diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..232c2d00
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,37 @@
+---
+name: 'Issue report'
+about: 'Create a report to help us improve the quality of our software'
+title: ''
+labels: ''
+assignees: ''
+---
+
+**Caution**
+
+The Issues are strictly limited for the reporting of problem encountered with the software provided in this project.
+For any other problem related to the STM32 product, the performance, the hardware characteristics and boards, the tools the environment in general, please post your report to the **ST Community** in the STM32 MCUs dedicated [page](https://community.st.com/s/topic/0TO0X000000BSqSWAW/stm32-mcus).
+
+**Describe the set-up**
+
+ * The board (either ST RPN reference or your custom board)
+ * IDE or at least the compiler and its version
+
+**Describe the bug (skip if none)**
+
+A clear and concise description of what the bug is.
+
+**How to reproduce the bug (skip if none)**
+
+1. Indicate the global behavior of your application project
+2. List the modules that you suspect to be the cause of the problem (Drivers, BSP, MW...)
+3. Describe the use case that generates the problem
+4. How we can reproduce the problem
+
+
+**Additional context**
+
+If you have a first analysis, an enhancement, a fix or a patch, thank you to share your proposal.
+
+**Screenshots**
+
+If applicable, add screenshots to help explain your problem.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 52e0c56a..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve the quality of our software
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Caution**
-The Issues are strictly limited for the reporting of problem encountered with the software provided in this project.
-For any other problem related to the STM32 product, the performance, the hardware characteristics and boards, the tools, or the environment in general, please post a topic in the [ST Community/STM32 MCUs forum](https://community.st.com/s/group/0F90X000000AXsASAW/stm32-mcus).
-
-**Describe the set-up**
- * The board (either ST RPN reference or your custom board).
- * IDE or at least the compiler and its version.
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**How To Reproduce**
-1. Indicate the global behavior of your application project.
-
-2. The modules that you suspect to be the cause of the problem (Driver, BSP, MW ...).
-
-3. The use case that generates the problem.
-
-4. How we can reproduce the problem.
-
-
-**Additional context**
-If you have a first analysis or patch correction, thank you to share your proposal.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md
deleted file mode 100644
index 568a2d8e..00000000
--- a/.github/ISSUE_TEMPLATE/other-issue.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: 'Other Issue '
-about: Generic issue description
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Caution**
-The Issues are strictly limited for the reporting of problem encountered with the software provided in this project.
-For any other problem related to the STM32 product, the performance, the hardware characteristics and boards, the tools, or the environment in general, please post a topic in the [ST Community/STM32 MCUs forum](https://community.st.com/s/group/0F90X000000AXsASAW/stm32-mcus).
-
-**Describe the set-up**
- * The board (either ST RPN reference or your custom board).
- * IDE or at least the compiler and its version.
-
-**Additional context**
-If you have a first analysis or a patch proposal, thank you to share your proposal.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a95c94fd..5efc26c5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,11 +7,9 @@ This guide mainly focuses on steps to be followed to submit an issue or a pull-r
 
 ### 1. Before opening an issue
 
-To report a bug or a request please file an issue in the right repository (example for [STM32CubeWL](https://github.com/STMicroelectronics/STM32CubeWL/issues/new/choose)).
-
 Please check the following boxes before posting an issue:
 - [ ] `Make sure you are using the latest commit (major releases are tagged, but corrections are available as new commits).`
-- [ ] `Make sure your issue is a question/feedback/suggestions RELATED TO the software provided in this repository.` Otherwise, it should be submitted to the ST Community under the MCU topic [page](https://community.st.com/s/group/0F90X000000AXsASAW/stm32-mcus).
+- [ ] `Make sure your issue is a question/feedback/suggestions RELATED TO the software provided in this repository.` Otherwise, it should be submitted to the ST Community under the MCU topic [page](https://community.st.com/s/topic/0TO0X000000BSqSWAW/stm32-mcus).
 - [ ] `Make sure your issue is not already reported/fixed on GitHub or discussed on a previous issue.` Please refer to this [dashboard](https://github.com/orgs/STMicroelectronics/projects/2) for the list of issues and pull-requests. Do not forget to browse into the **closed** issues.
 
 ### 2. Posting the issue
diff --git a/Documentation/STM32CubeWLGettingStarted.pdf b/Documentation/STM32CubeWLGettingStarted.pdf
index 6079c5b7..5b1111bc 100644
Binary files a/Documentation/STM32CubeWLGettingStarted.pdf and b/Documentation/STM32CubeWLGettingStarted.pdf differ
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/LICENSE.md b/Drivers/BSP/STM32WLxx_Nucleo/LICENSE.md
new file mode 100644
index 00000000..f6031ef2
--- /dev/null
+++ b/Drivers/BSP/STM32WLxx_Nucleo/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright 2020(-2021) STMicroelectronics.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/License.md b/Drivers/BSP/STM32WLxx_Nucleo/License.md
deleted file mode 100644
index c6b7c8bd..00000000
--- a/Drivers/BSP/STM32WLxx_Nucleo/License.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2020 STMicroelectronics
-
-This software component is licensed by STMicroelectronics under the **BSD-3-Clause** license. You may not use this software except in compliance with this license. You may obtain a copy of the license [here](https://opensource.org/licenses/BSD-3-Clause).
\ No newline at end of file
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/Release_Notes.html b/Drivers/BSP/STM32WLxx_Nucleo/Release_Notes.html
index 9b9e4565..ca9f5916 100644
--- a/Drivers/BSP/STM32WLxx_Nucleo/Release_Notes.html
+++ b/Drivers/BSP/STM32WLxx_Nucleo/Release_Notes.html
@@ -21,14 +21,12 @@
 <div class="row">
 <div class="col-sm-12 col-lg-4">
 <center>
-<h1 id="release-notes-for-stm32wlxx_nucleo">Release Notes for <mark>STM32WLxx_Nucleo</mark></h1>
+<h1 id="release-notes-for">Release Notes for</h1>
+<h1 id="stm32wlxx_nucleo"><mark>STM32WLxx_Nucleo</mark></h1>
 <p>Copyright © 2020 STMicroelectronics<br />
 </p>
 <a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
-<h1 id="license">License</h1>
-<p>This software component is licensed by ST under BSD 3-Clause license, the “License”; You may not use this component except in compliance with the License. You may obtain a copy of the License at:</p>
-<p><a href="https://opensource.org/licenses/BSD-3-Clause">https://opensource.org/licenses/BSD-3-Clause</a></p>
 <h1 id="purpose">Purpose</h1>
 <p>This driver provides a set of functions to manage:</p>
 <ul>
@@ -38,18 +36,37 @@ <h1 id="purpose">Purpose</h1>
 <div class="col-sm-12 col-lg-8">
 <h1 id="update-history">Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section1" checked aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<input type="checkbox" id="collapse-section2" checked aria-hidden="true"> <label for="collapse-section2" aria-hidden="true"><strong>V1.1.0 / 16-June-2021</strong></label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
-<p><strong>First Official Release</strong></p>
+<p><strong>Maintenance Release</strong></p>
 <h2 id="contents">Contents</h2>
-<p>First official release of board drivers for <strong>NUCLEO-WL55JC board (MB1389 C-01)</strong> in line with STM32Cube BSP drivers development guidelines (UM2298 - revision 2)</p>
+<ul>
+<li>Move some radio definitions (TCXO, DSDC) from stm32wlxx_nucleo_conf.h to stm32wlxx_nucleo_radio.h</li>
+<li>Add 2 interfaces to check BSP_RADIO_IsTCXO and BSP_RADIO_IsDCDC definitions</li>
+<li>Remove radio API BSP_RADIO_GetWakeUpTime from stm32wlxx_nucleo_radio.c</li>
+</ul>
 <h2 id="known-limitations">Known Limitations</h2>
 <p>None</p>
 <h2 id="dependencies">Dependencies</h2>
 <p>None</p>
 <h2 id="notes">Notes</h2>
-<p>stm32l5xx_nucleo_conf_template.h file must be copied in user application as stm32l5xx_nucleo_conf.h with optional configuration update</p>
+<p>stm32wlxx_nucleo_conf_template.h file must be copied in user application as stm32wlxx_nucleo_conf.h with optional configuration update</p>
+</div>
+</div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<p><strong>First Official Release</strong></p>
+<h2 id="contents-1">Contents</h2>
+<p>First official release of board drivers for <strong>NUCLEO-WL55JC board (MB1389 C-01)</strong> in line with STM32Cube BSP drivers development guidelines (UM2298 - revision 2)</p>
+<h2 id="known-limitations-1">Known Limitations</h2>
+<p>None</p>
+<h2 id="dependencies-1">Dependencies</h2>
+<p>None</p>
+<h2 id="notes-1">Notes</h2>
+<p>stm32wlxx_nucleo_conf_template.h file must be copied in user application as stm32wlxx_nucleo_conf.h with optional configuration update</p>
 </div>
 </div>
 </div>
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/_htmresc/mini-st.css b/Drivers/BSP/STM32WLxx_Nucleo/_htmresc/mini-st.css
deleted file mode 100644
index eb41d56c..00000000
--- a/Drivers/BSP/STM32WLxx_Nucleo/_htmresc/mini-st.css
+++ /dev/null
@@ -1,1700 +0,0 @@
-@charset "UTF-8";
-/*
-  Flavor name: Default (mini-default)
-  Author: Angelos Chalaris (chalarangelo@gmail.com)
-  Maintainers: Angelos Chalaris
-  mini.css version: v3.0.0-alpha.3
-*/
-/*
-  Browsers resets and base typography.
-*/
-/* Core module CSS variable definitions */
-:root {
-  --fore-color: #111;
-  --secondary-fore-color: #444;
-  --back-color: #f8f8f8;
-  --secondary-back-color: #f0f0f0;
-  --blockquote-color: #f57c00;
-  --pre-color: #1565c0;
-  --border-color: #aaa;
-  --secondary-border-color: #ddd;
-  --heading-ratio: 1.19;
-  --universal-margin: 0.5rem;
-  --universal-padding: 0.125rem;
-  --universal-border-radius: 0.125rem;
-  --a-link-color: #0277bd;
-  --a-visited-color: #01579b; }
-
-html {
-  font-size: 14px; }
-
-a, b, del, em, i, ins, q, span, strong, u {
-  font-size: 1em; }
-
-html, * {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Helvetica, sans-serif;
-  line-height: 1.4;
-  -webkit-text-size-adjust: 100%; }
-
-* {
-  font-size: 1rem; }
-
-body {
-  margin: 0;
-  color: var(--fore-color);
-  background: var(--back-color); }
-
-details {
-  display: block; }
-
-summary {
-  display: list-item; }
-
-abbr[title] {
-  border-bottom: none;
-  text-decoration: underline dotted; }
-
-input {
-  overflow: visible; }
-
-img {
-  max-width: 100%;
-  height: auto; }
-
-h1, h2, h3, h4, h5, h6 {
-  line-height: 1.2;
-  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  font-weight: 500; }
-  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-    color: var(--secondary-fore-color);
-    display: block;
-    margin-top: -0.25rem; }
-
-h1 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
-
-h2 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio); );
-  background: var(--mark-back-color);
-  font-weight: 600;
-  padding: 0.1em 0.5em 0.2em 0.5em;
-  color: var(--mark-fore-color); }
-
-h3 {
-  font-size: calc(1rem * var(--heading-ratio));
-  padding-left: calc(2 * var(--universal-margin)); 
-  /* background: var(--border-color); */
-    }
-
-h4 {
-  font-size: 1rem;);
-  padding-left: calc(4 * var(--universal-margin));  }
-
-h5 {
-  font-size: 1rem; }
-
-h6 {
-  font-size: calc(1rem / var(--heading-ratio)); }
-
-p {
-  margin: var(--universal-margin); }
-
-ol, ul {
-  margin: var(--universal-margin);
-  padding-left: calc(6 * var(--universal-margin)); }
-
-b, strong {
-  font-weight: 700; }
-
-hr {
-  box-sizing: content-box;
-  border: 0;
-  line-height: 1.25em;
-  margin: var(--universal-margin);
-  height: 0.0625rem;
-  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
-
-blockquote {
-  display: block;
-  position: relative;
-  font-style: italic;
-  color: var(--secondary-fore-color);
-  margin: var(--universal-margin);
-  padding: calc(3 * var(--universal-padding));
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.375rem solid var(--blockquote-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-  blockquote:before {
-    position: absolute;
-    top: calc(0rem - var(--universal-padding));
-    left: 0;
-    font-family: sans-serif;
-    font-size: 3rem;
-    font-weight: 700;
-    content: "\201c";
-    color: var(--blockquote-color); }
-  blockquote[cite]:after {
-    font-style: normal;
-    font-size: 0.75em;
-    font-weight: 700;
-    content: "\a—  " attr(cite);
-    white-space: pre; }
-
-code, kbd, pre, samp {
-  font-family: Menlo, Consolas, monospace;
-  font-size: 0.85em; }
-
-code {
-  background: var(--secondary-back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-kbd {
-  background: var(--fore-color);
-  color: var(--back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-pre {
-  overflow: auto;
-  background: var(--secondary-back-color);
-  padding: calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.25rem solid var(--pre-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-
-sup, sub, code, kbd {
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
-small, sup, sub, figcaption {
-  font-size: 0.75em; }
-
-sup {
-  top: -0.5em; }
-
-sub {
-  bottom: -0.25em; }
-
-figure {
-  margin: var(--universal-margin); }
-
-figcaption {
-  color: var(--secondary-fore-color); }
-
-a {
-  text-decoration: none; }
-  a:link {
-    color: var(--a-link-color); }
-  a:visited {
-    color: var(--a-visited-color); }
-  a:hover, a:focus {
-    text-decoration: underline; }
-
-/*
-  Definitions for the grid system, cards and containers.
-*/
-.container {
-  margin: 0 auto;
-  padding: 0 calc(1.5 * var(--universal-padding)); }
-
-.row {
-  box-sizing: border-box;
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap; }
-
-.col-sm,
-[class^='col-sm-'],
-[class^='col-sm-offset-'],
-.row[class*='cols-sm-'] > * {
-  box-sizing: border-box;
-  flex: 0 0 auto;
-  padding: 0 calc(var(--universal-padding) / 2); }
-
-.col-sm,
-.row.cols-sm > * {
-  max-width: 100%;
-  flex-grow: 1;
-  flex-basis: 0; }
-
-.col-sm-1,
-.row.cols-sm-1 > * {
-  max-width: 8.3333333333%;
-  flex-basis: 8.3333333333%; }
-
-.col-sm-offset-0 {
-  margin-left: 0; }
-
-.col-sm-2,
-.row.cols-sm-2 > * {
-  max-width: 16.6666666667%;
-  flex-basis: 16.6666666667%; }
-
-.col-sm-offset-1 {
-  margin-left: 8.3333333333%; }
-
-.col-sm-3,
-.row.cols-sm-3 > * {
-  max-width: 25%;
-  flex-basis: 25%; }
-
-.col-sm-offset-2 {
-  margin-left: 16.6666666667%; }
-
-.col-sm-4,
-.row.cols-sm-4 > * {
-  max-width: 33.3333333333%;
-  flex-basis: 33.3333333333%; }
-
-.col-sm-offset-3 {
-  margin-left: 25%; }
-
-.col-sm-5,
-.row.cols-sm-5 > * {
-  max-width: 41.6666666667%;
-  flex-basis: 41.6666666667%; }
-
-.col-sm-offset-4 {
-  margin-left: 33.3333333333%; }
-
-.col-sm-6,
-.row.cols-sm-6 > * {
-  max-width: 50%;
-  flex-basis: 50%; }
-
-.col-sm-offset-5 {
-  margin-left: 41.6666666667%; }
-
-.col-sm-7,
-.row.cols-sm-7 > * {
-  max-width: 58.3333333333%;
-  flex-basis: 58.3333333333%; }
-
-.col-sm-offset-6 {
-  margin-left: 50%; }
-
-.col-sm-8,
-.row.cols-sm-8 > * {
-  max-width: 66.6666666667%;
-  flex-basis: 66.6666666667%; }
-
-.col-sm-offset-7 {
-  margin-left: 58.3333333333%; }
-
-.col-sm-9,
-.row.cols-sm-9 > * {
-  max-width: 75%;
-  flex-basis: 75%; }
-
-.col-sm-offset-8 {
-  margin-left: 66.6666666667%; }
-
-.col-sm-10,
-.row.cols-sm-10 > * {
-  max-width: 83.3333333333%;
-  flex-basis: 83.3333333333%; }
-
-.col-sm-offset-9 {
-  margin-left: 75%; }
-
-.col-sm-11,
-.row.cols-sm-11 > * {
-  max-width: 91.6666666667%;
-  flex-basis: 91.6666666667%; }
-
-.col-sm-offset-10 {
-  margin-left: 83.3333333333%; }
-
-.col-sm-12,
-.row.cols-sm-12 > * {
-  max-width: 100%;
-  flex-basis: 100%; }
-
-.col-sm-offset-11 {
-  margin-left: 91.6666666667%; }
-
-.col-sm-normal {
-  order: initial; }
-
-.col-sm-first {
-  order: -999; }
-
-.col-sm-last {
-  order: 999; }
-
-@media screen and (min-width: 500px) {
-  .col-md,
-  [class^='col-md-'],
-  [class^='col-md-offset-'],
-  .row[class*='cols-md-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-md,
-  .row.cols-md > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-md-1,
-  .row.cols-md-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-md-offset-0 {
-    margin-left: 0; }
-
-  .col-md-2,
-  .row.cols-md-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-md-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-md-3,
-  .row.cols-md-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-md-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-md-4,
-  .row.cols-md-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-md-offset-3 {
-    margin-left: 25%; }
-
-  .col-md-5,
-  .row.cols-md-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-md-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-md-6,
-  .row.cols-md-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-md-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-md-7,
-  .row.cols-md-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-md-offset-6 {
-    margin-left: 50%; }
-
-  .col-md-8,
-  .row.cols-md-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-md-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-md-9,
-  .row.cols-md-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-md-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-md-10,
-  .row.cols-md-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-md-offset-9 {
-    margin-left: 75%; }
-
-  .col-md-11,
-  .row.cols-md-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-md-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-md-12,
-  .row.cols-md-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-md-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-md-normal {
-    order: initial; }
-
-  .col-md-first {
-    order: -999; }
-
-  .col-md-last {
-    order: 999; } }
-@media screen and (min-width: 1280px) {
-  .col-lg,
-  [class^='col-lg-'],
-  [class^='col-lg-offset-'],
-  .row[class*='cols-lg-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-lg,
-  .row.cols-lg > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-lg-1,
-  .row.cols-lg-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-lg-offset-0 {
-    margin-left: 0; }
-
-  .col-lg-2,
-  .row.cols-lg-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-lg-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-lg-3,
-  .row.cols-lg-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-lg-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-lg-4,
-  .row.cols-lg-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-lg-offset-3 {
-    margin-left: 25%; }
-
-  .col-lg-5,
-  .row.cols-lg-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-lg-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-lg-6,
-  .row.cols-lg-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-lg-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-lg-7,
-  .row.cols-lg-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-lg-offset-6 {
-    margin-left: 50%; }
-
-  .col-lg-8,
-  .row.cols-lg-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-lg-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-lg-9,
-  .row.cols-lg-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-lg-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-lg-10,
-  .row.cols-lg-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-lg-offset-9 {
-    margin-left: 75%; }
-
-  .col-lg-11,
-  .row.cols-lg-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-lg-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-lg-12,
-  .row.cols-lg-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-lg-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-lg-normal {
-    order: initial; }
-
-  .col-lg-first {
-    order: -999; }
-
-  .col-lg-last {
-    order: 999; } }
-/* Card component CSS variable definitions */
-:root {
-  --card-back-color: #f8f8f8;
-  --card-fore-color: #111;
-  --card-border-color: #ddd; }
-
-.card {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-self: center;
-  position: relative;
-  width: 100%;
-  background: var(--card-back-color);
-  color: var(--card-fore-color);
-  border: 0.0625rem solid var(--card-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  overflow: hidden; }
-  @media screen and (min-width: 320px) {
-    .card {
-      max-width: 320px; } }
-  .card > .sectione {
-    background: var(--card-back-color);
-    color: var(--card-fore-color);
-    box-sizing: border-box;
-    margin: 0;
-    border: 0;
-    border-radius: 0;
-    border-bottom: 0.0625rem solid var(--card-border-color);
-    padding: var(--universal-padding);
-    width: 100%; }
-    .card > .sectione.media {
-      height: 200px;
-      padding: 0;
-      -o-object-fit: cover;
-      object-fit: cover; }
-  .card > .sectione:last-child {
-    border-bottom: 0; }
-
-/*
-  Custom elements for card elements.
-*/
-@media screen and (min-width: 240px) {
-  .card.small {
-    max-width: 240px; } }
-@media screen and (min-width: 480px) {
-  .card.large {
-    max-width: 480px; } }
-.card.fluid {
-  max-width: 100%;
-  width: auto; }
-
-.card.warning {
-/*  --card-back-color: #ffca28; */
-  --card-back-color: #e5b8b7;
-  --card-border-color: #e8b825; }
-
-.card.error {
-  --card-back-color: #b71c1c;
-  --card-fore-color: #f8f8f8;
-  --card-border-color: #a71a1a; }
-
-.card > .sectione.dark {
-  --card-back-color: #e0e0e0; }
-
-.card > .sectione.double-padded {
-  padding: calc(1.5 * var(--universal-padding)); }
-
-/*
-  Definitions for forms and input elements.
-*/
-/* Input_control module CSS variable definitions */
-:root {
-  --form-back-color: #f0f0f0;
-  --form-fore-color: #111;
-  --form-border-color: #ddd;
-  --input-back-color: #f8f8f8;
-  --input-fore-color: #111;
-  --input-border-color: #ddd;
-  --input-focus-color: #0288d1;
-  --input-invalid-color: #d32f2f;
-  --button-back-color: #e2e2e2;
-  --button-hover-back-color: #dcdcdc;
-  --button-fore-color: #212121;
-  --button-border-color: transparent;
-  --button-hover-border-color: transparent;
-  --button-group-border-color: rgba(124, 124, 124, 0.54); }
-
-form {
-  background: var(--form-back-color);
-  color: var(--form-fore-color);
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
-
-fieldset {
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 4);
-  padding: var(--universal-padding); }
-
-legend {
-  box-sizing: border-box;
-  display: table;
-  max-width: 100%;
-  white-space: normal;
-  font-weight: 700;
-  padding: calc(var(--universal-padding) / 2); }
-
-label {
-  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-.input-group {
-  display: inline-block; }
-  .input-group.fluid {
-    display: flex;
-    align-items: center;
-    justify-content: center; }
-    .input-group.fluid > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-    @media screen and (max-width: 499px) {
-      .input-group.fluid {
-        align-items: stretch;
-        flex-direction: column; } }
-  .input-group.vertical {
-    display: flex;
-    align-items: stretch;
-    flex-direction: column; }
-    .input-group.vertical > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-
-[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
-  height: auto; }
-
-[type="search"] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px; }
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
-
-input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
-[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
-  box-sizing: border-box;
-  background: var(--input-back-color);
-  color: var(--input-fore-color);
-  border: 0.0625rem solid var(--input-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 2);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
-  border-color: var(--input-focus-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
-  border-color: var(--input-invalid-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
-  background: var(--secondary-back-color); }
-
-select {
-  max-width: 100%; }
-
-option {
-  overflow: hidden;
-  text-overflow: ellipsis; }
-
-[type="checkbox"], [type="radio"] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  position: relative;
-  height: calc(1rem + var(--universal-padding) / 2);
-  width: calc(1rem + var(--universal-padding) / 2);
-  vertical-align: text-bottom;
-  padding: 0;
-  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
-  flex-grow: 0 !important; }
-  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
-    position: absolute; }
-
-[type="checkbox"]:checked:before {
-  content: '\2713';
-  font-family: sans-serif;
-  font-size: calc(1rem + var(--universal-padding) / 2);
-  top: calc(0rem - var(--universal-padding));
-  left: calc(var(--universal-padding) / 4); }
-
-[type="radio"] {
-  border-radius: 100%; }
-  [type="radio"]:checked:before {
-    border-radius: 100%;
-    content: '';
-    top: calc(0.0625rem + var(--universal-padding) / 2);
-    left: calc(0.0625rem + var(--universal-padding) / 2);
-    background: var(--input-fore-color);
-    width: 0.5rem;
-    height: 0.5rem; }
-
-:placeholder-shown {
-  color: var(--input-fore-color); }
-
-::-ms-placeholder {
-  color: var(--input-fore-color);
-  opacity: 0.54; }
-
-button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-button, html [type="button"], [type="reset"], [type="submit"] {
-  -webkit-appearance: button; }
-
-button {
-  overflow: visible;
-  text-transform: none; }
-
-button, [type="button"], [type="submit"], [type="reset"],
-a.button, label.button, .button,
-a[role="button"], label[role="button"], [role="button"] {
-  display: inline-block;
-  background: var(--button-back-color);
-  color: var(--button-fore-color);
-  border: 0.0625rem solid var(--button-border-color);
-  border-radius: var(--universal-border-radius);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  text-decoration: none;
-  cursor: pointer;
-  transition: background 0.3s; }
-  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
-  a.button:hover,
-  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
-  a[role="button"]:hover,
-  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
-    background: var(--button-hover-back-color);
-    border-color: var(--button-hover-border-color); }
-
-input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
-  cursor: not-allowed;
-  opacity: 0.75; }
-
-.button-group {
-  display: flex;
-  border: 0.0625rem solid var(--button-group-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
-    margin: 0;
-    max-width: 100%;
-    flex: 1 1 auto;
-    text-align: center;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none; }
-  .button-group > :not(:first-child) {
-    border-left: 0.0625rem solid var(--button-group-border-color); }
-  @media screen and (max-width: 499px) {
-    .button-group {
-      flex-direction: column; }
-      .button-group > :not(:first-child) {
-        border: 0;
-        border-top: 0.0625rem solid var(--button-group-border-color); } }
-
-/*
-  Custom elements for forms and input elements.
-*/
-button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
-  --button-back-color: #1976d2;
-  --button-fore-color: #f8f8f8; }
-  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
-    --button-hover-back-color: #1565c0; }
-
-button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
-  --button-back-color: #d32f2f;
-  --button-fore-color: #f8f8f8; }
-  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
-    --button-hover-back-color: #c62828; }
-
-button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
-  --button-back-color: #308732;
-  --button-fore-color: #f8f8f8; }
-  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
-    --button-hover-back-color: #277529; }
-
-button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
-  --button-back-color: #212121;
-  --button-fore-color: #f8f8f8; }
-  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
-    --button-hover-back-color: #111; }
-
-button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
-  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
-  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-/*
-  Definitions for navigation elements.
-*/
-/* Navigation module CSS variable definitions */
-:root {
-  --header-back-color: #f8f8f8;
-  --header-hover-back-color: #f0f0f0;
-  --header-fore-color: #444;
-  --header-border-color: #ddd;
-  --nav-back-color: #f8f8f8;
-  --nav-hover-back-color: #f0f0f0;
-  --nav-fore-color: #444;
-  --nav-border-color: #ddd;
-  --nav-link-color: #0277bd;
-  --footer-fore-color: #444;
-  --footer-back-color: #f8f8f8;
-  --footer-border-color: #ddd;
-  --footer-link-color: #0277bd;
-  --drawer-back-color: #f8f8f8;
-  --drawer-hover-back-color: #f0f0f0;
-  --drawer-border-color: #ddd;
-  --drawer-close-color: #444; }
-
-header {
-  height: 3.1875rem;
-  background: var(--header-back-color);
-  color: var(--header-fore-color);
-  border-bottom: 0.0625rem solid var(--header-border-color);
-  padding: calc(var(--universal-padding) / 4) 0;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden; }
-  header.row {
-    box-sizing: content-box; }
-  header .logo {
-    color: var(--header-fore-color);
-    font-size: 1.75rem;
-    padding: var(--universal-padding) calc(2 * var(--universal-padding));
-    text-decoration: none; }
-  header button, header [type="button"], header .button, header [role="button"] {
-    box-sizing: border-box;
-    position: relative;
-    top: calc(0rem - var(--universal-padding) / 4);
-    height: calc(3.1875rem + var(--universal-padding) / 2);
-    background: var(--header-back-color);
-    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
-    text-align: center;
-    color: var(--header-fore-color);
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-    text-transform: uppercase; }
-    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
-      background: var(--header-hover-back-color); }
-
-nav {
-  background: var(--nav-back-color);
-  color: var(--nav-fore-color);
-  border: 0.0625rem solid var(--nav-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  nav * {
-    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-  nav a, nav a:visited {
-    display: block;
-    color: var(--nav-link-color);
-    border-radius: var(--universal-border-radius);
-    transition: background 0.3s; }
-    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
-      text-decoration: none;
-      background: var(--nav-hover-back-color); }
-  nav .sublink-1 {
-    position: relative;
-    margin-left: calc(2 * var(--universal-padding)); }
-    nav .sublink-1:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-  nav .sublink-2 {
-    position: relative;
-    margin-left: calc(4 * var(--universal-padding)); }
-    nav .sublink-2:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-
-footer {
-  background: var(--footer-back-color);
-  color: var(--footer-fore-color);
-  border-top: 0.0625rem solid var(--footer-border-color);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
-  font-size: 0.875rem; }
-  footer a, footer a:visited {
-    color: var(--footer-link-color); }
-
-header.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  top: 0; }
-
-footer.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  bottom: 0; }
-
-.drawer-toggle:before {
-  display: inline-block;
-  position: relative;
-  vertical-align: bottom;
-  content: '\00a0\2261\00a0';
-  font-family: sans-serif;
-  font-size: 1.5em; }
-@media screen and (min-width: 500px) {
-  .drawer-toggle:not(.persistent) {
-    display: none; } }
-
-[type="checkbox"].drawer {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].drawer + * {
-    display: block;
-    box-sizing: border-box;
-    position: fixed;
-    top: 0;
-    width: 320px;
-    height: 100vh;
-    overflow-y: auto;
-    background: var(--drawer-back-color);
-    border: 0.0625rem solid var(--drawer-border-color);
-    border-radius: 0;
-    margin: 0;
-    z-index: 1110;
-    right: -320px;
-    transition: right 0.3s; }
-    [type="checkbox"].drawer + * .drawer-close {
-      position: absolute;
-      top: var(--universal-margin);
-      right: var(--universal-margin);
-      z-index: 1111;
-      width: 2rem;
-      height: 2rem;
-      border-radius: var(--universal-border-radius);
-      padding: var(--universal-padding);
-      margin: 0;
-      cursor: pointer;
-      transition: background 0.3s; }
-      [type="checkbox"].drawer + * .drawer-close:before {
-        display: block;
-        content: '\00D7';
-        color: var(--drawer-close-color);
-        position: relative;
-        font-family: sans-serif;
-        font-size: 2rem;
-        line-height: 1;
-        text-align: center; }
-      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
-        background: var(--drawer-hover-back-color); }
-    @media screen and (max-width: 320px) {
-      [type="checkbox"].drawer + * {
-        width: 100%; } }
-  [type="checkbox"].drawer:checked + * {
-    right: 0; }
-  @media screen and (min-width: 500px) {
-    [type="checkbox"].drawer:not(.persistent) + * {
-      position: static;
-      height: 100%;
-      z-index: 1100; }
-      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
-        display: none; } }
-
-/*
-  Definitions for the responsive table component.
-*/
-/* Table module CSS variable definitions. */
-:root {
-  --table-border-color: #aaa;
-  --table-border-separator-color: #666;
-  --table-head-back-color: #e6e6e6;
-  --table-head-fore-color: #111;
-  --table-body-back-color: #f8f8f8;
-  --table-body-fore-color: #111;
-  --table-body-alt-back-color: #eee; }
-
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  : margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap;
-  padding: var(--universal-padding);
-  padding-top: 0;
-	margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);	}
-  table caption {
-    font-size: 1.25 * rem;
-    margin: calc(2 * var(--universal-margin)) 0;
-    max-width: 100%;
-    flex: 0 0 100%;
-		text-align: left;}
-  table thead, table tbody {
-    display: flex;
-    flex-flow: row wrap;
-    border: 0.0625rem solid var(--table-border-color); }
-  table thead {
-    z-index: 999;
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
-    border-bottom: 0.0625rem solid var(--table-border-separator-color); }
-  table tbody {
-    border-top: 0;
-    margin-top: calc(0 - var(--universal-margin));
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  table tr {
-    display: flex;
-    padding: 0; }
-  table th, table td {
-    padding: calc(0.5 * var(--universal-padding));
-		font-size: 0.9rem; }
-  table th {
-    text-align: left;
-    background: var(--table-head-back-color);
-    color: var(--table-head-fore-color); }
-  table td {
-    background: var(--table-body-back-color);
-    color: var(--table-body-fore-color);
-    border-top: 0.0625rem solid var(--table-border-color); }
-
-table:not(.horizontal) {
-  overflow: auto;
-  max-height: 850px; }
-  table:not(.horizontal) thead, table:not(.horizontal) tbody {
-    max-width: 100%;
-    flex: 0 0 100%; }
-  table:not(.horizontal) tr {
-    flex-flow: row wrap;
-    flex: 0 0 100%; }
-  table:not(.horizontal) th, table:not(.horizontal) td {
-    flex: 1 0 0%;
-    overflow: hidden;
-    text-overflow: ellipsis; }
-  table:not(.horizontal) thead {
-    position: sticky;
-    top: 0; }
-  table:not(.horizontal) tbody tr:first-child td {
-    border-top: 0; }
-
-table.horizontal {
-  border: 0; }
-  table.horizontal thead, table.horizontal tbody {
-    border: 0;
-    flex-flow: row nowrap; }
-  table.horizontal tbody {
-    overflow: auto;
-    justify-content: space-between;
-    flex: 1 0 0;
-    margin-left: calc( 4 * var(--universal-margin));
-    padding-bottom: calc(var(--universal-padding) / 4); }
-  table.horizontal tr {
-    flex-direction: column;
-    flex: 1 0 auto; }
-  table.horizontal th, table.horizontal td {
-    width: 100%;
-    border: 0;
-    border-bottom: 0.0625rem solid var(--table-border-color); }
-    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
-      border-top: 0; }
-  table.horizontal th {
-    text-align: right;
-    border-left: 0.0625rem solid var(--table-border-color);
-    border-right: 0.0625rem solid var(--table-border-separator-color); }
-  table.horizontal thead tr:first-child {
-    padding-left: 0; }
-  table.horizontal th:first-child, table.horizontal td:first-child {
-    border-top: 0.0625rem solid var(--table-border-color); }
-  table.horizontal tbody tr:last-child td {
-    border-right: 0.0625rem solid var(--table-border-color); }
-    table.horizontal tbody tr:last-child td:first-child {
-      border-top-right-radius: 0.25rem; }
-    table.horizontal tbody tr:last-child td:last-child {
-      border-bottom-right-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:first-child {
-    border-top-left-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:last-child {
-    border-bottom-left-radius: 0.25rem; }
-
-@media screen and (max-width: 499px) {
-  table, table.horizontal {
-    border-collapse: collapse;
-    border: 0;
-    width: 100%;
-    display: table; }
-    table thead, table th, table.horizontal thead, table.horizontal th {
-      border: 0;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      padding: 0;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%); }
-    table tbody, table.horizontal tbody {
-      border: 0;
-      display: table-row-group; }
-    table tr, table.horizontal tr {
-      display: block;
-      border: 0.0625rem solid var(--table-border-color);
-      border-radius: var(--universal-border-radius);
-      background: #fafafa;
-      padding: var(--universal-padding);
-      margin: var(--universal-margin);
-      margin-bottom: calc(2 * var(--universal-margin)); }
-    table th, table td, table.horizontal th, table.horizontal td {
-      width: auto; }
-    table td, table.horizontal td {
-      display: block;
-      border: 0;
-      text-align: right; }
-    table td:before, table.horizontal td:before {
-      content: attr(data-label);
-      float: left;
-      font-weight: 600; }
-    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
-      border-top: 0; }
-    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
-      border-right: 0; } }
-:root {
-  --table-body-alt-back-color: #eee; }
-
-table tr:nth-of-type(2n) > td {
-  background: var(--table-body-alt-back-color); }
-
-@media screen and (max-width: 500px) {
-  table tr:nth-of-type(2n) {
-    background: var(--table-body-alt-back-color); } }
-:root {
-  --table-body-hover-back-color: #90caf9; }
-
-table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-  background: var(--table-body-hover-back-color); }
-
-@media screen and (max-width: 500px) {
-  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-    background: var(--table-body-hover-back-color); } }
-/*
-  Definitions for contextual background elements, toasts and tooltips.
-*/
-/* Contextual module CSS variable definitions */
-:root {
-  --mark-back-color: #0277bd;
-  --mark-fore-color: #fafafa; }
-
-mark {
-  background: var(--mark-back-color);
-  color: var(--mark-fore-color);
-  font-size: 0.95em;
-  line-height: 1em;
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-  mark.inline-block {
-    display: inline-block;
-    font-size: 1em;
-    line-height: 1.5;
-    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-:root {
-  --toast-back-color: #424242;
-  --toast-fore-color: #fafafa; }
-
-.toast {
-  position: fixed;
-  bottom: calc(var(--universal-margin) * 3);
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1111;
-  color: var(--toast-fore-color);
-  background: var(--toast-back-color);
-  border-radius: calc(var(--universal-border-radius) * 16);
-  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
-
-:root {
-  --tooltip-back-color: #212121;
-  --tooltip-fore-color: #fafafa; }
-
-.tooltip {
-  position: relative;
-  display: inline-block; }
-  .tooltip:before, .tooltip:after {
-    position: absolute;
-    opacity: 0;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%);
-    transition: all 0.3s;
-    z-index: 1010;
-    left: 50%; }
-  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
-    bottom: 75%; }
-  .tooltip.bottom:before, .tooltip.bottom:after {
-    top: 75%; }
-  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
-    opacity: 1;
-    clip: auto;
-    -webkit-clip-path: inset(0%);
-    clip-path: inset(0%); }
-  .tooltip:before {
-    content: '';
-    background: transparent;
-    border: var(--universal-margin) solid transparent;
-    left: calc(50% - var(--universal-margin)); }
-  .tooltip:not(.bottom):before {
-    border-top-color: #212121; }
-  .tooltip.bottom:before {
-    border-bottom-color: #212121; }
-  .tooltip:after {
-    content: attr(aria-label);
-    color: var(--tooltip-fore-color);
-    background: var(--tooltip-back-color);
-    border-radius: var(--universal-border-radius);
-    padding: var(--universal-padding);
-    white-space: nowrap;
-    transform: translateX(-50%); }
-  .tooltip:not(.bottom):after {
-    margin-bottom: calc(2 * var(--universal-margin)); }
-  .tooltip.bottom:after {
-    margin-top: calc(2 * var(--universal-margin)); }
-
-:root {
-  --modal-overlay-color: rgba(0, 0, 0, 0.45);
-  --modal-close-color: #444;
-  --modal-close-hover-color: #f0f0f0; }
-
-[type="checkbox"].modal {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].modal + div {
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: none;
-    width: 100vw;
-    height: 100vh;
-    background: var(--modal-overlay-color); }
-    [type="checkbox"].modal + div .card {
-      margin: 0 auto;
-      max-height: 50vh;
-      overflow: auto; }
-      [type="checkbox"].modal + div .card .modal-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 1.75rem;
-        height: 1.75rem;
-        border-radius: var(--universal-border-radius);
-        padding: var(--universal-padding);
-        margin: 0;
-        cursor: pointer;
-        transition: background 0.3s; }
-        [type="checkbox"].modal + div .card .modal-close:before {
-          display: block;
-          content: '\00D7';
-          color: var(--modal-close-color);
-          position: relative;
-          font-family: sans-serif;
-          font-size: 1.75rem;
-          line-height: 1;
-          text-align: center; }
-        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
-          background: var(--modal-close-hover-color); }
-  [type="checkbox"].modal:checked + div {
-    display: flex;
-    flex: 0 1 auto;
-    z-index: 1200; }
-    [type="checkbox"].modal:checked + div .card .modal-close {
-      z-index: 1211; }
-
-:root {
-  --collapse-label-back-color: #e8e8e8;
-  --collapse-label-fore-color: #212121;
-  --collapse-label-hover-back-color: #f0f0f0;
-  --collapse-selected-label-back-color: #ececec;
-  --collapse-border-color: #ddd;
-  --collapse-content-back-color: #fafafa;
-  --collapse-selected-label-border-color: #0277bd; }
-
-.collapse {
-  width: calc(100% - 2 * var(--universal-margin));
-  opacity: 1;
-  display: flex;
-  flex-direction: column;
-  margin: var(--universal-margin);
-  border-radius: var(--universal-border-radius); }
-  .collapse > [type="radio"], .collapse > [type="checkbox"] {
-    height: 1px;
-    width: 1px;
-    margin: -1px;
-    overflow: hidden;
-    position: absolute;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%); }
-  .collapse > label {
-    flex-grow: 1;
-    display: inline-block;
-    height: 1.5rem;
-    cursor: pointer;
-    transition: background 0.3s;
-    color: var(--collapse-label-fore-color);
-    background: var(--collapse-label-back-color);
-    border: 0.0625rem solid var(--collapse-border-color);
-    padding: calc(1.5 * var(--universal-padding)); }
-    .collapse > label:hover, .collapse > label:focus {
-      background: var(--collapse-label-hover-back-color); }
-    .collapse > label + div {
-      flex-basis: auto;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%);
-      transition: max-height 0.3s;
-      max-height: 1px; }
-  .collapse > :checked + label {
-    background: var(--collapse-selected-label-back-color);
-    border-bottom-color: var(--collapse-selected-label-border-color); }
-    .collapse > :checked + label + div {
-      box-sizing: border-box;
-      position: relative;
-      width: 100%;
-      height: auto;
-      overflow: auto;
-      margin: 0;
-      background: var(--collapse-content-back-color);
-      border: 0.0625rem solid var(--collapse-border-color);
-      border-top: 0;
-      padding: var(--universal-padding);
-      clip: auto;
-      -webkit-clip-path: inset(0%);
-      clip-path: inset(0%);
-      max-height: 850px; }
-  .collapse > label:not(:first-of-type) {
-    border-top: 0; }
-  .collapse > label:first-of-type {
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
-  .collapse > label:last-of-type:not(:first-of-type) {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  .collapse > label:last-of-type:first-of-type {
-    border-radius: var(--universal-border-radius); }
-  .collapse > :checked:last-of-type:not(:first-of-type) + label {
-    border-radius: 0; }
-  .collapse > :checked:last-of-type + label + div {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-
-/*
-  Custom elements for contextual background elements, toasts and tooltips.
-*/
-mark.secondary {
-  --mark-back-color: #d32f2f; }
-
-mark.tertiary {
-  --mark-back-color: #308732; }
-
-mark.tag {
-  padding: calc(var(--universal-padding)/2) var(--universal-padding);
-  border-radius: 1em; }
-
-/*
-  Definitions for progress elements and spinners.
-*/
-/* Progress module CSS variable definitions */
-:root {
-  --progress-back-color: #ddd;
-  --progress-fore-color: #555; }
-
-progress {
-  display: block;
-  vertical-align: baseline;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  height: 0.75rem;
-  width: calc(100% - 2 * var(--universal-margin));
-  margin: var(--universal-margin);
-  border: 0;
-  border-radius: calc(2 * var(--universal-border-radius));
-  background: var(--progress-back-color);
-  color: var(--progress-fore-color); }
-  progress::-webkit-progress-value {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress::-webkit-progress-bar {
-    background: var(--progress-back-color); }
-  progress::-moz-progress-bar {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-webkit-progress-value {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-moz-progress-bar {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress.inline {
-    display: inline-block;
-    vertical-align: middle;
-    width: 60%; }
-
-:root {
-  --spinner-back-color: #ddd;
-  --spinner-fore-color: #555; }
-
-@keyframes spinner-donut-anim {
-  0% {
-    transform: rotate(0deg); }
-  100% {
-    transform: rotate(360deg); } }
-.spinner {
-  display: inline-block;
-  margin: var(--universal-margin);
-  border: 0.25rem solid var(--spinner-back-color);
-  border-left: 0.25rem solid var(--spinner-fore-color);
-  border-radius: 50%;
-  width: 1.25rem;
-  height: 1.25rem;
-  animation: spinner-donut-anim 1.2s linear infinite; }
-
-/*
-  Custom elements for progress bars and spinners.
-*/
-progress.primary {
-  --progress-fore-color: #1976d2; }
-
-progress.secondary {
-  --progress-fore-color: #d32f2f; }
-
-progress.tertiary {
-  --progress-fore-color: #308732; }
-
-.spinner.primary {
-  --spinner-fore-color: #1976d2; }
-
-.spinner.secondary {
-  --spinner-fore-color: #d32f2f; }
-
-.spinner.tertiary {
-  --spinner-fore-color: #308732; }
-
-/*
-  Definitions for icons - powered by Feather (https://feathericons.com/).
-*/
-span[class^='icon-'] {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  vertical-align: -0.125em;
-  background-size: contain;
-  margin: 0 calc(var(--universal-margin) / 4); }
-  span[class^='icon-'].secondary {
-    -webkit-filter: invert(25%);
-    filter: invert(25%); }
-  span[class^='icon-'].inverse {
-    -webkit-filter: invert(100%);
-    filter: invert(100%); }
-
-span.icon-alert {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-bookmark {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-calendar {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-credit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-edit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
-span.icon-link {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-help {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-home {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-info {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-lock {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-mail {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-location {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-phone {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-rss {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-search {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-settings {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-share {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-cart {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-upload {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-user {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
-
-/*
-  Definitions for utilities and helper classes.
-*/
-/* Utility module CSS variable definitions */
-:root {
-  --generic-border-color: rgba(0, 0, 0, 0.3);
-  --generic-box-shadow: 0 0.25rem 0.25rem 0 rgba(0, 0, 0, 0.125), 0 0.125rem 0.125rem -0.125rem rgba(0, 0, 0, 0.25); }
-
-.hidden {
-  display: none !important; }
-
-.visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  margin: -1px !important;
-  border: 0 !important;
-  padding: 0 !important;
-  clip: rect(0 0 0 0) !important;
-  -webkit-clip-path: inset(100%) !important;
-  clip-path: inset(100%) !important;
-  overflow: hidden !important; }
-
-.bordered {
-  border: 0.0625rem solid var(--generic-border-color) !important; }
-
-.rounded {
-  border-radius: var(--universal-border-radius) !important; }
-
-.circular {
-  border-radius: 50% !important; }
-
-.shadowed {
-  box-shadow: var(--generic-box-shadow) !important; }
-
-.responsive-margin {
-  margin: calc(var(--universal-margin) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-margin {
-      margin: calc(var(--universal-margin) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-margin {
-      margin: var(--universal-margin) !important; } }
-
-.responsive-padding {
-  padding: calc(var(--universal-padding) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-padding {
-      padding: calc(var(--universal-padding) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-padding {
-      padding: var(--universal-padding) !important; } }
-
-@media screen and (max-width: 499px) {
-  .hidden-sm {
-    display: none !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .hidden-md {
-    display: none !important; } }
-@media screen and (min-width: 1280px) {
-  .hidden-lg {
-    display: none !important; } }
-@media screen and (max-width: 499px) {
-  .visually-hidden-sm {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .visually-hidden-md {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 1280px) {
-  .visually-hidden-lg {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-
-/*# sourceMappingURL=mini-default.css.map */
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/_htmresc/st_logo.png b/Drivers/BSP/STM32WLxx_Nucleo/_htmresc/st_logo.png
deleted file mode 100644
index 8b80057f..00000000
Binary files a/Drivers/BSP/STM32WLxx_Nucleo/_htmresc/st_logo.png and /dev/null differ
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c
index 1f1c1a00..eb11b906 100644
--- a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c
+++ b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c
@@ -8,13 +8,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.h b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.h
index 0b4828ad..65ff82a0 100644
--- a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.h
+++ b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -146,7 +145,7 @@ typedef enum
   * @brief STM32WLXX NUCLEO BSP Driver version number
   */
 #define __STM32WLXX_NUCLEO_BSP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __STM32WLXX_NUCLEO_BSP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __STM32WLXX_NUCLEO_BSP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __STM32WLXX_NUCLEO_BSP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __STM32WLXX_NUCLEO_BSP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */ 
 #define __STM32WLXX_NUCLEO_BSP_VERSION        ((__STM32WLXX_NUCLEO_BSP_VERSION_MAIN << 24)\
@@ -205,6 +204,7 @@ typedef enum
 #else
 #define BUTTON_SW1_EXTI_IRQn                    EXTI0_IRQn
 #endif
+#define H_EXTI_0                                hpb_exti[BUTTON_SW1]
 
 #define BUTTON_SW2_PIN                          GPIO_PIN_1
 #define BUTTON_SW2_GPIO_PORT                    GPIOA
@@ -216,6 +216,7 @@ typedef enum
 #else
 #define BUTTON_SW2_EXTI_IRQn                    EXTI1_IRQn
 #endif
+#define H_EXTI_1                                hpb_exti[BUTTON_SW2]
 
 #define BUTTON_SW3_PIN                          GPIO_PIN_6
 #define BUTTON_SW3_GPIO_PORT                    GPIOC
@@ -227,6 +228,7 @@ typedef enum
 #else
 #define BUTTON_SW3_EXTI_IRQn                    EXTI9_5_IRQn
 #endif
+#define H_EXTI_6                                hpb_exti[BUTTON_SW3]
 
 #define BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == BUTTON_SW1) BUTTON_SW1_GPIO_CLK_ENABLE(); else \
                                               if ((__INDEX__) == BUTTON_SW2) BUTTON_SW2_GPIO_CLK_ENABLE(); else \
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_conf_template.h b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_conf_template.h
index 6b8db4f7..0af7b23e 100644
--- a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_conf_template.h
+++ b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_conf_template.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -51,21 +50,6 @@
 
 /* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
 
 /**
   * @}
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_errno.h b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_errno.h
index 9993f67a..d5caa299 100644
--- a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_errno.h
+++ b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_errno.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
index e48cb2d1..5870eb2a 100644
--- a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+++ b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
@@ -8,13 +8,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -158,33 +157,28 @@ int32_t BSP_RADIO_GetTxConfig(void)
   return RADIO_CONF_RFO_LP_HP;
 }
 
-/**
-  * @brief  Get Radio Wake Time
-  * @retval the wake upt time in ms
-  */
-int32_t BSP_RADIO_GetWakeUpTime(void)
-{
-  return  RF_WAKEUP_TIME;
-}
-
 /**
   * @brief  Get If TCXO is to be present on board
-  * @note   never remove called by MW, 
-  * @retval return 1 if present, 0 if not present
+  * @note   never remove called by MW,
+  * @retval
+  *  RADIO_CONF_TCXO_NOT_SUPPORTED
+  *  RADIO_CONF_TCXO_SUPPORTED
   */
-int32_t BSP_RADIO_IsTCXO(void)  
+int32_t BSP_RADIO_IsTCXO(void)
 {
-  return IS_TCXO_SUPPORTED;
+  return RADIO_CONF_TCXO_SUPPORTED;
 }
 
 /**
   * @brief  Get If DCDC is to be present on board
-  * @note   never remove called by MW, 
-  * @retval return 1 if present, 0 if not present
+  * @note   never remove called by MW,
+  * @retval
+  *  RADIO_CONF_DCDC_NOT_SUPPORTED
+  *  RADIO_CONF_DCDC_SUPPORTED  
   */
-int32_t BSP_RADIO_IsDCDC(void)  
+int32_t BSP_RADIO_IsDCDC(void)
 {
-  return IS_DCDC_SUPPORTED;
+  return RADIO_CONF_DCDC_SUPPORTED;
 }
 
 /**
diff --git a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.h b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.h
index 0e36ad8e..b6fd9a9d 100644
--- a/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.h
+++ b/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -65,11 +64,15 @@ typedef enum
 /** @defgroup STM32WLXX_NUCLEO_RADIO_LOW_LEVEL_RADIOCONFIG RADIO LOW LEVEL RADIO CONFIG Constants
   * @{
   */ 
+#define RADIO_CONF_RFO_LP_HP                     0U
+#define RADIO_CONF_RFO_LP                        1U
+#define RADIO_CONF_RFO_HP                        2U
 
-#define RADIO_CONF_RFO_LP_HP  0
-#define RADIO_CONF_RFO_LP     1
-#define RADIO_CONF_RFO_HP     2
+#define RADIO_CONF_TCXO_NOT_SUPPORTED            0U
+#define RADIO_CONF_TCXO_SUPPORTED                1U
 
+#define RADIO_CONF_DCDC_NOT_SUPPORTED            0U
+#define RADIO_CONF_DCDC_SUPPORTED                1U
 /**
   * @}
   */ 
@@ -112,7 +115,6 @@ int32_t BSP_RADIO_Init(void);
 int32_t BSP_RADIO_DeInit(void);
 int32_t BSP_RADIO_ConfigRFSwitch(BSP_RADIO_Switch_TypeDef Config);
 int32_t BSP_RADIO_GetTxConfig(void);
-int32_t BSP_RADIO_GetWakeUpTime(void);
 int32_t BSP_RADIO_IsTCXO(void);
 int32_t BSP_RADIO_IsDCDC(void);
 
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wl54xx.h b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wl54xx.h
index 871879c1..79d05e68 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wl54xx.h
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wl54xx.h
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -206,7 +205,7 @@ typedef enum
 #define __VTOR_PRESENT            1U /*!< Vector Table Register supported               */
 #define __NVIC_PRIO_BITS          4U /*!< STM32WLxx uses 4 Bits for the Priority Levels */
 #define __Vendor_SysTickConfig    0U /*!< Set to 1 if different SysTick Config is used  */
-#define __FPU_PRESENT             0U /*!< FPU present                                   */
+#define __FPU_PRESENT             0U /*!< FPU not present                                   */
 
 #include "core_cm4.h"                /* Cortex-M4 processor and core peripherals */
 
@@ -481,7 +480,7 @@ typedef struct
 } GPIO_TypeDef;
 
 /**
-  * @brief Global TrustZone Controller
+  * @brief Global Security Controller
   */
 typedef struct{
   __IO uint32_t CR;             /*!< TZSC control register,                             Address offset: 0x00       */
@@ -1187,6 +1186,15 @@ typedef struct
 /** @addtogroup Exported_constants
   * @{
   */
+  
+/** @addtogroup Hardware_Constant_Definition
+  * @{
+  */
+#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
+
+/**
+  * @}
+  */
 
 /** @addtogroup Peripheral_Registers_Bits_Definition
   * @{
@@ -4001,7 +4009,7 @@ typedef struct
 
 /******************************************************************************/
 /*                                                                            */
-/*                        Global TrustZone Control                            */
+/*                        Global Security Control                            */
 /*                                                                            */
 /******************************************************************************/
 /*******************  Bits definition for registers x = 0  ********************/
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wl55xx.h b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wl55xx.h
index 03a4d90b..ab713b1a 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wl55xx.h
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wl55xx.h
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -206,7 +205,7 @@ typedef enum
 #define __VTOR_PRESENT            1U /*!< Vector Table Register supported               */
 #define __NVIC_PRIO_BITS          4U /*!< STM32WLxx uses 4 Bits for the Priority Levels */
 #define __Vendor_SysTickConfig    0U /*!< Set to 1 if different SysTick Config is used  */
-#define __FPU_PRESENT             0U /*!< FPU present                                   */
+#define __FPU_PRESENT             0U /*!< FPU not present                                   */
 
 #include "core_cm4.h"                /* Cortex-M4 processor and core peripherals */
 
@@ -481,7 +480,7 @@ typedef struct
 } GPIO_TypeDef;
 
 /**
-  * @brief Global TrustZone Controller
+  * @brief Global Security Controller
   */
 typedef struct{
   __IO uint32_t CR;             /*!< TZSC control register,                             Address offset: 0x00       */
@@ -1187,6 +1186,15 @@ typedef struct
 /** @addtogroup Exported_constants
   * @{
   */
+  
+/** @addtogroup Hardware_Constant_Definition
+  * @{
+  */
+#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
+
+/**
+  * @}
+  */
 
 /** @addtogroup Peripheral_Registers_Bits_Definition
   * @{
@@ -4001,7 +4009,7 @@ typedef struct
 
 /******************************************************************************/
 /*                                                                            */
-/*                        Global TrustZone Control                            */
+/*                        Global Security Control                            */
 /*                                                                            */
 /******************************************************************************/
 /*******************  Bits definition for registers x = 0  ********************/
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wle4xx.h b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wle4xx.h
index 385603ab..663a30aa 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wle4xx.h
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wle4xx.h
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -140,7 +139,7 @@ typedef enum
 #define __VTOR_PRESENT            1U /*!< Vector Table Register supported               */
 #define __NVIC_PRIO_BITS          4U /*!< STM32WLxx uses 4 Bits for the Priority Levels */
 #define __Vendor_SysTickConfig    0U /*!< Set to 1 if different SysTick Config is used  */
-#define __FPU_PRESENT             0U /*!< FPU present                                   */
+#define __FPU_PRESENT             0U /*!< FPU not present                                   */
 
 #include "core_cm4.h"                /* Cortex-M4 processor and core peripherals */
 
@@ -1005,6 +1004,15 @@ typedef struct
 /** @addtogroup Exported_constants
   * @{
   */
+  
+/** @addtogroup Hardware_Constant_Definition
+  * @{
+  */
+#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
+
+/**
+  * @}
+  */
 
 /** @addtogroup Peripheral_Registers_Bits_Definition
   * @{
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wle5xx.h b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wle5xx.h
index 5188a07b..11222589 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wle5xx.h
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wle5xx.h
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -140,7 +139,7 @@ typedef enum
 #define __VTOR_PRESENT            1U /*!< Vector Table Register supported               */
 #define __NVIC_PRIO_BITS          4U /*!< STM32WLxx uses 4 Bits for the Priority Levels */
 #define __Vendor_SysTickConfig    0U /*!< Set to 1 if different SysTick Config is used  */
-#define __FPU_PRESENT             0U /*!< FPU present                                   */
+#define __FPU_PRESENT             0U /*!< FPU not present                                   */
 
 #include "core_cm4.h"                /* Cortex-M4 processor and core peripherals */
 
@@ -1005,6 +1004,15 @@ typedef struct
 /** @addtogroup Exported_constants
   * @{
   */
+  
+/** @addtogroup Hardware_Constant_Definition
+  * @{
+  */
+#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
+
+/**
+  * @}
+  */
 
 /** @addtogroup Peripheral_Registers_Bits_Definition
   * @{
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wlxx.h b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wlxx.h
index 01e41bac..e567a16a 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wlxx.h
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/stm32wlxx.h
@@ -8,21 +8,20 @@
   *          is using in the C source code, usually in main.c. This file contains:
   *           - Configuration section that allows to select:
   *              - The STM32WLxx device used in the target application
-  *              - To use or not the peripheral�s drivers in application code(i.e.
-  *                code will be based on direct access to peripheral�s registers
+  *              - To use or not the peripheral’s drivers in application code(i.e.
+  *                code will be based on direct access to peripheral’s registers
   *                rather than drivers API), this option is controlled by
   *                "#define USE_HAL_DRIVER"
   *
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -80,7 +79,7 @@
   * @brief CMSIS Device version number
   */
 #define __STM32WLxx_CMSIS_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __STM32WLxx_CMSIS_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __STM32WLxx_CMSIS_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __STM32WLxx_CMSIS_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __STM32WLxx_CMSIS_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 #define __STM32WLxx_CMSIS_DEVICE_VERSION        ((__STM32WLxx_CMSIS_VERSION_MAIN << 24)\
@@ -157,9 +156,105 @@ typedef enum
 #define MODIFY_REG(REG, CLEARMASK, SETMASK)  WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK)))
 
 #if defined(CORE_CM0PLUS)
+/* Use of interrupt control for register exclusive access (privileged mode only) */
+/* Atomic 32-bit register access macro to set one or several bits */
+#define ATOMIC_SET_BIT(REG, BIT) \
+  do {                           \
+    uint32_t primask;            \
+    primask = __get_PRIMASK();   \
+    __set_PRIMASK(1);            \
+    SET_BIT((REG), (BIT));       \
+    __set_PRIMASK(primask);      \
+  } while(0)
+
+/* Atomic 32-bit register access macro to clear one or several bits */
+#define ATOMIC_CLEAR_BIT(REG, BIT) \
+  do {                             \
+    uint32_t primask;              \
+    primask = __get_PRIMASK();     \
+    __set_PRIMASK(1);              \
+    CLEAR_BIT((REG), (BIT));       \
+    __set_PRIMASK(primask);        \
+  } while(0)
+
+/* Atomic 32-bit register access macro to clear and set one or several bits */
+#define ATOMIC_MODIFY_REG(REG, CLEARMSK, SETMASK) \
+  do {                                            \
+    uint32_t primask;                             \
+    primask = __get_PRIMASK();                    \
+    __set_PRIMASK(1);                             \
+    MODIFY_REG((REG), (CLEARMSK), (SETMASK));     \
+    __set_PRIMASK(primask);                       \
+  } while(0)
+
+/* Atomic 16-bit register access macro to set one or several bits */
+#define ATOMIC_SETH_BIT(REG, BIT)   ATOMIC_SET_BIT(REG, BIT)
+
+/* Atomic 16-bit register access macro to clear one or several bits */
+#define ATOMIC_CLEARH_BIT(REG, BIT) ATOMIC_CLEAR_BIT(REG, BIT)
+
+/* Atomic 16-bit register access macro to clear and set one or several bits */
+#define ATOMIC_MODIFYH_REG(REG, CLEARMSK, SETMASK) ATOMIC_MODIFY_REG(REG, CLEARMSK, SETMASK)
+
 #else
+/* Use of CMSIS compiler intrinsics for register exclusive access */
+/* Atomic 32-bit register access macro to set one or several bits */
+#define ATOMIC_SET_BIT(REG, BIT)                             \
+  do {                                                       \
+    uint32_t val;                                            \
+    do {                                                     \
+      val = __LDREXW((__IO uint32_t *)&(REG)) | (BIT);       \
+    } while ((__STREXW(val,(__IO uint32_t *)&(REG))) != 0U); \
+  } while(0)
+
+/* Atomic 32-bit register access macro to clear one or several bits */
+#define ATOMIC_CLEAR_BIT(REG, BIT)                           \
+  do {                                                       \
+    uint32_t val;                                            \
+    do {                                                     \
+      val = __LDREXW((__IO uint32_t *)&(REG)) & ~(BIT);      \
+    } while ((__STREXW(val,(__IO uint32_t *)&(REG))) != 0U); \
+  } while(0)
+
+/* Atomic 32-bit register access macro to clear and set one or several bits */
+#define ATOMIC_MODIFY_REG(REG, CLEARMSK, SETMASK)                          \
+  do {                                                                     \
+    uint32_t val;                                                          \
+    do {                                                                   \
+      val = (__LDREXW((__IO uint32_t *)&(REG)) & ~(CLEARMSK)) | (SETMASK); \
+    } while ((__STREXW(val,(__IO uint32_t *)&(REG))) != 0U);               \
+  } while(0)
+
+/* Atomic 16-bit register access macro to set one or several bits */
+#define ATOMIC_SETH_BIT(REG, BIT)                            \
+  do {                                                       \
+    uint16_t val;                                            \
+    do {                                                     \
+      val = __LDREXH((__IO uint16_t *)&(REG)) | (BIT);       \
+    } while ((__STREXH(val,(__IO uint16_t *)&(REG))) != 0U); \
+  } while(0)
+
+/* Atomic 16-bit register access macro to clear one or several bits */
+#define ATOMIC_CLEARH_BIT(REG, BIT)                          \
+  do {                                                       \
+    uint16_t val;                                            \
+    do {                                                     \
+      val = __LDREXH((__IO uint16_t *)&(REG)) & ~(BIT);      \
+    } while ((__STREXH(val,(__IO uint16_t *)&(REG))) != 0U); \
+  } while(0)
+
+/* Atomic 16-bit register access macro to clear and set one or several bits */
+#define ATOMIC_MODIFYH_REG(REG, CLEARMSK, SETMASK)                         \
+  do {                                                                     \
+    uint16_t val;                                                          \
+    do {                                                                   \
+      val = (__LDREXH((__IO uint16_t *)&(REG)) & ~(CLEARMSK)) | (SETMASK); \
+    } while ((__STREXH(val,(__IO uint16_t *)&(REG))) != 0U);               \
+  } while(0)
+
 #define POSITION_VAL(VAL)     (__CLZ(__RBIT(VAL)))
-#endif
+#endif /* CORE_CM0PLUS */
+
 /**
   * @}
   */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/system_stm32wlxx.h b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/system_stm32wlxx.h
index 3c435c52..b2953062 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Include/system_stm32wlxx.h
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Include/system_stm32wlxx.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/LICENSE.md b/Drivers/CMSIS/Device/ST/STM32WLxx/LICENSE.md
new file mode 100644
index 00000000..261eeb9e
--- /dev/null
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/LICENSE.md
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/License.md b/Drivers/CMSIS/Device/ST/STM32WLxx/License.md
deleted file mode 100644
index e0d829b6..00000000
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/License.md
+++ /dev/null
@@ -1,83 +0,0 @@
-Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-1.You must give any other recipients of the Work or Derivative Works a copy of this License; and
-2.You must cause any modified files to carry prominent notices stating that You changed the files; and
-3.You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-4.If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX:
-
-   Copyright [2019] [STMicroelectronics]
-
-   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.
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/README.md b/Drivers/CMSIS/Device/ST/STM32WLxx/README.md
index 0ada244a..f6054e58 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/README.md
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/README.md
@@ -1,5 +1,7 @@
 # STM32CubeWL CMSIS Device MCU Component
 
+![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/cmsis_device_wl.svg?color=brightgreen)
+
 ## Overview
 
 **STM32Cube** is an STMicroelectronics original initiative to ease the developers life by reducing efforts, time and cost.
@@ -30,6 +32,7 @@ In this table, you can find the successive versions of this CMSIS Device compone
 CMSIS Device WL | CMSIS Core | Was delivered in the full MCU package
 --------------- | ---------- | -------------------------------------
 Tag v1.0.0 | Tag v5.6.0_cm4 | Tag v1.0.0
+Tag v1.1.0 | Tag v5.6.0_cm4 | Tag v1.1.0
 
 
 The full **STM32CubeWL** MCU package is available [here](https://github.com/STMicroelectronics/STM32CubeWL).
@@ -37,4 +40,4 @@ The full **STM32CubeWL** MCU package is available [here](https://github.com/STMi
 ## Troubleshooting
 If you have any issue with the **Software content** of this repo, you can [file an issue on Github](https://github.com/STMicroelectronics/cmsis_device_wl/issues/new).
 
-For any other question related to the product, the tools, the environment, you can submit a topic on the [ST Community/STM32 MCUs forum](https://community.st.com/s/group/0F90X000000AXsASAW/stm32-mcus).
\ No newline at end of file
+For any other question related to the product, the tools, the environment, you can submit a topic on the [ST Community/STM32 MCUs forum](https://community.st.com/s/topic/0TO0X000000BSqSWAW/stm32-mcus).
\ No newline at end of file
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Release_Notes.html b/Drivers/CMSIS/Device/ST/STM32WLxx/Release_Notes.html
index 61c2cad4..5d2bfe46 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Release_Notes.html
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Release_Notes.html
@@ -21,14 +21,12 @@
 <div class="row">
 <div class="col-sm-12 col-lg-4">
 <center>
-<h1 id="release-notes-for-stm32wlxx-cmsis">Release Notes for <mark>STM32WLxx CMSIS</mark></h1>
+<h1 id="release-notes-for">Release Notes for</h1>
+<h1 id="stm32wlxx-cmsis"><mark>STM32WLxx CMSIS</mark></h1>
 <p>Copyright © 2020 STMicroelectronics<br />
 </p>
 <a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
-<h1 id="license">License</h1>
-<p>This software component is licensed by ST under Apache-2.0 license, the “License”; You may not use this component except in compliance with the License. You may obtain a copy of the License at:</p>
-<p><a href="https://opensource.org/licenses/Apache-2.0">Apache-2.0</a></p>
 <h1 id="purpose">Purpose</h1>
 <p>This driver provides the CMSIS device for the stm32WLxx products. This covers</p>
 <ul>
@@ -48,12 +46,18 @@ <h1 id="purpose">Purpose</h1>
 <div class="col-sm-12 col-lg-8">
 <h1 id="update-history">Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section1" checked aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<input type="checkbox" id="collapse-section2" checked aria-hidden="true"> <label for="collapse-section2" aria-hidden="true"><strong>V1.1.0 / 16-June-2021</strong></label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
-<p><strong>First Official Release</strong></p>
-<h2 id="contents">Contents</h2>
-<p>First official release of CMSIS drivers for STM32WLxx lines</p>
+<ul>
+<li>Add atomic register access services:
+<ul>
+<li>32-bit register access: ATOMIC_SET_BIT(), ATOMIC_CLEAR_BIT(), ATOMIC_MODIFY_REG()</li>
+<li>16-bit register access: ATOMIC_SETH_BIT(), ATOMIC_CLEARH_BIT(), ATOMIC_MODIFYH_BIT()</li>
+</ul></li>
+<li>Add define LSI_STARTUP_TIME used in default IWDG timeout calculation (HAL_IWDG_DEFAULT_TIMEOUT)</li>
+<li>Add reference to user manual for customization of CubeIDE linker files</li>
+</ul>
 <h2 id="known-limitations">Known Limitations</h2>
 <p>None</p>
 <h2 id="dependencies">Dependencies</h2>
@@ -62,6 +66,21 @@ <h2 id="notes">Notes</h2>
 <p>None</p>
 </div>
 </div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<p><strong>First Official Release</strong></p>
+<h2 id="contents">Contents</h2>
+<p>First official release of CMSIS drivers for STM32WLxx lines</p>
+<h2 id="known-limitations-1">Known Limitations</h2>
+<p>None</p>
+<h2 id="dependencies-1">Dependencies</h2>
+<p>None</p>
+<h2 id="notes-1">Notes</h2>
+<p>None</p>
+</div>
+</div>
 </div>
 </div>
 <footer class="sticky">
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl54xx_cm0plus.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl54xx_cm0plus.s
index cda971b7..3bbcdc31 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl54xx_cm0plus.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl54xx_cm0plus.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl54xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl54xx_cm4.s
index e4aa2b70..cf46ac5e 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl54xx_cm4.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl54xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl55xx_cm0plus.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl55xx_cm0plus.s
index 871df1a9..cc6430f1 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl55xx_cm0plus.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl55xx_cm0plus.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl55xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl55xx_cm4.s
index 8353c59c..f6c328fe 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl55xx_cm4.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle4xx.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle4xx.s
index 92c20cb8..6ca5766b 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle4xx.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle4xx.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s
index 836f2c03..512dd626 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL54XX_FLASH_CM0PLUS.ld b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL54XX_FLASH_CM0PLUS.ld
index d9932257..b2f00bf6 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL54XX_FLASH_CM0PLUS.ld
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL54XX_FLASH_CM0PLUS.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL54XX_FLASH_CM4.ld b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL54XX_FLASH_CM4.ld
index d83c02ca..26d8eae5 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL54XX_FLASH_CM4.ld
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL54XX_FLASH_CM4.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL55XX_FLASH_CM0PLUS.ld b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL55XX_FLASH_CM0PLUS.ld
index d9932257..b2f00bf6 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL55XX_FLASH_CM0PLUS.ld
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL55XX_FLASH_CM0PLUS.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL55XX_FLASH_CM4.ld b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL55XX_FLASH_CM4.ld
index d83c02ca..26d8eae5 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL55XX_FLASH_CM4.ld
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WL55XX_FLASH_CM4.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WLE4XX_FLASH.ld b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WLE4XX_FLASH.ld
index 5e48259f..631b77d9 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WLE4XX_FLASH.ld
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WLE4XX_FLASH.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WLE5XX_FLASH.ld b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WLE5XX_FLASH.ld
index 5e48259f..631b77d9 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WLE5XX_FLASH.ld
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/linker/STM32WLE5XX_FLASH.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl54xx_cm0plus.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl54xx_cm0plus.s
index d01109a5..2b1cac44 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl54xx_cm0plus.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl54xx_cm0plus.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl54xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl54xx_cm4.s
index 5c98e4e1..4b46f033 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl54xx_cm4.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl54xx_cm4.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl55xx_cm0plus.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl55xx_cm0plus.s
index 9e23530f..55cfe378 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl55xx_cm0plus.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl55xx_cm0plus.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl55xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl55xx_cm4.s
index 89dfe9e5..80ba57c9 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl55xx_cm4.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wl55xx_cm4.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle4xx.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle4xx.s
index df014395..77303d30 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle4xx.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle4xx.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s
index ad52fd83..8811a8a0 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl54xx_cm0plus.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl54xx_cm0plus.s
index 49774c70..6b595590 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl54xx_cm0plus.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl54xx_cm0plus.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl54xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl54xx_cm4.s
index 39d1eb27..3c5af0fb 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl54xx_cm4.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl54xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl55xx_cm0plus.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl55xx_cm0plus.s
index a6cf0145..cd6560d5 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl55xx_cm0plus.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl55xx_cm0plus.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl55xx_cm4.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl55xx_cm4.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle4xx.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle4xx.s
index 0072684f..378328d1 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle4xx.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle4xx.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s
index 341ee9ea..d8367da1 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c
+++ b/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/_htmresc/mini-st.css b/Drivers/CMSIS/Device/ST/STM32WLxx/_htmresc/mini-st.css
deleted file mode 100644
index eb41d56c..00000000
--- a/Drivers/CMSIS/Device/ST/STM32WLxx/_htmresc/mini-st.css
+++ /dev/null
@@ -1,1700 +0,0 @@
-@charset "UTF-8";
-/*
-  Flavor name: Default (mini-default)
-  Author: Angelos Chalaris (chalarangelo@gmail.com)
-  Maintainers: Angelos Chalaris
-  mini.css version: v3.0.0-alpha.3
-*/
-/*
-  Browsers resets and base typography.
-*/
-/* Core module CSS variable definitions */
-:root {
-  --fore-color: #111;
-  --secondary-fore-color: #444;
-  --back-color: #f8f8f8;
-  --secondary-back-color: #f0f0f0;
-  --blockquote-color: #f57c00;
-  --pre-color: #1565c0;
-  --border-color: #aaa;
-  --secondary-border-color: #ddd;
-  --heading-ratio: 1.19;
-  --universal-margin: 0.5rem;
-  --universal-padding: 0.125rem;
-  --universal-border-radius: 0.125rem;
-  --a-link-color: #0277bd;
-  --a-visited-color: #01579b; }
-
-html {
-  font-size: 14px; }
-
-a, b, del, em, i, ins, q, span, strong, u {
-  font-size: 1em; }
-
-html, * {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Helvetica, sans-serif;
-  line-height: 1.4;
-  -webkit-text-size-adjust: 100%; }
-
-* {
-  font-size: 1rem; }
-
-body {
-  margin: 0;
-  color: var(--fore-color);
-  background: var(--back-color); }
-
-details {
-  display: block; }
-
-summary {
-  display: list-item; }
-
-abbr[title] {
-  border-bottom: none;
-  text-decoration: underline dotted; }
-
-input {
-  overflow: visible; }
-
-img {
-  max-width: 100%;
-  height: auto; }
-
-h1, h2, h3, h4, h5, h6 {
-  line-height: 1.2;
-  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  font-weight: 500; }
-  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-    color: var(--secondary-fore-color);
-    display: block;
-    margin-top: -0.25rem; }
-
-h1 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
-
-h2 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio); );
-  background: var(--mark-back-color);
-  font-weight: 600;
-  padding: 0.1em 0.5em 0.2em 0.5em;
-  color: var(--mark-fore-color); }
-
-h3 {
-  font-size: calc(1rem * var(--heading-ratio));
-  padding-left: calc(2 * var(--universal-margin)); 
-  /* background: var(--border-color); */
-    }
-
-h4 {
-  font-size: 1rem;);
-  padding-left: calc(4 * var(--universal-margin));  }
-
-h5 {
-  font-size: 1rem; }
-
-h6 {
-  font-size: calc(1rem / var(--heading-ratio)); }
-
-p {
-  margin: var(--universal-margin); }
-
-ol, ul {
-  margin: var(--universal-margin);
-  padding-left: calc(6 * var(--universal-margin)); }
-
-b, strong {
-  font-weight: 700; }
-
-hr {
-  box-sizing: content-box;
-  border: 0;
-  line-height: 1.25em;
-  margin: var(--universal-margin);
-  height: 0.0625rem;
-  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
-
-blockquote {
-  display: block;
-  position: relative;
-  font-style: italic;
-  color: var(--secondary-fore-color);
-  margin: var(--universal-margin);
-  padding: calc(3 * var(--universal-padding));
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.375rem solid var(--blockquote-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-  blockquote:before {
-    position: absolute;
-    top: calc(0rem - var(--universal-padding));
-    left: 0;
-    font-family: sans-serif;
-    font-size: 3rem;
-    font-weight: 700;
-    content: "\201c";
-    color: var(--blockquote-color); }
-  blockquote[cite]:after {
-    font-style: normal;
-    font-size: 0.75em;
-    font-weight: 700;
-    content: "\a—  " attr(cite);
-    white-space: pre; }
-
-code, kbd, pre, samp {
-  font-family: Menlo, Consolas, monospace;
-  font-size: 0.85em; }
-
-code {
-  background: var(--secondary-back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-kbd {
-  background: var(--fore-color);
-  color: var(--back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-pre {
-  overflow: auto;
-  background: var(--secondary-back-color);
-  padding: calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.25rem solid var(--pre-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-
-sup, sub, code, kbd {
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
-small, sup, sub, figcaption {
-  font-size: 0.75em; }
-
-sup {
-  top: -0.5em; }
-
-sub {
-  bottom: -0.25em; }
-
-figure {
-  margin: var(--universal-margin); }
-
-figcaption {
-  color: var(--secondary-fore-color); }
-
-a {
-  text-decoration: none; }
-  a:link {
-    color: var(--a-link-color); }
-  a:visited {
-    color: var(--a-visited-color); }
-  a:hover, a:focus {
-    text-decoration: underline; }
-
-/*
-  Definitions for the grid system, cards and containers.
-*/
-.container {
-  margin: 0 auto;
-  padding: 0 calc(1.5 * var(--universal-padding)); }
-
-.row {
-  box-sizing: border-box;
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap; }
-
-.col-sm,
-[class^='col-sm-'],
-[class^='col-sm-offset-'],
-.row[class*='cols-sm-'] > * {
-  box-sizing: border-box;
-  flex: 0 0 auto;
-  padding: 0 calc(var(--universal-padding) / 2); }
-
-.col-sm,
-.row.cols-sm > * {
-  max-width: 100%;
-  flex-grow: 1;
-  flex-basis: 0; }
-
-.col-sm-1,
-.row.cols-sm-1 > * {
-  max-width: 8.3333333333%;
-  flex-basis: 8.3333333333%; }
-
-.col-sm-offset-0 {
-  margin-left: 0; }
-
-.col-sm-2,
-.row.cols-sm-2 > * {
-  max-width: 16.6666666667%;
-  flex-basis: 16.6666666667%; }
-
-.col-sm-offset-1 {
-  margin-left: 8.3333333333%; }
-
-.col-sm-3,
-.row.cols-sm-3 > * {
-  max-width: 25%;
-  flex-basis: 25%; }
-
-.col-sm-offset-2 {
-  margin-left: 16.6666666667%; }
-
-.col-sm-4,
-.row.cols-sm-4 > * {
-  max-width: 33.3333333333%;
-  flex-basis: 33.3333333333%; }
-
-.col-sm-offset-3 {
-  margin-left: 25%; }
-
-.col-sm-5,
-.row.cols-sm-5 > * {
-  max-width: 41.6666666667%;
-  flex-basis: 41.6666666667%; }
-
-.col-sm-offset-4 {
-  margin-left: 33.3333333333%; }
-
-.col-sm-6,
-.row.cols-sm-6 > * {
-  max-width: 50%;
-  flex-basis: 50%; }
-
-.col-sm-offset-5 {
-  margin-left: 41.6666666667%; }
-
-.col-sm-7,
-.row.cols-sm-7 > * {
-  max-width: 58.3333333333%;
-  flex-basis: 58.3333333333%; }
-
-.col-sm-offset-6 {
-  margin-left: 50%; }
-
-.col-sm-8,
-.row.cols-sm-8 > * {
-  max-width: 66.6666666667%;
-  flex-basis: 66.6666666667%; }
-
-.col-sm-offset-7 {
-  margin-left: 58.3333333333%; }
-
-.col-sm-9,
-.row.cols-sm-9 > * {
-  max-width: 75%;
-  flex-basis: 75%; }
-
-.col-sm-offset-8 {
-  margin-left: 66.6666666667%; }
-
-.col-sm-10,
-.row.cols-sm-10 > * {
-  max-width: 83.3333333333%;
-  flex-basis: 83.3333333333%; }
-
-.col-sm-offset-9 {
-  margin-left: 75%; }
-
-.col-sm-11,
-.row.cols-sm-11 > * {
-  max-width: 91.6666666667%;
-  flex-basis: 91.6666666667%; }
-
-.col-sm-offset-10 {
-  margin-left: 83.3333333333%; }
-
-.col-sm-12,
-.row.cols-sm-12 > * {
-  max-width: 100%;
-  flex-basis: 100%; }
-
-.col-sm-offset-11 {
-  margin-left: 91.6666666667%; }
-
-.col-sm-normal {
-  order: initial; }
-
-.col-sm-first {
-  order: -999; }
-
-.col-sm-last {
-  order: 999; }
-
-@media screen and (min-width: 500px) {
-  .col-md,
-  [class^='col-md-'],
-  [class^='col-md-offset-'],
-  .row[class*='cols-md-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-md,
-  .row.cols-md > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-md-1,
-  .row.cols-md-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-md-offset-0 {
-    margin-left: 0; }
-
-  .col-md-2,
-  .row.cols-md-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-md-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-md-3,
-  .row.cols-md-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-md-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-md-4,
-  .row.cols-md-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-md-offset-3 {
-    margin-left: 25%; }
-
-  .col-md-5,
-  .row.cols-md-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-md-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-md-6,
-  .row.cols-md-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-md-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-md-7,
-  .row.cols-md-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-md-offset-6 {
-    margin-left: 50%; }
-
-  .col-md-8,
-  .row.cols-md-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-md-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-md-9,
-  .row.cols-md-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-md-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-md-10,
-  .row.cols-md-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-md-offset-9 {
-    margin-left: 75%; }
-
-  .col-md-11,
-  .row.cols-md-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-md-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-md-12,
-  .row.cols-md-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-md-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-md-normal {
-    order: initial; }
-
-  .col-md-first {
-    order: -999; }
-
-  .col-md-last {
-    order: 999; } }
-@media screen and (min-width: 1280px) {
-  .col-lg,
-  [class^='col-lg-'],
-  [class^='col-lg-offset-'],
-  .row[class*='cols-lg-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-lg,
-  .row.cols-lg > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-lg-1,
-  .row.cols-lg-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-lg-offset-0 {
-    margin-left: 0; }
-
-  .col-lg-2,
-  .row.cols-lg-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-lg-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-lg-3,
-  .row.cols-lg-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-lg-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-lg-4,
-  .row.cols-lg-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-lg-offset-3 {
-    margin-left: 25%; }
-
-  .col-lg-5,
-  .row.cols-lg-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-lg-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-lg-6,
-  .row.cols-lg-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-lg-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-lg-7,
-  .row.cols-lg-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-lg-offset-6 {
-    margin-left: 50%; }
-
-  .col-lg-8,
-  .row.cols-lg-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-lg-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-lg-9,
-  .row.cols-lg-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-lg-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-lg-10,
-  .row.cols-lg-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-lg-offset-9 {
-    margin-left: 75%; }
-
-  .col-lg-11,
-  .row.cols-lg-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-lg-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-lg-12,
-  .row.cols-lg-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-lg-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-lg-normal {
-    order: initial; }
-
-  .col-lg-first {
-    order: -999; }
-
-  .col-lg-last {
-    order: 999; } }
-/* Card component CSS variable definitions */
-:root {
-  --card-back-color: #f8f8f8;
-  --card-fore-color: #111;
-  --card-border-color: #ddd; }
-
-.card {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-self: center;
-  position: relative;
-  width: 100%;
-  background: var(--card-back-color);
-  color: var(--card-fore-color);
-  border: 0.0625rem solid var(--card-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  overflow: hidden; }
-  @media screen and (min-width: 320px) {
-    .card {
-      max-width: 320px; } }
-  .card > .sectione {
-    background: var(--card-back-color);
-    color: var(--card-fore-color);
-    box-sizing: border-box;
-    margin: 0;
-    border: 0;
-    border-radius: 0;
-    border-bottom: 0.0625rem solid var(--card-border-color);
-    padding: var(--universal-padding);
-    width: 100%; }
-    .card > .sectione.media {
-      height: 200px;
-      padding: 0;
-      -o-object-fit: cover;
-      object-fit: cover; }
-  .card > .sectione:last-child {
-    border-bottom: 0; }
-
-/*
-  Custom elements for card elements.
-*/
-@media screen and (min-width: 240px) {
-  .card.small {
-    max-width: 240px; } }
-@media screen and (min-width: 480px) {
-  .card.large {
-    max-width: 480px; } }
-.card.fluid {
-  max-width: 100%;
-  width: auto; }
-
-.card.warning {
-/*  --card-back-color: #ffca28; */
-  --card-back-color: #e5b8b7;
-  --card-border-color: #e8b825; }
-
-.card.error {
-  --card-back-color: #b71c1c;
-  --card-fore-color: #f8f8f8;
-  --card-border-color: #a71a1a; }
-
-.card > .sectione.dark {
-  --card-back-color: #e0e0e0; }
-
-.card > .sectione.double-padded {
-  padding: calc(1.5 * var(--universal-padding)); }
-
-/*
-  Definitions for forms and input elements.
-*/
-/* Input_control module CSS variable definitions */
-:root {
-  --form-back-color: #f0f0f0;
-  --form-fore-color: #111;
-  --form-border-color: #ddd;
-  --input-back-color: #f8f8f8;
-  --input-fore-color: #111;
-  --input-border-color: #ddd;
-  --input-focus-color: #0288d1;
-  --input-invalid-color: #d32f2f;
-  --button-back-color: #e2e2e2;
-  --button-hover-back-color: #dcdcdc;
-  --button-fore-color: #212121;
-  --button-border-color: transparent;
-  --button-hover-border-color: transparent;
-  --button-group-border-color: rgba(124, 124, 124, 0.54); }
-
-form {
-  background: var(--form-back-color);
-  color: var(--form-fore-color);
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
-
-fieldset {
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 4);
-  padding: var(--universal-padding); }
-
-legend {
-  box-sizing: border-box;
-  display: table;
-  max-width: 100%;
-  white-space: normal;
-  font-weight: 700;
-  padding: calc(var(--universal-padding) / 2); }
-
-label {
-  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-.input-group {
-  display: inline-block; }
-  .input-group.fluid {
-    display: flex;
-    align-items: center;
-    justify-content: center; }
-    .input-group.fluid > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-    @media screen and (max-width: 499px) {
-      .input-group.fluid {
-        align-items: stretch;
-        flex-direction: column; } }
-  .input-group.vertical {
-    display: flex;
-    align-items: stretch;
-    flex-direction: column; }
-    .input-group.vertical > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-
-[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
-  height: auto; }
-
-[type="search"] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px; }
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
-
-input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
-[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
-  box-sizing: border-box;
-  background: var(--input-back-color);
-  color: var(--input-fore-color);
-  border: 0.0625rem solid var(--input-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 2);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
-  border-color: var(--input-focus-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
-  border-color: var(--input-invalid-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
-  background: var(--secondary-back-color); }
-
-select {
-  max-width: 100%; }
-
-option {
-  overflow: hidden;
-  text-overflow: ellipsis; }
-
-[type="checkbox"], [type="radio"] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  position: relative;
-  height: calc(1rem + var(--universal-padding) / 2);
-  width: calc(1rem + var(--universal-padding) / 2);
-  vertical-align: text-bottom;
-  padding: 0;
-  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
-  flex-grow: 0 !important; }
-  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
-    position: absolute; }
-
-[type="checkbox"]:checked:before {
-  content: '\2713';
-  font-family: sans-serif;
-  font-size: calc(1rem + var(--universal-padding) / 2);
-  top: calc(0rem - var(--universal-padding));
-  left: calc(var(--universal-padding) / 4); }
-
-[type="radio"] {
-  border-radius: 100%; }
-  [type="radio"]:checked:before {
-    border-radius: 100%;
-    content: '';
-    top: calc(0.0625rem + var(--universal-padding) / 2);
-    left: calc(0.0625rem + var(--universal-padding) / 2);
-    background: var(--input-fore-color);
-    width: 0.5rem;
-    height: 0.5rem; }
-
-:placeholder-shown {
-  color: var(--input-fore-color); }
-
-::-ms-placeholder {
-  color: var(--input-fore-color);
-  opacity: 0.54; }
-
-button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-button, html [type="button"], [type="reset"], [type="submit"] {
-  -webkit-appearance: button; }
-
-button {
-  overflow: visible;
-  text-transform: none; }
-
-button, [type="button"], [type="submit"], [type="reset"],
-a.button, label.button, .button,
-a[role="button"], label[role="button"], [role="button"] {
-  display: inline-block;
-  background: var(--button-back-color);
-  color: var(--button-fore-color);
-  border: 0.0625rem solid var(--button-border-color);
-  border-radius: var(--universal-border-radius);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  text-decoration: none;
-  cursor: pointer;
-  transition: background 0.3s; }
-  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
-  a.button:hover,
-  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
-  a[role="button"]:hover,
-  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
-    background: var(--button-hover-back-color);
-    border-color: var(--button-hover-border-color); }
-
-input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
-  cursor: not-allowed;
-  opacity: 0.75; }
-
-.button-group {
-  display: flex;
-  border: 0.0625rem solid var(--button-group-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
-    margin: 0;
-    max-width: 100%;
-    flex: 1 1 auto;
-    text-align: center;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none; }
-  .button-group > :not(:first-child) {
-    border-left: 0.0625rem solid var(--button-group-border-color); }
-  @media screen and (max-width: 499px) {
-    .button-group {
-      flex-direction: column; }
-      .button-group > :not(:first-child) {
-        border: 0;
-        border-top: 0.0625rem solid var(--button-group-border-color); } }
-
-/*
-  Custom elements for forms and input elements.
-*/
-button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
-  --button-back-color: #1976d2;
-  --button-fore-color: #f8f8f8; }
-  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
-    --button-hover-back-color: #1565c0; }
-
-button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
-  --button-back-color: #d32f2f;
-  --button-fore-color: #f8f8f8; }
-  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
-    --button-hover-back-color: #c62828; }
-
-button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
-  --button-back-color: #308732;
-  --button-fore-color: #f8f8f8; }
-  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
-    --button-hover-back-color: #277529; }
-
-button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
-  --button-back-color: #212121;
-  --button-fore-color: #f8f8f8; }
-  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
-    --button-hover-back-color: #111; }
-
-button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
-  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
-  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-/*
-  Definitions for navigation elements.
-*/
-/* Navigation module CSS variable definitions */
-:root {
-  --header-back-color: #f8f8f8;
-  --header-hover-back-color: #f0f0f0;
-  --header-fore-color: #444;
-  --header-border-color: #ddd;
-  --nav-back-color: #f8f8f8;
-  --nav-hover-back-color: #f0f0f0;
-  --nav-fore-color: #444;
-  --nav-border-color: #ddd;
-  --nav-link-color: #0277bd;
-  --footer-fore-color: #444;
-  --footer-back-color: #f8f8f8;
-  --footer-border-color: #ddd;
-  --footer-link-color: #0277bd;
-  --drawer-back-color: #f8f8f8;
-  --drawer-hover-back-color: #f0f0f0;
-  --drawer-border-color: #ddd;
-  --drawer-close-color: #444; }
-
-header {
-  height: 3.1875rem;
-  background: var(--header-back-color);
-  color: var(--header-fore-color);
-  border-bottom: 0.0625rem solid var(--header-border-color);
-  padding: calc(var(--universal-padding) / 4) 0;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden; }
-  header.row {
-    box-sizing: content-box; }
-  header .logo {
-    color: var(--header-fore-color);
-    font-size: 1.75rem;
-    padding: var(--universal-padding) calc(2 * var(--universal-padding));
-    text-decoration: none; }
-  header button, header [type="button"], header .button, header [role="button"] {
-    box-sizing: border-box;
-    position: relative;
-    top: calc(0rem - var(--universal-padding) / 4);
-    height: calc(3.1875rem + var(--universal-padding) / 2);
-    background: var(--header-back-color);
-    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
-    text-align: center;
-    color: var(--header-fore-color);
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-    text-transform: uppercase; }
-    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
-      background: var(--header-hover-back-color); }
-
-nav {
-  background: var(--nav-back-color);
-  color: var(--nav-fore-color);
-  border: 0.0625rem solid var(--nav-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  nav * {
-    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-  nav a, nav a:visited {
-    display: block;
-    color: var(--nav-link-color);
-    border-radius: var(--universal-border-radius);
-    transition: background 0.3s; }
-    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
-      text-decoration: none;
-      background: var(--nav-hover-back-color); }
-  nav .sublink-1 {
-    position: relative;
-    margin-left: calc(2 * var(--universal-padding)); }
-    nav .sublink-1:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-  nav .sublink-2 {
-    position: relative;
-    margin-left: calc(4 * var(--universal-padding)); }
-    nav .sublink-2:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-
-footer {
-  background: var(--footer-back-color);
-  color: var(--footer-fore-color);
-  border-top: 0.0625rem solid var(--footer-border-color);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
-  font-size: 0.875rem; }
-  footer a, footer a:visited {
-    color: var(--footer-link-color); }
-
-header.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  top: 0; }
-
-footer.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  bottom: 0; }
-
-.drawer-toggle:before {
-  display: inline-block;
-  position: relative;
-  vertical-align: bottom;
-  content: '\00a0\2261\00a0';
-  font-family: sans-serif;
-  font-size: 1.5em; }
-@media screen and (min-width: 500px) {
-  .drawer-toggle:not(.persistent) {
-    display: none; } }
-
-[type="checkbox"].drawer {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].drawer + * {
-    display: block;
-    box-sizing: border-box;
-    position: fixed;
-    top: 0;
-    width: 320px;
-    height: 100vh;
-    overflow-y: auto;
-    background: var(--drawer-back-color);
-    border: 0.0625rem solid var(--drawer-border-color);
-    border-radius: 0;
-    margin: 0;
-    z-index: 1110;
-    right: -320px;
-    transition: right 0.3s; }
-    [type="checkbox"].drawer + * .drawer-close {
-      position: absolute;
-      top: var(--universal-margin);
-      right: var(--universal-margin);
-      z-index: 1111;
-      width: 2rem;
-      height: 2rem;
-      border-radius: var(--universal-border-radius);
-      padding: var(--universal-padding);
-      margin: 0;
-      cursor: pointer;
-      transition: background 0.3s; }
-      [type="checkbox"].drawer + * .drawer-close:before {
-        display: block;
-        content: '\00D7';
-        color: var(--drawer-close-color);
-        position: relative;
-        font-family: sans-serif;
-        font-size: 2rem;
-        line-height: 1;
-        text-align: center; }
-      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
-        background: var(--drawer-hover-back-color); }
-    @media screen and (max-width: 320px) {
-      [type="checkbox"].drawer + * {
-        width: 100%; } }
-  [type="checkbox"].drawer:checked + * {
-    right: 0; }
-  @media screen and (min-width: 500px) {
-    [type="checkbox"].drawer:not(.persistent) + * {
-      position: static;
-      height: 100%;
-      z-index: 1100; }
-      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
-        display: none; } }
-
-/*
-  Definitions for the responsive table component.
-*/
-/* Table module CSS variable definitions. */
-:root {
-  --table-border-color: #aaa;
-  --table-border-separator-color: #666;
-  --table-head-back-color: #e6e6e6;
-  --table-head-fore-color: #111;
-  --table-body-back-color: #f8f8f8;
-  --table-body-fore-color: #111;
-  --table-body-alt-back-color: #eee; }
-
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  : margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap;
-  padding: var(--universal-padding);
-  padding-top: 0;
-	margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);	}
-  table caption {
-    font-size: 1.25 * rem;
-    margin: calc(2 * var(--universal-margin)) 0;
-    max-width: 100%;
-    flex: 0 0 100%;
-		text-align: left;}
-  table thead, table tbody {
-    display: flex;
-    flex-flow: row wrap;
-    border: 0.0625rem solid var(--table-border-color); }
-  table thead {
-    z-index: 999;
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
-    border-bottom: 0.0625rem solid var(--table-border-separator-color); }
-  table tbody {
-    border-top: 0;
-    margin-top: calc(0 - var(--universal-margin));
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  table tr {
-    display: flex;
-    padding: 0; }
-  table th, table td {
-    padding: calc(0.5 * var(--universal-padding));
-		font-size: 0.9rem; }
-  table th {
-    text-align: left;
-    background: var(--table-head-back-color);
-    color: var(--table-head-fore-color); }
-  table td {
-    background: var(--table-body-back-color);
-    color: var(--table-body-fore-color);
-    border-top: 0.0625rem solid var(--table-border-color); }
-
-table:not(.horizontal) {
-  overflow: auto;
-  max-height: 850px; }
-  table:not(.horizontal) thead, table:not(.horizontal) tbody {
-    max-width: 100%;
-    flex: 0 0 100%; }
-  table:not(.horizontal) tr {
-    flex-flow: row wrap;
-    flex: 0 0 100%; }
-  table:not(.horizontal) th, table:not(.horizontal) td {
-    flex: 1 0 0%;
-    overflow: hidden;
-    text-overflow: ellipsis; }
-  table:not(.horizontal) thead {
-    position: sticky;
-    top: 0; }
-  table:not(.horizontal) tbody tr:first-child td {
-    border-top: 0; }
-
-table.horizontal {
-  border: 0; }
-  table.horizontal thead, table.horizontal tbody {
-    border: 0;
-    flex-flow: row nowrap; }
-  table.horizontal tbody {
-    overflow: auto;
-    justify-content: space-between;
-    flex: 1 0 0;
-    margin-left: calc( 4 * var(--universal-margin));
-    padding-bottom: calc(var(--universal-padding) / 4); }
-  table.horizontal tr {
-    flex-direction: column;
-    flex: 1 0 auto; }
-  table.horizontal th, table.horizontal td {
-    width: 100%;
-    border: 0;
-    border-bottom: 0.0625rem solid var(--table-border-color); }
-    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
-      border-top: 0; }
-  table.horizontal th {
-    text-align: right;
-    border-left: 0.0625rem solid var(--table-border-color);
-    border-right: 0.0625rem solid var(--table-border-separator-color); }
-  table.horizontal thead tr:first-child {
-    padding-left: 0; }
-  table.horizontal th:first-child, table.horizontal td:first-child {
-    border-top: 0.0625rem solid var(--table-border-color); }
-  table.horizontal tbody tr:last-child td {
-    border-right: 0.0625rem solid var(--table-border-color); }
-    table.horizontal tbody tr:last-child td:first-child {
-      border-top-right-radius: 0.25rem; }
-    table.horizontal tbody tr:last-child td:last-child {
-      border-bottom-right-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:first-child {
-    border-top-left-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:last-child {
-    border-bottom-left-radius: 0.25rem; }
-
-@media screen and (max-width: 499px) {
-  table, table.horizontal {
-    border-collapse: collapse;
-    border: 0;
-    width: 100%;
-    display: table; }
-    table thead, table th, table.horizontal thead, table.horizontal th {
-      border: 0;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      padding: 0;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%); }
-    table tbody, table.horizontal tbody {
-      border: 0;
-      display: table-row-group; }
-    table tr, table.horizontal tr {
-      display: block;
-      border: 0.0625rem solid var(--table-border-color);
-      border-radius: var(--universal-border-radius);
-      background: #fafafa;
-      padding: var(--universal-padding);
-      margin: var(--universal-margin);
-      margin-bottom: calc(2 * var(--universal-margin)); }
-    table th, table td, table.horizontal th, table.horizontal td {
-      width: auto; }
-    table td, table.horizontal td {
-      display: block;
-      border: 0;
-      text-align: right; }
-    table td:before, table.horizontal td:before {
-      content: attr(data-label);
-      float: left;
-      font-weight: 600; }
-    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
-      border-top: 0; }
-    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
-      border-right: 0; } }
-:root {
-  --table-body-alt-back-color: #eee; }
-
-table tr:nth-of-type(2n) > td {
-  background: var(--table-body-alt-back-color); }
-
-@media screen and (max-width: 500px) {
-  table tr:nth-of-type(2n) {
-    background: var(--table-body-alt-back-color); } }
-:root {
-  --table-body-hover-back-color: #90caf9; }
-
-table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-  background: var(--table-body-hover-back-color); }
-
-@media screen and (max-width: 500px) {
-  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-    background: var(--table-body-hover-back-color); } }
-/*
-  Definitions for contextual background elements, toasts and tooltips.
-*/
-/* Contextual module CSS variable definitions */
-:root {
-  --mark-back-color: #0277bd;
-  --mark-fore-color: #fafafa; }
-
-mark {
-  background: var(--mark-back-color);
-  color: var(--mark-fore-color);
-  font-size: 0.95em;
-  line-height: 1em;
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-  mark.inline-block {
-    display: inline-block;
-    font-size: 1em;
-    line-height: 1.5;
-    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-:root {
-  --toast-back-color: #424242;
-  --toast-fore-color: #fafafa; }
-
-.toast {
-  position: fixed;
-  bottom: calc(var(--universal-margin) * 3);
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1111;
-  color: var(--toast-fore-color);
-  background: var(--toast-back-color);
-  border-radius: calc(var(--universal-border-radius) * 16);
-  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
-
-:root {
-  --tooltip-back-color: #212121;
-  --tooltip-fore-color: #fafafa; }
-
-.tooltip {
-  position: relative;
-  display: inline-block; }
-  .tooltip:before, .tooltip:after {
-    position: absolute;
-    opacity: 0;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%);
-    transition: all 0.3s;
-    z-index: 1010;
-    left: 50%; }
-  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
-    bottom: 75%; }
-  .tooltip.bottom:before, .tooltip.bottom:after {
-    top: 75%; }
-  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
-    opacity: 1;
-    clip: auto;
-    -webkit-clip-path: inset(0%);
-    clip-path: inset(0%); }
-  .tooltip:before {
-    content: '';
-    background: transparent;
-    border: var(--universal-margin) solid transparent;
-    left: calc(50% - var(--universal-margin)); }
-  .tooltip:not(.bottom):before {
-    border-top-color: #212121; }
-  .tooltip.bottom:before {
-    border-bottom-color: #212121; }
-  .tooltip:after {
-    content: attr(aria-label);
-    color: var(--tooltip-fore-color);
-    background: var(--tooltip-back-color);
-    border-radius: var(--universal-border-radius);
-    padding: var(--universal-padding);
-    white-space: nowrap;
-    transform: translateX(-50%); }
-  .tooltip:not(.bottom):after {
-    margin-bottom: calc(2 * var(--universal-margin)); }
-  .tooltip.bottom:after {
-    margin-top: calc(2 * var(--universal-margin)); }
-
-:root {
-  --modal-overlay-color: rgba(0, 0, 0, 0.45);
-  --modal-close-color: #444;
-  --modal-close-hover-color: #f0f0f0; }
-
-[type="checkbox"].modal {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].modal + div {
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: none;
-    width: 100vw;
-    height: 100vh;
-    background: var(--modal-overlay-color); }
-    [type="checkbox"].modal + div .card {
-      margin: 0 auto;
-      max-height: 50vh;
-      overflow: auto; }
-      [type="checkbox"].modal + div .card .modal-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 1.75rem;
-        height: 1.75rem;
-        border-radius: var(--universal-border-radius);
-        padding: var(--universal-padding);
-        margin: 0;
-        cursor: pointer;
-        transition: background 0.3s; }
-        [type="checkbox"].modal + div .card .modal-close:before {
-          display: block;
-          content: '\00D7';
-          color: var(--modal-close-color);
-          position: relative;
-          font-family: sans-serif;
-          font-size: 1.75rem;
-          line-height: 1;
-          text-align: center; }
-        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
-          background: var(--modal-close-hover-color); }
-  [type="checkbox"].modal:checked + div {
-    display: flex;
-    flex: 0 1 auto;
-    z-index: 1200; }
-    [type="checkbox"].modal:checked + div .card .modal-close {
-      z-index: 1211; }
-
-:root {
-  --collapse-label-back-color: #e8e8e8;
-  --collapse-label-fore-color: #212121;
-  --collapse-label-hover-back-color: #f0f0f0;
-  --collapse-selected-label-back-color: #ececec;
-  --collapse-border-color: #ddd;
-  --collapse-content-back-color: #fafafa;
-  --collapse-selected-label-border-color: #0277bd; }
-
-.collapse {
-  width: calc(100% - 2 * var(--universal-margin));
-  opacity: 1;
-  display: flex;
-  flex-direction: column;
-  margin: var(--universal-margin);
-  border-radius: var(--universal-border-radius); }
-  .collapse > [type="radio"], .collapse > [type="checkbox"] {
-    height: 1px;
-    width: 1px;
-    margin: -1px;
-    overflow: hidden;
-    position: absolute;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%); }
-  .collapse > label {
-    flex-grow: 1;
-    display: inline-block;
-    height: 1.5rem;
-    cursor: pointer;
-    transition: background 0.3s;
-    color: var(--collapse-label-fore-color);
-    background: var(--collapse-label-back-color);
-    border: 0.0625rem solid var(--collapse-border-color);
-    padding: calc(1.5 * var(--universal-padding)); }
-    .collapse > label:hover, .collapse > label:focus {
-      background: var(--collapse-label-hover-back-color); }
-    .collapse > label + div {
-      flex-basis: auto;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%);
-      transition: max-height 0.3s;
-      max-height: 1px; }
-  .collapse > :checked + label {
-    background: var(--collapse-selected-label-back-color);
-    border-bottom-color: var(--collapse-selected-label-border-color); }
-    .collapse > :checked + label + div {
-      box-sizing: border-box;
-      position: relative;
-      width: 100%;
-      height: auto;
-      overflow: auto;
-      margin: 0;
-      background: var(--collapse-content-back-color);
-      border: 0.0625rem solid var(--collapse-border-color);
-      border-top: 0;
-      padding: var(--universal-padding);
-      clip: auto;
-      -webkit-clip-path: inset(0%);
-      clip-path: inset(0%);
-      max-height: 850px; }
-  .collapse > label:not(:first-of-type) {
-    border-top: 0; }
-  .collapse > label:first-of-type {
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
-  .collapse > label:last-of-type:not(:first-of-type) {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  .collapse > label:last-of-type:first-of-type {
-    border-radius: var(--universal-border-radius); }
-  .collapse > :checked:last-of-type:not(:first-of-type) + label {
-    border-radius: 0; }
-  .collapse > :checked:last-of-type + label + div {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-
-/*
-  Custom elements for contextual background elements, toasts and tooltips.
-*/
-mark.secondary {
-  --mark-back-color: #d32f2f; }
-
-mark.tertiary {
-  --mark-back-color: #308732; }
-
-mark.tag {
-  padding: calc(var(--universal-padding)/2) var(--universal-padding);
-  border-radius: 1em; }
-
-/*
-  Definitions for progress elements and spinners.
-*/
-/* Progress module CSS variable definitions */
-:root {
-  --progress-back-color: #ddd;
-  --progress-fore-color: #555; }
-
-progress {
-  display: block;
-  vertical-align: baseline;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  height: 0.75rem;
-  width: calc(100% - 2 * var(--universal-margin));
-  margin: var(--universal-margin);
-  border: 0;
-  border-radius: calc(2 * var(--universal-border-radius));
-  background: var(--progress-back-color);
-  color: var(--progress-fore-color); }
-  progress::-webkit-progress-value {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress::-webkit-progress-bar {
-    background: var(--progress-back-color); }
-  progress::-moz-progress-bar {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-webkit-progress-value {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-moz-progress-bar {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress.inline {
-    display: inline-block;
-    vertical-align: middle;
-    width: 60%; }
-
-:root {
-  --spinner-back-color: #ddd;
-  --spinner-fore-color: #555; }
-
-@keyframes spinner-donut-anim {
-  0% {
-    transform: rotate(0deg); }
-  100% {
-    transform: rotate(360deg); } }
-.spinner {
-  display: inline-block;
-  margin: var(--universal-margin);
-  border: 0.25rem solid var(--spinner-back-color);
-  border-left: 0.25rem solid var(--spinner-fore-color);
-  border-radius: 50%;
-  width: 1.25rem;
-  height: 1.25rem;
-  animation: spinner-donut-anim 1.2s linear infinite; }
-
-/*
-  Custom elements for progress bars and spinners.
-*/
-progress.primary {
-  --progress-fore-color: #1976d2; }
-
-progress.secondary {
-  --progress-fore-color: #d32f2f; }
-
-progress.tertiary {
-  --progress-fore-color: #308732; }
-
-.spinner.primary {
-  --spinner-fore-color: #1976d2; }
-
-.spinner.secondary {
-  --spinner-fore-color: #d32f2f; }
-
-.spinner.tertiary {
-  --spinner-fore-color: #308732; }
-
-/*
-  Definitions for icons - powered by Feather (https://feathericons.com/).
-*/
-span[class^='icon-'] {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  vertical-align: -0.125em;
-  background-size: contain;
-  margin: 0 calc(var(--universal-margin) / 4); }
-  span[class^='icon-'].secondary {
-    -webkit-filter: invert(25%);
-    filter: invert(25%); }
-  span[class^='icon-'].inverse {
-    -webkit-filter: invert(100%);
-    filter: invert(100%); }
-
-span.icon-alert {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-bookmark {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-calendar {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-credit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-edit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
-span.icon-link {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-help {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-home {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-info {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-lock {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-mail {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-location {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-phone {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-rss {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-search {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-settings {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-share {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-cart {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-upload {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-user {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
-
-/*
-  Definitions for utilities and helper classes.
-*/
-/* Utility module CSS variable definitions */
-:root {
-  --generic-border-color: rgba(0, 0, 0, 0.3);
-  --generic-box-shadow: 0 0.25rem 0.25rem 0 rgba(0, 0, 0, 0.125), 0 0.125rem 0.125rem -0.125rem rgba(0, 0, 0, 0.25); }
-
-.hidden {
-  display: none !important; }
-
-.visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  margin: -1px !important;
-  border: 0 !important;
-  padding: 0 !important;
-  clip: rect(0 0 0 0) !important;
-  -webkit-clip-path: inset(100%) !important;
-  clip-path: inset(100%) !important;
-  overflow: hidden !important; }
-
-.bordered {
-  border: 0.0625rem solid var(--generic-border-color) !important; }
-
-.rounded {
-  border-radius: var(--universal-border-radius) !important; }
-
-.circular {
-  border-radius: 50% !important; }
-
-.shadowed {
-  box-shadow: var(--generic-box-shadow) !important; }
-
-.responsive-margin {
-  margin: calc(var(--universal-margin) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-margin {
-      margin: calc(var(--universal-margin) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-margin {
-      margin: var(--universal-margin) !important; } }
-
-.responsive-padding {
-  padding: calc(var(--universal-padding) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-padding {
-      padding: calc(var(--universal-padding) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-padding {
-      padding: var(--universal-padding) !important; } }
-
-@media screen and (max-width: 499px) {
-  .hidden-sm {
-    display: none !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .hidden-md {
-    display: none !important; } }
-@media screen and (min-width: 1280px) {
-  .hidden-lg {
-    display: none !important; } }
-@media screen and (max-width: 499px) {
-  .visually-hidden-sm {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .visually-hidden-md {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 1280px) {
-  .visually-hidden-lg {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-
-/*# sourceMappingURL=mini-default.css.map */
diff --git a/Drivers/CMSIS/Device/ST/STM32WLxx/_htmresc/st_logo.png b/Drivers/CMSIS/Device/ST/STM32WLxx/_htmresc/st_logo.png
deleted file mode 100644
index 8b80057f..00000000
Binary files a/Drivers/CMSIS/Device/ST/STM32WLxx/_htmresc/st_logo.png and /dev/null differ
diff --git a/Drivers/CMSIS/LICENSE.txt b/Drivers/CMSIS/LICENSE.txt
deleted file mode 100644
index 8dada3ed..00000000
--- a/Drivers/CMSIS/LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   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.
diff --git a/Drivers/CMSIS/docs/General/html/LICENSE.txt b/Drivers/CMSIS/docs/General/html/LICENSE.txt
deleted file mode 100644
index 8dada3ed..00000000
--- a/Drivers/CMSIS/docs/General/html/LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   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.
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/Drivers/STM32WLxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
index 41b79bd0..5057a2d4 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
@@ -7,7 +7,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under BSD 3-Clause license,
@@ -23,7 +23,7 @@
 #define STM32_HAL_LEGACY
 
 #ifdef __cplusplus
- extern "C" {
+extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -38,6 +38,14 @@
 #define AES_CLEARFLAG_CCF               CRYP_CLEARFLAG_CCF
 #define AES_CLEARFLAG_RDERR             CRYP_CLEARFLAG_RDERR
 #define AES_CLEARFLAG_WRERR             CRYP_CLEARFLAG_WRERR
+#if defined(STM32U5)
+#define CRYP_DATATYPE_32B               CRYP_NO_SWAP
+#define CRYP_DATATYPE_16B               CRYP_HALFWORD_SWAP
+#define CRYP_DATATYPE_8B                CRYP_BYTE_SWAP
+#define CRYP_DATATYPE_1B                CRYP_BIT_SWAP
+#define CRYP_CCF_CLEAR                  CRYP_CLEAR_CCF
+#define CRYP_ERR_CLEAR                  CRYP_CLEAR_RWEIF
+#endif /* STM32U5 */
 /**
   * @}
   */
@@ -210,6 +218,18 @@
   * @}
   */
 
+/** @defgroup CRC_Aliases CRC API aliases
+  * @{
+  */
+#if defined(STM32WL) || defined(STM32WB) || defined(STM32L5) || defined(STM32L4)
+#else
+#define HAL_CRC_Input_Data_Reverse   HAL_CRCEx_Input_Data_Reverse    /*!< Aliased to HAL_CRCEx_Input_Data_Reverse for inter STM32 series compatibility  */
+#define HAL_CRC_Output_Data_Reverse  HAL_CRCEx_Output_Data_Reverse   /*!< Aliased to HAL_CRCEx_Output_Data_Reverse for inter STM32 series compatibility */
+#endif
+/**
+  * @}
+  */
+
 /** @defgroup HAL_CRC_Aliased_Defines HAL CRC Aliased Defines maintained for legacy purpose
   * @{
   */
@@ -235,7 +255,7 @@
 #define DAC_WAVEGENERATION_NOISE                        DAC_WAVE_NOISE
 #define DAC_WAVEGENERATION_TRIANGLE                     DAC_WAVE_TRIANGLE
 
-#if defined(STM32G4) || defined(STM32H7)
+#if defined(STM32G4) || defined(STM32H7) || defined (STM32U5)
 #define DAC_CHIPCONNECT_DISABLE       DAC_CHIPCONNECT_EXTERNAL
 #define DAC_CHIPCONNECT_ENABLE        DAC_CHIPCONNECT_INTERNAL
 #endif
@@ -382,7 +402,6 @@
 #define DAC_TRIGGER_LP2_OUT                        DAC_TRIGGER_LPTIM2_OUT
 
 #endif /* STM32H7 */
-
 /**
   * @}
   */
@@ -470,15 +489,24 @@
 #define OB_BOOT_ENTRY_FORCED_FLASH    OB_BOOT_LOCK_ENABLE
 #endif
 #if defined(STM32H7)
-#define FLASH_FLAG_SNECCE_BANK1RR FLASH_FLAG_SNECCERR_BANK1
-#define FLASH_FLAG_DBECCE_BANK1RR FLASH_FLAG_DBECCERR_BANK1
-#define FLASH_FLAG_STRBER_BANK1R  FLASH_FLAG_STRBERR_BANK1
-#define FLASH_FLAG_SNECCE_BANK2RR FLASH_FLAG_SNECCERR_BANK2
-#define FLASH_FLAG_DBECCE_BANK2RR FLASH_FLAG_DBECCERR_BANK2
-#define FLASH_FLAG_STRBER_BANK2R  FLASH_FLAG_STRBERR_BANK2
-#define FLASH_FLAG_WDW            FLASH_FLAG_WBNE
-#define OB_WRP_SECTOR_All         OB_WRP_SECTOR_ALL
+#define FLASH_FLAG_SNECCE_BANK1RR     FLASH_FLAG_SNECCERR_BANK1
+#define FLASH_FLAG_DBECCE_BANK1RR     FLASH_FLAG_DBECCERR_BANK1
+#define FLASH_FLAG_STRBER_BANK1R      FLASH_FLAG_STRBERR_BANK1
+#define FLASH_FLAG_SNECCE_BANK2RR     FLASH_FLAG_SNECCERR_BANK2
+#define FLASH_FLAG_DBECCE_BANK2RR     FLASH_FLAG_DBECCERR_BANK2
+#define FLASH_FLAG_STRBER_BANK2R      FLASH_FLAG_STRBERR_BANK2
+#define FLASH_FLAG_WDW                FLASH_FLAG_WBNE
+#define OB_WRP_SECTOR_All             OB_WRP_SECTOR_ALL
 #endif /* STM32H7 */
+#if defined(STM32U5)
+#define OB_USER_nRST_STOP             OB_USER_NRST_STOP
+#define OB_USER_nRST_STDBY            OB_USER_NRST_STDBY
+#define OB_USER_nRST_SHDW             OB_USER_NRST_SHDW
+#define OB_USER_nSWBOOT0              OB_USER_NSWBOOT0
+#define OB_USER_nBOOT0                OB_USER_NBOOT0
+#define OB_nBOOT0_RESET               OB_NBOOT0_RESET
+#define OB_nBOOT0_SET                 OB_NBOOT0_SET
+#endif /* STM32U5 */
 
 /**
   * @}
@@ -521,6 +549,7 @@
 #define HAL_SYSCFG_EnableIOAnalogSwitchVDD        HAL_SYSCFG_EnableIOSwitchVDD
 #define HAL_SYSCFG_DisableIOAnalogSwitchVDD       HAL_SYSCFG_DisableIOSwitchVDD
 #endif /* STM32G4 */
+
 /**
   * @}
   */
@@ -595,24 +624,24 @@
 #define GPIO_AF1_LPTIM                            GPIO_AF1_LPTIM1
 #define GPIO_AF2_LPTIM                            GPIO_AF2_LPTIM1
 
-#if defined(STM32L0) || defined(STM32L4) || defined(STM32F4) || defined(STM32F2) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7)
+#if defined(STM32L0) || defined(STM32L4) || defined(STM32F4) || defined(STM32F2) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
 #define  GPIO_SPEED_LOW                           GPIO_SPEED_FREQ_LOW
 #define  GPIO_SPEED_MEDIUM                        GPIO_SPEED_FREQ_MEDIUM
 #define  GPIO_SPEED_FAST                          GPIO_SPEED_FREQ_HIGH
 #define  GPIO_SPEED_HIGH                          GPIO_SPEED_FREQ_VERY_HIGH
-#endif /* STM32L0 || STM32L4 || STM32F4 || STM32F2 || STM32F7 || STM32G4 || STM32H7*/
+#endif /* STM32L0 || STM32L4 || STM32F4 || STM32F2 || STM32F7 || STM32G4 || STM32H7 || STM32WB*/
 
 #if defined(STM32L1)
- #define  GPIO_SPEED_VERY_LOW    GPIO_SPEED_FREQ_LOW
- #define  GPIO_SPEED_LOW         GPIO_SPEED_FREQ_MEDIUM
- #define  GPIO_SPEED_MEDIUM      GPIO_SPEED_FREQ_HIGH
- #define  GPIO_SPEED_HIGH        GPIO_SPEED_FREQ_VERY_HIGH
+#define  GPIO_SPEED_VERY_LOW    GPIO_SPEED_FREQ_LOW
+#define  GPIO_SPEED_LOW         GPIO_SPEED_FREQ_MEDIUM
+#define  GPIO_SPEED_MEDIUM      GPIO_SPEED_FREQ_HIGH
+#define  GPIO_SPEED_HIGH        GPIO_SPEED_FREQ_VERY_HIGH
 #endif /* STM32L1 */
 
 #if defined(STM32F0) || defined(STM32F3) || defined(STM32F1)
- #define  GPIO_SPEED_LOW    GPIO_SPEED_FREQ_LOW
- #define  GPIO_SPEED_MEDIUM GPIO_SPEED_FREQ_MEDIUM
- #define  GPIO_SPEED_HIGH   GPIO_SPEED_FREQ_HIGH
+#define  GPIO_SPEED_LOW    GPIO_SPEED_FREQ_LOW
+#define  GPIO_SPEED_MEDIUM GPIO_SPEED_FREQ_MEDIUM
+#define  GPIO_SPEED_HIGH   GPIO_SPEED_FREQ_HIGH
 #endif /* STM32F0 || STM32F3 || STM32F1 */
 
 #define GPIO_AF6_DFSDM                            GPIO_AF6_DFSDM1
@@ -773,49 +802,6 @@
 #define HRTIM_EVENTSRC_3              (HRTIM_EECR1_EE1SRC_1)
 #define HRTIM_EVENTSRC_4              (HRTIM_EECR1_EE1SRC_1 | HRTIM_EECR1_EE1SRC_0)
 
-/** @brief Constants defining the events that can be selected to configure the
-  *        set/reset crossbar of a timer output
-  */
-#define HRTIM_OUTPUTSET_TIMEV_1       (HRTIM_SET1R_TIMEVNT1)
-#define HRTIM_OUTPUTSET_TIMEV_2       (HRTIM_SET1R_TIMEVNT2)
-#define HRTIM_OUTPUTSET_TIMEV_3       (HRTIM_SET1R_TIMEVNT3)
-#define HRTIM_OUTPUTSET_TIMEV_4       (HRTIM_SET1R_TIMEVNT4)
-#define HRTIM_OUTPUTSET_TIMEV_5       (HRTIM_SET1R_TIMEVNT5)
-#define HRTIM_OUTPUTSET_TIMEV_6       (HRTIM_SET1R_TIMEVNT6)
-#define HRTIM_OUTPUTSET_TIMEV_7       (HRTIM_SET1R_TIMEVNT7)
-#define HRTIM_OUTPUTSET_TIMEV_8       (HRTIM_SET1R_TIMEVNT8)
-#define HRTIM_OUTPUTSET_TIMEV_9       (HRTIM_SET1R_TIMEVNT9)
-
-#define HRTIM_OUTPUTRESET_TIMEV_1     (HRTIM_RST1R_TIMEVNT1)
-#define HRTIM_OUTPUTRESET_TIMEV_2     (HRTIM_RST1R_TIMEVNT2)
-#define HRTIM_OUTPUTRESET_TIMEV_3     (HRTIM_RST1R_TIMEVNT3)
-#define HRTIM_OUTPUTRESET_TIMEV_4     (HRTIM_RST1R_TIMEVNT4)
-#define HRTIM_OUTPUTRESET_TIMEV_5     (HRTIM_RST1R_TIMEVNT5)
-#define HRTIM_OUTPUTRESET_TIMEV_6     (HRTIM_RST1R_TIMEVNT6)
-#define HRTIM_OUTPUTRESET_TIMEV_7     (HRTIM_RST1R_TIMEVNT7)
-#define HRTIM_OUTPUTRESET_TIMEV_8     (HRTIM_RST1R_TIMEVNT8)
-#define HRTIM_OUTPUTRESET_TIMEV_9     (HRTIM_RST1R_TIMEVNT9)
-
-/** @brief Constants defining the event filtering applied to external events
-  *        by a timer
-  */
-#define HRTIM_TIMEVENTFILTER_NONE             (0x00000000U)
-#define HRTIM_TIMEVENTFILTER_BLANKINGCMP1     (HRTIM_EEFR1_EE1FLTR_0)
-#define HRTIM_TIMEVENTFILTER_BLANKINGCMP2     (HRTIM_EEFR1_EE1FLTR_1)
-#define HRTIM_TIMEVENTFILTER_BLANKINGCMP3     (HRTIM_EEFR1_EE1FLTR_1 | HRTIM_EEFR1_EE1FLTR_0)
-#define HRTIM_TIMEVENTFILTER_BLANKINGCMP4     (HRTIM_EEFR1_EE1FLTR_2)
-#define HRTIM_TIMEVENTFILTER_BLANKINGFLTR1    (HRTIM_EEFR1_EE1FLTR_2 | HRTIM_EEFR1_EE1FLTR_0)
-#define HRTIM_TIMEVENTFILTER_BLANKINGFLTR2    (HRTIM_EEFR1_EE1FLTR_2 | HRTIM_EEFR1_EE1FLTR_1)
-#define HRTIM_TIMEVENTFILTER_BLANKINGFLTR3    (HRTIM_EEFR1_EE1FLTR_2 | HRTIM_EEFR1_EE1FLTR_1 | HRTIM_EEFR1_EE1FLTR_0)
-#define HRTIM_TIMEVENTFILTER_BLANKINGFLTR4    (HRTIM_EEFR1_EE1FLTR_3)
-#define HRTIM_TIMEVENTFILTER_BLANKINGFLTR5    (HRTIM_EEFR1_EE1FLTR_3 | HRTIM_EEFR1_EE1FLTR_0)
-#define HRTIM_TIMEVENTFILTER_BLANKINGFLTR6    (HRTIM_EEFR1_EE1FLTR_3 | HRTIM_EEFR1_EE1FLTR_1)
-#define HRTIM_TIMEVENTFILTER_BLANKINGFLTR7    (HRTIM_EEFR1_EE1FLTR_3 | HRTIM_EEFR1_EE1FLTR_1 | HRTIM_EEFR1_EE1FLTR_0)
-#define HRTIM_TIMEVENTFILTER_BLANKINGFLTR8    (HRTIM_EEFR1_EE1FLTR_3 | HRTIM_EEFR1_EE1FLTR_2)
-#define HRTIM_TIMEVENTFILTER_WINDOWINGCMP2    (HRTIM_EEFR1_EE1FLTR_3 | HRTIM_EEFR1_EE1FLTR_2 | HRTIM_EEFR1_EE1FLTR_0)
-#define HRTIM_TIMEVENTFILTER_WINDOWINGCMP3    (HRTIM_EEFR1_EE1FLTR_3 | HRTIM_EEFR1_EE1FLTR_2 | HRTIM_EEFR1_EE1FLTR_1)
-#define HRTIM_TIMEVENTFILTER_WINDOWINGTIM     (HRTIM_EEFR1_EE1FLTR_3 | HRTIM_EEFR1_EE1FLTR_2 | HRTIM_EEFR1_EE1FLTR_1 | HRTIM_EEFR1_EE1FLTR_0)
-
 /** @brief Constants defining the DLL calibration periods (in micro seconds)
   */
 #define HRTIM_CALIBRATIONRATE_7300             0x00000000U
@@ -895,7 +881,11 @@
 #define LPTIM_TRIGSAMPLETIME_2TRANSITION        LPTIM_TRIGSAMPLETIME_2TRANSITIONS
 #define LPTIM_TRIGSAMPLETIME_4TRANSITION        LPTIM_TRIGSAMPLETIME_4TRANSITIONS
 #define LPTIM_TRIGSAMPLETIME_8TRANSITION        LPTIM_TRIGSAMPLETIME_8TRANSITIONS
-      
+
+#if defined(STM32U5)
+#define LPTIM_ISR_CC1        LPTIM_ISR_CC1IF
+#define LPTIM_ISR_CC2        LPTIM_ISR_CC2IF
+#endif /* STM32U5 */
 /**
   * @}
   */
@@ -968,6 +958,11 @@
 #define HAL_OPAMP_MSP_DEINIT_CB_ID     HAL_OPAMP_MSPDEINIT_CB_ID
 #endif
 
+#if defined(STM32L4) || defined(STM32L5)
+#define OPAMP_POWERMODE_NORMAL                OPAMP_POWERMODE_NORMALPOWER
+#elif defined(STM32G4)
+#define OPAMP_POWERMODE_NORMAL                OPAMP_POWERMODE_NORMALSPEED
+#endif
 
 /**
   * @}
@@ -979,15 +974,15 @@
 #define I2S_STANDARD_PHILLIPS      I2S_STANDARD_PHILIPS
 
 #if defined(STM32H7)
-  #define I2S_IT_TXE               I2S_IT_TXP
-  #define I2S_IT_RXNE              I2S_IT_RXP
+#define I2S_IT_TXE               I2S_IT_TXP
+#define I2S_IT_RXNE              I2S_IT_RXP
 
-  #define I2S_FLAG_TXE             I2S_FLAG_TXP
-  #define I2S_FLAG_RXNE            I2S_FLAG_RXP
+#define I2S_FLAG_TXE             I2S_FLAG_TXP
+#define I2S_FLAG_RXNE            I2S_FLAG_RXP
 #endif
 
 #if defined(STM32F7)
-  #define I2S_CLOCK_SYSCLK           I2S_CLOCK_PLL
+#define I2S_CLOCK_SYSCLK           I2S_CLOCK_PLL
 #endif
 /**
   * @}
@@ -1022,7 +1017,7 @@
 /**
   * @}
   */
-  
+
 /** @defgroup HAL_RTC_Aliased_Defines HAL RTC Aliased Defines maintained for legacy purpose
   * @{
   */
@@ -1122,16 +1117,16 @@
 
 #if defined(STM32H7)
 
- #define SPI_FLAG_TXE                    SPI_FLAG_TXP
- #define SPI_FLAG_RXNE                   SPI_FLAG_RXP
+#define SPI_FLAG_TXE                    SPI_FLAG_TXP
+#define SPI_FLAG_RXNE                   SPI_FLAG_RXP
 
- #define SPI_IT_TXE                      SPI_IT_TXP
- #define SPI_IT_RXNE                     SPI_IT_RXP
+#define SPI_IT_TXE                      SPI_IT_TXP
+#define SPI_IT_RXNE                     SPI_IT_RXP
 
- #define SPI_FRLVL_EMPTY                 SPI_RX_FIFO_0PACKET
- #define SPI_FRLVL_QUARTER_FULL          SPI_RX_FIFO_1PACKET
- #define SPI_FRLVL_HALF_FULL             SPI_RX_FIFO_2PACKET
- #define SPI_FRLVL_FULL                  SPI_RX_FIFO_3PACKET
+#define SPI_FRLVL_EMPTY                 SPI_RX_FIFO_0PACKET
+#define SPI_FRLVL_QUARTER_FULL          SPI_RX_FIFO_1PACKET
+#define SPI_FRLVL_HALF_FULL             SPI_RX_FIFO_2PACKET
+#define SPI_FRLVL_FULL                  SPI_RX_FIFO_3PACKET
 
 #endif /* STM32H7 */
 
@@ -1417,6 +1412,20 @@
   */
 #endif  /* STM32L4 ||  STM32F7 ||  STM32F4 ||  STM32H7 */
 
+#if defined(STM32L4) || defined(STM32F7) || defined(STM32F427xx) || defined(STM32F437xx) \
+  || defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F469xx) || defined(STM32F479xx) \
+  || defined(STM32H7) || defined(STM32U5)
+/** @defgroup DMA2D_Aliases DMA2D API Aliases
+  * @{
+  */
+#define HAL_DMA2D_DisableCLUT       HAL_DMA2D_CLUTLoading_Abort    /*!< Aliased to HAL_DMA2D_CLUTLoading_Abort
+                                                                        for compatibility with legacy code */
+/**
+  * @}
+  */
+
+#endif  /* STM32L4 ||  STM32F7 ||  STM32F4 ||  STM32H7 || STM32U5 */
+
 /** @defgroup HAL_PPP_Aliased_Defines HAL PPP Aliased Defines maintained for legacy purpose
   * @{
   */
@@ -1435,6 +1444,16 @@
   * @}
   */
 
+#if !defined(STM32F2)
+/** @defgroup HASH_alias HASH API alias
+  * @{
+  */
+#define HAL_HASHEx_IRQHandler   HAL_HASH_IRQHandler  /*!< Redirection for compatibility with legacy code */
+/**
+  *
+  * @}
+  */
+#endif /* STM32F2 */
 /** @defgroup HAL_HASH_Aliased_Functions HAL HASH Aliased Functions maintained for legacy purpose
   * @{
   */
@@ -1494,7 +1513,8 @@
 #define HAL_DisableDBGStopMode HAL_DBGMCU_DisableDBGStopMode
 #define HAL_EnableDBGStandbyMode HAL_DBGMCU_EnableDBGStandbyMode
 #define HAL_DisableDBGStandbyMode HAL_DBGMCU_DisableDBGStandbyMode
-#define HAL_DBG_LowPowerConfig(Periph, cmd) (((cmd)==ENABLE)? HAL_DBGMCU_DBG_EnableLowPowerConfig(Periph) : HAL_DBGMCU_DBG_DisableLowPowerConfig(Periph))
+#define HAL_DBG_LowPowerConfig(Periph, cmd) (((cmd\
+                                              )==ENABLE)? HAL_DBGMCU_DBG_EnableLowPowerConfig(Periph) : HAL_DBGMCU_DBG_DisableLowPowerConfig(Periph))
 #define HAL_VREFINT_OutputSelect  HAL_SYSCFG_VREFINT_OutputSelect
 #define HAL_Lock_Cmd(cmd) (((cmd)==ENABLE) ? HAL_SYSCFG_Enable_Lock_VREFINT() : HAL_SYSCFG_Disable_Lock_VREFINT())
 #if defined(STM32L0)
@@ -1502,7 +1522,8 @@
 #define HAL_VREFINT_Cmd(cmd) (((cmd)==ENABLE)? HAL_SYSCFG_EnableVREFINT() : HAL_SYSCFG_DisableVREFINT())
 #endif
 #define HAL_ADC_EnableBuffer_Cmd(cmd)  (((cmd)==ENABLE) ? HAL_ADCEx_EnableVREFINT() : HAL_ADCEx_DisableVREFINT())
-#define HAL_ADC_EnableBufferSensor_Cmd(cmd) (((cmd)==ENABLE) ?  HAL_ADCEx_EnableVREFINTTempSensor() : HAL_ADCEx_DisableVREFINTTempSensor())
+#define HAL_ADC_EnableBufferSensor_Cmd(cmd) (((cmd\
+                                              )==ENABLE) ?  HAL_ADCEx_EnableVREFINTTempSensor() : HAL_ADCEx_DisableVREFINTTempSensor())
 #if defined(STM32H7A3xx) || defined(STM32H7B3xx) || defined(STM32H7B0xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xxQ) || defined(STM32H7B0xxQ)
 #define HAL_EnableSRDomainDBGStopMode      HAL_EnableDomain3DBGStopMode
 #define HAL_DisableSRDomainDBGStopMode     HAL_DisableDomain3DBGStopMode
@@ -1525,9 +1546,9 @@
 #define HAL_DATA_EEPROMEx_Erase    HAL_FLASHEx_DATAEEPROM_Erase
 #define HAL_DATA_EEPROMEx_Program  HAL_FLASHEx_DATAEEPROM_Program
 
- /**
+/**
   * @}
-  */
+ */
 
 /** @defgroup HAL_I2C_Aliased_Functions HAL I2C Aliased Functions maintained for legacy purpose
   * @{
@@ -1537,7 +1558,8 @@
 #define HAL_FMPI2CEx_AnalogFilter_Config      HAL_FMPI2CEx_ConfigAnalogFilter
 #define HAL_FMPI2CEx_DigitalFilter_Config     HAL_FMPI2CEx_ConfigDigitalFilter
 
-#define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd)==ENABLE)? HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))
+#define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd\
+                                                                 )==ENABLE)? HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))
 
 #if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4) || defined(STM32L1)
 #define HAL_I2C_Master_Sequential_Transmit_IT  HAL_I2C_Master_Seq_Transmit_IT
@@ -1562,9 +1584,9 @@
 #define HAL_FMPI2C_Slave_Sequential_Transmit_DMA  HAL_FMPI2C_Slave_Seq_Transmit_DMA
 #define HAL_FMPI2C_Slave_Sequential_Receive_DMA   HAL_FMPI2C_Slave_Seq_Receive_DMA
 #endif /* STM32F4 */
- /**
+/**
   * @}
-  */
+ */
 
 /** @defgroup HAL_PWR_Aliased HAL PWR Aliased maintained for legacy purpose
   * @{
@@ -1619,9 +1641,9 @@
 
 #define PWR_MODE_EVT                                  PWR_PVD_MODE_NORMAL
 
- /**
+/**
   * @}
-  */
+ */
 
 /** @defgroup HAL_SMBUS_Aliased_Functions HAL SMBUS Aliased Functions maintained for legacy purpose
   * @{
@@ -1870,15 +1892,15 @@
 #define __HAL_FREEZE_RTC_DBGMCU __HAL_DBGMCU_FREEZE_RTC
 #define __HAL_UNFREEZE_RTC_DBGMCU __HAL_DBGMCU_UNFREEZE_RTC
 #if defined(STM32H7)
-  #define __HAL_FREEZE_WWDG_DBGMCU __HAL_DBGMCU_FREEZE_WWDG1
-  #define __HAL_UNFREEZE_WWDG_DBGMCU __HAL_DBGMCU_UnFreeze_WWDG1
-  #define __HAL_FREEZE_IWDG_DBGMCU __HAL_DBGMCU_FREEZE_IWDG1
-  #define __HAL_UNFREEZE_IWDG_DBGMCU __HAL_DBGMCU_UnFreeze_IWDG1
+#define __HAL_FREEZE_WWDG_DBGMCU __HAL_DBGMCU_FREEZE_WWDG1
+#define __HAL_UNFREEZE_WWDG_DBGMCU __HAL_DBGMCU_UnFreeze_WWDG1
+#define __HAL_FREEZE_IWDG_DBGMCU __HAL_DBGMCU_FREEZE_IWDG1
+#define __HAL_UNFREEZE_IWDG_DBGMCU __HAL_DBGMCU_UnFreeze_IWDG1
 #else
-  #define __HAL_FREEZE_WWDG_DBGMCU __HAL_DBGMCU_FREEZE_WWDG
-  #define __HAL_UNFREEZE_WWDG_DBGMCU __HAL_DBGMCU_UNFREEZE_WWDG
-  #define __HAL_FREEZE_IWDG_DBGMCU __HAL_DBGMCU_FREEZE_IWDG
-  #define __HAL_UNFREEZE_IWDG_DBGMCU __HAL_DBGMCU_UNFREEZE_IWDG
+#define __HAL_FREEZE_WWDG_DBGMCU __HAL_DBGMCU_FREEZE_WWDG
+#define __HAL_UNFREEZE_WWDG_DBGMCU __HAL_DBGMCU_UNFREEZE_WWDG
+#define __HAL_FREEZE_IWDG_DBGMCU __HAL_DBGMCU_FREEZE_IWDG
+#define __HAL_UNFREEZE_IWDG_DBGMCU __HAL_DBGMCU_UNFREEZE_IWDG
 #endif /* STM32H7 */
 #define __HAL_FREEZE_I2C1_TIMEOUT_DBGMCU __HAL_DBGMCU_FREEZE_I2C1_TIMEOUT
 #define __HAL_UNFREEZE_I2C1_TIMEOUT_DBGMCU __HAL_DBGMCU_UNFREEZE_I2C1_TIMEOUT
@@ -2089,8 +2111,8 @@
   */
 
 #define IS_DAC_WAVE(WAVE) (((WAVE) == DAC_WAVE_NONE) || \
-                          ((WAVE) == DAC_WAVE_NOISE)|| \
-                          ((WAVE) == DAC_WAVE_TRIANGLE))
+                           ((WAVE) == DAC_WAVE_NOISE)|| \
+                           ((WAVE) == DAC_WAVE_TRIANGLE))
 
 /**
   * @}
@@ -2146,7 +2168,7 @@
 #define IS_I2S_INSTANCE_EXT             IS_I2S_ALL_INSTANCE_EXT
 
 #if defined(STM32H7)
-  #define __HAL_I2S_CLEAR_FREFLAG       __HAL_I2S_CLEAR_TIFREFLAG
+#define __HAL_I2S_CLEAR_FREFLAG       __HAL_I2S_CLEAR_TIFREFLAG
 #endif
 
 /**
@@ -2283,7 +2305,8 @@
 #define RCC_StopWakeUpClock_HSI     RCC_STOP_WAKEUPCLOCK_HSI
 
 #define HAL_RCC_CCSCallback HAL_RCC_CSSCallback
-#define HAL_RC48_EnableBuffer_Cmd(cmd) (((cmd)==ENABLE) ? HAL_RCCEx_EnableHSI48_VREFINT() : HAL_RCCEx_DisableHSI48_VREFINT())
+#define HAL_RC48_EnableBuffer_Cmd(cmd) (((cmd\
+                                         )==ENABLE) ? HAL_RCCEx_EnableHSI48_VREFINT() : HAL_RCCEx_DisableHSI48_VREFINT())
 
 #define __ADC_CLK_DISABLE          __HAL_RCC_ADC_CLK_DISABLE
 #define __ADC_CLK_ENABLE           __HAL_RCC_ADC_CLK_ENABLE
@@ -3363,7 +3386,20 @@
 #define RCC_DFSDM1CLKSOURCE_APB2            RCC_DFSDM1CLKSOURCE_PCLK2
 #define RCC_DFSDM2CLKSOURCE_APB2            RCC_DFSDM2CLKSOURCE_PCLK2
 #define RCC_FMPI2C1CLKSOURCE_APB            RCC_FMPI2C1CLKSOURCE_PCLK1
-
+#if defined(STM32U5)
+#define MSIKPLLModeSEL  RCC_MSIKPLL_MODE_SEL
+#define MSISPLLModeSEL  RCC_MSISPLL_MODE_SEL
+#define __HAL_RCC_AHB21_CLK_DISABLE           __HAL_RCC_AHB2_1_CLK_DISABLE
+#define __HAL_RCC_AHB22_CLK_DISABLE           __HAL_RCC_AHB2_2_CLK_DISABLE
+#define __HAL_RCC_AHB1_CLK_Disable_Clear      __HAL_RCC_AHB1_CLK_ENABLE
+#define __HAL_RCC_AHB21_CLK_Disable_Clear     __HAL_RCC_AHB2_1_CLK_ENABLE
+#define __HAL_RCC_AHB22_CLK_Disable_Clear     __HAL_RCC_AHB2_2_CLK_ENABLE
+#define __HAL_RCC_AHB3_CLK_Disable_Clear      __HAL_RCC_AHB3_CLK_ENABLE
+#define __HAL_RCC_APB1_CLK_Disable_Clear      __HAL_RCC_APB1_CLK_ENABLE
+#define __HAL_RCC_APB2_CLK_Disable_Clear      __HAL_RCC_APB2_CLK_ENABLE
+#define __HAL_RCC_APB3_CLK_Disable_Clear      __HAL_RCC_APB3_CLK_ENABLE
+#define IS_RCC_MSIPLLModeSelection            IS_RCC_MSIPLLMODE_SELECT
+#endif
 /**
   * @}
   */
@@ -3380,7 +3416,7 @@
 /** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
   * @{
   */
-#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL)
+#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5)
 #else
 #define __HAL_RTC_CLEAR_FLAG                      __HAL_RTC_EXTI_CLEAR_FLAG
 #endif
@@ -3400,19 +3436,19 @@
 #else
 #define __HAL_RTC_EXTI_CLEAR_FLAG(__EXTI_LINE__)  (((__EXTI_LINE__) == RTC_EXTI_LINE_ALARM_EVENT) ? __HAL_RTC_ALARM_EXTI_CLEAR_FLAG() : \
                                                    (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_CLEAR_FLAG() : \
-                                                      __HAL_RTC_TAMPER_TIMESTAMP_EXTI_CLEAR_FLAG()))
+                                                    __HAL_RTC_TAMPER_TIMESTAMP_EXTI_CLEAR_FLAG()))
 #define __HAL_RTC_EXTI_ENABLE_IT(__EXTI_LINE__)   (((__EXTI_LINE__)  == RTC_EXTI_LINE_ALARM_EVENT) ? __HAL_RTC_ALARM_EXTI_ENABLE_IT() : \
-                                                  (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_ENABLE_IT() : \
-                                                      __HAL_RTC_TAMPER_TIMESTAMP_EXTI_ENABLE_IT()))
+                                                   (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_ENABLE_IT() : \
+                                                    __HAL_RTC_TAMPER_TIMESTAMP_EXTI_ENABLE_IT()))
 #define __HAL_RTC_EXTI_DISABLE_IT(__EXTI_LINE__)  (((__EXTI_LINE__) == RTC_EXTI_LINE_ALARM_EVENT) ? __HAL_RTC_ALARM_EXTI_DISABLE_IT() : \
-                                                  (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_DISABLE_IT() : \
-                                                      __HAL_RTC_TAMPER_TIMESTAMP_EXTI_DISABLE_IT()))
+                                                   (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_DISABLE_IT() : \
+                                                    __HAL_RTC_TAMPER_TIMESTAMP_EXTI_DISABLE_IT()))
 #define __HAL_RTC_EXTI_GET_FLAG(__EXTI_LINE__)    (((__EXTI_LINE__) == RTC_EXTI_LINE_ALARM_EVENT) ? __HAL_RTC_ALARM_EXTI_GET_FLAG() : \
-                                                  (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_GET_FLAG() : \
-                                                      __HAL_RTC_TAMPER_TIMESTAMP_EXTI_GET_FLAG()))
+                                                   (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_GET_FLAG() : \
+                                                    __HAL_RTC_TAMPER_TIMESTAMP_EXTI_GET_FLAG()))
 #define __HAL_RTC_EXTI_GENERATE_SWIT(__EXTI_LINE__)   (((__EXTI_LINE__) == RTC_EXTI_LINE_ALARM_EVENT) ? __HAL_RTC_ALARM_EXTI_GENERATE_SWIT() : \
-                                                      (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_GENERATE_SWIT() :  \
-                                                          __HAL_RTC_TAMPER_TIMESTAMP_EXTI_GENERATE_SWIT()))
+                                                       (((__EXTI_LINE__) == RTC_EXTI_LINE_WAKEUPTIMER_EVENT) ? __HAL_RTC_WAKEUPTIMER_EXTI_GENERATE_SWIT() :  \
+                                                        __HAL_RTC_TAMPER_TIMESTAMP_EXTI_GENERATE_SWIT()))
 #endif   /* STM32F1 */
 
 #define IS_ALARM                                  IS_RTC_ALARM
@@ -3437,13 +3473,17 @@
   * @}
   */
 
-/** @defgroup HAL_SD_Aliased_Macros HAL SD Aliased Macros maintained for legacy purpose
+/** @defgroup HAL_SD_Aliased_Macros HAL SD/MMC Aliased Macros maintained for legacy purpose
   * @{
   */
 
 #define SD_OCR_CID_CSD_OVERWRIETE   SD_OCR_CID_CSD_OVERWRITE
 #define SD_CMD_SD_APP_STAUS         SD_CMD_SD_APP_STATUS
 
+#define eMMC_HIGH_VOLTAGE_RANGE     EMMC_HIGH_VOLTAGE_RANGE
+#define eMMC_DUAL_VOLTAGE_RANGE     EMMC_DUAL_VOLTAGE_RANGE
+#define eMMC_LOW_VOLTAGE_RANGE      EMMC_LOW_VOLTAGE_RANGE
+
 #if defined(STM32F4) || defined(STM32F2)
 #define  SD_SDMMC_DISABLED          SD_SDIO_DISABLED
 #define  SD_SDMMC_FUNCTION_BUSY     SD_SDIO_FUNCTION_BUSY
@@ -3596,6 +3636,13 @@
 #define __HAL_USART_GETCLOCKSOURCE      USART_GETCLOCKSOURCE
 #define __USART_GETCLOCKSOURCE          USART_GETCLOCKSOURCE
 
+#if defined(STM32F0) || defined(STM32F3) || defined(STM32F7)
+#define USART_OVERSAMPLING_16               0x00000000U
+#define USART_OVERSAMPLING_8                USART_CR1_OVER8
+
+#define IS_USART_OVERSAMPLING(__SAMPLING__) (((__SAMPLING__) == USART_OVERSAMPLING_16) || \
+                                             ((__SAMPLING__) == USART_OVERSAMPLING_8))
+#endif /* STM32F0 || STM32F3 || STM32F7 */
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_adc.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_adc.h
index e0188e03..598e5fd2 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_adc.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_adc.h
@@ -132,8 +132,7 @@ typedef struct
 
   FunctionalState LowPowerAutoPowerOff; /*!< Select the auto-off mode: the ADC automatically powers-off after a conversion and automatically wakes-up when a new conversion is triggered (with startup time between trigger and start of sampling).
                                        This feature can be combined with automatic wait mode (parameter 'LowPowerAutoWait').
-                                       This parameter can be set to ENABLE or DISABLE.
-                                       Note: If enabled, this feature also turns off the ADC dedicated 14 MHz RC oscillator (HSI14) */
+                                       This parameter can be set to ENABLE or DISABLE. */
 
   FunctionalState ContinuousConvMode; /*!< Specify whether the conversion is performed in single mode (one conversion) or continuous mode for ADC group regular,
                                        after the first ADC conversion start trigger occurred (software start or external trigger).
@@ -473,7 +472,7 @@ typedef  void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
 /** @defgroup ADC_HAL_EC_DATA_ALIGN ADC conversion data alignment
   * @{
   */
-#define ADC_DATAALIGN_RIGHT                (LL_ADC_DATA_ALIGN_RIGHT)/*!< ADC conversion data alignment: right aligned (alignment on data register LSB bit 0)*/
+#define ADC_DATAALIGN_RIGHT                (LL_ADC_DATA_ALIGN_RIGHT)      /*!< ADC conversion data alignment: right aligned (alignment on data register LSB bit 0)*/
 #define ADC_DATAALIGN_LEFT                 (LL_ADC_DATA_ALIGN_LEFT)       /*!< ADC conversion data alignment: left aligned (alignment on data register MSB bit 15)*/
 /**
   * @}
@@ -1668,8 +1667,8 @@ void                    HAL_ADC_ErrorCallback(ADC_HandleTypeDef *hadc);
   * @{
   */
 /* Peripheral Control functions ***********************************************/
-HAL_StatusTypeDef       HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConfTypeDef *sConfig);
-HAL_StatusTypeDef       HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDGConfTypeDef *AnalogWDGConfig);
+HAL_StatusTypeDef       HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConfTypeDef *pConfig);
+HAL_StatusTypeDef       HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDGConfTypeDef *pAnalogWDGConfig);
 
 /**
   * @}
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_cortex.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_cortex.h
index 2b2fe2db..9797364e 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_cortex.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_cortex.h
@@ -187,9 +187,12 @@ typedef struct
 /** @defgroup CORTEX_MPU_Region_Size CORTEX MPU Region Size
   * @{
   */
+#if defined(CORE_CM0PLUS)
+#else
 #define   MPU_REGION_SIZE_32B        ((uint8_t)0x04)
 #define   MPU_REGION_SIZE_64B        ((uint8_t)0x05)
 #define   MPU_REGION_SIZE_128B       ((uint8_t)0x06)
+#endif
 #define   MPU_REGION_SIZE_256B       ((uint8_t)0x07)
 #define   MPU_REGION_SIZE_512B       ((uint8_t)0x08)
 #define   MPU_REGION_SIZE_1KB        ((uint8_t)0x09)
@@ -379,6 +382,33 @@ void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_Init);
                                          ((NUMBER) == MPU_REGION_NUMBER6) || \
                                          ((NUMBER) == MPU_REGION_NUMBER7))
 
+#if defined(CORE_CM0PLUS)
+#define IS_MPU_REGION_SIZE(SIZE)    (((SIZE) == MPU_REGION_SIZE_256B)  || \
+                                     ((SIZE) == MPU_REGION_SIZE_512B)  || \
+                                     ((SIZE) == MPU_REGION_SIZE_1KB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_2KB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_4KB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_8KB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_16KB)  || \
+                                     ((SIZE) == MPU_REGION_SIZE_32KB)  || \
+                                     ((SIZE) == MPU_REGION_SIZE_64KB)  || \
+                                     ((SIZE) == MPU_REGION_SIZE_128KB) || \
+                                     ((SIZE) == MPU_REGION_SIZE_256KB) || \
+                                     ((SIZE) == MPU_REGION_SIZE_512KB) || \
+                                     ((SIZE) == MPU_REGION_SIZE_1MB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_2MB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_4MB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_8MB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_16MB)  || \
+                                     ((SIZE) == MPU_REGION_SIZE_32MB)  || \
+                                     ((SIZE) == MPU_REGION_SIZE_64MB)  || \
+                                     ((SIZE) == MPU_REGION_SIZE_128MB) || \
+                                     ((SIZE) == MPU_REGION_SIZE_256MB) || \
+                                     ((SIZE) == MPU_REGION_SIZE_512MB) || \
+                                     ((SIZE) == MPU_REGION_SIZE_1GB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_2GB)   || \
+                                     ((SIZE) == MPU_REGION_SIZE_4GB))
+#else
 #define IS_MPU_REGION_SIZE(SIZE)    (((SIZE) == MPU_REGION_SIZE_32B)   || \
                                      ((SIZE) == MPU_REGION_SIZE_64B)   || \
                                      ((SIZE) == MPU_REGION_SIZE_128B)  || \
@@ -407,7 +437,7 @@ void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_Init);
                                      ((SIZE) == MPU_REGION_SIZE_1GB)   || \
                                      ((SIZE) == MPU_REGION_SIZE_2GB)   || \
                                      ((SIZE) == MPU_REGION_SIZE_4GB))
-
+#endif
 #define IS_MPU_SUB_REGION_DISABLE(SUBREGION)      ((SUBREGION) < (uint16_t)0x00FFU)
 #endif /* __MPU_PRESENT */
 
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_def.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_def.h
index 0cd2aedf..010f9e02 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_def.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_def.h
@@ -28,7 +28,7 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx.h"
-#include "Legacy/stm32_hal_legacy.h"  /* Aliases file for old names compatibility */
+#include "Legacy/stm32_hal_legacy.h"   /* Aliases file for old names compatibility */
 #include <stddef.h>
 
 /* Exported types ------------------------------------------------------------*/
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_dma.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_dma.h
index d2b5dd65..d281ed43 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_dma.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_dma.h
@@ -347,7 +347,7 @@ typedef struct __DMA_HandleTypeDef
 /** @defgroup DMA_Channel_Attributes DMA Channel Attributes
   * @brief DMA channel secure or non-secure and privileged or non-privileged attributes
   * @note Secure and non-secure attributes are only available from secure when the system
-  *       implements the security (TZEN=1)
+  *       implements the security (ESE=1)
   * @{
   */
 
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_flash.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_flash.h
index c920de4b..0fbe16b8 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_flash.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_flash.h
@@ -123,7 +123,7 @@ typedef struct
   uint32_t C2DebugAccessMode;      /*!< CPU2 debug access enabled or disabled (used for OPTIONBYTE_C2_DEBUG_ACCESS).
                                         This parameter can be a value of @ref FLASH_OB_C2_DEBUG_ACCESS */
   uint32_t C2BootRegion;           /*!< CPU2 Secure Boot memory region(used for OPTIONBYTE_C2_BOOT_VECT).
-                                        This parameter can be a value of @ref C2_FLASH_OB_BOOT_REGION */
+                                        This parameter can be a value of @ref FLASH_OB_C2_BOOT_REGION */
   uint32_t C2SecureBootVectAddr;   /*!< CPU2 Secure Boot reset vector (used for OPTIONBYTE_C2_BOOT_VECT).
                                         This parameter contains the CPU2 boot reset start address within
                                         the selected memory region. Make sure this parameter is word aligned. */
@@ -561,7 +561,7 @@ typedef struct
   * @}
   */
 
-/** @defgroup C2_FLASH_OB_BOOT_REGION CPU2 Option Bytes Reset Boot Vector
+/** @defgroup FLASH_OB_C2_BOOT_REGION CPU2 Option Bytes Reset Boot Vector
   * @{
   */
 #define OB_C2_BOOT_FROM_SRAM               0x00000000U        /*!< CPU2 boot from SRAM1 or SRAM2 */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_gpio.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_gpio.h
index 88c85b30..332a7c37 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_gpio.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_gpio.h
@@ -107,26 +107,25 @@ typedef enum
 
 /** @defgroup GPIO_mode GPIO mode
   * @brief GPIO Configuration Mode
-  *        Elements values convention: 0xX0yz00YZ
-  *           - X  : GPIO mode or EXTI Mode
-  *           - y  : External IT or Event trigger detection
-  *           - z  : IO configuration on External IT or Event
-  *           - Y  : Output type (Push Pull or Open Drain)
-  *           - Z  : IO Direction mode (Input, Output, Alternate or Analog)
+  *        Elements values convention: 0x00WX00YZ
+  *           - W  : EXTI trigger detection on 3 bits
+  *           - X  : EXTI mode (IT or Event) on 2 bits
+  *           - Y  : Output type (Push Pull or Open Drain) on 1 bit
+  *           - Z  : GPIO mode (Input, Output, Alternate or Analog) on 2 bits
   * @{
   */
-#define  GPIO_MODE_INPUT                        (0x00000000U)   /*!< Input Floating Mode                   */
-#define  GPIO_MODE_OUTPUT_PP                    (0x00000001U)   /*!< Output Push Pull Mode                 */
-#define  GPIO_MODE_OUTPUT_OD                    (0x00000011U)   /*!< Output Open Drain Mode                */
-#define  GPIO_MODE_AF_PP                        (0x00000002U)   /*!< Alternate Function Push Pull Mode     */
-#define  GPIO_MODE_AF_OD                        (0x00000012U)   /*!< Alternate Function Open Drain Mode    */
-#define  GPIO_MODE_ANALOG                       (0x00000003U)   /*!< Analog Mode  */
-#define  GPIO_MODE_IT_RISING                    (0x10110000U)   /*!< External Interrupt Mode with Rising edge trigger detection          */
-#define  GPIO_MODE_IT_FALLING                   (0x10210000U)   /*!< External Interrupt Mode with Falling edge trigger detection         */
-#define  GPIO_MODE_IT_RISING_FALLING            (0x10310000U)   /*!< External Interrupt Mode with Rising/Falling edge trigger detection  */
-#define  GPIO_MODE_EVT_RISING                   (0x10120000U)   /*!< External Event Mode with Rising edge trigger detection               */
-#define  GPIO_MODE_EVT_FALLING                  (0x10220000U)   /*!< External Event Mode with Falling edge trigger detection              */
-#define  GPIO_MODE_EVT_RISING_FALLING           (0x10320000U)   /*!< External Event Mode with Rising/Falling edge trigger detection       */
+#define GPIO_MODE_INPUT                 MODE_INPUT                                                  /*!< Input Floating Mode                                                */
+#define GPIO_MODE_OUTPUT_PP             (MODE_OUTPUT | OUTPUT_PP)                                   /*!< Output Push Pull Mode                                              */
+#define GPIO_MODE_OUTPUT_OD             (MODE_OUTPUT | OUTPUT_OD)                                   /*!< Output Open Drain Mode                                             */
+#define GPIO_MODE_AF_PP                 (MODE_AF | OUTPUT_PP)                                       /*!< Alternate Function Push Pull Mode                                  */
+#define GPIO_MODE_AF_OD                 (MODE_AF | OUTPUT_OD)                                       /*!< Alternate Function Open Drain Mode                                 */
+#define GPIO_MODE_ANALOG                MODE_ANALOG                                                 /*!< Analog Mode                                                        */
+#define GPIO_MODE_IT_RISING             (MODE_INPUT | EXTI_IT | TRIGGER_RISING)                     /*!< External Interrupt Mode with Rising edge trigger detection         */
+#define GPIO_MODE_IT_FALLING            (MODE_INPUT | EXTI_IT | TRIGGER_FALLING)                    /*!< External Interrupt Mode with Falling edge trigger detection        */
+#define GPIO_MODE_IT_RISING_FALLING     (MODE_INPUT | EXTI_IT | TRIGGER_RISING | TRIGGER_FALLING)   /*!< External Interrupt Mode with Rising/Falling edge trigger detection */
+#define GPIO_MODE_EVT_RISING            (MODE_INPUT | EXTI_EVT | TRIGGER_RISING)                    /*!< External Event Mode with Rising edge trigger detection             */
+#define GPIO_MODE_EVT_FALLING           (MODE_INPUT | EXTI_EVT | TRIGGER_FALLING)                   /*!< External Event Mode with Falling edge trigger detection            */
+#define GPIO_MODE_EVT_RISING_FALLING    (MODE_INPUT | EXTI_EVT | TRIGGER_RISING | TRIGGER_FALLING)  /*!< External Event Mode with Rising/Falling edge trigger detection     */
 /**
   * @}
   */
@@ -135,10 +134,10 @@ typedef enum
   * @brief GPIO Output Maximum frequency
   * @{
   */
-#define  GPIO_SPEED_FREQ_LOW        (0x00000000U)  /*!< Low speed       */
-#define  GPIO_SPEED_FREQ_MEDIUM     (0x00000001U)  /*!< Medium speed    */
-#define  GPIO_SPEED_FREQ_HIGH       (0x00000002U)  /*!< High speed      */
-#define  GPIO_SPEED_FREQ_VERY_HIGH  (0x00000003U)  /*!< Very high speed */
+#define GPIO_SPEED_FREQ_LOW             0x00000000u  /*!< Low speed       */
+#define GPIO_SPEED_FREQ_MEDIUM          0x00000001u  /*!< Medium speed    */
+#define GPIO_SPEED_FREQ_HIGH            0x00000002u  /*!< High speed      */
+#define GPIO_SPEED_FREQ_VERY_HIGH       0x00000003u  /*!< Very high speed */
 /**
   * @}
   */
@@ -147,9 +146,9 @@ typedef enum
   * @brief GPIO Pull-Up or Pull-Down Activation
   * @{
   */
-#define  GPIO_NOPULL        (0x00000000U)   /*!< No Pull-up or Pull-down activation  */
-#define  GPIO_PULLUP        (0x00000001U)   /*!< Pull-up activation                  */
-#define  GPIO_PULLDOWN      (0x00000002U)   /*!< Pull-down activation                */
+#define GPIO_NOPULL                     0x00000000u   /*!< No Pull-up or Pull-down activation  */
+#define GPIO_PULLUP                     0x00000001u   /*!< Pull-up activation                  */
+#define GPIO_PULLDOWN                   0x00000002u   /*!< Pull-down activation                */
 /**
   * @}
   */
@@ -208,6 +207,32 @@ typedef enum
   */
 
 /* Private macros ------------------------------------------------------------*/
+/** @defgroup GPIO_Private_Constants GPIO Private Constants
+  * @{
+  */
+#define GPIO_MODE_Pos                           0u
+#define GPIO_MODE                               (0x3uL << GPIO_MODE_Pos)
+#define MODE_INPUT                              (0x0uL << GPIO_MODE_Pos)
+#define MODE_OUTPUT                             (0x1uL << GPIO_MODE_Pos)
+#define MODE_AF                                 (0x2uL << GPIO_MODE_Pos)
+#define MODE_ANALOG                             (0x3uL << GPIO_MODE_Pos)
+#define OUTPUT_TYPE_Pos                         4u
+#define OUTPUT_TYPE                             (0x1uL << OUTPUT_TYPE_Pos)
+#define OUTPUT_PP                               (0x0uL << OUTPUT_TYPE_Pos)
+#define OUTPUT_OD                               (0x1uL << OUTPUT_TYPE_Pos)
+#define EXTI_MODE_Pos                           16u
+#define EXTI_MODE                               (0x3uL << EXTI_MODE_Pos)
+#define EXTI_IT                                 (0x1uL << EXTI_MODE_Pos)
+#define EXTI_EVT                                (0x2uL << EXTI_MODE_Pos)
+#define TRIGGER_MODE_Pos                         20u
+#define TRIGGER_MODE                            (0x7uL << TRIGGER_MODE_Pos)
+#define TRIGGER_RISING                          (0x1uL << TRIGGER_MODE_Pos)
+#define TRIGGER_FALLING                         (0x2uL << TRIGGER_MODE_Pos)
+
+/**
+  * @}
+  */
+
 /** @defgroup GPIO_Private_Macros GPIO Private Macros
   * @{
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_gtzc.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_gtzc.h
index 71fe39c9..d3aa3be6 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_gtzc.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_gtzc.h
@@ -121,7 +121,7 @@ typedef struct
   * @note     that two maximum values are also defined here:
   *           - max number of securable AHB/APB peripherals or masters (used in
   *           TZSC sub-block)
-  *           - max number of securable and TrustZone-aware AHB/APB peripherals
+  *           - max number of securable and security-aware AHB/APB peripherals
   *           or masters (used in TZIC sub-block)
   * @{
   */
@@ -146,7 +146,7 @@ typedef struct
 /* Note that two maximum values are also defined here:
  * - max number of securable peripherals
  *   (used in TZSC sub-block)
- * - max number of securable and TrustZone-aware peripherals or masters
+ * - max number of securable and security-aware peripherals or masters
  *   (used in TZIC sub-block)
  */
 #define GTZC_TZSC_PERIPH_NUMBER             4U
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_hsem.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_hsem.h
index 44ff4088..3455d0e7 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_hsem.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_hsem.h
@@ -43,7 +43,7 @@ extern "C" {
 
 /**
   * @brief  SemID to mask helper Macro.
-  * @param  __SEMID__: semaphore ID from 0 to 31
+  * @param  __SEMID__: semaphore ID from 0 to 15
   * @retval Semaphore Mask.
   */
 #define __HAL_HSEM_SEMID_TO_MASK(__SEMID__) (1 << (__SEMID__))
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_i2c.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_i2c.h
index 52884b36..ce949ac6 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_i2c.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_i2c.h
@@ -48,29 +48,30 @@ extern "C" {
 typedef struct
 {
   uint32_t Timing;              /*!< Specifies the I2C_TIMINGR_register value.
-                                  This parameter calculated by referring to I2C initialization
-                                         section in Reference manual */
+                                     This parameter calculated by referring to I2C initialization section
+                                     in Reference manual */
 
   uint32_t OwnAddress1;         /*!< Specifies the first device own address.
-                                  This parameter can be a 7-bit or 10-bit address. */
+                                     This parameter can be a 7-bit or 10-bit address. */
 
   uint32_t AddressingMode;      /*!< Specifies if 7-bit or 10-bit addressing mode is selected.
-                                  This parameter can be a value of @ref I2C_ADDRESSING_MODE */
+                                     This parameter can be a value of @ref I2C_ADDRESSING_MODE */
 
   uint32_t DualAddressMode;     /*!< Specifies if dual addressing mode is selected.
-                                  This parameter can be a value of @ref I2C_DUAL_ADDRESSING_MODE */
+                                     This parameter can be a value of @ref I2C_DUAL_ADDRESSING_MODE */
 
   uint32_t OwnAddress2;         /*!< Specifies the second device own address if dual addressing mode is selected
-                                  This parameter can be a 7-bit address. */
+                                     This parameter can be a 7-bit address. */
 
-  uint32_t OwnAddress2Masks;    /*!< Specifies the acknowledge mask address second device own address if dual addressing mode is selected
-                                  This parameter can be a value of @ref I2C_OWN_ADDRESS2_MASKS */
+  uint32_t OwnAddress2Masks;    /*!< Specifies the acknowledge mask address second device own address if dual addressing
+                                     mode is selected.
+                                     This parameter can be a value of @ref I2C_OWN_ADDRESS2_MASKS */
 
   uint32_t GeneralCallMode;     /*!< Specifies if general call mode is selected.
-                                  This parameter can be a value of @ref I2C_GENERAL_CALL_ADDRESSING_MODE */
+                                     This parameter can be a value of @ref I2C_GENERAL_CALL_ADDRESSING_MODE */
 
   uint32_t NoStretchMode;       /*!< Specifies if nostretch mode is selected.
-                                  This parameter can be a value of @ref I2C_NOSTRETCH_MODE */
+                                     This parameter can be a value of @ref I2C_NOSTRETCH_MODE */
 
 } I2C_InitTypeDef;
 
@@ -200,7 +201,8 @@ typedef struct __I2C_HandleTypeDef
 
   __IO uint32_t              PreviousState;  /*!< I2C communication Previous state          */
 
-  HAL_StatusTypeDef(*XferISR)(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources);  /*!< I2C transfer IRQ handler function pointer */
+  HAL_StatusTypeDef(*XferISR)(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources);
+  /*!< I2C transfer IRQ handler function pointer */
 
   DMA_HandleTypeDef          *hdmatx;        /*!< I2C Tx DMA handle parameters              */
 
@@ -217,20 +219,32 @@ typedef struct __I2C_HandleTypeDef
   __IO uint32_t              AddrEventCount; /*!< I2C Address Event counter                 */
 
 #if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-  void (* MasterTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);           /*!< I2C Master Tx Transfer completed callback */
-  void (* MasterRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);           /*!< I2C Master Rx Transfer completed callback */
-  void (* SlaveTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);            /*!< I2C Slave Tx Transfer completed callback  */
-  void (* SlaveRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);            /*!< I2C Slave Rx Transfer completed callback  */
-  void (* ListenCpltCallback)(struct __I2C_HandleTypeDef *hi2c);             /*!< I2C Listen Complete callback              */
-  void (* MemTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);              /*!< I2C Memory Tx Transfer completed callback */
-  void (* MemRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);              /*!< I2C Memory Rx Transfer completed callback */
-  void (* ErrorCallback)(struct __I2C_HandleTypeDef *hi2c);                  /*!< I2C Error callback                        */
-  void (* AbortCpltCallback)(struct __I2C_HandleTypeDef *hi2c);              /*!< I2C Abort callback                        */
-
-  void (* AddrCallback)(struct __I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode);  /*!< I2C Slave Address Match callback */
-
-  void (* MspInitCallback)(struct __I2C_HandleTypeDef *hi2c);                /*!< I2C Msp Init callback                     */
-  void (* MspDeInitCallback)(struct __I2C_HandleTypeDef *hi2c);              /*!< I2C Msp DeInit callback                   */
+  void (* MasterTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Master Tx Transfer completed callback */
+  void (* MasterRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Master Rx Transfer completed callback */
+  void (* SlaveTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Slave Tx Transfer completed callback  */
+  void (* SlaveRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Slave Rx Transfer completed callback  */
+  void (* ListenCpltCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Listen Complete callback              */
+  void (* MemTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Memory Tx Transfer completed callback */
+  void (* MemRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Memory Rx Transfer completed callback */
+  void (* ErrorCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Error callback                        */
+  void (* AbortCpltCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Abort callback                        */
+
+  void (* AddrCallback)(struct __I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode);
+  /*!< I2C Slave Address Match callback */
+
+  void (* MspInitCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Msp Init callback                     */
+  void (* MspDeInitCallback)(struct __I2C_HandleTypeDef *hi2c);
+  /*!< I2C Msp DeInit callback                   */
 
 #endif  /* USE_HAL_I2C_REGISTER_CALLBACKS */
 } I2C_HandleTypeDef;
@@ -259,8 +273,11 @@ typedef enum
 /**
   * @brief  HAL I2C Callback pointer definition
   */
-typedef  void (*pI2C_CallbackTypeDef)(I2C_HandleTypeDef *hi2c); /*!< pointer to an I2C callback function */
-typedef  void (*pI2C_AddrCallbackTypeDef)(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode); /*!< pointer to an I2C Address Match callback function */
+typedef  void (*pI2C_CallbackTypeDef)(I2C_HandleTypeDef *hi2c);
+/*!< pointer to an I2C callback function */
+typedef  void (*pI2C_AddrCallbackTypeDef)(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection,
+                                          uint16_t AddrMatchCode);
+/*!< pointer to an I2C Address Match callback function */
 
 #endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
 /**
@@ -440,14 +457,14 @@ typedef  void (*pI2C_AddrCallbackTypeDef)(I2C_HandleTypeDef *hi2c, uint8_t Trans
   * @retval None
   */
 #if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-#define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__)                do{                                                   \
-                                                                    (__HANDLE__)->State = HAL_I2C_STATE_RESET;       \
-                                                                    (__HANDLE__)->MspInitCallback = NULL;            \
-                                                                    (__HANDLE__)->MspDeInitCallback = NULL;          \
+#define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__)                do{                                             \
+                                                                    (__HANDLE__)->State = HAL_I2C_STATE_RESET;  \
+                                                                    (__HANDLE__)->MspInitCallback = NULL;       \
+                                                                    (__HANDLE__)->MspDeInitCallback = NULL;     \
                                                                   } while(0)
 #else
 #define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__)                ((__HANDLE__)->State = HAL_I2C_STATE_RESET)
-#endif
+#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
 
 /** @brief  Enable the specified I2C interrupt.
   * @param  __HANDLE__ specifies the I2C Handle.
@@ -542,26 +559,27 @@ typedef  void (*pI2C_AddrCallbackTypeDef)(I2C_HandleTypeDef *hi2c, uint8_t Trans
   *
   * @retval None
   */
-#define __HAL_I2C_CLEAR_FLAG(__HANDLE__, __FLAG__) (((__FLAG__) == I2C_FLAG_TXE) ? ((__HANDLE__)->Instance->ISR |= (__FLAG__)) \
-                                                    : ((__HANDLE__)->Instance->ICR = (__FLAG__)))
+#define __HAL_I2C_CLEAR_FLAG(__HANDLE__, __FLAG__) (((__FLAG__) == I2C_FLAG_TXE) ? \
+                                                    ((__HANDLE__)->Instance->ISR |= (__FLAG__)) : \
+                                                    ((__HANDLE__)->Instance->ICR = (__FLAG__)))
 
 /** @brief  Enable the specified I2C peripheral.
   * @param  __HANDLE__ specifies the I2C Handle.
   * @retval None
   */
-#define __HAL_I2C_ENABLE(__HANDLE__)                            (SET_BIT((__HANDLE__)->Instance->CR1,  I2C_CR1_PE))
+#define __HAL_I2C_ENABLE(__HANDLE__)                         (SET_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE))
 
 /** @brief  Disable the specified I2C peripheral.
   * @param  __HANDLE__ specifies the I2C Handle.
   * @retval None
   */
-#define __HAL_I2C_DISABLE(__HANDLE__)                           (CLEAR_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE))
+#define __HAL_I2C_DISABLE(__HANDLE__)                        (CLEAR_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE))
 
 /** @brief  Generate a Non-Acknowledge I2C peripheral in Slave mode.
   * @param  __HANDLE__ specifies the I2C Handle.
   * @retval None
   */
-#define __HAL_I2C_GENERATE_NACK(__HANDLE__)                     (SET_BIT((__HANDLE__)->Instance->CR2, I2C_CR2_NACK))
+#define __HAL_I2C_GENERATE_NACK(__HANDLE__)                  (SET_BIT((__HANDLE__)->Instance->CR2, I2C_CR2_NACK))
 /**
   * @}
   */
@@ -601,12 +619,14 @@ HAL_StatusTypeDef HAL_I2C_UnRegisterAddrCallback(I2C_HandleTypeDef *hi2c);
   */
 /* IO operation functions  ****************************************************/
 /******* Blocking mode: Polling */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size,
-                                          uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size,
+HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData,
+                                          uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData,
+                                         uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size,
                                          uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
+HAL_StatusTypeDef HAL_I2C_Slave_Receive(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size,
+                                        uint32_t Timeout);
 HAL_StatusTypeDef HAL_I2C_Mem_Write(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress,
                                     uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
 HAL_StatusTypeDef HAL_I2C_Mem_Read(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress,
@@ -757,10 +777,14 @@ uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
                                                         ((REQUEST) == I2C_OTHER_AND_LAST_FRAME))
 
 #define I2C_RESET_CR2(__HANDLE__)                 ((__HANDLE__)->Instance->CR2 &= \
-                                                   (uint32_t)~((uint32_t)(I2C_CR2_SADD | I2C_CR2_HEAD10R | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_RD_WRN)))
-
-#define I2C_GET_ADDR_MATCH(__HANDLE__)            ((uint16_t)(((__HANDLE__)->Instance->ISR & I2C_ISR_ADDCODE) >> 16U))
-#define I2C_GET_DIR(__HANDLE__)                   ((uint8_t)(((__HANDLE__)->Instance->ISR & I2C_ISR_DIR) >> 16U))
+                                                   (uint32_t)~((uint32_t)(I2C_CR2_SADD   | I2C_CR2_HEAD10R | \
+                                                                          I2C_CR2_NBYTES | I2C_CR2_RELOAD  | \
+                                                                          I2C_CR2_RD_WRN)))
+
+#define I2C_GET_ADDR_MATCH(__HANDLE__)            ((uint16_t)(((__HANDLE__)->Instance->ISR & I2C_ISR_ADDCODE) \
+                                                              >> 16U))
+#define I2C_GET_DIR(__HANDLE__)                   ((uint8_t)(((__HANDLE__)->Instance->ISR & I2C_ISR_DIR) \
+                                                             >> 16U))
 #define I2C_GET_STOP_MODE(__HANDLE__)             ((__HANDLE__)->Instance->CR2 & I2C_CR2_AUTOEND)
 #define I2C_GET_OWN_ADDRESS1(__HANDLE__)          ((uint16_t)((__HANDLE__)->Instance->OAR1 & I2C_OAR1_OA1))
 #define I2C_GET_OWN_ADDRESS2(__HANDLE__)          ((uint16_t)((__HANDLE__)->Instance->OAR2 & I2C_OAR2_OA2))
@@ -772,10 +796,15 @@ uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
                                                                          (uint16_t)(0xFF00U))) >> 8U)))
 #define I2C_MEM_ADD_LSB(__ADDRESS__)              ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)(0x00FFU))))
 
-#define I2C_GENERATE_START(__ADDMODE__,__ADDRESS__) (((__ADDMODE__) == I2C_ADDRESSINGMODE_7BIT) ? (uint32_t)((((uint32_t)(__ADDRESS__) & (I2C_CR2_SADD)) | (I2C_CR2_START) | (I2C_CR2_AUTOEND)) & (~I2C_CR2_RD_WRN)) : \
-                                                     (uint32_t)((((uint32_t)(__ADDRESS__) & (I2C_CR2_SADD)) | (I2C_CR2_ADD10) | (I2C_CR2_START)) & (~I2C_CR2_RD_WRN)))
+#define I2C_GENERATE_START(__ADDMODE__,__ADDRESS__) (((__ADDMODE__) == I2C_ADDRESSINGMODE_7BIT) ? \
+                                                     (uint32_t)((((uint32_t)(__ADDRESS__) & (I2C_CR2_SADD)) | \
+                                                                 (I2C_CR2_START) | (I2C_CR2_AUTOEND)) & \
+                                                                (~I2C_CR2_RD_WRN)) : \
+                                                     (uint32_t)((((uint32_t)(__ADDRESS__) & (I2C_CR2_SADD)) | \
+                                                                 (I2C_CR2_ADD10) | (I2C_CR2_START)) & \
+                                                                (~I2C_CR2_RD_WRN)))
 
-#define I2C_CHECK_FLAG(__ISR__, __FLAG__)         ((((__ISR__) &  ((__FLAG__) & I2C_FLAG_MASK)) == \
+#define I2C_CHECK_FLAG(__ISR__, __FLAG__)         ((((__ISR__) & ((__FLAG__) & I2C_FLAG_MASK)) == \
                                                     ((__FLAG__) & I2C_FLAG_MASK)) ? SET : RESET)
 #define I2C_CHECK_IT_SOURCE(__CR1__, __IT__)      ((((__CR1__) & (__IT__)) == (__IT__)) ? SET : RESET)
 /**
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_i2c_ex.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_i2c_ex.h
index acd29b5d..fd5e4b0c 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_i2c_ex.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_i2c_ex.h
@@ -38,7 +38,6 @@ extern "C" {
 
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
-
 /** @defgroup I2CEx_Exported_Constants I2C Extended Exported Constants
   * @{
   */
@@ -71,24 +70,50 @@ extern "C" {
   */
 
 /* Exported macro ------------------------------------------------------------*/
-/* Exported functions --------------------------------------------------------*/
+/** @defgroup I2CEx_Exported_Macros I2C Extended Exported Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
 
+/* Exported functions --------------------------------------------------------*/
 /** @addtogroup I2CEx_Exported_Functions I2C Extended Exported Functions
   * @{
   */
 
-/** @addtogroup I2CEx_Exported_Functions_Group1 Extended features functions
-  * @brief    Extended features functions
+/** @addtogroup I2CEx_Exported_Functions_Group1 Filter Mode Functions
   * @{
   */
-
 /* Peripheral Control functions  ************************************************/
 HAL_StatusTypeDef HAL_I2CEx_ConfigAnalogFilter(I2C_HandleTypeDef *hi2c, uint32_t AnalogFilter);
 HAL_StatusTypeDef HAL_I2CEx_ConfigDigitalFilter(I2C_HandleTypeDef *hi2c, uint32_t DigitalFilter);
+/**
+  * @}
+  */
+
+/** @addtogroup I2CEx_Exported_Functions_Group2 WakeUp Mode Functions
+  * @{
+  */
 HAL_StatusTypeDef HAL_I2CEx_EnableWakeUp(I2C_HandleTypeDef *hi2c);
 HAL_StatusTypeDef HAL_I2CEx_DisableWakeUp(I2C_HandleTypeDef *hi2c);
+/**
+  * @}
+  */
+
+/** @addtogroup I2CEx_Exported_Functions_Group3 Fast Mode Plus Functions
+  * @{
+  */
 void HAL_I2CEx_EnableFastModePlus(uint32_t ConfigFastModePlus);
 void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
 
 /* Private constants ---------------------------------------------------------*/
 /** @defgroup I2CEx_Private_Constants I2C Extended Private Constants
@@ -115,9 +140,6 @@ void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus);
                                          (((__CONFIG__) & (I2C_FASTMODEPLUS_I2C1)) == I2C_FASTMODEPLUS_I2C1)    || \
                                          (((__CONFIG__) & (I2C_FASTMODEPLUS_I2C2)) == I2C_FASTMODEPLUS_I2C2)    || \
                                          (((__CONFIG__) & (I2C_FASTMODEPLUS_I2C3)) == I2C_FASTMODEPLUS_I2C3))
-
-
-
 /**
   * @}
   */
@@ -139,14 +161,6 @@ void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus);
   * @}
   */
 
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_irda.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_irda.h
index 627c482d..8fa70cd3 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_irda.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_irda.h
@@ -89,7 +89,7 @@ typedef struct
   *             11 : Error
   *          b5     Peripheral initialization status
   *             0  : Reset (Peripheral not initialized)
-  *             1  : Init done (Peripheral not initialized. HAL IRDA Init function already called)
+  *             1  : Init done (Peripheral initialized. HAL IRDA Init function already called)
   *          b4-b3  (not used)
   *             xx : Should be set to 00
   *          b2     Intrinsic process state
@@ -106,7 +106,7 @@ typedef struct
   *             xx : Should be set to 00
   *          b5     Peripheral initialization status
   *             0  : Reset (Peripheral not initialized)
-  *             1  : Init done (Peripheral not initialized)
+  *             1  : Init done (Peripheral initialized)
   *          b4-b2  (not used)
   *            xxx : Should be set to 000
   *          b1     Rx state
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_iwdg.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_iwdg.h
index 5627957e..cf666721 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_iwdg.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_iwdg.h
@@ -87,7 +87,6 @@ typedef struct
 #define IWDG_PRESCALER_64               IWDG_PR_PR_2                                    /*!< IWDG prescaler set to 64  */
 #define IWDG_PRESCALER_128              (IWDG_PR_PR_2 | IWDG_PR_PR_0)                   /*!< IWDG prescaler set to 128 */
 #define IWDG_PRESCALER_256              (IWDG_PR_PR_2 | IWDG_PR_PR_1)                   /*!< IWDG prescaler set to 256 */
-
 /**
   * @}
   */
@@ -100,7 +99,6 @@ typedef struct
   * @}
   */
 
-
 /**
   * @}
   */
@@ -138,7 +136,7 @@ typedef struct
   * @{
   */
 /* Initialization/Start functions  ********************************************/
-HAL_StatusTypeDef HAL_IWDG_Init(IWDG_HandleTypeDef *hiwdg);
+HAL_StatusTypeDef     HAL_IWDG_Init(IWDG_HandleTypeDef *hiwdg);
 /**
   * @}
   */
@@ -147,7 +145,7 @@ HAL_StatusTypeDef HAL_IWDG_Init(IWDG_HandleTypeDef *hiwdg);
   * @{
   */
 /* I/O operation functions ****************************************************/
-HAL_StatusTypeDef HAL_IWDG_Refresh(IWDG_HandleTypeDef *hiwdg);
+HAL_StatusTypeDef     HAL_IWDG_Refresh(IWDG_HandleTypeDef *hiwdg);
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rcc.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rcc.h
index 5d26e16a..eb82375a 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rcc.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rcc.h
@@ -51,6 +51,9 @@ extern "C" {
 
 #define RCC_FLAG_MASK             0x1FU
 
+/* Defines Oscillator Masks */
+#define RCC_OSCILLATORTYPE_ALL          (RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_MSI | RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE)  /*!< All Oscillator to configure */
+
 /** @defgroup RCC_Timeout_Value Timeout Values
   * @{
   */
@@ -61,6 +64,23 @@ extern "C" {
   * @}
   */
 
+/** @defgroup RCC_Reset_Flag Reset Flag
+  * @{
+  */
+#define RCC_RESET_FLAG_OBL             RCC_CSR_OBLRSTF    /*!< Option Byte Loader reset flag */
+#define RCC_RESET_FLAG_PIN             RCC_CSR_PINRSTF    /*!< PIN reset flag */
+#define RCC_RESET_FLAG_PWR             RCC_CSR_BORRSTF    /*!< BOR or POR/PDR reset flag */
+#define RCC_RESET_FLAG_SW              RCC_CSR_SFTRSTF    /*!< Software Reset flag */
+#define RCC_RESET_FLAG_IWDG            RCC_CSR_IWDGRSTF   /*!< Independent Watchdog reset flag */
+#define RCC_RESET_FLAG_WWDG            RCC_CSR_WWDGRSTF   /*!< Window watchdog reset flag */
+#define RCC_RESET_FLAG_LPWR            RCC_CSR_LPWRRSTF   /*!< Low power reset flag */
+#define RCC_RESET_FLAG_ALL             (RCC_RESET_FLAG_OBL | RCC_RESET_FLAG_PIN | RCC_RESET_FLAG_PWR | \
+                                        RCC_RESET_FLAG_SW | RCC_RESET_FLAG_IWDG | RCC_RESET_FLAG_WWDG | \
+                                        RCC_RESET_FLAG_LPWR)
+/**
+  * @}
+  */
+
 /**
   * @}
   */
@@ -70,13 +90,8 @@ extern "C" {
   * @{
   */
 
-#define IS_RCC_OSCILLATORTYPE(__OSCILLATOR__)                                     \
-  (((__OSCILLATOR__) == RCC_OSCILLATORTYPE_NONE)                               || \
-   (((__OSCILLATOR__) & RCC_OSCILLATORTYPE_HSE)   == RCC_OSCILLATORTYPE_HSE)   || \
-   (((__OSCILLATOR__) & RCC_OSCILLATORTYPE_HSI)   == RCC_OSCILLATORTYPE_HSI)   || \
-   (((__OSCILLATOR__) & RCC_OSCILLATORTYPE_MSI)   == RCC_OSCILLATORTYPE_MSI)   || \
-   (((__OSCILLATOR__) & RCC_OSCILLATORTYPE_LSI)   == RCC_OSCILLATORTYPE_LSI)   || \
-   (((__OSCILLATOR__) & RCC_OSCILLATORTYPE_LSE)   == RCC_OSCILLATORTYPE_LSE))
+#define IS_RCC_OSCILLATORTYPE(__OSCILLATOR__)  (((__OSCILLATOR__) == RCC_OSCILLATORTYPE_NONE) || \
+                                                (((__OSCILLATOR__) & ~RCC_OSCILLATORTYPE_ALL) == 0x00U))
 
 
 #define IS_RCC_HSE(__HSE__)  (((__HSE__) == RCC_HSE_OFF) || ((__HSE__) == RCC_HSE_ON) || \
@@ -2360,6 +2375,7 @@ void              HAL_RCC_NMI_IRQHandler(void);
 /* User Callbacks in non blocking mode (IT mode) */
 void              HAL_RCC_CSSCallback(void);
 
+uint32_t          HAL_RCC_GetResetSource(void);
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rcc_ex.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rcc_ex.h
index 7647347d..d14a81ed 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rcc_ex.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rcc_ex.h
@@ -38,6 +38,19 @@ extern "C" {
   * @{
   */
 /* Private constants ---------------------------------------------------------*/
+/** @addtogroup RCCEx_Private_Constants
+  * @{
+  */
+/* Define used for IS_RCC_* macros below */
+#define RCC_PERIPHCLOCK_ALL             (RCC_PERIPHCLK_USART1 | RCC_PERIPHCLK_USART2 | RCC_PERIPHCLK_I2S2 | \
+                                         RCC_PERIPHCLK_LPUART1 | RCC_PERIPHCLK_I2C1 | RCC_PERIPHCLK_I2C2 | \
+                                         RCC_PERIPHCLK_I2C3 | RCC_PERIPHCLK_LPTIM1 | RCC_PERIPHCLK_LPTIM2 | \
+                                         RCC_PERIPHCLK_LPTIM3 | RCC_PERIPHCLK_ADC | RCC_PERIPHCLK_RNG | \
+                                         RCC_PERIPHCLK_RTC )
+/**
+  * @}
+  */
+
 /* Private macros ------------------------------------------------------------*/
 /** @addtogroup RCCEx_Private_Macros
   * @{
@@ -46,19 +59,8 @@ extern "C" {
 #define IS_RCC_LSCOSOURCE(__SOURCE__) (((__SOURCE__) == RCC_LSCOSOURCE_LSI) || \
                                        ((__SOURCE__) == RCC_LSCOSOURCE_LSE))
 
-#define IS_RCC_PERIPHCLOCK(__SELECTION__) ((((__SELECTION__) & RCC_PERIPHCLK_USART1)   == RCC_PERIPHCLK_USART1)  || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_USART2)   == RCC_PERIPHCLK_USART2)  || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_LPUART1)  == RCC_PERIPHCLK_LPUART1) || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_I2S2)     == RCC_PERIPHCLK_I2S2)    || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_I2C1)     == RCC_PERIPHCLK_I2C1)    || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_I2C2)     == RCC_PERIPHCLK_I2C2)    || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_I2C3)     == RCC_PERIPHCLK_I2C3)    || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_LPTIM1)   == RCC_PERIPHCLK_LPTIM1)  || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_LPTIM2)   == RCC_PERIPHCLK_LPTIM2)  || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_LPTIM3)   == RCC_PERIPHCLK_LPTIM3)  || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_RNG)      == RCC_PERIPHCLK_RNG)     || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_ADC)      == RCC_PERIPHCLK_ADC)     || \
-                                           (((__SELECTION__) & RCC_PERIPHCLK_RTC)      == RCC_PERIPHCLK_RTC))
+#define IS_RCC_PERIPHCLOCK(__SELECTION__)   ((((__SELECTION__) & RCC_PERIPHCLOCK_ALL) != 0x00u) && \
+                                             (((__SELECTION__) & ~RCC_PERIPHCLOCK_ALL) == 0x00u))
 
 #define IS_RCC_USART1CLKSOURCE(__SOURCE__)  (((__SOURCE__) == RCC_USART1CLKSOURCE_PCLK2)  || \
                                              ((__SOURCE__) == RCC_USART1CLKSOURCE_SYSCLK) || \
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rng.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rng.h
index 7a0c7550..cc62fd8f 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rng.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rng.h
@@ -363,15 +363,14 @@ uint32_t             HAL_RNG_GetError(RNG_HandleTypeDef *hrng);
   * @}
   */
 
-/* Private functions----------------------------------------------------------*/
-/** @defgroup RNG_Private_Functions RNG Private Functions
+/* Private functions ---------------------------------------------------------*/
+/** @defgroup RNG_Private_Functions RNG Private functions
   * @{
   */
 HAL_StatusTypeDef RNG_RecoverSeedError(RNG_HandleTypeDef *hrng);
 /**
   * @}
   */
-
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rng_ex.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rng_ex.h
index f93507ce..c1792c73 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rng_ex.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rng_ex.h
@@ -35,19 +35,19 @@ extern "C" {
 #if defined(RNG)
 #if defined(RNG_CR_CONDRST)
 
-/** @defgroup RNGEx RNGEx
+/** @defgroup RNG_Ex RNG_Ex
   * @brief RNG Extension HAL module driver
   * @{
   */
 
 /* Exported types ------------------------------------------------------------*/
-/** @defgroup RNGEx_Exported_Types RNGEx Exported Types
-  * @brief RNGEx Exported types
+/** @defgroup RNG_Ex_Exported_Types RNG_Ex Exported Types
+  * @brief RNG_Ex Exported types
   * @{
   */
 
 /**
-  * @brief RNGEX Configuration Structure definition
+  * @brief RNG_Ex Configuration Structure definition
   */
 
 typedef struct
@@ -56,9 +56,9 @@ typedef struct
   uint32_t        Config2;           /*!< Config2 must be a value between 0 and 0x7 */
   uint32_t        Config3;           /*!< Config3 must be a value between 0 and 0xF */
   uint32_t        ClockDivider;      /*!< Clock Divider factor.This parameter can
-                                          be a value of @ref RNGEX_Clock_Divider_Factor   */
+                                          be a value of @ref RNG_Ex_Clock_Divider_Factor   */
   uint32_t        NistCompliance;    /*!< NIST compliance.This parameter can be a
-                                          value of @ref RNGEX_NIST_Compliance   */
+                                          value of @ref RNG_Ex_NIST_Compliance   */
 } RNG_ConfigTypeDef;
 
 /**
@@ -66,11 +66,11 @@ typedef struct
   */
 
 /* Exported constants --------------------------------------------------------*/
-/** @defgroup RNGEX_Exported_Constants RNGEX Exported Constants
+/** @defgroup RNG_Ex_Exported_Constants RNG_Ex Exported Constants
   * @{
   */
 
-/** @defgroup RNGEX_Clock_Divider_Factor  Value used to configure an internal
+/** @defgroup RNG_Ex_Clock_Divider_Factor  Value used to configure an internal
   *            programmable divider acting on the incoming RNG clock
   * @{
   */
@@ -109,7 +109,7 @@ typedef struct
   * @}
   */
 
-/** @defgroup RNGEX_NIST_Compliance  NIST Compliance configuration
+/** @defgroup RNG_Ex_NIST_Compliance  NIST Compliance configuration
   * @{
   */
 #define RNG_NIST_COMPLIANT     (0x00000000UL) /*!< NIST compliant configuration*/
@@ -124,7 +124,7 @@ typedef struct
   */
 
 /* Private types -------------------------------------------------------------*/
-/** @defgroup RNGEx_Private_Types RNGEx Private Types
+/** @defgroup RNG_Ex_Private_Types RNG_Ex Private Types
   * @{
   */
 
@@ -133,7 +133,7 @@ typedef struct
   */
 
 /* Private variables ---------------------------------------------------------*/
-/** @defgroup RNGEx_Private_Variables RNGEx Private Variables
+/** @defgroup RNG_Ex_Private_Variables RNG_Ex Private Variables
   * @{
   */
 
@@ -142,7 +142,7 @@ typedef struct
   */
 
 /* Private constants ---------------------------------------------------------*/
-/** @defgroup RNGEx_Private_Constants RNGEx Private Constants
+/** @defgroup RNG_Ex_Private_Constants RNG_Ex Private Constants
   * @{
   */
 
@@ -151,7 +151,7 @@ typedef struct
   */
 
 /* Private macros ------------------------------------------------------------*/
-/** @defgroup RNGEx_Private_Macros RNGEx Private Macros
+/** @defgroup RNG_Ex_Private_Macros RNG_Ex Private Macros
   * @{
   */
 
@@ -188,7 +188,7 @@ typedef struct
   */
 
 /* Private functions ---------------------------------------------------------*/
-/** @defgroup RNGEx_Private_Functions RNGEx Private Functions
+/** @defgroup RNG_Ex_Private_Functions RNG_Ex Private Functions
   * @{
   */
 
@@ -197,11 +197,11 @@ typedef struct
   */
 
 /* Exported functions --------------------------------------------------------*/
-/** @defgroup RNGEx_Exported_Functions RNGEx Exported Functions
+/** @defgroup RNG_Ex_Exported_Functions RNG_Ex Exported Functions
   * @{
   */
 
-/** @addtogroup RNGEx_Exported_Functions_Group1
+/** @addtogroup RNG_Ex_Exported_Functions_Group1
   * @{
   */
 HAL_StatusTypeDef HAL_RNGEx_SetConfig(RNG_HandleTypeDef *hrng, RNG_ConfigTypeDef *pConf);
@@ -212,7 +212,7 @@ HAL_StatusTypeDef HAL_RNGEx_LockConfig(RNG_HandleTypeDef *hrng);
   * @}
   */
 
-/** @addtogroup RNGEx_Exported_Functions_Group2
+/** @addtogroup RNG_Ex_Exported_Functions_Group2
   * @{
   */
 HAL_StatusTypeDef HAL_RNGEx_RecoverSeedError(RNG_HandleTypeDef *hrng);
@@ -245,6 +245,6 @@ HAL_StatusTypeDef HAL_RNGEx_RecoverSeedError(RNG_HandleTypeDef *hrng);
 #endif
 
 
-#endif /* STM32WLxx_HAL_RNGEX_H */
+#endif /* STM32WLxx_HAL_RNG_EX_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rtc_ex.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rtc_ex.h
index f6abf908..6906e9f1 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rtc_ex.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_rtc_ex.h
@@ -322,13 +322,13 @@ typedef struct
 #define RTC_IT_TAMP_1                      TAMP_IER_TAMP1IE     /*!< Tamper 1 Interrupt */
 #define RTC_IT_TAMP_2                      TAMP_IER_TAMP2IE     /*!< Tamper 2 Interrupt */
 #define RTC_IT_TAMP_3                      TAMP_IER_TAMP3IE     /*!< Tamper 3 Interrupt */
-#define RTC_IT_TAMP_ALL                   (TAMP_IER_TAMP1IE | TAMP_IER_TAMP2IE | TAMP_IER_TAMP3IE)
+#define RTC_IT_TAMP_ALL                    (TAMP_IER_TAMP1IE | TAMP_IER_TAMP2IE | TAMP_IER_TAMP3IE)
 
 #define RTC_IT_INT_TAMP_3                  TAMP_IER_ITAMP3IE
 #define RTC_IT_INT_TAMP_5                  TAMP_IER_ITAMP5IE
 #define RTC_IT_INT_TAMP_6                  TAMP_IER_ITAMP6IE
 #define RTC_IT_INT_TAMP_8                  TAMP_IER_ITAMP8IE
-#define RTC_IT_INT_TAMP_ALL                (TAMP_IT_INT_TAMP3 | TAMP_IT_INT_TAMP5 | TAMP_IT_INT_TAMP6 | TAMP_IT_INT_TAMP8)
+#define RTC_IT_INT_TAMP_ALL                (TAMP_IER_ITAMP3IE | TAMP_IER_ITAMP5IE | TAMP_IER_ITAMP6IE | TAMP_IER_ITAMP8IE)
 /**
   * @}
   */
@@ -339,7 +339,7 @@ typedef struct
 #define RTC_FLAG_TAMP_1                    TAMP_SR_TAMP1F
 #define RTC_FLAG_TAMP_2                    TAMP_SR_TAMP2F
 #define RTC_FLAG_TAMP_3                    TAMP_SR_TAMP3F
-#define RTC_FLAG_TAMP_ALL                 (RTC_FLAG_TAMP1 | RTC_FLAG_TAMP2 | RTC_FLAG_TAMP3 )
+#define RTC_FLAG_TAMP_ALL                  (RTC_FLAG_TAMP1 | RTC_FLAG_TAMP2 | RTC_FLAG_TAMP3 )
 
 
 #define RTC_FLAG_INT_TAMP_3                 TAMP_SR_ITAMP3F
@@ -727,13 +727,13 @@ typedef struct
 #if defined(CORE_CM0PLUS)
 #define __HAL_RTC_TIMESTAMP_EXTI_ENABLE_IT()        (EXTI->C2IMR1 |= RTC_EXTI_LINE_TIMESTAMP_EVENT)
 #define __HAL_RTC_TIMESTAMP_EXTI_DISABLE_IT()       (EXTI->C2IMR1 &= ~(RTC_EXTI_LINE_TIMESTAMP_EVENT))
-#define __HAL_RTC_TIMESTAMP_EXTI_ENABLE_EVENT()    (EXTI->C2EMR1 |= RTC_EXTI_LINE_TIMESTAMP_EVENT)
-#define __HAL_RTC_TIMESTAMP_EXTI_DISABLE_EVENT()   (EXTI->C2EMR1 &= ~(RTC_EXTI_LINE_TIMESTAMP_EVENT))
+#define __HAL_RTC_TIMESTAMP_EXTI_ENABLE_EVENT()     (EXTI->C2EMR1 |= RTC_EXTI_LINE_TIMESTAMP_EVENT)
+#define __HAL_RTC_TIMESTAMP_EXTI_DISABLE_EVENT()    (EXTI->C2EMR1 &= ~(RTC_EXTI_LINE_TIMESTAMP_EVENT))
 #else
 #define __HAL_RTC_TIMESTAMP_EXTI_ENABLE_IT()        (EXTI->IMR1 |= RTC_EXTI_LINE_TIMESTAMP_EVENT)
 #define __HAL_RTC_TIMESTAMP_EXTI_DISABLE_IT()       (EXTI->IMR1 &= ~(RTC_EXTI_LINE_TIMESTAMP_EVENT))
-#define __HAL_RTC_TIMESTAMP_EXTI_ENABLE_EVENT()    (EXTI->EMR1 |= RTC_EXTI_LINE_TIMESTAMP_EVENT)
-#define __HAL_RTC_TIMESTAMP_EXTI_DISABLE_EVENT()   (EXTI->EMR1 &= ~(RTC_EXTI_LINE_TIMESTAMP_EVENT))
+#define __HAL_RTC_TIMESTAMP_EXTI_ENABLE_EVENT()     (EXTI->EMR1 |= RTC_EXTI_LINE_TIMESTAMP_EVENT)
+#define __HAL_RTC_TIMESTAMP_EXTI_DISABLE_EVENT()    (EXTI->EMR1 &= ~(RTC_EXTI_LINE_TIMESTAMP_EVENT))
 #endif
 
 /**
@@ -866,9 +866,14 @@ typedef struct
   *            @arg  RTC_TAMPER_1: Tamper1
   *            @arg  RTC_TAMPER_2: Tamper2
   *            @arg  RTC_TAMPER_3: Tamper3
+  *            @arg  RTC_IT_INT_TAMP_ALL: All Internal Tamper interrupts
+  *            @arg  RTC_IT_INT_TAMP_3: Internal Tamper3 interrupt
+  *            @arg  RTC_IT_INT_TAMP_5: Internal Tamper5 interrupt
+  *            @arg  RTC_IT_INT_TAMP_6: Internal Tamper6 interrupt
+  *            @arg  RTC_IT_INT_TAMP_8: Internal Tamper8 interrupt
   * @retval None
   */
-#define __HAL_RTC_TAMPER_ENABLE(__HANDLE__, __TAMPER__)           ((TAMP->CR1 |= (__TAMPER__))
+#define __HAL_RTC_TAMPER_ENABLE(__HANDLE__, __TAMPER__)           (TAMP->CR1 |= (__TAMPER__))
 
 /**
   * @brief  Disable the TAMP Tamper input detection.
@@ -879,8 +884,13 @@ typedef struct
   *            @arg  RTC_TAMPER_1: Tamper1
   *            @arg  RTC_TAMPER_2: Tamper2
   *            @arg  RTC_TAMPER_3: Tamper3
+  *            @arg  RTC_IT_INT_TAMP_ALL: All Internal Tamper interrupts
+  *            @arg  RTC_IT_INT_TAMP_3: Internal Tamper3 interrupt
+  *            @arg  RTC_IT_INT_TAMP_5: Internal Tamper5 interrupt
+  *            @arg  RTC_IT_INT_TAMP_6: Internal Tamper6 interrupt
+  *            @arg  RTC_IT_INT_TAMP_8: Internal Tamper8 interrupt
   */
-#define __HAL_RTC_TAMPER_DISABLE(__HANDLE__, __TAMPER__)           ((TAMP->CR1 &= ~(__TAMPER__))
+#define __HAL_RTC_TAMPER_DISABLE(__HANDLE__, __TAMPER__)           (TAMP->CR1 &= ~(__TAMPER__))
 
 
 /**************************************************************************************************/
@@ -893,9 +903,14 @@ typedef struct
   *            @arg  RTC_IT_TAMP_1: Tamper1 interrupt
   *            @arg  RTC_IT_TAMP_2: Tamper2 interrupt
   *            @arg  RTC_IT_TAMP_3: Tamper3 interrupt
+  *            @arg  RTC_IT_INT_TAMP_ALL: All Internal Tamper interrupts
+  *            @arg  RTC_IT_INT_TAMP_3: Internal Tamper3 interrupt
+  *            @arg  RTC_IT_INT_TAMP_5: Internal Tamper5 interrupt
+  *            @arg  RTC_IT_INT_TAMP_6: Internal Tamper6 interrupt
+  *            @arg  RTC_IT_INT_TAMP_8: Internal Tamper8 interrupt
   * @retval None
   */
-#define __HAL_RTC_TAMPER_ENABLE_IT(__HANDLE__, __INTERRUPT__)        ((TAMP->IER |= (__INTERRUPT__))
+#define __HAL_RTC_TAMPER_ENABLE_IT(__HANDLE__, __INTERRUPT__)        (TAMP->IER |= (__INTERRUPT__))
 
 /**
   * @brief  Disable the TAMP Tamper interrupt.
@@ -906,10 +921,14 @@ typedef struct
   *            @arg  RTC_IT_TAMP_1: Tamper1 interrupt
   *            @arg  RTC_IT_TAMP_2: Tamper2 interrupt
   *            @arg  RTC_IT_TAMP_3: Tamper3 interrupt
-
+  *            @arg  RTC_IT_INT_TAMP_ALL: All Internal Tamper interrupts
+  *            @arg  RTC_IT_INT_TAMP_3: Internal Tamper3 interrupt
+  *            @arg  RTC_IT_INT_TAMP_5: Internal Tamper5 interrupt
+  *            @arg  RTC_IT_INT_TAMP_6: Internal Tamper6 interrupt
+  *            @arg  RTC_IT_INT_TAMP_8: Internal Tamper8 interrupt
   * @retval None
   */
-#define __HAL_RTC_TAMPER_DISABLE_IT(__HANDLE__, __INTERRUPT__)       ((TAMP->IER &= ~(__INTERRUPT__))
+#define __HAL_RTC_TAMPER_DISABLE_IT(__HANDLE__, __INTERRUPT__)       (TAMP->IER &= ~(__INTERRUPT__))
 
 
 /**************************************************************************************************/
@@ -929,7 +948,7 @@ typedef struct
   *            @arg  RTC_IT_INT_TAMP_8: Internal Tamper8 interrupt
   * @retval None
   */
-#define __HAL_RTC_TAMPER_GET_IT(__HANDLE__, __INTERRUPT__)     (((((TAMP->MISR) & (__INTERRUPT__)) != 0U) ? 1UL : 0UL)
+#define __HAL_RTC_TAMPER_GET_IT(__HANDLE__, __INTERRUPT__)     ((((TAMP->MISR) & (__INTERRUPT__)) != 0U) ? 1UL : 0UL)
 
 
 /**
@@ -948,7 +967,7 @@ typedef struct
   *            @arg  RTC_IT_INT_TAMP_8: Internal Tamper8 interrupt
   * @retval None
   */
-#define __HAL_RTC_TAMPER_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__)    (((((TAMP->IER) & (__INTERRUPT__)) != 0U) ? 1UL : 0UL)
+#define __HAL_RTC_TAMPER_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__)    ((((TAMP->IER) & (__INTERRUPT__)) != 0U) ? 1UL : 0UL)
 
 
 /**
@@ -990,13 +1009,13 @@ typedef struct
 #if defined(CORE_CM0PLUS)
 #define __HAL_RTC_TAMPER_EXTI_ENABLE_IT()        (EXTI->C2IMR1 |= RTC_EXTI_LINE_TAMPER_EVENT)
 #define __HAL_RTC_TAMPER_EXTI_DISABLE_IT()       (EXTI->C2IMR1 &= ~(RTC_EXTI_LINE_TAMPER_EVENT))
-#define __HAL_RTC_TAMPER_EXTI_ENABLE_EVENT()    (EXTI->C2EMR1 |= RTC_EXTI_LINE_TAMPER_EVENT)
-#define __HAL_RTC_TAMPER_EXTI_DISABLE_EVENT()   (EXTI->C2EMR1 &= ~(RTC_EXTI_LINE_TAMPER_EVENT))
+#define __HAL_RTC_TAMPER_EXTI_ENABLE_EVENT()     (EXTI->C2EMR1 |= RTC_EXTI_LINE_TAMPER_EVENT)
+#define __HAL_RTC_TAMPER_EXTI_DISABLE_EVENT()    (EXTI->C2EMR1 &= ~(RTC_EXTI_LINE_TAMPER_EVENT))
 #else
 #define __HAL_RTC_TAMPER_EXTI_ENABLE_IT()        (EXTI->IMR1 |= RTC_EXTI_LINE_TAMPER_EVENT)
 #define __HAL_RTC_TAMPER_EXTI_DISABLE_IT()       (EXTI->IMR1 &= ~(RTC_EXTI_LINE_TAMPER_EVENT))
-#define __HAL_RTC_TAMPER_EXTI_ENABLE_EVENT()    (EXTI->EMR1 |= RTC_EXTI_LINE_TAMPER_EVENT)
-#define __HAL_RTC_TAMPER_EXTI_DISABLE_EVENT()   (EXTI->EMR1 &= ~(RTC_EXTI_LINE_TAMPER_EVENT))
+#define __HAL_RTC_TAMPER_EXTI_ENABLE_EVENT()     (EXTI->EMR1 |= RTC_EXTI_LINE_TAMPER_EVENT)
+#define __HAL_RTC_TAMPER_EXTI_DISABLE_EVENT()    (EXTI->EMR1 &= ~(RTC_EXTI_LINE_TAMPER_EVENT))
 #endif
 
 /**
@@ -1037,7 +1056,7 @@ typedef struct
   *            @arg @ref RTC_IT_SSRU  SSRU interrupt
   * @retval None
   */
-#define __HAL_RTC_SSRU_GET_IT(__HANDLE__, __INTERRUPT__)       ((((RTC->MISR) & ((__INTERRUPT__) >> 1) != 0U) ? 1U : 0U)
+#define __HAL_RTC_SSRU_GET_IT(__HANDLE__, __INTERRUPT__)       (((RTC->MISR) & ((__INTERRUPT__) >> 1) != 0U) ? 1U : 0U)
 /**
   * @brief  Check whether the specified RTC Wake Up timer interrupt has been enabled or not.
   * @param  __HANDLE__ specifies the RTC handle.
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smartcard.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smartcard.h
index cb80428c..4d20df41 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smartcard.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smartcard.h
@@ -159,7 +159,7 @@ typedef struct
   *             11 : Error
   *          b5     Peripheral initialization status
   *             0  : Reset (Peripheral not initialized)
-  *             1  : Init done (Peripheral not initialized. HAL SMARTCARD Init function already called)
+  *             1  : Init done (Peripheral initialized. HAL SMARTCARD Init function already called)
   *          b4-b3  (not used)
   *             xx : Should be set to 00
   *          b2     Intrinsic process state
@@ -176,7 +176,7 @@ typedef struct
   *             xx : Should be set to 00
   *          b5     Peripheral initialization status
   *             0  : Reset (Peripheral not initialized)
-  *             1  : Init done (Peripheral not initialized)
+  *             1  : Init done (Peripheral initialized)
   *          b4-b2  (not used)
   *            xxx : Should be set to 000
   *          b1     Rx state
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smbus.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smbus.h
index 51bd713f..8db5112e 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smbus.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smbus.h
@@ -27,6 +27,7 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal_def.h"
+#include "stm32wlxx_hal_smbus_ex.h"
 
 /** @addtogroup STM32WLxx_HAL_Driver
   * @{
@@ -48,42 +49,43 @@ extern "C" {
 typedef struct
 {
   uint32_t Timing;                 /*!< Specifies the SMBUS_TIMINGR_register value.
-                                     This parameter calculated by referring to SMBUS initialization
-                                            section in Reference manual */
+                                        This parameter calculated by referring to SMBUS initialization section
+                                        in Reference manual */
   uint32_t AnalogFilter;           /*!< Specifies if Analog Filter is enable or not.
-                                     This parameter can be a value of @ref SMBUS_Analog_Filter */
+                                        This parameter can be a value of @ref SMBUS_Analog_Filter */
 
   uint32_t OwnAddress1;            /*!< Specifies the first device own address.
-                                     This parameter can be a 7-bit or 10-bit address. */
+                                        This parameter can be a 7-bit or 10-bit address. */
 
   uint32_t AddressingMode;         /*!< Specifies if 7-bit or 10-bit addressing mode for master is selected.
-                                     This parameter can be a value of @ref SMBUS_addressing_mode */
+                                        This parameter can be a value of @ref SMBUS_addressing_mode */
 
   uint32_t DualAddressMode;        /*!< Specifies if dual addressing mode is selected.
-                                     This parameter can be a value of @ref SMBUS_dual_addressing_mode */
+                                        This parameter can be a value of @ref SMBUS_dual_addressing_mode */
 
   uint32_t OwnAddress2;            /*!< Specifies the second device own address if dual addressing mode is selected
-                                     This parameter can be a 7-bit address. */
+                                        This parameter can be a 7-bit address. */
 
-  uint32_t OwnAddress2Masks;       /*!< Specifies the acknowledge mask address second device own address if dual addressing mode is selected
-                                     This parameter can be a value of @ref SMBUS_own_address2_masks. */
+  uint32_t OwnAddress2Masks;       /*!< Specifies the acknowledge mask address second device own address
+                                        if dual addressing mode is selected
+                                        This parameter can be a value of @ref SMBUS_own_address2_masks. */
 
   uint32_t GeneralCallMode;        /*!< Specifies if general call mode is selected.
-                                     This parameter can be a value of @ref SMBUS_general_call_addressing_mode. */
+                                        This parameter can be a value of @ref SMBUS_general_call_addressing_mode. */
 
   uint32_t NoStretchMode;          /*!< Specifies if nostretch mode is selected.
-                                     This parameter can be a value of @ref SMBUS_nostretch_mode */
+                                        This parameter can be a value of @ref SMBUS_nostretch_mode */
 
   uint32_t PacketErrorCheckMode;   /*!< Specifies if Packet Error Check mode is selected.
-                                     This parameter can be a value of @ref SMBUS_packet_error_check_mode */
+                                        This parameter can be a value of @ref SMBUS_packet_error_check_mode */
 
   uint32_t PeripheralMode;         /*!< Specifies which mode of Periphal is selected.
-                                     This parameter can be a value of @ref SMBUS_peripheral_mode */
+                                        This parameter can be a value of @ref SMBUS_peripheral_mode */
 
   uint32_t SMBusTimeout;           /*!< Specifies the content of the 32 Bits SMBUS_TIMEOUT_register value.
-                                      (Enable bits and different timeout values)
-                                     This parameter calculated by referring to SMBUS initialization
-                                         section in Reference manual */
+                                        (Enable bits and different timeout values)
+                                        This parameter calculated by referring to SMBUS initialization section
+                                        in Reference manual */
 } SMBUS_InitTypeDef;
 /**
   * @}
@@ -102,7 +104,7 @@ typedef struct
 #define HAL_SMBUS_STATE_SLAVE_BUSY_RX   (0x00000042U)  /*!< Slave Data Reception process is ongoing       */
 #define HAL_SMBUS_STATE_TIMEOUT         (0x00000003U)  /*!< Timeout state                                 */
 #define HAL_SMBUS_STATE_ERROR           (0x00000004U)  /*!< Reception process is ongoing                  */
-#define HAL_SMBUS_STATE_LISTEN          (0x00000008U)   /*!< Address Listen Mode is ongoing                */
+#define HAL_SMBUS_STATE_LISTEN          (0x00000008U)  /*!< Address Listen Mode is ongoing                */
 /**
   * @}
   */
@@ -121,7 +123,7 @@ typedef struct
 #define HAL_SMBUS_ERROR_ALERT           (0x00000040U)    /*!< Alert error          */
 #define HAL_SMBUS_ERROR_PECERR          (0x00000080U)    /*!< PEC error            */
 #if (USE_HAL_SMBUS_REGISTER_CALLBACKS == 1)
-#define HAL_SMBUS_ERROR_INVALID_CALLBACK  (0x00000100U)    /*!< Invalid Callback error */
+#define HAL_SMBUS_ERROR_INVALID_CALLBACK  (0x00000100U)  /*!< Invalid Callback error   */
 #endif /* USE_HAL_SMBUS_REGISTER_CALLBACKS */
 #define HAL_SMBUS_ERROR_INVALID_PARAM    (0x00000200U)   /*!< Invalid Parameters error */
 /**
@@ -159,17 +161,26 @@ typedef struct
   __IO uint32_t                ErrorCode;       /*!< SMBUS Error code                   */
 
 #if (USE_HAL_SMBUS_REGISTER_CALLBACKS == 1)
-  void (* MasterTxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);           /*!< SMBUS Master Tx Transfer completed callback */
-  void (* MasterRxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);           /*!< SMBUS Master Rx Transfer completed callback */
-  void (* SlaveTxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);            /*!< SMBUS Slave Tx Transfer completed callback  */
-  void (* SlaveRxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);            /*!< SMBUS Slave Rx Transfer completed callback  */
-  void (* ListenCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);             /*!< SMBUS Listen Complete callback              */
-  void (* ErrorCallback)(struct __SMBUS_HandleTypeDef *hsmbus);                  /*!< SMBUS Error callback                        */
-
-  void (* AddrCallback)(struct __SMBUS_HandleTypeDef *hsmbus, uint8_t TransferDirection, uint16_t AddrMatchCode);  /*!< SMBUS Slave Address Match callback */
-
-  void (* MspInitCallback)(struct __SMBUS_HandleTypeDef *hsmbus);                /*!< SMBUS Msp Init callback                     */
-  void (* MspDeInitCallback)(struct __SMBUS_HandleTypeDef *hsmbus);              /*!< SMBUS Msp DeInit callback                   */
+  void (* MasterTxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);
+  /*!< SMBUS Master Tx Transfer completed callback */
+  void (* MasterRxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);
+  /*!< SMBUS Master Rx Transfer completed callback */
+  void (* SlaveTxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);
+  /*!< SMBUS Slave Tx Transfer completed callback  */
+  void (* SlaveRxCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);
+  /*!< SMBUS Slave Rx Transfer completed callback  */
+  void (* ListenCpltCallback)(struct __SMBUS_HandleTypeDef *hsmbus);
+  /*!< SMBUS Listen Complete callback              */
+  void (* ErrorCallback)(struct __SMBUS_HandleTypeDef *hsmbus);
+  /*!< SMBUS Error callback                        */
+
+  void (* AddrCallback)(struct __SMBUS_HandleTypeDef *hsmbus, uint8_t TransferDirection, uint16_t AddrMatchCode);
+  /*!< SMBUS Slave Address Match callback */
+
+  void (* MspInitCallback)(struct __SMBUS_HandleTypeDef *hsmbus);
+  /*!< SMBUS Msp Init callback                     */
+  void (* MspDeInitCallback)(struct __SMBUS_HandleTypeDef *hsmbus);
+  /*!< SMBUS Msp DeInit callback                   */
 
 #endif  /* USE_HAL_SMBUS_REGISTER_CALLBACKS */
 } SMBUS_HandleTypeDef;
@@ -195,8 +206,11 @@ typedef enum
 /**
   * @brief  HAL SMBUS Callback pointer definition
   */
-typedef  void (*pSMBUS_CallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus); /*!< pointer to an SMBUS callback function */
-typedef  void (*pSMBUS_AddrCallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus, uint8_t TransferDirection, uint16_t AddrMatchCode); /*!< pointer to an SMBUS Address Match callback function */
+typedef  void (*pSMBUS_CallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus);
+/*!< pointer to an SMBUS callback function */
+typedef  void (*pSMBUS_AddrCallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus, uint8_t TransferDirection,
+                                            uint16_t AddrMatchCode);
+/*!< pointer to an SMBUS Address Match callback function */
 
 #endif /* USE_HAL_SMBUS_REGISTER_CALLBACKS */
 /**
@@ -358,9 +372,10 @@ typedef  void (*pSMBUS_AddrCallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus, uint8_t
 #define SMBUS_IT_ADDRI                          I2C_CR1_ADDRIE
 #define SMBUS_IT_RXI                            I2C_CR1_RXIE
 #define SMBUS_IT_TXI                            I2C_CR1_TXIE
-#define SMBUS_IT_TX                             (SMBUS_IT_ERRI | SMBUS_IT_TCI | SMBUS_IT_STOPI | SMBUS_IT_NACKI | \
-                                                 SMBUS_IT_TXI)
-#define SMBUS_IT_RX                             (SMBUS_IT_ERRI | SMBUS_IT_TCI | SMBUS_IT_NACKI | SMBUS_IT_RXI)
+#define SMBUS_IT_TX                             (SMBUS_IT_ERRI | SMBUS_IT_TCI | SMBUS_IT_STOPI | \
+                                                 SMBUS_IT_NACKI | SMBUS_IT_TXI)
+#define SMBUS_IT_RX                             (SMBUS_IT_ERRI | SMBUS_IT_TCI | SMBUS_IT_NACKI | \
+                                                 SMBUS_IT_RXI)
 #define SMBUS_IT_ALERT                          (SMBUS_IT_ERRI)
 #define SMBUS_IT_ADDR                           (SMBUS_IT_ADDRI | SMBUS_IT_STOPI | SMBUS_IT_NACKI)
 /**
@@ -408,14 +423,14 @@ typedef  void (*pSMBUS_AddrCallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus, uint8_t
   * @retval None
   */
 #if (USE_HAL_SMBUS_REGISTER_CALLBACKS == 1)
-#define __HAL_SMBUS_RESET_HANDLE_STATE(__HANDLE__)           do{                                                   \
-                                                                 (__HANDLE__)->State = HAL_SMBUS_STATE_RESET;       \
+#define __HAL_SMBUS_RESET_HANDLE_STATE(__HANDLE__)           do{                                               \
+                                                                 (__HANDLE__)->State = HAL_SMBUS_STATE_RESET;  \
                                                                  (__HANDLE__)->MspInitCallback = NULL;            \
                                                                  (__HANDLE__)->MspDeInitCallback = NULL;          \
                                                                } while(0)
 #else
 #define __HAL_SMBUS_RESET_HANDLE_STATE(__HANDLE__)         ((__HANDLE__)->State = HAL_SMBUS_STATE_RESET)
-#endif
+#endif /* USE_HAL_SMBUS_REGISTER_CALLBACKS */
 
 /** @brief  Enable the specified SMBUS interrupts.
   * @param  __HANDLE__ specifies the SMBUS Handle.
@@ -491,7 +506,8 @@ typedef  void (*pSMBUS_AddrCallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus, uint8_t
   */
 #define SMBUS_FLAG_MASK  (0x0001FFFFU)
 #define __HAL_SMBUS_GET_FLAG(__HANDLE__, __FLAG__) \
-  (((((__HANDLE__)->Instance->ISR) & ((__FLAG__) & SMBUS_FLAG_MASK)) == ((__FLAG__) & SMBUS_FLAG_MASK)) ? SET : RESET)
+  (((((__HANDLE__)->Instance->ISR) & ((__FLAG__) & SMBUS_FLAG_MASK)) == \
+    ((__FLAG__) & SMBUS_FLAG_MASK)) ? SET : RESET)
 
 /** @brief  Clear the SMBUS pending flags which are cleared by writing 1 in a specific bit.
   * @param  __HANDLE__ specifies the SMBUS Handle.
@@ -574,43 +590,52 @@ typedef  void (*pSMBUS_AddrCallbackTypeDef)(SMBUS_HandleTypeDef *hsmbus, uint8_t
                                                          ((MODE) == SMBUS_PERIPHERAL_MODE_SMBUS_SLAVE)  || \
                                                          ((MODE) == SMBUS_PERIPHERAL_MODE_SMBUS_SLAVE_ARP))
 
-#define IS_SMBUS_TRANSFER_MODE(MODE)                    (((MODE) == SMBUS_RELOAD_MODE)                          || \
-                                                         ((MODE) == SMBUS_AUTOEND_MODE)                         || \
-                                                         ((MODE) == SMBUS_SOFTEND_MODE)                         || \
-                                                         ((MODE) == SMBUS_SENDPEC_MODE)                         || \
-                                                         ((MODE) == (SMBUS_RELOAD_MODE | SMBUS_SENDPEC_MODE))   || \
-                                                         ((MODE) == (SMBUS_AUTOEND_MODE | SMBUS_SENDPEC_MODE))  || \
-                                                         ((MODE) == (SMBUS_AUTOEND_MODE | SMBUS_RELOAD_MODE))   || \
-                                                         ((MODE) == (SMBUS_AUTOEND_MODE | SMBUS_SENDPEC_MODE | SMBUS_RELOAD_MODE )))
+#define IS_SMBUS_TRANSFER_MODE(MODE)                 (((MODE) == SMBUS_RELOAD_MODE)                          || \
+                                                      ((MODE) == SMBUS_AUTOEND_MODE)                         || \
+                                                      ((MODE) == SMBUS_SOFTEND_MODE)                         || \
+                                                      ((MODE) == SMBUS_SENDPEC_MODE)                         || \
+                                                      ((MODE) == (SMBUS_RELOAD_MODE | SMBUS_SENDPEC_MODE))   || \
+                                                      ((MODE) == (SMBUS_AUTOEND_MODE | SMBUS_SENDPEC_MODE))  || \
+                                                      ((MODE) == (SMBUS_AUTOEND_MODE | SMBUS_RELOAD_MODE))   || \
+                                                      ((MODE) == (SMBUS_AUTOEND_MODE | SMBUS_SENDPEC_MODE | \
+                                                                  SMBUS_RELOAD_MODE )))
 
 
 #define IS_SMBUS_TRANSFER_REQUEST(REQUEST)              (((REQUEST) == SMBUS_GENERATE_STOP)              || \
-                                                         ((REQUEST) == SMBUS_GENERATE_START_READ)       || \
-                                                         ((REQUEST) == SMBUS_GENERATE_START_WRITE)      || \
+                                                         ((REQUEST) == SMBUS_GENERATE_START_READ)        || \
+                                                         ((REQUEST) == SMBUS_GENERATE_START_WRITE)       || \
                                                          ((REQUEST) == SMBUS_NO_STARTSTOP))
 
 
-#define IS_SMBUS_TRANSFER_OPTIONS_REQUEST(REQUEST)      (IS_SMBUS_TRANSFER_OTHER_OPTIONS_REQUEST(REQUEST)       || \
-                                                         ((REQUEST) == SMBUS_FIRST_FRAME)                       || \
-                                                         ((REQUEST) == SMBUS_NEXT_FRAME)                        || \
-                                                         ((REQUEST) == SMBUS_FIRST_AND_LAST_FRAME_NO_PEC)       || \
-                                                         ((REQUEST) == SMBUS_LAST_FRAME_NO_PEC)                 || \
-                                                         ((REQUEST) == SMBUS_FIRST_FRAME_WITH_PEC)              || \
-                                                         ((REQUEST) == SMBUS_FIRST_AND_LAST_FRAME_WITH_PEC)     || \
-                                                         ((REQUEST) == SMBUS_LAST_FRAME_WITH_PEC))
+#define IS_SMBUS_TRANSFER_OPTIONS_REQUEST(REQUEST)   (IS_SMBUS_TRANSFER_OTHER_OPTIONS_REQUEST(REQUEST)       || \
+                                                      ((REQUEST) == SMBUS_FIRST_FRAME)                       || \
+                                                      ((REQUEST) == SMBUS_NEXT_FRAME)                        || \
+                                                      ((REQUEST) == SMBUS_FIRST_AND_LAST_FRAME_NO_PEC)       || \
+                                                      ((REQUEST) == SMBUS_LAST_FRAME_NO_PEC)                 || \
+                                                      ((REQUEST) == SMBUS_FIRST_FRAME_WITH_PEC)              || \
+                                                      ((REQUEST) == SMBUS_FIRST_AND_LAST_FRAME_WITH_PEC)     || \
+                                                      ((REQUEST) == SMBUS_LAST_FRAME_WITH_PEC))
 
-#define IS_SMBUS_TRANSFER_OTHER_OPTIONS_REQUEST(REQUEST) (((REQUEST) == SMBUS_OTHER_FRAME_NO_PEC)                || \
-                                                          ((REQUEST) == SMBUS_OTHER_AND_LAST_FRAME_NO_PEC)       || \
-                                                          ((REQUEST) == SMBUS_OTHER_FRAME_WITH_PEC)              || \
+#define IS_SMBUS_TRANSFER_OTHER_OPTIONS_REQUEST(REQUEST) (((REQUEST) == SMBUS_OTHER_FRAME_NO_PEC)             || \
+                                                          ((REQUEST) == SMBUS_OTHER_AND_LAST_FRAME_NO_PEC)    || \
+                                                          ((REQUEST) == SMBUS_OTHER_FRAME_WITH_PEC)           || \
                                                           ((REQUEST) == SMBUS_OTHER_AND_LAST_FRAME_WITH_PEC))
 
-#define SMBUS_RESET_CR1(__HANDLE__)                       ((__HANDLE__)->Instance->CR1 &= \
-                                                           (uint32_t)~((uint32_t)(I2C_CR1_SMBHEN | I2C_CR1_SMBDEN | I2C_CR1_PECEN)))
-#define SMBUS_RESET_CR2(__HANDLE__)                       ((__HANDLE__)->Instance->CR2 &= \
-                                                           (uint32_t)~((uint32_t)(I2C_CR2_SADD | I2C_CR2_HEAD10R | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_RD_WRN)))
-
-#define SMBUS_GENERATE_START(__ADDMODE__,__ADDRESS__)     (((__ADDMODE__) == SMBUS_ADDRESSINGMODE_7BIT) ? (uint32_t)((((uint32_t)(__ADDRESS__) & (I2C_CR2_SADD)) | (I2C_CR2_START) | (I2C_CR2_AUTOEND)) & (~I2C_CR2_RD_WRN)) : \
-                                                           (uint32_t)((((uint32_t)(__ADDRESS__) & (I2C_CR2_SADD)) | (I2C_CR2_ADD10) | (I2C_CR2_START)) & (~I2C_CR2_RD_WRN)))
+#define SMBUS_RESET_CR1(__HANDLE__)                    ((__HANDLE__)->Instance->CR1 &= \
+                                                        (uint32_t)~((uint32_t)(I2C_CR1_SMBHEN | I2C_CR1_SMBDEN | \
+                                                                               I2C_CR1_PECEN)))
+#define SMBUS_RESET_CR2(__HANDLE__)                    ((__HANDLE__)->Instance->CR2 &= \
+                                                        (uint32_t)~((uint32_t)(I2C_CR2_SADD | I2C_CR2_HEAD10R | \
+                                                                               I2C_CR2_NBYTES | I2C_CR2_RELOAD | \
+                                                                               I2C_CR2_RD_WRN)))
+
+#define SMBUS_GENERATE_START(__ADDMODE__,__ADDRESS__)     (((__ADDMODE__) == SMBUS_ADDRESSINGMODE_7BIT) ? \
+                                                           (uint32_t)((((uint32_t)(__ADDRESS__) & (I2C_CR2_SADD)) | \
+                                                                       (I2C_CR2_START) | (I2C_CR2_AUTOEND)) & \
+                                                                      (~I2C_CR2_RD_WRN)) : \
+                                                           (uint32_t)((((uint32_t)(__ADDRESS__) & \
+                                                                        (I2C_CR2_SADD)) | (I2C_CR2_ADD10) | \
+                                                                       (I2C_CR2_START)) & (~I2C_CR2_RD_WRN)))
 
 #define SMBUS_GET_ADDR_MATCH(__HANDLE__)                  (((__HANDLE__)->Instance->ISR & I2C_ISR_ADDCODE) >> 17U)
 #define SMBUS_GET_DIR(__HANDLE__)                         (((__HANDLE__)->Instance->ISR & I2C_ISR_DIR) >> 16U)
@@ -648,11 +673,14 @@ HAL_StatusTypeDef HAL_SMBUS_ConfigDigitalFilter(SMBUS_HandleTypeDef *hsmbus, uin
 
 /* Callbacks Register/UnRegister functions  ***********************************/
 #if (USE_HAL_SMBUS_REGISTER_CALLBACKS == 1)
-HAL_StatusTypeDef HAL_SMBUS_RegisterCallback(SMBUS_HandleTypeDef *hsmbus, HAL_SMBUS_CallbackIDTypeDef CallbackID,
+HAL_StatusTypeDef HAL_SMBUS_RegisterCallback(SMBUS_HandleTypeDef *hsmbus,
+                                             HAL_SMBUS_CallbackIDTypeDef CallbackID,
                                              pSMBUS_CallbackTypeDef pCallback);
-HAL_StatusTypeDef HAL_SMBUS_UnRegisterCallback(SMBUS_HandleTypeDef *hsmbus, HAL_SMBUS_CallbackIDTypeDef CallbackID);
+HAL_StatusTypeDef HAL_SMBUS_UnRegisterCallback(SMBUS_HandleTypeDef *hsmbus,
+                                               HAL_SMBUS_CallbackIDTypeDef CallbackID);
 
-HAL_StatusTypeDef HAL_SMBUS_RegisterAddrCallback(SMBUS_HandleTypeDef *hsmbus, pSMBUS_AddrCallbackTypeDef pCallback);
+HAL_StatusTypeDef HAL_SMBUS_RegisterAddrCallback(SMBUS_HandleTypeDef *hsmbus,
+                                                 pSMBUS_AddrCallbackTypeDef pCallback);
 HAL_StatusTypeDef HAL_SMBUS_UnRegisterAddrCallback(SMBUS_HandleTypeDef *hsmbus);
 #endif /* USE_HAL_SMBUS_REGISTER_CALLBACKS */
 /**
@@ -678,10 +706,10 @@ HAL_StatusTypeDef HAL_SMBUS_IsDeviceReady(SMBUS_HandleTypeDef *hsmbus, uint16_t
   * @{
   */
 /******* Non-Blocking mode: Interrupt */
-HAL_StatusTypeDef HAL_SMBUS_Master_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint16_t DevAddress, uint8_t *pData,
-                                               uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_SMBUS_Master_Receive_IT(SMBUS_HandleTypeDef *hsmbus, uint16_t DevAddress, uint8_t *pData,
-                                              uint16_t Size, uint32_t XferOptions);
+HAL_StatusTypeDef HAL_SMBUS_Master_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint16_t DevAddress,
+                                               uint8_t *pData, uint16_t Size, uint32_t XferOptions);
+HAL_StatusTypeDef HAL_SMBUS_Master_Receive_IT(SMBUS_HandleTypeDef *hsmbus, uint16_t DevAddress,
+                                              uint8_t *pData, uint16_t Size, uint32_t XferOptions);
 HAL_StatusTypeDef HAL_SMBUS_Master_Abort_IT(SMBUS_HandleTypeDef *hsmbus, uint16_t DevAddress);
 HAL_StatusTypeDef HAL_SMBUS_Slave_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint8_t *pData, uint16_t Size,
                                               uint32_t XferOptions);
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smbus_ex.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smbus_ex.h
new file mode 100644
index 00000000..82327b18
--- /dev/null
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_smbus_ex.h
@@ -0,0 +1,138 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_smbus_ex.h
+  * @author  MCD Application Team
+  * @brief   Header file of SMBUS HAL Extended module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_SMBUS_EX_H
+#define STM32WLxx_HAL_SMBUS_EX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal_def.h"
+
+/** @addtogroup STM32WLxx_HAL_Driver
+  * @{
+  */
+
+/** @addtogroup SMBUSEx
+  * @{
+  */
+
+/* Exported types ------------------------------------------------------------*/
+
+/* Exported constants --------------------------------------------------------*/
+/** @defgroup SMBUSEx_Exported_Constants SMBUS Extended Exported Constants
+  * @{
+  */
+
+/** @defgroup SMBUSEx_FastModePlus SMBUS Extended Fast Mode Plus
+  * @{
+  */
+#define SMBUS_FASTMODEPLUS_PB6            SYSCFG_CFGR1_I2C_PB6_FMP                        /*!< Enable Fast Mode Plus on PB6       */
+#define SMBUS_FASTMODEPLUS_PB7            SYSCFG_CFGR1_I2C_PB7_FMP                        /*!< Enable Fast Mode Plus on PB7       */
+#define SMBUS_FASTMODEPLUS_PB8            SYSCFG_CFGR1_I2C_PB8_FMP                        /*!< Enable Fast Mode Plus on PB8       */
+#define SMBUS_FASTMODEPLUS_PB9            SYSCFG_CFGR1_I2C_PB9_FMP                        /*!< Enable Fast Mode Plus on PB9       */
+#define SMBUS_FASTMODEPLUS_I2C1           SYSCFG_CFGR1_I2C1_FMP                           /*!< Enable Fast Mode Plus on I2C1 pins */
+#define SMBUS_FASTMODEPLUS_I2C2           SYSCFG_CFGR1_I2C2_FMP                           /*!< Enable Fast Mode Plus on I2C2 pins */
+#define SMBUS_FASTMODEPLUS_I2C3           SYSCFG_CFGR1_I2C3_FMP                           /*!< Enable Fast Mode Plus on I2C3 pins */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/* Exported macro ------------------------------------------------------------*/
+/** @defgroup SMBUSEx_Exported_Macros SMBUS Extended Exported Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/* Exported functions --------------------------------------------------------*/
+/** @addtogroup SMBUSEx_Exported_Functions SMBUS Extended Exported Functions
+  * @{
+  */
+
+/** @addtogroup SMBUSEx_Exported_Functions_Group3 SMBUS Extended FastModePlus Functions
+  * @{
+  */
+void HAL_SMBUSEx_EnableFastModePlus(uint32_t ConfigFastModePlus);
+void HAL_SMBUSEx_DisableFastModePlus(uint32_t ConfigFastModePlus);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/* Private constants ---------------------------------------------------------*/
+/** @defgroup SMBUSEx_Private_Constants SMBUS Extended Private Constants
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/* Private macros ------------------------------------------------------------*/
+/** @defgroup SMBUSEx_Private_Macro SMBUS Extended Private Macros
+  * @{
+  */
+#define IS_SMBUS_FASTMODEPLUS(__CONFIG__) ((((__CONFIG__) & (SMBUS_FASTMODEPLUS_PB6))  == SMBUS_FASTMODEPLUS_PB6)   || \
+                                           (((__CONFIG__) & (SMBUS_FASTMODEPLUS_PB7))  == SMBUS_FASTMODEPLUS_PB7)   || \
+                                           (((__CONFIG__) & (SMBUS_FASTMODEPLUS_PB8))  == SMBUS_FASTMODEPLUS_PB8)   || \
+                                           (((__CONFIG__) & (SMBUS_FASTMODEPLUS_PB9))  == SMBUS_FASTMODEPLUS_PB9)   || \
+                                           (((__CONFIG__) & (SMBUS_FASTMODEPLUS_I2C1)) == SMBUS_FASTMODEPLUS_I2C1)  || \
+                                           (((__CONFIG__) & (SMBUS_FASTMODEPLUS_I2C2)) == SMBUS_FASTMODEPLUS_I2C2)  || \
+                                           (((__CONFIG__) & (SMBUS_FASTMODEPLUS_I2C3)) == SMBUS_FASTMODEPLUS_I2C3))
+/**
+  * @}
+  */
+
+/* Private Functions ---------------------------------------------------------*/
+/** @defgroup SMBUSEx_Private_Functions SMBUS Extended Private Functions
+  * @{
+  */
+/* Private functions are defined in stm32wlxx_hal_smbus_ex.c file */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_SMBUS_EX_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_subghz.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_subghz.h
index 754c805f..1d5ff01c 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_subghz.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_subghz.h
@@ -51,7 +51,7 @@ typedef struct
 {
   uint32_t BaudratePrescaler;   /*!< Specifies the Baud Rate prescaler value which will be
                                      used to configure SUBGHZSPI clock.
-                                     This parameter can be a value of @ref SUBGHZSPI_BAUDRATE_Prescaler  */
+                                     This parameter can be a value of @ref SUBGHZ_SPI_BAUDRATE_Prescaler  */
 } SUBGHZ_InitTypeDef;
 
 /**
@@ -207,7 +207,7 @@ typedef enum
   * @}
   */
 
-/** @defgroup SUBGHZSPI_BAUDRATE_Prescaler SUBGHZ BaudRate Prescaler
+/** @defgroup SUBGHZ_SPI_BAUDRATE_Prescaler SUBGHZ BaudRate Prescaler
   * @{
   */
 #define SUBGHZSPI_BAUDRATEPRESCALER_2       (0x00000000U)
@@ -305,7 +305,7 @@ typedef enum
 
 /** @brief  Checks if SUBGHZSPI Baudrate prescaler parameter is in allowed range.
   * @param  __PRESCALER__ specifies the SUBGHZSPI Baudrate prescaler.
-  *         This parameter can be a value of @ref SUBGHZSPI_BAUDRATE_Prescaler
+  *         This parameter can be a value of @ref SUBGHZ_SPI_BAUDRATE_Prescaler
   * @retval None
   */
 #define IS_SUBGHZSPI_BAUDRATE_PRESCALER(__PRESCALER__) (((__PRESCALER__) == SUBGHZSPI_BAUDRATEPRESCALER_2)    || \
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_tim.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_tim.h
index dd7a9e01..6efaa401 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_tim.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_tim.h
@@ -1073,24 +1073,24 @@ typedef  void (*pTIM_CallbackTypeDef)(TIM_HandleTypeDef *htim);  /*!< pointer to
 /** @defgroup TIM_DMA_Burst_Length TIM DMA Burst Length
   * @{
   */
-#define TIM_DMABURSTLENGTH_1TRANSFER       0x00000000U                          /*!< The transfer is done to 1 register starting trom TIMx_CR1 + TIMx_DCR.DBA   */
-#define TIM_DMABURSTLENGTH_2TRANSFERS      0x00000100U                          /*!< The transfer is done to 2 registers starting trom TIMx_CR1 + TIMx_DCR.DBA  */
-#define TIM_DMABURSTLENGTH_3TRANSFERS      0x00000200U                          /*!< The transfer is done to 3 registers starting trom TIMx_CR1 + TIMx_DCR.DBA  */
-#define TIM_DMABURSTLENGTH_4TRANSFERS      0x00000300U                          /*!< The transfer is done to 4 registers starting trom TIMx_CR1 + TIMx_DCR.DBA  */
-#define TIM_DMABURSTLENGTH_5TRANSFERS      0x00000400U                          /*!< The transfer is done to 5 registers starting trom TIMx_CR1 + TIMx_DCR.DBA  */
-#define TIM_DMABURSTLENGTH_6TRANSFERS      0x00000500U                          /*!< The transfer is done to 6 registers starting trom TIMx_CR1 + TIMx_DCR.DBA  */
-#define TIM_DMABURSTLENGTH_7TRANSFERS      0x00000600U                          /*!< The transfer is done to 7 registers starting trom TIMx_CR1 + TIMx_DCR.DBA  */
-#define TIM_DMABURSTLENGTH_8TRANSFERS      0x00000700U                          /*!< The transfer is done to 8 registers starting trom TIMx_CR1 + TIMx_DCR.DBA  */
-#define TIM_DMABURSTLENGTH_9TRANSFERS      0x00000800U                          /*!< The transfer is done to 9 registers starting trom TIMx_CR1 + TIMx_DCR.DBA  */
-#define TIM_DMABURSTLENGTH_10TRANSFERS     0x00000900U                          /*!< The transfer is done to 10 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
-#define TIM_DMABURSTLENGTH_11TRANSFERS     0x00000A00U                          /*!< The transfer is done to 11 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
-#define TIM_DMABURSTLENGTH_12TRANSFERS     0x00000B00U                          /*!< The transfer is done to 12 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
-#define TIM_DMABURSTLENGTH_13TRANSFERS     0x00000C00U                          /*!< The transfer is done to 13 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
-#define TIM_DMABURSTLENGTH_14TRANSFERS     0x00000D00U                          /*!< The transfer is done to 14 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
-#define TIM_DMABURSTLENGTH_15TRANSFERS     0x00000E00U                          /*!< The transfer is done to 15 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
-#define TIM_DMABURSTLENGTH_16TRANSFERS     0x00000F00U                          /*!< The transfer is done to 16 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
-#define TIM_DMABURSTLENGTH_17TRANSFERS     0x00001000U                          /*!< The transfer is done to 17 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
-#define TIM_DMABURSTLENGTH_18TRANSFERS     0x00001100U                          /*!< The transfer is done to 18 registers starting trom TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_1TRANSFER       0x00000000U                          /*!< The transfer is done to 1 register starting from TIMx_CR1 + TIMx_DCR.DBA   */
+#define TIM_DMABURSTLENGTH_2TRANSFERS      0x00000100U                          /*!< The transfer is done to 2 registers starting from TIMx_CR1 + TIMx_DCR.DBA  */
+#define TIM_DMABURSTLENGTH_3TRANSFERS      0x00000200U                          /*!< The transfer is done to 3 registers starting from TIMx_CR1 + TIMx_DCR.DBA  */
+#define TIM_DMABURSTLENGTH_4TRANSFERS      0x00000300U                          /*!< The transfer is done to 4 registers starting from TIMx_CR1 + TIMx_DCR.DBA  */
+#define TIM_DMABURSTLENGTH_5TRANSFERS      0x00000400U                          /*!< The transfer is done to 5 registers starting from TIMx_CR1 + TIMx_DCR.DBA  */
+#define TIM_DMABURSTLENGTH_6TRANSFERS      0x00000500U                          /*!< The transfer is done to 6 registers starting from TIMx_CR1 + TIMx_DCR.DBA  */
+#define TIM_DMABURSTLENGTH_7TRANSFERS      0x00000600U                          /*!< The transfer is done to 7 registers starting from TIMx_CR1 + TIMx_DCR.DBA  */
+#define TIM_DMABURSTLENGTH_8TRANSFERS      0x00000700U                          /*!< The transfer is done to 8 registers starting from TIMx_CR1 + TIMx_DCR.DBA  */
+#define TIM_DMABURSTLENGTH_9TRANSFERS      0x00000800U                          /*!< The transfer is done to 9 registers starting from TIMx_CR1 + TIMx_DCR.DBA  */
+#define TIM_DMABURSTLENGTH_10TRANSFERS     0x00000900U                          /*!< The transfer is done to 10 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_11TRANSFERS     0x00000A00U                          /*!< The transfer is done to 11 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_12TRANSFERS     0x00000B00U                          /*!< The transfer is done to 12 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_13TRANSFERS     0x00000C00U                          /*!< The transfer is done to 13 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_14TRANSFERS     0x00000D00U                          /*!< The transfer is done to 14 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_15TRANSFERS     0x00000E00U                          /*!< The transfer is done to 15 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_16TRANSFERS     0x00000F00U                          /*!< The transfer is done to 16 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_17TRANSFERS     0x00001000U                          /*!< The transfer is done to 17 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
+#define TIM_DMABURSTLENGTH_18TRANSFERS     0x00001100U                          /*!< The transfer is done to 18 registers starting from TIMx_CR1 + TIMx_DCR.DBA */
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_uart.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_uart.h
index b8f4a235..f2006d50 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_uart.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_hal_uart.h
@@ -1137,10 +1137,10 @@ typedef  void (*pUART_RxEventCallbackTypeDef)(struct __UART_HandleTypeDef *huart
   * @param  __HANDLE__ specifies the UART Handle.
   * @retval None
   */
-#define __HAL_UART_HWCONTROL_CTS_ENABLE(__HANDLE__)        \
-  do{                                                      \
-    SET_BIT((__HANDLE__)->Instance->CR3, USART_CR3_CTSE);  \
-    (__HANDLE__)->Init.HwFlowCtl |= USART_CR3_CTSE;        \
+#define __HAL_UART_HWCONTROL_CTS_ENABLE(__HANDLE__)               \
+  do{                                                             \
+    ATOMIC_SET_BIT((__HANDLE__)->Instance->CR3, USART_CR3_CTSE);  \
+    (__HANDLE__)->Init.HwFlowCtl |= USART_CR3_CTSE;               \
   } while(0U)
 
 /** @brief  Disable CTS flow control.
@@ -1156,10 +1156,10 @@ typedef  void (*pUART_RxEventCallbackTypeDef)(struct __UART_HandleTypeDef *huart
   * @param  __HANDLE__ specifies the UART Handle.
   * @retval None
   */
-#define __HAL_UART_HWCONTROL_CTS_DISABLE(__HANDLE__)        \
-  do{                                                       \
-    CLEAR_BIT((__HANDLE__)->Instance->CR3, USART_CR3_CTSE); \
-    (__HANDLE__)->Init.HwFlowCtl &= ~(USART_CR3_CTSE);      \
+#define __HAL_UART_HWCONTROL_CTS_DISABLE(__HANDLE__)               \
+  do{                                                              \
+    ATOMIC_CLEAR_BIT((__HANDLE__)->Instance->CR3, USART_CR3_CTSE); \
+    (__HANDLE__)->Init.HwFlowCtl &= ~(USART_CR3_CTSE);             \
   } while(0U)
 
 /** @brief  Enable RTS flow control.
@@ -1175,10 +1175,10 @@ typedef  void (*pUART_RxEventCallbackTypeDef)(struct __UART_HandleTypeDef *huart
   * @param  __HANDLE__ specifies the UART Handle.
   * @retval None
   */
-#define __HAL_UART_HWCONTROL_RTS_ENABLE(__HANDLE__)       \
-  do{                                                     \
-    SET_BIT((__HANDLE__)->Instance->CR3, USART_CR3_RTSE); \
-    (__HANDLE__)->Init.HwFlowCtl |= USART_CR3_RTSE;       \
+#define __HAL_UART_HWCONTROL_RTS_ENABLE(__HANDLE__)              \
+  do{                                                            \
+    ATOMIC_SET_BIT((__HANDLE__)->Instance->CR3, USART_CR3_RTSE); \
+    (__HANDLE__)->Init.HwFlowCtl |= USART_CR3_RTSE;              \
   } while(0U)
 
 /** @brief  Disable RTS flow control.
@@ -1194,10 +1194,10 @@ typedef  void (*pUART_RxEventCallbackTypeDef)(struct __UART_HandleTypeDef *huart
   * @param  __HANDLE__ specifies the UART Handle.
   * @retval None
   */
-#define __HAL_UART_HWCONTROL_RTS_DISABLE(__HANDLE__)       \
-  do{                                                      \
-    CLEAR_BIT((__HANDLE__)->Instance->CR3, USART_CR3_RTSE);\
-    (__HANDLE__)->Init.HwFlowCtl &= ~(USART_CR3_RTSE);     \
+#define __HAL_UART_HWCONTROL_RTS_DISABLE(__HANDLE__)              \
+  do{                                                             \
+    ATOMIC_CLEAR_BIT((__HANDLE__)->Instance->CR3, USART_CR3_RTSE);\
+    (__HANDLE__)->Init.HwFlowCtl &= ~(USART_CR3_RTSE);            \
   } while(0U)
 /**
   * @}
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_adc.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_adc.h
index a5dee265..17de5aa0 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_adc.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_adc.h
@@ -54,14 +54,14 @@ extern "C" {
 
 /* Definition of ADC group regular sequencer bits information to be inserted  */
 /* into ADC group regular sequencer ranks literals definition.                */
-#define ADC_REG_RANK_1_SQRX_BITOFFSET_POS  ( 0UL) /* Value equivalent to bitfield "ADC_CHSELR_SQ1" position in register */
-#define ADC_REG_RANK_2_SQRX_BITOFFSET_POS  ( 4UL) /* Value equivalent to bitfield "ADC_CHSELR_SQ2" position in register */
-#define ADC_REG_RANK_3_SQRX_BITOFFSET_POS  ( 8UL) /* Value equivalent to bitfield "ADC_CHSELR_SQ3" position in register */
-#define ADC_REG_RANK_4_SQRX_BITOFFSET_POS  (12UL) /* Value equivalent to bitfield "ADC_CHSELR_SQ4" position in register */
-#define ADC_REG_RANK_5_SQRX_BITOFFSET_POS  (16UL) /* Value equivalent to bitfield "ADC_CHSELR_SQ5" position in register */
-#define ADC_REG_RANK_6_SQRX_BITOFFSET_POS  (20UL) /* Value equivalent to bitfield "ADC_CHSELR_SQ6" position in register */
-#define ADC_REG_RANK_7_SQRX_BITOFFSET_POS  (24UL) /* Value equivalent to bitfield "ADC_CHSELR_SQ7" position in register */
-#define ADC_REG_RANK_8_SQRX_BITOFFSET_POS  (28UL) /* Value equivalent to bitfield "ADC_CHSELR_SQ8" position in register */
+#define ADC_REG_RANK_1_SQRX_BITOFFSET_POS  ( 0UL) /* Equivalent to bitfield "ADC_CHSELR_SQ1" position in register */
+#define ADC_REG_RANK_2_SQRX_BITOFFSET_POS  ( 4UL) /* Equivalent to bitfield "ADC_CHSELR_SQ2" position in register */
+#define ADC_REG_RANK_3_SQRX_BITOFFSET_POS  ( 8UL) /* Equivalent to bitfield "ADC_CHSELR_SQ3" position in register */
+#define ADC_REG_RANK_4_SQRX_BITOFFSET_POS  (12UL) /* Equivalent to bitfield "ADC_CHSELR_SQ4" position in register */
+#define ADC_REG_RANK_5_SQRX_BITOFFSET_POS  (16UL) /* Equivalent to bitfield "ADC_CHSELR_SQ5" position in register */
+#define ADC_REG_RANK_6_SQRX_BITOFFSET_POS  (20UL) /* Equivalent to bitfield "ADC_CHSELR_SQ6" position in register */
+#define ADC_REG_RANK_7_SQRX_BITOFFSET_POS  (24UL) /* Equivalent to bitfield "ADC_CHSELR_SQ7" position in register */
+#define ADC_REG_RANK_8_SQRX_BITOFFSET_POS  (28UL) /* Equivalent to bitfield "ADC_CHSELR_SQ8" position in register */
 
 
 
@@ -88,8 +88,8 @@ extern "C" {
                                              ((ADC_REG_TRIG_EXT_EDGE_DEFAULT)              << (4U * 3UL))  )
 
 /* Definition of ADC group regular trigger bits information.                  */
-#define ADC_REG_TRIG_EXTSEL_BITOFFSET_POS  ( 6UL) /* Value equivalent to bitfield "ADC_CFGR1_EXTSEL" position in register */
-#define ADC_REG_TRIG_EXTEN_BITOFFSET_POS   (10UL) /* Value equivalent to bitfield "ADC_CFGR1_EXTEN" position in register */
+#define ADC_REG_TRIG_EXTSEL_BITOFFSET_POS  ( 6UL) /* Equivalent to bitfield "ADC_CFGR1_EXTSEL" position in register */
+#define ADC_REG_TRIG_EXTEN_BITOFFSET_POS   (10UL) /* Equivalent to bitfield "ADC_CFGR1_EXTEN" position in register */
 
 
 
@@ -101,8 +101,8 @@ extern "C" {
 /*   GPIO pins) and internal channels (connected to internal paths)           */
 #define ADC_CHANNEL_ID_NUMBER_MASK         (ADC_CFGR1_AWD1CH)
 #define ADC_CHANNEL_ID_BITFIELD_MASK       (ADC_CHSELR_CHSEL)
-#define ADC_CHANNEL_ID_NUMBER_MASK_SEQ     (ADC_CHSELR_SQ1 << ADC_CHANNEL_ID_NUMBER_BITOFFSET_POS) /* Value equivalent to ADC_CHANNEL_ID_NUMBER_MASK with reduced range: on this STM32 series, ADC group regular sequencer, if set to mode "fully configurable", can contain channels with a restricted channel number. Refer to function @ref LL_ADC_REG_SetSequencerConfigurable(). */
-#define ADC_CHANNEL_ID_NUMBER_BITOFFSET_POS (26UL)/* Value equivalent to bitfield "ADC_CHANNEL_ID_NUMBER_MASK" position in register */
+#define ADC_CHANNEL_ID_NUMBER_MASK_SEQ     (ADC_CHSELR_SQ1 << ADC_CHANNEL_ID_NUMBER_BITOFFSET_POS) /* Equivalent to ADC_CHANNEL_ID_NUMBER_MASK with reduced range: on this STM32 series, ADC group regular sequencer, if set to mode "fully configurable", can contain channels with a restricted channel number. Refer to function @ref LL_ADC_REG_SetSequencerConfigurable(). */
+#define ADC_CHANNEL_ID_NUMBER_BITOFFSET_POS (26UL)/* Equivalent to bitfield "ADC_CHANNEL_ID_NUMBER_MASK" position in register */
 #define ADC_CHANNEL_ID_MASK                (ADC_CHANNEL_ID_NUMBER_MASK | ADC_CHANNEL_ID_BITFIELD_MASK | \
                                             ADC_CHANNEL_ID_INTERNAL_CH_MASK)
 /* Equivalent mask of ADC_CHANNEL_NUMBER_MASK aligned on register LSB (bit 0) */
@@ -210,31 +210,31 @@ extern "C" {
 
 
 /* ADC registers bits positions */
-#define ADC_CFGR1_RES_BITOFFSET_POS        ( 3UL) /* Value equivalent to bitfield "ADC_CFGR1_RES" position in register */
-#define ADC_CFGR1_AWDSGL_BITOFFSET_POS     (22UL) /* Value equivalent to bitfield "ADC_CFGR1_AWDSGL" position in register */
-#define ADC_TR1_HT1_BITOFFSET_POS          (16UL) /* Value equivalent to bitfield "ADC_TR1_HT1" position in register */
-#define ADC_CHSELR_CHSEL0_BITOFFSET_POS    ( 0UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL0" position in register */
-#define ADC_CHSELR_CHSEL1_BITOFFSET_POS    ( 1UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL1" position in register */
-#define ADC_CHSELR_CHSEL2_BITOFFSET_POS    ( 2UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL2" position in register */
-#define ADC_CHSELR_CHSEL3_BITOFFSET_POS    ( 3UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL3" position in register */
-#define ADC_CHSELR_CHSEL4_BITOFFSET_POS    ( 4UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL4" position in register */
-#define ADC_CHSELR_CHSEL5_BITOFFSET_POS    ( 5UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL5" position in register */
-#define ADC_CHSELR_CHSEL6_BITOFFSET_POS    ( 6UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL6" position in register */
-#define ADC_CHSELR_CHSEL7_BITOFFSET_POS    ( 7UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL7" position in register */
-#define ADC_CHSELR_CHSEL8_BITOFFSET_POS    ( 8UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL8" position in register */
-#define ADC_CHSELR_CHSEL9_BITOFFSET_POS    ( 9UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL9" position in register */
-#define ADC_CHSELR_CHSEL10_BITOFFSET_POS   (10UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL10" position in register */
-#define ADC_CHSELR_CHSEL11_BITOFFSET_POS   (11UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL11" position in register */
-#define ADC_CHSELR_CHSEL12_BITOFFSET_POS   (12UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL12" position in register */
-#define ADC_CHSELR_CHSEL13_BITOFFSET_POS   (13UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL13" position in register */
-#define ADC_CHSELR_CHSEL14_BITOFFSET_POS   (14UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL14" position in register */
-#define ADC_CHSELR_CHSEL15_BITOFFSET_POS   (15UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL15" position in register */
-#define ADC_CHSELR_CHSEL16_BITOFFSET_POS   (16UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL16" position in register */
-#define ADC_CHSELR_CHSEL17_BITOFFSET_POS   (17UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL17" position in register */
-#define ADC_CHSELR_CHSEL18_BITOFFSET_POS   (18UL) /* Value equivalent to bitfield "ADC_CHSELR_CHSEL18" position in register */
-#define ADC_SMPR_SMP1_BITOFFSET_POS        ( 0UL) /* Value equivalent to bitfield "ADC_SMPR_SMP1" position in register */
-#define ADC_SMPR_SMP2_BITOFFSET_POS        ( 4UL) /* Value equivalent to bitfield "ADC_SMPR_SMP2" position in register */
-#define ADC_SMPR_SMPSEL0_BITOFFSET_POS     ( 8UL) /* Value equivalent to bitfield "ADC_SMPR_SMPSEL0" position in register */
+#define ADC_CFGR1_RES_BITOFFSET_POS        ( 3UL) /* Equivalent to bitfield "ADC_CFGR1_RES" position in register */
+#define ADC_CFGR1_AWDSGL_BITOFFSET_POS     (22UL) /* Equivalent to bitfield "ADC_CFGR1_AWDSGL" position in register */
+#define ADC_TR1_HT1_BITOFFSET_POS          (16UL) /* Equivalent to bitfield "ADC_TR1_HT1" position in register */
+#define ADC_CHSELR_CHSEL0_BITOFFSET_POS    ( 0UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL0" position in register */
+#define ADC_CHSELR_CHSEL1_BITOFFSET_POS    ( 1UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL1" position in register */
+#define ADC_CHSELR_CHSEL2_BITOFFSET_POS    ( 2UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL2" position in register */
+#define ADC_CHSELR_CHSEL3_BITOFFSET_POS    ( 3UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL3" position in register */
+#define ADC_CHSELR_CHSEL4_BITOFFSET_POS    ( 4UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL4" position in register */
+#define ADC_CHSELR_CHSEL5_BITOFFSET_POS    ( 5UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL5" position in register */
+#define ADC_CHSELR_CHSEL6_BITOFFSET_POS    ( 6UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL6" position in register */
+#define ADC_CHSELR_CHSEL7_BITOFFSET_POS    ( 7UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL7" position in register */
+#define ADC_CHSELR_CHSEL8_BITOFFSET_POS    ( 8UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL8" position in register */
+#define ADC_CHSELR_CHSEL9_BITOFFSET_POS    ( 9UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL9" position in register */
+#define ADC_CHSELR_CHSEL10_BITOFFSET_POS   (10UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL10" position in register */
+#define ADC_CHSELR_CHSEL11_BITOFFSET_POS   (11UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL11" position in register */
+#define ADC_CHSELR_CHSEL12_BITOFFSET_POS   (12UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL12" position in register */
+#define ADC_CHSELR_CHSEL13_BITOFFSET_POS   (13UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL13" position in register */
+#define ADC_CHSELR_CHSEL14_BITOFFSET_POS   (14UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL14" position in register */
+#define ADC_CHSELR_CHSEL15_BITOFFSET_POS   (15UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL15" position in register */
+#define ADC_CHSELR_CHSEL16_BITOFFSET_POS   (16UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL16" position in register */
+#define ADC_CHSELR_CHSEL17_BITOFFSET_POS   (17UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL17" position in register */
+#define ADC_CHSELR_CHSEL18_BITOFFSET_POS   (18UL) /* Equivalent to bitfield "ADC_CHSELR_CHSEL18" position in register */
+#define ADC_SMPR_SMP1_BITOFFSET_POS        ( 0UL) /* Equivalent to bitfield "ADC_SMPR_SMP1" position in register */
+#define ADC_SMPR_SMP2_BITOFFSET_POS        ( 4UL) /* Equivalent to bitfield "ADC_SMPR_SMP2" position in register */
+#define ADC_SMPR_SMPSEL0_BITOFFSET_POS     ( 8UL) /* Equivalent to bitfield "ADC_SMPR_SMPSEL0" position in register */
 
 
 /* ADC registers bits groups */
@@ -329,7 +329,6 @@ typedef struct
                                                    ADC clock synchronous (from PCLK) with prescaler 1 must be enabled only if PCLK has a 50% duty clock cycle
                                                    (APB prescaler configured inside the RCC must be bypassed and the system clock must by 50% duty cycle).
 
-
                                              This feature can be modified afterwards using unitary function @ref LL_ADC_SetClock().
                                              For more details, refer to description of this function. */
 
@@ -2318,17 +2317,17 @@ __STATIC_INLINE void LL_ADC_REG_SetTriggerSource(ADC_TypeDef *ADCx, uint32_t Tri
   */
 __STATIC_INLINE uint32_t LL_ADC_REG_GetTriggerSource(ADC_TypeDef *ADCx)
 {
-  __IO uint32_t TriggerSource = READ_BIT(ADCx->CFGR1, ADC_CFGR1_EXTSEL | ADC_CFGR1_EXTEN);
+  __IO uint32_t trigger_source = READ_BIT(ADCx->CFGR1, ADC_CFGR1_EXTSEL | ADC_CFGR1_EXTEN);
 
   /* Value for shift of {0; 4; 8; 12} depending on value of bitfield          */
   /* corresponding to ADC_CFGR1_EXTEN {0; 1; 2; 3}.                           */
-  uint32_t ShiftExten = ((TriggerSource & ADC_CFGR1_EXTEN) >> (ADC_REG_TRIG_EXTEN_BITOFFSET_POS - 2UL));
+  uint32_t shift_exten = ((trigger_source & ADC_CFGR1_EXTEN) >> (ADC_REG_TRIG_EXTEN_BITOFFSET_POS - 2UL));
 
   /* Set bitfield corresponding to ADC_CFGR1_EXTEN and ADC_CFGR1_EXTSEL       */
   /* to match with triggers literals definition.                              */
-  return ((TriggerSource
-           & (ADC_REG_TRIG_SOURCE_MASK >> ShiftExten) & ADC_CFGR1_EXTSEL)
-          | ((ADC_REG_TRIG_EDGE_MASK >> ShiftExten) & ADC_CFGR1_EXTEN)
+  return ((trigger_source
+           & (ADC_REG_TRIG_SOURCE_MASK >> shift_exten) & ADC_CFGR1_EXTSEL)
+          | ((ADC_REG_TRIG_EDGE_MASK >> shift_exten) & ADC_CFGR1_EXTEN)
          );
 }
 
@@ -2575,21 +2574,21 @@ __STATIC_INLINE void LL_ADC_REG_SetSequencerLength(ADC_TypeDef *ADCx, uint32_t S
   */
 __STATIC_INLINE uint32_t LL_ADC_REG_GetSequencerLength(ADC_TypeDef *ADCx)
 {
-  __IO uint32_t ChannelsRanks = READ_BIT(ADCx->CHSELR, ADC_CHSELR_SQ_ALL);
-  uint32_t SequencerLength = LL_ADC_REG_SEQ_SCAN_ENABLE_8RANKS;
-  uint32_t RankIndex;
+  __IO uint32_t channels_ranks = READ_BIT(ADCx->CHSELR, ADC_CHSELR_SQ_ALL);
+  uint32_t sequencer_length = LL_ADC_REG_SEQ_SCAN_ENABLE_8RANKS;
+  uint32_t rank_index;
 
   /* Parse register for end of sequence identifier */
-  for (RankIndex = 0UL; RankIndex < (32U - 4U); RankIndex += 4U)
+  for (rank_index = 0UL; rank_index < (32U - 4U); rank_index += 4U)
   {
-    if ((ChannelsRanks & (ADC_CHSELR_SQ2 << RankIndex)) == (ADC_CHSELR_SQ2 << RankIndex))
+    if ((channels_ranks & (ADC_CHSELR_SQ2 << rank_index)) == (ADC_CHSELR_SQ2 << rank_index))
     {
-      SequencerLength = (ADC_CHSELR_SQ2 << RankIndex);
+      sequencer_length = (ADC_CHSELR_SQ2 << rank_index);
       break;
     }
   }
 
-  return SequencerLength;
+  return sequencer_length;
 }
 
 /**
@@ -3194,26 +3193,26 @@ __STATIC_INLINE void LL_ADC_REG_SetSequencerChRem(ADC_TypeDef *ADCx, uint32_t Ch
   */
 __STATIC_INLINE uint32_t LL_ADC_REG_GetSequencerChannels(ADC_TypeDef *ADCx)
 {
-  uint32_t ChannelsBitfield = (uint32_t)READ_BIT(ADCx->CHSELR, ADC_CHSELR_CHSEL);
-
-  return ((((ChannelsBitfield & ADC_CHSELR_CHSEL0) >> ADC_CHSELR_CHSEL0_BITOFFSET_POS) * LL_ADC_CHANNEL_0)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL1) >> ADC_CHSELR_CHSEL1_BITOFFSET_POS) * LL_ADC_CHANNEL_1)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL2) >> ADC_CHSELR_CHSEL2_BITOFFSET_POS) * LL_ADC_CHANNEL_2)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL3) >> ADC_CHSELR_CHSEL3_BITOFFSET_POS) * LL_ADC_CHANNEL_3)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL4) >> ADC_CHSELR_CHSEL4_BITOFFSET_POS) * LL_ADC_CHANNEL_4)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL5) >> ADC_CHSELR_CHSEL5_BITOFFSET_POS) * LL_ADC_CHANNEL_5)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL6) >> ADC_CHSELR_CHSEL6_BITOFFSET_POS) * LL_ADC_CHANNEL_6)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL7) >> ADC_CHSELR_CHSEL7_BITOFFSET_POS) * LL_ADC_CHANNEL_7)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL8) >> ADC_CHSELR_CHSEL8_BITOFFSET_POS) * LL_ADC_CHANNEL_8)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL9) >> ADC_CHSELR_CHSEL9_BITOFFSET_POS) * LL_ADC_CHANNEL_9)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL10) >> ADC_CHSELR_CHSEL10_BITOFFSET_POS) * LL_ADC_CHANNEL_10)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL11) >> ADC_CHSELR_CHSEL11_BITOFFSET_POS) * LL_ADC_CHANNEL_11)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL12) >> ADC_CHSELR_CHSEL12_BITOFFSET_POS) * LL_ADC_CHANNEL_12)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL13) >> ADC_CHSELR_CHSEL13_BITOFFSET_POS) * LL_ADC_CHANNEL_13)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL14) >> ADC_CHSELR_CHSEL14_BITOFFSET_POS) * LL_ADC_CHANNEL_14)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL15) >> ADC_CHSELR_CHSEL15_BITOFFSET_POS) * LL_ADC_CHANNEL_15)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL16) >> ADC_CHSELR_CHSEL16_BITOFFSET_POS) * LL_ADC_CHANNEL_16)
-          | (((ChannelsBitfield & ADC_CHSELR_CHSEL17) >> ADC_CHSELR_CHSEL17_BITOFFSET_POS) * LL_ADC_CHANNEL_17)
+  uint32_t channels_bitfield = (uint32_t)READ_BIT(ADCx->CHSELR, ADC_CHSELR_CHSEL);
+
+  return ((((channels_bitfield & ADC_CHSELR_CHSEL0) >> ADC_CHSELR_CHSEL0_BITOFFSET_POS) * LL_ADC_CHANNEL_0)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL1) >> ADC_CHSELR_CHSEL1_BITOFFSET_POS) * LL_ADC_CHANNEL_1)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL2) >> ADC_CHSELR_CHSEL2_BITOFFSET_POS) * LL_ADC_CHANNEL_2)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL3) >> ADC_CHSELR_CHSEL3_BITOFFSET_POS) * LL_ADC_CHANNEL_3)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL4) >> ADC_CHSELR_CHSEL4_BITOFFSET_POS) * LL_ADC_CHANNEL_4)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL5) >> ADC_CHSELR_CHSEL5_BITOFFSET_POS) * LL_ADC_CHANNEL_5)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL6) >> ADC_CHSELR_CHSEL6_BITOFFSET_POS) * LL_ADC_CHANNEL_6)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL7) >> ADC_CHSELR_CHSEL7_BITOFFSET_POS) * LL_ADC_CHANNEL_7)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL8) >> ADC_CHSELR_CHSEL8_BITOFFSET_POS) * LL_ADC_CHANNEL_8)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL9) >> ADC_CHSELR_CHSEL9_BITOFFSET_POS) * LL_ADC_CHANNEL_9)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL10) >> ADC_CHSELR_CHSEL10_BITOFFSET_POS) * LL_ADC_CHANNEL_10)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL11) >> ADC_CHSELR_CHSEL11_BITOFFSET_POS) * LL_ADC_CHANNEL_11)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL12) >> ADC_CHSELR_CHSEL12_BITOFFSET_POS) * LL_ADC_CHANNEL_12)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL13) >> ADC_CHSELR_CHSEL13_BITOFFSET_POS) * LL_ADC_CHANNEL_13)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL14) >> ADC_CHSELR_CHSEL14_BITOFFSET_POS) * LL_ADC_CHANNEL_14)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL15) >> ADC_CHSELR_CHSEL15_BITOFFSET_POS) * LL_ADC_CHANNEL_15)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL16) >> ADC_CHSELR_CHSEL16_BITOFFSET_POS) * LL_ADC_CHANNEL_16)
+          | (((channels_bitfield & ADC_CHSELR_CHSEL17) >> ADC_CHSELR_CHSEL17_BITOFFSET_POS) * LL_ADC_CHANNEL_17)
          );
 }
 
@@ -3717,55 +3716,55 @@ __STATIC_INLINE uint32_t LL_ADC_GetAnalogWDMonitChannels(ADC_TypeDef *ADCx, uint
   __IO uint32_t *preg = __ADC_PTR_REG_OFFSET(ADCx->CFGR1, ((AWDy & ADC_AWD_CRX_REGOFFSET_MASK) >> ADC_AWD_CRX_REGOFFSET_POS)
                                              + ((AWDy & ADC_AWD_CR12_REGOFFSETGAP_MASK) * ADC_AWD_CR12_REGOFFSETGAP_VAL));
 
-  uint32_t AnalogWDMonitChannels = (READ_BIT(*preg, AWDy) & AWDy & ADC_AWD_CR_ALL_CHANNEL_MASK);
+  uint32_t analog_wd_monit_channels = (READ_BIT(*preg, AWDy) & AWDy & ADC_AWD_CR_ALL_CHANNEL_MASK);
 
-  /* If "AnalogWDMonitChannels" == 0, then the selected AWD is disabled       */
+  /* If "analog_wd_monit_channels" == 0, then the selected AWD is disabled       */
   /* (parameter value LL_ADC_AWD_DISABLE).                                    */
   /* Else, the selected AWD is enabled and is monitoring a group of channels  */
   /* or a single channel.                                                     */
-  if (AnalogWDMonitChannels != 0UL)
+  if (analog_wd_monit_channels != 0UL)
   {
     if (AWDy == LL_ADC_AWD1)
     {
-      if ((AnalogWDMonitChannels & ADC_CFGR1_AWD1SGL) == 0UL)
+      if ((analog_wd_monit_channels & ADC_CFGR1_AWD1SGL) == 0UL)
       {
         /* AWD monitoring a group of channels */
-        AnalogWDMonitChannels = ((AnalogWDMonitChannels
-                                  | (ADC_AWD_CR23_CHANNEL_MASK)
-                                 )
-                                 & (~(ADC_CFGR1_AWD1CH))
-                                );
+        analog_wd_monit_channels = ((analog_wd_monit_channels
+                                     | (ADC_AWD_CR23_CHANNEL_MASK)
+                                    )
+                                    & (~(ADC_CFGR1_AWD1CH))
+                                   );
       }
       else
       {
         /* AWD monitoring a single channel */
-        AnalogWDMonitChannels = (AnalogWDMonitChannels
-                                 | (ADC_AWD2CR_AWD2CH_0 << (AnalogWDMonitChannels >> ADC_CFGR1_AWD1CH_Pos))
-                                );
+        analog_wd_monit_channels = (analog_wd_monit_channels
+                                    | (ADC_AWD2CR_AWD2CH_0 << (analog_wd_monit_channels >> ADC_CFGR1_AWD1CH_Pos))
+                                   );
       }
     }
     else
     {
-      if ((AnalogWDMonitChannels & ADC_AWD_CR23_CHANNEL_MASK) == ADC_AWD_CR23_CHANNEL_MASK)
+      if ((analog_wd_monit_channels & ADC_AWD_CR23_CHANNEL_MASK) == ADC_AWD_CR23_CHANNEL_MASK)
       {
         /* AWD monitoring a group of channels */
-        AnalogWDMonitChannels = (ADC_AWD_CR23_CHANNEL_MASK
-                                 | (ADC_CFGR1_AWD1EN)
-                                );
+        analog_wd_monit_channels = (ADC_AWD_CR23_CHANNEL_MASK
+                                    | (ADC_CFGR1_AWD1EN)
+                                   );
       }
       else
       {
         /* AWD monitoring a single channel */
         /* AWD monitoring a group of channels */
-        AnalogWDMonitChannels = (AnalogWDMonitChannels
-                                 | (ADC_CFGR1_AWD1EN | ADC_CFGR1_AWD1SGL)
-                                 | (__LL_ADC_CHANNEL_TO_DECIMAL_NB(AnalogWDMonitChannels) << ADC_CFGR1_AWD1CH_Pos)
-                                );
+        analog_wd_monit_channels = (analog_wd_monit_channels
+                                    | (ADC_CFGR1_AWD1EN | ADC_CFGR1_AWD1SGL)
+                                    | (__LL_ADC_CHANNEL_TO_DECIMAL_NB(analog_wd_monit_channels) << ADC_CFGR1_AWD1CH_Pos)
+                                   );
       }
     }
   }
 
-  return AnalogWDMonitChannels;
+  return analog_wd_monit_channels;
 }
 
 /**
@@ -4731,7 +4730,7 @@ __STATIC_INLINE void LL_ADC_EnableIT_ADRDY(ADC_TypeDef *ADCx)
 
 /**
   * @brief  Enable interruption ADC channel configuration ready.
-  * @rmtoll IER      ADRDYIE        LL_ADC_EnableIT_CCRDY
+  * @rmtoll IER      CCRDYIE        LL_ADC_EnableIT_CCRDY
   * @param  ADCx ADC instance
   * @retval State of bit (1 or 0).
   */
@@ -4841,7 +4840,7 @@ __STATIC_INLINE void LL_ADC_DisableIT_ADRDY(ADC_TypeDef *ADCx)
 
 /**
   * @brief  Disable interruption ADC channel configuration ready.
-  * @rmtoll IER      ADRDYIE        LL_ADC_DisableIT_CCRDY
+  * @rmtoll IER      CCRDYIE        LL_ADC_DisableIT_CCRDY
   * @param  ADCx ADC instance
   * @retval State of bit (1 or 0).
   */
@@ -4952,7 +4951,7 @@ __STATIC_INLINE uint32_t LL_ADC_IsEnabledIT_ADRDY(ADC_TypeDef *ADCx)
 
 /**
   * @brief  Get state of interruption ADC channel configuration ready.
-  * @rmtoll IER      ADRDYIE        LL_ADC_IsEnabledIT_CCRDY
+  * @rmtoll IER      CCRDYIE        LL_ADC_IsEnabledIT_CCRDY
   * @param  ADCx ADC instance
   * @retval State of bit (1 or 0).
   */
@@ -5068,19 +5067,19 @@ __STATIC_INLINE uint32_t LL_ADC_IsEnabledIT_EOCAL(ADC_TypeDef *ADCx)
 
 /* Initialization of some features of ADC common parameters and multimode */
 ErrorStatus LL_ADC_CommonDeInit(ADC_Common_TypeDef *ADCxy_COMMON);
-ErrorStatus LL_ADC_CommonInit(ADC_Common_TypeDef *ADCxy_COMMON, LL_ADC_CommonInitTypeDef *ADC_CommonInitStruct);
-void        LL_ADC_CommonStructInit(LL_ADC_CommonInitTypeDef *ADC_CommonInitStruct);
+ErrorStatus LL_ADC_CommonInit(ADC_Common_TypeDef *ADCxy_COMMON, LL_ADC_CommonInitTypeDef *pADC_CommonInitStruct);
+void        LL_ADC_CommonStructInit(LL_ADC_CommonInitTypeDef *pADC_CommonInitStruct);
 
 /* De-initialization of ADC instance */
 ErrorStatus LL_ADC_DeInit(ADC_TypeDef *ADCx);
 
 /* Initialization of some features of ADC instance */
-ErrorStatus LL_ADC_Init(ADC_TypeDef *ADCx, LL_ADC_InitTypeDef *ADC_InitStruct);
-void        LL_ADC_StructInit(LL_ADC_InitTypeDef *ADC_InitStruct);
+ErrorStatus LL_ADC_Init(ADC_TypeDef *ADCx, LL_ADC_InitTypeDef *pADC_InitStruct);
+void        LL_ADC_StructInit(LL_ADC_InitTypeDef *pADC_InitStruct);
 
 /* Initialization of some features of ADC instance and ADC group regular */
-ErrorStatus LL_ADC_REG_Init(ADC_TypeDef *ADCx, LL_ADC_REG_InitTypeDef *ADC_REG_InitStruct);
-void        LL_ADC_REG_StructInit(LL_ADC_REG_InitTypeDef *ADC_REG_InitStruct);
+ErrorStatus LL_ADC_REG_Init(ADC_TypeDef *ADCx, LL_ADC_REG_InitTypeDef *pADC_RegInitStruct);
+void        LL_ADC_REG_StructInit(LL_ADC_REG_InitTypeDef *pADC_RegInitStruct);
 
 /**
   * @}
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_bus.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_bus.h
index 4fc39ec8..8723f1af 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_bus.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_bus.h
@@ -1819,7 +1819,7 @@ __STATIC_INLINE uint32_t LL_C2_AHB2_GRP1_IsEnabledClockSleep(uint32_t Periphs)
   * @rmtoll C2AHB2SMENR  GPIOASMEN     LL_C2_AHB2_GRP1_DisableClockSleep\n
   *         C2AHB2SMENR  GPIOBSMEN     LL_C2_AHB2_GRP1_DisableClockSleep\n
   *         C2AHB2SMENR  GPIOCSMEN     LL_C2_AHB2_GRP1_DisableClockSleep\n
-  *         C2AHB2SMENR  GPIODSMEN     LL_C2_AHB2_GRP1_DisableClockSleep\n
+  *         C2AHB2SMENR  GPIOHSMEN     LL_C2_AHB2_GRP1_DisableClockSleep\n
 
   * @param  Periphs This parameter can be a combination of the following values:
   *         @arg @ref LL_C2_AHB2_GRP1_PERIPH_GPIOA
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_cortex.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_cortex.h
index 12765e06..300b7bb0 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_cortex.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_cortex.h
@@ -83,10 +83,9 @@ extern "C" {
 /**
   * @}
   */
-
 #endif  /* CORE_CM0PLUS */
-#if __MPU_PRESENT
 
+#if __MPU_PRESENT
 /** @defgroup CORTEX_LL_EC_CTRL_HFNMI_PRIVDEF MPU Control
   * @{
   */
@@ -116,9 +115,12 @@ extern "C" {
 /** @defgroup CORTEX_LL_EC_REGION_SIZE MPU Region Size
   * @{
   */
+#if defined(CORE_CM0PLUS)
+#else
 #define LL_MPU_REGION_SIZE_32B             (0x04U << MPU_RASR_SIZE_Pos) /*!< 32B Size of the MPU protection region */
 #define LL_MPU_REGION_SIZE_64B             (0x05U << MPU_RASR_SIZE_Pos) /*!< 64B Size of the MPU protection region */
 #define LL_MPU_REGION_SIZE_128B            (0x06U << MPU_RASR_SIZE_Pos) /*!< 128B Size of the MPU protection region */
+#endif
 #define LL_MPU_REGION_SIZE_256B            (0x07U << MPU_RASR_SIZE_Pos) /*!< 256B Size of the MPU protection region */
 #define LL_MPU_REGION_SIZE_512B            (0x08U << MPU_RASR_SIZE_Pos) /*!< 512B Size of the MPU protection region */
 #define LL_MPU_REGION_SIZE_1KB             (0x09U << MPU_RASR_SIZE_Pos) /*!< 1KB Size of the MPU protection region */
@@ -569,7 +571,7 @@ __STATIC_INLINE void LL_MPU_EnableRegion(uint32_t Region)
   * @param  Address Value of region base address
   * @param  SubRegionDisable Sub-region disable value between Min_Data = 0x00 and Max_Data = 0xFF
   * @param  Attributes This parameter can be a combination of the following values:
-  *         @arg @ref LL_MPU_REGION_SIZE_32B or @ref LL_MPU_REGION_SIZE_64B or @ref LL_MPU_REGION_SIZE_128B
+  *         @arg @ref LL_MPU_REGION_SIZE_32B (*) or @ref LL_MPU_REGION_SIZE_64B (*) or @ref LL_MPU_REGION_SIZE_128B (*)
   *           or @ref LL_MPU_REGION_SIZE_256B or @ref LL_MPU_REGION_SIZE_512B or @ref LL_MPU_REGION_SIZE_1KB
   *           or @ref LL_MPU_REGION_SIZE_2KB or @ref LL_MPU_REGION_SIZE_4KB or @ref LL_MPU_REGION_SIZE_8KB
   *           or @ref LL_MPU_REGION_SIZE_16KB or @ref LL_MPU_REGION_SIZE_32KB or @ref LL_MPU_REGION_SIZE_64KB
@@ -586,6 +588,7 @@ __STATIC_INLINE void LL_MPU_EnableRegion(uint32_t Region)
   *         @arg @ref LL_MPU_ACCESS_SHAREABLE or @ref LL_MPU_ACCESS_NOT_SHAREABLE
   *         @arg @ref LL_MPU_ACCESS_CACHEABLE or @ref LL_MPU_ACCESS_NOT_CACHEABLE
   *         @arg @ref LL_MPU_ACCESS_BUFFERABLE or @ref LL_MPU_ACCESS_NOT_BUFFERABLE
+  *         (*) value not defined for CM0+ core.
   * @retval None
   */
 __STATIC_INLINE void LL_MPU_ConfigRegion(uint32_t Region, uint32_t SubRegionDisable, uint32_t Address,
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_i2c.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_i2c.h
index d85ec67f..92823afb 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_i2c.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_i2c.h
@@ -69,38 +69,46 @@ typedef struct
   uint32_t PeripheralMode;      /*!< Specifies the peripheral mode.
                                      This parameter can be a value of @ref I2C_LL_EC_PERIPHERAL_MODE.
 
-                                     This feature can be modified afterwards using unitary function @ref LL_I2C_SetMode(). */
+                                     This feature can be modified afterwards using unitary function
+                                     @ref LL_I2C_SetMode(). */
 
   uint32_t Timing;              /*!< Specifies the SDA setup, hold time and the SCL high, low period values.
                                      This parameter must be set by referring to the STM32CubeMX Tool and
                                      the helper macro @ref __LL_I2C_CONVERT_TIMINGS().
 
-                                     This feature can be modified afterwards using unitary function @ref LL_I2C_SetTiming(). */
+                                     This feature can be modified afterwards using unitary function
+                                     @ref LL_I2C_SetTiming(). */
 
   uint32_t AnalogFilter;        /*!< Enables or disables analog noise filter.
                                      This parameter can be a value of @ref I2C_LL_EC_ANALOGFILTER_SELECTION.
 
-                                     This feature can be modified afterwards using unitary functions @ref LL_I2C_EnableAnalogFilter() or LL_I2C_DisableAnalogFilter(). */
+                                     This feature can be modified afterwards using unitary functions
+                                     @ref LL_I2C_EnableAnalogFilter() or LL_I2C_DisableAnalogFilter(). */
 
   uint32_t DigitalFilter;       /*!< Configures the digital noise filter.
                                      This parameter can be a number between Min_Data = 0x00 and Max_Data = 0x0F.
 
-                                     This feature can be modified afterwards using unitary function @ref LL_I2C_SetDigitalFilter(). */
+                                     This feature can be modified afterwards using unitary function
+                                     @ref LL_I2C_SetDigitalFilter(). */
 
   uint32_t OwnAddress1;         /*!< Specifies the device own address 1.
                                      This parameter must be a value between Min_Data = 0x00 and Max_Data = 0x3FF.
 
-                                     This feature can be modified afterwards using unitary function @ref LL_I2C_SetOwnAddress1(). */
+                                     This feature can be modified afterwards using unitary function
+                                     @ref LL_I2C_SetOwnAddress1(). */
 
-  uint32_t TypeAcknowledge;     /*!< Specifies the ACKnowledge or Non ACKnowledge condition after the address receive match code or next received byte.
+  uint32_t TypeAcknowledge;     /*!< Specifies the ACKnowledge or Non ACKnowledge condition after the address receive
+                                     match code or next received byte.
                                      This parameter can be a value of @ref I2C_LL_EC_I2C_ACKNOWLEDGE.
 
-                                     This feature can be modified afterwards using unitary function @ref LL_I2C_AcknowledgeNextData(). */
+                                     This feature can be modified afterwards using unitary function
+                                     @ref LL_I2C_AcknowledgeNextData(). */
 
   uint32_t OwnAddrSize;         /*!< Specifies the device own address 1 size (7-bit or 10-bit).
                                      This parameter can be a value of @ref I2C_LL_EC_OWNADDRESS1.
 
-                                     This feature can be modified afterwards using unitary function @ref LL_I2C_SetOwnAddress1(). */
+                                     This feature can be modified afterwards using unitary function
+                                     @ref LL_I2C_SetOwnAddress1(). */
 } LL_I2C_InitTypeDef;
 /**
   * @}
@@ -170,10 +178,11 @@ typedef struct
 /** @defgroup I2C_LL_EC_PERIPHERAL_MODE Peripheral Mode
   * @{
   */
-#define LL_I2C_MODE_I2C                    0x00000000U              /*!< I2C Master or Slave mode                                    */
-#define LL_I2C_MODE_SMBUS_HOST             I2C_CR1_SMBHEN           /*!< SMBus Host address acknowledge                              */
-#define LL_I2C_MODE_SMBUS_DEVICE           0x00000000U              /*!< SMBus Device default mode (Default address not acknowledge) */
-#define LL_I2C_MODE_SMBUS_DEVICE_ARP       I2C_CR1_SMBDEN           /*!< SMBus Device Default address acknowledge                    */
+#define LL_I2C_MODE_I2C                    0x00000000U              /*!< I2C Master or Slave mode                 */
+#define LL_I2C_MODE_SMBUS_HOST             I2C_CR1_SMBHEN           /*!< SMBus Host address acknowledge           */
+#define LL_I2C_MODE_SMBUS_DEVICE           0x00000000U              /*!< SMBus Device default mode
+                                                                         (Default address not acknowledge)        */
+#define LL_I2C_MODE_SMBUS_DEVICE_ARP       I2C_CR1_SMBDEN           /*!< SMBus Device Default address acknowledge */
 /**
   * @}
   */
@@ -208,14 +217,15 @@ typedef struct
 /** @defgroup I2C_LL_EC_OWNADDRESS2 Own Address 2 Masks
   * @{
   */
-#define LL_I2C_OWNADDRESS2_NOMASK           I2C_OAR2_OA2NOMASK      /*!< Own Address2 No mask.                                */
-#define LL_I2C_OWNADDRESS2_MASK01           I2C_OAR2_OA2MASK01      /*!< Only Address2 bits[7:2] are compared.                */
-#define LL_I2C_OWNADDRESS2_MASK02           I2C_OAR2_OA2MASK02      /*!< Only Address2 bits[7:3] are compared.                */
-#define LL_I2C_OWNADDRESS2_MASK03           I2C_OAR2_OA2MASK03      /*!< Only Address2 bits[7:4] are compared.                */
-#define LL_I2C_OWNADDRESS2_MASK04           I2C_OAR2_OA2MASK04      /*!< Only Address2 bits[7:5] are compared.                */
-#define LL_I2C_OWNADDRESS2_MASK05           I2C_OAR2_OA2MASK05      /*!< Only Address2 bits[7:6] are compared.                */
-#define LL_I2C_OWNADDRESS2_MASK06           I2C_OAR2_OA2MASK06      /*!< Only Address2 bits[7] are compared.                  */
-#define LL_I2C_OWNADDRESS2_MASK07           I2C_OAR2_OA2MASK07      /*!< No comparison is done. All Address2 are acknowledged.*/
+#define LL_I2C_OWNADDRESS2_NOMASK           I2C_OAR2_OA2NOMASK      /*!< Own Address2 No mask.                 */
+#define LL_I2C_OWNADDRESS2_MASK01           I2C_OAR2_OA2MASK01      /*!< Only Address2 bits[7:2] are compared. */
+#define LL_I2C_OWNADDRESS2_MASK02           I2C_OAR2_OA2MASK02      /*!< Only Address2 bits[7:3] are compared. */
+#define LL_I2C_OWNADDRESS2_MASK03           I2C_OAR2_OA2MASK03      /*!< Only Address2 bits[7:4] are compared. */
+#define LL_I2C_OWNADDRESS2_MASK04           I2C_OAR2_OA2MASK04      /*!< Only Address2 bits[7:5] are compared. */
+#define LL_I2C_OWNADDRESS2_MASK05           I2C_OAR2_OA2MASK05      /*!< Only Address2 bits[7:6] are compared. */
+#define LL_I2C_OWNADDRESS2_MASK06           I2C_OAR2_OA2MASK06      /*!< Only Address2 bits[7] are compared.   */
+#define LL_I2C_OWNADDRESS2_MASK07           I2C_OAR2_OA2MASK07      /*!< No comparison is done.
+                                                                         All Address2 are acknowledged.        */
 /**
   * @}
   */
@@ -250,14 +260,21 @@ typedef struct
 /** @defgroup I2C_LL_EC_MODE Transfer End Mode
   * @{
   */
-#define LL_I2C_MODE_RELOAD                  I2C_CR2_RELOAD                                      /*!< Enable I2C Reload mode.                                   */
-#define LL_I2C_MODE_AUTOEND                 I2C_CR2_AUTOEND                                     /*!< Enable I2C Automatic end mode with no HW PEC comparison.  */
-#define LL_I2C_MODE_SOFTEND                 0x00000000U                                         /*!< Enable I2C Software end mode with no HW PEC comparison.   */
-#define LL_I2C_MODE_SMBUS_RELOAD            LL_I2C_MODE_RELOAD                                  /*!< Enable SMBUS Automatic end mode with HW PEC comparison.   */
-#define LL_I2C_MODE_SMBUS_AUTOEND_NO_PEC    LL_I2C_MODE_AUTOEND                                 /*!< Enable SMBUS Automatic end mode with HW PEC comparison.   */
-#define LL_I2C_MODE_SMBUS_SOFTEND_NO_PEC    LL_I2C_MODE_SOFTEND                                 /*!< Enable SMBUS Software end mode with HW PEC comparison.    */
-#define LL_I2C_MODE_SMBUS_AUTOEND_WITH_PEC  (uint32_t)(LL_I2C_MODE_AUTOEND | I2C_CR2_PECBYTE)   /*!< Enable SMBUS Automatic end mode with HW PEC comparison.   */
-#define LL_I2C_MODE_SMBUS_SOFTEND_WITH_PEC  (uint32_t)(LL_I2C_MODE_SOFTEND | I2C_CR2_PECBYTE)   /*!< Enable SMBUS Software end mode with HW PEC comparison.    */
+#define LL_I2C_MODE_RELOAD                  I2C_CR2_RELOAD           /*!< Enable I2C Reload mode.     */
+#define LL_I2C_MODE_AUTOEND                 I2C_CR2_AUTOEND          /*!< Enable I2C Automatic end mode
+                                                                          with no HW PEC comparison.  */
+#define LL_I2C_MODE_SOFTEND                 0x00000000U              /*!< Enable I2C Software end mode
+                                                                          with no HW PEC comparison.  */
+#define LL_I2C_MODE_SMBUS_RELOAD            LL_I2C_MODE_RELOAD       /*!< Enable SMBUS Automatic end mode
+                                                                          with HW PEC comparison.     */
+#define LL_I2C_MODE_SMBUS_AUTOEND_NO_PEC    LL_I2C_MODE_AUTOEND      /*!< Enable SMBUS Automatic end mode
+                                                                          with HW PEC comparison.     */
+#define LL_I2C_MODE_SMBUS_SOFTEND_NO_PEC    LL_I2C_MODE_SOFTEND      /*!< Enable SMBUS Software end mode
+                                                                          with HW PEC comparison.     */
+#define LL_I2C_MODE_SMBUS_AUTOEND_WITH_PEC  (uint32_t)(LL_I2C_MODE_AUTOEND | I2C_CR2_PECBYTE)
+/*!< Enable SMBUS Automatic end mode with HW PEC comparison.   */
+#define LL_I2C_MODE_SMBUS_SOFTEND_WITH_PEC  (uint32_t)(LL_I2C_MODE_SOFTEND | I2C_CR2_PECBYTE)
+/*!< Enable SMBUS Software end mode with HW PEC comparison.    */
 /**
   * @}
   */
@@ -265,14 +282,23 @@ typedef struct
 /** @defgroup I2C_LL_EC_GENERATE Start And Stop Generation
   * @{
   */
-#define LL_I2C_GENERATE_NOSTARTSTOP         0x00000000U                                                                /*!< Don't Generate Stop and Start condition.                */
-#define LL_I2C_GENERATE_STOP                (uint32_t)(0x80000000U | I2C_CR2_STOP)                                     /*!< Generate Stop condition (Size should be set to 0).      */
-#define LL_I2C_GENERATE_START_READ          (uint32_t)(0x80000000U | I2C_CR2_START | I2C_CR2_RD_WRN)                   /*!< Generate Start for read request.                        */
-#define LL_I2C_GENERATE_START_WRITE         (uint32_t)(0x80000000U | I2C_CR2_START)                                    /*!< Generate Start for write request.                       */
-#define LL_I2C_GENERATE_RESTART_7BIT_READ   (uint32_t)(0x80000000U | I2C_CR2_START | I2C_CR2_RD_WRN)                   /*!< Generate Restart for read request, slave 7Bit address.  */
-#define LL_I2C_GENERATE_RESTART_7BIT_WRITE  (uint32_t)(0x80000000U | I2C_CR2_START)                                    /*!< Generate Restart for write request, slave 7Bit address. */
-#define LL_I2C_GENERATE_RESTART_10BIT_READ  (uint32_t)(0x80000000U | I2C_CR2_START | I2C_CR2_RD_WRN | I2C_CR2_HEAD10R) /*!< Generate Restart for read request, slave 10Bit address. */
-#define LL_I2C_GENERATE_RESTART_10BIT_WRITE (uint32_t)(0x80000000U | I2C_CR2_START)                                    /*!< Generate Restart for write request, slave 10Bit address.*/
+#define LL_I2C_GENERATE_NOSTARTSTOP         0x00000000U
+/*!< Don't Generate Stop and Start condition. */
+#define LL_I2C_GENERATE_STOP                (uint32_t)(0x80000000U | I2C_CR2_STOP)
+/*!< Generate Stop condition (Size should be set to 0).      */
+#define LL_I2C_GENERATE_START_READ          (uint32_t)(0x80000000U | I2C_CR2_START | I2C_CR2_RD_WRN)
+/*!< Generate Start for read request. */
+#define LL_I2C_GENERATE_START_WRITE         (uint32_t)(0x80000000U | I2C_CR2_START)
+/*!< Generate Start for write request. */
+#define LL_I2C_GENERATE_RESTART_7BIT_READ   (uint32_t)(0x80000000U | I2C_CR2_START | I2C_CR2_RD_WRN)
+/*!< Generate Restart for read request, slave 7Bit address.  */
+#define LL_I2C_GENERATE_RESTART_7BIT_WRITE  (uint32_t)(0x80000000U | I2C_CR2_START)
+/*!< Generate Restart for write request, slave 7Bit address. */
+#define LL_I2C_GENERATE_RESTART_10BIT_READ  (uint32_t)(0x80000000U | I2C_CR2_START | \
+                                                       I2C_CR2_RD_WRN | I2C_CR2_HEAD10R)
+/*!< Generate Restart for read request, slave 10Bit address. */
+#define LL_I2C_GENERATE_RESTART_10BIT_WRITE (uint32_t)(0x80000000U | I2C_CR2_START)
+/*!< Generate Restart for write request, slave 10Bit address.*/
 /**
   * @}
   */
@@ -280,8 +306,10 @@ typedef struct
 /** @defgroup I2C_LL_EC_DIRECTION Read Write Direction
   * @{
   */
-#define LL_I2C_DIRECTION_WRITE              0x00000000U              /*!< Write transfer request by master, slave enters receiver mode.  */
-#define LL_I2C_DIRECTION_READ               I2C_ISR_DIR              /*!< Read transfer request by master, slave enters transmitter mode.*/
+#define LL_I2C_DIRECTION_WRITE              0x00000000U              /*!< Write transfer request by master,
+                                                                          slave enters receiver mode.  */
+#define LL_I2C_DIRECTION_READ               I2C_ISR_DIR              /*!< Read transfer request by master,
+                                                                          slave enters transmitter mode.*/
 /**
   * @}
   */
@@ -289,8 +317,10 @@ typedef struct
 /** @defgroup I2C_LL_EC_DMA_REG_DATA DMA Register Data
   * @{
   */
-#define LL_I2C_DMA_REG_DATA_TRANSMIT        0x00000000U              /*!< Get address of data register used for transmission */
-#define LL_I2C_DMA_REG_DATA_RECEIVE         0x00000001U              /*!< Get address of data register used for reception */
+#define LL_I2C_DMA_REG_DATA_TRANSMIT        0x00000000U              /*!< Get address of data register used for
+                                                                          transmission */
+#define LL_I2C_DMA_REG_DATA_RECEIVE         0x00000001U              /*!< Get address of data register used for
+                                                                          reception */
 /**
   * @}
   */
@@ -298,8 +328,10 @@ typedef struct
 /** @defgroup I2C_LL_EC_SMBUS_TIMEOUTA_MODE SMBus TimeoutA Mode SCL SDA Timeout
   * @{
   */
-#define LL_I2C_SMBUS_TIMEOUTA_MODE_SCL_LOW      0x00000000U          /*!< TimeoutA is used to detect SCL low level timeout.              */
-#define LL_I2C_SMBUS_TIMEOUTA_MODE_SDA_SCL_HIGH I2C_TIMEOUTR_TIDLE   /*!< TimeoutA is used to detect both SCL and SDA high level timeout.*/
+#define LL_I2C_SMBUS_TIMEOUTA_MODE_SCL_LOW      0x00000000U          /*!< TimeoutA is used to detect
+                                                                          SCL low level timeout.              */
+#define LL_I2C_SMBUS_TIMEOUTA_MODE_SDA_SCL_HIGH I2C_TIMEOUTR_TIDLE   /*!< TimeoutA is used to detect
+                                                                          both SCL and SDA high level timeout.*/
 /**
   * @}
   */
@@ -307,9 +339,12 @@ typedef struct
 /** @defgroup I2C_LL_EC_SMBUS_TIMEOUT_SELECTION SMBus Timeout Selection
   * @{
   */
-#define LL_I2C_SMBUS_TIMEOUTA               I2C_TIMEOUTR_TIMOUTEN                                   /*!< TimeoutA enable bit                                */
-#define LL_I2C_SMBUS_TIMEOUTB               I2C_TIMEOUTR_TEXTEN                                     /*!< TimeoutB (extended clock) enable bit               */
-#define LL_I2C_SMBUS_ALL_TIMEOUT            (uint32_t)(I2C_TIMEOUTR_TIMOUTEN | I2C_TIMEOUTR_TEXTEN) /*!< TimeoutA and TimeoutB (extended clock) enable bits */
+#define LL_I2C_SMBUS_TIMEOUTA               I2C_TIMEOUTR_TIMOUTEN                 /*!< TimeoutA enable bit          */
+#define LL_I2C_SMBUS_TIMEOUTB               I2C_TIMEOUTR_TEXTEN                   /*!< TimeoutB (extended clock)
+                                                                                       enable bit                   */
+#define LL_I2C_SMBUS_ALL_TIMEOUT            (uint32_t)(I2C_TIMEOUTR_TIMOUTEN | \
+                                                       I2C_TIMEOUTR_TEXTEN)       /*!< TimeoutA and TimeoutB
+(extended clock) enable bits */
 /**
   * @}
   */
@@ -353,18 +388,22 @@ typedef struct
 /**
   * @brief  Configure the SDA setup, hold time and the SCL high, low period.
   * @param  __PRESCALER__ This parameter must be a value between  Min_Data=0 and Max_Data=0xF.
-  * @param  __DATA_SETUP_TIME__ This parameter must be a value between Min_Data=0 and Max_Data=0xF. (tscldel = (SCLDEL+1)xtpresc)
-  * @param  __DATA_HOLD_TIME__ This parameter must be a value between Min_Data=0 and Max_Data=0xF. (tsdadel = SDADELxtpresc)
-  * @param  __CLOCK_HIGH_PERIOD__ This parameter must be a value between Min_Data=0 and Max_Data=0xFF. (tsclh = (SCLH+1)xtpresc)
-  * @param  __CLOCK_LOW_PERIOD__ This parameter must be a value between  Min_Data=0 and Max_Data=0xFF. (tscll = (SCLL+1)xtpresc)
+  * @param  __SETUP_TIME__ This parameter must be a value between Min_Data=0 and Max_Data=0xF.
+                           (tscldel = (SCLDEL+1)xtpresc)
+  * @param  __HOLD_TIME__  This parameter must be a value between Min_Data=0 and Max_Data=0xF.
+                           (tsdadel = SDADELxtpresc)
+  * @param  __SCLH_PERIOD__ This parameter must be a value between Min_Data=0 and Max_Data=0xFF.
+                            (tsclh = (SCLH+1)xtpresc)
+  * @param  __SCLL_PERIOD__ This parameter must be a value between  Min_Data=0 and Max_Data=0xFF.
+                            (tscll = (SCLL+1)xtpresc)
   * @retval Value between Min_Data=0 and Max_Data=0xFFFFFFFF
   */
-#define __LL_I2C_CONVERT_TIMINGS(__PRESCALER__, __DATA_SETUP_TIME__, __DATA_HOLD_TIME__, __CLOCK_HIGH_PERIOD__, __CLOCK_LOW_PERIOD__)   \
-  ((((uint32_t)(__PRESCALER__)         << I2C_TIMINGR_PRESC_Pos)  & I2C_TIMINGR_PRESC)   | \
-   (((uint32_t)(__DATA_SETUP_TIME__)   << I2C_TIMINGR_SCLDEL_Pos) & I2C_TIMINGR_SCLDEL)  | \
-   (((uint32_t)(__DATA_HOLD_TIME__)    << I2C_TIMINGR_SDADEL_Pos) & I2C_TIMINGR_SDADEL)  | \
-   (((uint32_t)(__CLOCK_HIGH_PERIOD__) << I2C_TIMINGR_SCLH_Pos)   & I2C_TIMINGR_SCLH)    | \
-   (((uint32_t)(__CLOCK_LOW_PERIOD__)  << I2C_TIMINGR_SCLL_Pos)   & I2C_TIMINGR_SCLL))
+#define __LL_I2C_CONVERT_TIMINGS(__PRESCALER__, __SETUP_TIME__, __HOLD_TIME__, __SCLH_PERIOD__, __SCLL_PERIOD__) \
+  ((((uint32_t)(__PRESCALER__)    << I2C_TIMINGR_PRESC_Pos)  & I2C_TIMINGR_PRESC)   | \
+   (((uint32_t)(__SETUP_TIME__)   << I2C_TIMINGR_SCLDEL_Pos) & I2C_TIMINGR_SCLDEL)  | \
+   (((uint32_t)(__HOLD_TIME__)    << I2C_TIMINGR_SDADEL_Pos) & I2C_TIMINGR_SDADEL)  | \
+   (((uint32_t)(__SCLH_PERIOD__)  << I2C_TIMINGR_SCLH_Pos)   & I2C_TIMINGR_SCLH)    | \
+   (((uint32_t)(__SCLL_PERIOD__)  << I2C_TIMINGR_SCLL_Pos)   & I2C_TIMINGR_SCLL))
 /**
   * @}
   */
@@ -428,7 +467,8 @@ __STATIC_INLINE uint32_t LL_I2C_IsEnabled(I2C_TypeDef *I2Cx)
   * @param  AnalogFilter This parameter can be one of the following values:
   *         @arg @ref LL_I2C_ANALOGFILTER_ENABLE
   *         @arg @ref LL_I2C_ANALOGFILTER_DISABLE
-  * @param  DigitalFilter This parameter must be a value between Min_Data=0x00 (Digital filter disabled) and Max_Data=0x0F (Digital filter enabled and filtering capability up to 15*ti2cclk).
+  * @param  DigitalFilter This parameter must be a value between Min_Data=0x00 (Digital filter disabled)
+                          and Max_Data=0x0F (Digital filter enabled and filtering capability up to 15*ti2cclk).
   *         This parameter is used to configure the digital noise filter on SDA and SCL input.
   *         The digital filter will filter spikes with a length of up to DNF[3:0]*ti2cclk.
   * @retval None
@@ -444,7 +484,8 @@ __STATIC_INLINE void LL_I2C_ConfigFilters(I2C_TypeDef *I2Cx, uint32_t AnalogFilt
   *         This filter can only be programmed when the I2C is disabled (PE = 0).
   * @rmtoll CR1          DNF           LL_I2C_SetDigitalFilter
   * @param  I2Cx I2C Instance.
-  * @param  DigitalFilter This parameter must be a value between Min_Data=0x00 (Digital filter disabled) and Max_Data=0x0F (Digital filter enabled and filtering capability up to 15*ti2cclk).
+  * @param  DigitalFilter This parameter must be a value between Min_Data=0x00 (Digital filter disabled)
+                          and Max_Data=0x0F (Digital filter enabled and filtering capability up to 15*ti2cclk).
   *         This parameter is used to configure the digital noise filter on SDA and SCL input.
   *         The digital filter will filter spikes with a length of up to DNF[3:0]*ti2cclk.
   * @retval None
@@ -664,7 +705,7 @@ __STATIC_INLINE uint32_t LL_I2C_IsEnabledSlaveByteControl(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Enable Wakeup from STOP.
-  * @note   Macro IS_I2C_WAKEUP_FROMSTOP_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_I2C_WAKEUP_FROMSTOP_INSTANCE(I2Cx) can be used to check whether or not
   *         WakeUpFromStop feature is supported by the I2Cx Instance.
   * @note   This bit can only be programmed when Digital Filter is disabled.
   * @rmtoll CR1          WUPEN         LL_I2C_EnableWakeUpFromStop
@@ -678,7 +719,7 @@ __STATIC_INLINE void LL_I2C_EnableWakeUpFromStop(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Disable Wakeup from STOP.
-  * @note   Macro IS_I2C_WAKEUP_FROMSTOP_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_I2C_WAKEUP_FROMSTOP_INSTANCE(I2Cx) can be used to check whether or not
   *         WakeUpFromStop feature is supported by the I2Cx Instance.
   * @rmtoll CR1          WUPEN         LL_I2C_DisableWakeUpFromStop
   * @param  I2Cx I2C Instance.
@@ -691,7 +732,7 @@ __STATIC_INLINE void LL_I2C_DisableWakeUpFromStop(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Check if Wakeup from STOP is enabled or disabled.
-  * @note   Macro IS_I2C_WAKEUP_FROMSTOP_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_I2C_WAKEUP_FROMSTOP_INSTANCE(I2Cx) can be used to check whether or not
   *         WakeUpFromStop feature is supported by the I2Cx Instance.
   * @rmtoll CR1          WUPEN         LL_I2C_IsEnabledWakeUpFromStop
   * @param  I2Cx I2C Instance.
@@ -941,7 +982,7 @@ __STATIC_INLINE uint32_t LL_I2C_GetDataSetupTime(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Configure peripheral mode.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll CR1          SMBHEN        LL_I2C_SetMode\n
   *         CR1          SMBDEN        LL_I2C_SetMode
@@ -960,7 +1001,7 @@ __STATIC_INLINE void LL_I2C_SetMode(I2C_TypeDef *I2Cx, uint32_t PeripheralMode)
 
 /**
   * @brief  Get peripheral mode.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll CR1          SMBHEN        LL_I2C_GetMode\n
   *         CR1          SMBDEN        LL_I2C_GetMode
@@ -978,7 +1019,7 @@ __STATIC_INLINE uint32_t LL_I2C_GetMode(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Enable SMBus alert (Host or Device mode)
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   SMBus Device mode:
   *         - SMBus Alert pin is drived low and
@@ -996,7 +1037,7 @@ __STATIC_INLINE void LL_I2C_EnableSMBusAlert(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Disable SMBus alert (Host or Device mode)
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   SMBus Device mode:
   *         - SMBus Alert pin is not drived (can be used as a standard GPIO) and
@@ -1014,7 +1055,7 @@ __STATIC_INLINE void LL_I2C_DisableSMBusAlert(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Check if SMBus alert (Host or Device mode) is enabled or disabled.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll CR1          ALERTEN       LL_I2C_IsEnabledSMBusAlert
   * @param  I2Cx I2C Instance.
@@ -1027,7 +1068,7 @@ __STATIC_INLINE uint32_t LL_I2C_IsEnabledSMBusAlert(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Enable SMBus Packet Error Calculation (PEC).
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll CR1          PECEN         LL_I2C_EnableSMBusPEC
   * @param  I2Cx I2C Instance.
@@ -1040,7 +1081,7 @@ __STATIC_INLINE void LL_I2C_EnableSMBusPEC(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Disable SMBus Packet Error Calculation (PEC).
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll CR1          PECEN         LL_I2C_DisableSMBusPEC
   * @param  I2Cx I2C Instance.
@@ -1053,7 +1094,7 @@ __STATIC_INLINE void LL_I2C_DisableSMBusPEC(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Check if SMBus Packet Error Calculation (PEC) is enabled or disabled.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll CR1          PECEN         LL_I2C_IsEnabledSMBusPEC
   * @param  I2Cx I2C Instance.
@@ -1066,7 +1107,7 @@ __STATIC_INLINE uint32_t LL_I2C_IsEnabledSMBusPEC(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Configure the SMBus Clock Timeout.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   This configuration can only be programmed when associated Timeout is disabled (TimeoutA and/orTimeoutB).
   * @rmtoll TIMEOUTR     TIMEOUTA      LL_I2C_ConfigSMBusTimeout\n
@@ -1089,7 +1130,7 @@ __STATIC_INLINE void LL_I2C_ConfigSMBusTimeout(I2C_TypeDef *I2Cx, uint32_t Timeo
 
 /**
   * @brief  Configure the SMBus Clock TimeoutA (SCL low timeout or SCL and SDA high timeout depends on TimeoutA mode).
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   These bits can only be programmed when TimeoutA is disabled.
   * @rmtoll TIMEOUTR     TIMEOUTA      LL_I2C_SetSMBusTimeoutA
@@ -1104,7 +1145,7 @@ __STATIC_INLINE void LL_I2C_SetSMBusTimeoutA(I2C_TypeDef *I2Cx, uint32_t Timeout
 
 /**
   * @brief  Get the SMBus Clock TimeoutA setting.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll TIMEOUTR     TIMEOUTA      LL_I2C_GetSMBusTimeoutA
   * @param  I2Cx I2C Instance.
@@ -1117,7 +1158,7 @@ __STATIC_INLINE uint32_t LL_I2C_GetSMBusTimeoutA(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Set the SMBus Clock TimeoutA mode.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   This bit can only be programmed when TimeoutA is disabled.
   * @rmtoll TIMEOUTR     TIDLE         LL_I2C_SetSMBusTimeoutAMode
@@ -1134,7 +1175,7 @@ __STATIC_INLINE void LL_I2C_SetSMBusTimeoutAMode(I2C_TypeDef *I2Cx, uint32_t Tim
 
 /**
   * @brief  Get the SMBus Clock TimeoutA mode.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll TIMEOUTR     TIDLE         LL_I2C_GetSMBusTimeoutAMode
   * @param  I2Cx I2C Instance.
@@ -1149,7 +1190,7 @@ __STATIC_INLINE uint32_t LL_I2C_GetSMBusTimeoutAMode(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Configure the SMBus Extended Cumulative Clock TimeoutB (Master or Slave mode).
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   These bits can only be programmed when TimeoutB is disabled.
   * @rmtoll TIMEOUTR     TIMEOUTB      LL_I2C_SetSMBusTimeoutB
@@ -1164,7 +1205,7 @@ __STATIC_INLINE void LL_I2C_SetSMBusTimeoutB(I2C_TypeDef *I2Cx, uint32_t Timeout
 
 /**
   * @brief  Get the SMBus Extended Cumulative Clock TimeoutB setting.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll TIMEOUTR     TIMEOUTB      LL_I2C_GetSMBusTimeoutB
   * @param  I2Cx I2C Instance.
@@ -1177,7 +1218,7 @@ __STATIC_INLINE uint32_t LL_I2C_GetSMBusTimeoutB(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Enable the SMBus Clock Timeout.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll TIMEOUTR     TIMOUTEN      LL_I2C_EnableSMBusTimeout\n
   *         TIMEOUTR     TEXTEN        LL_I2C_EnableSMBusTimeout
@@ -1195,7 +1236,7 @@ __STATIC_INLINE void LL_I2C_EnableSMBusTimeout(I2C_TypeDef *I2Cx, uint32_t Clock
 
 /**
   * @brief  Disable the SMBus Clock Timeout.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll TIMEOUTR     TIMOUTEN      LL_I2C_DisableSMBusTimeout\n
   *         TIMEOUTR     TEXTEN        LL_I2C_DisableSMBusTimeout
@@ -1213,7 +1254,7 @@ __STATIC_INLINE void LL_I2C_DisableSMBusTimeout(I2C_TypeDef *I2Cx, uint32_t Cloc
 
 /**
   * @brief  Check if the SMBus Clock Timeout is enabled or disabled.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll TIMEOUTR     TIMOUTEN      LL_I2C_IsEnabledSMBusTimeout\n
   *         TIMEOUTR     TEXTEN        LL_I2C_IsEnabledSMBusTimeout
@@ -1226,7 +1267,8 @@ __STATIC_INLINE void LL_I2C_DisableSMBusTimeout(I2C_TypeDef *I2Cx, uint32_t Cloc
   */
 __STATIC_INLINE uint32_t LL_I2C_IsEnabledSMBusTimeout(I2C_TypeDef *I2Cx, uint32_t ClockTimeout)
 {
-  return ((READ_BIT(I2Cx->TIMEOUTR, (I2C_TIMEOUTR_TIMOUTEN | I2C_TIMEOUTR_TEXTEN)) == (ClockTimeout)) ? 1UL : 0UL);
+  return ((READ_BIT(I2Cx->TIMEOUTR, (I2C_TIMEOUTR_TIMOUTEN | I2C_TIMEOUTR_TEXTEN)) == \
+           (ClockTimeout)) ? 1UL : 0UL);
 }
 
 /**
@@ -1443,7 +1485,7 @@ __STATIC_INLINE uint32_t LL_I2C_IsEnabledIT_TC(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Enable Error interrupts.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   Any of these errors will generate interrupt :
   *         Arbitration Loss (ARLO)
@@ -1463,7 +1505,7 @@ __STATIC_INLINE void LL_I2C_EnableIT_ERR(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Disable Error interrupts.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   Any of these errors will generate interrupt :
   *         Arbitration Loss (ARLO)
@@ -1645,7 +1687,7 @@ __STATIC_INLINE uint32_t LL_I2C_IsActiveFlag_OVR(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Indicate the status of SMBus PEC error flag in reception.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   RESET: Clear default value.
   *         SET: When the received PEC does not match with the PEC register content.
@@ -1660,7 +1702,7 @@ __STATIC_INLINE uint32_t LL_I2C_IsActiveSMBusFlag_PECERR(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Indicate the status of SMBus Timeout detection flag.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   RESET: Clear default value.
   *         SET: When a timeout or extended clock timeout occurs.
@@ -1675,7 +1717,7 @@ __STATIC_INLINE uint32_t LL_I2C_IsActiveSMBusFlag_TIMEOUT(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Indicate the status of SMBus alert flag.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @note   RESET: Clear default value.
   *         SET: When SMBus host configuration, SMBus alert enabled and
@@ -1782,7 +1824,7 @@ __STATIC_INLINE void LL_I2C_ClearFlag_OVR(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Clear SMBus PEC error flag.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll ICR          PECCF         LL_I2C_ClearSMBusFlag_PECERR
   * @param  I2Cx I2C Instance.
@@ -1795,7 +1837,7 @@ __STATIC_INLINE void LL_I2C_ClearSMBusFlag_PECERR(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Clear SMBus Timeout detection flag.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll ICR          TIMOUTCF      LL_I2C_ClearSMBusFlag_TIMEOUT
   * @param  I2Cx I2C Instance.
@@ -1808,7 +1850,7 @@ __STATIC_INLINE void LL_I2C_ClearSMBusFlag_TIMEOUT(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Clear SMBus Alert flag.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll ICR          ALERTCF       LL_I2C_ClearSMBusFlag_ALERT
   * @param  I2Cx I2C Instance.
@@ -1923,7 +1965,8 @@ __STATIC_INLINE uint32_t LL_I2C_GetTransferSize(I2C_TypeDef *I2Cx)
 }
 
 /**
-  * @brief  Prepare the generation of a ACKnowledge or Non ACKnowledge condition after the address receive match code or next received byte.
+  * @brief  Prepare the generation of a ACKnowledge or Non ACKnowledge condition after the address receive match code
+            or next received byte.
   * @note   Usage in Slave mode only.
   * @rmtoll CR2          NACK          LL_I2C_AcknowledgeNextData
   * @param  I2Cx I2C Instance.
@@ -1964,7 +2007,8 @@ __STATIC_INLINE void LL_I2C_GenerateStopCondition(I2C_TypeDef *I2Cx)
 /**
   * @brief  Enable automatic RESTART Read request condition for 10bit address header (master mode).
   * @note   The master sends the complete 10bit slave address read sequence :
-  *         Start + 2 bytes 10bit address in Write direction + Restart + first 7 bits of 10bit address in Read direction.
+  *         Start + 2 bytes 10bit address in Write direction + Restart + first 7 bits of 10bit address
+            in Read direction.
   * @rmtoll CR2          HEAD10R       LL_I2C_EnableAuto10BitRead
   * @param  I2Cx I2C Instance.
   * @retval None
@@ -2125,9 +2169,10 @@ __STATIC_INLINE uint32_t LL_I2C_GetAddressMatchCode(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Enable internal comparison of the SMBus Packet Error byte (transmission or reception mode).
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
-  * @note   This feature is cleared by hardware when the PEC byte is transferred, or when a STOP condition or an Address Matched is received.
+  * @note   This feature is cleared by hardware when the PEC byte is transferred, or when a STOP condition
+            or an Address Matched is received.
   *         This bit has no effect when RELOAD bit is set.
   *         This bit has no effect in device mode when SBC bit is not set.
   * @rmtoll CR2          PECBYTE       LL_I2C_EnableSMBusPECCompare
@@ -2141,7 +2186,7 @@ __STATIC_INLINE void LL_I2C_EnableSMBusPECCompare(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Check if the SMBus Packet Error byte internal comparison is requested or not.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll CR2          PECBYTE       LL_I2C_IsEnabledSMBusPECCompare
   * @param  I2Cx I2C Instance.
@@ -2154,7 +2199,7 @@ __STATIC_INLINE uint32_t LL_I2C_IsEnabledSMBusPECCompare(I2C_TypeDef *I2Cx)
 
 /**
   * @brief  Get the SMBus Packet Error byte calculated.
-  * @note   Macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
+  * @note   The macro IS_SMBUS_ALL_INSTANCE(I2Cx) can be used to check whether or not
   *         SMBus feature is supported by the I2Cx Instance.
   * @rmtoll PECR         PEC           LL_I2C_GetSMBusPEC
   * @param  I2Cx I2C Instance.
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_iwdg.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_iwdg.h
index e3d3093a..dc43d8f0 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_iwdg.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_iwdg.h
@@ -304,8 +304,8 @@ __STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_WVU(IWDG_TypeDef *IWDGx)
 /**
   * @brief  Check if all flags Prescaler, Reload & Window Value Update are reset or not
   * @rmtoll SR           PVU           LL_IWDG_IsReady\n
-  *         SR           WVU           LL_IWDG_IsReady\n
-  *         SR           RVU           LL_IWDG_IsReady
+  *         SR           RVU           LL_IWDG_IsReady\n
+  *         SR           WVU           LL_IWDG_IsReady
   * @param  IWDGx IWDG Instance
   * @retval State of bits (1 or 0).
   */
@@ -318,7 +318,6 @@ __STATIC_INLINE uint32_t LL_IWDG_IsReady(IWDG_TypeDef *IWDGx)
   * @}
   */
 
-
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_lpuart.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_lpuart.h
index 493a3f2a..013c67dd 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_lpuart.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_lpuart.h
@@ -559,7 +559,7 @@ __STATIC_INLINE uint32_t LL_LPUART_IsEnabledFIFO(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_SetTXFIFOThreshold(USART_TypeDef *LPUARTx, uint32_t Threshold)
 {
-  MODIFY_REG(LPUARTx->CR3, USART_CR3_TXFTCFG, Threshold << USART_CR3_TXFTCFG_Pos);
+  ATOMIC_MODIFY_REG(LPUARTx->CR3, USART_CR3_TXFTCFG, Threshold << USART_CR3_TXFTCFG_Pos);
 }
 
 /**
@@ -594,7 +594,7 @@ __STATIC_INLINE uint32_t LL_LPUART_GetTXFIFOThreshold(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_SetRXFIFOThreshold(USART_TypeDef *LPUARTx, uint32_t Threshold)
 {
-  MODIFY_REG(LPUARTx->CR3, USART_CR3_RXFTCFG, Threshold << USART_CR3_RXFTCFG_Pos);
+  ATOMIC_MODIFY_REG(LPUARTx->CR3, USART_CR3_RXFTCFG, Threshold << USART_CR3_RXFTCFG_Pos);
 }
 
 /**
@@ -637,8 +637,8 @@ __STATIC_INLINE uint32_t LL_LPUART_GetRXFIFOThreshold(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_ConfigFIFOsThreshold(USART_TypeDef *LPUARTx, uint32_t TXThreshold, uint32_t RXThreshold)
 {
-  MODIFY_REG(LPUARTx->CR3, USART_CR3_TXFTCFG | USART_CR3_RXFTCFG, (TXThreshold << USART_CR3_TXFTCFG_Pos) | \
-             (RXThreshold << USART_CR3_RXFTCFG_Pos));
+  ATOMIC_MODIFY_REG(LPUARTx->CR3, USART_CR3_TXFTCFG | USART_CR3_RXFTCFG, (TXThreshold << USART_CR3_TXFTCFG_Pos) | \
+                    (RXThreshold << USART_CR3_RXFTCFG_Pos));
 }
 
 /**
@@ -651,7 +651,7 @@ __STATIC_INLINE void LL_LPUART_ConfigFIFOsThreshold(USART_TypeDef *LPUARTx, uint
   */
 __STATIC_INLINE void LL_LPUART_EnableInStopMode(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_UESM);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_UESM);
 }
 
 /**
@@ -663,7 +663,7 @@ __STATIC_INLINE void LL_LPUART_EnableInStopMode(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableInStopMode(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_UESM);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_UESM);
 }
 
 /**
@@ -686,7 +686,7 @@ __STATIC_INLINE uint32_t LL_LPUART_IsEnabledInStopMode(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableDirectionRx(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_RE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_RE);
 }
 
 /**
@@ -697,7 +697,7 @@ __STATIC_INLINE void LL_LPUART_EnableDirectionRx(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableDirectionRx(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_RE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_RE);
 }
 
 /**
@@ -708,7 +708,7 @@ __STATIC_INLINE void LL_LPUART_DisableDirectionRx(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableDirectionTx(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_TE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_TE);
 }
 
 /**
@@ -719,7 +719,7 @@ __STATIC_INLINE void LL_LPUART_EnableDirectionTx(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableDirectionTx(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_TE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_TE);
 }
 
 /**
@@ -737,7 +737,7 @@ __STATIC_INLINE void LL_LPUART_DisableDirectionTx(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_SetTransferDirection(USART_TypeDef *LPUARTx, uint32_t TransferDirection)
 {
-  MODIFY_REG(LPUARTx->CR1, USART_CR1_RE | USART_CR1_TE, TransferDirection);
+  ATOMIC_MODIFY_REG(LPUARTx->CR1, USART_CR1_RE | USART_CR1_TE, TransferDirection);
 }
 
 /**
@@ -854,7 +854,7 @@ __STATIC_INLINE uint32_t LL_LPUART_GetDataWidth(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableMuteMode(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_MME);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_MME);
 }
 
 /**
@@ -865,7 +865,7 @@ __STATIC_INLINE void LL_LPUART_EnableMuteMode(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableMuteMode(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_MME);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_MME);
 }
 
 /**
@@ -1928,7 +1928,7 @@ __STATIC_INLINE void LL_LPUART_ClearFlag_WKUP(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_IDLE(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_IDLEIE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_IDLEIE);
 }
 
 /* Legacy define */
@@ -1942,7 +1942,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_IDLE(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_RXNE_RXFNE(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_RXNEIE_RXFNEIE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_RXNEIE_RXFNEIE);
 }
 
 /**
@@ -1953,7 +1953,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_RXNE_RXFNE(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_TC(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_TCIE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_TCIE);
 }
 
 /* Legacy define */
@@ -1967,7 +1967,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_TC(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_TXE_TXFNF(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_TXEIE_TXFNFIE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_TXEIE_TXFNFIE);
 }
 
 /**
@@ -1978,7 +1978,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_TXE_TXFNF(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_PE(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_PEIE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_PEIE);
 }
 
 /**
@@ -1989,7 +1989,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_PE(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_CM(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_CMIE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_CMIE);
 }
 
 /**
@@ -2000,7 +2000,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_CM(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_TXFE(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_TXFEIE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_TXFEIE);
 }
 
 /**
@@ -2011,7 +2011,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_TXFE(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_RXFF(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR1, USART_CR1_RXFFIE);
+  ATOMIC_SET_BIT(LPUARTx->CR1, USART_CR1_RXFFIE);
 }
 
 /**
@@ -2026,7 +2026,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_RXFF(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_ERROR(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR3, USART_CR3_EIE);
+  ATOMIC_SET_BIT(LPUARTx->CR3, USART_CR3_EIE);
 }
 
 /**
@@ -2037,7 +2037,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_ERROR(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_CTS(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR3, USART_CR3_CTSIE);
+  ATOMIC_SET_BIT(LPUARTx->CR3, USART_CR3_CTSIE);
 }
 
 /**
@@ -2048,7 +2048,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_CTS(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_WKUP(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR3, USART_CR3_WUFIE);
+  ATOMIC_SET_BIT(LPUARTx->CR3, USART_CR3_WUFIE);
 }
 
 /**
@@ -2059,7 +2059,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_WKUP(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_TXFT(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR3, USART_CR3_TXFTIE);
+  ATOMIC_SET_BIT(LPUARTx->CR3, USART_CR3_TXFTIE);
 }
 
 /**
@@ -2070,7 +2070,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_TXFT(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableIT_RXFT(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR3, USART_CR3_RXFTIE);
+  ATOMIC_SET_BIT(LPUARTx->CR3, USART_CR3_RXFTIE);
 }
 
 /**
@@ -2081,7 +2081,7 @@ __STATIC_INLINE void LL_LPUART_EnableIT_RXFT(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_IDLE(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_IDLEIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_IDLEIE);
 }
 
 /* Legacy define */
@@ -2095,7 +2095,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_IDLE(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_RXNE_RXFNE(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_RXNEIE_RXFNEIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_RXNEIE_RXFNEIE);
 }
 
 /**
@@ -2106,7 +2106,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_RXNE_RXFNE(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_TC(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_TCIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_TCIE);
 }
 
 /* Legacy define */
@@ -2120,7 +2120,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_TC(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_TXE_TXFNF(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_TXEIE_TXFNFIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_TXEIE_TXFNFIE);
 }
 
 /**
@@ -2131,7 +2131,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_TXE_TXFNF(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_PE(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_PEIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_PEIE);
 }
 
 /**
@@ -2142,7 +2142,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_PE(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_CM(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_CMIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_CMIE);
 }
 
 /**
@@ -2153,7 +2153,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_CM(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_TXFE(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_TXFEIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_TXFEIE);
 }
 
 /**
@@ -2164,7 +2164,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_TXFE(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_RXFF(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR1, USART_CR1_RXFFIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR1, USART_CR1_RXFFIE);
 }
 
 /**
@@ -2179,7 +2179,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_RXFF(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_ERROR(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR3, USART_CR3_EIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR3, USART_CR3_EIE);
 }
 
 /**
@@ -2190,7 +2190,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_ERROR(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_CTS(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR3, USART_CR3_CTSIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR3, USART_CR3_CTSIE);
 }
 
 /**
@@ -2201,7 +2201,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_CTS(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_WKUP(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR3, USART_CR3_WUFIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR3, USART_CR3_WUFIE);
 }
 
 /**
@@ -2212,7 +2212,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_WKUP(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_TXFT(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR3, USART_CR3_TXFTIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR3, USART_CR3_TXFTIE);
 }
 
 /**
@@ -2223,7 +2223,7 @@ __STATIC_INLINE void LL_LPUART_DisableIT_TXFT(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableIT_RXFT(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR3, USART_CR3_RXFTIE);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR3, USART_CR3_RXFTIE);
 }
 
 /**
@@ -2391,7 +2391,7 @@ __STATIC_INLINE uint32_t LL_LPUART_IsEnabledIT_RXFT(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableDMAReq_RX(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR3, USART_CR3_DMAR);
+  ATOMIC_SET_BIT(LPUARTx->CR3, USART_CR3_DMAR);
 }
 
 /**
@@ -2402,7 +2402,7 @@ __STATIC_INLINE void LL_LPUART_EnableDMAReq_RX(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableDMAReq_RX(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR3, USART_CR3_DMAR);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR3, USART_CR3_DMAR);
 }
 
 /**
@@ -2424,7 +2424,7 @@ __STATIC_INLINE uint32_t LL_LPUART_IsEnabledDMAReq_RX(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_EnableDMAReq_TX(USART_TypeDef *LPUARTx)
 {
-  SET_BIT(LPUARTx->CR3, USART_CR3_DMAT);
+  ATOMIC_SET_BIT(LPUARTx->CR3, USART_CR3_DMAT);
 }
 
 /**
@@ -2435,7 +2435,7 @@ __STATIC_INLINE void LL_LPUART_EnableDMAReq_TX(USART_TypeDef *LPUARTx)
   */
 __STATIC_INLINE void LL_LPUART_DisableDMAReq_TX(USART_TypeDef *LPUARTx)
 {
-  CLEAR_BIT(LPUARTx->CR3, USART_CR3_DMAT);
+  ATOMIC_CLEAR_BIT(LPUARTx->CR3, USART_CR3_DMAT);
 }
 
 /**
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_spi.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_spi.h
index 0765aedd..3e04ef1a 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_spi.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_spi.h
@@ -1333,7 +1333,7 @@ __STATIC_INLINE uint32_t LL_SPI_DMA_GetRegAddr(SPI_TypeDef *SPIx)
   */
 __STATIC_INLINE uint8_t LL_SPI_ReceiveData8(SPI_TypeDef *SPIx)
 {
-  return (uint8_t)(READ_REG(SPIx->DR));
+  return (*((__IO uint8_t *)&SPIx->DR));
 }
 
 /**
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_tim.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_tim.h
index 1aefeb77..649049ac 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_tim.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_tim.h
@@ -598,8 +598,8 @@ typedef struct
 /** @defgroup TIM_LL_EC_ONEPULSEMODE One Pulse Mode
   * @{
   */
-#define LL_TIM_ONEPULSEMODE_SINGLE             TIM_CR1_OPM          /*!< Counter is not stopped at update event */
-#define LL_TIM_ONEPULSEMODE_REPETITIVE         0x00000000U          /*!< Counter stops counting at the next update event */
+#define LL_TIM_ONEPULSEMODE_SINGLE             TIM_CR1_OPM          /*!< Counter stops counting at the next update event */
+#define LL_TIM_ONEPULSEMODE_REPETITIVE         0x00000000U          /*!< Counter is not stopped at update event */
 /**
   * @}
   */
@@ -1515,7 +1515,16 @@ __STATIC_INLINE void LL_TIM_SetCounterMode(TIM_TypeDef *TIMx, uint32_t CounterMo
   */
 __STATIC_INLINE uint32_t LL_TIM_GetCounterMode(TIM_TypeDef *TIMx)
 {
-  return (uint32_t)(READ_BIT(TIMx->CR1, TIM_CR1_DIR | TIM_CR1_CMS));
+  uint32_t counter_mode;
+
+  counter_mode = (uint32_t)(READ_BIT(TIMx->CR1, TIM_CR1_CMS));
+
+  if (counter_mode == 0U)
+  {
+    counter_mode = (uint32_t)(READ_BIT(TIMx->CR1, TIM_CR1_DIR));
+  }
+
+  return counter_mode;
 }
 
 /**
diff --git a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_usart.h b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_usart.h
index de04ac3e..830b0ad9 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_usart.h
+++ b/Drivers/STM32WLxx_HAL_Driver/Inc/stm32wlxx_ll_usart.h
@@ -88,41 +88,49 @@ typedef struct
   uint32_t PrescalerValue;            /*!< Specifies the Prescaler to compute the communication baud rate.
                                            This parameter can be a value of @ref USART_LL_EC_PRESCALER.
 
-                                           This feature can be modified afterwards using unitary function @ref LL_USART_SetPrescaler().*/
+                                           This feature can be modified afterwards using unitary
+                                           function @ref LL_USART_SetPrescaler().*/
 
   uint32_t BaudRate;                  /*!< This field defines expected Usart communication baud rate.
 
-                                           This feature can be modified afterwards using unitary function @ref LL_USART_SetBaudRate().*/
+                                           This feature can be modified afterwards using unitary
+                                           function @ref LL_USART_SetBaudRate().*/
 
   uint32_t DataWidth;                 /*!< Specifies the number of data bits transmitted or received in a frame.
                                            This parameter can be a value of @ref USART_LL_EC_DATAWIDTH.
 
-                                           This feature can be modified afterwards using unitary function @ref LL_USART_SetDataWidth().*/
+                                           This feature can be modified afterwards using unitary
+                                           function @ref LL_USART_SetDataWidth().*/
 
   uint32_t StopBits;                  /*!< Specifies the number of stop bits transmitted.
                                            This parameter can be a value of @ref USART_LL_EC_STOPBITS.
 
-                                           This feature can be modified afterwards using unitary function @ref LL_USART_SetStopBitsLength().*/
+                                           This feature can be modified afterwards using unitary
+                                           function @ref LL_USART_SetStopBitsLength().*/
 
   uint32_t Parity;                    /*!< Specifies the parity mode.
                                            This parameter can be a value of @ref USART_LL_EC_PARITY.
 
-                                           This feature can be modified afterwards using unitary function @ref LL_USART_SetParity().*/
+                                           This feature can be modified afterwards using unitary
+                                           function @ref LL_USART_SetParity().*/
 
   uint32_t TransferDirection;         /*!< Specifies whether the Receive and/or Transmit mode is enabled or disabled.
                                            This parameter can be a value of @ref USART_LL_EC_DIRECTION.
 
-                                           This feature can be modified afterwards using unitary function @ref LL_USART_SetTransferDirection().*/
+                                           This feature can be modified afterwards using unitary
+                                           function @ref LL_USART_SetTransferDirection().*/
 
   uint32_t HardwareFlowControl;       /*!< Specifies whether the hardware flow control mode is enabled or disabled.
                                            This parameter can be a value of @ref USART_LL_EC_HWCONTROL.
 
-                                           This feature can be modified afterwards using unitary function @ref LL_USART_SetHWFlowCtrl().*/
+                                           This feature can be modified afterwards using unitary
+                                           function @ref LL_USART_SetHWFlowCtrl().*/
 
   uint32_t OverSampling;              /*!< Specifies whether USART oversampling mode is 16 or 8.
                                            This parameter can be a value of @ref USART_LL_EC_OVERSAMPLING.
 
-                                           This feature can be modified afterwards using unitary function @ref LL_USART_SetOverSampling().*/
+                                           This feature can be modified afterwards using unitary
+                                           function @ref LL_USART_SetOverSampling().*/
 
 } LL_USART_InitTypeDef;
 
@@ -141,20 +149,23 @@ typedef struct
   uint32_t ClockPolarity;             /*!< Specifies the steady state of the serial clock.
                                            This parameter can be a value of @ref USART_LL_EC_POLARITY.
 
-                                           USART HW configuration can be modified afterwards using unitary functions @ref LL_USART_SetClockPolarity().
+                                           USART HW configuration can be modified afterwards using unitary
+                                           functions @ref LL_USART_SetClockPolarity().
                                            For more details, refer to description of this function. */
 
   uint32_t ClockPhase;                /*!< Specifies the clock transition on which the bit capture is made.
                                            This parameter can be a value of @ref USART_LL_EC_PHASE.
 
-                                           USART HW configuration can be modified afterwards using unitary functions @ref LL_USART_SetClockPhase().
+                                           USART HW configuration can be modified afterwards using unitary
+                                           functions @ref LL_USART_SetClockPhase().
                                            For more details, refer to description of this function. */
 
   uint32_t LastBitClockPulse;         /*!< Specifies whether the clock pulse corresponding to the last transmitted
                                            data bit (MSB) has to be output on the SCLK pin in synchronous mode.
                                            This parameter can be a value of @ref USART_LL_EC_LASTCLKPULSE.
 
-                                           USART HW configuration can be modified afterwards using unitary functions @ref LL_USART_SetLastClkPulseOutput().
+                                           USART HW configuration can be modified afterwards using unitary
+                                           functions @ref LL_USART_SetLastClkPulseOutput().
                                            For more details, refer to description of this function. */
 
 } LL_USART_ClockInitTypeDef;
@@ -699,7 +710,7 @@ __STATIC_INLINE uint32_t LL_USART_IsEnabledFIFO(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_SetTXFIFOThreshold(USART_TypeDef *USARTx, uint32_t Threshold)
 {
-  MODIFY_REG(USARTx->CR3, USART_CR3_TXFTCFG, Threshold << USART_CR3_TXFTCFG_Pos);
+  ATOMIC_MODIFY_REG(USARTx->CR3, USART_CR3_TXFTCFG, Threshold << USART_CR3_TXFTCFG_Pos);
 }
 
 /**
@@ -738,7 +749,7 @@ __STATIC_INLINE uint32_t LL_USART_GetTXFIFOThreshold(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_SetRXFIFOThreshold(USART_TypeDef *USARTx, uint32_t Threshold)
 {
-  MODIFY_REG(USARTx->CR3, USART_CR3_RXFTCFG, Threshold << USART_CR3_RXFTCFG_Pos);
+  ATOMIC_MODIFY_REG(USARTx->CR3, USART_CR3_RXFTCFG, Threshold << USART_CR3_RXFTCFG_Pos);
 }
 
 /**
@@ -785,7 +796,8 @@ __STATIC_INLINE uint32_t LL_USART_GetRXFIFOThreshold(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_ConfigFIFOsThreshold(USART_TypeDef *USARTx, uint32_t TXThreshold, uint32_t RXThreshold)
 {
-  MODIFY_REG(USARTx->CR3, USART_CR3_TXFTCFG | USART_CR3_RXFTCFG, (TXThreshold << USART_CR3_TXFTCFG_Pos) | (RXThreshold << USART_CR3_RXFTCFG_Pos));
+  ATOMIC_MODIFY_REG(USARTx->CR3, USART_CR3_TXFTCFG | USART_CR3_RXFTCFG, 
+                    (TXThreshold << USART_CR3_TXFTCFG_Pos) | (RXThreshold << USART_CR3_RXFTCFG_Pos));
 }
 
 /**
@@ -800,7 +812,7 @@ __STATIC_INLINE void LL_USART_ConfigFIFOsThreshold(USART_TypeDef *USARTx, uint32
   */
 __STATIC_INLINE void LL_USART_EnableInStopMode(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_UESM);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_UESM);
 }
 
 /**
@@ -814,7 +826,7 @@ __STATIC_INLINE void LL_USART_EnableInStopMode(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableInStopMode(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_UESM);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_UESM);
 }
 
 /**
@@ -838,7 +850,7 @@ __STATIC_INLINE uint32_t LL_USART_IsEnabledInStopMode(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableDirectionRx(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_RE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_RE);
 }
 
 /**
@@ -849,7 +861,7 @@ __STATIC_INLINE void LL_USART_EnableDirectionRx(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableDirectionRx(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_RE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_RE);
 }
 
 /**
@@ -860,7 +872,7 @@ __STATIC_INLINE void LL_USART_DisableDirectionRx(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableDirectionTx(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_TE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_TE);
 }
 
 /**
@@ -871,7 +883,7 @@ __STATIC_INLINE void LL_USART_EnableDirectionTx(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableDirectionTx(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_TE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_TE);
 }
 
 /**
@@ -889,7 +901,7 @@ __STATIC_INLINE void LL_USART_DisableDirectionTx(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_SetTransferDirection(USART_TypeDef *USARTx, uint32_t TransferDirection)
 {
-  MODIFY_REG(USARTx->CR1, USART_CR1_RE | USART_CR1_TE, TransferDirection);
+  ATOMIC_MODIFY_REG(USARTx->CR1, USART_CR1_RE | USART_CR1_TE, TransferDirection);
 }
 
 /**
@@ -1008,7 +1020,7 @@ __STATIC_INLINE uint32_t LL_USART_GetDataWidth(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableMuteMode(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_MME);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_MME);
 }
 
 /**
@@ -1019,7 +1031,7 @@ __STATIC_INLINE void LL_USART_EnableMuteMode(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableMuteMode(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_MME);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_MME);
 }
 
 /**
@@ -1870,6 +1882,10 @@ __STATIC_INLINE void LL_USART_SetBaudRate(USART_TypeDef *USARTx, uint32_t Periph
   {
     /* Do not overstep the size of USART_PRESCALER_TAB */
   }
+  else if (BaudRate == 0U)
+  {
+    /* Can Not divide per 0 */
+  }
   else if (OverSampling == LL_USART_OVERSAMPLING_8)
   {
     usartdiv = (uint16_t)(__LL_USART_DIV_SAMPLING8(PeriphClk, (uint8_t)PrescalerValue, BaudRate));
@@ -3434,7 +3450,7 @@ __STATIC_INLINE void LL_USART_ClearFlag_WKUP(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_IDLE(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_IDLEIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_IDLEIE);
 }
 
 /* Legacy define */
@@ -3450,7 +3466,7 @@ __STATIC_INLINE void LL_USART_EnableIT_IDLE(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_RXNE_RXFNE(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_RXNEIE_RXFNEIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_RXNEIE_RXFNEIE);
 }
 
 /**
@@ -3461,7 +3477,7 @@ __STATIC_INLINE void LL_USART_EnableIT_RXNE_RXFNE(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_TC(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_TCIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_TCIE);
 }
 
 /* Legacy define */
@@ -3477,7 +3493,7 @@ __STATIC_INLINE void LL_USART_EnableIT_TC(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_TXE_TXFNF(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_TXEIE_TXFNFIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_TXEIE_TXFNFIE);
 }
 
 /**
@@ -3488,7 +3504,7 @@ __STATIC_INLINE void LL_USART_EnableIT_TXE_TXFNF(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_PE(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_PEIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_PEIE);
 }
 
 /**
@@ -3499,7 +3515,7 @@ __STATIC_INLINE void LL_USART_EnableIT_PE(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_CM(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_CMIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_CMIE);
 }
 
 /**
@@ -3510,7 +3526,7 @@ __STATIC_INLINE void LL_USART_EnableIT_CM(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_RTO(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_RTOIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_RTOIE);
 }
 
 /**
@@ -3523,7 +3539,7 @@ __STATIC_INLINE void LL_USART_EnableIT_RTO(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_EOB(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_EOBIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_EOBIE);
 }
 
 /**
@@ -3536,7 +3552,7 @@ __STATIC_INLINE void LL_USART_EnableIT_EOB(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_TXFE(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_TXFEIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_TXFEIE);
 }
 
 /**
@@ -3547,7 +3563,7 @@ __STATIC_INLINE void LL_USART_EnableIT_TXFE(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_RXFF(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR1, USART_CR1_RXFFIE);
+  ATOMIC_SET_BIT(USARTx->CR1, USART_CR1_RXFFIE);
 }
 
 /**
@@ -3575,7 +3591,7 @@ __STATIC_INLINE void LL_USART_EnableIT_LBD(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_ERROR(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR3, USART_CR3_EIE);
+  ATOMIC_SET_BIT(USARTx->CR3, USART_CR3_EIE);
 }
 
 /**
@@ -3588,7 +3604,7 @@ __STATIC_INLINE void LL_USART_EnableIT_ERROR(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_CTS(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR3, USART_CR3_CTSIE);
+  ATOMIC_SET_BIT(USARTx->CR3, USART_CR3_CTSIE);
 }
 
 /**
@@ -3601,7 +3617,7 @@ __STATIC_INLINE void LL_USART_EnableIT_CTS(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_WKUP(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR3, USART_CR3_WUFIE);
+  ATOMIC_SET_BIT(USARTx->CR3, USART_CR3_WUFIE);
 }
 
 /**
@@ -3614,7 +3630,7 @@ __STATIC_INLINE void LL_USART_EnableIT_WKUP(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_TXFT(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR3, USART_CR3_TXFTIE);
+  ATOMIC_SET_BIT(USARTx->CR3, USART_CR3_TXFTIE);
 }
 
 /**
@@ -3627,7 +3643,7 @@ __STATIC_INLINE void LL_USART_EnableIT_TXFT(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_TCBGT(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR3, USART_CR3_TCBGTIE);
+  ATOMIC_SET_BIT(USARTx->CR3, USART_CR3_TCBGTIE);
 }
 
 /**
@@ -3640,7 +3656,7 @@ __STATIC_INLINE void LL_USART_EnableIT_TCBGT(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableIT_RXFT(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR3, USART_CR3_RXFTIE);
+  ATOMIC_SET_BIT(USARTx->CR3, USART_CR3_RXFTIE);
 }
 
 /**
@@ -3651,7 +3667,7 @@ __STATIC_INLINE void LL_USART_EnableIT_RXFT(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_IDLE(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_IDLEIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_IDLEIE);
 }
 
 /* Legacy define */
@@ -3667,7 +3683,7 @@ __STATIC_INLINE void LL_USART_DisableIT_IDLE(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_RXNE_RXFNE(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_RXNEIE_RXFNEIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_RXNEIE_RXFNEIE);
 }
 
 /**
@@ -3678,7 +3694,7 @@ __STATIC_INLINE void LL_USART_DisableIT_RXNE_RXFNE(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_TC(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_TCIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_TCIE);
 }
 
 /* Legacy define */
@@ -3694,7 +3710,7 @@ __STATIC_INLINE void LL_USART_DisableIT_TC(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_TXE_TXFNF(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_TXEIE_TXFNFIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_TXEIE_TXFNFIE);
 }
 
 /**
@@ -3705,7 +3721,7 @@ __STATIC_INLINE void LL_USART_DisableIT_TXE_TXFNF(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_PE(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_PEIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_PEIE);
 }
 
 /**
@@ -3716,7 +3732,7 @@ __STATIC_INLINE void LL_USART_DisableIT_PE(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_CM(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_CMIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_CMIE);
 }
 
 /**
@@ -3727,7 +3743,7 @@ __STATIC_INLINE void LL_USART_DisableIT_CM(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_RTO(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_RTOIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_RTOIE);
 }
 
 /**
@@ -3740,7 +3756,7 @@ __STATIC_INLINE void LL_USART_DisableIT_RTO(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_EOB(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_EOBIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_EOBIE);
 }
 
 /**
@@ -3753,7 +3769,7 @@ __STATIC_INLINE void LL_USART_DisableIT_EOB(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_TXFE(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_TXFEIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_TXFEIE);
 }
 
 /**
@@ -3766,7 +3782,7 @@ __STATIC_INLINE void LL_USART_DisableIT_TXFE(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_RXFF(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR1, USART_CR1_RXFFIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR1, USART_CR1_RXFFIE);
 }
 
 /**
@@ -3794,7 +3810,7 @@ __STATIC_INLINE void LL_USART_DisableIT_LBD(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_ERROR(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR3, USART_CR3_EIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR3, USART_CR3_EIE);
 }
 
 /**
@@ -3807,7 +3823,7 @@ __STATIC_INLINE void LL_USART_DisableIT_ERROR(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_CTS(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR3, USART_CR3_CTSIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR3, USART_CR3_CTSIE);
 }
 
 /**
@@ -3820,7 +3836,7 @@ __STATIC_INLINE void LL_USART_DisableIT_CTS(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_WKUP(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR3, USART_CR3_WUFIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR3, USART_CR3_WUFIE);
 }
 
 /**
@@ -3833,7 +3849,7 @@ __STATIC_INLINE void LL_USART_DisableIT_WKUP(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_TXFT(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR3, USART_CR3_TXFTIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR3, USART_CR3_TXFTIE);
 }
 
 /**
@@ -3846,7 +3862,7 @@ __STATIC_INLINE void LL_USART_DisableIT_TXFT(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_TCBGT(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR3, USART_CR3_TCBGTIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR3, USART_CR3_TCBGTIE);
 }
 
 /**
@@ -3859,7 +3875,7 @@ __STATIC_INLINE void LL_USART_DisableIT_TCBGT(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableIT_RXFT(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR3, USART_CR3_RXFTIE);
+  ATOMIC_CLEAR_BIT(USARTx->CR3, USART_CR3_RXFTIE);
 }
 
 /**
@@ -4093,7 +4109,7 @@ __STATIC_INLINE uint32_t LL_USART_IsEnabledIT_RXFT(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableDMAReq_RX(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR3, USART_CR3_DMAR);
+  ATOMIC_SET_BIT(USARTx->CR3, USART_CR3_DMAR);
 }
 
 /**
@@ -4104,7 +4120,7 @@ __STATIC_INLINE void LL_USART_EnableDMAReq_RX(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableDMAReq_RX(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR3, USART_CR3_DMAR);
+  ATOMIC_CLEAR_BIT(USARTx->CR3, USART_CR3_DMAR);
 }
 
 /**
@@ -4126,7 +4142,7 @@ __STATIC_INLINE uint32_t LL_USART_IsEnabledDMAReq_RX(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_EnableDMAReq_TX(USART_TypeDef *USARTx)
 {
-  SET_BIT(USARTx->CR3, USART_CR3_DMAT);
+  ATOMIC_SET_BIT(USARTx->CR3, USART_CR3_DMAT);
 }
 
 /**
@@ -4137,7 +4153,7 @@ __STATIC_INLINE void LL_USART_EnableDMAReq_TX(USART_TypeDef *USARTx)
   */
 __STATIC_INLINE void LL_USART_DisableDMAReq_TX(USART_TypeDef *USARTx)
 {
-  CLEAR_BIT(USARTx->CR3, USART_CR3_DMAT);
+  ATOMIC_CLEAR_BIT(USARTx->CR3, USART_CR3_DMAT);
 }
 
 /**
diff --git a/Drivers/STM32WLxx_HAL_Driver/LICENSE.md b/Drivers/STM32WLxx_HAL_Driver/LICENSE.md
new file mode 100644
index 00000000..f7dcd563
--- /dev/null
+++ b/Drivers/STM32WLxx_HAL_Driver/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright 2020 STMicroelectronics.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Drivers/STM32WLxx_HAL_Driver/License.md b/Drivers/STM32WLxx_HAL_Driver/License.md
deleted file mode 100644
index c6b7c8bd..00000000
--- a/Drivers/STM32WLxx_HAL_Driver/License.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2020 STMicroelectronics
-
-This software component is licensed by STMicroelectronics under the **BSD-3-Clause** license. You may not use this software except in compliance with this license. You may obtain a copy of the license [here](https://opensource.org/licenses/BSD-3-Clause).
\ No newline at end of file
diff --git a/Drivers/STM32WLxx_HAL_Driver/README.md b/Drivers/STM32WLxx_HAL_Driver/README.md
index 595b3cde..ec3ad744 100644
--- a/Drivers/STM32WLxx_HAL_Driver/README.md
+++ b/Drivers/STM32WLxx_HAL_Driver/README.md
@@ -1,19 +1,21 @@
 # STM32CubeWL HAL Driver MCU Component
 
+![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/stm32wlxx_hal_driver.svg?color=brightgreen)
+
 ## Overview
 
-**STM32Cube** is an STMicroelectronics original initiative to ease the developers life by reducing efforts, time and cost.
+**STM32Cube** is an STMicroelectronics original initiative to ease developers' life by reducing efforts, time and cost.
 
-**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform, delivered for each STM32 series.
-   * The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product
-   * The STM32 HAL-LL drivers : an abstraction drivers layer, the API ensuring maximized portability across the STM32 portfolio
-   * The BSP Drivers of each evaluation or demonstration board provided by this STM32 series
-   * A consistent set of middlewares components such as RTOS, FatFS, LoRaWAN , Sigfox ...
-   * A full set of software projects (basic examples, applications or demonstrations) for each board provided by this STM32 series
+**STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform delivered for each STM32 series.
+   * The CMSIS modules (core and device) corresponding to the ARM(tm) core implemented in this STM32 product.
+   * The STM32 HAL-LL drivers, an abstraction layer offering a set of APIs ensuring maximized portability across the STM32 portfolio.
+   * The BSP drivers of each evaluation, demonstration or nucleo board provided for this STM32 series.
+   * A consistent set of middleware libraries such as RTOS, USB, FatFS, graphics, touch sensing library...
+   * A full set of software projects (basic examples, applications, and demonstrations) for each board provided for this STM32 series.
 
 Two models of publication are proposed for the STM32Cube embedded software:
-   * The monolithic **MCU Package** : all STM32Cube software modules of one STM32 series are present (Drivers, Middlewares, Projects, Utilities) in the repo (usual name **STM32Cubexx**, xx corresponding to the STM32 series)
-   * The **MCU component** : progressively from November 2019, each STM32Cube software module being part of the STM32Cube MCU Package, are delivered as an individual repo, allowing the user to select and get only the required software functions.
+   * The monolithic **MCU Package**: all STM32Cube software modules of one STM32 series are present (Drivers, Middleware, Projects, Utilities) in the repository (usual name **STM32Cubexx**, xx corresponding to the STM32 series).
+   * The **MCU component**: each STM32Cube software module being part of the STM32Cube MCU Package, is delivered as an individual repository, allowing the user to select and get only the required software functions.
 
 ## Description
 
@@ -40,12 +42,13 @@ It is **crucial** that you use a consistent set of versions for the CMSIS Core -
 HAL Driver WL | CMSIS Device WL | CMSIS Core | Was delivered in the full MCU package
 ------------- | --------------- | ---------- | -------------------------------------
 Tag v1.0.0 | Tag v1.0.0 | Tag V5.6.0_cm4 | Tag v1.0.0 (and following, if any, till next tag)
+Tag v1.1.0 | Tag v1.1.0 | Tag V5.6.0_cm4 | Tag v1.1.0 (and following, if any, till next tag)
 
 
 The full **STM32CubeWL** MCU package is available [here](https://github.com/STMicroelectronics/STM32CubeWL).
 
 ## Troubleshooting
 
-If you have any issue with the **Software content** of this repo, you can [file an issue on Github](https://github.com/STMicroelectronics/stm32wlxx_hal_driver/issues/new/choose).
+If you have any issue with the **Software content** of this repository, you can file an issue [here](https://github.com/STMicroelectronics/stm32wlxx_hal_driver/issues/new/choose).
 
-For any other question related to the product, the tools, the environment, you can submit a topic on the [ST Community/STM32 MCUs forum](https://community.st.com/s/group/0F90X000000AXsASAW/stm32-mcus).
\ No newline at end of file
+For any other question related to the product, the tools, the environment, you can submit a topic on the [ST Community/STM32 MCUs forum](https://community.st.com/s/topic/0TO0X000000BSqSWAW/stm32-mcus).
diff --git a/Drivers/STM32WLxx_HAL_Driver/Release_Notes.html b/Drivers/STM32WLxx_HAL_Driver/Release_Notes.html
index 1ad577fd..1c473402 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Release_Notes.html
+++ b/Drivers/STM32WLxx_HAL_Driver/Release_Notes.html
@@ -21,7 +21,8 @@
 <div class="row">
 <div class="col-sm-12 col-lg-4">
 <center>
-<h1 id="release-notes-forstm32wlxx-hal-drivers"><small>Release Notes for</small><mark>STM32WLxx HAL Drivers</mark></h1>
+<h1 id="release-notes-for">Release Notes for</h1>
+<h1 id="stm32wlxx-hal-drivers"><mark>STM32WLxx HAL Drivers</mark></h1>
 <p>Copyright © 2020 STMicroelectronics</p>
 <a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
@@ -42,19 +43,184 @@ <h1 id="purpose">Purpose</h1>
 <div class="col-sm-12 col-lg-8">
 <h1 id="update-history">Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section1" checked aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<input type="checkbox" id="collapse-section2" checked aria-hidden="true"> <label for="collapse-section2" aria-hidden="true"><strong>V1.1.0 / 16-June-2021</strong></label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
-<p><strong>First Official Release</strong></p>
+<ul>
+<li>Maintenance release of <strong>HAL and Low Layer</strong> drivers to include latest corrections</li>
+<li>Update of HAL SMBUS driver to introduce fast mode and fast mode plus
+<ul>
+<li>Add extension files stm32wlxx_hal_smbus_ex.h/.c for new APIs:
+<ul>
+<li><em>HAL_SMBUSEx_EnableFastModePlus()</em></li>
+<li><em>HAL_SMBUSEx_DisableFastModePlus()</em></li>
+</ul></li>
+</ul></li>
+</ul>
 <h2 id="contents">Contents</h2>
-<p>First official release of LL / HAL Drivers for STM32WLxx series.</p>
+<h3 id="hal-drivers-updates"><strong>HAL Drivers</strong> updates</h3>
+<ul>
+<li><strong>HAL ADC</strong> driver
+<ul>
+<li>Update CFGR2 oversampling bitfields conditionally to oversampling enable</li>
+<li>Update timeout mechanism to avoid false timeout detection in case of preemption</li>
+<li>Update wait_loop_index computation so delay in us is always multiplicated by at least value “1”</li>
+</ul></li>
+<li><strong>HAL COMP</strong> driver
+<ul>
+<li>Update wait_loop_index computation so delay in us is always multiplicated by at least value “1”</li>
+</ul></li>
+<li><strong>HAL CORTEX</strong> driver
+<ul>
+<li>Disable the smallest MPU region sizes (32B, 64B, 128B) in the M0+ context</li>
+</ul></li>
+<li><strong>HAL CRYP</strong> driver
+<ul>
+<li>Update HAL_CRYP_SetConfig() and HAL_CRYP_GetConfig() APIs to set/get the continent of KeyIVConfigSkip correctly</li>
+<li>Resolve interrupt mode related GCM decryption issue causing wrong computation of decryption size</li>
+<li>Update HAL_CRYP_InCpltCallback() API to fix an incorrect condition call at resumption time</li>
+<li>Update CRYP_AESCCM_Process_IT() to fix incorrect CCM header length management when data are fed to the peripheral under interrupt</li>
+</ul></li>
+<li><strong>HAL EXTI</strong> driver
+<ul>
+<li>Update HAL_EXTI_GetConfigLine() to set default configuration value of Trigger and GPIOSel before checking each corresponding register</li>
+</ul></li>
+<li><strong>HAL GPIO</strong> driver
+<ul>
+<li>Update HAL_GPIO_Init() API to avoid the configuration of PUPDR register when Analog mode is selected</li>
+</ul></li>
+<li><strong>HAL HSEM</strong> driver
+<ul>
+<li>Update SemID comment related to the number of semaphores</li>
+</ul></li>
+<li><strong>HAL I2C</strong> driver
+<ul>
+<li>Updated I2C_IsAcknowledgeFailed() to avoid keeping I2C in busy state if NACK is received after transmitting register address</li>
+</ul></li>
+<li><strong>HAL IRDA</strong> driver
+<ul>
+<li>Fixed typos in the IRDA State definition description</li>
+</ul></li>
+<li><strong>HAL IWDG</strong> driver
+<ul>
+<li>Updated HAL_IWDG_Init() API in order to fix HAL_GetTick() timeout vulnerability issue</li>
+</ul></li>
+<li><strong>HAL LPTIM</strong> driver
+<ul>
+<li>Update HAL_LPTIM_Init() API implementation to configure digital filter for external clock when LPTIM is clocked by an internal clock source</li>
+</ul></li>
+<li><strong>HAL PWR</strong> driver
+<ul>
+<li>Correct HAL_PWREx_DisableInternalWakeUpLine() to update CM0+ register</li>
+</ul></li>
+<li><strong>HAL RCC</strong> driver
+<ul>
+<li>Update definition of IS_RCC_OSCILLATORTYPE() macro</li>
+<li>Update IS_RCC_PERIPHCLOCK() macro definition depending on targeted derivative</li>
+<li>Add new API HAL_RCC_GetResetSource() to get all reset sources and clear flags for next reset</li>
+</ul></li>
+<li><strong>HAL RNG</strong> driver
+<ul>
+<li>Update timeout mechanism to avoid false timeout detection in case of preemption</li>
+</ul></li>
+<li><strong>HAL RTC</strong> driver
+<ul>
+<li>Update HAL_RTC_DeactivateAlarm() to fix issue where Alarm Autoclear remained activated after deactivating alarm</li>
+<li>Update HAL_RTCEx_SetTimeStamp_IT() to avoid the call of TimeStamp callback during the setting of the TimeStamp</li>
+<li>Update assertions in HAL_RTC_SetAlarm() and HAL_RTC_SetAlarm_IT() to allow user to unset some Alarm parameters when AlarmMask is set</li>
+<li>Update HAL_RTC_DeactivateAlarm() to clear Alarm Flag</li>
+<li>Update HAL_RTCEx_DeactivateTimeStamp() to clear TimeStamp flag</li>
+<li>Update HAL_RTCEx_DeactivateInternalTimeStamp() to clear Internal TimeStamp flag
+<ul>
+<li>The flag is cleared only if TSOVF &amp; TSE are set to 0</li>
+</ul></li>
+<li>Update HAL_RTCEx_DeactivateWakeUpTimer() to clear WakeUpTimer flag</li>
+<li>Update HAL_RTCEx_DeactivateSSRU() to clear SSR Underflow flag</li>
+<li>Update HAL_RTC_WaitForSynchro() to fix issue to clear RSF flag</li>
+</ul></li>
+<li><strong>HAL SMARTCARD</strong> driver
+<ul>
+<li>Fixed typos in the SMARTCARD State definition description</li>
+</ul></li>
+<li><strong>HAL SMBUS</strong> driver
+<ul>
+<li>Add support for Fast Mode Plus to be SMBUS Rev3 compliant:
+<ul>
+<li>Add HAL_SMBUSEx_EnableFastModePlus() and HAL_SMBUSEx_DisableFastModePlus() APIs to manage Fm+</li>
+</ul></li>
+</ul></li>
+<li><strong>HAL SPI</strong> driver
+<ul>
+<li>Update in SPI_WaitFifoStateUntilTimeout() to fix code optimization issue</li>
+<li>Update to fix MISRA-C 2012 Rule-13.2 issue</li>
+</ul></li>
+<li><strong>HAL SUBGHZ</strong> driver
+<ul>
+<li>Update HAL_Delay() by a polling loop to avoid blocking situation in case of Systick is mapped on Tick</li>
+<li>Update HAL_SUBGHZ_DeInit() to check RF Busy bit and deassert the reset signal on RF side</li>
+</ul></li>
+<li><strong>HAL TIM</strong> driver
+<ul>
+<li>Update HAL_TIMEx_OnePulseN_Start and HAL_TIMEx_OnePulseN_Stop (pooling and IT mode) to take into consideration all OutputChannel parameters</li>
+<li>Correct CodeSpell typos in HAL TIM drivers</li>
+<li>Update timeout mechanism to avoid false timeout detection in case of preemption</li>
+<li>Update input capture measurement in DMA mode to avoid zero return values at high frequencies</li>
+</ul></li>
+<li><strong>HAL UART</strong> driver
+<ul>
+<li>Remove an invalid FIFO mode configuration from UART_SetConfig() as it is not is not member of UART_InitTypeDef Structure</li>
+<li>Update HAL_UART_IRQHandler() API to handle receiver timeout interrupt
+<ul>
+<li>Update UART receive processes (IT and DMA) to handle the UART receive’s timeout interrupt</li>
+</ul></li>
+<li>Update arrays definition to be declared as static const</li>
+<li>Fix erroneous UART’s handle state in case of error returned after DMA reception start within UART_Start_Receive_DMA()</li>
+<li>Update UART ReceptionType management in case of ReceptionToIdle API are called from RxEvent callback</li>
+<li>Handling of UART concurrent register access in case of race condition between Tx and Rx transfers (HAL UART and LL LPUART)</li>
+</ul></li>
+</ul>
+<p><br />
+</p>
+<h3 id="ll-drivers-updates"><strong>LL Drivers</strong> updates</h3>
+<ul>
+<li><strong>LL RCC</strong> driver
+<ul>
+<li>Private functions made static</li>
+</ul></li>
+<li><strong>LL RTC</strong> driver
+<ul>
+<li>Fix wrong reference of RTC instance in LL_RTC_TIME_Init() and LL_RTC_DATE_Init() functions</li>
+</ul></li>
+<li><strong>LL SPI</strong> driver
+<ul>
+<li>Updated to set the FRXTH bit for 8bit data in LL_SPI_Init() API</li>
+<li>Update LL_SPI_TransmitData8() to avoid casting the result to 8 bits</li>
+</ul></li>
+<li><strong>LL TIM</strong> driver
+<ul>
+<li>Updated LL_TIM_GetCounterMode() API to return the correct counter mode</li>
+<li>Update reversed description of TIM_LL_EC_ONEPULSEMODE One Pulse Mode</li>
+</ul></li>
+<li><strong>LL LPUART</strong> driver
+<ul>
+<li>Handling of UART concurrent register access in case of race condition between Tx and Rx transfers (HAL UART and LL LPUART)</li>
+</ul></li>
+<li><strong>LL USART</strong> driver
+<ul>
+<li>Handling of UART concurrent register access in case of race condition between Tx and Rx transfers (HAL UART and LL LPUART)</li>
+<li>LL_USART_ClockInit now supports clock phase and clock polarity configuration for SPI_Slave mode</li>
+<li>Remove useless check on maximum BRR value by removing IS_LL_USART_BRR_MAX() macro</li>
+</ul></li>
+</ul>
+<p><br />
+</p>
 <h2 id="known-limitations">Known Limitations</h2>
 <p>None</p>
 <h2 id="development-toolchains-and-compilers">Development Toolchains and Compilers</h2>
 <ul>
 <li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.30.1</li>
-<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.28</li>
-<li>STM32CubeIDE 1.5.0</li>
+<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.31</li>
+<li>STM32CubeIDE 1.7.0</li>
 </ul>
 <h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
 <p>Supported Devices:</p>
@@ -72,6 +238,37 @@ <h2 id="dependencies">Dependencies</h2>
 </p>
 </div>
 </div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<p><strong>First Official Release</strong></p>
+<h2 id="contents-1">Contents</h2>
+<p>First official release of LL / HAL Drivers for STM32WLxx series.</p>
+<h2 id="known-limitations-1">Known Limitations</h2>
+<p>None</p>
+<h2 id="development-toolchains-and-compilers-1">Development Toolchains and Compilers</h2>
+<ul>
+<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.30.1</li>
+<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.28</li>
+<li>STM32CubeIDE 1.5.0</li>
+</ul>
+<h2 id="supported-devices-and-boards-1">Supported Devices and boards</h2>
+<p>Supported Devices:</p>
+<ul>
+<li>STM32WL55xx</li>
+<li>STM32WL54xx</li>
+<li>STM32WLE5xx</li>
+<li>STM32WLE4xx</li>
+</ul>
+<h2 id="backward-compatibility-1">Backward Compatibility</h2>
+<p>Not applicable</p>
+<h2 id="dependencies-1">Dependencies</h2>
+<p>None</p>
+<p><br />
+</p>
+</div>
+</div>
 </div>
 </div>
 <footer class="sticky">
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c
index d6562971..45d49c61 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c
@@ -56,7 +56,7 @@
  * @brief STM32WLxx HAL Driver version number
    */
 #define __STM32WLxx_HAL_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __STM32WLxx_HAL_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __STM32WLxx_HAL_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __STM32WLxx_HAL_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __STM32WLxx_HAL_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 #define __STM32WLxx_HAL_VERSION         ((__STM32WLxx_HAL_VERSION_MAIN << 24U)\
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c
index f56cb361..b3eb314a 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c
@@ -211,11 +211,11 @@
 
      The compilation flag USE_HAL_ADC_REGISTER_CALLBACKS, when set to 1,
      allows the user to configure dynamically the driver callbacks.
-     Use Functions @ref HAL_ADC_RegisterCallback()
+     Use Functions HAL_ADC_RegisterCallback()
      to register an interrupt callback.
     [..]
 
-     Function @ref HAL_ADC_RegisterCallback() allows to register following callbacks:
+     Function HAL_ADC_RegisterCallback() allows to register following callbacks:
        (+) ConvCpltCallback               : ADC conversion complete callback
        (+) ConvHalfCpltCallback           : ADC conversion DMA half-transfer callback
        (+) LevelOutOfWindowCallback       : ADC analog watchdog 1 callback
@@ -229,11 +229,11 @@
      and a pointer to the user callback function.
     [..]
 
-     Use function @ref HAL_ADC_UnRegisterCallback to reset a callback to the default
+     Use function HAL_ADC_UnRegisterCallback to reset a callback to the default
      weak function.
     [..]
 
-     @ref HAL_ADC_UnRegisterCallback takes as parameters the HAL peripheral handle,
+     HAL_ADC_UnRegisterCallback takes as parameters the HAL peripheral handle,
      and the Callback ID.
      This function allows to reset following callbacks:
        (+) ConvCpltCallback               : ADC conversion complete callback
@@ -247,27 +247,27 @@
        (+) MspDeInitCallback              : ADC Msp DeInit callback
      [..]
 
-     By default, after the @ref HAL_ADC_Init() and when the state is @ref HAL_ADC_STATE_RESET
+     By default, after the HAL_ADC_Init() and when the state is HAL_ADC_STATE_RESET
      all callbacks are set to the corresponding weak functions:
-     examples @ref HAL_ADC_ConvCpltCallback(), @ref HAL_ADC_ErrorCallback().
+     examples HAL_ADC_ConvCpltCallback(), HAL_ADC_ErrorCallback().
      Exception done for MspInit and MspDeInit functions that are
-     reset to the legacy weak functions in the @ref HAL_ADC_Init()/ @ref HAL_ADC_DeInit() only when
+     reset to the legacy weak functions in the HAL_ADC_Init()/HAL_ADC_DeInit() only when
      these callbacks are null (not registered beforehand).
     [..]
 
-     If MspInit or MspDeInit are not null, the @ref HAL_ADC_Init()/ @ref HAL_ADC_DeInit()
+     If MspInit or MspDeInit are not null, the HAL_ADC_Init()/HAL_ADC_DeInit()
      keep and use the user MspInit/MspDeInit callbacks (registered beforehand) whatever the state.
      [..]
 
-     Callbacks can be registered/unregistered in @ref HAL_ADC_STATE_READY state only.
+     Callbacks can be registered/unregistered in HAL_ADC_STATE_READY state only.
      Exception done MspInit/MspDeInit functions that can be registered/unregistered
-     in @ref HAL_ADC_STATE_READY or @ref HAL_ADC_STATE_RESET state,
+     in HAL_ADC_STATE_READY or HAL_ADC_STATE_RESET state,
      thus registered (user) MspInit/DeInit callbacks can be used during the Init/DeInit.
     [..]
 
      Then, the user first registers the MspInit/MspDeInit user callbacks
-     using @ref HAL_ADC_RegisterCallback() before calling @ref HAL_ADC_DeInit()
-     or @ref HAL_ADC_Init() function.
+     using HAL_ADC_RegisterCallback() before calling HAL_ADC_DeInit()
+     or HAL_ADC_Init() function.
      [..]
 
      When the compilation flag USE_HAL_ADC_REGISTER_CALLBACKS is set to 0 or
@@ -416,7 +416,12 @@ HAL_StatusTypeDef HAL_ADC_Init(ADC_HandleTypeDef *hadc)
   assert_param(IS_ADC_SAMPLE_TIME(hadc->Init.SamplingTimeCommon1));
   assert_param(IS_ADC_SAMPLE_TIME(hadc->Init.SamplingTimeCommon2));
   assert_param(IS_FUNCTIONAL_STATE(hadc->Init.OversamplingMode));
-
+  if (hadc->Init.OversamplingMode == ENABLE)
+  {
+    assert_param(IS_ADC_OVERSAMPLING_RATIO(hadc->Init.Oversampling.Ratio));
+    assert_param(IS_ADC_RIGHT_BIT_SHIFT(hadc->Init.Oversampling.RightBitShift));
+    assert_param(IS_ADC_TRIGGERED_OVERSAMPLING_MODE(hadc->Init.Oversampling.TriggeredMode));
+  }
   assert_param(IS_ADC_TRIGGER_FREQ(hadc->Init.TriggerFrequencyMode));
 
   if (hadc->Init.ScanConvMode != ADC_SCAN_DISABLE)
@@ -476,7 +481,7 @@ HAL_StatusTypeDef HAL_ADC_Init(ADC_HandleTypeDef *hadc)
     /* Note: Variable divided by 2 to compensate partially              */
     /*       CPU processing cycles, scaling in us split to not          */
     /*       exceed 32 bits register capacity and handle low frequency. */
-    wait_loop_index = ((LL_ADC_DELAY_INTERNAL_REGUL_STAB_US / 10UL) * (SystemCoreClock / (100000UL * 2UL)));
+    wait_loop_index = ((LL_ADC_DELAY_INTERNAL_REGUL_STAB_US / 10UL) * ((SystemCoreClock / (100000UL * 2UL)) + 1UL));
     while (wait_loop_index != 0UL)
     {
       wait_loop_index--;
@@ -531,7 +536,7 @@ HAL_StatusTypeDef HAL_ADC_Init(ADC_HandleTypeDef *hadc)
       /* function on the fly (update of a parameter of ADC_InitTypeDef        */
       /* without needing to reconfigure all other ADC groups/channels         */
       /* parameters):                                                         */
-      /*   - internal measurement paths: Vbat, temperature sensor, Vref       */
+      /*   - internal measurement paths (VrefInt, ...)                        */
       /*     (set into HAL_ADC_ConfigChannel() )                              */
 
       /* Configuration of ADC resolution                                      */
@@ -540,15 +545,17 @@ HAL_StatusTypeDef HAL_ADC_Init(ADC_HandleTypeDef *hadc)
                  hadc->Init.Resolution);
 
       tmpCFGR2 |= ((hadc->Init.ClockPrescaler & ADC_CFGR2_CKMODE) |
-                   hadc->Init.Oversampling.Ratio         |
-                   hadc->Init.Oversampling.RightBitShift |
-                   hadc->Init.Oversampling.TriggeredMode |
                    hadc->Init.TriggerFrequencyMode
                   );
 
       if (hadc->Init.OversamplingMode == ENABLE)
       {
-        SET_BIT(tmpCFGR2, ADC_CFGR2_OVSE);
+        tmpCFGR2 |= (ADC_CFGR2_OVSE |
+                     (hadc->Init.ClockPrescaler & ADC_CFGR2_CKMODE) |
+                     hadc->Init.Oversampling.Ratio         |
+                     hadc->Init.Oversampling.RightBitShift |
+                     hadc->Init.Oversampling.TriggeredMode
+                    );
       }
 
       MODIFY_REG(hadc->Instance->CFGR2,
@@ -748,7 +755,6 @@ HAL_StatusTypeDef HAL_ADC_Init(ADC_HandleTypeDef *hadc)
     tmp_hal_status = HAL_ERROR;
   }
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -764,9 +770,6 @@ HAL_StatusTypeDef HAL_ADC_Init(ADC_HandleTypeDef *hadc)
   *         bypassed without error reporting: it can be the intended behavior in
   *         case of reset of a single ADC while the other ADCs sharing the same
   *         common group is still running.
-  * @note   By default, HAL_ADC_DeInit() set ADC in mode deep power-down:
-  *         this saves more power by reducing leakage currents
-  *         and is particularly interesting before entering MCU low-power modes.
   * @param hadc ADC handle
   * @retval HAL status
   */
@@ -858,12 +861,10 @@ HAL_StatusTypeDef HAL_ADC_DeInit(ADC_HandleTypeDef *hadc)
   /* ========== Hard reset ADC peripheral ========== */
   /* Performs a global reset of the entire ADC peripheral: ADC state is     */
   /* forced to a similar state after device power-on.                       */
-  /* If needed, copy-paste and uncomment the following reset code into      */
-  /* function "void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)":            */
-  /*                                                                        */
-  /*  __HAL_RCC_ADC_FORCE_RESET()                                           */
-  /*  __HAL_RCC_ADC_RELEASE_RESET()                                         */
-
+  /* Note: A possible implementation is to add RCC bus reset of ADC         */
+  /* (for example, using macro                                              */
+  /*  __HAL_RCC_ADC..._FORCE_RESET()/..._RELEASE_RESET()/..._CLK_DISABLE()) */
+  /* in function "void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)":         */
 #if (USE_HAL_ADC_REGISTER_CALLBACKS == 1)
   if (hadc->MspDeInitCallback == NULL)
   {
@@ -886,10 +887,8 @@ HAL_StatusTypeDef HAL_ADC_DeInit(ADC_HandleTypeDef *hadc)
   /* Set ADC state */
   hadc->State = HAL_ADC_STATE_RESET;
 
-  /* Process unlocked */
   __HAL_UNLOCK(hadc);
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -1192,7 +1191,6 @@ HAL_StatusTypeDef HAL_ADC_Start(ADC_HandleTypeDef *hadc)
   /* Perform ADC enable and conversion start if no conversion is on going */
   if (LL_ADC_REG_IsConversionOngoing(hadc->Instance) == 0UL)
   {
-    /* Process locked */
     __HAL_LOCK(hadc);
 
     /* Enable the ADC peripheral */
@@ -1230,7 +1228,6 @@ HAL_StatusTypeDef HAL_ADC_Start(ADC_HandleTypeDef *hadc)
     }
     else
     {
-      /* Process unlocked */
       __HAL_UNLOCK(hadc);
     }
   }
@@ -1239,7 +1236,6 @@ HAL_StatusTypeDef HAL_ADC_Start(ADC_HandleTypeDef *hadc)
     tmp_hal_status = HAL_BUSY;
   }
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -1259,7 +1255,6 @@ HAL_StatusTypeDef HAL_ADC_Stop(ADC_HandleTypeDef *hadc)
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(hadc->Instance));
 
-  /* Process locked */
   __HAL_LOCK(hadc);
 
   /* 1. Stop potential conversion on going, on ADC group regular */
@@ -1281,10 +1276,8 @@ HAL_StatusTypeDef HAL_ADC_Stop(ADC_HandleTypeDef *hadc)
     }
   }
 
-  /* Process unlocked */
   __HAL_UNLOCK(hadc);
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -1309,7 +1302,7 @@ HAL_StatusTypeDef HAL_ADC_Stop(ADC_HandleTypeDef *hadc)
 HAL_StatusTypeDef HAL_ADC_PollForConversion(ADC_HandleTypeDef *hadc, uint32_t Timeout)
 {
   uint32_t tickstart;
-  uint32_t tmp_Flag_End;
+  uint32_t tmp_flag_end;
 
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(hadc->Instance));
@@ -1317,7 +1310,7 @@ HAL_StatusTypeDef HAL_ADC_PollForConversion(ADC_HandleTypeDef *hadc, uint32_t Ti
   /* If end of conversion selected to end of sequence conversions */
   if (hadc->Init.EOCSelection == ADC_EOC_SEQ_CONV)
   {
-    tmp_Flag_End = ADC_FLAG_EOS;
+    tmp_flag_end = ADC_FLAG_EOS;
   }
   /* If end of conversion selected to end of unitary conversion */
   else /* ADC_EOC_SINGLE_CONV */
@@ -1337,7 +1330,7 @@ HAL_StatusTypeDef HAL_ADC_PollForConversion(ADC_HandleTypeDef *hadc, uint32_t Ti
     }
     else
     {
-      tmp_Flag_End = (ADC_FLAG_EOC);
+      tmp_flag_end = (ADC_FLAG_EOC);
     }
   }
 
@@ -1345,20 +1338,23 @@ HAL_StatusTypeDef HAL_ADC_PollForConversion(ADC_HandleTypeDef *hadc, uint32_t Ti
   tickstart = HAL_GetTick();
 
   /* Wait until End of unitary conversion or sequence conversions flag is raised */
-  while ((hadc->Instance->ISR & tmp_Flag_End) == 0UL)
+  while ((hadc->Instance->ISR & tmp_flag_end) == 0UL)
   {
     /* Check if timeout is disabled (set to infinite wait) */
     if (Timeout != HAL_MAX_DELAY)
     {
       if (((HAL_GetTick() - tickstart) > Timeout) || (Timeout == 0UL))
       {
-        /* Update ADC state machine to timeout */
-        SET_BIT(hadc->State, HAL_ADC_STATE_TIMEOUT);
+        /* New check to avoid false timeout detection in case of preemption */
+        if ((hadc->Instance->ISR & tmp_flag_end) == 0UL)
+        {
+          /* Update ADC state machine to timeout */
+          SET_BIT(hadc->State, HAL_ADC_STATE_TIMEOUT);
 
-        /* Process unlocked */
-        __HAL_UNLOCK(hadc);
+          __HAL_UNLOCK(hadc);
 
-        return HAL_TIMEOUT;
+          return HAL_TIMEOUT;
+        }
       }
     }
   }
@@ -1452,13 +1448,16 @@ HAL_StatusTypeDef HAL_ADC_PollForEvent(ADC_HandleTypeDef *hadc, uint32_t EventTy
     {
       if (((HAL_GetTick() - tickstart) > Timeout) || (Timeout == 0UL))
       {
-        /* Update ADC state machine to timeout */
-        SET_BIT(hadc->State, HAL_ADC_STATE_TIMEOUT);
+        /* New check to avoid false timeout detection in case of preemption */
+        if (__HAL_ADC_GET_FLAG(hadc, EventType) == 0UL)
+        {
+          /* Update ADC state machine to timeout */
+          SET_BIT(hadc->State, HAL_ADC_STATE_TIMEOUT);
 
-        /* Process unlocked */
-        __HAL_UNLOCK(hadc);
+          __HAL_UNLOCK(hadc);
 
-        return HAL_TIMEOUT;
+          return HAL_TIMEOUT;
+        }
       }
     }
   }
@@ -1570,7 +1569,6 @@ HAL_StatusTypeDef HAL_ADC_Start_IT(ADC_HandleTypeDef *hadc)
   /* Perform ADC enable and conversion start if no conversion is on going */
   if (LL_ADC_REG_IsConversionOngoing(hadc->Instance) == 0UL)
   {
-    /* Process locked */
     __HAL_LOCK(hadc);
 
     /* Enable the ADC peripheral */
@@ -1633,7 +1631,6 @@ HAL_StatusTypeDef HAL_ADC_Start_IT(ADC_HandleTypeDef *hadc)
     }
     else
     {
-      /* Process unlocked */
       __HAL_UNLOCK(hadc);
     }
 
@@ -1643,7 +1640,6 @@ HAL_StatusTypeDef HAL_ADC_Start_IT(ADC_HandleTypeDef *hadc)
     tmp_hal_status = HAL_BUSY;
   }
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -1661,7 +1657,6 @@ HAL_StatusTypeDef HAL_ADC_Stop_IT(ADC_HandleTypeDef *hadc)
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(hadc->Instance));
 
-  /* Process locked */
   __HAL_LOCK(hadc);
 
   /* 1. Stop potential conversion on going, on ADC group regular */
@@ -1687,10 +1682,8 @@ HAL_StatusTypeDef HAL_ADC_Stop_IT(ADC_HandleTypeDef *hadc)
     }
   }
 
-  /* Process unlocked */
   __HAL_UNLOCK(hadc);
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -1714,7 +1707,6 @@ HAL_StatusTypeDef HAL_ADC_Start_DMA(ADC_HandleTypeDef *hadc, uint32_t *pData, ui
   /* Perform ADC enable and conversion start if no conversion is on going */
   if (LL_ADC_REG_IsConversionOngoing(hadc->Instance) == 0UL)
   {
-    /* Process locked */
     __HAL_LOCK(hadc);
 
     /* Specific case for first call occurrence of this function (DMA transfer */
@@ -1791,7 +1783,6 @@ HAL_StatusTypeDef HAL_ADC_Start_DMA(ADC_HandleTypeDef *hadc, uint32_t *pData, ui
     tmp_hal_status = HAL_BUSY;
   }
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -1809,7 +1800,6 @@ HAL_StatusTypeDef HAL_ADC_Stop_DMA(ADC_HandleTypeDef *hadc)
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(hadc->Instance));
 
-  /* Process locked */
   __HAL_LOCK(hadc);
 
   /* 1. Stop potential ADC group regular conversion on going */
@@ -1860,10 +1850,8 @@ HAL_StatusTypeDef HAL_ADC_Stop_DMA(ADC_HandleTypeDef *hadc)
     CLEAR_BIT(hadc->Instance->CFGR1, ADC_CFGR1_DMAEN);
   }
 
-  /* Process unlocked */
   __HAL_UNLOCK(hadc);
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -2100,7 +2088,7 @@ void HAL_ADC_IRQHandler(ADC_HandleTypeDef *hadc)
   /* ========== Check channel configuration ready flag ========== */
   if (((tmp_isr & ADC_FLAG_CCRDY) == ADC_FLAG_CCRDY) && ((tmp_ier & ADC_IT_CCRDY) == ADC_IT_CCRDY))
   {
-    /* Level out of window 1 callback */
+    /* Channel configuration ready callback */
     HAL_ADCEx_ChannelConfigReadyCallback(hadc);
 
     /* Clear ADC analog watchdog flag */
@@ -2208,10 +2196,10 @@ __weak void HAL_ADC_ErrorCallback(ADC_HandleTypeDef *hadc)
   *         The setting of these parameters is conditioned to ADC state:
   *         Refer to comments of structure "ADC_ChannelConfTypeDef".
   * @param hadc ADC handle
-  * @param sConfig Structure of ADC channel assigned to ADC group regular.
+  * @param pConfig Structure of ADC channel assigned to ADC group regular.
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConfTypeDef *sConfig)
+HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConfTypeDef *pConfig)
 {
   HAL_StatusTypeDef tmp_hal_status = HAL_OK;
   uint32_t tmp_config_internal_channel;
@@ -2219,22 +2207,21 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
 
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(hadc->Instance));
-  assert_param(IS_ADC_CHANNEL(sConfig->Channel));
-  assert_param(IS_ADC_SAMPLING_TIME_COMMON(sConfig->SamplingTime));
+  assert_param(IS_ADC_CHANNEL(pConfig->Channel));
+  assert_param(IS_ADC_SAMPLING_TIME_COMMON(pConfig->SamplingTime));
 
   if ((hadc->Init.ScanConvMode == ADC_SCAN_SEQ_FIXED)       ||
       (hadc->Init.ScanConvMode == ADC_SCAN_SEQ_FIXED_BACKWARD))
   {
-    assert_param(IS_ADC_REGULAR_RANK_SEQ_FIXED(sConfig->Rank));
+    assert_param(IS_ADC_REGULAR_RANK_SEQ_FIXED(pConfig->Rank));
   }
   else
   {
     assert_param(IS_ADC_REGULAR_NB_CONV(hadc->Init.NbrOfConversion));
 
-    assert_param(IS_ADC_REGULAR_RANK(sConfig->Rank));
+    assert_param(IS_ADC_REGULAR_RANK(pConfig->Rank));
   }
 
-  /* Process locked */
   __HAL_LOCK(hadc);
 
   /* Parameters update conditioned to ADC state:                              */
@@ -2252,7 +2239,7 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
     /* Otherwise (sequencer set to fully configurable or to to not fully      */
     /* configurable with channel rank to be set), configure the selected      */
     /* channel.                                                               */
-    if (sConfig->Rank != ADC_RANK_NONE)
+    if (pConfig->Rank != ADC_RANK_NONE)
     {
       /* Regular sequence configuration */
       /* Note: ADC channel configuration requires few ADC clock cycles        */
@@ -2265,7 +2252,7 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
       {
         /* Sequencer set to not fully configurable:                           */
         /* Set the channel by enabling the corresponding bitfield.            */
-        LL_ADC_REG_SetSequencerChAdd(hadc->Instance, sConfig->Channel);
+        LL_ADC_REG_SetSequencerChAdd(hadc->Instance, pConfig->Channel);
       }
       else
       {
@@ -2274,21 +2261,21 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
 
         /* Memorize the channel set into variable in HAL ADC handle */
         MODIFY_REG(hadc->ADCGroupRegularSequencerRanks,
-                   ADC_CHSELR_SQ1 << (sConfig->Rank & 0x1FUL),
-                   __LL_ADC_CHANNEL_TO_DECIMAL_NB(sConfig->Channel) << (sConfig->Rank & 0x1FUL));
+                   ADC_CHSELR_SQ1 << (pConfig->Rank & 0x1FUL),
+                   __LL_ADC_CHANNEL_TO_DECIMAL_NB(pConfig->Channel) << (pConfig->Rank & 0x1FUL));
 
         /* If the selected rank is below ADC group regular sequencer length,  */
         /* apply the configuration in ADC register.                           */
         /* Note: Otherwise, configuration is not applied.                     */
         /*       To apply it, parameter'NbrOfConversion' must be increased.   */
-        if (((sConfig->Rank >> 2UL) + 1UL) <= hadc->Init.NbrOfConversion)
+        if (((pConfig->Rank >> 2UL) + 1UL) <= hadc->Init.NbrOfConversion)
         {
-          LL_ADC_REG_SetSequencerRanks(hadc->Instance, sConfig->Rank, sConfig->Channel);
+          LL_ADC_REG_SetSequencerRanks(hadc->Instance, pConfig->Rank, pConfig->Channel);
         }
       }
 
       /* Set sampling time of the selected ADC channel */
-      LL_ADC_SetChannelSamplingTime(hadc->Instance, sConfig->Channel, sConfig->SamplingTime);
+      LL_ADC_SetChannelSamplingTime(hadc->Instance, pConfig->Channel, pConfig->SamplingTime);
 
       /* Management of internal measurement channels: VrefInt/TempSensor/Vbat */
       /* internal measurement paths enable: If internal channel selected,     */
@@ -2296,13 +2283,13 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
       /* Note: these internal measurement paths can be disabled using         */
       /*       HAL_ADC_DeInit() or removing the channel from sequencer with   */
       /*       channel configuration parameter "Rank".                        */
-      if (__LL_ADC_IS_CHANNEL_INTERNAL(sConfig->Channel))
+      if (__LL_ADC_IS_CHANNEL_INTERNAL(pConfig->Channel))
       {
         tmp_config_internal_channel = LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance));
 
         /* If the requested internal measurement path has already been enabled,   */
         /* bypass the configuration processing.                                   */
-        if ((sConfig->Channel == ADC_CHANNEL_TEMPSENSOR) &&
+        if ((pConfig->Channel == ADC_CHANNEL_TEMPSENSOR) &&
             ((tmp_config_internal_channel & LL_ADC_PATH_INTERNAL_TEMPSENSOR) == 0UL))
         {
           LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance),
@@ -2313,18 +2300,18 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
           /* Note: Variable divided by 2 to compensate partially              */
           /*       CPU processing cycles, scaling in us split to not          */
           /*       exceed 32 bits register capacity and handle low frequency. */
-          wait_loop_index = (((LL_ADC_DELAY_TEMPSENSOR_STAB_US / 10UL) * (SystemCoreClock / (100000UL * 2UL))) + 1UL);
+          wait_loop_index = ((LL_ADC_DELAY_TEMPSENSOR_STAB_US / 10UL) * ((SystemCoreClock / (100000UL * 2UL)) + 1UL));
           while (wait_loop_index != 0UL)
           {
             wait_loop_index--;
           }
         }
-        else if ((sConfig->Channel == ADC_CHANNEL_VBAT) && ((tmp_config_internal_channel & LL_ADC_PATH_INTERNAL_VBAT) == 0UL))
+        else if ((pConfig->Channel == ADC_CHANNEL_VBAT) && ((tmp_config_internal_channel & LL_ADC_PATH_INTERNAL_VBAT) == 0UL))
         {
           LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance),
                                          LL_ADC_PATH_INTERNAL_VBAT | tmp_config_internal_channel);
         }
-        else if ((sConfig->Channel == ADC_CHANNEL_VREFINT) &&
+        else if ((pConfig->Channel == ADC_CHANNEL_VREFINT) &&
                  ((tmp_config_internal_channel & LL_ADC_PATH_INTERNAL_VREFINT) == 0UL))
         {
           LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance),
@@ -2348,27 +2335,27 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
       {
         /* Sequencer set to not fully configurable:                           */
         /* Reset the channel by disabling the corresponding bitfield.         */
-        LL_ADC_REG_SetSequencerChRem(hadc->Instance, sConfig->Channel);
+        LL_ADC_REG_SetSequencerChRem(hadc->Instance, pConfig->Channel);
       }
 
       /* Management of internal measurement channels: Vbat/VrefInt/TempSensor.  */
       /* If internal channel selected, enable dedicated internal buffers and    */
       /* paths.                                                                 */
-      if (__LL_ADC_IS_CHANNEL_INTERNAL(sConfig->Channel))
+      if (__LL_ADC_IS_CHANNEL_INTERNAL(pConfig->Channel))
       {
         tmp_config_internal_channel = LL_ADC_GetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance));
 
-        if (sConfig->Channel == ADC_CHANNEL_TEMPSENSOR)
+        if (pConfig->Channel == ADC_CHANNEL_TEMPSENSOR)
         {
           LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance),
                                          ~LL_ADC_PATH_INTERNAL_TEMPSENSOR & tmp_config_internal_channel);
         }
-        else if (sConfig->Channel == ADC_CHANNEL_VBAT)
+        else if (pConfig->Channel == ADC_CHANNEL_VBAT)
         {
           LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance),
                                          ~LL_ADC_PATH_INTERNAL_VBAT & tmp_config_internal_channel);
         }
-        else if (sConfig->Channel == ADC_CHANNEL_VREFINT)
+        else if (pConfig->Channel == ADC_CHANNEL_VREFINT)
         {
           LL_ADC_SetCommonPathInternalCh(__LL_ADC_COMMON_INSTANCE(hadc->Instance),
                                          ~LL_ADC_PATH_INTERNAL_VREFINT & tmp_config_internal_channel);
@@ -2392,10 +2379,8 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
     tmp_hal_status = HAL_ERROR;
   }
 
-  /* Process unlocked */
   __HAL_UNLOCK(hadc);
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -2418,24 +2403,24 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef *hadc, ADC_ChannelConf
   *         bus activity, this might cause an uncertainty on the
   *         effective timing of the new programmed threshold values.
   * @param hadc ADC handle
-  * @param AnalogWDGConfig Structure of ADC analog watchdog configuration
+  * @param pAnalogWDGConfig Structure of ADC analog watchdog configuration
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDGConfTypeDef *AnalogWDGConfig)
+HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDGConfTypeDef *pAnalogWDGConfig)
 {
   HAL_StatusTypeDef tmp_hal_status = HAL_OK;
-  uint32_t tmpAWDHighThresholdShifted;
-  uint32_t tmpAWDLowThresholdShifted;
+  uint32_t tmp_awd_high_threshold_shifted;
+  uint32_t tmp_awd_low_threshold_shifted;
 
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(hadc->Instance));
-  assert_param(IS_ADC_ANALOG_WATCHDOG_NUMBER(AnalogWDGConfig->WatchdogNumber));
-  assert_param(IS_ADC_ANALOG_WATCHDOG_MODE(AnalogWDGConfig->WatchdogMode));
-  assert_param(IS_FUNCTIONAL_STATE(AnalogWDGConfig->ITMode));
+  assert_param(IS_ADC_ANALOG_WATCHDOG_NUMBER(pAnalogWDGConfig->WatchdogNumber));
+  assert_param(IS_ADC_ANALOG_WATCHDOG_MODE(pAnalogWDGConfig->WatchdogMode));
+  assert_param(IS_FUNCTIONAL_STATE(pAnalogWDGConfig->ITMode));
 
-  if (AnalogWDGConfig->WatchdogMode == ADC_ANALOGWATCHDOG_SINGLE_REG)
+  if (pAnalogWDGConfig->WatchdogMode == ADC_ANALOGWATCHDOG_SINGLE_REG)
   {
-    assert_param(IS_ADC_CHANNEL(AnalogWDGConfig->Channel));
+    assert_param(IS_ADC_CHANNEL(pAnalogWDGConfig->Channel));
   }
 
   /* Verify thresholds range */
@@ -2444,17 +2429,16 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
     /* Case of oversampling enabled: depending on ratio and shift configuration,
        analog watchdog thresholds can be higher than ADC resolution.
        Verify if thresholds are within maximum thresholds range. */
-    assert_param(IS_ADC_RANGE(ADC_RESOLUTION_12B, AnalogWDGConfig->HighThreshold));
-    assert_param(IS_ADC_RANGE(ADC_RESOLUTION_12B, AnalogWDGConfig->LowThreshold));
+    assert_param(IS_ADC_RANGE(ADC_RESOLUTION_12B, pAnalogWDGConfig->HighThreshold));
+    assert_param(IS_ADC_RANGE(ADC_RESOLUTION_12B, pAnalogWDGConfig->LowThreshold));
   }
   else
   {
     /* Verify if thresholds are within the selected ADC resolution */
-    assert_param(IS_ADC_RANGE(ADC_GET_RESOLUTION(hadc), AnalogWDGConfig->HighThreshold));
-    assert_param(IS_ADC_RANGE(ADC_GET_RESOLUTION(hadc), AnalogWDGConfig->LowThreshold));
+    assert_param(IS_ADC_RANGE(ADC_GET_RESOLUTION(hadc), pAnalogWDGConfig->HighThreshold));
+    assert_param(IS_ADC_RANGE(ADC_GET_RESOLUTION(hadc), pAnalogWDGConfig->LowThreshold));
   }
 
-  /* Process locked */
   __HAL_LOCK(hadc);
 
   /* Parameters update conditioned to ADC state:                              */
@@ -2464,16 +2448,16 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
   if (LL_ADC_REG_IsConversionOngoing(hadc->Instance) == 0UL)
   {
     /* Analog watchdog configuration */
-    if (AnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_1)
+    if (pAnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_1)
     {
       /* Configuration of analog watchdog:                                    */
       /*  - Set the analog watchdog enable mode: one or overall group of      */
       /*    channels.                                                         */
-      switch (AnalogWDGConfig->WatchdogMode)
+      switch (pAnalogWDGConfig->WatchdogMode)
       {
         case ADC_ANALOGWATCHDOG_SINGLE_REG:
           LL_ADC_SetAnalogWDMonitChannels(hadc->Instance, LL_ADC_AWD1,
-                                          __LL_ADC_ANALOGWD_CHANNEL_GROUP(AnalogWDGConfig->Channel, LL_ADC_GROUP_REGULAR));
+                                          __LL_ADC_ANALOGWD_CHANNEL_GROUP(pAnalogWDGConfig->Channel, LL_ADC_GROUP_REGULAR));
           break;
 
         case ADC_ANALOGWATCHDOG_ALL_REG:
@@ -2495,7 +2479,7 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
       LL_ADC_ClearFlag_AWD1(hadc->Instance);
 
       /* Configure ADC analog watchdog interrupt */
-      if (AnalogWDGConfig->ITMode == ENABLE)
+      if (pAnalogWDGConfig->ITMode == ENABLE)
       {
         LL_ADC_EnableIT_AWD1(hadc->Instance);
       }
@@ -2507,31 +2491,31 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
     /* Case of ADC_ANALOGWATCHDOG_2 or ADC_ANALOGWATCHDOG_3 */
     else
     {
-      switch (AnalogWDGConfig->WatchdogMode)
+      switch (pAnalogWDGConfig->WatchdogMode)
       {
         case ADC_ANALOGWATCHDOG_SINGLE_REG:
           /* Update AWD by bitfield to keep the possibility to monitor        */
           /* several channels by successive calls of this function.           */
-          if (AnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_2)
+          if (pAnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_2)
           {
-            SET_BIT(hadc->Instance->AWD2CR, (1UL << __LL_ADC_CHANNEL_TO_DECIMAL_NB(AnalogWDGConfig->Channel)));
+            SET_BIT(hadc->Instance->AWD2CR, (1UL << __LL_ADC_CHANNEL_TO_DECIMAL_NB(pAnalogWDGConfig->Channel)));
           }
           else
           {
-            SET_BIT(hadc->Instance->AWD3CR, (1UL << __LL_ADC_CHANNEL_TO_DECIMAL_NB(AnalogWDGConfig->Channel)));
+            SET_BIT(hadc->Instance->AWD3CR, (1UL << __LL_ADC_CHANNEL_TO_DECIMAL_NB(pAnalogWDGConfig->Channel)));
           }
           break;
 
         case ADC_ANALOGWATCHDOG_ALL_REG:
-          LL_ADC_SetAnalogWDMonitChannels(hadc->Instance, AnalogWDGConfig->WatchdogNumber, LL_ADC_AWD_ALL_CHANNELS_REG);
+          LL_ADC_SetAnalogWDMonitChannels(hadc->Instance, pAnalogWDGConfig->WatchdogNumber, LL_ADC_AWD_ALL_CHANNELS_REG);
           break;
 
         default: /* ADC_ANALOGWATCHDOG_NONE */
-          LL_ADC_SetAnalogWDMonitChannels(hadc->Instance, AnalogWDGConfig->WatchdogNumber, LL_ADC_AWD_DISABLE);
+          LL_ADC_SetAnalogWDMonitChannels(hadc->Instance, pAnalogWDGConfig->WatchdogNumber, LL_ADC_AWD_DISABLE);
           break;
       }
 
-      if (AnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_2)
+      if (pAnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_2)
       {
         /* Update state, clear previous result related to AWD2 */
         CLEAR_BIT(hadc->State, HAL_ADC_STATE_AWD2);
@@ -2543,7 +2527,7 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
         LL_ADC_ClearFlag_AWD2(hadc->Instance);
 
         /* Configure ADC analog watchdog interrupt */
-        if (AnalogWDGConfig->ITMode == ENABLE)
+        if (pAnalogWDGConfig->ITMode == ENABLE)
         {
           LL_ADC_EnableIT_AWD2(hadc->Instance);
         }
@@ -2552,7 +2536,7 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
           LL_ADC_DisableIT_AWD2(hadc->Instance);
         }
       }
-      /* (AnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_3) */
+      /* (pAnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_3) */
       else
       {
         /* Update state, clear previous result related to AWD3 */
@@ -2565,7 +2549,7 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
         LL_ADC_ClearFlag_AWD3(hadc->Instance);
 
         /* Configure ADC analog watchdog interrupt */
-        if (AnalogWDGConfig->ITMode == ENABLE)
+        if (pAnalogWDGConfig->ITMode == ENABLE)
         {
           LL_ADC_EnableIT_AWD3(hadc->Instance);
         }
@@ -2579,13 +2563,13 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
   }
 
   /* Analog watchdog thresholds configuration */
-  if (AnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_1)
+  if (pAnalogWDGConfig->WatchdogNumber == ADC_ANALOGWATCHDOG_1)
   {
     /* Shift the offset with respect to the selected ADC resolution:        */
     /* Thresholds have to be left-aligned on bit 11, the LSB (right bits)   */
     /* are set to 0.                                                        */
-    tmpAWDHighThresholdShifted = ADC_AWD1THRESHOLD_SHIFT_RESOLUTION(hadc, AnalogWDGConfig->HighThreshold);
-    tmpAWDLowThresholdShifted  = ADC_AWD1THRESHOLD_SHIFT_RESOLUTION(hadc, AnalogWDGConfig->LowThreshold);
+    tmp_awd_high_threshold_shifted = ADC_AWD1THRESHOLD_SHIFT_RESOLUTION(hadc, pAnalogWDGConfig->HighThreshold);
+    tmp_awd_low_threshold_shifted  = ADC_AWD1THRESHOLD_SHIFT_RESOLUTION(hadc, pAnalogWDGConfig->LowThreshold);
   }
   /* Case of ADC_ANALOGWATCHDOG_2 and ADC_ANALOGWATCHDOG_3 */
   else
@@ -2593,18 +2577,16 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
     /* No need to shift the offset with respect to the selected ADC resolution: */
     /* Thresholds have to be left-aligned on bit 11, the LSB (right bits)   */
     /* are set to 0.                                                        */
-    tmpAWDHighThresholdShifted = AnalogWDGConfig->HighThreshold;
-    tmpAWDLowThresholdShifted  = AnalogWDGConfig->LowThreshold;
+    tmp_awd_high_threshold_shifted = pAnalogWDGConfig->HighThreshold;
+    tmp_awd_low_threshold_shifted  = pAnalogWDGConfig->LowThreshold;
   }
 
   /* Set ADC analog watchdog thresholds value of both thresholds high and low */
-  LL_ADC_ConfigAnalogWDThresholds(hadc->Instance, AnalogWDGConfig->WatchdogNumber, tmpAWDHighThresholdShifted,
-                                  tmpAWDLowThresholdShifted);
+  LL_ADC_ConfigAnalogWDThresholds(hadc->Instance, pAnalogWDGConfig->WatchdogNumber, tmp_awd_high_threshold_shifted,
+                                  tmp_awd_low_threshold_shifted);
 
-  /* Process unlocked */
   __HAL_UNLOCK(hadc);
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -2708,13 +2690,17 @@ HAL_StatusTypeDef ADC_ConversionStop(ADC_HandleTypeDef *hadc)
     {
       if ((HAL_GetTick() - tickstart) > ADC_STOP_CONVERSION_TIMEOUT)
       {
-        /* Update ADC state machine to error */
-        SET_BIT(hadc->State, HAL_ADC_STATE_ERROR_INTERNAL);
+        /* New check to avoid false timeout detection in case of preemption */
+        if ((hadc->Instance->CR & ADC_CR_ADSTART) != 0UL)
+        {
+          /* Update ADC state machine to error */
+          SET_BIT(hadc->State, HAL_ADC_STATE_ERROR_INTERNAL);
 
-        /* Set ADC error code to ADC peripheral internal error */
-        SET_BIT(hadc->ErrorCode, HAL_ADC_ERROR_INTERNAL);
+          /* Set ADC error code to ADC peripheral internal error */
+          SET_BIT(hadc->ErrorCode, HAL_ADC_ERROR_INTERNAL);
 
-        return HAL_ERROR;
+          return HAL_ERROR;
+        }
       }
     }
 
@@ -2764,7 +2750,7 @@ HAL_StatusTypeDef ADC_Enable(ADC_HandleTypeDef *hadc)
       /* Note: Variable divided by 2 to compensate partially              */
       /*       CPU processing cycles, scaling in us split to not          */
       /*       exceed 32 bits register capacity and handle low frequency. */
-      wait_loop_index = (((LL_ADC_DELAY_TEMPSENSOR_BUFFER_STAB_US / 10UL) * (SystemCoreClock / (100000UL * 2UL))) + 1UL);
+      wait_loop_index = ((LL_ADC_DELAY_TEMPSENSOR_BUFFER_STAB_US / 10UL) * ((SystemCoreClock / (100000UL * 2UL)) + 1UL));
       while (wait_loop_index != 0UL)
       {
         wait_loop_index--;
@@ -2795,13 +2781,17 @@ HAL_StatusTypeDef ADC_Enable(ADC_HandleTypeDef *hadc)
 
         if ((HAL_GetTick() - tickstart) > ADC_ENABLE_TIMEOUT)
         {
-          /* Update ADC state machine to error */
-          SET_BIT(hadc->State, HAL_ADC_STATE_ERROR_INTERNAL);
+          /* New check to avoid false timeout detection in case of preemption */
+          if (__HAL_ADC_GET_FLAG(hadc, ADC_FLAG_RDY) == 0UL)
+          {
+            /* Update ADC state machine to error */
+            SET_BIT(hadc->State, HAL_ADC_STATE_ERROR_INTERNAL);
 
-          /* Set ADC error code to ADC peripheral internal error */
-          SET_BIT(hadc->ErrorCode, HAL_ADC_ERROR_INTERNAL);
+            /* Set ADC error code to ADC peripheral internal error */
+            SET_BIT(hadc->ErrorCode, HAL_ADC_ERROR_INTERNAL);
 
-          return HAL_ERROR;
+            return HAL_ERROR;
+          }
         }
       }
     }
@@ -2856,13 +2846,17 @@ HAL_StatusTypeDef ADC_Disable(ADC_HandleTypeDef *hadc)
     {
       if ((HAL_GetTick() - tickstart) > ADC_DISABLE_TIMEOUT)
       {
-        /* Update ADC state machine to error */
-        SET_BIT(hadc->State, HAL_ADC_STATE_ERROR_INTERNAL);
+        /* New check to avoid false timeout detection in case of preemption */
+        if ((hadc->Instance->CR & ADC_CR_ADEN) != 0UL)
+        {
+          /* Update ADC state machine to error */
+          SET_BIT(hadc->State, HAL_ADC_STATE_ERROR_INTERNAL);
 
-        /* Set ADC error code to ADC peripheral internal error */
-        SET_BIT(hadc->ErrorCode, HAL_ADC_ERROR_INTERNAL);
+          /* Set ADC error code to ADC peripheral internal error */
+          SET_BIT(hadc->ErrorCode, HAL_ADC_ERROR_INTERNAL);
 
-        return HAL_ERROR;
+          return HAL_ERROR;
+        }
       }
     }
   }
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c
index 9cd5322d..267367d0 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c
@@ -12,12 +12,6 @@
   *          Other functions (generic functions) are available in file
   *          "stm32wlxx_hal_adc.c".
   *
-  @verbatim
-  [..]
-  (@) Sections "ADC peripheral features" and "How to use this driver" are
-      available in file of generic functions "stm32wlxx_hal_adc.c".
-  [..]
-  @endverbatim
   ******************************************************************************
   * @attention
   *
@@ -30,6 +24,12 @@
   *                        opensource.org/licenses/BSD-3-Clause
   *
   ******************************************************************************
+  @verbatim
+  [..]
+  (@) Sections "ADC peripheral features" and "How to use this driver" are
+      available in file of generic functions "stm32wlxx_hal_adc.c".
+  [..]
+  @endverbatim
   */
 
 /* Includes ------------------------------------------------------------------*/
@@ -110,7 +110,6 @@ HAL_StatusTypeDef HAL_ADCEx_Calibration_Start(ADC_HandleTypeDef *hadc)
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(hadc->Instance));
 
-  /* Process locked */
   __HAL_LOCK(hadc);
 
   /* Calibration prerequisite: ADC must be disabled. */
@@ -149,7 +148,6 @@ HAL_StatusTypeDef HAL_ADCEx_Calibration_Start(ADC_HandleTypeDef *hadc)
                           HAL_ADC_STATE_BUSY_INTERNAL,
                           HAL_ADC_STATE_ERROR_INTERNAL);
 
-        /* Process unlocked */
         __HAL_UNLOCK(hadc);
 
         return HAL_ERROR;
@@ -172,10 +170,8 @@ HAL_StatusTypeDef HAL_ADCEx_Calibration_Start(ADC_HandleTypeDef *hadc)
     /*       to state "HAL_ERROR" by function disabling the ADC.              */
   }
 
-  /* Process unlocked */
   __HAL_UNLOCK(hadc);
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
@@ -209,7 +205,6 @@ HAL_StatusTypeDef HAL_ADCEx_Calibration_SetValue(ADC_HandleTypeDef *hadc, uint32
   assert_param(IS_ADC_ALL_INSTANCE(hadc->Instance));
   assert_param(IS_ADC_CALFACT(CalibrationFactor));
 
-  /* Process locked */
   __HAL_LOCK(hadc);
 
   /* Verification of hardware constraints before modifying the calibration    */
@@ -234,10 +229,8 @@ HAL_StatusTypeDef HAL_ADCEx_Calibration_SetValue(ADC_HandleTypeDef *hadc, uint32
     tmp_hal_status = HAL_ERROR;
   }
 
-  /* Process unlocked */
   __HAL_UNLOCK(hadc);
 
-  /* Return function status */
   return tmp_hal_status;
 }
 
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_comp.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_comp.c
index 9d5d83f9..ccde7241 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_comp.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_comp.c
@@ -335,7 +335,7 @@ HAL_StatusTypeDef HAL_COMP_Init(COMP_HandleTypeDef *hcomp)
       /* Note: Variable divided by 2 to compensate partially              */
       /*       CPU processing cycles, scaling in us split to not          */
       /*       exceed 32 bits register capacity and handle low frequency. */
-      wait_loop_index = ((COMP_DELAY_VOLTAGE_SCALER_STAB_US / 10UL) * (SystemCoreClock / (100000UL * 2UL)));
+      wait_loop_index = ((COMP_DELAY_VOLTAGE_SCALER_STAB_US / 10UL) * ((SystemCoreClock / (100000UL * 2UL)) + 1UL));
       while(wait_loop_index != 0UL)
       {
         wait_loop_index--;
@@ -733,7 +733,7 @@ HAL_StatusTypeDef HAL_COMP_Start(COMP_HandleTypeDef *hcomp)
       /* Note: Variable divided by 2 to compensate partially              */
       /*       CPU processing cycles, scaling in us split to not          */
       /*       exceed 32 bits register capacity and handle low frequency. */
-      wait_loop_index = ((COMP_DELAY_STARTUP_US / 10UL) * (SystemCoreClock / (100000UL * 2UL)));
+      wait_loop_index = ((COMP_DELAY_STARTUP_US / 10UL) * ((SystemCoreClock / (100000UL * 2UL)) + 1UL));
       while(wait_loop_index != 0UL)
       {
         wait_loop_index--;
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c
index 55dd871f..3ba98987 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c
@@ -587,15 +587,17 @@ HAL_StatusTypeDef HAL_CRYP_SetConfig(CRYP_HandleTypeDef *hcryp, CRYP_ConfigTypeD
     __HAL_LOCK(hcryp);
 
     /* Set  CRYP parameters  */
-    hcryp->Init.DataType   = pConf->DataType;
-    hcryp->Init.pKey       = pConf->pKey;
-    hcryp->Init.Algorithm  = pConf->Algorithm;
-    hcryp->Init.KeySize    = pConf->KeySize;
-    hcryp->Init.pInitVect  = pConf->pInitVect;
-    hcryp->Init.Header     = pConf->Header;
-    hcryp->Init.HeaderSize = pConf->HeaderSize;
-    hcryp->Init.B0         = pConf->B0;
-    hcryp->Init.DataWidthUnit = pConf->DataWidthUnit;
+    hcryp->Init.DataType        = pConf->DataType;
+    hcryp->Init.pKey            = pConf->pKey;
+    hcryp->Init.Algorithm       = pConf->Algorithm;
+    hcryp->Init.KeySize         = pConf->KeySize;
+    hcryp->Init.pInitVect       = pConf->pInitVect;
+    hcryp->Init.Header          = pConf->Header;
+    hcryp->Init.HeaderSize      = pConf->HeaderSize;
+    hcryp->Init.B0              = pConf->B0;
+    hcryp->Init.DataWidthUnit   = pConf->DataWidthUnit;
+    hcryp->Init.HeaderWidthUnit = pConf->HeaderWidthUnit;
+    hcryp->Init.KeyIVConfigSkip = pConf->KeyIVConfigSkip;
 
     /* Set the key size (This bit field is do not care in the DES or TDES modes), data type and operating mode*/
     MODIFY_REG(hcryp->Instance->CR, AES_CR_DATATYPE | AES_CR_KEYSIZE | AES_CR_CHMOD, hcryp->Init.DataType | hcryp->Init.KeySize | hcryp->Init.Algorithm);
@@ -661,7 +663,9 @@ HAL_StatusTypeDef HAL_CRYP_GetConfig(CRYP_HandleTypeDef *hcryp, CRYP_ConfigTypeD
     pConf->Header          = hcryp->Init.Header ;
     pConf->HeaderSize      = hcryp->Init.HeaderSize;
     pConf->B0              = hcryp->Init.B0;
-    pConf->DataWidthUnit    = hcryp->Init.DataWidthUnit;
+    pConf->DataWidthUnit   = hcryp->Init.DataWidthUnit;
+    pConf->HeaderWidthUnit = hcryp->Init.HeaderWidthUnit;
+    pConf->KeyIVConfigSkip = hcryp->Init.KeyIVConfigSkip;
 
     /* Process Unlocked */
     __HAL_UNLOCK(hcryp);
@@ -693,8 +697,8 @@ __weak void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
   /* Prevent unused argument(s) compilation warning */
   UNUSED(hcryp);
 
-  /* NOTE : This function Should not be modified, when the callback is needed,
-            the HAL_CRYP_MspInit could be implemented in the user file
+  /* NOTE : This function should not be modified; when the callback is needed,
+            the HAL_CRYP_MspInit can be implemented in the user file
    */
 }
 
@@ -709,8 +713,8 @@ __weak void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
   /* Prevent unused argument(s) compilation warning */
   UNUSED(hcryp);
 
-  /* NOTE : This function Should not be modified, when the callback is needed,
-            the HAL_CRYP_MspDeInit could be implemented in the user file
+  /* NOTE : This function should not be modified; when the callback is needed,
+            the HAL_CRYP_MspDeInit can be implemented in the user file
    */
 }
 
@@ -1929,8 +1933,8 @@ __weak void HAL_CRYP_InCpltCallback(CRYP_HandleTypeDef *hcryp)
   /* Prevent unused argument(s) compilation warning */
   UNUSED(hcryp);
 
-  /* NOTE : This function Should not be modified, when the callback is needed,
-            the HAL_CRYP_InCpltCallback could be implemented in the user file
+  /* NOTE : This function should not be modified; when the callback is needed,
+            the HAL_CRYP_InCpltCallback can be implemented in the user file
    */
 }
 
@@ -1945,8 +1949,8 @@ __weak void HAL_CRYP_OutCpltCallback(CRYP_HandleTypeDef *hcryp)
   /* Prevent unused argument(s) compilation warning */
   UNUSED(hcryp);
 
-  /* NOTE : This function Should not be modified, when the callback is needed,
-            the HAL_CRYP_OutCpltCallback could be implemented in the user file
+  /* NOTE : This function should not be modified; when the callback is needed,
+            the HAL_CRYP_OutCpltCallback can be implemented in the user file
    */
 }
 
@@ -1961,8 +1965,8 @@ __weak void HAL_CRYP_ErrorCallback(CRYP_HandleTypeDef *hcryp)
   /* Prevent unused argument(s) compilation warning */
   UNUSED(hcryp);
 
-  /* NOTE : This function Should not be modified, when the callback is needed,
-            the HAL_CRYP_ErrorCallback could be implemented in the user file
+  /* NOTE : This function should not be modified; when the callback is needed,
+            the HAL_CRYP_ErrorCallback can be implemented in the user file
    */
 }
 /**
@@ -2570,15 +2574,31 @@ static void CRYP_DMAInCplt(DMA_HandleTypeDef *hdma)
     /* Initiate payload DMA IN and processed data DMA OUT transfers */
     (void)CRYP_GCMCCM_SetPayloadPhase_DMA(hcryp);
   }
+  else
+  {
+    uint32_t algo;
+    /* ECB, CBC or CTR end of input data feeding 
+       or
+       end of GCM/CCM payload data feeding through DMA */
+    algo = hcryp->Instance->CR & AES_CR_CHMOD;
 
-  /* Call input data transfer complete callback */
+    /* Don't call input data transfer complete callback only if 
+       it remains some input data to write to the peripheral.
+       This case can only occur for GCM and CCM with a payload length
+       not a multiple of 16 bytes */
+    if (!(((algo == CRYP_AES_GCM_GMAC) || (algo == CRYP_AES_CCM)) && \
+        (((hcryp->Size) % 16U) != 0U)))
+    {
+      /* Call input data transfer complete callback */
 #if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
-  /*Call registered Input complete callback*/
-  hcryp->InCpltCallback(hcryp);
+      /*Call registered Input complete callback*/
+      hcryp->InCpltCallback(hcryp);
 #else
-  /*Call legacy weak Input complete callback*/
-  HAL_CRYP_InCpltCallback(hcryp);
+      /*Call legacy weak Input complete callback*/
+      HAL_CRYP_InCpltCallback(hcryp);
 #endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */
+    }
+  } /* if (hcryp->Phase == CRYP_PHASE_HEADER_DMA_FEED) */
 }
 
 /**
@@ -2642,6 +2662,14 @@ static void CRYP_DMAOutCplt(DMA_HandleTypeDef *hdma)
       hcryp->Instance->DINR = 0x0U;
       count++;
     }
+    /* Call input data transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+    /*Call registered Input complete callback*/
+    hcryp->InCpltCallback(hcryp);
+#else
+    /*Call legacy weak Input complete callback*/
+    HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */  
 
     /*Wait on CCF flag*/
     CRYP_ClearCCFlagWhenHigh(hcryp, CRYP_TIMEOUT_GCMCCMHEADERPHASE);
@@ -3380,7 +3408,7 @@ static HAL_StatusTypeDef CRYP_AESGCM_Process_IT(CRYP_HandleTypeDef *hcryp)
         hcryp->CrypInCount++;
         hcryp->Instance->DINR  = *(uint32_t *)(hcryp->pCrypInBuffPtr + hcryp->CrypInCount);
         hcryp->CrypInCount++;
-        if (hcryp->CrypInCount ==  (hcryp->Size / 4U))
+        if ((hcryp->CrypInCount ==  (hcryp->Size / 4U)) && ((hcryp->Size % 16U) == 0U))  
         {
           /* Call Input transfer complete callback */
 #if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
@@ -3431,6 +3459,14 @@ static HAL_StatusTypeDef CRYP_AESGCM_Process_IT(CRYP_HandleTypeDef *hcryp)
           hcryp->Instance->DINR = 0x0U;
           loopcounter++;
         }
+        /* Call Input transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+        /*Call registered Input complete callback*/
+        hcryp->InCpltCallback(hcryp);
+#else
+        /*Call legacy weak Input complete callback*/
+        HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */        
       }
     }
     /* Enter header data */
@@ -3470,15 +3506,6 @@ static HAL_StatusTypeDef CRYP_AESGCM_Process_IT(CRYP_HandleTypeDef *hcryp)
           hcryp->CrypHeaderCount++;
         }
       }
-
-      /* Call Input transfer complete callback */
-#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
-      /*Call registered Input complete callback*/
-      hcryp->InCpltCallback(hcryp);
-#else
-      /*Call legacy weak Input complete callback*/
-      HAL_CRYP_InCpltCallback(hcryp);
-#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */
     }
     else
     {
@@ -3528,7 +3555,7 @@ static HAL_StatusTypeDef CRYP_AESGCM_Process_IT(CRYP_HandleTypeDef *hcryp)
       hcryp->CrypInCount++;
       hcryp->Instance->DINR  = *(uint32_t *)(hcryp->pCrypInBuffPtr + hcryp->CrypInCount);
       hcryp->CrypInCount++;
-      if (hcryp->CrypInCount ==  (hcryp->Size / 4U))
+      if ((hcryp->CrypInCount ==  (hcryp->Size / 4U)) && ((hcryp->Size % 16U) == 0U)) 
       {
         /* Call Input transfer complete callback */
 #if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
@@ -3579,6 +3606,14 @@ static HAL_StatusTypeDef CRYP_AESGCM_Process_IT(CRYP_HandleTypeDef *hcryp)
         hcryp->Instance->DINR = 0x0U;
         loopcounter++;
       }
+      /* Call Input transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+      /*Call registered Input complete callback*/
+      hcryp->InCpltCallback(hcryp);
+#else
+      /*Call legacy weak Input complete callback*/
+      HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */      
     }
   }
 
@@ -3904,6 +3939,11 @@ static HAL_StatusTypeDef CRYP_AESCCM_Process_IT(CRYP_HandleTypeDef *hcryp)
   uint32_t npblb;
   uint32_t mode;
   uint32_t DoKeyIVConfig = 1U; /* By default, carry out peripheral Key and IV configuration */
+  uint32_t headersize_in_bytes;
+  uint32_t tmp;
+  uint32_t mask[12] = {0x0U, 0xFF000000U, 0xFFFF0000U, 0xFFFFFF00U,  /* 32-bit data type */
+                       0x0U, 0x0000FF00U, 0x0000FFFFU, 0xFF00FFFFU,  /* 16-bit data type */
+                       0x0U, 0x000000FFU, 0x0000FFFFU, 0x00FFFFFFU}; /*  8-bit data type */
 
 #if (USE_HAL_CRYP_SUSPEND_RESUME == 1U)
   if ((hcryp->Phase == CRYP_PHASE_HEADER_SUSPENDED) || (hcryp->Phase == CRYP_PHASE_PAYLOAD_SUSPENDED))
@@ -3993,7 +4033,16 @@ static HAL_StatusTypeDef CRYP_AESCCM_Process_IT(CRYP_HandleTypeDef *hcryp)
     /* Enable the CRYP peripheral */
     __HAL_CRYP_ENABLE(hcryp);
 
-    if (hcryp->Init.HeaderSize ==   0U) /*header phase is  skipped*/
+    if (hcryp->Init.HeaderWidthUnit == CRYP_HEADERWIDTHUNIT_WORD)
+    {
+      headersize_in_bytes = hcryp->Init.HeaderSize * 4U;
+    }
+    else
+    {
+      headersize_in_bytes = hcryp->Init.HeaderSize;
+    }
+
+    if (headersize_in_bytes == 0U) /* Header phase is  skipped */
     {
       /* Set the phase */
       hcryp->Phase = CRYP_PHASE_PROCESS;
@@ -4077,26 +4126,63 @@ static HAL_StatusTypeDef CRYP_AESCCM_Process_IT(CRYP_HandleTypeDef *hcryp)
           hcryp->Instance->DINR = 0x0U;
           loopcounter++;
         }
+        /* Call Input transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+        /*Call registered Input complete callback*/
+        hcryp->InCpltCallback(hcryp);
+#else
+        /*Call legacy weak Input complete callback*/
+        HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */        
       }
     }
-    else if ((hcryp->Init.HeaderSize) < 4U) /*HeaderSize < 4 */
+    /* Enter header data */
+    /* Check first whether header length is small enough to enter the full header in one shot */
+    else if (headersize_in_bytes <= 16U)
     {
-      /*  Last block optionally pad the data with zeros*/
-      for (loopcounter = 0U; loopcounter < (hcryp->Init.HeaderSize % 4U); loopcounter++)
+      for (loopcounter = 0U; (loopcounter < (headersize_in_bytes / 4U)); loopcounter++)
       {
         hcryp->Instance->DINR = *(uint32_t *)(hcryp->Init.Header + hcryp->CrypHeaderCount);
         hcryp->CrypHeaderCount++ ;
       }
+      /* If the header size is a multiple of words */
+      if ((headersize_in_bytes % 4U) == 0U)
+      {
+        /* Pad the data with zeros to have a complete block */
+        while (loopcounter < 4U)
+        {
+          hcryp->Instance->DINR = 0x0U;
+          loopcounter++;
+        }
+      }
+      else
+      {
+        /* Enter last bytes, padded with zeros */
+        tmp =  *(uint32_t *)(hcryp->Init.Header + hcryp->CrypHeaderCount);
+        tmp &= mask[(hcryp->Init.DataType * 2U) + (headersize_in_bytes % 4U)];
+        hcryp->Instance->DINR = tmp;
+        hcryp->CrypHeaderCount++;
+        loopcounter++;
+        /* Pad the data with zeros to have a complete block */
       while (loopcounter < 4U)
       {
-        /* pad the data with zeros to have a complete block */
         hcryp->Instance->DINR = 0x0U;
         loopcounter++;
       }
+    }
+      /* Call Input transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+      /*Call registered Input complete callback*/
+      hcryp->InCpltCallback(hcryp);
+#else
+      /*Call legacy weak Input complete callback*/
+      HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */
     }
     else
     {
-      /* Write the input block in the IN FIFO */
+      /* Write the first input header block in the Input FIFO,
+         the following header data will be fed after interrupt occurrence */
       hcryp->Instance->DINR  = *(uint32_t *)(hcryp->Init.Header + hcryp->CrypHeaderCount);
       hcryp->CrypHeaderCount++;
       hcryp->Instance->DINR  = *(uint32_t *)(hcryp->Init.Header + hcryp->CrypHeaderCount);
@@ -4105,9 +4191,8 @@ static HAL_StatusTypeDef CRYP_AESCCM_Process_IT(CRYP_HandleTypeDef *hcryp)
       hcryp->CrypHeaderCount++;
       hcryp->Instance->DINR  = *(uint32_t *)(hcryp->Init.Header + hcryp->CrypHeaderCount);
       hcryp->CrypHeaderCount++;
-    }
-
-  } /* end of if (DoKeyIVConfig == 1U) */
+    }/* if (hcryp->Init.HeaderSize == 0U) */ /* Header phase is  skipped*/
+  } /* end of if (dokeyivconfig == 1U) */
   else  /* Key and IV have already been configured,
           header has already been processed;
           only process here message payload */
@@ -4182,6 +4267,14 @@ static HAL_StatusTypeDef CRYP_AESCCM_Process_IT(CRYP_HandleTypeDef *hcryp)
         hcryp->Instance->DINR = 0x0U;
         loopcounter++;
       }
+      /* Call Input transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+      /*Call registered Input complete callback*/
+      hcryp->InCpltCallback(hcryp);
+#else
+      /*Call legacy weak Input complete callback*/
+      HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */      
     }
   }
 
@@ -4387,9 +4480,9 @@ static void CRYP_GCMCCM_SetPayloadPhase_IT(CRYP_HandleTypeDef *hcryp)
     hcryp->CrypInCount++;
     hcryp->Instance->DINR  = *(uint32_t *)(hcryp->pCrypInBuffPtr + hcryp->CrypInCount);
     hcryp->CrypInCount++;
-    if ((hcryp->CrypInCount ==  hcryp->Size) && (hcryp->Init.Algorithm == CRYP_AES_GCM_GMAC))
+    if ((hcryp->CrypInCount ==  (hcryp->Size / 4U)) && ((hcryp->Size % 16U) == 0U))  
     {
-      /* Call output transfer complete callback */
+      /* Call input transfer complete callback */
 #if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
       /*Call registered Input complete callback*/
       hcryp->InCpltCallback(hcryp);
@@ -4435,6 +4528,14 @@ static void CRYP_GCMCCM_SetPayloadPhase_IT(CRYP_HandleTypeDef *hcryp)
       hcryp->Instance->DINR = 0x0U;
       loopcounter++;
     }
+      /* Call input transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+      /*Call registered Input complete callback*/
+      hcryp->InCpltCallback(hcryp);
+#else
+      /*Call legacy weak Input complete callback*/
+      HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */    
   }
 }
 
@@ -4509,6 +4610,14 @@ static HAL_StatusTypeDef CRYP_GCMCCM_SetPayloadPhase_DMA(CRYP_HandleTypeDef *hcr
       hcryp->Instance->DINR  = 0U;
       index++;
     }
+    /* Call the input data transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+    /*Call registered Input complete callback*/
+    hcryp->InCpltCallback(hcryp);
+#else
+    /*Call legacy weak Input complete callback*/
+    HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */    
     /* Wait for CCF flag to be raised */
     count = CRYP_TIMEOUT_GCMCCMHEADERPHASE;
     do
@@ -4550,6 +4659,15 @@ static HAL_StatusTypeDef CRYP_GCMCCM_SetPayloadPhase_DMA(CRYP_HandleTypeDef *hcr
 
     /* Process unlocked */
     __HAL_UNLOCK(hcryp);
+
+      /* Call Output transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+      /*Call registered Output complete callback*/
+      hcryp->OutCpltCallback(hcryp);
+#else
+      /*Call legacy weak Output complete callback*/
+      HAL_CRYP_OutCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */    
   }
 
   return HAL_OK;
@@ -4947,6 +5065,14 @@ static void CRYP_GCMCCM_SetHeaderPhase_IT(CRYP_HandleTypeDef *hcryp)
         hcryp->Instance->DINR = 0x0U;
         loopcounter++;
       }
+      /* Call the input data transfer complete callback */
+#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
+      /*Call registered Input complete callback*/
+      hcryp->InCpltCallback(hcryp);
+#else
+      /*Call legacy weak Input complete callback*/
+      HAL_CRYP_InCpltCallback(hcryp);
+#endif /* USE_HAL_CRYP_REGISTER_CALLBACKS */      
     }
   }
   else if ((((headersize_in_bytes / 4U) - (hcryp->CrypHeaderCount)) >= 4U))
@@ -5398,9 +5524,9 @@ static void CRYP_PhaseProcessingResume(CRYP_HandleTypeDef *hcryp)
         hcryp->CrypInCount++;
         hcryp->Instance->DINR  = *(uint32_t *)(hcryp->pCrypInBuffPtr + hcryp->CrypInCount );
         hcryp->CrypInCount++;
-        if((hcryp->CrypInCount ==  hcryp->Size) && (hcryp->Init.Algorithm == CRYP_AES_GCM_GMAC))
+        if ((hcryp->CrypInCount ==  (hcryp->Size / 4U)) && ((hcryp->Size % 16U) == 0U))
         {
-          /* Call output transfer complete callback */
+          /* Call input transfer complete callback */
 #if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1)
           /*Call registered Input complete callback*/
           hcryp->InCpltCallback(hcryp);
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dac.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dac.c
index 377bad37..f712cd18 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dac.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dac.c
@@ -209,7 +209,7 @@
       The compilation define  USE_HAL_DAC_REGISTER_CALLBACKS when set to 1
       allows the user to configure dynamically the driver callbacks.
 
-    Use Functions @ref HAL_DAC_RegisterCallback() to register a user callback,
+    Use Functions HAL_DAC_RegisterCallback() to register a user callback,
       it allows to register following callbacks:
       (+) ConvCpltCallbackCh1     : callback when a half transfer is completed on Ch1.
       (+) ConvHalfCpltCallbackCh1 : callback when a transfer is completed on Ch1.
@@ -220,7 +220,7 @@
       This function takes as parameters the HAL peripheral handle, the Callback ID
       and a pointer to the user callback function.
 
-    Use function @ref HAL_DAC_UnRegisterCallback() to reset a callback to the default
+    Use function HAL_DAC_UnRegisterCallback() to reset a callback to the default
       weak (surcharged) function. It allows to reset following callbacks:
       (+) ConvCpltCallbackCh1     : callback when a half transfer is completed on Ch1.
       (+) ConvHalfCpltCallbackCh1 : callback when a transfer is completed on Ch1.
@@ -231,12 +231,12 @@
       (+) All Callbacks
       This function) takes as parameters the HAL peripheral handle and the Callback ID.
 
-      By default, after the @ref HAL_DAC_Init and if the state is HAL_DAC_STATE_RESET
+      By default, after the HAL_DAC_Init and if the state is HAL_DAC_STATE_RESET
       all callbacks are reset to the corresponding legacy weak (surcharged) functions.
       Exception done for MspInit and MspDeInit callbacks that are respectively
-      reset to the legacy weak (surcharged) functions in the @ref HAL_DAC_Init
-      and @ref  HAL_DAC_DeInit only when these callbacks are null (not registered beforehand).
-      If not, MspInit or MspDeInit are not null, the @ref HAL_DAC_Init and @ref HAL_DAC_DeInit
+      reset to the legacy weak (surcharged) functions in the HAL_DAC_Init
+      and HAL_DAC_DeInit only when these callbacks are null (not registered beforehand).
+      If not, MspInit or MspDeInit are not null, the HAL_DAC_Init and HAL_DAC_DeInit
       keep and use the user MspInit/MspDeInit callbacks (registered beforehand)
 
       Callbacks can be registered/unregistered in READY state only.
@@ -244,8 +244,8 @@
       in READY or RESET state, thus registered (user) MspInit/DeInit callbacks can be used
       during the Init/DeInit.
       In that case first register the MspInit/MspDeInit user callbacks
-      using @ref HAL_DAC_RegisterCallback before calling @ref HAL_DAC_DeInit
-      or @ref HAL_DAC_Init function.
+      using HAL_DAC_RegisterCallback before calling HAL_DAC_DeInit
+      or HAL_DAC_Init function.
 
       When The compilation define USE_HAL_DAC_REGISTER_CALLBACKS is set to 0 or
       not defined, the callback registering feature is not available
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c
index 74c8c99b..ee221a47 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c
@@ -1002,7 +1002,7 @@ uint32_t HAL_DMA_GetError(DMA_HandleTypeDef *hdma)
     This subsection provides functions allowing to
       (+) Configure the DMA channel(s) privilege and non-privilege attributes
       (+) Configure the DMA channel(s) secure and non-secure attributes from
-          secure world when the system implements the security (TZEN=1)
+          secure world when the system implements the security (ESE=1)
       (+) Get the DMA channel(s) attributes
 
 @endverbatim
@@ -1142,7 +1142,7 @@ HAL_StatusTypeDef HAL_DMA_ConfigChannelAttributes(DMA_HandleTypeDef *hdma, uint3
 /**
   * @brief Get the attribute of a DMA channel.
   * @note  Secure and non-secure attributes are only available from secure state
-  *        when the system implements the security (TZEN=1)
+  *        when the system implements the security (ESE=1)
   * @param hdma Pointer to a DMA_HandleTypeDef structure that contains
   *             the configuration information for the specified DMA Channel.
   * @param ChannelAttributes pointer to return the attributes.
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c
index 9eb7e47c..74bfae77 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c
@@ -330,6 +330,10 @@ HAL_StatusTypeDef HAL_EXTI_GetConfigLine(EXTI_HandleTypeDef *hexti, EXTI_ConfigT
     pExtiConfig->Mode |= EXTI_MODE_EVENT;
   }
 
+  /* Get default Trigger and GPIOSel configuration */
+  pExtiConfig->Trigger = EXTI_TRIGGER_NONE;
+  pExtiConfig->GPIOSel = 0x00u;
+
   /* 2] Get trigger for configurable lines : rising */
   if ((pExtiConfig->Line & EXTI_CONFIG) != 0x00u)
   {
@@ -341,10 +345,6 @@ HAL_StatusTypeDef HAL_EXTI_GetConfigLine(EXTI_HandleTypeDef *hexti, EXTI_ConfigT
     {
       pExtiConfig->Trigger = EXTI_TRIGGER_RISING;
     }
-    else
-    {
-      pExtiConfig->Trigger = EXTI_TRIGGER_NONE;
-    }
 
     /* Get falling configuration */
     regaddr = (&EXTI->FTSR1 + (EXTI_CONFIG_OFFSET * offset));
@@ -362,15 +362,6 @@ HAL_StatusTypeDef HAL_EXTI_GetConfigLine(EXTI_HandleTypeDef *hexti, EXTI_ConfigT
       regval = SYSCFG->EXTICR[linepos >> 2u];
       pExtiConfig->GPIOSel = ((regval << (SYSCFG_EXTICR1_EXTI1_Pos * (3uL - (linepos & 0x03u)))) >> 24u);
     }
-    else
-    {
-      pExtiConfig->GPIOSel = 0x00u;
-    }
-  }
-  else
-  {
-    pExtiConfig->Trigger = EXTI_TRIGGER_NONE;
-    pExtiConfig->GPIOSel = 0x00u;
   }
 
   return HAL_OK;
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c
index d11d3dc5..a51154c5 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c
@@ -117,17 +117,9 @@
 
 /* Private typedef -----------------------------------------------------------*/
 /* Private defines ------------------------------------------------------------*/
-/** @defgroup GPIO_Private_Constants GPIO Private Constants
+/** @addtogroup GPIO_Private_Constants GPIO Private Constants
   * @{
   */
-#define GPIO_MODE             (0x00000003U)
-#define EXTI_MODE             (0x10000000U)
-#define GPIO_MODE_IT          (0x00010000U)
-#define GPIO_MODE_EVT         (0x00020000U)
-#define RISING_EDGE           (0x00100000U)
-#define FALLING_EDGE          (0x00200000U)
-#define GPIO_OUTPUT_TYPE      (0x00000010U)
-
 #define GPIO_NUMBER           (16U)
 /**
   * @}
@@ -183,8 +175,7 @@ void HAL_GPIO_Init(GPIO_TypeDef  *GPIOx, GPIO_InitTypeDef *GPIO_Init)
     {
       /*--------------------- GPIO Mode Configuration ------------------------*/
       /* In case of Output or Alternate function mode selection */
-      if ((GPIO_Init->Mode == GPIO_MODE_OUTPUT_PP) || (GPIO_Init->Mode == GPIO_MODE_AF_PP) ||
-          (GPIO_Init->Mode == GPIO_MODE_OUTPUT_OD) || (GPIO_Init->Mode == GPIO_MODE_AF_OD))
+      if (((GPIO_Init->Mode & GPIO_MODE) == MODE_OUTPUT) || ((GPIO_Init->Mode & GPIO_MODE) == MODE_AF))
       {
         /* Check the Speed parameter */
         assert_param(IS_GPIO_SPEED(GPIO_Init->Speed));
@@ -197,18 +188,21 @@ void HAL_GPIO_Init(GPIO_TypeDef  *GPIOx, GPIO_InitTypeDef *GPIO_Init)
         /* Configure the IO Output Type */
         temp = GPIOx->OTYPER;
         temp &= ~(GPIO_OTYPER_OT0 << position) ;
-        temp |= (((GPIO_Init->Mode & GPIO_OUTPUT_TYPE) >> 4U) << position);
+        temp |= (((GPIO_Init->Mode & OUTPUT_TYPE) >> OUTPUT_TYPE_Pos) << position);
         GPIOx->OTYPER = temp;
       }
 
       /* Activate the Pull-up or Pull down resistor for the current IO */
-      temp = GPIOx->PUPDR;
-      temp &= ~(GPIO_PUPDR_PUPD0 << (position * 2U));
-      temp |= ((GPIO_Init->Pull) << (position * 2U));
-      GPIOx->PUPDR = temp;
+      if ((GPIO_Init->Mode & GPIO_MODE) != MODE_ANALOG)
+      {
+        temp = GPIOx->PUPDR;
+        temp &= ~(GPIO_PUPDR_PUPD0 << (position * 2U));
+        temp |= ((GPIO_Init->Pull) << (position * 2U));
+        GPIOx->PUPDR = temp;
+      }
 
       /* In case of Alternate function mode selection */
-      if ((GPIO_Init->Mode == GPIO_MODE_AF_PP) || (GPIO_Init->Mode == GPIO_MODE_AF_OD))
+      if ((GPIO_Init->Mode & GPIO_MODE) == MODE_AF)
       {
         /* Check the Alternate function parameters */
         assert_param(IS_GPIO_AF_INSTANCE(GPIOx));
@@ -229,7 +223,7 @@ void HAL_GPIO_Init(GPIO_TypeDef  *GPIOx, GPIO_InitTypeDef *GPIO_Init)
 
       /*--------------------- EXTI Mode Configuration ------------------------*/
       /* Configure the External Interrupt or event for the current IO */
-      if ((GPIO_Init->Mode & EXTI_MODE) == EXTI_MODE)
+      if ((GPIO_Init->Mode & EXTI_MODE) != 0x00u)
       {
         temp = SYSCFG->EXTICR[position >> 2u];
         temp &= ~(0x07uL << (4U * (position & 0x03U)));
@@ -243,7 +237,7 @@ void HAL_GPIO_Init(GPIO_TypeDef  *GPIOx, GPIO_InitTypeDef *GPIO_Init)
         temp = EXTI->IMR1;
 #endif /* CORE_CM0PLUS */
         temp &= ~(iocurrent);
-        if ((GPIO_Init->Mode & GPIO_MODE_IT) == GPIO_MODE_IT)
+        if ((GPIO_Init->Mode & EXTI_IT) != 0x00u)
         {
           temp |= iocurrent;
         }
@@ -259,7 +253,7 @@ void HAL_GPIO_Init(GPIO_TypeDef  *GPIOx, GPIO_InitTypeDef *GPIO_Init)
         temp = EXTI->EMR1;
 #endif /* CORE_CM0PLUS */
         temp &= ~(iocurrent);
-        if ((GPIO_Init->Mode & GPIO_MODE_EVT) == GPIO_MODE_EVT)
+        if ((GPIO_Init->Mode & EXTI_EVT) != 0x00u)
         {
           temp |= iocurrent;
         }
@@ -272,7 +266,7 @@ void HAL_GPIO_Init(GPIO_TypeDef  *GPIOx, GPIO_InitTypeDef *GPIO_Init)
         /* Clear Rising Falling edge configuration */
         temp = EXTI->RTSR1;
         temp &= ~(iocurrent);
-        if ((GPIO_Init->Mode & RISING_EDGE) == RISING_EDGE)
+        if ((GPIO_Init->Mode & TRIGGER_RISING) != 0x00u)
         {
           temp |= iocurrent;
         }
@@ -280,7 +274,7 @@ void HAL_GPIO_Init(GPIO_TypeDef  *GPIOx, GPIO_InitTypeDef *GPIO_Init)
 
         temp = EXTI->FTSR1;
         temp &= ~(iocurrent);
-        if ((GPIO_Init->Mode & FALLING_EDGE) == FALLING_EDGE)
+        if ((GPIO_Init->Mode & TRIGGER_FALLING) != 0x00u)
         {
           temp |= iocurrent;
         }
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c
index 36677c94..fee81890 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c
@@ -15,16 +15,16 @@
                 ##### GTZC main features #####
   ==============================================================================
   [..]
-    (+) Global TrustZone Controller (GTZC) composed of two sub-blocks:
-      (++) TZSC: TrustZone security controller
+    (+) Global Security Controller (GTZC) composed of two sub-blocks:
+      (++) TZSC: Security controller
             This sub-block defines the secure/privileged state of slave
             peripherals. It also controls the unprivileged area size for the
             watermark memory peripheral controller (MPCWM).
-      (++) TZIC: TrustZone illegal access controller
+      (++) TZIC: Security Illegal access controller
             This sub-block gathers all illegal access events in the system and
             generates a secure interrupt towards the secure CPU2 NVIC.
 
-    (+) These sub-blocks are used to configure TrustZone system security and
+    (+) These sub-blocks are used to configure system security and
         privilege such as:
       (++) on-chip Flash memory and RAM with programmable secure or privilege or
       both area
@@ -112,7 +112,7 @@
   ==============================================================================
   [..]
     This section provides functions allowing to initialize/configure TZSC
-    TZSC: TrustZone Security Controller
+    TZSC: Security Controller
   @endverbatim
   * @{
   */
@@ -503,7 +503,7 @@ HAL_StatusTypeDef HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(uint32_t MemBaseAdd
   [..]
     This section provides functions allowing to manage the common TZSC and TZSC-MPCWM lock.
     It includes lock enable, and current value read.
-    TZSC: TrustZone Security Controller
+    TZSC: Security Controller
     MPCWM: Memory Protection Controller WaterMark
   @endverbatim
   * @{
@@ -544,7 +544,7 @@ void HAL_GTZC_TZSC_Lock(GTZC_TZSC_TypeDef *TZSCx)
   ==============================================================================
   [..]
     This section provides functions allowing to initialize/configure TZIC
-    TZIC: Trust Zone Interrupt Controller
+    TZIC: Security Interrupt Controller
   @endverbatim
   * @{
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c
index 8b3d7367..1f3bc932 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c
@@ -20,15 +20,15 @@
   ==============================================================================
   [..]
       (#)Take a semaphore In 2-Step mode Using function HAL_HSEM_Take. This function takes as parameters :
-           (++) the semaphore ID from 0 to 31
+           (++) the semaphore ID from 0 to 15
            (++) the process ID from 0 to 255
       (#) Fast Take semaphore In 1-Step mode Using function HAL_HSEM_FastTake. This function takes as parameter :
-           (++) the semaphore ID from 0_ID to 31. Note that the process ID value is implicitly assumed as zero
+           (++) the semaphore ID from 0 to 15. Note that the process ID value is implicitly assumed as zero
       (#) Check if a semaphore is Taken using function HAL_HSEM_IsSemTaken. This function takes as parameter :
-          (++) the semaphore ID from 0_ID to 31
+          (++) the semaphore ID from 0 to 15
           (++) It returns 1 if the given semaphore is taken otherwise (Free) zero
       (#)Release a semaphore using function with HAL_HSEM_Release. This function takes as parameters :
-           (++) the semaphore ID from 0 to 31
+           (++) the semaphore ID from 0 to 15
            (++) the process ID from 0 to 255:
            (++) Note: If ProcessID and MasterID match, semaphore is freed, and an interrupt
          may be generated when enabled (notification activated). If ProcessID or MasterID does not match,
@@ -144,7 +144,7 @@
 
 /**
   * @brief  Take a semaphore in 2 Step mode.
-  * @param  SemID: semaphore ID from 0 to 31
+  * @param  SemID: semaphore ID from 0 to 15
   * @param  ProcessID: Process ID from 0 to 255
   * @retval HAL status
   */
@@ -170,7 +170,7 @@ HAL_StatusTypeDef  HAL_HSEM_Take(uint32_t SemID, uint32_t ProcessID)
 
 /**
   * @brief  Fast Take a semaphore with 1 Step mode.
-  * @param  SemID: semaphore ID from 0 to 31
+  * @param  SemID: semaphore ID from 0 to 15
   * @retval HAL status
   */
 HAL_StatusTypeDef HAL_HSEM_FastTake(uint32_t SemID)
@@ -201,7 +201,7 @@ uint32_t HAL_HSEM_IsSemTaken(uint32_t SemID)
 
 /**
   * @brief  Release a semaphore.
-  * @param  SemID: semaphore ID from 0 to 31
+  * @param  SemID: semaphore ID from 0 to 15
   * @param  ProcessID: Process ID from 0 to 255
   * @retval None
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2c.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2c.c
index 17feea72..1bf9eb74 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2c.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2c.c
@@ -19,7 +19,7 @@
     (#) Declare a I2C_HandleTypeDef handle structure, for example:
         I2C_HandleTypeDef  hi2c;
 
-    (#)Initialize the I2C low level resources by implementing the @ref HAL_I2C_MspInit() API:
+    (#)Initialize the I2C low level resources by implementing the HAL_I2C_MspInit() API:
         (##) Enable the I2Cx interface clock
         (##) I2C pins configuration
             (+++) Enable the clock for the I2C GPIOs
@@ -28,7 +28,8 @@
             (+++) Configure the I2Cx interrupt priority
             (+++) Enable the NVIC I2C IRQ Channel
         (##) DMA Configuration if you need to use DMA process
-            (+++) Declare a DMA_HandleTypeDef handle structure for the transmit or receive channel
+            (+++) Declare a DMA_HandleTypeDef handle structure for
+                  the transmit or receive channel
             (+++) Enable the DMAx interface clock using
             (+++) Configure the DMA handle parameters
             (+++) Configure the DMA Tx or Rx channel
@@ -39,49 +40,49 @@
     (#) Configure the Communication Clock Timing, Own Address1, Master Addressing mode, Dual Addressing mode,
         Own Address2, Own Address2 Mask, General call and Nostretch mode in the hi2c Init structure.
 
-    (#) Initialize the I2C registers by calling the @ref HAL_I2C_Init(), configures also the low level Hardware
-        (GPIO, CLOCK, NVIC...etc) by calling the customized @ref HAL_I2C_MspInit(&hi2c) API.
+    (#) Initialize the I2C registers by calling the HAL_I2C_Init(), configures also the low level Hardware
+        (GPIO, CLOCK, NVIC...etc) by calling the customized HAL_I2C_MspInit(&hi2c) API.
 
-    (#) To check if target device is ready for communication, use the function @ref HAL_I2C_IsDeviceReady()
+    (#) To check if target device is ready for communication, use the function HAL_I2C_IsDeviceReady()
 
     (#) For I2C IO and IO MEM operations, three operation modes are available within this driver :
 
     *** Polling mode IO operation ***
     =================================
     [..]
-      (+) Transmit in master mode an amount of data in blocking mode using @ref HAL_I2C_Master_Transmit()
-      (+) Receive in master mode an amount of data in blocking mode using @ref HAL_I2C_Master_Receive()
-      (+) Transmit in slave mode an amount of data in blocking mode using @ref HAL_I2C_Slave_Transmit()
-      (+) Receive in slave mode an amount of data in blocking mode using @ref HAL_I2C_Slave_Receive()
+      (+) Transmit in master mode an amount of data in blocking mode using HAL_I2C_Master_Transmit()
+      (+) Receive in master mode an amount of data in blocking mode using HAL_I2C_Master_Receive()
+      (+) Transmit in slave mode an amount of data in blocking mode using HAL_I2C_Slave_Transmit()
+      (+) Receive in slave mode an amount of data in blocking mode using HAL_I2C_Slave_Receive()
 
     *** Polling mode IO MEM operation ***
     =====================================
     [..]
-      (+) Write an amount of data in blocking mode to a specific memory address using @ref HAL_I2C_Mem_Write()
-      (+) Read an amount of data in blocking mode from a specific memory address using @ref HAL_I2C_Mem_Read()
+      (+) Write an amount of data in blocking mode to a specific memory address using HAL_I2C_Mem_Write()
+      (+) Read an amount of data in blocking mode from a specific memory address using HAL_I2C_Mem_Read()
 
 
     *** Interrupt mode IO operation ***
     ===================================
     [..]
-      (+) Transmit in master mode an amount of data in non-blocking mode using @ref HAL_I2C_Master_Transmit_IT()
-      (+) At transmission end of transfer, @ref HAL_I2C_MasterTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MasterTxCpltCallback()
-      (+) Receive in master mode an amount of data in non-blocking mode using @ref HAL_I2C_Master_Receive_IT()
-      (+) At reception end of transfer, @ref HAL_I2C_MasterRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MasterRxCpltCallback()
-      (+) Transmit in slave mode an amount of data in non-blocking mode using @ref HAL_I2C_Slave_Transmit_IT()
-      (+) At transmission end of transfer, @ref HAL_I2C_SlaveTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_SlaveTxCpltCallback()
-      (+) Receive in slave mode an amount of data in non-blocking mode using @ref HAL_I2C_Slave_Receive_IT()
-      (+) At reception end of transfer, @ref HAL_I2C_SlaveRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_SlaveRxCpltCallback()
-      (+) In case of transfer Error, @ref HAL_I2C_ErrorCallback() function is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_ErrorCallback()
-      (+) Abort a master I2C process communication with Interrupt using @ref HAL_I2C_Master_Abort_IT()
-      (+) End of abort process, @ref HAL_I2C_AbortCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_AbortCpltCallback()
-      (+) Discard a slave I2C process communication using @ref __HAL_I2C_GENERATE_NACK() macro.
+      (+) Transmit in master mode an amount of data in non-blocking mode using HAL_I2C_Master_Transmit_IT()
+      (+) At transmission end of transfer, HAL_I2C_MasterTxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MasterTxCpltCallback()
+      (+) Receive in master mode an amount of data in non-blocking mode using HAL_I2C_Master_Receive_IT()
+      (+) At reception end of transfer, HAL_I2C_MasterRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MasterRxCpltCallback()
+      (+) Transmit in slave mode an amount of data in non-blocking mode using HAL_I2C_Slave_Transmit_IT()
+      (+) At transmission end of transfer, HAL_I2C_SlaveTxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_SlaveTxCpltCallback()
+      (+) Receive in slave mode an amount of data in non-blocking mode using HAL_I2C_Slave_Receive_IT()
+      (+) At reception end of transfer, HAL_I2C_SlaveRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_SlaveRxCpltCallback()
+      (+) In case of transfer Error, HAL_I2C_ErrorCallback() function is executed and users can
+           add their own code by customization of function pointer HAL_I2C_ErrorCallback()
+      (+) Abort a master I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
+      (+) End of abort process, HAL_I2C_AbortCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_AbortCpltCallback()
+      (+) Discard a slave I2C process communication using __HAL_I2C_GENERATE_NACK() macro.
            This action will inform Master to generate a Stop condition to discard the communication.
 
 
@@ -92,120 +93,137 @@
           when a direction change during transfer
     [..]
       (+) A specific option field manage the different steps of a sequential transfer
-      (+) Option field values are defined through @ref I2C_XFEROPTIONS and are listed below:
-      (++) I2C_FIRST_AND_LAST_FRAME: No sequential usage, functional is same as associated interfaces in no sequential mode
+      (+) Option field values are defined through I2C_XFEROPTIONS and are listed below:
+      (++) I2C_FIRST_AND_LAST_FRAME: No sequential usage, functional is same as associated interfaces in
+           no sequential mode
       (++) I2C_FIRST_FRAME: Sequential usage, this option allow to manage a sequence with start condition, address
                             and data to transfer without a final stop condition
-      (++) I2C_FIRST_AND_NEXT_FRAME: Sequential usage (Master only), this option allow to manage a sequence with start condition, address
-                            and data to transfer without a final stop condition, an then permit a call the same master sequential interface
-                            several times (like @ref HAL_I2C_Master_Seq_Transmit_IT() then @ref HAL_I2C_Master_Seq_Transmit_IT()
-                            or @ref HAL_I2C_Master_Seq_Transmit_DMA() then @ref HAL_I2C_Master_Seq_Transmit_DMA())
+      (++) I2C_FIRST_AND_NEXT_FRAME: Sequential usage (Master only), this option allow to manage a sequence with
+                            start condition, address and data to transfer without a final stop condition,
+                            an then permit a call the same master sequential interface several times
+                            (like HAL_I2C_Master_Seq_Transmit_IT() then HAL_I2C_Master_Seq_Transmit_IT()
+                            or HAL_I2C_Master_Seq_Transmit_DMA() then HAL_I2C_Master_Seq_Transmit_DMA())
       (++) I2C_NEXT_FRAME: Sequential usage, this option allow to manage a sequence with a restart condition, address
-                            and with new data to transfer if the direction change or manage only the new data to transfer
+                            and with new data to transfer if the direction change or manage only the new data to
+                            transfer
                             if no direction change and without a final stop condition in both cases
       (++) I2C_LAST_FRAME: Sequential usage, this option allow to manage a sequance with a restart condition, address
-                            and with new data to transfer if the direction change or manage only the new data to transfer
+                            and with new data to transfer if the direction change or manage only the new data to
+                            transfer
                             if no direction change and with a final stop condition in both cases
-      (++) I2C_LAST_FRAME_NO_STOP: Sequential usage (Master only), this option allow to manage a restart condition after several call of the same master sequential
-                            interface several times (link with option I2C_FIRST_AND_NEXT_FRAME).
-                            Usage can, transfer several bytes one by one using HAL_I2C_Master_Seq_Transmit_IT(option I2C_FIRST_AND_NEXT_FRAME then I2C_NEXT_FRAME)
-                              or HAL_I2C_Master_Seq_Receive_IT(option I2C_FIRST_AND_NEXT_FRAME then I2C_NEXT_FRAME)
-                              or HAL_I2C_Master_Seq_Transmit_DMA(option I2C_FIRST_AND_NEXT_FRAME then I2C_NEXT_FRAME)
-                              or HAL_I2C_Master_Seq_Receive_DMA(option I2C_FIRST_AND_NEXT_FRAME then I2C_NEXT_FRAME).
-                            Then usage of this option I2C_LAST_FRAME_NO_STOP at the last Transmit or Receive sequence permit to call the opposite interface Receive or Transmit
+      (++) I2C_LAST_FRAME_NO_STOP: Sequential usage (Master only), this option allow to manage a restart condition
+                            after several call of the same master sequential interface several times
+                            (link with option I2C_FIRST_AND_NEXT_FRAME).
+                            Usage can, transfer several bytes one by one using
+                              HAL_I2C_Master_Seq_Transmit_IT
+                              or HAL_I2C_Master_Seq_Receive_IT
+                              or HAL_I2C_Master_Seq_Transmit_DMA
+                              or HAL_I2C_Master_Seq_Receive_DMA
+                              with option I2C_FIRST_AND_NEXT_FRAME then I2C_NEXT_FRAME.
+                             Then usage of this option I2C_LAST_FRAME_NO_STOP at the last Transmit or
+                              Receive sequence permit to call the opposite interface Receive or Transmit
                               without stopping the communication and so generate a restart condition.
-      (++) I2C_OTHER_FRAME: Sequential usage (Master only), this option allow to manage a restart condition after each call of the same master sequential
+      (++) I2C_OTHER_FRAME: Sequential usage (Master only), this option allow to manage a restart condition after
+                            each call of the same master sequential
                             interface.
-                            Usage can, transfer several bytes one by one with a restart with slave address between each bytes using HAL_I2C_Master_Seq_Transmit_IT(option I2C_FIRST_FRAME then I2C_OTHER_FRAME)
-                              or HAL_I2C_Master_Seq_Receive_IT(option I2C_FIRST_FRAME then I2C_OTHER_FRAME)
-                              or HAL_I2C_Master_Seq_Transmit_DMA(option I2C_FIRST_FRAME then I2C_OTHER_FRAME)
-                              or HAL_I2C_Master_Seq_Receive_DMA(option I2C_FIRST_FRAME then I2C_OTHER_FRAME).
-                            Then usage of this option I2C_OTHER_AND_LAST_FRAME at the last frame to help automatic generation of STOP condition.
+                            Usage can, transfer several bytes one by one with a restart with slave address between
+                            each bytes using
+                              HAL_I2C_Master_Seq_Transmit_IT
+                              or HAL_I2C_Master_Seq_Receive_IT
+                              or HAL_I2C_Master_Seq_Transmit_DMA
+                              or HAL_I2C_Master_Seq_Receive_DMA
+                              with option I2C_FIRST_FRAME then I2C_OTHER_FRAME.
+                            Then usage of this option I2C_OTHER_AND_LAST_FRAME at the last frame to help automatic
+                            generation of STOP condition.
 
       (+) Different sequential I2C interfaces are listed below:
-      (++) Sequential transmit in master I2C mode an amount of data in non-blocking mode using @ref HAL_I2C_Master_Seq_Transmit_IT()
-            or using @ref HAL_I2C_Master_Seq_Transmit_DMA()
-      (+++) At transmission end of current frame transfer, @ref HAL_I2C_MasterTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MasterTxCpltCallback()
-      (++) Sequential receive in master I2C mode an amount of data in non-blocking mode using @ref HAL_I2C_Master_Seq_Receive_IT()
-            or using @ref HAL_I2C_Master_Seq_Receive_DMA()
-      (+++) At reception end of current frame transfer, @ref HAL_I2C_MasterRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MasterRxCpltCallback()
-      (++) Abort a master IT or DMA I2C process communication with Interrupt using @ref HAL_I2C_Master_Abort_IT()
-      (+++) End of abort process, @ref HAL_I2C_AbortCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_AbortCpltCallback()
-      (++) Enable/disable the Address listen mode in slave I2C mode using @ref HAL_I2C_EnableListen_IT() @ref HAL_I2C_DisableListen_IT()
-      (+++) When address slave I2C match, @ref HAL_I2C_AddrCallback() is executed and user can
-           add his own code to check the Address Match Code and the transmission direction request by master (Write/Read).
-      (+++) At Listen mode end @ref HAL_I2C_ListenCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_ListenCpltCallback()
-      (++) Sequential transmit in slave I2C mode an amount of data in non-blocking mode using @ref HAL_I2C_Slave_Seq_Transmit_IT()
-            or using @ref HAL_I2C_Slave_Seq_Transmit_DMA()
-      (+++) At transmission end of current frame transfer, @ref HAL_I2C_SlaveTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_SlaveTxCpltCallback()
-      (++) Sequential receive in slave I2C mode an amount of data in non-blocking mode using @ref HAL_I2C_Slave_Seq_Receive_IT()
-            or using @ref HAL_I2C_Slave_Seq_Receive_DMA()
-      (+++) At reception end of current frame transfer, @ref HAL_I2C_SlaveRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_SlaveRxCpltCallback()
-      (++) In case of transfer Error, @ref HAL_I2C_ErrorCallback() function is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_ErrorCallback()
-      (++) Discard a slave I2C process communication using @ref __HAL_I2C_GENERATE_NACK() macro.
+      (++) Sequential transmit in master I2C mode an amount of data in non-blocking mode using
+            HAL_I2C_Master_Seq_Transmit_IT() or using HAL_I2C_Master_Seq_Transmit_DMA()
+      (+++) At transmission end of current frame transfer, HAL_I2C_MasterTxCpltCallback() is executed and
+            users can add their own code by customization of function pointer HAL_I2C_MasterTxCpltCallback()
+      (++) Sequential receive in master I2C mode an amount of data in non-blocking mode using
+            HAL_I2C_Master_Seq_Receive_IT() or using HAL_I2C_Master_Seq_Receive_DMA()
+      (+++) At reception end of current frame transfer, HAL_I2C_MasterRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MasterRxCpltCallback()
+      (++) Abort a master IT or DMA I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
+      (+++) End of abort process, HAL_I2C_AbortCpltCallback() is executed and users can
+           add their own code by customization of function pointerHAL_I2C_AbortCpltCallback()
+      (++) Enable/disable the Address listen mode in slave I2C mode using HAL_I2C_EnableListen_IT()
+            HAL_I2C_DisableListen_IT()
+      (+++) When address slave I2C match, HAL_I2C_AddrCallback() is executed and users can
+           add their own code to check the Address Match Code and the transmission direction request by master
+           (Write/Read).
+      (+++) At Listen mode end HAL_I2C_ListenCpltCallback() is executed and users can
+          add their own code by customization of function pointer HAL_I2C_ListenCpltCallback()
+      (++) Sequential transmit in slave I2C mode an amount of data in non-blocking mode using
+            HAL_I2C_Slave_Seq_Transmit_IT()
+            or using HAL_I2C_Slave_Seq_Transmit_DMA()
+      (+++) At transmission end of current frame transfer, HAL_I2C_SlaveTxCpltCallback() is executed and
+            users can add their own code by customization of function pointer HAL_I2C_SlaveTxCpltCallback()
+      (++) Sequential receive in slave I2C mode an amount of data in non-blocking mode using
+            HAL_I2C_Slave_Seq_Receive_IT()
+            or usingHAL_I2C_Slave_Seq_Receive_DMA()
+      (+++) At reception end of current frame transfer, HAL_I2C_SlaveRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_SlaveRxCpltCallback()
+      (++) In case of transfer Error, HAL_I2C_ErrorCallback() function is executed and users can
+           add their own code by customization of function pointer HAL_I2C_ErrorCallback()
+      (++) Discard a slave I2C process communication using __HAL_I2C_GENERATE_NACK() macro.
            This action will inform Master to generate a Stop condition to discard the communication.
 
     *** Interrupt mode IO MEM operation ***
     =======================================
     [..]
       (+) Write an amount of data in non-blocking mode with Interrupt to a specific memory address using
-          @ref HAL_I2C_Mem_Write_IT()
-      (+) At Memory end of write transfer, @ref HAL_I2C_MemTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MemTxCpltCallback()
+          HAL_I2C_Mem_Write_IT()
+      (+) At Memory end of write transfer, HAL_I2C_MemTxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MemTxCpltCallback()
       (+) Read an amount of data in non-blocking mode with Interrupt from a specific memory address using
-          @ref HAL_I2C_Mem_Read_IT()
-      (+) At Memory end of read transfer, @ref HAL_I2C_MemRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MemRxCpltCallback()
-      (+) In case of transfer Error, @ref HAL_I2C_ErrorCallback() function is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_ErrorCallback()
+          HAL_I2C_Mem_Read_IT()
+      (+) At Memory end of read transfer, HAL_I2C_MemRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MemRxCpltCallback()
+      (+) In case of transfer Error, HAL_I2C_ErrorCallback() function is executed and users can
+           add their own code by customization of function pointer HAL_I2C_ErrorCallback()
 
     *** DMA mode IO operation ***
     ==============================
     [..]
       (+) Transmit in master mode an amount of data in non-blocking mode (DMA) using
-          @ref HAL_I2C_Master_Transmit_DMA()
-      (+) At transmission end of transfer, @ref HAL_I2C_MasterTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MasterTxCpltCallback()
+          HAL_I2C_Master_Transmit_DMA()
+      (+) At transmission end of transfer, HAL_I2C_MasterTxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MasterTxCpltCallback()
       (+) Receive in master mode an amount of data in non-blocking mode (DMA) using
-          @ref HAL_I2C_Master_Receive_DMA()
-      (+) At reception end of transfer, @ref HAL_I2C_MasterRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MasterRxCpltCallback()
+          HAL_I2C_Master_Receive_DMA()
+      (+) At reception end of transfer, HAL_I2C_MasterRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MasterRxCpltCallback()
       (+) Transmit in slave mode an amount of data in non-blocking mode (DMA) using
-          @ref HAL_I2C_Slave_Transmit_DMA()
-      (+) At transmission end of transfer, @ref HAL_I2C_SlaveTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_SlaveTxCpltCallback()
+          HAL_I2C_Slave_Transmit_DMA()
+      (+) At transmission end of transfer, HAL_I2C_SlaveTxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_SlaveTxCpltCallback()
       (+) Receive in slave mode an amount of data in non-blocking mode (DMA) using
-          @ref HAL_I2C_Slave_Receive_DMA()
-      (+) At reception end of transfer, @ref HAL_I2C_SlaveRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_SlaveRxCpltCallback()
-      (+) In case of transfer Error, @ref HAL_I2C_ErrorCallback() function is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_ErrorCallback()
-      (+) Abort a master I2C process communication with Interrupt using @ref HAL_I2C_Master_Abort_IT()
-      (+) End of abort process, @ref HAL_I2C_AbortCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_AbortCpltCallback()
-      (+) Discard a slave I2C process communication using @ref __HAL_I2C_GENERATE_NACK() macro.
+          HAL_I2C_Slave_Receive_DMA()
+      (+) At reception end of transfer, HAL_I2C_SlaveRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_SlaveRxCpltCallback()
+      (+) In case of transfer Error, HAL_I2C_ErrorCallback() function is executed and users can
+           add their own code by customization of function pointer HAL_I2C_ErrorCallback()
+      (+) Abort a master I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
+      (+) End of abort process, HAL_I2C_AbortCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_AbortCpltCallback()
+      (+) Discard a slave I2C process communication using __HAL_I2C_GENERATE_NACK() macro.
            This action will inform Master to generate a Stop condition to discard the communication.
 
     *** DMA mode IO MEM operation ***
     =================================
     [..]
       (+) Write an amount of data in non-blocking mode with DMA to a specific memory address using
-          @ref HAL_I2C_Mem_Write_DMA()
-      (+) At Memory end of write transfer, @ref HAL_I2C_MemTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MemTxCpltCallback()
+          HAL_I2C_Mem_Write_DMA()
+      (+) At Memory end of write transfer, HAL_I2C_MemTxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MemTxCpltCallback()
       (+) Read an amount of data in non-blocking mode with DMA from a specific memory address using
-          @ref HAL_I2C_Mem_Read_DMA()
-      (+) At Memory end of read transfer, @ref HAL_I2C_MemRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_MemRxCpltCallback()
-      (+) In case of transfer Error, @ref HAL_I2C_ErrorCallback() function is executed and user can
-           add his own code by customization of function pointer @ref HAL_I2C_ErrorCallback()
+          HAL_I2C_Mem_Read_DMA()
+      (+) At Memory end of read transfer, HAL_I2C_MemRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_I2C_MemRxCpltCallback()
+      (+) In case of transfer Error, HAL_I2C_ErrorCallback() function is executed and users can
+           add their own code by customization of function pointer HAL_I2C_ErrorCallback()
 
 
      *** I2C HAL driver macros list ***
@@ -213,23 +231,23 @@
      [..]
        Below the list of most used macros in I2C HAL driver.
 
-      (+) @ref __HAL_I2C_ENABLE: Enable the I2C peripheral
-      (+) @ref __HAL_I2C_DISABLE: Disable the I2C peripheral
-      (+) @ref __HAL_I2C_GENERATE_NACK: Generate a Non-Acknowledge I2C peripheral in Slave mode
-      (+) @ref __HAL_I2C_GET_FLAG: Check whether the specified I2C flag is set or not
-      (+) @ref __HAL_I2C_CLEAR_FLAG: Clear the specified I2C pending flag
-      (+) @ref __HAL_I2C_ENABLE_IT: Enable the specified I2C interrupt
-      (+) @ref __HAL_I2C_DISABLE_IT: Disable the specified I2C interrupt
+      (+) __HAL_I2C_ENABLE: Enable the I2C peripheral
+      (+) __HAL_I2C_DISABLE: Disable the I2C peripheral
+      (+) __HAL_I2C_GENERATE_NACK: Generate a Non-Acknowledge I2C peripheral in Slave mode
+      (+) __HAL_I2C_GET_FLAG: Check whether the specified I2C flag is set or not
+      (+) __HAL_I2C_CLEAR_FLAG: Clear the specified I2C pending flag
+      (+) __HAL_I2C_ENABLE_IT: Enable the specified I2C interrupt
+      (+) __HAL_I2C_DISABLE_IT: Disable the specified I2C interrupt
 
      *** Callback registration ***
      =============================================
     [..]
      The compilation flag USE_HAL_I2C_REGISTER_CALLBACKS when set to 1
      allows the user to configure dynamically the driver callbacks.
-     Use Functions @ref HAL_I2C_RegisterCallback() or @ref HAL_I2C_RegisterAddrCallback()
+     Use Functions HAL_I2C_RegisterCallback() or HAL_I2C_RegisterAddrCallback()
      to register an interrupt callback.
     [..]
-     Function @ref HAL_I2C_RegisterCallback() allows to register following callbacks:
+     Function HAL_I2C_RegisterCallback() allows to register following callbacks:
        (+) MasterTxCpltCallback : callback for Master transmission end of transfer.
        (+) MasterRxCpltCallback : callback for Master reception end of transfer.
        (+) SlaveTxCpltCallback  : callback for Slave transmission end of transfer.
@@ -244,11 +262,11 @@
      This function takes as parameters the HAL peripheral handle, the Callback ID
      and a pointer to the user callback function.
     [..]
-     For specific callback AddrCallback use dedicated register callbacks : @ref HAL_I2C_RegisterAddrCallback().
+     For specific callback AddrCallback use dedicated register callbacks : HAL_I2C_RegisterAddrCallback().
     [..]
-     Use function @ref HAL_I2C_UnRegisterCallback to reset a callback to the default
+     Use function HAL_I2C_UnRegisterCallback to reset a callback to the default
      weak function.
-     @ref HAL_I2C_UnRegisterCallback takes as parameters the HAL peripheral handle,
+     HAL_I2C_UnRegisterCallback takes as parameters the HAL peripheral handle,
      and the Callback ID.
      This function allows to reset following callbacks:
        (+) MasterTxCpltCallback : callback for Master transmission end of transfer.
@@ -263,24 +281,24 @@
        (+) MspInitCallback      : callback for Msp Init.
        (+) MspDeInitCallback    : callback for Msp DeInit.
     [..]
-     For callback AddrCallback use dedicated register callbacks : @ref HAL_I2C_UnRegisterAddrCallback().
+     For callback AddrCallback use dedicated register callbacks : HAL_I2C_UnRegisterAddrCallback().
     [..]
-     By default, after the @ref HAL_I2C_Init() and when the state is @ref HAL_I2C_STATE_RESET
+     By default, after the HAL_I2C_Init() and when the state is HAL_I2C_STATE_RESET
      all callbacks are set to the corresponding weak functions:
-     examples @ref HAL_I2C_MasterTxCpltCallback(), @ref HAL_I2C_MasterRxCpltCallback().
+     examples HAL_I2C_MasterTxCpltCallback(), HAL_I2C_MasterRxCpltCallback().
      Exception done for MspInit and MspDeInit functions that are
-     reset to the legacy weak functions in the @ref HAL_I2C_Init()/ @ref HAL_I2C_DeInit() only when
+     reset to the legacy weak functions in the HAL_I2C_Init()/ HAL_I2C_DeInit() only when
      these callbacks are null (not registered beforehand).
-     If MspInit or MspDeInit are not null, the @ref HAL_I2C_Init()/ @ref HAL_I2C_DeInit()
+     If MspInit or MspDeInit are not null, the HAL_I2C_Init()/ HAL_I2C_DeInit()
      keep and use the user MspInit/MspDeInit callbacks (registered beforehand) whatever the state.
     [..]
-     Callbacks can be registered/unregistered in @ref HAL_I2C_STATE_READY state only.
+     Callbacks can be registered/unregistered in HAL_I2C_STATE_READY state only.
      Exception done MspInit/MspDeInit functions that can be registered/unregistered
-     in @ref HAL_I2C_STATE_READY or @ref HAL_I2C_STATE_RESET state,
+     in HAL_I2C_STATE_READY or HAL_I2C_STATE_RESET state,
      thus registered (user) MspInit/DeInit callbacks can be used during the Init/DeInit.
      Then, the user first registers the MspInit/MspDeInit user callbacks
-     using @ref HAL_I2C_RegisterCallback() before calling @ref HAL_I2C_DeInit()
-     or @ref HAL_I2C_Init() function.
+     using HAL_I2C_RegisterCallback() before calling HAL_I2C_DeInit()
+     or HAL_I2C_Init() function.
     [..]
      When the compilation flag USE_HAL_I2C_REGISTER_CALLBACKS is set to 0 or
      not defined, the callback registration feature is not available and all callbacks
@@ -336,28 +354,48 @@
 #define I2C_TIMEOUT_FLAG    (25U)          /*!< 25 ms */
 
 #define MAX_NBYTE_SIZE      255U
-#define SlaveAddr_SHIFT     7U
-#define SlaveAddr_MSK       0x06U
+#define SLAVE_ADDR_SHIFT     7U
+#define SLAVE_ADDR_MSK       0x06U
 
 /* Private define for @ref PreviousState usage */
-#define I2C_STATE_MSK             ((uint32_t)((uint32_t)((uint32_t)HAL_I2C_STATE_BUSY_TX | (uint32_t)HAL_I2C_STATE_BUSY_RX) & (uint32_t)(~((uint32_t)HAL_I2C_STATE_READY)))) /*!< Mask State define, keep only RX and TX bits            */
-#define I2C_STATE_NONE            ((uint32_t)(HAL_I2C_MODE_NONE))                                                        /*!< Default Value                                          */
-#define I2C_STATE_MASTER_BUSY_TX  ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_TX & I2C_STATE_MSK) | (uint32_t)HAL_I2C_MODE_MASTER))            /*!< Master Busy TX, combinaison of State LSB and Mode enum */
-#define I2C_STATE_MASTER_BUSY_RX  ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_RX & I2C_STATE_MSK) | (uint32_t)HAL_I2C_MODE_MASTER))            /*!< Master Busy RX, combinaison of State LSB and Mode enum */
-#define I2C_STATE_SLAVE_BUSY_TX   ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_TX & I2C_STATE_MSK) | (uint32_t)HAL_I2C_MODE_SLAVE))             /*!< Slave Busy TX, combinaison of State LSB and Mode enum  */
-#define I2C_STATE_SLAVE_BUSY_RX   ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_RX & I2C_STATE_MSK) | (uint32_t)HAL_I2C_MODE_SLAVE))             /*!< Slave Busy RX, combinaison of State LSB and Mode enum  */
-#define I2C_STATE_MEM_BUSY_TX     ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_TX & I2C_STATE_MSK) | (uint32_t)HAL_I2C_MODE_MEM))               /*!< Memory Busy TX, combinaison of State LSB and Mode enum */
-#define I2C_STATE_MEM_BUSY_RX     ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_RX & I2C_STATE_MSK) | (uint32_t)HAL_I2C_MODE_MEM))               /*!< Memory Busy RX, combinaison of State LSB and Mode enum */
+#define I2C_STATE_MSK             ((uint32_t)((uint32_t)((uint32_t)HAL_I2C_STATE_BUSY_TX | \
+                                                         (uint32_t)HAL_I2C_STATE_BUSY_RX) & \
+                                              (uint32_t)(~((uint32_t)HAL_I2C_STATE_READY))))
+/*!< Mask State define, keep only RX and TX bits */
+#define I2C_STATE_NONE            ((uint32_t)(HAL_I2C_MODE_NONE))
+/*!< Default Value */
+#define I2C_STATE_MASTER_BUSY_TX  ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_TX & I2C_STATE_MSK) | \
+                                              (uint32_t)HAL_I2C_MODE_MASTER))
+/*!< Master Busy TX, combinaison of State LSB and Mode enum */
+#define I2C_STATE_MASTER_BUSY_RX  ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_RX & I2C_STATE_MSK) | \
+                                              (uint32_t)HAL_I2C_MODE_MASTER))
+/*!< Master Busy RX, combinaison of State LSB and Mode enum */
+#define I2C_STATE_SLAVE_BUSY_TX   ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_TX & I2C_STATE_MSK) | \
+                                              (uint32_t)HAL_I2C_MODE_SLAVE))
+/*!< Slave Busy TX, combinaison of State LSB and Mode enum */
+#define I2C_STATE_SLAVE_BUSY_RX   ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_RX & I2C_STATE_MSK) | \
+                                              (uint32_t)HAL_I2C_MODE_SLAVE))
+/*!< Slave Busy RX, combinaison of State LSB and Mode enum  */
+#define I2C_STATE_MEM_BUSY_TX     ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_TX & I2C_STATE_MSK) | \
+                                              (uint32_t)HAL_I2C_MODE_MEM))
+/*!< Memory Busy TX, combinaison of State LSB and Mode enum */
+#define I2C_STATE_MEM_BUSY_RX     ((uint32_t)(((uint32_t)HAL_I2C_STATE_BUSY_RX & I2C_STATE_MSK) | \
+                                              (uint32_t)HAL_I2C_MODE_MEM))
+/*!< Memory Busy RX, combinaison of State LSB and Mode enum */
 
 
 /* Private define to centralize the enable/disable of Interrupts */
-#define I2C_XFER_TX_IT          (uint16_t)(0x0001U)   /* Bit field can be combinated with @ref I2C_XFER_LISTEN_IT */
-#define I2C_XFER_RX_IT          (uint16_t)(0x0002U)   /* Bit field can be combinated with @ref I2C_XFER_LISTEN_IT */
-#define I2C_XFER_LISTEN_IT      (uint16_t)(0x8000U)   /* Bit field can be combinated with @ref I2C_XFER_TX_IT and @ref I2C_XFER_RX_IT */
-
-#define I2C_XFER_ERROR_IT       (uint16_t)(0x0010U)   /* Bit definition to manage addition of global Error and NACK treatment */
-#define I2C_XFER_CPLT_IT        (uint16_t)(0x0020U)   /* Bit definition to manage only STOP evenement */
-#define I2C_XFER_RELOAD_IT      (uint16_t)(0x0040U)   /* Bit definition to manage only Reload of NBYTE */
+#define I2C_XFER_TX_IT          (uint16_t)(0x0001U)   /*!< Bit field can be combinated with
+                                                         @ref I2C_XFER_LISTEN_IT */
+#define I2C_XFER_RX_IT          (uint16_t)(0x0002U)   /*!< Bit field can be combinated with
+                                                         @ref I2C_XFER_LISTEN_IT */
+#define I2C_XFER_LISTEN_IT      (uint16_t)(0x8000U)   /*!< Bit field can be combinated with @ref I2C_XFER_TX_IT
+                                                         and @ref I2C_XFER_RX_IT */
+
+#define I2C_XFER_ERROR_IT       (uint16_t)(0x0010U)   /*!< Bit definition to manage addition of global Error
+                                                         and NACK treatment */
+#define I2C_XFER_CPLT_IT        (uint16_t)(0x0020U)   /*!< Bit definition to manage only STOP evenement */
+#define I2C_XFER_RELOAD_IT      (uint16_t)(0x0040U)   /*!< Bit definition to manage only Reload of NBYTE */
 
 /* Private define Sequential Transfer Options default/reset value */
 #define I2C_NO_OPTION_FRAME     (0xFFFF0000U)
@@ -390,24 +428,34 @@ static void I2C_ITListenCplt(I2C_HandleTypeDef *hi2c, uint32_t ITFlags);
 static void I2C_ITError(I2C_HandleTypeDef *hi2c, uint32_t ErrorCode);
 
 /* Private functions to handle IT transfer */
-static HAL_StatusTypeDef I2C_RequestMemoryWrite(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress,
-                                                uint16_t MemAddSize, uint32_t Timeout, uint32_t Tickstart);
-static HAL_StatusTypeDef I2C_RequestMemoryRead(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress,
-                                               uint16_t MemAddSize, uint32_t Timeout, uint32_t Tickstart);
+static HAL_StatusTypeDef I2C_RequestMemoryWrite(I2C_HandleTypeDef *hi2c, uint16_t DevAddress,
+                                                uint16_t MemAddress, uint16_t MemAddSize, uint32_t Timeout,
+                                                uint32_t Tickstart);
+static HAL_StatusTypeDef I2C_RequestMemoryRead(I2C_HandleTypeDef *hi2c, uint16_t DevAddress,
+                                               uint16_t MemAddress, uint16_t MemAddSize, uint32_t Timeout,
+                                               uint32_t Tickstart);
 
 /* Private functions for I2C transfer IRQ handler */
-static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources);
-static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources);
-static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources);
-static HAL_StatusTypeDef I2C_Slave_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources);
+static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags,
+                                           uint32_t ITSources);
+static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags,
+                                          uint32_t ITSources);
+static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags,
+                                            uint32_t ITSources);
+static HAL_StatusTypeDef I2C_Slave_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags,
+                                           uint32_t ITSources);
 
 /* Private functions to handle flags during polling transfer */
 static HAL_StatusTypeDef I2C_WaitOnFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Flag, FlagStatus Status,
                                                     uint32_t Timeout, uint32_t Tickstart);
-static HAL_StatusTypeDef I2C_WaitOnTXISFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart);
-static HAL_StatusTypeDef I2C_WaitOnRXNEFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart);
-static HAL_StatusTypeDef I2C_WaitOnSTOPFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart);
-static HAL_StatusTypeDef I2C_IsAcknowledgeFailed(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart);
+static HAL_StatusTypeDef I2C_WaitOnTXISFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout,
+                                                        uint32_t Tickstart);
+static HAL_StatusTypeDef I2C_WaitOnRXNEFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout,
+                                                        uint32_t Tickstart);
+static HAL_StatusTypeDef I2C_WaitOnSTOPFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout,
+                                                        uint32_t Tickstart);
+static HAL_StatusTypeDef I2C_IsAcknowledgeFailed(I2C_HandleTypeDef *hi2c, uint32_t Timeout,
+                                                 uint32_t Tickstart);
 
 /* Private functions to centralize the enable/disable of Interrupts */
 static void I2C_Enable_IRQ(I2C_HandleTypeDef *hi2c, uint16_t InterruptRequest);
@@ -559,7 +607,8 @@ HAL_StatusTypeDef HAL_I2C_Init(I2C_HandleTypeDef *hi2c)
   hi2c->Instance->OAR2 &= ~I2C_DUALADDRESS_ENABLE;
 
   /* Configure I2Cx: Dual mode and Own Address2 */
-  hi2c->Instance->OAR2 = (hi2c->Init.DualAddressMode | hi2c->Init.OwnAddress2 | (hi2c->Init.OwnAddress2Masks << 8));
+  hi2c->Instance->OAR2 = (hi2c->Init.DualAddressMode | hi2c->Init.OwnAddress2 | \
+                          (hi2c->Init.OwnAddress2Masks << 8));
 
   /*---------------------------- I2Cx CR1 Configuration ----------------------*/
   /* Configure I2Cx: Generalcall and NoStretch mode */
@@ -1065,8 +1114,8 @@ HAL_StatusTypeDef HAL_I2C_UnRegisterAddrCallback(I2C_HandleTypeDef *hi2c)
   * @param  Timeout Timeout duration
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size,
-                                          uint32_t Timeout)
+HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData,
+                                          uint16_t Size, uint32_t Timeout)
 {
   uint32_t tickstart;
 
@@ -1097,12 +1146,14 @@ HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevA
     if (hi2c->XferCount > MAX_NBYTE_SIZE)
     {
       hi2c->XferSize = MAX_NBYTE_SIZE;
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE, I2C_GENERATE_START_WRITE);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE,
+                         I2C_GENERATE_START_WRITE);
     }
     else
     {
       hi2c->XferSize = hi2c->XferCount;
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_GENERATE_START_WRITE);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                         I2C_GENERATE_START_WRITE);
     }
 
     while (hi2c->XferCount > 0U)
@@ -1132,12 +1183,14 @@ HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevA
         if (hi2c->XferCount > MAX_NBYTE_SIZE)
         {
           hi2c->XferSize = MAX_NBYTE_SIZE;
-          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE,
+                             I2C_NO_STARTSTOP);
         }
         else
         {
           hi2c->XferSize = hi2c->XferCount;
-          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                             I2C_NO_STARTSTOP);
         }
       }
     }
@@ -1180,8 +1233,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevA
   * @param  Timeout Timeout duration
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size,
-                                         uint32_t Timeout)
+HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData,
+                                         uint16_t Size, uint32_t Timeout)
 {
   uint32_t tickstart;
 
@@ -1212,12 +1265,14 @@ HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAd
     if (hi2c->XferCount > MAX_NBYTE_SIZE)
     {
       hi2c->XferSize = MAX_NBYTE_SIZE;
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE, I2C_GENERATE_START_READ);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE,
+                         I2C_GENERATE_START_READ);
     }
     else
     {
       hi2c->XferSize = hi2c->XferCount;
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_GENERATE_START_READ);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                         I2C_GENERATE_START_READ);
     }
 
     while (hi2c->XferCount > 0U)
@@ -1248,12 +1303,14 @@ HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAd
         if (hi2c->XferCount > MAX_NBYTE_SIZE)
         {
           hi2c->XferSize = MAX_NBYTE_SIZE;
-          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE,
+                             I2C_NO_STARTSTOP);
         }
         else
         {
           hi2c->XferSize = hi2c->XferCount;
-          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                             I2C_NO_STARTSTOP);
         }
       }
     }
@@ -1294,7 +1351,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAd
   * @param  Timeout Timeout duration
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout)
+HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size,
+                                         uint32_t Timeout)
 {
   uint32_t tickstart;
 
@@ -1431,7 +1489,8 @@ HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData
   * @param  Timeout Timeout duration
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_I2C_Slave_Receive(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout)
+HAL_StatusTypeDef HAL_I2C_Slave_Receive(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size,
+                                        uint32_t Timeout)
 {
   uint32_t tickstart;
 
@@ -1606,7 +1665,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t D
 
     /* Enable ERR, TC, STOP, NACK, TXI interrupt */
     /* possible to enable all of these */
-    /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+    /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+      I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
     I2C_Enable_IRQ(hi2c, I2C_XFER_TX_IT);
 
     return HAL_OK;
@@ -1627,7 +1687,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t D
   * @param  Size Amount of data to be sent
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_I2C_Master_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size)
+HAL_StatusTypeDef HAL_I2C_Master_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData,
+                                            uint16_t Size)
 {
   uint32_t xfermode;
 
@@ -1675,7 +1736,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t De
 
     /* Enable ERR, TC, STOP, NACK, RXI interrupt */
     /* possible to enable all of these */
-    /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+    /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+      I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
     I2C_Enable_IRQ(hi2c, I2C_XFER_RX_IT);
 
     return HAL_OK;
@@ -1724,7 +1786,8 @@ HAL_StatusTypeDef HAL_I2C_Slave_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pD
 
     /* Enable ERR, TC, STOP, NACK, TXI interrupt */
     /* possible to enable all of these */
-    /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+    /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+      I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
     I2C_Enable_IRQ(hi2c, I2C_XFER_TX_IT | I2C_XFER_LISTEN_IT);
 
     return HAL_OK;
@@ -1773,7 +1836,8 @@ HAL_StatusTypeDef HAL_I2C_Slave_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pDa
 
     /* Enable ERR, TC, STOP, NACK, RXI interrupt */
     /* possible to enable all of these */
-    /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+    /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+      I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
     I2C_Enable_IRQ(hi2c, I2C_XFER_RX_IT | I2C_XFER_LISTEN_IT);
 
     return HAL_OK;
@@ -1846,7 +1910,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t
         hi2c->hdmatx->XferAbortCallback = NULL;
 
         /* Enable the DMA channel */
-        dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR, hi2c->XferSize);
+        dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR,
+                                         hi2c->XferSize);
       }
       else
       {
@@ -1906,7 +1971,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t
 
       /* Send Slave Address */
       /* Set NBYTES to write and generate START condition */
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_GENERATE_START_WRITE);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                         I2C_GENERATE_START_WRITE);
 
       /* Process Unlocked */
       __HAL_UNLOCK(hi2c);
@@ -1916,7 +1982,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t
                 process unlock */
       /* Enable ERR, TC, STOP, NACK, TXI interrupt */
       /* possible to enable all of these */
-      /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+      /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+        I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
       I2C_Enable_IRQ(hi2c, I2C_XFER_TX_IT);
     }
 
@@ -1990,7 +2057,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t D
         hi2c->hdmarx->XferAbortCallback = NULL;
 
         /* Enable the DMA channel */
-        dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData, hi2c->XferSize);
+        dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData,
+                                         hi2c->XferSize);
       }
       else
       {
@@ -2050,7 +2118,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t D
 
       /* Send Slave Address */
       /* Set NBYTES to read and generate START condition */
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_GENERATE_START_READ);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                         I2C_GENERATE_START_READ);
 
       /* Process Unlocked */
       __HAL_UNLOCK(hi2c);
@@ -2060,7 +2129,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t D
                 process unlock */
       /* Enable ERR, TC, STOP, NACK, TXI interrupt */
       /* possible to enable all of these */
-      /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+      /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+        I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
       I2C_Enable_IRQ(hi2c, I2C_XFER_TX_IT);
     }
 
@@ -2118,7 +2188,8 @@ HAL_StatusTypeDef HAL_I2C_Slave_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint8_t *p
       hi2c->hdmatx->XferAbortCallback = NULL;
 
       /* Enable the DMA channel */
-      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR, hi2c->XferSize);
+      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR,
+                                       hi2c->XferSize);
     }
     else
     {
@@ -2221,7 +2292,8 @@ HAL_StatusTypeDef HAL_I2C_Slave_Receive_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pD
       hi2c->hdmarx->XferAbortCallback = NULL;
 
       /* Enable the DMA channel */
-      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData, hi2c->XferSize);
+      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData,
+                                       hi2c->XferSize);
     }
     else
     {
@@ -2374,12 +2446,14 @@ HAL_StatusTypeDef HAL_I2C_Mem_Write(I2C_HandleTypeDef *hi2c, uint16_t DevAddress
         if (hi2c->XferCount > MAX_NBYTE_SIZE)
         {
           hi2c->XferSize = MAX_NBYTE_SIZE;
-          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE,
+                             I2C_NO_STARTSTOP);
         }
         else
         {
           hi2c->XferSize = hi2c->XferCount;
-          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                             I2C_NO_STARTSTOP);
         }
       }
 
@@ -2474,12 +2548,14 @@ HAL_StatusTypeDef HAL_I2C_Mem_Read(I2C_HandleTypeDef *hi2c, uint16_t DevAddress,
     if (hi2c->XferCount > MAX_NBYTE_SIZE)
     {
       hi2c->XferSize = MAX_NBYTE_SIZE;
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE, I2C_GENERATE_START_READ);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_RELOAD_MODE,
+                         I2C_GENERATE_START_READ);
     }
     else
     {
       hi2c->XferSize = hi2c->XferCount;
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_GENERATE_START_READ);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                         I2C_GENERATE_START_READ);
     }
 
     do
@@ -2510,12 +2586,14 @@ HAL_StatusTypeDef HAL_I2C_Mem_Read(I2C_HandleTypeDef *hi2c, uint16_t DevAddress,
         if (hi2c->XferCount > MAX_NBYTE_SIZE)
         {
           hi2c->XferSize = MAX_NBYTE_SIZE;
-          I2C_TransferConfig(hi2c, DevAddress, (uint8_t) hi2c->XferSize, I2C_RELOAD_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, DevAddress, (uint8_t) hi2c->XferSize, I2C_RELOAD_MODE,
+                             I2C_NO_STARTSTOP);
         }
         else
         {
           hi2c->XferSize = hi2c->XferCount;
-          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                             I2C_NO_STARTSTOP);
         }
       }
     } while (hi2c->XferCount > 0U);
@@ -2608,7 +2686,8 @@ HAL_StatusTypeDef HAL_I2C_Mem_Write_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddr
     }
 
     /* Send Slave Address and Memory Address */
-    if (I2C_RequestMemoryWrite(hi2c, DevAddress, MemAddress, MemAddSize, I2C_TIMEOUT_FLAG, tickstart) != HAL_OK)
+    if (I2C_RequestMemoryWrite(hi2c, DevAddress, MemAddress, MemAddSize, I2C_TIMEOUT_FLAG, tickstart)
+        != HAL_OK)
     {
       /* Process Unlocked */
       __HAL_UNLOCK(hi2c);
@@ -2627,7 +2706,8 @@ HAL_StatusTypeDef HAL_I2C_Mem_Write_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddr
 
     /* Enable ERR, TC, STOP, NACK, TXI interrupt */
     /* possible to enable all of these */
-    /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+    /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+      I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
     I2C_Enable_IRQ(hi2c, I2C_XFER_TX_IT);
 
     return HAL_OK;
@@ -2719,7 +2799,8 @@ HAL_StatusTypeDef HAL_I2C_Mem_Read_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddre
 
     /* Enable ERR, TC, STOP, NACK, RXI interrupt */
     /* possible to enable all of these */
-    /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+    /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+      I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
     I2C_Enable_IRQ(hi2c, I2C_XFER_RX_IT);
 
     return HAL_OK;
@@ -2792,7 +2873,8 @@ HAL_StatusTypeDef HAL_I2C_Mem_Write_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAdd
     }
 
     /* Send Slave Address and Memory Address */
-    if (I2C_RequestMemoryWrite(hi2c, DevAddress, MemAddress, MemAddSize, I2C_TIMEOUT_FLAG, tickstart) != HAL_OK)
+    if (I2C_RequestMemoryWrite(hi2c, DevAddress, MemAddress, MemAddSize, I2C_TIMEOUT_FLAG, tickstart)
+        != HAL_OK)
     {
       /* Process Unlocked */
       __HAL_UNLOCK(hi2c);
@@ -2813,7 +2895,8 @@ HAL_StatusTypeDef HAL_I2C_Mem_Write_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAdd
       hi2c->hdmatx->XferAbortCallback = NULL;
 
       /* Enable the DMA channel */
-      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR, hi2c->XferSize);
+      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR,
+                                       hi2c->XferSize);
     }
     else
     {
@@ -2957,7 +3040,8 @@ HAL_StatusTypeDef HAL_I2C_Mem_Read_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddr
       hi2c->hdmarx->XferAbortCallback = NULL;
 
       /* Enable the DMA channel */
-      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData, hi2c->XferSize);
+      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData,
+                                       hi2c->XferSize);
     }
     else
     {
@@ -3028,7 +3112,8 @@ HAL_StatusTypeDef HAL_I2C_Mem_Read_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddr
   * @param  Timeout Timeout duration
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_I2C_IsDeviceReady(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint32_t Trials, uint32_t Timeout)
+HAL_StatusTypeDef HAL_I2C_IsDeviceReady(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint32_t Trials,
+                                        uint32_t Timeout)
 {
   uint32_t tickstart;
 
@@ -3205,9 +3290,11 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16
       xfermode = hi2c->XferOptions;
     }
 
-    /* If transfer direction not change and there is no request to start another frame, do not generate Restart Condition */
+    /* If transfer direction not change and there is no request to start another frame,
+       do not generate Restart Condition */
     /* Mean Previous state is same as current state */
-    if ((hi2c->PreviousState == I2C_STATE_MASTER_BUSY_TX) && (IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(XferOptions) == 0))
+    if ((hi2c->PreviousState == I2C_STATE_MASTER_BUSY_TX) && \
+        (IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(XferOptions) == 0))
     {
       xferrequest = I2C_NO_STARTSTOP;
     }
@@ -3291,9 +3378,11 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint1
       xfermode = hi2c->XferOptions;
     }
 
-    /* If transfer direction not change and there is no request to start another frame, do not generate Restart Condition */
+    /* If transfer direction not change and there is no request to start another frame,
+       do not generate Restart Condition */
     /* Mean Previous state is same as current state */
-    if ((hi2c->PreviousState == I2C_STATE_MASTER_BUSY_TX) && (IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(XferOptions) == 0))
+    if ((hi2c->PreviousState == I2C_STATE_MASTER_BUSY_TX) && \
+        (IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(XferOptions) == 0))
     {
       xferrequest = I2C_NO_STARTSTOP;
     }
@@ -3324,7 +3413,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint1
         hi2c->hdmatx->XferAbortCallback = NULL;
 
         /* Enable the DMA channel */
-        dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR, hi2c->XferSize);
+        dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR,
+                                         hi2c->XferSize);
       }
       else
       {
@@ -3383,7 +3473,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint1
 
       /* Send Slave Address */
       /* Set NBYTES to write and generate START condition */
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_GENERATE_START_WRITE);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                         I2C_GENERATE_START_WRITE);
 
       /* Process Unlocked */
       __HAL_UNLOCK(hi2c);
@@ -3393,7 +3484,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint1
                 process unlock */
       /* Enable ERR, TC, STOP, NACK, TXI interrupt */
       /* possible to enable all of these */
-      /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+      /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+        I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
       I2C_Enable_IRQ(hi2c, I2C_XFER_TX_IT);
     }
 
@@ -3453,9 +3545,11 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_
       xfermode = hi2c->XferOptions;
     }
 
-    /* If transfer direction not change and there is no request to start another frame, do not generate Restart Condition */
+    /* If transfer direction not change and there is no request to start another frame,
+       do not generate Restart Condition */
     /* Mean Previous state is same as current state */
-    if ((hi2c->PreviousState == I2C_STATE_MASTER_BUSY_RX) && (IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(XferOptions) == 0))
+    if ((hi2c->PreviousState == I2C_STATE_MASTER_BUSY_RX) && \
+        (IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(XferOptions) == 0))
     {
       xferrequest = I2C_NO_STARTSTOP;
     }
@@ -3539,9 +3633,11 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16
       xfermode = hi2c->XferOptions;
     }
 
-    /* If transfer direction not change and there is no request to start another frame, do not generate Restart Condition */
+    /* If transfer direction not change and there is no request to start another frame,
+       do not generate Restart Condition */
     /* Mean Previous state is same as current state */
-    if ((hi2c->PreviousState == I2C_STATE_MASTER_BUSY_RX) && (IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(XferOptions) == 0))
+    if ((hi2c->PreviousState == I2C_STATE_MASTER_BUSY_RX) && \
+        (IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(XferOptions) == 0))
     {
       xferrequest = I2C_NO_STARTSTOP;
     }
@@ -3572,7 +3668,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16
         hi2c->hdmarx->XferAbortCallback = NULL;
 
         /* Enable the DMA channel */
-        dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData, hi2c->XferSize);
+        dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData,
+                                         hi2c->XferSize);
       }
       else
       {
@@ -3631,7 +3728,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16
 
       /* Send Slave Address */
       /* Set NBYTES to read and generate START condition */
-      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_GENERATE_START_READ);
+      I2C_TransferConfig(hi2c, DevAddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE,
+                         I2C_GENERATE_START_READ);
 
       /* Process Unlocked */
       __HAL_UNLOCK(hi2c);
@@ -3641,7 +3739,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16
                 process unlock */
       /* Enable ERR, TC, STOP, NACK, TXI interrupt */
       /* possible to enable all of these */
-      /* I2C_IT_ERRI | I2C_IT_TCI| I2C_IT_STOPI| I2C_IT_NACKI | I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
+      /* I2C_IT_ERRI | I2C_IT_TCI | I2C_IT_STOPI | I2C_IT_NACKI |
+        I2C_IT_ADDRI | I2C_IT_RXI | I2C_IT_TXI */
       I2C_Enable_IRQ(hi2c, I2C_XFER_TX_IT);
     }
 
@@ -3862,7 +3961,8 @@ HAL_StatusTypeDef HAL_I2C_Slave_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint8_
       hi2c->hdmatx->XferAbortCallback = NULL;
 
       /* Enable the DMA channel */
-      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR, hi2c->XferSize);
+      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)pData, (uint32_t)&hi2c->Instance->TXDR,
+                                       hi2c->XferSize);
     }
     else
     {
@@ -4138,7 +4238,8 @@ HAL_StatusTypeDef HAL_I2C_Slave_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint8_t
       hi2c->hdmarx->XferAbortCallback = NULL;
 
       /* Enable the DMA channel */
-      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)pData, hi2c->XferSize);
+      dmaxferstatus = HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR,
+                                       (uint32_t)pData, hi2c->XferSize);
     }
     else
     {
@@ -4356,7 +4457,8 @@ void HAL_I2C_ER_IRQHandler(I2C_HandleTypeDef *hi2c)
   uint32_t tmperror;
 
   /* I2C Bus error interrupt occurred ------------------------------------*/
-  if ((I2C_CHECK_FLAG(itflags, I2C_FLAG_BERR) != RESET) && (I2C_CHECK_IT_SOURCE(itsources, I2C_IT_ERRI) != RESET))
+  if ((I2C_CHECK_FLAG(itflags, I2C_FLAG_BERR) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(itsources, I2C_IT_ERRI) != RESET))
   {
     hi2c->ErrorCode |= HAL_I2C_ERROR_BERR;
 
@@ -4365,7 +4467,8 @@ void HAL_I2C_ER_IRQHandler(I2C_HandleTypeDef *hi2c)
   }
 
   /* I2C Over-Run/Under-Run interrupt occurred ----------------------------------------*/
-  if ((I2C_CHECK_FLAG(itflags, I2C_FLAG_OVR) != RESET) && (I2C_CHECK_IT_SOURCE(itsources, I2C_IT_ERRI) != RESET))
+  if ((I2C_CHECK_FLAG(itflags, I2C_FLAG_OVR) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(itsources, I2C_IT_ERRI) != RESET))
   {
     hi2c->ErrorCode |= HAL_I2C_ERROR_OVR;
 
@@ -4374,7 +4477,8 @@ void HAL_I2C_ER_IRQHandler(I2C_HandleTypeDef *hi2c)
   }
 
   /* I2C Arbitration Loss error interrupt occurred -------------------------------------*/
-  if ((I2C_CHECK_FLAG(itflags, I2C_FLAG_ARLO) != RESET) && (I2C_CHECK_IT_SOURCE(itsources, I2C_IT_ERRI) != RESET))
+  if ((I2C_CHECK_FLAG(itflags, I2C_FLAG_ARLO) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(itsources, I2C_IT_ERRI) != RESET))
   {
     hi2c->ErrorCode |= HAL_I2C_ERROR_ARLO;
 
@@ -4628,7 +4732,8 @@ uint32_t HAL_I2C_GetError(I2C_HandleTypeDef *hi2c)
   * @param  ITSources Interrupt sources enabled.
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources)
+static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags,
+                                           uint32_t ITSources)
 {
   uint16_t devaddress;
   uint32_t tmpITFlags = ITFlags;
@@ -4636,7 +4741,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uin
   /* Process Locked */
   __HAL_LOCK(hi2c);
 
-  if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_AF) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_NACKI) != RESET))
+  if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_AF) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_NACKI) != RESET))
   {
     /* Clear NACK Flag */
     __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_AF);
@@ -4649,7 +4755,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uin
     /* Flush TX register */
     I2C_Flush_TXDR(hi2c);
   }
-  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_RXNE) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_RXI) != RESET))
+  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_RXNE) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_RXI) != RESET))
   {
     /* Remove RXNE flag on temporary variable as read done */
     tmpITFlags &= ~I2C_FLAG_RXNE;
@@ -4663,7 +4770,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uin
     hi2c->XferSize--;
     hi2c->XferCount--;
   }
-  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_TXIS) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TXI) != RESET))
+  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_TXIS) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TXI) != RESET))
   {
     /* Write data to TXDR */
     hi2c->Instance->TXDR = *hi2c->pBuffPtr;
@@ -4674,7 +4782,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uin
     hi2c->XferSize--;
     hi2c->XferCount--;
   }
-  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_TCR) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TCI) != RESET))
+  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_TCR) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TCI) != RESET))
   {
     if ((hi2c->XferCount != 0U) && (hi2c->XferSize == 0U))
     {
@@ -4690,11 +4799,13 @@ static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uin
         hi2c->XferSize = hi2c->XferCount;
         if (hi2c->XferOptions != I2C_NO_OPTION_FRAME)
         {
-          I2C_TransferConfig(hi2c, devaddress, (uint8_t)hi2c->XferSize, hi2c->XferOptions, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, devaddress, (uint8_t)hi2c->XferSize,
+                             hi2c->XferOptions, I2C_NO_STARTSTOP);
         }
         else
         {
-          I2C_TransferConfig(hi2c, devaddress, (uint8_t)hi2c->XferSize, I2C_AUTOEND_MODE, I2C_NO_STARTSTOP);
+          I2C_TransferConfig(hi2c, devaddress, (uint8_t)hi2c->XferSize,
+                             I2C_AUTOEND_MODE, I2C_NO_STARTSTOP);
         }
       }
     }
@@ -4714,7 +4825,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uin
       }
     }
   }
-  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_TC) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TCI) != RESET))
+  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_TC) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TCI) != RESET))
   {
     if (hi2c->XferCount == 0U)
     {
@@ -4745,7 +4857,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uin
     /* Nothing to do */
   }
 
-  if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_STOPF) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_STOPI) != RESET))
+  if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_STOPF) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_STOPI) != RESET))
   {
     /* Call I2C Master complete process */
     I2C_ITMasterCplt(hi2c, tmpITFlags);
@@ -4765,7 +4878,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uin
   * @param  ITSources Interrupt sources enabled.
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources)
+static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags,
+                                          uint32_t ITSources)
 {
   uint32_t tmpoptions = hi2c->XferOptions;
   uint32_t tmpITFlags = ITFlags;
@@ -4774,13 +4888,15 @@ static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint
   __HAL_LOCK(hi2c);
 
   /* Check if STOPF is set */
-  if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_STOPF) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_STOPI) != RESET))
+  if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_STOPF) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_STOPI) != RESET))
   {
     /* Call I2C Slave complete process */
     I2C_ITSlaveCplt(hi2c, tmpITFlags);
   }
 
-  if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_AF) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_NACKI) != RESET))
+  if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_AF) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_NACKI) != RESET))
   {
     /* Check that I2C transfer finished */
     /* if yes, normal use case, a NACK is sent by the MASTER when Transfer is finished */
@@ -4788,8 +4904,9 @@ static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint
     /* So clear Flag NACKF only */
     if (hi2c->XferCount == 0U)
     {
-      /* Same action must be done for (tmpoptions == I2C_LAST_FRAME) which removed for Warning[Pa134]: left and right operands are identical */
       if ((hi2c->State == HAL_I2C_STATE_LISTEN) && (tmpoptions == I2C_FIRST_AND_LAST_FRAME))
+        /* Same action must be done for (tmpoptions == I2C_LAST_FRAME) which removed for
+           Warning[Pa134]: left and right operands are identical */
       {
         /* Call I2C Listen complete process */
         I2C_ITListenCplt(hi2c, tmpITFlags);
@@ -4828,7 +4945,8 @@ static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint
       }
     }
   }
-  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_RXNE) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_RXI) != RESET))
+  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_RXNE) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_RXI) != RESET))
   {
     if (hi2c->XferCount > 0U)
     {
@@ -4854,7 +4972,8 @@ static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint
   {
     I2C_ITAddrCplt(hi2c, tmpITFlags);
   }
-  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_TXIS) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TXI) != RESET))
+  else if ((I2C_CHECK_FLAG(tmpITFlags, I2C_FLAG_TXIS) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TXI) != RESET))
   {
     /* Write data to TXDR only if XferCount not reach "0" */
     /* A TXIS flag can be set, during STOP treatment      */
@@ -4900,7 +5019,8 @@ static HAL_StatusTypeDef I2C_Slave_ISR_IT(struct __I2C_HandleTypeDef *hi2c, uint
   * @param  ITSources Interrupt sources enabled.
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources)
+static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags,
+                                            uint32_t ITSources)
 {
   uint16_t devaddress;
   uint32_t xfermode;
@@ -4908,7 +5028,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, ui
   /* Process Locked */
   __HAL_LOCK(hi2c);
 
-  if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_AF) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_NACKI) != RESET))
+  if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_AF) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_NACKI) != RESET))
   {
     /* Clear NACK Flag */
     __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_AF);
@@ -4924,7 +5045,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, ui
     /* Flush TX register */
     I2C_Flush_TXDR(hi2c);
   }
-  else if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_TCR) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TCI) != RESET))
+  else if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_TCR) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TCI) != RESET))
   {
     /* Disable TC interrupt */
     __HAL_I2C_DISABLE_IT(hi2c, I2C_IT_TCI);
@@ -4985,7 +5107,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, ui
       }
     }
   }
-  else if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_TC) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TCI) != RESET))
+  else if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_TC) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_TCI) != RESET))
   {
     if (hi2c->XferCount == 0U)
     {
@@ -5011,7 +5134,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, ui
       I2C_ITError(hi2c, HAL_I2C_ERROR_SIZE);
     }
   }
-  else if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_STOPF) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_STOPI) != RESET))
+  else if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_STOPF) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_STOPI) != RESET))
   {
     /* Call I2C Master complete process */
     I2C_ITMasterCplt(hi2c, ITFlags);
@@ -5035,7 +5159,8 @@ static HAL_StatusTypeDef I2C_Master_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, ui
   * @param  ITSources Interrupt sources enabled.
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_Slave_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags, uint32_t ITSources)
+static HAL_StatusTypeDef I2C_Slave_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uint32_t ITFlags,
+                                           uint32_t ITSources)
 {
   uint32_t tmpoptions = hi2c->XferOptions;
   uint32_t treatdmanack = 0U;
@@ -5045,13 +5170,15 @@ static HAL_StatusTypeDef I2C_Slave_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uin
   __HAL_LOCK(hi2c);
 
   /* Check if STOPF is set */
-  if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_STOPF) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_STOPI) != RESET))
+  if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_STOPF) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_STOPI) != RESET))
   {
     /* Call I2C Slave complete process */
     I2C_ITSlaveCplt(hi2c, ITFlags);
   }
 
-  if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_AF) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_NACKI) != RESET))
+  if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_AF) != RESET) && \
+      (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_NACKI) != RESET))
   {
     /* Check that I2C transfer finished */
     /* if yes, normal use case, a NACK is sent by the MASTER when Transfer is finished */
@@ -5086,8 +5213,9 @@ static HAL_StatusTypeDef I2C_Slave_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uin
 
       if (treatdmanack == 1U)
       {
-        /* Same action must be done for (tmpoptions == I2C_LAST_FRAME) which removed for Warning[Pa134]: left and right operands are identical */
         if ((hi2c->State == HAL_I2C_STATE_LISTEN) && (tmpoptions == I2C_FIRST_AND_LAST_FRAME))
+          /* Same action must be done for (tmpoptions == I2C_LAST_FRAME) which removed for
+             Warning[Pa134]: left and right operands are identical */
         {
           /* Call I2C Listen complete process */
           I2C_ITListenCplt(hi2c, ITFlags);
@@ -5148,7 +5276,8 @@ static HAL_StatusTypeDef I2C_Slave_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uin
       __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_AF);
     }
   }
-  else if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_ADDR) != RESET) && (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_ADDRI) != RESET))
+  else if ((I2C_CHECK_FLAG(ITFlags, I2C_FLAG_ADDR) != RESET) && \
+           (I2C_CHECK_IT_SOURCE(ITSources, I2C_IT_ADDRI) != RESET))
   {
     I2C_ITAddrCplt(hi2c, ITFlags);
   }
@@ -5175,8 +5304,9 @@ static HAL_StatusTypeDef I2C_Slave_ISR_DMA(struct __I2C_HandleTypeDef *hi2c, uin
   * @param  Tickstart Tick start value
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_RequestMemoryWrite(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress,
-                                                uint16_t MemAddSize, uint32_t Timeout, uint32_t Tickstart)
+static HAL_StatusTypeDef I2C_RequestMemoryWrite(I2C_HandleTypeDef *hi2c, uint16_t DevAddress,
+                                                uint16_t MemAddress, uint16_t MemAddSize, uint32_t Timeout,
+                                                uint32_t Tickstart)
 {
   I2C_TransferConfig(hi2c, DevAddress, (uint8_t)MemAddSize, I2C_RELOAD_MODE, I2C_GENERATE_START_WRITE);
 
@@ -5229,8 +5359,9 @@ static HAL_StatusTypeDef I2C_RequestMemoryWrite(I2C_HandleTypeDef *hi2c, uint16_
   * @param  Tickstart Tick start value
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_RequestMemoryRead(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress,
-                                               uint16_t MemAddSize, uint32_t Timeout, uint32_t Tickstart)
+static HAL_StatusTypeDef I2C_RequestMemoryRead(I2C_HandleTypeDef *hi2c, uint16_t DevAddress,
+                                               uint16_t MemAddress, uint16_t MemAddSize, uint32_t Timeout,
+                                               uint32_t Tickstart)
 {
   I2C_TransferConfig(hi2c, DevAddress, (uint8_t)MemAddSize, I2C_SOFTEND_MODE, I2C_GENERATE_START_WRITE);
 
@@ -5298,7 +5429,7 @@ static void I2C_ITAddrCplt(I2C_HandleTypeDef *hi2c, uint32_t ITFlags)
     /* If 10bits addressing mode is selected */
     if (hi2c->Init.AddressingMode == I2C_ADDRESSINGMODE_10BIT)
     {
-      if ((slaveaddrcode & SlaveAddr_MSK) == ((ownadd1code >> SlaveAddr_SHIFT) & SlaveAddr_MSK))
+      if ((slaveaddrcode & SLAVE_ADDR_MSK) == ((ownadd1code >> SLAVE_ADDR_SHIFT) & SLAVE_ADDR_MSK))
       {
         slaveaddrcode = ownadd1code;
         hi2c->AddrEventCount++;
@@ -6025,7 +6156,8 @@ static void I2C_Flush_TXDR(I2C_HandleTypeDef *hi2c)
   */
 static void I2C_DMAMasterTransmitCplt(DMA_HandleTypeDef *hdma)
 {
-  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent); /* Derogation MISRAC2012-Rule-11.5 */
+  /* Derogation MISRAC2012-Rule-11.5 */
+  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent);
 
   /* Disable DMA Request */
   hi2c->Instance->CR1 &= ~I2C_CR1_TXDMAEN;
@@ -6053,7 +6185,8 @@ static void I2C_DMAMasterTransmitCplt(DMA_HandleTypeDef *hdma)
     }
 
     /* Enable the DMA channel */
-    if (HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)hi2c->pBuffPtr, (uint32_t)&hi2c->Instance->TXDR, hi2c->XferSize) != HAL_OK)
+    if (HAL_DMA_Start_IT(hi2c->hdmatx, (uint32_t)hi2c->pBuffPtr, (uint32_t)&hi2c->Instance->TXDR,
+                         hi2c->XferSize) != HAL_OK)
     {
       /* Call the corresponding callback to inform upper layer of End of Transfer */
       I2C_ITError(hi2c, HAL_I2C_ERROR_DMA);
@@ -6073,7 +6206,8 @@ static void I2C_DMAMasterTransmitCplt(DMA_HandleTypeDef *hdma)
   */
 static void I2C_DMASlaveTransmitCplt(DMA_HandleTypeDef *hdma)
 {
-  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent); /* Derogation MISRAC2012-Rule-11.5 */
+  /* Derogation MISRAC2012-Rule-11.5 */
+  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent);
   uint32_t tmpoptions = hi2c->XferOptions;
 
   if ((tmpoptions == I2C_NEXT_FRAME) || (tmpoptions == I2C_FIRST_FRAME))
@@ -6100,7 +6234,8 @@ static void I2C_DMASlaveTransmitCplt(DMA_HandleTypeDef *hdma)
   */
 static void I2C_DMAMasterReceiveCplt(DMA_HandleTypeDef *hdma)
 {
-  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent); /* Derogation MISRAC2012-Rule-11.5 */
+  /* Derogation MISRAC2012-Rule-11.5 */
+  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent);
 
   /* Disable DMA Request */
   hi2c->Instance->CR1 &= ~I2C_CR1_RXDMAEN;
@@ -6128,7 +6263,8 @@ static void I2C_DMAMasterReceiveCplt(DMA_HandleTypeDef *hdma)
     }
 
     /* Enable the DMA channel */
-    if (HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)hi2c->pBuffPtr, hi2c->XferSize) != HAL_OK)
+    if (HAL_DMA_Start_IT(hi2c->hdmarx, (uint32_t)&hi2c->Instance->RXDR, (uint32_t)hi2c->pBuffPtr,
+                         hi2c->XferSize) != HAL_OK)
     {
       /* Call the corresponding callback to inform upper layer of End of Transfer */
       I2C_ITError(hi2c, HAL_I2C_ERROR_DMA);
@@ -6148,7 +6284,8 @@ static void I2C_DMAMasterReceiveCplt(DMA_HandleTypeDef *hdma)
   */
 static void I2C_DMASlaveReceiveCplt(DMA_HandleTypeDef *hdma)
 {
-  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent); /* Derogation MISRAC2012-Rule-11.5 */
+  /* Derogation MISRAC2012-Rule-11.5 */
+  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent);
   uint32_t tmpoptions = hi2c->XferOptions;
 
   if ((__HAL_DMA_GET_COUNTER(hi2c->hdmarx) == 0U) && \
@@ -6175,7 +6312,8 @@ static void I2C_DMASlaveReceiveCplt(DMA_HandleTypeDef *hdma)
   */
 static void I2C_DMAError(DMA_HandleTypeDef *hdma)
 {
-  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent); /* Derogation MISRAC2012-Rule-11.5 */
+  /* Derogation MISRAC2012-Rule-11.5 */
+  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent);
 
   /* Disable Acknowledge */
   hi2c->Instance->CR2 |= I2C_CR2_NACK;
@@ -6192,7 +6330,8 @@ static void I2C_DMAError(DMA_HandleTypeDef *hdma)
   */
 static void I2C_DMAAbort(DMA_HandleTypeDef *hdma)
 {
-  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent); /* Derogation MISRAC2012-Rule-11.5 */
+  /* Derogation MISRAC2012-Rule-11.5 */
+  I2C_HandleTypeDef *hi2c = (I2C_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent);
 
   /* Reset AbortCpltCallback */
   if (hi2c->hdmatx != NULL)
@@ -6248,7 +6387,8 @@ static HAL_StatusTypeDef I2C_WaitOnFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uin
   * @param  Tickstart Tick start value
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_WaitOnTXISFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart)
+static HAL_StatusTypeDef I2C_WaitOnTXISFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout,
+                                                        uint32_t Tickstart)
 {
   while (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_TXIS) == RESET)
   {
@@ -6285,7 +6425,8 @@ static HAL_StatusTypeDef I2C_WaitOnTXISFlagUntilTimeout(I2C_HandleTypeDef *hi2c,
   * @param  Tickstart Tick start value
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_WaitOnSTOPFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart)
+static HAL_StatusTypeDef I2C_WaitOnSTOPFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout,
+                                                        uint32_t Tickstart)
 {
   while (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_STOPF) == RESET)
   {
@@ -6319,7 +6460,8 @@ static HAL_StatusTypeDef I2C_WaitOnSTOPFlagUntilTimeout(I2C_HandleTypeDef *hi2c,
   * @param  Tickstart Tick start value
   * @retval HAL status
   */
-static HAL_StatusTypeDef I2C_WaitOnRXNEFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout, uint32_t Tickstart)
+static HAL_StatusTypeDef I2C_WaitOnRXNEFlagUntilTimeout(I2C_HandleTypeDef *hi2c, uint32_t Timeout,
+                                                        uint32_t Tickstart)
 {
   while (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_RXNE) == RESET)
   {
@@ -6386,6 +6528,12 @@ static HAL_StatusTypeDef I2C_IsAcknowledgeFailed(I2C_HandleTypeDef *hi2c, uint32
 {
   if (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_AF) == SET)
   {
+    /* In case of Soft End condition, generate the STOP condition */
+    if (I2C_GET_STOP_MODE(hi2c) != I2C_AUTOEND_MODE)
+    {
+      /* Generate Stop */
+      hi2c->Instance->CR2 |= I2C_CR2_STOP;
+    }
     /* Wait until STOP Flag is reset */
     /* AutoEnd should be initiate after AF */
     while (__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_STOPF) == RESET)
@@ -6461,9 +6609,11 @@ static void I2C_TransferConfig(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uin
   /* update CR2 register */
   MODIFY_REG(hi2c->Instance->CR2,
              ((I2C_CR2_SADD | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_AUTOEND | \
-               (I2C_CR2_RD_WRN & (uint32_t)(Request >> (31U - I2C_CR2_RD_WRN_Pos))) | I2C_CR2_START | I2C_CR2_STOP)), \
-             (uint32_t)(((uint32_t)DevAddress & I2C_CR2_SADD) |
-                        (((uint32_t)Size << I2C_CR2_NBYTES_Pos) & I2C_CR2_NBYTES) | (uint32_t)Mode | (uint32_t)Request));
+               (I2C_CR2_RD_WRN & (uint32_t)(Request >> (31U - I2C_CR2_RD_WRN_Pos))) | \
+               I2C_CR2_START | I2C_CR2_STOP)), \
+             (uint32_t)(((uint32_t)DevAddress & I2C_CR2_SADD) | \
+                        (((uint32_t)Size << I2C_CR2_NBYTES_Pos) & I2C_CR2_NBYTES) | \
+                        (uint32_t)Mode | (uint32_t)Request));
 }
 
 /**
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2c_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2c_ex.c
index 189f884e..bb033243 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2c_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2c_ex.c
@@ -71,17 +71,15 @@
   * @{
   */
 
-/** @defgroup I2CEx_Exported_Functions_Group1 Extended features functions
-  * @brief    Extended features functions
+/** @defgroup I2CEx_Exported_Functions_Group1 Filter Mode Functions
+  * @brief    Filter Mode Functions
   *
 @verbatim
  ===============================================================================
-                      ##### Extended features functions #####
+                      ##### Filter Mode Functions #####
  ===============================================================================
     [..] This section provides functions allowing to:
       (+) Configure Noise Filters
-      (+) Configure Wake Up Feature
-      (+) Configure Fast Mode Plus
 
 @endverbatim
   * @{
@@ -182,6 +180,23 @@ HAL_StatusTypeDef HAL_I2CEx_ConfigDigitalFilter(I2C_HandleTypeDef *hi2c, uint32_
     return HAL_BUSY;
   }
 }
+/**
+  * @}
+  */
+
+/** @defgroup I2CEx_Exported_Functions_Group2 WakeUp Mode Functions
+  * @brief    WakeUp Mode Functions
+  *
+@verbatim
+ ===============================================================================
+                      ##### WakeUp Mode Functions #####
+ ===============================================================================
+    [..] This section provides functions allowing to:
+      (+) Configure Wake Up Feature
+
+@endverbatim
+  * @{
+  */
 
 /**
   * @brief  Enable I2C wakeup from Stop mode(s).
@@ -260,6 +275,23 @@ HAL_StatusTypeDef HAL_I2CEx_DisableWakeUp(I2C_HandleTypeDef *hi2c)
     return HAL_BUSY;
   }
 }
+/**
+  * @}
+  */
+
+/** @defgroup I2CEx_Exported_Functions_Group3 Fast Mode Plus Functions
+  * @brief    Fast Mode Plus Functions
+  *
+@verbatim
+ ===============================================================================
+                      ##### Fast Mode Plus Functions #####
+ ===============================================================================
+    [..] This section provides functions allowing to:
+      (+) Configure Fast Mode Plus
+
+@endverbatim
+  * @{
+  */
 
 /**
   * @brief Enable the I2C fast mode plus driving capability.
@@ -308,7 +340,6 @@ void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus)
   /* Disable fast mode plus driving capability for selected pin */
   CLEAR_BIT(SYSCFG->CFGR1, (uint32_t)ConfigFastModePlus);
 }
-
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2s.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2s.c
index e5336eb2..8890e8ab 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2s.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_i2s.c
@@ -741,7 +741,7 @@ HAL_StatusTypeDef HAL_I2S_UnRegisterCallback(I2S_HandleTypeDef *hi2s, HAL_I2S_Ca
   * @note   When a 16-bit data frame or a 16-bit data frame extended is selected during the I2S
   *         configuration phase, the Size parameter means the number of 16-bit data length
   *         in the transaction and when a 24-bit data frame or a 32-bit data frame is selected
-  *         the Size parameter means the number of 16-bit data length.
+  *         the Size parameter means the number of 24-bit or 32-bit data length.
   * @param  Timeout Timeout duration
   * @note   The I2S is kept enabled at the end of transaction to avoid the clock de-synchronization
   *         between Master and Slave(example: audio streaming).
@@ -858,7 +858,7 @@ HAL_StatusTypeDef HAL_I2S_Transmit(I2S_HandleTypeDef *hi2s, uint16_t *pData, uin
   * @note   When a 16-bit data frame or a 16-bit data frame extended is selected during the I2S
   *         configuration phase, the Size parameter means the number of 16-bit data length
   *         in the transaction and when a 24-bit data frame or a 32-bit data frame is selected
-  *         the Size parameter means the number of 16-bit data length.
+  *         the Size parameter means the number of 24-bit or 32-bit data length.
   * @param  Timeout Timeout duration
   * @note   The I2S is kept enabled at the end of transaction to avoid the clock de-synchronization
   *         between Master and Slave(example: audio streaming).
@@ -959,7 +959,7 @@ HAL_StatusTypeDef HAL_I2S_Receive(I2S_HandleTypeDef *hi2s, uint16_t *pData, uint
   * @note   When a 16-bit data frame or a 16-bit data frame extended is selected during the I2S
   *         configuration phase, the Size parameter means the number of 16-bit data length
   *         in the transaction and when a 24-bit data frame or a 32-bit data frame is selected
-  *         the Size parameter means the number of 16-bit data length.
+  *         the Size parameter means the number of 24-bit or 32-bit data length.
   * @note   The I2S is kept enabled at the end of transaction to avoid the clock de-synchronization
   *         between Master and Slave(example: audio streaming).
   * @retval HAL status
@@ -1023,7 +1023,7 @@ HAL_StatusTypeDef HAL_I2S_Transmit_IT(I2S_HandleTypeDef *hi2s, uint16_t *pData,
   * @note   When a 16-bit data frame or a 16-bit data frame extended is selected during the I2S
   *         configuration phase, the Size parameter means the number of 16-bit data length
   *         in the transaction and when a 24-bit data frame or a 32-bit data frame is selected
-  *         the Size parameter means the number of 16-bit data length.
+  *         the Size parameter means the number of 24-bit or 32-bit data length.
   * @note   The I2S is kept enabled at the end of transaction to avoid the clock de-synchronization
   *         between Master and Slave(example: audio streaming).
   * @note   It is recommended to use DMA for the I2S receiver to avoid de-synchronization
@@ -1089,7 +1089,7 @@ HAL_StatusTypeDef HAL_I2S_Receive_IT(I2S_HandleTypeDef *hi2s, uint16_t *pData, u
   * @note   When a 16-bit data frame or a 16-bit data frame extended is selected during the I2S
   *         configuration phase, the Size parameter means the number of 16-bit data length
   *         in the transaction and when a 24-bit data frame or a 32-bit data frame is selected
-  *         the Size parameter means the number of 16-bit data length.
+  *         the Size parameter means the number of 24-bit or 32-bit data length.
   * @note   The I2S is kept enabled at the end of transaction to avoid the clock de-synchronization
   *         between Master and Slave(example: audio streaming).
   * @retval HAL status
@@ -1180,7 +1180,7 @@ HAL_StatusTypeDef HAL_I2S_Transmit_DMA(I2S_HandleTypeDef *hi2s, uint16_t *pData,
   * @note   When a 16-bit data frame or a 16-bit data frame extended is selected during the I2S
   *         configuration phase, the Size parameter means the number of 16-bit data length
   *         in the transaction and when a 24-bit data frame or a 32-bit data frame is selected
-  *         the Size parameter means the number of 16-bit data length.
+  *         the Size parameter means the number of 24-bit or 32-bit data length.
   * @note   The I2S is kept enabled at the end of transaction to avoid the clock de-synchronization
   *         between Master and Slave(example: audio streaming).
   * @retval HAL status
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_irda.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_irda.c
index e53a26ab..5f5951df 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_irda.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_irda.c
@@ -113,8 +113,8 @@
     allows the user to configure dynamically the driver callbacks.
 
     [..]
-    Use Function @ref HAL_IRDA_RegisterCallback() to register a user callback.
-    Function @ref HAL_IRDA_RegisterCallback() allows to register following callbacks:
+    Use Function HAL_IRDA_RegisterCallback() to register a user callback.
+    Function HAL_IRDA_RegisterCallback() allows to register following callbacks:
     (+) TxHalfCpltCallback        : Tx Half Complete Callback.
     (+) TxCpltCallback            : Tx Complete Callback.
     (+) RxHalfCpltCallback        : Rx Half Complete Callback.
@@ -129,9 +129,9 @@
     and a pointer to the user callback function.
 
     [..]
-    Use function @ref HAL_IRDA_UnRegisterCallback() to reset a callback to the default
+    Use function HAL_IRDA_UnRegisterCallback() to reset a callback to the default
     weak (surcharged) function.
-    @ref HAL_IRDA_UnRegisterCallback() takes as parameters the HAL peripheral handle,
+    HAL_IRDA_UnRegisterCallback() takes as parameters the HAL peripheral handle,
     and the Callback ID.
     This function allows to reset following callbacks:
     (+) TxHalfCpltCallback        : Tx Half Complete Callback.
@@ -146,13 +146,13 @@
     (+) MspDeInitCallback         : IRDA MspDeInit.
 
     [..]
-    By default, after the @ref HAL_IRDA_Init() and when the state is HAL_IRDA_STATE_RESET
+    By default, after the HAL_IRDA_Init() and when the state is HAL_IRDA_STATE_RESET
     all callbacks are set to the corresponding weak (surcharged) functions:
-    examples @ref HAL_IRDA_TxCpltCallback(), @ref HAL_IRDA_RxHalfCpltCallback().
+    examples HAL_IRDA_TxCpltCallback(), HAL_IRDA_RxHalfCpltCallback().
     Exception done for MspInit and MspDeInit functions that are respectively
-    reset to the legacy weak (surcharged) functions in the @ref HAL_IRDA_Init()
-    and @ref HAL_IRDA_DeInit() only when these callbacks are null (not registered beforehand).
-    If not, MspInit or MspDeInit are not null, the @ref HAL_IRDA_Init() and @ref HAL_IRDA_DeInit()
+    reset to the legacy weak (surcharged) functions in the HAL_IRDA_Init()
+    and HAL_IRDA_DeInit() only when these callbacks are null (not registered beforehand).
+    If not, MspInit or MspDeInit are not null, the HAL_IRDA_Init() and HAL_IRDA_DeInit()
     keep and use the user MspInit/MspDeInit callbacks (registered beforehand).
 
     [..]
@@ -161,8 +161,8 @@
     in HAL_IRDA_STATE_READY or HAL_IRDA_STATE_RESET state, thus registered (user)
     MspInit/DeInit callbacks can be used during the Init/DeInit.
     In that case first register the MspInit/MspDeInit user callbacks
-    using @ref HAL_IRDA_RegisterCallback() before calling @ref HAL_IRDA_DeInit()
-    or @ref HAL_IRDA_Init() function.
+    using HAL_IRDA_RegisterCallback() before calling HAL_IRDA_DeInit()
+    or HAL_IRDA_Init() function.
 
     [..]
     When The compilation define USE_HAL_IRDA_REGISTER_CALLBACKS is set to 0 or
@@ -2362,7 +2362,7 @@ static HAL_StatusTypeDef IRDA_SetConfig(IRDA_HandleTypeDef *hirda)
   uint32_t tmpreg;
   IRDA_ClockSourceTypeDef clocksource;
   HAL_StatusTypeDef ret = HAL_OK;
-  const uint16_t IRDAPrescTable[12] = {1U, 2U, 4U, 6U, 8U, 10U, 12U, 16U, 32U, 64U, 128U, 256U};
+  static const uint16_t IRDAPrescTable[12] = {1U, 2U, 4U, 6U, 8U, 10U, 12U, 16U, 32U, 64U, 128U, 256U};
   uint32_t pclk;
 
   /* Check the communication parameters */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c
index 67d19e55..d95f3681 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c
@@ -65,13 +65,13 @@
       (++) Configure the IWDG prescaler and counter reload value. This reload
            value will be loaded in the IWDG counter each time the watchdog is
            reloaded, then the IWDG will start counting down from this value.
-      (++) Wait for status flags to be reset.
       (++) Depending on window parameter:
         (+++) If Window Init parameter is same as Window register value,
              nothing more is done but reload counter value in order to exit
              function with exact time base.
         (+++) Else modify Window register. This will automatically reload
              watchdog counter.
+      (++) Wait for status flags to be reset.
 
     (#) Then the application program must refresh the IWDG counter at regular
         intervals during normal operation to prevent an MCU reset, using
@@ -121,11 +121,14 @@
 /* Status register needs up to 5 LSI clock periods divided by the clock
    prescaler to be updated. The number of LSI clock periods is upper-rounded to
    6 for the timeout value calculation.
-   The timeout value is also calculated using the highest prescaler (256) and
+   The timeout value is calculated using the highest prescaler (256) and
    the LSI_VALUE constant. The value of this constant can be changed by the user
    to take into account possible LSI clock period variations.
-   The timeout value is multiplied by 1000 to be converted in milliseconds. */
-#define HAL_IWDG_DEFAULT_TIMEOUT ((6UL * 256UL * 1000UL) / LSI_VALUE)
+   The timeout value is multiplied by 1000 to be converted in milliseconds.
+   LSI startup time is also considered here by adding LSI_STARTUP_TIMEOUT
+   converted in milliseconds. */
+#define HAL_IWDG_DEFAULT_TIMEOUT        (((6UL * 256UL * 1000UL) / LSI_VALUE) + ((LSI_STARTUP_TIME / 1000UL) + 1UL))
+#define IWDG_KERNEL_UPDATE_FLAGS        (IWDG_SR_WVU | IWDG_SR_RVU | IWDG_SR_PVU)
 /**
   * @}
   */
@@ -196,11 +199,14 @@ HAL_StatusTypeDef HAL_IWDG_Init(IWDG_HandleTypeDef *hiwdg)
   tickstart = HAL_GetTick();
 
   /* Wait for register to be updated */
-  while (hiwdg->Instance->SR != 0x00u)
+  while ((hiwdg->Instance->SR & IWDG_KERNEL_UPDATE_FLAGS) != 0x00u)
   {
     if ((HAL_GetTick() - tickstart) > HAL_IWDG_DEFAULT_TIMEOUT)
     {
-      return HAL_TIMEOUT;
+      if ((hiwdg->Instance->SR & IWDG_KERNEL_UPDATE_FLAGS) != 0x00u)
+      {
+        return HAL_TIMEOUT;
+      }
     }
   }
 
@@ -223,6 +229,7 @@ HAL_StatusTypeDef HAL_IWDG_Init(IWDG_HandleTypeDef *hiwdg)
   return HAL_OK;
 }
 
+
 /**
   * @}
   */
@@ -242,7 +249,6 @@ HAL_StatusTypeDef HAL_IWDG_Init(IWDG_HandleTypeDef *hiwdg)
   * @{
   */
 
-
 /**
   * @brief  Refresh the IWDG.
   * @param  hiwdg  pointer to a IWDG_HandleTypeDef structure that contains
@@ -258,6 +264,7 @@ HAL_StatusTypeDef HAL_IWDG_Refresh(IWDG_HandleTypeDef *hiwdg)
   return HAL_OK;
 }
 
+
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c
index db28046e..9b849c8e 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c
@@ -96,13 +96,13 @@
   The compilation define  USE_HAL_LPTIM_REGISTER_CALLBACKS when set to 1
   allows the user to configure dynamically the driver callbacks.
   [..]
-  Use Function @ref HAL_LPTIM_RegisterCallback() to register a callback.
-  @ref HAL_LPTIM_RegisterCallback() takes as parameters the HAL peripheral handle,
+  Use Function HAL_LPTIM_RegisterCallback() to register a callback.
+  HAL_LPTIM_RegisterCallback() takes as parameters the HAL peripheral handle,
   the Callback ID and a pointer to the user callback function.
   [..]
-  Use function @ref HAL_LPTIM_UnRegisterCallback() to reset a callback to the
+  Use function HAL_LPTIM_UnRegisterCallback() to reset a callback to the
   default weak function.
-  @ref HAL_LPTIM_UnRegisterCallback takes as parameters the HAL peripheral handle,
+  HAL_LPTIM_UnRegisterCallback takes as parameters the HAL peripheral handle,
   and the Callback ID.
   [..]
   These functions allow to register/unregister following callbacks:
@@ -122,7 +122,7 @@
   [..]
   By default, after the Init and when the state is HAL_LPTIM_STATE_RESET
   all interrupt callbacks are set to the corresponding weak functions:
-  examples @ref HAL_LPTIM_TriggerCallback(), @ref HAL_LPTIM_CompareMatchCallback().
+  examples HAL_LPTIM_TriggerCallback(), HAL_LPTIM_CompareMatchCallback().
 
   [..]
   Exception done for MspInit and MspDeInit functions that are reset to the legacy weak
@@ -136,7 +136,7 @@
   in HAL_LPTIM_STATE_READY or HAL_LPTIM_STATE_RESET state,
   thus registered (user) MspInit/DeInit callbacks can be used during the Init/DeInit.
   In that case first register the MspInit/MspDeInit user callbacks
-  using @ref HAL_LPTIM_RegisterCallback() before calling DeInit or Init function.
+  using HAL_LPTIM_RegisterCallback() before calling DeInit or Init function.
 
   [..]
   When The compilation define USE_HAL_LPTIM_REGISTER_CALLBACKS is set to 0 or
@@ -251,19 +251,17 @@ HAL_StatusTypeDef HAL_LPTIM_Init(LPTIM_HandleTypeDef *hlptim)
 
   assert_param(IS_LPTIM_CLOCK_SOURCE(hlptim->Init.Clock.Source));
   assert_param(IS_LPTIM_CLOCK_PRESCALER(hlptim->Init.Clock.Prescaler));
-  if (hlptim->Init.Clock.Source == LPTIM_CLOCKSOURCE_ULPTIM)
+  if ((hlptim->Init.Clock.Source == LPTIM_CLOCKSOURCE_ULPTIM)
+      || (hlptim->Init.CounterSource == LPTIM_COUNTERSOURCE_EXTERNAL))
   {
     assert_param(IS_LPTIM_CLOCK_POLARITY(hlptim->Init.UltraLowPowerClock.Polarity));
+    assert_param(IS_LPTIM_CLOCK_SAMPLE_TIME(hlptim->Init.UltraLowPowerClock.SampleTime));
   }
   assert_param(IS_LPTIM_TRG_SOURCE(hlptim->Init.Trigger.Source));
   if (hlptim->Init.Trigger.Source != LPTIM_TRIGSOURCE_SOFTWARE)
   {
     assert_param(IS_LPTIM_EXT_TRG_POLARITY(hlptim->Init.Trigger.ActiveEdge));
-  }
-  if (hlptim->Init.Clock.Source == LPTIM_CLOCKSOURCE_APBCLOCK_LPOSC)
-  {
     assert_param(IS_LPTIM_TRIG_SAMPLE_TIME(hlptim->Init.Trigger.SampleTime));
-    assert_param(IS_LPTIM_CLOCK_SAMPLE_TIME(hlptim->Init.UltraLowPowerClock.SampleTime));
   }
   assert_param(IS_LPTIM_OUTPUT_POLARITY(hlptim->Init.OutputPolarity));
   assert_param(IS_LPTIM_UPDATE_MODE(hlptim->Init.UpdateMode));
@@ -322,21 +320,18 @@ HAL_StatusTypeDef HAL_LPTIM_Init(LPTIM_HandleTypeDef *hlptim)
   /* Get the LPTIMx CFGR value */
   tmpcfgr = hlptim->Instance->CFGR;
 
-  if (hlptim->Init.Clock.Source == LPTIM_CLOCKSOURCE_ULPTIM)
+  if ((hlptim->Init.Clock.Source == LPTIM_CLOCKSOURCE_ULPTIM)
+      || (hlptim->Init.CounterSource == LPTIM_COUNTERSOURCE_EXTERNAL))
   {
-    tmpcfgr &= (uint32_t)(~(LPTIM_CFGR_CKPOL));
+    tmpcfgr &= (uint32_t)(~(LPTIM_CFGR_CKPOL | LPTIM_CFGR_CKFLT));
   }
   if (hlptim->Init.Trigger.Source != LPTIM_TRIGSOURCE_SOFTWARE)
   {
-    tmpcfgr &= (uint32_t)(~(LPTIM_CFGR_TRIGSEL));
-  }
-  if (hlptim->Init.Clock.Source == LPTIM_CLOCKSOURCE_APBCLOCK_LPOSC)
-  {
-    tmpcfgr &= (uint32_t)(~(LPTIM_CFGR_TRGFLT | LPTIM_CFGR_CKFLT));
+    tmpcfgr &= (uint32_t)(~(LPTIM_CFGR_TRGFLT | LPTIM_CFGR_TRIGSEL));
   }
 
-  /* Clear CKSEL, CKPOL, PRESC, TRIGEN, TRGFLT, WAVPOL, PRELOAD & COUNTMODE bits */
-  tmpcfgr &= (uint32_t)(~(LPTIM_CFGR_CKSEL | LPTIM_CFGR_CKPOL | LPTIM_CFGR_TRIGEN | LPTIM_CFGR_PRELOAD |
+  /* Clear CKSEL, PRESC, TRIGEN, TRGFLT, WAVPOL, PRELOAD & COUNTMODE bits */
+  tmpcfgr &= (uint32_t)(~(LPTIM_CFGR_CKSEL | LPTIM_CFGR_TRIGEN | LPTIM_CFGR_PRELOAD |
                           LPTIM_CFGR_WAVPOL | LPTIM_CFGR_PRESC | LPTIM_CFGR_COUNTMODE));
 
   /* Set initialization parameters */
@@ -355,19 +350,21 @@ HAL_StatusTypeDef HAL_LPTIM_Init(LPTIM_HandleTypeDef *hlptim)
                 hlptim->Init.UltraLowPowerClock.SampleTime);
   }
 
-  /* Configure the active edge or edges used by the counter only if LPTIM is
-   * clocked by an external clock source
-   */
-  if (hlptim->Init.Clock.Source == LPTIM_CLOCKSOURCE_ULPTIM)
+  /* Configure LPTIM external clock polarity and digital filter */
+  if ((hlptim->Init.Clock.Source == LPTIM_CLOCKSOURCE_ULPTIM)
+      || (hlptim->Init.CounterSource == LPTIM_COUNTERSOURCE_EXTERNAL))
   {
-    tmpcfgr |= (hlptim->Init.UltraLowPowerClock.Polarity);
+    tmpcfgr |= (hlptim->Init.UltraLowPowerClock.Polarity |
+                hlptim->Init.UltraLowPowerClock.SampleTime);
   }
 
+  /* Configure LPTIM external trigger */
   if (hlptim->Init.Trigger.Source != LPTIM_TRIGSOURCE_SOFTWARE)
   {
     /* Enable External trigger and set the trigger source */
-    tmpcfgr |= (hlptim->Init.Trigger.Source |
-                hlptim->Init.Trigger.ActiveEdge);
+    tmpcfgr |= (hlptim->Init.Trigger.Source     |
+                hlptim->Init.Trigger.ActiveEdge |
+                hlptim->Init.Trigger.SampleTime);
   }
 
   /* Write to LPTIMx CFGR */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c
index 7faf33b3..edc23a19 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c
@@ -174,11 +174,11 @@
 
      The compilation flag USE_HAL_PKA_REGISTER_CALLBACKS, when set to 1,
      allows the user to configure dynamically the driver callbacks.
-     Use Functions @ref HAL_PKA_RegisterCallback()
+     Use Functions HAL_PKA_RegisterCallback()
      to register an interrupt callback.
     [..]
 
-     Function @ref HAL_PKA_RegisterCallback() allows to register following callbacks:
+     Function HAL_PKA_RegisterCallback() allows to register following callbacks:
        (+) OperationCpltCallback : callback for End of operation.
        (+) ErrorCallback         : callback for error detection.
        (+) MspInitCallback       : callback for Msp Init.
@@ -187,11 +187,11 @@
      and a pointer to the user callback function.
     [..]
 
-     Use function @ref HAL_PKA_UnRegisterCallback to reset a callback to the default
+     Use function HAL_PKA_UnRegisterCallback to reset a callback to the default
      weak function.
     [..]
 
-     @ref HAL_PKA_UnRegisterCallback takes as parameters the HAL peripheral handle,
+     HAL_PKA_UnRegisterCallback takes as parameters the HAL peripheral handle,
      and the Callback ID.
      This function allows to reset following callbacks:
        (+) OperationCpltCallback : callback for End of operation.
@@ -200,27 +200,27 @@
        (+) MspDeInitCallback     : callback for Msp DeInit.
      [..]
 
-     By default, after the @ref HAL_PKA_Init() and when the state is @ref HAL_PKA_STATE_RESET
+     By default, after the HAL_PKA_Init() and when the state is HAL_PKA_STATE_RESET
      all callbacks are set to the corresponding weak functions:
-     examples @ref HAL_PKA_OperationCpltCallback(), @ref HAL_PKA_ErrorCallback().
+     examples HAL_PKA_OperationCpltCallback(), HAL_PKA_ErrorCallback().
      Exception done for MspInit and MspDeInit functions that are
-     reset to the legacy weak functions in the @ref HAL_PKA_Init()/ @ref HAL_PKA_DeInit() only when
+     reset to the legacy weak functions in the HAL_PKA_Init()/ HAL_PKA_DeInit() only when
      these callbacks are null (not registered beforehand).
     [..]
 
-     If MspInit or MspDeInit are not null, the @ref HAL_PKA_Init()/ @ref HAL_PKA_DeInit()
+     If MspInit or MspDeInit are not null, the HAL_PKA_Init()/ HAL_PKA_DeInit()
      keep and use the user MspInit/MspDeInit callbacks (registered beforehand) whatever the state.
      [..]
 
-     Callbacks can be registered/unregistered in @ref HAL_PKA_STATE_READY state only.
+     Callbacks can be registered/unregistered in HAL_PKA_STATE_READY state only.
      Exception done MspInit/MspDeInit functions that can be registered/unregistered
-     in @ref HAL_PKA_STATE_READY or @ref HAL_PKA_STATE_RESET state,
+     in HAL_PKA_STATE_READY or HAL_PKA_STATE_RESET state,
      thus registered (user) MspInit/DeInit callbacks can be used during the Init/DeInit.
     [..]
 
      Then, the user first registers the MspInit/MspDeInit user callbacks
-     using @ref HAL_PKA_RegisterCallback() before calling @ref HAL_PKA_DeInit()
-     or @ref HAL_PKA_Init() function.
+     using HAL_PKA_RegisterCallback() before calling HAL_PKA_DeInit()
+     or HAL_PKA_Init() function.
      [..]
 
      When the compilation flag USE_HAL_PKA_REGISTER_CALLBACKS is set to 0 or
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c
index 5c861177..34613a5d 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c
@@ -198,7 +198,7 @@ void HAL_PWREx_EnableInternalWakeUpLine(void)
 void HAL_PWREx_DisableInternalWakeUpLine(void)
 {
 #ifdef CORE_CM0PLUS
-  CLEAR_BIT(PWR->CR3, PWR_C2CR3_EIWUL);
+  CLEAR_BIT(PWR->C2CR3, PWR_C2CR3_EIWUL);
 #else
   CLEAR_BIT(PWR->CR3, PWR_CR3_EIWUL);
 #endif
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c
index d9056220..27b9281c 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c
@@ -133,7 +133,7 @@ static HAL_StatusTypeDef RCC_SetFlashLatency(uint32_t Flash_ClkSrcFreq, uint32_t
 
          (+) MSI (Multiple Speed Internal): Its frequency is software trimmable from 100KHZ to 48MHZ.
              The number of flash wait states is automatically adjusted when MSI range is updated with
-             @ref HAL_RCC_OscConfig() and the MSI is used as System clock source.
+             HAL_RCC_OscConfig() and the MSI is used as System clock source.
 
          (+) LSI (low-speed internal): 32 KHz low consumption RC used as IWDG and/or RTC
              clock source.
@@ -173,14 +173,14 @@ static HAL_StatusTypeDef RCC_SetFlashLatency(uint32_t Flash_ClkSrcFreq, uint32_t
              on AHB bus (DMA, GPIO...). APB1 (PCLK1) and APB2 (PCLK2) clocks are derived
              from AHB clock through configurable prescalers and used to clock
              the peripherals mapped on these buses. You can use
-             "@ref HAL_RCC_GetSysClockFreq()" function to retrieve the frequencies of these clocks.
+             "HAL_RCC_GetSysClockFreq()" function to retrieve the frequencies of these clocks.
              The AHB3 clock (HCLK3) is derived from System clock through configurable
              prescaler and used to clock the FLASH. APB3 (PCLK3) is derived from AHB3 clock.
 
          -@- All the peripheral clocks are derived from the System clock (SYSCLK) except:
 
            (+@) RTC: the RTC clock can be derived either from the LSI, LSE or HSE clock divided by 32.
-                You have to use @ref __HAL_RCC_RTC_ENABLE() and @ref HAL_RCCEx_PeriphCLKConfig() function
+                You have to use __HAL_RCC_RTC_ENABLE() and HAL_RCCEx_PeriphCLKConfig() function
                 to configure this clock.
 
            (+@) IWDG clock which is always the LSI clock.
@@ -1591,6 +1591,25 @@ __weak void HAL_RCC_CSSCallback(void)
    */
 }
 
+/**
+  * @brief  Get and clear reset flags
+  * @note   Once reset flags are retrieved, this API is clearing them in order
+  *         to isolate next reset reason.
+  * @retval can be a combination of @ref RCC_Reset_Flag
+  */
+uint32_t HAL_RCC_GetResetSource(void)
+{
+  uint32_t reset;
+
+  /* Get all reset flags */
+  reset = RCC->CSR & RCC_RESET_FLAG_ALL;
+
+  /* Clear Reset flags */
+  RCC->CSR |= RCC_CSR_RMVF;
+
+  return reset;
+}
+
 /**
   * @}
   */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c
index 89cad9d7..4a719257 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c
@@ -78,7 +78,7 @@ static uint32_t          RCC_PLL_GetFreqDomain_Q(void);
     This subsection provides a set of functions allowing to control the RCC Clocks
     frequencies.
     [..]
-    (@) Important note: Care must be taken when @ref HAL_RCCEx_PeriphCLKConfig() is used to
+    (@) Important note: Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to
         select the RTC clock source; in this case the Backup domain will be reset in
         order to modify the RTC Clock source, as consequence RTC registers (including
         the backup registers) and RCC_BDCR register are set to their reset values.
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rng.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rng.c
index 457f6085..60dd1b7f 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rng.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rng.c
@@ -31,8 +31,8 @@
     allows the user to configure dynamically the driver callbacks.
 
     [..]
-    Use Function @ref HAL_RNG_RegisterCallback() to register a user callback.
-    Function @ref HAL_RNG_RegisterCallback() allows to register following callbacks:
+    Use FunctionHAL_RNG_RegisterCallback() to register a user callback.
+    Function HAL_RNG_RegisterCallback() allows to register following callbacks:
     (+) ErrorCallback             : RNG Error Callback.
     (+) MspInitCallback           : RNG MspInit.
     (+) MspDeInitCallback         : RNG MspDeInit.
@@ -40,9 +40,9 @@
     and a pointer to the user callback function.
 
     [..]
-    Use function @ref HAL_RNG_UnRegisterCallback() to reset a callback to the default
+    Use function HAL_RNG_UnRegisterCallback() to reset a callback to the default
     weak (surcharged) function.
-    @ref HAL_RNG_UnRegisterCallback() takes as parameters the HAL peripheral handle,
+    HAL_RNG_UnRegisterCallback() takes as parameters the HAL peripheral handle,
     and the Callback ID.
     This function allows to reset following callbacks:
     (+) ErrorCallback             : RNG Error Callback.
@@ -51,16 +51,16 @@
 
     [..]
     For specific callback ReadyDataCallback, use dedicated register callbacks:
-    respectively @ref HAL_RNG_RegisterReadyDataCallback() , @ref HAL_RNG_UnRegisterReadyDataCallback().
+    respectively HAL_RNG_RegisterReadyDataCallback() , HAL_RNG_UnRegisterReadyDataCallback().
 
     [..]
-    By default, after the @ref HAL_RNG_Init() and when the state is HAL_RNG_STATE_RESET
+    By default, after the HAL_RNG_Init() and when the state is HAL_RNG_STATE_RESET
     all callbacks are set to the corresponding weak (surcharged) functions:
-    example @ref HAL_RNG_ErrorCallback().
+    example HAL_RNG_ErrorCallback().
     Exception done for MspInit and MspDeInit functions that are respectively
-    reset to the legacy weak (surcharged) functions in the @ref HAL_RNG_Init()
-    and @ref HAL_RNG_DeInit() only when these callbacks are null (not registered beforehand).
-    If not, MspInit or MspDeInit are not null, the @ref HAL_RNG_Init() and @ref HAL_RNG_DeInit()
+    reset to the legacy weak (surcharged) functions in the HAL_RNG_Init()
+    and HAL_RNG_DeInit() only when these callbacks are null (not registered beforehand).
+    If not, MspInit or MspDeInit are not null, the HAL_RNG_Init() and HAL_RNG_DeInit()
     keep and use the user MspInit/MspDeInit callbacks (registered beforehand).
 
     [..]
@@ -69,8 +69,8 @@
     in HAL_RNG_STATE_READY or HAL_RNG_STATE_RESET state, thus registered (user)
     MspInit/DeInit callbacks can be used during the Init/DeInit.
     In that case first register the MspInit/MspDeInit user callbacks
-    using @ref HAL_RNG_RegisterCallback() before calling @ref HAL_RNG_DeInit()
-    or @ref HAL_RNG_Init() function.
+    using HAL_RNG_RegisterCallback() before calling HAL_RNG_DeInit()
+    or HAL_RNG_Init() function.
 
     [..]
     When The compilation define USE_HAL_RNG_REGISTER_CALLBACKS is set to 0 or
@@ -227,9 +227,13 @@ HAL_StatusTypeDef HAL_RNG_Init(RNG_HandleTypeDef *hrng)
   {
     if ((HAL_GetTick() - tickstart) > RNG_TIMEOUT_VALUE)
     {
-      hrng->State = HAL_RNG_STATE_READY;
-      hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
-      return HAL_ERROR;
+      /* New check to avoid false timeout detection in case of preemption */
+      if (HAL_IS_BIT_SET(hrng->Instance->CR, RNG_CR_CONDRST))
+      {
+        hrng->State = HAL_RNG_STATE_READY;
+        hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
+        return HAL_ERROR;
+      }
     }
   }
 
@@ -249,9 +253,13 @@ HAL_StatusTypeDef HAL_RNG_Init(RNG_HandleTypeDef *hrng)
   {
     if ((HAL_GetTick() - tickstart) > RNG_TIMEOUT_VALUE)
     {
-      hrng->State = HAL_RNG_STATE_ERROR;
-      hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
-      return HAL_ERROR;
+      /* New check to avoid false timeout detection in case of preemption */
+      if (__HAL_RNG_GET_FLAG(hrng, RNG_FLAG_SECS) != RESET)
+      {
+        hrng->State = HAL_RNG_STATE_ERROR;
+        hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
+        return HAL_ERROR;
+      }
     }
   }
 
@@ -295,11 +303,15 @@ HAL_StatusTypeDef HAL_RNG_DeInit(RNG_HandleTypeDef *hrng)
   {
     if ((HAL_GetTick() - tickstart) > RNG_TIMEOUT_VALUE)
     {
-      hrng->State = HAL_RNG_STATE_READY;
-      hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
-      /* Process Unlocked */
-      __HAL_UNLOCK(hrng);
-      return HAL_ERROR;
+      /* New check to avoid false timeout detection in case of preemption */
+      if (HAL_IS_BIT_SET(hrng->Instance->CR, RNG_CR_CONDRST))
+      {
+        hrng->State = HAL_RNG_STATE_READY;
+        hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
+        /* Process Unlocked */
+        __HAL_UNLOCK(hrng);
+        return HAL_ERROR;
+      }
     }
   }
 
@@ -665,11 +677,15 @@ HAL_StatusTypeDef HAL_RNG_GenerateRandomNumber(RNG_HandleTypeDef *hrng, uint32_t
     {
       if ((HAL_GetTick() - tickstart) > RNG_TIMEOUT_VALUE)
       {
-        hrng->State = HAL_RNG_STATE_READY;
-        hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
-        /* Process Unlocked */
-        __HAL_UNLOCK(hrng);
-        return HAL_ERROR;
+        /* New check to avoid false timeout detection in case of preemption */
+        if (__HAL_RNG_GET_FLAG(hrng, RNG_FLAG_DRDY) == RESET)
+        {
+          hrng->State = HAL_RNG_STATE_READY;
+          hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
+          /* Process Unlocked */
+          __HAL_UNLOCK(hrng);
+          return HAL_ERROR;
+        }
       }
     }
 
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rng_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rng_ex.c
index 09fd3f71..34591bc8 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rng_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rng_ex.c
@@ -31,7 +31,7 @@
 
 #if defined(RNG)
 
-/** @addtogroup RNGEx
+/** @addtogroup RNG_Ex
   * @brief RNG Extended HAL module driver.
   * @{
   */
@@ -40,7 +40,7 @@
 #if defined(RNG_CR_CONDRST)
 /* Private types -------------------------------------------------------------*/
 /* Private defines -----------------------------------------------------------*/
-/** @defgroup RNGEx_Private_Defines RNGEx Private Defines
+/** @defgroup RNG_Ex_Private_Defines RNGEx Private Defines
   * @{
   */
 /*  Health test control register information to use in CCM algorithm */
@@ -51,7 +51,7 @@
   */
 /* Private variables ---------------------------------------------------------*/
 /* Private constants ---------------------------------------------------------*/
-/** @defgroup RNGEx_Private_Constants RNGEx Private Constants
+/** @defgroup RNG_Ex_Private_Constants RNGEx Private Constants
   * @{
   */
 #define RNG_TIMEOUT_VALUE     2U
@@ -63,11 +63,11 @@
 /* Private functions  --------------------------------------------------------*/
 /* Exported functions --------------------------------------------------------*/
 
-/** @addtogroup RNGEx_Exported_Functions
+/** @addtogroup RNG_Ex_Exported_Functions
   * @{
   */
 
-/** @addtogroup RNGEx_Exported_Functions_Group1
+/** @addtogroup RNG_Ex_Exported_Functions_Group1
   *  @brief   Configuration functions
   *
 @verbatim
@@ -152,9 +152,13 @@ HAL_StatusTypeDef HAL_RNGEx_SetConfig(RNG_HandleTypeDef *hrng, RNG_ConfigTypeDef
     {
       if ((HAL_GetTick() - tickstart) > RNG_TIMEOUT_VALUE)
       {
-        hrng->State = HAL_RNG_STATE_READY;
-        hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
-        return HAL_ERROR;
+        /* New check to avoid false timeout detection in case of prememption */
+        if (HAL_IS_BIT_SET(hrng->Instance->CR, RNG_CR_CONDRST))
+        {
+          hrng->State = HAL_RNG_STATE_READY;
+          hrng->ErrorCode = HAL_RNG_ERROR_TIMEOUT;
+          return HAL_ERROR;
+        }
       }
     }
 
@@ -276,7 +280,7 @@ HAL_StatusTypeDef HAL_RNGEx_LockConfig(RNG_HandleTypeDef *hrng)
   * @}
   */
 
-/** @addtogroup RNGEx_Exported_Functions_Group2
+/** @addtogroup RNG_Ex_Exported_Functions_Group2
   *  @brief   Recover from seed error function
   *
 @verbatim
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c
index 93ac670f..67c97889 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c
@@ -1174,14 +1174,18 @@ HAL_StatusTypeDef HAL_RTC_SetAlarm(RTC_HandleTypeDef *hrtc, RTC_AlarmTypeDef *sA
       assert_param(IS_RTC_MINUTES(sAlarm->AlarmTime.Minutes));
       assert_param(IS_RTC_SECONDS(sAlarm->AlarmTime.Seconds));
 
-      if (sAlarm->AlarmDateWeekDaySel == RTC_ALARMDATEWEEKDAYSEL_DATE)
+      if( sAlarm->AlarmMask != RTC_ALARMMASK_DATEWEEKDAY )
       {
-        assert_param(IS_RTC_ALARM_DATE_WEEKDAY_DATE(sAlarm->AlarmDateWeekDay));
-      }
-      else
-      {
-        assert_param(IS_RTC_ALARM_DATE_WEEKDAY_WEEKDAY(sAlarm->AlarmDateWeekDay));
+        if (sAlarm->AlarmDateWeekDaySel == RTC_ALARMDATEWEEKDAYSEL_DATE)
+        {
+          assert_param(IS_RTC_ALARM_DATE_WEEKDAY_DATE(sAlarm->AlarmDateWeekDay));
+        }
+        else
+        {
+          assert_param(IS_RTC_ALARM_DATE_WEEKDAY_WEEKDAY(sAlarm->AlarmDateWeekDay));
+        }
       }
+
       tmpreg = (((uint32_t)RTC_ByteToBcd2(sAlarm->AlarmTime.Hours) << RTC_ALRMAR_HU_Pos) | \
                 ((uint32_t)RTC_ByteToBcd2(sAlarm->AlarmTime.Minutes) << RTC_ALRMAR_MNU_Pos) | \
                 ((uint32_t)RTC_ByteToBcd2(sAlarm->AlarmTime.Seconds) << RTC_ALRMAR_SU_Pos) | \
@@ -1192,30 +1196,37 @@ HAL_StatusTypeDef HAL_RTC_SetAlarm(RTC_HandleTypeDef *hrtc, RTC_AlarmTypeDef *sA
     }
     else /* format BCD */
     {
-      if (READ_BIT(RTC->CR, RTC_CR_FMT) != 0U)
+      if( sAlarm->AlarmMask != RTC_ALARMMASK_ALL )
       {
-        assert_param(IS_RTC_HOUR12(RTC_Bcd2ToByte(sAlarm->AlarmTime.Hours)));
-        assert_param(IS_RTC_HOURFORMAT12(sAlarm->AlarmTime.TimeFormat));
-      }
-      else
-      {
-        sAlarm->AlarmTime.TimeFormat = 0x00U;
-        assert_param(IS_RTC_HOUR24(RTC_Bcd2ToByte(sAlarm->AlarmTime.Hours)));
-      }
-
-      assert_param(IS_RTC_MINUTES(RTC_Bcd2ToByte(sAlarm->AlarmTime.Minutes)));
-      assert_param(IS_RTC_SECONDS(RTC_Bcd2ToByte(sAlarm->AlarmTime.Seconds)));
+        if( sAlarm->AlarmMask != RTC_ALARMMASK_HOURS )
+        {
+          if (READ_BIT(RTC->CR, RTC_CR_FMT) != 0U)
+          {
+            assert_param(IS_RTC_HOUR12(RTC_Bcd2ToByte(sAlarm->AlarmTime.Hours)));
+            assert_param(IS_RTC_HOURFORMAT12(sAlarm->AlarmTime.TimeFormat));
+          }
+          else
+          {
+            sAlarm->AlarmTime.TimeFormat = 0x00U;
+            assert_param(IS_RTC_HOUR24(RTC_Bcd2ToByte(sAlarm->AlarmTime.Hours)));
+          }
+        }
 
-#ifdef  USE_FULL_ASSERT
-      if (sAlarm->AlarmDateWeekDaySel == RTC_ALARMDATEWEEKDAYSEL_DATE)
-      {
-        assert_param(IS_RTC_ALARM_DATE_WEEKDAY_DATE(RTC_Bcd2ToByte(sAlarm->AlarmDateWeekDay)));
+        assert_param(IS_RTC_MINUTES(RTC_Bcd2ToByte(sAlarm->AlarmTime.Minutes)));
+        assert_param(IS_RTC_SECONDS(RTC_Bcd2ToByte(sAlarm->AlarmTime.Seconds)));
       }
-      else
+#ifdef  USE_FULL_ASSERT
+      if( ( sAlarm->AlarmMask != RTC_ALARMMASK_ALL ) && ( sAlarm->AlarmMask != RTC_ALARMMASK_DATEWEEKDAY ) )
       {
-        assert_param(IS_RTC_ALARM_DATE_WEEKDAY_WEEKDAY(RTC_Bcd2ToByte(sAlarm->AlarmDateWeekDay)));
+        if (sAlarm->AlarmDateWeekDaySel == RTC_ALARMDATEWEEKDAYSEL_DATE)
+        {
+          assert_param(IS_RTC_ALARM_DATE_WEEKDAY_DATE(RTC_Bcd2ToByte(sAlarm->AlarmDateWeekDay)));
+        }
+        else
+        {
+          assert_param(IS_RTC_ALARM_DATE_WEEKDAY_WEEKDAY(RTC_Bcd2ToByte(sAlarm->AlarmDateWeekDay)));
+        }
       }
-
 #endif /* USE_FULL_ASSERT */
       tmpreg = (((uint32_t)(sAlarm->AlarmTime.Hours) << RTC_ALRMAR_HU_Pos) | \
                 ((uint32_t)(sAlarm->AlarmTime.Minutes) << RTC_ALRMAR_MNU_Pos) | \
@@ -1369,14 +1380,18 @@ HAL_StatusTypeDef HAL_RTC_SetAlarm_IT(RTC_HandleTypeDef *hrtc, RTC_AlarmTypeDef
       assert_param(IS_RTC_MINUTES(sAlarm->AlarmTime.Minutes));
       assert_param(IS_RTC_SECONDS(sAlarm->AlarmTime.Seconds));
 
-      if (sAlarm->AlarmDateWeekDaySel == RTC_ALARMDATEWEEKDAYSEL_DATE)
+      if( sAlarm->AlarmMask != RTC_ALARMMASK_DATEWEEKDAY )
       {
-        assert_param(IS_RTC_ALARM_DATE_WEEKDAY_DATE(sAlarm->AlarmDateWeekDay));
-      }
-      else
-      {
-        assert_param(IS_RTC_ALARM_DATE_WEEKDAY_WEEKDAY(sAlarm->AlarmDateWeekDay));
+        if (sAlarm->AlarmDateWeekDaySel == RTC_ALARMDATEWEEKDAYSEL_DATE)
+        {
+          assert_param(IS_RTC_ALARM_DATE_WEEKDAY_DATE(sAlarm->AlarmDateWeekDay));
+        }
+        else
+        {
+          assert_param(IS_RTC_ALARM_DATE_WEEKDAY_WEEKDAY(sAlarm->AlarmDateWeekDay));
+        }
       }
+
       tmpreg = (((uint32_t)RTC_ByteToBcd2(sAlarm->AlarmTime.Hours) << RTC_ALRMAR_HU_Pos) | \
                 ((uint32_t)RTC_ByteToBcd2(sAlarm->AlarmTime.Minutes) << RTC_ALRMAR_MNU_Pos) | \
                 ((uint32_t)RTC_ByteToBcd2(sAlarm->AlarmTime.Seconds) << RTC_ALRMAR_SU_Pos) | \
@@ -1387,30 +1402,38 @@ HAL_StatusTypeDef HAL_RTC_SetAlarm_IT(RTC_HandleTypeDef *hrtc, RTC_AlarmTypeDef
     }
     else /* Format BCD */
     {
-      if (READ_BIT(RTC->CR, RTC_CR_FMT) != 0U)
-      {
-        assert_param(IS_RTC_HOUR12(RTC_Bcd2ToByte(sAlarm->AlarmTime.Hours)));
-        assert_param(IS_RTC_HOURFORMAT12(sAlarm->AlarmTime.TimeFormat));
-      }
-      else
+      if( sAlarm->AlarmMask != RTC_ALARMMASK_ALL )
       {
-        sAlarm->AlarmTime.TimeFormat = 0x00U;
-        assert_param(IS_RTC_HOUR24(RTC_Bcd2ToByte(sAlarm->AlarmTime.Hours)));
-      }
+        if( sAlarm->AlarmMask != RTC_ALARMMASK_HOURS )
+        {
+          if (READ_BIT(RTC->CR, RTC_CR_FMT) != 0U)
+          {
+            assert_param(IS_RTC_HOUR12(RTC_Bcd2ToByte(sAlarm->AlarmTime.Hours)));
+            assert_param(IS_RTC_HOURFORMAT12(sAlarm->AlarmTime.TimeFormat));
+          }
+          else
+          {
+            sAlarm->AlarmTime.TimeFormat = 0x00U;
+            assert_param(IS_RTC_HOUR24(RTC_Bcd2ToByte(sAlarm->AlarmTime.Hours)));
+          }
+        }
 
-      assert_param(IS_RTC_MINUTES(RTC_Bcd2ToByte(sAlarm->AlarmTime.Minutes)));
-      assert_param(IS_RTC_SECONDS(RTC_Bcd2ToByte(sAlarm->AlarmTime.Seconds)));
+        assert_param(IS_RTC_MINUTES(RTC_Bcd2ToByte(sAlarm->AlarmTime.Minutes)));
+        assert_param(IS_RTC_SECONDS(RTC_Bcd2ToByte(sAlarm->AlarmTime.Seconds)));
+      }
 
 #ifdef  USE_FULL_ASSERT
-      if (sAlarm->AlarmDateWeekDaySel == RTC_ALARMDATEWEEKDAYSEL_DATE)
+      if( ( sAlarm->AlarmMask != RTC_ALARMMASK_ALL ) && ( sAlarm->AlarmMask != RTC_ALARMMASK_DATEWEEKDAY ) )
       {
-        assert_param(IS_RTC_ALARM_DATE_WEEKDAY_DATE(RTC_Bcd2ToByte(sAlarm->AlarmDateWeekDay)));
-      }
-      else
-      {
-        assert_param(IS_RTC_ALARM_DATE_WEEKDAY_WEEKDAY(RTC_Bcd2ToByte(sAlarm->AlarmDateWeekDay)));
+        if (sAlarm->AlarmDateWeekDaySel == RTC_ALARMDATEWEEKDAYSEL_DATE)
+        {
+          assert_param(IS_RTC_ALARM_DATE_WEEKDAY_DATE(RTC_Bcd2ToByte(sAlarm->AlarmDateWeekDay)));
+        }
+        else
+        {
+          assert_param(IS_RTC_ALARM_DATE_WEEKDAY_WEEKDAY(RTC_Bcd2ToByte(sAlarm->AlarmDateWeekDay)));
+        }
       }
-
 #endif /* USE_FULL_ASSERT */
       tmpreg = (((uint32_t)(sAlarm->AlarmTime.Hours) << RTC_ALRMAR_HU_Pos) | \
                 ((uint32_t)(sAlarm->AlarmTime.Minutes) << RTC_ALRMAR_MNU_Pos) | \
@@ -1516,26 +1539,33 @@ HAL_StatusTypeDef HAL_RTC_DeactivateAlarm(RTC_HandleTypeDef *hrtc, uint32_t Alar
 
   if (Alarm == RTC_ALARM_A)
   {
-    /* AlarmA, Clear SSCLR */
-    CLEAR_BIT(RTC->ALRMASSR, RTC_ALRMASSR_SSCLR);
-
     /* AlarmA, In case of interrupt mode is used, the interrupt source must disabled */
     CLEAR_BIT(RTC->CR, RTC_CR_ALRAE | RTC_CR_ALRAIE);
 
+    /* AlarmA, Clear SSCLR */
+    CLEAR_BIT(RTC->ALRMASSR, RTC_ALRMASSR_SSCLR);
+
     /* Store in the handle the Alarm A disabled */
     CLEAR_BIT(hrtc->IsEnabled.RtcFeatures, RTC_MISR_ALRAMF);
+
+    /* Clear AlarmA flag */
+    WRITE_REG(RTC->SCR, RTC_SCR_CALRAF);
   }
   else
   {
-    /* AlarmB, Clear SSCLR */
-    CLEAR_BIT(RTC->ALRMBSSR, RTC_ALRMBSSR_SSCLR);
-
     /* AlarmB, In case of interrupt mode is used, the interrupt source must disabled */
     CLEAR_BIT(RTC->CR, RTC_CR_ALRBE | RTC_CR_ALRBIE);
 
+    /* AlarmB, Clear SSCLR */
+    CLEAR_BIT(RTC->ALRMBSSR, RTC_ALRMBSSR_SSCLR);
+
     /* Store in the handle the Alarm B disabled */
     CLEAR_BIT(hrtc->IsEnabled.RtcFeatures, RTC_MISR_ALRBMF);
+
+    /* Clear AlarmB flag */
+    WRITE_REG(RTC->SCR, RTC_SCR_CALRBF);
   }
+
   /* Enable the write protection for RTC registers */
   __HAL_RTC_WRITEPROTECTION_ENABLE(hrtc);
 
@@ -1742,7 +1772,7 @@ HAL_StatusTypeDef HAL_RTC_WaitForSynchro(RTC_HandleTypeDef *hrtc)
 
   UNUSED(hrtc);
   /* Clear RSF flag */
-  SET_BIT(RTC->ICSR, RTC_RSF_MASK);
+  CLEAR_BIT(RTC->ICSR, RTC_ICSR_RSF);
 
   tickstart = HAL_GetTick();
 
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c
index 815977e4..f4c85267 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c
@@ -282,6 +282,12 @@ HAL_StatusTypeDef HAL_RTCEx_DeactivateTimeStamp(RTC_HandleTypeDef *hrtc)
   /* In case of interrupt mode is used, the interrupt source must disabled */
   CLEAR_BIT(RTC->CR, (RTC_CR_TSEDGE | RTC_CR_TSE | RTC_CR_TSIE));
 
+  /* Clear timestamp flag only if internal timestamp flag not set */
+  if( READ_BIT( RTC->SR, RTC_SR_ITSF) == 0U )
+  {
+    WRITE_REG(RTC->SCR, RTC_SCR_CTSF);
+  }
+
   /* Enable the write protection for RTC registers */
   __HAL_RTC_WRITEPROTECTION_ENABLE(hrtc);
 
@@ -342,6 +348,16 @@ HAL_StatusTypeDef HAL_RTCEx_DeactivateInternalTimeStamp(RTC_HandleTypeDef *hrtc)
   /* Configure the internal Time Stamp Enable bits */
   CLEAR_BIT(RTC->CR, RTC_CR_ITSE);
 
+  /* Clear internal timestamp flag if Timestamp not enabled and TSOVF not set */
+  WRITE_REG(RTC->SCR, RTC_SCR_CITSF);
+  if ( READ_BIT(RTC->SR, RTC_SR_TSOVF) == 0U )
+  {
+    if ( READ_BIT(RTC->CR, RTC_CR_TSE) == 0U ) 
+    {
+      WRITE_REG(RTC->SCR, RTC_SCR_CTSF);
+    }
+  }
+
   /* Enable the write protection for RTC registers */
   __HAL_RTC_WRITEPROTECTION_ENABLE(hrtc);
 
@@ -710,6 +726,9 @@ HAL_StatusTypeDef HAL_RTCEx_DeactivateWakeUpTimer(RTC_HandleTypeDef *hrtc)
     }
   }
 
+  /* Clear wakeup timer flag */
+  WRITE_REG(RTC->SCR, RTC_SCR_CWUTF);
+
   /* Enable the write protection for RTC registers */
   __HAL_RTC_WRITEPROTECTION_ENABLE(hrtc);
 
@@ -1355,6 +1374,9 @@ HAL_StatusTypeDef HAL_RTCEx_DeactivateSSRU(RTC_HandleTypeDef *hrtc)
   /* In case of interrupt mode is used, the interrupt source must disabled */
   __HAL_RTC_SSRU_DISABLE_IT(hrtc, RTC_IT_TS);
 
+  /* Clear SSR underflow flag */
+  WRITE_REG(RTC->SCR, RTC_SCR_CSSRUF);
+
   /* Enable the write protection for RTC registers */
   __HAL_RTC_WRITEPROTECTION_ENABLE(hrtc);
 
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smartcard.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smartcard.c
index f811a6b0..67f585ec 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smartcard.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smartcard.c
@@ -107,8 +107,8 @@
     allows the user to configure dynamically the driver callbacks.
 
     [..]
-    Use Function @ref HAL_SMARTCARD_RegisterCallback() to register a user callback.
-    Function @ref HAL_SMARTCARD_RegisterCallback() allows to register following callbacks:
+    Use Function HAL_SMARTCARD_RegisterCallback() to register a user callback.
+    Function HAL_SMARTCARD_RegisterCallback() allows to register following callbacks:
     (+) TxCpltCallback            : Tx Complete Callback.
     (+) RxCpltCallback            : Rx Complete Callback.
     (+) ErrorCallback             : Error Callback.
@@ -123,9 +123,9 @@
     and a pointer to the user callback function.
 
     [..]
-    Use function @ref HAL_SMARTCARD_UnRegisterCallback() to reset a callback to the default
+    Use function HAL_SMARTCARD_UnRegisterCallback() to reset a callback to the default
     weak (surcharged) function.
-    @ref HAL_SMARTCARD_UnRegisterCallback() takes as parameters the HAL peripheral handle,
+    HAL_SMARTCARD_UnRegisterCallback() takes as parameters the HAL peripheral handle,
     and the Callback ID.
     This function allows to reset following callbacks:
     (+) TxCpltCallback            : Tx Complete Callback.
@@ -140,13 +140,13 @@
     (+) MspDeInitCallback         : SMARTCARD MspDeInit.
 
     [..]
-    By default, after the @ref HAL_SMARTCARD_Init() and when the state is HAL_SMARTCARD_STATE_RESET
+    By default, after the HAL_SMARTCARD_Init() and when the state is HAL_SMARTCARD_STATE_RESET
     all callbacks are set to the corresponding weak (surcharged) functions:
-    examples @ref HAL_SMARTCARD_TxCpltCallback(), @ref HAL_SMARTCARD_RxCpltCallback().
+    examples HAL_SMARTCARD_TxCpltCallback(), HAL_SMARTCARD_RxCpltCallback().
     Exception done for MspInit and MspDeInit functions that are respectively
-    reset to the legacy weak (surcharged) functions in the @ref HAL_SMARTCARD_Init()
-    and @ref HAL_SMARTCARD_DeInit() only when these callbacks are null (not registered beforehand).
-    If not, MspInit or MspDeInit are not null, the @ref HAL_SMARTCARD_Init() and @ref HAL_SMARTCARD_DeInit()
+    reset to the legacy weak (surcharged) functions in the HAL_SMARTCARD_Init()
+    and HAL_SMARTCARD_DeInit() only when these callbacks are null (not registered beforehand).
+    If not, MspInit or MspDeInit are not null, the HAL_SMARTCARD_Init() and HAL_SMARTCARD_DeInit()
     keep and use the user MspInit/MspDeInit callbacks (registered beforehand).
 
     [..]
@@ -155,8 +155,8 @@
     in HAL_SMARTCARD_STATE_READY or HAL_SMARTCARD_STATE_RESET state, thus registered (user)
     MspInit/DeInit callbacks can be used during the Init/DeInit.
     In that case first register the MspInit/MspDeInit user callbacks
-    using @ref HAL_SMARTCARD_RegisterCallback() before calling @ref HAL_SMARTCARD_DeInit()
-    or @ref HAL_SMARTCARD_Init() function.
+    using HAL_SMARTCARD_RegisterCallback() before calling HAL_SMARTCARD_DeInit()
+    or HAL_SMARTCARD_Init() function.
 
     [..]
     When The compilation define USE_HAL_SMARTCARD_REGISTER_CALLBACKS is set to 0 or
@@ -2327,7 +2327,7 @@ static HAL_StatusTypeDef SMARTCARD_SetConfig(SMARTCARD_HandleTypeDef *hsmartcard
   uint32_t tmpreg;
   SMARTCARD_ClockSourceTypeDef clocksource;
   HAL_StatusTypeDef ret = HAL_OK;
-  const uint16_t SMARTCARDPrescTable[12] = {1U, 2U, 4U, 6U, 8U, 10U, 12U, 16U, 32U, 64U, 128U, 256U};
+  static const uint16_t SMARTCARDPrescTable[12] = {1U, 2U, 4U, 6U, 8U, 10U, 12U, 16U, 32U, 64U, 128U, 256U};
   uint32_t pclk;
 
   /* Check the parameters */
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smartcard_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smartcard_ex.c
index 823dc41d..6a27ed47 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smartcard_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smartcard_ex.c
@@ -458,8 +458,8 @@ static void SMARTCARDEx_SetNbDataToProcess(SMARTCARD_HandleTypeDef *hsmartcard)
   uint8_t rx_fifo_threshold;
   uint8_t tx_fifo_threshold;
   /* 2 0U/1U added for MISRAC2012-Rule-18.1_b and MISRAC2012-Rule-18.1_d */
-  uint8_t numerator[]   = {1U, 1U, 1U, 3U, 7U, 1U, 0U, 0U};
-  uint8_t denominator[] = {8U, 4U, 2U, 4U, 8U, 1U, 1U, 1U};
+  static const uint8_t numerator[]   = {1U, 1U, 1U, 3U, 7U, 1U, 0U, 0U};
+  static const uint8_t denominator[] = {8U, 4U, 2U, 4U, 8U, 1U, 1U, 1U};
 
   if (hsmartcard->FifoMode == SMARTCARD_FIFOMODE_DISABLE)
   {
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smbus.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smbus.c
index 5754a500..63210321 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smbus.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smbus.c
@@ -20,7 +20,7 @@
     (#) Declare a SMBUS_HandleTypeDef handle structure, for example:
         SMBUS_HandleTypeDef  hsmbus;
 
-    (#)Initialize the SMBUS low level resources by implementing the @ref HAL_SMBUS_MspInit() API:
+    (#)Initialize the SMBUS low level resources by implementing the HAL_SMBUS_MspInit() API:
         (##) Enable the SMBUSx interface clock
         (##) SMBUS pins configuration
             (+++) Enable the clock for the SMBUS GPIOs
@@ -33,69 +33,75 @@
         Dual Addressing mode, Own Address2, Own Address2 Mask, General call, Nostretch mode,
         Peripheral mode and Packet Error Check mode in the hsmbus Init structure.
 
-    (#) Initialize the SMBUS registers by calling the @ref HAL_SMBUS_Init() API:
+    (#) Initialize the SMBUS registers by calling the HAL_SMBUS_Init() API:
         (++) These API's configures also the low level Hardware GPIO, CLOCK, CORTEX...etc)
-             by calling the customized @ref HAL_SMBUS_MspInit(&hsmbus) API.
+             by calling the customized HAL_SMBUS_MspInit(&hsmbus) API.
 
-    (#) To check if target device is ready for communication, use the function @ref HAL_SMBUS_IsDeviceReady()
+    (#) To check if target device is ready for communication, use the function HAL_SMBUS_IsDeviceReady()
 
     (#) For SMBUS IO operations, only one mode of operations is available within this driver
 
     *** Interrupt mode IO operation ***
     ===================================
     [..]
-      (+) Transmit in master/host SMBUS mode an amount of data in non-blocking mode using @ref HAL_SMBUS_Master_Transmit_IT()
-      (++) At transmission end of transfer @ref HAL_SMBUS_MasterTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_SMBUS_MasterTxCpltCallback()
-      (+) Receive in master/host SMBUS mode an amount of data in non-blocking mode using @ref HAL_SMBUS_Master_Receive_IT()
-      (++) At reception end of transfer @ref HAL_SMBUS_MasterRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_SMBUS_MasterRxCpltCallback()
-      (+) Abort a master/host SMBUS process communication with Interrupt using @ref HAL_SMBUS_Master_Abort_IT()
+      (+) Transmit in master/host SMBUS mode an amount of data in non-blocking mode
+          using HAL_SMBUS_Master_Transmit_IT()
+      (++) At transmission end of transfer HAL_SMBUS_MasterTxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_SMBUS_MasterTxCpltCallback()
+      (+) Receive in master/host SMBUS mode an amount of data in non-blocking mode
+          using HAL_SMBUS_Master_Receive_IT()
+      (++) At reception end of transfer HAL_SMBUS_MasterRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_SMBUS_MasterRxCpltCallback()
+      (+) Abort a master/host SMBUS process communication with Interrupt using HAL_SMBUS_Master_Abort_IT()
       (++) The associated previous transfer callback is called at the end of abort process
-      (++) mean @ref HAL_SMBUS_MasterTxCpltCallback() in case of previous state was master transmit
-      (++) mean @ref HAL_SMBUS_MasterRxCpltCallback() in case of previous state was master receive
+      (++) mean HAL_SMBUS_MasterTxCpltCallback() in case of previous state was master transmit
+      (++) mean HAL_SMBUS_MasterRxCpltCallback() in case of previous state was master receive
       (+) Enable/disable the Address listen mode in slave/device or host/slave SMBUS mode
-           using @ref HAL_SMBUS_EnableListen_IT() @ref HAL_SMBUS_DisableListen_IT()
-      (++) When address slave/device SMBUS match, @ref HAL_SMBUS_AddrCallback() is executed and user can
-           add his own code to check the Address Match Code and the transmission direction request by master/host (Write/Read).
-      (++) At Listen mode end @ref HAL_SMBUS_ListenCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_SMBUS_ListenCpltCallback()
-      (+) Transmit in slave/device SMBUS mode an amount of data in non-blocking mode using @ref HAL_SMBUS_Slave_Transmit_IT()
-      (++) At transmission end of transfer @ref HAL_SMBUS_SlaveTxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_SMBUS_SlaveTxCpltCallback()
-      (+) Receive in slave/device SMBUS mode an amount of data in non-blocking mode using @ref HAL_SMBUS_Slave_Receive_IT()
-      (++) At reception end of transfer @ref HAL_SMBUS_SlaveRxCpltCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_SMBUS_SlaveRxCpltCallback()
-      (+) Enable/Disable the SMBUS alert mode using @ref HAL_SMBUS_EnableAlert_IT() @ref HAL_SMBUS_DisableAlert_IT()
-      (++) When SMBUS Alert is generated @ref HAL_SMBUS_ErrorCallback() is executed and user can
-           add his own code by customization of function pointer @ref HAL_SMBUS_ErrorCallback()
-           to check the Alert Error Code using function @ref HAL_SMBUS_GetError()
-      (+) Get HAL state machine or error values using @ref HAL_SMBUS_GetState() or @ref HAL_SMBUS_GetError()
-      (+) In case of transfer Error, @ref HAL_SMBUS_ErrorCallback() function is executed and user can
-           add his own code by customization of function pointer @ref HAL_SMBUS_ErrorCallback()
-           to check the Error Code using function @ref HAL_SMBUS_GetError()
+           using HAL_SMBUS_EnableListen_IT() HAL_SMBUS_DisableListen_IT()
+      (++) When address slave/device SMBUS match, HAL_SMBUS_AddrCallback() is executed and users can
+           add their own code to check the Address Match Code and the transmission direction
+           request by master/host (Write/Read).
+      (++) At Listen mode end HAL_SMBUS_ListenCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_SMBUS_ListenCpltCallback()
+      (+) Transmit in slave/device SMBUS mode an amount of data in non-blocking mode
+          using HAL_SMBUS_Slave_Transmit_IT()
+      (++) At transmission end of transfer HAL_SMBUS_SlaveTxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_SMBUS_SlaveTxCpltCallback()
+      (+) Receive in slave/device SMBUS mode an amount of data in non-blocking mode
+          using HAL_SMBUS_Slave_Receive_IT()
+      (++) At reception end of transfer HAL_SMBUS_SlaveRxCpltCallback() is executed and users can
+           add their own code by customization of function pointer HAL_SMBUS_SlaveRxCpltCallback()
+      (+) Enable/Disable the SMBUS alert mode using
+          HAL_SMBUS_EnableAlert_IT() or HAL_SMBUS_DisableAlert_IT()
+      (++) When SMBUS Alert is generated HAL_SMBUS_ErrorCallback() is executed and users can
+           add their own code by customization of function pointer HAL_SMBUS_ErrorCallback()
+           to check the Alert Error Code using function HAL_SMBUS_GetError()
+      (+) Get HAL state machine or error values using HAL_SMBUS_GetState() or HAL_SMBUS_GetError()
+      (+) In case of transfer Error, HAL_SMBUS_ErrorCallback() function is executed and users can
+           add their own code by customization of function pointer HAL_SMBUS_ErrorCallback()
+           to check the Error Code using function HAL_SMBUS_GetError()
 
      *** SMBUS HAL driver macros list ***
      ==================================
      [..]
        Below the list of most used macros in SMBUS HAL driver.
 
-      (+) @ref __HAL_SMBUS_ENABLE:      Enable the SMBUS peripheral
-      (+) @ref __HAL_SMBUS_DISABLE:     Disable the SMBUS peripheral
-      (+) @ref __HAL_SMBUS_GET_FLAG:    Check whether the specified SMBUS flag is set or not
-      (+) @ref __HAL_SMBUS_CLEAR_FLAG:  Clear the specified SMBUS pending flag
-      (+) @ref __HAL_SMBUS_ENABLE_IT:   Enable the specified SMBUS interrupt
-      (+) @ref __HAL_SMBUS_DISABLE_IT:  Disable the specified SMBUS interrupt
+      (+) __HAL_SMBUS_ENABLE:      Enable the SMBUS peripheral
+      (+) __HAL_SMBUS_DISABLE:     Disable the SMBUS peripheral
+      (+) __HAL_SMBUS_GET_FLAG:    Check whether the specified SMBUS flag is set or not
+      (+) __HAL_SMBUS_CLEAR_FLAG:  Clear the specified SMBUS pending flag
+      (+) __HAL_SMBUS_ENABLE_IT:   Enable the specified SMBUS interrupt
+      (+) __HAL_SMBUS_DISABLE_IT:  Disable the specified SMBUS interrupt
 
      *** Callback registration ***
      =============================================
     [..]
      The compilation flag USE_HAL_SMBUS_REGISTER_CALLBACKS when set to 1
      allows the user to configure dynamically the driver callbacks.
-     Use Functions @ref HAL_SMBUS_RegisterCallback() or @ref HAL_SMBUS_RegisterAddrCallback()
+     Use Functions HAL_SMBUS_RegisterCallback() or HAL_SMBUS_RegisterAddrCallback()
      to register an interrupt callback.
     [..]
-     Function @ref HAL_SMBUS_RegisterCallback() allows to register following callbacks:
+     Function HAL_SMBUS_RegisterCallback() allows to register following callbacks:
        (+) MasterTxCpltCallback : callback for Master transmission end of transfer.
        (+) MasterRxCpltCallback : callback for Master reception end of transfer.
        (+) SlaveTxCpltCallback  : callback for Slave transmission end of transfer.
@@ -107,11 +113,11 @@
      This function takes as parameters the HAL peripheral handle, the Callback ID
      and a pointer to the user callback function.
     [..]
-     For specific callback AddrCallback use dedicated register callbacks : @ref HAL_SMBUS_RegisterAddrCallback.
+     For specific callback AddrCallback use dedicated register callbacks : HAL_SMBUS_RegisterAddrCallback.
     [..]
-     Use function @ref HAL_SMBUS_UnRegisterCallback to reset a callback to the default
+     Use function HAL_SMBUS_UnRegisterCallback to reset a callback to the default
      weak function.
-     @ref HAL_SMBUS_UnRegisterCallback takes as parameters the HAL peripheral handle,
+     HAL_SMBUS_UnRegisterCallback takes as parameters the HAL peripheral handle,
      and the Callback ID.
      This function allows to reset following callbacks:
        (+) MasterTxCpltCallback : callback for Master transmission end of transfer.
@@ -123,24 +129,24 @@
        (+) MspInitCallback      : callback for Msp Init.
        (+) MspDeInitCallback    : callback for Msp DeInit.
     [..]
-     For callback AddrCallback use dedicated register callbacks : @ref HAL_SMBUS_UnRegisterAddrCallback.
+     For callback AddrCallback use dedicated register callbacks : HAL_SMBUS_UnRegisterAddrCallback.
     [..]
-     By default, after the @ref HAL_SMBUS_Init() and when the state is @ref HAL_I2C_STATE_RESET
+     By default, after theHAL_SMBUS_Init() and when the state is HAL_I2C_STATE_RESET
      all callbacks are set to the corresponding weak functions:
-     examples @ref HAL_SMBUS_MasterTxCpltCallback(), @ref HAL_SMBUS_MasterRxCpltCallback().
+     examples HAL_SMBUS_MasterTxCpltCallback(), HAL_SMBUS_MasterRxCpltCallback().
      Exception done for MspInit and MspDeInit functions that are
-     reset to the legacy weak functions in the @ref HAL_SMBUS_Init()/ @ref HAL_SMBUS_DeInit() only when
+     reset to the legacy weak functions in the HAL_SMBUS_Init()/ HAL_SMBUS_DeInit() only when
      these callbacks are null (not registered beforehand).
-     If MspInit or MspDeInit are not null, the @ref HAL_SMBUS_Init()/ @ref HAL_SMBUS_DeInit()
+     If MspInit or MspDeInit are not null, the HAL_SMBUS_Init()/ HAL_SMBUS_DeInit()
      keep and use the user MspInit/MspDeInit callbacks (registered beforehand) whatever the state.
     [..]
-     Callbacks can be registered/unregistered in @ref HAL_I2C_STATE_READY state only.
+     Callbacks can be registered/unregistered in HAL_I2C_STATE_READY state only.
      Exception done MspInit/MspDeInit functions that can be registered/unregistered
-     in @ref HAL_I2C_STATE_READY or @ref HAL_I2C_STATE_RESET state,
+     in HAL_I2C_STATE_READY or HAL_I2C_STATE_RESET state,
      thus registered (user) MspInit/DeInit callbacks can be used during the Init/DeInit.
      Then, the user first registers the MspInit/MspDeInit user callbacks
-     using @ref HAL_SMBUS_RegisterCallback() before calling @ref HAL_SMBUS_DeInit()
-     or @ref HAL_SMBUS_Init() function.
+     using HAL_SMBUS_RegisterCallback() before calling  HAL_SMBUS_DeInit()
+     or HAL_SMBUS_Init() function.
     [..]
      When the compilation flag USE_HAL_SMBUS_REGISTER_CALLBACKS is set to 0 or
      not defined, the callback registration feature is not available and all callbacks
@@ -203,8 +209,8 @@
 /** @addtogroup SMBUS_Private_Functions SMBUS Private Functions
   * @{
   */
-static HAL_StatusTypeDef SMBUS_WaitOnFlagUntilTimeout(SMBUS_HandleTypeDef *hsmbus, uint32_t Flag, FlagStatus Status,
-                                                      uint32_t Timeout);
+static HAL_StatusTypeDef SMBUS_WaitOnFlagUntilTimeout(SMBUS_HandleTypeDef *hsmbus, uint32_t Flag,
+                                                      FlagStatus Status, uint32_t Timeout);
 
 static void SMBUS_Enable_IRQ(SMBUS_HandleTypeDef *hsmbus, uint32_t InterruptRequest);
 static void SMBUS_Disable_IRQ(SMBUS_HandleTypeDef *hsmbus, uint32_t InterruptRequest);
@@ -215,8 +221,8 @@ static void SMBUS_ConvertOtherXferOptions(SMBUS_HandleTypeDef *hsmbus);
 
 static void SMBUS_ITErrorHandler(SMBUS_HandleTypeDef *hsmbus);
 
-static void SMBUS_TransferConfig(SMBUS_HandleTypeDef *hsmbus,  uint16_t DevAddress, uint8_t Size, uint32_t Mode,
-                                 uint32_t Request);
+static void SMBUS_TransferConfig(SMBUS_HandleTypeDef *hsmbus,  uint16_t DevAddress, uint8_t Size,
+                                 uint32_t Mode, uint32_t Request);
 /**
   * @}
   */
@@ -364,15 +370,20 @@ HAL_StatusTypeDef HAL_SMBUS_Init(SMBUS_HandleTypeDef *hsmbus)
 
   /*---------------------------- SMBUSx OAR2 Configuration -----------------------*/
   /* Configure SMBUSx: Dual mode and Own Address2 */
-  hsmbus->Instance->OAR2 = (hsmbus->Init.DualAddressMode | hsmbus->Init.OwnAddress2 | (hsmbus->Init.OwnAddress2Masks << 8U));
+  hsmbus->Instance->OAR2 = (hsmbus->Init.DualAddressMode | hsmbus->Init.OwnAddress2 | \
+                            (hsmbus->Init.OwnAddress2Masks << 8U));
 
   /*---------------------------- SMBUSx CR1 Configuration ------------------------*/
   /* Configure SMBUSx: Generalcall and NoStretch mode */
-  hsmbus->Instance->CR1 = (hsmbus->Init.GeneralCallMode | hsmbus->Init.NoStretchMode | hsmbus->Init.PacketErrorCheckMode | hsmbus->Init.PeripheralMode | hsmbus->Init.AnalogFilter);
+  hsmbus->Instance->CR1 = (hsmbus->Init.GeneralCallMode | hsmbus->Init.NoStretchMode | \
+                           hsmbus->Init.PacketErrorCheckMode | hsmbus->Init.PeripheralMode | \
+                           hsmbus->Init.AnalogFilter);
 
-  /* Enable Slave Byte Control only in case of Packet Error Check is enabled and SMBUS Peripheral is set in Slave mode */
-  if ((hsmbus->Init.PacketErrorCheckMode == SMBUS_PEC_ENABLE)
-      && ((hsmbus->Init.PeripheralMode == SMBUS_PERIPHERAL_MODE_SMBUS_SLAVE) || (hsmbus->Init.PeripheralMode == SMBUS_PERIPHERAL_MODE_SMBUS_SLAVE_ARP)))
+  /* Enable Slave Byte Control only in case of Packet Error Check is enabled
+     and SMBUS Peripheral is set in Slave mode */
+  if ((hsmbus->Init.PacketErrorCheckMode == SMBUS_PEC_ENABLE) && \
+      ((hsmbus->Init.PeripheralMode == SMBUS_PERIPHERAL_MODE_SMBUS_SLAVE) || \
+       (hsmbus->Init.PeripheralMode == SMBUS_PERIPHERAL_MODE_SMBUS_SLAVE_ARP)))
   {
     hsmbus->Instance->CR1 |= I2C_CR1_SBC;
   }
@@ -581,7 +592,8 @@ HAL_StatusTypeDef HAL_SMBUS_ConfigDigitalFilter(SMBUS_HandleTypeDef *hsmbus, uin
   * @param  pCallback pointer to the Callback function
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_SMBUS_RegisterCallback(SMBUS_HandleTypeDef *hsmbus, HAL_SMBUS_CallbackIDTypeDef CallbackID,
+HAL_StatusTypeDef HAL_SMBUS_RegisterCallback(SMBUS_HandleTypeDef *hsmbus,
+                                             HAL_SMBUS_CallbackIDTypeDef CallbackID,
                                              pSMBUS_CallbackTypeDef pCallback)
 {
   HAL_StatusTypeDef status = HAL_OK;
@@ -695,7 +707,8 @@ HAL_StatusTypeDef HAL_SMBUS_RegisterCallback(SMBUS_HandleTypeDef *hsmbus, HAL_SM
   *          @arg @ref HAL_SMBUS_MSPDEINIT_CB_ID MspDeInit callback ID
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_SMBUS_UnRegisterCallback(SMBUS_HandleTypeDef *hsmbus, HAL_SMBUS_CallbackIDTypeDef CallbackID)
+HAL_StatusTypeDef HAL_SMBUS_UnRegisterCallback(SMBUS_HandleTypeDef *hsmbus,
+                                               HAL_SMBUS_CallbackIDTypeDef CallbackID)
 {
   HAL_StatusTypeDef status = HAL_OK;
 
@@ -790,7 +803,8 @@ HAL_StatusTypeDef HAL_SMBUS_UnRegisterCallback(SMBUS_HandleTypeDef *hsmbus, HAL_
   * @param  pCallback pointer to the Address Match Callback function
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_SMBUS_RegisterAddrCallback(SMBUS_HandleTypeDef *hsmbus, pSMBUS_AddrCallbackTypeDef pCallback)
+HAL_StatusTypeDef HAL_SMBUS_RegisterAddrCallback(SMBUS_HandleTypeDef *hsmbus,
+                                                 pSMBUS_AddrCallbackTypeDef pCallback)
 {
   HAL_StatusTypeDef status = HAL_OK;
 
@@ -914,8 +928,8 @@ HAL_StatusTypeDef HAL_SMBUS_UnRegisterAddrCallback(SMBUS_HandleTypeDef *hsmbus)
   * @param  XferOptions Options of Transfer, value of @ref SMBUS_XferOptions_definition
   * @retval HAL status
   */
-HAL_StatusTypeDef HAL_SMBUS_Master_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint16_t DevAddress, uint8_t *pData,
-                                               uint16_t Size, uint32_t XferOptions)
+HAL_StatusTypeDef HAL_SMBUS_Master_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint16_t DevAddress,
+                                               uint8_t *pData, uint16_t Size, uint32_t XferOptions)
 {
   uint32_t tmp;
 
@@ -955,7 +969,8 @@ HAL_StatusTypeDef HAL_SMBUS_Master_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint
     if ((hsmbus->XferSize < hsmbus->XferCount) && (hsmbus->XferSize == MAX_NBYTE_SIZE))
     {
       SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize,
-                           SMBUS_RELOAD_MODE | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE), SMBUS_GENERATE_START_WRITE);
+                           SMBUS_RELOAD_MODE | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE),
+                           SMBUS_GENERATE_START_WRITE);
     }
     else
     {
@@ -965,9 +980,11 @@ HAL_StatusTypeDef HAL_SMBUS_Master_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint
       /* Store current volatile XferOptions, misra rule */
       tmp = hsmbus->XferOptions;
 
-      if ((hsmbus->PreviousState == HAL_SMBUS_STATE_MASTER_BUSY_TX) && (IS_SMBUS_TRANSFER_OTHER_OPTIONS_REQUEST(tmp) == 0))
+      if ((hsmbus->PreviousState == HAL_SMBUS_STATE_MASTER_BUSY_TX) && \
+          (IS_SMBUS_TRANSFER_OTHER_OPTIONS_REQUEST(tmp) == 0))
       {
-        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions, SMBUS_NO_STARTSTOP);
+        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions,
+                             SMBUS_NO_STARTSTOP);
       }
       /* Else transfer direction change, so generate Restart with new transfer direction */
       else
@@ -976,7 +993,9 @@ HAL_StatusTypeDef HAL_SMBUS_Master_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint
         SMBUS_ConvertOtherXferOptions(hsmbus);
 
         /* Handle Transfer */
-        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions, SMBUS_GENERATE_START_WRITE);
+        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize,
+                             hsmbus->XferOptions,
+                             SMBUS_GENERATE_START_WRITE);
       }
 
       /* If PEC mode is enable, size to transmit manage by SW part should be Size-1 byte, corresponding to PEC byte */
@@ -1057,7 +1076,8 @@ HAL_StatusTypeDef HAL_SMBUS_Master_Receive_IT(SMBUS_HandleTypeDef *hsmbus, uint1
     if ((hsmbus->XferSize < hsmbus->XferCount) && (hsmbus->XferSize == MAX_NBYTE_SIZE))
     {
       SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize,
-                           SMBUS_RELOAD_MODE  | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE), SMBUS_GENERATE_START_READ);
+                           SMBUS_RELOAD_MODE  | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE),
+                           SMBUS_GENERATE_START_READ);
     }
     else
     {
@@ -1067,9 +1087,11 @@ HAL_StatusTypeDef HAL_SMBUS_Master_Receive_IT(SMBUS_HandleTypeDef *hsmbus, uint1
       /* Store current volatile XferOptions, Misra rule */
       tmp = hsmbus->XferOptions;
 
-      if ((hsmbus->PreviousState == HAL_SMBUS_STATE_MASTER_BUSY_RX) && (IS_SMBUS_TRANSFER_OTHER_OPTIONS_REQUEST(tmp) == 0))
+      if ((hsmbus->PreviousState == HAL_SMBUS_STATE_MASTER_BUSY_RX) && \
+          (IS_SMBUS_TRANSFER_OTHER_OPTIONS_REQUEST(tmp) == 0))
       {
-        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions, SMBUS_NO_STARTSTOP);
+        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions,
+                             SMBUS_NO_STARTSTOP);
       }
       /* Else transfer direction change, so generate Restart with new transfer direction */
       else
@@ -1078,7 +1100,9 @@ HAL_StatusTypeDef HAL_SMBUS_Master_Receive_IT(SMBUS_HandleTypeDef *hsmbus, uint1
         SMBUS_ConvertOtherXferOptions(hsmbus);
 
         /* Handle Transfer */
-        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions, SMBUS_GENERATE_START_READ);
+        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize,
+                             hsmbus->XferOptions,
+                             SMBUS_GENERATE_START_READ);
       }
     }
 
@@ -1222,12 +1246,14 @@ HAL_StatusTypeDef HAL_SMBUS_Slave_Transmit_IT(SMBUS_HandleTypeDef *hsmbus, uint8
     if ((hsmbus->XferSize < hsmbus->XferCount) && (hsmbus->XferSize == MAX_NBYTE_SIZE))
     {
       SMBUS_TransferConfig(hsmbus, 0, (uint8_t)hsmbus->XferSize,
-                           SMBUS_RELOAD_MODE | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE), SMBUS_NO_STARTSTOP);
+                           SMBUS_RELOAD_MODE | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE),
+                           SMBUS_NO_STARTSTOP);
     }
     else
     {
       /* Set NBYTE to transmit */
-      SMBUS_TransferConfig(hsmbus, 0, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions, SMBUS_NO_STARTSTOP);
+      SMBUS_TransferConfig(hsmbus, 0, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions,
+                           SMBUS_NO_STARTSTOP);
 
       /* If PEC mode is enable, size to transmit should be Size-1 byte, corresponding to PEC byte */
       /* PEC byte is automatically sent by HW block, no need to manage it in Transmit process */
@@ -1313,7 +1339,8 @@ HAL_StatusTypeDef HAL_SMBUS_Slave_Receive_IT(SMBUS_HandleTypeDef *hsmbus, uint8_
     /* This RELOAD bit will be reset for last BYTE to be receive in SMBUS_Slave_ISR */
     if (((SMBUS_GET_PEC_MODE(hsmbus) != 0UL) && (hsmbus->XferSize == 2U)) || (hsmbus->XferSize == 1U))
     {
-      SMBUS_TransferConfig(hsmbus, 0, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions, SMBUS_NO_STARTSTOP);
+      SMBUS_TransferConfig(hsmbus, 0, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions,
+                           SMBUS_NO_STARTSTOP);
     }
     else
     {
@@ -1576,7 +1603,8 @@ void HAL_SMBUS_EV_IRQHandler(SMBUS_HandleTypeDef *hsmbus)
   uint32_t tmpcr1value = READ_REG(hsmbus->Instance->CR1);
 
   /* SMBUS in mode Transmitter ---------------------------------------------------*/
-  if ((SMBUS_CHECK_IT_SOURCE(tmpcr1value, (SMBUS_IT_TCI | SMBUS_IT_STOPI | SMBUS_IT_NACKI | SMBUS_IT_TXI)) != RESET) &&
+  if ((SMBUS_CHECK_IT_SOURCE(tmpcr1value, (SMBUS_IT_TCI | SMBUS_IT_STOPI |
+                                           SMBUS_IT_NACKI | SMBUS_IT_TXI)) != RESET) &&
       ((SMBUS_CHECK_FLAG(tmpisrvalue, SMBUS_FLAG_TXIS) != RESET) ||
        (SMBUS_CHECK_FLAG(tmpisrvalue, SMBUS_FLAG_TCR) != RESET) ||
        (SMBUS_CHECK_FLAG(tmpisrvalue, SMBUS_FLAG_TC) != RESET) ||
@@ -1600,7 +1628,8 @@ void HAL_SMBUS_EV_IRQHandler(SMBUS_HandleTypeDef *hsmbus)
   }
 
   /* SMBUS in mode Receiver ----------------------------------------------------*/
-  if ((SMBUS_CHECK_IT_SOURCE(tmpcr1value, (SMBUS_IT_TCI | SMBUS_IT_STOPI | SMBUS_IT_NACKI | SMBUS_IT_RXI)) != RESET) &&
+  if ((SMBUS_CHECK_IT_SOURCE(tmpcr1value, (SMBUS_IT_TCI | SMBUS_IT_STOPI |
+                                           SMBUS_IT_NACKI | SMBUS_IT_RXI)) != RESET) &&
       ((SMBUS_CHECK_FLAG(tmpisrvalue, SMBUS_FLAG_RXNE) != RESET) ||
        (SMBUS_CHECK_FLAG(tmpisrvalue, SMBUS_FLAG_TCR) != RESET) ||
        (SMBUS_CHECK_FLAG(tmpisrvalue, SMBUS_FLAG_TC) != RESET) ||
@@ -1720,7 +1749,8 @@ __weak void HAL_SMBUS_SlaveRxCpltCallback(SMBUS_HandleTypeDef *hsmbus)
   * @param  AddrMatchCode Address Match Code
   * @retval None
   */
-__weak void HAL_SMBUS_AddrCallback(SMBUS_HandleTypeDef *hsmbus, uint8_t TransferDirection, uint16_t AddrMatchCode)
+__weak void HAL_SMBUS_AddrCallback(SMBUS_HandleTypeDef *hsmbus, uint8_t TransferDirection,
+                                   uint16_t AddrMatchCode)
 {
   /* Prevent unused argument(s) compilation warning */
   UNUSED(hsmbus);
@@ -1879,7 +1909,7 @@ static HAL_StatusTypeDef SMBUS_Master_ISR(SMBUS_HandleTypeDef *hsmbus, uint32_t
       /* Process Unlocked */
       __HAL_UNLOCK(hsmbus);
 
-      /* re-enable the selected SMBUS peripheral */
+      /* Re-enable the selected SMBUS peripheral */
       __HAL_SMBUS_ENABLE(hsmbus);
 
       /* Call the corresponding callback to inform upper layer of End of Transfer */
@@ -1967,13 +1997,15 @@ static HAL_StatusTypeDef SMBUS_Master_ISR(SMBUS_HandleTypeDef *hsmbus, uint32_t
       if (hsmbus->XferCount > MAX_NBYTE_SIZE)
       {
         SMBUS_TransferConfig(hsmbus, DevAddress, MAX_NBYTE_SIZE,
-                             (SMBUS_RELOAD_MODE | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE)), SMBUS_NO_STARTSTOP);
+                             (SMBUS_RELOAD_MODE | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE)),
+                             SMBUS_NO_STARTSTOP);
         hsmbus->XferSize = MAX_NBYTE_SIZE;
       }
       else
       {
         hsmbus->XferSize = hsmbus->XferCount;
-        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions, SMBUS_NO_STARTSTOP);
+        SMBUS_TransferConfig(hsmbus, DevAddress, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions,
+                             SMBUS_NO_STARTSTOP);
         /* If PEC mode is enable, size to transmit should be Size-1 byte, corresponding to PEC byte */
         /* PEC byte is automatically sent by HW block, no need to manage it in Transmit process */
         if (SMBUS_GET_PEC_MODE(hsmbus) != 0UL)
@@ -2225,7 +2257,9 @@ static HAL_StatusTypeDef SMBUS_Slave_ISR(SMBUS_HandleTypeDef *hsmbus, uint32_t S
       else
       {
         /* Set Reload for next Bytes */
-        SMBUS_TransferConfig(hsmbus, 0, 1, SMBUS_RELOAD_MODE  | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE), SMBUS_NO_STARTSTOP);
+        SMBUS_TransferConfig(hsmbus, 0, 1,
+                             SMBUS_RELOAD_MODE  | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE),
+                             SMBUS_NO_STARTSTOP);
 
         /* Ack last Byte Read */
         hsmbus->Instance->CR2 &= ~I2C_CR2_NACK;
@@ -2237,14 +2271,16 @@ static HAL_StatusTypeDef SMBUS_Slave_ISR(SMBUS_HandleTypeDef *hsmbus, uint32_t S
       {
         if (hsmbus->XferCount > MAX_NBYTE_SIZE)
         {
-          SMBUS_TransferConfig(hsmbus, 0, MAX_NBYTE_SIZE, (SMBUS_RELOAD_MODE | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE)),
+          SMBUS_TransferConfig(hsmbus, 0, MAX_NBYTE_SIZE,
+                               (SMBUS_RELOAD_MODE | (hsmbus->XferOptions & SMBUS_SENDPEC_MODE)),
                                SMBUS_NO_STARTSTOP);
           hsmbus->XferSize = MAX_NBYTE_SIZE;
         }
         else
         {
           hsmbus->XferSize = hsmbus->XferCount;
-          SMBUS_TransferConfig(hsmbus, 0, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions, SMBUS_NO_STARTSTOP);
+          SMBUS_TransferConfig(hsmbus, 0, (uint8_t)hsmbus->XferSize, hsmbus->XferOptions,
+                               SMBUS_NO_STARTSTOP);
           /* If PEC mode is enable, size to transmit should be Size-1 byte, corresponding to PEC byte */
           /* PEC byte is automatically sent by HW block, no need to manage it in Transmit process */
           if (SMBUS_GET_PEC_MODE(hsmbus) != 0UL)
@@ -2489,7 +2525,8 @@ static void SMBUS_ITErrorHandler(SMBUS_HandleTypeDef *hsmbus)
   uint32_t tmperror;
 
   /* SMBUS Bus error interrupt occurred ------------------------------------*/
-  if (((itflags & SMBUS_FLAG_BERR) == SMBUS_FLAG_BERR) && ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
+  if (((itflags & SMBUS_FLAG_BERR) == SMBUS_FLAG_BERR) && \
+      ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
   {
     hsmbus->ErrorCode |= HAL_SMBUS_ERROR_BERR;
 
@@ -2498,7 +2535,8 @@ static void SMBUS_ITErrorHandler(SMBUS_HandleTypeDef *hsmbus)
   }
 
   /* SMBUS Over-Run/Under-Run interrupt occurred ----------------------------------------*/
-  if (((itflags & SMBUS_FLAG_OVR) == SMBUS_FLAG_OVR) && ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
+  if (((itflags & SMBUS_FLAG_OVR) == SMBUS_FLAG_OVR) && \
+      ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
   {
     hsmbus->ErrorCode |= HAL_SMBUS_ERROR_OVR;
 
@@ -2507,7 +2545,8 @@ static void SMBUS_ITErrorHandler(SMBUS_HandleTypeDef *hsmbus)
   }
 
   /* SMBUS Arbitration Loss error interrupt occurred ------------------------------------*/
-  if (((itflags & SMBUS_FLAG_ARLO) == SMBUS_FLAG_ARLO) && ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
+  if (((itflags & SMBUS_FLAG_ARLO) == SMBUS_FLAG_ARLO) && \
+      ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
   {
     hsmbus->ErrorCode |= HAL_SMBUS_ERROR_ARLO;
 
@@ -2516,7 +2555,8 @@ static void SMBUS_ITErrorHandler(SMBUS_HandleTypeDef *hsmbus)
   }
 
   /* SMBUS Timeout error interrupt occurred ---------------------------------------------*/
-  if (((itflags & SMBUS_FLAG_TIMEOUT) == SMBUS_FLAG_TIMEOUT) && ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
+  if (((itflags & SMBUS_FLAG_TIMEOUT) == SMBUS_FLAG_TIMEOUT) && \
+      ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
   {
     hsmbus->ErrorCode |= HAL_SMBUS_ERROR_BUSTIMEOUT;
 
@@ -2525,7 +2565,8 @@ static void SMBUS_ITErrorHandler(SMBUS_HandleTypeDef *hsmbus)
   }
 
   /* SMBUS Alert error interrupt occurred -----------------------------------------------*/
-  if (((itflags & SMBUS_FLAG_ALERT) == SMBUS_FLAG_ALERT) && ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
+  if (((itflags & SMBUS_FLAG_ALERT) == SMBUS_FLAG_ALERT) && \
+      ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
   {
     hsmbus->ErrorCode |= HAL_SMBUS_ERROR_ALERT;
 
@@ -2534,7 +2575,8 @@ static void SMBUS_ITErrorHandler(SMBUS_HandleTypeDef *hsmbus)
   }
 
   /* SMBUS Packet Error Check error interrupt occurred ----------------------------------*/
-  if (((itflags & SMBUS_FLAG_PECERR) == SMBUS_FLAG_PECERR) && ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
+  if (((itflags & SMBUS_FLAG_PECERR) == SMBUS_FLAG_PECERR) && \
+      ((itsources & SMBUS_IT_ERRI) == SMBUS_IT_ERRI))
   {
     hsmbus->ErrorCode |= HAL_SMBUS_ERROR_PECERR;
 
@@ -2582,8 +2624,8 @@ static void SMBUS_ITErrorHandler(SMBUS_HandleTypeDef *hsmbus)
   * @param  Timeout Timeout duration
   * @retval HAL status
   */
-static HAL_StatusTypeDef SMBUS_WaitOnFlagUntilTimeout(SMBUS_HandleTypeDef *hsmbus, uint32_t Flag, FlagStatus Status,
-                                                      uint32_t Timeout)
+static HAL_StatusTypeDef SMBUS_WaitOnFlagUntilTimeout(SMBUS_HandleTypeDef *hsmbus, uint32_t Flag,
+                                                      FlagStatus Status, uint32_t Timeout)
 {
   uint32_t tickstart = HAL_GetTick();
 
@@ -2632,8 +2674,8 @@ static HAL_StatusTypeDef SMBUS_WaitOnFlagUntilTimeout(SMBUS_HandleTypeDef *hsmbu
   *     @arg @ref SMBUS_GENERATE_START_WRITE Generate Restart for write request.
   * @retval None
   */
-static void SMBUS_TransferConfig(SMBUS_HandleTypeDef *hsmbus,  uint16_t DevAddress, uint8_t Size, uint32_t Mode,
-                                 uint32_t Request)
+static void SMBUS_TransferConfig(SMBUS_HandleTypeDef *hsmbus,  uint16_t DevAddress, uint8_t Size,
+                                 uint32_t Mode, uint32_t Request)
 {
   /* Check the parameters */
   assert_param(IS_SMBUS_ALL_INSTANCE(hsmbus->Instance));
@@ -2644,9 +2686,10 @@ static void SMBUS_TransferConfig(SMBUS_HandleTypeDef *hsmbus,  uint16_t DevAddre
   MODIFY_REG(hsmbus->Instance->CR2,
              ((I2C_CR2_SADD | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_AUTOEND | \
                (I2C_CR2_RD_WRN & (uint32_t)(Request >> (31UL - I2C_CR2_RD_WRN_Pos))) | \
-               I2C_CR2_START | I2C_CR2_STOP  | I2C_CR2_PECBYTE)), \
+               I2C_CR2_START | I2C_CR2_STOP | I2C_CR2_PECBYTE)), \
              (uint32_t)(((uint32_t)DevAddress & I2C_CR2_SADD) | \
-                        (((uint32_t)Size << I2C_CR2_NBYTES_Pos) & I2C_CR2_NBYTES) | (uint32_t)Mode | (uint32_t)Request));
+                        (((uint32_t)Size << I2C_CR2_NBYTES_Pos) & I2C_CR2_NBYTES) | \
+                        (uint32_t)Mode | (uint32_t)Request));
 }
 
 /**
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smbus_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smbus_ex.c
new file mode 100644
index 00000000..f249e07d
--- /dev/null
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_smbus_ex.c
@@ -0,0 +1,146 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_smbus_ex.c
+  * @author  MCD Application Team
+  * @brief   SMBUS Extended HAL module driver.
+  *          This file provides firmware functions to manage the following
+  *          functionalities of SMBUS Extended peripheral:
+  *           + Extended features functions
+  *
+  @verbatim
+  ==============================================================================
+               ##### SMBUS peripheral Extended features  #####
+  ==============================================================================
+
+  [..] Comparing to other previous devices, the SMBUS interface for STM32WLxx
+       devices contains the following additional features
+
+       (+) Disable or enable Fast Mode Plus
+
+                     ##### How to use this driver #####
+  ==============================================================================
+    (#) Configure the enable or disable of fast mode plus driving capability using the functions :
+          (++) HAL_SMBUSEx_EnableFastModePlus()
+          (++) HAL_SMBUSEx_DisableFastModePlus()
+  @endverbatim
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup STM32WLxx_HAL_Driver
+  * @{
+  */
+
+/** @defgroup SMBUSEx SMBUSEx
+  * @brief SMBUS Extended HAL module driver
+  * @{
+  */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+
+/** @defgroup SMBUSEx_Exported_Functions SMBUS Extended Exported Functions
+  * @{
+  */
+
+/** @defgroup SMBUSEx_Exported_Functions_Group1 Extended features functions
+  * @brief    Extended features functions
+  *
+@verbatim
+ ===============================================================================
+                      ##### Extended features functions #####
+ ===============================================================================
+    [..] This section provides functions allowing to:
+
+      (+) Configure Fast Mode Plus
+
+@endverbatim
+  * @{
+  */
+
+/**
+  * @brief Enable the SMBUS fast mode plus driving capability.
+  * @param ConfigFastModePlus Selects the pin.
+  *   This parameter can be one of the @ref SMBUSEx_FastModePlus values
+  * @note  For I2C1, fast mode plus driving capability can be enabled on all selected
+  *        I2C1 pins using I2C_FASTMODEPLUS_I2C1 parameter or independently
+  *        on each one of the following pins PB6, PB7, PB8 and PB9.
+  * @note  For remaining I2C1 pins (PA14, PA15...) fast mode plus driving capability
+  *        can be enabled only by using I2C_FASTMODEPLUS_I2C1 parameter.
+  * @note  For all I2C2 pins fast mode plus driving capability can be enabled
+  *        only by using I2C_FASTMODEPLUS_I2C2 parameter.
+  * @note  For all I2C3 pins fast mode plus driving capability can be enabled
+  *        only by using I2C_FASTMODEPLUS_I2C3 parameter.
+  * @retval None
+  */
+void HAL_SMBUSEx_EnableFastModePlus(uint32_t ConfigFastModePlus)
+{
+  /* Check the parameter */
+  assert_param(IS_SMBUS_FASTMODEPLUS(ConfigFastModePlus));
+
+  /* Enable fast mode plus driving capability for selected pin */
+  SET_BIT(SYSCFG->CFGR1, (uint32_t)ConfigFastModePlus);
+}
+
+/**
+  * @brief Disable the SMBUS fast mode plus driving capability.
+  * @param ConfigFastModePlus Selects the pin.
+  *   This parameter can be one of the @ref SMBUSEx_FastModePlus values
+  * @note  For I2C1, fast mode plus driving capability can be disabled on all selected
+  *        I2C1 pins using I2C_FASTMODEPLUS_I2C1 parameter or independently
+  *        on each one of the following pins PB6, PB7, PB8 and PB9.
+  * @note  For remaining I2C1 pins (PA14, PA15...) fast mode plus driving capability
+  *        can be disabled only by using I2C_FASTMODEPLUS_I2C1 parameter.
+  * @note  For all I2C2 pins fast mode plus driving capability can be disabled
+  *        only by using I2C_FASTMODEPLUS_I2C2 parameter.
+  * @note  For all I2C3 pins fast mode plus driving capability can be disabled
+  *        only by using I2C_FASTMODEPLUS_I2C3 parameter.
+  * @retval None
+  */
+void HAL_SMBUSEx_DisableFastModePlus(uint32_t ConfigFastModePlus)
+{
+  /* Check the parameter */
+  assert_param(IS_SMBUS_FASTMODEPLUS(ConfigFastModePlus));
+
+  /* Disable fast mode plus driving capability for selected pin */
+  CLEAR_BIT(SYSCFG->CFGR1, (uint32_t)ConfigFastModePlus);
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c
index f494700b..dd824024 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c
@@ -1007,6 +1007,11 @@ HAL_StatusTypeDef HAL_SPI_Transmit(SPI_HandleTypeDef *hspi, uint8_t *pData, uint
   */
 HAL_StatusTypeDef HAL_SPI_Receive(SPI_HandleTypeDef *hspi, uint8_t *pData, uint16_t Size, uint32_t Timeout)
 {
+#if (USE_SPI_CRC != 0U)
+  __IO uint32_t tmpreg = 0U;
+  __IO uint8_t  * ptmpreg8;
+  __IO uint8_t  tmpreg8 = 0;
+#endif /* USE_SPI_CRC */
   uint32_t tickstart;
   HAL_StatusTypeDef errorcode = HAL_OK;
 
@@ -1173,12 +1178,18 @@ HAL_StatusTypeDef HAL_SPI_Receive(SPI_HandleTypeDef *hspi, uint8_t *pData, uint1
     if (hspi->Init.DataSize == SPI_DATASIZE_16BIT)
     {
       /* Read 16bit CRC */
-      READ_REG(hspi->Instance->DR);
+      tmpreg = READ_REG(hspi->Instance->DR);
+      /* To avoid GCC warning */
+      UNUSED(tmpreg);
     }
     else
     {
+      /* Initialize the 8bit temporary pointer */
+      ptmpreg8 = (__IO uint8_t *)&hspi->Instance->DR;
       /* Read 8bit CRC */
-      READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+      tmpreg8 = *ptmpreg8;
+      /* To avoid GCC warning */
+      UNUSED(tmpreg8);
 
       if ((hspi->Init.DataSize == SPI_DATASIZE_8BIT) && (hspi->Init.CRCLength == SPI_CRC_LENGTH_16BIT))
       {
@@ -1190,7 +1201,9 @@ HAL_StatusTypeDef HAL_SPI_Receive(SPI_HandleTypeDef *hspi, uint8_t *pData, uint1
           goto error;
         }
         /* Read 8bit CRC again in case of 16bit CRC in 8bit Data mode */
-        READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+        tmpreg8 = *ptmpreg8;
+        /* To avoid GCC warning */
+        UNUSED(tmpreg8);
       }
     }
   }
@@ -1241,8 +1254,11 @@ HAL_StatusTypeDef HAL_SPI_TransmitReceive(SPI_HandleTypeDef *hspi, uint8_t *pTxD
   HAL_SPI_StateTypeDef tmp_state;
   uint32_t             tickstart;
 #if (USE_SPI_CRC != 0U)
+  __IO uint32_t tmpreg = 0U;
   uint32_t             spi_cr1;
   uint32_t             spi_cr2;
+  __IO uint8_t  * ptmpreg8;
+  __IO uint8_t  tmpreg8 = 0;
 #endif /* USE_SPI_CRC */
 
   /* Variable used to alternate Rx and Tx during transfer */
@@ -1476,12 +1492,18 @@ HAL_StatusTypeDef HAL_SPI_TransmitReceive(SPI_HandleTypeDef *hspi, uint8_t *pTxD
     if (hspi->Init.DataSize == SPI_DATASIZE_16BIT)
     {
       /* Read 16bit CRC */
-      READ_REG(hspi->Instance->DR);
+      tmpreg = READ_REG(hspi->Instance->DR);
+      /* To avoid GCC warning */
+      UNUSED(tmpreg);
     }
     else
     {
+      /* Initialize the 8bit temporary pointer */
+      ptmpreg8 = (__IO uint8_t *)&hspi->Instance->DR;
       /* Read 8bit CRC */
-      READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+      tmpreg8 = *ptmpreg8;
+      /* To avoid GCC warning */
+      UNUSED(tmpreg8);
 
       if (hspi->Init.CRCLength == SPI_CRC_LENGTH_16BIT)
       {
@@ -1493,7 +1515,9 @@ HAL_StatusTypeDef HAL_SPI_TransmitReceive(SPI_HandleTypeDef *hspi, uint8_t *pTxD
           goto error;
         }
         /* Read 8bit CRC again in case of 16bit CRC in 8bit Data mode */
-        READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+        tmpreg8 = *ptmpreg8;
+        /* To avoid GCC warning */
+        UNUSED(tmpreg8);
       }
     }
   }
@@ -3048,6 +3072,11 @@ static void SPI_DMAReceiveCplt(DMA_HandleTypeDef *hdma)
 {
   SPI_HandleTypeDef *hspi = (SPI_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent); /* Derogation MISRAC2012-Rule-11.5 */
   uint32_t tickstart;
+#if (USE_SPI_CRC != 0U)
+  __IO uint32_t tmpreg = 0U;
+  __IO uint8_t  * ptmpreg8;
+  __IO uint8_t  tmpreg8 = 0;
+#endif /* USE_SPI_CRC */
 
   /* Init tickstart for timeout management*/
   tickstart = HAL_GetTick();
@@ -3072,12 +3101,18 @@ static void SPI_DMAReceiveCplt(DMA_HandleTypeDef *hdma)
       if (hspi->Init.DataSize > SPI_DATASIZE_8BIT)
       {
         /* Read 16bit CRC */
-        READ_REG(hspi->Instance->DR);
+        tmpreg = READ_REG(hspi->Instance->DR);
+        /* To avoid GCC warning */
+        UNUSED(tmpreg);
       }
       else
       {
+        /* Initialize the 8bit temporary pointer */
+        ptmpreg8 = (__IO uint8_t *)&hspi->Instance->DR;
         /* Read 8bit CRC */
-        READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+        tmpreg8 = *ptmpreg8;
+        /* To avoid GCC warning */
+        UNUSED(tmpreg8);
 
         if (hspi->Init.CRCLength == SPI_CRC_LENGTH_16BIT)
         {
@@ -3087,7 +3122,9 @@ static void SPI_DMAReceiveCplt(DMA_HandleTypeDef *hdma)
             SET_BIT(hspi->ErrorCode, HAL_SPI_ERROR_CRC);
           }
           /* Read 8bit CRC again in case of 16bit CRC in 8bit Data mode */
-          READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+          tmpreg8 = *ptmpreg8;
+          /* To avoid GCC warning */
+          UNUSED(tmpreg8);
         }
       }
     }
@@ -3152,6 +3189,11 @@ static void SPI_DMATransmitReceiveCplt(DMA_HandleTypeDef *hdma)
 {
   SPI_HandleTypeDef *hspi = (SPI_HandleTypeDef *)(((DMA_HandleTypeDef *)hdma)->Parent); /* Derogation MISRAC2012-Rule-11.5 */
   uint32_t tickstart;
+#if (USE_SPI_CRC != 0U)
+  __IO uint32_t tmpreg = 0U;
+  __IO uint8_t  * ptmpreg8;
+  __IO uint8_t  tmpreg8 = 0;
+#endif /* USE_SPI_CRC */
 
   /* Init tickstart for timeout management*/
   tickstart = HAL_GetTick();
@@ -3174,8 +3216,12 @@ static void SPI_DMATransmitReceiveCplt(DMA_HandleTypeDef *hdma)
           /* Error on the CRC reception */
           SET_BIT(hspi->ErrorCode, HAL_SPI_ERROR_CRC);
         }
-        /* Read CRC to Flush DR and RXNE flag */
-        READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+        /* Initialize the 8bit temporary pointer */
+        ptmpreg8 = (__IO uint8_t *)&hspi->Instance->DR;
+        /* Read 8bit CRC */
+        tmpreg8 = *ptmpreg8;
+        /* To avoid GCC warning */
+        UNUSED(tmpreg8);
       }
       else
       {
@@ -3185,7 +3231,9 @@ static void SPI_DMATransmitReceiveCplt(DMA_HandleTypeDef *hdma)
           SET_BIT(hspi->ErrorCode, HAL_SPI_ERROR_CRC);
         }
         /* Read CRC to Flush DR and RXNE flag */
-        READ_REG(hspi->Instance->DR);
+        tmpreg = READ_REG(hspi->Instance->DR);
+        /* To avoid GCC warning */
+        UNUSED(tmpreg);
       }
     }
 #endif /* USE_SPI_CRC */
@@ -3520,8 +3568,15 @@ static void SPI_2linesRxISR_8BIT(struct __SPI_HandleTypeDef *hspi)
   */
 static void SPI_2linesRxISR_8BITCRC(struct __SPI_HandleTypeDef *hspi)
 {
+  __IO uint8_t  * ptmpreg8;
+  __IO uint8_t  tmpreg8 = 0;
+
+  /* Initialize the 8bit temporary pointer */
+  ptmpreg8 = (__IO uint8_t *)&hspi->Instance->DR;
   /* Read 8bit CRC to flush Data Register */
-  READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+  tmpreg8 = *ptmpreg8;
+  /* To avoid GCC warning */
+  UNUSED(tmpreg8);
 
   hspi->CRCSize--;
 
@@ -3628,8 +3683,12 @@ static void SPI_2linesRxISR_16BIT(struct __SPI_HandleTypeDef *hspi)
   */
 static void SPI_2linesRxISR_16BITCRC(struct __SPI_HandleTypeDef *hspi)
 {
+  __IO uint32_t tmpreg = 0U;
+
   /* Read 16bit CRC to flush Data Register */
-  READ_REG(hspi->Instance->DR);
+  tmpreg = READ_REG(hspi->Instance->DR);
+  /* To avoid GCC warning */
+  UNUSED(tmpreg);  
 
   /* Disable RXNE interrupt */
   __HAL_SPI_DISABLE_IT(hspi, SPI_IT_RXNE);
@@ -3684,8 +3743,15 @@ static void SPI_2linesTxISR_16BIT(struct __SPI_HandleTypeDef *hspi)
   */
 static void SPI_RxISR_8BITCRC(struct __SPI_HandleTypeDef *hspi)
 {
+  __IO uint8_t  * ptmpreg8;
+  __IO uint8_t  tmpreg8 = 0;
+
+  /* Initialize the 8bit temporary pointer */
+  ptmpreg8 = (__IO uint8_t *)&hspi->Instance->DR;
   /* Read 8bit CRC to flush Data Register */
-  READ_REG(*(__IO uint8_t *)&hspi->Instance->DR);
+  tmpreg8 = *ptmpreg8;
+  /* To avoid GCC warning */
+  UNUSED(tmpreg8);
 
   hspi->CRCSize--;
 
@@ -3738,8 +3804,12 @@ static void SPI_RxISR_8BIT(struct __SPI_HandleTypeDef *hspi)
   */
 static void SPI_RxISR_16BITCRC(struct __SPI_HandleTypeDef *hspi)
 {
+  __IO uint32_t tmpreg = 0U;
+
   /* Read 16bit CRC to flush Data Register */
-  READ_REG(hspi->Instance->DR);
+  tmpreg = READ_REG(hspi->Instance->DR);
+  /* To avoid GCC warning */
+  UNUSED(tmpreg);
 
   /* Disable RXNE and ERR interrupt */
   __HAL_SPI_DISABLE_IT(hspi, (SPI_IT_RXNE | SPI_IT_ERR));
@@ -3917,11 +3987,16 @@ static HAL_StatusTypeDef SPI_WaitFifoStateUntilTimeout(SPI_HandleTypeDef *hspi,
   __IO uint32_t count;
   uint32_t tmp_timeout;
   uint32_t tmp_tickstart;
+  __IO uint8_t  * ptmpreg8;
+  __IO uint8_t  tmpreg8 = 0;
 
   /* Adjust Timeout value  in case of end of transfer */
   tmp_timeout = Timeout - (HAL_GetTick() - Tickstart);
   tmp_tickstart = HAL_GetTick();
 
+  /* Initialize the 8bit temporary pointer */
+  ptmpreg8 = (__IO uint8_t *)&hspi->Instance->DR;
+
   /* Calculate Timeout based on a software loop to avoid blocking issue if Systick is disabled */
   count = tmp_timeout * ((SystemCoreClock * 35U) >> 20U);
 
@@ -3929,8 +4004,10 @@ static HAL_StatusTypeDef SPI_WaitFifoStateUntilTimeout(SPI_HandleTypeDef *hspi,
   {
     if ((Fifo == SPI_SR_FRLVL) && (State == SPI_FRLVL_EMPTY))
     {
-      /* Read 8bit CRC to flush Data Register */
-      READ_REG(*((__IO uint8_t *)&hspi->Instance->DR));
+      /* Flush Data Register by a blank read */
+      tmpreg8 = *ptmpreg8;
+      /* To avoid GCC warning */
+      UNUSED(tmpreg8);
     }
 
     if (Timeout != HAL_MAX_DELAY)
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c
index e2fa9a8e..bc5a3f72 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c
@@ -155,6 +155,7 @@
 /* SystemCoreClock dividers. Corresponding to time execution of while loop.   */
 #define SUBGHZ_DEFAULT_LOOP_TIME   ((SystemCoreClock*28U)>>19U)
 #define SUBGHZ_RFBUSY_LOOP_TIME    ((SystemCoreClock*24U)>>20U)
+#define SUBGHZ_NSS_LOOP_TIME       ((SystemCoreClock*24U)>>16U)
 /**
   * @}
   */
@@ -319,6 +320,7 @@ HAL_StatusTypeDef HAL_SUBGHZ_Init(SUBGHZ_HandleTypeDef *hsubghz)
 HAL_StatusTypeDef HAL_SUBGHZ_DeInit(SUBGHZ_HandleTypeDef *hsubghz)
 {
   HAL_StatusTypeDef status;
+  __IO uint32_t count;
 
   /* Check the SUBGHZ handle allocation */
   if (hsubghz == NULL)
@@ -363,8 +365,25 @@ HAL_StatusTypeDef HAL_SUBGHZ_DeInit(SUBGHZ_HandleTypeDef *hsubghz)
   LL_PWR_SetRadioBusyTrigger(LL_PWR_RADIO_BUSY_TRIGGER_NONE);
 #endif /* CM0PLUS */
 
-  /* Disable the Radio peripheral  Reset signal */
-  LL_RCC_RF_DisableReset();
+  /* Clear Pending Flag */
+  LL_PWR_ClearFlag_RFBUSY();
+
+  /* Re-asserts the reset signal of the Radio peripheral */
+  LL_RCC_RF_EnableReset();
+
+  /* Verify that Radio in reset status flag is set */
+  count  = SUBGHZ_DEFAULT_TIMEOUT * SUBGHZ_DEFAULT_LOOP_TIME;
+
+  do
+  {
+    if (count == 0U)
+    {
+      status  = HAL_ERROR;
+      hsubghz->ErrorCode = HAL_SUBGHZ_ERROR_TIMEOUT;
+      break;
+    }
+    count--;
+  } while (LL_RCC_IsRFUnderReset() != 1UL);
 
   hsubghz->ErrorCode = HAL_SUBGHZ_ERROR_NONE;
   hsubghz->State     = HAL_SUBGHZ_STATE_RESET;
@@ -1677,13 +1696,22 @@ HAL_StatusTypeDef SUBGHZSPI_Receive(SUBGHZ_HandleTypeDef *hsubghz,
   */
 HAL_StatusTypeDef SUBGHZ_CheckDeviceReady(SUBGHZ_HandleTypeDef *hsubghz)
 {
+  __IO uint32_t count;
+
   /* Wakeup radio in case of sleep mode: Select-Unselect radio */
   if (hsubghz->DeepSleep == SUBGHZ_DEEP_SLEEP_ENABLE)
   {
+    /* Initialize NSS switch Delay */
+    count  = SUBGHZ_NSS_LOOP_TIME;
+
     /* NSS = 0; */
     LL_PWR_SelectSUBGHZSPI_NSS();
 
-    HAL_Delay(1);
+    /* Wait Radio wakeup */
+    do
+    {
+      count--;
+    } while (count != 0UL);
 
     /* NSS = 1 */
     LL_PWR_UnselectSUBGHZSPI_NSS();
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c
index be883ae5..a2575c2f 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c
@@ -103,14 +103,14 @@
   allows the user to configure dynamically the driver callbacks.
 
   [..]
-  Use Function @ref HAL_TIM_RegisterCallback() to register a callback.
-  @ref HAL_TIM_RegisterCallback() takes as parameters the HAL peripheral handle,
+  Use Function HAL_TIM_RegisterCallback() to register a callback.
+  HAL_TIM_RegisterCallback() takes as parameters the HAL peripheral handle,
   the Callback ID and a pointer to the user callback function.
 
   [..]
-  Use function @ref HAL_TIM_UnRegisterCallback() to reset a callback to the default
+  Use function HAL_TIM_UnRegisterCallback() to reset a callback to the default
   weak function.
-  @ref HAL_TIM_UnRegisterCallback takes as parameters the HAL peripheral handle,
+  HAL_TIM_UnRegisterCallback takes as parameters the HAL peripheral handle,
   and the Callback ID.
 
   [..]
@@ -147,7 +147,7 @@
   [..]
 By default, after the Init and when the state is HAL_TIM_STATE_RESET
 all interrupt callbacks are set to the corresponding weak functions:
-  examples @ref HAL_TIM_TriggerCallback(), @ref HAL_TIM_ErrorCallback().
+  examples HAL_TIM_TriggerCallback(), HAL_TIM_ErrorCallback().
 
   [..]
   Exception done for MspInit and MspDeInit functions that are reset to the legacy weak
@@ -161,7 +161,7 @@ all interrupt callbacks are set to the corresponding weak functions:
     in HAL_TIM_STATE_READY or HAL_TIM_STATE_RESET state,
     thus registered(user) MspInit / DeInit callbacks can be used during the Init / DeInit.
   In that case first register the MspInit/MspDeInit user callbacks
-      using @ref HAL_TIM_RegisterCallback() before calling DeInit or Init function.
+      using HAL_TIM_RegisterCallback() before calling DeInit or Init function.
 
   [..]
       When The compilation define USE_HAL_TIM_REGISTER_CALLBACKS is set to 0 or
@@ -2333,6 +2333,23 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel
     return HAL_ERROR;
   }
 
+  /* Enable the Input Capture channel */
+  TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE);
+
+  /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */
+  if (IS_TIM_SLAVE_INSTANCE(htim->Instance))
+  {
+    tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS;
+    if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr))
+    {
+      __HAL_TIM_ENABLE(htim);
+    }
+  }
+  else
+  {
+    __HAL_TIM_ENABLE(htim);
+  }
+
   switch (Channel)
   {
     case TIM_CHANNEL_1:
@@ -2419,23 +2436,6 @@ HAL_StatusTypeDef HAL_TIM_IC_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Channel
       break;
   }
 
-  /* Enable the Input Capture channel */
-  TIM_CCxChannelCmd(htim->Instance, Channel, TIM_CCx_ENABLE);
-
-  /* Enable the Peripheral, except in trigger mode where enable is automatically done with trigger */
-  if (IS_TIM_SLAVE_INSTANCE(htim->Instance))
-  {
-    tmpsmcr = htim->Instance->SMCR & TIM_SMCR_SMS;
-    if (!IS_TIM_SLAVEMODE_TRIGGER_ENABLED(tmpsmcr))
-    {
-      __HAL_TIM_ENABLE(htim);
-    }
-  }
-  else
-  {
-    __HAL_TIM_ENABLE(htim);
-  }
-
   /* Return function status */
   return HAL_OK;
 }
@@ -2690,11 +2690,12 @@ __weak void HAL_TIM_OnePulse_MspDeInit(TIM_HandleTypeDef *htim)
 
 /**
   * @brief  Starts the TIM One Pulse signal generation.
+  * @note Though OutputChannel parameter is deprecated and ignored by the function
+  *        it has been kept to avoid HAL_TIM API compatibility break.
+  * @note The pulse output channel is determined when calling
+  *       @ref HAL_TIM_OnePulse_ConfigChannel().
   * @param  htim TIM One Pulse handle
-  * @param  OutputChannel TIM Channels to be enabled
-  *          This parameter can be one of the following values:
-  *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
-  *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
+  * @param  OutputChannel See note above
   * @retval HAL status
   */
 HAL_StatusTypeDef HAL_TIM_OnePulse_Start(TIM_HandleTypeDef *htim, uint32_t OutputChannel)
@@ -2726,7 +2727,7 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Start(TIM_HandleTypeDef *htim, uint32_t Outpu
     (in the OPM Mode the two possible channels that can be used are TIM_CHANNEL_1 and TIM_CHANNEL_2)
     if TIM_CHANNEL_1 is used as output, the TIM_CHANNEL_2 will be used as input and
     if TIM_CHANNEL_1 is used as input, the TIM_CHANNEL_2 will be used as output
-    in all combinations, the TIM_CHANNEL_1 and TIM_CHANNEL_2 should be enabled together
+    whatever the combination, the TIM_CHANNEL_1 and TIM_CHANNEL_2 should be enabled together
 
     No need to enable the counter, it's enabled automatically by hardware
     (the counter starts in response to a stimulus and generate a pulse */
@@ -2746,11 +2747,12 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Start(TIM_HandleTypeDef *htim, uint32_t Outpu
 
 /**
   * @brief  Stops the TIM One Pulse signal generation.
+  * @note Though OutputChannel parameter is deprecated and ignored by the function
+  *        it has been kept to avoid HAL_TIM API compatibility break.
+  * @note The pulse output channel is determined when calling
+  *       @ref HAL_TIM_OnePulse_ConfigChannel().
   * @param  htim TIM One Pulse handle
-  * @param  OutputChannel TIM Channels to be disable
-  *          This parameter can be one of the following values:
-  *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
-  *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
+  * @param  OutputChannel See note above
   * @retval HAL status
   */
 HAL_StatusTypeDef HAL_TIM_OnePulse_Stop(TIM_HandleTypeDef *htim, uint32_t OutputChannel)
@@ -2762,7 +2764,7 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Stop(TIM_HandleTypeDef *htim, uint32_t Output
   (in the OPM Mode the two possible channels that can be used are TIM_CHANNEL_1 and TIM_CHANNEL_2)
   if TIM_CHANNEL_1 is used as output, the TIM_CHANNEL_2 will be used as input and
   if TIM_CHANNEL_1 is used as input, the TIM_CHANNEL_2 will be used as output
-  in all combinations, the TIM_CHANNEL_1 and TIM_CHANNEL_2 should be disabled together */
+  whatever the combination, the TIM_CHANNEL_1 and TIM_CHANNEL_2 should be disabled together */
 
   TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_DISABLE);
   TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_2, TIM_CCx_DISABLE);
@@ -2788,11 +2790,12 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Stop(TIM_HandleTypeDef *htim, uint32_t Output
 
 /**
   * @brief  Starts the TIM One Pulse signal generation in interrupt mode.
+  * @note Though OutputChannel parameter is deprecated and ignored by the function
+  *        it has been kept to avoid HAL_TIM API compatibility break.
+  * @note The pulse output channel is determined when calling
+  *       @ref HAL_TIM_OnePulse_ConfigChannel().
   * @param  htim TIM One Pulse handle
-  * @param  OutputChannel TIM Channels to be enabled
-  *          This parameter can be one of the following values:
-  *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
-  *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
+  * @param  OutputChannel See note above
   * @retval HAL status
   */
 HAL_StatusTypeDef HAL_TIM_OnePulse_Start_IT(TIM_HandleTypeDef *htim, uint32_t OutputChannel)
@@ -2824,7 +2827,7 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Start_IT(TIM_HandleTypeDef *htim, uint32_t Ou
     (in the OPM Mode the two possible channels that can be used are TIM_CHANNEL_1 and TIM_CHANNEL_2)
     if TIM_CHANNEL_1 is used as output, the TIM_CHANNEL_2 will be used as input and
     if TIM_CHANNEL_1 is used as input, the TIM_CHANNEL_2 will be used as output
-    in all combinations, the TIM_CHANNEL_1 and TIM_CHANNEL_2 should be enabled together
+    whatever the combination, the TIM_CHANNEL_1 and TIM_CHANNEL_2 should be enabled together
 
     No need to enable the counter, it's enabled automatically by hardware
     (the counter starts in response to a stimulus and generate a pulse */
@@ -2850,11 +2853,12 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Start_IT(TIM_HandleTypeDef *htim, uint32_t Ou
 
 /**
   * @brief  Stops the TIM One Pulse signal generation in interrupt mode.
+  * @note Though OutputChannel parameter is deprecated and ignored by the function
+  *        it has been kept to avoid HAL_TIM API compatibility break.
+  * @note The pulse output channel is determined when calling
+  *       @ref HAL_TIM_OnePulse_ConfigChannel().
   * @param  htim TIM One Pulse handle
-  * @param  OutputChannel TIM Channels to be enabled
-  *          This parameter can be one of the following values:
-  *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
-  *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
+  * @param  OutputChannel See note above
   * @retval HAL status
   */
 HAL_StatusTypeDef HAL_TIM_OnePulse_Stop_IT(TIM_HandleTypeDef *htim, uint32_t OutputChannel)
@@ -2872,7 +2876,7 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Stop_IT(TIM_HandleTypeDef *htim, uint32_t Out
   (in the OPM Mode the two possible channels that can be used are TIM_CHANNEL_1 and TIM_CHANNEL_2)
   if TIM_CHANNEL_1 is used as output, the TIM_CHANNEL_2 will be used as input and
   if TIM_CHANNEL_1 is used as input, the TIM_CHANNEL_2 will be used as output
-  in all combinations, the TIM_CHANNEL_1 and TIM_CHANNEL_2 should be disabled together */
+  whatever the combination, the TIM_CHANNEL_1 and TIM_CHANNEL_2 should be disabled together */
   TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_1, TIM_CCx_DISABLE);
   TIM_CCxChannelCmd(htim->Instance, TIM_CHANNEL_2, TIM_CCx_DISABLE);
 
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c
index 0e7270c7..379e3674 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c
@@ -1532,8 +1532,10 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Chan
 /**
   * @brief  Starts the TIM One Pulse signal generation on the complementary
   *         output.
+  * @note OutputChannel must match the pulse output channel chosen when calling
+  *       @ref HAL_TIM_OnePulse_ConfigChannel().
   * @param  htim TIM One Pulse handle
-  * @param  OutputChannel TIM Channel to be enabled
+  * @param  OutputChannel pulse output channel to enable
   *          This parameter can be one of the following values:
   *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
   *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
@@ -1542,22 +1544,28 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Chan
 HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Start(TIM_HandleTypeDef *htim, uint32_t OutputChannel)
 {
   uint32_t input_channel = (OutputChannel == TIM_CHANNEL_1) ? TIM_CHANNEL_2 : TIM_CHANNEL_1;
-  HAL_TIM_ChannelStateTypeDef input_channel_state = TIM_CHANNEL_STATE_GET(htim, input_channel);
-  HAL_TIM_ChannelStateTypeDef output_channel_state = TIM_CHANNEL_N_STATE_GET(htim, OutputChannel);
+  HAL_TIM_ChannelStateTypeDef channel_1_state = TIM_CHANNEL_STATE_GET(htim, TIM_CHANNEL_1);
+  HAL_TIM_ChannelStateTypeDef channel_2_state = TIM_CHANNEL_STATE_GET(htim, TIM_CHANNEL_2);
+  HAL_TIM_ChannelStateTypeDef complementary_channel_1_state = TIM_CHANNEL_N_STATE_GET(htim, TIM_CHANNEL_1);
+  HAL_TIM_ChannelStateTypeDef complementary_channel_2_state = TIM_CHANNEL_N_STATE_GET(htim, TIM_CHANNEL_2);
 
   /* Check the parameters */
   assert_param(IS_TIM_CCXN_INSTANCE(htim->Instance, OutputChannel));
 
   /* Check the TIM channels state */
-  if ((output_channel_state != HAL_TIM_CHANNEL_STATE_READY)
-      || (input_channel_state != HAL_TIM_CHANNEL_STATE_READY))
+  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
+      || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY)
+      || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
+      || (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY))
   {
     return HAL_ERROR;
   }
 
   /* Set the TIM channels state */
-  TIM_CHANNEL_N_STATE_SET(htim, OutputChannel, HAL_TIM_CHANNEL_STATE_BUSY);
-  TIM_CHANNEL_STATE_SET(htim, input_channel, HAL_TIM_CHANNEL_STATE_BUSY);
+  TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_BUSY);
+  TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_BUSY);
+  TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_BUSY);
+  TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_BUSY);
 
   /* Enable the complementary One Pulse output channel and the Input Capture channel */
   TIM_CCxNChannelCmd(htim->Instance, OutputChannel, TIM_CCxN_ENABLE);
@@ -1573,8 +1581,10 @@ HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Start(TIM_HandleTypeDef *htim, uint32_t Ou
 /**
   * @brief  Stops the TIM One Pulse signal generation on the complementary
   *         output.
+  * @note OutputChannel must match the pulse output channel chosen when calling
+  *       @ref HAL_TIM_OnePulse_ConfigChannel().
   * @param  htim TIM One Pulse handle
-  * @param  OutputChannel TIM Channel to be disabled
+  * @param  OutputChannel pulse output channel to disable
   *          This parameter can be one of the following values:
   *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
   *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
@@ -1598,8 +1608,10 @@ HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Stop(TIM_HandleTypeDef *htim, uint32_t Out
   __HAL_TIM_DISABLE(htim);
 
   /* Set the TIM  channels state */
-  TIM_CHANNEL_N_STATE_SET(htim, OutputChannel, HAL_TIM_CHANNEL_STATE_READY);
-  TIM_CHANNEL_STATE_SET(htim, input_channel, HAL_TIM_CHANNEL_STATE_READY);
+  TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_READY);
+  TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_READY);
+  TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_READY);
+  TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_READY);
 
   /* Return function status */
   return HAL_OK;
@@ -1608,8 +1620,10 @@ HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Stop(TIM_HandleTypeDef *htim, uint32_t Out
 /**
   * @brief  Starts the TIM One Pulse signal generation in interrupt mode on the
   *         complementary channel.
+  * @note OutputChannel must match the pulse output channel chosen when calling
+  *       @ref HAL_TIM_OnePulse_ConfigChannel().
   * @param  htim TIM One Pulse handle
-  * @param  OutputChannel TIM Channel to be enabled
+  * @param  OutputChannel pulse output channel to enable
   *          This parameter can be one of the following values:
   *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
   *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
@@ -1618,22 +1632,28 @@ HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Stop(TIM_HandleTypeDef *htim, uint32_t Out
 HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Start_IT(TIM_HandleTypeDef *htim, uint32_t OutputChannel)
 {
   uint32_t input_channel = (OutputChannel == TIM_CHANNEL_1) ? TIM_CHANNEL_2 : TIM_CHANNEL_1;
-  HAL_TIM_ChannelStateTypeDef input_channel_state = TIM_CHANNEL_STATE_GET(htim, input_channel);
-  HAL_TIM_ChannelStateTypeDef output_channel_state = TIM_CHANNEL_N_STATE_GET(htim, OutputChannel);
+  HAL_TIM_ChannelStateTypeDef channel_1_state = TIM_CHANNEL_STATE_GET(htim, TIM_CHANNEL_1);
+  HAL_TIM_ChannelStateTypeDef channel_2_state = TIM_CHANNEL_STATE_GET(htim, TIM_CHANNEL_2);
+  HAL_TIM_ChannelStateTypeDef complementary_channel_1_state = TIM_CHANNEL_N_STATE_GET(htim, TIM_CHANNEL_1);
+  HAL_TIM_ChannelStateTypeDef complementary_channel_2_state = TIM_CHANNEL_N_STATE_GET(htim, TIM_CHANNEL_2);
 
   /* Check the parameters */
   assert_param(IS_TIM_CCXN_INSTANCE(htim->Instance, OutputChannel));
 
   /* Check the TIM channels state */
-  if ((output_channel_state != HAL_TIM_CHANNEL_STATE_READY)
-      || (input_channel_state != HAL_TIM_CHANNEL_STATE_READY))
+  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
+      || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY)
+      || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
+      || (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY))
   {
     return HAL_ERROR;
   }
 
   /* Set the TIM channels state */
-  TIM_CHANNEL_N_STATE_SET(htim, OutputChannel, HAL_TIM_CHANNEL_STATE_BUSY);
-  TIM_CHANNEL_STATE_SET(htim, input_channel, HAL_TIM_CHANNEL_STATE_BUSY);
+  TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_BUSY);
+  TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_BUSY);
+  TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_BUSY);
+  TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_BUSY);
 
   /* Enable the TIM Capture/Compare 1 interrupt */
   __HAL_TIM_ENABLE_IT(htim, TIM_IT_CC1);
@@ -1655,8 +1675,10 @@ HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Start_IT(TIM_HandleTypeDef *htim, uint32_t
 /**
   * @brief  Stops the TIM One Pulse signal generation in interrupt mode on the
   *         complementary channel.
+  * @note OutputChannel must match the pulse output channel chosen when calling
+  *       @ref HAL_TIM_OnePulse_ConfigChannel().
   * @param  htim TIM One Pulse handle
-  * @param  OutputChannel TIM Channel to be disabled
+  * @param  OutputChannel pulse output channel to disable
   *          This parameter can be one of the following values:
   *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
   *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
@@ -1686,8 +1708,10 @@ HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Stop_IT(TIM_HandleTypeDef *htim, uint32_t
   __HAL_TIM_DISABLE(htim);
 
   /* Set the TIM  channels state */
-  TIM_CHANNEL_N_STATE_SET(htim, OutputChannel, HAL_TIM_CHANNEL_STATE_READY);
-  TIM_CHANNEL_STATE_SET(htim, input_channel, HAL_TIM_CHANNEL_STATE_READY);
+  TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_READY);
+  TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_READY);
+  TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_READY);
+  TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_READY);
 
   /* Return function status */
   return HAL_OK;
@@ -2370,15 +2394,17 @@ HAL_StatusTypeDef HAL_TIMEx_ReArmBreakInput(TIM_HandleTypeDef *htim, uint32_t Br
         /* Break input BRK is re-armed automatically by hardware. Poll to check whether fault condition disappeared */
         /* Init tickstart for timeout management */
         tickstart = HAL_GetTick();
-        do
+        while (READ_BIT(htim->Instance->BDTR, TIM_BDTR_BKDSRM) != 0UL)
         {
-          if (READ_BIT(htim->Instance->BDTR, TIM_BDTR_BKDSRM) != TIM_BDTR_BKDSRM)
+          if ((HAL_GetTick() - tickstart) > TIM_BREAKINPUT_REARM_TIMEOUT)
           {
-            return HAL_OK;
+            /* New check to avoid false timeout detection in case of preemption */
+            if (READ_BIT(htim->Instance->BDTR, TIM_BDTR_BKDSRM) != 0UL)
+            {
+              return HAL_TIMEOUT;
+            }
           }
-        } while ((HAL_GetTick() - tickstart) <= TIM_BREAKINPUT_REARM_TIMEOUT);
-
-        return HAL_TIMEOUT;
+        }
       }
       break;
     }
@@ -2391,15 +2417,17 @@ HAL_StatusTypeDef HAL_TIMEx_ReArmBreakInput(TIM_HandleTypeDef *htim, uint32_t Br
         /* Break input BRK2 is re-armed automatically by hardware. Poll to check whether fault condition disappeared */
         /* Init tickstart for timeout management */
         tickstart = HAL_GetTick();
-        do
+        while (READ_BIT(htim->Instance->BDTR, TIM_BDTR_BK2DSRM) != 0UL)
         {
-          if (READ_BIT(htim->Instance->BDTR, TIM_BDTR_BK2DSRM) != TIM_BDTR_BK2DSRM)
+          if ((HAL_GetTick() - tickstart) > TIM_BREAKINPUT_REARM_TIMEOUT)
           {
-            return HAL_OK;
+            /* New check to avoid false timeout detection in case of preemption */
+            if (READ_BIT(htim->Instance->BDTR, TIM_BDTR_BK2DSRM) != 0UL)
+            {
+              return HAL_TIMEOUT;
+            }
           }
-        } while ((HAL_GetTick() - tickstart) <= TIM_BREAKINPUT_REARM_TIMEOUT);
-
-        return HAL_TIMEOUT;
+        }
       }
       break;
     }
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c
index ccbd0bf6..d4662346 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c
@@ -76,8 +76,8 @@
     allows the user to configure dynamically the driver callbacks.
 
     [..]
-    Use Function @ref HAL_UART_RegisterCallback() to register a user callback.
-    Function @ref HAL_UART_RegisterCallback() allows to register following callbacks:
+    Use Function HAL_UART_RegisterCallback() to register a user callback.
+    Function HAL_UART_RegisterCallback() allows to register following callbacks:
     (+) TxHalfCpltCallback        : Tx Half Complete Callback.
     (+) TxCpltCallback            : Tx Complete Callback.
     (+) RxHalfCpltCallback        : Rx Half Complete Callback.
@@ -95,9 +95,9 @@
     and a pointer to the user callback function.
 
     [..]
-    Use function @ref HAL_UART_UnRegisterCallback() to reset a callback to the default
+    Use function HAL_UART_UnRegisterCallback() to reset a callback to the default
     weak (surcharged) function.
-    @ref HAL_UART_UnRegisterCallback() takes as parameters the HAL peripheral handle,
+    HAL_UART_UnRegisterCallback() takes as parameters the HAL peripheral handle,
     and the Callback ID.
     This function allows to reset following callbacks:
     (+) TxHalfCpltCallback        : Tx Half Complete Callback.
@@ -116,16 +116,16 @@
 
     [..]
     For specific callback RxEventCallback, use dedicated registration/reset functions:
-    respectively @ref HAL_UART_RegisterRxEventCallback() , @ref HAL_UART_UnRegisterRxEventCallback().
+    respectively HAL_UART_RegisterRxEventCallback() , HAL_UART_UnRegisterRxEventCallback().
 
     [..]
-    By default, after the @ref HAL_UART_Init() and when the state is HAL_UART_STATE_RESET
+    By default, after the HAL_UART_Init() and when the state is HAL_UART_STATE_RESET
     all callbacks are set to the corresponding weak (surcharged) functions:
-    examples @ref HAL_UART_TxCpltCallback(), @ref HAL_UART_RxHalfCpltCallback().
+    examples HAL_UART_TxCpltCallback(), HAL_UART_RxHalfCpltCallback().
     Exception done for MspInit and MspDeInit functions that are respectively
-    reset to the legacy weak (surcharged) functions in the @ref HAL_UART_Init()
-    and @ref HAL_UART_DeInit() only when these callbacks are null (not registered beforehand).
-    If not, MspInit or MspDeInit are not null, the @ref HAL_UART_Init() and @ref HAL_UART_DeInit()
+    reset to the legacy weak (surcharged) functions in the HAL_UART_Init()
+    and HAL_UART_DeInit() only when these callbacks are null (not registered beforehand).
+    If not, MspInit or MspDeInit are not null, the HAL_UART_Init() and HAL_UART_DeInit()
     keep and use the user MspInit/MspDeInit callbacks (registered beforehand).
 
     [..]
@@ -134,8 +134,8 @@
     in HAL_UART_STATE_READY or HAL_UART_STATE_RESET state, thus registered (user)
     MspInit/DeInit callbacks can be used during the Init/DeInit.
     In that case first register the MspInit/MspDeInit user callbacks
-    using @ref HAL_UART_RegisterCallback() before calling @ref HAL_UART_DeInit()
-    or @ref HAL_UART_Init() function.
+    using HAL_UART_RegisterCallback() before calling HAL_UART_DeInit()
+    or HAL_UART_Init() function.
 
     [..]
     When The compilation define USE_HAL_UART_REGISTER_CALLBACKS is set to 0 or
@@ -1380,7 +1380,7 @@ HAL_StatusTypeDef HAL_UART_Transmit_IT(UART_HandleTypeDef *huart, uint8_t *pData
       __HAL_UNLOCK(huart);
 
       /* Enable the TX FIFO threshold interrupt */
-      SET_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
+      ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
     }
     else
     {
@@ -1397,7 +1397,7 @@ HAL_StatusTypeDef HAL_UART_Transmit_IT(UART_HandleTypeDef *huart, uint8_t *pData
       __HAL_UNLOCK(huart);
 
       /* Enable the Transmit Data Register Empty interrupt */
-      SET_BIT(huart->Instance->CR1, USART_CR1_TXEIE_TXFNFIE);
+      ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_TXEIE_TXFNFIE);
     }
 
     return HAL_OK;
@@ -1452,6 +1452,16 @@ HAL_StatusTypeDef HAL_UART_Receive_IT(UART_HandleTypeDef *huart, uint8_t *pData,
     /* Set Reception type to Standard reception */
     huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
 
+    if (!(IS_LPUART_INSTANCE(huart->Instance)))
+    {
+      /* Check that USART RTOEN bit is set */
+      if(READ_BIT(huart->Instance->CR2, USART_CR2_RTOEN) != 0U)
+      {
+        /* Enable the UART Receiver Timeout Interrupt */
+        ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_RTOIE);
+      }
+    }
+
     return(UART_Start_Receive_IT(huart, pData, Size));
   }
   else
@@ -1543,7 +1553,7 @@ HAL_StatusTypeDef HAL_UART_Transmit_DMA(UART_HandleTypeDef *huart, uint8_t *pDat
 
     /* Enable the DMA transfer for transmit request by setting the DMAT bit
     in the UART CR3 register */
-    SET_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_DMAT);
 
     return HAL_OK;
   }
@@ -1599,6 +1609,16 @@ HAL_StatusTypeDef HAL_UART_Receive_DMA(UART_HandleTypeDef *huart, uint8_t *pData
     /* Set Reception type to Standard reception */
     huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
 
+    if (!(IS_LPUART_INSTANCE(huart->Instance)))
+    {
+      /* Check that USART RTOEN bit is set */
+      if(READ_BIT(huart->Instance->CR2, USART_CR2_RTOEN) != 0U)
+      {
+        /* Enable the UART Receiver Timeout Interrupt */
+        ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_RTOIE);
+      }
+    }
+
     return(UART_Start_Receive_DMA(huart, pData, Size));
   }
   else
@@ -1623,17 +1643,17 @@ HAL_StatusTypeDef HAL_UART_DMAPause(UART_HandleTypeDef *huart)
       (gstate == HAL_UART_STATE_BUSY_TX))
   {
     /* Disable the UART DMA Tx request */
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
   }
   if ((HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAR)) &&
       (rxstate == HAL_UART_STATE_BUSY_RX))
   {
     /* Disable PE and ERR (Frame error, noise error, overrun error) interrupts */
-    CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
     /* Disable the UART DMA Rx request */
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
   }
 
   __HAL_UNLOCK(huart);
@@ -1653,7 +1673,7 @@ HAL_StatusTypeDef HAL_UART_DMAResume(UART_HandleTypeDef *huart)
   if (huart->gState == HAL_UART_STATE_BUSY_TX)
   {
     /* Enable the UART DMA Tx request */
-    SET_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_DMAT);
   }
   if (huart->RxState == HAL_UART_STATE_BUSY_RX)
   {
@@ -1661,11 +1681,11 @@ HAL_StatusTypeDef HAL_UART_DMAResume(UART_HandleTypeDef *huart)
     __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_OREF);
 
     /* Re-enable PE and ERR (Frame error, noise error, overrun error) interrupts */
-    SET_BIT(huart->Instance->CR1, USART_CR1_PEIE);
-    SET_BIT(huart->Instance->CR3, USART_CR3_EIE);
+    ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_PEIE);
+    ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
     /* Enable the UART DMA Rx request */
-    SET_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+    ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_DMAR);
   }
 
   __HAL_UNLOCK(huart);
@@ -1694,7 +1714,7 @@ HAL_StatusTypeDef HAL_UART_DMAStop(UART_HandleTypeDef *huart)
   if ((HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAT)) &&
       (gstate == HAL_UART_STATE_BUSY_TX))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
 
     /* Abort the UART DMA Tx channel */
     if (huart->hdmatx != NULL)
@@ -1718,7 +1738,7 @@ HAL_StatusTypeDef HAL_UART_DMAStop(UART_HandleTypeDef *huart)
   if ((HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAR)) &&
       (rxstate == HAL_UART_STATE_BUSY_RX))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
     /* Abort the UART DMA Rx channel */
     if (huart->hdmarx != NULL)
@@ -1756,20 +1776,20 @@ HAL_StatusTypeDef HAL_UART_DMAStop(UART_HandleTypeDef *huart)
 HAL_StatusTypeDef HAL_UART_Abort(UART_HandleTypeDef *huart)
 {
   /* Disable TXE, TC, RXNE, PE, RXFT, TXFT and ERR (Frame error, noise error, overrun error) interrupts */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE |
-                                   USART_CR1_TCIE));
-  CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE | USART_CR3_RXFTIE | USART_CR3_TXFTIE);
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE |
+                                          USART_CR1_TXEIE_TXFNFIE | USART_CR1_TCIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE | USART_CR3_RXFTIE | USART_CR3_TXFTIE);
 
   /* If Reception till IDLE event was ongoing, disable IDLEIE interrupt */
   if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
   {
-    CLEAR_BIT(huart->Instance->CR1, (USART_CR1_IDLEIE));
+    ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_IDLEIE));
   }
 
   /* Disable the UART DMA Tx request if enabled */
   if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAT))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
 
     /* Abort the UART DMA Tx channel : use blocking DMA Abort API (no callback) */
     if (huart->hdmatx != NULL)
@@ -1794,7 +1814,7 @@ HAL_StatusTypeDef HAL_UART_Abort(UART_HandleTypeDef *huart)
   /* Disable the UART DMA Rx request if enabled */
   if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAR))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
     /* Abort the UART DMA Rx channel : use blocking DMA Abort API (no callback) */
     if (huart->hdmarx != NULL)
@@ -1857,13 +1877,13 @@ HAL_StatusTypeDef HAL_UART_Abort(UART_HandleTypeDef *huart)
 HAL_StatusTypeDef HAL_UART_AbortTransmit(UART_HandleTypeDef *huart)
 {
   /* Disable TCIE, TXEIE and TXFTIE interrupts */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TCIE | USART_CR1_TXEIE_TXFNFIE));
-  CLEAR_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TCIE | USART_CR1_TXEIE_TXFNFIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
 
   /* Disable the UART DMA Tx request if enabled */
   if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAT))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
 
     /* Abort the UART DMA Tx channel : use blocking DMA Abort API (no callback) */
     if (huart->hdmatx != NULL)
@@ -1915,19 +1935,19 @@ HAL_StatusTypeDef HAL_UART_AbortTransmit(UART_HandleTypeDef *huart)
 HAL_StatusTypeDef HAL_UART_AbortReceive(UART_HandleTypeDef *huart)
 {
   /* Disable PEIE, EIE, RXNEIE and RXFTIE interrupts */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_PEIE | USART_CR1_RXNEIE_RXFNEIE));
-  CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE | USART_CR3_RXFTIE);
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_PEIE | USART_CR1_RXNEIE_RXFNEIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE | USART_CR3_RXFTIE);
 
   /* If Reception till IDLE event was ongoing, disable IDLEIE interrupt */
   if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
   {
-    CLEAR_BIT(huart->Instance->CR1, (USART_CR1_IDLEIE));
+    ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_IDLEIE));
   }
 
   /* Disable the UART DMA Rx request if enabled */
   if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAR))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
     /* Abort the UART DMA Rx channel : use blocking DMA Abort API (no callback) */
     if (huart->hdmarx != NULL)
@@ -1984,14 +2004,14 @@ HAL_StatusTypeDef HAL_UART_Abort_IT(UART_HandleTypeDef *huart)
   uint32_t abortcplt = 1U;
 
   /* Disable interrupts */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_PEIE | USART_CR1_TCIE | USART_CR1_RXNEIE_RXFNEIE |
-                                   USART_CR1_TXEIE_TXFNFIE));
-  CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE | USART_CR3_TXFTIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_PEIE | USART_CR1_TCIE | USART_CR1_RXNEIE_RXFNEIE |
+                                          USART_CR1_TXEIE_TXFNFIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE | USART_CR3_TXFTIE));
 
   /* If Reception till IDLE event was ongoing, disable IDLEIE interrupt */
   if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
   {
-    CLEAR_BIT(huart->Instance->CR1, (USART_CR1_IDLEIE));
+    ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_IDLEIE));
   }
 
   /* If DMA Tx and/or DMA Rx Handles are associated to UART Handle, DMA Abort complete callbacks should be initialised
@@ -2029,7 +2049,7 @@ HAL_StatusTypeDef HAL_UART_Abort_IT(UART_HandleTypeDef *huart)
   if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAT))
   {
     /* Disable DMA Tx at UART level */
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
 
     /* Abort the UART DMA Tx channel : use non blocking DMA Abort API (callback) */
     if (huart->hdmatx != NULL)
@@ -2052,7 +2072,7 @@ HAL_StatusTypeDef HAL_UART_Abort_IT(UART_HandleTypeDef *huart)
   /* Disable the UART DMA Rx request if enabled */
   if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAR))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
     /* Abort the UART DMA Rx channel : use non blocking DMA Abort API (callback) */
     if (huart->hdmarx != NULL)
@@ -2134,13 +2154,13 @@ HAL_StatusTypeDef HAL_UART_Abort_IT(UART_HandleTypeDef *huart)
 HAL_StatusTypeDef HAL_UART_AbortTransmit_IT(UART_HandleTypeDef *huart)
 {
   /* Disable interrupts */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TCIE | USART_CR1_TXEIE_TXFNFIE));
-  CLEAR_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TCIE | USART_CR1_TXEIE_TXFNFIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
 
   /* Disable the UART DMA Tx request if enabled */
   if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAT))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
 
     /* Abort the UART DMA Tx channel : use non blocking DMA Abort API (callback) */
     if (huart->hdmatx != NULL)
@@ -2224,19 +2244,19 @@ HAL_StatusTypeDef HAL_UART_AbortTransmit_IT(UART_HandleTypeDef *huart)
 HAL_StatusTypeDef HAL_UART_AbortReceive_IT(UART_HandleTypeDef *huart)
 {
   /* Disable RXNE, PE and ERR (Frame error, noise error, overrun error) interrupts */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_PEIE | USART_CR1_RXNEIE_RXFNEIE));
-  CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_PEIE | USART_CR1_RXNEIE_RXFNEIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
 
   /* If Reception till IDLE event was ongoing, disable IDLEIE interrupt */
   if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
   {
-    CLEAR_BIT(huart->Instance->CR1, (USART_CR1_IDLEIE));
+    ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_IDLEIE));
   }
 
   /* Disable the UART DMA Rx request if enabled */
   if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAR))
   {
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
     /* Abort the UART DMA Rx channel : use non blocking DMA Abort API (callback) */
     if (huart->hdmarx != NULL)
@@ -2417,7 +2437,7 @@ void HAL_UART_IRQHandler(UART_HandleTypeDef *huart)
         /* Disable the UART DMA Rx request if enabled */
         if (HAL_IS_BIT_SET(huart->Instance->CR3, USART_CR3_DMAR))
         {
-          CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+          ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
           /* Abort the UART DMA Rx channel */
           if (huart->hdmarx != NULL)
@@ -2502,18 +2522,18 @@ void HAL_UART_IRQHandler(UART_HandleTypeDef *huart)
         if (HAL_IS_BIT_CLR(huart->hdmarx->Instance->CCR, DMA_CCR_CIRC))
         {
           /* Disable PE and ERR (Frame error, noise error, overrun error) interrupts */
-          CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
-          CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
+          ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
+          ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
           /* Disable the DMA transfer for the receiver request by resetting the DMAR bit
              in the UART CR3 register */
-          CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+          ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
           /* At end of Rx process, restore huart->RxState to Ready */
           huart->RxState = HAL_UART_STATE_READY;
           huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
 
-          CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+          ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
 
           /* Last bytes received, so no need as the abort is immediate */
           (void)HAL_DMA_Abort(huart->hdmarx);
@@ -2538,10 +2558,10 @@ void HAL_UART_IRQHandler(UART_HandleTypeDef *huart)
           &&(nb_rx_data > 0U) )
       {
         /* Disable the UART Parity Error Interrupt and RXNE interrupts */
-        CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE));
+        ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE));
 
-        /* Disable the UART Error Interrupt: (Frame error, noise error, overrun error) and RX FIFO Threshold interrupt */
-        CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
+        /* Disable the UART Error Interrupt:(Frame error, noise error, overrun error) and RX FIFO Threshold interrupt */
+        ATOMIC_CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
 
         /* Rx process is completed, restore huart->RxState to Ready */
         huart->RxState = HAL_UART_STATE_READY;
@@ -2550,7 +2570,7 @@ void HAL_UART_IRQHandler(UART_HandleTypeDef *huart)
         /* Clear RxISR function pointer */
         huart->RxISR = NULL;
 
-        CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+        ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
 #if (USE_HAL_UART_REGISTER_CALLBACKS == 1)
         /*Call registered Rx complete callback*/
         huart->RxEventCallback(huart, nb_rx_data);
@@ -2900,7 +2920,7 @@ HAL_StatusTypeDef HAL_MultiProcessor_EnableMuteMode(UART_HandleTypeDef *huart)
   huart->gState = HAL_UART_STATE_BUSY;
 
   /* Enable USART mute mode by setting the MME bit in the CR1 register */
-  SET_BIT(huart->Instance->CR1, USART_CR1_MME);
+  ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_MME);
 
   huart->gState = HAL_UART_STATE_READY;
 
@@ -2920,7 +2940,7 @@ HAL_StatusTypeDef HAL_MultiProcessor_DisableMuteMode(UART_HandleTypeDef *huart)
   huart->gState = HAL_UART_STATE_BUSY;
 
   /* Disable USART mute mode by clearing the MME bit in the CR1 register */
-  CLEAR_BIT(huart->Instance->CR1, USART_CR1_MME);
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_MME);
 
   huart->gState = HAL_UART_STATE_READY;
 
@@ -2949,10 +2969,10 @@ HAL_StatusTypeDef HAL_HalfDuplex_EnableTransmitter(UART_HandleTypeDef *huart)
   huart->gState = HAL_UART_STATE_BUSY;
 
   /* Clear TE and RE bits */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TE | USART_CR1_RE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TE | USART_CR1_RE));
 
   /* Enable the USART's transmit interface by setting the TE bit in the USART CR1 register */
-  SET_BIT(huart->Instance->CR1, USART_CR1_TE);
+  ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_TE);
 
   huart->gState = HAL_UART_STATE_READY;
 
@@ -2972,10 +2992,10 @@ HAL_StatusTypeDef HAL_HalfDuplex_EnableReceiver(UART_HandleTypeDef *huart)
   huart->gState = HAL_UART_STATE_BUSY;
 
   /* Clear TE and RE bits */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TE | USART_CR1_RE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TE | USART_CR1_RE));
 
   /* Enable the USART's receive interface by setting the RE bit in the USART CR1 register */
-  SET_BIT(huart->Instance->CR1, USART_CR1_RE);
+  ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_RE);
 
   huart->gState = HAL_UART_STATE_READY;
 
@@ -3452,8 +3472,9 @@ HAL_StatusTypeDef UART_WaitOnFlagUntilTimeout(UART_HandleTypeDef *huart, uint32_
       {
         /* Disable TXE, RXNE, PE and ERR (Frame error, noise error, overrun error)
            interrupts for the interrupt process */
-        CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE));
-        CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
+        ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE |
+                                                USART_CR1_TXEIE_TXFNFIE));
+        ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
         huart->gState = HAL_UART_STATE_READY;
         huart->RxState = HAL_UART_STATE_READY;
@@ -3472,8 +3493,9 @@ HAL_StatusTypeDef UART_WaitOnFlagUntilTimeout(UART_HandleTypeDef *huart, uint32_
 
           /* Disable TXE, RXNE, PE and ERR (Frame error, noise error, overrun error)
              interrupts for the interrupt process */
-          CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE));
-          CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
+          ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE |
+                                                  USART_CR1_TXEIE_TXFNFIE));
+          ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
           huart->gState = HAL_UART_STATE_READY;
           huart->RxState = HAL_UART_STATE_READY;
@@ -3515,7 +3537,7 @@ HAL_StatusTypeDef UART_Start_Receive_IT(UART_HandleTypeDef *huart, uint8_t *pDat
   huart->RxState = HAL_UART_STATE_BUSY_RX;
 
   /* Enable the UART Error Interrupt: (Frame error, noise error, overrun error) */
-  SET_BIT(huart->Instance->CR3, USART_CR3_EIE);
+  ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
   /* Configure Rx interrupt processing */
   if ((huart->FifoMode == UART_FIFOMODE_ENABLE) && (Size >= huart->NbRxDataToProcess))
@@ -3533,8 +3555,8 @@ HAL_StatusTypeDef UART_Start_Receive_IT(UART_HandleTypeDef *huart, uint8_t *pDat
     __HAL_UNLOCK(huart);
 
     /* Enable the UART Parity Error interrupt and RX FIFO Threshold interrupt */
-    SET_BIT(huart->Instance->CR1, USART_CR1_PEIE);
-    SET_BIT(huart->Instance->CR3, USART_CR3_RXFTIE);
+    ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_PEIE);
+    ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_RXFTIE);
   }
   else
   {
@@ -3551,7 +3573,7 @@ HAL_StatusTypeDef UART_Start_Receive_IT(UART_HandleTypeDef *huart, uint8_t *pDat
     __HAL_UNLOCK(huart);
 
     /* Enable the UART Parity Error interrupt and Data Register Not Empty interrupt */
-    SET_BIT(huart->Instance->CR1, USART_CR1_PEIE | USART_CR1_RXNEIE_RXFNEIE);
+    ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_PEIE | USART_CR1_RXNEIE_RXFNEIE);
   }
   return HAL_OK;
 }
@@ -3597,8 +3619,8 @@ HAL_StatusTypeDef UART_Start_Receive_DMA(UART_HandleTypeDef *huart, uint8_t *pDa
 
       __HAL_UNLOCK(huart);
 
-      /* Restore huart->gState to ready */
-      huart->gState = HAL_UART_STATE_READY;
+      /* Restore huart->RxState to ready */
+      huart->RxState = HAL_UART_STATE_READY;
 
       return HAL_ERROR;
     }
@@ -3606,14 +3628,14 @@ HAL_StatusTypeDef UART_Start_Receive_DMA(UART_HandleTypeDef *huart, uint8_t *pDa
   __HAL_UNLOCK(huart);
 
   /* Enable the UART Parity Error Interrupt */
-  SET_BIT(huart->Instance->CR1, USART_CR1_PEIE);
+  ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_PEIE);
 
   /* Enable the UART Error Interrupt: (Frame error, noise error, overrun error) */
-  SET_BIT(huart->Instance->CR3, USART_CR3_EIE);
+  ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
   /* Enable the DMA transfer for the receiver request by setting the DMAR bit
   in the UART CR3 register */
-  SET_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+  ATOMIC_SET_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
   return HAL_OK;
 }
@@ -3627,8 +3649,8 @@ HAL_StatusTypeDef UART_Start_Receive_DMA(UART_HandleTypeDef *huart, uint8_t *pDa
 static void UART_EndTxTransfer(UART_HandleTypeDef *huart)
 {
   /* Disable TXEIE, TCIE, TXFT interrupts */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TXEIE_TXFNFIE | USART_CR1_TCIE));
-  CLEAR_BIT(huart->Instance->CR3, (USART_CR3_TXFTIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_TXEIE_TXFNFIE | USART_CR1_TCIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR3, (USART_CR3_TXFTIE));
 
   /* At end of Tx process, restore huart->gState to Ready */
   huart->gState = HAL_UART_STATE_READY;
@@ -3643,13 +3665,13 @@ static void UART_EndTxTransfer(UART_HandleTypeDef *huart)
 static void UART_EndRxTransfer(UART_HandleTypeDef *huart)
 {
   /* Disable RXNE, PE and ERR (Frame error, noise error, overrun error) interrupts */
-  CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE));
-  CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE));
+  ATOMIC_CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
 
   /* In case of reception waiting for IDLE event, disable also the IDLE IE interrupt source */
   if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
   {
-    CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
   }
 
   /* At end of Rx process, restore huart->RxState to Ready */
@@ -3677,10 +3699,10 @@ static void UART_DMATransmitCplt(DMA_HandleTypeDef *hdma)
 
     /* Disable the DMA transfer for transmit request by resetting the DMAT bit
        in the UART CR3 register */
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAT);
 
     /* Enable the UART Transmit Complete Interrupt */
-    SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
+    ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
   }
   /* DMA Circular mode */
   else
@@ -3728,12 +3750,12 @@ static void UART_DMAReceiveCplt(DMA_HandleTypeDef *hdma)
     huart->RxXferCount = 0U;
 
     /* Disable PE and ERR (Frame error, noise error, overrun error) interrupts */
-    CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
     /* Disable the DMA transfer for the receiver request by resetting the DMAR bit
        in the UART CR3 register */
-    CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
+    ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_DMAR);
 
     /* At end of Rx process, restore huart->RxState to Ready */
     huart->RxState = HAL_UART_STATE_READY;
@@ -3741,7 +3763,7 @@ static void UART_DMAReceiveCplt(DMA_HandleTypeDef *hdma)
     /* If Reception till IDLE event has been selected, Disable IDLE Interrupt */
     if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
     {
-      CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+      ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
     }
   }
 
@@ -4053,10 +4075,10 @@ static void UART_TxISR_8BIT(UART_HandleTypeDef *huart)
     if (huart->TxXferCount == 0U)
     {
       /* Disable the UART Transmit Data Register Empty Interrupt */
-      CLEAR_BIT(huart->Instance->CR1, USART_CR1_TXEIE_TXFNFIE);
+      ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_TXEIE_TXFNFIE);
 
       /* Enable the UART Transmit Complete Interrupt */
-      SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
+      ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
     }
     else
     {
@@ -4084,10 +4106,10 @@ static void UART_TxISR_16BIT(UART_HandleTypeDef *huart)
     if (huart->TxXferCount == 0U)
     {
       /* Disable the UART Transmit Data Register Empty Interrupt */
-      CLEAR_BIT(huart->Instance->CR1, USART_CR1_TXEIE_TXFNFIE);
+      ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_TXEIE_TXFNFIE);
 
       /* Enable the UART Transmit Complete Interrupt */
-      SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
+      ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
     }
     else
     {
@@ -4118,10 +4140,10 @@ static void UART_TxISR_8BIT_FIFOEN(UART_HandleTypeDef *huart)
       if (huart->TxXferCount == 0U)
       {
         /* Disable the TX FIFO threshold interrupt */
-        CLEAR_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
+        ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
 
         /* Enable the UART Transmit Complete Interrupt */
-        SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
+        ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
 
         break; /* force exit loop */
       }
@@ -4159,10 +4181,10 @@ static void UART_TxISR_16BIT_FIFOEN(UART_HandleTypeDef *huart)
       if (huart->TxXferCount == 0U)
       {
         /* Disable the TX FIFO threshold interrupt */
-        CLEAR_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
+        ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_TXFTIE);
 
         /* Enable the UART Transmit Complete Interrupt */
-        SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
+        ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_TCIE);
 
         break; /* force exit loop */
       }
@@ -4190,7 +4212,7 @@ static void UART_TxISR_16BIT_FIFOEN(UART_HandleTypeDef *huart)
 static void UART_EndTransmit_IT(UART_HandleTypeDef *huart)
 {
   /* Disable the UART Transmit Complete Interrupt */
-  CLEAR_BIT(huart->Instance->CR1, USART_CR1_TCIE);
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_TCIE);
 
   /* Tx process is ended, restore huart->gState to Ready */
   huart->gState = HAL_UART_STATE_READY;
@@ -4228,10 +4250,10 @@ static void UART_RxISR_8BIT(UART_HandleTypeDef *huart)
     if (huart->RxXferCount == 0U)
     {
       /* Disable the UART Parity Error Interrupt and RXNE interrupts */
-      CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE));
+      ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE));
 
       /* Disable the UART Error Interrupt: (Frame error, noise error, overrun error) */
-      CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
+      ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
       /* Rx process is completed, restore huart->RxState to Ready */
       huart->RxState = HAL_UART_STATE_READY;
@@ -4243,9 +4265,17 @@ static void UART_RxISR_8BIT(UART_HandleTypeDef *huart)
          If Reception till IDLE event has been selected : */
       if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
       {
+        /* Set reception type to Standard */
+        huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
+
         /* Disable IDLE interrupt */
-        CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+        ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
 
+        if (__HAL_UART_GET_FLAG(huart, UART_FLAG_IDLE) == SET)
+        {
+          /* Clear IDLE Flag */
+          __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_IDLEF);
+        }
 #if (USE_HAL_UART_REGISTER_CALLBACKS == 1)
         /*Call registered Rx Event callback*/
         huart->RxEventCallback(huart, huart->RxXferSize);
@@ -4265,7 +4295,6 @@ static void UART_RxISR_8BIT(UART_HandleTypeDef *huart)
         HAL_UART_RxCpltCallback(huart);
 #endif /* USE_HAL_UART_REGISTER_CALLBACKS */
       }
-      huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
     }
   }
   else
@@ -4300,10 +4329,10 @@ static void UART_RxISR_16BIT(UART_HandleTypeDef *huart)
     if (huart->RxXferCount == 0U)
     {
       /* Disable the UART Parity Error Interrupt and RXNE interrupt*/
-      CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE));
+      ATOMIC_CLEAR_BIT(huart->Instance->CR1, (USART_CR1_RXNEIE_RXFNEIE | USART_CR1_PEIE));
 
       /* Disable the UART Error Interrupt: (Frame error, noise error, overrun error) */
-      CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
+      ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_EIE);
 
       /* Rx process is completed, restore huart->RxState to Ready */
       huart->RxState = HAL_UART_STATE_READY;
@@ -4315,9 +4344,17 @@ static void UART_RxISR_16BIT(UART_HandleTypeDef *huart)
          If Reception till IDLE event has been selected : */
       if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
       {
+        /* Set reception type to Standard */
+        huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
+
         /* Disable IDLE interrupt */
-        CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+        ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
 
+        if (__HAL_UART_GET_FLAG(huart, UART_FLAG_IDLE) == SET)
+        {
+          /* Clear IDLE Flag */
+          __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_IDLEF);
+        }
 #if (USE_HAL_UART_REGISTER_CALLBACKS == 1)
         /*Call registered Rx Event callback*/
         huart->RxEventCallback(huart, huart->RxXferSize);
@@ -4337,7 +4374,6 @@ static void UART_RxISR_16BIT(UART_HandleTypeDef *huart)
         HAL_UART_RxCpltCallback(huart);
 #endif /* USE_HAL_UART_REGISTER_CALLBACKS */
       }
-      huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
     }
   }
   else
@@ -4422,11 +4458,11 @@ static void UART_RxISR_8BIT_FIFOEN(UART_HandleTypeDef *huart)
       if (huart->RxXferCount == 0U)
       {
         /* Disable the UART Parity Error Interrupt and RXFT interrupt*/
-        CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
+        ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
 
         /* Disable the UART Error Interrupt: (Frame error, noise error, overrun error)
            and RX FIFO Threshold interrupt */
-        CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
+        ATOMIC_CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
 
         /* Rx process is completed, restore huart->RxState to Ready */
         huart->RxState = HAL_UART_STATE_READY;
@@ -4438,9 +4474,17 @@ static void UART_RxISR_8BIT_FIFOEN(UART_HandleTypeDef *huart)
            If Reception till IDLE event has been selected : */
         if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
         {
+          /* Set reception type to Standard */
+          huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
+
           /* Disable IDLE interrupt */
-          CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+          ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
 
+          if (__HAL_UART_GET_FLAG(huart, UART_FLAG_IDLE) == SET)
+          {
+            /* Clear IDLE Flag */
+            __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_IDLEF);
+          }
 #if (USE_HAL_UART_REGISTER_CALLBACKS == 1)
           /*Call registered Rx Event callback*/
           huart->RxEventCallback(huart, huart->RxXferSize);
@@ -4460,7 +4504,6 @@ static void UART_RxISR_8BIT_FIFOEN(UART_HandleTypeDef *huart)
           HAL_UART_RxCpltCallback(huart);
 #endif /* USE_HAL_UART_REGISTER_CALLBACKS */
         }
-        huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
       }
     }
 
@@ -4472,13 +4515,13 @@ static void UART_RxISR_8BIT_FIFOEN(UART_HandleTypeDef *huart)
     if ((rxdatacount != 0U) && (rxdatacount < huart->NbRxDataToProcess))
     {
       /* Disable the UART RXFT interrupt*/
-      CLEAR_BIT(huart->Instance->CR3, USART_CR3_RXFTIE);
+      ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_RXFTIE);
 
       /* Update the RxISR function pointer */
       huart->RxISR = UART_RxISR_8BIT;
 
       /* Enable the UART Data Register Not Empty interrupt */
-      SET_BIT(huart->Instance->CR1, USART_CR1_RXNEIE_RXFNEIE);
+      ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_RXNEIE_RXFNEIE);
     }
   }
   else
@@ -4565,11 +4608,11 @@ static void UART_RxISR_16BIT_FIFOEN(UART_HandleTypeDef *huart)
       if (huart->RxXferCount == 0U)
       {
         /* Disable the UART Parity Error Interrupt and RXFT interrupt*/
-        CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
+        ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_PEIE);
 
         /* Disable the UART Error Interrupt: (Frame error, noise error, overrun error)
            and RX FIFO Threshold interrupt */
-        CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
+        ATOMIC_CLEAR_BIT(huart->Instance->CR3, (USART_CR3_EIE | USART_CR3_RXFTIE));
 
         /* Rx process is completed, restore huart->RxState to Ready */
         huart->RxState = HAL_UART_STATE_READY;
@@ -4581,9 +4624,17 @@ static void UART_RxISR_16BIT_FIFOEN(UART_HandleTypeDef *huart)
            If Reception till IDLE event has been selected : */
         if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
         {
+          /* Set reception type to Standard */
+          huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
+
           /* Disable IDLE interrupt */
-          CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+          ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
 
+          if (__HAL_UART_GET_FLAG(huart, UART_FLAG_IDLE) == SET)
+          {
+            /* Clear IDLE Flag */
+            __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_IDLEF);
+          }
 #if (USE_HAL_UART_REGISTER_CALLBACKS == 1)
           /*Call registered Rx Event callback*/
           huart->RxEventCallback(huart, huart->RxXferSize);
@@ -4603,7 +4654,6 @@ static void UART_RxISR_16BIT_FIFOEN(UART_HandleTypeDef *huart)
           HAL_UART_RxCpltCallback(huart);
 #endif /* USE_HAL_UART_REGISTER_CALLBACKS */
         }
-        huart->ReceptionType = HAL_UART_RECEPTION_STANDARD;
       }
     }
 
@@ -4615,13 +4665,13 @@ static void UART_RxISR_16BIT_FIFOEN(UART_HandleTypeDef *huart)
     if ((rxdatacount != 0U) && (rxdatacount < huart->NbRxDataToProcess))
     {
       /* Disable the UART RXFT interrupt*/
-      CLEAR_BIT(huart->Instance->CR3, USART_CR3_RXFTIE);
+      ATOMIC_CLEAR_BIT(huart->Instance->CR3, USART_CR3_RXFTIE);
 
       /* Update the RxISR function pointer */
       huart->RxISR = UART_RxISR_16BIT;
 
       /* Enable the UART Data Register Not Empty interrupt */
-      SET_BIT(huart->Instance->CR1, USART_CR1_RXNEIE_RXFNEIE);
+      ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_RXNEIE_RXFNEIE);
     }
   }
   else
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c
index f942f333..ef072357 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c
@@ -483,7 +483,7 @@ HAL_StatusTypeDef HAL_UARTEx_EnableStopMode(UART_HandleTypeDef *huart)
   __HAL_LOCK(huart);
 
   /* Set UESM bit */
-  SET_BIT(huart->Instance->CR1, USART_CR1_UESM);
+  ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_UESM);
 
   /* Process Unlocked */
   __HAL_UNLOCK(huart);
@@ -502,7 +502,7 @@ HAL_StatusTypeDef HAL_UARTEx_DisableStopMode(UART_HandleTypeDef *huart)
   __HAL_LOCK(huart);
 
   /* Clear UESM bit */
-  CLEAR_BIT(huart->Instance->CR1, USART_CR1_UESM);
+  ATOMIC_CLEAR_BIT(huart->Instance->CR1, USART_CR1_UESM);
 
   /* Process Unlocked */
   __HAL_UNLOCK(huart);
@@ -890,7 +890,7 @@ HAL_StatusTypeDef HAL_UARTEx_ReceiveToIdle_IT(UART_HandleTypeDef *huart, uint8_t
       if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
       {
         __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_IDLEF);
-        SET_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+        ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
       }
       else
       {
@@ -969,7 +969,7 @@ HAL_StatusTypeDef HAL_UARTEx_ReceiveToIdle_DMA(UART_HandleTypeDef *huart, uint8_
       if (huart->ReceptionType == HAL_UART_RECEPTION_TOIDLE)
       {
         __HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_IDLEF);
-        SET_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
+        ATOMIC_SET_BIT(huart->Instance->CR1, USART_CR1_IDLEIE);
       }
       else
       {
@@ -1031,8 +1031,8 @@ static void UARTEx_SetNbDataToProcess(UART_HandleTypeDef *huart)
   uint8_t tx_fifo_depth;
   uint8_t rx_fifo_threshold;
   uint8_t tx_fifo_threshold;
-  uint8_t numerator[] = {1U, 1U, 1U, 3U, 7U, 1U, 0U, 0U};
-  uint8_t denominator[] = {8U, 4U, 2U, 4U, 8U, 1U, 1U, 1U};
+  static const uint8_t numerator[] = {1U, 1U, 1U, 3U, 7U, 1U, 0U, 0U};
+  static const uint8_t denominator[] = {8U, 4U, 2U, 4U, 8U, 1U, 1U, 1U};
 
   if (huart->FifoMode == UART_FIFOMODE_DISABLE)
   {
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_usart.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_usart.c
index f855cb61..aa7d901d 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_usart.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_usart.c
@@ -62,8 +62,8 @@
     allows the user to configure dynamically the driver callbacks.
 
     [..]
-    Use Function @ref HAL_USART_RegisterCallback() to register a user callback.
-    Function @ref HAL_USART_RegisterCallback() allows to register following callbacks:
+    Use Function HAL_USART_RegisterCallback() to register a user callback.
+    Function HAL_USART_RegisterCallback() allows to register following callbacks:
     (+) TxHalfCpltCallback        : Tx Half Complete Callback.
     (+) TxCpltCallback            : Tx Complete Callback.
     (+) RxHalfCpltCallback        : Rx Half Complete Callback.
@@ -79,9 +79,9 @@
     and a pointer to the user callback function.
 
     [..]
-    Use function @ref HAL_USART_UnRegisterCallback() to reset a callback to the default
+    Use function HAL_USART_UnRegisterCallback() to reset a callback to the default
     weak (surcharged) function.
-    @ref HAL_USART_UnRegisterCallback() takes as parameters the HAL peripheral handle,
+    HAL_USART_UnRegisterCallback() takes as parameters the HAL peripheral handle,
     and the Callback ID.
     This function allows to reset following callbacks:
     (+) TxHalfCpltCallback        : Tx Half Complete Callback.
@@ -97,13 +97,13 @@
     (+) MspDeInitCallback         : USART MspDeInit.
 
     [..]
-    By default, after the @ref HAL_USART_Init() and when the state is HAL_USART_STATE_RESET
+    By default, after the HAL_USART_Init() and when the state is HAL_USART_STATE_RESET
     all callbacks are set to the corresponding weak (surcharged) functions:
-    examples @ref HAL_USART_TxCpltCallback(), @ref HAL_USART_RxHalfCpltCallback().
+    examples HAL_USART_TxCpltCallback(), HAL_USART_RxHalfCpltCallback().
     Exception done for MspInit and MspDeInit functions that are respectively
-    reset to the legacy weak (surcharged) functions in the @ref HAL_USART_Init()
-    and @ref HAL_USART_DeInit() only when these callbacks are null (not registered beforehand).
-    If not, MspInit or MspDeInit are not null, the @ref HAL_USART_Init() and @ref HAL_USART_DeInit()
+    reset to the legacy weak (surcharged) functions in the HAL_USART_Init()
+    and HAL_USART_DeInit() only when these callbacks are null (not registered beforehand).
+    If not, MspInit or MspDeInit are not null, the HAL_USART_Init() and HAL_USART_DeInit()
     keep and use the user MspInit/MspDeInit callbacks (registered beforehand).
 
     [..]
@@ -112,8 +112,8 @@
     in HAL_USART_STATE_READY or HAL_USART_STATE_RESET state, thus registered (user)
     MspInit/DeInit callbacks can be used during the Init/DeInit.
     In that case first register the MspInit/MspDeInit user callbacks
-    using @ref HAL_USART_RegisterCallback() before calling @ref HAL_USART_DeInit()
-    or @ref HAL_USART_Init() function.
+    using HAL_USART_RegisterCallback() before calling HAL_USART_DeInit()
+    or HAL_USART_Init() function.
 
     [..]
     When The compilation define USE_HAL_USART_REGISTER_CALLBACKS is set to 0 or
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_usart_ex.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_usart_ex.c
index 59c21845..a10093d6 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_usart_ex.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_usart_ex.c
@@ -502,8 +502,8 @@ static void USARTEx_SetNbDataToProcess(USART_HandleTypeDef *husart)
   uint8_t rx_fifo_threshold;
   uint8_t tx_fifo_threshold;
   /* 2 0U/1U added for MISRAC2012-Rule-18.1_b and MISRAC2012-Rule-18.1_d */
-  uint8_t numerator[]   = {1U, 1U, 1U, 3U, 7U, 1U, 0U, 0U};
-  uint8_t denominator[] = {8U, 4U, 2U, 4U, 8U, 1U, 1U, 1U};
+  static const uint8_t numerator[]   = {1U, 1U, 1U, 3U, 7U, 1U, 0U, 0U};
+  static const uint8_t denominator[] = {8U, 4U, 2U, 4U, 8U, 1U, 1U, 1U};
 
   if (husart->FifoMode == USART_FIFOMODE_DISABLE)
   {
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c
index 05fade2d..ba94eb11 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c
@@ -232,18 +232,18 @@ ErrorStatus LL_ADC_CommonDeInit(ADC_Common_TypeDef *ADCxy_COMMON)
   *         must be disabled.
   * @param  ADCxy_COMMON ADC common instance
   *         (can be set directly from CMSIS definition or by using helper macro @ref __LL_ADC_COMMON_INSTANCE() )
-  * @param  ADC_CommonInitStruct Pointer to a @ref LL_ADC_CommonInitTypeDef structure
+  * @param  pADC_CommonInitStruct Pointer to a @ref LL_ADC_CommonInitTypeDef structure
   * @retval An ErrorStatus enumeration value:
   *          - SUCCESS: ADC common registers are initialized
   *          - ERROR: ADC common registers are not initialized
   */
-ErrorStatus LL_ADC_CommonInit(ADC_Common_TypeDef *ADCxy_COMMON, LL_ADC_CommonInitTypeDef *ADC_CommonInitStruct)
+ErrorStatus LL_ADC_CommonInit(ADC_Common_TypeDef *ADCxy_COMMON, LL_ADC_CommonInitTypeDef *pADC_CommonInitStruct)
 {
   ErrorStatus status = SUCCESS;
 
   /* Check the parameters */
   assert_param(IS_ADC_COMMON_INSTANCE(ADCxy_COMMON));
-  assert_param(IS_LL_ADC_COMMON_CLOCK(ADC_CommonInitStruct->CommonClock));
+  assert_param(IS_LL_ADC_COMMON_CLOCK(pADC_CommonInitStruct->CommonClock));
 
   /* Note: Hardware constraint (refer to description of functions             */
   /*       "LL_ADC_SetCommonXXX()":                                           */
@@ -256,7 +256,7 @@ ErrorStatus LL_ADC_CommonInit(ADC_Common_TypeDef *ADCxy_COMMON, LL_ADC_CommonIni
     /*  - common to several ADC                                               */
     /*    (all ADC instances belonging to the same ADC common instance)       */
     /*    - Set ADC clock (conversion clock)                                  */
-    LL_ADC_SetCommonClock(ADCxy_COMMON, ADC_CommonInitStruct->CommonClock);
+    LL_ADC_SetCommonClock(ADCxy_COMMON, pADC_CommonInitStruct->CommonClock);
   }
   else
   {
@@ -270,16 +270,16 @@ ErrorStatus LL_ADC_CommonInit(ADC_Common_TypeDef *ADCxy_COMMON, LL_ADC_CommonIni
 
 /**
   * @brief  Set each @ref LL_ADC_CommonInitTypeDef field to default value.
-  * @param  ADC_CommonInitStruct Pointer to a @ref LL_ADC_CommonInitTypeDef structure
+  * @param  pADC_CommonInitStruct Pointer to a @ref LL_ADC_CommonInitTypeDef structure
   *                              whose fields will be set to default values.
   * @retval None
   */
-void LL_ADC_CommonStructInit(LL_ADC_CommonInitTypeDef *ADC_CommonInitStruct)
+void LL_ADC_CommonStructInit(LL_ADC_CommonInitTypeDef *pADC_CommonInitStruct)
 {
-  /* Set ADC_CommonInitStruct fields to default values */
+  /* Set pADC_CommonInitStruct fields to default values */
   /* Set fields of ADC common */
   /* (all ADC instances belonging to the same ADC common instance) */
-  ADC_CommonInitStruct->CommonClock = LL_ADC_CLOCK_ASYNC_DIV2;
+  pADC_CommonInitStruct->CommonClock = LL_ADC_CLOCK_ASYNC_DIV2;
 
 }
 
@@ -506,22 +506,22 @@ ErrorStatus LL_ADC_DeInit(ADC_TypeDef *ADCx)
   *            Refer to function LL_ADC_SetSamplingTimeCommonChannels();
   *            Refer to function LL_ADC_SetChannelSamplingTime();
   * @param  ADCx ADC instance
-  * @param  ADC_InitStruct Pointer to a @ref LL_ADC_REG_InitTypeDef structure
+  * @param  pADC_InitStruct Pointer to a @ref LL_ADC_REG_InitTypeDef structure
   * @retval An ErrorStatus enumeration value:
   *          - SUCCESS: ADC registers are initialized
   *          - ERROR: ADC registers are not initialized
   */
-ErrorStatus LL_ADC_Init(ADC_TypeDef *ADCx, LL_ADC_InitTypeDef *ADC_InitStruct)
+ErrorStatus LL_ADC_Init(ADC_TypeDef *ADCx, LL_ADC_InitTypeDef *pADC_InitStruct)
 {
   ErrorStatus status = SUCCESS;
 
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(ADCx));
 
-  assert_param(IS_LL_ADC_CLOCK(ADC_InitStruct->Clock));
-  assert_param(IS_LL_ADC_RESOLUTION(ADC_InitStruct->Resolution));
-  assert_param(IS_LL_ADC_DATA_ALIGN(ADC_InitStruct->DataAlignment));
-  assert_param(IS_LL_ADC_LOW_POWER(ADC_InitStruct->LowPowerMode));
+  assert_param(IS_LL_ADC_CLOCK(pADC_InitStruct->Clock));
+  assert_param(IS_LL_ADC_RESOLUTION(pADC_InitStruct->Resolution));
+  assert_param(IS_LL_ADC_DATA_ALIGN(pADC_InitStruct->DataAlignment));
+  assert_param(IS_LL_ADC_LOW_POWER(pADC_InitStruct->LowPowerMode));
 
   /* Note: Hardware constraint (refer to description of this function):       */
   /*       ADC instance must be disabled.                                     */
@@ -538,15 +538,15 @@ ErrorStatus LL_ADC_Init(ADC_TypeDef *ADCx, LL_ADC_InitTypeDef *ADC_InitStruct)
                | ADC_CFGR1_WAIT
                | ADC_CFGR1_AUTOFF
                ,
-               ADC_InitStruct->Resolution
-               | ADC_InitStruct->DataAlignment
-               | ADC_InitStruct->LowPowerMode
+               pADC_InitStruct->Resolution
+               | pADC_InitStruct->DataAlignment
+               | pADC_InitStruct->LowPowerMode
               );
 
     MODIFY_REG(ADCx->CFGR2,
                ADC_CFGR2_CKMODE
                ,
-               ADC_InitStruct->Clock
+               pADC_InitStruct->Clock
               );
   }
   else
@@ -560,18 +560,18 @@ ErrorStatus LL_ADC_Init(ADC_TypeDef *ADCx, LL_ADC_InitTypeDef *ADC_InitStruct)
 
 /**
   * @brief  Set each @ref LL_ADC_InitTypeDef field to default value.
-  * @param  ADC_InitStruct Pointer to a @ref LL_ADC_InitTypeDef structure
+  * @param  pADC_InitStruct Pointer to a @ref LL_ADC_InitTypeDef structure
   *                        whose fields will be set to default values.
   * @retval None
   */
-void LL_ADC_StructInit(LL_ADC_InitTypeDef *ADC_InitStruct)
+void LL_ADC_StructInit(LL_ADC_InitTypeDef *pADC_InitStruct)
 {
-  /* Set ADC_InitStruct fields to default values */
+  /* Set pADC_InitStruct fields to default values */
   /* Set fields of ADC instance */
-  ADC_InitStruct->Clock         = LL_ADC_CLOCK_SYNC_PCLK_DIV2;
-  ADC_InitStruct->Resolution    = LL_ADC_RESOLUTION_12B;
-  ADC_InitStruct->DataAlignment = LL_ADC_DATA_ALIGN_RIGHT;
-  ADC_InitStruct->LowPowerMode  = LL_ADC_LP_MODE_NONE;
+  pADC_InitStruct->Clock         = LL_ADC_CLOCK_SYNC_PCLK_DIV2;
+  pADC_InitStruct->Resolution    = LL_ADC_RESOLUTION_12B;
+  pADC_InitStruct->DataAlignment = LL_ADC_DATA_ALIGN_RIGHT;
+  pADC_InitStruct->LowPowerMode  = LL_ADC_LP_MODE_NONE;
 
 }
 
@@ -610,37 +610,37 @@ void LL_ADC_StructInit(LL_ADC_InitTypeDef *ADC_InitStruct)
   *            Refer to function LL_ADC_SetSamplingTimeCommonChannels();
   *            Refer to function LL_ADC_SetChannelSamplingTime();
   * @param  ADCx ADC instance
-  * @param  ADC_REG_InitStruct Pointer to a @ref LL_ADC_REG_InitTypeDef structure
+  * @param  pADC_RegInitStruct Pointer to a @ref LL_ADC_REG_InitTypeDef structure
   * @retval An ErrorStatus enumeration value:
   *          - SUCCESS: ADC registers are initialized
   *          - ERROR: ADC registers are not initialized
   */
-ErrorStatus LL_ADC_REG_Init(ADC_TypeDef *ADCx, LL_ADC_REG_InitTypeDef *ADC_REG_InitStruct)
+ErrorStatus LL_ADC_REG_Init(ADC_TypeDef *ADCx, LL_ADC_REG_InitTypeDef *pADC_RegInitStruct)
 {
   ErrorStatus status = SUCCESS;
 
   /* Check the parameters */
   assert_param(IS_ADC_ALL_INSTANCE(ADCx));
-  assert_param(IS_LL_ADC_REG_TRIG_SOURCE(ADC_REG_InitStruct->TriggerSource));
-  assert_param(IS_LL_ADC_REG_CONTINUOUS_MODE(ADC_REG_InitStruct->ContinuousMode));
-  assert_param(IS_LL_ADC_REG_DMA_TRANSFER(ADC_REG_InitStruct->DMATransfer));
-  assert_param(IS_LL_ADC_REG_OVR_DATA_BEHAVIOR(ADC_REG_InitStruct->Overrun));
+  assert_param(IS_LL_ADC_REG_TRIG_SOURCE(pADC_RegInitStruct->TriggerSource));
+  assert_param(IS_LL_ADC_REG_CONTINUOUS_MODE(pADC_RegInitStruct->ContinuousMode));
+  assert_param(IS_LL_ADC_REG_DMA_TRANSFER(pADC_RegInitStruct->DMATransfer));
+  assert_param(IS_LL_ADC_REG_OVR_DATA_BEHAVIOR(pADC_RegInitStruct->Overrun));
 
   if (LL_ADC_REG_GetSequencerConfigurable(ADCx) != LL_ADC_REG_SEQ_FIXED)
   {
-    assert_param(IS_LL_ADC_REG_SEQ_SCAN_LENGTH(ADC_REG_InitStruct->SequencerLength));
+    assert_param(IS_LL_ADC_REG_SEQ_SCAN_LENGTH(pADC_RegInitStruct->SequencerLength));
   }
 
   if ((LL_ADC_REG_GetSequencerConfigurable(ADCx) == LL_ADC_REG_SEQ_FIXED)
-      || (ADC_REG_InitStruct->SequencerLength != LL_ADC_REG_SEQ_SCAN_DISABLE)
+      || (pADC_RegInitStruct->SequencerLength != LL_ADC_REG_SEQ_SCAN_DISABLE)
      )
   {
-    assert_param(IS_LL_ADC_REG_SEQ_SCAN_DISCONT_MODE(ADC_REG_InitStruct->SequencerDiscont));
+    assert_param(IS_LL_ADC_REG_SEQ_SCAN_DISCONT_MODE(pADC_RegInitStruct->SequencerDiscont));
 
     /* ADC group regular continuous mode and discontinuous mode                 */
     /* can not be enabled simultenaeously                                       */
-    assert_param((ADC_REG_InitStruct->ContinuousMode == LL_ADC_REG_CONV_SINGLE)
-                 || (ADC_REG_InitStruct->SequencerDiscont == LL_ADC_REG_SEQ_DISCONT_DISABLE));
+    assert_param((pADC_RegInitStruct->ContinuousMode == LL_ADC_REG_CONV_SINGLE)
+                 || (pADC_RegInitStruct->SequencerDiscont == LL_ADC_REG_SEQ_DISCONT_DISABLE));
   }
 
   /* Note: Hardware constraint (refer to description of this function):       */
@@ -659,7 +659,7 @@ ErrorStatus LL_ADC_REG_Init(ADC_TypeDef *ADCx, LL_ADC_REG_InitTypeDef *ADC_REG_I
     /* Note: On this STM32 series, ADC trigger edge is set to value 0x0 by    */
     /*       setting of trigger source to SW start.                           */
     if ((LL_ADC_REG_GetSequencerConfigurable(ADCx) == LL_ADC_REG_SEQ_FIXED)
-        || (ADC_REG_InitStruct->SequencerLength != LL_ADC_REG_SEQ_SCAN_DISABLE)
+        || (pADC_RegInitStruct->SequencerLength != LL_ADC_REG_SEQ_SCAN_DISABLE)
        )
     {
       /* Case of sequencer mode fixed
@@ -674,11 +674,11 @@ ErrorStatus LL_ADC_REG_Init(ADC_TypeDef *ADCx, LL_ADC_REG_InitTypeDef *ADC_REG_I
                  | ADC_CFGR1_DMACFG
                  | ADC_CFGR1_OVRMOD
                  ,
-                 ADC_REG_InitStruct->TriggerSource
-                 | ADC_REG_InitStruct->SequencerDiscont
-                 | ADC_REG_InitStruct->ContinuousMode
-                 | ADC_REG_InitStruct->DMATransfer
-                 | ADC_REG_InitStruct->Overrun
+                 pADC_RegInitStruct->TriggerSource
+                 | pADC_RegInitStruct->SequencerDiscont
+                 | pADC_RegInitStruct->ContinuousMode
+                 | pADC_RegInitStruct->DMATransfer
+                 | pADC_RegInitStruct->Overrun
                 );
     }
     else
@@ -695,18 +695,18 @@ ErrorStatus LL_ADC_REG_Init(ADC_TypeDef *ADCx, LL_ADC_REG_InitTypeDef *ADC_REG_I
                  | ADC_CFGR1_DMACFG
                  | ADC_CFGR1_OVRMOD
                  ,
-                 ADC_REG_InitStruct->TriggerSource
+                 pADC_RegInitStruct->TriggerSource
                  | LL_ADC_REG_SEQ_DISCONT_DISABLE
-                 | ADC_REG_InitStruct->ContinuousMode
-                 | ADC_REG_InitStruct->DMATransfer
-                 | ADC_REG_InitStruct->Overrun
+                 | pADC_RegInitStruct->ContinuousMode
+                 | pADC_RegInitStruct->DMATransfer
+                 | pADC_RegInitStruct->Overrun
                 );
     }
 
     /* Set ADC group regular sequencer length */
     if (LL_ADC_REG_GetSequencerConfigurable(ADCx) != LL_ADC_REG_SEQ_FIXED)
     {
-      LL_ADC_REG_SetSequencerLength(ADCx, ADC_REG_InitStruct->SequencerLength);
+      LL_ADC_REG_SetSequencerLength(ADCx, pADC_RegInitStruct->SequencerLength);
     }
   }
   else
@@ -719,22 +719,22 @@ ErrorStatus LL_ADC_REG_Init(ADC_TypeDef *ADCx, LL_ADC_REG_InitTypeDef *ADC_REG_I
 
 /**
   * @brief  Set each @ref LL_ADC_REG_InitTypeDef field to default value.
-  * @param  ADC_REG_InitStruct Pointer to a @ref LL_ADC_REG_InitTypeDef structure
+  * @param  pADC_RegInitStruct Pointer to a @ref LL_ADC_REG_InitTypeDef structure
   *                            whose fields will be set to default values.
   * @retval None
   */
-void LL_ADC_REG_StructInit(LL_ADC_REG_InitTypeDef *ADC_REG_InitStruct)
+void LL_ADC_REG_StructInit(LL_ADC_REG_InitTypeDef *pADC_RegInitStruct)
 {
-  /* Set ADC_REG_InitStruct fields to default values */
+  /* Set pADC_RegInitStruct fields to default values */
   /* Set fields of ADC group regular */
   /* Note: On this STM32 series, ADC trigger edge is set to value 0x0 by      */
   /*       setting of trigger source to SW start.                             */
-  ADC_REG_InitStruct->TriggerSource    = LL_ADC_REG_TRIG_SOFTWARE;
-  ADC_REG_InitStruct->SequencerLength  = LL_ADC_REG_SEQ_SCAN_DISABLE;
-  ADC_REG_InitStruct->SequencerDiscont = LL_ADC_REG_SEQ_DISCONT_DISABLE;
-  ADC_REG_InitStruct->ContinuousMode   = LL_ADC_REG_CONV_SINGLE;
-  ADC_REG_InitStruct->DMATransfer      = LL_ADC_REG_DMA_TRANSFER_NONE;
-  ADC_REG_InitStruct->Overrun          = LL_ADC_REG_OVR_DATA_OVERWRITTEN;
+  pADC_RegInitStruct->TriggerSource    = LL_ADC_REG_TRIG_SOFTWARE;
+  pADC_RegInitStruct->SequencerLength  = LL_ADC_REG_SEQ_SCAN_DISABLE;
+  pADC_RegInitStruct->SequencerDiscont = LL_ADC_REG_SEQ_DISCONT_DISABLE;
+  pADC_RegInitStruct->ContinuousMode   = LL_ADC_REG_CONV_SINGLE;
+  pADC_RegInitStruct->DMATransfer      = LL_ADC_REG_DMA_TRANSFER_NONE;
+  pADC_RegInitStruct->Overrun          = LL_ADC_REG_OVR_DATA_OVERWRITTEN;
 }
 
 /**
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_i2c.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_i2c.c
index 1e8dd13b..43921ec3 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_i2c.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_i2c.c
@@ -25,7 +25,7 @@
 #include "stm32_assert.h"
 #else
 #define assert_param(expr) ((void)0U)
-#endif
+#endif /* USE_FULL_ASSERT */
 
 /** @addtogroup STM32WLxx_LL_Driver
   * @{
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rcc.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rcc.c
index 313c1f97..91efbd2d 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rcc.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rcc.c
@@ -69,22 +69,22 @@
 /** @defgroup RCC_LL_Private_Functions RCC Private functions
   * @{
   */
-uint32_t RCC_PLL_GetFreqDomain_SYS(void);
-uint32_t RCC_PLL_GetFreqDomain_ADC(void);
-uint32_t RCC_PLL_GetFreqDomain_RNG(void);
-uint32_t RCC_PLL_GetFreqDomain_I2S(void);
+static uint32_t RCC_PLL_GetFreqDomain_SYS(void);
+static uint32_t RCC_PLL_GetFreqDomain_ADC(void);
+static uint32_t RCC_PLL_GetFreqDomain_RNG(void);
+static uint32_t RCC_PLL_GetFreqDomain_I2S(void);
 
-uint32_t RCC_GetSystemClockFreq(void);
+static uint32_t RCC_GetSystemClockFreq(void);
 
-uint32_t RCC_GetHCLK1ClockFreq(uint32_t SYSCLK_Frequency);
+static uint32_t RCC_GetHCLK1ClockFreq(uint32_t SYSCLK_Frequency);
 #if defined(DUAL_CORE)
-uint32_t RCC_GetHCLK2ClockFreq(uint32_t SYSCLK_Frequency);
+static uint32_t RCC_GetHCLK2ClockFreq(uint32_t SYSCLK_Frequency);
 #endif /* DUAL_CORE */
-uint32_t RCC_GetHCLK3ClockFreq(uint32_t SYSCLK_Frequency);
+static uint32_t RCC_GetHCLK3ClockFreq(uint32_t SYSCLK_Frequency);
 
 
-uint32_t RCC_GetPCLK1ClockFreq(uint32_t HCLK_Frequency);
-uint32_t RCC_GetPCLK2ClockFreq(uint32_t HCLK_Frequency);
+static uint32_t RCC_GetPCLK1ClockFreq(uint32_t HCLK_Frequency);
+static uint32_t RCC_GetPCLK2ClockFreq(uint32_t HCLK_Frequency);
 /**
   * @}
   */
@@ -778,7 +778,7 @@ uint32_t LL_RCC_GetRTCClockFreq(void)
   * @brief  Return SYSTEM clock (SYSCLK) frequency
   * @retval SYSTEM clock frequency (in Hz)
   */
-uint32_t RCC_GetSystemClockFreq(void)
+static uint32_t RCC_GetSystemClockFreq(void)
 {
   uint32_t frequency;
 
@@ -828,7 +828,7 @@ uint32_t RCC_GetSystemClockFreq(void)
   * @param  SYSCLK_Frequency SYSCLK clock frequency
   * @retval HCLK1 clock frequency (in Hz)
   */
-uint32_t RCC_GetHCLK1ClockFreq(uint32_t SYSCLK_Frequency)
+static uint32_t RCC_GetHCLK1ClockFreq(uint32_t SYSCLK_Frequency)
 {
   /* HCLK clock frequency */
   return __LL_RCC_CALC_HCLK1_FREQ(SYSCLK_Frequency, LL_RCC_GetAHBPrescaler());
@@ -840,7 +840,7 @@ uint32_t RCC_GetHCLK1ClockFreq(uint32_t SYSCLK_Frequency)
   * @param  SYSCLK_Frequency SYSCLK clock frequency
   * @retval HCLK2 clock frequency (in Hz)
   */
-uint32_t RCC_GetHCLK2ClockFreq(uint32_t SYSCLK_Frequency)
+static uint32_t RCC_GetHCLK2ClockFreq(uint32_t SYSCLK_Frequency)
 {
   /* HCLK clock frequency */
   return __LL_RCC_CALC_HCLK2_FREQ(SYSCLK_Frequency, LL_C2_RCC_GetAHBPrescaler());
@@ -852,7 +852,7 @@ uint32_t RCC_GetHCLK2ClockFreq(uint32_t SYSCLK_Frequency)
   * @param  SYSCLK_Frequency SYSCLK clock frequency
   * @retval HCLK3 clock frequency (in Hz)
   */
-uint32_t RCC_GetHCLK3ClockFreq(uint32_t SYSCLK_Frequency)
+static uint32_t RCC_GetHCLK3ClockFreq(uint32_t SYSCLK_Frequency)
 {
   /* HCLK clock frequency */
   return __LL_RCC_CALC_HCLK3_FREQ(SYSCLK_Frequency, LL_RCC_GetAHB3Prescaler());
@@ -863,7 +863,7 @@ uint32_t RCC_GetHCLK3ClockFreq(uint32_t SYSCLK_Frequency)
   * @param  HCLK_Frequency HCLK clock frequency
   * @retval PCLK1 clock frequency (in Hz)
   */
-uint32_t RCC_GetPCLK1ClockFreq(uint32_t HCLK_Frequency)
+static uint32_t RCC_GetPCLK1ClockFreq(uint32_t HCLK_Frequency)
 {
   /* PCLK1 clock frequency */
   return __LL_RCC_CALC_PCLK1_FREQ(HCLK_Frequency, LL_RCC_GetAPB1Prescaler());
@@ -874,7 +874,7 @@ uint32_t RCC_GetPCLK1ClockFreq(uint32_t HCLK_Frequency)
   * @param  HCLK_Frequency HCLK clock frequency
   * @retval PCLK2 clock frequency (in Hz)
   */
-uint32_t RCC_GetPCLK2ClockFreq(uint32_t HCLK_Frequency)
+static uint32_t RCC_GetPCLK2ClockFreq(uint32_t HCLK_Frequency)
 {
   /* PCLK2 clock frequency */
   return __LL_RCC_CALC_PCLK2_FREQ(HCLK_Frequency, LL_RCC_GetAPB2Prescaler());
@@ -884,7 +884,7 @@ uint32_t RCC_GetPCLK2ClockFreq(uint32_t HCLK_Frequency)
   * @brief  Return PLL clock (PLLRCLK) frequency used for system domain
   * @retval PLLRCLK clock frequency (in Hz)
   */
-uint32_t RCC_PLL_GetFreqDomain_SYS(void)
+static uint32_t RCC_PLL_GetFreqDomain_SYS(void)
 {
   uint32_t pllinputfreq;
   uint32_t pllsource;
@@ -934,7 +934,7 @@ uint32_t RCC_PLL_GetFreqDomain_SYS(void)
   * @brief  Return PLL clock (PLLPCLK) frequency used for ADC domain
   * @retval PLLPCLK clock frequency (in Hz)
   */
-uint32_t RCC_PLL_GetFreqDomain_ADC(void)
+static uint32_t RCC_PLL_GetFreqDomain_ADC(void)
 {
   uint32_t pllinputfreq;
   uint32_t pllsource;
@@ -982,7 +982,7 @@ uint32_t RCC_PLL_GetFreqDomain_ADC(void)
   * @brief  Return PLL clock (PLLQCLK) frequency used for RNG domain
   * @retval PLLQCLK clock frequency (in Hz)
   */
-uint32_t RCC_PLL_GetFreqDomain_RNG(void)
+static uint32_t RCC_PLL_GetFreqDomain_RNG(void)
 {
   uint32_t pllinputfreq;
   uint32_t pllsource;
@@ -1030,7 +1030,7 @@ uint32_t RCC_PLL_GetFreqDomain_RNG(void)
   * @brief  Return PLL clock (PLLQCLK) frequency used for I2S domain
   * @retval PLLQCLK clock frequency (in Hz)
   */
-uint32_t RCC_PLL_GetFreqDomain_I2S(void)
+static uint32_t RCC_PLL_GetFreqDomain_I2S(void)
 {
   uint32_t pllinputfreq;
   uint32_t pllsource;
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rng.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rng.c
index 57d10fc6..6ef53964 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rng.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rng.c
@@ -42,7 +42,7 @@
 /* Private variables ---------------------------------------------------------*/
 /* Private constants ---------------------------------------------------------*/
 /* Private macros ------------------------------------------------------------*/
-/** @addtogroup RNG_LL_Private_Macros
+/** @defgroup RNG_LL_Private_Macros RNG Private Macros
   * @{
   */
 #define IS_LL_RNG_CED(__MODE__) (((__MODE__) == LL_RNG_CED_ENABLE) || \
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rtc.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rtc.c
index 1e85f481..b80c475b 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rtc.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_rtc.c
@@ -343,7 +343,7 @@ ErrorStatus LL_RTC_TIME_Init(RTC_TypeDef *RTCx, uint32_t RTC_Format, LL_RTC_Time
     }
 
     /* Exit Initialization mode */
-    LL_RTC_DisableInitMode(RTC);
+    LL_RTC_DisableInitMode(RTCx);
 
     /* If  RTC_CR_BYPSHAD bit = 0, wait for synchro else this check is not needed */
     if (LL_RTC_IsShadowRegBypassEnabled(RTCx) == 0U)
@@ -431,7 +431,7 @@ ErrorStatus LL_RTC_DATE_Init(RTC_TypeDef *RTCx, uint32_t RTC_Format, LL_RTC_Date
     }
 
     /* Exit Initialization mode */
-    LL_RTC_DisableInitMode(RTC);
+    LL_RTC_DisableInitMode(RTCx);
 
     /* If  RTC_CR_BYPSHAD bit = 0, wait for synchro else this check is not needed */
     if (LL_RTC_IsShadowRegBypassEnabled(RTCx) == 0U)
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_spi.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_spi.c
index c39fdfcb..3478ef66 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_spi.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_spi.c
@@ -221,6 +221,12 @@ ErrorStatus LL_SPI_Init(SPI_TypeDef *SPIx, LL_SPI_InitTypeDef *SPI_InitStruct)
                SPI_CR2_DS | SPI_CR2_SSOE,
                SPI_InitStruct->DataWidth | (SPI_InitStruct->NSS >> 16U));
 
+    /* Set Rx FIFO to Quarter (1 Byte) in case of 8 Bits mode. No DataPacking by default */
+    if (SPI_InitStruct->DataWidth < LL_SPI_DATAWIDTH_9BIT)
+    {
+      LL_SPI_SetRxFIFOThreshold(SPIx, LL_SPI_RX_FIFO_TH_QUARTER);
+    }
+
     /*---------------------------- SPIx CRCPR Configuration ----------------------
      * Configure SPIx CRCPR with parameters:
      * - CRCPoly:            CRCPOLY[15:0] bits
diff --git a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_usart.c b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_usart.c
index b5f8ce14..4f1a4583 100644
--- a/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_usart.c
+++ b/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_usart.c
@@ -66,9 +66,6 @@
 /* __VALUE__ In case of oversampling by 16 and 8, BRR content must be greater than or equal to 16d. */
 #define IS_LL_USART_BRR_MIN(__VALUE__) ((__VALUE__) >= 16U)
 
-/* __VALUE__ BRR content must be lower than or equal to 0xFFFF. */
-#define IS_LL_USART_BRR_MAX(__VALUE__) ((__VALUE__) <= 0x0000FFFFU)
-
 #define IS_LL_USART_DIRECTION(__VALUE__) (((__VALUE__) == LL_USART_DIRECTION_NONE) \
                                           || ((__VALUE__) == LL_USART_DIRECTION_RX) \
                                           || ((__VALUE__) == LL_USART_DIRECTION_TX) \
@@ -252,9 +249,6 @@ ErrorStatus LL_USART_Init(USART_TypeDef *USARTx, LL_USART_InitTypeDef *USART_Ini
 
       /* Check BRR is greater than or equal to 16d */
       assert_param(IS_LL_USART_BRR_MIN(USARTx->BRR));
-
-      /* Check BRR is lower than or equal to 0xFFFF */
-      assert_param(IS_LL_USART_BRR_MAX(USARTx->BRR));
     }
 
     /*---------------------------- USART PRESC Configuration -----------------------
@@ -312,37 +306,25 @@ ErrorStatus LL_USART_ClockInit(USART_TypeDef *USARTx, LL_USART_ClockInitTypeDef
      CRx registers */
   if (LL_USART_IsEnabled(USARTx) == 0U)
   {
-    /*---------------------------- USART CR2 Configuration -----------------------*/
-    /* If Clock signal has to be output */
-    if (USART_ClockInitStruct->ClockOutput == LL_USART_CLOCK_DISABLE)
-    {
-      /* Deactivate Clock signal delivery :
-       * - Disable Clock Output:        USART_CR2_CLKEN cleared
-       */
-      LL_USART_DisableSCLKOutput(USARTx);
-    }
-    else
-    {
-      /* Ensure USART instance is USART capable */
-      assert_param(IS_USART_INSTANCE(USARTx));
-
-      /* Check clock related parameters */
-      assert_param(IS_LL_USART_CLOCKPOLARITY(USART_ClockInitStruct->ClockPolarity));
-      assert_param(IS_LL_USART_CLOCKPHASE(USART_ClockInitStruct->ClockPhase));
-      assert_param(IS_LL_USART_LASTBITCLKOUTPUT(USART_ClockInitStruct->LastBitClockPulse));
-
-      /*---------------------------- USART CR2 Configuration -----------------------
-       * Configure USARTx CR2 (Clock signal related bits) with parameters:
-       * - Enable Clock Output:         USART_CR2_CLKEN set
-       * - Clock Polarity:              USART_CR2_CPOL bit according to USART_ClockInitStruct->ClockPolarity value
-       * - Clock Phase:                 USART_CR2_CPHA bit according to USART_ClockInitStruct->ClockPhase value
-       * - Last Bit Clock Pulse Output: USART_CR2_LBCL bit according to USART_ClockInitStruct->LastBitClockPulse value.
-       */
-      MODIFY_REG(USARTx->CR2,
-                 USART_CR2_CLKEN | USART_CR2_CPHA | USART_CR2_CPOL | USART_CR2_LBCL,
-                 USART_CR2_CLKEN | USART_ClockInitStruct->ClockPolarity |
-                 USART_ClockInitStruct->ClockPhase | USART_ClockInitStruct->LastBitClockPulse);
-    }
+    /* Ensure USART instance is USART capable */
+    assert_param(IS_USART_INSTANCE(USARTx));
+
+    /* Check clock related parameters */
+    assert_param(IS_LL_USART_CLOCKPOLARITY(USART_ClockInitStruct->ClockPolarity));
+    assert_param(IS_LL_USART_CLOCKPHASE(USART_ClockInitStruct->ClockPhase));
+    assert_param(IS_LL_USART_LASTBITCLKOUTPUT(USART_ClockInitStruct->LastBitClockPulse));
+
+    /*---------------------------- USART CR2 Configuration -----------------------
+     * Configure USARTx CR2 (Clock signal related bits) with parameters:
+     * - Clock Output:                USART_CR2_CLKEN bit according to USART_ClockInitStruct->ClockOutput value
+     * - Clock Polarity:              USART_CR2_CPOL bit according to USART_ClockInitStruct->ClockPolarity value
+     * - Clock Phase:                 USART_CR2_CPHA bit according to USART_ClockInitStruct->ClockPhase value
+     * - Last Bit Clock Pulse Output: USART_CR2_LBCL bit according to USART_ClockInitStruct->LastBitClockPulse value.
+     */
+    MODIFY_REG(USARTx->CR2,
+               USART_CR2_CLKEN | USART_CR2_CPHA | USART_CR2_CPOL | USART_CR2_LBCL,
+               USART_ClockInitStruct->ClockOutput | USART_ClockInitStruct->ClockPolarity |
+               USART_ClockInitStruct->ClockPhase | USART_ClockInitStruct->LastBitClockPulse);
   }
   /* Else (USART not in Disabled state => return ERROR */
   else
diff --git a/Drivers/STM32WLxx_HAL_Driver/_htmresc/mini-st.css b/Drivers/STM32WLxx_HAL_Driver/_htmresc/mini-st.css
deleted file mode 100644
index eb41d56c..00000000
--- a/Drivers/STM32WLxx_HAL_Driver/_htmresc/mini-st.css
+++ /dev/null
@@ -1,1700 +0,0 @@
-@charset "UTF-8";
-/*
-  Flavor name: Default (mini-default)
-  Author: Angelos Chalaris (chalarangelo@gmail.com)
-  Maintainers: Angelos Chalaris
-  mini.css version: v3.0.0-alpha.3
-*/
-/*
-  Browsers resets and base typography.
-*/
-/* Core module CSS variable definitions */
-:root {
-  --fore-color: #111;
-  --secondary-fore-color: #444;
-  --back-color: #f8f8f8;
-  --secondary-back-color: #f0f0f0;
-  --blockquote-color: #f57c00;
-  --pre-color: #1565c0;
-  --border-color: #aaa;
-  --secondary-border-color: #ddd;
-  --heading-ratio: 1.19;
-  --universal-margin: 0.5rem;
-  --universal-padding: 0.125rem;
-  --universal-border-radius: 0.125rem;
-  --a-link-color: #0277bd;
-  --a-visited-color: #01579b; }
-
-html {
-  font-size: 14px; }
-
-a, b, del, em, i, ins, q, span, strong, u {
-  font-size: 1em; }
-
-html, * {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Helvetica, sans-serif;
-  line-height: 1.4;
-  -webkit-text-size-adjust: 100%; }
-
-* {
-  font-size: 1rem; }
-
-body {
-  margin: 0;
-  color: var(--fore-color);
-  background: var(--back-color); }
-
-details {
-  display: block; }
-
-summary {
-  display: list-item; }
-
-abbr[title] {
-  border-bottom: none;
-  text-decoration: underline dotted; }
-
-input {
-  overflow: visible; }
-
-img {
-  max-width: 100%;
-  height: auto; }
-
-h1, h2, h3, h4, h5, h6 {
-  line-height: 1.2;
-  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  font-weight: 500; }
-  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-    color: var(--secondary-fore-color);
-    display: block;
-    margin-top: -0.25rem; }
-
-h1 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
-
-h2 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio); );
-  background: var(--mark-back-color);
-  font-weight: 600;
-  padding: 0.1em 0.5em 0.2em 0.5em;
-  color: var(--mark-fore-color); }
-
-h3 {
-  font-size: calc(1rem * var(--heading-ratio));
-  padding-left: calc(2 * var(--universal-margin)); 
-  /* background: var(--border-color); */
-    }
-
-h4 {
-  font-size: 1rem;);
-  padding-left: calc(4 * var(--universal-margin));  }
-
-h5 {
-  font-size: 1rem; }
-
-h6 {
-  font-size: calc(1rem / var(--heading-ratio)); }
-
-p {
-  margin: var(--universal-margin); }
-
-ol, ul {
-  margin: var(--universal-margin);
-  padding-left: calc(6 * var(--universal-margin)); }
-
-b, strong {
-  font-weight: 700; }
-
-hr {
-  box-sizing: content-box;
-  border: 0;
-  line-height: 1.25em;
-  margin: var(--universal-margin);
-  height: 0.0625rem;
-  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
-
-blockquote {
-  display: block;
-  position: relative;
-  font-style: italic;
-  color: var(--secondary-fore-color);
-  margin: var(--universal-margin);
-  padding: calc(3 * var(--universal-padding));
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.375rem solid var(--blockquote-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-  blockquote:before {
-    position: absolute;
-    top: calc(0rem - var(--universal-padding));
-    left: 0;
-    font-family: sans-serif;
-    font-size: 3rem;
-    font-weight: 700;
-    content: "\201c";
-    color: var(--blockquote-color); }
-  blockquote[cite]:after {
-    font-style: normal;
-    font-size: 0.75em;
-    font-weight: 700;
-    content: "\a—  " attr(cite);
-    white-space: pre; }
-
-code, kbd, pre, samp {
-  font-family: Menlo, Consolas, monospace;
-  font-size: 0.85em; }
-
-code {
-  background: var(--secondary-back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-kbd {
-  background: var(--fore-color);
-  color: var(--back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-pre {
-  overflow: auto;
-  background: var(--secondary-back-color);
-  padding: calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.25rem solid var(--pre-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-
-sup, sub, code, kbd {
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
-small, sup, sub, figcaption {
-  font-size: 0.75em; }
-
-sup {
-  top: -0.5em; }
-
-sub {
-  bottom: -0.25em; }
-
-figure {
-  margin: var(--universal-margin); }
-
-figcaption {
-  color: var(--secondary-fore-color); }
-
-a {
-  text-decoration: none; }
-  a:link {
-    color: var(--a-link-color); }
-  a:visited {
-    color: var(--a-visited-color); }
-  a:hover, a:focus {
-    text-decoration: underline; }
-
-/*
-  Definitions for the grid system, cards and containers.
-*/
-.container {
-  margin: 0 auto;
-  padding: 0 calc(1.5 * var(--universal-padding)); }
-
-.row {
-  box-sizing: border-box;
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap; }
-
-.col-sm,
-[class^='col-sm-'],
-[class^='col-sm-offset-'],
-.row[class*='cols-sm-'] > * {
-  box-sizing: border-box;
-  flex: 0 0 auto;
-  padding: 0 calc(var(--universal-padding) / 2); }
-
-.col-sm,
-.row.cols-sm > * {
-  max-width: 100%;
-  flex-grow: 1;
-  flex-basis: 0; }
-
-.col-sm-1,
-.row.cols-sm-1 > * {
-  max-width: 8.3333333333%;
-  flex-basis: 8.3333333333%; }
-
-.col-sm-offset-0 {
-  margin-left: 0; }
-
-.col-sm-2,
-.row.cols-sm-2 > * {
-  max-width: 16.6666666667%;
-  flex-basis: 16.6666666667%; }
-
-.col-sm-offset-1 {
-  margin-left: 8.3333333333%; }
-
-.col-sm-3,
-.row.cols-sm-3 > * {
-  max-width: 25%;
-  flex-basis: 25%; }
-
-.col-sm-offset-2 {
-  margin-left: 16.6666666667%; }
-
-.col-sm-4,
-.row.cols-sm-4 > * {
-  max-width: 33.3333333333%;
-  flex-basis: 33.3333333333%; }
-
-.col-sm-offset-3 {
-  margin-left: 25%; }
-
-.col-sm-5,
-.row.cols-sm-5 > * {
-  max-width: 41.6666666667%;
-  flex-basis: 41.6666666667%; }
-
-.col-sm-offset-4 {
-  margin-left: 33.3333333333%; }
-
-.col-sm-6,
-.row.cols-sm-6 > * {
-  max-width: 50%;
-  flex-basis: 50%; }
-
-.col-sm-offset-5 {
-  margin-left: 41.6666666667%; }
-
-.col-sm-7,
-.row.cols-sm-7 > * {
-  max-width: 58.3333333333%;
-  flex-basis: 58.3333333333%; }
-
-.col-sm-offset-6 {
-  margin-left: 50%; }
-
-.col-sm-8,
-.row.cols-sm-8 > * {
-  max-width: 66.6666666667%;
-  flex-basis: 66.6666666667%; }
-
-.col-sm-offset-7 {
-  margin-left: 58.3333333333%; }
-
-.col-sm-9,
-.row.cols-sm-9 > * {
-  max-width: 75%;
-  flex-basis: 75%; }
-
-.col-sm-offset-8 {
-  margin-left: 66.6666666667%; }
-
-.col-sm-10,
-.row.cols-sm-10 > * {
-  max-width: 83.3333333333%;
-  flex-basis: 83.3333333333%; }
-
-.col-sm-offset-9 {
-  margin-left: 75%; }
-
-.col-sm-11,
-.row.cols-sm-11 > * {
-  max-width: 91.6666666667%;
-  flex-basis: 91.6666666667%; }
-
-.col-sm-offset-10 {
-  margin-left: 83.3333333333%; }
-
-.col-sm-12,
-.row.cols-sm-12 > * {
-  max-width: 100%;
-  flex-basis: 100%; }
-
-.col-sm-offset-11 {
-  margin-left: 91.6666666667%; }
-
-.col-sm-normal {
-  order: initial; }
-
-.col-sm-first {
-  order: -999; }
-
-.col-sm-last {
-  order: 999; }
-
-@media screen and (min-width: 500px) {
-  .col-md,
-  [class^='col-md-'],
-  [class^='col-md-offset-'],
-  .row[class*='cols-md-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-md,
-  .row.cols-md > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-md-1,
-  .row.cols-md-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-md-offset-0 {
-    margin-left: 0; }
-
-  .col-md-2,
-  .row.cols-md-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-md-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-md-3,
-  .row.cols-md-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-md-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-md-4,
-  .row.cols-md-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-md-offset-3 {
-    margin-left: 25%; }
-
-  .col-md-5,
-  .row.cols-md-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-md-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-md-6,
-  .row.cols-md-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-md-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-md-7,
-  .row.cols-md-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-md-offset-6 {
-    margin-left: 50%; }
-
-  .col-md-8,
-  .row.cols-md-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-md-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-md-9,
-  .row.cols-md-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-md-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-md-10,
-  .row.cols-md-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-md-offset-9 {
-    margin-left: 75%; }
-
-  .col-md-11,
-  .row.cols-md-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-md-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-md-12,
-  .row.cols-md-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-md-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-md-normal {
-    order: initial; }
-
-  .col-md-first {
-    order: -999; }
-
-  .col-md-last {
-    order: 999; } }
-@media screen and (min-width: 1280px) {
-  .col-lg,
-  [class^='col-lg-'],
-  [class^='col-lg-offset-'],
-  .row[class*='cols-lg-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-lg,
-  .row.cols-lg > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-lg-1,
-  .row.cols-lg-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-lg-offset-0 {
-    margin-left: 0; }
-
-  .col-lg-2,
-  .row.cols-lg-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-lg-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-lg-3,
-  .row.cols-lg-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-lg-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-lg-4,
-  .row.cols-lg-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-lg-offset-3 {
-    margin-left: 25%; }
-
-  .col-lg-5,
-  .row.cols-lg-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-lg-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-lg-6,
-  .row.cols-lg-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-lg-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-lg-7,
-  .row.cols-lg-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-lg-offset-6 {
-    margin-left: 50%; }
-
-  .col-lg-8,
-  .row.cols-lg-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-lg-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-lg-9,
-  .row.cols-lg-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-lg-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-lg-10,
-  .row.cols-lg-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-lg-offset-9 {
-    margin-left: 75%; }
-
-  .col-lg-11,
-  .row.cols-lg-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-lg-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-lg-12,
-  .row.cols-lg-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-lg-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-lg-normal {
-    order: initial; }
-
-  .col-lg-first {
-    order: -999; }
-
-  .col-lg-last {
-    order: 999; } }
-/* Card component CSS variable definitions */
-:root {
-  --card-back-color: #f8f8f8;
-  --card-fore-color: #111;
-  --card-border-color: #ddd; }
-
-.card {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-self: center;
-  position: relative;
-  width: 100%;
-  background: var(--card-back-color);
-  color: var(--card-fore-color);
-  border: 0.0625rem solid var(--card-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  overflow: hidden; }
-  @media screen and (min-width: 320px) {
-    .card {
-      max-width: 320px; } }
-  .card > .sectione {
-    background: var(--card-back-color);
-    color: var(--card-fore-color);
-    box-sizing: border-box;
-    margin: 0;
-    border: 0;
-    border-radius: 0;
-    border-bottom: 0.0625rem solid var(--card-border-color);
-    padding: var(--universal-padding);
-    width: 100%; }
-    .card > .sectione.media {
-      height: 200px;
-      padding: 0;
-      -o-object-fit: cover;
-      object-fit: cover; }
-  .card > .sectione:last-child {
-    border-bottom: 0; }
-
-/*
-  Custom elements for card elements.
-*/
-@media screen and (min-width: 240px) {
-  .card.small {
-    max-width: 240px; } }
-@media screen and (min-width: 480px) {
-  .card.large {
-    max-width: 480px; } }
-.card.fluid {
-  max-width: 100%;
-  width: auto; }
-
-.card.warning {
-/*  --card-back-color: #ffca28; */
-  --card-back-color: #e5b8b7;
-  --card-border-color: #e8b825; }
-
-.card.error {
-  --card-back-color: #b71c1c;
-  --card-fore-color: #f8f8f8;
-  --card-border-color: #a71a1a; }
-
-.card > .sectione.dark {
-  --card-back-color: #e0e0e0; }
-
-.card > .sectione.double-padded {
-  padding: calc(1.5 * var(--universal-padding)); }
-
-/*
-  Definitions for forms and input elements.
-*/
-/* Input_control module CSS variable definitions */
-:root {
-  --form-back-color: #f0f0f0;
-  --form-fore-color: #111;
-  --form-border-color: #ddd;
-  --input-back-color: #f8f8f8;
-  --input-fore-color: #111;
-  --input-border-color: #ddd;
-  --input-focus-color: #0288d1;
-  --input-invalid-color: #d32f2f;
-  --button-back-color: #e2e2e2;
-  --button-hover-back-color: #dcdcdc;
-  --button-fore-color: #212121;
-  --button-border-color: transparent;
-  --button-hover-border-color: transparent;
-  --button-group-border-color: rgba(124, 124, 124, 0.54); }
-
-form {
-  background: var(--form-back-color);
-  color: var(--form-fore-color);
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
-
-fieldset {
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 4);
-  padding: var(--universal-padding); }
-
-legend {
-  box-sizing: border-box;
-  display: table;
-  max-width: 100%;
-  white-space: normal;
-  font-weight: 700;
-  padding: calc(var(--universal-padding) / 2); }
-
-label {
-  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-.input-group {
-  display: inline-block; }
-  .input-group.fluid {
-    display: flex;
-    align-items: center;
-    justify-content: center; }
-    .input-group.fluid > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-    @media screen and (max-width: 499px) {
-      .input-group.fluid {
-        align-items: stretch;
-        flex-direction: column; } }
-  .input-group.vertical {
-    display: flex;
-    align-items: stretch;
-    flex-direction: column; }
-    .input-group.vertical > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-
-[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
-  height: auto; }
-
-[type="search"] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px; }
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
-
-input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
-[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
-  box-sizing: border-box;
-  background: var(--input-back-color);
-  color: var(--input-fore-color);
-  border: 0.0625rem solid var(--input-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 2);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
-  border-color: var(--input-focus-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
-  border-color: var(--input-invalid-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
-  background: var(--secondary-back-color); }
-
-select {
-  max-width: 100%; }
-
-option {
-  overflow: hidden;
-  text-overflow: ellipsis; }
-
-[type="checkbox"], [type="radio"] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  position: relative;
-  height: calc(1rem + var(--universal-padding) / 2);
-  width: calc(1rem + var(--universal-padding) / 2);
-  vertical-align: text-bottom;
-  padding: 0;
-  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
-  flex-grow: 0 !important; }
-  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
-    position: absolute; }
-
-[type="checkbox"]:checked:before {
-  content: '\2713';
-  font-family: sans-serif;
-  font-size: calc(1rem + var(--universal-padding) / 2);
-  top: calc(0rem - var(--universal-padding));
-  left: calc(var(--universal-padding) / 4); }
-
-[type="radio"] {
-  border-radius: 100%; }
-  [type="radio"]:checked:before {
-    border-radius: 100%;
-    content: '';
-    top: calc(0.0625rem + var(--universal-padding) / 2);
-    left: calc(0.0625rem + var(--universal-padding) / 2);
-    background: var(--input-fore-color);
-    width: 0.5rem;
-    height: 0.5rem; }
-
-:placeholder-shown {
-  color: var(--input-fore-color); }
-
-::-ms-placeholder {
-  color: var(--input-fore-color);
-  opacity: 0.54; }
-
-button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-button, html [type="button"], [type="reset"], [type="submit"] {
-  -webkit-appearance: button; }
-
-button {
-  overflow: visible;
-  text-transform: none; }
-
-button, [type="button"], [type="submit"], [type="reset"],
-a.button, label.button, .button,
-a[role="button"], label[role="button"], [role="button"] {
-  display: inline-block;
-  background: var(--button-back-color);
-  color: var(--button-fore-color);
-  border: 0.0625rem solid var(--button-border-color);
-  border-radius: var(--universal-border-radius);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  text-decoration: none;
-  cursor: pointer;
-  transition: background 0.3s; }
-  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
-  a.button:hover,
-  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
-  a[role="button"]:hover,
-  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
-    background: var(--button-hover-back-color);
-    border-color: var(--button-hover-border-color); }
-
-input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
-  cursor: not-allowed;
-  opacity: 0.75; }
-
-.button-group {
-  display: flex;
-  border: 0.0625rem solid var(--button-group-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
-    margin: 0;
-    max-width: 100%;
-    flex: 1 1 auto;
-    text-align: center;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none; }
-  .button-group > :not(:first-child) {
-    border-left: 0.0625rem solid var(--button-group-border-color); }
-  @media screen and (max-width: 499px) {
-    .button-group {
-      flex-direction: column; }
-      .button-group > :not(:first-child) {
-        border: 0;
-        border-top: 0.0625rem solid var(--button-group-border-color); } }
-
-/*
-  Custom elements for forms and input elements.
-*/
-button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
-  --button-back-color: #1976d2;
-  --button-fore-color: #f8f8f8; }
-  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
-    --button-hover-back-color: #1565c0; }
-
-button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
-  --button-back-color: #d32f2f;
-  --button-fore-color: #f8f8f8; }
-  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
-    --button-hover-back-color: #c62828; }
-
-button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
-  --button-back-color: #308732;
-  --button-fore-color: #f8f8f8; }
-  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
-    --button-hover-back-color: #277529; }
-
-button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
-  --button-back-color: #212121;
-  --button-fore-color: #f8f8f8; }
-  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
-    --button-hover-back-color: #111; }
-
-button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
-  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
-  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-/*
-  Definitions for navigation elements.
-*/
-/* Navigation module CSS variable definitions */
-:root {
-  --header-back-color: #f8f8f8;
-  --header-hover-back-color: #f0f0f0;
-  --header-fore-color: #444;
-  --header-border-color: #ddd;
-  --nav-back-color: #f8f8f8;
-  --nav-hover-back-color: #f0f0f0;
-  --nav-fore-color: #444;
-  --nav-border-color: #ddd;
-  --nav-link-color: #0277bd;
-  --footer-fore-color: #444;
-  --footer-back-color: #f8f8f8;
-  --footer-border-color: #ddd;
-  --footer-link-color: #0277bd;
-  --drawer-back-color: #f8f8f8;
-  --drawer-hover-back-color: #f0f0f0;
-  --drawer-border-color: #ddd;
-  --drawer-close-color: #444; }
-
-header {
-  height: 3.1875rem;
-  background: var(--header-back-color);
-  color: var(--header-fore-color);
-  border-bottom: 0.0625rem solid var(--header-border-color);
-  padding: calc(var(--universal-padding) / 4) 0;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden; }
-  header.row {
-    box-sizing: content-box; }
-  header .logo {
-    color: var(--header-fore-color);
-    font-size: 1.75rem;
-    padding: var(--universal-padding) calc(2 * var(--universal-padding));
-    text-decoration: none; }
-  header button, header [type="button"], header .button, header [role="button"] {
-    box-sizing: border-box;
-    position: relative;
-    top: calc(0rem - var(--universal-padding) / 4);
-    height: calc(3.1875rem + var(--universal-padding) / 2);
-    background: var(--header-back-color);
-    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
-    text-align: center;
-    color: var(--header-fore-color);
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-    text-transform: uppercase; }
-    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
-      background: var(--header-hover-back-color); }
-
-nav {
-  background: var(--nav-back-color);
-  color: var(--nav-fore-color);
-  border: 0.0625rem solid var(--nav-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  nav * {
-    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-  nav a, nav a:visited {
-    display: block;
-    color: var(--nav-link-color);
-    border-radius: var(--universal-border-radius);
-    transition: background 0.3s; }
-    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
-      text-decoration: none;
-      background: var(--nav-hover-back-color); }
-  nav .sublink-1 {
-    position: relative;
-    margin-left: calc(2 * var(--universal-padding)); }
-    nav .sublink-1:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-  nav .sublink-2 {
-    position: relative;
-    margin-left: calc(4 * var(--universal-padding)); }
-    nav .sublink-2:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-
-footer {
-  background: var(--footer-back-color);
-  color: var(--footer-fore-color);
-  border-top: 0.0625rem solid var(--footer-border-color);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
-  font-size: 0.875rem; }
-  footer a, footer a:visited {
-    color: var(--footer-link-color); }
-
-header.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  top: 0; }
-
-footer.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  bottom: 0; }
-
-.drawer-toggle:before {
-  display: inline-block;
-  position: relative;
-  vertical-align: bottom;
-  content: '\00a0\2261\00a0';
-  font-family: sans-serif;
-  font-size: 1.5em; }
-@media screen and (min-width: 500px) {
-  .drawer-toggle:not(.persistent) {
-    display: none; } }
-
-[type="checkbox"].drawer {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].drawer + * {
-    display: block;
-    box-sizing: border-box;
-    position: fixed;
-    top: 0;
-    width: 320px;
-    height: 100vh;
-    overflow-y: auto;
-    background: var(--drawer-back-color);
-    border: 0.0625rem solid var(--drawer-border-color);
-    border-radius: 0;
-    margin: 0;
-    z-index: 1110;
-    right: -320px;
-    transition: right 0.3s; }
-    [type="checkbox"].drawer + * .drawer-close {
-      position: absolute;
-      top: var(--universal-margin);
-      right: var(--universal-margin);
-      z-index: 1111;
-      width: 2rem;
-      height: 2rem;
-      border-radius: var(--universal-border-radius);
-      padding: var(--universal-padding);
-      margin: 0;
-      cursor: pointer;
-      transition: background 0.3s; }
-      [type="checkbox"].drawer + * .drawer-close:before {
-        display: block;
-        content: '\00D7';
-        color: var(--drawer-close-color);
-        position: relative;
-        font-family: sans-serif;
-        font-size: 2rem;
-        line-height: 1;
-        text-align: center; }
-      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
-        background: var(--drawer-hover-back-color); }
-    @media screen and (max-width: 320px) {
-      [type="checkbox"].drawer + * {
-        width: 100%; } }
-  [type="checkbox"].drawer:checked + * {
-    right: 0; }
-  @media screen and (min-width: 500px) {
-    [type="checkbox"].drawer:not(.persistent) + * {
-      position: static;
-      height: 100%;
-      z-index: 1100; }
-      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
-        display: none; } }
-
-/*
-  Definitions for the responsive table component.
-*/
-/* Table module CSS variable definitions. */
-:root {
-  --table-border-color: #aaa;
-  --table-border-separator-color: #666;
-  --table-head-back-color: #e6e6e6;
-  --table-head-fore-color: #111;
-  --table-body-back-color: #f8f8f8;
-  --table-body-fore-color: #111;
-  --table-body-alt-back-color: #eee; }
-
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  : margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap;
-  padding: var(--universal-padding);
-  padding-top: 0;
-	margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);	}
-  table caption {
-    font-size: 1.25 * rem;
-    margin: calc(2 * var(--universal-margin)) 0;
-    max-width: 100%;
-    flex: 0 0 100%;
-		text-align: left;}
-  table thead, table tbody {
-    display: flex;
-    flex-flow: row wrap;
-    border: 0.0625rem solid var(--table-border-color); }
-  table thead {
-    z-index: 999;
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
-    border-bottom: 0.0625rem solid var(--table-border-separator-color); }
-  table tbody {
-    border-top: 0;
-    margin-top: calc(0 - var(--universal-margin));
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  table tr {
-    display: flex;
-    padding: 0; }
-  table th, table td {
-    padding: calc(0.5 * var(--universal-padding));
-		font-size: 0.9rem; }
-  table th {
-    text-align: left;
-    background: var(--table-head-back-color);
-    color: var(--table-head-fore-color); }
-  table td {
-    background: var(--table-body-back-color);
-    color: var(--table-body-fore-color);
-    border-top: 0.0625rem solid var(--table-border-color); }
-
-table:not(.horizontal) {
-  overflow: auto;
-  max-height: 850px; }
-  table:not(.horizontal) thead, table:not(.horizontal) tbody {
-    max-width: 100%;
-    flex: 0 0 100%; }
-  table:not(.horizontal) tr {
-    flex-flow: row wrap;
-    flex: 0 0 100%; }
-  table:not(.horizontal) th, table:not(.horizontal) td {
-    flex: 1 0 0%;
-    overflow: hidden;
-    text-overflow: ellipsis; }
-  table:not(.horizontal) thead {
-    position: sticky;
-    top: 0; }
-  table:not(.horizontal) tbody tr:first-child td {
-    border-top: 0; }
-
-table.horizontal {
-  border: 0; }
-  table.horizontal thead, table.horizontal tbody {
-    border: 0;
-    flex-flow: row nowrap; }
-  table.horizontal tbody {
-    overflow: auto;
-    justify-content: space-between;
-    flex: 1 0 0;
-    margin-left: calc( 4 * var(--universal-margin));
-    padding-bottom: calc(var(--universal-padding) / 4); }
-  table.horizontal tr {
-    flex-direction: column;
-    flex: 1 0 auto; }
-  table.horizontal th, table.horizontal td {
-    width: 100%;
-    border: 0;
-    border-bottom: 0.0625rem solid var(--table-border-color); }
-    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
-      border-top: 0; }
-  table.horizontal th {
-    text-align: right;
-    border-left: 0.0625rem solid var(--table-border-color);
-    border-right: 0.0625rem solid var(--table-border-separator-color); }
-  table.horizontal thead tr:first-child {
-    padding-left: 0; }
-  table.horizontal th:first-child, table.horizontal td:first-child {
-    border-top: 0.0625rem solid var(--table-border-color); }
-  table.horizontal tbody tr:last-child td {
-    border-right: 0.0625rem solid var(--table-border-color); }
-    table.horizontal tbody tr:last-child td:first-child {
-      border-top-right-radius: 0.25rem; }
-    table.horizontal tbody tr:last-child td:last-child {
-      border-bottom-right-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:first-child {
-    border-top-left-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:last-child {
-    border-bottom-left-radius: 0.25rem; }
-
-@media screen and (max-width: 499px) {
-  table, table.horizontal {
-    border-collapse: collapse;
-    border: 0;
-    width: 100%;
-    display: table; }
-    table thead, table th, table.horizontal thead, table.horizontal th {
-      border: 0;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      padding: 0;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%); }
-    table tbody, table.horizontal tbody {
-      border: 0;
-      display: table-row-group; }
-    table tr, table.horizontal tr {
-      display: block;
-      border: 0.0625rem solid var(--table-border-color);
-      border-radius: var(--universal-border-radius);
-      background: #fafafa;
-      padding: var(--universal-padding);
-      margin: var(--universal-margin);
-      margin-bottom: calc(2 * var(--universal-margin)); }
-    table th, table td, table.horizontal th, table.horizontal td {
-      width: auto; }
-    table td, table.horizontal td {
-      display: block;
-      border: 0;
-      text-align: right; }
-    table td:before, table.horizontal td:before {
-      content: attr(data-label);
-      float: left;
-      font-weight: 600; }
-    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
-      border-top: 0; }
-    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
-      border-right: 0; } }
-:root {
-  --table-body-alt-back-color: #eee; }
-
-table tr:nth-of-type(2n) > td {
-  background: var(--table-body-alt-back-color); }
-
-@media screen and (max-width: 500px) {
-  table tr:nth-of-type(2n) {
-    background: var(--table-body-alt-back-color); } }
-:root {
-  --table-body-hover-back-color: #90caf9; }
-
-table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-  background: var(--table-body-hover-back-color); }
-
-@media screen and (max-width: 500px) {
-  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-    background: var(--table-body-hover-back-color); } }
-/*
-  Definitions for contextual background elements, toasts and tooltips.
-*/
-/* Contextual module CSS variable definitions */
-:root {
-  --mark-back-color: #0277bd;
-  --mark-fore-color: #fafafa; }
-
-mark {
-  background: var(--mark-back-color);
-  color: var(--mark-fore-color);
-  font-size: 0.95em;
-  line-height: 1em;
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-  mark.inline-block {
-    display: inline-block;
-    font-size: 1em;
-    line-height: 1.5;
-    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-:root {
-  --toast-back-color: #424242;
-  --toast-fore-color: #fafafa; }
-
-.toast {
-  position: fixed;
-  bottom: calc(var(--universal-margin) * 3);
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1111;
-  color: var(--toast-fore-color);
-  background: var(--toast-back-color);
-  border-radius: calc(var(--universal-border-radius) * 16);
-  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
-
-:root {
-  --tooltip-back-color: #212121;
-  --tooltip-fore-color: #fafafa; }
-
-.tooltip {
-  position: relative;
-  display: inline-block; }
-  .tooltip:before, .tooltip:after {
-    position: absolute;
-    opacity: 0;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%);
-    transition: all 0.3s;
-    z-index: 1010;
-    left: 50%; }
-  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
-    bottom: 75%; }
-  .tooltip.bottom:before, .tooltip.bottom:after {
-    top: 75%; }
-  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
-    opacity: 1;
-    clip: auto;
-    -webkit-clip-path: inset(0%);
-    clip-path: inset(0%); }
-  .tooltip:before {
-    content: '';
-    background: transparent;
-    border: var(--universal-margin) solid transparent;
-    left: calc(50% - var(--universal-margin)); }
-  .tooltip:not(.bottom):before {
-    border-top-color: #212121; }
-  .tooltip.bottom:before {
-    border-bottom-color: #212121; }
-  .tooltip:after {
-    content: attr(aria-label);
-    color: var(--tooltip-fore-color);
-    background: var(--tooltip-back-color);
-    border-radius: var(--universal-border-radius);
-    padding: var(--universal-padding);
-    white-space: nowrap;
-    transform: translateX(-50%); }
-  .tooltip:not(.bottom):after {
-    margin-bottom: calc(2 * var(--universal-margin)); }
-  .tooltip.bottom:after {
-    margin-top: calc(2 * var(--universal-margin)); }
-
-:root {
-  --modal-overlay-color: rgba(0, 0, 0, 0.45);
-  --modal-close-color: #444;
-  --modal-close-hover-color: #f0f0f0; }
-
-[type="checkbox"].modal {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].modal + div {
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: none;
-    width: 100vw;
-    height: 100vh;
-    background: var(--modal-overlay-color); }
-    [type="checkbox"].modal + div .card {
-      margin: 0 auto;
-      max-height: 50vh;
-      overflow: auto; }
-      [type="checkbox"].modal + div .card .modal-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 1.75rem;
-        height: 1.75rem;
-        border-radius: var(--universal-border-radius);
-        padding: var(--universal-padding);
-        margin: 0;
-        cursor: pointer;
-        transition: background 0.3s; }
-        [type="checkbox"].modal + div .card .modal-close:before {
-          display: block;
-          content: '\00D7';
-          color: var(--modal-close-color);
-          position: relative;
-          font-family: sans-serif;
-          font-size: 1.75rem;
-          line-height: 1;
-          text-align: center; }
-        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
-          background: var(--modal-close-hover-color); }
-  [type="checkbox"].modal:checked + div {
-    display: flex;
-    flex: 0 1 auto;
-    z-index: 1200; }
-    [type="checkbox"].modal:checked + div .card .modal-close {
-      z-index: 1211; }
-
-:root {
-  --collapse-label-back-color: #e8e8e8;
-  --collapse-label-fore-color: #212121;
-  --collapse-label-hover-back-color: #f0f0f0;
-  --collapse-selected-label-back-color: #ececec;
-  --collapse-border-color: #ddd;
-  --collapse-content-back-color: #fafafa;
-  --collapse-selected-label-border-color: #0277bd; }
-
-.collapse {
-  width: calc(100% - 2 * var(--universal-margin));
-  opacity: 1;
-  display: flex;
-  flex-direction: column;
-  margin: var(--universal-margin);
-  border-radius: var(--universal-border-radius); }
-  .collapse > [type="radio"], .collapse > [type="checkbox"] {
-    height: 1px;
-    width: 1px;
-    margin: -1px;
-    overflow: hidden;
-    position: absolute;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%); }
-  .collapse > label {
-    flex-grow: 1;
-    display: inline-block;
-    height: 1.5rem;
-    cursor: pointer;
-    transition: background 0.3s;
-    color: var(--collapse-label-fore-color);
-    background: var(--collapse-label-back-color);
-    border: 0.0625rem solid var(--collapse-border-color);
-    padding: calc(1.5 * var(--universal-padding)); }
-    .collapse > label:hover, .collapse > label:focus {
-      background: var(--collapse-label-hover-back-color); }
-    .collapse > label + div {
-      flex-basis: auto;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%);
-      transition: max-height 0.3s;
-      max-height: 1px; }
-  .collapse > :checked + label {
-    background: var(--collapse-selected-label-back-color);
-    border-bottom-color: var(--collapse-selected-label-border-color); }
-    .collapse > :checked + label + div {
-      box-sizing: border-box;
-      position: relative;
-      width: 100%;
-      height: auto;
-      overflow: auto;
-      margin: 0;
-      background: var(--collapse-content-back-color);
-      border: 0.0625rem solid var(--collapse-border-color);
-      border-top: 0;
-      padding: var(--universal-padding);
-      clip: auto;
-      -webkit-clip-path: inset(0%);
-      clip-path: inset(0%);
-      max-height: 850px; }
-  .collapse > label:not(:first-of-type) {
-    border-top: 0; }
-  .collapse > label:first-of-type {
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
-  .collapse > label:last-of-type:not(:first-of-type) {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  .collapse > label:last-of-type:first-of-type {
-    border-radius: var(--universal-border-radius); }
-  .collapse > :checked:last-of-type:not(:first-of-type) + label {
-    border-radius: 0; }
-  .collapse > :checked:last-of-type + label + div {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-
-/*
-  Custom elements for contextual background elements, toasts and tooltips.
-*/
-mark.secondary {
-  --mark-back-color: #d32f2f; }
-
-mark.tertiary {
-  --mark-back-color: #308732; }
-
-mark.tag {
-  padding: calc(var(--universal-padding)/2) var(--universal-padding);
-  border-radius: 1em; }
-
-/*
-  Definitions for progress elements and spinners.
-*/
-/* Progress module CSS variable definitions */
-:root {
-  --progress-back-color: #ddd;
-  --progress-fore-color: #555; }
-
-progress {
-  display: block;
-  vertical-align: baseline;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  height: 0.75rem;
-  width: calc(100% - 2 * var(--universal-margin));
-  margin: var(--universal-margin);
-  border: 0;
-  border-radius: calc(2 * var(--universal-border-radius));
-  background: var(--progress-back-color);
-  color: var(--progress-fore-color); }
-  progress::-webkit-progress-value {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress::-webkit-progress-bar {
-    background: var(--progress-back-color); }
-  progress::-moz-progress-bar {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-webkit-progress-value {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-moz-progress-bar {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress.inline {
-    display: inline-block;
-    vertical-align: middle;
-    width: 60%; }
-
-:root {
-  --spinner-back-color: #ddd;
-  --spinner-fore-color: #555; }
-
-@keyframes spinner-donut-anim {
-  0% {
-    transform: rotate(0deg); }
-  100% {
-    transform: rotate(360deg); } }
-.spinner {
-  display: inline-block;
-  margin: var(--universal-margin);
-  border: 0.25rem solid var(--spinner-back-color);
-  border-left: 0.25rem solid var(--spinner-fore-color);
-  border-radius: 50%;
-  width: 1.25rem;
-  height: 1.25rem;
-  animation: spinner-donut-anim 1.2s linear infinite; }
-
-/*
-  Custom elements for progress bars and spinners.
-*/
-progress.primary {
-  --progress-fore-color: #1976d2; }
-
-progress.secondary {
-  --progress-fore-color: #d32f2f; }
-
-progress.tertiary {
-  --progress-fore-color: #308732; }
-
-.spinner.primary {
-  --spinner-fore-color: #1976d2; }
-
-.spinner.secondary {
-  --spinner-fore-color: #d32f2f; }
-
-.spinner.tertiary {
-  --spinner-fore-color: #308732; }
-
-/*
-  Definitions for icons - powered by Feather (https://feathericons.com/).
-*/
-span[class^='icon-'] {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  vertical-align: -0.125em;
-  background-size: contain;
-  margin: 0 calc(var(--universal-margin) / 4); }
-  span[class^='icon-'].secondary {
-    -webkit-filter: invert(25%);
-    filter: invert(25%); }
-  span[class^='icon-'].inverse {
-    -webkit-filter: invert(100%);
-    filter: invert(100%); }
-
-span.icon-alert {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-bookmark {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-calendar {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-credit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-edit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
-span.icon-link {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-help {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-home {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-info {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-lock {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-mail {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-location {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-phone {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-rss {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-search {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-settings {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-share {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-cart {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-upload {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-user {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
-
-/*
-  Definitions for utilities and helper classes.
-*/
-/* Utility module CSS variable definitions */
-:root {
-  --generic-border-color: rgba(0, 0, 0, 0.3);
-  --generic-box-shadow: 0 0.25rem 0.25rem 0 rgba(0, 0, 0, 0.125), 0 0.125rem 0.125rem -0.125rem rgba(0, 0, 0, 0.25); }
-
-.hidden {
-  display: none !important; }
-
-.visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  margin: -1px !important;
-  border: 0 !important;
-  padding: 0 !important;
-  clip: rect(0 0 0 0) !important;
-  -webkit-clip-path: inset(100%) !important;
-  clip-path: inset(100%) !important;
-  overflow: hidden !important; }
-
-.bordered {
-  border: 0.0625rem solid var(--generic-border-color) !important; }
-
-.rounded {
-  border-radius: var(--universal-border-radius) !important; }
-
-.circular {
-  border-radius: 50% !important; }
-
-.shadowed {
-  box-shadow: var(--generic-box-shadow) !important; }
-
-.responsive-margin {
-  margin: calc(var(--universal-margin) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-margin {
-      margin: calc(var(--universal-margin) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-margin {
-      margin: var(--universal-margin) !important; } }
-
-.responsive-padding {
-  padding: calc(var(--universal-padding) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-padding {
-      padding: calc(var(--universal-padding) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-padding {
-      padding: var(--universal-padding) !important; } }
-
-@media screen and (max-width: 499px) {
-  .hidden-sm {
-    display: none !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .hidden-md {
-    display: none !important; } }
-@media screen and (min-width: 1280px) {
-  .hidden-lg {
-    display: none !important; } }
-@media screen and (max-width: 499px) {
-  .visually-hidden-sm {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .visually-hidden-md {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 1280px) {
-  .visually-hidden-lg {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-
-/*# sourceMappingURL=mini-default.css.map */
diff --git a/Drivers/STM32WLxx_HAL_Driver/_htmresc/st_logo.png b/Drivers/STM32WLxx_HAL_Driver/_htmresc/st_logo.png
deleted file mode 100644
index 8b80057f..00000000
Binary files a/Drivers/STM32WLxx_HAL_Driver/_htmresc/st_logo.png and /dev/null differ
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 00000000..2c0e4ad4
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,16 @@
+| Component                       | Copyright                          | License                                          |
+|:---------                       |:----------                         |:-------                                          |
+| CMSIS                           | ARM Limited                        | Apache-2.0                                       |
+| CMSIS Device                    | ARM Limited - STMicroelectronics   | Apache-2.0                                       |
+| STM32WL HAL                     | STMicroelectronics                 | BSD-3-Clause                                     |
+| BSP NUCLEO-WL55JC               | STMicroelectronics                 | BSD-3-Clause                                     |
+| FreeRTOS kernel                 | Amazon.com, Inc. or its affiliates | MIT                                              |
+| FatFS                           | ChaN - STMicroelectronics          | BSD-3-Clause                                     |
+| SubGHz_Phy                      | Semtech - STMicroelectronics       | BSD-3-Clause                                     |
+| LoRaWAN                         | Semtech - STMicroelectronics       | BSD-3-Clause                                     |
+| Sigfox                          | Sigfox - STMicroelectronics        | SLA0044 and SIGFOX Specific Terms                |
+| mbed-crypto                     | ARM Limited (or its affiliates)    | Apache-2.0                                       |
+| STM32_Key_Management_Services   | STMicroelectronics                 | SLA0044                                          |
+| STM32_Secure_Engine             | STMicroelectronics                 | SLA0044                                          |
+| STM32 Projects                  | STMicroelectronics                 | SLA0044 (BSD-3-Clause for basic Examples)        |
+| STM32 Utilities                 | STMicroelectronics                 | BSD-3-Clause                                     |
\ No newline at end of file
diff --git a/License.md b/License.md
deleted file mode 100644
index c887820d..00000000
--- a/License.md
+++ /dev/null
@@ -1,16 +0,0 @@
-| Component                       | License                                          | Copyright |
-|:---------                       |:-------                                          |:----------|
-| CMSIS                           | Apache-2.0                                       | Copyright (c) 2009-2017 ARM Limited. All rights reserved. |
-| CMSIS Device                    | Apache-2.0                                       | STMicroelectronics |
-| STM32WL HAL                     | BSD-3-Clause                                     | STMicroelectronics |
-| BSP NUCLEO-WL55JC               | BSD-3-Clause                                     | STMicroelectronics |
-| FreeRTOS kernel                 | MIT                                              | Copyright (C) 2017 Amazon.com, Inc. or its affiliates |
-| FatFS                           | BSD-3-Clause                                     | ChaN - STMicroelectronics |
-| SubGHz_Phy                      | BSD-3-Clause                                     | STMicroelectronics |
-| LoRaWAN                         | BSD-3-Clause                                     | SEMTECH S.A. - STMicroelectronics |
-| Sigfox                          | ST SLA0044 - SIGFOX Specific Terms               | SIGFOX - STMicroelectronics |
-| mbed-crypto                     | Apache-2.0                                       | Arm Limited (or its affiliates) |
-| STM32_Key_Management_Services   | ST SLA0044                                       | STMicroelectronics |
-| STM32_Secure_Engine             | ST SLA0044                                       | STMicroelectronics |
-| STM32 Projects                  | ST Proprietary (BSD-3-Clause for basic Examples) | STMicroelectronics |
-| STM32 Utilities                 | BSD-3-Clause                                     | STMicroelectronics |
\ No newline at end of file
diff --git a/Middlewares/ST/STM32_Key_Management_Services/Release_Notes.html b/Middlewares/ST/STM32_Key_Management_Services/Release_Notes.html
index 1b33c691..aece6752 100644
--- a/Middlewares/ST/STM32_Key_Management_Services/Release_Notes.html
+++ b/Middlewares/ST/STM32_Key_Management_Services/Release_Notes.html
@@ -5,32 +5,27 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Release Notes for STM32 Key Management Services</title>
-  <style>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    span.underline{text-decoration: underline;}
-    div.column{display: inline-block; vertical-align: top; width: 50%;}
-    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
-    ul.task-list{list-style: none;}
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      span.smallcaps{font-variant: small-caps;}
+      span.underline{text-decoration: underline;}
+      div.column{display: inline-block; vertical-align: top; width: 50%;}
   </style>
-  <link rel="stylesheet" href="_htmresc/mini-st.css" />
+  <link rel="stylesheet" href="_htmresc/mini-st_2020.css" />
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
+  <link rel="icon" type="image/x-icon" href="_htmresc/favicon.png" />
 </head>
 <body>
 <div class="row">
 <div class="col-sm-12 col-lg-4">
-<div class="card fluid">
-<div class="sectione dark">
 <center>
-<h1 id="release-notes-for-stm32-key-management-services"><small>Release Notes for</small> STM32 Key Management Services</h1>
+<h1 id="release-notes-for-stm32-key-management-services">Release Notes for <strong>STM32 Key Management Services</strong></h1>
 <p>Copyright © 2019 STMicroelectronics<br />
 </p>
-<a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo.png" alt="ST logo" /></a>
+<a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
-</div>
-</div>
 <h1 id="license">License</h1>
 <p>This software component is licensed by ST under Ultimate Liberty license SLA0044, the “License”;</p>
 <p>You may not use this file except in compliance with the License.</p>
@@ -40,7 +35,7 @@ <h1 id="purpose">Purpose</h1>
 <p><br />
 The figure below shows the overall KMS architecture.</p>
 <figure>
-<img src="_htmresc/KMS.png" alt="" /><figcaption>KMS overview</figcaption>
+<img src="_htmresc/KMS.png" alt="KMS overview" /><figcaption>KMS overview</figcaption>
 </figure>
 <p>KMS manages 3 types of keys:<br />
 </p>
@@ -99,20 +94,36 @@ <h1 id="purpose">Purpose</h1>
 <p><br />
 For more details, refer to <a href="https://www.st.com/st-web-ui/static/active/en/resource/technical/document/user_manual/DM00414687.pdf">UM2262</a> : Getting started with X-CUBE-SBSFU expansion package, Chapter 4.</p>
 </div>
-<section id="update-history" class="col-sm-12 col-lg-8">
-<h1>Update History</h1>
+<div class="col-sm-12 col-lg-8">
+<h1 id="update-history">Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section7" checked aria-hidden="true"> <label for="collapse-section7" aria-hidden="true"><strong>v1.1.5 / 4-September-2020</strong></label>
+<input type="checkbox" id="collapse-section7" checked aria-hidden="true"> <label for="collapse-section7" aria-hidden="true"><strong>v1.1.6 / 20-May-2021</strong></label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
 <ul>
-<li>Minor fix for build issues</li>
+<li><p>Give possibility to derivate keys in RAM instead of NVM</p></li>
+<li><p>Locked objects are no more accessible by searches</p></li>
 </ul>
 <h2 id="known-limitations">Known Limitations</h2>
 <ul>
 <li>None</li>
 </ul>
 <h2 id="backward-compatibility">Backward Compatibility</h2>
+<p>Break of compatibility with v1.1.5</p>
+</div>
+</div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section7" aria-hidden="true"> <label for="collapse-section7" aria-hidden="true"><strong>v1.1.5 / 4-September-2020</strong></label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<ul>
+<li>Minor fix for build issues</li>
+</ul>
+<h2 id="known-limitations-1">Known Limitations</h2>
+<ul>
+<li>None</li>
+</ul>
+<h2 id="backward-compatibility-1">Backward Compatibility</h2>
 <ul>
 <li>Fully compatible with previous version</li>
 </ul>
@@ -121,16 +132,16 @@ <h2 id="backward-compatibility">Backward Compatibility</h2>
 <div class="collapse">
 <input type="checkbox" id="collapse-section6" aria-hidden="true"> <label for="collapse-section6" aria-hidden="true"><strong>v1.1.4 / 24-July-2020</strong></label>
 <div>
-<h2 id="main-changes-1">Main Changes</h2>
+<h2 id="main-changes-2">Main Changes</h2>
 <ul>
 <li>CHM documentation updated<br />
 </li>
 </ul>
-<h2 id="known-limitations-1">Known Limitations</h2>
+<h2 id="known-limitations-2">Known Limitations</h2>
 <ul>
 <li>None</li>
 </ul>
-<h2 id="backward-compatibility-1">Backward Compatibility</h2>
+<h2 id="backward-compatibility-2">Backward Compatibility</h2>
 <ul>
 <li>Fully compatible with previous version</li>
 </ul>
@@ -139,16 +150,16 @@ <h2 id="backward-compatibility-1">Backward Compatibility</h2>
 <div class="collapse">
 <input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true"><strong>v1.1.3 / 2-July-2020</strong></label>
 <div>
-<h2 id="main-changes-2">Main Changes</h2>
+<h2 id="main-changes-3">Main Changes</h2>
 <ul>
 <li>Warnings issues fixes<br />
 </li>
 </ul>
-<h2 id="known-limitations-2">Known Limitations</h2>
+<h2 id="known-limitations-3">Known Limitations</h2>
 <ul>
 <li>None</li>
 </ul>
-<h2 id="backward-compatibility-2">Backward Compatibility</h2>
+<h2 id="backward-compatibility-3">Backward Compatibility</h2>
 <ul>
 <li>Fully compatible with previous version</li>
 </ul>
@@ -157,18 +168,18 @@ <h2 id="backward-compatibility-2">Backward Compatibility</h2>
 <div class="collapse">
 <input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true"><strong>v1.1.2 / 1-July-2020</strong></label>
 <div>
-<h2 id="main-changes-3">Main Changes</h2>
+<h2 id="main-changes-4">Main Changes</h2>
 <ul>
 <li><p>Configuration switch placement review<br />
 </p></li>
 <li><p>Warnings and spelling issues fixes<br />
 </p></li>
 </ul>
-<h2 id="known-limitations-3">Known Limitations</h2>
+<h2 id="known-limitations-4">Known Limitations</h2>
 <ul>
 <li>None</li>
 </ul>
-<h2 id="backward-compatibility-3">Backward Compatibility</h2>
+<h2 id="backward-compatibility-4">Backward Compatibility</h2>
 <ul>
 <li>Fully compatible with previous version</li>
 </ul>
@@ -177,18 +188,18 @@ <h2 id="backward-compatibility-3">Backward Compatibility</h2>
 <div class="collapse">
 <input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true"><strong>v1.1.1 / 12-June-2020</strong></label>
 <div>
-<h2 id="main-changes-4">Main Changes</h2>
+<h2 id="main-changes-5">Main Changes</h2>
 <ul>
 <li><p>C_STM_ImportBlob update to specify blob download area<br />
 </p></li>
 <li><p>Allow multiple C_Initialize and C_Finalize imbricated calls<br />
 </p></li>
 </ul>
-<h2 id="known-limitations-4">Known Limitations</h2>
+<h2 id="known-limitations-5">Known Limitations</h2>
 <ul>
 <li>None</li>
 </ul>
-<h2 id="backward-compatibility-4">Backward Compatibility</h2>
+<h2 id="backward-compatibility-5">Backward Compatibility</h2>
 <ul>
 <li>Break of compatibility with V1.1.0 (New parameter C_STM_ImportBlob)</li>
 </ul>
@@ -197,7 +208,7 @@ <h2 id="backward-compatibility-4">Backward Compatibility</h2>
 <div class="collapse">
 <input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true"><strong>v1.1.0 / 11-May-2020</strong></label>
 <div>
-<h2 id="main-changes-5">Main Changes</h2>
+<h2 id="main-changes-6">Main Changes</h2>
 <ul>
 <li><p>New features and improvements introduced in this release are :</p>
 <ul>
@@ -211,8 +222,8 @@ <h2 id="main-changes-5">Main Changes</h2>
 </p></li>
 <li><p>Lock keys and services vendor APIs<br />
 </p></li>
-<li><p>iKMS/niKMS folders replaces tKMS one<br />
-</p>
+<li>iKMS/niKMS folders replaces tKMS one<br />
+
 <ul>
 <li>Use iKMS when caller is isolated from KMS by a secure enclave<br />
 </li>
@@ -224,7 +235,7 @@ <h2 id="main-changes-5">Main Changes</h2>
 <li><p>kms_config.h redesign (better scalability and config build time check)<br />
 </p></li>
 </ul></li>
-<li><p>Bug fixes</p>
+<li>Bug fixes
 <ul>
 <li>AES CMAC moved to Sign/Verify services<br />
 </li>
@@ -234,11 +245,11 @@ <h2 id="main-changes-5">Main Changes</h2>
 </li>
 </ul></li>
 </ul>
-<h2 id="known-limitations-5">Known Limitations</h2>
+<h2 id="known-limitations-6">Known Limitations</h2>
 <ul>
 <li>None</li>
 </ul>
-<h2 id="backward-compatibility-5">Backward Compatibility</h2>
+<h2 id="backward-compatibility-6">Backward Compatibility</h2>
 <ul>
 <li>Break of compatibility with V1.0.0</li>
 </ul>
@@ -247,18 +258,17 @@ <h2 id="backward-compatibility-5">Backward Compatibility</h2>
 <div class="collapse">
 <input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>v1.0.0 / 13-July-2019</strong></label>
 <div>
-<h2 id="main-changes-6">Main Changes</h2>
+<h2 id="main-changes-7">Main Changes</h2>
 <h3 id="first-official-release">First official release</h3>
 <p>Official delivery of Key Management Services for STM32 series, compliant with PKCS#11 APIs from OASIS.</p>
-<h2 id="known-limitations-6">Known Limitations</h2>
+<h2 id="known-limitations-7">Known Limitations</h2>
 <p>None</p>
 </div>
 </div>
-</section>
+</div>
 </div>
 <footer class="sticky">
-<p>For complete documentation on STM32 Microcontrollers, visit: [<a href="http://www.st.com/STM32">www.st.com/stm32</a>]</p>
-<em>This release note uses up to date web standards and, for this reason, should not be opened with Internet Explorer but preferably with popular browsers such as Google Chrome, Mozilla Firefox, Opera or Microsoft Edge.</em>
+For complete documentation on <strong>Security framework for STM32 series</strong>, visit: <a href="https://www.st.com/stm32trust">STM32Trust</a>
 </footer>
 </body>
 </html>
diff --git a/Middlewares/ST/STM32_Key_Management_Services/_htmresc/favicon.png b/Middlewares/ST/STM32_Key_Management_Services/_htmresc/favicon.png
new file mode 100644
index 00000000..06713eec
Binary files /dev/null and b/Middlewares/ST/STM32_Key_Management_Services/_htmresc/favicon.png differ
diff --git a/Middlewares/ST/STM32_Key_Management_Services/_htmresc/mini-st.css b/Middlewares/ST/STM32_Key_Management_Services/_htmresc/mini-st.css
deleted file mode 100644
index eb41d56c..00000000
--- a/Middlewares/ST/STM32_Key_Management_Services/_htmresc/mini-st.css
+++ /dev/null
@@ -1,1700 +0,0 @@
-@charset "UTF-8";
-/*
-  Flavor name: Default (mini-default)
-  Author: Angelos Chalaris (chalarangelo@gmail.com)
-  Maintainers: Angelos Chalaris
-  mini.css version: v3.0.0-alpha.3
-*/
-/*
-  Browsers resets and base typography.
-*/
-/* Core module CSS variable definitions */
-:root {
-  --fore-color: #111;
-  --secondary-fore-color: #444;
-  --back-color: #f8f8f8;
-  --secondary-back-color: #f0f0f0;
-  --blockquote-color: #f57c00;
-  --pre-color: #1565c0;
-  --border-color: #aaa;
-  --secondary-border-color: #ddd;
-  --heading-ratio: 1.19;
-  --universal-margin: 0.5rem;
-  --universal-padding: 0.125rem;
-  --universal-border-radius: 0.125rem;
-  --a-link-color: #0277bd;
-  --a-visited-color: #01579b; }
-
-html {
-  font-size: 14px; }
-
-a, b, del, em, i, ins, q, span, strong, u {
-  font-size: 1em; }
-
-html, * {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Helvetica, sans-serif;
-  line-height: 1.4;
-  -webkit-text-size-adjust: 100%; }
-
-* {
-  font-size: 1rem; }
-
-body {
-  margin: 0;
-  color: var(--fore-color);
-  background: var(--back-color); }
-
-details {
-  display: block; }
-
-summary {
-  display: list-item; }
-
-abbr[title] {
-  border-bottom: none;
-  text-decoration: underline dotted; }
-
-input {
-  overflow: visible; }
-
-img {
-  max-width: 100%;
-  height: auto; }
-
-h1, h2, h3, h4, h5, h6 {
-  line-height: 1.2;
-  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  font-weight: 500; }
-  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-    color: var(--secondary-fore-color);
-    display: block;
-    margin-top: -0.25rem; }
-
-h1 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
-
-h2 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio); );
-  background: var(--mark-back-color);
-  font-weight: 600;
-  padding: 0.1em 0.5em 0.2em 0.5em;
-  color: var(--mark-fore-color); }
-
-h3 {
-  font-size: calc(1rem * var(--heading-ratio));
-  padding-left: calc(2 * var(--universal-margin)); 
-  /* background: var(--border-color); */
-    }
-
-h4 {
-  font-size: 1rem;);
-  padding-left: calc(4 * var(--universal-margin));  }
-
-h5 {
-  font-size: 1rem; }
-
-h6 {
-  font-size: calc(1rem / var(--heading-ratio)); }
-
-p {
-  margin: var(--universal-margin); }
-
-ol, ul {
-  margin: var(--universal-margin);
-  padding-left: calc(6 * var(--universal-margin)); }
-
-b, strong {
-  font-weight: 700; }
-
-hr {
-  box-sizing: content-box;
-  border: 0;
-  line-height: 1.25em;
-  margin: var(--universal-margin);
-  height: 0.0625rem;
-  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
-
-blockquote {
-  display: block;
-  position: relative;
-  font-style: italic;
-  color: var(--secondary-fore-color);
-  margin: var(--universal-margin);
-  padding: calc(3 * var(--universal-padding));
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.375rem solid var(--blockquote-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-  blockquote:before {
-    position: absolute;
-    top: calc(0rem - var(--universal-padding));
-    left: 0;
-    font-family: sans-serif;
-    font-size: 3rem;
-    font-weight: 700;
-    content: "\201c";
-    color: var(--blockquote-color); }
-  blockquote[cite]:after {
-    font-style: normal;
-    font-size: 0.75em;
-    font-weight: 700;
-    content: "\a—  " attr(cite);
-    white-space: pre; }
-
-code, kbd, pre, samp {
-  font-family: Menlo, Consolas, monospace;
-  font-size: 0.85em; }
-
-code {
-  background: var(--secondary-back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-kbd {
-  background: var(--fore-color);
-  color: var(--back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-pre {
-  overflow: auto;
-  background: var(--secondary-back-color);
-  padding: calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.25rem solid var(--pre-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-
-sup, sub, code, kbd {
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
-small, sup, sub, figcaption {
-  font-size: 0.75em; }
-
-sup {
-  top: -0.5em; }
-
-sub {
-  bottom: -0.25em; }
-
-figure {
-  margin: var(--universal-margin); }
-
-figcaption {
-  color: var(--secondary-fore-color); }
-
-a {
-  text-decoration: none; }
-  a:link {
-    color: var(--a-link-color); }
-  a:visited {
-    color: var(--a-visited-color); }
-  a:hover, a:focus {
-    text-decoration: underline; }
-
-/*
-  Definitions for the grid system, cards and containers.
-*/
-.container {
-  margin: 0 auto;
-  padding: 0 calc(1.5 * var(--universal-padding)); }
-
-.row {
-  box-sizing: border-box;
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap; }
-
-.col-sm,
-[class^='col-sm-'],
-[class^='col-sm-offset-'],
-.row[class*='cols-sm-'] > * {
-  box-sizing: border-box;
-  flex: 0 0 auto;
-  padding: 0 calc(var(--universal-padding) / 2); }
-
-.col-sm,
-.row.cols-sm > * {
-  max-width: 100%;
-  flex-grow: 1;
-  flex-basis: 0; }
-
-.col-sm-1,
-.row.cols-sm-1 > * {
-  max-width: 8.3333333333%;
-  flex-basis: 8.3333333333%; }
-
-.col-sm-offset-0 {
-  margin-left: 0; }
-
-.col-sm-2,
-.row.cols-sm-2 > * {
-  max-width: 16.6666666667%;
-  flex-basis: 16.6666666667%; }
-
-.col-sm-offset-1 {
-  margin-left: 8.3333333333%; }
-
-.col-sm-3,
-.row.cols-sm-3 > * {
-  max-width: 25%;
-  flex-basis: 25%; }
-
-.col-sm-offset-2 {
-  margin-left: 16.6666666667%; }
-
-.col-sm-4,
-.row.cols-sm-4 > * {
-  max-width: 33.3333333333%;
-  flex-basis: 33.3333333333%; }
-
-.col-sm-offset-3 {
-  margin-left: 25%; }
-
-.col-sm-5,
-.row.cols-sm-5 > * {
-  max-width: 41.6666666667%;
-  flex-basis: 41.6666666667%; }
-
-.col-sm-offset-4 {
-  margin-left: 33.3333333333%; }
-
-.col-sm-6,
-.row.cols-sm-6 > * {
-  max-width: 50%;
-  flex-basis: 50%; }
-
-.col-sm-offset-5 {
-  margin-left: 41.6666666667%; }
-
-.col-sm-7,
-.row.cols-sm-7 > * {
-  max-width: 58.3333333333%;
-  flex-basis: 58.3333333333%; }
-
-.col-sm-offset-6 {
-  margin-left: 50%; }
-
-.col-sm-8,
-.row.cols-sm-8 > * {
-  max-width: 66.6666666667%;
-  flex-basis: 66.6666666667%; }
-
-.col-sm-offset-7 {
-  margin-left: 58.3333333333%; }
-
-.col-sm-9,
-.row.cols-sm-9 > * {
-  max-width: 75%;
-  flex-basis: 75%; }
-
-.col-sm-offset-8 {
-  margin-left: 66.6666666667%; }
-
-.col-sm-10,
-.row.cols-sm-10 > * {
-  max-width: 83.3333333333%;
-  flex-basis: 83.3333333333%; }
-
-.col-sm-offset-9 {
-  margin-left: 75%; }
-
-.col-sm-11,
-.row.cols-sm-11 > * {
-  max-width: 91.6666666667%;
-  flex-basis: 91.6666666667%; }
-
-.col-sm-offset-10 {
-  margin-left: 83.3333333333%; }
-
-.col-sm-12,
-.row.cols-sm-12 > * {
-  max-width: 100%;
-  flex-basis: 100%; }
-
-.col-sm-offset-11 {
-  margin-left: 91.6666666667%; }
-
-.col-sm-normal {
-  order: initial; }
-
-.col-sm-first {
-  order: -999; }
-
-.col-sm-last {
-  order: 999; }
-
-@media screen and (min-width: 500px) {
-  .col-md,
-  [class^='col-md-'],
-  [class^='col-md-offset-'],
-  .row[class*='cols-md-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-md,
-  .row.cols-md > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-md-1,
-  .row.cols-md-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-md-offset-0 {
-    margin-left: 0; }
-
-  .col-md-2,
-  .row.cols-md-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-md-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-md-3,
-  .row.cols-md-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-md-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-md-4,
-  .row.cols-md-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-md-offset-3 {
-    margin-left: 25%; }
-
-  .col-md-5,
-  .row.cols-md-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-md-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-md-6,
-  .row.cols-md-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-md-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-md-7,
-  .row.cols-md-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-md-offset-6 {
-    margin-left: 50%; }
-
-  .col-md-8,
-  .row.cols-md-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-md-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-md-9,
-  .row.cols-md-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-md-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-md-10,
-  .row.cols-md-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-md-offset-9 {
-    margin-left: 75%; }
-
-  .col-md-11,
-  .row.cols-md-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-md-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-md-12,
-  .row.cols-md-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-md-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-md-normal {
-    order: initial; }
-
-  .col-md-first {
-    order: -999; }
-
-  .col-md-last {
-    order: 999; } }
-@media screen and (min-width: 1280px) {
-  .col-lg,
-  [class^='col-lg-'],
-  [class^='col-lg-offset-'],
-  .row[class*='cols-lg-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-lg,
-  .row.cols-lg > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-lg-1,
-  .row.cols-lg-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-lg-offset-0 {
-    margin-left: 0; }
-
-  .col-lg-2,
-  .row.cols-lg-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-lg-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-lg-3,
-  .row.cols-lg-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-lg-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-lg-4,
-  .row.cols-lg-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-lg-offset-3 {
-    margin-left: 25%; }
-
-  .col-lg-5,
-  .row.cols-lg-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-lg-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-lg-6,
-  .row.cols-lg-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-lg-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-lg-7,
-  .row.cols-lg-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-lg-offset-6 {
-    margin-left: 50%; }
-
-  .col-lg-8,
-  .row.cols-lg-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-lg-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-lg-9,
-  .row.cols-lg-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-lg-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-lg-10,
-  .row.cols-lg-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-lg-offset-9 {
-    margin-left: 75%; }
-
-  .col-lg-11,
-  .row.cols-lg-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-lg-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-lg-12,
-  .row.cols-lg-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-lg-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-lg-normal {
-    order: initial; }
-
-  .col-lg-first {
-    order: -999; }
-
-  .col-lg-last {
-    order: 999; } }
-/* Card component CSS variable definitions */
-:root {
-  --card-back-color: #f8f8f8;
-  --card-fore-color: #111;
-  --card-border-color: #ddd; }
-
-.card {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-self: center;
-  position: relative;
-  width: 100%;
-  background: var(--card-back-color);
-  color: var(--card-fore-color);
-  border: 0.0625rem solid var(--card-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  overflow: hidden; }
-  @media screen and (min-width: 320px) {
-    .card {
-      max-width: 320px; } }
-  .card > .sectione {
-    background: var(--card-back-color);
-    color: var(--card-fore-color);
-    box-sizing: border-box;
-    margin: 0;
-    border: 0;
-    border-radius: 0;
-    border-bottom: 0.0625rem solid var(--card-border-color);
-    padding: var(--universal-padding);
-    width: 100%; }
-    .card > .sectione.media {
-      height: 200px;
-      padding: 0;
-      -o-object-fit: cover;
-      object-fit: cover; }
-  .card > .sectione:last-child {
-    border-bottom: 0; }
-
-/*
-  Custom elements for card elements.
-*/
-@media screen and (min-width: 240px) {
-  .card.small {
-    max-width: 240px; } }
-@media screen and (min-width: 480px) {
-  .card.large {
-    max-width: 480px; } }
-.card.fluid {
-  max-width: 100%;
-  width: auto; }
-
-.card.warning {
-/*  --card-back-color: #ffca28; */
-  --card-back-color: #e5b8b7;
-  --card-border-color: #e8b825; }
-
-.card.error {
-  --card-back-color: #b71c1c;
-  --card-fore-color: #f8f8f8;
-  --card-border-color: #a71a1a; }
-
-.card > .sectione.dark {
-  --card-back-color: #e0e0e0; }
-
-.card > .sectione.double-padded {
-  padding: calc(1.5 * var(--universal-padding)); }
-
-/*
-  Definitions for forms and input elements.
-*/
-/* Input_control module CSS variable definitions */
-:root {
-  --form-back-color: #f0f0f0;
-  --form-fore-color: #111;
-  --form-border-color: #ddd;
-  --input-back-color: #f8f8f8;
-  --input-fore-color: #111;
-  --input-border-color: #ddd;
-  --input-focus-color: #0288d1;
-  --input-invalid-color: #d32f2f;
-  --button-back-color: #e2e2e2;
-  --button-hover-back-color: #dcdcdc;
-  --button-fore-color: #212121;
-  --button-border-color: transparent;
-  --button-hover-border-color: transparent;
-  --button-group-border-color: rgba(124, 124, 124, 0.54); }
-
-form {
-  background: var(--form-back-color);
-  color: var(--form-fore-color);
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
-
-fieldset {
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 4);
-  padding: var(--universal-padding); }
-
-legend {
-  box-sizing: border-box;
-  display: table;
-  max-width: 100%;
-  white-space: normal;
-  font-weight: 700;
-  padding: calc(var(--universal-padding) / 2); }
-
-label {
-  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-.input-group {
-  display: inline-block; }
-  .input-group.fluid {
-    display: flex;
-    align-items: center;
-    justify-content: center; }
-    .input-group.fluid > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-    @media screen and (max-width: 499px) {
-      .input-group.fluid {
-        align-items: stretch;
-        flex-direction: column; } }
-  .input-group.vertical {
-    display: flex;
-    align-items: stretch;
-    flex-direction: column; }
-    .input-group.vertical > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-
-[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
-  height: auto; }
-
-[type="search"] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px; }
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
-
-input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
-[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
-  box-sizing: border-box;
-  background: var(--input-back-color);
-  color: var(--input-fore-color);
-  border: 0.0625rem solid var(--input-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 2);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
-  border-color: var(--input-focus-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
-  border-color: var(--input-invalid-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
-  background: var(--secondary-back-color); }
-
-select {
-  max-width: 100%; }
-
-option {
-  overflow: hidden;
-  text-overflow: ellipsis; }
-
-[type="checkbox"], [type="radio"] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  position: relative;
-  height: calc(1rem + var(--universal-padding) / 2);
-  width: calc(1rem + var(--universal-padding) / 2);
-  vertical-align: text-bottom;
-  padding: 0;
-  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
-  flex-grow: 0 !important; }
-  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
-    position: absolute; }
-
-[type="checkbox"]:checked:before {
-  content: '\2713';
-  font-family: sans-serif;
-  font-size: calc(1rem + var(--universal-padding) / 2);
-  top: calc(0rem - var(--universal-padding));
-  left: calc(var(--universal-padding) / 4); }
-
-[type="radio"] {
-  border-radius: 100%; }
-  [type="radio"]:checked:before {
-    border-radius: 100%;
-    content: '';
-    top: calc(0.0625rem + var(--universal-padding) / 2);
-    left: calc(0.0625rem + var(--universal-padding) / 2);
-    background: var(--input-fore-color);
-    width: 0.5rem;
-    height: 0.5rem; }
-
-:placeholder-shown {
-  color: var(--input-fore-color); }
-
-::-ms-placeholder {
-  color: var(--input-fore-color);
-  opacity: 0.54; }
-
-button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-button, html [type="button"], [type="reset"], [type="submit"] {
-  -webkit-appearance: button; }
-
-button {
-  overflow: visible;
-  text-transform: none; }
-
-button, [type="button"], [type="submit"], [type="reset"],
-a.button, label.button, .button,
-a[role="button"], label[role="button"], [role="button"] {
-  display: inline-block;
-  background: var(--button-back-color);
-  color: var(--button-fore-color);
-  border: 0.0625rem solid var(--button-border-color);
-  border-radius: var(--universal-border-radius);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  text-decoration: none;
-  cursor: pointer;
-  transition: background 0.3s; }
-  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
-  a.button:hover,
-  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
-  a[role="button"]:hover,
-  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
-    background: var(--button-hover-back-color);
-    border-color: var(--button-hover-border-color); }
-
-input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
-  cursor: not-allowed;
-  opacity: 0.75; }
-
-.button-group {
-  display: flex;
-  border: 0.0625rem solid var(--button-group-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
-    margin: 0;
-    max-width: 100%;
-    flex: 1 1 auto;
-    text-align: center;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none; }
-  .button-group > :not(:first-child) {
-    border-left: 0.0625rem solid var(--button-group-border-color); }
-  @media screen and (max-width: 499px) {
-    .button-group {
-      flex-direction: column; }
-      .button-group > :not(:first-child) {
-        border: 0;
-        border-top: 0.0625rem solid var(--button-group-border-color); } }
-
-/*
-  Custom elements for forms and input elements.
-*/
-button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
-  --button-back-color: #1976d2;
-  --button-fore-color: #f8f8f8; }
-  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
-    --button-hover-back-color: #1565c0; }
-
-button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
-  --button-back-color: #d32f2f;
-  --button-fore-color: #f8f8f8; }
-  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
-    --button-hover-back-color: #c62828; }
-
-button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
-  --button-back-color: #308732;
-  --button-fore-color: #f8f8f8; }
-  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
-    --button-hover-back-color: #277529; }
-
-button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
-  --button-back-color: #212121;
-  --button-fore-color: #f8f8f8; }
-  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
-    --button-hover-back-color: #111; }
-
-button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
-  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
-  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-/*
-  Definitions for navigation elements.
-*/
-/* Navigation module CSS variable definitions */
-:root {
-  --header-back-color: #f8f8f8;
-  --header-hover-back-color: #f0f0f0;
-  --header-fore-color: #444;
-  --header-border-color: #ddd;
-  --nav-back-color: #f8f8f8;
-  --nav-hover-back-color: #f0f0f0;
-  --nav-fore-color: #444;
-  --nav-border-color: #ddd;
-  --nav-link-color: #0277bd;
-  --footer-fore-color: #444;
-  --footer-back-color: #f8f8f8;
-  --footer-border-color: #ddd;
-  --footer-link-color: #0277bd;
-  --drawer-back-color: #f8f8f8;
-  --drawer-hover-back-color: #f0f0f0;
-  --drawer-border-color: #ddd;
-  --drawer-close-color: #444; }
-
-header {
-  height: 3.1875rem;
-  background: var(--header-back-color);
-  color: var(--header-fore-color);
-  border-bottom: 0.0625rem solid var(--header-border-color);
-  padding: calc(var(--universal-padding) / 4) 0;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden; }
-  header.row {
-    box-sizing: content-box; }
-  header .logo {
-    color: var(--header-fore-color);
-    font-size: 1.75rem;
-    padding: var(--universal-padding) calc(2 * var(--universal-padding));
-    text-decoration: none; }
-  header button, header [type="button"], header .button, header [role="button"] {
-    box-sizing: border-box;
-    position: relative;
-    top: calc(0rem - var(--universal-padding) / 4);
-    height: calc(3.1875rem + var(--universal-padding) / 2);
-    background: var(--header-back-color);
-    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
-    text-align: center;
-    color: var(--header-fore-color);
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-    text-transform: uppercase; }
-    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
-      background: var(--header-hover-back-color); }
-
-nav {
-  background: var(--nav-back-color);
-  color: var(--nav-fore-color);
-  border: 0.0625rem solid var(--nav-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  nav * {
-    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-  nav a, nav a:visited {
-    display: block;
-    color: var(--nav-link-color);
-    border-radius: var(--universal-border-radius);
-    transition: background 0.3s; }
-    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
-      text-decoration: none;
-      background: var(--nav-hover-back-color); }
-  nav .sublink-1 {
-    position: relative;
-    margin-left: calc(2 * var(--universal-padding)); }
-    nav .sublink-1:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-  nav .sublink-2 {
-    position: relative;
-    margin-left: calc(4 * var(--universal-padding)); }
-    nav .sublink-2:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-
-footer {
-  background: var(--footer-back-color);
-  color: var(--footer-fore-color);
-  border-top: 0.0625rem solid var(--footer-border-color);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
-  font-size: 0.875rem; }
-  footer a, footer a:visited {
-    color: var(--footer-link-color); }
-
-header.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  top: 0; }
-
-footer.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  bottom: 0; }
-
-.drawer-toggle:before {
-  display: inline-block;
-  position: relative;
-  vertical-align: bottom;
-  content: '\00a0\2261\00a0';
-  font-family: sans-serif;
-  font-size: 1.5em; }
-@media screen and (min-width: 500px) {
-  .drawer-toggle:not(.persistent) {
-    display: none; } }
-
-[type="checkbox"].drawer {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].drawer + * {
-    display: block;
-    box-sizing: border-box;
-    position: fixed;
-    top: 0;
-    width: 320px;
-    height: 100vh;
-    overflow-y: auto;
-    background: var(--drawer-back-color);
-    border: 0.0625rem solid var(--drawer-border-color);
-    border-radius: 0;
-    margin: 0;
-    z-index: 1110;
-    right: -320px;
-    transition: right 0.3s; }
-    [type="checkbox"].drawer + * .drawer-close {
-      position: absolute;
-      top: var(--universal-margin);
-      right: var(--universal-margin);
-      z-index: 1111;
-      width: 2rem;
-      height: 2rem;
-      border-radius: var(--universal-border-radius);
-      padding: var(--universal-padding);
-      margin: 0;
-      cursor: pointer;
-      transition: background 0.3s; }
-      [type="checkbox"].drawer + * .drawer-close:before {
-        display: block;
-        content: '\00D7';
-        color: var(--drawer-close-color);
-        position: relative;
-        font-family: sans-serif;
-        font-size: 2rem;
-        line-height: 1;
-        text-align: center; }
-      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
-        background: var(--drawer-hover-back-color); }
-    @media screen and (max-width: 320px) {
-      [type="checkbox"].drawer + * {
-        width: 100%; } }
-  [type="checkbox"].drawer:checked + * {
-    right: 0; }
-  @media screen and (min-width: 500px) {
-    [type="checkbox"].drawer:not(.persistent) + * {
-      position: static;
-      height: 100%;
-      z-index: 1100; }
-      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
-        display: none; } }
-
-/*
-  Definitions for the responsive table component.
-*/
-/* Table module CSS variable definitions. */
-:root {
-  --table-border-color: #aaa;
-  --table-border-separator-color: #666;
-  --table-head-back-color: #e6e6e6;
-  --table-head-fore-color: #111;
-  --table-body-back-color: #f8f8f8;
-  --table-body-fore-color: #111;
-  --table-body-alt-back-color: #eee; }
-
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  : margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap;
-  padding: var(--universal-padding);
-  padding-top: 0;
-	margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);	}
-  table caption {
-    font-size: 1.25 * rem;
-    margin: calc(2 * var(--universal-margin)) 0;
-    max-width: 100%;
-    flex: 0 0 100%;
-		text-align: left;}
-  table thead, table tbody {
-    display: flex;
-    flex-flow: row wrap;
-    border: 0.0625rem solid var(--table-border-color); }
-  table thead {
-    z-index: 999;
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
-    border-bottom: 0.0625rem solid var(--table-border-separator-color); }
-  table tbody {
-    border-top: 0;
-    margin-top: calc(0 - var(--universal-margin));
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  table tr {
-    display: flex;
-    padding: 0; }
-  table th, table td {
-    padding: calc(0.5 * var(--universal-padding));
-		font-size: 0.9rem; }
-  table th {
-    text-align: left;
-    background: var(--table-head-back-color);
-    color: var(--table-head-fore-color); }
-  table td {
-    background: var(--table-body-back-color);
-    color: var(--table-body-fore-color);
-    border-top: 0.0625rem solid var(--table-border-color); }
-
-table:not(.horizontal) {
-  overflow: auto;
-  max-height: 850px; }
-  table:not(.horizontal) thead, table:not(.horizontal) tbody {
-    max-width: 100%;
-    flex: 0 0 100%; }
-  table:not(.horizontal) tr {
-    flex-flow: row wrap;
-    flex: 0 0 100%; }
-  table:not(.horizontal) th, table:not(.horizontal) td {
-    flex: 1 0 0%;
-    overflow: hidden;
-    text-overflow: ellipsis; }
-  table:not(.horizontal) thead {
-    position: sticky;
-    top: 0; }
-  table:not(.horizontal) tbody tr:first-child td {
-    border-top: 0; }
-
-table.horizontal {
-  border: 0; }
-  table.horizontal thead, table.horizontal tbody {
-    border: 0;
-    flex-flow: row nowrap; }
-  table.horizontal tbody {
-    overflow: auto;
-    justify-content: space-between;
-    flex: 1 0 0;
-    margin-left: calc( 4 * var(--universal-margin));
-    padding-bottom: calc(var(--universal-padding) / 4); }
-  table.horizontal tr {
-    flex-direction: column;
-    flex: 1 0 auto; }
-  table.horizontal th, table.horizontal td {
-    width: 100%;
-    border: 0;
-    border-bottom: 0.0625rem solid var(--table-border-color); }
-    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
-      border-top: 0; }
-  table.horizontal th {
-    text-align: right;
-    border-left: 0.0625rem solid var(--table-border-color);
-    border-right: 0.0625rem solid var(--table-border-separator-color); }
-  table.horizontal thead tr:first-child {
-    padding-left: 0; }
-  table.horizontal th:first-child, table.horizontal td:first-child {
-    border-top: 0.0625rem solid var(--table-border-color); }
-  table.horizontal tbody tr:last-child td {
-    border-right: 0.0625rem solid var(--table-border-color); }
-    table.horizontal tbody tr:last-child td:first-child {
-      border-top-right-radius: 0.25rem; }
-    table.horizontal tbody tr:last-child td:last-child {
-      border-bottom-right-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:first-child {
-    border-top-left-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:last-child {
-    border-bottom-left-radius: 0.25rem; }
-
-@media screen and (max-width: 499px) {
-  table, table.horizontal {
-    border-collapse: collapse;
-    border: 0;
-    width: 100%;
-    display: table; }
-    table thead, table th, table.horizontal thead, table.horizontal th {
-      border: 0;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      padding: 0;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%); }
-    table tbody, table.horizontal tbody {
-      border: 0;
-      display: table-row-group; }
-    table tr, table.horizontal tr {
-      display: block;
-      border: 0.0625rem solid var(--table-border-color);
-      border-radius: var(--universal-border-radius);
-      background: #fafafa;
-      padding: var(--universal-padding);
-      margin: var(--universal-margin);
-      margin-bottom: calc(2 * var(--universal-margin)); }
-    table th, table td, table.horizontal th, table.horizontal td {
-      width: auto; }
-    table td, table.horizontal td {
-      display: block;
-      border: 0;
-      text-align: right; }
-    table td:before, table.horizontal td:before {
-      content: attr(data-label);
-      float: left;
-      font-weight: 600; }
-    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
-      border-top: 0; }
-    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
-      border-right: 0; } }
-:root {
-  --table-body-alt-back-color: #eee; }
-
-table tr:nth-of-type(2n) > td {
-  background: var(--table-body-alt-back-color); }
-
-@media screen and (max-width: 500px) {
-  table tr:nth-of-type(2n) {
-    background: var(--table-body-alt-back-color); } }
-:root {
-  --table-body-hover-back-color: #90caf9; }
-
-table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-  background: var(--table-body-hover-back-color); }
-
-@media screen and (max-width: 500px) {
-  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-    background: var(--table-body-hover-back-color); } }
-/*
-  Definitions for contextual background elements, toasts and tooltips.
-*/
-/* Contextual module CSS variable definitions */
-:root {
-  --mark-back-color: #0277bd;
-  --mark-fore-color: #fafafa; }
-
-mark {
-  background: var(--mark-back-color);
-  color: var(--mark-fore-color);
-  font-size: 0.95em;
-  line-height: 1em;
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-  mark.inline-block {
-    display: inline-block;
-    font-size: 1em;
-    line-height: 1.5;
-    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-:root {
-  --toast-back-color: #424242;
-  --toast-fore-color: #fafafa; }
-
-.toast {
-  position: fixed;
-  bottom: calc(var(--universal-margin) * 3);
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1111;
-  color: var(--toast-fore-color);
-  background: var(--toast-back-color);
-  border-radius: calc(var(--universal-border-radius) * 16);
-  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
-
-:root {
-  --tooltip-back-color: #212121;
-  --tooltip-fore-color: #fafafa; }
-
-.tooltip {
-  position: relative;
-  display: inline-block; }
-  .tooltip:before, .tooltip:after {
-    position: absolute;
-    opacity: 0;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%);
-    transition: all 0.3s;
-    z-index: 1010;
-    left: 50%; }
-  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
-    bottom: 75%; }
-  .tooltip.bottom:before, .tooltip.bottom:after {
-    top: 75%; }
-  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
-    opacity: 1;
-    clip: auto;
-    -webkit-clip-path: inset(0%);
-    clip-path: inset(0%); }
-  .tooltip:before {
-    content: '';
-    background: transparent;
-    border: var(--universal-margin) solid transparent;
-    left: calc(50% - var(--universal-margin)); }
-  .tooltip:not(.bottom):before {
-    border-top-color: #212121; }
-  .tooltip.bottom:before {
-    border-bottom-color: #212121; }
-  .tooltip:after {
-    content: attr(aria-label);
-    color: var(--tooltip-fore-color);
-    background: var(--tooltip-back-color);
-    border-radius: var(--universal-border-radius);
-    padding: var(--universal-padding);
-    white-space: nowrap;
-    transform: translateX(-50%); }
-  .tooltip:not(.bottom):after {
-    margin-bottom: calc(2 * var(--universal-margin)); }
-  .tooltip.bottom:after {
-    margin-top: calc(2 * var(--universal-margin)); }
-
-:root {
-  --modal-overlay-color: rgba(0, 0, 0, 0.45);
-  --modal-close-color: #444;
-  --modal-close-hover-color: #f0f0f0; }
-
-[type="checkbox"].modal {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].modal + div {
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: none;
-    width: 100vw;
-    height: 100vh;
-    background: var(--modal-overlay-color); }
-    [type="checkbox"].modal + div .card {
-      margin: 0 auto;
-      max-height: 50vh;
-      overflow: auto; }
-      [type="checkbox"].modal + div .card .modal-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 1.75rem;
-        height: 1.75rem;
-        border-radius: var(--universal-border-radius);
-        padding: var(--universal-padding);
-        margin: 0;
-        cursor: pointer;
-        transition: background 0.3s; }
-        [type="checkbox"].modal + div .card .modal-close:before {
-          display: block;
-          content: '\00D7';
-          color: var(--modal-close-color);
-          position: relative;
-          font-family: sans-serif;
-          font-size: 1.75rem;
-          line-height: 1;
-          text-align: center; }
-        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
-          background: var(--modal-close-hover-color); }
-  [type="checkbox"].modal:checked + div {
-    display: flex;
-    flex: 0 1 auto;
-    z-index: 1200; }
-    [type="checkbox"].modal:checked + div .card .modal-close {
-      z-index: 1211; }
-
-:root {
-  --collapse-label-back-color: #e8e8e8;
-  --collapse-label-fore-color: #212121;
-  --collapse-label-hover-back-color: #f0f0f0;
-  --collapse-selected-label-back-color: #ececec;
-  --collapse-border-color: #ddd;
-  --collapse-content-back-color: #fafafa;
-  --collapse-selected-label-border-color: #0277bd; }
-
-.collapse {
-  width: calc(100% - 2 * var(--universal-margin));
-  opacity: 1;
-  display: flex;
-  flex-direction: column;
-  margin: var(--universal-margin);
-  border-radius: var(--universal-border-radius); }
-  .collapse > [type="radio"], .collapse > [type="checkbox"] {
-    height: 1px;
-    width: 1px;
-    margin: -1px;
-    overflow: hidden;
-    position: absolute;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%); }
-  .collapse > label {
-    flex-grow: 1;
-    display: inline-block;
-    height: 1.5rem;
-    cursor: pointer;
-    transition: background 0.3s;
-    color: var(--collapse-label-fore-color);
-    background: var(--collapse-label-back-color);
-    border: 0.0625rem solid var(--collapse-border-color);
-    padding: calc(1.5 * var(--universal-padding)); }
-    .collapse > label:hover, .collapse > label:focus {
-      background: var(--collapse-label-hover-back-color); }
-    .collapse > label + div {
-      flex-basis: auto;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%);
-      transition: max-height 0.3s;
-      max-height: 1px; }
-  .collapse > :checked + label {
-    background: var(--collapse-selected-label-back-color);
-    border-bottom-color: var(--collapse-selected-label-border-color); }
-    .collapse > :checked + label + div {
-      box-sizing: border-box;
-      position: relative;
-      width: 100%;
-      height: auto;
-      overflow: auto;
-      margin: 0;
-      background: var(--collapse-content-back-color);
-      border: 0.0625rem solid var(--collapse-border-color);
-      border-top: 0;
-      padding: var(--universal-padding);
-      clip: auto;
-      -webkit-clip-path: inset(0%);
-      clip-path: inset(0%);
-      max-height: 850px; }
-  .collapse > label:not(:first-of-type) {
-    border-top: 0; }
-  .collapse > label:first-of-type {
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
-  .collapse > label:last-of-type:not(:first-of-type) {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  .collapse > label:last-of-type:first-of-type {
-    border-radius: var(--universal-border-radius); }
-  .collapse > :checked:last-of-type:not(:first-of-type) + label {
-    border-radius: 0; }
-  .collapse > :checked:last-of-type + label + div {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-
-/*
-  Custom elements for contextual background elements, toasts and tooltips.
-*/
-mark.secondary {
-  --mark-back-color: #d32f2f; }
-
-mark.tertiary {
-  --mark-back-color: #308732; }
-
-mark.tag {
-  padding: calc(var(--universal-padding)/2) var(--universal-padding);
-  border-radius: 1em; }
-
-/*
-  Definitions for progress elements and spinners.
-*/
-/* Progress module CSS variable definitions */
-:root {
-  --progress-back-color: #ddd;
-  --progress-fore-color: #555; }
-
-progress {
-  display: block;
-  vertical-align: baseline;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  height: 0.75rem;
-  width: calc(100% - 2 * var(--universal-margin));
-  margin: var(--universal-margin);
-  border: 0;
-  border-radius: calc(2 * var(--universal-border-radius));
-  background: var(--progress-back-color);
-  color: var(--progress-fore-color); }
-  progress::-webkit-progress-value {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress::-webkit-progress-bar {
-    background: var(--progress-back-color); }
-  progress::-moz-progress-bar {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-webkit-progress-value {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-moz-progress-bar {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress.inline {
-    display: inline-block;
-    vertical-align: middle;
-    width: 60%; }
-
-:root {
-  --spinner-back-color: #ddd;
-  --spinner-fore-color: #555; }
-
-@keyframes spinner-donut-anim {
-  0% {
-    transform: rotate(0deg); }
-  100% {
-    transform: rotate(360deg); } }
-.spinner {
-  display: inline-block;
-  margin: var(--universal-margin);
-  border: 0.25rem solid var(--spinner-back-color);
-  border-left: 0.25rem solid var(--spinner-fore-color);
-  border-radius: 50%;
-  width: 1.25rem;
-  height: 1.25rem;
-  animation: spinner-donut-anim 1.2s linear infinite; }
-
-/*
-  Custom elements for progress bars and spinners.
-*/
-progress.primary {
-  --progress-fore-color: #1976d2; }
-
-progress.secondary {
-  --progress-fore-color: #d32f2f; }
-
-progress.tertiary {
-  --progress-fore-color: #308732; }
-
-.spinner.primary {
-  --spinner-fore-color: #1976d2; }
-
-.spinner.secondary {
-  --spinner-fore-color: #d32f2f; }
-
-.spinner.tertiary {
-  --spinner-fore-color: #308732; }
-
-/*
-  Definitions for icons - powered by Feather (https://feathericons.com/).
-*/
-span[class^='icon-'] {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  vertical-align: -0.125em;
-  background-size: contain;
-  margin: 0 calc(var(--universal-margin) / 4); }
-  span[class^='icon-'].secondary {
-    -webkit-filter: invert(25%);
-    filter: invert(25%); }
-  span[class^='icon-'].inverse {
-    -webkit-filter: invert(100%);
-    filter: invert(100%); }
-
-span.icon-alert {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-bookmark {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-calendar {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-credit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-edit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
-span.icon-link {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-help {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-home {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-info {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-lock {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-mail {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-location {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-phone {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-rss {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-search {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-settings {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-share {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-cart {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-upload {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-user {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
-
-/*
-  Definitions for utilities and helper classes.
-*/
-/* Utility module CSS variable definitions */
-:root {
-  --generic-border-color: rgba(0, 0, 0, 0.3);
-  --generic-box-shadow: 0 0.25rem 0.25rem 0 rgba(0, 0, 0, 0.125), 0 0.125rem 0.125rem -0.125rem rgba(0, 0, 0, 0.25); }
-
-.hidden {
-  display: none !important; }
-
-.visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  margin: -1px !important;
-  border: 0 !important;
-  padding: 0 !important;
-  clip: rect(0 0 0 0) !important;
-  -webkit-clip-path: inset(100%) !important;
-  clip-path: inset(100%) !important;
-  overflow: hidden !important; }
-
-.bordered {
-  border: 0.0625rem solid var(--generic-border-color) !important; }
-
-.rounded {
-  border-radius: var(--universal-border-radius) !important; }
-
-.circular {
-  border-radius: 50% !important; }
-
-.shadowed {
-  box-shadow: var(--generic-box-shadow) !important; }
-
-.responsive-margin {
-  margin: calc(var(--universal-margin) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-margin {
-      margin: calc(var(--universal-margin) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-margin {
-      margin: var(--universal-margin) !important; } }
-
-.responsive-padding {
-  padding: calc(var(--universal-padding) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-padding {
-      padding: calc(var(--universal-padding) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-padding {
-      padding: var(--universal-padding) !important; } }
-
-@media screen and (max-width: 499px) {
-  .hidden-sm {
-    display: none !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .hidden-md {
-    display: none !important; } }
-@media screen and (min-width: 1280px) {
-  .hidden-lg {
-    display: none !important; } }
-@media screen and (max-width: 499px) {
-  .visually-hidden-sm {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .visually-hidden-md {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 1280px) {
-  .visually-hidden-lg {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-
-/*# sourceMappingURL=mini-default.css.map */
diff --git a/Middlewares/ST/STM32_Key_Management_Services/_htmresc/mini-st_2020.css b/Middlewares/ST/STM32_Key_Management_Services/_htmresc/mini-st_2020.css
new file mode 100644
index 00000000..986f4d42
--- /dev/null
+++ b/Middlewares/ST/STM32_Key_Management_Services/_htmresc/mini-st_2020.css
@@ -0,0 +1,1711 @@
+@charset "UTF-8";
+/*
+  Flavor name: Custom (mini-custom)
+  Generated online - https://minicss.org/flavors
+  mini.css version: v3.0.1
+*/
+/*
+  Browsers resets and base typography.
+*/
+/* Core module CSS variable definitions */
+:root {
+  --fore-color: #03234b;
+  --secondary-fore-color: #03234b;
+  --back-color: #ffffff;
+  --secondary-back-color: #ffffff;
+  --blockquote-color: #e6007e;
+  --pre-color: #e6007e;
+  --border-color: #3cb4e6;
+  --secondary-border-color: #3cb4e6;
+  --heading-ratio: 1.2;
+  --universal-margin: 0.5rem;
+  --universal-padding: 0.25rem;
+  --universal-border-radius: 0.075rem;
+  --background-margin: 1.5%;
+  --a-link-color: #3cb4e6;
+  --a-visited-color: #8c0078; }
+
+html {
+  font-size: 13.5px; }
+
+a, b, del, em, i, ins, q, span, strong, u {
+  font-size: 1em; }
+
+html, * {
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica, arial, sans-serif;
+  line-height: 1.25;
+  -webkit-text-size-adjust: 100%; }
+
+* {
+  font-size: 1rem; }
+
+body {
+  margin: 0;
+  color: var(--fore-color);
+  @background: var(--back-color);
+  background: var(--back-color) linear-gradient(#ffd200, #ffd200) repeat-y left top;
+  background-size: var(--background-margin);
+  }
+
+details {
+  display: block; }
+
+summary {
+  display: list-item; }
+
+abbr[title] {
+  border-bottom: none;
+  text-decoration: underline dotted; }
+
+input {
+  overflow: visible; }
+
+img {
+  max-width: 100%;
+  height: auto; }
+
+h1, h2, h3, h4, h5, h6 {
+  line-height: 1.25;
+  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
+  font-weight: 400; }
+  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
+    color: var(--secondary-fore-color);
+    display: block;
+    margin-top: -0.25rem; }
+
+h1 {
+  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
+
+h2 {
+  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) );
+  border-style: none none solid none ; 
+  border-width: thin;
+  border-color: var(--border-color); }
+h3 {
+  font-size: calc(1rem * var(--heading-ratio) ); }
+
+h4 {
+  font-size: calc(1rem * var(--heading-ratio)); }
+
+h5 {
+  font-size: 1rem; }
+
+h6 {
+  font-size: calc(1rem / var(--heading-ratio)); }
+
+p {
+  margin: var(--universal-margin); }
+
+ol, ul {
+  margin: var(--universal-margin);
+  padding-left: calc(3 * var(--universal-margin)); }
+
+b, strong {
+  font-weight: 700; }
+
+hr {
+  box-sizing: content-box;
+  border: 0;
+  line-height: 1.25em;
+  margin: var(--universal-margin);
+  height: 0.0714285714rem;
+  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
+
+blockquote {
+  display: block;
+  position: relative;
+  font-style: italic;
+  color: var(--secondary-fore-color);
+  margin: var(--universal-margin);
+  padding: calc(3 * var(--universal-padding));
+  border: 0.0714285714rem solid var(--secondary-border-color);
+  border-left: 0.3rem solid var(--blockquote-color);
+  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
+  blockquote:before {
+    position: absolute;
+    top: calc(0rem - var(--universal-padding));
+    left: 0;
+    font-family: sans-serif;
+    font-size: 2rem;
+    font-weight: 800;
+    content: "\201c";
+    color: var(--blockquote-color); }
+  blockquote[cite]:after {
+    font-style: normal;
+    font-size: 0.75em;
+    font-weight: 700;
+    content: "\a—  " attr(cite);
+    white-space: pre; }
+
+code, kbd, pre, samp {
+  font-family: Menlo, Consolas, monospace;
+  font-size: 0.85em; }
+
+code {
+  background: var(--secondary-back-color);
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
+
+kbd {
+  background: var(--fore-color);
+  color: var(--back-color);
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
+
+pre {
+  overflow: auto;
+  background: var(--secondary-back-color);
+  padding: calc(1.5 * var(--universal-padding));
+  margin: var(--universal-margin);
+  border: 0.0714285714rem solid var(--secondary-border-color);
+  border-left: 0.2857142857rem solid var(--pre-color);
+  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
+
+sup, sub, code, kbd {
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline; }
+
+small, sup, sub, figcaption {
+  font-size: 0.75em; }
+
+sup {
+  top: -0.5em; }
+
+sub {
+  bottom: -0.25em; }
+
+figure {
+  margin: var(--universal-margin); }
+
+figcaption {
+  color: var(--secondary-fore-color); }
+
+a {
+  text-decoration: none; }
+  a:link {
+    color: var(--a-link-color); }
+  a:visited {
+    color: var(--a-visited-color); }
+  a:hover, a:focus {
+    text-decoration: underline; }
+
+/*
+  Definitions for the grid system, cards and containers.
+*/
+.container {
+  margin: 0 auto;
+  padding: 0 calc(1.5 * var(--universal-padding)); }
+
+.row {
+  box-sizing: border-box;
+  display: flex;
+  flex: 0 1 auto;
+  flex-flow: row wrap;
+  margin: 0 0 0 var(--background-margin); }
+
+.col-sm,
+[class^='col-sm-'],
+[class^='col-sm-offset-'],
+.row[class*='cols-sm-'] > * {
+  box-sizing: border-box;
+  flex: 0 0 auto;
+  padding: 0 calc(var(--universal-padding) / 2); }
+
+.col-sm,
+.row.cols-sm > * {
+  max-width: 100%;
+  flex-grow: 1;
+  flex-basis: 0; }
+
+.col-sm-1,
+.row.cols-sm-1 > * {
+  max-width: 8.3333333333%;
+  flex-basis: 8.3333333333%; }
+
+.col-sm-offset-0 {
+  margin-left: 0; }
+
+.col-sm-2,
+.row.cols-sm-2 > * {
+  max-width: 16.6666666667%;
+  flex-basis: 16.6666666667%; }
+
+.col-sm-offset-1 {
+  margin-left: 8.3333333333%; }
+
+.col-sm-3,
+.row.cols-sm-3 > * {
+  max-width: 25%;
+  flex-basis: 25%; }
+
+.col-sm-offset-2 {
+  margin-left: 16.6666666667%; }
+
+.col-sm-4,
+.row.cols-sm-4 > * {
+  max-width: 33.3333333333%;
+  flex-basis: 33.3333333333%; }
+
+.col-sm-offset-3 {
+  margin-left: 25%; }
+
+.col-sm-5,
+.row.cols-sm-5 > * {
+  max-width: 41.6666666667%;
+  flex-basis: 41.6666666667%; }
+
+.col-sm-offset-4 {
+  margin-left: 33.3333333333%; }
+
+.col-sm-6,
+.row.cols-sm-6 > * {
+  max-width: 50%;
+  flex-basis: 50%; }
+
+.col-sm-offset-5 {
+  margin-left: 41.6666666667%; }
+
+.col-sm-7,
+.row.cols-sm-7 > * {
+  max-width: 58.3333333333%;
+  flex-basis: 58.3333333333%; }
+
+.col-sm-offset-6 {
+  margin-left: 50%; }
+
+.col-sm-8,
+.row.cols-sm-8 > * {
+  max-width: 66.6666666667%;
+  flex-basis: 66.6666666667%; }
+
+.col-sm-offset-7 {
+  margin-left: 58.3333333333%; }
+
+.col-sm-9,
+.row.cols-sm-9 > * {
+  max-width: 75%;
+  flex-basis: 75%; }
+
+.col-sm-offset-8 {
+  margin-left: 66.6666666667%; }
+
+.col-sm-10,
+.row.cols-sm-10 > * {
+  max-width: 83.3333333333%;
+  flex-basis: 83.3333333333%; }
+
+.col-sm-offset-9 {
+  margin-left: 75%; }
+
+.col-sm-11,
+.row.cols-sm-11 > * {
+  max-width: 91.6666666667%;
+  flex-basis: 91.6666666667%; }
+
+.col-sm-offset-10 {
+  margin-left: 83.3333333333%; }
+
+.col-sm-12,
+.row.cols-sm-12 > * {
+  max-width: 100%;
+  flex-basis: 100%; }
+
+.col-sm-offset-11 {
+  margin-left: 91.6666666667%; }
+
+.col-sm-normal {
+  order: initial; }
+
+.col-sm-first {
+  order: -999; }
+
+.col-sm-last {
+  order: 999; }
+
+@media screen and (min-width: 500px) {
+  .col-md,
+  [class^='col-md-'],
+  [class^='col-md-offset-'],
+  .row[class*='cols-md-'] > * {
+    box-sizing: border-box;
+    flex: 0 0 auto;
+    padding: 0 calc(var(--universal-padding) / 2); }
+
+  .col-md,
+  .row.cols-md > * {
+    max-width: 100%;
+    flex-grow: 1;
+    flex-basis: 0; }
+
+  .col-md-1,
+  .row.cols-md-1 > * {
+    max-width: 8.3333333333%;
+    flex-basis: 8.3333333333%; }
+
+  .col-md-offset-0 {
+    margin-left: 0; }
+
+  .col-md-2,
+  .row.cols-md-2 > * {
+    max-width: 16.6666666667%;
+    flex-basis: 16.6666666667%; }
+
+  .col-md-offset-1 {
+    margin-left: 8.3333333333%; }
+
+  .col-md-3,
+  .row.cols-md-3 > * {
+    max-width: 25%;
+    flex-basis: 25%; }
+
+  .col-md-offset-2 {
+    margin-left: 16.6666666667%; }
+
+  .col-md-4,
+  .row.cols-md-4 > * {
+    max-width: 33.3333333333%;
+    flex-basis: 33.3333333333%; }
+
+  .col-md-offset-3 {
+    margin-left: 25%; }
+
+  .col-md-5,
+  .row.cols-md-5 > * {
+    max-width: 41.6666666667%;
+    flex-basis: 41.6666666667%; }
+
+  .col-md-offset-4 {
+    margin-left: 33.3333333333%; }
+
+  .col-md-6,
+  .row.cols-md-6 > * {
+    max-width: 50%;
+    flex-basis: 50%; }
+
+  .col-md-offset-5 {
+    margin-left: 41.6666666667%; }
+
+  .col-md-7,
+  .row.cols-md-7 > * {
+    max-width: 58.3333333333%;
+    flex-basis: 58.3333333333%; }
+
+  .col-md-offset-6 {
+    margin-left: 50%; }
+
+  .col-md-8,
+  .row.cols-md-8 > * {
+    max-width: 66.6666666667%;
+    flex-basis: 66.6666666667%; }
+
+  .col-md-offset-7 {
+    margin-left: 58.3333333333%; }
+
+  .col-md-9,
+  .row.cols-md-9 > * {
+    max-width: 75%;
+    flex-basis: 75%; }
+
+  .col-md-offset-8 {
+    margin-left: 66.6666666667%; }
+
+  .col-md-10,
+  .row.cols-md-10 > * {
+    max-width: 83.3333333333%;
+    flex-basis: 83.3333333333%; }
+
+  .col-md-offset-9 {
+    margin-left: 75%; }
+
+  .col-md-11,
+  .row.cols-md-11 > * {
+    max-width: 91.6666666667%;
+    flex-basis: 91.6666666667%; }
+
+  .col-md-offset-10 {
+    margin-left: 83.3333333333%; }
+
+  .col-md-12,
+  .row.cols-md-12 > * {
+    max-width: 100%;
+    flex-basis: 100%; }
+
+  .col-md-offset-11 {
+    margin-left: 91.6666666667%; }
+
+  .col-md-normal {
+    order: initial; }
+
+  .col-md-first {
+    order: -999; }
+
+  .col-md-last {
+    order: 999; } }
+@media screen and (min-width: 1280px) {
+  .col-lg,
+  [class^='col-lg-'],
+  [class^='col-lg-offset-'],
+  .row[class*='cols-lg-'] > * {
+    box-sizing: border-box;
+    flex: 0 0 auto;
+    padding: 0 calc(var(--universal-padding) / 2); }
+
+  .col-lg,
+  .row.cols-lg > * {
+    max-width: 100%;
+    flex-grow: 1;
+    flex-basis: 0; }
+
+  .col-lg-1,
+  .row.cols-lg-1 > * {
+    max-width: 8.3333333333%;
+    flex-basis: 8.3333333333%; }
+
+  .col-lg-offset-0 {
+    margin-left: 0; }
+
+  .col-lg-2,
+  .row.cols-lg-2 > * {
+    max-width: 16.6666666667%;
+    flex-basis: 16.6666666667%; }
+
+  .col-lg-offset-1 {
+    margin-left: 8.3333333333%; }
+
+  .col-lg-3,
+  .row.cols-lg-3 > * {
+    max-width: 25%;
+    flex-basis: 25%; }
+
+  .col-lg-offset-2 {
+    margin-left: 16.6666666667%; }
+
+  .col-lg-4,
+  .row.cols-lg-4 > * {
+    max-width: 33.3333333333%;
+    flex-basis: 33.3333333333%; }
+
+  .col-lg-offset-3 {
+    margin-left: 25%; }
+
+  .col-lg-5,
+  .row.cols-lg-5 > * {
+    max-width: 41.6666666667%;
+    flex-basis: 41.6666666667%; }
+
+  .col-lg-offset-4 {
+    margin-left: 33.3333333333%; }
+
+  .col-lg-6,
+  .row.cols-lg-6 > * {
+    max-width: 50%;
+    flex-basis: 50%; }
+
+  .col-lg-offset-5 {
+    margin-left: 41.6666666667%; }
+
+  .col-lg-7,
+  .row.cols-lg-7 > * {
+    max-width: 58.3333333333%;
+    flex-basis: 58.3333333333%; }
+
+  .col-lg-offset-6 {
+    margin-left: 50%; }
+
+  .col-lg-8,
+  .row.cols-lg-8 > * {
+    max-width: 66.6666666667%;
+    flex-basis: 66.6666666667%; }
+
+  .col-lg-offset-7 {
+    margin-left: 58.3333333333%; }
+
+  .col-lg-9,
+  .row.cols-lg-9 > * {
+    max-width: 75%;
+    flex-basis: 75%; }
+
+  .col-lg-offset-8 {
+    margin-left: 66.6666666667%; }
+
+  .col-lg-10,
+  .row.cols-lg-10 > * {
+    max-width: 83.3333333333%;
+    flex-basis: 83.3333333333%; }
+
+  .col-lg-offset-9 {
+    margin-left: 75%; }
+
+  .col-lg-11,
+  .row.cols-lg-11 > * {
+    max-width: 91.6666666667%;
+    flex-basis: 91.6666666667%; }
+
+  .col-lg-offset-10 {
+    margin-left: 83.3333333333%; }
+
+  .col-lg-12,
+  .row.cols-lg-12 > * {
+    max-width: 100%;
+    flex-basis: 100%; }
+
+  .col-lg-offset-11 {
+    margin-left: 91.6666666667%; }
+
+  .col-lg-normal {
+    order: initial; }
+
+  .col-lg-first {
+    order: -999; }
+
+  .col-lg-last {
+    order: 999; } }
+/* Card component CSS variable definitions */
+:root {
+  --card-back-color: #3cb4e6;
+  --card-fore-color: #03234b;
+  --card-border-color: #03234b; }
+
+.card {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-self: center;
+  position: relative;
+  width: 100%;
+  background: var(--card-back-color);
+  color: var(--card-fore-color);
+  border: 0.0714285714rem solid var(--card-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin);
+  overflow: hidden; }
+  @media screen and (min-width: 320px) {
+    .card {
+      max-width: 320px; } }
+  .card > .sectione {
+    background: var(--card-back-color);
+    color: var(--card-fore-color);
+    box-sizing: border-box;
+    margin: 0;
+    border: 0;
+    border-radius: 0;
+    border-bottom: 0.0714285714rem solid var(--card-border-color);
+    padding: var(--universal-padding);
+    width: 100%; }
+    .card > .sectione.media {
+      height: 200px;
+      padding: 0;
+      -o-object-fit: cover;
+      object-fit: cover; }
+  .card > .sectione:last-child {
+    border-bottom: 0; }
+
+/*
+  Custom elements for card elements.
+*/
+@media screen and (min-width: 240px) {
+  .card.small {
+    max-width: 240px; } }
+@media screen and (min-width: 480px) {
+  .card.large {
+    max-width: 480px; } }
+.card.fluid {
+  max-width: 100%;
+  width: auto; }
+
+.card.warning {
+  --card-back-color: #e5b8b7;
+  --card-fore-color: #3b234b;
+  --card-border-color: #8c0078; }
+
+.card.error {
+  --card-back-color: #464650;
+  --card-fore-color: #ffffff;
+  --card-border-color: #8c0078; }
+
+.card > .sectione.dark {
+  --card-back-color: #3b234b;
+  --card-fore-color: #ffffff; }
+
+.card > .sectione.double-padded {
+  padding: calc(1.5 * var(--universal-padding)); }
+
+/*
+  Definitions for forms and input elements.
+*/
+/* Input_control module CSS variable definitions */
+:root {
+  --form-back-color: #ffe97f;
+  --form-fore-color: #03234b;
+  --form-border-color: #3cb4e6;
+  --input-back-color: #ffffff;
+  --input-fore-color: #03234b;
+  --input-border-color: #3cb4e6;
+  --input-focus-color: #0288d1;
+  --input-invalid-color: #d32f2f;
+  --button-back-color: #e2e2e2;
+  --button-hover-back-color: #dcdcdc;
+  --button-fore-color: #212121;
+  --button-border-color: transparent;
+  --button-hover-border-color: transparent;
+  --button-group-border-color: rgba(124, 124, 124, 0.54); }
+
+form {
+  background: var(--form-back-color);
+  color: var(--form-fore-color);
+  border: 0.0714285714rem solid var(--form-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin);
+  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
+
+fieldset {
+  border: 0.0714285714rem solid var(--form-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: calc(var(--universal-margin) / 4);
+  padding: var(--universal-padding); }
+
+legend {
+  box-sizing: border-box;
+  display: table;
+  max-width: 100%;
+  white-space: normal;
+  font-weight: 500;
+  padding: calc(var(--universal-padding) / 2); }
+
+label {
+  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
+
+.input-group {
+  display: inline-block; }
+  .input-group.fluid {
+    display: flex;
+    align-items: center;
+    justify-content: center; }
+    .input-group.fluid > input {
+      max-width: 100%;
+      flex-grow: 1;
+      flex-basis: 0px; }
+    @media screen and (max-width: 499px) {
+      .input-group.fluid {
+        align-items: stretch;
+        flex-direction: column; } }
+  .input-group.vertical {
+    display: flex;
+    align-items: stretch;
+    flex-direction: column; }
+    .input-group.vertical > input {
+      max-width: 100%;
+      flex-grow: 1;
+      flex-basis: 0px; }
+
+[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
+  height: auto; }
+
+[type="search"] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px; }
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none; }
+
+input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
+[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
+  box-sizing: border-box;
+  background: var(--input-back-color);
+  color: var(--input-fore-color);
+  border: 0.0714285714rem solid var(--input-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: calc(var(--universal-margin) / 2);
+  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
+
+input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
+  border-color: var(--input-focus-color);
+  box-shadow: none; }
+input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
+  border-color: var(--input-invalid-color);
+  box-shadow: none; }
+input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
+  background: var(--secondary-back-color); }
+
+select {
+  max-width: 100%; }
+
+option {
+  overflow: hidden;
+  text-overflow: ellipsis; }
+
+[type="checkbox"], [type="radio"] {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  position: relative;
+  height: calc(1rem + var(--universal-padding) / 2);
+  width: calc(1rem + var(--universal-padding) / 2);
+  vertical-align: text-bottom;
+  padding: 0;
+  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
+  flex-grow: 0 !important; }
+  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
+    position: absolute; }
+
+[type="checkbox"]:checked:before {
+  content: '\2713';
+  font-family: sans-serif;
+  font-size: calc(1rem + var(--universal-padding) / 2);
+  top: calc(0rem - var(--universal-padding));
+  left: calc(var(--universal-padding) / 4); }
+
+[type="radio"] {
+  border-radius: 100%; }
+  [type="radio"]:checked:before {
+    border-radius: 100%;
+    content: '';
+    top: calc(0.0714285714rem + var(--universal-padding) / 2);
+    left: calc(0.0714285714rem + var(--universal-padding) / 2);
+    background: var(--input-fore-color);
+    width: 0.5rem;
+    height: 0.5rem; }
+
+:placeholder-shown {
+  color: var(--input-fore-color); }
+
+::-ms-placeholder {
+  color: var(--input-fore-color);
+  opacity: 0.54; }
+
+button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0; }
+
+button, html [type="button"], [type="reset"], [type="submit"] {
+  -webkit-appearance: button; }
+
+button {
+  overflow: visible;
+  text-transform: none; }
+
+button, [type="button"], [type="submit"], [type="reset"],
+a.button, label.button, .button,
+a[role="button"], label[role="button"], [role="button"] {
+  display: inline-block;
+  background: var(--button-back-color);
+  color: var(--button-fore-color);
+  border: 0.0714285714rem solid var(--button-border-color);
+  border-radius: var(--universal-border-radius);
+  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
+  margin: var(--universal-margin);
+  text-decoration: none;
+  cursor: pointer;
+  transition: background 0.3s; }
+  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
+  a.button:hover,
+  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
+  a[role="button"]:hover,
+  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
+    background: var(--button-hover-back-color);
+    border-color: var(--button-hover-border-color); }
+
+input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
+  cursor: not-allowed;
+  opacity: 0.75; }
+
+.button-group {
+  display: flex;
+  border: 0.0714285714rem solid var(--button-group-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin); }
+  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
+    margin: 0;
+    max-width: 100%;
+    flex: 1 1 auto;
+    text-align: center;
+    border: 0;
+    border-radius: 0;
+    box-shadow: none; }
+  .button-group > :not(:first-child) {
+    border-left: 0.0714285714rem solid var(--button-group-border-color); }
+  @media screen and (max-width: 499px) {
+    .button-group {
+      flex-direction: column; }
+      .button-group > :not(:first-child) {
+        border: 0;
+        border-top: 0.0714285714rem solid var(--button-group-border-color); } }
+
+/*
+  Custom elements for forms and input elements.
+*/
+button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
+  --button-back-color: #1976d2;
+  --button-fore-color: #f8f8f8; }
+  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
+    --button-hover-back-color: #1565c0; }
+
+button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
+  --button-back-color: #d32f2f;
+  --button-fore-color: #f8f8f8; }
+  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
+    --button-hover-back-color: #c62828; }
+
+button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
+  --button-back-color: #308732;
+  --button-fore-color: #f8f8f8; }
+  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
+    --button-hover-back-color: #277529; }
+
+button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
+  --button-back-color: #212121;
+  --button-fore-color: #f8f8f8; }
+  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
+    --button-hover-back-color: #111; }
+
+button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
+  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
+  margin: var(--universal-margin); }
+
+button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
+  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
+  margin: var(--universal-margin); }
+
+/*
+  Definitions for navigation elements.
+*/
+/* Navigation module CSS variable definitions */
+:root {
+  --header-back-color: #03234b;
+  --header-hover-back-color: #ffd200;
+  --header-fore-color: #ffffff;
+  --header-border-color: #3cb4e6;
+  --nav-back-color: #ffffff;
+  --nav-hover-back-color: #ffe97f;
+  --nav-fore-color: #e6007e;
+  --nav-border-color: #3cb4e6;
+  --nav-link-color: #3cb4e6;
+  --footer-fore-color: #ffffff;
+  --footer-back-color: #03234b;
+  --footer-border-color: #3cb4e6;
+  --footer-link-color: #3cb4e6;
+  --drawer-back-color: #ffffff;
+  --drawer-hover-back-color: #ffe97f;
+  --drawer-border-color: #3cb4e6;
+  --drawer-close-color: #e6007e; }
+
+header {
+  height: 2.75rem;
+  background: var(--header-back-color);
+  color: var(--header-fore-color);
+  border-bottom: 0.0714285714rem solid var(--header-border-color);
+  padding: calc(var(--universal-padding) / 4) 0;
+  white-space: nowrap;
+  overflow-x: auto;
+  overflow-y: hidden; }
+  header.row {
+    box-sizing: content-box; }
+  header .logo {
+    color: var(--header-fore-color);
+    font-size: 1.75rem;
+    padding: var(--universal-padding) calc(2 * var(--universal-padding));
+    text-decoration: none; }
+  header button, header [type="button"], header .button, header [role="button"] {
+    box-sizing: border-box;
+    position: relative;
+    top: calc(0rem - var(--universal-padding) / 4);
+    height: calc(3.1875rem + var(--universal-padding) / 2);
+    background: var(--header-back-color);
+    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
+    text-align: center;
+    color: var(--header-fore-color);
+    border: 0;
+    border-radius: 0;
+    margin: 0;
+    text-transform: uppercase; }
+    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
+      background: var(--header-hover-back-color); }
+
+nav {
+  background: var(--nav-back-color);
+  color: var(--nav-fore-color);
+  border: 0.0714285714rem solid var(--nav-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin); }
+  nav * {
+    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
+  nav a, nav a:visited {
+    display: block;
+    color: var(--nav-link-color);
+    border-radius: var(--universal-border-radius);
+    transition: background 0.3s; }
+    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
+      text-decoration: none;
+      background: var(--nav-hover-back-color); }
+  nav .sublink-1 {
+    position: relative;
+    margin-left: calc(2 * var(--universal-padding)); }
+    nav .sublink-1:before {
+      position: absolute;
+      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
+      top: -0.0714285714rem;
+      content: '';
+      height: 100%;
+      border: 0.0714285714rem solid var(--nav-border-color);
+      border-left: 0; }
+  nav .sublink-2 {
+    position: relative;
+    margin-left: calc(4 * var(--universal-padding)); }
+    nav .sublink-2:before {
+      position: absolute;
+      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
+      top: -0.0714285714rem;
+      content: '';
+      height: 100%;
+      border: 0.0714285714rem solid var(--nav-border-color);
+      border-left: 0; }
+
+footer {
+  background: var(--footer-back-color);
+  color: var(--footer-fore-color);
+  border-top: 0.0714285714rem solid var(--footer-border-color);
+  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
+  font-size: 0.875rem; }
+  footer a, footer a:visited {
+    color: var(--footer-link-color); }
+
+header.sticky {
+  position: -webkit-sticky;
+  position: sticky;
+  z-index: 1101;
+  top: 0; }
+
+footer.sticky {
+  position: -webkit-sticky;
+  position: sticky;
+  z-index: 1101;
+  bottom: 0; }
+
+.drawer-toggle:before {
+  display: inline-block;
+  position: relative;
+  vertical-align: bottom;
+  content: '\00a0\2261\00a0';
+  font-family: sans-serif;
+  font-size: 1.5em; }
+@media screen and (min-width: 500px) {
+  .drawer-toggle:not(.persistent) {
+    display: none; } }
+
+[type="checkbox"].drawer {
+  height: 1px;
+  width: 1px;
+  margin: -1px;
+  overflow: hidden;
+  position: absolute;
+  clip: rect(0 0 0 0);
+  -webkit-clip-path: inset(100%);
+  clip-path: inset(100%); }
+  [type="checkbox"].drawer + * {
+    display: block;
+    box-sizing: border-box;
+    position: fixed;
+    top: 0;
+    width: 320px;
+    height: 100vh;
+    overflow-y: auto;
+    background: var(--drawer-back-color);
+    border: 0.0714285714rem solid var(--drawer-border-color);
+    border-radius: 0;
+    margin: 0;
+    z-index: 1110;
+    right: -320px;
+    transition: right 0.3s; }
+    [type="checkbox"].drawer + * .drawer-close {
+      position: absolute;
+      top: var(--universal-margin);
+      right: var(--universal-margin);
+      z-index: 1111;
+      width: 2rem;
+      height: 2rem;
+      border-radius: var(--universal-border-radius);
+      padding: var(--universal-padding);
+      margin: 0;
+      cursor: pointer;
+      transition: background 0.3s; }
+      [type="checkbox"].drawer + * .drawer-close:before {
+        display: block;
+        content: '\00D7';
+        color: var(--drawer-close-color);
+        position: relative;
+        font-family: sans-serif;
+        font-size: 2rem;
+        line-height: 1;
+        text-align: center; }
+      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
+        background: var(--drawer-hover-back-color); }
+    @media screen and (max-width: 320px) {
+      [type="checkbox"].drawer + * {
+        width: 100%; } }
+  [type="checkbox"].drawer:checked + * {
+    right: 0; }
+  @media screen and (min-width: 500px) {
+    [type="checkbox"].drawer:not(.persistent) + * {
+      position: static;
+      height: 100%;
+      z-index: 1100; }
+      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
+        display: none; } }
+
+/*
+  Definitions for the responsive table component.
+*/
+/* Table module CSS variable definitions. */
+:root {
+  --table-border-color: #03234b;
+  --table-border-separator-color: #03234b;
+  --table-head-back-color: #03234b;
+  --table-head-fore-color: #ffffff;
+  --table-body-back-color: #ffffff;
+  --table-body-fore-color: #03234b;
+  --table-body-alt-back-color: #f4f4f4; }
+
+table {
+  border-collapse: separate;
+  border-spacing: 0;
+  margin: 0;
+  display: flex;
+  flex: 0 1 auto;
+  flex-flow: row wrap;
+  padding: var(--universal-padding);
+  padding-top: 0; }
+  table caption {
+    font-size: 1rem;
+    margin: calc(2 * var(--universal-margin)) 0;
+    max-width: 100%;
+    flex: 0 0 100%; }
+  table thead, table tbody {
+    display: flex;
+    flex-flow: row wrap;
+    border: 0.0714285714rem solid var(--table-border-color); }
+  table thead {
+    z-index: 999;
+    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
+    border-bottom: 0.0714285714rem solid var(--table-border-separator-color); }
+  table tbody {
+    border-top: 0;
+    margin-top: calc(0 - var(--universal-margin));
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+  table tr {
+    display: flex;
+    padding: 0; }
+  table th, table td {
+    padding: calc(0.5 * var(--universal-padding));
+		font-size: 0.9rem; }
+  table th {
+    text-align: left;
+    background: var(--table-head-back-color);
+    color: var(--table-head-fore-color); }
+  table td {
+    background: var(--table-body-back-color);
+    color: var(--table-body-fore-color);
+    border-top: 0.0714285714rem solid var(--table-border-color); }
+
+table:not(.horizontal) {
+  overflow: auto;
+  max-height: 100%; }
+  table:not(.horizontal) thead, table:not(.horizontal) tbody {
+    max-width: 100%;
+    flex: 0 0 100%; }
+  table:not(.horizontal) tr {
+    flex-flow: row wrap;
+    flex: 0 0 100%; }
+  table:not(.horizontal) th, table:not(.horizontal) td {
+    flex: 1 0 0%;
+    overflow: hidden;
+    text-overflow: ellipsis; }
+  table:not(.horizontal) thead {
+    position: sticky;
+    top: 0; }
+  table:not(.horizontal) tbody tr:first-child td {
+    border-top: 0; }
+
+table.horizontal {
+  border: 0; }
+  table.horizontal thead, table.horizontal tbody {
+    border: 0;
+    flex: .2 0 0;
+    flex-flow: row nowrap; }
+  table.horizontal tbody {
+    overflow: auto;
+    justify-content: space-between;
+    flex: .8 0 0;
+    margin-left: 0;
+    padding-bottom: calc(var(--universal-padding) / 4); }
+  table.horizontal tr {
+    flex-direction: column;
+    flex: 1 0 auto; }
+  table.horizontal th, table.horizontal td {
+    width: auto;
+    border: 0;
+    border-bottom: 0.0714285714rem solid var(--table-border-color); }
+    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
+      border-top: 0; }
+  table.horizontal th {
+    text-align: right;
+    border-left: 0.0714285714rem solid var(--table-border-color);
+    border-right: 0.0714285714rem solid var(--table-border-separator-color); }
+  table.horizontal thead tr:first-child {
+    padding-left: 0; }
+  table.horizontal th:first-child, table.horizontal td:first-child {
+    border-top: 0.0714285714rem solid var(--table-border-color); }
+  table.horizontal tbody tr:last-child td {
+    border-right: 0.0714285714rem solid var(--table-border-color); }
+    table.horizontal tbody tr:last-child td:first-child {
+      border-top-right-radius: 0.25rem; }
+    table.horizontal tbody tr:last-child td:last-child {
+      border-bottom-right-radius: 0.25rem; }
+  table.horizontal thead tr:first-child th:first-child {
+    border-top-left-radius: 0.25rem; }
+  table.horizontal thead tr:first-child th:last-child {
+    border-bottom-left-radius: 0.25rem; }
+
+@media screen and (max-width: 499px) {
+  table, table.horizontal {
+    border-collapse: collapse;
+    border: 0;
+    width: 100%;
+    display: table; }
+    table thead, table th, table.horizontal thead, table.horizontal th {
+      border: 0;
+      height: 1px;
+      width: 1px;
+      margin: -1px;
+      overflow: hidden;
+      padding: 0;
+      position: absolute;
+      clip: rect(0 0 0 0);
+      -webkit-clip-path: inset(100%);
+      clip-path: inset(100%); }
+    table tbody, table.horizontal tbody {
+      border: 0;
+      display: table-row-group; }
+    table tr, table.horizontal tr {
+      display: block;
+      border: 0.0714285714rem solid var(--table-border-color);
+      border-radius: var(--universal-border-radius);
+      background: #ffffff;
+      padding: var(--universal-padding);
+      margin: var(--universal-margin);
+      margin-bottom: calc(1 * var(--universal-margin)); }
+    table th, table td, table.horizontal th, table.horizontal td {
+      width: auto; }
+    table td, table.horizontal td {
+      display: block;
+      border: 0;
+      text-align: right; }
+    table td:before, table.horizontal td:before {
+      content: attr(data-label);
+      float: left;
+      font-weight: 600; }
+    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
+      border-top: 0; }
+    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
+      border-right: 0; } }
+table tr:nth-of-type(2n) > td {
+  background: var(--table-body-alt-back-color); }
+
+@media screen and (max-width: 500px) {
+  table tr:nth-of-type(2n) {
+    background: var(--table-body-alt-back-color); } }
+:root {
+  --table-body-hover-back-color: #90caf9; }
+
+table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
+  background: var(--table-body-hover-back-color); }
+
+@media screen and (max-width: 500px) {
+  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
+    background: var(--table-body-hover-back-color); } }
+/*
+  Definitions for contextual background elements, toasts and tooltips.
+*/
+/* Contextual module CSS variable definitions */
+:root {
+  --mark-back-color: #3cb4e6;
+  --mark-fore-color: #ffffff; }
+
+mark {
+  background: var(--mark-back-color);
+  color: var(--mark-fore-color);
+  font-size: 0.95em;
+  line-height: 1em;
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) var(--universal-padding); }
+  mark.inline-block {
+    display: inline-block;
+    font-size: 1em;
+    line-height: 1.4;
+    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
+
+:root {
+  --toast-back-color: #424242;
+  --toast-fore-color: #fafafa; }
+
+.toast {
+  position: fixed;
+  bottom: calc(var(--universal-margin) * 3);
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1111;
+  color: var(--toast-fore-color);
+  background: var(--toast-back-color);
+  border-radius: calc(var(--universal-border-radius) * 16);
+  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
+
+:root {
+  --tooltip-back-color: #212121;
+  --tooltip-fore-color: #fafafa; }
+
+.tooltip {
+  position: relative;
+  display: inline-block; }
+  .tooltip:before, .tooltip:after {
+    position: absolute;
+    opacity: 0;
+    clip: rect(0 0 0 0);
+    -webkit-clip-path: inset(100%);
+    clip-path: inset(100%);
+    transition: all 0.3s;
+    z-index: 1010;
+    left: 50%; }
+  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
+    bottom: 75%; }
+  .tooltip.bottom:before, .tooltip.bottom:after {
+    top: 75%; }
+  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
+    opacity: 1;
+    clip: auto;
+    -webkit-clip-path: inset(0%);
+    clip-path: inset(0%); }
+  .tooltip:before {
+    content: '';
+    background: transparent;
+    border: var(--universal-margin) solid transparent;
+    left: calc(50% - var(--universal-margin)); }
+  .tooltip:not(.bottom):before {
+    border-top-color: #212121; }
+  .tooltip.bottom:before {
+    border-bottom-color: #212121; }
+  .tooltip:after {
+    content: attr(aria-label);
+    color: var(--tooltip-fore-color);
+    background: var(--tooltip-back-color);
+    border-radius: var(--universal-border-radius);
+    padding: var(--universal-padding);
+    white-space: nowrap;
+    transform: translateX(-50%); }
+  .tooltip:not(.bottom):after {
+    margin-bottom: calc(2 * var(--universal-margin)); }
+  .tooltip.bottom:after {
+    margin-top: calc(2 * var(--universal-margin)); }
+
+:root {
+  --modal-overlay-color: rgba(0, 0, 0, 0.45);
+  --modal-close-color: #e6007e;
+  --modal-close-hover-color: #ffe97f; }
+
+[type="checkbox"].modal {
+  height: 1px;
+  width: 1px;
+  margin: -1px;
+  overflow: hidden;
+  position: absolute;
+  clip: rect(0 0 0 0);
+  -webkit-clip-path: inset(100%);
+  clip-path: inset(100%); }
+  [type="checkbox"].modal + div {
+    position: fixed;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 100vw;
+    height: 100vh;
+    background: var(--modal-overlay-color); }
+    [type="checkbox"].modal + div .card {
+      margin: 0 auto;
+      max-height: 50vh;
+      overflow: auto; }
+      [type="checkbox"].modal + div .card .modal-close {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 1.75rem;
+        height: 1.75rem;
+        border-radius: var(--universal-border-radius);
+        padding: var(--universal-padding);
+        margin: 0;
+        cursor: pointer;
+        transition: background 0.3s; }
+        [type="checkbox"].modal + div .card .modal-close:before {
+          display: block;
+          content: '\00D7';
+          color: var(--modal-close-color);
+          position: relative;
+          font-family: sans-serif;
+          font-size: 1.75rem;
+          line-height: 1;
+          text-align: center; }
+        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
+          background: var(--modal-close-hover-color); }
+  [type="checkbox"].modal:checked + div {
+    display: flex;
+    flex: 0 1 auto;
+    z-index: 1200; }
+    [type="checkbox"].modal:checked + div .card .modal-close {
+      z-index: 1211; }
+
+:root {
+  --collapse-label-back-color: #03234b;
+  --collapse-label-fore-color: #ffffff;
+  --collapse-label-hover-back-color: #3cb4e6;
+  --collapse-selected-label-back-color: #3cb4e6;
+  --collapse-border-color: var(--collapse-label-back-color);
+  --collapse-selected-border-color: #ceecf8;
+  --collapse-content-back-color: #ffffff;
+  --collapse-selected-label-border-color: #3cb4e6; }
+
+.collapse {
+  width: calc(100% - 2 * var(--universal-margin));
+  opacity: 1;
+  display: flex;
+  flex-direction: column;
+  margin: var(--universal-margin);
+  border-radius: var(--universal-border-radius); }
+  .collapse > [type="radio"], .collapse > [type="checkbox"] {
+    height: 1px;
+    width: 1px;
+    margin: -1px;
+    overflow: hidden;
+    position: absolute;
+    clip: rect(0 0 0 0);
+    -webkit-clip-path: inset(100%);
+    clip-path: inset(100%); }
+  .collapse > label {
+    flex-grow: 1;
+    display: inline-block;
+    height: 1.25rem;
+    cursor: pointer;
+    transition: background 0.2s;
+    color: var(--collapse-label-fore-color);
+    background: var(--collapse-label-back-color);
+    border: 0.0714285714rem solid var(--collapse-selected-border-color);
+    padding: calc(1.25 * var(--universal-padding)); }
+    .collapse > label:hover, .collapse > label:focus {
+      background: var(--collapse-label-hover-back-color); }
+    .collapse > label + div {
+      flex-basis: auto;
+      height: 1px;
+      width: 1px;
+      margin: -1px;
+      overflow: hidden;
+      position: absolute;
+      clip: rect(0 0 0 0);
+      -webkit-clip-path: inset(100%);
+      clip-path: inset(100%);
+      transition: max-height 0.3s;
+      max-height: 1px; }
+  .collapse > :checked + label {
+    background: var(--collapse-selected-label-back-color);
+    border-color: var(--collapse-selected-label-border-color); }
+    .collapse > :checked + label + div {
+      box-sizing: border-box;
+      position: relative;
+      width: 100%;
+      height: auto;
+      overflow: auto;
+      margin: 0;
+      background: var(--collapse-content-back-color);
+      border: 0.0714285714rem solid var(--collapse-selected-border-color);
+      border-top: 0;
+      padding: var(--universal-padding);
+      clip: auto;
+      -webkit-clip-path: inset(0%);
+      clip-path: inset(0%);
+      max-height: 100%; }
+  .collapse > label:not(:first-of-type) {
+    border-top: 0; }
+  .collapse > label:first-of-type {
+    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
+  .collapse > label:last-of-type:not(:first-of-type) {
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+  .collapse > label:last-of-type:first-of-type {
+    border-radius: var(--universal-border-radius); }
+  .collapse > :checked:last-of-type:not(:first-of-type) + label {
+    border-radius: 0; }
+  .collapse > :checked:last-of-type + label + div {
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+
+/*
+  Custom elements for contextual background elements, toasts and tooltips.
+*/
+mark.tertiary {
+  --mark-back-color: #3cb4e6; }
+
+mark.tag {
+  padding: calc(var(--universal-padding)/2) var(--universal-padding);
+  border-radius: 1em; }
+
+/*
+  Definitions for progress elements and spinners.
+*/
+/* Progress module CSS variable definitions */
+:root {
+  --progress-back-color: #3cb4e6;
+  --progress-fore-color: #555; }
+
+progress {
+  display: block;
+  vertical-align: baseline;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  height: 0.75rem;
+  width: calc(100% - 2 * var(--universal-margin));
+  margin: var(--universal-margin);
+  border: 0;
+  border-radius: calc(2 * var(--universal-border-radius));
+  background: var(--progress-back-color);
+  color: var(--progress-fore-color); }
+  progress::-webkit-progress-value {
+    background: var(--progress-fore-color);
+    border-top-left-radius: calc(2 * var(--universal-border-radius));
+    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
+  progress::-webkit-progress-bar {
+    background: var(--progress-back-color); }
+  progress::-moz-progress-bar {
+    background: var(--progress-fore-color);
+    border-top-left-radius: calc(2 * var(--universal-border-radius));
+    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
+  progress[value="1000"]::-webkit-progress-value {
+    border-radius: calc(2 * var(--universal-border-radius)); }
+  progress[value="1000"]::-moz-progress-bar {
+    border-radius: calc(2 * var(--universal-border-radius)); }
+  progress.inline {
+    display: inline-block;
+    vertical-align: middle;
+    width: 60%; }
+
+:root {
+  --spinner-back-color: #ddd;
+  --spinner-fore-color: #555; }
+
+@keyframes spinner-donut-anim {
+  0% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } }
+.spinner {
+  display: inline-block;
+  margin: var(--universal-margin);
+  border: 0.25rem solid var(--spinner-back-color);
+  border-left: 0.25rem solid var(--spinner-fore-color);
+  border-radius: 50%;
+  width: 1.25rem;
+  height: 1.25rem;
+  animation: spinner-donut-anim 1.2s linear infinite; }
+
+/*
+  Custom elements for progress bars and spinners.
+*/
+progress.primary {
+  --progress-fore-color: #1976d2; }
+
+progress.secondary {
+  --progress-fore-color: #d32f2f; }
+
+progress.tertiary {
+  --progress-fore-color: #308732; }
+
+.spinner.primary {
+  --spinner-fore-color: #1976d2; }
+
+.spinner.secondary {
+  --spinner-fore-color: #d32f2f; }
+
+.spinner.tertiary {
+  --spinner-fore-color: #308732; }
+
+/*
+  Definitions for icons - powered by Feather (https://feathericons.com/).
+*/
+span[class^='icon-'] {
+  display: inline-block;
+  height: 1em;
+  width: 1em;
+  vertical-align: -0.125em;
+  background-size: contain;
+  margin: 0 calc(var(--universal-margin) / 4); }
+  span[class^='icon-'].secondary {
+    -webkit-filter: invert(25%);
+    filter: invert(25%); }
+  span[class^='icon-'].inverse {
+    -webkit-filter: invert(100%);
+    filter: invert(100%); }
+
+span.icon-alert {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-bookmark {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-calendar {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-credit {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-edit {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
+span.icon-link {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-help {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-home {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
+span.icon-info {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-lock {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-mail {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
+span.icon-location {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
+span.icon-phone {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-rss {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
+span.icon-search {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-settings {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-share {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-cart {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-upload {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-user {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
+
+/*
+  Definitions for STMicroelectronics icons (https://brandportal.st.com/document/26).
+*/
+span.icon-st-update {
+  background-image: url("Update.svg"); }
+span.icon-st-add {
+  background-image: url("Add button.svg"); }
+
+/*
+  Definitions for utilities and helper classes.
+*/
+/* Utility module CSS variable definitions */
+:root {
+  --generic-border-color: rgba(0, 0, 0, 0.3);
+  --generic-box-shadow: 0 0.2857142857rem 0.2857142857rem 0 rgba(0, 0, 0, 0.125), 0 0.1428571429rem 0.1428571429rem -0.1428571429rem rgba(0, 0, 0, 0.125); }
+
+.hidden {
+  display: none !important; }
+
+.visually-hidden {
+  position: absolute !important;
+  width: 1px !important;
+  height: 1px !important;
+  margin: -1px !important;
+  border: 0 !important;
+  padding: 0 !important;
+  clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(100%) !important;
+  clip-path: inset(100%) !important;
+  overflow: hidden !important; }
+
+.bordered {
+  border: 0.0714285714rem solid var(--generic-border-color) !important; }
+
+.rounded {
+  border-radius: var(--universal-border-radius) !important; }
+
+.circular {
+  border-radius: 50% !important; }
+
+.shadowed {
+  box-shadow: var(--generic-box-shadow) !important; }
+
+.responsive-margin {
+  margin: calc(var(--universal-margin) / 4) !important; }
+  @media screen and (min-width: 500px) {
+    .responsive-margin {
+      margin: calc(var(--universal-margin) / 2) !important; } }
+  @media screen and (min-width: 1280px) {
+    .responsive-margin {
+      margin: var(--universal-margin) !important; } }
+
+.responsive-padding {
+  padding: calc(var(--universal-padding) / 4) !important; }
+  @media screen and (min-width: 500px) {
+    .responsive-padding {
+      padding: calc(var(--universal-padding) / 2) !important; } }
+  @media screen and (min-width: 1280px) {
+    .responsive-padding {
+      padding: var(--universal-padding) !important; } }
+
+@media screen and (max-width: 499px) {
+  .hidden-sm {
+    display: none !important; } }
+@media screen and (min-width: 500px) and (max-width: 1279px) {
+  .hidden-md {
+    display: none !important; } }
+@media screen and (min-width: 1280px) {
+  .hidden-lg {
+    display: none !important; } }
+@media screen and (max-width: 499px) {
+  .visually-hidden-sm {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+@media screen and (min-width: 500px) and (max-width: 1279px) {
+  .visually-hidden-md {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+@media screen and (min-width: 1280px) {
+  .visually-hidden-lg {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+
+/*# sourceMappingURL=mini-custom.css.map */
+
+img[alt="ST logo"] { display: block; margin: auto; width: 75%; max-width: 250px; min-width: 71px; }
+img[alt="Cube logo"] { float: right; width: 30%; max-width: 10rem; min-width: 8rem; padding-right: 1rem;}
+
+.figure {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/Middlewares/ST/STM32_Key_Management_Services/_htmresc/st_logo.png b/Middlewares/ST/STM32_Key_Management_Services/_htmresc/st_logo.png
deleted file mode 100644
index 8b80057f..00000000
Binary files a/Middlewares/ST/STM32_Key_Management_Services/_htmresc/st_logo.png and /dev/null differ
diff --git a/Middlewares/ST/STM32_Key_Management_Services/_htmresc/st_logo_2020.png b/Middlewares/ST/STM32_Key_Management_Services/_htmresc/st_logo_2020.png
new file mode 100644
index 00000000..d6cebb5a
Binary files /dev/null and b/Middlewares/ST/STM32_Key_Management_Services/_htmresc/st_logo_2020.png differ
diff --git a/Middlewares/ST/STM32_Secure_Engine/Release_Notes.html b/Middlewares/ST/STM32_Secure_Engine/Release_Notes.html
index ffe8915d..338b9b41 100644
--- a/Middlewares/ST/STM32_Secure_Engine/Release_Notes.html
+++ b/Middlewares/ST/STM32_Secure_Engine/Release_Notes.html
@@ -5,32 +5,27 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Release Notes for STM32 Secure Engine</title>
-  <style>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    span.underline{text-decoration: underline;}
-    div.column{display: inline-block; vertical-align: top; width: 50%;}
-    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
-    ul.task-list{list-style: none;}
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      span.smallcaps{font-variant: small-caps;}
+      span.underline{text-decoration: underline;}
+      div.column{display: inline-block; vertical-align: top; width: 50%;}
   </style>
-  <link rel="stylesheet" href="_htmresc/mini-st.css" />
+  <link rel="stylesheet" href="_htmresc/mini-st_2020.css" />
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
+  <link rel="icon" type="image/x-icon" href="_htmresc/favicon.png" />
 </head>
 <body>
 <div class="row">
 <div class="col-sm-12 col-lg-4">
-<div class="card fluid">
-<div class="sectione dark">
 <center>
-<h1 id="release-notes-for-stm32-secure-engine"><small>Release Notes for</small> STM32 Secure Engine</h1>
+<h1 id="release-notes-for-stm32-secure-engine">Release Notes for <strong>STM32 Secure Engine</strong></h1>
 <p>Copyright © 2017 STMicroelectronics<br />
 </p>
-<a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo.png" alt="ST logo" /></a>
+<a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
-</div>
-</div>
 <h1 id="license">License</h1>
 <p>This software component is licensed by ST under Ultimate Liberty license SLA0044, the “License”;</p>
 <p>You may not use this file except in compliance with the License.</p>
@@ -45,7 +40,7 @@ <h1 id="purpose">Purpose</h1>
 </li>
 </ul>
 <figure>
-<img src="_htmresc/Firewall.png" alt="" /><figcaption>Firewall-based isolation</figcaption>
+<img src="_htmresc/Firewall.png" alt="Firewall-based isolation" /><figcaption>Firewall-based isolation</figcaption>
 </figure>
 <p><br />
 </p>
@@ -53,54 +48,70 @@ <h1 id="purpose">Purpose</h1>
 <li>MPU-based Secure Engine Isolation : The MPU-based Secure Engine isolation relies on the concept of privileged and unprivileged levels of software execution. The software must run in unprivileged level of execution by default (when SBSFU or the User Application is running), except for very specific actions like platform initialization or interrupt handling.</li>
 </ul>
 <figure>
-<img src="_htmresc/MPU.png" alt="" /><figcaption>MPU-based isolation</figcaption>
+<img src="_htmresc/MPU.png" alt="MPU-based isolation" /><figcaption>MPU-based isolation</figcaption>
 </figure>
 <p>For more details, refer to <a href="https://www.st.com/st-web-ui/static/active/en/resource/technical/document/user_manual/DM00414687.pdf">UM2262</a>, AppendixA : Getting started with X-CUBE-SBSFU expansion package</p>
 </div>
-<section id="update-history" class="col-sm-12 col-lg-8">
-<h1>Update History</h1>
+<div class="col-sm-12 col-lg-8">
+<h1 id="update-history">Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section8" checked aria-hidden="true"> <label for="collapse-section8" aria-hidden="true">V2.4.1 / 4-September-2020</label>
+<input type="checkbox" id="collapse-section9" checked aria-hidden="true"> <label for="collapse-section9" aria-hidden="true">v2.5.0 / 20-May-2021</label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
 <ul>
-<li><p>Add service to enable and disable IRQ services</p></li>
-<li><p>Modify prepareimage to allow merge of any elf and bin files</p></li>
+<li><p>STM32WB Series : Add specific CKS lock key service (cannot be called in BY-PASS mode)</p></li>
+<li><p>Remove bootinfo structure and services</p></li>
+<li><p>Locked objects are no more accessible by searches</p></li>
+<li><p>Minor update with no functional impact</p></li>
 </ul>
 <h2 id="known-limitations">Known Limitations</h2>
 <p>None</p>
 <h2 id="backward-compatibility">Backward Compatibility</h2>
+<p>Break of compatibility with V2.4.1</p>
+</div>
+</div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section8" aria-hidden="true"> <label for="collapse-section8" aria-hidden="true">V2.4.1 / 4-September-2020</label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<ul>
+<li><p>Add service to enable and disable IRQ services</p></li>
+<li><p>Modify prepareimage to allow merge of any elf and bin files</p></li>
+</ul>
+<h2 id="known-limitations-1">Known Limitations</h2>
+<p>None</p>
+<h2 id="backward-compatibility-1">Backward Compatibility</h2>
 <p>No Break of compatibility with V2.4.0</p>
 </div>
 </div>
 <div class="collapse">
 <input type="checkbox" id="collapse-section7" aria-hidden="true"> <label for="collapse-section7" aria-hidden="true">V2.4.0 / 27-July-2020</label>
 <div>
-<h2 id="main-changes-1">Main Changes</h2>
+<h2 id="main-changes-2">Main Changes</h2>
 <ul>
 <li><p>Fix for IT management with firewall.</p></li>
 <li><p>Minor update with no functional impact.</p></li>
 </ul>
-<h2 id="known-limitations-1">Known Limitations</h2>
+<h2 id="known-limitations-2">Known Limitations</h2>
 <p>None</p>
-<h2 id="backward-compatibility-1">Backward Compatibility</h2>
+<h2 id="backward-compatibility-2">Backward Compatibility</h2>
 <p>None</p>
 </div>
 </div>
 <div class="collapse">
 <input type="checkbox" id="collapse-section6" aria-hidden="true"> <label for="collapse-section6" aria-hidden="true">V2.2.0 / 12-June-2020</label>
 <div>
-<h2 id="main-changes-2">Main Changes</h2>
+<h2 id="main-changes-3">Main Changes</h2>
 <ul>
 <li><p><strong>Management of interruption during code execution inside the firewall</strong> is now supported for applications with high real time constraints. IRQ are no more disabled when entering into the isolated code environment, when IT_MANAGEMENT compilation switch is enable.</p></li>
-<li><p>Add <strong>multi-images support</strong>:</p>
+<li>Add <strong>multi-images support</strong>:
 <ul>
 <li>A maximum of 3 active images and 3 download areas can be configured.</li>
 <li>Slot number parameter is added to the service SE_APPLI_GetActiveFwInfo().</li>
 <li>Control for read/write/erase operations are extended to the 3 active images headers.</li>
 <li>For each active image, authentication, decryption and integrity are controlled with specific keys.</li>
 </ul></li>
-<li><p>Add <strong>image state handling</strong> feature:</p>
+<li>Add <strong>image state handling</strong> feature:
 <ul>
 <li>State information are added in the firmware header: FWIMG_STATE_NEW, FWIMG_STATE_SELFTEST, FWIMG_STATE_INVALID, FWIMG_STATE_VALID, FWIMG_STATE_VALID_ALL.</li>
 <li>New services added: SE_IMG_GetActiveFwState(), SE_IMG_SetActiveFwState(), SE_APP_ValidateFw().</li>
@@ -112,7 +123,7 @@ <h2 id="main-changes-2">Main Changes</h2>
 <li>FWIMG_STATE_SELFTEST -&gt; FWIMG_STATE_VALID_ALL : the active image identified as MASTER will validate all new installed active images in a single operation.</li>
 </ul></li>
 </ul></li>
-<li><p>Update prepare image tools to support:</p>
+<li>Update prepare image tools to support:
 <ul>
 <li>New examples mapping configuration:
 <ul>
@@ -129,21 +140,21 @@ <h2 id="main-changes-2">Main Changes</h2>
 </ul></li>
 <li><p>For CKS_ENABLED feature (P-NUCLEO-WB55.Nucleo): the lock of CM0 keys is now done during execution of SE_LOCK_RESTRICT_SERVICES just before jumping into user application.</p></li>
 </ul>
-<h2 id="known-limitations-2">Known Limitations</h2>
+<h2 id="known-limitations-3">Known Limitations</h2>
 <p>None</p>
-<h2 id="backward-compatibility-2">Backward Compatibility</h2>
+<h2 id="backward-compatibility-3">Backward Compatibility</h2>
 <p>Break of compatibility with V2.1.0</p>
 </div>
 </div>
 <div class="collapse">
 <input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">V2.1.0 / 17-January-2020</label>
 <div>
-<h2 id="main-changes-3">Main Changes</h2>
+<h2 id="main-changes-4">Main Changes</h2>
 <ul>
 <li><p>Management of <strong>header not contiguous with firmware</strong> for external flash : when slot0 is mapped in external flash, header of slot0 must be contiguous to SBSFU area, in order to be protected by secure memory</p></li>
 <li><p>New Secure Engine service (SECBOOT_ECCDSA_WITH_AES128_CTR_SHA256) for <strong>initialization of OTFDEC with symmetric keys</strong> ; AES CTR cryptographic scheme is required for external flash with OTFDEC variant</p></li>
-<li><p>Update of <strong>prepareimage.py utility</strong> to support :<br />
-</p>
+<li>Update of <strong>prepareimage.py utility</strong> to support :<br />
+
 <ul>
 <li>partial image update<br />
 </li>
@@ -155,32 +166,32 @@ <h2 id="main-changes-3">Main Changes</h2>
 </ul></li>
 <li><p>Changes in <strong>management of exceptions for STM32 series supporting Flash ECC error</strong> (STM32L4, STM32G0, STM32G4, STM32H7 and STM32WB series) : fix on double ecc error management</p></li>
 </ul>
-<h2 id="known-limitations-3">Known Limitations</h2>
+<h2 id="known-limitations-4">Known Limitations</h2>
 <p>None</p>
-<h2 id="backward-compatibility-3">Backward Compatibility</h2>
+<h2 id="backward-compatibility-4">Backward Compatibility</h2>
 <p>Break of compatibility with V2.0.0</p>
 </div>
 </div>
 <div class="collapse">
 <input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true">V2.0.0 / 13-July-2019</label>
 <div>
-<h2 id="main-changes-4">Main Changes</h2>
+<h2 id="main-changes-5">Main Changes</h2>
 <p><strong>General improvements (software counter measures) against software attacks and against basic hardware faults injection</strong></p>
 <p>Secure Engine extended with <strong>Key Management Services</strong>, replacing former secure engine crypto services when KMS feature is enabled</p>
 <p>Add SE_IMG_Erase API to be able to erase slot #0 header: mandatory for NUCLEO-L073RZ (specific behavior of STM32L0 flash interface : writing instructions during erasing sequence)</p>
 <p>prepareimage.py utility updated to support :<br />
 - partial image update<br />
 - pairing keys, for communication with STSAFE-A100</p>
-<h2 id="known-limitations-4">Known Limitations</h2>
+<h2 id="known-limitations-5">Known Limitations</h2>
 <p>None</p>
-<h2 id="backward-compatibility-4">Backward Compatibility</h2>
+<h2 id="backward-compatibility-5">Backward Compatibility</h2>
 <p>Break of compatibility with V1.2.0</p>
 </div>
 </div>
 <div class="collapse">
 <input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.2.0 / 14-December-2018</label>
 <div>
-<h2 id="main-changes-5">Main Changes</h2>
+<h2 id="main-changes-6">Main Changes</h2>
 <p>prepareimage/key/translate_key scripts improvements :<br />
 - Quicker execution timing.<br />
 - Support of big elf in order to be able to flash SBSFU+ UserApp from IDE : refer to AN5056 for more details.<br />
@@ -191,14 +202,14 @@ <h2 id="main-changes-5">Main Changes</h2>
 <p>Security controls added :<br />
 - Check the mapping of the data given as parameters toSecure Engine services (SE_BufferCheck_SBSFU() /SE_BufferCheck_in_se_ram()).<br />
 - Clean Secure Engine RAM data (SE_LL_CORE_Cleanup())when leaving SBSFU (SE_LockRestrictServices()).</p>
-<h2 id="known-limitations-5">Known Limitations</h2>
+<h2 id="known-limitations-6">Known Limitations</h2>
 <p>None</p>
 </div>
 </div>
 <div class="collapse">
 <input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.1.0 / 20-April-2018</label>
 <div>
-<h2 id="main-changes-6">Main Changes</h2>
+<h2 id="main-changes-7">Main Changes</h2>
 <p>Multiple crypto scheme implemented under compilation switch (se_crypto_config.h) :<br />
 - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM: symmetric crypto.<br />
 - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256(default config) : asymmetric crypto with encrypted (AES128-CBC)Firmware.<br />
@@ -210,24 +221,23 @@ <h2 id="main-changes-6">Main Changes</h2>
 - Windows executable version of the python scripts available : This is now the default tooling for pre/post build actions (so python not mandatory any more)</p>
 <p>Secure Engine now using its own stack inside protected area</p>
 <p>Files structure updated to provide more feature modularity and feature customization flexibility</p>
-<h2 id="known-limitations-6">Known Limitations</h2>
+<h2 id="known-limitations-7">Known Limitations</h2>
 <p>None</p>
 </div>
 </div>
 <div class="collapse">
 <input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0 / 1-December-2017</label>
 <div>
-<h2 id="main-changes-7">Main Changes</h2>
+<h2 id="main-changes-8">Main Changes</h2>
 <h3 id="first-release">First release</h3>
-<h2 id="known-limitations-7">Known Limitations</h2>
+<h2 id="known-limitations-8">Known Limitations</h2>
 <p>None</p>
 </div>
 </div>
-</section>
+</div>
 </div>
 <footer class="sticky">
-<p>For complete documentation on STM32 Microcontrollers, visit: [<a href="http://www.st.com/STM32">www.st.com/stm32</a>]</p>
-<em>This release note uses up to date web standards and, for this reason, should not be opened with Internet Explorer but preferably with popular browsers such as Google Chrome, Mozilla Firefox, Opera or Microsoft Edge.</em>
+For complete documentation on <strong>Security framework for STM32 series</strong>, visit: <a href="https://www.st.com/stm32trust">STM32Trust</a>
 </footer>
 </body>
 </html>
diff --git a/Middlewares/ST/STM32_Secure_Engine/_htmresc/favicon.png b/Middlewares/ST/STM32_Secure_Engine/_htmresc/favicon.png
new file mode 100644
index 00000000..06713eec
Binary files /dev/null and b/Middlewares/ST/STM32_Secure_Engine/_htmresc/favicon.png differ
diff --git a/Middlewares/ST/STM32_Secure_Engine/_htmresc/mini-st.css b/Middlewares/ST/STM32_Secure_Engine/_htmresc/mini-st.css
deleted file mode 100644
index eb41d56c..00000000
--- a/Middlewares/ST/STM32_Secure_Engine/_htmresc/mini-st.css
+++ /dev/null
@@ -1,1700 +0,0 @@
-@charset "UTF-8";
-/*
-  Flavor name: Default (mini-default)
-  Author: Angelos Chalaris (chalarangelo@gmail.com)
-  Maintainers: Angelos Chalaris
-  mini.css version: v3.0.0-alpha.3
-*/
-/*
-  Browsers resets and base typography.
-*/
-/* Core module CSS variable definitions */
-:root {
-  --fore-color: #111;
-  --secondary-fore-color: #444;
-  --back-color: #f8f8f8;
-  --secondary-back-color: #f0f0f0;
-  --blockquote-color: #f57c00;
-  --pre-color: #1565c0;
-  --border-color: #aaa;
-  --secondary-border-color: #ddd;
-  --heading-ratio: 1.19;
-  --universal-margin: 0.5rem;
-  --universal-padding: 0.125rem;
-  --universal-border-radius: 0.125rem;
-  --a-link-color: #0277bd;
-  --a-visited-color: #01579b; }
-
-html {
-  font-size: 14px; }
-
-a, b, del, em, i, ins, q, span, strong, u {
-  font-size: 1em; }
-
-html, * {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Helvetica, sans-serif;
-  line-height: 1.4;
-  -webkit-text-size-adjust: 100%; }
-
-* {
-  font-size: 1rem; }
-
-body {
-  margin: 0;
-  color: var(--fore-color);
-  background: var(--back-color); }
-
-details {
-  display: block; }
-
-summary {
-  display: list-item; }
-
-abbr[title] {
-  border-bottom: none;
-  text-decoration: underline dotted; }
-
-input {
-  overflow: visible; }
-
-img {
-  max-width: 100%;
-  height: auto; }
-
-h1, h2, h3, h4, h5, h6 {
-  line-height: 1.2;
-  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  font-weight: 500; }
-  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-    color: var(--secondary-fore-color);
-    display: block;
-    margin-top: -0.25rem; }
-
-h1 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
-
-h2 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio); );
-  background: var(--mark-back-color);
-  font-weight: 600;
-  padding: 0.1em 0.5em 0.2em 0.5em;
-  color: var(--mark-fore-color); }
-
-h3 {
-  font-size: calc(1rem * var(--heading-ratio));
-  padding-left: calc(2 * var(--universal-margin)); 
-  /* background: var(--border-color); */
-    }
-
-h4 {
-  font-size: 1rem;);
-  padding-left: calc(4 * var(--universal-margin));  }
-
-h5 {
-  font-size: 1rem; }
-
-h6 {
-  font-size: calc(1rem / var(--heading-ratio)); }
-
-p {
-  margin: var(--universal-margin); }
-
-ol, ul {
-  margin: var(--universal-margin);
-  padding-left: calc(6 * var(--universal-margin)); }
-
-b, strong {
-  font-weight: 700; }
-
-hr {
-  box-sizing: content-box;
-  border: 0;
-  line-height: 1.25em;
-  margin: var(--universal-margin);
-  height: 0.0625rem;
-  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
-
-blockquote {
-  display: block;
-  position: relative;
-  font-style: italic;
-  color: var(--secondary-fore-color);
-  margin: var(--universal-margin);
-  padding: calc(3 * var(--universal-padding));
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.375rem solid var(--blockquote-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-  blockquote:before {
-    position: absolute;
-    top: calc(0rem - var(--universal-padding));
-    left: 0;
-    font-family: sans-serif;
-    font-size: 3rem;
-    font-weight: 700;
-    content: "\201c";
-    color: var(--blockquote-color); }
-  blockquote[cite]:after {
-    font-style: normal;
-    font-size: 0.75em;
-    font-weight: 700;
-    content: "\a—  " attr(cite);
-    white-space: pre; }
-
-code, kbd, pre, samp {
-  font-family: Menlo, Consolas, monospace;
-  font-size: 0.85em; }
-
-code {
-  background: var(--secondary-back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-kbd {
-  background: var(--fore-color);
-  color: var(--back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-pre {
-  overflow: auto;
-  background: var(--secondary-back-color);
-  padding: calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.25rem solid var(--pre-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-
-sup, sub, code, kbd {
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
-small, sup, sub, figcaption {
-  font-size: 0.75em; }
-
-sup {
-  top: -0.5em; }
-
-sub {
-  bottom: -0.25em; }
-
-figure {
-  margin: var(--universal-margin); }
-
-figcaption {
-  color: var(--secondary-fore-color); }
-
-a {
-  text-decoration: none; }
-  a:link {
-    color: var(--a-link-color); }
-  a:visited {
-    color: var(--a-visited-color); }
-  a:hover, a:focus {
-    text-decoration: underline; }
-
-/*
-  Definitions for the grid system, cards and containers.
-*/
-.container {
-  margin: 0 auto;
-  padding: 0 calc(1.5 * var(--universal-padding)); }
-
-.row {
-  box-sizing: border-box;
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap; }
-
-.col-sm,
-[class^='col-sm-'],
-[class^='col-sm-offset-'],
-.row[class*='cols-sm-'] > * {
-  box-sizing: border-box;
-  flex: 0 0 auto;
-  padding: 0 calc(var(--universal-padding) / 2); }
-
-.col-sm,
-.row.cols-sm > * {
-  max-width: 100%;
-  flex-grow: 1;
-  flex-basis: 0; }
-
-.col-sm-1,
-.row.cols-sm-1 > * {
-  max-width: 8.3333333333%;
-  flex-basis: 8.3333333333%; }
-
-.col-sm-offset-0 {
-  margin-left: 0; }
-
-.col-sm-2,
-.row.cols-sm-2 > * {
-  max-width: 16.6666666667%;
-  flex-basis: 16.6666666667%; }
-
-.col-sm-offset-1 {
-  margin-left: 8.3333333333%; }
-
-.col-sm-3,
-.row.cols-sm-3 > * {
-  max-width: 25%;
-  flex-basis: 25%; }
-
-.col-sm-offset-2 {
-  margin-left: 16.6666666667%; }
-
-.col-sm-4,
-.row.cols-sm-4 > * {
-  max-width: 33.3333333333%;
-  flex-basis: 33.3333333333%; }
-
-.col-sm-offset-3 {
-  margin-left: 25%; }
-
-.col-sm-5,
-.row.cols-sm-5 > * {
-  max-width: 41.6666666667%;
-  flex-basis: 41.6666666667%; }
-
-.col-sm-offset-4 {
-  margin-left: 33.3333333333%; }
-
-.col-sm-6,
-.row.cols-sm-6 > * {
-  max-width: 50%;
-  flex-basis: 50%; }
-
-.col-sm-offset-5 {
-  margin-left: 41.6666666667%; }
-
-.col-sm-7,
-.row.cols-sm-7 > * {
-  max-width: 58.3333333333%;
-  flex-basis: 58.3333333333%; }
-
-.col-sm-offset-6 {
-  margin-left: 50%; }
-
-.col-sm-8,
-.row.cols-sm-8 > * {
-  max-width: 66.6666666667%;
-  flex-basis: 66.6666666667%; }
-
-.col-sm-offset-7 {
-  margin-left: 58.3333333333%; }
-
-.col-sm-9,
-.row.cols-sm-9 > * {
-  max-width: 75%;
-  flex-basis: 75%; }
-
-.col-sm-offset-8 {
-  margin-left: 66.6666666667%; }
-
-.col-sm-10,
-.row.cols-sm-10 > * {
-  max-width: 83.3333333333%;
-  flex-basis: 83.3333333333%; }
-
-.col-sm-offset-9 {
-  margin-left: 75%; }
-
-.col-sm-11,
-.row.cols-sm-11 > * {
-  max-width: 91.6666666667%;
-  flex-basis: 91.6666666667%; }
-
-.col-sm-offset-10 {
-  margin-left: 83.3333333333%; }
-
-.col-sm-12,
-.row.cols-sm-12 > * {
-  max-width: 100%;
-  flex-basis: 100%; }
-
-.col-sm-offset-11 {
-  margin-left: 91.6666666667%; }
-
-.col-sm-normal {
-  order: initial; }
-
-.col-sm-first {
-  order: -999; }
-
-.col-sm-last {
-  order: 999; }
-
-@media screen and (min-width: 500px) {
-  .col-md,
-  [class^='col-md-'],
-  [class^='col-md-offset-'],
-  .row[class*='cols-md-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-md,
-  .row.cols-md > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-md-1,
-  .row.cols-md-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-md-offset-0 {
-    margin-left: 0; }
-
-  .col-md-2,
-  .row.cols-md-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-md-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-md-3,
-  .row.cols-md-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-md-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-md-4,
-  .row.cols-md-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-md-offset-3 {
-    margin-left: 25%; }
-
-  .col-md-5,
-  .row.cols-md-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-md-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-md-6,
-  .row.cols-md-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-md-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-md-7,
-  .row.cols-md-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-md-offset-6 {
-    margin-left: 50%; }
-
-  .col-md-8,
-  .row.cols-md-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-md-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-md-9,
-  .row.cols-md-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-md-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-md-10,
-  .row.cols-md-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-md-offset-9 {
-    margin-left: 75%; }
-
-  .col-md-11,
-  .row.cols-md-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-md-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-md-12,
-  .row.cols-md-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-md-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-md-normal {
-    order: initial; }
-
-  .col-md-first {
-    order: -999; }
-
-  .col-md-last {
-    order: 999; } }
-@media screen and (min-width: 1280px) {
-  .col-lg,
-  [class^='col-lg-'],
-  [class^='col-lg-offset-'],
-  .row[class*='cols-lg-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-lg,
-  .row.cols-lg > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-lg-1,
-  .row.cols-lg-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-lg-offset-0 {
-    margin-left: 0; }
-
-  .col-lg-2,
-  .row.cols-lg-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-lg-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-lg-3,
-  .row.cols-lg-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-lg-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-lg-4,
-  .row.cols-lg-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-lg-offset-3 {
-    margin-left: 25%; }
-
-  .col-lg-5,
-  .row.cols-lg-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-lg-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-lg-6,
-  .row.cols-lg-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-lg-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-lg-7,
-  .row.cols-lg-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-lg-offset-6 {
-    margin-left: 50%; }
-
-  .col-lg-8,
-  .row.cols-lg-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-lg-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-lg-9,
-  .row.cols-lg-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-lg-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-lg-10,
-  .row.cols-lg-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-lg-offset-9 {
-    margin-left: 75%; }
-
-  .col-lg-11,
-  .row.cols-lg-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-lg-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-lg-12,
-  .row.cols-lg-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-lg-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-lg-normal {
-    order: initial; }
-
-  .col-lg-first {
-    order: -999; }
-
-  .col-lg-last {
-    order: 999; } }
-/* Card component CSS variable definitions */
-:root {
-  --card-back-color: #f8f8f8;
-  --card-fore-color: #111;
-  --card-border-color: #ddd; }
-
-.card {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-self: center;
-  position: relative;
-  width: 100%;
-  background: var(--card-back-color);
-  color: var(--card-fore-color);
-  border: 0.0625rem solid var(--card-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  overflow: hidden; }
-  @media screen and (min-width: 320px) {
-    .card {
-      max-width: 320px; } }
-  .card > .sectione {
-    background: var(--card-back-color);
-    color: var(--card-fore-color);
-    box-sizing: border-box;
-    margin: 0;
-    border: 0;
-    border-radius: 0;
-    border-bottom: 0.0625rem solid var(--card-border-color);
-    padding: var(--universal-padding);
-    width: 100%; }
-    .card > .sectione.media {
-      height: 200px;
-      padding: 0;
-      -o-object-fit: cover;
-      object-fit: cover; }
-  .card > .sectione:last-child {
-    border-bottom: 0; }
-
-/*
-  Custom elements for card elements.
-*/
-@media screen and (min-width: 240px) {
-  .card.small {
-    max-width: 240px; } }
-@media screen and (min-width: 480px) {
-  .card.large {
-    max-width: 480px; } }
-.card.fluid {
-  max-width: 100%;
-  width: auto; }
-
-.card.warning {
-/*  --card-back-color: #ffca28; */
-  --card-back-color: #e5b8b7;
-  --card-border-color: #e8b825; }
-
-.card.error {
-  --card-back-color: #b71c1c;
-  --card-fore-color: #f8f8f8;
-  --card-border-color: #a71a1a; }
-
-.card > .sectione.dark {
-  --card-back-color: #e0e0e0; }
-
-.card > .sectione.double-padded {
-  padding: calc(1.5 * var(--universal-padding)); }
-
-/*
-  Definitions for forms and input elements.
-*/
-/* Input_control module CSS variable definitions */
-:root {
-  --form-back-color: #f0f0f0;
-  --form-fore-color: #111;
-  --form-border-color: #ddd;
-  --input-back-color: #f8f8f8;
-  --input-fore-color: #111;
-  --input-border-color: #ddd;
-  --input-focus-color: #0288d1;
-  --input-invalid-color: #d32f2f;
-  --button-back-color: #e2e2e2;
-  --button-hover-back-color: #dcdcdc;
-  --button-fore-color: #212121;
-  --button-border-color: transparent;
-  --button-hover-border-color: transparent;
-  --button-group-border-color: rgba(124, 124, 124, 0.54); }
-
-form {
-  background: var(--form-back-color);
-  color: var(--form-fore-color);
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
-
-fieldset {
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 4);
-  padding: var(--universal-padding); }
-
-legend {
-  box-sizing: border-box;
-  display: table;
-  max-width: 100%;
-  white-space: normal;
-  font-weight: 700;
-  padding: calc(var(--universal-padding) / 2); }
-
-label {
-  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-.input-group {
-  display: inline-block; }
-  .input-group.fluid {
-    display: flex;
-    align-items: center;
-    justify-content: center; }
-    .input-group.fluid > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-    @media screen and (max-width: 499px) {
-      .input-group.fluid {
-        align-items: stretch;
-        flex-direction: column; } }
-  .input-group.vertical {
-    display: flex;
-    align-items: stretch;
-    flex-direction: column; }
-    .input-group.vertical > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-
-[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
-  height: auto; }
-
-[type="search"] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px; }
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
-
-input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
-[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
-  box-sizing: border-box;
-  background: var(--input-back-color);
-  color: var(--input-fore-color);
-  border: 0.0625rem solid var(--input-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 2);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
-  border-color: var(--input-focus-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
-  border-color: var(--input-invalid-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
-  background: var(--secondary-back-color); }
-
-select {
-  max-width: 100%; }
-
-option {
-  overflow: hidden;
-  text-overflow: ellipsis; }
-
-[type="checkbox"], [type="radio"] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  position: relative;
-  height: calc(1rem + var(--universal-padding) / 2);
-  width: calc(1rem + var(--universal-padding) / 2);
-  vertical-align: text-bottom;
-  padding: 0;
-  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
-  flex-grow: 0 !important; }
-  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
-    position: absolute; }
-
-[type="checkbox"]:checked:before {
-  content: '\2713';
-  font-family: sans-serif;
-  font-size: calc(1rem + var(--universal-padding) / 2);
-  top: calc(0rem - var(--universal-padding));
-  left: calc(var(--universal-padding) / 4); }
-
-[type="radio"] {
-  border-radius: 100%; }
-  [type="radio"]:checked:before {
-    border-radius: 100%;
-    content: '';
-    top: calc(0.0625rem + var(--universal-padding) / 2);
-    left: calc(0.0625rem + var(--universal-padding) / 2);
-    background: var(--input-fore-color);
-    width: 0.5rem;
-    height: 0.5rem; }
-
-:placeholder-shown {
-  color: var(--input-fore-color); }
-
-::-ms-placeholder {
-  color: var(--input-fore-color);
-  opacity: 0.54; }
-
-button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-button, html [type="button"], [type="reset"], [type="submit"] {
-  -webkit-appearance: button; }
-
-button {
-  overflow: visible;
-  text-transform: none; }
-
-button, [type="button"], [type="submit"], [type="reset"],
-a.button, label.button, .button,
-a[role="button"], label[role="button"], [role="button"] {
-  display: inline-block;
-  background: var(--button-back-color);
-  color: var(--button-fore-color);
-  border: 0.0625rem solid var(--button-border-color);
-  border-radius: var(--universal-border-radius);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  text-decoration: none;
-  cursor: pointer;
-  transition: background 0.3s; }
-  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
-  a.button:hover,
-  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
-  a[role="button"]:hover,
-  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
-    background: var(--button-hover-back-color);
-    border-color: var(--button-hover-border-color); }
-
-input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
-  cursor: not-allowed;
-  opacity: 0.75; }
-
-.button-group {
-  display: flex;
-  border: 0.0625rem solid var(--button-group-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
-    margin: 0;
-    max-width: 100%;
-    flex: 1 1 auto;
-    text-align: center;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none; }
-  .button-group > :not(:first-child) {
-    border-left: 0.0625rem solid var(--button-group-border-color); }
-  @media screen and (max-width: 499px) {
-    .button-group {
-      flex-direction: column; }
-      .button-group > :not(:first-child) {
-        border: 0;
-        border-top: 0.0625rem solid var(--button-group-border-color); } }
-
-/*
-  Custom elements for forms and input elements.
-*/
-button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
-  --button-back-color: #1976d2;
-  --button-fore-color: #f8f8f8; }
-  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
-    --button-hover-back-color: #1565c0; }
-
-button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
-  --button-back-color: #d32f2f;
-  --button-fore-color: #f8f8f8; }
-  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
-    --button-hover-back-color: #c62828; }
-
-button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
-  --button-back-color: #308732;
-  --button-fore-color: #f8f8f8; }
-  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
-    --button-hover-back-color: #277529; }
-
-button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
-  --button-back-color: #212121;
-  --button-fore-color: #f8f8f8; }
-  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
-    --button-hover-back-color: #111; }
-
-button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
-  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
-  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-/*
-  Definitions for navigation elements.
-*/
-/* Navigation module CSS variable definitions */
-:root {
-  --header-back-color: #f8f8f8;
-  --header-hover-back-color: #f0f0f0;
-  --header-fore-color: #444;
-  --header-border-color: #ddd;
-  --nav-back-color: #f8f8f8;
-  --nav-hover-back-color: #f0f0f0;
-  --nav-fore-color: #444;
-  --nav-border-color: #ddd;
-  --nav-link-color: #0277bd;
-  --footer-fore-color: #444;
-  --footer-back-color: #f8f8f8;
-  --footer-border-color: #ddd;
-  --footer-link-color: #0277bd;
-  --drawer-back-color: #f8f8f8;
-  --drawer-hover-back-color: #f0f0f0;
-  --drawer-border-color: #ddd;
-  --drawer-close-color: #444; }
-
-header {
-  height: 3.1875rem;
-  background: var(--header-back-color);
-  color: var(--header-fore-color);
-  border-bottom: 0.0625rem solid var(--header-border-color);
-  padding: calc(var(--universal-padding) / 4) 0;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden; }
-  header.row {
-    box-sizing: content-box; }
-  header .logo {
-    color: var(--header-fore-color);
-    font-size: 1.75rem;
-    padding: var(--universal-padding) calc(2 * var(--universal-padding));
-    text-decoration: none; }
-  header button, header [type="button"], header .button, header [role="button"] {
-    box-sizing: border-box;
-    position: relative;
-    top: calc(0rem - var(--universal-padding) / 4);
-    height: calc(3.1875rem + var(--universal-padding) / 2);
-    background: var(--header-back-color);
-    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
-    text-align: center;
-    color: var(--header-fore-color);
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-    text-transform: uppercase; }
-    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
-      background: var(--header-hover-back-color); }
-
-nav {
-  background: var(--nav-back-color);
-  color: var(--nav-fore-color);
-  border: 0.0625rem solid var(--nav-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  nav * {
-    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-  nav a, nav a:visited {
-    display: block;
-    color: var(--nav-link-color);
-    border-radius: var(--universal-border-radius);
-    transition: background 0.3s; }
-    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
-      text-decoration: none;
-      background: var(--nav-hover-back-color); }
-  nav .sublink-1 {
-    position: relative;
-    margin-left: calc(2 * var(--universal-padding)); }
-    nav .sublink-1:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-  nav .sublink-2 {
-    position: relative;
-    margin-left: calc(4 * var(--universal-padding)); }
-    nav .sublink-2:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-
-footer {
-  background: var(--footer-back-color);
-  color: var(--footer-fore-color);
-  border-top: 0.0625rem solid var(--footer-border-color);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
-  font-size: 0.875rem; }
-  footer a, footer a:visited {
-    color: var(--footer-link-color); }
-
-header.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  top: 0; }
-
-footer.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  bottom: 0; }
-
-.drawer-toggle:before {
-  display: inline-block;
-  position: relative;
-  vertical-align: bottom;
-  content: '\00a0\2261\00a0';
-  font-family: sans-serif;
-  font-size: 1.5em; }
-@media screen and (min-width: 500px) {
-  .drawer-toggle:not(.persistent) {
-    display: none; } }
-
-[type="checkbox"].drawer {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].drawer + * {
-    display: block;
-    box-sizing: border-box;
-    position: fixed;
-    top: 0;
-    width: 320px;
-    height: 100vh;
-    overflow-y: auto;
-    background: var(--drawer-back-color);
-    border: 0.0625rem solid var(--drawer-border-color);
-    border-radius: 0;
-    margin: 0;
-    z-index: 1110;
-    right: -320px;
-    transition: right 0.3s; }
-    [type="checkbox"].drawer + * .drawer-close {
-      position: absolute;
-      top: var(--universal-margin);
-      right: var(--universal-margin);
-      z-index: 1111;
-      width: 2rem;
-      height: 2rem;
-      border-radius: var(--universal-border-radius);
-      padding: var(--universal-padding);
-      margin: 0;
-      cursor: pointer;
-      transition: background 0.3s; }
-      [type="checkbox"].drawer + * .drawer-close:before {
-        display: block;
-        content: '\00D7';
-        color: var(--drawer-close-color);
-        position: relative;
-        font-family: sans-serif;
-        font-size: 2rem;
-        line-height: 1;
-        text-align: center; }
-      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
-        background: var(--drawer-hover-back-color); }
-    @media screen and (max-width: 320px) {
-      [type="checkbox"].drawer + * {
-        width: 100%; } }
-  [type="checkbox"].drawer:checked + * {
-    right: 0; }
-  @media screen and (min-width: 500px) {
-    [type="checkbox"].drawer:not(.persistent) + * {
-      position: static;
-      height: 100%;
-      z-index: 1100; }
-      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
-        display: none; } }
-
-/*
-  Definitions for the responsive table component.
-*/
-/* Table module CSS variable definitions. */
-:root {
-  --table-border-color: #aaa;
-  --table-border-separator-color: #666;
-  --table-head-back-color: #e6e6e6;
-  --table-head-fore-color: #111;
-  --table-body-back-color: #f8f8f8;
-  --table-body-fore-color: #111;
-  --table-body-alt-back-color: #eee; }
-
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  : margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap;
-  padding: var(--universal-padding);
-  padding-top: 0;
-	margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);	}
-  table caption {
-    font-size: 1.25 * rem;
-    margin: calc(2 * var(--universal-margin)) 0;
-    max-width: 100%;
-    flex: 0 0 100%;
-		text-align: left;}
-  table thead, table tbody {
-    display: flex;
-    flex-flow: row wrap;
-    border: 0.0625rem solid var(--table-border-color); }
-  table thead {
-    z-index: 999;
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
-    border-bottom: 0.0625rem solid var(--table-border-separator-color); }
-  table tbody {
-    border-top: 0;
-    margin-top: calc(0 - var(--universal-margin));
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  table tr {
-    display: flex;
-    padding: 0; }
-  table th, table td {
-    padding: calc(0.5 * var(--universal-padding));
-		font-size: 0.9rem; }
-  table th {
-    text-align: left;
-    background: var(--table-head-back-color);
-    color: var(--table-head-fore-color); }
-  table td {
-    background: var(--table-body-back-color);
-    color: var(--table-body-fore-color);
-    border-top: 0.0625rem solid var(--table-border-color); }
-
-table:not(.horizontal) {
-  overflow: auto;
-  max-height: 850px; }
-  table:not(.horizontal) thead, table:not(.horizontal) tbody {
-    max-width: 100%;
-    flex: 0 0 100%; }
-  table:not(.horizontal) tr {
-    flex-flow: row wrap;
-    flex: 0 0 100%; }
-  table:not(.horizontal) th, table:not(.horizontal) td {
-    flex: 1 0 0%;
-    overflow: hidden;
-    text-overflow: ellipsis; }
-  table:not(.horizontal) thead {
-    position: sticky;
-    top: 0; }
-  table:not(.horizontal) tbody tr:first-child td {
-    border-top: 0; }
-
-table.horizontal {
-  border: 0; }
-  table.horizontal thead, table.horizontal tbody {
-    border: 0;
-    flex-flow: row nowrap; }
-  table.horizontal tbody {
-    overflow: auto;
-    justify-content: space-between;
-    flex: 1 0 0;
-    margin-left: calc( 4 * var(--universal-margin));
-    padding-bottom: calc(var(--universal-padding) / 4); }
-  table.horizontal tr {
-    flex-direction: column;
-    flex: 1 0 auto; }
-  table.horizontal th, table.horizontal td {
-    width: 100%;
-    border: 0;
-    border-bottom: 0.0625rem solid var(--table-border-color); }
-    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
-      border-top: 0; }
-  table.horizontal th {
-    text-align: right;
-    border-left: 0.0625rem solid var(--table-border-color);
-    border-right: 0.0625rem solid var(--table-border-separator-color); }
-  table.horizontal thead tr:first-child {
-    padding-left: 0; }
-  table.horizontal th:first-child, table.horizontal td:first-child {
-    border-top: 0.0625rem solid var(--table-border-color); }
-  table.horizontal tbody tr:last-child td {
-    border-right: 0.0625rem solid var(--table-border-color); }
-    table.horizontal tbody tr:last-child td:first-child {
-      border-top-right-radius: 0.25rem; }
-    table.horizontal tbody tr:last-child td:last-child {
-      border-bottom-right-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:first-child {
-    border-top-left-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:last-child {
-    border-bottom-left-radius: 0.25rem; }
-
-@media screen and (max-width: 499px) {
-  table, table.horizontal {
-    border-collapse: collapse;
-    border: 0;
-    width: 100%;
-    display: table; }
-    table thead, table th, table.horizontal thead, table.horizontal th {
-      border: 0;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      padding: 0;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%); }
-    table tbody, table.horizontal tbody {
-      border: 0;
-      display: table-row-group; }
-    table tr, table.horizontal tr {
-      display: block;
-      border: 0.0625rem solid var(--table-border-color);
-      border-radius: var(--universal-border-radius);
-      background: #fafafa;
-      padding: var(--universal-padding);
-      margin: var(--universal-margin);
-      margin-bottom: calc(2 * var(--universal-margin)); }
-    table th, table td, table.horizontal th, table.horizontal td {
-      width: auto; }
-    table td, table.horizontal td {
-      display: block;
-      border: 0;
-      text-align: right; }
-    table td:before, table.horizontal td:before {
-      content: attr(data-label);
-      float: left;
-      font-weight: 600; }
-    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
-      border-top: 0; }
-    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
-      border-right: 0; } }
-:root {
-  --table-body-alt-back-color: #eee; }
-
-table tr:nth-of-type(2n) > td {
-  background: var(--table-body-alt-back-color); }
-
-@media screen and (max-width: 500px) {
-  table tr:nth-of-type(2n) {
-    background: var(--table-body-alt-back-color); } }
-:root {
-  --table-body-hover-back-color: #90caf9; }
-
-table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-  background: var(--table-body-hover-back-color); }
-
-@media screen and (max-width: 500px) {
-  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-    background: var(--table-body-hover-back-color); } }
-/*
-  Definitions for contextual background elements, toasts and tooltips.
-*/
-/* Contextual module CSS variable definitions */
-:root {
-  --mark-back-color: #0277bd;
-  --mark-fore-color: #fafafa; }
-
-mark {
-  background: var(--mark-back-color);
-  color: var(--mark-fore-color);
-  font-size: 0.95em;
-  line-height: 1em;
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-  mark.inline-block {
-    display: inline-block;
-    font-size: 1em;
-    line-height: 1.5;
-    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-:root {
-  --toast-back-color: #424242;
-  --toast-fore-color: #fafafa; }
-
-.toast {
-  position: fixed;
-  bottom: calc(var(--universal-margin) * 3);
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1111;
-  color: var(--toast-fore-color);
-  background: var(--toast-back-color);
-  border-radius: calc(var(--universal-border-radius) * 16);
-  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
-
-:root {
-  --tooltip-back-color: #212121;
-  --tooltip-fore-color: #fafafa; }
-
-.tooltip {
-  position: relative;
-  display: inline-block; }
-  .tooltip:before, .tooltip:after {
-    position: absolute;
-    opacity: 0;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%);
-    transition: all 0.3s;
-    z-index: 1010;
-    left: 50%; }
-  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
-    bottom: 75%; }
-  .tooltip.bottom:before, .tooltip.bottom:after {
-    top: 75%; }
-  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
-    opacity: 1;
-    clip: auto;
-    -webkit-clip-path: inset(0%);
-    clip-path: inset(0%); }
-  .tooltip:before {
-    content: '';
-    background: transparent;
-    border: var(--universal-margin) solid transparent;
-    left: calc(50% - var(--universal-margin)); }
-  .tooltip:not(.bottom):before {
-    border-top-color: #212121; }
-  .tooltip.bottom:before {
-    border-bottom-color: #212121; }
-  .tooltip:after {
-    content: attr(aria-label);
-    color: var(--tooltip-fore-color);
-    background: var(--tooltip-back-color);
-    border-radius: var(--universal-border-radius);
-    padding: var(--universal-padding);
-    white-space: nowrap;
-    transform: translateX(-50%); }
-  .tooltip:not(.bottom):after {
-    margin-bottom: calc(2 * var(--universal-margin)); }
-  .tooltip.bottom:after {
-    margin-top: calc(2 * var(--universal-margin)); }
-
-:root {
-  --modal-overlay-color: rgba(0, 0, 0, 0.45);
-  --modal-close-color: #444;
-  --modal-close-hover-color: #f0f0f0; }
-
-[type="checkbox"].modal {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].modal + div {
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: none;
-    width: 100vw;
-    height: 100vh;
-    background: var(--modal-overlay-color); }
-    [type="checkbox"].modal + div .card {
-      margin: 0 auto;
-      max-height: 50vh;
-      overflow: auto; }
-      [type="checkbox"].modal + div .card .modal-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 1.75rem;
-        height: 1.75rem;
-        border-radius: var(--universal-border-radius);
-        padding: var(--universal-padding);
-        margin: 0;
-        cursor: pointer;
-        transition: background 0.3s; }
-        [type="checkbox"].modal + div .card .modal-close:before {
-          display: block;
-          content: '\00D7';
-          color: var(--modal-close-color);
-          position: relative;
-          font-family: sans-serif;
-          font-size: 1.75rem;
-          line-height: 1;
-          text-align: center; }
-        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
-          background: var(--modal-close-hover-color); }
-  [type="checkbox"].modal:checked + div {
-    display: flex;
-    flex: 0 1 auto;
-    z-index: 1200; }
-    [type="checkbox"].modal:checked + div .card .modal-close {
-      z-index: 1211; }
-
-:root {
-  --collapse-label-back-color: #e8e8e8;
-  --collapse-label-fore-color: #212121;
-  --collapse-label-hover-back-color: #f0f0f0;
-  --collapse-selected-label-back-color: #ececec;
-  --collapse-border-color: #ddd;
-  --collapse-content-back-color: #fafafa;
-  --collapse-selected-label-border-color: #0277bd; }
-
-.collapse {
-  width: calc(100% - 2 * var(--universal-margin));
-  opacity: 1;
-  display: flex;
-  flex-direction: column;
-  margin: var(--universal-margin);
-  border-radius: var(--universal-border-radius); }
-  .collapse > [type="radio"], .collapse > [type="checkbox"] {
-    height: 1px;
-    width: 1px;
-    margin: -1px;
-    overflow: hidden;
-    position: absolute;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%); }
-  .collapse > label {
-    flex-grow: 1;
-    display: inline-block;
-    height: 1.5rem;
-    cursor: pointer;
-    transition: background 0.3s;
-    color: var(--collapse-label-fore-color);
-    background: var(--collapse-label-back-color);
-    border: 0.0625rem solid var(--collapse-border-color);
-    padding: calc(1.5 * var(--universal-padding)); }
-    .collapse > label:hover, .collapse > label:focus {
-      background: var(--collapse-label-hover-back-color); }
-    .collapse > label + div {
-      flex-basis: auto;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%);
-      transition: max-height 0.3s;
-      max-height: 1px; }
-  .collapse > :checked + label {
-    background: var(--collapse-selected-label-back-color);
-    border-bottom-color: var(--collapse-selected-label-border-color); }
-    .collapse > :checked + label + div {
-      box-sizing: border-box;
-      position: relative;
-      width: 100%;
-      height: auto;
-      overflow: auto;
-      margin: 0;
-      background: var(--collapse-content-back-color);
-      border: 0.0625rem solid var(--collapse-border-color);
-      border-top: 0;
-      padding: var(--universal-padding);
-      clip: auto;
-      -webkit-clip-path: inset(0%);
-      clip-path: inset(0%);
-      max-height: 850px; }
-  .collapse > label:not(:first-of-type) {
-    border-top: 0; }
-  .collapse > label:first-of-type {
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
-  .collapse > label:last-of-type:not(:first-of-type) {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  .collapse > label:last-of-type:first-of-type {
-    border-radius: var(--universal-border-radius); }
-  .collapse > :checked:last-of-type:not(:first-of-type) + label {
-    border-radius: 0; }
-  .collapse > :checked:last-of-type + label + div {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-
-/*
-  Custom elements for contextual background elements, toasts and tooltips.
-*/
-mark.secondary {
-  --mark-back-color: #d32f2f; }
-
-mark.tertiary {
-  --mark-back-color: #308732; }
-
-mark.tag {
-  padding: calc(var(--universal-padding)/2) var(--universal-padding);
-  border-radius: 1em; }
-
-/*
-  Definitions for progress elements and spinners.
-*/
-/* Progress module CSS variable definitions */
-:root {
-  --progress-back-color: #ddd;
-  --progress-fore-color: #555; }
-
-progress {
-  display: block;
-  vertical-align: baseline;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  height: 0.75rem;
-  width: calc(100% - 2 * var(--universal-margin));
-  margin: var(--universal-margin);
-  border: 0;
-  border-radius: calc(2 * var(--universal-border-radius));
-  background: var(--progress-back-color);
-  color: var(--progress-fore-color); }
-  progress::-webkit-progress-value {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress::-webkit-progress-bar {
-    background: var(--progress-back-color); }
-  progress::-moz-progress-bar {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-webkit-progress-value {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-moz-progress-bar {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress.inline {
-    display: inline-block;
-    vertical-align: middle;
-    width: 60%; }
-
-:root {
-  --spinner-back-color: #ddd;
-  --spinner-fore-color: #555; }
-
-@keyframes spinner-donut-anim {
-  0% {
-    transform: rotate(0deg); }
-  100% {
-    transform: rotate(360deg); } }
-.spinner {
-  display: inline-block;
-  margin: var(--universal-margin);
-  border: 0.25rem solid var(--spinner-back-color);
-  border-left: 0.25rem solid var(--spinner-fore-color);
-  border-radius: 50%;
-  width: 1.25rem;
-  height: 1.25rem;
-  animation: spinner-donut-anim 1.2s linear infinite; }
-
-/*
-  Custom elements for progress bars and spinners.
-*/
-progress.primary {
-  --progress-fore-color: #1976d2; }
-
-progress.secondary {
-  --progress-fore-color: #d32f2f; }
-
-progress.tertiary {
-  --progress-fore-color: #308732; }
-
-.spinner.primary {
-  --spinner-fore-color: #1976d2; }
-
-.spinner.secondary {
-  --spinner-fore-color: #d32f2f; }
-
-.spinner.tertiary {
-  --spinner-fore-color: #308732; }
-
-/*
-  Definitions for icons - powered by Feather (https://feathericons.com/).
-*/
-span[class^='icon-'] {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  vertical-align: -0.125em;
-  background-size: contain;
-  margin: 0 calc(var(--universal-margin) / 4); }
-  span[class^='icon-'].secondary {
-    -webkit-filter: invert(25%);
-    filter: invert(25%); }
-  span[class^='icon-'].inverse {
-    -webkit-filter: invert(100%);
-    filter: invert(100%); }
-
-span.icon-alert {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-bookmark {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-calendar {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-credit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-edit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
-span.icon-link {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-help {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-home {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-info {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-lock {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-mail {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-location {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-phone {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-rss {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-search {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-settings {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-share {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-cart {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-upload {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-user {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
-
-/*
-  Definitions for utilities and helper classes.
-*/
-/* Utility module CSS variable definitions */
-:root {
-  --generic-border-color: rgba(0, 0, 0, 0.3);
-  --generic-box-shadow: 0 0.25rem 0.25rem 0 rgba(0, 0, 0, 0.125), 0 0.125rem 0.125rem -0.125rem rgba(0, 0, 0, 0.25); }
-
-.hidden {
-  display: none !important; }
-
-.visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  margin: -1px !important;
-  border: 0 !important;
-  padding: 0 !important;
-  clip: rect(0 0 0 0) !important;
-  -webkit-clip-path: inset(100%) !important;
-  clip-path: inset(100%) !important;
-  overflow: hidden !important; }
-
-.bordered {
-  border: 0.0625rem solid var(--generic-border-color) !important; }
-
-.rounded {
-  border-radius: var(--universal-border-radius) !important; }
-
-.circular {
-  border-radius: 50% !important; }
-
-.shadowed {
-  box-shadow: var(--generic-box-shadow) !important; }
-
-.responsive-margin {
-  margin: calc(var(--universal-margin) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-margin {
-      margin: calc(var(--universal-margin) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-margin {
-      margin: var(--universal-margin) !important; } }
-
-.responsive-padding {
-  padding: calc(var(--universal-padding) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-padding {
-      padding: calc(var(--universal-padding) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-padding {
-      padding: var(--universal-padding) !important; } }
-
-@media screen and (max-width: 499px) {
-  .hidden-sm {
-    display: none !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .hidden-md {
-    display: none !important; } }
-@media screen and (min-width: 1280px) {
-  .hidden-lg {
-    display: none !important; } }
-@media screen and (max-width: 499px) {
-  .visually-hidden-sm {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .visually-hidden-md {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 1280px) {
-  .visually-hidden-lg {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-
-/*# sourceMappingURL=mini-default.css.map */
diff --git a/Middlewares/ST/STM32_Secure_Engine/_htmresc/mini-st_2020.css b/Middlewares/ST/STM32_Secure_Engine/_htmresc/mini-st_2020.css
new file mode 100644
index 00000000..986f4d42
--- /dev/null
+++ b/Middlewares/ST/STM32_Secure_Engine/_htmresc/mini-st_2020.css
@@ -0,0 +1,1711 @@
+@charset "UTF-8";
+/*
+  Flavor name: Custom (mini-custom)
+  Generated online - https://minicss.org/flavors
+  mini.css version: v3.0.1
+*/
+/*
+  Browsers resets and base typography.
+*/
+/* Core module CSS variable definitions */
+:root {
+  --fore-color: #03234b;
+  --secondary-fore-color: #03234b;
+  --back-color: #ffffff;
+  --secondary-back-color: #ffffff;
+  --blockquote-color: #e6007e;
+  --pre-color: #e6007e;
+  --border-color: #3cb4e6;
+  --secondary-border-color: #3cb4e6;
+  --heading-ratio: 1.2;
+  --universal-margin: 0.5rem;
+  --universal-padding: 0.25rem;
+  --universal-border-radius: 0.075rem;
+  --background-margin: 1.5%;
+  --a-link-color: #3cb4e6;
+  --a-visited-color: #8c0078; }
+
+html {
+  font-size: 13.5px; }
+
+a, b, del, em, i, ins, q, span, strong, u {
+  font-size: 1em; }
+
+html, * {
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica, arial, sans-serif;
+  line-height: 1.25;
+  -webkit-text-size-adjust: 100%; }
+
+* {
+  font-size: 1rem; }
+
+body {
+  margin: 0;
+  color: var(--fore-color);
+  @background: var(--back-color);
+  background: var(--back-color) linear-gradient(#ffd200, #ffd200) repeat-y left top;
+  background-size: var(--background-margin);
+  }
+
+details {
+  display: block; }
+
+summary {
+  display: list-item; }
+
+abbr[title] {
+  border-bottom: none;
+  text-decoration: underline dotted; }
+
+input {
+  overflow: visible; }
+
+img {
+  max-width: 100%;
+  height: auto; }
+
+h1, h2, h3, h4, h5, h6 {
+  line-height: 1.25;
+  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
+  font-weight: 400; }
+  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
+    color: var(--secondary-fore-color);
+    display: block;
+    margin-top: -0.25rem; }
+
+h1 {
+  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
+
+h2 {
+  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) );
+  border-style: none none solid none ; 
+  border-width: thin;
+  border-color: var(--border-color); }
+h3 {
+  font-size: calc(1rem * var(--heading-ratio) ); }
+
+h4 {
+  font-size: calc(1rem * var(--heading-ratio)); }
+
+h5 {
+  font-size: 1rem; }
+
+h6 {
+  font-size: calc(1rem / var(--heading-ratio)); }
+
+p {
+  margin: var(--universal-margin); }
+
+ol, ul {
+  margin: var(--universal-margin);
+  padding-left: calc(3 * var(--universal-margin)); }
+
+b, strong {
+  font-weight: 700; }
+
+hr {
+  box-sizing: content-box;
+  border: 0;
+  line-height: 1.25em;
+  margin: var(--universal-margin);
+  height: 0.0714285714rem;
+  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
+
+blockquote {
+  display: block;
+  position: relative;
+  font-style: italic;
+  color: var(--secondary-fore-color);
+  margin: var(--universal-margin);
+  padding: calc(3 * var(--universal-padding));
+  border: 0.0714285714rem solid var(--secondary-border-color);
+  border-left: 0.3rem solid var(--blockquote-color);
+  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
+  blockquote:before {
+    position: absolute;
+    top: calc(0rem - var(--universal-padding));
+    left: 0;
+    font-family: sans-serif;
+    font-size: 2rem;
+    font-weight: 800;
+    content: "\201c";
+    color: var(--blockquote-color); }
+  blockquote[cite]:after {
+    font-style: normal;
+    font-size: 0.75em;
+    font-weight: 700;
+    content: "\a—  " attr(cite);
+    white-space: pre; }
+
+code, kbd, pre, samp {
+  font-family: Menlo, Consolas, monospace;
+  font-size: 0.85em; }
+
+code {
+  background: var(--secondary-back-color);
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
+
+kbd {
+  background: var(--fore-color);
+  color: var(--back-color);
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
+
+pre {
+  overflow: auto;
+  background: var(--secondary-back-color);
+  padding: calc(1.5 * var(--universal-padding));
+  margin: var(--universal-margin);
+  border: 0.0714285714rem solid var(--secondary-border-color);
+  border-left: 0.2857142857rem solid var(--pre-color);
+  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
+
+sup, sub, code, kbd {
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline; }
+
+small, sup, sub, figcaption {
+  font-size: 0.75em; }
+
+sup {
+  top: -0.5em; }
+
+sub {
+  bottom: -0.25em; }
+
+figure {
+  margin: var(--universal-margin); }
+
+figcaption {
+  color: var(--secondary-fore-color); }
+
+a {
+  text-decoration: none; }
+  a:link {
+    color: var(--a-link-color); }
+  a:visited {
+    color: var(--a-visited-color); }
+  a:hover, a:focus {
+    text-decoration: underline; }
+
+/*
+  Definitions for the grid system, cards and containers.
+*/
+.container {
+  margin: 0 auto;
+  padding: 0 calc(1.5 * var(--universal-padding)); }
+
+.row {
+  box-sizing: border-box;
+  display: flex;
+  flex: 0 1 auto;
+  flex-flow: row wrap;
+  margin: 0 0 0 var(--background-margin); }
+
+.col-sm,
+[class^='col-sm-'],
+[class^='col-sm-offset-'],
+.row[class*='cols-sm-'] > * {
+  box-sizing: border-box;
+  flex: 0 0 auto;
+  padding: 0 calc(var(--universal-padding) / 2); }
+
+.col-sm,
+.row.cols-sm > * {
+  max-width: 100%;
+  flex-grow: 1;
+  flex-basis: 0; }
+
+.col-sm-1,
+.row.cols-sm-1 > * {
+  max-width: 8.3333333333%;
+  flex-basis: 8.3333333333%; }
+
+.col-sm-offset-0 {
+  margin-left: 0; }
+
+.col-sm-2,
+.row.cols-sm-2 > * {
+  max-width: 16.6666666667%;
+  flex-basis: 16.6666666667%; }
+
+.col-sm-offset-1 {
+  margin-left: 8.3333333333%; }
+
+.col-sm-3,
+.row.cols-sm-3 > * {
+  max-width: 25%;
+  flex-basis: 25%; }
+
+.col-sm-offset-2 {
+  margin-left: 16.6666666667%; }
+
+.col-sm-4,
+.row.cols-sm-4 > * {
+  max-width: 33.3333333333%;
+  flex-basis: 33.3333333333%; }
+
+.col-sm-offset-3 {
+  margin-left: 25%; }
+
+.col-sm-5,
+.row.cols-sm-5 > * {
+  max-width: 41.6666666667%;
+  flex-basis: 41.6666666667%; }
+
+.col-sm-offset-4 {
+  margin-left: 33.3333333333%; }
+
+.col-sm-6,
+.row.cols-sm-6 > * {
+  max-width: 50%;
+  flex-basis: 50%; }
+
+.col-sm-offset-5 {
+  margin-left: 41.6666666667%; }
+
+.col-sm-7,
+.row.cols-sm-7 > * {
+  max-width: 58.3333333333%;
+  flex-basis: 58.3333333333%; }
+
+.col-sm-offset-6 {
+  margin-left: 50%; }
+
+.col-sm-8,
+.row.cols-sm-8 > * {
+  max-width: 66.6666666667%;
+  flex-basis: 66.6666666667%; }
+
+.col-sm-offset-7 {
+  margin-left: 58.3333333333%; }
+
+.col-sm-9,
+.row.cols-sm-9 > * {
+  max-width: 75%;
+  flex-basis: 75%; }
+
+.col-sm-offset-8 {
+  margin-left: 66.6666666667%; }
+
+.col-sm-10,
+.row.cols-sm-10 > * {
+  max-width: 83.3333333333%;
+  flex-basis: 83.3333333333%; }
+
+.col-sm-offset-9 {
+  margin-left: 75%; }
+
+.col-sm-11,
+.row.cols-sm-11 > * {
+  max-width: 91.6666666667%;
+  flex-basis: 91.6666666667%; }
+
+.col-sm-offset-10 {
+  margin-left: 83.3333333333%; }
+
+.col-sm-12,
+.row.cols-sm-12 > * {
+  max-width: 100%;
+  flex-basis: 100%; }
+
+.col-sm-offset-11 {
+  margin-left: 91.6666666667%; }
+
+.col-sm-normal {
+  order: initial; }
+
+.col-sm-first {
+  order: -999; }
+
+.col-sm-last {
+  order: 999; }
+
+@media screen and (min-width: 500px) {
+  .col-md,
+  [class^='col-md-'],
+  [class^='col-md-offset-'],
+  .row[class*='cols-md-'] > * {
+    box-sizing: border-box;
+    flex: 0 0 auto;
+    padding: 0 calc(var(--universal-padding) / 2); }
+
+  .col-md,
+  .row.cols-md > * {
+    max-width: 100%;
+    flex-grow: 1;
+    flex-basis: 0; }
+
+  .col-md-1,
+  .row.cols-md-1 > * {
+    max-width: 8.3333333333%;
+    flex-basis: 8.3333333333%; }
+
+  .col-md-offset-0 {
+    margin-left: 0; }
+
+  .col-md-2,
+  .row.cols-md-2 > * {
+    max-width: 16.6666666667%;
+    flex-basis: 16.6666666667%; }
+
+  .col-md-offset-1 {
+    margin-left: 8.3333333333%; }
+
+  .col-md-3,
+  .row.cols-md-3 > * {
+    max-width: 25%;
+    flex-basis: 25%; }
+
+  .col-md-offset-2 {
+    margin-left: 16.6666666667%; }
+
+  .col-md-4,
+  .row.cols-md-4 > * {
+    max-width: 33.3333333333%;
+    flex-basis: 33.3333333333%; }
+
+  .col-md-offset-3 {
+    margin-left: 25%; }
+
+  .col-md-5,
+  .row.cols-md-5 > * {
+    max-width: 41.6666666667%;
+    flex-basis: 41.6666666667%; }
+
+  .col-md-offset-4 {
+    margin-left: 33.3333333333%; }
+
+  .col-md-6,
+  .row.cols-md-6 > * {
+    max-width: 50%;
+    flex-basis: 50%; }
+
+  .col-md-offset-5 {
+    margin-left: 41.6666666667%; }
+
+  .col-md-7,
+  .row.cols-md-7 > * {
+    max-width: 58.3333333333%;
+    flex-basis: 58.3333333333%; }
+
+  .col-md-offset-6 {
+    margin-left: 50%; }
+
+  .col-md-8,
+  .row.cols-md-8 > * {
+    max-width: 66.6666666667%;
+    flex-basis: 66.6666666667%; }
+
+  .col-md-offset-7 {
+    margin-left: 58.3333333333%; }
+
+  .col-md-9,
+  .row.cols-md-9 > * {
+    max-width: 75%;
+    flex-basis: 75%; }
+
+  .col-md-offset-8 {
+    margin-left: 66.6666666667%; }
+
+  .col-md-10,
+  .row.cols-md-10 > * {
+    max-width: 83.3333333333%;
+    flex-basis: 83.3333333333%; }
+
+  .col-md-offset-9 {
+    margin-left: 75%; }
+
+  .col-md-11,
+  .row.cols-md-11 > * {
+    max-width: 91.6666666667%;
+    flex-basis: 91.6666666667%; }
+
+  .col-md-offset-10 {
+    margin-left: 83.3333333333%; }
+
+  .col-md-12,
+  .row.cols-md-12 > * {
+    max-width: 100%;
+    flex-basis: 100%; }
+
+  .col-md-offset-11 {
+    margin-left: 91.6666666667%; }
+
+  .col-md-normal {
+    order: initial; }
+
+  .col-md-first {
+    order: -999; }
+
+  .col-md-last {
+    order: 999; } }
+@media screen and (min-width: 1280px) {
+  .col-lg,
+  [class^='col-lg-'],
+  [class^='col-lg-offset-'],
+  .row[class*='cols-lg-'] > * {
+    box-sizing: border-box;
+    flex: 0 0 auto;
+    padding: 0 calc(var(--universal-padding) / 2); }
+
+  .col-lg,
+  .row.cols-lg > * {
+    max-width: 100%;
+    flex-grow: 1;
+    flex-basis: 0; }
+
+  .col-lg-1,
+  .row.cols-lg-1 > * {
+    max-width: 8.3333333333%;
+    flex-basis: 8.3333333333%; }
+
+  .col-lg-offset-0 {
+    margin-left: 0; }
+
+  .col-lg-2,
+  .row.cols-lg-2 > * {
+    max-width: 16.6666666667%;
+    flex-basis: 16.6666666667%; }
+
+  .col-lg-offset-1 {
+    margin-left: 8.3333333333%; }
+
+  .col-lg-3,
+  .row.cols-lg-3 > * {
+    max-width: 25%;
+    flex-basis: 25%; }
+
+  .col-lg-offset-2 {
+    margin-left: 16.6666666667%; }
+
+  .col-lg-4,
+  .row.cols-lg-4 > * {
+    max-width: 33.3333333333%;
+    flex-basis: 33.3333333333%; }
+
+  .col-lg-offset-3 {
+    margin-left: 25%; }
+
+  .col-lg-5,
+  .row.cols-lg-5 > * {
+    max-width: 41.6666666667%;
+    flex-basis: 41.6666666667%; }
+
+  .col-lg-offset-4 {
+    margin-left: 33.3333333333%; }
+
+  .col-lg-6,
+  .row.cols-lg-6 > * {
+    max-width: 50%;
+    flex-basis: 50%; }
+
+  .col-lg-offset-5 {
+    margin-left: 41.6666666667%; }
+
+  .col-lg-7,
+  .row.cols-lg-7 > * {
+    max-width: 58.3333333333%;
+    flex-basis: 58.3333333333%; }
+
+  .col-lg-offset-6 {
+    margin-left: 50%; }
+
+  .col-lg-8,
+  .row.cols-lg-8 > * {
+    max-width: 66.6666666667%;
+    flex-basis: 66.6666666667%; }
+
+  .col-lg-offset-7 {
+    margin-left: 58.3333333333%; }
+
+  .col-lg-9,
+  .row.cols-lg-9 > * {
+    max-width: 75%;
+    flex-basis: 75%; }
+
+  .col-lg-offset-8 {
+    margin-left: 66.6666666667%; }
+
+  .col-lg-10,
+  .row.cols-lg-10 > * {
+    max-width: 83.3333333333%;
+    flex-basis: 83.3333333333%; }
+
+  .col-lg-offset-9 {
+    margin-left: 75%; }
+
+  .col-lg-11,
+  .row.cols-lg-11 > * {
+    max-width: 91.6666666667%;
+    flex-basis: 91.6666666667%; }
+
+  .col-lg-offset-10 {
+    margin-left: 83.3333333333%; }
+
+  .col-lg-12,
+  .row.cols-lg-12 > * {
+    max-width: 100%;
+    flex-basis: 100%; }
+
+  .col-lg-offset-11 {
+    margin-left: 91.6666666667%; }
+
+  .col-lg-normal {
+    order: initial; }
+
+  .col-lg-first {
+    order: -999; }
+
+  .col-lg-last {
+    order: 999; } }
+/* Card component CSS variable definitions */
+:root {
+  --card-back-color: #3cb4e6;
+  --card-fore-color: #03234b;
+  --card-border-color: #03234b; }
+
+.card {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-self: center;
+  position: relative;
+  width: 100%;
+  background: var(--card-back-color);
+  color: var(--card-fore-color);
+  border: 0.0714285714rem solid var(--card-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin);
+  overflow: hidden; }
+  @media screen and (min-width: 320px) {
+    .card {
+      max-width: 320px; } }
+  .card > .sectione {
+    background: var(--card-back-color);
+    color: var(--card-fore-color);
+    box-sizing: border-box;
+    margin: 0;
+    border: 0;
+    border-radius: 0;
+    border-bottom: 0.0714285714rem solid var(--card-border-color);
+    padding: var(--universal-padding);
+    width: 100%; }
+    .card > .sectione.media {
+      height: 200px;
+      padding: 0;
+      -o-object-fit: cover;
+      object-fit: cover; }
+  .card > .sectione:last-child {
+    border-bottom: 0; }
+
+/*
+  Custom elements for card elements.
+*/
+@media screen and (min-width: 240px) {
+  .card.small {
+    max-width: 240px; } }
+@media screen and (min-width: 480px) {
+  .card.large {
+    max-width: 480px; } }
+.card.fluid {
+  max-width: 100%;
+  width: auto; }
+
+.card.warning {
+  --card-back-color: #e5b8b7;
+  --card-fore-color: #3b234b;
+  --card-border-color: #8c0078; }
+
+.card.error {
+  --card-back-color: #464650;
+  --card-fore-color: #ffffff;
+  --card-border-color: #8c0078; }
+
+.card > .sectione.dark {
+  --card-back-color: #3b234b;
+  --card-fore-color: #ffffff; }
+
+.card > .sectione.double-padded {
+  padding: calc(1.5 * var(--universal-padding)); }
+
+/*
+  Definitions for forms and input elements.
+*/
+/* Input_control module CSS variable definitions */
+:root {
+  --form-back-color: #ffe97f;
+  --form-fore-color: #03234b;
+  --form-border-color: #3cb4e6;
+  --input-back-color: #ffffff;
+  --input-fore-color: #03234b;
+  --input-border-color: #3cb4e6;
+  --input-focus-color: #0288d1;
+  --input-invalid-color: #d32f2f;
+  --button-back-color: #e2e2e2;
+  --button-hover-back-color: #dcdcdc;
+  --button-fore-color: #212121;
+  --button-border-color: transparent;
+  --button-hover-border-color: transparent;
+  --button-group-border-color: rgba(124, 124, 124, 0.54); }
+
+form {
+  background: var(--form-back-color);
+  color: var(--form-fore-color);
+  border: 0.0714285714rem solid var(--form-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin);
+  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
+
+fieldset {
+  border: 0.0714285714rem solid var(--form-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: calc(var(--universal-margin) / 4);
+  padding: var(--universal-padding); }
+
+legend {
+  box-sizing: border-box;
+  display: table;
+  max-width: 100%;
+  white-space: normal;
+  font-weight: 500;
+  padding: calc(var(--universal-padding) / 2); }
+
+label {
+  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
+
+.input-group {
+  display: inline-block; }
+  .input-group.fluid {
+    display: flex;
+    align-items: center;
+    justify-content: center; }
+    .input-group.fluid > input {
+      max-width: 100%;
+      flex-grow: 1;
+      flex-basis: 0px; }
+    @media screen and (max-width: 499px) {
+      .input-group.fluid {
+        align-items: stretch;
+        flex-direction: column; } }
+  .input-group.vertical {
+    display: flex;
+    align-items: stretch;
+    flex-direction: column; }
+    .input-group.vertical > input {
+      max-width: 100%;
+      flex-grow: 1;
+      flex-basis: 0px; }
+
+[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
+  height: auto; }
+
+[type="search"] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px; }
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none; }
+
+input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
+[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
+  box-sizing: border-box;
+  background: var(--input-back-color);
+  color: var(--input-fore-color);
+  border: 0.0714285714rem solid var(--input-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: calc(var(--universal-margin) / 2);
+  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
+
+input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
+  border-color: var(--input-focus-color);
+  box-shadow: none; }
+input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
+  border-color: var(--input-invalid-color);
+  box-shadow: none; }
+input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
+  background: var(--secondary-back-color); }
+
+select {
+  max-width: 100%; }
+
+option {
+  overflow: hidden;
+  text-overflow: ellipsis; }
+
+[type="checkbox"], [type="radio"] {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  position: relative;
+  height: calc(1rem + var(--universal-padding) / 2);
+  width: calc(1rem + var(--universal-padding) / 2);
+  vertical-align: text-bottom;
+  padding: 0;
+  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
+  flex-grow: 0 !important; }
+  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
+    position: absolute; }
+
+[type="checkbox"]:checked:before {
+  content: '\2713';
+  font-family: sans-serif;
+  font-size: calc(1rem + var(--universal-padding) / 2);
+  top: calc(0rem - var(--universal-padding));
+  left: calc(var(--universal-padding) / 4); }
+
+[type="radio"] {
+  border-radius: 100%; }
+  [type="radio"]:checked:before {
+    border-radius: 100%;
+    content: '';
+    top: calc(0.0714285714rem + var(--universal-padding) / 2);
+    left: calc(0.0714285714rem + var(--universal-padding) / 2);
+    background: var(--input-fore-color);
+    width: 0.5rem;
+    height: 0.5rem; }
+
+:placeholder-shown {
+  color: var(--input-fore-color); }
+
+::-ms-placeholder {
+  color: var(--input-fore-color);
+  opacity: 0.54; }
+
+button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0; }
+
+button, html [type="button"], [type="reset"], [type="submit"] {
+  -webkit-appearance: button; }
+
+button {
+  overflow: visible;
+  text-transform: none; }
+
+button, [type="button"], [type="submit"], [type="reset"],
+a.button, label.button, .button,
+a[role="button"], label[role="button"], [role="button"] {
+  display: inline-block;
+  background: var(--button-back-color);
+  color: var(--button-fore-color);
+  border: 0.0714285714rem solid var(--button-border-color);
+  border-radius: var(--universal-border-radius);
+  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
+  margin: var(--universal-margin);
+  text-decoration: none;
+  cursor: pointer;
+  transition: background 0.3s; }
+  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
+  a.button:hover,
+  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
+  a[role="button"]:hover,
+  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
+    background: var(--button-hover-back-color);
+    border-color: var(--button-hover-border-color); }
+
+input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
+  cursor: not-allowed;
+  opacity: 0.75; }
+
+.button-group {
+  display: flex;
+  border: 0.0714285714rem solid var(--button-group-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin); }
+  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
+    margin: 0;
+    max-width: 100%;
+    flex: 1 1 auto;
+    text-align: center;
+    border: 0;
+    border-radius: 0;
+    box-shadow: none; }
+  .button-group > :not(:first-child) {
+    border-left: 0.0714285714rem solid var(--button-group-border-color); }
+  @media screen and (max-width: 499px) {
+    .button-group {
+      flex-direction: column; }
+      .button-group > :not(:first-child) {
+        border: 0;
+        border-top: 0.0714285714rem solid var(--button-group-border-color); } }
+
+/*
+  Custom elements for forms and input elements.
+*/
+button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
+  --button-back-color: #1976d2;
+  --button-fore-color: #f8f8f8; }
+  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
+    --button-hover-back-color: #1565c0; }
+
+button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
+  --button-back-color: #d32f2f;
+  --button-fore-color: #f8f8f8; }
+  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
+    --button-hover-back-color: #c62828; }
+
+button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
+  --button-back-color: #308732;
+  --button-fore-color: #f8f8f8; }
+  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
+    --button-hover-back-color: #277529; }
+
+button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
+  --button-back-color: #212121;
+  --button-fore-color: #f8f8f8; }
+  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
+    --button-hover-back-color: #111; }
+
+button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
+  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
+  margin: var(--universal-margin); }
+
+button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
+  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
+  margin: var(--universal-margin); }
+
+/*
+  Definitions for navigation elements.
+*/
+/* Navigation module CSS variable definitions */
+:root {
+  --header-back-color: #03234b;
+  --header-hover-back-color: #ffd200;
+  --header-fore-color: #ffffff;
+  --header-border-color: #3cb4e6;
+  --nav-back-color: #ffffff;
+  --nav-hover-back-color: #ffe97f;
+  --nav-fore-color: #e6007e;
+  --nav-border-color: #3cb4e6;
+  --nav-link-color: #3cb4e6;
+  --footer-fore-color: #ffffff;
+  --footer-back-color: #03234b;
+  --footer-border-color: #3cb4e6;
+  --footer-link-color: #3cb4e6;
+  --drawer-back-color: #ffffff;
+  --drawer-hover-back-color: #ffe97f;
+  --drawer-border-color: #3cb4e6;
+  --drawer-close-color: #e6007e; }
+
+header {
+  height: 2.75rem;
+  background: var(--header-back-color);
+  color: var(--header-fore-color);
+  border-bottom: 0.0714285714rem solid var(--header-border-color);
+  padding: calc(var(--universal-padding) / 4) 0;
+  white-space: nowrap;
+  overflow-x: auto;
+  overflow-y: hidden; }
+  header.row {
+    box-sizing: content-box; }
+  header .logo {
+    color: var(--header-fore-color);
+    font-size: 1.75rem;
+    padding: var(--universal-padding) calc(2 * var(--universal-padding));
+    text-decoration: none; }
+  header button, header [type="button"], header .button, header [role="button"] {
+    box-sizing: border-box;
+    position: relative;
+    top: calc(0rem - var(--universal-padding) / 4);
+    height: calc(3.1875rem + var(--universal-padding) / 2);
+    background: var(--header-back-color);
+    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
+    text-align: center;
+    color: var(--header-fore-color);
+    border: 0;
+    border-radius: 0;
+    margin: 0;
+    text-transform: uppercase; }
+    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
+      background: var(--header-hover-back-color); }
+
+nav {
+  background: var(--nav-back-color);
+  color: var(--nav-fore-color);
+  border: 0.0714285714rem solid var(--nav-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin); }
+  nav * {
+    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
+  nav a, nav a:visited {
+    display: block;
+    color: var(--nav-link-color);
+    border-radius: var(--universal-border-radius);
+    transition: background 0.3s; }
+    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
+      text-decoration: none;
+      background: var(--nav-hover-back-color); }
+  nav .sublink-1 {
+    position: relative;
+    margin-left: calc(2 * var(--universal-padding)); }
+    nav .sublink-1:before {
+      position: absolute;
+      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
+      top: -0.0714285714rem;
+      content: '';
+      height: 100%;
+      border: 0.0714285714rem solid var(--nav-border-color);
+      border-left: 0; }
+  nav .sublink-2 {
+    position: relative;
+    margin-left: calc(4 * var(--universal-padding)); }
+    nav .sublink-2:before {
+      position: absolute;
+      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
+      top: -0.0714285714rem;
+      content: '';
+      height: 100%;
+      border: 0.0714285714rem solid var(--nav-border-color);
+      border-left: 0; }
+
+footer {
+  background: var(--footer-back-color);
+  color: var(--footer-fore-color);
+  border-top: 0.0714285714rem solid var(--footer-border-color);
+  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
+  font-size: 0.875rem; }
+  footer a, footer a:visited {
+    color: var(--footer-link-color); }
+
+header.sticky {
+  position: -webkit-sticky;
+  position: sticky;
+  z-index: 1101;
+  top: 0; }
+
+footer.sticky {
+  position: -webkit-sticky;
+  position: sticky;
+  z-index: 1101;
+  bottom: 0; }
+
+.drawer-toggle:before {
+  display: inline-block;
+  position: relative;
+  vertical-align: bottom;
+  content: '\00a0\2261\00a0';
+  font-family: sans-serif;
+  font-size: 1.5em; }
+@media screen and (min-width: 500px) {
+  .drawer-toggle:not(.persistent) {
+    display: none; } }
+
+[type="checkbox"].drawer {
+  height: 1px;
+  width: 1px;
+  margin: -1px;
+  overflow: hidden;
+  position: absolute;
+  clip: rect(0 0 0 0);
+  -webkit-clip-path: inset(100%);
+  clip-path: inset(100%); }
+  [type="checkbox"].drawer + * {
+    display: block;
+    box-sizing: border-box;
+    position: fixed;
+    top: 0;
+    width: 320px;
+    height: 100vh;
+    overflow-y: auto;
+    background: var(--drawer-back-color);
+    border: 0.0714285714rem solid var(--drawer-border-color);
+    border-radius: 0;
+    margin: 0;
+    z-index: 1110;
+    right: -320px;
+    transition: right 0.3s; }
+    [type="checkbox"].drawer + * .drawer-close {
+      position: absolute;
+      top: var(--universal-margin);
+      right: var(--universal-margin);
+      z-index: 1111;
+      width: 2rem;
+      height: 2rem;
+      border-radius: var(--universal-border-radius);
+      padding: var(--universal-padding);
+      margin: 0;
+      cursor: pointer;
+      transition: background 0.3s; }
+      [type="checkbox"].drawer + * .drawer-close:before {
+        display: block;
+        content: '\00D7';
+        color: var(--drawer-close-color);
+        position: relative;
+        font-family: sans-serif;
+        font-size: 2rem;
+        line-height: 1;
+        text-align: center; }
+      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
+        background: var(--drawer-hover-back-color); }
+    @media screen and (max-width: 320px) {
+      [type="checkbox"].drawer + * {
+        width: 100%; } }
+  [type="checkbox"].drawer:checked + * {
+    right: 0; }
+  @media screen and (min-width: 500px) {
+    [type="checkbox"].drawer:not(.persistent) + * {
+      position: static;
+      height: 100%;
+      z-index: 1100; }
+      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
+        display: none; } }
+
+/*
+  Definitions for the responsive table component.
+*/
+/* Table module CSS variable definitions. */
+:root {
+  --table-border-color: #03234b;
+  --table-border-separator-color: #03234b;
+  --table-head-back-color: #03234b;
+  --table-head-fore-color: #ffffff;
+  --table-body-back-color: #ffffff;
+  --table-body-fore-color: #03234b;
+  --table-body-alt-back-color: #f4f4f4; }
+
+table {
+  border-collapse: separate;
+  border-spacing: 0;
+  margin: 0;
+  display: flex;
+  flex: 0 1 auto;
+  flex-flow: row wrap;
+  padding: var(--universal-padding);
+  padding-top: 0; }
+  table caption {
+    font-size: 1rem;
+    margin: calc(2 * var(--universal-margin)) 0;
+    max-width: 100%;
+    flex: 0 0 100%; }
+  table thead, table tbody {
+    display: flex;
+    flex-flow: row wrap;
+    border: 0.0714285714rem solid var(--table-border-color); }
+  table thead {
+    z-index: 999;
+    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
+    border-bottom: 0.0714285714rem solid var(--table-border-separator-color); }
+  table tbody {
+    border-top: 0;
+    margin-top: calc(0 - var(--universal-margin));
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+  table tr {
+    display: flex;
+    padding: 0; }
+  table th, table td {
+    padding: calc(0.5 * var(--universal-padding));
+		font-size: 0.9rem; }
+  table th {
+    text-align: left;
+    background: var(--table-head-back-color);
+    color: var(--table-head-fore-color); }
+  table td {
+    background: var(--table-body-back-color);
+    color: var(--table-body-fore-color);
+    border-top: 0.0714285714rem solid var(--table-border-color); }
+
+table:not(.horizontal) {
+  overflow: auto;
+  max-height: 100%; }
+  table:not(.horizontal) thead, table:not(.horizontal) tbody {
+    max-width: 100%;
+    flex: 0 0 100%; }
+  table:not(.horizontal) tr {
+    flex-flow: row wrap;
+    flex: 0 0 100%; }
+  table:not(.horizontal) th, table:not(.horizontal) td {
+    flex: 1 0 0%;
+    overflow: hidden;
+    text-overflow: ellipsis; }
+  table:not(.horizontal) thead {
+    position: sticky;
+    top: 0; }
+  table:not(.horizontal) tbody tr:first-child td {
+    border-top: 0; }
+
+table.horizontal {
+  border: 0; }
+  table.horizontal thead, table.horizontal tbody {
+    border: 0;
+    flex: .2 0 0;
+    flex-flow: row nowrap; }
+  table.horizontal tbody {
+    overflow: auto;
+    justify-content: space-between;
+    flex: .8 0 0;
+    margin-left: 0;
+    padding-bottom: calc(var(--universal-padding) / 4); }
+  table.horizontal tr {
+    flex-direction: column;
+    flex: 1 0 auto; }
+  table.horizontal th, table.horizontal td {
+    width: auto;
+    border: 0;
+    border-bottom: 0.0714285714rem solid var(--table-border-color); }
+    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
+      border-top: 0; }
+  table.horizontal th {
+    text-align: right;
+    border-left: 0.0714285714rem solid var(--table-border-color);
+    border-right: 0.0714285714rem solid var(--table-border-separator-color); }
+  table.horizontal thead tr:first-child {
+    padding-left: 0; }
+  table.horizontal th:first-child, table.horizontal td:first-child {
+    border-top: 0.0714285714rem solid var(--table-border-color); }
+  table.horizontal tbody tr:last-child td {
+    border-right: 0.0714285714rem solid var(--table-border-color); }
+    table.horizontal tbody tr:last-child td:first-child {
+      border-top-right-radius: 0.25rem; }
+    table.horizontal tbody tr:last-child td:last-child {
+      border-bottom-right-radius: 0.25rem; }
+  table.horizontal thead tr:first-child th:first-child {
+    border-top-left-radius: 0.25rem; }
+  table.horizontal thead tr:first-child th:last-child {
+    border-bottom-left-radius: 0.25rem; }
+
+@media screen and (max-width: 499px) {
+  table, table.horizontal {
+    border-collapse: collapse;
+    border: 0;
+    width: 100%;
+    display: table; }
+    table thead, table th, table.horizontal thead, table.horizontal th {
+      border: 0;
+      height: 1px;
+      width: 1px;
+      margin: -1px;
+      overflow: hidden;
+      padding: 0;
+      position: absolute;
+      clip: rect(0 0 0 0);
+      -webkit-clip-path: inset(100%);
+      clip-path: inset(100%); }
+    table tbody, table.horizontal tbody {
+      border: 0;
+      display: table-row-group; }
+    table tr, table.horizontal tr {
+      display: block;
+      border: 0.0714285714rem solid var(--table-border-color);
+      border-radius: var(--universal-border-radius);
+      background: #ffffff;
+      padding: var(--universal-padding);
+      margin: var(--universal-margin);
+      margin-bottom: calc(1 * var(--universal-margin)); }
+    table th, table td, table.horizontal th, table.horizontal td {
+      width: auto; }
+    table td, table.horizontal td {
+      display: block;
+      border: 0;
+      text-align: right; }
+    table td:before, table.horizontal td:before {
+      content: attr(data-label);
+      float: left;
+      font-weight: 600; }
+    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
+      border-top: 0; }
+    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
+      border-right: 0; } }
+table tr:nth-of-type(2n) > td {
+  background: var(--table-body-alt-back-color); }
+
+@media screen and (max-width: 500px) {
+  table tr:nth-of-type(2n) {
+    background: var(--table-body-alt-back-color); } }
+:root {
+  --table-body-hover-back-color: #90caf9; }
+
+table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
+  background: var(--table-body-hover-back-color); }
+
+@media screen and (max-width: 500px) {
+  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
+    background: var(--table-body-hover-back-color); } }
+/*
+  Definitions for contextual background elements, toasts and tooltips.
+*/
+/* Contextual module CSS variable definitions */
+:root {
+  --mark-back-color: #3cb4e6;
+  --mark-fore-color: #ffffff; }
+
+mark {
+  background: var(--mark-back-color);
+  color: var(--mark-fore-color);
+  font-size: 0.95em;
+  line-height: 1em;
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) var(--universal-padding); }
+  mark.inline-block {
+    display: inline-block;
+    font-size: 1em;
+    line-height: 1.4;
+    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
+
+:root {
+  --toast-back-color: #424242;
+  --toast-fore-color: #fafafa; }
+
+.toast {
+  position: fixed;
+  bottom: calc(var(--universal-margin) * 3);
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1111;
+  color: var(--toast-fore-color);
+  background: var(--toast-back-color);
+  border-radius: calc(var(--universal-border-radius) * 16);
+  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
+
+:root {
+  --tooltip-back-color: #212121;
+  --tooltip-fore-color: #fafafa; }
+
+.tooltip {
+  position: relative;
+  display: inline-block; }
+  .tooltip:before, .tooltip:after {
+    position: absolute;
+    opacity: 0;
+    clip: rect(0 0 0 0);
+    -webkit-clip-path: inset(100%);
+    clip-path: inset(100%);
+    transition: all 0.3s;
+    z-index: 1010;
+    left: 50%; }
+  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
+    bottom: 75%; }
+  .tooltip.bottom:before, .tooltip.bottom:after {
+    top: 75%; }
+  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
+    opacity: 1;
+    clip: auto;
+    -webkit-clip-path: inset(0%);
+    clip-path: inset(0%); }
+  .tooltip:before {
+    content: '';
+    background: transparent;
+    border: var(--universal-margin) solid transparent;
+    left: calc(50% - var(--universal-margin)); }
+  .tooltip:not(.bottom):before {
+    border-top-color: #212121; }
+  .tooltip.bottom:before {
+    border-bottom-color: #212121; }
+  .tooltip:after {
+    content: attr(aria-label);
+    color: var(--tooltip-fore-color);
+    background: var(--tooltip-back-color);
+    border-radius: var(--universal-border-radius);
+    padding: var(--universal-padding);
+    white-space: nowrap;
+    transform: translateX(-50%); }
+  .tooltip:not(.bottom):after {
+    margin-bottom: calc(2 * var(--universal-margin)); }
+  .tooltip.bottom:after {
+    margin-top: calc(2 * var(--universal-margin)); }
+
+:root {
+  --modal-overlay-color: rgba(0, 0, 0, 0.45);
+  --modal-close-color: #e6007e;
+  --modal-close-hover-color: #ffe97f; }
+
+[type="checkbox"].modal {
+  height: 1px;
+  width: 1px;
+  margin: -1px;
+  overflow: hidden;
+  position: absolute;
+  clip: rect(0 0 0 0);
+  -webkit-clip-path: inset(100%);
+  clip-path: inset(100%); }
+  [type="checkbox"].modal + div {
+    position: fixed;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 100vw;
+    height: 100vh;
+    background: var(--modal-overlay-color); }
+    [type="checkbox"].modal + div .card {
+      margin: 0 auto;
+      max-height: 50vh;
+      overflow: auto; }
+      [type="checkbox"].modal + div .card .modal-close {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 1.75rem;
+        height: 1.75rem;
+        border-radius: var(--universal-border-radius);
+        padding: var(--universal-padding);
+        margin: 0;
+        cursor: pointer;
+        transition: background 0.3s; }
+        [type="checkbox"].modal + div .card .modal-close:before {
+          display: block;
+          content: '\00D7';
+          color: var(--modal-close-color);
+          position: relative;
+          font-family: sans-serif;
+          font-size: 1.75rem;
+          line-height: 1;
+          text-align: center; }
+        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
+          background: var(--modal-close-hover-color); }
+  [type="checkbox"].modal:checked + div {
+    display: flex;
+    flex: 0 1 auto;
+    z-index: 1200; }
+    [type="checkbox"].modal:checked + div .card .modal-close {
+      z-index: 1211; }
+
+:root {
+  --collapse-label-back-color: #03234b;
+  --collapse-label-fore-color: #ffffff;
+  --collapse-label-hover-back-color: #3cb4e6;
+  --collapse-selected-label-back-color: #3cb4e6;
+  --collapse-border-color: var(--collapse-label-back-color);
+  --collapse-selected-border-color: #ceecf8;
+  --collapse-content-back-color: #ffffff;
+  --collapse-selected-label-border-color: #3cb4e6; }
+
+.collapse {
+  width: calc(100% - 2 * var(--universal-margin));
+  opacity: 1;
+  display: flex;
+  flex-direction: column;
+  margin: var(--universal-margin);
+  border-radius: var(--universal-border-radius); }
+  .collapse > [type="radio"], .collapse > [type="checkbox"] {
+    height: 1px;
+    width: 1px;
+    margin: -1px;
+    overflow: hidden;
+    position: absolute;
+    clip: rect(0 0 0 0);
+    -webkit-clip-path: inset(100%);
+    clip-path: inset(100%); }
+  .collapse > label {
+    flex-grow: 1;
+    display: inline-block;
+    height: 1.25rem;
+    cursor: pointer;
+    transition: background 0.2s;
+    color: var(--collapse-label-fore-color);
+    background: var(--collapse-label-back-color);
+    border: 0.0714285714rem solid var(--collapse-selected-border-color);
+    padding: calc(1.25 * var(--universal-padding)); }
+    .collapse > label:hover, .collapse > label:focus {
+      background: var(--collapse-label-hover-back-color); }
+    .collapse > label + div {
+      flex-basis: auto;
+      height: 1px;
+      width: 1px;
+      margin: -1px;
+      overflow: hidden;
+      position: absolute;
+      clip: rect(0 0 0 0);
+      -webkit-clip-path: inset(100%);
+      clip-path: inset(100%);
+      transition: max-height 0.3s;
+      max-height: 1px; }
+  .collapse > :checked + label {
+    background: var(--collapse-selected-label-back-color);
+    border-color: var(--collapse-selected-label-border-color); }
+    .collapse > :checked + label + div {
+      box-sizing: border-box;
+      position: relative;
+      width: 100%;
+      height: auto;
+      overflow: auto;
+      margin: 0;
+      background: var(--collapse-content-back-color);
+      border: 0.0714285714rem solid var(--collapse-selected-border-color);
+      border-top: 0;
+      padding: var(--universal-padding);
+      clip: auto;
+      -webkit-clip-path: inset(0%);
+      clip-path: inset(0%);
+      max-height: 100%; }
+  .collapse > label:not(:first-of-type) {
+    border-top: 0; }
+  .collapse > label:first-of-type {
+    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
+  .collapse > label:last-of-type:not(:first-of-type) {
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+  .collapse > label:last-of-type:first-of-type {
+    border-radius: var(--universal-border-radius); }
+  .collapse > :checked:last-of-type:not(:first-of-type) + label {
+    border-radius: 0; }
+  .collapse > :checked:last-of-type + label + div {
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+
+/*
+  Custom elements for contextual background elements, toasts and tooltips.
+*/
+mark.tertiary {
+  --mark-back-color: #3cb4e6; }
+
+mark.tag {
+  padding: calc(var(--universal-padding)/2) var(--universal-padding);
+  border-radius: 1em; }
+
+/*
+  Definitions for progress elements and spinners.
+*/
+/* Progress module CSS variable definitions */
+:root {
+  --progress-back-color: #3cb4e6;
+  --progress-fore-color: #555; }
+
+progress {
+  display: block;
+  vertical-align: baseline;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  height: 0.75rem;
+  width: calc(100% - 2 * var(--universal-margin));
+  margin: var(--universal-margin);
+  border: 0;
+  border-radius: calc(2 * var(--universal-border-radius));
+  background: var(--progress-back-color);
+  color: var(--progress-fore-color); }
+  progress::-webkit-progress-value {
+    background: var(--progress-fore-color);
+    border-top-left-radius: calc(2 * var(--universal-border-radius));
+    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
+  progress::-webkit-progress-bar {
+    background: var(--progress-back-color); }
+  progress::-moz-progress-bar {
+    background: var(--progress-fore-color);
+    border-top-left-radius: calc(2 * var(--universal-border-radius));
+    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
+  progress[value="1000"]::-webkit-progress-value {
+    border-radius: calc(2 * var(--universal-border-radius)); }
+  progress[value="1000"]::-moz-progress-bar {
+    border-radius: calc(2 * var(--universal-border-radius)); }
+  progress.inline {
+    display: inline-block;
+    vertical-align: middle;
+    width: 60%; }
+
+:root {
+  --spinner-back-color: #ddd;
+  --spinner-fore-color: #555; }
+
+@keyframes spinner-donut-anim {
+  0% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } }
+.spinner {
+  display: inline-block;
+  margin: var(--universal-margin);
+  border: 0.25rem solid var(--spinner-back-color);
+  border-left: 0.25rem solid var(--spinner-fore-color);
+  border-radius: 50%;
+  width: 1.25rem;
+  height: 1.25rem;
+  animation: spinner-donut-anim 1.2s linear infinite; }
+
+/*
+  Custom elements for progress bars and spinners.
+*/
+progress.primary {
+  --progress-fore-color: #1976d2; }
+
+progress.secondary {
+  --progress-fore-color: #d32f2f; }
+
+progress.tertiary {
+  --progress-fore-color: #308732; }
+
+.spinner.primary {
+  --spinner-fore-color: #1976d2; }
+
+.spinner.secondary {
+  --spinner-fore-color: #d32f2f; }
+
+.spinner.tertiary {
+  --spinner-fore-color: #308732; }
+
+/*
+  Definitions for icons - powered by Feather (https://feathericons.com/).
+*/
+span[class^='icon-'] {
+  display: inline-block;
+  height: 1em;
+  width: 1em;
+  vertical-align: -0.125em;
+  background-size: contain;
+  margin: 0 calc(var(--universal-margin) / 4); }
+  span[class^='icon-'].secondary {
+    -webkit-filter: invert(25%);
+    filter: invert(25%); }
+  span[class^='icon-'].inverse {
+    -webkit-filter: invert(100%);
+    filter: invert(100%); }
+
+span.icon-alert {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-bookmark {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-calendar {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-credit {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-edit {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
+span.icon-link {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-help {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-home {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
+span.icon-info {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-lock {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-mail {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
+span.icon-location {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
+span.icon-phone {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-rss {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
+span.icon-search {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-settings {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-share {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-cart {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-upload {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-user {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
+
+/*
+  Definitions for STMicroelectronics icons (https://brandportal.st.com/document/26).
+*/
+span.icon-st-update {
+  background-image: url("Update.svg"); }
+span.icon-st-add {
+  background-image: url("Add button.svg"); }
+
+/*
+  Definitions for utilities and helper classes.
+*/
+/* Utility module CSS variable definitions */
+:root {
+  --generic-border-color: rgba(0, 0, 0, 0.3);
+  --generic-box-shadow: 0 0.2857142857rem 0.2857142857rem 0 rgba(0, 0, 0, 0.125), 0 0.1428571429rem 0.1428571429rem -0.1428571429rem rgba(0, 0, 0, 0.125); }
+
+.hidden {
+  display: none !important; }
+
+.visually-hidden {
+  position: absolute !important;
+  width: 1px !important;
+  height: 1px !important;
+  margin: -1px !important;
+  border: 0 !important;
+  padding: 0 !important;
+  clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(100%) !important;
+  clip-path: inset(100%) !important;
+  overflow: hidden !important; }
+
+.bordered {
+  border: 0.0714285714rem solid var(--generic-border-color) !important; }
+
+.rounded {
+  border-radius: var(--universal-border-radius) !important; }
+
+.circular {
+  border-radius: 50% !important; }
+
+.shadowed {
+  box-shadow: var(--generic-box-shadow) !important; }
+
+.responsive-margin {
+  margin: calc(var(--universal-margin) / 4) !important; }
+  @media screen and (min-width: 500px) {
+    .responsive-margin {
+      margin: calc(var(--universal-margin) / 2) !important; } }
+  @media screen and (min-width: 1280px) {
+    .responsive-margin {
+      margin: var(--universal-margin) !important; } }
+
+.responsive-padding {
+  padding: calc(var(--universal-padding) / 4) !important; }
+  @media screen and (min-width: 500px) {
+    .responsive-padding {
+      padding: calc(var(--universal-padding) / 2) !important; } }
+  @media screen and (min-width: 1280px) {
+    .responsive-padding {
+      padding: var(--universal-padding) !important; } }
+
+@media screen and (max-width: 499px) {
+  .hidden-sm {
+    display: none !important; } }
+@media screen and (min-width: 500px) and (max-width: 1279px) {
+  .hidden-md {
+    display: none !important; } }
+@media screen and (min-width: 1280px) {
+  .hidden-lg {
+    display: none !important; } }
+@media screen and (max-width: 499px) {
+  .visually-hidden-sm {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+@media screen and (min-width: 500px) and (max-width: 1279px) {
+  .visually-hidden-md {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+@media screen and (min-width: 1280px) {
+  .visually-hidden-lg {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+
+/*# sourceMappingURL=mini-custom.css.map */
+
+img[alt="ST logo"] { display: block; margin: auto; width: 75%; max-width: 250px; min-width: 71px; }
+img[alt="Cube logo"] { float: right; width: 30%; max-width: 10rem; min-width: 8rem; padding-right: 1rem;}
+
+.figure {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/Middlewares/ST/STM32_Secure_Engine/_htmresc/st_logo.png b/Middlewares/ST/STM32_Secure_Engine/_htmresc/st_logo.png
deleted file mode 100644
index 8b80057f..00000000
Binary files a/Middlewares/ST/STM32_Secure_Engine/_htmresc/st_logo.png and /dev/null differ
diff --git a/Middlewares/ST/STM32_Secure_Engine/_htmresc/st_logo_2020.png b/Middlewares/ST/STM32_Secure_Engine/_htmresc/st_logo_2020.png
new file mode 100644
index 00000000..d6cebb5a
Binary files /dev/null and b/Middlewares/ST/STM32_Secure_Engine/_htmresc/st_logo_2020.png differ
diff --git a/Middlewares/Third_Party/LoRaWAN/Conf/Commissioning_template.h b/Middlewares/Third_Party/LoRaWAN/Conf/Commissioning_template.h
index efc12164..3b399304 100644
--- a/Middlewares/Third_Party/LoRaWAN/Conf/Commissioning_template.h
+++ b/Middlewares/Third_Party/LoRaWAN/Conf/Commissioning_template.h
@@ -26,13 +26,11 @@
   * @brief   End-device commissioning parameters
   ******************************************************************************
  */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __COMMISSIONING_H__
 #define __COMMISSIONING_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 /*!
  ******************************************************************************
  ********************************** WARNING ***********************************
@@ -81,8 +79,4 @@ extern "C" {
 
 /* USER CODE END EC2 */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __COMMISSIONING_H__ */
diff --git a/Middlewares/Third_Party/LoRaWAN/Conf/frag_decoder_if_template.h b/Middlewares/Third_Party/LoRaWAN/Conf/frag_decoder_if_template.h
new file mode 100644
index 00000000..4c1eae05
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/Conf/frag_decoder_if_template.h
@@ -0,0 +1,93 @@
+/**
+  ******************************************************************************
+  * @file    frag_decoder_if_template.h
+  * @author  MCD Application Team
+  * @brief   Applicative interfaces of LoRa-Alliance fragmentation decoder
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __FRAG_DECODER_IF_H__
+#define __FRAG_DECODER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+/* Private typedef -----------------------------------------------------------*/
+/* Private defines -----------------------------------------------------------*/
+
+#define INTEROP_TEST_MODE                           0
+
+#if (INTEROP_TEST_MODE == 1)
+/*!
+  * Maximum number of fragment that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_NB                                 20
+
+/*!
+  * Maximum fragment size that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_SIZE                               50
+
+/*!
+  * Maximum number of extra frames that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_REDUNDANCY                         5
+
+#else /* INTEROP_TEST_MODE == 0 */
+/*!
+  * Maximum number of fragment that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  * \note FRAG_MAX_NB = (SLOT_DWL_1_END - SLOT_DWL_1_START) / FRAG_MAX_SIZE
+  */
+#define FRAG_MAX_NB                                  716
+
+/*!
+  * Maximum fragment size that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_SIZE                               120
+
+/*!
+  * Maximum number of extra frames that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  * \note FRAG_MAX_NB * 0.10 (with redundancy = 10 %)
+  */
+#define FRAG_MAX_REDUNDANCY                         72
+
+#endif /* INTEROP_TEST_MODE */
+
+/* Private macros ------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Global variables ----------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+/* Functions Definition ------------------------------------------------------*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __FRAG_DECODER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/LoRaWAN/Conf/lora_info_template.c b/Middlewares/Third_Party/LoRaWAN/Conf/lora_info_template.c
index 52d1aa8d..c82825a9 100644
--- a/Middlewares/Third_Party/LoRaWAN/Conf/lora_info_template.c
+++ b/Middlewares/Third_Party/LoRaWAN/Conf/lora_info_template.c
@@ -20,6 +20,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "LoRaMac.h"
 #include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
 
 /* USER CODE BEGIN Includes */
 
@@ -118,7 +119,7 @@ void LoraInfo_Init(void)
   loraInfo.ActivationMode = 3;
 #else /* LORAWAN_KMS == 1 */
   loraInfo.Kms = 1;
-  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALISATION + OVER_THE_AIR_ACTIVATION << 1;
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
 #endif /* LORAWAN_KMS */
 }
 
diff --git a/Middlewares/Third_Party/LoRaWAN/Conf/lorawan_conf_template.h b/Middlewares/Third_Party/LoRaWAN/Conf/lorawan_conf_template.h
index ce94762f..7e14a134 100644
--- a/Middlewares/Third_Party/LoRaWAN/Conf/lorawan_conf_template.h
+++ b/Middlewares/Third_Party/LoRaWAN/Conf/lorawan_conf_template.h
@@ -25,8 +25,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-#include "sys_app.h"   /* needed for APP_PRINTF */
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -40,7 +38,7 @@ extern "C" {
 
 /* Region ------------------------------------*/
 /* the region listed here will be linked in the MW code */
-/* the applic (on sys_conf.h) shall just configure one region at the time */
+/* the application (on sys_conf.h) shall just configure one region at the time */
 /*#define REGION_AS923*/
 /*#define REGION_AU915*/
 /*#define REGION_CN470*/
@@ -52,9 +50,24 @@ extern "C" {
 #define REGION_US915
 /*#define REGION_RU864*/
 
-#define HYBRID_ENABLED          0
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
 
-#define KEY_LOG_ENABLED         1
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
 
 /* Class B ------------------------------------*/
 #define LORAMAC_CLASSB_ENABLED  0
@@ -113,4 +126,5 @@ extern "C" {
 #endif
 
 #endif /* __LORAWAN_CONF_H__ */
+
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/LoRaWAN/Conf/se-identity_template.h b/Middlewares/Third_Party/LoRaWAN/Conf/se-identity_template.h
index 8ed42876..da87d282 100644
--- a/Middlewares/Third_Party/LoRaWAN/Conf/se-identity_template.h
+++ b/Middlewares/Third_Party/LoRaWAN/Conf/se-identity_template.h
@@ -28,7 +28,7 @@
   *
   *          Portions COPYRIGHT 2020 STMicroelectronics
   *
-  * @file    se-identity_template.c
+  * @file    se-identity_template.h
   * @author  MCD Application Team
   * @brief   Secure Element identity and keys
   ******************************************************************************
diff --git a/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c b/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c
index a1d81d6e..a7c2b12b 100644
--- a/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c
+++ b/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c
@@ -1,35 +1,29 @@
 /*!
-  * \file      soft-se.c
-  *
-  * \brief     Secure Element software implementation
-  *
-  * \copyright Revised BSD License, see section \ref LICENSE.
-  *
-  * \code
-  *                ______                              _
-  *               / _____)             _              | |
-  *              ( (____  _____ ____ _| |_ _____  ____| |__
-  *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
-  *               _____) ) ____| | | || |_| ____( (___| | | |
-  *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
-  *              (C)2020 Semtech
-  *
-  *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
-  *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
-  *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
-  *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
-  *              embedded.connectivity.solutions===============
-  *
-  * \endcode
-  *
-  * \author    Miguel Luis ( Semtech )
-  *
-  * \author    Gregory Cristian ( Semtech )
-  *
-  * \author    Daniel Jaeckle ( STACKFORCE )
-  *
-  * \author    Johannes Bruder ( STACKFORCE )
-  */
+ * \file      soft-se.c
+ *
+ * \brief     Secure Element software implementation
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2020 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ */
+
 /**
   ******************************************************************************
   *
@@ -48,37 +42,21 @@
 #include "lorawan_conf.h"  /* LORAWAN_KMS */
 #include "radio.h"         /* needed for Random */
 #include "utilities.h"
-#include "LoRaMacHeaderTypes.h"
-#include "secure-element.h"
-#include "se-identity.h"
-
+#include "mw_log_conf.h"   /* needed for MW_LOG */
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
 #include "lorawan_aes.h"
 #include "cmac.h"
 #else /* LORAWAN_KMS == 1 */
-#include "mw_log_conf.h"   /* needed for MW_LOG */
 #include "kms_if.h"
 #endif /* LORAWAN_KMS */
 
-/* Private constants ---------------------------------------------------------*/
-/*!
-  * Number of supported crypto keys
-  */
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-#if ( LORAMAC_MAX_MC_CTX == 1 )
-#define NUM_OF_KEYS      14UL
-#else /* LORAMAC_MAX_MC_CTX > 1 */
-#define NUM_OF_KEYS      23UL
-#endif /* LORAMAC_MAX_MC_CTX */
+#include "LoRaMacHeaderTypes.h"
 
-#else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
-#if ( LORAMAC_MAX_MC_CTX == 1 )
-#define NUM_OF_KEYS      10UL
-#else /* LORAMAC_MAX_MC_CTX > 1 */
-#define NUM_OF_KEYS      19UL
-#endif /* LORAMAC_MAX_MC_CTX */
-#endif /* USE_LRWAN_1_1_X_CRYPTO */
+#include "secure-element.h"
+#include "secure-element-nvm.h"
+#include "se-identity.h"
 
+/* Private constants ---------------------------------------------------------*/
 /*!
  * MIC computation offset
  * \remark required for 1.1.x support
@@ -103,95 +81,17 @@
  */
 #define HEX16(X)  HEX8(X), X[8], X[9], X[10], X[11], X[12], X[13], X[14], X[15]
 
-#if defined (KEY_LOG_ENABLED) && (KEY_LOG_ENABLED == 1)
-#define KEY_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
-#else  /* !KEY_LOG_ENABLED */
-#define KEY_LOG(TS,VL,...)
-#endif /* KEY_LOG_ENABLED */
 /* Private Types ---------------------------------------------------------*/
-
-/*!
- * Identifier value pair type for Keys
- */
-typedef struct sKey
-{
-  /*
-   * Key identifier
-   */
-  KeyIdentifier_t KeyID;
-
-#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  /*
-   * Key value
-   */
-  uint8_t KeyValue[SE_KEY_SIZE];
-#else /* LORAWAN_KMS == 1 */
-  /*
-   * Key object index in the above list
-   */
-  CK_OBJECT_HANDLE Object_Index;
-#endif /* LORAWAN_KMS */
-} Key_t;
-
-/*
- * Secure Element Non Volatile Context structure
- */
-typedef struct sSecureElementNvCtx
-{
-  /*
-   * DevEUI storage
-   */
-  uint8_t DevEui[SE_EUI_SIZE];
-  /*
-   * Join EUI storage
-   */
-  uint8_t JoinEui[SE_EUI_SIZE];
-  /*
-   * Key List
-   */
-  Key_t KeyList[NUM_OF_KEYS];
-} SecureElementNvCtx_t;
-
 /* Private variables ---------------------------------------------------------*/
 /*!
  * Secure element context
  */
-static SecureElementNvCtx_t SeNvmCtx =
-{
-  /*!
-   * end-device IEEE EUI (big endian)
-   *
-   * \remark In this application the value is automatically generated by calling
-   *         BoardGetUniqueId function
-   */
-  .DevEui = LORAWAN_DEVICE_EUI,
-  /*!
-   * App/Join server IEEE EUI (big endian)
-   */
-  .JoinEui = LORAWAN_JOIN_EUI
-};
-
-#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-static const Key_t InitialKeyList[NUM_OF_KEYS] = SOFT_SE_KEY_LIST;
-#endif /* LORAWAN_KMS == 0 */
-
-static SecureElementNvmEvent SeNvmCtxChanged;
+static SecureElementNvmData_t* SeNvm;
 
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
 #else /* LORAWAN_KMS == 1 */
-static CK_ULONG DeriveKey_template_class = CKO_SECRET_KEY;
-static CK_ULONG DeriveKey_template_destroyable = CK_TRUE;
-static CK_ULONG DeriveKey_template_encrypt = CK_TRUE;
-static CK_ULONG DeriveKey_template_decrypt = CK_TRUE;
-static CK_ULONG DeriveKey_template_extract = CK_FALSE;
-static CK_ATTRIBUTE DeriveKey_template[] =
-{
-  {CKA_CLASS, (CK_VOID_PTR) &DeriveKey_template_class,       sizeof(CK_ULONG)},
-  {CKA_DESTROYABLE, (CK_VOID_PTR) &DeriveKey_template_destroyable, sizeof(CK_ULONG)},
-  {CKA_ENCRYPT, (CK_VOID_PTR) &DeriveKey_template_encrypt,     sizeof(CK_ULONG)},
-  {CKA_DECRYPT, (CK_VOID_PTR) &DeriveKey_template_decrypt,     sizeof(CK_ULONG)},
-  {CKA_EXTRACTABLE, (CK_VOID_PTR) &DeriveKey_template_extract,     sizeof(CK_ULONG)}
-};
+/* WARNING: Should be modified at the end of product development */
+static const CK_ULONG GlobalTemplateLabel = 0x444E524CU;
 
 /*
  * Intermediate buffer used for two reasons:
@@ -199,22 +99,82 @@ static CK_ATTRIBUTE DeriveKey_template[] =
  * - for Cmac combine InitVector + input buff
  */
 static uint8_t input_align_combined_buf[PAYLOAD_MAX_SIZE + SE_KEY_SIZE] ALIGN(4);
+
 static uint8_t output_align[PAYLOAD_MAX_SIZE] ALIGN(4);
+
 static uint8_t tag[SE_KEY_SIZE] ALIGN(4) = {0};
 #endif /* LORAWAN_KMS */
 
 /* Private functions prototypes ---------------------------------------------------*/
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-static SecureElementStatus_t GetKeyByID(KeyIdentifier_t keyID, Key_t **keyItem);
+static SecureElementStatus_t GetKeyByID( KeyIdentifier_t keyID, Key_t **keyItem );
 #else /* LORAWAN_KMS == 1 */
-static SecureElementStatus_t GetKeyIndexByID(KeyIdentifier_t keyID, CK_OBJECT_HANDLE *keyItem);
+static SecureElementStatus_t GetKeyIndexByID( KeyIdentifier_t keyID, CK_OBJECT_HANDLE *keyIndex );
+
+static SecureElementStatus_t GetSpecificLabelByID( KeyIdentifier_t keyID, uint32_t *specificLabel );
+
+static SecureElementStatus_t DeleteAllDynamicKeys( void );
 #endif /* LORAWAN_KMS */
 
+#if (defined (KEY_EXTRACTABLE) && (KEY_EXTRACTABLE == 1))
+static void PrintKey( KeyIdentifier_t key );
+#endif /* KEY_EXTRACTABLE */
+
 static SecureElementStatus_t ComputeCmac(uint8_t *micBxBuffer, uint8_t *buffer, uint16_t size, KeyIdentifier_t keyID,
                                          uint32_t *cmac);
-static void DummyCB(void);
+
 
 /* Private functions ---------------------------------------------------------*/
+#if (defined (KEY_EXTRACTABLE) && (KEY_EXTRACTABLE == 1))
+static void PrintKey( KeyIdentifier_t key )
+{
+    SecureElementStatus_t retval = SECURE_ELEMENT_ERROR;
+    Key_t *keyItem;
+    retval = SecureElementGetKeyByID(key, &keyItem);
+    if (retval == SECURE_ELEMENT_SUCCESS)
+    {
+        if (key == APP_KEY)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### AppKey:      ");
+        }
+        else if (key == NWK_KEY)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### NwkKey:      ");
+        }
+        else if (key == APP_S_KEY)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### AppSKey:     ");
+        }
+        else if (key == NWK_S_KEY)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### NwkSKey:     ");
+        }
+        else if (key == MC_ROOT_KEY)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### MCRootKey:   ");
+        }
+        else if (key == MC_KE_KEY)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### MCKEKey:     ");
+        }
+        else if (key == MC_KEY_0)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### MCKey_0:     ");
+        }
+        else if (key == MC_APP_S_KEY_0)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### MCAppSKey_0: ");
+        }
+        else if (key == MC_NWK_S_KEY_0)
+        {
+            MW_LOG(TS_OFF, VLEVEL_M, "###### MCNwkSKey_0: ");
+        }
+        MW_LOG(TS_OFF, VLEVEL_M, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n",
+               HEX16(keyItem->KeyValue));
+    }
+}
+#endif /* KEY_EXTRACTABLE */
+
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
 /*
  * Gets key item from key list.
@@ -223,17 +183,17 @@ static void DummyCB(void);
  * \param[OUT] keyItem        - Key item reference
  * \retval                    - Status of the operation
  */
-static SecureElementStatus_t GetKeyByID(KeyIdentifier_t keyID, Key_t **keyItem)
+static SecureElementStatus_t GetKeyByID( KeyIdentifier_t keyID, Key_t** keyItem )
 {
-  for (uint8_t i = 0; i < NUM_OF_KEYS; i++)
-  {
-    if (SeNvmCtx.KeyList[i].KeyID == keyID)
+    for( uint8_t i = 0; i < NUM_OF_KEYS; i++ )
     {
-      *keyItem = &(SeNvmCtx.KeyList[i]);
-      return SECURE_ELEMENT_SUCCESS;
+        if( SeNvm->KeyList[i].KeyID == keyID )
+        {
+            *keyItem = &( SeNvm->KeyList[i] );
+            return SECURE_ELEMENT_SUCCESS;
+        }
     }
-  }
-  return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+    return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
 }
 
 #else /* LORAWAN_KMS == 1 */
@@ -241,32 +201,165 @@ static SecureElementStatus_t GetKeyByID(KeyIdentifier_t keyID, Key_t **keyItem)
 /*
  * Gets key Index from key list in KMS table
  *
- * \param[IN]  keyID          - Key identifier
- * \param[OUT] keyIndex       - Key item reference
- * \retval                    - Status of the operation
+ * \param[IN]    keyID                    - Key identifier
+ * \param[OUT] keyIndex             - Key item reference
+ * \retval                                        - Status of the operation
  */
-static SecureElementStatus_t GetKeyIndexByID(KeyIdentifier_t keyID, CK_OBJECT_HANDLE *keyIndex)
+static SecureElementStatus_t GetKeyIndexByID( KeyIdentifier_t keyID, CK_OBJECT_HANDLE *keyIndex )
 {
-  for (uint8_t i = 0; i < NUM_OF_KEYS; i++)
-  {
-    if (SeNvmCtx.KeyList[i].KeyID == keyID)
+    for (uint8_t i = 0; i < NUM_OF_KEYS; i++)
     {
-      *keyIndex = SeNvmCtx.KeyList[i].Object_Index;
-      return SECURE_ELEMENT_SUCCESS;
+        if (SeNvm->KeyList[i].KeyID == keyID)
+        {
+            *keyIndex = SeNvm->KeyList[i].Object_Index;
+            return SECURE_ELEMENT_SUCCESS;
+        }
     }
-  }
-  return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+    return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
 }
 
-#endif /* LORAWAN_KMS */
+static SecureElementStatus_t GetSpecificLabelByID( KeyIdentifier_t keyID, uint32_t *specificLabel )
+{
+    SecureElementStatus_t retval = SECURE_ELEMENT_SUCCESS;
+    switch (keyID)
+    {
+        case APP_KEY:
+            *specificLabel = 0x5F505041U;
+            break;
+        case NWK_KEY:
+            *specificLabel = 0x5F4B574EU;
+            break;
+#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+        case J_S_INT_KEY:
+            *specificLabel = 0x314B574EU;
+            break;
+        case J_S_ENC_KEY:
+            *specificLabel = 0x324B574EU;
+            break;
+        case F_NWK_S_INT_KEY:
+            *specificLabel = 0x334B574EU;
+            break;
+        case S_NWK_S_INT_KEY:
+            *specificLabel = 0x344B574EU;
+            break;
+        case NWK_S_ENC_KEY:
+            *specificLabel = 0x354B574EU;
+            break;
+#else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
+        case NWK_S_KEY:
+            *specificLabel = 0x534B574EU;
+            break;
+#endif /* USE_LRWAN_1_1_X_CRYPTO */
+        case APP_S_KEY:
+            *specificLabel = 0x53505041U;
+            break;
+        case MC_ROOT_KEY:
+            *specificLabel = 0x5452434DU;
+            break;
+        case MC_KE_KEY:
+            *specificLabel = 0x454B434DU;
+            break;
+        case MC_KEY_0:
+            *specificLabel = 0x304B434DU;
+            break;
+        case MC_APP_S_KEY_0:
+            *specificLabel = 0x3053414DU;
+            break;
+        case MC_NWK_S_KEY_0:
+            *specificLabel = 0x30534E4DU;
+            break;
+#if ( LORAMAC_MAX_MC_CTX > 1 )
+        case MC_KEY_1:
+            *specificLabel = 0x314B434DU;
+            break;
+        case MC_APP_S_KEY_1:
+            *specificLabel = 0x3153414DU;
+            break;
+        case MC_NWK_S_KEY_1:
+            *specificLabel = 0x31534E4DU;
+            break;
+        case MC_KEY_2:
+            *specificLabel = 0x324B434DU;
+            break;
+        case MC_APP_S_KEY_2:
+            *specificLabel = 0x3253414DU;
+            break;
+        case MC_NWK_S_KEY_2:
+            *specificLabel = 0x32534E4DU;
+            break;
+        case MC_KEY_3:
+            *specificLabel = 0x334B434DU;
+            break;
+        case MC_APP_S_KEY_3:
+            *specificLabel = 0x3353414DU;
+            break;
+        case MC_NWK_S_KEY_3:
+            *specificLabel = 0x33534E4DU;
+            break;
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+        default:
+            retval = SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+            break;
+    }
+    return retval;
+}
 
-/*
- * Dummy callback in case if the user provides NULL function pointer
- */
-static void DummyCB(void)
+static SecureElementStatus_t DeleteAllDynamicKeys( void )
 {
-  return;
+    CK_RV rv;
+    CK_SESSION_HANDLE session;
+    CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+    CK_OBJECT_HANDLE hObject[NUM_OF_KEYS];
+    uint32_t ulCount = 0;
+
+    /* Open session with KMS */
+    rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+    /* Get all keys handle */
+    if (rv == CKR_OK)
+    {
+        rv = C_FindObjectsInit(session, NULL, 0);
+    }
+
+    /* Find all existing keys handle */
+    if (rv == CKR_OK)
+    {
+        rv = C_FindObjects(session, hObject, NUM_OF_KEYS, (CK_ULONG *) &ulCount);
+    }
+
+    if (rv == CKR_OK)
+    {
+        rv = C_FindObjectsFinal(session);
+    }
+
+    if (ulCount <= NUM_OF_KEYS)
+    {
+        for (uint8_t i = 0; i < ulCount; i++)
+        {
+            /* Exclude all Embedded keys */
+            if (hObject[i] > LAST_KMS_KEY_OBJECT_HANDLE)
+            {
+                if (rv == CKR_OK)
+                {
+                    rv = C_DestroyObject(session, hObject[i]);
+                }
+            }
+        }
+    }
+
+    /* Close sessions */
+    if (session > 0)
+    {
+        (void)C_CloseSession(session);
+    }
+
+    if (rv != CKR_OK)
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
+    return SECURE_ELEMENT_SUCCESS;
 }
+#endif /* LORAWAN_KMS */
 
 /*
  * Computes a CMAC of a message using provided initial Bx block
@@ -280,109 +373,107 @@ static void DummyCB(void)
  * \param[OUT] cmac           - Computed cmac
  * \retval                    - Status of the operation
  */
-static SecureElementStatus_t ComputeCmac(uint8_t *micBxBuffer, uint8_t *buffer, uint16_t size, KeyIdentifier_t keyID,
-                                         uint32_t *cmac)
+static SecureElementStatus_t ComputeCmac( uint8_t* micBxBuffer, uint8_t* buffer, uint16_t size, KeyIdentifier_t keyID,
+                                          uint32_t* cmac )
 {
-  SecureElementStatus_t retval = SECURE_ELEMENT_ERROR;
-  if ((buffer == NULL) || (cmac == NULL))
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
+    if( ( buffer == NULL ) || ( cmac == NULL ) )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
 
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  uint8_t Cmac[16];
-  AES_CMAC_CTX aesCmacCtx[1];
-
-  AES_CMAC_Init(aesCmacCtx);
+    uint8_t Cmac[16];
+    AES_CMAC_CTX aesCmacCtx[1];
 
-  Key_t *keyItem;
-  retval = GetKeyByID(keyID, &keyItem);
+    AES_CMAC_Init( aesCmacCtx );
 
-  if (retval == SECURE_ELEMENT_SUCCESS)
-  {
-    AES_CMAC_SetKey(aesCmacCtx, keyItem->KeyValue);
+    Key_t*                keyItem;
+    SecureElementStatus_t retval = GetKeyByID( keyID, &keyItem );
 
-    if (micBxBuffer != NULL)
+    if( retval == SECURE_ELEMENT_SUCCESS )
     {
-      AES_CMAC_Update(aesCmacCtx, micBxBuffer, 16);
-    }
+        AES_CMAC_SetKey( aesCmacCtx, keyItem->KeyValue );
 
-    AES_CMAC_Update(aesCmacCtx, buffer, size);
+        if( micBxBuffer != NULL )
+        {
+            AES_CMAC_Update( aesCmacCtx, micBxBuffer, 16 );
+        }
 
-    AES_CMAC_Final(Cmac, aesCmacCtx);
+        AES_CMAC_Update( aesCmacCtx, buffer, size );
 
-    /* Bring into the required format */
-    *cmac = (uint32_t)((uint32_t) Cmac[3] << 24 | (uint32_t) Cmac[2] << 16 | (uint32_t) Cmac[1] << 8 |
-                       (uint32_t) Cmac[0]);
-  }
-#else /* LORAWAN_KMS == 1 */
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint32_t tag_lenth = 0;
-  CK_OBJECT_HANDLE object_handle ;
-
-  /* AES CMAC Authentication variables */
-  CK_MECHANISM aes_cmac_mechanism = { CKM_AES_CMAC, (CK_VOID_PTR)NULL, 0 };
-
-  retval = GetKeyIndexByID(keyID, &object_handle);
-  if (retval != SECURE_ELEMENT_SUCCESS)
-  {
-    return retval;
-  }
+        AES_CMAC_Final( Cmac, aesCmacCtx );
 
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+        // Bring into the required format
+        *cmac = ( uint32_t )( ( uint32_t ) Cmac[3] << 24 | ( uint32_t ) Cmac[2] << 16 | ( uint32_t ) Cmac[1] << 8 |
+                              ( uint32_t ) Cmac[0] );
+    }
+#else /* LORAWAN_KMS == 1 */
+    CK_RV rv;
+    CK_SESSION_HANDLE session;
+    CK_FLAGS session_flags = CKF_SERIAL_SESSION;    /* Read ONLY session */
+    uint32_t tag_lenth = 0;
+    CK_OBJECT_HANDLE key_handle ;
 
-  /* Configure session to Authentication message in AES CMAC with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_SignInit(session, &aes_cmac_mechanism, object_handle);
-  }
+    /* AES CMAC Authentication variables */
+    CK_MECHANISM aes_cmac_mechanism = { CKM_AES_CMAC, (CK_VOID_PTR)NULL, 0 };
 
-  /* Encrypt clear message */
-  if (rv == CKR_OK)
-  {
-    /* work around : need to double-check if possible to use micBxBuffer as IV for Sign */
-    if (micBxBuffer != NULL)
+    SecureElementStatus_t retval = GetKeyIndexByID(keyID, &key_handle);
+    if (retval != SECURE_ELEMENT_SUCCESS)
     {
-      memcpy1((uint8_t *) &input_align_combined_buf[0], (uint8_t *) micBxBuffer, SE_KEY_SIZE);
-      memcpy1((uint8_t *) &input_align_combined_buf[SE_KEY_SIZE], (uint8_t *) buffer, size);
+        return retval;
     }
-    else
+
+    /* Open session with KMS */
+    rv = C_OpenSession(0,    session_flags, NULL, 0, &session);
+
+    /* Configure session to Authentication message in AES CMAC with settings included into the mechanism */
+    if (rv == CKR_OK)
     {
-      memcpy1((uint8_t *) &input_align_combined_buf[0], (uint8_t *) buffer, size);
+        rv = C_SignInit(session, &aes_cmac_mechanism, key_handle);
     }
-  }
 
-  if (rv == CKR_OK)
-  {
-    if (micBxBuffer != NULL)
+    /* Encrypt clear message */
+    if (rv == CKR_OK)
     {
-      rv = C_Sign(session, (CK_BYTE_PTR)&input_align_combined_buf[0], size + SE_KEY_SIZE, &tag[0],
-                  (CK_ULONG_PTR)&tag_lenth);
+        /* work around : need to double-check if possible to use micBxBuffer as IV for Sign */
+        if (micBxBuffer != NULL)
+        {
+            memcpy1((uint8_t *) &input_align_combined_buf[0], (uint8_t *) micBxBuffer, SE_KEY_SIZE);
+            memcpy1((uint8_t *) &input_align_combined_buf[SE_KEY_SIZE], (uint8_t *) buffer, size);
+        }
+        else
+        {
+            memcpy1((uint8_t *) &input_align_combined_buf[0], (uint8_t *) buffer, size);
+        }
     }
-    else
+
+    if (rv == CKR_OK)
     {
-      rv = C_Sign(session, (CK_BYTE_PTR)&input_align_combined_buf[0], size, &tag[0],
-                  (CK_ULONG_PTR)&tag_lenth);
+        if (micBxBuffer != NULL)
+        {
+            rv = C_Sign(session, (CK_BYTE_PTR)&input_align_combined_buf[0], size + SE_KEY_SIZE, &tag[0],
+                        (CK_ULONG_PTR)&tag_lenth);
+        }
+        else
+        {
+            rv = C_Sign(session, (CK_BYTE_PTR)&input_align_combined_buf[0], size, &tag[0],
+                        (CK_ULONG_PTR)&tag_lenth);
+        }
     }
-  }
 
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
+    /* Close session with KMS */
+    (void)C_CloseSession(session);
 
-  /* combine to a 32bit authentication word (MIC) */
-  *cmac = (uint32_t)((uint32_t) tag[3] << 24 | (uint32_t) tag[2] << 16 | (uint32_t) tag[1] << 8 |
-                     (uint32_t) tag[0]);
+    /* combine to a 32bit authentication word (MIC) */
+    *cmac = (uint32_t)((uint32_t) tag[3] << 24 | (uint32_t) tag[2] << 16 | (uint32_t) tag[1] << 8 |
+                       (uint32_t) tag[0]);
 
-  if (rv != CKR_OK)
-  {
-    retval = SECURE_ELEMENT_ERROR;
-  }
+    if (rv != CKR_OK)
+    {
+        retval = SECURE_ELEMENT_ERROR;
+    }
 #endif /* LORAWAN_KMS */
-
-  return retval;
+    return retval;
 }
 
 
@@ -391,609 +482,796 @@ static SecureElementStatus_t ComputeCmac(uint8_t *micBxBuffer, uint8_t *buffer,
 /*
  * API functions
  */
-
-SecureElementStatus_t SecureElementInit(SecureElementNvmEvent seNvmCtxChanged)
+/* ST_WORKAROUND: Add unique ID callback as input parameter */
+SecureElementStatus_t SecureElementInit( SecureElementNvmData_t *nvm, SecureElementGetUniqueId seGetUniqueId )
 {
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  Key_t *keyItem;
-  SecureElementStatus_t retval = SECURE_ELEMENT_ERROR;
-
-  /* Initialize LoRaWAN Key List buffer */
-  memcpy1((uint8_t *)(SeNvmCtx.KeyList), (const uint8_t *)InitialKeyList, sizeof(Key_t)*NUM_OF_KEYS);
-
-  retval = GetKeyByID(APP_KEY, &keyItem);
-  KEY_LOG(TS_OFF, VLEVEL_M, "###### OTAA ######\r\n");
-  if (retval == SECURE_ELEMENT_SUCCESS)
-  {
-    KEY_LOG(TS_OFF, VLEVEL_M, "###### AppKey:  %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\r\n", HEX16(keyItem->KeyValue));
-  }
-  retval = GetKeyByID(NWK_KEY, &keyItem);
-  if (retval == SECURE_ELEMENT_SUCCESS)
-  {
-    KEY_LOG(TS_OFF, VLEVEL_M, "###### NwkKey:  %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\r\n", HEX16(keyItem->KeyValue));
-  }
-  KEY_LOG(TS_OFF, VLEVEL_M, "###### ABP  ######\r\n");
-  retval = GetKeyByID(APP_S_KEY, &keyItem);
-  if (retval == SECURE_ELEMENT_SUCCESS)
-  {
-    KEY_LOG(TS_OFF, VLEVEL_M, "###### AppSKey: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\r\n", HEX16(keyItem->KeyValue));
-  }
-  retval = GetKeyByID(NWK_S_KEY, &keyItem);
-  if (retval == SECURE_ELEMENT_SUCCESS)
-  {
-    KEY_LOG(TS_OFF, VLEVEL_M, "###### NwkSKey: %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\r\n", HEX16(keyItem->KeyValue));
-  }
+    SecureElementNvmData_t seNvmInit =
+    {
+        /*!
+        * end-device IEEE EUI (big endian)
+        *
+        * \remark In this application the value is automatically generated by
+        *         calling BoardGetUniqueId function
+        */
+        .DevEui = LORAWAN_DEVICE_EUI,
+        /*!
+        * App/Join server IEEE EUI (big endian)
+        */
+        .JoinEui = LORAWAN_JOIN_EUI,
+        /*!
+        * LoRaWAN key list
+        */
+        .KeyList = SOFT_SE_KEY_LIST
+    };
+
+
+    if( nvm == NULL )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
+
+    // Initialize nvm pointer
+    SeNvm = nvm;
+
+    // Initialize data
+    memcpy1( ( uint8_t* )SeNvm, ( uint8_t* )&seNvmInit, sizeof( seNvmInit ) );
 #else /* LORAWAN_KMS == 1 */
-  uint8_t itr = 0;
+    uint8_t itr = 0;
+    uint8_t devEUI[SE_EUI_SIZE] = LORAWAN_DEVICE_EUI;
+    uint8_t joinEUI[SE_EUI_SIZE] = LORAWAN_JOIN_EUI;
+
+    if (nvm == NULL)
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
 
-  // Initialize with defaults
-  SeNvmCtx.KeyList[itr++].KeyID = APP_KEY;
-  SeNvmCtx.KeyList[itr++].KeyID = NWK_KEY;
+    /* Initialize nvm pointer */
+    SeNvm = nvm;
+
+    /* Initialize with defaults */
+    memcpy1((uint8_t *)SeNvm->DevEui, devEUI, SE_EUI_SIZE);
+    memcpy1((uint8_t *)SeNvm->JoinEui, joinEUI, SE_EUI_SIZE);
+
+    SeNvm->KeyList[itr++].KeyID = APP_KEY;
+    SeNvm->KeyList[itr++].KeyID = NWK_KEY;
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-  SeNvmCtx.KeyList[itr++].KeyID = J_S_INT_KEY;
-  SeNvmCtx.KeyList[itr++].KeyID = J_S_ENC_KEY;
-  SeNvmCtx.KeyList[itr++].KeyID = F_NWK_S_INT_KEY;
-  SeNvmCtx.KeyList[itr++].KeyID = S_NWK_S_INT_KEY;
-  SeNvmCtx.KeyList[itr++].KeyID = NWK_S_ENC_KEY;
+    SeNvm->KeyList[itr++].KeyID = J_S_INT_KEY;
+    SeNvm->KeyList[itr++].KeyID = J_S_ENC_KEY;
+    SeNvm->KeyList[itr++].KeyID = F_NWK_S_INT_KEY;
+    SeNvm->KeyList[itr++].KeyID = S_NWK_S_INT_KEY;
+    SeNvm->KeyList[itr++].KeyID = NWK_S_ENC_KEY;
 #else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
-  SeNvmCtx.KeyList[itr++].KeyID = NWK_S_KEY;
+    SeNvm->KeyList[itr++].KeyID = NWK_S_KEY;
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
-  SeNvmCtx.KeyList[itr++].KeyID = APP_S_KEY;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_ROOT_KEY;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_KE_KEY;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_KEY_0;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_APP_S_KEY_0;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_NWK_S_KEY_0;
+    SeNvm->KeyList[itr++].KeyID = APP_S_KEY;
+    SeNvm->KeyList[itr++].KeyID = MC_ROOT_KEY;
+    SeNvm->KeyList[itr++].KeyID = MC_KE_KEY;
+    SeNvm->KeyList[itr++].KeyID = MC_KEY_0;
+    SeNvm->KeyList[itr++].KeyID = MC_APP_S_KEY_0;
+    SeNvm->KeyList[itr++].KeyID = MC_NWK_S_KEY_0;
 #if ( LORAMAC_MAX_MC_CTX > 1 )
-  SeNvmCtx.KeyList[itr++].KeyID = MC_KEY_1;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_APP_S_KEY_1;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_NWK_S_KEY_1;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_KEY_2;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_APP_S_KEY_2;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_NWK_S_KEY_2;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_KEY_3;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_APP_S_KEY_3;
-  SeNvmCtx.KeyList[itr++].KeyID = MC_NWK_S_KEY_3;
+    SeNvm->KeyList[itr++].KeyID = MC_KEY_1;
+    SeNvm->KeyList[itr++].KeyID = MC_APP_S_KEY_1;
+    SeNvm->KeyList[itr++].KeyID = MC_NWK_S_KEY_1;
+    SeNvm->KeyList[itr++].KeyID = MC_KEY_2;
+    SeNvm->KeyList[itr++].KeyID = MC_APP_S_KEY_2;
+    SeNvm->KeyList[itr++].KeyID = MC_NWK_S_KEY_2;
+    SeNvm->KeyList[itr++].KeyID = MC_KEY_3;
+    SeNvm->KeyList[itr++].KeyID = MC_APP_S_KEY_3;
+    SeNvm->KeyList[itr++].KeyID = MC_NWK_S_KEY_3;
 #endif /*LORAMAC_MAX_MC_CTX > 1 */
-  SeNvmCtx.KeyList[itr].KeyID = SLOT_RAND_ZERO_KEY;
-
+    SeNvm->KeyList[itr].KeyID = SLOT_RAND_ZERO_KEY;
+
+    /* Delete all obsolete keys in NVM  */
+    DeleteAllDynamicKeys();
+
+    SecureElementSetObjHandler(APP_KEY, KMS_APP_KEY_OBJECT_HANDLE);
+    SecureElementSetObjHandler(NWK_KEY, KMS_NWK_KEY_OBJECT_HANDLE);
+    SecureElementSetObjHandler(APP_S_KEY, KMS_APP_S_KEY_OBJECT_HANDLE);
+    SecureElementSetObjHandler(NWK_S_KEY, KMS_NWK_S_KEY_OBJECT_HANDLE);
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+    SecureElementSetObjHandler(SLOT_RAND_ZERO_KEY, KMS_ZERO_KEY_OBJECT_HANDLE);
+#endif /* LORAMAC_CLASSB_ENABLED */
 #endif /* LORAWAN_KMS */
 
-  /* Assign callback */
-  if (seNvmCtxChanged != 0)
-  {
-    SeNvmCtxChanged = seNvmCtxChanged;
-  }
-  else
-  {
-    SeNvmCtxChanged = DummyCB;
-  }
+#if (defined (KEY_EXTRACTABLE) && (KEY_EXTRACTABLE == 1))
+    MW_LOG(TS_OFF, VLEVEL_M, "###### OTAA ######\r\n");
+    PrintKey(APP_KEY);
+    PrintKey(NWK_KEY);
+    MW_LOG(TS_OFF, VLEVEL_M, "###### ABP  ######\r\n");
+    PrintKey(APP_S_KEY);
+    PrintKey(NWK_S_KEY);
+#endif /* KEY_EXTRACTABLE */
 
 #if !defined( SECURE_ELEMENT_PRE_PROVISIONED )
-#if ( STATIC_DEVICE_EUI == 0 )
-  /* Get a DevEUI from MCU unique ID */
-  GetUniqueId(SeNvmCtx.DevEui);
+#if( STATIC_DEVICE_EUI == 0 )
+    if (seGetUniqueId != NULL)
+    {
+        // Get a DevEUI from MCU unique ID
+        seGetUniqueId(SeNvm->DevEui);
+    }
 #endif /* STATIC_DEVICE_EUI */
 #endif /* !SECURE_ELEMENT_PRE_PROVISIONED */
-  SeNvmCtxChanged();
-
-  return SECURE_ELEMENT_SUCCESS;
+    return SECURE_ELEMENT_SUCCESS;
 }
 
-SecureElementStatus_t SecureElementDeleteDerivedKeys(uint8_t *kms_key_label)
+/* ST_WORKAROUND_BEGIN: Add KMS specific functions */
+SecureElementStatus_t SecureElementGetKeyByID( KeyIdentifier_t keyID, Key_t **keyItem )
 {
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  return SECURE_ELEMENT_ERROR;
+#if (defined (KEY_EXTRACTABLE) && (KEY_EXTRACTABLE == 1))
+    for (uint8_t i = 0; i < NUM_OF_KEYS; i++)
+    {
+        if (SeNvm->KeyList[i].KeyID == keyID)
+        {
+            *keyItem = &(SeNvm->KeyList[i]);
+            return SECURE_ELEMENT_SUCCESS;
+        }
+    }
+#endif /* KEY_EXTRACTABLE */
+    return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
 #else /* LORAWAN_KMS == 1 */
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Work Around: waiting for bugzilla Ticket 80990  */
-  /* Be sure there are no remaining derived key in the NVM */
-  /* The problem is that today there is no a Close session procedure */
-  /* on the other hand this could erase keys generated by the application */
-  /* so be very careful with this ... */
-  if (rv == CKR_OK)
-  {
-    rv = C_DestroyObject(session, 50);  /* KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS = 50 */
-    rv = C_DestroyObject(session, 51);
-    rv = C_DestroyObject(session, 52);
-    rv = C_DestroyObject(session, 53);
-    rv = C_DestroyObject(session, 54);
-    rv = C_DestroyObject(session, 55);
-    rv = C_DestroyObject(session, 56);
-    rv = C_DestroyObject(session, 57);  /* from kms_platf_objects_interface.h we use max 8 objects */
-  }
-  else
-  {
-    return SECURE_ELEMENT_ERROR;
-  }
+    CK_RV rv;
+    CK_SESSION_HANDLE session;
+    CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+    CK_OBJECT_HANDLE key_handle = (CK_OBJECT_HANDLE)(~0UL);
+    CK_ULONG derive_key_template_class = CKO_SECRET_KEY;
+    uint8_t extractable_key[16] = {0};
+    CK_ATTRIBUTE key_attribute_template = {CKA_VALUE, (CK_VOID_PTR) &derive_key_template_class, 16UL};
+    uint8_t index_keylist = 0;
+    for (index_keylist = 0; index_keylist < NUM_OF_KEYS; index_keylist++)
+    {
+        if (SeNvm->KeyList[index_keylist].KeyID == keyID)
+        {
+            key_handle = SeNvm->KeyList[index_keylist].Object_Index;
+            break;
+        }
+    }
+    if (key_handle == (CK_OBJECT_HANDLE)(~0UL))
+    {
+        return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+    }
 
-  /* Close sessions */
-  if (session > 0)
-  {
+    /* Open session with KMS */
+    rv = C_OpenSession(0, session_flags, NULL, 0, &session);
+
+    /* Get key to display */
+    if (rv == CKR_OK)
+    {
+        key_attribute_template.pValue = extractable_key;
+        rv = C_GetAttributeValue(session, key_handle, &key_attribute_template, 1UL);
+    }
+    if (rv == CKR_OK)
+    {
+        memcpy1(SeNvm->KeyList[index_keylist].KeyValue, extractable_key, sizeof(extractable_key));
+        *keyItem = &(SeNvm->KeyList[index_keylist]);
+    }
+
+    /* Close sessions */
     (void)C_CloseSession(session);
-  }
-  return SECURE_ELEMENT_SUCCESS;
+
+    if (rv != CKR_OK)
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
+    return SECURE_ELEMENT_SUCCESS;
+
 #endif /* LORAWAN_KMS == 1 */
 }
 
-SecureElementStatus_t SecureElementRestoreNvmCtx(void *seNvmCtx)
+SecureElementStatus_t SecureElementDeleteDynamicKeys( KeyIdentifier_t keyID, uint32_t *key_label )
 {
-  /* Restore nvm context */
-  if (seNvmCtx != 0)
-  {
-    memcpy1((uint8_t *) &SeNvmCtx, (uint8_t *) seNvmCtx, sizeof(SeNvmCtx));
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+    return SECURE_ELEMENT_ERROR;
+#else /* LORAWAN_KMS == 1 */
+    CK_RV rv;
+    CK_SESSION_HANDLE session;
+    CK_FLAGS session_flags = CKF_SERIAL_SESSION;    /* Read ONLY session */
+    CK_OBJECT_HANDLE hObject[NUM_OF_KEYS];
+    CK_ULONG local_template_label[] = {GlobalTemplateLabel, 0UL};
+    CK_ATTRIBUTE dynamic_key_template = {CKA_LABEL, (CK_VOID_PTR)local_template_label, sizeof(local_template_label)};
+    uint32_t ulCount = 0;
+
+    if (SECURE_ELEMENT_SUCCESS != GetSpecificLabelByID(keyID, &local_template_label[1]))
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
+    *key_label = local_template_label[1];
+
+    /* Open session with KMS */
+    rv = C_OpenSession(0,    session_flags, NULL, 0, &session);
+
+    /* Search from Template pattern */
+    if (rv == CKR_OK)
+    {
+        rv = C_FindObjectsInit(session, &dynamic_key_template, sizeof(dynamic_key_template) / sizeof(CK_ATTRIBUTE));
+    }
+
+    /* Find all existing keys handle Template pattern */
+    if (rv == CKR_OK)
+    {
+        rv = C_FindObjects(session, hObject, NUM_OF_KEYS, (CK_ULONG *) &ulCount);
+    }
+
+    if (rv == CKR_OK)
+    {
+        rv = C_FindObjectsFinal(session);
+    }
+
+    if (ulCount <= NUM_OF_KEYS)
+    {
+        for (uint8_t i = 0; i < ulCount; i++)
+        {
+            if (rv == CKR_OK)
+            {
+                rv = C_DestroyObject(session, hObject[i]);
+            }
+        }
+    }
+
+    /* Close sessions */
+    if (session > 0)
+    {
+        (void)C_CloseSession(session);
+    }
+
+    if (rv != CKR_OK)
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
     return SECURE_ELEMENT_SUCCESS;
-  }
-  else
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
+#endif /* LORAWAN_KMS == 1 */
 }
 
-void *SecureElementGetNvmCtx(size_t *seNvmCtxSize)
+SecureElementStatus_t SecureElementSetObjHandler( KeyIdentifier_t keyID, uint32_t keyIndex )
 {
-  *seNvmCtxSize = sizeof(SeNvmCtx);
-  return &SeNvmCtx;
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+    return SECURE_ELEMENT_ERROR;
+#else /* LORAWAN_KMS == 1 */
+    for (uint8_t i = 0; i < NUM_OF_KEYS; i++)
+    {
+        if (SeNvm->KeyList[i].KeyID == keyID)
+        {
+            SeNvm->KeyList[i].Object_Index = (CK_OBJECT_HANDLE) keyIndex;
+            return SECURE_ELEMENT_SUCCESS;
+        }
+    }
+    return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+#endif /* LORAWAN_KMS */
 }
+/* ST_WORKAROUND_END */
 
-SecureElementStatus_t SecureElementSetKey(KeyIdentifier_t keyID, uint8_t *key)
+SecureElementStatus_t SecureElementSetKey( KeyIdentifier_t keyID, uint8_t* key )
 {
-  if (key == NULL)
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
+    if( key == NULL )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
 
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  for (uint8_t i = 0; i < NUM_OF_KEYS; i++)
-  {
-    if (SeNvmCtx.KeyList[i].KeyID == keyID)
+    for( uint8_t i = 0; i < NUM_OF_KEYS; i++ )
+    {
+        if( SeNvm->KeyList[i].KeyID == keyID )
+        {
+            /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+#if ( LORAMAC_MAX_MC_CTX == 1 )
+            if ( keyID == MC_KEY_0 )
+#else /* LORAMAC_MAX_MC_CTX > 1 */
+            if( ( keyID == MC_KEY_0 ) || ( keyID == MC_KEY_1 ) || ( keyID == MC_KEY_2 ) || ( keyID == MC_KEY_3 ) )
+#endif /* LORAMAC_MAX_MC_CTX */
+            /* ST_WORKAROUND_END */
+            {  // Decrypt the key if its a Mckey
+                SecureElementStatus_t retval           = SECURE_ELEMENT_ERROR;
+                uint8_t               decryptedKey[16] = { 0 };
+
+                retval = SecureElementAesEncrypt( key, 16, MC_KE_KEY, decryptedKey );
+
+                memcpy1( SeNvm->KeyList[i].KeyValue, decryptedKey, SE_KEY_SIZE );
+                return retval;
+            }
+            else
+            {
+                memcpy1( SeNvm->KeyList[i].KeyValue, key, SE_KEY_SIZE );
+                return SECURE_ELEMENT_SUCCESS;
+            }
+        }
+    }
+
+    return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+#else /* LORAWAN_KMS == 1 */
+    SecureElementStatus_t retval = SECURE_ELEMENT_ERROR;
+    CK_RV rv;
+    CK_SESSION_HANDLE session;
+    CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+    CK_OBJECT_HANDLE key_handle;
+    CK_ULONG template_class = CKO_SECRET_KEY;
+    CK_ULONG template_type = CKK_AES;
+#if (defined (KEY_EXTRACTABLE) && (KEY_EXTRACTABLE == 1))
+    CK_ULONG template_true = CK_TRUE;
+#else
+    CK_ULONG template_false = CK_TRUE;
+#endif /* KEY_EXTRACTABLE */
+    uint32_t key_ui32[] =
+    {
+        key[3]  | (key[2] << 8)  | (key[1] << 16)  | (key[0] << 24),
+        key[7]  | (key[6] << 8)  | (key[5] << 16)  | (key[4] << 24),
+        key[11] | (key[10] << 8) | (key[9] << 16)  | (key[8] << 24),
+        key[15] | (key[14] << 8) | (key[13] << 16) | (key[12] << 24),
+    };
+
+    uint32_t specific_label[] = {GlobalTemplateLabel, 0UL};
+    CK_ATTRIBUTE key_attribute_template[] =
     {
+        { CKA_CLASS, (CK_VOID_PTR) &template_class,    sizeof(CK_BBOOL)      },
+        { CKA_KEY_TYPE, (CK_VOID_PTR) &template_type,     sizeof(CK_BBOOL)      },
+        { CKA_VALUE, (CK_VOID_PTR)key_ui32,           sizeof(key_ui32)      },
+#if (defined (KEY_EXTRACTABLE) && (KEY_EXTRACTABLE == 1))
+        { CKA_EXTRACTABLE, (CK_VOID_PTR) &template_true,     sizeof(CK_BBOOL)      },
+#else
+        { CKA_EXTRACTABLE, (CK_VOID_PTR) &template_false,    sizeof(CK_BBOOL)      },
+#endif /* KEY_EXTRACTABLE */
+        { CKA_LABEL, (CK_VOID_PTR)specific_label,     sizeof(specific_label)},
+    };
+
+    /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
 #if ( LORAMAC_MAX_MC_CTX == 1 )
-      if (keyID == MC_KEY_0)
+    if ( keyID == MC_KEY_0 )
 #else /* LORAMAC_MAX_MC_CTX > 1 */
-      if ((keyID == MC_KEY_0) || (keyID == MC_KEY_1) || (keyID == MC_KEY_2) || (keyID == MC_KEY_3))
+    if( ( keyID == MC_KEY_0 ) || ( keyID == MC_KEY_1 ) || ( keyID == MC_KEY_2 ) || ( keyID == MC_KEY_3 ) )
 #endif /* LORAMAC_MAX_MC_CTX */
-      {
-        /* Decrypt the key if its a Mckey */
-        SecureElementStatus_t retval = SECURE_ELEMENT_ERROR;
+    /* ST_WORKAROUND_END */
+    {  // Decrypt the key if its a Mckey
         uint8_t decryptedKey[16] = { 0 };
+        if (SECURE_ELEMENT_SUCCESS != SecureElementAesEncrypt( key, 16, MC_KE_KEY, decryptedKey ))
+        {
+            return SECURE_ELEMENT_ERROR;
+        }
+
+        key_ui32[0] = decryptedKey[3]  | (decryptedKey[2] << 8)  | (decryptedKey[1] << 16)  | (decryptedKey[0] << 24);
+        key_ui32[1] = decryptedKey[7]  | (decryptedKey[6] << 8)  | (decryptedKey[5] << 16)  | (decryptedKey[4] << 24);
+        key_ui32[2] = decryptedKey[11] | (decryptedKey[10] << 8) | (decryptedKey[9] << 16)  | (decryptedKey[8] << 24);
+        key_ui32[3] = decryptedKey[15] | (decryptedKey[14] << 8) | (decryptedKey[13] << 16) | (decryptedKey[12] << 24);
+    }
 
-        retval = SecureElementAesEncrypt(key, 16, MC_KE_KEY, decryptedKey);
+    if (SECURE_ELEMENT_SUCCESS != GetKeyIndexByID(keyID, &key_handle))
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
 
-        memcpy1(SeNvmCtx.KeyList[i].KeyValue, decryptedKey, SE_KEY_SIZE);
-        SeNvmCtxChanged();
+    if (SECURE_ELEMENT_SUCCESS != SecureElementDeleteDynamicKeys(keyID, &specific_label[1]))
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
 
-        return retval;
-      }
-      else
-      {
-        memcpy1(SeNvmCtx.KeyList[i].KeyValue, key, SE_KEY_SIZE);
-        SeNvmCtxChanged();
-        return SECURE_ELEMENT_SUCCESS;
-      }
-    }
-  }
-  return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
-#else /* LORAWAN_KMS == 1 */
-  /* Indexes are already stored at init or when deriving the key */
-  CK_OBJECT_HANDLE keyIndex;
-  return GetKeyIndexByID(keyID, &keyIndex);
-#endif /* LORAWAN_KMS */
-}
+    /* Open session with KMS */
+    rv = C_OpenSession(0, session_flags, NULL, 0, &session);
 
-SecureElementStatus_t SecureElementSetObjHandler(KeyIdentifier_t keyID, uint32_t keyIndex)
-{
-#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  return SECURE_ELEMENT_ERROR;
-#else /* LORAWAN_KMS == 1 */
-  for (uint8_t i = 0; i < NUM_OF_KEYS; i++)
-  {
-    if (SeNvmCtx.KeyList[i].KeyID == keyID)
+    /* Get key to display */
+    if (rv == CKR_OK)
+    {
+        rv = C_CreateObject(session, key_attribute_template, sizeof(key_attribute_template) / sizeof(CK_ATTRIBUTE),
+                            &key_handle);
+    }
+
+    if (rv == CKR_OK)
+    {
+        retval = SecureElementSetObjHandler(keyID, key_handle);
+    }
+
+    PrintKey(keyID);
+
+    /* Close sessions */
+    (void)C_CloseSession(session);
+
+    if (rv != CKR_OK)
     {
-      SeNvmCtx.KeyList[i].Object_Index = (CK_OBJECT_HANDLE) keyIndex;
-      SeNvmCtxChanged();
-      return SECURE_ELEMENT_SUCCESS;
+        retval = SECURE_ELEMENT_ERROR;
     }
-  }
-  return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+    return retval;
 #endif /* LORAWAN_KMS */
 }
 
-SecureElementStatus_t SecureElementComputeAesCmac(uint8_t *micBxBuffer, uint8_t *buffer, uint16_t size,
-                                                  KeyIdentifier_t keyID, uint32_t *cmac)
+SecureElementStatus_t SecureElementComputeAesCmac( uint8_t* micBxBuffer, uint8_t* buffer, uint16_t size,
+                                                   KeyIdentifier_t keyID, uint32_t* cmac )
 {
-  if (keyID >= LORAMAC_CRYPTO_MULTICAST_KEYS)
-  {
-    /* Never accept multicast key identifier for cmac computation */
-    return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
-  }
+    if( keyID >= LORAMAC_CRYPTO_MULTICAST_KEYS )
+    {
+        // Never accept multicast key identifier for cmac computation
+        return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+    }
 
-  return ComputeCmac(micBxBuffer, buffer, size, keyID, cmac);
+    return ComputeCmac( micBxBuffer, buffer, size, keyID, cmac );
 }
 
-SecureElementStatus_t SecureElementVerifyAesCmac(uint8_t *buffer, uint16_t size, uint32_t expectedCmac,
-                                                 KeyIdentifier_t keyID)
+SecureElementStatus_t SecureElementVerifyAesCmac( uint8_t* buffer, uint16_t size, uint32_t expectedCmac,
+                                                  KeyIdentifier_t keyID )
 {
-  SecureElementStatus_t retval = SECURE_ELEMENT_ERROR;
-  if (buffer == NULL)
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
+    if( buffer == NULL )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
 
+    SecureElementStatus_t retval   = SECURE_ELEMENT_ERROR;
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  uint32_t compCmac = 0;
-
-  retval = ComputeCmac(NULL, buffer, size, keyID, &compCmac);
-  if (retval != SECURE_ELEMENT_SUCCESS)
-  {
-    return retval;
-  }
+    uint32_t              compCmac = 0;
+    retval                         = ComputeCmac( NULL, buffer, size, keyID, &compCmac );
+    if( retval != SECURE_ELEMENT_SUCCESS )
+    {
+        return retval;
+    }
 
-  if (expectedCmac != compCmac)
-  {
-    retval = SECURE_ELEMENT_FAIL_CMAC;
-  }
+    if( expectedCmac != compCmac )
+    {
+        retval = SECURE_ELEMENT_FAIL_CMAC;
+    }
 #else /* LORAWAN_KMS == 1 */
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  CK_OBJECT_HANDLE object_handle;
-
-  if (buffer == NULL)
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
-
-  /* AES CMAC Authentication variables */
-  CK_MECHANISM aes_cmac_mechanism = { CKM_AES_CMAC, (CK_VOID_PTR)NULL, 0 };
-
-  retval = GetKeyIndexByID(keyID, &object_handle);
-  if (retval != SECURE_ELEMENT_SUCCESS)
-  {
-    return retval;
-  }
+    CK_RV rv;
+    CK_SESSION_HANDLE session;
+    CK_FLAGS session_flags = CKF_SERIAL_SESSION;    /* Read ONLY session */
+    CK_OBJECT_HANDLE object_handle;
 
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+    if (buffer == NULL)
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
 
-  /* Configure session to Verify the message in AES CMAC with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_VerifyInit(session, &aes_cmac_mechanism, object_handle);
-  }
+    /* AES CMAC Authentication variables */
+    CK_MECHANISM aes_cmac_mechanism = { CKM_AES_CMAC, (CK_VOID_PTR)NULL, 0 };
 
-  /* Verify the message */
-  if (rv == CKR_OK)
-  {
-    memcpy1(input_align_combined_buf, buffer, size);
-    rv = C_Verify(session, (CK_BYTE_PTR)input_align_combined_buf, size, (CK_BYTE_PTR)&expectedCmac, 4);
-  }
+    retval = GetKeyIndexByID(keyID, &object_handle);
+    if (retval != SECURE_ELEMENT_SUCCESS)
+    {
+        return retval;
+    }
 
-  (void)C_CloseSession(session);
+    /* Open session with KMS */
+    rv = C_OpenSession(0,    session_flags, NULL, 0, &session);
 
-  if (rv != CKR_OK)
-  {
-    retval = SECURE_ELEMENT_ERROR;
-  }
+    /* Configure session to Verify the message in AES CMAC with settings included into the mechanism */
+    if (rv == CKR_OK)
+    {
+        rv = C_VerifyInit(session, &aes_cmac_mechanism, object_handle);
+    }
+
+    /* Verify the message */
+    if (rv == CKR_OK)
+    {
+        memcpy1(input_align_combined_buf, buffer, size);
+        rv = C_Verify(session, (CK_BYTE_PTR)input_align_combined_buf, size, (CK_BYTE_PTR)&expectedCmac, 4);
+    }
+
+    (void)C_CloseSession(session);
+
+    if (rv != CKR_OK)
+    {
+        retval = SECURE_ELEMENT_ERROR;
+    }
 
 #endif /* LORAWAN_KMS */
 
-  return retval;
+    return retval;
 }
 
-SecureElementStatus_t SecureElementAesEncrypt(uint8_t *buffer, uint16_t size, KeyIdentifier_t keyID,
-                                              uint8_t *encBuffer)
+SecureElementStatus_t SecureElementAesEncrypt( uint8_t* buffer, uint16_t size, KeyIdentifier_t keyID,
+                                               uint8_t* encBuffer )
 {
-  SecureElementStatus_t retval = SECURE_ELEMENT_ERROR;
-  if (buffer == NULL || encBuffer == NULL)
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
-
-  /* Check if the size is divisible by 16 */
-  if ((size % 16) != 0)
-  {
-    return SECURE_ELEMENT_ERROR_BUF_SIZE;
-  }
+    if( buffer == NULL || encBuffer == NULL )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
+
+    // Check if the size is divisible by 16,
+    if( ( size % 16 ) != 0 )
+    {
+        return SECURE_ELEMENT_ERROR_BUF_SIZE;
+    }
 
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  lorawan_aes_context aesContext;
-  memset1(aesContext.ksch, '\0', 240);
+    lorawan_aes_context aesContext;
+    memset1( aesContext.ksch, '\0', 240 );
 
-  Key_t *pItem;
-  retval = GetKeyByID(keyID, &pItem);
+    Key_t*                pItem;
+    SecureElementStatus_t retval = GetKeyByID( keyID, &pItem );
 
-  if (retval == SECURE_ELEMENT_SUCCESS)
-  {
-    lorawan_aes_set_key(pItem->KeyValue, 16, &aesContext);
+    if( retval == SECURE_ELEMENT_SUCCESS )
+    {
+        lorawan_aes_set_key(pItem->KeyValue, 16, &aesContext);
 
-    uint8_t block = 0;
+        uint8_t block = 0;
 
-    while (size != 0)
-    {
-      lorawan_aes_encrypt(&buffer[block], &encBuffer[block], &aesContext);
-      block = block + 16;
-      size = size - 16;
+        while( size != 0 )
+        {
+            lorawan_aes_encrypt(&buffer[block], &encBuffer[block], &aesContext);
+            block = block + 16;
+            size  = size - 16;
+        }
     }
-  }
 #else /* LORAWAN_KMS == 1 */
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint32_t encrypted_length = 0;
-  CK_OBJECT_HANDLE object_handle;
-  uint8_t dummy_tag[SE_KEY_SIZE] = {0};
-  uint32_t dummy_tag_lenth = 0;
-
-  CK_MECHANISM aes_ecb_mechanism = { CKM_AES_ECB, (CK_VOID_PTR *) NULL, 0 };
-
-  retval = GetKeyIndexByID(keyID, &object_handle);
-  if (retval != SECURE_ELEMENT_SUCCESS)
-  {
-    return retval;
-  }
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Configure session to encrypt message in AES ECB with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_EncryptInit(session, &aes_ecb_mechanism, object_handle);
-  }
-
-  /* Encrypt clear message */
-  if (rv == CKR_OK)
-  {
-    memcpy1(input_align_combined_buf, buffer, size);
-    encrypted_length = sizeof(output_align);
-    rv = C_EncryptUpdate(session, (CK_BYTE_PTR)input_align_combined_buf, size,
-                         output_align, (CK_ULONG_PTR)&encrypted_length);
-    memcpy1(encBuffer, output_align, size);
-  }
-
-  /* In this case C_EncryptFinal is just called to Free the Alloc mem */
-  if (rv == CKR_OK)
-  {
-    dummy_tag_lenth = sizeof(tag);
-    rv = C_EncryptFinal(session, &dummy_tag[0], (CK_ULONG_PTR)&dummy_tag_lenth);
-  }
-
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
-
-  if (rv != CKR_OK)
-  {
-    retval = SECURE_ELEMENT_ERROR;
-  }
+    CK_RV rv;
+    CK_SESSION_HANDLE session;
+    CK_FLAGS session_flags = CKF_SERIAL_SESSION;    /* Read ONLY session */
+    uint32_t encrypted_length = 0;
+    CK_OBJECT_HANDLE object_handle;
+    uint8_t dummy_tag[SE_KEY_SIZE] = {0};
+    uint32_t dummy_tag_lenth = 0;
+
+    CK_MECHANISM aes_ecb_mechanism = { CKM_AES_ECB, (CK_VOID_PTR *) NULL, 0 };
+
+    SecureElementStatus_t retval = GetKeyIndexByID(keyID, &object_handle);
+    if (retval != SECURE_ELEMENT_SUCCESS)
+    {
+        return retval;
+    }
+
+    /* Open session with KMS */
+    rv = C_OpenSession(0,    session_flags, NULL, 0, &session);
+
+    /* Configure session to encrypt message in AES ECB with settings included into the mechanism */
+    if (rv == CKR_OK)
+    {
+        rv = C_EncryptInit(session, &aes_ecb_mechanism, object_handle);
+    }
+
+    /* Encrypt clear message */
+    if (rv == CKR_OK)
+    {
+        memcpy1(input_align_combined_buf, buffer, size);
+        encrypted_length = sizeof(output_align);
+        rv = C_EncryptUpdate(session, (CK_BYTE_PTR)input_align_combined_buf, size,
+                             output_align, (CK_ULONG_PTR)&encrypted_length);
+        memcpy1(encBuffer, output_align, size);
+    }
+
+    /* In this case C_EncryptFinal is just called to Free the Alloc mem */
+    if (rv == CKR_OK)
+    {
+        dummy_tag_lenth = sizeof(tag);
+        rv = C_EncryptFinal(session, &dummy_tag[0], (CK_ULONG_PTR)&dummy_tag_lenth);
+    }
+
+    /* Close session with KMS */
+    (void)C_CloseSession(session);
+
+    if (rv != CKR_OK)
+    {
+        retval = SECURE_ELEMENT_ERROR;
+    }
 #endif /* LORAWAN_KMS */
 
-  return retval;
+    return retval;
 }
 
-SecureElementStatus_t SecureElementDeriveAndStoreKey(Version_t version, uint8_t *input, KeyIdentifier_t rootKeyID,
-                                                     KeyIdentifier_t targetKeyID)
+SecureElementStatus_t SecureElementDeriveAndStoreKey( uint8_t* input, KeyIdentifier_t rootKeyID,
+                                                      KeyIdentifier_t targetKeyID )
 {
-  SecureElementStatus_t retval = SECURE_ELEMENT_ERROR;
-  if (input == NULL)
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
+    if( input == NULL )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
 
-  /* In case of MC_KE_KEY, only McRootKey can be used as root key */
-  if (targetKeyID == MC_KE_KEY)
-  {
-    if (rootKeyID != MC_ROOT_KEY)
+    SecureElementStatus_t retval  = SECURE_ELEMENT_ERROR;
+
+    // In case of MC_KE_KEY, only McRootKey can be used as root key
+    if( targetKeyID == MC_KE_KEY )
     {
-      return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+        if( rootKeyID != MC_ROOT_KEY )
+        {
+            return SECURE_ELEMENT_ERROR_INVALID_KEY_ID;
+        }
     }
-  }
 
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  uint8_t key[16] = { 0 };
-  /* Derive key */
-  retval = SecureElementAesEncrypt(input, 16, rootKeyID, key);
-  if (retval != SECURE_ELEMENT_SUCCESS)
-  {
-    return retval;
-  }
+    uint8_t key[16] = { 0 };
+    // Derive key
+    retval = SecureElementAesEncrypt( input, 16, rootKeyID, key );
+    if( retval != SECURE_ELEMENT_SUCCESS )
+    {
+        return retval;
+    }
 
-  /* Store key */
-  retval = SecureElementSetKey(targetKeyID, key);
-  if (retval != SECURE_ELEMENT_SUCCESS)
-  {
-    return retval;
-  }
+    // Store key
+    retval = SecureElementSetKey( targetKeyID, key );
+    if( retval != SECURE_ELEMENT_SUCCESS )
+    {
+        return retval;
+    }
+
+    return SECURE_ELEMENT_SUCCESS;
 #else /* LORAWAN_KMS == 1 */
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  /* Key derivation */
-  CK_MECHANISM      mech = {CKM_AES_ECB_ENCRYPT_DATA, input, SE_KEY_SIZE};
-  CK_OBJECT_HANDLE  derivedKeyHdle;
-  CK_OBJECT_HANDLE  rootkey_object_handle;
-
-  /* Derive key */
-  retval = GetKeyIndexByID(rootKeyID, &rootkey_object_handle);
-  if (retval != SECURE_ELEMENT_SUCCESS)
-  {
+    CK_RV rv;
+    CK_SESSION_HANDLE session;
+    CK_FLAGS session_flags = CKF_SERIAL_SESSION;    /* Read ONLY session */
+    /* Key derivation */
+    CK_MECHANISM            mech = {CKM_AES_ECB_ENCRYPT_DATA, input, SE_KEY_SIZE};
+    CK_OBJECT_HANDLE  derived_object_handle;
+    CK_OBJECT_HANDLE    rootkey_object_handle;
+    uint32_t specific_label[] = {GlobalTemplateLabel, 0UL};
+    CK_ATTRIBUTE DeriveKey_template = {CKA_LABEL, (CK_VOID_PTR)specific_label, sizeof(specific_label)};
+
+    /* Derive key */
+    if (SECURE_ELEMENT_SUCCESS != GetKeyIndexByID(rootKeyID, &rootkey_object_handle))
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
+
+    if (SECURE_ELEMENT_SUCCESS != GetKeyIndexByID(targetKeyID, &derived_object_handle))
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
+
+    if (SECURE_ELEMENT_SUCCESS != SecureElementDeleteDynamicKeys(targetKeyID, &specific_label[1]))
+    {
+        return SECURE_ELEMENT_ERROR;
+    }
+
+    /* Open session with KMS */
+    rv = C_OpenSession(0,    session_flags, NULL, 0, &session);
+
+    /* Derive key with pass phrase */
+    if (rv == CKR_OK)
+    {
+        rv = C_DeriveKey(session, &(mech), rootkey_object_handle,
+                         &DeriveKey_template, sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derived_object_handle);
+    }
+
+    if (rv == CKR_OK)
+    {
+        /* Store Derived Index in table */
+        retval = SecureElementSetObjHandler(targetKeyID, derived_object_handle);
+    }
+
+    PrintKey(targetKeyID);
+
+    /* Close session with KMS */
+    (void)C_CloseSession(session);
+
+    if (rv != CKR_OK)
+    {
+        retval = SECURE_ELEMENT_ERROR;
+    }
     return retval;
-  }
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Derive key with pass phrase */
-  if (rv == CKR_OK)
-  {
-    rv = C_DeriveKey(session, &(mech), rootkey_object_handle,
-                     &DeriveKey_template[0], sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derivedKeyHdle);
-  }
-
-  if (rv == CKR_OK)
-  {
-    /* Store Derived Index in table */
-    retval = SecureElementSetObjHandler(targetKeyID, derivedKeyHdle);
-  }
-
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
-
-  if (rv != CKR_OK)
-  {
-    retval = SECURE_ELEMENT_ERROR;
-  }
 #endif /* LORAWAN_KMS */
-
-  return retval;
 }
 
-SecureElementStatus_t SecureElementProcessJoinAccept(JoinReqIdentifier_t joinReqType, uint8_t *joinEui,
-                                                     uint16_t devNonce, uint8_t *encJoinAccept,
-                                                     uint8_t encJoinAcceptSize, uint8_t *decJoinAccept,
-                                                     uint8_t *versionMinor)
+SecureElementStatus_t SecureElementProcessJoinAccept( JoinReqIdentifier_t joinReqType, uint8_t* joinEui,
+                                                      uint16_t devNonce, uint8_t* encJoinAccept,
+                                                      uint8_t encJoinAcceptSize, uint8_t* decJoinAccept,
+                                                      uint8_t* versionMinor )
 {
-  if ((encJoinAccept == NULL) || (decJoinAccept == NULL) || (versionMinor == NULL))
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
+    if( ( encJoinAccept == NULL ) || ( decJoinAccept == NULL ) || ( versionMinor == NULL ) )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
 
-  /* Check that frame size isn't bigger than a JoinAccept with CFList size */
-  if (encJoinAcceptSize > LORAMAC_JOIN_ACCEPT_FRAME_MAX_SIZE)
-  {
-    return SECURE_ELEMENT_ERROR_BUF_SIZE;
-  }
+    // Check that frame size isn't bigger than a JoinAccept with CFList size
+    if( encJoinAcceptSize > LORAMAC_JOIN_ACCEPT_FRAME_MAX_SIZE )
+    {
+        return SECURE_ELEMENT_ERROR_BUF_SIZE;
+    }
 
-  /* Determine decryption key */
-  KeyIdentifier_t encKeyID = NWK_KEY;
+    // Determine decryption key
+    KeyIdentifier_t encKeyID = NWK_KEY;
 
+    /* ST_WORKAROUND_BEGIN: Keep NWK_KEY if 1.1.x keys are not defined */
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-  if (joinReqType != JOIN_REQ)
-  {
-    encKeyID = J_S_ENC_KEY;
-  }
+    if( joinReqType != JOIN_REQ )
+    {
+        encKeyID = J_S_ENC_KEY;
+    }
 #endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
 
-  memcpy1(decJoinAccept, encJoinAccept, encJoinAcceptSize);
+    memcpy1( decJoinAccept, encJoinAccept, encJoinAcceptSize );
 
-  /* Decrypt JoinAccept, skip MHDR */
-  if (SecureElementAesEncrypt(encJoinAccept + LORAMAC_MHDR_FIELD_SIZE, encJoinAcceptSize - LORAMAC_MHDR_FIELD_SIZE,
-                              encKeyID, decJoinAccept + LORAMAC_MHDR_FIELD_SIZE) != SECURE_ELEMENT_SUCCESS)
-  {
-    return SECURE_ELEMENT_FAIL_ENCRYPT;
-  }
+    // Decrypt JoinAccept, skip MHDR
+    if( SecureElementAesEncrypt( encJoinAccept + LORAMAC_MHDR_FIELD_SIZE, encJoinAcceptSize - LORAMAC_MHDR_FIELD_SIZE,
+                                 encKeyID, decJoinAccept + LORAMAC_MHDR_FIELD_SIZE ) != SECURE_ELEMENT_SUCCESS )
+    {
+        return SECURE_ELEMENT_FAIL_ENCRYPT;
+    }
 
-  *versionMinor = ((decJoinAccept[11] & 0x80) == 0x80) ? 1 : 0;
+    *versionMinor = ( ( decJoinAccept[11] & 0x80 ) == 0x80 ) ? 1 : 0;
 
-  uint32_t mic = 0;
+    uint32_t mic = 0;
 
-  mic = ((uint32_t) decJoinAccept[encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE] << 0);
-  mic |= ((uint32_t) decJoinAccept[encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE + 1] << 8);
-  mic |= ((uint32_t) decJoinAccept[encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE + 2] << 16);
-  mic |= ((uint32_t) decJoinAccept[encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE + 3] << 24);
+    mic = ( ( uint32_t ) decJoinAccept[encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE] << 0 );
+    mic |= ( ( uint32_t ) decJoinAccept[encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE + 1] << 8 );
+    mic |= ( ( uint32_t ) decJoinAccept[encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE + 2] << 16 );
+    mic |= ( ( uint32_t ) decJoinAccept[encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE + 3] << 24 );
 
-  /*  - Header buffer to be used for MIC computation
-   *        - LoRaWAN 1.0.x : micHeader = [MHDR(1)]
-   *        - LoRaWAN 1.1.x : micHeader = [JoinReqType(1), JoinEUI(8), DevNonce(2), MHDR(1)] */
+    //  - Header buffer to be used for MIC computation
+    //        - LoRaWAN 1.0.x : micHeader = [MHDR(1)]
+    //        - LoRaWAN 1.1.x : micHeader = [JoinReqType(1), JoinEUI(8), DevNonce(2), MHDR(1)]
 
-  /* Verify mic */
-  if (*versionMinor == 0)
-  {
-    /* For LoRaWAN 1.0.x
-     *   cmac = aes128_cmac(NwkKey, MHDR |  JoinNonce | NetID | DevAddr | DLSettings | RxDelay | CFList |
-     *   CFListType) */
-    if (SecureElementVerifyAesCmac(decJoinAccept, (encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE), mic, NWK_KEY) !=
-        SECURE_ELEMENT_SUCCESS)
+    // Verify mic
+    if( *versionMinor == 0 )
     {
-      return SECURE_ELEMENT_FAIL_CMAC;
+        // For LoRaWAN 1.0.x
+        //   cmac = aes128_cmac(NwkKey, MHDR |  JoinNonce | NetID | DevAddr | DLSettings | RxDelay | CFList |
+        //   CFListType)
+        if( SecureElementVerifyAesCmac( decJoinAccept, ( encJoinAcceptSize - LORAMAC_MIC_FIELD_SIZE ), mic, NWK_KEY ) !=
+            SECURE_ELEMENT_SUCCESS )
+        {
+            return SECURE_ELEMENT_FAIL_CMAC;
+        }
     }
-  }
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-  else if (*versionMinor == 1)
-  {
-    uint8_t  micHeader11[JOIN_ACCEPT_MIC_COMPUTATION_OFFSET] = { 0 };
-    uint16_t bufItr                                          = 0;
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
+    else if( *versionMinor == 1 )
+    {
+        uint8_t  micHeader11[JOIN_ACCEPT_MIC_COMPUTATION_OFFSET] = { 0 };
+        uint16_t bufItr                                          = 0;
 
-    micHeader11[bufItr++] = (uint8_t) joinReqType;
+        micHeader11[bufItr++] = ( uint8_t ) joinReqType;
 
-    memcpyr(micHeader11 + bufItr, joinEui, LORAMAC_JOIN_EUI_FIELD_SIZE);
-    bufItr += LORAMAC_JOIN_EUI_FIELD_SIZE;
+        memcpyr( micHeader11 + bufItr, joinEui, LORAMAC_JOIN_EUI_FIELD_SIZE );
+        bufItr += LORAMAC_JOIN_EUI_FIELD_SIZE;
 
-    micHeader11[bufItr++] = devNonce & 0xFF;
-    micHeader11[bufItr++] = (devNonce >> 8) & 0xFF;
+        micHeader11[bufItr++] = devNonce & 0xFF;
+        micHeader11[bufItr++] = ( devNonce >> 8 ) & 0xFF;
 
-    /* For LoRaWAN 1.1.x and later:
-     *   cmac = aes128_cmac(JSIntKey, JoinReqType | JoinEUI | DevNonce | MHDR | JoinNonce | NetID | DevAddr |
-     *   DLSettings | RxDelay | CFList | CFListType)
-     *   Prepare the msg for integrity check (adding JoinReqType, JoinEUI and DevNonce) */
-    uint8_t localBuffer[LORAMAC_JOIN_ACCEPT_FRAME_MAX_SIZE + JOIN_ACCEPT_MIC_COMPUTATION_OFFSET] = { 0 };
+        // For LoRaWAN 1.1.x and later:
+        //   cmac = aes128_cmac(JSIntKey, JoinReqType | JoinEUI | DevNonce | MHDR | JoinNonce | NetID | DevAddr |
+        //   DLSettings | RxDelay | CFList | CFListType)
+        // Prepare the msg for integrity check (adding JoinReqType, JoinEUI and DevNonce)
+        uint8_t localBuffer[LORAMAC_JOIN_ACCEPT_FRAME_MAX_SIZE + JOIN_ACCEPT_MIC_COMPUTATION_OFFSET] = { 0 };
 
-    memcpy1(localBuffer, micHeader11, JOIN_ACCEPT_MIC_COMPUTATION_OFFSET);
-    memcpy1(localBuffer + JOIN_ACCEPT_MIC_COMPUTATION_OFFSET - 1, decJoinAccept, encJoinAcceptSize);
+        memcpy1( localBuffer, micHeader11, JOIN_ACCEPT_MIC_COMPUTATION_OFFSET );
+        memcpy1( localBuffer + JOIN_ACCEPT_MIC_COMPUTATION_OFFSET - 1, decJoinAccept, encJoinAcceptSize );
 
-    if (SecureElementVerifyAesCmac(localBuffer,
-                                   encJoinAcceptSize + JOIN_ACCEPT_MIC_COMPUTATION_OFFSET -
-                                   LORAMAC_MHDR_FIELD_SIZE - LORAMAC_MIC_FIELD_SIZE,
-                                   mic, J_S_INT_KEY) != SECURE_ELEMENT_SUCCESS)
-    {
-      return SECURE_ELEMENT_FAIL_CMAC;
+        if( SecureElementVerifyAesCmac( localBuffer,
+                                        encJoinAcceptSize + JOIN_ACCEPT_MIC_COMPUTATION_OFFSET -
+                                            LORAMAC_MHDR_FIELD_SIZE - LORAMAC_MIC_FIELD_SIZE,
+                                        mic, J_S_INT_KEY ) != SECURE_ELEMENT_SUCCESS )
+        {
+            return SECURE_ELEMENT_FAIL_CMAC;
+        }
     }
-  }
 #endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
-  else
-  {
-    return SECURE_ELEMENT_ERROR_INVALID_LORAWAM_SPEC_VERSION;
-  }
+    else
+    {
+        return SECURE_ELEMENT_ERROR_INVALID_LORAWAM_SPEC_VERSION;
+    }
 
-  return SECURE_ELEMENT_SUCCESS;
+    return SECURE_ELEMENT_SUCCESS;
 }
 
-SecureElementStatus_t SecureElementRandomNumber(uint32_t *randomNum)
+SecureElementStatus_t SecureElementRandomNumber( uint32_t* randomNum )
 {
-  if (randomNum == NULL)
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
-  *randomNum = Radio.Random( );
-  return SECURE_ELEMENT_SUCCESS;
+    if( randomNum == NULL )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
+    *randomNum = Radio.Random();
+    return SECURE_ELEMENT_SUCCESS;
 }
 
-SecureElementStatus_t SecureElementSetDevEui(uint8_t *devEui)
+SecureElementStatus_t SecureElementSetDevEui( uint8_t* devEui )
 {
-  if (devEui == NULL)
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
-  memcpy1(SeNvmCtx.DevEui, devEui, SE_EUI_SIZE);
-  SeNvmCtxChanged();
-  return SECURE_ELEMENT_SUCCESS;
+    if( devEui == NULL )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
+    memcpy1( SeNvm->DevEui, devEui, SE_EUI_SIZE );
+    return SECURE_ELEMENT_SUCCESS;
 }
 
-uint8_t *SecureElementGetDevEui(void)
+uint8_t* SecureElementGetDevEui( void )
 {
-  return SeNvmCtx.DevEui;
+    return SeNvm->DevEui;
 }
 
-SecureElementStatus_t SecureElementSetJoinEui(uint8_t *joinEui)
+SecureElementStatus_t SecureElementSetJoinEui( uint8_t* joinEui )
 {
-  if (joinEui == NULL)
-  {
-    return SECURE_ELEMENT_ERROR_NPE;
-  }
-  memcpy1(SeNvmCtx.JoinEui, joinEui, SE_EUI_SIZE);
-  SeNvmCtxChanged();
-  return SECURE_ELEMENT_SUCCESS;
+    if( joinEui == NULL )
+    {
+        return SECURE_ELEMENT_ERROR_NPE;
+    }
+    memcpy1( SeNvm->JoinEui, joinEui, SE_EUI_SIZE );
+    return SECURE_ELEMENT_SUCCESS;
 }
 
-uint8_t *SecureElementGetJoinEui(void)
+uint8_t* SecureElementGetJoinEui( void )
 {
-  return SeNvmCtx.JoinEui;
+    return SeNvm->JoinEui;
 }
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/LoRaWAN/LICENSE.txt b/Middlewares/Third_Party/LoRaWAN/LICENSE.txt
deleted file mode 100644
index 51f599a9..00000000
--- a/Middlewares/Third_Party/LoRaWAN/LICENSE.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Revised BSD License
-Copyright Semtech Corporation 2013. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Semtech corporation nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL SEMTECH CORPORATION BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c
index df9c5643..ac4dca98 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c
@@ -33,26 +33,31 @@
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
-#include "secure-element.h"
-
-#include "LmHandler.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "utilities.h"
+#include "timer.h"
+#include "Commissioning.h"
+#include "NvmDataMgmt.h"
+#include "radio.h"
 #include "Region.h"
+#include "LoRaMacTest.h"
+#include "LmHandler.h"
+#include "LmhPackage.h"
+#include "LmhpCompliance.h"
+#include "secure-element.h"
 #include "mw_log_conf.h"  /* needed for MW_LOG */
 #include "lorawan_version.h"
-#include "Commissioning.h"
+#include "lora_info.h"
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
 #else /* LORAWAN_KMS == 1 */
 #include "kms.h"
 #include "kms_platf_objects_interface.h"
 #endif /* LORAWAN_KMS */
-
-#include "NvmCtxMgmt.h"
-#include "lora_info.h"
-#include "LmhpCompliance.h"
-#include "LoRaMacTest.h"
 #if (!defined (LORAWAN_DATA_DISTRIB_MGT) || (LORAWAN_DATA_DISTRIB_MGT == 0))
 #else /* LORAWAN_DATA_DISTRIB_MGT == 1 */
-#include "LmhpDataDistribution.h"
+#include "LmhpPackagesRegistration.h"
 #endif /* LORAWAN_DATA_DISTRIB_MGT */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -61,9 +66,9 @@
  */
 typedef enum PackageNotifyTypes_e
 {
-  PACKAGE_MCPS_CONFIRM,
-  PACKAGE_MCPS_INDICATION,
-  PACKAGE_MLME_CONFIRM,
+    PACKAGE_MCPS_CONFIRM,
+    PACKAGE_MCPS_INDICATION,
+    PACKAGE_MLME_CONFIRM
 } PackageNotifyTypes_t;
 
 /* Private define ------------------------------------------------------------*/
@@ -83,55 +88,162 @@ typedef enum PackageNotifyTypes_e
  */
 #define HEX16(X)  HEX8(X), X[8], X[9], X[10], X[11], X[12], X[13], X[14], X[15]
 
+/* Private variables ---------------------------------------------------------*/
+static CommissioningParams_t CommissioningParams =
+{
+    .DevEui = { 0 },  // Automatically filed from secure-element
+    .JoinEui = { 0 }, // Automatically filed from secure-element
+    .NetworkId = LORAWAN_NETWORK_ID,
+    .DevAddr = LORAWAN_DEVICE_ADDRESS,
+};
+
+/*!
+ * LoRaWAN compliance tests handler parameters
+ */
+static LmhpComplianceParams_t LmhpComplianceParams =
+{
+    .AdrEnabled =       LORAMAC_HANDLER_ADR_ON,
+    .DutyCycleEnabled = false,
+    .StopPeripherals =  NULL,
+    .StartPeripherals = NULL,
+};
+
+static LmhPackage_t *LmHandlerPackages[PKG_MAX_NUMBER];
+
+/*!
+ * Upper layer LoRaMac parameters
+ */
+static LmHandlerParams_t LmHandlerParams;
+
+/*!
+ * Upper layer callbacks
+ */
+static LmHandlerCallbacks_t *LmHandlerCallbacks;
+
+/*!
+ * Used to notify LmHandler of LoRaMac events
+ */
+static LoRaMacPrimitives_t LoRaMacPrimitives;
+
+/*!
+ * LoRaMac callbacks
+ */
+static LoRaMacCallback_t LoRaMacCallbacks;
+
+static LmHandlerJoinParams_t JoinParams =
+{
+    .Mode = ACTIVATION_TYPE_NONE,
+    .Datarate = DR_0,
+    .Status = LORAMAC_HANDLER_ERROR
+};
+
+static LmHandlerTxParams_t TxParams =
+{
+    .MsgType = LORAMAC_HANDLER_UNCONFIRMED_MSG,
+    .AckReceived = 0,
+    .Datarate = DR_0,
+    .UplinkCounter = 0,
+    .AppData =
+    {
+        .Port = 0,
+        .BufferSize = 0,
+        .Buffer = NULL
+    },
+    .TxPower = TX_POWER_0,
+    .Channel = 0
+};
+
+static LmHandlerRxParams_t RxParams =
+{
+    .Rssi = 0,
+    .Snr = 0,
+    .DownlinkCounter = 0,
+    .RxSlot = -1,
+    .LinkCheck = false,
+    .DemodMargin = 0,
+    .NbGateways = 0
+};
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+static LmHandlerBeaconParams_t BeaconParams =
+{
+    .State = LORAMAC_HANDLER_BEACON_ACQUIRING,
+    .Info =
+    {
+        .Time = { .Seconds = 0, .SubSeconds = 0 },
+        .Frequency = 0,
+        .Datarate = 0,
+        .Rssi = 0,
+        .Snr = 0,
+        .GwSpecific =
+        {
+            .InfoDesc = 0,
+            .Info = { 0 }
+        }
+    }
+};
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+/*!
+ * Package Application buffer
+ */
+static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+
+/*!
+ * Package application data structure
+ */
+static LmHandlerAppData_t AppData = { 0, LORAWAN_APP_DATA_BUFFER_MAX_SIZE, AppDataBuffer };
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+/*!
+ * Indicates if a switch to Class B operation is pending or not.
+ */
+static bool IsClassBSwitchPending = false;
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+static bool CtxRestoreDone = false;
+
 /* Private function prototypes -----------------------------------------------*/
 /*!
  * \brief   MCPS-Confirm event function
  *
- * \param   [IN] mcpsConfirm Pointer to the confirm structure,
- *                           containing confirm attributes.
+ * \param   [IN] mcpsConfirm - Pointer to the confirm structure,
+ *                             containing confirm attributes.
  */
-static void McpsConfirm(McpsConfirm_t *mcpsConfirm);
+static void McpsConfirm( McpsConfirm_t *mcpsConfirm );
 
 /*!
  * \brief   MCPS-Indication event function
  *
- * \param   [IN] mcpsIndication Pointer to the indication structure,
- *                              containing indication attributes.
+ * \param   [IN] mcpsIndication - Pointer to the indication structure,
+ *               containing indication attributes.
  */
-static void McpsIndication(McpsIndication_t *mcpsIndication);
+static void McpsIndication( McpsIndication_t *mcpsIndication, LoRaMacRxStatus_t *RxStatus );
 
 /*!
  * \brief   MLME-Confirm event function
  *
- * \param   [IN] MlmeConfirm Pointer to the confirm structure,
- *                           containing confirm attributes.
+ * \param   [IN] MlmeConfirm - Pointer to the confirm structure,
+ *               containing confirm attributes.
  */
-static void MlmeConfirm(MlmeConfirm_t *mlmeConfirm);
+static void MlmeConfirm( MlmeConfirm_t *mlmeConfirm );
 
 /*!
  * \brief   MLME-Indication event function
  *
- * \param   [IN] mlmeIndication Pointer to the indication structure,
- *                              containing indication attributes.
- */
-static void MlmeIndication(MlmeIndication_t *mlmeIndication);
-
-/*!
- * \brief   Requests network server time update
- *
- * \retval  status Returns \ref LORAMAC_HANDLER_SUCCESS if request has been
- *                 processed else \ref LORAMAC_HANDLER_ERROR
+ * \param   [IN] mlmeIndication - Pointer to the indication structure,
+ *               containing indication attributes.
  */
-static LmHandlerErrorStatus_t LmHandlerDeviceTimeReq(void);
+static void MlmeIndication( MlmeIndication_t *mlmeIndication, LoRaMacRxStatus_t *RxStatus );
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
 /*!
- * \brief   Starts the beacon search
+ * Starts the beacon search
  *
  * \retval  status Returns \ref LORAMAC_HANDLER_SUCCESS if request has been
  *                 processed else \ref LORAMAC_HANDLER_ERROR
  */
-static LmHandlerErrorStatus_t LmHandlerBeaconReq(void);
+static LmHandlerErrorStatus_t LmHandlerBeaconReq( void );
 
 /*!
  * \brief   Informs the server on the ping-slot periodicity to use
@@ -146,16 +258,18 @@ static LmHandlerErrorStatus_t LmHandlerPingSlotReq(uint8_t periodicity);
 #endif /* LORAMAC_CLASSB_ENABLED == 1 */
 
 /*!
- * \brief   Notifies the package to process the LoRaMac callbacks.
+ * Notifies the package to process the LoRaMac callbacks.
  *
- * \param   [IN] notifyType MAC notification type [PACKAGE_MCPS_CONFIRM,
- *                                                 PACKAGE_MCPS_INDICATION,
- *                                                 PACKAGE_MLME_CONFIRM,
- *                                                 PACKAGE_MLME_INDICATION]
- * \param   [IN] params     Notification parameters. The params type can be
- *                          [McpsConfirm_t, McpsIndication_t, MlmeConfirm_t, MlmeIndication_t]
+ * \param [IN] notifyType MAC notification type [PACKAGE_MCPS_CONFIRM,
+ *                                               PACKAGE_MCPS_INDICATION,
+ *                                               PACKAGE_MLME_CONFIRM,
+ *                                               PACKAGE_MLME_INDICATION]
+ * \param[IN] params      Notification parameters. The params type can be
+ *                        [McpsConfirm_t, McpsIndication_t, MlmeConfirm_t, MlmeIndication_t]
  */
-static void LmHandlerPackagesNotify(PackageNotifyTypes_t notifyType, void *params);
+static void LmHandlerPackagesNotify( PackageNotifyTypes_t notifyType, void *params );
+
+static void LmHandlerPackagesProcess( void );
 
 /*!
  * \brief   Check if the package ID is initialized
@@ -182,1463 +296,1643 @@ static void DisplayClassUpdate(DeviceClass_t deviceClass);
 static void DisplayBeaconUpdate(LmHandlerBeaconParams_t *params);
 #endif /* LORAMAC_CLASSB_ENABLED == 1 */
 
-/* Private variables ---------------------------------------------------------*/
-static CommissioningParams_t CommissioningParams =
-{
-  .DevEui = { 0 },  /* Automatically filed from secure-element */
-  .JoinEui = { 0 }, /* Automatically filed from secure-element */
-  .NetworkId = LORAWAN_NETWORK_ID,
-  .DevAddr = LORAWAN_DEVICE_ADDRESS,
-};
-
-/*!
- * LoRaWAN compliance tests handler parameters
- */
-static LmhpComplianceParams_t LmhpComplianceParams =
-{
-  .AdrEnabled =       LORAMAC_HANDLER_ADR_ON,
-  .DutyCycleEnabled = false,
-  .StopPeripherals =  NULL,
-  .StartPeripherals = NULL,
-};
-
-static LmhPackage_t *LmHandlerPackages[PKG_MAX_NUMBER];
-
-/*!
- * Upper layer LoRaMac parameters
- */
-static LmHandlerParams_t LmHandlerParams;
-
-/*!
- * Upper layer callbacks
- */
-static LmHandlerCallbacks_t LmHandlerCallbacks;
-
-/*!
- * Used to notify LmHandler of LoRaMac events
- */
-static LoRaMacPrimitives_t LoRaMacPrimitives;
-
-/*!
- * LoRaMac callbacks
- */
-static LoRaMacCallback_t LoRaMacCallbacks;
-
-static LmHandlerJoinParams_t JoinParams =
-{
-  .Mode = ACTIVATION_TYPE_NONE,
-  .Datarate = DR_0,
-  .Status = LORAMAC_HANDLER_ERROR
-};
-
-static LmHandlerTxParams_t TxParams =
-{
-  .MsgType = LORAMAC_HANDLER_UNCONFIRMED_MSG,
-  .AckReceived = 0,
-  .Datarate = DR_0,
-  .UplinkCounter = 0,
-  .AppData =
-  {
-    .Port = 0,
-    .BufferSize = 0,
-    .Buffer = NULL
-  },
-  .TxPower = TX_POWER_0,
-  .Channel = 0
-};
-
-static LmHandlerRxParams_t RxParams =
-{
-  .Rssi = 0,
-  .Snr = 0,
-  .DownlinkCounter = 0,
-  .RxSlot = -1
-};
+static LmHandlerErrorStatus_t LmHandlerSetSystemMaxRxError( uint32_t maxErrorInMs );
 
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-static LmHandlerBeaconParams_t BeaconParams =
+/* Exported functions ---------------------------------------------------------*/
+LmHandlerErrorStatus_t LmHandlerInit( LmHandlerCallbacks_t *handlerCallbacks )
 {
-  .State = LORAMAC_HANDLER_BEACON_ACQUIRING,
-  .Info =
-  {
-    .Time = { .Seconds = 0, .SubSeconds = 0 },
-    .Frequency = 0,
-    .Datarate = 0,
-    .Rssi = 0,
-    .Snr = 0,
-    .GwSpecific =
+    LmHandlerCallbacks = handlerCallbacks;
+
+    LoRaMacPrimitives.MacMcpsConfirm = McpsConfirm;
+    LoRaMacPrimitives.MacMcpsIndication = McpsIndication;
+    LoRaMacPrimitives.MacMlmeConfirm = MlmeConfirm;
+    LoRaMacPrimitives.MacMlmeIndication = MlmeIndication;
+    LoRaMacCallbacks.GetBatteryLevel = LmHandlerCallbacks->GetBatteryLevel;
+    LoRaMacCallbacks.GetTemperatureLevel = LmHandlerCallbacks->GetTemperature;
+    LoRaMacCallbacks.GetUniqueId = LmHandlerCallbacks->GetUniqueId;
+    LoRaMacCallbacks.NvmDataChange  = NvmDataMgmtEvent;
+    LoRaMacCallbacks.MacProcessNotify = LmHandlerCallbacks->OnMacProcess;
+
+    /*The LoRa-Alliance Compliance protocol package should always be initialized and activated.*/
+    if (LmHandlerPackageRegister(PACKAGE_ID_COMPLIANCE, &LmhpComplianceParams) != LORAMAC_HANDLER_SUCCESS)
     {
-      .InfoDesc = 0,
-      .Info = { 0 }
+        return LORAMAC_HANDLER_ERROR;
     }
-  }
-};
-#endif /* LORAMAC_CLASSB_ENABLED == 1 */
-
-/*!
- * Package Application buffer
- */
-static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
-
-/*!
- * Package application data structure
- */
-static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
-
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-/*!
- * Indicates if a switch to Class B operation is pending or not.
- */
-static bool IsClassBSwitchPending = false;
-#endif /* LORAMAC_CLASSB_ENABLED == 1 */
-
-static bool CtxRestoreDone = false;
-
-/* Exported functions ---------------------------------------------------------*/
-LmHandlerErrorStatus_t LmHandlerInit(LmHandlerCallbacks_t *handlerCallbacks)
-{
-  UTIL_MEM_cpy_8((void *)&LmHandlerCallbacks, (const void *)handlerCallbacks, sizeof(LmHandlerCallbacks_t));
-
-  LoRaMacPrimitives.MacMcpsConfirm = McpsConfirm;
-  LoRaMacPrimitives.MacMcpsIndication = McpsIndication;
-  LoRaMacPrimitives.MacMlmeConfirm = MlmeConfirm;
-  LoRaMacPrimitives.MacMlmeIndication = MlmeIndication;
-  LoRaMacCallbacks.GetBatteryLevel = LmHandlerCallbacks.GetBatteryLevel;
-  LoRaMacCallbacks.GetTemperatureLevel = LmHandlerCallbacks.GetTemperature;
-  LoRaMacCallbacks.NvmContextChange = NvmCtxMgmtEvent;
-  LoRaMacCallbacks.MacProcessNotify = LmHandlerCallbacks.OnMacProcess;
-
-  /*The LoRa-Alliance Compliance protocol package should always be initialized and activated.*/
-  if (LmHandlerPackageRegister(PACKAGE_ID_COMPLIANCE, &LmhpComplianceParams) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
 #if (!defined (LORAWAN_DATA_DISTRIB_MGT) || (LORAWAN_DATA_DISTRIB_MGT == 0))
 #else /*LORAWAN_DATA_DISTRIB_MGT == 1*/
-  if (LmhpDataDistributionInit() != LORAMAC_HANDLER_SUCCESS)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (LmhpPackagesRegistrationInit() != LORAMAC_HANDLER_SUCCESS)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 #endif /*LORAWAN_DATA_DISTRIB_MGT*/
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-LmHandlerErrorStatus_t LmHandlerConfigure(LmHandlerParams_t *handlerParams)
+LmHandlerErrorStatus_t LmHandlerConfigure( LmHandlerParams_t *handlerParams )
 {
-  MibRequestConfirm_t mibReq;
-  LoraInfo_t *loraInfo;
+    uint16_t nbNvmData = 0;
+    MibRequestConfirm_t mibReq;
+    LoraInfo_t *loraInfo;
 
-  UTIL_MEM_cpy_8((void *)&LmHandlerParams, (const void *)handlerParams, sizeof(LmHandlerParams_t));
+    UTIL_MEM_cpy_8((void *)&LmHandlerParams, (const void *)handlerParams, sizeof(LmHandlerParams_t));
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-  IsClassBSwitchPending = false;
+    IsClassBSwitchPending = false;
 #endif /* LORAMAC_CLASSB_ENABLED == 1 */
 
-  loraInfo = LoraInfo_GetPtr();
+    loraInfo = LoraInfo_GetPtr();
 
-  if (0U != ((1 << (LmHandlerParams.ActiveRegion)) & (loraInfo->Region)))
-  {
-    if (LoRaMacInitialization(&LoRaMacPrimitives, &LoRaMacCallbacks, LmHandlerParams.ActiveRegion) != LORAMAC_STATUS_OK)
+    if (0U != ((1 << (LmHandlerParams.ActiveRegion)) & (loraInfo->Region)))
+    {
+        if (LoRaMacInitialization(&LoRaMacPrimitives, &LoRaMacCallbacks, LmHandlerParams.ActiveRegion) != LORAMAC_STATUS_OK)
+        {
+            return LORAMAC_HANDLER_ERROR;
+        }
+    }
+    else
     {
-      return LORAMAC_HANDLER_ERROR;
+        MW_LOG(TS_ON, VLEVEL_ALWAYS, "error: Region is not defined in the MW: set lorawan_conf.h accordingly\r\n");
+        while (1) {}  /* error: Region is not defined in the MW */
     }
-  }
-  else
-  {
-    MW_LOG(TS_ON, VLEVEL_ALWAYS, "error: Region is not defined in the MW: set lorawan_conf.h accordingly\r\n");
-    while (1) {}  /* error: Region is not defined in the MW */
-  }
 
-  /* Try to restore from NVM and query the mac if possible. */
-  if (NvmCtxMgmtRestore() == NVMCTXMGMT_STATUS_SUCCESS)
-  {
-    CtxRestoreDone = true;
-  }
-  else
-  {
-    CtxRestoreDone = false;
+    // Restore data if required
+    nbNvmData = NvmDataMgmtRestore( );
 
-#if (defined (LORAWAN_KMS) && (LORAWAN_KMS == 1))
-    SecureElementSetObjHandler(APP_KEY, KMS_APP_KEY_OBJECT_HANDLE);
-    SecureElementSetObjHandler(NWK_KEY, KMS_NWK_KEY_OBJECT_HANDLE);
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-    SecureElementSetObjHandler(SLOT_RAND_ZERO_KEY, KMS_ZERO_KEY_OBJECT_HANDLE);
-#endif /* LORAMAC_CLASSB_ENABLED */
-#endif /* LORAWAN_KMS == 1 */
-    /* Read secure-element DEV_EUI and JOIN_EUI values. */
+    // Try to restore from NVM and query the mac if possible.
+    if( nbNvmData > 0 )
+    {
+        CtxRestoreDone = true;
+    }
+    else
+    {
+        CtxRestoreDone = false;
+    }
+
+    // Read secure-element DEV_EUI and JOIN_EUI values.
     mibReq.Type = MIB_DEV_EUI;
-    LoRaMacMibGetRequestConfirm(&mibReq);
-    memcpy1(CommissioningParams.DevEui, mibReq.Param.DevEui, 8);
+    LoRaMacMibGetRequestConfirm( &mibReq );
+    memcpy1( CommissioningParams.DevEui, mibReq.Param.DevEui, 8 );
 
     mibReq.Type = MIB_JOIN_EUI;
-    LoRaMacMibGetRequestConfirm(&mibReq);
-    memcpy1(CommissioningParams.JoinEui, mibReq.Param.JoinEui, 8);
-  }
-  MW_LOG(TS_OFF, VLEVEL_M, "###### DevEui:  %02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\r\n",
-         HEX8(CommissioningParams.DevEui));
-  MW_LOG(TS_OFF, VLEVEL_M, "###### AppEui:  %02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X\r\n",
-         HEX8(CommissioningParams.JoinEui));
-#if (defined (LORAWAN_KMS) && (LORAWAN_KMS == 1))
-  MW_LOG(TS_OFF, VLEVEL_L, "###### KMS ENABLED \r\n");
-#endif /* LORAWAN_KMS == 1 */
+    LoRaMacMibGetRequestConfirm( &mibReq );
+    memcpy1( CommissioningParams.JoinEui, mibReq.Param.JoinEui, 8 );
+
+#if ( STATIC_DEVICE_ADDRESS != 1 )
+    CommissioningParams.DevAddr = LmHandlerCallbacks->GetDevAddr();
+#endif /* STATIC_DEVICE_ADDRESS != 1 */
 
-  mibReq.Type = MIB_PUBLIC_NETWORK;
-  mibReq.Param.EnablePublicNetwork = LORAWAN_PUBLIC_NETWORK;
-  LoRaMacMibSetRequestConfirm(&mibReq);
+    mibReq.Type = MIB_DEV_ADDR;
+    mibReq.Param.DevAddr = CommissioningParams.DevAddr;
+    LoRaMacMibSetRequestConfirm(&mibReq);
 
-  mibReq.Type = MIB_REPEATER_SUPPORT;
-  mibReq.Param.EnableRepeaterSupport = LORAWAN_REPEATER_SUPPORT;
-  LoRaMacMibSetRequestConfirm(&mibReq);
+    MW_LOG(TS_OFF, VLEVEL_M, "###### DevEui:  %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n",
+           HEX8(CommissioningParams.DevEui));
+    MW_LOG(TS_OFF, VLEVEL_M, "###### AppEui:  %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n",
+           HEX8(CommissioningParams.JoinEui));
+    MW_LOG(TS_OFF, VLEVEL_M, "###### DevAddr: %02X:%02X:%02X:%02X\r\n",
+           (unsigned)((unsigned char *)(&CommissioningParams.DevAddr))[3],
+           (unsigned)((unsigned char *)(&CommissioningParams.DevAddr))[2],
+           (unsigned)((unsigned char *)(&CommissioningParams.DevAddr))[1],
+           (unsigned)((unsigned char *)(&CommissioningParams.DevAddr))[0]);
 
-  mibReq.Type = MIB_ADR;
-  mibReq.Param.AdrEnable = LmHandlerParams.AdrEnable;
-  LoRaMacMibSetRequestConfirm(&mibReq);
+#if (defined (LORAWAN_KMS) && (LORAWAN_KMS == 1))
+    MW_LOG(TS_OFF, VLEVEL_L, "###### KMS ENABLED \r\n");
+#endif /* LORAWAN_KMS == 1 */
 
-  mibReq.Type = MIB_SYSTEM_MAX_RX_ERROR;
-  mibReq.Param.SystemMaxRxError = 20;
-  LoRaMacMibSetRequestConfirm(&mibReq);
+    mibReq.Type = MIB_PUBLIC_NETWORK;
+    mibReq.Param.EnablePublicNetwork = LORAWAN_PUBLIC_NETWORK;
+    LoRaMacMibSetRequestConfirm(&mibReq);
 
-  GetPhyParams_t getPhy;
-  PhyParam_t phyParam;
-  getPhy.Attribute = PHY_DUTY_CYCLE;
-  phyParam = RegionGetPhyParam(LmHandlerParams.ActiveRegion, &getPhy);
-  LmHandlerParams.DutyCycleEnabled = (bool) phyParam.Value;
+    mibReq.Type = MIB_NET_ID;
+    mibReq.Param.NetID = LORAWAN_NETWORK_ID;
+    LoRaMacMibSetRequestConfirm(&mibReq);
 
-  /* override previous value if reconfigure new region */
-  LoRaMacTestSetDutyCycleOn(LmHandlerParams.DutyCycleEnabled);
+    mibReq.Type = MIB_REPEATER_SUPPORT;
+    mibReq.Param.EnableRepeaterSupport = LORAWAN_REPEATER_SUPPORT;
+    LoRaMacMibSetRequestConfirm( &mibReq );
 
-  return LORAMAC_HANDLER_SUCCESS;
-}
+    mibReq.Type = MIB_ADR;
+    mibReq.Param.AdrEnable = LmHandlerParams.AdrEnable;
+    LoRaMacMibSetRequestConfirm( &mibReq );
 
-bool LmHandlerIsBusy(void)
-{
-  if (LoRaMacIsBusy() == true)
-  {
-    return true;
-  }
+    GetPhyParams_t getPhy;
+    PhyParam_t phyParam;
+    getPhy.Attribute = PHY_DUTY_CYCLE;
+    phyParam = RegionGetPhyParam( LmHandlerParams.ActiveRegion, &getPhy );
+    LmHandlerParams.DutyCycleEnabled = (bool) phyParam.Value;
 
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
-    /* The network isn't yet joined, try again later. */
-    LmHandlerJoin(JoinParams.Mode);
-    return true;
-  }
+    LmHandlerSetSystemMaxRxError( 20 );
 
-  if (LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->IsRunning() == true)
-  {
-    return true;
-  }
-  return false;
+    /* override previous value if reconfigure new region */
+    LoRaMacTestSetDutyCycleOn( LmHandlerParams.DutyCycleEnabled );
+
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-void LmHandlerProcess(void)
+bool LmHandlerIsBusy( void )
 {
-  /* Call at first the LoRaMAC process before to run all package process features */
-  /* Processes the LoRaMac events */
-  LoRaMacProcess();
-
-  /* Call all packages process functions */
-  for (int8_t i = 0; i < PKG_MAX_NUMBER; i++)
-  {
-    if ((LmHandlerPackages[i] != NULL) &&
-        (LmHandlerPackages[i]->Process != NULL) &&
-        (LmHandlerPackageIsInitialized(i) != false))
+    if( LoRaMacIsBusy( ) == true )
+    {
+        return true;
+    }
+    if( LmHandlerJoinStatus( ) != LORAMAC_HANDLER_SET )
     {
-      LmHandlerPackages[i]->Process();
+        // The network isn't yet joined, try again later.
+        LmHandlerJoin( JoinParams.Mode );
+        return true;
     }
-  }
 
-  NvmCtxMgmtStore();
+    if( LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->IsRunning( ) == true )
+    {
+        return true;
+    }
+    return false;
 }
 
-LmHandlerFlagStatus_t LmHandlerJoinStatus(void)
+void LmHandlerProcess( void )
 {
-  MibRequestConfirm_t mibReq;
-  LoRaMacStatus_t status;
+    /* Call at first the LoRaMAC process before to run all package process features */
+    // Processes the LoRaMac events
+    LoRaMacProcess( );
 
-  mibReq.Type = MIB_NETWORK_ACTIVATION;
-  status = LoRaMacMibGetRequestConfirm(&mibReq);
+    // Call all packages process functions
+    LmHandlerPackagesProcess( );
 
-  if (status == LORAMAC_STATUS_OK)
-  {
-    if (mibReq.Param.NetworkActivation == ACTIVATION_TYPE_NONE)
-    {
-      return LORAMAC_HANDLER_RESET;
-    }
-    else
-    {
-      return LORAMAC_HANDLER_SET;
-    }
-  }
-  else
-  {
-    return LORAMAC_HANDLER_RESET;
-  }
+    // Store to NVM if required
+    NvmDataMgmtStore( );
 }
 
-void LmHandlerJoin(ActivationType_t mode)
+void LmHandlerJoin( ActivationType_t mode )
 {
-  MibRequestConfirm_t mibReq;
+    MibRequestConfirm_t mibReq;
 
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
 #else /* LORAWAN_KMS == 1 */
 #if (OVER_THE_AIR_ACTIVATION == 0)
-  if (mode == ACTIVATION_TYPE_OTAA)
-  {
-    MW_LOG(TS_OFF, VLEVEL_M, "ERROR: OTAA mode not implemented\r\n");
-    while (1);
-  }
+    if ( mode == ACTIVATION_TYPE_OTAA )
+    {
+        MW_LOG(TS_OFF, VLEVEL_M, "ERROR: OTAA mode not implemented\r\n");
+        while (1);
+    }
 #endif /* OVER_THE_AIR_ACTIVATION */
-#if (ACTIVATION_BY_PERSONALISATION == 0)
-  if (mode == ACTIVATION_TYPE_ABP)
-  {
-    MW_LOG(TS_OFF, VLEVEL_M, "ERROR: ABP mode not implemented\r\n");
-    while (1);
-  }
-#endif /* ACTIVATION_BY_PERSONALISATION */
-  SecureElementDeleteDerivedKeys(NULL);
+#if (ACTIVATION_BY_PERSONALIZATION == 0)
+    if ( mode == ACTIVATION_TYPE_ABP )
+    {
+        MW_LOG(TS_OFF, VLEVEL_M, "ERROR: ABP mode not implemented\r\n");
+        while (1);
+    }
+#endif /* ACTIVATION_BY_PERSONALIZATION */
 #endif /* LORAWAN_KMS */
 
-  if (mode == ACTIVATION_TYPE_OTAA)
-  {
-    MlmeReq_t mlmeReq;
-    JoinParams.Mode = ACTIVATION_TYPE_OTAA;
-
-    LoRaMacStart();
+    if ( mode == ACTIVATION_TYPE_OTAA )
+    {
+        MlmeReq_t mlmeReq;
+        JoinParams.Mode = ACTIVATION_TYPE_OTAA;
 
-    /* Starts the OTAA join procedure */
-    mlmeReq.Type = MLME_JOIN;
-    mlmeReq.Req.Join.Datarate = LmHandlerParams.TxDatarate;
-    LoRaMacMlmeRequest(&mlmeReq);
+        LoRaMacStart();
 
-  }
-  else
-  {
-    JoinParams.Mode = ACTIVATION_TYPE_ABP;
-    JoinParams.Status = LORAMAC_HANDLER_SUCCESS;
+        mlmeReq.Type = MLME_JOIN;
+        mlmeReq.Req.Join.Datarate = LmHandlerParams.TxDatarate;
 
-    if (CtxRestoreDone == false)
+        // Starts the OTAA join procedure
+        LoRaMacMlmeRequest( &mlmeReq );
+    }
+    else
     {
-      /* Tell the MAC layer which network server version are we connecting too. */
-      mibReq.Type = MIB_ABP_LORAWAN_VERSION;
-      mibReq.Param.AbpLrWanVersion.Value = ABP_ACTIVATION_LRWAN_VERSION;
-      LoRaMacMibSetRequestConfirm(&mibReq);
-
-      mibReq.Type = MIB_NET_ID;
-      mibReq.Param.NetID = CommissioningParams.NetworkId;
-      LoRaMacMibSetRequestConfirm(&mibReq);
-
-#if ( STATIC_DEVICE_ADDRESS != 1 )
-      CommissioningParams.DevAddr = GetDevAddr();
-#endif /* STATIC_DEVICE_ADDRESS != 1 */
+        JoinParams.Mode = ACTIVATION_TYPE_ABP;
+        JoinParams.Datarate = LmHandlerParams.TxDatarate;
+        JoinParams.Status = LORAMAC_HANDLER_SUCCESS;
 
-      mibReq.Type = MIB_DEV_ADDR;
-      mibReq.Param.DevAddr = CommissioningParams.DevAddr;
-      LoRaMacMibSetRequestConfirm(&mibReq);
-      MW_LOG(TS_OFF, VLEVEL_M, "###### DevAddr:   %08X\r\n", CommissioningParams.DevAddr);
+        if (CtxRestoreDone == false)
+        {
+            /* Tell the MAC layer which network server version are we connecting too. */
+            mibReq.Type = MIB_ABP_LORAWAN_VERSION;
+            mibReq.Param.AbpLrWanVersion.Value = ABP_ACTIVATION_LRWAN_VERSION;
+            LoRaMacMibSetRequestConfirm(&mibReq);
 
 #if (defined (LORAWAN_KMS) && (LORAWAN_KMS == 1))
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-      SecureElementSetObjHandler(F_NWK_S_INT_KEY, KMS_F_NWK_S_INT_KEY_OBJECT_HANDLE);
-      SecureElementSetObjHandler(S_NWK_S_INT_KEY, KMS_S_NWK_S_INT_KEY_OBJECT_HANDLE);
-      SecureElementSetObjHandler(NWK_S_ENC_KEY, KMS_NWK_S_ENC_KEY_OBJECT_HANDLE);
+            SecureElementSetObjHandler(F_NWK_S_INT_KEY, KMS_F_NWK_S_INT_KEY_OBJECT_HANDLE);
+            SecureElementSetObjHandler(S_NWK_S_INT_KEY, KMS_S_NWK_S_INT_KEY_OBJECT_HANDLE);
+            SecureElementSetObjHandler(NWK_S_ENC_KEY, KMS_NWK_S_ENC_KEY_OBJECT_HANDLE);
 #else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
-      SecureElementSetObjHandler(NWK_S_KEY, KMS_NWK_S_KEY_OBJECT_HANDLE);
+            SecureElementSetObjHandler(NWK_S_KEY, KMS_NWK_S_KEY_OBJECT_HANDLE);
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
-      SecureElementSetObjHandler(APP_S_KEY, KMS_APP_S_KEY_OBJECT_HANDLE);
+            SecureElementSetObjHandler(APP_S_KEY, KMS_APP_S_KEY_OBJECT_HANDLE);
 #endif  /* LORAWAN_KMS == 1 */
-    }
+        }
 
-    LoRaMacStart();
-    mibReq.Type = MIB_NETWORK_ACTIVATION;
-    mibReq.Param.NetworkActivation = ACTIVATION_TYPE_ABP;
-    LoRaMacMibSetRequestConfirm(&mibReq);
+        LoRaMacStart();
+        mibReq.Type = MIB_NETWORK_ACTIVATION;
+        mibReq.Param.NetworkActivation = ACTIVATION_TYPE_ABP;
+        LoRaMacMibSetRequestConfirm( &mibReq );
 
-    LmHandlerCallbacks.OnJoinRequest(&JoinParams);
-    LmHandlerRequestClass(LmHandlerParams.DefaultClass);
-  }
+        // Notify upper layer
+        LmHandlerCallbacks->OnJoinRequest( &JoinParams );
+        LmHandlerRequestClass(LmHandlerParams.DefaultClass);
+    }
 }
 
-LmHandlerErrorStatus_t LmHandlerStop(void)
+LmHandlerFlagStatus_t LmHandlerJoinStatus( void )
 {
-  if (LoRaMacDeInitialization() == LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_SUCCESS;
-  }
-  else
-  {
-    return LORAMAC_HANDLER_BUSY_ERROR;
-  }
-}
-
-LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed,
-                                     TimerTime_t *nextTxIn, bool allowDelayedTx)
-{
-  LoRaMacStatus_t status;
-  LmHandlerErrorStatus_t lmhStatus = LORAMAC_HANDLER_ERROR;
-  McpsReq_t mcpsReq;
-  LoRaMacTxInfo_t txInfo;
-
-  if (LoRaMacIsBusy() == true)
-  {
-    return LORAMAC_HANDLER_BUSY_ERROR;
-  }
-
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
-    /* The network isn't yet joined, try again later. */
-    LmHandlerJoin(JoinParams.Mode);
-    return LORAMAC_HANDLER_NO_NETWORK_JOINED;
-  }
-
-  if ((LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->IsRunning() == true)
-      && (appData->Port != LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->Port) && (appData->Port != 0))
-  {
-    return LORAMAC_HANDLER_COMPLIANCE_RUNNING;
-  }
-
-  mcpsReq.Req.Unconfirmed.Datarate = LmHandlerParams.TxDatarate;
-  if (LoRaMacQueryTxPossible(appData->BufferSize, &txInfo) != LORAMAC_STATUS_OK)
-  {
-    /* Send empty frame in order to flush MAC commands */
-    TxParams.MsgType = LORAMAC_HANDLER_UNCONFIRMED_MSG;
-    mcpsReq.Type = MCPS_UNCONFIRMED;
-    mcpsReq.Req.Unconfirmed.fBuffer = NULL;
-    mcpsReq.Req.Unconfirmed.fBufferSize = 0;
-  }
-  else
-  {
-    TxParams.MsgType = isTxConfirmed;
-    mcpsReq.Req.Unconfirmed.fPort = appData->Port;
-    mcpsReq.Req.Unconfirmed.fBufferSize = appData->BufferSize;
-    mcpsReq.Req.Unconfirmed.fBuffer = appData->Buffer;
-    if (isTxConfirmed == LORAMAC_HANDLER_UNCONFIRMED_MSG)
-    {
-      mcpsReq.Type = MCPS_UNCONFIRMED;
-    }
-    else
-    {
-      mcpsReq.Type = MCPS_CONFIRMED;
-      mcpsReq.Req.Confirmed.NbTrials = 8;
-    }
-  }
-
-  TxParams.AppData = *appData;
-  TxParams.Datarate = LmHandlerParams.TxDatarate;
-
-  status = LoRaMacMcpsRequest(&mcpsReq, allowDelayedTx);
-  if (nextTxIn != NULL)
-  {
-    *nextTxIn = mcpsReq.ReqReturn.DutyCycleWaitTime;
-  }
-
-  switch(status)
-  {
-  case LORAMAC_STATUS_OK:
-    lmhStatus = LORAMAC_HANDLER_SUCCESS;
-    break;
-  case LORAMAC_STATUS_BUSY:
-  case LORAMAC_STATUS_BUSY_UPLINK_COLLISION:
-  case LORAMAC_STATUS_BUSY_BEACON_RESERVED_TIME:
-  case LORAMAC_STATUS_BUSY_PING_SLOT_WINDOW_TIME:
-    lmhStatus = LORAMAC_HANDLER_BUSY_ERROR;
-    break;
-  case LORAMAC_STATUS_NO_NETWORK_JOINED:
-    lmhStatus = LORAMAC_HANDLER_NO_NETWORK_JOINED;
-    break;
-  case LORAMAC_STATUS_CRYPTO_ERROR:
-    lmhStatus = LORAMAC_HANDLER_CRYPTO_ERROR;
-    break;
-  case LORAMAC_STATUS_DUTYCYCLE_RESTRICTED:
-    lmhStatus = LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED;
-    break;
-  case LORAMAC_STATUS_SERVICE_UNKNOWN:
-  case LORAMAC_STATUS_PARAMETER_INVALID:
-  case LORAMAC_STATUS_MAC_COMMAD_ERROR:
-  case LORAMAC_STATUS_FCNT_HANDLER_ERROR:
-  case LORAMAC_STATUS_REGION_NOT_SUPPORTED:
-  case LORAMAC_STATUS_NO_FREE_CHANNEL_FOUND:
-  case LORAMAC_STATUS_NO_CHANNEL_FOUND:
-  case LORAMAC_STATUS_LENGTH_ERROR:
-  default:
-    lmhStatus = LORAMAC_HANDLER_ERROR;
-    break;
-  }
-      
-  return lmhStatus;
-}
-
-LmHandlerErrorStatus_t LmHandlerRequestClass(DeviceClass_t newClass)
-{
-  MibRequestConfirm_t mibReq;
-  DeviceClass_t currentClass;
-  LmHandlerErrorStatus_t errorStatus = LORAMAC_HANDLER_SUCCESS;
-
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
-    return LORAMAC_HANDLER_NO_NETWORK_JOINED;
-  }
-
-  mibReq.Type = MIB_DEVICE_CLASS;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-  currentClass = mibReq.Param.Class;
+    MibRequestConfirm_t mibReq;
+    LoRaMacStatus_t status;
 
-  /* Attempt to switch only if class update */
-  if (currentClass != newClass)
-  {
-    switch (newClass)
+    mibReq.Type = MIB_NETWORK_ACTIVATION;
+    status = LoRaMacMibGetRequestConfirm( &mibReq );
+
+    if( status == LORAMAC_STATUS_OK )
     {
-      case CLASS_A:
-      {
-        if (currentClass != CLASS_A)
-        {
-          mibReq.Param.Class = CLASS_A;
-          if (LoRaMacMibSetRequestConfirm(&mibReq) == LORAMAC_STATUS_OK)
-          {
-            /* Switch is instantaneous */
-            DisplayClassUpdate(CLASS_A);
-          }
-          else
-          {
-            errorStatus = LORAMAC_HANDLER_ERROR;
-          }
-        }
-      }
-      break;
-      case CLASS_B:
-      {
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-        if (currentClass != CLASS_A)
-        {
-          errorStatus = LORAMAC_HANDLER_ERROR;
-        }
-        else
+        if( mibReq.Param.NetworkActivation == ACTIVATION_TYPE_NONE )
         {
-          /* Beacon must first be acquired */
-          errorStatus = LmHandlerDeviceTimeReq();
-          IsClassBSwitchPending = true;
-        }
-#else /* LORAMAC_CLASSB_ENABLED == 0 */
-        errorStatus = LORAMAC_HANDLER_ERROR;
-#endif /* LORAMAC_CLASSB_ENABLED */
-      }
-      break;
-      case CLASS_C:
-      {
-        if (currentClass != CLASS_A)
-        {
-          errorStatus = LORAMAC_HANDLER_ERROR;
+            return LORAMAC_HANDLER_RESET;
         }
         else
         {
-          /* Switch is instantaneous */
-          mibReq.Param.Class = CLASS_C;
-          if (LoRaMacMibSetRequestConfirm(&mibReq) == LORAMAC_STATUS_OK)
-          {
-            DisplayClassUpdate(CLASS_C);
-          }
-          else
-          {
-            errorStatus = LORAMAC_HANDLER_ERROR;
-          }
+            return LORAMAC_HANDLER_SET;
         }
-      }
-      break;
-      default:
-        break;
     }
-  }
-  return errorStatus;
+    else
+    {
+        return LORAMAC_HANDLER_RESET;
+    }
 }
 
-LmHandlerErrorStatus_t LmHandlerPackageRegister(uint8_t id, void *params)
+LmHandlerErrorStatus_t LmHandlerStop(void)
 {
-  LmhPackage_t *package = NULL;
-  switch (id)
-  {
-    case PACKAGE_ID_COMPLIANCE:
+    if (LoRaMacDeInitialization() == LORAMAC_STATUS_OK)
     {
-      package = LmphCompliancePackageFactory();
-      break;
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        return LORAMAC_HANDLER_BUSY_ERROR;
+    }
+}
+
+LmHandlerErrorStatus_t LmHandlerSend( LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed,
+                                      TimerTime_t *nextTxIn, bool allowDelayedTx )
+{
+    LoRaMacStatus_t status;
+    LmHandlerErrorStatus_t lmhStatus = LORAMAC_HANDLER_ERROR;
+    McpsReq_t mcpsReq;
+    LoRaMacTxInfo_t txInfo;
+
+    if (LoRaMacIsBusy() == true)
+    {
+        return LORAMAC_HANDLER_BUSY_ERROR;
+    }
+
+    if( LmHandlerJoinStatus( ) != LORAMAC_HANDLER_SET )
+    {
+        // The network isn't joined, try again.
+        LmHandlerJoin(JoinParams.Mode);
+        return LORAMAC_HANDLER_NO_NETWORK_JOINED;
+    }
+
+    if( ( LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->IsRunning( ) == true ) && ( appData->Port != LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->Port ) && ( appData->Port != 0 ) )
+    {
+        return LORAMAC_HANDLER_COMPLIANCE_RUNNING;
+    }
+
+    mcpsReq.Req.Unconfirmed.Datarate = LmHandlerParams.TxDatarate;
+    if( LoRaMacQueryTxPossible( appData->BufferSize, &txInfo ) != LORAMAC_STATUS_OK )
+    {
+        // Send empty frame in order to flush MAC commands
+        TxParams.MsgType = LORAMAC_HANDLER_UNCONFIRMED_MSG;
+        mcpsReq.Type = MCPS_UNCONFIRMED;
+        mcpsReq.Req.Unconfirmed.fBuffer = NULL;
+        mcpsReq.Req.Unconfirmed.fBufferSize = 0;
+    }
+    else
+    {
+        TxParams.MsgType = isTxConfirmed;
+        mcpsReq.Req.Unconfirmed.fPort = appData->Port;
+        mcpsReq.Req.Unconfirmed.fBufferSize = appData->BufferSize;
+        mcpsReq.Req.Unconfirmed.fBuffer = appData->Buffer;
+        if( isTxConfirmed == LORAMAC_HANDLER_UNCONFIRMED_MSG )
+        {
+            mcpsReq.Type = MCPS_UNCONFIRMED;
+        }
+        else
+        {
+            mcpsReq.Type = MCPS_CONFIRMED;
+            mcpsReq.Req.Confirmed.NbTrials = 8;
+        }
+    }
+
+    TxParams.AppData = *appData;
+    TxParams.Datarate = LmHandlerParams.TxDatarate;
+
+    status = LoRaMacMcpsRequest(&mcpsReq, allowDelayedTx);
+    if (nextTxIn != NULL)
+    {
+        *nextTxIn = mcpsReq.ReqReturn.DutyCycleWaitTime;
+    }
+
+    switch (status)
+    {
+        case LORAMAC_STATUS_OK:
+            lmhStatus = LORAMAC_HANDLER_SUCCESS;
+            break;
+        case LORAMAC_STATUS_BUSY:
+        case LORAMAC_STATUS_BUSY_UPLINK_COLLISION:
+        case LORAMAC_STATUS_BUSY_BEACON_RESERVED_TIME:
+        case LORAMAC_STATUS_BUSY_PING_SLOT_WINDOW_TIME:
+            lmhStatus = LORAMAC_HANDLER_BUSY_ERROR;
+            break;
+        case LORAMAC_STATUS_NO_NETWORK_JOINED:
+            lmhStatus = LORAMAC_HANDLER_NO_NETWORK_JOINED;
+            break;
+        case LORAMAC_STATUS_CRYPTO_ERROR:
+            lmhStatus = LORAMAC_HANDLER_CRYPTO_ERROR;
+            break;
+        case LORAMAC_STATUS_DUTYCYCLE_RESTRICTED:
+            lmhStatus = LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED;
+            break;
+        case LORAMAC_STATUS_SERVICE_UNKNOWN:
+        case LORAMAC_STATUS_PARAMETER_INVALID:
+        case LORAMAC_STATUS_MAC_COMMAD_ERROR:
+        case LORAMAC_STATUS_FCNT_HANDLER_ERROR:
+        case LORAMAC_STATUS_REGION_NOT_SUPPORTED:
+        case LORAMAC_STATUS_NO_FREE_CHANNEL_FOUND:
+        case LORAMAC_STATUS_NO_CHANNEL_FOUND:
+        case LORAMAC_STATUS_LENGTH_ERROR:
+        default:
+            lmhStatus = LORAMAC_HANDLER_ERROR;
+            break;
     }
-    default:
-#if (!defined (LORAWAN_DATA_DISTRIB_MGT) || (LORAWAN_DATA_DISTRIB_MGT == 0))
-#else /*LORAWAN_DATA_DISTRIB_MGT == 1*/
-      LmhpDataDistributionPackageRegister(id, &package);
-#endif /*LORAWAN_DATA_DISTRIB_MGT*/
-      break;
-  }
 
-  if (package != NULL)
-  {
-    LmHandlerPackages[id] = package;
-    LmHandlerPackages[id]->OnJoinRequest = LmHandlerJoin;
-    LmHandlerPackages[id]->OnSendRequest = LmHandlerSend;
-    LmHandlerPackages[id]->OnDeviceTimeRequest = LmHandlerDeviceTimeReq;
-    LmHandlerPackages[id]->Init(params, AppData.Buffer, LORAWAN_APP_DATA_BUFFER_MAX_SIZE);
+    return lmhStatus;
+}
+
+LmHandlerErrorStatus_t LmHandlerLinkCheckReq( void )
+{
+    LoRaMacStatus_t status;
+    MlmeReq_t mlmeReq;
+
+    mlmeReq.Type = MLME_LINK_CHECK;
+
+    status = LoRaMacMlmeRequest( &mlmeReq );
+
+    if( status == LORAMAC_STATUS_OK )
+    {
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+}
+
+LmHandlerErrorStatus_t LmHandlerDeviceTimeReq( void )
+{
+    LoRaMacStatus_t status;
+    MlmeReq_t mlmeReq;
+
+    mlmeReq.Type = MLME_DEVICE_TIME;
+
+    status = LoRaMacMlmeRequest( &mlmeReq );
+
+    if( status == LORAMAC_STATUS_OK )
+    {
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+}
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+static LmHandlerErrorStatus_t LmHandlerBeaconReq( void )
+{
+    LoRaMacStatus_t status;
+    MlmeReq_t mlmeReq;
+
+    mlmeReq.Type = MLME_BEACON_ACQUISITION;
+
+    status = LoRaMacMlmeRequest( &mlmeReq );
+
+    if( status == LORAMAC_STATUS_OK )
+    {
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+}
 
+static LmHandlerErrorStatus_t LmHandlerPingSlotReq( uint8_t periodicity )
+{
+    LoRaMacStatus_t status;
+    MlmeReq_t mlmeReq;
+
+    mlmeReq.Type = MLME_PING_SLOT_INFO;
+    mlmeReq.Req.PingSlotInfo.PingSlot.Fields.Periodicity = periodicity;
+    mlmeReq.Req.PingSlotInfo.PingSlot.Fields.RFU = 0;
+
+    status = LoRaMacMlmeRequest( &mlmeReq );
+
+    if( status == LORAMAC_STATUS_OK )
+    {
+        LmHandlerParams.PingPeriodicity = periodicity;
+        // Send an empty message
+        LmHandlerAppData_t appData =
+        {
+            .Buffer = NULL,
+            .BufferSize = 0,
+            .Port = 0
+        };
+        return LmHandlerSend( &appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, false );
+    }
+    else
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+}
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+LmHandlerErrorStatus_t LmHandlerRequestClass( DeviceClass_t newClass )
+{
+    MibRequestConfirm_t mibReq;
+    DeviceClass_t currentClass;
+    LmHandlerErrorStatus_t errorStatus = LORAMAC_HANDLER_SUCCESS;
+
+    if (LoRaMacIsBusy() == true)
+    {
+        return LORAMAC_HANDLER_BUSY_ERROR;
+    }
+
+    if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+    {
+        return LORAMAC_HANDLER_NO_NETWORK_JOINED;
+    }
+
+    mibReq.Type = MIB_DEVICE_CLASS;
+    if ( LoRaMacMibGetRequestConfirm( &mibReq ) != LORAMAC_STATUS_OK )
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+    currentClass = mibReq.Param.Class;
+
+    // Attempt to switch only if class update
+    if( currentClass != newClass )
+    {
+        switch( newClass )
+        {
+        case CLASS_A:
+            {
+                if( currentClass != CLASS_A )
+                {
+                    mibReq.Param.Class = newClass;
+                    if( LoRaMacMibSetRequestConfirm( &mibReq ) == LORAMAC_STATUS_OK )
+                    {
+                        // Switch is instantaneous
+                        DisplayClassUpdate(newClass);
+                        if (LmHandlerCallbacks->OnClassChange != NULL)
+                        {
+                            LmHandlerCallbacks->OnClassChange( newClass );
+                        }
+                    }
+                    else
+                    {
+                        errorStatus = LORAMAC_HANDLER_ERROR;
+                    }
+                }
+            }
+            break;
+        case CLASS_B:
+            {
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+                if( currentClass != CLASS_A )
+                {
+                    errorStatus = LORAMAC_HANDLER_ERROR;
+                }
+                else
+                {
+                    // Beacon must first be acquired
+                    errorStatus = LmHandlerDeviceTimeReq( );
+                    IsClassBSwitchPending = true;
+                }
+#else /* LORAMAC_CLASSB_ENABLED == 0 */
+                errorStatus = LORAMAC_HANDLER_ERROR;
+#endif /* LORAMAC_CLASSB_ENABLED */
+            }
+            break;
+        case CLASS_C:
+            {
+                if( currentClass != CLASS_A )
+                {
+                    errorStatus = LORAMAC_HANDLER_ERROR;
+                }
+                else
+                {
+                    // Switch is instantaneous
+                    mibReq.Param.Class = newClass;
+                    if (LoRaMacMibSetRequestConfirm( &mibReq ) == LORAMAC_STATUS_OK)
+                    {
+                        DisplayClassUpdate(newClass);
+                        if (LmHandlerCallbacks->OnClassChange != NULL)
+                        {
+                            LmHandlerCallbacks->OnClassChange( newClass );
+                        }
+                    }
+                    else
+                    {
+                        errorStatus = LORAMAC_HANDLER_ERROR;
+                    }
+                }
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    return errorStatus;
+}
+
+LmHandlerErrorStatus_t LmHandlerGetCurrentClass( DeviceClass_t *deviceClass )
+{
+    MibRequestConfirm_t mibReq;
+    if (deviceClass == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+
+    mibReq.Type = MIB_DEVICE_CLASS;
+    if (LoRaMacMibGetRequestConfirm( &mibReq ) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+
+    *deviceClass = mibReq.Param.Class;
     return LORAMAC_HANDLER_SUCCESS;
-  }
-  else
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
 }
 
-int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
+LmHandlerErrorStatus_t LmHandlerGetTxDatarate( int8_t *txDatarate )
 {
-  MibRequestConfirm_t mibReq;
-  if (deviceClass == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibGet;
+    if (txDatarate == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  mibReq.Type = MIB_DEVICE_CLASS;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibGet.Type = MIB_CHANNELS_DATARATE;
+    if (LoRaMacMibGetRequestConfirm( &mibGet ) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *deviceClass = mibReq.Param.Class;
-  return LORAMAC_HANDLER_SUCCESS;
+    *txDatarate = mibGet.Param.ChannelsDatarate;
+    LmHandlerParams.TxDatarate = *txDatarate;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetTxDatarate(int8_t *txDatarate)
+LmHandlerErrorStatus_t LmHandlerGetActiveRegion( LoRaMacRegion_t *region )
 {
-  MibRequestConfirm_t mibGet;
-  if (txDatarate == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (region == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  mibGet.Type = MIB_CHANNELS_DATARATE;
-  if (LoRaMacMibGetRequestConfirm(&mibGet) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    *region = LmHandlerParams.ActiveRegion;
+    return LORAMAC_HANDLER_SUCCESS;
+}
+
+static LmHandlerErrorStatus_t LmHandlerSetSystemMaxRxError( uint32_t maxErrorInMs )
+{
+    MibRequestConfirm_t mibReq;
 
-  *txDatarate = mibGet.Param.ChannelsDatarate;
-  LmHandlerParams.TxDatarate = mibGet.Param.ChannelsDatarate;
-  return LORAMAC_HANDLER_SUCCESS;
+    mibReq.Type = MIB_SYSTEM_MAX_RX_ERROR;
+    mibReq.Param.SystemMaxRxError = maxErrorInMs;
+    if( LoRaMacMibSetRequestConfirm( &mibReq ) != LORAMAC_STATUS_OK )
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
+/*
+ *=============================================================================
+ * LORAMAC NOTIFICATIONS HANDLING
+ *=============================================================================
+ */
+
+static void McpsConfirm( McpsConfirm_t *mcpsConfirm )
 {
-  if (region == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    TxParams.IsMcpsConfirm = 1;
+    TxParams.Status = mcpsConfirm->Status;
+    TxParams.Datarate = mcpsConfirm->Datarate;
+    TxParams.UplinkCounter = mcpsConfirm->UpLinkCounter;
+    TxParams.TxPower = mcpsConfirm->TxPower;
+    TxParams.Channel = mcpsConfirm->Channel;
+    TxParams.AckReceived = mcpsConfirm->AckReceived;
+
+    LmHandlerCallbacks->OnTxData( &TxParams );
 
-  *region = LmHandlerParams.ActiveRegion;
-  return LORAMAC_HANDLER_SUCCESS;
+    LmHandlerPackagesNotify( PACKAGE_MCPS_CONFIRM, mcpsConfirm );
 }
 
-int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
+static void McpsIndication( McpsIndication_t *mcpsIndication, LoRaMacRxStatus_t *RxStatus )
 {
-  if (devEUI == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    LmHandlerAppData_t appData;
+    DeviceClass_t deviceClass = CLASS_A;
+    RxParams.IsMcpsIndication = 1;
+    RxParams.Status = mcpsIndication->Status;
+
+    if( RxParams.Status != LORAMAC_EVENT_INFO_STATUS_OK )
+    {
+        return;
+    }
+
+    RxParams.Datarate = mcpsIndication->RxDatarate;
+    RxParams.Rssi = RxStatus->Rssi;
+    RxParams.Snr = RxStatus->Snr;
+    RxParams.RxSlot = RxStatus->RxSlot;
+    RxParams.DownlinkCounter = mcpsIndication->DownLinkCounter;
+
+    appData.Port = mcpsIndication->Port;
+    appData.BufferSize = mcpsIndication->BufferSize;
+    appData.Buffer = mcpsIndication->Buffer;
 
-  UTIL_MEM_cpy_8(devEUI, CommissioningParams.DevEui, 8);
-  return LORAMAC_HANDLER_SUCCESS;
+    LmHandlerCallbacks->OnRxData(&appData, &RxParams);
+
+    if ((LmHandlerCallbacks->OnSysTimeUpdate != NULL) && (mcpsIndication->DeviceTimeAnsReceived == true))
+    {
+        LmHandlerCallbacks->OnSysTimeUpdate( );
+    }
+
+    // Call packages RxProcess function
+    LmHandlerPackagesNotify( PACKAGE_MCPS_INDICATION, mcpsIndication );
+
+    LmHandlerGetCurrentClass(&deviceClass);
+    if ((mcpsIndication->FramePending == true) && (deviceClass == CLASS_A))
+    {
+        // The server signals that it has pending data to be sent.
+        // We schedule an uplink as soon as possible to flush the server.
+
+        // Send an empty message
+        LmHandlerAppData_t appData =
+        {
+            .Buffer = NULL,
+            .BufferSize = 0,
+            .Port = 0
+        };
+        LmHandlerSend(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true);
+    }
 }
 
-int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
+static void MlmeConfirm( MlmeConfirm_t *mlmeConfirm )
 {
-#if ( STATIC_DEVICE_EUI != 1 )
-  MibRequestConfirm_t mibReq;
+    TxParams.IsMcpsConfirm = 0;
+    TxParams.Status = mlmeConfirm->Status;
+    LmHandlerCallbacks->OnTxData( &TxParams );
+
+    LmHandlerPackagesNotify( PACKAGE_MLME_CONFIRM, mlmeConfirm );
+
+    switch( mlmeConfirm->MlmeRequest )
+    {
+    case MLME_JOIN:
+        {
+            MibRequestConfirm_t mibReq;
+            mibReq.Type = MIB_DEV_ADDR;
+            LoRaMacMibGetRequestConfirm( &mibReq );
+            CommissioningParams.DevAddr = mibReq.Param.DevAddr;
+            LmHandlerGetTxDatarate( &JoinParams.Datarate );
+
+            if( mlmeConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK )
+            {
+                // Status is OK, node has joined the network
+                JoinParams.Status = LORAMAC_HANDLER_SUCCESS;
+                LmHandlerRequestClass(LmHandlerParams.DefaultClass);
+            }
+            else
+            {
+                // Join was not successful. Try to join again
+                JoinParams.Status = LORAMAC_HANDLER_ERROR;
+            }
+            // Notify upper layer
+            LmHandlerCallbacks->OnJoinRequest( &JoinParams );
+        }
+        break;
+    case MLME_LINK_CHECK:
+        {
+            RxParams.LinkCheck = true;
+            RxParams.DemodMargin = mlmeConfirm->DemodMargin;
+            RxParams.NbGateways = mlmeConfirm->NbGateways;
+        }
+        break;
+    case MLME_DEVICE_TIME:
+        {
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+            if( IsClassBSwitchPending == true )
+            {
+                LmHandlerBeaconReq( );
+            }
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+        }
+        break;
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+    case MLME_BEACON_ACQUISITION:
+        {
+            if( mlmeConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK )
+            {
+                // Beacon has been acquired
+                // Request server for ping slot
+                LmHandlerPingSlotReq( LmHandlerParams.PingPeriodicity );
+            }
+            else
+            {
+                // Beacon not acquired
+                // Request Device Time again.
+                LmHandlerDeviceTimeReq( );
+            }
+        }
+        break;
+    case MLME_PING_SLOT_INFO:
+        {
+            if( mlmeConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK )
+            {
+                MibRequestConfirm_t mibReq;
+
+                // Class B is now activated
+                mibReq.Type = MIB_DEVICE_CLASS;
+                mibReq.Param.Class = CLASS_B;
+                LoRaMacMibSetRequestConfirm( &mibReq );
+                // Notify upper layer
+                DisplayClassUpdate( CLASS_B );
+                if (LmHandlerCallbacks->OnClassChange != NULL)
+                {
+                    LmHandlerCallbacks->OnClassChange( CLASS_B );
+                }
+                IsClassBSwitchPending = false;
+            }
+            else
+            {
+                LmHandlerPingSlotReq( LmHandlerParams.PingPeriodicity );
+            }
+        }
+        break;
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+    default:
+        break;
+    }
+}
+
+static void MlmeIndication( MlmeIndication_t *mlmeIndication, LoRaMacRxStatus_t *RxStatus )
+{
+    RxParams.IsMcpsIndication = 0;
+    RxParams.Status = mlmeIndication->Status;
+    RxParams.Rssi = RxStatus->Rssi;
+    RxParams.Snr = RxStatus->Snr;
+    RxParams.RxSlot = RxStatus->RxSlot;
+    if( RxParams.Status != LORAMAC_EVENT_INFO_STATUS_BEACON_LOCKED )
+    {
+        LmHandlerCallbacks->OnRxData( NULL, &RxParams );
+    }
+
+    switch( mlmeIndication->MlmeIndication )
+    {
+    case MLME_SCHEDULE_UPLINK:
+        {// The MAC signals that we shall provide an uplink as soon as possible
+            // Send an empty message
+            LmHandlerAppData_t appData =
+            {
+                .Buffer = NULL,
+                .BufferSize = 0,
+                .Port = 0
+            };
+
+            if( LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->IsRunning( ) == false )
+            {
+                LmHandlerSend( &appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true );
+            }
+        }
+        break;
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+    case MLME_BEACON_LOST:
+        {
+            MibRequestConfirm_t mibReq;
+            // Switch to class A again
+            mibReq.Type = MIB_DEVICE_CLASS;
+            mibReq.Param.Class = CLASS_A;
+            LoRaMacMibSetRequestConfirm( &mibReq );
+
+            BeaconParams.State = LORAMAC_HANDLER_BEACON_LOST;
+            BeaconParams.Info.Time.Seconds = 0;
+            BeaconParams.Info.GwSpecific.InfoDesc = 0;
+            UTIL_MEM_set_8(BeaconParams.Info.GwSpecific.Info, 0, 6);
+
+            DisplayClassUpdate( CLASS_A );
+            if (LmHandlerCallbacks->OnClassChange != NULL)
+            {
+                LmHandlerCallbacks->OnClassChange( CLASS_A );
+            }
+            DisplayBeaconUpdate( &BeaconParams );
+
+            LmHandlerDeviceTimeReq( );
+        }
+        break;
+    case MLME_BEACON:
+        {
+            if( mlmeIndication->Status == LORAMAC_EVENT_INFO_STATUS_BEACON_LOCKED )
+            {
+                BeaconParams.State = LORAMAC_HANDLER_BEACON_RX;
+                BeaconParams.Info = mlmeIndication->BeaconInfo;
+
+                DisplayBeaconUpdate( &BeaconParams );
+            }
+            else
+            {
+                BeaconParams.State = LORAMAC_HANDLER_BEACON_NRX;
+                BeaconParams.Info = mlmeIndication->BeaconInfo;
+
+                DisplayBeaconUpdate( &BeaconParams );
+            }
+        }
+        break;
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+    default:
+        break;
+    }
+}
+
+/*
+ *=============================================================================
+ * PACKAGES HANDLING
+ *=============================================================================
+ */
+
+LmHandlerErrorStatus_t LmHandlerPackageRegister( uint8_t id, void *params )
+{
+    LmhPackage_t *package = NULL;
+    switch( id )
+    {
+        case PACKAGE_ID_COMPLIANCE:
+        {
+            package = LmhpCompliancePackageFactory( );
+            break;
+        }
+        default:
+        {
+#if (!defined (LORAWAN_DATA_DISTRIB_MGT) || (LORAWAN_DATA_DISTRIB_MGT == 0))
+#else /*LORAWAN_DATA_DISTRIB_MGT == 1*/
+            LmhpPackagesRegister(id, &package);
+#endif /*LORAWAN_DATA_DISTRIB_MGT*/
+            break;
+        }
+    }
+    if( package != NULL )
+    {
+        LmHandlerPackages[id] = package;
+        LmHandlerPackages[id]->OnJoinRequest = LmHandlerJoin;
+        LmHandlerPackages[id]->OnSendRequest = LmHandlerSend;
+        LmHandlerPackages[id]->OnDeviceTimeRequest = LmHandlerDeviceTimeReq;
+        LmHandlerPackages[id]->OnPackageProcessEvent = LmHandlerCallbacks->OnMacProcess;
+        LmHandlerPackages[id]->Init( params, AppData.Buffer, AppData.BufferSize );
+
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+}
+
+static bool LmHandlerPackageIsInitialized( uint8_t id )
+{
+    if (( id < PKG_MAX_NUMBER ) && ( LmHandlerPackages[id]->IsInitialized != NULL ))
+    {
+        return LmHandlerPackages[id]->IsInitialized( );
+    }
+    else
+    {
+        return false;
+    }
+}
+
+static void LmHandlerPackagesNotify( PackageNotifyTypes_t notifyType, void *params )
+{
+    for( int8_t i = 0; i < PKG_MAX_NUMBER; i++ )
+    {
+        if( LmHandlerPackages[i] != NULL )
+        {
+            switch( notifyType )
+            {
+                case PACKAGE_MCPS_CONFIRM:
+                {
+                    if( LmHandlerPackages[i]->OnMcpsConfirmProcess != NULL )
+                    {
+                        LmHandlerPackages[i]->OnMcpsConfirmProcess( ( McpsConfirm_t* ) params );
+                    }
+                    break;
+                }
+                case PACKAGE_MCPS_INDICATION:
+                {
+                    if( ( LmHandlerPackages[i]->OnMcpsIndicationProcess != NULL ) &&
+                        ( ( LmHandlerPackages[i]->Port == ((McpsIndication_t* )params)->Port ) ||
+                          ( ( i == PACKAGE_ID_COMPLIANCE ) && ( LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->IsRunning() ))))
+                    {
+                        LmHandlerPackages[i]->OnMcpsIndicationProcess( ( McpsIndication_t* )params );
+                    }
+                    break;
+                }
+                case PACKAGE_MLME_CONFIRM:
+                {
+                    if( LmHandlerPackages[i]->OnMlmeConfirmProcess != NULL )
+                    {
+                        LmHandlerPackages[i]->OnMlmeConfirmProcess( ( MlmeConfirm_t* )params );
+                    }
+                    break;
+                }
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    }
+}
+
+static void LmHandlerPackagesProcess( void )
+{
+    for( int8_t i = 0; i < PKG_MAX_NUMBER; i++ )
+    {
+        if( ( LmHandlerPackages[i] != NULL ) &&
+            ( LmHandlerPackages[i]->Process != NULL ) &&
+            ( LmHandlerPackageIsInitialized( i ) != false ) )
+        {
+            LmHandlerPackages[i]->Process( );
+        }
+    }
+}
+
+LmHandlerErrorStatus_t LmHandlerGetDevEUI(uint8_t *devEUI)
+{
+    MibRequestConfirm_t mibReq;
+    if (devEUI == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  /* Not yet joined */
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
     mibReq.Type = MIB_DEV_EUI;
-    UTIL_MEM_cpy_8(mibReq.Param.DevEui, devEUI, SE_EUI_SIZE);
-    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
     {
-      return LORAMAC_HANDLER_ERROR;
+        return LORAMAC_HANDLER_ERROR;
     }
-    UTIL_MEM_cpy_8(CommissioningParams.DevEui, devEUI, SE_EUI_SIZE);
+    UTIL_MEM_cpy_8(devEUI, mibReq.Param.DevEui, SE_EUI_SIZE);
     return LORAMAC_HANDLER_SUCCESS;
-  }
-  else
-  {
-    /* Cannot change Keys in running state */
-    return LORAMAC_HANDLER_ERROR;
-  }
+}
+
+LmHandlerErrorStatus_t LmHandlerSetDevEUI(uint8_t *devEUI)
+{
+#if ( STATIC_DEVICE_EUI != 1 )
+    MibRequestConfirm_t mibReq;
+
+    /* Not yet joined */
+    if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+    {
+        mibReq.Type = MIB_DEV_EUI;
+        mibReq.Param.DevEui = devEUI;
+        if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+        {
+            return LORAMAC_HANDLER_ERROR;
+        }
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        /* Cannot change Keys in running state */
+        return LORAMAC_HANDLER_ERROR;
+    }
 #else /* STATIC_DEVICE_EUI == 1 */
-  return LORAMAC_HANDLER_ERROR;
+    return LORAMAC_HANDLER_ERROR;
 #endif /* STATIC_DEVICE_EUI */
 }
 
-int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
+LmHandlerErrorStatus_t LmHandlerGetAppEUI(uint8_t *appEUI)
 {
-  if (appEUI == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
 
-  UTIL_MEM_cpy_8(appEUI, CommissioningParams.JoinEui, 8);
+    if (appEUI == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  return LORAMAC_HANDLER_SUCCESS;
+    mibReq.Type = MIB_JOIN_EUI;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+    UTIL_MEM_cpy_8(appEUI, mibReq.Param.JoinEui, SE_EUI_SIZE);
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
+LmHandlerErrorStatus_t LmHandlerSetAppEUI(uint8_t *appEUI)
 {
-  /* Not yet joined */
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
-    UTIL_MEM_cpy_8(CommissioningParams.JoinEui, appEUI, 8);
-    return LmHandlerConfigure(&LmHandlerParams);
-  }
-  else
-  {
-    /* Cannot change Keys in running state */
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+
+    /* Not yet joined */
+    if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+    {
+        mibReq.Type = MIB_JOIN_EUI;
+        mibReq.Param.JoinEui = appEUI;
+        if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+        {
+            return LORAMAC_HANDLER_ERROR;
+        }
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        /* Cannot change Keys in running state */
+        return LORAMAC_HANDLER_ERROR;
+    }
 }
 
-int32_t LmHandlerGetNetworkID(uint32_t *networkId)
+LmHandlerErrorStatus_t LmHandlerGetNetworkID(uint32_t *networkId)
 {
-  if (networkId == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+
+    if (networkId == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *networkId = CommissioningParams.NetworkId;
-  return LORAMAC_HANDLER_SUCCESS;
+    mibReq.Type = MIB_NET_ID;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+    *networkId = mibReq.Param.NetID;
+    return LORAMAC_HANDLER_SUCCESS;
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNetworkID(uint32_t networkId)
+{
+    MibRequestConfirm_t mibReq;
+
+    /* Not yet joined */
+    if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+    {
+        mibReq.Type = MIB_NET_ID;
+        mibReq.Param.NetID = networkId;
+        if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+        {
+            return LORAMAC_HANDLER_ERROR;
+        }
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        /* Cannot change NetworkID in running state */
+        return LORAMAC_HANDLER_ERROR;
+    }
 }
 
-int32_t LmHandlerSetNetworkID(uint32_t networkId)
+LmHandlerErrorStatus_t LmHandlerGetDevAddr(uint32_t *devAddr)
 {
-  /* Not yet joined */
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
-    CommissioningParams.NetworkId = networkId;
-    return LmHandlerConfigure(&LmHandlerParams);
-  }
-  else
-  {
-    /* Cannot change NetworkID in running state */
-    return LORAMAC_HANDLER_ERROR;
-  }
-}
+    MibRequestConfirm_t mibReq;
 
-int32_t LmHandlerGetDevAddr(uint32_t *devAddr)
-{
-  if (devAddr == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (devAddr == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *devAddr = CommissioningParams.DevAddr;
-  return LORAMAC_HANDLER_SUCCESS;
+    mibReq.Type = MIB_DEV_ADDR;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+    *devAddr = mibReq.Param.DevAddr;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetDevAddr(uint32_t devAddr)
+LmHandlerErrorStatus_t LmHandlerSetDevAddr(uint32_t devAddr)
 {
 #if ( STATIC_DEVICE_ADDRESS != 1 )
-  /* Not yet joined */
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
-    CommissioningParams.DevAddr = devAddr;
-    return LmHandlerConfigure(&LmHandlerParams);
-  }
-  else
-  {
-    /* Cannot change DevAddr in running state */
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+
+    /* Not yet joined */
+    if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+    {
+        mibReq.Type = MIB_DEV_ADDR;
+        mibReq.Param.DevAddr = devAddr;
+        if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+        {
+            return LORAMAC_HANDLER_ERROR;
+        }
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        /* Cannot change DevAddr in running state */
+        return LORAMAC_HANDLER_ERROR;
+    }
 #else /* STATIC_DEVICE_ADDRESS == 1 */
-  return LORAMAC_HANDLER_ERROR;
+    return LORAMAC_HANDLER_ERROR;
 #endif /* STATIC_DEVICE_ADDRESS */
 }
 
-int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
+LmHandlerErrorStatus_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
 {
-  /* Not yet joined */
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
-    LmHandlerParams.ActiveRegion = region;
-    return LmHandlerConfigure(&LmHandlerParams);
-  }
-  else
-  {
-    /* Cannot change Region in running state */
-    return LORAMAC_HANDLER_ERROR;
-  }
+    /* Not yet joined */
+    if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+    {
+        LmHandlerParams.ActiveRegion = region;
+        return LmHandlerConfigure( &LmHandlerParams );
+    }
+    else
+    {
+        /* Cannot change Region in running state */
+        return LORAMAC_HANDLER_ERROR;
+    }
 }
 
-int32_t LmHandlerGetAdrEnable(bool *adrEnable)
+LmHandlerErrorStatus_t LmHandlerGetAdrEnable(bool *adrEnable)
 {
-  if (adrEnable == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (adrEnable == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *adrEnable = LmHandlerParams.AdrEnable;
-  return LORAMAC_HANDLER_SUCCESS;
+    *adrEnable = LmHandlerParams.AdrEnable;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetAdrEnable(bool adrEnable)
+LmHandlerErrorStatus_t LmHandlerSetAdrEnable(bool adrEnable)
 {
-  MibRequestConfirm_t mibReq;
-  mibReq.Type = MIB_ADR;
-  mibReq.Param.AdrEnable = adrEnable;
-  if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-  LmHandlerParams.AdrEnable = adrEnable;
+    MibRequestConfirm_t mibReq;
+    mibReq.Type = MIB_ADR;
+    mibReq.Param.AdrEnable = adrEnable;
+    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+    LmHandlerParams.AdrEnable = adrEnable;
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetTxDatarate(int8_t txDatarate)
+LmHandlerErrorStatus_t LmHandlerSetTxDatarate(int8_t txDatarate)
 {
-  if (LmHandlerParams.AdrEnable == true)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (LmHandlerParams.AdrEnable == true)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  MibRequestConfirm_t mibReq;
-  mibReq.Type = MIB_CHANNELS_DATARATE;
-  mibReq.Param.ChannelsDatarate = txDatarate;
-  if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    mibReq.Type = MIB_CHANNELS_DATARATE;
+    mibReq.Param.ChannelsDatarate = txDatarate;
+    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  LmHandlerParams.TxDatarate = txDatarate;
+    LmHandlerParams.TxDatarate = txDatarate;
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
+LmHandlerErrorStatus_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
 {
-  if (dutyCycleEnable == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (dutyCycleEnable == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *dutyCycleEnable = LmHandlerParams.DutyCycleEnabled;
-  return LORAMAC_HANDLER_SUCCESS;
+    *dutyCycleEnable = LmHandlerParams.DutyCycleEnabled;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
+LmHandlerErrorStatus_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
 {
-  LmHandlerParams.DutyCycleEnabled = dutyCycleEnable;
-  LoRaMacTestSetDutyCycleOn(dutyCycleEnable);
+    LmHandlerParams.DutyCycleEnabled = dutyCycleEnable;
+    LoRaMacTestSetDutyCycleOn(dutyCycleEnable);
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
+LmHandlerErrorStatus_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
 {
-  if (rxParams == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (rxParams == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  MibRequestConfirm_t mibReq;
+    MibRequestConfirm_t mibReq;
 
-  mibReq.Type = MIB_RX2_CHANNEL;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibReq.Type = MIB_RX2_CHANNEL;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  rxParams->Frequency = mibReq.Param.Rx2Channel.Frequency;
-  rxParams->Datarate = mibReq.Param.Rx2Channel.Datarate;
-  return LORAMAC_HANDLER_SUCCESS;
+    rxParams->Frequency = mibReq.Param.Rx2Channel.Frequency;
+    rxParams->Datarate = mibReq.Param.Rx2Channel.Datarate;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetTxPower(int8_t *txPower)
+LmHandlerErrorStatus_t LmHandlerGetTxPower(int8_t *txPower)
 {
-  MibRequestConfirm_t mibReq;
-  if (txPower == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    if (txPower == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  mibReq.Type = MIB_CHANNELS_TX_POWER;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibReq.Type = MIB_CHANNELS_TX_POWER;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *txPower = mibReq.Param.ChannelsTxPower;
-  return LORAMAC_HANDLER_SUCCESS;
+    *txPower = mibReq.Param.ChannelsTxPower;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
 {
-  MibRequestConfirm_t mibReq;
-  if (rxDelay == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    if (rxDelay == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  mibReq.Type = MIB_RECEIVE_DELAY_1;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibReq.Type = MIB_RECEIVE_DELAY_1;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *rxDelay = mibReq.Param.ReceiveDelay1;
-  return LORAMAC_HANDLER_SUCCESS;
+    *rxDelay = mibReq.Param.ReceiveDelay1;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
 {
-  MibRequestConfirm_t mibReq;
-  if (rxDelay == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    if (rxDelay == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  mibReq.Type = MIB_RECEIVE_DELAY_2;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibReq.Type = MIB_RECEIVE_DELAY_2;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *rxDelay = mibReq.Param.ReceiveDelay2;
-  return LORAMAC_HANDLER_SUCCESS;
+    *rxDelay = mibReq.Param.ReceiveDelay2;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
 {
-  MibRequestConfirm_t mibReq;
-  if (rxDelay == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    if (rxDelay == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  mibReq.Type = MIB_JOIN_ACCEPT_DELAY_1;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibReq.Type = MIB_JOIN_ACCEPT_DELAY_1;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *rxDelay = mibReq.Param.JoinAcceptDelay1;
-  return LORAMAC_HANDLER_SUCCESS;
+    *rxDelay = mibReq.Param.JoinAcceptDelay1;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
 {
-  MibRequestConfirm_t mibReq;
-  if (rxDelay == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    if (rxDelay == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  mibReq.Type = MIB_JOIN_ACCEPT_DELAY_2;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibReq.Type = MIB_JOIN_ACCEPT_DELAY_2;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *rxDelay = mibReq.Param.JoinAcceptDelay2;
-  return LORAMAC_HANDLER_SUCCESS;
+    *rxDelay = mibReq.Param.JoinAcceptDelay2;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetTxPower(int8_t txPower)
+LmHandlerErrorStatus_t LmHandlerSetTxPower(int8_t txPower)
 {
-  MibRequestConfirm_t mibReq;
+    MibRequestConfirm_t mibReq;
 
-  mibReq.Type = MIB_CHANNELS_TX_POWER;
-  mibReq.Param.ChannelsTxPower = txPower;
-  if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibReq.Type = MIB_CHANNELS_TX_POWER;
+    mibReq.Param.ChannelsTxPower = txPower;
+    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
+LmHandlerErrorStatus_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
 {
-  MibRequestConfirm_t mibReq;
+    MibRequestConfirm_t mibReq;
 
-  mibReq.Type = MIB_RX2_CHANNEL;
-  mibReq.Param.Rx2Channel.Frequency = rxParams->Frequency;
-  mibReq.Param.Rx2Channel.Datarate = rxParams->Datarate;
-  if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    mibReq.Type = MIB_RX2_CHANNEL;
+    mibReq.Param.Rx2Channel.Frequency = rxParams->Frequency;
+    mibReq.Param.Rx2Channel.Datarate = rxParams->Datarate;
+    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetRx1Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetRx1Delay(uint32_t rxDelay)
 {
-  MibRequestConfirm_t mibReq;
-  mibReq.Type = MIB_RECEIVE_DELAY_1;
-  mibReq.Param.ReceiveDelay1 = rxDelay;
-  if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    mibReq.Type = MIB_RECEIVE_DELAY_1;
+    mibReq.Param.ReceiveDelay1 = rxDelay;
+    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetRx2Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetRx2Delay(uint32_t rxDelay)
 {
-  MibRequestConfirm_t mibReq;
-  mibReq.Type = MIB_RECEIVE_DELAY_2;
-  mibReq.Param.ReceiveDelay2 = rxDelay;
-  if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    mibReq.Type = MIB_RECEIVE_DELAY_2;
+    mibReq.Param.ReceiveDelay2 = rxDelay;
+    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
 {
-  MibRequestConfirm_t mibReq;
-  mibReq.Type = MIB_JOIN_ACCEPT_DELAY_1;
-  mibReq.Param.JoinAcceptDelay1 = rxDelay;
-  if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    mibReq.Type = MIB_JOIN_ACCEPT_DELAY_1;
+    mibReq.Param.JoinAcceptDelay1 = rxDelay;
+    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
 {
-  MibRequestConfirm_t mibReq;
-  mibReq.Type = MIB_JOIN_ACCEPT_DELAY_2;
-  mibReq.Param.JoinAcceptDelay2 = rxDelay;
-  if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    MibRequestConfirm_t mibReq;
+    mibReq.Type = MIB_JOIN_ACCEPT_DELAY_2;
+    mibReq.Param.JoinAcceptDelay2 = rxDelay;
+    if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  return LORAMAC_HANDLER_SUCCESS;
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
+LmHandlerErrorStatus_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-  if (pingPeriodicity == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (pingPeriodicity == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *pingPeriodicity = LmHandlerParams.PingPeriodicity;
-  return LORAMAC_HANDLER_SUCCESS;
+    *pingPeriodicity = LmHandlerParams.PingPeriodicity;
+    return LORAMAC_HANDLER_SUCCESS;
 #else /* LORAMAC_CLASSB_ENABLED == 0 */
-  return LORAMAC_HANDLER_ERROR;
+    return LORAMAC_HANDLER_ERROR;
 #endif /* LORAMAC_CLASSB_ENABLED */
 }
 
-int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
+LmHandlerErrorStatus_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-  /* Not yet joined */
-  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
-  {
-    LmHandlerParams.PingPeriodicity = pingPeriodicity;
-    return LORAMAC_HANDLER_SUCCESS;
-  }
-  else
-  {
-    /* Cannot change Region in running state */
-    return LmHandlerPingSlotReq(pingPeriodicity);
-  }
+    /* Not yet joined */
+    if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+    {
+        LmHandlerParams.PingPeriodicity = pingPeriodicity;
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        /* Cannot change Region in running state */
+        return LmHandlerPingSlotReq(pingPeriodicity);
+    }
 #else /* LORAMAC_CLASSB_ENABLED == 0 */
-  return LORAMAC_HANDLER_ERROR;
+    return LORAMAC_HANDLER_ERROR;
 #endif /* LORAMAC_CLASSB_ENABLED */
 }
 
-int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
+LmHandlerErrorStatus_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-  MibRequestConfirm_t mibReq;
-  LoRaMacClassBNvmCtx_t *CtxClassB;
+    MibRequestConfirm_t mibReq;
 
-  if (beaconState == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  mibReq.Type = MIB_NVM_CTXS;
-  if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-  CtxClassB = (LoRaMacClassBNvmCtx_t *) mibReq.Param.Contexts->ClassBNvmCtx;
-  if (CtxClassB == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    if (beaconState == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  *beaconState =  CtxClassB->BeaconCtx.BeaconState;
-  return LORAMAC_HANDLER_SUCCESS;
+    mibReq.Type = MIB_BEACON_STATE;
+    if (LoRaMacMibGetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+    *beaconState =  mibReq.Param.BeaconState;
+    return LORAMAC_HANDLER_SUCCESS;
 #else /* LORAMAC_CLASSB_ENABLED == 0 */
-  return LORAMAC_HANDLER_ERROR;
+    return LORAMAC_HANDLER_ERROR;
 #endif /* LORAMAC_CLASSB_ENABLED */
 }
 
-/* Private  functions ---------------------------------------------------------*/
-static LmHandlerErrorStatus_t LmHandlerDeviceTimeReq(void)
+LmHandlerErrorStatus_t LmHandlerGetNwkKey( uint8_t *nwkKey )
 {
-  LoRaMacStatus_t status;
-  MlmeReq_t mlmeReq;
-
-  mlmeReq.Type = MLME_DEVICE_TIME;
-
-  status = LoRaMacMlmeRequest(&mlmeReq);
+    Key_t *keyItem;
+    if (nwkKey == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  if (status == LORAMAC_STATUS_OK)
-  {
+    if (SECURE_ELEMENT_SUCCESS != SecureElementGetKeyByID(NWK_KEY, &keyItem))
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
+    UTIL_MEM_cpy_8( nwkKey, keyItem->KeyValue, 16 );
     return LORAMAC_HANDLER_SUCCESS;
-  }
-  else
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
 }
 
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-static LmHandlerErrorStatus_t LmHandlerBeaconReq(void)
+LmHandlerErrorStatus_t LmHandlerSetNwkKey( uint8_t *nwkKey )
 {
-  LoRaMacStatus_t status = LORAMAC_STATUS_OK;
-  MlmeReq_t mlmeReq;
-
-  mlmeReq.Type = MLME_BEACON_ACQUISITION;
-
-  status = LoRaMacMlmeRequest(&mlmeReq);
-
-  if (status == LORAMAC_STATUS_OK)
-  {
-    return LORAMAC_HANDLER_SUCCESS;
-  }
-  else
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+    /* Not yet joined */
+    if( LmHandlerJoinStatus( ) != LORAMAC_HANDLER_SET )
+    {
+        MibRequestConfirm_t mibReq;
+        mibReq.Type = MIB_NWK_KEY;
+        mibReq.Param.NwkKey = nwkKey;
+        if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+        {
+            return LORAMAC_HANDLER_ERROR;
+        }
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        /* Cannot change Keys in running state */
+        return LORAMAC_HANDLER_ERROR;
+    }
 }
 
-static LmHandlerErrorStatus_t LmHandlerPingSlotReq(uint8_t periodicity)
+LmHandlerErrorStatus_t LmHandlerGetAppKey( uint8_t *appKey )
 {
-  LoRaMacStatus_t status;
-  MlmeReq_t mlmeReq;
-
-  mlmeReq.Type = MLME_PING_SLOT_INFO;
-  mlmeReq.Req.PingSlotInfo.PingSlot.Fields.Periodicity = periodicity;
-  mlmeReq.Req.PingSlotInfo.PingSlot.Fields.RFU = 0;
-
-  status = LoRaMacMlmeRequest(&mlmeReq);
+    Key_t *keyItem;
+    if (appKey == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-  if (status == LORAMAC_STATUS_OK)
-  {
-    LmHandlerParams.PingPeriodicity = periodicity;
-    /* Send an empty message */
-    LmHandlerAppData_t appData =
+    if (SECURE_ELEMENT_SUCCESS != SecureElementGetKeyByID(APP_KEY, &keyItem))
     {
-      .Buffer = NULL,
-      .BufferSize = 0,
-      .Port = 0
-    };
-    return LmHandlerSend(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, false);
-  }
-  else
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
+        return LORAMAC_HANDLER_ERROR;
+    }
+    UTIL_MEM_cpy_8( appKey, keyItem->KeyValue, 16 );
+    return LORAMAC_HANDLER_SUCCESS;
 }
-#endif /* LORAMAC_CLASSB_ENABLED == 1 */
 
-static void McpsConfirm(McpsConfirm_t *mcpsConfirm)
+LmHandlerErrorStatus_t LmHandlerSetAppKey( uint8_t *appKey )
 {
-  TxParams.IsMcpsConfirm = 1;
-  TxParams.Status = mcpsConfirm->Status;
-  TxParams.Datarate = mcpsConfirm->Datarate;
-  TxParams.UplinkCounter = mcpsConfirm->UpLinkCounter;
-  TxParams.TxPower = mcpsConfirm->TxPower;
-  TxParams.Channel = mcpsConfirm->Channel;
-  TxParams.AckReceived = mcpsConfirm->AckReceived;
-
-  LmHandlerCallbacks.OnTxData(&TxParams);
-
-  LmHandlerPackagesNotify(PACKAGE_MCPS_CONFIRM, mcpsConfirm);
+    /* Not yet joined */
+    if( LmHandlerJoinStatus( ) != LORAMAC_HANDLER_SET )
+    {
+        MibRequestConfirm_t mibReq;
+        mibReq.Type = MIB_APP_KEY;
+        mibReq.Param.AppKey = appKey;
+        if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+        {
+            return LORAMAC_HANDLER_ERROR;
+        }
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        /* Cannot change Keys in running state */
+        return LORAMAC_HANDLER_ERROR;
+    }
 }
 
-static void McpsIndication(McpsIndication_t *mcpsIndication)
+LmHandlerErrorStatus_t LmHandlerGetNwkSKey( uint8_t *nwkSKey )
 {
-  LmHandlerAppData_t appData;
-  DeviceClass_t deviceClass;
-  RxParams.IsMcpsIndication = 1;
-  RxParams.Status = mcpsIndication->Status;
-
-  if (RxParams.Status != LORAMAC_EVENT_INFO_STATUS_OK)
-  {
-    return;
-  }
-
-  if (mcpsIndication->BufferSize > 0)
-  {
-    RxParams.Datarate = mcpsIndication->RxDatarate;
-    RxParams.Rssi = mcpsIndication->Rssi;
-    RxParams.Snr = mcpsIndication->Snr;
-    RxParams.DownlinkCounter = mcpsIndication->DownLinkCounter;
-    RxParams.RxSlot = mcpsIndication->RxSlot;
-
-    appData.Port = mcpsIndication->Port;
-    appData.BufferSize = mcpsIndication->BufferSize;
-    appData.Buffer = mcpsIndication->Buffer;
-
-    LmHandlerCallbacks.OnRxData(&appData, &RxParams);
-  }
-
-  /* Call packages RxProcess function */
-  LmHandlerPackagesNotify(PACKAGE_MCPS_INDICATION, mcpsIndication);
-  LmHandlerGetCurrentClass(&deviceClass);
-  if ((mcpsIndication->FramePending == true) && (deviceClass == CLASS_A))
-  {
-    /* The server signals that it has pending data to be sent. */
-    /* We schedule an uplink as soon as possible to flush the server. */
+    Key_t *keyItem;
+    if (nwkSKey == NULL)
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-    /* Send an empty message */
-    LmHandlerAppData_t appData =
+    if (SECURE_ELEMENT_SUCCESS != SecureElementGetKeyByID(NWK_S_KEY, &keyItem))
     {
-      .Buffer = NULL,
-      .BufferSize = 0,
-      .Port = 0
-    };
-    LmHandlerSend(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true);
-  }
+        return LORAMAC_HANDLER_ERROR;
+    }
+    UTIL_MEM_cpy_8( nwkSKey, keyItem->KeyValue, 16 );
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-static void MlmeConfirm(MlmeConfirm_t *mlmeConfirm)
+LmHandlerErrorStatus_t LmHandlerSetNwkSKey( uint8_t *nwkSKey )
 {
-  TxParams.IsMcpsConfirm = 0;
-  TxParams.Status = mlmeConfirm->Status;
-
-  LmHandlerPackagesNotify(PACKAGE_MLME_CONFIRM, mlmeConfirm);
-
-  switch (mlmeConfirm->MlmeRequest)
-  {
-    case MLME_JOIN:
+    /* Not yet joined */
+    if( LmHandlerJoinStatus( ) != LORAMAC_HANDLER_SET )
     {
-      MibRequestConfirm_t mibReq;
-      mibReq.Type = MIB_DEV_ADDR;
-      LoRaMacMibGetRequestConfirm(&mibReq);
-      CommissioningParams.DevAddr = mibReq.Param.DevAddr;
-      LmHandlerGetTxDatarate(&JoinParams.Datarate);
-
-      if (mlmeConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK)
-      {
-        /* Status is OK, node has joined the network */
-        JoinParams.Status = LORAMAC_HANDLER_SUCCESS;
+        MibRequestConfirm_t mibReq;
+        mibReq.Type = MIB_NWK_S_KEY;
+        mibReq.Param.NwkSKey = nwkSKey;
+        if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
+        {
+            return LORAMAC_HANDLER_ERROR;
+        }
 
-        /* Notify upper layer */
-        LmHandlerRequestClass(LmHandlerParams.DefaultClass);
-      }
-      else
-      {
-        /* Join was not successful. Try to join again */
-        JoinParams.Status = LORAMAC_HANDLER_ERROR;
-      }
-      LmHandlerCallbacks.OnJoinRequest(&JoinParams);
-    }
-    break;
-    case MLME_LINK_CHECK:
-    {
-      /* Check DemodMargin */
-      /* Check NbGateways */
-    }
-    break;
-    case MLME_DEVICE_TIME:
-    {
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-      if (IsClassBSwitchPending == true)
-      {
-        LmHandlerBeaconReq();
-      }
-#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+        return LORAMAC_HANDLER_SUCCESS;
     }
-    break;
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-    case MLME_BEACON_ACQUISITION:
-    {
-      if (mlmeConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK)
-      {
-        /* Beacon has been acquired */
-        /* Request server for ping slot */
-        LmHandlerPingSlotReq(LmHandlerParams.PingPeriodicity);
-      }
-      else
-      {
-        /* Beacon not acquired */
-        /* Request Device Time again. */
-        LmHandlerDeviceTimeReq();
-      }
-    }
-    break;
-    case MLME_PING_SLOT_INFO:
+    else
     {
-      if (mlmeConfirm->Status == LORAMAC_EVENT_INFO_STATUS_OK)
-      {
-        MibRequestConfirm_t mibReq;
-
-        /* Class B is now activated */
-        mibReq.Type = MIB_DEVICE_CLASS;
-        mibReq.Param.Class = CLASS_B;
-        LoRaMacMibSetRequestConfirm(&mibReq);
-
-        DisplayClassUpdate(CLASS_B);
-
-        IsClassBSwitchPending = false;
-      }
-      else
-      {
-        LmHandlerPingSlotReq(LmHandlerParams.PingPeriodicity);
-      }
+        /* Cannot change Keys in running state */
+        return LORAMAC_HANDLER_ERROR;
     }
-    break;
-#endif /* LORAMAC_CLASSB_ENABLED == 1 */
-    default:
-      break;
-  }
 }
 
-static void MlmeIndication(MlmeIndication_t *mlmeIndication)
+LmHandlerErrorStatus_t LmHandlerGetAppSKey( uint8_t *appSKey )
 {
-  RxParams.IsMcpsIndication = 0;
-  RxParams.Status = mlmeIndication->Status;
-
-  switch (mlmeIndication->MlmeIndication)
-  {
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-    case MLME_BEACON_LOST:
+    Key_t *keyItem;
+    if (appSKey == NULL)
     {
-      MibRequestConfirm_t mibReq;
-      /* Switch to class A again */
-      mibReq.Type = MIB_DEVICE_CLASS;
-      mibReq.Param.Class = CLASS_A;
-      LoRaMacMibSetRequestConfirm(&mibReq);
-
-      BeaconParams.State = LORAMAC_HANDLER_BEACON_LOST;
-      BeaconParams.Info.Time.Seconds = 0;
-      BeaconParams.Info.GwSpecific.InfoDesc = 0;
-      UTIL_MEM_set_8(BeaconParams.Info.GwSpecific.Info, 0, 6);
-
-      DisplayClassUpdate(CLASS_A);
-      DisplayBeaconUpdate(&BeaconParams);
-
-      LmHandlerDeviceTimeReq();
+        return LORAMAC_HANDLER_ERROR;
     }
-    break;
-    case MLME_BEACON:
-    {
-      if (mlmeIndication->Status == LORAMAC_EVENT_INFO_STATUS_BEACON_LOCKED)
-      {
-        BeaconParams.State = LORAMAC_HANDLER_BEACON_RX;
-        BeaconParams.Info = mlmeIndication->BeaconInfo;
 
-        DisplayBeaconUpdate(&BeaconParams);
-      }
-      else
-      {
-        BeaconParams.State = LORAMAC_HANDLER_BEACON_NRX;
-        BeaconParams.Info = mlmeIndication->BeaconInfo;
-
-        DisplayBeaconUpdate(&BeaconParams);
-      }
-      break;
+    if (SECURE_ELEMENT_SUCCESS != SecureElementGetKeyByID(APP_S_KEY, &keyItem))
+    {
+        return LORAMAC_HANDLER_ERROR;
     }
-#endif /* LORAMAC_CLASSB_ENABLED == 1 */
-    default:
-      break;
-  }
-}
-
-static bool LmHandlerPackageIsInitialized(uint8_t id)
-{
-  if ((id < PKG_MAX_NUMBER) && (LmHandlerPackages[id]->IsInitialized != NULL))
-  {
-    return LmHandlerPackages[id]->IsInitialized();
-  }
-  else
-  {
-    return false;
-  }
+    UTIL_MEM_cpy_8( appSKey, keyItem->KeyValue, 16 );
+    return LORAMAC_HANDLER_SUCCESS;
 }
 
-static void LmHandlerPackagesNotify(PackageNotifyTypes_t notifyType, void *params)
+LmHandlerErrorStatus_t LmHandlerSetAppSKey( uint8_t *appSKey )
 {
-  for (int8_t i = 0; i < PKG_MAX_NUMBER; i++)
-  {
-    if (LmHandlerPackages[i] != NULL)
+    /* Not yet joined */
+    if( LmHandlerJoinStatus( ) != LORAMAC_HANDLER_SET )
     {
-      switch (notifyType)
-      {
-        case PACKAGE_MCPS_CONFIRM:
-        {
-          if (LmHandlerPackages[i]->OnMcpsConfirmProcess != NULL)
-          {
-            LmHandlerPackages[i]->OnMcpsConfirmProcess(params);
-          }
-          break;
-        }
-        case PACKAGE_MCPS_INDICATION:
-        {
-          if ((LmHandlerPackages[i]->OnMcpsIndicationProcess != NULL) &&
-              ((LmHandlerPackages[i]->Port == ((McpsIndication_t *)params)->Port) ||
-               ((i == PACKAGE_ID_COMPLIANCE) && (LmHandlerPackages[PACKAGE_ID_COMPLIANCE]->IsRunning()))))
-          {
-            LmHandlerPackages[i]->OnMcpsIndicationProcess(params);
-          }
-          break;
-        }
-        case PACKAGE_MLME_CONFIRM:
+        MibRequestConfirm_t mibReq;
+        mibReq.Type = MIB_APP_S_KEY;
+        mibReq.Param.AppSKey = appSKey;
+        if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_OK)
         {
-          if (LmHandlerPackages[i]->OnMlmeConfirmProcess != NULL)
-          {
-            LmHandlerPackages[i]->OnMlmeConfirmProcess(params);
-          }
-          break;
+            return LORAMAC_HANDLER_ERROR;
         }
-        default:
-          break;
-      }
+
+        return LORAMAC_HANDLER_SUCCESS;
+    }
+    else
+    {
+        /* Cannot change Keys in running state */
+        return LORAMAC_HANDLER_ERROR;
     }
-  }
 }
 
 static void DisplayClassUpdate(DeviceClass_t deviceClass)
 {
-  MW_LOG(TS_OFF, VLEVEL_M, "Switch to Class %c done\r\n", "ABC"[deviceClass]);
+    MW_LOG(TS_OFF, VLEVEL_M, "Switch to Class %c done\r\n", "ABC"[deviceClass]);
 }
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
 static void DisplayBeaconUpdate(LmHandlerBeaconParams_t *params)
 {
-  static const char *EventBeaconStateStrings[] = { "BC_ACQUIRING", "BC_LOST", "BC_RECEIVED", "BC_NOT_RECEIVED" };
-
-  MW_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== %s\r\n", EventBeaconStateStrings[params->State]);
-  if (params->State == LORAMAC_HANDLER_BEACON_RX)
-  {
-    MW_LOG(TS_OFF, VLEVEL_H, "###### BTIME:%010d | GW DESC:%d | GW INFO:%02X %02X %02X %02X %02X %02X\r\n",
-           params->Info.Time.Seconds, params->Info.GwSpecific.InfoDesc,
-           params->Info.GwSpecific.Info[0], params->Info.GwSpecific.Info[1],
-           params->Info.GwSpecific.Info[2], params->Info.GwSpecific.Info[3],
-           params->Info.GwSpecific.Info[4], params->Info.GwSpecific.Info[5]);
-    MW_LOG(TS_OFF, VLEVEL_H, "###### FREQ:%d | DR:%d | RSSI:%d | SNR:%d\r\n",
-           params->Info.Frequency, params->Info.Datarate,
-           params->Info.Rssi, params->Info.Snr);
-  }
+    static const char *EventBeaconStateStrings[] = { "BC_ACQUIRING", "BC_LOST", "BC_RECEIVED", "BC_NOT_RECEIVED" };
+
+    MW_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== %s\r\n", EventBeaconStateStrings[params->State]);
+    if (params->State == LORAMAC_HANDLER_BEACON_RX)
+    {
+        MW_LOG(TS_OFF, VLEVEL_H, "###### BTIME:%010d | GW DESC:%d | GW INFO:%02X %02X %02X %02X %02X %02X\r\n",
+               params->Info.Time.Seconds, params->Info.GwSpecific.InfoDesc,
+               params->Info.GwSpecific.Info[0], params->Info.GwSpecific.Info[1],
+               params->Info.GwSpecific.Info[2], params->Info.GwSpecific.Info[3],
+               params->Info.GwSpecific.Info[4], params->Info.GwSpecific.Info[5]);
+        MW_LOG(TS_OFF, VLEVEL_H, "###### FREQ:%d | DR:%d | RSSI:%d | SNR:%d\r\n",
+               params->Info.Frequency, params->Info.Datarate,
+               params->Info.Rssi, params->Info.Snr);
+    }
 }
 #endif /* LORAMAC_CLASSB_ENABLED == 1 */
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.h
index af796110..ee17e6a1 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.h
@@ -36,7 +36,8 @@
 #define __LORAMAC_HANDLER_H__
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -49,11 +50,11 @@ extern "C" {
 /*!
  * \brief Join notification parameters
  */
-  typedef struct LmHandlerJoinParams_s
+typedef struct LmHandlerJoinParams_s
 {
-  int8_t Datarate;
-  LmHandlerErrorStatus_t Status;
-  ActivationType_t Mode;
+    int8_t Datarate;
+    LmHandlerErrorStatus_t Status;
+    ActivationType_t Mode;
 } LmHandlerJoinParams_t;
 
 /*!
@@ -61,159 +62,218 @@ extern "C" {
  */
 typedef struct LmHandlerTxParams_s
 {
-  uint8_t IsMcpsConfirm;
-  LoRaMacEventInfoStatus_t Status;
-  LmHandlerMsgTypes_t MsgType;
-  uint8_t AckReceived;
-  int8_t Datarate;
-  uint32_t UplinkCounter;
-  LmHandlerAppData_t AppData;
-  int8_t TxPower;
-  uint8_t Channel;
-} LmHandlerTxParams_t;
+    uint8_t IsMcpsConfirm;
+    LoRaMacEventInfoStatus_t Status;
+    LmHandlerMsgTypes_t MsgType;
+    uint8_t AckReceived;
+    int8_t Datarate;
+    uint32_t UplinkCounter;
+    LmHandlerAppData_t AppData;
+    int8_t TxPower;
+    uint8_t Channel;
+}LmHandlerTxParams_t;
 
 /*!
  * \brief Rx notification parameters
  */
 typedef struct LmHandlerRxParams_s
 {
-  uint8_t IsMcpsIndication;
-  LoRaMacEventInfoStatus_t Status;
-  int8_t Datarate;
-  int8_t Rssi;
-  int8_t Snr;
-  uint32_t DownlinkCounter;
-  int8_t RxSlot;
-} LmHandlerRxParams_t;
+    uint8_t IsMcpsIndication;
+    LoRaMacEventInfoStatus_t Status;
+    int8_t Datarate;
+    int8_t Rssi;
+    int8_t Snr;
+    uint32_t DownlinkCounter;
+    int8_t RxSlot;
+    bool LinkCheck;
+    uint8_t DemodMargin;
+    uint8_t NbGateways;
+}LmHandlerRxParams_t;
 
 /*!
  * \brief Beacon notification parameters
  */
 typedef struct LmHandlerBeaconParams_s
 {
-  LoRaMacEventInfoStatus_t Status;
-  LmHandlerBeaconState_t State;
-  BeaconInfo_t Info;
-} LmHandlerBeaconParams_t;
+    LoRaMacEventInfoStatus_t Status;
+    LmHandlerBeaconState_t State;
+    BeaconInfo_t Info;
+}LmHandlerBeaconParams_t;
 
 /*!
  * \brief LoRaMac handler parameters
  */
 typedef struct LmHandlerParams_s
 {
-  /*!
-   * Active Region
-   */
-  LoRaMacRegion_t ActiveRegion;
-  /*!
-   * Default Class
-   */
-  DeviceClass_t DefaultClass;
-  /*!
-   * Holds the ADR state
-   */
-  bool AdrEnable;
-  /*!
-   * Uplink datarate, when \ref AdrEnable is OFF
-   */
-  int8_t TxDatarate;
-  /*!
-   * LoRaWAN ETSI duty cycle control enable/disable
-   *
-   * \remark Please note that ETSI mandates duty cycled transmissions. Use only for test purposes
-   */
-  bool DutyCycleEnabled;
-  /*!
-   * Periodicity of the ping slots
-   */
-  uint8_t PingPeriodicity;
-} LmHandlerParams_t;
+    /*!
+     * Active Region
+     */
+    LoRaMacRegion_t ActiveRegion;
+    /*!
+     * Default Class
+     */
+    DeviceClass_t DefaultClass;
+    /*!
+     * Holds the ADR state
+     */
+    bool AdrEnable;
+    /*!
+     * Uplink datarate, when \ref AdrEnable is OFF
+     */
+    int8_t TxDatarate;
+    /*!
+     * Enables/Disables a public network usage
+     */
+    bool PublicNetworkEnable;
+    /*!
+    * LoRaWAN ETSI duty cycle control enable/disable
+    *
+    * \remark Please note that ETSI mandates duty cycled transmissions. Use only for test purposes
+    */
+    bool DutyCycleEnabled;
+    /*!
+     * Application data buffer maximum size
+     */
+    uint8_t DataBufferMaxSize;
+    /*!
+     * Application data buffer pointer
+     */
+    uint8_t *DataBuffer;
+    /*!
+     * Periodicity of the ping slots
+     */
+    uint8_t PingPeriodicity;
+}LmHandlerParams_t;
 
 /*!
  * \brief LoRaMac handler callbacks
  */
 typedef struct LmHandlerCallbacks_s
 {
-  /*!
-   * \brief Get the current battery level
-   *
-   * \retval value  Battery level ( 0: very low, 254: fully charged )
-   */
-  uint8_t (*GetBatteryLevel)(void);
-  /*!
-   * \brief Get the current temperature
-   *
-   * \retval value  Temperature in degree Celsius
-   */
-  /*float*/ uint16_t (*GetTemperature)(void);
-  /*!
-   * \brief    Will be called each time a Radio IRQ is handled by the MAC
-   *          layer.
-   *
-   * \warning  Runs in a IRQ context. Should only change variables state.
-   */
-  void (*OnMacProcess)(void);
-  /*!
-   * \brief Notifies the upper layer that a network has been joined
-   *
-   * \param [in] params notification parameters
-   */
-  void (*OnJoinRequest)(LmHandlerJoinParams_t *params);
-  /*!
-   * \brief Notifies upper layer that a frame has been transmitted
-   *
-   * \param [in] params notification parameters
-   */
-  void (*OnTxData)(LmHandlerTxParams_t *params);
-  /*!
-   * \brief Notifies the upper layer that an applicative frame has been received
-   *
-   * \param [in] appData Received applicative data
-   * \param [in] params notification parameters
-   */
-  void (*OnRxData)(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
-} LmHandlerCallbacks_t;
+    /*!
+     * Get the current battery level
+     *
+     * \retval value  Battery level ( 0: very low, 254: fully charged )
+     */
+    uint8_t ( *GetBatteryLevel )( void );
+    /*!
+     * Get the current temperature
+     *
+     * \retval value  Temperature in degree Celsius
+     */
+    /*float*/ uint16_t ( *GetTemperature )( void );
+    /*!
+     * Get the board 64 bits unique ID
+     *
+     * \param   [OUT] id unique
+     */
+    void (*GetUniqueId)(uint8_t *id);
+    /*!
+     * Get the board 32 bits unique ID (LSB)
+     *
+     * \retval  devAddr Device Address
+     */
+    uint32_t (*GetDevAddr)(void);
+    /*!
+     *\brief    Will be called each time a Radio IRQ is handled by the MAC
+     *          layer.
+     *
+     *\warning  Runs in a IRQ context. Should only change variables state.
+     */
+    void ( *OnMacProcess )( void );
+    /*!
+     * Notifies the upper layer that the NVM context has changed
+     *
+     * \param [IN] state Indicates if we are storing (true) or
+     *                   restoring (false) the NVM context
+     *
+     * \param [IN] size Number of data bytes which were stored or restored.
+     */
+    void ( *OnNvmDataChange )( LmHandlerNvmContextStates_t state, uint16_t size );
+    /*!
+     * Notifies the upper layer that a network parameters have been set
+     *
+     * \param [IN] params notification parameters
+     */
+    void ( *OnNetworkParametersChange )( CommissioningParams_t *params );
+    /*!
+     * Notifies the upper layer that a network has been joined
+     *
+     * \param [IN] params notification parameters
+     */
+    void ( *OnJoinRequest )( LmHandlerJoinParams_t *params );
+    /*!
+     * Notifies upper layer that a frame has been transmitted
+     *
+     * \param [IN] params notification parameters
+     */
+    void ( *OnTxData )( LmHandlerTxParams_t *params );
+    /*!
+     * Notifies the upper layer that an applicative frame has been received
+     *
+     * \param [IN] appData Received applicative data
+     * \param [IN] params notification parameters
+     */
+    void ( *OnRxData )( LmHandlerAppData_t *appData, LmHandlerRxParams_t *params );
+    /*!
+     * Confirms the LoRaWAN device class change
+     *
+     * \param [IN] deviceClass New end-device class
+     */
+    void ( *OnClassChange )( DeviceClass_t deviceClass );
+    /*!
+     * Notifies the upper layer that the beacon status has changed
+     *
+     * \param [IN] params notification parameters
+     */
+    void ( *OnBeaconStatusChange )( LmHandlerBeaconParams_t *params );
+    /*!
+     * Notifies the upper layer that the system time has been updated.
+     */
+    void ( *OnSysTimeUpdate )( void );
+}LmHandlerCallbacks_t;
 
 /* External variables --------------------------------------------------------*/
 /* Exported macros -----------------------------------------------------------*/
 /* Exported functions ------------------------------------------------------- */
 /*!
- * \brief LoRaMac handler initialisation
+ * LoRaMac handler initialisation
  *
  * \param [in] handlerCallbacks LoRaMac handler callbacks
  *
  * \retval status Returns \ref LORAMAC_HANDLER_SUCCESS if package have been
  *                initialized else \ref LORAMAC_HANDLER_ERROR
  */
-LmHandlerErrorStatus_t LmHandlerInit(LmHandlerCallbacks_t *handlerCallbacks);
+LmHandlerErrorStatus_t LmHandlerInit( LmHandlerCallbacks_t *handlerCallbacks );
 
 /*!
- * \brief Indicates if the LoRaMacHandler is busy
- *
+ * Indicates if the LoRaMacHandler is busy
+ * 
  * \retval status [true] Busy, [false] free
  */
-bool LmHandlerIsBusy(void);
+bool LmHandlerIsBusy( void );
 
 /*!
- * \brief Processes the LoRaMac and Radio events. When no pendig operation asks to go in low power mode.
+ * Processes the LoRaMac and Radio events. 
+ * When no pendig operation asks to go in low power mode.
  *
  * \remark This function must be called in the main loop.
  */
-void LmHandlerProcess(void);
+void LmHandlerProcess( void );
 
 /*!
- * \brief Instructs the MAC layer to send a ClassA uplink
+ * Instructs the MAC layer to send a ClassA uplink
  *
- * \param [in] appData Data to be sent
- * \param [in] isTxConfirmed Indicates if the uplink requires an acknowledgement
+ * \param [IN] appData Data to be sent
+ * \param [IN] isTxConfirmed Indicates if the uplink requires an acknowledgement
  * \param [out] nextTxIn Time before next uplink window available
  * \param [in] allowDelayedTx when set to true, the frame will be delayed
  *
  * \retval status Returns \ref LORAMAC_HANDLER_SUCCESS if request has been
  *                processed else \ref LORAMAC_HANDLER_ERROR
  */
-LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed,
-                                     TimerTime_t *nextTxIn, bool allowDelayedTx);
+LmHandlerErrorStatus_t LmHandlerSend( LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed,
+                                      TimerTime_t *nextTxIn, bool allowDelayedTx );
 
 /*!
  * \brief   Check whether the Device is joined to the network
@@ -280,7 +340,7 @@ LmHandlerErrorStatus_t LmHandlerPackageRegister(uint8_t id, void *params);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass);
+LmHandlerErrorStatus_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass);
 
 /*!
  * \brief Gets the LoRaWAN Device EUI (if OTAA)
@@ -290,7 +350,7 @@ int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetDevEUI(uint8_t *devEUI);
+LmHandlerErrorStatus_t LmHandlerGetDevEUI(uint8_t *devEUI);
 
 /*!
  * \brief Sets the LoRaWAN Device EUI (if OTAA)
@@ -300,17 +360,17 @@ int32_t LmHandlerGetDevEUI(uint8_t *devEUI);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetDevEUI(uint8_t *devEUI);
+LmHandlerErrorStatus_t LmHandlerSetDevEUI(uint8_t *devEUI);
 
 /*!
- * \brief Gets the LoRaWAN AppEUI (from the Commissionning)
+ * \brief Gets the LoRaWAN AppEUI (from the Commissioning)
  *
  * \param [out] appEUI LoRaWAN AppEUI
  *
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetAppEUI(uint8_t *appEUI);
+LmHandlerErrorStatus_t LmHandlerGetAppEUI(uint8_t *appEUI);
 
 /*!
  * \brief Sets the LoRaWAN App EUI (if OTAA)
@@ -320,17 +380,17 @@ int32_t LmHandlerGetAppEUI(uint8_t *appEUI);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetAppEUI(uint8_t *appEUI);
+LmHandlerErrorStatus_t LmHandlerSetAppEUI(uint8_t *appEUI);
 
 /*!
- * \brief Gets the LoRaWAN Network ID (from the Commissionning if ABP or after the Join if OTAA)
+ * \brief Gets the LoRaWAN Network ID (from the Commissioning if ABP or after the Join if OTAA)
  *
  * \param [out] networkId current network ID
  *
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetNetworkID(uint32_t *networkId);
+LmHandlerErrorStatus_t LmHandlerGetNetworkID(uint32_t *networkId);
 
 /*!
  * \brief Sets the LoRaWAN Network ID
@@ -340,17 +400,17 @@ int32_t LmHandlerGetNetworkID(uint32_t *networkId);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetNetworkID(uint32_t networkId);
+LmHandlerErrorStatus_t LmHandlerSetNetworkID(uint32_t networkId);
 
 /*!
- * \brief Gets the LoRaWAN Device Address (from the Commissionning if ABP or after the Join if OTAA)
+ * \brief Gets the LoRaWAN Device Address (from the Commissioning if ABP or after the Join if OTAA)
  *
  * \param [out] devAddr current device address
  *
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetDevAddr(uint32_t *devAddr);
+LmHandlerErrorStatus_t LmHandlerGetDevAddr(uint32_t *devAddr);
 
 /*!
  * \brief Sets the LoRaWAN Device Address (if ABP)
@@ -360,7 +420,7 @@ int32_t LmHandlerGetDevAddr(uint32_t *devAddr);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetDevAddr(uint32_t devAddr);
+LmHandlerErrorStatus_t LmHandlerSetDevAddr(uint32_t devAddr);
 
 /*!
  * \brief Gets the current active region
@@ -370,7 +430,7 @@ int32_t LmHandlerSetDevAddr(uint32_t devAddr);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region);
+LmHandlerErrorStatus_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region);
 
 /*!
  * \brief Sets the current active region
@@ -380,7 +440,7 @@ int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region);
+LmHandlerErrorStatus_t LmHandlerSetActiveRegion(LoRaMacRegion_t region);
 
 /*!
  * \brief Gets the Adaptive data rate (1 = the Network manages the DR, 0 = the device manages the DR)
@@ -390,7 +450,7 @@ int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetAdrEnable(bool *adrEnable);
+LmHandlerErrorStatus_t LmHandlerGetAdrEnable(bool *adrEnable);
 
 /*!
  * \brief Sets the Adaptive data rate (1 = the Network manages the DR, 0 = the device manages the DR)
@@ -400,7 +460,7 @@ int32_t LmHandlerGetAdrEnable(bool *adrEnable);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetAdrEnable(bool adrEnable);
+LmHandlerErrorStatus_t LmHandlerSetAdrEnable(bool adrEnable);
 
 /*!
  * \brief Gets the current datarate
@@ -410,7 +470,7 @@ int32_t LmHandlerSetAdrEnable(bool adrEnable);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetTxDatarate(int8_t *txDatarate);
+LmHandlerErrorStatus_t LmHandlerGetTxDatarate(int8_t *txDatarate);
 
 /*!
  * \brief Sets the current datarate
@@ -420,7 +480,7 @@ int32_t LmHandlerGetTxDatarate(int8_t *txDatarate);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetTxDatarate(int8_t txDatarate);
+LmHandlerErrorStatus_t LmHandlerSetTxDatarate(int8_t txDatarate);
 
 /*!
  * \brief Gets the duty cycle flag
@@ -430,7 +490,7 @@ int32_t LmHandlerSetTxDatarate(int8_t txDatarate);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable);
+LmHandlerErrorStatus_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable);
 
 /*!
  * \brief Sets the current datarate
@@ -440,7 +500,7 @@ int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable);
+LmHandlerErrorStatus_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable);
 
 /*!
  * \brief Gets the current RX_2 datarate and frequency
@@ -450,7 +510,7 @@ int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams);
+LmHandlerErrorStatus_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams);
 
 /*!
  * \brief Gets the current TX power
@@ -460,7 +520,7 @@ int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetTxPower(int8_t *txPower);
+LmHandlerErrorStatus_t LmHandlerGetTxPower(int8_t *txPower);
 
 /*!
  * \brief Gets the current RX1 delay (after the TX done)
@@ -470,7 +530,7 @@ int32_t LmHandlerGetTxPower(int8_t *txPower);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay);
+LmHandlerErrorStatus_t LmHandlerGetRx1Delay(uint32_t *rxDelay);
 
 /*!
  * \brief Gets the current RX2 delay (after the TX done)
@@ -480,7 +540,7 @@ int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay);
+LmHandlerErrorStatus_t LmHandlerGetRx2Delay(uint32_t *rxDelay);
 
 /*!
  * \brief Gets the current RX1 Join delay (after the TX done)
@@ -490,7 +550,7 @@ int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay);
+LmHandlerErrorStatus_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay);
 
 /*!
  * \brief Gets the current RX2 Join delay (after the TX done)
@@ -500,7 +560,7 @@ int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay);
+LmHandlerErrorStatus_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay);
 
 /*!
  * \brief Sets the RX_2 datarate and frequency
@@ -510,7 +570,7 @@ int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams);
+LmHandlerErrorStatus_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams);
 
 /*!
  * \brief Sets the TX power
@@ -520,7 +580,7 @@ int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetTxPower(int8_t txPower);
+LmHandlerErrorStatus_t LmHandlerSetTxPower(int8_t txPower);
 
 /*!
  * \brief Sets the RX1 delay (after the TX done)
@@ -530,7 +590,7 @@ int32_t LmHandlerSetTxPower(int8_t txPower);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetRx1Delay(uint32_t rxDelay);
+LmHandlerErrorStatus_t LmHandlerSetRx1Delay(uint32_t rxDelay);
 
 /*!
  * \brief Sets the RX2 delay (after the TX done)
@@ -540,7 +600,7 @@ int32_t LmHandlerSetRx1Delay(uint32_t rxDelay);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetRx2Delay(uint32_t rxDelay);
+LmHandlerErrorStatus_t LmHandlerSetRx2Delay(uint32_t rxDelay);
 
 /*!
  * \brief Sets the RX1 delay (after the TX done)
@@ -550,7 +610,7 @@ int32_t LmHandlerSetRx2Delay(uint32_t rxDelay);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay);
+LmHandlerErrorStatus_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay);
 
 /*!
  * \brief Sets the RX2 delay (after the TX done)
@@ -560,7 +620,7 @@ int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay);
+LmHandlerErrorStatus_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay);
 
 /*!
  * \brief Gets the current ClassB Ping periodicity
@@ -570,7 +630,7 @@ int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity);
+LmHandlerErrorStatus_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity);
 
 /*!
  * \brief Sets the ClassB Ping periodicity
@@ -580,7 +640,7 @@ int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity);
+LmHandlerErrorStatus_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity);
 
 /*!
  * \brief Gets the current ClassB Beacon status
@@ -590,8 +650,103 @@ int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity);
  * \retval -1 LORAMAC_HANDLER_ERROR
  *          0 LORAMAC_HANDLER_SUCCESS
  */
-int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState);
+LmHandlerErrorStatus_t LmHandlerGetBeaconState(BeaconState_t *beaconState);
+
+/*!
+ * \brief Gets the LoRaWAN NwkKey (from the se-identity)
+ *
+ * \param [out] nwkKey LoRaWAN NwkKey
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerGetNwkKey( uint8_t *nwkKey );
+
+/*!
+ * \brief Sets the LoRaWAN NwkKey (if OTAA)
+ *
+ * \param [in] nwkKey LoRaWAN NwkKey
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerSetNwkKey( uint8_t *nwkKey );
+
+/*!
+ * \brief Gets the LoRaWAN AppKey (from the se-identity)
+ *
+ * \param [out] appKey LoRaWAN AppKey
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerGetAppKey( uint8_t *appKey );
 
+/*!
+ * \brief Sets the LoRaWAN AppKey (if OTAA)
+ *
+ * \param [in] appKey LoRaWAN AppKey
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerSetAppKey( uint8_t *appKey );
+
+/*!
+ * \brief Gets the LoRaWAN NwkSKey (from the se-identity)
+ *
+ * \param [out] nwkSKey LoRaWAN NwkSKey
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerGetNwkSKey( uint8_t *nwkSKey );
+
+/*!
+ * \brief Sets the LoRaWAN NwkSKey (if OTAA)
+ *
+ * \param [in] nwkSKey LoRaWAN NwkSKey
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerSetNwkSKey( uint8_t *nwkSKey );
+
+/*!
+ * \brief Gets the LoRaWAN AppSKey (from the se-identity)
+ *
+ * \param [out] appSKey LoRaWAN AppSKey
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerGetAppSKey( uint8_t *appSKey );
+
+/*!
+ * \brief Sets the LoRaWAN AppSKey (if OTAA)
+ *
+ * \param [in] appSKey appSKey LoRaWAN AppSKey
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerSetAppSKey( uint8_t *appSKey );
+
+/*!
+ * Requests network server time update
+ *
+ * \retval  status Returns \ref LORAMAC_HANDLER_SUCCESS if request has been
+ *                 processed else \ref LORAMAC_HANDLER_ERROR
+ */
+LmHandlerErrorStatus_t LmHandlerDeviceTimeReq( void );
+
+/*!
+ * Requests Link connectivity check
+ *
+ * \retval -1 LORAMAC_HANDLER_ERROR
+ *          0 LORAMAC_HANDLER_SUCCESS
+ */
+LmHandlerErrorStatus_t LmHandlerLinkCheckReq( void );
 #ifdef __cplusplus
 }
 #endif
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandlerTypes.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandlerTypes.h
index 1292eca1..9cf0b693 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandlerTypes.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandlerTypes.h
@@ -31,10 +31,6 @@
 #ifndef __LORAMAC_HANDLER_TYPES_H__
 #define __LORAMAC_HANDLER_TYPES_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Includes ------------------------------------------------------------------*/
 #include "LoRaMac.h"
 
@@ -46,104 +42,100 @@ extern "C" {
  */
 typedef enum
 {
-  LORAMAC_HANDLER_ADR_OFF = 0,
-  LORAMAC_HANDLER_ADR_ON = !LORAMAC_HANDLER_ADR_OFF
-} LmHandlerAdrStates_t;
+    LORAMAC_HANDLER_ADR_OFF = 0,
+    LORAMAC_HANDLER_ADR_ON = !LORAMAC_HANDLER_ADR_OFF
+}LmHandlerAdrStates_t;
 
 /*!
  *
  */
 typedef enum
 {
-  LORAMAC_HANDLER_RESET = 0,
-  LORAMAC_HANDLER_SET = !LORAMAC_HANDLER_RESET
-} LmHandlerFlagStatus_t;
+    LORAMAC_HANDLER_RESET = 0,
+    LORAMAC_HANDLER_SET = !LORAMAC_HANDLER_RESET
+}LmHandlerFlagStatus_t;
 
 /*!
  *
  */
 typedef enum
 {
-  LORAMAC_HANDLER_ERROR = -1,
-  LORAMAC_HANDLER_BUSY_ERROR = -2,
-  LORAMAC_HANDLER_NO_NETWORK_JOINED = -3,
-  LORAMAC_HANDLER_COMPLIANCE_RUNNING = -4,
-  LORAMAC_HANDLER_CRYPTO_ERROR = -5,
-  LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED = -6,
-  LORAMAC_HANDLER_SUCCESS = 0
-} LmHandlerErrorStatus_t;
+    LORAMAC_HANDLER_ERROR = -1,
+    LORAMAC_HANDLER_BUSY_ERROR = -2,
+    LORAMAC_HANDLER_NO_NETWORK_JOINED = -3,
+    LORAMAC_HANDLER_COMPLIANCE_RUNNING = -4,
+    LORAMAC_HANDLER_CRYPTO_ERROR = -5,
+    LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED = -6,
+    LORAMAC_HANDLER_SUCCESS = 0
+}LmHandlerErrorStatus_t;
 
 /*!
  *
  */
 typedef enum
 {
-  LORAMAC_HANDLER_UNCONFIRMED_MSG = 0,
-  LORAMAC_HANDLER_CONFIRMED_MSG = !LORAMAC_HANDLER_UNCONFIRMED_MSG
-} LmHandlerMsgTypes_t;
+    LORAMAC_HANDLER_UNCONFIRMED_MSG = 0,
+    LORAMAC_HANDLER_CONFIRMED_MSG = !LORAMAC_HANDLER_UNCONFIRMED_MSG
+}LmHandlerMsgTypes_t;
 
 /*!
  *
  */
 typedef enum
 {
-  LORAMAC_HANDLER_FALSE = 0,
-  LORAMAC_HANDLER_TRUE = !LORAMAC_HANDLER_FALSE
-} LmHandlerBoolean_t;
+    LORAMAC_HANDLER_FALSE = 0,
+    LORAMAC_HANDLER_TRUE = !LORAMAC_HANDLER_FALSE
+}LmHandlerBoolean_t;
 
 typedef enum
 {
-  LORAMAC_HANDLER_BEACON_ACQUIRING,
-  LORAMAC_HANDLER_BEACON_LOST,
-  LORAMAC_HANDLER_BEACON_RX,
-  LORAMAC_HANDLER_BEACON_NRX
-} LmHandlerBeaconState_t;
+    LORAMAC_HANDLER_BEACON_ACQUIRING,
+    LORAMAC_HANDLER_BEACON_LOST,
+    LORAMAC_HANDLER_BEACON_RX,
+    LORAMAC_HANDLER_BEACON_NRX
+}LmHandlerBeaconState_t;
 
 typedef enum
 {
-  LORAMAC_HANDLER_NVM_RESTORE,
-  LORAMAC_HANDLER_NVM_STORE,
-} LmHandlerNvmContextStates_t;
+    LORAMAC_HANDLER_NVM_RESTORE,
+    LORAMAC_HANDLER_NVM_STORE,
+}LmHandlerNvmContextStates_t;
 
 /*!
  * Commissioning parameters
  */
 typedef struct CommissioningParams_s
 {
-  uint8_t DevEui[8];
-  uint8_t JoinEui[8];
-  uint32_t NetworkId;
-  uint32_t DevAddr;
-} CommissioningParams_t;
+    uint8_t DevEui[8];
+    uint8_t JoinEui[8];
+    uint32_t NetworkId;
+    uint32_t DevAddr;
+}CommissioningParams_t;
 
 /*!
  * Application data structure
  */
 typedef struct LmHandlerAppData_s
 {
-  uint8_t Port;
-  uint8_t BufferSize;
-  uint8_t *Buffer;
-} LmHandlerAppData_t;
+    uint8_t Port;
+    uint8_t BufferSize;
+    uint8_t *Buffer;
+}LmHandlerAppData_t;
 
 typedef struct LmHandlerRequestParams_s
 {
-  uint8_t IsMcpsRequest;
-  LoRaMacStatus_t Status;
-  union
-  {
-    Mcps_t Mcps;
-    Mlme_t Mlme;
-  } RequestType;
-} LmHandlerRequestParams_t;
+    uint8_t IsMcpsRequest;
+    LoRaMacStatus_t Status;
+    union
+    {
+        Mcps_t Mcps;
+        Mlme_t Mlme;
+    }RequestType;
+}LmHandlerRequestParams_t;
 
 
 /* External variables --------------------------------------------------------*/
 /* Exported macros -----------------------------------------------------------*/
 /* Exported functions ------------------------------------------------------- */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __LORAMAC_HANDLER_TYPES_H__ */
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c
deleted file mode 100644
index f360fb59..00000000
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*!
- * \file      NvmCtxMgmt.c
- *
- * \brief     NVM context management implementation
- *
- * \copyright Revised BSD License, see section \ref LICENSE.
- *
- * \code
- *                ______                              _
- *               / _____)             _              | |
- *              ( (____  _____ ____ _| |_ _____  ____| |__
- *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- *               _____) ) ____| | | || |_| ____( (___| | | |
- *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
- *              (C)2013-2017 Semtech
- *
- *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
- *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
- *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
- *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
- *              embedded.connectivity.solutions===============
- *
- * \endcode
- *
- * \author    Miguel Luis ( Semtech )
- *
- * \author    Gregory Cristian ( Semtech )
- *
- * \author    Daniel Jaeckle ( STACKFORCE )
- *
- * \author    Johannes Bruder ( STACKFORCE )
- */
-/**
-  ******************************************************************************
-  *
-  *          Portions COPYRIGHT 2020 STMicroelectronics
-  *
-  * @file    NvmCtxMgmt.c
-  * @author  MCD Application Team
-  * @brief   NVM Context Management definition
-  ******************************************************************************
-  */
-/* Includes ------------------------------------------------------------------*/
-#include "NvmCtxMgmt.h"
-
-/* Private typedef -----------------------------------------------------------*/
-#if ( CONTEXT_MANAGEMENT_ENABLED == 1 )
-/*!
- * LoRaMAC Structure holding contexts changed status
- * in case of a \ref MLME_NVM_CTXS_UPDATE indication.
- */
-typedef union uLoRaMacCtxsUpdateInfo
-{
-  /*!
-   * Byte-access to the bits
-   */
-  uint8_t Value;
-  /*!
-   * The according context bit will be set to one
-   * if the context changed or 0 otherwise.
-   */
-  struct sElements
-  {
-    /*!
-     * Mac core nvm context
-     */
-    uint8_t Mac : 1;
-    /*!
-     * Region module nvm contexts
-     */
-    uint8_t Region : 1;
-    /*!
-     * Crypto module context
-     */
-    uint8_t Crypto : 1;
-    /*!
-     * Secure Element driver context
-     */
-    uint8_t SecureElement : 1;
-    /*!
-     * MAC commands module context
-     */
-    uint8_t Commands : 1;
-    /*!
-     * Class B module context
-     */
-    uint8_t ClassB : 1;
-    /*!
-     * Confirm queue module context
-     */
-    uint8_t ConfirmQueue : 1;
-    /*!
-     * FCnt Handler module context
-     */
-    uint8_t FCntHandlerNvmCtx : 1;
-  } Elements;
-} LoRaMacCtxUpdateStatus_t;
-#endif /* CONTEXT_MANAGEMENT_ENABLED == 1 */
-
-/* Private define ------------------------------------------------------------*/
-/*!
- * Enables/Disables the context storage management storage at all. Must be enabled for LoRaWAN 1.1.x.
- * WARNING: Still under development and not tested yet.
- */
-#define CONTEXT_MANAGEMENT_ENABLED         0
-
-/*!
- * Enables/Disables maximum persistent context storage management. All module contexts will be saved on a non-volatile memory.
- * WARNING: Still under development and not tested yet.
- */
-#define MAX_PERSISTENT_CTX_MGMT_ENABLED    0
-
-#if ( MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 )
-#define NVM_CTX_STORAGE_MASK               0xFF
-#else /* MAX_PERSISTENT_CTX_MGMT_ENABLED == 0 */
-#define NVM_CTX_STORAGE_MASK               0x8C
-#endif /* MAX_PERSISTENT_CTX_MGMT_ENABLED */
-
-/* Private macro -------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-#if ( CONTEXT_MANAGEMENT_ENABLED == 1 )
-static LoRaMacCtxUpdateStatus_t CtxUpdateStatus = { .Value = 0 };
-
-/*
- * Nvmm handles
- */
-static NvmmDataBlock_t SecureElementNvmCtxDataBlock;
-static NvmmDataBlock_t CryptoNvmCtxDataBlock;
-#if ( MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 )
-static NvmmDataBlock_t MacNvmCtxDataBlock;
-static NvmmDataBlock_t RegionNvmCtxDataBlock;
-static NvmmDataBlock_t CommandsNvmCtxDataBlock;
-static NvmmDataBlock_t ConfirmQueueNvmCtxDataBlock;
-static NvmmDataBlock_t ClassBNvmCtxDataBlock;
-#endif /* MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 */
-#endif /* CONTEXT_MANAGEMENT_ENABLED == 1 */
-
-/* Exported functions ---------------------------------------------------------*/
-void NvmCtxMgmtEvent(LoRaMacNvmCtxModule_t module)
-{
-#if ( CONTEXT_MANAGEMENT_ENABLED == 1 )
-  switch (module)
-  {
-    case LORAMAC_NVMCTXMODULE_MAC:
-    {
-      CtxUpdateStatus.Elements.Mac = 1;
-      break;
-    }
-    case LORAMAC_NVMCTXMODULE_REGION:
-    {
-      CtxUpdateStatus.Elements.Region = 1;
-      break;
-    }
-    case LORAMAC_NVMCTXMODULE_CRYPTO:
-    {
-      CtxUpdateStatus.Elements.Crypto = 1;
-      break;
-    }
-    case LORAMAC_NVMCTXMODULE_SECURE_ELEMENT:
-    {
-      CtxUpdateStatus.Elements.SecureElement = 1;
-      break;
-    }
-    case LORAMAC_NVMCTXMODULE_COMMANDS:
-    {
-      CtxUpdateStatus.Elements.Commands = 1;
-      break;
-    }
-    case LORAMAC_NVMCTXMODULE_CLASS_B:
-    {
-      CtxUpdateStatus.Elements.ClassB = 1;
-      break;
-    }
-    case LORAMAC_NVMCTXMODULE_CONFIRM_QUEUE:
-    {
-      CtxUpdateStatus.Elements.ConfirmQueue = 1;
-      break;
-    }
-    default:
-    {
-      break;
-    }
-  }
-#endif /* CONTEXT_MANAGEMENT_ENABLED == 1 */
-}
-
-NvmCtxMgmtStatus_t NvmCtxMgmtStore(void)
-{
-#if ( CONTEXT_MANAGEMENT_ENABLED == 1 )
-  /* Read out the contexts lengths and pointers */
-  MibRequestConfirm_t mibReq;
-  mibReq.Type = MIB_NVM_CTXS;
-  LoRaMacMibGetRequestConfirm(&mibReq);
-  LoRaMacCtxs_t *MacContexts = mibReq.Param.Contexts;
-
-  /* Input checks */
-  if ((CtxUpdateStatus.Value & NVM_CTX_STORAGE_MASK) == 0)
-  {
-    return NVMCTXMGMT_STATUS_FAIL;
-  }
-  if (LoRaMacStop() != LORAMAC_STATUS_OK)
-  {
-    return NVMCTXMGMT_STATUS_FAIL;
-  }
-
-  /* Write */
-  if (CtxUpdateStatus.Elements.Crypto == 1)
-  {
-    if (NvmmWrite(&CryptoNvmCtxDataBlock, MacContexts->CryptoNvmCtx, MacContexts->CryptoNvmCtxSize) != NVMM_SUCCESS)
-    {
-      return NVMCTXMGMT_STATUS_FAIL;
-    }
-  }
-
-  if (CtxUpdateStatus.Elements.SecureElement == 1)
-  {
-    if (NvmmWrite(&SecureElementNvmCtxDataBlock, MacContexts->SecureElementNvmCtx,
-                  MacContexts->SecureElementNvmCtxSize) != NVMM_SUCCESS)
-    {
-      return NVMCTXMGMT_STATUS_FAIL;
-    }
-  }
-
-#if ( MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 )
-  if (CtxUpdateStatus.Elements.Mac == 1)
-  {
-    if (NvmmWrite(&MacNvmCtxDataBlock, MacContexts->MacNvmCtx, MacContexts->MacNvmCtxSize) != NVMM_SUCCESS)
-    {
-      return NVMCTXMGMT_STATUS_FAIL;
-    }
-  }
-
-  if (CtxUpdateStatus.Elements.Region == 1)
-  {
-    if (NvmmWrite(&RegionNvmCtxDataBlock, MacContexts->RegionNvmCtx, MacContexts->RegionNvmCtxSize) != NVMM_SUCCESS)
-    {
-      return NVMCTXMGMT_STATUS_FAIL;
-    }
-  }
-
-  if (CtxUpdateStatus.Elements.Commands == 1)
-  {
-    if (NvmmWrite(&CommandsNvmCtxDataBlock, MacContexts->CommandsNvmCtx, MacContexts->CommandsNvmCtxSize) != NVMM_SUCCESS)
-    {
-      return NVMCTXMGMT_STATUS_FAIL;
-    }
-  }
-
-  if (CtxUpdateStatus.Elements.ClassB == 1)
-  {
-    if (NvmmWrite(&ClassBNvmCtxDataBlock, MacContexts->ClassBNvmCtx, MacContexts->ClassBNvmCtxSize) != NVMM_SUCCESS)
-    {
-      return NVMCTXMGMT_STATUS_FAIL;
-    }
-  }
-
-  if (CtxUpdateStatus.Elements.ConfirmQueue == 1)
-  {
-    if (NvmmWrite(&ConfirmQueueNvmCtxDataBlock, MacContexts->ConfirmQueueNvmCtx,
-                  MacContexts->ConfirmQueueNvmCtxSize) != NVMM_SUCCESS)
-    {
-      return NVMCTXMGMT_STATUS_FAIL;
-    }
-  }
-#endif /* MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 */
-
-  CtxUpdateStatus.Value = 0x00;
-
-  /* Resume LoRaMac */
-  LoRaMacStart();
-
-  return NVMCTXMGMT_STATUS_SUCCESS;
-#else /* CONTEXT_MANAGEMENT_ENABLED == 0 */
-  return NVMCTXMGMT_STATUS_FAIL;
-#endif /* CONTEXT_MANAGEMENT_ENABLED */
-}
-
-NvmCtxMgmtStatus_t NvmCtxMgmtRestore(void)
-{
-#if ( CONTEXT_MANAGEMENT_ENABLED == 1 )
-  MibRequestConfirm_t mibReq;
-  LoRaMacCtxs_t contexts = { 0 };
-  NvmCtxMgmtStatus_t status = NVMCTXMGMT_STATUS_SUCCESS;
-
-  /* Read out the contexts lengths */
-  mibReq.Type = MIB_NVM_CTXS;
-  LoRaMacMibGetRequestConfirm(&mibReq);
-
-
-  uint8_t NvmCryptoCtxRestore[mibReq.Param.Contexts->CryptoNvmCtxSize];
-  uint8_t NvmSecureElementCtxRestore[mibReq.Param.Contexts->SecureElementNvmCtxSize];
-#if ( MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 )
-  uint8_t NvmMacCtxRestore[mibReq.Param.Contexts->MacNvmCtxSize];
-  uint8_t NvmRegionCtxRestore[mibReq.Param.Contexts->RegionNvmCtxSize];
-  uint8_t NvmCommandsCtxRestore[mibReq.Param.Contexts->CommandsNvmCtxSize];
-  uint8_t NvmClassBCtxRestore[mibReq.Param.Contexts->ClassBNvmCtxSize];
-  uint8_t NvmConfirmQueueCtxRestore[mibReq.Param.Contexts->ConfirmQueueNvmCtxSize];
-#endif /* MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 */
-
-  if (NvmmDeclare(&CryptoNvmCtxDataBlock, mibReq.Param.Contexts->CryptoNvmCtxSize) == NVMM_SUCCESS)
-  {
-    NvmmRead(&CryptoNvmCtxDataBlock, NvmCryptoCtxRestore, mibReq.Param.Contexts->CryptoNvmCtxSize);
-    contexts.CryptoNvmCtx = &NvmCryptoCtxRestore;
-    contexts.CryptoNvmCtxSize = mibReq.Param.Contexts->CryptoNvmCtxSize;
-  }
-  else
-  {
-    status = NVMCTXMGMT_STATUS_FAIL;
-  }
-
-  if (NvmmDeclare(&SecureElementNvmCtxDataBlock, mibReq.Param.Contexts->SecureElementNvmCtxSize) == NVMM_SUCCESS)
-  {
-    NvmmRead(&SecureElementNvmCtxDataBlock, NvmSecureElementCtxRestore, mibReq.Param.Contexts->SecureElementNvmCtxSize);
-    contexts.SecureElementNvmCtx = &NvmSecureElementCtxRestore;
-    contexts.SecureElementNvmCtxSize = mibReq.Param.Contexts->SecureElementNvmCtxSize;
-  }
-  else
-  {
-    status = NVMCTXMGMT_STATUS_FAIL;
-  }
-
-#if ( MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 )
-  if (NvmmDeclare(&MacNvmCtxDataBlock, mibReq.Param.Contexts->MacNvmCtxSize) == NVMM_SUCCESS)
-  {
-    NvmmRead(&MacNvmCtxDataBlock, NvmMacCtxRestore, mibReq.Param.Contexts->MacNvmCtxSize);
-    contexts.MacNvmCtx = &NvmMacCtxRestore;
-    contexts.MacNvmCtxSize = mibReq.Param.Contexts->MacNvmCtxSize;
-  }
-  else
-  {
-    status = NVMCTXMGMT_STATUS_FAIL;
-  }
-
-  if (NvmmDeclare(&RegionNvmCtxDataBlock, mibReq.Param.Contexts->RegionNvmCtxSize) == NVMM_SUCCESS)
-  {
-    NvmmRead(&RegionNvmCtxDataBlock, NvmRegionCtxRestore, mibReq.Param.Contexts->RegionNvmCtxSize);
-    contexts.RegionNvmCtx = &NvmRegionCtxRestore;
-    contexts.RegionNvmCtxSize = mibReq.Param.Contexts->RegionNvmCtxSize;
-  }
-  else
-  {
-    status = NVMCTXMGMT_STATUS_FAIL;
-  }
-
-  if (NvmmDeclare(&CommandsNvmCtxDataBlock, mibReq.Param.Contexts->CommandsNvmCtxSize) == NVMM_SUCCESS)
-  {
-    NvmmRead(&CommandsNvmCtxDataBlock, NvmCommandsCtxRestore, mibReq.Param.Contexts->CommandsNvmCtxSize);
-    contexts.CommandsNvmCtx = &NvmCommandsCtxRestore;
-    contexts.CommandsNvmCtxSize = mibReq.Param.Contexts->CommandsNvmCtxSize;
-  }
-  else
-  {
-    status = NVMCTXMGMT_STATUS_FAIL;
-  }
-
-  if (NvmmDeclare(&ClassBNvmCtxDataBlock, mibReq.Param.Contexts->ClassBNvmCtxSize) == NVMM_SUCCESS)
-  {
-    NvmmRead(&ClassBNvmCtxDataBlock, NvmClassBCtxRestore, mibReq.Param.Contexts->ClassBNvmCtxSize);
-    contexts.ClassBNvmCtx = &NvmClassBCtxRestore;
-    contexts.ClassBNvmCtxSize = mibReq.Param.Contexts->ClassBNvmCtxSize;
-  }
-  else
-  {
-    status = NVMCTXMGMT_STATUS_FAIL;
-  }
-
-  if (NvmmDeclare(&ConfirmQueueNvmCtxDataBlock, mibReq.Param.Contexts->ConfirmQueueNvmCtxSize) == NVMM_SUCCESS)
-  {
-    NvmmRead(&ConfirmQueueNvmCtxDataBlock, NvmConfirmQueueCtxRestore, mibReq.Param.Contexts->ConfirmQueueNvmCtxSize);
-    contexts.ConfirmQueueNvmCtx = &NvmConfirmQueueCtxRestore;
-    contexts.ConfirmQueueNvmCtxSize = mibReq.Param.Contexts->ConfirmQueueNvmCtxSize;
-  }
-  else
-  {
-    status = NVMCTXMGMT_STATUS_FAIL;
-  }
-#endif /* MAX_PERSISTENT_CTX_MGMT_ENABLED == 1 */
-
-  /* Enforce storing all contexts */
-  if (status == NVMCTXMGMT_STATUS_FAIL)
-  {
-    CtxUpdateStatus.Value = 0xFF;
-    NvmCtxMgmtStore();
-  }
-  else
-  {
-    /* If successful query the mac to restore contexts */
-    mibReq.Type = MIB_NVM_CTXS;
-    mibReq.Param.Contexts = &contexts;
-    LoRaMacMibSetRequestConfirm(&mibReq);
-  }
-
-  return status;
-#else /* CONTEXT_MANAGEMENT_ENABLED == 0 */
-  return NVMCTXMGMT_STATUS_FAIL;
-#endif /* CONTEXT_MANAGEMENT_ENABLED */
-}
-
-/* Private  functions ---------------------------------------------------------*/
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.h
deleted file mode 100644
index 9b38879c..00000000
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*!
- * \file      NvmCtxMgmt.h
- *
- * \brief     NVM context management implementation
- *
- * \copyright Revised BSD License, see section \ref LICENSE.
- *
- * \code
- *                ______                              _
- *               / _____)             _              | |
- *              ( (____  _____ ____ _| |_ _____  ____| |__
- *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- *               _____) ) ____| | | || |_| ____( (___| | | |
- *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
- *              (C)2013-2017 Semtech
- *
- *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
- *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
- *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
- *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
- *              embedded.connectivity.solutions===============
- *
- * \endcode
- *
- * \author    Miguel Luis ( Semtech )
- *
- * \author    Gregory Cristian ( Semtech )
- *
- * \author    Daniel Jaeckle ( STACKFORCE )
- *
- * \author    Johannes Bruder ( STACKFORCE )
- *
- * \defgroup  NVMCTXMGMT NVM context management implementation
- *            This module implements the NVM context handling
- * \{
- */
-/**
-  ******************************************************************************
-  *
-  *          Portions COPYRIGHT 2020 STMicroelectronics
-  *
-  * @file    NvmCtxMgmt.h
-  * @author  MCD Application Team
-  * @brief   Header for NVM Context Management module
-  ******************************************************************************
-  */
-#ifndef __NVMCTXMGMT_H__
-#define __NVMCTXMGMT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "LoRaMac.h"
-
-/* Exported defines ----------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/*!
- * Data structure containing the status of a operation
- */
-typedef enum NvmCtxMgmtStatus_e
-{
-  /*!
-   * Operation was successful
-   */
-  NVMCTXMGMT_STATUS_SUCCESS,
-  /*!
-   * Operation was not successful
-   */
-  NVMCTXMGMT_STATUS_FAIL
-} NvmCtxMgmtStatus_t;
-
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-/*!
- * \brief Calculates the next datarate to set, when ADR is on or off.
- *
- * \param [in] adrNext Pointer to the function parameters.
- *
- */
-void NvmCtxMgmtEvent(LoRaMacNvmCtxModule_t module);
-
-NvmCtxMgmtStatus_t NvmCtxMgmtStore(void);
-
-NvmCtxMgmtStatus_t NvmCtxMgmtRestore(void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NVMCTXMGMT_H__ */
-
-/*! \} defgroup NVMCTXMGMT */
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c
new file mode 100644
index 00000000..eaa49d51
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c
@@ -0,0 +1,275 @@
+/*!
+ * \file      NvmDataMgmt.c
+ *
+ * \brief     NVM context management implementation
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2017 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ *
+ * \author    Gregory Cristian ( Semtech )
+ *
+ * \author    Daniel Jaeckle ( STACKFORCE )
+ *
+ * \author    Johannes Bruder ( STACKFORCE )
+ */
+
+#include <stdio.h>
+#include "utilities.h"
+#include "LoRaMac.h"
+#include "NvmDataMgmt.h"
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#ifndef CONTEXT_MANAGEMENT_ENABLED
+#define CONTEXT_MANAGEMENT_ENABLED         0
+#endif
+
+#if( CONTEXT_MANAGEMENT_ENABLED == 1 )
+#include "nvmm.h"
+
+static uint16_t NvmNotifyFlags = 0;
+#endif /* CONTEXT_MANAGEMENT_ENABLED == 1 */
+
+void NvmDataMgmtEvent( uint16_t notifyFlags )
+{
+#if( CONTEXT_MANAGEMENT_ENABLED == 1 )
+    NvmNotifyFlags = notifyFlags;
+#endif /* CONTEXT_MANAGEMENT_ENABLED == 1 */
+}
+
+uint16_t NvmDataMgmtStore( void )
+{
+#if( CONTEXT_MANAGEMENT_ENABLED == 1 )
+    uint16_t offset = 0;
+    uint16_t dataSize = 0;
+    MibRequestConfirm_t mibReq;
+    mibReq.Type = MIB_NVM_CTXS;
+    LoRaMacMibGetRequestConfirm( &mibReq );
+    LoRaMacNvmData_t* nvm = mibReq.Param.Contexts;
+
+    // Input checks
+    if( NvmNotifyFlags == LORAMAC_NVM_NOTIFY_FLAG_NONE )
+    {
+        // There was no update.
+        return 0;
+    }
+    if( LoRaMacStop( ) != LORAMAC_STATUS_OK )
+    {
+        return 0;
+    }
+
+    // Crypto
+    if( ( NvmNotifyFlags & LORAMAC_NVM_NOTIFY_FLAG_CRYPTO ) ==
+        LORAMAC_NVM_NOTIFY_FLAG_CRYPTO )
+    {
+        dataSize += NvmmWrite( ( uint8_t* ) &nvm->Crypto, sizeof( nvm->Crypto ),
+                               offset );
+    }
+    offset += sizeof( nvm->Crypto );
+
+    // MacGroup1
+    if( ( NvmNotifyFlags & LORAMAC_NVM_NOTIFY_FLAG_MAC_GROUP1 ) ==
+        LORAMAC_NVM_NOTIFY_FLAG_MAC_GROUP1 )
+    {
+        dataSize += NvmmWrite( ( uint8_t* ) &nvm->MacGroup1,
+                               sizeof( nvm->MacGroup1 ), offset );
+    }
+    offset += sizeof( nvm->MacGroup1 );
+
+    // MacGroup2
+    if( ( NvmNotifyFlags & LORAMAC_NVM_NOTIFY_FLAG_MAC_GROUP2 ) ==
+        LORAMAC_NVM_NOTIFY_FLAG_MAC_GROUP2 )
+    {
+        dataSize += NvmmWrite( ( uint8_t* ) &nvm->MacGroup2,
+                               sizeof( nvm->MacGroup2 ), offset );
+    }
+    offset += sizeof( nvm->MacGroup2 );
+
+    // Secure element
+    if( ( NvmNotifyFlags & LORAMAC_NVM_NOTIFY_FLAG_SECURE_ELEMENT ) ==
+        LORAMAC_NVM_NOTIFY_FLAG_SECURE_ELEMENT )
+    {
+        dataSize += NvmmWrite( ( uint8_t* ) &nvm->SecureElement, sizeof( nvm->SecureElement ),
+                               offset );
+    }
+    offset += sizeof( nvm->SecureElement );
+
+    // Region group 1
+    if( ( NvmNotifyFlags & LORAMAC_NVM_NOTIFY_FLAG_REGION_GROUP1 ) ==
+        LORAMAC_NVM_NOTIFY_FLAG_REGION_GROUP1 )
+    {
+        dataSize += NvmmWrite( ( uint8_t* ) &nvm->RegionGroup1,
+                               sizeof( nvm->RegionGroup1 ), offset );
+    }
+    offset += sizeof( nvm->RegionGroup1 );
+
+    // Region group 2
+    if( ( NvmNotifyFlags & LORAMAC_NVM_NOTIFY_FLAG_REGION_GROUP2 ) ==
+        LORAMAC_NVM_NOTIFY_FLAG_REGION_GROUP2 )
+    {
+        dataSize += NvmmWrite( ( uint8_t* ) &nvm->RegionGroup2,
+                               sizeof( nvm->RegionGroup2 ), offset );
+    }
+    offset += sizeof( nvm->RegionGroup2 );
+
+    // Class b
+    if( ( NvmNotifyFlags & LORAMAC_NVM_NOTIFY_FLAG_CLASS_B ) ==
+        LORAMAC_NVM_NOTIFY_FLAG_CLASS_B )
+    {
+        dataSize += NvmmWrite( ( uint8_t* ) &nvm->ClassB, sizeof( nvm->ClassB ),
+                               offset );
+    }
+    offset += sizeof( nvm->ClassB );
+
+    // Reset notification flags
+    NvmNotifyFlags = LORAMAC_NVM_NOTIFY_FLAG_NONE;
+
+    // Resume LoRaMac
+    LoRaMacStart( );
+    return dataSize;
+#else
+    return 0;
+#endif
+}
+
+uint16_t NvmDataMgmtRestore( void )
+{
+#if( CONTEXT_MANAGEMENT_ENABLED == 1 )
+    MibRequestConfirm_t mibReq;
+    mibReq.Type = MIB_NVM_CTXS;
+    LoRaMacMibGetRequestConfirm( &mibReq );
+    LoRaMacNvmData_t* nvm = mibReq.Param.Contexts;
+    uint16_t offset = 0;
+
+    // Crypto
+    if( NvmmCrc32Check( sizeof( LoRaMacCryptoNvmData_t ), offset ) == false )
+    {
+        return 0;
+    }
+    offset += sizeof( LoRaMacCryptoNvmData_t );
+
+    // Mac Group 1
+    if( NvmmCrc32Check( sizeof( LoRaMacNvmDataGroup1_t ), offset ) == false )
+    {
+        return 0;
+    }
+    offset += sizeof( LoRaMacNvmDataGroup1_t );
+
+    // Mac Group 2
+    if( NvmmCrc32Check( sizeof( LoRaMacNvmDataGroup2_t ), offset ) == false )
+    {
+        return 0;
+    }
+    offset += sizeof( LoRaMacNvmDataGroup2_t );
+
+    // Secure element
+    if( NvmmCrc32Check( sizeof( SecureElementNvmData_t ), offset ) == false )
+    {
+        return 0;
+    }
+    offset += sizeof( SecureElementNvmData_t );
+
+    // Region group 1
+    if( NvmmCrc32Check( sizeof( RegionNvmDataGroup1_t ), offset ) == false )
+    {
+        return 0;
+    }
+    offset += sizeof( RegionNvmDataGroup1_t );
+
+    // Region group 2
+    if( NvmmCrc32Check( sizeof( RegionNvmDataGroup2_t ), offset ) == false )
+    {
+        return 0;
+    }
+    offset += sizeof( RegionNvmDataGroup2_t );
+
+    // Class b
+    if( NvmmCrc32Check( sizeof( LoRaMacClassBNvmData_t ), offset ) == false )
+    {
+        return 0;
+    }
+    offset += sizeof( LoRaMacClassBNvmData_t );
+
+    if( NvmmRead( ( uint8_t* ) nvm, sizeof( LoRaMacNvmData_t ), 0 ) ==
+                  sizeof( LoRaMacNvmData_t ) )
+    {
+        return sizeof( LoRaMacNvmData_t );
+    }
+#endif
+    return 0;
+}
+
+bool NvmDataMgmtFactoryReset( void )
+{
+#if( CONTEXT_MANAGEMENT_ENABLED == 1 )
+    uint16_t offset = 0;
+    // Crypto
+    if( NvmmReset( sizeof( LoRaMacCryptoNvmData_t ), offset ) == false )
+    {
+        return false;
+    }
+    offset += sizeof( LoRaMacCryptoNvmData_t );
+
+    // Mac Group 1
+    if( NvmmReset( sizeof( LoRaMacNvmDataGroup1_t ), offset ) == false )
+    {
+        return false;
+    }
+    offset += sizeof( LoRaMacNvmDataGroup1_t );
+
+    // Mac Group 2
+    if( NvmmReset( sizeof( LoRaMacNvmDataGroup2_t ), offset ) == false )
+    {
+        return false;
+    }
+    offset += sizeof( LoRaMacNvmDataGroup2_t );
+
+    // Secure element
+    if( NvmmReset( sizeof( SecureElementNvmData_t ), offset ) == false )
+    {
+        return false;
+    }
+    offset += sizeof( SecureElementNvmData_t );
+
+    // Region group 1
+    if( NvmmReset( sizeof( RegionNvmDataGroup1_t ), offset ) == false )
+    {
+        return false;
+    }
+    offset += sizeof( RegionNvmDataGroup1_t );
+
+    // Region group 2
+    if( NvmmReset( sizeof( RegionNvmDataGroup2_t ), offset ) == false )
+    {
+        return false;
+    }
+    offset += sizeof( RegionNvmDataGroup2_t );
+
+    // Class b
+    if( NvmmReset( sizeof( LoRaMacClassBNvmData_t ), offset ) == false )
+    {
+        return false;
+    }
+    offset += sizeof( LoRaMacClassBNvmData_t );
+#endif
+    return true;
+}
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.h
new file mode 100644
index 00000000..608af63e
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.h
@@ -0,0 +1,71 @@
+/*!
+ * \file      NvmDataMgmt.h
+ *
+ * \brief     NVM context management implementation
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2017 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ *
+ * \author    Gregory Cristian ( Semtech )
+ *
+ * \author    Daniel Jaeckle ( STACKFORCE )
+ *
+ * \author    Johannes Bruder ( STACKFORCE )
+ *
+ * \defgroup  NVMDATAMGMT NVM context management implementation
+ *            This module implements the NVM context handling
+ * \{
+ */
+#ifndef __NVMDATAMGMT_H__
+#define __NVMDATAMGMT_H__
+
+/*!
+ * \brief NVM Management event.
+ *
+ * \param [IN] notifyFlags Bitmap which contains the information about modules that
+ *                         changed.
+ */
+void NvmDataMgmtEvent( uint16_t notifyFlags );
+
+/*!
+ * \brief Function which stores the MAC data into NVM, if required.
+ *
+ * \retval Number of bytes which were stored.
+ */
+uint16_t NvmDataMgmtStore( void );
+
+/*!
+ * \brief Function which restores the MAC data from NVM, if required.
+ *
+ * \retval Number of bytes which were restored.
+ */
+uint16_t NvmDataMgmtRestore(void );
+
+/*!
+ * \brief Resets the NVM data.
+ *
+ * \retval Returns true, if successful.
+ */
+bool NvmDataMgmtFactoryReset( void );
+
+/* \} */
+
+#endif // __NVMDATAMGMT_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.c
index 7a2f0dfe..fbbbd7f3 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.c
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.c
@@ -30,600 +30,638 @@
   * @brief   Fragmentation Decoder definition
   ******************************************************************************
   */
-/* Includes ------------------------------------------------------------------*/
+#include <stddef.h>
 #include <stdbool.h>
-#include "mw_log_conf.h"   /* needed for MW_LOG */
+#include "utilities.h"
 #include "FragDecoder.h"
-#include "sfu_fwimg_regions.h"
+#include "LmhpFragmentation.h" /* LmhpFragmentationGetPackageVersion */
+#include "frag_decoder_if.h"
+
+/*
+ *=============================================================================
+ * Fragmentation decoder algorithm utilities
+ *=============================================================================
+ */
 
-/* Private typedef -----------------------------------------------------------*/
 typedef struct
 {
-  FragDecoderCallbacks_t *Callbacks;
-  uint16_t FragNb;
-  uint8_t FragSize;
+    FragDecoderCallbacks_t *Callbacks;
+    uint16_t FragNb;
+    uint8_t FragSize;
 
-  uint32_t M2BLine;
-  uint8_t MatrixM2B[((FRAG_MAX_REDUNDANCY >> 3) + 1) * FRAG_MAX_REDUNDANCY];
-  uint16_t FragNbMissingIndex[FRAG_MAX_NB];
+    uint32_t M2BLine;
+    uint8_t MatrixM2B[( ( FRAG_MAX_REDUNDANCY >> 3 ) + 1 ) * FRAG_MAX_REDUNDANCY];
+    uint16_t FragNbMissingIndex[FRAG_MAX_NB];
 
-  uint8_t S[(FRAG_MAX_REDUNDANCY >> 3) + 1];
+    uint8_t S[( FRAG_MAX_REDUNDANCY >> 3 ) + 1];
 
-  FragDecoderStatus_t Status;
-} FragDecoder_t;
+    FragDecoderStatus_t Status;
+}FragDecoder_t;
 
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
 /*!
  * \brief Sets a row from source into file destination
  *
- * \param [in] src  Source buffer pointer
- * \param [in] row  Destination index of the row to be copied
- * \param [in] size Source number of bytes to be copied
+ * \param [IN] src  Source buffer pointer
+ * \param [IN] row  Destination index of the row to be copied
+ * \param [IN] size Source number of bytes to be copied
  */
-static void SetRow(uint8_t *src, uint16_t row, uint16_t size);
+static void SetRow( uint8_t *src, uint16_t row, uint16_t size );
 
 /*!
  * \brief Gets a row from source and stores it into file destination
  *
- * \param [in] src  Source buffer pointer
- * \param [in] row  Source index of the row to be copied
- * \param [in] size Source number of bytes to be copied
+ * \param [IN] src  Source buffer pointer
+ * \param [IN] row  Source index of the row to be copied
+ * \param [IN] size Source number of bytes to be copied
  */
-static void GetRow(uint8_t *src, uint16_t row, uint16_t size);
-
+static void GetRow( uint8_t *src, uint16_t row, uint16_t size );
 
 /*!
  * \brief Gets the parity value from a given row of the parity matrix
  *
- * \param [in] index      The index of the row to be computed
- * \param [in] matrixRow  Pointer to the parity matrix (parity bit array)
+ * \param [IN] index      The index of the row to be computed
+ * \param [IN] matrixRow  Pointer to the parity matrix (parity bit array)
  *
  * \retval parity         Parity value at the given index
  */
-static uint8_t GetParity(uint16_t index, uint8_t *matrixRow);
+static uint8_t GetParity( uint16_t index, uint8_t *matrixRow  );
 
 /*!
  * \brief Sets the parity value on the given row of the parity matrix
  *
- * \param [in]     index     The index of the row to be computed
+ * \param [IN]     index     The index of the row to be computed
  * \param [IN/OUT] matrixRow Pointer to the parity matrix.
- * \param [in]     parity    The parity value to be set in the parity matrix
+ * \param [IN]     parity    The parity value to be set in the parity matrix
  */
-static void SetParity(uint16_t index, uint8_t *matrixRow, uint8_t parity);
+static void SetParity( uint16_t index, uint8_t *matrixRow, uint8_t parity );
 
 /*!
  * \brief Check if the provided value is a power of 2
  *
- * \param [in] x  Value to be tested
+ * \param [IN] x  Value to be tested
  *
  * \retval status Return true if frame is a power of two
  */
-static bool IsPowerOfTwo(uint32_t x);
+static bool IsPowerOfTwo( uint32_t x );
 
 /*!
  * \brief XOrs two data lines
  *
- * \param [in]  line1  1st Data line to be XORed
- * \param [in]  line2  2nd Data line to be XORed
- * \param [in]  size   Number of elements in line1
+ * \param [IN]  line1  1st Data line to be XORed
+ * \param [IN]  line2  2nd Data line to be XORed
+ * \param [IN]  size   Number of elements in line1
  *
- * \param [out] result XOR( line1, line2 ) result stored in line1
+ * \param [OUT] result XOR( line1, line2 ) result stored in line1
  */
-static void XorDataLine(uint8_t *line1, uint8_t *line2, int32_t size);
+static void XorDataLine( uint8_t *line1, uint8_t *line2, int32_t size );
 
 /*!
  * \brief XORs two parity lines
  *
- * \param [in]  line1  1st Parity line to be XORed
- * \param [in]  line2  2nd Parity line to be XORed
- * \param [in]  size   Number of elements in line1
+ * \param [IN]  line1  1st Parity line to be XORed
+ * \param [IN]  line2  2nd Parity line to be XORed
+ * \param [IN]  size   Number of elements in line1
  *
- * \param [out] result XOR( line1, line2 ) result stored in line1
+ * \param [OUT] result XOR( line1, line2 ) result stored in line1
  */
-static void XorParityLine(uint8_t *line1, uint8_t *line2, int32_t size);
+static void XorParityLine( uint8_t* line1, uint8_t* line2, int32_t size );
 
 /*!
  * \brief Generates a pseudo random number : PRBS23
  *
- * \param [in] value The input of the PRBS23 generator
+ * \param [IN] value The input of the PRBS23 generator
  *
  * \retval nextValue Returns the next pseudo random number
  */
-static int32_t FragPrbs23(int32_t value);
+static int32_t FragPrbs23( int32_t value );
 
 /*!
  * \brief Gets and fills the parity matrix
  *
- * \param [in]  n         Fragment N
- * \param [in]  m         Fragment number
- * \param [out] matrixRow Parity matrix
+ * \param [IN]  n         Fragment N
+ * \param [IN]  m         Fragment number
+ * \param [OUT] matrixRow Parity matrix
  */
-static void FragGetParityMatrixRow(int32_t n, int32_t m, uint8_t *matrixRow);
+static void FragGetParityMatrixRow( int32_t n, int32_t m, uint8_t *matrixRow );
 
 /*!
  * \brief Finds the index of the first one in a bit array
  *
- * \param [in] bitArray Pointer to the bit array
- * \param [in] size     Bit array size
+ * \param [IN] bitArray Pointer to the bit array
+ * \param [IN] size     Bit array size
  * \retval index        The index of the first 1 in the bit array
  */
-static uint16_t BitArrayFindFirstOne(uint8_t *bitArray, uint16_t size);
+static uint16_t BitArrayFindFirstOne( uint8_t *bitArray, uint16_t size );
 
 /*!
  * \brief Checks if the provided bit array only contains zeros
  *
- * \param [in] bitArray Pointer to the bit array
- * \param [in] size     Bit array size
+ * \param [IN] bitArray Pointer to the bit array
+ * \param [IN] size     Bit array size
  * \retval isAllZeros   [0: Contains ones, 1: Contains all zeros]
  */
-static uint8_t BitArrayIsAllZeros(uint8_t *bitArray, uint16_t  size);
+static uint8_t BitArrayIsAllZeros( uint8_t *bitArray, uint16_t  size );
 
 /*!
  * \brief Finds & marks missing fragments
  *
- * \param [in]  counter Current fragment counter
- * \param [out] FragDecoder.FragNbMissingIndex[] array is updated in place
+ * \param [IN]  counter Current fragment counter
+ * \param [OUT] FragDecoder.FragNbMissingIndex[] array is updated in place
  */
-static void FragFindMissingFrags(uint16_t counter);
+static void FragFindMissingFrags( uint16_t counter );
 
 /*!
  * \brief Finds the index (frag counter) of the x th missing frag
  *
- * \param [in] x   x th missing frag
+ * \param [IN] x   x th missing frag
  *
  * \retval counter The counter value associated to the x th missing frag
  */
-static uint16_t FragFindMissingIndex(uint16_t x);
+static uint16_t FragFindMissingIndex( uint16_t x );
 
 /*!
  * \brief Extacts a row from the binary matrix and expands it to a bitArray
  *
- * \param [in] bitArray  Pointer to the bit array
- * \param [in] rowIndex  Matrix row index
- * \param [in] bitsInRow Number of bits in one row
+ * \param [IN] bitArray  Pointer to the bit array
+ * \param [IN] rowIndex  Matrix row index
+ * \param [IN] bitsInRow Number of bits in one row
  */
-static void FragExtractLineFromBinaryMatrix(uint8_t *bitArray, uint16_t rowIndex, uint16_t bitsInRow);
+static void FragExtractLineFromBinaryMatrix( uint8_t* bitArray, uint16_t rowIndex, uint16_t bitsInRow );
 
 /*!
  * \brief Collapses and Pushs a row of a bit array to the matrix
  *
- * \param [in] bitArray  Pointer to the bit array
- * \param [in] rowIndex  Matrix row index
- * \param [in] bitsInRow Number of bits in one row
+ * \param [IN] bitArray  Pointer to the bit array
+ * \param [IN] rowIndex  Matrix row index
+ * \param [IN] bitsInRow Number of bits in one row
+ */
+static void FragPushLineToBinaryMatrix( uint8_t *bitArray, uint16_t rowIndex, uint16_t bitsInRow );
+
+/*
+ *=============================================================================
+ * Fragmentation decoder algorithm
+ *=============================================================================
  */
-static void FragPushLineToBinaryMatrix(uint8_t *bitArray, uint16_t rowIndex, uint16_t bitsInRow);
 
-/* Private variables ---------------------------------------------------------*/
 static FragDecoder_t FragDecoder;
 
-/* Exported functions ---------------------------------------------------------*/
-void FragDecoderInit(uint16_t fragNb, uint8_t fragSize, FragDecoderCallbacks_t *callbacks)
+void FragDecoderInit( uint16_t fragNb, uint8_t fragSize, FragDecoderCallbacks_t *callbacks )
 {
-#if (INTEROP_TEST_MODE == 1)
-  uint8_t init_buffer[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-#endif /* INTEROP_TEST_MODE == 1 */
-  FragDecoder.Callbacks = callbacks;
-  FragDecoder.FragNb = fragNb;                                /* FragNb = FRAG_MAX_SIZE */
-  FragDecoder.FragSize = fragSize;                            /* number of byte on a row */
-  FragDecoder.Status.FragNbLastRx = 0;
-  FragDecoder.Status.FragNbLost = 0;
-  FragDecoder.M2BLine = 0;
-
-
-  /* Initialize missing fragments index array */
-  for (uint16_t i = 0; i < FRAG_MAX_NB; i++)
-  {
-    FragDecoder.FragNbMissingIndex[i] = 1;
-  }
-
-  /* Initialize parity matrix */
-  for (uint32_t i = 0; i < ((FRAG_MAX_REDUNDANCY >> 3) + 1); i++)
-  {
-    FragDecoder.S[i] = 0;
-  }
-
-  for (uint32_t i = 0; i < (((FRAG_MAX_REDUNDANCY >> 3) + 1) * FRAG_MAX_REDUNDANCY); i++)
-  {
-    FragDecoder.MatrixM2B[i] = 0xFF;
-  }
-
-  /* Initialize final uncoded data buffer ( FRAG_MAX_NB * FRAG_MAX_SIZE ) */
-#if (INTEROP_TEST_MODE == 1)
-  FragDecoder.Callbacks->FragDecoderErase(0, fragNb * fragSize);
-#else /* INTEROP_TEST_MODE == 0 */
-  FragDecoder.Callbacks->FragDecoderErase(0, SlotEndAdd[SLOT_DWL_1] - SlotStartAdd[SLOT_DWL_1] + 1U);
-#endif /* INTEROP_TEST_MODE */
-
-  FragDecoder.Status.FragNbLost = 0;
-  FragDecoder.Status.FragNbLastRx = 0;
+    FragDecoder.Callbacks = callbacks;
+    FragDecoder.FragNb = fragNb;                                // FragNb = FRAG_MAX_SIZE
+    FragDecoder.FragSize = fragSize;                            // number of byte on a row
+    FragDecoder.Status.FragNbLastRx = 0;
+    FragDecoder.Status.FragNbLost = 0;
+    FragDecoder.M2BLine = 0;
+
+    // Initialize missing fragments index array
+    for( uint16_t i = 0; i < FRAG_MAX_NB; i++ )
+    {
+        FragDecoder.FragNbMissingIndex[i] = 1;
+    }
+
+    // Initialize parity matrix
+    for( uint32_t i = 0; i < ( ( FRAG_MAX_REDUNDANCY >> 3 ) + 1 ); i++ )
+    {
+        FragDecoder.S[i] = 0;
+    }
+
+    for( uint32_t i = 0; i < ( ( ( FRAG_MAX_REDUNDANCY >> 3 ) + 1 ) * FRAG_MAX_REDUNDANCY ); i++ )
+    {
+       FragDecoder.MatrixM2B[i] = 0xFF;
+    }
+    
+    // Initialize final uncoded data buffer ( FRAG_MAX_NB * FRAG_MAX_SIZE )
+    if (FragDecoder.Callbacks->FragDecoderErase != NULL)
+    {
+        FragDecoder.Callbacks->FragDecoderErase();
+    }
+
+    FragDecoder.Status.FragNbLost = 0;
+    FragDecoder.Status.FragNbLastRx = 0;
 }
 
-uint32_t FragDecoderGetMaxFileSize(void)
+uint32_t FragDecoderGetMaxFileSize( void )
 {
-  return FRAG_MAX_NB * FRAG_MAX_SIZE;
+    return FRAG_MAX_NB * FRAG_MAX_SIZE;
 }
 
-int32_t FragDecoderProcess(uint16_t fragCounter, uint8_t *rawData)
+int32_t FragDecoderProcess( uint16_t fragCounter, uint8_t *rawData )
 {
-  uint16_t firstOneInRow = 0;
-  int32_t first = 0;
-  int32_t noInfo = 0;
-
-  uint8_t matrixRow[(FRAG_MAX_NB >> 3) + 1];
-  uint8_t matrixDataTemp[FRAG_MAX_SIZE];
-  uint8_t dataTempVector[(FRAG_MAX_REDUNDANCY >> 3) + 1];
-  uint8_t dataTempVector2[(FRAG_MAX_REDUNDANCY >> 3) + 1];
-
-  UTIL_MEM_set_8(matrixRow, 0, (FRAG_MAX_NB >> 3) + 1);
-  UTIL_MEM_set_8(matrixDataTemp, 0, FRAG_MAX_SIZE);
-  UTIL_MEM_set_8(dataTempVector, 0, (FRAG_MAX_REDUNDANCY >> 3) + 1);
-  UTIL_MEM_set_8(dataTempVector2, 0, (FRAG_MAX_REDUNDANCY >> 3) + 1);
-
-  FragDecoder.Status.FragNbRx = fragCounter;
-
-  if (fragCounter < FragDecoder.Status.FragNbLastRx)
-  {
-    return FRAG_SESSION_ONGOING;  /* Drop frame out of order */
-  }
-
-  /* The M (FragNb) first packets aren't encoded or in other words they are */
-  /* encoded with the unitary matrix */
-  if (fragCounter < (FragDecoder.FragNb + 1))
-  {
-    /* The M first frame are not encoded store them */
-    SetRow(rawData, fragCounter - 1, FragDecoder.FragSize);
-
-    FragDecoder.FragNbMissingIndex[fragCounter - 1] = 0;
-
-    /* Update the FragDecoder.FragNbMissingIndex with the losing frame */
-    FragFindMissingFrags(fragCounter);
-  }
-  else
-  {
-    if (FragDecoder.Status.FragNbLost > FRAG_MAX_REDUNDANCY)
-    {
-      FragDecoder.Status.MatrixError = 1;
-      return FRAG_SESSION_FINISHED;
-    }
-    /* At this point we receive encoded frames and the number of losing frames */
-    /* is well known: FragDecoder.FragNbLost - 1; */
+    uint16_t firstOneInRow = 0;
+    int32_t first = 0;
+    int32_t noInfo = 0;
+
+    uint8_t matrixRow[(FRAG_MAX_NB >> 3 ) + 1];
+    uint8_t matrixDataTemp[FRAG_MAX_SIZE];
+    uint8_t dataTempVector[( FRAG_MAX_REDUNDANCY >> 3 ) + 1];
+    uint8_t dataTempVector2[( FRAG_MAX_REDUNDANCY >> 3 ) + 1];
 
-    /* In case of the end of true data is missing */
-    FragFindMissingFrags(fragCounter);
+    UTIL_MEM_set_8(matrixRow, 0, (FRAG_MAX_NB >> 3) + 1);
+    UTIL_MEM_set_8(matrixDataTemp, 0, FRAG_MAX_SIZE);
+    UTIL_MEM_set_8(dataTempVector, 0, (FRAG_MAX_REDUNDANCY >> 3) + 1);
+    UTIL_MEM_set_8(dataTempVector2, 0, (FRAG_MAX_REDUNDANCY >> 3) + 1);
 
-    if (FragDecoder.Status.FragNbLost == 0)
+    FragDecoder.Status.FragNbRx = fragCounter;
+
+    if( fragCounter < FragDecoder.Status.FragNbLastRx )
     {
-      /* the case : all the M(FragNb) first rows have been transmitted with no error */
-      return FragDecoder.Status.FragNbLost;
+        return FRAG_SESSION_ONGOING;  // Drop frame out of order
     }
 
-    /* fragCounter - FragDecoder.FragNb */
-    FragGetParityMatrixRow(fragCounter - FragDecoder.FragNb, FragDecoder.FragNb, matrixRow);
-
-    for (int32_t i = 0; i < FragDecoder.FragNb; i++)
+    // The M (FragNb) first packets aren't encoded or in other words they are
+    // encoded with the unitary matrix
+    if( fragCounter < ( FragDecoder.FragNb + 1 ) )
     {
-      if (GetParity(i, matrixRow) == 1)
-      {
-        if (FragDecoder.FragNbMissingIndex[i] == 0)
+        // The M first frame are not encoded store them
+        SetRow( rawData, fragCounter - 1, FragDecoder.FragSize );
+
+        FragDecoder.FragNbMissingIndex[fragCounter - 1] = 0;
+
+        // Update the FragDecoder.FragNbMissingIndex with the loosing frame
+        FragFindMissingFrags( fragCounter );
+
+        if ((fragCounter == FragDecoder.FragNb) && (FragDecoder.Status.FragNbLost == 0U))
         {
-          /* XOR with already receive frag */
-          SetParity(i, matrixRow, 0);
-          GetRow(matrixDataTemp, i, FragDecoder.FragSize);
-          XorDataLine(rawData, matrixDataTemp, FragDecoder.FragSize);
+            return FRAG_SESSION_FINISHED;
         }
-        else
+    }
+    else
+    {
+        if( FragDecoder.Status.FragNbLost > FRAG_MAX_REDUNDANCY )
         {
-          /* Fill the "little" boolean matrix m2b */
-          SetParity(FragDecoder.FragNbMissingIndex[i] - 1, dataTempVector, 1);
-          if (first == 0)
-          {
-            first = 1;
-          }
+           FragDecoder.Status.MatrixError = 1;
+           return FRAG_SESSION_FINISHED;
         }
-      }
-    }
+        // At this point we receive encoded frames and the number of loosing frames
+        // is well known: FragDecoder.FragNbLost - 1;
 
-    firstOneInRow = BitArrayFindFirstOne(dataTempVector, FragDecoder.Status.FragNbLost);
+        // In case of the end of true data is missing
+        FragFindMissingFrags( fragCounter );
 
-    if (first > 0)
-    {
-      int32_t li;
-      int32_t lj;
-
-      /* Manage a new line in MatrixM2B */
-      while (GetParity(firstOneInRow, FragDecoder.S) == 1)
-      {
-        /* Row already diagonalized exist & ( FragDecoder.MatrixM2B[firstOneInRow][0] ) */
-        FragExtractLineFromBinaryMatrix(dataTempVector2, firstOneInRow, FragDecoder.Status.FragNbLost);
-        XorParityLine(dataTempVector, dataTempVector2, FragDecoder.Status.FragNbLost);
-        /* Have to store it in the mi th position of the missing frag */
-        li = FragFindMissingIndex(firstOneInRow);
-        GetRow(matrixDataTemp, li, FragDecoder.FragSize);
-        XorDataLine(rawData, matrixDataTemp, FragDecoder.FragSize);
-        if (BitArrayIsAllZeros(dataTempVector, FragDecoder.Status.FragNbLost))
-        {
-          noInfo = 1;
-          break;
+        if( FragDecoder.Status.FragNbLost == 0 )
+        { 
+            // the case : all the M(FragNb) first rows have been transmitted with no error
+            return FragDecoder.Status.FragNbLost;
         }
-        firstOneInRow = BitArrayFindFirstOne(dataTempVector, FragDecoder.Status.FragNbLost);
-      }
-
-      if (noInfo == 0)
-      {
-        FragPushLineToBinaryMatrix(dataTempVector, firstOneInRow, FragDecoder.Status.FragNbLost);
-        li = FragFindMissingIndex(firstOneInRow);
-        SetRow(rawData, li, FragDecoder.FragSize);
-        SetParity(firstOneInRow, FragDecoder.S, 1);
-        FragDecoder.M2BLine++;
-      }
-
-      if (FragDecoder.M2BLine == FragDecoder.Status.FragNbLost)
-      {
-        /* Then last step diagonalized */
-        if (FragDecoder.Status.FragNbLost > 1)
-        {
-          int32_t i;
-          int32_t j;
-
-          for (i = (FragDecoder.Status.FragNbLost - 2); i >= 0 ; i--)
-          {
-            li = FragFindMissingIndex(i);
-            GetRow(matrixDataTemp, li, FragDecoder.FragSize);
-            for (j = (FragDecoder.Status.FragNbLost - 1); j > i; j--)
-            {
-              FragExtractLineFromBinaryMatrix(dataTempVector2, i, FragDecoder.Status.FragNbLost);
-              FragExtractLineFromBinaryMatrix(dataTempVector, j, FragDecoder.Status.FragNbLost);
-              if (GetParity(j, dataTempVector2) == 1)
-              {
-                XorParityLine(dataTempVector2, dataTempVector, FragDecoder.Status.FragNbLost);
 
-                lj = FragFindMissingIndex(j);
+        // fragCounter - FragDecoder.FragNb
+        FragGetParityMatrixRow( fragCounter - FragDecoder.FragNb, FragDecoder.FragNb, matrixRow );
 
-                GetRow(rawData, lj, FragDecoder.FragSize);
-                XorDataLine(matrixDataTemp, rawData, FragDecoder.FragSize);
-              }
+        for( int32_t i = 0; i < FragDecoder.FragNb; i++ )
+        {
+            if( GetParity( i , matrixRow ) == 1 )
+            {
+                if( FragDecoder.FragNbMissingIndex[i] == 0 )
+                {
+                    // XOR with already receive frag
+                    SetParity( i, matrixRow, 0 );
+                    GetRow( matrixDataTemp, i, FragDecoder.FragSize );
+                    XorDataLine( rawData, matrixDataTemp, FragDecoder.FragSize );
+                }
+                else
+                {
+                    // Fill the "little" boolean matrix m2b
+                    SetParity( FragDecoder.FragNbMissingIndex[i] - 1, dataTempVector, 1 );
+                    if( first == 0 )
+                    {
+                        first = 1;
+                    }
+                }
             }
-            SetRow(matrixDataTemp, li, FragDecoder.FragSize);
-          }
-          return FragDecoder.Status.FragNbLost;
         }
-        else
+
+        firstOneInRow = BitArrayFindFirstOne( dataTempVector, FragDecoder.Status.FragNbLost );
+
+        if( first > 0 )
         {
-          /* If not ( FragDecoder.FragNbLost > 1 ) */
-          return FragDecoder.Status.FragNbLost;
+            int32_t li;
+            int32_t lj;
+
+            // Manage a new line in MatrixM2B
+            while( GetParity( firstOneInRow, FragDecoder.S ) == 1 )
+            { 
+                // Row already diagonalized exist & ( FragDecoder.MatrixM2B[firstOneInRow][0] )
+                FragExtractLineFromBinaryMatrix( dataTempVector2, firstOneInRow, FragDecoder.Status.FragNbLost );
+                XorParityLine( dataTempVector, dataTempVector2, FragDecoder.Status.FragNbLost );
+                // Have to store it in the mi th position of the missing frag
+                li = FragFindMissingIndex( firstOneInRow );
+                GetRow( matrixDataTemp, li, FragDecoder.FragSize );
+                XorDataLine( rawData, matrixDataTemp, FragDecoder.FragSize );
+                if( BitArrayIsAllZeros( dataTempVector, FragDecoder.Status.FragNbLost ) )
+                {
+                    noInfo = 1;
+                    break;
+                }
+                firstOneInRow = BitArrayFindFirstOne( dataTempVector, FragDecoder.Status.FragNbLost );
+            }
+
+            if( noInfo == 0 )
+            {
+                FragPushLineToBinaryMatrix( dataTempVector, firstOneInRow, FragDecoder.Status.FragNbLost );
+                li = FragFindMissingIndex( firstOneInRow );
+                SetRow( rawData, li, FragDecoder.FragSize );
+                SetParity( firstOneInRow, FragDecoder.S, 1 );
+                FragDecoder.M2BLine++;
+            }
+
+            if( FragDecoder.M2BLine == FragDecoder.Status.FragNbLost )
+            { 
+                // Then last step diagonalized
+                if( FragDecoder.Status.FragNbLost > 1 )
+                {
+                    int32_t i;
+                    int32_t j;
+
+                    for( i = ( FragDecoder.Status.FragNbLost - 2 ); i >= 0 ; i-- )
+                    {
+                        li = FragFindMissingIndex( i );
+                        GetRow( matrixDataTemp, li, FragDecoder.FragSize );
+                        for( j = ( FragDecoder.Status.FragNbLost - 1 ); j > i; j--)
+                        {
+                            FragExtractLineFromBinaryMatrix( dataTempVector2, i, FragDecoder.Status.FragNbLost );
+                            FragExtractLineFromBinaryMatrix( dataTempVector, j, FragDecoder.Status.FragNbLost );
+                            if( GetParity( j, dataTempVector2 ) == 1 )
+                            {
+                                XorParityLine( dataTempVector2, dataTempVector, FragDecoder.Status.FragNbLost );
+
+                                lj = FragFindMissingIndex( j );
+
+                                GetRow( rawData, lj, FragDecoder.FragSize );
+                                XorDataLine( matrixDataTemp , rawData , FragDecoder.FragSize );
+                            }
+                        }
+                        SetRow( matrixDataTemp, li, FragDecoder.FragSize );
+                    }
+                    return FragDecoder.Status.FragNbLost;
+                }
+                else
+                { 
+                    //If not ( FragDecoder.FragNbLost > 1 )
+                    return FragDecoder.Status.FragNbLost;
+                }
+            }
         }
-      }
     }
-  }
-  return FRAG_SESSION_ONGOING;
+    return FRAG_SESSION_ONGOING;
 }
 
-FragDecoderStatus_t FragDecoderGetStatus(void)
-{
-  return FragDecoder.Status;
+FragDecoderStatus_t FragDecoderGetStatus( void )
+{ 
+    return FragDecoder.Status;
 }
 
-/* Private  functions ---------------------------------------------------------*/
-static void SetRow(uint8_t *src, uint16_t row, uint16_t size)
+/*
+ *=============================================================================
+ * Fragmentation decoder algorithm utilities
+ *=============================================================================
+ */
+
+static void SetRow( uint8_t *src, uint16_t row, uint16_t size )
 {
-  if ((FragDecoder.Callbacks != NULL) && (FragDecoder.Callbacks->FragDecoderWrite != NULL))
-  {
-    FragDecoder.Callbacks->FragDecoderWrite(row * size, src, size);
-  }
+    if( ( FragDecoder.Callbacks != NULL ) && ( FragDecoder.Callbacks->FragDecoderWrite != NULL ) )
+    {
+        FragDecoder.Callbacks->FragDecoderWrite( row * size, src, size );
+    }
 }
 
-static void GetRow(uint8_t *dst, uint16_t row, uint16_t size)
+static void GetRow( uint8_t *dst, uint16_t row, uint16_t size )
 {
-  if ((FragDecoder.Callbacks != NULL) && (FragDecoder.Callbacks->FragDecoderRead != NULL))
-  {
-    FragDecoder.Callbacks->FragDecoderRead(row * size, dst, size);
-  }
+    if( ( FragDecoder.Callbacks != NULL ) && ( FragDecoder.Callbacks->FragDecoderRead != NULL ) )
+    {
+        FragDecoder.Callbacks->FragDecoderRead( row * size, dst, size );
+    }
 }
 
-static uint8_t GetParity(uint16_t index, uint8_t *matrixRow)
+static uint8_t GetParity( uint16_t index, uint8_t *matrixRow  )
 {
-  uint8_t parity;
-  parity = matrixRow[index >> 3];
-  parity = (parity >> (7 - (index % 8))) & 0x01;
-  return parity;
+    uint8_t parity;
+    parity = matrixRow[index >> 3];
+    parity = ( parity >> ( 7 - ( index % 8 ) ) ) & 0x01;
+    return parity;
 }
 
-static void SetParity(uint16_t index, uint8_t *matrixRow, uint8_t parity)
+static void SetParity( uint16_t index, uint8_t *matrixRow, uint8_t parity )
 {
-  uint8_t mask = 0xFF - (1 << (7 - (index % 8)));
-  parity = parity << (7 - (index % 8));
-  matrixRow[index >> 3] = (matrixRow[index >> 3] & mask) + parity;
+    uint8_t mask = 0xFF - ( 1 << ( 7 - ( index % 8 ) ) );
+    parity = parity << ( 7 - ( index % 8 ) );
+    matrixRow[index >> 3] = ( matrixRow[index >> 3] & mask ) + parity;
 }
 
-static bool IsPowerOfTwo(uint32_t x)
+static bool IsPowerOfTwo( uint32_t x )
 {
-  uint8_t sumBit = 0;
-
-  for (uint8_t i = 0; i < 32; i++)
-  {
-    sumBit += (x & (1 << i)) >> i;
-  }
-  if (sumBit == 1)
-  {
-    return true;
-  }
-  return false;
+    uint8_t sumBit = 0;
+
+    for( uint8_t i = 0; i < 32; i++ )
+    {
+        sumBit += ( x & ( 1 << i ) ) >> i;
+    }
+    if( sumBit == 1 )
+    {
+        return true;
+    }
+    return false;
 }
 
-static void XorDataLine(uint8_t *line1, uint8_t *line2, int32_t size)
+static void XorDataLine( uint8_t *line1, uint8_t *line2, int32_t size )
 {
-  for (int32_t i = 0; i < size; i++)
-  {
-    line1[i] = line1[i] ^ line2[i];
-  }
+    for( int32_t i = 0; i < size; i++ )
+    {
+        line1[i] = line1[i] ^ line2[i];
+    }
 }
 
-static void XorParityLine(uint8_t *line1, uint8_t *line2, int32_t size)
+static void XorParityLine( uint8_t* line1, uint8_t* line2, int32_t size )
 {
-  for (int32_t i = 0; i < size; i++)
-  {
-    SetParity(i, line1, (GetParity(i, line1) ^ GetParity(i, line2)));
-  }
+    for( int32_t i = 0; i < size; i++ )
+    {
+        SetParity( i, line1, ( GetParity( i, line1 ) ^ GetParity( i, line2 ) ) );
+    }
 }
 
-static int32_t FragPrbs23(int32_t value)
+static int32_t FragPrbs23( int32_t value )
 {
-  int32_t b0 = value & 0x01;
-  int32_t b1 = (value & 0x20) >> 5;
-  return (value >> 1) + ((b0 ^ b1) << 22);;
+    int32_t b0 = value & 0x01;
+    int32_t b1 = ( value & 0x20 ) >> 5;
+    return ( value >> 1 ) + ( ( b0 ^ b1 ) << 22 );
 }
 
-static void FragGetParityMatrixRow(int32_t n, int32_t m, uint8_t *matrixRow)
+static void FragGetParityMatrixRow( int32_t n, int32_t m, uint8_t *matrixRow )
 {
-  int32_t mTemp;
-  int32_t x;
-  int32_t nbCoeff = 0;
-  int32_t r;
-
-  if (IsPowerOfTwo(m) != false)
-  {
-    mTemp = 1;
-  }
-  else
-  {
-    mTemp = 0;
-  }
-
-  x = 1 + (1001 * n);
-  for (uint8_t i = 0; i < ((m >> 3) + 1); i++)
-  {
-    matrixRow[i] = 0;
-  }
-  while (nbCoeff < (m >> 1))
-  {
-    r = 1 << 16;
-    while (r >= m)
+    int32_t mTemp;
+    int32_t x;
+    int32_t nbCoeff = 0;
+    int32_t r;
+
+    if( IsPowerOfTwo( m ) != false )
     {
-      x = FragPrbs23(x);
-      r = x % (m + mTemp);
+        mTemp = 1;
+    }
+    else 
+    {
+        mTemp = 0;
+    }
+
+    x = 1 + ( 1001 * n );
+    for( uint8_t i = 0; i < ( ( m >> 3 ) + 1 ); i++ )
+    {
+        matrixRow[i] = 0;
+    }
+    while( nbCoeff < ( m >> 1 ) )
+    {
+        r = 1 << 16;
+        while( r >= m )
+        {
+            x = FragPrbs23( x );
+            r = x % ( m + mTemp );
+        }
+
+        // FEC algorithm optimization in V2.0.0
+        if ((GetParity(r, matrixRow) == 0) || (LmhpFragmentationGetPackageVersion() == 1U))
+        {
+            SetParity(r, matrixRow, 1);
+            nbCoeff += 1;
+        }
     }
-    SetParity(r, matrixRow, 1);
-    nbCoeff += 1;
-  }
 }
 
-static uint16_t BitArrayFindFirstOne(uint8_t *bitArray, uint16_t size)
+static uint16_t BitArrayFindFirstOne( uint8_t *bitArray, uint16_t size )
 {
-  for (uint16_t i = 0; i < size; i++)
-  {
-    if (GetParity(i, bitArray) == 1)
+    for( uint16_t i = 0; i < size; i++)
     {
-      return i;
+        if ( GetParity( i, bitArray ) == 1 )
+        {
+            return i;
+        }
     }
-  }
-  return 0;
+    return 0;
 }
 
-static uint8_t BitArrayIsAllZeros(uint8_t *bitArray, uint16_t  size)
+static uint8_t BitArrayIsAllZeros( uint8_t *bitArray, uint16_t  size )
 {
-  for (uint16_t i = 0; i < size; i++)
-  {
-    if (GetParity(i, bitArray) == 1)
+    for( uint16_t i = 0; i < size; i++ )
     {
-      return 0;
+        if( GetParity( i, bitArray ) == 1 )
+        {
+            return 0;
+        }
     }
-  }
-  return 1;
+    return 1;
 }
 
-static void FragFindMissingFrags(uint16_t counter)
+/*!
+ * \brief Finds & marks missing fragments
+ *
+ * \param [IN]  counter Current fragment counter
+ * \param [OUT] FragDecoder.FragNbMissingIndex[] array is updated in place
+ */
+static void FragFindMissingFrags( uint16_t counter )
 {
-  int32_t i;
-  for (i = FragDecoder.Status.FragNbLastRx; i < (counter - 1); i++)
-  {
-    if (i < FragDecoder.FragNb)
+    int32_t i;
+    for( i = FragDecoder.Status.FragNbLastRx; i < ( counter - 1 ); i++ )
+    {
+        if( i < FragDecoder.FragNb )
+        {
+            FragDecoder.Status.FragNbLost++;
+            FragDecoder.FragNbMissingIndex[i] = FragDecoder.Status.FragNbLost;
+        }
+    }
+    if( i < FragDecoder.FragNb )
+    {
+        FragDecoder.Status.FragNbLastRx = counter;
+    }
+    else
     {
-      FragDecoder.Status.FragNbLost++;
-      FragDecoder.FragNbMissingIndex[i] = FragDecoder.Status.FragNbLost;
+        FragDecoder.Status.FragNbLastRx = FragDecoder.FragNb + 1;
     }
-  }
-  if (i < FragDecoder.FragNb)
-  {
-    FragDecoder.Status.FragNbLastRx = counter;
-  }
-  else
-  {
-    FragDecoder.Status.FragNbLastRx = FragDecoder.FragNb + 1;
-  }
-  MW_LOG(TS_ON, VLEVEL_H, "RECEIVED    : %5d / %5d Fragments\r\n", FragDecoder.Status.FragNbRx, FragDecoder.FragNb);
-  MW_LOG(TS_ON, VLEVEL_H, "              %5d / %5d Bytes\r\n", FragDecoder.Status.FragNbRx * FragDecoder.FragSize,
-         FragDecoder.FragNb * FragDecoder.FragSize);
-  MW_LOG(TS_ON, VLEVEL_H, "LOST        :       %7d Fragments\r\n\r\n", FragDecoder.Status.FragNbLost);
 }
 
-static uint16_t FragFindMissingIndex(uint16_t x)
+/*!
+ * \brief Finds the index (frag counter) of the x th missing frag
+ *
+ * \param [IN] x   x th missing frag
+ *
+ * \retval counter The counter value associated to the x th missing frag
+ */
+static uint16_t FragFindMissingIndex( uint16_t x )
 {
-  for (uint16_t i = 0; i < FragDecoder.FragNb; i++)
-  {
-    if (FragDecoder.FragNbMissingIndex[i] == (x + 1))
+    for( uint16_t i = 0; i < FragDecoder.FragNb; i++ )
     {
-      return i;
+        if( FragDecoder.FragNbMissingIndex[i] == ( x + 1 ) )
+        {
+            return i;
+        }
     }
-  }
-  return 0;
+    return 0;
 }
 
-static void FragExtractLineFromBinaryMatrix(uint8_t *bitArray, uint16_t rowIndex, uint16_t bitsInRow)
+/*!
+ * \brief Extacts a row from the binary matrix and expands it to a bitArray
+ *
+ * \param [IN] bitArray  Pointer to the bit array
+ * \param [IN] rowIndex  Matrix row index
+ * \param [IN] bitsInRow Number of bits in one row
+ */
+static void FragExtractLineFromBinaryMatrix( uint8_t* bitArray, uint16_t rowIndex, uint16_t bitsInRow )
 {
-  uint32_t findByte = 0;
-  uint32_t findBitInByte = 0;
-
-  if (rowIndex > 0)
-  {
-    findByte      = (rowIndex * bitsInRow - ((rowIndex * (rowIndex - 1)) >> 1)) >> 3;
-    findBitInByte = (rowIndex * bitsInRow - ((rowIndex * (rowIndex - 1)) >> 1)) % 8;
-  }
-  if (rowIndex > 0)
-  {
-    for (uint16_t i = 0; i < rowIndex; i++)
+    uint32_t findByte = 0;
+    uint32_t findBitInByte = 0;
+
+    if( rowIndex > 0 )
     {
-      SetParity(i, bitArray, 0);
+        findByte      = ( rowIndex * bitsInRow - ( ( rowIndex * ( rowIndex - 1 ) ) >> 1 ) ) >> 3;
+        findBitInByte = ( rowIndex * bitsInRow - ( ( rowIndex * ( rowIndex - 1 ) ) >> 1 ) ) % 8;
+    }
+    if( rowIndex > 0 )
+    {
+        for( uint16_t i = 0; i < rowIndex; i++ )
+        {
+            SetParity( i, bitArray, 0 );
+        }
     }
-  }
-  for (uint16_t i = rowIndex; i < bitsInRow; i++)
-  {
-    SetParity(i,
-              bitArray,
-              (FragDecoder.MatrixM2B[findByte] >> (7 - findBitInByte)) & 0x01);
-
-    findBitInByte++;
-    if (findBitInByte == 8)
+    for( uint16_t i = rowIndex; i < bitsInRow; i++ )
     {
-      findBitInByte = 0;
-      findByte++;
+        SetParity( i,
+                   bitArray, 
+                   ( FragDecoder.MatrixM2B[findByte] >> ( 7 - findBitInByte ) ) & 0x01 );
+
+        findBitInByte++;
+        if( findBitInByte == 8 )
+        {
+            findBitInByte = 0;
+            findByte++;
+        }
     }
-  }
 }
 
-static void FragPushLineToBinaryMatrix(uint8_t *bitArray, uint16_t rowIndex, uint16_t bitsInRow)
+/*!
+ * \brief Collapses and Pushs a row of a bit array to the matrix
+ *
+ * \param [IN] bitArray  Pointer to the bit array
+ * \param [IN] rowIndex  Matrix row index
+ * \param [IN] bitsInRow Number of bits in one row
+ */
+static void FragPushLineToBinaryMatrix( uint8_t *bitArray, uint16_t rowIndex, uint16_t bitsInRow )
 {
-  uint32_t findByte = 0;
-  uint32_t findBitInByte = 0;
-
-  if (rowIndex > 0)
-  {
-    findByte      = (rowIndex * bitsInRow - ((rowIndex * (rowIndex - 1)) >> 1)) >> 3;
-    findBitInByte = (rowIndex * bitsInRow - ((rowIndex * (rowIndex - 1)) >> 1)) % 8;
-
-  }
-  for (uint16_t i = rowIndex; i < bitsInRow; i++)
-  {
-    if (GetParity(i, bitArray) == 0)
-    {
-      FragDecoder.MatrixM2B[findByte] = FragDecoder.MatrixM2B[findByte] & (0xFF - (1 << (7 - findBitInByte)));
+    uint32_t findByte = 0;
+    uint32_t findBitInByte = 0;
+
+    if ( rowIndex > 0) {
+        findByte      = ( rowIndex * bitsInRow - ( ( rowIndex * ( rowIndex - 1 ) ) >> 1 ) ) >> 3;
+        findBitInByte = ( rowIndex * bitsInRow - ( ( rowIndex * ( rowIndex - 1 ) ) >> 1 ) ) % 8;
+
     }
-    findBitInByte++;
-    if (findBitInByte == 8)
+    for( uint16_t i = rowIndex; i < bitsInRow; i++ )
     {
-      findBitInByte = 0;
-      findByte++;
+        if( GetParity( i, bitArray ) == 0 )
+        {
+            FragDecoder.MatrixM2B[findByte] = FragDecoder.MatrixM2B[findByte] & ( 0xFF - ( 1 << ( 7 - findBitInByte ) ) );
+        }
+        findBitInByte++;
+        if( findBitInByte == 8 )
+        {
+            findBitInByte = 0;
+            findByte++;
+        }
     }
-  }
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.h
index 21dc2d57..0a27fb33 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.h
@@ -33,148 +33,84 @@
 #ifndef __FRAG_DECODER_H__
 #define __FRAG_DECODER_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
 
-/* Exported defines ----------------------------------------------------------*/
-#define INTEROP_TEST_MODE                           0
-
-#if (INTEROP_TEST_MODE == 1)
-/*!
- * Maximum number of fragment that can be handled.
- *
- * \remark This parameter has an impact on the memory footprint.
- */
-#define FRAG_MAX_NB                                 21
-
-/*!
- * Maximum fragment size that can be handled.
- *
- * \remark This parameter has an impact on the memory footprint.
- */
-#define FRAG_MAX_SIZE                               50
-
-/*!
- * Maximum number of extra frames that can be handled.
- *
- * \remark This parameter has an impact on the memory footprint.
- */
-#define FRAG_MAX_REDUNDANCY                         5
-#else /* INTEROP_TEST_MODE == 0 */
-/*!
- * Maximum number of fragment that can be handled.
- *
- * \remark This parameter has an impact on the memory footprint.
- */
-#define FRAG_MAX_NB                                 250
-
-/*!
- * Maximum fragment size that can be handled.
- *
- * \remark This parameter has an impact on the memory footprint.
- */
-#define FRAG_MAX_SIZE                               216
-
-/*!
- * Maximum number of extra frames that can be handled.
- *
- * \remark This parameter has an impact on the memory footprint.
- */
-#define FRAG_MAX_REDUNDANCY                         40
-#endif /* INTEROP_TEST_MODE */
-
 #define FRAG_SESSION_FINISHED                       ( int32_t )0
 #define FRAG_SESSION_NOT_STARTED                    ( int32_t )-2
 #define FRAG_SESSION_ONGOING                        ( int32_t )-1
 
-/* Exported constants --------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
 typedef struct sFragDecoderStatus
 {
-  uint16_t FragNbRx;
-  uint16_t FragNbLost;
-  uint16_t FragNbLastRx;
-  uint8_t MatrixError;
-} FragDecoderStatus_t;
+    uint16_t FragNbRx;
+    uint16_t FragNbLost;
+    uint16_t FragNbLastRx;
+    uint8_t MatrixError;
+}FragDecoderStatus_t;
 
 typedef struct sFragDecoderCallbacks
 {
-  /*!
-   * Init `data` buffer of `size` starting at address `addr`
-   *
-   * \param [in] addr Address start index to erase.
-   * \param [in] size number of bytes.
-   *
-   * \retval status Write operation status [0: Success, -1 Fail]
-   */
-  uint8_t (*FragDecoderErase)(uint32_t addr, uint32_t size);
-  /*!
-   * Writes `data` buffer of `size` starting at address `addr`
-   *
-   * \param [in] addr Address start index to write to.
-   * \param [in] data Data buffer to be written.
-   * \param [in] size Size of data buffer to be written.
-   *
-   * \retval status Write operation status [0: Success, -1 Fail]
-   */
-  uint8_t (*FragDecoderWrite)(uint32_t addr, uint8_t *data, uint32_t size);
-  /*!
-   * Reads `data` buffer of `size` starting at address `addr`
-   *
-   * \param [in] addr Address start index to read from.
-   * \param [in] data Data buffer to be read.
-   * \param [in] size Size of data buffer to be read.
-   *
-   * \retval status Read operation status [0: Success, -1 Fail]
-   */
-  uint8_t (*FragDecoderRead)(uint32_t addr, uint8_t *data, uint32_t size);
-} FragDecoderCallbacks_t;
+    /*!
+     * Initialize final uncoded data buffer
+     *
+     * \retval status Write operation status [0: Success, -1 Fail]
+     */
+    int32_t ( *FragDecoderErase )( void );
+    /*!
+     * Writes `data` buffer of `size` starting at address `addr`
+     *
+     * \param [IN] addr Address start index to write to.
+     * \param [IN] data Data buffer to be written.
+     * \param [IN] size Size of data buffer to be written.
+     * 
+     * \retval status Write operation status [0: Success, -1 Fail]
+     */
+    int32_t ( *FragDecoderWrite )( uint32_t addr, uint8_t *data, uint32_t size );
+    /*!
+     * Reads `data` buffer of `size` starting at address `addr`
+     *
+     * \param [IN] addr Address start index to read from.
+     * \param [IN] data Data buffer to be read.
+     * \param [IN] size Size of data buffer to be read.
+     * 
+     * \retval status Read operation status [0: Success, -1 Fail]
+     */
+    int32_t ( *FragDecoderRead )( uint32_t addr, uint8_t *data, uint32_t size );
+}FragDecoderCallbacks_t;
 
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
 /*!
  * \brief Initializes the fragmentation decoder
  *
- * \param [in] fragNb     Number of expected fragments (without redundancy packets)
- * \param [in] fragSize   Size of a fragment
- * \param [in] callbacks  Pointer to the Write/Read functions.
+ * \param [IN] fragNb     Number of expected fragments (without redundancy packets)
+ * \param [IN] fragSize   Size of a fragment
+ * \param [IN] callbacks  Pointer to the Write/Read functions.
  */
-void FragDecoderInit(uint16_t fragNb, uint8_t fragSize, FragDecoderCallbacks_t *callbacks);
+void FragDecoderInit( uint16_t fragNb, uint8_t fragSize, FragDecoderCallbacks_t *callbacks );
 
 /*!
  * \brief Gets the maximum file size that can be received
- *
+ * 
  * \retval size FileSize
  */
-uint32_t FragDecoderGetMaxFileSize(void);
+uint32_t FragDecoderGetMaxFileSize( void );
 
 /*!
  * \brief Function to decode and reconstruct the binary file
  *        Called for each receive frame
- *
- * \param [in] fragCounter Fragment counter [1..(FragDecoder.FragNb + FragDecoder.Redundancy)]
- * \param [in] rawData     Pointer to the fragment to be processed (length = FragDecoder.FragSize)
+ * 
+ * \param [IN] fragCounter Fragment counter [1..(FragDecoder.FragNb + FragDecoder.Redundancy)]
+ * \param [IN] rawData     Pointer to the fragment to be processed (length = FragDecoder.FragSize)
  *
  * \retval status          Process status. [FRAG_SESSION_ONGOING,
  *                                          FRAG_SESSION_FINISHED or
  *                                          FragDecoder.Status.FragNbLost]
  */
-int32_t FragDecoderProcess(uint16_t fragCounter, uint8_t *rawData);
+int32_t FragDecoderProcess( uint16_t fragCounter, uint8_t *rawData );
 
 /*!
  * \brief Gets the current fragmentation status
- *
+ * 
  * \retval status Fragmentation decoder status
  */
-FragDecoderStatus_t FragDecoderGetStatus(void);
-
-#ifdef __cplusplus
-}
-#endif
+FragDecoderStatus_t FragDecoderGetStatus( void );
 
-#endif /* __FRAG_DECODER_H__ */
+#endif // __FRAG_DECODER_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhPackage.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhPackage.h
index d67b9200..0a70a312 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhPackage.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhPackage.h
@@ -31,116 +31,108 @@
 #ifndef __LMH_PACKAGE_H__
 #define __LMH_PACKAGE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include <stdbool.h>
 #include "LmHandlerTypes.h"
 
-/* Exported defines ----------------------------------------------------------*/
 /*!
  * Maximum number of packages
  */
 #define PKG_MAX_NUMBER                              5
 
-/* Exported constants --------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/*!
- * LoRaMac handler package parameters
- */
 typedef struct LmhPackage_s
 {
-  uint8_t Port;
-  /*
-   *=========================================================================
-   * Below callbacks must be initialized in package variable declaration
-   *=========================================================================
-   */
+    uint8_t Port;
+    /*
+     *=========================================================================
+     * Below callbacks must be initialized in package variable declaration
+     *=========================================================================
+     */
 
-  /*!
-   * Initializes the package with provided parameters
-   *
-   * \param [in] params            Pointer to the package parameters
-   * \param [in] dataBuffer        Pointer to main application buffer
-   * \param [in] dataBufferMaxSize Main application buffer maximum size
-   */
-  void (*Init)(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize);
-  /*!
-   * Returns the current package initialization status.
-   *
-   * \retval status Package initialization status
-   *                [true: Initialized, false: Not initialized]
-   */
-  bool (*IsInitialized)(void);
-  /*!
-   * Returns the package operation status.
-   *
-   * \retval status Package operation status
-   *                [true: Running, false: Not running]
-   */
-  bool (*IsRunning)(void);
-  /*!
-   * Processes the internal package events.
-   */
-  void (*Process)(void);
-  /*!
-   * Processes the MCSP Confirm
-   *
-   * \param [in] mcpsConfirm MCPS confirmation primitive data
-   */
-  void (*OnMcpsConfirmProcess)(McpsConfirm_t *mcpsConfirm);
-  /*!
-   * Processes the MCPS Indication
-   *
-   * \param [in] mcpsIndication     MCPS indication primitive data
-   */
-  void (*OnMcpsIndicationProcess)(McpsIndication_t *mcpsIndication);
-  /*!
-   * Processes the MLME Confirm
-   *
-   * \param [in] mlmeConfirm MLME confirmation primitive data
-   */
-  void (*OnMlmeConfirmProcess)(MlmeConfirm_t *mlmeConfirm);
+    /*!
+     * Initializes the package with provided parameters
+     *
+     * \param [IN] params            Pointer to the package parameters
+     * \param [IN] dataBuffer        Pointer to main application buffer
+     * \param [IN] dataBufferMaxSize Main application buffer maximum size
+     */
+    void ( *Init )( void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize );
+    /*!
+     * Returns the current package initialization status.
+     *
+     * \retval status Package initialization status
+     *                [true: Initialized, false: Not initialized]
+     */
+    bool ( *IsInitialized )( void );
+    /*!
+     * Returns the package operation status.
+     *
+     * \retval status Package operation status
+     *                [true: Running, false: Not running]
+     */
+    bool ( *IsRunning )( void );
+    /*!
+     * Processes the internal package events.
+     */
+    void ( *Process )( void );
+    /*!
+     * Notify the LmHandler process through an event
+     */
+    void ( *OnPackageProcessEvent )( void );
+    /*!
+     * Processes the MCSP Confirm
+     *
+     * \param [IN] mcpsConfirm MCPS confirmation primitive data
+     */
+    void ( *OnMcpsConfirmProcess )( McpsConfirm_t *mcpsConfirm );
+    /*!
+     * Processes the MCPS Indication
+     *
+     * \param [IN] mcpsIndication     MCPS indication primitive data
+     */
+    void ( *OnMcpsIndicationProcess )( McpsIndication_t *mcpsIndication );
+    /*!
+     * Processes the MLME Confirm
+     *
+     * \param [IN] mlmeConfirm MLME confirmation primitive data
+     */
+    void ( *OnMlmeConfirmProcess )( MlmeConfirm_t *mlmeConfirm );
 
-  /*
-   *=========================================================================
-   * Below callbacks must be initialized in LmHandler initialization with
-   * provideded LmHandlerSend and OnMacRequest functions
-   *=========================================================================
-   */
-
-  /*!
-  * \brief Join a LoRa Network in classA
-  *
-  * \note if the device is ABP, this is a pass through function
-  *
-  * \param [in] isOtaa Indicates which activation mode must be used
-  */
-  void (*OnJoinRequest)(ActivationType_t mode);
-  /*!
-   * \brief Instructs the MAC layer to send a ClassA uplink
-   *
-   * \param [in] appData Data to be sent
-   * \param [in] isTxConfirmed Indicates if the uplink requires an acknowledgement
-   *
-   * \retval status Returns \ref LORAMAC_HANDLER_SUCCESS if request has been
-   *                processed else \ref LORAMAC_HANDLER_ERROR
-   */
-  LmHandlerErrorStatus_t (*OnSendRequest)(LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed, TimerTime_t *nextTxIn, bool allowDelayedTx);
-  /*!
-  * \brief Requests network server time update
-  *
-  * \retval status Returns \ref LORAMAC_HANDLER_SET if joined else \ref LORAMAC_HANDLER_RESET
-  */
-  LmHandlerErrorStatus_t (*OnDeviceTimeRequest)(void);
-} LmhPackage_t;
+    /*
+     *=========================================================================
+     * Below callbacks must be initialized in LmHandler initialization with
+     * provideded LmHandlerSend and OnMacRequest functions
+     *=========================================================================
+     */
 
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-#ifdef __cplusplus
-}
-#endif
+    /*!
+    * Join a LoRa Network in classA
+    *
+    * \Note if the device is ABP, this is a pass through function
+    * 
+    * \param [IN] isOtaa Indicates which activation mode must be used
+    */
+    void ( *OnJoinRequest )( ActivationType_t mode );
+    /*!
+     * Instructs the MAC layer to send a ClassA uplink
+     *
+     * \param [IN] appData Data to be sent
+     * \param [IN] isTxConfirmed Indicates if the uplink requires an acknowledgement
+     *
+     * \retval status Returns \ref LORAMAC_HANDLER_SUCCESS if request has been
+     *                processed else \ref LORAMAC_HANDLER_ERROR
+     */
+    LmHandlerErrorStatus_t ( *OnSendRequest )( LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed, TimerTime_t *nextTxIn, bool allowDelayedTx );
+    /*!
+    * Requests network server time update
+    *
+    * \retval status Returns \ref LORAMAC_HANDLER_SET if joined else \ref LORAMAC_HANDLER_RESET
+    */
+    LmHandlerErrorStatus_t ( *OnDeviceTimeRequest )( void );
+    /*!
+     * Notifies the upper layer that the system time has been updated.
+     */
+    void ( *OnSysTimeUpdate )( void );
+}LmhPackage_t;
 
-#endif /* __LMH_PACKAGE_H__ */
+#endif // __LMH_PACKAGE_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.c
index 86343395..f1c5d82f 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.c
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.c
@@ -29,72 +29,69 @@
   * @brief   Clock Synchronisation Package definition
   ******************************************************************************
   */
-/* Includes ------------------------------------------------------------------*/
+#include "systime.h"
 #include "LmHandler.h"
 #include "LmhpClockSync.h"
 #include "utilities.h"
 
-/* Private typedef -----------------------------------------------------------*/
+/*!
+ * LoRaWAN Application Layer Clock Synchronization Specification
+ */
+#define CLOCK_SYNC_PORT                             202
+
+#define CLOCK_SYNC_ID                               1
+#define CLOCK_SYNC_VERSION                          1
+
 /*!
  * Package current context
  */
 typedef struct LmhpClockSyncState_s
 {
-  bool Initialized;
-  bool IsRunning;
-  uint8_t DataBufferMaxSize;
-  uint8_t *DataBuffer;
-  union
-  {
-    uint8_t Value;
-    struct
+    bool Initialized;
+    bool IsRunning;
+    uint8_t DataBufferMaxSize;
+    uint8_t *DataBuffer;
+    union
     {
-      uint8_t TokenReq:    4;
-      uint8_t AnsRequired: 1;
-      uint8_t RFU:         3;
-    } Fields;
-  } TimeReqParam;
-  bool AppTimeReqPending;
-  bool AdrEnabledPrev;
-  uint8_t NbTransPrev;
-  uint8_t DataratePrev;
-  uint8_t NbTransmissions;
-} LmhpClockSyncState_t;
+        uint8_t Value;
+        struct
+        {
+            uint8_t TokenReq:    4;
+            uint8_t AnsRequired: 1;
+            uint8_t RFU:         3;
+        }Fields;
+    }TimeReqParam;
+    bool AppTimeReqPending;
+    bool AdrEnabledPrev;
+    uint8_t NbTransPrev;
+    uint8_t DataratePrev;
+    uint8_t NbTransmissions;
+}LmhpClockSyncState_t;
 
 typedef enum LmhpClockSyncMoteCmd_e
 {
-  CLOCK_SYNC_PKG_VERSION_ANS       = 0x00,
-  CLOCK_SYNC_APP_TIME_REQ          = 0x01,
-  CLOCK_SYNC_APP_TIME_PERIOD_ANS   = 0x02,
-  CLOCK_SYNC_FORCE_RESYNC_ANS      = 0x03,
-} LmhpClockSyncMoteCmd_t;
+    CLOCK_SYNC_PKG_VERSION_ANS       = 0x00,
+    CLOCK_SYNC_APP_TIME_REQ          = 0x01,
+    CLOCK_SYNC_APP_TIME_PERIOD_ANS   = 0x02,
+    CLOCK_SYNC_FORCE_RESYNC_ANS      = 0x03,
+}LmhpClockSyncMoteCmd_t;
 
 typedef enum LmhpClockSyncSrvCmd_e
 {
-  CLOCK_SYNC_PKG_VERSION_REQ       = 0x00,
-  CLOCK_SYNC_APP_TIME_ANS          = 0x01,
-  CLOCK_SYNC_APP_TIME_PERIOD_REQ   = 0x02,
-  CLOCK_SYNC_FORCE_RESYNC_REQ      = 0x03,
-} LmhpClockSyncSrvCmd_t;
-
-/* Private define ------------------------------------------------------------*/
-/*!
- * LoRaWAN Application Layer Clock Synchronization Specification
- */
-#define CLOCK_SYNC_PORT                             202
-#define CLOCK_SYNC_ID                               1
-#define CLOCK_SYNC_VERSION                          1
+    CLOCK_SYNC_PKG_VERSION_REQ       = 0x00,
+    CLOCK_SYNC_APP_TIME_ANS          = 0x01,
+    CLOCK_SYNC_APP_TIME_PERIOD_REQ   = 0x02,
+    CLOCK_SYNC_FORCE_RESYNC_REQ      = 0x03,
+}LmhpClockSyncSrvCmd_t;
 
-/* Private macro -------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
 /*!
  * Initializes the package with provided parameters
  *
- * \param [in] params            Pointer to the package parameters
- * \param [in] dataBuffer        Pointer to main application buffer
- * \param [in] dataBufferMaxSize Main application buffer maximum size
+ * \param [IN] params            Pointer to the package parameters
+ * \param [IN] dataBuffer        Pointer to main application buffer
+ * \param [IN] dataBufferMaxSize Main application buffer maximum size
  */
-static void LmhpClockSyncInit(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize);
+static void LmhpClockSyncInit( void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize );
 
 /*!
  * Returns the current package initialization status.
@@ -102,7 +99,7 @@ static void LmhpClockSyncInit(void *params, uint8_t *dataBuffer, uint8_t dataBuf
  * \retval status Package initialization status
  *                [true: Initialized, false: Not initialized]
  */
-static bool LmhpClockSyncIsInitialized(void);
+static bool LmhpClockSyncIsInitialized( void );
 
 /*!
  * Returns the package operation status.
@@ -110,54 +107,55 @@ static bool LmhpClockSyncIsInitialized(void);
  * \retval status Package operation status
  *                [true: Running, false: Not running]
  */
-static bool LmhpClockSyncIsRunning(void);
+static bool LmhpClockSyncIsRunning( void );
 
 /*!
  * Processes the internal package events.
  */
-static void LmhpClockSyncProcess(void);
+static void LmhpClockSyncProcess( void );
 
 /*!
  * Processes the MCSP Confirm
  *
- * \param [in] mcpsConfirm MCPS confirmation primitive data
+ * \param [IN] mcpsConfirm MCPS confirmation primitive data
  */
-static void LmhpClockSyncOnMcpsConfirm(McpsConfirm_t *mcpsConfirm);
+static void LmhpClockSyncOnMcpsConfirm( McpsConfirm_t *mcpsConfirm );
 
 /*!
  * Processes the MCPS Indication
  *
- * \param [in] mcpsIndication     MCPS indication primitive data
+ * \param [IN] mcpsIndication     MCPS indication primitive data
  */
-static void LmhpClockSyncOnMcpsIndication(McpsIndication_t *mcpsIndication);
+static void LmhpClockSyncOnMcpsIndication( McpsIndication_t *mcpsIndication );
 
 static void OnPeriodicTimeStartTimer(void *context);
 
-/* Private variables ---------------------------------------------------------*/
 static LmhpClockSyncState_t LmhpClockSyncState =
 {
-  .Initialized =        false,
-  .IsRunning =          false,
-  .TimeReqParam.Value = 0,
-  .AppTimeReqPending =  false,
-  .AdrEnabledPrev =     false,
-  .NbTransPrev =        0,
-  .NbTransmissions =    0
+    .Initialized = false,
+    .IsRunning = false,
+    .TimeReqParam.Value = 0,
+    .AppTimeReqPending = false,
+    .AdrEnabledPrev = false,
+    .NbTransPrev = 0,
+    .NbTransmissions = 0,
 };
 
 static LmhPackage_t LmhpClockSyncPackage =
 {
-  .Port =                       CLOCK_SYNC_PORT,
-  .Init =                       LmhpClockSyncInit,
-  .IsInitialized =              LmhpClockSyncIsInitialized,
-  .IsRunning =                  LmhpClockSyncIsRunning,
-  .Process =                    LmhpClockSyncProcess,
-  .OnMcpsConfirmProcess =       LmhpClockSyncOnMcpsConfirm,
-  .OnMcpsIndicationProcess =    LmhpClockSyncOnMcpsIndication,
-  .OnMlmeConfirmProcess =       NULL,                          /* Not used in this package */
-  .OnJoinRequest =              NULL,                          /* To be initialized by LmHandler */
-  .OnSendRequest =              NULL,                          /* To be initialized by LmHandler */
-  .OnDeviceTimeRequest =        NULL,                          /* To be initialized by LmHandler */
+    .Port = CLOCK_SYNC_PORT,
+    .Init = LmhpClockSyncInit,
+    .IsInitialized = LmhpClockSyncIsInitialized,
+    .IsRunning = LmhpClockSyncIsRunning,
+    .Process = LmhpClockSyncProcess,
+    .OnMcpsConfirmProcess = LmhpClockSyncOnMcpsConfirm,
+    .OnMcpsIndicationProcess = LmhpClockSyncOnMcpsIndication,
+    .OnMlmeConfirmProcess = NULL,                              // Not used in this package
+    .OnJoinRequest = NULL,                                     // To be initialized by LmHandler
+    .OnSendRequest = NULL,                                     // To be initialized by LmHandler
+    .OnDeviceTimeRequest = NULL,                               // To be initialized by LmHandler
+    .OnSysTimeUpdate = NULL,                                   // To be initialized by LmHandler
+    .OnPackageProcessEvent = NULL,                             // To be initialized by LmHandler
 };
 
 /*!
@@ -165,250 +163,264 @@ static LmhPackage_t LmhpClockSyncPackage =
  */
 static TimerEvent_t PeriodicTimeStartTimer;
 
-/* Exported functions ---------------------------------------------------------*/
-LmhPackage_t *LmphClockSyncPackageFactory(void)
+LmhPackage_t *LmhpClockSyncPackageFactory( void )
 {
-  return &LmhpClockSyncPackage;
-}
-
-LmHandlerErrorStatus_t LmhpClockSyncAppTimeReq(void)
-{
-  if (LmHandlerIsBusy() == true)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  if (LmhpClockSyncState.AppTimeReqPending == false)
-  {
-    MibRequestConfirm_t mibReq;
-
-    /* Disable ADR */
-    mibReq.Type = MIB_ADR;
-    LoRaMacMibGetRequestConfirm(&mibReq);
-    LmhpClockSyncState.AdrEnabledPrev = mibReq.Param.AdrEnable;
-    mibReq.Param.AdrEnable = false;
-    LoRaMacMibSetRequestConfirm(&mibReq);
-
-    /* Set NbTrans = 1 */
-    mibReq.Type = MIB_CHANNELS_NB_TRANS;
-    LoRaMacMibGetRequestConfirm(&mibReq);
-    LmhpClockSyncState.NbTransPrev = mibReq.Param.ChannelsNbTrans;
-    mibReq.Param.ChannelsNbTrans = 1;
-    LoRaMacMibSetRequestConfirm(&mibReq);
-
-    /* Store data rate */
-    mibReq.Type = MIB_CHANNELS_DATARATE;
-    LoRaMacMibGetRequestConfirm(&mibReq);
-    LmhpClockSyncState.DataratePrev = mibReq.Param.ChannelsDatarate;
-
-    /* Add DeviceTimeReq MAC command. */
-    /* In case the network server supports this more precise command */
-    /* this package will use DeviceTimeAns answer as clock synchronization */
-    /* mechanism. */
-    LmhpClockSyncPackage.OnDeviceTimeRequest();
-  }
-
-  SysTime_t curTime = SysTimeGet();
-  uint8_t dataBufferIndex = 0;
-
-  /* Subtract Unix to Gps epcoh offset. The system time is based on Unix time. */
-  curTime.Seconds -= UNIX_GPS_EPOCH_OFFSET;
-
-  LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_APP_TIME_REQ;
-  LmhpClockSyncState.DataBuffer[dataBufferIndex++] = (curTime.Seconds >> 0) & 0xFF;
-  LmhpClockSyncState.DataBuffer[dataBufferIndex++] = (curTime.Seconds >> 8) & 0xFF;
-  LmhpClockSyncState.DataBuffer[dataBufferIndex++] = (curTime.Seconds >> 16) & 0xFF;
-  LmhpClockSyncState.DataBuffer[dataBufferIndex++] = (curTime.Seconds >> 24) & 0xFF;
-  LmhpClockSyncState.TimeReqParam.Fields.AnsRequired = 0;
-  LmhpClockSyncState.DataBuffer[dataBufferIndex++] = LmhpClockSyncState.TimeReqParam.Value;
-
-  LmHandlerAppData_t appData =
-  {
-    .Buffer = LmhpClockSyncState.DataBuffer,
-    .BufferSize = dataBufferIndex,
-    .Port = CLOCK_SYNC_PORT
-  };
-  LmhpClockSyncState.AppTimeReqPending = true;
-
-  bool current_dutycycle;
-  LmHandlerGetDutyCycleEnable(&current_dutycycle);
-
-  /* force Duty Cycle OFF to this Send */
-  LmHandlerSetDutyCycleEnable(false);
-  LmHandlerErrorStatus_t status = LmhpClockSyncPackage.OnSendRequest(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true);
-
-  /* restore initial Duty Cycle */
-  LmHandlerSetDutyCycleEnable(current_dutycycle);
-
-  return status;
+    return &LmhpClockSyncPackage;
 }
 
-/* Private  functions ---------------------------------------------------------*/
-static void LmhpClockSyncInit(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize)
+static void LmhpClockSyncInit( void * params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize )
 {
-  if (dataBuffer != NULL)
-  {
-    LmhpClockSyncState.DataBuffer = dataBuffer;
-    LmhpClockSyncState.DataBufferMaxSize = dataBufferMaxSize;
-    LmhpClockSyncState.Initialized = true;
-    LmhpClockSyncState.IsRunning = true;
-    TimerInit(&PeriodicTimeStartTimer, OnPeriodicTimeStartTimer);
-  }
-  else
-  {
-    LmhpClockSyncState.IsRunning = false;
-    LmhpClockSyncState.Initialized = false;
-  }
+    if( dataBuffer != NULL )
+    {
+        LmhpClockSyncState.DataBuffer = dataBuffer;
+        LmhpClockSyncState.DataBufferMaxSize = dataBufferMaxSize;
+        LmhpClockSyncState.Initialized = true;
+        LmhpClockSyncState.IsRunning = true;
+        TimerInit(&PeriodicTimeStartTimer, OnPeriodicTimeStartTimer);
+    }
+    else
+    {
+        LmhpClockSyncState.IsRunning = false;
+        LmhpClockSyncState.Initialized = false;
+    }
 }
 
-static bool LmhpClockSyncIsInitialized(void)
+static bool LmhpClockSyncIsInitialized( void )
 {
-  return LmhpClockSyncState.Initialized;
+    return LmhpClockSyncState.Initialized;
 }
 
-static bool LmhpClockSyncIsRunning(void)
+static bool LmhpClockSyncIsRunning( void )
 {
-  if (LmhpClockSyncState.Initialized == false)
-  {
-    return false;
-  }
+    if( LmhpClockSyncState.Initialized == false )
+    {
+        return false;
+    }
 
-  return LmhpClockSyncState.IsRunning;
+    return LmhpClockSyncState.IsRunning;
 }
 
-static void LmhpClockSyncProcess(void)
+static void LmhpClockSyncProcess( void )
 {
-  if (LmhpClockSyncState.NbTransmissions > 0)
-  {
-    if (LmhpClockSyncAppTimeReq() == LORAMAC_HANDLER_SUCCESS)
+    if( LmhpClockSyncState.NbTransmissions > 0 )
     {
-      LmhpClockSyncState.NbTransmissions--;
+        if( LmhpClockSyncAppTimeReq( ) == LORAMAC_HANDLER_SUCCESS )
+        {
+            LmhpClockSyncState.NbTransmissions--;
+        }
     }
-  }
 }
 
-static void LmhpClockSyncOnMcpsConfirm(McpsConfirm_t *mcpsConfirm)
+static void LmhpClockSyncOnMcpsConfirm( McpsConfirm_t *mcpsConfirm )
 {
-  MibRequestConfirm_t mibReq;
-
-  if (LmhpClockSyncState.AppTimeReqPending == true)
-  {
-    /* Revert ADR setting */
-    mibReq.Type = MIB_ADR;
-    mibReq.Param.AdrEnable = LmhpClockSyncState.AdrEnabledPrev;
-    LoRaMacMibSetRequestConfirm(&mibReq);
-
-    /* Revert NbTrans setting */
-    mibReq.Type = MIB_CHANNELS_NB_TRANS;
-    mibReq.Param.ChannelsNbTrans = LmhpClockSyncState.NbTransPrev;
-    LoRaMacMibSetRequestConfirm(&mibReq);
-
-    /* Revert data rate setting */
-    mibReq.Type = MIB_CHANNELS_DATARATE;
-    mibReq.Param.ChannelsDatarate = LmhpClockSyncState.DataratePrev;
-    LoRaMacMibSetRequestConfirm(&mibReq);
-
-    LmhpClockSyncState.AppTimeReqPending = false;
-  }
+    MibRequestConfirm_t mibReq;
+
+    if( LmhpClockSyncState.AppTimeReqPending == true )
+    {
+        // Revert ADR setting
+        mibReq.Type = MIB_ADR;
+        mibReq.Param.AdrEnable = LmhpClockSyncState.AdrEnabledPrev;
+        LoRaMacMibSetRequestConfirm( &mibReq );
+
+        // Revert NbTrans setting
+        mibReq.Type = MIB_CHANNELS_NB_TRANS;
+        mibReq.Param.ChannelsNbTrans = LmhpClockSyncState.NbTransPrev;
+        LoRaMacMibSetRequestConfirm( &mibReq );
+
+        // Revert data rate setting
+        mibReq.Type = MIB_CHANNELS_DATARATE;
+        mibReq.Param.ChannelsDatarate = LmhpClockSyncState.DataratePrev;
+        LoRaMacMibSetRequestConfirm( &mibReq );        
+        
+        LmhpClockSyncState.AppTimeReqPending = false;
+    }
 }
 
-static void LmhpClockSyncOnMcpsIndication(McpsIndication_t *mcpsIndication)
+static void LmhpClockSyncOnMcpsIndication( McpsIndication_t *mcpsIndication )
 {
-  uint8_t cmdIndex = 0;
-  uint8_t dataBufferIndex = 0;
+    uint8_t cmdIndex = 0;
+    uint8_t dataBufferIndex = 0;
+
+    if( mcpsIndication->Port != CLOCK_SYNC_PORT )
+    {
+        return;
+    }
 
-  while (cmdIndex < mcpsIndication->BufferSize)
-  {
-    switch (mcpsIndication->Buffer[cmdIndex++])
+    while( cmdIndex < mcpsIndication->BufferSize )
     {
-      case CLOCK_SYNC_PKG_VERSION_REQ:
-      {
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_PKG_VERSION_ANS;
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_ID;
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_VERSION;
-        break;
-      }
-      case CLOCK_SYNC_APP_TIME_ANS:
-      {
-        LmhpClockSyncState.NbTransmissions = 0;
-
-        /* Check if a more precise time correction has been received. */
-        /* If yes then don't process and ignore this answer. */
-        if (mcpsIndication->DeviceTimeAnsReceived == true)
+        switch( mcpsIndication->Buffer[cmdIndex++] )
         {
-          cmdIndex += 5;
-          break;
+            case CLOCK_SYNC_PKG_VERSION_REQ:
+            {
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_PKG_VERSION_ANS;
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_ID;
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_VERSION;
+                break;
+            }
+            case CLOCK_SYNC_APP_TIME_ANS:
+            {
+                LmhpClockSyncState.NbTransmissions = 0;
+
+                // Check if a more precise time correction has been received.
+                // If yes then don't process and ignore this answer.
+                if( mcpsIndication->DeviceTimeAnsReceived == true )
+                {
+                    cmdIndex += 5;
+                    break;
+                }
+                int32_t timeCorrection = 0;
+                timeCorrection  = ( mcpsIndication->Buffer[cmdIndex++] << 0  ) & 0x000000FF;
+                timeCorrection += ( mcpsIndication->Buffer[cmdIndex++] << 8  ) & 0x0000FF00;
+                timeCorrection += ( mcpsIndication->Buffer[cmdIndex++] << 16 ) & 0x00FF0000;
+                timeCorrection += ( mcpsIndication->Buffer[cmdIndex++] << 24 ) & 0xFF000000;
+                if( ( mcpsIndication->Buffer[cmdIndex++] & 0x0F ) == LmhpClockSyncState.TimeReqParam.Fields.TokenReq )
+                {
+                    SysTime_t curTime = { .Seconds = 0, .SubSeconds = 0 };
+                    curTime = SysTimeGet( );
+                    curTime.Seconds += timeCorrection;
+                    SysTimeSet( curTime );
+                    LmhpClockSyncState.TimeReqParam.Fields.TokenReq = ( LmhpClockSyncState.TimeReqParam.Fields.TokenReq + 1 ) & 0x0F;
+                    if( LmhpClockSyncPackage.OnSysTimeUpdate != NULL )
+                    {
+                        if( ( timeCorrection >= -1 ) && ( timeCorrection <= 1 ) )
+                        {
+                            LmhpClockSyncPackage.OnSysTimeUpdate( );
+                        }
+                    }
+                }
+                break;
+            }
+            case CLOCK_SYNC_APP_TIME_PERIOD_REQ:
+            {
+                // Increment index
+                cmdIndex++;
+
+                uint32_t periodTime = mcpsIndication->Buffer[cmdIndex++] & 0x0F;
+                periodTime = (128 << periodTime) + randr(0, 30);
+
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_APP_TIME_PERIOD_ANS;
+                // Answer status supported.
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = 0x00;
+
+                SysTime_t curTime = SysTimeGet( );
+                // Substract Unix to Gps epoch offset. The system time is based on Unix time.
+                curTime.Seconds -= UNIX_GPS_EPOCH_OFFSET;
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = ( curTime.Seconds >> 0  ) & 0xFF;
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = ( curTime.Seconds >> 8  ) & 0xFF;
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = ( curTime.Seconds >> 16 ) & 0xFF;
+                LmhpClockSyncState.DataBuffer[dataBufferIndex++] = ( curTime.Seconds >> 24 ) & 0xFF;
+
+                /* Start Periodic timer */
+                TimerSetValue(&PeriodicTimeStartTimer, periodTime * 1000);
+                TimerStart(&PeriodicTimeStartTimer);
+
+                break;
+            }
+            case CLOCK_SYNC_FORCE_RESYNC_REQ:
+            {
+                LmhpClockSyncState.NbTransmissions = mcpsIndication->Buffer[cmdIndex++] & 0X07;
+                break;
+            }
         }
-        int32_t timeCorrection = 0;
-        timeCorrection  = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x000000FF;
-        timeCorrection += (mcpsIndication->Buffer[cmdIndex++] << 8) & 0x0000FF00;
-        timeCorrection += (mcpsIndication->Buffer[cmdIndex++] << 16) & 0x00FF0000;
-        timeCorrection += (mcpsIndication->Buffer[cmdIndex++] << 24) & 0xFF000000;
-        if ((mcpsIndication->Buffer[cmdIndex++] & 0x0F) == LmhpClockSyncState.TimeReqParam.Fields.TokenReq)
+    }
+
+    if( dataBufferIndex != 0 )
+    {
+        // Answer commands
+        LmHandlerAppData_t appData =
         {
-          SysTime_t curTime = { .Seconds = 0, .SubSeconds = 0 };
-          curTime = SysTimeGet();
-          curTime.Seconds += timeCorrection;
-          SysTimeSet(curTime);
-          LmhpClockSyncState.TimeReqParam.Fields.TokenReq = (LmhpClockSyncState.TimeReqParam.Fields.TokenReq + 1) & 0x0F;
-        }
-        break;
-      }
-      case CLOCK_SYNC_APP_TIME_PERIOD_REQ:
-      {
-        uint32_t periodTime = mcpsIndication->Buffer[cmdIndex++] & 0x0F;
-        periodTime = (128 << periodTime) + randr(0, 30);
-
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_APP_TIME_PERIOD_ANS;
-        /* Answer status supported. */
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = 0x00;
-
-        SysTime_t curTime = SysTimeGet();
-        /* Subtract Unix to Gps epcoh offset. The system time is based on Unix time. */
-        curTime.Seconds -= UNIX_GPS_EPOCH_OFFSET;
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = (curTime.Seconds >> 0) & 0xFF;
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = (curTime.Seconds >> 8) & 0xFF;
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = (curTime.Seconds >> 16) & 0xFF;
-        LmhpClockSyncState.DataBuffer[dataBufferIndex++] = (curTime.Seconds >> 24) & 0xFF;
-
-        /* Start Periodic timer */
-        TimerSetValue(&PeriodicTimeStartTimer, periodTime * 1000);
-        TimerStart(&PeriodicTimeStartTimer);
-
-        break;
-      }
-      case CLOCK_SYNC_FORCE_RESYNC_REQ:
-      {
-        LmhpClockSyncState.NbTransmissions = mcpsIndication->Buffer[cmdIndex++] & 0X07;
-        break;
-      }
+            .Buffer = LmhpClockSyncState.DataBuffer,
+            .BufferSize = dataBufferIndex,
+            .Port = CLOCK_SYNC_PORT
+        };
+
+        bool current_dutycycle;
+        LmHandlerGetDutyCycleEnable(&current_dutycycle);
+
+        /* force Duty Cycle OFF to this Send */
+        LmHandlerSetDutyCycleEnable(false);
+        LmhpClockSyncPackage.OnSendRequest(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true);
+
+        /* restore initial Duty Cycle */
+        LmHandlerSetDutyCycleEnable(current_dutycycle);
+    }
+}
+
+LmHandlerErrorStatus_t LmhpClockSyncAppTimeReq( void )
+{
+    if( LmHandlerIsBusy( ) == true )
+    {
+        return LORAMAC_HANDLER_ERROR;
     }
-  }
 
-  if (dataBufferIndex != 0)
-  {
-    /* Answer commands */
+    if( LmhpClockSyncState.AppTimeReqPending == false )
+    {
+        MibRequestConfirm_t mibReq;
+
+        // Disable ADR
+        mibReq.Type = MIB_ADR;
+        LoRaMacMibGetRequestConfirm( &mibReq );
+        LmhpClockSyncState.AdrEnabledPrev = mibReq.Param.AdrEnable;
+        mibReq.Param.AdrEnable = false;
+        LoRaMacMibSetRequestConfirm( &mibReq );
+
+        // Set NbTrans = 1
+        mibReq.Type = MIB_CHANNELS_NB_TRANS;
+        LoRaMacMibGetRequestConfirm( &mibReq );
+        LmhpClockSyncState.NbTransPrev = mibReq.Param.ChannelsNbTrans;
+        mibReq.Param.ChannelsNbTrans = 1;
+        LoRaMacMibSetRequestConfirm( &mibReq );
+
+        // Store data rate
+        mibReq.Type = MIB_CHANNELS_DATARATE;
+        LoRaMacMibGetRequestConfirm( &mibReq );  
+        LmhpClockSyncState.DataratePrev = mibReq.Param.ChannelsDatarate;
+
+        // Add DeviceTimeReq MAC command.
+        // In case the network server supports this more precise command
+        // this package will use DeviceTimeAns answer as clock synchronization
+        // mechanism.
+        LmhpClockSyncPackage.OnDeviceTimeRequest( );
+    }
+
+    SysTime_t curTime = SysTimeGet( );
+    uint8_t dataBufferIndex = 0;
+
+    // Substract Unix to Gps epoch offset. The system time is based on Unix time.
+    curTime.Seconds -= UNIX_GPS_EPOCH_OFFSET;
+
+    LmhpClockSyncState.DataBuffer[dataBufferIndex++] = CLOCK_SYNC_APP_TIME_REQ;
+    LmhpClockSyncState.DataBuffer[dataBufferIndex++] = ( curTime.Seconds >> 0  ) & 0xFF;
+    LmhpClockSyncState.DataBuffer[dataBufferIndex++] = ( curTime.Seconds >> 8  ) & 0xFF;
+    LmhpClockSyncState.DataBuffer[dataBufferIndex++] = ( curTime.Seconds >> 16 ) & 0xFF;
+    LmhpClockSyncState.DataBuffer[dataBufferIndex++] = ( curTime.Seconds >> 24 ) & 0xFF;
+    LmhpClockSyncState.TimeReqParam.Fields.AnsRequired = 0;
+    LmhpClockSyncState.DataBuffer[dataBufferIndex++] = LmhpClockSyncState.TimeReqParam.Value;
+
     LmHandlerAppData_t appData =
     {
-      .Buffer = LmhpClockSyncState.DataBuffer,
-      .BufferSize = dataBufferIndex,
-      .Port = CLOCK_SYNC_PORT
+        .Buffer = LmhpClockSyncState.DataBuffer,
+        .BufferSize = dataBufferIndex,
+        .Port = CLOCK_SYNC_PORT
     };
+    LmhpClockSyncState.AppTimeReqPending = true;
 
     bool current_dutycycle;
     LmHandlerGetDutyCycleEnable(&current_dutycycle);
 
     /* force Duty Cycle OFF to this Send */
     LmHandlerSetDutyCycleEnable(false);
-    LmhpClockSyncPackage.OnSendRequest(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true);
+    LmHandlerErrorStatus_t status = LmhpClockSyncPackage.OnSendRequest(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true);
 
     /* restore initial Duty Cycle */
     LmHandlerSetDutyCycleEnable(current_dutycycle);
-  }
+
+    return status;
 }
 
 static void OnPeriodicTimeStartTimer(void *context)
 {
   LmhpClockSyncState.NbTransmissions = 1;
   TimerStart(&PeriodicTimeStartTimer);
+  LmhpClockSyncPackage.OnPackageProcessEvent();
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.h
index d3e26660..254e211d 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.h
@@ -19,27 +19,13 @@
  *
  * \author    Miguel Luis ( Semtech )
  */
-/**
-  ******************************************************************************
-  *
-  *          Portions COPYRIGHT 2020 STMicroelectronics
-  *
-  * @file    LmhpClockSync.h
-  * @author  MCD Application Team
-  * @brief   Header for Clock Synchronisation Package module
-  ******************************************************************************
-  */
 #ifndef __LMHP_CLOCK_SYNC_H__
 #define __LMHP_CLOCK_SYNC_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
+#include "LoRaMac.h"
+#include "LmHandlerTypes.h"
 #include "LmhPackage.h"
 
-/* Exported defines ----------------------------------------------------------*/
 /*!
  * Clock sync package identifier.
  *
@@ -47,17 +33,17 @@ extern "C" {
  */
 #define PACKAGE_ID_CLOCK_SYNC                       1
 
-/* Exported constants --------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-LmhPackage_t *LmphClockSyncPackageFactory(void);
+/*!
+ * Clock sync package parameters
+ *
+ * This package doesn't require parameters
+ */
+//typedef struct LmhpClockSyncParams_s
+//{
+//}LmhpClockSyncParams_t;
 
-LmHandlerErrorStatus_t LmhpClockSyncAppTimeReq(void);
+LmhPackage_t *LmhpClockSyncPackageFactory( void );
 
-#ifdef __cplusplus
-}
-#endif
+LmHandlerErrorStatus_t LmhpClockSyncAppTimeReq( void );
 
-#endif /* __LMHP_CLOCK_SYNC_H__ */
+#endif // __LMHP_CLOCK_SYNC_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c
index bcab48a5..cb30d15a 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c
@@ -28,32 +28,17 @@
   * @brief   Certification Protocol Handling definition
   ******************************************************************************
   */
-/* Includes ------------------------------------------------------------------*/
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "utilities.h"
+#include "timer.h"
+#include "LoRaMac.h"
 #include "LoRaMacTest.h"
+#include "Region.h"
+#include "LmhPackage.h"
 #include "LmhpCompliance.h"
 
-/* Private typedef -----------------------------------------------------------*/
-/*!
- * LoRaWAN compliance tests support data
- */
-typedef struct ComplianceTestState_s
-{
-  bool Initialized;
-  bool IsRunning;
-  uint8_t State;
-  bool TxPending;
-  bool IsTxConfirmed;
-  uint8_t Port;
-  uint8_t DataBufferMaxSize;
-  uint8_t DataBufferSize;
-  uint8_t *DataBuffer;
-  uint16_t DownLinkCounter;
-  bool LinkCheck;
-  uint8_t DemodMargin;
-  uint8_t NbGateways;
-} ComplianceTestState_t;
-
-/* Private define ------------------------------------------------------------*/
 /*!
  * LoRaWAN compliance certification protocol port number.
  *
@@ -67,21 +52,67 @@ typedef struct ComplianceTestState_s
  */
 #define COMPLIANCE_TX_DUTYCYCLE                     5000
 
-/* Private macro -------------------------------------------------------------*/
+/*!
+ * LoRaWAN compliance tests support data
+ */
+typedef struct ComplianceTestState_s
+{
+    bool Initialized;
+    bool IsRunning;
+    uint8_t State;
+    bool IsTxConfirmed;
+    uint8_t Port;
+    uint8_t DataBufferMaxSize;
+    uint8_t DataBufferSize;
+    uint8_t *DataBuffer;
+    uint16_t DownLinkCounter;
+    bool LinkCheck;
+    uint8_t DemodMargin;
+    uint8_t NbGateways;
+}ComplianceTestState_t;
+
 #ifndef MIN
 #define MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
 #endif
 
-/* Private function prototypes -----------------------------------------------*/
+/*!
+ * Timer to handle the application data transmission duty cycle
+ */
+static TimerEvent_t ComplianceTxNextPacketTimer;
+
+/*!
+ * Holds the compliance test current context
+ */
+static ComplianceTestState_t ComplianceTestState =
+{ 
+    .Initialized = false,
+    .IsRunning = false,
+    .State = 0,
+    .IsTxConfirmed = false,
+    .Port = 0,
+    .DataBufferMaxSize = 0,
+    .DataBufferSize = 0,
+    .DataBuffer = NULL,
+    .DownLinkCounter = 0,
+    .LinkCheck = false,
+    .DemodMargin = 0,
+    .NbGateways = 0
+};
+
+/*!
+ * LoRaWAN compliance tests protocol handler parameters
+ */
+static LmhpComplianceParams_t* LmhpComplianceParams;
+
 /*!
  * Initializes the compliance tests with provided parameters
  *
- * \param [in] params Structure containing the initial compliance
+ * \param [IN] params Structure containing the initial compliance
  *                    tests parameters.
- * \param [in] dataBuffer        Pointer to main application buffer
- * \param [in] dataBufferMaxSize Application buffer maximum size
+ * \param [IN] dataBuffer        Pointer to main application buffer
+ * \param [IN] dataBufferMaxSize Application buffer maximum size
  */
-static void LmhpComplianceInit(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize);
+static void LmhpComplianceInit( void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize );
 
 /*!
  * Returns the current compliance certification protocol initialization status.
@@ -89,7 +120,7 @@ static void LmhpComplianceInit(void *params, uint8_t *dataBuffer, uint8_t dataBu
  * \retval status Compliance certification protocol initialization status
  *                [true: Initialized, false: Not initialized]
  */
-static bool LmhpComplianceIsInitialized(void);
+static bool LmhpComplianceIsInitialized( void );
 
 /*!
  * Returns the current compliance certification protocol handling status.
@@ -97,12 +128,12 @@ static bool LmhpComplianceIsInitialized(void);
  * \retval status Compliance certification protocol handling status
  *                [true: Running, false: Not running]
  */
-static bool LmhpComplianceIsRunning(void);
+static bool LmhpComplianceIsRunning( void );
 
 /*!
  * Processes the LoRaMac Compliance events.
  */
-static void LmhpComplianceProcess(void);
+static void LmhpComplianceProcess( void );
 
 /*!
  * Processes the MCPS Confirm
@@ -114,21 +145,21 @@ static void LmhpComplianceOnMcpsConfirm(McpsConfirm_t *mcpsConfirm);
 /*!
  * Processes the MCPS Indication
  *
- * \param [in] mcpsIndication     MCPS indication primitive data
+ * \param [IN] mcpsIndication     MCPS indication primitive data
  */
-static void LmhpComplianceOnMcpsIndication(McpsIndication_t *mcpsIndication);
+static void LmhpComplianceOnMcpsIndication( McpsIndication_t *mcpsIndication );
 
 /*!
  * Processes the MLME Confirm
  *
- * \param [in] mlmeConfirm MLME confirmation primitive data
+ * \param [IN] mlmeConfirm MLME confirmation primitive data
  */
-static void LmhpComplianceOnMlmeConfirm(MlmeConfirm_t *mlmeConfirm);
+static void LmhpComplianceOnMlmeConfirm( MlmeConfirm_t *mlmeConfirm );
 
 /*!
  * Function executed on TxNextPacket Timeout event
  */
-static void OnComplianceTxNextPacketTimerEvent(void *context);
+static void OnComplianceTxNextPacketTimerEvent( void *context );
 
 /*!
  * Processes the data to transmit on port \ref COMPLIANCE_PORT
@@ -137,382 +168,362 @@ static void OnComplianceTxNextPacketTimerEvent(void *context);
  * \retval status Returns \ref LORAMAC_HANDLER_SUCCESS if request has been
  *                processed else \ref LORAMAC_HANDLER_ERROR
  */
-static LmHandlerErrorStatus_t LmhpComplianceTxProcess(void);
-
-/* Private variables ---------------------------------------------------------*/
-/*!
- * Timer to handle the application data transmission duty cycle
- */
-static TimerEvent_t ComplianceTxNextPacketTimer;
-
-/*!
- * Holds the compliance test current context
- */
-static ComplianceTestState_t ComplianceTestState =
-{
-  .Initialized =        false,
-  .IsRunning =          false,
-  .State =              0,
-  .IsTxConfirmed =      false,
-  .Port =               0,
-  .DataBufferMaxSize =  0,
-  .DataBufferSize =     0,
-  .DataBuffer =         NULL,
-  .DownLinkCounter =    0,
-  .LinkCheck =          false,
-  .DemodMargin =        0,
-  .NbGateways =         0
-};
-
-/*!
- * LoRaWAN compliance tests protocol handler parameters
- */
-static LmhpComplianceParams_t *LmhpComplianceParams;
+static LmHandlerErrorStatus_t LmhpComplianceTxProcess( void );
 
 static LmhPackage_t LmhpCompliancePackage =
 {
-  .Port =                       COMPLIANCE_PORT,
-  .Init =                       LmhpComplianceInit,
-  .IsInitialized =              LmhpComplianceIsInitialized,
-  .IsRunning =                  LmhpComplianceIsRunning,
-  .Process =                    LmhpComplianceProcess,
-  .OnMcpsConfirmProcess =       LmhpComplianceOnMcpsConfirm,
-  .OnMcpsIndicationProcess =    LmhpComplianceOnMcpsIndication,
-  .OnMlmeConfirmProcess =       LmhpComplianceOnMlmeConfirm,
-  .OnJoinRequest =              NULL,                           /* To be initialized by LmHandler */
-  .OnSendRequest =              NULL,                           /* To be initialized by LmHandler */
-  .OnDeviceTimeRequest =        NULL,                           /* To be initialized by LmHandler */
+    .Port = COMPLIANCE_PORT,
+    .Init = LmhpComplianceInit,
+    .IsInitialized = LmhpComplianceIsInitialized,
+    .IsRunning = LmhpComplianceIsRunning,
+    .Process = LmhpComplianceProcess,
+    .OnMcpsConfirmProcess =       LmhpComplianceOnMcpsConfirm,
+    .OnMcpsIndicationProcess = LmhpComplianceOnMcpsIndication,
+    .OnMlmeConfirmProcess = LmhpComplianceOnMlmeConfirm,
+    .OnJoinRequest = NULL,                                     // To be initialized by LmHandler
+    .OnSendRequest = NULL,                                     // To be initialized by LmHandler
+    .OnDeviceTimeRequest = NULL,                               // To be initialized by LmHandler
+    .OnSysTimeUpdate = NULL,                                   // To be initialized by LmHandler
+    .OnPackageProcessEvent = NULL,                             // To be initialized by LmHandler
 };
 
-/* Exported functions ---------------------------------------------------------*/
-LmhPackage_t *LmphCompliancePackageFactory(void)
+LmhPackage_t *LmhpCompliancePackageFactory( void )
 {
-  return &LmhpCompliancePackage;
+    return &LmhpCompliancePackage;
 }
 
-/* Private  functions ---------------------------------------------------------*/
-static void LmhpComplianceInit(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize)
+static void LmhpComplianceInit( void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize )
 {
-  if ((params != NULL) && (dataBuffer != NULL))
-  {
-    LmhpComplianceParams = (LmhpComplianceParams_t *)params;
-    ComplianceTestState.DataBuffer = dataBuffer;
-    ComplianceTestState.DataBufferMaxSize = dataBufferMaxSize;
-    ComplianceTestState.Initialized = true;
-  }
-  else
-  {
-    LmhpComplianceParams = NULL;
-    ComplianceTestState.Initialized = false;
-  }
+    if( ( params != NULL ) && ( dataBuffer != NULL ) )
+    {
+        LmhpComplianceParams = ( LmhpComplianceParams_t* )params;
+        ComplianceTestState.DataBuffer = dataBuffer;
+        ComplianceTestState.DataBufferMaxSize = dataBufferMaxSize;
+        ComplianceTestState.Initialized = true;
+    }
+    else
+    {
+        LmhpComplianceParams = NULL;
+        ComplianceTestState.Initialized = false;
+    }
 }
 
-static bool LmhpComplianceIsInitialized(void)
+static bool LmhpComplianceIsInitialized( void )
 {
-  return ComplianceTestState.Initialized;
+    return ComplianceTestState.Initialized;
 }
 
-static bool LmhpComplianceIsRunning(void)
+static bool LmhpComplianceIsRunning( void )
 {
-  if (ComplianceTestState.Initialized == false)
-  {
-    return false;
-  }
+    if( ComplianceTestState.Initialized == false )
+    {
+        return false;
+    }
 
-  return ComplianceTestState.IsRunning;
+    return ComplianceTestState.IsRunning;
 }
 
 static void LmhpComplianceOnMcpsConfirm(McpsConfirm_t *mcpsConfirm)
 {
-  if (ComplianceTestState.Initialized == false)
-  {
-    return;
-  }
-
-  if ((ComplianceTestState.IsRunning == true) &&
-      (mcpsConfirm->McpsRequest == MCPS_CONFIRMED) &&
-      (mcpsConfirm->AckReceived != 0))
-  {
-    /* Increment the compliance certification protocol downlink counter */
-    ComplianceTestState.DownLinkCounter++;
-  }
-}
-
-static void LmhpComplianceOnMlmeConfirm(MlmeConfirm_t *mlmeConfirm)
-{
-  if (ComplianceTestState.Initialized == false)
-  {
-    return;
-  }
-
-  if (mlmeConfirm->MlmeRequest == MLME_LINK_CHECK)
-  {
-    ComplianceTestState.LinkCheck = true;
-    ComplianceTestState.DemodMargin = mlmeConfirm->DemodMargin;
-    ComplianceTestState.NbGateways = mlmeConfirm->NbGateways;
-  }
-}
+    if (ComplianceTestState.Initialized == false)
+    {
+        return;
+    }
 
-static LmHandlerErrorStatus_t LmhpComplianceTxProcess(void)
-{
-  if (ComplianceTestState.Initialized == false)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  if (ComplianceTestState.LinkCheck == true)
-  {
-    ComplianceTestState.LinkCheck = false;
-    ComplianceTestState.DataBufferSize = 3;
-    ComplianceTestState.DataBuffer[0] = 5;
-    ComplianceTestState.DataBuffer[1] = ComplianceTestState.DemodMargin;
-    ComplianceTestState.DataBuffer[2] = ComplianceTestState.NbGateways;
-    ComplianceTestState.State = 1;
-  }
-  else
-  {
-    switch (ComplianceTestState.State)
+    if ((ComplianceTestState.IsRunning == true) &&
+        (mcpsConfirm->McpsRequest == MCPS_CONFIRMED) &&
+        (mcpsConfirm->AckReceived != 0))
     {
-      case 4:
-        ComplianceTestState.State = 1;
-        break;
-      case 1:
-        ComplianceTestState.DataBufferSize = 2;
-        ComplianceTestState.DataBuffer[0] = ComplianceTestState.DownLinkCounter >> 8;
-        ComplianceTestState.DataBuffer[1] = ComplianceTestState.DownLinkCounter;
-        break;
+        /* Increment the compliance certification protocol downlink counter */
+        ComplianceTestState.DownLinkCounter++;
     }
-  }
-  LmHandlerAppData_t appData =
-  {
-    .Buffer = ComplianceTestState.DataBuffer,
-    .BufferSize = ComplianceTestState.DataBufferSize,
-    .Port = COMPLIANCE_PORT
-  };
-  TimerTime_t nextTxIn = 0;
-
-  /* Schedule next transmission */
-  TimerStart(&ComplianceTxNextPacketTimer);
-
-  return LmhpCompliancePackage.OnSendRequest(&appData, (LmHandlerMsgTypes_t)ComplianceTestState.IsTxConfirmed, &nextTxIn,
-                                             true);
 }
 
-static void LmhpComplianceOnMcpsIndication(McpsIndication_t *mcpsIndication)
+static void LmhpComplianceOnMlmeConfirm( MlmeConfirm_t *mlmeConfirm )
 {
-  if (ComplianceTestState.Initialized == false)
-  {
-    return;
-  }
-
-  if (mcpsIndication->RxData == false)
-  {
-    return;
-  }
-
-  if ((ComplianceTestState.IsRunning == true) &&
-      (mcpsIndication->AckReceived == 0))
-  {
-    /* Increment the compliance certification protocol downlink counter */
-    ComplianceTestState.DownLinkCounter++;
-  }
-
-  if (mcpsIndication->Port != COMPLIANCE_PORT)
-  {
-    return;
-  }
-
-  if (ComplianceTestState.IsRunning == false)
-  {
-    /* Check compliance test enable command (i) */
-    if ((mcpsIndication->BufferSize == 4) &&
-        (mcpsIndication->Buffer[0] == 0x01) &&
-        (mcpsIndication->Buffer[1] == 0x01) &&
-        (mcpsIndication->Buffer[2] == 0x01) &&
-        (mcpsIndication->Buffer[3] == 0x01))
+    if( ComplianceTestState.Initialized == false )
     {
-      MibRequestConfirm_t mibReq;
-
-      /* Initialize compliance test mode context */
-      ComplianceTestState.IsTxConfirmed = false;
-      ComplianceTestState.Port = 224;
-      ComplianceTestState.DataBufferSize = 2;
-      ComplianceTestState.DownLinkCounter = 0;
-      ComplianceTestState.LinkCheck = false;
-      ComplianceTestState.DemodMargin = 0;
-      ComplianceTestState.NbGateways = 0;
-      ComplianceTestState.IsRunning = true;
-      ComplianceTestState.State = 1;
-
-      /* Enable ADR while in compliance test mode */
-      mibReq.Type = MIB_ADR;
-      mibReq.Param.AdrEnable = true;
-      LoRaMacMibSetRequestConfirm(&mibReq);
-
-      /* Disable duty cycle enforcement while in compliance test mode */
-      LoRaMacTestSetDutyCycleOn(false);
-
-      /* Stop peripherals */
-      if (LmhpComplianceParams->StopPeripherals != NULL)
-      {
-        LmhpComplianceParams->StopPeripherals();
-      }
-      /* Initialize compliance protocol transmission timer */
-      TimerInit(&ComplianceTxNextPacketTimer, OnComplianceTxNextPacketTimerEvent);
-      TimerSetValue(&ComplianceTxNextPacketTimer, COMPLIANCE_TX_DUTYCYCLE);
-
-      /* Confirm compliance test protocol activation */
-      LmhpComplianceTxProcess();
+        return;
     }
-  }
-  else
-  {
-    /* Parse compliance test protocol */
-    ComplianceTestState.State = mcpsIndication->Buffer[0];
-    switch (ComplianceTestState.State)
-    {
-      case 0: /* Check compliance test disable command (ii) */
-      {
-        MibRequestConfirm_t mibReq;
 
-        TimerStop(&ComplianceTxNextPacketTimer);
+    if( ComplianceTestState.IsRunning == false )
+    {
+        return;
+    }
 
-        /* Disable compliance test mode and reset the downlink counter. */
-        ComplianceTestState.DownLinkCounter = 0;
-        ComplianceTestState.IsRunning = false;
+    if( mlmeConfirm->MlmeRequest == MLME_LINK_CHECK )
+    {
+        ComplianceTestState.LinkCheck = true;
+        ComplianceTestState.DemodMargin = mlmeConfirm->DemodMargin;
+        ComplianceTestState.NbGateways = mlmeConfirm->NbGateways;
+    }
+}
 
-        /* Restore previous ADR seeting */
-        mibReq.Type = MIB_ADR;
-        mibReq.Param.AdrEnable = LmhpComplianceParams->AdrEnabled;
-        LoRaMacMibSetRequestConfirm(&mibReq);
+static LmHandlerErrorStatus_t LmhpComplianceTxProcess( void )
+{
+    if( ComplianceTestState.Initialized == false )
+    {
+        return LORAMAC_HANDLER_ERROR;
+    }
 
-        /* Enable duty cycle enforcement */
-        LoRaMacTestSetDutyCycleOn(LmhpComplianceParams->DutyCycleEnabled);
+    if( ComplianceTestState.IsRunning == false )
+    {
+        return LORAMAC_HANDLER_SUCCESS;
+    }
 
-        /* Restart peripherals */
-        if (LmhpComplianceParams->StartPeripherals != NULL)
-        {
-          LmhpComplianceParams->StartPeripherals();
-        }
-      }
-      break;
-      case 1: /* (iii, iv) */
-        ComplianceTestState.DataBufferSize = 2;
-        break;
-      case 2: /* Enable confirmed messages (v) */
-        ComplianceTestState.IsTxConfirmed = true;
-        ComplianceTestState.State = 1;
-        break;
-      case 3:  /* Disable confirmed messages (vi) */
-        ComplianceTestState.IsTxConfirmed = false;
+    if( ComplianceTestState.LinkCheck == true )
+    {
+        ComplianceTestState.LinkCheck = false;
+        ComplianceTestState.DataBufferSize = 3;
+        ComplianceTestState.DataBuffer[0] = 5;
+        ComplianceTestState.DataBuffer[1] = ComplianceTestState.DemodMargin;
+        ComplianceTestState.DataBuffer[2] = ComplianceTestState.NbGateways;
         ComplianceTestState.State = 1;
-        break;
-      case 4: /* (vii) */
-        ComplianceTestState.DataBufferSize = mcpsIndication->BufferSize;
-
-        ComplianceTestState.DataBuffer[0] = 4;
-        for (uint8_t i = 1; i < MIN(ComplianceTestState.DataBufferSize, ComplianceTestState.DataBufferMaxSize); i++)
+    }
+    else
+    {
+        switch( ComplianceTestState.State )
         {
-          ComplianceTestState.DataBuffer[i] = mcpsIndication->Buffer[i] + 1;
+        case 4:
+            ComplianceTestState.State = 1;
+            break;
+        case 1:
+            ComplianceTestState.DataBufferSize = 2;
+            ComplianceTestState.DataBuffer[0] = ComplianceTestState.DownLinkCounter >> 8;
+            ComplianceTestState.DataBuffer[1] = ComplianceTestState.DownLinkCounter;
+            break;
         }
-        break;
-      case 5: /* (viii) */
-      {
-        MlmeReq_t mlmeReq;
+    }
 
-        mlmeReq.Type = MLME_LINK_CHECK;
+    LmHandlerAppData_t appData =
+    {
+        .Buffer = ComplianceTestState.DataBuffer,
+        .BufferSize = ComplianceTestState.DataBufferSize,
+        .Port = COMPLIANCE_PORT
+    };
 
-        LoRaMacMlmeRequest(&mlmeReq);
-      }
-      break;
-      case 6: /* (ix) */
-      {
-        MibRequestConfirm_t mibReq;
+    // Schedule next transmission
+    TimerStart( &ComplianceTxNextPacketTimer );
 
-        TimerStop(&ComplianceTxNextPacketTimer);
+    return LmhpCompliancePackage.OnSendRequest( &appData, ( LmHandlerMsgTypes_t )ComplianceTestState.IsTxConfirmed, NULL, true );
+}
 
-        /* Disable TestMode and revert back to normal operation */
-        /* Disable compliance test mode and reset the downlink counter. */
-        ComplianceTestState.DownLinkCounter = 0;
-        ComplianceTestState.IsRunning = false;
+static void LmhpComplianceOnMcpsIndication( McpsIndication_t* mcpsIndication )
+{
+    if( ComplianceTestState.Initialized == false )
+    {
+        return;
+    }
 
-        /* Restore previous ADR seeting */
-        mibReq.Type = MIB_ADR;
-        mibReq.Param.AdrEnable = LmhpComplianceParams->AdrEnabled;
-        LoRaMacMibSetRequestConfirm(&mibReq);
+    if( mcpsIndication->RxData == false )
+    {
+        return;
+    }
 
-        /* Enable duty cycle enforcement */
-        LoRaMacTestSetDutyCycleOn(LmhpComplianceParams->DutyCycleEnabled);
+    if ((ComplianceTestState.IsRunning == true) &&
+        (mcpsIndication->AckReceived == 0))
+    {
+        /* Increment the compliance certification protocol downlink counter */
+        ComplianceTestState.DownLinkCounter++;
+    }
 
-        /* Restart peripherals */
-        if (LmhpComplianceParams->StartPeripherals != NULL)
-        {
-          LmhpComplianceParams->StartPeripherals();
-        }
+    if( mcpsIndication->Port != COMPLIANCE_PORT )
+    {
+        return;
+    }
 
-        LmhpCompliancePackage.OnJoinRequest(ACTIVATION_TYPE_OTAA);
-      }
-      break;
-      case 7: /* (x) */
-      {
-        MlmeReq_t mlmeReq;
-        if (mcpsIndication->BufferSize == 3)
+    if( ComplianceTestState.IsRunning == false )
+    {
+        // Check compliance test enable command (i)
+        if( ( mcpsIndication->BufferSize == 4 ) &&
+            ( mcpsIndication->Buffer[0] == 0x01 ) &&
+            ( mcpsIndication->Buffer[1] == 0x01 ) &&
+            ( mcpsIndication->Buffer[2] == 0x01 ) &&
+            ( mcpsIndication->Buffer[3] == 0x01 ) )
         {
-          mlmeReq.Type = MLME_TXCW;
-          mlmeReq.Req.TxCw.Timeout = (uint16_t)((mcpsIndication->Buffer[1] << 8) | mcpsIndication->Buffer[2]);
+            MibRequestConfirm_t mibReq;
+
+            // Initialize compliance test mode context
+            ComplianceTestState.IsTxConfirmed = false;
+            ComplianceTestState.Port = 224;
+            ComplianceTestState.DataBufferSize = 2;
+            ComplianceTestState.DownLinkCounter = 0;
+            ComplianceTestState.LinkCheck = false;
+            ComplianceTestState.DemodMargin = 0;
+            ComplianceTestState.NbGateways = 0;
+            ComplianceTestState.IsRunning = true;
+            ComplianceTestState.State = 1;
+
+            // Enable ADR while in compliance test mode
+            mibReq.Type = MIB_ADR;
+            mibReq.Param.AdrEnable = true;
+            LoRaMacMibSetRequestConfirm( &mibReq );
+
+            // Disable duty cycle enforcement while in compliance test mode
+            LoRaMacTestSetDutyCycleOn( false );
+
+            // Stop peripherals
+            if( LmhpComplianceParams->StopPeripherals != NULL )
+            {
+                LmhpComplianceParams->StopPeripherals( );
+            }
+            // Initialize compliance protocol transmission timer
+            TimerInit( &ComplianceTxNextPacketTimer, OnComplianceTxNextPacketTimerEvent );
+            TimerSetValue( &ComplianceTxNextPacketTimer, COMPLIANCE_TX_DUTYCYCLE );
+
+            // Confirm compliance test protocol activation
+            LmhpComplianceTxProcess( );
         }
-        else if (mcpsIndication->BufferSize == 7)
+    }
+    else
+    {
+
+        // Parse compliance test protocol
+        ComplianceTestState.State = mcpsIndication->Buffer[0];
+        switch( ComplianceTestState.State )
         {
-          mlmeReq.Type = MLME_TXCW_1;
-          mlmeReq.Req.TxCw.Timeout = (uint16_t)((mcpsIndication->Buffer[1] << 8) | mcpsIndication->Buffer[2]);
-          mlmeReq.Req.TxCw.Frequency = (uint32_t)((mcpsIndication->Buffer[3] << 16) | (mcpsIndication->Buffer[4] << 8) | mcpsIndication->Buffer[5]) * 100;
-          mlmeReq.Req.TxCw.Power = mcpsIndication->Buffer[6];
+        case 0: // Check compliance test disable command (ii)
+            {
+                MibRequestConfirm_t mibReq;
+
+                TimerStop( &ComplianceTxNextPacketTimer );
+
+                // Disable compliance test mode and reset the downlink counter.
+                ComplianceTestState.DownLinkCounter = 0;
+                ComplianceTestState.IsRunning = false;
+
+                // Restore previous ADR seeting
+                mibReq.Type = MIB_ADR;
+                mibReq.Param.AdrEnable = LmhpComplianceParams->AdrEnabled;
+                LoRaMacMibSetRequestConfirm( &mibReq );
+
+                // Enable duty cycle enforcement
+                LoRaMacTestSetDutyCycleOn( LmhpComplianceParams->DutyCycleEnabled );
+
+                // Restart peripherals
+                if( LmhpComplianceParams->StartPeripherals != NULL )
+                {
+                    LmhpComplianceParams->StartPeripherals( );
+                }
+            }
+            break;
+        case 1: // (iii, iv)
+            ComplianceTestState.DataBufferSize = 2;
+            break;
+        case 2: // Enable confirmed messages (v)
+            ComplianceTestState.IsTxConfirmed = true;
+            ComplianceTestState.State = 1;
+            break;
+        case 3:  // Disable confirmed messages (vi)
+            ComplianceTestState.IsTxConfirmed = false;
+            ComplianceTestState.State = 1;
+            break;
+        case 4: // (vii)
+            ComplianceTestState.DataBufferSize = mcpsIndication->BufferSize;
+
+            ComplianceTestState.DataBuffer[0] = 4;
+            for( uint8_t i = 1; i < MIN( ComplianceTestState.DataBufferSize, ComplianceTestState.DataBufferMaxSize ); i++ )
+            {
+                ComplianceTestState.DataBuffer[i] = mcpsIndication->Buffer[i] + 1;
+            }
+            break;
+        case 5: // (viii)
+            {
+                MlmeReq_t mlmeReq;
+
+                mlmeReq.Type = MLME_LINK_CHECK;
+
+                LoRaMacMlmeRequest( &mlmeReq );
+            }
+            break;
+        case 6: // (ix)
+            {
+                MibRequestConfirm_t mibReq;
+
+                TimerStop(&ComplianceTxNextPacketTimer);
+
+                // Disable TestMode and revert back to normal operation
+                // Disable compliance test mode and reset the downlink counter.
+                ComplianceTestState.DownLinkCounter = 0;
+                ComplianceTestState.IsRunning = false;
+
+                // Restore previous ADR seeting
+                mibReq.Type = MIB_ADR;
+                mibReq.Param.AdrEnable = LmhpComplianceParams->AdrEnabled;
+                LoRaMacMibSetRequestConfirm( &mibReq );
+
+                // Enable duty cycle enforcement
+                LoRaMacTestSetDutyCycleOn( LmhpComplianceParams->DutyCycleEnabled );
+
+                // Restart peripherals
+                if( LmhpComplianceParams->StartPeripherals != NULL )
+                {
+                    LmhpComplianceParams->StartPeripherals( );
+                }
+
+                LmhpCompliancePackage.OnJoinRequest( ACTIVATION_TYPE_OTAA );
+            }
+            break;
+        case 7: // (x)
+            {
+                MlmeReq_t mlmeReq;
+                if( mcpsIndication->BufferSize == 3 )
+                {
+                    mlmeReq.Type = MLME_TXCW;
+                    mlmeReq.Req.TxCw.Timeout = ( uint16_t )( ( mcpsIndication->Buffer[1] << 8 ) | mcpsIndication->Buffer[2] );
+                }
+                else if( mcpsIndication->BufferSize == 7 )
+                {
+                    mlmeReq.Type = MLME_TXCW_1;
+                    mlmeReq.Req.TxCw.Timeout = ( uint16_t )( ( mcpsIndication->Buffer[1] << 8 ) | mcpsIndication->Buffer[2] );
+                    mlmeReq.Req.TxCw.Frequency = ( uint32_t )( ( mcpsIndication->Buffer[3] << 16 ) | ( mcpsIndication->Buffer[4] << 8 ) | mcpsIndication->Buffer[5] ) * 100;
+                    mlmeReq.Req.TxCw.Power = mcpsIndication->Buffer[6];
+                }
+                LoRaMacMlmeRequest( &mlmeReq );
+                ComplianceTestState.State = 1;
+            }
+            break;
+        case 8: // Send DeviceTimeReq
+            {
+                MlmeReq_t mlmeReq;
+
+                mlmeReq.Type = MLME_DEVICE_TIME;
+
+                LoRaMacMlmeRequest( &mlmeReq );
+            }
+            break;
+        case 9: // Switch end device Class
+            {
+                MibRequestConfirm_t mibReq;
+
+                mibReq.Type = MIB_DEVICE_CLASS;
+                // CLASS_A = 0, CLASS_B = 1, CLASS_C = 2
+                mibReq.Param.Class = ( DeviceClass_t )mcpsIndication->Buffer[1];;
+                LoRaMacMibSetRequestConfirm( &mibReq );
+            }
+            break;
+        case 10: // Send PingSlotInfoReq
+            {
+                MlmeReq_t mlmeReq;
+
+                mlmeReq.Type = MLME_PING_SLOT_INFO;
+                mlmeReq.Req.PingSlotInfo.PingSlot.Value = mcpsIndication->Buffer[1];
+
+                LoRaMacMlmeRequest( &mlmeReq );
+            }
+            break;
+        default:
+            break;
         }
-        LoRaMacMlmeRequest(&mlmeReq);
-        ComplianceTestState.State = 1;
-      }
-      break;
-      case 8: /* Send DeviceTimeReq */
-      {
-        MlmeReq_t mlmeReq;
-
-        mlmeReq.Type = MLME_DEVICE_TIME;
-
-        LoRaMacMlmeRequest(&mlmeReq);
-      }
-      break;
-      case 9: /* Switch end device Class */
-      {
-        MibRequestConfirm_t mibReq;
-
-        mibReq.Type = MIB_DEVICE_CLASS;
-        /* CLASS_A = 0, CLASS_B = 1, CLASS_C = 2 */
-        mibReq.Param.Class = (DeviceClass_t)mcpsIndication->Buffer[1];;
-        LoRaMacMibSetRequestConfirm(&mibReq);
-      }
-      break;
-      case 10: /* Send PingSlotInfoReq */
-      {
-        MlmeReq_t mlmeReq;
-
-        mlmeReq.Type = MLME_PING_SLOT_INFO;
-        mlmeReq.Req.PingSlotInfo.PingSlot.Value = mcpsIndication->Buffer[1];
-
-        LoRaMacMlmeRequest(&mlmeReq);
-      }
-      break;
-      default:
-        break;
     }
-  }
 }
 
-static void LmhpComplianceProcess(void)
+static void LmhpComplianceProcess( void )
 {
-  /* Nothing to process */
+    /* Nothing to process */
 }
 
-static void OnComplianceTxNextPacketTimerEvent(void *context)
+static void OnComplianceTxNextPacketTimerEvent( void* context )
 {
-  LmhpComplianceTxProcess();
+    LmhpComplianceTxProcess( );
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.h
index a3597c36..22be453c 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.h
@@ -18,75 +18,51 @@
  *
  * \author    Miguel Luis ( Semtech )
  */
-/**
-  ******************************************************************************
-  *
-  *          Portions COPYRIGHT 2020 STMicroelectronics
-  *
-  * @file    LmhpCompliance.h
-  * @author  MCD Application Team
-  * @brief   Header for Certification Protocol Handling module
-  ******************************************************************************
- */
 #ifndef __LMHP_COMPLIANCE__
 #define __LMHP_COMPLIANCE__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
+#include "LoRaMac.h"
+#include "LmHandlerTypes.h"
 #include "LmhPackage.h"
 
-/* Exported defines ----------------------------------------------------------*/
 /*!
-  * Compliance package identifier.
-  *
-  * \remark This value must be unique amongst the packages
-  */
+ * Compliance package identifier.
+ * 
+ * \remark This value must be unique amongst the packages
+ */
 #define PACKAGE_ID_COMPLIANCE                       0
 
-/* Exported constants --------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
 /*!
-  * Compliance test protocol handler parameters
-  */
+ * Compliance test protocol handler parameters
+ */
 typedef struct LmhpComplianceParams_s
 {
-  /*!
-    * Holds the ADR state
-    */
-  bool AdrEnabled;
-  /*!
+    /*!
+     * Holds the ADR state
+     */
+    bool AdrEnabled;
+    /*!
     * LoRaWAN ETSI duty cycle control enable/disable
     *
     * \remark Please note that ETSI mandates duty cycled transmissions. Use only for test purposes
     */
-  bool DutyCycleEnabled;
-  /*!
-    * Stops unnecessary peripherals.
-    *
-    * \remark Use for the compliance tests protocol handling in order to
-    *         reduce the power consumption.
-    */
-  void (*StopPeripherals)(void);
-  /*!
-    * Starts previously stopped peripherals.
-    *
-    * \remark Use for the compliance tests protocol handling in order to
-    *         reduce the power consumption.
-    */
-  void (*StartPeripherals)(void);
-} LmhpComplianceParams_t;
-
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-LmhPackage_t *LmphCompliancePackageFactory(void);
-
+    bool DutyCycleEnabled;
+    /*!
+     * Stops unnecessary peripherals.
+     *
+     * \remark Use for the compliance tests protocol handling in order to
+     *         reduce the power consumption.
+     */
+    void ( *StopPeripherals )( void );
+    /*!
+     * Starts previously stopped peripherals.
+     *
+     * \remark Use for the compliance tests protocol handling in order to
+     *         reduce the power consumption.
+     */
+    void ( *StartPeripherals )( void );
+}LmhpComplianceParams_t;
 
-#ifdef __cplusplus
-}
-#endif
+LmhPackage_t *LmhpCompliancePackageFactory( void );
 
-#endif /* __LMHP_COMPLIANCE__ */
+#endif // __LMHP_COMPLIANCE__
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpDataDistribution.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpDataDistribution.c
deleted file mode 100644
index dc9c229a..00000000
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpDataDistribution.c
+++ /dev/null
@@ -1,391 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    LmhpDataDistribution.c
-  * @author  MCD Application Team
-  * @brief   Implements the Data Distribution Agent
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "LmhpDataDistribution.h"
-#include "LmhpClockSync.h"
-#include "LmhpRemoteMcastSetup.h"
-#include "LmhpFragmentation.h"
-#include "LmhpFirmwareManagement.h"
-#include "LmHandler.h"
-#include "mw_log_conf.h"
-#include "utilities.h"
-
-#include "flash_if.h"
-#include "se_def_metadata.h"
-
-#define SFU_FWIMG_COMMON_C
-#include "sfu_fwimg_regions.h"
-
-/* Private typedef -----------------------------------------------------------*/
-/*! 
- * Structure containing values related to the management of multi-images in Flash
- */
-typedef struct
-{
-  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
-  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
-  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
-  uint32_t  ExecutionAddr;         /*!< The execution address for the FwImage in UserFlash */
-} FwImageFlashTypeDef;
-
-/* Private define ------------------------------------------------------------*/
-/*!
- * Defines the maximum size for the buffer receiving the fragmentation result.
- *
- * \remark By default FragDecoder.h defines:
- *         \ref FRAG_MAX_NB   313
- *         \ref FRAG_MAX_SIZE 216
- *
- *         In interop test mode will be
- *         \ref FRAG_MAX_NB   21
- *         \ref FRAG_MAX_SIZE 50
- *
- *         FileSize = FRAG_MAX_NB * FRAG_MAX_SIZE
- *
- *         If bigger file size is to be received or is fragmented differently
- *         one must update those parameters.
- *
- * \remark  Memory allocation is done at compile time. Several options have to be foreseen
- *          in order to optimize the memory. Will depend of the Memory management used
- *          Could be Dynamic allocation --> malloc method
- *          Variable Length Array --> VLA method
- *          pseudo dynamic allocation --> memory pool method
- *          Other option :
- *          In place of using the caching memory method we can foreseen to have a direct
- *          flash memory copy. This solution will depend of the SBSFU constraint
- *
- */
-#define UNFRAGMENTED_DATA_SIZE                      ( FRAG_MAX_NB * FRAG_MAX_SIZE )
-
-/*!
- * Starting offset to add to the  first address
- */
-#define SFU_IMG_IMAGE_OFFSET                        ((uint32_t)512U)
-
-/*!
- * Size of header to write in Swap sector to trigger installation
- */
-#define INSTALLED_LENGTH                            ((uint32_t)512U)
-
-#define SFU_IMG_SWAP_REGION_SIZE                    ((uint32_t)(SWAP_END - SWAP_START + 1U))
-
-#define SFU_IMG_SWAP_REGION_BEGIN_VALUE             ((uint32_t)SWAP_START)
-
-#define SFU_IMG_SLOT_DWL_REGION_BEGIN_VALUE         ((uint32_t)SLOT_DWL_1_START)
-
-#define SFU_IMG_SLOT_DWL_REGION_SIZE                ((uint32_t)(SLOT_DWL_1_END - SLOT_DWL_1_START + 1U))
-
-/* Private macro -------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Init `data` buffer of `size` starting at address `addr`
-  * @param  addr Address start index to erase.
-  * @param  size number of bytes.
-  * @retval status Init operation status [0: Success, -1 Fail]
-  */
-static uint8_t FragDecoderErase(uint32_t addr, uint32_t size);
-/**
-  * @brief  Write `data` buffer of `size` starting at address `addr`
-  * @param  addr Address start index to write to.
-  * @param  data Data buffer to be written.
-  * @param  size Size of data buffer to be written.
-  * @retval status Write operation status [0: Success, -1 Fail]
-  */
-static uint8_t FragDecoderWrite(uint32_t addr, uint8_t *data, uint32_t size);
-
-/**
-  * @brief  Reads `data` buffer of `size` starting at address `addr`
-  * @param  addr Address start index to read from.
-  * @param  data Data buffer to be read.
-  * @param  size Size of data buffer to be read.
-  * @retval status Read operation status [0: Success, -1 Fail]
-  */
-static uint8_t FragDecoderRead(uint32_t addr, uint8_t *data, uint32_t size);
-
-/**
-  * @brief  Callback to get the current progress status of the fragmentation session
-  * @param  fragCounter fragment counter
-  * @param  fragNb number of fragments
-  * @param  fragSize size of fragments
-  * @param  fragNbLost number of lost fragments
-  * @retval None
-  */
-static void OnFragProgress(uint16_t fragCounter, uint16_t fragNb, uint8_t fragSize, uint16_t fragNbLost);
-
-/**
-  * @brief  Callback to notify when the fragmentation session is finished
-  * @param  status status of the fragmentation process
-  * @param  size size of the fragmented data block
-  * @retval None
-  */
-static void OnFragDone(int32_t status, uint32_t size);
-
-#if (INTEROP_TEST_MODE == 0)
-/**
-  * @brief  Run FW Update process.
-  * @param  None
-  * @retval None
-  */
-static void FwUpdateAgentRun(void);
-
-/**
-  * @brief  Provide the area descriptor to write a FW image in Flash.
-  *         This function is used by the User Application to know where to store
-  *          a new Firmware Image before asking for its installation.
-  * @param  pArea pointer to area descriptor
-  * @retval HAL_OK if successful, otherwise HAL_ERROR
-  */
-static uint32_t FwUpdateAgentGetDownloadAreaInfo(FwImageFlashTypeDef *pArea);
-
-/**
-  * @brief  Write in Flash the next header image to install.
-  *         This function is used by the User Application to request a Firmware installation (at next reboot).
-  * @param  fw_header FW header of the FW to be installed
-  * @retval HAL_OK if successful, otherwise HAL_ERROR
-  */
-static uint32_t FwUpdateAgentInstallAtNextReset(uint8_t *fw_header);
-#endif /* INTEROP_TEST_MODE == 0 */
-/* Private variables ---------------------------------------------------------*/
-static LmhpFragmentationParams_t FragmentationParams =
-{
-  .DecoderCallbacks =
-  {
-    .FragDecoderErase = FragDecoderErase,
-    .FragDecoderWrite = FragDecoderWrite,
-    .FragDecoderRead = FragDecoderRead,
-  },
-  .OnProgress = OnFragProgress,
-  .OnDone = OnFragDone
-};
-
-/*
- * Indicates if the file transfer is done
- */
-static volatile bool IsFileTransferDone = false;
-
-#if (INTEROP_TEST_MODE == 1)  /*write fragment in RAM - Caching mode*/
-/*
- * Un-fragmented data storage.
- */
-static uint8_t UnfragmentedData[UNFRAGMENTED_DATA_SIZE];
-#endif /* INTEROP_TEST_MODE == 1 */
-
-/* Exported functions ---------------------------------------------------------*/
-LmHandlerErrorStatus_t LmhpDataDistributionInit(void)
-{
-  if (LmHandlerPackageRegister(PACKAGE_ID_CLOCK_SYNC, NULL) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-  else if (LmHandlerPackageRegister(PACKAGE_ID_REMOTE_MCAST_SETUP, NULL) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-  else if (LmHandlerPackageRegister(PACKAGE_ID_FRAGMENTATION, &FragmentationParams) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-  else if (LmHandlerPackageRegister(PACKAGE_ID_FIRMWARE_MANAGEMENT, NULL) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  return LORAMAC_HANDLER_SUCCESS;
-}
-
-LmHandlerErrorStatus_t LmhpDataDistributionPackageRegister(uint8_t id, LmhPackage_t **package)
-{
-  if (package == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-  switch (id)
-  {
-    case PACKAGE_ID_CLOCK_SYNC:
-    {
-      *package = LmphClockSyncPackageFactory();
-      break;
-    }
-    case PACKAGE_ID_REMOTE_MCAST_SETUP:
-    {
-      *package = LmhpRemoteMcastSetupPackageFactory();
-      break;
-    }
-    case PACKAGE_ID_FRAGMENTATION:
-    {
-      *package = LmhpFragmentationPackageFactory();
-      break;
-    }
-    case PACKAGE_ID_FIRMWARE_MANAGEMENT:
-    {
-      *package = LmhpFirmwareManagementPackageFactory();
-      break;
-    }
-  }
-
-  return LORAMAC_HANDLER_SUCCESS;
-}
-
-/* Private  functions ---------------------------------------------------------*/
-static uint8_t FragDecoderErase(uint32_t addr, uint32_t size)
-{
-#if (INTEROP_TEST_MODE == 1)
-  for (uint32_t i = 0; i < size; i++)
-  {
-    UnfragmentedData[addr + i] = 0xFF;
-  }
-#else /* INTEROP_TEST_MODE == 0 */
-  if (FLASH_Erase((void *)(SlotStartAdd[SLOT_DWL_1] + addr), size) != HAL_OK)
-  {
-    return -1;
-  }
-#endif /* INTEROP_TEST_MODE */
-  return 0; /* Success */
-}
-
-static uint8_t FragDecoderWrite(uint32_t addr, uint8_t *data, uint32_t size)
-{
-  if (size >= UNFRAGMENTED_DATA_SIZE)
-  {
-    return (uint8_t) - 1; /* Fail */
-  }
-#if (INTEROP_TEST_MODE == 1)  /*write fragment in RAM - Caching mode*/
-  for (uint32_t i = 0; i < size; i++)
-  {
-    UnfragmentedData[addr + i] = data[i];
-  }
-#else /* INTEROP_TEST_MODE == 0 */
-  if (FLASH_Write(SlotStartAdd[SLOT_DWL_1] + addr, data, size) != HAL_OK)
-  {
-    return -1;
-  }
-#endif /* INTEROP_TEST_MODE */
-
-  return 0; /* Success */
-}
-
-static uint8_t FragDecoderRead(uint32_t addr, uint8_t *data, uint32_t size)
-{
-  if (size >= UNFRAGMENTED_DATA_SIZE)
-  {
-    return (uint8_t) - 1; /* Fail */
-  }
-
-#if (INTEROP_TEST_MODE == 1)   /*Read fragment in RAM - Caching mode*/
-  for (uint32_t i = 0; i < size; i++)
-  {
-    data[i] = UnfragmentedData[addr + i];
-  }
-#else /* INTEROP_TEST_MODE == 0 */
-  if (FLASH_Read((void *)(SlotStartAdd[SLOT_DWL_1] + addr), data, size) != HAL_OK)
-  {
-    return -1;
-  }
-#endif /* INTEROP_TEST_MODE */
-
-  return 0; /* Success */
-}
-
-static void OnFragProgress(uint16_t fragCounter, uint16_t fragNb, uint8_t fragSize, uint16_t fragNbLost)
-{
-#if (INTEROP_TEST_MODE == 1)
-  /* BSP_LED_On(LED_BLUE); */
-  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_15, GPIO_PIN_SET);
-#endif /* INTEROP_TEST_MODE == 1 */
-
-  MW_LOG(TS_OFF, VLEVEL_M, "\r\n....... FRAG_DECODER in Progress .......\r\n");
-  MW_LOG(TS_OFF, VLEVEL_M, "RECEIVED    : %5d / %5d Fragments\r\n", fragCounter, fragNb);
-  MW_LOG(TS_OFF, VLEVEL_M, "              %5d / %5d Bytes\r\n", fragCounter * fragSize, fragNb * fragSize);
-  MW_LOG(TS_OFF, VLEVEL_M, "LOST        :       %7d Fragments\r\n\r\n", fragNbLost);
-}
-
-static void OnFragDone(int32_t status, uint32_t size)
-{
-  IsFileTransferDone = true;
-#if (INTEROP_TEST_MODE == 0)
-  /* Do a request to Run the Secure boot - The file is already in flash */
-  FwUpdateAgentRun();
-#else
-  /* BSP_LED_Off(LED_BLUE); */
-  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_15, GPIO_PIN_RESET);
-#endif /* INTEROP_TEST_MODE == 1 */
-  MW_LOG(TS_OFF, VLEVEL_M, "\r\n....... FRAG_DECODER Finished .......\r\n");
-  MW_LOG(TS_OFF, VLEVEL_M, "STATUS      : %d\r\n", status);
-}
-
-#if (INTEROP_TEST_MODE == 0)
-static void FwUpdateAgentRun(void)
-{
-  HAL_StatusTypeDef ret = HAL_ERROR;
-  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
-  FwImageFlashTypeDef fw_image_dwl_area;
-
-  /* Get Info about the download area */
-  if (FwUpdateAgentGetDownloadAreaInfo(&fw_image_dwl_area) != HAL_ERROR)
-  {
-    /* Read header in slot 1 */
-    ret = FLASH_Read(fw_header_dwl_slot, (void *) fw_image_dwl_area.DownloadAddr, SE_FW_HEADER_TOT_LEN);
-
-    /* Ask for installation at next reset */
-    (void)FwUpdateAgentInstallAtNextReset((uint8_t *) fw_header_dwl_slot);
-
-    /* System Reboot*/
-    NVIC_SystemReset();
-  }
-  if (ret != HAL_OK)
-  {
-    MW_LOG(TS_OFF, VLEVEL_M, "  --  Operation Failed  \r\n");
-  }
-}
-
-static uint32_t FwUpdateAgentGetDownloadAreaInfo(FwImageFlashTypeDef *pArea)
-{
-  uint32_t ret;
-  if (pArea != NULL)
-  {
-    pArea->DownloadAddr = SFU_IMG_SLOT_DWL_REGION_BEGIN_VALUE;
-    pArea->MaxSizeInBytes = (uint32_t)SFU_IMG_SLOT_DWL_REGION_SIZE;
-    pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
-    ret =  HAL_OK;
-  }
-  else
-  {
-    ret = HAL_ERROR;
-  }
-  return ret;
-}
-
-static uint32_t FwUpdateAgentInstallAtNextReset(uint8_t *pfw_header)
-{
-  uint32_t ret = HAL_OK;
-
-  if (pfw_header == NULL)
-  {
-    return HAL_ERROR;
-  }
-
-  ret = FLASH_Erase((void *) SFU_IMG_SWAP_REGION_BEGIN_VALUE, SFU_IMG_IMAGE_OFFSET);
-  if (ret == HAL_OK)
-  {
-    ret = FLASH_Write(SFU_IMG_SWAP_REGION_BEGIN_VALUE, pfw_header, SE_FW_HEADER_TOT_LEN);
-  }
-  return ret;
-}
-#endif /* INTEROP_TEST_MODE == 0 */
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpDataDistribution.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpDataDistribution.h
deleted file mode 100644
index 9d259e3c..00000000
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpDataDistribution.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    LmhpDataDistribution.h
-  * @author  MCD Application Team
-  * @brief   Function prototypes for LoRaMac Data distribution agent
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-#ifndef __LMHP_DATA_DISTRIBUTION_H__
-#define __LMHP_DATA_DISTRIBUTION_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "LmhPackage.h"
-
-/* Exported defines ----------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-LmHandlerErrorStatus_t LmhpDataDistributionInit(void);
-
-LmHandlerErrorStatus_t LmhpDataDistributionPackageRegister(uint8_t id, LmhPackage_t **package);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __LMHP_DATA_DISTRIBUTION_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFirmwareManagement.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFirmwareManagement.c
index 70e48a58..03b04bf1 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFirmwareManagement.c
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFirmwareManagement.c
@@ -17,6 +17,7 @@
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
+#include "platform.h"
 #include "LmHandler.h"
 #include "LmhpFirmwareManagement.h"
 #include "mw_log_conf.h"  /* needed for MW_LOG */
@@ -131,6 +132,7 @@ static LmhPackage_t LmhpFirmwareManagementPackage =
   .OnJoinRequest =              NULL,                              /* To be initialized by LmHandler */
   .OnSendRequest =              NULL,                              /* To be initialized by LmHandler */
   .OnDeviceTimeRequest =        NULL,                              /* To be initialized by LmHandler */
+  .OnPackageProcessEvent =      NULL,                              /* To be initialized by LmHandler */
 };
 
 /*!
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.c
index 6d06f9e7..6c7b3107 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.c
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.c
@@ -1,24 +1,24 @@
 /*!
-  * \file      LmhpFragmentation.c
-  *
-  * \brief     Implements the LoRa-Alliance fragmented data block transport package
-  *            Specification: https://lora-alliance.org/sites/default/files/2018-09/fragmented_data_block_transport_v1.0.0.pdf
-  *
-  * \copyright Revised BSD License, see section \ref LICENSE.
-  *
-  * \code
-  *                ______                              _
-  *               / _____)             _              | |
-  *              ( (____  _____ ____ _| |_ _____  ____| |__
-  *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
-  *               _____) ) ____| | | || |_| ____( (___| | | |
-  *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
-  *              (C)2013-2018 Semtech
-  *
-  * \endcode
-  *
-  * \author    Miguel Luis ( Semtech )
-  */
+ * \file      LmhpFragmentation.c
+ *
+ * \brief     Implements the LoRa-Alliance fragmented data block transport package
+ *            Specification: https://lora-alliance.org/sites/default/files/2018-09/fragmented_data_block_transport_v1.0.0.pdf
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2018 Semtech
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ */
 /**
   ******************************************************************************
   *
@@ -26,126 +26,88 @@
   *
   * @file    LmhpFragmentation.c
   * @author  MCD Application Team
-  * @brief   Fragmentation Data Block Transport Package definition
+  * @brief   Implements the LoRa-Alliance fragmented data block transport package
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
 #include "LmHandler.h"
 #include "LmhpFragmentation.h"
+#include "FragDecoder.h"
+#include "frag_decoder_if.h"
 #include "utilities.h"
 
-/* Private typedef -----------------------------------------------------------*/
-/* Fragmentation Tx delay state */
+/*!
+ * LoRaWAN Application Layer Fragmented Data Block Transport Specification
+ */
+#define FRAGMENTATION_PORT                          201
+
+#define FRAGMENTATION_ID                            3
+#define FRAGMENTATION_VERSION                       1
+
+#define FRAGMENTATION_MAX_SESSIONS                  4
+
+// Fragmentation Tx delay state
 typedef enum LmhpFragmentationTxDelayStates_e
 {
-  /* Tx delay in idle state */
-  FRAGMENTATION_TX_DELAY_STATE_IDLE,
-  /* Tx delay to be started */
-  FRAGMENTATION_TX_DELAY_STATE_START,
-  /* Tx is in pending */
-  FRAGMENTATION_TX_DELAY_STATE_PENDING,
-} LmhpFragmentationTxDelayStates_t;
+    // Tx delay in idle state.
+    FRAGMENTATION_TX_DELAY_STATE_IDLE,
+    // Tx delay to be started.
+    FRAGMENTATION_TX_DELAY_STATE_START,
+    // Tx is in pending
+    FRAGMENTATION_TX_DELAY_STATE_PENDING,
+}LmhpFragmentationTxDelayStates_t;
 
 /*!
  * Package current context
  */
 typedef struct LmhpFragmentationState_s
 {
-  bool Initialized;
-  bool IsRunning;
-  LmhpFragmentationTxDelayStates_t TxDelayState;
-  uint8_t DataBufferMaxSize;
-  uint8_t *DataBuffer;
-  uint8_t *file;
-} LmhpFragmentationState_t;
+    bool Initialized;
+    bool IsRunning;
+    LmhpFragmentationTxDelayStates_t TxDelayState;
+    uint8_t DataBufferMaxSize;
+    uint8_t *DataBuffer;
+    uint8_t *file;
+}LmhpFragmentationState_t;
 
 typedef enum LmhpFragmentationMoteCmd_e
 {
-  FRAGMENTATION_PKG_VERSION_ANS         = 0x00,
-  FRAGMENTATION_FRAG_STATUS_ANS         = 0x01,
-  FRAGMENTATION_FRAG_SESSION_SETUP_ANS  = 0x02,
-  FRAGMENTATION_FRAG_SESSION_DELETE_ANS = 0x03,
-} LmhpFragmentationMoteCmd_t;
+    FRAGMENTATION_PKG_VERSION_ANS         = 0x00,
+    FRAGMENTATION_FRAG_STATUS_ANS         = 0x01,
+    FRAGMENTATION_FRAG_SESSION_SETUP_ANS  = 0x02,
+    FRAGMENTATION_FRAG_SESSION_DELETE_ANS = 0x03,
+}LmhpFragmentationMoteCmd_t;
 
 typedef enum LmhpFragmentationSrvCmd_e
 {
-  FRAGMENTATION_PKG_VERSION_REQ         = 0x00,
-  FRAGMENTATION_FRAG_STATUS_REQ         = 0x01,
-  FRAGMENTATION_FRAG_SESSION_SETUP_REQ  = 0x02,
-  FRAGMENTATION_FRAG_SESSION_DELETE_REQ = 0x03,
-  FRAGMENTATION_DATA_FRAGMENT           = 0x08,
-} LmhpFragmentationSrvCmd_t;
-
-typedef struct FragGroupData_s
-{
-  bool IsActive;
-  union
-  {
-    uint8_t Value;
-    struct
-    {
-      uint8_t McGroupBitMask:   4;
-      uint8_t FragIndex:        2;
-      uint8_t RFU:              2;
-    } Fields;
-  } FragSession;
-  uint16_t FragNb;
-  uint8_t FragSize;
-  union
-  {
-    uint8_t Value;
-    struct
-    {
-      uint8_t BlockAckDelay:    3;
-      uint8_t FragAlgo:         3;
-      uint8_t RFU:              2;
-    } Fields;
-  } Control;
-  uint8_t Padding;
-  uint32_t Descriptor;
-} FragGroupData_t;
-
-typedef struct FragSessionData_s
-{
-  FragGroupData_t FragGroupData;
-  FragDecoderStatus_t FragDecoderStatus;
-  int32_t FragDecoderProcessStatus;
-} FragSessionData_t;
-
-/* Private define ------------------------------------------------------------*/
-/*!
- * LoRaWAN Application Layer Fragmented Data Block Transport Specification
- */
-#define FRAGMENTATION_PORT                          201
+    FRAGMENTATION_PKG_VERSION_REQ         = 0x00,
+    FRAGMENTATION_FRAG_STATUS_REQ         = 0x01,
+    FRAGMENTATION_FRAG_SESSION_SETUP_REQ  = 0x02,
+    FRAGMENTATION_FRAG_SESSION_DELETE_REQ = 0x03,
+    FRAGMENTATION_DATA_FRAGMENT           = 0x08,
+}LmhpFragmentationSrvCmd_t;
 
-#define FRAGMENTATION_ID                            3
-#define FRAGMENTATION_VERSION                       1
-
-#define FRAGMENTATION_MAX_SESSIONS                  4
-
-/* Private macro -------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
 /*!
- * \brief Callback function for Fragment delay timer.
+ * LoRaWAN fragmented data block transport handler parameters
  */
-static void OnFragmentTxDelay(void *context);
+static LmhpFragmentationParams_t* LmhpFragmentationParams;
 
 /*!
  * Initializes the package with provided parameters
  *
- * \param [in] params            Pointer to the package parameters
- * \param [in] dataBuffer        Pointer to main application buffer
- * \param [in] dataBufferMaxSize Main application buffer maximum size
+ * \param [IN] params            Pointer to the package parameters
+ * \param [IN] dataBuffer        Pointer to main application buffer
+ * \param [IN] dataBufferMaxSize Main application buffer maximum size
  */
-static void LmhpFragmentationInit(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize);
+static void LmhpFragmentationInit( void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize );
 
 /*!
-* Returns the current package initialization status.
-*
-* \retval status Package initialization status
-*                [true: Initialized, false: Not initialized]
-*/
-static bool LmhpFragmentationIsInitialized(void);
+ * Returns the current package initialization status.
+ *
+ * \retval status Package initialization status
+ *                [true: Initialized, false: Not initialized]
+ */
+static bool LmhpFragmentationIsInitialized( void );
 
 /*!
  * Returns the package operation status.
@@ -153,387 +115,437 @@ static bool LmhpFragmentationIsInitialized(void);
  * \retval status Package operation status
  *                [true: Running, false: Not running]
  */
-static bool LmhpFragmentationIsRunning(void);
+static bool LmhpFragmentationIsRunning( void );
 
 /*!
  * Processes the internal package events.
  */
-static void LmhpFragmentationProcess(void);
+static void LmhpFragmentationProcess( void );
 
 /*!
  * Processes the MCPS Indication
  *
- * \param [in] mcpsIndication     MCPS indication primitive data
+ * \param [IN] mcpsIndication     MCPS indication primitive data
  */
-static void LmhpFragmentationOnMcpsIndication(McpsIndication_t *mcpsIndication);
+static void LmhpFragmentationOnMcpsIndication( McpsIndication_t *mcpsIndication );
 
-/* Private variables ---------------------------------------------------------*/
 /*!
- * LoRaWAN fragmented data block transport handler parameters
+ * \brief Callback function for Fragment delay timer.
  */
-static LmhpFragmentationParams_t *LmhpFragmentationParams;
+static void OnFragmentTxDelay(void *context);
 
 static LmhpFragmentationState_t LmhpFragmentationState =
 {
-  .Initialized =  false,
-  .IsRunning =    false,
-  .TxDelayState = FRAGMENTATION_TX_DELAY_STATE_IDLE,
+    .Initialized = false,
+    .IsRunning = false,
+    .TxDelayState = FRAGMENTATION_TX_DELAY_STATE_IDLE,
 };
 
+typedef struct FragGroupData_s
+{
+    bool IsActive;
+    union
+    {
+        uint8_t Value;
+        struct
+        {
+            uint8_t McGroupBitMask:   4;
+            uint8_t FragIndex:        2;
+            uint8_t RFU:              2;
+        }Fields;
+    }FragSession;
+    uint16_t FragNb;
+    uint8_t FragSize;
+    union
+    {
+        uint8_t Value;
+        struct
+        {
+            uint8_t BlockAckDelay:    3;
+            uint8_t FragAlgo:         3;
+            uint8_t RFU:              2;
+        }Fields;
+    }Control;
+    uint8_t Padding;
+    uint32_t Descriptor;
+}FragGroupData_t;
+
+typedef struct FragSessionData_s
+{
+    FragGroupData_t FragGroupData;
+    FragDecoderStatus_t FragDecoderStatus;
+  int32_t FragDecoderProcessStatus;
+}FragSessionData_t;
+
 static FragSessionData_t FragSessionData[FRAGMENTATION_MAX_SESSIONS];
 
-/* Answer struct for the commands. */
+// Answer struct for the commands.
 LmHandlerAppData_t DelayedReplyAppData;
 
 static LmhPackage_t LmhpFragmentationPackage =
 {
-  .Port =                       FRAGMENTATION_PORT,
-  .Init =                       LmhpFragmentationInit,
-  .IsInitialized =              LmhpFragmentationIsInitialized,
-  .IsRunning =                  LmhpFragmentationIsRunning,
-  .Process =                    LmhpFragmentationProcess,
-  .OnMcpsConfirmProcess =       NULL,                              /* Not used in this package */
-  .OnMcpsIndicationProcess =    LmhpFragmentationOnMcpsIndication,
-  .OnMlmeConfirmProcess =       NULL,                              /* Not used in this package */
-  .OnJoinRequest =              NULL,                              /* To be initialized by LmHandler */
-  .OnSendRequest =              NULL,                              /* To be initialized by LmHandler */
-  .OnDeviceTimeRequest =        NULL,                              /* To be initialized by LmHandler */
+    .Port = FRAGMENTATION_PORT,
+    .Init = LmhpFragmentationInit,
+    .IsInitialized = LmhpFragmentationIsInitialized,
+    .IsRunning = LmhpFragmentationIsRunning,
+    .Process = LmhpFragmentationProcess,
+    .OnMcpsConfirmProcess = NULL,                              // Not used in this package
+    .OnMcpsIndicationProcess = LmhpFragmentationOnMcpsIndication,
+    .OnMlmeConfirmProcess = NULL,                              // Not used in this package
+    .OnJoinRequest = NULL,                                     // To be initialized by LmHandler
+    .OnSendRequest = NULL,                                     // To be initialized by LmHandler
+    .OnDeviceTimeRequest = NULL,                               // To be initialized by LmHandler
+    .OnSysTimeUpdate = NULL,                                   // To be initialized by LmHandler
+    .OnPackageProcessEvent = NULL,                             // To be initialized by LmHandler
 };
 
-/* Delay value. */
+// Delay value.
 static uint32_t TxDelayTime;
 
-/* Fragment Delay Timer struct */
+// Fragment Delay Timer struct
 static TimerEvent_t FragmentTxDelayTimer;
-/* Exported functions ---------------------------------------------------------*/
-LmhPackage_t *LmhpFragmentationPackageFactory(void)
-{
-  return &LmhpFragmentationPackage;
-}
 
-/* Private  functions ---------------------------------------------------------*/
-static void OnFragmentTxDelay(void *context)
+/*!
+ * \brief Callback function for Fragment delay timer.
+ */
+static void OnFragmentTxDelay( void* context )
 {
-  /* Stop the timer. */
-  TimerStop(&FragmentTxDelayTimer);
-  /* Set the state. */
-  LmhpFragmentationState.TxDelayState = FRAGMENTATION_TX_DELAY_STATE_PENDING;
+    // Stop the timer.
+    TimerStop( &FragmentTxDelayTimer );
+    // Set the state.
+    LmhpFragmentationState.TxDelayState = FRAGMENTATION_TX_DELAY_STATE_PENDING;
+    LmhpFragmentationPackage.OnPackageProcessEvent();
 }
 
-static void LmhpFragmentationInit(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize)
+LmhPackage_t *LmhpFragmentationPackageFactory( void )
 {
-  if ((params != NULL) && (dataBuffer != NULL))
-  {
-    LmhpFragmentationParams = (LmhpFragmentationParams_t *)params;
-    LmhpFragmentationState.DataBuffer = dataBuffer;
-    LmhpFragmentationState.DataBufferMaxSize = dataBufferMaxSize;
-    LmhpFragmentationState.Initialized = true;
-    LmhpFragmentationState.IsRunning = true;
-    /* Initialize Fragmentation delay time. */
-    TxDelayTime = 0;
-    /* Initialize Fragmentation delay timer. */
-    TimerInit(&FragmentTxDelayTimer, OnFragmentTxDelay);
-  }
-  else
-  {
-    LmhpFragmentationParams = NULL;
-    LmhpFragmentationState.IsRunning = false;
-    LmhpFragmentationState.Initialized = false;
-  }
-
-  /* initialize the global fragmentation session buffer */
-  UTIL_MEM_set_8(FragSessionData, 0, sizeof(FragSessionData));
+    return &LmhpFragmentationPackage;
 }
 
-static bool LmhpFragmentationIsInitialized(void)
+uint8_t LmhpFragmentationGetPackageVersion(void)
 {
-  return LmhpFragmentationState.Initialized;
+  return (uint8_t)FRAGMENTATION_VERSION;
 }
 
-static bool LmhpFragmentationIsRunning(void)
+static void LmhpFragmentationInit( void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize )
 {
-  if (LmhpFragmentationState.Initialized == false)
-  {
-    return false;
-  }
+    if( ( params != NULL ) && ( dataBuffer != NULL ) )
+    {
+        LmhpFragmentationParams = ( LmhpFragmentationParams_t* )params;
+        LmhpFragmentationState.DataBuffer = dataBuffer;
+        LmhpFragmentationState.DataBufferMaxSize = dataBufferMaxSize;
+        LmhpFragmentationState.Initialized = true;
+        LmhpFragmentationState.IsRunning = true;
+        // Initialize Fragmentation delay time.
+        TxDelayTime = 0;
+        // Initialize Fragmentation delay timer.
+        TimerInit( &FragmentTxDelayTimer, OnFragmentTxDelay );
+    }
+    else
+    {
+        LmhpFragmentationParams = NULL;
+        LmhpFragmentationState.IsRunning = false;
+        LmhpFragmentationState.Initialized = false;
+    }
 
-  return LmhpFragmentationState.IsRunning;
+    /* initialize the global fragmentation session buffer */
+    UTIL_MEM_set_8( FragSessionData, 0, sizeof(FragSessionData) );
 }
 
-static void LmhpFragmentationProcess(void)
+static bool LmhpFragmentationIsInitialized( void )
 {
-  LmhpFragmentationTxDelayStates_t delayTimerState;
-  TimerTime_t nextTxIn = 0;
-
-  CRITICAL_SECTION_BEGIN();
-  delayTimerState = LmhpFragmentationState.TxDelayState;
-  CRITICAL_SECTION_END();
-
-  switch (delayTimerState)
-  {
-    case FRAGMENTATION_TX_DELAY_STATE_START:
-      /* Set the timer with the initially calculated Delay value. */
-      TimerSetValue(&FragmentTxDelayTimer, TxDelayTime);
-      /* Start the timer. */
-      TimerStart(&FragmentTxDelayTimer);
-      break;
-    case FRAGMENTATION_TX_DELAY_STATE_PENDING:
-      /* Send the reply. */
-      if (LmhpFragmentationPackage.OnSendRequest(&DelayedReplyAppData, LORAMAC_HANDLER_UNCONFIRMED_MSG, &nextTxIn,
-                                                 true) == LORAMAC_HANDLER_SUCCESS)
-      {
-        LmhpFragmentationState.TxDelayState = FRAGMENTATION_TX_DELAY_STATE_IDLE;
-      }
-      break;
-    case FRAGMENTATION_TX_DELAY_STATE_IDLE:
-    /* Intentional fall through */
-    default:
-      /* Nothing to do. */
-      break;
-  }
+    return LmhpFragmentationState.Initialized;
 }
 
-static void LmhpFragmentationOnMcpsIndication(McpsIndication_t *mcpsIndication)
+static bool LmhpFragmentationIsRunning( void )
 {
-  uint8_t cmdIndex = 0;
-  uint8_t dataBufferIndex = 0;
-  bool isAnswerDelayed = false;
-  /* Co-efficient used to calculate delay. */
-  uint8_t blockAckDelay = 0;
-
-  while (cmdIndex < mcpsIndication->BufferSize)
-  {
-    switch (mcpsIndication->Buffer[cmdIndex++])
+    if( LmhpFragmentationState.Initialized == false )
     {
-      case FRAGMENTATION_PKG_VERSION_REQ:
-      {
-        if (mcpsIndication->Multicast == 1)
-        {
-          /* Multicast channel. Don't process command. */
-          break;
-        }
-        LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_PKG_VERSION_ANS;
-        LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_ID;
-        LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_VERSION;
-        break;
-      }
-      case FRAGMENTATION_FRAG_STATUS_REQ:
-      {
-        uint8_t fragIndex = mcpsIndication->Buffer[cmdIndex++];
-        uint8_t participants = fragIndex & 0x01;
-
-        fragIndex >>= 1;
-        FragSessionData[fragIndex].FragDecoderStatus = FragDecoderGetStatus();
-
-        if ((participants == 1) ||
-            ((participants == 0) && (FragSessionData[fragIndex].FragDecoderStatus.FragNbLost > 0)))
-        {
-          LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_FRAG_STATUS_ANS;
-          LmhpFragmentationState.DataBuffer[dataBufferIndex++] = (fragIndex << 14) |
-                                                                 ((FragSessionData[fragIndex].FragDecoderStatus.FragNbRx >> 8) & 0x3F);
-          LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FragSessionData[fragIndex].FragDecoderStatus.FragNbRx & 0xFF;
-          LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FragSessionData[fragIndex].FragDecoderStatus.FragNbLost;
-          LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FragSessionData[fragIndex].FragDecoderStatus.MatrixError & 0x01;
-
-          /* Fetch the co-efficient value required to calculate delay of that respective session. */
-          blockAckDelay = FragSessionData[fragIndex].FragGroupData.Control.Fields.BlockAckDelay;
-          isAnswerDelayed = true;
-        }
-        break;
-      }
-      case FRAGMENTATION_FRAG_SESSION_SETUP_REQ:
-      {
-        if (mcpsIndication->Multicast == 1)
-        {
-          /* Multicast channel. Don't process command. */
-          break;
-        }
-        FragSessionData_t fragSessionData;
-        uint8_t status = 0x00;
-
-        fragSessionData.FragGroupData.FragSession.Value = mcpsIndication->Buffer[cmdIndex++];
-
-        fragSessionData.FragGroupData.FragNb = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x00FF;
-        fragSessionData.FragGroupData.FragNb |= (mcpsIndication->Buffer[cmdIndex++] << 8) & 0xFF00;
-
-        fragSessionData.FragGroupData.FragSize = mcpsIndication->Buffer[cmdIndex++];
+        return false;
+    }
 
-        fragSessionData.FragGroupData.Control.Value = mcpsIndication->Buffer[cmdIndex++];
+    return LmhpFragmentationState.IsRunning;
+}
 
-        fragSessionData.FragGroupData.Padding = mcpsIndication->Buffer[cmdIndex++];
+static void LmhpFragmentationProcess( void )
+{
+    LmhpFragmentationTxDelayStates_t delayTimerState;
 
-        fragSessionData.FragGroupData.Descriptor = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x000000FF;
-        fragSessionData.FragGroupData.Descriptor += (mcpsIndication->Buffer[cmdIndex++] << 8) & 0x0000FF00;
-        fragSessionData.FragGroupData.Descriptor += (mcpsIndication->Buffer[cmdIndex++] << 16) & 0x00FF0000;
-        fragSessionData.FragGroupData.Descriptor += (mcpsIndication->Buffer[cmdIndex++] << 24) & 0xFF000000;
+    CRITICAL_SECTION_BEGIN( );
+    delayTimerState = LmhpFragmentationState.TxDelayState;
+    CRITICAL_SECTION_END( );
 
-        if (fragSessionData.FragGroupData.Control.Fields.FragAlgo > 0)
-        {
-          status |= 0x01; /* Encoding unsupported */
-        }
-
-        if ((fragSessionData.FragGroupData.FragNb * fragSessionData.FragGroupData.FragSize) > FragDecoderGetMaxFileSize())
-        {
-          status |= 0x02; /* Not enough Memory */
-        }
-        status |= (fragSessionData.FragGroupData.FragSession.Fields.FragIndex << 6) & 0xC0;
-        if (fragSessionData.FragGroupData.FragSession.Fields.FragIndex >= FRAGMENTATION_MAX_SESSIONS)
-        {
-          status |= 0x04; /* FragSession index not supported */
-        }
+    switch( delayTimerState )
+    {
+        case FRAGMENTATION_TX_DELAY_STATE_START:
+            // Set the timer with the initially calculated Delay value.
+            TimerSetValue( &FragmentTxDelayTimer, TxDelayTime );
+            // Start the timer.
+            TimerStart( &FragmentTxDelayTimer );
+            break;
+        case FRAGMENTATION_TX_DELAY_STATE_PENDING:
+            // Send the reply.
+            if (LORAMAC_HANDLER_SUCCESS == LmhpFragmentationPackage.OnSendRequest( &DelayedReplyAppData,
+                                                                                   LORAMAC_HANDLER_UNCONFIRMED_MSG,
+                                                                                   NULL,
+                                                                                   true ) )
+            {
+                LmhpFragmentationState.TxDelayState = FRAGMENTATION_TX_DELAY_STATE_IDLE;
+            }
+            break;
+        case FRAGMENTATION_TX_DELAY_STATE_IDLE:
+            // Intentional fall through
+        default:
+            // Nothing to do.
+            break;
+    }
+}
 
-        /* Descriptor is not really defined in the specification */
-        /* Not clear how to handle this. */
-        /* Currently the descriptor is always correct */
-        if (fragSessionData.FragGroupData.Descriptor != 0x01020304)
-        {
-          /* status |= 0x08; // Wrong Descriptor */
-        }
+static void LmhpFragmentationOnMcpsIndication( McpsIndication_t *mcpsIndication )
+{
+    uint8_t cmdIndex = 0;
+    uint8_t dataBufferIndex = 0;
+    bool isAnswerDelayed = false;
+    // Answer struct for the commands.
+    LmHandlerAppData_t cmdReplyAppData;
+    // Co-efficient used to calculate delay.
+    uint8_t blockAckDelay = 0;
+
+    if( mcpsIndication->Port != FRAGMENTATION_PORT )
+    {
+        return;
+    }
 
-        if ((status & 0x0F) == 0)
-        {
-          /* The FragSessionSetup is accepted */
-          fragSessionData.FragGroupData.IsActive = true;
-          fragSessionData.FragDecoderProcessStatus = FRAG_SESSION_ONGOING;
-          FragSessionData[fragSessionData.FragGroupData.FragSession.Fields.FragIndex] = fragSessionData;
-          FragDecoderInit(fragSessionData.FragGroupData.FragNb,
-                          fragSessionData.FragGroupData.FragSize,
-                          &LmhpFragmentationParams->DecoderCallbacks);
-        }
-        LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_FRAG_SESSION_SETUP_ANS;
-        LmhpFragmentationState.DataBuffer[dataBufferIndex++] = status;
-        isAnswerDelayed = false;
-        break;
-      }
-      case FRAGMENTATION_FRAG_SESSION_DELETE_REQ:
-      {
-        if (mcpsIndication->Multicast == 1)
+    while( cmdIndex < mcpsIndication->BufferSize )
+    {
+        switch( mcpsIndication->Buffer[cmdIndex++] )
         {
-          /* Multicast channel. Don't process command. */
-          break;
+            case FRAGMENTATION_PKG_VERSION_REQ:
+            {
+                if( mcpsIndication->Multicast == 1 )
+                {
+                    // Multicast channel. Don't process command.
+                    break;
+                }
+                LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_PKG_VERSION_ANS;
+                LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_ID;
+                LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_VERSION;
+                break;
+            }
+            case FRAGMENTATION_FRAG_STATUS_REQ:
+            {
+                uint8_t fragIndex = mcpsIndication->Buffer[cmdIndex++];
+                uint8_t participants = fragIndex & 0x01;
+
+                fragIndex = (fragIndex >> 1 ) & 0x03;
+                FragSessionData[fragIndex].FragDecoderStatus = FragDecoderGetStatus( );
+
+                if( ( participants == 1 ) ||
+                    ( ( participants == 0 ) && ( FragSessionData[fragIndex].FragDecoderStatus.FragNbLost > 0 ) ) )
+                {
+                    LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_FRAG_STATUS_ANS;
+                    LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FragSessionData[fragIndex].FragDecoderStatus.FragNbRx & 0xFF;
+                    LmhpFragmentationState.DataBuffer[dataBufferIndex++] = ( fragIndex << 6 ) |
+                                                                           ( ( FragSessionData[fragIndex].FragDecoderStatus.FragNbRx >> 8 ) & 0x3F );
+                    LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FragSessionData[fragIndex].FragDecoderStatus.FragNbLost;
+                    LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FragSessionData[fragIndex].FragDecoderStatus.MatrixError & 0x01;
+
+                    // Fetch the co-efficient value required to calculate delay of that respective session.
+                    blockAckDelay = FragSessionData[fragIndex].FragGroupData.Control.Fields.BlockAckDelay;
+                    isAnswerDelayed = true;
+                }
+                break;
+            }
+            case FRAGMENTATION_FRAG_SESSION_SETUP_REQ:
+            {
+                if( mcpsIndication->Multicast == 1 )
+                {
+                    // Multicast channel. Don't process command.
+                    break;
+                }
+                FragSessionData_t fragSessionData;
+                uint8_t status = 0x00;
+
+                fragSessionData.FragGroupData.FragSession.Value = mcpsIndication->Buffer[cmdIndex++];
+                
+                fragSessionData.FragGroupData.FragNb =  ( mcpsIndication->Buffer[cmdIndex++] << 0 ) & 0x00FF;
+                fragSessionData.FragGroupData.FragNb |= ( mcpsIndication->Buffer[cmdIndex++] << 8 ) & 0xFF00;
+
+                fragSessionData.FragGroupData.FragSize = mcpsIndication->Buffer[cmdIndex++];
+
+                fragSessionData.FragGroupData.Control.Value = mcpsIndication->Buffer[cmdIndex++];
+
+                fragSessionData.FragGroupData.Padding = mcpsIndication->Buffer[cmdIndex++];
+
+                fragSessionData.FragGroupData.Descriptor =  ( mcpsIndication->Buffer[cmdIndex++] << 0  ) & 0x000000FF;
+                fragSessionData.FragGroupData.Descriptor += ( mcpsIndication->Buffer[cmdIndex++] << 8  ) & 0x0000FF00;
+                fragSessionData.FragGroupData.Descriptor += ( mcpsIndication->Buffer[cmdIndex++] << 16 ) & 0x00FF0000;
+                fragSessionData.FragGroupData.Descriptor += ( mcpsIndication->Buffer[cmdIndex++] << 24 ) & 0xFF000000;
+
+                if( fragSessionData.FragGroupData.Control.Fields.FragAlgo > 0 )
+                {
+                    status |= 0x01; // Encoding unsupported
+                }
+
+                if( ( fragSessionData.FragGroupData.FragNb > FRAG_MAX_NB ) || 
+                    ( fragSessionData.FragGroupData.FragSize > FRAG_MAX_SIZE ) ||
+                    ( ( fragSessionData.FragGroupData.FragNb * fragSessionData.FragGroupData.FragSize ) > FragDecoderGetMaxFileSize( ) ) )
+                {
+                    status |= 0x02; // Not enough Memory
+                }
+                status |= ( fragSessionData.FragGroupData.FragSession.Fields.FragIndex << 6 ) & 0xC0;
+                if( fragSessionData.FragGroupData.FragSession.Fields.FragIndex >= FRAGMENTATION_MAX_SESSIONS )
+                {
+                    status |= 0x04; // FragSession index not supported
+                }
+
+                // Descriptor is not really defined in the specification
+                // Not clear how to handle this.
+                // Currently the descriptor is always correct
+                if( fragSessionData.FragGroupData.Descriptor != 0x01020304 )
+                {
+                    //status |= 0x08; // Wrong Descriptor
+                }
+
+                if( ( status & 0x0F ) == 0 )
+                {
+                    // The FragSessionSetup is accepted
+                    fragSessionData.FragGroupData.IsActive = true;
+                    fragSessionData.FragDecoderProcessStatus = FRAG_SESSION_ONGOING;
+                    FragSessionData[fragSessionData.FragGroupData.FragSession.Fields.FragIndex] = fragSessionData;
+                    FragDecoderInit( fragSessionData.FragGroupData.FragNb,
+                                     fragSessionData.FragGroupData.FragSize,
+                                     &LmhpFragmentationParams->DecoderCallbacks );
+                }
+                LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_FRAG_SESSION_SETUP_ANS;
+                LmhpFragmentationState.DataBuffer[dataBufferIndex++] = status;
+                isAnswerDelayed = false;
+                break;
+            }
+            case FRAGMENTATION_FRAG_SESSION_DELETE_REQ:
+            {
+                if( mcpsIndication->Multicast == 1 )
+                {
+                    // Multicast channel. Don't process command.
+                    break;
+                }
+                uint8_t status = 0x00;
+                uint8_t id = mcpsIndication->Buffer[cmdIndex++] & 0x03;
+
+                status |= id;
+                if( ( id >= FRAGMENTATION_MAX_SESSIONS ) || ( FragSessionData[id].FragGroupData.IsActive == false ) )
+                {
+                    status |= 0x04; // Session does not exist
+                }
+                else
+                {
+                    // Delete session
+                    FragSessionData[id].FragGroupData.IsActive = false;
+                }
+                LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_FRAG_SESSION_DELETE_ANS;
+                LmhpFragmentationState.DataBuffer[dataBufferIndex++] = status;
+                isAnswerDelayed = false;
+                break;
+            }
+            case FRAGMENTATION_DATA_FRAGMENT:
+            {
+                uint8_t fragIndex = 0;
+                uint16_t fragCounter = 0;
+
+                fragCounter = ( mcpsIndication->Buffer[cmdIndex++] << 0 ) & 0x00FF;
+                fragCounter |= ( mcpsIndication->Buffer[cmdIndex++] << 8 ) & 0xFF00;
+
+                fragIndex = ( fragCounter >> 14 ) & 0x03;
+                fragCounter &= 0x3FFF;
+                if (FragSessionData[fragIndex].FragGroupData.IsActive == false)
+                {
+                    cmdIndex = mcpsIndication->BufferSize;
+                    break;
+                }
+                if( mcpsIndication->Multicast == 1 )
+                {
+                    // Message received on a multicast address
+                    // Check McGroupBitMask
+                    uint8_t groupId = LoRaMacMcChannelGetGroupId( mcpsIndication->DevAddress );
+                    if( ( groupId == 0xFF ) ||
+                        ( ( FragSessionData[fragIndex].FragGroupData.FragSession.Fields.McGroupBitMask & ( 1 << groupId ) ) == 0 ) )
+                    {
+                        // Ignore message
+                        cmdIndex = mcpsIndication->BufferSize;
+                        break;
+                    }
+                }
+
+                if (FragSessionData[fragIndex].FragDecoderProcessStatus == FRAG_SESSION_ONGOING)
+                {
+                    FragSessionData[fragIndex].FragDecoderProcessStatus = FragDecoderProcess( fragCounter, &mcpsIndication->Buffer[cmdIndex] );
+                    FragSessionData[fragIndex].FragDecoderStatus = FragDecoderGetStatus( );
+                    if( LmhpFragmentationParams->OnProgress != NULL )
+                    {
+                        LmhpFragmentationParams->OnProgress( FragSessionData[fragIndex].FragDecoderStatus.FragNbRx,
+                                                             FragSessionData[fragIndex].FragGroupData.FragNb,
+                                                             FragSessionData[fragIndex].FragGroupData.FragSize,
+                                                             FragSessionData[fragIndex].FragDecoderStatus.FragNbLost );
+                    }
+
+                    if( FragSessionData[fragIndex].FragDecoderProcessStatus >= 0 )
+                    {
+                        // Fragmentation successfully done
+                        if( LmhpFragmentationParams->OnDone != NULL )
+                        {
+                            LmhpFragmentationParams->OnDone( FragSessionData[fragIndex].FragDecoderProcessStatus,
+                                                            ( FragSessionData[fragIndex].FragGroupData.FragNb * FragSessionData[fragIndex].FragGroupData.FragSize ) - FragSessionData[fragIndex].FragGroupData.Padding );
+                        }
+                        FragSessionData[fragIndex].FragDecoderProcessStatus = FRAG_SESSION_NOT_STARTED;
+                    }
+                }
+                cmdIndex += FragSessionData[fragIndex].FragGroupData.FragSize;
+                break;
+            }
+            default:
+            {
+                break;
+            }
         }
-        uint8_t status = 0x00;
-        uint8_t id = mcpsIndication->Buffer[cmdIndex++] & 0x03;
+    }
 
-        status |= id;
-        if ((id >= FRAGMENTATION_MAX_SESSIONS) || (FragSessionData[id].FragGroupData.IsActive == false))
-        {
-          status |= 0x04; /* Session does not exist */
-        }
-        else
-        {
-          /* Delete session */
-          FragSessionData[id].FragGroupData.IsActive = false;
-        }
-        LmhpFragmentationState.DataBuffer[dataBufferIndex++] = FRAGMENTATION_FRAG_SESSION_DELETE_ANS;
-        LmhpFragmentationState.DataBuffer[dataBufferIndex++] = status;
-        isAnswerDelayed = false;
-        break;
-      }
-      case FRAGMENTATION_DATA_FRAGMENT:
-      {
-        uint8_t fragIndex = 0;
-        uint16_t fragCounter = 0;
-
-        fragCounter = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x00FF;
-        fragCounter |= (mcpsIndication->Buffer[cmdIndex++] << 8) & 0xFF00;
-
-        fragIndex = (fragCounter >> 14) & 0x03;
-        fragCounter &= 0x3FFF;
-        if (FragSessionData[fragIndex].FragGroupData.IsActive == false)
-        {
-          cmdIndex = mcpsIndication->BufferSize;
-          break;
-        }
-        if (mcpsIndication->Multicast == 1)
-        {
-          /* Message received on a multicast address */
-          /* Check McGroupBitMask */
-          uint8_t groupId = LoRaMacMcChannelGetGroupId(mcpsIndication->DevAddress);
-          if ((groupId == 0xFF) ||
-              ((FragSessionData[fragIndex].FragGroupData.FragSession.Fields.McGroupBitMask & (1 << groupId)) == 0))
-          {
-            /* Ignore message */
-            cmdIndex = mcpsIndication->BufferSize;
-            break;
-          }
-        }
+    // After processing the commands, if the end-node has to reply back then a flag is checked if the
+    // reply is to be sent immediately or with a delay.
+    // In some scenarios it is not desired that multiple end-notes send uplinks at the same time to
+    // the same server. (Example: Fragment status during a multicast FUOTA)
+    if( dataBufferIndex != 0 )
+    {
+        // Prepare Answer that is to be transmitted
+        cmdReplyAppData.Buffer = LmhpFragmentationState.DataBuffer;
+        cmdReplyAppData.BufferSize = dataBufferIndex;
+        cmdReplyAppData.Port = FRAGMENTATION_PORT;
 
-        if (FragSessionData[fragIndex].FragDecoderProcessStatus == FRAG_SESSION_ONGOING)
+        if( isAnswerDelayed == true )
         {
-          FragSessionData[fragIndex].FragDecoderProcessStatus = FragDecoderProcess(fragCounter, &mcpsIndication->Buffer[cmdIndex]);
-          FragSessionData[fragIndex].FragDecoderStatus = FragDecoderGetStatus();
-          if (LmhpFragmentationParams->OnProgress != NULL)
-          {
-            LmhpFragmentationParams->OnProgress(FragSessionData[fragIndex].FragDecoderStatus.FragNbRx,
-                                                FragSessionData[fragIndex].FragGroupData.FragNb,
-                                                FragSessionData[fragIndex].FragGroupData.FragSize,
-                                                FragSessionData[fragIndex].FragDecoderStatus.FragNbLost);
-          }
+            // Delay value is calculated using BlockAckDelay which is communicated by server during the FragSessionSetupReq
+            // Pseudo Random Delay = rand(0:1) * 2^(blockAckDelay + 4) Seconds.
+            // Delay = Pseudo Random Delay * 1000 milli seconds.
+            // Eg: blockAckDelay = 7
+            //     Pseudo Random Delay = rand(0:1) * 2^11
+            //     rand(0:1) seconds = rand(0:1000) milliseconds
+            //     Delay = rand(0:1000) * 2048 => 2048000ms = 34 minutes
+            TxDelayTime = randr( 0, 1000 ) * ( 1 << ( blockAckDelay + 4 ) );
+            DelayedReplyAppData = cmdReplyAppData;
+            LmhpFragmentationState.TxDelayState = FRAGMENTATION_TX_DELAY_STATE_START;
+            LmhpFragmentationPackage.OnPackageProcessEvent();
         }
         else
         {
-          if (FragSessionData[fragIndex].FragDecoderProcessStatus >= 0)
-          {
-            /* Fragmentation successfully done */
-            if (LmhpFragmentationParams->OnDone != NULL)
-            {
-              LmhpFragmentationParams->OnDone(FragSessionData[fragIndex].FragDecoderProcessStatus,
-                                              (FragSessionData[fragIndex].FragGroupData.FragNb * FragSessionData[fragIndex].FragGroupData.FragSize) -
-                                              FragSessionData[fragIndex].FragGroupData.Padding);
-            }
-            FragSessionData[fragIndex].FragDecoderProcessStatus = FRAG_SESSION_NOT_STARTED;
-          }
-        }
-        cmdIndex += FragSessionData[fragIndex].FragGroupData.FragSize;
-        break;
-      }
-      default:
-      {
-        break;
-      }
-    }
-  }
-
-  /* After processing the commands, if the end-node has to reply back then a flag is checked if the */
-  /* reply is to be sent immediately or with a delay. */
-  /* In some scenarios it is not desired that multiple end-notes send uplinks at the same time to */
-  /* the same server. (Example: Fragment status during a multicast FUOTA) */
-  if (dataBufferIndex != 0)
-  {
-    /* Answer commands */
-    LmHandlerAppData_t appData =
-    {
-      .Buffer = LmhpFragmentationState.DataBuffer,
-      .BufferSize = dataBufferIndex,
-      .Port = FRAGMENTATION_PORT
-    };
-
-    if (isAnswerDelayed == true)
-    {
-      /* Delay value is calculated using BlockAckDelay which is communicated by server during the FragSessionSetupReq */
-      /* Pseudo Random Delay = rand(0:1) * 2^(blockAckDelay + 4) Seconds. */
-      /* Delay = Pseudo Random Delay * 1000 milli seconds. */
-      /* Eg: blockAckDelay = 7 */
-      /* Pseudo Random Delay = rand(0:1) * 2^11 */
-      /* rand(0:1) seconds = rand(0:1000) milliseconds */
-      /* Delay = rand(0:1000) * 2048 => 2048000ms = 34 minutes */
-      TxDelayTime = randr(0, 1000) * (1 << (blockAckDelay + 4));
-      DelayedReplyAppData = appData;
-      LmhpFragmentationState.TxDelayState = FRAGMENTATION_TX_DELAY_STATE_START;
-    }
-    else
-    {
-      /* Send the prepared answer */
-      bool current_dutycycle;
-      LmHandlerGetDutyCycleEnable(&current_dutycycle);
+            // Send the prepared answer
+            bool current_dutycycle;
+            LmHandlerGetDutyCycleEnable( &current_dutycycle );
 
-      /* force Duty Cycle OFF to this Send */
-      LmHandlerSetDutyCycleEnable(false);
-      LmhpFragmentationPackage.OnSendRequest(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true);
+            /* force Duty Cycle OFF to this Send */
+            LmHandlerSetDutyCycleEnable( false );
+            LmhpFragmentationPackage.OnSendRequest( &cmdReplyAppData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true );
 
-      /* restore initial Duty Cycle */
-      LmHandlerSetDutyCycleEnable(current_dutycycle);
+            /* restore initial Duty Cycle */
+            LmHandlerSetDutyCycleEnable( current_dutycycle );
+        }
     }
-  }
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.h
index d8d0fdc6..794d3dd0 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.h
@@ -1,46 +1,32 @@
 /*!
-  * \file      LmhpFragmentation.h
-  *
-  * \brief     Implements the LoRa-Alliance fragmented data block transport package
-  *            Specification: https://lora-alliance.org/sites/default/files/2018-09/fragmented_data_block_transport_v1.0.0.pdf
-  *
-  * \copyright Revised BSD License, see section \ref LICENSE.
-  *
-  * \code
-  *                ______                              _
-  *               / _____)             _              | |
-  *              ( (____  _____ ____ _| |_ _____  ____| |__
-  *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
-  *               _____) ) ____| | | || |_| ____( (___| | | |
-  *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
-  *              (C)2013-2018 Semtech
-  *
-  * \endcode
-  *
-  * \author    Miguel Luis ( Semtech )
-  */
-/**
-  ******************************************************************************
-  *
-  *          Portions COPYRIGHT 2020 STMicroelectronics
-  *
-  * @file    LmhpFragmentation.h
-  * @author  MCD Application Team
-  * @brief   Header for Fragmentation Data Block Transport Package module
-  ******************************************************************************
-  */
+ * \file      LmhpFragmentation.h
+ *
+ * \brief     Implements the LoRa-Alliance fragmented data block transport package
+ *            Specification: https://lora-alliance.org/sites/default/files/2018-09/fragmented_data_block_transport_v1.0.0.pdf
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2018 Semtech
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ */
 #ifndef __LMHP_FRAGMENTATION_H__
 #define __LMHP_FRAGMENTATION_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
+#include "LoRaMac.h"
+#include "LmHandlerTypes.h"
 #include "LmhPackage.h"
 #include "FragDecoder.h"
 
-/* Exported defines ----------------------------------------------------------*/
 /*!
  * Fragmentation data block transport package identifier.
  *
@@ -48,44 +34,37 @@ extern "C" {
  */
 #define PACKAGE_ID_FRAGMENTATION                    3
 
-/* Exported constants --------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
 /*!
  * Fragmentation package parameters
  */
 typedef struct LmhpFragmentationParams_s
 {
-  /*!
-   * FragDecoder Write/Read function callbacks
-   */
-  FragDecoderCallbacks_t DecoderCallbacks;
-  /*!
-   * Notifies the progress of the current fragmentation session
-   *
-   * \param [in] fragCounter Fragment counter
-   * \param [in] fragNb      Number of fragments
-   * \param [in] fragSize    Size of fragments
-   * \param [in] fragNbLost  Number of lost fragments
-   */
-  void (*OnProgress)(uint16_t fragCounter, uint16_t fragNb, uint8_t fragSize, uint16_t fragNbLost);
-  /*!
-   * Notifies that the fragmentation session is finished
-   *
-   * \param [in] status Fragmentation session status [FRAG_SESSION_ONGOING,
-   *                                                  FRAG_SESSION_FINISHED or
-   *                                                  FragDecoder.Status.FragNbLost]
-   * \param [in] size   Received file size
-   */
-  void (*OnDone)(int32_t status, uint32_t size);
-} LmhpFragmentationParams_t;
+    /*!
+     * FragDecoder Write/Read function callbacks
+     */
+    FragDecoderCallbacks_t DecoderCallbacks;
+    /*!
+     * Notifies the progress of the current fragmentation session
+     *
+     * \param [IN] fragCounter Fragment counter
+     * \param [IN] fragNb      Number of fragments
+     * \param [IN] fragSize    Size of fragments
+     * \param [IN] fragNbLost  Number of lost fragments
+     */
+    void ( *OnProgress )( uint16_t fragCounter, uint16_t fragNb, uint8_t fragSize, uint16_t fragNbLost );
+    /*!
+     * Notifies that the fragmentation session is finished
+     *
+     * \param [IN] status Fragmentation session status [FRAG_SESSION_ONGOING,
+     *                                                  FRAG_SESSION_FINISHED or
+     *                                                  FragDecoder.Status.FragNbLost]
+     * \param [IN] size   Received file size
+     */
+    void ( *OnDone )( int32_t status, uint32_t size );
+}LmhpFragmentationParams_t;
 
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-LmhPackage_t *LmhpFragmentationPackageFactory(void);
+LmhPackage_t *LmhpFragmentationPackageFactory( void );
 
-#ifdef __cplusplus
-}
-#endif
+uint8_t LmhpFragmentationGetPackageVersion(void);
 
-#endif /* __LMHP_FRAGMENTATION_H__ */
+#endif // __LMHP_FRAGMENTATION_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpPackagesRegistration.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpPackagesRegistration.c
new file mode 100644
index 00000000..e90d5bce
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpPackagesRegistration.c
@@ -0,0 +1,94 @@
+/**
+  ******************************************************************************
+  * @file    LmhpPackagesRegistration.c
+  * @author  MCD Application Team
+  * @brief   Implements the Packages Registration Agent
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "LmhpPackagesRegistration.h"
+#include "LmhpClockSync.h"
+#include "LmhpRemoteMcastSetup.h"
+#include "LmhpFragmentation.h"
+#include "LmhpFirmwareManagement.h"
+#include "LmHandler.h"
+#include "frag_decoder_if.h"
+
+/* Private typedef -----------------------------------------------------------*/
+
+/* Private define ------------------------------------------------------------*/
+
+/* Private macro -------------------------------------------------------------*/
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+
+/* Exported functions ---------------------------------------------------------*/
+LmHandlerErrorStatus_t LmhpPackagesRegistrationInit(void)
+{
+  if (LmHandlerPackageRegister(PACKAGE_ID_CLOCK_SYNC, NULL) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+  else if (LmHandlerPackageRegister(PACKAGE_ID_REMOTE_MCAST_SETUP, NULL) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+  else if (LmHandlerPackageRegister(PACKAGE_ID_FRAGMENTATION, (LmhpFragmentationParams_t *)&FRAG_DECODER_IF_FragmentationParams) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+  else if (LmHandlerPackageRegister(PACKAGE_ID_FIRMWARE_MANAGEMENT, NULL) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  return LORAMAC_HANDLER_SUCCESS;
+}
+
+LmHandlerErrorStatus_t LmhpPackagesRegister(uint8_t id, LmhPackage_t **package)
+{
+  if (package == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+  switch (id)
+  {
+    case PACKAGE_ID_CLOCK_SYNC:
+    {
+      *package = LmhpClockSyncPackageFactory();
+      break;
+    }
+    case PACKAGE_ID_REMOTE_MCAST_SETUP:
+    {
+      *package = LmhpRemoteMcastSetupPackageFactory();
+      break;
+    }
+    case PACKAGE_ID_FRAGMENTATION:
+    {
+      *package = LmhpFragmentationPackageFactory();
+      break;
+    }
+    case PACKAGE_ID_FIRMWARE_MANAGEMENT:
+    {
+      *package = LmhpFirmwareManagementPackageFactory();
+      break;
+    }
+  }
+
+  return LORAMAC_HANDLER_SUCCESS;
+}
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpPackagesRegistration.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpPackagesRegistration.h
new file mode 100644
index 00000000..8ac70364
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpPackagesRegistration.h
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    LmhpPackagesRegistration.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for LoRaMac Packages Registration agent
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+#ifndef __LMHP_PACKAGES_REGISTRATION_H__
+#define __LMHP_PACKAGES_REGISTRATION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "LmhPackage.h"
+
+/* Exported defines ----------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+/* External variables --------------------------------------------------------*/
+/* Exported macros -----------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+LmHandlerErrorStatus_t LmhpPackagesRegistrationInit(void);
+
+LmHandlerErrorStatus_t LmhpPackagesRegister(uint8_t id, LmhPackage_t **package);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LMHP_PACKAGES_REGISTRATION_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.c b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.c
index 8c64161e..e56539ea 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.c
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.c
@@ -34,97 +34,61 @@
 #include "LmhpRemoteMcastSetup.h"
 #include "mw_log_conf.h"  /* needed for MW_LOG */
 
-/* Private typedef -----------------------------------------------------------*/
+/*!
+ * LoRaWAN Application Layer Remote multicast setup Specification
+ */
+#define REMOTE_MCAST_SETUP_PORT                     200
+
+#define REMOTE_MCAST_SETUP_ID                       2
+#define REMOTE_MCAST_SETUP_VERSION                  1
+
 typedef enum LmhpRemoteMcastSetupSessionStates_e
 {
-  REMOTE_MCAST_SETUP_SESSION_STATE_IDLE,
-  REMOTE_MCAST_SETUP_SESSION_STATE_START,
-  REMOTE_MCAST_SETUP_SESSION_STATE_STOP,
-} LmhpRemoteMcastSetupSessionStates_t;
+    REMOTE_MCAST_SETUP_SESSION_STATE_IDLE,
+    REMOTE_MCAST_SETUP_SESSION_STATE_START,
+    REMOTE_MCAST_SETUP_SESSION_STATE_STOP,
+}LmhpRemoteMcastSetupSessionStates_t;
 
 /*!
  * Package current context
  */
 typedef struct LmhpRemoteMcastSetupState_s
 {
-  bool Initialized;
-  bool IsRunning;
-  LmhpRemoteMcastSetupSessionStates_t SessionState;
-  uint8_t DataBufferMaxSize;
-  uint8_t *DataBuffer;
-} LmhpRemoteMcastSetupState_t;
+    bool Initialized;
+    bool IsRunning;
+    LmhpRemoteMcastSetupSessionStates_t SessionState;
+    uint8_t DataBufferMaxSize;
+    uint8_t *DataBuffer;
+}LmhpRemoteMcastSetupState_t;
 
 typedef enum LmhpRemoteMcastSetupMoteCmd_e
 {
-  REMOTE_MCAST_SETUP_PKG_VERSION_ANS              = 0x00,
-  REMOTE_MCAST_SETUP_MC_GROUP_STATUS_ANS          = 0x01,
-  REMOTE_MCAST_SETUP_MC_GROUP_SETUP_ANS           = 0x02,
-  REMOTE_MCAST_SETUP_MC_GROUP_DELETE_ANS          = 0x03,
-  REMOTE_MCAST_SETUP_MC_GROUP_CLASS_C_SESSION_ANS = 0x04,
-  REMOTE_MCAST_SETUP_MC_GROUP_CLASS_B_SESSION_ANS = 0x05,
-} LmhpRemoteMcastSetupMoteCmd_t;
+    REMOTE_MCAST_SETUP_PKG_VERSION_ANS              = 0x00,
+    REMOTE_MCAST_SETUP_MC_GROUP_STATUS_ANS          = 0x01,
+    REMOTE_MCAST_SETUP_MC_GROUP_SETUP_ANS           = 0x02,
+    REMOTE_MCAST_SETUP_MC_GROUP_DELETE_ANS          = 0x03,
+    REMOTE_MCAST_SETUP_MC_GROUP_CLASS_C_SESSION_ANS = 0x04,
+    REMOTE_MCAST_SETUP_MC_GROUP_CLASS_B_SESSION_ANS = 0x05,
+}LmhpRemoteMcastSetupMoteCmd_t;
 
 typedef enum LmhpRemoteMcastSetupSrvCmd_e
 {
-  REMOTE_MCAST_SETUP_PKG_VERSION_REQ              = 0x00,
-  REMOTE_MCAST_SETUP_MC_GROUP_STATUS_REQ          = 0x01,
-  REMOTE_MCAST_SETUP_MC_GROUP_SETUP_REQ           = 0x02,
-  REMOTE_MCAST_SETUP_MC_GROUP_DELETE_REQ          = 0x03,
-  REMOTE_MCAST_SETUP_MC_GROUP_CLASS_C_SESSION_REQ = 0x04,
-  REMOTE_MCAST_SETUP_MC_GROUP_CLASS_B_SESSION_REQ = 0x05,
-} LmhpRemoteMcastSetupSrvCmd_t;
-
-typedef struct McGroupData_s
-{
-  uint8_t McGroupEnabled;
-  union
-  {
-    uint8_t Value;
-    struct
-    {
-      uint8_t McGroupId:   2;
-      uint8_t RFU:         6;
-    } Fields;
-  } IdHeader;
-  uint32_t McAddr;
-  uint8_t McKeyEncrypted[16];
-  uint32_t McFCountMin; /*! */
-  uint32_t McFCountMax;
-} McGroupData_t;
+    REMOTE_MCAST_SETUP_PKG_VERSION_REQ              = 0x00,
+    REMOTE_MCAST_SETUP_MC_GROUP_STATUS_REQ          = 0x01,
+    REMOTE_MCAST_SETUP_MC_GROUP_SETUP_REQ           = 0x02,
+    REMOTE_MCAST_SETUP_MC_GROUP_DELETE_REQ          = 0x03,
+    REMOTE_MCAST_SETUP_MC_GROUP_CLASS_C_SESSION_REQ = 0x04,
+    REMOTE_MCAST_SETUP_MC_GROUP_CLASS_B_SESSION_REQ = 0x05,
+}LmhpRemoteMcastSetupSrvCmd_t;
 
-typedef enum eSessionState
-{
-  SESSION_STOPPED,
-  SESSION_STARTED
-} SessionState_t;
-
-typedef struct McSessionData_s
-{
-  McGroupData_t McGroupData;
-  SessionState_t SessionState;
-  uint32_t SessionTime;
-  uint8_t SessionTimeout;
-  McRxParams_t RxParams;
-} McSessionData_t;
-
-/* Private define ------------------------------------------------------------*/
-/*!
- * LoRaWAN Application Layer Remote multicast setup Specification
- */
-#define REMOTE_MCAST_SETUP_PORT                     200
-#define REMOTE_MCAST_SETUP_ID                       2
-#define REMOTE_MCAST_SETUP_VERSION                  1
-
-/* Private macro -------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
 /*!
  * Initializes the package with provided parameters
  *
- * \param [in] params            Pointer to the package parameters
- * \param [in] dataBuffer        Pointer to main application buffer
- * \param [in] dataBufferMaxSize Main application buffer maximum size
+ * \param [IN] params            Pointer to the package parameters
+ * \param [IN] dataBuffer        Pointer to main application buffer
+ * \param [IN] dataBufferMaxSize Main application buffer maximum size
  */
-static void LmhpRemoteMcastSetupInit(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize);
+static void LmhpRemoteMcastSetupInit( void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize );
 
 /*!
  * Returns the current package initialization status.
@@ -132,7 +96,7 @@ static void LmhpRemoteMcastSetupInit(void *params, uint8_t *dataBuffer, uint8_t
  * \retval status Package initialization status
  *                [true: Initialized, false: Not initialized]
  */
-static bool LmhpRemoteMcastSetupIsInitialized(void);
+static bool LmhpRemoteMcastSetupIsInitialized( void );
 
 /*!
  * Returns the package operation status.
@@ -140,32 +104,64 @@ static bool LmhpRemoteMcastSetupIsInitialized(void);
  * \retval status Package operation status
  *                [true: Running, false: Not running]
  */
-static bool LmhpRemoteMcastSetupIsRunning(void);
+static bool LmhpRemoteMcastSetupIsRunning( void );
 
 /*!
  * Processes the internal package events.
  */
-static void LmhpRemoteMcastSetupProcess(void);
+static void LmhpRemoteMcastSetupProcess( void );
 
 /*!
  * Processes the MCPS Indication
  *
- * \param [in] mcpsIndication     MCPS indication primitive data
+ * \param [IN] mcpsIndication     MCPS indication primitive data
  */
-static void LmhpRemoteMcastSetupOnMcpsIndication(McpsIndication_t *mcpsIndication);
+static void LmhpRemoteMcastSetupOnMcpsIndication( McpsIndication_t *mcpsIndication );
 
-static void OnSessionStartTimer(void *context);
+static void OnSessionStartTimer( void *context );
 
-static void OnSessionStopTimer(void *context);
+static void OnSessionStopTimer( void *context );
 
-/* Private variables ---------------------------------------------------------*/
 static LmhpRemoteMcastSetupState_t LmhpRemoteMcastSetupState =
 {
-  .Initialized = false,
-  .IsRunning =   false,
-  .SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_IDLE,
+    .Initialized = false,
+    .IsRunning = false,
+    .SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_IDLE,
 };
 
+typedef struct McGroupData_s
+{
+    uint8_t McGroupEnabled;
+    union
+    {
+        uint8_t Value;
+        struct
+        {
+            uint8_t McGroupId:   2;
+            uint8_t RFU:         6;
+        }Fields;
+    }IdHeader;
+    uint32_t McAddr;
+    uint8_t McKeyEncrypted[16];
+    uint32_t McFCountMin;
+    uint32_t McFCountMax;
+}McGroupData_t;
+
+typedef enum eSessionState
+{
+    SESSION_STOPPED,
+    SESSION_STARTED
+}SessionState_t;
+
+typedef struct McSessionData_s
+{
+    McGroupData_t McGroupData;
+    SessionState_t SessionState;
+    uint32_t SessionTime;
+    uint8_t SessionTimeout;
+    McRxParams_t RxParams;
+}McSessionData_t;
+
 static McSessionData_t McSessionData[LORAMAC_MAX_MC_CTX];
 
 /*!
@@ -180,340 +176,355 @@ static TimerEvent_t SessionStopTimer;
 
 static LmhPackage_t LmhpRemoteMcastSetupPackage =
 {
-  .Port =                       REMOTE_MCAST_SETUP_PORT,
-  .Init =                       LmhpRemoteMcastSetupInit,
-  .IsInitialized =              LmhpRemoteMcastSetupIsInitialized,
-  .IsRunning =                  LmhpRemoteMcastSetupIsRunning,
-  .Process =                    LmhpRemoteMcastSetupProcess,
-  .OnMcpsConfirmProcess =       NULL,                              /* Not used in this package */
-  .OnMcpsIndicationProcess =    LmhpRemoteMcastSetupOnMcpsIndication,
-  .OnMlmeConfirmProcess =       NULL,                              /* Not used in this package */
-  .OnJoinRequest =              NULL,                              /* To be initialized by LmHandler */
-  .OnSendRequest =              NULL,                              /* To be initialized by LmHandler */
-  .OnDeviceTimeRequest =        NULL,                              /* To be initialized by LmHandler */
+    .Port = REMOTE_MCAST_SETUP_PORT,
+    .Init = LmhpRemoteMcastSetupInit,
+    .IsInitialized = LmhpRemoteMcastSetupIsInitialized,
+    .IsRunning = LmhpRemoteMcastSetupIsRunning,
+    .Process = LmhpRemoteMcastSetupProcess,
+    .OnMcpsConfirmProcess = NULL,                              // Not used in this package
+    .OnMcpsIndicationProcess = LmhpRemoteMcastSetupOnMcpsIndication,
+    .OnMlmeConfirmProcess = NULL,                              // Not used in this package
+    .OnJoinRequest = NULL,                                     // To be initialized by LmHandler
+    .OnSendRequest = NULL,                                     // To be initialized by LmHandler
+    .OnDeviceTimeRequest = NULL,                               // To be initialized by LmHandler
+    .OnSysTimeUpdate = NULL,                                   // To be initialized by LmHandler
+    .OnPackageProcessEvent = NULL,                             // To be initialized by LmHandler
 };
 
-/* Exported functions ---------------------------------------------------------*/
-LmhPackage_t *LmhpRemoteMcastSetupPackageFactory(void)
+LmhPackage_t *LmhpRemoteMcastSetupPackageFactory( void )
 {
-  return &LmhpRemoteMcastSetupPackage;
+    return &LmhpRemoteMcastSetupPackage;
 }
 
-/* Private  functions ---------------------------------------------------------*/
-static void LmhpRemoteMcastSetupInit(void *params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize)
+static void LmhpRemoteMcastSetupInit( void * params, uint8_t *dataBuffer, uint8_t dataBufferMaxSize )
 {
-  if (dataBuffer != NULL)
-  {
-    LmhpRemoteMcastSetupState.DataBuffer = dataBuffer;
-    LmhpRemoteMcastSetupState.DataBufferMaxSize = dataBufferMaxSize;
-    LmhpRemoteMcastSetupState.Initialized = true;
-    LmhpRemoteMcastSetupState.IsRunning = true;
-    TimerInit(&SessionStartTimer, OnSessionStartTimer);
-    TimerInit(&SessionStopTimer, OnSessionStopTimer);
-  }
-  else
-  {
-    LmhpRemoteMcastSetupState.IsRunning = false;
-    LmhpRemoteMcastSetupState.Initialized = false;
-  }
-
-  for (uint8_t id = 0; id < LORAMAC_MAX_MC_CTX; id++)
-  {
-    McSessionData[id].McGroupData.McGroupEnabled = false;
-  }
+    if( dataBuffer != NULL )
+    {
+        LmhpRemoteMcastSetupState.DataBuffer = dataBuffer;
+        LmhpRemoteMcastSetupState.DataBufferMaxSize = dataBufferMaxSize;
+        LmhpRemoteMcastSetupState.Initialized = true;
+        LmhpRemoteMcastSetupState.IsRunning = true;
+        TimerInit( &SessionStartTimer, OnSessionStartTimer );
+        TimerInit( &SessionStopTimer, OnSessionStopTimer );
+    }
+    else
+    {
+        LmhpRemoteMcastSetupState.IsRunning = false;
+        LmhpRemoteMcastSetupState.Initialized = false;
+    }
+
+    for (uint8_t id = 0; id < LORAMAC_MAX_MC_CTX; id++)
+    {
+        McSessionData[id].McGroupData.McGroupEnabled = false;
+    }
 }
 
-static bool LmhpRemoteMcastSetupIsInitialized(void)
+static bool LmhpRemoteMcastSetupIsInitialized( void )
 {
-  return LmhpRemoteMcastSetupState.Initialized;
+    return LmhpRemoteMcastSetupState.Initialized;
 }
 
-static bool LmhpRemoteMcastSetupIsRunning(void)
+static bool LmhpRemoteMcastSetupIsRunning( void )
 {
-  if (LmhpRemoteMcastSetupState.Initialized == false)
-  {
-    return false;
-  }
+    if( LmhpRemoteMcastSetupState.Initialized == false )
+    {
+        return false;
+    }
 
-  return LmhpRemoteMcastSetupState.IsRunning;
+    return LmhpRemoteMcastSetupState.IsRunning;
 }
 
-static void LmhpRemoteMcastSetupProcess(void)
+static void LmhpRemoteMcastSetupProcess( void )
 {
-  LmhpRemoteMcastSetupSessionStates_t state;
-
-  CRITICAL_SECTION_BEGIN();
-  state = LmhpRemoteMcastSetupState.SessionState;
-  CRITICAL_SECTION_END();
-
-  switch (state)
-  {
-    case REMOTE_MCAST_SETUP_SESSION_STATE_START:
-      /* Switch to Class C */
-
-      if (LmHandlerRequestClass(CLASS_C) == LORAMAC_HANDLER_SUCCESS)
-      {
-        LmhpRemoteMcastSetupState.SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_IDLE;
-
-        TimerSetValue(&SessionStopTimer, (1 << McSessionData[0].SessionTimeout) * 1000);
-        TimerStart(&SessionStopTimer);
-      }
-      break;
-    case REMOTE_MCAST_SETUP_SESSION_STATE_STOP:
-      /* Switch back to Class A */
-      if (LmHandlerRequestClass(CLASS_A) == LORAMAC_HANDLER_SUCCESS)
-      {
-        LmhpRemoteMcastSetupState.SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_IDLE;
-      }
-      break;
-    case REMOTE_MCAST_SETUP_SESSION_STATE_IDLE:
-    /* Intentional fall through */
-    default:
-      /* Nothing to do. */
-      break;
-  }
-}
+    LmhpRemoteMcastSetupSessionStates_t state;
 
-static void LmhpRemoteMcastSetupOnMcpsIndication(McpsIndication_t *mcpsIndication)
-{
-  uint8_t cmdIndex = 0;
-  uint8_t dataBufferIndex = 0;
-  uint8_t id = 0xFF;
+    CRITICAL_SECTION_BEGIN( );
+    state = LmhpRemoteMcastSetupState.SessionState;
+    CRITICAL_SECTION_END( );
 
-  while (cmdIndex < mcpsIndication->BufferSize)
-  {
-    switch (mcpsIndication->Buffer[cmdIndex++])
+    switch( state )
     {
-      case REMOTE_MCAST_SETUP_PKG_VERSION_REQ:
-      {
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_PKG_VERSION_ANS;
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_ID;
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_VERSION;
-        break;
-      }
-      case REMOTE_MCAST_SETUP_MC_GROUP_STATUS_REQ:
-      {
-        uint8_t nbAvailableGroups = 0;
-        uint8_t reqGroupMask = mcpsIndication->Buffer[cmdIndex++] & 0x0F;
-        uint8_t AnsGroupMask = 0x00;
-
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_MC_GROUP_STATUS_ANS;
-
-        /* move index to the next first optional list */
-        dataBufferIndex++;
-        for (id = 0; id < LORAMAC_MAX_MC_CTX; id++)
-        {
-          if (McSessionData[id].McGroupData.McGroupEnabled)
-          {
-            nbAvailableGroups++;
+        case REMOTE_MCAST_SETUP_SESSION_STATE_START:
+            // Switch to Class C
 
-            /* If multicast group defined in the input bit mask */
-            if ((reqGroupMask & (1 << id)) != 0)
+            if ( LmHandlerRequestClass( CLASS_C ) == LORAMAC_HANDLER_SUCCESS )
             {
-              AnsGroupMask |= (1 << id);
-              LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = id;
-              LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (McSessionData[id].McGroupData.McAddr >> 0) & 0xFF;
-              LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (McSessionData[id].McGroupData.McAddr >> 8) & 0xFF;
-              LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (McSessionData[id].McGroupData.McAddr >> 16) & 0xFF;
-              LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (McSessionData[id].McGroupData.McAddr >> 24) & 0xFF;
-            }
-          }
-        }
-        /* set the status bit */
-        LmhpRemoteMcastSetupState.DataBuffer[1] = (nbAvailableGroups & 0x07) << 4 | (AnsGroupMask & 0x0F);
+                LmhpRemoteMcastSetupState.SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_IDLE;
 
-        break;
-      }
-      case REMOTE_MCAST_SETUP_MC_GROUP_SETUP_REQ:
-      {
-        uint8_t status = id = mcpsIndication->Buffer[cmdIndex++] & 0x03;
-        McSessionData[id].McGroupData.IdHeader.Value = id;
+                TimerSetValue( &SessionStopTimer, ( 1 << McSessionData[0].SessionTimeout ) * 1000 );
+                TimerStart(&SessionStopTimer);
+            }
+            else
+            {
+                TimerSetValue( &SessionStartTimer, 1000 );
+                TimerStart(&SessionStartTimer);
+            }
+            break;
+        case REMOTE_MCAST_SETUP_SESSION_STATE_STOP:
+            // Switch back to Class A
+            if ( LmHandlerRequestClass( CLASS_A ) == LORAMAC_HANDLER_SUCCESS )
+            {
+                LmhpRemoteMcastSetupState.SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_IDLE;
+            }
+            else
+            {
+                TimerSetValue( &SessionStopTimer, 1000 );
+                TimerStart(&SessionStopTimer);
+            }
+            break;
+        case REMOTE_MCAST_SETUP_SESSION_STATE_IDLE:
+            break;
+        default:
+            break;
+    }
+}
 
+static void LmhpRemoteMcastSetupOnMcpsIndication( McpsIndication_t *mcpsIndication )
+{
+    uint8_t cmdIndex = 0;
+    uint8_t dataBufferIndex = 0;
+    uint8_t id = 0xFF;
 
-        McSessionData[id].McGroupData.McAddr = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x000000FF;
-        McSessionData[id].McGroupData.McAddr += (mcpsIndication->Buffer[cmdIndex++] << 8) & 0x0000FF00;
-        McSessionData[id].McGroupData.McAddr += (mcpsIndication->Buffer[cmdIndex++] << 16) & 0x00FF0000;
-        McSessionData[id].McGroupData.McAddr += (mcpsIndication->Buffer[cmdIndex++] << 24) & 0xFF000000;
+    if( mcpsIndication->Port != REMOTE_MCAST_SETUP_PORT )
+    {
+        return;
+    }
 
-        for (int8_t i = 0; i < 16; i++)
+    while( cmdIndex < mcpsIndication->BufferSize )
+    {
+        switch( mcpsIndication->Buffer[cmdIndex++] )
         {
-          McSessionData[id].McGroupData.McKeyEncrypted[i] = mcpsIndication->Buffer[cmdIndex++];
+            case REMOTE_MCAST_SETUP_PKG_VERSION_REQ:
+            {
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_PKG_VERSION_ANS;
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_ID;
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_VERSION;
+                break;
+            }
+            case REMOTE_MCAST_SETUP_MC_GROUP_STATUS_REQ:
+            {
+                uint8_t nbAvailableGroups = 0;
+                uint8_t reqGroupMask = mcpsIndication->Buffer[cmdIndex++] & 0x0F;
+                uint8_t AnsGroupMask = 0x00;
+
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_MC_GROUP_STATUS_ANS;
+
+                /* move index to the next first optional list */
+                dataBufferIndex++;
+                for (id = 0; id < LORAMAC_MAX_MC_CTX; id++)
+                {
+                    if( McSessionData[id].McGroupData.McGroupEnabled )
+                    {
+                        nbAvailableGroups++;
+
+                        /* If multicast group defined in the input bit mask */
+                        if( ( reqGroupMask & ( 1 << id ) ) != 0 )
+                        {
+                            AnsGroupMask |= (1 << id);
+                            LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = id;
+                            LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (McSessionData[id].McGroupData.McAddr >> 0) & 0xFF;
+                            LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (McSessionData[id].McGroupData.McAddr >> 8) & 0xFF;
+                            LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (McSessionData[id].McGroupData.McAddr >> 16) & 0xFF;
+                            LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (McSessionData[id].McGroupData.McAddr >> 24) & 0xFF;
+                        }
+                    }
+                }
+                /* set the status bit */
+                LmhpRemoteMcastSetupState.DataBuffer[1] = (nbAvailableGroups & 0x07) << 4 | (AnsGroupMask & 0x0F);
+
+                break;
+            }
+            case REMOTE_MCAST_SETUP_MC_GROUP_SETUP_REQ:
+            {
+                id = mcpsIndication->Buffer[cmdIndex++] & 0x03;
+                McSessionData[id].McGroupData.IdHeader.Value = id;
+
+                McSessionData[id].McGroupData.McAddr =  ( mcpsIndication->Buffer[cmdIndex++] << 0  ) & 0x000000FF;
+                McSessionData[id].McGroupData.McAddr += ( mcpsIndication->Buffer[cmdIndex++] << 8  ) & 0x0000FF00;
+                McSessionData[id].McGroupData.McAddr += ( mcpsIndication->Buffer[cmdIndex++] << 16 ) & 0x00FF0000;
+                McSessionData[id].McGroupData.McAddr += ( mcpsIndication->Buffer[cmdIndex++] << 24 ) & 0xFF000000;
+
+                for( int8_t i = 0; i < 16; i++ )
+                {
+                    McSessionData[id].McGroupData.McKeyEncrypted[i] = mcpsIndication->Buffer[cmdIndex++];
+                }
+
+                McSessionData[id].McGroupData.McFCountMin =  ( mcpsIndication->Buffer[cmdIndex++] << 0  ) & 0x000000FF;
+                McSessionData[id].McGroupData.McFCountMin += ( mcpsIndication->Buffer[cmdIndex++] << 8  ) & 0x0000FF00;
+                McSessionData[id].McGroupData.McFCountMin += ( mcpsIndication->Buffer[cmdIndex++] << 16 ) & 0x00FF0000;
+                McSessionData[id].McGroupData.McFCountMin += ( mcpsIndication->Buffer[cmdIndex++] << 24 ) & 0xFF000000;
+
+                McSessionData[id].McGroupData.McFCountMax =  ( mcpsIndication->Buffer[cmdIndex++] << 0  ) & 0x000000FF;
+                McSessionData[id].McGroupData.McFCountMax += ( mcpsIndication->Buffer[cmdIndex++] << 8  ) & 0x0000FF00;
+                McSessionData[id].McGroupData.McFCountMax += ( mcpsIndication->Buffer[cmdIndex++] << 16 ) & 0x00FF0000;
+                McSessionData[id].McGroupData.McFCountMax += ( mcpsIndication->Buffer[cmdIndex++] << 24 ) & 0xFF000000;
+
+                McChannelParams_t channel =
+                {
+                    .IsRemotelySetup = true,
+                    .Class = CLASS_C, // Field not used for multicast channel setup. Must be initialized to something
+                    .IsEnabled = true,
+                    .GroupID = ( AddressIdentifier_t )McSessionData[id].McGroupData.IdHeader.Fields.McGroupId,
+                    .Address = McSessionData[id].McGroupData.McAddr,
+                    .McKeys.McKeyE = McSessionData[id].McGroupData.McKeyEncrypted,
+                    .FCountMin = McSessionData[id].McGroupData.McFCountMin,
+                    .FCountMax = McSessionData[id].McGroupData.McFCountMax,
+                    .RxParams.ClassC = // Field not used for multicast channel setup. Must be initialized to something
+                    {
+                        .Frequency = 0,
+                        .Datarate = 0
+                    }
+                };
+                uint8_t idError = 0x01; // One bit value
+                if( LoRaMacMcChannelSetup( &channel ) == LORAMAC_STATUS_OK )
+                {
+                    idError = 0x00;
+                    McSessionData[id].McGroupData.McGroupEnabled = true;
+                }
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_MC_GROUP_SETUP_ANS;
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = ( idError << 2 ) | McSessionData[id].McGroupData.IdHeader.Fields.McGroupId;
+                break;
+            }
+            case REMOTE_MCAST_SETUP_MC_GROUP_DELETE_REQ:
+            {
+                uint8_t status = 0x00;
+                id = mcpsIndication->Buffer[cmdIndex++] & 0x03;
+
+                status = id;
+                McSessionData[id].McGroupData.IdHeader.Value = 0;
+                McSessionData[id].McGroupData.McAddr = 0;
+                UTIL_MEM_set_8( McSessionData[id].McGroupData.McKeyEncrypted, 0x00, 16 );
+                McSessionData[id].McGroupData.McFCountMin = 0;
+                McSessionData[id].McGroupData.McFCountMax = 0;
+
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_MC_GROUP_DELETE_ANS;
+
+                if( LoRaMacMcChannelDelete( ( AddressIdentifier_t )id ) != LORAMAC_STATUS_OK )
+                {
+                    status |= 0x04; // McGroupUndefined bit set
+                }
+                else
+                {
+                    McSessionData[id].McGroupData.McGroupEnabled = false;
+                }
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = status;
+                break;
+            }
+            case REMOTE_MCAST_SETUP_MC_GROUP_CLASS_C_SESSION_REQ:
+            {
+                uint8_t status = 0x00;
+                int32_t timeToSessionStart = 0;
+                id = mcpsIndication->Buffer[cmdIndex++] & 0x03;
+
+                McSessionData[id].SessionTime =  ( mcpsIndication->Buffer[cmdIndex++] << 0  ) & 0x000000FF;
+                McSessionData[id].SessionTime += ( mcpsIndication->Buffer[cmdIndex++] << 8  ) & 0x0000FF00;
+                McSessionData[id].SessionTime += ( mcpsIndication->Buffer[cmdIndex++] << 16 ) & 0x00FF0000;
+                McSessionData[id].SessionTime += ( mcpsIndication->Buffer[cmdIndex++] << 24 ) & 0xFF000000;
+
+                // Add Unix to Gps epoch offset. The system time is based on Unix time.
+                McSessionData[id].SessionTime += UNIX_GPS_EPOCH_OFFSET;
+
+                McSessionData[id].SessionTimeout =  mcpsIndication->Buffer[cmdIndex++] & 0x0F;
+
+                McSessionData[id].RxParams.ClassC.Frequency =  ( mcpsIndication->Buffer[cmdIndex++] << 0  ) & 0x000000FF;
+                McSessionData[id].RxParams.ClassC.Frequency |= ( mcpsIndication->Buffer[cmdIndex++] << 8  ) & 0x0000FF00;
+                McSessionData[id].RxParams.ClassC.Frequency |= ( mcpsIndication->Buffer[cmdIndex++] << 16 ) & 0x00FF0000;
+                McSessionData[id].RxParams.ClassC.Frequency *= 100;
+
+                McSessionData[id].RxParams.ClassC.Datarate = mcpsIndication->Buffer[cmdIndex++];
+
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_MC_GROUP_CLASS_C_SESSION_ANS;
+                if( LoRaMacMcChannelSetupRxParams( ( AddressIdentifier_t )id, &McSessionData[id].RxParams, &status ) == LORAMAC_STATUS_OK )
+                {
+                    SysTime_t curTime = { .Seconds = 0, .SubSeconds = 0 };
+                    curTime = SysTimeGet( );
+
+                    timeToSessionStart = McSessionData[id].SessionTime - curTime.Seconds;
+                    if( timeToSessionStart > 0 )
+                    {
+                        // Start session start timer
+                        TimerSetValue( &SessionStartTimer, timeToSessionStart * 1000 );
+                        TimerStart( &SessionStartTimer );
+
+                        MW_LOG(TS_OFF, VLEVEL_M, "Time2SessionStart: %d ms\r\n", timeToSessionStart * 1000);
+                    }
+                    else
+                    {
+                        // Session start time before current device time
+                        status |= 0x10;
+                    }
+                }
+                LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = status;
+                if( status == 0x00 )
+                {
+                    LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (timeToSessionStart >> 0) & 0xFF;
+                    LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (timeToSessionStart >> 8) & 0xFF;
+                    LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (timeToSessionStart >> 16) & 0xFF;
+                }
+                break;
+            }
+            case REMOTE_MCAST_SETUP_MC_GROUP_CLASS_B_SESSION_REQ:
+            {
+                // implement command prosessing and handling
+                break;
+            }
+            default:
+            {
+                break;
+            }
         }
+    }
 
-        McSessionData[id].McGroupData.McFCountMin = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x000000FF;
-        McSessionData[id].McGroupData.McFCountMin += (mcpsIndication->Buffer[cmdIndex++] << 8) & 0x0000FF00;
-        McSessionData[id].McGroupData.McFCountMin += (mcpsIndication->Buffer[cmdIndex++] << 16) & 0x00FF0000;
-        McSessionData[id].McGroupData.McFCountMin += (mcpsIndication->Buffer[cmdIndex++] << 24) & 0xFF000000;
-
-        McSessionData[id].McGroupData.McFCountMax = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x000000FF;
-        McSessionData[id].McGroupData.McFCountMax += (mcpsIndication->Buffer[cmdIndex++] << 8) & 0x0000FF00;
-        McSessionData[id].McGroupData.McFCountMax += (mcpsIndication->Buffer[cmdIndex++] << 16) & 0x00FF0000;
-        McSessionData[id].McGroupData.McFCountMax += (mcpsIndication->Buffer[cmdIndex++] << 24) & 0xFF000000;
-
-        McChannelParams_t channel =
+    if( dataBufferIndex != 0 )
+    {
+        // Answer commands
+        LmHandlerAppData_t appData =
         {
-          .IsRemotelySetup = true,
-          .Class = CLASS_C, /* Field not used for multicast channel setup. Must be initialized to something */
-          .IsEnabled = true,
-          .GroupID = (AddressIdentifier_t)McSessionData[id].McGroupData.IdHeader.Fields.McGroupId,
-          .Address = McSessionData[id].McGroupData.McAddr,
-          .McKeys.McKeyE = McSessionData[id].McGroupData.McKeyEncrypted,
-          .FCountMin = McSessionData[id].McGroupData.McFCountMin,
-          .FCountMax = McSessionData[id].McGroupData.McFCountMax,
-          .RxParams.ClassC = /* Field not used for multicast channel setup. Must be initialized to something */
-          {
-            .Frequency = 0,
-            .Datarate = 0
-          }
+            .Buffer = LmhpRemoteMcastSetupState.DataBuffer,
+            .BufferSize = dataBufferIndex,
+            .Port = REMOTE_MCAST_SETUP_PORT
         };
-        if (LoRaMacMcChannelSetup(&channel) != LORAMAC_STATUS_OK)
-        {
-          status |= 0x04; /* IDerror bit */
-        }
-        else
-        {
-          McSessionData[id].McGroupData.McGroupEnabled = true;
-        }
 
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_MC_GROUP_SETUP_ANS;
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = status;
+        bool current_dutycycle;
+        LmHandlerGetDutyCycleEnable( &current_dutycycle );
 
-        break;
-      }
-      case REMOTE_MCAST_SETUP_MC_GROUP_DELETE_REQ:
-      {
-        uint8_t status = id = mcpsIndication->Buffer[cmdIndex++] & 0x03;
+        /* force Duty Cycle OFF to this Send */
+        LmHandlerSetDutyCycleEnable( false );
+        LmhpRemoteMcastSetupPackage.OnSendRequest( &appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true );
 
-        McSessionData[id].McGroupData.IdHeader.Value = 0;
-        McSessionData[id].McGroupData.McAddr = 0;
-        UTIL_MEM_set_8(McSessionData[id].McGroupData.McKeyEncrypted, 0x00, 16);
-        McSessionData[id].McGroupData.McFCountMin = 0;
-        McSessionData[id].McGroupData.McFCountMax = 0;
+        /* restore initial Duty Cycle */
+        LmHandlerSetDutyCycleEnable( current_dutycycle );
 
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_MC_GROUP_DELETE_ANS;
-
-        if (LoRaMacMcChannelDelete((AddressIdentifier_t)id) != LORAMAC_STATUS_OK)
-        {
-          status |= 0x04; /* McGroupUndefined bit set */
-        }
-        else
+        if (id != 0xFF && id < LORAMAC_MAX_MC_CTX)
         {
-          McSessionData[id].McGroupData.McGroupEnabled = false;
-        }
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = status;
-        break;
-      }
-      case REMOTE_MCAST_SETUP_MC_GROUP_CLASS_C_SESSION_REQ:
-      {
-        uint8_t status = 0x00;
-        id = mcpsIndication->Buffer[cmdIndex++] & 0x03;
-        int32_t timeToSessionStart = 0;
-
-        McSessionData[id].SessionTime = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x000000FF;
-        McSessionData[id].SessionTime += (mcpsIndication->Buffer[cmdIndex++] << 8) & 0x0000FF00;
-        McSessionData[id].SessionTime += (mcpsIndication->Buffer[cmdIndex++] << 16) & 0x00FF0000;
-        McSessionData[id].SessionTime += (mcpsIndication->Buffer[cmdIndex++] << 24) & 0xFF000000;
-
-        /* Add Unix to Gps epcoh offset. The system time is based on Unix time. */
-        McSessionData[id].SessionTime += UNIX_GPS_EPOCH_OFFSET;
-
-        McSessionData[id].SessionTimeout =  mcpsIndication->Buffer[cmdIndex++] & 0x0F;
-
-        McSessionData[id].RxParams.ClassC.Frequency = (mcpsIndication->Buffer[cmdIndex++] << 0) & 0x000000FF;
-        McSessionData[id].RxParams.ClassC.Frequency |= (mcpsIndication->Buffer[cmdIndex++] << 8) & 0x0000FF00;
-        McSessionData[id].RxParams.ClassC.Frequency |= (mcpsIndication->Buffer[cmdIndex++] << 16) & 0x00FF0000;
-        McSessionData[id].RxParams.ClassC.Frequency *= 100;
-
-        McSessionData[id].RxParams.ClassC.Datarate = mcpsIndication->Buffer[cmdIndex++];
-
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = REMOTE_MCAST_SETUP_MC_GROUP_CLASS_C_SESSION_ANS;
-        if (LoRaMacMcChannelSetupRxParams((AddressIdentifier_t)id, &McSessionData[id].RxParams, &status) == LORAMAC_STATUS_OK)
-        {
-          SysTime_t curTime = { .Seconds = 0, .SubSeconds = 0 };
-          curTime = SysTimeGet();
-
-          if ((McSessionData[id].SessionTime - curTime.Seconds) > 0)
-          {
-            timeToSessionStart = McSessionData[id].SessionTime - curTime.Seconds;
-            /* Start session start timer */
-            TimerSetValue(&SessionStartTimer, timeToSessionStart * 1000);
-            TimerStart(&SessionStartTimer);
-
-            MW_LOG(TS_OFF, VLEVEL_M, "Time2SessionStart: %d ms\r\n", timeToSessionStart * 1000);
-          }
-          else
-          {
-            /* Session start time before current device time */
-            status |= 0x20;
-          }
+            MW_LOG(TS_OFF, VLEVEL_M, "ID          : %d\r\n", McSessionData[id].McGroupData.IdHeader.Fields.McGroupId);
+            MW_LOG(TS_OFF, VLEVEL_M, "McAddr      : %08X\r\n", McSessionData[id].McGroupData.McAddr);
+            MW_LOG(TS_OFF, VLEVEL_M, "McKey       : %02X", McSessionData[id].McGroupData.McKeyEncrypted[0]);
+            for ( int i = 1; i < 16; i++ )
+            {
+                MW_LOG(TS_OFF, VLEVEL_M, "-%02X",  McSessionData[id].McGroupData.McKeyEncrypted[i]);
+            }
+            MW_LOG(TS_OFF, VLEVEL_M, "\r\n");
+            MW_LOG(TS_OFF, VLEVEL_M, "McFCountMin : %u\r\n",  McSessionData[id].McGroupData.McFCountMin);
+            MW_LOG(TS_OFF, VLEVEL_M, "McFCountMax : %u\r\n",  McSessionData[id].McGroupData.McFCountMax);
+            MW_LOG(TS_OFF, VLEVEL_M, "SessionTime : %u\r\n",  McSessionData[id].SessionTime);
+            MW_LOG(TS_OFF, VLEVEL_M, "SessionTimeT: %d s\r\n", (1 << McSessionData[id].SessionTimeout));
+            MW_LOG(TS_OFF, VLEVEL_M, "Rx Freq     : %u\r\n", McSessionData[id].RxParams.ClassC.Frequency);
+            MW_LOG(TS_OFF, VLEVEL_M, "Rx DR       : DR_%d\r\n", McSessionData[id].RxParams.ClassC.Datarate);
         }
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = status;
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (timeToSessionStart >> 0) & 0xFF;
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (timeToSessionStart >> 8) & 0xFF;
-        LmhpRemoteMcastSetupState.DataBuffer[dataBufferIndex++] = (timeToSessionStart >> 16) & 0xFF;
-        break;
-      }
-      case REMOTE_MCAST_SETUP_MC_GROUP_CLASS_B_SESSION_REQ:
-      {
-        /* implement command prosessing and handling */
-        break;
-      }
-      default:
-      {
-        break;
-      }
-    }
-  }
-
-  if (dataBufferIndex != 0)
-  {
-    /* Answer commands */
-    LmHandlerAppData_t appData =
-    {
-      .Buffer = LmhpRemoteMcastSetupState.DataBuffer,
-      .BufferSize = dataBufferIndex,
-      .Port = REMOTE_MCAST_SETUP_PORT
-    };
-
-    bool current_dutycycle;
-    LmHandlerGetDutyCycleEnable(&current_dutycycle);
-
-    /* force Duty Cycle OFF to this Send */
-    LmHandlerSetDutyCycleEnable(false);
-    LmhpRemoteMcastSetupPackage.OnSendRequest(&appData, LORAMAC_HANDLER_UNCONFIRMED_MSG, NULL, true);
-
-    /* restore initial Duty Cycle */
-    LmHandlerSetDutyCycleEnable(current_dutycycle);
-
-    if (id != 0xFF && id < LORAMAC_MAX_MC_CTX)
-    {
-      MW_LOG(TS_OFF, VLEVEL_M, "ID          : %d\r\n", McSessionData[id].McGroupData.IdHeader.Fields.McGroupId);
-      MW_LOG(TS_OFF, VLEVEL_M, "McAddr      : %08X\r\n", McSessionData[id].McGroupData.McAddr);
-      MW_LOG(TS_OFF, VLEVEL_M, "McKey       : %02X", McSessionData[id].McGroupData.McKeyEncrypted[0]);
-      for (int i = 1; i < 16; i++)
-      {
-        MW_LOG(TS_OFF, VLEVEL_M, "-%02X",  McSessionData[id].McGroupData.McKeyEncrypted[i]);
-      }
-      MW_LOG(TS_OFF, VLEVEL_M, "\r\n");
-      MW_LOG(TS_OFF, VLEVEL_M, "McFCountMin : %u\r\n",  McSessionData[id].McGroupData.McFCountMin);
-      MW_LOG(TS_OFF, VLEVEL_M, "McFCountMax : %u\r\n",  McSessionData[id].McGroupData.McFCountMax);
-      MW_LOG(TS_OFF, VLEVEL_M, "SessionTime : %u\r\n",  McSessionData[id].SessionTime);
-      MW_LOG(TS_OFF, VLEVEL_M, "SessionTimeT: %d s\r\n", (1 << McSessionData[id].SessionTimeout));
-      MW_LOG(TS_OFF, VLEVEL_M, "Rx Freq     : %u\r\n", McSessionData[id].RxParams.ClassC.Frequency);
-      MW_LOG(TS_OFF, VLEVEL_M, "Rx DR       : DR_%d\r\n", McSessionData[id].RxParams.ClassC.Datarate);
     }
-  }
 }
 
-static void OnSessionStartTimer(void *context)
+static void OnSessionStartTimer( void *context )
 {
-  TimerStop(&SessionStartTimer);
-  LmhpRemoteMcastSetupState.SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_START;
-  LmhpRemoteMcastSetupProcess();
+    TimerStop( &SessionStartTimer );
+    LmhpRemoteMcastSetupState.SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_START;
+    LmhpRemoteMcastSetupPackage.OnPackageProcessEvent();
 }
 
-static void OnSessionStopTimer(void *context)
+static void OnSessionStopTimer( void *context )
 {
-  TimerStop(&SessionStopTimer);
-  LmhpRemoteMcastSetupState.SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_STOP;
+    TimerStop( &SessionStopTimer );
+    LmhpRemoteMcastSetupState.SessionState = REMOTE_MCAST_SETUP_SESSION_STATE_STOP;
+    LmhpRemoteMcastSetupPackage.OnPackageProcessEvent();
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.h
index 35801e9f..db013871 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.h
@@ -19,27 +19,13 @@
  *
  * \author    Miguel Luis ( Semtech )
  */
-/**
-  ******************************************************************************
-  *
-  *          Portions COPYRIGHT 2020 STMicroelectronics
-  *
-  * @file    LmhpRemoteMcastSetup.h
-  * @author  MCD Application Team
-  * @brief   Header for Remote Multicast Package module
-  ******************************************************************************
-  */
 #ifndef __LMHP_REMOTE_MCAST_SETUP_H__
 #define __LMHP_REMOTE_MCAST_SETUP_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
+#include "LoRaMac.h"
+#include "LmHandlerTypes.h"
 #include "LmhPackage.h"
 
-/* Exported defines ----------------------------------------------------------*/
 /*!
  * Remote multicast setup package identifier.
  *
@@ -47,16 +33,6 @@ extern "C" {
  */
 #define PACKAGE_ID_REMOTE_MCAST_SETUP               2
 
-/* Exported constants --------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-LmhPackage_t *LmhpRemoteMcastSetupPackageFactory(void);
-
-
-#ifdef __cplusplus
-}
-#endif
+LmhPackage_t *LmhpRemoteMcastSetupPackageFactory( void );
 
-#endif /* __LMHP_REMOTE_MCAST_SETUP_H__ */
+#endif // __LMHP_REMOTE_MCAST_SETUP_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/LmHandler/lorawan_version.h b/Middlewares/Third_Party/LoRaWAN/LmHandler/lorawan_version.h
index c0d9054b..05c62608 100644
--- a/Middlewares/Third_Party/LoRaWAN/LmHandler/lorawan_version.h
+++ b/Middlewares/Third_Party/LoRaWAN/LmHandler/lorawan_version.h
@@ -30,8 +30,8 @@
 /* Exported constants --------------------------------------------------------*/
 
 #define __LORAWAN_VERSION_MAIN   (0x02U) /*!< [31:24] main version */
-#define __LORAWAN_VERSION_SUB1   (0x02U) /*!< [23:16] sub1 version */
-#define __LORAWAN_VERSION_SUB2   (0x01U) /*!< [15:8]  sub2 version */
+#define __LORAWAN_VERSION_SUB1   (0x03U) /*!< [23:16] sub1 version */
+#define __LORAWAN_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __LORAWAN_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
 #define __LORAWAN_MAIN_SHIFT     24
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c
index 5924faad..49883ad4 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c
@@ -40,7 +40,6 @@
   * @brief   LoRa MAC layer implementation
   ******************************************************************************
   */
-/* Includes ------------------------------------------------------------------*/
 #include "utilities.h"
 #include "Region.h"
 #include "LoRaMacClassB.h"
@@ -55,12 +54,11 @@
 #include "LoRaMacCommands.h"
 #include "LoRaMacAdr.h"
 #include "LoRaMacSerializer.h"
+#include "radio.h"
 
 #include "LoRaMac.h"
 #include "mw_log_conf.h"
 
-/* Private macro -------------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
 #ifndef LORAMAC_VERSION
 /*!
  * LoRaWAN version definition.
@@ -73,11 +71,6 @@
  */
 #define LORAMAC_PHY_MAXPAYLOAD                      255
 
-/*!
- * Maximum MAC commands buffer size
- */
-#define LORA_MAC_COMMAND_MAX_LENGTH                 128
-
 /*!
  * Maximum length of the fOpts field
  */
@@ -98,7 +91,6 @@
  */
 #define BACKOFF_DC_24_HOURS                         10000
 
-/* Private typedef -----------------------------------------------------------*/
 /*!
  * LoRaMac internal states
  */
@@ -123,101 +115,6 @@ typedef enum eLoRaMacRequestHandling
     LORAMAC_REQUEST_HANDLING_ON = !LORAMAC_REQUEST_HANDLING_OFF
 }LoRaMacRequestHandling_t;
 
-typedef struct sLoRaMacNvmCtx
-{
-    /*
-     * LoRaMac region.
-     */
-    LoRaMacRegion_t Region;
-    /*
-     * LoRaMac default parameters
-     */
-    LoRaMacParams_t MacParamsDefaults;
-    /*
-     * Network ID ( 3 bytes )
-     */
-    uint32_t NetID;
-    /*
-     * Mote Address
-     */
-    uint32_t DevAddr;
-    /*!
-    * Multicast channel list
-    */
-    MulticastCtx_t MulticastChannelList[LORAMAC_MAX_MC_CTX];
-    /*
-     * Actual device class
-     */
-    DeviceClass_t DeviceClass;
-    /*
-     * Indicates if the node is connected to
-     * a private or public network
-     */
-    bool PublicNetwork;
-    /*
-     * LoRaMac ADR control status
-     */
-    bool AdrCtrlOn;
-    /*
-     * Counts the number of missed ADR acknowledgements
-     */
-    uint32_t AdrAckCounter;
-
-    /*
-     * LoRaMac parameters
-     */
-    LoRaMacParams_t MacParams;
-    /*
-     * Maximum duty cycle
-     * \remark Possibility to shutdown the device.
-     */
-    uint8_t MaxDCycle;
-    /*
-    * Enables/Disables duty cycle management (Test only)
-    */
-    bool DutyCycleOn;
-    /*
-     * Holds the current rx window slot
-     */
-    bool RepeaterSupport;
-    /*
-     * Buffer containing the MAC layer commands
-     */
-    uint8_t MacCommandsBuffer[LORA_MAC_COMMAND_MAX_LENGTH];
-    /*
-     * If the server has sent a FRAME_TYPE_DATA_CONFIRMED_DOWN this variable indicates
-     * if the ACK bit must be set for the next transmission
-     */
-    bool SrvAckRequested;
-    /*
-     * Aggregated duty cycle management
-     */
-    uint16_t AggregatedDCycle;
-    /*
-    * Aggregated duty cycle management
-    */
-    TimerTime_t LastTxDoneTime;
-    TimerTime_t AggregatedTimeOff;
-    /*
-    * Stores the time at LoRaMac initialization.
-    *
-    * \remark Used for the BACKOFF_DC computation.
-    */
-    SysTime_t InitializationTime;
-    /*
-     * Current LoRaWAN Version
-     */
-    Version_t Version;
-    /*
-     * End-Device network activation
-     */
-    ActivationType_t NetworkActivation;
-    /*!
-     * Last received Message integrity Code (MIC)
-     */
-    uint32_t LastRxMic;
-}LoRaMacNvmCtx_t;
-
 typedef struct sLoRaMacCtx
 {
     /*
@@ -341,6 +238,10 @@ typedef struct sLoRaMacCtx
     * Structure to hold MLME indication data.
     */
     MlmeIndication_t MlmeIndication;
+    /*
+     * Structure to hold global Rx Status.
+     */
+    LoRaMacRxStatus_t RxStatus;
     /*
     * Holds the current rx window slot
     */
@@ -354,15 +255,22 @@ typedef struct sLoRaMacCtx
     */
     LoRaMacRequestHandling_t AllowRequests;
     /*
-    * Non-volatile module context structure
-    */
-    LoRaMacNvmCtx_t* NvmCtx;
-    /*
     * Duty cycle wait time
     */
     TimerTime_t DutyCycleWaitTime;
+    /*
+     * Buffer containing the MAC layer commands
+     */
+    uint8_t MacCommandsBuffer[LORA_MAC_COMMAND_MAX_LENGTH];
 }LoRaMacCtx_t;
 
+/*
+ * Module context.
+ */
+static LoRaMacCtx_t MacCtx;
+
+static LoRaMacNvmData_t Nvm;
+
 /*!
  * Defines the LoRaMac radio events status
  */
@@ -379,48 +287,11 @@ typedef union uLoRaMacRadioEvents
     }Events;
 }LoRaMacRadioEvents_t;
 
-/*!
- * Structure used to store the radio Tx event data
- */
-struct
-{
-    TimerTime_t CurTime;
-}TxDoneParams;
-
-/*!
- * Structure used to store the radio Rx event data
- */
-struct
-{
-    TimerTime_t LastRxDone;
-    uint8_t *Payload;
-    uint16_t Size;
-    int16_t Rssi;
-    int8_t Snr;
-}RxDoneParams;
-
-/* Private variables ---------------------------------------------------------*/
-/*
- * Module context.
- */
-static LoRaMacCtx_t MacCtx;
-
-/*
- * Non-volatile module context.
- */
-static LoRaMacNvmCtx_t NvmMacCtx;
-
-/*
- * List of module contexts.
- */
-static LoRaMacCtxs_t Contexts;
-
 /*!
  * LoRaMac radio events status
  */
 LoRaMacRadioEvents_t LoRaMacRadioEvents = { .Value = 0 };
 
-/* Private function prototypes -----------------------------------------------*/
 /*!
  * \brief Function to be executed on Radio Tx Done event
  */
@@ -539,6 +410,7 @@ static bool ValidatePayloadLength( uint8_t lenN, int8_t datarate, uint8_t fOptsL
  */
 static void ProcessMacCommands( uint8_t* payload, uint8_t macIndex, uint8_t commandsSize, int8_t snr, LoRaMacRxSlot_t rxSlot );
 
+/* ST_WORKAROUND_BEGIN: Update Send request with new input parameter to allow delayed tx */
 /*!
  * \brief LoRaMAC layer generic send frame
  *
@@ -549,6 +421,7 @@ static void ProcessMacCommands( uint8_t* payload, uint8_t macIndex, uint8_t comm
  * \retval status          Status of the operation.
  */
 static LoRaMacStatus_t Send( LoRaMacHeader_t* macHdr, uint8_t fPort, void* fBuffer, uint16_t fBufferSize, bool allowDelayedTx );
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief LoRaMAC layer send join/rejoin request
@@ -660,7 +533,7 @@ static void OpenContinuousRxCWindow( void );
  *
  * \retval  void Points to a structure containing all contexts
  */
-static LoRaMacCtxs_t* GetCtxs( void );
+static LoRaMacNvmData_t* GetNvmData( void );
 
 /*!
  * \brief   Restoring of internal module contexts
@@ -673,7 +546,7 @@ static LoRaMacCtxs_t* GetCtxs( void );
  *          \ref LORAMAC_STATUS_OK,
  *          \ref LORAMAC_STATUS_PARAMETER_INVALID,
  */
-static LoRaMacStatus_t RestoreCtxs( LoRaMacCtxs_t* contexts );
+static LoRaMacStatus_t RestoreNvmData( LoRaMacNvmData_t* contexts );
 
 /*!
  * \brief   Determines the frame type
@@ -710,6 +583,11 @@ static bool CheckRetransConfirmedUplink( void );
  */
 static bool StopRetransmission( void );
 
+/*!
+ * \brief Calls the callback to indicate that a context changed
+ */
+static void CallNvmDataChangeCallback( uint16_t notifyFlags );
+
 /*!
  * \brief Handles the ACK retries algorithm.
  *        Increments the re-tries counter up until the specified number of
@@ -724,46 +602,6 @@ static void AckTimeoutRetriesProcess( void );
  */
 static void AckTimeoutRetriesFinalize( void );
 
-/*!
- * \brief Calls the callback to indicate that a context changed
- */
-static void CallNvmCtxCallback( LoRaMacNvmCtxModule_t module );
-
-/*!
- * \brief MAC NVM Context has been changed
- */
-static void EventMacNvmCtxChanged( void );
-
-/*!
- * \brief Region NVM Context has been changed
- */
-static void EventRegionNvmCtxChanged( void );
-
-/*!
- * \brief Crypto NVM Context has been changed
- */
-static void EventCryptoNvmCtxChanged( void );
-
-/*!
- * \brief Secure Element NVM Context has been changed
- */
-static void EventSecureElementNvmCtxChanged( void );
-
-/*!
- * \brief MAC commands module nvm context has been changed
- */
-static void EventCommandsNvmCtxChanged( void );
-
-/*!
- * \brief Class B module nvm context has been changed
- */
-static void EventClassBNvmCtxChanged( void );
-
-/*!
- * \brief Confirm Queue module nvm context has been changed
- */
-static void EventConfirmQueueNvmCtxChanged( void );
-
 /*!
  * \brief Verifies if a request is pending currently
  *
@@ -811,7 +649,33 @@ static void LoRaMacHandleRequestEvents( void );
  */
 static void LoRaMacHandleIndicationEvents( void );
 
-/* Private  functions ---------------------------------------------------------*/
+/*!
+ * \brief This function handles callback events for NVM updates
+ *
+ * \param [IN] nvmData Data structure containing NVM data.
+ */
+static void LoRaMacHandleNvm( LoRaMacNvmData_t* nvmData );
+
+/*!
+ * Structure used to store the radio Tx event data
+ */
+struct
+{
+    TimerTime_t CurTime;
+}TxDoneParams;
+
+/*!
+ * Structure used to store the radio Rx event data
+ */
+struct
+{
+    TimerTime_t LastRxDone;
+    uint8_t *Payload;
+    uint16_t Size;
+    int16_t Rssi;
+    int8_t Snr;
+}RxDoneParams;
+
 static void OnRadioTxDone( void )
 {
     TxDoneParams.CurTime = TimerGetCurrentTime( );
@@ -877,7 +741,7 @@ static void OnRadioRxTimeout( void )
 
 static void UpdateRxSlotIdleState( void )
 {
-    if( MacCtx.NvmCtx->DeviceClass != CLASS_C )
+    if( Nvm.MacGroup2.DeviceClass != CLASS_C )
     {
         MacCtx.RxSlot = RX_SLOT_NONE;
     }
@@ -893,7 +757,7 @@ static void ProcessRadioTxDone( void )
     PhyParam_t phyParam;
     SetBandTxDoneParams_t txDone;
 
-    if( MacCtx.NvmCtx->DeviceClass != CLASS_C )
+    if( Nvm.MacGroup2.DeviceClass != CLASS_C )
     {
         Radio.Sleep( );
     }
@@ -903,29 +767,29 @@ static void ProcessRadioTxDone( void )
     TimerSetValue( &MacCtx.RxWindowTimer2, MacCtx.RxWindow2Delay );
     TimerStart( &MacCtx.RxWindowTimer2 );
 
-    if( ( MacCtx.NvmCtx->DeviceClass == CLASS_C ) || ( MacCtx.NodeAckRequested == true ) )
+    if( ( Nvm.MacGroup2.DeviceClass == CLASS_C ) || ( MacCtx.NodeAckRequested == true ) )
     {
         getPhy.Attribute = PHY_ACK_TIMEOUT;
-        phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+        phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
         TimerSetValue( &MacCtx.AckTimeoutTimer, MacCtx.RxWindow2Delay + phyParam.Value );
         TimerStart( &MacCtx.AckTimeoutTimer );
     }
 
     // Update Aggregated last tx done time
-    MacCtx.NvmCtx->LastTxDoneTime = TxDoneParams.CurTime;
+    Nvm.MacGroup1.LastTxDoneTime = TxDoneParams.CurTime;
 
     // Update last tx done time for the current channel
     txDone.Channel = MacCtx.Channel;
     txDone.LastTxDoneTime = TxDoneParams.CurTime;
-    txDone.ElapsedTimeSinceStartUp = SysTimeSub( SysTimeGetMcuTime( ), MacCtx.NvmCtx->InitializationTime );
+    txDone.ElapsedTimeSinceStartUp = SysTimeSub( SysTimeGetMcuTime( ), Nvm.MacGroup2.InitializationTime );
     txDone.LastTxAirTime = MacCtx.TxTimeOnAir;
     txDone.Joined  = true;
-    if( MacCtx.NvmCtx->NetworkActivation == ACTIVATION_TYPE_NONE )
+    if( Nvm.MacGroup2.NetworkActivation == ACTIVATION_TYPE_NONE )
     {
         txDone.Joined  = false;
     }
 
-    RegionSetBandTxDone( MacCtx.NvmCtx->Region, &txDone );
+    RegionSetBandTxDone( Nvm.MacGroup2.Region, &txDone );
 
     if( MacCtx.NodeAckRequested == false )
     {
@@ -966,15 +830,15 @@ static void ProcessRadioRxDone( void )
     uint8_t pktHeaderLen = 0;
 
     uint32_t downLinkCounter = 0;
-    uint32_t address = MacCtx.NvmCtx->DevAddr;
+    uint32_t address = Nvm.MacGroup2.DevAddr;
     uint8_t multicast = 0;
     AddressIdentifier_t addrID = UNICAST_DEV_ADDR;
     FCntIdentifier_t fCntID;
 
     MacCtx.McpsConfirm.AckReceived = false;
-    MacCtx.McpsIndication.Rssi = rssi;
-    MacCtx.McpsIndication.Snr = snr;
-    MacCtx.McpsIndication.RxSlot = MacCtx.RxSlot;
+    MacCtx.RxStatus.Rssi = rssi;
+    MacCtx.RxStatus.Snr = snr;
+    MacCtx.RxStatus.RxSlot = MacCtx.RxSlot;
     MacCtx.McpsIndication.Port = 0;
     MacCtx.McpsIndication.Multicast = 0;
     MacCtx.McpsIndication.FramePending = 0;
@@ -998,19 +862,19 @@ static void ProcessRadioRxDone( void )
         return;
     }
     // Check if we expect a ping or a multicast slot.
-    if( MacCtx.NvmCtx->DeviceClass == CLASS_B )
+    if( Nvm.MacGroup2.DeviceClass == CLASS_B )
     {
         if( LoRaMacClassBIsPingExpected( ) == true )
         {
             LoRaMacClassBSetPingSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
             LoRaMacClassBPingSlotTimerEvent( NULL );
-            MacCtx.McpsIndication.RxSlot = RX_SLOT_WIN_CLASS_B_PING_SLOT;
+            MacCtx.RxStatus.RxSlot = RX_SLOT_WIN_CLASS_B_PING_SLOT;
         }
         else if( LoRaMacClassBIsMulticastExpected( ) == true )
         {
             LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
             LoRaMacClassBMulticastSlotTimerEvent( NULL );
-            MacCtx.McpsIndication.RxSlot = RX_SLOT_WIN_CLASS_B_MULTICAST_SLOT;
+            MacCtx.RxStatus.RxSlot = RX_SLOT_WIN_CLASS_B_MULTICAST_SLOT;
         }
     }
 
@@ -1030,7 +894,7 @@ static void ProcessRadioRxDone( void )
             macMsgJoinAccept.BufSize = size;
 
             // Abort in case if the device isn't joined yet and no rejoin request is ongoing.
-            if( MacCtx.NvmCtx->NetworkActivation != ACTIVATION_TYPE_NONE )
+            if( Nvm.MacGroup2.NetworkActivation != ACTIVATION_TYPE_NONE )
             {
                 MacCtx.McpsIndication.Status = LORAMAC_EVENT_INFO_STATUS_ERROR;
                 PrepareRxDoneAbort( );
@@ -1041,37 +905,37 @@ static void ProcessRadioRxDone( void )
             if( LORAMAC_CRYPTO_SUCCESS == macCryptoStatus )
             {
                 // Network ID
-                MacCtx.NvmCtx->NetID = ( uint32_t ) macMsgJoinAccept.NetID[0];
-                MacCtx.NvmCtx->NetID |= ( ( uint32_t ) macMsgJoinAccept.NetID[1] << 8 );
-                MacCtx.NvmCtx->NetID |= ( ( uint32_t ) macMsgJoinAccept.NetID[2] << 16 );
+                Nvm.MacGroup2.NetID = ( uint32_t ) macMsgJoinAccept.NetID[0];
+                Nvm.MacGroup2.NetID |= ( ( uint32_t ) macMsgJoinAccept.NetID[1] << 8 );
+                Nvm.MacGroup2.NetID |= ( ( uint32_t ) macMsgJoinAccept.NetID[2] << 16 );
 
                 // Device Address
-                MacCtx.NvmCtx->DevAddr = macMsgJoinAccept.DevAddr;
+                Nvm.MacGroup2.DevAddr = macMsgJoinAccept.DevAddr;
 
                 // DLSettings
-                MacCtx.NvmCtx->MacParams.Rx1DrOffset = macMsgJoinAccept.DLSettings.Bits.RX1DRoffset;
-                MacCtx.NvmCtx->MacParams.Rx2Channel.Datarate = macMsgJoinAccept.DLSettings.Bits.RX2DataRate;
-                MacCtx.NvmCtx->MacParams.RxCChannel.Datarate = macMsgJoinAccept.DLSettings.Bits.RX2DataRate;
+                Nvm.MacGroup2.MacParams.Rx1DrOffset = macMsgJoinAccept.DLSettings.Bits.RX1DRoffset;
+                Nvm.MacGroup2.MacParams.Rx2Channel.Datarate = macMsgJoinAccept.DLSettings.Bits.RX2DataRate;
+                Nvm.MacGroup2.MacParams.RxCChannel.Datarate = macMsgJoinAccept.DLSettings.Bits.RX2DataRate;
 
                 // RxDelay
-                MacCtx.NvmCtx->MacParams.ReceiveDelay1 = macMsgJoinAccept.RxDelay;
-                if( MacCtx.NvmCtx->MacParams.ReceiveDelay1 == 0 )
+                Nvm.MacGroup2.MacParams.ReceiveDelay1 = macMsgJoinAccept.RxDelay;
+                if( Nvm.MacGroup2.MacParams.ReceiveDelay1 == 0 )
                 {
-                    MacCtx.NvmCtx->MacParams.ReceiveDelay1 = 1;
+                    Nvm.MacGroup2.MacParams.ReceiveDelay1 = 1;
                 }
-                MacCtx.NvmCtx->MacParams.ReceiveDelay1 *= 1000;
-                MacCtx.NvmCtx->MacParams.ReceiveDelay2 = MacCtx.NvmCtx->MacParams.ReceiveDelay1 + 1000;
+                Nvm.MacGroup2.MacParams.ReceiveDelay1 *= 1000;
+                Nvm.MacGroup2.MacParams.ReceiveDelay2 = Nvm.MacGroup2.MacParams.ReceiveDelay1 + 1000;
 
-                MacCtx.NvmCtx->Version.Fields.Minor = 0;
+                Nvm.MacGroup2.Version.Fields.Minor = 0;
 
                 // Apply CF list
                 applyCFList.Payload = macMsgJoinAccept.CFList;
                 // Size of the regular payload is 12. Plus 1 byte MHDR and 4 bytes MIC
                 applyCFList.Size = size - 17;
 
-                RegionApplyCFList( MacCtx.NvmCtx->Region, &applyCFList );
+                RegionApplyCFList( Nvm.MacGroup2.Region, &applyCFList );
 
-                MacCtx.NvmCtx->NetworkActivation = ACTIVATION_TYPE_OTAA;
+                Nvm.MacGroup2.NetworkActivation = ACTIVATION_TYPE_OTAA;
 
                 // MLME handling
                 if( LoRaMacConfirmQueueIsCmdActive( MLME_JOIN ) == true )
@@ -1087,23 +951,26 @@ static void ProcessRadioRxDone( void )
                     LoRaMacConfirmQueueSetStatus( LORAMAC_EVENT_INFO_STATUS_JOIN_FAIL, MLME_JOIN );
                 }
             }
+            MacCtx.MacFlags.Bits.MlmeInd = 1;
             break;
         case FRAME_TYPE_DATA_CONFIRMED_DOWN:
             MacCtx.McpsIndication.McpsIndication = MCPS_CONFIRMED;
             // Intentional fall through
         case FRAME_TYPE_DATA_UNCONFIRMED_DOWN:
             // Check if the received payload size is valid
-            getPhy.UplinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
+            getPhy.UplinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
             getPhy.Datarate = MacCtx.McpsIndication.RxDatarate;
             getPhy.Attribute = PHY_MAX_PAYLOAD;
 
+            /* ST_WORKAROUND_BEGIN: Keep repeater feature */
             // Get the maximum payload length
-            if( MacCtx.NvmCtx->RepeaterSupport == true )
+            if( Nvm.MacGroup2.MacParams.RepeaterSupport == true )
             {
                 getPhy.Attribute = PHY_MAX_PAYLOAD_REPEATER;
             }
+            /* ST_WORKAROUND_END */
 
-            phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+            phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
             if( ( MAX( 0, ( int16_t )( ( int16_t ) size - ( int16_t ) LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE ) ) > ( int16_t )phyParam.Value ) ||
                 ( size < LORAMAC_FRAME_PAYLOAD_MIN_SIZE ) )
             {
@@ -1139,16 +1006,16 @@ static void ProcessRadioRxDone( void )
             downLinkCounter = 0;
             for( uint8_t i = 0; i < LORAMAC_MAX_MC_CTX; i++ )
             {
-                if( ( MacCtx.NvmCtx->MulticastChannelList[i].ChannelParams.Address == macMsgData.FHDR.DevAddr ) &&
-                    ( MacCtx.NvmCtx->MulticastChannelList[i].ChannelParams.IsEnabled == true ) )
+                if( ( Nvm.MacGroup2.MulticastChannelList[i].ChannelParams.Address == macMsgData.FHDR.DevAddr ) &&
+                    ( Nvm.MacGroup2.MulticastChannelList[i].ChannelParams.IsEnabled == true ) )
                 {
                     multicast = 1;
-                    addrID = MacCtx.NvmCtx->MulticastChannelList[i].ChannelParams.GroupID;
-                    downLinkCounter = *( MacCtx.NvmCtx->MulticastChannelList[i].DownLinkCounter );
-                    address = MacCtx.NvmCtx->MulticastChannelList[i].ChannelParams.Address;
-                    if( MacCtx.NvmCtx->DeviceClass == CLASS_C )
+                    addrID = Nvm.MacGroup2.MulticastChannelList[i].ChannelParams.GroupID;
+                    downLinkCounter = *( Nvm.MacGroup2.MulticastChannelList[i].DownLinkCounter );
+                    address = Nvm.MacGroup2.MulticastChannelList[i].ChannelParams.Address;
+                    if( Nvm.MacGroup2.DeviceClass == CLASS_C )
                     {
-                        MacCtx.McpsIndication.RxSlot = RX_SLOT_WIN_CLASS_C_MULTICAST;
+                        MacCtx.RxStatus.RxSlot = RX_SLOT_WIN_CLASS_C_MULTICAST;
                     }
                     break;
                 }
@@ -1166,19 +1033,19 @@ static void ProcessRadioRxDone( void )
 
             // Get maximum allowed counter difference
             getPhy.Attribute = PHY_MAX_FCNT_GAP;
-            phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+            phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
 
             // Get downlink frame counter value
-            macCryptoStatus = GetFCntDown( addrID, fType, &macMsgData, MacCtx.NvmCtx->Version, phyParam.Value, &fCntID, &downLinkCounter );
+            macCryptoStatus = GetFCntDown( addrID, fType, &macMsgData, Nvm.MacGroup2.Version, phyParam.Value, &fCntID, &downLinkCounter );
             if( macCryptoStatus != LORAMAC_CRYPTO_SUCCESS )
             {
                 if( macCryptoStatus == LORAMAC_CRYPTO_FAIL_FCNT_DUPLICATED )
                 {
                     // Catch the case of repeated downlink frame counter
                     MacCtx.McpsIndication.Status = LORAMAC_EVENT_INFO_STATUS_DOWNLINK_REPEATED;
-                    if( ( MacCtx.NvmCtx->Version.Fields.Minor == 0 ) && ( macHdr.Bits.MType == FRAME_TYPE_DATA_CONFIRMED_DOWN ) && ( MacCtx.NvmCtx->LastRxMic == macMsgData.MIC ) )
+                    if( ( Nvm.MacGroup2.Version.Fields.Minor == 0 ) && ( macHdr.Bits.MType == FRAME_TYPE_DATA_CONFIRMED_DOWN ) && ( Nvm.MacGroup1.LastRxMic == macMsgData.MIC ) )
                     {
-                        MacCtx.NvmCtx->SrvAckRequested = true;
+                        Nvm.MacGroup1.SrvAckRequested = true;
                     }
                 }
                 else if( macCryptoStatus == LORAMAC_CRYPTO_FAIL_MAX_GAP_FCNT )
@@ -1226,10 +1093,10 @@ static void ProcessRadioRxDone( void )
             MacCtx.McpsConfirm.AckReceived = macMsgData.FHDR.FCtrl.Bits.Ack;
 
             // Reset ADR ACK Counter only, when RX1 or RX2 slot
-            if( ( MacCtx.McpsIndication.RxSlot == RX_SLOT_WIN_1 ) ||
-                ( MacCtx.McpsIndication.RxSlot == RX_SLOT_WIN_2 ) )
+            if( ( MacCtx.RxStatus.RxSlot == RX_SLOT_WIN_1 ) ||
+                ( MacCtx.RxStatus.RxSlot == RX_SLOT_WIN_2 ) )
             {
-                MacCtx.NvmCtx->AdrAckCounter = 0;
+                Nvm.MacGroup1.AdrAckCounter = 0;
             }
 
             // MCPS Indication and ack requested handling
@@ -1241,21 +1108,21 @@ static void ProcessRadioRxDone( void )
             {
                 if( macHdr.Bits.MType == FRAME_TYPE_DATA_CONFIRMED_DOWN )
                 {
-                    MacCtx.NvmCtx->SrvAckRequested = true;
-                    if( MacCtx.NvmCtx->Version.Fields.Minor == 0 )
+                    Nvm.MacGroup1.SrvAckRequested = true;
+                    if( Nvm.MacGroup2.Version.Fields.Minor == 0 )
                     {
-                        MacCtx.NvmCtx->LastRxMic = macMsgData.MIC;
+                        Nvm.MacGroup1.LastRxMic = macMsgData.MIC;
                     }
                     MacCtx.McpsIndication.McpsIndication = MCPS_CONFIRMED;
                 }
                 else
                 {
-                    MacCtx.NvmCtx->SrvAckRequested = false;
+                    Nvm.MacGroup1.SrvAckRequested = false;
                     MacCtx.McpsIndication.McpsIndication = MCPS_UNCONFIRMED;
                 }
             }
 
-            RemoveMacCommands( MacCtx.McpsIndication.RxSlot, macMsgData.FHDR.FCtrl, MacCtx.McpsConfirm.McpsRequest );
+            RemoveMacCommands( MacCtx.RxStatus.RxSlot, macMsgData.FHDR.FCtrl, MacCtx.McpsConfirm.McpsRequest );
 
             switch( fType )
             {
@@ -1268,7 +1135,7 @@ static void ProcessRadioRxDone( void )
                     */
 
                     // Decode MAC commands in FOpts field
-                    ProcessMacCommands( macMsgData.FHDR.FOpts, 0, macMsgData.FHDR.FCtrl.Bits.FOptsLen, snr, MacCtx.McpsIndication.RxSlot );
+                    ProcessMacCommands( macMsgData.FHDR.FOpts, 0, macMsgData.FHDR.FCtrl.Bits.FOptsLen, snr, MacCtx.RxStatus.RxSlot );
                     MacCtx.McpsIndication.Port = macMsgData.FPort;
                     MacCtx.McpsIndication.Buffer = macMsgData.FRMPayload;
                     MacCtx.McpsIndication.BufferSize = macMsgData.FRMPayloadSize;
@@ -1284,7 +1151,7 @@ static void ProcessRadioRxDone( void )
                     */
 
                     // Decode MAC commands in FOpts field
-                    ProcessMacCommands( macMsgData.FHDR.FOpts, 0, macMsgData.FHDR.FCtrl.Bits.FOptsLen, snr, MacCtx.McpsIndication.RxSlot );
+                    ProcessMacCommands( macMsgData.FHDR.FOpts, 0, macMsgData.FHDR.FCtrl.Bits.FOptsLen, snr, MacCtx.RxStatus.RxSlot );
                     MacCtx.McpsIndication.Port = macMsgData.FPort;
                     break;
                 }
@@ -1297,7 +1164,7 @@ static void ProcessRadioRxDone( void )
                     */
 
                     // Decode MAC commands in FRMPayload
-                    ProcessMacCommands( macMsgData.FRMPayload, 0, macMsgData.FRMPayloadSize, snr, MacCtx.McpsIndication.RxSlot );
+                    ProcessMacCommands( macMsgData.FRMPayload, 0, macMsgData.FRMPayloadSize, snr, MacCtx.RxStatus.RxSlot );
                     MacCtx.McpsIndication.Port = macMsgData.FPort;
                     break;
                 }
@@ -1353,7 +1220,7 @@ static void ProcessRadioRxDone( void )
     }
     else
     {
-        if( MacCtx.NvmCtx->DeviceClass == CLASS_C )
+        if( Nvm.MacGroup2.DeviceClass == CLASS_C )
         {
             OnAckTimeoutTimerEvent( NULL );
         }
@@ -1365,7 +1232,7 @@ static void ProcessRadioRxDone( void )
 
 static void ProcessRadioTxTimeout( void )
 {
-    if( MacCtx.NvmCtx->DeviceClass != CLASS_C )
+    if( Nvm.MacGroup2.DeviceClass != CLASS_C )
     {
         Radio.Sleep( );
     }
@@ -1384,7 +1251,7 @@ static void HandleRadioRxErrorTimeout( LoRaMacEventInfoStatus_t rx1EventInfoStat
 {
     bool classBRx = false;
 
-    if( MacCtx.NvmCtx->DeviceClass != CLASS_C )
+    if( Nvm.MacGroup2.DeviceClass != CLASS_C )
     {
         Radio.Sleep( );
     }
@@ -1395,7 +1262,7 @@ static void HandleRadioRxErrorTimeout( LoRaMacEventInfoStatus_t rx1EventInfoStat
         LoRaMacClassBBeaconTimerEvent( NULL );
         classBRx = true;
     }
-    if( MacCtx.NvmCtx->DeviceClass == CLASS_B )
+    if( Nvm.MacGroup2.DeviceClass == CLASS_B )
     {
         if( LoRaMacClassBIsPingExpected( ) == true )
         {
@@ -1421,7 +1288,7 @@ static void HandleRadioRxErrorTimeout( LoRaMacEventInfoStatus_t rx1EventInfoStat
             }
             LoRaMacConfirmQueueSetStatusCmn( rx1EventInfoStatus );
 
-            if( TimerGetElapsedTime( MacCtx.NvmCtx->LastTxDoneTime ) >= MacCtx.RxWindow2Delay )
+            if( TimerGetElapsedTime( Nvm.MacGroup1.LastTxDoneTime ) >= MacCtx.RxWindow2Delay )
             {
                 TimerStop( &MacCtx.RxWindowTimer2 );
                 MacCtx.MacFlags.Bits.MacDone = 1;
@@ -1435,7 +1302,7 @@ static void HandleRadioRxErrorTimeout( LoRaMacEventInfoStatus_t rx1EventInfoStat
             }
             LoRaMacConfirmQueueSetStatusCmn( rx2EventInfoStatus );
 
-            if( MacCtx.NvmCtx->DeviceClass != CLASS_C )
+            if( Nvm.MacGroup2.DeviceClass != CLASS_C )
             {
                 MacCtx.MacFlags.Bits.MacDone = 1;
             }
@@ -1489,6 +1356,17 @@ static void LoRaMacHandleIrqEvents( void )
     }
 }
 
+bool LoRaMacIsBusy( void )
+{
+    if( ( MacCtx.MacState == LORAMAC_IDLE ) &&
+        ( MacCtx.AllowRequests == LORAMAC_REQUEST_HANDLING_ON ) )
+    {
+        return false;
+    }
+    return true;
+}
+
+
 static void LoRaMacEnableRequests( LoRaMacRequestHandling_t requestState )
 {
     MacCtx.AllowRequests = requestState;
@@ -1559,7 +1437,7 @@ static void LoRaMacHandleIndicationEvents( void )
     if( MacCtx.MacFlags.Bits.MlmeInd == 1 )
     {
         MacCtx.MacFlags.Bits.MlmeInd = 0;
-        MacCtx.MacPrimitives->MacMlmeIndication( &MacCtx.MlmeIndication );
+        MacCtx.MacPrimitives->MacMlmeIndication( &MacCtx.MlmeIndication, &MacCtx.RxStatus );
     }
 
     if( MacCtx.MacFlags.Bits.MlmeSchedUplinkInd == 1 )
@@ -1568,7 +1446,7 @@ static void LoRaMacHandleIndicationEvents( void )
         schduleUplinkIndication.MlmeIndication = MLME_SCHEDULE_UPLINK;
         schduleUplinkIndication.Status = LORAMAC_EVENT_INFO_STATUS_OK;
 
-        MacCtx.MacPrimitives->MacMlmeIndication( &schduleUplinkIndication );
+        MacCtx.MacPrimitives->MacMlmeIndication( &schduleUplinkIndication, &MacCtx.RxStatus );
         MacCtx.MacFlags.Bits.MlmeSchedUplinkInd = 0;
     }
 
@@ -1576,7 +1454,7 @@ static void LoRaMacHandleIndicationEvents( void )
     if( MacCtx.MacFlags.Bits.McpsInd == 1 )
     {
         MacCtx.MacFlags.Bits.McpsInd = 0;
-        MacCtx.MacPrimitives->MacMcpsIndication( &MacCtx.McpsIndication );
+        MacCtx.MacPrimitives->MacMcpsIndication( &MacCtx.McpsIndication, &MacCtx.RxStatus );
     }
 }
 
@@ -1599,7 +1477,7 @@ static void LoRaMacHandleMcpsRequest( void )
             {
                 stopRetransmission = CheckRetransConfirmedUplink( );
 
-                if( MacCtx.NvmCtx->Version.Fields.Minor == 0 )
+                if( Nvm.MacGroup2.Version.Fields.Minor == 0 )
                 {
                     if( stopRetransmission == false )
                     {
@@ -1679,6 +1557,118 @@ static void LoRaMacCheckForRxAbort( void )
     }
 }
 
+static void LoRaMacHandleNvm( LoRaMacNvmData_t* nvmData )
+{
+    uint32_t crc = 0;
+    uint16_t notifyFlags = LORAMAC_NVM_NOTIFY_FLAG_NONE;
+
+    if( MacCtx.MacState != LORAMAC_IDLE )
+    {
+        return;
+    }
+
+    // Crypto
+    crc = Crc32( ( uint8_t* ) &nvmData->Crypto, sizeof( nvmData->Crypto ) -
+                                                sizeof( nvmData->Crypto.Crc32 ) );
+    if( crc != nvmData->Crypto.Crc32 )
+    {
+        nvmData->Crypto.Crc32 = crc;
+        notifyFlags |= LORAMAC_NVM_NOTIFY_FLAG_CRYPTO;
+    }
+
+    // MacGroup1
+    crc = Crc32( ( uint8_t* ) &nvmData->MacGroup1, sizeof( nvmData->MacGroup1 ) -
+                                                   sizeof( nvmData->MacGroup1.Crc32 ) );
+    if( crc != nvmData->MacGroup1.Crc32 )
+    {
+        nvmData->MacGroup1.Crc32 = crc;
+        notifyFlags |= LORAMAC_NVM_NOTIFY_FLAG_MAC_GROUP1;
+    }
+
+    // MacGroup2
+    crc = Crc32( ( uint8_t* ) &nvmData->MacGroup2, sizeof( nvmData->MacGroup2 ) -
+                                                   sizeof( nvmData->MacGroup2.Crc32 ) );
+    if( crc != nvmData->MacGroup2.Crc32 )
+    {
+        nvmData->MacGroup2.Crc32 = crc;
+        notifyFlags |= LORAMAC_NVM_NOTIFY_FLAG_MAC_GROUP2;
+    }
+
+    // Secure Element
+    crc = Crc32( ( uint8_t* ) &nvmData->SecureElement, sizeof( nvmData->SecureElement ) -
+                                                       sizeof( nvmData->SecureElement.Crc32 ) );
+    if( crc != nvmData->SecureElement.Crc32 )
+    {
+        nvmData->SecureElement.Crc32 = crc;
+        notifyFlags |= LORAMAC_NVM_NOTIFY_FLAG_SECURE_ELEMENT;
+    }
+
+    // Region
+    crc = Crc32( ( uint8_t* ) &nvmData->RegionGroup1, sizeof( nvmData->RegionGroup1 ) -
+                                                sizeof( nvmData->RegionGroup1.Crc32 ) );
+    if( crc != nvmData->RegionGroup1.Crc32 )
+    {
+        nvmData->RegionGroup1.Crc32 = crc;
+        notifyFlags |= LORAMAC_NVM_NOTIFY_FLAG_REGION_GROUP1;
+    }
+
+    crc = Crc32( ( uint8_t* ) &nvmData->RegionGroup2, sizeof( nvmData->RegionGroup2 ) -
+                                                sizeof( nvmData->RegionGroup2.Crc32 ) );
+    if( crc != nvmData->RegionGroup2.Crc32 )
+    {
+        nvmData->RegionGroup2.Crc32 = crc;
+        notifyFlags |= LORAMAC_NVM_NOTIFY_FLAG_REGION_GROUP2;
+    }
+
+    // ClassB
+    crc = Crc32( ( uint8_t* ) &nvmData->ClassB, sizeof( nvmData->ClassB ) -
+                                                sizeof( nvmData->ClassB.Crc32 ) );
+    if( crc != nvmData->ClassB.Crc32 )
+    {
+        nvmData->ClassB.Crc32 = crc;
+        notifyFlags |= LORAMAC_NVM_NOTIFY_FLAG_CLASS_B;
+    }
+
+    CallNvmDataChangeCallback( notifyFlags );
+}
+
+
+void LoRaMacProcess( void )
+{
+    uint8_t noTx = false;
+
+    LoRaMacHandleIrqEvents( );
+    LoRaMacClassBProcess( );
+
+    // MAC proceeded a state and is ready to check
+    if( MacCtx.MacFlags.Bits.MacDone == 1 )
+    {
+        LoRaMacEnableRequests( LORAMAC_REQUEST_HANDLING_OFF );
+        LoRaMacCheckForRxAbort( );
+
+        // An error occurs during transmitting
+        if( IsRequestPending( ) > 0 )
+        {
+            noTx |= LoRaMacCheckForBeaconAcquisition( );
+        }
+
+        if( noTx == 0x00 )
+        {
+            LoRaMacHandleMlmeRequest( );
+            LoRaMacHandleMcpsRequest( );
+        }
+        LoRaMacHandleRequestEvents( );
+        LoRaMacHandleScheduleUplinkEvent( );
+        LoRaMacHandleNvm( &Nvm );
+        LoRaMacEnableRequests( LORAMAC_REQUEST_HANDLING_ON );
+    }
+    LoRaMacHandleIndicationEvents( );
+    if( MacCtx.RxSlot == RX_SLOT_WIN_CLASS_C )
+    {
+        OpenContinuousRxCWindow( );
+    }
+}
+
 static void OnTxDelayedTimerEvent( void* context )
 {
     TimerStop( &MacCtx.TxDelayedTimer );
@@ -1695,7 +1685,7 @@ static void OnTxDelayedTimerEvent( void* context )
         default:
         {
             // Stop retransmission attempt
-            MacCtx.McpsConfirm.Datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
+            MacCtx.McpsConfirm.Datarate = Nvm.MacGroup1.ChannelsDatarate;
             MacCtx.McpsConfirm.NbRetries = MacCtx.AckTimeoutRetriesCounter;
             MacCtx.McpsConfirm.Status = LORAMAC_EVENT_INFO_STATUS_TX_DR_PAYLOAD_SIZE_ERROR;
             LoRaMacConfirmQueueSetStatusCmn( LORAMAC_EVENT_INFO_STATUS_TX_DR_PAYLOAD_SIZE_ERROR );
@@ -1708,9 +1698,9 @@ static void OnTxDelayedTimerEvent( void* context )
 static void OnRxWindow1TimerEvent( void* context )
 {
     MacCtx.RxWindow1Config.Channel = MacCtx.Channel;
-    MacCtx.RxWindow1Config.DrOffset = MacCtx.NvmCtx->MacParams.Rx1DrOffset;
-    MacCtx.RxWindow1Config.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
-    MacCtx.RxWindow1Config.RepeaterSupport = MacCtx.NvmCtx->RepeaterSupport;
+    MacCtx.RxWindow1Config.DrOffset = Nvm.MacGroup2.MacParams.Rx1DrOffset;
+    MacCtx.RxWindow1Config.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
+    MacCtx.RxWindow1Config.RepeaterSupport = Nvm.MacGroup2.MacParams.RepeaterSupport; /* ST_WORKAROUND: Keep repeater feature */
     MacCtx.RxWindow1Config.RxContinuous = false;
     MacCtx.RxWindow1Config.RxSlot = RX_SLOT_WIN_1;
 
@@ -1726,9 +1716,9 @@ static void OnRxWindow2TimerEvent( void* context )
         return;
     }
     MacCtx.RxWindow2Config.Channel = MacCtx.Channel;
-    MacCtx.RxWindow2Config.Frequency = MacCtx.NvmCtx->MacParams.Rx2Channel.Frequency;
-    MacCtx.RxWindow2Config.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
-    MacCtx.RxWindow2Config.RepeaterSupport = MacCtx.NvmCtx->RepeaterSupport;
+    MacCtx.RxWindow2Config.Frequency = Nvm.MacGroup2.MacParams.Rx2Channel.Frequency;
+    MacCtx.RxWindow2Config.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
+    MacCtx.RxWindow2Config.RepeaterSupport = Nvm.MacGroup2.MacParams.RepeaterSupport; /* ST_WORKAROUND: Keep repeater feature */
     MacCtx.RxWindow2Config.RxContinuous = false;
     MacCtx.RxWindow2Config.RxSlot = RX_SLOT_WIN_2;
 
@@ -1743,7 +1733,7 @@ static void OnAckTimeoutTimerEvent( void* context )
     {
         MacCtx.AckTimeoutRetry = true;
     }
-    if( MacCtx.NvmCtx->DeviceClass == CLASS_C )
+    if( Nvm.MacGroup2.DeviceClass == CLASS_C )
     {
         MacCtx.MacFlags.Bits.MacDone = 1;
     }
@@ -1782,20 +1772,28 @@ static LoRaMacCryptoStatus_t GetFCntDown( AddressIdentifier_t addrID, FType_t fT
                 *fCntID = FCNT_DOWN;
             }
             break;
+        /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+#if ( LORAMAC_MAX_MC_CTX > 0 )
         case MULTICAST_0_ADDR:
             *fCntID = MC_FCNT_DOWN_0;
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
 #if ( LORAMAC_MAX_MC_CTX > 1 )
         case MULTICAST_1_ADDR:
             *fCntID = MC_FCNT_DOWN_1;
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
         case MULTICAST_2_ADDR:
             *fCntID = MC_FCNT_DOWN_2;
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
         case MULTICAST_3_ADDR:
             *fCntID = MC_FCNT_DOWN_3;
             break;
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
+        /* ST_WORKAROUND_END */
         default:
             return LORAMAC_CRYPTO_FAIL_FCNT_ID;
     }
@@ -1807,42 +1805,43 @@ static LoRaMacStatus_t SwitchClass( DeviceClass_t deviceClass )
 {
     LoRaMacStatus_t status = LORAMAC_STATUS_PARAMETER_INVALID;
 
-    switch( MacCtx.NvmCtx->DeviceClass )
+    switch( Nvm.MacGroup2.DeviceClass )
     {
         case CLASS_A:
         {
             if( deviceClass == CLASS_A )
             {
                 // Revert back RxC parameters
-                MacCtx.NvmCtx->MacParams.RxCChannel = MacCtx.NvmCtx->MacParams.Rx2Channel;
+                Nvm.MacGroup2.MacParams.RxCChannel = Nvm.MacGroup2.MacParams.Rx2Channel;
             }
             if( deviceClass == CLASS_B )
             {
                 status = LoRaMacClassBSwitchClass( deviceClass );
                 if( status == LORAMAC_STATUS_OK )
                 {
-                    MacCtx.NvmCtx->DeviceClass = deviceClass;
+                    Nvm.MacGroup2.DeviceClass = deviceClass;
                 }
             }
 
             if( deviceClass == CLASS_C )
             {
-                MacCtx.NvmCtx->DeviceClass = deviceClass;
+                Nvm.MacGroup2.DeviceClass = deviceClass;
 
                 MacCtx.RxWindowCConfig = MacCtx.RxWindow2Config;
                 MacCtx.RxWindowCConfig.RxSlot = RX_SLOT_WIN_CLASS_C;
 
                 for( int8_t i = 0; i < LORAMAC_MAX_MC_CTX; i++ )
                 {
-                    if( MacCtx.NvmCtx->MulticastChannelList[i].ChannelParams.IsEnabled == true )
+                    if( Nvm.MacGroup2.MulticastChannelList[i].ChannelParams.IsEnabled == true )
+                    // TODO: Check multicast channel device class.
                     {
-                        MacCtx.NvmCtx->MacParams.RxCChannel.Frequency = MacCtx.NvmCtx->MulticastChannelList[i].ChannelParams.RxParams.ClassC.Frequency;
-                        MacCtx.NvmCtx->MacParams.RxCChannel.Datarate = MacCtx.NvmCtx->MulticastChannelList[i].ChannelParams.RxParams.ClassC.Datarate;
+                        Nvm.MacGroup2.MacParams.RxCChannel.Frequency = Nvm.MacGroup2.MulticastChannelList[i].ChannelParams.RxParams.ClassC.Frequency;
+                        Nvm.MacGroup2.MacParams.RxCChannel.Datarate = Nvm.MacGroup2.MulticastChannelList[i].ChannelParams.RxParams.ClassC.Datarate;
 
                         MacCtx.RxWindowCConfig.Channel = MacCtx.Channel;
-                        MacCtx.RxWindowCConfig.Frequency = MacCtx.NvmCtx->MacParams.RxCChannel.Frequency;
-                        MacCtx.RxWindowCConfig.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
-                        MacCtx.RxWindowCConfig.RepeaterSupport = MacCtx.NvmCtx->RepeaterSupport;
+                        MacCtx.RxWindowCConfig.Frequency = Nvm.MacGroup2.MacParams.RxCChannel.Frequency;
+                        MacCtx.RxWindowCConfig.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
+                        MacCtx.RxWindowCConfig.RepeaterSupport = Nvm.MacGroup2.MacParams.RepeaterSupport; /* ST_WORKAROUND: Keep repeater feature */
                         MacCtx.RxWindowCConfig.RxSlot = RX_SLOT_WIN_CLASS_C_MULTICAST;
                         MacCtx.RxWindowCConfig.RxContinuous = true;
                         break;
@@ -1865,7 +1864,7 @@ static LoRaMacStatus_t SwitchClass( DeviceClass_t deviceClass )
             status = LoRaMacClassBSwitchClass( deviceClass );
             if( status == LORAMAC_STATUS_OK )
             {
-                MacCtx.NvmCtx->DeviceClass = deviceClass;
+                Nvm.MacGroup2.DeviceClass = deviceClass;
             }
             break;
         }
@@ -1873,7 +1872,7 @@ static LoRaMacStatus_t SwitchClass( DeviceClass_t deviceClass )
         {
             if( deviceClass == CLASS_A )
             {
-                MacCtx.NvmCtx->DeviceClass = deviceClass;
+                Nvm.MacGroup2.DeviceClass = deviceClass;
 
                 // Set the radio into sleep to setup a defined state
                 Radio.Sleep( );
@@ -1893,17 +1892,17 @@ static uint8_t GetMaxAppPayloadWithoutFOptsLength( int8_t datarate )
     PhyParam_t phyParam;
 
     // Setup PHY request
-    getPhy.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
+    getPhy.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
     getPhy.Datarate = datarate;
     getPhy.Attribute = PHY_MAX_PAYLOAD;
-
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     // Get the maximum payload length
-    if( MacCtx.NvmCtx->RepeaterSupport == true )
+    if( Nvm.MacGroup2.MacParams.RepeaterSupport == true )
     {
         getPhy.Attribute = PHY_MAX_PAYLOAD_REPEATER;
     }
-
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+    /* ST_WORKAROUND_END */
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
 
     return phyParam.Value;
 }
@@ -1973,22 +1972,22 @@ static void ProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8_t comm
                     // Fill parameter structure
                     linkAdrReq.Payload = &payload[macIndex - 1];
                     linkAdrReq.PayloadSize = commandsSize - ( macIndex - 1 );
-                    linkAdrReq.AdrEnabled = MacCtx.NvmCtx->AdrCtrlOn;
-                    linkAdrReq.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
-                    linkAdrReq.CurrentDatarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
-                    linkAdrReq.CurrentTxPower = MacCtx.NvmCtx->MacParams.ChannelsTxPower;
-                    linkAdrReq.CurrentNbRep = MacCtx.NvmCtx->MacParams.ChannelsNbTrans;
-                    linkAdrReq.Version = MacCtx.NvmCtx->Version;
+                    linkAdrReq.AdrEnabled = Nvm.MacGroup2.AdrCtrlOn;
+                    linkAdrReq.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
+                    linkAdrReq.CurrentDatarate = Nvm.MacGroup1.ChannelsDatarate;
+                    linkAdrReq.CurrentTxPower = Nvm.MacGroup1.ChannelsTxPower;
+                    linkAdrReq.CurrentNbRep = Nvm.MacGroup2.MacParams.ChannelsNbTrans;
+                    linkAdrReq.Version = Nvm.MacGroup2.Version;
 
                     // Process the ADR requests
-                    status = RegionLinkAdrReq( MacCtx.NvmCtx->Region, &linkAdrReq, &linkAdrDatarate,
+                    status = RegionLinkAdrReq( Nvm.MacGroup2.Region, &linkAdrReq, &linkAdrDatarate,
                                                &linkAdrTxPower, &linkAdrNbRep, &linkAdrNbBytesParsed );
 
                     if( ( status & 0x07 ) == 0x07 )
                     {
-                        MacCtx.NvmCtx->MacParams.ChannelsDatarate = linkAdrDatarate;
-                        MacCtx.NvmCtx->MacParams.ChannelsTxPower = linkAdrTxPower;
-                        MacCtx.NvmCtx->MacParams.ChannelsNbTrans = linkAdrNbRep;
+                        Nvm.MacGroup1.ChannelsDatarate = linkAdrDatarate;
+                        Nvm.MacGroup1.ChannelsTxPower = linkAdrTxPower;
+                        Nvm.MacGroup2.MacParams.ChannelsNbTrans = linkAdrNbRep;
                     }
 
                     // Add the answers to the buffer
@@ -2003,8 +2002,8 @@ static void ProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8_t comm
             }
             case SRV_MAC_DUTY_CYCLE_REQ:
             {
-                MacCtx.NvmCtx->MaxDCycle = payload[macIndex++] & 0x0F;
-                MacCtx.NvmCtx->AggregatedDCycle = 1 << MacCtx.NvmCtx->MaxDCycle;
+                Nvm.MacGroup2.MaxDCycle = payload[macIndex++] & 0x0F;
+                Nvm.MacGroup2.AggregatedDCycle = 1 << Nvm.MacGroup2.MaxDCycle;
                 LoRaMacCommandsAddCmd( MOTE_MAC_DUTY_CYCLE_ANS, macCmdPayload, 0 );
                 break;
             }
@@ -2023,15 +2022,15 @@ static void ProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8_t comm
                 rxParamSetupReq.Frequency *= 100;
 
                 // Perform request on region
-                status = RegionRxParamSetupReq( MacCtx.NvmCtx->Region, &rxParamSetupReq );
+                status = RegionRxParamSetupReq( Nvm.MacGroup2.Region, &rxParamSetupReq );
 
                 if( ( status & 0x07 ) == 0x07 )
                 {
-                    MacCtx.NvmCtx->MacParams.Rx2Channel.Datarate = rxParamSetupReq.Datarate;
-                    MacCtx.NvmCtx->MacParams.RxCChannel.Datarate = rxParamSetupReq.Datarate;
-                    MacCtx.NvmCtx->MacParams.Rx2Channel.Frequency = rxParamSetupReq.Frequency;
-                    MacCtx.NvmCtx->MacParams.RxCChannel.Frequency = rxParamSetupReq.Frequency;
-                    MacCtx.NvmCtx->MacParams.Rx1DrOffset = rxParamSetupReq.DrOffset;
+                    Nvm.MacGroup2.MacParams.Rx2Channel.Datarate = rxParamSetupReq.Datarate;
+                    Nvm.MacGroup2.MacParams.RxCChannel.Datarate = rxParamSetupReq.Datarate;
+                    Nvm.MacGroup2.MacParams.Rx2Channel.Frequency = rxParamSetupReq.Frequency;
+                    Nvm.MacGroup2.MacParams.RxCChannel.Frequency = rxParamSetupReq.Frequency;
+                    Nvm.MacGroup2.MacParams.Rx1DrOffset = rxParamSetupReq.DrOffset;
                 }
                 macCmdPayload[0] = status;
                 LoRaMacCommandsAddCmd( MOTE_MAC_RX_PARAM_SETUP_ANS, macCmdPayload, 1 );
@@ -2067,10 +2066,13 @@ static void ProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8_t comm
                 chParam.Rx1Frequency = 0;
                 chParam.DrRange.Value = payload[macIndex++];
 
-                status = RegionNewChannelReq( MacCtx.NvmCtx->Region, &newChannelReq );
+                status = ( uint8_t )RegionNewChannelReq( Nvm.MacGroup2.Region, &newChannelReq );
 
-                macCmdPayload[0] = status;
-                LoRaMacCommandsAddCmd( MOTE_MAC_NEW_CHANNEL_ANS, macCmdPayload, 1 );
+                if( ( int8_t )status >= 0 )
+                {
+                    macCmdPayload[0] = status;
+                    LoRaMacCommandsAddCmd( MOTE_MAC_NEW_CHANNEL_ANS, macCmdPayload, 1 );
+                }
                 break;
             }
             case SRV_MAC_RX_TIMING_SETUP_REQ:
@@ -2081,8 +2083,8 @@ static void ProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8_t comm
                 {
                     delay++;
                 }
-                MacCtx.NvmCtx->MacParams.ReceiveDelay1 = delay * 1000;
-                MacCtx.NvmCtx->MacParams.ReceiveDelay2 = MacCtx.NvmCtx->MacParams.ReceiveDelay1 + 1000;
+                Nvm.MacGroup2.MacParams.ReceiveDelay1 = delay * 1000;
+                Nvm.MacGroup2.MacParams.ReceiveDelay2 = Nvm.MacGroup2.MacParams.ReceiveDelay1 + 1000;
                 LoRaMacCommandsAddCmd( MOTE_MAC_RX_TIMING_SETUP_ANS, macCmdPayload, 0 );
                 // Setup indication to inform the application
                 SetMlmeScheduleUplinkIndication( );
@@ -2109,17 +2111,17 @@ static void ProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8_t comm
                 txParamSetupReq.MaxEirp = eirpDwellTime & 0x0F;
 
                 // Check the status for correctness
-                if( RegionTxParamSetupReq( MacCtx.NvmCtx->Region, &txParamSetupReq ) != -1 )
+                if( RegionTxParamSetupReq( Nvm.MacGroup2.Region, &txParamSetupReq ) != -1 )
                 {
                     // Accept command
-                    MacCtx.NvmCtx->MacParams.UplinkDwellTime = txParamSetupReq.UplinkDwellTime;
-                    MacCtx.NvmCtx->MacParams.DownlinkDwellTime = txParamSetupReq.DownlinkDwellTime;
-                    MacCtx.NvmCtx->MacParams.MaxEirp = LoRaMacMaxEirpTable[txParamSetupReq.MaxEirp];
+                    Nvm.MacGroup2.MacParams.UplinkDwellTime = txParamSetupReq.UplinkDwellTime;
+                    Nvm.MacGroup2.MacParams.DownlinkDwellTime = txParamSetupReq.DownlinkDwellTime;
+                    Nvm.MacGroup2.MacParams.MaxEirp = LoRaMacMaxEirpTable[txParamSetupReq.MaxEirp];
                     // Update the datarate in case of the new configuration limits it
                     getPhy.Attribute = PHY_MIN_TX_DR;
-                    getPhy.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
-                    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-                    MacCtx.NvmCtx->MacParams.ChannelsDatarate = MAX( MacCtx.NvmCtx->MacParams.ChannelsDatarate, ( int8_t )phyParam.Value );
+                    getPhy.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
+                    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+                    Nvm.MacGroup1.ChannelsDatarate = MAX( Nvm.MacGroup1.ChannelsDatarate, ( int8_t )phyParam.Value );
 
                     // Add command response
                     LoRaMacCommandsAddCmd( MOTE_MAC_TX_PARAM_SETUP_ANS, macCmdPayload, 0 );
@@ -2137,11 +2139,15 @@ static void ProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8_t comm
                 dlChannelReq.Rx1Frequency |= ( uint32_t ) payload[macIndex++] << 16;
                 dlChannelReq.Rx1Frequency *= 100;
 
-                status = RegionDlChannelReq( MacCtx.NvmCtx->Region, &dlChannelReq );
-                macCmdPayload[0] = status;
-                LoRaMacCommandsAddCmd( MOTE_MAC_DL_CHANNEL_ANS, macCmdPayload, 1 );
-                // Setup indication to inform the application
-                SetMlmeScheduleUplinkIndication( );
+                status = ( uint8_t )RegionDlChannelReq( Nvm.MacGroup2.Region, &dlChannelReq );
+
+                if( ( int8_t )status >= 0 )
+                {
+                    macCmdPayload[0] = status;
+                    LoRaMacCommandsAddCmd( MOTE_MAC_DL_CHANNEL_ANS, macCmdPayload, 1 );
+                    // Setup indication to inform the application
+                    SetMlmeScheduleUplinkIndication( );
+                }
                 break;
             }
             case SRV_MAC_DEVICE_TIME_ANS:
@@ -2253,31 +2259,32 @@ static void ProcessMacCommands( uint8_t *payload, uint8_t macIndex, uint8_t comm
     }
 }
 
+/* ST_WORKAROUND: Update Send request with new input parameter to allow delayed tx */
 static LoRaMacStatus_t Send( LoRaMacHeader_t* macHdr, uint8_t fPort, void* fBuffer, uint16_t fBufferSize, bool allowDelayedTx )
 {
     LoRaMacFrameCtrl_t fCtrl;
     LoRaMacStatus_t status = LORAMAC_STATUS_PARAMETER_INVALID;
-    int8_t datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
-    int8_t txPower = MacCtx.NvmCtx->MacParams.ChannelsTxPower;
-    uint32_t adrAckCounter = MacCtx.NvmCtx->AdrAckCounter;
+    int8_t datarate = Nvm.MacGroup1.ChannelsDatarate;
+    int8_t txPower = Nvm.MacGroup1.ChannelsTxPower;
+    uint32_t adrAckCounter = Nvm.MacGroup1.AdrAckCounter;
     CalcNextAdrParams_t adrNext;
 
     // Check if we are joined
-    if( MacCtx.NvmCtx->NetworkActivation == ACTIVATION_TYPE_NONE )
+    if( Nvm.MacGroup2.NetworkActivation == ACTIVATION_TYPE_NONE )
     {
         return LORAMAC_STATUS_NO_NETWORK_JOINED;
     }
-    if( MacCtx.NvmCtx->MaxDCycle == 0 )
+    if( Nvm.MacGroup2.MaxDCycle == 0 )
     {
-        MacCtx.NvmCtx->AggregatedTimeOff = 0;
+        Nvm.MacGroup1.AggregatedTimeOff = 0;
     }
 
     fCtrl.Value = 0;
     fCtrl.Bits.FOptsLen      = 0;
-    fCtrl.Bits.Adr           = MacCtx.NvmCtx->AdrCtrlOn;
+    fCtrl.Bits.Adr           = Nvm.MacGroup2.AdrCtrlOn;
 
     // Check class b
-    if( MacCtx.NvmCtx->DeviceClass == CLASS_B )
+    if( Nvm.MacGroup2.DeviceClass == CLASS_B )
     {
         fCtrl.Bits.FPending      = 1;
     }
@@ -2287,25 +2294,25 @@ static LoRaMacStatus_t Send( LoRaMacHeader_t* macHdr, uint8_t fPort, void* fBuff
     }
 
     // Check server ack
-    if( MacCtx.NvmCtx->SrvAckRequested == true )
+    if( Nvm.MacGroup1.SrvAckRequested == true )
     {
         fCtrl.Bits.Ack = 1;
     }
 
     // ADR next request
-    adrNext.Version = MacCtx.NvmCtx->Version;
+    adrNext.Version = Nvm.MacGroup2.Version;
     adrNext.UpdateChanMask = true;
     adrNext.AdrEnabled = fCtrl.Bits.Adr;
-    adrNext.AdrAckCounter = MacCtx.NvmCtx->AdrAckCounter;
+    adrNext.AdrAckCounter = Nvm.MacGroup1.AdrAckCounter;
     adrNext.AdrAckLimit = MacCtx.AdrAckLimit;
     adrNext.AdrAckDelay = MacCtx.AdrAckDelay;
-    adrNext.Datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
-    adrNext.TxPower = MacCtx.NvmCtx->MacParams.ChannelsTxPower;
-    adrNext.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
-    adrNext.Region = MacCtx.NvmCtx->Region;
+    adrNext.Datarate = Nvm.MacGroup1.ChannelsDatarate;
+    adrNext.TxPower = Nvm.MacGroup1.ChannelsTxPower;
+    adrNext.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
+    adrNext.Region = Nvm.MacGroup2.Region;
 
-    fCtrl.Bits.AdrAckReq = LoRaMacAdrCalcNext( &adrNext, &MacCtx.NvmCtx->MacParams.ChannelsDatarate,
-                                               &MacCtx.NvmCtx->MacParams.ChannelsTxPower, &adrAckCounter );
+    fCtrl.Bits.AdrAckReq = LoRaMacAdrCalcNext( &adrNext, &Nvm.MacGroup1.ChannelsDatarate,
+                                               &Nvm.MacGroup1.ChannelsTxPower, &adrAckCounter );
 
     // Prepare the frame
     status = PrepareFrame( macHdr, &fCtrl, fPort, fBuffer, fBufferSize );
@@ -2314,7 +2321,7 @@ static LoRaMacStatus_t Send( LoRaMacHeader_t* macHdr, uint8_t fPort, void* fBuff
     if( ( status == LORAMAC_STATUS_OK ) || ( status == LORAMAC_STATUS_SKIPPED_APP_DATA ) )
     {
         // Schedule frame, do not allow delayed transmissions
-        status = ScheduleTx( allowDelayedTx );
+        status = ScheduleTx( allowDelayedTx ); /* ST_WORKAROUND: Update Send request with new input parameter to allow delayed tx */
     }
 
     // Post processing
@@ -2322,14 +2329,14 @@ static LoRaMacStatus_t Send( LoRaMacHeader_t* macHdr, uint8_t fPort, void* fBuff
     {
         // Bad case - restore
         // Store local variables
-        MacCtx.NvmCtx->MacParams.ChannelsDatarate = datarate;
-        MacCtx.NvmCtx->MacParams.ChannelsTxPower = txPower;
+        Nvm.MacGroup1.ChannelsDatarate = datarate;
+        Nvm.MacGroup1.ChannelsTxPower = txPower;
     }
     else
     {
         // Good case
-        MacCtx.NvmCtx->SrvAckRequested = false;
-        MacCtx.NvmCtx->AdrAckCounter = adrAckCounter;
+        Nvm.MacGroup1.SrvAckRequested = false;
+        Nvm.MacGroup1.AdrAckCounter = adrAckCounter;
         // Remove all none sticky MAC commands
         if( LoRaMacCommandsRemoveNoneStickyCmds( ) != LORAMAC_COMMANDS_SUCCESS )
         {
@@ -2384,7 +2391,7 @@ static LoRaMacStatus_t CheckForClassBCollision( void )
         return LORAMAC_STATUS_BUSY_BEACON_RESERVED_TIME;
     }
 
-    if( MacCtx.NvmCtx->DeviceClass == CLASS_B )
+    if( Nvm.MacGroup2.DeviceClass == CLASS_B )
     {
         if( LoRaMacClassBIsPingExpected( ) == true )
         {
@@ -2401,29 +2408,29 @@ static LoRaMacStatus_t CheckForClassBCollision( void )
 static void ComputeRxWindowParameters( void )
 {
     // Compute Rx1 windows parameters
-    RegionComputeRxWindowParameters( MacCtx.NvmCtx->Region,
-                                     RegionApplyDrOffset( MacCtx.NvmCtx->Region,
-                                                          MacCtx.NvmCtx->MacParams.DownlinkDwellTime,
-                                                          MacCtx.NvmCtx->MacParams.ChannelsDatarate,
-                                                          MacCtx.NvmCtx->MacParams.Rx1DrOffset ),
-                                     MacCtx.NvmCtx->MacParams.MinRxSymbols,
-                                     MacCtx.NvmCtx->MacParams.SystemMaxRxError,
+    RegionComputeRxWindowParameters( Nvm.MacGroup2.Region,
+                                     RegionApplyDrOffset( Nvm.MacGroup2.Region,
+                                                          Nvm.MacGroup2.MacParams.DownlinkDwellTime,
+                                                          Nvm.MacGroup1.ChannelsDatarate,
+                                                          Nvm.MacGroup2.MacParams.Rx1DrOffset ),
+                                     Nvm.MacGroup2.MacParams.MinRxSymbols,
+                                     Nvm.MacGroup2.MacParams.SystemMaxRxError,
                                      &MacCtx.RxWindow1Config );
     // Compute Rx2 windows parameters
-    RegionComputeRxWindowParameters( MacCtx.NvmCtx->Region,
-                                     MacCtx.NvmCtx->MacParams.Rx2Channel.Datarate,
-                                     MacCtx.NvmCtx->MacParams.MinRxSymbols,
-                                     MacCtx.NvmCtx->MacParams.SystemMaxRxError,
+    RegionComputeRxWindowParameters( Nvm.MacGroup2.Region,
+                                     Nvm.MacGroup2.MacParams.Rx2Channel.Datarate,
+                                     Nvm.MacGroup2.MacParams.MinRxSymbols,
+                                     Nvm.MacGroup2.MacParams.SystemMaxRxError,
                                      &MacCtx.RxWindow2Config );
 
     // Default setup, in case the device joined
-    MacCtx.RxWindow1Delay = MacCtx.NvmCtx->MacParams.ReceiveDelay1 + MacCtx.RxWindow1Config.WindowOffset;
-    MacCtx.RxWindow2Delay = MacCtx.NvmCtx->MacParams.ReceiveDelay2 + MacCtx.RxWindow2Config.WindowOffset;
+    MacCtx.RxWindow1Delay = Nvm.MacGroup2.MacParams.ReceiveDelay1 + MacCtx.RxWindow1Config.WindowOffset;
+    MacCtx.RxWindow2Delay = Nvm.MacGroup2.MacParams.ReceiveDelay2 + MacCtx.RxWindow2Config.WindowOffset;
 
-    if( MacCtx.NvmCtx->NetworkActivation == ACTIVATION_TYPE_NONE )
+    if( Nvm.MacGroup2.NetworkActivation == ACTIVATION_TYPE_NONE )
     {
-        MacCtx.RxWindow1Delay = MacCtx.NvmCtx->MacParams.JoinAcceptDelay1 + MacCtx.RxWindow1Config.WindowOffset;
-        MacCtx.RxWindow2Delay = MacCtx.NvmCtx->MacParams.JoinAcceptDelay2 + MacCtx.RxWindow2Config.WindowOffset;
+        MacCtx.RxWindow1Delay = Nvm.MacGroup2.MacParams.JoinAcceptDelay1 + MacCtx.RxWindow1Config.WindowOffset;
+        MacCtx.RxWindow2Delay = Nvm.MacGroup2.MacParams.JoinAcceptDelay2 + MacCtx.RxWindow2Config.WindowOffset;
     }
 }
 
@@ -2431,14 +2438,14 @@ static LoRaMacStatus_t VerifyTxFrame( void )
 {
     size_t macCmdsSize = 0;
 
-    if( MacCtx.NvmCtx->NetworkActivation != ACTIVATION_TYPE_NONE )
+    if( Nvm.MacGroup2.NetworkActivation != ACTIVATION_TYPE_NONE )
     {
         if( LoRaMacCommandsGetSizeSerializedCmds( &macCmdsSize ) != LORAMAC_COMMANDS_SUCCESS )
         {
             return LORAMAC_STATUS_MAC_COMMAD_ERROR;
         }
 
-        if( ValidatePayloadLength( MacCtx.AppDataSize, MacCtx.NvmCtx->MacParams.ChannelsDatarate, macCmdsSize ) == false )
+        if( ValidatePayloadLength( MacCtx.AppDataSize, Nvm.MacGroup1.ChannelsDatarate, macCmdsSize ) == false )
         {
             return LORAMAC_STATUS_LENGTH_ERROR;
         }
@@ -2498,24 +2505,24 @@ static LoRaMacStatus_t ScheduleTx( bool allowDelayedTx )
         return status;
     }
 
-    nextChan.AggrTimeOff = MacCtx.NvmCtx->AggregatedTimeOff;
-    nextChan.Datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
-    nextChan.DutyCycleEnabled = MacCtx.NvmCtx->DutyCycleOn;
-    nextChan.ElapsedTimeSinceStartUp = SysTimeSub( SysTimeGetMcuTime( ), MacCtx.NvmCtx->InitializationTime );
-    nextChan.LastAggrTx = MacCtx.NvmCtx->LastTxDoneTime;
+    nextChan.AggrTimeOff = Nvm.MacGroup1.AggregatedTimeOff;
+    nextChan.Datarate = Nvm.MacGroup1.ChannelsDatarate;
+    nextChan.DutyCycleEnabled = Nvm.MacGroup2.DutyCycleOn;
+    nextChan.ElapsedTimeSinceStartUp = SysTimeSub( SysTimeGetMcuTime( ), Nvm.MacGroup2.InitializationTime );
+    nextChan.LastAggrTx = Nvm.MacGroup1.LastTxDoneTime;
     nextChan.LastTxIsJoinRequest = false;
     nextChan.Joined = true;
     nextChan.PktLen = MacCtx.PktBufferLen;
 
     // Setup the parameters based on the join status
-    if( MacCtx.NvmCtx->NetworkActivation == ACTIVATION_TYPE_NONE )
+    if( Nvm.MacGroup2.NetworkActivation == ACTIVATION_TYPE_NONE )
     {
         nextChan.LastTxIsJoinRequest = true;
         nextChan.Joined = false;
     }
 
     // Select channel
-    status = RegionNextChannel( MacCtx.NvmCtx->Region, &nextChan, &MacCtx.Channel, &MacCtx.DutyCycleWaitTime, &MacCtx.NvmCtx->AggregatedTimeOff );
+    status = RegionNextChannel( Nvm.MacGroup2.Region, &nextChan, &MacCtx.Channel, &MacCtx.DutyCycleWaitTime, &Nvm.MacGroup1.AggregatedTimeOff );
 
     if( status != LORAMAC_STATUS_OK )
     {
@@ -2598,11 +2605,11 @@ static void CalculateBackOff( void )
 {
     // Make sure that the calculation of the backoff time for the aggregated time off will only be done in
     // case the value is zero. It will be set to zero in the function RegionNextChannel.
-    if( MacCtx.NvmCtx->AggregatedTimeOff == 0 )
+    if( Nvm.MacGroup1.AggregatedTimeOff == 0 )
     {
         // Update aggregated time-off. This must be an assignment and no incremental
         // update as we do only calculate the time-off based on the last transmission
-        MacCtx.NvmCtx->AggregatedTimeOff = ( MacCtx.TxTimeOnAir * MacCtx.NvmCtx->AggregatedDCycle - MacCtx.TxTimeOnAir );
+        Nvm.MacGroup1.AggregatedTimeOff = ( MacCtx.TxTimeOnAir * Nvm.MacGroup2.AggregatedDCycle - MacCtx.TxTimeOnAir );
     }
 }
 
@@ -2626,48 +2633,53 @@ static void RemoveMacCommands( LoRaMacRxSlot_t rxSlot, LoRaMacFrameCtrl_t fCtrl,
     }
 }
 
+
 static void ResetMacParameters( void )
 {
-    MacCtx.NvmCtx->NetworkActivation = ACTIVATION_TYPE_NONE;
+    LoRaMacClassBCallback_t classBCallbacks;
+    LoRaMacClassBParams_t classBParams;
+
+    Nvm.MacGroup2.NetworkActivation = ACTIVATION_TYPE_NONE;
 
     // ADR counter
-    MacCtx.NvmCtx->AdrAckCounter = 0;
+    Nvm.MacGroup1.AdrAckCounter = 0;
 
     MacCtx.ChannelsNbTransCounter = 0;
     MacCtx.AckTimeoutRetries = 1;
     MacCtx.AckTimeoutRetriesCounter = 1;
     MacCtx.AckTimeoutRetry = false;
 
-    MacCtx.NvmCtx->MaxDCycle = 0;
-    MacCtx.NvmCtx->AggregatedDCycle = 1;
+    Nvm.MacGroup2.MaxDCycle = 0;
+    Nvm.MacGroup2.AggregatedDCycle = 1;
 
-    MacCtx.NvmCtx->MacParams.ChannelsTxPower = MacCtx.NvmCtx->MacParamsDefaults.ChannelsTxPower;
-    MacCtx.NvmCtx->MacParams.ChannelsDatarate = MacCtx.NvmCtx->MacParamsDefaults.ChannelsDatarate;
-    MacCtx.NvmCtx->MacParams.Rx1DrOffset = MacCtx.NvmCtx->MacParamsDefaults.Rx1DrOffset;
-    MacCtx.NvmCtx->MacParams.Rx2Channel = MacCtx.NvmCtx->MacParamsDefaults.Rx2Channel;
-    MacCtx.NvmCtx->MacParams.RxCChannel = MacCtx.NvmCtx->MacParamsDefaults.RxCChannel;
-    MacCtx.NvmCtx->MacParams.UplinkDwellTime = MacCtx.NvmCtx->MacParamsDefaults.UplinkDwellTime;
-    MacCtx.NvmCtx->MacParams.DownlinkDwellTime = MacCtx.NvmCtx->MacParamsDefaults.DownlinkDwellTime;
-    MacCtx.NvmCtx->MacParams.MaxEirp = MacCtx.NvmCtx->MacParamsDefaults.MaxEirp;
-    MacCtx.NvmCtx->MacParams.AntennaGain = MacCtx.NvmCtx->MacParamsDefaults.AntennaGain;
+    Nvm.MacGroup1.ChannelsTxPower = Nvm.MacGroup2.ChannelsTxPowerDefault;
+    Nvm.MacGroup1.ChannelsDatarate = Nvm.MacGroup2.ChannelsDatarateDefault;
+    Nvm.MacGroup2.MacParams.Rx1DrOffset = Nvm.MacGroup2.MacParamsDefaults.Rx1DrOffset;
+    Nvm.MacGroup2.MacParams.Rx2Channel = Nvm.MacGroup2.MacParamsDefaults.Rx2Channel;
+    Nvm.MacGroup2.MacParams.RxCChannel = Nvm.MacGroup2.MacParamsDefaults.RxCChannel;
+    Nvm.MacGroup2.MacParams.UplinkDwellTime = Nvm.MacGroup2.MacParamsDefaults.UplinkDwellTime;
+    Nvm.MacGroup2.MacParams.DownlinkDwellTime = Nvm.MacGroup2.MacParamsDefaults.DownlinkDwellTime;
+    Nvm.MacGroup2.MacParams.MaxEirp = Nvm.MacGroup2.MacParamsDefaults.MaxEirp;
+    Nvm.MacGroup2.MacParams.AntennaGain = Nvm.MacGroup2.MacParamsDefaults.AntennaGain;
 
     MacCtx.NodeAckRequested = false;
-    MacCtx.NvmCtx->SrvAckRequested = false;
+    Nvm.MacGroup1.SrvAckRequested = false;
 
     // Reset to application defaults
     InitDefaultsParams_t params;
     params.Type = INIT_TYPE_RESET_TO_DEFAULT_CHANNELS;
-    params.NvmCtx = NULL;
-    RegionInitDefaults( MacCtx.NvmCtx->Region, &params );
+    params.NvmGroup1 = &Nvm.RegionGroup1;
+    params.NvmGroup2 = &Nvm.RegionGroup2;
+    RegionInitDefaults( Nvm.MacGroup2.Region, &params );
 
     // Initialize channel index.
     MacCtx.Channel = 0;
 
     // Initialize Rx2 config parameters.
     MacCtx.RxWindow2Config.Channel = MacCtx.Channel;
-    MacCtx.RxWindow2Config.Frequency = MacCtx.NvmCtx->MacParams.Rx2Channel.Frequency;
-    MacCtx.RxWindow2Config.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
-    MacCtx.RxWindow2Config.RepeaterSupport = MacCtx.NvmCtx->RepeaterSupport;
+    MacCtx.RxWindow2Config.Frequency = Nvm.MacGroup2.MacParams.Rx2Channel.Frequency;
+    MacCtx.RxWindow2Config.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
+    MacCtx.RxWindow2Config.RepeaterSupport = Nvm.MacGroup2.MacParams.RepeaterSupport; /* ST_WORKAROUND: Keep repeater feature */
     MacCtx.RxWindow2Config.RxContinuous = false;
     MacCtx.RxWindow2Config.RxSlot = RX_SLOT_WIN_2;
 
@@ -2676,6 +2688,28 @@ static void ResetMacParameters( void )
     MacCtx.RxWindowCConfig.RxContinuous = true;
     MacCtx.RxWindowCConfig.RxSlot = RX_SLOT_WIN_CLASS_C;
 
+    // Initialize class b
+    // Apply callback
+    classBCallbacks.GetTemperatureLevel = NULL;
+    classBCallbacks.MacProcessNotify = NULL;
+
+    if( MacCtx.MacCallbacks != NULL )
+    {
+        classBCallbacks.GetTemperatureLevel = MacCtx.MacCallbacks->GetTemperatureLevel;
+        classBCallbacks.MacProcessNotify = MacCtx.MacCallbacks->MacProcessNotify;
+    }
+
+    // Must all be static. Don't use local references.
+    classBParams.MlmeIndication = &MacCtx.MlmeIndication;
+    classBParams.McpsIndication = &MacCtx.McpsIndication;
+    classBParams.MlmeConfirm = &MacCtx.MlmeConfirm;
+    classBParams.LoRaMacFlags = &MacCtx.MacFlags;
+    classBParams.LoRaMacDevAddr = &Nvm.MacGroup2.DevAddr;
+    classBParams.LoRaMacRegion = &Nvm.MacGroup2.Region;
+    classBParams.LoRaMacParams = &Nvm.MacGroup2.MacParams;
+    classBParams.MulticastChannels = &Nvm.MacGroup2.MulticastChannelList[0];
+
+    LoRaMacClassBInit( &classBParams, &classBCallbacks, &Nvm.ClassB );
 }
 
 /*!
@@ -2691,9 +2725,9 @@ static void RxWindowSetup( TimerEvent_t* rxTimer, RxConfigParams_t* rxConfig )
     // Ensure the radio is Idle
     Radio.Standby( );
 
-    if( RegionRxConfig( MacCtx.NvmCtx->Region, rxConfig, ( int8_t* )&MacCtx.McpsIndication.RxDatarate ) == true )
+    if( RegionRxConfig( Nvm.MacGroup2.Region, rxConfig, ( int8_t* )&MacCtx.McpsIndication.RxDatarate ) == true )
     {
-        Radio.Rx( MacCtx.NvmCtx->MacParams.MaxRxWindow );
+        Radio.Rx( Nvm.MacGroup2.MacParams.MaxRxWindow );
         MacCtx.RxSlot = rxConfig->RxSlot;
     }
 }
@@ -2701,10 +2735,10 @@ static void RxWindowSetup( TimerEvent_t* rxTimer, RxConfigParams_t* rxConfig )
 static void OpenContinuousRxCWindow( void )
 {
     // Compute RxC windows parameters
-    RegionComputeRxWindowParameters( MacCtx.NvmCtx->Region,
-                                     MacCtx.NvmCtx->MacParams.RxCChannel.Datarate,
-                                     MacCtx.NvmCtx->MacParams.MinRxSymbols,
-                                     MacCtx.NvmCtx->MacParams.SystemMaxRxError,
+    RegionComputeRxWindowParameters( Nvm.MacGroup2.Region,
+                                     Nvm.MacGroup2.MacParams.RxCChannel.Datarate,
+                                     Nvm.MacGroup2.MacParams.MinRxSymbols,
+                                     Nvm.MacGroup2.MacParams.SystemMaxRxError,
                                      &MacCtx.RxWindowCConfig );
 
     MacCtx.RxWindowCConfig.RxSlot = RX_SLOT_WIN_CLASS_C;
@@ -2713,7 +2747,7 @@ static void OpenContinuousRxCWindow( void )
 
     // At this point the Radio should be idle.
     // Thus, there is no need to set the radio in standby mode.
-    if( RegionRxConfig( MacCtx.NvmCtx->Region, &MacCtx.RxWindowCConfig, ( int8_t* )&MacCtx.McpsIndication.RxDatarate ) == true )
+    if( RegionRxConfig( Nvm.MacGroup2.Region, &MacCtx.RxWindowCConfig, ( int8_t* )&MacCtx.McpsIndication.RxDatarate ) == true )
     {
         Radio.Rx( 0 ); // Continuous mode
         MacCtx.RxSlot = MacCtx.RxWindowCConfig.RxSlot;
@@ -2748,7 +2782,7 @@ static LoRaMacStatus_t PrepareFrame( LoRaMacHeader_t* macHdr, LoRaMacFrameCtrl_t
             MacCtx.TxMsg.Message.Data.BufSize = LORAMAC_PHY_MAXPAYLOAD;
             MacCtx.TxMsg.Message.Data.MHDR.Value = macHdr->Value;
             MacCtx.TxMsg.Message.Data.FPort = fPort;
-            MacCtx.TxMsg.Message.Data.FHDR.DevAddr = MacCtx.NvmCtx->DevAddr;
+            MacCtx.TxMsg.Message.Data.FHDR.DevAddr = Nvm.MacGroup2.DevAddr;
             MacCtx.TxMsg.Message.Data.FHDR.FCtrl.Value = fCtrl->Value;
             MacCtx.TxMsg.Message.Data.FRMPayloadSize = MacCtx.AppDataSize;
             MacCtx.TxMsg.Message.Data.FRMPayload = MacCtx.AppData;
@@ -2772,7 +2806,7 @@ static LoRaMacStatus_t PrepareFrame( LoRaMacHeader_t* macHdr, LoRaMacFrameCtrl_t
 
             if( macCmdsSize > 0 )
             {
-                availableSize = GetMaxAppPayloadWithoutFOptsLength( MacCtx.NvmCtx->MacParams.ChannelsDatarate );
+                availableSize = GetMaxAppPayloadWithoutFOptsLength( Nvm.MacGroup1.ChannelsDatarate );
 
                 // There is application payload available and the MAC commands fit into FOpts field.
                 if( ( MacCtx.AppDataSize > 0 ) && ( macCmdsSize <= LORA_MAC_COMMAND_MAX_FOPTS_LENGTH ) )
@@ -2789,7 +2823,7 @@ static LoRaMacStatus_t PrepareFrame( LoRaMacHeader_t* macHdr, LoRaMacFrameCtrl_t
                 else if( ( MacCtx.AppDataSize > 0 ) && ( macCmdsSize > LORA_MAC_COMMAND_MAX_FOPTS_LENGTH ) )
                 {
 
-                    if( LoRaMacCommandsSerializeCmds( availableSize, &macCmdsSize, MacCtx.NvmCtx->MacCommandsBuffer ) != LORAMAC_COMMANDS_SUCCESS )
+                    if( LoRaMacCommandsSerializeCmds( availableSize, &macCmdsSize, MacCtx.MacCommandsBuffer ) != LORAMAC_COMMANDS_SUCCESS )
                     {
                         return LORAMAC_STATUS_MAC_COMMAD_ERROR;
                     }
@@ -2798,14 +2832,14 @@ static LoRaMacStatus_t PrepareFrame( LoRaMacHeader_t* macHdr, LoRaMacFrameCtrl_t
                 // No application payload available therefore add all mac commands to the FRMPayload.
                 else
                 {
-                    if( LoRaMacCommandsSerializeCmds( availableSize, &macCmdsSize, MacCtx.NvmCtx->MacCommandsBuffer ) != LORAMAC_COMMANDS_SUCCESS )
+                    if( LoRaMacCommandsSerializeCmds( availableSize, &macCmdsSize, MacCtx.MacCommandsBuffer ) != LORAMAC_COMMANDS_SUCCESS )
                     {
                         return LORAMAC_STATUS_MAC_COMMAD_ERROR;
                     }
                     // Force FPort to be zero
                     MacCtx.TxMsg.Message.Data.FPort = 0;
 
-                    MacCtx.TxMsg.Message.Data.FRMPayload = MacCtx.NvmCtx->MacCommandsBuffer;
+                    MacCtx.TxMsg.Message.Data.FRMPayload = MacCtx.MacCommandsBuffer;
                     MacCtx.TxMsg.Message.Data.FRMPayloadSize = macCmdsSize;
                 }
             }
@@ -2832,16 +2866,16 @@ static LoRaMacStatus_t SendFrameOnChannel( uint8_t channel )
     int8_t txPower = 0;
 
     txConfig.Channel = channel;
-    txConfig.Datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
-    txConfig.TxPower = MacCtx.NvmCtx->MacParams.ChannelsTxPower;
-    txConfig.MaxEirp = MacCtx.NvmCtx->MacParams.MaxEirp;
-    txConfig.AntennaGain = MacCtx.NvmCtx->MacParams.AntennaGain;
+    txConfig.Datarate = Nvm.MacGroup1.ChannelsDatarate;
+    txConfig.TxPower = Nvm.MacGroup1.ChannelsTxPower;
+    txConfig.MaxEirp = Nvm.MacGroup2.MacParams.MaxEirp;
+    txConfig.AntennaGain = Nvm.MacGroup2.MacParams.AntennaGain;
     txConfig.PktLen = MacCtx.PktBufferLen;
 
-    RegionTxConfig( MacCtx.NvmCtx->Region, &txConfig, &txPower, &MacCtx.TxTimeOnAir );
+    RegionTxConfig( Nvm.MacGroup2.Region, &txConfig, &txPower, &MacCtx.TxTimeOnAir );
 
     MacCtx.McpsConfirm.Status = LORAMAC_EVENT_INFO_STATUS_ERROR;
-    MacCtx.McpsConfirm.Datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
+    MacCtx.McpsConfirm.Datarate = Nvm.MacGroup1.ChannelsDatarate;
     MacCtx.McpsConfirm.TxPower = txPower;
     MacCtx.McpsConfirm.Channel = channel;
 
@@ -2861,7 +2895,7 @@ static LoRaMacStatus_t SendFrameOnChannel( uint8_t channel )
         }
     }
 
-    if( MacCtx.NvmCtx->DeviceClass == CLASS_B )
+    if( Nvm.MacGroup2.DeviceClass == CLASS_B )
     {
         // Stop slots for class b
         LoRaMacClassBStopRxSlots( );
@@ -2870,7 +2904,7 @@ static LoRaMacStatus_t SendFrameOnChannel( uint8_t channel )
     LoRaMacClassBHaltBeaconing( );
 
     // Secure frame
-    status = SecureFrame( MacCtx.NvmCtx->MacParams.ChannelsDatarate, MacCtx.Channel );
+    status = SecureFrame( Nvm.MacGroup1.ChannelsDatarate, MacCtx.Channel );
     if( status != LORAMAC_STATUS_OK )
     {
         return status;
@@ -2893,13 +2927,13 @@ static LoRaMacStatus_t SetTxContinuousWave( uint16_t timeout )
     ContinuousWaveParams_t continuousWave;
 
     continuousWave.Channel = MacCtx.Channel;
-    continuousWave.Datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
-    continuousWave.TxPower = MacCtx.NvmCtx->MacParams.ChannelsTxPower;
-    continuousWave.MaxEirp = MacCtx.NvmCtx->MacParams.MaxEirp;
-    continuousWave.AntennaGain = MacCtx.NvmCtx->MacParams.AntennaGain;
+    continuousWave.Datarate = Nvm.MacGroup1.ChannelsDatarate;
+    continuousWave.TxPower = Nvm.MacGroup1.ChannelsTxPower;
+    continuousWave.MaxEirp = Nvm.MacGroup2.MacParams.MaxEirp;
+    continuousWave.AntennaGain = Nvm.MacGroup2.MacParams.AntennaGain;
     continuousWave.Timeout = timeout;
 
-    RegionSetContinuousWave( MacCtx.NvmCtx->Region, &continuousWave );
+    RegionSetContinuousWave( Nvm.MacGroup2.Region, &continuousWave );
 
     MacCtx.MacState |= LORAMAC_TX_RUNNING;
 
@@ -2915,24 +2949,17 @@ static LoRaMacStatus_t SetTxContinuousWave1( uint16_t timeout, uint32_t frequenc
     return LORAMAC_STATUS_OK;
 }
 
-static LoRaMacCtxs_t* GetCtxs( void )
+LoRaMacNvmData_t* GetNvmData( void )
 {
-    Contexts.MacNvmCtx = &NvmMacCtx;
-    Contexts.MacNvmCtxSize = sizeof( NvmMacCtx );
-    Contexts.CryptoNvmCtx = LoRaMacCryptoGetNvmCtx( &Contexts.CryptoNvmCtxSize );
-    GetNvmCtxParams_t params ={ 0 };
-    Contexts.RegionNvmCtx = RegionGetNvmCtx( MacCtx.NvmCtx->Region, &params );
-    Contexts.RegionNvmCtxSize = params.nvmCtxSize;
-    Contexts.SecureElementNvmCtx = SecureElementGetNvmCtx( &Contexts.SecureElementNvmCtxSize );
-    Contexts.CommandsNvmCtx = LoRaMacCommandsGetNvmCtx( &Contexts.CommandsNvmCtxSize );
-    Contexts.ClassBNvmCtx = LoRaMacClassBGetNvmCtx( &Contexts.ClassBNvmCtxSize );
-    Contexts.ConfirmQueueNvmCtx = LoRaMacConfirmQueueGetNvmCtx( &Contexts.ConfirmQueueNvmCtxSize );
-    return &Contexts;
+    return &Nvm;
 }
 
-static LoRaMacStatus_t RestoreCtxs( LoRaMacCtxs_t* contexts )
+LoRaMacStatus_t RestoreNvmData( LoRaMacNvmData_t* nvm )
 {
-    if( contexts == NULL )
+    uint32_t crc = 0;
+
+    // Status and parameter validation
+    if( nvm == NULL )
     {
         return LORAMAC_STATUS_PARAMETER_INVALID;
     }
@@ -2941,47 +2968,64 @@ static LoRaMacStatus_t RestoreCtxs( LoRaMacCtxs_t* contexts )
         return LORAMAC_STATUS_BUSY;
     }
 
-    if( contexts->MacNvmCtx != NULL )
+    // Crypto
+    crc = Crc32( ( uint8_t* ) &nvm->Crypto, sizeof( nvm->Crypto ) -
+                                            sizeof( nvm->Crypto.Crc32 ) );
+    if( crc == nvm->Crypto.Crc32 )
     {
-        memcpy1( ( uint8_t* ) &NvmMacCtx, ( uint8_t* ) contexts->MacNvmCtx, contexts->MacNvmCtxSize );
+        memcpy1( ( uint8_t* ) &Nvm.Crypto, ( uint8_t* ) &nvm->Crypto,
+                 sizeof( Nvm.Crypto ) );
     }
 
-    InitDefaultsParams_t params;
-    params.Type = INIT_TYPE_RESTORE_CTX;
-    params.NvmCtx = contexts->RegionNvmCtx;
-    RegionInitDefaults( MacCtx.NvmCtx->Region, &params );
-
-    // Initialize RxC config parameters.
-    MacCtx.RxWindowCConfig.Channel = MacCtx.Channel;
-    MacCtx.RxWindowCConfig.Frequency = MacCtx.NvmCtx->MacParams.RxCChannel.Frequency;
-    MacCtx.RxWindowCConfig.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
-    MacCtx.RxWindowCConfig.RepeaterSupport = MacCtx.NvmCtx->RepeaterSupport;
-    MacCtx.RxWindowCConfig.RxContinuous = true;
-    MacCtx.RxWindowCConfig.RxSlot = RX_SLOT_WIN_CLASS_C;
-
-    if( SecureElementRestoreNvmCtx( contexts->SecureElementNvmCtx ) != SECURE_ELEMENT_SUCCESS )
+    // MacGroup1
+    crc = Crc32( ( uint8_t* ) &nvm->MacGroup1, sizeof( nvm->MacGroup1 ) -
+                                               sizeof( nvm->MacGroup1.Crc32 ) );
+    if( crc == nvm->MacGroup1.Crc32 )
     {
-        return LORAMAC_STATUS_CRYPTO_ERROR;
+        memcpy1( ( uint8_t* ) &Nvm.MacGroup1, ( uint8_t* ) &nvm->MacGroup1,
+                 sizeof( Nvm.MacGroup1 ) );
     }
 
-    if( LoRaMacCryptoRestoreNvmCtx( contexts->CryptoNvmCtx ) != LORAMAC_CRYPTO_SUCCESS )
+    // MacGroup2
+    crc = Crc32( ( uint8_t* ) &nvm->MacGroup2, sizeof( nvm->MacGroup2 ) -
+                                               sizeof( nvm->MacGroup2.Crc32 ) );
+    if( crc == nvm->MacGroup2.Crc32 )
     {
-        return LORAMAC_STATUS_CRYPTO_ERROR;
+        memcpy1( ( uint8_t* ) &Nvm.MacGroup2, ( uint8_t* ) &nvm->MacGroup2,
+                 sizeof( Nvm.MacGroup2 ) );
+
+        // Initialize RxC config parameters.
+        MacCtx.RxWindowCConfig.Channel = MacCtx.Channel;
+        MacCtx.RxWindowCConfig.Frequency = Nvm.MacGroup2.MacParams.RxCChannel.Frequency;
+        MacCtx.RxWindowCConfig.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
+        MacCtx.RxWindowCConfig.RxContinuous = true;
+        MacCtx.RxWindowCConfig.RxSlot = RX_SLOT_WIN_CLASS_C;
     }
 
-    if( LoRaMacCommandsRestoreNvmCtx( contexts->CommandsNvmCtx ) != LORAMAC_COMMANDS_SUCCESS )
+    // Secure Element
+    crc = Crc32( ( uint8_t* ) &nvm->SecureElement, sizeof( nvm->SecureElement ) -
+                                                   sizeof( nvm->SecureElement.Crc32 ) );
+    if( crc == nvm->SecureElement.Crc32 )
     {
-        return LORAMAC_STATUS_MAC_COMMAD_ERROR;
+        memcpy1( ( uint8_t* ) &Nvm.SecureElement,( uint8_t* ) &nvm->SecureElement,
+                 sizeof( Nvm.SecureElement ) );
     }
 
-    if( LoRaMacClassBRestoreNvmCtx( contexts->ClassBNvmCtx ) != true )
+    // Region
+    crc = Crc32( ( uint8_t* ) &nvm->RegionGroup1, sizeof( nvm->RegionGroup1 ) -
+                                            sizeof( nvm->RegionGroup1.Crc32 ) );
+    if( crc == nvm->RegionGroup1.Crc32 )
     {
-        return LORAMAC_STATUS_CLASS_B_ERROR;
+        memcpy1( ( uint8_t* ) &Nvm.RegionGroup1,( uint8_t* ) &nvm->RegionGroup1,
+                 sizeof( Nvm.RegionGroup1 ) );
     }
 
-    if( LoRaMacConfirmQueueRestoreNvmCtx( contexts->ConfirmQueueNvmCtx ) != true )
+    crc = Crc32( ( uint8_t* ) &nvm->ClassB, sizeof( nvm->ClassB ) -
+                                            sizeof( nvm->ClassB.Crc32 ) );
+    if( crc == nvm->ClassB.Crc32 )
     {
-        return LORAMAC_STATUS_CONFIRM_QUEUE_ERROR;
+        memcpy1( ( uint8_t* ) &Nvm.ClassB,( uint8_t* ) &nvm->ClassB,
+                 sizeof( Nvm.ClassB ) );
     }
 
     return LORAMAC_STATUS_OK;
@@ -3043,20 +3087,20 @@ static bool CheckRetransUnconfirmedUplink( void )
 {
     // Unconfirmed uplink, when all retransmissions are done.
     if( MacCtx.ChannelsNbTransCounter >=
-        MacCtx.NvmCtx->MacParams.ChannelsNbTrans )
+        Nvm.MacGroup2.MacParams.ChannelsNbTrans )
     {
         return true;
     }
     else if( MacCtx.MacFlags.Bits.McpsInd == 1 )
     {
         // For Class A stop in each case
-        if( MacCtx.NvmCtx->DeviceClass == CLASS_A )
+        if( Nvm.MacGroup2.DeviceClass == CLASS_A )
         {
             return true;
         }
         else
         {// For Class B & C stop only if the frame was received in RX1 window
-            if( MacCtx.McpsIndication.RxSlot == RX_SLOT_WIN_1 )
+            if( MacCtx.RxStatus.RxSlot == RX_SLOT_WIN_1 )
             {
                 return true;
             }
@@ -3086,13 +3130,13 @@ static bool CheckRetransConfirmedUplink( void )
 static bool StopRetransmission( void )
 {
     if( ( MacCtx.MacFlags.Bits.McpsInd == 0 ) ||
-        ( ( MacCtx.McpsIndication.RxSlot != RX_SLOT_WIN_1 ) &&
-          ( MacCtx.McpsIndication.RxSlot != RX_SLOT_WIN_2 ) ) )
+        ( ( MacCtx.RxStatus.RxSlot != RX_SLOT_WIN_1 ) &&
+          ( MacCtx.RxStatus.RxSlot != RX_SLOT_WIN_2 ) ) )
     {   // Maximum repetitions without downlink. Increase ADR Ack counter.
         // Only process the case when the MAC did not receive a downlink.
-        if( MacCtx.NvmCtx->AdrCtrlOn == true )
+        if( Nvm.MacGroup2.AdrCtrlOn == true )
         {
-            MacCtx.NvmCtx->AdrAckCounter++;
+            Nvm.MacGroup1.AdrAckCounter++;
         }
     }
 
@@ -3104,6 +3148,15 @@ static bool StopRetransmission( void )
     return true;
 }
 
+static void CallNvmDataChangeCallback( uint16_t notifyFlags )
+{
+    if( ( MacCtx.MacCallbacks != NULL ) &&
+        ( MacCtx.MacCallbacks->NvmDataChange  != NULL ) )
+    {
+        MacCtx.MacCallbacks->NvmDataChange ( notifyFlags );
+    }
+}
+
 static void AckTimeoutRetriesProcess( void )
 {
     if( MacCtx.AckTimeoutRetriesCounter < MacCtx.AckTimeoutRetries )
@@ -3115,10 +3168,10 @@ static void AckTimeoutRetriesProcess( void )
             PhyParam_t phyParam;
 
             getPhy.Attribute = PHY_NEXT_LOWER_TX_DR;
-            getPhy.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
-            getPhy.Datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
-            phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-            MacCtx.NvmCtx->MacParams.ChannelsDatarate = phyParam.Value;
+            getPhy.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
+            getPhy.Datarate = Nvm.MacGroup1.ChannelsDatarate;
+            phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+            Nvm.MacGroup1.ChannelsDatarate = phyParam.Value;
         }
     }
 }
@@ -3129,8 +3182,9 @@ static void AckTimeoutRetriesFinalize( void )
     {
         InitDefaultsParams_t params;
         params.Type = INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS;
-        params.NvmCtx = Contexts.RegionNvmCtx;
-        RegionInitDefaults( MacCtx.NvmCtx->Region, &params );
+        params.NvmGroup1 = &Nvm.RegionGroup1;
+        params.NvmGroup2 = &Nvm.RegionGroup2;
+        RegionInitDefaults( Nvm.MacGroup2.Region, &params );
 
         MacCtx.NodeAckRequested = false;
         MacCtx.McpsConfirm.AckReceived = false;
@@ -3138,49 +3192,6 @@ static void AckTimeoutRetriesFinalize( void )
     MacCtx.McpsConfirm.NbRetries = MacCtx.AckTimeoutRetriesCounter;
 }
 
-static void CallNvmCtxCallback( LoRaMacNvmCtxModule_t module )
-{
-    if( ( MacCtx.MacCallbacks != NULL ) && ( MacCtx.MacCallbacks->NvmContextChange != NULL ) )
-    {
-        MacCtx.MacCallbacks->NvmContextChange( module );
-    }
-}
-
-static void EventMacNvmCtxChanged( void )
-{
-    CallNvmCtxCallback( LORAMAC_NVMCTXMODULE_MAC );
-}
-
-static void EventRegionNvmCtxChanged( void )
-{
-    CallNvmCtxCallback( LORAMAC_NVMCTXMODULE_REGION );
-}
-
-static void EventCryptoNvmCtxChanged( void )
-{
-    CallNvmCtxCallback( LORAMAC_NVMCTXMODULE_CRYPTO );
-}
-
-static void EventSecureElementNvmCtxChanged( void )
-{
-    CallNvmCtxCallback( LORAMAC_NVMCTXMODULE_SECURE_ELEMENT );
-}
-
-static void EventCommandsNvmCtxChanged( void )
-{
-    CallNvmCtxCallback( LORAMAC_NVMCTXMODULE_COMMANDS );
-}
-
-static void EventClassBNvmCtxChanged( void )
-{
-    CallNvmCtxCallback( LORAMAC_NVMCTXMODULE_CLASS_B );
-}
-
-static void EventConfirmQueueNvmCtxChanged( void )
-{
-    CallNvmCtxCallback( LORAMAC_NVMCTXMODULE_CONFIRM_QUEUE );
-}
-
 static uint8_t IsRequestPending( void )
 {
     if( ( MacCtx.MacFlags.Bits.MlmeReq == 1 ) ||
@@ -3191,58 +3202,11 @@ static uint8_t IsRequestPending( void )
     return 0;
 }
 
-/* Exported functions ---------------------------------------------------------*/
-bool LoRaMacIsBusy( void )
-{
-    if( ( MacCtx.MacState == LORAMAC_IDLE ) &&
-        ( MacCtx.AllowRequests == LORAMAC_REQUEST_HANDLING_ON ) )
-    {
-        return false;
-    }
-    return true;
-}
-
-void LoRaMacProcess( void )
-{
-    uint8_t noTx = 0x00;
-
-    LoRaMacHandleIrqEvents( );
-    LoRaMacClassBProcess( );
-
-    // MAC proceeded a state and is ready to check
-    if( MacCtx.MacFlags.Bits.MacDone == 1 )
-    {
-        LoRaMacEnableRequests( LORAMAC_REQUEST_HANDLING_OFF );
-        LoRaMacCheckForRxAbort( );
-
-        // An error occurs during transmitting
-        if( IsRequestPending( ) > 0 )
-        {
-            noTx |= LoRaMacCheckForBeaconAcquisition( );
-        }
-
-        if( noTx == 0x00 )
-        {
-            LoRaMacHandleMlmeRequest( );
-            LoRaMacHandleMcpsRequest( );
-        }
-        LoRaMacHandleRequestEvents( );
-        LoRaMacHandleScheduleUplinkEvent( );
-        LoRaMacEnableRequests( LORAMAC_REQUEST_HANDLING_ON );
-    }
-    LoRaMacHandleIndicationEvents( );
-    if( MacCtx.RxSlot == RX_SLOT_WIN_CLASS_C )
-    {
-        OpenContinuousRxCWindow( );
-    }
-}
 
 LoRaMacStatus_t LoRaMacInitialization( LoRaMacPrimitives_t* primitives, LoRaMacCallback_t* callbacks, LoRaMacRegion_t region )
 {
     GetPhyParams_t getPhy;
     PhyParam_t phyParam;
-    LoRaMacClassBCallback_t classBCallbacks;
-    LoRaMacClassBParams_t classBParams;
 
     if( ( primitives == NULL ) ||
         ( callbacks == NULL ) )
@@ -3264,125 +3228,125 @@ LoRaMacStatus_t LoRaMacInitialization( LoRaMacPrimitives_t* primitives, LoRaMacC
     }
 
     // Confirm queue reset
-    LoRaMacConfirmQueueInit( primitives, EventConfirmQueueNvmCtxChanged );
+    LoRaMacConfirmQueueInit( primitives );
 
     // Initialize the module context with zeros
-    memset1( ( uint8_t* ) &NvmMacCtx, 0x00, sizeof( LoRaMacNvmCtx_t ) );
+    memset1( ( uint8_t* ) &Nvm, 0x00, sizeof( LoRaMacNvmData_t ) );
     memset1( ( uint8_t* ) &MacCtx, 0x00, sizeof( LoRaMacCtx_t ) );
-    MacCtx.NvmCtx = &NvmMacCtx;
 
     // Set non zero variables to its default value
     MacCtx.AckTimeoutRetriesCounter = 1;
     MacCtx.AckTimeoutRetries = 1;
-    MacCtx.NvmCtx->Region = region;
-    MacCtx.NvmCtx->DeviceClass = CLASS_A;
-    MacCtx.NvmCtx->RepeaterSupport = false;
+    Nvm.MacGroup2.Region = region;
+    Nvm.MacGroup2.DeviceClass = CLASS_A;
+    Nvm.MacGroup2.MacParams.RepeaterSupport = false; /* ST_WORKAROUND: Keep repeater feature */
 
     // Setup version
-    MacCtx.NvmCtx->Version.Value = LORAMAC_VERSION;
+    Nvm.MacGroup2.Version.Value = LORAMAC_VERSION;
 
     // Reset to defaults
     getPhy.Attribute = PHY_DUTY_CYCLE;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->DutyCycleOn = ( bool ) phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.DutyCycleOn = ( bool ) phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_TX_POWER;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.ChannelsTxPower = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.ChannelsTxPowerDefault = phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_TX_DR;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.ChannelsDatarate = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.ChannelsDatarateDefault = phyParam.Value;
 
     getPhy.Attribute = PHY_MAX_RX_WINDOW;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.MaxRxWindow = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.MaxRxWindow = phyParam.Value;
 
     getPhy.Attribute = PHY_RECEIVE_DELAY1;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.ReceiveDelay1 = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.ReceiveDelay1 = phyParam.Value;
 
     getPhy.Attribute = PHY_RECEIVE_DELAY2;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.ReceiveDelay2 = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.ReceiveDelay2 = phyParam.Value;
 
     getPhy.Attribute = PHY_JOIN_ACCEPT_DELAY1;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.JoinAcceptDelay1 = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.JoinAcceptDelay1 = phyParam.Value;
 
     getPhy.Attribute = PHY_JOIN_ACCEPT_DELAY2;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.JoinAcceptDelay2 = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.JoinAcceptDelay2 = phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_DR1_OFFSET;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.Rx1DrOffset = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.Rx1DrOffset = phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_RX2_FREQUENCY;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.Rx2Channel.Frequency = phyParam.Value;
-    MacCtx.NvmCtx->MacParamsDefaults.RxCChannel.Frequency = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.Rx2Channel.Frequency = phyParam.Value;
+    Nvm.MacGroup2.MacParamsDefaults.RxCChannel.Frequency = phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_RX2_DR;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.Rx2Channel.Datarate = phyParam.Value;
-    MacCtx.NvmCtx->MacParamsDefaults.RxCChannel.Datarate = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.Rx2Channel.Datarate = phyParam.Value;
+    Nvm.MacGroup2.MacParamsDefaults.RxCChannel.Datarate = phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_UPLINK_DWELL_TIME;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.UplinkDwellTime = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.UplinkDwellTime = phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_DOWNLINK_DWELL_TIME;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.DownlinkDwellTime = phyParam.Value;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.DownlinkDwellTime = phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_MAX_EIRP;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.MaxEirp = phyParam.fValue;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.MaxEirp = phyParam.fValue;
 
     getPhy.Attribute = PHY_DEF_ANTENNA_GAIN;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
-    MacCtx.NvmCtx->MacParamsDefaults.AntennaGain = phyParam.fValue;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
+    Nvm.MacGroup2.MacParamsDefaults.AntennaGain = phyParam.fValue;
 
     getPhy.Attribute = PHY_DEF_ADR_ACK_LIMIT;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
     MacCtx.AdrAckLimit = phyParam.Value;
 
     getPhy.Attribute = PHY_DEF_ADR_ACK_DELAY;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
     MacCtx.AdrAckDelay = phyParam.Value;
 
     // Init parameters which are not set in function ResetMacParameters
-    MacCtx.NvmCtx->MacParamsDefaults.ChannelsNbTrans = 1;
-    MacCtx.NvmCtx->MacParamsDefaults.SystemMaxRxError = 10;
-    MacCtx.NvmCtx->MacParamsDefaults.MinRxSymbols = 6;
-
-    MacCtx.NvmCtx->MacParams.SystemMaxRxError = MacCtx.NvmCtx->MacParamsDefaults.SystemMaxRxError;
-    MacCtx.NvmCtx->MacParams.MinRxSymbols = MacCtx.NvmCtx->MacParamsDefaults.MinRxSymbols;
-    MacCtx.NvmCtx->MacParams.MaxRxWindow = MacCtx.NvmCtx->MacParamsDefaults.MaxRxWindow;
-    MacCtx.NvmCtx->MacParams.ReceiveDelay1 = MacCtx.NvmCtx->MacParamsDefaults.ReceiveDelay1;
-    MacCtx.NvmCtx->MacParams.ReceiveDelay2 = MacCtx.NvmCtx->MacParamsDefaults.ReceiveDelay2;
-    MacCtx.NvmCtx->MacParams.JoinAcceptDelay1 = MacCtx.NvmCtx->MacParamsDefaults.JoinAcceptDelay1;
-    MacCtx.NvmCtx->MacParams.JoinAcceptDelay2 = MacCtx.NvmCtx->MacParamsDefaults.JoinAcceptDelay2;
-    MacCtx.NvmCtx->MacParams.ChannelsNbTrans = MacCtx.NvmCtx->MacParamsDefaults.ChannelsNbTrans;
+    Nvm.MacGroup2.MacParamsDefaults.ChannelsNbTrans = 1;
+    Nvm.MacGroup2.MacParamsDefaults.SystemMaxRxError = 10;
+    Nvm.MacGroup2.MacParamsDefaults.MinRxSymbols = 6;
+
+    Nvm.MacGroup2.MacParams.SystemMaxRxError = Nvm.MacGroup2.MacParamsDefaults.SystemMaxRxError;
+    Nvm.MacGroup2.MacParams.MinRxSymbols = Nvm.MacGroup2.MacParamsDefaults.MinRxSymbols;
+    Nvm.MacGroup2.MacParams.MaxRxWindow = Nvm.MacGroup2.MacParamsDefaults.MaxRxWindow;
+    Nvm.MacGroup2.MacParams.ReceiveDelay1 = Nvm.MacGroup2.MacParamsDefaults.ReceiveDelay1;
+    Nvm.MacGroup2.MacParams.ReceiveDelay2 = Nvm.MacGroup2.MacParamsDefaults.ReceiveDelay2;
+    Nvm.MacGroup2.MacParams.JoinAcceptDelay1 = Nvm.MacGroup2.MacParamsDefaults.JoinAcceptDelay1;
+    Nvm.MacGroup2.MacParams.JoinAcceptDelay2 = Nvm.MacGroup2.MacParamsDefaults.JoinAcceptDelay2;
+    Nvm.MacGroup2.MacParams.ChannelsNbTrans = Nvm.MacGroup2.MacParamsDefaults.ChannelsNbTrans;
 
     InitDefaultsParams_t params;
     params.Type = INIT_TYPE_DEFAULTS;
-    params.NvmCtx = NULL;
-    RegionInitDefaults( MacCtx.NvmCtx->Region, &params );
+    params.NvmGroup1 = &Nvm.RegionGroup1;
+    params.NvmGroup2 = &Nvm.RegionGroup2;
+    RegionInitDefaults( Nvm.MacGroup2.Region, &params );
 
+    MacCtx.MacCallbacks = callbacks;
     ResetMacParameters( );
 
-    MacCtx.NvmCtx->PublicNetwork = true;
+    Nvm.MacGroup2.PublicNetwork = true;
 
     MacCtx.MacPrimitives = primitives;
-    MacCtx.MacCallbacks = callbacks;
     MacCtx.MacFlags.Value = 0;
     MacCtx.MacState = LORAMAC_STOPPED;
 
     // Reset duty cycle times
-    MacCtx.NvmCtx->LastTxDoneTime = 0;
-    MacCtx.NvmCtx->AggregatedTimeOff = 0;
+    Nvm.MacGroup1.LastTxDoneTime = 0;
+    Nvm.MacGroup1.AggregatedTimeOff = 0;
 
     // Initialize timers
     TimerInit( &MacCtx.TxDelayedTimer, OnTxDelayedTimerEvent );
@@ -3391,7 +3355,7 @@ LoRaMacStatus_t LoRaMacInitialization( LoRaMacPrimitives_t* primitives, LoRaMacC
     TimerInit( &MacCtx.AckTimeoutTimer, OnAckTimeoutTimerEvent );
 
     // Store the current initialization time
-    MacCtx.NvmCtx->InitializationTime = SysTimeGetMcuTime( );
+    Nvm.MacGroup2.InitializationTime = SysTimeGetMcuTime( );
 
     // Initialize Radio driver
     MacCtx.RadioEvents.TxDone = OnRadioTxDone;
@@ -3402,25 +3366,25 @@ LoRaMacStatus_t LoRaMacInitialization( LoRaMacPrimitives_t* primitives, LoRaMacC
     Radio.Init( &MacCtx.RadioEvents );
 
     // Initialize the Secure Element driver
-    if( SecureElementInit( EventSecureElementNvmCtxChanged ) != SECURE_ELEMENT_SUCCESS )
+    if( SecureElementInit( &Nvm.SecureElement, callbacks->GetUniqueId ) != SECURE_ELEMENT_SUCCESS ) /* ST_WORKAROUND: Add unique ID callback as input parameter */
     {
         return LORAMAC_STATUS_CRYPTO_ERROR;
     }
 
     // Initialize Crypto module
-    if( LoRaMacCryptoInit( EventCryptoNvmCtxChanged ) != LORAMAC_CRYPTO_SUCCESS )
+    if( LoRaMacCryptoInit( &Nvm.Crypto ) != LORAMAC_CRYPTO_SUCCESS )
     {
         return LORAMAC_STATUS_CRYPTO_ERROR;
     }
 
     // Initialize MAC commands module
-    if( LoRaMacCommandsInit( EventCommandsNvmCtxChanged ) != LORAMAC_COMMANDS_SUCCESS )
+    if( LoRaMacCommandsInit( ) != LORAMAC_COMMANDS_SUCCESS )
     {
         return LORAMAC_STATUS_MAC_COMMAD_ERROR;
     }
 
     // Set multicast downlink counter reference
-    if( LoRaMacCryptoSetMulticastReference( MacCtx.NvmCtx->MulticastChannelList ) != LORAMAC_CRYPTO_SUCCESS )
+    if( LoRaMacCryptoSetMulticastReference( Nvm.MacGroup2.MulticastChannelList ) != LORAMAC_CRYPTO_SUCCESS )
     {
         return LORAMAC_STATUS_CRYPTO_ERROR;
     }
@@ -3428,31 +3392,9 @@ LoRaMacStatus_t LoRaMacInitialization( LoRaMacPrimitives_t* primitives, LoRaMacC
     // Random seed initialization
     srand1( Radio.Random( ) );
 
-    Radio.SetPublicNetwork( MacCtx.NvmCtx->PublicNetwork );
+    Radio.SetPublicNetwork( Nvm.MacGroup2.PublicNetwork );
     Radio.Sleep( );
 
-    // Initialize class b
-    // Apply callback
-    classBCallbacks.GetTemperatureLevel = NULL;
-    classBCallbacks.MacProcessNotify = NULL;
-    if( callbacks != NULL )
-    {
-        classBCallbacks.GetTemperatureLevel = callbacks->GetTemperatureLevel;
-        classBCallbacks.MacProcessNotify = callbacks->MacProcessNotify;
-    }
-
-    // Must all be static. Don't use local references.
-    classBParams.MlmeIndication = &MacCtx.MlmeIndication;
-    classBParams.McpsIndication = &MacCtx.McpsIndication;
-    classBParams.MlmeConfirm = &MacCtx.MlmeConfirm;
-    classBParams.LoRaMacFlags = &MacCtx.MacFlags;
-    classBParams.LoRaMacDevAddr = &MacCtx.NvmCtx->DevAddr;
-    classBParams.LoRaMacRegion = &MacCtx.NvmCtx->Region;
-    classBParams.LoRaMacParams = &MacCtx.NvmCtx->MacParams;
-    classBParams.MulticastChannels = &MacCtx.NvmCtx->MulticastChannelList[0];
-
-    LoRaMacClassBInit( &classBParams, &classBCallbacks, &EventClassBNvmCtxChanged );
-
     LoRaMacEnableRequests( LORAMAC_REQUEST_HANDLING_ON );
 
     return LORAMAC_STATUS_OK;
@@ -3481,9 +3423,9 @@ LoRaMacStatus_t LoRaMacStop( void )
 LoRaMacStatus_t LoRaMacQueryTxPossible( uint8_t size, LoRaMacTxInfo_t* txInfo )
 {
     CalcNextAdrParams_t adrNext;
-    uint32_t adrAckCounter = MacCtx.NvmCtx->AdrAckCounter;
-    int8_t datarate = MacCtx.NvmCtx->MacParamsDefaults.ChannelsDatarate;
-    int8_t txPower = MacCtx.NvmCtx->MacParamsDefaults.ChannelsTxPower;
+    uint32_t adrAckCounter = Nvm.MacGroup1.AdrAckCounter;
+    int8_t datarate = Nvm.MacGroup2.ChannelsDatarateDefault;
+    int8_t txPower = Nvm.MacGroup2.ChannelsTxPowerDefault;
     size_t macCmdsSize = 0;
 
     if( txInfo == NULL )
@@ -3492,16 +3434,16 @@ LoRaMacStatus_t LoRaMacQueryTxPossible( uint8_t size, LoRaMacTxInfo_t* txInfo )
     }
 
     // Setup ADR request
-    adrNext.Version = MacCtx.NvmCtx->Version;
+    adrNext.Version = Nvm.MacGroup2.Version;
     adrNext.UpdateChanMask = false;
-    adrNext.AdrEnabled = MacCtx.NvmCtx->AdrCtrlOn;
-    adrNext.AdrAckCounter = MacCtx.NvmCtx->AdrAckCounter;
+    adrNext.AdrEnabled = Nvm.MacGroup2.AdrCtrlOn;
+    adrNext.AdrAckCounter = Nvm.MacGroup1.AdrAckCounter;
     adrNext.AdrAckLimit = MacCtx.AdrAckLimit;
     adrNext.AdrAckDelay = MacCtx.AdrAckDelay;
-    adrNext.Datarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
-    adrNext.TxPower = MacCtx.NvmCtx->MacParams.ChannelsTxPower;
-    adrNext.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
-    adrNext.Region = MacCtx.NvmCtx->Region;
+    adrNext.Datarate = Nvm.MacGroup1.ChannelsDatarate;
+    adrNext.TxPower = Nvm.MacGroup1.ChannelsTxPower;
+    adrNext.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
+    adrNext.Region = Nvm.MacGroup2.Region;
 
     // We call the function for information purposes only. We don't want to
     // apply the datarate, the tx power and the ADR ack counter.
@@ -3551,12 +3493,12 @@ LoRaMacStatus_t LoRaMacMibGetRequestConfirm( MibRequestConfirm_t* mibGet )
     {
         case MIB_DEVICE_CLASS:
         {
-            mibGet->Param.Class = MacCtx.NvmCtx->DeviceClass;
+            mibGet->Param.Class = Nvm.MacGroup2.DeviceClass;
             break;
         }
         case MIB_NETWORK_ACTIVATION:
         {
-            mibGet->Param.NetworkActivation = MacCtx.NvmCtx->NetworkActivation;
+            mibGet->Param.NetworkActivation = Nvm.MacGroup2.NetworkActivation;
             break;
         }
         case MIB_DEV_EUI:
@@ -3571,61 +3513,63 @@ LoRaMacStatus_t LoRaMacMibGetRequestConfirm( MibRequestConfirm_t* mibGet )
         }
         case MIB_ADR:
         {
-            mibGet->Param.AdrEnable = MacCtx.NvmCtx->AdrCtrlOn;
+            mibGet->Param.AdrEnable = Nvm.MacGroup2.AdrCtrlOn;
             break;
         }
         case MIB_NET_ID:
         {
-            mibGet->Param.NetID = MacCtx.NvmCtx->NetID;
+            mibGet->Param.NetID = Nvm.MacGroup2.NetID;
             break;
         }
         case MIB_DEV_ADDR:
         {
-            mibGet->Param.DevAddr = MacCtx.NvmCtx->DevAddr;
+            mibGet->Param.DevAddr = Nvm.MacGroup2.DevAddr;
             break;
         }
         case MIB_PUBLIC_NETWORK:
         {
-            mibGet->Param.EnablePublicNetwork = MacCtx.NvmCtx->PublicNetwork;
+            mibGet->Param.EnablePublicNetwork = Nvm.MacGroup2.PublicNetwork;
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case MIB_REPEATER_SUPPORT:
         {
-            mibGet->Param.EnableRepeaterSupport = MacCtx.NvmCtx->RepeaterSupport;
+            mibGet->Param.EnableRepeaterSupport = Nvm.MacGroup2.MacParams.RepeaterSupport;
             break;
         }
+        /* ST_WORKAROUND_END */
         case MIB_CHANNELS:
         {
             getPhy.Attribute = PHY_CHANNELS;
-            phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+            phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
 
             mibGet->Param.ChannelList = phyParam.Channels;
             break;
         }
         case MIB_RX2_CHANNEL:
         {
-            mibGet->Param.Rx2Channel = MacCtx.NvmCtx->MacParams.Rx2Channel;
+            mibGet->Param.Rx2Channel = Nvm.MacGroup2.MacParams.Rx2Channel;
             break;
         }
         case MIB_RX2_DEFAULT_CHANNEL:
         {
-            mibGet->Param.Rx2Channel = MacCtx.NvmCtx->MacParamsDefaults.Rx2Channel;
+            mibGet->Param.Rx2Channel = Nvm.MacGroup2.MacParamsDefaults.Rx2Channel;
             break;
         }
         case MIB_RXC_CHANNEL:
         {
-            mibGet->Param.RxCChannel = MacCtx.NvmCtx->MacParams.RxCChannel;
+            mibGet->Param.RxCChannel = Nvm.MacGroup2.MacParams.RxCChannel;
             break;
         }
         case MIB_RXC_DEFAULT_CHANNEL:
         {
-            mibGet->Param.RxCChannel = MacCtx.NvmCtx->MacParamsDefaults.RxCChannel;
+            mibGet->Param.RxCChannel = Nvm.MacGroup2.MacParamsDefaults.RxCChannel;
             break;
         }
         case MIB_CHANNELS_DEFAULT_MASK:
         {
             getPhy.Attribute = PHY_CHANNELS_DEFAULT_MASK;
-            phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+            phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
 
             mibGet->Param.ChannelsDefaultMask = phyParam.ChannelsMask;
             break;
@@ -3633,89 +3577,89 @@ LoRaMacStatus_t LoRaMacMibGetRequestConfirm( MibRequestConfirm_t* mibGet )
         case MIB_CHANNELS_MASK:
         {
             getPhy.Attribute = PHY_CHANNELS_MASK;
-            phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+            phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
 
             mibGet->Param.ChannelsMask = phyParam.ChannelsMask;
             break;
         }
         case MIB_CHANNELS_NB_TRANS:
         {
-            mibGet->Param.ChannelsNbTrans = MacCtx.NvmCtx->MacParams.ChannelsNbTrans;
+            mibGet->Param.ChannelsNbTrans = Nvm.MacGroup2.MacParams.ChannelsNbTrans;
             break;
         }
         case MIB_MAX_RX_WINDOW_DURATION:
         {
-            mibGet->Param.MaxRxWindow = MacCtx.NvmCtx->MacParams.MaxRxWindow;
+            mibGet->Param.MaxRxWindow = Nvm.MacGroup2.MacParams.MaxRxWindow;
             break;
         }
         case MIB_RECEIVE_DELAY_1:
         {
-            mibGet->Param.ReceiveDelay1 = MacCtx.NvmCtx->MacParams.ReceiveDelay1;
+            mibGet->Param.ReceiveDelay1 = Nvm.MacGroup2.MacParams.ReceiveDelay1;
             break;
         }
         case MIB_RECEIVE_DELAY_2:
         {
-            mibGet->Param.ReceiveDelay2 = MacCtx.NvmCtx->MacParams.ReceiveDelay2;
+            mibGet->Param.ReceiveDelay2 = Nvm.MacGroup2.MacParams.ReceiveDelay2;
             break;
         }
         case MIB_JOIN_ACCEPT_DELAY_1:
         {
-            mibGet->Param.JoinAcceptDelay1 = MacCtx.NvmCtx->MacParams.JoinAcceptDelay1;
+            mibGet->Param.JoinAcceptDelay1 = Nvm.MacGroup2.MacParams.JoinAcceptDelay1;
             break;
         }
         case MIB_JOIN_ACCEPT_DELAY_2:
         {
-            mibGet->Param.JoinAcceptDelay2 = MacCtx.NvmCtx->MacParams.JoinAcceptDelay2;
+            mibGet->Param.JoinAcceptDelay2 = Nvm.MacGroup2.MacParams.JoinAcceptDelay2;
             break;
         }
         case MIB_CHANNELS_DEFAULT_DATARATE:
         {
-            mibGet->Param.ChannelsDefaultDatarate = MacCtx.NvmCtx->MacParamsDefaults.ChannelsDatarate;
+            mibGet->Param.ChannelsDefaultDatarate = Nvm.MacGroup2.ChannelsDatarateDefault;
             break;
         }
         case MIB_CHANNELS_DATARATE:
         {
-            mibGet->Param.ChannelsDatarate = MacCtx.NvmCtx->MacParams.ChannelsDatarate;
+            mibGet->Param.ChannelsDatarate = Nvm.MacGroup1.ChannelsDatarate;
             break;
         }
         case MIB_CHANNELS_DEFAULT_TX_POWER:
         {
-            mibGet->Param.ChannelsDefaultTxPower = MacCtx.NvmCtx->MacParamsDefaults.ChannelsTxPower;
+            mibGet->Param.ChannelsDefaultTxPower = Nvm.MacGroup2.ChannelsTxPowerDefault;
             break;
         }
         case MIB_CHANNELS_TX_POWER:
         {
-            mibGet->Param.ChannelsTxPower = MacCtx.NvmCtx->MacParams.ChannelsTxPower;
+            mibGet->Param.ChannelsTxPower = Nvm.MacGroup1.ChannelsTxPower;
             break;
         }
         case MIB_SYSTEM_MAX_RX_ERROR:
         {
-            mibGet->Param.SystemMaxRxError = MacCtx.NvmCtx->MacParams.SystemMaxRxError;
+            mibGet->Param.SystemMaxRxError = Nvm.MacGroup2.MacParams.SystemMaxRxError;
             break;
         }
         case MIB_MIN_RX_SYMBOLS:
         {
-            mibGet->Param.MinRxSymbols = MacCtx.NvmCtx->MacParams.MinRxSymbols;
+            mibGet->Param.MinRxSymbols = Nvm.MacGroup2.MacParams.MinRxSymbols;
             break;
         }
         case MIB_ANTENNA_GAIN:
         {
-            mibGet->Param.AntennaGain = MacCtx.NvmCtx->MacParams.AntennaGain;
+            mibGet->Param.AntennaGain = Nvm.MacGroup2.MacParams.AntennaGain;
             break;
         }
         case MIB_NVM_CTXS:
         {
-            mibGet->Param.Contexts = GetCtxs( );
+            mibGet->Param.Contexts = GetNvmData( );
             break;
         }
         case MIB_DEFAULT_ANTENNA_GAIN:
         {
-            mibGet->Param.DefaultAntennaGain = MacCtx.NvmCtx->MacParamsDefaults.AntennaGain;
+            mibGet->Param.DefaultAntennaGain = Nvm.MacGroup2.MacParamsDefaults.AntennaGain;
             break;
         }
         case MIB_LORAWAN_VERSION:
         {
-            mibGet->Param.LrWanVersion.LoRaWan = MacCtx.NvmCtx->Version;
+            mibGet->Param.LrWanVersion.LoRaWan = Nvm.MacGroup2.Version;
             mibGet->Param.LrWanVersion.LoRaWanRegion = RegionGetVersion( );
             break;
         }
@@ -3754,7 +3698,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         {
             if( mibSet->Param.NetworkActivation != ACTIVATION_TYPE_OTAA  )
             {
-                MacCtx.NvmCtx->NetworkActivation = mibSet->Param.NetworkActivation;
+                Nvm.MacGroup2.NetworkActivation = mibSet->Param.NetworkActivation;
             }
             else
             {   // Do not allow to set ACTIVATION_TYPE_OTAA since the MAC will set it automatically after a successful join process.
@@ -3780,17 +3724,17 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         }
         case MIB_ADR:
         {
-            MacCtx.NvmCtx->AdrCtrlOn = mibSet->Param.AdrEnable;
+            Nvm.MacGroup2.AdrCtrlOn = mibSet->Param.AdrEnable;
             break;
         }
         case MIB_NET_ID:
         {
-            MacCtx.NvmCtx->NetID = mibSet->Param.NetID;
+            Nvm.MacGroup2.NetID = mibSet->Param.NetID;
             break;
         }
         case MIB_DEV_ADDR:
         {
-            MacCtx.NvmCtx->DevAddr = mibSet->Param.DevAddr;
+            Nvm.MacGroup2.DevAddr = mibSet->Param.DevAddr;
             break;
         }
         case MIB_APP_KEY:
@@ -3823,7 +3767,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             }
             break;
         }
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if ( USE_LRWAN_1_1_X_CRYPTO == 1 ) /* ST_WORKAROUND: integrate 1.1.x keys only if required */
         case MIB_J_S_INT_KEY:
         {
             if( mibSet->Param.JSIntKey != NULL )
@@ -3946,6 +3890,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             }
             break;
         }
+#if ( LORAMAC_MAX_MC_CTX > 0 ) /* ST_WORKAROUND: reduced LORAMAC_MAX_MC_CTX */
         case MIB_MC_KEY_0:
         {
             if( mibSet->Param.McKey0 != NULL )
@@ -3991,6 +3936,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             }
             break;
         }
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
 #if ( LORAMAC_MAX_MC_CTX > 1 )
         case MIB_MC_KEY_1:
         {
@@ -4037,6 +3983,8 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             }
             break;
         }
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
         case MIB_MC_KEY_2:
         {
             if( mibSet->Param.McKey2 != NULL )
@@ -4082,6 +4030,8 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             }
             break;
         }
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
         case MIB_MC_KEY_3:
         {
             if( mibSet->Param.McKey3 != NULL )
@@ -4127,40 +4077,42 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             }
             break;
         }
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
         case MIB_PUBLIC_NETWORK:
         {
-            MacCtx.NvmCtx->PublicNetwork = mibSet->Param.EnablePublicNetwork;
-            Radio.SetPublicNetwork( MacCtx.NvmCtx->PublicNetwork );
+            Nvm.MacGroup2.PublicNetwork = mibSet->Param.EnablePublicNetwork;
+            Radio.SetPublicNetwork( Nvm.MacGroup2.PublicNetwork );
             /* ST_WORAROUND_BEGIN: Required to avoid keeping the radio active after init */
             Radio.Sleep( );
             /* ST_WORKAROUND_END */
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case MIB_REPEATER_SUPPORT:
         {
-            MacCtx.NvmCtx->RepeaterSupport = mibSet->Param.EnableRepeaterSupport;
+            Nvm.MacGroup2.MacParams.RepeaterSupport = mibSet->Param.EnableRepeaterSupport;
             break;
         }
+        /* ST_WORKAROUND_END */
         case MIB_RX2_CHANNEL:
         {
             verify.DatarateParams.Datarate = mibSet->Param.Rx2Channel.Datarate;
-            verify.DatarateParams.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
+            verify.DatarateParams.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
             /* ST_WORAROUND_BEGIN: Check also the Rx Frequency parameter */
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_RX_DR ) != true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_RX_DR ) != true )
             {
                 status = LORAMAC_STATUS_PARAMETER_INVALID;
             }
             else
             {
                 verify.Frequency = mibSet->Param.Rx2Channel.Frequency;
-                if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_FREQUENCY ) != true )
+                if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_FREQUENCY ) != true )
                 {
                     status = LORAMAC_STATUS_PARAMETER_INVALID;
                 }
                 else
                 {
-                    MacCtx.NvmCtx->MacParams.Rx2Channel = mibSet->Param.Rx2Channel;
+                    Nvm.MacGroup2.MacParams.Rx2Channel = mibSet->Param.Rx2Channel;
                 }
             }
             /* ST_WORKAROUND_END */
@@ -4169,11 +4121,11 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         case MIB_RX2_DEFAULT_CHANNEL:
         {
             verify.DatarateParams.Datarate = mibSet->Param.Rx2Channel.Datarate;
-            verify.DatarateParams.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
+            verify.DatarateParams.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
 
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_RX_DR ) == true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_RX_DR ) == true )
             {
-                MacCtx.NvmCtx->MacParamsDefaults.Rx2Channel = mibSet->Param.Rx2DefaultChannel;
+                Nvm.MacGroup2.MacParamsDefaults.Rx2Channel = mibSet->Param.Rx2DefaultChannel;
             }
             else
             {
@@ -4184,13 +4136,13 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         case MIB_RXC_CHANNEL:
         {
             verify.DatarateParams.Datarate = mibSet->Param.RxCChannel.Datarate;
-            verify.DatarateParams.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
+            verify.DatarateParams.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
 
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_RX_DR ) == true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_RX_DR ) == true )
             {
-                MacCtx.NvmCtx->MacParams.RxCChannel = mibSet->Param.RxCChannel;
+                Nvm.MacGroup2.MacParams.RxCChannel = mibSet->Param.RxCChannel;
 
-                if( ( MacCtx.NvmCtx->DeviceClass == CLASS_C ) && ( MacCtx.NvmCtx->NetworkActivation != ACTIVATION_TYPE_NONE ) )
+                if( ( Nvm.MacGroup2.DeviceClass == CLASS_C ) && ( Nvm.MacGroup2.NetworkActivation != ACTIVATION_TYPE_NONE ) )
                 {
                     // We can only compute the RX window parameters directly, if we are already
                     // in class c mode and joined. We cannot setup an RX window in case of any other
@@ -4210,11 +4162,11 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         case MIB_RXC_DEFAULT_CHANNEL:
         {
             verify.DatarateParams.Datarate = mibSet->Param.RxCChannel.Datarate;
-            verify.DatarateParams.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
+            verify.DatarateParams.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
 
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_RX_DR ) == true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_RX_DR ) == true )
             {
-                MacCtx.NvmCtx->MacParamsDefaults.RxCChannel = mibSet->Param.RxCDefaultChannel;
+                Nvm.MacGroup2.MacParamsDefaults.RxCChannel = mibSet->Param.RxCDefaultChannel;
             }
             else
             {
@@ -4227,7 +4179,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             chanMaskSet.ChannelsMaskIn = mibSet->Param.ChannelsDefaultMask;
             chanMaskSet.ChannelsMaskType = CHANNELS_DEFAULT_MASK;
 
-            if( RegionChanMaskSet( MacCtx.NvmCtx->Region, &chanMaskSet ) == false )
+            if( RegionChanMaskSet( Nvm.MacGroup2.Region, &chanMaskSet ) == false )
             {
                 status = LORAMAC_STATUS_PARAMETER_INVALID;
             }
@@ -4238,7 +4190,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             chanMaskSet.ChannelsMaskIn = mibSet->Param.ChannelsMask;
             chanMaskSet.ChannelsMaskType = CHANNELS_MASK;
 
-            if( RegionChanMaskSet( MacCtx.NvmCtx->Region, &chanMaskSet ) == false )
+            if( RegionChanMaskSet( Nvm.MacGroup2.Region, &chanMaskSet ) == false )
             {
                 status = LORAMAC_STATUS_PARAMETER_INVALID;
             }
@@ -4249,7 +4201,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             if( ( mibSet->Param.ChannelsNbTrans >= 1 ) &&
                 ( mibSet->Param.ChannelsNbTrans <= 15 ) )
             {
-                MacCtx.NvmCtx->MacParams.ChannelsNbTrans = mibSet->Param.ChannelsNbTrans;
+                Nvm.MacGroup2.MacParams.ChannelsNbTrans = mibSet->Param.ChannelsNbTrans;
             }
             else
             {
@@ -4259,36 +4211,36 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         }
         case MIB_MAX_RX_WINDOW_DURATION:
         {
-            MacCtx.NvmCtx->MacParams.MaxRxWindow = mibSet->Param.MaxRxWindow;
+            Nvm.MacGroup2.MacParams.MaxRxWindow = mibSet->Param.MaxRxWindow;
             break;
         }
         case MIB_RECEIVE_DELAY_1:
         {
-            MacCtx.NvmCtx->MacParams.ReceiveDelay1 = mibSet->Param.ReceiveDelay1;
+            Nvm.MacGroup2.MacParams.ReceiveDelay1 = mibSet->Param.ReceiveDelay1;
             break;
         }
         case MIB_RECEIVE_DELAY_2:
         {
-            MacCtx.NvmCtx->MacParams.ReceiveDelay2 = mibSet->Param.ReceiveDelay2;
+            Nvm.MacGroup2.MacParams.ReceiveDelay2 = mibSet->Param.ReceiveDelay2;
             break;
         }
         case MIB_JOIN_ACCEPT_DELAY_1:
         {
-            MacCtx.NvmCtx->MacParams.JoinAcceptDelay1 = mibSet->Param.JoinAcceptDelay1;
+            Nvm.MacGroup2.MacParams.JoinAcceptDelay1 = mibSet->Param.JoinAcceptDelay1;
             break;
         }
         case MIB_JOIN_ACCEPT_DELAY_2:
         {
-            MacCtx.NvmCtx->MacParams.JoinAcceptDelay2 = mibSet->Param.JoinAcceptDelay2;
+            Nvm.MacGroup2.MacParams.JoinAcceptDelay2 = mibSet->Param.JoinAcceptDelay2;
             break;
         }
         case MIB_CHANNELS_DEFAULT_DATARATE:
         {
             verify.DatarateParams.Datarate = mibSet->Param.ChannelsDefaultDatarate;
 
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_DEF_TX_DR ) == true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_DEF_TX_DR ) == true )
             {
-                MacCtx.NvmCtx->MacParamsDefaults.ChannelsDatarate = verify.DatarateParams.Datarate;
+                Nvm.MacGroup2.ChannelsDatarateDefault = verify.DatarateParams.Datarate;
             }
             else
             {
@@ -4299,11 +4251,11 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         case MIB_CHANNELS_DATARATE:
         {
             verify.DatarateParams.Datarate = mibSet->Param.ChannelsDatarate;
-            verify.DatarateParams.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
+            verify.DatarateParams.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
 
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_TX_DR ) == true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_TX_DR ) == true )
             {
-                MacCtx.NvmCtx->MacParams.ChannelsDatarate = verify.DatarateParams.Datarate;
+                Nvm.MacGroup1.ChannelsDatarate = verify.DatarateParams.Datarate;
             }
             else
             {
@@ -4315,9 +4267,9 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         {
             verify.TxPower = mibSet->Param.ChannelsDefaultTxPower;
 
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_DEF_TX_POWER ) == true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_DEF_TX_POWER ) == true )
             {
-                MacCtx.NvmCtx->MacParamsDefaults.ChannelsTxPower = verify.TxPower;
+                Nvm.MacGroup2.ChannelsTxPowerDefault = verify.TxPower;
             }
             else
             {
@@ -4329,9 +4281,9 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         {
             verify.TxPower = mibSet->Param.ChannelsTxPower;
 
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_TX_POWER ) == true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_TX_POWER ) == true )
             {
-                MacCtx.NvmCtx->MacParams.ChannelsTxPower = verify.TxPower;
+                Nvm.MacGroup1.ChannelsTxPower = verify.TxPower;
             }
             else
             {
@@ -4341,29 +4293,29 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         }
         case MIB_SYSTEM_MAX_RX_ERROR:
         {
-            MacCtx.NvmCtx->MacParams.SystemMaxRxError = MacCtx.NvmCtx->MacParamsDefaults.SystemMaxRxError = mibSet->Param.SystemMaxRxError;
+            Nvm.MacGroup2.MacParams.SystemMaxRxError = Nvm.MacGroup2.MacParamsDefaults.SystemMaxRxError = mibSet->Param.SystemMaxRxError;
             break;
         }
         case MIB_MIN_RX_SYMBOLS:
         {
-            MacCtx.NvmCtx->MacParams.MinRxSymbols = MacCtx.NvmCtx->MacParamsDefaults.MinRxSymbols = mibSet->Param.MinRxSymbols;
+            Nvm.MacGroup2.MacParams.MinRxSymbols = Nvm.MacGroup2.MacParamsDefaults.MinRxSymbols = mibSet->Param.MinRxSymbols;
             break;
         }
         case MIB_ANTENNA_GAIN:
         {
-            MacCtx.NvmCtx->MacParams.AntennaGain = mibSet->Param.AntennaGain;
+            Nvm.MacGroup2.MacParams.AntennaGain = mibSet->Param.AntennaGain;
             break;
         }
         case MIB_DEFAULT_ANTENNA_GAIN:
         {
-            MacCtx.NvmCtx->MacParamsDefaults.AntennaGain = mibSet->Param.DefaultAntennaGain;
+            Nvm.MacGroup2.MacParamsDefaults.AntennaGain = mibSet->Param.DefaultAntennaGain;
             break;
         }
         case MIB_NVM_CTXS:
         {
             if( mibSet->Param.Contexts != 0 )
             {
-                status = RestoreCtxs( mibSet->Param.Contexts );
+                status = RestoreNvmData( mibSet->Param.Contexts );
             }
             else
             {
@@ -4375,7 +4327,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
         {
             if( mibSet->Param.AbpLrWanVersion.Fields.Minor <= 1 )
             {
-                MacCtx.NvmCtx->Version = mibSet->Param.AbpLrWanVersion;
+                Nvm.MacGroup2.Version = mibSet->Param.AbpLrWanVersion;
 
                 if( LORAMAC_CRYPTO_SUCCESS != LoRaMacCryptoSetLrWanVersion( mibSet->Param.AbpLrWanVersion ) )
                 {
@@ -4394,8 +4346,6 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet )
             break;
         }
     }
-    EventRegionNvmCtxChanged( );
-    EventMacNvmCtxChanged( );
     return status;
 }
 
@@ -4414,9 +4364,7 @@ LoRaMacStatus_t LoRaMacChannelAdd( uint8_t id, ChannelParams_t params )
 
     channelAdd.NewChannel = &params;
     channelAdd.ChannelId = id;
-
-    EventRegionNvmCtxChanged( );
-    return RegionChannelAdd( MacCtx.NvmCtx->Region, &channelAdd );
+    return RegionChannelAdd( Nvm.MacGroup2.Region, &channelAdd );
 }
 
 LoRaMacStatus_t LoRaMacChannelRemove( uint8_t id )
@@ -4433,12 +4381,10 @@ LoRaMacStatus_t LoRaMacChannelRemove( uint8_t id )
 
     channelRemove.ChannelId = id;
 
-    if( RegionChannelsRemove( MacCtx.NvmCtx->Region, &channelRemove ) == false )
+    if( RegionChannelsRemove( Nvm.MacGroup2.Region, &channelRemove ) == false )
     {
         return LORAMAC_STATUS_PARAMETER_INVALID;
     }
-
-    EventRegionNvmCtxChanged( );
     return LORAMAC_STATUS_OK;
 }
 
@@ -4454,15 +4400,26 @@ LoRaMacStatus_t LoRaMacMcChannelSetup( McChannelParams_t *channel )
         return LORAMAC_STATUS_MC_GROUP_UNDEFINED;
     }
 
-    MacCtx.NvmCtx->MulticastChannelList[channel->GroupID].ChannelParams = *channel;
+    Nvm.MacGroup2.MulticastChannelList[channel->GroupID].ChannelParams = *channel;
 
     if( channel->IsRemotelySetup == true )
     {
-#if ( LORAMAC_MAX_MC_CTX == 1 )
-        const KeyIdentifier_t mcKeys[LORAMAC_MAX_MC_CTX] = { MC_KEY_0 };
-#else /* LORAMAC_MAX_MC_CTX > 1 */
-        const KeyIdentifier_t mcKeys[LORAMAC_MAX_MC_CTX] = { MC_KEY_0, MC_KEY_1, MC_KEY_2, MC_KEY_3 };
-#endif /* LORAMAC_MAX_MC_CTX */
+        /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+        const KeyIdentifier_t mcKeys[LORAMAC_MAX_MC_CTX] = {
+#if ( LORAMAC_MAX_MC_CTX > 0 )
+            MC_KEY_0
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
+#if ( LORAMAC_MAX_MC_CTX > 1 )
+            , MC_KEY_1
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
+            , MC_KEY_2
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
+            , MC_KEY_3
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
+        };
+        /* ST_WORKAROUND_END */
         if( LoRaMacCryptoSetKey( mcKeys[channel->GroupID], channel->McKeys.McKeyE ) != LORAMAC_CRYPTO_SUCCESS )
         {
             return LORAMAC_STATUS_CRYPTO_ERROR;
@@ -4475,13 +4432,36 @@ LoRaMacStatus_t LoRaMacMcChannelSetup( McChannelParams_t *channel )
     }
     else
     {
-#if ( LORAMAC_MAX_MC_CTX == 1 )
-        const KeyIdentifier_t mcAppSKeys[LORAMAC_MAX_MC_CTX] = { MC_APP_S_KEY_0 };
-        const KeyIdentifier_t mcNwkSKeys[LORAMAC_MAX_MC_CTX] = { MC_NWK_S_KEY_0 };
-#else /* LORAMAC_MAX_MC_CTX > 1 */
-        const KeyIdentifier_t mcAppSKeys[LORAMAC_MAX_MC_CTX] = { MC_APP_S_KEY_0, MC_APP_S_KEY_1, MC_APP_S_KEY_2, MC_APP_S_KEY_3 };
-        const KeyIdentifier_t mcNwkSKeys[LORAMAC_MAX_MC_CTX] = { MC_NWK_S_KEY_0, MC_NWK_S_KEY_1, MC_NWK_S_KEY_2, MC_NWK_S_KEY_3 };
-#endif /* LORAMAC_MAX_MC_CTX */
+        /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+        const KeyIdentifier_t mcAppSKeys[LORAMAC_MAX_MC_CTX] = {
+#if ( LORAMAC_MAX_MC_CTX > 0 )
+            MC_APP_S_KEY_0
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
+#if ( LORAMAC_MAX_MC_CTX > 1 )
+            , MC_APP_S_KEY_1
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
+            , MC_APP_S_KEY_2
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
+            , MC_APP_S_KEY_3
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
+        };
+        const KeyIdentifier_t mcNwkSKeys[LORAMAC_MAX_MC_CTX] = {
+#if ( LORAMAC_MAX_MC_CTX > 0 )
+            MC_NWK_S_KEY_0
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
+#if ( LORAMAC_MAX_MC_CTX > 1 )
+            , MC_NWK_S_KEY_1
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
+            , MC_NWK_S_KEY_2
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
+            , MC_NWK_S_KEY_3
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
+        };
+        /* ST_WORKAROUND_END */
         if( LORAMAC_CRYPTO_SUCCESS != LoRaMacCryptoSetKey( mcAppSKeys[channel->GroupID], channel->McKeys.Session.McAppSKey ) )
         {
             return LORAMAC_STATUS_CRYPTO_ERROR;
@@ -4495,14 +4475,11 @@ LoRaMacStatus_t LoRaMacMcChannelSetup( McChannelParams_t *channel )
     if( channel->Class == CLASS_B )
     {
         // Calculate class b parameters
-        LoRaMacClassBSetMulticastPeriodicity( &MacCtx.NvmCtx->MulticastChannelList[channel->GroupID] );
+        LoRaMacClassBSetMulticastPeriodicity( &Nvm.MacGroup2.MulticastChannelList[channel->GroupID] );
     }
 
     // Reset multicast channel downlink counter to initial value.
-    *MacCtx.NvmCtx->MulticastChannelList[channel->GroupID].DownLinkCounter = FCNT_DOWN_INITAL_VALUE;
-
-    EventMacNvmCtxChanged( );
-    EventRegionNvmCtxChanged( );
+    *Nvm.MacGroup2.MulticastChannelList[channel->GroupID].DownLinkCounter = FCNT_DOWN_INITAL_VALUE;
     return LORAMAC_STATUS_OK;
 }
 
@@ -4514,7 +4491,7 @@ LoRaMacStatus_t LoRaMacMcChannelDelete( AddressIdentifier_t groupID )
     }
 
     if( ( groupID >= LORAMAC_MAX_MC_CTX ) ||
-        ( MacCtx.NvmCtx->MulticastChannelList[groupID].ChannelParams.IsEnabled == false ) )
+        ( Nvm.MacGroup2.MulticastChannelList[groupID].ChannelParams.IsEnabled == false ) )
     {
         return LORAMAC_STATUS_MC_GROUP_UNDEFINED;
     }
@@ -4524,10 +4501,7 @@ LoRaMacStatus_t LoRaMacMcChannelDelete( AddressIdentifier_t groupID )
     // Set all channel fields with 0
     memset1( ( uint8_t* )&channel, 0, sizeof( McChannelParams_t ) );
 
-    MacCtx.NvmCtx->MulticastChannelList[groupID].ChannelParams = channel;
-
-    EventMacNvmCtxChanged( );
-    EventRegionNvmCtxChanged( );
+    Nvm.MacGroup2.MulticastChannelList[groupID].ChannelParams = channel;
     return LORAMAC_STATUS_OK;
 }
 
@@ -4535,7 +4509,7 @@ uint8_t LoRaMacMcChannelGetGroupId( uint32_t mcAddress )
 {
     for( uint8_t i = 0; i < LORAMAC_MAX_MC_CTX; i++ )
     {
-        if( mcAddress == MacCtx.NvmCtx->MulticastChannelList[i].ChannelParams.Address )
+        if( mcAddress == Nvm.MacGroup2.MulticastChannelList[i].ChannelParams.Address )
         {
             return i;
         }
@@ -4552,20 +4526,18 @@ LoRaMacStatus_t LoRaMacMcChannelSetupRxParams( AddressIdentifier_t groupID, McRx
         return LORAMAC_STATUS_BUSY;
     }
 
-    DeviceClass_t devClass = MacCtx.NvmCtx->MulticastChannelList[groupID].ChannelParams.Class;
+    DeviceClass_t devClass = Nvm.MacGroup2.MulticastChannelList[groupID].ChannelParams.Class;
     if( ( devClass == CLASS_A ) || ( devClass > CLASS_C ) )
     {
         return LORAMAC_STATUS_PARAMETER_INVALID;
     }
 
     if( ( groupID >= LORAMAC_MAX_MC_CTX ) ||
-        ( MacCtx.NvmCtx->MulticastChannelList[groupID].ChannelParams.IsEnabled == false ) )
+        ( Nvm.MacGroup2.MulticastChannelList[groupID].ChannelParams.IsEnabled == false ) )
     {
         return LORAMAC_STATUS_MC_GROUP_UNDEFINED;
     }
-    /* ST_WORAROUND_BEGIN: only clean one bit */
-    *status &= 0xEF; // groupID OK
-    /* ST_WORAROUND_END */
+    *status &= 0x0F; // groupID OK
 
     VerifyParams_t verify;
     // Check datarate
@@ -4577,9 +4549,9 @@ LoRaMacStatus_t LoRaMacMcChannelSetupRxParams( AddressIdentifier_t groupID, McRx
     {
         verify.DatarateParams.Datarate = rxParams->ClassC.Datarate;
     }
-    verify.DatarateParams.DownlinkDwellTime = MacCtx.NvmCtx->MacParams.DownlinkDwellTime;
+    verify.DatarateParams.DownlinkDwellTime = Nvm.MacGroup2.MacParams.DownlinkDwellTime;
 
-    if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_RX_DR ) == true )
+    if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_RX_DR ) == true )
     {
         *status &= 0xFB; // datarate OK
     }
@@ -4593,7 +4565,7 @@ LoRaMacStatus_t LoRaMacMcChannelSetupRxParams( AddressIdentifier_t groupID, McRx
     {
         verify.Frequency = rxParams->ClassC.Frequency;
     }
-    if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_FREQUENCY ) == true )
+    if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_FREQUENCY ) == true )
     {
         *status &= 0xF7; // frequency OK
     }
@@ -4601,11 +4573,8 @@ LoRaMacStatus_t LoRaMacMcChannelSetupRxParams( AddressIdentifier_t groupID, McRx
     if( *status == ( groupID & 0x03 ) )
     {
         // Apply parameters
-        MacCtx.NvmCtx->MulticastChannelList[groupID].ChannelParams.RxParams = *rxParams;
+        Nvm.MacGroup2.MulticastChannelList[groupID].ChannelParams.RxParams = *rxParams;
     }
-
-    EventMacNvmCtxChanged( );
-    EventRegionNvmCtxChanged( );
     return LORAMAC_STATUS_OK;
 }
 
@@ -4650,7 +4619,7 @@ LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest )
 
             ResetMacParameters( );
 
-            MacCtx.NvmCtx->MacParams.ChannelsDatarate = RegionAlternateDr( MacCtx.NvmCtx->Region, mlmeRequest->Req.Join.Datarate, ALTERNATE_DR );
+            Nvm.MacGroup1.ChannelsDatarate = RegionAlternateDr( Nvm.MacGroup2.Region, mlmeRequest->Req.Join.Datarate, ALTERNATE_DR );
 
             queueElement.Status = LORAMAC_EVENT_INFO_STATUS_JOIN_FAIL;
 
@@ -4659,7 +4628,7 @@ LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest )
             if( status != LORAMAC_STATUS_OK )
             {
                 // Revert back the previous datarate ( mainly used for US915 like regions )
-                MacCtx.NvmCtx->MacParams.ChannelsDatarate = RegionAlternateDr( MacCtx.NvmCtx->Region, mlmeRequest->Req.Join.Datarate, ALTERNATE_DR_RESTORE );
+                Nvm.MacGroup1.ChannelsDatarate = RegionAlternateDr( Nvm.MacGroup2.Region, mlmeRequest->Req.Join.Datarate, ALTERNATE_DR_RESTORE );
             }
             break;
         }
@@ -4696,7 +4665,7 @@ LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest )
         }
         case MLME_PING_SLOT_INFO:
         {
-            if( MacCtx.NvmCtx->DeviceClass == CLASS_A )
+            if( Nvm.MacGroup2.DeviceClass == CLASS_A )
             {
                 uint8_t value = mlmeRequest->Req.PingSlotInfo.PingSlot.Value;
 
@@ -4758,11 +4727,11 @@ LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest )
     else
     {
         LoRaMacConfirmQueueAdd( &queueElement );
-        EventMacNvmCtxChanged( );
     }
     return status;
 }
 
+/* ST_WORKAROUND_BEGIN: Update MCPS request with new input parameter to allow delayed tx */
 LoRaMacStatus_t LoRaMacMcpsRequest( McpsReq_t* mcpsRequest, bool allowDelayedTx )
 {
     GetPhyParams_t getPhy;
@@ -4771,7 +4740,9 @@ LoRaMacStatus_t LoRaMacMcpsRequest( McpsReq_t* mcpsRequest, bool allowDelayedTx
     LoRaMacHeader_t macHdr;
     VerifyParams_t verify;
     uint8_t fPort = 0;
-    void* fBuffer;
+    /* ST_WORKAROUND_BEGIN: remove GCC9 warning */
+    void* fBuffer = NULL;
+    /* ST_WORKAROUND_END */
     uint16_t fBufferSize;
     int8_t datarate = DR_0;
     bool readyToSend = false;
@@ -4835,22 +4806,22 @@ LoRaMacStatus_t LoRaMacMcpsRequest( McpsReq_t* mcpsRequest, bool allowDelayedTx
 
     // Get the minimum possible datarate
     getPhy.Attribute = PHY_MIN_TX_DR;
-    getPhy.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
-    phyParam = RegionGetPhyParam( MacCtx.NvmCtx->Region, &getPhy );
+    getPhy.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
+    phyParam = RegionGetPhyParam( Nvm.MacGroup2.Region, &getPhy );
     // Apply the minimum possible datarate.
     // Some regions have limitations for the minimum datarate.
     datarate = MAX( datarate, ( int8_t )phyParam.Value );
 
     if( readyToSend == true )
     {
-        if( MacCtx.NvmCtx->AdrCtrlOn == false )
+        if( Nvm.MacGroup2.AdrCtrlOn == false )
         {
             verify.DatarateParams.Datarate = datarate;
-            verify.DatarateParams.UplinkDwellTime = MacCtx.NvmCtx->MacParams.UplinkDwellTime;
+            verify.DatarateParams.UplinkDwellTime = Nvm.MacGroup2.MacParams.UplinkDwellTime;
 
-            if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_TX_DR ) == true )
+            if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_TX_DR ) == true )
             {
-                MacCtx.NvmCtx->MacParams.ChannelsDatarate = verify.DatarateParams.Datarate;
+                Nvm.MacGroup1.ChannelsDatarate = verify.DatarateParams.Datarate;
             }
             else
             {
@@ -4858,12 +4829,11 @@ LoRaMacStatus_t LoRaMacMcpsRequest( McpsReq_t* mcpsRequest, bool allowDelayedTx
             }
         }
 
-        status = Send( &macHdr, fPort, fBuffer, fBufferSize, allowDelayedTx );
+        status = Send( &macHdr, fPort, fBuffer, fBufferSize, allowDelayedTx ); /* ST_WORKAROUND: Update Send request with new input parameter to allow delayed tx */
         if( status == LORAMAC_STATUS_OK )
         {
             MacCtx.McpsConfirm.McpsRequest = mcpsRequest->Type;
             MacCtx.MacFlags.Bits.McpsReq = 1;
-            EventMacNvmCtxChanged( );
         }
         else
         {
@@ -4876,6 +4846,7 @@ LoRaMacStatus_t LoRaMacMcpsRequest( McpsReq_t* mcpsRequest, bool allowDelayedTx
 
     return status;
 }
+/* ST_WORKAROUND_END */
 
 void LoRaMacTestSetDutyCycleOn( bool enable )
 {
@@ -4883,9 +4854,9 @@ void LoRaMacTestSetDutyCycleOn( bool enable )
 
     verify.DutyCycle = enable;
 
-    if( RegionVerify( MacCtx.NvmCtx->Region, &verify, PHY_DUTY_CYCLE ) == true )
+    if( RegionVerify( Nvm.MacGroup2.Region, &verify, PHY_DUTY_CYCLE ) == true )
     {
-        MacCtx.NvmCtx->DutyCycleOn = enable;
+        Nvm.MacGroup2.DutyCycleOn = enable;
     }
 }
 
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.h b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.h
index 6da1300d..78576965 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.h
@@ -36,87 +36,32 @@
  *            layer and the supported features.
  * \{
  *
- * \example   classA/B-L072Z-LRWAN1/main.c
- *            LoRaWAN class A application example for the B-L072Z-LRWAN1.
+ * \example   periodic-uplink-lpp/B-L072Z-LRWAN1/main.c
+ *            LoRaWAN class A/B/C application example for the B-L072Z-LRWAN1.
  *
- * \example   classB/B-L072Z-LRWAN1/main.c
- *            LoRaWAN class B application example for the B-L072Z-LRWAN1.
+ * \example   periodic-uplink-lpp/NAMote72/main.c
+ *            LoRaWAN class A/B/C application example for the NAMote72.
  *
- * \example   classC/B-L072Z-LRWAN1/main.c
- *            LoRaWAN class C application example for the B-L072Z-LRWAN1.
+ * \example   periodic-uplink-lpp/NucleoL073/main.c
+ *            LoRaWAN class A/B/C application example for the NucleoL073.
  *
- * \example   classA/NAMote72/main.c
- *            LoRaWAN class A application example for the NAMote72.
+ * \example   periodic-uplink-lpp/NucleoL152/main.c
+ *            LoRaWAN class A/B/C application example for the NucleoL152.
  *
- * \example   classB/NAMote72/main.c
- *            LoRaWAN class B application example for the NAMote72.
+ * \example   periodic-uplink-lpp/NucleoL476/main.c
+ *            LoRaWAN class A/B/C application example for the NucleoL476.
  *
- * \example   classC/NAMote72/main.c
- *            LoRaWAN class C application example for the NAMote72.
+ * \example   periodic-uplink-lpp/SAMR34/main.c
+ *            LoRaWAN class A/B/C application example for the SAMR34.
  *
- * \example   classA/NucleoL073/main.c
- *            LoRaWAN class A application example for the NucleoL073.
+ * \example   periodic-uplink-lpp/SKiM880B/main.c
+ *            LoRaWAN class A/B/C application example for the SKiM880B.
  *
- * \example   classB/NucleoL073/main.c
- *            LoRaWAN class B application example for the NucleoL073.
- *
- * \example   classC/NucleoL073/main.c
- *            LoRaWAN class C application example for the NucleoL073.
- *
- * \example   classA/NucleoL152/main.c
- *            LoRaWAN class A application example for the NucleoL152.
- *
- * \example   classB/NucleoL152/main.c
- *            LoRaWAN class B application example for the NucleoL152.
- *
- * \example   classC/NucleoL152/main.c
- *            LoRaWAN class C application example for the NucleoL152.
- *
- * \example   classA/NucleoL476/main.c
- *            LoRaWAN class A application example for the NucleoL476.
- *
- * \example   classB/NucleoL476/main.c
- *            LoRaWAN class B application example for the NucleoL476.
- *
- * \example   classC/NucleoL476/main.c
- *            LoRaWAN class C application example for the NucleoL476.
- *
- * \example   classA/SAMR34/main.c
- *            LoRaWAN class A application example for the SAMR34.
- *
- * \example   classB/SAMR34/main.c
- *            LoRaWAN class B application example for the SAMR34.
- *
- * \example   classC/SAMR34/main.c
- *            LoRaWAN class C application example for the SAMR34.
- *
- * \example   classA/SKiM880B/main.c
- *            LoRaWAN class A application example for the SKiM880B.
- *
- * \example   classB/SKiM880B/main.c
- *            LoRaWAN class B application example for the SKiM880B.
- *
- * \example   classC/SKiM880B/main.c
- *            LoRaWAN class C application example for the SKiM880B.
- *
- * \example   classA/SKiM881AXL/main.c
- *            LoRaWAN class A application example for the SKiM881AXL.
- *
- * \example   classB/SKiM881AXL/main.c
- *            LoRaWAN class B application example for the SKiM881AXL.
- *
- * \example   classC/SKiM881AXL/main.c
- *            LoRaWAN class C application example for the SKiM881AXL.
- *
- * \example   classA/SKiM980A/main.c
- *            LoRaWAN class A application example for the SKiM980A.
- *
- * \example   classB/SKiM980A/main.c
- *            LoRaWAN class B application example for the SKiM980A.
- *
- * \example   classC/SKiM980A/main.c
- *            LoRaWAN class C application example for the SKiM980A.
+ * \example   periodic-uplink-lpp/SKiM881AXL/main.c
+ *            LoRaWAN class A/B/C application example for the SKiM881AXL.
  *
+ * \example   periodic-uplink-lpp/SKiM980A/main.c
+ *            LoRaWAN class A/B/C application example for the SKiM980A.
  */
 /**
   ******************************************************************************
@@ -138,11 +83,15 @@ extern "C"
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "utilities.h"
+
 #include "timer.h"
 #include "systime.h"
-#include "radio.h"
 #include "LoRaMacTypes.h"
+
+#include "RegionNvm.h"
+#include "LoRaMacCryptoNvm.h"
+#include "secure-element-nvm.h"
+#include "LoRaMacClassBNvm.h"
 #include "lorawan_conf.h"
 
 /*!
@@ -168,7 +117,53 @@ extern "C"
 /*!
  * Start value for multicast keys enumeration
  */
-#define LORAMAC_CRYPTO_MULTICAST_KEYS   127
+#define LORAMAC_CRYPTO_MULTICAST_KEYS               127
+
+/*!
+ * Maximum MAC commands buffer size
+ */
+#define LORA_MAC_COMMAND_MAX_LENGTH                 128
+
+
+/*!
+ * Bitmap value
+ */
+#define LORAMAC_NVM_NOTIFY_FLAG_NONE                0x00
+
+/*!
+ * Bitmap value for the NVM group crypto.
+ */
+#define LORAMAC_NVM_NOTIFY_FLAG_CRYPTO              0x01
+
+/*!
+ * Bitmap value for the NVM group MAC 1.
+ */
+#define LORAMAC_NVM_NOTIFY_FLAG_MAC_GROUP1          0x02
+
+/*!
+ * Bitmap value for the NVM group MAC 2.
+ */
+#define LORAMAC_NVM_NOTIFY_FLAG_MAC_GROUP2          0x04
+
+/*!
+ * Bitmap value for the NVM group secure element.
+ */
+#define LORAMAC_NVM_NOTIFY_FLAG_SECURE_ELEMENT      0x08
+
+/*!
+ * Bitmap value for the NVM group 1 region.
+ */
+#define LORAMAC_NVM_NOTIFY_FLAG_REGION_GROUP1       0x10
+
+/*!
+ * Bitmap value for the NVM group 2 region.
+ */
+#define LORAMAC_NVM_NOTIFY_FLAG_REGION_GROUP2       0x20
+
+/*!
+ * Bitmap value for the NVM group class b.
+ */
+#define LORAMAC_NVM_NOTIFY_FLAG_CLASS_B             0x40
 
 /*!
  * End-Device activation type
@@ -189,62 +184,6 @@ typedef enum eActivationType
     ACTIVATION_TYPE_OTAA = 2,
 }ActivationType_t;
 
-/*!
- * LoRaMAC channels parameters definition
- */
-typedef union uDrRange
-{
-    /*!
-     * Byte-access to the bits
-     */
-    int8_t Value;
-    /*!
-     * Structure to store the minimum and the maximum datarate
-     */
-    struct sFields
-    {
-        /*!
-         * Minimum data rate
-         *
-         * LoRaWAN Regional Parameters V1.0.2rB
-         *
-         * The allowed ranges are region specific. Please refer to \ref DR_0 to \ref DR_15 for details.
-         */
-        int8_t Min : 4;
-        /*!
-         * Maximum data rate
-         *
-         * LoRaWAN Regional Parameters V1.0.2rB
-         *
-         * The allowed ranges are region specific. Please refer to \ref DR_0 to \ref DR_15 for details.
-         */
-        int8_t Max : 4;
-    }Fields;
-}DrRange_t;
-
-/*!
- * LoRaMAC channel definition
- */
-typedef struct sChannelParams
-{
-    /*!
-     * Frequency in Hz
-     */
-    uint32_t Frequency;
-    /*!
-     * Alternative frequency for RX window 1
-     */
-    uint32_t Rx1Frequency;
-    /*!
-     * Data rate definition
-     */
-    DrRange_t DrRange;
-    /*!
-     * Band index
-     */
-    uint8_t Band;
-}ChannelParams_t;
-
 /*!
  * LoRaMAC receive window channel parameters
  */
@@ -299,82 +238,11 @@ typedef enum eLoRaMacRxSlot
     RX_SLOT_NONE,
 }LoRaMacRxSlot_t;
 
-/*!
- * LoRaMAC structure to hold internal context pointers and its lengths
- */
-typedef struct sLoRaMacCtxs
-{
-    /*!
-     * \brief   Pointer to Mac context
-     */
-    void* MacNvmCtx;
-    /*!
-     * \brief   Size of Mac context
-     */
-    size_t MacNvmCtxSize;
-    /*!
-     * \brief   Pointer to region context
-     */
-    void* RegionNvmCtx;
-    /*!
-     * \brief   Size of region context
-     */
-    size_t RegionNvmCtxSize;
-    /*!
-     * \brief   Pointer to crypto module context
-     */
-    void* CryptoNvmCtx;
-    /*!
-     * \brief   Size of crypto module context
-     */
-    size_t CryptoNvmCtxSize;
-    /*!
-     * \brief   Pointer to secure element driver context
-     */
-    void* SecureElementNvmCtx;
-    /*!
-     * \brief   Size of secure element driver context
-     */
-    size_t SecureElementNvmCtxSize;
-    /*!
-     * \brief   Pointer to MAC commands module context
-     */
-    void* CommandsNvmCtx;
-    /*!
-     * \brief   Size of MAC commands module context
-     */
-    size_t CommandsNvmCtxSize;
-    /*!
-     * \brief   Pointer to Class B module context
-     */
-    void* ClassBNvmCtx;
-    /*!
-     * \brief   Size of MAC Class B module context
-     */
-    size_t ClassBNvmCtxSize;
-    /*!
-     * \brief   Pointer to MLME Confirm queue module context
-     */
-    void* ConfirmQueueNvmCtx;
-    /*!
-     * \brief   Size of MLME Confirm queue module context
-     */
-    size_t ConfirmQueueNvmCtxSize;
-}LoRaMacCtxs_t;
-
 /*!
  * Global MAC layer parameters
  */
 typedef struct sLoRaMacParams
 {
-    /*!
-     * Channels TX power
-     */
-    int8_t ChannelsTxPower;
-    /*!
-     * Channels data rate
-     */
-    int8_t ChannelsDatarate;
     /*!
      * System overall timing error in milliseconds.
      * [-SystemMaxRxError : +SystemMaxRxError]
@@ -438,12 +306,33 @@ typedef struct sLoRaMacParams
      * Antenna gain of the node
      */
     float AntennaGain;
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     /*!
      * Indicates if the node supports repeaters
      */
     bool RepeaterSupport;
+    /* ST_WORKAROUND_END */
 }LoRaMacParams_t;
 
+/*!
+ * Global RX layer status
+ */
+typedef struct sLoRaMacRxStatus
+{
+    /*
+     * Rssi of the received packet
+     */
+    int16_t Rssi;
+    /*
+     * Snr of the received packet
+     */
+    int8_t Snr;
+    /*
+    * Holds the current rx window slot
+    */
+    LoRaMacRxSlot_t RxSlot;
+}LoRaMacRxStatus_t;
+
 /*!
  * LoRaMAC data structure for a PingSlotInfoReq \ref MLME_PING_SLOT_INFO
  *
@@ -636,6 +525,211 @@ typedef union eLoRaMacFlags_t
     }Bits;
 }LoRaMacFlags_t;
 
+/*!
+ * LoRaMAC region enumeration
+ */
+typedef enum eLoRaMacRegion
+{
+    /*!
+     * AS band on 923MHz
+     */
+    LORAMAC_REGION_AS923,
+    /*!
+     * Australian band on 915MHz
+     */
+    LORAMAC_REGION_AU915,
+    /*!
+     * Chinese band on 470MHz
+     */
+    LORAMAC_REGION_CN470,
+    /*!
+     * Chinese band on 779MHz
+     */
+    LORAMAC_REGION_CN779,
+    /*!
+     * European band on 433MHz
+     */
+    LORAMAC_REGION_EU433,
+    /*!
+     * European band on 868MHz
+     */
+    LORAMAC_REGION_EU868,
+    /*!
+     * South korean band on 920MHz
+     */
+    LORAMAC_REGION_KR920,
+    /*!
+     * India band on 865MHz
+     */
+    LORAMAC_REGION_IN865,
+    /*!
+     * North american band on 915MHz
+     */
+    LORAMAC_REGION_US915,
+    /*!
+     * Russia band on 864MHz
+     */
+    LORAMAC_REGION_RU864,
+}LoRaMacRegion_t;
+
+typedef struct sLoRaMacNvmDataGroup1
+{
+    /*!
+     * Counts the number of missed ADR acknowledgements
+     */
+    uint32_t AdrAckCounter;
+    /*!
+     * Last transmission time.
+     */
+    TimerTime_t LastTxDoneTime;
+    /*!
+     * Aggregated time off.
+     */
+    TimerTime_t AggregatedTimeOff;
+    /*!
+     * Last received Message integrity Code (MIC)
+     */
+    uint32_t LastRxMic;
+    /*!
+     * Channels TX power
+     */
+    int8_t ChannelsTxPower;
+    /*!
+     * Channels data rate
+     */
+    int8_t ChannelsDatarate;
+    /*!
+     * If the server has sent a FRAME_TYPE_DATA_CONFIRMED_DOWN this variable indicates
+     * if the ACK bit must be set for the next transmission
+     */
+    bool SrvAckRequested;
+    /*!
+     * CRC32 value of the MacGroup1 data structure.
+     */
+    uint32_t Crc32;
+}LoRaMacNvmDataGroup1_t;
+
+typedef struct sLoRaMacNvmDataGroup2
+{
+    /*!
+     * LoRaMac region.
+     */
+    LoRaMacRegion_t Region;
+    /*!
+     * LoRaMac parameters
+     */
+    LoRaMacParams_t MacParams;
+    /*!
+     * LoRaMac default parameters
+     */
+    LoRaMacParams_t MacParamsDefaults;
+    /*!
+     * Channels TX power
+     */
+    int8_t ChannelsTxPowerDefault;
+    /*!
+     * Channels data rate
+     */
+    int8_t ChannelsDatarateDefault;
+    /*!
+     * Network ID ( 3 bytes )
+     */
+    uint32_t NetID;
+    /*!
+     * Mote Address
+     */
+    uint32_t DevAddr;
+    /*!
+    * Multicast channel list
+    */
+    MulticastCtx_t MulticastChannelList[LORAMAC_MAX_MC_CTX];
+    /*!
+     * Actual device class
+     */
+    DeviceClass_t DeviceClass;
+    /*!
+     * Indicates if the node is connected to
+     * a private or public network
+     */
+    bool PublicNetwork;
+    /*
+     * LoRaMac ADR control status
+     */
+    bool AdrCtrlOn;
+    /*!
+     * Maximum duty cycle
+     * \remark Possibility to shutdown the device.
+     */
+    uint8_t MaxDCycle;
+    /*!
+     * Enables/Disables duty cycle management (Test only)
+     */
+    bool DutyCycleOn;
+    /*!
+     * Aggregated duty cycle management
+     */
+    uint16_t AggregatedDCycle;
+    /*!
+     * Stores the time at LoRaMac initialization.
+     *
+     * \remark Used for the BACKOFF_DC computation.
+     */
+    SysTime_t InitializationTime;
+    /*!
+     * Current LoRaWAN Version
+     */
+    Version_t Version;
+    /*!
+     * End-Device network activation
+     */
+    ActivationType_t NetworkActivation;
+    /*!
+     * CRC32 value of the MacGroup2 data structure.
+     */
+    uint32_t Crc32;
+}LoRaMacNvmDataGroup2_t;
+
+/*!
+ * LoRaMAC data structure for non-volatile memory (NVM).
+ * This structure contains data which must be stored in NVM.
+ */
+typedef struct sLoRaMacNvmData
+{
+    /*!
+     * Parameters related to the crypto layer. Change with every TX/RX
+     * procedure.
+     */
+    LoRaMacCryptoNvmData_t Crypto;
+    /*!
+     * Parameters related to the MAC which change with high probability after
+     * every TX/RX procedure.
+     */
+    LoRaMacNvmDataGroup1_t MacGroup1;
+    /*!
+     * Parameters related to the MAC which do not change very likely with every
+     * TX/RX procedure.
+     */
+    LoRaMacNvmDataGroup2_t MacGroup2;
+    /*!
+     * Parameters related to the secure-element.
+     */
+    SecureElementNvmData_t SecureElement;
+    /*!
+     * Parameters related to the regional implementation which change with high
+     * probability after every TX/RX procedure.
+     */
+    RegionNvmDataGroup1_t RegionGroup1;
+    /*!
+     * Parameters related to the regional implementation which do not change
+     * very likely with every TX/RX procedure.
+     */
+    RegionNvmDataGroup2_t RegionGroup2;
+    /*!
+     * Parameters related to class b.
+     */
+    LoRaMacClassBNvmData_t ClassB;
+}LoRaMacNvmData_t;
+
 /*!
  *
  * \brief   LoRaMAC data services
@@ -903,18 +997,6 @@ typedef struct sMcpsIndication
      * Indicates, if data is available
      */
     bool RxData;
-    /*!
-     * Rssi of the received packet
-     */
-    int16_t Rssi;
-    /*!
-     * Snr of the received packet
-     */
-    int8_t Snr;
-    /*!
-     * Receive window
-     */
-    LoRaMacRxSlot_t RxSlot;
     /*!
      * Set if an acknowledgement was received
      */
@@ -1081,7 +1163,7 @@ typedef struct sMlmeReqTxCw
     /*!
      * RF output power to set (Only used with new way)
      */
-    uint8_t Power;
+    int8_t Power;
 }MlmeReqTxCw_t;
 
 /*!
@@ -1366,6 +1448,7 @@ typedef enum eMib
      * LoRaWAN Specification V1.1.0, chapter 6.1.1.3
      */
     MIB_NWK_KEY,
+    /* ST_WORKAROUND_BEGIN: integrate 1.1.x keys only if required */
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
     /*!
      * Join session integrity key
@@ -1403,6 +1486,7 @@ typedef enum eMib
      */
     MIB_NWK_S_KEY,
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
+    /* ST_WORKAROUND_END */
     /*!
      * Application session key
      *
@@ -1415,6 +1499,8 @@ typedef enum eMib
      * LoRaWAN - Secure element specification v1
      */
     MIB_MC_KE_KEY,
+    /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+#if ( LORAMAC_MAX_MC_CTX > 0 )
     /*!
      * Multicast root key index 0
      *
@@ -1433,6 +1519,7 @@ typedef enum eMib
      * LoRaWAN - Secure element specification v1
      */
     MIB_MC_NWK_S_KEY_0,
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
 #if ( LORAMAC_MAX_MC_CTX > 1 )
     /*!
      * Multicast root key index 1
@@ -1452,6 +1539,8 @@ typedef enum eMib
      * LoRaWAN - Secure element specification v1
      */
     MIB_MC_NWK_S_KEY_1,
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
     /*!
      * Multicast root key index 2
      *
@@ -1470,6 +1559,8 @@ typedef enum eMib
      * LoRaWAN - Secure element specification v1
      */
     MIB_MC_NWK_S_KEY_2,
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
     /*!
      * Multicast root key index 3
      *
@@ -1488,7 +1579,8 @@ typedef enum eMib
      * LoRaWAN - Secure element specification v1
      */
     MIB_MC_NWK_S_KEY_3,
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
+    /* ST_WORKAROUND_END */
     /*!
      * Set the network type to public or private
      *
@@ -1497,6 +1589,7 @@ typedef enum eMib
      * [true: public network, false: private network]
      */
     MIB_PUBLIC_NETWORK,
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     /*!
      * Support the operation with repeaters
      *
@@ -1505,6 +1598,7 @@ typedef enum eMib
      * [true: repeater support enabled, false: repeater support disabled]
      */
     MIB_REPEATER_SUPPORT,
+    /* ST_WORKAROUND_END */
     /*!
      * Communication channels. A get request will return a
      * pointer which references the first entry of the channel list. The
@@ -1720,6 +1814,10 @@ typedef enum eMib
      * The allowed ranges are region specific. Please refer to \ref DR_0 to \ref DR_15 for details.
      */
      MIB_PING_SLOT_DATARATE,
+    /*!
+     * Beacon state
+     */
+     MIB_BEACON_STATE,
 }Mib_t;
 
 /*!
@@ -1781,6 +1879,7 @@ typedef union uMibParam
      * Related MIB type: \ref MIB_NWK_KEY
      */
     uint8_t* NwkKey;
+    /* ST_WORKAROUND_BEGIN: integrate 1.1.x keys only if required */
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
     /*!
      * Join session integrity key
@@ -1820,6 +1919,7 @@ typedef union uMibParam
      */
     uint8_t* NwkSKey;
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
+    /* ST_WORKAROUND_END */
     /*!
      * Application session key
      *
@@ -1910,12 +2010,14 @@ typedef union uMibParam
      * Related MIB type: \ref MIB_PUBLIC_NETWORK
      */
     bool EnablePublicNetwork;
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     /*!
      * Enable or disable repeater support
      *
      * Related MIB type: \ref MIB_REPEATER_SUPPORT
      */
     bool EnableRepeaterSupport;
+    /* ST_WORKAROUND_END */
     /*!
      * LoRaWAN Channel
      *
@@ -2049,11 +2151,12 @@ typedef union uMibParam
      */
     float DefaultAntennaGain;
     /*!
-     * Structure holding pointers to internal non-volatile contexts and its lengths.
+     * Returns a pointer to the structure holding all data which shall be stored
+     * in the NVM.
      *
      * Related MIB type: \ref MIB_NVM_CTXS
      */
-    LoRaMacCtxs_t* Contexts;
+    LoRaMacNvmData_t* Contexts;
     /*
      * LoRaWAN MAC layer operating version when activated by ABP.
      *
@@ -2150,6 +2253,12 @@ typedef union uMibParam
      * Related MIB type: \ref MIB_PING_SLOT_DATARATE
      */
     int8_t PingSlotDatarate;
+    /*!
+    * State of the beaconing mechanism
+    *
+    * Related MIB type: \ref MIB_BEACON_STATE
+    */
+    BeaconState_t BeaconState;
 }MibParam_t;
 
 /*!
@@ -2300,89 +2409,6 @@ typedef enum eLoRaMacStatus
     LORAMAC_STATUS_ERROR
 }LoRaMacStatus_t;
 
-/*!
- * LoRaMAC region enumeration
- */
-typedef enum eLoRaMacRegion_t
-{
-    /*!
-     * AS band on 923MHz
-     */
-    LORAMAC_REGION_AS923 = 0,
-    /*!
-     * Australian band on 915MHz
-     */
-    LORAMAC_REGION_AU915,
-    /*!
-     * Chinese band on 470MHz
-     */
-    LORAMAC_REGION_CN470,
-    /*!
-     * Chinese band on 779MHz
-     */
-    LORAMAC_REGION_CN779,
-    /*!
-     * European band on 433MHz
-     */
-    LORAMAC_REGION_EU433,
-    /*!
-     * European band on 868MHz
-     */
-    LORAMAC_REGION_EU868,
-    /*!
-     * South korean band on 920MHz
-     */
-    LORAMAC_REGION_KR920,
-    /*!
-     * India band on 865MHz
-     */
-    LORAMAC_REGION_IN865,
-    /*!
-     * North american band on 915MHz
-     */
-    LORAMAC_REGION_US915,
-    /*!
-     * Russia band on 864MHz
-     */
-    LORAMAC_REGION_RU864,
-}LoRaMacRegion_t;
-
-/*!
- * Enumeration of modules which have a context
- */
-typedef enum LoRaMacNvmCtxModule_e
-{
-    /*!
-     * Context for the MAC
-     */
-    LORAMAC_NVMCTXMODULE_MAC,
-    /*!
-     * Context for the regions
-     */
-    LORAMAC_NVMCTXMODULE_REGION,
-    /*!
-     * Context for the crypto module
-     */
-    LORAMAC_NVMCTXMODULE_CRYPTO,
-    /*!
-     * Context for the secure element
-     */
-    LORAMAC_NVMCTXMODULE_SECURE_ELEMENT,
-    /*!
-     * Context for the command queue
-     */
-    LORAMAC_NVMCTXMODULE_COMMANDS,
-    /*!
-     * Context for class b
-     */
-    LORAMAC_NVMCTXMODULE_CLASS_B,
-    /*!
-     * Context for the confirm queue
-     */
-    LORAMAC_NVMCTXMODULE_CONFIRM_QUEUE,
-}LoRaMacNvmCtxModule_t;
-
-
 /*!
  * LoRaMAC events structure
  * Used to notify upper layers of MAC events
@@ -2400,19 +2426,19 @@ typedef struct sLoRaMacPrimitives
      *
      * \param   [OUT] MCPS-Indication parameters
      */
-    void ( *MacMcpsIndication )( McpsIndication_t* McpsIndication );
+    void ( *MacMcpsIndication )( McpsIndication_t* McpsIndication, LoRaMacRxStatus_t* RxStatus );
     /*!
      * \brief   MLME-Confirm primitive
      *
      * \param   [OUT] MLME-Confirm parameters
      */
-    void ( *MacMlmeConfirm )( MlmeConfirm_t* MlmeConfirm );
+    void ( *MacMlmeConfirm )( MlmeConfirm_t* MlmeConfirms );
     /*!
      * \brief   MLME-Indication primitive
      *
      * \param   [OUT] MLME-Indication parameters
      */
-    void ( *MacMlmeIndication )( MlmeIndication_t* MlmeIndication );
+    void ( *MacMlmeIndication )( MlmeIndication_t* MlmeIndication, LoRaMacRxStatus_t* RxStatus );
 }LoRaMacPrimitives_t;
 
 /*!
@@ -2429,18 +2455,29 @@ typedef struct sLoRaMacCallback
      *          to measure the battery level]
      */
     uint8_t ( *GetBatteryLevel )( void );
+    /* ST_WORKAROUND_BEGIN: Return temperature into Q7.8 instead float */
     /*!
      * \brief   Measures the temperature level
      *
      * \retval  Temperature level
      */
     uint16_t ( *GetTemperatureLevel )( void );
+    /* ST_WORKAROUND_END */
+    /* ST_WORKAROUND_BEGIN: Add unique ID callback */
+    /*!
+     * \brief   Get the board 64 bits unique ID
+     *
+     * \param   [OUT] id unique
+     */
+    void ( *GetUniqueId )(uint8_t *id);
+    /* ST_WORKAROUND_END */
     /*!
      * \brief   Will be called when an attribute has changed in one of the context.
      *
-     * \param   Context that changed
+     * \param   notifyFlags Bitmap that contains the modules which changed.
+     *                      Refer to \ref LoRaMacNvmData_t.
      */
-    void ( *NvmContextChange )( LoRaMacNvmCtxModule_t module );
+    void ( *NvmDataChange )( uint16_t notifyFlags );
     /*!
      *\brief    Will be called each time a Radio IRQ is handled by the MAC
      *          layer.
@@ -2719,6 +2756,7 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t* mibSet );
  */
 LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest );
 
+/* ST_WORKAROUND_BEGIN: Update Mcps request with new input parameter to allow delayed tx */
 /*!
  * \brief   LoRaMAC MCPS-Request
  *
@@ -2752,6 +2790,7 @@ LoRaMacStatus_t LoRaMacMlmeRequest( MlmeReq_t* mlmeRequest );
  *          \ref LORAMAC_STATUS_LENGTH_ERROR,
  */
 LoRaMacStatus_t LoRaMacMcpsRequest( McpsReq_t* mcpsRequest, bool allowDelayedTx );
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief   LoRaMAC deinitialization
@@ -2765,7 +2804,6 @@ LoRaMacStatus_t LoRaMacMcpsRequest( McpsReq_t* mcpsRequest, bool allowDelayedTx
  */
 LoRaMacStatus_t LoRaMacDeInitialization( void );
 
-
 /*! \} defgroup LORAMAC */
 
 #ifdef __cplusplus
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c
index 58432324..d9d16896 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c
@@ -28,19 +28,79 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
  */
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    LoRaMacClassB.c
+  * @author  MCD Application Team
+  * @brief   LoRa MAC Class B layer implementation
+  ******************************************************************************
+  */
 #include <math.h>
 #include "utilities.h"
 #include "secure-element.h"
 #include "LoRaMac.h"
-#include "Region.h"
 #include "LoRaMacClassB.h"
+#include "LoRaMacClassBNvm.h"
 #include "LoRaMacClassBConfig.h"
 #include "LoRaMacCrypto.h"
 #include "LoRaMacConfirmQueue.h"
+#include "radio.h"
+#include "Region.h"
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
 
+
+/*
+ * LoRaMac Class B Context structure
+ */
+typedef struct sLoRaMacClassBCtx
+{
+    /*!
+    * Class B ping slot context
+    */
+    PingSlotContext_t PingSlotCtx;
+    /*!
+    * Class B beacon context
+    */
+    BeaconContext_t BeaconCtx;
+    /*!
+    * State of the beaconing mechanism
+    */
+    BeaconState_t BeaconState;
+    /*!
+    * State of the ping slot mechanism
+    */
+    PingSlotState_t PingSlotState;
+    /*!
+    * State of the multicast slot mechanism
+    */
+    PingSlotState_t MulticastSlotState;
+    /*!
+    * Timer for CLASS B beacon acquisition and tracking.
+    */
+    TimerEvent_t BeaconTimer;
+    /*!
+    * Timer for CLASS B ping slot timer.
+    */
+    TimerEvent_t PingSlotTimer;
+    /*!
+    * Timer for CLASS B multicast ping slot timer.
+    */
+    TimerEvent_t MulticastSlotTimer;
+    /*!
+    * Container for the callbacks related to class b.
+    */
+    LoRaMacClassBCallback_t LoRaMacClassBCallbacks;
+    /*!
+    * Data structure which holds the parameters which needs to be set
+    * in class b operation.
+    */
+    LoRaMacClassBParams_t LoRaMacClassBParams;
+} LoRaMacClassBCtx_t;
+
 /*!
  * Defines the LoRaMac radio events status
  */
@@ -57,17 +117,18 @@ typedef union uLoRaMacClassBEvents
 
 LoRaMacClassBEvents_t LoRaMacClassBEvents = { .Value = 0 };
 
-/*
- * Non-volatile module context.
- */
-static LoRaMacClassBNvmCtx_t NvmCtx;
-
 /*
  * Module context.
  */
 static LoRaMacClassBCtx_t Ctx;
 
+/*!
+ * Data structure which holds the parameters which needs to be stored
+ * in the NVM.
+ */
+static LoRaMacClassBNvmData_t* ClassBNvm;
 
+/* ST_WORKAROUND_BEGIN: Move timer function (ClassB specific) */
 /*!
  * \brief Computes the temperature compensation for a period of time on a
  *        specific temperature.
@@ -111,6 +172,7 @@ static TimerTime_t TimerTempCompensation( TimerTime_t period, float temperature
   // Calculate the resulting period
   return ( UTIL_TIMER_Time_t ) interim;
 }
+/* ST_WORKAROUND_END */
 
 /*!
  * Computes the Ping Offset
@@ -199,6 +261,7 @@ static uint32_t CalcDownlinkChannelAndFrequency( uint32_t devAddr, TimerTime_t b
     PhyParam_t phyParam;
     uint32_t channel = 0;
     uint8_t nbChannels = 0;
+    uint8_t offset = 0;
 
     // Default initialization - ping slot channels
     getPhy.Attribute = PHY_PING_SLOT_NB_CHANNELS;
@@ -215,9 +278,14 @@ static uint32_t CalcDownlinkChannelAndFrequency( uint32_t devAddr, TimerTime_t b
     // defined by the calculation below.
     if( nbChannels > 1 )
     {
+        getPhy.Attribute = PHY_BEACON_CHANNEL_OFFSET;
+        phyParam = RegionGetPhyParam( *Ctx.LoRaMacClassBParams.LoRaMacRegion, &getPhy );
+        offset = ( uint8_t ) phyParam.Value;
+
         // Calculate the channel for the next downlink
         channel = devAddr + ( beaconTime / ( beaconInterval / 1000 ) );
         channel = channel % nbChannels;
+        channel += offset;
     }
 
     // Calculate the frequency for the next downlink. This holds
@@ -225,21 +293,55 @@ static uint32_t CalcDownlinkChannelAndFrequency( uint32_t devAddr, TimerTime_t b
     return CalcDownlinkFrequency( channel, isBeacon );
 }
 
+/*!
+ * \brief Calculates the correct frequency and opens up the beacon reception window. Please
+ *        note that the variable WindowTimeout and WindowOffset will be updated according
+ *        to the current settings. Also, the function perform a calculation only, when
+ *        Ctx.BeaconCtx.Ctrl.BeaconAcquired OR Ctx.BeaconCtx.Ctrl.AcquisitionPending is
+ *        set to 1.
+ *
+ * \param [IN] rxConfig Reception parameters for the beacon window.
+ *
+ * \param [IN] currentSymbolTimeout Current symbol timeout.
+ */
+static void CalculateBeaconRxWindowConfig( RxConfigParams_t* rxConfig, uint16_t currentSymbolTimeout )
+{
+    GetPhyParams_t getPhy;
+    PhyParam_t phyParam;
+
+    rxConfig->WindowTimeout = currentSymbolTimeout;
+    rxConfig->WindowOffset = 0;
+
+    //if( ( Ctx.BeaconCtx.Ctrl.BeaconAcquired == 1 ) || ( Ctx.BeaconCtx.Ctrl.AcquisitionPending == 1 ) )
+    {
+        // Apply the symbol timeout only if we have acquired the beacon
+        // Otherwise, take the window enlargement into account
+        // Read beacon datarate
+        getPhy.Attribute = PHY_BEACON_CHANNEL_DR;
+        phyParam = RegionGetPhyParam( *Ctx.LoRaMacClassBParams.LoRaMacRegion, &getPhy );
+
+        // Calculate downlink symbols
+        RegionComputeRxWindowParameters( *Ctx.LoRaMacClassBParams.LoRaMacRegion,
+                                        ( int8_t )phyParam.Value, // datarate
+                                        Ctx.LoRaMacClassBParams.LoRaMacParams->MinRxSymbols,
+                                        Ctx.LoRaMacClassBParams.LoRaMacParams->SystemMaxRxError,
+                                        rxConfig );
+    }
+}
+
 /*!
  * \brief Calculates the correct frequency and opens up the beacon reception window.
  *
  * \param [IN] rxTime The reception time which should be setup
  *
  * \param [IN] activateDefaultChannel Set to true, if the function shall setup the default channel
+ *
+ * \param [IN] symbolTimeout Symbol timeout
  */
-static void RxBeaconSetup( TimerTime_t rxTime, bool activateDefaultChannel )
+static void RxBeaconSetup( TimerTime_t rxTime, bool activateDefaultChannel, uint16_t symbolTimeout )
 {
     RxBeaconSetup_t rxBeaconSetup;
     uint32_t frequency = 0;
-    RxConfigParams_t beaconRxConfig;
-    GetPhyParams_t getPhy;
-    PhyParam_t phyParam;
-    uint16_t windowTimeout = Ctx.BeaconCtx.SymbolTimeout;
 
     if( activateDefaultChannel == true )
     {
@@ -254,10 +356,10 @@ static void RxBeaconSetup( TimerTime_t rxTime, bool activateDefaultChannel )
                                                      CLASSB_BEACON_INTERVAL, true );
     }
 
-    if( Ctx.NvmCtx->BeaconCtx.Ctrl.CustomFreq == 1 )
+    if( ClassBNvm->BeaconCtx.Ctrl.CustomFreq == 1 )
     {
         // Set the frequency from the BeaconFreqReq
-        frequency = Ctx.NvmCtx->BeaconCtx.Frequency;
+        frequency = ClassBNvm->BeaconCtx.Frequency;
     }
 
     if( Ctx.BeaconCtx.Ctrl.BeaconChannelSet == 1 )
@@ -267,24 +369,7 @@ static void RxBeaconSetup( TimerTime_t rxTime, bool activateDefaultChannel )
         frequency = CalcDownlinkFrequency( Ctx.BeaconCtx.BeaconTimingChannel, true );
     }
 
-    if( ( Ctx.BeaconCtx.Ctrl.BeaconAcquired == 1 ) || ( Ctx.BeaconCtx.Ctrl.AcquisitionPending == 1 ) )
-    {
-        // Apply the symbol timeout only if we have acquired the beacon
-        // Otherwise, take the window enlargement into account
-        // Read beacon datarate
-        getPhy.Attribute = PHY_BEACON_CHANNEL_DR;
-        phyParam = RegionGetPhyParam( *Ctx.LoRaMacClassBParams.LoRaMacRegion, &getPhy );
-
-        // Calculate downlink symbols
-        RegionComputeRxWindowParameters( *Ctx.LoRaMacClassBParams.LoRaMacRegion,
-                                        ( int8_t )phyParam.Value, // datarate
-                                        Ctx.LoRaMacClassBParams.LoRaMacParams->MinRxSymbols,
-                                        Ctx.LoRaMacClassBParams.LoRaMacParams->SystemMaxRxError,
-                                        &beaconRxConfig );
-        windowTimeout = beaconRxConfig.WindowTimeout;
-    }
-
-    rxBeaconSetup.SymbolTimeout = windowTimeout;
+    rxBeaconSetup.SymbolTimeout = symbolTimeout;
     rxBeaconSetup.RxTime = rxTime;
     rxBeaconSetup.Frequency = frequency;
 
@@ -390,7 +475,7 @@ static void InitClassB( void )
     LoRaMacClassBEvents.Value = 0;
 
     // Init variables to default
-    memset1( ( uint8_t* ) &NvmCtx, 0, sizeof( LoRaMacClassBNvmCtx_t ) );
+    memset1( ( uint8_t* ) ClassBNvm, 0, sizeof( LoRaMacClassBNvmData_t ) );
     memset1( ( uint8_t* ) &Ctx.PingSlotCtx, 0, sizeof( PingSlotContext_t ) );
     memset1( ( uint8_t* ) &Ctx.BeaconCtx, 0, sizeof( BeaconContext_t ) );
 
@@ -401,32 +486,31 @@ static void InitClassB( void )
     // Setup default ping slot datarate
     getPhy.Attribute = PHY_PING_SLOT_CHANNEL_DR;
     phyParam = RegionGetPhyParam( *Ctx.LoRaMacClassBParams.LoRaMacRegion, &getPhy );
-    Ctx.NvmCtx->PingSlotCtx.Datarate = (int8_t)( phyParam.Value );
+    ClassBNvm->PingSlotCtx.Datarate = ( int8_t )( phyParam.Value );
 
     // Setup default states
     Ctx.BeaconState = BEACON_STATE_ACQUISITION;
     Ctx.PingSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
     Ctx.MulticastSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
-    Ctx.NvmCtx->BeaconCtx.BeaconState = BEACON_STATE_ACQUISITION;
 }
 
 static void InitClassBDefaults( void )
 {
     // This function shall reset the Class B settings to default,
     // but should keep important configurations
-    LoRaMacClassBBeaconNvmCtx_t beaconCtx = Ctx.NvmCtx->BeaconCtx;
-    LoRaMacClassBPingSlotNvmCtx_t pingSlotCtx = Ctx.NvmCtx->PingSlotCtx;
+    LoRaMacClassBBeaconNvmData_t beaconCtx = ClassBNvm->BeaconCtx;
+    LoRaMacClassBPingSlotNvmData_t pingSlotCtx = ClassBNvm->PingSlotCtx;
 
     InitClassB( );
 
     // Parameters from BeaconFreqReq
-    Ctx.NvmCtx->BeaconCtx.Frequency = beaconCtx.Frequency;
-    Ctx.NvmCtx->BeaconCtx.Ctrl.CustomFreq = beaconCtx.Ctrl.CustomFreq;
+    ClassBNvm->BeaconCtx.Frequency = beaconCtx.Frequency;
+    ClassBNvm->BeaconCtx.Ctrl.CustomFreq = beaconCtx.Ctrl.CustomFreq;
 
     // Parameters from PingSlotChannelReq
-    Ctx.NvmCtx->PingSlotCtx.Ctrl.CustomFreq = pingSlotCtx.Ctrl.CustomFreq;
-    Ctx.NvmCtx->PingSlotCtx.Frequency = pingSlotCtx.Frequency;
-    Ctx.NvmCtx->PingSlotCtx.Datarate = pingSlotCtx.Datarate;
+    ClassBNvm->PingSlotCtx.Ctrl.CustomFreq = pingSlotCtx.Ctrl.CustomFreq;
+    ClassBNvm->PingSlotCtx.Frequency = pingSlotCtx.Frequency;
+    ClassBNvm->PingSlotCtx.Datarate = pingSlotCtx.Datarate;
 }
 
 static void EnlargeWindowTimeout( void )
@@ -529,71 +613,32 @@ static uint16_t CalcPingPeriod( uint8_t pingNb )
 {
     return CLASSB_BEACON_WINDOW_SLOTS / pingNb;
 }
+#endif /* LORAMAC_CLASSB_ENABLED */
 
-/*
- * Dummy callback in case if the user provides NULL function pointer
- */
-static void NvmContextChange( void )
+void LoRaMacClassBInit( LoRaMacClassBParams_t *classBParams, LoRaMacClassBCallback_t *callbacks,
+                        LoRaMacClassBNvmData_t* nvm )
 {
-    if( Ctx.LoRaMacClassBNvmEvent != NULL )
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+    // Assign non-volatile context
+    if( nvm == NULL )
     {
-        Ctx.LoRaMacClassBNvmEvent( );
+        return;
     }
-}
-
-#endif // LORAMAC_CLASSB_ENABLED
+    ClassBNvm = nvm;
 
-void LoRaMacClassBInit( LoRaMacClassBParams_t *classBParams, LoRaMacClassBCallback_t *callbacks, LoRaMacClassBNvmEvent classBNvmCtxChanged )
-{
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
     // Store callbacks
     Ctx.LoRaMacClassBCallbacks = *callbacks;
 
     // Store parameter pointers
     Ctx.LoRaMacClassBParams = *classBParams;
 
-    // Assign non-volatile context
-    Ctx.NvmCtx = &NvmCtx;
-
-    // Assign callback
-    Ctx.LoRaMacClassBNvmEvent = classBNvmCtxChanged;
-
     // Initialize timers
     TimerInit( &Ctx.BeaconTimer, LoRaMacClassBBeaconTimerEvent );
     TimerInit( &Ctx.PingSlotTimer, LoRaMacClassBPingSlotTimerEvent );
     TimerInit( &Ctx.MulticastSlotTimer, LoRaMacClassBMulticastSlotTimerEvent );
 
     InitClassB( );
-#endif // LORAMAC_CLASSB_ENABLED
-}
-
-bool LoRaMacClassBRestoreNvmCtx( void* classBNvmCtx )
-{
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-    // Restore module context
-    if( classBNvmCtx != NULL )
-    {
-        memcpy1( ( uint8_t* ) &NvmCtx, ( uint8_t* ) classBNvmCtx, sizeof( NvmCtx ) );
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-#else
-    return true;
-#endif // LORAMAC_CLASSB_ENABLED
-}
-
-void* LoRaMacClassBGetNvmCtx( size_t* classBNvmCtxSize )
-{
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-    *classBNvmCtxSize = sizeof( NvmCtx );
-    return &NvmCtx;
-#else
-    *classBNvmCtxSize = 0;
-    return NULL;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBSetBeaconState( BeaconState_t beaconState )
@@ -621,22 +666,21 @@ void LoRaMacClassBSetBeaconState( BeaconState_t beaconState )
             Ctx.BeaconState = beaconState;
         }
     }
-    Ctx.NvmCtx->BeaconCtx.BeaconState = Ctx.BeaconState;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBSetPingSlotState( PingSlotState_t pingSlotState )
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
     Ctx.PingSlotState = pingSlotState;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBSetMulticastSlotState( PingSlotState_t multicastSlotState )
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
     Ctx.MulticastSlotState = multicastSlotState;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 bool LoRaMacClassBIsAcquisitionInProgress( void )
@@ -657,7 +701,7 @@ bool LoRaMacClassBIsAcquisitionInProgress( void )
     return false;
 #else
     return false;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBBeaconTimerEvent( void* context )
@@ -671,7 +715,7 @@ void LoRaMacClassBBeaconTimerEvent( void* context )
     {
         Ctx.LoRaMacClassBCallbacks.MacProcessNotify( );
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
@@ -679,6 +723,7 @@ static void LoRaMacClassBProcessBeacon( void )
 {
     bool activateTimer = false;
     TimerTime_t beaconEventTime = 1;
+    RxConfigParams_t beaconRxConfig;
     TimerTime_t currentTime = Ctx.BeaconCtx.TimeStamp;
 
     // Beacon state machine
@@ -700,11 +745,21 @@ static void LoRaMacClassBProcessBeacon( void )
 
                 if( Ctx.BeaconCtx.Ctrl.BeaconDelaySet == 1 )
                 {
+                    // The goal is to calculate beaconRxConfig.WindowTimeout
+                    CalculateBeaconRxWindowConfig( &beaconRxConfig, Ctx.BeaconCtx.SymbolTimeout );
+
                     if( Ctx.BeaconCtx.BeaconTimingDelay > 0 )
                     {
                         if( SysTimeToMs( Ctx.BeaconCtx.NextBeaconRx ) > currentTime )
                         {
+                            // Calculate the time when we expect the next beacon
                             beaconEventTime = TimerTempCompensation( SysTimeToMs( Ctx.BeaconCtx.NextBeaconRx ) - currentTime, Ctx.BeaconCtx.Temperature );
+
+                            if( ( int32_t ) beaconEventTime > beaconRxConfig.WindowOffset )
+                            {
+                                // Apply the offset of the system error respectively beaconing precision setting
+                                beaconEventTime += beaconRxConfig.WindowOffset;
+                            }
                         }
                         else
                         {
@@ -726,7 +781,7 @@ static void LoRaMacClassBProcessBeacon( void )
 
                         // Don't use the default channel. We know on which
                         // channel the next beacon will be transmitted
-                        RxBeaconSetup( CLASSB_BEACON_RESERVED, false );
+                        RxBeaconSetup( CLASSB_BEACON_RESERVED, false, beaconRxConfig.WindowTimeout );
                     }
                 }
                 else
@@ -757,12 +812,15 @@ static void LoRaMacClassBProcessBeacon( void )
                 Ctx.BeaconCtx.Ctrl.AcquisitionPending = 1;
                 beaconEventTime = CLASSB_BEACON_INTERVAL;
 
+                // The goal is to calculate beaconRxConfig.WindowTimeout
+                CalculateBeaconRxWindowConfig( &beaconRxConfig, Ctx.BeaconCtx.SymbolTimeout );
+
                 // Start the beacon acquisition. When the MAC has received a beacon in function
                 // RxBeacon successfully, the next state is BEACON_STATE_LOCKED. If the MAC does not
                 // find a beacon, the state machine will stay in state BEACON_STATE_ACQUISITION.
                 // This state detects that a acquisition was pending previously and will change the next
                 // state to BEACON_STATE_LOST.
-                RxBeaconSetup( 0, true );
+                RxBeaconSetup( 0, true, beaconRxConfig.WindowTimeout );
             }
             break;
         }
@@ -834,11 +892,20 @@ static void LoRaMacClassBProcessBeacon( void )
             beaconEventTime = Ctx.BeaconCtx.NextBeaconRxAdjusted - Radio.GetWakeupTime( );
             currentTime = TimerGetCurrentTime( );
 
+            // The goal is to calculate beaconRxConfig.WindowTimeout and beaconRxConfig.WindowOffset
+            CalculateBeaconRxWindowConfig( &beaconRxConfig, Ctx.BeaconCtx.SymbolTimeout );
+
             if( beaconEventTime > currentTime )
             {
                 Ctx.BeaconState = BEACON_STATE_GUARD;
                 beaconEventTime -= currentTime;
                 beaconEventTime = TimerTempCompensation( beaconEventTime, Ctx.BeaconCtx.Temperature );
+
+                if( ( int32_t ) beaconEventTime > beaconRxConfig.WindowOffset )
+                {
+                    // Apply the offset of the system error respectively beaconing precision setting
+                    beaconEventTime += beaconRxConfig.WindowOffset;
+                }
             }
             else
             {
@@ -856,7 +923,7 @@ static void LoRaMacClassBProcessBeacon( void )
 
             // Don't use the default channel. We know on which
             // channel the next beacon will be transmitted
-            RxBeaconSetup( CLASSB_BEACON_RESERVED, false );
+            RxBeaconSetup( CLASSB_BEACON_RESERVED, false, beaconRxConfig.WindowTimeout );
             break;
         }
         case BEACON_STATE_LOST:
@@ -899,7 +966,7 @@ static void LoRaMacClassBProcessBeacon( void )
         TimerStart( &Ctx.BeaconTimer );
     }
 }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 
 void LoRaMacClassBPingSlotTimerEvent( void* context )
 {
@@ -910,7 +977,7 @@ void LoRaMacClassBPingSlotTimerEvent( void* context )
     {
         Ctx.LoRaMacClassBCallbacks.MacProcessNotify( );
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
@@ -925,21 +992,21 @@ static void LoRaMacClassBProcessPingSlot( void )
         {
             ComputePingOffset( Ctx.BeaconCtx.BeaconTime.Seconds,
                                *Ctx.LoRaMacClassBParams.LoRaMacDevAddr,
-                               Ctx.NvmCtx->PingSlotCtx.PingPeriod,
+                               ClassBNvm->PingSlotCtx.PingPeriod,
                                &( Ctx.PingSlotCtx.PingOffset ) );
             Ctx.PingSlotState = PINGSLOT_STATE_SET_TIMER;
         }
             // Intentional fall through
         case PINGSLOT_STATE_SET_TIMER:
         {
-            if( CalcNextSlotTime( Ctx.PingSlotCtx.PingOffset, Ctx.NvmCtx->PingSlotCtx.PingPeriod, Ctx.NvmCtx->PingSlotCtx.PingNb, &pingSlotTime ) == true )
+            if( CalcNextSlotTime( Ctx.PingSlotCtx.PingOffset, ClassBNvm->PingSlotCtx.PingPeriod, ClassBNvm->PingSlotCtx.PingNb, &pingSlotTime ) == true )
             {
                 if( Ctx.BeaconCtx.Ctrl.BeaconAcquired == 1 )
                 {
                     // Compute the symbol timeout. Apply it only, if the beacon is acquired
                     // Otherwise, take the enlargement of the symbols into account.
                     RegionComputeRxWindowParameters( *Ctx.LoRaMacClassBParams.LoRaMacRegion,
-                                                     Ctx.NvmCtx->PingSlotCtx.Datarate,
+                                                     ClassBNvm->PingSlotCtx.Datarate,
                                                      Ctx.LoRaMacClassBParams.LoRaMacParams->MinRxSymbols,
                                                      Ctx.LoRaMacClassBParams.LoRaMacParams->SystemMaxRxError,
                                                      &pingSlotRxConfig );
@@ -960,10 +1027,10 @@ static void LoRaMacClassBProcessPingSlot( void )
         }
         case PINGSLOT_STATE_IDLE:
         {
-            uint32_t frequency = Ctx.NvmCtx->PingSlotCtx.Frequency;
+            uint32_t frequency = ClassBNvm->PingSlotCtx.Frequency;
 
             // Apply a custom frequency if the following bit is set
-            if( Ctx.NvmCtx->PingSlotCtx.Ctrl.CustomFreq == 0 )
+            if( ClassBNvm->PingSlotCtx.Ctrl.CustomFreq == 0 )
             {
                 // Restore floor plan
                 frequency = CalcDownlinkChannelAndFrequency( *Ctx.LoRaMacClassBParams.LoRaMacDevAddr, Ctx.BeaconCtx.BeaconTime.Seconds,
@@ -976,9 +1043,9 @@ static void LoRaMacClassBProcessPingSlot( void )
             {
                 Ctx.PingSlotState = PINGSLOT_STATE_RX;
 
-                pingSlotRxConfig.Datarate = Ctx.NvmCtx->PingSlotCtx.Datarate;
+                pingSlotRxConfig.Datarate = ClassBNvm->PingSlotCtx.Datarate;
                 pingSlotRxConfig.DownlinkDwellTime = Ctx.LoRaMacClassBParams.LoRaMacParams->DownlinkDwellTime;
-                pingSlotRxConfig.RepeaterSupport = Ctx.LoRaMacClassBParams.LoRaMacParams->RepeaterSupport;
+                pingSlotRxConfig.RepeaterSupport = Ctx.LoRaMacClassBParams.LoRaMacParams->RepeaterSupport; /* ST_WORKAROUND: keep repeater feature */
                 pingSlotRxConfig.Frequency = frequency;
                 pingSlotRxConfig.RxContinuous = false;
                 pingSlotRxConfig.RxSlot = RX_SLOT_WIN_CLASS_B_PING_SLOT;
@@ -1010,7 +1077,7 @@ static void LoRaMacClassBProcessPingSlot( void )
         }
     }
 }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 
 void LoRaMacClassBMulticastSlotTimerEvent( void* context )
 {
@@ -1021,7 +1088,7 @@ void LoRaMacClassBMulticastSlotTimerEvent( void* context )
     {
         Ctx.LoRaMacClassBCallbacks.MacProcessNotify( );
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
@@ -1049,7 +1116,7 @@ static void LoRaMacClassBProcessMulticastSlot( void )
         case PINGSLOT_STATE_CALC_PING_OFFSET:
         {
             // Compute all offsets for every multicast slots
-            for( uint8_t i = 0; i < LORAMAC_MAX_MC_CTX; i++ )
+            for( uint8_t i = 0; i < LORAMAC_MAX_MC_CTX; i++ ) /* ST_WORKAROUND: reduced LORAMAC_MAX_MC_CTX */
             {
                 ComputePingOffset( Ctx.BeaconCtx.BeaconTime.Seconds,
                                    cur->ChannelParams.Address,
@@ -1086,7 +1153,7 @@ static void LoRaMacClassBProcessMulticastSlot( void )
                 if( Ctx.BeaconCtx.Ctrl.BeaconAcquired == 1 )
                 {
                     RegionComputeRxWindowParameters( *Ctx.LoRaMacClassBParams.LoRaMacRegion,
-                                                    Ctx.NvmCtx->PingSlotCtx.Datarate,
+                                                    ClassBNvm->PingSlotCtx.Datarate,
                                                     Ctx.LoRaMacClassBParams.LoRaMacParams->MinRxSymbols,
                                                     Ctx.LoRaMacClassBParams.LoRaMacParams->SystemMaxRxError,
                                                     &multicastSlotRxConfig );
@@ -1133,7 +1200,7 @@ static void LoRaMacClassBProcessMulticastSlot( void )
 
             multicastSlotRxConfig.Datarate = Ctx.PingSlotCtx.NextMulticastChannel->ChannelParams.RxParams.ClassB.Datarate;
             multicastSlotRxConfig.DownlinkDwellTime = Ctx.LoRaMacClassBParams.LoRaMacParams->DownlinkDwellTime;
-            multicastSlotRxConfig.RepeaterSupport = Ctx.LoRaMacClassBParams.LoRaMacParams->RepeaterSupport;
+            multicastSlotRxConfig.RepeaterSupport = Ctx.LoRaMacClassBParams.LoRaMacParams->RepeaterSupport; /* ST_WORKAROUND: keep repeater feature */
             multicastSlotRxConfig.Frequency = frequency;
             multicastSlotRxConfig.RxContinuous = false;
             multicastSlotRxConfig.RxSlot = RX_SLOT_WIN_CLASS_B_MULTICAST_SLOT;
@@ -1166,7 +1233,7 @@ static void LoRaMacClassBProcessMulticastSlot( void )
         }
     }
 }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 
 bool LoRaMacClassBRxBeacon( uint8_t *payload, uint16_t size )
 {
@@ -1259,7 +1326,7 @@ bool LoRaMacClassBRxBeacon( uint8_t *payload, uint16_t size )
                 Ctx.BeaconCtx.Ctrl.BeaconMode = 1;
                 ResetWindowTimeout( );
                 Ctx.BeaconState = BEACON_STATE_LOCKED;
-                Ctx.NvmCtx->BeaconCtx.BeaconState = Ctx.BeaconState;
+
                 LoRaMacClassBBeaconTimerEvent( NULL );
             }
         }
@@ -1267,7 +1334,6 @@ bool LoRaMacClassBRxBeacon( uint8_t *payload, uint16_t size )
         if( Ctx.BeaconState == BEACON_STATE_RX )
         {
             Ctx.BeaconState = BEACON_STATE_TIMEOUT;
-            Ctx.NvmCtx->BeaconCtx.BeaconState = Ctx.BeaconState;
             LoRaMacClassBBeaconTimerEvent( NULL );
         }
         // When the MAC listens for a beacon, it is not allowed to process any other
@@ -1282,7 +1348,7 @@ bool LoRaMacClassBRxBeacon( uint8_t *payload, uint16_t size )
     return beaconProcessed;
 #else
     return false;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 bool LoRaMacClassBIsBeaconExpected( void )
@@ -1296,7 +1362,7 @@ bool LoRaMacClassBIsBeaconExpected( void )
     return false;
 #else
     return false;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 bool LoRaMacClassBIsPingExpected( void )
@@ -1309,7 +1375,7 @@ bool LoRaMacClassBIsPingExpected( void )
     return false;
 #else
     return false;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 bool LoRaMacClassBIsMulticastExpected( void )
@@ -1322,7 +1388,7 @@ bool LoRaMacClassBIsMulticastExpected( void )
     return false;
 #else
     return false;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 bool LoRaMacClassBIsAcquisitionPending( void )
@@ -1335,7 +1401,7 @@ bool LoRaMacClassBIsAcquisitionPending( void )
     return false;
 #else
     return false;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 bool LoRaMacClassBIsBeaconModeActive( void )
@@ -1349,16 +1415,15 @@ bool LoRaMacClassBIsBeaconModeActive( void )
     return false;
 #else
     return false;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBSetPingSlotInfo( uint8_t periodicity )
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-    Ctx.NvmCtx->PingSlotCtx.PingNb = CalcPingNb( periodicity );
-    Ctx.NvmCtx->PingSlotCtx.PingPeriod = CalcPingPeriod( Ctx.NvmCtx->PingSlotCtx.PingNb );
-    NvmContextChange( );
-#endif // LORAMAC_CLASSB_ENABLED
+    ClassBNvm->PingSlotCtx.PingNb = CalcPingNb( periodicity );
+    ClassBNvm->PingSlotCtx.PingPeriod = CalcPingPeriod( ClassBNvm->PingSlotCtx.PingNb );
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBHaltBeaconing( void )
@@ -1382,12 +1447,11 @@ void LoRaMacClassBHaltBeaconing( void )
 
         // Halt beacon state machine
         Ctx.BeaconState = BEACON_STATE_HALT;
-        Ctx.NvmCtx->BeaconCtx.BeaconState = Ctx.BeaconState;
 
         // Halt ping and multicast slot state machines
         LoRaMacClassBStopRxSlots( );
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBResumeBeaconing( void )
@@ -1406,10 +1470,9 @@ void LoRaMacClassBResumeBeaconing( void )
             Ctx.BeaconState = BEACON_STATE_REACQUISITION;
         }
 
-        Ctx.NvmCtx->BeaconCtx.BeaconState = Ctx.BeaconState;
         LoRaMacClassBBeaconTimerEvent( NULL );
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 LoRaMacStatus_t LoRaMacClassBSwitchClass( DeviceClass_t nextClass )
@@ -1417,7 +1480,7 @@ LoRaMacStatus_t LoRaMacClassBSwitchClass( DeviceClass_t nextClass )
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
     if( nextClass == CLASS_B )
     {// Switch to from class a to class b
-        if( ( Ctx.BeaconCtx.Ctrl.BeaconMode == 1 ) && ( Ctx.NvmCtx->PingSlotCtx.Ctrl.Assigned == 1 ) )
+        if( ( Ctx.BeaconCtx.Ctrl.BeaconMode == 1 ) && ( ClassBNvm->PingSlotCtx.Ctrl.Assigned == 1 ) )
         {
             return LORAMAC_STATUS_OK;
         }
@@ -1434,19 +1497,24 @@ LoRaMacStatus_t LoRaMacClassBSwitchClass( DeviceClass_t nextClass )
     return LORAMAC_STATUS_SERVICE_UNKNOWN;
 #else
     return LORAMAC_STATUS_SERVICE_UNKNOWN;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 LoRaMacStatus_t LoRaMacClassBMibGetRequestConfirm( MibRequestConfirm_t *mibGet )
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-    LoRaMacStatus_t status;
+    LoRaMacStatus_t status = LORAMAC_STATUS_OK;
 
     switch( mibGet->Type )
     {
         case MIB_PING_SLOT_DATARATE:
         {
-            mibGet->Param.PingSlotDatarate = Ctx.NvmCtx->PingSlotCtx.Datarate;
+            mibGet->Param.PingSlotDatarate = ClassBNvm->PingSlotCtx.Datarate;
+            break;
+        }
+        case MIB_BEACON_STATE:
+        {
+            mibGet->Param.BeaconState = Ctx.BeaconState;
             break;
         }
         default:
@@ -1458,20 +1526,19 @@ LoRaMacStatus_t LoRaMacClassBMibGetRequestConfirm( MibRequestConfirm_t *mibGet )
     return status;
 #else
     return LORAMAC_STATUS_SERVICE_UNKNOWN;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 LoRaMacStatus_t LoRaMacMibClassBSetRequestConfirm( MibRequestConfirm_t *mibSet )
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-    LoRaMacStatus_t status;
+    LoRaMacStatus_t status = LORAMAC_STATUS_OK;
 
     switch( mibSet->Type )
     {
         case MIB_PING_SLOT_DATARATE:
         {
-            Ctx.NvmCtx->PingSlotCtx.Datarate = mibSet->Param.PingSlotDatarate;
-            NvmContextChange( );
+            ClassBNvm->PingSlotCtx.Datarate = mibSet->Param.PingSlotDatarate;
             break;
         }
         default:
@@ -1483,7 +1550,7 @@ LoRaMacStatus_t LoRaMacMibClassBSetRequestConfirm( MibRequestConfirm_t *mibSet )
     return status;
 #else
     return LORAMAC_STATUS_SERVICE_UNKNOWN;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBPingSlotInfoAns( void )
@@ -1492,10 +1559,9 @@ void LoRaMacClassBPingSlotInfoAns( void )
     if( LoRaMacConfirmQueueIsCmdActive( MLME_PING_SLOT_INFO ) == true )
     {
         LoRaMacConfirmQueueSetStatus( LORAMAC_EVENT_INFO_STATUS_OK, MLME_PING_SLOT_INFO );
-        Ctx.NvmCtx->PingSlotCtx.Ctrl.Assigned = 1;
-        NvmContextChange( );
+        ClassBNvm->PingSlotCtx.Ctrl.Assigned = 1;
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 uint8_t LoRaMacClassBPingSlotChannelReq( uint8_t datarate, uint32_t frequency )
@@ -1527,22 +1593,21 @@ uint8_t LoRaMacClassBPingSlotChannelReq( uint8_t datarate, uint32_t frequency )
     {
         if( isCustomFreq == true )
         {
-            Ctx.NvmCtx->PingSlotCtx.Ctrl.CustomFreq = 1;
-            Ctx.NvmCtx->PingSlotCtx.Frequency = frequency;
+            ClassBNvm->PingSlotCtx.Ctrl.CustomFreq = 1;
+            ClassBNvm->PingSlotCtx.Frequency = frequency;
         }
         else
         {
-            Ctx.NvmCtx->PingSlotCtx.Ctrl.CustomFreq = 0;
-            Ctx.NvmCtx->PingSlotCtx.Frequency = 0;
+            ClassBNvm->PingSlotCtx.Ctrl.CustomFreq = 0;
+            ClassBNvm->PingSlotCtx.Frequency = 0;
         }
-        Ctx.NvmCtx->PingSlotCtx.Datarate = datarate;
-        NvmContextChange( );
+        ClassBNvm->PingSlotCtx.Datarate = datarate;
     }
 
     return status;
 #else
     return 0;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBBeaconTimingAns( uint16_t beaconTimingDelay, uint8_t beaconTimingChannel, TimerTime_t lastRxDone )
@@ -1571,7 +1636,7 @@ void LoRaMacClassBBeaconTimingAns( uint16_t beaconTimingDelay, uint8_t beaconTim
         Ctx.LoRaMacClassBParams.MlmeConfirm->BeaconTimingDelay = Ctx.BeaconCtx.BeaconTimingDelay;
         Ctx.LoRaMacClassBParams.MlmeConfirm->BeaconTimingChannel = Ctx.BeaconCtx.BeaconTimingChannel;
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBDeviceTimeAns( void )
@@ -1607,7 +1672,7 @@ void LoRaMacClassBDeviceTimeAns( void )
             LoRaMacConfirmQueueSetStatus( LORAMAC_EVENT_INFO_STATUS_OK, MLME_DEVICE_TIME );
         }
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 bool LoRaMacClassBBeaconFreqReq( uint32_t frequency )
@@ -1621,22 +1686,20 @@ bool LoRaMacClassBBeaconFreqReq( uint32_t frequency )
 
         if( RegionVerify( *Ctx.LoRaMacClassBParams.LoRaMacRegion, &verify, PHY_FREQUENCY ) == true )
         {
-            Ctx.NvmCtx->BeaconCtx.Ctrl.CustomFreq = 1;
-            Ctx.NvmCtx->BeaconCtx.Frequency = frequency;
-            NvmContextChange( );
+            ClassBNvm->BeaconCtx.Ctrl.CustomFreq = 1;
+            ClassBNvm->BeaconCtx.Frequency = frequency;
             return true;
         }
     }
     else
     {
-        Ctx.NvmCtx->BeaconCtx.Ctrl.CustomFreq = 0;
-        NvmContextChange( );
+        ClassBNvm->BeaconCtx.Ctrl.CustomFreq = 0;
         return true;
     }
     return false;
 #else
     return false;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 TimerTime_t LoRaMacClassBIsUplinkCollision( TimerTime_t txTimeOnAir )
@@ -1660,7 +1723,7 @@ TimerTime_t LoRaMacClassBIsUplinkCollision( TimerTime_t txTimeOnAir )
     return 0;
 #else
     return 0;
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBStopRxSlots( void )
@@ -1673,13 +1736,13 @@ void LoRaMacClassBStopRxSlots( void )
     LoRaMacClassBEvents.Events.PingSlot = 0;
     LoRaMacClassBEvents.Events.MulticastSlot = 0;
     CRITICAL_SECTION_END( );
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBStartRxSlots( void )
 {
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-    if( Ctx.NvmCtx->PingSlotCtx.Ctrl.Assigned == 1 )
+    if( ClassBNvm->PingSlotCtx.Ctrl.Assigned == 1 )
     {
         Ctx.PingSlotState = PINGSLOT_STATE_CALC_PING_OFFSET;
         TimerSetValue( &Ctx.PingSlotTimer, 1 );
@@ -1689,7 +1752,7 @@ void LoRaMacClassBStartRxSlots( void )
         TimerSetValue( &Ctx.MulticastSlotTimer, 1 );
         TimerStart( &Ctx.MulticastSlotTimer );
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBSetMulticastPeriodicity( MulticastCtx_t* multicastChannel )
@@ -1700,7 +1763,7 @@ void LoRaMacClassBSetMulticastPeriodicity( MulticastCtx_t* multicastChannel )
         multicastChannel->PingNb = CalcPingNb( multicastChannel->ChannelParams.RxParams.ClassB.Periodicity );
         multicastChannel->PingPeriod = CalcPingPeriod( multicastChannel->PingNb );
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
 
 void LoRaMacClassBProcess( void )
@@ -1728,5 +1791,5 @@ void LoRaMacClassBProcess( void )
             LoRaMacClassBProcessMulticastSlot( );
         }
     }
-#endif // LORAMAC_CLASSB_ENABLED
+#endif /* LORAMAC_CLASSB_ENABLED */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.h b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.h
index b3896bd1..68db8dba 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.h
@@ -34,6 +34,16 @@
  *            layer and the supported features.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    LoRaMacClassB.h
+  * @author  MCD Application Team
+  * @brief   LoRa MAC Class B layer implementation
+  ******************************************************************************
+  */
 #ifndef __LORAMACCLASSB_H__
 #define __LORAMACCLASSB_H__
 
@@ -45,59 +55,6 @@ extern "C"
 #include "systime.h"
 #include "LoRaMacTypes.h"
 
-/*!
- * States of the class B beacon acquisition and tracking
- */
-typedef enum eBeaconState
-{
-    /*!
-     * Initial state to acquire the beacon
-     */
-    BEACON_STATE_ACQUISITION,
-    /*!
-     * Beacon acquisition state when a time reference is available
-     */
-    BEACON_STATE_ACQUISITION_BY_TIME,
-    /*!
-     * Handles the state when the beacon reception fails
-     */
-    BEACON_STATE_TIMEOUT,
-    /*!
-     * Handles the state when the beacon was missed due to an uplink
-     */
-    BEACON_STATE_BEACON_MISSED,
-    /*!
-     * Reacquisition state which applies the algorithm to enlarge the reception
-     * windows
-     */
-    BEACON_STATE_REACQUISITION,
-    /*!
-     * The node has locked a beacon successfully
-     */
-    BEACON_STATE_LOCKED,
-    /*!
-     * The beacon state machine is stopped due to operations with higher priority
-     */
-    BEACON_STATE_HALT,
-    /*!
-     * The node currently operates in the beacon window and is idle. In this
-     * state, the temperature measurement takes place
-     */
-    BEACON_STATE_IDLE,
-    /*!
-     * The node operates in the guard time of class B
-     */
-    BEACON_STATE_GUARD,
-    /*!
-     * The node is in receive mode to lock a beacon
-     */
-    BEACON_STATE_RX,
-    /*!
-     * The nodes switches the device class
-     */
-    BEACON_STATE_LOST,
-}BeaconState_t;
-
 /*!
  * States of the class B ping slot mechanism
  */
@@ -227,12 +184,14 @@ typedef struct sBeaconContext
  */
 typedef struct sLoRaMacClassBCallback
 {
+    /* ST_WORKAROUND_BEGIN: Return temperature into Q7.8 instead float */
     /*!
      * \brief   Measures the temperature level
      *
      * \retval  Temperature level
      */
     uint16_t ( *GetTemperatureLevel )( void );
+    /* ST_WORKAROUND_END */
     /*!
      *\brief    Will be called each time a Radio IRQ is handled by the MAC
      *          layer.
@@ -287,161 +246,15 @@ typedef struct sLoRaMacClassBParams
  */
 typedef void ( *LoRaMacClassBNvmEvent )( void );
 
-/*
- * LoRaMac Class B Context structure for NVM parameters
- * related to ping slots
- */
-typedef struct sLoRaMacClassBPingSlotNvmCtx
-{
-    struct sPingSlotCtrlNvm
-    {
-        /*!
-         * Set when the server assigned a ping slot to the node
-         */
-        uint8_t Assigned         : 1;
-        /*!
-         * Set when a custom frequency is used
-         */
-        uint8_t CustomFreq       : 1;
-    }Ctrl;
-    /*!
-     * Number of ping slots
-     */
-    uint8_t PingNb;
-    /*!
-     * Period of the ping slots
-     */
-    uint16_t PingPeriod;
-    /*!
-     * Reception frequency of the ping slot windows
-     */
-    uint32_t Frequency;
-    /*!
-     * Datarate of the ping slot
-     */
-    int8_t Datarate;
-} LoRaMacClassBPingSlotNvmCtx_t;
-
-/*
- * LoRaMac Class B Context structure for NVM parameters
- * related to beaconing
- */
-typedef struct sLoRaMacClassBBeaconNvmCtx
-{
-    struct sBeaconCtrlNvm
-    {
-        /*!
-         * Set if the node has a custom frequency for beaconing and ping slots
-         */
-        uint8_t CustomFreq          : 1;
-    }Ctrl;
-    /*!
-     * Beacon reception frequency
-     */
-    uint32_t Frequency;
-    /*!
-     * State of the beaconing mechanism
-     */
-    BeaconState_t BeaconState;
-} LoRaMacClassBBeaconNvmCtx_t;
-
-/*
- * LoRaMac Class B Context structure
- */
-typedef struct sLoRaMacClassBNvmCtx
-{
-    /*!
-    * Class B ping slot context
-    */
-    LoRaMacClassBPingSlotNvmCtx_t PingSlotCtx;
-    /*!
-    * Class B beacon context
-    */
-    LoRaMacClassBBeaconNvmCtx_t BeaconCtx;
-} LoRaMacClassBNvmCtx_t;
-
-/*
- * LoRaMac Class B Context structure
- */
-typedef struct sLoRaMacClassBCtx
-{
-    /*!
-    * Class B ping slot context
-    */
-    PingSlotContext_t PingSlotCtx;
-    /*!
-    * Class B beacon context
-    */
-    BeaconContext_t BeaconCtx;
-    /*!
-    * State of the beaconing mechanism
-    */
-    BeaconState_t BeaconState;
-    /*!
-    * State of the ping slot mechanism
-    */
-    PingSlotState_t PingSlotState;
-    /*!
-    * State of the multicast slot mechanism
-    */
-    PingSlotState_t MulticastSlotState;
-    /*!
-    * Timer for CLASS B beacon acquisition and tracking.
-    */
-    TimerEvent_t BeaconTimer;
-    /*!
-    * Timer for CLASS B ping slot timer.
-    */
-    TimerEvent_t PingSlotTimer;
-    /*!
-    * Timer for CLASS B multicast ping slot timer.
-    */
-    TimerEvent_t MulticastSlotTimer;
-    /*!
-    * Container for the callbacks related to class b.
-    */
-    LoRaMacClassBCallback_t LoRaMacClassBCallbacks;
-    /*!
-    * Data structure which holds the parameters which needs to be set
-    * in class b operation.
-    */
-    LoRaMacClassBParams_t LoRaMacClassBParams;
-    /*
-     * Callback function to notify the upper layer about context change
-     */
-    LoRaMacClassBNvmEvent LoRaMacClassBNvmEvent;
-    /*!
-    * Non-volatile module context.
-    */
-    LoRaMacClassBNvmCtx_t* NvmCtx;
-} LoRaMacClassBCtx_t;
-
 /*!
  * \brief Initialize LoRaWAN Class B
  *
  * \param [IN] classBParams Information and feedback parameter
  * \param [IN] callbacks Contains the callback which the Class B implementation needs
- * \param [IN] callback function which will be called when the non-volatile context needs to be saved.
- */
-void LoRaMacClassBInit( LoRaMacClassBParams_t *classBParams, LoRaMacClassBCallback_t *callbacks, LoRaMacClassBNvmEvent classBNvmCtxChanged );
-
-/*!
- * Restores the internal non-volatile context from passed pointer.
- *
- * \param [IN]     classBNvmCtx     - Pointer to non-volatile class B module context to be restored.
- *
- * \retval                     - Status of the operation
- */
-bool LoRaMacClassBRestoreNvmCtx( void* classBNvmCtx );
-
-/*!
- * Returns a pointer to the internal non-volatile context.
- *
- * \param [IN]     classBNvmCtxSize - Size of the module non-volatile context
- *
- * \retval                    - Points to a structure where the module store its non-volatile context
+ * \param [IN] nvm Pointer to an external non-volatile memory data structure.
  */
-void* LoRaMacClassBGetNvmCtx( size_t* classBNvmCtxSize );
+void LoRaMacClassBInit( LoRaMacClassBParams_t *classBParams, LoRaMacClassBCallback_t *callbacks,
+                        LoRaMacClassBNvmData_t* nvm );
 
 /*!
  * \brief Set the state of the beacon state machine
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassBNvm.h b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassBNvm.h
new file mode 100644
index 00000000..dcfc141e
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassBNvm.h
@@ -0,0 +1,120 @@
+/*!
+ * \file      LoRaMacClassBNvm.h
+ *
+ * \brief     LoRa MAC Class B non-volatile data.
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author     Miguel Luis ( Semtech )
+ *
+ * \author     Daniel Jaeckle ( STACKFORCE )
+ *
+ * \addtogroup LORAMACCLASSB
+ *
+ * \{
+ */
+#ifndef __LORAMACCLASSBNVM_H__
+#define __LORAMACCLASSBNVM_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <stdint.h>
+
+/*!
+ * LoRaMac Class B Context structure for NVM parameters
+ * related to ping slots
+ */
+typedef struct sLoRaMacClassBPingSlotNvmData
+{
+    struct sPingSlotCtrlNvm
+    {
+        /*!
+         * Set when the server assigned a ping slot to the node
+         */
+        uint8_t Assigned         : 1;
+        /*!
+         * Set when a custom frequency is used
+         */
+        uint8_t CustomFreq       : 1;
+    }Ctrl;
+    /*!
+     * Number of ping slots
+     */
+    uint8_t PingNb;
+    /*!
+     * Period of the ping slots
+     */
+    uint16_t PingPeriod;
+    /*!
+     * Reception frequency of the ping slot windows
+     */
+    uint32_t Frequency;
+    /*!
+     * Datarate of the ping slot
+     */
+    int8_t Datarate;
+} LoRaMacClassBPingSlotNvmData_t;
+
+/*!
+ * LoRaMac Class B Context structure for NVM parameters
+ * related to beaconing
+ */
+typedef struct sLoRaMacClassBBeaconNvmData
+{
+    struct sBeaconCtrlNvm
+    {
+        /*!
+         * Set if the node has a custom frequency for beaconing and ping slots
+         */
+        uint8_t CustomFreq          : 1;
+    }Ctrl;
+    /*!
+     * Beacon reception frequency
+     */
+    uint32_t Frequency;
+} LoRaMacClassBBeaconNvmData_t;
+
+/*!
+ * LoRaMac Class B Context structure
+ */
+typedef struct sLoRaMacClassBNvmData
+{
+    /*!
+     * Class B ping slot context
+     */
+    LoRaMacClassBPingSlotNvmData_t PingSlotCtx;
+    /*!
+     * Class B beacon context
+     */
+    LoRaMacClassBBeaconNvmData_t BeaconCtx;
+    /*!
+     * CRC32 value of the ClassB data structure.
+     */
+    uint32_t Crc32;
+} LoRaMacClassBNvmData_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __LORAMACCLASSBNVM_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c
index 6e3f59f8..1306c2ae 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c
@@ -78,15 +78,10 @@ typedef struct sLoRaMacCommandsCtx
     size_t SerializedCmdsSize;
 } LoRaMacCommandsCtx_t;
 
-/*!
- * Callback function to notify the upper layer about context change
- */
-static LoRaMacCommandsNvmEvent CommandsNvmCtxChanged;
-
 /*!
  * Non-volatile module context.
  */
-static LoRaMacCommandsCtx_t NvmCtx;
+static LoRaMacCommandsCtx_t CommandsCtx;
 
 /* Memory management functions */
 
@@ -119,7 +114,7 @@ static MacCommand_t* MallocNewMacCommandSlot( void )
 {
     uint8_t itr = 0;
 
-    while( IsSlotFree( ( const MacCommand_t* )&NvmCtx.MacCommandSlots[itr] ) == false )
+    while( IsSlotFree( ( const MacCommand_t* )&CommandsCtx.MacCommandSlots[itr] ) == false )
     {
         itr++;
         if( itr == NUM_OF_MAC_COMMANDS )
@@ -128,7 +123,7 @@ static MacCommand_t* MallocNewMacCommandSlot( void )
         }
     }
 
-    return &NvmCtx.MacCommandSlots[itr];
+    return &CommandsCtx.MacCommandSlots[itr];
 }
 
 /*!
@@ -299,50 +294,16 @@ static bool IsSticky( uint8_t cid )
     }
 }
 
-/*
- * \brief Wrapper function for the NvmCtx
- */
-static void NvmCtxCallback( void )
-{
-    if( CommandsNvmCtxChanged != NULL )
-    {
-        CommandsNvmCtxChanged( );
-    }
-}
-
-LoRaMacCommandStatus_t LoRaMacCommandsInit( LoRaMacCommandsNvmEvent commandsNvmCtxChanged )
+LoRaMacCommandStatus_t LoRaMacCommandsInit( void )
 {
     // Initialize with default
-    memset1( ( uint8_t* )&NvmCtx, 0, sizeof( NvmCtx ) );
-
-    LinkedListInit( &NvmCtx.MacCommandList );
+    memset1( ( uint8_t* )&CommandsCtx, 0, sizeof( CommandsCtx ) );
 
-    // Assign callback
-    CommandsNvmCtxChanged = commandsNvmCtxChanged;
+    LinkedListInit( &CommandsCtx.MacCommandList );
 
     return LORAMAC_COMMANDS_SUCCESS;
 }
 
-LoRaMacCommandStatus_t LoRaMacCommandsRestoreNvmCtx( void* commandsNvmCtx )
-{
-    // Restore module context
-    if( commandsNvmCtx != NULL )
-    {
-        memcpy1( ( uint8_t* )&NvmCtx, ( uint8_t* )commandsNvmCtx, sizeof( NvmCtx ) );
-        return LORAMAC_COMMANDS_SUCCESS;
-    }
-    else
-    {
-        return LORAMAC_COMMANDS_ERROR_NPE;
-    }
-}
-
-void* LoRaMacCommandsGetNvmCtx( size_t* commandsNvmCtxSize )
-{
-    *commandsNvmCtxSize = sizeof( NvmCtx );
-    return &NvmCtx;
-}
-
 LoRaMacCommandStatus_t LoRaMacCommandsAddCmd( uint8_t cid, uint8_t* payload, size_t payloadSize )
 {
     if( payload == NULL )
@@ -360,7 +321,7 @@ LoRaMacCommandStatus_t LoRaMacCommandsAddCmd( uint8_t cid, uint8_t* payload, siz
     }
 
     // Add it to the list of Mac commands
-    if( LinkedListAdd( &NvmCtx.MacCommandList, newCmd ) == false )
+    if( LinkedListAdd( &CommandsCtx.MacCommandList, newCmd ) == false )
     {
         return LORAMAC_COMMANDS_ERROR;
     }
@@ -371,9 +332,7 @@ LoRaMacCommandStatus_t LoRaMacCommandsAddCmd( uint8_t cid, uint8_t* payload, siz
     memcpy1( ( uint8_t* )newCmd->Payload, payload, payloadSize );
     newCmd->IsSticky = IsSticky( cid );
 
-    NvmCtx.SerializedCmdsSize += ( CID_FIELD_SIZE + payloadSize );
-
-    NvmCtxCallback( );
+    CommandsCtx.SerializedCmdsSize += ( CID_FIELD_SIZE + payloadSize );
 
     return LORAMAC_COMMANDS_SUCCESS;
 }
@@ -386,12 +345,12 @@ LoRaMacCommandStatus_t LoRaMacCommandsRemoveCmd( MacCommand_t* macCmd )
     }
 
     // Remove the Mac command element from MacCommandList
-    if( LinkedListRemove( &NvmCtx.MacCommandList, macCmd ) == false )
+    if( LinkedListRemove( &CommandsCtx.MacCommandList, macCmd ) == false )
     {
         return LORAMAC_COMMANDS_ERROR_CMD_NOT_FOUND;
     }
 
-    NvmCtx.SerializedCmdsSize -= ( CID_FIELD_SIZE + macCmd->PayloadSize );
+    CommandsCtx.SerializedCmdsSize -= ( CID_FIELD_SIZE + macCmd->PayloadSize );
 
     // Free the MacCommand Slot
     if( FreeMacCommandSlot( macCmd ) == false )
@@ -399,8 +358,6 @@ LoRaMacCommandStatus_t LoRaMacCommandsRemoveCmd( MacCommand_t* macCmd )
         return LORAMAC_COMMANDS_ERROR;
     }
 
-    NvmCtxCallback( );
-
     return LORAMAC_COMMANDS_SUCCESS;
 }
 
@@ -409,7 +366,7 @@ LoRaMacCommandStatus_t LoRaMacCommandsGetCmd( uint8_t cid, MacCommand_t** macCmd
     MacCommand_t* curElement;
 
     // Start at the head of the list
-    curElement = NvmCtx.MacCommandList.First;
+    curElement = CommandsCtx.MacCommandList.First;
 
     // Loop through all elements until we find the element with the given CID
     while( ( curElement != NULL ) && ( curElement->CID != cid ) )
@@ -434,7 +391,7 @@ LoRaMacCommandStatus_t LoRaMacCommandsRemoveNoneStickyCmds( void )
     MacCommand_t* nexElement;
 
     // Start at the head of the list
-    curElement = NvmCtx.MacCommandList.First;
+    curElement = CommandsCtx.MacCommandList.First;
 
     // Loop through all elements
     while( curElement != NULL )
@@ -451,8 +408,6 @@ LoRaMacCommandStatus_t LoRaMacCommandsRemoveNoneStickyCmds( void )
         }
     }
 
-    NvmCtxCallback( );
-
     return LORAMAC_COMMANDS_SUCCESS;
 }
 
@@ -462,7 +417,7 @@ LoRaMacCommandStatus_t LoRaMacCommandsRemoveStickyAnsCmds( void )
     MacCommand_t* nexElement;
 
     // Start at the head of the list
-    curElement = NvmCtx.MacCommandList.First;
+    curElement = CommandsCtx.MacCommandList.First;
 
     // Loop through all elements
     while( curElement != NULL )
@@ -475,8 +430,6 @@ LoRaMacCommandStatus_t LoRaMacCommandsRemoveStickyAnsCmds( void )
         curElement = nexElement;
     }
 
-    NvmCtxCallback( );
-
     return LORAMAC_COMMANDS_SUCCESS;
 }
 
@@ -486,13 +439,13 @@ LoRaMacCommandStatus_t LoRaMacCommandsGetSizeSerializedCmds( size_t* size )
     {
         return LORAMAC_COMMANDS_ERROR_NPE;
     }
-    *size = NvmCtx.SerializedCmdsSize;
+    *size = CommandsCtx.SerializedCmdsSize;
     return LORAMAC_COMMANDS_SUCCESS;
 }
 
 LoRaMacCommandStatus_t LoRaMacCommandsSerializeCmds( size_t availableSize, size_t* effectiveSize, uint8_t* buffer )
 {
-    MacCommand_t* curElement = NvmCtx.MacCommandList.First;
+    MacCommand_t* curElement = CommandsCtx.MacCommandList.First;
     MacCommand_t* nextElement;
     uint8_t itr = 0;
 
@@ -540,7 +493,7 @@ LoRaMacCommandStatus_t LoRaMacCommandsStickyCmdsPending( bool* cmdsPending )
         return LORAMAC_COMMANDS_ERROR_NPE;
     }
     MacCommand_t* curElement;
-    curElement = NvmCtx.MacCommandList.First;
+    curElement = CommandsCtx.MacCommandList.First;
 
     *cmdsPending = false;
 
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.h b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.h
index 2452efe7..c6f76aaf 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.h
@@ -119,30 +119,9 @@ typedef void ( *LoRaMacCommandsNvmEvent )( void );
 /*!
  * \brief Initialization of LoRaMac MAC commands module
  *
- * \param[IN]    commandsNvmCtxChanged - Callback function which will be called when the
- *                                      non-volatile context needs to be saved.
- *
  * \retval                            - Status of the operation
  */
-LoRaMacCommandStatus_t LoRaMacCommandsInit( LoRaMacCommandsNvmEvent commandsNvmCtxChanged );
-
-/*!
- * Restores the internal non-volatile context from passed pointer.
- *
- * \param[IN]     commandsNvmCtx     - Pointer to non-volatile MAC commands module context to be restored.
- *
- * \retval                     - Status of the operation
- */
-LoRaMacCommandStatus_t LoRaMacCommandsRestoreNvmCtx( void* commandsNvmCtx );
-
-/*!
- * Returns a pointer to the internal non-volatile context.
- *
- * \param[IN]     commandsNvmCtxSize - Size of the module non-volatile context
- *
- * \retval                    - Points to a structure where the module store its non-volatile context
- */
-void* LoRaMacCommandsGetNvmCtx( size_t* commandsNvmCtxSize );
+LoRaMacCommandStatus_t LoRaMacCommandsInit( void );
 
 /*!
  * \brief Adds a new MAC command to be sent.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c
index 1929b03a..3cc85360 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c
@@ -41,7 +41,7 @@
 /*
  * LoRaMac Confirm Queue Context NVM structure
  */
-typedef struct sLoRaMacConfirmQueueNvmCtx
+typedef struct sLoRaMacConfirmQueueNvmData
 {
     /*!
     * MlmeConfirm queue data structure
@@ -55,7 +55,7 @@ typedef struct sLoRaMacConfirmQueueNvmCtx
     * Variable which holds a common status
     */
     LoRaMacEventInfoStatus_t CommonStatus;
-} LoRaMacConfirmQueueNvmCtx_t;
+} LoRaMacConfirmQueueNvmData_t;
 
 /*
  * LoRaMac Confirm Queue Context structure
@@ -74,21 +74,12 @@ typedef struct sLoRaMacConfirmQueueCtx
     * Pointer to the last element of the ring buffer
     */
     MlmeConfirmQueue_t* BufferEnd;
-    /*
-     * Callback function to notify the upper layer about context change
-     */
-    LoRaMacConfirmQueueNvmEvent LoRaMacConfirmQueueNvmEvent;
     /*!
     * Non-volatile module context.
     */
-    LoRaMacConfirmQueueNvmCtx_t* ConfirmQueueNvmCtx;
+    LoRaMacConfirmQueueNvmData_t Nvm;
 } LoRaMacConfirmQueueCtx_t;
 
-/*
- * Non-volatile module context.
- */
-static LoRaMacConfirmQueueNvmCtx_t ConfirmQueueNvmCtx;
-
 /*
  * Module context.
  */
@@ -96,10 +87,10 @@ static LoRaMacConfirmQueueCtx_t ConfirmQueueCtx;
 
 static MlmeConfirmQueue_t* IncreaseBufferPointer( MlmeConfirmQueue_t* bufferPointer )
 {
-    if( bufferPointer == &ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueue[LORA_MAC_MLME_CONFIRM_QUEUE_LEN - 1] )
+    if( bufferPointer == &ConfirmQueueCtx.Nvm.MlmeConfirmQueue[LORA_MAC_MLME_CONFIRM_QUEUE_LEN - 1] )
     {
         // Reset to the first element
-        bufferPointer = ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueue;
+        bufferPointer = ConfirmQueueCtx.Nvm.MlmeConfirmQueue;
     }
     else
     {
@@ -111,10 +102,10 @@ static MlmeConfirmQueue_t* IncreaseBufferPointer( MlmeConfirmQueue_t* bufferPoin
 
 static MlmeConfirmQueue_t* DecreaseBufferPointer( MlmeConfirmQueue_t* bufferPointer )
 {
-    if( bufferPointer == ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueue )
+    if( bufferPointer == ConfirmQueueCtx.Nvm.MlmeConfirmQueue )
     {
         // Reset to the last element
-        bufferPointer = &ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueue[LORA_MAC_MLME_CONFIRM_QUEUE_LEN - 1];
+        bufferPointer = &ConfirmQueueCtx.Nvm.MlmeConfirmQueue[LORA_MAC_MLME_CONFIRM_QUEUE_LEN - 1];
     }
     else
     {
@@ -145,12 +136,12 @@ static MlmeConfirmQueue_t* GetElement( Mlme_t request, MlmeConfirmQueue_t* buffe
 {
     MlmeConfirmQueue_t* element = bufferStart;
 
-    if( IsListEmpty( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt ) == true )
+    if( IsListEmpty( ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt ) == true )
     {
         return NULL;
     }
 
-    for( uint8_t elementCnt = 0; elementCnt < ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt; elementCnt++ )
+    for( uint8_t elementCnt = 0; elementCnt < ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt; elementCnt++ )
     {
         if( element->Request == request )
         {
@@ -163,52 +154,26 @@ static MlmeConfirmQueue_t* GetElement( Mlme_t request, MlmeConfirmQueue_t* buffe
     return NULL;
 }
 
-void LoRaMacConfirmQueueInit( LoRaMacPrimitives_t* primitives, LoRaMacConfirmQueueNvmEvent confirmQueueNvmCtxChanged )
+void LoRaMacConfirmQueueInit( LoRaMacPrimitives_t* primitives )
 {
     ConfirmQueueCtx.Primitives = primitives;
 
-    // Assign nvm context
-    ConfirmQueueCtx.ConfirmQueueNvmCtx = &ConfirmQueueNvmCtx;
-
     // Init counter
-    ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt = 0;
+    ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt = 0;
 
     // Init buffer
-    ConfirmQueueCtx.BufferStart = ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueue;
-    ConfirmQueueCtx.BufferEnd = ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueue;
+    ConfirmQueueCtx.BufferStart = ConfirmQueueCtx.Nvm.MlmeConfirmQueue;
+    ConfirmQueueCtx.BufferEnd = ConfirmQueueCtx.Nvm.MlmeConfirmQueue;
 
-    memset1( ( uint8_t* )ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueue, 0xFF, sizeof( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueue ) );
+    memset1( ( uint8_t* )ConfirmQueueCtx.Nvm.MlmeConfirmQueue, 0xFF, sizeof( ConfirmQueueCtx.Nvm.MlmeConfirmQueue ) );
 
     // Common status
-    ConfirmQueueCtx.ConfirmQueueNvmCtx->CommonStatus = LORAMAC_EVENT_INFO_STATUS_ERROR;
-
-    // Assign callback
-    ConfirmQueueCtx.LoRaMacConfirmQueueNvmEvent = confirmQueueNvmCtxChanged;
-}
-
-bool LoRaMacConfirmQueueRestoreNvmCtx( void* confirmQueueNvmCtx )
-{
-    // Restore module context
-    if( confirmQueueNvmCtx != NULL )
-    {
-        memcpy1( ( uint8_t* )&ConfirmQueueNvmCtx, ( uint8_t* ) confirmQueueNvmCtx, sizeof( ConfirmQueueNvmCtx ) );
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-void* LoRaMacConfirmQueueGetNvmCtx( size_t* confirmQueueNvmCtxSize )
-{
-    *confirmQueueNvmCtxSize = sizeof( ConfirmQueueNvmCtx );
-    return &ConfirmQueueNvmCtx;
+    ConfirmQueueCtx.Nvm.CommonStatus = LORAMAC_EVENT_INFO_STATUS_ERROR;
 }
 
 bool LoRaMacConfirmQueueAdd( MlmeConfirmQueue_t* mlmeConfirm )
 {
-    if( IsListFull( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt ) == true )
+    if( IsListFull( ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt ) == true )
     {
         // Protect the buffer against overwrites
         return false;
@@ -220,7 +185,7 @@ bool LoRaMacConfirmQueueAdd( MlmeConfirmQueue_t* mlmeConfirm )
     ConfirmQueueCtx.BufferEnd->RestrictCommonReadyToHandle = mlmeConfirm->RestrictCommonReadyToHandle;
     ConfirmQueueCtx.BufferEnd->ReadyToHandle = false;
     // Increase counter
-    ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt++;
+    ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt++;
     // Update end pointer
     ConfirmQueueCtx.BufferEnd = IncreaseBufferPointer( ConfirmQueueCtx.BufferEnd );
 
@@ -229,13 +194,13 @@ bool LoRaMacConfirmQueueAdd( MlmeConfirmQueue_t* mlmeConfirm )
 
 bool LoRaMacConfirmQueueRemoveLast( void )
 {
-    if( IsListEmpty( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt ) == true )
+    if( IsListEmpty( ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt ) == true )
     {
         return false;
     }
 
     // Increase counter
-    ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt--;
+    ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt--;
     // Update start pointer
     ConfirmQueueCtx.BufferEnd = DecreaseBufferPointer( ConfirmQueueCtx.BufferEnd );
 
@@ -244,13 +209,13 @@ bool LoRaMacConfirmQueueRemoveLast( void )
 
 bool LoRaMacConfirmQueueRemoveFirst( void )
 {
-    if( IsListEmpty( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt ) == true )
+    if( IsListEmpty( ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt ) == true )
     {
         return false;
     }
 
     // Increase counter
-    ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt--;
+    ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt--;
     // Update start pointer
     ConfirmQueueCtx.BufferStart = IncreaseBufferPointer( ConfirmQueueCtx.BufferStart );
 
@@ -261,7 +226,7 @@ void LoRaMacConfirmQueueSetStatus( LoRaMacEventInfoStatus_t status, Mlme_t reque
 {
     MlmeConfirmQueue_t* element = NULL;
 
-    if( IsListEmpty( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt ) == false )
+    if( IsListEmpty( ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt ) == false )
     {
         element = GetElement( request, ConfirmQueueCtx.BufferStart, ConfirmQueueCtx.BufferEnd );
         if( element != NULL )
@@ -276,7 +241,7 @@ LoRaMacEventInfoStatus_t LoRaMacConfirmQueueGetStatus( Mlme_t request )
 {
     MlmeConfirmQueue_t* element = NULL;
 
-    if( IsListEmpty( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt ) == false )
+    if( IsListEmpty( ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt ) == false )
     {
         element = GetElement( request, ConfirmQueueCtx.BufferStart, ConfirmQueueCtx.BufferEnd );
         if( element != NULL )
@@ -291,9 +256,9 @@ void LoRaMacConfirmQueueSetStatusCmn( LoRaMacEventInfoStatus_t status )
 {
     MlmeConfirmQueue_t* element = ConfirmQueueCtx.BufferStart;
 
-    ConfirmQueueCtx.ConfirmQueueNvmCtx->CommonStatus = status;
+    ConfirmQueueCtx.Nvm.CommonStatus = status;
 
-    if( IsListEmpty( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt ) == false )
+    if( IsListEmpty( ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt ) == false )
     {
         do
         {
@@ -311,7 +276,7 @@ void LoRaMacConfirmQueueSetStatusCmn( LoRaMacEventInfoStatus_t status )
 
 LoRaMacEventInfoStatus_t LoRaMacConfirmQueueGetStatusCmn( void )
 {
-    return ConfirmQueueCtx.ConfirmQueueNvmCtx->CommonStatus;
+    return ConfirmQueueCtx.Nvm.CommonStatus;
 }
 
 bool LoRaMacConfirmQueueIsCmdActive( Mlme_t request )
@@ -325,7 +290,7 @@ bool LoRaMacConfirmQueueIsCmdActive( Mlme_t request )
 
 void LoRaMacConfirmQueueHandleCb( MlmeConfirm_t* mlmeConfirm )
 {
-    uint8_t nbElements = ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt;
+    uint8_t nbElements = ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt;
     bool readyToHandle = false;
     MlmeConfirmQueue_t mlmeConfirmToStore;
 
@@ -360,12 +325,12 @@ void LoRaMacConfirmQueueHandleCb( MlmeConfirm_t* mlmeConfirm )
 
 uint8_t LoRaMacConfirmQueueGetCnt( void )
 {
-    return ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt;
+    return ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt;
 }
 
 bool LoRaMacConfirmQueueIsFull( void )
 {
-    if( IsListFull( ConfirmQueueCtx.ConfirmQueueNvmCtx->MlmeConfirmQueueCnt ) == true )
+    if( IsListFull( ConfirmQueueCtx.Nvm.MlmeConfirmQueueCnt ) == true )
     {
         return true;
     }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.h b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.h
index b572be4f..8adbe4b9 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.h
@@ -78,39 +78,12 @@ typedef struct sMlmeConfirmQueue
     bool RestrictCommonReadyToHandle;
 }MlmeConfirmQueue_t;
 
-/*!
- * Signature of callback function to be called by this module when the
- * non-volatile needs to be saved.
- */
-typedef void ( *LoRaMacConfirmQueueNvmEvent )( void );
-
 /*!
  * \brief   Initializes the confirm queue
  *
  * \param   [IN] primitives - Pointer to the LoRaMac primitives.
- *
- * \param   [IN] confirmQueueNvmCtxChanged - Callback function which will be called when the
- *                                           non-volatile context needs to be saved.
- */
-void LoRaMacConfirmQueueInit( LoRaMacPrimitives_t* primitives, LoRaMacConfirmQueueNvmEvent confirmQueueNvmCtxChanged  );
-
-/*!
- * Restores the internal non-volatile context from passed pointer.
- *
- * \param   [IN] confirmQueueNvmCtx - Pointer to non-volatile class B module context to be restored.
- *
- * \retval  [true - operation was successful, false - operation failed]
- */
-bool LoRaMacConfirmQueueRestoreNvmCtx( void* confirmQueueNvmCtx );
-
-/*!
- * Returns a pointer to the internal non-volatile context.
- *
- * \param   [IN] confirmQueueNvmCtxSize - Size of the module non-volatile context
- *
- * \retval  - Points to a structure where the module store its non-volatile context
  */
-void* LoRaMacConfirmQueueGetNvmCtx( size_t* confirmQueueNvmCtxSize );
+void LoRaMacConfirmQueueInit( LoRaMacPrimitives_t* primitive );
 
 /*!
  * \brief   Adds an element to the confirm queue.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c
index 84c8a500..a47731f7 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c
@@ -30,6 +30,16 @@
  *
  * \author    Johannes Bruder ( STACKFORCE )
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    LoRaMacCrypto.c
+  * @author  MCD Application Team
+  * @brief   LoRa MAC layer cryptography implementation
+  ******************************************************************************
+  */
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -56,20 +66,12 @@
  */
 #define MIC_BLOCK_BX_SIZE               16
 
+/* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
 /*
  * Number of security context entries
  */
 #define NUM_OF_SEC_CTX                  LORAMAC_MAX_MC_CTX + 1
-
-/*
- * Size of the module context
- */
-#define CRYPTO_CTX_SIZE                 sizeof( LoRaMacCryptoCtx_t )
-
-/*
- * Size of the module non volatile context
- */
-#define CRYPTO_NVM_CTX_SIZE             sizeof( LoRaMacCryptoNvmCtx_t )
+/* ST_WORKAROUND_END */
 
 /*
  * Maximum size of the message that can be handled by the crypto operations
@@ -81,108 +83,6 @@
  */
 #define CRYPTO_BUFFER_SIZE              CRYPTO_MAXMESSAGE_SIZE + MIC_BLOCK_BX_SIZE
 
-/*!
- * LoRaWAN Frame counter list.
- */
-typedef struct sFCntList
-{
-    /*!
-     * Uplink frame counter which is incremented with each uplink.
-     */
-    uint32_t FCntUp;
-    /*!
-     * Network downlink frame counter which is incremented with each downlink on FPort 0
-     * or when the FPort field is missing.
-     */
-    uint32_t NFCntDown;
-    /*!
-     * Application downlink frame counter which is incremented with each downlink
-     * on a port different than 0.
-     */
-    uint32_t AFCntDown;
-    /*!
-     * In case if the device is connected to a LoRaWAN 1.0 Server,
-     * this counter is used for every kind of downlink frame.
-     */
-    uint32_t FCntDown;
-    /*!
-     * Multicast downlink counter for index 0
-     */
-    uint32_t McFCntDown0;
-#if ( LORAMAC_MAX_MC_CTX > 1 )
-    /*!
-     * Multicast downlink counter for index 1
-     */
-    uint32_t McFCntDown1;
-    /*!
-     * Multicast downlink counter for index 2
-     */
-    uint32_t McFCntDown2;
-    /*!
-     * Multicast downlink counter for index 3
-     */
-    uint32_t McFCntDown3;
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-    /*
-     * RJcount1 is a counter incremented with every Rejoin request Type 1 frame transmitted.
-     */
-    uint16_t RJcount1;
-#endif
-}FCntList_t;
-
-/*
- * LoRaMac Crypto Non Volatile Context structure
- */
-typedef struct sLoRaMacCryptoNvmCtx
-{
-    /*
-     * Stores the information if the device is connected to a LoRaWAN network
-     * server with prior to 1.1.0 implementation.
-     */
-    Version_t LrWanVersion;
-    /*
-     * Device nonce is a counter starting at 0 when the device is initially
-     * powered up and incremented with every JoinRequest.
-     */
-    uint16_t DevNonce;
-    /*
-     * JoinNonce is a device specific counter value (that never repeats itself)
-     * provided by the join server and incremented with every JoinAccept message.
-     */
-    uint32_t JoinNonce;
-    /*
-     * Frame counter list
-     */
-    FCntList_t FCntList;
-    /*
-     * LastDownFCnt stores the information which frame counter was used to unsecure the last frame.
-     * This information is needed to compute ConfFCnt in B1 block for the MIC.
-     */
-    uint32_t* LastDownFCnt;
-}LoRaMacCryptoNvmCtx_t;
-
-/*
- * LoRaMac Crypto Context structure
- */
-typedef struct sLoRaMacCryptoCtx
-{
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-    /*
-     * RJcount0 is a counter incremented with every Type 0 or 2 Rejoin frame transmitted.
-     */
-    uint16_t RJcount0;
-#endif
-    /*
-     * Non volatile module context structure
-     */
-    LoRaMacCryptoNvmCtx_t* NvmCtx;
-    /*
-     * Callback function to notify the upper layer about context change
-     */
-    LoRaMacCryptoNvmEvent EventCryptoNvmCtxChanged;
-}LoRaMacCryptoCtx_t;
-
 /*
  * Key-Address item
  */
@@ -206,38 +106,44 @@ typedef struct sKeyAddr
     KeyIdentifier_t RootKey;
 }KeyAddr_t;
 
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
 /*
- *Crypto module context.
+ * RJcount0 is a counter incremented with every Type 0 or 2 Rejoin frame transmitted.
  */
-static LoRaMacCryptoCtx_t CryptoCtx;
+static uint16_t RJcount0;
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
 
 /*
  * Non volatile module context.
  */
-static LoRaMacCryptoNvmCtx_t NvmCryptoCtx;
+static LoRaMacCryptoNvmData_t* CryptoNvm;
 
 /*
  * Key-Address list
  */
 static KeyAddr_t KeyAddrList[NUM_OF_SEC_CTX] =
     {
+/* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+#if ( LORAMAC_MAX_MC_CTX > 0 )
         { MULTICAST_0_ADDR, MC_APP_S_KEY_0, MC_NWK_S_KEY_0, MC_KEY_0 },
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
 #if ( LORAMAC_MAX_MC_CTX > 1 )
         { MULTICAST_1_ADDR, MC_APP_S_KEY_1, MC_NWK_S_KEY_1, MC_KEY_1 },
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
         { MULTICAST_2_ADDR, MC_APP_S_KEY_2, MC_NWK_S_KEY_2, MC_KEY_2 },
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
         { MULTICAST_3_ADDR, MC_APP_S_KEY_3, MC_NWK_S_KEY_3, MC_KEY_3 },
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
+/* ST_WORKAROUND_END */
+#if ( USE_LRWAN_1_1_X_CRYPTO == 1 ) /* ST_WORKAROUND: integrate 1.1.x keys only if required */
         { UNICAST_DEV_ADDR, APP_S_KEY, S_NWK_S_INT_KEY, NO_KEY }
 #else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
         { UNICAST_DEV_ADDR, APP_S_KEY, NWK_S_KEY, NO_KEY }
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
     };
 
-/*
- * Local functions
- */
-
 /*
  * Encrypts the payload
  *
@@ -295,7 +201,7 @@ static LoRaMacCryptoStatus_t PayloadEncrypt( uint8_t* buffer, int16_t size, KeyI
     return LORAMAC_CRYPTO_SUCCESS;
 }
 
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
 /*
  * Encrypts the FOpts
  *
@@ -320,7 +226,7 @@ static LoRaMacCryptoStatus_t FOptsEncrypt( uint16_t size, uint32_t address, uint
 
     aBlock[0] = 0x01;
 
-    if( CryptoCtx.NvmCtx->LrWanVersion.Value > 0x01010000 )
+    if( CryptoNvm->LrWanVersion.Value > 0x01010000 )
     {
         // Introduced in LoRaWAN 1.1.1 specification
         switch( fCntID )
@@ -357,7 +263,7 @@ static LoRaMacCryptoStatus_t FOptsEncrypt( uint16_t size, uint32_t address, uint
     aBlock[12] = ( frameCounter >> 16 ) & 0xFF;
     aBlock[13] = ( frameCounter >> 24 ) & 0xFF;
 
-    if( CryptoCtx.NvmCtx->LrWanVersion.Value > 0x01010000 )
+    if( CryptoNvm->LrWanVersion.Value > 0x01010000 )
     {
         // Introduced in LoRaWAN 1.1.1 specification
         aBlock[15] = 0x01;
@@ -377,7 +283,7 @@ static LoRaMacCryptoStatus_t FOptsEncrypt( uint16_t size, uint32_t address, uint
 
     return LORAMAC_CRYPTO_SUCCESS;
 }
-#endif
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
 
 /*
  * Prepares B0 block for cmac computation.
@@ -399,21 +305,21 @@ static LoRaMacCryptoStatus_t PrepareB0( uint16_t msgLen, KeyIdentifier_t keyID,
     }
 
     b0[0] = 0x49;
-/* ST_WORAROUND_BEGIN: These bytes are only used for the LRWAN 1.1.x */
+    /* ST_WORAROUND_BEGIN: These bytes are only used for the LRWAN 1.1.x */
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
     if( ( isAck == true ) && ( dir == DOWNLINK ) )
     {
         // confFCnt contains the frame counter value modulo 2^16 of the "confirmed" uplink or downlink frame that is being acknowledged
         uint16_t confFCnt = 0;
 
-        confFCnt = ( uint16_t )( CryptoCtx.NvmCtx->FCntList.FCntUp % 65536 );
+        confFCnt = ( uint16_t )( CryptoNvm->FCntList.FCntUp % 65536 );
 
         b0[1] = confFCnt & 0xFF;
         b0[2] = ( confFCnt >> 8 ) & 0xFF;
     }
     else
 #endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
-/* ST_WORAROUND_END */
+    /* ST_WORAROUND_END */
     {
         b0[1] = 0x00;
         b0[2] = 0x00;
@@ -527,7 +433,7 @@ static LoRaMacCryptoStatus_t VerifyCmacB0( uint8_t* msg, uint16_t len, KeyIdenti
     return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
 }
 
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
 /*
  * Prpares B1 block for cmac computation.
  *
@@ -553,7 +459,7 @@ static LoRaMacCryptoStatus_t PrepareB1( uint16_t msgLen, KeyIdentifier_t keyID,
     if( isAck == true )
     {
         // confFCnt contains the frame counter value modulo 2^16 of the "confirmed" uplink frame that is being acknowledged
-        uint16_t confFCnt = ( uint16_t )( *CryptoCtx.NvmCtx->LastDownFCnt % 65536 );
+        uint16_t confFCnt = ( uint16_t )( *CryptoNvm->LastDownFCnt % 65536 );
         b1[1] = confFCnt & 0xFF;
         b1[2] = ( confFCnt >> 8 ) & 0xFF;
     }
@@ -622,7 +528,7 @@ static LoRaMacCryptoStatus_t ComputeCmacB1( uint8_t* msg, uint16_t len, KeyIdent
     }
     return LORAMAC_CRYPTO_SUCCESS;
 }
-#endif
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
 
 /*
  * Gets security item from list.
@@ -653,15 +559,11 @@ static LoRaMacCryptoStatus_t GetKeyAddrItem( AddressIdentifier_t addrID, KeyAddr
  * \param[IN]  deviceNonce    - Device nonce
  * \retval                    - Status of the operation
  */
-static LoRaMacCryptoStatus_t DeriveSessionKey10x( KeyIdentifier_t keyID, uint8_t* joinNonce, uint8_t* netID, uint8_t* devNonce )
+static LoRaMacCryptoStatus_t DeriveSessionKey10x( KeyIdentifier_t keyID, uint32_t joinNonce, uint32_t netID, uint16_t devNonce )
 {
-    if( ( joinNonce == 0 ) || ( netID == 0 ) || ( devNonce == 0 ) )
-    {
-        return LORAMAC_CRYPTO_ERROR_NPE;
-    }
-
     uint8_t compBase[16] = { 0 };
 
+    /* ST_WORKAROUND_BEGIN: integrate 1.1.x keys only if required */
     switch( keyID )
     {
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
@@ -679,12 +581,20 @@ static LoRaMacCryptoStatus_t DeriveSessionKey10x( KeyIdentifier_t keyID, uint8_t
         default:
             return LORAMAC_CRYPTO_ERROR_INVALID_KEY_ID;
     }
+   /* ST_WORKAROUND_END */
+
+    compBase[1] = ( uint8_t )( ( joinNonce >> 0 ) & 0xFF );
+    compBase[2] = ( uint8_t )( ( joinNonce >> 8 ) & 0xFF );
+    compBase[3] = ( uint8_t )( ( joinNonce >> 16 ) & 0xFF );
+
+    compBase[4] = ( uint8_t )( ( netID >> 0 ) & 0xFF );
+    compBase[5] = ( uint8_t )( ( netID >> 8 ) & 0xFF );
+    compBase[6] = ( uint8_t )( ( netID >> 16 ) & 0xFF );
 
-    memcpy1( compBase + 1, joinNonce, 3 );
-    memcpy1( compBase + 4, netID, 3 );
-    memcpy1( compBase + 7, devNonce, 2 );
+    compBase[7] = ( uint8_t )( ( devNonce >> 0 ) & 0xFF );
+    compBase[8] = ( uint8_t )( ( devNonce >> 8 ) & 0xFF );
 
-    if( SecureElementDeriveAndStoreKey( CryptoCtx.NvmCtx->LrWanVersion, compBase, NWK_KEY, keyID ) != SECURE_ELEMENT_SUCCESS )
+    if( SecureElementDeriveAndStoreKey( compBase, NWK_KEY, keyID ) != SECURE_ELEMENT_SUCCESS )
     {
         return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
     }
@@ -692,7 +602,7 @@ static LoRaMacCryptoStatus_t DeriveSessionKey10x( KeyIdentifier_t keyID, uint8_t
     return LORAMAC_CRYPTO_SUCCESS;
 }
 
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
 /*
  * Derives a session key as of LoRaWAN 1.1.0
  *
@@ -702,9 +612,9 @@ static LoRaMacCryptoStatus_t DeriveSessionKey10x( KeyIdentifier_t keyID, uint8_t
  * \param[IN]  deviceNonce    - Device nonce
  * \retval                    - Status of the operation
  */
-static LoRaMacCryptoStatus_t DeriveSessionKey11x( KeyIdentifier_t keyID, uint8_t* joinNonce, uint8_t* joinEUI, uint8_t* devNonce )
+static LoRaMacCryptoStatus_t DeriveSessionKey11x( KeyIdentifier_t keyID, uint32_t joinNonce, uint8_t* joinEUI, uint16_t devNonce )
 {
-    if( ( joinNonce == 0 ) || ( joinEUI == 0 ) || ( devNonce == 0 ) )
+    if( joinEUI == 0 )
     {
         return LORAMAC_CRYPTO_ERROR_NPE;
     }
@@ -731,11 +641,16 @@ static LoRaMacCryptoStatus_t DeriveSessionKey11x( KeyIdentifier_t keyID, uint8_t
             return LORAMAC_CRYPTO_ERROR_INVALID_KEY_ID;
     }
 
-    memcpy1( compBase + 1, joinNonce, 3 );
+    compBase[1] = ( uint8_t )( ( joinNonce >> 0 ) & 0xFF );
+    compBase[2] = ( uint8_t )( ( joinNonce >> 8 ) & 0xFF );
+    compBase[3] = ( uint8_t )( ( joinNonce >> 16 ) & 0xFF );
+
     memcpyr( compBase + 4, joinEUI, 8 );
-    memcpy1( compBase + 12, devNonce, 2 );
 
-    if( SecureElementDeriveAndStoreKey( CryptoCtx.NvmCtx->LrWanVersion, compBase, rootKeyId, keyID ) != SECURE_ELEMENT_SUCCESS )
+    compBase[12] = ( uint8_t )( ( devNonce >> 0 ) & 0xFF );
+    compBase[13] = ( uint8_t )( ( devNonce >> 8 ) & 0xFF );
+
+    if( SecureElementDeriveAndStoreKey( compBase, rootKeyId, keyID ) != SECURE_ELEMENT_SUCCESS )
     {
         return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
     }
@@ -773,14 +688,14 @@ static LoRaMacCryptoStatus_t DeriveLifeTimeSessionKey( KeyIdentifier_t keyID, ui
 
     memcpyr( compBase + 1, devEUI, 8 );
 
-    if( SecureElementDeriveAndStoreKey( CryptoCtx.NvmCtx->LrWanVersion, compBase, NWK_KEY, keyID ) != SECURE_ELEMENT_SUCCESS )
+    if( SecureElementDeriveAndStoreKey( compBase, NWK_KEY, keyID ) != SECURE_ELEMENT_SUCCESS )
     {
         return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
     }
 
     return LORAMAC_CRYPTO_SUCCESS;
 }
-#endif
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
 
 /*
  * Gets the last received frame counter
@@ -799,31 +714,37 @@ static LoRaMacCryptoStatus_t GetLastFcntDown( FCntIdentifier_t fCntID, uint32_t*
     switch( fCntID )
     {
         case N_FCNT_DOWN:
-            *lastDown = CryptoCtx.NvmCtx->FCntList.NFCntDown;
-            CryptoCtx.NvmCtx->LastDownFCnt = &CryptoCtx.NvmCtx->FCntList.NFCntDown;
+            *lastDown = CryptoNvm->FCntList.NFCntDown;
+            CryptoNvm->LastDownFCnt = CryptoNvm->FCntList.NFCntDown;
             break;
         case A_FCNT_DOWN:
-            *lastDown = CryptoCtx.NvmCtx->FCntList.AFCntDown;
-            CryptoCtx.NvmCtx->LastDownFCnt = &CryptoCtx.NvmCtx->FCntList.AFCntDown;
+            *lastDown = CryptoNvm->FCntList.AFCntDown;
+            CryptoNvm->LastDownFCnt = CryptoNvm->FCntList.AFCntDown;
             break;
         case FCNT_DOWN:
-            *lastDown = CryptoCtx.NvmCtx->FCntList.FCntDown;
-            CryptoCtx.NvmCtx->LastDownFCnt = &CryptoCtx.NvmCtx->FCntList.FCntDown;
+            *lastDown = CryptoNvm->FCntList.FCntDown;
+            CryptoNvm->LastDownFCnt = CryptoNvm->FCntList.FCntDown;
             break;
+#if ( LORAMAC_MAX_MC_CTX > 0 )
         case MC_FCNT_DOWN_0:
-            *lastDown = CryptoCtx.NvmCtx->FCntList.McFCntDown0;
+            *lastDown = CryptoNvm->FCntList.McFCntDown[0];
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
 #if ( LORAMAC_MAX_MC_CTX > 1 )
         case MC_FCNT_DOWN_1:
-            *lastDown = CryptoCtx.NvmCtx->FCntList.McFCntDown1;
+            *lastDown = CryptoNvm->FCntList.McFCntDown[1];
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
         case MC_FCNT_DOWN_2:
-            *lastDown = CryptoCtx.NvmCtx->FCntList.McFCntDown2;
+            *lastDown = CryptoNvm->FCntList.McFCntDown[2];
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
         case MC_FCNT_DOWN_3:
-            *lastDown = CryptoCtx.NvmCtx->FCntList.McFCntDown3;
+            *lastDown = CryptoNvm->FCntList.McFCntDown[3];
             break;
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
         default:
             return LORAMAC_CRYPTO_FAIL_FCNT_ID;
     }
@@ -870,32 +791,37 @@ static void UpdateFCntDown( FCntIdentifier_t fCntID, uint32_t currentDown )
     switch( fCntID )
     {
         case N_FCNT_DOWN:
-            CryptoCtx.NvmCtx->FCntList.NFCntDown = currentDown;
+            CryptoNvm->FCntList.NFCntDown = currentDown;
             break;
         case A_FCNT_DOWN:
-            CryptoCtx.NvmCtx->FCntList.AFCntDown = currentDown;
+            CryptoNvm->FCntList.AFCntDown = currentDown;
             break;
         case FCNT_DOWN:
-            CryptoCtx.NvmCtx->FCntList.FCntDown = currentDown;
+            CryptoNvm->FCntList.FCntDown = currentDown;
             break;
+#if ( LORAMAC_MAX_MC_CTX > 0 )
         case MC_FCNT_DOWN_0:
-            CryptoCtx.NvmCtx->FCntList.McFCntDown0 = currentDown;
+            CryptoNvm->FCntList.McFCntDown[0] = currentDown;
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
 #if ( LORAMAC_MAX_MC_CTX > 1 )
         case MC_FCNT_DOWN_1:
-            CryptoCtx.NvmCtx->FCntList.McFCntDown1 = currentDown;
+            CryptoNvm->FCntList.McFCntDown[1] = currentDown;
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
         case MC_FCNT_DOWN_2:
-            CryptoCtx.NvmCtx->FCntList.McFCntDown2 = currentDown;
+            CryptoNvm->FCntList.McFCntDown[2] = currentDown;
             break;
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
         case MC_FCNT_DOWN_3:
-            CryptoCtx.NvmCtx->FCntList.McFCntDown3 = currentDown;
+            CryptoNvm->FCntList.McFCntDown[3] = currentDown;
             break;
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
         default:
             break;
     }
-    CryptoCtx.EventCryptoNvmCtxChanged( );
 }
 
 /*!
@@ -903,57 +829,39 @@ static void UpdateFCntDown( FCntIdentifier_t fCntID, uint32_t currentDown )
  */
 static void ResetFCnts( void )
 {
+    CryptoNvm->FCntList.FCntUp = 0;
+    CryptoNvm->FCntList.NFCntDown = FCNT_DOWN_INITAL_VALUE;
+    CryptoNvm->FCntList.AFCntDown = FCNT_DOWN_INITAL_VALUE;
+    CryptoNvm->FCntList.FCntDown = FCNT_DOWN_INITAL_VALUE;
+    CryptoNvm->LastDownFCnt = CryptoNvm->FCntList.FCntDown;
 
-    CryptoCtx.NvmCtx->FCntList.FCntUp = 0;
-    CryptoCtx.NvmCtx->FCntList.NFCntDown = FCNT_DOWN_INITAL_VALUE;
-    CryptoCtx.NvmCtx->FCntList.AFCntDown = FCNT_DOWN_INITAL_VALUE;
-    CryptoCtx.NvmCtx->FCntList.FCntDown = FCNT_DOWN_INITAL_VALUE;
-    CryptoCtx.NvmCtx->LastDownFCnt = &CryptoCtx.NvmCtx->FCntList.FCntDown;
-
-    CryptoCtx.NvmCtx->FCntList.McFCntDown0 = FCNT_DOWN_INITAL_VALUE;
-#if ( LORAMAC_MAX_MC_CTX > 1 )
-    CryptoCtx.NvmCtx->FCntList.McFCntDown1 = FCNT_DOWN_INITAL_VALUE;
-    CryptoCtx.NvmCtx->FCntList.McFCntDown2 = FCNT_DOWN_INITAL_VALUE;
-    CryptoCtx.NvmCtx->FCntList.McFCntDown3 = FCNT_DOWN_INITAL_VALUE;
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
-    CryptoCtx.EventCryptoNvmCtxChanged( );
-}
-
-/*
- * Dummy callback in case if the user provides NULL function pointer
- */
-static void DummyCB( void )
-{
-    return;
+    for( int32_t i = 0; i < LORAMAC_MAX_MC_CTX; i++ )
+    {
+        CryptoNvm->FCntList.McFCntDown[i] = FCNT_DOWN_INITAL_VALUE;
+    }
 }
 
 /*
  *  API functions
  */
-
-LoRaMacCryptoStatus_t LoRaMacCryptoInit( LoRaMacCryptoNvmEvent cryptoNvmCtxChanged )
+LoRaMacCryptoStatus_t LoRaMacCryptoInit( LoRaMacCryptoNvmData_t* nvm )
 {
-    // Assign non volatile context
-    CryptoCtx.NvmCtx = &NvmCryptoCtx;
-
-    // Assign callback
-    if( cryptoNvmCtxChanged != 0 )
+    if( nvm == NULL )
     {
-        CryptoCtx.EventCryptoNvmCtxChanged = cryptoNvmCtxChanged;
-    }
-    else
-    {
-        CryptoCtx.EventCryptoNvmCtxChanged = DummyCB;
+        return LORAMAC_CRYPTO_FAIL_PARAM;
     }
 
+    // Assign non volatile context
+    CryptoNvm = nvm;
+
     // Initialize with default
-    memset1( ( uint8_t* )CryptoCtx.NvmCtx, 0, sizeof( LoRaMacCryptoNvmCtx_t ) );
+    memset1( ( uint8_t* )CryptoNvm, 0, sizeof( LoRaMacCryptoNvmData_t ) );
 
     // Set default LoRaWAN version
-    CryptoCtx.NvmCtx->LrWanVersion.Fields.Major = 1;
-    CryptoCtx.NvmCtx->LrWanVersion.Fields.Minor = 1;
-    CryptoCtx.NvmCtx->LrWanVersion.Fields.Patch = 1;
-    CryptoCtx.NvmCtx->LrWanVersion.Fields.Revision = 0;
+    CryptoNvm->LrWanVersion.Fields.Major = 1;
+    CryptoNvm->LrWanVersion.Fields.Minor = 1;
+    CryptoNvm->LrWanVersion.Fields.Patch = 1;
+    CryptoNvm->LrWanVersion.Fields.Revision = 0;
 
     // Reset frame counters
     ResetFCnts( );
@@ -963,30 +871,10 @@ LoRaMacCryptoStatus_t LoRaMacCryptoInit( LoRaMacCryptoNvmEvent cryptoNvmCtxChang
 
 LoRaMacCryptoStatus_t LoRaMacCryptoSetLrWanVersion( Version_t version )
 {
-    CryptoCtx.NvmCtx->LrWanVersion = version;
+    CryptoNvm->LrWanVersion = version;
     return LORAMAC_CRYPTO_SUCCESS;
 }
 
-LoRaMacCryptoStatus_t LoRaMacCryptoRestoreNvmCtx( void* cryptoNvmCtx )
-{
-    // Restore module context
-    if( cryptoNvmCtx != 0 )
-    {
-        memcpy1( ( uint8_t* )&NvmCryptoCtx, ( uint8_t* )cryptoNvmCtx, CRYPTO_NVM_CTX_SIZE );
-        return LORAMAC_CRYPTO_SUCCESS;
-    }
-    else
-    {
-        return LORAMAC_CRYPTO_ERROR_NPE;
-    }
-}
-
-void* LoRaMacCryptoGetNvmCtx( size_t* cryptoNvmCtxSize )
-{
-    *cryptoNvmCtxSize = CRYPTO_NVM_CTX_SIZE;
-    return &NvmCryptoCtx;
-}
-
 LoRaMacCryptoStatus_t LoRaMacCryptoGetFCntUp( uint32_t* currentUp )
 {
     if( currentUp == NULL )
@@ -994,7 +882,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoGetFCntUp( uint32_t* currentUp )
         return LORAMAC_CRYPTO_ERROR_NPE;
     }
 
-    *currentUp = CryptoCtx.NvmCtx->FCntList.FCntUp + 1;
+    *currentUp = CryptoNvm->FCntList.FCntUp + 1;
 
     return LORAMAC_CRYPTO_SUCCESS;
 }
@@ -1042,7 +930,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoGetFCntDown( FCntIdentifier_t fCntID, uint16_
     }
 
     // For LoRaWAN 1.0.X only, check maxFCntGap
-    if( CryptoCtx.NvmCtx->LrWanVersion.Fields.Minor == 0 )
+    if( CryptoNvm->LrWanVersion.Fields.Minor == 0 )
     {
         if( ( ( int64_t )*currentDown - ( int64_t )lastDown ) >= maxFCntGap )
         {
@@ -1053,6 +941,28 @@ LoRaMacCryptoStatus_t LoRaMacCryptoGetFCntDown( FCntIdentifier_t fCntID, uint16_
     return LORAMAC_CRYPTO_SUCCESS;
 }
 
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
+LoRaMacCryptoStatus_t LoRaMacCryptoGetRJcount( FCntIdentifier_t fCntID, uint16_t* rJcount )
+{
+    if( rJcount == 0 )
+    {
+        return LORAMAC_CRYPTO_ERROR_NPE;
+    }
+    switch( fCntID )
+    {
+        case RJ_COUNT_0:
+            *rJcount = RJcount0 + 1;
+            break;
+        case RJ_COUNT_1:
+            *rJcount = CryptoNvm->FCntList.RJcount1 + 1;
+            break;
+        default:
+            return LORAMAC_CRYPTO_FAIL_FCNT_ID;
+    }
+    return LORAMAC_CRYPTO_SUCCESS;
+}
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
+
 LoRaMacCryptoStatus_t LoRaMacCryptoSetMulticastReference( MulticastCtx_t* multicastList )
 {
     if( multicastList == NULL )
@@ -1060,12 +970,11 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSetMulticastReference( MulticastCtx_t* multic
         return LORAMAC_CRYPTO_ERROR_NPE;
     }
 
-    multicastList[0].DownLinkCounter = &CryptoCtx.NvmCtx->FCntList.McFCntDown0;
-#if ( LORAMAC_MAX_MC_CTX > 1 )
-    multicastList[1].DownLinkCounter = &CryptoCtx.NvmCtx->FCntList.McFCntDown1;
-    multicastList[2].DownLinkCounter = &CryptoCtx.NvmCtx->FCntList.McFCntDown2;
-    multicastList[3].DownLinkCounter = &CryptoCtx.NvmCtx->FCntList.McFCntDown3;
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
+    for( int32_t i = 0; i < LORAMAC_MAX_MC_CTX; i++ )
+    {
+        multicastList[i].DownLinkCounter = &CryptoNvm->FCntList.McFCntDown[i];
+    }
+
     return LORAMAC_CRYPTO_SUCCESS;
 }
 
@@ -1078,7 +987,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSetKey( KeyIdentifier_t keyID, uint8_t* key )
     if( keyID == APP_KEY )
     {
         // Derive lifetime keys
-        if( LoRaMacCryptoDeriveMcRootKey( keyID ) != LORAMAC_CRYPTO_SUCCESS )
+        if( LoRaMacCryptoDeriveMcRootKey( CryptoNvm->LrWanVersion.Fields.Minor, keyID ) != LORAMAC_CRYPTO_SUCCESS )
         {
             return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
         }
@@ -1102,14 +1011,13 @@ LoRaMacCryptoStatus_t LoRaMacCryptoPrepareJoinRequest( LoRaMacMessageJoinRequest
 #if ( USE_RANDOM_DEV_NONCE == 1 )
     uint32_t devNonce = 0;
     SecureElementRandomNumber( &devNonce );
-    CryptoCtx.NvmCtx->DevNonce = devNonce;
+    CryptoNvm->DevNonce = devNonce;
 #else
-    CryptoCtx.NvmCtx->DevNonce++;
-#endif
-    CryptoCtx.EventCryptoNvmCtxChanged( );
-    macMsg->DevNonce = CryptoCtx.NvmCtx->DevNonce;
+    CryptoNvm->DevNonce++;
+#endif /* USE_RANDOM_DEV_NONCE */
+    macMsg->DevNonce = CryptoNvm->DevNonce;
 
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
     // Derive lifetime session keys
     if( DeriveLifeTimeSessionKey( J_S_INT_KEY, macMsg->DevEUI ) != LORAMAC_CRYPTO_SUCCESS )
     {
@@ -1119,7 +1027,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoPrepareJoinRequest( LoRaMacMessageJoinRequest
     {
         return LORAMAC_CRYPTO_ERROR;
     }
-#endif
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
 
     // Serialize message
     if( LoRaMacSerializerJoinRequest( macMsg ) != LORAMAC_SERIALIZER_SUCCESS )
@@ -1142,7 +1050,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoPrepareJoinRequest( LoRaMacMessageJoinRequest
     return LORAMAC_CRYPTO_SUCCESS;
 }
 
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
 LoRaMacCryptoStatus_t LoRaMacCryptoPrepareReJoinType1( LoRaMacMessageReJoinType1_t* macMsg )
 {
     if( macMsg == 0 )
@@ -1151,7 +1059,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoPrepareReJoinType1( LoRaMacMessageReJoinType1
     }
 
     // Check for RJcount1 overflow
-    if( CryptoCtx.NvmCtx->FCntList.RJcount1 == 65535 )
+    if( CryptoNvm->FCntList.RJcount1 == 65535 )
     {
         return LORAMAC_CRYPTO_ERROR_RJCOUNT1_OVERFLOW;
     }
@@ -1176,8 +1084,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoPrepareReJoinType1( LoRaMacMessageReJoinType1
     }
 
     // Increment RJcount1
-    CryptoCtx.NvmCtx->FCntList.RJcount1++;
-    CryptoCtx.EventCryptoNvmCtxChanged( );
+    CryptoNvm->FCntList.RJcount1++;
 
     return LORAMAC_CRYPTO_SUCCESS;
 }
@@ -1190,7 +1097,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoPrepareReJoinType0or2( LoRaMacMessageReJoinTy
     }
 
     // Check for RJcount0 overflow
-    if( CryptoCtx.RJcount0 == 65535 )
+    if( RJcount0 == 65535 )
     {
         return LORAMAC_CRYPTO_FAIL_RJCOUNT0_OVERFLOW;
     }
@@ -1215,11 +1122,11 @@ LoRaMacCryptoStatus_t LoRaMacCryptoPrepareReJoinType0or2( LoRaMacMessageReJoinTy
     }
 
     // Increment RJcount0
-    CryptoCtx.RJcount0++;
+    RJcount0++;
 
     return LORAMAC_CRYPTO_SUCCESS;
 }
-#endif
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
 
 LoRaMacCryptoStatus_t LoRaMacCryptoHandleJoinAccept( JoinReqIdentifier_t joinReqType, uint8_t* joinEUI, LoRaMacMessageJoinAccept_t* macMsg )
 {
@@ -1231,33 +1138,33 @@ LoRaMacCryptoStatus_t LoRaMacCryptoHandleJoinAccept( JoinReqIdentifier_t joinReq
     LoRaMacCryptoStatus_t retval = LORAMAC_CRYPTO_ERROR;
     uint8_t decJoinAccept[LORAMAC_JOIN_ACCEPT_FRAME_MAX_SIZE] = { 0 };
     uint8_t versionMinor         = 0;
-    uint8_t* nonce               = ( uint8_t* )&CryptoCtx.NvmCtx->DevNonce;
+    uint16_t nonce               = CryptoNvm->DevNonce;
 
     // Nonce selection depending on JoinReqType
-    // JOIN_REQ     : CryptoCtx.NvmCtx->DevNonce
-    // REJOIN_REQ_0 : CryptoCtx.RJcount0
+    // JOIN_REQ     : CryptoNvm->DevNonce
+    // REJOIN_REQ_0 : RJcount0
     // REJOIN_REQ_1 : CryptoCtx.RJcount1
-    // REJOIN_REQ_2 : CryptoCtx.RJcount0
+    // REJOIN_REQ_2 : RJcount0
     if( joinReqType == JOIN_REQ )
     {
         // Nothing to be done
     }
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
     else
     {
         // If Join-accept is a reply to a rejoin, the RJcount(0 or 1) replaces DevNonce in the key derivation process.
         if( ( joinReqType == REJOIN_REQ_0 ) || ( joinReqType == REJOIN_REQ_2 ) )
         {
-            nonce = ( uint8_t* )&CryptoCtx.RJcount0;
+            nonce = RJcount0;
         }
         else
         {
-            nonce = ( uint8_t* )&CryptoCtx.NvmCtx->FCntList.RJcount1;
+            nonce = CryptoNvm->FCntList.RJcount1;
         }
     }
-#endif
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
 
-    if( SecureElementProcessJoinAccept( joinReqType, joinEUI, ( int16_t )*nonce, macMsg->Buffer,
+    if( SecureElementProcessJoinAccept( joinReqType, joinEUI, nonce, macMsg->Buffer,
                                         macMsg->BufSize, decJoinAccept,
                                         &versionMinor ) != SECURE_ELEMENT_SUCCESS )
     {
@@ -1272,106 +1179,123 @@ LoRaMacCryptoStatus_t LoRaMacCryptoHandleJoinAccept( JoinReqIdentifier_t joinReq
         return LORAMAC_CRYPTO_ERROR_PARSER;
     }
 
-#if ( USE_JOIN_NONCE_COUNTER_CHECK == 1 )
-    // Check if the JoinNonce is greater as the previous one
-    uint32_t currentJoinNonce = 0;
+    uint32_t currentJoinNonce;
 
     currentJoinNonce = ( uint32_t )macMsg->JoinNonce[0];
     currentJoinNonce |= ( ( uint32_t )macMsg->JoinNonce[1] << 8 );
     currentJoinNonce |= ( ( uint32_t )macMsg->JoinNonce[2] << 16 );
 
-    if( currentJoinNonce > CryptoCtx.NvmCtx->JoinNonce )
+#if( USE_JOIN_NONCE_COUNTER_CHECK == 1 )
+    // Check if the JoinNonce is greater as the previous one
+    if( currentJoinNonce > CryptoNvm->JoinNonce )
+#else
+    // Check if the JoinNonce is different from the previous one
+    if( currentJoinNonce != CryptoNvm->JoinNonce )
+#endif /* USE_JOIN_NONCE_COUNTER_CHECK */
     {
-        CryptoCtx.NvmCtx->JoinNonce = currentJoinNonce;
-        CryptoCtx.EventCryptoNvmCtxChanged( );
+        CryptoNvm->JoinNonce = currentJoinNonce;
     }
     else
     {
         return LORAMAC_CRYPTO_FAIL_JOIN_NONCE;
     }
-#endif
 
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+    // Derive lifetime keys
+    retval = LoRaMacCryptoDeriveMcRootKey( versionMinor, APP_KEY );
+    if( retval != LORAMAC_CRYPTO_SUCCESS )
+    {
+        return retval;
+    }
+
+    retval = LoRaMacCryptoDeriveMcKEKey( MC_ROOT_KEY );
+    if( retval != LORAMAC_CRYPTO_SUCCESS )
+    {
+        return retval;
+    }
+
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
     if( versionMinor == 1 )
     {
         // Operating in LoRaWAN 1.1.x mode
-        // Derive lifetime keys
-        retval = LoRaMacCryptoDeriveMcRootKey( APP_KEY );
+
+        retval = DeriveSessionKey11x( F_NWK_S_INT_KEY, currentJoinNonce, joinEUI, nonce );
         if( retval != LORAMAC_CRYPTO_SUCCESS )
         {
             return retval;
         }
 
-        retval = LoRaMacCryptoDeriveMcKEKey( MC_ROOT_KEY );
+        retval = DeriveSessionKey11x( S_NWK_S_INT_KEY, currentJoinNonce, joinEUI, nonce );
         if( retval != LORAMAC_CRYPTO_SUCCESS )
         {
             return retval;
         }
 
-        retval = DeriveSessionKey11x( F_NWK_S_INT_KEY, macMsg->JoinNonce, joinEUI, nonce );
+        retval = DeriveSessionKey11x( NWK_S_ENC_KEY, currentJoinNonce, joinEUI, nonce );
         if( retval != LORAMAC_CRYPTO_SUCCESS )
         {
             return retval;
         }
 
-        retval = DeriveSessionKey11x( S_NWK_S_INT_KEY, macMsg->JoinNonce, joinEUI, nonce );
+        retval = DeriveSessionKey11x( APP_S_KEY, currentJoinNonce, joinEUI, nonce );
         if( retval != LORAMAC_CRYPTO_SUCCESS )
         {
             return retval;
         }
+    }
+    else
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
+    {
+        // Operating in LoRaWAN 1.0.x mode
+
+        uint32_t netID;
+
+        netID = ( uint32_t )macMsg->NetID[0];
+        netID |= ( ( uint32_t )macMsg->NetID[1] << 8 );
+        netID |= ( ( uint32_t )macMsg->NetID[2] << 16 );
 
-        retval = DeriveSessionKey11x( NWK_S_ENC_KEY, macMsg->JoinNonce, joinEUI, nonce );
+        retval = DeriveSessionKey10x( APP_S_KEY, currentJoinNonce, netID, nonce );
         if( retval != LORAMAC_CRYPTO_SUCCESS )
         {
             return retval;
         }
 
-        retval = DeriveSessionKey11x( APP_S_KEY, macMsg->JoinNonce, joinEUI, nonce );
+        /* ST_WORKAROUND_BEGIN: integrate 1.1.x keys only if required */
+#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+        retval = DeriveSessionKey10x( NWK_S_ENC_KEY, currentJoinNonce, netID, nonce );
         if( retval != LORAMAC_CRYPTO_SUCCESS )
         {
             return retval;
         }
-    }
-#else
-    // Operating in LoRaWAN 1.0.x mode
-    retval = LoRaMacCryptoDeriveMcRootKey( APP_KEY );
-    if( retval != LORAMAC_CRYPTO_SUCCESS )
-    {
-        return retval;
-    }
 
-    retval = LoRaMacCryptoDeriveMcKEKey( MC_ROOT_KEY );
-    if( retval != LORAMAC_CRYPTO_SUCCESS )
-    {
-        return retval;
-    }
+        retval = DeriveSessionKey10x( F_NWK_S_INT_KEY, currentJoinNonce, netID, nonce );
+        if( retval != LORAMAC_CRYPTO_SUCCESS )
+        {
+            return retval;
+        }
 
-    retval = DeriveSessionKey10x( APP_S_KEY, macMsg->JoinNonce, macMsg->NetID, ( uint8_t* )&CryptoCtx.NvmCtx->DevNonce );
-    if( retval != LORAMAC_CRYPTO_SUCCESS )
-    {
-        return retval;
-    }
-    retval = DeriveSessionKey10x( NWK_S_KEY, macMsg->JoinNonce, macMsg->NetID, ( uint8_t* )&CryptoCtx.NvmCtx->DevNonce );
-    if( retval != LORAMAC_CRYPTO_SUCCESS )
-    {
-        return retval;
-    }
+        retval = DeriveSessionKey10x( S_NWK_S_INT_KEY, currentJoinNonce, netID, nonce );
+#else
+        retval = DeriveSessionKey10x( NWK_S_KEY, currentJoinNonce, netID, nonce );
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
+        /* ST_WORKAROUND_END */
+        if( retval != LORAMAC_CRYPTO_SUCCESS )
+        {
+            return retval;
+        }
+    }
 
     // Join-Accept is successfully processed
     // Save LoRaWAN specification version
-    CryptoCtx.NvmCtx->LrWanVersion.Fields.Minor = versionMinor;
+    CryptoNvm->LrWanVersion.Fields.Minor = versionMinor;
 
     // Reset frame counters
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-    CryptoCtx.RJcount0 = 0;
-#endif
-    CryptoCtx.NvmCtx->FCntList.FCntUp = 0;
-    CryptoCtx.NvmCtx->FCntList.FCntDown = FCNT_DOWN_INITAL_VALUE;
-    CryptoCtx.NvmCtx->FCntList.NFCntDown = FCNT_DOWN_INITAL_VALUE;
-    CryptoCtx.NvmCtx->FCntList.AFCntDown = FCNT_DOWN_INITAL_VALUE;
-
-    CryptoCtx.EventCryptoNvmCtxChanged( );
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
+    RJcount0 = 0;
+#endif /* USE_LRWAN_1_1_X_CRYPTO == 1 */
+    CryptoNvm->FCntList.FCntUp = 0;
+    CryptoNvm->FCntList.FCntDown = FCNT_DOWN_INITAL_VALUE;
+    CryptoNvm->FCntList.NFCntDown = FCNT_DOWN_INITAL_VALUE;
+    CryptoNvm->FCntList.AFCntDown = FCNT_DOWN_INITAL_VALUE;
 
     return LORAMAC_CRYPTO_SUCCESS;
 }
@@ -1386,7 +1310,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSecureMessage( uint32_t fCntUp, uint8_t txDr,
         return LORAMAC_CRYPTO_ERROR_NPE;
     }
 
-    if( fCntUp < CryptoCtx.NvmCtx->FCntList.FCntUp )
+    if( fCntUp < CryptoNvm->FCntList.FCntUp )
     {
         return LORAMAC_CRYPTO_FAIL_FCNT_SMALLER;
     }
@@ -1395,14 +1319,16 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSecureMessage( uint32_t fCntUp, uint8_t txDr,
     if( macMsg->FPort == 0 )
     {
         // Use network session key
+        /* ST_WORKAROUND_BEGIN: integrate 1.1.x keys only if required */
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
         payloadDecryptionKeyID = NWK_S_ENC_KEY;
 #else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
         payloadDecryptionKeyID = NWK_S_KEY;
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
+        /* ST_WORKAROUND_END */
     }
 
-    if( fCntUp > CryptoCtx.NvmCtx->FCntList.FCntUp )
+    if( fCntUp > CryptoNvm->FCntList.FCntUp )
     {
         retval = PayloadEncrypt( macMsg->FRMPayload, macMsg->FRMPayloadSize, payloadDecryptionKeyID, macMsg->FHDR.DevAddr, UPLINK, fCntUp );
         if( retval != LORAMAC_CRYPTO_SUCCESS )
@@ -1410,8 +1336,8 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSecureMessage( uint32_t fCntUp, uint8_t txDr,
             return retval;
         }
 
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-        if( CryptoCtx.NvmCtx->LrWanVersion.Fields.Minor == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
+        if( CryptoNvm->LrWanVersion.Fields.Minor == 1 )
         {
             // Encrypt FOpts
             retval = FOptsEncrypt( macMsg->FHDR.FCtrl.Bits.FOptsLen, macMsg->FHDR.DevAddr, UPLINK, FCNT_UP, fCntUp, macMsg->FHDR.FOpts );
@@ -1420,7 +1346,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSecureMessage( uint32_t fCntUp, uint8_t txDr,
                 return retval;
             }
         }
-#endif
+#endif /* USE_LRWAN_1_1_X_CRYPTO */
     }
 
     // Serialize message
@@ -1430,8 +1356,8 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSecureMessage( uint32_t fCntUp, uint8_t txDr,
     }
 
     // Compute mic
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-    if( CryptoCtx.NvmCtx->LrWanVersion.Fields.Minor == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
+    if( CryptoNvm->LrWanVersion.Fields.Minor == 1 )
     {
         uint32_t cmacS = 0;
         uint32_t cmacF = 0;
@@ -1452,13 +1378,16 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSecureMessage( uint32_t fCntUp, uint8_t txDr,
         macMsg->MIC = ( ( cmacF << 16 ) & 0xFFFF0000 ) | ( cmacS & 0x0000FFFF );
     }
     else
-#endif
-    {        // Use network session key
+#endif /* USE_LRWAN_1_1_X_CRYPTO */
+    {        
+        // Use network session key
+        /* ST_WORKAROUND_BEGIN: integrate 1.1.x keys only if required */
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
         payloadDecryptionKeyID = NWK_S_ENC_KEY;
 #else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
         payloadDecryptionKeyID = NWK_S_KEY;
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
+        /* ST_WORKAROUND_END */
         // MIC = cmacF[0..3]
         // The IsAck parameter is every time false since the ConfFCnt field is not used in legacy mode.
         retval = ComputeCmacB0( macMsg->Buffer, ( macMsg->BufSize - LORAMAC_MIC_FIELD_SIZE ), payloadDecryptionKeyID, false, UPLINK, macMsg->FHDR.DevAddr, fCntUp, &macMsg->MIC );
@@ -1474,8 +1403,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoSecureMessage( uint32_t fCntUp, uint8_t txDr,
         return LORAMAC_CRYPTO_ERROR_SERIALIZER;
     }
 
-    CryptoCtx.NvmCtx->FCntList.FCntUp = fCntUp;
-    CryptoCtx.EventCryptoNvmCtxChanged( );
+    CryptoNvm->FCntList.FCntUp = fCntUp;
 
     return LORAMAC_CRYPTO_SUCCESS;
 }
@@ -1494,12 +1422,13 @@ LoRaMacCryptoStatus_t LoRaMacCryptoUnsecureMessage( AddressIdentifier_t addrID,
 
     LoRaMacCryptoStatus_t retval = LORAMAC_CRYPTO_ERROR;
     KeyIdentifier_t payloadDecryptionKeyID = APP_S_KEY;
-
+    /* ST_WORKAROUND_BEGIN: integrate 1.1.x keys only if required */
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
     KeyIdentifier_t micComputationKeyID = S_NWK_S_INT_KEY;
 #else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
     KeyIdentifier_t micComputationKeyID = NWK_S_KEY;
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
+    /* ST_WORKAROUND_END */
     KeyAddr_t* curItem;
 
     // Parse the message
@@ -1526,7 +1455,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoUnsecureMessage( AddressIdentifier_t addrID,
 
     // Compute mic
     bool isAck = macMsg->FHDR.FCtrl.Bits.Ack;
-    if( CryptoCtx.NvmCtx->LrWanVersion.Fields.Minor == 0 )
+    if( CryptoNvm->LrWanVersion.Fields.Minor == 0 )
     {
         // In legacy mode the IsAck parameter is forced to be false since the ConfFCnt field is not used.
         isAck = false;
@@ -1543,11 +1472,13 @@ LoRaMacCryptoStatus_t LoRaMacCryptoUnsecureMessage( AddressIdentifier_t addrID,
     if( macMsg->FPort == 0 )
     {
         // Use network session encryption key
+        /* ST_WORKAROUND_BEGIN: integrate 1.1.x keys only if required */
 #if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
         payloadDecryptionKeyID = NWK_S_ENC_KEY;
 #else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
         payloadDecryptionKeyID = NWK_S_KEY;
 #endif /* USE_LRWAN_1_1_X_CRYPTO */
+        /* ST_WORKAROUND_END */
     }
     retval = PayloadEncrypt( macMsg->FRMPayload, macMsg->FRMPayloadSize, payloadDecryptionKeyID, address, DOWNLINK, fCntDown );
     if( retval != LORAMAC_CRYPTO_SUCCESS )
@@ -1555,8 +1486,8 @@ LoRaMacCryptoStatus_t LoRaMacCryptoUnsecureMessage( AddressIdentifier_t addrID,
         return retval;
     }
 
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
-    if( CryptoCtx.NvmCtx->LrWanVersion.Fields.Minor == 1 )
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
+    if( CryptoNvm->LrWanVersion.Fields.Minor == 1 )
     {
         if( addrID == UNICAST_DEV_ADDR )
         {
@@ -1575,7 +1506,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoUnsecureMessage( AddressIdentifier_t addrID,
     return LORAMAC_CRYPTO_SUCCESS;
 }
 
-LoRaMacCryptoStatus_t LoRaMacCryptoDeriveMcRootKey( KeyIdentifier_t keyID )
+LoRaMacCryptoStatus_t LoRaMacCryptoDeriveMcRootKey( uint8_t versionMinor, KeyIdentifier_t keyID )
 {
     // Prevent other keys than AppKey
     if( keyID != APP_KEY )
@@ -1584,11 +1515,11 @@ LoRaMacCryptoStatus_t LoRaMacCryptoDeriveMcRootKey( KeyIdentifier_t keyID )
     }
     uint8_t compBase[16] = { 0 };
 
-    if( CryptoCtx.NvmCtx->LrWanVersion.Fields.Minor == 1 )
+    if( versionMinor == 1 )
     {
         compBase[0] = 0x20;
     }
-    if( SecureElementDeriveAndStoreKey( CryptoCtx.NvmCtx->LrWanVersion, compBase, keyID, MC_ROOT_KEY ) != SECURE_ELEMENT_SUCCESS )
+    if( SecureElementDeriveAndStoreKey( compBase, keyID, MC_ROOT_KEY ) != SECURE_ELEMENT_SUCCESS )
     {
         return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
     }
@@ -1605,7 +1536,7 @@ LoRaMacCryptoStatus_t LoRaMacCryptoDeriveMcKEKey( KeyIdentifier_t keyID )
     }
     uint8_t compBase[16] = { 0 };
 
-    if( SecureElementDeriveAndStoreKey( CryptoCtx.NvmCtx->LrWanVersion, compBase, keyID, MC_KE_KEY ) != SECURE_ELEMENT_SUCCESS )
+    if( SecureElementDeriveAndStoreKey( compBase, keyID, MC_KE_KEY ) != SECURE_ELEMENT_SUCCESS )
     {
         return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
     }
@@ -1648,12 +1579,12 @@ LoRaMacCryptoStatus_t LoRaMacCryptoDeriveMcSessionKeyPair( AddressIdentifier_t a
     compBaseNwkS[3] = ( mcAddr >> 16 ) & 0xFF;
     compBaseNwkS[4] = ( mcAddr >> 24 ) & 0xFF;
 
-    if( SecureElementDeriveAndStoreKey( CryptoCtx.NvmCtx->LrWanVersion, compBaseAppS, curItem->RootKey, curItem->AppSkey ) != SECURE_ELEMENT_SUCCESS )
+    if( SecureElementDeriveAndStoreKey( compBaseAppS, curItem->RootKey, curItem->AppSkey ) != SECURE_ELEMENT_SUCCESS )
     {
         return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
     }
 
-    if( SecureElementDeriveAndStoreKey( CryptoCtx.NvmCtx->LrWanVersion, compBaseNwkS, curItem->RootKey, curItem->NwkSkey ) != SECURE_ELEMENT_SUCCESS )
+    if( SecureElementDeriveAndStoreKey( compBaseNwkS, curItem->RootKey, curItem->NwkSkey ) != SECURE_ELEMENT_SUCCESS )
     {
         return LORAMAC_CRYPTO_ERROR_SECURE_ELEMENT_FUNC;
     }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.h b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.h
index f23bcad1..8f91dbd7 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.h
@@ -48,6 +48,12 @@ extern "C"
 #include "utilities.h"
 #include "LoRaMacTypes.h"
 #include "LoRaMacMessageTypes.h"
+#include "LoRaMacCryptoNvm.h"
+
+/*!
+ * Indicates if LoRaWAN 1.1.x crypto scheme is enabled
+ */
+#define USE_LRWAN_1_1_X_CRYPTO                      0
 
 /*!
  * Indicates if a random devnonce must be used or not
@@ -163,11 +169,11 @@ typedef void ( *LoRaMacCryptoNvmEvent )( void );
  * Initialization of LoRaMac Crypto module
  * It sets initial values of volatile variables and assigns the non-volatile context.
  *
- * \param[IN]     cryptoNvmCtxChanged - Callback function which will be called  when the
- *                                      non-volatile context have to be stored.
+ * \param[IN]     nvm                 - Pointer to the non-volatile memory data
+ *                                      structure.
  * \retval                            - Status of the operation
  */
-LoRaMacCryptoStatus_t LoRaMacCryptoInit( LoRaMacCryptoNvmEvent cryptoNvmCtxChanged );
+LoRaMacCryptoStatus_t LoRaMacCryptoInit( LoRaMacCryptoNvmData_t* nvm );
 
 /*!
  * Sets the LoRaWAN specification version to be used.
@@ -180,22 +186,6 @@ LoRaMacCryptoStatus_t LoRaMacCryptoInit( LoRaMacCryptoNvmEvent cryptoNvmCtxChang
  */
 LoRaMacCryptoStatus_t LoRaMacCryptoSetLrWanVersion( Version_t version );
 
-/*!
- * Restores the internal nvm context from passed pointer.
- *
- * \param[IN]     cryptoNmvCtx     - Pointer to non-volatile crypto module context to be restored.
- * \retval                         - Status of the operation
- */
-LoRaMacCryptoStatus_t LoRaMacCryptoRestoreNvmCtx( void* cryptoNvmCtx );
-
-/*!
- * Returns a pointer to the internal non-volatile context.
- *
- * \param[IN]     cryptoNvmCtxSize - Size of the module non-volatile context
- * \retval                         - Points to a structure where the module store its non-volatile context
- */
-void* LoRaMacCryptoGetNvmCtx( size_t* cryptoNvmCtxSize );
-
 /*!
  * Returns updated fCntID downlink counter value.
  *
@@ -303,10 +293,11 @@ LoRaMacCryptoStatus_t LoRaMacCryptoUnsecureMessage( AddressIdentifier_t addrID,
  * 1.1.x
  * McRootKey = aes128_encrypt(AppKey, 0x20 | pad16)
  *
+ * \param[IN]     versionMinor    - LoRaWAN specification minor version to be used.
  * \param[IN]     keyID           - Key identifier of the root key to use to perform the derivation ( AppKey )
  * \retval                        - Status of the operation
  */
-LoRaMacCryptoStatus_t LoRaMacCryptoDeriveMcRootKey( KeyIdentifier_t keyID );
+LoRaMacCryptoStatus_t LoRaMacCryptoDeriveMcRootKey( uint8_t versionMinor, KeyIdentifier_t keyID );
 
 /*!
  * Derives the McKEKey from the McRootKey.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCryptoNvm.h b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCryptoNvm.h
new file mode 100644
index 00000000..55869422
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCryptoNvm.h
@@ -0,0 +1,124 @@
+/*!
+ * \file      LoRaMacCryptoNvm.h
+ *
+ * \brief     LoRa MAC layer cryptographic NVM data.
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2017 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ *
+ * \author    Daniel Jaeckle ( STACKFORCE )
+ *
+ * addtogroup LORAMAC
+ * \{
+ *
+ */
+#ifndef __LORAMAC_CRYPTO_NVM_H__
+#define __LORAMAC_CRYPTO_NVM_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <stdint.h>
+#include "utilities.h"
+#include "LoRaMacTypes.h"
+
+
+/*!
+ * LoRaWAN Frame counter list.
+ */
+typedef struct sFCntList
+{
+    /*!
+     * Uplink frame counter which is incremented with each uplink.
+     */
+    uint32_t FCntUp;
+    /*!
+     * Network downlink frame counter which is incremented with each downlink on FPort 0
+     * or when the FPort field is missing.
+     */
+    uint32_t NFCntDown;
+    /*!
+     * Application downlink frame counter which is incremented with each downlink
+     * on a port different than 0.
+     */
+    uint32_t AFCntDown;
+    /*!
+     * In case if the device is connected to a LoRaWAN 1.0 Server,
+     * this counter is used for every kind of downlink frame.
+     */
+    uint32_t FCntDown;
+    /*!
+     * Multicast downlink counters
+     */
+    uint32_t McFCntDown[LORAMAC_MAX_MC_CTX];
+#if( USE_LRWAN_1_1_X_CRYPTO == 1 )
+    /*!
+     * RJcount1 is a counter incremented with every Rejoin request Type 1 frame transmitted.
+     */
+    uint16_t RJcount1;
+#endif
+}FCntList_t;
+
+/*!
+ * LoRaMac Crypto Non Volatile Context structure
+ */
+typedef struct sLoRaMacCryptoNvmData
+{
+    /*!
+     * Stores the information if the device is connected to a LoRaWAN network
+     * server with prior to 1.1.0 implementation.
+     */
+    Version_t LrWanVersion;
+    /*!
+     * Device nonce is a counter starting at 0 when the device is initially
+     * powered up and incremented with every JoinRequest.
+     */
+    uint16_t DevNonce;
+    /*!
+     * JoinNonce is a device specific counter value (that never repeats itself)
+     * provided by the join server and incremented with every JoinAccept message.
+     */
+    uint32_t JoinNonce;
+    /*!
+     * Frame counter list
+     */
+    FCntList_t FCntList;
+    /*!
+     * LastDownFCnt stores the information which frame counter was used to
+     * decrypt the last frame. This information is needed to compute ConfFCnt in
+     * B1 block for the MIC.
+     */
+    uint32_t LastDownFCnt;
+    /*!
+     * CRC32 value of the Crypto data structure.
+     */
+    uint32_t Crc32;
+}LoRaMacCryptoNvmData_t;
+
+/*! \} addtogroup LORAMAC */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __LORAMAC_CRYPTO_NVM_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacTypes.h b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacTypes.h
index 31f995e9..d5d84cf7 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacTypes.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacTypes.h
@@ -32,6 +32,16 @@
  * \{
  *
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    LoRaMacTypes.h
+  * @author  MCD Application Team
+  * @brief   LoRa MAC layer internal types definition. Please do not include in application sources.
+  ******************************************************************************
+  */
 #ifndef __LORAMAC_TYPES_H__
 #define __LORAMAC_TYPES_H__
 
@@ -43,26 +53,525 @@ extern "C"
 #include <stdint.h>
 #include <stdbool.h>
 #include "timer.h"
+#include "systime.h"
 
 /*!
  * Start value for unicast keys enumeration
  */
-#define LORAMAC_CRYPTO_UNICAST_KEYS     0
+#define LORAMAC_CRYPTO_UNICAST_KEYS                 0
 
 /*!
  * Start value for multicast keys enumeration
  */
-#define LORAMAC_CRYPTO_MULTICAST_KEYS   127
+#define LORAMAC_CRYPTO_MULTICAST_KEYS               127
 
-   /*!
- * Indicates if LoRaWAN 1.1.x crypto scheme is enabled
+/*!
+ * Maximum number of multicast context
  */
-#define USE_LRWAN_1_1_X_CRYPTO          0
+#define LORAMAC_MAX_MC_CTX                          1 /* ST_WORKAROUND: reduced LORAMAC_MAX_MC_CTX */
 
 /*!
- * Maximum number of multicast context
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | SF12 - BW125
+ * AU915        | SF10 - BW125
+ * CN470        | SF12 - BW125
+ * CN779        | SF12 - BW125
+ * EU433        | SF12 - BW125
+ * EU868        | SF12 - BW125
+ * IN865        | SF12 - BW125
+ * KR920        | SF12 - BW125
+ * US915        | SF10 - BW125
+ * RU864        | SF12 - BW125
+ */
+#define DR_0                                        0
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | SF11 - BW125
+ * AU915        | SF9  - BW125
+ * CN470        | SF11 - BW125
+ * CN779        | SF11 - BW125
+ * EU433        | SF11 - BW125
+ * EU868        | SF11 - BW125
+ * IN865        | SF11 - BW125
+ * KR920        | SF11 - BW125
+ * US915        | SF9  - BW125
+ * RU864        | SF11 - BW125
+ */
+#define DR_1                                        1
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | SF10 - BW125
+ * AU915        | SF8  - BW125
+ * CN470        | SF10 - BW125
+ * CN779        | SF10 - BW125
+ * EU433        | SF10 - BW125
+ * EU868        | SF10 - BW125
+ * IN865        | SF10 - BW125
+ * KR920        | SF10 - BW125
+ * US915        | SF8  - BW125
+ * RU864        | SF10 - BW125
+ */
+#define DR_2                                        2
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | SF9  - BW125
+ * AU915        | SF7  - BW125
+ * CN470        | SF9  - BW125
+ * CN779        | SF9  - BW125
+ * EU433        | SF9  - BW125
+ * EU868        | SF9  - BW125
+ * IN865        | SF9  - BW125
+ * KR920        | SF9  - BW125
+ * US915        | SF7  - BW125
+ * RU864        | SF9  - BW125
+ */
+#define DR_3                                        3
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | SF8  - BW125
+ * AU915        | SF8  - BW500
+ * CN470        | SF8  - BW125
+ * CN779        | SF8  - BW125
+ * EU433        | SF8  - BW125
+ * EU868        | SF8  - BW125
+ * IN865        | SF8  - BW125
+ * KR920        | SF8  - BW125
+ * US915        | SF8  - BW500
+ * RU864        | SF8  - BW125
+ */
+#define DR_4                                        4
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | SF7  - BW125
+ * AU915        | RFU
+ * CN470        | SF7  - BW125
+ * CN779        | SF7  - BW125
+ * EU433        | SF7  - BW125
+ * EU868        | SF7  - BW125
+ * IN865        | SF7  - BW125
+ * KR920        | SF7  - BW125
+ * US915        | RFU
+ * RU864        | SF7  - BW125
+ */
+#define DR_5                                        5
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | SF7  - BW250
+ * AU915        | RFU
+ * CN470        | SF12 - BW125
+ * CN779        | SF7  - BW250
+ * EU433        | SF7  - BW250
+ * EU868        | SF7  - BW250
+ * IN865        | SF7  - BW250
+ * KR920        | RFU
+ * US915        | RFU
+ * RU864        | SF7  - BW250
+ */
+#define DR_6                                        6
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | FSK
+ * AU915        | RFU
+ * CN470        | SF12 - BW125
+ * CN779        | FSK
+ * EU433        | FSK
+ * EU868        | FSK
+ * IN865        | FSK
+ * KR920        | RFU
+ * US915        | RFU
+ * RU864        | FSK
+ */
+#define DR_7                                        7
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | RFU
+ * AU915        | SF12 - BW500
+ * CN470        | RFU
+ * CN779        | RFU
+ * EU433        | RFU
+ * EU868        | RFU
+ * IN865        | RFU
+ * KR920        | RFU
+ * US915        | SF12 - BW500
+ * RU864        | RFU
+ */
+#define DR_8                                        8
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | RFU
+ * AU915        | SF11 - BW500
+ * CN470        | RFU
+ * CN779        | RFU
+ * EU433        | RFU
+ * EU868        | RFU
+ * IN865        | RFU
+ * KR920        | RFU
+ * US915        | SF11 - BW500
+ * RU864        | RFU
+ */
+#define DR_9                                        9
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | RFU
+ * AU915        | SF10 - BW500
+ * CN470        | RFU
+ * CN779        | RFU
+ * EU433        | RFU
+ * EU868        | RFU
+ * IN865        | RFU
+ * KR920        | RFU
+ * US915        | SF10 - BW500
+ * RU864        | RFU
+ */
+#define DR_10                                       10
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | RFU
+ * AU915        | SF9  - BW500
+ * CN470        | RFU
+ * CN779        | RFU
+ * EU433        | RFU
+ * EU868        | RFU
+ * IN865        | RFU
+ * KR920        | RFU
+ * US915        | SF9  - BW500
+ * RU864        | RFU
+ */
+#define DR_11                                       11
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | RFU
+ * AU915        | SF8  - BW500
+ * CN470        | RFU
+ * CN779        | RFU
+ * EU433        | RFU
+ * EU868        | RFU
+ * IN865        | RFU
+ * KR920        | RFU
+ * US915        | SF8  - BW500
+ * RU864        | RFU
+ */
+#define DR_12                                       12
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | RFU
+ * AU915        | SF7  - BW500
+ * CN470        | RFU
+ * CN779        | RFU
+ * EU433        | RFU
+ * EU868        | RFU
+ * IN865        | RFU
+ * KR920        | RFU
+ * US915        | SF7  - BW500
+ * RU864        | RFU
+ */
+#define DR_13                                       13
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | RFU
+ * AU915        | RFU
+ * CN470        | RFU
+ * CN779        | RFU
+ * EU433        | RFU
+ * EU868        | RFU
+ * IN865        | RFU
+ * KR920        | RFU
+ * US915        | RFU
+ * RU864        | RFU
+ */
+#define DR_14                                       14
+
+/*!
+ * Region       | SF
+ * ------------ | :-----:
+ * AS923        | RFU
+ * AU915        | RFU
+ * CN470        | RFU
+ * CN779        | RFU
+ * EU433        | RFU
+ * EU868        | RFU
+ * IN865        | RFU
+ * KR920        | RFU
+ * US915        | RFU
+ * RU864        | RFU
+ */
+#define DR_15                                       15
+
+
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | Max EIRP
+ * AU915        | Max EIRP
+ * CN470        | Max EIRP
+ * CN779        | Max EIRP
+ * EU433        | Max EIRP
+ * EU868        | Max EIRP
+ * IN865        | Max EIRP
+ * KR920        | Max EIRP
+ * US915        | Max ERP
+ * RU864        | Max EIRP
+ */
+#define TX_POWER_0                                  0
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | Max EIRP - 2
+ * AU915        | Max EIRP - 2
+ * CN470        | Max EIRP - 2
+ * CN779        | Max EIRP - 2
+ * EU433        | Max EIRP - 2
+ * EU868        | Max EIRP - 2
+ * IN865        | Max EIRP - 2
+ * KR920        | Max EIRP - 2
+ * US915        | Max ERP - 2
+ * RU864        | Max EIRP - 2
+ */
+#define TX_POWER_1                                  1
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | Max EIRP - 4
+ * AU915        | Max EIRP - 4
+ * CN470        | Max EIRP - 4
+ * CN779        | Max EIRP - 4
+ * EU433        | Max EIRP - 4
+ * EU868        | Max EIRP - 4
+ * IN865        | Max EIRP - 4
+ * KR920        | Max EIRP - 4
+ * US915        | Max ERP - 4
+ * RU864        | Max EIRP - 4
+ */
+#define TX_POWER_2                                  2
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | Max EIRP - 6
+ * AU915        | Max EIRP - 6
+ * CN470        | Max EIRP - 6
+ * CN779        | Max EIRP - 6
+ * EU433        | Max EIRP - 6
+ * EU868        | Max EIRP - 6
+ * IN865        | Max EIRP - 6
+ * KR920        | Max EIRP - 6
+ * US915        | Max ERP - 6
+ * RU864        | Max EIRP - 6
+ */
+#define TX_POWER_3                                  3
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | Max EIRP - 8
+ * AU915        | Max EIRP - 8
+ * CN470        | Max EIRP - 8
+ * CN779        | Max EIRP - 8
+ * EU433        | Max EIRP - 8
+ * EU868        | Max EIRP - 8
+ * IN865        | Max EIRP - 8
+ * KR920        | Max EIRP - 8
+ * US915        | Max ERP - 8
+ * RU864        | Max EIRP - 8
+ */
+#define TX_POWER_4                                  4
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | Max EIRP - 10
+ * AU915        | Max EIRP - 10
+ * CN470        | Max EIRP - 10
+ * CN779        | Max EIRP - 10
+ * EU433        | Max EIRP - 10
+ * EU868        | Max EIRP - 10
+ * IN865        | Max EIRP - 10
+ * KR920        | Max EIRP - 10
+ * US915        | Max ERP - 10
+ * RU864        | Max EIRP - 10
+ */
+#define TX_POWER_5                                  5
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | Max EIRP - 12
+ * AU915        | Max EIRP - 12
+ * CN470        | Max EIRP - 12
+ * CN779        | -
+ * EU433        | -
+ * EU868        | Max EIRP - 12
+ * IN865        | Max EIRP - 12
+ * KR920        | Max EIRP - 12
+ * US915        | Max ERP - 12
+ * RU864        | Max EIRP - 12
+ */
+#define TX_POWER_6                                  6
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | Max EIRP - 14
+ * AU915        | Max EIRP - 14
+ * CN470        | Max EIRP - 14
+ * CN779        | -
+ * EU433        | -
+ * EU868        | Max EIRP - 14
+ * IN865        | Max EIRP - 14
+ * KR920        | Max EIRP - 14
+ * US915        | Max ERP - 14
+ * RU864        | Max EIRP - 14
+ */
+#define TX_POWER_7                                  7
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | -
+ * AU915        | Max EIRP - 16
+ * CN470        | -
+ * CN779        | -
+ * EU433        | -
+ * EU868        | -
+ * IN865        | Max EIRP - 16
+ * KR920        | -
+ * US915        | Max ERP - 16
+ * RU864        | -
+ */
+#define TX_POWER_8                                  8
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | -
+ * AU915        | Max EIRP - 18
+ * CN470        | -
+ * CN779        | -
+ * EU433        | -
+ * EU868        | -
+ * IN865        | Max EIRP - 18
+ * KR920        | -
+ * US915        | Max ERP - 18
+ * RU864        | -
  */
-#define   LORAMAC_MAX_MC_CTX            1
+#define TX_POWER_9                                  9
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | -
+ * AU915        | Max EIRP - 20
+ * CN470        | -
+ * CN779        | -
+ * EU433        | -
+ * EU868        | -
+ * IN865        | Max EIRP - 20
+ * KR920        | -
+ * US915        | Max ERP - 20
+ * RU864        | -
+ */
+#define TX_POWER_10                                 10
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | -
+ * AU915        | Max EIRP - 22
+ * CN470        | -
+ * CN779        | -
+ * EU433        | -
+ * EU868        | -
+ * IN865        | -
+ * KR920        | -
+ * US915        | Max ERP - 22
+ * RU864        | -
+ */
+#define TX_POWER_11                                 11
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | -
+ * AU915        | Max EIRP - 24
+ * CN470        | -
+ * CN779        | -
+ * EU433        | -
+ * EU868        | -
+ * IN865        | -
+ * KR920        | -
+ * US915        | Max ERP - 24
+ * RU864        | -
+ */
+#define TX_POWER_12                                 12
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | -
+ * AU915        | Max EIRP - 26
+ * CN470        | -
+ * CN779        | -
+ * EU433        | -
+ * EU868        | -
+ * IN865        | -
+ * KR920        | -
+ * US915        | Max ERP - 26
+ * RU864        | -
+ */
+#define TX_POWER_13                                 13
+
+/*!
+ * Region       | dBM
+ * ------------ | :-----:
+ * AS923        | -
+ * AU915        | Max EIRP - 28
+ * CN470        | -
+ * CN779        | -
+ * EU433        | -
+ * EU868        | -
+ * IN865        | -
+ * KR920        | -
+ * US915        | Max ERP - 28
+ * RU864        | -
+ */
+#define TX_POWER_14                                 14
+
+/*!
+ * RFU
+ */
+#define TX_POWER_15                                 15
 
 /*!
  * LoRaWAN devices classes definition
@@ -149,24 +658,32 @@ typedef enum eFCntIdentifier
      * this counter is used for every kind of downlink frame.
      */
     FCNT_DOWN,
+    /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+#if ( LORAMAC_MAX_MC_CTX > 0 )
     /*!
      * Multicast downlink counter for index 0
      */
     MC_FCNT_DOWN_0,
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
 #if ( LORAMAC_MAX_MC_CTX > 1 )
     /*!
      * Multicast downlink counter for index 1
      */
     MC_FCNT_DOWN_1,
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
     /*!
      * Multicast downlink counter for index 2
      */
     MC_FCNT_DOWN_2,
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
     /*!
      * Multicast downlink counter for index 3
      */
     MC_FCNT_DOWN_3,
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
+    /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
 }FCntIdentifier_t;
 
 /*!
@@ -182,7 +699,7 @@ typedef enum eKeyIdentifier
      * Network root key
      */
     NWK_KEY,
-#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if ( USE_LRWAN_1_1_X_CRYPTO == 1 ) /* ST_WORKAROUND: integrate 1.1.x keys only if required */
     /*!
      * Join session integrity key
      */
@@ -221,6 +738,8 @@ typedef enum eKeyIdentifier
      * Multicast key encryption key
      */
     MC_KE_KEY = LORAMAC_CRYPTO_MULTICAST_KEYS,
+    /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+#if ( LORAMAC_MAX_MC_CTX > 0 )
     /*!
      * Multicast root key index 0
      */
@@ -233,6 +752,7 @@ typedef enum eKeyIdentifier
      * Multicast Network session key index 0
      */
     MC_NWK_S_KEY_0,
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
 #if ( LORAMAC_MAX_MC_CTX > 1 )
     /*!
      * Multicast root key index 1
@@ -246,6 +766,8 @@ typedef enum eKeyIdentifier
      * Multicast Network session key index 1
      */
     MC_NWK_S_KEY_1,
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
     /*!
      * Multicast root key index 2
      */
@@ -258,6 +780,8 @@ typedef enum eKeyIdentifier
      * Multicast Network session key index 2
      */
     MC_NWK_S_KEY_2,
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
     /*!
      * Multicast root key index 3
      */
@@ -270,7 +794,8 @@ typedef enum eKeyIdentifier
      * Multicast Network session key index 3
      */
     MC_NWK_S_KEY_3,
-#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
+    /* ST_WORKAROUND_END */
     /*!
      * Zero key for slot randomization in class B
      */
@@ -286,33 +811,36 @@ typedef enum eKeyIdentifier
  */
 typedef enum eAddressIdentifier
 {
+    /* ST_WORKAROUND_BEGIN: reduced LORAMAC_MAX_MC_CTX */
+#if ( LORAMAC_MAX_MC_CTX > 0 )
     /*!
      * Multicast Address for index 0
      */
     MULTICAST_0_ADDR = 0,
-#if ( LORAMAC_MAX_MC_CTX == 1 )
-    /*!
-     * Unicast End-device address
-     */
-    UNICAST_DEV_ADDR = 1,
-#else /* LORAMAC_MAX_MC_CTX > 1 */
+#endif /* LORAMAC_MAX_MC_CTX > 0 */
+#if ( LORAMAC_MAX_MC_CTX > 1 )
     /*!
      * Multicast Address for index 1
      */
-    MULTICAST_1_ADDR = 1,
+    MULTICAST_1_ADDR,
+#endif /* LORAMAC_MAX_MC_CTX > 1 */
+#if ( LORAMAC_MAX_MC_CTX > 2 )
     /*!
      * Multicast Address for index 2
      */
-    MULTICAST_2_ADDR = 2,
+    MULTICAST_2_ADDR,
+#endif /* LORAMAC_MAX_MC_CTX > 2 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
     /*!
      * Multicast Address for index 3
      */
-    MULTICAST_3_ADDR = 3,
+    MULTICAST_3_ADDR,
+#endif /* LORAMAC_MAX_MC_CTX > 3 */
     /*!
      * Unicast End-device address
      */
-    UNICAST_DEV_ADDR = 4,
-#endif /* LORAMAC_MAX_MC_CTX */
+    UNICAST_DEV_ADDR,
+    /* ST_WORKAROUND_END */
 }AddressIdentifier_t;
 
 /*
@@ -624,6 +1152,11 @@ typedef struct sBand
      * synchronized with the current time
      */
     TimerTime_t LastBandUpdateTime;
+    /*!
+     * The last time we have assigned the max
+     * credits for the 24h interval.
+     */
+    TimerTime_t LastMaxCreditAssignTime;
     /*!
      * Current time credits which are available. This
      * is a value in ms
@@ -640,6 +1173,62 @@ typedef struct sBand
     bool ReadyForTransmission;
 }Band_t;
 
+/*!
+ * LoRaMAC channels parameters definition
+ */
+typedef union uDrRange
+{
+    /*!
+     * Byte-access to the bits
+     */
+    int8_t Value;
+    /*!
+     * Structure to store the minimum and the maximum datarate
+     */
+    struct sFields
+    {
+        /*!
+         * Minimum data rate
+         *
+         * LoRaWAN Regional Parameters V1.0.2rB
+         *
+         * The allowed ranges are region specific. Please refer to \ref DR_0 to \ref DR_15 for details.
+         */
+        int8_t Min : 4;
+        /*!
+         * Maximum data rate
+         *
+         * LoRaWAN Regional Parameters V1.0.2rB
+         *
+         * The allowed ranges are region specific. Please refer to \ref DR_0 to \ref DR_15 for details.
+         */
+        int8_t Max : 4;
+    }Fields;
+}DrRange_t;
+
+/*!
+ * LoRaMAC channel definition
+ */
+typedef struct sChannelParams
+{
+    /*!
+     * Frequency in Hz
+     */
+    uint32_t Frequency;
+    /*!
+     * Alternative frequency for RX window 1
+     */
+    uint32_t Rx1Frequency;
+    /*!
+     * Data rate definition
+     */
+    DrRange_t DrRange;
+    /*!
+     * Band index
+     */
+    uint8_t Band;
+}ChannelParams_t;
+
 /*!
  * LoRaMAC frame types
  *
@@ -700,6 +1289,58 @@ typedef enum eLoRaMacBatteryLevel
     BAT_LEVEL_NO_MEASURE             = 0xFF,
 }LoRaMacBatteryLevel_t;
 
+/*!
+ * States of the class B beacon acquisition and tracking
+ */
+typedef enum eBeaconState
+{
+    /*!
+     * Initial state to acquire the beacon
+     */
+    BEACON_STATE_ACQUISITION,
+    /*!
+     * Beacon acquisition state when a time reference is available
+     */
+    BEACON_STATE_ACQUISITION_BY_TIME,
+    /*!
+     * Handles the state when the beacon reception fails
+     */
+    BEACON_STATE_TIMEOUT,
+    /*!
+     * Handles the state when the beacon was missed due to an uplink
+     */
+    BEACON_STATE_BEACON_MISSED,
+    /*!
+     * Reacquisition state which applies the algorithm to enlarge the reception
+     * windows
+     */
+    BEACON_STATE_REACQUISITION,
+    /*!
+     * The node has locked a beacon successfully
+     */
+    BEACON_STATE_LOCKED,
+    /*!
+     * The beacon state machine is stopped due to operations with higher priority
+     */
+    BEACON_STATE_HALT,
+    /*!
+     * The node currently operates in the beacon window and is idle. In this
+     * state, the temperature measurement takes place
+     */
+    BEACON_STATE_IDLE,
+    /*!
+     * The node operates in the guard time of class B
+     */
+    BEACON_STATE_GUARD,
+    /*!
+     * The node is in receive mode to lock a beacon
+     */
+    BEACON_STATE_RX,
+    /*!
+     * The nodes switches the device class
+     */
+    BEACON_STATE_LOST,
+}BeaconState_t;
 #ifdef __cplusplus
 }
 #endif
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c
index 727a4694..9076314c 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c
@@ -38,7 +38,6 @@
 #define AS923_GET_PHY_PARAM( )                     AS923_CASE { return RegionAS923GetPhyParam( getPhy ); }
 #define AS923_SET_BAND_TX_DONE( )                  AS923_CASE { RegionAS923SetBandTxDone( txDone ); break; }
 #define AS923_INIT_DEFAULTS( )                     AS923_CASE { RegionAS923InitDefaults( params ); break; }
-#define AS923_GET_NVM_CTX( )                       AS923_CASE { return RegionAS923GetNvmCtx( params ); }
 #define AS923_VERIFY( )                            AS923_CASE { return RegionAS923Verify( verify, phyAttribute ); }
 #define AS923_APPLY_CF_LIST( )                     AS923_CASE { RegionAS923ApplyCFList( applyCFList ); break; }
 #define AS923_CHAN_MASK_SET( )                     AS923_CASE { return RegionAS923ChanMaskSet( chanMaskSet ); }
@@ -90,7 +89,6 @@
 #define AU915_GET_PHY_PARAM( )                     AU915_CASE { return RegionAU915GetPhyParam( getPhy ); }
 #define AU915_SET_BAND_TX_DONE( )                  AU915_CASE { RegionAU915SetBandTxDone( txDone ); break; }
 #define AU915_INIT_DEFAULTS( )                     AU915_CASE { RegionAU915InitDefaults( params ); break; }
-#define AU915_GET_NVM_CTX( )                       AU915_CASE { return RegionAU915GetNvmCtx( params ); }
 #define AU915_VERIFY( )                            AU915_CASE { return RegionAU915Verify( verify, phyAttribute ); }
 #define AU915_APPLY_CF_LIST( )                     AU915_CASE { RegionAU915ApplyCFList( applyCFList ); break; }
 #define AU915_CHAN_MASK_SET( )                     AU915_CASE { return RegionAU915ChanMaskSet( chanMaskSet ); }
@@ -142,7 +140,6 @@
 #define CN470_GET_PHY_PARAM( )                     CN470_CASE { return RegionCN470GetPhyParam( getPhy ); }
 #define CN470_SET_BAND_TX_DONE( )                  CN470_CASE { RegionCN470SetBandTxDone( txDone ); break; }
 #define CN470_INIT_DEFAULTS( )                     CN470_CASE { RegionCN470InitDefaults( params ); break; }
-#define CN470_GET_NVM_CTX( )                       CN470_CASE { return RegionCN470GetNvmCtx( params ); }
 #define CN470_VERIFY( )                            CN470_CASE { return RegionCN470Verify( verify, phyAttribute ); }
 #define CN470_APPLY_CF_LIST( )                     CN470_CASE { RegionCN470ApplyCFList( applyCFList ); break; }
 #define CN470_CHAN_MASK_SET( )                     CN470_CASE { return RegionCN470ChanMaskSet( chanMaskSet ); }
@@ -194,7 +191,6 @@
 #define CN779_GET_PHY_PARAM( )                     CN779_CASE { return RegionCN779GetPhyParam( getPhy ); }
 #define CN779_SET_BAND_TX_DONE( )                  CN779_CASE { RegionCN779SetBandTxDone( txDone ); break; }
 #define CN779_INIT_DEFAULTS( )                     CN779_CASE { RegionCN779InitDefaults( params ); break; }
-#define CN779_GET_NVM_CTX( )                       CN779_CASE { return RegionCN779GetNvmCtx( params ); }
 #define CN779_VERIFY( )                            CN779_CASE { return RegionCN779Verify( verify, phyAttribute ); }
 #define CN779_APPLY_CF_LIST( )                     CN779_CASE { RegionCN779ApplyCFList( applyCFList ); break; }
 #define CN779_CHAN_MASK_SET( )                     CN779_CASE { return RegionCN779ChanMaskSet( chanMaskSet ); }
@@ -246,7 +242,6 @@
 #define EU433_GET_PHY_PARAM( )                     EU433_CASE { return RegionEU433GetPhyParam( getPhy ); }
 #define EU433_SET_BAND_TX_DONE( )                  EU433_CASE { RegionEU433SetBandTxDone( txDone ); break; }
 #define EU433_INIT_DEFAULTS( )                     EU433_CASE { RegionEU433InitDefaults( params ); break; }
-#define EU433_GET_NVM_CTX( )                       EU433_CASE { return RegionEU433GetNvmCtx( params ); }
 #define EU433_VERIFY( )                            EU433_CASE { return RegionEU433Verify( verify, phyAttribute ); }
 #define EU433_APPLY_CF_LIST( )                     EU433_CASE { RegionEU433ApplyCFList( applyCFList ); break; }
 #define EU433_CHAN_MASK_SET( )                     EU433_CASE { return RegionEU433ChanMaskSet( chanMaskSet ); }
@@ -298,7 +293,6 @@
 #define EU868_GET_PHY_PARAM( )                     EU868_CASE { return RegionEU868GetPhyParam( getPhy ); }
 #define EU868_SET_BAND_TX_DONE( )                  EU868_CASE { RegionEU868SetBandTxDone( txDone ); break; }
 #define EU868_INIT_DEFAULTS( )                     EU868_CASE { RegionEU868InitDefaults( params ); break; }
-#define EU868_GET_NVM_CTX( )                       EU868_CASE { return RegionEU868GetNvmCtx( params ); }
 #define EU868_VERIFY( )                            EU868_CASE { return RegionEU868Verify( verify, phyAttribute ); }
 #define EU868_APPLY_CF_LIST( )                     EU868_CASE { RegionEU868ApplyCFList( applyCFList ); break; }
 #define EU868_CHAN_MASK_SET( )                     EU868_CASE { return RegionEU868ChanMaskSet( chanMaskSet ); }
@@ -350,7 +344,6 @@
 #define KR920_GET_PHY_PARAM( )                     KR920_CASE { return RegionKR920GetPhyParam( getPhy ); }
 #define KR920_SET_BAND_TX_DONE( )                  KR920_CASE { RegionKR920SetBandTxDone( txDone ); break; }
 #define KR920_INIT_DEFAULTS( )                     KR920_CASE { RegionKR920InitDefaults( params ); break; }
-#define KR920_GET_NVM_CTX( )                       KR920_CASE { return RegionKR920GetNvmCtx( params ); }
 #define KR920_VERIFY( )                            KR920_CASE { return RegionKR920Verify( verify, phyAttribute ); }
 #define KR920_APPLY_CF_LIST( )                     KR920_CASE { RegionKR920ApplyCFList( applyCFList ); break; }
 #define KR920_CHAN_MASK_SET( )                     KR920_CASE { return RegionKR920ChanMaskSet( chanMaskSet ); }
@@ -402,7 +395,6 @@
 #define IN865_GET_PHY_PARAM( )                     IN865_CASE { return RegionIN865GetPhyParam( getPhy ); }
 #define IN865_SET_BAND_TX_DONE( )                  IN865_CASE { RegionIN865SetBandTxDone( txDone ); break; }
 #define IN865_INIT_DEFAULTS( )                     IN865_CASE { RegionIN865InitDefaults( params ); break; }
-#define IN865_GET_NVM_CTX( )                       IN865_CASE { return RegionIN865GetNvmCtx( params ); }
 #define IN865_VERIFY( )                            IN865_CASE { return RegionIN865Verify( verify, phyAttribute ); }
 #define IN865_APPLY_CF_LIST( )                     IN865_CASE { RegionIN865ApplyCFList( applyCFList ); break; }
 #define IN865_CHAN_MASK_SET( )                     IN865_CASE { return RegionIN865ChanMaskSet( chanMaskSet ); }
@@ -454,7 +446,6 @@
 #define US915_GET_PHY_PARAM( )                     US915_CASE { return RegionUS915GetPhyParam( getPhy ); }
 #define US915_SET_BAND_TX_DONE( )                  US915_CASE { RegionUS915SetBandTxDone( txDone ); break; }
 #define US915_INIT_DEFAULTS( )                     US915_CASE { RegionUS915InitDefaults( params ); break; }
-#define US915_GET_NVM_CTX( )                       US915_CASE { return RegionUS915GetNvmCtx( params ); }
 #define US915_VERIFY( )                            US915_CASE { return RegionUS915Verify( verify, phyAttribute ); }
 #define US915_APPLY_CF_LIST( )                     US915_CASE { RegionUS915ApplyCFList( applyCFList ); break; }
 #define US915_CHAN_MASK_SET( )                     US915_CASE { return RegionUS915ChanMaskSet( chanMaskSet ); }
@@ -506,7 +497,6 @@
 #define RU864_GET_PHY_PARAM( )                     RU864_CASE { return RegionRU864GetPhyParam( getPhy ); }
 #define RU864_SET_BAND_TX_DONE( )                  RU864_CASE { RegionRU864SetBandTxDone( txDone ); break; }
 #define RU864_INIT_DEFAULTS( )                     RU864_CASE { RegionRU864InitDefaults( params ); break; }
-#define RU864_GET_NVM_CTX( )                       RU864_CASE { return RegionRU864GetNvmCtx( params ); }
 #define RU864_VERIFY( )                            RU864_CASE { return RegionRU864Verify( verify, phyAttribute ); }
 #define RU864_APPLY_CF_LIST( )                     RU864_CASE { RegionRU864ApplyCFList( applyCFList ); break; }
 #define RU864_CHAN_MASK_SET( )                     RU864_CASE { return RegionRU864ChanMaskSet( chanMaskSet ); }
@@ -636,27 +626,6 @@ void RegionInitDefaults( LoRaMacRegion_t region, InitDefaultsParams_t* params )
     }
 }
 
-void* RegionGetNvmCtx( LoRaMacRegion_t region, GetNvmCtxParams_t* params )
-{
-    switch( region )
-    {
-        AS923_GET_NVM_CTX( );
-        AU915_GET_NVM_CTX( );
-        CN470_GET_NVM_CTX( );
-        CN779_GET_NVM_CTX( );
-        EU433_GET_NVM_CTX( );
-        EU868_GET_NVM_CTX( );
-        KR920_GET_NVM_CTX( );
-        IN865_GET_NVM_CTX( );
-        US915_GET_NVM_CTX( );
-        RU864_GET_NVM_CTX( );
-        default:
-        {
-           return 0;
-        }
-    }
-}
-
 bool RegionVerify( LoRaMacRegion_t region, VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
     switch( region )
@@ -825,7 +794,7 @@ uint8_t RegionRxParamSetupReq( LoRaMacRegion_t region, RxParamSetupReqParams_t*
     }
 }
 
-uint8_t RegionNewChannelReq( LoRaMacRegion_t region, NewChannelReqParams_t* newChannelReq )
+int8_t RegionNewChannelReq( LoRaMacRegion_t region, NewChannelReqParams_t* newChannelReq )
 {
     switch( region )
     {
@@ -867,7 +836,7 @@ int8_t RegionTxParamSetupReq( LoRaMacRegion_t region, TxParamSetupReqParams_t* t
     }
 }
 
-uint8_t RegionDlChannelReq( LoRaMacRegion_t region, DlChannelReqParams_t* dlChannelReq )
+int8_t RegionDlChannelReq( LoRaMacRegion_t region, DlChannelReqParams_t* dlChannelReq )
 {
     switch( region )
     {
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.h
index cc63dd0b..47894aaf 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.h
@@ -78,511 +78,6 @@ extern "C"
 
 
 
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | SF12 - BW125
- * AU915        | SF10 - BW125
- * CN470        | SF12 - BW125
- * CN779        | SF12 - BW125
- * EU433        | SF12 - BW125
- * EU868        | SF12 - BW125
- * IN865        | SF12 - BW125
- * KR920        | SF12 - BW125
- * US915        | SF10 - BW125
- * RU864        | SF12 - BW125
- */
-#define DR_0                                        0
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | SF11 - BW125
- * AU915        | SF9  - BW125
- * CN470        | SF11 - BW125
- * CN779        | SF11 - BW125
- * EU433        | SF11 - BW125
- * EU868        | SF11 - BW125
- * IN865        | SF11 - BW125
- * KR920        | SF11 - BW125
- * US915        | SF9  - BW125
- * RU864        | SF11 - BW125
- */
-#define DR_1                                        1
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | SF10 - BW125
- * AU915        | SF8  - BW125
- * CN470        | SF10 - BW125
- * CN779        | SF10 - BW125
- * EU433        | SF10 - BW125
- * EU868        | SF10 - BW125
- * IN865        | SF10 - BW125
- * KR920        | SF10 - BW125
- * US915        | SF8  - BW125
- * RU864        | SF10 - BW125
- */
-#define DR_2                                        2
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | SF9  - BW125
- * AU915        | SF7  - BW125
- * CN470        | SF9  - BW125
- * CN779        | SF9  - BW125
- * EU433        | SF9  - BW125
- * EU868        | SF9  - BW125
- * IN865        | SF9  - BW125
- * KR920        | SF9  - BW125
- * US915        | SF7  - BW125
- * RU864        | SF9  - BW125
- */
-#define DR_3                                        3
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | SF8  - BW125
- * AU915        | SF8  - BW500
- * CN470        | SF8  - BW125
- * CN779        | SF8  - BW125
- * EU433        | SF8  - BW125
- * EU868        | SF8  - BW125
- * IN865        | SF8  - BW125
- * KR920        | SF8  - BW125
- * US915        | SF8  - BW500
- * RU864        | SF8  - BW125
- */
-#define DR_4                                        4
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | SF7  - BW125
- * AU915        | RFU
- * CN470        | SF7  - BW125
- * CN779        | SF7  - BW125
- * EU433        | SF7  - BW125
- * EU868        | SF7  - BW125
- * IN865        | SF7  - BW125
- * KR920        | SF7  - BW125
- * US915        | RFU
- * RU864        | SF7  - BW125
- */
-#define DR_5                                        5
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | SF7  - BW250
- * AU915        | RFU
- * CN470        | SF12 - BW125
- * CN779        | SF7  - BW250
- * EU433        | SF7  - BW250
- * EU868        | SF7  - BW250
- * IN865        | SF7  - BW250
- * KR920        | RFU
- * US915        | RFU
- * RU864        | SF7  - BW250
- */
-#define DR_6                                        6
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | FSK
- * AU915        | RFU
- * CN470        | SF12 - BW125
- * CN779        | FSK
- * EU433        | FSK
- * EU868        | FSK
- * IN865        | FSK
- * KR920        | RFU
- * US915        | RFU
- * RU864        | FSK
- */
-#define DR_7                                        7
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | RFU
- * AU915        | SF12 - BW500
- * CN470        | RFU
- * CN779        | RFU
- * EU433        | RFU
- * EU868        | RFU
- * IN865        | RFU
- * KR920        | RFU
- * US915        | SF12 - BW500
- * RU864        | RFU
- */
-#define DR_8                                        8
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | RFU
- * AU915        | SF11 - BW500
- * CN470        | RFU
- * CN779        | RFU
- * EU433        | RFU
- * EU868        | RFU
- * IN865        | RFU
- * KR920        | RFU
- * US915        | SF11 - BW500
- * RU864        | RFU
- */
-#define DR_9                                        9
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | RFU
- * AU915        | SF10 - BW500
- * CN470        | RFU
- * CN779        | RFU
- * EU433        | RFU
- * EU868        | RFU
- * IN865        | RFU
- * KR920        | RFU
- * US915        | SF10 - BW500
- * RU864        | RFU
- */
-#define DR_10                                       10
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | RFU
- * AU915        | SF9  - BW500
- * CN470        | RFU
- * CN779        | RFU
- * EU433        | RFU
- * EU868        | RFU
- * IN865        | RFU
- * KR920        | RFU
- * US915        | SF9  - BW500
- * RU864        | RFU
- */
-#define DR_11                                       11
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | RFU
- * AU915        | SF8  - BW500
- * CN470        | RFU
- * CN779        | RFU
- * EU433        | RFU
- * EU868        | RFU
- * IN865        | RFU
- * KR920        | RFU
- * US915        | SF8  - BW500
- * RU864        | RFU
- */
-#define DR_12                                       12
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | RFU
- * AU915        | SF7  - BW500
- * CN470        | RFU
- * CN779        | RFU
- * EU433        | RFU
- * EU868        | RFU
- * IN865        | RFU
- * KR920        | RFU
- * US915        | SF7  - BW500
- * RU864        | RFU
- */
-#define DR_13                                       13
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | RFU
- * AU915        | RFU
- * CN470        | RFU
- * CN779        | RFU
- * EU433        | RFU
- * EU868        | RFU
- * IN865        | RFU
- * KR920        | RFU
- * US915        | RFU
- * RU864        | RFU
- */
-#define DR_14                                       14
-
-/*!
- * Region       | SF
- * ------------ | :-----:
- * AS923        | RFU
- * AU915        | RFU
- * CN470        | RFU
- * CN779        | RFU
- * EU433        | RFU
- * EU868        | RFU
- * IN865        | RFU
- * KR920        | RFU
- * US915        | RFU
- * RU864        | RFU
- */
-#define DR_15                                       15
-
-
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | Max EIRP
- * AU915        | Max EIRP
- * CN470        | Max EIRP
- * CN779        | Max EIRP
- * EU433        | Max EIRP
- * EU868        | Max EIRP
- * IN865        | Max EIRP
- * KR920        | Max EIRP
- * US915        | Max ERP
- * RU864        | Max EIRP
- */
-#define TX_POWER_0                                  0
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | Max EIRP - 2
- * AU915        | Max EIRP - 2
- * CN470        | Max EIRP - 2
- * CN779        | Max EIRP - 2
- * EU433        | Max EIRP - 2
- * EU868        | Max EIRP - 2
- * IN865        | Max EIRP - 2
- * KR920        | Max EIRP - 2
- * US915        | Max ERP - 2
- * RU864        | Max EIRP - 2
- */
-#define TX_POWER_1                                  1
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | Max EIRP - 4
- * AU915        | Max EIRP - 4
- * CN470        | Max EIRP - 4
- * CN779        | Max EIRP - 4
- * EU433        | Max EIRP - 4
- * EU868        | Max EIRP - 4
- * IN865        | Max EIRP - 4
- * KR920        | Max EIRP - 4
- * US915        | Max ERP - 4
- * RU864        | Max EIRP - 4
- */
-#define TX_POWER_2                                  2
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | Max EIRP - 6
- * AU915        | Max EIRP - 6
- * CN470        | Max EIRP - 6
- * CN779        | Max EIRP - 6
- * EU433        | Max EIRP - 6
- * EU868        | Max EIRP - 6
- * IN865        | Max EIRP - 6
- * KR920        | Max EIRP - 6
- * US915        | Max ERP - 6
- * RU864        | Max EIRP - 6
- */
-#define TX_POWER_3                                  3
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | Max EIRP - 8
- * AU915        | Max EIRP - 8
- * CN470        | Max EIRP - 8
- * CN779        | Max EIRP - 8
- * EU433        | Max EIRP - 8
- * EU868        | Max EIRP - 8
- * IN865        | Max EIRP - 8
- * KR920        | Max EIRP - 8
- * US915        | Max ERP - 8
- * RU864        | Max EIRP - 8
- */
-#define TX_POWER_4                                  4
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | Max EIRP - 10
- * AU915        | Max EIRP - 10
- * CN470        | Max EIRP - 10
- * CN779        | Max EIRP - 10
- * EU433        | Max EIRP - 10
- * EU868        | Max EIRP - 10
- * IN865        | Max EIRP - 10
- * KR920        | Max EIRP - 10
- * US915        | Max ERP - 10
- * RU864        | Max EIRP - 10
- */
-#define TX_POWER_5                                  5
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | Max EIRP - 12
- * AU915        | Max EIRP - 12
- * CN470        | Max EIRP - 12
- * CN779        | -
- * EU433        | -
- * EU868        | Max EIRP - 12
- * IN865        | Max EIRP - 12
- * KR920        | Max EIRP - 12
- * US915        | Max ERP - 12
- * RU864        | Max EIRP - 12
- */
-#define TX_POWER_6                                  6
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | Max EIRP - 14
- * AU915        | Max EIRP - 14
- * CN470        | Max EIRP - 14
- * CN779        | -
- * EU433        | -
- * EU868        | Max EIRP - 14
- * IN865        | Max EIRP - 14
- * KR920        | Max EIRP - 14
- * US915        | Max ERP - 14
- * RU864        | Max EIRP - 14
- */
-#define TX_POWER_7                                  7
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | -
- * AU915        | Max EIRP - 16
- * CN470        | -
- * CN779        | -
- * EU433        | -
- * EU868        | -
- * IN865        | Max EIRP - 16
- * KR920        | -
- * US915        | Max ERP - 16
- * RU864        | -
- */
-#define TX_POWER_8                                  8
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | -
- * AU915        | Max EIRP - 18
- * CN470        | -
- * CN779        | -
- * EU433        | -
- * EU868        | -
- * IN865        | Max EIRP - 18
- * KR920        | -
- * US915        | Max ERP - 18
- * RU864        | -
- */
-#define TX_POWER_9                                  9
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | -
- * AU915        | Max EIRP - 20
- * CN470        | -
- * CN779        | -
- * EU433        | -
- * EU868        | -
- * IN865        | Max EIRP - 20
- * KR920        | -
- * US915        | Max ERP - 20
- * RU864        | -
- */
-#define TX_POWER_10                                 10
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | -
- * AU915        | Max EIRP - 22
- * CN470        | -
- * CN779        | -
- * EU433        | -
- * EU868        | -
- * IN865        | -
- * KR920        | -
- * US915        | Max ERP - 22
- * RU864        | -
- */
-#define TX_POWER_11                                 11
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | -
- * AU915        | Max EIRP - 24
- * CN470        | -
- * CN779        | -
- * EU433        | -
- * EU868        | -
- * IN865        | -
- * KR920        | -
- * US915        | Max ERP - 24
- * RU864        | -
- */
-#define TX_POWER_12                                 12
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | -
- * AU915        | Max EIRP - 26
- * CN470        | -
- * CN779        | -
- * EU433        | -
- * EU868        | -
- * IN865        | -
- * KR920        | -
- * US915        | Max ERP - 26
- * RU864        | -
- */
-#define TX_POWER_13                                 13
-
-/*!
- * Region       | dBM
- * ------------ | :-----:
- * AS923        | -
- * AU915        | Max EIRP - 28
- * CN470        | -
- * CN779        | -
- * EU433        | -
- * EU868        | -
- * IN865        | -
- * KR920        | -
- * US915        | Max ERP - 28
- * RU864        | -
- */
-#define TX_POWER_14                                 14
-
-/*!
- * RFU
- */
-#define TX_POWER_15                                 15
-
-
-
 /*!
  * Enumeration of phy attributes.
  */
@@ -649,10 +144,12 @@ typedef enum ePhyAttribute
      * Maximum payload possible.
      */
     PHY_MAX_PAYLOAD,
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     /*!
      * Maximum payload possible when repeater support is enabled.
      */
     PHY_MAX_PAYLOAD_REPEATER,
+    /* ST_WORKAROUND_END */
     /*!
      * Duty cycle.
      */
@@ -799,14 +296,14 @@ typedef enum ePhyAttribute
      * The beacon channel datarate.
      */
     PHY_BEACON_CHANNEL_DR,
-    /*!
-     * The frequency stepwidth between the beacon channels.
-     */
-    PHY_BEACON_CHANNEL_STEPWIDTH,
     /*!
      * The number of channels for the beacon reception.
      */
     PHY_BEACON_NB_CHANNELS,
+    /*!
+     * The static offset for the downlink channel calculation.
+     */
+    PHY_BEACON_CHANNEL_OFFSET,
     /*!
      * Ping slot channel frequency.
      */
@@ -815,7 +312,7 @@ typedef enum ePhyAttribute
      * The datarate of a ping slot channel.
      */
     PHY_PING_SLOT_CHANNEL_DR,
-    /*
+    /*!
      * The number of channels for the ping slot reception.
      */
     PHY_PING_SLOT_NB_CHANNELS,
@@ -850,11 +347,7 @@ typedef enum eInitType
      * Activates the default channels. Leaves all other active channels
      * active.
      */
-    INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS,
-    /*!
-     * Restores internal context from passed pointer.
-     */
-    INIT_TYPE_RESTORE_CTX
+    INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS
 }InitType_t;
 
 typedef enum eChannelsMask
@@ -989,26 +482,18 @@ typedef struct sSetBandTxDoneParams
 typedef struct sInitDefaultsParams
 {
     /*!
-     * Pointer to region module context to be restored.
+     * Pointer to region NVM group1.
      */
-    void* NvmCtx;
+    void* NvmGroup1;
     /*!
-     * Sets the initialization type.
+     * Pointer to region NVM group2.
      */
-     InitType_t Type;
-}InitDefaultsParams_t;
-
-/*!
- * Parameter structure for the function RegionGetNvmCtx.
- */
-typedef struct sGetNvmCtxParams
-{
+    void* NvmGroup2;
     /*!
-     * Size of module context.
+     * Sets the initialization type.
      */
-     size_t nvmCtxSize;
-}GetNvmCtxParams_t;
-
+    InitType_t Type;
+}InitDefaultsParams_t;
 
 /*!
  * Parameter structure for the function RegionVerify.
@@ -1114,10 +599,12 @@ typedef struct sRxConfigParams
      * Downlink dwell time.
      */
     uint8_t DownlinkDwellTime;
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     /*!
      * Set to true, if a repeater is supported.
      */
     bool RepeaterSupport;
+    /* ST_WORKAROUND_END */
     /*!
      * Set to true, if RX should be continuous.
      */
@@ -1437,17 +924,6 @@ void RegionSetBandTxDone( LoRaMacRegion_t region, SetBandTxDoneParams_t* txDone
  */
 void RegionInitDefaults( LoRaMacRegion_t region, InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [IN] region LoRaWAN region.
- *
- * \param [IN] params Pointer to the function parameters.
- *
- * \retval     Points to a structure where the module store its non-volatile context.
- */
-void* RegionGetNvmCtx( LoRaMacRegion_t region, GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -1604,7 +1080,7 @@ uint8_t RegionRxParamSetupReq( LoRaMacRegion_t region, RxParamSetupReqParams_t*
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionNewChannelReq( LoRaMacRegion_t region, NewChannelReqParams_t* newChannelReq );
+int8_t RegionNewChannelReq( LoRaMacRegion_t region, NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -1628,7 +1104,7 @@ int8_t RegionTxParamSetupReq( LoRaMacRegion_t region, TxParamSetupReqParams_t* t
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionDlChannelReq( LoRaMacRegion_t region, DlChannelReqParams_t* dlChannelReq );
+int8_t RegionDlChannelReq( LoRaMacRegion_t region, DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c
index 39da9b49..3438c2c6 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c
@@ -28,10 +28,20 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionAS923.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for AS923
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionAS923.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE                1
@@ -71,6 +81,8 @@
 
 // Channel plan CHANNEL_PLAN_GROUP_AS923_1_JP
 
+#define REGION_AS923_FREQ_OFFSET          0
+
 /*!
  * Restrict AS923 frequencies to channels 24 to 38
  * Center frequencies 920.6 MHz to 923.4 MHz @ 200 kHz max bandwidth
@@ -91,84 +103,24 @@
 #define AS923_RX_MAX_DATARATE             DR_5
 
 #undef AS923_DEFAULT_UPLINK_DWELL_TIME
-#define AS923_DEFAULT_UPLINK_DWELL_TIME   DR_5
+#define AS923_DEFAULT_UPLINK_DWELL_TIME   0
 
 #undef AS923_DEFAULT_DOWNLINK_DWELL_TIME
-#define AS923_DEFAULT_DOWNLINK_DWELL_TIME DR_5
+#define AS923_DEFAULT_DOWNLINK_DWELL_TIME 0
 
 #undef AS923_DEFAULT_MAX_EIRP
 #define AS923_DEFAULT_MAX_EIRP            13.0f
 
 #endif /* REGION_AS923_DEFAULT_CHANNEL_PLAN */
 
-/*!
- * Region specific context
- */
-typedef struct sRegionAS923NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ AS923_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ AS923_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionAS923NvmCtx_t;
-
+#if defined( REGION_AS923 )
 /*
  * Non-volatile module context.
  */
-static RegionAS923NvmCtx_t NvmCtx;
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 // Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsAS923[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
-
-    return txPowerResult;
-}
-
 static bool VerifyRfFreq( uint32_t freq )
 {
     // Check radio driver support
@@ -187,7 +139,7 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesAS923[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsAS923 );
     TimerTime_t timeOnAir = 0;
 
     if( datarate == DR_7 )
@@ -200,11 +152,13 @@ static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
     }
     return timeOnAir;
 }
+#endif /* REGION_AS923 */
 
 PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_AS923 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -238,14 +192,16 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            if( getPhy->UplinkDwellTime == 0 )
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
             {
-                phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, AS923_TX_MIN_DATARATE );
-            }
-            else
-            {
-                phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, AS923_DWELL_LIMIT_DATARATE );
-            }
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )AS923_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )( ( getPhy->UplinkDwellTime == 0 ) ? AS923_TX_MIN_DATARATE : AS923_DWELL_LIMIT_DATARATE ),
+                .NbChannels = AS923_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -260,12 +216,12 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = AS923_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = AS923_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -276,10 +232,11 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
             }
             else
             {
-                phyParam.Value = MaxPayloadOfDatarateDwell1UpAS923[getPhy->Datarate];
+                phyParam.Value = MaxPayloadOfDatarateDwell1AS923[getPhy->Datarate];
             }
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             if( getPhy->UplinkDwellTime == 0 )
@@ -288,10 +245,11 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
             }
             else
             {
-                phyParam.Value = MaxPayloadOfDatarateDwell1UpAS923[getPhy->Datarate];
+                phyParam.Value = MaxPayloadOfDatarateDwell1AS923[getPhy->Datarate];
             }
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = AS923_DUTY_CYCLE_ENABLED;
@@ -304,42 +262,42 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = AS923_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = AS923_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = AS923_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = AS923_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = AS923_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( AS923_ACKTIMEOUT + randr( -AS923_ACK_TIMEOUT_RND, AS923_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = AS923_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
         {
-            phyParam.Value = AS923_RX_WND_2_FREQ;
+            phyParam.Value = AS923_RX_WND_2_FREQ - REGION_AS923_FREQ_OFFSET;
             break;
         }
         case PHY_DEF_RX2_DR:
@@ -349,12 +307,12 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -364,7 +322,7 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
@@ -389,7 +347,7 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BEACON_CHANNEL_FREQ:
         {
-            phyParam.Value = AS923_BEACON_CHANNEL_FREQ;
+            phyParam.Value = AS923_BEACON_CHANNEL_FREQ - REGION_AS923_FREQ_OFFSET;
             break;
         }
         case PHY_BEACON_FORMAT:
@@ -421,7 +379,7 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsAS923 );
             break;
         }
         default:
@@ -430,17 +388,21 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_AS923 */
     return phyParam;
 }
 
 void RegionAS923SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_AS923 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_AS923 */
 }
 
 void RegionAS923InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_AS923 )
     Band_t bands[AS923_MAX_NB_BANDS] =
     {
         AS923_BAND0
@@ -450,41 +412,45 @@ void RegionAS923InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Default bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * AS923_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * AS923_MAX_NB_BANDS );
 
             // Default channels
-            NvmCtx.Channels[0] = ( ChannelParams_t ) AS923_LC1;
-            NvmCtx.Channels[1] = ( ChannelParams_t ) AS923_LC2;
+            RegionNvmGroup2->Channels[0] = ( ChannelParams_t ) AS923_LC1;
+            RegionNvmGroup2->Channels[1] = ( ChannelParams_t ) AS923_LC2;
+
+            // Apply frequency offset
+            RegionNvmGroup2->Channels[0].Frequency -= REGION_AS923_FREQ_OFFSET;
+            RegionNvmGroup2->Channels[1].Frequency -= REGION_AS923_FREQ_OFFSET;
 
             // Default ChannelsMask
-            NvmCtx.ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 );
+            RegionNvmGroup2->ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 );
 
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
         {
             // Reset Channels Rx1Frequency to default 0
-            NvmCtx.Channels[0].Rx1Frequency = 0;
-            NvmCtx.Channels[1].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[0].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[1].Rx1Frequency = 0;
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Activate channels default mask
-            NvmCtx.ChannelsMask[0] |= NvmCtx.ChannelsDefaultMask[0];
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
-            }
+            RegionNvmGroup2->ChannelsMask[0] |= RegionNvmGroup2->ChannelsDefaultMask[0];
             break;
         }
         default:
@@ -492,16 +458,12 @@ void RegionAS923InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionAS923GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionAS923NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_AS923 */
 }
 
 bool RegionAS923Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_AS923 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -547,10 +509,14 @@ bool RegionAS923Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_AS923 */
 }
 
 void RegionAS923ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_AS923 )
     ChannelParams_t newChannel;
     ChannelAddParams_t channelAdd;
     ChannelRemoveParams_t channelRemove;
@@ -606,52 +572,58 @@ void RegionAS923ApplyCFList( ApplyCFListParams_t* applyCFList )
             RegionAS923ChannelsRemove( &channelRemove );
         }
     }
+#endif /* REGION_AS923 */
 }
 
 bool RegionAS923ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_AS923 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_AS923 */
 }
 
 void RegionAS923ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_AS923 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, AS923_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsAS923 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesAS923[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesAS923[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesAS923[rxConfigParams->Datarate], BandwidthsAS923[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesAS923[rxConfigParams->Datarate], BandwidthsAS923[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_AS923 */
 }
 
 bool RegionAS923RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_AS923 )
     RadioModems_t modem;
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
@@ -666,11 +638,11 @@ bool RegionAS923RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     if( rxConfig->RxSlot == RX_SLOT_WIN_1 )
     {
         // Apply window 1 frequency
-        frequency = NvmCtx.Channels[rxConfig->Channel].Frequency;
+        frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Frequency;
         // Apply the alternative RX 1 window frequency, if it is available
-        if( NvmCtx.Channels[rxConfig->Channel].Rx1Frequency != 0 )
+        if( RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency != 0 )
         {
-            frequency = NvmCtx.Channels[rxConfig->Channel].Rx1Frequency;
+            frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency;
         }
     }
 
@@ -691,7 +663,7 @@ bool RegionAS923RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         Radio.SetRxConfig( modem, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
     }
 
-    // Check for repeater support
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterDwell0AS923[dr];
@@ -702,27 +674,33 @@ bool RegionAS923RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     }
 
     Radio.SetMaxPayloadLength( modem, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_AS923 */
 }
 
 bool RegionAS923TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_AS923 )
     RadioModems_t modem;
     int8_t phyDr = DataratesAS923[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsAS923 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, txConfig->MaxEirp, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     if( txConfig->Datarate == DR_7 )
     { // High Speed FSK channel
@@ -735,7 +713,7 @@ bool RegionAS923TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     }
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Update time-on-air
@@ -746,11 +724,15 @@ bool RegionAS923TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_AS923 */
 }
 
 uint8_t RegionAS923LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_AS923 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
@@ -793,7 +775,7 @@ uint8_t RegionAS923LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
             {
                 if( linkAdrParams.ChMaskCtrl == 6 )
                 {
-                    if( NvmCtx.Channels[i].Frequency != 0 )
+                    if( RegionNvmGroup2->Channels[i].Frequency != 0 )
                     {
                         chMask |= 1 << i;
                     }
@@ -801,7 +783,7 @@ uint8_t RegionAS923LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
                 else
                 {
                     if( ( ( chMask & ( 1 << i ) ) != 0 ) &&
-                        ( NvmCtx.Channels[i].Frequency == 0 ) )
+                        ( RegionNvmGroup2->Channels[i].Frequency == 0 ) )
                     {// Trying to enable an undefined channel
                         status &= 0xFE; // Channel mask KO
                     }
@@ -827,7 +809,7 @@ uint8_t RegionAS923LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = &chMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = AS923_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = AS923_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = AS923_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -839,9 +821,9 @@ uint8_t RegionAS923LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Set the channels mask to a default value
-        memset1( ( uint8_t* ) NvmCtx.ChannelsMask, 0, sizeof( NvmCtx.ChannelsMask ) );
+        memset1( ( uint8_t* ) RegionNvmGroup2->ChannelsMask, 0, sizeof( RegionNvmGroup2->ChannelsMask ) );
         // Update the channels mask
-        NvmCtx.ChannelsMask[0] = chMask;
+        RegionNvmGroup2->ChannelsMask[0] = chMask;
     }
 
     // Update status variables
@@ -850,12 +832,14 @@ uint8_t RegionAS923LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_AS923 */
     return status;
 }
 
 uint8_t RegionAS923RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_AS923 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -875,10 +859,11 @@ uint8_t RegionAS923RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_AS923 */
     return status;
 }
 
-uint8_t RegionAS923NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionAS923NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
     uint8_t status = 0x03;
     ChannelAddParams_t channelAdd;
@@ -937,10 +922,11 @@ int8_t RegionAS923TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
     return 0;
 }
 
-uint8_t RegionAS923DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionAS923DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
     uint8_t status = 0x03;
 
+#if defined( REGION_AS923 )
     // Verify if the frequency is supported
     if( VerifyRfFreq( dlChannelReq->Rx1Frequency ) == false )
     {
@@ -948,7 +934,7 @@ uint8_t RegionAS923DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     }
 
     // Verify if an uplink frequency exists
-    if( NvmCtx.Channels[dlChannelReq->ChannelId].Frequency == 0 )
+    if( RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Frequency == 0 )
     {
         status &= 0xFD;
     }
@@ -956,40 +942,47 @@ uint8_t RegionAS923DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     // Apply Rx1 frequency, if the status is OK
     if( status == 0x03 )
     {
-        NvmCtx.Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
+        RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
     }
 
+#endif /* REGION_AS923 */
     return status;
 }
 
 int8_t RegionAS923AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
+#if defined( REGION_AS923 )
     // Only AS923_DWELL_LIMIT_DATARATE is supported
     return AS923_DWELL_LIMIT_DATARATE;
+#else
+    return -1;
+#endif /* REGION_AS923 */
 }
 
 LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_AS923 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[AS923_MAX_NB_CHANNELS] = { 0 };
     RegionCommonIdentifyChannelsParam_t identifyChannelsParam;
     RegionCommonCountNbOfEnabledChannelsParams_t countChannelsParams;
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
+    uint16_t joinChannels = AS923_JOIN_CHANNELS;
 
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMask, 0, 1 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup2->ChannelsMask, 0, 1 ) == 0 )
     { // Reactivate default channels
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 );
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMask;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup2->ChannelsMask;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = AS923_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = AS923_JOIN_CHANNELS;
+    countChannelsParams.JoinChannels = &joinChannels;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -1018,7 +1011,7 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_
 
             // Perform carrier sense for AS923_CARRIER_SENSE_TIME
             // If the channel is free, we can stop the LBT mechanism
-            if( Radio.IsChannelFree( NvmCtx.Channels[channelNext].Frequency, AS923_LBT_RX_BANDWIDTH, AS923_RSSI_FREE_TH, AS923_CARRIER_SENSE_TIME ) == true )
+            if( Radio.IsChannelFree( RegionNvmGroup2->Channels[channelNext].Frequency, AS923_LBT_RX_BANDWIDTH, AS923_RSSI_FREE_TH, AS923_CARRIER_SENSE_TIME ) == true )
             {
                 // Free channel found
                 *channel = channelNext;
@@ -1036,13 +1029,17 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_
     else if( status == LORAMAC_STATUS_NO_CHANNEL_FOUND )
     {
         // Datarate not supported by any channel, restore defaults
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_AS923 */
 }
 
 LoRaMacStatus_t RegionAS923ChannelAdd( ChannelAddParams_t* channelAdd )
 {
+#if defined( REGION_AS923 )
     bool drInvalid = false;
     bool freqInvalid = false;
     uint8_t id = channelAdd->ChannelId;
@@ -1094,14 +1091,18 @@ LoRaMacStatus_t RegionAS923ChannelAdd( ChannelAddParams_t* channelAdd )
         return LORAMAC_STATUS_FREQUENCY_INVALID;
     }
 
-    memcpy1( ( uint8_t* ) &(NvmCtx.Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( NvmCtx.Channels[id] ) );
-    NvmCtx.Channels[id].Band = 0;
-    NvmCtx.ChannelsMask[0] |= ( 1 << id );
+    memcpy1( ( uint8_t* ) &(RegionNvmGroup2->Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( RegionNvmGroup2->Channels[id] ) );
+    RegionNvmGroup2->Channels[id].Band = 0;
+    RegionNvmGroup2->ChannelsMask[0] |= ( 1 << id );
     return LORAMAC_STATUS_OK;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_AS923 */
 }
 
 bool RegionAS923ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 {
+#if defined( REGION_AS923 )
     uint8_t id = channelRemove->ChannelId;
 
     if( id < AS923_NUMB_DEFAULT_CHANNELS )
@@ -1110,25 +1111,31 @@ bool RegionAS923ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
     }
 
     // Remove the channel from the list of channels
-    NvmCtx.Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
+    RegionNvmGroup2->Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
 
-    return RegionCommonChanDisable( NvmCtx.ChannelsMask, id, AS923_MAX_NB_CHANNELS );
+    return RegionCommonChanDisable( RegionNvmGroup2->ChannelsMask, id, AS923_MAX_NB_CHANNELS );
+#else
+    return false;
+#endif /* REGION_AS923 */
 }
 
 void RegionAS923SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_AS923 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, continuousWave->MaxEirp, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_AS923 */
 }
 
 uint8_t RegionAS923ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_AS923 )
     // Initialize minDr for a downlink dwell time configuration of 0
     int8_t minDr = DR_0;
 
@@ -1140,10 +1147,15 @@ uint8_t RegionAS923ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
 
     // Apply offset formula
     return MIN( DR_5, MAX( minDr, dr - EffectiveRx1DrOffsetAS923[drOffset] ) );
+#else
+    return 0;
+#endif /* REGION_AS923 */
+
 }
 
 void RegionAS923RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_AS923 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesAS923;
@@ -1158,4 +1170,5 @@ void RegionAS923RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = AS923_BEACON_CHANNEL_DR;
+#endif /* REGION_AS923 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.h
index 9270d9ed..8edd214a 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionAS923.h
+  * @author  MCD Application Team
+  * @brief   Region definition for AS923
+  ******************************************************************************
+  */
 #ifndef __REGION_AS923_H__
 #define __REGION_AS923_H__
 
@@ -124,11 +134,6 @@ extern "C"
  */
 #define AS923_MAX_RX1_DR_OFFSET                     7
 
-/*!
- * Default Rx1 receive datarate offset
- */
-#define AS923_DEFAULT_RX1_DR_OFFSET                 0
-
 /*!
  * Minimal Tx output power that can be used by the node
  */
@@ -164,16 +169,6 @@ extern "C"
  */
 #define AS923_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define AS923_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define AS923_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -184,41 +179,6 @@ extern "C"
  */
 #define AS923_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define AS923_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define AS923_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define AS923_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define AS923_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define AS923_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define AS923_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define AS923_ACK_TIMEOUT_RND                       1000
-
 #if ( AS923_DEFAULT_DATARATE > DR_5 )
 #error "A default DR higher than DR_5 may lead to connectivity loss."
 #endif
@@ -283,9 +243,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define AS923_BAND0                                 { 100, AS923_MAX_TX_POWER, 0, 0, 0, 0 } //  1.0 %
+#define AS923_BAND0                                 { 100, AS923_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  1.0 %
 
 /*!
  * LoRaMac default channel 1
@@ -324,6 +284,7 @@ static const uint8_t DataratesAS923[]  = { 12, 11, 10,  9,  8,  7, 7, 50 };
  */
 static const uint32_t BandwidthsAS923[] = { 125000, 125000, 125000, 125000, 125000, 125000, 250000, 0 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  * The table is valid for the dwell time configuration of 0 for uplinks and downlinks.
@@ -339,15 +300,10 @@ static const uint8_t MaxPayloadOfDatarateRepeaterDwell0AS923[] = { 51, 51, 51, 1
 
 /*!
  * Maximum payload with respect to the datarate index. Can operate with and without repeater.
- * The table proides repeater support. The table is only valid for uplinks.
+ * The table provides repeater support. The table is for uplinks and downlinks.
  */
-static const uint8_t MaxPayloadOfDatarateDwell1UpAS923[] = { 0, 0, 11, 53, 125, 242, 242, 242 };
-
-/*!
- * Maximum payload with respect to the datarate index. Can operate with and without repeater.
- * The table proides repeater support. The table is only valid for downlinks.
- */
-static const uint8_t MaxPayloadOfDatarateDwell1DownAS923[] = { 0, 0, 11, 53, 126, 242, 242, 242 };
+static const uint8_t MaxPayloadOfDatarateDwell1AS923[] = { 0, 0, 11, 53, 125, 242, 242, 242 };
+/* ST_WORKAROUND_END */
 
 /*!
  * Effective datarate offsets for receive window 1.
@@ -377,15 +333,6 @@ void RegionAS923SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionAS923InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionAS923GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -478,7 +425,7 @@ uint8_t RegionAS923RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionAS923NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionAS923NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -498,7 +445,7 @@ int8_t RegionAS923TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionAS923DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionAS923DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c
index 13a3aa0f..e71fbbb5 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c
@@ -28,10 +28,21 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionAU915.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for AU915
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionAU915.h"
+#include "RegionBaseUS.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE              6
@@ -39,81 +50,12 @@
 // A mask to select only valid 500KHz channels
 #define CHANNELS_MASK_500KHZ_MASK       0x00FF
 
-/*!
- * Region specific context
- */
-typedef struct sRegionAU915NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ AU915_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ AU915_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels remaining
-     */
-    uint16_t ChannelsMaskRemaining[CHANNELS_MASK_SIZE];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionAU915NvmCtx_t;
-
+#if defined( REGION_AU915 )
 /*
  * Non-volatile module context.
  */
-static RegionAU915NvmCtx_t NvmCtx;
-
-// Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else if( dr == DR_8 )
-    {   // DR_7 is not allowed
-        nextLowerDr = DR_6;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsAU915[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
-
-    return txPowerResult;
-}
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 static bool VerifyRfFreq( uint32_t freq )
 {
@@ -131,8 +73,7 @@ static bool VerifyRfFreq( uint32_t freq )
         return false;
     }
 
-    // Tx frequencies for 125kHz
-    // Also includes the range for 500kHz channels
+    // Test for frequency range - take RX and TX frequencies into account
     if( ( freq < 915200000 ) ||  ( freq > 927800000 ) )
     {
         return false;
@@ -143,15 +84,17 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesAU915[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsAU915 );
 
     return Radio.TimeOnAir( MODEM_LORA, bandwidth, phyDr, 1, 8, false, pktLen, true );
 }
+#endif /* REGION_AU915 */
 
 PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_AU915 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -185,14 +128,16 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            if( getPhy->UplinkDwellTime == 0)
-            {
-                phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, AU915_TX_MIN_DATARATE );
-            }
-            else
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
             {
-                phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, AU915_DWELL_LIMIT_DATARATE );
-            }
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )AU915_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )( ( getPhy->UplinkDwellTime == 0 ) ? AU915_TX_MIN_DATARATE : AU915_DWELL_LIMIT_DATARATE ),
+                .NbChannels = AU915_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -207,12 +152,12 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = AU915_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = AU915_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -227,6 +172,7 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
             }
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             if( getPhy->UplinkDwellTime == 0)
@@ -239,6 +185,7 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
             }
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = AU915_DUTY_CYCLE_ENABLED;
@@ -251,37 +198,37 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = AU915_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = AU915_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = AU915_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = AU915_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = AU915_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( AU915_ACKTIMEOUT + randr( -AU915_ACK_TIMEOUT_RND, AU915_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = AU915_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -296,12 +243,12 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -311,7 +258,7 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
@@ -321,7 +268,7 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = AU915_DEFAULT_DOWNLINK_DWELL_TIME;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -336,7 +283,9 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BEACON_CHANNEL_FREQ:
         {
-            phyParam.Value = AU915_BEACON_CHANNEL_FREQ + ( getPhy->Channel * AU915_BEACON_CHANNEL_STEPWIDTH );
+            phyParam.Value = RegionBaseUSCalcDownlinkFrequency( getPhy->Channel,
+                                                                AU915_BEACON_CHANNEL_FREQ,
+                                                                AU915_BEACON_CHANNEL_STEPWIDTH );
             break;
         }
         case PHY_BEACON_FORMAT:
@@ -351,24 +300,16 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = AU915_BEACON_CHANNEL_DR;
             break;
         }
-        case PHY_BEACON_CHANNEL_STEPWIDTH:
-        {
-            phyParam.Value = AU915_BEACON_CHANNEL_STEPWIDTH;
-            break;
-        }
         case PHY_BEACON_NB_CHANNELS:
         {
             phyParam.Value = AU915_BEACON_NB_CHANNELS;
             break;
         }
-        case PHY_PING_SLOT_NB_CHANNELS:
-        {
-            phyParam.Value = AU915_PING_SLOT_NB_CHANNELS;
-            break;
-        }
         case PHY_PING_SLOT_CHANNEL_FREQ:
         {
-            phyParam.Value = AU915_PING_SLOT_CHANNEL_FREQ + ( getPhy->Channel * AU915_BEACON_CHANNEL_STEPWIDTH );
+            phyParam.Value = RegionBaseUSCalcDownlinkFrequency( getPhy->Channel,
+                                                                AU915_PING_SLOT_CHANNEL_FREQ,
+                                                                AU915_BEACON_CHANNEL_STEPWIDTH );
             break;
         }
         case PHY_PING_SLOT_CHANNEL_DR:
@@ -376,6 +317,11 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = AU915_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_PING_SLOT_NB_CHANNELS:
+        {
+            phyParam.Value = AU915_BEACON_NB_CHANNELS;
+            break;
+        }
         case PHY_SF_FROM_DR:
         {
             phyParam.Value = DataratesAU915[getPhy->Datarate];
@@ -383,7 +329,7 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsAU915 );
             break;
         }
         default:
@@ -392,17 +338,21 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_AU915 */
     return phyParam;
 }
 
 void RegionAU915SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_AU915 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_AU915 */
 }
 
 void RegionAU915InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_AU915 )
     Band_t bands[AU915_MAX_NB_BANDS] =
     {
         AU915_BAND0
@@ -412,49 +362,63 @@ void RegionAU915InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
+            // Initialize 8 bit channel groups index
+            RegionNvmGroup1->JoinChannelGroupsCurrentIndex = 0;
+
+            // Initialize the join trials counter
+            RegionNvmGroup1->JoinTrialsCounter = 0;
+
             // Default bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * AU915_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * AU915_MAX_NB_BANDS );
 
             // Channels
             for( uint8_t i = 0; i < AU915_MAX_NB_CHANNELS - 8; i++ )
             {
                 // 125 kHz channels
-                NvmCtx.Channels[i].Frequency = 915200000 + i * 200000;
-                NvmCtx.Channels[i].DrRange.Value = ( DR_5 << 4 ) | DR_0;
-                NvmCtx.Channels[i].Band = 0;
+                RegionNvmGroup2->Channels[i].Frequency = 915200000 + i * 200000;
+                RegionNvmGroup2->Channels[i].DrRange.Value = ( DR_5 << 4 ) | DR_0;
+                RegionNvmGroup2->Channels[i].Band = 0;
             }
             for( uint8_t i = AU915_MAX_NB_CHANNELS - 8; i < AU915_MAX_NB_CHANNELS; i++ )
             {
                 // 500 kHz channels
-                NvmCtx.Channels[i].Frequency = 915900000 + ( i - ( AU915_MAX_NB_CHANNELS - 8 ) ) * 1600000;
-                NvmCtx.Channels[i].DrRange.Value = ( DR_6 << 4 ) | DR_6;
-                NvmCtx.Channels[i].Band = 0;
+                RegionNvmGroup2->Channels[i].Frequency = 915900000 + ( i - ( AU915_MAX_NB_CHANNELS - 8 ) ) * 1600000;
+                RegionNvmGroup2->Channels[i].DrRange.Value = ( DR_6 << 4 ) | DR_6;
+                RegionNvmGroup2->Channels[i].Band = 0;
             }
 
             // Initialize channels default mask
             /* ST_WORKAROUND_BEGIN: Hybrid mode */
 #if ( HYBRID_ENABLED == 1 )
-            NvmCtx.ChannelsDefaultMask[0] = 0x00FF;
-            NvmCtx.ChannelsDefaultMask[1] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[2] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[3] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[4] = 0x0001;
-            NvmCtx.ChannelsDefaultMask[5] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[0] = 0x00FF;
+            RegionNvmGroup2->ChannelsDefaultMask[1] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[2] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[3] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[4] = 0x0001;
+            RegionNvmGroup2->ChannelsDefaultMask[5] = 0x0000;
 #else
-            NvmCtx.ChannelsDefaultMask[0] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[1] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[2] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[3] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[4] = 0x00FF;
-            NvmCtx.ChannelsDefaultMask[5] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[0] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[1] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[2] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[3] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[4] = 0x00FF;
+            RegionNvmGroup2->ChannelsDefaultMask[5] = 0x0000;
 #endif /* HYBRID_ENABLED == 1 */
             /* ST_WORKAROUND_END */
 
             // Copy channels default mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
 
             // Copy into channels mask remaining
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMaskRemaining, NvmCtx.ChannelsMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup1->ChannelsMaskRemaining, RegionNvmGroup2->ChannelsMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
@@ -464,19 +428,11 @@ void RegionAU915InitDefaults( InitDefaultsParams_t* params )
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Copy channels default mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
 
             for( uint8_t i = 0; i < CHANNELS_MASK_SIZE; i++ )
             { // Copy-And the channels mask
-                NvmCtx.ChannelsMaskRemaining[i] &= NvmCtx.ChannelsMask[i];
-            }
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
+                RegionNvmGroup1->ChannelsMaskRemaining[i] &= RegionNvmGroup2->ChannelsMask[i];
             }
             break;
         }
@@ -485,16 +441,12 @@ void RegionAU915InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionAU915GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionAU915NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_AU915 */
 }
 
 bool RegionAU915Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_AU915 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -537,10 +489,14 @@ bool RegionAU915Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_AU915 */
 }
 
 void RegionAU915ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_AU915 )
     // Size of the optional CF list must be 16 byte
     if( applyCFList->Size != 16 )
     {
@@ -556,62 +512,68 @@ void RegionAU915ApplyCFList( ApplyCFListParams_t* applyCFList )
     // ChMask0 - ChMask4 must be set (every ChMask has 16 bit)
     for( uint8_t chMaskItr = 0, cntPayload = 0; chMaskItr <= 4; chMaskItr++, cntPayload+=2 )
     {
-        NvmCtx.ChannelsMask[chMaskItr] = (uint16_t) (0x00FF & applyCFList->Payload[cntPayload]);
-        NvmCtx.ChannelsMask[chMaskItr] |= (uint16_t) (applyCFList->Payload[cntPayload+1] << 8);
+        RegionNvmGroup2->ChannelsMask[chMaskItr] = (uint16_t) (0x00FF & applyCFList->Payload[cntPayload]);
+        RegionNvmGroup2->ChannelsMask[chMaskItr] |= (uint16_t) (applyCFList->Payload[cntPayload+1] << 8);
         if( chMaskItr == 4 )
         {
-            NvmCtx.ChannelsMask[chMaskItr] = NvmCtx.ChannelsMask[chMaskItr] & CHANNELS_MASK_500KHZ_MASK;
+            RegionNvmGroup2->ChannelsMask[chMaskItr] = RegionNvmGroup2->ChannelsMask[chMaskItr] & CHANNELS_MASK_500KHZ_MASK;
         }
         // Set the channel mask to the remaining
-        NvmCtx.ChannelsMaskRemaining[chMaskItr] &= NvmCtx.ChannelsMask[chMaskItr];
+        RegionNvmGroup1->ChannelsMaskRemaining[chMaskItr] &= RegionNvmGroup2->ChannelsMask[chMaskItr];
     }
+#endif /* REGION_AU915 */
 }
 
 bool RegionAU915ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_AU915 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 6 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
 
-            NvmCtx.ChannelsDefaultMask[4] = NvmCtx.ChannelsDefaultMask[4] & CHANNELS_MASK_500KHZ_MASK;
-            NvmCtx.ChannelsDefaultMask[5] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[4] = RegionNvmGroup2->ChannelsDefaultMask[4] & CHANNELS_MASK_500KHZ_MASK;
+            RegionNvmGroup2->ChannelsDefaultMask[5] = 0x0000;
 
-            for( uint8_t i = 0; i < 6; i++ )
+            for( uint8_t i = 0; i < CHANNELS_MASK_SIZE; i++ )
             { // Copy-And the channels mask
-                NvmCtx.ChannelsMaskRemaining[i] &= NvmCtx.ChannelsMask[i];
+                RegionNvmGroup1->ChannelsMaskRemaining[i] &= RegionNvmGroup2->ChannelsMask[i];
             }
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 6 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_AU915 */
 }
 
 void RegionAU915ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_AU915 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, AU915_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsAU915 );
 
-    tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesAU915[rxConfigParams->Datarate], BandwidthsAU915[rxConfigParams->Datarate] );
+    tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesAU915[rxConfigParams->Datarate], BandwidthsAU915[rxConfigParams->Datarate] );
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_AU915 */
 }
 
 bool RegionAU915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_AU915 )
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
     int8_t phyDr = 0;
@@ -636,6 +598,7 @@ bool RegionAU915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     // Radio configuration
     Radio.SetRxConfig( MODEM_LORA, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
 
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterDwell0AU915[dr];
@@ -645,44 +608,55 @@ bool RegionAU915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         maxPayload = MaxPayloadOfDatarateDwell0AU915[dr];
     }
     Radio.SetMaxPayloadLength( MODEM_LORA, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_AU915 */
 }
 
 bool RegionAU915TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_AU915 )
     int8_t phyDr = DataratesAU915[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsAU915 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, txConfig->MaxEirp, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     Radio.SetTxConfig( MODEM_LORA, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Setup maximum payload length of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
+
     // Update time-on-air
     *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_AU915 */
 }
 
 uint8_t RegionAU915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_AU915 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
@@ -692,7 +666,7 @@ uint8_t RegionAU915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     RegionCommonLinkAdrReqVerifyParams_t linkAdrVerifyParams;
 
     // Initialize local copy of channels mask
-    RegionCommonChanMaskCopy( channelsMask, NvmCtx.ChannelsMask, 6 );
+    RegionCommonChanMaskCopy( channelsMask, RegionNvmGroup2->ChannelsMask, 6 );
 
     while( bytesProcessed < linkAdrReq->PayloadSize )
     {
@@ -810,7 +784,7 @@ uint8_t RegionAU915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = channelsMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = AU915_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = AU915_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = AU915_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -822,14 +796,14 @@ uint8_t RegionAU915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Copy Mask
-        RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, channelsMask, 6 );
-
-        NvmCtx.ChannelsMaskRemaining[0] &= NvmCtx.ChannelsMask[0];
-        NvmCtx.ChannelsMaskRemaining[1] &= NvmCtx.ChannelsMask[1];
-        NvmCtx.ChannelsMaskRemaining[2] &= NvmCtx.ChannelsMask[2];
-        NvmCtx.ChannelsMaskRemaining[3] &= NvmCtx.ChannelsMask[3];
-        NvmCtx.ChannelsMaskRemaining[4] = NvmCtx.ChannelsMask[4];
-        NvmCtx.ChannelsMaskRemaining[5] = NvmCtx.ChannelsMask[5];
+        RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, channelsMask, 6 );
+
+        RegionNvmGroup1->ChannelsMaskRemaining[0] &= RegionNvmGroup2->ChannelsMask[0];
+        RegionNvmGroup1->ChannelsMaskRemaining[1] &= RegionNvmGroup2->ChannelsMask[1];
+        RegionNvmGroup1->ChannelsMaskRemaining[2] &= RegionNvmGroup2->ChannelsMask[2];
+        RegionNvmGroup1->ChannelsMaskRemaining[3] &= RegionNvmGroup2->ChannelsMask[3];
+        RegionNvmGroup1->ChannelsMaskRemaining[4] = RegionNvmGroup2->ChannelsMask[4];
+        RegionNvmGroup1->ChannelsMaskRemaining[5] = RegionNvmGroup2->ChannelsMask[5];
     }
 
     // Update status variables
@@ -838,12 +812,14 @@ uint8_t RegionAU915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_AU915 */
     return status;
 }
 
 uint8_t RegionAU915RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_AU915 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -868,13 +844,14 @@ uint8_t RegionAU915RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_AU915 */
     return status;
 }
 
-uint8_t RegionAU915NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionAU915NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
-    // Datarate and frequency KO
-    return 0;
+    // Do not accept the request
+    return -1;
 }
 
 int8_t RegionAU915TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
@@ -883,32 +860,44 @@ int8_t RegionAU915TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
     return 0;
 }
 
-uint8_t RegionAU915DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionAU915DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
-    return 0;
+    // Do not accept the request
+    return -1;
 }
 
 int8_t RegionAU915AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
-    static int8_t trialsCount = 0;
-
-    // Re-enable 500 kHz default channels
-    NvmCtx.ChannelsMask[4] = CHANNELS_MASK_500KHZ_MASK;
+#if defined( REGION_AU915 )
+    // Alternates the data rate according to the channel sequence:
+    // Eight times a 125kHz DR_2 and then one 500kHz DR_6 channel
+    if( type == ALTERNATE_DR )
+    {
+        RegionNvmGroup1->JoinTrialsCounter++;
+    }
+    else
+    {
+        RegionNvmGroup1->JoinTrialsCounter--;
+    }
 
-    if( ( trialsCount & 0x01 ) == 0x01 )
+    if( RegionNvmGroup1->JoinTrialsCounter % 9 == 0 )
     {
+        // Use DR_6 every 9th times.
         currentDr = DR_6;
     }
     else
     {
         currentDr = DR_2;
     }
-    trialsCount++;
     return currentDr;
+#else
+    return -1;
+#endif /* REGION_AU915 */
 }
 
 LoRaMacStatus_t RegionAU915NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_AU915 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[AU915_MAX_NB_CHANNELS] = { 0 };
@@ -917,27 +906,29 @@ LoRaMacStatus_t RegionAU915NextChannel( NextChanParams_t* nextChanParams, uint8_
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
 
     // Count 125kHz channels
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMaskRemaining, 0, 4 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup1->ChannelsMaskRemaining, 0, 4 ) == 0 )
     { // Reactivate default channels
-        RegionCommonChanMaskCopy( NvmCtx.ChannelsMaskRemaining, NvmCtx.ChannelsMask, 4  );
+        RegionCommonChanMaskCopy( RegionNvmGroup1->ChannelsMaskRemaining, RegionNvmGroup2->ChannelsMask, 4  );
+
+        RegionNvmGroup1->JoinChannelGroupsCurrentIndex = 0;
     }
     // Check other channels
     if( nextChanParams->Datarate >= DR_6 )
     {
-        if( ( NvmCtx.ChannelsMaskRemaining[4] & CHANNELS_MASK_500KHZ_MASK ) == 0 )
+        if( ( RegionNvmGroup1->ChannelsMaskRemaining[4] & CHANNELS_MASK_500KHZ_MASK ) == 0 )
         {
-            NvmCtx.ChannelsMaskRemaining[4] = NvmCtx.ChannelsMask[4];
+            RegionNvmGroup1->ChannelsMaskRemaining[4] = RegionNvmGroup2->ChannelsMask[4];
         }
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMaskRemaining;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup1->ChannelsMaskRemaining;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = AU915_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = 0;
+    countChannelsParams.JoinChannels = NULL;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -955,12 +946,47 @@ LoRaMacStatus_t RegionAU915NextChannel( NextChanParams_t* nextChanParams, uint8_
 
     if( status == LORAMAC_STATUS_OK )
     {
-        // We found a valid channel
-        *channel = enabledChannels[randr( 0, nbEnabledChannels - 1 )];
+        if( nextChanParams->Joined == true )
+        {
+            // Choose randomly on of the remaining channels
+            *channel = enabledChannels[randr( 0, nbEnabledChannels - 1 )];
+        }
+        else
+        {
+            // For rapid network acquisition in mixed gateway channel plan environments, the device
+            // follow a random channel selection sequence. It probes alternating one out of a
+            // group of eight 125 kHz channels followed by probing one 500 kHz channel each pass.
+            // Each time a 125 kHz channel will be selected from another group.
+
+            // 125kHz Channels (0 - 63) DR2
+            if( nextChanParams->Datarate == DR_2 )
+            {
+                if( RegionBaseUSComputeNext125kHzJoinChannel( ( uint16_t* ) RegionNvmGroup1->ChannelsMaskRemaining,
+                    &RegionNvmGroup1->JoinChannelGroupsCurrentIndex, channel ) == LORAMAC_STATUS_PARAMETER_INVALID )
+                {
+                    return LORAMAC_STATUS_PARAMETER_INVALID;
+                }
+            }
+            // 500kHz Channels (64 - 71) DR6
+            else
+            {
+                // Choose the next available channel
+                uint8_t i = 0;
+                while( ( ( RegionNvmGroup1->ChannelsMaskRemaining[4] & CHANNELS_MASK_500KHZ_MASK ) & ( 1 << i ) ) == 0 )
+                {
+                    i++;
+                }
+                *channel = 64 + i;
+            }
+        }
+
         // Disable the channel in the mask
-        RegionCommonChanDisable( NvmCtx.ChannelsMaskRemaining, *channel, AU915_MAX_NB_CHANNELS - 8 );
+        RegionCommonChanDisable( RegionNvmGroup1->ChannelsMaskRemaining, *channel, AU915_MAX_NB_CHANNELS );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_AU915 */
 }
 
 LoRaMacStatus_t RegionAU915ChannelAdd( ChannelAddParams_t* channelAdd )
@@ -975,18 +1001,21 @@ bool RegionAU915ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 
 void RegionAU915SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_AU915 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, continuousWave->MaxEirp, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_AU915 */
 }
 
 uint8_t RegionAU915ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_AU915 )
     int8_t datarate = DatarateOffsetsAU915[dr][drOffset];
 
     if( datarate < 0 )
@@ -1001,10 +1030,14 @@ uint8_t RegionAU915ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
         }
     }
     return datarate;
+#else
+    return 0;
+#endif /* REGION_AU915 */
 }
 
 void RegionAU915RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_AU915 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesAU915;
@@ -1019,4 +1052,5 @@ void RegionAU915RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = AU915_BEACON_CHANNEL_DR;
+#endif /* REGION_AU915 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.h
index 98ace49f..896f7329 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionAU915.h
+  * @author  MCD Application Team
+  * @brief   Region definition for AU915
+  ******************************************************************************
+  */
 #ifndef __REGION_AU915_H__
 #define __REGION_AU915_H__
 
@@ -57,7 +67,7 @@ extern "C"
 /*!
  * Maximal datarate that can be used by the node
  */
-#define AU915_TX_MAX_DATARATE                       DR_13
+#define AU915_TX_MAX_DATARATE                       DR_6
 
 /*!
  * Minimal datarate that can be used by the node
@@ -88,12 +98,7 @@ extern "C"
 /*!
  * Maximal Rx1 receive datarate offset
  */
-#define AU915_MAX_RX1_DR_OFFSET                     6
-
-/*!
- * Default Rx1 receive datarate offset
- */
-#define AU915_DEFAULT_RX1_DR_OFFSET                 0
+#define AU915_MAX_RX1_DR_OFFSET                     5
 
 /*!
  * Minimal Tx output power that can be used by the node
@@ -115,11 +120,6 @@ extern "C"
  */
 #define AU915_DEFAULT_UPLINK_DWELL_TIME             1
 
-/*!
- * Default downlink dwell time configuration
- */
-#define AU915_DEFAULT_DOWNLINK_DWELL_TIME           0
-
 /*!
  * Default Max EIRP
  */
@@ -130,16 +130,6 @@ extern "C"
  */
 #define AU915_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define AU915_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define AU915_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -150,41 +140,6 @@ extern "C"
  */
 #define AU915_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define AU915_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define AU915_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define AU915_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define AU915_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define AU915_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define AU915_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define AU915_ACK_TIMEOUT_RND                       1000
-
 /*!
  * Second reception window channel frequency definition.
  */
@@ -213,11 +168,6 @@ extern "C"
  */
 #define AU915_PING_SLOT_CHANNEL_FREQ                923300000
 
-/*!
- * Number of possible ping slot channels
- */
-#define AU915_PING_SLOT_NB_CHANNELS                 8
-  
 /*!
  * Number of possible beacon channels
  */
@@ -264,9 +214,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define AU915_BAND0                                 { 1, AU915_MAX_TX_POWER, 0, 0, 0, 0 } //  100.0 %
+#define AU915_BAND0                                 { 1, AU915_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  100.0 %
 
 /*!
  * Defines the first channel for RX window 1 for US band
@@ -307,6 +257,7 @@ static const int8_t DatarateOffsetsAU915[7][6] =
     { DR_13, DR_13, DR_12, DR_11, DR_10, DR_9  }, // DR_6
 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  * The table is valid for the dwell time configuration of 0 for uplinks.
@@ -332,6 +283,7 @@ static const uint8_t MaxPayloadOfDatarateDwell1AU915[] = { 0, 0, 11, 53, 125, 24
  * repeater support.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterDwell1AU915[] = { 0, 0, 11, 53, 125, 242, 242, 0, 33, 109, 222, 222, 222, 222 };
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief The function gets a value of a specific phy attribute.
@@ -356,15 +308,6 @@ void RegionAU915SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionAU915InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionAU915GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -457,7 +400,7 @@ uint8_t RegionAU915RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionAU915NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionAU915NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -477,7 +420,7 @@ int8_t RegionAU915TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionAU915DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionAU915DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c
new file mode 100644
index 00000000..00e52d9c
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c
@@ -0,0 +1,153 @@
+/*!
+ * \file      RegionBaseUS.c
+ *
+ * \brief     Implementations common with US region.
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2017 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ *
+ * \author    Gregory Cristian ( Semtech )
+ *
+ * \author    Daniel Jaeckle ( STACKFORCE )
+ *
+ * \author    Phanindra Kumar Yellapu ( STACKFORCE )
+ */
+#include "LoRaMacTypes.h"
+#include "Region/Region.h"
+#include "RegionBaseUS.h"
+
+
+/*!
+ * \brief Searches for available 125 kHz channels in the given channel mask.
+ *
+ * \param [IN] currentChannelMaskLeft The remaining channel mask.
+ *
+ * \param [OUT] findAvailableChannelsIndex List containing the indexes of all available 125 kHz channels.
+ *
+ * \param [OUT] availableChannels Number of available 125 kHz channels.
+ *
+ * \retval Status
+ */
+static LoRaMacStatus_t FindAvailable125kHzChannels( uint16_t currentChannelMaskLeft,
+                                                    uint8_t* findAvailableChannelsIndex, uint8_t* availableChannels )
+{
+    // Nullpointer check
+    if( findAvailableChannelsIndex == NULL || availableChannels == NULL )
+    {
+        return LORAMAC_STATUS_PARAMETER_INVALID;
+    }
+
+    // Initialize counter
+    *availableChannels = 0;
+    for( uint8_t i = 0; i < 8; i++ )
+    {
+        // Find available channels
+        if( ( currentChannelMaskLeft & ( 1 << i ) ) != 0 )
+        {
+            // Save available channel index
+            findAvailableChannelsIndex[*availableChannels] = i;
+            // Increment counter of available channels if the current channel is available
+            ( *availableChannels )++;
+        }
+    }
+
+    return LORAMAC_STATUS_OK;
+}
+
+LoRaMacStatus_t RegionBaseUSComputeNext125kHzJoinChannel( uint16_t* channelsMaskRemaining,
+                                                          uint8_t* groupsCurrentIndex, uint8_t* newChannelIndex )
+{
+    uint8_t currentChannelMaskLeftIndex;
+    uint16_t currentChannelMaskLeft;
+    uint8_t findAvailableChannelsIndex[8] = { 0 };
+    uint8_t availableChannels = 0;
+    uint8_t startIndex;
+
+    // Null pointer check
+    if( channelsMaskRemaining == NULL || groupsCurrentIndex == NULL || newChannelIndex == NULL )
+    {
+        return LORAMAC_STATUS_PARAMETER_INVALID;
+    }
+
+    // copy the current index.
+    startIndex = *groupsCurrentIndex;
+
+    do
+    {
+        // Current ChannelMaskRemaining, two groups per channel mask. For example Group 0 and 1 (8 bit) are ChannelMaskRemaining 0 (16 bit), etc.
+        currentChannelMaskLeftIndex = (uint8_t) startIndex / 2;
+
+        // For even numbers we need the 8 LSBs and for uneven the 8 MSBs
+        if( ( startIndex % 2 ) == 0 )
+        {
+            currentChannelMaskLeft = ( channelsMaskRemaining[currentChannelMaskLeftIndex] & 0x00FF );
+        }
+        else
+        {
+            currentChannelMaskLeft = ( ( channelsMaskRemaining[currentChannelMaskLeftIndex] >> 8 ) & 0x00FF );
+        }
+
+
+        if( FindAvailable125kHzChannels( currentChannelMaskLeft, findAvailableChannelsIndex, &availableChannels ) == LORAMAC_STATUS_PARAMETER_INVALID )
+        {
+            return LORAMAC_STATUS_PARAMETER_INVALID;
+        }
+
+        if ( availableChannels > 0 )
+        {
+            // Choose randomly a free channel 125kHz
+            *newChannelIndex = ( startIndex * 8 ) + findAvailableChannelsIndex[randr( 0, ( availableChannels - 1 ) )];
+        }
+
+        // Increment start index
+        startIndex++;
+        if ( startIndex > 7 )
+        {
+            startIndex = 0;
+        }
+    } while( ( availableChannels == 0 ) && ( startIndex != *groupsCurrentIndex ) );
+
+    if ( availableChannels > 0 )
+    {
+        *groupsCurrentIndex = startIndex;
+        return LORAMAC_STATUS_OK;
+    }
+
+    return LORAMAC_STATUS_PARAMETER_INVALID;
+}
+
+bool RegionBaseUSVerifyFrequencyGroup( uint32_t freq, uint32_t minFreq, uint32_t maxFreq, uint32_t stepwidth )
+{
+    if( ( freq < minFreq ) ||
+        ( freq > maxFreq ) ||
+        ( ( ( freq - ( uint32_t ) minFreq ) % ( uint32_t ) stepwidth ) != 0 ) )
+    {
+        return false;
+    }
+    return true;
+}
+
+uint32_t RegionBaseUSCalcDownlinkFrequency( uint8_t channel, uint32_t frequency,
+                                            uint32_t stepwidth )
+{
+    // Calculate the frequency
+    return frequency + ( channel * stepwidth );
+}
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.h
new file mode 100644
index 00000000..72edfb5b
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.h
@@ -0,0 +1,98 @@
+/*!
+ * \file      RegionBaseUS.h
+ *
+ * \brief     Implementations common with US region.
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2017 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ *
+ * \author    Gregory Cristian ( Semtech )
+ *
+ * \author    Daniel Jaeckle ( STACKFORCE )
+ *
+ * \author    Phanindra Kumar Yellapu ( STACKFORCE )
+ *
+ * \defgroup  REGIONBASEUS US region common implementations.
+ * \{
+ */
+#ifndef __REGIONBASEUS_H__
+#define __REGIONBASEUS_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "LoRaMac.h"
+
+/*!
+ * \brief Computes the next 125kHz channel used for join requests.
+ *        And it returns all the parameters updated.
+ *
+ * \param [IN]  channelsMaskRemaining pointer to remaining channels.
+ *
+ * \param [IN]  groupsCurrentIndex Index of current channel.
+ *
+ * \param [OUT] newChannelIndex Index of next available channel.
+ *
+ * \retval Status
+ */
+LoRaMacStatus_t RegionBaseUSComputeNext125kHzJoinChannel( uint16_t* channelsMaskRemaining,
+                                                          uint8_t* groupsCurrentIndex, uint8_t* newChannelIndex );
+
+/*!
+ * \brief Verifies if the frequency is in the correct range with a
+ *        specific stepwidth.
+ *
+ * \param [IN]  freq Frequency to verify.
+ *
+ * \param [IN]  minFreq Minimum frequency.
+ *
+ * \param [IN]  maxFreq Maximum frequency.
+ *
+ * \param [IN]  stepwidth Frequency stepwidth.
+ *
+ * \retval True, if the frequency is valid, false if not.
+ */
+bool RegionBaseUSVerifyFrequencyGroup( uint32_t freq, uint32_t minFreq, uint32_t maxFreq, uint32_t stepwidth );
+
+/*!
+ * \brief Calculates the downlink frequency for a given channel. This
+ *        function is used in class B only.
+ *
+ * \param [IN] channel The channel according to the channel plan.
+ *
+ * \param [IN] frequency The base frequency.
+ *
+ * \param [IN] stepwidth The frequency stepwidth.
+ *
+ * \retval The downlink frequency.
+ */
+uint32_t RegionBaseUSCalcDownlinkFrequency( uint8_t channel, uint32_t frequency,
+                                            uint32_t stepwidth );
+
+/*! \} defgroup REGIONBASEUS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __REGIONBASEUS_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c
index 536f7f3b..2230940d 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c
@@ -28,82 +28,33 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionCN470.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for CN470
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionCN470.h"
+#include "RegionBaseUS.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE              6
 
-/*!
- * Region specific context
- */
-typedef struct sRegionCN470NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ CN470_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ CN470_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionCN470NvmCtx_t;
-
+#if defined( REGION_CN470 )
 /*
  * Non-volatile module context.
  */
-static RegionCN470NvmCtx_t NvmCtx;
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 // Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsCN470[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
-
-    return txPowerResult;
-}
-
 static bool VerifyRfFreq( uint32_t freq )
 {
     // Check radio driver support
@@ -131,15 +82,17 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesCN470[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsCN470 );
 
     return Radio.TimeOnAir( MODEM_LORA, bandwidth, phyDr, 1, 8, false, pktLen, true );
 }
+#endif /* REGION_CN470 */
 
 PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_CN470 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -159,7 +112,16 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, CN470_TX_MIN_DATARATE );
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
+            {
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )CN470_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )CN470_TX_MIN_DATARATE,
+                .NbChannels = CN470_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -174,12 +136,12 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = CN470_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = CN470_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -187,11 +149,13 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = MaxPayloadOfDatarateCN470[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             phyParam.Value = MaxPayloadOfDatarateRepeaterCN470[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = CN470_DUTY_CYCLE_ENABLED;
@@ -204,37 +168,37 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = CN470_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = CN470_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = CN470_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = CN470_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = CN470_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( CN470_ACKTIMEOUT + randr( -CN470_ACK_TIMEOUT_RND, CN470_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = CN470_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -249,12 +213,12 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -264,13 +228,17 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
+        {
+            phyParam.Value = CN470_DEFAULT_UPLINK_DWELL_TIME;
+            break;
+        }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = 0;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -285,7 +253,9 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BEACON_CHANNEL_FREQ:
         {
-            phyParam.Value = CN470_BEACON_CHANNEL_FREQ;
+            phyParam.Value = RegionBaseUSCalcDownlinkFrequency( getPhy->Channel,
+                                                                CN470_BEACON_CHANNEL_FREQ,
+                                                                CN470_BEACON_CHANNEL_STEPWIDTH );
             break;
         }
         case PHY_BEACON_FORMAT:
@@ -300,16 +270,6 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = CN470_BEACON_CHANNEL_DR;
             break;
         }
-        case PHY_BEACON_CHANNEL_STEPWIDTH:
-        {
-            phyParam.Value = CN470_BEACON_CHANNEL_STEPWIDTH;
-            break;
-        }
-        case PHY_PING_SLOT_NB_CHANNELS:
-        {
-            phyParam.Value = CN470_PING_SLOT_NB_CHANNELS;
-            break;
-        }
         case PHY_BEACON_NB_CHANNELS:
         {
             phyParam.Value = CN470_BEACON_NB_CHANNELS;
@@ -317,7 +277,9 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_PING_SLOT_CHANNEL_FREQ:
         {
-            phyParam.Value = CN470_PING_SLOT_CHANNEL_FREQ;
+            phyParam.Value = RegionBaseUSCalcDownlinkFrequency( getPhy->Channel,
+                                                                CN470_PING_SLOT_CHANNEL_FREQ,
+                                                                CN470_BEACON_CHANNEL_STEPWIDTH );
             break;
         }
         case PHY_PING_SLOT_CHANNEL_DR:
@@ -325,6 +287,11 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = CN470_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_PING_SLOT_NB_CHANNELS:
+        {
+            phyParam.Value = CN470_BEACON_NB_CHANNELS;
+            break;
+        }
         case PHY_SF_FROM_DR:
         {
             phyParam.Value = DataratesCN470[getPhy->Datarate];
@@ -332,7 +299,7 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsCN470 );
             break;
         }
         default:
@@ -341,17 +308,21 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_CN470 */
     return phyParam;
 }
 
 void RegionCN470SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_CN470 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_CN470 */
 }
 
 void RegionCN470InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_CN470 )
     Band_t bands[CN470_MAX_NB_BANDS] =
     {
         CN470_BAND0
@@ -361,40 +332,48 @@ void RegionCN470InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Default bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * CN470_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * CN470_MAX_NB_BANDS );
 
-            // Channels
+            // Default channels
             for( uint8_t i = 0; i < CN470_MAX_NB_CHANNELS; i++ )
             {
                 // 125 kHz channels
-                NvmCtx.Channels[i].Frequency = 470300000 + i * 200000;
-                NvmCtx.Channels[i].DrRange.Value = ( DR_5 << 4 ) | DR_0;
-                NvmCtx.Channels[i].Band = 0;
+                RegionNvmGroup2->Channels[i].Frequency = 470300000 + i * 200000;
+                RegionNvmGroup2->Channels[i].DrRange.Value = ( DR_5 << 4 ) | DR_0;
+                RegionNvmGroup2->Channels[i].Band = 0;
             }
 
-            // Initialize channels default mask
+            // Default ChannelsMask
             /* ST_WORKAROUND_BEGIN: Hybrid mode */
 #if ( HYBRID_ENABLED == 1 )
-            NvmCtx.ChannelsDefaultMask[0] = 0x00FF;
-            NvmCtx.ChannelsDefaultMask[1] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[2] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[3] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[4] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[5] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[0] = 0x00FF;
+            RegionNvmGroup2->ChannelsDefaultMask[1] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[2] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[3] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[4] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[5] = 0x0000;
 #else
-            NvmCtx.ChannelsDefaultMask[0] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[1] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[2] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[3] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[4] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[5] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[0] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[1] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[2] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[3] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[4] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[5] = 0xFFFF;
 #endif /* HYBRID_ENABLED == 1 */
             /* ST_WORKAROUND_END */
 
 
             // Copy channels default mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
@@ -404,15 +383,7 @@ void RegionCN470InitDefaults( InitDefaultsParams_t* params )
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Copy channels default mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
-            }
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         default:
@@ -420,16 +391,12 @@ void RegionCN470InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionCN470GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionCN470NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_CN470 */
 }
 
 bool RegionCN470Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_CN470 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -458,10 +425,14 @@ bool RegionCN470Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_CN470 */
 }
 
 void RegionCN470ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_CN470 )
     // Size of the optional CF list must be 16 byte
     if( applyCFList->Size != 16 )
     {
@@ -477,48 +448,54 @@ void RegionCN470ApplyCFList( ApplyCFListParams_t* applyCFList )
     // ChMask0 - ChMask5 must be set (every ChMask has 16 bit)
     for( uint8_t chMaskItr = 0, cntPayload = 0; chMaskItr <= 5; chMaskItr++, cntPayload+=2 )
     {
-        NvmCtx.ChannelsMask[chMaskItr] = (uint16_t) (0x00FF & applyCFList->Payload[cntPayload]);
-        NvmCtx.ChannelsMask[chMaskItr] |= (uint16_t) (applyCFList->Payload[cntPayload+1] << 8);
+        RegionNvmGroup2->ChannelsMask[chMaskItr] = (uint16_t) (0x00FF & applyCFList->Payload[cntPayload]);
+        RegionNvmGroup2->ChannelsMask[chMaskItr] |= (uint16_t) (applyCFList->Payload[cntPayload+1] << 8);
     }
+#endif /* REGION_CN470 */
 }
 
 bool RegionCN470ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_CN470 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 6 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 6 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_CN470 */
 }
 
 void RegionCN470ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_CN470 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, CN470_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsCN470 );
 
-    tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesCN470[rxConfigParams->Datarate], BandwidthsCN470[rxConfigParams->Datarate] );
+    tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesCN470[rxConfigParams->Datarate], BandwidthsCN470[rxConfigParams->Datarate] );
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_CN470 */
 }
 
 bool RegionCN470RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_CN470 )
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
     int8_t phyDr = 0;
@@ -542,7 +519,7 @@ bool RegionCN470RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 
     // Radio configuration
     Radio.SetRxConfig( MODEM_LORA, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
-
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterCN470[dr];
@@ -552,53 +529,65 @@ bool RegionCN470RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         maxPayload = MaxPayloadOfDatarateCN470[dr];
     }
     Radio.SetMaxPayloadLength( MODEM_LORA, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_CN470 */
 }
 
 bool RegionCN470TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_CN470 )
     int8_t phyDr = DataratesCN470[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsCN470 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, txConfig->MaxEirp, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
-    Radio.SetTxConfig( MODEM_LORA, phyTxPower, 0, 0, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
+    Radio.SetTxConfig( MODEM_LORA, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Setup maximum payload length of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
+
     // Update time-on-air
     *txTimeOnAir = GetTimeOnAir( txConfig->Datarate, txConfig->PktLen );
-    *txPower = txPowerLimited;
 
+    *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_CN470 */
 }
 
 uint8_t RegionCN470LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_CN470 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
-    uint16_t channelsMask[6] = { 0, 0, 0, 0, 0, 0 };
+    uint16_t channelsMask[CHANNELS_MASK_SIZE] = { 0, 0, 0, 0, 0, 0 };
     GetPhyParams_t getPhy;
     PhyParam_t phyParam;
     RegionCommonLinkAdrReqVerifyParams_t linkAdrVerifyParams;
 
     // Initialize local copy of channels mask
-    RegionCommonChanMaskCopy( channelsMask, NvmCtx.ChannelsMask, 6 );
+    RegionCommonChanMaskCopy( channelsMask, RegionNvmGroup2->ChannelsMask, CHANNELS_MASK_SIZE );
 
     while( bytesProcessed < linkAdrReq->PayloadSize )
     {
@@ -633,7 +622,7 @@ uint8_t RegionCN470LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
             for( uint8_t i = 0; i < 16; i++ )
             {
                 if( ( ( linkAdrParams.ChMask & ( 1 << i ) ) != 0 ) &&
-                    ( NvmCtx.Channels[linkAdrParams.ChMaskCtrl * 16 + i].Frequency == 0 ) )
+                    ( RegionNvmGroup2->Channels[linkAdrParams.ChMaskCtrl * 16 + i].Frequency == 0 ) )
                 {// Trying to enable an undefined channel
                     status &= 0xFE; // Channel mask KO
                 }
@@ -659,7 +648,7 @@ uint8_t RegionCN470LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = channelsMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = CN470_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = CN470_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = CN470_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -671,7 +660,7 @@ uint8_t RegionCN470LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Copy Mask
-        RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, channelsMask, 6 );
+        RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, channelsMask, 6 );
     }
 
     // Update status variables
@@ -680,12 +669,14 @@ uint8_t RegionCN470LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_CN470 */
     return status;
 }
 
 uint8_t RegionCN470RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_CN470 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -705,32 +696,40 @@ uint8_t RegionCN470RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_CN470 */
     return status;
 }
 
-uint8_t RegionCN470NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionCN470NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
-    // Datarate and frequency KO
-    return 0;
+    // Do not accept the request
+    return -1;
 }
 
 int8_t RegionCN470TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
 {
+    // Do not accept the request
     return -1;
 }
 
-uint8_t RegionCN470DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionCN470DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
-    return 0;
+    // Do not accept the request
+    return -1;
 }
 
 int8_t RegionCN470AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
+#if defined( REGION_CN470 )
     return currentDr;
+#else
+    return -1;
+#endif /* REGION_CN470 */
 }
 
 LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_CN470 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[CN470_MAX_NB_CHANNELS] = { 0 };
@@ -739,24 +738,24 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
 
     // Count 125kHz channels
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMask, 0, 6 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup2->ChannelsMask, 0, CHANNELS_MASK_SIZE ) == 0 )
     { // Reactivate default channels
-        NvmCtx.ChannelsMask[0] = 0xFFFF;
-        NvmCtx.ChannelsMask[1] = 0xFFFF;
-        NvmCtx.ChannelsMask[2] = 0xFFFF;
-        NvmCtx.ChannelsMask[3] = 0xFFFF;
-        NvmCtx.ChannelsMask[4] = 0xFFFF;
-        NvmCtx.ChannelsMask[5] = 0xFFFF;
+        RegionNvmGroup2->ChannelsMask[0] = 0xFFFF;
+        RegionNvmGroup2->ChannelsMask[1] = 0xFFFF;
+        RegionNvmGroup2->ChannelsMask[2] = 0xFFFF;
+        RegionNvmGroup2->ChannelsMask[3] = 0xFFFF;
+        RegionNvmGroup2->ChannelsMask[4] = 0xFFFF;
+        RegionNvmGroup2->ChannelsMask[5] = 0xFFFF;
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMask;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup2->ChannelsMask;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = CN470_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = 0;
+    countChannelsParams.JoinChannels = NULL;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -778,6 +777,9 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_
         *channel = enabledChannels[randr( 0, nbEnabledChannels - 1 )];
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_CN470 */
 }
 
 LoRaMacStatus_t RegionCN470ChannelAdd( ChannelAddParams_t* channelAdd )
@@ -792,18 +794,21 @@ bool RegionCN470ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 
 void RegionCN470SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_CN470 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, continuousWave->MaxEirp, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_CN470 */
 }
 
 uint8_t RegionCN470ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_CN470 )
     int8_t datarate = dr - drOffset;
 
     if( datarate < 0 )
@@ -811,10 +816,14 @@ uint8_t RegionCN470ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
         datarate = DR_0;
     }
     return datarate;
+#else
+    return 0;
+#endif /* REGION_CN470 */
 }
 
 void RegionCN470RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_CN470 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesCN470;
@@ -829,4 +838,5 @@ void RegionCN470RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = CN470_BEACON_CHANNEL_DR;
+#endif /* REGION_CN470 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.h
index 0da8d493..8bab4ca1 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionCN470.h
+  * @author  MCD Application Team
+  * @brief   Region definition for CN470
+  ******************************************************************************
+  */
 #ifndef __REGION_CN470_H__
 #define __REGION_CN470_H__
 
@@ -47,7 +57,7 @@ extern "C"
 /*!
  * LoRaMac maximum number of channels
  */
-#define CN470_MAX_NB_CHANNELS                        96
+#define CN470_MAX_NB_CHANNELS                       96
 
 /*!
  * Minimal datarate that can be used by the node
@@ -82,27 +92,22 @@ extern "C"
 /*!
  * Maximal Rx1 receive datarate offset
  */
-#define CN470_MAX_RX1_DR_OFFSET                     3
-
-/*!
- * Default Rx1 receive datarate offset
- */
-#define CN470_DEFAULT_RX1_DR_OFFSET                 0
+#define CN470_MAX_RX1_DR_OFFSET                     5
 
 /*!
  * Minimal Tx output power that can be used by the node
  */
-#define CN470_MIN_TX_POWER                        TX_POWER_7
+#define CN470_MIN_TX_POWER                          TX_POWER_7
 
 /*!
  * Maximal Tx output power that can be used by the node
  */
-#define CN470_MAX_TX_POWER                        TX_POWER_0
+#define CN470_MAX_TX_POWER                          TX_POWER_0
 
 /*!
  * Default Tx output power used by the node
  */
-#define CN470_DEFAULT_TX_POWER                    TX_POWER_0
+#define CN470_DEFAULT_TX_POWER                      TX_POWER_0
 
 /*!
  * Default Max EIRP
@@ -114,16 +119,6 @@ extern "C"
  */
 #define CN470_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define CN470_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define CN470_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -134,41 +129,6 @@ extern "C"
  */
 #define CN470_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define CN470_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define CN470_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define CN470_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define CN470_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define CN470_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define CN470_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define CN470_ACK_TIMEOUT_RND                       1000
-
 /*!
  * Second reception window channel frequency definition.
  */
@@ -179,6 +139,11 @@ extern "C"
  */
 #define CN470_RX_WND_2_DR                           DR_0
 
+/*!
+ * Default uplink dwell time configuration
+ */
+#define CN470_DEFAULT_UPLINK_DWELL_TIME             0
+
 /*
  * CLASS B
  */
@@ -197,11 +162,6 @@ extern "C"
  */
 #define CN470_PING_SLOT_CHANNEL_FREQ                508300000
 
-/*!
- * Number of possible ping slot channels
- */
-#define CN470_PING_SLOT_NB_CHANNELS                 8
-
 /*!
  * Number of possible beacon channels
  */
@@ -244,9 +204,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define CN470_BAND0                                 { 1, CN470_MAX_TX_POWER, 0, 0, 0, 0 } //  100.0 %
+#define CN470_BAND0                                 { 1, CN470_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  100.0 %
 
 /*!
  * Defines the first channel for RX window 1 for CN470 band
@@ -273,6 +233,7 @@ static const uint8_t DataratesCN470[]  = { 12, 11, 10,  9,  8,  7 };
  */
 static const uint32_t BandwidthsCN470[] = { 125000, 125000, 125000, 125000, 125000, 125000 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  */
@@ -282,6 +243,7 @@ static const uint8_t MaxPayloadOfDatarateCN470[] = { 51, 51, 51, 115, 242, 242 }
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterCN470[] = { 51, 51, 51, 115, 222, 222 };
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief The function gets a value of a specific phy attribute.
@@ -306,15 +268,6 @@ void RegionCN470SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionCN470InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionCN470GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -407,7 +360,7 @@ uint8_t RegionCN470RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionCN470NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionCN470NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -427,13 +380,15 @@ int8_t RegionCN470TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionCN470DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionCN470DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
  *
  * \param [IN] currentDr Current datarate.
  *
+ * \param [IN] type Alternation type.
+ *
  * \retval Datarate to apply.
  */
 int8_t RegionCN470AlternateDr( int8_t currentDr, AlternateDrType_t type );
@@ -495,7 +450,7 @@ uint8_t RegionCN470ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
  *
  * \param [IN] rxBeaconSetup Pointer to the function parameters
  */
- void RegionCN470RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr );
+void RegionCN470RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr );
 
 /*! \} defgroup REGIONCN470 */
 
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c
index edcc241d..f0b40e66 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c
@@ -28,82 +28,32 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionCN779.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for CN779
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionCN779.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE              1
 
-/*!
- * Region specific context
- */
-typedef struct sRegionCN779NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ CN779_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ CN779_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionCN779NvmCtx_t;
-
+#if defined( REGION_CN779 )
 /*
  * Non-volatile module context.
  */
-static RegionCN779NvmCtx_t NvmCtx;
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 // Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsCN779[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
-
-    return txPowerResult;
-}
-
 static bool VerifyRfFreq( uint32_t freq )
 {
     // Check radio driver support
@@ -122,7 +72,7 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesCN779[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsCN779 );
     TimerTime_t timeOnAir = 0;
 
     if( datarate == DR_7 )
@@ -135,11 +85,13 @@ static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
     }
     return timeOnAir;
 }
+#endif /* REGION_CN779 */
 
 PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_CN779 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -159,7 +111,16 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, CN779_TX_MIN_DATARATE );
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
+            {
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )CN779_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )CN779_TX_MIN_DATARATE,
+                .NbChannels = CN779_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -174,12 +135,12 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = CN779_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = CN779_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -187,11 +148,13 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = MaxPayloadOfDatarateCN779[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             phyParam.Value = MaxPayloadOfDatarateRepeaterCN779[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = CN779_DUTY_CYCLE_ENABLED;
@@ -204,37 +167,37 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = CN779_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = CN779_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = CN779_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = CN779_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = CN779_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( CN779_ACKTIMEOUT + randr( -CN779_ACK_TIMEOUT_RND, CN779_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = CN779_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -249,12 +212,12 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -264,13 +227,17 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
+        {
+            phyParam.Value = CN779_DEFAULT_UPLINK_DWELL_TIME;
+            break;
+        }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = 0;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -317,7 +284,7 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsCN779 );
             break;
         }
         default:
@@ -326,17 +293,21 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_CN779 */
     return phyParam;
 }
 
 void RegionCN779SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_CN779 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_CN779 */
 }
 
 void RegionCN779InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_CN779 )
     Band_t bands[CN779_MAX_NB_BANDS] =
     {
         CN779_BAND0
@@ -346,43 +317,43 @@ void RegionCN779InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Default bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * CN779_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * CN779_MAX_NB_BANDS );
 
             // Default channels
-            NvmCtx.Channels[0] = ( ChannelParams_t ) CN779_LC1;
-            NvmCtx.Channels[1] = ( ChannelParams_t ) CN779_LC2;
-            NvmCtx.Channels[2] = ( ChannelParams_t ) CN779_LC3;
+            RegionNvmGroup2->Channels[0] = ( ChannelParams_t ) CN779_LC1;
+            RegionNvmGroup2->Channels[1] = ( ChannelParams_t ) CN779_LC2;
+            RegionNvmGroup2->Channels[2] = ( ChannelParams_t ) CN779_LC3;
 
             // Default ChannelsMask
-            NvmCtx.ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
+            RegionNvmGroup2->ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
 
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
         {
             // Reset Channels Rx1Frequency to default 0
-            NvmCtx.Channels[0].Rx1Frequency = 0;
-            NvmCtx.Channels[1].Rx1Frequency = 0;
-            NvmCtx.Channels[2].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[0].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[1].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[2].Rx1Frequency = 0;
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Restore channels default mask
-            NvmCtx.ChannelsMask[0] |= NvmCtx.ChannelsDefaultMask[0];
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
-            }
+            RegionNvmGroup2->ChannelsMask[0] |= RegionNvmGroup2->ChannelsDefaultMask[0];
             break;
         }
         default:
@@ -390,16 +361,12 @@ void RegionCN779InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionCN779GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionCN779NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_CN779 */
 }
 
 bool RegionCN779Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_CN779 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -431,10 +398,14 @@ bool RegionCN779Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_CN779 */
 }
 
 void RegionCN779ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_CN779 )
     ChannelParams_t newChannel;
     ChannelAddParams_t channelAdd;
     ChannelRemoveParams_t channelRemove;
@@ -490,52 +461,58 @@ void RegionCN779ApplyCFList( ApplyCFListParams_t* applyCFList )
             RegionCN779ChannelsRemove( &channelRemove );
         }
     }
+#endif /* REGION_CN779 */
 }
 
 bool RegionCN779ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_CN779 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_CN779 */
 }
 
 void RegionCN779ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_CN779 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, CN779_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsCN779 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesCN779[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesCN779[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesCN779[rxConfigParams->Datarate], BandwidthsCN779[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesCN779[rxConfigParams->Datarate], BandwidthsCN779[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_CN779 */
 }
 
 bool RegionCN779RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_CN779 )
     RadioModems_t modem;
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
@@ -550,11 +527,11 @@ bool RegionCN779RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     if( rxConfig->RxSlot == RX_SLOT_WIN_1 )
     {
         // Apply window 1 frequency
-        frequency = NvmCtx.Channels[rxConfig->Channel].Frequency;
+        frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Frequency;
         // Apply the alternative RX 1 window frequency, if it is available
-        if( NvmCtx.Channels[rxConfig->Channel].Rx1Frequency != 0 )
+        if( RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency != 0 )
         {
-            frequency = NvmCtx.Channels[rxConfig->Channel].Rx1Frequency;
+            frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency;
         }
     }
 
@@ -575,6 +552,7 @@ bool RegionCN779RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         Radio.SetRxConfig( modem, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
     }
 
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterCN779[dr];
@@ -584,27 +562,33 @@ bool RegionCN779RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         maxPayload = MaxPayloadOfDatarateCN779[dr];
     }
     Radio.SetMaxPayloadLength( modem, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_CN779 */
 }
 
 bool RegionCN779TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_CN779 )
     RadioModems_t modem;
     int8_t phyDr = DataratesCN779[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsCN779 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, txConfig->MaxEirp, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     if( txConfig->Datarate == DR_7 )
     { // High Speed FSK channel
@@ -617,7 +601,7 @@ bool RegionCN779TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     }
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Update time-on-air
@@ -628,11 +612,15 @@ bool RegionCN779TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_CN779 */
 }
 
 uint8_t RegionCN779LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_CN779 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
@@ -675,7 +663,7 @@ uint8_t RegionCN779LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
             {
                 if( linkAdrParams.ChMaskCtrl == 6 )
                 {
-                    if( NvmCtx.Channels[i].Frequency != 0 )
+                    if( RegionNvmGroup2->Channels[i].Frequency != 0 )
                     {
                         chMask |= 1 << i;
                     }
@@ -683,7 +671,7 @@ uint8_t RegionCN779LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
                 else
                 {
                     if( ( ( chMask & ( 1 << i ) ) != 0 ) &&
-                        ( NvmCtx.Channels[i].Frequency == 0 ) )
+                        ( RegionNvmGroup2->Channels[i].Frequency == 0 ) )
                     {// Trying to enable an undefined channel
                         status &= 0xFE; // Channel mask KO
                     }
@@ -709,7 +697,7 @@ uint8_t RegionCN779LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = &chMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = CN779_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = CN779_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = CN779_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -721,9 +709,9 @@ uint8_t RegionCN779LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Set the channels mask to a default value
-        memset1( ( uint8_t* ) NvmCtx.ChannelsMask, 0, sizeof( NvmCtx.ChannelsMask ) );
+        memset1( ( uint8_t* ) RegionNvmGroup2->ChannelsMask, 0, sizeof( RegionNvmGroup2->ChannelsMask ) );
         // Update the channels mask
-        NvmCtx.ChannelsMask[0] = chMask;
+        RegionNvmGroup2->ChannelsMask[0] = chMask;
     }
 
     // Update status variables
@@ -732,12 +720,14 @@ uint8_t RegionCN779LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_CN779 */
     return status;
 }
 
 uint8_t RegionCN779RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_CN779 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -757,10 +747,11 @@ uint8_t RegionCN779RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_CN779 */
     return status;
 }
 
-uint8_t RegionCN779NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionCN779NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
     uint8_t status = 0x03;
     ChannelAddParams_t channelAdd;
@@ -815,12 +806,14 @@ uint8_t RegionCN779NewChannelReq( NewChannelReqParams_t* newChannelReq )
 
 int8_t RegionCN779TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
 {
+    // Do not accept the request
     return -1;
 }
 
-uint8_t RegionCN779DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionCN779DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
     uint8_t status = 0x03;
+#if defined( REGION_CN779 )
 
     // Verify if the frequency is supported
     if( VerifyRfFreq( dlChannelReq->Rx1Frequency ) == false )
@@ -829,7 +822,7 @@ uint8_t RegionCN779DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     }
 
     // Verify if an uplink frequency exists
-    if( NvmCtx.Channels[dlChannelReq->ChannelId].Frequency == 0 )
+    if( RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Frequency == 0 )
     {
         status &= 0xFD;
     }
@@ -837,9 +830,10 @@ uint8_t RegionCN779DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     // Apply Rx1 frequency, if the status is OK
     if( status == 0x03 )
     {
-        NvmCtx.Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
+        RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
     }
 
+#endif /* REGION_CN779 */
     return status;
 }
 
@@ -850,26 +844,28 @@ int8_t RegionCN779AlternateDr( int8_t currentDr, AlternateDrType_t type )
 
 LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_CN779 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[CN779_MAX_NB_CHANNELS] = { 0 };
     RegionCommonIdentifyChannelsParam_t identifyChannelsParam;
     RegionCommonCountNbOfEnabledChannelsParams_t countChannelsParams;
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
+    uint16_t joinChannels = CN779_JOIN_CHANNELS;
 
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMask, 0, 1 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup2->ChannelsMask, 0, 1 ) == 0 )
     { // Reactivate default channels
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMask;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup2->ChannelsMask;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = CN779_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = CN779_JOIN_CHANNELS;
+    countChannelsParams.JoinChannels = &joinChannels;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -893,13 +889,17 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_
     else if( status == LORAMAC_STATUS_NO_CHANNEL_FOUND )
     {
         // Datarate not supported by any channel, restore defaults
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_CN779 */
 }
 
 LoRaMacStatus_t RegionCN779ChannelAdd( ChannelAddParams_t* channelAdd )
 {
+#if defined( REGION_CN779 )
     bool drInvalid = false;
     bool freqInvalid = false;
     uint8_t id = channelAdd->ChannelId;
@@ -951,14 +951,18 @@ LoRaMacStatus_t RegionCN779ChannelAdd( ChannelAddParams_t* channelAdd )
         return LORAMAC_STATUS_FREQUENCY_INVALID;
     }
 
-    memcpy1( ( uint8_t* ) &(NvmCtx.Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( NvmCtx.Channels[id] ) );
-    NvmCtx.Channels[id].Band = 0;
-    NvmCtx.ChannelsMask[0] |= ( 1 << id );
+    memcpy1( ( uint8_t* ) &(RegionNvmGroup2->Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( RegionNvmGroup2->Channels[id] ) );
+    RegionNvmGroup2->Channels[id].Band = 0;
+    RegionNvmGroup2->ChannelsMask[0] |= ( 1 << id );
     return LORAMAC_STATUS_OK;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_CN779 */
 }
 
 bool RegionCN779ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 {
+#if defined( REGION_CN779 )
     uint8_t id = channelRemove->ChannelId;
 
     if( id < CN779_NUMB_DEFAULT_CHANNELS )
@@ -967,25 +971,31 @@ bool RegionCN779ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
     }
 
     // Remove the channel from the list of channels
-    NvmCtx.Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
+    RegionNvmGroup2->Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
 
-    return RegionCommonChanDisable( NvmCtx.ChannelsMask, id, CN779_MAX_NB_CHANNELS );
+    return RegionCommonChanDisable( RegionNvmGroup2->ChannelsMask, id, CN779_MAX_NB_CHANNELS );
+#else
+    return false;
+#endif /* REGION_CN779 */
 }
 
 void RegionCN779SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_CN779 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, continuousWave->MaxEirp, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_CN779 */
 }
 
 uint8_t RegionCN779ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_CN779 )
     int8_t datarate = dr - drOffset;
 
     if( datarate < 0 )
@@ -993,10 +1003,14 @@ uint8_t RegionCN779ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
         datarate = DR_0;
     }
     return datarate;
+#else
+    return 0;
+#endif /* REGION_CN779 */
 }
 
 void RegionCN779RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_CN779 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesCN779;
@@ -1011,4 +1025,5 @@ void RegionCN779RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = CN779_BEACON_CHANNEL_DR;
+#endif /* REGION_CN779 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.h
index 146dc6a7..8c5968bb 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionCN779.h
+  * @author  MCD Application Team
+  * @brief   Region definition for CN779
+  ******************************************************************************
+  */
 #ifndef __REGION_CN779_H__
 #define __REGION_CN779_H__
 
@@ -94,11 +104,6 @@ extern "C"
  */
 #define CN779_MAX_RX1_DR_OFFSET                     5
 
-/*!
- * Default Rx1 receive datarate offset
- */
-#define CN779_DEFAULT_RX1_DR_OFFSET                 0
-
 /*!
  * Minimal Tx output power that can be used by the node
  */
@@ -124,16 +129,6 @@ extern "C"
  */
 #define CN779_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define CN779_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define CN779_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -144,41 +139,6 @@ extern "C"
  */
 #define CN779_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define CN779_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define CN779_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define CN779_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define CN779_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define CN779_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define CN779_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define CN779_ACK_TIMEOUT_RND                       1000
-
 /*!
  * Verification of default datarate
  */
@@ -196,6 +156,11 @@ extern "C"
  */
 #define CN779_RX_WND_2_DR                           DR_0
 
+/*!
+ * Default uplink dwell time configuration
+ */
+#define CN779_DEFAULT_UPLINK_DWELL_TIME             0
+
 /*
  * CLASS B
  */
@@ -246,9 +211,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define CN779_BAND0                                 { 100, CN779_MAX_TX_POWER, 0, 0, 0, 0 } //  1.0 %
+#define CN779_BAND0                                 { 100, CN779_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  1.0 %
 
 /*!
  * LoRaMac default channel 1
@@ -282,6 +247,7 @@ static const uint8_t DataratesCN779[]  = { 12, 11, 10,  9,  8,  7,  7, 50 };
  */
 static const uint32_t BandwidthsCN779[] = { 125000, 125000, 125000, 125000, 125000, 125000, 250000, 0 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  */
@@ -291,6 +257,7 @@ static const uint8_t MaxPayloadOfDatarateCN779[] = { 51, 51, 51, 115, 242, 242,
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterCN779[] = { 51, 51, 51, 115, 222, 222, 222, 222 };
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief The function gets a value of a specific phy attribute.
@@ -315,15 +282,6 @@ void RegionCN779SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionCN779InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionCN779GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -416,7 +374,7 @@ uint8_t RegionCN779RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionCN779NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionCN779NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -436,7 +394,7 @@ int8_t RegionCN779TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionCN779DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionCN779DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c
index 6cd34db6..cdf0630c 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c
@@ -28,31 +28,81 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionCommon.c
+  * @author  MCD Application Team
+  * @brief   LoRa MAC common region implementation
+  ******************************************************************************
+  */
 #include <math.h>
+#include "radio.h"
+#include "utilities.h"
 #include "RegionCommon.h"
+#include "systime.h"
 #include "mw_log_conf.h"
 
 #define BACKOFF_DC_1_HOUR                   100
 #define BACKOFF_DC_10_HOURS                 1000
 #define BACKOFF_DC_24_HOURS                 10000
-#define BACKOFF_DC_TIMER_PERIOD_FACTOR      100
+
+#define BACKOFF_DUTY_CYCLE_1_HOUR_IN_S      3600
+#define BACKOFF_DUTY_CYCLE_10_HOURS_IN_S    ( BACKOFF_DUTY_CYCLE_1_HOUR_IN_S + ( BACKOFF_DUTY_CYCLE_1_HOUR_IN_S * 10 ) )
+#define BACKOFF_DUTY_CYCLE_24_HOURS_IN_S    ( BACKOFF_DUTY_CYCLE_10_HOURS_IN_S + ( BACKOFF_DUTY_CYCLE_1_HOUR_IN_S * 24 ) )
+#define BACKOFF_24_HOURS_IN_S               ( BACKOFF_DUTY_CYCLE_1_HOUR_IN_S * 24 )
 
 #ifndef DUTY_CYCLE_TIME_PERIOD
 /*!
- * Default duty cycle time period is 1 hour = 3600000 ms
+ * Default duty cycle observation time period
+ *
+ * \remark The ETSI observation time period is 1 hour (3600000 ms) but, the implemented algorithm may violate the
+ *         defined duty-cycle restrictions. In order to ensure that these restrictions never get violated we changed the
+ *         default duty cycle observation time period to 1/2 hour (1800000 ms).
  */
-#define DUTY_CYCLE_TIME_PERIOD              3600000
+#define DUTY_CYCLE_TIME_PERIOD              1800000
 #endif
 
+/*!
+ * \brief Returns `N / D` rounded to the smallest integer value greater than or equal to `N / D`
+ *
+ * \warning when `D == 0`, the result is undefined
+ *
+ * \remark `N` and `D` can be signed or unsigned
+ *
+ * \param [IN] N the numerator, which can have any sign
+ * \param [IN] D the denominator, which can have any sign
+ * \retval N / D with any fractional part rounded to the smallest integer value greater than or equal to `N / D`
+ */
+#define DIV_CEIL( N, D )                                                       \
+    (                                                                          \
+        ( N > 0 ) ?                                                            \
+        ( ( ( N ) + ( D ) - 1 ) / ( D ) ) :                                    \
+        ( ( N ) / ( D ) )                                                      \
+    )
+
 static uint16_t GetDutyCycle( Band_t* band, bool joined, SysTime_t elapsedTimeSinceStartup )
 {
-    uint16_t joinDutyCycle = RegionCommonGetJoinDc( elapsedTimeSinceStartup );
     uint16_t dutyCycle = band->DCycle;
 
     if( joined == false )
     {
-        // Get the join duty cycle which depends on the runtime
-        joinDutyCycle = RegionCommonGetJoinDc( elapsedTimeSinceStartup );
+        uint16_t joinDutyCycle = BACKOFF_DC_24_HOURS;
+
+        if( elapsedTimeSinceStartup.Seconds < BACKOFF_DUTY_CYCLE_1_HOUR_IN_S )
+        {
+            joinDutyCycle = BACKOFF_DC_1_HOUR;
+        }
+        else if( elapsedTimeSinceStartup.Seconds < BACKOFF_DUTY_CYCLE_10_HOURS_IN_S )
+        {
+            joinDutyCycle = BACKOFF_DC_10_HOURS;
+        }
+        else
+        {
+            joinDutyCycle = BACKOFF_DC_24_HOURS;
+        }
         // Take the most restrictive duty cycle
         dutyCycle = MAX( dutyCycle, joinDutyCycle );
     }
@@ -66,10 +116,13 @@ static uint16_t GetDutyCycle( Band_t* band, bool joined, SysTime_t elapsedTimeSi
     return dutyCycle;
 }
 
-static uint16_t SetMaxTimeCredits( Band_t* band, bool joined, SysTime_t elapsedTimeSinceStartup )
+static uint16_t SetMaxTimeCredits( Band_t* band, bool joined, SysTime_t elapsedTimeSinceStartup,
+                                   bool dutyCycleEnabled, bool lastTxIsJoinRequest )
 {
     uint16_t dutyCycle = band->DCycle;
-    uint8_t timePeriodFactor = 1;
+    TimerTime_t maxCredits = DUTY_CYCLE_TIME_PERIOD;
+    TimerTime_t elapsedTime = SysTimeToMs( elapsedTimeSinceStartup );
+    SysTime_t timeDiff = { 0 };
 
     // Get the band duty cycle. If not joined, the function either returns the join duty cycle
     // or the band duty cycle, whichever is more restrictive.
@@ -77,20 +130,60 @@ static uint16_t SetMaxTimeCredits( Band_t* band, bool joined, SysTime_t elapsedT
 
     if( joined == false )
     {
-        // Apply a factor to increase the maximum time period of observation
-        timePeriodFactor = dutyCycle / BACKOFF_DC_TIMER_PERIOD_FACTOR;
-    }
+        if( dutyCycle == BACKOFF_DC_1_HOUR )
+        {
+            maxCredits = DUTY_CYCLE_TIME_PERIOD;
+            band->LastMaxCreditAssignTime = elapsedTime;
+        }
+        else if( dutyCycle == BACKOFF_DC_10_HOURS )
+        {
+            maxCredits = DUTY_CYCLE_TIME_PERIOD * 10;
+            band->LastMaxCreditAssignTime = elapsedTime;
+        }
+        else
+        {
+            maxCredits = DUTY_CYCLE_TIME_PERIOD * 24;
+        }
 
-    // Setup the maximum allowed credits
-    band->MaxTimeCredits = DUTY_CYCLE_TIME_PERIOD * timePeriodFactor;
+        timeDiff = SysTimeSub( elapsedTimeSinceStartup, SysTimeFromMs( band->LastMaxCreditAssignTime ) );
 
-    // In case if it is the first time, update also the current
-    // time credits
+        // Verify if we have to assign the maximum credits in cases
+        // of the preconditions have changed.
+        if( ( ( dutyCycleEnabled == false ) && ( lastTxIsJoinRequest == false ) ) ||
+            ( band->MaxTimeCredits != maxCredits ) ||
+            ( timeDiff.Seconds >= BACKOFF_24_HOURS_IN_S ) )
+        {
+            band->TimeCredits = maxCredits;
+
+            if( elapsedTimeSinceStartup.Seconds >= BACKOFF_DUTY_CYCLE_24_HOURS_IN_S )
+            {
+                timeDiff.Seconds = ( elapsedTimeSinceStartup.Seconds - BACKOFF_DUTY_CYCLE_24_HOURS_IN_S ) / BACKOFF_24_HOURS_IN_S;
+                timeDiff.Seconds *= BACKOFF_24_HOURS_IN_S;
+                timeDiff.Seconds += BACKOFF_DUTY_CYCLE_24_HOURS_IN_S;
+                timeDiff.SubSeconds = 0;
+                band->LastMaxCreditAssignTime = SysTimeToMs( timeDiff );
+            }
+        }
+    }
+    else
+    {
+        if( dutyCycleEnabled == false )
+        {
+            // Assign max credits when the duty cycle is disabled.
+            band->TimeCredits = maxCredits;
+        }
+    }
+
+    // Assign the max credits if its the first time
     if( band->LastBandUpdateTime == 0 )
     {
-        band->TimeCredits = band->MaxTimeCredits;
+        band->TimeCredits = maxCredits;
     }
 
+    // Setup the maximum allowed credits. We can assign them
+    // safely all the time.
+    band->MaxTimeCredits = maxCredits;
+
     return dutyCycle;
 }
 
@@ -98,30 +191,15 @@ static uint16_t UpdateTimeCredits( Band_t* band, bool joined, bool dutyCycleEnab
                                    bool lastTxIsJoinRequest, SysTime_t elapsedTimeSinceStartup,
                                    TimerTime_t currentTime )
 {
-    uint16_t dutyCycle = SetMaxTimeCredits( band, joined, elapsedTimeSinceStartup );
+    uint16_t dutyCycle = SetMaxTimeCredits( band, joined, elapsedTimeSinceStartup,
+                                            dutyCycleEnabled, lastTxIsJoinRequest );
 
-    if( joined == false )
+    if( joined == true )
     {
-        if( ( dutyCycleEnabled == false ) &&
-            ( lastTxIsJoinRequest == false ) )
-        {
-            // This is the case when the duty cycle is off and the last uplink frame was not a join.
-            // This could happen in case of a rejoin, e.g. in compliance test mode.
-            // In this special case we have to set the time off to 0, since the join duty cycle shall only
-            // be applied after the first join request.
-            band->TimeCredits = band->MaxTimeCredits;
-        }
+        // Apply a sliding window for the duty cycle with collection and speding
+        // credits.
+        band->TimeCredits += TimerGetElapsedTime( band->LastBandUpdateTime );
     }
-    else
-    {
-        if( dutyCycleEnabled == false )
-        {
-            band->TimeCredits = band->MaxTimeCredits;
-        }
-    }
-
-    // Get the difference between now and the last update
-    band->TimeCredits += TimerGetElapsedTime( band->LastBandUpdateTime );
 
     // Limit band credits to maximum
     if( band->TimeCredits > band->MaxTimeCredits )
@@ -149,25 +227,6 @@ static uint8_t CountChannels( uint16_t mask, uint8_t nbBits )
     return nbActiveBits;
 }
 
-uint16_t RegionCommonGetJoinDc( SysTime_t elapsedTime )
-{
-    uint16_t dutyCycle = 0;
-
-    if( elapsedTime.Seconds < 3600 )
-    {
-        dutyCycle = BACKOFF_DC_1_HOUR;
-    }
-    else if( elapsedTime.Seconds < ( 3600 + 36000 ) )
-    {
-        dutyCycle = BACKOFF_DC_10_HOURS;
-    }
-    else
-    {
-        dutyCycle = BACKOFF_DC_24_HOURS;
-    }
-    return dutyCycle;
-}
-
 bool RegionCommonChanVerifyDr( uint8_t nbChannels, uint16_t* channelsMask, int8_t dr, int8_t minDr, int8_t maxDr, ChannelParams_t* channels )
 {
     if( RegionCommonValueInRange( dr, minDr, maxDr ) == 0 )
@@ -289,7 +348,7 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, Band_t* bands,
         // when the duty cycle is off, or the TimeCredits of the band
         // is higher than the credit costs for the transmission.
         if( ( bands[i].TimeCredits > creditCosts ) ||
-            ( dutyCycleEnabled == false ) )
+            ( ( dutyCycleEnabled == false ) && ( joined == true ) ) )
         {
             bands[i].ReadyForTransmission = true;
             // This band is a potential candidate for an
@@ -315,6 +374,36 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, Band_t* bands,
                 // at the moment), so increase the counter.
                 validBands++;
             }
+
+            // Apply a special calculation if the device is not joined.
+            if( joined == false )
+            {
+                SysTime_t backoffTimeRange = {
+                    .Seconds    = 0,
+                    .SubSeconds = 0,
+                };
+                // Get the backoff time range based on the duty cycle definition
+                if( dutyCycle == BACKOFF_DC_1_HOUR )
+                {
+                    backoffTimeRange.Seconds = BACKOFF_DUTY_CYCLE_1_HOUR_IN_S;
+                }
+                else if( dutyCycle == BACKOFF_DC_10_HOURS )
+                {
+                    backoffTimeRange.Seconds = BACKOFF_DUTY_CYCLE_10_HOURS_IN_S;
+                }
+                else
+                {
+                    backoffTimeRange.Seconds = BACKOFF_DUTY_CYCLE_24_HOURS_IN_S;
+                }
+                // Calculate the time to wait.
+                if( elapsedTimeSinceStartup.Seconds > BACKOFF_DUTY_CYCLE_24_HOURS_IN_S )
+                {
+                    backoffTimeRange.Seconds += BACKOFF_24_HOURS_IN_S * ( ( ( elapsedTimeSinceStartup.Seconds - BACKOFF_DUTY_CYCLE_24_HOURS_IN_S ) / BACKOFF_24_HOURS_IN_S ) + 1 );
+                }
+                // Calculate the time difference between now and the next range
+                backoffTimeRange  = SysTimeSub( backoffTimeRange, elapsedTimeSinceStartup );
+                minTimeToWait = SysTimeToMs( backoffTimeRange );
+            }
         }
     }
 
@@ -409,24 +498,23 @@ uint8_t RegionCommonLinkAdrReqVerifyParams( RegionCommonLinkAdrReqVerifyParams_t
     return status;
 }
 
-/* ST_WORKAROUND_BEGIN: remove float/double */
-uint32_t RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidth )
+uint32_t RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidthInHz )
 {
-    return (1000000000UL/bandwidth) * (1 << phyDr);
+    return ( 1 << phyDr ) * 1000000 / bandwidthInHz;
 }
 
-uint32_t RegionCommonComputeSymbolTimeFsk( uint8_t phyDr )
+uint32_t RegionCommonComputeSymbolTimeFsk( uint8_t phyDrInKbps )
 {
-    // ((8 * 1000000) / 50);
-    return 160000UL;
+    return 8000 / ( uint32_t )phyDrInKbps; // 1 symbol equals 1 byte
 }
 
-void RegionCommonComputeRxWindowParameters( uint32_t tSymbol, uint8_t minRxSymbols, uint32_t rxError, uint32_t wakeUpTime, uint32_t* windowTimeout, int32_t* windowOffset )
+void RegionCommonComputeRxWindowParameters( uint32_t tSymbolInUs, uint8_t minRxSymbols, uint32_t rxErrorInMs, uint32_t wakeUpTimeInMs, uint32_t* windowTimeoutInSymbols, int32_t* windowOffsetInMs )
 {
-  *windowTimeout = MAX( (uint32_t)2 * minRxSymbols - 8 + DIVC(2 * rxError * 1000000UL, tSymbol ), minRxSymbols);
-  *windowOffset = DIVC((int32_t)(4 * tSymbol - ((*windowTimeout * tSymbol) >> 1)), 1000000L) - 1 - wakeUpTime;
+    *windowTimeoutInSymbols = MAX( DIV_CEIL( ( ( 2 * minRxSymbols - 8 ) * tSymbolInUs + 2 * ( rxErrorInMs * 1000 ) ),  tSymbolInUs ), minRxSymbols ); // Computed number of symbols
+    *windowOffsetInMs = ( int32_t )DIV_CEIL( ( int32_t )( 4 * tSymbolInUs ) -
+                                               ( int32_t )DIV_CEIL( ( *windowTimeoutInSymbols * tSymbolInUs ), 2 ) -
+                                               ( int32_t )( wakeUpTimeInMs * 1000 ), 1000 );
 }
-/* ST_WORKAROUND_END */
 
 int8_t RegionCommonComputeTxPower( int8_t txPowerIndex, float maxEirp, float antennaGain )
 {
@@ -463,8 +551,9 @@ void RegionCommonRxBeaconSetup( RegionCommonRxBeaconSetupParams_t* rxBeaconSetup
                        1, 0, 10, rxBeaconSetupParams->SymbolTimeout, true, rxBeaconSetupParams->BeaconSize, false, 0, 0, false, rxContinuous );
 
     Radio.Rx( rxBeaconSetupParams->RxTime );
-    
+    /* ST_WORKAROUND_BEGIN: Print Beacon parameters */
     MW_LOG(TS_ON, VLEVEL_M, "RX_BC on freq %d Hz at DR %d\r\n", rxBeaconSetupParams->Frequency, rxBeaconSetupParams->BeaconDatarate );
+    /* ST_WORKAROUND_END */
 }
 
 void RegionCommonCountNbOfEnabledChannels( RegionCommonCountNbOfEnabledChannelsParams_t* countNbOfEnabledChannelsParams,
@@ -484,9 +573,9 @@ void RegionCommonCountNbOfEnabledChannels( RegionCommonCountNbOfEnabledChannelsP
                     continue;
                 }
                 if( ( countNbOfEnabledChannelsParams->Joined == false ) &&
-                    ( countNbOfEnabledChannelsParams->JoinChannels > 0 ) )
+                    ( countNbOfEnabledChannelsParams->JoinChannels != NULL ) )
                 {
-                    if( ( countNbOfEnabledChannelsParams->JoinChannels & ( 1 << j ) ) == 0 )
+                    if( ( countNbOfEnabledChannelsParams->JoinChannels[k] & ( 1 << j ) ) == 0 )
                     {
                         continue;
                     }
@@ -554,6 +643,47 @@ LoRaMacStatus_t RegionCommonIdentifyChannels( RegionCommonIdentifyChannelsParam_
     }
 }
 
+int8_t RegionCommonGetNextLowerTxDr( RegionCommonGetNextLowerTxDrParams_t *params )
+{
+    int8_t drLocal = params->CurrentDr;
+
+    if( params->CurrentDr == params->MinDr )
+    {
+        return params->MinDr;
+    }
+    else
+    {
+        do
+        {
+            drLocal = ( drLocal - 1 );
+        } while( ( drLocal != params->MinDr ) &&
+                 ( RegionCommonChanVerifyDr( params->NbChannels, params->ChannelsMask, drLocal, params->MinDr, params->MaxDr, params->Channels  ) == false ) );
+
+        return drLocal;
+    }
+}
+
+int8_t RegionCommonLimitTxPower( int8_t txPower, int8_t maxBandTxPower )
+{
+    // Limit tx power to the band max
+    return MAX( txPower, maxBandTxPower );
+}
+
+uint32_t RegionCommonGetBandwidth( uint32_t drIndex, const uint32_t* bandwidths )
+{
+    switch( bandwidths[drIndex] )
+    {
+        default:
+        case 125000:
+            return 0;
+        case 250000:
+            return 1;
+        case 500000:
+            return 2;
+    }
+}
+
+/* ST_WORKAROUND_BEGIN: Print Tx/Rx config */
 void RegionCommonRxConfigPrint(LoRaMacRxSlot_t rxSlot, uint32_t frequency, int8_t dr)
 {
     const char *slotStrings[] = { "1", "2", "C", "Multi_C", "P", "Multi_P" };
@@ -572,3 +702,4 @@ void RegionCommonTxConfigPrint(uint32_t frequency, int8_t dr)
 {
     MW_LOG(TS_ON, VLEVEL_M,  "TX on freq %d Hz at DR %d\r\n", frequency, dr );
 }
+/* ST_WORKAROUND_END */
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.h
index 9839a344..23b0d216 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.h
@@ -34,6 +34,16 @@
  *            Region independent implementations which are common to all regions.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionCommon.h
+  * @author  MCD Application Team
+  * @brief   Region independent implementations which are common to all regions.
+  ******************************************************************************
+  */
 #ifndef __REGIONCOMMON_H__
 #define __REGIONCOMMON_H__
 
@@ -46,6 +56,64 @@ extern "C"
 #include "LoRaMacHeaderTypes.h"
 #include "Region.h"
 
+// Constants that are common to all the regions.
+
+/*!
+ * Receive delay of 1 second.
+ */
+#define REGION_COMMON_DEFAULT_RECEIVE_DELAY1            1000
+
+/*!
+ * Receive delay of 2 seconds.
+ */
+#define REGION_COMMON_DEFAULT_RECEIVE_DELAY2            ( REGION_COMMON_DEFAULT_RECEIVE_DELAY1 + 1000 )
+
+/*!
+ * Join accept delay of 5 seconds.
+ */
+#define REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1        5000
+
+/*!
+ * Join accept delay of 6 seconds.
+ */
+#define REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2        ( REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1 + 1000 )
+
+/*!
+ * ADR ack limit.
+ */
+#define REGION_COMMON_DEFAULT_ADR_ACK_LIMIT             64
+
+/*!
+ * ADR ack delay.
+ */
+#define REGION_COMMON_DEFAULT_ADR_ACK_DELAY             32
+
+/*!
+ * Maximum frame counter gap
+ */
+#define REGION_COMMON_DEFAULT_MAX_FCNT_GAP              16384
+
+/*!
+ * Retransmission timeout for ACK in milliseconds.
+ */
+#define REGION_COMMON_DEFAULT_ACK_TIMEOUT               2000
+
+/*!
+ * Rounding limit for generating random retransmission timeout for ACK.
+ * In milliseconds.
+ */
+#define REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND           1000
+
+/*!
+ * Default Rx1 receive datarate offset
+ */
+#define REGION_COMMON_DEFAULT_RX1_DR_OFFSET             0
+
+/*!
+ * Default downlink dwell time configuration
+ */
+#define REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME       0
+
 /*!
  * Default ping slots periodicity
  *
@@ -205,9 +273,11 @@ typedef struct sRegionCommonCountNbOfEnabledChannelsParams
      */
     uint16_t MaxNbChannels;
     /*!
-     * A bitmask containing the join channels.
+     * A pointer to the bitmask containing the
+     * join channels. Shall have the same dimension as the
+     * ChannelsMask with a number of MaxNbChannels channels.
      */
-    uint16_t JoinChannels;
+    uint16_t* JoinChannels;
 }RegionCommonCountNbOfEnabledChannelsParams_t;
 
 typedef struct sRegionCommonIdentifyChannelsParam
@@ -262,15 +332,15 @@ typedef struct sRegionCommonSetDutyCycleParams
     Band_t* Bands;
 }RegionCommonSetDutyCycleParams_t;
 
-/*!
- * \brief Calculates the join duty cycle.
- *        This is a generic function and valid for all regions.
- *
- * \param [IN] elapsedTime Elapsed time since the start of the device.
- *
- * \retval Duty cycle restriction.
- */
-uint16_t RegionCommonGetJoinDc( SysTime_t elapsedTime );
+typedef struct sRegionCommonGetNextLowerTxDrParams
+{
+    int8_t CurrentDr;
+    int8_t MaxDr;
+    int8_t MinDr;
+    uint8_t NbChannels;
+    uint16_t* ChannelsMask;
+    ChannelParams_t* Channels;
+}RegionCommonGetNextLowerTxDrParams_t;
 
 /*!
  * \brief Verifies, if a value is in a given range.
@@ -423,38 +493,36 @@ uint8_t RegionCommonLinkAdrReqVerifyParams( RegionCommonLinkAdrReqVerifyParams_t
  *
  * \param [IN] bandwidth Bandwidth to use.
  *
- * \retval Returns the symbol time in us.
+ * \retval Returns the symbol time in microseconds.
  */
-uint32_t RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidth );
+uint32_t RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidthInHz );
 
 /*!
  * \brief Computes the symbol time for FSK modulation.
  *
  * \param [IN] phyDr Physical datarate to use.
  *
- * \param [IN] bandwidth Bandwidth to use.
- *
- * \retval Returns the symbol time in us.
+ * \retval Returns the symbol time in microseconds.
  */
-uint32_t RegionCommonComputeSymbolTimeFsk( uint8_t phyDr );
+uint32_t RegionCommonComputeSymbolTimeFsk( uint8_t phyDrInKbps );
 
 /*!
  * \brief Computes the RX window timeout and the RX window offset.
  *
- * \param [IN] tSymbol Symbol timeout.
+ * \param [IN] tSymbolInUs Symbol timeout.
  *
  * \param [IN] minRxSymbols Minimum required number of symbols to detect an Rx frame.
  *
- * \param [IN] rxError System maximum timing error of the receiver. In milliseconds
- *                     The receiver will turn on in a [-rxError : +rxError] ms interval around RxOffset.
+ * \param [IN] rxErrorInMs System maximum timing error of the receiver. In milliseconds
+ *                     The receiver will turn on in a [-rxErrorInMs : +rxErrorInMs] ms interval around RxOffset.
  *
- * \param [IN] wakeUpTime Wakeup time of the system.
+ * \param [IN] wakeUpTimeInMs Wakeup time of the system.
  *
- * \param [OUT] windowTimeout RX window timeout.
+ * \param [OUT] windowTimeoutInSymbols RX window timeout.
  *
- * \param [OUT] windowOffset RX window time offset to be applied to the RX delay.
+ * \param [OUT] windowOffsetInMs RX window time offset to be applied to the RX delay.
  */
-void RegionCommonComputeRxWindowParameters( uint32_t tSymbol, uint8_t minRxSymbols, uint32_t rxError, uint32_t wakeUpTime, uint32_t* windowTimeout, int32_t* windowOffset );
+void RegionCommonComputeRxWindowParameters( uint32_t tSymbolInUs, uint8_t minRxSymbols, uint32_t rxErrorInMs, uint32_t wakeUpTimeInMs, uint32_t* windowTimeoutInSymbols, int32_t* windowOffsetInMs );
 
 /*!
  * \brief Computes the txPower, based on the max EIRP and the antenna gain.
@@ -522,6 +590,38 @@ LoRaMacStatus_t RegionCommonIdentifyChannels( RegionCommonIdentifyChannelsParam_
                                               uint8_t* nbEnabledChannels, uint8_t* nbRestrictedChannels,
                                               TimerTime_t* nextTxDelay );
 
+/*!
+ * \brief Selects the next lower datarate.
+ *
+ * \param [IN] params Data structure providing parameters based on \ref RegionCommonGetNextLowerTxDrParams_t
+ *
+ * \retval The next lower datarate.
+ */
+int8_t RegionCommonGetNextLowerTxDr( RegionCommonGetNextLowerTxDrParams_t *params );
+
+/*!
+ * \brief Limits the TX power.
+ *
+ * \param [IN] txPower Current TX power.
+ *
+ * \param [IN] maxBandTxPower Maximum possible TX power.
+ *
+ * \retval Limited TX power.
+ */
+int8_t RegionCommonLimitTxPower( int8_t txPower, int8_t maxBandTxPower );
+
+/*!
+ * \brief Gets the bandwidth.
+ *
+ * \param [IN] drIndex Datarate index.
+ *
+ * \param [IN] bandwidths A pointer to the bandwidth table.
+ *
+ * \retval Bandwidth.
+ */
+uint32_t RegionCommonGetBandwidth( uint32_t drIndex, const uint32_t* bandwidths );
+
+/* ST_WORKAROUND_BEGIN: Print Tx/Rx config */
 /*!
  * \brief Print the current RX configuration
  *
@@ -545,7 +645,7 @@ void RegionCommonRxConfigPrint(LoRaMacRxSlot_t rxSlot,
  *
  */
 void RegionCommonTxConfigPrint(uint32_t frequency, int8_t dr);
-
+/* ST_WORKAROUND_END */
 /*! \} defgroup REGIONCOMMON */
 
 #ifdef __cplusplus
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c
index 4b743439..77e9b05e 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c
@@ -28,82 +28,32 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionEU433.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for EU433
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionEU433.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE              1
 
-/*!
- * Region specific context
- */
-typedef struct sRegionEU433NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ EU433_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ EU433_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionEU433NvmCtx_t;
-
+#if defined( REGION_EU433 )
 /*
  * Non-volatile module context.
  */
-static RegionEU433NvmCtx_t NvmCtx;
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 // Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsEU433[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
-
-    return txPowerResult;
-}
-
 static bool VerifyRfFreq( uint32_t freq )
 {
     // Check radio driver support
@@ -122,7 +72,7 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesEU433[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsEU433 );
     TimerTime_t timeOnAir = 0;
 
     if( datarate == DR_7 )
@@ -135,11 +85,13 @@ static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
     }
     return timeOnAir;
 }
+#endif /* REGION_EU433 */
 
 PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_EU433 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -159,7 +111,16 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, EU433_TX_MIN_DATARATE );
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
+            {
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )EU433_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )EU433_TX_MIN_DATARATE,
+                .NbChannels = EU433_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -174,12 +135,12 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = EU433_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = EU433_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -187,11 +148,13 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = MaxPayloadOfDatarateEU433[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             phyParam.Value = MaxPayloadOfDatarateRepeaterEU433[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = EU433_DUTY_CYCLE_ENABLED;
@@ -204,37 +167,37 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = EU433_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = EU433_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = EU433_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = EU433_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = EU433_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( EU433_ACKTIMEOUT + randr( -EU433_ACK_TIMEOUT_RND, EU433_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = EU433_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -249,12 +212,12 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -264,13 +227,17 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
+        {
+            phyParam.Value = EU433_DEFAULT_UPLINK_DWELL_TIME;
+            break;
+        }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = 0;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -317,7 +284,7 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsEU433 );
             break;
         }
         default:
@@ -326,17 +293,21 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_EU433 */
     return phyParam;
 }
 
 void RegionEU433SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_EU433 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_EU433 */
 }
 
 void RegionEU433InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_EU433 )
     Band_t bands[EU433_MAX_NB_BANDS] =
     {
         EU433_BAND0
@@ -346,43 +317,43 @@ void RegionEU433InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Default bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * EU433_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * EU433_MAX_NB_BANDS );
 
             // Default channels
-            NvmCtx.Channels[0] = ( ChannelParams_t ) EU433_LC1;
-            NvmCtx.Channels[1] = ( ChannelParams_t ) EU433_LC2;
-            NvmCtx.Channels[2] = ( ChannelParams_t ) EU433_LC3;
+            RegionNvmGroup2->Channels[0] = ( ChannelParams_t ) EU433_LC1;
+            RegionNvmGroup2->Channels[1] = ( ChannelParams_t ) EU433_LC2;
+            RegionNvmGroup2->Channels[2] = ( ChannelParams_t ) EU433_LC3;
 
             // Default ChannelsMask
-            NvmCtx.ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
+            RegionNvmGroup2->ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
 
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
         {
             // Reset Channels Rx1Frequency to default 0
-            NvmCtx.Channels[0].Rx1Frequency = 0;
-            NvmCtx.Channels[1].Rx1Frequency = 0;
-            NvmCtx.Channels[2].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[0].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[1].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[2].Rx1Frequency = 0;
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Restore channels default mask
-            NvmCtx.ChannelsMask[0] |= NvmCtx.ChannelsDefaultMask[0];
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
-            }
+            RegionNvmGroup2->ChannelsMask[0] |= RegionNvmGroup2->ChannelsDefaultMask[0];
             break;
         }
         default:
@@ -390,16 +361,12 @@ void RegionEU433InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionEU433GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionEU433NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_EU433 */
 }
 
 bool RegionEU433Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_EU433 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -431,10 +398,14 @@ bool RegionEU433Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_EU433 */
 }
 
 void RegionEU433ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_EU433 )
     ChannelParams_t newChannel;
     ChannelAddParams_t channelAdd;
     ChannelRemoveParams_t channelRemove;
@@ -490,52 +461,58 @@ void RegionEU433ApplyCFList( ApplyCFListParams_t* applyCFList )
             RegionEU433ChannelsRemove( &channelRemove );
         }
     }
+#endif /* REGION_EU433 */
 }
 
 bool RegionEU433ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_EU433 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_EU433 */
 }
 
 void RegionEU433ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_EU433 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, EU433_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsEU433 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesEU433[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesEU433[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesEU433[rxConfigParams->Datarate], BandwidthsEU433[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesEU433[rxConfigParams->Datarate], BandwidthsEU433[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_EU433 */
 }
 
 bool RegionEU433RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_EU433 )
     RadioModems_t modem;
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
@@ -550,11 +527,11 @@ bool RegionEU433RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     if( rxConfig->RxSlot == RX_SLOT_WIN_1 )
     {
         // Apply window 1 frequency
-        frequency = NvmCtx.Channels[rxConfig->Channel].Frequency;
+        frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Frequency;
         // Apply the alternative RX 1 window frequency, if it is available
-        if( NvmCtx.Channels[rxConfig->Channel].Rx1Frequency != 0 )
+        if( RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency != 0 )
         {
-            frequency = NvmCtx.Channels[rxConfig->Channel].Rx1Frequency;
+            frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency;
         }
     }
 
@@ -575,6 +552,7 @@ bool RegionEU433RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         Radio.SetRxConfig( modem, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
     }
 
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterEU433[dr];
@@ -584,27 +562,33 @@ bool RegionEU433RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         maxPayload = MaxPayloadOfDatarateEU433[dr];
     }
     Radio.SetMaxPayloadLength( modem, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_EU433 */
 }
 
 bool RegionEU433TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_EU433 )
     RadioModems_t modem;
     int8_t phyDr = DataratesEU433[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsEU433 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, txConfig->MaxEirp, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     if( txConfig->Datarate == DR_7 )
     { // High Speed FSK channel
@@ -617,7 +601,7 @@ bool RegionEU433TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     }
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Update time-on-air
@@ -628,11 +612,15 @@ bool RegionEU433TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_EU433 */
 }
 
 uint8_t RegionEU433LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_EU433 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
@@ -675,7 +663,7 @@ uint8_t RegionEU433LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
             {
                 if( linkAdrParams.ChMaskCtrl == 6 )
                 {
-                    if( NvmCtx.Channels[i].Frequency != 0 )
+                    if( RegionNvmGroup2->Channels[i].Frequency != 0 )
                     {
                         chMask |= 1 << i;
                     }
@@ -683,7 +671,7 @@ uint8_t RegionEU433LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
                 else
                 {
                     if( ( ( chMask & ( 1 << i ) ) != 0 ) &&
-                        ( NvmCtx.Channels[i].Frequency == 0 ) )
+                        ( RegionNvmGroup2->Channels[i].Frequency == 0 ) )
                     {// Trying to enable an undefined channel
                         status &= 0xFE; // Channel mask KO
                     }
@@ -692,7 +680,7 @@ uint8_t RegionEU433LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
         }
     }
 
-        // Get the minimum possible datarate
+    // Get the minimum possible datarate
     getPhy.Attribute = PHY_MIN_TX_DR;
     getPhy.UplinkDwellTime = linkAdrReq->UplinkDwellTime;
     phyParam = RegionEU433GetPhyParam( &getPhy );
@@ -709,7 +697,7 @@ uint8_t RegionEU433LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = &chMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = EU433_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = EU433_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = EU433_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -721,9 +709,9 @@ uint8_t RegionEU433LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Set the channels mask to a default value
-        memset1( ( uint8_t* ) NvmCtx.ChannelsMask, 0, sizeof( NvmCtx.ChannelsMask ) );
+        memset1( ( uint8_t* ) RegionNvmGroup2->ChannelsMask, 0, sizeof( RegionNvmGroup2->ChannelsMask ) );
         // Update the channels mask
-        NvmCtx.ChannelsMask[0] = chMask;
+        RegionNvmGroup2->ChannelsMask[0] = chMask;
     }
 
     // Update status variables
@@ -732,12 +720,14 @@ uint8_t RegionEU433LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_EU433 */
     return status;
 }
 
 uint8_t RegionEU433RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_EU433 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -757,10 +747,11 @@ uint8_t RegionEU433RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_EU433 */
     return status;
 }
 
-uint8_t RegionEU433NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionEU433NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
     uint8_t status = 0x03;
     ChannelAddParams_t channelAdd;
@@ -815,12 +806,14 @@ uint8_t RegionEU433NewChannelReq( NewChannelReqParams_t* newChannelReq )
 
 int8_t RegionEU433TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
 {
+    // Do not accept the request
     return -1;
 }
 
-uint8_t RegionEU433DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionEU433DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
     uint8_t status = 0x03;
+#if defined( REGION_EU433 )
 
     // Verify if the frequency is supported
     if( VerifyRfFreq( dlChannelReq->Rx1Frequency ) == false )
@@ -829,7 +822,7 @@ uint8_t RegionEU433DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     }
 
     // Verify if an uplink frequency exists
-    if( NvmCtx.Channels[dlChannelReq->ChannelId].Frequency == 0 )
+    if( RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Frequency == 0 )
     {
         status &= 0xFD;
     }
@@ -837,39 +830,46 @@ uint8_t RegionEU433DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     // Apply Rx1 frequency, if the status is OK
     if( status == 0x03 )
     {
-        NvmCtx.Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
+        RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
     }
 
+#endif /* REGION_EU433 */
     return status;
 }
 
 int8_t RegionEU433AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
+#if defined( REGION_EU433 )
     return currentDr;
+#else
+    return -1;
+#endif /* REGION_EU433 */
 }
 
 LoRaMacStatus_t RegionEU433NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_EU433 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[EU433_MAX_NB_CHANNELS] = { 0 };
     RegionCommonIdentifyChannelsParam_t identifyChannelsParam;
     RegionCommonCountNbOfEnabledChannelsParams_t countChannelsParams;
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
+    uint16_t joinChannels = EU433_JOIN_CHANNELS;
 
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMask, 0, 1 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup2->ChannelsMask, 0, 1 ) == 0 )
     { // Reactivate default channels
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMask;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup2->ChannelsMask;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = EU433_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = EU433_JOIN_CHANNELS;
+    countChannelsParams.JoinChannels = &joinChannels;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -893,13 +893,17 @@ LoRaMacStatus_t RegionEU433NextChannel( NextChanParams_t* nextChanParams, uint8_
     else if( status == LORAMAC_STATUS_NO_CHANNEL_FOUND )
     {
         // Datarate not supported by any channel, restore defaults
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_EU433 */
 }
 
 LoRaMacStatus_t RegionEU433ChannelAdd( ChannelAddParams_t* channelAdd )
 {
+#if defined( REGION_EU433 )
     bool drInvalid = false;
     bool freqInvalid = false;
     uint8_t id = channelAdd->ChannelId;
@@ -951,14 +955,18 @@ LoRaMacStatus_t RegionEU433ChannelAdd( ChannelAddParams_t* channelAdd )
         return LORAMAC_STATUS_FREQUENCY_INVALID;
     }
 
-    memcpy1( ( uint8_t* ) &(NvmCtx.Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( NvmCtx.Channels[id] ) );
-    NvmCtx.Channels[id].Band = 0;
-    NvmCtx.ChannelsMask[0] |= ( 1 << id );
+    memcpy1( ( uint8_t* ) &(RegionNvmGroup2->Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( RegionNvmGroup2->Channels[id] ) );
+    RegionNvmGroup2->Channels[id].Band = 0;
+    RegionNvmGroup2->ChannelsMask[0] |= ( 1 << id );
     return LORAMAC_STATUS_OK;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_EU433 */
 }
 
 bool RegionEU433ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 {
+#if defined( REGION_EU433 )
     uint8_t id = channelRemove->ChannelId;
 
     if( id < EU433_NUMB_DEFAULT_CHANNELS )
@@ -967,25 +975,31 @@ bool RegionEU433ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
     }
 
     // Remove the channel from the list of channels
-    NvmCtx.Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
+    RegionNvmGroup2->Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
 
-    return RegionCommonChanDisable( NvmCtx.ChannelsMask, id, EU433_MAX_NB_CHANNELS );
+    return RegionCommonChanDisable( RegionNvmGroup2->ChannelsMask, id, EU433_MAX_NB_CHANNELS );
+#else
+    return false;
+#endif /* REGION_EU433 */
 }
 
 void RegionEU433SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_EU433 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, continuousWave->MaxEirp, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_EU433 */
 }
 
 uint8_t RegionEU433ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_EU433 )
     int8_t datarate = dr - drOffset;
 
     if( datarate < 0 )
@@ -993,10 +1007,14 @@ uint8_t RegionEU433ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
         datarate = DR_0;
     }
     return datarate;
+#else
+    return 0;
+#endif /* REGION_EU433 */
 }
 
 void RegionEU433RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_EU433 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesEU433;
@@ -1004,11 +1022,12 @@ void RegionEU433RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
     regionCommonRxBeaconSetup.BeaconSize = EU433_BEACON_SIZE;
     regionCommonRxBeaconSetup.BeaconDatarate = EU433_BEACON_CHANNEL_DR;
     regionCommonRxBeaconSetup.BeaconChannelBW = EU433_BEACON_CHANNEL_BW;
-   regionCommonRxBeaconSetup.RxTime = rxBeaconSetup->RxTime;
+    regionCommonRxBeaconSetup.RxTime = rxBeaconSetup->RxTime;
     regionCommonRxBeaconSetup.SymbolTimeout = rxBeaconSetup->SymbolTimeout;
 
     RegionCommonRxBeaconSetup( &regionCommonRxBeaconSetup );
 
     // Store downlink datarate
     *outDr = EU433_BEACON_CHANNEL_DR;
+#endif /* REGION_EU433 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.h
index ec0b6014..c77a22b2 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionEU433.h
+  * @author  MCD Application Team
+  * @brief   Region definition for EU433
+  ******************************************************************************
+  */
 #ifndef __REGION_EU433_H__
 #define __REGION_EU433_H__
 
@@ -94,11 +104,6 @@ extern "C"
  */
 #define EU433_MAX_RX1_DR_OFFSET                     5
 
-/*!
- * Default Rx1 receive datarate offset
- */
-#define EU433_DEFAULT_RX1_DR_OFFSET                 0
-
 /*!
  * Minimal Tx output power that can be used by the node
  */
@@ -124,16 +129,6 @@ extern "C"
  */
 #define EU433_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define EU433_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define EU433_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -144,41 +139,6 @@ extern "C"
  */
 #define EU433_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define EU433_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define EU433_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define EU433_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define EU433_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define EU433_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define EU433_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define EU433_ACK_TIMEOUT_RND                       1000
-
 /*!
  * Verification of default datarate
  */
@@ -201,6 +161,11 @@ extern "C"
  */
 #define EU433_MAX_NB_BANDS                          1
 
+/*!
+ * Default uplink dwell time configuration
+ */
+#define EU433_DEFAULT_UPLINK_DWELL_TIME             0
+
 /*
  * CLASS B
  */
@@ -246,9 +211,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define EU433_BAND0                                 { 100, EU433_MAX_TX_POWER, 0, 0, 0, 0 } //  1.0 %
+#define EU433_BAND0                                 { 100, EU433_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  1.0 %
 
 /*!
  * LoRaMac default channel 1
@@ -283,6 +248,7 @@ static const uint8_t DataratesEU433[] = { 12, 11, 10,  9,  8,  7,  7, 50 };
  */
 static const uint32_t BandwidthsEU433[] = { 125000, 125000, 125000, 125000, 125000, 125000, 250000, 0 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  */
@@ -292,6 +258,7 @@ static const uint8_t MaxPayloadOfDatarateEU433[] = { 51, 51, 51, 115, 242, 242,
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterEU433[] = { 51, 51, 51, 115, 222, 222, 222, 222 };
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief The function gets a value of a specific phy attribute.
@@ -316,15 +283,6 @@ void RegionEU433SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionEU433InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionEU433GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -417,7 +375,7 @@ uint8_t RegionEU433RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionEU433NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionEU433NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -437,7 +395,7 @@ int8_t RegionEU433TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionEU433DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionEU433DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c
index 9ca1d975..8db7ea22 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c
@@ -28,82 +28,32 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionEU868.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for EU868
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionEU868.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE              1
 
-/*!
- * Region specific context
- */
-typedef struct sRegionEU868NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ EU868_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ EU868_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionEU868NvmCtx_t;
-
+#if defined( REGION_EU868 )
 /*
  * Non-volatile module context.
  */
-static RegionEU868NvmCtx_t NvmCtx;
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 // Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsEU868[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
-
-    return txPowerResult;
-}
-
 static bool VerifyRfFreq( uint32_t freq, uint8_t *band )
 {
     // Check radio driver support
@@ -147,7 +97,7 @@ static bool VerifyRfFreq( uint32_t freq, uint8_t *band )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesEU868[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsEU868 );
     TimerTime_t timeOnAir = 0;
 
     if( datarate == DR_7 )
@@ -160,11 +110,13 @@ static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
     }
     return timeOnAir;
 }
+#endif /* REGION_EU868 */
 
 PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_EU868 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -184,7 +136,16 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, EU868_TX_MIN_DATARATE );
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
+            {
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )EU868_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )EU868_TX_MIN_DATARATE,
+                .NbChannels = EU868_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -199,12 +160,12 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = EU868_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = EU868_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -212,11 +173,13 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = MaxPayloadOfDatarateEU868[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             phyParam.Value = MaxPayloadOfDatarateRepeaterEU868[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = EU868_DUTY_CYCLE_ENABLED;
@@ -229,37 +192,37 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = EU868_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = EU868_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = EU868_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = EU868_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = EU868_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( EU868_ACKTIMEOUT + randr( -EU868_ACK_TIMEOUT_RND, EU868_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = EU868_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -274,12 +237,12 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -289,13 +252,17 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
+        {
+            phyParam.Value = EU868_DEFAULT_UPLINK_DWELL_TIME;
+            break;
+        }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = 0;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -342,7 +309,7 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsEU868 );
             break;
         }
         default:
@@ -351,17 +318,21 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_EU868 */
     return phyParam;
 }
 
 void RegionEU868SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_EU868 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_EU868 */
 }
 
 void RegionEU868InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_EU868 )
     Band_t bands[EU868_MAX_NB_BANDS] =
     {
         EU868_BAND0,
@@ -376,43 +347,43 @@ void RegionEU868InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Default bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * EU868_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * EU868_MAX_NB_BANDS );
 
             // Default channels
-            NvmCtx.Channels[0] = ( ChannelParams_t ) EU868_LC1;
-            NvmCtx.Channels[1] = ( ChannelParams_t ) EU868_LC2;
-            NvmCtx.Channels[2] = ( ChannelParams_t ) EU868_LC3;
+            RegionNvmGroup2->Channels[0] = ( ChannelParams_t ) EU868_LC1;
+            RegionNvmGroup2->Channels[1] = ( ChannelParams_t ) EU868_LC2;
+            RegionNvmGroup2->Channels[2] = ( ChannelParams_t ) EU868_LC3;
 
             // Default ChannelsMask
-            NvmCtx.ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
+            RegionNvmGroup2->ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
 
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
         {
             // Reset Channels Rx1Frequency to default 0
-            NvmCtx.Channels[0].Rx1Frequency = 0;
-            NvmCtx.Channels[1].Rx1Frequency = 0;
-            NvmCtx.Channels[2].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[0].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[1].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[2].Rx1Frequency = 0;
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Restore channels default mask
-            NvmCtx.ChannelsMask[0] |= NvmCtx.ChannelsDefaultMask[0];
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
-            }
+            RegionNvmGroup2->ChannelsMask[0] |= RegionNvmGroup2->ChannelsDefaultMask[0];
             break;
         }
         default:
@@ -420,16 +391,12 @@ void RegionEU868InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionEU868GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionEU868NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_EU868 */
 }
 
 bool RegionEU868Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_EU868 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -462,10 +429,14 @@ bool RegionEU868Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_EU868 */
 }
 
 void RegionEU868ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_EU868 )
     ChannelParams_t newChannel;
     ChannelAddParams_t channelAdd;
     ChannelRemoveParams_t channelRemove;
@@ -521,52 +492,58 @@ void RegionEU868ApplyCFList( ApplyCFListParams_t* applyCFList )
             RegionEU868ChannelsRemove( &channelRemove );
         }
     }
+#endif /* REGION_EU868 */
 }
 
 bool RegionEU868ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_EU868 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_EU868 */
 }
 
 void RegionEU868ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_EU868 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, EU868_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsEU868 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesEU868[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesEU868[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesEU868[rxConfigParams->Datarate], BandwidthsEU868[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesEU868[rxConfigParams->Datarate], BandwidthsEU868[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_EU868 */
 }
 
 bool RegionEU868RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_EU868 )
     RadioModems_t modem;
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
@@ -581,11 +558,11 @@ bool RegionEU868RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     if( rxConfig->RxSlot == RX_SLOT_WIN_1 )
     {
         // Apply window 1 frequency
-        frequency = NvmCtx.Channels[rxConfig->Channel].Frequency;
+        frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Frequency;
         // Apply the alternative RX 1 window frequency, if it is available
-        if( NvmCtx.Channels[rxConfig->Channel].Rx1Frequency != 0 )
+        if( RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency != 0 )
         {
-            frequency = NvmCtx.Channels[rxConfig->Channel].Rx1Frequency;
+            frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency;
         }
     }
 
@@ -606,6 +583,7 @@ bool RegionEU868RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         Radio.SetRxConfig( modem, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
     }
 
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterEU868[dr];
@@ -616,27 +594,33 @@ bool RegionEU868RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     }
 
     Radio.SetMaxPayloadLength( modem, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_EU868 */
 }
 
 bool RegionEU868TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_EU868 )
     RadioModems_t modem;
     int8_t phyDr = DataratesEU868[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsEU868 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, txConfig->MaxEirp, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     if( txConfig->Datarate == DR_7 )
     { // High Speed FSK channel
@@ -649,7 +633,7 @@ bool RegionEU868TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     }
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Update time-on-air
@@ -660,11 +644,15 @@ bool RegionEU868TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_EU868 */
 }
 
 uint8_t RegionEU868LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_EU868 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
@@ -707,7 +695,7 @@ uint8_t RegionEU868LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
             {
                 if( linkAdrParams.ChMaskCtrl == 6 )
                 {
-                    if( NvmCtx.Channels[i].Frequency != 0 )
+                    if( RegionNvmGroup2->Channels[i].Frequency != 0 )
                     {
                         chMask |= 1 << i;
                     }
@@ -715,7 +703,7 @@ uint8_t RegionEU868LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
                 else
                 {
                     if( ( ( chMask & ( 1 << i ) ) != 0 ) &&
-                        ( NvmCtx.Channels[i].Frequency == 0 ) )
+                        ( RegionNvmGroup2->Channels[i].Frequency == 0 ) )
                     {// Trying to enable an undefined channel
                         status &= 0xFE; // Channel mask KO
                     }
@@ -741,7 +729,7 @@ uint8_t RegionEU868LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = &chMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = EU868_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = EU868_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = EU868_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -753,9 +741,9 @@ uint8_t RegionEU868LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Set the channels mask to a default value
-        memset1( ( uint8_t* ) NvmCtx.ChannelsMask, 0, sizeof( NvmCtx.ChannelsMask ) );
+        memset1( ( uint8_t* ) RegionNvmGroup2->ChannelsMask, 0, sizeof( RegionNvmGroup2->ChannelsMask ) );
         // Update the channels mask
-        NvmCtx.ChannelsMask[0] = chMask;
+        RegionNvmGroup2->ChannelsMask[0] = chMask;
     }
 
     // Update status variables
@@ -764,12 +752,14 @@ uint8_t RegionEU868LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_EU868 */
     return status;
 }
 
 uint8_t RegionEU868RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_EU868 )
     uint8_t band = 0;
 
     // Verify radio frequency
@@ -790,10 +780,11 @@ uint8_t RegionEU868RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_EU868 */
     return status;
 }
 
-uint8_t RegionEU868NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionEU868NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
     uint8_t status = 0x03;
     ChannelAddParams_t channelAdd;
@@ -848,12 +839,14 @@ uint8_t RegionEU868NewChannelReq( NewChannelReqParams_t* newChannelReq )
 
 int8_t RegionEU868TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
 {
+    // Do not accept the request
     return -1;
 }
 
-uint8_t RegionEU868DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionEU868DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
     uint8_t status = 0x03;
+#if defined( REGION_EU868 )
     uint8_t band = 0;
 
     // Verify if the frequency is supported
@@ -863,7 +856,7 @@ uint8_t RegionEU868DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     }
 
     // Verify if an uplink frequency exists
-    if( NvmCtx.Channels[dlChannelReq->ChannelId].Frequency == 0 )
+    if( RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Frequency == 0 )
     {
         status &= 0xFD;
     }
@@ -871,39 +864,46 @@ uint8_t RegionEU868DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     // Apply Rx1 frequency, if the status is OK
     if( status == 0x03 )
     {
-        NvmCtx.Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
+        RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
     }
 
+#endif /* REGION_EU868 */
     return status;
 }
 
 int8_t RegionEU868AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
+#if defined( REGION_EU868 )
     return currentDr;
+#else
+    return -1;
+#endif /* REGION_EU868 */
 }
 
 LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_EU868 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[EU868_MAX_NB_CHANNELS] = { 0 };
     RegionCommonIdentifyChannelsParam_t identifyChannelsParam;
     RegionCommonCountNbOfEnabledChannelsParams_t countChannelsParams;
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
+    uint16_t joinChannels = EU868_JOIN_CHANNELS;
 
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMask, 0, 1 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup2->ChannelsMask, 0, 1 ) == 0 )
     { // Reactivate default channels
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMask;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup2->ChannelsMask;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = EU868_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = EU868_JOIN_CHANNELS;
+    countChannelsParams.JoinChannels = &joinChannels;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -927,13 +927,17 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_
     else if( status == LORAMAC_STATUS_NO_CHANNEL_FOUND )
     {
         // Datarate not supported by any channel, restore defaults
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_EU868 */
 }
 
 LoRaMacStatus_t RegionEU868ChannelAdd( ChannelAddParams_t* channelAdd )
 {
+#if defined( REGION_EU868 )
     uint8_t band = 0;
     bool drInvalid = false;
     bool freqInvalid = false;
@@ -986,14 +990,18 @@ LoRaMacStatus_t RegionEU868ChannelAdd( ChannelAddParams_t* channelAdd )
         return LORAMAC_STATUS_FREQUENCY_INVALID;
     }
 
-    memcpy1( ( uint8_t* ) &(NvmCtx.Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( NvmCtx.Channels[id] ) );
-    NvmCtx.Channels[id].Band = band;
-    NvmCtx.ChannelsMask[0] |= ( 1 << id );
+    memcpy1( ( uint8_t* ) &(RegionNvmGroup2->Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( RegionNvmGroup2->Channels[id] ) );
+    RegionNvmGroup2->Channels[id].Band = band;
+    RegionNvmGroup2->ChannelsMask[0] |= ( 1 << id );
     return LORAMAC_STATUS_OK;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_EU868 */
 }
 
 bool RegionEU868ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 {
+#if defined( REGION_EU868 )
     uint8_t id = channelRemove->ChannelId;
 
     if( id < EU868_NUMB_DEFAULT_CHANNELS )
@@ -1002,25 +1010,31 @@ bool RegionEU868ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
     }
 
     // Remove the channel from the list of channels
-    NvmCtx.Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
+    RegionNvmGroup2->Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
 
-    return RegionCommonChanDisable( NvmCtx.ChannelsMask, id, EU868_MAX_NB_CHANNELS );
+    return RegionCommonChanDisable( RegionNvmGroup2->ChannelsMask, id, EU868_MAX_NB_CHANNELS );
+#else
+    return false;
+#endif /* REGION_EU868 */
 }
 
 void RegionEU868SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_EU868 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, continuousWave->MaxEirp, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_EU868 */
 }
 
 uint8_t RegionEU868ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_EU868 )
     int8_t datarate = dr - drOffset;
 
     if( datarate < 0 )
@@ -1028,10 +1042,14 @@ uint8_t RegionEU868ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
         datarate = DR_0;
     }
     return datarate;
+#else
+    return 0;
+#endif /* REGION_EU868 */
 }
 
 void RegionEU868RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_EU868 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesEU868;
@@ -1046,4 +1064,5 @@ void RegionEU868RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = EU868_BEACON_CHANNEL_DR;
+#endif /* REGION_EU868 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.h
index a154ac6e..9e760530 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionEU868.h
+  * @author  MCD Application Team
+  * @brief   Region definition for EU868
+  ******************************************************************************
+  */
 #ifndef __REGION_EU868_H__
 #define __REGION_EU868_H__
 
@@ -94,11 +104,6 @@ extern "C"
  */
 #define EU868_MAX_RX1_DR_OFFSET                     5
 
-/*!
- * Default Rx1 receive datarate offset
- */
-#define EU868_DEFAULT_RX1_DR_OFFSET                 0
-
 /*!
  * Minimal Tx output power that can be used by the node
  */
@@ -124,16 +129,6 @@ extern "C"
  */
 #define EU868_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define EU868_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define EU868_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -144,41 +139,6 @@ extern "C"
  */
 #define EU868_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define EU868_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define EU868_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define EU868_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define EU868_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define EU868_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define EU868_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define EU868_ACK_TIMEOUT_RND                       1000
-
 #if ( EU868_DEFAULT_DATARATE > DR_5 )
 #error "A default DR higher than DR_5 may lead to connectivity loss."
 #endif
@@ -193,6 +153,11 @@ extern "C"
  */
 #define EU868_RX_WND_2_DR                           DR_0
 
+/*!
+ * Default uplink dwell time configuration
+ */
+#define EU868_DEFAULT_UPLINK_DWELL_TIME             0
+
 /*
  * CLASS B
  */
@@ -243,40 +208,40 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define EU868_BAND0                                 { 100 , EU868_MAX_TX_POWER, 0, 0, 0, 0 } //  1.0 %
+#define EU868_BAND0                                 { 100 , EU868_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  1.0 %
 
 /*!
  * Band 1 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define EU868_BAND1                                 { 100 , EU868_MAX_TX_POWER, 0, 0, 0, 0 } //  1.0 %
+#define EU868_BAND1                                 { 100 , EU868_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  1.0 %
 
 /*!
  * Band 2 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define EU868_BAND2                                 { 1000, EU868_MAX_TX_POWER, 0, 0, 0, 0 } //  0.1 %
+#define EU868_BAND2                                 { 1000, EU868_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  0.1 %
 
 /*!
  * Band 3 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define EU868_BAND3                                 { 10  , EU868_MAX_TX_POWER, 0, 0, 0, 0 } // 10.0 %
+#define EU868_BAND3                                 { 10  , EU868_MAX_TX_POWER, 0, 0, 0, 0, 0 } // 10.0 %
 
 /*!
  * Band 4 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define EU868_BAND4                                 { 100 , EU868_MAX_TX_POWER, 0, 0, 0, 0 } //  1.0 %
+#define EU868_BAND4                                 { 100 , EU868_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  1.0 %
 
 /*!
  * Band 5 definition
  * Band = { DutyCycle, TxMaxPower, LastJoinTxDoneTime, LastTxDoneTime, TimeOff,
  *          DutyCycleTimePeriod, MaxAllowedTimeOnAir, AggregatedTimeOnAir, StartTimeOfPeriod }
  */
-#define EU868_BAND5                                 { 1000, EU868_MAX_TX_POWER, 0, 0, 0, 0 } //  0.1 %
+#define EU868_BAND5                                 { 1000, EU868_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  0.1 %
 
 /*!
  * LoRaMac default channel 1
@@ -311,6 +276,7 @@ static const uint8_t DataratesEU868[]  = { 12, 11, 10,  9,  8,  7,  7, 50 };
  */
 static const uint32_t BandwidthsEU868[] = { 125000, 125000, 125000, 125000, 125000, 125000, 250000, 0 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  */
@@ -320,6 +286,7 @@ static const uint8_t MaxPayloadOfDatarateEU868[] = { 51, 51, 51, 115, 242, 242,
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterEU868[] = { 51, 51, 51, 115, 222, 222, 222, 222 };
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief The function gets a value of a specific phy attribute.
@@ -344,15 +311,6 @@ void RegionEU868SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionEU868InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionEU868GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -445,7 +403,7 @@ uint8_t RegionEU868RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionEU868NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionEU868NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -465,7 +423,7 @@ int8_t RegionEU868TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionEU868DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionEU868DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c
index 62b68655..6d033b33 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c
@@ -28,85 +28,31 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionIN865.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for IN865
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionIN865.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE              1
 
-/*!
- * Region specific context
- */
-typedef struct sRegionIN865NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ IN865_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ IN865_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionIN865NvmCtx_t;
-
+#if defined( REGION_IN865 )
 /*
  * Non-volatile module context.
  */
-static RegionIN865NvmCtx_t NvmCtx;
-
-// Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else if( dr == DR_7 )
-    {
-        nextLowerDr = DR_5;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsIN865[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
-    return txPowerResult;
-}
 
 static bool VerifyRfFreq( uint32_t freq )
 {
@@ -126,7 +72,7 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesIN865[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsIN865 );
     TimerTime_t timeOnAir = 0;
 
     if( datarate == DR_7 )
@@ -139,11 +85,13 @@ static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
     }
     return timeOnAir;
 }
+#endif /* REGION_IN865 */
 
 PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_IN865 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -163,7 +111,16 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, IN865_TX_MIN_DATARATE );
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
+            {
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )IN865_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )IN865_TX_MIN_DATARATE,
+                .NbChannels = IN865_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -178,12 +135,12 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = IN865_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = IN865_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -191,11 +148,13 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = MaxPayloadOfDatarateIN865[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             phyParam.Value = MaxPayloadOfDatarateRepeaterIN865[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = IN865_DUTY_CYCLE_ENABLED;
@@ -208,37 +167,37 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = IN865_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = IN865_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = IN865_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = IN865_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = IN865_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( IN865_ACKTIMEOUT + randr( -IN865_ACK_TIMEOUT_RND, IN865_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = IN865_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -253,12 +212,12 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -268,13 +227,17 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
+        {
+            phyParam.Value = IN865_DEFAULT_UPLINK_DWELL_TIME;
+            break;
+        }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = 0;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -321,7 +284,7 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsIN865 );
             break;
         }
         default:
@@ -330,17 +293,21 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_IN865 */
     return phyParam;
 }
 
 void RegionIN865SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_IN865 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_IN865 */
 }
 
 void RegionIN865InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_IN865 )
     Band_t bands[IN865_MAX_NB_BANDS] =
     {
         IN865_BAND0
@@ -350,43 +317,43 @@ void RegionIN865InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Initialize bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * IN865_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * IN865_MAX_NB_BANDS );
 
             // Default channels
-            NvmCtx.Channels[0] = ( ChannelParams_t ) IN865_LC1;
-            NvmCtx.Channels[1] = ( ChannelParams_t ) IN865_LC2;
-            NvmCtx.Channels[2] = ( ChannelParams_t ) IN865_LC3;
+            RegionNvmGroup2->Channels[0] = ( ChannelParams_t ) IN865_LC1;
+            RegionNvmGroup2->Channels[1] = ( ChannelParams_t ) IN865_LC2;
+            RegionNvmGroup2->Channels[2] = ( ChannelParams_t ) IN865_LC3;
 
             // Initialize the channels default mask
-            NvmCtx.ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
+            RegionNvmGroup2->ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
 
             // Default ChannelsMask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
         {
             // Reset Channels Rx1Frequency to default 0
-            NvmCtx.Channels[0].Rx1Frequency = 0;
-            NvmCtx.Channels[1].Rx1Frequency = 0;
-            NvmCtx.Channels[2].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[0].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[1].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[2].Rx1Frequency = 0;
             // Default ChannelsMask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Restore channels default mask
-            NvmCtx.ChannelsMask[0] |= NvmCtx.ChannelsDefaultMask[0];
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
-            }
+            RegionNvmGroup2->ChannelsMask[0] |= RegionNvmGroup2->ChannelsDefaultMask[0];
             break;
         }
         default:
@@ -394,16 +361,12 @@ void RegionIN865InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionIN865GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionIN865NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_IN865 */
 }
 
 bool RegionIN865Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_IN865 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -449,10 +412,14 @@ bool RegionIN865Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_IN865 */
 }
 
 void RegionIN865ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_IN865 )
     ChannelParams_t newChannel;
     ChannelAddParams_t channelAdd;
     ChannelRemoveParams_t channelRemove;
@@ -508,52 +475,58 @@ void RegionIN865ApplyCFList( ApplyCFListParams_t* applyCFList )
             RegionIN865ChannelsRemove( &channelRemove );
         }
     }
+#endif /* REGION_IN865 */
 }
 
 bool RegionIN865ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_IN865 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_IN865 */
 }
 
 void RegionIN865ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_IN865 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, IN865_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsIN865 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesIN865[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesIN865[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesIN865[rxConfigParams->Datarate], BandwidthsIN865[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesIN865[rxConfigParams->Datarate], BandwidthsIN865[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_IN865 */
 }
 
 bool RegionIN865RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_IN865 )
     RadioModems_t modem;
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
@@ -568,11 +541,11 @@ bool RegionIN865RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     if( rxConfig->RxSlot == RX_SLOT_WIN_1 )
     {
         // Apply window 1 frequency
-        frequency = NvmCtx.Channels[rxConfig->Channel].Frequency;
+        frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Frequency;
         // Apply the alternative RX 1 window frequency, if it is available
-        if( NvmCtx.Channels[rxConfig->Channel].Rx1Frequency != 0 )
+        if( RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency != 0 )
         {
-            frequency = NvmCtx.Channels[rxConfig->Channel].Rx1Frequency;
+            frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency;
         }
     }
 
@@ -593,6 +566,7 @@ bool RegionIN865RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         Radio.SetRxConfig( modem, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
     }
 
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterIN865[dr];
@@ -602,27 +576,33 @@ bool RegionIN865RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         maxPayload = MaxPayloadOfDatarateIN865[dr];
     }
     Radio.SetMaxPayloadLength( modem, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_IN865 */
 }
 
 bool RegionIN865TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_IN865 )
     RadioModems_t modem;
     int8_t phyDr = DataratesIN865[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsIN865 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, txConfig->MaxEirp, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     if( txConfig->Datarate == DR_7 )
     { // High Speed FSK channel
@@ -635,7 +615,7 @@ bool RegionIN865TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     }
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Update time-on-air
@@ -646,11 +626,15 @@ bool RegionIN865TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_IN865 */
 }
 
 uint8_t RegionIN865LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_IN865 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
@@ -693,7 +677,7 @@ uint8_t RegionIN865LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
             {
                 if( linkAdrParams.ChMaskCtrl == 6 )
                 {
-                    if( NvmCtx.Channels[i].Frequency != 0 )
+                    if( RegionNvmGroup2->Channels[i].Frequency != 0 )
                     {
                         chMask |= 1 << i;
                     }
@@ -701,7 +685,7 @@ uint8_t RegionIN865LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
                 else
                 {
                     if( ( ( chMask & ( 1 << i ) ) != 0 ) &&
-                        ( NvmCtx.Channels[i].Frequency == 0 ) )
+                        ( RegionNvmGroup2->Channels[i].Frequency == 0 ) )
                     {// Trying to enable an undefined channel
                         status &= 0xFE; // Channel mask KO
                     }
@@ -729,7 +713,7 @@ uint8_t RegionIN865LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
         linkAdrVerifyParams.ChannelsMask = &chMask;
         linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
         linkAdrVerifyParams.MaxDatarate = IN865_TX_MAX_DATARATE;
-        linkAdrVerifyParams.Channels = NvmCtx.Channels;
+        linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
         linkAdrVerifyParams.MinTxPower = IN865_MIN_TX_POWER;
         linkAdrVerifyParams.MaxTxPower = IN865_MAX_TX_POWER;
         linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -746,9 +730,9 @@ uint8_t RegionIN865LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Set the channels mask to a default value
-        memset1( ( uint8_t* ) NvmCtx.ChannelsMask, 0, sizeof( NvmCtx.ChannelsMask ) );
+        memset1( ( uint8_t* ) RegionNvmGroup2->ChannelsMask, 0, sizeof( RegionNvmGroup2->ChannelsMask ) );
         // Update the channels mask
-        NvmCtx.ChannelsMask[0] = chMask;
+        RegionNvmGroup2->ChannelsMask[0] = chMask;
     }
 
     // Update status variables
@@ -757,12 +741,14 @@ uint8_t RegionIN865LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_IN865 */
     return status;
 }
 
 uint8_t RegionIN865RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_IN865 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -771,7 +757,9 @@ uint8_t RegionIN865RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
     }
 
     // Verify datarate
-    if( RegionCommonValueInRange( rxParamSetupReq->Datarate, IN865_RX_MIN_DATARATE, IN865_RX_MAX_DATARATE ) == false )
+    if( ( RegionCommonValueInRange( rxParamSetupReq->Datarate, IN865_RX_MIN_DATARATE, IN865_RX_MAX_DATARATE ) == false ) ||
+        // DR_6 is not supported by this region
+        ( rxParamSetupReq->Datarate == DR_6 ) )
     {
         status &= 0xFD; // Datarate KO
     }
@@ -782,10 +770,11 @@ uint8_t RegionIN865RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_IN865 */
     return status;
 }
 
-uint8_t RegionIN865NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionIN865NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
     uint8_t status = 0x03;
     ChannelAddParams_t channelAdd;
@@ -840,12 +829,14 @@ uint8_t RegionIN865NewChannelReq( NewChannelReqParams_t* newChannelReq )
 
 int8_t RegionIN865TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
 {
+    // Do not accept the request
     return -1;
 }
 
-uint8_t RegionIN865DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionIN865DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
     uint8_t status = 0x03;
+#if defined( REGION_IN865 )
 
     // Verify if the frequency is supported
     if( VerifyRfFreq( dlChannelReq->Rx1Frequency ) == false )
@@ -854,7 +845,7 @@ uint8_t RegionIN865DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     }
 
     // Verify if an uplink frequency exists
-    if( NvmCtx.Channels[dlChannelReq->ChannelId].Frequency == 0 )
+    if( RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Frequency == 0 )
     {
         status &= 0xFD;
     }
@@ -862,39 +853,46 @@ uint8_t RegionIN865DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     // Apply Rx1 frequency, if the status is OK
     if( status == 0x03 )
     {
-        NvmCtx.Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
+        RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
     }
 
+#endif /* REGION_IN865 */
     return status;
 }
 
 int8_t RegionIN865AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
+#if defined( REGION_IN865 )
     return currentDr;
+#else
+    return -1;
+#endif /* REGION_IN865 */
 }
 
 LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_IN865 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[IN865_MAX_NB_CHANNELS] = { 0 };
     RegionCommonIdentifyChannelsParam_t identifyChannelsParam;
     RegionCommonCountNbOfEnabledChannelsParams_t countChannelsParams;
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
+    uint16_t joinChannels = IN865_JOIN_CHANNELS;
 
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMask, 0, 1 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup2->ChannelsMask, 0, 1 ) == 0 )
     { // Reactivate default channels
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMask;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup2->ChannelsMask;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = IN865_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = IN865_JOIN_CHANNELS;
+    countChannelsParams.JoinChannels = &joinChannels;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -918,13 +916,17 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_
     else if( status == LORAMAC_STATUS_NO_CHANNEL_FOUND )
     {
         // Datarate not supported by any channel, restore defaults
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_IN865 */
 }
 
 LoRaMacStatus_t RegionIN865ChannelAdd( ChannelAddParams_t* channelAdd )
 {
+#if defined( REGION_IN865 )
     bool drInvalid = false;
     bool freqInvalid = false;
     uint8_t id = channelAdd->ChannelId;
@@ -976,14 +978,18 @@ LoRaMacStatus_t RegionIN865ChannelAdd( ChannelAddParams_t* channelAdd )
         return LORAMAC_STATUS_FREQUENCY_INVALID;
     }
 
-    memcpy1( ( uint8_t* ) &(NvmCtx.Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( NvmCtx.Channels[id] ) );
-    NvmCtx.Channels[id].Band = 0;
-    NvmCtx.ChannelsMask[0] |= ( 1 << id );
+    memcpy1( ( uint8_t* ) &(RegionNvmGroup2->Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( RegionNvmGroup2->Channels[id] ) );
+    RegionNvmGroup2->Channels[id].Band = 0;
+    RegionNvmGroup2->ChannelsMask[0] |= ( 1 << id );
     return LORAMAC_STATUS_OK;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_IN865 */
 }
 
 bool RegionIN865ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 {
+#if defined( REGION_IN865 )
     uint8_t id = channelRemove->ChannelId;
 
     if( id < IN865_NUMB_DEFAULT_CHANNELS )
@@ -992,31 +998,41 @@ bool RegionIN865ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
     }
 
     // Remove the channel from the list of channels
-    NvmCtx.Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
+    RegionNvmGroup2->Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
 
-    return RegionCommonChanDisable( NvmCtx.ChannelsMask, id, IN865_MAX_NB_CHANNELS );
+    return RegionCommonChanDisable( RegionNvmGroup2->ChannelsMask, id, IN865_MAX_NB_CHANNELS );
+#else
+    return false;
+#endif /* REGION_IN865 */
 }
 
 void RegionIN865SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_IN865 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, continuousWave->MaxEirp, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_IN865 */
 }
 
 uint8_t RegionIN865ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_IN865 )
     // Apply offset formula
     return MIN( DR_5, MAX( DR_0, dr - EffectiveRx1DrOffsetIN865[drOffset] ) );
+#else
+    return 0;
+#endif /* REGION_IN865 */
 }
 
 void RegionIN865RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_IN865 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesIN865;
@@ -1031,4 +1047,5 @@ void RegionIN865RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = IN865_BEACON_CHANNEL_DR;
+#endif /* REGION_IN865 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.h
index 48af152f..1fdec3bb 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionIN865.h
+  * @author  MCD Application Team
+  * @brief   Region definition for IN865
+  ******************************************************************************
+  */
 #ifndef __REGION_IN865_H__
 #define __REGION_IN865_H__
 
@@ -94,11 +104,6 @@ extern "C"
  */
 #define IN865_MAX_RX1_DR_OFFSET                     7
 
-/*!
- * Default Rx1 receive datarate offset
- */
-#define IN865_DEFAULT_RX1_DR_OFFSET                 0
-
 /*!
  * Minimal Tx output power that can be used by the node
  */
@@ -124,16 +129,6 @@ extern "C"
  */
 #define IN865_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define IN865_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define IN865_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -144,41 +139,6 @@ extern "C"
  */
 #define IN865_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define IN865_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define IN865_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define IN865_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define IN865_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define IN865_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define IN865_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define IN865_ACK_TIMEOUT_RND                       1000
-
 #if ( IN865_DEFAULT_DATARATE > DR_5 )
 #error "A default DR higher than DR_5 may lead to connectivity loss."
 #endif
@@ -193,6 +153,11 @@ extern "C"
  */
 #define IN865_RX_WND_2_DR                           DR_2
 
+/*!
+ * Default uplink dwell time configuration
+ */
+#define IN865_DEFAULT_UPLINK_DWELL_TIME             0
+
 /*
  * CLASS B
  */
@@ -243,9 +208,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define IN865_BAND0                                 { 1 , IN865_MAX_TX_POWER, 0, 0, 0, 0 } //  100.0 %
+#define IN865_BAND0                                 { 1 , IN865_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  100.0 %
 
 /*!
  * LoRaMac default channel 1
@@ -280,6 +245,7 @@ static const uint8_t DataratesIN865[]  = { 12, 11, 10,  9,  8,  7,  7, 50 };
  */
 static const uint32_t BandwidthsIN865[] = { 125000, 125000, 125000, 125000, 125000, 125000, 250000, 0 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  */
@@ -289,6 +255,7 @@ static const uint8_t MaxPayloadOfDatarateIN865[] = { 51, 51, 51, 115, 242, 242,
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterIN865[] = { 51, 51, 51, 115, 222, 222, 222, 222 };
+/* ST_WORKAROUND_END */
 
 /*!
  * Effective datarate offsets for receive window 1.
@@ -318,15 +285,6 @@ void RegionIN865SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionIN865InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionIN865GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -419,7 +377,7 @@ uint8_t RegionIN865RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionIN865NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionIN865NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -439,7 +397,7 @@ int8_t RegionIN865TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionIN865DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionIN865DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c
index 3f4c6b05..bbdc672e 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c
@@ -28,10 +28,20 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionKR920.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for KR920
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionKR920.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE                1
@@ -42,50 +52,14 @@
  */
 #define KR920_LBT_RX_BANDWIDTH            200000
 
-/*!
- * Region specific context
- */
-typedef struct sRegionKR920NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ KR920_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ KR920_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionKR920NvmCtx_t;
-
+#if defined( REGION_KR920 )
 /*
  * Non-volatile module context.
  */
-static RegionKR920NvmCtx_t NvmCtx;
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 // Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
 static int8_t GetMaxEIRP( uint32_t freq )
 {
     if( freq >= 922100000 )
@@ -96,30 +70,6 @@ static int8_t GetMaxEIRP( uint32_t freq )
     return KR920_DEFAULT_MAX_EIRP_LOW;
 }
 
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsKR920[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
-
-    return txPowerResult;
-}
-
 static bool VerifyRfFreq( uint32_t freq )
 {
     uint32_t tmpFreq = freq;
@@ -147,15 +97,17 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesKR920[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsKR920 );
 
     return Radio.TimeOnAir( MODEM_LORA, bandwidth, phyDr, 1, 8, false, pktLen, true );
 }
+#endif /* REGION_KR920 */
 
 PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_KR920 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -175,7 +127,16 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, KR920_TX_MIN_DATARATE );
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
+            {
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )KR920_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )KR920_TX_MIN_DATARATE,
+                .NbChannels = KR920_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -190,12 +151,12 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = KR920_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = KR920_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -203,11 +164,13 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = MaxPayloadOfDatarateKR920[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             phyParam.Value = MaxPayloadOfDatarateRepeaterKR920[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = KR920_DUTY_CYCLE_ENABLED;
@@ -220,37 +183,37 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = KR920_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = KR920_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = KR920_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = KR920_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = KR920_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( KR920_ACKTIMEOUT + randr( -KR920_ACK_TIMEOUT_RND, KR920_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = KR920_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -265,12 +228,12 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -280,13 +243,17 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
+        {
+            phyParam.Value = KR920_DEFAULT_UPLINK_DWELL_TIME;
+            break;
+        }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = 0;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -337,7 +304,7 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsKR920 );
             break;
         }
         default:
@@ -346,17 +313,21 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_KR920 */
     return phyParam;
 }
 
 void RegionKR920SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_KR920 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_KR920 */
 }
 
 void RegionKR920InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_KR920 )
     Band_t bands[KR920_MAX_NB_BANDS] =
     {
         KR920_BAND0
@@ -366,43 +337,43 @@ void RegionKR920InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Initialize bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * KR920_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * KR920_MAX_NB_BANDS );
 
             // Default channels
-            NvmCtx.Channels[0] = ( ChannelParams_t ) KR920_LC1;
-            NvmCtx.Channels[1] = ( ChannelParams_t ) KR920_LC2;
-            NvmCtx.Channels[2] = ( ChannelParams_t ) KR920_LC3;
+            RegionNvmGroup2->Channels[0] = ( ChannelParams_t ) KR920_LC1;
+            RegionNvmGroup2->Channels[1] = ( ChannelParams_t ) KR920_LC2;
+            RegionNvmGroup2->Channels[2] = ( ChannelParams_t ) KR920_LC3;
 
             // Default ChannelsMask
-            NvmCtx.ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
+            RegionNvmGroup2->ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 ) + LC( 3 );
 
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
         {
             // Reset Channels Rx1Frequency to default 0
-            NvmCtx.Channels[0].Rx1Frequency = 0;
-            NvmCtx.Channels[1].Rx1Frequency = 0;
-            NvmCtx.Channels[2].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[0].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[1].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[2].Rx1Frequency = 0;
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Restore channels default mask
-            NvmCtx.ChannelsMask[0] |= NvmCtx.ChannelsDefaultMask[0];
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
-            }
+            RegionNvmGroup2->ChannelsMask[0] |= RegionNvmGroup2->ChannelsDefaultMask[0];
             break;
         }
         default:
@@ -410,16 +381,12 @@ void RegionKR920InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionKR920GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionKR920NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_KR920 */
 }
 
 bool RegionKR920Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_KR920 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -451,10 +418,14 @@ bool RegionKR920Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_KR920 */
 }
 
 void RegionKR920ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_KR920 )
     ChannelParams_t newChannel;
     ChannelAddParams_t channelAdd;
     ChannelRemoveParams_t channelRemove;
@@ -510,45 +481,51 @@ void RegionKR920ApplyCFList( ApplyCFListParams_t* applyCFList )
             RegionKR920ChannelsRemove( &channelRemove );
         }
     }
+#endif /* REGION_KR920 */
 }
 
 bool RegionKR920ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_KR920 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_KR920 */
 }
 
 void RegionKR920ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_KR920 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, KR920_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsKR920 );
 
-    tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesKR920[rxConfigParams->Datarate], BandwidthsKR920[rxConfigParams->Datarate] );
+    tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesKR920[rxConfigParams->Datarate], BandwidthsKR920[rxConfigParams->Datarate] );
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_KR920 */
 }
 
 bool RegionKR920RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_KR920 )
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
     int8_t phyDr = 0;
@@ -562,11 +539,11 @@ bool RegionKR920RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     if( rxConfig->RxSlot == RX_SLOT_WIN_1 )
     {
         // Apply window 1 frequency
-        frequency = NvmCtx.Channels[rxConfig->Channel].Frequency;
+        frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Frequency;
         // Apply the alternative RX 1 window frequency, if it is available
-        if( NvmCtx.Channels[rxConfig->Channel].Rx1Frequency != 0 )
+        if( RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency != 0 )
         {
-            frequency = NvmCtx.Channels[rxConfig->Channel].Rx1Frequency;
+            frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency;
         }
     }
 
@@ -578,6 +555,7 @@ bool RegionKR920RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     // Radio configuration
     Radio.SetRxConfig( MODEM_LORA, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
 
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterKR920[dr];
@@ -588,20 +566,26 @@ bool RegionKR920RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     }
 
     Radio.SetMaxPayloadLength( MODEM_LORA, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_KR920 */
 }
 
 bool RegionKR920TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_KR920 )
     int8_t phyDr = DataratesKR920[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
-    float maxEIRP = GetMaxEIRP( NvmCtx.Channels[txConfig->Channel].Frequency );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsKR920 );
+    float maxEIRP = GetMaxEIRP( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
     int8_t phyTxPower = 0;
 
     // Take the minimum between the maxEIRP and txConfig->MaxEirp.
@@ -612,11 +596,11 @@ bool RegionKR920TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, maxEIRP, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     Radio.SetTxConfig( MODEM_LORA, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Setup maximum payload length of the radio driver
@@ -626,11 +610,15 @@ bool RegionKR920TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_KR920 */
 }
 
 uint8_t RegionKR920LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_KR920 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
@@ -673,7 +661,7 @@ uint8_t RegionKR920LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
             {
                 if( linkAdrParams.ChMaskCtrl == 6 )
                 {
-                    if( NvmCtx.Channels[i].Frequency != 0 )
+                    if( RegionNvmGroup2->Channels[i].Frequency != 0 )
                     {
                         chMask |= 1 << i;
                     }
@@ -681,7 +669,7 @@ uint8_t RegionKR920LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
                 else
                 {
                     if( ( ( chMask & ( 1 << i ) ) != 0 ) &&
-                        ( NvmCtx.Channels[i].Frequency == 0 ) )
+                        ( RegionNvmGroup2->Channels[i].Frequency == 0 ) )
                     {// Trying to enable an undefined channel
                         status &= 0xFE; // Channel mask KO
                     }
@@ -707,7 +695,7 @@ uint8_t RegionKR920LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = &chMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = KR920_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = KR920_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = KR920_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -719,9 +707,9 @@ uint8_t RegionKR920LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Set the channels mask to a default value
-        memset1( ( uint8_t* ) NvmCtx.ChannelsMask, 0, sizeof( NvmCtx.ChannelsMask ) );
+        memset1( ( uint8_t* ) RegionNvmGroup2->ChannelsMask, 0, sizeof( RegionNvmGroup2->ChannelsMask ) );
         // Update the channels mask
-        NvmCtx.ChannelsMask[0] = chMask;
+        RegionNvmGroup2->ChannelsMask[0] = chMask;
     }
 
     // Update status variables
@@ -730,12 +718,14 @@ uint8_t RegionKR920LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_KR920 */
     return status;
 }
 
 uint8_t RegionKR920RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_KR920 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -755,10 +745,11 @@ uint8_t RegionKR920RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_KR920 */
     return status;
 }
 
-uint8_t RegionKR920NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionKR920NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
     uint8_t status = 0x03;
     ChannelAddParams_t channelAdd;
@@ -813,12 +804,14 @@ uint8_t RegionKR920NewChannelReq( NewChannelReqParams_t* newChannelReq )
 
 int8_t RegionKR920TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
 {
+    // Do not accept the request
     return -1;
 }
 
-uint8_t RegionKR920DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionKR920DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
     uint8_t status = 0x03;
+#if defined( REGION_KR920 )
 
     // Verify if the frequency is supported
     if( VerifyRfFreq( dlChannelReq->Rx1Frequency ) == false )
@@ -827,7 +820,7 @@ uint8_t RegionKR920DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     }
 
     // Verify if an uplink frequency exists
-    if( NvmCtx.Channels[dlChannelReq->ChannelId].Frequency == 0 )
+    if( RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Frequency == 0 )
     {
         status &= 0xFD;
     }
@@ -835,19 +828,25 @@ uint8_t RegionKR920DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     // Apply Rx1 frequency, if the status is OK
     if( status == 0x03 )
     {
-        NvmCtx.Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
+        RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
     }
 
+#endif /* REGION_KR920 */
     return status;
 }
 
 int8_t RegionKR920AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
+#if defined( REGION_KR920 )
     return currentDr;
+#else
+    return -1;
+#endif /* REGION_KR920 */
 }
 
 LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_KR920 )
     uint8_t channelNext = 0;
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
@@ -855,20 +854,21 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_
     RegionCommonIdentifyChannelsParam_t identifyChannelsParam;
     RegionCommonCountNbOfEnabledChannelsParams_t countChannelsParams;
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
+    uint16_t joinChannels = KR920_JOIN_CHANNELS;
 
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMask, 0, 1 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup2->ChannelsMask, 0, 1 ) == 0 )
     { // Reactivate default channels
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMask;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup2->ChannelsMask;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = KR920_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = KR920_JOIN_CHANNELS;
+    countChannelsParams.JoinChannels = &joinChannels;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -893,7 +893,7 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_
 
             // Perform carrier sense for KR920_CARRIER_SENSE_TIME
             // If the channel is free, we can stop the LBT mechanism
-            if( Radio.IsChannelFree( NvmCtx.Channels[channelNext].Frequency, KR920_LBT_RX_BANDWIDTH, KR920_RSSI_FREE_TH, KR920_CARRIER_SENSE_TIME ) == true )
+            if( Radio.IsChannelFree( RegionNvmGroup2->Channels[channelNext].Frequency, KR920_LBT_RX_BANDWIDTH, KR920_RSSI_FREE_TH, KR920_CARRIER_SENSE_TIME ) == true )
             {
                 // Free channel found
                 *channel = channelNext;
@@ -907,13 +907,17 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_
     else if( status == LORAMAC_STATUS_NO_CHANNEL_FOUND )
     {
         // Datarate not supported by any channel, restore defaults
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_KR920 */
 }
 
 LoRaMacStatus_t RegionKR920ChannelAdd( ChannelAddParams_t* channelAdd )
 {
+#if defined( REGION_KR920 )
     bool drInvalid = false;
     bool freqInvalid = false;
     uint8_t id = channelAdd->ChannelId;
@@ -965,14 +969,18 @@ LoRaMacStatus_t RegionKR920ChannelAdd( ChannelAddParams_t* channelAdd )
         return LORAMAC_STATUS_FREQUENCY_INVALID;
     }
 
-    memcpy1( ( uint8_t* ) &(NvmCtx.Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( NvmCtx.Channels[id] ) );
-    NvmCtx.Channels[id].Band = 0;
-    NvmCtx.ChannelsMask[0] |= ( 1 << id );
+    memcpy1( ( uint8_t* ) &(RegionNvmGroup2->Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( RegionNvmGroup2->Channels[id] ) );
+    RegionNvmGroup2->Channels[id].Band = 0;
+    RegionNvmGroup2->ChannelsMask[0] |= ( 1 << id );
     return LORAMAC_STATUS_OK;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_KR920 */
 }
 
 bool RegionKR920ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 {
+#if defined( REGION_KR920 )
     uint8_t id = channelRemove->ChannelId;
 
     if( id < KR920_NUMB_DEFAULT_CHANNELS )
@@ -981,17 +989,21 @@ bool RegionKR920ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
     }
 
     // Remove the channel from the list of channels
-    NvmCtx.Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
+    RegionNvmGroup2->Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
 
-    return RegionCommonChanDisable( NvmCtx.ChannelsMask, id, KR920_MAX_NB_CHANNELS );
+    return RegionCommonChanDisable( RegionNvmGroup2->ChannelsMask, id, KR920_MAX_NB_CHANNELS );
+#else
+    return false;
+#endif /* REGION_KR920 */
 }
 
 void RegionKR920SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
-    float maxEIRP = GetMaxEIRP( NvmCtx.Channels[continuousWave->Channel].Frequency );
+#if defined( REGION_KR920 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
+    float maxEIRP = GetMaxEIRP( RegionNvmGroup2->Channels[continuousWave->Channel].Frequency );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Take the minimum between the maxEIRP and continuousWave->MaxEirp.
     // The value of continuousWave->MaxEirp could have changed during runtime, e.g. due to a MAC command.
@@ -1001,10 +1013,12 @@ void RegionKR920SetContinuousWave( ContinuousWaveParams_t* continuousWave )
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, maxEIRP, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_KR920 */
 }
 
 uint8_t RegionKR920ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_KR920 )
     int8_t datarate = dr - drOffset;
 
     if( datarate < 0 )
@@ -1012,10 +1026,14 @@ uint8_t RegionKR920ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
         datarate = DR_0;
     }
     return datarate;
+#else
+    return 0;
+#endif /* REGION_KR920 */
 }
 
 void RegionKR920RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_KR920 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesKR920;
@@ -1030,4 +1048,5 @@ void RegionKR920RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = KR920_BEACON_CHANNEL_DR;
+#endif /* REGION_KR920 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.h
index 4436daa7..a33c1ee4 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionKR920.h
+  * @author  MCD Application Team
+  * @brief   Region definition for KR920
+  ******************************************************************************
+  */
 #ifndef __REGION_KR920_H__
 #define __REGION_KR920_H__
 
@@ -94,11 +104,6 @@ extern "C"
  */
 #define KR920_MAX_RX1_DR_OFFSET                     5
 
-/*!
- * Default Rx1 receive datarate offset
- */
-#define KR920_DEFAULT_RX1_DR_OFFSET                 0
-
 /*!
  * Minimal Tx output power that can be used by the node
  */
@@ -129,16 +134,6 @@ extern "C"
  */
 #define KR920_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define KR920_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define KR920_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -149,41 +144,6 @@ extern "C"
  */
 #define KR920_MAX_RX_WINDOW                         4000
 
-/*!
- * Receive delay 1
- */
-#define KR920_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define KR920_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define KR920_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define KR920_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define KR920_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define KR920_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define KR920_ACK_TIMEOUT_RND                       1000
-
 #if ( KR920_DEFAULT_DATARATE > DR_5 )
 #error "A default DR higher than DR_5 may lead to connectivity loss."
 #endif
@@ -198,6 +158,11 @@ extern "C"
  */
 #define KR920_RX_WND_2_DR                           DR_0
 
+/*!
+ * Default uplink dwell time configuration
+ */
+#define KR920_DEFAULT_UPLINK_DWELL_TIME             0
+
 /*
  * CLASS B
  */
@@ -248,9 +213,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define KR920_BAND0                                 { 1 , KR920_MAX_TX_POWER, 0, 0, 0, 0 } //  100.0 %
+#define KR920_BAND0                                 { 1 , KR920_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  100.0 %
 
 /*!
  * LoRaMac default channel 1
@@ -295,6 +260,7 @@ static const uint8_t DataratesKR920[]  = { 12, 11, 10,  9,  8,  7 };
  */
 static const uint32_t BandwidthsKR920[] = { 125000, 125000, 125000, 125000, 125000, 125000 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Can operate with and without a repeater.
  */
@@ -304,6 +270,7 @@ static const uint8_t MaxPayloadOfDatarateKR920[] = { 51, 51, 51, 115, 242, 242 }
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterKR920[] = { 51, 51, 51, 115, 222, 222 };
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief The function gets a value of a specific phy attribute.
@@ -328,15 +295,6 @@ void RegionKR920SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionKR920InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionKR920GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -429,7 +387,7 @@ uint8_t RegionKR920RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionKR920NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionKR920NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -449,7 +407,7 @@ int8_t RegionKR920TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionKR920DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionKR920DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionNvm.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionNvm.h
new file mode 100644
index 00000000..cc608f47
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionNvm.h
@@ -0,0 +1,135 @@
+/*!
+ * \file      RegionNvm.h
+ *
+ * \brief     Region independent non-volatile data.
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2017 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author     Miguel Luis ( Semtech )
+ *
+ * \author     Daniel Jaeckle ( STACKFORCE )
+ *
+ * \addtogroup REGIONCOMMON
+ *
+ * \{
+ */
+#ifndef __REGIONNVM_H__
+#define __REGIONNVM_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include "lorawan_conf.h"
+#include "LoRaMacTypes.h"
+
+// Selection of REGION_NVM_MAX_NB_CHANNELS
+#if defined( REGION_CN470 )
+    #define REGION_NVM_MAX_NB_CHANNELS                 96
+#elif defined( REGION_US915 ) || defined( REGION_AU915 )
+    #define REGION_NVM_MAX_NB_CHANNELS                 72
+#elif defined( REGION_AS923 ) || defined( REGION_CN779 ) || \
+      defined( REGION_EU433 ) || defined( REGION_EU868 ) || \
+      defined( REGION_IN865 ) || defined( REGION_KR920 )
+    #define REGION_NVM_MAX_NB_CHANNELS                 16
+#else
+    // Region_RU864
+    #define REGION_NVM_MAX_NB_CHANNELS                 8
+#endif
+
+// Selection of REGION_NVM_MAX_NB_BANDS
+#if defined( REGION_EU868 )
+    #define REGION_NVM_MAX_NB_BANDS                    6
+#else
+    // All others
+    #define REGION_NVM_MAX_NB_BANDS                    1
+#endif
+
+// Selection of REGION_NVM_CHANNELS_MASK_SIZE
+#if defined( REGION_CN470 ) || defined( REGION_US915 ) || \
+    defined( REGION_AU915 )
+    #define REGION_NVM_CHANNELS_MASK_SIZE              6
+#else
+    // All others
+    #define REGION_NVM_CHANNELS_MASK_SIZE              1
+#endif
+
+/*!
+ * Region specific data which must be stored in the NVM.
+ */
+typedef struct sRegionNvmDataGroup1
+{
+    /*!
+     * LoRaMac bands
+     */
+    Band_t Bands[ REGION_NVM_MAX_NB_BANDS ];
+#if defined( REGION_US915 ) || defined( REGION_AU915 )
+    /*!
+     * LoRaMac channels remaining
+     */
+    uint16_t ChannelsMaskRemaining[ REGION_NVM_CHANNELS_MASK_SIZE ];
+    /*!
+     * Index of current in use 8 bit group (0: bit 0 - 7, 1: bit 8 - 15, ...,
+     * 7: bit 56 - 63)
+     */
+    uint8_t JoinChannelGroupsCurrentIndex;
+    /*!
+     * Counter of join trials needed to alternate between datarates.
+     */
+    uint8_t JoinTrialsCounter;
+#endif
+    /*!
+     * CRC32 value of the Region data structure.
+     */
+    uint32_t Crc32;
+}RegionNvmDataGroup1_t;
+
+/*!
+ * Region specific data which must be stored in the NVM.
+ * Parameters which do not change very frequently.
+ */
+typedef struct sRegionNvmDataGroup2
+{
+    /*!
+     * LoRaMAC channels
+     */
+    ChannelParams_t Channels[ REGION_NVM_MAX_NB_CHANNELS ];
+    /*!
+     * LoRaMac channels mask
+     */
+    uint16_t ChannelsMask[ REGION_NVM_CHANNELS_MASK_SIZE ];
+    /*!
+     * LoRaMac channels default mask
+     */
+    uint16_t ChannelsDefaultMask[ REGION_NVM_CHANNELS_MASK_SIZE ];
+    /*!
+     * CRC32 value of the Region data structure.
+     */
+    uint32_t Crc32;
+}RegionNvmDataGroup2_t;
+
+/*! \} addtogroup REGIONCOMMON */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __REGIONNVM_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c
index 468523ad..a3659c56 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c
@@ -28,82 +28,32 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionRU864.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for RU864
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionRU864.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE              1
 
-/*!
- * Region specific context
- */
-typedef struct sRegionRU864NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ RU864_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ RU864_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-}RegionRU864NvmCtx_t;
-
+#if defined( REGION_RU864 )
 /*
  * Non-volatile module context.
  */
-static RegionRU864NvmCtx_t NvmCtx;
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 // Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsRU864[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
-
-static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
-{
-    int8_t txPowerResult = txPower;
-
-    // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
-
-    return txPowerResult;
-}
-
 static bool VerifyRfFreq( uint32_t freq )
 {
     // Check radio driver support
@@ -123,7 +73,7 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesRU864[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsRU864 );
     TimerTime_t timeOnAir = 0;
 
     if( datarate == DR_7 )
@@ -136,11 +86,13 @@ static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
     }
     return timeOnAir;
 }
+#endif /* REGION_RU864 */
 
 PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_RU864 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -160,7 +112,16 @@ PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, RU864_TX_MIN_DATARATE );
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
+            {
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )RU864_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )RU864_TX_MIN_DATARATE,
+                .NbChannels = RU864_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -175,12 +136,12 @@ PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = RU864_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = RU864_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -188,11 +149,13 @@ PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = MaxPayloadOfDatarateRU864[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             phyParam.Value = MaxPayloadOfDatarateRepeaterRU864[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = RU864_DUTY_CYCLE_ENABLED;
@@ -205,37 +168,37 @@ PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = RU864_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = RU864_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = RU864_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = RU864_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = RU864_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( RU864_ACKTIMEOUT + randr( -RU864_ACK_TIMEOUT_RND, RU864_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = RU864_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -250,12 +213,12 @@ PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -265,13 +228,17 @@ PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
+        {
+            phyParam.Value = RU864_DEFAULT_UPLINK_DWELL_TIME;
+            break;
+        }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = 0;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -318,7 +285,7 @@ PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsRU864 );
             break;
         }
         default:
@@ -327,17 +294,21 @@ PhyParam_t RegionRU864GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_RU864 */
     return phyParam;
 }
 
 void RegionRU864SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_RU864 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_RU864 */
 }
 
 void RegionRU864InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_RU864 )
     Band_t bands[RU864_MAX_NB_BANDS] =
     {
         RU864_BAND0
@@ -347,41 +318,41 @@ void RegionRU864InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Default bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * RU864_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * RU864_MAX_NB_BANDS );
 
             // Default channels
-            NvmCtx.Channels[0] = ( ChannelParams_t ) RU864_LC1;
-            NvmCtx.Channels[1] = ( ChannelParams_t ) RU864_LC2;
+            RegionNvmGroup2->Channels[0] = ( ChannelParams_t ) RU864_LC1;
+            RegionNvmGroup2->Channels[1] = ( ChannelParams_t ) RU864_LC2;
 
             // Default ChannelsMask
-            NvmCtx.ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 );
+            RegionNvmGroup2->ChannelsDefaultMask[0] = LC( 1 ) + LC( 2 );
 
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
         {
             // Reset Channels Rx1Frequency to default 0
-            NvmCtx.Channels[0].Rx1Frequency = 0;
-            NvmCtx.Channels[1].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[0].Rx1Frequency = 0;
+            RegionNvmGroup2->Channels[1].Rx1Frequency = 0;
             // Update the channels mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Restore channels default mask
-            NvmCtx.ChannelsMask[0] |= NvmCtx.ChannelsDefaultMask[0];
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
-            }
+            RegionNvmGroup2->ChannelsMask[0] |= RegionNvmGroup2->ChannelsDefaultMask[0];
             break;
         }
         default:
@@ -389,16 +360,12 @@ void RegionRU864InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionRU864GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionRU864NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_RU864 */
 }
 
 bool RegionRU864Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_RU864 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -430,10 +397,14 @@ bool RegionRU864Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_RU864 */
 }
 
 void RegionRU864ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_RU864 )
     ChannelParams_t newChannel;
     ChannelAddParams_t channelAdd;
     ChannelRemoveParams_t channelRemove;
@@ -489,52 +460,58 @@ void RegionRU864ApplyCFList( ApplyCFListParams_t* applyCFList )
             RegionRU864ChannelsRemove( &channelRemove );
         }
     }
+#endif /* REGION_RU864 */
 }
 
 bool RegionRU864ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_RU864 )
     switch( chanMaskSet->ChannelsMaskType )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, 1 );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_RU864 */
 }
 
 void RegionRU864ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_RU864 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, RU864_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsRU864 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesRU864[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesRU864[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesRU864[rxConfigParams->Datarate], BandwidthsRU864[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesRU864[rxConfigParams->Datarate], BandwidthsRU864[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_RU864 */
 }
 
 bool RegionRU864RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_RU864 )
     RadioModems_t modem;
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
@@ -549,11 +526,11 @@ bool RegionRU864RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     if( rxConfig->RxSlot == RX_SLOT_WIN_1 )
     {
         // Apply window 1 frequency
-        frequency = NvmCtx.Channels[rxConfig->Channel].Frequency;
+        frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Frequency;
         // Apply the alternative RX 1 window frequency, if it is available
-        if( NvmCtx.Channels[rxConfig->Channel].Rx1Frequency != 0 )
+        if( RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency != 0 )
         {
-            frequency = NvmCtx.Channels[rxConfig->Channel].Rx1Frequency;
+            frequency = RegionNvmGroup2->Channels[rxConfig->Channel].Rx1Frequency;
         }
     }
 
@@ -574,6 +551,7 @@ bool RegionRU864RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
         Radio.SetRxConfig( modem, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
     }
 
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterRU864[dr];
@@ -584,27 +562,33 @@ bool RegionRU864RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     }
 
     Radio.SetMaxPayloadLength( modem, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_RU864 */
 }
 
 bool RegionRU864TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_RU864 )
     RadioModems_t modem;
     int8_t phyDr = DataratesRU864[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
+    int8_t txPowerLimited = RegionCommonLimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsRU864 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, txConfig->MaxEirp, txConfig->AntennaGain );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     if( txConfig->Datarate == DR_7 )
     { // High Speed FSK channel
@@ -617,7 +601,7 @@ bool RegionRU864TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     }
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Update time-on-air
@@ -628,11 +612,15 @@ bool RegionRU864TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_RU864 */
 }
 
 uint8_t RegionRU864LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_RU864 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
@@ -675,7 +663,7 @@ uint8_t RegionRU864LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
             {
                 if( linkAdrParams.ChMaskCtrl == 6 )
                 {
-                    if( NvmCtx.Channels[i].Frequency != 0 )
+                    if( RegionNvmGroup2->Channels[i].Frequency != 0 )
                     {
                         chMask |= 1 << i;
                     }
@@ -683,7 +671,7 @@ uint8_t RegionRU864LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
                 else
                 {
                     if( ( ( chMask & ( 1 << i ) ) != 0 ) &&
-                        ( NvmCtx.Channels[i].Frequency == 0 ) )
+                        ( RegionNvmGroup2->Channels[i].Frequency == 0 ) )
                     {// Trying to enable an undefined channel
                         status &= 0xFE; // Channel mask KO
                     }
@@ -709,7 +697,7 @@ uint8_t RegionRU864LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = &chMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = RU864_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = RU864_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = RU864_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -721,9 +709,9 @@ uint8_t RegionRU864LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Set the channels mask to a default value
-        memset1( ( uint8_t* ) NvmCtx.ChannelsMask, 0, sizeof( NvmCtx.ChannelsMask ) );
+        memset1( ( uint8_t* ) RegionNvmGroup2->ChannelsMask, 0, sizeof( RegionNvmGroup2->ChannelsMask ) );
         // Update the channels mask
-        NvmCtx.ChannelsMask[0] = chMask;
+        RegionNvmGroup2->ChannelsMask[0] = chMask;
     }
 
     // Update status variables
@@ -732,12 +720,14 @@ uint8_t RegionRU864LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_RU864 */
     return status;
 }
 
 uint8_t RegionRU864RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_RU864 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -757,10 +747,11 @@ uint8_t RegionRU864RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_RU864 */
     return status;
 }
 
-uint8_t RegionRU864NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionRU864NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
     uint8_t status = 0x03;
     ChannelAddParams_t channelAdd;
@@ -815,12 +806,14 @@ uint8_t RegionRU864NewChannelReq( NewChannelReqParams_t* newChannelReq )
 
 int8_t RegionRU864TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
 {
+    // Do not accept the request
     return -1;
 }
 
-uint8_t RegionRU864DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionRU864DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
     uint8_t status = 0x03;
+#if defined( REGION_RU864 )
 
     // Verify if the frequency is supported
     if( VerifyRfFreq( dlChannelReq->Rx1Frequency ) == false )
@@ -829,7 +822,7 @@ uint8_t RegionRU864DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     }
 
     // Verify if an uplink frequency exists
-    if( NvmCtx.Channels[dlChannelReq->ChannelId].Frequency == 0 )
+    if( RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Frequency == 0 )
     {
         status &= 0xFD;
     }
@@ -837,39 +830,46 @@ uint8_t RegionRU864DlChannelReq( DlChannelReqParams_t* dlChannelReq )
     // Apply Rx1 frequency, if the status is OK
     if( status == 0x03 )
     {
-        NvmCtx.Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
+        RegionNvmGroup2->Channels[dlChannelReq->ChannelId].Rx1Frequency = dlChannelReq->Rx1Frequency;
     }
 
+#endif /* REGION_RU864 */
     return status;
 }
 
 int8_t RegionRU864AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
+#if defined( REGION_RU864 )
     return currentDr;
+#else
+    return -1;
+#endif /* REGION_RU864 */
 }
 
 LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_RU864 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[RU864_MAX_NB_CHANNELS] = { 0 };
     RegionCommonIdentifyChannelsParam_t identifyChannelsParam;
     RegionCommonCountNbOfEnabledChannelsParams_t countChannelsParams;
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
+    uint16_t joinChannels = RU864_JOIN_CHANNELS;
 
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMask, 0, 1 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup2->ChannelsMask, 0, 1 ) == 0 )
     { // Reactivate default channels
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 );
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMask;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup2->ChannelsMask;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = RU864_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = RU864_JOIN_CHANNELS;
+    countChannelsParams.JoinChannels = &joinChannels;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
@@ -893,13 +893,17 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_
     else if( status == LORAMAC_STATUS_NO_CHANNEL_FOUND )
     {
         // Datarate not supported by any channel, restore defaults
-        NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 );
+        RegionNvmGroup2->ChannelsMask[0] |= LC( 1 ) + LC( 2 );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_RU864 */
 }
 
 LoRaMacStatus_t RegionRU864ChannelAdd( ChannelAddParams_t* channelAdd )
 {
+#if defined( REGION_RU864 )
     bool drInvalid = false;
     bool freqInvalid = false;
     uint8_t id = channelAdd->ChannelId;
@@ -951,14 +955,18 @@ LoRaMacStatus_t RegionRU864ChannelAdd( ChannelAddParams_t* channelAdd )
         return LORAMAC_STATUS_FREQUENCY_INVALID;
     }
 
-    memcpy1( ( uint8_t* ) &(NvmCtx.Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( NvmCtx.Channels[id] ) );
-    NvmCtx.Channels[id].Band = 0;
-    NvmCtx.ChannelsMask[0] |= ( 1 << id );
+    memcpy1( ( uint8_t* ) &(RegionNvmGroup2->Channels[id]), ( uint8_t* ) channelAdd->NewChannel, sizeof( RegionNvmGroup2->Channels[id] ) );
+    RegionNvmGroup2->Channels[id].Band = 0;
+    RegionNvmGroup2->ChannelsMask[0] |= ( 1 << id );
     return LORAMAC_STATUS_OK;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_RU864 */
 }
 
 bool RegionRU864ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 {
+#if defined( REGION_RU864 )
     uint8_t id = channelRemove->ChannelId;
 
     if( id < RU864_NUMB_DEFAULT_CHANNELS )
@@ -967,25 +975,31 @@ bool RegionRU864ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
     }
 
     // Remove the channel from the list of channels
-    NvmCtx.Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
+    RegionNvmGroup2->Channels[id] = ( ChannelParams_t ){ 0, 0, { 0 }, 0 };
 
-    return RegionCommonChanDisable( NvmCtx.ChannelsMask, id, RU864_MAX_NB_CHANNELS );
+    return RegionCommonChanDisable( RegionNvmGroup2->ChannelsMask, id, RU864_MAX_NB_CHANNELS );
+#else
+    return false;
+#endif /* REGION_RU864 */
 }
 
 void RegionRU864SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_RU864 )
+    int8_t txPowerLimited = RegionCommonLimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, continuousWave->MaxEirp, continuousWave->AntennaGain );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_RU864 */
 }
 
 uint8_t RegionRU864ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_RU864 )
     int8_t datarate = dr - drOffset;
 
     if( datarate < 0 )
@@ -993,10 +1007,14 @@ uint8_t RegionRU864ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
         datarate = DR_0;
     }
     return datarate;
+#else
+    return 0;
+#endif /* REGION_RU864 */
 }
 
 void RegionRU864RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_RU864 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesRU864;
@@ -1011,4 +1029,5 @@ void RegionRU864RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = RU864_BEACON_CHANNEL_DR;
+#endif /* REGION_RU864 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.h
index 5776d5a1..89327d26 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.h
@@ -32,6 +32,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionRU864.h
+  * @author  MCD Application Team
+  * @brief   Region definition for RU864
+  ******************************************************************************
+  */
 #ifndef __REGION_RU864_H__
 #define __REGION_RU864_H__
 
@@ -92,11 +102,6 @@ extern "C"
  */
 #define RU864_MAX_RX1_DR_OFFSET                     5
 
-/*!
- * Default Rx1 receive datarate offset
- */
-#define RU864_DEFAULT_RX1_DR_OFFSET                 0
-
 /*!
  * Minimal Tx output power that can be used by the node
  */
@@ -122,16 +127,6 @@ extern "C"
  */
 #define RU864_DEFAULT_ANTENNA_GAIN                  2.15f
 
-/*!
- * ADR Ack limit
- */
-#define RU864_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define RU864_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -142,41 +137,6 @@ extern "C"
  */
 #define RU864_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define RU864_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define RU864_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define RU864_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define RU864_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define RU864_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define RU864_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define RU864_ACK_TIMEOUT_RND                       1000
-
 #if ( RU864_DEFAULT_DATARATE > DR_5 )
 #error "A default DR higher than DR_5 may lead to connectivity loss."
 #endif
@@ -191,6 +151,11 @@ extern "C"
  */
 #define RU864_RX_WND_2_DR                           DR_0
 
+/*!
+ * Default uplink dwell time configuration
+ */
+#define RU864_DEFAULT_UPLINK_DWELL_TIME             0
+
 /*
  * CLASS B
  */
@@ -241,9 +206,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define RU864_BAND0                                 { 100 , RU864_MAX_TX_POWER, 0, 0, 0, 0 } //  1.0 %
+#define RU864_BAND0                                 { 100 , RU864_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  1.0 %
 
 /*!
  * LoRaMac default channel 1
@@ -273,6 +238,7 @@ static const uint8_t DataratesRU864[]  = { 12, 11, 10,  9,  8,  7, 7, 50 };
  */
 static const uint32_t BandwidthsRU864[] = { 125000, 125000, 125000, 125000, 125000, 125000, 250000, 0 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  */
@@ -282,6 +248,7 @@ static const uint8_t MaxPayloadOfDatarateRU864[] = { 51, 51, 51, 115, 242, 242,
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterRU864[] = { 51, 51, 51, 115, 222, 222, 222, 222 };
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief The function gets a value of a specific phy attribute.
@@ -306,15 +273,6 @@ void RegionRU864SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionRU864InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionRU864GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -407,7 +365,7 @@ uint8_t RegionRU864RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionRU864NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionRU864NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -427,7 +385,7 @@ int8_t RegionRU864TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionRU864DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionRU864DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c
index 6fdeca8a..b8fae757 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c
@@ -28,10 +28,21 @@
  *
  * \author    Daniel Jaeckle ( STACKFORCE )
 */
-#include "utilities.h"
-
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionUS915.c
+  * @author  MCD Application Team
+  * @brief   Region implementation for US915
+  ******************************************************************************
+  */
+#include "radio.h"
 #include "RegionCommon.h"
 #include "RegionUS915.h"
+#include "RegionBaseUS.h"
+#include "lorawan_conf.h"  /* REGION_* */
 
 // Definitions
 #define CHANNELS_MASK_SIZE              6
@@ -39,182 +50,19 @@
 // A mask to select only valid 500KHz channels
 #define CHANNELS_MASK_500KHZ_MASK       0x00FF
 
-/*!
- * Region specific context
- */
-typedef struct sRegionUS915NvmCtx
-{
-    /*!
-     * LoRaMAC channels
-     */
-    ChannelParams_t Channels[ US915_MAX_NB_CHANNELS ];
-    /*!
-     * LoRaMac bands
-     */
-    Band_t Bands[ US915_MAX_NB_BANDS ];
-    /*!
-     * LoRaMac channels mask
-     */
-    uint16_t ChannelsMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * LoRaMac channels remaining
-     */
-    uint16_t ChannelsMaskRemaining[CHANNELS_MASK_SIZE];
-    /*!
-     * LoRaMac channels default mask
-     */
-    uint16_t ChannelsDefaultMask[ CHANNELS_MASK_SIZE ];
-    /*!
-     * Index of current in use 8 bit group (0: bit 0 - 7, 1: bit 8 - 15, ..., 7: bit 56 - 63)
-     */
-    uint8_t JoinChannelGroupsCurrentIndex;
-    /*!
-     * Counter of join trials needed to alternate between DR0 and DR4, see \ref RegionUS915AlternateDr
-     */
-    uint8_t JoinTrialsCounter;
-}RegionUS915NvmCtx_t;
-
+#if defined( REGION_US915 )
 /*
  * Non-volatile module context.
  */
-static RegionUS915NvmCtx_t NvmCtx;
-
-// Static functions
-static int8_t GetNextLowerTxDr( int8_t dr, int8_t minDr )
-{
-    uint8_t nextLowerDr = 0;
-
-    if( dr == minDr )
-    {
-        nextLowerDr = minDr;
-    }
-    else
-    {
-        nextLowerDr = dr - 1;
-    }
-    return nextLowerDr;
-}
-
-/*!
- * \brief Searches for available 125 kHz channels in the given channel mask.
- *
- * \param [IN] channelMaskRemaining The remaining channel mask.
- *
- * \param [OUT] findAvailableChannelsIndex List containing the indexes of all available 125 kHz channels.
- *
- * \param [OUT] availableChannels Number of available 125 kHz channels.
- *
- * \retval Status
- */
-static LoRaMacStatus_t FindAvailable125kHzChannels( uint8_t* findAvailableChannelsIndex, uint16_t channelMaskRemaining, uint8_t* availableChannels )
-{
-    // Nullpointer check
-    if( findAvailableChannelsIndex == NULL || availableChannels == NULL )
-    {
-        return LORAMAC_STATUS_PARAMETER_INVALID;
-    }
-
-    // Initialize counter
-    *availableChannels = 0;
-    for( uint8_t i = 0; i < 8; i++ )
-    {
-        // Find available channels
-        if( ( channelMaskRemaining & ( 1 << i ) ) != 0 )
-        {
-            // Save available channel index
-            findAvailableChannelsIndex[*availableChannels] = i;
-            // Increment counter of available channels if the current channel is available
-            ( *availableChannels )++;
-        }
-    }
-
-    return LORAMAC_STATUS_OK;
-}
-
-/*!
- * \brief Computes the next 125kHz channel used for join requests.
- *
- * \param [OUT] newChannelIndex Index of available channel.
- *
- * \retval Status
- */
-static LoRaMacStatus_t ComputeNext125kHzJoinChannel( uint8_t* newChannelIndex )
-{
-    uint8_t currentChannelsMaskRemainingIndex;
-    uint16_t channelMaskRemaining;
-    uint8_t findAvailableChannelsIndex[8] = { 0 };
-    uint8_t availableChannels = 0;
-    uint8_t startIndex = NvmCtx.JoinChannelGroupsCurrentIndex;
-
-    // Null pointer check
-    if( newChannelIndex == NULL )
-    {
-        return LORAMAC_STATUS_PARAMETER_INVALID;
-    }
-
-    do {
-        // Current ChannelMaskRemaining, two groups per channel mask. For example Group 0 and 1 (8 bit) are ChannelMaskRemaining 0 (16 bit), etc.
-        currentChannelsMaskRemainingIndex = (uint8_t) startIndex / 2;
-
-        // For even numbers we need the 8 LSBs and for uneven the 8 MSBs
-        if( ( startIndex % 2 ) == 0 )
-        {
-            channelMaskRemaining = ( NvmCtx.ChannelsMaskRemaining[currentChannelsMaskRemainingIndex] & 0x00FF );
-        }
-        else
-        {
-            channelMaskRemaining = ( ( NvmCtx.ChannelsMaskRemaining[currentChannelsMaskRemainingIndex] >> 8 ) & 0x00FF );
-        }
-
-
-        if( FindAvailable125kHzChannels( findAvailableChannelsIndex, channelMaskRemaining, &availableChannels ) == LORAMAC_STATUS_PARAMETER_INVALID )
-        {
-            return LORAMAC_STATUS_PARAMETER_INVALID;
-        }
-
-        if ( availableChannels > 0 )
-        {
-            // Choose randomly a free channel 125kHz
-            *newChannelIndex = ( startIndex * 8 ) + findAvailableChannelsIndex[randr( 0, ( availableChannels - 1 ) )];
-        }
-
-        // Increment start index
-        startIndex++;
-        if ( startIndex > 7 )
-        {
-            startIndex = 0;
-        }
-    } while( ( availableChannels == 0 ) && ( startIndex != NvmCtx.JoinChannelGroupsCurrentIndex ) );
-
-    if ( availableChannels > 0 )
-    {
-        NvmCtx.JoinChannelGroupsCurrentIndex = startIndex;
-        return LORAMAC_STATUS_OK;
-    }
-
-    return LORAMAC_STATUS_PARAMETER_INVALID;
-}
-
-static uint32_t GetBandwidth( uint32_t drIndex )
-{
-    switch( BandwidthsUS915[drIndex] )
-    {
-        default:
-        case 125000:
-            return 0;
-        case 250000:
-            return 1;
-        case 500000:
-            return 2;
-    }
-}
+static RegionNvmDataGroup1_t* RegionNvmGroup1;
+static RegionNvmDataGroup2_t* RegionNvmGroup2;
 
 static int8_t LimitTxPower( int8_t txPower, int8_t maxBandTxPower, int8_t datarate, uint16_t* channelsMask )
 {
     int8_t txPowerResult = txPower;
 
     // Limit tx power to the band max
-    txPowerResult =  MAX( txPower, maxBandTxPower );
+    txPowerResult =  RegionCommonLimitTxPower( txPower, maxBandTxPower );
 
     if( datarate == DR_4 )
     {// Limit tx power to max 26dBm
@@ -257,15 +105,17 @@ static bool VerifyRfFreq( uint32_t freq )
 static TimerTime_t GetTimeOnAir( int8_t datarate, uint16_t pktLen )
 {
     int8_t phyDr = DataratesUS915[datarate];
-    uint32_t bandwidth = GetBandwidth( datarate );
+    uint32_t bandwidth = RegionCommonGetBandwidth( datarate, BandwidthsUS915 );
 
     return Radio.TimeOnAir( MODEM_LORA, bandwidth, phyDr, 1, 8, false, pktLen, true );
 }
+#endif /* REGION_US915 */
 
 PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 
+#if defined( REGION_US915 )
     switch( getPhy->Attribute )
     {
         case PHY_MIN_RX_DR:
@@ -285,7 +135,16 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_NEXT_LOWER_TX_DR:
         {
-            phyParam.Value = GetNextLowerTxDr( getPhy->Datarate, US915_TX_MIN_DATARATE );
+            RegionCommonGetNextLowerTxDrParams_t nextLowerTxDrParams =
+            {
+                .CurrentDr = getPhy->Datarate,
+                .MaxDr = ( int8_t )US915_TX_MAX_DATARATE,
+                .MinDr = ( int8_t )US915_TX_MIN_DATARATE,
+                .NbChannels = US915_MAX_NB_CHANNELS,
+                .ChannelsMask = RegionNvmGroup2->ChannelsMask,
+                .Channels = RegionNvmGroup2->Channels,
+            };
+            phyParam.Value = RegionCommonGetNextLowerTxDr( &nextLowerTxDrParams );
             break;
         }
         case PHY_MAX_TX_POWER:
@@ -300,12 +159,12 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_ADR_ACK_LIMIT:
         {
-            phyParam.Value = US915_ADR_ACK_LIMIT;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_LIMIT;
             break;
         }
         case PHY_DEF_ADR_ACK_DELAY:
         {
-            phyParam.Value = US915_ADR_ACK_DELAY;
+            phyParam.Value = REGION_COMMON_DEFAULT_ADR_ACK_DELAY;
             break;
         }
         case PHY_MAX_PAYLOAD:
@@ -313,11 +172,13 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = MaxPayloadOfDatarateUS915[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_BEGIN: Keep repeater feature */
         case PHY_MAX_PAYLOAD_REPEATER:
         {
             phyParam.Value = MaxPayloadOfDatarateRepeaterUS915[getPhy->Datarate];
             break;
         }
+        /* ST_WORKAROUND_END */
         case PHY_DUTY_CYCLE:
         {
             phyParam.Value = US915_DUTY_CYCLE_ENABLED;
@@ -330,37 +191,37 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_RECEIVE_DELAY1:
         {
-            phyParam.Value = US915_RECEIVE_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY1;
             break;
         }
         case PHY_RECEIVE_DELAY2:
         {
-            phyParam.Value = US915_RECEIVE_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_RECEIVE_DELAY2;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY1:
         {
-            phyParam.Value = US915_JOIN_ACCEPT_DELAY1;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY1;
             break;
         }
         case PHY_JOIN_ACCEPT_DELAY2:
         {
-            phyParam.Value = US915_JOIN_ACCEPT_DELAY2;
+            phyParam.Value = REGION_COMMON_DEFAULT_JOIN_ACCEPT_DELAY2;
             break;
         }
         case PHY_MAX_FCNT_GAP:
         {
-            phyParam.Value = US915_MAX_FCNT_GAP;
+            phyParam.Value = REGION_COMMON_DEFAULT_MAX_FCNT_GAP;
             break;
         }
         case PHY_ACK_TIMEOUT:
         {
-            phyParam.Value = ( US915_ACKTIMEOUT + randr( -US915_ACK_TIMEOUT_RND, US915_ACK_TIMEOUT_RND ) );
+            phyParam.Value = ( REGION_COMMON_DEFAULT_ACK_TIMEOUT + randr( -REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND, REGION_COMMON_DEFAULT_ACK_TIMEOUT_RND ) );
             break;
         }
         case PHY_DEF_DR1_OFFSET:
         {
-            phyParam.Value = US915_DEFAULT_RX1_DR_OFFSET;
+            phyParam.Value = REGION_COMMON_DEFAULT_RX1_DR_OFFSET;
             break;
         }
         case PHY_DEF_RX2_FREQUENCY:
@@ -375,12 +236,12 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsMask;
             break;
         }
         case PHY_CHANNELS_DEFAULT_MASK:
         {
-            phyParam.ChannelsMask = NvmCtx.ChannelsDefaultMask;
+            phyParam.ChannelsMask = RegionNvmGroup2->ChannelsDefaultMask;
             break;
         }
         case PHY_MAX_NB_CHANNELS:
@@ -390,13 +251,17 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_CHANNELS:
         {
-            phyParam.Channels = NvmCtx.Channels;
+            phyParam.Channels = RegionNvmGroup2->Channels;
             break;
         }
         case PHY_DEF_UPLINK_DWELL_TIME:
+        {
+            phyParam.Value = US915_DEFAULT_UPLINK_DWELL_TIME;
+            break;
+        }
         case PHY_DEF_DOWNLINK_DWELL_TIME:
         {
-            phyParam.Value = 0;
+            phyParam.Value = REGION_COMMON_DEFAULT_DOWNLINK_DWELL_TIME;
             break;
         }
         case PHY_DEF_MAX_EIRP:
@@ -411,7 +276,9 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BEACON_CHANNEL_FREQ:
         {
-            phyParam.Value = US915_BEACON_CHANNEL_FREQ + ( getPhy->Channel * US915_BEACON_CHANNEL_STEPWIDTH );
+            phyParam.Value = RegionBaseUSCalcDownlinkFrequency( getPhy->Channel,
+                                                                US915_BEACON_CHANNEL_FREQ,
+                                                                US915_BEACON_CHANNEL_STEPWIDTH );
             break;
         }
         case PHY_BEACON_FORMAT:
@@ -426,16 +293,6 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = US915_BEACON_CHANNEL_DR;
             break;
         }
-        case PHY_BEACON_CHANNEL_STEPWIDTH:
-        {
-            phyParam.Value = US915_BEACON_CHANNEL_STEPWIDTH;
-            break;
-        }
-        case PHY_PING_SLOT_NB_CHANNELS:
-        {
-            phyParam.Value = US915_PING_SLOT_NB_CHANNELS;
-            break;
-        }
         case PHY_BEACON_NB_CHANNELS:
         {
             phyParam.Value = US915_BEACON_NB_CHANNELS;
@@ -443,7 +300,9 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_PING_SLOT_CHANNEL_FREQ:
         {
-            phyParam.Value = US915_PING_SLOT_CHANNEL_FREQ + ( getPhy->Channel * US915_BEACON_CHANNEL_STEPWIDTH );
+            phyParam.Value = RegionBaseUSCalcDownlinkFrequency( getPhy->Channel,
+                                                                US915_PING_SLOT_CHANNEL_FREQ,
+                                                                US915_BEACON_CHANNEL_STEPWIDTH );
             break;
         }
         case PHY_PING_SLOT_CHANNEL_DR:
@@ -451,6 +310,11 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = US915_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_PING_SLOT_NB_CHANNELS:
+        {
+            phyParam.Value = US915_BEACON_NB_CHANNELS;
+            break;
+        }
         case PHY_SF_FROM_DR:
         {
             phyParam.Value = DataratesUS915[getPhy->Datarate];
@@ -458,7 +322,7 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_BW_FROM_DR:
         {
-            phyParam.Value = GetBandwidth( getPhy->Datarate );
+            phyParam.Value = RegionCommonGetBandwidth( getPhy->Datarate, BandwidthsUS915 );
             break;
         }
         default:
@@ -467,17 +331,21 @@ PhyParam_t RegionUS915GetPhyParam( GetPhyParams_t* getPhy )
         }
     }
 
+#endif /* REGION_US915 */
     return phyParam;
 }
 
 void RegionUS915SetBandTxDone( SetBandTxDoneParams_t* txDone )
 {
-    RegionCommonSetBandTxDone( &NvmCtx.Bands[NvmCtx.Channels[txDone->Channel].Band],
+#if defined( REGION_US915 )
+    RegionCommonSetBandTxDone( &RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txDone->Channel].Band],
                                txDone->LastTxAirTime, txDone->Joined, txDone->ElapsedTimeSinceStartUp );
+#endif /* REGION_US915 */
 }
 
 void RegionUS915InitDefaults( InitDefaultsParams_t* params )
 {
+#if defined( REGION_US915 )
     Band_t bands[US915_MAX_NB_BANDS] =
     {
        US915_BAND0
@@ -487,55 +355,63 @@ void RegionUS915InitDefaults( InitDefaultsParams_t* params )
     {
         case INIT_TYPE_DEFAULTS:
         {
+            if( ( params->NvmGroup1 == NULL ) || ( params->NvmGroup2 == NULL ) )
+            {
+                return;
+            }
+
+            RegionNvmGroup1 = (RegionNvmDataGroup1_t*) params->NvmGroup1;
+            RegionNvmGroup2 = (RegionNvmDataGroup2_t*) params->NvmGroup2;
+
             // Initialize 8 bit channel groups index
-            NvmCtx.JoinChannelGroupsCurrentIndex = 0;
+            RegionNvmGroup1->JoinChannelGroupsCurrentIndex = 0;
 
             // Initialize the join trials counter
-            NvmCtx.JoinTrialsCounter = 0;
+            RegionNvmGroup1->JoinTrialsCounter = 0;
 
             // Default bands
-            memcpy1( ( uint8_t* )NvmCtx.Bands, ( uint8_t* )bands, sizeof( Band_t ) * US915_MAX_NB_BANDS );
+            memcpy1( ( uint8_t* )RegionNvmGroup1->Bands, ( uint8_t* )bands, sizeof( Band_t ) * US915_MAX_NB_BANDS );
 
             // Default channels
             for( uint8_t i = 0; i < US915_MAX_NB_CHANNELS - 8; i++ )
             {
                 // 125 kHz channels
-                NvmCtx.Channels[i].Frequency = 902300000 + i * 200000;
-                NvmCtx.Channels[i].DrRange.Value = ( DR_3 << 4 ) | DR_0;
-                NvmCtx.Channels[i].Band = 0;
+                RegionNvmGroup2->Channels[i].Frequency = 902300000 + i * 200000;
+                RegionNvmGroup2->Channels[i].DrRange.Value = ( DR_3 << 4 ) | DR_0;
+                RegionNvmGroup2->Channels[i].Band = 0;
             }
             for( uint8_t i = US915_MAX_NB_CHANNELS - 8; i < US915_MAX_NB_CHANNELS; i++ )
             {
                 // 500 kHz channels
-                NvmCtx.Channels[i].Frequency = 903000000 + ( i - ( US915_MAX_NB_CHANNELS - 8 ) ) * 1600000;
-                NvmCtx.Channels[i].DrRange.Value = ( DR_4 << 4 ) | DR_4;
-                NvmCtx.Channels[i].Band = 0;
+                RegionNvmGroup2->Channels[i].Frequency = 903000000 + ( i - ( US915_MAX_NB_CHANNELS - 8 ) ) * 1600000;
+                RegionNvmGroup2->Channels[i].DrRange.Value = ( DR_4 << 4 ) | DR_4;
+                RegionNvmGroup2->Channels[i].Band = 0;
             }
 
             // Default ChannelsMask
             /* ST_WORKAROUND_BEGIN: Hybrid mode */
 #if ( HYBRID_ENABLED == 1 )
-            NvmCtx.ChannelsDefaultMask[0] = 0x00FF;
-            NvmCtx.ChannelsDefaultMask[1] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[2] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[3] = 0x0000;
-            NvmCtx.ChannelsDefaultMask[4] = 0x0001;
-            NvmCtx.ChannelsDefaultMask[5] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[0] = 0x00FF;
+            RegionNvmGroup2->ChannelsDefaultMask[1] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[2] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[3] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[4] = 0x0001;
+            RegionNvmGroup2->ChannelsDefaultMask[5] = 0x0000;
 #else
-            NvmCtx.ChannelsDefaultMask[0] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[1] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[2] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[3] = 0xFFFF;
-            NvmCtx.ChannelsDefaultMask[4] = 0x00FF;
-            NvmCtx.ChannelsDefaultMask[5] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[0] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[1] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[2] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[3] = 0xFFFF;
+            RegionNvmGroup2->ChannelsDefaultMask[4] = 0x00FF;
+            RegionNvmGroup2->ChannelsDefaultMask[5] = 0x0000;
 #endif /* HYBRID_ENABLED == 1 */
             /* ST_WORKAROUND_END */
 
             // Copy channels default mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, 6 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
 
             // Copy into channels mask remaining
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMaskRemaining, NvmCtx.ChannelsMask, 6 );
+            RegionCommonChanMaskCopy( RegionNvmGroup1->ChannelsMaskRemaining, RegionNvmGroup2->ChannelsMask, CHANNELS_MASK_SIZE );
             break;
         }
         case INIT_TYPE_RESET_TO_DEFAULT_CHANNELS:
@@ -545,19 +421,11 @@ void RegionUS915InitDefaults( InitDefaultsParams_t* params )
         case INIT_TYPE_ACTIVATE_DEFAULT_CHANNELS:
         {
             // Copy channels default mask
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, NvmCtx.ChannelsDefaultMask, 6 );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, RegionNvmGroup2->ChannelsDefaultMask, CHANNELS_MASK_SIZE );
 
-            for( uint8_t i = 0; i < 6; i++ )
+            for( uint8_t i = 0; i < CHANNELS_MASK_SIZE; i++ )
             { // Copy-And the channels mask
-                NvmCtx.ChannelsMaskRemaining[i] &= NvmCtx.ChannelsMask[i];
-            }
-            break;
-        }
-        case INIT_TYPE_RESTORE_CTX:
-        {
-            if( params->NvmCtx != 0 )
-            {
-                memcpy1( (uint8_t*) &NvmCtx, (uint8_t*) params->NvmCtx, sizeof( NvmCtx ) );
+                RegionNvmGroup1->ChannelsMaskRemaining[i] &= RegionNvmGroup2->ChannelsMask[i];
             }
             break;
         }
@@ -566,16 +434,12 @@ void RegionUS915InitDefaults( InitDefaultsParams_t* params )
             break;
         }
     }
-}
-
-void* RegionUS915GetNvmCtx( GetNvmCtxParams_t* params )
-{
-    params->nvmCtxSize = sizeof( RegionUS915NvmCtx_t );
-    return &NvmCtx;
+#endif /* REGION_US915 */
 }
 
 bool RegionUS915Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
 {
+#if defined( REGION_US915 )
     switch( phyAttribute )
     {
         case PHY_FREQUENCY:
@@ -583,12 +447,9 @@ bool RegionUS915Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
             return VerifyRfFreq( verify->Frequency );
         }
         case PHY_TX_DR:
-        {
-            return RegionCommonValueInRange( verify->DatarateParams.Datarate, US915_TX_MIN_DATARATE, US915_TX_MAX_DATARATE );
-        }
         case PHY_DEF_TX_DR:
         {
-            return RegionCommonValueInRange( verify->DatarateParams.Datarate, DR_0, DR_5 );
+            return RegionCommonValueInRange( verify->DatarateParams.Datarate, US915_TX_MIN_DATARATE, US915_TX_MAX_DATARATE );
         }
         case PHY_RX_DR:
         {
@@ -607,10 +468,14 @@ bool RegionUS915Verify( VerifyParams_t* verify, PhyAttribute_t phyAttribute )
         default:
             return false;
     }
+#else
+    return false;
+#endif /* REGION_US915 */
 }
 
 void RegionUS915ApplyCFList( ApplyCFListParams_t* applyCFList )
 {
+#if defined( REGION_US915 )
     // Size of the optional CF list must be 16 byte
     if( applyCFList->Size != 16 )
     {
@@ -626,19 +491,21 @@ void RegionUS915ApplyCFList( ApplyCFListParams_t* applyCFList )
     // ChMask0 - ChMask4 must be set (every ChMask has 16 bit)
     for( uint8_t chMaskItr = 0, cntPayload = 0; chMaskItr <= 4; chMaskItr++, cntPayload+=2 )
     {
-        NvmCtx.ChannelsMask[chMaskItr] = (uint16_t) (0x00FF & applyCFList->Payload[cntPayload]);
-        NvmCtx.ChannelsMask[chMaskItr] |= (uint16_t) (applyCFList->Payload[cntPayload+1] << 8);
+        RegionNvmGroup2->ChannelsMask[chMaskItr] = (uint16_t) (0x00FF & applyCFList->Payload[cntPayload]);
+        RegionNvmGroup2->ChannelsMask[chMaskItr] |= (uint16_t) (applyCFList->Payload[cntPayload+1] << 8);
         if( chMaskItr == 4 )
         {
-            NvmCtx.ChannelsMask[chMaskItr] = NvmCtx.ChannelsMask[chMaskItr] & CHANNELS_MASK_500KHZ_MASK;
+            RegionNvmGroup2->ChannelsMask[chMaskItr] = RegionNvmGroup2->ChannelsMask[chMaskItr] & CHANNELS_MASK_500KHZ_MASK;
         }
         // Set the channel mask to the remaining
-        NvmCtx.ChannelsMaskRemaining[chMaskItr] &= NvmCtx.ChannelsMask[chMaskItr];
+        RegionNvmGroup1->ChannelsMaskRemaining[chMaskItr] &= RegionNvmGroup2->ChannelsMask[chMaskItr];
     }
+#endif /* REGION_US915 */
 }
 
 bool RegionUS915ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 {
+#if defined( REGION_US915 )
     uint8_t nbChannels = RegionCommonCountChannels( chanMaskSet->ChannelsMaskIn, 0, 4 );
 
     // Check the number of active channels
@@ -652,45 +519,49 @@ bool RegionUS915ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
     {
         case CHANNELS_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
 
-            NvmCtx.ChannelsDefaultMask[4] = NvmCtx.ChannelsDefaultMask[4] & CHANNELS_MASK_500KHZ_MASK;
-            NvmCtx.ChannelsDefaultMask[5] = 0x0000;
+            RegionNvmGroup2->ChannelsDefaultMask[4] = RegionNvmGroup2->ChannelsDefaultMask[4] & CHANNELS_MASK_500KHZ_MASK;
+            RegionNvmGroup2->ChannelsDefaultMask[5] = 0x0000;
 
             for( uint8_t i = 0; i < CHANNELS_MASK_SIZE; i++ )
             { // Copy-And the channels mask
-                NvmCtx.ChannelsMaskRemaining[i] &= NvmCtx.ChannelsMask[i];
+                RegionNvmGroup1->ChannelsMaskRemaining[i] &= RegionNvmGroup2->ChannelsMask[i];
             }
             break;
         }
         case CHANNELS_DEFAULT_MASK:
         {
-            RegionCommonChanMaskCopy( NvmCtx.ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
+            RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsDefaultMask, chanMaskSet->ChannelsMaskIn, CHANNELS_MASK_SIZE );
             break;
         }
         default:
             return false;
     }
     return true;
+#else
+    return false;
+#endif /* REGION_US915 */
 }
 
 void RegionUS915ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    /* ST_WORKAROUND_BEGIN: remove float/double */
-    uint32_t tSymbol = 0;
-    /* ST_WORKAROUND_END */
+#if defined( REGION_US915 )
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, US915_RX_MAX_DATARATE );
-    rxConfigParams->Bandwidth = GetBandwidth( rxConfigParams->Datarate );
+    rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsUS915 );
 
-    tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesUS915[rxConfigParams->Datarate], BandwidthsUS915[rxConfigParams->Datarate] );
+    tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesUS915[rxConfigParams->Datarate], BandwidthsUS915[rxConfigParams->Datarate] );
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+#endif /* REGION_US915 */
 }
 
 bool RegionUS915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
 {
+#if defined( REGION_US915 )
     int8_t dr = rxConfig->Datarate;
     uint8_t maxPayload = 0;
     int8_t phyDr = 0;
@@ -715,6 +586,7 @@ bool RegionUS915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     // Radio configuration
     Radio.SetRxConfig( MODEM_LORA, rxConfig->Bandwidth, phyDr, 1, 0, 8, rxConfig->WindowTimeout, false, 0, false, 0, 0, true, rxConfig->RxContinuous );
 
+    /* ST_WORKAROUND_BEGIN: Keep repeater feature */
     if( rxConfig->RepeaterSupport == true )
     {
         maxPayload = MaxPayloadOfDatarateRepeaterUS915[dr];
@@ -723,31 +595,38 @@ bool RegionUS915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
     {
         maxPayload = MaxPayloadOfDatarateUS915[dr];
     }
+
     Radio.SetMaxPayloadLength( MODEM_LORA, maxPayload + LORAMAC_FRAME_PAYLOAD_OVERHEAD_SIZE );
+    /* ST_WORKAROUND_END */
+
     /* ST_WORKAROUND_BEGIN: Print Rx config */
     RegionCommonRxConfigPrint(rxConfig->RxSlot, frequency, dr);
     /* ST_WORKAROUND_END */
 
     *datarate = (uint8_t) dr;
     return true;
+#else
+    return false;
+#endif /* REGION_US915 */
 }
 
 bool RegionUS915TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime_t* txTimeOnAir )
 {
+#if defined( REGION_US915 )
     int8_t phyDr = DataratesUS915[txConfig->Datarate];
-    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, NvmCtx.Bands[NvmCtx.Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, NvmCtx.ChannelsMask );
-    uint32_t bandwidth = GetBandwidth( txConfig->Datarate );
+    int8_t txPowerLimited = LimitTxPower( txConfig->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[txConfig->Channel].Band].TxMaxPower, txConfig->Datarate, RegionNvmGroup2->ChannelsMask );
+    uint32_t bandwidth = RegionCommonGetBandwidth( txConfig->Datarate, BandwidthsUS915 );
     int8_t phyTxPower = 0;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, US915_DEFAULT_MAX_ERP, 0 );
 
     // Setup the radio frequency
-    Radio.SetChannel( NvmCtx.Channels[txConfig->Channel].Frequency );
+    Radio.SetChannel( RegionNvmGroup2->Channels[txConfig->Channel].Frequency );
 
     Radio.SetTxConfig( MODEM_LORA, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
     /* ST_WORKAROUND_BEGIN: Print Tx config */
-    RegionCommonTxConfigPrint(NvmCtx.Channels[txConfig->Channel].Frequency, txConfig->Datarate);
+    RegionCommonTxConfigPrint(RegionNvmGroup2->Channels[txConfig->Channel].Frequency, txConfig->Datarate);
     /* ST_WORKAROUND_END */
 
     // Setup maximum payload length of the radio driver
@@ -758,24 +637,29 @@ bool RegionUS915TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     *txPower = txPowerLimited;
     return true;
+#else
+    return false;
+#endif /* REGION_US915 */
 }
 
 uint8_t RegionUS915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, int8_t* txPowOut, uint8_t* nbRepOut, uint8_t* nbBytesParsed )
 {
     uint8_t status = 0x07;
+#if defined( REGION_US915 )
     RegionCommonLinkAdrParams_t linkAdrParams = { 0 };
     uint8_t nextIndex = 0;
     uint8_t bytesProcessed = 0;
-    uint16_t channelsMask[6] = { 0, 0, 0, 0, 0, 0 };
+    uint16_t channelsMask[CHANNELS_MASK_SIZE] = { 0, 0, 0, 0, 0, 0 };
     GetPhyParams_t getPhy;
     PhyParam_t phyParam;
     RegionCommonLinkAdrReqVerifyParams_t linkAdrVerifyParams;
 
     // Initialize local copy of channels mask
-    RegionCommonChanMaskCopy( channelsMask, NvmCtx.ChannelsMask, 6 );
+    RegionCommonChanMaskCopy( channelsMask, RegionNvmGroup2->ChannelsMask, CHANNELS_MASK_SIZE );
 
     while( bytesProcessed < linkAdrReq->PayloadSize )
     {
+        // Get ADR request parameters
         nextIndex = RegionCommonParseLinkAdrReq( &( linkAdrReq->Payload[bytesProcessed] ), &linkAdrParams );
 
         if( nextIndex == 0 )
@@ -890,7 +774,7 @@ uint8_t RegionUS915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     linkAdrVerifyParams.ChannelsMask = channelsMask;
     linkAdrVerifyParams.MinDatarate = ( int8_t )phyParam.Value;
     linkAdrVerifyParams.MaxDatarate = US915_TX_MAX_DATARATE;
-    linkAdrVerifyParams.Channels = NvmCtx.Channels;
+    linkAdrVerifyParams.Channels = RegionNvmGroup2->Channels;
     linkAdrVerifyParams.MinTxPower = US915_MIN_TX_POWER;
     linkAdrVerifyParams.MaxTxPower = US915_MAX_TX_POWER;
     linkAdrVerifyParams.Version = linkAdrReq->Version;
@@ -902,14 +786,14 @@ uint8_t RegionUS915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     if( status == 0x07 )
     {
         // Copy Mask
-        RegionCommonChanMaskCopy( NvmCtx.ChannelsMask, channelsMask, 6 );
-
-        NvmCtx.ChannelsMaskRemaining[0] &= NvmCtx.ChannelsMask[0];
-        NvmCtx.ChannelsMaskRemaining[1] &= NvmCtx.ChannelsMask[1];
-        NvmCtx.ChannelsMaskRemaining[2] &= NvmCtx.ChannelsMask[2];
-        NvmCtx.ChannelsMaskRemaining[3] &= NvmCtx.ChannelsMask[3];
-        NvmCtx.ChannelsMaskRemaining[4] = NvmCtx.ChannelsMask[4];
-        NvmCtx.ChannelsMaskRemaining[5] = NvmCtx.ChannelsMask[5];
+        RegionCommonChanMaskCopy( RegionNvmGroup2->ChannelsMask, channelsMask, 6 );
+
+        RegionNvmGroup1->ChannelsMaskRemaining[0] &= RegionNvmGroup2->ChannelsMask[0];
+        RegionNvmGroup1->ChannelsMaskRemaining[1] &= RegionNvmGroup2->ChannelsMask[1];
+        RegionNvmGroup1->ChannelsMaskRemaining[2] &= RegionNvmGroup2->ChannelsMask[2];
+        RegionNvmGroup1->ChannelsMaskRemaining[3] &= RegionNvmGroup2->ChannelsMask[3];
+        RegionNvmGroup1->ChannelsMaskRemaining[4] = RegionNvmGroup2->ChannelsMask[4];
+        RegionNvmGroup1->ChannelsMaskRemaining[5] = RegionNvmGroup2->ChannelsMask[5];
     }
 
     // Update status variables
@@ -918,12 +802,14 @@ uint8_t RegionUS915LinkAdrReq( LinkAdrReqParams_t* linkAdrReq, int8_t* drOut, in
     *nbRepOut = linkAdrParams.NbRep;
     *nbBytesParsed = bytesProcessed;
 
+#endif /* REGION_US915 */
     return status;
 }
 
 uint8_t RegionUS915RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
 {
     uint8_t status = 0x07;
+#if defined( REGION_US915 )
 
     // Verify radio frequency
     if( VerifyRfFreq( rxParamSetupReq->Frequency ) == false )
@@ -948,39 +834,43 @@ uint8_t RegionUS915RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq )
         status &= 0xFB; // Rx1DrOffset range KO
     }
 
+#endif /* REGION_US915 */
     return status;
 }
 
-uint8_t RegionUS915NewChannelReq( NewChannelReqParams_t* newChannelReq )
+int8_t RegionUS915NewChannelReq( NewChannelReqParams_t* newChannelReq )
 {
-    // Datarate and frequency KO
-    return 0;
+    // Do not accept the request
+    return -1;
 }
 
 int8_t RegionUS915TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq )
 {
+    // Do not accept the request
     return -1;
 }
 
-uint8_t RegionUS915DlChannelReq( DlChannelReqParams_t* dlChannelReq )
+int8_t RegionUS915DlChannelReq( DlChannelReqParams_t* dlChannelReq )
 {
-    return 0;
+    // Do not accept the request
+    return -1;
 }
 
 int8_t RegionUS915AlternateDr( int8_t currentDr, AlternateDrType_t type )
 {
+#if defined( REGION_US915 )
     // Alternates the data rate according to the channel sequence:
     // Eight times a 125kHz DR_0 and then one 500kHz DR_4 channel
     if( type == ALTERNATE_DR )
     {
-        NvmCtx.JoinTrialsCounter++;
+        RegionNvmGroup1->JoinTrialsCounter++;
     }
     else
     {
-        NvmCtx.JoinTrialsCounter--;
+        RegionNvmGroup1->JoinTrialsCounter--;
     }
 
-    if( NvmCtx.JoinTrialsCounter % 9 == 0 )
+    if( RegionNvmGroup1->JoinTrialsCounter % 9 == 0 )
     {
         // Use DR_4 every 9th times.
         currentDr = DR_4;
@@ -990,54 +880,57 @@ int8_t RegionUS915AlternateDr( int8_t currentDr, AlternateDrType_t type )
         currentDr = DR_0;
     }
     return currentDr;
+#else
+    return -1;
+#endif /* REGION_US915 */
 }
 
 LoRaMacStatus_t RegionUS915NextChannel( NextChanParams_t* nextChanParams, uint8_t* channel, TimerTime_t* time, TimerTime_t* aggregatedTimeOff )
 {
+#if defined( REGION_US915 )
     uint8_t nbEnabledChannels = 0;
     uint8_t nbRestrictedChannels = 0;
     uint8_t enabledChannels[US915_MAX_NB_CHANNELS] = { 0 };
-    uint8_t newChannelIndex = 0;
     RegionCommonIdentifyChannelsParam_t identifyChannelsParam;
     RegionCommonCountNbOfEnabledChannelsParams_t countChannelsParams;
     LoRaMacStatus_t status = LORAMAC_STATUS_NO_CHANNEL_FOUND;
 
     // Count 125kHz channels
-    if( RegionCommonCountChannels( NvmCtx.ChannelsMaskRemaining, 0, 4 ) == 0 )
+    if( RegionCommonCountChannels( RegionNvmGroup1->ChannelsMaskRemaining, 0, 4 ) == 0 )
     { // Reactivate default channels
-        RegionCommonChanMaskCopy( NvmCtx.ChannelsMaskRemaining, NvmCtx.ChannelsMask, 4  );
+        RegionCommonChanMaskCopy( RegionNvmGroup1->ChannelsMaskRemaining, RegionNvmGroup2->ChannelsMask, 4  );
 
-        NvmCtx.JoinChannelGroupsCurrentIndex = 0;
+        RegionNvmGroup1->JoinChannelGroupsCurrentIndex = 0;
     }
     // Check other channels
     if( nextChanParams->Datarate >= DR_4 )
     {
-        if( ( NvmCtx.ChannelsMaskRemaining[4] & CHANNELS_MASK_500KHZ_MASK ) == 0 )
+        if( ( RegionNvmGroup1->ChannelsMaskRemaining[4] & CHANNELS_MASK_500KHZ_MASK ) == 0 )
         {
-            NvmCtx.ChannelsMaskRemaining[4] = NvmCtx.ChannelsMask[4];
+            RegionNvmGroup1->ChannelsMaskRemaining[4] = RegionNvmGroup2->ChannelsMask[4];
         }
     }
 
     // Search how many channels are enabled
     countChannelsParams.Joined = nextChanParams->Joined;
     countChannelsParams.Datarate = nextChanParams->Datarate;
-    countChannelsParams.ChannelsMask = NvmCtx.ChannelsMaskRemaining;
-    countChannelsParams.Channels = NvmCtx.Channels;
-    countChannelsParams.Bands = NvmCtx.Bands;
+    countChannelsParams.ChannelsMask = RegionNvmGroup1->ChannelsMaskRemaining;
+    countChannelsParams.Channels = RegionNvmGroup2->Channels;
+    countChannelsParams.Bands = RegionNvmGroup1->Bands;
     countChannelsParams.MaxNbChannels = US915_MAX_NB_CHANNELS;
-    countChannelsParams.JoinChannels = 0;
+    countChannelsParams.JoinChannels = NULL;
 
     identifyChannelsParam.AggrTimeOff = nextChanParams->AggrTimeOff;
     identifyChannelsParam.LastAggrTx = nextChanParams->LastAggrTx;
     identifyChannelsParam.DutyCycleEnabled = nextChanParams->DutyCycleEnabled;
     identifyChannelsParam.MaxBands = US915_MAX_NB_BANDS;
 
-    identifyChannelsParam.CountNbOfEnabledChannelsParam = &countChannelsParams;
-
     identifyChannelsParam.ElapsedTimeSinceStartUp = nextChanParams->ElapsedTimeSinceStartUp;
     identifyChannelsParam.LastTxIsJoinRequest = nextChanParams->LastTxIsJoinRequest;
     identifyChannelsParam.ExpectedTimeOnAir = GetTimeOnAir( nextChanParams->Datarate, nextChanParams->PktLen );
 
+    identifyChannelsParam.CountNbOfEnabledChannelsParam = &countChannelsParams;
+
     status = RegionCommonIdentifyChannels( &identifyChannelsParam, aggregatedTimeOff, enabledChannels,
                                            &nbEnabledChannels, &nbRestrictedChannels, time );
 
@@ -1058,18 +951,18 @@ LoRaMacStatus_t RegionUS915NextChannel( NextChanParams_t* nextChanParams, uint8_
             // 125kHz Channels (0 - 63) DR0
             if( nextChanParams->Datarate == DR_0 )
             {
-                if( ComputeNext125kHzJoinChannel( &newChannelIndex ) == LORAMAC_STATUS_PARAMETER_INVALID )
+                if( RegionBaseUSComputeNext125kHzJoinChannel( ( uint16_t* ) RegionNvmGroup1->ChannelsMaskRemaining,
+                    &RegionNvmGroup1->JoinChannelGroupsCurrentIndex, channel ) == LORAMAC_STATUS_PARAMETER_INVALID )
                 {
                     return LORAMAC_STATUS_PARAMETER_INVALID;
                 }
-                *channel = newChannelIndex;
             }
             // 500kHz Channels (64 - 71) DR4
             else
             {
                 // Choose the next available channel
                 uint8_t i = 0;
-                while( ( ( NvmCtx.ChannelsMaskRemaining[4] & CHANNELS_MASK_500KHZ_MASK ) & ( 1 << i ) ) == 0 )
+                while( ( ( RegionNvmGroup1->ChannelsMaskRemaining[4] & CHANNELS_MASK_500KHZ_MASK ) & ( 1 << i ) ) == 0 )
                 {
                     i++;
                 }
@@ -1078,9 +971,12 @@ LoRaMacStatus_t RegionUS915NextChannel( NextChanParams_t* nextChanParams, uint8_
         }
 
         // Disable the channel in the mask
-        RegionCommonChanDisable( NvmCtx.ChannelsMaskRemaining, *channel, US915_MAX_NB_CHANNELS );
+        RegionCommonChanDisable( RegionNvmGroup1->ChannelsMaskRemaining, *channel, US915_MAX_NB_CHANNELS );
     }
     return status;
+#else
+    return LORAMAC_STATUS_NO_CHANNEL_FOUND;
+#endif /* REGION_US915 */
 }
 
 LoRaMacStatus_t RegionUS915ChannelAdd( ChannelAddParams_t* channelAdd )
@@ -1095,18 +991,21 @@ bool RegionUS915ChannelsRemove( ChannelRemoveParams_t* channelRemove  )
 
 void RegionUS915SetContinuousWave( ContinuousWaveParams_t* continuousWave )
 {
-    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, NvmCtx.Bands[NvmCtx.Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, NvmCtx.ChannelsMask );
+#if defined( REGION_US915 )
+    int8_t txPowerLimited = LimitTxPower( continuousWave->TxPower, RegionNvmGroup1->Bands[RegionNvmGroup2->Channels[continuousWave->Channel].Band].TxMaxPower, continuousWave->Datarate, RegionNvmGroup2->ChannelsMask );
     int8_t phyTxPower = 0;
-    uint32_t frequency = NvmCtx.Channels[continuousWave->Channel].Frequency;
+    uint32_t frequency = RegionNvmGroup2->Channels[continuousWave->Channel].Frequency;
 
     // Calculate physical TX power
     phyTxPower = RegionCommonComputeTxPower( txPowerLimited, US915_DEFAULT_MAX_ERP, 0 );
 
     Radio.SetTxContinuousWave( frequency, phyTxPower, continuousWave->Timeout );
+#endif /* REGION_US915 */
 }
 
 uint8_t RegionUS915ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t drOffset )
 {
+#if defined( REGION_US915 )
     int8_t datarate = DatarateOffsetsUS915[dr][drOffset];
 
     if( datarate < 0 )
@@ -1114,10 +1013,14 @@ uint8_t RegionUS915ApplyDrOffset( uint8_t downlinkDwellTime, int8_t dr, int8_t d
         datarate = DR_0;
     }
     return datarate;
+#else
+    return 0;
+#endif /* REGION_US915 */
 }
 
 void RegionUS915RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 {
+#if defined( REGION_US915 )
     RegionCommonRxBeaconSetupParams_t regionCommonRxBeaconSetup;
 
     regionCommonRxBeaconSetup.Datarates = DataratesUS915;
@@ -1132,4 +1035,5 @@ void RegionUS915RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
 
     // Store downlink datarate
     *outDr = US915_BEACON_CHANNEL_DR;
+#endif /* REGION_US915 */
 }
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.h b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.h
index bfaf4e29..12ffc957 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.h
@@ -34,6 +34,16 @@
  *            Implementation according to LoRaWAN Specification v1.0.2.
  * \{
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    RegionUS915.h
+  * @author  MCD Application Team
+  * @brief   Region definition for US915
+  ******************************************************************************
+  */
 #ifndef __REGION_US915_H__
 #define __REGION_US915_H__
 
@@ -84,11 +94,7 @@ extern "C"
  */
 #define US915_MAX_RX1_DR_OFFSET                     3
 
-/*!
- * Default Rx1 receive datarate offset
- */
-#define US915_DEFAULT_RX1_DR_OFFSET                 0
-
+/* ST_WORKAROUND_BEGIN: Certification requirement */
 /*!
  * Minimal Tx output power that can be used by the node
  */
@@ -97,6 +103,8 @@ extern "C"
 #else
 #define US915_MIN_TX_POWER                          TX_POWER_14
 #endif /* CERTIF_LORAWAN_VERSION */
+/* ST_WORKAROUND_END */
+
 /*!
  * Maximal Tx output power that can be used by the node
  */
@@ -112,16 +120,6 @@ extern "C"
  */
 #define US915_DEFAULT_MAX_ERP                      30.0f
 
-/*!
- * ADR Ack limit
- */
-#define US915_ADR_ACK_LIMIT                         64
-
-/*!
- * ADR Ack delay
- */
-#define US915_ADR_ACK_DELAY                         32
-
 /*!
  * Enabled or disabled the duty cycle
  */
@@ -132,41 +130,6 @@ extern "C"
  */
 #define US915_MAX_RX_WINDOW                         3000
 
-/*!
- * Receive delay 1
- */
-#define US915_RECEIVE_DELAY1                        1000
-
-/*!
- * Receive delay 2
- */
-#define US915_RECEIVE_DELAY2                        2000
-
-/*!
- * Join accept delay 1
- */
-#define US915_JOIN_ACCEPT_DELAY1                    5000
-
-/*!
- * Join accept delay 2
- */
-#define US915_JOIN_ACCEPT_DELAY2                    6000
-
-/*!
- * Maximum frame counter gap
- */
-#define US915_MAX_FCNT_GAP                          16384
-
-/*!
- * Ack timeout
- */
-#define US915_ACKTIMEOUT                            2000
-
-/*!
- * Random ack timeout limits
- */
-#define US915_ACK_TIMEOUT_RND                       1000
-
 /*!
  * Second reception window channel frequency definition.
  */
@@ -177,6 +140,11 @@ extern "C"
  */
 #define US915_RX_WND_2_DR                           DR_8
 
+/*!
+ * Default uplink dwell time configuration
+ */
+#define US915_DEFAULT_UPLINK_DWELL_TIME             0
+
 /*
  * CLASS B
  */
@@ -195,11 +163,6 @@ extern "C"
  */
 #define US915_PING_SLOT_CHANNEL_FREQ                923300000
 
-/*!
- * Number of possible ping slot channels
- */
-#define US915_PING_SLOT_NB_CHANNELS                 8
-
 /*!
  * Number of possible beacon channels
  */
@@ -242,9 +205,9 @@ extern "C"
 
 /*!
  * Band 0 definition
- * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
+ * Band = { DutyCycle, TxMaxPower, LastBandUpdateTime, LastMaxCreditAssignTime, TimeCredits, MaxTimeCredits, ReadyForTransmission }
  */
-#define US915_BAND0                                 { 1, US915_MAX_TX_POWER, 0, 0, 0, 0 } //  100.0 %
+#define US915_BAND0                                 { 1, US915_MAX_TX_POWER, 0, 0, 0, 0, 0 } //  100.0 %
 
 /*!
  * Defines the first channel for RX window 1 for US band
@@ -283,6 +246,7 @@ static const int8_t DatarateOffsetsUS915[5][4] =
     { DR_13, DR_13, DR_12, DR_11 }, // DR_4
 };
 
+/* ST_WORKAROUND_BEGIN: Keep repeater feature */
 /*!
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  */
@@ -292,6 +256,7 @@ static const uint8_t MaxPayloadOfDatarateUS915[] = { 11, 53, 125, 242, 242, 0, 0
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  */
 static const uint8_t MaxPayloadOfDatarateRepeaterUS915[] = { 11, 53, 125, 242, 242, 0, 0, 0, 33, 109, 222, 222, 222, 222, 0, 0 };
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief The function gets a value of a specific phy attribute.
@@ -316,15 +281,6 @@ void RegionUS915SetBandTxDone( SetBandTxDoneParams_t* txDone );
  */
 void RegionUS915InitDefaults( InitDefaultsParams_t* params );
 
-/*!
- * \brief Returns a pointer to the internal context and its size.
- *
- * \param [OUT] params Pointer to the function parameters.
- *
- * \retval      Points to a structure where the module store its non-volatile context.
- */
-void* RegionUS915GetNvmCtx( GetNvmCtxParams_t* params );
-
 /*!
  * \brief Verifies a parameter.
  *
@@ -417,7 +373,7 @@ uint8_t RegionUS915RxParamSetupReq( RxParamSetupReqParams_t* rxParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionUS915NewChannelReq( NewChannelReqParams_t* newChannelReq );
+int8_t RegionUS915NewChannelReq( NewChannelReqParams_t* newChannelReq );
 
 /*!
  * \brief The function processes a TX ParamSetup Request.
@@ -437,7 +393,7 @@ int8_t RegionUS915TxParamSetupReq( TxParamSetupReqParams_t* txParamSetupReq );
  *
  * \retval Returns the status of the operation, according to the LoRaMAC specification.
  */
-uint8_t RegionUS915DlChannelReq( DlChannelReqParams_t* dlChannelReq );
+int8_t RegionUS915DlChannelReq( DlChannelReqParams_t* dlChannelReq );
 
 /*!
  * \brief Alternates the datarate of the channel for the join request.
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/secure-element-nvm.h b/Middlewares/Third_Party/LoRaWAN/Mac/secure-element-nvm.h
new file mode 100644
index 00000000..b3576b31
--- /dev/null
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/secure-element-nvm.h
@@ -0,0 +1,147 @@
+/*!
+ * \file      secure-element-nvm.h
+ *
+ * \brief     Secure Element non-volatile data.
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ * \author    Miguel Luis ( Semtech )
+ *
+ * \author    Daniel Jaeckle ( STACKFORCE )
+ *
+ * \addtogroup  SECUREELEMENT
+ *
+ * \{
+ *
+ */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    secure-element-nvm.h
+  * @author  MCD Application Team
+  * @brief   Secure Element non-volatile data.
+  ******************************************************************************
+  */
+#ifndef __SECURE_ELEMENT_NVM_H__
+#define __SECURE_ELEMENT_NVM_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#include <stdint.h>
+#include "LoRaMacTypes.h"
+#include "lorawan_conf.h"  /* LORAWAN_KMS */
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+#else /* LORAWAN_KMS == 1 */
+#include "kms_if.h"
+#endif /* LORAWAN_KMS */
+  
+/*!
+ * Secure-element keys size in bytes
+ */
+#define SE_KEY_SIZE             16
+
+/*!
+ * Secure-element EUI size in bytes
+ */
+#define SE_EUI_SIZE             8
+
+/* ST_WORKAROUND_BEGIN: Dynamic number of keys definition */
+/*!
+ * Number of supported crypto keys for the soft-se
+ */
+#if ( USE_LRWAN_1_1_X_CRYPTO == 1 )
+#if ( LORAMAC_MAX_MC_CTX > 3 )
+#define NUM_OF_KEYS             23UL
+#elif ( LORAMAC_MAX_MC_CTX > 2 )
+#define NUM_OF_KEYS             20UL
+#elif ( LORAMAC_MAX_MC_CTX > 1 )
+#define NUM_OF_KEYS             17UL
+#else /* LORAMAC_MAX_MC_CTX == 0 */
+#define NUM_OF_KEYS             14UL
+#endif /* LORAMAC_MAX_MC_CTX */
+#else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
+#if ( LORAMAC_MAX_MC_CTX > 3 )
+#define NUM_OF_KEYS             19UL
+#elif ( LORAMAC_MAX_MC_CTX > 2 )
+#define NUM_OF_KEYS             16UL
+#elif ( LORAMAC_MAX_MC_CTX > 1 )
+#define NUM_OF_KEYS             13UL
+#else /* LORAMAC_MAX_MC_CTX == 0 */
+#define NUM_OF_KEYS             10UL
+#endif /* LORAMAC_MAX_MC_CTX */
+#endif /* USE_LRWAN_1_1_X_CRYPTO */
+/* ST_WORKAROUND_END */
+
+/*!
+ * Key structure definition for the soft-se
+ */
+typedef struct sKey
+{
+    /*!
+     * Key identifier
+     */
+    KeyIdentifier_t KeyID;
+    /*!
+     * Key value
+     */
+    uint8_t KeyValue[SE_KEY_SIZE];
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+#else /* LORAWAN_KMS == 1 */
+    /*!
+     * Key object index in the above list
+     */
+    CK_OBJECT_HANDLE Object_Index;
+#endif /* LORAWAN_KMS */
+} Key_t;
+
+typedef struct sSecureElementNvCtx
+{
+    /*!
+     * DevEUI storage
+     */
+    uint8_t DevEui[SE_EUI_SIZE];
+    /*!
+     * Join EUI storage
+     */
+    uint8_t JoinEui[SE_EUI_SIZE];
+    /*!
+     * The key list is required for the soft-se only. All other secure-elements
+     * handle the storage on their own.
+     */
+    Key_t KeyList[NUM_OF_KEYS];
+    /*!
+     * CRC32 value of the SecureElement data structure.
+     */
+    uint32_t Crc32;
+} SecureElementNvmData_t;
+
+
+/*! \} addtogroup SECUREELEMENT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //  __SECURE_ELEMENT_NVM_H__
diff --git a/Middlewares/Third_Party/LoRaWAN/Mac/secure-element.h b/Middlewares/Third_Party/LoRaWAN/Mac/secure-element.h
index d2e81a85..227208fb 100644
--- a/Middlewares/Third_Party/LoRaWAN/Mac/secure-element.h
+++ b/Middlewares/Third_Party/LoRaWAN/Mac/secure-element.h
@@ -35,6 +35,16 @@
  * \{
  *
  */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    secure-element.h
+  * @author  MCD Application Team
+  * @brief   Secure Element driver API
+  ******************************************************************************
+  */
 #ifndef __SECURE_ELEMENT_H__
 #define __SECURE_ELEMENT_H__
 
@@ -45,16 +55,7 @@ extern "C"
 
 #include <stdint.h>
 #include "LoRaMacCrypto.h"
-
-/*!
- * Secure-element keys size in bytes
- */
-#define SE_KEY_SIZE             16
-
-/*!
- * Secure-element EUI size in bytes
- */
-#define SE_EUI_SIZE             8
+#include "secure-element-nvm.h"
 
 /*!
  * Return values.
@@ -95,63 +96,62 @@ typedef enum eSecureElementStatus
     SECURE_ELEMENT_FAIL_ENCRYPT,
 }SecureElementStatus_t;
 
+/* ST_WORKAROUND_BEGIN: Add unique ID callback as input parameter */
 /*!
- * Signature of callback function to be called by the Secure Element driver when the
- * non volatile context have to be stored.
+ * \brief   get the board 64 bits unique ID
  *
+ * \param   [OUT] id unique
  */
-typedef void ( *SecureElementNvmEvent )( void );
-
+typedef void ( *SecureElementGetUniqueId )(uint8_t *id);
+    
 /*!
  * Initialization of Secure Element driver
  *
- * \param[IN]     seNvmCtxChanged           - Callback function which will be called  when the
- *                                            non-volatile context have to be stored.
- * \retval                                  - Status of the operation
- */
-SecureElementStatus_t SecureElementInit( SecureElementNvmEvent seNvmCtxChanged );
-
-/*!
- * Remove previously generated derived keys with "label" from memory 
- *
- * \param[IN]     kms_key_label       - string of char to be searched in the key label
- * \retval                            - Status of the operation
+ * \param[IN]     nvm              - Pointer to the non-volatile memory data
+ *                                   structure.
+ * \param[IN]     seGetUniqueId    - Get unique ID callback
+ * \retval                         - Status of the operation
  */
-SecureElementStatus_t SecureElementDeleteDerivedKeys(uint8_t* kms_key_label);
+SecureElementStatus_t SecureElementInit( SecureElementNvmData_t* nvm, SecureElementGetUniqueId seGetUniqueId );
+/* ST_WORKAROUND_END */
 
+/* ST_WORKAROUND_BEGIN: Add KMS specific functions */
 /*!
- * Restores the internal nvm context from passed pointer.
+ * Gets key item from key list.
  *
- * \param[IN]     seNvmCtx         - Pointer to non-volatile module context to be restored.
- * \retval                         - Status of the operation
+ * \param[IN]  keyID          - Key identifier
+ * \param[OUT] keyItem        - Key item reference
+ * \retval                    - Status of the operation
  */
-SecureElementStatus_t SecureElementRestoreNvmCtx( void* seNvmCtx );
+SecureElementStatus_t SecureElementGetKeyByID( KeyIdentifier_t keyID, Key_t **keyItem );
 
 /*!
- * Returns a pointer to the internal non-volatile context.
+ * Remove previously generated dynamic keys with "label" from memory
  *
- * \param[IN]     seNvmCtxSize    - Size of the module non volatile context
- * \retval                        - Points to a structure where the module store its non volatile context
+ * \param[IN]     keyID               - Key identifier
+ * \param[OUT]    key_label           - string of char to identifying targetKeyID label
+ * \retval                            - Status of the operation
  */
-void* SecureElementGetNvmCtx( size_t* seNvmCtxSize );
+SecureElementStatus_t SecureElementDeleteDynamicKeys( KeyIdentifier_t keyID, uint32_t *key_label );
 
 /*!
- * Sets a key
+ * Sets a the KMS object handler for a given keyID (reserved to Kms)
  *
  * \param[IN]  keyID          - Key identifier
  * \param[IN]  key            - Key value
  * \retval                    - Status of the operation
  */
-SecureElementStatus_t SecureElementSetKey( KeyIdentifier_t keyID, uint8_t* key );
+SecureElementStatus_t SecureElementSetObjHandler( KeyIdentifier_t keyID, uint32_t keyIndex );
+/* ST_WORKAROUND_END */
 
 /*!
- * Sets a the KMS object handler for a given keyID (reserved to Kms)
+ * Sets a key
  *
  * \param[IN]  keyID          - Key identifier
  * \param[IN]  key            - Key value
  * \retval                    - Status of the operation
  */
-SecureElementStatus_t SecureElementSetObjHandler(KeyIdentifier_t keyID, uint32_t keyIndex);
+SecureElementStatus_t SecureElementSetKey( KeyIdentifier_t keyID, uint8_t* key );
 
 /*!
  * Computes a CMAC of a message using provided initial Bx block
@@ -190,13 +190,12 @@ SecureElementStatus_t SecureElementAesEncrypt( uint8_t* buffer, uint16_t size, K
 /*!
  * Derives and store a key
  *
- * \param[IN]  version        - LoRaWAN specification version currently in use.
  * \param[IN]  input          - Input data from which the key is derived ( 16 byte )
  * \param[IN]  rootKeyID      - Key identifier of the root key to use to perform the derivation
  * \param[IN]  targetKeyID    - Key identifier of the key which will be derived
  * \retval                    - Status of the operation
  */
-SecureElementStatus_t SecureElementDeriveAndStoreKey( Version_t version, uint8_t* input, KeyIdentifier_t rootKeyID, KeyIdentifier_t targetKeyID );
+SecureElementStatus_t SecureElementDeriveAndStoreKey( uint8_t* input, KeyIdentifier_t rootKeyID, KeyIdentifier_t targetKeyID );
 
 /*!
  * Process JoinAccept message.
diff --git a/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c b/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c
index 4f51af12..882f1cf0 100644
--- a/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c
+++ b/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c
@@ -1,5 +1,5 @@
 /*!
- * \file      utilities.h
+ * \file      utilities.c
  *
  * \brief     Helper functions implementation
  *
@@ -101,4 +101,62 @@ int8_t Nibble2HexChar( uint8_t a )
         return '?';
     }
 }
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
+uint32_t Crc32( uint8_t *buffer, uint16_t length )
+{
+    // The CRC calculation follows CCITT - 0x04C11DB7
+    const uint32_t reversedPolynom = 0xEDB88320;
+
+    // CRC initial value
+    uint32_t crc = 0xFFFFFFFF;
+
+    if( buffer == NULL )
+    {
+        return 0;
+    }
+
+    for( uint16_t i = 0; i < length; ++i )
+    {
+        crc ^= ( uint32_t )buffer[i];
+        for( uint16_t i = 0; i < 8; i++ )
+        {
+            crc = ( crc >> 1 ) ^ ( reversedPolynom & ~( ( crc & 0x01 ) - 1 ) );
+        }
+    }
+
+    return ~crc;
+}
+
+uint32_t Crc32Init( void )
+{
+    return 0xFFFFFFFF;
+}
+
+uint32_t Crc32Update( uint32_t crcInit, uint8_t *buffer, uint16_t length )
+{
+    // The CRC calculation follows CCITT - 0x04C11DB7
+    const uint32_t reversedPolynom = 0xEDB88320;
+
+    // CRC initial value
+    uint32_t crc = crcInit;
+
+    if( buffer == NULL )
+    {
+        return 0;
+    }
+
+    for( uint16_t i = 0; i < length; ++i )
+    {
+        crc ^= ( uint32_t )buffer[i];
+        for( uint16_t i = 0; i < 8; i++ )
+        {
+            crc = ( crc >> 1 ) ^ ( reversedPolynom & ~( ( crc & 0x01 ) - 1 ) );
+        }
+    }
+    return crc;
+}
+
+uint32_t Crc32Finalize( uint32_t crc )
+{
+    return ~crc;
+}
diff --git a/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.h b/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.h
index 22b29b36..8f4fdedf 100644
--- a/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.h
+++ b/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.h
@@ -27,7 +27,7 @@
   *
   * @file    utilities.h
   * @author  MCD Application Team
-  * @brief   Header for driver utilities.c module
+  * @brief   Helper functions implementation
   ******************************************************************************
   */
 
@@ -36,7 +36,8 @@
 #define __UTILITIES_H__
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -79,6 +80,7 @@ extern "C" {
 #define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #endif
 
+/* ST_WORKAROUND_BEGIN: Add global ceiling div macro */
 /**
   * \brief Calculates ceiling( X / N )
   *
@@ -89,6 +91,7 @@ extern "C" {
 #ifndef DIVC
 #define DIVC( X, N )                ( ( ( X ) + ( N ) - 1 ) / ( N ) )
 #endif
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief Returns 2 raised to the power of n
@@ -168,6 +171,45 @@ void memset1( uint8_t *dst, uint8_t value, uint16_t size );
  */
 int8_t Nibble2HexChar( uint8_t a );
 
+/*!
+ * \brief Computes a CCITT 32 bits CRC
+ *
+ * \param [IN] buffer   Data buffer used to compute the CRC
+ * \param [IN] length   Data buffer length
+ *
+ * \retval crc          The computed buffer of length CRC
+ */
+uint32_t Crc32( uint8_t *buffer, uint16_t length );
+
+/*!
+ * \brief Computes the initial value of the CCITT 32 bits CRC. This function
+ *        can be used with functions \ref Crc32Update and \ref Crc32Finalize.
+ *
+ * \retval crc          Initial crc value.
+ */
+uint32_t Crc32Init( void );
+
+/*!
+ * \brief Updates the value of the crc value.
+ *
+ * \param [IN] crcInit  Previous or initial crc value.
+ * \param [IN] buffer   Data pointer.
+ * \param [IN] length   Length of the data.
+ *
+ * \retval crc          Updated crc value.
+ */
+uint32_t Crc32Update( uint32_t crcInit, uint8_t *buffer, uint16_t length );
+
+/*!
+ * \brief Finalizes the crc value after the calls to \ref Crc32Update.
+ *
+ * \param [IN] crc      Recent crc value.
+ *
+ * \retval crc          Updated crc value.
+ */
+uint32_t Crc32Finalize( uint32_t crc );
+
+/* ST_WORKAROUND: Moved CRITICAL_SECTION_ macro from utilities to *_conf.h header files */
 #ifdef __cplusplus
 }
 #endif
diff --git a/Middlewares/Third_Party/LoRaWAN/readme.md b/Middlewares/Third_Party/LoRaWAN/readme.md
index 695d4d31..fd955b6d 100644
--- a/Middlewares/Third_Party/LoRaWAN/readme.md
+++ b/Middlewares/Third_Party/LoRaWAN/readme.md
@@ -18,25 +18,18 @@
 
 The aim of this project is to show an example of an end-device LoRaWAN stack implementation.
 
-This project has 3 active branches in place.
+This project has 2 active branches in place.
 
 | Branch        | L2 spec       | RP spec   | Tag/Milestone       | Class     | Comments      |
 | ------------- |:-------------:|:---------:|:---------:|:---------:|:--------------|
-| | [1.0.3](https://lora-alliance.org/resource-hub/lorawanr-specification-v103) | [v1.0.3revA](https://www.lora-alliance.org/resource-hub/lorawanr-regional-parameters-v103reva) | [v4.4.4](https://github.com/Lora-net/LoRaMac-node/releases/tag/v4.4.4) | A/B/C | LoRaWAN L2 1.0.3 - **_Released_** |
-| [master](https://github.com/Lora-net/LoRaMac-node/tree/master) | [1.0.3](https://lora-alliance.org/resource-hub/lorawanr-specification-v103) | [v1.0.3revA](https://www.lora-alliance.org/resource-hub/lorawanr-regional-parameters-v103reva) | [M 4.4.5](https://github.com/Lora-net/LoRaMac-node/milestone/7) | A/B/C | LoRaWAN L2 1.0.3 |
-| [develop](https://github.com/Lora-net/LoRaMac-node/tree/develop) | [1.0.4](https://lora-alliance.org/resource-hub) | [2-1.0.1](https://lora-alliance.org/sites/default/files/2020-02/rp_2-1.0.1.pdf) | [M 4.5.0](https://github.com/Lora-net/LoRaMac-node/milestone/5) | A/B/C |  LoRaWAN L2 1.0.4 |
-| [feature/5.0.0](https://github.com/Lora-net/LoRaMac-node/tree/feature/5.0.0) | [1.0.4](https://lora-alliance.org/resource-hub) / [1.1.1](https://lora-alliance.org/resource-hub/lorawanr-specification-v11) | [2-1.0.1](https://lora-alliance.org/sites/default/files/2020-02/rp_2-1.0.1.pdf) | [M 5.0.0](https://github.com/Lora-net/LoRaMac-node/milestone/3) | A/B/C |  LoRaWAN L2 1.0.4 / 1.1.1 |
+| | [1.0.3](https://lora-alliance.org/resource-hub/lorawanr-specification-v103) | [v1.0.3revA](https://www.lora-alliance.org/resource-hub/lorawanr-regional-parameters-v103reva) | [v4.4.7](https://github.com/Lora-net/LoRaMac-node/releases/tag/v4.4.7) | A/B/C | LoRaWAN L2 1.0.3 - **_Released_ (last release based on 1.0.3)** |
+| [master](https://github.com/Lora-net/LoRaMac-node/tree/master) | [1.0.4](https://lora-alliance.org/resource-hub/lorawan-104-specification-package) | [2-1.0.1](https://lora-alliance.org/sites/default/files/2020-02/rp_2-1.0.1.pdf) | [v4.5.0](https://github.com/Lora-net/LoRaMac-node/releases/tag/v4.5.0) | A/B/C |  LoRaWAN L2 1.0.4 |
+| [develop](https://github.com/Lora-net/LoRaMac-node/tree/develop) | [1.0.4](https://lora-alliance.org/resource-hub/lorawan-104-specification-package) / [1.1.1](https://lora-alliance.org/resource-hub/lorawanr-specification-v11) | [2-1.0.1](https://lora-alliance.org/sites/default/files/2020-02/rp_2-1.0.1.pdf) | [M 4.6.0](https://github.com/Lora-net/LoRaMac-node/milestone/3) | A/B/C |  LoRaWAN L2 1.0.4 / 1.1.1 |
 
 This project fully implements ClassA, ClassB and ClassC end-device classes and it also provides SX1272/73, SX1276/77/78/79, SX1261/2 and LR1110 radio drivers.
 
 For each currently supported platform example applications are provided.
 
-* **LoRaMac/classA**: ClassA end-device example application.
-
-* **LoRaMac/classB**: ClassB end-device example application.
-
-* **LoRaMac/classC**: ClassC end-device example application.
-
 * **LoRaMac/fuota-test-01**: FUOTA test scenario 01 end-device example application. (Based on provided application common packages)
 
 * **LoRaMac/periodic-uplink-lpp**: ClassA/B/C end-device example application. Periodically uplinks a frame using the Cayenne LPP protocol. (Based on provided application common packages)
@@ -225,7 +218,7 @@ $ make
         "APPLICATION":"LoRaMac",
 
         // Select LoRaMac sub project. You can choose between:
-        // classA, classB or classC, periodic-uplink-lpp, fuota-test-01.
+        // periodic-uplink-lpp, fuota-test-01.
         "SUB_PROJECT":"periodic-uplink-lpp",
 
         // Switch for Class B support of LoRaMac:
@@ -326,7 +319,7 @@ $ make
         "APPLICATION":"ping-pong",
 
         // Select LoRaMac sub project. You can choose between:
-        // classA, classB or classC, periodic-uplink-lpp, fuota-test-01.
+        // periodic-uplink-lpp, fuota-test-01.
         "SUB_PROJECT":"periodic-uplink-lpp",
 
         // Switch for Class B support of LoRaMac:
diff --git a/Middlewares/Third_Party/LoRaWAN/st_readme.txt b/Middlewares/Third_Party/LoRaWAN/st_readme.txt
index 838a909c..6c422247 100644
--- a/Middlewares/Third_Party/LoRaWAN/st_readme.txt
+++ b/Middlewares/Third_Party/LoRaWAN/st_readme.txt
@@ -20,6 +20,26 @@
  ******************************************************************************
   @endverbatim
 
+### V2.3.0/18-May-2021 ###
+===============================
+   + Implements LoRa Mac from Semtech/StackForce develop branch (18-Jan-2021 commits, version 4.4.7)
+   
+   + SecureElementDeleteDerivedKeys dynamic implementation in using KMS APIs
+   
+   + Cleanup NVM key attributes with KMS default values definition
+   
+   + Printable Keys (Root and derived) with KEY_EXTRACTABLE
+   
+   + Remove GCCv9 compiler warnings
+   
+   + Fix SetAppEUI/SetDevEUI functions
+   
+   + Add LinkCheckReq and DeviceTimeReq support
+   
+   + Fragmentation processing move to application layer
+
+   + Release Notes update
+
 ### V2.2.1/2-Oct-2020 ###
 ===============================
    + Multiple tools write to the same file' if AES + LoRaWAN + option .c/.h
diff --git a/Middlewares/Third_Party/Sigfox/Release_notes.html b/Middlewares/Third_Party/Sigfox/Release_notes.html
deleted file mode 100644
index cd849b01..00000000
--- a/Middlewares/Third_Party/Sigfox/Release_notes.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <title>Release Notes for STM32WLxx Sigfox Middleware</title>
-  <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-  </style>
-  <link rel="stylesheet" href="_htmresc/mini-st.css" />
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-<div class="row">
-<div class="col-sm-12 col-lg-4">
-<div class="card fluid">
-<div class="sectione dark">
-<center>
-<h1 id="release-notes-for-stm32wlxx-sigfox-middleware"><small>Release Notes for</small> STM32WLxx Sigfox Middleware</h1>
-<p>Copyright © 2020 STMicroelectronics<br />
-</p>
-<a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo.png" alt="ST logo" /></a>
-</center>
-</div>
-</div>
-<h1 id="license">License</h1>
-<p>This software component is licensed by ST under Ultimate Liberty license SLA0044, the “License”;</p>
-<p>You may not use this file except in compliance with the License.</p>
-<p>You may obtain a copy of the License at: <a href="http://www.st.com/SLA0044">SLA0044</a></p>
-<p>Sigfox specific license is also applicable at: <a href="./License_Sigfox_library_to_ST_Customers_legal.txt">Sigfox License</a></p>
-<h1 id="purpose">Purpose</h1>
-<p>This Middlewares provides the Sigfox Middleware for the stm32wlxx products. This covers</p>
-<ul>
-<li>STM32WLxx devices</li>
-</ul>
-<p>This driver is composed of 4 directories:</p>
-<ul>
-<li><p>Crypto</p></li>
-<li><p>Monarch</p></li>
-<li><p>SigfoxLib</p></li>
-<li>SigfoxLibTest</li>
-</ul>
-</div>
-<div class="col-sm-12 col-lg-8">
-<h1 id="update-history">Update History</h1>
-<div class="collapse">
-<input type="checkbox" id="collapse-section11" checked aria-hidden="true"> <label for="collapse-section11" aria-hidden="true">V1.6.1 / 2-Oct-2020</label>
-<div>
-<h2 id="main-changes">Main Changes</h2>
-<h3 id="updated-sigfoxlib">Multiple tools write to the same file' if AES + Sigfox + option .c/.h</h3>
-<h3 id="release-notes-update">Release Notes update</h3>
-<h4 id="version-of-embedded-sigfox-libraries">Version of embedded Sigfox libraries:</h4>
-<ul>
-<li>Crypto : V1.0.0</li>
-<li>Monarch: V2.0.0 (STMicroelectronics Patent)</li>
-<li>SigfoxLib: V2.8.1</li>
-<li>SigfoxLibTest: V0.6.0</li>
-</ul>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section10" aria-hidden="true"> <label for="collapse-section10" aria-hidden="true">V1.6.0 / 4-Sept-2020</label>
-<div>
-<h2 id="main-changes">Main Changes</h2>
-<h3 id="updated-sigfoxlib">Updated SigfoxLib</h3>
-<h3 id="release-notes-update">Release Notes update</h3>
-<h4 id="version-of-embedded-sigfox-libraries">Version of embedded Sigfox libraries:</h4>
-<ul>
-<li>Crypto : V1.0.0</li>
-<li>Monarch: V2.0.0 (STMicroelectronics Patent)</li>
-<li>SigfoxLib: V2.8.1 =&gt; NEW</li>
-<li>SigfoxLibTest: V0.6.0</li>
-</ul>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section9" aria-hidden="true"> <label for="collapse-section9" aria-hidden="true">V1.5.0 / 29-June-2020</label>
-<div>
-<h2 id="main-changes-1">Main Changes</h2>
-<h3 id="encrypted_sigfox_data-update-for-kms">encrypted_sigfox_data update for KMS</h3>
-<h3 id="sigfox_api_init-interface-function-definition">SIGFOX_API_init() interface function definition</h3>
-<h3 id="templates-directory-creation">/Templates directory creation</h3>
-<h3 id="release-notes-update-1">Release Notes update</h3>
-<h4 id="version-of-embedded-sigfox-libraries-1">Version of embedded Sigfox libraries:</h4>
-<ul>
-<li>Crypto : V1.0.0</li>
-<li>Monarch: V2.0.0 (STMicroelectronics Patent)</li>
-<li>SigfoxLib: V2.8.0</li>
-<li>SigfoxLibTest: V0.6.0</li>
-</ul>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section8" aria-hidden="true"> <label for="collapse-section8" aria-hidden="true">V1.4.2 / 02-April-2020</label>
-<div>
-<h2 id="main-changes-2">Main Changes</h2>
-<h3 id="release-notes-information-update">Release Notes information update</h3>
-<p><br />
-</p>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section7" aria-hidden="true"> <label for="collapse-section7" aria-hidden="true">V1.4.1 / 01-April-2020</label>
-<div>
-<h2 id="main-changes-3">Main Changes</h2>
-<h3 id="release-notes-formatting-update">Release Notes formatting update</h3>
-<p><br />
-</p>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section6" aria-hidden="true"> <label for="collapse-section6" aria-hidden="true">V1.4.0 / 06-March-2020</label>
-<div>
-<h2 id="main-changes-4">Main Changes</h2>
-<h3 id="all-libraries-eabi-compatible">All libraries: eabi compatible</h3>
-<h3 id="update-sigfox-library-versions-to">Update Sigfox library versions to:</h3>
-<h3 id="sfx_addon_rfp_v0.6.0_se_fdl_mon.a">- SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</h3>
-<h3 id="sfx_lib_v2.8.0_se_fdl_mon.a-rc1-to-rc7-supported">- SFX_LIB_V2.8.0_SE_FDL_MON.a =&gt; RC1 to RC7 supported</h3>
-<h3 id="monarch-library-addition-sgfx-monarch-v2.0.0-stmicroelectronics-patent">Monarch library addition: Sgfx-Monarch-V2.0.0 (STMicroelectronics Patent)</h3>
-<h4 id="version-of-embedded-sigfox-libraries-2">Version of embedded Sigfox libraries:</h4>
-<ul>
-<li>Crypto : V1.0.0</li>
-<li>Monarch: V2.0.0 (STMicroelectronics Patent) =&gt; NEW</li>
-<li>SigfoxLib: V2.8.0 =&gt; NEW</li>
-<li>SigfoxLibTest: V0.6.0 =&gt; NEW</li>
-</ul>
-<p><br />
-</p>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">V1.3.0 / 13-Nov-2019</label>
-<div>
-<h2 id="main-changes-5">Main Changes</h2>
-<h3 id="cleanup-of-licenses">Cleanup of licenses</h3>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true">V1.2.0 / 30-March-2019</label>
-<div>
-<h2 id="main-changes-6">Main Changes</h2>
-<h3 id="middleware-for-stm32cube-solution-including-v2.6.1-sigfox-library">Middleware for STM32Cube solution including v2.6.1 sigfox library</h3>
-<pre><code> merged with Monarch algorithm </code></pre>
-<h4 id="version-of-embedded-sigfox-libraries-3">Version of embedded Sigfox libraries:</h4>
-<ul>
-<li>Crypto : V1.0.0</li>
-<li>SigfoxLib: V2.6.1 =&gt; NEW</li>
-<li>SigfoxLibTest: V0.6.0<br />
-</li>
-</ul>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.1.0 / 30-April-2018 </label>
-<div>
-<h2 id="main-changes-7">Main Changes</h2>
-<h3 id="middleware-for-stm32cube-solution-including-v2.3.1-sigfox-library">Middleware for STM32Cube solution including v2.3.1 sigfox library</h3>
-<h4 id="version-of-embedded-sigfox-libraries-4">Version of embedded Sigfox libraries:</h4>
-<ul>
-<li>Crypto : V1.0.0</li>
-<li>SigfoxLib: V2.3.1 =&gt; NEW</li>
-<li>SigfoxLibTest: V0.6.0<br />
-</li>
-</ul>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.0.0 / 15-December-2017 </label>
-<div>
-<h2 id="main-changes-8">Main Changes</h2>
-<h3 id="middleware-for-stm32cube-solution-including-v2.0.2-sigfox-library">Middleware for STM32Cube solution including v2.0.2 sigfox library</h3>
-<h4 id="version-of-embedded-sigfox-libraries-5">Version of embedded Sigfox libraries:</h4>
-<ul>
-<li>Crypto : V1.0.0</li>
-<li>SigfoxLib: V2.0.2 =&gt; NEW</li>
-<li>SigfoxLibTest: V0.6.0<br />
-</li>
-</ul>
-</div>
-</div>
-<div class="collapse">
-<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V0.0.1 / 01-June-2017 </label>
-<div>
-<h2 id="main-changes-9">Main Changes</h2>
-<h3 id="first-version">First version</h3>
-<h3 id="middleware-for-stm32cube-solution-including-v1.8.9-sigfox-library">Middleware for STM32Cube solution including v1.8.9 sigfox library</h3>
-<h4 id="version-of-embedded-sigfox-libraries-6">Version of embedded Sigfox libraries:</h4>
-<ul>
-<li>Crypto : V1.0.0</li>
-<li>SigfoxLib: V1.8.9 =&gt; NEW</li>
-<li>SigfoxLibTest: V0.6.0<br />
-</li>
-</ul>
-</div>
-</div>
-</div>
-</div>
-<footer class="sticky">
-<p>For complete documentation on STM32, visit: [<a href="http://www.st.com">www.st.com/stm32</a>]</p>
-This release note uses up to date web standards and, for this reason, should not be opened with Internet Explorer but preferably with popular browsers such as Google Chrome, Mozilla Firefox, Opera or Microsoft Edge.
-</footer>
-</body>
-</html>
diff --git a/Middlewares/Third_Party/Sigfox/_htmresc/mini-st.css b/Middlewares/Third_Party/Sigfox/_htmresc/mini-st.css
deleted file mode 100644
index eb41d56c..00000000
--- a/Middlewares/Third_Party/Sigfox/_htmresc/mini-st.css
+++ /dev/null
@@ -1,1700 +0,0 @@
-@charset "UTF-8";
-/*
-  Flavor name: Default (mini-default)
-  Author: Angelos Chalaris (chalarangelo@gmail.com)
-  Maintainers: Angelos Chalaris
-  mini.css version: v3.0.0-alpha.3
-*/
-/*
-  Browsers resets and base typography.
-*/
-/* Core module CSS variable definitions */
-:root {
-  --fore-color: #111;
-  --secondary-fore-color: #444;
-  --back-color: #f8f8f8;
-  --secondary-back-color: #f0f0f0;
-  --blockquote-color: #f57c00;
-  --pre-color: #1565c0;
-  --border-color: #aaa;
-  --secondary-border-color: #ddd;
-  --heading-ratio: 1.19;
-  --universal-margin: 0.5rem;
-  --universal-padding: 0.125rem;
-  --universal-border-radius: 0.125rem;
-  --a-link-color: #0277bd;
-  --a-visited-color: #01579b; }
-
-html {
-  font-size: 14px; }
-
-a, b, del, em, i, ins, q, span, strong, u {
-  font-size: 1em; }
-
-html, * {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Helvetica, sans-serif;
-  line-height: 1.4;
-  -webkit-text-size-adjust: 100%; }
-
-* {
-  font-size: 1rem; }
-
-body {
-  margin: 0;
-  color: var(--fore-color);
-  background: var(--back-color); }
-
-details {
-  display: block; }
-
-summary {
-  display: list-item; }
-
-abbr[title] {
-  border-bottom: none;
-  text-decoration: underline dotted; }
-
-input {
-  overflow: visible; }
-
-img {
-  max-width: 100%;
-  height: auto; }
-
-h1, h2, h3, h4, h5, h6 {
-  line-height: 1.2;
-  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  font-weight: 500; }
-  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-    color: var(--secondary-fore-color);
-    display: block;
-    margin-top: -0.25rem; }
-
-h1 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
-
-h2 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio); );
-  background: var(--mark-back-color);
-  font-weight: 600;
-  padding: 0.1em 0.5em 0.2em 0.5em;
-  color: var(--mark-fore-color); }
-
-h3 {
-  font-size: calc(1rem * var(--heading-ratio));
-  padding-left: calc(2 * var(--universal-margin)); 
-  /* background: var(--border-color); */
-    }
-
-h4 {
-  font-size: 1rem;);
-  padding-left: calc(4 * var(--universal-margin));  }
-
-h5 {
-  font-size: 1rem; }
-
-h6 {
-  font-size: calc(1rem / var(--heading-ratio)); }
-
-p {
-  margin: var(--universal-margin); }
-
-ol, ul {
-  margin: var(--universal-margin);
-  padding-left: calc(6 * var(--universal-margin)); }
-
-b, strong {
-  font-weight: 700; }
-
-hr {
-  box-sizing: content-box;
-  border: 0;
-  line-height: 1.25em;
-  margin: var(--universal-margin);
-  height: 0.0625rem;
-  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
-
-blockquote {
-  display: block;
-  position: relative;
-  font-style: italic;
-  color: var(--secondary-fore-color);
-  margin: var(--universal-margin);
-  padding: calc(3 * var(--universal-padding));
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.375rem solid var(--blockquote-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-  blockquote:before {
-    position: absolute;
-    top: calc(0rem - var(--universal-padding));
-    left: 0;
-    font-family: sans-serif;
-    font-size: 3rem;
-    font-weight: 700;
-    content: "\201c";
-    color: var(--blockquote-color); }
-  blockquote[cite]:after {
-    font-style: normal;
-    font-size: 0.75em;
-    font-weight: 700;
-    content: "\a—  " attr(cite);
-    white-space: pre; }
-
-code, kbd, pre, samp {
-  font-family: Menlo, Consolas, monospace;
-  font-size: 0.85em; }
-
-code {
-  background: var(--secondary-back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-kbd {
-  background: var(--fore-color);
-  color: var(--back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-pre {
-  overflow: auto;
-  background: var(--secondary-back-color);
-  padding: calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.25rem solid var(--pre-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-
-sup, sub, code, kbd {
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
-small, sup, sub, figcaption {
-  font-size: 0.75em; }
-
-sup {
-  top: -0.5em; }
-
-sub {
-  bottom: -0.25em; }
-
-figure {
-  margin: var(--universal-margin); }
-
-figcaption {
-  color: var(--secondary-fore-color); }
-
-a {
-  text-decoration: none; }
-  a:link {
-    color: var(--a-link-color); }
-  a:visited {
-    color: var(--a-visited-color); }
-  a:hover, a:focus {
-    text-decoration: underline; }
-
-/*
-  Definitions for the grid system, cards and containers.
-*/
-.container {
-  margin: 0 auto;
-  padding: 0 calc(1.5 * var(--universal-padding)); }
-
-.row {
-  box-sizing: border-box;
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap; }
-
-.col-sm,
-[class^='col-sm-'],
-[class^='col-sm-offset-'],
-.row[class*='cols-sm-'] > * {
-  box-sizing: border-box;
-  flex: 0 0 auto;
-  padding: 0 calc(var(--universal-padding) / 2); }
-
-.col-sm,
-.row.cols-sm > * {
-  max-width: 100%;
-  flex-grow: 1;
-  flex-basis: 0; }
-
-.col-sm-1,
-.row.cols-sm-1 > * {
-  max-width: 8.3333333333%;
-  flex-basis: 8.3333333333%; }
-
-.col-sm-offset-0 {
-  margin-left: 0; }
-
-.col-sm-2,
-.row.cols-sm-2 > * {
-  max-width: 16.6666666667%;
-  flex-basis: 16.6666666667%; }
-
-.col-sm-offset-1 {
-  margin-left: 8.3333333333%; }
-
-.col-sm-3,
-.row.cols-sm-3 > * {
-  max-width: 25%;
-  flex-basis: 25%; }
-
-.col-sm-offset-2 {
-  margin-left: 16.6666666667%; }
-
-.col-sm-4,
-.row.cols-sm-4 > * {
-  max-width: 33.3333333333%;
-  flex-basis: 33.3333333333%; }
-
-.col-sm-offset-3 {
-  margin-left: 25%; }
-
-.col-sm-5,
-.row.cols-sm-5 > * {
-  max-width: 41.6666666667%;
-  flex-basis: 41.6666666667%; }
-
-.col-sm-offset-4 {
-  margin-left: 33.3333333333%; }
-
-.col-sm-6,
-.row.cols-sm-6 > * {
-  max-width: 50%;
-  flex-basis: 50%; }
-
-.col-sm-offset-5 {
-  margin-left: 41.6666666667%; }
-
-.col-sm-7,
-.row.cols-sm-7 > * {
-  max-width: 58.3333333333%;
-  flex-basis: 58.3333333333%; }
-
-.col-sm-offset-6 {
-  margin-left: 50%; }
-
-.col-sm-8,
-.row.cols-sm-8 > * {
-  max-width: 66.6666666667%;
-  flex-basis: 66.6666666667%; }
-
-.col-sm-offset-7 {
-  margin-left: 58.3333333333%; }
-
-.col-sm-9,
-.row.cols-sm-9 > * {
-  max-width: 75%;
-  flex-basis: 75%; }
-
-.col-sm-offset-8 {
-  margin-left: 66.6666666667%; }
-
-.col-sm-10,
-.row.cols-sm-10 > * {
-  max-width: 83.3333333333%;
-  flex-basis: 83.3333333333%; }
-
-.col-sm-offset-9 {
-  margin-left: 75%; }
-
-.col-sm-11,
-.row.cols-sm-11 > * {
-  max-width: 91.6666666667%;
-  flex-basis: 91.6666666667%; }
-
-.col-sm-offset-10 {
-  margin-left: 83.3333333333%; }
-
-.col-sm-12,
-.row.cols-sm-12 > * {
-  max-width: 100%;
-  flex-basis: 100%; }
-
-.col-sm-offset-11 {
-  margin-left: 91.6666666667%; }
-
-.col-sm-normal {
-  order: initial; }
-
-.col-sm-first {
-  order: -999; }
-
-.col-sm-last {
-  order: 999; }
-
-@media screen and (min-width: 500px) {
-  .col-md,
-  [class^='col-md-'],
-  [class^='col-md-offset-'],
-  .row[class*='cols-md-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-md,
-  .row.cols-md > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-md-1,
-  .row.cols-md-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-md-offset-0 {
-    margin-left: 0; }
-
-  .col-md-2,
-  .row.cols-md-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-md-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-md-3,
-  .row.cols-md-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-md-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-md-4,
-  .row.cols-md-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-md-offset-3 {
-    margin-left: 25%; }
-
-  .col-md-5,
-  .row.cols-md-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-md-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-md-6,
-  .row.cols-md-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-md-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-md-7,
-  .row.cols-md-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-md-offset-6 {
-    margin-left: 50%; }
-
-  .col-md-8,
-  .row.cols-md-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-md-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-md-9,
-  .row.cols-md-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-md-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-md-10,
-  .row.cols-md-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-md-offset-9 {
-    margin-left: 75%; }
-
-  .col-md-11,
-  .row.cols-md-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-md-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-md-12,
-  .row.cols-md-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-md-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-md-normal {
-    order: initial; }
-
-  .col-md-first {
-    order: -999; }
-
-  .col-md-last {
-    order: 999; } }
-@media screen and (min-width: 1280px) {
-  .col-lg,
-  [class^='col-lg-'],
-  [class^='col-lg-offset-'],
-  .row[class*='cols-lg-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-lg,
-  .row.cols-lg > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-lg-1,
-  .row.cols-lg-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-lg-offset-0 {
-    margin-left: 0; }
-
-  .col-lg-2,
-  .row.cols-lg-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-lg-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-lg-3,
-  .row.cols-lg-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-lg-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-lg-4,
-  .row.cols-lg-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-lg-offset-3 {
-    margin-left: 25%; }
-
-  .col-lg-5,
-  .row.cols-lg-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-lg-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-lg-6,
-  .row.cols-lg-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-lg-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-lg-7,
-  .row.cols-lg-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-lg-offset-6 {
-    margin-left: 50%; }
-
-  .col-lg-8,
-  .row.cols-lg-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-lg-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-lg-9,
-  .row.cols-lg-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-lg-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-lg-10,
-  .row.cols-lg-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-lg-offset-9 {
-    margin-left: 75%; }
-
-  .col-lg-11,
-  .row.cols-lg-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-lg-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-lg-12,
-  .row.cols-lg-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-lg-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-lg-normal {
-    order: initial; }
-
-  .col-lg-first {
-    order: -999; }
-
-  .col-lg-last {
-    order: 999; } }
-/* Card component CSS variable definitions */
-:root {
-  --card-back-color: #f8f8f8;
-  --card-fore-color: #111;
-  --card-border-color: #ddd; }
-
-.card {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-self: center;
-  position: relative;
-  width: 100%;
-  background: var(--card-back-color);
-  color: var(--card-fore-color);
-  border: 0.0625rem solid var(--card-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  overflow: hidden; }
-  @media screen and (min-width: 320px) {
-    .card {
-      max-width: 320px; } }
-  .card > .sectione {
-    background: var(--card-back-color);
-    color: var(--card-fore-color);
-    box-sizing: border-box;
-    margin: 0;
-    border: 0;
-    border-radius: 0;
-    border-bottom: 0.0625rem solid var(--card-border-color);
-    padding: var(--universal-padding);
-    width: 100%; }
-    .card > .sectione.media {
-      height: 200px;
-      padding: 0;
-      -o-object-fit: cover;
-      object-fit: cover; }
-  .card > .sectione:last-child {
-    border-bottom: 0; }
-
-/*
-  Custom elements for card elements.
-*/
-@media screen and (min-width: 240px) {
-  .card.small {
-    max-width: 240px; } }
-@media screen and (min-width: 480px) {
-  .card.large {
-    max-width: 480px; } }
-.card.fluid {
-  max-width: 100%;
-  width: auto; }
-
-.card.warning {
-/*  --card-back-color: #ffca28; */
-  --card-back-color: #e5b8b7;
-  --card-border-color: #e8b825; }
-
-.card.error {
-  --card-back-color: #b71c1c;
-  --card-fore-color: #f8f8f8;
-  --card-border-color: #a71a1a; }
-
-.card > .sectione.dark {
-  --card-back-color: #e0e0e0; }
-
-.card > .sectione.double-padded {
-  padding: calc(1.5 * var(--universal-padding)); }
-
-/*
-  Definitions for forms and input elements.
-*/
-/* Input_control module CSS variable definitions */
-:root {
-  --form-back-color: #f0f0f0;
-  --form-fore-color: #111;
-  --form-border-color: #ddd;
-  --input-back-color: #f8f8f8;
-  --input-fore-color: #111;
-  --input-border-color: #ddd;
-  --input-focus-color: #0288d1;
-  --input-invalid-color: #d32f2f;
-  --button-back-color: #e2e2e2;
-  --button-hover-back-color: #dcdcdc;
-  --button-fore-color: #212121;
-  --button-border-color: transparent;
-  --button-hover-border-color: transparent;
-  --button-group-border-color: rgba(124, 124, 124, 0.54); }
-
-form {
-  background: var(--form-back-color);
-  color: var(--form-fore-color);
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
-
-fieldset {
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 4);
-  padding: var(--universal-padding); }
-
-legend {
-  box-sizing: border-box;
-  display: table;
-  max-width: 100%;
-  white-space: normal;
-  font-weight: 700;
-  padding: calc(var(--universal-padding) / 2); }
-
-label {
-  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-.input-group {
-  display: inline-block; }
-  .input-group.fluid {
-    display: flex;
-    align-items: center;
-    justify-content: center; }
-    .input-group.fluid > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-    @media screen and (max-width: 499px) {
-      .input-group.fluid {
-        align-items: stretch;
-        flex-direction: column; } }
-  .input-group.vertical {
-    display: flex;
-    align-items: stretch;
-    flex-direction: column; }
-    .input-group.vertical > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-
-[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
-  height: auto; }
-
-[type="search"] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px; }
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
-
-input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
-[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
-  box-sizing: border-box;
-  background: var(--input-back-color);
-  color: var(--input-fore-color);
-  border: 0.0625rem solid var(--input-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 2);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
-  border-color: var(--input-focus-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
-  border-color: var(--input-invalid-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
-  background: var(--secondary-back-color); }
-
-select {
-  max-width: 100%; }
-
-option {
-  overflow: hidden;
-  text-overflow: ellipsis; }
-
-[type="checkbox"], [type="radio"] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  position: relative;
-  height: calc(1rem + var(--universal-padding) / 2);
-  width: calc(1rem + var(--universal-padding) / 2);
-  vertical-align: text-bottom;
-  padding: 0;
-  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
-  flex-grow: 0 !important; }
-  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
-    position: absolute; }
-
-[type="checkbox"]:checked:before {
-  content: '\2713';
-  font-family: sans-serif;
-  font-size: calc(1rem + var(--universal-padding) / 2);
-  top: calc(0rem - var(--universal-padding));
-  left: calc(var(--universal-padding) / 4); }
-
-[type="radio"] {
-  border-radius: 100%; }
-  [type="radio"]:checked:before {
-    border-radius: 100%;
-    content: '';
-    top: calc(0.0625rem + var(--universal-padding) / 2);
-    left: calc(0.0625rem + var(--universal-padding) / 2);
-    background: var(--input-fore-color);
-    width: 0.5rem;
-    height: 0.5rem; }
-
-:placeholder-shown {
-  color: var(--input-fore-color); }
-
-::-ms-placeholder {
-  color: var(--input-fore-color);
-  opacity: 0.54; }
-
-button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-button, html [type="button"], [type="reset"], [type="submit"] {
-  -webkit-appearance: button; }
-
-button {
-  overflow: visible;
-  text-transform: none; }
-
-button, [type="button"], [type="submit"], [type="reset"],
-a.button, label.button, .button,
-a[role="button"], label[role="button"], [role="button"] {
-  display: inline-block;
-  background: var(--button-back-color);
-  color: var(--button-fore-color);
-  border: 0.0625rem solid var(--button-border-color);
-  border-radius: var(--universal-border-radius);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  text-decoration: none;
-  cursor: pointer;
-  transition: background 0.3s; }
-  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
-  a.button:hover,
-  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
-  a[role="button"]:hover,
-  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
-    background: var(--button-hover-back-color);
-    border-color: var(--button-hover-border-color); }
-
-input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
-  cursor: not-allowed;
-  opacity: 0.75; }
-
-.button-group {
-  display: flex;
-  border: 0.0625rem solid var(--button-group-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
-    margin: 0;
-    max-width: 100%;
-    flex: 1 1 auto;
-    text-align: center;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none; }
-  .button-group > :not(:first-child) {
-    border-left: 0.0625rem solid var(--button-group-border-color); }
-  @media screen and (max-width: 499px) {
-    .button-group {
-      flex-direction: column; }
-      .button-group > :not(:first-child) {
-        border: 0;
-        border-top: 0.0625rem solid var(--button-group-border-color); } }
-
-/*
-  Custom elements for forms and input elements.
-*/
-button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
-  --button-back-color: #1976d2;
-  --button-fore-color: #f8f8f8; }
-  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
-    --button-hover-back-color: #1565c0; }
-
-button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
-  --button-back-color: #d32f2f;
-  --button-fore-color: #f8f8f8; }
-  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
-    --button-hover-back-color: #c62828; }
-
-button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
-  --button-back-color: #308732;
-  --button-fore-color: #f8f8f8; }
-  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
-    --button-hover-back-color: #277529; }
-
-button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
-  --button-back-color: #212121;
-  --button-fore-color: #f8f8f8; }
-  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
-    --button-hover-back-color: #111; }
-
-button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
-  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
-  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-/*
-  Definitions for navigation elements.
-*/
-/* Navigation module CSS variable definitions */
-:root {
-  --header-back-color: #f8f8f8;
-  --header-hover-back-color: #f0f0f0;
-  --header-fore-color: #444;
-  --header-border-color: #ddd;
-  --nav-back-color: #f8f8f8;
-  --nav-hover-back-color: #f0f0f0;
-  --nav-fore-color: #444;
-  --nav-border-color: #ddd;
-  --nav-link-color: #0277bd;
-  --footer-fore-color: #444;
-  --footer-back-color: #f8f8f8;
-  --footer-border-color: #ddd;
-  --footer-link-color: #0277bd;
-  --drawer-back-color: #f8f8f8;
-  --drawer-hover-back-color: #f0f0f0;
-  --drawer-border-color: #ddd;
-  --drawer-close-color: #444; }
-
-header {
-  height: 3.1875rem;
-  background: var(--header-back-color);
-  color: var(--header-fore-color);
-  border-bottom: 0.0625rem solid var(--header-border-color);
-  padding: calc(var(--universal-padding) / 4) 0;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden; }
-  header.row {
-    box-sizing: content-box; }
-  header .logo {
-    color: var(--header-fore-color);
-    font-size: 1.75rem;
-    padding: var(--universal-padding) calc(2 * var(--universal-padding));
-    text-decoration: none; }
-  header button, header [type="button"], header .button, header [role="button"] {
-    box-sizing: border-box;
-    position: relative;
-    top: calc(0rem - var(--universal-padding) / 4);
-    height: calc(3.1875rem + var(--universal-padding) / 2);
-    background: var(--header-back-color);
-    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
-    text-align: center;
-    color: var(--header-fore-color);
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-    text-transform: uppercase; }
-    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
-      background: var(--header-hover-back-color); }
-
-nav {
-  background: var(--nav-back-color);
-  color: var(--nav-fore-color);
-  border: 0.0625rem solid var(--nav-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  nav * {
-    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-  nav a, nav a:visited {
-    display: block;
-    color: var(--nav-link-color);
-    border-radius: var(--universal-border-radius);
-    transition: background 0.3s; }
-    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
-      text-decoration: none;
-      background: var(--nav-hover-back-color); }
-  nav .sublink-1 {
-    position: relative;
-    margin-left: calc(2 * var(--universal-padding)); }
-    nav .sublink-1:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-  nav .sublink-2 {
-    position: relative;
-    margin-left: calc(4 * var(--universal-padding)); }
-    nav .sublink-2:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-
-footer {
-  background: var(--footer-back-color);
-  color: var(--footer-fore-color);
-  border-top: 0.0625rem solid var(--footer-border-color);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
-  font-size: 0.875rem; }
-  footer a, footer a:visited {
-    color: var(--footer-link-color); }
-
-header.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  top: 0; }
-
-footer.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  bottom: 0; }
-
-.drawer-toggle:before {
-  display: inline-block;
-  position: relative;
-  vertical-align: bottom;
-  content: '\00a0\2261\00a0';
-  font-family: sans-serif;
-  font-size: 1.5em; }
-@media screen and (min-width: 500px) {
-  .drawer-toggle:not(.persistent) {
-    display: none; } }
-
-[type="checkbox"].drawer {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].drawer + * {
-    display: block;
-    box-sizing: border-box;
-    position: fixed;
-    top: 0;
-    width: 320px;
-    height: 100vh;
-    overflow-y: auto;
-    background: var(--drawer-back-color);
-    border: 0.0625rem solid var(--drawer-border-color);
-    border-radius: 0;
-    margin: 0;
-    z-index: 1110;
-    right: -320px;
-    transition: right 0.3s; }
-    [type="checkbox"].drawer + * .drawer-close {
-      position: absolute;
-      top: var(--universal-margin);
-      right: var(--universal-margin);
-      z-index: 1111;
-      width: 2rem;
-      height: 2rem;
-      border-radius: var(--universal-border-radius);
-      padding: var(--universal-padding);
-      margin: 0;
-      cursor: pointer;
-      transition: background 0.3s; }
-      [type="checkbox"].drawer + * .drawer-close:before {
-        display: block;
-        content: '\00D7';
-        color: var(--drawer-close-color);
-        position: relative;
-        font-family: sans-serif;
-        font-size: 2rem;
-        line-height: 1;
-        text-align: center; }
-      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
-        background: var(--drawer-hover-back-color); }
-    @media screen and (max-width: 320px) {
-      [type="checkbox"].drawer + * {
-        width: 100%; } }
-  [type="checkbox"].drawer:checked + * {
-    right: 0; }
-  @media screen and (min-width: 500px) {
-    [type="checkbox"].drawer:not(.persistent) + * {
-      position: static;
-      height: 100%;
-      z-index: 1100; }
-      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
-        display: none; } }
-
-/*
-  Definitions for the responsive table component.
-*/
-/* Table module CSS variable definitions. */
-:root {
-  --table-border-color: #aaa;
-  --table-border-separator-color: #666;
-  --table-head-back-color: #e6e6e6;
-  --table-head-fore-color: #111;
-  --table-body-back-color: #f8f8f8;
-  --table-body-fore-color: #111;
-  --table-body-alt-back-color: #eee; }
-
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  : margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap;
-  padding: var(--universal-padding);
-  padding-top: 0;
-	margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);	}
-  table caption {
-    font-size: 1.25 * rem;
-    margin: calc(2 * var(--universal-margin)) 0;
-    max-width: 100%;
-    flex: 0 0 100%;
-		text-align: left;}
-  table thead, table tbody {
-    display: flex;
-    flex-flow: row wrap;
-    border: 0.0625rem solid var(--table-border-color); }
-  table thead {
-    z-index: 999;
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
-    border-bottom: 0.0625rem solid var(--table-border-separator-color); }
-  table tbody {
-    border-top: 0;
-    margin-top: calc(0 - var(--universal-margin));
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  table tr {
-    display: flex;
-    padding: 0; }
-  table th, table td {
-    padding: calc(0.5 * var(--universal-padding));
-		font-size: 0.9rem; }
-  table th {
-    text-align: left;
-    background: var(--table-head-back-color);
-    color: var(--table-head-fore-color); }
-  table td {
-    background: var(--table-body-back-color);
-    color: var(--table-body-fore-color);
-    border-top: 0.0625rem solid var(--table-border-color); }
-
-table:not(.horizontal) {
-  overflow: auto;
-  max-height: 850px; }
-  table:not(.horizontal) thead, table:not(.horizontal) tbody {
-    max-width: 100%;
-    flex: 0 0 100%; }
-  table:not(.horizontal) tr {
-    flex-flow: row wrap;
-    flex: 0 0 100%; }
-  table:not(.horizontal) th, table:not(.horizontal) td {
-    flex: 1 0 0%;
-    overflow: hidden;
-    text-overflow: ellipsis; }
-  table:not(.horizontal) thead {
-    position: sticky;
-    top: 0; }
-  table:not(.horizontal) tbody tr:first-child td {
-    border-top: 0; }
-
-table.horizontal {
-  border: 0; }
-  table.horizontal thead, table.horizontal tbody {
-    border: 0;
-    flex-flow: row nowrap; }
-  table.horizontal tbody {
-    overflow: auto;
-    justify-content: space-between;
-    flex: 1 0 0;
-    margin-left: calc( 4 * var(--universal-margin));
-    padding-bottom: calc(var(--universal-padding) / 4); }
-  table.horizontal tr {
-    flex-direction: column;
-    flex: 1 0 auto; }
-  table.horizontal th, table.horizontal td {
-    width: 100%;
-    border: 0;
-    border-bottom: 0.0625rem solid var(--table-border-color); }
-    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
-      border-top: 0; }
-  table.horizontal th {
-    text-align: right;
-    border-left: 0.0625rem solid var(--table-border-color);
-    border-right: 0.0625rem solid var(--table-border-separator-color); }
-  table.horizontal thead tr:first-child {
-    padding-left: 0; }
-  table.horizontal th:first-child, table.horizontal td:first-child {
-    border-top: 0.0625rem solid var(--table-border-color); }
-  table.horizontal tbody tr:last-child td {
-    border-right: 0.0625rem solid var(--table-border-color); }
-    table.horizontal tbody tr:last-child td:first-child {
-      border-top-right-radius: 0.25rem; }
-    table.horizontal tbody tr:last-child td:last-child {
-      border-bottom-right-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:first-child {
-    border-top-left-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:last-child {
-    border-bottom-left-radius: 0.25rem; }
-
-@media screen and (max-width: 499px) {
-  table, table.horizontal {
-    border-collapse: collapse;
-    border: 0;
-    width: 100%;
-    display: table; }
-    table thead, table th, table.horizontal thead, table.horizontal th {
-      border: 0;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      padding: 0;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%); }
-    table tbody, table.horizontal tbody {
-      border: 0;
-      display: table-row-group; }
-    table tr, table.horizontal tr {
-      display: block;
-      border: 0.0625rem solid var(--table-border-color);
-      border-radius: var(--universal-border-radius);
-      background: #fafafa;
-      padding: var(--universal-padding);
-      margin: var(--universal-margin);
-      margin-bottom: calc(2 * var(--universal-margin)); }
-    table th, table td, table.horizontal th, table.horizontal td {
-      width: auto; }
-    table td, table.horizontal td {
-      display: block;
-      border: 0;
-      text-align: right; }
-    table td:before, table.horizontal td:before {
-      content: attr(data-label);
-      float: left;
-      font-weight: 600; }
-    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
-      border-top: 0; }
-    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
-      border-right: 0; } }
-:root {
-  --table-body-alt-back-color: #eee; }
-
-table tr:nth-of-type(2n) > td {
-  background: var(--table-body-alt-back-color); }
-
-@media screen and (max-width: 500px) {
-  table tr:nth-of-type(2n) {
-    background: var(--table-body-alt-back-color); } }
-:root {
-  --table-body-hover-back-color: #90caf9; }
-
-table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-  background: var(--table-body-hover-back-color); }
-
-@media screen and (max-width: 500px) {
-  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-    background: var(--table-body-hover-back-color); } }
-/*
-  Definitions for contextual background elements, toasts and tooltips.
-*/
-/* Contextual module CSS variable definitions */
-:root {
-  --mark-back-color: #0277bd;
-  --mark-fore-color: #fafafa; }
-
-mark {
-  background: var(--mark-back-color);
-  color: var(--mark-fore-color);
-  font-size: 0.95em;
-  line-height: 1em;
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-  mark.inline-block {
-    display: inline-block;
-    font-size: 1em;
-    line-height: 1.5;
-    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-:root {
-  --toast-back-color: #424242;
-  --toast-fore-color: #fafafa; }
-
-.toast {
-  position: fixed;
-  bottom: calc(var(--universal-margin) * 3);
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1111;
-  color: var(--toast-fore-color);
-  background: var(--toast-back-color);
-  border-radius: calc(var(--universal-border-radius) * 16);
-  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
-
-:root {
-  --tooltip-back-color: #212121;
-  --tooltip-fore-color: #fafafa; }
-
-.tooltip {
-  position: relative;
-  display: inline-block; }
-  .tooltip:before, .tooltip:after {
-    position: absolute;
-    opacity: 0;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%);
-    transition: all 0.3s;
-    z-index: 1010;
-    left: 50%; }
-  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
-    bottom: 75%; }
-  .tooltip.bottom:before, .tooltip.bottom:after {
-    top: 75%; }
-  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
-    opacity: 1;
-    clip: auto;
-    -webkit-clip-path: inset(0%);
-    clip-path: inset(0%); }
-  .tooltip:before {
-    content: '';
-    background: transparent;
-    border: var(--universal-margin) solid transparent;
-    left: calc(50% - var(--universal-margin)); }
-  .tooltip:not(.bottom):before {
-    border-top-color: #212121; }
-  .tooltip.bottom:before {
-    border-bottom-color: #212121; }
-  .tooltip:after {
-    content: attr(aria-label);
-    color: var(--tooltip-fore-color);
-    background: var(--tooltip-back-color);
-    border-radius: var(--universal-border-radius);
-    padding: var(--universal-padding);
-    white-space: nowrap;
-    transform: translateX(-50%); }
-  .tooltip:not(.bottom):after {
-    margin-bottom: calc(2 * var(--universal-margin)); }
-  .tooltip.bottom:after {
-    margin-top: calc(2 * var(--universal-margin)); }
-
-:root {
-  --modal-overlay-color: rgba(0, 0, 0, 0.45);
-  --modal-close-color: #444;
-  --modal-close-hover-color: #f0f0f0; }
-
-[type="checkbox"].modal {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].modal + div {
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: none;
-    width: 100vw;
-    height: 100vh;
-    background: var(--modal-overlay-color); }
-    [type="checkbox"].modal + div .card {
-      margin: 0 auto;
-      max-height: 50vh;
-      overflow: auto; }
-      [type="checkbox"].modal + div .card .modal-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 1.75rem;
-        height: 1.75rem;
-        border-radius: var(--universal-border-radius);
-        padding: var(--universal-padding);
-        margin: 0;
-        cursor: pointer;
-        transition: background 0.3s; }
-        [type="checkbox"].modal + div .card .modal-close:before {
-          display: block;
-          content: '\00D7';
-          color: var(--modal-close-color);
-          position: relative;
-          font-family: sans-serif;
-          font-size: 1.75rem;
-          line-height: 1;
-          text-align: center; }
-        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
-          background: var(--modal-close-hover-color); }
-  [type="checkbox"].modal:checked + div {
-    display: flex;
-    flex: 0 1 auto;
-    z-index: 1200; }
-    [type="checkbox"].modal:checked + div .card .modal-close {
-      z-index: 1211; }
-
-:root {
-  --collapse-label-back-color: #e8e8e8;
-  --collapse-label-fore-color: #212121;
-  --collapse-label-hover-back-color: #f0f0f0;
-  --collapse-selected-label-back-color: #ececec;
-  --collapse-border-color: #ddd;
-  --collapse-content-back-color: #fafafa;
-  --collapse-selected-label-border-color: #0277bd; }
-
-.collapse {
-  width: calc(100% - 2 * var(--universal-margin));
-  opacity: 1;
-  display: flex;
-  flex-direction: column;
-  margin: var(--universal-margin);
-  border-radius: var(--universal-border-radius); }
-  .collapse > [type="radio"], .collapse > [type="checkbox"] {
-    height: 1px;
-    width: 1px;
-    margin: -1px;
-    overflow: hidden;
-    position: absolute;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%); }
-  .collapse > label {
-    flex-grow: 1;
-    display: inline-block;
-    height: 1.5rem;
-    cursor: pointer;
-    transition: background 0.3s;
-    color: var(--collapse-label-fore-color);
-    background: var(--collapse-label-back-color);
-    border: 0.0625rem solid var(--collapse-border-color);
-    padding: calc(1.5 * var(--universal-padding)); }
-    .collapse > label:hover, .collapse > label:focus {
-      background: var(--collapse-label-hover-back-color); }
-    .collapse > label + div {
-      flex-basis: auto;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%);
-      transition: max-height 0.3s;
-      max-height: 1px; }
-  .collapse > :checked + label {
-    background: var(--collapse-selected-label-back-color);
-    border-bottom-color: var(--collapse-selected-label-border-color); }
-    .collapse > :checked + label + div {
-      box-sizing: border-box;
-      position: relative;
-      width: 100%;
-      height: auto;
-      overflow: auto;
-      margin: 0;
-      background: var(--collapse-content-back-color);
-      border: 0.0625rem solid var(--collapse-border-color);
-      border-top: 0;
-      padding: var(--universal-padding);
-      clip: auto;
-      -webkit-clip-path: inset(0%);
-      clip-path: inset(0%);
-      max-height: 850px; }
-  .collapse > label:not(:first-of-type) {
-    border-top: 0; }
-  .collapse > label:first-of-type {
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
-  .collapse > label:last-of-type:not(:first-of-type) {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  .collapse > label:last-of-type:first-of-type {
-    border-radius: var(--universal-border-radius); }
-  .collapse > :checked:last-of-type:not(:first-of-type) + label {
-    border-radius: 0; }
-  .collapse > :checked:last-of-type + label + div {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-
-/*
-  Custom elements for contextual background elements, toasts and tooltips.
-*/
-mark.secondary {
-  --mark-back-color: #d32f2f; }
-
-mark.tertiary {
-  --mark-back-color: #308732; }
-
-mark.tag {
-  padding: calc(var(--universal-padding)/2) var(--universal-padding);
-  border-radius: 1em; }
-
-/*
-  Definitions for progress elements and spinners.
-*/
-/* Progress module CSS variable definitions */
-:root {
-  --progress-back-color: #ddd;
-  --progress-fore-color: #555; }
-
-progress {
-  display: block;
-  vertical-align: baseline;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  height: 0.75rem;
-  width: calc(100% - 2 * var(--universal-margin));
-  margin: var(--universal-margin);
-  border: 0;
-  border-radius: calc(2 * var(--universal-border-radius));
-  background: var(--progress-back-color);
-  color: var(--progress-fore-color); }
-  progress::-webkit-progress-value {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress::-webkit-progress-bar {
-    background: var(--progress-back-color); }
-  progress::-moz-progress-bar {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-webkit-progress-value {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-moz-progress-bar {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress.inline {
-    display: inline-block;
-    vertical-align: middle;
-    width: 60%; }
-
-:root {
-  --spinner-back-color: #ddd;
-  --spinner-fore-color: #555; }
-
-@keyframes spinner-donut-anim {
-  0% {
-    transform: rotate(0deg); }
-  100% {
-    transform: rotate(360deg); } }
-.spinner {
-  display: inline-block;
-  margin: var(--universal-margin);
-  border: 0.25rem solid var(--spinner-back-color);
-  border-left: 0.25rem solid var(--spinner-fore-color);
-  border-radius: 50%;
-  width: 1.25rem;
-  height: 1.25rem;
-  animation: spinner-donut-anim 1.2s linear infinite; }
-
-/*
-  Custom elements for progress bars and spinners.
-*/
-progress.primary {
-  --progress-fore-color: #1976d2; }
-
-progress.secondary {
-  --progress-fore-color: #d32f2f; }
-
-progress.tertiary {
-  --progress-fore-color: #308732; }
-
-.spinner.primary {
-  --spinner-fore-color: #1976d2; }
-
-.spinner.secondary {
-  --spinner-fore-color: #d32f2f; }
-
-.spinner.tertiary {
-  --spinner-fore-color: #308732; }
-
-/*
-  Definitions for icons - powered by Feather (https://feathericons.com/).
-*/
-span[class^='icon-'] {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  vertical-align: -0.125em;
-  background-size: contain;
-  margin: 0 calc(var(--universal-margin) / 4); }
-  span[class^='icon-'].secondary {
-    -webkit-filter: invert(25%);
-    filter: invert(25%); }
-  span[class^='icon-'].inverse {
-    -webkit-filter: invert(100%);
-    filter: invert(100%); }
-
-span.icon-alert {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-bookmark {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-calendar {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-credit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-edit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
-span.icon-link {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-help {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-home {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-info {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-lock {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-mail {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-location {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-phone {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-rss {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-search {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-settings {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-share {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-cart {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-upload {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-user {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
-
-/*
-  Definitions for utilities and helper classes.
-*/
-/* Utility module CSS variable definitions */
-:root {
-  --generic-border-color: rgba(0, 0, 0, 0.3);
-  --generic-box-shadow: 0 0.25rem 0.25rem 0 rgba(0, 0, 0, 0.125), 0 0.125rem 0.125rem -0.125rem rgba(0, 0, 0, 0.25); }
-
-.hidden {
-  display: none !important; }
-
-.visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  margin: -1px !important;
-  border: 0 !important;
-  padding: 0 !important;
-  clip: rect(0 0 0 0) !important;
-  -webkit-clip-path: inset(100%) !important;
-  clip-path: inset(100%) !important;
-  overflow: hidden !important; }
-
-.bordered {
-  border: 0.0625rem solid var(--generic-border-color) !important; }
-
-.rounded {
-  border-radius: var(--universal-border-radius) !important; }
-
-.circular {
-  border-radius: 50% !important; }
-
-.shadowed {
-  box-shadow: var(--generic-box-shadow) !important; }
-
-.responsive-margin {
-  margin: calc(var(--universal-margin) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-margin {
-      margin: calc(var(--universal-margin) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-margin {
-      margin: var(--universal-margin) !important; } }
-
-.responsive-padding {
-  padding: calc(var(--universal-padding) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-padding {
-      padding: calc(var(--universal-padding) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-padding {
-      padding: var(--universal-padding) !important; } }
-
-@media screen and (max-width: 499px) {
-  .hidden-sm {
-    display: none !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .hidden-md {
-    display: none !important; } }
-@media screen and (min-width: 1280px) {
-  .hidden-lg {
-    display: none !important; } }
-@media screen and (max-width: 499px) {
-  .visually-hidden-sm {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .visually-hidden-md {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 1280px) {
-  .visually-hidden-lg {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-
-/*# sourceMappingURL=mini-default.css.map */
diff --git a/Middlewares/Third_Party/Sigfox/_htmresc/st_logo.png b/Middlewares/Third_Party/Sigfox/_htmresc/st_logo.png
deleted file mode 100644
index 8b80057f..00000000
Binary files a/Middlewares/Third_Party/Sigfox/_htmresc/st_logo.png and /dev/null differ
diff --git a/Middlewares/Third_Party/SubGHz_Phy/LICENSE.txt b/Middlewares/Third_Party/SubGHz_Phy/LICENSE.txt
deleted file mode 100644
index d6dfb1b8..00000000
--- a/Middlewares/Third_Party/SubGHz_Phy/LICENSE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- Revised BSD License ---
-Copyright (c) 2013, SEMTECH S.A.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Semtech corporation nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Middlewares/Third_Party/SubGHz_Phy/Release_notes.html b/Middlewares/Third_Party/SubGHz_Phy/Release_notes.html
index 24a00d81..1f9eda44 100644
--- a/Middlewares/Third_Party/SubGHz_Phy/Release_notes.html
+++ b/Middlewares/Third_Party/SubGHz_Phy/Release_notes.html
@@ -11,26 +11,24 @@
       span.underline{text-decoration: underline;}
       div.column{display: inline-block; vertical-align: top; width: 50%;}
   </style>
-  <link rel="stylesheet" href="_htmresc/mini-st.css" />
+  <link rel="stylesheet" href="../../../_htmresc/mini-st_2020.css" />
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
+  <link rel="icon" type="image/x-icon" href="../../../_htmresc/favicon.png" />
 </head>
 <body>
 <div class="row">
 <div class="col-sm-12 col-lg-4">
-<div class="card fluid">
-<div class="sectione dark">
 <center>
 <h1 id="release-notes-for-stm32wlxx-subghz-physical-layer-middleware"><small>Release Notes for</small> STM32WLxx SubGHz Physical Layer Middleware</h1>
-<p>Copyright © 2020 STMicroelectronics<br />
+<p>Copyright © 2021 STMicroelectronics<br />
 </p>
-<a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo.png" alt="ST logo" /></a>
+<a href="https://www.st.com" class="logo"><img src="../../../_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
-</div>
-</div>
 <h1 id="license">License</h1>
-<p>This software component is licensed by ST under BSD 3-Clause, the “License”; You may not use this component except in compliance with the License. You may obtain a copy of the License at: <a href="https://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause</a></p>
+<p>Licensed by ST under BSD 3-Clause license (the "License"). You may not use this component except in compliance with the License. You may obtain a copy of the License at:</p>
+<p><a href="https://opensource.org/licenses/BSD-3-Clause">https://opensource.org/licenses/BSD-3-Clause</a></p>
 <h1 id="purpose">Purpose</h1>
 <p>This Middlewares provides the SubGHz Physical Layer for the stm32wlxx products. This covers</p>
 <ul>
@@ -41,10 +39,31 @@ <h1 id="purpose">Purpose</h1>
 <div class="col-sm-12 col-lg-8">
 <h1 id="update-history">Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section1" checked aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">v1.0.0 / 21-Oct-2020</label>
+<input type="checkbox" id="collapse-section2" checked aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">v1.1.0 / 29-Apr-2021</label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
-<h3 id="first-release-1">First release</h3>
+<h3 id="fix-smps-drive-level-init">fix: SMPS drive level init</h3>
+<h3 id="fix-generic_bpsk-in-radiosettxgenericconfig-function-test-mode">fix: GENERIC_BPSK in RadioSetTxGenericConfig function (test mode)</h3>
+<h3 id="fix-modem_bpsk-is-not-handled-in-radiosetmodem-in-radio.c">fix: MODEM_BPSK is not handled in RadioSetModem in radio.c</h3>
+<h3 id="feature-add-cfo-calculation">feature: add cfo calculation</h3>
+<h3 id="fix-reduce-interrupt-scope-to-minimize-privilege-stack-code-execution">fix: reduce interrupt scope to minimize privilege stack code execution</h3>
+<h3 id="featureadd-long-packet-in-radio_fw">feature:add long packet in radio_fw</h3>
+<h3 id="feature-support-ibm-whitening-by-firmware-radio_fw">feature: Support IBM whitening by firmware radio_fw</h3>
+<h3 id="fix-channel-activity-detection-antenna-switch-set-in-rx-mode">fix: Channel Activity Detection: antenna switch set in rx mode</h3>
+<h3 id="fix-deadlock-of-wl-rf-driver">fix: Deadlock of WL RF driver</h3>
+<h3 id="fix-pingpong-rxerrors-when-sf12-bw500-cr-48">fix: PingPong RxErrors when SF12, BW500, CR 4/8</h3>
+<h3 id="feature-move-getfskbandwidthregvalue-in-radio-driver">feature: move GetFskBandwidthRegValue in radio_driver</h3>
+<h3 id="fix-incorrect-lora-per-results">fix: Incorrect LoRa PER Results</h3>
+<h3 id="feature-align-to-lorawan-semtech-stack-v4.4.7-integration---radio-part">feature: align to LoRaWAN Semtech stack v4.4.7 integration - Radio Part</h3>
+<p><br />
+</p>
+</div>
+</div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">v1.0.0 / 21-Oct-2020</label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<h3 id="first-release">First Release</h3>
 <p><br />
 </p>
 </div>
@@ -52,7 +71,7 @@ <h3 id="first-release-1">First release</h3>
 </div>
 </div>
 <footer class="sticky">
-<p>For complete documentation on STM32, visit: [<a href="http://www.st.com">www.st.com/stm32</a>]</p>
+<p>For complete documentation on STM32, visit: [<a href="http://www.st.com/stm32">www.st.com/stm32</a>]</p>
 This release note uses up to date web standards and, for this reason, should not be opened with Internet Explorer but preferably with popular browsers such as Google Chrome, Mozilla Firefox, Opera or Microsoft Edge.
 </footer>
 </body>
diff --git a/Middlewares/Third_Party/SubGHz_Phy/_htmresc/mini-st.css b/Middlewares/Third_Party/SubGHz_Phy/_htmresc/mini-st.css
deleted file mode 100644
index eb41d56c..00000000
--- a/Middlewares/Third_Party/SubGHz_Phy/_htmresc/mini-st.css
+++ /dev/null
@@ -1,1700 +0,0 @@
-@charset "UTF-8";
-/*
-  Flavor name: Default (mini-default)
-  Author: Angelos Chalaris (chalarangelo@gmail.com)
-  Maintainers: Angelos Chalaris
-  mini.css version: v3.0.0-alpha.3
-*/
-/*
-  Browsers resets and base typography.
-*/
-/* Core module CSS variable definitions */
-:root {
-  --fore-color: #111;
-  --secondary-fore-color: #444;
-  --back-color: #f8f8f8;
-  --secondary-back-color: #f0f0f0;
-  --blockquote-color: #f57c00;
-  --pre-color: #1565c0;
-  --border-color: #aaa;
-  --secondary-border-color: #ddd;
-  --heading-ratio: 1.19;
-  --universal-margin: 0.5rem;
-  --universal-padding: 0.125rem;
-  --universal-border-radius: 0.125rem;
-  --a-link-color: #0277bd;
-  --a-visited-color: #01579b; }
-
-html {
-  font-size: 14px; }
-
-a, b, del, em, i, ins, q, span, strong, u {
-  font-size: 1em; }
-
-html, * {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", Helvetica, sans-serif;
-  line-height: 1.4;
-  -webkit-text-size-adjust: 100%; }
-
-* {
-  font-size: 1rem; }
-
-body {
-  margin: 0;
-  color: var(--fore-color);
-  background: var(--back-color); }
-
-details {
-  display: block; }
-
-summary {
-  display: list-item; }
-
-abbr[title] {
-  border-bottom: none;
-  text-decoration: underline dotted; }
-
-input {
-  overflow: visible; }
-
-img {
-  max-width: 100%;
-  height: auto; }
-
-h1, h2, h3, h4, h5, h6 {
-  line-height: 1.2;
-  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  font-weight: 500; }
-  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-    color: var(--secondary-fore-color);
-    display: block;
-    margin-top: -0.25rem; }
-
-h1 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
-
-h2 {
-  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio); );
-  background: var(--mark-back-color);
-  font-weight: 600;
-  padding: 0.1em 0.5em 0.2em 0.5em;
-  color: var(--mark-fore-color); }
-
-h3 {
-  font-size: calc(1rem * var(--heading-ratio));
-  padding-left: calc(2 * var(--universal-margin)); 
-  /* background: var(--border-color); */
-    }
-
-h4 {
-  font-size: 1rem;);
-  padding-left: calc(4 * var(--universal-margin));  }
-
-h5 {
-  font-size: 1rem; }
-
-h6 {
-  font-size: calc(1rem / var(--heading-ratio)); }
-
-p {
-  margin: var(--universal-margin); }
-
-ol, ul {
-  margin: var(--universal-margin);
-  padding-left: calc(6 * var(--universal-margin)); }
-
-b, strong {
-  font-weight: 700; }
-
-hr {
-  box-sizing: content-box;
-  border: 0;
-  line-height: 1.25em;
-  margin: var(--universal-margin);
-  height: 0.0625rem;
-  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
-
-blockquote {
-  display: block;
-  position: relative;
-  font-style: italic;
-  color: var(--secondary-fore-color);
-  margin: var(--universal-margin);
-  padding: calc(3 * var(--universal-padding));
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.375rem solid var(--blockquote-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-  blockquote:before {
-    position: absolute;
-    top: calc(0rem - var(--universal-padding));
-    left: 0;
-    font-family: sans-serif;
-    font-size: 3rem;
-    font-weight: 700;
-    content: "\201c";
-    color: var(--blockquote-color); }
-  blockquote[cite]:after {
-    font-style: normal;
-    font-size: 0.75em;
-    font-weight: 700;
-    content: "\a—  " attr(cite);
-    white-space: pre; }
-
-code, kbd, pre, samp {
-  font-family: Menlo, Consolas, monospace;
-  font-size: 0.85em; }
-
-code {
-  background: var(--secondary-back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-kbd {
-  background: var(--fore-color);
-  color: var(--back-color);
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-
-pre {
-  overflow: auto;
-  background: var(--secondary-back-color);
-  padding: calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  border: 0.0625rem solid var(--secondary-border-color);
-  border-left: 0.25rem solid var(--pre-color);
-  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
-
-sup, sub, code, kbd {
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
-small, sup, sub, figcaption {
-  font-size: 0.75em; }
-
-sup {
-  top: -0.5em; }
-
-sub {
-  bottom: -0.25em; }
-
-figure {
-  margin: var(--universal-margin); }
-
-figcaption {
-  color: var(--secondary-fore-color); }
-
-a {
-  text-decoration: none; }
-  a:link {
-    color: var(--a-link-color); }
-  a:visited {
-    color: var(--a-visited-color); }
-  a:hover, a:focus {
-    text-decoration: underline; }
-
-/*
-  Definitions for the grid system, cards and containers.
-*/
-.container {
-  margin: 0 auto;
-  padding: 0 calc(1.5 * var(--universal-padding)); }
-
-.row {
-  box-sizing: border-box;
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap; }
-
-.col-sm,
-[class^='col-sm-'],
-[class^='col-sm-offset-'],
-.row[class*='cols-sm-'] > * {
-  box-sizing: border-box;
-  flex: 0 0 auto;
-  padding: 0 calc(var(--universal-padding) / 2); }
-
-.col-sm,
-.row.cols-sm > * {
-  max-width: 100%;
-  flex-grow: 1;
-  flex-basis: 0; }
-
-.col-sm-1,
-.row.cols-sm-1 > * {
-  max-width: 8.3333333333%;
-  flex-basis: 8.3333333333%; }
-
-.col-sm-offset-0 {
-  margin-left: 0; }
-
-.col-sm-2,
-.row.cols-sm-2 > * {
-  max-width: 16.6666666667%;
-  flex-basis: 16.6666666667%; }
-
-.col-sm-offset-1 {
-  margin-left: 8.3333333333%; }
-
-.col-sm-3,
-.row.cols-sm-3 > * {
-  max-width: 25%;
-  flex-basis: 25%; }
-
-.col-sm-offset-2 {
-  margin-left: 16.6666666667%; }
-
-.col-sm-4,
-.row.cols-sm-4 > * {
-  max-width: 33.3333333333%;
-  flex-basis: 33.3333333333%; }
-
-.col-sm-offset-3 {
-  margin-left: 25%; }
-
-.col-sm-5,
-.row.cols-sm-5 > * {
-  max-width: 41.6666666667%;
-  flex-basis: 41.6666666667%; }
-
-.col-sm-offset-4 {
-  margin-left: 33.3333333333%; }
-
-.col-sm-6,
-.row.cols-sm-6 > * {
-  max-width: 50%;
-  flex-basis: 50%; }
-
-.col-sm-offset-5 {
-  margin-left: 41.6666666667%; }
-
-.col-sm-7,
-.row.cols-sm-7 > * {
-  max-width: 58.3333333333%;
-  flex-basis: 58.3333333333%; }
-
-.col-sm-offset-6 {
-  margin-left: 50%; }
-
-.col-sm-8,
-.row.cols-sm-8 > * {
-  max-width: 66.6666666667%;
-  flex-basis: 66.6666666667%; }
-
-.col-sm-offset-7 {
-  margin-left: 58.3333333333%; }
-
-.col-sm-9,
-.row.cols-sm-9 > * {
-  max-width: 75%;
-  flex-basis: 75%; }
-
-.col-sm-offset-8 {
-  margin-left: 66.6666666667%; }
-
-.col-sm-10,
-.row.cols-sm-10 > * {
-  max-width: 83.3333333333%;
-  flex-basis: 83.3333333333%; }
-
-.col-sm-offset-9 {
-  margin-left: 75%; }
-
-.col-sm-11,
-.row.cols-sm-11 > * {
-  max-width: 91.6666666667%;
-  flex-basis: 91.6666666667%; }
-
-.col-sm-offset-10 {
-  margin-left: 83.3333333333%; }
-
-.col-sm-12,
-.row.cols-sm-12 > * {
-  max-width: 100%;
-  flex-basis: 100%; }
-
-.col-sm-offset-11 {
-  margin-left: 91.6666666667%; }
-
-.col-sm-normal {
-  order: initial; }
-
-.col-sm-first {
-  order: -999; }
-
-.col-sm-last {
-  order: 999; }
-
-@media screen and (min-width: 500px) {
-  .col-md,
-  [class^='col-md-'],
-  [class^='col-md-offset-'],
-  .row[class*='cols-md-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-md,
-  .row.cols-md > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-md-1,
-  .row.cols-md-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-md-offset-0 {
-    margin-left: 0; }
-
-  .col-md-2,
-  .row.cols-md-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-md-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-md-3,
-  .row.cols-md-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-md-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-md-4,
-  .row.cols-md-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-md-offset-3 {
-    margin-left: 25%; }
-
-  .col-md-5,
-  .row.cols-md-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-md-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-md-6,
-  .row.cols-md-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-md-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-md-7,
-  .row.cols-md-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-md-offset-6 {
-    margin-left: 50%; }
-
-  .col-md-8,
-  .row.cols-md-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-md-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-md-9,
-  .row.cols-md-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-md-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-md-10,
-  .row.cols-md-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-md-offset-9 {
-    margin-left: 75%; }
-
-  .col-md-11,
-  .row.cols-md-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-md-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-md-12,
-  .row.cols-md-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-md-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-md-normal {
-    order: initial; }
-
-  .col-md-first {
-    order: -999; }
-
-  .col-md-last {
-    order: 999; } }
-@media screen and (min-width: 1280px) {
-  .col-lg,
-  [class^='col-lg-'],
-  [class^='col-lg-offset-'],
-  .row[class*='cols-lg-'] > * {
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    padding: 0 calc(var(--universal-padding) / 2); }
-
-  .col-lg,
-  .row.cols-lg > * {
-    max-width: 100%;
-    flex-grow: 1;
-    flex-basis: 0; }
-
-  .col-lg-1,
-  .row.cols-lg-1 > * {
-    max-width: 8.3333333333%;
-    flex-basis: 8.3333333333%; }
-
-  .col-lg-offset-0 {
-    margin-left: 0; }
-
-  .col-lg-2,
-  .row.cols-lg-2 > * {
-    max-width: 16.6666666667%;
-    flex-basis: 16.6666666667%; }
-
-  .col-lg-offset-1 {
-    margin-left: 8.3333333333%; }
-
-  .col-lg-3,
-  .row.cols-lg-3 > * {
-    max-width: 25%;
-    flex-basis: 25%; }
-
-  .col-lg-offset-2 {
-    margin-left: 16.6666666667%; }
-
-  .col-lg-4,
-  .row.cols-lg-4 > * {
-    max-width: 33.3333333333%;
-    flex-basis: 33.3333333333%; }
-
-  .col-lg-offset-3 {
-    margin-left: 25%; }
-
-  .col-lg-5,
-  .row.cols-lg-5 > * {
-    max-width: 41.6666666667%;
-    flex-basis: 41.6666666667%; }
-
-  .col-lg-offset-4 {
-    margin-left: 33.3333333333%; }
-
-  .col-lg-6,
-  .row.cols-lg-6 > * {
-    max-width: 50%;
-    flex-basis: 50%; }
-
-  .col-lg-offset-5 {
-    margin-left: 41.6666666667%; }
-
-  .col-lg-7,
-  .row.cols-lg-7 > * {
-    max-width: 58.3333333333%;
-    flex-basis: 58.3333333333%; }
-
-  .col-lg-offset-6 {
-    margin-left: 50%; }
-
-  .col-lg-8,
-  .row.cols-lg-8 > * {
-    max-width: 66.6666666667%;
-    flex-basis: 66.6666666667%; }
-
-  .col-lg-offset-7 {
-    margin-left: 58.3333333333%; }
-
-  .col-lg-9,
-  .row.cols-lg-9 > * {
-    max-width: 75%;
-    flex-basis: 75%; }
-
-  .col-lg-offset-8 {
-    margin-left: 66.6666666667%; }
-
-  .col-lg-10,
-  .row.cols-lg-10 > * {
-    max-width: 83.3333333333%;
-    flex-basis: 83.3333333333%; }
-
-  .col-lg-offset-9 {
-    margin-left: 75%; }
-
-  .col-lg-11,
-  .row.cols-lg-11 > * {
-    max-width: 91.6666666667%;
-    flex-basis: 91.6666666667%; }
-
-  .col-lg-offset-10 {
-    margin-left: 83.3333333333%; }
-
-  .col-lg-12,
-  .row.cols-lg-12 > * {
-    max-width: 100%;
-    flex-basis: 100%; }
-
-  .col-lg-offset-11 {
-    margin-left: 91.6666666667%; }
-
-  .col-lg-normal {
-    order: initial; }
-
-  .col-lg-first {
-    order: -999; }
-
-  .col-lg-last {
-    order: 999; } }
-/* Card component CSS variable definitions */
-:root {
-  --card-back-color: #f8f8f8;
-  --card-fore-color: #111;
-  --card-border-color: #ddd; }
-
-.card {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-self: center;
-  position: relative;
-  width: 100%;
-  background: var(--card-back-color);
-  color: var(--card-fore-color);
-  border: 0.0625rem solid var(--card-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  overflow: hidden; }
-  @media screen and (min-width: 320px) {
-    .card {
-      max-width: 320px; } }
-  .card > .sectione {
-    background: var(--card-back-color);
-    color: var(--card-fore-color);
-    box-sizing: border-box;
-    margin: 0;
-    border: 0;
-    border-radius: 0;
-    border-bottom: 0.0625rem solid var(--card-border-color);
-    padding: var(--universal-padding);
-    width: 100%; }
-    .card > .sectione.media {
-      height: 200px;
-      padding: 0;
-      -o-object-fit: cover;
-      object-fit: cover; }
-  .card > .sectione:last-child {
-    border-bottom: 0; }
-
-/*
-  Custom elements for card elements.
-*/
-@media screen and (min-width: 240px) {
-  .card.small {
-    max-width: 240px; } }
-@media screen and (min-width: 480px) {
-  .card.large {
-    max-width: 480px; } }
-.card.fluid {
-  max-width: 100%;
-  width: auto; }
-
-.card.warning {
-/*  --card-back-color: #ffca28; */
-  --card-back-color: #e5b8b7;
-  --card-border-color: #e8b825; }
-
-.card.error {
-  --card-back-color: #b71c1c;
-  --card-fore-color: #f8f8f8;
-  --card-border-color: #a71a1a; }
-
-.card > .sectione.dark {
-  --card-back-color: #e0e0e0; }
-
-.card > .sectione.double-padded {
-  padding: calc(1.5 * var(--universal-padding)); }
-
-/*
-  Definitions for forms and input elements.
-*/
-/* Input_control module CSS variable definitions */
-:root {
-  --form-back-color: #f0f0f0;
-  --form-fore-color: #111;
-  --form-border-color: #ddd;
-  --input-back-color: #f8f8f8;
-  --input-fore-color: #111;
-  --input-border-color: #ddd;
-  --input-focus-color: #0288d1;
-  --input-invalid-color: #d32f2f;
-  --button-back-color: #e2e2e2;
-  --button-hover-back-color: #dcdcdc;
-  --button-fore-color: #212121;
-  --button-border-color: transparent;
-  --button-hover-border-color: transparent;
-  --button-group-border-color: rgba(124, 124, 124, 0.54); }
-
-form {
-  background: var(--form-back-color);
-  color: var(--form-fore-color);
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
-
-fieldset {
-  border: 0.0625rem solid var(--form-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 4);
-  padding: var(--universal-padding); }
-
-legend {
-  box-sizing: border-box;
-  display: table;
-  max-width: 100%;
-  white-space: normal;
-  font-weight: 700;
-  padding: calc(var(--universal-padding) / 2); }
-
-label {
-  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-.input-group {
-  display: inline-block; }
-  .input-group.fluid {
-    display: flex;
-    align-items: center;
-    justify-content: center; }
-    .input-group.fluid > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-    @media screen and (max-width: 499px) {
-      .input-group.fluid {
-        align-items: stretch;
-        flex-direction: column; } }
-  .input-group.vertical {
-    display: flex;
-    align-items: stretch;
-    flex-direction: column; }
-    .input-group.vertical > input {
-      max-width: 100%;
-      flex-grow: 1;
-      flex-basis: 0px; }
-
-[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
-  height: auto; }
-
-[type="search"] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px; }
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
-
-input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
-[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
-  box-sizing: border-box;
-  background: var(--input-back-color);
-  color: var(--input-fore-color);
-  border: 0.0625rem solid var(--input-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: calc(var(--universal-margin) / 2);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
-  border-color: var(--input-focus-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
-  border-color: var(--input-invalid-color);
-  box-shadow: none; }
-input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
-  background: var(--secondary-back-color); }
-
-select {
-  max-width: 100%; }
-
-option {
-  overflow: hidden;
-  text-overflow: ellipsis; }
-
-[type="checkbox"], [type="radio"] {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  position: relative;
-  height: calc(1rem + var(--universal-padding) / 2);
-  width: calc(1rem + var(--universal-padding) / 2);
-  vertical-align: text-bottom;
-  padding: 0;
-  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
-  flex-grow: 0 !important; }
-  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
-    position: absolute; }
-
-[type="checkbox"]:checked:before {
-  content: '\2713';
-  font-family: sans-serif;
-  font-size: calc(1rem + var(--universal-padding) / 2);
-  top: calc(0rem - var(--universal-padding));
-  left: calc(var(--universal-padding) / 4); }
-
-[type="radio"] {
-  border-radius: 100%; }
-  [type="radio"]:checked:before {
-    border-radius: 100%;
-    content: '';
-    top: calc(0.0625rem + var(--universal-padding) / 2);
-    left: calc(0.0625rem + var(--universal-padding) / 2);
-    background: var(--input-fore-color);
-    width: 0.5rem;
-    height: 0.5rem; }
-
-:placeholder-shown {
-  color: var(--input-fore-color); }
-
-::-ms-placeholder {
-  color: var(--input-fore-color);
-  opacity: 0.54; }
-
-button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0; }
-
-button, html [type="button"], [type="reset"], [type="submit"] {
-  -webkit-appearance: button; }
-
-button {
-  overflow: visible;
-  text-transform: none; }
-
-button, [type="button"], [type="submit"], [type="reset"],
-a.button, label.button, .button,
-a[role="button"], label[role="button"], [role="button"] {
-  display: inline-block;
-  background: var(--button-back-color);
-  color: var(--button-fore-color);
-  border: 0.0625rem solid var(--button-border-color);
-  border-radius: var(--universal-border-radius);
-  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
-  margin: var(--universal-margin);
-  text-decoration: none;
-  cursor: pointer;
-  transition: background 0.3s; }
-  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
-  a.button:hover,
-  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
-  a[role="button"]:hover,
-  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
-    background: var(--button-hover-back-color);
-    border-color: var(--button-hover-border-color); }
-
-input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
-  cursor: not-allowed;
-  opacity: 0.75; }
-
-.button-group {
-  display: flex;
-  border: 0.0625rem solid var(--button-group-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
-    margin: 0;
-    max-width: 100%;
-    flex: 1 1 auto;
-    text-align: center;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none; }
-  .button-group > :not(:first-child) {
-    border-left: 0.0625rem solid var(--button-group-border-color); }
-  @media screen and (max-width: 499px) {
-    .button-group {
-      flex-direction: column; }
-      .button-group > :not(:first-child) {
-        border: 0;
-        border-top: 0.0625rem solid var(--button-group-border-color); } }
-
-/*
-  Custom elements for forms and input elements.
-*/
-button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
-  --button-back-color: #1976d2;
-  --button-fore-color: #f8f8f8; }
-  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
-    --button-hover-back-color: #1565c0; }
-
-button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
-  --button-back-color: #d32f2f;
-  --button-fore-color: #f8f8f8; }
-  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
-    --button-hover-back-color: #c62828; }
-
-button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
-  --button-back-color: #308732;
-  --button-fore-color: #f8f8f8; }
-  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
-    --button-hover-back-color: #277529; }
-
-button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
-  --button-back-color: #212121;
-  --button-fore-color: #f8f8f8; }
-  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
-    --button-hover-back-color: #111; }
-
-button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
-  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
-  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
-  margin: var(--universal-margin); }
-
-/*
-  Definitions for navigation elements.
-*/
-/* Navigation module CSS variable definitions */
-:root {
-  --header-back-color: #f8f8f8;
-  --header-hover-back-color: #f0f0f0;
-  --header-fore-color: #444;
-  --header-border-color: #ddd;
-  --nav-back-color: #f8f8f8;
-  --nav-hover-back-color: #f0f0f0;
-  --nav-fore-color: #444;
-  --nav-border-color: #ddd;
-  --nav-link-color: #0277bd;
-  --footer-fore-color: #444;
-  --footer-back-color: #f8f8f8;
-  --footer-border-color: #ddd;
-  --footer-link-color: #0277bd;
-  --drawer-back-color: #f8f8f8;
-  --drawer-hover-back-color: #f0f0f0;
-  --drawer-border-color: #ddd;
-  --drawer-close-color: #444; }
-
-header {
-  height: 3.1875rem;
-  background: var(--header-back-color);
-  color: var(--header-fore-color);
-  border-bottom: 0.0625rem solid var(--header-border-color);
-  padding: calc(var(--universal-padding) / 4) 0;
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden; }
-  header.row {
-    box-sizing: content-box; }
-  header .logo {
-    color: var(--header-fore-color);
-    font-size: 1.75rem;
-    padding: var(--universal-padding) calc(2 * var(--universal-padding));
-    text-decoration: none; }
-  header button, header [type="button"], header .button, header [role="button"] {
-    box-sizing: border-box;
-    position: relative;
-    top: calc(0rem - var(--universal-padding) / 4);
-    height: calc(3.1875rem + var(--universal-padding) / 2);
-    background: var(--header-back-color);
-    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
-    text-align: center;
-    color: var(--header-fore-color);
-    border: 0;
-    border-radius: 0;
-    margin: 0;
-    text-transform: uppercase; }
-    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
-      background: var(--header-hover-back-color); }
-
-nav {
-  background: var(--nav-back-color);
-  color: var(--nav-fore-color);
-  border: 0.0625rem solid var(--nav-border-color);
-  border-radius: var(--universal-border-radius);
-  margin: var(--universal-margin); }
-  nav * {
-    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
-  nav a, nav a:visited {
-    display: block;
-    color: var(--nav-link-color);
-    border-radius: var(--universal-border-radius);
-    transition: background 0.3s; }
-    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
-      text-decoration: none;
-      background: var(--nav-hover-back-color); }
-  nav .sublink-1 {
-    position: relative;
-    margin-left: calc(2 * var(--universal-padding)); }
-    nav .sublink-1:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-  nav .sublink-2 {
-    position: relative;
-    margin-left: calc(4 * var(--universal-padding)); }
-    nav .sublink-2:before {
-      position: absolute;
-      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
-      top: -0.0625rem;
-      content: '';
-      height: 100%;
-      border: 0.0625rem solid var(--nav-border-color);
-      border-left: 0; }
-
-footer {
-  background: var(--footer-back-color);
-  color: var(--footer-fore-color);
-  border-top: 0.0625rem solid var(--footer-border-color);
-  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
-  font-size: 0.875rem; }
-  footer a, footer a:visited {
-    color: var(--footer-link-color); }
-
-header.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  top: 0; }
-
-footer.sticky {
-  position: -webkit-sticky;
-  position: sticky;
-  z-index: 1101;
-  bottom: 0; }
-
-.drawer-toggle:before {
-  display: inline-block;
-  position: relative;
-  vertical-align: bottom;
-  content: '\00a0\2261\00a0';
-  font-family: sans-serif;
-  font-size: 1.5em; }
-@media screen and (min-width: 500px) {
-  .drawer-toggle:not(.persistent) {
-    display: none; } }
-
-[type="checkbox"].drawer {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].drawer + * {
-    display: block;
-    box-sizing: border-box;
-    position: fixed;
-    top: 0;
-    width: 320px;
-    height: 100vh;
-    overflow-y: auto;
-    background: var(--drawer-back-color);
-    border: 0.0625rem solid var(--drawer-border-color);
-    border-radius: 0;
-    margin: 0;
-    z-index: 1110;
-    right: -320px;
-    transition: right 0.3s; }
-    [type="checkbox"].drawer + * .drawer-close {
-      position: absolute;
-      top: var(--universal-margin);
-      right: var(--universal-margin);
-      z-index: 1111;
-      width: 2rem;
-      height: 2rem;
-      border-radius: var(--universal-border-radius);
-      padding: var(--universal-padding);
-      margin: 0;
-      cursor: pointer;
-      transition: background 0.3s; }
-      [type="checkbox"].drawer + * .drawer-close:before {
-        display: block;
-        content: '\00D7';
-        color: var(--drawer-close-color);
-        position: relative;
-        font-family: sans-serif;
-        font-size: 2rem;
-        line-height: 1;
-        text-align: center; }
-      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
-        background: var(--drawer-hover-back-color); }
-    @media screen and (max-width: 320px) {
-      [type="checkbox"].drawer + * {
-        width: 100%; } }
-  [type="checkbox"].drawer:checked + * {
-    right: 0; }
-  @media screen and (min-width: 500px) {
-    [type="checkbox"].drawer:not(.persistent) + * {
-      position: static;
-      height: 100%;
-      z-index: 1100; }
-      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
-        display: none; } }
-
-/*
-  Definitions for the responsive table component.
-*/
-/* Table module CSS variable definitions. */
-:root {
-  --table-border-color: #aaa;
-  --table-border-separator-color: #666;
-  --table-head-back-color: #e6e6e6;
-  --table-head-fore-color: #111;
-  --table-body-back-color: #f8f8f8;
-  --table-body-fore-color: #111;
-  --table-body-alt-back-color: #eee; }
-
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  : margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
-  display: flex;
-  flex: 0 1 auto;
-  flex-flow: row wrap;
-  padding: var(--universal-padding);
-  padding-top: 0;
-	margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);	}
-  table caption {
-    font-size: 1.25 * rem;
-    margin: calc(2 * var(--universal-margin)) 0;
-    max-width: 100%;
-    flex: 0 0 100%;
-		text-align: left;}
-  table thead, table tbody {
-    display: flex;
-    flex-flow: row wrap;
-    border: 0.0625rem solid var(--table-border-color); }
-  table thead {
-    z-index: 999;
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
-    border-bottom: 0.0625rem solid var(--table-border-separator-color); }
-  table tbody {
-    border-top: 0;
-    margin-top: calc(0 - var(--universal-margin));
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  table tr {
-    display: flex;
-    padding: 0; }
-  table th, table td {
-    padding: calc(0.5 * var(--universal-padding));
-		font-size: 0.9rem; }
-  table th {
-    text-align: left;
-    background: var(--table-head-back-color);
-    color: var(--table-head-fore-color); }
-  table td {
-    background: var(--table-body-back-color);
-    color: var(--table-body-fore-color);
-    border-top: 0.0625rem solid var(--table-border-color); }
-
-table:not(.horizontal) {
-  overflow: auto;
-  max-height: 850px; }
-  table:not(.horizontal) thead, table:not(.horizontal) tbody {
-    max-width: 100%;
-    flex: 0 0 100%; }
-  table:not(.horizontal) tr {
-    flex-flow: row wrap;
-    flex: 0 0 100%; }
-  table:not(.horizontal) th, table:not(.horizontal) td {
-    flex: 1 0 0%;
-    overflow: hidden;
-    text-overflow: ellipsis; }
-  table:not(.horizontal) thead {
-    position: sticky;
-    top: 0; }
-  table:not(.horizontal) tbody tr:first-child td {
-    border-top: 0; }
-
-table.horizontal {
-  border: 0; }
-  table.horizontal thead, table.horizontal tbody {
-    border: 0;
-    flex-flow: row nowrap; }
-  table.horizontal tbody {
-    overflow: auto;
-    justify-content: space-between;
-    flex: 1 0 0;
-    margin-left: calc( 4 * var(--universal-margin));
-    padding-bottom: calc(var(--universal-padding) / 4); }
-  table.horizontal tr {
-    flex-direction: column;
-    flex: 1 0 auto; }
-  table.horizontal th, table.horizontal td {
-    width: 100%;
-    border: 0;
-    border-bottom: 0.0625rem solid var(--table-border-color); }
-    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
-      border-top: 0; }
-  table.horizontal th {
-    text-align: right;
-    border-left: 0.0625rem solid var(--table-border-color);
-    border-right: 0.0625rem solid var(--table-border-separator-color); }
-  table.horizontal thead tr:first-child {
-    padding-left: 0; }
-  table.horizontal th:first-child, table.horizontal td:first-child {
-    border-top: 0.0625rem solid var(--table-border-color); }
-  table.horizontal tbody tr:last-child td {
-    border-right: 0.0625rem solid var(--table-border-color); }
-    table.horizontal tbody tr:last-child td:first-child {
-      border-top-right-radius: 0.25rem; }
-    table.horizontal tbody tr:last-child td:last-child {
-      border-bottom-right-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:first-child {
-    border-top-left-radius: 0.25rem; }
-  table.horizontal thead tr:first-child th:last-child {
-    border-bottom-left-radius: 0.25rem; }
-
-@media screen and (max-width: 499px) {
-  table, table.horizontal {
-    border-collapse: collapse;
-    border: 0;
-    width: 100%;
-    display: table; }
-    table thead, table th, table.horizontal thead, table.horizontal th {
-      border: 0;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      padding: 0;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%); }
-    table tbody, table.horizontal tbody {
-      border: 0;
-      display: table-row-group; }
-    table tr, table.horizontal tr {
-      display: block;
-      border: 0.0625rem solid var(--table-border-color);
-      border-radius: var(--universal-border-radius);
-      background: #fafafa;
-      padding: var(--universal-padding);
-      margin: var(--universal-margin);
-      margin-bottom: calc(2 * var(--universal-margin)); }
-    table th, table td, table.horizontal th, table.horizontal td {
-      width: auto; }
-    table td, table.horizontal td {
-      display: block;
-      border: 0;
-      text-align: right; }
-    table td:before, table.horizontal td:before {
-      content: attr(data-label);
-      float: left;
-      font-weight: 600; }
-    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
-      border-top: 0; }
-    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
-      border-right: 0; } }
-:root {
-  --table-body-alt-back-color: #eee; }
-
-table tr:nth-of-type(2n) > td {
-  background: var(--table-body-alt-back-color); }
-
-@media screen and (max-width: 500px) {
-  table tr:nth-of-type(2n) {
-    background: var(--table-body-alt-back-color); } }
-:root {
-  --table-body-hover-back-color: #90caf9; }
-
-table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-  background: var(--table-body-hover-back-color); }
-
-@media screen and (max-width: 500px) {
-  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
-    background: var(--table-body-hover-back-color); } }
-/*
-  Definitions for contextual background elements, toasts and tooltips.
-*/
-/* Contextual module CSS variable definitions */
-:root {
-  --mark-back-color: #0277bd;
-  --mark-fore-color: #fafafa; }
-
-mark {
-  background: var(--mark-back-color);
-  color: var(--mark-fore-color);
-  font-size: 0.95em;
-  line-height: 1em;
-  border-radius: var(--universal-border-radius);
-  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
-  mark.inline-block {
-    display: inline-block;
-    font-size: 1em;
-    line-height: 1.5;
-    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
-
-:root {
-  --toast-back-color: #424242;
-  --toast-fore-color: #fafafa; }
-
-.toast {
-  position: fixed;
-  bottom: calc(var(--universal-margin) * 3);
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1111;
-  color: var(--toast-fore-color);
-  background: var(--toast-back-color);
-  border-radius: calc(var(--universal-border-radius) * 16);
-  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
-
-:root {
-  --tooltip-back-color: #212121;
-  --tooltip-fore-color: #fafafa; }
-
-.tooltip {
-  position: relative;
-  display: inline-block; }
-  .tooltip:before, .tooltip:after {
-    position: absolute;
-    opacity: 0;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%);
-    transition: all 0.3s;
-    z-index: 1010;
-    left: 50%; }
-  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
-    bottom: 75%; }
-  .tooltip.bottom:before, .tooltip.bottom:after {
-    top: 75%; }
-  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
-    opacity: 1;
-    clip: auto;
-    -webkit-clip-path: inset(0%);
-    clip-path: inset(0%); }
-  .tooltip:before {
-    content: '';
-    background: transparent;
-    border: var(--universal-margin) solid transparent;
-    left: calc(50% - var(--universal-margin)); }
-  .tooltip:not(.bottom):before {
-    border-top-color: #212121; }
-  .tooltip.bottom:before {
-    border-bottom-color: #212121; }
-  .tooltip:after {
-    content: attr(aria-label);
-    color: var(--tooltip-fore-color);
-    background: var(--tooltip-back-color);
-    border-radius: var(--universal-border-radius);
-    padding: var(--universal-padding);
-    white-space: nowrap;
-    transform: translateX(-50%); }
-  .tooltip:not(.bottom):after {
-    margin-bottom: calc(2 * var(--universal-margin)); }
-  .tooltip.bottom:after {
-    margin-top: calc(2 * var(--universal-margin)); }
-
-:root {
-  --modal-overlay-color: rgba(0, 0, 0, 0.45);
-  --modal-close-color: #444;
-  --modal-close-hover-color: #f0f0f0; }
-
-[type="checkbox"].modal {
-  height: 1px;
-  width: 1px;
-  margin: -1px;
-  overflow: hidden;
-  position: absolute;
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(100%);
-  clip-path: inset(100%); }
-  [type="checkbox"].modal + div {
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: none;
-    width: 100vw;
-    height: 100vh;
-    background: var(--modal-overlay-color); }
-    [type="checkbox"].modal + div .card {
-      margin: 0 auto;
-      max-height: 50vh;
-      overflow: auto; }
-      [type="checkbox"].modal + div .card .modal-close {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 1.75rem;
-        height: 1.75rem;
-        border-radius: var(--universal-border-radius);
-        padding: var(--universal-padding);
-        margin: 0;
-        cursor: pointer;
-        transition: background 0.3s; }
-        [type="checkbox"].modal + div .card .modal-close:before {
-          display: block;
-          content: '\00D7';
-          color: var(--modal-close-color);
-          position: relative;
-          font-family: sans-serif;
-          font-size: 1.75rem;
-          line-height: 1;
-          text-align: center; }
-        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
-          background: var(--modal-close-hover-color); }
-  [type="checkbox"].modal:checked + div {
-    display: flex;
-    flex: 0 1 auto;
-    z-index: 1200; }
-    [type="checkbox"].modal:checked + div .card .modal-close {
-      z-index: 1211; }
-
-:root {
-  --collapse-label-back-color: #e8e8e8;
-  --collapse-label-fore-color: #212121;
-  --collapse-label-hover-back-color: #f0f0f0;
-  --collapse-selected-label-back-color: #ececec;
-  --collapse-border-color: #ddd;
-  --collapse-content-back-color: #fafafa;
-  --collapse-selected-label-border-color: #0277bd; }
-
-.collapse {
-  width: calc(100% - 2 * var(--universal-margin));
-  opacity: 1;
-  display: flex;
-  flex-direction: column;
-  margin: var(--universal-margin);
-  border-radius: var(--universal-border-radius); }
-  .collapse > [type="radio"], .collapse > [type="checkbox"] {
-    height: 1px;
-    width: 1px;
-    margin: -1px;
-    overflow: hidden;
-    position: absolute;
-    clip: rect(0 0 0 0);
-    -webkit-clip-path: inset(100%);
-    clip-path: inset(100%); }
-  .collapse > label {
-    flex-grow: 1;
-    display: inline-block;
-    height: 1.5rem;
-    cursor: pointer;
-    transition: background 0.3s;
-    color: var(--collapse-label-fore-color);
-    background: var(--collapse-label-back-color);
-    border: 0.0625rem solid var(--collapse-border-color);
-    padding: calc(1.5 * var(--universal-padding)); }
-    .collapse > label:hover, .collapse > label:focus {
-      background: var(--collapse-label-hover-back-color); }
-    .collapse > label + div {
-      flex-basis: auto;
-      height: 1px;
-      width: 1px;
-      margin: -1px;
-      overflow: hidden;
-      position: absolute;
-      clip: rect(0 0 0 0);
-      -webkit-clip-path: inset(100%);
-      clip-path: inset(100%);
-      transition: max-height 0.3s;
-      max-height: 1px; }
-  .collapse > :checked + label {
-    background: var(--collapse-selected-label-back-color);
-    border-bottom-color: var(--collapse-selected-label-border-color); }
-    .collapse > :checked + label + div {
-      box-sizing: border-box;
-      position: relative;
-      width: 100%;
-      height: auto;
-      overflow: auto;
-      margin: 0;
-      background: var(--collapse-content-back-color);
-      border: 0.0625rem solid var(--collapse-border-color);
-      border-top: 0;
-      padding: var(--universal-padding);
-      clip: auto;
-      -webkit-clip-path: inset(0%);
-      clip-path: inset(0%);
-      max-height: 850px; }
-  .collapse > label:not(:first-of-type) {
-    border-top: 0; }
-  .collapse > label:first-of-type {
-    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
-  .collapse > label:last-of-type:not(:first-of-type) {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-  .collapse > label:last-of-type:first-of-type {
-    border-radius: var(--universal-border-radius); }
-  .collapse > :checked:last-of-type:not(:first-of-type) + label {
-    border-radius: 0; }
-  .collapse > :checked:last-of-type + label + div {
-    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
-
-/*
-  Custom elements for contextual background elements, toasts and tooltips.
-*/
-mark.secondary {
-  --mark-back-color: #d32f2f; }
-
-mark.tertiary {
-  --mark-back-color: #308732; }
-
-mark.tag {
-  padding: calc(var(--universal-padding)/2) var(--universal-padding);
-  border-radius: 1em; }
-
-/*
-  Definitions for progress elements and spinners.
-*/
-/* Progress module CSS variable definitions */
-:root {
-  --progress-back-color: #ddd;
-  --progress-fore-color: #555; }
-
-progress {
-  display: block;
-  vertical-align: baseline;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  height: 0.75rem;
-  width: calc(100% - 2 * var(--universal-margin));
-  margin: var(--universal-margin);
-  border: 0;
-  border-radius: calc(2 * var(--universal-border-radius));
-  background: var(--progress-back-color);
-  color: var(--progress-fore-color); }
-  progress::-webkit-progress-value {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress::-webkit-progress-bar {
-    background: var(--progress-back-color); }
-  progress::-moz-progress-bar {
-    background: var(--progress-fore-color);
-    border-top-left-radius: calc(2 * var(--universal-border-radius));
-    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-webkit-progress-value {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress[value="1000"]::-moz-progress-bar {
-    border-radius: calc(2 * var(--universal-border-radius)); }
-  progress.inline {
-    display: inline-block;
-    vertical-align: middle;
-    width: 60%; }
-
-:root {
-  --spinner-back-color: #ddd;
-  --spinner-fore-color: #555; }
-
-@keyframes spinner-donut-anim {
-  0% {
-    transform: rotate(0deg); }
-  100% {
-    transform: rotate(360deg); } }
-.spinner {
-  display: inline-block;
-  margin: var(--universal-margin);
-  border: 0.25rem solid var(--spinner-back-color);
-  border-left: 0.25rem solid var(--spinner-fore-color);
-  border-radius: 50%;
-  width: 1.25rem;
-  height: 1.25rem;
-  animation: spinner-donut-anim 1.2s linear infinite; }
-
-/*
-  Custom elements for progress bars and spinners.
-*/
-progress.primary {
-  --progress-fore-color: #1976d2; }
-
-progress.secondary {
-  --progress-fore-color: #d32f2f; }
-
-progress.tertiary {
-  --progress-fore-color: #308732; }
-
-.spinner.primary {
-  --spinner-fore-color: #1976d2; }
-
-.spinner.secondary {
-  --spinner-fore-color: #d32f2f; }
-
-.spinner.tertiary {
-  --spinner-fore-color: #308732; }
-
-/*
-  Definitions for icons - powered by Feather (https://feathericons.com/).
-*/
-span[class^='icon-'] {
-  display: inline-block;
-  height: 1em;
-  width: 1em;
-  vertical-align: -0.125em;
-  background-size: contain;
-  margin: 0 calc(var(--universal-margin) / 4); }
-  span[class^='icon-'].secondary {
-    -webkit-filter: invert(25%);
-    filter: invert(25%); }
-  span[class^='icon-'].inverse {
-    -webkit-filter: invert(100%);
-    filter: invert(100%); }
-
-span.icon-alert {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-bookmark {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-calendar {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-credit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-edit {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
-span.icon-link {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-help {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-home {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-info {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-lock {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-mail {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
-span.icon-location {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-phone {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-rss {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
-span.icon-search {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-settings {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-share {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-cart {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
-span.icon-upload {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
-span.icon-user {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23111' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
-
-/*
-  Definitions for utilities and helper classes.
-*/
-/* Utility module CSS variable definitions */
-:root {
-  --generic-border-color: rgba(0, 0, 0, 0.3);
-  --generic-box-shadow: 0 0.25rem 0.25rem 0 rgba(0, 0, 0, 0.125), 0 0.125rem 0.125rem -0.125rem rgba(0, 0, 0, 0.25); }
-
-.hidden {
-  display: none !important; }
-
-.visually-hidden {
-  position: absolute !important;
-  width: 1px !important;
-  height: 1px !important;
-  margin: -1px !important;
-  border: 0 !important;
-  padding: 0 !important;
-  clip: rect(0 0 0 0) !important;
-  -webkit-clip-path: inset(100%) !important;
-  clip-path: inset(100%) !important;
-  overflow: hidden !important; }
-
-.bordered {
-  border: 0.0625rem solid var(--generic-border-color) !important; }
-
-.rounded {
-  border-radius: var(--universal-border-radius) !important; }
-
-.circular {
-  border-radius: 50% !important; }
-
-.shadowed {
-  box-shadow: var(--generic-box-shadow) !important; }
-
-.responsive-margin {
-  margin: calc(var(--universal-margin) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-margin {
-      margin: calc(var(--universal-margin) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-margin {
-      margin: var(--universal-margin) !important; } }
-
-.responsive-padding {
-  padding: calc(var(--universal-padding) / 4) !important; }
-  @media screen and (min-width: 500px) {
-    .responsive-padding {
-      padding: calc(var(--universal-padding) / 2) !important; } }
-  @media screen and (min-width: 1280px) {
-    .responsive-padding {
-      padding: var(--universal-padding) !important; } }
-
-@media screen and (max-width: 499px) {
-  .hidden-sm {
-    display: none !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .hidden-md {
-    display: none !important; } }
-@media screen and (min-width: 1280px) {
-  .hidden-lg {
-    display: none !important; } }
-@media screen and (max-width: 499px) {
-  .visually-hidden-sm {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 500px) and (max-width: 1279px) {
-  .visually-hidden-md {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-@media screen and (min-width: 1280px) {
-  .visually-hidden-lg {
-    position: absolute !important;
-    width: 1px !important;
-    height: 1px !important;
-    margin: -1px !important;
-    border: 0 !important;
-    padding: 0 !important;
-    clip: rect(0 0 0 0) !important;
-    -webkit-clip-path: inset(100%) !important;
-    clip-path: inset(100%) !important;
-    overflow: hidden !important; } }
-
-/*# sourceMappingURL=mini-default.css.map */
diff --git a/Middlewares/Third_Party/SubGHz_Phy/_htmresc/st_logo.png b/Middlewares/Third_Party/SubGHz_Phy/_htmresc/st_logo.png
deleted file mode 100644
index 8b80057f..00000000
Binary files a/Middlewares/Third_Party/SubGHz_Phy/_htmresc/st_logo.png and /dev/null differ
diff --git a/Middlewares/Third_Party/SubGHz_Phy/radio.h b/Middlewares/Third_Party/SubGHz_Phy/radio.h
index 04498af1..beb0ca3e 100644
--- a/Middlewares/Third_Party/SubGHz_Phy/radio.h
+++ b/Middlewares/Third_Party/SubGHz_Phy/radio.h
@@ -36,13 +36,13 @@
 #define __RADIO_H__
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 /* Includes ------------------------------------------------------------------*/
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "radio_ex.h"
 
 /* Private typedef -----------------------------------------------------------*/
 /*!
@@ -52,9 +52,11 @@ typedef enum
 {
     MODEM_FSK = 0,
     MODEM_LORA,
+    /* ST_WORKAROUND_BEGIN: Upgraded modulations list */
     MODEM_BPSK,
     MODEM_SIGFOX_TX,
     MODEM_SIGFOX_RX,
+    /* ST_WORKAROUND_END */
 }RadioModems_t;
 
 /*!
@@ -87,11 +89,11 @@ typedef struct
      * \param [IN] payload Received buffer pointer
      * \param [IN] size    Received buffer size
      * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
-     * \param [IN] snr     SNR value computed while receiving the frame [dB]
-     *                     FSK : N/A ( set to 0 )
+     * \param [IN] LoraSnr_FskCfo
+     *                     FSK : Carrier Frequency Offset in kHz
      *                     LoRa: SNR value in dB
      */
-    void    ( *RxDone )( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr );
+    void    ( *RxDone )( uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo );
     /*!
      * \brief  Rx Timeout callback prototype.
      */
@@ -115,6 +117,8 @@ typedef struct
     void ( *CadDone ) ( bool channelActivityDetected );
 }RadioEvents_t;
 
+#include "radio_ex.h" /* ST_WORKAROUND: extended radio functions */
+
 /*!
  * \brief Radio driver definition
  */
@@ -331,6 +335,7 @@ struct Radio_s
      * \retval rssiValue Current RSSI value in [dBm]
      */
     int16_t ( *Rssi )( RadioModems_t modem );
+    /* ST_WORKAROUND_BEGIN: Force register addr to uint16_t */
     /*!
      * \brief Writes the radio register at the specified address
      *
@@ -361,6 +366,7 @@ struct Radio_s
      * \param [IN] size Number of registers to be read
      */
     void    ( *ReadRegisters )( uint16_t addr, uint8_t *buffer, uint8_t size );
+    /* ST_WORKAROUND_END */
     /*!
      * \brief Sets the maximum payload length.
      *
@@ -404,6 +410,7 @@ struct Radio_s
      * \param [in]  sleepTime     Structure describing sleep timeout value
      */
     void ( *SetRxDutyCycle ) ( uint32_t rxTime, uint32_t sleepTime );
+    /* ST_WORKAROUND_BEGIN: extended radio functions */
     /*!
      * @brief Sets the Transmitter in continuous PRBS mode
      *
@@ -411,7 +418,7 @@ struct Radio_s
      */
     void (*TxPrbs) ( void );
     /*!
-     * @brief Sets the Transmitter in continuous unmodulated Carrier mode at power dBm
+     * @brief Sets the Transmitter in continuous un-modulated Carrier mode at power dBm
      */
     void (*TxCw) ( int8_t power );
     /*!
@@ -438,10 +445,34 @@ struct Radio_s
     *                           lora field to be used if modem =GENERIC_LORA
                                 bpsk field to be used if modem =GENERIC_BPSK
      * \param [IN] power        Sets the output power [dBm]
-     * \param [IN] timeout      Transmission timeout [ms]
+     * \param [IN] timeout      Reception timeout [ms]
      * \return 0 when no parameters error, -1 otherwise
      */
     int32_t (*RadioSetTxGenericConfig)( GenericModems_t modem, TxConfigGeneric_t* config, int8_t power, uint32_t timeout );
+  /*!
+   * \brief Starts sending long Packet, packet maybe short
+   *
+   * \param [IN] payload_size        total payload size to be sent
+     \param [IN] timeout             in ms
+   * \param [IN] TxLongPacketGetNextChunkCb   callback to be implemented on user side to feed partial chunk
+   *                                  buffer: source buffer allocated by the app
+   *                                  size: size in bytes to feed
+   * \return 0 when no parameters error, -1 otherwise
+   */
+  int32_t (*TransmitLongPacket)( uint16_t payload_size, uint32_t timeout,void (*TxLongPacketGetNextChunkCb) (uint8_t** buffer, uint8_t buffer_size) );
+
+  /*!
+   * \brief Starts receiving long Packet, packet maybe short
+   *
+   * \param [IN] boosted_mode        boosted_mode: 0 normal Rx, 1:improved sensitivity
+   * \param [IN] timeout             Reception timeout [ms]
+   * \param [IN] RxLongStorePacketChunkCb   callback to be implemented on user side to record partial chunk in the application 
+   *                                  buffer: source buffer allocated in the radio driver
+   *                                  size: size in bytes to record
+   * \return 0 when no parameters error, -1 otherwise
+   */
+  int32_t (*ReceiveLongPacket)( uint8_t boosted_mode, uint32_t timeout, void (*RxLongStorePacketChunkCb) (uint8_t* buffer, uint8_t chunk_size) );
+  /* ST_WORKAROUND_END */
 };
 
 /*!
@@ -451,17 +482,9 @@ struct Radio_s
  *         board implementation
  */
 extern const struct Radio_s Radio;
-/* Private defines -----------------------------------------------------------*/
-/* Private macros ------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Global variables ----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Functions Definition ------------------------------------------------------*/
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif // __RADIO_H__
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/SubGHz_Phy/radio_ex.h b/Middlewares/Third_Party/SubGHz_Phy/radio_ex.h
index aa1e37eb..c836d54e 100644
--- a/Middlewares/Third_Party/SubGHz_Phy/radio_ex.h
+++ b/Middlewares/Third_Party/SubGHz_Phy/radio_ex.h
@@ -40,6 +40,10 @@ extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
 
+
+
+
+/*******************************************Radio LORA enum*****************************************/
 typedef enum
 {
     GENERIC_FSK = 0,
@@ -47,7 +51,6 @@ typedef enum
     GENERIC_BPSK,
 }GenericModems_t;
 
-/*******************************************Radio LORA enum*****************************************/
 /*!
  * @brief Represents the possible spreading factor values in LoRa packet types
  */
@@ -124,10 +127,11 @@ typedef enum
  */
 typedef enum
 {
-    RADIO_LORA_LOWDR_OPT_OFF                         = 0x00,  /*Force to 0*/
-    RADIO_LORA_LOWDR_OPT_ON                          = 0x01,  /*Force to 1*/
-    RADIO_LORA_LOWDR_OPT_AUTO                        = 0x02,  /*Force to 1 when SF11 or SF12, 0 otherwise*/
+    RADIO_LORA_LOWDR_OPT_OFF                         = 0x00,  /*Forced to 0*/
+    RADIO_LORA_LOWDR_OPT_ON                          = 0x01,  /*Forced to 1*/
+    RADIO_LORA_LOWDR_OPT_AUTO                        = 0x02,  /*Forced to 1 when SF11 or SF12, 0 otherwise*/
 }RADIO_Ld_Opt_t;
+
 /*******************************************Radio FSK enum*****************************************/
 
 /*!
@@ -170,7 +174,8 @@ typedef enum
 typedef enum
 {
     RADIO_FSK_PACKET_FIXED_LENGTH               = 0x00,         //!< The packet is known on both sides, no header included in the packet
-    RADIO_FSK_PACKET_VARIABLE_LENGTH            = 0x01,         //!< The packet is on variable size, header included
+    RADIO_FSK_PACKET_VARIABLE_LENGTH            = 0x01,         //!< 1 byte  packet length field inserted after the sync word*/
+    RADIO_FSK_PACKET_2BYTES_LENGTH              = 0x02          //!< 2 bytes packet length field inserted after the sync word, payload size greater than 255 bytes */
 }RADIO_FSK_PacketLengthModes_t;
 
 /*!
@@ -188,14 +193,18 @@ typedef enum
 }RADIO_FSK_CrcTypes_t;
 
 /*!
- * @brief Radio whitening mode activated or deactivated
+ * @brief Radio whitening mode Off, CCIT or ibm
  */
 typedef enum
 {
-    RADIO_FSK_DC_FREE_OFF                       = 0x00,
-    RADIO_FSK_DC_FREEWHITENING                  = 0x01,
+    RADIO_FSK_DC_FREE_OFF                       = 0x00, /*whitening Off*/
+    RADIO_FSK_DC_FREEWHITENING                  = 0x01, /*whitening CCIT*/
+    RADIO_FSK_DC_IBM_WHITENING                  = 0x02, /*whitening IBM*/
 }RADIO_FSK_DcFree_t;
 
+/*!
+ * @brief Radio Lora generic Rx parameters
+ */
 typedef struct{
   uint32_t StopTimerOnPreambleDetect; /*0 inactive, otherwise active*/
   RADIO_LoRaSpreadingFactors_t SpreadingFactor;
@@ -209,59 +218,79 @@ typedef struct{
   RADIO_LoRaIQModes_t IqInverted;
 } generic_param_rx_lora_t;
 
+/*!
+ * @brief Radio FSK generic Rx parameters
+ */
 typedef struct{
   uint32_t StopTimerOnPreambleDetect;
   RADIO_FSK_ModShapings_t ModulationShaping;
   uint32_t Bandwidth;
-  uint32_t BitRate; /*BitRate*/
-  uint32_t PreambleLen; /*in Byte*/
+  uint32_t BitRate;                                   /* BitRate */
+  uint32_t PreambleLen;                               /* Preamble length in Byte */
   RADIO_FSK_PreambleDetection_t PreambleMinDetect;
-  uint8_t SyncWordLength; /*in Byte*/
-  uint8_t* SyncWord; /*SyncWord Buffer*/
-  uint32_t MaxPayloadLength; /*maximum Payload length to listen*/
-  uint16_t whiteSeed; /*WhiteningSeed*/
+  uint8_t SyncWordLength;                             /* SyncWord Buffer length in Byte*/
+  uint8_t* SyncWord;                                  /* SyncWord Buffer, 8 bytes max */
+  uint32_t MaxPayloadLength;                          /* maximum Payload length to listen */
+  uint16_t whiteSeed;                                 /* WhiteningSeed, whitening can also be disabled by setting this field to 0 */
   RADIO_FSK_AddressComp_t           AddrComp;
-  RADIO_FSK_PacketLengthModes_t     LengthMode;        //!< If the header is explicit, it will be transmitted in the GFSK packet. If the header is implicit, it will not be transmitted
-  RADIO_FSK_CrcTypes_t              CrcLength;         //!< Size of the CRC block in the GFSK packet
-  uint16_t CrcPolynomial;
+  RADIO_FSK_PacketLengthModes_t     LengthMode;       /* If the header is explicit, it will be transmitted in the GFSK packet. If the header is implicit, it will not be transmitted */
+  RADIO_FSK_CrcTypes_t              CrcLength;        /* Size of the CRC block in the GFSK packet */
+  uint16_t CrcPolynomial;                             /* Polynomial of the Crc*/
+  uint16_t CrcSeed;                                   /* Seed of the Crc*/
   RADIO_FSK_DcFree_t                Whitening;
 } generic_param_rx_fsk_t;
 
+/*!
+ * @brief Radio generic Rx Configuration
+ */
 typedef struct{
   generic_param_rx_fsk_t fsk;
   generic_param_rx_lora_t lora;
 } RxConfigGeneric_t;
 
+/*!
+ * @brief Radio BPSK generic Tx parameters
+ */
 typedef struct{
-  uint32_t BitRate; /*BitRate*/
+  uint32_t BitRate;                                   /*BitRate*/
 } generic_param_tx_bpsk_t;
 
+/*!
+ * @brief Radio Lora generic Tx parameters
+ */
 typedef struct{
   RADIO_LoRaSpreadingFactors_t SpreadingFactor;
   RADIO_LoRaBandwidths_t Bandwidth;
   RADIO_LoRaCodingRates_t Coderate;
-  RADIO_Ld_Opt_t LowDatarateOptimize;/*0 inactive, otherwise active*/
+  RADIO_Ld_Opt_t LowDatarateOptimize;                 /*0 inactive, otherwise active*/
   uint16_t PreambleLen;
   RADIO_LoRaPacketLengthsMode_t LengthMode;
   RADIO_LoRaCrcModes_t CrcMode;
   RADIO_LoRaIQModes_t IqInverted;
 } generic_param_tx_lora_t;
 
+/*!
+ * @brief Radio FSK generic Tx parameters
+ */
 typedef struct{
   RADIO_FSK_ModShapings_t ModulationShaping;
   uint32_t Bandwidth;
-  uint32_t BitRate; /*BitRate*/
-  uint32_t FrequencyDeviation; /*FrequencyDeviation*/
-  uint32_t PreambleLen; /*in Byte*/
-  uint8_t SyncWordLength; /*in Byte*/
-  uint8_t* SyncWord; /*SyncWord Buffer*/
-  uint16_t whiteSeed; /*WhiteningSeed*/
-  RADIO_FSK_PacketLengthModes_t     HeaderType;        //!< If the header is explicit, it will be transmitted in the GFSK packet. If the header is implicit, it will not be transmitted
-  RADIO_FSK_CrcTypes_t              CrcLength;         //!< Size of the CRC block in the GFSK packet
+  uint32_t BitRate;                                   /* BitRate */
+  uint32_t FrequencyDeviation;                        /* FrequencyDeviation */
+  uint32_t PreambleLen;                               /* in Byte */
+  uint8_t SyncWordLength;                             /* in Byte */
+  uint8_t* SyncWord;                                  /* SyncWord Buffer, 8 bytes max */
+  uint16_t whiteSeed;                                 /* Whitening seed, whitening can be disabled by setting this field to 0 */
+  RADIO_FSK_PacketLengthModes_t     HeaderType;       /* If the header is explicit, it will be transmitted in the GFSK packet. If the header is implicit, it will not be transmitted */
+  RADIO_FSK_CrcTypes_t              CrcLength;        /* Size of the CRC block in the GFSK packet */
   uint16_t CrcPolynomial;
+  uint16_t CrcSeed;
   RADIO_FSK_DcFree_t                Whitening;
 } generic_param_tx_fsk_t;
 
+/*!
+ * @brief Radio generic Tx Configuration
+ */
 typedef struct{
   generic_param_tx_fsk_t fsk;
   generic_param_tx_lora_t lora;
diff --git a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c
index f251a471..cd951ca7 100644
--- a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c
+++ b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c
@@ -27,18 +27,20 @@
   *
   * @file    radio.c
   * @author  MCD Application Team
-  * @brief   radio API definition
+  * @brief   Radio driver API definition
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
 #include "timer.h"
 #include "radio.h"
+#include "radio_fw.h"
 #include "radio_driver.h"
 #include "radio_conf.h"
 #include "mw_log_conf.h"
 
 /* Private typedef -----------------------------------------------------------*/
+/* ST_WORKAROUND_BEGIN: Replace global variables by typedef struct */
 /*!
  * Radio hardware and global parameters
  */
@@ -59,22 +61,14 @@ typedef struct SubgRf_s
     RadioIrqMasks_t RadioIrq;
     uint8_t AntSwitchPaSelect;
 } SubgRf_t;
+/* ST_WORKAROUND_END */
 
-/*!
- * FSK bandwidth definition
- */
-typedef struct
-{
-    uint32_t bandwidth;
-    uint8_t  RegValue;
-} FskBandwidth_t;
-
-/* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
+/* ST_WORKAROUND_BEGIN: Add utilities macro to prevent missing header file */
 #define RADIO_BIT_MASK(__n)  (~(1<<__n))
 
 /**
-  * \brief Calculates ceiling( X / N )
+  * \brief Calculates ceiling division of ( X / N )
   *
   * \param [IN] X numerator
   * \param [IN] N denominator
@@ -83,15 +77,54 @@ typedef struct
 #ifndef DIVC
 #define DIVC( X, N )                ( ( ( X ) + ( N ) - 1 ) / ( N ) )
 #endif
-/* Private function prototypes -----------------------------------------------*/
-/*!
- * \brief Returns the known FSK bandwidth registers value
- *
- * \param [IN] bandwidth Bandwidth value in Hz
- * \retval regValue Bandwidth register value.
- */
-static uint8_t RadioGetFskBandwidthRegValue( uint32_t bandwidth );
 
+/**
+  * \brief Calculates rounding division of ( X / N )
+  *
+  * \param [IN] X numerator
+  * \param [IN] N denominator
+  *
+  */
+#ifndef DIVR
+#define DIVR( X, N )                ( ( ( X ) + ( ((X)>0?(N):(N))>>1 ) ) / ( N ) )
+#endif
+/* ST_WORKAROUND_END */
+
+/* Private define ------------------------------------------------------------*/
+/* ST_WORKAROUND_BEGIN: Add radio defines to prevent missing header file */
+/*can be overridden in radio_conf.h*/
+#ifndef XTAL_FREQ
+#define XTAL_FREQ                                   32000000UL
+#endif
+/*can be overridden in radio_conf.h*/
+#ifndef RADIO_IRQ_PROCESS_INIT
+#define RADIO_IRQ_PROCESS_INIT()
+#endif
+/*can be overridden in radio_conf.h*/
+#ifndef RADIO_IRQ_PROCESS
+#define RADIO_IRQ_PROCESS()        RadioIrqProcess()
+#endif
+/*can be overridden in radio_conf.h*/
+#ifndef RADIO_RX_TIMEOUT_PROCESS
+#define RADIO_RX_TIMEOUT_PROCESS() RadioOnRxTimeoutProcess()
+#endif
+/*can be overridden in radio_conf.h*/
+#ifndef RADIO_TX_TIMEOUT_PROCESS
+#define RADIO_TX_TIMEOUT_PROCESS() RadioOnTxTimeoutProcess()
+#endif
+
+#ifndef IRQ_TX_DBG
+#define IRQ_TX_DBG ((uint16_t) 0)
+#endif
+
+#ifndef IRQ_RX_DBG
+#define IRQ_RX_DBG ((uint16_t) 0)
+#endif
+
+#define RADIO_BUF_SIZE 255
+/* ST_WORKAROUND_END */
+
+/* Private function prototypes -----------------------------------------------*/
 /*!
  * \brief Initializes the radio
  *
@@ -242,63 +275,6 @@ static void RadioSetTxConfig( RadioModems_t modem, int8_t power, uint32_t fdev,
  */
 static bool RadioCheckRfFrequency( uint32_t frequency );
 
-/*!
- * \brief Convert the bandwitdh enum to Hz value
- *
- * \param [IN] bw RF frequency to be checked
- * \retval bandwidthInHz bandwidth value in Hertz
- */
-static uint32_t RadioGetLoRaBandwidthInHz( RadioLoRaBandwidths_t bw );
-
-/*!
- * \brief Computes the time on air GSFK numerator
- *
- * \param [IN] datarate     Sets the Datarate
- *                          FSK : 600..300000 bits/s
- *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
- *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
- *                          FSK : Number of bytes
- *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \retval numerator        time on air GFSK numerator
- */
-static uint32_t RadioGetGfskTimeOnAirNumerator( uint32_t datarate, uint8_t coderate,
-                                                uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
-                                                bool crcOn );
-
-/*!
- * \brief Computes the time on air LoRa numerator
- *
- * \param [IN] bandwidth    Sets the bandwidth
- *                          FSK : >= 2600 and <= 250000 Hz
- *                          LoRa: [0: 125 kHz, 1: 250 kHz,
- *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
- *                          FSK : 600..300000 bits/s
- *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
- *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
- *                          FSK : Number of bytes
- *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \retval numerator        time on air LoRa numerator
- */
-static uint32_t RadioGetLoRaTimeOnAirNumerator( uint32_t bandwidth,
-                                                uint32_t datarate, uint8_t coderate,
-                                                uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
-                                                bool crcOn );
-
 /*!
  * \brief Computes the packet time on air in ms for the given payload
  *
@@ -377,6 +353,7 @@ static void RadioSetTxContinuousWave( uint32_t freq, int8_t power, uint16_t time
  */
 static int16_t RadioRssi( RadioModems_t modem );
 
+/* ST_WORKAROUND_BEGIN: Force register addr to uint16_t */
 /*!
  * \brief Writes the radio register at the specified address
  *
@@ -410,6 +387,7 @@ static void RadioWriteRegisters( uint16_t addr, uint8_t *buffer, uint8_t size );
  * \param [IN] size Number of registers to be read
  */
 static void RadioReadRegisters( uint16_t addr, uint8_t *buffer, uint8_t size );
+/* ST_WORKAROUND_END */
 
 /*!
  * \brief Sets the maximum payload length.
@@ -470,6 +448,17 @@ static void RadioOnTxTimeoutIrq( void * context );
  */
 static void RadioOnRxTimeoutIrq( void * context );
 
+/*!
+ * \brief Rx timeout timer process
+ */
+static void RadioOnRxTimeoutProcess( void );
+
+/*!
+ * \brief Tx timeout timer process
+ */
+static void RadioOnTxTimeoutProcess( void );
+
+/* ST_WORKAROUND_BEGIN: extended radio functions */
 /*!
  * @brief D-BPSK to BPSK
  *
@@ -523,6 +512,64 @@ static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t*
 static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
                                        int8_t power, uint32_t timeout);
 
+/*!
+ * \brief Convert the bandwidth enum to Hz value
+ *
+ * \param [IN] bw RF frequency to be checked
+ * \retval bandwidthInHz bandwidth value in Hertz
+ */
+static uint32_t RadioGetLoRaBandwidthInHz( RadioLoRaBandwidths_t bw );
+
+/*!
+ * \brief Computes the time on air GFSK numerator
+ *
+ * \param [IN] datarate     Sets the Datarate
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param [IN] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param [IN] preambleLen  Sets the Preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param [IN] payloadLen   Sets payload length when fixed length is used
+ * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \retval numerator        time on air GFSK numerator
+ */
+static uint32_t RadioGetGfskTimeOnAirNumerator( uint32_t datarate, uint8_t coderate,
+                                                uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                                                bool crcOn );
+
+/*!
+ * \brief Computes the time on air LoRa numerator
+ *
+ * \param [IN] bandwidth    Sets the bandwidth
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param [IN] datarate     Sets the Datarate
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param [IN] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param [IN] preambleLen  Sets the Preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param [IN] payloadLen   Sets payload length when fixed length is used
+ * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \retval numerator        time on air LoRa numerator
+ */
+static uint32_t RadioGetLoRaTimeOnAirNumerator( uint32_t bandwidth,
+                                                uint32_t datarate, uint8_t coderate,
+                                                uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                                                bool crcOn );
+/* ST_WORKAROUND_END */
+
 /* Private variables ---------------------------------------------------------*/
 /*!
  * Radio driver structure initialization
@@ -556,47 +603,21 @@ const struct Radio_s Radio =
     RadioIrqProcess,
     RadioRxBoosted,
     RadioSetRxDutyCycle,
+    /* ST_WORKAROUND_BEGIN: extended radio functions */
     RadioTxPrbs,
     RadioTxCw,
     RadioSetRxGenericConfig,
     RadioSetTxGenericConfig,
-};
-
-
-/*!
- * Precomputed FSK bandwidth registers values
- */
-const FskBandwidth_t FskBandwidths[] =
-{
-    { 4800  , 0x1F },
-    { 5800  , 0x17 },
-    { 7300  , 0x0F },
-    { 9700  , 0x1E },
-    { 11700 , 0x16 },
-    { 14600 , 0x0E },
-    { 19500 , 0x1D },
-    { 23400 , 0x15 },
-    { 29300 , 0x0D },
-    { 39000 , 0x1C },
-    { 46900 , 0x14 },
-    { 58600 , 0x0C },
-    { 78200 , 0x1B },
-    { 93800 , 0x13 },
-    { 117300, 0x0B },
-    { 156200, 0x1A },
-    { 187200, 0x12 },
-    { 234300, 0x0A },
-    { 312000, 0x19 },
-    { 373600, 0x11 },
-    { 467000, 0x09 },
-    { 500000, 0x00 }, // Invalid Bandwidth
+    RFW_TransmitLongPacket,
+    RFW_ReceiveLongPacket
+    /* ST_WORKAROUND_END */
 };
 
 const RadioLoRaBandwidths_t Bandwidths[] = { LORA_BW_125, LORA_BW_250, LORA_BW_500 };
 
-static uint8_t MaxPayloadLength = RADIO_RX_BUF_SIZE;
+static uint8_t MaxPayloadLength = RADIO_BUF_SIZE;
 
-static uint8_t RadioRxPayload[RADIO_RX_BUF_SIZE];
+static uint8_t RadioBuffer[RADIO_BUF_SIZE];
 
 /*
  * Radio callbacks variable
@@ -613,379 +634,115 @@ SubgRf_t SubgRf;
  */
 TimerEvent_t TxTimeoutTimer;
 TimerEvent_t RxTimeoutTimer;
-/* Exported functions ---------------------------------------------------------*/
-static int32_t RadioSetRxGenericConfig( GenericModems_t modem, RxConfigGeneric_t* config, uint32_t rxContinuous, uint32_t symbTimeout)
+
+/* Private  functions ---------------------------------------------------------*/
+
+static void RadioInit( RadioEvents_t *events )
 {
-    int32_t status=0;
-    uint8_t syncword[8]={0};
-    uint8_t MaxPayloadLength;
-    if( rxContinuous != 0 )
+    RadioEvents = events;
+
+    SubgRf.RxContinuous = false;
+    SubgRf.TxTimeout = 0;
+    SubgRf.RxTimeout = 0;
+
+    SUBGRF_Init( RadioOnDioIrq );
+    /*SubgRf.publicNetwork set to false*/
+    RadioSetPublicNetwork( false );
+
+    RADIO_IRQ_PROCESS_INIT();
+
+    SUBGRF_SetRegulatorMode(  );
+
+    SUBGRF_SetBufferBaseAddress( 0x00, 0x00 );
+    SUBGRF_SetTxParams(RFO_LP, 0, RADIO_RAMP_200_US);
+    SUBGRF_SetDioIrqParams( IRQ_RADIO_ALL, IRQ_RADIO_ALL, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+
+    /* ST_WORKAROUND_BEGIN: Sleep radio */
+    RadioSleep();
+    /* ST_WORKAROUND_END */
+    // Initialize driver timeout timers
+    TimerInit( &TxTimeoutTimer, RadioOnTxTimeoutIrq );
+    TimerInit( &RxTimeoutTimer, RadioOnRxTimeoutIrq );
+    TimerStop( &TxTimeoutTimer );
+    TimerStop( &RxTimeoutTimer );
+}
+
+static RadioState_t RadioGetStatus( void )
+{
+    switch( SUBGRF_GetOperatingMode( ) )
     {
-        symbTimeout = 0;
+        case MODE_TX:
+            return RF_TX_RUNNING;
+        case MODE_RX:
+            return RF_RX_RUNNING;
+        case MODE_CAD:
+            return RF_CAD;
+        default:
+            return RF_IDLE;
     }
-    SubgRf.RxContinuous = (rxContinuous==0)? false :true;
+}
 
+static void RadioSetModem( RadioModems_t modem )
+{
+    SubgRf.Modem = modem;
+    RFW_SetRadioModem(modem);
     switch( modem )
     {
-        case GENERIC_FSK:
-            if ((config->fsk.BitRate== 0) || (config->fsk.PreambleLen== 0))
-            {
-                return -1;
-            }
-            if ( config->fsk.SyncWordLength>8)
-            {
-                return -1;
-            }
-            else
-            {
-                for(int i =0; i<config->fsk.SyncWordLength; i++)
-                {
-                    syncword[i]=config->fsk.SyncWord[i];
-                }
-            }
-            if( config->fsk.LengthMode == RADIO_FSK_PACKET_FIXED_LENGTH )
-            {
-                MaxPayloadLength = config->fsk.MaxPayloadLength;
-            }
-            else
-            {
-                MaxPayloadLength = 0xFF;
-            }
+    default:
+    case MODEM_FSK:
+        SUBGRF_SetPacketType( PACKET_TYPE_GFSK );
+        // When switching to GFSK mode the LoRa SyncWord register value is reset
+        // Thus, we also reset the RadioPublicNetwork variable
+        SubgRf.PublicNetwork.Current = false;
+        break;
+    case MODEM_LORA:
+        SUBGRF_SetPacketType( PACKET_TYPE_LORA );
+        // Public/Private network register is reset when switching modems
+        if( SubgRf.PublicNetwork.Current != SubgRf.PublicNetwork.Previous )
+        {
+            SubgRf.PublicNetwork.Current = SubgRf.PublicNetwork.Previous;
+            RadioSetPublicNetwork( SubgRf.PublicNetwork.Current );
+        }
+        break;
+    case MODEM_BPSK:
+        SUBGRF_SetPacketType( PACKET_TYPE_BPSK );
+        // When switching to BPSK mode the LoRa SyncWord register value is reset
+        // Thus, we also reset the RadioPublicNetwork variable
+        SubgRf.PublicNetwork.Current = false;
+        break;
+    case MODEM_SIGFOX_TX:
+        SUBGRF_SetPacketType( PACKET_TYPE_BPSK );
+        // When switching to BPSK mode the LoRa SyncWord register value is reset
+        // Thus, we also reset the RadioPublicNetwork variable
+        SubgRf.PublicNetwork.Current = false;
+        break;
+    case MODEM_SIGFOX_RX:
+        SUBGRF_SetPacketType( PACKET_TYPE_GFSK );
+        // When switching to GFSK mode the LoRa SyncWord register value is reset
+        // Thus, we also reset the RadioPublicNetwork variable
+        SubgRf.PublicNetwork.Current = false;
+        break;
+    }
+}
 
-            SUBGRF_SetStopRxTimerOnPreambleDetect( (config->fsk.StopTimerOnPreambleDetect==0)? false:true );
+static void RadioSetChannel( uint32_t freq )
+{
+    SUBGRF_SetRfFrequency( freq );
+}
 
-            SubgRf.ModulationParams.PacketType = PACKET_TYPE_GFSK;
-            SubgRf.ModulationParams.Params.Gfsk.BitRate = config->fsk.BitRate;
-            SubgRf.ModulationParams.Params.Gfsk.ModulationShaping = (RadioModShapings_t) config->fsk.ModulationShaping;
-            SubgRf.ModulationParams.Params.Gfsk.Bandwidth = RadioGetFskBandwidthRegValue(config->fsk.Bandwidth);
+static bool RadioIsChannelFree( uint32_t freq, uint32_t rxBandwidth, int16_t rssiThresh, uint32_t maxCarrierSenseTime )
+{
+    bool status = true;
+    int16_t rssi = 0;
+    uint32_t carrierSenseTime = 0;
 
-            SubgRf.PacketParams.PacketType = PACKET_TYPE_GFSK;
-            SubgRf.PacketParams.Params.Gfsk.PreambleLength = ( config->fsk.PreambleLen) << 3 ; // convert byte into bit
-            SubgRf.PacketParams.Params.Gfsk.PreambleMinDetect = (RadioPreambleDetection_t) config->fsk.PreambleMinDetect;
-            SubgRf.PacketParams.Params.Gfsk.SyncWordLength = (config->fsk.SyncWordLength) << 3; // convert byte into bit
-            SubgRf.PacketParams.Params.Gfsk.AddrComp = (RadioAddressComp_t)config->fsk.AddrComp;
-            SubgRf.PacketParams.Params.Gfsk.HeaderType = (RadioPacketLengthModes_t) config->fsk.LengthMode;
-            SubgRf.PacketParams.Params.Gfsk.PayloadLength = MaxPayloadLength;
-            SubgRf.PacketParams.Params.Gfsk.CrcLength = (RadioCrcTypes_t) config->fsk.CrcLength;
-            SubgRf.PacketParams.Params.Gfsk.DcFree = (RadioDcFree_t) config->fsk.Whitening;
+    /* ST_WORKAROUND_BEGIN: Prevent multiple sleeps with TXCO delay */
+    RadioStandby( );
+    /* ST_WORKAROUND_END */
 
-            RadioStandby( );
-            RadioSetModem(  MODEM_FSK );
-            SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
-            SUBGRF_SetPacketParams( &SubgRf.PacketParams );
-            SUBGRF_SetSyncWord( syncword );
-            SUBGRF_SetWhiteningSeed( config->fsk.whiteSeed );
-            SUBGRF_SetCrcPolynomial(config->fsk.CrcPolynomial );
-            /*timeout*/
+    RadioSetModem( MODEM_FSK );
 
-            SubgRf.RxTimeout = ( uint32_t )( (symbTimeout * 1000* 8 )/config->fsk.BitRate );
-            break;
-        case GENERIC_LORA:
-            if  (config->lora.PreambleLen== 0)
-            {
-                return -1;
-            }
-
-            if( config->lora.LengthMode == RADIO_LORA_PACKET_FIXED_LENGTH )
-            {
-                MaxPayloadLength = config->fsk.MaxPayloadLength;
-            }
-            else
-            {
-                MaxPayloadLength = 0xFF;
-            }
-            SUBGRF_SetStopRxTimerOnPreambleDetect(  (config->lora.StopTimerOnPreambleDetect==0)? false:true  );
-            SUBGRF_SetLoRaSymbNumTimeout( symbTimeout );
-
-            SubgRf.ModulationParams.PacketType = PACKET_TYPE_LORA;
-            SubgRf.ModulationParams.Params.LoRa.SpreadingFactor = (RadioLoRaSpreadingFactors_t) config->lora.SpreadingFactor;
-            SubgRf.ModulationParams.Params.LoRa.Bandwidth = (RadioLoRaBandwidths_t) config->lora.Bandwidth;
-            SubgRf.ModulationParams.Params.LoRa.CodingRate = (RadioLoRaCodingRates_t) config->lora.Coderate;
-            switch (config->lora.LowDatarateOptimize)
-            {
-              case RADIO_LORA_LOWDR_OPT_OFF:
-                SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 0;
-                break;
-              case RADIO_LORA_LOWDR_OPT_ON:
-                SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 1;
-                break;
-              case RADIO_LORA_LOWDR_OPT_AUTO:
-                if ((config->lora.SpreadingFactor==RADIO_LORA_SF11) || (config->lora.SpreadingFactor==RADIO_LORA_SF12))
-                {
-                  SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 1;
-                }
-                else
-                {
-                  SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 0;
-                }
-                break;
-              default:
-                break;
-            }
-
-            SubgRf.PacketParams.PacketType = PACKET_TYPE_LORA;
-            SubgRf.PacketParams.Params.LoRa.PreambleLength = config->lora.PreambleLen;
-            SubgRf.PacketParams.Params.LoRa.HeaderType = (RadioLoRaPacketLengthsMode_t) config->lora.LengthMode;
-            SubgRf.PacketParams.Params.LoRa.PayloadLength = MaxPayloadLength;
-            SubgRf.PacketParams.Params.LoRa.CrcMode = (RadioLoRaCrcModes_t) config->lora.CrcMode;
-            SubgRf.PacketParams.Params.LoRa.InvertIQ = (RadioLoRaIQModes_t) config->lora.IqInverted;
-
-            RadioStandby( );
-            RadioSetModem( MODEM_LORA );
-            SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
-            SUBGRF_SetPacketParams( &SubgRf.PacketParams );
-
-            // WORKAROUND - Optimizing the Inverted IQ Operation, see DS_SX1261-2_V1.2 datasheet chapter 15.4
-            if( SubgRf.PacketParams.Params.LoRa.InvertIQ == LORA_IQ_INVERTED )
-            {
-                // RegIqPolaritySetup = @address 0x0736
-                SUBGRF_WriteRegister( 0x0736, SUBGRF_ReadRegister( 0x0736 ) & ~( 1 << 2 ) );
-            }
-            else
-            {
-                // RegIqPolaritySetup @address 0x0736
-                SUBGRF_WriteRegister( 0x0736, SUBGRF_ReadRegister( 0x0736 ) | ( 1 << 2 ) );
-            }
-            // WORKAROUND END
-
-            // Timeout Max, Timeout handled directly in SetRx function
-            SubgRf.RxTimeout = 0xFFFF;
-            break;
-        default:
-            break;
-    }
-    return status;
-}
-
-static int32_t RadioSetTxGenericConfig( GenericModems_t modem, TxConfigGeneric_t* config, int8_t power, uint32_t timeout )
-{
-  uint8_t syncword[8]={0};
-    switch( modem )
-    {
-        case GENERIC_FSK:
-            if ((config->fsk.BitRate== 0) || (config->fsk.PreambleLen== 0))
-            {
-                return -1;
-            }
-            if ( config->fsk.SyncWordLength>8)
-            {
-                return -1;
-            }
-            else
-            {
-                for(int i =0; i<config->fsk.SyncWordLength; i++)
-                {
-                    syncword[i]=config->fsk.SyncWord[i];
-                }
-            }
-            SubgRf.ModulationParams.PacketType = PACKET_TYPE_GFSK;
-            SubgRf.ModulationParams.Params.Gfsk.BitRate = config->fsk.BitRate;
-            SubgRf.ModulationParams.Params.Gfsk.ModulationShaping = (RadioModShapings_t) config->fsk.ModulationShaping;
-            SubgRf.ModulationParams.Params.Gfsk.Bandwidth = RadioGetFskBandwidthRegValue( config->fsk.Bandwidth );
-            SubgRf.ModulationParams.Params.Gfsk.Fdev = config->fsk.FrequencyDeviation;
-
-            SubgRf.PacketParams.PacketType = PACKET_TYPE_GFSK;
-            SubgRf.PacketParams.Params.Gfsk.PreambleLength = ( config->fsk.PreambleLen << 3 ); // convert byte into bit
-            SubgRf.PacketParams.Params.Gfsk.PreambleMinDetect = RADIO_PREAMBLE_DETECTOR_08_BITS; //don't care in tx
-            SubgRf.PacketParams.Params.Gfsk.SyncWordLength = (config->fsk.SyncWordLength ) << 3 ; // convert byte into bit
-            SubgRf.PacketParams.Params.Gfsk.AddrComp = RADIO_ADDRESSCOMP_FILT_OFF; /*don't care in tx*/
-            SubgRf.PacketParams.Params.Gfsk.HeaderType = (RadioPacketLengthModes_t) config->fsk.HeaderType;
-            SubgRf.PacketParams.Params.Gfsk.CrcLength = (RadioCrcTypes_t) config->fsk.CrcLength;
-            SubgRf.PacketParams.Params.Gfsk.DcFree = (RadioDcFree_t) config->fsk.Whitening;
-
-            RadioStandby( );
-            RadioSetModem( MODEM_FSK );
-            SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
-            SUBGRF_SetPacketParams( &SubgRf.PacketParams );
-            SUBGRF_SetSyncWord( syncword );
-            SUBGRF_SetWhiteningSeed( config->fsk.whiteSeed );
-            SUBGRF_SetCrcPolynomial(config->fsk.CrcPolynomial );
-            break;
-        case GENERIC_LORA:
-            SubgRf.ModulationParams.PacketType = PACKET_TYPE_LORA;
-            SubgRf.ModulationParams.Params.LoRa.SpreadingFactor = ( RadioLoRaSpreadingFactors_t ) config->lora.SpreadingFactor;
-            SubgRf.ModulationParams.Params.LoRa.Bandwidth = (RadioLoRaBandwidths_t) config->lora.Bandwidth;
-            SubgRf.ModulationParams.Params.LoRa.CodingRate = (RadioLoRaCodingRates_t) config->lora.Coderate;
-            switch (config->lora.LowDatarateOptimize)
-            {
-              case RADIO_LORA_LOWDR_OPT_OFF:
-                SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 0;
-                break;
-              case RADIO_LORA_LOWDR_OPT_ON:
-                SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 1;
-                break;
-              case RADIO_LORA_LOWDR_OPT_AUTO:
-                if ((config->lora.SpreadingFactor==RADIO_LORA_SF11) || (config->lora.SpreadingFactor==RADIO_LORA_SF12))
-                {
-                  SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 1;
-                }
-                else
-                {
-                  SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 0;
-                }
-                break;
-              default:
-                break;
-            }
-            SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = (config->lora.LowDatarateOptimize==0)?0:1;
-
-            SubgRf.PacketParams.PacketType = PACKET_TYPE_LORA;
-            SubgRf.PacketParams.Params.LoRa.PreambleLength = config->lora.PreambleLen;
-            SubgRf.PacketParams.Params.LoRa.HeaderType = (RadioLoRaPacketLengthsMode_t) config->lora.LengthMode;
-            SubgRf.PacketParams.Params.LoRa.CrcMode = (RadioLoRaCrcModes_t) config->lora.CrcMode;
-            SubgRf.PacketParams.Params.LoRa.InvertIQ = (RadioLoRaIQModes_t) config->lora.IqInverted;
-
-            RadioStandby( );
-            RadioSetModem( MODEM_LORA );
-            SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
-            SUBGRF_SetPacketParams( &SubgRf.PacketParams );
-            // WORKAROUND - Modulation Quality with 500 kHz LoRa� Bandwidth, see DS_SX1261-2_V1.2 datasheet chapter 15.1
-            if( SubgRf.ModulationParams.Params.LoRa.Bandwidth == LORA_BW_500 )
-            {
-                // RegTxModulation = @address 0x0889
-                SUBGRF_WriteRegister( 0x0889, SUBGRF_ReadRegister( 0x0889 ) & ~( 1 << 2 ) );
-            }
-            else
-            {
-                // RegTxModulation = @address 0x0889
-                SUBGRF_WriteRegister( 0x0889, SUBGRF_ReadRegister( 0x0889 ) | ( 1 << 2 ) );
-            }
-            // WORKAROUND END
-            break;
-        case GENERIC_BPSK:
-            if ((config->fsk.BitRate== 0) || (config->fsk.BitRate> 1000))
-            {
-                return -1;
-            }
-            RadioSetModem( MODEM_BPSK );
-            SubgRf.ModulationParams.PacketType = PACKET_TYPE_BPSK;
-            SubgRf.ModulationParams.Params.Bpsk.BitRate           = config->bpsk.BitRate;
-            SubgRf.ModulationParams.Params.Bpsk.ModulationShaping = MOD_SHAPING_DBPSK;
-            SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
-            break;
-        default:
-            break;
-    }
-
-    SubgRf.AntSwitchPaSelect = SUBGRF_SetRfTxPower( power );
-    SubgRf.TxTimeout = timeout;
-    return 0;
-}
-
-/* Private  functions ---------------------------------------------------------*/
-static uint8_t RadioGetFskBandwidthRegValue( uint32_t bandwidth )
-{
-    uint8_t i;
-
-    if( bandwidth == 0 )
-    {
-        return( 0x1F );
-    }
-
-    /* ST_WORKAROUND_BEGIN: Simplified loop */
-    for( i = 0; i < ( sizeof( FskBandwidths ) / sizeof( FskBandwidth_t ) ); i++ )
-    {
-        if ( bandwidth < FskBandwidths[i].bandwidth )
-        {
-            return FskBandwidths[i].RegValue;
-        }
-    }
-    /* ST_WORKAROUND_END */
-    // ERROR: Value not found
-    while( 1 );
-}
-
-static void RadioInit( RadioEvents_t *events )
-{
-    RadioEvents = events;
-
-    SubgRf.RxContinuous = false;
-    SubgRf.TxTimeout = 0;
-    SubgRf.RxTimeout = 0;
-
-    SUBGRF_Init( RadioOnDioIrq );
-    /*SubgRf.publicNetwork set to false*/
-    RadioSetPublicNetwork( false );
-
-    SUBGRF_SetRegulatorMode(  );
-
-    SUBGRF_SetBufferBaseAddress( 0x00, 0x00 );
-    SUBGRF_SetTxParams(RFO_LP, 0, RADIO_RAMP_200_US);
-    SUBGRF_SetDioIrqParams( IRQ_RADIO_ALL, IRQ_RADIO_ALL, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
-
-    /* ST_WORKAROUND_BEGIN: Sleep radio */
-    RadioSleep();
-    /* ST_WORKAROUND_END */
-    // Initialize driver timeout timers
-    TimerInit( &TxTimeoutTimer, RadioOnTxTimeoutIrq );
-    TimerInit( &RxTimeoutTimer, RadioOnRxTimeoutIrq );
-    TimerStop( &TxTimeoutTimer );
-    TimerStop( &RxTimeoutTimer );
-}
-
-static RadioState_t RadioGetStatus( void )
-{
-    switch( SUBGRF_GetOperatingMode( ) )
-    {
-        case MODE_TX:
-            return RF_TX_RUNNING;
-        case MODE_RX:
-            return RF_RX_RUNNING;
-        case MODE_CAD:
-            return RF_CAD;
-        default:
-            return RF_IDLE;
-    }
-}
-
-static void RadioSetModem( RadioModems_t modem )
-{
-    SubgRf.Modem = modem;
-    switch( modem )
-    {
-        default:
-        case MODEM_FSK:
-            SUBGRF_SetPacketType( PACKET_TYPE_GFSK );
-            // When switching to GFSK mode the LoRa SyncWord register value is reset
-            // Thus, we also reset the RadioPublicNetwork variable
-            SubgRf.PublicNetwork.Current = false;
-            break;
-        case MODEM_LORA:
-            SUBGRF_SetPacketType( PACKET_TYPE_LORA );
-            // Public/Private network register is reset when switching modems
-            if( SubgRf.PublicNetwork.Current != SubgRf.PublicNetwork.Previous )
-            {
-                SubgRf.PublicNetwork.Current = SubgRf.PublicNetwork.Previous;
-                RadioSetPublicNetwork( SubgRf.PublicNetwork.Current );
-            }
-            break;
-        case MODEM_SIGFOX_TX:
-            SUBGRF_SetPacketType( PACKET_TYPE_BPSK );
-            break;
-        case MODEM_SIGFOX_RX:
-            SUBGRF_SetPacketType( PACKET_TYPE_GFSK );
-            break;
-    }
-}
-
-static void RadioSetChannel( uint32_t freq )
-{
-    SUBGRF_SetRfFrequency( freq );
-}
-
-static bool RadioIsChannelFree( uint32_t freq, uint32_t rxBandwidth, int16_t rssiThresh, uint32_t maxCarrierSenseTime )
-{
-    bool status = true;
-    int16_t rssi = 0;
-    uint32_t carrierSenseTime = 0;
-
-    /* ST_WORKAROUND_BEGIN: Prevent multiple sleeps with TXCO delay */
-    RadioStandby( );
-    /* ST_WORKAROUND_END */
-
-    RadioSetModem( MODEM_FSK );
-
-    RadioSetChannel( freq );
+    RadioSetChannel( freq );
 
     // Set Rx bandwidth. Other parameters are not used.
     RadioSetRxConfig( MODEM_FSK, rxBandwidth, 600, 0, rxBandwidth, 3, 0, false,
@@ -1020,10 +777,10 @@ static uint32_t RadioRandom( void )
     /*
      * Radio setup for random number generation
      */
-    /* Set LoRa modem ON */
+    // Set LoRa modem ON
     RadioSetModem( MODEM_LORA );
 
-    /* Disable LoRa modem interrupts */
+    // Disable LoRa modem interrupts
     SUBGRF_SetDioIrqParams( IRQ_RADIO_NONE, IRQ_RADIO_NONE, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
 
     rnd = SUBGRF_GetRandom();
@@ -1042,6 +799,7 @@ static void RadioSetRxConfig( RadioModems_t modem, uint32_t bandwidth,
 
     uint8_t modReg;
     SubgRf.RxContinuous = rxContinuous;
+    RFW_DeInit(); /* ST_WORKAROUND: Switch Off FwPacketDecoding by default */
     if( rxContinuous == true )
     {
         symbTimeout = 0;
@@ -1064,7 +822,7 @@ static void RadioSetRxConfig( RadioModems_t modem, uint32_t bandwidth,
             SubgRf.ModulationParams.Params.Gfsk.BitRate = datarate;
             SubgRf.ModulationParams.Params.Gfsk.ModulationShaping = MOD_SHAPING_G_BT_05;
             SubgRf.ModulationParams.Params.Gfsk.Fdev = 800;
-            SubgRf.ModulationParams.Params.Gfsk.Bandwidth = RadioGetFskBandwidthRegValue( bandwidth );
+            SubgRf.ModulationParams.Params.Gfsk.Bandwidth = SUBGRF_GetFskBandwidthRegValue( bandwidth );
 
             SubgRf.PacketParams.PacketType = PACKET_TYPE_GFSK;
             SubgRf.PacketParams.Params.Gfsk.PreambleLength = ( preambleLen << 3 ); // convert byte into bit
@@ -1095,7 +853,7 @@ static void RadioSetRxConfig( RadioModems_t modem, uint32_t bandwidth,
             modReg&=( RADIO_BIT_MASK(2) & RADIO_BIT_MASK(3) & RADIO_BIT_MASK(4) );
             RadioWrite(0x89b, (modReg| (0x1<<3) ) );
 
-            /* Biger afc_pbl_len (better frequency correction). Reg 0x6d1, bits[3 :4] = 0x3 */
+            /* Bigger afc_pbl_len (better frequency correction). Reg 0x6d1, bits[3 :4] = 0x3 */
             modReg= RadioRead(0x6d1);
             modReg&=( RADIO_BIT_MASK(3) & RADIO_BIT_MASK(4) );
             RadioWrite(0x6d1, (modReg| (0x3<<3) ));
@@ -1104,7 +862,7 @@ static void RadioSetRxConfig( RadioModems_t modem, uint32_t bandwidth,
             modReg= RadioRead(0x6ac);
             modReg&=( RADIO_BIT_MASK(4) & RADIO_BIT_MASK(5) & RADIO_BIT_MASK(6) );
             RadioWrite(0x6ac, (modReg| (0x5<<4) ));
-
+            /*timeout unused when SubgRf.RxContinuous*/
             SubgRf.RxTimeout = ( uint32_t )(( symbTimeout * 8 * 1000 ) /datarate);
             break;
         case MODEM_FSK:
@@ -1113,7 +871,7 @@ static void RadioSetRxConfig( RadioModems_t modem, uint32_t bandwidth,
 
             SubgRf.ModulationParams.Params.Gfsk.BitRate = datarate;
             SubgRf.ModulationParams.Params.Gfsk.ModulationShaping = MOD_SHAPING_G_BT_1;
-            SubgRf.ModulationParams.Params.Gfsk.Bandwidth = RadioGetFskBandwidthRegValue( bandwidth );
+            SubgRf.ModulationParams.Params.Gfsk.Bandwidth = SUBGRF_GetFskBandwidthRegValue( bandwidth );
 
             SubgRf.PacketParams.PacketType = PACKET_TYPE_GFSK;
             SubgRf.PacketParams.Params.Gfsk.PreambleLength = ( preambleLen << 3 ); // convert byte into bit
@@ -1139,6 +897,7 @@ static void RadioSetRxConfig( RadioModems_t modem, uint32_t bandwidth,
             SUBGRF_SetSyncWord( ( uint8_t[] ){ 0xC1, 0x94, 0xC1, 0x00, 0x00, 0x00, 0x00, 0x00 } );
             SUBGRF_SetWhiteningSeed( 0x01FF );
 
+            /*timeout unused when SubgRf.RxContinuous*/
             SubgRf.RxTimeout = ( uint32_t )(( symbTimeout * 8 * 1000 ) /datarate);
             break;
 
@@ -1190,20 +949,20 @@ static void RadioSetRxConfig( RadioModems_t modem, uint32_t bandwidth,
             SUBGRF_SetPacketParams( &SubgRf.PacketParams );
             SUBGRF_SetLoRaSymbNumTimeout( symbTimeout );
 
-            /* WORKAROUND - Optimizing the Inverted IQ Operation, see DS_SX1261-2_V1.2 datasheet chapter 15.4 */
+            // WORKAROUND - Optimizing the Inverted IQ Operation, see DS_SX1261-2_V1.2 datasheet chapter 15.4
             if( SubgRf.PacketParams.Params.LoRa.InvertIQ == LORA_IQ_INVERTED )
             {
-                /* RegIqPolaritySetup = @address 0x0736 */
+                // RegIqPolaritySetup = @address 0x0736
                 SUBGRF_WriteRegister( 0x0736, SUBGRF_ReadRegister( 0x0736 ) & ~( 1 << 2 ) );
             }
             else
             {
-                /* RegIqPolaritySetup @address 0x0736 */
+                // RegIqPolaritySetup @address 0x0736
                 SUBGRF_WriteRegister( 0x0736, SUBGRF_ReadRegister( 0x0736 ) | ( 1 << 2 ) );
             }
-            /* WORKAROUND END */
+            // WORKAROUND END
 
-            /* Timeout Max, Timeout handled directly in SetRx function */
+            // Timeout Max, Timeout handled directly in SetRx function
             SubgRf.RxTimeout = 0xFFFF;
 
             break;
@@ -1218,23 +977,15 @@ static void RadioSetTxConfig( RadioModems_t modem, int8_t power, uint32_t fdev,
                               bool fixLen, bool crcOn, bool freqHopOn,
                               uint8_t hopPeriod, bool iqInverted, uint32_t timeout )
 {
-
+    RFW_DeInit(); /* ST_WORKAROUND: Switch Off FwPacketDecoding by default */
     switch( modem )
     {
-        case MODEM_SIGFOX_TX:
-            RadioSetModem(MODEM_SIGFOX_TX);
-            SubgRf.ModulationParams.PacketType = PACKET_TYPE_BPSK;
-            SubgRf.ModulationParams.Params.Bpsk.BitRate           = datarate;
-            SubgRf.ModulationParams.Params.Bpsk.ModulationShaping = MOD_SHAPING_DBPSK;
-            SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
-            break;
-
         case MODEM_FSK:
             SubgRf.ModulationParams.PacketType = PACKET_TYPE_GFSK;
             SubgRf.ModulationParams.Params.Gfsk.BitRate = datarate;
 
             SubgRf.ModulationParams.Params.Gfsk.ModulationShaping = MOD_SHAPING_G_BT_1;
-            SubgRf.ModulationParams.Params.Gfsk.Bandwidth = RadioGetFskBandwidthRegValue( bandwidth );
+            SubgRf.ModulationParams.Params.Gfsk.Bandwidth = SUBGRF_GetFskBandwidthRegValue( bandwidth );
             SubgRf.ModulationParams.Params.Gfsk.Fdev = fdev;
 
             SubgRf.PacketParams.PacketType = PACKET_TYPE_GFSK;
@@ -1296,7 +1047,6 @@ static void RadioSetTxConfig( RadioModems_t modem, int8_t power, uint32_t fdev,
             {
                 SubgRf.PacketParams.Params.LoRa.PreambleLength = preambleLen;
             }
-
             SubgRf.PacketParams.Params.LoRa.HeaderType = ( RadioLoRaPacketLengthsMode_t )fixLen;
             SubgRf.PacketParams.Params.LoRa.PayloadLength = MaxPayloadLength;
             SubgRf.PacketParams.Params.LoRa.CrcMode = ( RadioLoRaCrcModes_t )crcOn;
@@ -1306,24 +1056,24 @@ static void RadioSetTxConfig( RadioModems_t modem, int8_t power, uint32_t fdev,
             RadioSetModem( ( SubgRf.ModulationParams.PacketType == PACKET_TYPE_GFSK ) ? MODEM_FSK : MODEM_LORA );
             SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
             SUBGRF_SetPacketParams( &SubgRf.PacketParams );
+            break;
+
+        case MODEM_SIGFOX_TX:
+            RadioSetModem(MODEM_SIGFOX_TX);
+            SubgRf.ModulationParams.PacketType = PACKET_TYPE_BPSK;
+            SubgRf.ModulationParams.Params.Bpsk.BitRate           = datarate;
+            SubgRf.ModulationParams.Params.Bpsk.ModulationShaping = MOD_SHAPING_DBPSK;
+            SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
+            break;
+
         default:
             break;
     }
 
-    /* WORKAROUND - Modulation Quality with 500 kHz LoRa� Bandwidth, see DS_SX1261-2_V1.2 datasheet chapter 15.1 */
-    if( ( modem == MODEM_LORA ) && ( SubgRf.ModulationParams.Params.LoRa.Bandwidth == LORA_BW_500 ) )
-    {
-        /* RegTxModulation = @address 0x0889 */
-        SUBGRF_WriteRegister( 0x0889, SUBGRF_ReadRegister( 0x0889 ) & ~( 1 << 2 ) );
-    }
-    else
-    {
-        /* RegTxModulation = @address 0x0889 */
-        SUBGRF_WriteRegister( 0x0889, SUBGRF_ReadRegister( 0x0889 ) | ( 1 << 2 ) );
-    }
-    /* WORKAROUND END */
+
 
     SubgRf.AntSwitchPaSelect = SUBGRF_SetRfTxPower( power );
+    RFW_SetAntSwitch( SubgRf.AntSwitchPaSelect ); /* ST_WORKAROUND: ?????? */
     SubgRf.TxTimeout = timeout;
 }
 
@@ -1377,19 +1127,6 @@ static uint32_t RadioGetGfskTimeOnAirNumerator( uint32_t datarate, uint8_t coder
                                                 uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
                                                 bool crcOn )
 {
-    /*
-    const RadioAddressComp_t addrComp = RADIO_ADDRESSCOMP_FILT_OFF;
-    const uint8_t syncWordLength = 3;
-
-    return ( preambleLen << 3 ) +
-           ( ( fixLen == false ) ? 8 : 0 ) +
-             ( syncWordLength << 3 ) +
-             ( ( payloadLen +
-               ( addrComp == RADIO_ADDRESSCOMP_FILT_OFF ? 0 : 1 ) +
-               ( ( crcOn == true ) ? 2 : 0 )
-               ) << 3
-             );
-    */
     /* ST_WORKAROUND_BEGIN: Simplified calculation without const values */
     return ( preambleLen << 3 ) +
            ( ( fixLen == false ) ? 8 : 0 ) + 24 +
@@ -1405,7 +1142,7 @@ static uint32_t RadioGetLoRaTimeOnAirNumerator( uint32_t bandwidth,
     int32_t crDenom           = coderate + 4;
     bool    lowDatareOptimize = false;
 
-    /* Ensure that the preamble length is at least 12 symbols when using SF5 or SF6 */
+    // Ensure that the preamble length is at least 12 symbols when using SF5 or SF6
     if( ( datarate == 5 ) || ( datarate == 6 ) )
     {
         if( preambleLen < 12 )
@@ -1491,16 +1228,17 @@ static uint32_t RadioTimeOnAir( RadioModems_t modem, uint32_t bandwidth,
         break;
     }
     // Perform integral ceil()
-    return DIVC(numerator, denominator);
+    return DIVC(numerator, denominator); /* ST_WORKAROUND : simplified calculation with macro usage */
 }
 
 static void RadioSend( uint8_t *buffer, uint8_t size )
 {
-    /* Radio IRQ is set to DIO1 by default */
-    SUBGRF_SetDioIrqParams( IRQ_TX_DONE | IRQ_RX_TX_TIMEOUT,
-                            IRQ_TX_DONE | IRQ_RX_TX_TIMEOUT,
+    /* ST_WORKAROUND_BEGIN : Set the debug pin and update the radio switch */
+    SUBGRF_SetDioIrqParams( IRQ_TX_DONE | IRQ_RX_TX_TIMEOUT | IRQ_TX_DBG,
+                            IRQ_TX_DONE | IRQ_RX_TX_TIMEOUT | IRQ_TX_DBG,
                             IRQ_RADIO_NONE,
                             IRQ_RADIO_NONE );
+    /* ST_WORKAROUND_END */
 
     /* ST_WORKAROUND_BEGIN : Set the debug pin and update the radio switch */
     /* Set DBG pin */
@@ -1508,8 +1246,17 @@ static void RadioSend( uint8_t *buffer, uint8_t size )
 
     /* Set RF switch */
     SUBGRF_SetSwitch(SubgRf.AntSwitchPaSelect, RFSWITCH_TX);
-    /* ST_WORKAROUND_END */
-
+    /* WORKAROUND - Modulation Quality with 500 kHz LoRaTM Bandwidth*/
+    /* RegTxModulation = @address 0x0889 */
+    if((SubgRf.Modem==MODEM_LORA) && (SubgRf.ModulationParams.Params.LoRa.Bandwidth == LORA_BW_500 ))
+    {
+        SUBGRF_WriteRegister( 0x0889, SUBGRF_ReadRegister( 0x0889 ) & ~( 1 << 2 ) );
+    }
+    else
+    {
+        SUBGRF_WriteRegister( 0x0889, SUBGRF_ReadRegister( 0x0889 ) | ( 1 << 2 ) );
+    }
+    /* WORKAROUND END */
     switch(SubgRf.Modem)
     {
         case MODEM_LORA:
@@ -1521,9 +1268,27 @@ static void RadioSend( uint8_t *buffer, uint8_t size )
         }
         case MODEM_FSK:
         {
-            SubgRf.PacketParams.Params.Gfsk.PayloadLength = size;
-            SUBGRF_SetPacketParams( &SubgRf.PacketParams );
-            SUBGRF_SendPayload( buffer, size, 0 );
+            if ( 1UL == RFW_Is_Init( ) )
+            {
+              uint8_t outsize;
+              if ( 0UL == RFW_TransmitInit( buffer,size, &outsize ) )
+              {
+                  SubgRf.PacketParams.Params.Gfsk.PayloadLength = outsize;
+                  SUBGRF_SetPacketParams( &SubgRf.PacketParams );
+                  SUBGRF_SendPayload( buffer, outsize, 0 );
+              }
+              else
+              {
+                MW_LOG( TS_ON, VLEVEL_M, "RadioSend Oversize\r\n");
+                return;
+              }
+            }
+            else
+            {
+              SubgRf.PacketParams.Params.Gfsk.PayloadLength = size;
+              SUBGRF_SetPacketParams( &SubgRf.PacketParams );
+              SUBGRF_SendPayload( buffer, size, 0 );
+            }
             break;
         }
         case MODEM_BPSK:
@@ -1536,35 +1301,32 @@ static void RadioSend( uint8_t *buffer, uint8_t size )
         }
         case MODEM_SIGFOX_TX:
         {
-            uint8_t outBuffer[35] = {0};
-            /*from bpsk to dbpsk*/
-            /*first 1 bit duplicated*/
-            payload_integration( outBuffer, buffer, size );
+            /* from bpsk to dbpsk */
+            /* first 1 bit duplicated */
+            /* RadioBuffer is 1 bytes more */
+            payload_integration( RadioBuffer, buffer, size );
 
             SubgRf.PacketParams.PacketType = PACKET_TYPE_BPSK;
             SubgRf.PacketParams.Params.Bpsk.PayloadLength = size + 1;
             SUBGRF_SetPacketParams( &SubgRf.PacketParams );
 
+            RadioWrite( 0x00F1, 0 ); // clean start-up LSB
+            RadioWrite( 0x00F0, 0 ); // clean start-up MSB
             if( SubgRf.ModulationParams.Params.Bpsk.BitRate == 100 )
             {
-                RadioWrite( 0x00F1, 0 ); // clean start-up LSB
-                RadioWrite( 0x00F0, 0 ); // clean start-up MSB
                 RadioWrite( 0x00F3, 0x70 ); // clean end of frame LSB
                 RadioWrite( 0x00F2, 0x1D ); // clean end of frame MSB
             }
             else // 600 bps
             {
-                RadioWrite( 0x00F1, 0 ); // clean start-up LSB
-                RadioWrite( 0x00F0, 0 ); // clean start-up MSB
                 RadioWrite( 0x00F3, 0xE1 ); // clean end of frame LSB
                 RadioWrite( 0x00F2, 0x04 ); // clean end of frame MSB
             }
 
-            uint16_t bitNum = (size*8)+2;
+            uint16_t bitNum = ( size * 8 ) + 2;
             RadioWrite( 0x00F4, ( bitNum >> 8 ) & 0x00FF );    // limit frame
             RadioWrite( 0x00F5, bitNum & 0x00FF );             // limit frame
-            //
-            SUBGRF_SendPayload( outBuffer, size+1 , 0xFFFFFF );
+            SUBGRF_SendPayload( RadioBuffer, size+1 , 0xFFFFFF );
             break;
         }
         default:
@@ -1592,11 +1354,17 @@ static void RadioStandby( void )
 
 static void RadioRx( uint32_t timeout )
 {
-    /* Radio IRQ is set to DIO1 by default */
-    SUBGRF_SetDioIrqParams( IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
-                            IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
-                            IRQ_RADIO_NONE,
-                            IRQ_RADIO_NONE );
+    if ( 1UL == RFW_Is_Init( ) )
+    {
+      RFW_ReceiveInit( );
+    }
+    else
+    {
+      SUBGRF_SetDioIrqParams( IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT | IRQ_CRC_ERROR | IRQ_HEADER_ERROR | IRQ_RX_DBG,
+                              IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT | IRQ_CRC_ERROR | IRQ_HEADER_ERROR | IRQ_RX_DBG,
+                              IRQ_RADIO_NONE,
+                              IRQ_RADIO_NONE );
+    }
 
     if( timeout != 0 )
     {
@@ -1624,19 +1392,26 @@ static void RadioRx( uint32_t timeout )
 
 static void RadioRxBoosted( uint32_t timeout )
 {
-    SUBGRF_SetDioIrqParams( IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
-                            IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
-                            IRQ_RADIO_NONE,
-                            IRQ_RADIO_NONE );
-
+    if (1UL==RFW_Is_Init())
+    {
+      RFW_ReceiveInit();
+    }
+    else
+    {
+      SUBGRF_SetDioIrqParams( IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT | IRQ_CRC_ERROR | IRQ_HEADER_ERROR | IRQ_RX_DBG,
+                              IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT | IRQ_CRC_ERROR | IRQ_HEADER_ERROR | IRQ_RX_DBG,
+                              IRQ_RADIO_NONE,
+                              IRQ_RADIO_NONE );
+    }
     if( timeout != 0 )
     {
-         TimerSetValue( &RxTimeoutTimer, timeout );
-         TimerStart( &RxTimeoutTimer );
+        TimerSetValue( &RxTimeoutTimer, timeout );
+        TimerStart( &RxTimeoutTimer );
     }
 
     /* RF switch configuration */
     SUBGRF_SetSwitch(SubgRf.AntSwitchPaSelect, RFSWITCH_RX);
+
     if( SubgRf.RxContinuous == true )
     {
         SUBGRF_SetRxBoosted( 0xFFFFFF ); // Rx Continuous
@@ -1651,18 +1426,25 @@ static void RadioSetRxDutyCycle( uint32_t rxTime, uint32_t sleepTime )
 {
     /* RF switch configuration */
     SUBGRF_SetSwitch(SubgRf.AntSwitchPaSelect, RFSWITCH_RX);
+
     SUBGRF_SetRxDutyCycle( rxTime, sleepTime );
 }
 
 static void RadioStartCad( void )
 {
-    SUBGRF_SetDioIrqParams( IRQ_CAD_CLEAR | IRQ_CAD_DETECTED, IRQ_CAD_CLEAR | IRQ_CAD_DETECTED, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+    /* RF switch configuration */
+    SUBGRF_SetSwitch(SubgRf.AntSwitchPaSelect, RFSWITCH_RX);
+
+    SUBGRF_SetDioIrqParams( IRQ_CAD_CLEAR | IRQ_CAD_DETECTED,
+                            IRQ_CAD_CLEAR | IRQ_CAD_DETECTED,
+                            IRQ_RADIO_NONE,
+                            IRQ_RADIO_NONE );
     SUBGRF_SetCad( );
 }
 
 static void RadioSetTxContinuousWave( uint32_t freq, int8_t power, uint16_t time )
 {
-    uint32_t timeout = (uint32_t)time * 1000;
+    uint32_t timeout = ( uint32_t )time * 1000;
     uint8_t antswitchpow;
 
     SUBGRF_SetRfFrequency( freq );
@@ -1727,25 +1509,34 @@ static void RadioSetPublicNetwork( bool enable )
     RadioSetModem( MODEM_LORA );
     if( enable == true )
     {
-      /* Change LoRa modem SyncWord */
-      SUBGRF_WriteRegister( REG_LR_SYNCWORD, ( LORA_MAC_PUBLIC_SYNCWORD >> 8 ) & 0xFF );
-      SUBGRF_WriteRegister( REG_LR_SYNCWORD + 1, LORA_MAC_PUBLIC_SYNCWORD & 0xFF );
+        // Change LoRa modem SyncWord
+        SUBGRF_WriteRegister( REG_LR_SYNCWORD, ( LORA_MAC_PUBLIC_SYNCWORD >> 8 ) & 0xFF );
+        SUBGRF_WriteRegister( REG_LR_SYNCWORD + 1, LORA_MAC_PUBLIC_SYNCWORD & 0xFF );
     }
     else
     {
-      /* Change LoRa modem SyncWord */
-      SUBGRF_WriteRegister( REG_LR_SYNCWORD, ( LORA_MAC_PRIVATE_SYNCWORD >> 8 ) & 0xFF );
-      SUBGRF_WriteRegister( REG_LR_SYNCWORD + 1, LORA_MAC_PRIVATE_SYNCWORD & 0xFF );
+        // Change LoRa modem SyncWord
+        SUBGRF_WriteRegister( REG_LR_SYNCWORD, ( LORA_MAC_PRIVATE_SYNCWORD >> 8 ) & 0xFF );
+        SUBGRF_WriteRegister( REG_LR_SYNCWORD + 1, LORA_MAC_PRIVATE_SYNCWORD & 0xFF );
     }
 }
 
 static uint32_t RadioGetWakeupTime( void )
 {
-  return SUBGRF_GetRadioWakeUpTime() + RADIO_WAKEUP_TIME;
+    return SUBGRF_GetRadioWakeUpTime() + RADIO_WAKEUP_TIME;
 }
 
-
 static void RadioOnTxTimeoutIrq( void* context )
+{
+    RADIO_TX_TIMEOUT_PROCESS();
+}
+
+static void RadioOnRxTimeoutIrq( void* context )
+{
+    RADIO_RX_TIMEOUT_PROCESS();
+}
+
+static void RadioOnTxTimeoutProcess( void )
 {
     /* ST_WORKAROUND_BEGIN: Reset DBG pin */
     DBG_GPIO_RADIO_TX(RST);
@@ -1757,7 +1548,7 @@ static void RadioOnTxTimeoutIrq( void* context )
     }
 }
 
-static void RadioOnRxTimeoutIrq( void* context )
+static void RadioOnRxTimeoutProcess( void )
 {
     /* ST_WORKAROUND_BEGIN: Reset DBG pin */
     DBG_GPIO_RADIO_RX(RST);
@@ -1771,210 +1562,538 @@ static void RadioOnRxTimeoutIrq( void* context )
 
 static void RadioOnDioIrq( RadioIrqMasks_t radioIrq )
 {
-  SubgRf.RadioIrq = radioIrq;
+    SubgRf.RadioIrq = radioIrq;
 
-  RadioIrqProcess();
+    RADIO_IRQ_PROCESS();
 }
 
 static void RadioIrqProcess( void )
 {
-  uint8_t size;
+    uint8_t size = 0;
+    int32_t cfo = 0;
 
-  switch (SubgRf.RadioIrq)
-  {
-  case IRQ_TX_DONE:
-    /* ST_WORKAROUND_BEGIN: Reset DBG pin */
-    DBG_GPIO_RADIO_TX(RST);
-    /* ST_WORKAROUND_END */
-
-    TimerStop( &TxTimeoutTimer );
-    SUBGRF_SetStandby( STDBY_RC );
-    if( ( RadioEvents != NULL ) && ( RadioEvents->TxDone != NULL ) )
+    switch ( SubgRf.RadioIrq )
     {
-      RadioEvents->TxDone( );
-    }
-    break;
+    case IRQ_TX_DONE:
+        /* ST_WORKAROUND_BEGIN: Reset DBG pin */
+        DBG_GPIO_RADIO_TX(RST);
+        /* ST_WORKAROUND_END */
 
-  case IRQ_RX_DONE: 
-    /* ST_WORKAROUND_BEGIN: Reset DBG pin */
-    DBG_GPIO_RADIO_RX(RST);
-    /* ST_WORKAROUND_END */
+        TimerStop( &TxTimeoutTimer );
+        //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
+        SUBGRF_SetStandby( STDBY_RC );
 
-    TimerStop( &RxTimeoutTimer );
-    if( SubgRf.RxContinuous == false )
-    {
-      //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
-      SUBGRF_SetStandby( STDBY_RC );
-
-      // WORKAROUND - Implicit Header Mode Timeout Behavior, see DS_SX1261-2_V1.2 datasheet chapter 15.3
-      // RegRtcControl = @address 0x0902
-      SUBGRF_WriteRegister( 0x0902, 0x00 );
-      // RegEventMask = @address 0x0944
-      SUBGRF_WriteRegister( 0x0944, SUBGRF_ReadRegister( 0x0944 ) | ( 1 << 1 ) );
-      // WORKAROUND END
-    }
-    SUBGRF_GetPayload( RadioRxPayload, &size , 255 );
-    SUBGRF_GetPacketStatus( &(SubgRf.PacketStatus) );
-    if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) )
-    {
-      switch (SubgRf.PacketStatus.packetType)
-      {
-      case PACKET_TYPE_LORA:
-        RadioEvents->RxDone( RadioRxPayload, size, SubgRf.PacketStatus.Params.LoRa.RssiPkt, SubgRf.PacketStatus.Params.LoRa.SnrPkt );
+        if ( RFW_Is_LongPacketModeEnabled() == 1 )
+        {
+            RFW_DeInit_TxLongPacket( );
+        }
+
+        if( ( RadioEvents != NULL ) && ( RadioEvents->TxDone != NULL ) )
+        {
+            RadioEvents->TxDone( );
+        }
+        break;
+
+    case IRQ_RX_DONE:
+        /* ST_WORKAROUND_BEGIN: Reset DBG pin */
+        DBG_GPIO_RADIO_RX(RST);
+        /* ST_WORKAROUND_END */
+
+        TimerStop( &RxTimeoutTimer );
+        if( SubgRf.RxContinuous == false )
+        {
+            //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
+            SUBGRF_SetStandby( STDBY_RC );
+
+            // WORKAROUND - Implicit Header Mode Timeout Behavior, see DS_SX1261-2_V1.2 datasheet chapter 15.3
+            // RegRtcControl = @address 0x0902
+            SUBGRF_WriteRegister( 0x0902, 0x00 );
+            // RegEventMask = @address 0x0944
+            SUBGRF_WriteRegister( 0x0944, SUBGRF_ReadRegister( 0x0944 ) | ( 1 << 1 ) );
+            // WORKAROUND END
+        }
+        SUBGRF_GetPayload( RadioBuffer, &size , 255 );
+        SUBGRF_GetPacketStatus( &(SubgRf.PacketStatus) );
+        if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) )
+        {
+            switch ( SubgRf.PacketStatus.packetType )
+            {
+            case PACKET_TYPE_LORA:
+                RadioEvents->RxDone( RadioBuffer, size, SubgRf.PacketStatus.Params.LoRa.RssiPkt, SubgRf.PacketStatus.Params.LoRa.SnrPkt );
+                break;
+            default:
+                SUBGRF_GetCFO( SubgRf.ModulationParams.Params.Gfsk.BitRate, &cfo );
+                RadioEvents->RxDone( RadioBuffer, size, SubgRf.PacketStatus.Params.Gfsk.RssiAvg, (int8_t) DIVR(cfo, 1000) );
+                break;
+            }
+        }
         break;
-      default:
-        RadioEvents->RxDone( RadioRxPayload, size, SubgRf.PacketStatus.Params.Gfsk.RssiAvg, (int8_t)(SubgRf.PacketStatus.Params.Gfsk.FreqError) );
+
+    case IRQ_CAD_CLEAR:
+        //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
+        SUBGRF_SetStandby( STDBY_RC );
+        if( ( RadioEvents != NULL ) && ( RadioEvents->CadDone != NULL ) )
+        {
+            RadioEvents->CadDone( false );
+        }
+        break;
+    case IRQ_CAD_DETECTED:
+        //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
+        SUBGRF_SetStandby( STDBY_RC );
+        if( ( RadioEvents != NULL ) && ( RadioEvents->CadDone != NULL ) )
+        {
+            RadioEvents->CadDone( true );
+        }
         break;
-      } 
-    }
-    break;
 
-  case IRQ_CRC_ERROR:
 
-    if( SubgRf.RxContinuous == false )
-    {
-      //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
-      SUBGRF_SetStandby( STDBY_RC );
-    }
-    if( ( RadioEvents != NULL ) && ( RadioEvents->RxError ) )
-    {
-      RadioEvents->RxError( );
-    }
-    break;
+    case IRQ_RX_TX_TIMEOUT:
+        MW_LOG( TS_ON, VLEVEL_M,  "IRQ_RX_TX_TIMEOUT\r\n" );
+        if( SUBGRF_GetOperatingMode( ) == MODE_TX )
+        {
+            /* ST_WORKAROUND_BEGIN: Reset DBG pin */
+            DBG_GPIO_RADIO_TX(RST);
+            /* ST_WORKAROUND_END */
+
+            TimerStop( &TxTimeoutTimer );
+            //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
+            SUBGRF_SetStandby( STDBY_RC );
+            if( ( RadioEvents != NULL ) && ( RadioEvents->TxTimeout != NULL ) )
+            {
+                RadioEvents->TxTimeout( );
+            }
+        }
+        else if( SUBGRF_GetOperatingMode( ) == MODE_RX )
+        {
+            /* ST_WORKAROUND_BEGIN: Reset DBG pin */
+            DBG_GPIO_RADIO_RX(RST);
+            /* ST_WORKAROUND_END */
+
+            TimerStop( &RxTimeoutTimer );
+            //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
+            SUBGRF_SetStandby( STDBY_RC );
+            if( ( RadioEvents != NULL ) && ( RadioEvents->RxTimeout != NULL ) )
+            {
+                RadioEvents->RxTimeout( );
+            }
+        }
+        break;
+
+    case IRQ_PREAMBLE_DETECTED:
+        MW_LOG( TS_ON, VLEVEL_M,  "PRE OK\r\n" );
+        break;
+
+    case IRQ_SYNCWORD_VALID:
+        MW_LOG( TS_ON, VLEVEL_M,  "SYNC OK\r\n" );
+        if ( 1UL == RFW_Is_Init( ) )
+        {
+            RFW_ReceivePayload( );
+        }
+        break;
 
+    case IRQ_HEADER_VALID:
+        MW_LOG( TS_ON, VLEVEL_M,  "HDR OK\r\n" );
+        break;
 
-  case IRQ_CAD_CLEAR:
-    //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
-    SUBGRF_SetStandby( STDBY_RC );
-    if( ( RadioEvents != NULL ) && ( RadioEvents->CadDone != NULL ) )
+    case IRQ_HEADER_ERROR:
+        TimerStop( &RxTimeoutTimer );
+        if( SubgRf.RxContinuous == false )
+        {
+            //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
+            SUBGRF_SetStandby( STDBY_RC );
+        }
+        if( ( RadioEvents != NULL ) && ( RadioEvents->RxTimeout != NULL ) )
+        {
+            RadioEvents->RxTimeout( );
+            MW_LOG( TS_ON, VLEVEL_M,  "HDR KO\r\n" );
+        }
+        break;
+
+    case IRQ_CRC_ERROR:
+        MW_LOG( TS_ON, VLEVEL_M,  "IRQ_CRC_ERROR\r\n" );
+
+        if( SubgRf.RxContinuous == false )
+        {
+            //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
+            SUBGRF_SetStandby( STDBY_RC );
+        }
+        if( ( RadioEvents != NULL ) && ( RadioEvents->RxError ) )
+        {
+            RadioEvents->RxError( );
+        }
+        break;
+    default:
+        break;
+  }
+}
+
+static void RadioTxPrbs( void )
+{
+    SUBGRF_SetSwitch( SubgRf.AntSwitchPaSelect, RFSWITCH_TX );
+    Radio.Write( SUBGHZ_PKTCTL1A, 0x2d );  // sel mode prbs9 instead of preamble
+    SUBGRF_SetTxInfinitePreamble( );
+    SUBGRF_SetTx( 0x0fffff );
+}
+
+static void RadioTxCw( int8_t power )
+{
+    uint8_t paselect = SUBGRF_SetRfTxPower( power );
+    SUBGRF_SetSwitch( paselect, RFSWITCH_TX );
+    SUBGRF_SetTxContinuousWave( );
+}
+
+static void payload_integration( uint8_t *outBuffer, uint8_t *inBuffer, uint8_t size )
+{
+    uint8_t prevInt = 0;
+    uint8_t currBit;
+    uint8_t index_bit;
+    uint8_t index_byte;
+    uint8_t index_bit_out;
+    uint8_t index_byte_out;
+    int i = 0;
+
+    for (i = 0; i < size; i++)
     {
-      RadioEvents->CadDone( false );
+        /* reverse all inputs */
+        inBuffer[i] = ~inBuffer[i];
+        /* init outBuffer */
+        outBuffer[i] = 0;
     }
-    break;
-  case IRQ_CAD_DETECTED:
-    //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
-    SUBGRF_SetStandby( STDBY_RC );
-    if( ( RadioEvents != NULL ) && ( RadioEvents->CadDone != NULL ) )
+
+    for (i = 0; i < (size * 8); i++)
     {
-      RadioEvents->CadDone( true );
+        /* index to take bit in inBuffer */
+        index_bit = 7 - ( i % 8 );
+        index_byte = i / 8;
+        /* index to place bit in outBuffer is shifted 1 bit right */
+        index_bit_out = 7 - ( ( i + 1 ) % 8 );
+        index_byte_out = ( i + 1 ) / 8;
+        /* extract current bit from input */
+        currBit = ( inBuffer[index_byte] >> index_bit ) & 0x01;
+        /* integration */
+        prevInt ^= currBit;
+        /* write result integration in output */
+        outBuffer[index_byte_out] |= ( prevInt << index_bit_out );
     }
-    break;
 
-  case IRQ_RX_TX_TIMEOUT:
-    if( SUBGRF_GetOperatingMode( ) == MODE_TX )
+    outBuffer[size] = ( prevInt << 7 ) | ( prevInt << 6 ) | ( ( ( !prevInt ) & 0x01 ) << 5 ) ;
+}
+
+static int32_t RadioSetRxGenericConfig( GenericModems_t modem, RxConfigGeneric_t* config, uint32_t rxContinuous, uint32_t symbTimeout )
+{
+    int32_t status = 0;
+    uint8_t syncword[8] = {0};
+    uint8_t MaxPayloadLength;
+
+    RFW_DeInit( ); /* switch Off FwPacketDecoding by default */
+
+    if( rxContinuous != 0 )
     {
-      /* ST_WORKAROUND_BEGIN: Reset DBG pin */
-      DBG_GPIO_RADIO_TX(RST);
-      /* ST_WORKAROUND_END */
-
-      TimerStop( &TxTimeoutTimer );
-      //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
-      SUBGRF_SetStandby( STDBY_RC );
-      if( ( RadioEvents != NULL ) && ( RadioEvents->TxTimeout != NULL ) )
-      {
-        RadioEvents->TxTimeout( );
-      }
+        symbTimeout = 0;
     }
-    else if( SUBGRF_GetOperatingMode( ) == MODE_RX )
+    SubgRf.RxContinuous = ( rxContinuous == 0 ) ? false : true;
+
+    switch( modem )
     {
-      /* ST_WORKAROUND_BEGIN: Reset DBG pin */
-      DBG_GPIO_RADIO_RX(RST);
-      /* ST_WORKAROUND_END */
-
-      TimerStop( &RxTimeoutTimer );
-      //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
-      SUBGRF_SetStandby( STDBY_RC );
-      if( ( RadioEvents != NULL ) && ( RadioEvents->RxTimeout != NULL ) )
-      {
-        RadioEvents->RxTimeout( );
-      }
-    }
-    break;
+    case GENERIC_FSK:
+        if( ( config->fsk.BitRate == 0 ) || ( config->fsk.PreambleLen == 0 ) )
+        {
+            return -1;
+        }
+        if( config->fsk.SyncWordLength > 8 )
+        {
+            return -1;
+        }
+        else
+        {
+            for(int i = 0; i < config->fsk.SyncWordLength; i++)
+            {
+                syncword[i] = config->fsk.SyncWord[i];
+            }
+        }
 
-  case IRQ_PREAMBLE_DETECTED:
-    MW_LOG( TS_ON, VLEVEL_M,  "PRE OK\r\n" );
-    break;
+        SUBGRF_SetStopRxTimerOnPreambleDetect( ( config->fsk.StopTimerOnPreambleDetect == 0 ) ? false : true );
 
-  case IRQ_SYNCWORD_VALID:
+        SubgRf.ModulationParams.PacketType = PACKET_TYPE_GFSK;
+        SubgRf.ModulationParams.Params.Gfsk.BitRate = config->fsk.BitRate;
+        SubgRf.ModulationParams.Params.Gfsk.ModulationShaping = (RadioModShapings_t) config->fsk.ModulationShaping;
+        SubgRf.ModulationParams.Params.Gfsk.Bandwidth = SUBGRF_GetFskBandwidthRegValue( config->fsk.Bandwidth );
 
-    MW_LOG( TS_ON, VLEVEL_M,  "SYNC OK\r\n" );
-    break;
+        SubgRf.PacketParams.PacketType = PACKET_TYPE_GFSK;
+        SubgRf.PacketParams.Params.Gfsk.PreambleLength = ( config->fsk.PreambleLen ) << 3 ; // convert byte into bit
+        SubgRf.PacketParams.Params.Gfsk.PreambleMinDetect = ( RadioPreambleDetection_t ) config->fsk.PreambleMinDetect;
+        SubgRf.PacketParams.Params.Gfsk.SyncWordLength = ( config->fsk.SyncWordLength ) << 3; // convert byte into bit
+        SubgRf.PacketParams.Params.Gfsk.AddrComp = ( RadioAddressComp_t ) config->fsk.AddrComp;
 
-  case IRQ_HEADER_VALID:
+        if( config->fsk.LengthMode == RADIO_FSK_PACKET_FIXED_LENGTH )
+        {
+            SubgRf.PacketParams.Params.Gfsk.PayloadLength = config->fsk.MaxPayloadLength;
+        }
+        else if( config->fsk.LengthMode == RADIO_FSK_PACKET_2BYTES_LENGTH )
+        {
+          /* Set max in the radio, in long packet mode will be tuned based dynamically on received chunk */
+          SubgRf.PacketParams.Params.Gfsk.PayloadLength = 0xFF;
+        }
+        else
+        {
+          /* Set max in the radio */
+          SubgRf.PacketParams.Params.Gfsk.PayloadLength = 0xFF;
+        }
 
-    MW_LOG( TS_ON, VLEVEL_M,  "HDR OK\r\n" );
-    break;
+        if( ( config->fsk.Whitening == RADIO_FSK_DC_IBM_WHITENING ) || ( config->fsk.LengthMode == RADIO_FSK_PACKET_2BYTES_LENGTH ) )
+        {
+          /* Supports only RADIO_FSK_CRC_2_BYTES_IBM or RADIO_FSK_CRC_2_BYTES_CCIT*/
+          if( ( config->fsk.CrcLength != RADIO_FSK_CRC_2_BYTES_IBM ) && ( config->fsk.CrcLength != RADIO_FSK_CRC_2_BYTES_CCIT ) && ( config->fsk.CrcLength != RADIO_FSK_CRC_OFF ) )
+          {
+            return -1;
+          }
+          ConfigGeneric_t ConfigGeneric;
+          ConfigGeneric.rtx = CONFIG_RX;
+          ConfigGeneric.RxConfig = config;
+          if( 0UL != RFW_Init( &ConfigGeneric, RadioEvents, &RxTimeoutTimer ) )
+          {
+            return -1;
+          }
+          /* Whitening off, will be processed by FW, switch off built-in radio whitening*/
+          SubgRf.PacketParams.Params.Gfsk.DcFree = ( RadioDcFree_t ) RADIO_FSK_DC_FREE_OFF;
+          /* Crc off, Crc processed by FW, switch off built-in radio Crc*/
+          SubgRf.PacketParams.Params.Gfsk.CrcLength = ( RadioCrcTypes_t ) RADIO_CRC_OFF;
+          /* Length contained in Tx, but will be processed by FW after de-whitening*/
+          SubgRf.PacketParams.Params.Gfsk.HeaderType = ( RadioPacketLengthModes_t ) RADIO_PACKET_FIXED_LENGTH;
+        }
+        else
+        {
+          SubgRf.PacketParams.Params.Gfsk.CrcLength = ( RadioCrcTypes_t ) config->fsk.CrcLength;
+          SubgRf.PacketParams.Params.Gfsk.DcFree = ( RadioDcFree_t ) config->fsk.Whitening;
+          SubgRf.PacketParams.Params.Gfsk.HeaderType = ( RadioPacketLengthModes_t ) config->fsk.LengthMode;
+        }
 
-  case IRQ_HEADER_ERROR:
-    TimerStop( &RxTimeoutTimer );
-    if( SubgRf.RxContinuous == false )
-    {
-      //!< Update operating mode state to a value lower than \ref MODE_STDBY_XOSC
-      SUBGRF_SetStandby( STDBY_RC );
-    }
-    if( ( RadioEvents != NULL ) && ( RadioEvents->RxTimeout != NULL ) )
-    {
-      RadioEvents->RxTimeout( );
-      MW_LOG( TS_ON, VLEVEL_M,  "HDR KO\r\n" );
-    }
-    break;
+        RadioStandby( );
+        RadioSetModem( MODEM_FSK );
+        SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
+        SUBGRF_SetPacketParams( &SubgRf.PacketParams );
+        SUBGRF_SetSyncWord( syncword );
+        SUBGRF_SetWhiteningSeed( config->fsk.whiteSeed );
+        SUBGRF_SetCrcPolynomial( config->fsk.CrcPolynomial );
+        /* timeout unused when SubgRf.RxContinuous */
+        SubgRf.RxTimeout = ( uint32_t )( ( symbTimeout * 1000 * 8 ) / config->fsk.BitRate );
+        break;
+    case GENERIC_LORA:
+        if( config->lora.PreambleLen == 0 )
+        {
+            return -1;
+        }
 
-  default:
-    break;
+        if( config->lora.LengthMode == RADIO_LORA_PACKET_FIXED_LENGTH )
+        {
+            MaxPayloadLength = config->fsk.MaxPayloadLength;
+        }
+        else
+        {
+            MaxPayloadLength = 0xFF;
+        }
+        SUBGRF_SetStopRxTimerOnPreambleDetect( ( config->lora.StopTimerOnPreambleDetect == 0 ) ? false : true );
+        SUBGRF_SetLoRaSymbNumTimeout( symbTimeout );
+
+        SubgRf.ModulationParams.PacketType = PACKET_TYPE_LORA;
+        SubgRf.ModulationParams.Params.LoRa.SpreadingFactor = ( RadioLoRaSpreadingFactors_t ) config->lora.SpreadingFactor;
+        SubgRf.ModulationParams.Params.LoRa.Bandwidth = ( RadioLoRaBandwidths_t ) config->lora.Bandwidth;
+        SubgRf.ModulationParams.Params.LoRa.CodingRate = ( RadioLoRaCodingRates_t ) config->lora.Coderate;
+        switch( config->lora.LowDatarateOptimize )
+        {
+        case RADIO_LORA_LOWDR_OPT_OFF:
+            SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 0;
+            break;
+        case RADIO_LORA_LOWDR_OPT_ON:
+            SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 1;
+            break;
+        case RADIO_LORA_LOWDR_OPT_AUTO:
+            if( ( config->lora.SpreadingFactor == RADIO_LORA_SF11 ) || ( config->lora.SpreadingFactor == RADIO_LORA_SF12 ) )
+            {
+              SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 1;
+            }
+            else
+            {
+              SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 0;
+            }
+            break;
+        default:
+            break;
+        }
 
-  }
-}
+        SubgRf.PacketParams.PacketType = PACKET_TYPE_LORA;
+        SubgRf.PacketParams.Params.LoRa.PreambleLength = config->lora.PreambleLen;
+        SubgRf.PacketParams.Params.LoRa.HeaderType = ( RadioLoRaPacketLengthsMode_t ) config->lora.LengthMode;
+        SubgRf.PacketParams.Params.LoRa.PayloadLength = MaxPayloadLength;
+        SubgRf.PacketParams.Params.LoRa.CrcMode = ( RadioLoRaCrcModes_t ) config->lora.CrcMode;
+        SubgRf.PacketParams.Params.LoRa.InvertIQ = ( RadioLoRaIQModes_t ) config->lora.IqInverted;
 
-static void RadioTxPrbs(void )
-{
-    SUBGRF_SetSwitch(SubgRf.AntSwitchPaSelect, RFSWITCH_TX);
-    Radio.Write(0x6B8, 0x2d);  // sel mode prbs9 instead of preamble
-    SUBGRF_SetTxInfinitePreamble();
-    SUBGRF_SetTx(0x0fffff);
-}
+        RadioStandby( );
+        RadioSetModem( MODEM_LORA );
+        SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
+        SUBGRF_SetPacketParams( &SubgRf.PacketParams );
 
-static void RadioTxCw( int8_t power )
-{
-    uint8_t paselect = SUBGRF_SetRfTxPower( power );
-    SUBGRF_SetSwitch( paselect, RFSWITCH_TX);
-    SUBGRF_SetTxContinuousWave();
+        // WORKAROUND - Optimizing the Inverted IQ Operation, see DS_SX1261-2_V1.2 datasheet chapter 15.4
+        if( SubgRf.PacketParams.Params.LoRa.InvertIQ == LORA_IQ_INVERTED )
+        {
+            // RegIqPolaritySetup = @address 0x0736
+            SUBGRF_WriteRegister( 0x0736, SUBGRF_ReadRegister( 0x0736 ) & ~( 1 << 2 ) );
+        }
+        else
+        {
+            // RegIqPolaritySetup @address 0x0736
+            SUBGRF_WriteRegister( 0x0736, SUBGRF_ReadRegister( 0x0736 ) | ( 1 << 2 ) );
+        }
+        // WORKAROUND END
+
+        // Timeout Max, Timeout handled directly in SetRx function
+        SubgRf.RxTimeout = 0xFFFF;
+        break;
+    default:
+        break;
+    }
+    return status;
 }
 
-static void payload_integration( uint8_t *outBuffer, uint8_t *inBuffer, uint8_t size)
+static int32_t RadioSetTxGenericConfig( GenericModems_t modem, TxConfigGeneric_t* config, int8_t power, uint32_t timeout )
 {
-  uint8_t prevInt=0;
-  uint8_t currBit;
-  uint8_t index_bit;
-  uint8_t index_byte;
-  uint8_t index_bit_out;
-  uint8_t index_byte_out;
-  int i=0;
-
-  for (i=0; i<size; i++)
-  {
-    /*reverse all inputs*/
-    inBuffer[i]=~inBuffer[i];
-    /*init outBuffer*/
-    outBuffer[i]=0;
-  }
+    uint8_t syncword[8] = {0};
+    RFW_DeInit( ); /* switch Off FwPacketDecoding by default */
+    switch( modem )
+    {
+    case GENERIC_FSK:
+        if( ( config->fsk.BitRate == 0 ) || ( config->fsk.PreambleLen == 0 ) )
+        {
+            return -1;
+        }
+        if( config->fsk.SyncWordLength > 8 )
+        {
+            return -1;
+        }
+        else
+        {
+            for(int i = 0; i < config->fsk.SyncWordLength; i++)
+            {
+                syncword[i] = config->fsk.SyncWord[i];
+            }
+        }
+        SubgRf.ModulationParams.PacketType = PACKET_TYPE_GFSK;
+        SubgRf.ModulationParams.Params.Gfsk.BitRate = config->fsk.BitRate;
+        SubgRf.ModulationParams.Params.Gfsk.ModulationShaping = ( RadioModShapings_t ) config->fsk.ModulationShaping;
+        SubgRf.ModulationParams.Params.Gfsk.Bandwidth = SUBGRF_GetFskBandwidthRegValue( config->fsk.Bandwidth );
+        SubgRf.ModulationParams.Params.Gfsk.Fdev = config->fsk.FrequencyDeviation;
+    
+        SubgRf.PacketParams.PacketType = PACKET_TYPE_GFSK;
+        SubgRf.PacketParams.Params.Gfsk.PreambleLength = ( config->fsk.PreambleLen ) << 3; // convert byte into bit
+        SubgRf.PacketParams.Params.Gfsk.PreambleMinDetect = RADIO_PREAMBLE_DETECTOR_08_BITS; // don't care in tx
+        SubgRf.PacketParams.Params.Gfsk.SyncWordLength = ( config->fsk.SyncWordLength ) << 3; // convert byte into bit
+        SubgRf.PacketParams.Params.Gfsk.AddrComp = RADIO_ADDRESSCOMP_FILT_OFF; // don't care in tx
+
+        if( ( config->fsk.Whitening == RADIO_FSK_DC_IBM_WHITENING ) || ( config->fsk.HeaderType == RADIO_FSK_PACKET_2BYTES_LENGTH ) )
+        {
+            /* Supports only RADIO_FSK_CRC_2_BYTES_IBM or RADIO_FSK_CRC_2_BYTES_CCIT */
+            if( ( config->fsk.CrcLength != RADIO_FSK_CRC_2_BYTES_IBM ) && ( config->fsk.CrcLength != RADIO_FSK_CRC_2_BYTES_CCIT ) &&( config->fsk.CrcLength != RADIO_FSK_CRC_OFF ) )
+            {
+                return -1;
+            }
+            ConfigGeneric_t ConfigGeneric;
+            ConfigGeneric.rtx = CONFIG_TX;
+            ConfigGeneric.TxConfig = config;
+            if( 0UL != RFW_Init( &ConfigGeneric, RadioEvents, &TxTimeoutTimer ) )
+            {
+              return -1;
+            }
+            /* whitening off, will be processed by FW, switch off built-in radio whitening */
+            SubgRf.PacketParams.Params.Gfsk.DcFree = ( RadioDcFree_t ) RADIO_FSK_DC_FREE_OFF;
+            /* Crc processed by FW, switch off built-in radio Crc */
+            SubgRf.PacketParams.Params.Gfsk.CrcLength = (RadioCrcTypes_t) RADIO_CRC_OFF;
+            /* length contained in Tx, but will be processed by FW after de-whitening */
+            SubgRf.PacketParams.Params.Gfsk.HeaderType = ( RadioPacketLengthModes_t ) RADIO_PACKET_FIXED_LENGTH;
+        }
+        else
+        {
+          SubgRf.PacketParams.Params.Gfsk.CrcLength = ( RadioCrcTypes_t ) config->fsk.CrcLength;
+          SubgRf.PacketParams.Params.Gfsk.DcFree = ( RadioDcFree_t ) config->fsk.Whitening;
+          SubgRf.PacketParams.Params.Gfsk.HeaderType = ( RadioPacketLengthModes_t ) config->fsk.HeaderType;
+        }
 
-  for (i=0; i<size*8; i++)
-  {
-    /*index to take bit in inBuffer*/
-    index_bit = 7 - (i%8);
-    index_byte = i / 8;
-    /*index to place bit in outBuffer is shifted 1 bit rigth*/
-    index_bit_out = 7 - ((i+1)%8);
-    index_byte_out = (i+1) / 8;
-    /*extract current bit from input*/
-    currBit = (inBuffer[index_byte] >> index_bit) & 0x01; 
-    /*integration*/
-    prevInt ^= currBit;
-    /* write result integration in output*/
-    outBuffer[index_byte_out]|= (prevInt << index_bit_out);
-  }
+        RadioStandby( );
+        RadioSetModem( MODEM_FSK );
+        SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
+        SUBGRF_SetPacketParams( &SubgRf.PacketParams );
+        SUBGRF_SetSyncWord( syncword );
+        SUBGRF_SetWhiteningSeed( config->fsk.whiteSeed );
+        SUBGRF_SetCrcPolynomial(config->fsk.CrcPolynomial );
+        break;
+    case GENERIC_LORA:
+        SubgRf.ModulationParams.PacketType = PACKET_TYPE_LORA;
+        SubgRf.ModulationParams.Params.LoRa.SpreadingFactor = ( RadioLoRaSpreadingFactors_t ) config->lora.SpreadingFactor;
+        SubgRf.ModulationParams.Params.LoRa.Bandwidth = ( RadioLoRaBandwidths_t ) config->lora.Bandwidth;
+        SubgRf.ModulationParams.Params.LoRa.CodingRate = ( RadioLoRaCodingRates_t ) config->lora.Coderate;
+        switch( config->lora.LowDatarateOptimize )
+        {
+          case RADIO_LORA_LOWDR_OPT_OFF:
+            SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 0;
+            break;
+          case RADIO_LORA_LOWDR_OPT_ON:
+            SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 1;
+            break;
+          case RADIO_LORA_LOWDR_OPT_AUTO:
+            if( ( config->lora.SpreadingFactor == RADIO_LORA_SF11 ) || ( config->lora.SpreadingFactor == RADIO_LORA_SF12 ) )
+            {
+              SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 1;
+            }
+            else
+            {
+              SubgRf.ModulationParams.Params.LoRa.LowDatarateOptimize = 0;
+            }
+            break;
+          default:
+            break;
+        }
+
+        SubgRf.PacketParams.PacketType = PACKET_TYPE_LORA;
+        SubgRf.PacketParams.Params.LoRa.PreambleLength = config->lora.PreambleLen;
+        SubgRf.PacketParams.Params.LoRa.HeaderType = ( RadioLoRaPacketLengthsMode_t ) config->lora.LengthMode;
+        SubgRf.PacketParams.Params.LoRa.CrcMode = ( RadioLoRaCrcModes_t ) config->lora.CrcMode;
+        SubgRf.PacketParams.Params.LoRa.InvertIQ = ( RadioLoRaIQModes_t ) config->lora.IqInverted;
+
+        RadioStandby( );
+        RadioSetModem( MODEM_LORA );
+        SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
+        SUBGRF_SetPacketParams( &SubgRf.PacketParams );
+        // WORKAROUND - Modulation Quality with 500 kHz LoRa Bandwidth, see DS_SX1261-2_V1.2 datasheet chapter 15.1
+        if( SubgRf.ModulationParams.Params.LoRa.Bandwidth == LORA_BW_500 )
+        {
+            // RegTxModulation = @address 0x0889
+            SUBGRF_WriteRegister( 0x0889, SUBGRF_ReadRegister( 0x0889 ) & ~( 1 << 2 ) );
+        }
+        else
+        {
+            // RegTxModulation = @address 0x0889
+            SUBGRF_WriteRegister( 0x0889, SUBGRF_ReadRegister( 0x0889 ) | ( 1 << 2 ) );
+        }
+        // WORKAROUND END
+        break;
+    case GENERIC_BPSK:
+        if( ( config->bpsk.BitRate == 0 ) || ( config->bpsk.BitRate > 1000 ) )
+        {
+            return -1;
+        }
+        RadioSetModem( MODEM_BPSK );
+        SubgRf.ModulationParams.PacketType = PACKET_TYPE_BPSK;
+        SubgRf.ModulationParams.Params.Bpsk.BitRate = config->bpsk.BitRate;
+        SubgRf.ModulationParams.Params.Bpsk.ModulationShaping = MOD_SHAPING_DBPSK;
+        SUBGRF_SetModulationParams( &SubgRf.ModulationParams );
+        break;
+    default:
+        break;
+    }
 
-  outBuffer[size] =(prevInt<<7) | (prevInt<<6) | (( (!prevInt) & 0x01)<<5) ;
+    SubgRf.AntSwitchPaSelect = SUBGRF_SetRfTxPower( power );
+    RFW_SetAntSwitch( SubgRf.AntSwitchPaSelect );
+    SubgRf.TxTimeout = timeout;
+    return 0;
 }
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c
index bde74954..b7288929 100644
--- a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c
+++ b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c
@@ -31,10 +31,9 @@
   ******************************************************************************
   */
 /* Includes ------------------------------------------------------------------*/
-#include "radio_driver.h" 
 #include "radio_conf.h"
+#include "radio_driver.h" 
 #include "mw_log_conf.h"
-#include "stm32_lpm.h"
 
 /* External variables ---------------------------------------------------------*/
 /*!
@@ -44,26 +43,73 @@ extern SUBGHZ_HandleTypeDef hsubghz;
 
 /* Private typedef -----------------------------------------------------------*/
 /*!
- * \brief Radio registers definition
+ * FSK bandwidth definition
  */
-typedef struct
+typedef struct FskBandwidth_s
 {
-    uint16_t      Addr;                             //!< The address of the register
-    uint8_t       Value;                            //!< The value of the register
-}RadioRegisters_t;
-
+    uint32_t bandwidth;
+    uint8_t  RegValue;
+} FskBandwidth_t;
 /* Private define ------------------------------------------------------------*/
+/**
+  * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note SMPS_DRIVE_SETTING_DEFAULT can be redefined in radio_conf.h
+  */
+#ifndef SMPS_DRIVE_SETTING_DEFAULT
+#define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
+#endif /* SMPS_DRIVE_SETTING_DEFAULT */
 
-/*!
- * \brief Provides the frequency of the chip running on the radio and the frequency step
- *
- * \remark These defines are used for computing the frequency divider to set the RF frequency
- *
- * \note XTAL_FREQ can be redefined in radio_conf.h
- */
+/**
+  * @brief drive value used anytime radio is in TX low power mode
+  *        TX low power mode is the worst case because the PA sinks from SMPS
+  *        while in high power mode, current is sunk directly from the battery
+  * @note SMPS_DRIVE_SETTING_MAX can be redefined in radio_conf.h
+  */
+#ifndef SMPS_DRIVE_SETTING_MAX
+#define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
+#endif /* SMPS_DRIVE_SETTING_MAX */
+
+/**
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note XTAL_FREQ can be redefined in radio_conf.h
+  */
 #ifndef XTAL_FREQ
-#define XTAL_FREQ                                   32000000UL
-#endif
+#define XTAL_FREQ                   ( 32000000UL )
+#endif /* XTAL_FREQ */
+
+/**
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note XTAL_DEFAULT_CAP_VALUE can be redefined in radio_conf.h
+  */
+#ifndef XTAL_DEFAULT_CAP_VALUE
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
+#endif /* XTAL_DEFAULT_CAP_VALUE */
+
+/**
+  * @brief voltage of vdd tcxo.
+  * @note TCXO_CTRL_VOLTAGE can be redefined in radio_conf.h
+  */
+#ifndef TCXO_CTRL_VOLTAGE
+#define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
+#endif /* TCXO_CTRL_VOLTAGE */
+
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note RF_WAKEUP_TIME can be redefined in radio_conf.h
+  */
+#ifndef RF_WAKEUP_TIME
+#define RF_WAKEUP_TIME              ( 10UL )
+#endif /* RF_WAKEUP_TIME */
+
+/**
+  * @brief DCDC is present and enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note DCDC_ENABLE can be redefined in radio_conf.h
+  */
+#ifndef DCDC_ENABLE
+#define DCDC_ENABLE                 ( 1UL )
+#endif /* DCDC_ENABLE */
 
 /* Private macro -------------------------------------------------------------*/
 
@@ -73,9 +119,6 @@ do                                                                           \
   channel = (uint32_t) ((((uint64_t) freq)<<25)/(XTAL_FREQ) );               \
 }while( 0 )
 
-#define SUBGRF_WriteCommand( x, y, z )  HAL_SUBGHZ_ExecSetCmd( &hsubghz, (x), (y), (z) )
-#define SUBGRF_ReadCommand( x, y, z )   HAL_SUBGHZ_ExecGetCmd( &hsubghz, (x), (y), (z) )
-
 /* Private variables ---------------------------------------------------------*/
 /*!
  * \brief Holds the internal operating mode of the radio
@@ -102,6 +145,35 @@ volatile uint32_t FrequencyError = 0;
  */
 static bool ImageCalibrated = false;
 
+/*!
+ * Precomputed FSK bandwidth registers values
+ */
+static const FskBandwidth_t FskBandwidths[] =
+{
+    { 4800  , 0x1F },
+    { 5800  , 0x17 },
+    { 7300  , 0x0F },
+    { 9700  , 0x1E },
+    { 11700 , 0x16 },
+    { 14600 , 0x0E },
+    { 19500 , 0x1D },
+    { 23400 , 0x15 },
+    { 29300 , 0x0D },
+    { 39000 , 0x1C },
+    { 46900 , 0x14 },
+    { 58600 , 0x0C },
+    { 78200 , 0x1B },
+    { 93800 , 0x13 },
+    { 117300, 0x0B },
+    { 156200, 0x1A },
+    { 187200, 0x12 },
+    { 234300, 0x0A },
+    { 312000, 0x19 },
+    { 373600, 0x11 },
+    { 467000, 0x09 },
+    { 500000, 0x00 }, // Invalid Bandwidth
+};
+
 /* Private function prototypes -----------------------------------------------*/
 
 /*!
@@ -114,6 +186,25 @@ static void Radio_SMPS_Set( uint8_t level );
  */
 static DioIrqHandler RadioOnDioIrqCb;
 
+/*!
+ * \brief Write command to the radio
+ *
+ * \param [in]  SetCommand    The Write Command
+ * \param [out] buffer        A pointer command buffer
+ * \param [in]  size          Size in byte of the command buffer
+ */
+static void SUBGRF_WriteCommand( SUBGHZ_RadioSetCmd_t Command, uint8_t *pBuffer,
+                                        uint16_t Size );
+/*!
+ * \brief Read command to the radio
+ *
+ * \param [in]  GetCommand    The Read Command
+ * \param [out] buffer        A pointer command buffer
+ * \param [in]  size          Size in byte of the command buffer
+ */
+static void SUBGRF_ReadCommand( SUBGHZ_RadioGetCmd_t Command, uint8_t *pBuffer,
+                                        uint16_t Size );
+
 /* Exported functions ---------------------------------------------------------*/
 void SUBGRF_Init( DioIrqHandler dioIrq )
 {
@@ -122,11 +213,11 @@ void SUBGRF_Init( DioIrqHandler dioIrq )
         RadioOnDioIrqCb = dioIrq;
     }
 
+    RADIO_INIT();
+
     /* set default SMPS current drive to default*/
     Radio_SMPS_Set(SMPS_DRIVE_SETTING_DEFAULT);
 
-    RADIO_INIT();
-
     ImageCalibrated = false;
 
     SUBGRF_SetStandby( STDBY_RC );
@@ -134,7 +225,7 @@ void SUBGRF_Init( DioIrqHandler dioIrq )
     // Initialize TCXO control
     if (1U == RBI_IsTCXO() )
     {
-        SUBGRF_SetTcxoMode( TCXO_CTRL_VOLTAGE, RBI_GetWakeUpTime() << 6 );// 100 ms
+        SUBGRF_SetTcxoMode( TCXO_CTRL_VOLTAGE, RF_WAKEUP_TIME << 6 );// 100 ms
         SUBGRF_WriteRegister( REG_XTA_TRIM, 0x00 );
 
         /*enable calibration for cut1.1 and later*/
@@ -173,6 +264,7 @@ uint8_t SUBGRF_GetPayload( uint8_t *buffer, uint8_t *size,  uint8_t maxSize )
         return 1;
     }
     SUBGRF_ReadBuffer( offset, buffer, *size );
+
     return 0;
 }
 
@@ -401,7 +493,7 @@ void SUBGRF_SetRegulatorMode( void )
     /* ST_WORKAROUND_BEGIN: Get RegulatorMode value from RBI */
     RadioRegulatorMode_t mode;
 
-    if ( 1U == RBI_IsDCDC() )
+    if ( ( 1UL == RBI_IsDCDC() ) && ( 1UL == DCDC_ENABLE ) )
     {
         mode = USE_DCDC ;
     }
@@ -514,8 +606,6 @@ void SUBGRF_SetRfFrequency( uint32_t frequency )
     uint8_t buf[4];
     uint32_t chan = 0;
 
-    frequency+= RF_FREQUENCY_ERROR;
-
     if( ImageCalibrated == false )
     {
         SUBGRF_CalibrateImage( frequency );
@@ -871,22 +961,46 @@ uint8_t SUBGRF_ReadRegister( uint16_t addr )
 
 void SUBGRF_WriteRegisters( uint16_t address, uint8_t *buffer, uint16_t size )
 {
+    CRITICAL_SECTION_BEGIN();
     HAL_SUBGHZ_WriteRegisters( &hsubghz, address, buffer, size );
+    CRITICAL_SECTION_END();
 }
 
 void SUBGRF_ReadRegisters( uint16_t address, uint8_t *buffer, uint16_t size )
 {
+    CRITICAL_SECTION_BEGIN();
     HAL_SUBGHZ_ReadRegisters( &hsubghz, address, buffer, size );
+    CRITICAL_SECTION_END();
 }
 
 void SUBGRF_WriteBuffer( uint8_t offset, uint8_t *buffer, uint8_t size )
 {
+    CRITICAL_SECTION_BEGIN();
     HAL_SUBGHZ_WriteBuffer( &hsubghz, offset, buffer, size );
+    CRITICAL_SECTION_END();
 }
 
 void SUBGRF_ReadBuffer( uint8_t offset, uint8_t *buffer, uint8_t size )
 {
+    CRITICAL_SECTION_BEGIN();
     HAL_SUBGHZ_ReadBuffer( &hsubghz, offset, buffer, size );
+    CRITICAL_SECTION_END();
+}
+
+void SUBGRF_WriteCommand( SUBGHZ_RadioSetCmd_t Command, uint8_t *pBuffer,
+                                        uint16_t Size )
+{
+    CRITICAL_SECTION_BEGIN();
+    HAL_SUBGHZ_ExecSetCmd( &hsubghz, Command, pBuffer, Size );
+    CRITICAL_SECTION_END();
+}
+
+void SUBGRF_ReadCommand( SUBGHZ_RadioGetCmd_t Command, uint8_t *pBuffer,
+                                        uint16_t Size )
+{
+    CRITICAL_SECTION_BEGIN();
+    HAL_SUBGHZ_ExecGetCmd( &hsubghz, Command, pBuffer, Size );
+    CRITICAL_SECTION_END();
 }
 
 void SUBGRF_SetSwitch( uint8_t paSelect, RFState_t rxtx )
@@ -956,7 +1070,7 @@ uint8_t SUBGRF_SetRfTxPower( int8_t power )
 
 uint32_t SUBGRF_GetRadioWakeUpTime( void )
 {
-    return ( uint32_t ) RBI_GetWakeUpTime();
+    return RF_WAKEUP_TIME;
 }
 
 /* HAL_SUBGHz Callbacks definitions */ 
@@ -1025,4 +1139,59 @@ static void Radio_SMPS_Set(uint8_t level)
     SUBGRF_WriteRegister(SUBGHZ_SMPSC2R, modReg | level);
   }
 }
+
+uint8_t SUBGRF_GetFskBandwidthRegValue( uint32_t bandwidth )
+{
+    uint8_t i;
+
+    if( bandwidth == 0 )
+    {
+        return( 0x1F );
+    }
+
+    /* ST_WORKAROUND_BEGIN: Simplified loop */
+    for( i = 0; i < ( sizeof( FskBandwidths ) / sizeof( FskBandwidth_t ) ); i++ )
+    {
+        if ( bandwidth < FskBandwidths[i].bandwidth )
+        {
+            return FskBandwidths[i].RegValue;
+        }
+    }
+    /* ST_WORKAROUND_END */
+    // ERROR: Value not found
+    while( 1 );
+}
+void SUBGRF_GetCFO( uint32_t bitRate, int32_t *cfo)
+{
+  uint8_t BwMant[] = {4, 8, 10, 12};
+  /* read demod bandwidth: mant bit4:3, exp bits 2:0 */
+  uint8_t reg = (SUBGRF_ReadRegister( SUBGHZ_BWSEL ));
+  uint8_t bandwidth_mant = BwMant[( reg >> 3 ) & 0x3];
+  uint8_t bandwidth_exp = reg & 0x7;
+  uint32_t cf_fs = XTAL_FREQ / ( bandwidth_mant * ( 1 << ( bandwidth_exp - 1 )));
+  uint32_t cf_osr = cf_fs / bitRate;
+  uint8_t interp = 1;
+  /* calculate demod interpolation factor */
+  if (cf_osr * interp < 8)
+  {
+    interp = 2;
+  }
+  if (cf_osr * interp < 4)
+  {
+    interp = 4;
+  }
+  /* calculate demod sampling frequency */
+  uint32_t fs = cf_fs* interp;
+  /* get the cfo registers */
+  int32_t cfo_bin = ( SUBGRF_ReadRegister( SUBGHZ_CFO_H ) & 0xF ) << 8;
+  cfo_bin |= SUBGRF_ReadRegister( SUBGHZ_CFO_L );
+  /* negate if 12 bits sign bit is 1 */
+  if (( cfo_bin & 0x800 ) == 0x800 )
+  {
+    cfo_bin |= 0xFFFFF000;
+  }
+  /* calculate cfo in Hz */
+  /* shift by 5 first to not saturate, cfo_bin on 12bits */
+  *cfo = ((int32_t)( cfo_bin * ( fs >> 5 ))) >> ( 12 - 5 );
+}
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.h b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.h
index 46a61c76..e3f6f487 100644
--- a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.h
+++ b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.h
@@ -241,7 +241,23 @@ extern "C" {
 #define SUBGHZ_PCR                                  0x091A
 /*Sub-GHz radio SMPS control 2 register */
 #define SUBGHZ_SMPSC2R                              0x0923
-
+/*Sub-GHz radio Rx Bandwidth selector register */
+#define SUBGHZ_BWSEL                                0x0807
+/*Sub-GHz radio CFO High register */
+#define SUBGHZ_CFO_H                                0x06B0
+/*Sub-GHz radio CFO Low register */
+#define SUBGHZ_CFO_L                                0x06B1
+/*Sub-GHz radio rxAddrPtr register*/
+#define SUBGHZ_RX_ADR_PTR                           0x0803
+/*Sub-GHz radio txAddrPtr register*/
+#define SUBGHZ_TX_ADR_PTR                           0x0802
+/*Sub-GHz radio rtx register*/
+#define SUBGHZ_RTXPLDLEN                            0x06BB
+/*Sub-GHz radio pktCtl1 register*/
+#define SUBGHZ_PKTCTL1                              0x06B4
+/*Sub-GHz radio pktCtl1a register*/
+#define SUBGHZ_PKTCTL1A                             0x06B8
+  
 #define SMPS_CLK_DET_ENABLE ((uint8_t) (1<<6))
 
 #define SMPS_DRV_20  ((uint8_t) ((0x0)<<1))
@@ -1199,6 +1215,21 @@ uint8_t SUBGRF_SetRfTxPower(  int8_t power );
  */
 uint32_t SUBGRF_GetRadioWakeUpTime( void );
 
+/*!
+ * \brief Returns the known FSK bandwidth registers value
+ *
+ * \param [IN] bandwidth Bandwidth value in Hz
+ * \retval regValue Bandwidth register value.
+ */
+uint8_t SUBGRF_GetFskBandwidthRegValue( uint32_t bandwidth );
+/*!
+ * \brief SUBGRF_GetCFO get the frequency offset between the remote transmitter and the radio receiver
+ *
+ * \param [in] bitrate     gfsk bitrate
+ * \param [OUT] cfo        carrier frequency offset in Hertz
+ */
+void SUBGRF_GetCFO( uint32_t BitRate, int32_t * Cfo);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c
new file mode 100644
index 00000000..e273380e
--- /dev/null
+++ b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c
@@ -0,0 +1,1107 @@
+/**
+  ******************************************************************************
+  * @file    radio_fw.c
+  * @author  MCD Application Team
+  * @brief   extended radio functionality SubGHz_Phy Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer.h"
+#include "radio.h"
+#include "radio_fw.h"
+#include "radio_driver.h"
+#include "radio_conf.h"
+#include "mw_log_conf.h"
+
+/* External variables --------------------------------------------------------*/
+/* Private typedef -----------------------------------------------------------*/
+
+/**
+ * Radio RFWPacket and global parameters
+ * In RFWPacket mode, the packet is 'Fixed length' without Hw Crc check and without Hw (de-)whitening
+ */
+typedef struct 
+{
+    uint8_t Enable;                    /* RFWPacket mode On: 1 or Off: 0*/
+    uint8_t PayloadLengthFieldSize;    /* Size of the packet length Field*/
+    uint8_t CrcEnable;                 /* enable crc calculation and check*/
+    uint8_t CrcFieldSize;              /* size of the packet length Field*/
+    uint16_t CrcPolynomial;            /* Init Crc polynomial, to set before running RFW_CrcRun*/
+    uint16_t CrcSeed;                  /* Init Crc seed to set before running RFW_CrcRun*/
+    RADIO_FSK_CrcTypes_t CrcType;      /* Init Crc types to set before running RFW_CrcRun*/
+    uint16_t WhiteSeed;                /* Init whitening seed, to set before running Radio_FwWhiteRun*/
+    uint16_t LongPacketMaxRxLength;    /* Maximum expected amount of bytes in payload*/
+    RadioModems_t Modem;
+    RadioEvents_t* RadioEvents;
+} RFwInit_t;
+
+typedef struct 
+{
+    RFwInit_t Init;                    /*Init structure, set at Rx or Tx config*/
+    uint16_t CrcLfsrState;             /*State of LFSR crc, set from CrcSeed at beginning of each payload*/
+    uint16_t WhiteLfsrState;           /*State of LFSR whitening, set from WhiteSeed at beginning of each payload
+                                         use to save LFSR state after rx payload length de-withening*/
+    uint16_t PayloadLength;            /*In Rx, Payload length is first byte(s) of the payload excluding CrcFieldSize and PayloadLengthFieldSize*/
+    uint8_t LongPacketModeEnable;      /* set to one when RFW_TransmitLongPacket or RFW_ReceiveLongPacket. 0 otherwise*/
+    TimerEvent_t Timer;                /*Timer to get/Set Rx(Tx)Bytes*/
+    uint16_t LongPacketRemainingBytes; /* Count remaining bytes to send receive (including crc)*/
+    uint8_t RadioBufferOffset;         /* Radio buffer offset*/
+    uint16_t RxPayloadOffset;          /* RxPayloadOffset buffer offset*/
+    void (*RxLongPacketStoreChunkCb) (uint8_t* buffer, uint8_t buffer_size);
+    void (*TxLongPacketGetNextChunkCb) (uint8_t** buffer, uint8_t buffer_size);
+    uint8_t AntSwitchPaSelect;
+    uint32_t BitRate;
+    TimerEvent_t* RxTimeoutTimer;
+    TimerEvent_t* TxTimeoutTimer;
+} RadioFw_t;
+
+/* Private define ------------------------------------------------------------*/
+
+#define RADIO_BUF_SIZE 255 //bytes SubG IP  internal Buffer
+
+#define LONGPACKET_CHUNK_LENGTH_BYTES ((int32_t) 128) //bytes (half Radio fifo)
+
+/* Private macro -------------------------------------------------------------*/
+/**
+  * @brief Calculates ceiling division of ( X / N )
+  *
+  * @param [IN] X numerator
+  * @param [IN] N denominator
+  *
+  */
+#ifndef DIVC
+#define DIVC( X, N )                ( ( ( X ) + ( N ) - 1 ) / ( N ) )
+#endif
+
+/**
+  * @brief Calculates rounding division of ( X / N )
+  *
+  * @param [IN] X numerator
+  * @param [IN] N denominator
+  *
+  */
+#ifndef DIVR
+#define DIVR( X, N )                ( ( ( X ) + ( ((X)>0?(N):(N))>>1 ) ) / ( N ) )
+#endif
+
+/*can be overridden in radio_conf.h*/
+#ifndef RFW_IT_INIT
+#define RFW_IT_INIT() 
+#endif
+
+#ifndef RFW_GET_PAYLOAD_PROCESS
+#define RFW_GET_PAYLOAD_PROCESS() RFW_GetPayloadProcess()
+#endif
+/*can be overridden in radio_conf.h*/
+#ifndef RFW_TRANSMIT_LONGPACKET_TX_CHUNK_PROCESS
+#define RFW_TRANSMIT_LONGPACKET_TX_CHUNK_PROCESS() RFW_TransmitLongPacket_TxChunkProcess()
+#endif
+
+#ifndef RFW_MW_LOG_ENABLE
+#define RFW_MW_LOG(...)
+#else
+#define RFW_MW_LOG   MW_LOG
+#endif
+
+#ifndef RFW_ENABLE
+#define RFW_ENABLE 0
+#endif
+
+#ifndef RFW_LONGPACKET_ENABLE
+#define RFW_LONGPACKET_ENABLE 0
+#endif
+
+#ifndef RADIO_MEMCPY8
+#define RADIO_MEMCPY8 memcpy
+#endif
+
+#ifndef RADIO_MEMSET8
+#define RADIO_MEMSET8 memset
+#endif
+
+#if ((RFW_LONGPACKET_ENABLE==1)&&(RFW_ENABLE==0))
+#error RFW_ENABLE must be defined to 1 if RFW_LONGPACKET_ENABLE is defined to 1
+#endif
+
+/* Private variables ---------------------------------------------------------*/
+#if (RFW_ENABLE ==1 )
+static RadioFw_t RFWPacket={0};
+/*Radio buffer chunk*/
+static uint8_t ChunkBuffer[RADIO_BUF_SIZE];
+/*Radio buffer chunk for packet <=RADIO_BUF_SIZE and */
+static uint8_t RxBuffer[RADIO_BUF_SIZE];
+#endif
+/* Private function prototypes -----------------------------------------------*/
+#if (RFW_ENABLE ==1 )
+/**
+ * @brief Record the seed of the (de-)Whitening algorithm
+ *
+ * @param [IN] RFwInit_t      the whitening Init structure
+ * @param [IN] WhiteSeed        the Initial seed of the Whitening algorithm
+ */
+static void RFW_WhiteInitState(RFwInit_t* Init, uint16_t WhiteSeed);
+
+/**
+ * @brief Set the state of the Whitening algorithm from the seed
+ *
+ * @param [IN] RFWPacket      the whitening structure
+ * @param [IN] whiteSeed             the Initial seed of the Whitening algorithm
+ */
+static void RFW_WhiteSetState(RadioFw_t* RFWPacket);
+
+/**
+ * @brief Initialize seed of the Crc algorithm
+ *
+ * @param [IN] RFWPacket      the whitening Init structure
+ * @param [IN] CrcPolynomial         the Initial seed of the Crc algorithm
+ * @param [IN] CrcSeed               the Initial seed of the Crc seed
+ * @param [IN] CrcSeed               the Initial seed of the Crc types (Ibm/CCITT)
+
+ */
+static void RFW_CrcInitState(RFwInit_t* Init, const uint16_t CrcPolynomial, const uint16_t CrcSeed, const RADIO_FSK_CrcTypes_t CrcTypes);
+
+/**
+ * @brief Run the Crc algorithm
+ * @param [IN] RFWPacket      the whitening structure
+ */
+static void RFW_CrcSetState(RadioFw_t* RFWPacket);
+/**
+ * @brief Run the Whitening algorithm
+ *
+ * @param [IN] RFWPacket      the whitening structure
+ * @param [IN/OUT] Payload    the Payload to (de-)Whiten and the payload result
+ * @param [IN] Size           the Payload size
+ */
+static void RFW_WhiteRun(RadioFw_t* RFWPacket, uint8_t* Payload, uint32_t Size);
+
+/**
+ * @brief Run the Crc algorithm
+ *
+ * @param [IN] RFWPacket      the whitening structure
+ * @param [IN] Payload        the Payload to calculate the Crc
+ * @param [IN] Size           the Payload size
+ * @param [OUT] CrcResult     the result of the Crc calculation
+ */
+static int32_t RFW_CrcRun(RadioFw_t* const RFWPacket, const uint8_t* Payload, const uint32_t Size, uint8_t CrcResult[2]);
+
+/**
+ * @brief Compute Crc Byte
+ *
+ * @param [IN] crc        Crc bytes
+ * @param [IN] dataByte        the data byte
+ * @param [OUT] polynomial     the polynomial to use
+ * @return crc bytes out
+ */
+uint16_t RFW_CrcRun1Byte( uint16_t Crc, uint8_t DataByte, uint16_t Polynomial );
+
+/**
+ * @brief Get the payload length after sync
+ *
+ * @param [OUT] PayloadLength        the length of PayloadOnly excluding CrcLengthField
+ * @return 0 when no parameters error, -1 otherwise
+ */
+static int32_t RFW_GetPacketLength(uint16_t* PayloadLength);
+
+/**
+ * @brief RFW_GetPayloadTimerEvent TimerEvent to get the payload data, de-whitening, and crc verification
+ *
+ * @Note calls RFW_GetPayloadProcess directly inside IRQ (default) or in background with sequencer or OS
+ * @param [IN] context        context of the timer
+ */
+static void RFW_GetPayloadTimerEvent( void * context);
+
+/**
+ * @brief RFW_GetPayloadProcess process to get the payload data, de-whitening, and crc verification
+ */
+static void RFW_GetPayloadProcess( void );
+
+#if (RFW_LONGPACKET_ENABLE ==1 )
+/**
+ * @brief RFW_TransmitLongPacket_NewTxChunkTimer: long packet Tx timer callback to process intermediate chunk of TxData
+ * @Note calls RFW_TransmitLongPacket_TxChunkProcess directly inside IRQ (default) or in background with sequencer or any Rtos
+ *
+ * @param [In] param        unused
+ */
+static void RFW_TransmitLongPacket_NewTxChunkTimerEvent( void * param );
+
+/**
+ * @brief RFW_TransmitLongPacket_TxChunkProcess: tx long packet process intermediate chunk of TxData
+ */
+static void RFW_TransmitLongPacket_TxChunkProcess( void );
+#endif
+
+/**
+ * @brief RFW_GetPayload get the payload of 
+ *
+ * @param [In] Offset        Offset of the 
+ * @param [In] Length        carrier frequency offset in Hertz
+ */
+static void RFW_GetPayload( uint8_t Offset, uint8_t Length );
+#endif
+
+/* Exported functions --------------------------------------------------------*/
+int32_t RFW_TransmitLongPacket( uint16_t payload_size, uint32_t timeout, void (*TxLongPacketGetNextChunkCb) (uint8_t** buffer, uint8_t buffer_size) )
+{
+  int32_t status=0;
+#if (RFW_LONGPACKET_ENABLE ==1 )
+  uint32_t total_size= payload_size+ RFWPacket.Init.PayloadLengthFieldSize+ RFWPacket.Init.CrcFieldSize;
+
+  RFW_MW_LOG( TS_ON, VLEVEL_M,  "RevID=%04X\r\n", LL_DBGMCU_GetRevisionID() );
+
+  if ((TxLongPacketGetNextChunkCb==NULL)||
+      (payload_size> (1<<(8*RFWPacket.Init.PayloadLengthFieldSize))-1) ||/*check that size fits inside the packetLengthField*/
+      (RFWPacket.Init.Enable==0) ||/* Can only be used when after RadioSetTxGenericConfig*/
+      (LL_DBGMCU_GetRevisionID() < 0x1003 ) )   /* Only available from stm32wl revision Y*/
+  {
+    status= -1;
+  }
+  else
+  {
+    /*chunk buffer pointer fed by the application*/
+    uint8_t* app_chunk_buffer_ptr=NULL;
+    /*size of the chunk to be sent*/
+    uint8_t chunk_size;
+    uint8_t crc_size;
+    /*timeout for next chunk*/
+    uint32_t chunk_timeout;
+    /*Records call back*/
+    RFWPacket.TxLongPacketGetNextChunkCb=TxLongPacketGetNextChunkCb;
+
+    /* Radio IRQ is set to DIO1 by default */
+    SUBGRF_SetDioIrqParams( IRQ_TX_DONE | IRQ_RX_TX_TIMEOUT,
+                            IRQ_TX_DONE | IRQ_RX_TX_TIMEOUT,
+                            IRQ_RADIO_NONE,
+                            IRQ_RADIO_NONE );
+
+    /* ST_WORKAROUND_BEGIN : Set the debug pin and update the radio switch */
+    /* Set DBG pin */
+    DBG_GPIO_RADIO_TX(SET);
+    /* Set RF switch */
+    SUBGRF_SetSwitch(RFWPacket.AntSwitchPaSelect, RFSWITCH_TX);
+    /* ST_WORKAROUND_END */
+
+    switch(RFWPacket.Init.Modem)
+    {
+        case MODEM_FSK:
+        {
+            if (RFWPacket.Init.Enable==1)
+            {
+              /*crc will be calculated on the fly along with packet chunk transmission*/
+              uint8_t crc_result[2];
+              /*init radio buffer offset*/
+              RFWPacket.RadioBufferOffset=0;
+              /*long packet mode enable*/
+              RFWPacket.LongPacketModeEnable=1;
+              /*Remaining bytes to transmit*/
+              RFWPacket.LongPacketRemainingBytes=total_size;
+              /*Records total payload bytes to transmit*/
+              RFWPacket.PayloadLength=total_size;
+              if (total_size> RADIO_BUF_SIZE)
+              {
+                /*cut in chunk*/
+                if (total_size<RADIO_BUF_SIZE+RFWPacket.Init.CrcFieldSize)
+                {
+                  /*reduce chunk so that crc is treated in the next chunk*/
+                  chunk_size= RADIO_BUF_SIZE-RFWPacket.Init.PayloadLengthFieldSize-RFWPacket.Init.CrcFieldSize;
+                }
+                else
+                {
+                  chunk_size= RADIO_BUF_SIZE-RFWPacket.Init.PayloadLengthFieldSize;
+                }
+                /*Set crc size for the crc calculation: no crc here because it is not the end of the packet*/
+                crc_size= 0;
+              }
+              else
+              {
+                chunk_size= payload_size;
+                /*Set crc size for the crc calculation*/
+                crc_size= RFWPacket.Init.CrcFieldSize;
+              }
+              /* Prepend payload size before Payload*/
+              if (RFWPacket.Init.PayloadLengthFieldSize==1)
+              {
+                ChunkBuffer[0]=payload_size;
+              }
+              else
+              {
+                ChunkBuffer[0]=(uint8_t) ((payload_size)>>8);
+                ChunkBuffer[1]=(uint8_t) ((payload_size)&0xFF);
+              }
+              /* Get Tx chunk from app*/
+              TxLongPacketGetNextChunkCb(&app_chunk_buffer_ptr, chunk_size);
+              
+              /* Copy first chunk in ChunkBuffer Buffer*/
+              RADIO_MEMCPY8(&ChunkBuffer[RFWPacket.Init.PayloadLengthFieldSize], app_chunk_buffer_ptr, chunk_size);
+
+              if (RFWPacket.Init.CrcEnable== 1)
+              {
+                /* Set the state of the Crc to crc_seed*/
+                RFW_CrcSetState(&RFWPacket);
+                /* Run the crc calculation on payload length and payload*/
+                RFW_CrcRun(&RFWPacket, ChunkBuffer, RFWPacket.Init.PayloadLengthFieldSize+ chunk_size, crc_result);
+                /* Append the crc result after the payload if total_size<= RADIO_BUF_SIZE*/
+                RADIO_MEMCPY8(&ChunkBuffer[RFWPacket.Init.PayloadLengthFieldSize+ chunk_size], crc_result, crc_size);
+              }
+              /* Init whitening at beginning of the packet*/
+              RFW_WhiteSetState(&RFWPacket);
+              /* Run the whitening calculation on payload length, payload and crc if crc fits inside 1st chunk*/
+              RFW_WhiteRun(&RFWPacket, &ChunkBuffer[0],RFWPacket.Init.PayloadLengthFieldSize+ chunk_size+ crc_size);
+              /* Configure the Transmitter to send all*/
+              /* Init radio buffer */
+              SUBGRF_WriteRegister(SUBGHZ_RTXPLDLEN,RFWPacket.Init.PayloadLengthFieldSize+ chunk_size+ crc_size);
+              SUBGRF_WriteRegister(SUBGHZ_TX_ADR_PTR,0);
+              /* Send*/
+              SUBGRF_SendPayload( ChunkBuffer, RFWPacket.Init.PayloadLengthFieldSize+ chunk_size+ crc_size, 0 );
+              if (total_size> RADIO_BUF_SIZE)
+              {
+                /*in case total size is greater than RADIO_BUF_SIZE, need to program a timer to get next chunk*/
+                //RFWPacket.LongPacketRemainingBytes-= RFWPacket.Init.PayloadLengthFieldSize+ chunk_size+ crc_size;
+                /*Initialize Timer to get new chunk and update radio ptr*/
+                chunk_timeout = ( LONGPACKET_CHUNK_LENGTH_BYTES* 8 * 1000)/RFWPacket.BitRate;
+                RFW_MW_LOG( TS_ON, VLEVEL_M,  "Timeout=%d,\r\n", chunk_timeout);
+                TimerInit( &RFWPacket.Timer, RFW_TransmitLongPacket_NewTxChunkTimerEvent );
+                TimerSetValue( &RFWPacket.Timer, chunk_timeout );
+                TimerStart( &RFWPacket.Timer);
+                /*Write bit infinite_sequence = 1, required for long packet*/
+                uint8_t reg = SUBGRF_ReadRegister(SUBGHZ_PKTCTL1A);
+                SUBGRF_WriteRegister(SUBGHZ_PKTCTL1A, reg | 0x02);
+                
+                TimerSetValue( RFWPacket.RxTimeoutTimer, timeout );
+                TimerStart( RFWPacket.RxTimeoutTimer);
+              }
+            }
+            else
+            {
+              /* error*/
+              status= -1;
+            }
+            break;
+        }
+        case MODEM_LORA:
+        {
+            /* not supported by the radio Ip*/
+            status= -2;
+            break;
+        }
+        case MODEM_BPSK:
+        {
+           /* not supported by the FW*/
+            status= -2;
+            break;
+        }
+        case MODEM_SIGFOX_TX:
+        {
+            /* not supported by the FW*/
+            status= -2;
+            break;
+        }
+        default:
+            break;
+    }
+  }
+#else
+  status= -1;
+#endif
+  return status;
+}
+
+int32_t RFW_ReceiveLongPacket( uint8_t boosted_mode, uint32_t timeout, void (*RxLongPacketStoreChunkCb) (uint8_t* buffer, uint8_t chunk_size) )
+{
+  int32_t status=0;
+#if (RFW_LONGPACKET_ENABLE ==1 )
+  if ((RxLongPacketStoreChunkCb==NULL) ||
+      (RFWPacket.Init.Enable==0)) /* Can only be used when after RadioSetRxGenericConfig*/
+  {
+    status= -1;
+  }
+  else
+  {
+    /*Records call back*/
+    RFWPacket.RxLongPacketStoreChunkCb=RxLongPacketStoreChunkCb;
+    SUBGRF_SetDioIrqParams( IRQ_SYNCWORD_VALID | IRQ_RX_TX_TIMEOUT,
+                            IRQ_SYNCWORD_VALID | IRQ_RX_TX_TIMEOUT,
+                            IRQ_RADIO_NONE,
+                            IRQ_RADIO_NONE );
+    SUBGRF_SetSwitch(RFWPacket.AntSwitchPaSelect, RFSWITCH_RX);
+    /*init radio buffer offset*/
+    RFWPacket.RadioBufferOffset=0;
+    /* Init whitening at beginning of the packet*/
+    RFW_WhiteSetState(&RFWPacket);
+    /* Set the state of the Crc to crc_seed*/
+    RFW_CrcSetState(&RFWPacket);
+    /* Init radio buffer */
+    SUBGRF_WriteRegister(SUBGHZ_RTXPLDLEN,255);
+    SUBGRF_WriteRegister(SUBGHZ_RX_ADR_PTR,0);
+    /*enable long packet*/
+    RFWPacket.LongPacketModeEnable=1;
+    
+    if( timeout != 0 )
+    {
+        TimerSetValue( RFWPacket.RxTimeoutTimer, timeout );
+        TimerStart( RFWPacket.RxTimeoutTimer );
+    }
+    DBG_GPIO_RADIO_RX(SET);
+    if (boosted_mode ==1)
+    {
+      SUBGRF_SetRxBoosted( 0xFFFFFF ); // Rx Continuous
+    }
+    else
+    {
+      SUBGRF_SetRx( 0xFFFFFF ); // Rx Continuous
+    }
+  }
+#else
+  status= -1;
+#endif
+  return status;
+}
+
+int32_t RFW_Init( ConfigGeneric_t* config, RadioEvents_t* RadioEvents, TimerEvent_t* TimeoutTimerEvent)
+{
+#if (RFW_ENABLE ==1 )
+  RADIO_FSK_PacketLengthModes_t HeaderType;
+  uint32_t RxMaxPayloadLength= 0;
+  RADIO_FSK_CrcTypes_t CrcLength;
+  uint16_t whiteSeed;
+  uint16_t CrcPolynomial;
+  uint16_t CrcSeed;
+  if (config->rtx ==CONFIG_TX)
+  {
+    HeaderType=    config->TxConfig->fsk.HeaderType;
+    CrcLength=     config->TxConfig->fsk.CrcLength;
+    whiteSeed=     config->TxConfig->fsk.whiteSeed;
+    CrcPolynomial= config->TxConfig->fsk.CrcPolynomial;
+    CrcSeed=       config->TxConfig->fsk.CrcSeed;
+    RFWPacket.BitRate= config->TxConfig->fsk.BitRate;
+    RFWPacket.TxTimeoutTimer= TimeoutTimerEvent;
+  }
+  else
+  {
+    HeaderType=          config->RxConfig->fsk.LengthMode;
+    CrcLength=           config->RxConfig->fsk.CrcLength;
+    RxMaxPayloadLength = config->RxConfig->fsk.MaxPayloadLength;
+    whiteSeed=           config->RxConfig->fsk.whiteSeed;
+    CrcPolynomial=       config->RxConfig->fsk.CrcPolynomial;
+    CrcSeed=             config->RxConfig->fsk.CrcSeed;
+    RFWPacket.BitRate=   config->RxConfig->fsk.BitRate;
+    RFWPacket.RxTimeoutTimer= TimeoutTimerEvent;
+  }
+  if( ( RadioEvents != NULL ) && ( RadioEvents->RxError ) )
+  {
+    RFWPacket.Init.RadioEvents=RadioEvents;
+  }
+  else
+  {
+    return -1;
+  }
+  if (HeaderType==RADIO_FSK_PACKET_2BYTES_LENGTH)
+  {
+#if (RFW_LONGPACKET_ENABLE ==1 )
+    RFWPacket.Init.PayloadLengthFieldSize= 2;
+#else
+    return -1;
+#endif
+  }
+  else
+  {
+    RFWPacket.Init.PayloadLengthFieldSize= 1;
+  }
+    /*record, used to reject packet in length decoded at sync time out greater than LongPacketMaxRxLength*/
+  RFWPacket.Init.LongPacketMaxRxLength= RxMaxPayloadLength;
+  if (CrcLength== RADIO_FSK_CRC_OFF)
+  {
+    RFWPacket.Init.CrcEnable =0;
+    RFWPacket.Init.CrcFieldSize= 0;
+  }
+  else
+  {
+    RFWPacket.Init.CrcEnable =1;
+    RFWPacket.Init.CrcFieldSize= 2;
+  }
+  /*Macro can be used to init interrupt behaviour*/
+  RFW_IT_INIT();
+  /*Initialise whitening Seed*/
+  RFW_WhiteInitState(&RFWPacket.Init, whiteSeed);
+  /*Initialise Crc Seed*/
+  RFW_CrcInitState(&RFWPacket.Init, CrcPolynomial, CrcSeed, CrcLength);
+  /*Enable the RFWPacket decoding*/
+  RFWPacket.Init.Enable=1;
+  /* Initialize Timer for end of fixed packet, started at sync*/
+  TimerInit( &RFWPacket.Timer, RFW_GetPayloadTimerEvent );
+  return 0;
+#else
+  return -1;
+#endif
+}
+
+void RFW_DeInit( void)
+{
+#if (RFW_ENABLE ==1 )
+  RFWPacket.Init.Enable=0; /*Disable the RFWPacket decoding*/
+#endif
+}
+
+uint8_t RFW_Is_Init( void)
+{
+#if (RFW_ENABLE ==1 )
+  return RFWPacket.Init.Enable;
+#else
+  return 0;
+#endif
+}
+
+uint8_t RFW_Is_LongPacketModeEnabled( void)
+{
+#if (RFW_ENABLE ==1 )
+  return RFWPacket.LongPacketModeEnable;
+#else
+  return 0;
+#endif
+}
+
+void RFW_SetAntSwitch( uint8_t AntSwitch)
+{
+#if (RFW_ENABLE ==1 )
+  RFWPacket.AntSwitchPaSelect=AntSwitch;
+#endif
+}
+
+int32_t RFW_TransmitInit(uint8_t* inOutBuffer, uint8_t size, uint8_t* outSize)
+{
+  int32_t status=-1;
+#if (RFW_ENABLE ==1 )
+  uint8_t crc_result[2];
+  if (size+RFWPacket.Init.PayloadLengthFieldSize+ RFWPacket.Init.CrcFieldSize> RADIO_BUF_SIZE)
+  {
+    RFW_MW_LOG( TS_ON, VLEVEL_M, "RadioSend Oversize\r\n");
+    status= -1;
+  }
+  else
+  {
+    /* Copy tx buffer in payload*/
+    RADIO_MEMCPY8(&ChunkBuffer[RFWPacket.Init.PayloadLengthFieldSize], inOutBuffer, size);
+    /* Calculate the crc on */
+    /* Payload Size without the packet length field nor the CRC */
+    /* Prepend payload size before Payload*/
+    if (RFWPacket.Init.PayloadLengthFieldSize==1)
+    {
+      ChunkBuffer[0]=size;
+    }
+    else
+    {
+      ChunkBuffer[0]=0;
+      ChunkBuffer[1]=size;
+    }
+    if (RFWPacket.Init.CrcEnable== 1)
+    {
+      /* Set the state of the Crc to crc_seed*/
+      RFW_CrcSetState(&RFWPacket);
+      /*Run the crc calculation on payload length and payload*/
+      RFW_CrcRun(&RFWPacket, &ChunkBuffer[0],size+ RFWPacket.Init.PayloadLengthFieldSize, crc_result);
+    /*append the crc result afater the payload*/
+      RADIO_MEMCPY8(&ChunkBuffer[size+ RFWPacket.Init.PayloadLengthFieldSize], crc_result, RFWPacket.Init.CrcFieldSize);
+    }
+    /*init whitening at beginning of the packet*/
+    RFW_WhiteSetState(&RFWPacket);
+    /*Run the whitening calculation on payload length, payload and crc*/
+    RFW_WhiteRun(&RFWPacket, &ChunkBuffer[0],size+ RFWPacket.Init.PayloadLengthFieldSize+ RFWPacket.Init.CrcFieldSize);
+    /*Configure the Transmitter to send all*/
+    *outSize=(uint8_t) size+ RFWPacket.Init.PayloadLengthFieldSize+ RFWPacket.Init.CrcFieldSize;
+    /*copy result*/
+    RADIO_MEMCPY8(inOutBuffer, ChunkBuffer, *outSize);
+    
+    RFWPacket.LongPacketModeEnable=0;
+    
+    status= 0;
+  }
+#endif
+  return status;
+}
+
+int32_t RFW_ReceiveInit( void )
+{
+#if (RFW_ENABLE ==1 )
+  /* Radio IRQ is set to DIO1 by default */
+  SUBGRF_SetDioIrqParams( IRQ_RADIO_ALL&(~IRQ_RX_DONE), //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
+                          IRQ_RADIO_ALL&(~IRQ_RX_DONE), //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
+                          IRQ_RADIO_NONE,
+                          IRQ_RADIO_NONE );
+/*init whitening at beginning of the packet*/
+  RFW_WhiteSetState(&RFWPacket);
+/* Set the state of the Crc to crc_seed*/
+  RFW_CrcSetState(&RFWPacket);
+  
+  RFWPacket.RxPayloadOffset=0;
+  
+  RFWPacket.LongPacketModeEnable=0;
+  return 0;
+#else
+  return -1;
+#endif
+}
+
+void RFW_DeInit_TxLongPacket(void)
+{
+#if (RFW_LONGPACKET_ENABLE ==1 )
+  /*long packet WA*/
+  uint8_t reg = SUBGRF_ReadRegister(SUBGHZ_PKTCTL1A);
+  SUBGRF_WriteRegister(SUBGHZ_PKTCTL1A, reg & ~0x02);//clear infinite_sequence bit
+  SUBGRF_WriteRegister(SUBGHZ_RTXPLDLEN, 0xFF); //RxTxPldLen: reset to 0xFF
+#endif
+}
+
+void RFW_ReceivePayload( void )
+{
+#if (RFW_ENABLE ==1 )
+  uint16_t PayloadLength= 0;
+  if (RFW_GetPacketLength(&PayloadLength)==0)
+  {
+    uint32_t timeout;
+    uint32_t packet_length= PayloadLength+RFWPacket.Init.CrcFieldSize;
+    /*record payload length*/
+    RFWPacket.PayloadLength= PayloadLength;
+    /*record remaining payload length*/
+    RFWPacket.LongPacketRemainingBytes = (uint16_t) packet_length;
+    /*record rx buffer offset*/
+    RFWPacket.RadioBufferOffset = RFWPacket.Init.PayloadLengthFieldSize;
+    /*if decoded PayloadLength is longer than LongPacketMaxRxLength, reject packet*/
+    if (PayloadLength>RFWPacket.Init.LongPacketMaxRxLength)
+    {
+       SUBGRF_SetStandby( STDBY_RC );
+       RFWPacket.Init.RadioEvents->RxError( );
+       return;
+    }
+    if (packet_length<LONGPACKET_CHUNK_LENGTH_BYTES)
+    {
+      /* all in one chunks*/
+      /* calcucate time to end of packet*/
+      timeout = DIVC( (packet_length) * 8 * 1000 , RFWPacket.BitRate)+2;
+      /**/
+      /* start timer at the end of the packet*/
+      RFW_MW_LOG( TS_ON, VLEVEL_M,  "end packet in %dms\r\n", timeout);
+
+    }
+    else if (packet_length<(3*LONGPACKET_CHUNK_LENGTH_BYTES/2))
+    {
+      /* packet contained in 2 chunks*/
+      /* make sure that crc not cut in chunk*/
+      timeout = DIVR( (packet_length * 8 * 1000)/2 , RFWPacket.BitRate);
+    }
+    else
+    {
+      /* packet contained in multiple chunk*/
+      /* program radio timer for first chunk*/
+      timeout = DIVR( LONGPACKET_CHUNK_LENGTH_BYTES * 8 * 1000 , RFWPacket.BitRate);
+    }
+    TimerSetValue( &RFWPacket.Timer, timeout );
+    TimerStart( &RFWPacket.Timer);
+  }
+  else
+  {
+    /*timeout*/
+    SUBGRF_SetStandby( STDBY_RC );
+    RFWPacket.Init.RadioEvents->RxTimeout( );
+  }
+#endif
+}
+
+void RFW_SetRadioModem(RadioModems_t Modem)
+{
+#if (RFW_ENABLE ==1 )
+  RFWPacket.Init.Modem= Modem;
+#endif
+}
+
+/* Private Functions Definition -----------------------------------------------*/
+#if (RFW_LONGPACKET_ENABLE ==1 )
+static void RFW_TransmitLongPacket_NewTxChunkTimerEvent( void * param )
+{
+  RFW_TRANSMIT_LONGPACKET_TX_CHUNK_PROCESS();
+}
+
+static void RFW_TransmitLongPacket_TxChunkProcess( void )
+{
+  uint8_t* app_chunk_buffer_ptr=NULL;
+  uint8_t chunk_size=0;
+  uint8_t crc_result[2]={0};
+  uint8_t crc_size;
+  uint32_t timeout;/*timeout for next chunk*/
+  /*records how much has been sent*/
+  uint8_t read_ptr= SUBGRF_ReadRegister(SUBGHZ_TX_ADR_PTR); /*radio has transmitted up to read_ptr*/
+  uint8_t write_ptr= SUBGRF_ReadRegister(SUBGHZ_RTXPLDLEN); /*from read_ptr to write_ptr still to be transmitted*/
+  /*calculates how much bytes were sent since previous radio loading*/
+  uint8_t bytes_sent =read_ptr-RFWPacket.RadioBufferOffset;
+  /*bytes already loaded in the radio to send*/
+  uint8_t bytes_loaded= write_ptr-read_ptr;
+
+  /* Update offset tx, intentional wrap around*/
+  RFWPacket.RadioBufferOffset+= bytes_sent;
+  /*record payload remaining bytes to send*/
+  RFWPacket.LongPacketRemainingBytes-= bytes_sent;
+  RFW_MW_LOG( TS_ON, VLEVEL_M,  "read_ptr=%d, write_ptr=%d, bytes_sent=%d, bytes_loaded=%d,remaining to send=%d\r\n", 
+                                read_ptr, write_ptr,bytes_sent, bytes_loaded,RFWPacket.LongPacketRemainingBytes);
+  if ( RFWPacket.LongPacketRemainingBytes> 256)
+  {
+    /*get next chunk */
+    /*make sure that at least full CrcFieldSize will be loaded for the last chunk*/
+    if ( RFWPacket.LongPacketRemainingBytes>256+RFWPacket.Init.CrcFieldSize)
+    {
+      chunk_size = bytes_sent;
+    }
+    else
+    {
+      chunk_size = bytes_sent-RFWPacket.Init.CrcFieldSize;
+    }
+    /*no crc since it is not the last chunk*/
+    crc_size= 0;
+    /*calculate timeout for next chunk*/
+    timeout = DIVR( chunk_size* 8 * 1000 , RFWPacket.BitRate);
+    
+    TimerSetValue( &RFWPacket.Timer, timeout );
+    TimerStart( &RFWPacket.Timer);
+  }
+  else
+  {
+    /*last chunk to send*/
+    
+    if (RFWPacket.LongPacketRemainingBytes>bytes_loaded)
+    {
+      chunk_size = RFWPacket.LongPacketRemainingBytes-bytes_loaded;
+    }
+    else/* nothing to load anymore*/
+    {
+      chunk_size =RFWPacket.Init.CrcFieldSize;
+    }
+    /* crc, since it is the last chunk*/
+    crc_size= RFWPacket.Init.CrcFieldSize;
+    /*no more bytes to send*/
+    RFWPacket.LongPacketRemainingBytes= 0;
+    /*no need to program another timer, Tx done will complete the Tx process*/
+  }
+  /*get new chunk from the app*/
+  RFWPacket.TxLongPacketGetNextChunkCb( &app_chunk_buffer_ptr, chunk_size-crc_size);
+  /* Copy app_chunk_buffer_ptr in ChunkBuffer Buffer*/
+  RADIO_MEMCPY8(ChunkBuffer, app_chunk_buffer_ptr, chunk_size-crc_size);
+  if (RFWPacket.Init.CrcEnable== 1)
+  {
+      /* Run the crc calculation on payload length and payload*/
+      RFW_CrcRun(&RFWPacket, ChunkBuffer, chunk_size-crc_size, crc_result);
+      /* Append the crc result after the payload (if last chunk)*/
+      RADIO_MEMCPY8(&ChunkBuffer[chunk_size-crc_size], crc_result, crc_size);
+  }
+  /* Run the whitening calculation on payload length, payload and crc*/
+  RFW_WhiteRun(&RFWPacket, ChunkBuffer, chunk_size);
+  /*write next chunk*/
+  SUBGRF_WriteBuffer( write_ptr, ChunkBuffer, chunk_size );
+
+  /*update end ptr*/
+  SUBGRF_WriteRegister(SUBGHZ_RTXPLDLEN, (uint8_t)(chunk_size + write_ptr));
+  
+  RFW_MW_LOG( TS_ON, VLEVEL_M,  "next chunk size=%d, new write ptr=%d\n\r",chunk_size+ crc_size,  (uint8_t)(chunk_size+ crc_size + write_ptr));
+}
+#endif
+
+#if (RFW_ENABLE ==1 )
+static void RFW_WhiteInitState(RFwInit_t* Init, uint16_t WhiteSeed)
+{
+  Init->WhiteSeed= WhiteSeed;
+}
+
+static void RFW_WhiteSetState(RadioFw_t* RFWPacket)
+{
+  RFWPacket->WhiteLfsrState= RFWPacket->Init.WhiteSeed;
+}
+
+static void RFW_CrcInitState(RFwInit_t* Init, const uint16_t CrcPolynomial, const uint16_t CrcSeed, const RADIO_FSK_CrcTypes_t CrcType)
+{
+  Init->CrcPolynomial= CrcPolynomial;
+  Init->CrcSeed= CrcSeed;
+  Init->CrcType= CrcType;
+}
+
+static void RFW_CrcSetState(RadioFw_t* RFWPacket)
+{
+  RFWPacket->CrcLfsrState= RFWPacket->Init.CrcSeed;
+}
+
+static void RFW_WhiteRun(RadioFw_t* RFWPacket, uint8_t* Payload, uint32_t Size)
+{
+  /*run the whitening algo on Size bytes*/
+  uint16_t ibmwhite_state= RFWPacket->WhiteLfsrState;
+  for(int i=0;i<Size;i++)
+  {
+    Payload[i]^= ibmwhite_state&0xFF;
+    for (int j=0; j<8; j++)
+    {
+      uint8_t msb =  ((ibmwhite_state>>5)&0x1)^((ibmwhite_state>>0)&0x1);
+      ibmwhite_state= ((msb<<8) | (ibmwhite_state>>1) );
+    }
+  }
+  RFWPacket->WhiteLfsrState=ibmwhite_state;
+}
+
+static int32_t RFW_CrcRun(RadioFw_t* const RFWPacket, const uint8_t* Payload, const uint32_t Size, uint8_t CrcResult[2])
+{
+  int32_t status=0;
+  int32_t i = 0;
+  uint16_t polynomial = RFWPacket->Init.CrcPolynomial;
+  /* Restore state from previous chunk*/
+  uint16_t crc = RFWPacket->CrcLfsrState;
+  for( i = 0; i < Size; i++ )
+  {
+    crc = RFW_CrcRun1Byte( crc, Payload[i], polynomial );
+  }
+  /*Save state for next chunk*/
+  RFWPacket->CrcLfsrState=crc;
+  
+  if( RFWPacket->Init.CrcType == RADIO_FSK_CRC_2_BYTES_IBM )
+  {
+    CrcResult[1]=crc&0xFF;
+    CrcResult[0]=crc>>8;
+  }
+  else
+  {
+    crc= ~crc ;
+    CrcResult[1]=crc&0xFF;
+    CrcResult[0]=crc>>8;
+  }
+  return status;
+}
+
+uint16_t RFW_CrcRun1Byte( uint16_t Crc, uint8_t DataByte, uint16_t Polynomial)
+{
+  uint8_t i;
+  for( i = 0; i < 8; i++ )
+  {
+    if( ( ( ( Crc & 0x8000 ) >> 8 ) ^ ( DataByte & 0x80 ) ) != 0 )
+    {
+      Crc <<= 1;
+      Crc ^= Polynomial;
+    }
+    else
+    {
+      Crc <<= 1;
+    }
+    DataByte <<= 1;
+  }
+  return Crc;
+}
+
+static int32_t RFW_PollRxBytes(uint32_t bytes)
+{
+   uint32_t now = TimerGetCurrentTime( );
+   uint8_t reg_buff_ptr_ref= SUBGRF_ReadRegister(SUBGHZ_RX_ADR_PTR);
+   uint8_t reg_buff_ptr=reg_buff_ptr_ref;
+   uint32_t timeout = DIVC( bytes* 8 * 1000 , RFWPacket.BitRate);
+    // Wait that packet length is received
+    while( (reg_buff_ptr-reg_buff_ptr_ref) < bytes)
+    {
+        /*reading rx address pointer*/
+        reg_buff_ptr=SUBGRF_ReadRegister(SUBGHZ_RX_ADR_PTR);
+        if( TimerGetElapsedTime( now ) > timeout)
+        {
+          /*timeout*/
+          return -1;
+        }
+    }
+    return 0;
+}
+
+static int32_t RFW_GetPacketLength(uint16_t* PayloadLength)
+{
+    if ( 0UL!= RFW_PollRxBytes(RFWPacket.Init.PayloadLengthFieldSize))
+    {
+      return -1;
+    }
+    /* Get buffer from Radio*/
+    SUBGRF_ReadBuffer( 0, ChunkBuffer, RFWPacket.Init.PayloadLengthFieldSize );
+    /* De-whiten packet length*/
+    RFW_WhiteRun(&RFWPacket, ChunkBuffer ,RFWPacket.Init.PayloadLengthFieldSize);
+    /*do crc 1st calculation packetLengthField and store intermediate result */
+    if (RFWPacket.Init.CrcEnable== 1)
+    {
+      /*run Crc algo on payloadLengthField*/
+      uint8_t crc_dummy[2];
+      RFW_CrcRun(&RFWPacket, ChunkBuffer, RFWPacket.Init.PayloadLengthFieldSize, crc_dummy);
+    }
+    if (RFWPacket.Init.PayloadLengthFieldSize==1)
+    {
+      *PayloadLength= (uint16_t) ChunkBuffer[0];
+    }
+    else
+    {
+      /*packet length is 2 bytes*/
+      *PayloadLength= (((uint16_t) ChunkBuffer[0])<<8) |ChunkBuffer[1];
+      /*disable preamble detector*/
+      //uint8_t reg= SUBGRF_ReadRegister( SUBGHZ_PKTCTL1 );
+      //SUBGRF_WriteRegister(SUBGHZ_PKTCTL1, reg&(~0x02));
+    }
+    RFW_MW_LOG( TS_ON, VLEVEL_M,  "PayloadLength=%d,\r\n", *PayloadLength);
+    return 0;
+}
+
+static void RFW_GetPayloadTimerEvent( void * context)
+{
+  RFW_GET_PAYLOAD_PROCESS();
+}
+
+static void RFW_GetPayloadProcess( void )
+{
+    /*long packet mode*/
+    uint8_t read_ptr= SUBGRF_ReadRegister(SUBGHZ_RX_ADR_PTR);
+    uint8_t size=read_ptr-RFWPacket.RadioBufferOffset;
+    uint32_t Timeout;
+    /*check remaining size*/
+    if (RFWPacket.LongPacketRemainingBytes>size)
+    {
+      /* update LongPacketRemainingBytes*/
+      RFWPacket.LongPacketRemainingBytes-=size;
+      /*intermediate chunk*/
+      RFW_MW_LOG( TS_ON, VLEVEL_M,  "RxTxPldLen=0x%02X,\r\n",SUBGRF_ReadRegister(SUBGHZ_RTXPLDLEN));
+      RFW_MW_LOG( TS_ON, VLEVEL_M,  "RxAddrPtr=0x%02X,\r\n",read_ptr);
+      RFW_MW_LOG( TS_ON, VLEVEL_M,  "offset= %d, size=%d, remaining=%d,\r\n",RFWPacket.RadioBufferOffset, size, RFWPacket.LongPacketRemainingBytes);
+      /*update pld length so that not reached*/
+      SUBGRF_WriteRegister(SUBGHZ_RTXPLDLEN, read_ptr-1);
+      /* read data from radio*/
+      SUBGRF_ReadBuffer( RFWPacket.RadioBufferOffset, ChunkBuffer, size );
+      /* update buffer Offset, with intentional wrap around*/
+      RFWPacket.RadioBufferOffset+=size;
+      /*Run the de-whitening on current chunk*/
+      RFW_WhiteRun(&RFWPacket, ChunkBuffer, size);
+      if (RFWPacket.Init.CrcEnable== 1)
+      {
+        /*run Crc algo on partial chunk*/
+        uint8_t crc_dummy[2];
+        RFW_CrcRun(&RFWPacket, ChunkBuffer, size, crc_dummy);
+      }
+
+      if (RFWPacket.LongPacketModeEnable ==1)
+      {
+        /*report rx data chunk to application*/
+        RFWPacket.RxLongPacketStoreChunkCb( ChunkBuffer, size);
+      }
+      else
+      {
+        if (RFWPacket.RxPayloadOffset+=size<RADIO_BUF_SIZE )
+        {
+          RADIO_MEMCPY8(&RxBuffer[RFWPacket.RxPayloadOffset],ChunkBuffer,size);
+          RFWPacket.RxPayloadOffset+=size;
+        }
+        else
+        {
+          /*stop the radio*/
+          SUBGRF_SetStandby( STDBY_RC );
+          /*report CRC error*/
+          RFWPacket.Init.RadioEvents->RxError( );
+          return;
+        }
+      }
+      /*calculate next timer timeout*/
+      if (RFWPacket.LongPacketRemainingBytes<LONGPACKET_CHUNK_LENGTH_BYTES)
+      {
+        /*for the next and last chunk DIVC +1 to make sure crc is received.*/
+        Timeout = DIVC( (RFWPacket.LongPacketRemainingBytes)* 8 * 1000 , RFWPacket.BitRate)+2;
+      }
+      else if (RFWPacket.LongPacketRemainingBytes<(3*LONGPACKET_CHUNK_LENGTH_BYTES)/2)
+      {
+        /*this is to make sure that last chunk will always be greater than LONGPACKET_CHUNK_LENGTH_BYTES/2 */
+        Timeout = DIVR( (RFWPacket.LongPacketRemainingBytes/2)  * 8 * 1000 , RFWPacket.BitRate);
+      }
+      else
+      {
+        /*size value is close to LONGPACKET_CHUNK_LENGTH_BYTES with +/- errors compensated in closed loop here*/
+        Timeout = DIVR( (LONGPACKET_CHUNK_LENGTH_BYTES)  * 8 * 1000 , RFWPacket.BitRate);
+      }
+      TimerSetValue( &RFWPacket.Timer, Timeout );
+      TimerStart( &RFWPacket.Timer);
+    }
+    else
+    {
+      if (RFWPacket.LongPacketRemainingBytes<RFWPacket.Init.CrcFieldSize)
+      {
+        /* force LongPacketRemainingBytes to CrcFieldSize: this should never happen*/
+        RFWPacket.LongPacketRemainingBytes=RFWPacket.Init.CrcFieldSize;
+      }
+      /*last chunk*/
+      RFW_MW_LOG( TS_ON, VLEVEL_M,  "LastChunk. offset= %d, size=%d, remaining=%d,\r\n",RFWPacket.RadioBufferOffset, size,RFWPacket.LongPacketRemainingBytes);
+      size =RFWPacket.LongPacketRemainingBytes;
+      /* update LongPacketRemainingBytes*/
+      RFWPacket.LongPacketRemainingBytes=0;
+      /*Process last chunk*/
+      RFW_GetPayload(RFWPacket.RadioBufferOffset, size);
+    }
+}
+
+static void RFW_GetPayload( uint8_t Offset, uint8_t Length )
+{
+    uint8_t crc_result[2];
+    /*stop the radio*/
+    SUBGRF_SetStandby( STDBY_RC );
+    /*read data buffer*/
+    SUBGRF_ReadBuffer( Offset, ChunkBuffer, Length );
+    /*Run the de-whitening on all packet*/
+    RFW_WhiteRun(&RFWPacket, ChunkBuffer, Length);
+    if (RFWPacket.Init.CrcEnable== 1)
+    {
+      RFW_CrcRun(&RFWPacket, ChunkBuffer, Length-RFWPacket.Init.CrcFieldSize, crc_result);
+    }
+    if (RFWPacket.LongPacketModeEnable ==1)
+    {
+      /*report rx data chunk to application*/
+
+        RFWPacket.RxLongPacketStoreChunkCb( ChunkBuffer, Length-RFWPacket.Init.CrcFieldSize);
+    }
+    else
+    {
+      if (RFWPacket.RxPayloadOffset+Length-RFWPacket.Init.CrcFieldSize<RADIO_BUF_SIZE )
+      {
+        RADIO_MEMCPY8(&RxBuffer[RFWPacket.RxPayloadOffset], ChunkBuffer, Length-RFWPacket.Init.CrcFieldSize);
+        RFWPacket.RxPayloadOffset+=Length-RFWPacket.Init.CrcFieldSize;
+      }
+      else
+      {
+        /*report CRC error*/
+        RFWPacket.Init.RadioEvents->RxError( );
+        return;
+      }
+    }
+    TimerStop( RFWPacket.RxTimeoutTimer );
+    /* CRC check*/
+    RFW_MW_LOG( TS_ON, VLEVEL_M,  "crc_result= 0x%02X%02X, crc_payload=0x%02X%02X\r\n",crc_result[0],crc_result[1],ChunkBuffer[Length-2],ChunkBuffer[Length-1]);
+    if (((crc_result[0]==ChunkBuffer[Length-2]) &&
+        (crc_result[1]==ChunkBuffer[Length-1])) ||
+        (RFWPacket.Init.CrcEnable== 0))
+    {
+        /*read Rssi sampled at Sync*/
+        uint8_t rssi_sync = SUBGRF_ReadRegister(0x06CA);
+        /* Get Carrier Frequency Offset*/
+        int32_t cfo;
+        SUBGRF_GetCFO(RFWPacket.BitRate, &cfo);
+      /*ChunkBuffer[1] to remove packet Length*/
+        RFWPacket.Init.RadioEvents->RxDone( RxBuffer, 
+                                            RFWPacket.RxPayloadOffset,
+                                            -(rssi_sync>>1),
+                                            (int8_t) DIVR(cfo,1000));
+    }
+    else
+    {
+      /*report CRC error*/
+        RFWPacket.Init.RadioEvents->RxError( );
+    }
+    DBG_GPIO_RADIO_RX(RST);
+}
+#endif
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.h b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.h
new file mode 100644
index 00000000..6057fae8
--- /dev/null
+++ b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.h
@@ -0,0 +1,145 @@
+/**
+  ******************************************************************************
+  * @file    radio_fw.h
+  * @author  MCD Application Team
+  * @brief   Extends radio capabilities (whitening, long packet)
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_FW_H__
+#define __RADIO_FW_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+
+/*reserved for SubGHz_Phy internal MW communication*/
+typedef enum
+{
+    CONFIG_RX = 0,
+    CONFIG_TX,
+}ConfigGenericRTx_t;
+
+typedef struct{
+  TxConfigGeneric_t* TxConfig;
+  RxConfigGeneric_t* RxConfig;
+  ConfigGenericRTx_t rtx;
+} ConfigGeneric_t;
+
+/* Exported constants --------------------------------------------------------*/
+/* External variables --------------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions prototypes ---------------------------------------------*/
+
+/*!
+ * @brief Initialise the RFW module and enables custom  whithing, optionally long packet feature
+ *
+ * @param [IN] config        rx or tx config from the application
+ * @param [IN] RadioEvents from the radio
+ * @return 0 when no parameters error, -1 otherwise
+ */
+int32_t RFW_Init( ConfigGeneric_t* config, RadioEvents_t* RadioEvents, TimerEvent_t* TimeoutTimerEvent);
+
+/*!
+ * @brief Return whether the RFW module is enabled
+ *
+ * @return 0 when not initialised, -1 otherwise
+ */
+uint8_t RFW_Is_Init( void);
+
+/*!
+ * @brief Return whether the RFW module long packet is enabled
+ *
+ * @return 0 when not initialised, -1 otherwise
+ */
+uint8_t RFW_Is_LongPacketModeEnabled( void);
+
+/*!
+ * @brief Return whether the RFW module long packet is enabled
+ *
+ * @param [IN] RadioModems_t set in the radio
+ */
+void RFW_SetRadioModem(RadioModems_t Modem);
+
+/*!
+ * @brief DeInitialise the RFW module and enable custom  whithing and optionally long packet feature
+ *
+ */
+void RFW_DeInit( void);
+
+/*!
+ * @brief DeInitialise the TxLongPacket
+ *
+ */
+void RFW_DeInit_TxLongPacket(void);
+
+/*!
+ * @brief Set antenna switch output to be used in Tx
+ *
+ * @param [IN] AntSwitch  RFO_LP or FRO_HP
+ *
+ */
+void RFW_SetAntSwitch( uint8_t AntSwitch);
+
+/*!
+ * @brief Initialise reception for IBM whitening case
+ *
+ */
+int32_t RFW_ReceiveInit( void );
+
+/*!
+ * @brief Initialise transmission for IBM whitening case
+ *
+ */
+int32_t RFW_TransmitInit(uint8_t* inOutBuffer, uint8_t size, uint8_t* outSize);
+
+/*!
+ * @brief Starts receiving payload. Called at Rx Sync IRQ
+ *
+ */
+void RFW_ReceivePayload(void );
+
+/*!
+ * @brief Starts transmitting long Packet, note packet length may be on 1 bytes depending on config
+ *
+ * @param [IN] payload_size        total payload size to be sent
+ * @param [IN] TxLongPacketGetNextChunkCb   callback to be implemented on user side to feed partial chunk
+ *                                  buffer: source buffer allocated by the app
+ *                                  size: size in bytes to feed. User to implement the offset based on previous chunk request
+ * @return 0 when no parameters error, -1 otherwise
+ */
+int32_t RFW_TransmitLongPacket( uint16_t payload_size, uint32_t timeout, void (*TxLongPacketGetNextChunkCb) (uint8_t** buffer, uint8_t buffer_size) );
+
+/*!
+ * @brief Starts receiving long Packet, packet maybe short
+ *
+ * @param [IN] boosted_mode        boosted_mode: 0 normal Rx, 1:improved sensitivity
+ * @param [IN] timeout             Reception timeout [ms]
+ * @param [IN] RxLongStorePacketChunkCb   callback to be implemented on user side to record partial chunk in the application 
+ *                                  buffer: source buffer allocated in the radio driver
+ *                                  size: size in bytes to record
+ * @return 0 when no parameters error, -1 otherwise
+ */
+int32_t RFW_ReceiveLongPacket( uint8_t boosted_mode, uint32_t timeout, void (*RxLongStorePacketChunkCb) (uint8_t* buffer, uint8_t chunk_size) );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__RADIO_FW_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/subghz_phy_version.h b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/subghz_phy_version.h
index 4deb396d..d4c21628 100644
--- a/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/subghz_phy_version.h
+++ b/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/subghz_phy_version.h
@@ -34,9 +34,9 @@
                       0x76  SX1276 */
 
 #define __SUBGHZ_PHY_TYPE           (0x01U) /*!< [31:24] main version */
-#define __SUBGHZ_PHY_VERSION_MAIN   (0x00U) /*!< [23:16] main version */
-#define __SUBGHZ_PHY_VERSION_SUB1   (0x06U) /*!< [15:8]  sub1 version */
-#define __SUBGHZ_PHY_VERSION_SUB2   (0x01U) /*!< [7:0]   sub2 version */ 
+#define __SUBGHZ_PHY_VERSION_MAIN   (0x01U) /*!< [23:16] main version */
+#define __SUBGHZ_PHY_VERSION_SUB1   (0x01U) /*!< [15:8]  sub1 version */
+#define __SUBGHZ_PHY_VERSION_SUB2   (0x00U) /*!< [7:0]   sub2 version */ 
 #define __SUBGHZ_PHY_VERSION        ((__SUBGHZ_PHY_VERSION_MAIN << 24)  \
                                      |(__SUBGHZ_PHY_VERSION_SUB1 << 16) \
                                      |(__SUBGHZ_PHY_VERSION_SUB2 << 8 ) \
diff --git a/Middlewares/Third_Party/mbed-crypto/programs/psa/key_ladder_demo.sh b/Middlewares/Third_Party/mbed-crypto/programs/psa/key_ladder_demo.sh
deleted file mode 100644
index 2cec945f..00000000
--- a/Middlewares/Third_Party/mbed-crypto/programs/psa/key_ladder_demo.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-set -e -u
-
-program="${0%/*}"/key_ladder_demo
-files_to_clean=
-
-run () {
-    echo
-    echo "# $1"
-    shift
-    echo "+ $*"
-    "$@"
-}
-
-if [ -e master.key ]; then
-    echo "# Reusing the existing master.key file."
-else
-    files_to_clean="$files_to_clean master.key"
-    run "Generate a master key." \
-        "$program" generate master=master.key
-fi
-
-files_to_clean="$files_to_clean input.txt hello_world.wrap"
-echo "Here is some input. See it wrapped." >input.txt
-run "Derive a key and wrap some data with it." \
-    "$program" wrap master=master.key label=hello label=world \
-               input=input.txt output=hello_world.wrap
-
-files_to_clean="$files_to_clean hello_world.txt"
-run "Derive the same key again and unwrap the data." \
-    "$program" unwrap master=master.key label=hello label=world \
-               input=hello_world.wrap output=hello_world.txt
-run "Compare the unwrapped data with the original input." \
-    cmp input.txt hello_world.txt
-
-files_to_clean="$files_to_clean hellow_orld.txt"
-! run "Derive a different key and attempt to unwrap the data. This must fail." \
-  "$program" unwrap master=master.key input=hello_world.wrap output=hellow_orld.txt label=hellow label=orld
-
-files_to_clean="$files_to_clean hello.key"
-run "Save the first step of the key ladder, then load it as a master key and construct the rest of the ladder." \
-    "$program" save master=master.key label=hello \
-               input=hello_world.wrap output=hello.key
-run "Check that we get the same key by unwrapping data made by the other key." \
-    "$program" unwrap master=hello.key label=world \
-               input=hello_world.wrap output=hello_world.txt
-
-# Cleanup
-rm -f $files_to_clean
diff --git a/Middlewares/Third_Party/mbed-crypto/scripts/apidoc_full.sh b/Middlewares/Third_Party/mbed-crypto/scripts/apidoc_full.sh
deleted file mode 100644
index bebab103..00000000
--- a/Middlewares/Third_Party/mbed-crypto/scripts/apidoc_full.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Generate doxygen documentation with a full config.h (this ensures that every
-# available flag is documented, and avoids warnings about documentation
-# without a corresponding #define).
-#
-# /!\ This must not be a Makefile target, as it would create a race condition
-# when multiple targets are invoked in the same parallel build.
-
-set -eu
-
-CONFIG_H='include/mbedtls/config.h'
-
-if [ -r $CONFIG_H ]; then :; else
-    echo "$CONFIG_H not found" >&2
-    exit 1
-fi
-
-CONFIG_BAK=${CONFIG_H}.bak
-cp -p $CONFIG_H $CONFIG_BAK
-
-scripts/config.pl realfull
-make apidoc
-
-mv $CONFIG_BAK $CONFIG_H
diff --git a/Middlewares/Third_Party/mbed-crypto/scripts/bump_version.sh b/Middlewares/Third_Party/mbed-crypto/scripts/bump_version.sh
deleted file mode 100644
index d76e313c..00000000
--- a/Middlewares/Third_Party/mbed-crypto/scripts/bump_version.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash
-#
-# This file is part of mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2012-2016, ARM Limited, All Rights Reserved
-#
-# Purpose
-#
-# Sets the version numbers in the source code to those given.
-#
-# Usage: bump_version.sh [ --version <version> ] [ --so-crypto <version>]
-#                           [ -v | --verbose ] [ -h | --help ]
-#
-
-VERSION=""
-SOVERSION=""
-
-# Parse arguments
-#
-until [ -z "$1" ]
-do
-  case "$1" in
-    --version)
-      # Version to use
-      shift
-      VERSION=$1
-      ;;
-    --so-crypto)
-      shift
-      SO_CRYPTO=$1
-      ;;
-    -v|--verbose)
-      # Be verbose
-      VERBOSE="1"
-      ;;
-    -h|--help)
-      # print help
-      echo "Usage: $0"
-      echo -e "  -h|--help\t\tPrint this help."
-      echo -e "  --version <version>\tVersion to bump to."
-      echo -e "  --so-crypto <version>\tSO version to bump libmbedcrypto to."
-      echo -e "  -v|--verbose\t\tVerbose."
-      exit 1
-      ;;
-    *)
-      # print error
-      echo "Unknown argument: '$1'"
-      exit 1
-      ;;
-  esac
-  shift
-done
-
-if [ "X" = "X$VERSION" ];
-then
-  echo "No version specified. Unable to continue."
-  exit 1
-fi
-
-[ $VERBOSE ] && echo "Bumping VERSION in library/CMakeLists.txt"
-sed -e "s/ VERSION [0-9.]\{1,\}/ VERSION $VERSION/g" < library/CMakeLists.txt > tmp
-mv tmp library/CMakeLists.txt
-
-if [ "X" != "X$SO_CRYPTO" ];
-then
-  [ $VERBOSE ] && echo "Bumping SOVERSION for libmbedcrypto in library/CMakeLists.txt"
-  sed -e "/mbedcrypto/ s/ SOVERSION [0-9]\{1,\}/ SOVERSION $SO_CRYPTO/g" < library/CMakeLists.txt > tmp
-  mv tmp library/CMakeLists.txt
-
-  [ $VERBOSE ] && echo "Bumping SOVERSION for libmbedcrypto in library/Makefile"
-  sed -e "s/SOEXT_CRYPTO=so.[0-9]\{1,\}/SOEXT_CRYPTO=so.$SO_CRYPTO/g" < library/Makefile > tmp
-  mv tmp library/Makefile
-fi
-
-[ $VERBOSE ] && echo "Bumping VERSION in include/mbedtls/version.h"
-read MAJOR MINOR PATCH <<<$(IFS="."; echo $VERSION)
-VERSION_NR="$( printf "0x%02X%02X%02X00" $MAJOR $MINOR $PATCH )"
-cat include/mbedtls/version.h |                                    \
-    sed -e "s/_VERSION_MAJOR .\{1,\}/_VERSION_MAJOR  $MAJOR/" |    \
-    sed -e "s/_VERSION_MINOR .\{1,\}/_VERSION_MINOR  $MINOR/" |    \
-    sed -e "s/_VERSION_PATCH .\{1,\}/_VERSION_PATCH  $PATCH/" |    \
-    sed -e "s/_VERSION_NUMBER .\{1,\}/_VERSION_NUMBER         $VERSION_NR/" |    \
-    sed -e "s/_VERSION_STRING .\{1,\}/_VERSION_STRING         \"$VERSION\"/" |    \
-    sed -e "s/_VERSION_STRING_FULL .\{1,\}/_VERSION_STRING_FULL    \"mbed TLS $VERSION\"/" \
-    > tmp
-mv tmp include/mbedtls/version.h
-
-[ $VERBOSE ] && echo "Bumping version in tests/suites/test_suite_version.data"
-sed -e "s/version:\".\{1,\}/version:\"$VERSION\"/g" < tests/suites/test_suite_version.data > tmp
-mv tmp tests/suites/test_suite_version.data
-
-[ $VERBOSE ] && echo "Bumping PROJECT_NAME in doxygen/mbedtls.doxyfile and doxygen/input/doc_mainpage.h"
-for i in doxygen/mbedtls.doxyfile doxygen/input/doc_mainpage.h;
-do
-  sed -e "s/mbed TLS v[0-9\.]\{1,\}/mbed TLS v$VERSION/g" < $i > tmp
-  mv tmp $i
-done
-
-[ $VERBOSE ] && echo "Re-generating library/error.c"
-scripts/generate_errors.pl
-
-[ $VERBOSE ] && echo "Re-generating programs/test/query_config.c"
-scripts/generate_query_config.pl
-
-[ $VERBOSE ] && echo "Re-generating library/version_features.c"
-scripts/generate_features.pl
-
-[ $VERBOSE ] && echo "Re-generating visualc files"
-scripts/generate_visualc_files.pl
-
diff --git a/Middlewares/Third_Party/mbed-crypto/scripts/ecc-heap.sh b/Middlewares/Third_Party/mbed-crypto/scripts/ecc-heap.sh
deleted file mode 100644
index 94a04cf7..00000000
--- a/Middlewares/Third_Party/mbed-crypto/scripts/ecc-heap.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# Measure heap usage (and performance) of ECC operations with various values of
-# the relevant tunable compile-time parameters.
-#
-# Usage (preferably on a 32-bit platform):
-# cmake -D CMAKE_BUILD_TYPE=Release .
-# scripts/ecc-heap.sh | tee ecc-heap.log
-
-set -eu
-
-CONFIG_H='include/mbedtls/config.h'
-
-if [ -r $CONFIG_H ]; then :; else
-    echo "$CONFIG_H not found" >&2
-    exit 1
-fi
-
-if grep -i cmake Makefile >/dev/null; then :; else
-    echo "Needs Cmake" >&2
-    exit 1
-fi
-
-if git status | grep -F $CONFIG_H >/dev/null 2>&1; then
-    echo "config.h not clean" >&2
-    exit 1
-fi
-
-CONFIG_BAK=${CONFIG_H}.bak
-cp $CONFIG_H $CONFIG_BAK
-
-cat << EOF >$CONFIG_H
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
-#define MBEDTLS_MEMORY_DEBUG
-
-#define MBEDTLS_TIMING_C
-
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_ECP_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_ASN1_WRITE_C
-#define MBEDTLS_ECDSA_C
-#define MBEDTLS_ECDH_C
-
-#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
-
-#include "check_config.h"
-
-//#define MBEDTLS_ECP_WINDOW_SIZE            6
-//#define MBEDTLS_ECP_FIXED_POINT_OPTIM      1
-EOF
-
-for F in 0 1; do
-    for W in 2 3 4 5 6; do
-        scripts/config.pl set MBEDTLS_ECP_WINDOW_SIZE $W
-        scripts/config.pl set MBEDTLS_ECP_FIXED_POINT_OPTIM $F
-        make benchmark >/dev/null 2>&1
-        echo "fixed point optim = $F, max window size = $W"
-        echo "--------------------------------------------"
-        programs/test/benchmark
-    done
-done
-
-# cleanup
-
-mv $CONFIG_BAK $CONFIG_H
-make clean
diff --git a/Middlewares/Third_Party/mbed-crypto/scripts/footprint.sh b/Middlewares/Third_Party/mbed-crypto/scripts/footprint.sh
deleted file mode 100644
index 697972f3..00000000
--- a/Middlewares/Third_Party/mbed-crypto/scripts/footprint.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-#
-# This file is part of mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2015-2016, ARM Limited, All Rights Reserved
-#
-# Purpose
-#
-# This script determines ROM size (or code size) for the standard mbed TLS
-# configurations, when built for a Cortex M3/M4 target.
-#
-# Configurations included:
-#   default    include/mbedtls/config.h
-#   thread     configs/config-thread.h
-#   suite-b    configs/config-suite-b.h
-#   psk        configs/config-ccm-psk-tls1_2.h
-#
-# Usage: footprint.sh
-#
-set -eu
-
-CONFIG_H='include/mbedtls/config.h'
-
-if [ -r $CONFIG_H ]; then :; else
-    echo "$CONFIG_H not found" >&2
-    echo "This script needs to be run from the root of" >&2
-    echo "a git checkout or uncompressed tarball" >&2
-    exit 1
-fi
-
-if grep -i cmake Makefile >/dev/null; then
-    echo "Not compatible with CMake" >&2
-    exit 1
-fi
-
-if which arm-none-eabi-gcc >/dev/null 2>&1; then :; else
-    echo "You need the ARM-GCC toolchain in your path" >&2
-    echo "See https://launchpad.net/gcc-arm-embedded/" >&2
-    exit 1
-fi
-
-ARMGCC_FLAGS='-Os -march=armv7-m -mthumb'
-OUTFILE='00-footprint-summary.txt'
-
-log()
-{
-    echo "$@"
-    echo "$@" >> "$OUTFILE"
-}
-
-doit()
-{
-    NAME="$1"
-    FILE="$2"
-
-    log ""
-    log "$NAME ($FILE):"
-
-    cp $CONFIG_H ${CONFIG_H}.bak
-    if [ "$FILE" != $CONFIG_H ]; then
-        cp "$FILE"  $CONFIG_H
-    fi
-
-    {
-        scripts/config.pl unset MBEDTLS_TIMING_C || true
-        scripts/config.pl unset MBEDTLS_FS_IO || true
-        scripts/config.pl --force set MBEDTLS_NO_PLATFORM_ENTROPY || true
-    } >/dev/null 2>&1
-
-    make clean >/dev/null
-    CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld \
-        CFLAGS="$ARMGCC_FLAGS" make lib >/dev/null
-
-    OUT="size-${NAME}.txt"
-    arm-none-eabi-size -t library/libmbed*.a > "$OUT"
-    log "$( head -n1 "$OUT" )"
-    log "$( tail -n1 "$OUT" )"
-
-    cp ${CONFIG_H}.bak $CONFIG_H
-}
-
-# truncate the file just this time
-echo "(generated by $0)" > "$OUTFILE"
-echo "" >> "$OUTFILE"
-
-log "Footprint of standard configurations (minus net_sockets.c, timing.c, fs_io)"
-log "for bare-metal ARM Cortex-M3/M4 microcontrollers."
-
-VERSION_H="include/mbedtls/version.h"
-MBEDTLS_VERSION=$( sed -n 's/.*VERSION_STRING *"\(.*\)"/\1/p' $VERSION_H )
-if git rev-parse HEAD >/dev/null; then
-    GIT_HEAD=$( git rev-parse HEAD | head -c 10 )
-    GIT_VERSION=" (git head: $GIT_HEAD)"
-else
-    GIT_VERSION=""
-fi
-
-log ""
-log "mbed TLS $MBEDTLS_VERSION$GIT_VERSION"
-log "$( arm-none-eabi-gcc --version | head -n1 )"
-log "CFLAGS=$ARMGCC_FLAGS"
-
-doit default    include/mbedtls/config.h
-doit thread     configs/config-thread.h
-doit suite-b    configs/config-suite-b.h
-doit psk        configs/config-ccm-psk-tls1_2.h
-
-zip mbedtls-footprint.zip "$OUTFILE" size-*.txt >/dev/null
diff --git a/Middlewares/Third_Party/mbed-crypto/scripts/output_env.sh b/Middlewares/Third_Party/mbed-crypto/scripts/output_env.sh
deleted file mode 100644
index 132963c0..00000000
--- a/Middlewares/Third_Party/mbed-crypto/scripts/output_env.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /usr/bin/env sh
-
-# output_env.sh
-#
-# This file is part of mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2016, ARM Limited, All Rights Reserved
-#
-# Purpose
-#
-# To print out all the relevant information about the development environment.
-#
-# This includes:
-#   - architecture of the system
-#   - type and version of the operating system
-#   - version of armcc, clang, gcc-arm and gcc compilers
-#   - version of libc, clang, asan and valgrind if installed
-
-print_version()
-{
-    BIN="$1"
-    shift
-    ARGS="$1"
-    shift
-    FAIL_MSG="$1"
-    shift
-
-    if ! `type "$BIN" > /dev/null 2>&1`; then
-        echo "* $FAIL_MSG"
-        return 0
-    fi
-
-    BIN=`which "$BIN"`
-    VERSION_STR=`$BIN $ARGS 2>&1`
-
-    # Apply all filters
-    while [ $# -gt 0 ]; do
-        FILTER="$1"
-        shift
-        VERSION_STR=`echo "$VERSION_STR" | $FILTER`
-    done
-
-    echo "* ${BIN##*/}: $BIN: $VERSION_STR"
-}
-
-print_version "uname" "-a" ""
-echo
-
-if [ "${RUN_ARMCC:-1}" -ne 0 ]; then
-    : "${ARMC5_CC:=armcc}"
-    print_version "$ARMC5_CC" "--vsn" "armcc not found!" "head -n 2"
-    echo
-
-    : "${ARMC6_CC:=armclang}"
-    print_version "$ARMC6_CC" "--vsn" "armclang not found!" "head -n 2"
-    echo
-fi
-
-print_version "arm-none-eabi-gcc" "--version" "gcc-arm not found!" "head -n 1"
-echo
-
-print_version "gcc" "--version" "gcc not found!" "head -n 1"
-echo
-
-print_version "clang" "--version" "clang not found" "head -n 2"
-echo
-
-print_version "ldd" "--version"                     \
-    "No ldd present: can't determine libc version!" \
-    "head -n 1"
-echo
-
-print_version "valgrind" "--version" "valgrind not found!"
-echo
-
-if `hash dpkg > /dev/null 2>&1`; then
-    echo "* asan:"
-    dpkg -s libasan2 2> /dev/null | grep -i version
-    dpkg -s libasan1 2> /dev/null | grep -i version
-    dpkg -s libasan0 2> /dev/null | grep -i version
-else
-    echo "* No dpkg present: can't determine asan version!"
-fi
-echo
diff --git a/Middlewares/Third_Party/mbed-crypto/scripts/tmp_ignore_makefiles.sh b/Middlewares/Third_Party/mbed-crypto/scripts/tmp_ignore_makefiles.sh
deleted file mode 100644
index df9450e1..00000000
--- a/Middlewares/Third_Party/mbed-crypto/scripts/tmp_ignore_makefiles.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# Temporarily (de)ignore Makefiles generated by CMake to allow easier
-# git development
-
-IGNORE=""
-
-# Parse arguments
-#
-until [ -z "$1" ]
-do
-  case "$1" in
-    -u|--undo)
-      IGNORE="0"
-      ;;
-    -v|--verbose)
-      # Be verbose
-      VERBOSE="1"
-      ;;
-    -h|--help)
-      # print help
-      echo "Usage: $0"
-      echo -e "  -h|--help\t\tPrint this help."
-      echo -e "  -u|--undo\t\tRemove ignores and continue tracking."
-      echo -e "  -v|--verbose\t\tVerbose."
-      exit 1
-      ;;
-    *)
-      # print error
-      echo "Unknown argument: '$1'"
-      exit 1
-      ;;
-  esac
-  shift
-done
-
-if [ "X" = "X$IGNORE" ];
-then
-  [ $VERBOSE ] && echo "Ignoring Makefiles"
-  git update-index --assume-unchanged Makefile library/Makefile programs/Makefile tests/Makefile
-else
-  [ $VERBOSE ] && echo "Tracking Makefiles"
-  git update-index --no-assume-unchanged Makefile library/Makefile programs/Makefile tests/Makefile
-fi
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/git-scripts/pre-push.sh b/Middlewares/Third_Party/mbed-crypto/tests/git-scripts/pre-push.sh
deleted file mode 100644
index 86edf5a3..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/git-scripts/pre-push.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# pre-push.sh
-#
-# This file is part of mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2017, ARM Limited, All Rights Reserved
-#
-# Purpose
-#
-# Called by "git push" after it has checked the remote status, but before anything has been
-# pushed.  If this script exits with a non-zero status nothing will be pushed.
-# This script can also be used independently, not using git.
-#
-# This hook is called with the following parameters:
-#
-# $1 -- Name of the remote to which the push is being done
-# $2 -- URL to which the push is being done
-#
-# If pushing without using a named remote those arguments will be equal.
-#
-# Information about the commits which are being pushed is supplied as lines to
-# the standard input in the form:
-#
-#   <local ref> <local sha1> <remote ref> <remote sha1>
-#
-
-REMOTE="$1"
-URL="$2"
-
-echo "REMOTE is $REMOTE"
-echo "URL is $URL"
-
-set -eu
-
-run_test()
-{
-    TEST=$1
-    echo "running '$TEST'"
-    if ! `$TEST > /dev/null 2>&1`; then
-        echo "test '$TEST' failed"
-        return 1
-    fi
-}
-
-run_test ./tests/scripts/check-doxy-blocks.pl
-run_test ./tests/scripts/check-names.sh
-run_test ./tests/scripts/check-generated-files.sh
-run_test ./tests/scripts/check-files.py
-run_test ./tests/scripts/doxygen.sh
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/all.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/all.sh
deleted file mode 100644
index b38c7d45..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/all.sh
+++ /dev/null
@@ -1,1145 +0,0 @@
-#! /usr/bin/env sh
-
-# all.sh
-#
-# This file is part of mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2014-2017, ARM Limited, All Rights Reserved
-
-
-
-################################################################
-#### Documentation
-################################################################
-
-# Purpose
-# -------
-#
-# To run all tests possible or available on the platform.
-#
-# Notes for users
-# ---------------
-#
-# Warning: the test is destructive. It includes various build modes and
-# configurations, and can and will arbitrarily change the current CMake
-# configuration. The following files must be committed into git:
-#    * include/mbedtls/config.h
-#    * Makefile, library/Makefile, programs/Makefile, tests/Makefile
-# After running this script, the CMake cache will be lost and CMake
-# will no longer be initialised.
-#
-# The script assumes the presence of a number of tools:
-#   * Basic Unix tools (Windows users note: a Unix-style find must be before
-#     the Windows find in the PATH)
-#   * Perl
-#   * GNU Make
-#   * CMake
-#   * GCC and Clang (recent enough for using ASan with gcc and MemSan with clang, or valgrind)
-#   * G++
-#   * arm-gcc and mingw-gcc
-#   * ArmCC 5 and ArmCC 6, unless invoked with --no-armcc
-# See the invocation of check_tools below for details.
-#
-# This script must be invoked from the toplevel directory of a git
-# working copy of Mbed TLS.
-#
-# Note that the output is not saved. You may want to run
-#   script -c tests/scripts/all.sh
-# or
-#   tests/scripts/all.sh >all.log 2>&1
-#
-# Notes for maintainers
-# ---------------------
-#
-# The bulk of the code is organized into functions that follow one of the
-# following naming conventions:
-#  * pre_XXX: things to do before running the tests, in order.
-#  * component_XXX: independent components. They can be run in any order.
-#      * component_check_XXX: quick tests that aren't worth parallelizing.
-#      * component_build_XXX: build things but don't run them.
-#      * component_test_XXX: build and test.
-#  * support_XXX: if support_XXX exists and returns false then
-#    component_XXX is not run by default.
-#  * post_XXX: things to do after running the tests.
-#  * other: miscellaneous support functions.
-#
-# Each component must start by invoking `msg` with a short informative message.
-#
-# The framework performs some cleanup tasks after each component. This
-# means that components can assume that the working directory is in a
-# cleaned-up state, and don't need to perform the cleanup themselves.
-# * Run `make clean`.
-# * Restore `include/mbedtks/config.h` from a backup made before running
-#   the component.
-# * Check out `Makefile`, `library/Makefile`, `programs/Makefile` and
-#   `tests/Makefile` from git. This cleans up after an in-tree use of
-#   CMake.
-#
-# Any command that is expected to fail must be protected so that the
-# script keeps running in --keep-going mode despite `set -e`. In keep-going
-# mode, if a protected command fails, this is logged as a failure and the
-# script will exit with a failure status once it has run all components.
-# Commands can be protected in any of the following ways:
-# * `make` is a function which runs the `make` command with protection.
-#   Note that you must write `make VAR=value`, not `VAR=value make`,
-#   because the `VAR=value make` syntax doesn't work with functions.
-# * Put `report_status` before the command to protect it.
-# * Put `if_build_successful` before a command. This protects it, and
-#   additionally skips it if a prior invocation of `make` in the same
-#   component failed.
-#
-# The tests are roughly in order from fastest to slowest. This doesn't
-# have to be exact, but in general you should add slower tests towards
-# the end and fast checks near the beginning.
-
-
-
-################################################################
-#### Initialization and command line parsing
-################################################################
-
-# Abort on errors (and uninitialised variables)
-set -eu
-
-pre_check_environment () {
-    if [ -d library -a -d include -a -d tests ]; then :; else
-        echo "Must be run from mbed TLS root" >&2
-        exit 1
-    fi
-}
-
-pre_initialize_variables () {
-    CONFIG_H='include/mbedtls/config.h'
-    CONFIG_BAK="$CONFIG_H.bak"
-
-    FORCE=0
-    KEEP_GOING=0
-
-    # Default commands, can be overridden by the environment
-    : ${OUT_OF_SOURCE_DIR:=./mbedtls_out_of_source_build}
-    : ${ARMC5_BIN_DIR:=/usr/bin}
-    : ${ARMC6_BIN_DIR:=/usr/bin}
-
-    # if MAKEFLAGS is not set add the -j option to speed up invocations of make
-    if [ -z "${MAKEFLAGS+set}" ]; then
-        export MAKEFLAGS="-j"
-    fi
-
-    # Include more verbose output for failing tests run by CMake
-    export CTEST_OUTPUT_ON_FAILURE=1
-
-    # Gather the list of available components. These are the functions
-    # defined in this script whose name starts with "component_".
-    # Parse the script with sed, because in sh there is no way to list
-    # defined functions.
-    ALL_COMPONENTS=$(sed -n 's/^ *component_\([0-9A-Z_a-z]*\) *().*/\1/p' <"$0")
-
-    # Exclude components that are not supported on this platform.
-    SUPPORTED_COMPONENTS=
-    for component in $ALL_COMPONENTS; do
-        case $(type "support_$component" 2>&1) in
-            *' function'*)
-                if ! support_$component; then continue; fi;;
-        esac
-        SUPPORTED_COMPONENTS="$SUPPORTED_COMPONENTS $component"
-    done
-}
-
-# Test whether the component $1 is included in the command line patterns.
-is_component_included()
-{
-    set -f
-    for pattern in $COMMAND_LINE_COMPONENTS; do
-        set +f
-        case ${1#component_} in $pattern) return 0;; esac
-    done
-    set +f
-    return 1
-}
-
-usage()
-{
-    cat <<EOF
-Usage: $0 [OPTION]... [COMPONENT]...
-Run mbedtls release validation tests.
-By default, run all tests. With one or more COMPONENT, run only those.
-COMPONENT can be the name of a component or a shell wildcard pattern.
-
-Examples:
-  $0 "check_*"
-    Run all sanity checks.
-  $0 --no-armcc --except test_memsan
-    Run everything except builds that require armcc and MemSan.
-
-Special options:
-  -h|--help             Print this help and exit.
-  --list-all-components List all available test components and exit.
-  --list-components     List components supported on this platform and exit.
-
-General options:
-  -f|--force            Force the tests to overwrite any modified files.
-  -k|--keep-going       Run all tests and report errors at the end.
-  -m|--memory           Additional optional memory tests.
-     --armcc            Run ARM Compiler builds (on by default).
-     --except           Exclude the COMPONENTs listed on the command line,
-                        instead of running only those.
-     --no-armcc         Skip ARM Compiler builds.
-     --no-force         Refuse to overwrite modified files (default).
-     --no-keep-going    Stop at the first error (default).
-     --no-memory        No additional memory tests (default).
-     --out-of-source-dir=<path>  Directory used for CMake out-of-source build tests.
-     --random-seed      Use a random seed value for randomized tests (default).
-  -r|--release-test     Run this script in release mode. This fixes the seed value to 1.
-  -s|--seed             Integer seed value to use for this test run.
-
-Tool path options:
-     --armc5-bin-dir=<ARMC5_bin_dir_path>       ARM Compiler 5 bin directory.
-     --armc6-bin-dir=<ARMC6_bin_dir_path>       ARM Compiler 6 bin directory.
-EOF
-}
-
-# remove built files as well as the cmake cache/config
-cleanup()
-{
-    if [ -n "${MBEDTLS_ROOT_DIR+set}" ]; then
-        cd "$MBEDTLS_ROOT_DIR"
-    fi
-
-    command make clean
-
-    # Remove CMake artefacts
-    find . -name .git -prune -o \
-           -iname CMakeFiles -exec rm -rf {} \+ -o \
-           \( -iname cmake_install.cmake -o \
-              -iname CTestTestfile.cmake -o \
-              -iname CMakeCache.txt \) -exec rm {} \+
-    # Recover files overwritten by in-tree CMake builds
-    rm -f include/Makefile include/mbedtls/Makefile programs/*/Makefile
-    git update-index --no-skip-worktree Makefile library/Makefile programs/Makefile tests/Makefile
-    git checkout -- Makefile library/Makefile programs/Makefile tests/Makefile
-
-    if [ -f "$CONFIG_BAK" ]; then
-        mv "$CONFIG_BAK" "$CONFIG_H"
-    fi
-}
-
-# Executed on exit. May be redefined depending on command line options.
-final_report () {
-    :
-}
-
-fatal_signal () {
-    cleanup
-    final_report $1
-    trap - $1
-    kill -$1 $$
-}
-
-trap 'fatal_signal HUP' HUP
-trap 'fatal_signal INT' INT
-trap 'fatal_signal TERM' TERM
-
-msg()
-{
-    if [ -n "${current_component:-}" ]; then
-        current_section="${current_component#component_}: $1"
-    else
-        current_section="$1"
-    fi
-    echo ""
-    echo "******************************************************************"
-    echo "* $current_section "
-    printf "* "; date
-    echo "******************************************************************"
-}
-
-armc6_build_test()
-{
-    FLAGS="$1"
-
-    msg "build: ARM Compiler 6 ($FLAGS), make"
-    ARM_TOOL_VARIANT="ult" CC="$ARMC6_CC" AR="$ARMC6_AR" CFLAGS="$FLAGS" \
-                    WARNING_CFLAGS='-xc -std=c99' make lib
-    make clean
-}
-
-err_msg()
-{
-    echo "$1" >&2
-}
-
-check_tools()
-{
-    for TOOL in "$@"; do
-        if ! `type "$TOOL" >/dev/null 2>&1`; then
-            err_msg "$TOOL not found!"
-            exit 1
-        fi
-    done
-}
-
-check_headers_in_cpp () {
-    ls include/mbedtls | grep "\.h$" >headers.txt
-    <programs/test/cpp_dummy_build.cpp sed -n 's/"$//; s!^#include "mbedtls/!!p' |
-    sort |
-    diff headers.txt -
-    rm headers.txt
-}
-
-pre_parse_command_line () {
-    COMMAND_LINE_COMPONENTS=
-    all_except=0
-    no_armcc=
-
-    # Note that legacy options are ignored instead of being omitted from this
-    # list of options, so invocations that worked with previous version of
-    # all.sh will still run and work properly.
-    while [ $# -gt 0 ]; do
-        case "$1" in
-            --armcc) no_armcc=;;
-            --armc5-bin-dir) shift; ARMC5_BIN_DIR="$1";;
-            --armc6-bin-dir) shift; ARMC6_BIN_DIR="$1";;
-            --except) all_except=1;;
-            --force|-f) FORCE=1;;
-            --gnutls-cli) shift;;
-            --gnutls-legacy-cli) shift;;
-            --gnutls-legacy-serv) shift;;
-            --gnutls-serv) shift;;
-            --help|-h) usage; exit;;
-            --keep-going|-k) KEEP_GOING=1;;
-            --list-all-components) printf '%s\n' $ALL_COMPONENTS; exit;;
-            --list-components) printf '%s\n' $SUPPORTED_COMPONENTS; exit;;
-            --memory|-m) ;;
-            --no-armcc) no_armcc=1;;
-            --no-force) FORCE=0;;
-            --no-keep-going) KEEP_GOING=0;;
-            --no-memory) ;;
-            --openssl) shift;;
-            --openssl-legacy) shift;;
-            --openssl-next) shift;;
-            --out-of-source-dir) shift; OUT_OF_SOURCE_DIR="$1";;
-            --random-seed) ;;
-            --release-test|-r) ;;
-            --seed|-s) shift;;
-            -*)
-                echo >&2 "Unknown option: $1"
-                echo >&2 "Run $0 --help for usage."
-                exit 120
-                ;;
-            *) COMMAND_LINE_COMPONENTS="$COMMAND_LINE_COMPONENTS $1";;
-        esac
-        shift
-    done
-
-    # With no list of components, run everything.
-    if [ -z "$COMMAND_LINE_COMPONENTS" ]; then
-        all_except=1
-    fi
-
-    # --no-armcc is a legacy option. The modern way is --except '*_armcc*'.
-    # Ignore it if components are listed explicitly on the command line.
-    if [ -n "$no_armcc" ] && [ $all_except -eq 1 ]; then
-        COMMAND_LINE_COMPONENTS="$COMMAND_LINE_COMPONENTS *_armcc*"
-    fi
-
-    # Build the list of components to run.
-    RUN_COMPONENTS=
-    for component in $SUPPORTED_COMPONENTS; do
-        if is_component_included "$component"; [ $? -eq $all_except ]; then
-            RUN_COMPONENTS="$RUN_COMPONENTS $component"
-        fi
-    done
-
-    unset all_except
-    unset no_armcc
-}
-
-pre_check_git () {
-    if [ $FORCE -eq 1 ]; then
-        rm -rf "$OUT_OF_SOURCE_DIR"
-        git checkout-index -f -q $CONFIG_H
-        cleanup
-    else
-
-        if [ -d "$OUT_OF_SOURCE_DIR" ]; then
-            echo "Warning - there is an existing directory at '$OUT_OF_SOURCE_DIR'" >&2
-            echo "You can either delete this directory manually, or force the test by rerunning"
-            echo "the script as: $0 --force --out-of-source-dir $OUT_OF_SOURCE_DIR"
-            exit 1
-        fi
-
-        if ! git diff --quiet include/mbedtls/config.h; then
-            err_msg "Warning - the configuration file 'include/mbedtls/config.h' has been edited. "
-            echo "You can either delete or preserve your work, or force the test by rerunning the"
-            echo "script as: $0 --force"
-            exit 1
-        fi
-    fi
-}
-
-pre_check_seedfile () {
-    if [ ! -f "./tests/seedfile" ]; then
-        dd if=/dev/urandom of=./tests/seedfile bs=32 count=1
-    fi
-}
-
-pre_setup_keep_going () {
-    failure_summary=
-    failure_count=0
-    start_red=
-    end_color=
-    if [ -t 1 ]; then
-        case "${TERM:-}" in
-            *color*|cygwin|linux|rxvt*|screen|[Eex]term*)
-                start_red=$(printf '\033[31m')
-                end_color=$(printf '\033[0m')
-                ;;
-        esac
-    fi
-    record_status () {
-        if "$@"; then
-            last_status=0
-        else
-            last_status=$?
-            text="$current_section: $* -> $last_status"
-            failure_summary="$failure_summary
-$text"
-            failure_count=$((failure_count + 1))
-            echo "${start_red}^^^^$text^^^^${end_color}"
-        fi
-    }
-    make () {
-        case "$*" in
-            *test|*check)
-                if [ $build_status -eq 0 ]; then
-                    record_status command make "$@"
-                else
-                    echo "(skipped because the build failed)"
-                fi
-                ;;
-            *)
-                record_status command make "$@"
-                build_status=$last_status
-                ;;
-        esac
-    }
-    final_report () {
-        if [ $failure_count -gt 0 ]; then
-            echo
-            echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-            echo "${start_red}FAILED: $failure_count${end_color}$failure_summary"
-            echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-            exit 1
-        elif [ -z "${1-}" ]; then
-            echo "SUCCESS :)"
-        fi
-        if [ -n "${1-}" ]; then
-            echo "Killed by SIG$1."
-        fi
-    }
-}
-
-if_build_succeeded () {
-    if [ $build_status -eq 0 ]; then
-        record_status "$@"
-    fi
-}
-
-# to be used instead of ! for commands run with
-# record_status or if_build_succeeded
-not() {
-    ! "$@"
-}
-
-pre_print_configuration () {
-    msg "info: $0 configuration"
-    echo "FORCE: $FORCE"
-    echo "ARMC5_BIN_DIR: $ARMC5_BIN_DIR"
-    echo "ARMC6_BIN_DIR: $ARMC6_BIN_DIR"
-}
-
-# Make sure the tools we need are available.
-pre_check_tools () {
-    # Build the list of variables to pass to output_env.sh.
-    set env
-
-    case " $RUN_COMPONENTS " in
-        *_doxygen[_\ ]*) check_tools "doxygen" "dot";;
-    esac
-
-    case " $RUN_COMPONENTS " in
-        *_arm_none_eabi_gcc[_\ ]*) check_tools "arm-none-eabi-gcc";;
-    esac
-
-    case " $RUN_COMPONENTS " in
-        *_mingw[_\ ]*) check_tools "i686-w64-mingw32-gcc";;
-    esac
-
-    case " $RUN_COMPONENTS " in
-        *" test_zeroize "*) check_tools "gdb";;
-    esac
-
-    case " $RUN_COMPONENTS " in
-        *_armcc*)
-            ARMC5_CC="$ARMC5_BIN_DIR/armcc"
-            ARMC5_AR="$ARMC5_BIN_DIR/armar"
-            ARMC6_CC="$ARMC6_BIN_DIR/armclang"
-            ARMC6_AR="$ARMC6_BIN_DIR/armar"
-            check_tools "$ARMC5_CC" "$ARMC5_AR" "$ARMC6_CC" "$ARMC6_AR";;
-    esac
-
-    msg "info: output_env.sh"
-    case $RUN_COMPONENTS in
-        *_armcc*)
-            set "$@" ARMC5_CC="$ARMC5_CC" ARMC6_CC="$ARMC6_CC" RUN_ARMCC=1;;
-        *) set "$@" RUN_ARMCC=0;;
-    esac
-    "$@" scripts/output_env.sh
-}
-
-
-
-################################################################
-#### Basic checks
-################################################################
-
-#
-# Test Suites to be executed
-#
-# The test ordering tries to optimize for the following criteria:
-# 1. Catch possible problems early, by running first tests that run quickly
-#    and/or are more likely to fail than others (eg I use Clang most of the
-#    time, so start with a GCC build).
-# 2. Minimize total running time, by avoiding useless rebuilds
-#
-# Indicative running times are given for reference.
-
-component_check_recursion () {
-    msg "test: recursion.pl" # < 1s
-    record_status tests/scripts/recursion.pl library/*.c
-}
-
-component_check_generated_files () {
-    msg "test: freshness of generated source files" # < 1s
-    record_status tests/scripts/check-generated-files.sh
-}
-
-component_check_doxy_blocks () {
-    msg "test: doxygen markup outside doxygen blocks" # < 1s
-    record_status tests/scripts/check-doxy-blocks.pl
-}
-
-component_check_files () {
-    msg "test: check-files.py" # < 1s
-    record_status tests/scripts/check-files.py
-}
-
-component_check_names () {
-    msg "test/build: declared and exported names" # < 3s
-    record_status tests/scripts/check-names.sh
-}
-
-component_check_doxygen_warnings () {
-    msg "test: doxygen warnings" # ~ 3s
-    record_status tests/scripts/doxygen.sh
-}
-
-
-################################################################
-#### Build and test many configurations and targets
-################################################################
-
-component_test_default_out_of_box () {
-    msg "build: make, default config (out-of-box)" # ~1min
-    make
-
-    msg "test: main suites make, default config (out-of-box)" # ~10s
-    make test
-
-    msg "selftest: make, default config (out-of-box)" # ~10s
-    programs/test/selftest
-}
-
-component_test_default_cmake_gcc_asan () {
-    msg "build: cmake, gcc, ASan" # ~ 1 min 50s
-    CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
-    make
-
-    msg "test: main suites (inc. selftests) (ASan build)" # ~ 50s
-    make test
-}
-
-component_test_ref_configs () {
-    msg "test/build: ref-configs (ASan build)" # ~ 6 min 20s
-    CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
-    record_status tests/scripts/test-ref-configs.pl
-}
-
-component_test_rsa_no_crt () {
-    msg "build: Default + RSA_NO_CRT (ASan build)" # ~ 6 min
-    scripts/config.pl set MBEDTLS_RSA_NO_CRT
-    CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
-    make
-
-    msg "test: RSA_NO_CRT - main suites (inc. selftests) (ASan build)" # ~ 50s
-    make test
-}
-
-component_test_new_ecdh_context () {
-    msg "build: new ECDH context (ASan build)" # ~ 6 min
-    scripts/config.pl unset MBEDTLS_ECDH_LEGACY_CONTEXT
-    CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
-    make
-
-    msg "test: new ECDH context - main suites (inc. selftests) (ASan build)" # ~ 50s
-    make test
-}
-
-component_test_full_cmake_clang () {
-    msg "build: cmake, full config, clang" # ~ 50s
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
-    CC=clang cmake -D CMAKE_BUILD_TYPE:String=Check -D ENABLE_TESTING=On .
-    make
-
-    msg "test: main suites (full config)" # ~ 5s
-    make test
-
-    msg "test: psa_constant_names (full config)" # ~ 1s
-    record_status tests/scripts/test_psa_constant_names.py
-}
-
-component_build_deprecated () {
-    msg "build: make, full config + DEPRECATED_WARNING, gcc -O" # ~ 30s
-    scripts/config.pl full
-    scripts/config.pl set MBEDTLS_DEPRECATED_WARNING
-    # Build with -O -Wextra to catch a maximum of issues.
-    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra' lib programs
-    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-unused-function' tests
-
-    msg "build: make, full config + DEPRECATED_REMOVED, clang -O" # ~ 30s
-    # No cleanup, just tweak the configuration and rebuild
-    make clean
-    scripts/config.pl unset MBEDTLS_DEPRECATED_WARNING
-    scripts/config.pl set MBEDTLS_DEPRECATED_REMOVED
-    # Build with -O -Wextra to catch a maximum of issues.
-    make CC=clang CFLAGS='-O -Werror -Wall -Wextra' lib programs
-    make CC=clang CFLAGS='-O -Werror -Wall -Wextra -Wno-unused-function' tests
-}
-
-
-component_test_depends_curves () {
-    msg "test/build: curves.pl (gcc)" # ~ 4 min
-    record_status tests/scripts/curves.pl
-}
-
-component_test_depends_hashes () {
-    msg "test/build: depends-hashes.pl (gcc)" # ~ 2 min
-    record_status tests/scripts/depends-hashes.pl
-}
-
-component_test_depends_pkalgs () {
-    msg "test/build: depends-pkalgs.pl (gcc)" # ~ 2 min
-    record_status tests/scripts/depends-pkalgs.pl
-}
-
-component_build_default_make_gcc_and_cxx () {
-    msg "build: Unix make, -Os (gcc)" # ~ 30s
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra -Os'
-
-    msg "test: verify header list in cpp_dummy_build.cpp"
-    record_status check_headers_in_cpp
-
-    msg "build: Unix make, incremental g++"
-    make TEST_CPP=1
-}
-
-component_test_use_psa_crypto_full_cmake_asan() {
-    # MBEDTLS_USE_PSA_CRYPTO: run the same set of tests as basic-build-test.sh
-    msg "build: cmake, full config + MBEDTLS_USE_PSA_CRYPTO, ASan"
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
-    scripts/config.pl unset MBEDTLS_ECP_RESTARTABLE  # restartable ECC not supported through PSA
-    scripts/config.pl set MBEDTLS_PSA_CRYPTO_C
-    scripts/config.pl set MBEDTLS_USE_PSA_CRYPTO
-    CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
-    make
-
-    msg "test: main suites (MBEDTLS_USE_PSA_CRYPTO)"
-    make test
-}
-
-component_test_check_params_without_platform () {
-    msg "build+test: MBEDTLS_CHECK_PARAMS without MBEDTLS_PLATFORM_C"
-    scripts/config.pl full # includes CHECK_PARAMS
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
-    scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C
-    scripts/config.pl unset MBEDTLS_PLATFORM_EXIT_ALT
-    scripts/config.pl unset MBEDTLS_PLATFORM_TIME_ALT
-    scripts/config.pl unset MBEDTLS_PLATFORM_FPRINTF_ALT
-    scripts/config.pl unset MBEDTLS_PLATFORM_MEMORY
-    scripts/config.pl unset MBEDTLS_PLATFORM_PRINTF_ALT
-    scripts/config.pl unset MBEDTLS_PLATFORM_SNPRINTF_ALT
-    scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED
-    scripts/config.pl unset MBEDTLS_PLATFORM_C
-    make CC=gcc CFLAGS='-Werror -O1' all test
-}
-
-component_test_check_params_silent () {
-    msg "build+test: MBEDTLS_CHECK_PARAMS with alternative MBEDTLS_PARAM_FAILED()"
-    scripts/config.pl full # includes CHECK_PARAMS
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
-    sed -i 's/.*\(#define MBEDTLS_PARAM_FAILED( cond )\).*/\1/' "$CONFIG_H"
-    make CC=gcc CFLAGS='-Werror -O1' all test
-}
-
-component_test_no_platform () {
-    # Full configuration build, without platform support, file IO and net sockets.
-    # This should catch missing mbedtls_printf definitions, and by disabling file
-    # IO, it should catch missing '#include <stdio.h>'
-    msg "build: full config except platform/fsio/net, make, gcc, C99" # ~ 30s
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_PLATFORM_C
-    scripts/config.pl unset MBEDTLS_PLATFORM_MEMORY
-    scripts/config.pl unset MBEDTLS_PLATFORM_PRINTF_ALT
-    scripts/config.pl unset MBEDTLS_PLATFORM_FPRINTF_ALT
-    scripts/config.pl unset MBEDTLS_PLATFORM_SNPRINTF_ALT
-    scripts/config.pl unset MBEDTLS_PLATFORM_TIME_ALT
-    scripts/config.pl unset MBEDTLS_PLATFORM_EXIT_ALT
-    scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED
-    scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C
-    scripts/config.pl unset MBEDTLS_FS_IO
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C
-    scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C
-    # Note, _DEFAULT_SOURCE needs to be defined for platforms using glibc version >2.19,
-    # to re-enable platform integration features otherwise disabled in C99 builds
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra -std=c99 -pedantic -O0 -D_DEFAULT_SOURCE' lib programs
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra -O0' test
-}
-
-component_build_no_std_function () {
-    # catch compile bugs in _uninit functions
-    msg "build: full config with NO_STD_FUNCTION, make, gcc" # ~ 30s
-    scripts/config.pl full
-    scripts/config.pl set MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-    scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra -O0'
-}
-
-component_test_null_entropy () {
-    msg "build: default config with  MBEDTLS_TEST_NULL_ENTROPY (ASan build)"
-    scripts/config.pl set MBEDTLS_TEST_NULL_ENTROPY
-    scripts/config.pl set MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
-    scripts/config.pl set MBEDTLS_ENTROPY_C
-    scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED
-    scripts/config.pl unset MBEDTLS_ENTROPY_HARDWARE_ALT
-    scripts/config.pl unset MBEDTLS_HAVEGE_C
-    CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan -D UNSAFE_BUILD=ON .
-    make
-
-    msg "test: MBEDTLS_TEST_NULL_ENTROPY - main suites (inc. selftests) (ASan build)"
-    make test
-}
-
-component_test_platform_calloc_macro () {
-    msg "build: MBEDTLS_PLATFORM_{CALLOC/FREE}_MACRO enabled (ASan build)"
-    scripts/config.pl set MBEDTLS_PLATFORM_MEMORY
-    scripts/config.pl set MBEDTLS_PLATFORM_CALLOC_MACRO calloc
-    scripts/config.pl set MBEDTLS_PLATFORM_FREE_MACRO   free
-    CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
-    make
-
-    msg "test: MBEDTLS_PLATFORM_{CALLOC/FREE}_MACRO enabled (ASan build)"
-    make test
-}
-
-component_test_aes_fewer_tables () {
-    msg "build: default config with AES_FEWER_TABLES enabled"
-    scripts/config.pl set MBEDTLS_AES_FEWER_TABLES
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra'
-
-    msg "test: AES_FEWER_TABLES"
-    make test
-}
-
-component_test_aes_rom_tables () {
-    msg "build: default config with AES_ROM_TABLES enabled"
-    scripts/config.pl set MBEDTLS_AES_ROM_TABLES
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra'
-
-    msg "test: AES_ROM_TABLES"
-    make test
-}
-
-component_test_aes_fewer_tables_and_rom_tables () {
-    msg "build: default config with AES_ROM_TABLES and AES_FEWER_TABLES enabled"
-    scripts/config.pl set MBEDTLS_AES_FEWER_TABLES
-    scripts/config.pl set MBEDTLS_AES_ROM_TABLES
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra'
-
-    msg "test: AES_FEWER_TABLES + AES_ROM_TABLES"
-    make test
-}
-
-component_test_make_shared () {
-    msg "build/test: make shared" # ~ 40s
-    make SHARED=1 all check
-}
-
-component_test_m32_o0 () {
-    # Build once with -O0, to compile out the i386 specific inline assembly
-    msg "build: i386, make, gcc -O0 (ASan build)" # ~ 30s
-    scripts/config.pl full
-    make CC=gcc CFLAGS='-O0 -Werror -Wall -Wextra -m32 -fsanitize=address'
-
-    msg "test: i386, make, gcc -O0 (ASan build)"
-    make test
-}
-support_test_m32_o0 () {
-    case $(uname -m) in
-        *64*) true;;
-        *) false;;
-    esac
-}
-
-component_test_m32_o1 () {
-    # Build again with -O1, to compile in the i386 specific inline assembly
-    msg "build: i386, make, gcc -O1 (ASan build)" # ~ 30s
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE
-    scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C
-    scripts/config.pl unset MBEDTLS_MEMORY_DEBUG
-    make CC=gcc CFLAGS='-O1 -Werror -Wall -Wextra -m32 -fsanitize=address'
-
-    msg "test: i386, make, gcc -O1 (ASan build)"
-    make test
-}
-support_test_m32_o1 () {
-    support_test_m32_o0 "$@"
-}
-
-component_test_mx32 () {
-    msg "build: 64-bit ILP32, make, gcc" # ~ 30s
-    scripts/config.pl full
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra -mx32'
-
-    msg "test: 64-bit ILP32, make, gcc"
-    make test
-}
-support_test_mx32 () {
-    case $(uname -m) in
-        amd64|x86_64) true;;
-        *) false;;
-    esac
-}
-
-component_test_min_mpi_window_size () {
-    msg "build: Default + MBEDTLS_MPI_WINDOW_SIZE=1 (ASan build)" # ~ 10s
-    scripts/config.pl set MBEDTLS_MPI_WINDOW_SIZE 1
-    CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
-    make
-
-    msg "test: MBEDTLS_MPI_WINDOW_SIZE=1 - main suites (inc. selftests) (ASan build)" # ~ 10s
-    make test
-}
-
-component_test_have_int32 () {
-    msg "build: gcc, force 32-bit bignum limbs"
-    scripts/config.pl unset MBEDTLS_HAVE_ASM
-    scripts/config.pl unset MBEDTLS_AESNI_C
-    scripts/config.pl unset MBEDTLS_PADLOCK_C
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra -DMBEDTLS_HAVE_INT32'
-
-    msg "test: gcc, force 32-bit bignum limbs"
-    make test
-}
-
-component_test_have_int64 () {
-    msg "build: gcc, force 64-bit bignum limbs"
-    scripts/config.pl unset MBEDTLS_HAVE_ASM
-    scripts/config.pl unset MBEDTLS_AESNI_C
-    scripts/config.pl unset MBEDTLS_PADLOCK_C
-    make CC=gcc CFLAGS='-Werror -Wall -Wextra -DMBEDTLS_HAVE_INT64'
-
-    msg "test: gcc, force 64-bit bignum limbs"
-    make test
-}
-
-component_test_no_udbl_division () {
-    msg "build: MBEDTLS_NO_UDBL_DIVISION native" # ~ 10s
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
-    scripts/config.pl set MBEDTLS_NO_UDBL_DIVISION
-    make CFLAGS='-Werror -O1'
-
-    msg "test: MBEDTLS_NO_UDBL_DIVISION native" # ~ 10s
-    make test
-}
-
-component_test_no_64bit_multiplication () {
-    msg "build: MBEDTLS_NO_64BIT_MULTIPLICATION native" # ~ 10s
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
-    scripts/config.pl set MBEDTLS_NO_64BIT_MULTIPLICATION
-    make CFLAGS='-Werror -O1'
-
-    msg "test: MBEDTLS_NO_64BIT_MULTIPLICATION native" # ~ 10s
-    make test
-}
-
-component_build_arm_none_eabi_gcc () {
-    msg "build: arm-none-eabi-gcc, make" # ~ 10s
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_TIMING_C
-    scripts/config.pl unset MBEDTLS_FS_IO
-    scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C
-    scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED
-    scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY
-    # following things are not in the default config
-    scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c
-    scripts/config.pl unset MBEDTLS_THREADING_PTHREAD
-    scripts/config.pl unset MBEDTLS_THREADING_C
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # execinfo.h
-    scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # calls exit
-    make CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld CFLAGS='-Werror -Wall -Wextra' lib
-}
-
-component_build_arm_none_eabi_gcc_no_udbl_division () {
-    msg "build: arm-none-eabi-gcc -DMBEDTLS_NO_UDBL_DIVISION, make" # ~ 10s
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_TIMING_C
-    scripts/config.pl unset MBEDTLS_FS_IO
-    scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C
-    scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED
-    scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY
-    # following things are not in the default config
-    scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c
-    scripts/config.pl unset MBEDTLS_THREADING_PTHREAD
-    scripts/config.pl unset MBEDTLS_THREADING_C
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # execinfo.h
-    scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # calls exit
-    scripts/config.pl set MBEDTLS_NO_UDBL_DIVISION
-    make CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld CFLAGS='-Werror -Wall -Wextra' lib
-    echo "Checking that software 64-bit division is not required"
-    if_build_succeeded not grep __aeabi_uldiv library/*.o
-}
-
-component_build_arm_none_eabi_gcc_no_64bit_multiplication () {
-    msg "build: arm-none-eabi-gcc MBEDTLS_NO_64BIT_MULTIPLICATION, make" # ~ 10s
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_TIMING_C
-    scripts/config.pl unset MBEDTLS_FS_IO
-    scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C
-    scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED
-    scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY
-    # following things are not in the default config
-    scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c
-    scripts/config.pl unset MBEDTLS_THREADING_PTHREAD
-    scripts/config.pl unset MBEDTLS_THREADING_C
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # execinfo.h
-    scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # calls exit
-    scripts/config.pl set MBEDTLS_NO_64BIT_MULTIPLICATION
-    make CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld CFLAGS='-Werror -O1 -march=armv6-m -mthumb' lib
-    echo "Checking that software 64-bit multiplication is not required"
-    if_build_succeeded not grep __aeabi_lmul library/*.o
-}
-
-component_build_armcc () {
-    msg "build: ARM Compiler 5, make"
-    scripts/config.pl full
-    scripts/config.pl unset MBEDTLS_TIMING_C
-    scripts/config.pl unset MBEDTLS_FS_IO
-    scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C
-    scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C
-    scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED
-    scripts/config.pl unset MBEDTLS_HAVE_TIME
-    scripts/config.pl unset MBEDTLS_HAVE_TIME_DATE
-    scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY
-    # following things are not in the default config
-    scripts/config.pl unset MBEDTLS_DEPRECATED_WARNING
-    scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c
-    scripts/config.pl unset MBEDTLS_THREADING_PTHREAD
-    scripts/config.pl unset MBEDTLS_THREADING_C
-    scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # execinfo.h
-    scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # calls exit
-    scripts/config.pl unset MBEDTLS_PLATFORM_TIME_ALT # depends on MBEDTLS_HAVE_TIME
-
-    make CC="$ARMC5_CC" AR="$ARMC5_AR" WARNING_CFLAGS='--strict --c99' lib
-    make clean
-
-    # ARM Compiler 6 - Target ARMv7-A
-    armc6_build_test "--target=arm-arm-none-eabi -march=armv7-a"
-
-    # ARM Compiler 6 - Target ARMv7-M
-    armc6_build_test "--target=arm-arm-none-eabi -march=armv7-m"
-
-    # ARM Compiler 6 - Target ARMv8-A - AArch32
-    armc6_build_test "--target=arm-arm-none-eabi -march=armv8.2-a"
-
-    # ARM Compiler 6 - Target ARMv8-M
-    armc6_build_test "--target=arm-arm-none-eabi -march=armv8-m.main"
-
-    # ARM Compiler 6 - Target ARMv8-A - AArch64
-    armc6_build_test "--target=aarch64-arm-none-eabi -march=armv8.2-a"
-}
-
-component_build_mingw () {
-    msg "build: Windows cross build - mingw64, make (Link Library)" # ~ 30s
-    make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 lib programs
-
-    # note Make tests only builds the tests, but doesn't run them
-    make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror' WINDOWS_BUILD=1 tests
-    make WINDOWS_BUILD=1 clean
-
-    msg "build: Windows cross build - mingw64, make (DLL)" # ~ 30s
-    make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 SHARED=1 lib programs
-    make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 SHARED=1 tests
-    make WINDOWS_BUILD=1 clean
-}
-support_build_mingw() {
-    case $(i686-w64-mingw32-gcc -dumpversion) in
-        [0-5]*) false;;
-        *) true;;
-    esac
-}
-
-component_test_memsan () {
-    msg "build: MSan (clang)" # ~ 1 min 20s
-    scripts/config.pl unset MBEDTLS_AESNI_C # memsan doesn't grok asm
-    CC=clang cmake -D CMAKE_BUILD_TYPE:String=MemSan .
-    make
-
-    msg "test: main suites (MSan)" # ~ 10s
-    make test
-}
-
-component_test_valgrind () {
-    msg "build: Release (clang)"
-    CC=clang cmake -D CMAKE_BUILD_TYPE:String=Release .
-    make
-
-    msg "test: main suites valgrind (Release)"
-    make memcheck
-}
-
-component_test_cmake_out_of_source () {
-    msg "build: cmake 'out-of-source' build"
-    MBEDTLS_ROOT_DIR="$PWD"
-    mkdir "$OUT_OF_SOURCE_DIR"
-    cd "$OUT_OF_SOURCE_DIR"
-    cmake "$MBEDTLS_ROOT_DIR"
-    make
-
-    msg "test: cmake 'out-of-source' build"
-    make test
-
-    cd "$MBEDTLS_ROOT_DIR"
-    rm -rf "$OUT_OF_SOURCE_DIR"
-    unset MBEDTLS_ROOT_DIR
-}
-
-component_test_zeroize () {
-    # Test that the function mbedtls_platform_zeroize() is not optimized away by
-    # different combinations of compilers and optimization flags by using an
-    # auxiliary GDB script. Unfortunately, GDB does not return error values to the
-    # system in all cases that the script fails, so we must manually search the
-    # output to check whether the pass string is present and no failure strings
-    # were printed.
-
-    # Don't try to disable ASLR. We don't care about ASLR here. We do care
-    # about a spurious message if Gdb tries and fails, so suppress that.
-    gdb_disable_aslr=
-    if [ -z "$(gdb -batch -nw -ex 'set disable-randomization off' 2>&1)" ]; then
-        gdb_disable_aslr='set disable-randomization off'
-    fi
-
-    for optimization_flag in -O2 -O3 -Ofast -Os; do
-        for compiler in clang gcc; do
-            msg "test: $compiler $optimization_flag, mbedtls_platform_zeroize()"
-            make programs CC="$compiler" DEBUG=1 CFLAGS="$optimization_flag"
-            if_build_succeeded gdb -ex "$gdb_disable_aslr" -x tests/scripts/test_zeroize.gdb -nw -batch -nx 2>&1 | tee test_zeroize.log
-            if_build_succeeded grep "The buffer was correctly zeroized" test_zeroize.log
-            if_build_succeeded not grep -i "error" test_zeroize.log
-            rm -f test_zeroize.log
-            make clean
-        done
-    done
-
-    unset gdb_disable_aslr
-}
-
-support_check_python_files () {
-    type pylint3 >/dev/null 2>/dev/null
-}
-component_check_python_files () {
-    msg "Lint: Python scripts"
-    record_status tests/scripts/check-python-files.sh
-}
-
-component_check_generate_test_code () {
-    msg "uint test: generate_test_code.py"
-    record_status ./tests/scripts/test_generate_test_code.py
-}
-
-################################################################
-#### Termination
-################################################################
-
-post_report () {
-    msg "Done, cleaning up"
-    cleanup
-
-    final_report
-}
-
-
-
-################################################################
-#### Run all the things
-################################################################
-
-# Run one component and clean up afterwards.
-run_component () {
-    # Back up the configuration in case the component modifies it.
-    # The cleanup function will restore it.
-    cp -p "$CONFIG_H" "$CONFIG_BAK"
-    current_component="$1"
-    "$@"
-    cleanup
-}
-
-# Preliminary setup
-pre_check_environment
-pre_initialize_variables
-pre_parse_command_line "$@"
-
-pre_check_git
-pre_check_seedfile
-
-build_status=0
-if [ $KEEP_GOING -eq 1 ]; then
-    pre_setup_keep_going
-else
-    record_status () {
-        "$@"
-    }
-fi
-pre_print_configuration
-pre_check_tools
-cleanup
-
-# Run the requested tests.
-for component in $RUN_COMPONENTS; do
-    run_component "component_$component"
-done
-
-# We're done.
-post_report
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/basic-build-test.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/basic-build-test.sh
deleted file mode 100644
index a653001e..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/basic-build-test.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/sh
-
-# basic-build-tests.sh
-#
-# This file is part of mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2016, ARM Limited, All Rights Reserved
-#
-# Purpose
-#
-# Executes the basic test suites, captures the results, and generates a simple
-# test report and code coverage report.
-#
-# The tests include:
-#   * Unit tests                - executed using tests/scripts/run-test-suite.pl
-#   * Self-tests                - executed using the test suites above
-#
-# The tests focus on functionality and do not consider performance.
-#
-# Note the tests self-adapt due to configurations in include/mbedtls/config.h
-# which can lead to some tests being skipped, and can cause the number of
-# available tests to fluctuate.
-#
-# This script has been written to be generic and should work on any shell.
-#
-# Usage: basic-build-tests.sh
-#
-
-# Abort on errors (and uninitiliased variables)
-set -eu
-
-if [ -d library -a -d include -a -d tests ]; then :; else
-    echo "Must be run from mbed TLS root" >&2
-    exit 1
-fi
-
-CONFIG_H='include/mbedtls/config.h'
-CONFIG_BAK="$CONFIG_H.bak"
-
-# Step 0 - print build environment info
-scripts/output_env.sh
-echo
-
-# Step 1 - Make and instrumented build for code coverage
-export CFLAGS=' --coverage -g3 -O0 '
-make clean
-cp "$CONFIG_H" "$CONFIG_BAK"
-scripts/config.pl full
-scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE
-make -j
-
-
-# Step 2 - Execute the tests
-TEST_OUTPUT=out_${PPID}
-cd tests
-
-# Step 2a - Unit Tests
-perl scripts/run-test-suites.pl -v 2 |tee unit-test-$TEST_OUTPUT
-echo
-
-# Step 3 - Process the coverage report
-cd ..
-make lcov |tee tests/cov-$TEST_OUTPUT
-
-
-# Step 4 - Summarise the test report
-echo
-echo "========================================================================="
-echo "Test Report Summary"
-echo
-
-cd tests
-
-# Step 4a - Unit tests
-echo "Unit tests - tests/scripts/run-test-suites.pl"
-
-PASSED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/test cases passed :[\t]*\([0-9]*\)/\1/p'| tr -d ' ')
-SKIPPED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/skipped :[ \t]*\([0-9]*\)/\1/p'| tr -d ' ')
-TOTAL_SUITES=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/.* (\([0-9]*\) .*, [0-9]* tests run)/\1/p'| tr -d ' ')
-FAILED_TESTS=$(tail -n6 unit-test-$TEST_OUTPUT|sed -n -e 's/failed :[\t]*\([0-9]*\)/\1/p' |tr -d ' ')
-
-echo "No test suites     : $TOTAL_SUITES"
-echo "Passed             : $PASSED_TESTS"
-echo "Failed             : $FAILED_TESTS"
-echo "Skipped            : $SKIPPED_TESTS"
-echo "Total exec'd tests : $(($PASSED_TESTS + $FAILED_TESTS))"
-echo "Total avail tests  : $(($PASSED_TESTS + $FAILED_TESTS + $SKIPPED_TESTS))"
-echo
-
-TOTAL_PASS=$PASSED_TESTS
-TOTAL_FAIL=$FAILED_TESTS
-TOTAL_SKIP=$SKIPPED_TESTS
-TOTAL_AVAIL=$(($PASSED_TESTS + $FAILED_TESTS + $SKIPPED_TESTS))
-TOTAL_EXED=$(($PASSED_TESTS + $FAILED_TESTS))
-
-
-# Step 4d - Grand totals
-echo "-------------------------------------------------------------------------"
-echo "Total tests"
-
-echo "Total Passed       : $TOTAL_PASS"
-echo "Total Failed       : $TOTAL_FAIL"
-echo "Total Skipped      : $TOTAL_SKIP"
-echo "Total exec'd tests : $TOTAL_EXED"
-echo "Total avail tests  : $TOTAL_AVAIL"
-echo
-
-
-# Step 4e - Coverage
-echo "Coverage"
-
-LINES_TESTED=$(tail -n3 cov-$TEST_OUTPUT|sed -n -e 's/  lines......: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* lines)/\1/p')
-LINES_TOTAL=$(tail -n3 cov-$TEST_OUTPUT|sed -n -e 's/  lines......: [0-9]*.[0-9]% ([0-9]* of \([0-9]*\) lines)/\1/p')
-FUNCS_TESTED=$(tail -n3 cov-$TEST_OUTPUT|sed -n -e 's/  functions..: [0-9]*.[0-9]% (\([0-9]*\) of [0-9]* functions)$/\1/p')
-FUNCS_TOTAL=$(tail -n3 cov-$TEST_OUTPUT|sed -n -e 's/  functions..: [0-9]*.[0-9]% ([0-9]* of \([0-9]*\) functions)$/\1/p')
-
-LINES_PERCENT=$((1000*$LINES_TESTED/$LINES_TOTAL))
-LINES_PERCENT="$(($LINES_PERCENT/10)).$(($LINES_PERCENT-($LINES_PERCENT/10)*10))"
-
-FUNCS_PERCENT=$((1000*$FUNCS_TESTED/$FUNCS_TOTAL))
-FUNCS_PERCENT="$(($FUNCS_PERCENT/10)).$(($FUNCS_PERCENT-($FUNCS_PERCENT/10)*10))"
-
-echo "Lines Tested       : $LINES_TESTED of $LINES_TOTAL $LINES_PERCENT%"
-echo "Functions Tested   : $FUNCS_TESTED of $FUNCS_TOTAL $FUNCS_PERCENT%"
-echo
-
-
-rm unit-test-$TEST_OUTPUT
-rm cov-$TEST_OUTPUT
-
-cd ..
-
-make clean
-
-if [ -f "$CONFIG_BAK" ]; then
-    mv "$CONFIG_BAK" "$CONFIG_H"
-fi
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-generated-files.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-generated-files.sh
deleted file mode 100644
index f41e465c..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-generated-files.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /usr/bin/env sh
-
-# This file is part of mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2018, ARM Limited, All Rights Reserved
-#
-# Purpose
-#
-# Check if generated files are up-to-date.
-
-set -eu
-
-if [ -d library -a -d include -a -d tests ]; then :; else
-    echo "Must be run from mbed TLS root" >&2
-    exit 1
-fi
-
-check()
-{
-    SCRIPT=$1
-    TO_CHECK=$2
-    PATTERN=""
-    FILES=""
-
-    if [ -d $TO_CHECK ]; then
-        for FILE in $TO_CHECK/*; do
-            FILES="$FILE $FILES"
-        done
-    else
-        FILES=$TO_CHECK
-    fi
-
-    for FILE in $FILES; do
-        cp $FILE $FILE.bak
-    done
-
-    $SCRIPT
-
-    # Compare the script output to the old files and remove backups
-    for FILE in $FILES; do
-        if ! diff $FILE $FILE.bak >/dev/null 2>&1; then
-            echo "'$FILE' was either modified or deleted by '$SCRIPT'"
-            exit 1
-        fi
-        mv $FILE.bak $FILE
-
-        if [ -d $TO_CHECK ]; then
-            # Create a grep regular expression that we can check against the
-            # directory contents to test whether new files have been created
-            if [ -z $PATTERN ]; then
-                PATTERN="$(basename $FILE)"
-            else
-                PATTERN="$PATTERN\|$(basename $FILE)"
-            fi
-        fi
-    done
-
-    if [ -d $TO_CHECK ]; then
-        # Check if there are any new files
-        if ls -1 $TO_CHECK | grep -v "$PATTERN" >/dev/null 2>&1; then
-            echo "Files were created by '$SCRIPT'"
-            exit 1
-        fi
-    fi
-}
-
-check scripts/generate_errors.pl library/error.c
-check scripts/generate_query_config.pl programs/test/query_config.c
-check scripts/generate_features.pl library/version_features.c
-check scripts/generate_visualc_files.pl visualc/VS2010
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-names.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-names.sh
deleted file mode 100644
index 925037c3..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-names.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# This file is part of mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2015-2016, ARM Limited, All Rights Reserved
-#
-# Purpose
-#
-# This script confirms that the naming of all symbols and identifiers in mbed
-# TLS are consistent with the house style and are also self-consistent.
-#
-set -eu
-
-if grep --version|head -n1|grep GNU >/dev/null; then :; else
-    echo "This script requires GNU grep.">&2
-    exit 1
-fi
-
-printf "Analysing source code...\n"
-
-tests/scripts/list-macros.sh
-tests/scripts/list-enum-consts.pl
-tests/scripts/list-identifiers.sh
-tests/scripts/list-symbols.sh
-
-FAIL=0
-
-printf "\nExported symbols declared in header: "
-UNDECLARED=$( diff exported-symbols identifiers | sed -n -e 's/^< //p' )
-if [ "x$UNDECLARED" = "x" ]; then
-    echo "PASS"
-else
-    echo "FAIL"
-    echo "$UNDECLARED"
-    FAIL=1
-fi
-
-diff macros identifiers | sed -n -e 's/< //p' > actual-macros
-
-for THING in actual-macros enum-consts; do
-    printf "Names of $THING: "
-    test -r $THING
-    BAD=$( grep -E -v '^(MBEDTLS|PSA)_[0-9A-Z_]*[0-9A-Z]$' $THING || true )
-    if [ "x$BAD" = "x" ]; then
-        echo "PASS"
-    else
-        echo "FAIL"
-        echo "$BAD"
-        FAIL=1
-    fi
-done
-
-for THING in identifiers; do
-    printf "Names of $THING: "
-    test -r $THING
-    BAD=$( grep -E -v '^(mbedtls|psa)_[0-9a-z_]*[0-9a-z]$' $THING || true )
-    if [ "x$BAD" = "x" ]; then
-        echo "PASS"
-    else
-        echo "FAIL"
-        echo "$BAD"
-        FAIL=1
-    fi
-done
-
-printf "Likely typos: "
-sort -u actual-macros enum-consts > _caps
-HEADERS=$( ls include/mbedtls/*.h include/psa/*.h | egrep -v 'compat-1\.3\.h' )
-NL='
-'
-sed -n 's/MBED..._[A-Z0-9_]*/\'"$NL"'&\'"$NL"/gp \
-    $HEADERS library/*.c \
-    | grep MBEDTLS | sort -u > _MBEDTLS_XXX
-TYPOS=$( diff _caps _MBEDTLS_XXX | sed -n 's/^> //p' \
-            | egrep -v 'XXX|__|_$|^MBEDTLS_.*CONFIG_FILE$' || true )
-rm _MBEDTLS_XXX _caps
-if [ "x$TYPOS" = "x" ]; then
-    echo "PASS"
-else
-    echo "FAIL"
-    echo "$TYPOS"
-    FAIL=1
-fi
-
-printf "\nOverall: "
-if [ "$FAIL" -eq 0 ]; then
-    rm macros actual-macros enum-consts identifiers exported-symbols
-    echo "PASSED"
-    exit 0
-else
-    echo "FAILED"
-    exit 1
-fi
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-python-files.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-python-files.sh
deleted file mode 100644
index 92904182..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/check-python-files.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /usr/bin/env sh
-
-# This file is part of Mbed TLS (https://tls.mbed.org)
-#
-# Copyright (c) 2018, Arm Limited, All Rights Reserved
-#
-# Purpose:
-#
-# Run 'pylint' on Python files for programming errors and helps enforcing
-# PEP8 coding standards.
-
-pylint3 -j 2 scripts/*.py tests/scripts/*.py
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/doxygen.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/doxygen.sh
deleted file mode 100644
index e7758c9e..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/doxygen.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Make sure the doxygen documentation builds without warnings
-
-# Abort on errors (and uninitiliased variables)
-set -eu
-
-if [ -d library -a -d include -a -d tests ]; then :; else
-    echo "Must be run from mbed TLS root" >&2
-    exit 1
-fi
-
-if scripts/apidoc_full.sh > doc.out 2>doc.err; then :; else
-    cat doc.err
-    echo "FAIL" >&2
-    exit 1;
-fi
-
-cat doc.out doc.err | \
-    grep -v "warning: ignoring unsupported tag" \
-    > doc.filtered
-
-if egrep "(warning|error):" doc.filtered; then
-    echo "FAIL" >&2
-    exit 1;
-fi
-
-make apidoc_clean
-rm -f doc.out doc.err doc.filtered
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/generate-afl-tests.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/generate-afl-tests.sh
deleted file mode 100644
index cbc2f590..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/generate-afl-tests.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# This script splits the data test files containing the test cases into
-# individual files (one test case per file) suitable for use with afl
-# (American Fuzzy Lop). http://lcamtuf.coredump.cx/afl/
-#
-# Usage: generate-afl-tests.sh <test data file path>
-#  <test data file path> - should be the path to one of the test suite files
-#                          such as 'test_suite_mpi.data'
-
-# Abort on errors
-set -e
-
-if [ -z $1 ]
-then
-    echo " [!] No test file specified" >&2
-    echo "Usage: $0 <test data file>" >&2
-    exit 1
-fi
-
-SRC_FILEPATH=$(dirname $1)/$(basename $1)
-TESTSUITE=$(basename $1 .data)
-
-THIS_DIR=$(basename $PWD)
-
-if [ -d ../library -a -d ../include -a -d ../tests -a $THIS_DIR == "tests" ];
-then :;
-else
-    echo " [!] Must be run from mbed TLS tests directory" >&2
-    exit 1
-fi
-
-DEST_TESTCASE_DIR=$TESTSUITE-afl-tests
-DEST_OUTPUT_DIR=$TESTSUITE-afl-out
-
-echo " [+] Creating output directories" >&2
-
-if [ -e $DEST_OUTPUT_DIR/* ];
-then :
-    echo " [!] Test output files already exist." >&2
-    exit 1
-else
-    mkdir -p $DEST_OUTPUT_DIR
-fi
-
-if [ -e $DEST_TESTCASE_DIR/* ];
-then :
-    echo " [!] Test output files already exist." >&2
-else
-    mkdir -p $DEST_TESTCASE_DIR
-fi
-
-echo " [+] Creating test cases" >&2
-cd $DEST_TESTCASE_DIR
-
-split -p '^\s*$' ../$SRC_FILEPATH
-
-for f in *;
-do
-    # Strip out any blank lines (no trim on OS X)
-    sed '/^\s*$/d' $f >testcase_$f
-    rm $f
-done
-
-cd ..
-
-echo " [+] Test cases in $DEST_TESTCASE_DIR" >&2
-
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-identifiers.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-identifiers.sh
deleted file mode 100644
index eaf270c7..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-identifiers.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-#
-# Create a file named identifiers containing identifiers from internal header
-# files or all header files, based on --internal flag.
-# Outputs the line count of the file to stdout.
-#
-# Usage: list-identifiers.sh [ -i | --internal ]
-
-set -eu
-
-if [ -d include/mbedtls ]; then :; else
-    echo "$0: must be run from root" >&2
-    exit 1
-fi
-
-INTERNAL=""
-
-until [ -z "${1-}" ]
-do
-  case "$1" in
-    -i|--internal)
-      INTERNAL="1"
-      ;;
-    *)
-      # print error
-      echo "Unknown argument: '$1'"
-      exit 1
-      ;;
-  esac
-  shift
-done
-
-if [ $INTERNAL ]
-then
-    HEADERS=$( ls include/mbedtls/*_internal.h library/*.h | egrep -v 'compat-1\.3\.h|bn_mul' )
-else
-    HEADERS=$( ls include/mbedtls/*.h include/psa/*.h library/*.h | egrep -v 'compat-1\.3\.h|bn_mul' )
-fi
-
-rm -f identifiers
-
-grep '^[^ /#{]' $HEADERS | \
-    sed -e 's/^[^:]*://' | \
-    egrep -v '^(extern "C"|(typedef )?(struct|enum)( {)?$|};?$)' \
-    > _decls
-
-if true; then
-sed -n -e 's/.* \**\([a-zA-Z_][a-zA-Z0-9_]*\)(.*/\1/p' \
-       -e 's/.*(\*\(.*\))(.*/\1/p' _decls
-grep -v '(' _decls | sed -e 's/\([a-zA-Z0-9_]*\)[;[].*/\1/' -e 's/.* \**//'
-fi > _identifiers
-
-if [ $( wc -l < _identifiers ) -eq $( wc -l < _decls ) ]; then
-    rm _decls
-    egrep -v '^(u?int(16|32|64)_t)$' _identifiers | sort > identifiers
-    rm _identifiers
-else
-    echo "$0: oops, lost some identifiers" 2>&1
-    exit 1
-fi
-
-wc -l identifiers
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-macros.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-macros.sh
deleted file mode 100644
index 3fa66f19..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-macros.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-if [ -d include/mbedtls ]; then :; else
-    echo "$0: must be run from root" >&2
-    exit 1
-fi
-
-HEADERS=$( ls include/mbedtls/*.h include/psa/*.h | egrep -v 'compat-1\.3\.h' )
-
-# White-list macros we want to be able to refer to that don't exist in the
-# crypto library, useful when referring to macros in Mbed TLS from comments.
-WHITELIST='MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS'
-
-# Generate a list of macros and combine it with the white-listed macros in
-# sorted order.
-{ sed -n -e 's/.*#define \([a-zA-Z0-9_]*\).*/\1/p' $HEADERS |
-  egrep -v '^(asm|inline|EMIT|_CRT_SECURE_NO_DEPRECATE)$|^MULADDC_';
-  printf '%s\n' $WHITELIST;
-} | sort -u > macros
-
-wc -l macros
diff --git a/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-symbols.sh b/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-symbols.sh
deleted file mode 100644
index c2587194..00000000
--- a/Middlewares/Third_Party/mbed-crypto/tests/scripts/list-symbols.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-if [ -d include/mbedtls ]; then :; else
-    echo "$0: must be run from root" >&2
-    exit 1
-fi
-
-if grep -i cmake Makefile >/dev/null; then
-    echo "$0: not compatible with cmake" >&2
-    exit 1
-fi
-
-cp include/mbedtls/config.h include/mbedtls/config.h.bak
-scripts/config.pl full
-CFLAGS=-fno-asynchronous-unwind-tables make clean lib >/dev/null 2>&1
-mv include/mbedtls/config.h.bak include/mbedtls/config.h
-if uname | grep -F Darwin >/dev/null; then
-    nm -gUj library/libmbed*.a 2>/dev/null | sed -n -e 's/^_//p'
-elif uname | grep -F Linux >/dev/null; then
-    nm -og library/libmbed*.a | grep -v '^[^ ]*: *U \|^$\|^[^ ]*:$' | sed 's/^[^ ]* . //'
-fi | sort > exported-symbols
-make clean
-
-wc -l exported-symbols
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/app_sfu.h
deleted file mode 100644
index 079ddb03..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/app_sfu.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_sfu.h
-  * @author  MCD Application Team
-  * @brief   This file contains the configuration of SBSFU application.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef APP_SFU_H
-#define APP_SFU_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_crypto_config.h"
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * Use this define to choose the type of Firmware Image Programming you want to use.
-  * This version supports only 2 modes:
-  *
-  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
-  *       The image is received in encrypted format.
-  *       The image must be decrypted to be installed:
-  *         this is done according to the selected crypto scheme,
-  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
-  *
-  * SFU_CLEAR_IMAGE: Clear Firmware Image
-  *       The image is received in clear format.
-  *       No decrypt operation is needed before installing the image:
-  *         the selected crypto scheme must be compatible with this choice,
-  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
-  *
-  *
-  */
-#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
-#else
-#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
-#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
-
-/*#define SFU_DEBUG_MODE */              /*!< Comment this define to optimize memory footprint (debug mode removed)
-                                          No more print on terminal during SBSFU execution */
-
-/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
-                                          this switch activates more debug prints in the console (FSM state info...) */
-
-
-/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
-                                                          When this switch is activated, the FWIMG part of SB_SFU will
-                                                          block when an abnormal error is encountered */
-
-#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
-#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
-#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
-
-#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
-#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
-#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
-
-/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
-                                           Automatically executed @startup */
-#if defined(SFU_TEST_PROTECTION)
-#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
-#endif /* SFU_TEST_PROTECTION */
-
-/**
-  * SB_SFU status LED.
-  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
-  * This is useful when no log is enabled.
-  *
-  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
-  * \li For the other situations, please check the other defines below.
-  */
-#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
-#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
-                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
-#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
-
-
-/**
-  * Optional Features Software Configuration
-  */
-#if !defined(SFU_TEST_PROTECTION)
-#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
-#else
-#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
-#endif /* SFU_TEST_PROTECTION */
-
-#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
-#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
-#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
-
-/* Uncomment the define below if you want to use minicom with Linux */
-/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
-
-#if defined(MINICOM_YMODEM)
-/* Minicom does not accept the debug prints during the YMODEM session */
-#undef SFU_VERBOSE_DEBUG_MODE
-#endif /* MINICOM_YMODEM */
-
-
-/* Multi-images configuration :
-   - Max : 3 Active images and 3 Download area
-   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
-   - Active slot identified with SFU magic (1,2,3) information from header
-   - Do not forget to add keys for each image in SE_Corebin/Binary folder
-   - Master slot : image started in priority if valid
-   - FW image valide all feature authorized from master slot
-*/
-#define SFU_NB_MAX_ACTIVE_IMAGE 1U                        /*!< 1 active image managed */
-#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 dwl area managed */
-#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
-
-/* The define below allows disabling all security IPs at once.
- *
- * Enabled: all security IPs (WRP, watchdog...) are disabled.
- * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
- *
- */
-
-#define SECBOOT_DISABLE_SECURITY_IPS  /*!< Disable all security IPs at once when activated */
-
-
-#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
-
-/* Uncomment the following defines when in Release mode.
-   In debug mode it can be better to disable some of the following protection
-   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
-
-#define SFU_WRP_PROTECT_ENABLE
-#define SFU_RDP_PROTECT_ENABLE
-/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
-                                             neither connected to GND nor to 5V (floating level), there are too many
-                                             spurious tamper event detected */
-#define SFU_DAP_PROTECT_ENABLE     /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
-                                        It might be difficult to reconnect the Debugger.*/
-#define SFU_DMA_PROTECT_ENABLE
-#define SFU_IWDG_PROTECT_ENABLE    /*!< WARNING:
-                                        1. Be Careful if enabling this protection. IWDG will be active also after
-                                           switching to UserApp: a refresh is needed.
-                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
-                                           platform (flash size...)*/
-#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
-                                        Enables/Disables the MPU protection.
-                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
-                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
-                                        addition to the overall MPU protection. */
-#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
-                                        executable area */
-
-
-/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
-                                                 steps.
-                                                 When enabling this lock, Static protections cannot be modified any more
-                                                 and Debug is finally disabled. */
-
-#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
-#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
-                                                      completely disabled, OB update no more possible  */
-
-
-#else
-#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
-                                                      field should set it as Level2 */
-#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
-
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-
-/**
-  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
-  * This define is taken into account only if RDP level 2 is not set.
-  * If RDP level 2 is set no modification can be done anyway.
-  *
-  * Enabled: Option Bytes Development Mode enabled.
-  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
-  *          If an OB is not set though it should be then this setting is automatically corrected.
-  *          This applies only as long as RDP level 2 is not set.
-  *
-  * Disabled: Option Bytes Development Mode disabled.
-  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
-              the first time.
-  *           SB_SFU checks the Option Bytes configuration but does not correct it.
-  *           If a problem is detected an error message is reported and the execution stops.
-  */
-#define SECBOOT_OB_DEV_MODE
-
-
-#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
-                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
-
-
-/** 
-  * Application Configuration
-  *
-  */
-#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
-                                              You can also define an upper bound here if you plan to use it */
-
-#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
-                                              no FW installed or due to an attack attempt). Could be different from
-                                              SFU_FW_VERSION_START_NUM */
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APP_SFU_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_boot.c
deleted file mode 100644
index 7c0f1caa..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_boot.c
+++ /dev/null
@@ -1,1761 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_boot.c
-  * @author  MCD Application Team
-  * @brief   SFU BOOT module
-  *          This file provides firmware functions to manage the following
-  *          functionalities of the Secure Boot:
-  *           + Initialization and de-initialization functions
-  *           + Secure Boot Control functions
-  *           + Secure Boot State functions
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_BOOT_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "string.h"
-#include "sfu_boot.h"
-#include "sfu_loader.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level.h"
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
-
-/*
- * The sfu_com init is provided by the sfu_com_trace module by default.
- * If not, then it is taken from the sfu_com_loader module.
- */
-#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-#include "sfu_trace.h"
-#else
-#include "sfu_trace.h"      /* needed anyhow even if the defines will be empty */
-#include "sfu_com_loader.h" /* needed only for the COM init/de-init */
-#endif /* SFU_DEBUG_MODE  || SFU_TEST_PROTECTION */
-#include "se_def.h"
-#include "se_bootinfo.h"
-#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
-#include "sfu_new_image.h"            /* the local loader is a kind of "application" running in SB_SFU so it needs the
-                                         services to install a FW image */
-#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
-#include "sfu_test.h"                 /* auto tests */
-#include "sfu_fwimg_internal.h"
-
-#ifdef KMS_ENABLED
-#include "tkms.h"
-#include "sfu_kms.h"
-#endif /* KMS_ENABLED */
-
-/* Private typedef -----------------------------------------------------------*/
-typedef struct
-{
-  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
-  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
-} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
-                                                     information using during the SM evolution. */
-
-/* Private defines -----------------------------------------------------------*/
-#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
-#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
-#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
-                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
-
-#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
-                                    maintained for future customization/expansion of the field itself */
-
-#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
-
-/* Private macros ------------------------------------------------------------*/
-#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
-  do{                                                                   \
-    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
-    if (Status == SFU_SUCCESS){                                         \
-      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
-    }                                                                   \
-    else {                                                              \
-      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
-    }                                                                   \
-  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
-
-
-#define SFU_SET_SM_CURR_STATE(NewState)                                 \
-  do{                                                                   \
-    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
-    m_StateMachineContext.CurrState = NewState;                         \
-  }while(0) /*!< Set a State Machine state*/
-
-
-#define SFU_GET_LAST_EXEC_STATE(STATUS)         (((STATUS)>>8U) & 0xFFU)          /*!< Get last State Machine state*/
-#define SFU_GET_LAST_EXEC_IMAGE_ID(STATUS)      (((STATUS)>>16U) & 0xFFU)         /*!< Get image ID*/
-#define SFU_GET_LAST_EXEC_ID(STATUS)            (((STATUS)>>24U) & 0xFFU)         /*!< Get Execution ID*/
-
-/* Private variables ---------------------------------------------------------*/
-/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
-static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
-                                                                         SFU_STATE_INITIAL
-                                                                        };
-
-/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
-#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
-#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
-static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
-
-/* Global variables ----------------------------------------------------------*/
-/**
-  * This variable indicates if at boot-up the FW presence check has already been performed or not:
-  * \li It is reset when the FW status has already been checked once and no FW is present
-  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
-  * \li It is used to display some messages only once in the teraterm console
-  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
-  * \li This is used at LocalDownload and CheckUserFwStatus stages.
-  */
-uint8_t initialDeviceStatusCheck;
-
-/**
-  *  Flow control initial values.
-  *   - Security protections flow (static + dynamic)
-  *   - Crypto operations flow (authentication, integrity)
-  */
-uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
-uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_BOOT_Init(void);
-static SFU_ErrorStatus SFU_BOOT_DeInit(void);
-static void SFU_BOOT_BspConfiguration(void);
-static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
-static void SFU_BOOT_SM_CheckStatusOnReset(void);
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-static void SFU_BOOT_SM_CheckNewFwToDownload(void);
-static void SFU_BOOT_SM_DownloadNewUserFw(void);
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-#ifdef KMS_ENABLED
-static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
-static void SFU_BOOT_SM_InstallKMSBlob(void);
-#endif /* KMS_ENABLED */
-static void SFU_BOOT_SM_CheckUserFwStatus(void);
-static void SFU_BOOT_SM_VerifyUserFwSignature(void);
-static void SFU_BOOT_SM_ExecuteUserFw(void);
-static void SFU_BOOT_SM_HandleCriticalFailure(void);
-static void SFU_BOOT_SM_RebootStateMachine(void);
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
-static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
-static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
-static SFU_ErrorStatus SFU_BOOT_SetLastExecStatus(uint8_t uExecID, uint8_t uLastExecState);
-static SFU_ErrorStatus SFU_BOOT_ManageLastExecStatus(uint32_t uLastExecStatus);
-static SFU_ErrorStatus SFU_BOOT_ManageResetSources(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
-  *        In the nominal case, the bootloader service runs until the user application is launched.
-  *        When no valid user application can be run (after installing a new image or not),
-  *        if the local loader feature is not enabled then the execution stops,
-  *        otherwise a local download will be awaited.
-  *        If the state machine encounters a major issue then a reboot is triggered.
-  * @param None.
-  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
-  * @note Constraints
-  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
-  *       2. This function also takes care of BSP initialization after enabling the secure mode.
-  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
-  *       3. No other entity should handle the initialization of the Secure Engine.
-  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
-  *          configurations will be overwritten).
-  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
-  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
-  *          error cause.
-  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
-  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
-  *          new image).
-  * @note Settings are handled at compilation time:
-  *       1. See compiler switches in main.h for secure IPs settings
-  *       2. The trace system is configured in the sfu_trace.h file
-  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
-  *          stage.
-  */
-SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
-{
-  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
-
-  /*
-   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
-   * "automatically" managed by SBSFU compiler command
-   */
-  if (SE_Startup() == SE_SUCCESS)
-  {
-    /* Security Configuration */
-    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
-    {
-      /* Board BSP  Configuration */
-      SFU_BOOT_BspConfiguration();
-
-      /* Configure the Secure Boot and start the State machine */
-      if (SFU_BOOT_Init() == SFU_SUCCESS)
-      {
-        /* Start the Secure Boot State Machine */
-        (void) SFU_BOOT_SM_Run();
-      }
-      else
-      {
-        /* failure when initializing the secure boot service */
-        e_ret_code = SFU_BOOT_INIT_FAIL;
-      }
-    }
-    else
-    {
-      /* failure when configuring the security IPs  */
-      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
-    }
-  }
-  else
-  {
-    /* failure at secure engine initialization stage */
-    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
-  }
-
-  /*
-   * This point should not be reached unless a critical init failure occurred
-   * Return the error code
-   */
-  return (e_ret_code);
-}
-
-/**
-  * @brief  Force System Reboot
-  * @param  None
-  * @retval None
-  */
-void SFU_BOOT_ForceReboot(void)
-{
-  /*
-   * WARNING: The follow TRACEs are for debug only. This function could be called
-   * inside an IRQ so the below printf could not be executed or could generate a fault!
-   */
-  TRACE("\r\n========= End of Execution ==========");
-  TRACE("\r\n\r\n\r\n");
-
-  /* This is the last operation executed. Force a System Reset. */
-  NVIC_SystemReset();
-}
-
-/**
-  * @brief  Initialize the Secure Boot State machine.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_Init(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-
-  /*
-   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
-   * download)
-   */
-  initialDeviceStatusCheck = 1U;
-
-  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
-  if (SFU_LL_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Flash interface initialization */
-  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* The COM modules is required only if the trace or the local download is enabled */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
-  if (SFU_COM_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  /* Call the SFU_LOADER module Init */
-  if (SFU_LOADER_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER */
-
-  /* Call the Exception module Init */
-  if (SFU_EXCPT_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Call the image handling Init  */
-  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
-  {
-    return SFU_ERROR;
-  } /* else continue */
-
-#ifdef SFU_TEST_PROTECTION
-  SFU_TEST_Init();
-#endif /* SFU_TEST_PROTECTION */
-
-  TRACE("\r\n\r\n");
-  TRACE("\r\n======================================================================");
-  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
-  TRACE("\r\n=                                                                    =");
-  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
-  TRACE("\r\n======================================================================");
-  TRACE("\r\n\r\n");
-
-  /* Initialize the Secure Engine that will be used for all the most critical operations */
-  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
-  {
-    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
-  }
-  else
-  {
-    /* Check the Secure Engine Status in order to get more information */
-    if (e_se_status == SE_BOOT_INFO_ERR_FACTORY_RESET)
-    {
-      TRACE("\r\n= [SBOOT] STATE: WARNING: SECURE ENGINE INITIALIZATION WITH FACTORY DEFAULT VALUES!");
-      /* Please add your custom action here */
-      /* ... */
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-      TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
-    }
-    /*
-     * The BootInfo consecutive boot on error counter will be handled in SFU_BOOT_ManageResetSources() to decide if it
-     * is incremented or reset.
-     * This counter is used to count the number of consecutive resets triggered by an error (in the User Application or
-     * in SB_SFU when dealing with the user application management).
-     * So this counter is reset as soon as a normal power off/power on boot is performed.
-     */
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  DeInitialize the Secure Boot State machine.
-  * @param  None
-  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
-  *         The bootloader can terminate:
-  *         1. with an init failure : no de-init needed
-  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
-  *            by this function.
-  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
-  *            required security mechanisms.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_DeInit(void)
-{
-  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER */
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  if (SFU_COM_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
-
-  if (SFU_LL_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  BSP Initialization.
-  *         Called when the secure mode is enabled.
-  * @note   The BSP configuration should be handled only in this function.
-  * @param  None
-  * @retval None
-  */
-static void SFU_BOOT_BspConfiguration()
-{
-  /* LED Init*/
-  (void) BSP_LED_Init(SFU_STATUS_LED);
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-  /* User Button */
-  BUTTON_INIT();
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-}
-
-/**
-  * @brief  Execute the Secure Boot state machine.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
-  void (*fnStateMachineFunction)(void);
-  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-                                                 SFU_BOOT_SM_CheckNewFwToDownload,
-                                                 SFU_BOOT_SM_DownloadNewUserFw,
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-#ifdef KMS_ENABLED
-                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
-                                                 SFU_BOOT_SM_InstallKMSBlob,
-#endif /* KMS_ENABLED */
-                                                 SFU_BOOT_SM_CheckUserFwStatus,
-                                                 SFU_BOOT_SM_VerifyUserFwSignature,
-                                                 SFU_BOOT_SM_ExecuteUserFw,
-                                                 SFU_BOOT_SM_HandleCriticalFailure,
-                                                 SFU_BOOT_SM_RebootStateMachine
-                                                };
-
-  /* Start the State Machine loop/evolution */
-  while (e_ret_status == SFU_SUCCESS)
-  {
-    /* Always execute a security/safety check before moving to the next state */
-    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
-    {
-      /*
-       * Except for the 1st state, used to check the last saved execution status,
-       * let's save the current Execution Status in order to be retrieved and analyzed
-       * in case a reboot will be triggered by an error, bug, power-off, Hw reset, etc.
-       */
-      if (m_StateMachineContext.CurrState != SFU_STATE_CHECK_STATUS_ON_RESET)
-      {
-        (void) SFU_BOOT_SetLastExecStatus(EXEC_ID_SECURE_BOOT, (uint8_t)m_StateMachineContext.CurrState);
-      }
-
-      /* Get the right StateMachine function according to the current state */
-      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
-
-      /* Call the State Machine function associated to the current state */
-      fnStateMachineFunction();
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  /* If the State Machine cannot evolve anymore, reboot is the only option */
-
-  /* Set the error before forcing a reboot */
-  (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_UNKNOWN);
-
-  /* This is the last operation executed. Force a System Reset */
-  SFU_BOOT_ForceReboot();
-
-  return e_ret_status;
-}
-
-/** @brief  Check the Reset status in order to understand the last cause of Reset
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckStatusOnReset(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef         e_se_status;
-  SE_BootInfoTypeDef       x_boot_info;
-  uint32_t                 u_last_exec_status;
-
-  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
-
-  /* First of all, locally get the last execution status we'll work on, before setting the new state */
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    u_last_exec_status = x_boot_info.LastExecStatus;
-    /*
-     * Try to save here the current Execution Status in order to be retrieved and analyzed in case a reboot will be
-     * triggered by an error, bug, power-off, Hw reset, etc.
-     */
-
-    if (SFU_BOOT_SetLastExecStatus(EXEC_ID_SECURE_BOOT, (uint8_t)m_StateMachineContext.CurrState) == SFU_SUCCESS)
-    {
-      /* Check the wakeup sources */
-      if (SFU_BOOT_ManageResetSources() == SFU_SUCCESS)
-      {
-        /* Check the last execution status and take the opportune actions */
-        if (SFU_BOOT_ManageLastExecStatus(u_last_exec_status) == SFU_SUCCESS)
-        {
-          if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-          {
-            e_ret_status = SFU_SUCCESS;
-          } /* else SE_INFO_ReadBootInfo fails: go forward as we end up with a critical failure anyway */
-        } /* else SFU_BOOT_ManageLastExecStatus fails: go forward as we end up with a critical failure anyway */
-      } /* else SFU_BOOT_ManageResetSources fails: go forward as we end up with a critical failure anyway */
-    } /* else SFU_BOOT_SetLastExecStatus fails: go forward as we end up with a critical failure anyway */
-  } /* else SE_INFO_ReadBootInfo fails: go forward as we end up with a critical failure anyway */
-
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-  /* When the local loader feature is supported we need to check if a local download is requested */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#else
-#ifdef KMS_ENABLED
-  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#else
-  /* When the local loader feature is disabled go directly to the check of the FW status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_VERIFY_USER_FW_STATUS, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#endif /* KMS_ENABLED */
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-}
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-/**
-  * @brief  Check if a new UserApp firmware is available for downloading.
-  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
-  *         to press the user button to force the local download.
-  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
-  *         (because there is no other action to do).
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckNewFwToDownload(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-#ifdef SECBOOT_BYPASS_MODE_ENABLED
-  if ((*(uint32_t *)LOADER_COM_REGION_RAM_START) == STANDALONE_LOADER_BYPASS_REQ)
-  {
-    TRACE("\r\n= [SBOOT] STATE: Bypass mode - execution standalone loader");
-    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
-
-    /* This is unreachable code (dead code) in principle...
-    At this point we should not be able to reach the following instructions.
-    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
-    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-#endif /* SECBOOT_BYPASS_MODE_ENABLED */
-#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
-
-  if (initialDeviceStatusCheck == 1U)
-  {
-    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
-    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
-    if (0U != BUTTON_PUSHED())
-    {
-      /* Download requested */
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-  else
-  {
-    /*
-     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
-     * download to start
-     */
-    e_ret_status = SFU_SUCCESS;
-  }
-
-#ifdef KMS_ENABLED
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
-#else
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
-#endif /* KMS_ENABLED */
-
-}
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
-
-#ifdef KMS_ENABLED
-/**
-  * @brief  Check if a KMSBlob is waiting for installation.
-  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
-  *         disabled.
-  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
-  *         enabled.
-  *         In this latter case,
-  *               if a new Firmware download is requested,
-  *               it has priority over the KMS blob installation,
-  *               and the KMS blob installation request will be lost.
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
-
-  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
-  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
-
-  /* Check if a Blob Installation is requested or on-going */
-  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
-
-  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
-  {
-    /* Blob installation requested */
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
-}
-
-/**
-  * @brief  Check if a KMSBlob is waiting for install.
-  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
-  *         to press the user button to force the local download.
-  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
-  *         (because there is no other action to do).
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_InstallKMSBlob(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  uint8_t         *pBlobHdr;
-  uint8_t         *pBlobInFlash;
-  CK_RV           e_status;
-
-  /* At boot-up, Managing ImportBlob through KMS services.  */
-  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
-
-  /* Here we will Launch SE service to take consume the Blob */
-  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
-  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
-  }
-  else
-  {
-    /* Initialize KMS in order to be able to import blob using internal algorithms */
-    e_status = C_Initialize(NULL);
-    if (e_status == CKR_OK)
-    {
-      /* we do not take the return value into account as we will not retry the import in case of issue */
-      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
-
-      if (e_status != CKR_OK)
-      {
-        (void)C_Finalize(NULL);
-      }
-      else
-      {
-        e_status = C_Finalize(NULL);
-      }
-    }
-
-    if (e_status != CKR_OK)
-    {
-      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
-    }
-
-    /* In any case, we remove the Blob To Install (regardless of the result) */
-    e_ret_status = SFU_KMS_EraseBlob();
-
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
-    }
-
-    /* Display the KMS import result */
-    switch (e_status)
-    {
-      case CKR_OK:
-        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
-        e_ret_status = SFU_SUCCESS;
-        break;
-
-      case CKR_SIGNATURE_INVALID:
-        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_DATA_INVALID:
-        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_DEVICE_ERROR:
-        /* At boot-up, NVM Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_OPERATION_ACTIVE:
-        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      default:
-        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
-        e_ret_status = SFU_ERROR;
-        break;
-    }
-  }
-
-  /* Set the next State Machine regardless of the KMS import result */
-  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
-}
-
-#endif /* KMS_ENABLED */
-
-
-/**
-  * @brief  Check the Status of the Fw Image to work on  in order to set the next
-  *         State Machine state accordingly
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckUserFwStatus(void)
-{
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-  uint32_t i;
-
-  if (initialDeviceStatusCheck == 1U)
-  {
-    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
-  }
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-  if ((*(uint32_t *)LOADER_COM_REGION_RAM_START) == STANDALONE_LOADER_INSTALL_REQ)
-  {
-    /* Whatever the status the decryption can be done only once ==> no interruption allowed */
-    (*(uint32_t *)LOADER_COM_REGION_RAM_START) = STANDALONE_LOADER_NO_REQ;
-
-    TRACE("\r\n\t  New Fw Encrypted, to be decrypted");
-
-    /* Check if there is a pending action related to a FW update procedure */
-    if (SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall) == SFU_IMG_FWIMAGE_TO_INSTALL)
-    {
-      /* Start installation */
-      e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
-    }
-
-    /* Critical failure management if installation failed */
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-      return;
-    }
-  }
-#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
-
-  /*
-   * No FW image installation pending :
-   *   1- Priority to MASTER_SLOT : check if a firmware is detected
-   *   2- No firmware identified : verify other slots and start execution on the last detected firmware
-   *   3- No active firmware candidate for execution ==> Local download
-   *
-   * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
-   */
-
-  m_ActiveSlotToExecute = 0U;
-
-  /* 1- Priority to MASTER_SLOT : check if a firmware is detected */
-  if (MASTER_SLOT != 0xFFU)
-  {
-    if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
-    {
-      m_ActiveSlotToExecute = MASTER_SLOT;
-      TRACE("\r\n\t  A FW is detected in the slot SLOT_ACTIVE_%d", m_ActiveSlotToExecute);
-      SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
-    }
-  }
-
-  /* 2- No firmware identified : verify other slots and start execution on the last detected firmware */
-  if (m_ActiveSlotToExecute == 0U)
-  {
-    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-    {
-      if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
-      {
-        if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-        {
-          m_ActiveSlotToExecute = SLOT_ACTIVE_1 + i;
-          TRACE("\r\n\t  A FW is detected in the slot SLOT_ACTIVE_%d", m_ActiveSlotToExecute);
-          SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
-        }
-      }
-    }
-  }
-
-  /* 3- No active firmware candidate for execution ==> Local download */
-  if (m_ActiveSlotToExecute == 0U)
-  {
-    /* Control if all active slot are empty */
-    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-    {
-      if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
-      {
-        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /*
-           * We should never reach this code.
-           * Could come from an attack ==> as an example we invalidate current firmware.
-           */
-          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
-          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-        }
-      }
-    }
-
-    /*
-     * No valid FW is present in the active slot
-     * and there is no FW to be installed in UserApp download area: local download (when possible)
-     */
-    if (initialDeviceStatusCheck == 1U)
-    {
-      TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-      /* Waiting for a local download is automatic, no trigger required. */
-      TRACE("\r\n\t  Waiting for the local download to start... ");
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-      initialDeviceStatusCheck = 0U;
-#ifdef SFU_TEST_PROTECTION
-      SFU_TEST_Reset();
-#endif /* SFU_TEST_PROTECTION */
-    }
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    else
-    {
-      /*
-       * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
-       *   If a FW is present in the active slot => it is checked then launched.
-       *   If there is a FW to install => the installation procedure starts.
-       *   If no FW is present and no installation is pending:
-       *      - if the local loader feature is enabled we enter the local download state
-       *      - if the local loader feature is disabled, the execution is stopped.
-       */
-      TRACE("Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS is not supposed to be entered more than once per boot.");
-    }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-    SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
-#else
-    /*
-     * When the local loader feature is disabled it is not possible to enter the "check new fw download" state.
-     * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
-     * So we end up waiting for the user to reboot (or the IWDG to expire).
-     */
-    TRACE("No valid FW and no local loader: execution stopped.\r\n");
-    while (1 == 1)
-    {
-      (void) BSP_LED_Toggle(SFU_STATUS_LED);
-      HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
-    }
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-  }
-}
-
-
-#if SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER
-/**
-  * @brief  A new UserApp Fw was available. Start to download it
-  * @param  None
-  * @note   Reset is generated at by standalone loader when FW is downloaded.
-  * @retval None
-  */
-static void SFU_BOOT_SM_DownloadNewUserFw(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
-
-  /* Jump into standalone loader */
-  e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
-
-  /* This is unreachable code (dead code) in principle...
-  At this point we should not be able to reach the following instructions.
-  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-/**
-  * @brief  A new UserApp Fw was available. Start to download it
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_DownloadNewUserFw(void)
-{
-  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
-  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
-  uint32_t                  dwl_slot;
-  uint32_t                  active_slot;
-  uint32_t                  u_size = 0;
-
-  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
-
-  /*
-   * Download area will be chosen as following. After header analysis :
-   *   - same DWL slot number as SFU magic number, if the slot is configured.
-   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
-   *   - by default : SLOT_DWL_1
-   */
-  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
-          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
-          fw_image_header_validated.PartialFwOffset, u_size);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-    /* Read header in dwl slot */
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
-                                     sizeof(SE_FwRawHeaderTypeDef));
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_validated);
-    if (SFU_IMG_Validation(active_slot, &fw_image_header_validated) != SFU_SUCCESS)
-    {
-      /* CleanUp downloaded image (header preserved, for anti-rollback) */
-      (void) SFU_IMG_InvalidateCurrentFirmware(active_slot);
-
-      /* no specific error cause set */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-  else
-  {
-    /* CleanUp downloaded image (header preserved, for anti-rollback) */
-    (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
-
-    /* Memorize the specific error cause if any before handling this critical failure */
-    switch (e_ret_status_app)
-    {
-      case SFU_LOADER_ERR_COM:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_COM_ERROR);
-        break;
-      case SFU_LOADER_ERR_FW_VERSION:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_INCORRECT_VERSION);
-        break;
-      case SFU_LOADER_ERR_FW_LENGTH:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FW_TOO_BIG);
-        break;
-      case SFU_LOADER_ERR_AUTH_FAILED:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_HEADER_AUTH_FAILED);
-        break;
-      case SFU_LOADER_ERR_FLASH:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-        break;
-      case SFU_LOADER_ERR_CRYPTO:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-        break;
-      default:
-        /* no specific error cause */
-        break;
-    }
-  } /* else error with no specific error cause */
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
-
-
-/**
-  * @brief  Verify the UserApp Fw signature before executing it
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_VerifyUserFwSignature(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t i;
-
-  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
-
-  /* Double security check :
-     - testing "static protections" twice will avoid basic hardware attack
-     - flow control reached : dynamic protections checked
-     - re-execute static then dynamic check
-     - errors caught by FLOW_CONTROL ==> infinite loop */
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
-  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
-  }
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    /*
-     * Due to previous flow control, we should never reach this code  :
-     * Critical failure management if installation failed
-     */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-    return;
-  }
-
-  /*
-   * With the 2 images handling:
-   *       1. the header signature is verified  when installing a new firmware
-   *       2. the firmware signature is checked when installing a new firmware
-   *       3. remaining part of active slot is kept "clean" during installation procedure
-   * So following checks should never fail.
-   */
-  /* Check all active slots configured */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      /* FW installed ? */
-      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-      {
-        /* Initialize Flow control */
-        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
-
-        /* Check the header signature */
-        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
-        if (SFU_SUCCESS == e_ret_status)
-        {
-          /* Check the FW signature */
-          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
-          if (SFU_SUCCESS == e_ret_status)
-          {
-            /* Verify that there is no additional code beyond firmware image */
-            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
-            if (SFU_SUCCESS != e_ret_status)
-            {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-            }
-          }
-          else
-          {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          }
-        }
-        else
-        {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-        }
-        /*
-         * One of the checks fails :
-         *  - Header signature
-         *  - FW signature
-         *  - No malicious code
-         *  ==> Active slot should be invalidated
-         */
-        if (SFU_SUCCESS != e_ret_status)
-        {
-          /*
-           * We should never reach this code.
-           * Could come from an attack ==> as an example we invalidate current firmware.
-           */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-        }
-        else
-        {
-          /* Verify if authentication and integrity controls performed */
-          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-        }
-      }
-      else
-      {
-        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /*
-           * We should never reach this code.
-           * Could come from an attack ==> as an example we invalidate current firmware.
-           */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-        }
-      }
-    }
-  }
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-
-/**
-  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_ExecuteUserFw(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status = SE_KO;
-  uint32_t i;
-
-  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
-
-  /* Reload Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
-  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-
-  /* Double security check for all active slots :
-     - Control twice the Header signature will avoid basic hardware attack
-     - Control twice the FW signature will avoid basic hardware attack */
-
-  /* Check all active slots configured */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      /* FW installed ? */
-      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-      {
-        /* Initialize Flow control */
-        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
-
-        /* Check the header signature */
-        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Security issue : execution stopped ! */
-          SFU_EXCPT_Security_Error();
-        }
-
-        /* Check the FW signature */
-        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Security issue : execution stopped ! */
-          SFU_EXCPT_Security_Error();
-        }
-
-#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
-        /* Move the state to SELFTEST for the new images */
-        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Image state cannot be changed : What to do ?
-             ==> decision to continue execution */
-          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
-        }
-#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
-
-        /* Verify if authentication and integrity controls performed */
-        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-      }
-    }
-  }
-
-  /*
-   * Try to set the last execution status and continue: we assume the UserApp will start or a failure will be linked to
-   * the UserApp code so we can change the EXEC_ID now
-   */
-  e_ret_status = SFU_BOOT_SetLastExecStatus(EXEC_ID_USER_APP, (uint8_t)m_StateMachineContext.CurrState);
-
-  /*
-   * You may decide to implement additional checks before running the Firmware.
-   * For the time being we launch the FW present in the active slot.
-   *
-   * The bootloader must also take care of the security aspects:
-   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
-   *   B.lock the SE services the UserApp is not allowed to call
-   *   C.leave secure boot mode
-   */
-
-  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-
-    /* Lock part of Secure Engine services */
-    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
-    {
-      /* De-initialize the SB_SFU bootloader before launching the UserApp */
-      (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
-
-      /* Last flow control : lock service */
-      FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
-
-      /* This function should not return */
-      e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
-
-      /* This point should not be reached */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      /* We do not memorize any specific error, the FSM state is already providing the info */
-      TRACE("\r\n=         SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      while (1 == 1)
-      {
-        ;    /* wait for watchdog */
-      }
-    }
-    else
-    {
-      TRACE("\r\n= [FWIMG] SECURE ENGINE CRITICAL FAILURE!");
-
-      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_LOCK_SE_SERVICES_ERR);
-
-      /* This is the last operation executed. Force a System Reset */
-      SFU_BOOT_ForceReboot();
-    }
-  }
-  else
-  {
-    TRACE("\r\n= [FWIMG] EXTERNAL FLASH CONFIGURATION FAILURE!");
-
-    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-
-    /* This is the last operation executed. Force a System Reset */
-    SFU_BOOT_ForceReboot();
-  }
-
-  /* This is unreachable code (dead code) in principle...
-  At this point we should not be able to reach the following instructions.
-  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-
-/**
-  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
-  * @param  None
-  * @note   After a Critical Failure a Reboot will be called.
-  * @retval None
-  */
-static void SFU_BOOT_SM_HandleCriticalFailure(void)
-{
-  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
-
-  /* Any Critical Failure will be served and a SystemReset will be triggered */
-  SFU_BOOT_StateExceptionHandler(m_StateMachineContext.PrevState);
-
-  /* It's not possible to continue without compromising the stability or the security of the solution.
-     The State Machine needs to be aborted and a Reset must be triggered */
-  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
-}
-
-/**
-  * @brief  The state machine is aborted and a Reset is triggered
-  * @param  None
-  * @note   You are in this condition because it's not possible to continue without
-            compromising the stability or the security of the solution.
-  * @retval None
-  */
-static void SFU_BOOT_SM_RebootStateMachine(void)
-{
-  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
-
-  /*
-   * In case some clean-up must be done before resetting.
-   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
-   */
-  (void)SFU_BOOT_DeInit();
-
-  /* This is the last operation executed. Force a System Reset */
-  SFU_BOOT_ForceReboot();
-}
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-/**
-  * @brief  Jump into standalone loader
-  * @param  None
-  * @retval None
-  */
-static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status = SE_KO;
-  uint32_t jump_address ;
-  typedef void (*Function_Pointer)(void);
-  Function_Pointer  p_jump_to_function;
-
-  /* Lock part of Secure Engine services */
-  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
-  {
-    /* Give execution rights to standalone loader */
-    e_ret_status = SFU_LL_SECU_SetProtectionMPU_StandaloneLoader();
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Initialize address to jump */
-    jump_address = *(__IO uint32_t *)(((uint32_t)LOADER_REGION_ROM_START + 4));
-    p_jump_to_function = (Function_Pointer) jump_address;
-
-    /* Initialize loader's Stack Pointer */
-    __set_MSP(*(__IO uint32_t *)(LOADER_REGION_ROM_START));
-
-    /* Jump into loader */
-    p_jump_to_function();
-  }
-
-  /* The point below should NOT be reached */
-  return e_ret_status;
-}
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-
-/**
-  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
-  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
-  * @param  None
-  * @note   This operation should be done as soon as possible after a reboot.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply Static protections involving Option Bytes */
-  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
-  {
-    /* Apply runtime protections needed to be enabled after each Reset */
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  System security configuration
-  * @param  None
-  * @note   Check and apply the security protections. This has to be done as soon
-  *         as possible after a reset
-  * @retval None
-  */
-static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  /* WARNING: The following CheckApplySecurityProtection function must be called
-     as soon as possible after a Reset in order to be sure the system is secured
-     before starting any other operation. The drawback is that the ErrorManagement
-     is not initialized yet, so in case of failure of this function, there will not be
-     any error stored into the BootInfo or other visible effects.  */
-
-  /* Very few things are already initialized at this stage. Need additional initialization
-     to show a message that is added as below only in Debug/Test mode */
-#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  (void) SFU_COM_Init();
-#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
-
-  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
-  {
-    /* WARNING: This might be generated by an attempted attack or a bug of your code!
-       Add your code here in order to implement a custom action for this event,
-       e.g. trigger a mass erase or take any other action in order to
-       protect your system, or simply discard it if this is expected.
-       ...
-       ...
-    */
-    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
-  }
-  else
-  {
-    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
-  *         a malicious code removing some of the applied security/integrity features.
-  *         The IWDG is also refreshed in this function.
-  * @param  None
-  * @note   This function must be called with a frequency greater than 0.25Hz!
-  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
-  *         So the User App should continue to refresh the IWDG counter.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Refresh the IWDG */
-  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
-
-
-  /* Add your code here for customization:
-     e.g. for additional security or safety periodic check.
-     ...
-     ...
-  */
-  return e_ret_status;
-}
-
-/**
-  * @brief  Set the last execution status. For future customization the parameter
-  *         list can be extended with an additional uint8_t, that at the moment is
-  *         stored with a reserved default value.
-  * @param  uExecID: This parameter can be a value of @ref SFU_BOOT_Private_Defines_Execution_Id
-  * @param  uLastExecState: the last SM state to store into the BootInfo structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SetLastExecStatus(uint8_t uExecID, uint8_t uLastExecState)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef        e_se_status;
-  SE_BootInfoTypeDef      x_boot_info;
-  uint8_t uFwImageIdx = 0U;
-
-  if ((IS_VALID_EXEC_ID(uExecID)) && (IS_SFU_SM_STATE(uLastExecState)))
-  {
-    if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      /* Set the last execution status as a 32-bit data */
-      x_boot_info.LastExecStatus = RESERVED_VALUE
-                                   | ((uint32_t)uLastExecState << 8U)
-                                   | ((uint32_t)uFwImageIdx << 16U)
-                                   | ((uint32_t)uExecID << 24U);
-
-      /* Update the BootInfo shared area according to the modifications above */
-      if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the  the last execution status, and take the right actions accordingly
-  * @param  uLastExecStatus: 32-bit representing the @ref SFU_BOOT_Private_Macros_Execution_Status
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus  SFU_BOOT_ManageLastExecStatus(uint32_t uLastExecStatus)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef         e_se_status;
-  SE_BootInfoTypeDef       x_boot_info;
-  SFU_EXCPT_IdTypeDef      u_last_error;
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    /* Show the last execution state */
-    TRACE("\r\n\t  INFO: Last execution status before Reboot was:");
-    if (IS_SFU_SM_STATE(SFU_GET_LAST_EXEC_STATE(uLastExecStatus)))
-    {
-      TRACE(m_aStateMachineStrings[SFU_GET_LAST_EXEC_STATE(uLastExecStatus)]);
-    }
-    else
-    {
-      TRACE("Unknown");
-    }
-#else
-    UNUSED(uLastExecStatus);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-    /* Show the last execution error */
-    u_last_error = (SFU_EXCPT_IdTypeDef) x_boot_info.LastExecError;
-    TRACE("\r\n\t  INFO: Last execution detected error was: ");
-    if (IS_SFU_EXCPT(u_last_error))
-    {
-      TRACE((char const *)m_aErrorStrings[u_last_error]);
-    }
-    else
-    {
-      TRACE("Unknown error.");
-      u_last_error = SFU_EXCPT_UNKNOWN;
-    }
-
-    /* Custom handler of the last error detected at reset */
-    if ((SFU_EXCPT_IdTypeDef)u_last_error != SFU_EXCPT_NONE)
-    {
-      SFU_EXCPT_ResetExceptionHandler((SFU_EXCPT_IdTypeDef)u_last_error);
-    }
-
-    /*
-     * It's possible to reset the error at this point (because we are in SFU_STATE_CHECK_STATUS_ON_RESET context so no
-     * need to memorize the exception further)
-     */
-    x_boot_info.LastExecError = (uint32_t) SFU_EXCPT_NONE;
-
-    /* Update the BootInfo shared area according to the modifications above */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus  SFU_BOOT_ManageResetSources(void)
-{
-  SFU_ErrorStatus     e_ret_status = SFU_ERROR;
-  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
-  SFU_EXCPT_IdTypeDef e_exception;
-  SE_BootInfoTypeDef  x_boot_info; /* to retrieve and  update the counter of consecutive errors */
-  SE_StatusTypeDef    e_se_status;
-
-  /* Check the wakeup sources */
-  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
-  switch (e_wakeup_source_id)
-  {
-    /*
-     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
-     * RCC_CSR flags can be used to do so.
-     * It is based on the behaviors we consider as normal and abnormal for the SB_SFU and UserApp example projects
-     * running on a Nucleo HW board.
-     * Hence this piece of code must systematically be revisited and tuned for the targeted system (software and
-     * hardware expected behaviors must be assessed to tune this code).
-     *
-     * One may use the "uExecID" parameter to determine if the last exec status was in the SB_SFU context or UserApp
-     * context to implement more clever checks in the reset cause handling below.
-     */
-
-    case SFU_RESET_WDG_RESET:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* This event has to be considered as an error to manage */
-      e_exception = SFU_EXCPT_WATCHDOG_RESET;
-      break;
-
-    case SFU_RESET_LOW_POWER:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_HW_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         This is because a Nucleo board offers a RESET button triggering the HW reset.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_BOR_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_SW_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage,
-         also because a sw reset is generated when the State Machine forces a Reboot.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_OB_LOADER:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage,
-         also because an OptionByte loader is called after applying some of the security protections
-         (see SFU_CheckApplyStaticProtections).
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line.
-         Typically we may implement a more clever check where we determine if this OB reset occurred only once because
-         SB_SFU had to tune the OB initially, or if it occurred again after these initial settings. If so, we could
-         consider it as an attack. */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    default:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-  }
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) != SE_SUCCESS)
-  {
-    /* This is not supposed to occur because ReadBootInfo is already called before SFU_BOOT_ManageResetSources() is
-       entered... */
-    TRACE("\r\n\t  BOOT INFO reading Error");
-    /* Do nothing more and return an error */
-  }
-  else
-  {
-    /* In case an error has been set above, set/overwrite it into the BootInfo */
-    if (e_exception != SFU_EXCPT_NONE)
-    {
-      /* increment number of consecutive boot errors */
-      x_boot_info.ConsecutiveBootOnErrorCounter++;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter ++ ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-    else
-    {
-      /*
-       * The reset cause is considered as normal so we reset the counter of consecutive errors
-       */
-      x_boot_info.ConsecutiveBootOnErrorCounter = 0;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter reset ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-
-    /* Log the consecutive init counter value in the console */
-    TRACE("\r\n\t  Consecutive Boot on error counter = %d ", x_boot_info.ConsecutiveBootOnErrorCounter);
-
-    /* Update BootInfo structure with  consecutive boot counter */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) != SE_SUCCESS)
-    {
-      TRACE("\r\n\t  BOOT INFO Consecutive Boot on error counter writing error ");
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter updated ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* Update the last exec error if needed */
-  if (e_exception != SFU_EXCPT_NONE)
-  {
-    if (SFU_BOOT_SetLastExecError((uint32_t)e_exception) != SFU_SUCCESS)
-    {
-      e_ret_status = SFU_ERROR;
-    } /* else keep the previous e_ret_status value */
-  } /* else: no need to update it */
-
-  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
-  SFU_LL_SECU_ClearResetSources();
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
-  * @param  None
-  * @retval None
-  */
-void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
-{
-  UNUSED(hrtc);
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
-}
-
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the Memory Fault.
-  * @note  After a Memory Fault could not be possible to execute additional code
-  * @param  None
-  * @retval None
-  */
-void SFU_CALLBACK_MEMORYFAULT(void)
-{
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_MEMORY_FAULT);
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_loader.c
deleted file mode 100644
index 23111c05..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_loader.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_com_loader.c
-  * @author  MCD Application Team
-  * @brief   Secure Firmware Update COM module.
-  *          This file provides set of firmware functions to manage SFU Com
-  *          functionalities for the local loader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level.h"
-#include "sfu_low_level_security.h"
-#include "sfu_com_loader.h"
-#include "sfu_trace.h"
-
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
-
-/* Private defines -----------------------------------------------------------*/
-#if defined(__ICCARM__)
-#define PUTCHAR_PROTOTYPE int putchar(int ch)
-#elif defined(__ARMCC_VERSION)
-#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
-#elif defined(__GNUC__)
-#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
-#endif /* __ICCARM__ */
-
-#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
-#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
-
-/* Private macros ------------------------------------------------------------*/
-#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
-#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
-#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
-#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
-#define ISVALIDDEC(c)       IS_09(c)
-#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
-
-#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
-#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
-
-/* Private function prototypes -----------------------------------------------*/
-static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
-static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
-
-/* Functions Definition ------------------------------------------------------*/
-
-#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
-/**
-  * @brief  SFU Com Init function.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_Init(void)
-{
-#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
-  setvbuf(stdout, NULL, _IONBF, 0);
-#endif /* __GNUC__ */
-  return SFU_LL_UART_Init();
-}
-
-/**
-  * @brief  SFU Com DeInit function.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_DeInit(void)
-{
-  return SFU_LL_UART_DeInit();
-}
-
-#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
-
-/**
-  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
-  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
-  * @param  puSize: size of received file.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
-  */
-SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
-{
-  uint32_t i;
-  uint32_t packet_length = 0U;
-  uint32_t session_done = 0U;
-  uint32_t file_done;
-  uint32_t errors = 0U;
-  uint32_t session_begin = 0U;
-  uint32_t filesize = 0U;
-  uint32_t packets_received;
-  uint8_t *file_ptr;
-  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
-  uint8_t tmp;
-  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
-                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(4)));
-
-  /* Check the pointers allocation */
-  if ((peCOMStatus == NULL) || (puSize == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  *peCOMStatus = SFU_COM_YMODEM_OK;
-
-  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
-  {
-    packets_received = 0U;
-    file_done = 0U;
-    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
-    {
-      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
-      {
-        case HAL_OK:
-          errors = 0U;
-          switch (packet_length)
-          {
-            case 3U:
-              /* Startup sequence */
-              break;
-            case 2U:
-              /* Abort by sender */
-              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-              *peCOMStatus = SFU_COM_YMODEM_ABORT;
-              break;
-            case 0U:
-              /* End of transmission */
-              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-              *puSize = filesize;
-              file_done = 1U;
-              break;
-            default:
-              /* Normal packet */
-              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
-              {
-                /* No NACK sent for a better synchro with remote : packet will be repeated */
-              }
-              else
-              {
-                if (packets_received == 0U)
-                {
-                  /* File name packet */
-                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
-                  {
-                    /* File name skipped */
-                    i = 0U;
-                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
-                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
-                    {
-                      i++;
-                      file_ptr++;
-                    }
-                    /* end of file name ('\0') skipped */
-                    file_ptr++;
-                    
-                    /* File size extraction */
-                    i = 0U;
-                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
-                    {
-                      file_size[i] = *file_ptr;
-                      i++;
-                      file_ptr++;
-                    }
-                    file_size[i] = (uint8_t) '\0';
-                    (void) Str2Int(file_size, &filesize);
-
-                    /* Header packet received callback call*/
-                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
-                    {
-                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-                      (void) SFU_LL_UART_Flush();
-                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
-                    }
-                    else
-                    {
-                      /* End session */
-                      tmp = SFU_COM_YMODEM_CA;
-                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
-                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
-                      return SFU_ERROR;
-                    }
-                  }
-                  /* File header packet is empty, end session */
-                  else
-                  {
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-                    file_done = 1U;
-                    session_done = 1U;
-                    break;
-                  }
-                }
-                else /* Data packet */
-                {
-                  /* Data packet received callback call*/
-                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX], 
-                                                           packet_length) == SFU_SUCCESS)
-                  {
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-
-                  }
-                  else /* An error occurred while writing to Flash memory */
-                  {
-                    /* End session */
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-                    *peCOMStatus = SFU_COM_YMODEM_DATA;
-                  }
-
-                }
-                packets_received ++;
-                session_begin = 1;
-              }
-              break;
-          }
-          break;
-        case HAL_BUSY: /* Abort actually */
-          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-          *peCOMStatus = SFU_COM_YMODEM_ABORT;
-          break;
-        default:
-          if (session_begin > 0U)
-          {
-            errors ++;
-          }
-          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
-          {
-            /* Abort communication */
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-            *peCOMStatus = SFU_COM_YMODEM_ABORT;
-          }
-          else
-          {
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
-#ifndef MINICOM_YMODEM
-            /* Minicom does not accept this extra character */
-            TRACE("\b.");                                 /* Replace C char by . on display console */
-#endif /* MINICOM_YMODEM */
-            /*
-             * Toggling the LED in case no console is available: the toggling frequency depends on
-             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
-             */
-            (void) BSP_LED_Toggle(SFU_STATUS_LED);
-          }
-          break;
-      }
-    }
-  }
-  /* Make sure the status LED is turned off */
-  (void) BSP_LED_Off(SFU_STATUS_LED);
-
-  if (*peCOMStatus == SFU_COM_YMODEM_OK)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-}
-
-/**
-  * @brief  Transmit a byte to the COM Port.
-  * @param  uParam: The byte to be sent.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
-{
-  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
-}
-
-/**
-  * @brief  Convert a string to an integer.
-  * @param  pInputStr: The string to be converted.
-  * @param  pIntNum: The integer value.
-  * @retval 1: Correct
-  *         0: Error
-  */
-static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
-{
-  uint32_t i = 0U;
-  uint32_t res = 0U;
-  uint32_t val = 0U;
-  uint8_t  x;
-
-  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
-  {
-    i = 2U;
-    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
-    {
-      if (ISVALIDHEX(pInputStr[i]))
-      {
-        x = CONVERTHEX(pInputStr[i]);
-        val = (val << 4U) + x;
-      }
-      else
-      {
-        /* Return 0, Invalid input */
-        res = 0U;
-        break;
-      }
-      i++;
-    }
-
-    /* valid result */
-    if (pInputStr[i] == (uint8_t)'\0')
-    {
-      *pIntNum = val;
-      res = 1U;
-    }
-  }
-  else /* max 10-digit decimal input */
-  {
-    while ((i < 11U) && (res != 1U))
-    {
-      if (pInputStr[i] == (uint8_t)'\0')
-      {
-        *pIntNum = val;
-        /* return 1 */
-        res = 1U;
-      }
-      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
-      {
-        val = val << 10U;
-        *pIntNum = val;
-        res = 1U;
-      }
-      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
-      {
-        val = val << 20U;
-        *pIntNum = val;
-        res = 1U;
-      }
-      else if (ISVALIDDEC(pInputStr[i]))
-      {
-        x =  CONVERTDEC(pInputStr[i]);
-        val = (val * 10U) + x;
-      }
-      else
-      {
-        /* return 0, Invalid input */
-        res = 0U;
-        break;
-      }
-      i++;
-    }
-  }
-
-  return res;
-}
-
-/**
-  * @brief  Receive a packet from sender
-  * @param  pData: pointer to received data.
-  * @param  puLength
-  *     0: end of transmission
-  *     2: abort by sender
-  *    >0: packet length
-  * @param  uTimeOut: receive timeout (ms).
-  * @retval HAL_OK: normally return
-  *         HAL_BUSY: abort by user
-  */
-static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
-{
-  uint32_t crc;
-  uint32_t packet_size = 0U;
-  HAL_StatusTypeDef status;
-  SFU_ErrorStatus eRetStatus;
-
-  uint8_t char1;
-
-#ifdef MINICOM_YMODEM
-  uint32_t myIdx = 0; /* index indicating where to write in pData */
-#endif /* MINICOM_YMODEM */
-
-  *puLength = 0U;
-
-  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
-
-  if (eRetStatus == SFU_SUCCESS)
-  {
-    status = HAL_OK;
-
-    switch (char1)
-    {
-      case SFU_COM_YMODEM_SOH:
-        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
-        break;
-      case SFU_COM_YMODEM_STX:
-        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
-        break;
-      case SFU_COM_YMODEM_EOT:
-        break;
-      case SFU_COM_YMODEM_CA:
-        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
-        {
-          packet_size = 2U;
-        }
-        else
-        {
-          status = HAL_ERROR;
-        }
-        break;
-      case SFU_COM_YMODEM_ABORT1:
-      case SFU_COM_YMODEM_ABORT2:
-        status = HAL_BUSY;
-        break;
-      case SFU_COM_YMODEM_RB:
-        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
-        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
-        packet_size = 3U;
-        break;
-      default:
-        status = HAL_ERROR;
-        break;
-    }
-    *pData = char1;
-
-    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
-    {
-
-#ifndef MINICOM_YMODEM
-      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX], 
-                                       (uint16_t) (packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
-#else
-      eRetStatus = SFU_SUCCESS;
-      /* Receive byte per byte until no data left or no space left in buffer */
-      while ((SFU_SUCCESS == eRetStatus) &&
-             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
-              SFU_COM_YMODEM_PACKET_DATA_INDEX +
-              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
-            )
-      {
-        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
-                                         1U, uTimeout);
-        myIdx++;
-      }
-
-      if (myIdx > 1)
-      {
-        /* We received some bytes */
-        eRetStatus = SFU_SUCCESS;
-      }
-#endif /* MINICOM_YMODEM */
-
-      /* Simple packet sanity check */
-      if (eRetStatus == SFU_SUCCESS)
-      {
-        status = HAL_OK;
-
-        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
-                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
-        {
-          packet_size = 0U;
-          status = HAL_ERROR;
-        }
-        else
-        {
-          /* Check packet CRC*/
-          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
-          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
-
-          /*Configure CRC with 16-bit polynomial*/
-          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
-          {
-            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
-            {
-              packet_size = 0U;
-              status = HAL_ERROR;
-            }
-
-          }
-          else
-          {
-            packet_size = 0U;
-            status = HAL_ERROR;
-          }
-        }
-      }
-      else
-      {
-        status = HAL_ERROR;
-      }
-    }
-  }
-  else
-  {
-    status = HAL_ERROR;
-  }
-
-  *puLength = packet_size;
-  return status;
-}
-
-/**
-  * @brief  Ymodem Header Packet Transfer completed callback.
-  * @param  uFileSize: Dimension of the file that will be received.
-  * @retval None
-  */
-__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
-{
-
-  /* NOTE : This function should not be modified, when the callback is needed,
-            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
-   */
-  UNUSED(uFileSize);
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Ymodem Data Packet Transfer completed callback.
-  * @param  pData: Pointer to the buffer.
-  * @param  uSize: Packet dimension.
-  * @retval None
-  */
-__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-
-  /* NOTE : This function should not be modified, when the callback is needed,
-            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
-   */
-  UNUSED(pData);
-  UNUSED(uSize);
-  return SFU_SUCCESS;
-}
-
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_error.c
deleted file mode 100644
index c9e026cb..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_error.c
+++ /dev/null
@@ -1,606 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_error.c
-  * @author  MCD Application Team
-  * @brief   SFU ERROR
-  *          This file provides set of firmware functions for SB_SFU errors handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-#include "sfu_low_level_security.h"
-#include "sfu_trace.h"
-#include "se_interface_bootloader.h"
-#include "sfu_fwimg_services.h"
-#include "sfu_boot.h"
-#include "sfu_test.h"
-
-
-/* Private function prototypes -----------------------------------------------*/
-static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Set the last execution error. The state of the FSM that generated the error is stored
-  * @param  uLastExecError: the last error to store into the BootInfo structure.
-  * @note   for product with MPU isolation : e_se_status and x_boot_info parameters are defined as static to avoid to
-  *         be located into SE stack. This function can be called from IT and thus use the SE stack (privilege mode).
-  *         SE callgate will generate a reset if the parameters are not well located.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_BOOT_SetLastExecError(uint32_t uLastExecError)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  static SE_StatusTypeDef   e_se_status;
-  static SE_BootInfoTypeDef x_boot_info;
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    /* Set the last execution status as a 32-bit data */
-    x_boot_info.LastExecError = uLastExecError;
-
-    /* Update the BootInfo shared area according to the modifications above */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Manage the Exception generated by an IRQ
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   Because of the interruption of the State Machine execution,
-  *         it's not possible to continue without compromising the stability or
-  *         the security of the solution. A System Reset is forced at the end.
-  * @retval None
-  */
-void SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  SFU_EXCPT_IdTypeDef exception_id;
-  
-  /* Check the value */
-  exception_id = eExceptionId;
-  if (!IS_SFU_EXCPT(exception_id))
-  {
-    exception_id = SFU_EXCPT_UNKNOWN;
-  }
-
-  /* At this point and according to the detected critical exceptions, the execution
-     itself may be compromised and could not be possible to execute the following instructions.
-     It's worth trying anyway */
-
-  /* Try to take an action */
-  SFU_EXCPT_RuntimeExceptionHandler(exception_id);
-
-  /* Try to store the detected error */
-  (void)SFU_BOOT_SetLastExecError((uint32_t) exception_id);
-
-  /* It's not possible to continue without compromising the stability or the security of the solution.
-  The State Machine needs to be aborted and a Reset must be triggered */
-  SFU_BOOT_ForceReboot();
-}
-
-/**
-  * @brief  Manage the Error generated during the StateMachine execution
-  *
-  *         If a specific error has been logged in the BootInfo area it is used.
-  *         Otherwise, a generic exception is derived from the previous FSM state (minimal info).
-  *         Nevertheless, the max.consecutive boot on error counter has priority over all other errors.
-  * @note   This function is called when processing a critical failure
-  *         (called from @ref SFU_BOOT_SM_HandleCriticalFailure in state @ref SFU_STATE_HANDLE_CRITICAL_FAILURE)
-  * @param  eStateMachineState: This parameter can be a value of @ref SFU_BOOT_State_Machine_Structure_definition
-  * @retval None
-  */
-void SFU_BOOT_StateExceptionHandler(SFU_BOOT_StateMachineTypeDef eStateMachineState)
-{
-  SFU_EXCPT_IdTypeDef eExceptionId;
-  SE_BootInfoTypeDef  x_boot_info; /* to retrieve the counter of consecutive errors */
-  SE_StatusTypeDef    e_se_status;
-  SFU_EXCPT_IdTypeDef u_specific_LastExecError = SFU_EXCPT_NONE;
-
-  /* Check the parameters */
-  assert_param(IS_SFU_SM_STATE(eStateMachineState));
-
-  /*
-   * First we retrieve the specific error set when the error was detected if any.
-   * This gives a chance to set a specific error cause, more detailed than the exceptions computed from the FSM state.
-   */
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    u_specific_LastExecError = (SFU_EXCPT_IdTypeDef) x_boot_info.LastExecError;
-  } /* else keep u_specific_LastExecError as SFU_EXCPT_NONE */
-
-  switch (eStateMachineState)
-  {
-
-    case SFU_STATE_CHECK_STATUS_ON_RESET:
-      eExceptionId = SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR;
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD:
-      eExceptionId = SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR;
-      break;
-
-    case SFU_STATE_DOWNLOAD_NEW_USER_FW:
-      eExceptionId = SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR;
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_STATE_VERIFY_USER_FW_STATUS:
-      eExceptionId = SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR;
-      break;
-
-
-    case SFU_STATE_VERIFY_USER_FW_SIGNATURE:
-      eExceptionId = SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR;
-      break;
-
-
-    case SFU_STATE_EXECUTE_USER_FW:
-      eExceptionId = SFU_EXCPT_EXECUTE_USER_FW_ERR;
-      break;
-
-    default:
-      /* Set an unknown error */
-      eExceptionId = SFU_EXCPT_UNKNOWN;
-      break;
-  }
-
-  if (SFU_EXCPT_NONE != u_specific_LastExecError)
-  {
-    /* The specific error cause set at error detection stage has priority over the exception computed from the FSM
-       state */
-    eExceptionId = u_specific_LastExecError;
-  } /* else go ahead with the exception derived from the FSM state */
-
-  /* Take an immediate action */
-  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
-
-  /* Try to store the error inside the BootInfo structure */
-  (void)SFU_BOOT_SetLastExecError((uint32_t) eExceptionId);
-
-}
-
-/**
-  * @brief  Check exception code among the known list
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-SFU_ErrorStatus SFU_EXCPT_Check_Code(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  switch (eExceptionId)
-  {
-    case SFU_EXCPT_WATCHDOG_RESET :
-      break;
-    case SFU_EXCPT_MEMORY_FAULT :
-      break;
-    case SFU_EXCPT_HARD_FAULT :
-      break;
-    case SFU_EXCPT_TAMPERING_FAULT :
-      break;
-    case SFU_EXCPT_CHECK_PROTECTIONS_ERR :
-      break;
-    case SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR :
-      break;
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR :
-      break;
-    case SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR :
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-    case SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR :
-      break;
-    case SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR :
-      break;
-    case SFU_EXCPT_EXECUTE_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_LOCK_SE_SERVICES_ERR :
-      break;
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_FW_TOO_BIG :
-      break;
-    case SFU_EXCPT_COM_ERROR :
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-    case SFU_EXCPT_HEADER_AUTH_FAILED :
-      break;
-    case SFU_EXCPT_DECRYPT_FAILURE :
-      break;
-    case SFU_EXCPT_SIGNATURE_FAILURE :
-      break;
-    case SFU_EXCPT_FLASH_ERROR :
-      break;
-    case SFU_EXCPT_FWIMG_MAGIC :
-      break;
-    case SFU_EXCPT_INCORRECT_VERSION :
-      break;
-    case SFU_EXCPT_UNKNOWN :
-      break;
-    default :
-      break;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Stop in case of security error
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-void SFU_EXCPT_Security_Error(void)
-{
-  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
-  HAL_Delay(1000);
-  /* This is the last operation executed. Force a System Reset. */
-  NVIC_SystemReset();
-}
-
-/**
-  * @brief  SFU Exception Initialization.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_EXCPT_Init(void)
-{
-  SFU_ErrorStatus e_ret_status;
-
-  /* ADD SRC CODE HERE
-       ...
-  */
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU Exception DeInitialization.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_EXCPT_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status;
-  /* ADD SRC CODE HERE
-      ...
-  */
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the Exception/Errors/Fault at reset,
-  *         after reading the stored values related to the last execution errors/status
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   this function is exported because the reset exceptions are also handled at boot time
-  *         when the last execution status is checked.
-  * @retval None
-  */
-void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-
-  switch (eExceptionId)
-  {
-
-    case SFU_EXCPT_WATCHDOG_RESET:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] WATCHDOG RESET FAULT!");
-      break;
-
-    default:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* As an example all the other errors/exceptions/fault retrieved at reset
-         and related to the previous execution can be managed at the same way of the
-         errors/exceptions/fault detected at runtime: See SFU_EXCPT_RuntimeExceptionHandler
-      */
-      break;
-  }
-}
-
-/**
-  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   A System Reset is forced at the end by the caller of this function.
-  *         WARNING: Be aware that this function can be called by an IRQ while
-  *         using the printf, since the printf is not a reentrant function, and using
-  *         the printf inside this function as well, a fault will likely occur.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  switch (eExceptionId)
-  {
-    case SFU_EXCPT_TAMPERING_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at runt-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TAMPERING FAULT!");
-      break;
-
-    case SFU_EXCPT_MEMORY_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at run-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] MEMORY FAULT!");
-      break;
-
-    case SFU_EXCPT_HARD_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at run-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] HARD FAULT!");
-#ifdef SFU_TEST_PROTECTION
-      SFU_TEST_Error();
-#endif /* SFU_TEST_PROTECTION */
-      break;
-
-    case SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-        Add your code here in order to implement a custom action for this event,
-        e.g. trigger a mass erase or take any other action in order to
-        protect your system.
-        ...
-        ...
-      */
-      TRACE("\r\n= [EXCPT] CHECK ON-RESET FAILED!");
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] CHECK FOR NEW FW DOWNLOAD FAILED!");
-      break;
-
-    case SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FW DOWNLOAD FAILED!");
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO CHECK THE FW STATUS. FAILURE!");
-      break;
-
-    case SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] USER FW DECRYPTION FAILED!");
-      break;
-
-
-    case SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] USER FW CANNOT BE VERIFIED. FAILURE!");
-      break;
-
-
-    case SFU_EXCPT_EXECUTE_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO EXECUTE THE NEW FW. FAILURE!");
-      break;
-
-    case SFU_EXCPT_UNKNOWN:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] UNKNOWN FAILURE!");
-      break;
-
-    case SFU_EXCPT_LOCK_SE_SERVICES_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] CANNOT CONFIGURE SECURE ENGINE TO RUN THE FIRMWARE!");
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_FW_TOO_BIG:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] BINARY IMAGE TOO BIG TO BE STORED IN DWL SLOT!");
-      break;
-
-    case SFU_EXCPT_COM_ERROR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] COM ERROR DURING DOWNLOAD !");
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_EXCPT_HEADER_AUTH_FAILED:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] HEADER AUTHENTICATION FAILURE!");
-      break;
-
-    case SFU_EXCPT_DECRYPT_FAILURE:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] DECRYPT FAILURE!");
-      break;
-
-    case SFU_EXCPT_SIGNATURE_FAILURE:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FIRMWARE SIGNATURE CHECK FAILED!");
-      break;
-
-    case SFU_EXCPT_FLASH_ERROR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FLASH ERROR!");
-      break;
-
-    case SFU_EXCPT_FWIMG_MAGIC:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] INTERNAL FWIMG ISSUE!");
-      break;
-
-
-    case SFU_EXCPT_INCORRECT_VERSION:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] INSTALLATION CANCELLED: FORBIDDEN VERSION!");
-      break;
-
-    default:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] UNKNOWN FAILURE!");
-      break;
-  }
-
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_error.h
deleted file mode 100644
index b7bb5e14..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_error.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_error.h
-  * @author  MCD Application Team
-  * @brief   This file contains the error handling elements for SB_SFU.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_ERROR_H
-#define SFU_ERROR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * This enum must start from 0.
-  * When adding a new error in the enum below please also:
-  *  1. update IS_SFU_EXCPT
-  *  2. update m_aErrorStrings
-  */
-typedef enum
-{
-  SFU_EXCPT_NONE = 0UL,
-  /* System errors */
-  SFU_EXCPT_WATCHDOG_RESET,
-  SFU_EXCPT_MEMORY_FAULT,
-  SFU_EXCPT_HARD_FAULT,
-  SFU_EXCPT_TAMPERING_FAULT,
-  SFU_EXCPT_CHECK_PROTECTIONS_ERR,
-  /* Generic errors derived from the FSM state */
-  SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR,
-  SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR,
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-  SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR,
-  SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR,
-  SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR,
-  SFU_EXCPT_EXECUTE_USER_FW_ERR,
-  /* Specific errors */
-  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
-  SFU_EXCPT_COM_ERROR,             /* COM error during the local download of the binary */
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-  SFU_EXCPT_HEADER_AUTH_FAILED,    /* header authentication failure */
-  SFU_EXCPT_DECRYPT_FAILURE,       /* Decrypt failure */
-  SFU_EXCPT_SIGNATURE_FAILURE,     /* Signature check failure */
-  SFU_EXCPT_FLASH_ERROR,           /* Problem with FLASH */
-  SFU_EXCPT_FWIMG_MAGIC,           /* Problem with a FWIMG pattern */
-  SFU_EXCPT_INCORRECT_VERSION,     /* Anti-rollback check rejected the version to be installed */
-  /* Unknown error */
-  SFU_EXCPT_UNKNOWN
-} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
-
-/* External variables --------------------------------------------------------*/
-#ifdef SFU_DEBUG_MODE
-#if defined (SFU_BOOT_C)
-
-/**
-  *  The following strings associated to the exceptions/errors are used for debugging purpose.
-  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
-  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
-  */
-char *m_aErrorStrings[] =       {  "No error. Success.",
-                                   "Watchdog error.",
-                                   "Memory fault.",
-                                   "Hard fault.",
-                                   "Tampering fault.",
-                                   "Check protections error.",
-                                   "Check status on reset error.",
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-                                   "Check new user fw to download error.",
-                                   "Download new user fw error.",
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-                                   "Verify user fw status error.",
-                                   "Decrypt user fw error.",
-                                   "Install user fw error.",
-                                   "Verify user fw signature.",
-                                   "Resume install new user fw error.",
-                                   "Execute user fw error.",
-                                   "Max. Consecutive Errors reached.",
-                                   "SE lock cannot be set.",
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-                                   "Inconsistent FW size.",
-                                   "FW too big.",
-                                   "YMODEM com failure.",
-                                   "File not correctly received.",
-                                   "Header authentication failed.",
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-                                   "Decrypt failure.",
-                                   "Signature check failure.",
-                                   "Incorrect binary format (not encrypted).",
-                                   "Flash error.",
-                                   "FWIMG pattern issue.",
-                                   "Error while swapping the images in slot #0 and slot #1.",
-                                   "Firmware version rejected by anti-rollback check.",
-                                   "Unknown error."
-                                };
-
-#endif /* SFU_BOOT_C */
-#endif /* SFU_DEBUG_MODE */
-
-/* Exported macros -----------------------------------------------------------*/
-#define IS_SFU_EXCPT(EXCPT)  (SFU_EXCPT_Check_Code((EXCPT)) == SFU_SUCCESS) /*!< Check validity of exception Id */
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_BOOT_SetLastExecError(uint32_t uLastExecError);
-void SFU_BOOT_StateExceptionHandler(SFU_BOOT_StateMachineTypeDef eStateMachineState);
-void SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-SFU_ErrorStatus SFU_EXCPT_Check_Code(SFU_EXCPT_IdTypeDef eExceptionId);
-void SFU_EXCPT_Security_Error(void);
-
-SFU_ErrorStatus SFU_EXCPT_Init(void);
-SFU_ErrorStatus SFU_EXCPT_DeInit(void);
-
-void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_ERROR_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_common.c
deleted file mode 100644
index 3462933d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_common.c
+++ /dev/null
@@ -1,1003 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_common.c
-  * @author  MCD Application Team
-  * @brief   This file provides set of firmware functions to manage the Firmware Images.
-  *          This file contains the "common" functionalities of the image handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_FWIMG_COMMON_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "main.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "sfu_low_level.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "sfu_interface_crypto_scheme.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_fwimg_services.h"
-#include "sfu_fwimg_internal.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
-
-/* Global variables ----------------------------------------------------------*/
-/**
-  *  FWIMG status variables used to log errors and display debug messages.
-  *  This is related to FLASH operations.
-  *  This is handled with STATUS_FWIMG.
-  */
-SFU_IMG_StatusTypeDef SFU_IMG_Status;
-uint32_t SFU_IMG_Line;
-
-/**
-  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
-  */
-SE_FwRawHeaderTypeDef fw_image_header_validated;
-
-#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-/**
-  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
-  */
-SE_FwRawHeaderTypeDef fw_image_header_to_test;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-
-/* Functions Definition : helper ---------------------------------------------*/
-/**
-  * @brief  Memory compare with constant time execution.
-  * @note   Objective is to avoid basic attacks based on time execution
-  * @param  pAdd1 Address of the first buffer to compare
-  * @param  pAdd2 Address of the second buffer to compare
-  * @param  Size Size of the comparison
-  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
-  */
-SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
-{
-  uint8_t result = 0x00U;
-  uint32_t i;
-
-  for (i = 0U; i < Size; i++)
-  {
-    result |= pAdd1[i] ^ pAdd2[i];
-  }
-
-  if (result == 0x00U)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-}
-
-
-/**
-  * @brief  Check header signature
-  * @param  pFwImageHeader: pointer to raw header.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef se_status;
-  uint8_t result = 0x00U;
-  uint32_t i;
-
-  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
-  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
-  {
-    /* Unused bytes should be set at 0x00 value
-       Comparison with constant time execution */
-    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
-    {
-      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
-    }
-
-    if (result == 0x00U)
-    {
-      /* Check signature of the FW header */
-      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
-      {
-        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
-  *        It handles Firmware TAG verification of a complete buffer by calling
-  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
-  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
-  *        and at the end compare the obtained TAG with the one provided as input
-  *        in pSE_GMCInit parameter.
-  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
-  * @param pSE_Status: Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param SlotNumber index of the slot in the list
-  * @param pSE_Metadata: Firmware metadata.
-  * @param pSE_Payload: pointer to Payload Buffer descriptor.
-  * @param SE_FwType: Type of Fw Image.
-  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
-                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
-                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
-{
-  SE_ErrorStatus se_ret_status = SE_ERROR;
-  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
-  /* Loop variables */
-  uint32_t i;
-  uint32_t j;
-  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
-  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
-  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
-  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
-  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
-  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(4)));
-  /* FW chunk produced by the verification procedure if any   */
-  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(4)));
-  /* FW chunk provided as input to the verification procedure */
-  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(4)));
-  /* Variables to handle the FW image (this will be split in chunks) */
-  uint32_t payloadsize;
-  uint32_t ppayload;
-  uint32_t scatter_nb;
-  /* Variables to handle FW image size and tag */
-  uint32_t fw_size;
-  uint8_t *fw_tag;
-
-  /* Check the pointers allocation */
-  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
-  {
-    return SFU_ERROR;
-  }
-  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Check the parameters value and set fw_size and fw_tag to check */
-  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
-  {
-    fw_size = pSE_Metadata->FwSize;
-    fw_tag = pSE_Metadata->FwTag;
-  }
-  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
-  {
-    fw_size = pSE_Metadata->PartialFwSize;
-    fw_tag = pSE_Metadata->PartialFwTag;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-   
-  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
-  {
-    return SFU_ERROR;
-  }
-
-  /*  fix number of scatter block */
-  if (pSE_Payload->PayloadSize[1] != 0U)
-  {
-    scatter_nb = 2U;
-  }
-  else
-  {
-    scatter_nb = 1U;
-  }
-
-
-  /* Encryption process*/
-  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
-
-  /* check for initialization errors */
-  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-  {
-    for (j = 0; j < scatter_nb; j++)
-    {
-      payloadsize = pSE_Payload->PayloadSize[j];
-      ppayload = pSE_Payload->pPayload[j];
-      i = 0;
-      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
-
-      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
-             (sfu_ret_status == SFU_SUCCESS))
-      {
-
-        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
-        if (sfu_ret_status == SFU_SUCCESS)
-        {
-          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
-                                                   fw_chunk, (int32_t *)&fw_chunk_size);
-        }
-        else
-        {
-          *pSeStatus = SE_ERR_FLASH_READ;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-        }
-        ppayload += fw_chunk_size;
-        fw_verified_total_size += fw_chunk_size;
-        i++;
-      }
-      /* this the last path , size can be smaller */
-      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
-      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-      {
-        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
-        if (sfu_ret_status == SFU_SUCCESS)
-        {
-
-          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
-                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)), 
-                                                   fw_chunk, (int32_t *)&fw_chunk_size);
-        }
-        else
-        {
-          *pSeStatus = SE_ERR_FLASH_READ;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-        }
-        fw_verified_total_size += fw_chunk_size;
-      }
-    }
-  }
-
-  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-  {
-    if (fw_verified_total_size <= fw_size)
-    {
-      /* Do the Finalization, check the authentication TAG*/
-      fw_tag_len = sizeof(fw_tag_output);
-      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
-
-      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
-      {
-        /* Firmware tag verification */
-        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
-        {
-          *pSeStatus = SE_SIGNATURE_ERR;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-
-          /* Save result for active slot :
-             to avoid single fault attack the signature will be double checked before UserApp execution */
-          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
-          {
-            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
-          }
-        }
-        else
-        {
-          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
-
-          /* Save result for active slot :
-             to avoid single fault attacje the signature will be doble checked before UserApp execution */
-          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
-          {
-            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag, SE_TAG_LEN);
-          }
-        }
-      }
-      else
-      {
-        sfu_ret_status = SFU_ERROR;
-      }
-    }
-    else
-    {
-      sfu_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    sfu_ret_status = SFU_ERROR;
-  }
-  return sfu_ret_status;
-}
-
-/**
-  * @brief Fill authenticated info in SE_FwImage.
-  * @param SFU_APP_Status
-  * @param pBuffer
-  * @param BufferSize
-  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
-{
-  /* Check the pointers allocation */
-  if ((pFwHeader == NULL) || (pBuffer == NULL))
-  {
-    return SFU_ERROR;
-  }
-  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Verify Image Header in the slot given as a parameter
-  * @param  SlotNumber index of the slot in the list
-  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
-  * @note   Not used in Alpha version -
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* use api read to detect possible ECC error */
-  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
-                                   sizeof(SE_FwRawHeaderTypeDef));
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Verify signature */
-    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Verify Fw signature of binary contiguous in flash
-  * @param  pSeStatus pointer giving the SE status result
-  * @param  SlotNumber flash slot to check
-  * @param  pFwImageHeader pointer to fw header
-  * @param  SlotNumber flash slot to check
-  * @param SE_FwType: Type of Fw Image.
-  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
-                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
-                                  uint32_t SE_FwType)
-{
-  SE_Ex_PayloadDescTypeDef  pse_payload;
-  uint32_t fw_size;
-  uint32_t fw_offset;
-
-  /*  put it OK, to discriminate error in SFU FWIMG parts */
-  *pSeStatus = SE_OK;
-
-  /* Check the parameters value */
-  if (pFwImageHeader == NULL)
-  {
-    return SFU_ERROR;
-  }
-  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Check SE_FwType parameter, and fix size and offset accordingly */
-  switch (SE_FwType)
-  {
-    case SE_FW_IMAGE_COMPLETE :
-      fw_size = pFwImageHeader->FwSize;
-      fw_offset = 0U;
-      break;
-    case SE_FW_IMAGE_PARTIAL :
-      fw_size = pFwImageHeader->PartialFwSize;
-      fw_offset = pFwImageHeader->PartialFwOffset;
-      break;
-    default :
-      /* error */
-      fw_size = 0U;
-      fw_offset = 0U;   
-      break;      
-  }
-
-  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
-  pse_payload.PayloadSize[0] = fw_size;
-  pse_payload.pPayload[1] = 0U;
-  pse_payload.PayloadSize[1] = 0U;
-
-  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
-}
-
-/**
-  * @brief Verifies the validity of a slot.
-  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
-  * @param pSlotBegin Start address of a slot.
-  * @param uSlotSize Size of a slot.
-  * @param uFwSize Size of the firmware image.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_LL_FLASH_write_t pattern1;
-  SFU_LL_FLASH_write_t pattern2;
-  SFU_LL_FLASH_write_t value;
-  uint32_t pdata;
-  uint32_t fw_size;
-  uint32_t slot_begin;
-
-  /* Set dimension to the appropriate length for FLASH programming.
-   * Example: 64-bit length for L4.
-   */
-  if ((uFwSize % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
-  {
-    fw_size = uFwSize + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (uFwSize % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-  }
-  else
-  {
-    fw_size = uFwSize;
-  }
-
-  /* Clean-up pattern initialization */
-  (void) memset((void *)&pattern1, 0xFF, sizeof(SFU_LL_FLASH_write_t));
-  (void) memset((void *)&pattern2, 0x00, sizeof(SFU_LL_FLASH_write_t));
-
-  /* Clean-up Check operation */
-  slot_begin = (uint32_t) pSlotBegin;
-  for (pdata = slot_begin + SFU_IMG_IMAGE_OFFSET + fw_size; 
-      (pdata < (slot_begin + uSlotSize)) && (e_ret_status == SFU_SUCCESS);
-       pdata += sizeof(SFU_LL_FLASH_write_t))
-  {
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check is already clean */
-      if ((memcmp((void *) &value, (void *) &pattern1, sizeof(SFU_LL_FLASH_write_t)) != 0) &&
-          (memcmp((void *) &value, (void *) &pattern2, sizeof(SFU_LL_FLASH_write_t)) != 0))
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    /* Reload watchdoag every 64Kbytes */
-    if ((pdata % 0x10000U) == 0U)
-    {
-      (void) SFU_LL_SECU_IWDG_Refresh();
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function clean-up the flash
-  * @note   Not designed to clean-up area inside secure engine isolation.
-  * @note   To clean the slot without erasing the header we write "0x00" except if already written
-  * @param  pSlotBegin Start address of a slot.
-  * @param  uSlotSize Size of a slot.
-  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t pdata;
-  uint32_t slot_begin;
-  SFU_LL_FLASH_write_t pattern;
-  SFU_LL_FLASH_write_t value;
-  SFU_FLASH_StatusTypeDef flash_if_info;
-
-  /* Clean-up pattern initialization */
-  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
-
-  /* Cleaning operation */
-  slot_begin = (uint32_t) pSlotBegin;
-  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
-  {
-    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* If read succeed, then the pattern write is performed only if pattern is not already present */
-      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
-      {
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
-                                          sizeof(SFU_LL_FLASH_write_t));
-      }
-    }
-    else
-    {
-      /* If read fail, then the write is performed unconditionally */
-      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
-                                        sizeof(SFU_LL_FLASH_write_t));
-    }
-
-    /* Reload Watchdog every 4Kbytes */
-    if ((pdata % 0x1000U) == 0U)
-    {
-      (void) SFU_LL_SECU_IWDG_Refresh();
-    }
-  }
-  return e_ret_status;
-}
-
-/* Functions Definition : services ------------------------------------------- */
-
-/**
-  * @brief FW Image Handling (FWIMG) initialization function.
-  *        Checks the validity of the settings related to image handling (slots size and alignments...).
-  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
-  *        used...etc...).
-  *        Must be called first (and once) before calling the other Image handling services.
-  * @param  None.
-  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
-  */
-SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
-{
-  uint32_t i;
-  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
-
-  /*
-   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
-   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
-   * starting with 0s.
-   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
-   * side-effects).
-   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
-   */
-  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
-
-  /*
-   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
-      {
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
-              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
-      } /* else active slot is properly aligned */
-    }
-  }
-
-
-  /*
-   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
-   */
-  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
-  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
-
-  /*
-   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
-   */
-  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
-  } /* else the FW Header Length is fine with regards to FLASH constraints */
-
-
-  /*
-   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if (((SlotStartAdd[SLOT_ACTIVE_1 + i] - FLASH_BASE) / FLASH_PAGE_SIZE) <= SFU_PROTECT_WRP_PAGE_END_1)
-      {
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-
-
-
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
-   */
-  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
-        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
-  {
-    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-  }
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
-            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
-      {
-        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-
-
-  return e_ret_status;
-}
-
-/**
-  * @brief This function makes sure the current active firmware will not be considered as valid any more.
-  *        This function alters the FLASH content.
-  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *       running the procedure).
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Reload Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
-  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief Verifies the validity of the active firmware image metadata.
-  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
-  *       elements have been configured.
-  * @note This function populates the FWIMG module variable: fw_image_header_validated
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
-{
-  /*
-   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
-   */
-  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
-}
-
-/**
-  * @brief Verifies the validity of the active firmware image.
-  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
-  *       elements have been configured.
-  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
-  *       fw_image_header_validated.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status = SE_KO;
-
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (SFU_ERROR == e_ret_status)
-  {
-    /* We do not memorize any specific error, the FSM state is already providing the info */
-    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
-  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
-{
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
-}
-
-/**
-  * @brief Verifies if no malicious code in active slot.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
-{
-  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
-}
-
-/**
-  * @brief  Control firmware signature
-  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
-{
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
-                    SE_TAG_LEN) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  else
-  {
-    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
-    return SFU_SUCCESS;
-  }
-
-}
-
-/**
-  * @brief Launches the user application.
-  *        The caller must be prepared to never get the hand back after calling this function.
-  *        If a problem occurs, it must be memorized in the bootinfo area.
-  *        If the caller gets the hand back then this situation must be handled as a critical error.
-  * @note It is up to the caller to make sure the conditions to call this primitive are met
-  *       (typically: no security check performed before launching the firmware).
-  * @note This function only handles the "system" aspects.
-  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
-  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
-  *       function (as this needs to be done just before jumping into the user application).
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Verify if authentication/integrity/lock SE service performed */
-  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
-
-  uint32_t jump_address ;
-  typedef void (*Function_Pointer)(void);
-  Function_Pointer  p_jump_to_function;
-
-#if defined(SFU_MPU_PROTECT_ENABLE)
-#if defined(SFU_MPU_USERAPP_ACTIVATION)
-  e_ret_status = SFU_LL_SECU_SetProtectionMPU_UserApp();
-#else
-  HAL_MPU_Disable();
-#endif /* SFU_MPU_USERAPP_ACTIVATION */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-  jump_address = *(__IO uint32_t *)((SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET + 4));
-  /* Jump to user application */
-  p_jump_to_function = (Function_Pointer) jump_address;
-  /* Initialize user application's Stack Pointer */
-  __set_MSP(*(__IO uint32_t *)(SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET));
-
-  /* Configure active slot area in execution mode if required (external flash) */
-  if (SFU_SUCCESS == e_ret_status)
-  {    
-    e_ret_status = SFU_LL_FLASH_Config_Exe(SlotNumber);
-  }
-
-  if (SFU_SUCCESS == e_ret_status)
-  {    
-    /* JUMP into User App */
-    p_jump_to_function();
-  }
-
-  /* The point below should NOT be reached */
-  return (e_ret_status);
-}
-
-/**
-  * @brief Get the version of the active FW
-  * @note It is up to the caller to make sure the active slot contains a valid active FW.
-  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
-  *       fails.
-  * @param  SlotNumber index of the slot in the list
-  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
-  */
-uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
-{
-  SE_FwRawHeaderTypeDef fw_image_header;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint16_t version = 0;
-
-  /* check the header of the active FW */
-  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* retrieve the version from the header without any further check */
-    version = fw_image_header.FwVersion;
-  }
-
-  return (version);
-}
-
-/**
-  * @brief Detect if a FW is present in a slot.
-  * @note  Detection done based on MAGIC header + FW signature. Header verification
-  *        not done at this stage for timing optimization.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *pbuffer;
-  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
-  SE_FwRawHeaderTypeDef *p_header;
-
-  /* Read header */
-  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
-  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
-  {
-    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
-    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
-    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
-    {
-      /*
-       * Control if the first 32 bytes (could be more but time consuming ...) are significants
-       * At this location we should find the vector table.
-       * Objective is to detect if the FW image has been erased
-       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
-       */
-      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Validate the active FW image in active slot by installing the header
-  * @param  SlotNumber index of the slot in the list
-  * @param  pFwImageHeader pointer in ram to the header to install
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-
-SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
-{
-#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-
-  /* Header writing: encrypted part with signature */
-  e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
-                                    SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-
-  /* Header writing : Do not update image state part */
-
-  /* Header writing: previous FW image fingerprint */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
-                                                                 SE_FW_HEADER_FINGERPRINT_LEN),
-                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-  }
-  return e_ret_status;
-#else
-  /* Nothing to do header already written */
-  return SFU_SUCCESS;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-}
-
-/**
-  * @brief  Get firmware image ID from header.
-  * @param  pFwImageHeader pointer to a structure to handle the header info
-  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
-  */
-uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  uint32_t active_slot;
-
-  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_1;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
-  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_2;
-  }
-#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
-  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_3;
-  }
-#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
-  else
-  {
-    active_slot = SLOT_INACTIVE;
-  }
-
-  return active_slot;
-}
-
-/**
-  * @brief  Check candidate image version is allowed.
-  * @param  CurrentVersion Version of currently installed image if any
-  * @param  CandidateVersion Version of candidate image
-  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint16_t CurrentVersion, uint16_t CandidateVersion)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-
-  /* If the headre of the active firmware is not valid, the CurrentVersion is 0 */
-  if (CurrentVersion == 0U)
-  {
-    /*
-     * If the header of the active firmware is not valide (could comes from an attak atempt, we authorize only the 
-     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
-     */
-     if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
-     {
-       /* Candidate version is allowed */
-       e_ret_status = SFU_SUCCESS;
-     }
-  }
-  else
-  {
-    /*
-     * It is not allowed to install a Firmware with a lower version than the active firmware.
-     * But we authorize the re-installation of the current firmware version.
-     * We also check that the candidate version is at least the min. allowed version for this device.
-     */
-    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
-    {
-      /* Candidate version is allowed */
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_internal.h
deleted file mode 100644
index a09e993b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_internal.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_internal.h
-  * @author  MCD Application Team
-  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
-  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
-  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
-  *          fw_image_header_to_test to install an KMS blob.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_INTERNAL_H
-#define SFU_FWIMG_INTERNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_fwimg_regions.h"
-#include "kms_blob_metadata.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Payload Buffer descriptor.
-  * This structure describes how a Firmware is split in Flash.
-  * In the nominal case a Firmware is stored in 1 contiguous area.
-  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
-  * decrypt operation).
-  */
-typedef struct
-{
-  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
-  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
-} SE_Ex_PayloadDescTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief SFU_IMG Flash Status Type Definition
-  * Status of a FLASH operation.
-  */
-typedef enum
-{
-  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
-  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
-  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
-  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
-} SFU_IMG_StatusTypeDef;
-
-/**
-  * @brief RAM chunk used for decryption / comparison / swap
-  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
-  * some function allocates 2 buffer of this size in stack.
-  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
-  */
-#define VALID_SIZE (3U*MAGIC_LENGTH)
-#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
-
-#define SFU_IMG_CHUNK_SIZE  (512UL)
-#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
-
-/* Exported macros -----------------------------------------------------------*/
-/**
-  * @brief  Status Macro
-  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
-  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
-  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
-  * activated) and the execution continues.
-  */
-#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
-#define STATUS_FWIMG(B,A) if (B) { \
-                                   SFU_IMG_Status=A; \
-                                   SFU_IMG_Line = __LINE__; \
-                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
-                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
-                                   while(1==1){;} \
-                                 } while(0==1){;}
-#else
-#define STATUS_FWIMG(B,A) if (B) { \
-                                   SFU_IMG_Status=A; \
-                                   SFU_IMG_Line = __LINE__; \
-                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
-                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
-                                 } while(0==1){;}
-#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
-
-/* External variables --------------------------------------------------------*/
-/**
-  *  FWIMG status variables used to log errors and display debug messages.
-  *  This is related to FLASH operations.
-  *  This is handled with STATUS_FWIMG.
-  */
-extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
-extern uint32_t SFU_IMG_Line;
-
-extern SE_FwRawHeaderTypeDef fw_image_header_validated;
-#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-
-/* Exported functions : helper ---------------------------------------------- */
-SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
-SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
-                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
-                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
-SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
-                          uint8_t  *pPayload, uint32_t SE_FwType);
-SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
-SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
-                                  uint32_t SE_FwType);
-SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
-SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_INTERNAL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_regions.h
deleted file mode 100644
index c4d0c847..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_regions.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_regions.h
-  * @author  MCD Application Team
-  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_REGIONS_H
-#define SFU_FWIMG_REGIONS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_sfu.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_fwimg.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-#include "se_crypto_config.h"
-
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  *  Slot list : 2 slots per image configuration + swap
-  */
-#define NB_SLOTS      4U
-#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
-#define SLOT_ACTIVE_1 1U
-#define SLOT_DWL_1    2U
-#define SLOT_SWAP     3U
-
-
-/* Calculation of the size of a slot */
-#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
-
-/*
- * Design constraint: the image slot size must be a multiple of the swap area size.
- * And of course both image slots must have the same size.
- */
-#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
-
-/*
- * Checking that the slot sizes are consistent with the .icf file
- * Sizes expressed in bytes (+1 because the end address belongs to the slot)
- * The checks are executed at runtime in the SFU_Img_Init() function.
- */
-#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
-
-/**
-  * Image starting offset to add to the  address of 1st block
-  */
-#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
-
-
-/* External variables --------------------------------------------------------*/
-extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
-extern const uint32_t  SlotStartAdd[NB_SLOTS];
-extern const uint32_t  SlotEndAdd[NB_SLOTS];
-
-#if defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C) || defined(SFU_LOADER_C)
-
-const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
-                                            SLOT_ACTIVE_1_HEADER,
-                                            SLOT_BLOB_DWL_1_START,
-                                            0U,
-                                          };
-/* List of slot start address */
-const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
-                                            SLOT_ACTIVE_1_START,
-                                            SLOT_BLOB_DWL_1_START,
-                                            0U,
-                                          };
-/* List of slot end address */
-const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
-                                            SLOT_ACTIVE_1_END,
-                                            SLOT_BLOB_DWL_1_END,
-                                            0U,
-                                          };
-#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_REGIONS_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_services.h
deleted file mode 100644
index 3cff72a2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fwimg_services.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_services.h
-  * @author  MCD Application Team
-  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
-  *          API definitions.
-  *          These services can be called by the bootloader to deal with images handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_SERVICES_H
-#define SFU_FWIMG_SERVICES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU_IMG Initialization Status Type Definition
-  */
-typedef enum
-{
-  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
-  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
-  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
-  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
-  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
-  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
-} SFU_IMG_InitStatusTypeDef;
-
-/**
-  * @brief  SFU_IMG Image Installation State Type Definition
-  */
-typedef enum
-{
-  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
-  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
-  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
-  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
-} SFU_IMG_ImgInstallStateTypeDef;
-
-/* Exported functions ------------------------------------------------------- */
-SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
-SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
-#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall);
-#else
-SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
-                                                                uint32_t *pActiveSlotToResume, \
-                                                                uint32_t *pActiveSlotToRollback);
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
-SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
-SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber);
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
-uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
-uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
-SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
-uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint16_t CurrentVersion, uint16_t CandidateVersion);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_SERVICES_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c
deleted file mode 100644
index 0b3acd0b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_interface_crypto_scheme.c
-  * @author  MCD Application Team
-  * @brief   Secure Engine Interface module.
-  *          This file provides set of firmware functions to manage SE Interface
-  *          functionalities. These services are used by the bootloader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
-#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
-                               STM32 board specificities */
-#include "tkms.h"
-#include "sfu_interface_crypto_scheme.h"
-#include <string.h>
-#include "kms_platf_objects_interface.h"
-
-/* Private defines -----------------------------------------------------------*/
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-#define GCM_TAGBITS_SIZE          128
-#define GCM_IVLEN_BITS            16
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-/* Private variables ---------------------------------------------------------*/
-CK_SESSION_HANDLE EncryptSession;
-CK_SESSION_HANDLE DecryptSession;
-CK_SESSION_HANDLE AuthenticateSession;
-CK_SESSION_HANDLE VerifySession;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-static uint8_t *gcm_tag_header;
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Get AES key handle.
-  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
-  * @param  phAESKey pointer on AES key object handle
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  /* Identify the slot number */
-  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 2) */
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-/**
-  * @brief  Get ECDSA key handle.
-  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
-  * @param  phAESKey pointer on AES key object handle
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  /* Identify the slot number */
-  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 2) */
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
-
-
-/**
-  * @brief Secure Engine Decrypt Init function.
-  *        It is a wrapper of Decrypt_Init function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  CK_RV rv = CKR_OK;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    NULL,
-    0,
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-  gcm_tag_header = pxSE_Metadata->FwTag;
-
-#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  CK_RV rv = CKR_OK;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_MECHANISM cktest_aes_cbc_mechanism =
-  {
-    CKM_AES_CBC,
-    iv_cbc,
-    SE_IV_LEN
-  };
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /*
-   * In this crypto scheme the Firmware is not encrypted.
-   * The Decrypt operation is called anyhow before installing the firmware.
-   * Indeed, it allows moving the Firmware image blocks in FLASH.
-   * These moves are mandatory to create the appropriate mapping in FLASH
-   * allowing the swap procedure to run without using the swap area at each and every move.
-   *
-   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
-   */
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointer allocation */
-  if (pxSE_Metadata == NULL)
-  {
-    return SE_ERROR;
-  }
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /* Nothing to do as we won't decrypt anything */
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Decrypt Append function.
-  *        It is a wrapper of Decrypt_Append function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pInputBuffer pointer to Input Buffer.
-  * @param uInputSize Input Size (bytes).
-  * @param pOutputBuffe pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
-                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  CK_RV rv = CKR_OK;
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
-  if (0 == InputSize)
-  {
-    /* Nothing to do but we must return a success for the decrypt operation to continue */
-    return (SE_SUCCESS);
-  }
-
-  /* Check the pointers allocation */
-  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  /* Buffer decryption */
-  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /*
-   * The firmware is not encrypted.
-   * The only thing we need to do is to recopy the input buffer in the output buffer
-   */
-  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
-  *pOutputSize = InputSize;
-  se_status = SE_SUCCESS;
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Decrypt Finish function.
-  *        It is a wrapper of Decrypt_Finish function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  *peSE_Status = SE_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  CK_RV rv = CKR_OK;
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  /* Check the pointers allocation */
-  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  memcpy(pOutputBuffer, gcm_tag_header, 16);
-
-  /* End-up decryption session */
-  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /* Nothing to do */
-  se_status = SE_SUCCESS;
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Close the session */
-  rv = C_CloseSession(DecryptSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Init function.
-  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
-                                       uint32_t SE_FwType)
-{
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  CK_RV rv = CKR_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
-  CK_OBJECT_HANDLE hAESKey;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    NULL,
-    0,
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  CK_MECHANISM cktest_sha_256_mechanism =
-  {
-    CKM_SHA256,
-    NULL,
-    0
-  };
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointer allocation */
-  if (pxSE_Metadata == NULL)
-  {
-    return SE_ERROR;
-  }
-
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize encryption session  */
-  rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* Digest initialization */
-  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Append function.
-  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pInputBuffer pointer to Input Buffer.
-  * @param uInputSize Input Size (bytes).
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
-                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  CK_RV rv = CKR_OK;
-
-  /* Check the pointers allocation */
-  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Buffer encryption */
-  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
-                       (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* Digest calculation */
-  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Finish function.
-  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  CK_RV rv = CKR_OK;
-
-  /* Check the pointers allocation */
-  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* End-up encryption session */
-  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* End-up Digest calculation */
-  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Close the session */
-  rv = C_CloseSession(AuthenticateSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Verify Raw Fw Header Tag.
-  *        It verifies the signature of a raw header file.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pFwRawHeader pointer to RawHeader Buffer.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
-{
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  CK_RV rv = CKR_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  int32_t fw_raw_header_output_length = SE_TAG_LEN;
-  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
-  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    (CK_BYTE_PTR)gcm_header,
-    ((int32_t)SE_FW_AUTH_LEN),
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
-       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-
-  const uint8_t *pPayload;                        /* Metadata payload */
-  int32_t payloadSize;                            /* Metadata length to be considered for hash */
-  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
-  CK_OBJECT_HANDLE hECDSAKey = 0UL;
-  CK_MECHANISM cktest_ecdsa_256_mechanism =
-  {
-    CKM_ECDSA_SHA256,
-    NULL,
-    0
-  };
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointers allocation */
-  if (NULL == pxFwRawHeader)
-  {
-    *peSE_Status = SE_KO;
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  gcm_tag_header = pxFwRawHeader->HeaderSignature;
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up decryption session  : control if the tag is correct */
-  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
-
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
-       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-
-  pPayload = (const uint8_t *)pxFwRawHeader;
-  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
-
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize the verification process */
-  rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up verification process : control if the signature is correct */
-  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-  /* Close the session */
-  rv = C_CloseSession(VerifySession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-
-  return se_status;
-
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_loader.c
deleted file mode 100644
index 8df9adb7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_loader.c
+++ /dev/null
@@ -1,811 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_loader.c
-  * @author  MCD Application Team
-  * @brief   Secure Firmware Update LOADER module.
-  *          This file provides set of firmware functions to manage SFU local
-  *          loader functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include "main.h"
-#include "sfu_loader.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "sfu_com_loader.h"
-#include "sfu_trace.h"
-#include "se_interface_bootloader.h" /* for metadata authentication */
-#include "sfu_interface_crypto_scheme.h"
-#include "sfu_fwimg_services.h"      /* for version checking & to check if a valid FW is installed (the local
-                                        bootloader is a kind of "application" running in SB_SFU) */
-#include "app_sfu.h"
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t
-fw_decrypted_chunk[SFU_COM_YMODEM_PACKET_1K_SIZE];/*!< Buffer used for decryption during reception process */
-static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
-static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
-static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
-static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
-static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
-static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
-static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
-static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize the SFU LOADER.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_Init(void)
-{
-  /*
-  * ADD SRC CODE HERE
-  */
-
-  /*
-   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
-   * when doing a length alignment before writing in FLASH.
-   */
-  if (0U != (uint32_t)(sizeof(fw_decrypted_chunk) % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The decrypt buffer must be a multiple of the FLASH write length  */
-    TRACE("\r\n= [FWIMG] Decrypt buffer size (%d) is not matching the FLASH constraints", sizeof(fw_decrypted_chunk));
-    return SFU_ERROR;
-  } /* else the FW Header Length is fine with regards to FLASH constraints */
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  DeInitialize the SFU LOADER.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_DeInit(void)
-{
-  /*
-   * ADD SRC CODE HERE
-   */
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Download a new User Fw.
-  *         Writes firmware received via Ymodem in FLASH.
-  * @param  peSFU_LOADER_Status: SFU LOADER Status.
-  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
-  * @param  p_DwlSlot identification of the downloaded area
-  * @param  p_Size Size of the downloaded image.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
-                                             uint32_t *pSize)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
-  SE_StatusTypeDef e_se_status;
-  int32_t fw_tag_len = 0;
-  uint8_t fw_tag_output[SE_TAG_LEN];
-
-  /* Check the pointers allocation */
-  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Refresh Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* Transfer FW Image via YMODEM protocol */
-  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
-
-  /* Initialize global variables to be used during the YMODEM process */
-  m_uDwlAreaAddress = 0U;
-  m_uDwlAreaStart = 0U;
-  m_uDwlAreaSize = 0U;
-  m_uFileSizeYmodem = 0U;
-  m_uNbrBlocksYmodem = 0U;
-  m_uPacketsReceived = 0U;
-  m_uDwlSlot = SLOT_ACTIVE_1;
-  m_LoaderStatus = SFU_LOADER_ERR_COM;
-
-  /* Receive the FW in RAM and write it in the Flash*/
-  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
-  {
-    if (*pSize > 0U)
-    {
-      /* File download correct*/
-      m_LoaderStatus = SFU_LOADER_OK;
-    }
-  }
-  else
-  {
-    /* Nothing to do : m_LoaderStatus updated during during YModem process */
-  }
-
-  /* Provide slot information to the caller
-     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
-     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
-  *pDwlSlot = m_uDwlSlot;
-
-  if (m_LoaderStatus == SFU_LOADER_OK)
-  {
-    /* End of decryption process */
-    fw_tag_len = sizeof(fw_tag_output);
-    if (SE_Decrypt_Finish(&e_se_status, fw_tag_output, &fw_tag_len) != SE_SUCCESS)
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-
-    }
-    else if (e_se_status != SE_OK)
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-    }
-    else
-    {
-      /* Nothing */
-    }
-  }
-
-  *peSFU_LOADER_Status = m_LoaderStatus;
-  if (m_LoaderStatus == SFU_LOADER_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Ymodem Header Packet Transfer completed callback.
-  * @param  uFileSize: Dimension of the file that will be received.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
-{
-  /*Reset of the ymodem variables */
-  m_uFileSizeYmodem = 0U;
-  m_uPacketsReceived = 0U;
-  m_uNbrBlocksYmodem = 0U;
-
-  /*Filesize information is stored*/
-  m_uFileSizeYmodem = uFileSize;
-
-  /*Compute the number of blocks */
-#ifndef MINICOM_YMODEM
-  /* Teraterm sends 1kB YMODEM packets */
-  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
-#else
-  /* Minicom sends 128 bytes YMODEM packets */
-  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
-#endif /* MINICOM_YMODEM */
-
-  /* NOTE : delay inserted for Ymodem protocol*/
-  HAL_Delay(1000U);
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Ymodem Data Packet Transfer completed callback.
-  * @param  pData: Pointer to the buffer.
-  * @param  uSize: Packet dimension.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-#ifndef MINICOM_YMODEM
-/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
-SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-  /* The local loader must make a copy of the Firmware metadata,
-   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
-   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
-  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(4)));
-  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
-  static uint32_t m_uDwlImgSize = 0U;
-
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_FLASH_StatusTypeDef x_flash_info;
-  uint32_t rx_size = uSize;
-  uint8_t *p_data = pData;
-  uint32_t uOldSize;
-  int32_t fw_decrypted_chunk_size;
-  SE_StatusTypeDef e_se_status = SE_KO;
-
-  /* Check the pointers allocation */
-  if (p_data == NULL)
-  {
-    return SFU_ERROR;
-  }
-    
-  /*Increase the number of received packets*/
-  m_uPacketsReceived++;
-
-  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    /*Extracting actual payload from last packet*/
-    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
-    {
-      /* The last packet must be fully considered */
-      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
-    }
-    else
-    {
-      /* The last packet is not full, drop the extra bytes */
-      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
-                                   SFU_COM_YMODEM_PACKET_1K_SIZE);
-    }
-  }
-
-  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
-  if (m_uPacketsReceived == 1U)
-  {
-
-    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
-
-    /* Verify header */
-    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress = m_uDwlAreaStart;
-
-      /* Downloaded Image size : Header size + Image size */
-      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
-    }
-
-    /* Clear Download application area (including TRAILERS area) */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
-          SFU_SUCCESS)
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    /* Initialize decryption process */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS)
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-        e_ret_status = SFU_ERROR;
-      }
-      else if (e_se_status != SE_OK)
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-        e_ret_status = SFU_ERROR;
-      }
-      else
-      {
-        /* Store FW image header in Flash */
-        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, SE_FW_HEADER_TOT_LEN) == SFU_SUCCESS)
-        {
-          /* Shift the DWL area pointer */
-          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
-          rx_size -= SE_FW_HEADER_TOT_LEN;
-          p_data += SE_FW_HEADER_TOT_LEN;
-        }
-        else
-        {
-          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-          e_ret_status = SFU_ERROR;
-        }
-      }
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding */
-    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
-    {
-      /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
-      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
-      {
-        m_uDwlAreaAddress += rx_size;
-        p_data += rx_size;
-        rx_size = 0U;
-      }
-      /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be deccrypted */
-      else
-      {
-        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
-        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
-        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
-      }
-    }
-
-    /* remaining bytes to decrypt ? */
-    if (rx_size != 0U)
-    {
-      fw_decrypted_chunk_size = rx_size;
-      if ((e_ret_status == SFU_SUCCESS)
-          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
-              != SE_SUCCESS))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-        e_ret_status = SFU_ERROR;
-      }
-      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-        e_ret_status = SFU_ERROR;
-      }
-      else
-      {
-        /*Nothing */
-      }
-    }
-  }
-
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Check size to avoid writing beyond DWL image size */
-    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Set dimension to the appropriate length for FLASH programming.
-     * Example: 64-bit length for L4.
-     */
-    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
-    {
-      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
-         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
-      uOldSize = rx_size;
-      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-      while (uOldSize < rx_size)
-      {
-        p_data[uOldSize] = 0xFF;
-        uOldSize++;
-      }
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Check size to avoid writing beyond DWL area */
-    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  /* Write Data in Flash */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress += (rx_size);
-    }
-    else
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-
-  /* Last packet : reset m_uPacketsReceived */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    m_uPacketsReceived = 0U;
-  }
-
-  /* Reset data counters in case of error */
-  if (e_ret_status == SFU_ERROR)
-  {
-    /*Reset of the ymodem variables */
-    m_uFileSizeYmodem = 0U;
-    m_uPacketsReceived = 0U;
-    m_uNbrBlocksYmodem = 0U;
-  }
-
-  return e_ret_status;
-}
-#else /* MINICOM_YMODEM */
-/* Minicom variant of the YMODEM protocol: uses 128B packets */
-SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-  /* The local loader must make a copy of the Firmware metadata,
-   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
-   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
-  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(4)));
-  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
-  static uint32_t m_uDwlImgSize = 0U;
-
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_FLASH_StatusTypeDef x_flash_info;
-  uint32_t rx_size = uSize;  
-  uint8_t *p_data = pData;
-  uint32_t uOldSize;
-  int32_t fw_decrypted_chunk_size;
-  SE_StatusTypeDef e_se_status = SE_KO;
-
-  /* Check the pointers allocation */
-  if (p_data == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  /*Increase the number of received packets*/
-  m_uPacketsReceived++;
-
-  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
-    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
-    {
-      /* The last packet must be fully considered */
-      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
-    }
-    else
-    {
-      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
-      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
-                                   SFU_COM_YMODEM_PACKET_SIZE);
-    }
-  }
-
-
-  /*
-   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
-   */
-
-  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
-     not encrypted  */
-  if (1 == m_uPacketsReceived)
-  {
-    /* First packet: beginning of header */
-    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
-    {
-      /* Copy the beginning of the header */
-      memcpy(fw_header, p_data, rx_size);
-      rx_size = 0U; /* nothing more to do */
-    }
-    else
-    {
-      /* Unexpected case */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else if (2U == m_uPacketsReceived)
-  {
-    /* Second packet: end of header (64 bytes) */
-    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
-    rx_size -= 64U;
-    p_data += 64U;
-
-    /* Verify header */
-    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress = m_uDwlAreaStart;
-      /* Downloaded Image size : Header size + Image size */
-      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
-
-      /* Clear Download application area (including TRAILERS area) */
-      if ((e_ret_status == SFU_SUCCESS)
-          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
-              SFU_SUCCESS))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /* Initialize decryption process */
-        if ((e_ret_status == SFU_SUCCESS)
-            && (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS))
-        {
-          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-          e_ret_status = SFU_ERROR;
-        }
-        else if (e_se_status != SE_OK)
-        {
-          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-          e_ret_status = SFU_ERROR;
-        }
-        else
-        {
-          /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
-          if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
-              == SFU_SUCCESS)
-          {
-            /* Shift the DWL area pointer */
-            m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
-          }
-          else
-          {
-            m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-            e_ret_status = SFU_ERROR;
-          }
-        }
-      }
-      /* The remaining 64 bytes of data must be handled : standard processing */
-    }
-  }
-  /*
-   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
-   */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /*
-     * if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding
-     */
-    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
-    {
-      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
-      {
-        /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
-        m_uDwlAreaAddress += rx_size;
-        p_data += rx_size;
-        rx_size = 0U;
-      }
-      else
-      {
-        /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be decrypted */
-        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
-        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
-        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
-      }
-    }
-
-    /* remaining bytes to decrypt ? */
-    if (rx_size != 0)
-    {
-      fw_decrypted_chunk_size = rx_size;
-      if ((e_ret_status == SFU_SUCCESS)
-          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
-              != SE_SUCCESS))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-        e_ret_status = SFU_ERROR;
-      }
-      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
-        e_ret_status = SFU_ERROR;
-      }
-      else
-      {
-        /*Nothing */
-      }
-
-      /* Check size to avoid writing beyond DWL image size */
-      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      /* Set dimension to the appropriate length for FLASH programming.
-       * Example: 64-bit length for L4.
-       */
-      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
-      {
-        /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
-           sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
-        uOldSize = rx_size;
-        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-        while (uOldSize < rx_size)
-        {
-          p_data[uOldSize] = 0xFF;
-          uOldSize++;
-        }
-      }
-
-      /* Check size to avoid writing beyond DWL area */
-      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      /* Write Data in Flash */
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
-        {
-          m_uDwlAreaAddress += (rx_size);
-        }
-        else
-        {
-          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-          e_ret_status = SFU_ERROR;
-        }
-      }
-    }
-  }
-
-
-  /* Last packet : reset m_uPacketsReceived */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    m_uPacketsReceived = 0U;
-  }
-
-  /* Reset data counters in case of error */
-  if (e_ret_status == SFU_ERROR)
-  {
-    /*Reset of the ymodem variables */
-    m_uFileSizeYmodem = 0U;
-    m_uPacketsReceived = 0U;
-    m_uNbrBlocksYmodem = 0U;
-  }
-
-  return e_ret_status;
-}
-#endif /* MINICOM_YMODEM */
-
-
-/**
-  * @brief  Verifies the Raw Fw Header received. It checks if the header is
-  *         authentic and if the fields are ok with the device (e.g. size and version).
-  * @note   Please note that when the new image is installed, this metadata is checked
-  *         by @ref SFU_IMG_CheckCandidateVersion.
-  * @param  peSFU_LOADER_Status: SFU LOADER Status.
-  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
-  * @param  pBuffer: pointer to header Buffer.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-/* anti-rollback mechanism is tested twice to avoid basic hardware attack
-   ==> compiler optimization is disabled for this reason */
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O0")))
-#endif /* __ICCARM__ */
-
-static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef              e_se_status;
-  SE_FwRawHeaderTypeDef         *p_x_fw_raw_header;
-  SFU_FwImageFlashTypeDef       fw_image_flash_data;
-  uint16_t                      curVer;
-  uint32_t                      active_slot;
-
-  /*Parse the received buffer*/
-  p_x_fw_raw_header = (SE_FwRawHeaderTypeDef *)(uint32_t)pBuffer;
-  /*Check if the received header packet is authentic*/
-  if (SE_VerifyHeaderSignature(&e_se_status, p_x_fw_raw_header) != SE_ERROR)
-  {
-    active_slot = SFU_IMG_GetFwImageSlot(p_x_fw_raw_header);
-    /*
-     * 1 slot per image configuration. Identify the download area.
-     *   It will be based on SFU magic :
-     *   - dwl slot is the active_slot if configured.
-     *   - else : SLOT_ACTIVE_1
-     */
-    m_uDwlSlot = active_slot;
-    if (SLOT_SIZE(m_uDwlSlot) == 0U)
-    {
-      m_uDwlSlot = SLOT_ACTIVE_1;
-    }
-    SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
-
-    /* Assign the download flash address to be used during the YMODEM process */
-    m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
-    m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
-
-    /*
-     * Check if the version is allowed
-     * ==> SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
-     */
-    curVer = SFU_IMG_GetActiveFwVersion(active_slot);
-    if (SFU_IMG_CheckFwVersion(curVer, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
-    {
-      /* Anti-rollback check pass */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n          Anti-rollback: candidate version(%d) accepted | current version(%d) , min.version(%d) !",
-            p_x_fw_raw_header->FwVersion, curVer, SFU_FW_VERSION_START_NUM);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-      /*
-       * Check length : Let's make sure the Firmware image can be written in the destination slot.
-       */
-      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
-      {
-        /* The firmware cannot be written in dwl slot */
-        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-      }
-      else
-      {
-        /* Installation authorized */
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-    else
-    {
-      /* The installation is forbidden */
-      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
-            p_x_fw_raw_header->FwVersion, curVer, SFU_FW_VERSION_START_NUM);
-      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
-    }
-
-
-    /*
-     * Control of version and length is done twice to avoid basic hardware attack
-     * This more important for the 1 image configuration as the installation is done during the download procedure
-     * For the 2 images configuration anti-rollback will be checked again during installation process
-     */
-    if (SFU_IMG_CheckFwVersion(curVer, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
-    {
-      /* Anti-rollback check pass */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n          Anti-rollback: candidate version(%d) accepted | current version(%d) , min.version(%d) !",
-            p_x_fw_raw_header->FwVersion, curVer, SFU_FW_VERSION_START_NUM);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-      /*
-       * Check length : Let's make sure the Firmware image can be written in the destination slot.
-       */
-      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
-      {
-        /* The firmware cannot be written in dwl slot */
-        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-      }
-      else
-      {
-        /* Installation authorized */
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-    else
-    {
-      /* The installation is forbidden */
-      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
-            p_x_fw_raw_header->FwVersion, curVer, SFU_FW_VERSION_START_NUM);
-      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
-    }
-  }
-  else
-  {
-    /* Header authentication failure */
-    m_LoaderStatus = SFU_LOADER_ERR_AUTH_FAILED;
-  }
-
-  return e_ret_status;
-}
-
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_loader.h
deleted file mode 100644
index e74ce1d3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_loader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_loader.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update local
-  *          loader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOADER_H
-#define SFU_LOADER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_def.h"
-#include "sfu_new_image.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU_LOADER Status Type Definition
-  */
-typedef enum
-{
-  SFU_LOADER_OK                            = 0x00U,
-  SFU_LOADER_ERR_COM                       = 0x01U,
-  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
-  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
-  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
-  SFU_LOADER_ERR_FLASH                     = 0x05U,
-  SFU_LOADER_ERR_CRYPTO                    = 0x06U
-} SFU_LOADER_StatusTypeDef;
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LOADER_Init(void);
-SFU_ErrorStatus SFU_LOADER_DeInit(void);
-SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
-                                             uint32_t *p_Size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOADER_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_test.c
deleted file mode 100644
index b98a72e8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_test.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_test.c
-  * @author  MCD Application Team
-  * @brief   Test Protections module.
-  *          This file provides set of firmware functions to manage Test Protections
-  *          functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_test.h"
-#include "main.h"
-#include "sfu_trace.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level.h"
-#include "string.h" /* required for strncmp */
-
-#if defined(SFU_TEST_PROTECTION)
-
-extern RTC_HandleTypeDef RtcHandle;
-
-/* Private defines -----------------------------------------------------------*/
-
-/* Automatic tests : list of tests (Address, Message, Operation */
-/* Flash programming by 64 bits */
-#define SHIFT_FLASH_WRITE (8U-1U)
-
-/* Private variables ---------------------------------------------------------*/
-static ProtectionTest_t aProtectTests[] =
-{
-#ifdef SFU_MPU_PROTECT_ENABLE
-  {SFU_RAM_BASE, "MPU SRAM1 start add", TEST_EXECUTE},
-  {SFU_RAM_END - 3U, "MPU SRAM1 end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
-  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
-  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
-  /* READ_FLASH is possible as we are privileged when there is no MPU isolation but WRITE_FLASH must fail */
-  {INTVECT_START, "Init. Vector", TEST_WRITE_FLASH},
-  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-#ifdef SFU_WRP_PROTECT_ENABLE
-  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
-  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
-  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
-#endif /* SFU_WRP_PROTECT_ENABLE */
-#ifdef SFU_PCROP_PROTECT_ENABLE
-  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
-  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
-                                                                                         writing test */
-  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
-  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
-#endif /* SFU_PCROP_PROTECT_ENABLE */
-#if defined(TEST_ISOLATION)
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
-  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
-                                                                         64bits writing test + WRP protection applies */
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
-  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
-  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
-                                                                    that initializes all the variables in the binary. */
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
-  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
-  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
-  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
-  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-#endif /* TEST_ISOLATION  */
-#ifdef SFU_MPU_PROTECT_ENABLE
-  /* Testing the MPU protection of the OBs */
-  /*
-   * WL55JC
-   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
-   * 0x1FFF 7818 Reserved Write protection 1A
-   * 0x1FFF 7820 Reserved Write protection 1B
-   * 0x1FFF 7870 User option bytes (USER)
-   * 0x1FFF 7878 User option bytes (USER)
-   */
-  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFFC000", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7870, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7878, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-#endif /* SFU_MPU_PROTECT_ENABLE  */
-  {0xAAAAAAAA, "Execution successful", TEST_END},
-};
-
-
-/* Automatic test : list of operation */
-uint8_t aTestOperation[][20] =
-{
-  "write 8 bytes",
-  "read 1 byte",
-  "erase 512 bytes",
-  "write 4 bytes",
-  "read 1 byte",
-  "execute",
-  "end"
-};
-
-/* Private function prototypes -----------------------------------------------*/
-static void SFU_TEST_Protection(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
-  * @param  None.
-  * @retval None.
-  */
-static void SFU_TEST_Protection(void)
-{
-  uint32_t test_idx;
-  uint32_t flashErrCode = 0;
-  uint64_t pattern = 0U;
-  uint32_t page_error = 0U;
-  FLASH_EraseInitTypeDef p_erase_init;
-  TestStatus status = TEST_IN_PROGRESS;
-  __IO uint8_t tmp;
-  void (*func)(void);
-
-  /*
-    * Now checking the security
-    * We will try to access protected @ and run protected code.
-    * Each time a a flash error will be raised or a reset will be generated by IP protection.
-    * At next boot we read the backup register to check the next @ until all addresses have been verified.
-    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
-    * FWALL/Code Isolation
-    */
-
-  do
-  {
-    /* slow down execution */
-    HAL_Delay(100);
-
-    /* Increment test number for next execution */
-    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
-    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
-           aProtectTests[test_idx].address);
-
-    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
-    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
-        && (aProtectTests[test_idx].address > 0x00000FFFU))
-    {
-      switch (aProtectTests[test_idx].type)
-      {
-        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_WRITE_FLASH :
-          HAL_FLASH_Unlock();
-          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
-          HAL_FLASH_Lock();
-          flashErrCode = HAL_FLASH_GetError();
-          printf("\r\nflash error code: %x", flashErrCode);
-          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
-          {
-            status = TEST_ERROR;
-          }
-
-          /*
-           * OBs protection test: MPU generates a MEMORY FAULT and a RESET
-           * So the test is FAILED if we reach this line
-           */
-          if (0 == strncmp("OBs @", (const char *)aProtectTests[test_idx].msg, 5))
-          {
-            status = TEST_ERROR;
-          }
-          /* else not an OB protection test so probably not an error */
-          break;
-
-        /* Trying to read in FLASH : RDP set in case of PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_READ_FLASH :
-          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
-          HAL_Delay(1);                                                 /* ensure Flag is set */
-          /*
-           * When Isolation activated : RESET should be generated
-           * So the test is FAILED if we reach this line
-           */
-          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
-          {
-            status = TEST_ERROR;
-          }
-
-          break;
-
-        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_ERASE_FLASH :
-          HAL_FLASH_Unlock();
-          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
-          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
-          p_erase_init.NbPages     = 1;
-          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
-          HAL_FLASH_Lock();
-          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
-          {
-            status = TEST_ERROR;
-          }
-          break;
-
-        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
-        case TEST_WRITE_RAM :
-          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
-          status = TEST_ERROR;
-          break;
-
-        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
-        case TEST_READ_RAM :
-          tmp = *(uint8_t *)aProtectTests[test_idx].address;
-          printf(" value : %d ", tmp);
-          status = TEST_ERROR;
-          break;
-
-          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
-        case TEST_EXECUTE :
-          func = (void(*)(void))(aProtectTests[test_idx].address);
-          func();
-          status = TEST_ERROR;
-          break;
-
-        /* End of execution */
-        case TEST_END :
-          status = TEST_COMPLETED;
-          break;
-
-        default :
-          break;
-      }
-    }
-  } while (status == TEST_IN_PROGRESS) ;
-
-  if (status == TEST_ERROR)
-  {
-    SFU_TEST_Error();
-  }
-  else if (status == TEST_COMPLETED)
-  {
-    /* reset for next run (need a RESET of the platform to restart a session) */
-    printf("\b\b\b\b\b\b\b\b");
-    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
-  }
-}
-
-/**
-  * @brief  Initialization of backup register and start test
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Init(void)
-{
-  /* Use register DR0 to know which if the test sequence is in progress or done */
-  /* Use register DR1 to know which test to run after a reset */
-
-  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
-  {
-    return;
-  }
-  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
-                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
-                                                                  reset test index (DR1) */
-  {
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
-  }
-
-  /* Start test */
-  SFU_TEST_Protection();
-}
-
-/**
-  * @brief  Reset backup register to be able to execute a new test sequence
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Reset(void)
-{
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
-}
-
-/**
-  * @brief  Error detected during test sequence
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Error(void)
-{
-  printf(" ===> KO!!!!!");
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
-}
-
-#endif /* SFU_TEST_PROTECTION */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_trace.h
deleted file mode 100644
index 41b6e137..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_trace.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_trace.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for SFU_TRACE functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_TRACE_H
-#define SFU_TRACE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_sfu.h"
-#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-#include "sfu_com_trace.h"
-#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
-
-/* External variables --------------------------------------------------------*/
-/**
-  * This variable indicates if at boot-up the FW presence check has already been performed or not:
-  * \li It is reset when the FW status has already been checked once and no FW is present
-  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
-  * \li It is used to display some messages only once in the teraterm console
-  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
-  * \li This is used at LocalDownload and CheckUserFwStatus stages.
-  */
-extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
-
-/* Exported macros -----------------------------------------------------------*/
-#ifdef SFU_DEBUG_MODE
-#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid faults. 
-                                                                        printf is not rieentrant */
-#define TRACE   (void) printf
-#else
-#define TRACE(...)
-#define TRACE_IRQ(pbuffer)
-#endif /* SFU_DEBUG_MODE */
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_TRACE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level.c
deleted file mode 100644
index 0bf6f3bd..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level.c
-  * @author  MCD Application Team
-  * @brief   SFU Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU low level
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level.h"
-#include "sfu_trace.h"
-
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-extern RTC_HandleTypeDef RtcHandle;
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-/* Private variables ---------------------------------------------------------*/
-static UART_HandleTypeDef   UartHandle;
-static CRC_HandleTypeDef    CrcHandle;
-
-/* Private function prototypes -----------------------------------------------*/
-static void     SFU_LL_Error_Handler(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize SFU Interface.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Initialize CRC */
-  e_ret_status = SFU_LL_CRC_Init();
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  DeInitialize SFU Interface.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* ADD SRC CODE HERE
-       ...
-  */
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU IF CRC Init.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_CRC_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Configure the peripheral clock */
-  __HAL_RCC_CRC_CLK_ENABLE();
-
-
-  /* Configure CRC with default polynomial - standard configuration */
-  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU  IF CRC Configuration.
-  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
-  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Check the parameters */
-  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
-
-  /* Switch to the selected configuration */
-  CrcHandle.Instance = CRC;
-
-  /* The input data are not inverted */
-  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
-
-  /* The output data are not inverted */
-  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
-
-  switch (eCRCConfg)
-  {
-    case SFU_CRC_CONFIG_DEFAULT:
-      /* The Default polynomial is used */
-      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
-      /* The default init value is used */
-      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
-      /* The input data are 32-bit long words */
-      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
-      /* Valid parameter*/
-      e_ret_status = SFU_SUCCESS;
-      break;
-
-    case SFU_CRC_CONFIG_16BIT:
-      /* The CRC-16-CCIT polynomial is used */
-      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
-      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
-      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
-      /* The zero init value is used */
-      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
-      CrcHandle.Init.InitValue               = 0U;
-      /* The input data are 8-bit long */
-      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
-      /* Valid parameter*/
-      e_ret_status = SFU_SUCCESS;
-      break;
-
-    default:
-      /* Invalid parameter */
-      e_ret_status = SFU_ERROR;
-      break;
-  }
-
-  /* Proceed to CRC Init (Correct Parameters) */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  SFU IF CRC Calculate.
-  * @param  pBuffer: pointer to data buffer.
-  * @param  BufferLength: buffer length in bytes.
-  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
-  */
-uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
-{
-  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
-}
-
-/**
-  * @brief SFU UART Init.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_UART_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
-  /* USART configured as follow:
-  - BaudRate = 115200 baud
-  - Word Length = 8 Bits
-  - One Stop Bit
-  - No parity
-  - Hardware flow control disabled (RTS and CTS signals)
-  - Receive and transmit enabled
-  */
-  UartHandle.Instance = SFU_UART;
-  UartHandle.Init.BaudRate = 115200U;
-  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
-  UartHandle.Init.StopBits = UART_STOPBITS_1;
-  UartHandle.Init.Parity = UART_PARITY_NONE;
-  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
-  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
-  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
-  if (HAL_UART_Init(&UartHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-
-}
-
-/**
-  * @brief SFU IF UART DeInit.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_UART_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  SFU IF Write data (send).
-  * @param  pData: pointer to the 128bit data to write.
-  * @param  DataLength: pointer to the 128bit data to write.
-  * @param  pData: pointer to the 128bit data to write.
-  * @param  Timeout: Timeout duration.
-  * @retval status of the write operation
-  *         SFU_ERROR : if the write operation is not performed
-  *         SFU_SUCCESS : if the write operation is successfully performed
-  */
-SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check the pointers allocation */
-  if (pData == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU IF Read data (receive).
-  * @param  pData: pointer to the 128bit data where to store the received data.
-  * @param  DataLength: the length of the data to be read in bytes.
-  * @param Timeout: Timeout duration.
-  * @retval status of the read operation
-  *         SFU_ERROR : if the read operation is not performed
-  *         SFU_SUCCESS : if the read operation is successfully performed
-  */
-SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check the pointers allocation */
-  if (pData == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU HAL IF Flush.
-  * @param  None.
-  * @retval status of the operation.
-  */
-SFU_ErrorStatus SFU_LL_UART_Flush(void)
-{
-  /* Clean the input path */
-  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
-
-  return SFU_SUCCESS;
-}
-
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-/**
-  * @brief SFU IF RTC Init.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_RTC_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Configure RTC prescaler and RTC data registers */
-  /* RTC configured as follows:
-  - Hour Format    = Format 24
-  - Asynch Prediv  = Value according to source clock
-  - Synch Prediv   = Value according to source clock
-  - OutPut         = Output Disable
-  - OutPutPolarity = High Polarity
-  - OutPutType     = Open Drain */
-  RtcHandle.Instance            = RTC;
-  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
-  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
-  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
-  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
-  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
-  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
-
-  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief SFU IF RTC DeInit.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-
-}
-
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-
-/**
-  * @brief SFU IF RTC MSP Initialization
-  *        This function configures the hardware resources used in this example
-  * @param hrtc: RTC handle pointer.
-  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
-  *        the RTC clock source; in this case the Backup domain will be reset in
-  *        order to modify the RTC Clock source, as consequence RTC registers (including
-  *        the backup registers) and RCC_BDCR register are set to their reset values.
-  * @retval None
-  */
-void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
-{
-  RCC_OscInitTypeDef        RCC_OscInitStruct;
-  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
-
-  UNUSED(hrtc);
-  /*-1- Enables access to the backup domain */
-  /* To enable access on RTC registers */
-
-  HAL_PWR_EnableBkUpAccess();
-
-  /*-2- Configure LSE/LSI as RTC clock source */
-#ifdef RTC_CLOCK_SOURCE_LSE
-
-  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
-  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-
-  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
-  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-#elif defined (RTC_CLOCK_SOURCE_LSI)
-  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
-  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-
-  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
-  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-#else
-#error Please select the RTC Clock source inside the main.h file
-#endif /*RTC_CLOCK_SOURCE_LSE*/
-
-  /*-3- Enable RTC peripheral Clocks */
-  /* Enable RTC Clock */
-  __HAL_RCC_RTC_ENABLE();
-
-  /* Enable RTC APB clock  */
-  __HAL_RCC_RTCAPB_CLK_ENABLE();
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-  /*-4- Configure the NVIC for RTC Tamper */
-  HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_SSRU_IRQn, 0x0FU, 0U);
-  HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn);
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-}
-
-/**
-  * @brief RTC MSP De-Initialization
-  *        This function frees the hardware resources used in in SFU application:
-  *          - Disable the Peripheral's clock
-  * @param hrtc: RTC handle pointer
-  * @retval None
-  */
-void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
-{
-  UNUSED(hrtc);
-
-  __HAL_RCC_RTC_DISABLE();
-
-  /* Disable RTC APB clock  */
-  __HAL_RCC_RTCAPB_CLK_DISABLE();
-}
-
-/**
-  * @brief UART MSP Initialization
-  *        This function configures the hardware resources used in SFU application.
-  * @param huart: UART handle pointer
-  * @retval None
-  */
-void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
-{
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-  if (huart->Instance == SFU_UART)
-  {
-    /* Peripheral Clock Enable */
-    SFU_UART_CLK_ENABLE();
-
-    /* GPIO Ports Clock Enable */
-    SFU_UART_TX_GPIO_CLK_ENABLE();
-    SFU_UART_RX_GPIO_CLK_ENABLE();
-
-    /*Configure GPIO pins : SFU_UART_TX_Pin  */
-    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
-    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
-
-    /*Configure GPIO pins : SFU_UART_RX_Pin  */
-    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
-    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
-
-  }
-
-}
-
-/**
-  * @brief UART MSP De-Initialization
-  *        This function frees the hardware resources used in SFU application:
-  *          - Disable the Peripheral's clock
-  * @param huart: UART handle pointer
-  * @retval None
-  */
-void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
-{
-
-  if (huart->Instance == SFU_UART)
-  {
-    /* Peripheral clock disable */
-    SFU_UART_CLK_DISABLE();
-
-    /* GPIO DeInit*/
-    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
-    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
-
-  }
-
-
-}
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @param  None
-  * @retval None
-  */
-static void SFU_LL_Error_Handler(void)
-{
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  while (1 == 1)
-  {
-    ;
-  }
-}
-
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level.h
deleted file mode 100644
index cc8860a4..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef  SFU_LOW_LEVEL_H
-#define  SFU_LOW_LEVEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU CRC Configuration definition
-  */
-typedef enum
-{
-  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
-  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
-  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
-} SFU_CRC_ConfigTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define SFU_UART                                USART2
-#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
-#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
-
-#define SFU_UART_TX_AF                          GPIO_AF7_USART2
-#define SFU_UART_TX_GPIO_PORT                   GPIOA
-#define SFU_UART_TX_PIN                         GPIO_PIN_2
-#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
-
-#define SFU_UART_RX_AF                          GPIO_AF7_USART2
-#define SFU_UART_RX_GPIO_PORT                   GPIOA
-#define SFU_UART_RX_PIN                         GPIO_PIN_3
-#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
-
-/* Uncomment to enable the adequate Clock Source */
-#define RTC_CLOCK_SOURCE_LSI
-/*#define RTC_CLOCK_SOURCE_LSE*/
-
-#ifdef RTC_CLOCK_SOURCE_LSI
-#define RTC_ASYNCH_PREDIV    0x1FU
-#define RTC_SYNCH_PREDIV     0x3FF
-#endif /* RTC_CLOCK_SOURCE_LSI */
-
-#ifdef RTC_CLOCK_SOURCE_LSE
-#define RTC_ASYNCH_PREDIV  0x7FU
-#define RTC_SYNCH_PREDIV   0x00FFU
-#endif /* RTC_CLOCK_SOURCE_LSE */
-
-
-/* Exported macros -----------------------------------------------------------*/
-#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
-                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
-                               ((CONF) == SFU_CRC_CONFIG_16BIT))
-
-/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
-   but not meaningful for this product */
-#define SFU_LL_DummyAccess() \
-  do{ \
-  }while(0)
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus    SFU_LL_Init(void);
-SFU_ErrorStatus    SFU_LL_DeInit(void);
-
-SFU_ErrorStatus    SFU_LL_CRC_Init(void);
-SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
-uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
-
-SFU_ErrorStatus    SFU_LL_UART_Init(void);
-SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
-SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
-SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
-SFU_ErrorStatus    SFU_LL_UART_Flush(void);
-
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-SFU_ErrorStatus SFU_LL_RTC_Init(void);
-SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-
-void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
-void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
-void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
-void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*  SFU_LOW_LEVEL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash.c
deleted file mode 100644
index 2dbc00c7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU flash
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_flash_ext.h"
-#include "sfu_fwimg_regions.h"
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
-  * @param  none
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  e_ret_status = SFU_LL_FLASH_INT_Init();
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_EXT_Init();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pFlashStatus: SFU_FLASH Status pointer
-  * @param  pStart: flash address to be erased
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-
-  /* Check Flash start address */
-  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
-  }
-}
-
-/**
-  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pFlashStatus: FLASH_StatusTypeDef
-  * @param  pDestination: flash address to write
-  * @param  pSource: pointer on buffer with data to write
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                   uint32_t Length)
-{
-  /* Check Flash destination address */
-  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
-  }
-}
-
-/**
-  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pDestination: pointer on buffer to store data
-  * @param  pSource: flash address to read
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  /* Check Flash source address */
-  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
-  }
-}
-
-/**
-  * @brief  This function configure the flash to be able to execute code
-  * @param  Addr: flash address
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
-{
-  /*
-   * Internal flash : nothing to do
-   * External flash : configure memory mapped mode
-   */
-
-  /* Check Flash address */
-  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
-  }
-}
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: flash address
-  * @retval The page of a given address
-  */
-uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
-{
-  /* Check Flash address */
-  if (Addr < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_GetPage(Addr);
-  }
-  else
-  {
-    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
-  }
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash.h
deleted file mode 100644
index a7b6aaca..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update flash
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_H
-#define SFU_LOW_LEVEL_FLASH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-typedef enum
-{
-  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
-  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
-  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
-  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
-  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
-  SFU_FLASH_SUCCESS           /*!< Flash Success */
-} SFU_FLASH_StatusTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define INVALID_SECTOR 0xFFFFFFFFU
-#define INVALID_PAGE   0xFFFFFFFFU
-#define INVALID_BANK   0xFFFFFFFFU
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                   uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
-
-uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c
deleted file mode 100644
index 2e4b5b65..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_ext.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU external
-  *          flash low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_flash_ext.h"
-#include "sfu_low_level_security.h"
-
-/* Private defines -----------------------------------------------------------*/
-#define BLOC_64_KBYTES 0x10000U
-
-/* Functions Definition ------------------------------------------------------*/
-
-/* No external flash available on this product
-   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
-       systematically during startup phase */
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
-{
-  return SFU_SUCCESS;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-  UNUSED(pFlashStatus);
-  UNUSED(pStart);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                       uint32_t Length)
-{
-  UNUSED(pFlashStatus);
-  UNUSED(pDestination);
-  UNUSED(pSource);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  UNUSED(pDestination);
-  UNUSED(pSource);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
-{
-  UNUSED(SlotNumber);
-  return SFU_SUCCESS;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h
deleted file mode 100644
index 2f900bb8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_ext.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface for external flash.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
-#define SFU_LOW_LEVEL_FLASH_EXT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash.h"
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported constants --------------------------------------------------------*/
-#define EXTERNAL_FLASH_ADDRESS  0x90000000U
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                       uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c
deleted file mode 100644
index 85480f7a..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_int.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU internal
-  *          flash low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "string.h"
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-
-/* Private defines -----------------------------------------------------------*/
-#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
-
-/* Private variables ---------------------------------------------------------*/
-static __IO uint32_t DoubleECC_Error_Counter = 0U;
-
-
-static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  This function initialize the internal flash interface if required
-  * @param  none
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
-{
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  This function does an erase of n (depends on Length) pages in user flash area
-  * @param  pFlashStatus: SFU_FLASH Status pointer
-  * @param  pStart: flash address to be erased
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-  uint32_t page_error = 0U;
-  uint32_t start = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef p_erase_init;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t first_page;
-  uint32_t nb_pages;
-  uint32_t chunk_nb_pages;
-  uint32_t length = Length;
-
-  /* Check the pointers allocation */
-  if (pFlashStatus == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  *pFlashStatus = SFU_FLASH_SUCCESS;
-
-  /* Clear error flags raised during previous operation */
-  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() == HAL_OK)
-    {
-      first_page = SFU_LL_FLASH_INT_GetPage(start);
-      /* Get the number of pages to erase from 1st page */
-      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
-      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
-      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
-      do
-      {
-        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
-        p_erase_init.Page = first_page;
-        p_erase_init.NbPages = chunk_nb_pages;
-        first_page += chunk_nb_pages;
-        nb_pages -= chunk_nb_pages;
-        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
-        {
-          e_ret_status = SFU_ERROR;
-          *pFlashStatus = SFU_FLASH_ERR_ERASE;
-        }
-        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
-      } while (nb_pages > 0U);
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      if (HAL_FLASH_Lock() != HAL_OK)
-      {
-        e_ret_status = SFU_ERROR;
-        *pFlashStatus = SFU_FLASH_ERR_HAL;
-      }
-    }
-    else
-    {
-      *pFlashStatus = SFU_FLASH_ERR_HAL;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
-  * @note   After writing data buffer, the flash content is checked.
-  * @param  pFlashStatus: FLASH_StatusTypeDef
-  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
-  * @param  pSource: pointer on buffer with data to write
-  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                       uint32_t Length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t i;
-  uint32_t inside_header = 0U;
-  uint32_t destination = (uint32_t)pDestination;
-  uint32_t source = (uint32_t)pSource;
-
-  /* Check the pointers allocation */
-  if ((pFlashStatus == NULL) || (pSource == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Is destination area inside 1 of the firmware image headers ? */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      inside_header = 1U;
-    }
-  }
-
-  /* Destination area part of 1 of the firmware image headers :
-     writing operation should be executed inside secure environment */
-  if ((inside_header == 1U) && (Length != 0U))
-  {
-    /* SE Access */
-    SE_StatusTypeDef se_status;
-    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
-    if (se_ret_status == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-      *pFlashStatus = SFU_FLASH_SUCCESS;
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-      *pFlashStatus = SFU_FLASH_ERROR;
-    }
-  }
-  /* Writing operation executed by SBSFU */
-  else
-  {
-    *pFlashStatus = SFU_FLASH_ERROR;
-
-    /* Clear error flags raised during previous operation */
-    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Unlock the Flash to enable the flash control register access *************/
-      if (HAL_FLASH_Unlock() != HAL_OK)
-      {
-        *pFlashStatus = SFU_FLASH_ERR_HAL;
-
-      }
-      else
-      {
-        /* DataLength must be a multiple of 64 bit */
-        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
-        {
-          *pFlashStatus = SFU_FLASH_ERROR;
-
-          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
-          be done by word */
-          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
-              == HAL_OK)
-          {
-            /* Check the written value */
-            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
-            {
-              /* Flash content doesn't match SRAM content */
-              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
-              e_ret_status = SFU_ERROR;
-            }
-            else
-            {
-              /* Increment FLASH Destination address */
-              destination = destination + sizeof(SFU_LL_FLASH_write_t);
-              e_ret_status = SFU_SUCCESS;
-              *pFlashStatus = SFU_FLASH_SUCCESS;
-            }
-          }
-          else
-          {
-            /* Error occurred while writing data in Flash memory */
-            *pFlashStatus = SFU_FLASH_ERR_WRITING;
-            e_ret_status = SFU_ERROR;
-          }
-        }
-        /* Lock the Flash to disable the flash control register access (recommended
-        to protect the FLASH memory against possible unwanted operation) */
-        if (HAL_FLASH_Lock() != HAL_OK)
-        {
-          e_ret_status = SFU_ERROR;
-          *pFlashStatus = SFU_FLASH_ERR_HAL;
-        }
-      }
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function reads flash
-  * @param  pDestination: Start address for target location
-  * @param  pSource: flash address to read
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_ErrorStatus se_ret_status;
-  SE_StatusTypeDef se_status;
-  uint32_t i;
-  uint32_t inside_header = 0U;
-  uint32_t source = (uint32_t)pSource;
-
-  /* Is destination area inside 1 of the firmware image headers ? */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      inside_header = 1U;
-    }
-  }
-
-  /* Destination area part of 1 of the firmware image headers :
-     reading operation should be executed inside secure environment */
-  if (inside_header == 1U)
-  {
-    /* SE Access */
-    DoubleECC_Error_Counter = 0U;
-    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
-    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-    DoubleECC_Error_Counter = 0U;
-  }
-  /* Reading operation executed by SBSFU */
-  else
-  {
-    DoubleECC_Error_Counter = 0U;
-    (void) memcpy(pDestination, (uint8_t *)source, Length);
-    if (DoubleECC_Error_Counter == 0U)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-    DoubleECC_Error_Counter = 0U;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: flash address
-  * @retval The page of a given address
-  */
-uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
-{
-  uint32_t page;
-
-  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
-
-  return page;
-}
-
-
-
-
-/**
-  * @brief  Clear error flags raised during previous operation
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Unlock the Program memory */
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-
-    /* Clear all FLASH flags */
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-
-    /* Unlock the Program memory */
-    if (HAL_FLASH_Lock() == HAL_OK)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-
-}
-
-
-/**
-  * @brief  Get Link Register value (LR)
-  * @param  None.
-  * @retval LR Register value
-  */
-__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
-{
-  register uint32_t result;
-
-#if defined ( __ICCARM__ ) || ( __GNUC__ )
-  __ASM volatile("MOV %0, LR" : "=r"(result));
-#elif defined ( __CC_ARM )
-  __ASM volatile("MOV result, __return_address()");
-#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
-
-  return result;
-}
-
-/*
-   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
-   not to use extra registers (on top of scratch registers), because it would change the stack pointer
-   position. Then compiler optimizations are customized to ensure that.
-*/
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O1")))
-#endif /* __ICCARM__ */
-/**
-  * @brief  NMI Handler present for handling Double ECC NMI interrupt
-  * @param  None.
-  * @retvat void
-  */
-void NMI_Handler(void)
-{
-  uint32_t *p_sp;
-  uint32_t lr;
-  uint16_t opcode_msb;
-
-  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
-  {
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
-
-    /* Memorize error to ignore the read value */
-    DoubleECC_Error_Counter++;
-
-    lr = __get_LR();
-
-    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
-    if (((lr) & (0xFU)) == 0xDU)
-    {
-      /* interrupted code was using Process Stack Pointer */
-      p_sp = (uint32_t *)__get_PSP();
-    }
-    else
-    {
-      /* interrupted code was using Main Stack Pointer */
-      p_sp = (uint32_t *)__get_MSP();
-    }
-
-    /* Test caller mode T bit from CPSR in stack */
-    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
-    {
-      /* Thumb  mode.
-         Test PC in stack.
-         If bits [15:11] of the halfword being decoded take any of the following values,
-         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
-         Otherwise, the halfword is a 16-bit instruction.
-      */
-      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
-      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
-      {
-        /* execute next instruction PC +4  */
-        *(p_sp + 6U) += 4U;
-      }
-      else
-      {
-        /* execute next instruction PC +2  */
-        *(p_sp + 6U) += 2U;
-      }
-    }
-    else
-    {
-      /* ARM mode execute next instruction PC +4 */
-      *(p_sp + 6U) += 4U;
-    }
-  }
-  else
-  {
-    while (1 == 1)
-    {
-      ;
-    }
-  }
-}
-
-
-/**
-  * @brief  HardFault Handler
-  * @param  None.
-  * @retval None.
-  */
-void HardFault_Handler(void)
-{
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h
deleted file mode 100644
index 221c183f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_int.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface for internal flash.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_INT_H
-#define SFU_LOW_LEVEL_FLASH_INT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash.h"
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Flash Write Access Constraints (size and alignment)
-  *
-  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
-  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
-  *
-  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
-  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
-  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
-  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_CheckTrailerValid).
-  */
-
-/* double-word is the default setting for most platforms */
-typedef uint64_t SFU_LL_FLASH_write_t;
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * Length of a MAGIC tag (32 bytes).
-  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
-  */
-#define MAGIC_LENGTH ((uint32_t)32U)
-
-/* External variables --------------------------------------------------------*/
-#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                       uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
-void NMI_Handler(void);
-void HardFault_Handler(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_security.c
deleted file mode 100644
index d10c9f3f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_security.c
+++ /dev/null
@@ -1,994 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.c
-  * @author  MCD Application Team
-  * @brief   SFU Security Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "stm32wlxx_it.h"
-
-#ifndef  SFU_WRP_PROTECT_ENABLE
-#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
-#warning "SFU_WRP_PROTECT_DISABLED"
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifndef  SFU_RDP_PROTECT_ENABLE
-#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
-#warning "SFU_RDP_PROTECT_DISABLED"
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-#endif /* SFU_RDP_PROTECT_ENABLE */
-
-
-#ifndef  SFU_MPU_PROTECT_ENABLE
-#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
-#warning "SFU_MPU_PROTECT_DISABLED"
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-
-#ifndef  SFU_TAMPER_PROTECT_ENABLE
-#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
-#warning "SFU_TAMPER_PROTECT_DISABLED"
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-#ifndef  SFU_DAP_PROTECT_ENABLE
-#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
-#warning "SFU_DAP_PROTECT_DISABLED"
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-#ifndef  SFU_DMA_PROTECT_ENABLE
-#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
-#warning "SFU_DMA_PROTECT_DISABLED"
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-#ifndef  SFU_IWDG_PROTECT_ENABLE
-#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
-#warning "SFU_IWDG_PROTECT_DISABLED"
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-
-/* Private typedef -----------------------------------------------------------*/
-typedef enum
-{
-  SFU_FALSE = 0U,
-  SFU_TRUE = !SFU_FALSE
-} SFU_BoolTypeDef;
-
-typedef struct
-{
-  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Number */
-  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
-  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
-  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Permission_Attributes */
-  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
-                                                 of  CORTEX_MPU_Instruction_Access */
-  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
-                                                 is 1 region sub region is disabled */
-} SFU_MPU_InitTypeDef;
-
-typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
-
-/* Private variables ---------------------------------------------------------*/
-#ifdef  SFU_IWDG_PROTECT_ENABLE
-static IWDG_HandleTypeDef   IwdgHandle;
-
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-#ifdef  SFU_MPU_PROTECT_ENABLE
-static SFU_MPU_InitTypeDef MpuAreas[] =
-
-  {
-    {
-      MPU_REGION_NUMBER0, SFU_PROTECT_MPU_AREA_USER_START,     SFU_PROTECT_MPU_AREA_USER_SIZE,
-      SFU_PROTECT_MPU_AREA_USER_PERM,     SFU_PROTECT_MPU_AREA_USER_EXEC,     SFU_PROTECT_MPU_AREA_USER_SREG
-    },
-{
-  MPU_REGION_NUMBER1, SFU_PROTECT_MPU_AREA_SFUEN_START_0,  SFU_PROTECT_MPU_AREA_SFUEN_SIZE_0,
-  SFU_PROTECT_MPU_AREA_SFUEN_PERM,    SFU_PROTECT_MPU_AREA_SFUEN_EXEC,    SFU_PROTECT_MPU_AREA_SFUEN_SREG_0
-},
-{
-  MPU_REGION_NUMBER2, SFU_PROTECT_MPU_AREA_SFUEN_START_1,  SFU_PROTECT_MPU_AREA_SFUEN_SIZE_1,
-  SFU_PROTECT_MPU_AREA_SFUEN_PERM,    SFU_PROTECT_MPU_AREA_SFUEN_EXEC,    SFU_PROTECT_MPU_AREA_SFUEN_SREG_1
-},
-{
-  MPU_REGION_NUMBER3, SFU_PROTECT_MPU_AREA_VECT_START,     SFU_PROTECT_MPU_AREA_VECT_SIZE,
-  SFU_PROTECT_MPU_AREA_VECT_PERM,     SFU_PROTECT_MPU_AREA_VECT_EXEC,     SFU_PROTECT_MPU_AREA_VECT_SREG
-},
-{
-  MPU_REGION_NUMBER4, SFU_PROTECT_MPU_AREA_OB_BANK1_START, SFU_PROTECT_MPU_AREA_OB_BANK1_SIZE,
-  SFU_PROTECT_MPU_AREA_OB_BANK1_PERM, SFU_PROTECT_MPU_AREA_OB_BANK1_EXEC, SFU_PROTECT_MPU_AREA_OB_BANK1_SREG
-},
-{
-  MPU_REGION_NUMBER5, SFU_PROTECT_MPU_AREA_PERIPH_START,   SFU_PROTECT_MPU_AREA_PERIPH_SIZE,
-  SFU_PROTECT_MPU_AREA_PERIPH_PERM,   SFU_PROTECT_MPU_AREA_PERIPH_EXEC,   SFU_PROTECT_MPU_AREA_PERIPH_SREG
-},
-  };
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#ifdef SFU_RDP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /*SFU_RDP_PROTECT_ENABLE*/
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-
-
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
-#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
-
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
-#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
-
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Check and if not applied apply the Static security  protections to
-  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
-  *         those protections not impacted by a Reset. They are set using the Option Bytes
-  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
-  * @param  None
-  * @note   By default, the best security protections are applied to the different
-  *         flash sections in order to maximize the security level for the specific MCU.
-  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
-  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
-{
-  FLASH_OBProgramInitTypeDef flash_option_bytes;
-  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  (void) HAL_FLASH_Unlock();
-
-  /* Clear OPTVERR bit set on virgin samples */
-  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
-
-  /* Unlock the Options Bytes *************************************************/
-  (void) HAL_FLASH_OB_Unlock();
-
-  /* Get Option Bytes status for WRP AREA_A  **********/
-  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
-  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
-
-  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
-  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
-  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
-  {
-    /* Sanity check of the (enabled) static protections */
-    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-
-
-    /*RDP level 2 ==> Flow control by-passed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-  }
-  else
-  {
-    /* Check/Set Flash configuration *******************************************/
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-
-    /* Check/Apply WRP ********************************************************/
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-    /* Check/Apply PCRoP ******************************************************/
-
-
-    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
-#ifdef SFU_RDP_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_RDP_PROTECT_ENABLE */
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (is_protection_to_be_applied)
-      {
-        /* Generate System Reset to reload the new option byte values *************/
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        (void) HAL_FLASH_OB_Launch();
-      }
-    }
-  }
-
-
-  /* Lock the Options Bytes ***************************************************/
-  (void) HAL_FLASH_OB_Lock();
-
-  /* Lock the Flash to disable the flash control register access (recommended
-  to protect the FLASH memory against possible unwanted operation) *********/
-  (void) HAL_FLASH_Lock();
-
-  /* If it was not possible to apply one of the above mandatory protections, the
-  Option bytes have not been reloaded. Return the error status in order for the
-  caller function to take the right actions */
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  Apply Runtime security  protections.
-  *         Runtime security protections have to be re-configured at each Reset.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
-
-  /* Depending on compilation switches, prevent compilation warning */
-  UNUSED(runtime_protection);
-
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionMPU() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-
-
-  /* Check/Apply disable DMAs  ************************************************/
-#ifdef SFU_DMA_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-  /* Check/Apply  IWDG **************************************************/
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-  /* Check/Apply  DAP *********************************************************/
-#ifdef SFU_DAP_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#else
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-  /* Check/Apply  ANTI_TAMPER *************************************************/
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#else
-#ifdef SFU_TEST_PROTECTION
-  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_TEST_PROTECTION */
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-  /* Check/Apply  CLOCK_MONITOR **********************************************/
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
-
-  /* Check/Apply  TEMP_MONITOR **********************************************/
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Return the reset source  detected after a reboot. The related flag is reset
-  *         at the end of this function.
-  * @param  peResetpSourceId: to be filled with the detected source of reset
-  * @note   In case of multiple reset sources this function return only one of them.
-  *         It can be improved returning and managing a combination of them.
-  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
-  */
-void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
-{
-  /* Check if the last reset has been generated from a Watchdog exception */
-  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
-      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
-  {
-    *peResetpSourceId = SFU_RESET_WDG_RESET;
-
-  }
-
-
-  /* Check if the last reset has been generated from a Low Power reset */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_LOW_POWER;
-
-  }
-
-  /* Check if the last reset has been generated from a Software reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_SW_RESET;
-
-  }
-  /* Check if the last reset has been generated from an Option Byte Loader reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_OB_LOADER;
-  }
-  /* Check if the last reset has been generated from a Hw pin reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_HW_RESET;
-
-  }
-  /* Unknown */
-  else
-  {
-    *peResetpSourceId = SFU_RESET_UNKNOWN;
-  }
-}
-
-/**
-  * @brief  Clear the reset sources. This function should be called after the actions
-  *         on the reset sources has been already taken.
-  * @param  none
-  * @note   none
-  * @retval none
-  */
-void SFU_LL_SECU_ClearResetSources()
-{
-  /* Clear reset flags  */
-  __HAL_RCC_CLEAR_RESET_FLAGS();
-}
-
-/**
-  * @brief  Refresh Watchdog : reload counter
-  *         This function must be called just before jumping to the UserFirmware
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  /* Refresh IWDG: reload counter */
-  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-#else
-  e_ret_status = SFU_SUCCESS;
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check Flash configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply BOOT_LOCK ****************************************************/
-  if ((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-  }
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  Set Flash configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check Flash configuration */
-  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
-    psFlashOptionBytes->UserConfig      &= ~OB_BOOT_LOCK_ENABLE;
-    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-    }
-#else
-    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-#ifdef SFU_RDP_PROTECT_ENABLE
-/**
-  * @brief  Apply the RDP protection
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply RDP **********************************************************/
-  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
-  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
-  {
-    e_ret_status = SFU_SUCCESS; /*Protection already applied */
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
-    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
-#else
-    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
-#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
-    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
-    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-  return e_ret_status;
-}
-#endif /*SFU_RDP_PROTECT_ENABLE*/
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-/**
-  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Check WRP ****************************************************************/
-  if ((psFlashOptionBytes->WRPStartOffset > SFU_PROTECT_WRP_PAGE_START_1) ||
-      (psFlashOptionBytes->WRPEndOffset   < SFU_PROTECT_WRP_PAGE_END_1))
-  {
-    e_ret_status = SFU_ERROR; /*Protection not applied */
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply WRP **********************************************************/
-  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS; /*Protection already applied */
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
-    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
-    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
-    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-/**
-  * @brief  Apply MPU protection before executing UserApp
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
-{
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = MPU_REGION_NUMBER6;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
-  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
-  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = MPU_REGION_NUMBER7;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_EXEC;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
-  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
-  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-
-  return SFU_SUCCESS;
-}
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-/**
-  * @brief  Apply MPU protection before executing Standalone loader
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_StandaloneLoader(void)
-{
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = MPU_REGION_NUMBER6;
-  MPU_InitStruct.BaseAddress          = LOADER_PROTECT_MPU_AREA_START;
-  MPU_InitStruct.Size                 = LOADER_PROTECT_MPU_AREA_SIZE;
-  MPU_InitStruct.SubRegionDisable     = LOADER_PROTECT_MPU_AREA_SREG;
-  MPU_InitStruct.AccessPermission     = LOADER_PROTECT_MPU_AREA_PERM;
-  MPU_InitStruct.DisableExec          = LOADER_PROTECT_MPU_AREA_EXEC;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
-  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
-  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  return SFU_SUCCESS;
-}
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-
-/**
-  * @brief  Apply MPU protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t mpu_region_num; /* id of the MPU region being configured */
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  HAL_MPU_Disable();
-
-  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
-  {
-    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
-    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
-    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
-    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
-    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
-    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
-    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-    MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
-    MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
-    MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
-          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
-          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    HAL_MPU_ConfigRegion(&MPU_InitStruct);
-  }
-  HAL_MPU_Enable(MPU_HARDFAULT_NMI);
-  e_ret_status = SFU_SUCCESS;
-
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
-  }
-  return e_ret_status;
-}
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-
-
-
-#ifdef SFU_DMA_PROTECT_ENABLE
-/**
-  * @brief  Apply DMA protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
-{
-  /*
-   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
-   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
-   * information in SRAM, FLASH
-   */
-  /* Disable  DMA1, DMA2 */
-  __HAL_RCC_DMA1_CLK_DISABLE();
-
-  __HAL_RCC_DMA2_CLK_DISABLE();
-
-  __HAL_RCC_DMAMUX1_CLK_DISABLE();
-
-
-
-
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
-  return SFU_SUCCESS;
-}
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-/**
-  *  @brief Apply IWDG protection
-  *         The IWDG timeout is set to 4 second.
-  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
-  *         to the measured LSI frequency after setting the prescaler value:
-  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
-  This is not used in this implementation because not necessary and in order
-  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
-
-  /* Configure & Start the IWDG peripheral */
-  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
-  IWDG counter clock Frequency = uwLsiFreq
-  Set Prescaler to 64 (IWDG_PRESCALER_64)
-  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
-  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
-  IwdgHandle.Instance = IWDG;
-  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
-  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
-  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
-
-  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef SFU_DAP_PROTECT_ENABLE
-/**
-  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-
-  /* Enable clock of DBG GPIO port */
-  SFU_DBG_CLK_ENABLE();
-
-  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
-  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
-  e_ret_status = SFU_SUCCESS;
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
-
-  return e_ret_status;
-}
-#else
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-/**
-  * @brief  Apply ANTI TAMPER protection
-  * @param None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  RTC_TamperTypeDef  stamperstructure;
-
-  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
-  TAMPER_GPIO_CLK_ENABLE();
-
-  /* Configure Tamper Pin */
-  /* tamper is an additional function */
-  /* not an alternate Function : config not needed */
-  /* Configure the RTC peripheral */
-  /* Configure RTC prescaler and RTC data registers */
-  /* RTC configured as follows:
-  - Hour Format    = Format 24
-  - Asynch Prediv  = Value according to source clock
-  - Synch Prediv   = Value according to source clock
-  - OutPut         = Output Disable
-  - OutPutPolarity = High Polarity
-  - OutPutType     = Open Drain */
-  RtcHandle.Instance            = RTC;
-  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
-  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
-  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
-  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
-  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
-  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
-
-  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
-  {
-    /* Configure RTC Tamper */
-    stamperstructure.Tamper                       = RTC_TAMPER_ID;
-    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
-    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
-    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
-    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
-    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
-    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
-    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
-    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
-
-    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
-    {
-
-      /* Clear the Tamper interrupt pending bit */
-      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
-    }
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-/**
-  * @brief  Apply CLOCK MONITOR protection
-  * @note   This function has been added just as template to be used/customized
-  *         if a clock monitor is requested.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply the Clock Monitoring */
-  /* Add your code here for customization
-     e.g. if HSE or LSE is used enable the CSS!
-   ...
-   ...
-  */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
-
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-/**
-  * @brief  Apply TEMP MONITOR protection
-  * @note   This function has been added just as template to be used/customized
-  *         if a temperature monitor is requested.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply the Temperature Monitoring */
-  /* Add your code here for customization
-     ...
-     ...
-  */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
-
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_security.h
deleted file mode 100644
index 63060228..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/Target/sfu_low_level_security.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_SECURITY_H
-#define SFU_LOW_LEVEL_SECURITY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_fwimg_regions.h"
-#include "sfu_def.h"
-
-/* Exported constants --------------------------------------------------------*/
-
-/*!< Bank 1, Area A  used to protect Vector Table */
-#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
-
-/*!< First page including the Vector Table: 0 based */
-#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Last page: (code_size-1)/page_size because the page
-     indexes start from 0 */
-#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-
-
-/**
-  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
-  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
-  *    The priorities are fixed, and cannot be changed.
-  */
-
-
-/**
-  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
-  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
-  *                   but used only to read and write the downloaded code RAM is also not executable.
-  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
-  */
-
-#define SFU_PROTECT_MPU_AREA_USER_START         ((uint32_t)0x00000000U)
-#define SFU_PROTECT_MPU_AREA_USER_SIZE          MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
-#define SFU_PROTECT_MPU_AREA_USER_PERM          MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_AREA_USER_EXEC          MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_AREA_USER_SREG          0x00U      /*!< All subregions activated */
-
-/**
-  * @brief Region 1 and Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys). Inner region inside
-  *                                the Region 0
-  */
-#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)       /*!< 8 sub-regions is the maximum */
-#define SFU_PROTECT_MPU_AREA_SFUEN_START_0      FLASH_BASE
-#define SFU_PROTECT_MPU_AREA_SFUEN_START_1      0x0800C000
-#define SFU_PROTECT_MPU_AREA_SFUEN_SIZE_0       MPU_REGION_SIZE_64KB
-#define SFU_PROTECT_MPU_AREA_SFUEN_SIZE_1       MPU_REGION_SIZE_4KB
-#define SFU_PROTECT_MPU_AREA_SFUEN_PERM         MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_AREA_SFUEN_EXEC         MPU_INSTRUCTION_ACCESS_ENABLE
-#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_0       0xC0U      /*!< 64 bytes / 8 * 6 ==> 48 bytes */
-#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_1       0x00U      /*!< All subregions activated */
-
-/**
-  * @brief Region 3 - Vector Table: Vector Table must be Read-Only under privileged access. Inner region inside the
-  *                   Region 1
-  */
-#define SFU_PROTECT_MPU_AREA_VECT_START         ((uint32_t) INTVECT_START) /*!< Vector table memory area */
-#define SFU_PROTECT_MPU_AREA_VECT_SIZE          MPU_REGION_SIZE_512B
-#define SFU_PROTECT_MPU_AREA_VECT_PERM          MPU_REGION_PRIV_RO
-#define SFU_PROTECT_MPU_AREA_VECT_EXEC          MPU_INSTRUCTION_ACCESS_ENABLE
-#define SFU_PROTECT_MPU_AREA_VECT_SREG          0x00U                   /*!< All subregions activated */
-
-/**
-  * @brief Region 4 - Inner region inside the Region 0 . The Option Bytes. Once the Option Bytes have been set,
-  *                   only reading will be possible
-  */
-
-/*
- * WLxx
- * Single Bank
- * [ 1FFF7800 1FFF7808 1FFF7810 1FFF7818 1FFF7820]: 40 bytes to be protected
- * The MPU can be used to protect up to eight memory regions.
- * These, in turn can have eight subregions, if the region is at least 256 bytes.
- * Here, we define a 64B region so subregions cannot be used.
- */
-#define SFU_PROTECT_MPU_AREA_OB_BANK1_START     ((uint32_t)0x1FFF7800U) /*!< Option Bytes in bank 1        */
-#define SFU_PROTECT_MPU_AREA_OB_BANK1_SIZE      MPU_REGION_SIZE_64B     /*!< Protecting more than required */
-#define SFU_PROTECT_MPU_AREA_OB_BANK1_PERM      MPU_REGION_NO_ACCESS
-#define SFU_PROTECT_MPU_AREA_OB_BANK1_EXEC      MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_AREA_OB_BANK1_SREG      0x00U                   /*!< Subregion mask to deactivate unexpected
-                                                                             MPU subregions: 0x1F should be set but it
-                                                                             would have no effect as we have a 64B
-                                                                             region */
-
-/**
-  * @brief  Region 5 - Peripherals Area
-  */
-#define SFU_PROTECT_MPU_AREA_PERIPH_START       PERIPH_BASE                  /*!< Peripheral memory area */
-#define SFU_PROTECT_MPU_AREA_PERIPH_SIZE        MPU_REGION_SIZE_512MB        /*!< To be coherent with the peripherals
-                                                                                  memory area */
-#define SFU_PROTECT_MPU_AREA_PERIPH_PERM        MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_AREA_PERIPH_EXEC        MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_AREA_PERIPH_SREG        0x00U                        /*!< All subregions activated */
-
-
-/**
-  * MPU configuration for UserApp execution
-  * =======================================
-  * @brief Region 6 & 7 - Enable the execution of the active slots
-  * MPU constraint = Region base address should be aligned on Region size
-  */
-/**
-  * Region definition : from 0x0800 F800 ==> 0x0800 FFFF (2 kbytes)
-  */
-#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START  SLOT_ACTIVE_1_START
-#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_2KB
-#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
-#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG   0x00U                       /*!< All subregions activated */
-/**
-  * Additional Region definition : from 0x0801 0000 ==> 0x0803 FFFF (192 kbytes)
-  */
-#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_START  FLASH_BASE
-#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_256KB
-#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
-#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SREG   0x03U                    /*!< 256 Kbytes / 8 * 6 ==> 192 Kbytes */
-
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
-  * @{
-  */
-#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
-#define RTC_TAMPER_ID                      RTC_TAMPER_1
-#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
-  * @{
-  */
-#define SFU_DBG_PORT            GPIOA
-#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
-#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
-  * @{
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
-  * @{
-  */
-typedef enum
-{
-  SFU_RESET_UNKNOWN = 0x00U,
-  SFU_RESET_WDG_RESET,
-  SFU_RESET_LOW_POWER,
-  SFU_RESET_HW_RESET,
-  SFU_RESET_BOR_RESET,
-  SFU_RESET_SW_RESET,
-  SFU_RESET_OB_LOADER,
-} SFU_RESET_IdTypeDef;
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
-  * @{
-  */
-#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
-#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
-#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
-                                                                            separate section to support PCRoP */
-#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
-#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
-                                                                            Std Protections cannot be
-                                                                            added/removed/modified */
-#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
-                                                                            boot in bank1! */
-
-#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
-#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
-#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
-#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
-#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
-#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
-#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
-
-#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
-                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
-/*!< All the static protections */
-
-#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
-                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
-                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
-                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | SFU_RUNTIME_PROTECTION_TEMP_MONITOR)
-/*!< All the run-time protections */
-
-#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
-#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
-#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
-
-/* Exported functions ------------------------------------------------------- */
-#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
-/*!<SFU Redirect of RTC Tamper Event Callback*/
-#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
-
-SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
-void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
-void               SFU_LL_SECU_ClearResetSources(void);
-#ifdef SFU_MPU_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(void);
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-#ifdef SFU_DMA_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-#ifdef SFU_DAP_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-#if defined(SFU_MPU_PROTECT_ENABLE)
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
-#endif /* SFU_MPU_PROTECT_ENABLE */
-#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_StandaloneLoader(void);
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_SECURITY_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/app_hw.h
deleted file mode 100644
index 119621d7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/app_hw.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_hw.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update hardware
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef APP_HW_H
-#define APP_HW_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Exported macros -----------------------------------------------------------*/
-#define BUTTON_INIT()         BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);
-#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APP_HW_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 6b8db4f7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/* COM usage define */
-#define USE_BSP_COM_FEATURE                 0U
-
-/* COM log define */
-#define USE_COM_LOG                         0U
-
-/* IRQ priorities */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Src/main.c
deleted file mode 100644
index 771eb7dd..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Src/main.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    main.c
-  * @author  MCD Application Team
-  * @brief   Main application file.
-  *          This application demonstrates Secure Boot and Secure Firmware Update.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_boot.h"
-
-
-/* Private variables ---------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-void SystemClock_Config(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  main function
-  * @param  None
-  * @retval int
-  */
-int main(void)
-{
-
-  /* MCU Configuration--------------------------------------------------------*/
-  /* Configure the system clock using LL functions */
-  SystemClock_Config();
-
-  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
-  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
-  (void) HAL_Init();
-
-  /* Board BSP  Configuration-------------------------------------------------*/
-  /*
-   * As the secure mode has not been entered yet, we do not configure BSP right now .
-   * The BSP will be configured by the bootloader.
-   */
-
-
-  /* Launch the Bootloader----------------------------------------------------*/
-  /*
-   * This is the beginning of the secure part:
-   * security mechanisms will be enabled.
-   * The function below should not return (unless a critical failure is encountered).
-   */
-  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
-
-  /* Security or SecureBoot initialization failure. Force a System Reset */
-  SFU_BOOT_ForceReboot();
-
-}
-
-/**
-  * @brief  System Clock Configuration
-  *         The system Clock is configured as follows :
-  *            System Clock source            = PLL (MSI)
-  *            SYSCLK(Hz)                     = 48000000
-  *            HCLK(Hz)                       = 48000000
-  *            AHB1 Prescaler                 = 1 
-  *            AHB3 Prescaler                 = 1
-  *            APB1 Prescaler                 = 1
-  *            APB2 Prescaler                 = 1
-  *            MSI Frequency(Hz)              = 4000000
-  *            PLL_M                          = 1
-  *            PLL_N                          = 24
-  *            PLL_R                          = 2
-  *            Flash Latency(WS)              = 2
-  *            Voltage range                  = 1
-  * @param  None
-  * @retval None
-  */
-void SystemClock_Config(void)
-{
-  LL_FLASH_SetLatency(LL_FLASH_LATENCY_2);
-
-  while(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_2)
-  {
-  };
-
-  LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
-  LL_RCC_MSI_Enable();
-
-   /* Wait till MSI is ready */
-  while(LL_RCC_MSI_IsReady() != 1)
-  {
-  };
-
-  LL_RCC_MSI_EnableRangeSelection();
-  LL_RCC_MSI_SetRange(LL_RCC_MSIRANGE_6);
-  LL_RCC_MSI_SetCalibTrimming(0);
-  LL_RCC_PLL_ConfigDomain_SYS(LL_RCC_PLLSOURCE_MSI, LL_RCC_PLLM_DIV_1, 24, LL_RCC_PLLR_DIV_2);
-  LL_RCC_PLL_EnableDomain_SYS();
-  LL_RCC_PLL_Enable();
-
-   /* Wait till PLL is ready */
-  while(LL_RCC_PLL_IsReady() != 1)
-  {
-  };
-
-  LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL);
-
-   /* Wait till System clock is ready */
-  while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL)
-  {
-  };
-
-  LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
-  LL_RCC_SetAHB3Prescaler(LL_RCC_SYSCLK_DIV_1);
-  LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
-  LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1);
-
-  LL_Init1msTick(48000000);
-
-  /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */
-  LL_SetSystemCoreClock(48000000);
-}
-
-
-
-
-
-#ifdef USE_FULL_ASSERT
-
-/**
-  * @brief Reports the name of the source file and the source line number
-  * where the assert_param error has occurred.
-  * @param file: pointer to the source file name
-  * @param line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t *file, uint32_t line)
-{
-  /* USER CODE BEGIN 6 */
-  /* User can add his own implementation to report the file name and line number,
-    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  /* USER CODE END 6 */
-
-}
-
-#endif /* USE_FULL_ASSERT */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Src/stm32wlxx_it.c
deleted file mode 100644
index 818ce0d5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Src/stm32wlxx_it.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_it.c
-  * @author  MCD Application Team
-  * @brief   Interrupt Service Routines.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "stm32wlxx_it.h"
-
-/* Global variables ----------------------------------------------------------*/
-/* RTC handler declaration */
-RTC_HandleTypeDef RtcHandle;
-
-/* Functions Definition ------------------------------------------------------*/
-/******************************************************************************/
-/*            Cortex-M4 Processor Interruption and Exception Handlers         */
-/******************************************************************************/
-
-/* Exception handlers are implemented in the various source files of sbsfu application */
-
-/* NMI exception handler is implemented in sfu_low_level_flash_int.c file */
-/* Hard Fault exception handler is implemented in sfu_boot.c file */
-/* Memory Manage exception handler is implemented in sfu_boot.c file */
-/**
-  * @brief  This function handles Bus Fault exception.
-  * @param  None
-  * @retval None
-  */
-void BusFault_Handler(void)
-{
-  /* Go to infinite loop when Bus Fault exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Usage Fault exception.
-  * @param  None
-  * @retval None
-  */
-void UsageFault_Handler(void)
-{
-  /* Go to infinite loop when Usage Fault exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles SVCall exception.
-  * @param  None
-  * @retval None
-  */
-void SVC_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles Debug Monitor exception.
-  * @param  None
-  * @retval None
-  */
-void DebugMon_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles PendSVC exception.
-  * @param  None
-  * @retval None
-  */
-void PendSV_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles SysTick Handler.
-  * @param  None
-  * @retval None
-  */
-void SysTick_Handler(void)
-{
-  HAL_IncTick();
-}
-
-/******************************************************************************/
-/*                 STM32WLxx Peripherals Interrupt Handlers                  */
-/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
-/*  available peripheral interrupt handler's name please refer to the startup */
-/*  file (startup_stm32wlxx.s).                                               */
-/******************************************************************************/
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-/**
-  * @brief  This function handles Tamper interrupt request.
-  * @param  None
-  * @retval None
-  */
-void TAMP_STAMP_LSECSS_SSRU_IRQHandler()
-{
-  HAL_RTCEx_TamperIRQHandler(&RtcHandle);
-}
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/Project.ewp
deleted file mode 100644
index 24b33bbd..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/Project.ewp
+++ /dev/null
@@ -1,1230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_1_Image_BFU</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state>KMS_ENABLED</state>
-          <state>DISABLE_IMAGE_STATE_HANDLING</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\Core\Inc</state>
-          <state>$PROJ_DIR$\..\BFU\App</state>
-          <state>$PROJ_DIR$\..\BFU\Target</state>
-          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
-          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
-          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>Project.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$.\se_interface_appli.o"</postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state>SE_CORE_Bin</state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state>$PROJ_DIR$.\..\..\1_Image_SECoreBin\EWARM\SE_Core.bin</state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state>SE_CORE_Bin</state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state>SE_CORE_Bin</state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>Core</name>
-      <file>
-        <name>$PROJ_DIR$\..\Core\Src\main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
-      </file>
-    </group>
-    <group>
-      <name>BFU</name>
-      <group>
-        <name>App</name>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_loader.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_boot.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_com_loader.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_com_trace.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_error.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_test.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_fwimg_common.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_new_image.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_kms.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\App\sfu_interface_crypto_scheme.c</name>
-        </file>
-      </group>
-      <group>
-        <name>Target</name>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash_int.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash_ext.c</name>
-        </file>
-        <file>
-          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_security.c</name>
-        </file>
-      </group>
-    </group>
-    <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
-        <file>
-          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-        </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-      </file>
-    </group>
-    <group>
-      <name>STM32WLxx_LL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</name>
-      </file>
-    </group>
-    <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
-    <group>
-      <name>STM32_Secure_Engine</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
-      </file>
-    </group>
-    <group>
-      <name>STM32_Key_Management_Services</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
-      </file>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s
deleted file mode 100644
index 1431e7f3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s
+++ /dev/null
@@ -1,509 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm4.s
-;* Author             : MCD Application Team
-;* Description        : M4 core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M4 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     MemManage_Handler                 ; MPU Fault Handler
-        DCD     BusFault_Handler                  ; Bus Fault Handler
-        DCD     UsageFault_Handler                ; Usage Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     DebugMon_Handler                  ; Debug Monitor Handler
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     WWDG_IRQHandler                   ; Window WatchDog
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
-        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
-        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
-        DCD     RCC_IRQHandler                    ; RCC Interrupt
-        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
-        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
-        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
-        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
-        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
-        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
-        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
-        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
-        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
-        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
-        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
-        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
-        DCD     ADC_IRQHandler                    ; ADC Interrupt
-        DCD     DAC_IRQHandler                    ; DAC Interrupt
-        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
-        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
-        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
-        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
-        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
-        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
-        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
-        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
-        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
-        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
-        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
-        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
-        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                 ; USART1 Interrupt
-        DCD     USART2_IRQHandler                 ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
-        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
-        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
-        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
-        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
-        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
-        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
-        DCD     AES_IRQHandler                    ; AES Interrupt
-        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
-        DCD     PKA_IRQHandler                    ; PKA Interrupt
-        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
-        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
-        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
-        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
-        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
-        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
-        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
-        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK MemManage_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-MemManage_Handler
-        B MemManage_Handler
-
-        PUBWEAK BusFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-BusFault_Handler
-        B BusFault_Handler
-
-        PUBWEAK UsageFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-UsageFault_Handler
-        B UsageFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK DebugMon_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DebugMon_Handler
-        B DebugMon_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK WWDG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-WWDG_IRQHandler
-        B WWDG_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
-
-        PUBWEAK RTC_WKUP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_WKUP_IRQHandler
-        B RTC_WKUP_IRQHandler
-
-        PUBWEAK FLASH_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-FLASH_IRQHandler
-        B FLASH_IRQHandler
-
-        PUBWEAK RCC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_IRQHandler
-        B RCC_IRQHandler
-
-        PUBWEAK EXTI0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI0_IRQHandler
-        B EXTI0_IRQHandler
-
-        PUBWEAK EXTI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_IRQHandler
-        B EXTI1_IRQHandler
-
-        PUBWEAK EXTI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI2_IRQHandler
-        B EXTI2_IRQHandler
-
-        PUBWEAK EXTI3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_IRQHandler
-        B EXTI3_IRQHandler
-
-        PUBWEAK EXTI4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI4_IRQHandler
-        B EXTI4_IRQHandler
-
-        PUBWEAK DMA1_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_IRQHandler
-        B DMA1_Channel1_IRQHandler
-
-        PUBWEAK DMA1_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel2_IRQHandler
-        B DMA1_Channel2_IRQHandler
-
-        PUBWEAK DMA1_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel3_IRQHandler
-        B DMA1_Channel3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_IRQHandler
-        B DMA1_Channel4_IRQHandler
-
-        PUBWEAK DMA1_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel5_IRQHandler
-        B DMA1_Channel5_IRQHandler
-
-        PUBWEAK DMA1_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel6_IRQHandler
-        B DMA1_Channel6_IRQHandler
-
-        PUBWEAK DMA1_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel7_IRQHandler
-        B DMA1_Channel7_IRQHandler
-
-        PUBWEAK ADC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_IRQHandler
-        B ADC_IRQHandler
-
-        PUBWEAK DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DAC_IRQHandler
-        B DAC_IRQHandler
-
-        PUBWEAK C2SEV_PWR_C2H_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-C2SEV_PWR_C2H_IRQHandler
-        B C2SEV_PWR_C2H_IRQHandler
-
-        PUBWEAK COMP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-COMP_IRQHandler
-        B COMP_IRQHandler
-
-        PUBWEAK EXTI9_5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI9_5_IRQHandler
-        B EXTI9_5_IRQHandler
-
-        PUBWEAK TIM1_BRK_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_BRK_IRQHandler
-        B TIM1_BRK_IRQHandler
-
-        PUBWEAK TIM1_UP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_UP_IRQHandler
-        B TIM1_UP_IRQHandler
-
-        PUBWEAK TIM1_TRG_COM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_TRG_COM_IRQHandler
-        B TIM1_TRG_COM_IRQHandler
-
-        PUBWEAK TIM1_CC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_CC_IRQHandler
-        B TIM1_CC_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK I2C1_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_EV_IRQHandler
-        B I2C1_EV_IRQHandler
-
-        PUBWEAK I2C1_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_ER_IRQHandler
-        B I2C1_ER_IRQHandler
-
-        PUBWEAK I2C2_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_EV_IRQHandler
-        B I2C2_EV_IRQHandler
-
-        PUBWEAK I2C2_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_ER_IRQHandler
-        B I2C2_ER_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK EXTI15_10_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_10_IRQHandler
-        B EXTI15_10_IRQHandler
-
-        PUBWEAK RTC_Alarm_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_Alarm_IRQHandler
-        B RTC_Alarm_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK IPCC_C1_RX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_RX_IRQHandler
-        B IPCC_C1_RX_IRQHandler
-
-        PUBWEAK IPCC_C1_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_TX_IRQHandler
-        B IPCC_C1_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK I2C3_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_EV_IRQHandler
-        B I2C3_EV_IRQHandler
-
-        PUBWEAK I2C3_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_ER_IRQHandler
-        B I2C3_ER_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        PUBWEAK AES_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_IRQHandler
-        B AES_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PKA_IRQHandler
-        B PKA_IRQHandler
-
-        PUBWEAK DMA2_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel1_IRQHandler
-        B DMA2_Channel1_IRQHandler
-
-        PUBWEAK DMA2_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel2_IRQHandler
-        B DMA2_Channel2_IRQHandler
-
-        PUBWEAK DMA2_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel3_IRQHandler
-        B DMA2_Channel3_IRQHandler
-
-        PUBWEAK DMA2_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel4_IRQHandler
-        B DMA2_Channel4_IRQHandler
-
-        PUBWEAK DMA2_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel5_IRQHandler
-        B DMA2_Channel5_IRQHandler
-
-        PUBWEAK DMA2_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel6_IRQHandler
-        B DMA2_Channel6_IRQHandler
-
-        PUBWEAK DMA2_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel7_IRQHandler
-        B DMA2_Channel7_IRQHandler
-
-        PUBWEAK DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMAMUX1_OVR_IRQHandler
-        B DMAMUX1_OVR_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/steering_file.txt
deleted file mode 100644
index 15a2041f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/steering_file.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-show SE_APP_GetActiveFwInfo
-show SE_APP_ValidateFw
-show SE_KMS_Initialize
-show SE_KMS_Finalize
-show SE_KMS_GetInfo
-show SE_KMS_GetFunctionList
-show SE_KMS_GetSlotList
-show SE_KMS_GetSlotInfo
-show SE_KMS_GetTokenInfo
-show SE_KMS_GetMechanismInfo
-show SE_KMS_OpenSession
-show SE_KMS_CloseSession
-show SE_KMS_CreateObject
-show SE_KMS_DestroyObject
-show SE_KMS_GetAttributeValue
-show SE_KMS_SetAttributeValue
-show SE_KMS_FindObjectsInit
-show SE_KMS_FindObjects
-show SE_KMS_FindObjectsFinal
-show SE_KMS_EncryptInit
-show SE_KMS_Encrypt
-show SE_KMS_EncryptUpdate
-show SE_KMS_EncryptFinal
-show SE_KMS_DecryptInit
-show SE_KMS_Decrypt
-show SE_KMS_DecryptUpdate
-show SE_KMS_DecryptFinal
-show SE_KMS_DigestInit
-show SE_KMS_Digest
-show SE_KMS_DigestUpdate
-show SE_KMS_DigestFinal
-show SE_KMS_SignInit
-show SE_KMS_Sign
-show SE_KMS_VerifyInit
-show SE_KMS_Verify
-show SE_KMS_DeriveKey
-show SE_KMS_GenerateKeyPair
-show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 42bdad70..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,698 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_1_Image_BFU</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM4</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>BFU</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP -MPU</SimDllArguments>
-          <SimDlgDll>DCM.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> -MPU</TargetDllArguments>
-          <TargetDlgDll>TCM.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls>-Wno-format</MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED</Define>
-              <Undefine></Undefine>
-              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../Core/Inc;../BFU/App;../BFU/Target;../../1_Image_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>BFU.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--symdefs=se_interface_appli.txt
---keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/Core</GroupName>
-          <Files>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/main.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>se_core_bin.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>se_core_bin.s</FilePath>
-            </File>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/BFU/App</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_boot.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../BFU/App/sfu_boot.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_com_loader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\BFU\App\sfu_com_loader.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_com_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\BFU\App\sfu_com_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_error.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../BFU/App/sfu_error.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_fwimg_common.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../BFU/App/sfu_fwimg_common.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_interface_crypto_scheme.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../BFU/App/sfu_interface_crypto_scheme.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../BFU/App/sfu_kms.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_loader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\BFU\App\sfu_loader.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_new_image.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\BFU\App\sfu_new_image.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_test.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../BFU/App/sfu_test.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/BFU/Target</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\BFU\Target\sfu_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\BFU\Target\sfu_low_level_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_ext.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\BFU\Target\sfu_low_level_flash_ext.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_int.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\BFU\Target\sfu_low_level_flash_int.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_security.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../BFU/Target/sfu_low_level_security.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_nucleo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_iwdg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_spi.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_application.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_interface_bootloader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_interface_common.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_ll_utils.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components/>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/.cproject
deleted file mode 100644
index c1590b94..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/.cproject
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="BFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../BFU/App | ../../../BFU/Target | ../../../../1_Image_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/1_Image_BFU}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../Core/Inc"/>
-									<listOptionValue builtIn="false" value="../../BFU/App"/>
-									<listOptionValue builtIn="false" value="../../BFU/Target"/>
-									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
-									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/BFU.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-					<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.298519129" name="se_interface_application.c" rcbsApplicability="disable" resourcePath="Middlewares/STM32_Secure_Engine/se_interface_application.c" toolsToInvoke="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898.810348834">
-						<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898.810348834" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898">
-							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.310263369" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-								<listOptionValue builtIn="false" value="../../Core/Inc"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-								<listOptionValue builtIn="false" value="../../BFU/App"/>
-								<listOptionValue builtIn="false" value="../../BFU/Target"/>
-								<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
-								<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
-							</option>
-							<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1223368002" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-						</tool>
-					</fileInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="1_Image_BFU.null.839446873" name="1_Image_BFU"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1415671833;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1687290193">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="refreshScope"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/.project
deleted file mode 100644
index c70b9549..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/.project
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>1_Image_BFU</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Doc/readme.txt</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
-		</link>
-		<link>
-			<name>Application/Core/main.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
-		</link>
-		<link>
-			<name>Application/Core/stm32wlxx_hal_msp.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
-		</link>
-		<link>
-			<name>Application/Core/stm32wlxx_it.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_LL_Driver/stm32wlxx_ll_utils.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_utils.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/se_interface_kms.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_interface_application.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_interface_bootloader.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_interface_common.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_boot.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_boot.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_com_loader.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_com_loader.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_com_trace.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_com_trace.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_error.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_error.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_fwimg_common.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_fwimg_common.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_interface_crypto_scheme.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_interface_crypto_scheme.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_kms.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_kms.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_loader.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_loader.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_new_image.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_new_image.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/App/sfu_test.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_test.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/Target/sfu_low_level.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/Target/sfu_low_level_flash.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/Target/sfu_low_level_flash_ext.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash_ext.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/Target/sfu_low_level_flash_int.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash_int.c</locationURI>
-		</link>
-		<link>
-			<name>Application/BFU/Target/sfu_low_level_security.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_security.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/se_interface.txt
deleted file mode 100644
index ff9b2425..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/se_interface.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-SE_APP_GetActiveFwInfo
-SE_APP_ValidateFw
-SE_APP_SVC_Handler
-SE_SYS_SaveDisableIrq
-SE_SYS_RestoreEnableIrq
-SE_KMS_Initialize
-SE_KMS_Finalize
-SE_KMS_GetInfo
-SE_KMS_GetFunctionList
-SE_KMS_GetSlotList
-SE_KMS_GetSlotInfo
-SE_KMS_GetTokenInfo
-SE_KMS_GetMechanismInfo
-SE_KMS_OpenSession
-SE_KMS_CloseSession
-SE_KMS_CreateObject
-SE_KMS_DestroyObject
-SE_KMS_GetAttributeValue
-SE_KMS_SetAttributeValue
-SE_KMS_FindObjectsInit
-SE_KMS_FindObjects
-SE_KMS_FindObjectsFinal
-SE_KMS_EncryptInit
-SE_KMS_Encrypt
-SE_KMS_EncryptUpdate
-SE_KMS_EncryptFinal
-SE_KMS_DecryptInit
-SE_KMS_Decrypt
-SE_KMS_DecryptUpdate
-SE_KMS_DecryptFinal
-SE_KMS_DigestInit
-SE_KMS_Digest
-SE_KMS_DigestUpdate
-SE_KMS_DigestFinal
-SE_KMS_SignInit
-SE_KMS_Sign
-SE_KMS_VerifyInit
-SE_KMS_Verify
-SE_KMS_DeriveKey
-SE_KMS_GenerateKeyPair
-SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/readme.txt
deleted file mode 100644
index 7a9c2535..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/readme.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
-  @page 1_Image_BFU / Boot and Firmware Update Demo Application
-
-  @verbatim
-  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
-  * @file    readme.txt
-  * @brief   This application shows Boot and Firmware Update example.
-  ******************************************************************************
-  *
-  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                               www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Application Description
-
-The Boot (B) and Firmware Update (FU) solution allows the update
-of the STM32 microcontroller built-in program with new firmware versions, adding
-new features and correcting potential issues. The update process is performed in
-a secure way to prevent unauthorized updates.
-In addition, Secure Boot (Root of Trust services) checks and activates the STM32
-security mechanisms (if any), and checks the authenticity and integrity of user application
-code before every execution to ensure that invalid or malicious code cannot be run.
-The Firmware Update application receives the encrypted firmware image, decrypts
-it, then checks the authenticity and integrity of the code before installing it.
-
-The key management services provide cryptographic services to the user
-application through the pkcs11 APIs (KEY ID based APIs). User application keys are stored
-and can be updated in a secure way (authenticity check, data decryption and data integrity check).
-
-This example handles 1 firmware image with 1 single slot in FLASH allowing to
-maximize the user application size.
-As a consequence, some features are not available:
-* download a new firmware image from the application
-* resume firmware update procedure in case of power off during installation
-
-To be easily tailorable to 128 Kbytes footprint, SFU_DEBUG_MODE compilation switch is disabled.
-As a consequence there is no print on terminal during SBSFU execution.
-
-For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
-available from the STMicroelectronics microcontroller website www.st.com.
-
-@par Keywords
-
-Security, SBSFU, MPU
-
-@par Directory contents
-
-   - 1_Image_BFU/Core/Src/main.c                           Main application file
-   - 1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c              HAL MSP module
-   - 1_Image_BFU/Core/Src/stm32wlxx_it.c                   STM32 interrupt handlers
-   - 1_Image_BFU/Core/Inc/app_hw.h                         Hardware definition for application
-   - 1_Image_BFU/Core/Inc/main.h                           Header file for main.c
-   - 1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h             HAL configuration file
-   - 1_Image_BFU/Core/Inc/stm32wlxx_it.h                   Header file for stm32wlxx_it.c
-   - 1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h          BSP configuration file
-   - 1_Image_BFU/BFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
-   - 1_Image_BFU/BFU/App/sfu_com_loader.c                SBSFU communication module: local loader part
-   - 1_Image_BFU/BFU/App/sfu_com_trace.c                 SBSFU communication module: trace part
-   - 1_Image_BFU/BFU/App/sfu_error.c                     SBSFU errors management
-   - 1_Image_BFU/BFU/App/sfu_fwimg_common.c              SBSFU image handling: common functionalities/services
-   - 1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
-   - 1_Image_BFU/BFU/App/sfu_kms.c                       Key management service blob importation handling
-   - 1_Image_BFU/BFU/App/sfu_loader.c                    SBSFU Local Loader
-   - 1_Image_BFU/BFU/App/sfu_new_image.c                 SBSFU image handling: manage the new firmware image storage and installation
-   - 1_Image_BFU/BFU/App/sfu_test.c                      SBSFU security protection automatic test
-   - 1_Image_BFU/BFU/App/app_sfu.h                       Software configuration of SBSFU application
-   - 1_Image_BFU/BFU/App/sfu_boot.h                      Header file for sfu_boot.c
-   - 1_Image_BFU/BFU/App/sfu_com_loader.h                Header file for sfu_com_loader.c
-   - 1_Image_BFU/BFU/App/sfu_com_trace.h                 Header file for sfu_com_trace.c
-   - 1_Image_BFU/BFU/App/sfu_def.h                       General definition for SBSFU application
-   - 1_Image_BFU/BFU/App/sfu_error.h                     Header file for sfu_error.c file
-   - 1_Image_BFU/BFU/App/sfu_fsm_states.h                SBSFU FSM states definitions
-   - 1_Image_BFU/BFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling (sfu_fwimg_core.c and sfu_fwimg_services.c)
-   - 1_Image_BFU/BFU/App/sfu_fwimg_regions.h             FLASH regions definitions for image handling
-   - 1_Image_BFU/BFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
-   - 1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
-   - 1_Image_BFU/BFU/App/sfu_kms.h                       Header file for sfu_kms.c
-   - 1_Image_BFU/BFU/App/sfu_loader.h                    Header file for sfu_loader.c
-   - 1_Image_BFU/BFU/App/sfu_new_image.h                 Header file for sfu_new_image.c
-   - 1_Image_BFU/BFU/App/sfu_test.h                      Header file for sfu_test.c
-   - 1_Image_BFU/BFU/App/sfu_trace.h                     Header file for sfu_trace.c
-   - 1_Image_BFU/BFU/Target/sfu_low_level.c              SBSFU general low level interface
-   - 1_Image_BFU/BFU/Target/sfu_low_level_flash.c        SBSFU flash low level interface (wrapper)
-   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c    SBSFU internal flash low level interface
-   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c    SBSFU external flash low level interface
-   - 1_Image_BFU/BFU/Target/sfu_low_level_security.c     SBSFU security low level interface
-   - 1_Image_BFU/BFU/Target/sfu_low_level.h              Header file for general low level interface
-   - 1_Image_BFU/BFU/Target/sfu_low_level_flash.h        Header file for flash low level interface (wrapper)
-   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h    Header file for internal flash low level interface
-   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h    Header file for external flash low level interface
-   - 1_Image_BFU/BFU/Target/sfu_low_level_security.h     Header file for security low level interface
-
-@par Hardware and Software environment
-
-  - This example runs on STM32WL55xx devices.
-  - This example has been tested with NUCLEO-WL55JC RevC board and can be
-    easily tailored to any other supported device and development board.
-  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
-    is a feature provided by STM32Cube programmer available on www.st.com.
-  - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
-  - This example needs a terminal emulator.
-  - Microsoft Windows has a limitation whereby paths to files and directories cannot
-    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
-    shell scripts) to fail reading from or writing to such files.
-    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
-    up a local drive out of an existing directory on the hard drive, such as:
-    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
-
-@par How to use it ?
-
-Several steps to run BFU application :
-
-1. Compile projects in the following order. This is mandatory as each project requests some objects
-   generated by the compilation of the previous one:
-  - 1_Image_SECoreBin (see also SECoreBin/readme.txt)
-  - 1_Image_BFU
-  - 1_Image_UserApp (see also UserApp/readme.txt)
-
-2. Before loading BFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that
-   the following are valid for the device:
- - RDP Level 0
- - Write Protection disabled on all FLASH pages
- - Chip has been erased
-
-3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator
-   that can be downloaded from https://osdn.net/projects/ttssh2/) for UART connection with the board.
-   Support of YMODEM protocol is required. Serial port configuration should be :
- - Baud rate = 115200
- - Data = 8 bits
- - Parity = none
- - Stop = 1 bit
- - Flow control = none
-
-4. Load BFU image into target memory with your preferred toolchain or STM32CubeProgammer.
-
-5. Once the BFU software is downloaded, power cycle the board (unplug/plug USB cable) : the BFU
-   application starts and configures the security mechanisms if some of them are enabled.
-
-6. [If RDP is enabled] Power cycle the board a second time (unplug/plug the USB cable): the BFU application starts with
-   the configured securities turned on and the Tera Term connection is possible.
-   Caution: Make sure to use an up-to-date version of ST-LINK firmware else BFU may not start.
-
-7. At startup (Power On or Reset button pushed) :
- - Green LED blinks every 3 seconds when a local download is waited.
- - Green LED blinks every 250 ms in case of error in option bytes configuration.
- - 'C' is displayed when BFU is ready for a firmware image download. To be easily tailorable to 128 Kbytes footprint,
-   SFU_DEBUG_MODE compilation switch is disabled. As a consequence there is no print on terminal during
-   BFU execution.
-
-8. Send the user encrypted firmware file (\1_Image\1_Image_UserApp\Binary\UserApp.sfb) with Tera Term
-   by using menu "File > Transfer > YMODEM > Send..."
-
-Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
-Note2 : The following steps enable the protections disabled by default:
-        - Comment "SECBOOT_DISABLE_SECURITY_IPS" in app_sfu.h. This will enable RDP, WRP, DAP, DMA, IWDG protections
-          as well as attack surface reduction with MPU.
-        - As TAMPER detection can be very sensitive, the protection remains disabled by default.
-          Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
-        - In Linker_Common, update the mapping by:
-           - Renaming "mapping_fwimg.icf" to "mapping_fwimg_no_sec.icf".
-           - Renaming "mapping_sbsfu.icf" to "mapping_sbsfu_no_sec.icf".
-           - Renaming "mapping_fwimg_sec.icf" to "mapping_fwimg.icf".
-           - Renaming "mapping_sbsfu_sec.icf" to "mapping_sbsfu.icf".
-        These features achieve an attack surface reduction but will not make it possible to protect secrets.
-Note3 :  for Linux users Minicom can be used but to do so you need to compile the SBSFU project with the MINICOM_YMODEM switch enabled (app_sfu.h)
-
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/Project.ewp
deleted file mode 100644
index 1df6658c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/Project.ewp
+++ /dev/null
@@ -1,1056 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_1_Image_KMS_Blob</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Platform</state>
-          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>..\..\KMS_Blob.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
-      </file>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 7710f10c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_1_Image_KMS_Blob</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM4</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>KMS_blob</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
-            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP -MPU</SimDllArguments>
-          <SimDlgDll>DCM.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> -MPU</TargetDllArguments>
-          <TargetDlgDll>TCM.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>4</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Platform;../../1_Image_SECoreBin/Inc</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>0</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>KMS_Blob.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--diag_suppress L6305W</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>kms_blob_example_keys.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_1_Image_KMS_Blob"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/.cproject
deleted file mode 100644
index 5b0e678a..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/.cproject
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../1_Image_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/1_Image_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="1_Image_KMS_Blob.null.1082786794" name="1_Image_KMS_Blob"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1003497030;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1841871715">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope"/>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/postbuild.sh b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/postbuild.sh
deleted file mode 100644
index 82dd9adb..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/postbuild.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-# arg1 is the build directory
-# arg2 is the bin file path+name without extension
-# arg3 is the version
-
-projectdir=$1
-execname=$2
-version=$3
-
-userAppBinary=$projectdir"/../Binary"
-bin=$execname".bin"
-
-kmsu=$userAppBinary"/"$execname".kmsu"
-kmsb=$userAppBinary"/"$execname".kmsb"
-sign=$userAppBinary"/"$execname".sign"
-
-iv=$userAppBinary"/iv.bin"
-oemkey=$userAppBinary"/OEM_KEY_COMPANY1_key_AES_CBC.bin"
-ecckey=$userAppBinary"/ECCKEY.txt"
-
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname | grep -i -e windows -e mingw
-
-if [ $? == 0 ] && [   -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  cmd=""
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-echo "$cmd $prepareimage" > $1/output.txt
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-command=$cmd" "$prepareimage" enc -k "$oemkey" -i "$iv" "$bin" "$kmsu
-echo $command
-$command >> "$projectdir"/output.txt
-ret=$?
-if [ $ret == 0 ]; then
-# -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
-  command=$cmd" "$prepareimage" sha256 "$bin" "$sign" -p 16"
-  echo $command
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret == 0 ]; then 
-    command=$cmd" "$prepareimage" pack -k "$ecckey" -m "KMSB" -r 28 -v "$version" -i "$iv" -f "$kmsu" -t "$sign" -o 320 "$kmsb
-    echo $command
-    $command >> $projectdir"/output.txt"
-    ret=$?
-  fi
-fi
-
-if [ $ret == 0 ]; then
-  rm $sign
-  rm $kmsu
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/Project.ewp
deleted file mode 100644
index 759b7c04..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/Project.ewp
+++ /dev/null
@@ -1,1184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_1_Image_SECoreBin</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state>KMS_ENABLED</state>
-          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
-          <state>IT_MANAGEMENT_DISABLED</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
-          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\App</state>
-          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\Target</state>
-          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-          <state>$PROJ_DIR$</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>..\..\SE_Core.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>SE_CallGate</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
-    <group>
-      <name>STM32_Secure_Engine</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_bootinfo.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
-      </file>
-    </group>
-    <group>
-      <name>STM32_Key_Management_Services</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
-      </file>
-    </group>
-    <group>
-      <name>Third_Party</name>
-      <group>
-        <name>mbed-crypto</name>
-        <file>
-          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
-        </file>
-      </group>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
deleted file mode 100644
index 30d6619d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
+++ /dev/null
@@ -1,122 +0,0 @@
-::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfu=%userAppBinary%\\%execname%.sfu"
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-
-
-set "nonce=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\nonce.bin"
-set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\project.out"
-set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%"
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
deleted file mode 100644
index 0fb75e6d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
+++ /dev/null
@@ -1,119 +0,0 @@
-::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-
-set "oemkey="
-set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\project.out"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
-IF %ERRORLEVEL% NEQ 0 goto :error
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-:: no encryption
-set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:: no encryption so pack the binary file
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
deleted file mode 100644
index db7e4155..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
+++ /dev/null
@@ -1,121 +0,0 @@
-::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfu=%userAppBinary%\\%execname%.sfu"
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-
-set "iv=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\iv.bin"
-set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\project.out"
-set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%"
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf
deleted file mode 100644
index b97f0115..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf
+++ /dev/null
@@ -1,24 +0,0 @@
-/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
-
-define memory mem with size = 4G;
-
-/******************************************************************************/
-/*       Include of SE symbols file                                           */
-/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
-/*   specify the the directory to search for include files                    */
-/******************************************************************************/
-include "mapping_sbsfu.icf";
-include "mapping_fwimg.icf";
-
-initialize by copy { readwrite };
-do not initialize  { section .noinit, section BOOTINFO_DATA};
-
-/******************************************************************************/
-/*                          placement instructions                            */
-/******************************************************************************/
-place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
-place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
-place in SE_CODE_NOKEY_ROM_region {readonly};
-place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
-keep { section .SE_embedded_Keys };
-place in SE_RAM_region {readwrite, section BOOTINFO_DATA};
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/se_low_level.h
deleted file mode 100644
index 2857e3e6..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/se_low_level.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_low_level.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Engine low level interface
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SE_LOW_LEVEL_H
-#define SE_LOW_LEVEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_def.h"
-
-/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
-   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
-#include "sfu_fwimg_regions.h"
-
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup SE
-  * @{
-  */
-
-/** @addtogroup SE_HARDWARE
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
-  * @{
-  */
-/**
-  * @brief flash handling constants: these constants are used in se_fwimg.c
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
-  * @{
-  */
-
-/**
-  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
-  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
-  * 32-bit word.
-  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
-  */
-#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
-  do{                                  \
-    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
-  }while(0)
-
-/**
-  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
-  */
-#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
-  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
-  * @{
-  */
-
-/* == Code isolation : FIREWALL example ==*/
-#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
-#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
-
-/* == Code isolation : MPU example ==*/
-/**
-  * This switch enables the Secure Engine isolation based on the MPU usage.
-  * This switch must be enabled if the STM32 platform in use does not have a Firewall.
-  * This switch cannot be enabled if the example is provided with Firewall isolation.
-  */
-
-/** @addtogroup SE_LOW_LEVEL_Exported_Functions
-  * @{
-  */
-void SE_LL_CORE_Cleanup(void);
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_Functions
-  * @{
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_CRC_Config(void);
-SE_ErrorStatus SE_LL_CRC_Init(void);
-SE_ErrorStatus SE_LL_CRC_DeInit(void);
-uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
-SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-
-void NMI_Handler(void);
-void HardFault_Handler(void);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
-SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SE_LOW_LEVEL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/Project.uvoptx
deleted file mode 100644
index 43e75521..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/Project.uvoptx
+++ /dev/null
@@ -1,730 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>STM32WL55JC_Nucleo_1_Image_SECoreBin</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>1</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>1</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>1</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>201</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134218244</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\SECoreBin\../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c\201</Expression>
-        </Bp>
-      </Breakpoint>
-      <MemoryWindow1>
-        <Mm>
-          <WinNumber>1</WinNumber>
-          <SubType>0</SubType>
-          <ItemText>0x20005AF8</ItemText>
-          <AccSizeX>0</AccSizeX>
-        </Mm>
-      </MemoryWindow1>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>1</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>1</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>.\data_init.c</PathWithFileName>
-      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/User</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_bootinfo.c</PathWithFileName>
-      <FilenameWithoutPath>se_bootinfo.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
-      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
-      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
-      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
-      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
-      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
-      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
-      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
-      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
-      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
-      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
-      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
-      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
-      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
-      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
-      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
-      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
-      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
-      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>::CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>1</RteFlg>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 0720d5dd..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_1_Image_SECoreBin</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM4</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>SECoreBin</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name>prebuild.bat .</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP -MPU</SimDllArguments>
-          <SimDlgDll>DCM.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> -MPU</TargetDllArguments>
-          <TargetDlgDll>TCM.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
-              <Undefine></Undefine>
-              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../1_Image_BFU/BFU/App;../../1_Image_BFU/BFU/Target;../../Linker_Common/MDK-ARM</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>SECoreBin.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--entry=SE_CallGate
---diag_suppress L6404W
---diag_suppress L6314W</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>data_init.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\data_init.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>ca_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/ca_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/kms_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>nvms_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/nvms_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/se_low_level.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pka.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_bootinfo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_bootinfo.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_callgate.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_exception.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_fwimg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_startup.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_user_application.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_utils.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-          <Files>
-            <File>
-              <FileName>ca_core.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_der_x962.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_digest.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_dyn_obj.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_ecc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_enc_dec.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_entry.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_init.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_key_mgt.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_mem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_nvm_storage.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_objects.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_platf_objects.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_sign_verify.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
-          <Files>
-            <File>
-              <FileName>platform_util.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
-            </File>
-            <File>
-              <FileName>sha256.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_1_Image_SECoreBin"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct
deleted file mode 100644
index 679a84f3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct
+++ /dev/null
@@ -1,29 +0,0 @@
-#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
-; *************************************************************
-; *** Scatter-Loading Description File generated by uVision ***
-; *************************************************************
-#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
-#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
-
-
-; *** regions needed by SE_CoreBin project ***
-LR_SE SE_CODE_REGION_ROM_START {
-  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
-  *(.SE_CallGate_Code)
-  }
-  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
-  *(.SE_embedded_Keys)
-  }
-  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
-  *(.SE_Startup_Code)
-  }
-  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_ROM_REGION_SIZE{
-  .ANY (+RO)
-  } 
-  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
-  .ANY (+RW +ZI)
-  }
-  SE_region_RAM_Boot +0  {
-   *(BOOTINFO_DATA) 
-  }
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/.cproject
deleted file mode 100644
index a01ed63f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/.cproject
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../1_Image_BFU/CM4/BFU/App | ../../../1_Image_BFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/1_Image_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value=".."/>
-									<listOptionValue builtIn="false" value="../../Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
-									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/App"/>
-									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/Target"/>
-									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="1_Image_SECoreBin.null.394363235" name="1_Image_SECoreBin"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope"/>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/.project
deleted file mode 100644
index 52199163..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/.project
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>1_Image_SECoreBin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Doc/readme.txt</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
-		</link>
-		<link>
-			<name>Application/User/ca_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/kms_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/nvms_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/se_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_bootinfo.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_bootinfo.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.sh b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.sh
deleted file mode 100644
index db7fe674..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_AES128_GCM_WITH_AES128_GCM
-# arg1 is the build directory
-# arg2 is the elf file path+name
-# arg3 is the bin file path+name
-# arg4 is the firmware Id (1/2/3)
-# arg5 is the version
-# arg6 when present forces "bigelf" generation
-projectdir=$1
-FileName=${3##*/}
-execname=${FileName%.*}
-elf=$2
-bin=$3
-version=$5
-
-SecureEngine=${0%/*} 
-
-userAppBinary=$projectdir"/../Binary"
-
-sfu=$userAppBinary"/"$execname".sfu"
-sfb=$userAppBinary"/"$execname".sfb"
-sign=$userAppBinary"/"%execname".sign"
-headerbin=$userAppBinary"/"$execname"sfuh.bin"
-bigbinary=$userAppBinary"/BFU_"$execname".bin"
-elfbackup=$userAppBinary"/BFU_"$execname".elf"
- 
-nonce=$SecureEngine"/../Binary/nonce.bin"
-magic="SFU"$4
-oemkey=$SecureEngine"/../Binary/OEM_KEY_COMPANY"$4"_key_AES_GCM.bin"
-current_directory=`pwd`
-cd  $SecureEngine"/../../"
-SecureDir=`pwd`
-cd $current_directory
-sbsfuelf="$SecureDir/1_Image_BFU/STM32CubeIDE/Debug/BFU.elf"
-
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname | grep -i -e windows -e mingw >/dev/null > /dev/null 2>&1
-if [ $? -eq 0 ] && [  -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  export PATH=$basedir"\win\prepareimage";$PATH > /dev/null 2>&1
-  cmd=""
-  prepareimage="prepareimage.exe"
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-command=$cmd" "$prepareimage" enc -k "$oemkey" -n "$nonce" "$bin" "$sfu
-$command > $projectdir"/output.txt"
-ret=$?
-if [ $ret -eq 0 ]; then
-  command=$cmd" "$prepareimage" sign -k "$oemkey" -n "$nonce" "$bin" "$sign
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret -eq 0 ]; then 
-    command=$cmd" "$prepareimage" pack -m "$magic" -k "$oemkey"  -r 112 -v "$version" -n "$nonce" -f "$sfu" -t "$sign" "$sfb" -o 512"
-    $command >> $projectdir"/output.txt"
-    ret=$?
-    if [ $ret -eq 0 ]; then
-      command=$cmd" "$prepareimage" header -m "$magic" -k  "$oemkey" -r 112 -v "$version"  -n "$nonce" -f "$sfu" -t "$sign" -o 512 "$headerbin
-      $command >> $projectdir"/output.txt"
-      ret=$?
-      if [ $ret -eq 0 ]; then
-        command=$cmd" "$prepareimage" merge -v 0 -e 1 -i "$headerbin" -s "$sbsfuelf" -u "$elf" "$bigbinary
-        $command >> $projectdir"/output.txt"
-        ret=$?
-        if [ $ret -eq 0 ] && [ $# = 6 ]; then
-          echo "Generating the global elf file BFU and userApp"
-          echo "Generating the global elf file BFU and userApp" >> $projectdir"/output.txt"
-          uname | grep -i -e windows -e mingw > /dev/null 2>&1
-          if [ $? -eq 0 ]; then
-            # Set to the default installation path of the Cube Programmer tool
-            # If you installed it in another location, please update PATH.
-            PATH="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin":$PATH > /dev/null 2>&1
-            programmertool="STM32_Programmer_CLI.exe"
-          else
-            which STM32_Programmer_CLI > /dev/null
-            if [ $? = 0 ]; then
-              programmertool="STM32_Programmer_CLI"
-            else
-              echo "fix access path to STM32_Programmer_CLI"
-            fi
-          fi
-          command=$programmertool" -ms "$elf" "$headerbin" "$sbsfuelf
-          $command >> $projectdir"/output.txt"
-          ret=$?
-        fi
-      fi
-    fi
-  fi
-fi
-
-
-if [ $ret -eq 0 ]; then
-  rm $sign
-  rm $sfu
-  rm $headerbin
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  if [ -e  "$elf" ]; then
-    rm  $elf
-  fi
-  if [ -e "$elfbackup" ]; then 
-    rm  $elfbackup
-  fi
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.sh b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.sh
deleted file mode 100644
index 21ba5a75..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.sh
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-# arg1 is the build directory
-# arg2 is the elf file path+name
-# arg3 is the bin file path+name
-# arg4 is the firmware Id (1/2/3)
-# arg5 is the version
-# arg6 when present forces "bigelf" generation
-projectdir=$1
-FileName=${3##*/}
-execname=${FileName%.*}
-elf=$2
-bin=$3
-version=$5
-
-SecureEngine=${0%/*}
-
-userAppBinary=$projectdir"/../Binary"
-
-sfb=$userAppBinary"/"$execname".sfb"
-sign=$userAppBinary"/"$execname".sign"
-headerbin=$userAppBinary"/"$execname"sfuh.bin"
-bigbinary=$userAppBinary"/BFU_"$execname".bin"
-magic="SFU"$4
-ecckey=$SecureEngine"/../Binary/ECCKEY"$4".txt"
-current_directory=`pwd`
-cd  $SecureEngine"/../../"
-SecureDir=`pwd`
-cd $current_directory
-sbsfuelf="$SecureDir/1_Image_BFU/STM32CubeIDE/Debug/BFU.elf"
-
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname  | grep -i -e windows -e mingw > /dev/null 2>&1
-if [ $? -eq 0 ] && [  -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  export PATH=$basedir"\win\prepareimage";$PATH > /dev/null 2>&1
-  cmd=""
-  prepareimage="prepareimage.exe"
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-echo "$cmd $prepareimage" >> $1/output.txt
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-
-
-command=$cmd" "$prepareimage" sha256 "$bin" "$sign
-$command >> $projectdir"/output.txt"
-ret=$?
-if [ $ret -eq 0 ]; then 
-  command=$cmd" "$prepareimage" pack -m "$magic" -k "$ecckey" -p 1 -r 44 -v "$version" -f "$bin" -t "$sign" "$sfb" -o 512" 
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret -eq 0 ]; then
-    command=$cmd" "$prepareimage" header -m "$magic" -k  "$ecckey"  -p 1 -r 44 -v "$version"  -f "$bin" -t "$sign" -o 512 "$headerbin
-    $command >> $projectdir"/output.txt"
-    ret=$?
-    if [ $ret -eq 0 ]; then
-      command=$cmd" "$prepareimage" merge -v 0 -e 1 -i "$headerbin" -s "$sbsfuelf" -u "$elf" "$bigbinary
-      $command >> $projectdir"/output.txt"
-      ret=$?
-      if [ $ret -eq 0 ] && [ $# = 6 ]; then
-        echo "Generating the global elf file (BFU and userApp)"
-        echo "Generating the global elf file (BFU and userApp)" >> $projectdir"/output.txt"
-        uname | grep -i -e windows -e mingw > /dev/null 2>&1
-        if [ $? -eq 0 ]; then
-          # Set to the default installation path of the Cube Programmer tool
-          # If you installed it in another location, please update PATH.
-          PATH="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin":$PATH > /dev/null 2>&1
-          programmertool="STM32_Programmer_CLI.exe"
-        else
-          which STM32_Programmer_CLI > /dev/null
-          if [ $? = 0 ]; then
-            programmertool="STM32_Programmer_CLI"
-          else
-            echo "fix access path to STM32_Programmer_CLI"
-          fi
-        fi
-        command=$programmertool" -ms "$elf" "$headerbin" "$sbsfuelf
-        $command >> $projectdir"/output.txt"
-        ret=$?
-      fi
-    fi
-  fi
-fi
-
-if [ $ret -eq 0 ]; then
-  rm $sign
-  rm $headerbin
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  if [ -e  "$elf" ]; then
-    rm  $elf
-  fi
-  if [ -e "$elfbackup" ]; then 
-    rm  $elfbackup
-  fi
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.sh b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.sh
deleted file mode 100644
index aa0b9928..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-# arg1 is the build directory
-# arg2 is the elf file path+name
-# arg3 is the bin file path+name
-# arg4 is the firmware Id (1/2/3)
-# arg5 is the version
-# arg6 when present forces "bigelf" generation
-projectdir=$1
-FileName=${3##*/}
-execname=${FileName%.*}
-elf=$2
-bin=$3
-version=$5
-
-SecureEngine=${0%/*} 
-
-userAppBinary=$projectdir"/../Binary"
-
-sfu=$userAppBinary"/"$execname".sfu"
-sfb=$userAppBinary"/"$execname".sfb"
-sign=$userAppBinary"/"$execname".sign"
-headerbin=$userAppBinary"/"$execname"sfuh.bin"
-bigbinary=$userAppBinary"/BFU_"$execname".bin"
-
-iv=$SecureEngine"/../Binary/iv.bin"
-magic="SFU"$4
-oemkey=$SecureEngine"/../Binary/OEM_KEY_COMPANY"$4"_key_AES_CBC.bin"
-ecckey=$SecureEngine"/../Binary/ECCKEY"$4".txt"
-current_directory=`pwd`
-cd  $SecureEngine"/../../"
-SecureDir=`pwd`
-cd $current_directory
-sbsfuelf="$SecureDir/1_Image_BFU/STM32CubeIDE/Debug/BFU.elf"
-
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname | grep -i -e windows -e mingw > /dev/null 2>&1
-
-if [ $? -eq 0 ] && [   -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  export PATH=$basedir"\win\prepareimage";$PATH > /dev/null 2>&1
-  cmd=""
-  prepareimage="prepareimage.exe"
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-echo "$cmd $prepareimage" >> $1/output.txt
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-
-command=$cmd" "$prepareimage" enc -k "$oemkey" -i "$iv" "$bin" "$sfu
-$command > "$projectdir"/output.txt
-ret=$?
-if [ $ret -eq 0 ]; then
-  command=$cmd" "$prepareimage" sha256 "$bin" "$sign
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret -eq 0 ]; then 
-    command=$cmd" "$prepareimage" pack -m "$magic" -k "$ecckey" -r 28 -v "$version" -i "$iv" -f "$sfu" -t "$sign" "$sfb" -o 512"
-    $command >> $projectdir"/output.txt"
-    ret=$?
-    if [ $ret -eq 0 ]; then
-      command=$cmd" "$prepareimage" header -m "$magic" -k  "$ecckey" -r 28 -v "$version"  -i "$iv" -f "$sfu" -t "$sign" -o 512 "$headerbin
-      $command >> $projectdir"/output.txt"
-      ret=$?
-      if [ $ret -eq 0 ]; then
-        command=$cmd" "$prepareimage" merge -v 0 -e 1 -i "$headerbin" -s "$sbsfuelf" -u "$elf" "$bigbinary
-        $command >> $projectdir"/output.txt"
-        ret=$?
-        if [ $ret -eq 0 ] && [ $# = 6 ]; then
-          echo "Generating the global elf file BFU and userApp"
-          echo "Generating the global elf file BFU and userApp" >> $projectdir"/output.txt"
-          uname | grep -i -e windows -e mingw > /dev/null 2>&1
-          if [ $? -eq 0 ]; then
-            # Set to the default installation path of the Cube Programmer tool
-            # If you installed it in another location, please update PATH.
-            PATH="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin":$PATH > /dev/null 2>&1
-            programmertool="STM32_Programmer_CLI.exe"
-          else
-            which STM32_Programmer_CLI > /dev/null
-            if [ $? = 0 ]; then
-              programmertool="STM32_Programmer_CLI"
-            else
-              echo "fix access path to STM32_Programmer_CLI"
-            fi
-          fi
-          command=$programmertool" -ms "$elf" "$headerbin" "$sbsfuelf
-          $command >> $projectdir"/output.txt"
-          ret=$?
-        fi
-      fi
-    fi
-  fi
-fi
-
-if [ $ret -eq 0 ]; then
-  rm $sign
-  rm $sfu
-  rm $headerbin
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  if [ -e  "$elf" ]; then
-    rm  $elf
-  fi
-  if [ -e "$elfbackup" ]; then 
-    rm  $elfbackup
-  fi
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld
deleted file mode 100644
index abd290a8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-** LinkerScript
-*/
-
-/* Entry Point */
-ENTRY(SE_CallGate)
-
-/* Generate a link error if heap and stack don't fit into RAM */
-_Min_Heap_Size = 0x200;      /* required amount of heap  */
-_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
-
-INCLUDE mapping_fwimg.ld
-INCLUDE mapping_sbsfu.ld
-
-/* Define output sections */
-SECTIONS
-{
-  .SE_CallGate_Code : { KEEP(*(.SE_CallGate_Code)) } > SE_CallGate_ROM_region
-
-  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
-
-  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
-  .text :
-  {
-    . = ALIGN(8);
-    *(.text)           /* .text sections (code) */
-    *(.text*)          /* .text* sections (code) */
-    *(.glue_7)         /* glue arm to thumb code */
-    *(.glue_7t)        /* glue thumb to arm code */
-    *(.eh_frame)
-
-    KEEP (*(.init))
-    KEEP (*(.fini))
-
-    . = ALIGN(8);
-    _etext = .;        /* define a global symbols at end of code */
-  } >SE_Code_NoKey_ROM_region
-
-  /* Constant data goes into FLASH */
-  .rodata :
-  {
-    . = ALIGN(8);
-    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
-    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .ARM.extab   : 
-  { 
-  . = ALIGN(8);
-  *(.ARM.extab* .gnu.linkonce.armextab.*)
-  . = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .ARM : {
-	. = ALIGN(8);
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-	. = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .preinit_array     :
-  {
-	. = ALIGN(8);
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array*))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-	. = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-  
-  .init_array :
-  {
-	. = ALIGN(8);
-    PROVIDE_HIDDEN (__init_array_start = .);
-    KEEP (*(SORT(.init_array.*)))
-    KEEP (*(.init_array*))
-    PROVIDE_HIDDEN (__init_array_end = .);
-	. = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .fini_array :
-  {
-	. = ALIGN(8);
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(SORT(.fini_array.*)))
-    KEEP (*(.fini_array*))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-	. = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-  
-  /* used by the startup to initialize data */
-  _sidata = LOADADDR(.data);
-
-  /* Initialized data sections goes into RAM, load LMA copy after code */
-  .data : 
-  {
-    . = ALIGN(8);
-    _sdata = .;        /* create a global symbol at data start */
-    *(.data)           /* .data sections */
-    *(.data*)          /* .data* sections */
-
-    . = ALIGN(8);
-    _edata = .;        /* define a global symbol at data end */
-  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
-
-  
-  /* Uninitialized data section */
-  . = ALIGN(8);
-  .bss :
-  {
-    /* This is used by the startup in order to initialize the .bss section */
-    _sbss = .;         /* define a global symbol at bss start */
-    __bss_start__ = _sbss;
-    *(.bss)
-    *(.bss*)
-    *(COMMON)
-
-    . = ALIGN(8);
-    _ebss = .;         /* define a global symbol at bss end */
-    __bss_end__ = _ebss;
-  } >SE_RAM_region
-
-  BOOTINFO_DATA : 
-  {
-    . = ALIGN(8);
-    _sBOOTINFO_DATA = .;        /* create a global symbol at BOOTINFO_DATA start */
-    *(BOOTINFO_DATA)          /* BOOTINFO_DATA* sections */
-    *(BOOTINFO_DATA*)
-    . = ALIGN(8);
-    _eBOOTINFO_DATA = .;        /* define a global symbol at BOOTINFO_DATA end */
-  
-  } >SE_RAM_region AT> SE_Code_NoKey_ROM_region
-
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
-  ._user_heap_stack :
-  {
-    . = ALIGN(8);
-    PROVIDE ( end = . );
-    PROVIDE ( _end = . );
-    . = . + _Min_Heap_Size;
-    . = . + _Min_Stack_Size;
-    . = ALIGN(8);
-  } >SE_RAM_region
-   
-  /* Remove information from the standard libraries */
-  /DISCARD/ :
-  {
-    libc.a ( * )
-    libm.a ( * )
-    libgcc.a ( * )
-  }
-
-  .ARM.attributes 0 : { *(.ARM.attributes) }
-}
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/prebuild.sh b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/prebuild.sh
deleted file mode 100644
index 7358087d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/prebuild.sh
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/bin/bash - 
-#prebuild script 
-echo prebuild.sh : started > $1/output.txt
-asmfile=$1/se_key.s
-# comment this line to force python
-# python is used if  executable not found
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-SBSFUBootLoader=$1/../..
-
-# test if window executable usable
-prepareimage=$basedir/win/prepareimage/prepareimage.exe
-uname  | grep -i -e windows -e mingw > /dev/null 2>&1
-
-if [ $? -eq 0 ] && [  -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable" >> $1/output.txt
-  echo "prepareimage with windows executable"
-  cmd=""
-else
-  # line for python
-  echo "prepareimage with python script" >> $1/output.txt
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd=python
-fi
-
-echo "$cmd $prepareimage" >> $1/output.txt
-crypto_h=$1/../Inc/se_crypto_config.h
-
-#clean
-if [ -e "$1/crypto.txt" ]; then
-  rm $1"/crypto.txt"
-fi
-
-if [ -e "$asmfile" ]; then
-  rm $asmfile
-fi
-
-if [ -e "$1"/postbuild.sh ]; then
-  rm $1"/postbuild.sh"
-fi
-
-#get crypto name
-command="$cmd $prepareimage conf "$crypto_h""
-echo $command
-crypto=`$command`
-echo $crypto > $1"/crypto.txt"
-echo "$crypto selected">> $1"/output.txt"
-echo $crypto selected
-ret=$?
-
-kms_config=$1"/kms_platf_objects_config.h"
-kms_tmp=$1"/kms_platf_objects_config.h.tmp"
-
-#Patch KMS embedded keys with Blob Keys
-if [ $ret -eq 0 ]; then
-  kms_blob_ecckey=$SBSFUBootLoader"/1_Image_KMS_Blob/Binary/ECCKEY.txt"
-  command=$cmd" "$prepareimage" inject -k "$kms_blob_ecckey" -f "$1"/../Inc/kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ "$kms_tmp
-  echo $command
-  $command
-  ret=$?
-  if [ $ret -eq 0 ]; then
-    kms_blob_oemkey=$SBSFUBootLoader"/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin"
-    command=$cmd" "$prepareimage" inject -k "$kms_blob_oemkey" -f "$kms_tmp" -p @AES_BLOB_KEY@ "$kms_config
-    echo $command
-    $command
-    ret=$?
-  fi
-fi    
-
-# Patch AES keys part
-if [ $ret -eq 0 ]; then
-  type="vide"
-  if [ $crypto = "SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" ]; then
-    type="GCM"
-  fi  
-  if [ $crypto = "SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" ]; then
-    type="CBC"
-  fi
-  if [ $crypto = "SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" ]; then
-# For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
-    type="CBC"
-  fi
-  if [ $type != "vide" ]; then
-    oemkey="$1/../Binary/OEM_KEY_COMPANY1_key_AES_$type.bin"
-    command="cat "$kms_config
-    $command > $kms_tmp
-    ret=$?
-    if [ $? -eq 0 ]; then
-      command=$cmd" "$prepareimage" inject -k "$oemkey" -f "$kms_tmp" -p @AES_SBSFU_KEY_1@ "$kms_config
-      echo $command
-      $command
-      ret=$?
-    fi
-
-    oemkey="$1/../Binary/OEM_KEY_COMPANY2_key_AES_$type.bin"
-    if [ -e "$oemkey" ]; then
-      command="cat "$kms_config
-      $command > $kms_tmp
-      ret=$?
-      if [ $? -eq 0 ]; then
-        command=$cmd" "$prepareimage" inject -k "$oemkey" -f "$kms_tmp" -p @AES_SBSFU_KEY_2@ "$kms_config
-        echo $command
-        $command
-        ret=$?
-      fi
-    fi
-
-    oemkey="$1/../Binary/OEM_KEY_COMPANY3_key_AES_$type.bin"
-    if [ -e "$oemkey" ]; then
-      command="cat "$kms_config
-      $command > $kms_tmp
-      ret=$?
-      if [ $? -eq 0 ]; then
-        command=$cmd" "$prepareimage" inject -k "$oemkey" -f "$kms_tmp" -p @AES_SBSFU_KEY_3@ "$kms_config
-        echo $command
-        $command
-        ret=$?
-      fi
-    fi
-  fi
-fi
-
-# Patch ECC keys part
-if [ $ret -eq 0 ]; then
-  type="vide"
-  if [ $crypto = "SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" ]; then
-    type="ECC"
-  fi  
-  if [ $crypto = "SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" ]; then
-    type="ECC"
-  fi
-  if [ $crypto = "SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" ]; then
-# For KMS dummy ECC keys are needed
-    type="ECC"
-  fi
-  if [ $type != "vide" ]; then
-    ecckey="$1/../Binary/ECCKEY1.txt"
-    command="cat "$kms_config
-    $command > $kms_tmp
-    ret=$?
-    if [ $? -eq 0 ]; then
-      command=$cmd" "$prepareimage" inject -k "$ecckey" -f "$kms_tmp" -p @ECDSA_SBSFU_KEY_1@ "$kms_config
-      echo $command
-      $command
-      ret=$?
-    fi
-
-    ecckey="$1/../Binary/ECCKEY2.txt"
-    if [ -e "$ecckey" ]; then
-      command="cat "$kms_config
-      $command > $kms_tmp
-      ret=$?
-      if [ $? -eq 0 ]; then
-        command=$cmd" "$prepareimage" inject -k "$ecckey" -f "$kms_tmp" -p @ECDSA_SBSFU_KEY_2@ "$kms_config
-        echo $command
-        $command
-        ret=$?
-      fi
-    fi
-
-    ecckey="$1/../Binary/ECCKEY3.txt"
-    if [ -e "$ecckey" ]; then
-      command="cat "$kms_config
-      $command > $kms_tmp
-      ret=$?
-      if [ $? -eq 0 ]; then
-        command=$cmd" "$prepareimage" inject -k "$ecckey" -f "$kms_tmp" -p @ECDSA_SBSFU_KEY_3@ "$kms_config
-        echo $command
-        $command
-        ret=$?
-      fi
-    fi
-  fi
-fi
-
-rm $kms_tmp
-
-if [ $ret -eq 0 ]; then
-#no error recopy post build script
-    uname  | grep -i -e windows -e mingw > /dev/null 2>&1
-    if [ $? -eq 0 ]; then
-        echo "recopy postbuild.sh script with "$crypto".sh script"
-        command="cat "$1"/"$crypto".sh"
-        $command > "$1"/"postbuild.sh"
-        ret=$?
-    else
-        echo "create symbolic link postbuild.sh to "$crypto".sh"
-        command="ln -s ./"$crypto".sh "$1"/postbuild.sh"
-        $command
-        ret=$?
-    fi
-fi
-
-if [ $ret != 0 ]; then
-#an error
-echo $command : failed >> $1/output.txt 
-echo $command : failed
-read -n 1 -s
-exit 1
-fi
-exit 0
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/ca_low_level.c
deleted file mode 100644
index f641765f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/ca_low_level.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ca_low_level.c
-  * @author  MCD Application Team
-  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef CA_LOW_LEVEL_C
-#define CA_LOW_LEVEL_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "CryptoApi/ca.h"
-
-/* Private defines -----------------------------------------------------------*/
-/* Private typedef -----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-
-
-/* Exported functions implementation -----------------------------------------*/
-
-#if defined(CA_HAL_CRYPTOLIB_SUPP)
-
-#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
- || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
- || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
- || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
-     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
-
-/**
-  * @brief CRYP MSP Initialization
-  * This function configures the hardware resources
-  * @param hcryp: CRYP handle pointer
-  * @retval None
-  */
-void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
-{
-  if (hcryp->Instance == CA_AES_INSTANCE)
-  {
-    /* Release AES/CRYP from reset state */
-    __HAL_RCC_AES_RELEASE_RESET();
-    /* Peripheral clock enable */
-    __HAL_RCC_AES_CLK_ENABLE();
-  }
-}
-
-/**
-  * @brief CRYP MSP De-Initialization
-  * This function freeze the hardware resources
-  * @param hcryp: CRYP handle pointer
-  * @retval None
-  */
-void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
-{
-  if (hcryp->Instance == CA_AES_INSTANCE)
-  {
-    /* Peripheral clock disable */
-    __HAL_RCC_AES_CLK_DISABLE();
-    /* Force AES/CRYP into reset state */
-    __HAL_RCC_AES_FORCE_RESET();
-  }
-}
-#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
-       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
-
-
-#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
-/**
-  * @brief      PKA MSP Initialization
-  *             This function configures the hardware resources used in this example
-  * @param[in] hpka: PKA handle pointer
-  * @retval None
-  */
-void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
-{
-  if (hpka->Instance == CA_PKA_INSTANCE)
-  {
-    /* Release PKA from reset state */
-    __HAL_RCC_PKA_RELEASE_RESET();
-    /* Peripheral clock enable */
-    __HAL_RCC_PKA_CLK_ENABLE();
-  }
-}
-
-/**
-  * @brief      PKA MSP De-Initialization
-  *             This function freeze the hardware resources used in this example
-  * @param[in] hpka: PKA handle pointer
-  * @retval None
-  */
-void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
-{
-  if (hpka->Instance == CA_PKA_INSTANCE)
-  {
-    /* Peripheral clock disable */
-    __HAL_RCC_PKA_CLK_DISABLE();
-    /* Force PKA into reset state */
-    __HAL_RCC_PKA_FORCE_RESET();
-  }
-}
-#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
-
-#endif /* CA_HAL_CRYPTOLIB_SUPP */
-
-
-#if defined(CA_ST_CRYPTOLIB_SUPP)
-/**
-  * @brief      CRC initialization
-  *             This function release reset and clock CRC IP peripheral
-  * @retval None
-  */
-void CA_LL_CRC_Init(void)
-{
-  /* Force CRC into reset state */
-  __HAL_RCC_CRC_FORCE_RESET();
-  /* Release CRC from reset state */
-  __HAL_RCC_CRC_RELEASE_RESET();
-  /* Peripheral clock enable */
-  __HAL_RCC_CRC_CLK_ENABLE();
-}
-
-#endif /* CA_ST_CRYPTOLIB_SUPP */
-
-#endif /* CA_LOW_LEVEL_C */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/se_low_level.c
deleted file mode 100644
index e69e2547..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/se_low_level.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_low_level.c
-  * @author  MCD Application Team
-  * @brief   Secure Engine Interface module.
-  *          This file provides set of firmware functions to manage SE low level
-  *          interface functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SE_LOW_LEVEL_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_low_level.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#endif /* __CC_ARM */
-#include "se_exception.h"
-#include "string.h"
-
-/** @addtogroup SE Secure Engine
-  * @{
-  */
-/** @defgroup  SE_HARDWARE SE Hardware Interface
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Private_Variables Private Variables
-  * @{
-  */
-static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
-
-static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Private_Functions Private Functions
-  * @{
-  */
-
-static uint32_t SE_LL_GetPage(uint32_t Address);
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
-  * @{
-  */
-
-/**
-  * @brief  Set CRC configuration and call HAL CRC initialization function.
-  * @param  None.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
-  */
-SE_ErrorStatus SE_LL_CRC_Config(void)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  CrcHandle.Instance = CRC;
-  /* The input data are not inverted */
-  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
-
-  /* The output data are not inverted */
-  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
-
-  /* The Default polynomial is used */
-  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
-  /* The default init value is used */
-  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
-  /* The input data are 32-bit long words */
-  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
-  /* CRC Init*/
-  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Wrapper to HAL CRC initialization function.
-  * @param  None
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_CRC_Init(void)
-{
-  /* CRC Peripheral clock enable */
-  __HAL_RCC_CRC_CLK_ENABLE();
-
-  return SE_LL_CRC_Config();
-}
-
-/**
-  * @brief  Wrapper to HAL CRC de-initialization function.
-  * @param  None
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_CRC_DeInit(void)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
-  {
-    /* Initialization OK */
-    e_ret_status = SE_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Wrapper to HAL CRC Calculate function.
-  * @param  pBuffer: pointer to data buffer.
-  * @param  uBufferLength: buffer length in 32-bits word.
-  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
-  */
-uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
-{
-  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
-}
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
-  * @{
-  */
-
-/**
-  * @brief  This function does an erase of nb pages in user flash area
-  * @param  pStart: pointer to  user flash area
-  * @param  Length: number of bytes.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
-{
-  uint32_t page_error = 0U;
-  uint32_t start = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef p_erase_init;
-  SE_ErrorStatus e_ret_status = SE_SUCCESS;
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-    /* Fill EraseInit structure*/
-    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
-    p_erase_init.Page          = SE_LL_GetPage(start);
-    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
-    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
-    {
-      e_ret_status = SE_ERROR;
-    }
-
-    /* Lock the Flash to disable the flash control register access (recommended
-    to protect the FLASH memory against possible unwanted operation) *********/
-    (void)HAL_FLASH_Lock();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Write in Flash  protected area
-  * @param  pDestination pointer to destination area in Flash
-  * @param  pSource pointer to input buffer
-  * @param  Length number of bytes to be written
-  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
-  */
-
-SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  SE_ErrorStatus ret = SE_SUCCESS;
-  uint32_t i;
-  uint32_t verified = 0U;
-  uint32_t destination = (uint32_t)pDestination;
-  uint32_t source = (uint32_t)pSource;
-
-  if (Length == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  /* Area should be inside 1 of the firmware image headers */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      verified = 1U;
-    }
-  }
-  if (verified == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-    for (i = 0U; i < Length; i += 8U)
-    {
-      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
-      {
-        ret = SE_ERROR;
-        break;
-      }
-    }
-
-    /* Lock the Flash to disable the flash control register access (recommended
-    to protect the FLASH memory against possible unwanted operation) */
-    (void)HAL_FLASH_Lock();
-  }
-  else
-  {
-    ret = SE_ERROR;
-  }
-  return ret;
-}
-
-/**
-  * @brief  Read in Flash protected area
-  * @param  pDestination: Start address for target location
-  * @param  pSource: pointer on buffer with data to read
-  * @param  Length: Length in bytes of data buffer
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  uint32_t source = (uint32_t)pSource;
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  uint32_t i;
-  uint32_t verified = 0U;
-
-
-  /* Area should be inside 1 of the firmware image headers
-     or inside 1 of the download areas */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      verified = 1U;
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
-        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
-    {
-      verified = 1U;
-    }
-  }
-
-  if (verified == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  SE_DoubleECC_Error_Counter = 0U;
-  (void)memcpy(pDestination, pSource, Length);
-  if (SE_DoubleECC_Error_Counter == 0U)
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  SE_DoubleECC_Error_Counter = 0U;
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
-  * @{
-  */
-
-/**
-  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
-  * @param pxSE_Metadata: Firmware metadata.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(pxSE_Metadata);
-  return SE_SUCCESS;
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @brief Check if an array is inside the RAM of the product
-  * @param Addr : address  of array
-  * @param Length : length of array in byte
-  */
-SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
-      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= (SE_REGION_RAM_END + 1U))))
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is in sbsfu ram.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
-      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se ram.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
-                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
-      || ((0xFFFFFFFFUL - addr_start) < Length))
-  {
-    e_ret_status = SE_SUCCESS;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se rom.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
-                         || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
-      )))
-      || ((0xFFFFFFFFUL - addr_start) < Length))
-  {
-    e_ret_status = SE_SUCCESS;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-/**
-  * @brief function to disable all IRQ, previously enabled ones are stored in parameter
-  * @param pIrqState: IRQ state buffer
-  * @param IrqStateNb: Number of IRQ state that can be stored
-  * @retval SE_ErrorStatus SE_SUCCESS when complete successfully, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se rom.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: Address of the FLASH Memory
-  * @retval The page of a given address
-  */
-static uint32_t SE_LL_GetPage(uint32_t Address)
-{
-  uint32_t page;
-
-  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
-  {
-    /* Bank 1 */
-    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
-  }
-  else
-  {
-    /* Bank 2 */
-    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
-  }
-  return page;
-}
-
-/**
-  * @brief  Gets the bank of a given address
-  * @param  Addr: Address of the FLASH Memory
-  * @retval The bank of a given address
-  */
-
-
-/**
-  * @brief  Get Link Register value (LR)
-  * @param  None.
-  * @retval LR Register value
-  */
-__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
-{
-  register uint32_t result;
-
-#if defined ( __ICCARM__ ) || ( __GNUC__ )
-  __ASM volatile("MOV %0, LR" : "=r"(result));
-#elif defined ( __CC_ARM )
-  __ASM volatile("MOV result, __return_address()");
-#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
-
-  return result;
-}
-
-/*
-   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
-   not to use extra registers (on top of scratch registers), because it would change the stack pointer
-   position. Then compiler optimizations are customized to ensure that.
-*/
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O1")))
-#endif /* __ICCARM__ */
-
-/**
-  * @brief  NMI Handler present for handling Double ECC NMI interrupt
-  * @param  None.
-  * @retval None.
-  */
-void NMI_Handler(void)
-{
-  uint32_t *p_sp;
-  uint32_t lr;
-  uint16_t opcode_msb;
-
-  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
-  {
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
-
-    /* Memorize error to ignore the read value */
-    SE_DoubleECC_Error_Counter++;
-
-    lr = __get_LR();
-
-    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
-    if (((lr) & (0xFU)) == 0xDU)
-    {
-      /* interrupted code was using Process Stack Pointer */
-      p_sp = (uint32_t *)__get_PSP();
-    }
-    else
-    {
-      /* interrupted code was using Main Stack Pointer */
-      p_sp = (uint32_t *)__get_MSP();
-    }
-
-    /* Test caller mode T bit from CPSR in stack */
-    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
-    {
-      /* Thumb  mode.
-         Test PC in stack.
-         If bits [15:11] of the halfword being decoded take any of the following values,
-         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
-         Otherwise, the halfword is a 16-bit instruction.
-      */
-      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
-      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
-      {
-        /* execute next instruction PC +4  */
-        *(p_sp + 6U) += 4U;
-      }
-      else
-      {
-        /* execute next instruction PC +2  */
-        *(p_sp + 6U) += 2U;
-      }
-    }
-    else
-    {
-      /* ARM mode execute next instruction PC +4 */
-      *(p_sp + 6U) += 4U;
-    }
-  }
-  else
-  {
-    /* This exception occurs for another reason than flash double ECC errors */
-    SE_NMI_ExceptionHandler();
-  }
-}
-
-/**
-  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
-  * @param  None.
-  * @retvat void
-  */
-void HardFault_Handler(void)
-{
-  SE_NMI_ExceptionHandler();
-}
-
-/**
-  * @brief  Cleanup SE CORE
-  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
-  *
-  */
-void  SE_LL_CORE_Cleanup(void)
-{
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/readme.txt
deleted file mode 100644
index 4c742c61..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/readme.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
-  @page 1_Image_SECoreBin / Secure Engine Core binary generation.
-
-  @verbatim
-  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
-  * @file    readme.txt
-  * @brief   Secure Engine Core binary generation.
-  *          SE Core binary exports SE CallGate function entry point for
-  *          FU Application.
-  ******************************************************************************
-  *
-  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                               www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Application Description
-
-This application is used to generate Secure Engine Core binary file to be linked
-with Boot & Firmware Update application (BFU).
-SE Core binary exports a single entry point to SE CallGate function and a startup
-method for data initialization. It is based on the Secure Engine Middleware.
-
-Generated SE Core Binary embeds Key Management Services accessible through this same
-single entry point using APIs defined by iKMS interface.
-
-It has to be compiled before BFU project.
-
-Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default cryptographic
-scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are provided and can be
-selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
-- SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
-- SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-- SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
-
-For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
-available from the STMicroelectronics microcontroller website www.st.com.
-
-@par Keywords
-
-Security, KMS, SBSFU
-
-@par Directory contents
-
-   - 1_Image_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
-   - 1_Image_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
-   - 1_Image_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
-   - 1_Image_SECoreBin/Src/se_low_level.c                      Low level interface
-   - 1_Image_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
-   - 1_Image_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
-   - 1_Image_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
-   - 1_Image_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
-   - 1_Image_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
-   - 1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
-                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
-   - 1_Image_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
-                                                                Exported to KMS user to ease embedded object usage
-   - 1_Image_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
-   - 1_Image_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
-   - 1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
-   - 1_Image_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
-   - 1_Image_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
-   - 1_Image_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
-   - 1_Image_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
-   - 1_Image_SECoreBin/Binary/ECCKEY2.txt                      Private ECCDSA key for signature verification of a possible 2nd active image
-   - 1_Image_SECoreBin/Binary/ECCKEY3.txt                      Private ECCDSA key for signature verification of a possible 3rd active image
-   - 1_Image_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
-   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
-   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
-   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin Public key for AES CBC encryption of a possible 2nd active image
-   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin Public key for AES GCM encryption of a possible 2nd active image
-   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY3_key_AES_CBC.bin Public key for AES CBC encryption of a possible 3rd active image
-   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY3_key_AES_GCM.bin Public key for AES GCM encryption of a possible 3rd active image
-
-@par Hardware and Software environment
-
-  - This example runs on STM32WL55xx devices
-  - This example has been tested with NUCLEO-WL55JC RevC board and can be
-    easily tailored to any other supported device and development board.
-  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
-    is a feature provided by STM32Cube programmer available on www.st.com.
-  - Microsoft Windows has a limitation whereby paths to files and directories cannot
-    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
-    shell scripts) to fail reading from or writing to such files.
-    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
-    up a local drive out of an existing directory on the hard drive, such as:
-    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
-
-   
-@par IDE prebuild script
-
-In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
-This preliminary processing is in charge of:
- - determining the requested cryptographic scheme
- - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of BFU & Blob importation keys into the KMS embedded objects pattern file)
- - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
-A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic key).
-The IDE does not track this update so you need to force the rebuild of the project manually.
-
-@par How to use it ?
-
-In order to generate Secure Engine Core binary file, you must do the following :
- - Open your preferred toolchain
- - Rebuild the project
-
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/Project.ewp
deleted file mode 100644
index 42643233..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/Project.ewp
+++ /dev/null
@@ -1,1189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_1_Image_UserApp</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state>KMS_ENABLED</state>
-          <state>DISABLE_IMAGE_STATE_HANDLING</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
-          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
-          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\App</state>
-          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
-          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>..\..\UserApp.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\1_Image_SECoreBin\EWARM\PostBuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 1 1"</postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\com.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\common.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\fw_update_app.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\se_user_code.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\test_protections.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\ymodem.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\flash_if.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\kms_object_update_app.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\tkms_app.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\tkms_app_derive_key.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\tkms_app_encrypt_decrypt.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\tkms_app_sign_verify.c</name>
-      </file>
-    </group>
-    <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
-        <file>
-          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-        </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-      </file>
-    </group>
-    <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
-    <group>
-      <name>STM32_Secure_Engine</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\1_Image_BFU\EWARM\se_interface_appli.o</name>
-      </file>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s
deleted file mode 100644
index 1431e7f3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s
+++ /dev/null
@@ -1,509 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm4.s
-;* Author             : MCD Application Team
-;* Description        : M4 core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M4 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     MemManage_Handler                 ; MPU Fault Handler
-        DCD     BusFault_Handler                  ; Bus Fault Handler
-        DCD     UsageFault_Handler                ; Usage Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     DebugMon_Handler                  ; Debug Monitor Handler
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     WWDG_IRQHandler                   ; Window WatchDog
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
-        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
-        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
-        DCD     RCC_IRQHandler                    ; RCC Interrupt
-        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
-        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
-        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
-        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
-        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
-        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
-        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
-        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
-        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
-        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
-        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
-        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
-        DCD     ADC_IRQHandler                    ; ADC Interrupt
-        DCD     DAC_IRQHandler                    ; DAC Interrupt
-        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
-        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
-        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
-        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
-        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
-        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
-        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
-        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
-        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
-        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
-        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
-        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
-        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                 ; USART1 Interrupt
-        DCD     USART2_IRQHandler                 ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
-        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
-        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
-        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
-        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
-        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
-        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
-        DCD     AES_IRQHandler                    ; AES Interrupt
-        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
-        DCD     PKA_IRQHandler                    ; PKA Interrupt
-        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
-        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
-        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
-        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
-        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
-        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
-        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
-        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK MemManage_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-MemManage_Handler
-        B MemManage_Handler
-
-        PUBWEAK BusFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-BusFault_Handler
-        B BusFault_Handler
-
-        PUBWEAK UsageFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-UsageFault_Handler
-        B UsageFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK DebugMon_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DebugMon_Handler
-        B DebugMon_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK WWDG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-WWDG_IRQHandler
-        B WWDG_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
-
-        PUBWEAK RTC_WKUP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_WKUP_IRQHandler
-        B RTC_WKUP_IRQHandler
-
-        PUBWEAK FLASH_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-FLASH_IRQHandler
-        B FLASH_IRQHandler
-
-        PUBWEAK RCC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_IRQHandler
-        B RCC_IRQHandler
-
-        PUBWEAK EXTI0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI0_IRQHandler
-        B EXTI0_IRQHandler
-
-        PUBWEAK EXTI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_IRQHandler
-        B EXTI1_IRQHandler
-
-        PUBWEAK EXTI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI2_IRQHandler
-        B EXTI2_IRQHandler
-
-        PUBWEAK EXTI3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_IRQHandler
-        B EXTI3_IRQHandler
-
-        PUBWEAK EXTI4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI4_IRQHandler
-        B EXTI4_IRQHandler
-
-        PUBWEAK DMA1_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_IRQHandler
-        B DMA1_Channel1_IRQHandler
-
-        PUBWEAK DMA1_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel2_IRQHandler
-        B DMA1_Channel2_IRQHandler
-
-        PUBWEAK DMA1_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel3_IRQHandler
-        B DMA1_Channel3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_IRQHandler
-        B DMA1_Channel4_IRQHandler
-
-        PUBWEAK DMA1_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel5_IRQHandler
-        B DMA1_Channel5_IRQHandler
-
-        PUBWEAK DMA1_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel6_IRQHandler
-        B DMA1_Channel6_IRQHandler
-
-        PUBWEAK DMA1_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel7_IRQHandler
-        B DMA1_Channel7_IRQHandler
-
-        PUBWEAK ADC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_IRQHandler
-        B ADC_IRQHandler
-
-        PUBWEAK DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DAC_IRQHandler
-        B DAC_IRQHandler
-
-        PUBWEAK C2SEV_PWR_C2H_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-C2SEV_PWR_C2H_IRQHandler
-        B C2SEV_PWR_C2H_IRQHandler
-
-        PUBWEAK COMP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-COMP_IRQHandler
-        B COMP_IRQHandler
-
-        PUBWEAK EXTI9_5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI9_5_IRQHandler
-        B EXTI9_5_IRQHandler
-
-        PUBWEAK TIM1_BRK_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_BRK_IRQHandler
-        B TIM1_BRK_IRQHandler
-
-        PUBWEAK TIM1_UP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_UP_IRQHandler
-        B TIM1_UP_IRQHandler
-
-        PUBWEAK TIM1_TRG_COM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_TRG_COM_IRQHandler
-        B TIM1_TRG_COM_IRQHandler
-
-        PUBWEAK TIM1_CC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_CC_IRQHandler
-        B TIM1_CC_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK I2C1_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_EV_IRQHandler
-        B I2C1_EV_IRQHandler
-
-        PUBWEAK I2C1_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_ER_IRQHandler
-        B I2C1_ER_IRQHandler
-
-        PUBWEAK I2C2_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_EV_IRQHandler
-        B I2C2_EV_IRQHandler
-
-        PUBWEAK I2C2_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_ER_IRQHandler
-        B I2C2_ER_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK EXTI15_10_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_10_IRQHandler
-        B EXTI15_10_IRQHandler
-
-        PUBWEAK RTC_Alarm_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_Alarm_IRQHandler
-        B RTC_Alarm_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK IPCC_C1_RX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_RX_IRQHandler
-        B IPCC_C1_RX_IRQHandler
-
-        PUBWEAK IPCC_C1_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_TX_IRQHandler
-        B IPCC_C1_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK I2C3_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_EV_IRQHandler
-        B I2C3_EV_IRQHandler
-
-        PUBWEAK I2C3_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_ER_IRQHandler
-        B I2C3_ER_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        PUBWEAK AES_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_IRQHandler
-        B AES_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PKA_IRQHandler
-        B PKA_IRQHandler
-
-        PUBWEAK DMA2_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel1_IRQHandler
-        B DMA2_Channel1_IRQHandler
-
-        PUBWEAK DMA2_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel2_IRQHandler
-        B DMA2_Channel2_IRQHandler
-
-        PUBWEAK DMA2_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel3_IRQHandler
-        B DMA2_Channel3_IRQHandler
-
-        PUBWEAK DMA2_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel4_IRQHandler
-        B DMA2_Channel4_IRQHandler
-
-        PUBWEAK DMA2_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel5_IRQHandler
-        B DMA2_Channel5_IRQHandler
-
-        PUBWEAK DMA2_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel6_IRQHandler
-        B DMA2_Channel6_IRQHandler
-
-        PUBWEAK DMA2_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel7_IRQHandler
-        B DMA2_Channel7_IRQHandler
-
-        PUBWEAK DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMAMUX1_OVR_IRQHandler
-        B DMAMUX1_OVR_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf
deleted file mode 100644
index 0726aa48..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf
+++ /dev/null
@@ -1,43 +0,0 @@
-/*###ICF### Set of symbols used in UserApp project ****/
-
-define memory mem with size = 4G;
-
-/******************************************************************************/
-/*       Include of SBSFU symbols file                                        */
-/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
-/*   specify the the directory to search for include files                    */
-/******************************************************************************/
-include "mapping_sbsfu.icf";
-include "mapping_fwimg.icf";
-
-/*-Memory Regions-*/
-define symbol __ICFEDIT_region_ROM_start__      = __ICFEDIT_SLOT_Active_1_start__ + 512;
-define symbol __ICFEDIT_region_ROM_end__        = __ICFEDIT_SLOT_Active_1_end__ ;
-define symbol __ICFEDIT_region_RAM_start__      = __ICFEDIT_SE_region_RAM_end__ + 1;
-define symbol __ICFEDIT_region_RAM_end__        = 0x20017FFF;
-
-/*-Sizes-*/
-define symbol __ICFEDIT_size_cstack__ = 0x800;
-define symbol __ICFEDIT_size_heap__ = 0x200;
-
-define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];
-define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];
-
-/* to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes) */
-define root section aes_block_padding with alignment=16
-{
-udata8 "Force Alignment";
-pad_to 16;
-};
-
-define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
-define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
-
-initialize by copy { readwrite };
-do not initialize  { section .noinit };
-
-place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
-
-place in ROM_region   { readonly, last section aes_block_padding };
-place in RAM_region   { readwrite, block CSTACK, block HEAP };
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 6b8db4f7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/* COM usage define */
-#define USE_BSP_COM_FEATURE                 0U
-
-/* COM log define */
-#define USE_COM_LOG                         0U
-
-/* IRQ priorities */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/tkms_app.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/tkms_app.h
deleted file mode 100644
index e6a35163..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/tkms_app.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for tkms application examples.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef KMS_APP_H
-#define KMS_APP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_sfu.h"
-
-/* Exported macros -----------------------------------------------------------*/
-#if  defined(SFU_IWDG_PROTECT_ENABLE)
-/* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register */
-#define INVOKE_SCHEDULE_NEEDS()            \
-  do {                                     \
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);  \
-  } while(0);
-#else
-#define INVOKE_SCHEDULE_NEEDS()            \
-  do {                                     \
-    ;                                      \
-  } while(0);
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-
-
-/* Exported functions ------------------------------------------------------- */
-void tkms_app_menu(void);
-void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length);
-
-CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage);
-CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage);
-CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage);
-CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pMessage);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* KMS_APP_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/Project.uvoptx
deleted file mode 100644
index 206b7123..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/Project.uvoptx
+++ /dev/null
@@ -1,796 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>STM32WL55JC_Nucleo_1_Image_UserApp</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>1</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>0</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>0</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>0</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile>.\STM32WL_CM4.ini</tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=98,207,509,709,0)(1007=673,180,880,401,0)(1008=566,409,942,645,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>55</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134345422</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>C:\git\wl_master\Firmware\Projects\NUCLEO-WL55JC\Applications\BFU_1_Image\1_Image_UserApp\Src\mpu.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\UserApp_M0\../Src/mpu.c\55</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>141</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134337248</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\startup_stm32wl55xx_cm4.s</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\UserApp_M0\startup_stm32wl55xx_cm4.s\141</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>400</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134346614</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>../Src/test_protections.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\UserApp_M0\../Src/test_protections.c\400</Expression>
-        </Bp>
-      </Breakpoint>
-      <MemoryWindow1>
-        <Mm>
-          <WinNumber>1</WinNumber>
-          <SubType>2</SubType>
-          <ItemText>0x2000A400</ItemText>
-          <AccSizeX>0</AccSizeX>
-        </Mm>
-      </MemoryWindow1>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>0</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>1</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-      <SystemViewers>
-        <Entry>
-          <Name>System Viewer\DBGMCU</Name>
-          <WinId>35904</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\NVIC</Name>
-          <WinId>35901</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\SCB</Name>
-          <WinId>35905</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\SYSCFG</Name>
-          <WinId>35903</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\SYSCFG_continue</Name>
-          <WinId>35902</WinId>
-        </Entry>
-      </SystemViewers>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>.\startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/User</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/com.c</PathWithFileName>
-      <FilenameWithoutPath>com.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/common.c</PathWithFileName>
-      <FilenameWithoutPath>common.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/flash_if.c</PathWithFileName>
-      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/fw_update_app.c</PathWithFileName>
-      <FilenameWithoutPath>fw_update_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/kms_object_update_app.c</PathWithFileName>
-      <FilenameWithoutPath>kms_object_update_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/se_user_code.c</PathWithFileName>
-      <FilenameWithoutPath>se_user_code.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/test_protections.c</PathWithFileName>
-      <FilenameWithoutPath>test_protections.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/tkms_app.c</PathWithFileName>
-      <FilenameWithoutPath>tkms_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/tkms_app_derive_key.c</PathWithFileName>
-      <FilenameWithoutPath>tkms_app_derive_key.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/tkms_app_encrypt_decrypt.c</PathWithFileName>
-      <FilenameWithoutPath>tkms_app_encrypt_decrypt.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/tkms_app_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>tkms_app_sign_verify.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/ymodem.c</PathWithFileName>
-      <FilenameWithoutPath>ymodem.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>38</FileNumber>
-      <FileType>3</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\1_Image_BFU\MDK-ARM\STM32WL55JC_Nucleo\Exe\se_interface_appli.txt</PathWithFileName>
-      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>::CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>1</RteFlg>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 75757b28..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_1_Image_UserApp</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM4</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>UserApp</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
-            <UserProg2Name>.\..\..\1_Image_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP -MPU</SimDllArguments>
-          <SimDlgDll>DCM.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> -MPU</TargetDllArguments>
-          <TargetDlgDll>TCM.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED,DISABLE_IMAGE_STATE_HANDLING</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../1_Image_SECoreBin/Inc;../../1_Image_BFU/BFU/App;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>.\UserApp.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>.\startup_stm32wl55xx_cm4.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>com.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/com.c</FilePath>
-            </File>
-            <File>
-              <FileName>common.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/common.c</FilePath>
-            </File>
-            <File>
-              <FileName>flash_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/flash_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>fw_update_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/fw_update_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_object_update_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/kms_object_update_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/main.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_user_code.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/se_user_code.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/stm32wlxx_it.c</FilePath>
-            </File>
-            <File>
-              <FileName>test_protections.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/test_protections.c</FilePath>
-            </File>
-            <File>
-              <FileName>tkms_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/tkms_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>tkms_app_derive_key.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/tkms_app_derive_key.c</FilePath>
-            </File>
-            <File>
-              <FileName>tkms_app_encrypt_decrypt.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/tkms_app_encrypt_decrypt.c</FilePath>
-            </File>
-            <File>
-              <FileName>tkms_app_sign_verify.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/tkms_app_sign_verify.c</FilePath>
-            </File>
-            <File>
-              <FileName>ymodem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/ymodem.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_nucleo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_iwdg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_appli.txt</FileName>
-              <FileType>3</FileType>
-              <FilePath>..\..\1_Image_BFU\MDK-ARM\STM32WL55JC_Nucleo\Exe\se_interface_appli.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_1_Image_UserApp"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/UserApp.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/UserApp.sct
deleted file mode 100644
index 4ab8c3d2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/UserApp.sct
+++ /dev/null
@@ -1,29 +0,0 @@
-#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
-; *************************************************************
-; *** Scatter-Loading Description File generated by uVision ***
-; *************************************************************
-#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
-#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
-
-LR_ROM (SLOT_ACTIVE_1_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
-  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
-  *.o (RESET, +First)
-  }
-  ROM_region +0 {
-  *(InRoot$$Sections)
-  .ANY (+RO)
-  }
-; SBSFU RAM area is reused for UserApp  
-  RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE {
-  .ANY (STACK)
-  .ANY (HEAP)
-  .ANY (+RW +ZI)
-  }
-}
-
-; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes)
-LR_ROM1(+0) ALIGN(16) {
-  ForAlignment +0 {
-    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
-  }
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/.cproject
deleted file mode 100644
index aee28e0e..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/.cproject
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="UserApp" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../1_Image_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;" prebuildStep="">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../1_Image_BFU/BFU/App | ../../../1_Image_BFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/1_Image_UserApp}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="DISABLE_IMAGE_STATE_HANDLING"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
-									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
-									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/App"/>
-									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata.1159753008" name="Place data in their own sections (-fdata-sections)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata" useByScannerDiscovery="false" value="false" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1663313052" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.401807756" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":se_interface_app.o"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
-									<listOptionValue builtIn="false" value="../../../1_Image_BFU/STM32CubeIDE/Debug"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath.741843002" name="Use C math library (-Wl,--start-group -lc -lm -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="1_Image_UserApp.null.394363235" name="1_Image_UserApp"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/1_Image_UserApp"/>
-		</configuration>
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/1_Image_UserApp"/>
-		</configuration>
-	</storageModule>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/.project
deleted file mode 100644
index aa5cadf4..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/.project
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>1_Image_UserApp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Doc/readme.txt</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
-		</link>
-		<link>
-			<name>Application/User/com.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/com.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/common.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/common.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/flash_if.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/flash_if.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/fw_update_app.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/fw_update_app.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/kms_object_update_app.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/kms_object_update_app.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/main.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/main.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/se_user_code.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/se_user_code.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/stm32wlxx_it.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/stm32wlxx_it.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/test_protections.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/test_protections.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/tkms_app.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/tkms_app_derive_key.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_derive_key.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/tkms_app_encrypt_decrypt.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_encrypt_decrypt.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/tkms_app_sign_verify.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_sign_verify.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/ymodem.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/ymodem.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/system_stm32wlxx.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/1_Image_BFU/STM32CubeIDE/Debug/se_interface_app.o</locationURI>
-		</link>
-		<link>
-			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/flash_if.c
deleted file mode 100644
index fe37d3ee..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/flash_if.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    flash_if.c
-  * @author  MCD Application Team
-  * @brief   FLASH Interface module.
-  *          This file provides set of firmware functions to manage Flash
-  *          Interface functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup USER_APP_COMMON Common
-  * @{
-  */
-/* Includes ------------------------------------------------------------------*/
-#include "flash_if.h"
-#include "string.h"
-#include <stdio.h>
-
-/* Uncomment the line below if you want some debug logs */
-#define FLASH_IF_DBG
-#ifdef FLASH_IF_DBG
-#define FLASH_IF_TRACE printf
-#else
-#define FLASH_IF_TRACE(...)
-#endif /* FLASH_IF_DBG */
-
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
-#define EXTERNAL_FLASH_ADDRESS    0x90000000U
-#define BLOC_64_KBYTES            0x10000U
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-
-
-/* Private function prototypes -----------------------------------------------*/
-static uint32_t GetPage(uint32_t uAddr);
-static HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void);
-
-/* Public functions : wrapper ---------------------------------------------------------*/
-
-/**
-  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
-  * @param  none
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_If_Init(void)
-{
-  HAL_StatusTypeDef e_ret_status = HAL_OK;
-
-  e_ret_status = FLASH_INT_Init();
-  if (e_ret_status == HAL_OK)
-  {
-    e_ret_status = FLASH_EXT_Init();
-  }
-  return e_ret_status;
-}
-/**
-  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pStart: flash address to be erased
-  * @param  uLength: number of bytes
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_If_Erase_Size(void *pStart, uint32_t uLength)
-{
-  /* Check Flash start address */
-  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
-  {
-    return FLASH_INT_If_Erase_Size(pStart, uLength);
-  }
-  else
-  {
-    return FLASH_EXT_If_Erase_Size(pStart, uLength);
-  }
-}
-
-/**
-  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pDestination: flash address to write
-  * @param  pSource: pointer on buffer with data to write
-  * @param  uLength: number of bytes
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  /* Check Flash destination address */
-  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
-  {
-    return FLASH_INT_If_Write(pDestination, pSource, uLength);
-  }
-  else
-  {
-    return FLASH_EXT_If_Write(pDestination, pSource, uLength);
-  }
-}
-
-/**
-  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pDestination: pointer on buffer to store data
-  * @param  pSource: flash address to read
-  * @param  uLength: number of bytes
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  /* Check Flash source address */
-  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
-  {
-    return FLASH_INT_If_Read(pDestination, pSource, uLength);
-  }
-  else
-  {
-    return FLASH_EXT_If_Read(pDestination, pSource, uLength);
-  }
-}
-
-/* Public functions : internal flash --------------------------------------------------------- */
-/**
-  * @brief  This function initialize the internal flash interface if required
-  * @param  none
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_INT_Init(void)
-{
-  return HAL_OK;
-}
-
-/**
-  * @brief  This function does an erase of n (depends on Length) pages in user flash area
-  * @param  pStart: Start of user flash area
-  * @param  uLength: number of bytes.
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_INT_If_Erase_Size(void *pStart, uint32_t uLength)
-{
-  uint32_t page_error = 0U;
-  uint32_t uStart = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef x_erase_init;
-  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
-  uint32_t first_page = 0U;
-  uint32_t nb_pages = 0U;
-  uint32_t chunk_nb_pages;
-
-  /* Clear error flags raised during previous operation */
-  e_ret_status = FLASH_INT_If_Clear_Error();
-
-  if (e_ret_status == HAL_OK)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() == HAL_OK)
-    {
-      first_page = GetPage(uStart);
-      /* Get the number of pages to erase from 1st page */
-      nb_pages = GetPage(uStart + uLength - 1U) - first_page + 1U;
-      x_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
-      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
-      do
-      {
-        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
-        x_erase_init.Page = first_page;
-        x_erase_init.NbPages = chunk_nb_pages;
-        first_page += chunk_nb_pages;
-        nb_pages -= chunk_nb_pages;
-        if (HAL_FLASHEx_Erase(&x_erase_init, &page_error) != HAL_OK)
-        {
-          HAL_FLASH_GetError();
-          e_ret_status = HAL_ERROR;
-        }
-        /* Refresh Watchdog */
-        WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-      } while (nb_pages > 0);
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      HAL_FLASH_Lock();
-
-    }
-    else
-    {
-      e_ret_status = HAL_ERROR;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
-  * @note   After writing data buffer, the flash content is checked.
-  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
-  * @param  pSource: pointer on buffer with data to write
-  * @param  uLength: Length of data buffer in bytes. It has to be 8 bytes aligned.
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_INT_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
-  uint32_t i = 0U;
-  uint32_t pdata = (uint32_t)pSource;
-
-  /* Clear error flags raised during previous operation */
-  e_ret_status = FLASH_INT_If_Clear_Error();
-
-  if (e_ret_status == HAL_OK)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() != HAL_OK)
-    {
-      return HAL_ERROR;
-
-    }
-    else
-    {
-      /* DataLength must be a multiple of 64 bit */
-      for (i = 0U; i < uLength; i += 8U)
-      {
-        /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
-        be done by word */
-        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)pDestination,  *((uint64_t *)(pdata + i)))
-            == HAL_OK)
-        {
-          /* Check the written value */
-          if (*(uint64_t *)pDestination != *(uint64_t *)(pdata + i))
-          {
-            /* Flash content doesn't match SRAM content */
-            e_ret_status = HAL_ERROR;
-            break;
-          }
-          /* Increment FLASH Destination address */
-          pDestination = (void *)((uint32_t)pDestination + 8U);
-        }
-        else
-        {
-          /* Error occurred while writing data in Flash memory */
-          e_ret_status = HAL_ERROR;
-          break;
-        }
-      }
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      HAL_FLASH_Lock();
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function reads flash
-  * @param  pDestination: Start address for target location
-  * @param  pSource: flash address to read
-  * @param  uLength: number of bytes
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_INT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  memcpy(pDestination, pSource, uLength);
-  return HAL_OK;
-}
-
-/* Public functions : external flash ---------------------------------------------------------*/
-
-HAL_StatusTypeDef FLASH_EXT_Init(void)
-{
-  return HAL_OK;
-}
-
-/* No external flash available on this product
-   ==> return SFU_ERROR */
-
-HAL_StatusTypeDef FLASH_EXT_If_Erase_Size(void *pStart, uint32_t uLength)
-{
-  return HAL_ERROR;
-}
-
-HAL_StatusTypeDef FLASH_EXT_If_Write(void  *pDestination, const void *pSource, uint32_t uLength)
-{
-  return HAL_ERROR;
-}
-
-HAL_StatusTypeDef FLASH_EXT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  return HAL_ERROR;
-}
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  Clear error flags raised during previous operation
-  * @param  None
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void)
-{
-  HAL_StatusTypeDef ret = HAL_ERROR;
-
-  /* Unlock the Program memory */
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-
-    /* Clear all FLASH flags */
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-    /* Unlock the Program memory */
-    if (HAL_FLASH_Lock() == HAL_OK)
-    {
-      ret = HAL_OK;
-    }
-#ifdef FLASH_IF_DBG
-    else
-    {
-      FLASH_IF_TRACE("[FLASH_IF] Lock failure\r\n");
-    }
-#endif /* FLASH_IF_DBG */
-  }
-#ifdef FLASH_IF_DBG
-  else
-  {
-    FLASH_IF_TRACE("[FLASH_IF] Unlock failure\r\n");
-  }
-#endif /* FLASH_IF_DBG */
-  return ret;
-}
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: Address of the FLASH Memory
-  * @retval The page of a given address
-  */
-uint32_t GetPage(uint32_t Addr)
-{
-  uint32_t page = 0U;
-
-  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
-
-  return page;
-}
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/fw_update_app.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/fw_update_app.c
deleted file mode 100644
index 4b945f87..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/fw_update_app.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    fw_update_app.c
-  * @author  MCD Application Team
-  * @brief   Firmware Update module.
-  *          This file provides set of firmware functions to manage Firmware
-  *          Update functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-
-#include "se_def.h"
-#include "com.h"
-#include "common.h"
-#include "flash_if.h"
-#include "stm32wlxx_hal.h"
-#include "stm32wlxx_nucleo.h"
-#include "fw_update_app.h"
-#include "se_interface_application.h"
-#include "sfu_fwimg_regions.h"
-#include "string.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-#include "ymodem.h"
-
-/* Private defines -----------------------------------------------------------*/
-
-
-/* Global variables ----------------------------------------------------------*/
-
-
-/* Private function prototypes -----------------------------------------------*/
-
-
-/* Functions Definition ------------------------------------------------------*/
-
-/**
-  * @brief  Run FW Update process.
-  * @param  None
-  * @retval HAL Status.
-  */
-#if defined(EXTERNAL_LOADER)
-void FW_UPDATE_Run(void)
-{
-  /* Print Firmware Update welcome message */
-  printf("\r\n================ New Fw Download =========================\r\n\n");
-
-  /* Standalone loader communication : execution requested */
-  (*(uint32_t *)LOADER_COM_REGION_RAM_START) = STANDALONE_LOADER_BYPASS_REQ;
-
-  NVIC_SystemReset();
-}
-
-#else
-void FW_UPDATE_Run(void)
-{
-  printf("  Feature not supported ! \r\n");
-}
-
-#endif
-
-
-#if defined(EXTERNAL_LOADER)
-/**
-  * @brief  Run Multiple FW Update process.
-  * @param  None
-  * @retval None.
-  */
-void FW_UPDATE_MULTIPLE_RunMenu(void)
-{
-  printf("  Feature not supported ! \r\n");
-}
-
-#else
-/**
-  * @brief  Run Multiple FW Update process.
-  * @param  None
-  * @retval None.
-  */
-void FW_UPDATE_MULTIPLE_RunMenu(void)
-{
-  printf("  Feature not supported ! \r\n");
-}
-
-#endif
-
-
-#if defined(EXTERNAL_LOADER)
-/**
-  * @brief  Run validation of a FW image menu.
-  * @param  None
-  * @retval None.
-  */
-void FW_VALIDATE_RunMenu(void)
-{
-  printf("  Feature not supported ! \r\n");
-}
-
-#else
-/**
-  * @brief  Run validation of a FW image menu.
-  * @param  None
-  * @retval None.
-  */
-void FW_VALIDATE_RunMenu(void)
-{
-  printf("  Feature not supported ! \r\n");
-}
-
-#endif
-
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/se_user_code.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/se_user_code.c
deleted file mode 100644
index 18f9a54d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/se_user_code.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_user_code.c
-  * @author  MCD Application Team
-  * @brief   Secure Engine User code example module.
-  *          This file demonstrates how to call user defined services running
-  *          in Secure Engine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_def.h"
-#include "com.h"
-#include "common.h"
-#include "stm32wlxx_hal.h"
-#include "stm32wlxx_nucleo.h"
-#include "se_user_code.h"
-#include "se_interface_application.h"
-#include "sfu_fwimg_regions.h"
-#include <string.h> /* needed for memset */
-
-
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup  SE_USER_CODE Secure Engine User Code Example
-  * @brief Example of user defined code running in Secure Engine.
-  *        This code provides user defined services to the user application.
-  * @{
-  */
-
-/** @defgroup  SE_USER_CODE_Private_Variables Private Variables
-  * @{
-  */
-/**
-  * @}
-  */
-
-/** @defgroup  SE_USER_CODE_Private_Functions Private Functions
-  * @{
-  */
-
-/**
-  * @brief  Display the SE_USER_CODE Menu choices on hyperterminal
-  * @param  None.
-  * @retval None.
-  */
-static void SE_USER_CODE_PrintMenu(void)
-{
-  printf("\r\n=== Call User Defined Code running in Secure Engine ===\r\n\n");
-  printf("  Get firmware information of SLOT_ACTIVE_1 ------------- 1\r\n\n");
-  printf("  Previous Menu ----------------------------------------- x\r\n\n");
-  printf("  Selection :\r\n\n");
-}
-
-/**
-  * @brief  Get FW information.
-  * @param  SlotNumber slot identification
-  * @retval HAL Status.
-  */
-static void SE_USER_CODE_GetFwInfo(uint32_t SlotNumber)
-{
-  SE_ErrorStatus se_retCode = SE_ERROR;
-  SE_StatusTypeDef se_Status = SE_KO;
-  SE_APP_ActiveFwInfo_t sl_FwInfo;
-
-  memset(&sl_FwInfo, 0xFF, sizeof(SE_APP_ActiveFwInfo_t));
-
-
-
-  /* Get FW info */
-  se_retCode = SE_APP_GetActiveFwInfo(&se_Status, SlotNumber, &sl_FwInfo);
-
-  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
-  {
-    /* Print the result */
-    printf("Firmware Info:\r\n");
-    printf("\tActiveFwVersion: %d\r\n", sl_FwInfo.ActiveFwVersion);
-    printf("\tActiveFwSize: %d bytes\r\n", sl_FwInfo.ActiveFwSize);
-  }
-  else
-  {
-    /* Failure */
-    printf("  -- !!Operation failed!! \r\n\n");
-  }
-
-}
-
-
-/**
-  * @}
-  */
-
-/** @addtogroup  SE_USER_CODE_Exported_Functions
-  * @{
-  */
-
-/**
-  * @brief  Run get firmware info menu.
-  * @param  None
-  * @retval HAL Status.
-  */
-void SE_USER_CODE_RunMenu(void)
-{
-  uint8_t key = 0U;
-  uint32_t exit = 0U;
-  uint32_t slot_number = 0U;
-
-  /*Print Main Menu message*/
-  SE_USER_CODE_PrintMenu();
-
-  while (exit == 0U)
-  {
-    key = 0U;
-    slot_number = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
-       register */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '1' :
-          slot_number = SLOT_ACTIVE_1;
-          if (SlotStartAdd[slot_number] == 0U)
-          {
-            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
-          }
-          else
-          {
-            SE_USER_CODE_GetFwInfo(slot_number);
-          }
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-        default:
-          printf("Invalid Number !\r");
-          break;
-      }
-
-      /*Print Main Menu message*/
-      SE_USER_CODE_PrintMenu();
-    }
-  }
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/stm32wlxx_it.c
deleted file mode 100644
index 899060b5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/stm32wlxx_it.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_it.c
-  * @author  MCD Application Team
-  * @brief   Main Interrupt Service Routines.
-  *          This file provides template for all exceptions handler and
-  *          peripherals interrupt service routine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "stm32wlxx_it.h"
-#include "test_protections.h"
-
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup USER_APP_COMMON Common
-  * @{
-  */
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-RTC_HandleTypeDef RtcHandle;
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/******************************************************************************/
-/*            Cortex-M4 Processor Exceptions Handlers                         */
-/******************************************************************************/
-
-/**
-  * @brief  This function handles NMI exception.
-  * @param  None
-  * @retval None
-  */
-void NMI_Handler(void)
-{
-  /* Go to infinite loop when NMI exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Hard Fault exception.
-  * @param  None
-  * @retval None
-  */
-void HardFault_Handler(void)
-{
-  /* Go to infinite loop when Memory Manage exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Memory Manage exception.
-  * @param  None
-  * @retval None
-  */
-void MemManage_Handler(void)
-{
-  /* Go to infinite loop when Memory Manage exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Bus Fault exception.
-  * @param  None
-  * @retval None
-  */
-void BusFault_Handler(void)
-{
-  /* Go to infinite loop when Bus Fault exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Usage Fault exception.
-  * @param  None
-  * @retval None
-  */
-void UsageFault_Handler(void)
-{
-  /* Go to infinite loop when Usage Fault exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles SVCall exception.
-  * @param  None
-  * @retval None
-  */
-void SVC_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles Debug Monitor exception.
-  * @param  None
-  * @retval None
-  */
-void DebugMon_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles PendSVC exception.
-  * @param  None
-  * @retval None
-  */
-void PendSV_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles SysTick Handler.
-  * @param  None
-  * @retval None
-  */
-void SysTick_Handler(void)
-{
-  HAL_IncTick();
-}
-
-/******************************************************************************/
-/*                 STM32WLxx Peripherals Interrupt Handlers             */
-/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
-/*  available peripheral interrupt handler's name please refer to the startup */
-/*  file (startup_stm32wlxx.s).                                         */
-/******************************************************************************/
-
-/**
-  * @brief  This function handles Flash operation error interrupt request.
-  * @param  None
-  * @retval None
-  */
-void FLASH_IRQHandler(void)
-{
-  HAL_FLASH_IRQHandler();
-}
-
-/**
-  * @brief  This function handles Tamper interrupt request.
-  * @param  None
-  * @retval None
-  */
-void TAMP_STAMP_LSECSS_SSRU_IRQHandler()
-{
-  /* Store in the handle the Internal Tamper enabled */
-  SET_BIT(RtcHandle.IsEnabled.TampFeatures, RTC_TAMPER_ID);
-
-  RtcHandle.Instance = RTC;
-  HAL_RTCEx_TamperIRQHandler(&RtcHandle);
-}
-
-void BUTTON_IRQHANDLER(void)
-{
-  HAL_GPIO_EXTI_IRQHandler(BUTTON_EXTI_LINE);
-}
-
-void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
-{
-  if (GPIO_Pin == BUTTON_EXTI_LINE)
-  {
-    printf("\r\nUser IRQ Handler: User Button pressed\r\n");
-  }
-}
-
-/**
-  * @brief  This function handles PPP interrupt request.
-  * @param  None
-  * @retval None
-  */
-/*void PPP_IRQHandler(void)
-{
-}*/
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/test_protections.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/test_protections.c
deleted file mode 100644
index a2491e4b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/test_protections.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    test_protections.c
-  * @author  MCD Application Team
-  * @brief   Test Protections module.
-  *          This file provides set of firmware functions to manage Test Protections
-  *          functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define TEST_PROTECTIONS_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "test_protections.h"
-#include "se_def.h"
-#include "se_interface_application.h"
-#include "com.h"
-#include "common.h"
-#include "flash_if.h"
-#include "sfu_fwimg_regions.h" /* required for corruption tests (a real user application should NOT need this file) */
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup TEST_PROTECTIONS Test protections
-  * @{
-  */
-
-/** @defgroup  TEST_PROTECTIONS_Private_Defines Private Defines
-  * @{
-  */
-
-/**
-  * @brief  Isolated enclave Test.
-  */
-/*!< Address used to test SE CODE protection*/
-#define TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS     ((uint32_t) SE_CALLGATE_REGION_ROM_START)
-/*!< Address used to test SE VDATA protection*/
-#define TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS     ((uint32_t) SE_REGION_RAM_START)
-
-/**
-  * @brief  WRP Test.
-  */
-/*!< Address used to test WRP protection */
-#define TEST_PROTECTIONS_WRP_FLASH_ADDRESS            ((uint32_t) (KMS_DATASTORAGE_START - 0x1000))
-/*!< WRP Test Size */
-#define TEST_PROTECTIONS_WRP_FLASH_SIZE               ((uint32_t)0x800U)
-
-/**
-  * @brief  IWDG Test.
-  */
-/*!< IWDG Test delay in ms (it has to be greater than what used in SB)*/
-#define TEST_PROTECTIONS_IWDG_DELAY                   ((uint32_t)10000U)
-
-/**
-  * @brief  TAMPER Test.
-  */
-#define TEST_PROTECTIONS_TAMPER_DELAY                 ((uint32_t)10U)         /*!< TAMPER Test delay in s */
-
-/**
-  * @brief  CORRUPT_IMAGE Test.
-  */
-/*!< CORRUPT_IMAGE Test: address where data will be corrupted: address of active slot + offset */
-#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(A)  ((uint32_t)(SlotStartAdd[A] \
-                                                                     +SFU_IMG_IMAGE_OFFSET))
-/*!< CORRUPT_IMAGE Test: size of data to be corrupted */
-#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE     ((uint32_t)32U)
-
-/** @defgroup  TEST_PROTECTIONS_Private_Variables Private Variables
-  * @{
-  */
-static uint8_t uRead_WRP[TEST_PROTECTIONS_WRP_FLASH_SIZE]; /*!< RTC handler used for TAMPER Test  */
-static uint32_t m_uTamperEvent = 0U;                /*!< Tamper Event */
-
-/** @defgroup  TEST_PROTECTIONS_Private_Functions Private Functions
-  * @{
-  */
-static void TEST_PROTECTIONS_RunWRP(void);
-static void TEST_PROTECTIONS_RunTAMPER(void);
-static void TEST_PROTECTIONS_RunIWDG(void);
-static void TEST_PROTECTIONS_CORRUPT_RunMenu(void);
-static void TEST_PROTECTIONS_PrintTestingMenu(void);
-/**
-  * @}
-  */
-
-
-
-
-/** @defgroup  TEST_PROTECTIONS_Exported_Functions Exported Functions
-  * @{
-  */
-
-/** @defgroup  TEST_PROTECTIONS_Control_Functions Control Functions
-  * @{
-  */
-
-/**
-  * @brief  Display the TEST Main Menu choices on HyperTerminal
-  * @param  None.
-  * @retval None.
-  */
-void TEST_PROTECTIONS_RunMenu(void)
-{
-  uint8_t key = 0U;
-  uint8_t exit = 0U;
-
-  /* Print Main Menu message */
-  TEST_PROTECTIONS_PrintTestingMenu();
-
-  while (exit == 0U)
-  {
-    key = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
-       reload register*/
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '1' :
-          TEST_PROTECTIONS_CORRUPT_RunMenu();
-          break;
-        case '2' :
-          TEST_PROTECTIONS_RunWRP();
-          break;
-        case '3' :
-          TEST_PROTECTIONS_RunIWDG();
-          break;
-        case '4' :
-          TEST_PROTECTIONS_RunTAMPER();
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-
-        default:
-          printf("Invalid Number !\r");
-          break;
-      }
-      /*Print Main Menu message*/
-      TEST_PROTECTIONS_PrintTestingMenu();
-    }
-  }
-}
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup  TEST_PROTECTIONS_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  Display the TEST Main Menu choices on HyperTerminal
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_PrintTestingMenu(void)
-{
-  printf("\r\n=================== Test Menu ============================\r\n\n");
-  printf("  Test : CORRUPT ACTIVE IMAGE --------------------------- 1\r\n\n");
-  printf("  Test Protection: WRP ---------------------------------- 2\r\n\n");
-  printf("  Test Protection: IWDG --------------------------------- 3\r\n\n");
-  printf("  Test Protection: TAMPER ------------------------------- 4\r\n\n");
-  printf("  Previous Menu ----------------------------------------- x\r\n\n");
-  printf("  Selection :\r\n\n");
-}
-
-
-/**
-  * @brief  TEST Run WRP
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunWRP(void)
-{
-  uint32_t i = 0U;
-  uint32_t address = 0U;
-
-  printf("\r\n====== Test Protection: WRP ===========================\r\n\n");
-
-  address = TEST_PROTECTIONS_WRP_FLASH_ADDRESS;
-
-  /* #1 - Read Page to be used for restoring*/
-  printf("  -- Reading 0x%x bytes at address: 0x%x (for backup)\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
-         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
-
-  for (i = 0U; i < TEST_PROTECTIONS_WRP_FLASH_SIZE; i++)
-  {
-    uRead_WRP[i] = *((uint8_t *)(address + i));
-  }
-
-  /* #2 - Erasing page */
-  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
-         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
-
-  /* Check that it is not allowed to erase this page */
-  if (FLASH_If_Erase_Size((void *)address, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
-  {
-    /* Error returned during programmation. */
-    /* Check that WRPERR flag is set */
-    if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
-    {
-      printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
-    }
-  }
-  else
-  {
-    /* #3 - Writing Data previously read*/
-    if (FLASH_If_Write((void *)address, uRead_WRP, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
-    {
-      /* Error returned during programmation. */
-      printf("-- !! HAL_FLASH_ERROR: FLASH Write error\r\n\n");
-
-      /* Check that WRPERR flag is set */
-      if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
-      {
-        printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
-      }
-    }
-    else
-    {
-      printf("  -- Written successfully at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
-
-      /*No Errors detected means WRP was not enabled*/
-      printf("  -- !! WRP protection is NOT ENABLED !!\r\n\n");
-    }
-  }
-}
-
-/**
-  * @brief  TEST Run CORRUPT_IMAGE
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunCORRUPT(uint32_t slot_number)
-{
-  HAL_StatusTypeDef ret = HAL_ERROR;
-  uint8_t pattern[TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE] = {0};
-
-  /* On this series, there is no MPU to disable to allow flash corruption. */
-
-  /* Erase first sector of active slot */
-  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n", TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE,
-         TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number));
-  printf("  -- At next boot Signature Verification will fail. Download a new FW to restore FW image !!\r\n\n");
-
-  /* On this series, the memory corruption is performed by writing again the flash (but not header).
-     The header is preserved for anti-rollback check. */
-  ret = FLASH_If_Write((void *)(TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number)), (void *) &pattern,
-                       TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE);
-
-  /* This code may not be reached, due to the memory corruption performed.
-     In this case, the execution will probably trig hard fault exception (while (1)),
-     then watchdog reset. */
-  if (ret == HAL_OK)
-  {
-    NVIC_SystemReset();
-  }
-  else
-  {
-    printf("-- !! HAL_FLASH_ERROR_CORRUPT_IMAGE: erasing failure ...\r\n\n");
-  }
-}
-
-/**
-  * @brief  Display the corruption menu
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_CORRUPT_PrintMenu(void)
-{
-  printf("\r\n============  Test: CORRUPT ACTIVE IMAGE ============\r\n\n");
-  printf("  Corrupt image from SLOT_ACTIVE_1 ---------------------- 1\r\n\n");
-  printf("  Selection :\r\n\n");
-}
-
-/**
-  * @brief  Run get firmware info menu.
-  * @param  None
-  * @retval HAL Status.
-  */
-static void TEST_PROTECTIONS_CORRUPT_RunMenu(void)
-{
-  uint8_t key = 0U;
-  uint32_t exit = 0U;
-  uint32_t slot_number = 0U;
-
-  /*Print Main Menu message*/
-  TEST_PROTECTIONS_CORRUPT_PrintMenu();
-
-  while (exit == 0U)
-  {
-    key = 0U;
-    slot_number = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
-       register */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '1' :
-          slot_number = SLOT_ACTIVE_1;
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-        default:
-          printf("Invalid Number !\r");
-          break;
-      }
-
-      if (SlotStartAdd[slot_number] == 0U)
-      {
-        printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
-      }
-      else
-      {
-        TEST_PROTECTIONS_RunCORRUPT(slot_number);
-      }
-
-      /*Print Main Menu message*/
-      TEST_PROTECTIONS_CORRUPT_PrintMenu();
-    }
-  }
-}
-
-
-/**
-  * @brief  TEST Run TAMPER
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunTAMPER(void)
-{
-  uint32_t i = 0U;
-  m_uTamperEvent = 0U;
-
-  printf("\r\n====== Test Protection: TAMPER ========================\r\n\n");
-  /* Print instructions*/
-  printf("  -- Pull PC13 (CN7.23) to GND \r\n\n");
-  printf("  -- -- Note: sometimes it may be enough to put your finger close to PC13 (CN7.23)\r\n\n");
-  printf("  -- Should reset if TAMPER is enabled. \r\n\n");
-  printf("  Waiting for 10 seconds...\r\n\n")  ;
-
-  /* #2 - Wait 10 seconds*/
-  while ((i < TEST_PROTECTIONS_TAMPER_DELAY) && (m_uTamperEvent == 0U))
-  {
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register
-     */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-    HAL_Delay(1000U);
-    i++;
-  }
-  if (m_uTamperEvent == 0U)
-  {
-    printf("\r\n\n  -- Waited 10 seconds, if you have connected TAMPER pin to GND it means TAMPER protection ");
-    printf("is NOT ENABLED !! \r\n\n");
-  }
-  else
-  {
-    printf("\r\n\n  -- TAMPER Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
-    NVIC_SystemReset();
-  }
-}
-
-/**
-  * @brief  TEST Run IWDG
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunIWDG(void)
-{
-  printf("\r\n====== Test Protection: IWDG ===========================\r\n\n");
-
-  /* Wait for TEST_PROTECTIONS_IWDG_DELAY*/
-  printf("  -- Waiting %d (ms). Should reset if IWDG is enabled. \r\n\n", TEST_PROTECTIONS_IWDG_DELAY);
-
-  HAL_Delay(TEST_PROTECTIONS_IWDG_DELAY);
-
-  /* No Reset means IWDG was not enabled*/
-  printf("  -- !! IWDG protection is NOT ENABLED !!\r\n\n");
-}
-
-/**
-  * @}
-  */
-
-/** @defgroup TEST_PROTECTIONS_Callback_Functions Callback Functions
-  * @{
-  */
-
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
-  * @param  None
-  * @retval None
-  */
-void CALLBACK_Antitamper(void)
-{
-  /*Set tamper event variable*/
-  m_uTamperEvent = 1U;
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app.c
deleted file mode 100644
index f97b7f89..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app.c
-  * @author  MCD Application Team
-  * @brief   tKMS application examples module.
-  *          This file provides examples of KMS API usages.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "tkms.h"
-#include "tkms_app.h"
-#include "com.h"
-#include "common.h"
-
-
-/* Private variables ---------------------------------------------------------*/
-extern void KMS_UPDATE_StartLocalUpdate(void);
-
-static void tkms_app_print_menu(void)
-{
-  (void)printf("\r\n======================= tKMS Examples Menu ===========================\r\n\n");
-  (void)printf("  (*) Requires execution of 'Import Blob' test (3) prior to execute this one\r\n\n");
-  (void)printf("  TKMS - Test All (*)                               --------------------- 0\r\n\n");
-  (void)printf("  TKMS - Tests AES-GCM Embedded key                 --------------------- 1\r\n\n");
-  (void)printf("  TKMS - Tests AES-CBC Embedded key                 --------------------- 2\r\n\n");
-  (void)printf("  TKMS - Import blob                                --------------------- 3\r\n\n");
-  (void)printf("  TKMS - Tests RSA Static key (*)                   --------------------- 4\r\n\n");
-  (void)printf("  TKMS - Tests Derive Static key (*)                --------------------- 5\r\n\n");
-  (void)printf("  Exit tKMS Examples Menu                           --------------------- x\r\n\n");
-}
-
-void tkms_app_menu(void)
-{
-  uint8_t key;
-  uint8_t exit = 0U;
-  CK_RV ret_status;
-  uint8_t tests_executed;
-  uint8_t tests_success;
-  uint8_t clear_buffer[128] = "STM32 Key Management Services - Example buffer";
-
-  /* Initialize tKMS for subsequent usage */
-  ret_status = C_Initialize(NULL);
-  if (ret_status != CKR_OK)
-  {
-    (void)printf("tKMS initialization failed\r\n");
-    exit = 1;
-  }
-  else
-  {
-    tkms_app_print_menu();
-  }
-
-  while (exit == 0U)
-  {
-    key = 0U;
-
-    INVOKE_SCHEDULE_NEEDS();
-
-    /* Clean the user input path */
-    (void)COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '0' :
-          tests_executed = 0U;
-          tests_success = 0U;
-          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
-          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tests_executed++;
-          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
-          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tests_executed++;
-          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
-          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tests_executed++;
-          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
-          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tests_executed++;
-          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
-          INVOKE_SCHEDULE_NEEDS();
-          if (tests_success == tests_executed)
-          {
-            (void)printf("CUMULATIVE RESULT: ALL TESTS PASSED\r\n");
-          }
-          else
-          {
-            (void)printf("CUMULATIVE RESULT: %d/%d success\r\n", tests_success, tests_executed);
-          }
-          tkms_app_print_menu();
-          break;
-
-        /* 1 = TKMS - Tests AES-GCM Embedded key */
-        case '1' :
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
-          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tkms_app_print_menu();
-          break;
-        /* 2 = Tests AES-CBC Embedded key */
-        case '2' :
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
-          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tkms_app_print_menu();
-          break;
-        /* 3 = Import Blob */
-        case '3':
-          INVOKE_SCHEDULE_NEEDS();
-          KMS_UPDATE_StartLocalUpdate();
-          tkms_app_print_menu();
-          break;
-        /* 4 = Tests RSA Static key (requires blob import) */
-        case '4' :
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
-          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tkms_app_print_menu();
-          break;
-        /* 5 = Tests Key derivation (requires blob import) */
-        case '5':
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
-          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tkms_app_print_menu();
-          break;
-        case 'x':
-          exit = 1;
-          break;
-
-        default:
-          (void)printf("Invalid Number !\r");
-          tkms_app_print_menu();
-          break;
-      }
-    }
-  }
-
-  /* Finalize tKMS since no more in use */
-  ret_status = C_Finalize(NULL);
-  if (ret_status != CKR_OK)
-  {
-    (void)printf("tKMS finalization failed\r\n");
-  }
-}
-
-void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length)
-{
-  uint8_t ascii[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-  uint8_t *ptmp = pstr;
-  uint8_t *ptmp2 = pbuff;
-  for (uint32_t i = 0UL; i < length; i += 1UL)
-  {
-    *ptmp = ascii[*ptmp2 >> 4];
-    ptmp++;
-    *ptmp = ascii[*ptmp2 & 0x0FUL];
-    ptmp++;
-    ptmp2++;
-  }
-  *ptmp = 0U;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_derive_key.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_derive_key.c
deleted file mode 100644
index bd2e720f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_derive_key.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app_derive_key.c
-  * @author  MCD Application Team
-  * @brief   tKMS application examples module.
-  *          This file provides examples of KMS API usage to derivate a key
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "tkms.h"
-#include "tkms_app.h"
-#include "com.h"
-#include "common.h"
-#include "kms_platf_objects_interface.h"
-
-/* Private defines -----------------------------------------------------------*/
-#define EC_POINT_MAX_LEN          (3U + (2U * 32U))   /* EC Point Max Length : X962 header + DER header +
-                                                         NIST-P256 *2 - > (0x04|LEN|0x04|X|Y) */
-#define DH_SECRET_X_MAX_LEN       (32U)               /* DH Secret X Max Length */
-
-/* Private structures -- -----------------------------------------------------*/
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t a_string[1024] = {0};
-
-/*
- * Key derivation
- * -----------------------------------------------------------------------------
- * This example is showing how to use key derivation to create
- * a specific session key.
- * -----------------------------------------------------------------------------
- * Key derivation shared information between emitter and receiver
- * - Secret derivation Key: stored in KMS under
- *                         KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE object handle
- * - Session key variation: transmitted or calculated by both emitter & receiver
- */
-CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pClearMessage)
-{
-  uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
-  uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
-  CK_ULONG DeriveKey_template_class = CKO_SECRET_KEY;
-  CK_ULONG DeriveKey_template_destroyable = CK_TRUE;
-  CK_ULONG DeriveKey_template_encrypt = CK_TRUE;
-  CK_ULONG DeriveKey_template_decrypt = CK_TRUE;
-  CK_ULONG DeriveKey_template_extract = CK_TRUE;
-  CK_ATTRIBUTE DeriveKey_template[] =
-  {
-    {CKA_CLASS, (CK_VOID_PTR) &DeriveKey_template_class,       sizeof(CK_ULONG)},
-    {CKA_DESTROYABLE, (CK_VOID_PTR) &DeriveKey_template_destroyable, sizeof(CK_ULONG)},
-    {CKA_ENCRYPT, (CK_VOID_PTR) &DeriveKey_template_encrypt,     sizeof(CK_ULONG)},
-    {CKA_DECRYPT, (CK_VOID_PTR) &DeriveKey_template_decrypt,     sizeof(CK_ULONG)},
-    {CKA_EXTRACTABLE, (CK_VOID_PTR) &DeriveKey_template_extract,     sizeof(CK_ULONG)}
-  };
-  CK_ATTRIBUTE GetKey_template[] = {{CKA_VALUE, (CK_VOID_PTR) &DeriveKey_template_class, 32UL}};
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  /* Key derivation */
-  uint8_t session_variant[32] = "My session variation 0122004578";
-  CK_MECHANISM      mech = {CKM_AES_ECB_ENCRYPT_DATA, session_variant, 32};
-  CK_OBJECT_HANDLE  derivedKeyHdle = 0UL;
-  uint8_t derivedKey[32] = {0};
-  /* AES encryption / decryption */
-  uint32_t encrypted_length = 0UL;
-  uint32_t decrypted_length = 0UL;
-  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
-  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)cbc_iv, sizeof(cbc_iv) };
-  uint8_t tag[16] = {0};
-  uint32_t tag_lenth;
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Derive key with pass phrase */
-  if (rv == CKR_OK)
-  {
-    rv = C_DeriveKey(session, &(mech), (CK_OBJECT_HANDLE)KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE,
-                     &DeriveKey_template[0], sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derivedKeyHdle);
-  }
-
-  /* Get derived key to display */
-  if (rv == CKR_OK)
-  {
-    GetKey_template[0].pValue = derivedKey;
-    rv = C_GetAttributeValue(session, derivedKeyHdle, &(GetKey_template[0]), sizeof(GetKey_template) /
-                             sizeof(CK_ATTRIBUTE));
-  }
-  if (rv == CKR_OK)
-  {
-    (void)printf("--- Derivating key --------------------------------------------\r\n");
-    (void)printf("--- AES ECB\r\n");
-    (void)printf("--- Pass phrase   [%s]\r\n", session_variant);
-    tkms_buff2str(derivedKey, a_string, 32);
-    (void)printf("--- Derived key   [%s]\r\n", a_string);
-  }
-
-  /* Encryption --------------------------------------------------------------*/
-  (void)printf("--- Encrypting --------------------------------------------------\r\n");
-  (void)printf("--- AES CBC\r\n");
-  (void)printf("--- IV      [%s]\r\n", cbc_iv);
-  (void)printf("--- Message [%s]\r\n", pClearMessage);
-  tkms_buff2str(pClearMessage, a_string, length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-  (void)printf("--- Length  [%d]\r\n", length);
-
-  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
-  }
-
-  /* Encrypt clear message */
-  if (rv == CKR_OK)
-  {
-    encrypted_length = sizeof(encrypted_message);
-    rv = C_EncryptUpdate(session, pClearMessage, length,
-                         encrypted_message, &encrypted_length);
-  }
-
-  /* Finalize message encryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
-  }
-
-  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
-  tkms_buff2str(encrypted_message, a_string, encrypted_length);
-  (void)printf("--- Message [0x%s]\r\n", a_string);
-
-  /* Decryption --------------------------------------------------------------*/
-
-  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_DecryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
-  }
-
-  /* Decrypt encrypted message */
-  if (rv == CKR_OK)
-  {
-    decrypted_length = sizeof(decrypted_message);
-    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
-                         decrypted_message, &decrypted_length);
-  }
-
-  /* Finalize message decryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
-  }
-  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
-  (void)printf("--- Message [%s]\r\n", decrypted_message);
-  tkms_buff2str(decrypted_message, a_string, decrypted_length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-
-  /* Compare decrypted message with clear one */
-  if (rv == CKR_OK)
-  {
-    if (memcmp(pClearMessage, decrypted_message, length) != 0)
-    {
-      (void)printf("XXX Decrypted message differs\r\n");
-      rv = CKR_FUNCTION_FAILED;
-    }
-    else
-    {
-      (void)printf(">>> Decrypted message is same\r\n");
-    }
-  }
-
-  /* Remove key once no more needed */
-  if (rv == CKR_OK)
-  {
-    rv = C_DestroyObject(session, derivedKeyHdle);
-  }
-
-  /* Verify key is no more usable */
-  if (rv == CKR_OK)
-  {
-    if (C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle) == CKR_OK)
-    {
-      rv = CKR_FUNCTION_FAILED;
-    }
-  }
-
-  /* Close sessions */
-  (void)C_CloseSession(session);
-
-  return rv;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c
deleted file mode 100644
index 5401f895..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app_encrypt_decrypt.c
-  * @author  MCD Application Team
-  * @brief   KMS application examples module.
-  *          This file provides examples of KMS API usage to encrypt & decrypt
-  *          messages.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "tkms.h"
-#include "tkms_app.h"
-#include "com.h"
-#include "common.h"
-#include "kms_platf_objects_interface.h"
-
-/* Private defines ---------------------------------------------------------*/
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t a_string[1024] = {0};
-static uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
-static uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
-
-/*
- * AES GCM 128 Bits
- * -----------------------------------------------------------------------------
- * This example is showing how to use AES GCM encryption/decryption to
- * authenticate and protect a message.
- * -----------------------------------------------------------------------------
- * Shared information between emitter and receiver
- * - Secret encryption/decryption Key: stored in KMS under
- *                                     KMS_KEY_AES128_OBJECT_HANDLE object handle
- * - Encrypted message: transmitted from emitter to sender
- * - Initialization Vector: transmitted from emitter to sender
- * - Message Header: transmitted from emitter to sender
- * - Authentication Tag: transmitted from emitter to sender
- *                      (calculated during encryption, verified during decryption)
- */
-CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage)
-{
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint32_t encrypted_length = 0UL;
-  uint32_t decrypted_length = 0UL;
-  uint8_t tag[16] = {0};  /* 128 bits tag size */
-  uint32_t tag_lenth = 0UL;
-
-  /* AES GCM Configuration variables */
-  uint8_t gcm_iv[12] = ">GCM VECTOR";
-  uint8_t gcm_header[16] = ">AES GCM Header";
-  CK_GCM_PARAMS gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    sizeof(gcm_iv),
-    (CK_BYTE_PTR)gcm_header,
-    sizeof(gcm_header),
-    128   /* Tag length in Bits */
-  };
-  CK_MECHANISM aes_gcm_mechanism = { CKM_AES_GCM, (CK_VOID_PTR *)(uint32_t)&gcm_params, sizeof(gcm_params) };
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Encryption --------------------------------------------------------------*/
-  (void)printf("--- Encrypting --------------------------------------------------\r\n");
-  (void)printf("--- AES GCM\r\n");
-  (void)printf("--- IV      [%s]\r\n", gcm_iv);
-  (void)printf("--- Header  [%s]\r\n", gcm_header);
-  (void)printf("--- Message [%s]\r\n", pClearMessage);
-  tkms_buff2str(pClearMessage, a_string, length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-  (void)printf("--- Length  [%d]\r\n", length);
-
-  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_EncryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
-  }
-
-  /* Encrypt clear message */
-  if (rv == CKR_OK)
-  {
-    encrypted_length = sizeof(encrypted_message);
-    rv = C_EncryptUpdate(session, pClearMessage, length,
-                         encrypted_message, &encrypted_length);
-  }
-
-  /* Finalize message encryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
-  }
-
-  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
-  tkms_buff2str(encrypted_message, a_string, encrypted_length);
-  (void)printf("--- Message [0x%s]\r\n", a_string);
-  tkms_buff2str(tag, a_string, tag_lenth);
-  (void)printf("--- Tag     [0x%s]\r\n", a_string);
-
-  /* Decryption --------------------------------------------------------------*/
-
-  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_DecryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
-  }
-
-  /* Decrypt encrypted message */
-  if (rv == CKR_OK)
-  {
-    decrypted_length = sizeof(decrypted_message);
-    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
-                         decrypted_message, &decrypted_length);
-  }
-
-  /* Finalize message decryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
-  }
-  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
-  (void)printf("--- Message [%s]\r\n", decrypted_message);
-  tkms_buff2str(decrypted_message, a_string, decrypted_length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-
-  if (rv == CKR_OK)
-  {
-    (void)printf(">>> Decrypted message authenticated\r\n");
-  }
-  else
-  {
-    (void)printf("XXX Decrypted message not authenticated\r\n");
-  }
-
-  /* Compare decrypted message with clear one */
-  if (rv == CKR_OK)
-  {
-    if (memcmp(pClearMessage, decrypted_message, length) != 0)
-    {
-      (void)printf("XXX Decrypted message differs\r\n");
-      rv = CKR_FUNCTION_FAILED;
-    }
-    else
-    {
-      (void)printf(">>> Decrypted message is same\r\n");
-    }
-  }
-
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
-
-  return rv;
-}
-
-/*
- * AES CBC 256 Bits
- * -----------------------------------------------------------------------------
- * This example is showing how to use AES CBC encryption/decryption to
- * protect a message.
- * -----------------------------------------------------------------------------
- * CBC shared information between emitter and receiver
- * - Secret encryption/decryption Key: stored in KMS under
- *                                     KMS_KEY_AESC256_OBJECT_HANDLE object handle
- * - Encrypted message: transmitted from emitter to sender
- * - Initialization Vector: transmitted from emitter to sender
- */
-CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage)
-{
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint32_t encrypted_length = 0UL;
-  uint32_t decrypted_length = 0UL;
-  uint8_t tag[16] = {0};
-  uint32_t tag_lenth;
-
-  /* AES CBC Configuration variables */
-  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
-  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)(uint32_t)cbc_iv, sizeof(cbc_iv) };
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Encryption --------------------------------------------------------------*/
-  (void)printf("--- Encrypting --------------------------------------------------\r\n");
-  (void)printf("--- AES CBC\r\n");
-  (void)printf("--- IV      [%s]\r\n", cbc_iv);
-  (void)printf("--- Message [%s]\r\n", pClearMessage);
-  tkms_buff2str(pClearMessage, a_string, length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-  (void)printf("--- Length  [%d]\r\n", length);
-
-  /* Configure session to encrypt message in AES CBC with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_EncryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
-  }
-
-  /* Encrypt clear message */
-  if (rv == CKR_OK)
-  {
-    encrypted_length = sizeof(encrypted_message);
-    rv = C_EncryptUpdate(session, pClearMessage, length,
-                         encrypted_message, &encrypted_length);
-  }
-
-  /* Finalize message encryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
-  }
-
-  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
-  tkms_buff2str(encrypted_message, a_string, encrypted_length);
-  (void)printf("--- Message [0x%s]\r\n", a_string);
-
-  /* Decryption --------------------------------------------------------------*/
-
-  /* Configure session to decrypt message in AES CBC with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_DecryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
-  }
-
-  /* Decrypt encrypted message */
-  if (rv == CKR_OK)
-  {
-    decrypted_length = sizeof(decrypted_message);
-    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
-                         decrypted_message, &decrypted_length);
-  }
-
-  /* Finalize message decryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
-  }
-  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
-  (void)printf("--- Message [%s]\r\n", decrypted_message);
-  tkms_buff2str(decrypted_message, a_string, decrypted_length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-
-  /* Compare decrypted message with clear one */
-  if (rv == CKR_OK)
-  {
-    if (memcmp(pClearMessage, decrypted_message, length) != 0)
-    {
-      (void)printf("XXX Decrypted message differs\r\n");
-      rv = CKR_FUNCTION_FAILED;
-    }
-    else
-    {
-      (void)printf(">>> Decrypted message is same\r\n");
-    }
-  }
-
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
-
-  return rv;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_sign_verify.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_sign_verify.c
deleted file mode 100644
index cd6b1209..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/tkms_app_sign_verify.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app_sign_verify.c
-  * @author  MCD Application Team
-  * @brief   KMS application examples module.
-  *          This file provides examples of KMS API usage to sign & verify
-  *          messages.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "tkms.h"
-#include "tkms_app.h"
-#include "com.h"
-#include "common.h"
-#include "kms_platf_objects_interface.h"
-
-/* Private defines -----------------------------------------------------------*/
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t a_string[1024] = {0};
-static uint8_t signature[2048 / 8] __attribute__((aligned(8))) = {0};
-
-/*
- * RSA 1024 Bits
- * -----------------------------------------------------------------------------
- * This example is showing how to use RSA signature to
- * authenticate a message.
- * -----------------------------------------------------------------------------
- * RSA shared information between emitter and receiver
- * - Secret signature/verification Key: stored in KMS under
- *   KMS_KEY_RSA2048_OBJECT_HANDLE object handle
- * - Message to authenticate: transmitted from emitter to sender
- * - Signature: transmitted from emitter to sender
- *              (calculated by emitter, verified by receiver)
- */
-CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage)
-{
-
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint32_t signature_length = 0UL;
-
-  CK_MECHANISM rsa_mechanism = { CKM_SHA256_RSA_PKCS, (CK_VOID_PTR *) NULL, 0};
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Signature --------------------------------------------------------------*/
-  (void)printf("--- Signing -----------------------------------------------------\r\n");
-  (void)printf("--- RSA 1024 bits\r\n");
-  (void)printf("--- Message [%s]\r\n", pMessage);
-  tkms_buff2str(pMessage, a_string, length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-  (void)printf("--- Length  [%d]\r\n", length);
-
-  /* Configure session to sign message using RSA with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_SignInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
-  }
-
-  /* Sign message */
-  if (rv == CKR_OK)
-  {
-    signature_length = sizeof(signature);
-    rv = C_Sign(session, pMessage, length,
-                signature, &signature_length);
-  }
-
-  (void)printf("--- Signed ------------------------------------------------------\r\n");
-  tkms_buff2str(signature, a_string, signature_length);
-  (void)printf("--- Signature [0x%s]\r\n", a_string);
-  (void)printf("--- Length    [%d]\r\n", signature_length);
-
-  /* Verification ------------------------------------------------------------*/
-
-  /* Configure session to verify message using RSA with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_VerifyInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
-  }
-
-  /* Verify message */
-  if (rv == CKR_OK)
-  {
-    rv = C_Verify(session, pMessage, length,
-                  signature, signature_length);
-  }
-
-  if (rv == CKR_OK)
-  {
-    (void)printf(">>> Message authenticated\r\n");
-  }
-  else
-  {
-    (void)printf("XXX Message not authenticated\r\n");
-  }
-
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
-
-  return rv;
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/readme.txt
deleted file mode 100644
index 8223627c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/readme.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
-  @page 1_Image_UserApp / Firmware Update - User Application Demo
-
-  @verbatim
-  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
-  * @file    readme.txt
-  * @brief   This application shows a User Application
-  ******************************************************************************
-  *
-  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                               www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Application Description
-
-This application demonstrates firmware download capabilities and provides a set
-of functions to test the active protections offered by Secure Boot and Secure Engine.
-It also demonstrates key management services through basic examples and specific boot
-mechanism (firmware update decryption, verification...)
-A terminal connected with the board via VCOM is needed to communicate with the
-board and to select which feature to demonstrate.
-
-For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
-available from the STMicroelectronics microcontroller website www.st.com.
-
-@par Keywords
-
-Security, KMS, SBSFU
-
-@par Directory contents
-
-   - 1_Image_UserApp/Src/com.c                    Communication module file
-   - 1_Image_UserApp/Src/common.c                 Common module file
-   - 1_Image_UserApp/Src/flash_if.c               Flash interface file
-   - 1_Image_UserApp/Src/fw_update_app.c          Firmware update application
-   - 1_Image_UserApp/Src/kms_object_update_app.c  KMS Blob update application
-   - 1_Image_UserApp/Src/main.c                   Main program
-   - 1_Image_UserApp/Src/se_user_code.c           Call user defined services running in Secure Engine
-   - 1_Image_UserApp/Src/stm32wlxx_it.c           Interrupt handlers
-   - 1_Image_UserApp/Src/system_stm32wlxx.c       STM32 system file
-   - 1_Image_UserApp/Src/test_protections.c       Protection test
-   - 1_Image_UserApp/Src/tkms_app.c               tKMS tests
-   - 1_Image_UserApp/Src/tkms_app_derive_key.c    tKMS key derivation tests
-   - 1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c tKMS encryption/decryption tests
-   - 1_Image_UserApp/Src/tkms_app_sign_verify.c   tKMS signature/verification tests
-   - 1_Image_UserApp/Src/ymodem.c                 Ymodem communication module
-   - 1_Image_UserApp/Inc/com.h                    Header for com.c file
-   - 1_Image_UserApp/Inc/common.h                 Header for common.c file
-   - 1_Image_UserApp/Inc/flash_if.h               Header for flash_if.c file
-   - 1_Image_UserApp/Inc/fw_update_app.h          Header for fw_update_app.c file
-   - 1_Image_UserApp/Inc/main.h                   Header for main.c file
-   - 1_Image_UserApp/Inc/se_user_code.h           Header file for se_user_code.c
-   - 1_Image_UserApp/Inc/sfu_app_new_image.h      Definition for the new blob storage and installation
-   - 1_Image_UserApp/Inc/stm32wlxx_hal_conf.h     HAL configuration file
-   - 1_Image_UserApp/Inc/stm32wlxx_it.h           Header for stm32wlxx_it.c file
-   - 1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h  BSP configuration file
-   - 1_Image_UserApp/Inc/test_protections.h       Header for test_protections.c file
-   - 1_Image_UserApp/Inc/tkms_app.h               Header for tkms_app.c file
-   - 1_Image_UserApp/Inc/ymodem.h                 Header for ymodem.c file
-
-@par Hardware and Software environment
-
-  - This example runs on STM32WL55xx devices.
-  - This example has been tested with NUCLEO-WL55JC RevC board and can be
-    easily tailored to any other supported device and development board.
-  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
-    is a feature provided by STM32Cube programmer available on www.st.com.
-  - This example is based on se_interface_application.o module exported by BFU project.
-  - This example needs a terminal emulator.
-  - Microsoft Windows has a limitation whereby paths to files and directories cannot
-    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
-    shell scripts) to fail reading from or writing to such files.
-    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
-    up a local drive out of an existing directory on the hard drive, such as:
-    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
-
-@par IDE postbuild script
-
-In order to ease the development process, a postbuild script ("postbuild.bat") is integrated in each IDE project.
-This postbuild script:
- - is generated when compiling the Secure Engine Core project,
- - prepares the firmware image of the user application to be installed in the device.
-
-A known limitation of this integration occurs when you update the firmware version (parameter of
-postbuild.bat script).
-The IDE does not track this update so you need to force the rebuild of the project manually.
-
-@par How to use it ?
-
-Refer to BFU readme and follow steps by steps instructions.
-
-Once executed, this user application gives access to a menu which allows:
-  1 - to download a new firmware : feature not supported in 1 firmware image example
-  2 - to test protections (WRP, IWDG, TAMPER)
-  3 - to demonstrate how to call user defined services running in Secure Engine
-  4 - to provide access to multiple images feature (not supported)
-  5 - to validate a firmware image at first start-up (not supported)
-  a - to demonstrate usage of key management services
-
-1. Pressing 1 allows to download a new firmware.
-
-Feature not supported in 1 firmware image example
-
-2. Pressing 2 allows to test protections.
-
- - CORRUPT IMAGE test (#1): causes a signature verification failure at next boot
- - WRP test (#2): causes an error trying to erase write protected code
- - IWDG test (#3): causes a reset simulating a deadlock by not refreshing the watchdog
- - TAMPER test (#4): causes a reset if a tamper event is detected. In order to generate a tamper event,
-   user has to connect PC13 (CN7.23) to GND (It may be enough to put your finger close to PC13 (CN7.23)).
-
-Return to previous menu by pressing x.
-
-3. Pressing 3 allows to call user defined services running in Secure Engine.
-As an example, SE_APP_GetActiveFwInfo service is called in order to display the firmware information
-located in the protected area such as version and size.
-
-4. This menu is dedicated to multiple images feature.
-Feature not available as there is only 1 download area configured.
-
-5. This menu is dedicated to image validation.
-Feature available under ENABLE_IMAGE_STATE_HANDLING compilation switch, not available in this example.
-
-a. Pressing a allows to enter specific key management services test menu.
-With this menu, you should be able to try encryption/decryption, signature/verification or key derivation mechanisms.
-
-
-Note :  for Linux users Minicom can be used but to do so you need to compile the UserApp project with the MINICOM_YMODEM switch enabled (ymodem.h)
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_export.h
deleted file mode 100644
index 11c619fa..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_export.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mapping_export.h
-  * @author  MCD Application Team
-  * @brief   This file contains the definitions exported from mapping linker files.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef MAPPING_EXPORT_H
-#define MAPPING_EXPORT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Exported constants --------------------------------------------------------*/
-extern uint32_t __ICFEDIT_intvec_start__;
-#define INTVECT_START ((uint32_t)& __ICFEDIT_intvec_start__)
-extern uint32_t __ICFEDIT_SE_Startup_region_ROM_start__;
-#define SE_STARTUP_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Startup_region_ROM_start__)
-extern uint32_t __ICFEDIT_SE_Code_region_ROM_start__;
-#define SE_CODE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_start__)
-extern uint32_t __ICFEDIT_SE_Code_region_ROM_end__;
-#define SE_CODE_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_end__)
-extern uint32_t __ICFEDIT_SE_IF_region_ROM_start__;
-#define SE_IF_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_start__)
-extern uint32_t __ICFEDIT_SE_IF_region_ROM_end__;
-#define SE_IF_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_end__)
-extern uint32_t __ICFEDIT_SE_Key_region_ROM_start__;
-#define SE_KEY_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_start__)
-extern uint32_t __ICFEDIT_SE_Key_region_ROM_end__;
-#define SE_KEY_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_end__)
-extern uint32_t __ICFEDIT_SE_CallGate_region_ROM_start__;
-#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_CallGate_region_ROM_start__)
-extern uint32_t __ICFEDIT_SB_region_ROM_start__;
-#define SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_SB_region_ROM_start__)
-extern uint32_t __ICFEDIT_SB_region_ROM_end__;
-#define SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_SB_region_ROM_end__)
-extern uint32_t __ICFEDIT_SE_region_RAM_start__;
-#define SE_REGION_RAM_START ((uint32_t)& __ICFEDIT_SE_region_RAM_start__)
-extern uint32_t __ICFEDIT_SE_region_RAM_end__ ;
-#define SE_REGION_RAM_END ((uint32_t)& __ICFEDIT_SE_region_RAM_end__)
-extern uint32_t __ICFEDIT_SB_region_RAM_start__ ;
-#define SB_REGION_RAM_START ((uint32_t)& __ICFEDIT_SB_region_RAM_start__)
-extern uint32_t __ICFEDIT_SB_region_RAM_end__ ;
-#define SB_REGION_RAM_END ((uint32_t)& __ICFEDIT_SB_region_RAM_end__)
-extern uint32_t __ICFEDIT_SE_region_RAM_stack_top__;
-#define SE_REGION_RAM_STACK_TOP ((uint32_t)& __ICFEDIT_SE_region_RAM_stack_top__)
-
-extern uint32_t __ICFEDIT_KMS_DataStorage_start__ ;
-#define KMS_DATASTORAGE_START ((uint32_t)& __ICFEDIT_KMS_DataStorage_start__)
-extern uint32_t __ICFEDIT_KMS_DataStorage_end__ ;
-#define KMS_DATASTORAGE_END ((uint32_t)& __ICFEDIT_KMS_DataStorage_end__)
-
-#if defined (__ICCARM__) || defined(__GNUC__)
-extern uint32_t __ICFEDIT_SLOT_Active_1_header__;
-#define SLOT_ACTIVE_1_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_1_header__)
-extern uint32_t __ICFEDIT_SLOT_Active_1_start__;
-#define SLOT_ACTIVE_1_START ((uint32_t)& __ICFEDIT_SLOT_Active_1_start__)
-extern uint32_t __ICFEDIT_SLOT_Active_1_end__;
-#define SLOT_ACTIVE_1_END ((uint32_t)& __ICFEDIT_SLOT_Active_1_end__)
-extern uint32_t __ICFEDIT_SLOT_Active_2_header__;
-#define SLOT_ACTIVE_2_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_2_header__)
-extern uint32_t __ICFEDIT_SLOT_Active_2_start__;
-#define SLOT_ACTIVE_2_START ((uint32_t)& __ICFEDIT_SLOT_Active_2_start__)
-extern uint32_t __ICFEDIT_SLOT_Active_2_end__;
-#define SLOT_ACTIVE_2_END ((uint32_t)& __ICFEDIT_SLOT_Active_2_end__)
-extern uint32_t __ICFEDIT_SLOT_Active_3_header__;
-#define SLOT_ACTIVE_3_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_3_header__)
-extern uint32_t __ICFEDIT_SLOT_Active_3_start__;
-#define SLOT_ACTIVE_3_START ((uint32_t)& __ICFEDIT_SLOT_Active_3_start__)
-extern uint32_t __ICFEDIT_SLOT_Active_3_end__;
-#define SLOT_ACTIVE_3_END ((uint32_t)& __ICFEDIT_SLOT_Active_3_end__)
-extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_start__;
-#define SLOT_BLOB_DWL_1_START ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_start__)
-extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_end__;
-#define SLOT_BLOB_DWL_1_END ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_end__)
-#endif /* __ICCARM__ || __GNUC__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MAPPING_EXPORT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
deleted file mode 100644
index 3c0a9a2b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-** LinkerScript
-*/
-
-/******************************************************************************/
-/*                               ROM section                                  */
-/******************************************************************************/
-
-/* Vector table */
-INTVECT_start                  = 0x08000000;
-Vector_size                    = 0x200;
-
-/* SE Code region protected by MPU isolation */
-SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
-SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start + 0x4;
-SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
-
-/* SE Embedded Keys */
-SE_Key_region_ROM_start        = SE_CallGate_region_ROM_end + 0x1;
-SE_Key_region_ROM_end          = SE_Key_region_ROM_start + 0x2FF;
-
-/* SE Startup */
-SE_Startup_region_ROM_start    = SE_Key_region_ROM_end + 0x1;
-SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
-SE_Code_region_ROM_end         = SE_Startup_region_ROM_start + 0x72FF;
-
-/* SE IF ROM */
-SE_IF_region_ROM_start         = SE_Code_region_ROM_end + 0x1; 
-SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0xEFF;
-
-/* SBSFU Code region */
-SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
-SB_region_ROM_end              = 0x0800CFFF;
-
-/* KMS Data Storage (NVMS) region protected area */
-/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
-KMS_DataStorage_start          = 0x0800D000;
-KMS_DataStorage_end            = 0x0800EFFF;
-
-/* ROM regions size definition */
-SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
-SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
-SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
-SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
-SE_Code_NoKey_region_ROM_size  = SE_Code_region_ROM_end - SE_Code_NoKey_region_ROM_start + 0x1;
-SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
-SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
-KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
-
-/******************************************************************************/
-/*                              RAM section                                   */
-/*                                                                            */
-/******************************************************************************/
-
-/* SE RAM region */
-SE_region_RAM_start            = 0x20000000;
-SE_region_RAM_stack_top        = 0x20000C00;                /* Secure Engine's private stack */
-SE_region_RAM_end              = 0x200033FF;
-
-/* SBSFU RAM region */
-SB_region_RAM_start            = SE_region_RAM_end + 0x1;
-SB_region_RAM_end              = 0x20007FFF;
-
-/* RAM regions size definition */
-SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
-SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
-
-/******************************************************************************/
-/*                              RAM/ROM regions                               */
-/*                                                                            */
-/******************************************************************************/
-
-MEMORY
-{
- INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
- SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
- SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
- SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
- SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
- SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
- SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
- SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
- SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
- SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/app_sfu.h
new file mode 100644
index 00000000..7d428183
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/app_sfu.h
@@ -0,0 +1,236 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_crypto_config.h"
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Use this define to choose the type of Firmware Image Programming you want to use.
+  * This version supports only 2 modes:
+  *
+  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
+  *       The image is received in encrypted format.
+  *       The image must be decrypted to be installed:
+  *         this is done according to the selected crypto scheme,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  * SFU_CLEAR_IMAGE: Clear Firmware Image
+  *       The image is received in clear format.
+  *       No decrypt operation is needed before installing the image:
+  *         the selected crypto scheme must be compatible with this choice,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  *
+  */
+#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
+#else
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
+#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
+
+/*#define SFU_DEBUG_MODE */              /*!< Comment this define to optimize memory footprint (debug mode removed)
+                                          No more print on terminal during SBSFU execution */
+
+/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
+                                          this switch activates more debug prints in the console (FSM state info...) */
+
+
+/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
+                                                          When this switch is activated, the FWIMG part of SB_SFU will
+                                                          block when an abnormal error is encountered */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
+#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
+#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
+
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
+#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
+
+/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
+                                           Automatically executed @startup */
+#if defined(SFU_TEST_PROTECTION)
+#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
+#endif /* SFU_TEST_PROTECTION */
+
+/**
+  * SB_SFU status LED.
+  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
+  * This is useful when no log is enabled.
+  *
+  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
+  * \li For the other situations, please check the other defines below.
+  */
+#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
+#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
+                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
+#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
+
+
+/**
+  * Optional Features Software Configuration
+  */
+#if !defined(SFU_TEST_PROTECTION)
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+#else
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
+#endif /* SFU_TEST_PROTECTION */
+
+#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
+#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
+#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
+
+/* Uncomment the define below if you want to use minicom with Linux */
+/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
+
+#if defined(MINICOM_YMODEM)
+/* Minicom does not accept the debug prints during the YMODEM session */
+#undef SFU_VERBOSE_DEBUG_MODE
+#endif /* MINICOM_YMODEM */
+
+
+/* Multi-images configuration :
+   - Max : 3 Active images
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+*/
+#define SFU_NB_MAX_ACTIVE_IMAGE 1U                        /*!< 1 active image managed */
+#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 blob dwl area managed */
+#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
+
+
+/* The define below allows disabling all security IPs at once.
+ *
+ * Enabled: all security IPs (WRP, watchdog...) are disabled.
+ * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
+ *
+ */
+
+#define SECBOOT_DISABLE_SECURITY_IPS  /*!< Disable all security IPs at once when activated */
+
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_WRP_PROTECT_ENABLE
+#define SFU_RDP_PROTECT_ENABLE
+/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
+                                             neither connected to GND nor to 5V (floating level), there are too many
+                                             spurious tamper event detected */
+#define SFU_DAP_PROTECT_ENABLE     /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
+                                        It might be difficult to reconnect the Debugger.*/
+#define SFU_DMA_PROTECT_ENABLE
+#define SFU_IWDG_PROTECT_ENABLE    /*!< WARNING:
+                                        1. Be Careful if enabling this protection. IWDG will be active also after
+                                           switching to UserApp: a refresh is needed.
+                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
+                                           platform (flash size...)*/
+#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
+                                        Enables/Disables the MPU protection.
+                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
+                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
+                                        addition to the overall MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
+                                        executable area */
+
+
+/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
+                                                 steps.
+                                                 When enabling this lock, Static protections cannot be modified any more
+                                                 and Debug is finally disabled. */
+
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
+                                                      completely disabled, OB update no more possible  */
+
+
+#else
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
+                                                      field should set it as Level2 */
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+/**
+  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
+  * This define is taken into account only if RDP level 2 is not set.
+  * If RDP level 2 is set no modification can be done anyway.
+  *
+  * Enabled: Option Bytes Development Mode enabled.
+  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
+  *          If an OB is not set though it should be then this setting is automatically corrected.
+  *          This applies only as long as RDP level 2 is not set.
+  *
+  * Disabled: Option Bytes Development Mode disabled.
+  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
+              the first time.
+  *           SB_SFU checks the Option Bytes configuration but does not correct it.
+  *           If a problem is detected an error message is reported and the execution stops.
+  */
+#define SECBOOT_OB_DEV_MODE
+
+
+#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
+                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
+
+
+/**
+  * Application Configuration
+  *
+  */
+#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
+                                              You can also define an upper bound here if you plan to use it */
+
+#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
+                                              no FW installed or due to an attack attempt). Could be different from
+                                              SFU_FW_VERSION_START_NUM */
+
+/**
+  * Features compatibility control
+  */
+#if defined(SFU_NO_SWAP) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_NO_SWAP process"
+#endif
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_SECURE_USER_PROTECT_ENABLE process"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_boot.c
new file mode 100644
index 00000000..e351318b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_boot.c
@@ -0,0 +1,1518 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.c
+  * @author  MCD Application Team
+  * @brief   SFU BOOT module
+  *          This file provides firmware functions to manage the following
+  *          functionalities of the Secure Boot:
+  *           + Initialization and de-initialization functions
+  *           + Secure Boot Control functions
+  *           + Secure Boot State functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_BOOT_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+#include "sfu_boot.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
+
+/*
+ * The sfu_com init is provided by the sfu_com_trace module by default.
+ * If not, then it is taken from the sfu_com_loader module.
+ */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_trace.h"
+#else
+#include "sfu_trace.h"      /* needed anyhow even if the defines will be empty */
+#include "sfu_com_loader.h" /* needed only for the COM init/de-init */
+#endif /* SFU_DEBUG_MODE  || SFU_TEST_PROTECTION */
+#include "se_def.h"
+#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
+#include "sfu_new_image.h"            /* the local loader is a kind of "application" running in SB_SFU so it needs the
+                                         services to install a FW image */
+#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
+#include "sfu_test.h"                 /* auto tests */
+#include "sfu_fwimg_internal.h"
+
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "sfu_kms.h"
+#endif /* KMS_ENABLED */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct
+{
+  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
+  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
+} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
+                                                     information using during the SM evolution. */
+
+/* Private defines -----------------------------------------------------------*/
+#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
+#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
+#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
+                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
+
+#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
+                                    maintained for future customization/expansion of the field itself */
+
+#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
+
+/* Private macros ------------------------------------------------------------*/
+#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    if (Status == SFU_SUCCESS){                                         \
+      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
+    }                                                                   \
+    else {                                                              \
+      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
+    }                                                                   \
+  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
+
+
+#define SFU_SET_SM_CURR_STATE(NewState)                                 \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    m_StateMachineContext.CurrState = NewState;                         \
+  }while(0) /*!< Set a State Machine state*/
+
+/* Private variables ---------------------------------------------------------*/
+/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
+static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
+                                                                         SFU_STATE_INITIAL
+                                                                        };
+
+/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+uint8_t initialDeviceStatusCheck;
+
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_BOOT_Init(void);
+static SFU_ErrorStatus SFU_BOOT_DeInit(void);
+static void SFU_BOOT_BspConfiguration(void);
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
+static void SFU_BOOT_SM_CheckStatusOnReset(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static void SFU_BOOT_SM_CheckNewFwToDownload(void);
+static void SFU_BOOT_SM_DownloadNewUserFw(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
+static void SFU_BOOT_SM_InstallKMSBlob(void);
+#endif /* KMS_ENABLED */
+static void SFU_BOOT_SM_CheckUserFwStatus(void);
+static void SFU_BOOT_SM_VerifyUserFwSignature(void);
+static void SFU_BOOT_SM_ExecuteUserFw(void);
+static void SFU_BOOT_SM_HandleCriticalFailure(void);
+static void SFU_BOOT_SM_RebootStateMachine(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
+static void SFU_BOOT_ManageResetSources(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
+  *        In the nominal case, the bootloader service runs until the user application is launched.
+  *        When no valid user application can be run (after installing a new image or not),
+  *        if the local loader feature is not enabled then the execution stops,
+  *        otherwise a local download will be awaited.
+  *        If the state machine encounters a major issue then a reboot is triggered.
+  * @param None.
+  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
+  * @note Constraints
+  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
+  *       2. This function also takes care of BSP initialization after enabling the secure mode.
+  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
+  *       3. No other entity should handle the initialization of the Secure Engine.
+  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
+  *          configurations will be overwritten).
+  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
+  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
+  *          error cause.
+  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
+  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
+  *          new image).
+  * @note Settings are handled at compilation time:
+  *       1. See compiler switches in main.h for secure IPs settings
+  *       2. The trace system is configured in the sfu_trace.h file
+  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
+  *          stage.
+  */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
+{
+  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
+
+  /*
+   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
+   * "automatically" managed by SBSFU compiler command
+   */
+  if (SE_Startup() == SE_SUCCESS)
+  {
+    /* Security Configuration */
+    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
+    {
+      /* Board BSP  Configuration */
+      SFU_BOOT_BspConfiguration();
+
+      /* Configure the Secure Boot and start the State machine */
+      if (SFU_BOOT_Init() == SFU_SUCCESS)
+      {
+        /* Start the Secure Boot State Machine */
+        (void) SFU_BOOT_SM_Run();
+      }
+      else
+      {
+        /* failure when initializing the secure boot service */
+        e_ret_code = SFU_BOOT_INIT_FAIL;
+      }
+    }
+    else
+    {
+      /* failure when configuring the security IPs  */
+      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
+    }
+  }
+  else
+  {
+    /* failure at secure engine initialization stage */
+    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
+  }
+
+  /*
+   * This point should not be reached unless a critical init failure occurred
+   * Return the error code
+   */
+  return (e_ret_code);
+}
+
+/**
+  * @brief  Force System Reboot
+  * @param  None
+  * @retval None
+  */
+void SFU_BOOT_ForceReboot(void)
+{
+  /*
+   * WARNING: The follow TRACEs are for debug only. This function could be called
+   * inside an IRQ so the below printf could not be executed or could generate a fault!
+   */
+  TRACE("\r\n========= End of Execution ==========");
+  TRACE("\r\n\r\n\r\n");
+
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/**
+  * @brief  Initialize the Secure Boot State machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_Init(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
+   * download)
+   */
+  initialDeviceStatusCheck = 1U;
+
+  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
+  if (SFU_LL_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Flash interface initialization */
+  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* The COM modules is required only if the trace or the local download is enabled */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
+  if (SFU_COM_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  /* Call the SFU_LOADER module Init */
+  if (SFU_LOADER_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+  /* Call the Exception module Init */
+  if (SFU_EXCPT_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Call the image handling Init  */
+  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
+  {
+    return SFU_ERROR;
+  } /* else continue */
+
+#ifdef SFU_TEST_PROTECTION
+  SFU_TEST_Init();
+#endif /* SFU_TEST_PROTECTION */
+
+  TRACE("\r\n\r\n");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  TRACE("\r\n=                                                                    =");
+  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n\r\n");
+
+  /* Initialize the Secure Engine that will be used for all the most critical operations */
+  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
+  }
+  else
+  {
+    e_ret_status = SFU_SUCCESS;
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize the Secure Boot State machine.
+  * @param  None
+  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
+  *         The bootloader can terminate:
+  *         1. with an init failure : no de-init needed
+  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
+  *            by this function.
+  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
+  *            required security mechanisms.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_DeInit(void)
+{
+  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  if (SFU_COM_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+  if (SFU_LL_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  BSP Initialization.
+  *         Called when the secure mode is enabled.
+  * @note   The BSP configuration should be handled only in this function.
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_BspConfiguration()
+{
+  /* LED Init*/
+  (void) BSP_LED_Init(SFU_STATUS_LED);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* User Button */
+  BUTTON_INIT();
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Execute the Secure Boot state machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
+  void (*fnStateMachineFunction)(void);
+  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+                                                 SFU_BOOT_SM_CheckNewFwToDownload,
+                                                 SFU_BOOT_SM_DownloadNewUserFw,
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
+                                                 SFU_BOOT_SM_InstallKMSBlob,
+#endif /* KMS_ENABLED */
+                                                 SFU_BOOT_SM_CheckUserFwStatus,
+                                                 SFU_BOOT_SM_VerifyUserFwSignature,
+                                                 SFU_BOOT_SM_ExecuteUserFw,
+                                                 SFU_BOOT_SM_HandleCriticalFailure,
+                                                 SFU_BOOT_SM_RebootStateMachine
+                                                };
+
+  /* Start the State Machine loop/evolution */
+  while (e_ret_status == SFU_SUCCESS)
+  {
+    /* Always execute a security/safety check before moving to the next state */
+    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
+    {
+      /* Get the right StateMachine function according to the current state */
+      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
+
+      /* Call the State Machine function associated to the current state */
+      fnStateMachineFunction();
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* If the State Machine cannot evolve anymore, reboot is the only option */
+
+  /* Set the error before forcing a reboot */
+  SFU_EXCPT_SetError(SFU_EXCPT_UNKNOWN);
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+  return e_ret_status;
+}
+
+/** @brief  Check the Reset status in order to understand the last cause of Reset
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckStatusOnReset(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
+
+  /* Check the wakeup sources */
+  SFU_BOOT_ManageResetSources();
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* When the local loader feature is supported we need to check if a local download is requested */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+#ifdef KMS_ENABLED
+  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* When the local loader feature is disabled go directly to the check of the FW status */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Check if a new UserApp firmware is available for downloading.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckNewFwToDownload(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_DWL_REQ)
+  {
+    TRACE("\r\n= [SBOOT] STATE: execution standalone loader");
+    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+    /* This is unreachable code (dead code) in principle...
+    At this point we should not be able to reach the following instructions.
+    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
+    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
+    if (0U != BUTTON_PUSHED())
+    {
+      /* Download requested */
+      e_ret_status = SFU_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /*
+     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
+     * download to start
+     */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+#ifdef KMS_ENABLED
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
+
+#ifdef KMS_ENABLED
+/**
+  * @brief  Check if a KMSBlob is waiting for installation.
+  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
+  *         disabled.
+  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
+  *         enabled.
+  *         In this latter case,
+  *               if a new Firmware download is requested,
+  *               it has priority over the KMS blob installation,
+  *               and the KMS blob installation request will be lost.
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
+
+  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
+  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
+
+  /* Check if a Blob Installation is requested or on-going */
+  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
+
+  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
+  {
+    /* Blob installation requested */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+/**
+  * @brief  Check if a KMSBlob is waiting for install.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallKMSBlob(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  uint8_t         *pBlobHdr;
+  uint8_t         *pBlobInFlash;
+  CK_RV           e_status;
+
+  /* At boot-up, Managing ImportBlob through KMS services.  */
+  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
+
+  /* Here we will Launch SE service to take consume the Blob */
+  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
+  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
+  }
+  else
+  {
+    /* Initialize KMS in order to be able to import blob using internal algorithms */
+    e_status = C_Initialize(NULL);
+    if (e_status == CKR_OK)
+    {
+      /* we do not take the return value into account as we will not retry the import in case of issue */
+      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
+
+      if (e_status != CKR_OK)
+      {
+        (void)C_Finalize(NULL);
+      }
+      else
+      {
+        e_status = C_Finalize(NULL);
+      }
+    }
+
+    if (e_status != CKR_OK)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
+    }
+
+    /* In any case, we remove the Blob To Install (regardless of the result) */
+    e_ret_status = SFU_KMS_EraseBlob();
+
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
+    }
+
+    /* Display the KMS import result */
+    switch (e_status)
+    {
+      case CKR_OK:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
+        e_ret_status = SFU_SUCCESS;
+        break;
+
+      case CKR_SIGNATURE_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DATA_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DEVICE_ERROR:
+        /* At boot-up, NVM Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_OPERATION_ACTIVE:
+        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      default:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
+        e_ret_status = SFU_ERROR;
+        break;
+    }
+  }
+
+  /* Set the next State Machine regardless of the KMS import result */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+#endif /* KMS_ENABLED */
+
+
+/**
+  * @brief  Check the Status of the Fw Image to work on  in order to set the next
+  *         State Machine state accordingly
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckUserFwStatus(void)
+{
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  uint32_t i;
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_INSTALL_REQ)
+  {
+    /* Whatever the status the decryption can be done only once ==> no interruption allowed */
+    STANDALONE_LOADER_STATE = STANDALONE_LOADER_NO_REQ;
+
+    TRACE("\r\n\t  New Fw Encrypted, to be decrypted");
+
+    /* Check if there is a pending action related to a FW update procedure */
+    if (SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall) == SFU_IMG_FWIMAGE_TO_INSTALL)
+    {
+      /* Check the candidate version vs current active version */
+      e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+
+      if (SFU_SUCCESS != e_ret_status)
+      {
+        /* Erase downloaded FW in case of authentication/integrity error */
+        (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
+      }
+      else
+      {
+        /* Secure coding : double check the candidate version vs current active version */
+        e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+      }
+
+      if (SFU_SUCCESS == e_ret_status)
+      {
+        /* Start installation */
+        e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
+      }
+    }
+
+    /* Critical failure management if installation failed */
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+      return;
+    }
+  }
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+  /*
+   * No FW image installation pending :
+   *   1- Priority to MASTER_SLOT : check if a firmware is detected
+   *   2- No firmware identified : verify other slots and start execution on the last detected firmware
+   *   3- No active firmware candidate for execution ==> Local download
+   *
+   * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
+   */
+
+  m_ActiveSlotToExecute = 0U;
+
+  /* 1- Priority to MASTER_SLOT : check if a firmware is detected */
+  if (MASTER_SLOT != 0xFFU)
+  {
+    if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
+    {
+      m_ActiveSlotToExecute = MASTER_SLOT;
+      TRACE("\r\n\t  A FW is detected in the slot SLOT_ACTIVE_%d", m_ActiveSlotToExecute);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+    }
+  }
+
+  /* 2- No firmware identified : verify other slots and start execution on the last detected firmware */
+  if (m_ActiveSlotToExecute == 0U)
+  {
+    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+    {
+      if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
+      {
+        if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+        {
+          m_ActiveSlotToExecute = SLOT_ACTIVE_1 + i;
+          TRACE("\r\n\t  A FW is detected in the slot SLOT_ACTIVE_%d", m_ActiveSlotToExecute);
+          SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+        }
+      }
+    }
+  }
+
+  /* 3- No active firmware candidate for execution ==> Local download */
+  if (m_ActiveSlotToExecute == 0U)
+  {
+    /* Control if all active slot are empty */
+    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+    {
+      if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+
+    /*
+     * No valid FW is present in the active slot
+     * and there is no FW to be installed in UserApp download area: local download (when possible)
+     */
+    if (initialDeviceStatusCheck == 1U)
+    {
+      TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+      /* Waiting for a local download is automatic, no trigger required. */
+      TRACE("\r\n\t  Waiting for the local download to start... ");
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+      initialDeviceStatusCheck = 0U;
+#ifdef SFU_TEST_PROTECTION
+      SFU_TEST_Reset();
+#endif /* SFU_TEST_PROTECTION */
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      /*
+       * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
+       *   If a FW is present in the active slot => it is checked then launched.
+       *   If there is a FW to install => the installation procedure starts.
+       *   If no FW is present and no installation is pending:
+       *      - if the local loader feature is enabled we enter the local download state
+       *      - if the local loader feature is disabled, the execution is stopped.
+       */
+      TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS is not supposed to be entered more than once per boot.");
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+    SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+    /*
+     * When the local loader feature is disabled it is not possible to enter the "check new fw download" state.
+     * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
+     * So we end up waiting for the user to reboot (or the IWDG to expire).
+     */
+    TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
+    while (1 == 1)
+    {
+      (void) BSP_LED_Toggle(SFU_STATUS_LED);
+      HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+    }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  }
+}
+
+
+#if SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   Reset is generated at by standalone loader when FW is downloaded.
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /* Jump into standalone loader */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+  e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /*
+   * Download area will be chosen as following. After header analysis :
+   *   - same DWL slot number as SFU magic number, if the slot is configured.
+   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
+   *   - by default : SLOT_DWL_1
+   */
+  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
+          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
+          fw_image_header_validated.PartialFwOffset, u_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * In 1_Image example : dwl_slot == active_slot
+     */
+    if (SFU_IMG_Validation(dwl_slot, &fw_image_header_validated) != SFU_SUCCESS)
+    {
+      /* CleanUp downloaded image (header preserved, for anti-rollback) */
+      (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
+
+      /* no specific error cause set */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    /* CleanUp downloaded image (header preserved, for anti-rollback) */
+    (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
+
+    /* Memorize the specific error cause if any before handling this critical failure */
+    switch (e_ret_status_app)
+    {
+      case SFU_LOADER_ERR_COM:
+        SFU_EXCPT_SetError(SFU_EXCPT_COM_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_VERSION:
+        SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_LENGTH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FW_TOO_BIG);
+        break;
+      case SFU_LOADER_ERR_AUTH_FAILED:
+        SFU_EXCPT_SetError(SFU_EXCPT_HEADER_AUTH_ERR);
+        break;
+      case SFU_LOADER_ERR_FLASH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FLASH_ERR);
+        break;
+      case SFU_LOADER_ERR_CRYPTO:
+        SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+        break;
+      default:
+        /* no specific error cause */
+        break;
+    }
+  } /* else error with no specific error cause */
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+
+/**
+  * @brief  Verify the UserApp Fw signature before executing it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_VerifyUserFwSignature(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
+
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /*
+   * With the 2 images handling:
+   *       1. the header signature is verified  when installing a new firmware
+   *       2. the firmware signature is checked when installing a new firmware
+   *       3. remaining part of active slot is kept "clean" during installation procedure
+   * So following checks should never fail.
+   */
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
+        if (SFU_SUCCESS == e_ret_status)
+        {
+          /* Check the FW signature */
+          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
+          if (SFU_SUCCESS == e_ret_status)
+          {
+            /* Verify that there is no additional code beyond firmware image */
+            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
+            if (SFU_SUCCESS != e_ret_status)
+            {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+            }
+          }
+          else
+          {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          }
+        }
+        else
+        {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        }
+        /*
+         * One of the checks fails :
+         *  - Header signature
+         *  - FW signature
+         *  - No malicious code
+         *  ==> Active slot should be invalidated
+         */
+        if (SFU_SUCCESS != e_ret_status)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+        else
+        {
+          /* Verify if authentication and integrity controls performed */
+          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+        }
+      }
+      else
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ExecuteUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+
+  /* Double security check for all active slots :
+     - Control twice the Header signature will avoid basic hardware attack
+     - Control twice the FW signature will avoid basic hardware attack */
+
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+        /* Check the FW signature */
+        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+        /* Move the state to SELFTEST for the new images */
+        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Image state cannot be changed : What to do ?
+             ==> decision to continue execution */
+          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
+        }
+#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
+
+        /* Verify if authentication and integrity controls performed */
+        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+      }
+    }
+  }
+
+  /*
+   * You may decide to implement additional checks before running the Firmware.
+   * For the time being we launch the FW present in the active slot.
+   *
+   * The bootloader must also take care of the security aspects:
+   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
+   *   B.lock the SE services the UserApp is not allowed to call
+   *   C.leave secure boot mode
+   */
+
+  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
+  e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+    SFU_EXCPT_SetError(SFU_EXCPT_FLASH_CFG_ERR);
+
+    /* This is the last operation executed. Force a System Reset */
+    SFU_BOOT_ForceReboot();
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Double instruction to avoid basic fault injection */
+      if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+      {
+        /* De-initialize the SB_SFU bootloader before launching the UserApp */
+        (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
+
+        /* Last flow control : lock service */
+        FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
+
+        /* This function should not return */
+        e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
+
+        /* This point should not be reached */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        /* We do not memorize any specific error, the FSM state is already providing the info */
+        TRACE("\r\n\t  SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        while (1 == 1)
+        {
+          ;    /* wait for watchdog */
+        }
+      }
+      else
+      {
+        /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+        SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+        /* This is the last operation executed. Force a System Reset */
+        SFU_BOOT_ForceReboot();
+      }
+    }
+    else
+    {
+      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+      SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+      /* This is the last operation executed. Force a System Reset */
+      SFU_BOOT_ForceReboot();
+    }
+  }
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
+  * @param  None
+  * @note   After a Critical Failure a Reboot will be called.
+  * @retval None
+  */
+static void SFU_BOOT_SM_HandleCriticalFailure(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+     The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
+}
+
+/**
+  * @brief  The state machine is aborted and a Reset is triggered
+  * @param  None
+  * @note   You are in this condition because it's not possible to continue without
+            compromising the stability or the security of the solution.
+  * @retval None
+  */
+static void SFU_BOOT_SM_RebootStateMachine(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
+
+  /*
+   * In case some clean-up must be done before resetting.
+   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
+   */
+  (void)SFU_BOOT_DeInit();
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Jump into standalone loader
+  * @param  None
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+
+
+  /* Lock part of Secure Engine services */
+  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Give execution rights to standalone loader */
+      e_ret_status = SFU_LL_SECU_SetProtectionMPU_StandaloneLoader();
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Initialize address to jump */
+    jump_address = *(__IO uint32_t *)(((uint32_t)LOADER_REGION_ROM_START + 4));
+    p_jump_to_function = (Function_Pointer) jump_address;
+
+    /* Initialize loader's Stack Pointer */
+    __set_MSP(*(__IO uint32_t *)(LOADER_REGION_ROM_START));
+
+    /* Jump into loader */
+    p_jump_to_function();
+  }
+
+  /* The point below should NOT be reached */
+  return e_ret_status;
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply Static protections involving Option Bytes */
+  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  System security configuration
+  * @param  None
+  * @note   Check and apply the security protections. This has to be done as soon
+  *         as possible after a reset
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  /* WARNING: The following CheckApplySecurityProtection function must be called
+     as soon as possible after a Reset in order to be sure the system is secured
+     before starting any other operation. The drawback is that the ErrorManagement
+     is not initialized yet, so in case of failure of this function, there will not be
+     any error stored into the BootInfo or other visible effects.  */
+
+  /* Very few things are already initialized at this stage. Need additional initialization
+     to show a message that is added as below only in Debug/Test mode */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  (void) SFU_COM_Init();
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
+  {
+    /* WARNING: This might be generated by an attempted attack or a bug of your code!
+       Add your code here in order to implement a custom action for this event,
+       e.g. trigger a mass erase or take any other action in order to
+       protect your system, or simply discard it if this is expected.
+       ...
+       ...
+    */
+    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
+  }
+  else
+  {
+    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
+  *         a malicious code removing some of the applied security/integrity features.
+  *         The IWDG is also refreshed in this function.
+  * @param  None
+  * @note   This function must be called with a frequency greater than 0.25Hz!
+  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
+  *         So the User App should continue to refresh the IWDG counter.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Refresh the IWDG */
+  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
+
+
+  /* Add your code here for customization:
+     e.g. for additional security or safety periodic check.
+     ...
+     ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_ManageResetSources(void)
+{
+  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
+
+  /* Check the wakeup sources */
+  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
+  switch (e_wakeup_source_id)
+  {
+    /*
+     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
+     * RCC_CSR flags can be used to do so.
+     */
+
+    case SFU_RESET_WDG_RESET:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_LOW_POWER:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_HW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_BOR_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_SW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_OB_LOADER:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    default:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+  }
+
+  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
+  SFU_LL_SECU_ClearResetSources();
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Memory Fault.
+  * @note  After a Memory Fault could not be possible to execute additional code
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_MEMORYFAULT(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_MEMORY_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_boot.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_boot.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_boot.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_loader.c
new file mode 100644
index 00000000..f7599f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_loader.c
@@ -0,0 +1,544 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
+#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
+
+/* Private macros ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
+#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
+#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+/**
+  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
+  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
+  * @param  puSize: size of received file.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
+{
+  uint32_t i;
+  uint32_t packet_length = 0U;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t filesize = 0U;
+  uint32_t packets_received;
+  uint8_t *file_ptr;
+  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
+                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(8)));
+
+  /* Check the pointers allocation */
+  if ((peCOMStatus == NULL) || (puSize == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  *peCOMStatus = SFU_COM_YMODEM_OK;
+
+  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *peCOMStatus = SFU_COM_YMODEM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *puSize = filesize;
+              file_done = 1U;
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
+              {
+                /* No NACK sent for a better synchro with remote : packet will be repeated */
+              }
+              else
+              {
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name skipped */
+                    i = 0U;
+                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
+                    {
+                      i++;
+                      file_ptr++;
+                    }
+                    /* end of file name ('\0') skipped */
+                    file_ptr++;
+
+                    /* File size extraction */
+                    i = 0U;
+                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
+                    {
+                      file_size[i] = *file_ptr;
+                      i++;
+                      file_ptr++;
+                    }
+                    file_size[i] = (uint8_t) '\0';
+                    (void) Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call*/
+                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
+                    {
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                      (void) SFU_LL_UART_Flush();
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
+                    }
+                    else
+                    {
+                      /* End session */
+                      tmp = SFU_COM_YMODEM_CA;
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      return SFU_ERROR;
+                    }
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                    file_done = 1U;
+                    session_done = 1U;
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  /* Data packet received callback call*/
+                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX],
+                                                           packet_length) == SFU_SUCCESS)
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* End session */
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    *peCOMStatus = SFU_COM_YMODEM_DATA;
+                  }
+
+                }
+                packets_received ++;
+                session_begin = 1;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          break;
+        default:
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
+          {
+            /* Abort communication */
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          }
+          else
+          {
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            /* Minicom does not accept this extra character */
+            TRACE("\b.");                                 /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+            /*
+             * Toggling the LED in case no console is available: the toggling frequency depends on
+             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
+             */
+            (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          }
+          break;
+      }
+    }
+  }
+  /* Make sure the status LED is turned off */
+  (void) BSP_LED_Off(SFU_STATUS_LED);
+
+  if (*peCOMStatus == SFU_COM_YMODEM_OK)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+/**
+  * @brief  Transmit a byte to the COM Port.
+  * @param  uParam: The byte to be sent.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
+{
+  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
+}
+
+/**
+  * @brief  Convert a string to an integer.
+  * @param  pInputStr: The string to be converted.
+  * @param  pIntNum: The integer value.
+  * @retval 1: Correct
+  *         0: Error
+  */
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+  uint8_t  digit;
+
+  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        digit = CONVERTHEX(pInputStr[i]);
+        val = (val << 4U) + digit;
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == (uint8_t)'\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == (uint8_t)'\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        digit =  CONVERTDEC(pInputStr[i]);
+        val = (val * 10U) + digit;
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData: pointer to received data.
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeOut: receive timeout (ms).
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  SFU_ErrorStatus eRetStatus;
+
+  uint8_t char1;
+
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0; /* index indicating where to write in pData */
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
+
+  if (eRetStatus == SFU_SUCCESS)
+  {
+    status = HAL_OK;
+
+    switch (char1)
+    {
+      case SFU_COM_YMODEM_SOH:
+        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
+        break;
+      case SFU_COM_YMODEM_STX:
+        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+        break;
+      case SFU_COM_YMODEM_EOT:
+        break;
+      case SFU_COM_YMODEM_CA:
+        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
+        {
+          packet_size = 2U;
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      case SFU_COM_YMODEM_ABORT1:
+      case SFU_COM_YMODEM_ABORT2:
+        status = HAL_BUSY;
+        break;
+      case SFU_COM_YMODEM_RB:
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
+    {
+
+#ifndef MINICOM_YMODEM
+      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX],
+                                       (uint16_t)(packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
+#else
+      eRetStatus = SFU_SUCCESS;
+      /* Receive byte per byte until no data left or no space left in buffer */
+      while ((SFU_SUCCESS == eRetStatus) &&
+             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
+              SFU_COM_YMODEM_PACKET_DATA_INDEX +
+              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
+            )
+      {
+        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
+                                         1U, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        /* We received some bytes */
+        eRetStatus = SFU_SUCCESS;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (eRetStatus == SFU_SUCCESS)
+      {
+        status = HAL_OK;
+
+        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
+                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
+        {
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC*/
+          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
+          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
+
+          /*Configure CRC with 16-bit polynomial*/
+          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
+          {
+            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
+            {
+              packet_size = 0U;
+              status = HAL_ERROR;
+            }
+
+          }
+          else
+          {
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        status = HAL_ERROR;
+      }
+    }
+  }
+  else
+  {
+    status = HAL_ERROR;
+  }
+
+  *puLength = packet_size;
+  return status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(uFileSize);
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(pData);
+  UNUSED(uSize);
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_loader.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_loader.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_loader.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_loader.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_trace.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_trace.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_trace.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_trace.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_trace.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_trace.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_com_trace.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_com_trace.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_def.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_def.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_def.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_def.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_error.c
new file mode 100644
index 00000000..e4f31b31
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_error.c
@@ -0,0 +1,228 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.c
+  * @author  MCD Application Team
+  * @brief   SFU ERROR
+  *          This file provides set of firmware functions for SB_SFU errors handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "sfu_low_level_security.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_boot.h"
+#include "sfu_test.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+/**
+  *  The following strings associated to the exceptions/errors are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
+  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
+  */
+static char *m_aErrorStrings[] ={  "No error. Success",
+                                   "Memory fault",
+                                   "Hard fault",
+                                   "Tampering fault",
+                                   "SE lock cannot be set",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Fw too big",
+                                   "File not correctly received",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Fw header authentication error",
+                                   "Fw decryption error",
+                                   "Fw signature check error",
+                                   "Flash error",
+                                   "External flash configuration error.",
+                                   "Header erasing error",
+                                   "Header validation error",
+                                   "Additional code detected beyond FW",
+                                   "Fw version rejected (anti-rollback)",
+                                   "Unknown error"
+                                };
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Print relevant errpr message.
+  * @param  Error Error code.
+  * @retval None
+  */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  if (eExceptionId <= SFU_EXCPT_UNKNOWN)
+  {
+#ifdef SFU_DEBUG_MODE
+    TRACE("\r\n\t%s",m_aErrorStrings[(uint32_t) eExceptionId]);
+#endif /* SFU_DEBUG_MODE */
+  }
+}
+
+
+/**
+  * @brief  Manage the Exception generated by an IRQ
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   Because of the interruption of the State Machine execution,
+  *         it's not possible to continue without compromising the stability or
+  *         the security of the solution. A System Reset is forced at the end.
+  * @retval None
+  */
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+#ifdef SFU_DEBUG_MODE
+  uint8_t message[150];
+  uint32_t i = 0U;
+
+  /* Avoid warning with cast frombetween char* and uint8_t* */
+  while ((m_aErrorStrings[(uint32_t) eExceptionId][i] != 0u) && (i < 149U))
+  {
+    message[i] = m_aErrorStrings[(uint32_t) eExceptionId][i];
+    i++;
+  }
+  message[i] = 0U;
+
+  /* Print relevant error message */
+  TRACE_IRQ((uint8_t *)"\r\n\t  ");
+  TRACE_IRQ(message);
+#endif /* SFU_DEBUG_MODE */
+
+  /* Try to take an action */
+  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+  The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_BOOT_ForceReboot();
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+void SFU_EXCPT_Security_Error(void)
+{
+  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
+  HAL_Delay(1000);
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/**
+  * @brief  SFU Exception Initialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_Init(void)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU Exception DeInitialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status;
+  /* ADD SRC CODE HERE
+      ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   A System Reset is forced at the end by the caller of this function.
+  *         WARNING: Be aware that this function can be called by an IRQ while
+  *         using the printf, since the printf is not a reentrant function, and using
+  *         the printf inside this function as well, a fault will likely occur.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  switch (eExceptionId)
+  {
+    case SFU_EXCPT_TAMPERING_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_MEMORY_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_HARD_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+#ifdef SFU_TEST_PROTECTION
+      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
+         ==> this is not an error */
+#endif /* SFU_TEST_PROTECTION */
+      break;
+
+    default:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+  }
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_error.h
new file mode 100644
index 00000000..9188822f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_error.h
@@ -0,0 +1,85 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.h
+  * @author  MCD Application Team
+  * @brief   This file contains the error handling elements for SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_ERROR_H
+#define SFU_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * This enum must start from 0.
+  * When adding a new error in the enum below please also:
+  *  1. update IS_SFU_EXCPT
+  *  2. update m_aErrorStrings
+  */
+typedef enum
+{
+  SFU_EXCPT_NONE = 0UL,
+  /* System errors */
+  SFU_EXCPT_MEMORY_FAULT,
+  SFU_EXCPT_HARD_FAULT,
+  SFU_EXCPT_TAMPERING_FAULT,
+  /* Specific errors */
+  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
+  SFU_EXCPT_COM_ERR,               /* COM error during the local download of the binary */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  SFU_EXCPT_HEADER_AUTH_ERR,       /* header authentication failure */
+  SFU_EXCPT_DECRYPT_ERR,           /* Decrypt failure */
+  SFU_EXCPT_SIGNATURE_ERR,         /* Signature check failure */
+  SFU_EXCPT_FLASH_ERR,             /* Problem with FLASH */
+  SFU_EXCPT_FLASH_CFG_ERR,         /* Flash configuration issue (external flash) */
+  SFU_EXCPT_HEADER_ERASING_ERR,    /* Header erasing failure */
+  SFU_EXCPT_HEADER_VALIDATION_ERR, /* Header validation failure */
+  SFU_EXCPT_ADDITIONAL_CODE_ERR,   /* Additional code detected beyond the firmware image (malicious SW) */
+  SFU_EXCPT_VERSION_ERR,           /* Anti-rollback check rejected the version to be installed */
+  /* Unknown error */
+  SFU_EXCPT_UNKNOWN                /* To be kept as last error */
+} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
+
+/* External variables --------------------------------------------------------*/
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_Security_Error(void);
+
+SFU_ErrorStatus SFU_EXCPT_Init(void);
+SFU_ErrorStatus SFU_EXCPT_DeInit(void);
+
+void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_ERROR_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fsm_states.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fsm_states.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_fsm_states.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fsm_states.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_common.c
new file mode 100644
index 00000000..d440520f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_common.c
@@ -0,0 +1,1055 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_common.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the "common" functionalities of the image handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_COMMON_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+SFU_IMG_StatusTypeDef SFU_IMG_Status;
+uint32_t SFU_IMG_Line;
+
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_to_test;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/* Functions Definition : helper ---------------------------------------------*/
+/**
+  * @brief  Memory compare with constant time execution.
+  * @note   Objective is to avoid basic attacks based on time execution
+  * @param  pAdd1 Address of the first buffer to compare
+  * @param  pAdd2 Address of the second buffer to compare
+  * @param  Size Size of the comparison
+  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
+  */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
+{
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  for (i = 0U; i < Size; i++)
+  {
+    result |= pAdd1[i] ^ pAdd2[i];
+  }
+
+  if (result == 0x00U)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+
+/**
+  * @brief  Check header signature
+  * @param  pFwImageHeader: pointer to raw header.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef se_status;
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
+  {
+    /* Unused bytes should be set at 0x00 value
+       Comparison with constant time execution */
+    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
+    {
+      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
+    }
+
+    if (result == 0x00U)
+    {
+      /* Check signature of the FW header */
+      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
+      {
+        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
+  *        It handles Firmware TAG verification of a complete buffer by calling
+  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
+  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
+  *        and at the end compare the obtained TAG with the one provided as input
+  *        in pSE_GMCInit parameter.
+  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
+  * @param pSE_Status: Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param SlotNumber index of the slot in the list
+  * @param pSE_Metadata: Firmware metadata.
+  * @param pSE_Payload: pointer to Payload Buffer descriptor.
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_ret_status = SE_ERROR;
+  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
+  /* Loop variables */
+  uint32_t i;
+  uint32_t j;
+  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
+  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
+  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
+  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
+  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
+  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(8)));
+  /* FW chunk produced by the verification procedure if any   */
+  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* FW chunk provided as input to the verification procedure */
+  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* Variables to handle the FW image (this will be split in chunks) */
+  uint32_t payloadsize;
+  uint32_t ppayload;
+  uint32_t scatter_nb;
+  /* Variables to handle FW image size and tag */
+  uint32_t fw_size;
+  uint8_t *fw_tag;
+
+  /* Check the pointers allocation */
+  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
+  {
+    return SFU_ERROR;
+  }
+  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check the parameters value and set fw_size and fw_tag to check */
+  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
+  {
+    fw_size = pSE_Metadata->FwSize;
+    fw_tag = pSE_Metadata->FwTag;
+  }
+  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
+  {
+    fw_size = pSE_Metadata->PartialFwSize;
+    fw_tag = pSE_Metadata->PartialFwTag;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+
+  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
+  {
+    return SFU_ERROR;
+  }
+
+  /*  fix number of scatter block */
+  if (pSE_Payload->PayloadSize[1] != 0U)
+  {
+    scatter_nb = 2U;
+  }
+  else
+  {
+    scatter_nb = 1U;
+  }
+
+
+  /* Encryption process*/
+  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
+
+  /* check for initialization errors */
+  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    for (j = 0; j < scatter_nb; j++)
+    {
+      payloadsize = pSE_Payload->PayloadSize[j];
+      ppayload = pSE_Payload->pPayload[j];
+      i = 0;
+      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
+
+      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
+             (sfu_ret_status == SFU_SUCCESS))
+      {
+
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        ppayload += fw_chunk_size;
+        fw_verified_total_size += fw_chunk_size;
+        i++;
+      }
+      /* this the last path , size can be smaller */
+      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
+      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+      {
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
+                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)),
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        fw_verified_total_size += fw_chunk_size;
+      }
+    }
+  }
+
+  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    if (fw_verified_total_size <= fw_size)
+    {
+      /* Do the Finalization, check the authentication TAG*/
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
+
+      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
+        {
+          *pSeStatus = SE_SIGNATURE_ERR;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+
+          /* Save result for active slot :
+             to avoid single fault attack the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
+          }
+        }
+        else
+        {
+          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+
+          /* Save result for active slot :
+             to avoid single fault attacje the signature will be doble checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag_output, SE_TAG_LEN);
+          }
+        }
+      }
+      else
+      {
+        sfu_ret_status = SFU_ERROR;
+      }
+    }
+    else
+    {
+      sfu_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    sfu_ret_status = SFU_ERROR;
+  }
+  return sfu_ret_status;
+}
+
+/**
+  * @brief Fill authenticated info in SE_FwImage.
+  * @param SFU_APP_Status
+  * @param pBuffer
+  * @param BufferSize
+  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
+{
+  /* Check the pointers allocation */
+  if ((pFwHeader == NULL) || (pBuffer == NULL))
+  {
+    return SFU_ERROR;
+  }
+  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Verify Image Header in the slot given as a parameter
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
+  * @note   Not used in Alpha version -
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* use api read to detect possible ECC error */
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                   sizeof(SE_FwRawHeaderTypeDef));
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify signature */
+    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify Fw signature of binary contiguous in flash
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  SlotNumber flash slot to check
+  * @param  pFwImageHeader pointer to fw header
+  * @param  SlotNumber flash slot to check
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
+                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType)
+{
+  SE_Ex_PayloadDescTypeDef  pse_payload;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*  put it OK, to discriminate error in SFU FWIMG parts */
+  *pSeStatus = SE_OK;
+
+  /* Check the parameters value */
+  if (pFwImageHeader == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check SE_FwType parameter, and fix size and offset accordingly */
+  switch (SE_FwType)
+  {
+    case SE_FW_IMAGE_COMPLETE :
+      fw_size = pFwImageHeader->FwSize;
+      fw_offset = 0U;
+      break;
+    case SE_FW_IMAGE_PARTIAL :
+      fw_size = pFwImageHeader->PartialFwSize;
+      fw_offset = pFwImageHeader->PartialFwOffset;
+      break;
+    default :
+      /* error */
+      fw_size = 0U;
+      fw_offset = 0U;
+      break;
+  }
+
+  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
+  pse_payload.PayloadSize[0] = fw_size;
+  pse_payload.pPayload[1] = 0U;
+  pse_payload.PayloadSize[1] = 0U;
+
+  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
+}
+
+/**
+  * @brief Verifies the validity of a slot.
+  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
+  * @param pSlotBegin Start address of a slot.
+  * @param uSlotSize Size of a slot.
+  * @param uFwSize Size of the firmware image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
+{
+  uint8_t *pdata;
+  uint32_t length;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check is already clean */
+  pdata = pSlotBegin + SFU_IMG_IMAGE_OFFSET + uFwSize;
+  length = uSlotSize - SFU_IMG_IMAGE_OFFSET - uFwSize;
+  e_ret_status = SFU_LL_FLASH_Compare(pdata, 0x00000000U, 0xFFFFFFFFU, length);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function clean-up the flash
+  * @note   Not designed to clean-up area inside secure engine isolation.
+  * @note   To clean the slot without erasing the header we write "0x00" except if already written
+  * @param  pSlotBegin Start address of a slot.
+  * @param  uSlotSize Size of a slot.
+  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t pdata;
+  uint32_t slot_begin;
+  SFU_LL_FLASH_write_t pattern;
+  SFU_LL_FLASH_write_t value;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  /* Clean-up pattern initialization */
+  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
+
+  /* Cleaning operation */
+  slot_begin = (uint32_t) pSlotBegin;
+  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
+  {
+    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* If read succeed, then the pattern write is performed only if pattern is not already present */
+      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                          sizeof(SFU_LL_FLASH_write_t));
+      }
+    }
+    else
+    {
+      /* If read fail, then the write is performed unconditionally */
+      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                        sizeof(SFU_LL_FLASH_write_t));
+    }
+
+    /* Reload Watchdog every 4Kbytes */
+    if ((pdata % 0x1000U) == 0U)
+    {
+      (void) SFU_LL_SECU_IWDG_Refresh();
+    }
+  }
+  return e_ret_status;
+}
+
+/* Functions Definition : services ------------------------------------------- */
+
+/**
+  * @brief FW Image Handling (FWIMG) initialization function.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
+{
+  uint32_t i;
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+
+  /*
+   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
+   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
+   * starting with 0s.
+   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
+   * side-effects).
+   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
+   */
+  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
+
+  /*
+   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
+      } /* else active slot is properly aligned */
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
+   */
+  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
+  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
+   */
+  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+
+  /*
+   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (((SlotStartAdd[SLOT_ACTIVE_1 + i] - FLASH_BASE) / FLASH_PAGE_SIZE) <= SFU_PROTECT_WRP_PAGE_END_1)
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
+   */
+  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
+        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief This function makes sure the current active firmware will not be considered as valid any more.
+  *        This function alters the FLASH content.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
+  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image metadata.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  * @note This function populates the FWIMG module variable: fw_image_header_validated
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
+{
+  /*
+   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
+   */
+  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
+  *       fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (SFU_ERROR == e_ret_status)
+  {
+    /* We do not memorize any specific error, the FSM state is already providing the info */
+    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
+  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
+}
+
+/**
+  * @brief Verifies if no malicious code in active slot.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
+{
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
+}
+
+/**
+  * @brief  Control firmware signature
+  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
+                    SE_TAG_LEN) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  else
+  {
+    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+    return SFU_SUCCESS;
+  }
+
+}
+
+/**
+  * @brief Launches the user application.
+  *        The caller must be prepared to never get the hand back after calling this function.
+  *        If a problem occurs, it must be memorized in the bootinfo area.
+  *        If the caller gets the hand back then this situation must be handled as a critical error.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met
+  *       (typically: no security check performed before launching the firmware).
+  * @note This function only handles the "system" aspects.
+  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
+  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
+  *       function (as this needs to be done just before jumping into the user application).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Verify if authentication/integrity/lock SE service performed */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
+
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+
+#if defined(SFU_MPU_PROTECT_ENABLE)
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+  e_ret_status = SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+  HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+  /* Avoid systick interruption during UserApp start-up
+     systick will be re-initialized by HAL_Init() during execution of main() from UserApp */
+  HAL_SuspendTick();
+
+  /* Initialize address of user application to jump into */
+  jump_address = *(__IO uint32_t *)((SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET + 4));
+  p_jump_to_function = (Function_Pointer) jump_address;
+
+  /* Initialize user application's Stack Pointer */
+  __set_MSP(*(__IO uint32_t *)(SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET));
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* JUMP into User App */
+    p_jump_to_function();
+  }
+
+  /* The point below should NOT be reached */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Get the version of the active FW
+  * @note It is up to the caller to make sure the active slot contains a valid active FW.
+  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
+  *       fails.
+  * @param  SlotNumber index of the slot in the list
+  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
+  */
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
+{
+  SE_FwRawHeaderTypeDef fw_image_header;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint16_t version = 0;
+
+  /* check the header of the active FW */
+  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* retrieve the version from the header without any further check */
+    version = fw_image_header.FwVersion;
+  }
+
+  return (version);
+}
+
+/**
+  * @brief Detect if a FW is present in a slot.
+  * @note  Detection done based on MAGIC header + FW signature. Header verification
+  *        not done at this stage for timing optimization.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
+  SE_FwRawHeaderTypeDef *p_header;
+
+  /* Read header */
+  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
+  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
+  {
+    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
+    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
+    {
+      /*
+       * Control if the first 32 bytes (could be more but time consuming ...) are significants
+       * At this location we should find the vector table.
+       * Objective is to detect if the FW image has been erased
+       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
+       */
+      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Validate the active FW image in active slot by installing the header
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
+{
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /* Header writing: encrypted part with signature */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
+                                    SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+  /* Header writing : Do not update image state part */
+
+  /* Header writing: previous FW image fingerprint */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
+                                                                    SE_FW_HEADER_FINGERPRINT_LEN),
+                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+
+  return e_ret_status;
+#else
+
+  /* Nothing to do header already written */
+  return SFU_SUCCESS;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Get firmware image ID from header.
+  * @param  pFwImageHeader pointer to a structure to handle the header info
+  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
+  */
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  uint32_t active_slot;
+
+  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_1;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_2;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_3;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
+  else
+  {
+    active_slot = SLOT_INACTIVE;
+  }
+
+  return active_slot;
+}
+
+/**
+  * @brief  Check candidate image version is allowed.
+  * @param  ActiveSlot Slot identification used in case of secure counters usage
+  * @param  CurrentVersion Version of currently installed image if any
+  * @param  CandidateVersion Version of candidate image
+  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  UNUSED(ActiveSlot);
+
+  /* If the header of the active firmware is not valid, the CurrentVersion is 0 */
+  if (CurrentVersion == 0U)
+  {
+    /*
+     * If the header of the active firmware is not valide (could comes from an attak atempt, we authorize only the
+     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
+     */
+    if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * It is not allowed to install a Firmware with a lower version than the active firmware.
+     * But we authorize the re-installation of the current firmware version.
+     * We also check that the candidate version is at least the min. allowed version for this device.
+     */
+    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  }
+
+  return e_ret_status;
+}
+
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief Verifies the validity of the metadata associated to a candidate image.
+  *        The anti-rollback check is performed.
+  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure):
+  *       SFU_IMG_CheckPendingInstallation should be called first.
+  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
+  *       @ref SFU_APP_VerifyFwHeader.
+  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint32_t active_slot;
+  uint16_t cur_ver;
+  uint16_t verif_ver;
+
+  /*
+   * - Candidate FW Header Authentication
+   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
+   *       As a consequence: fw_image_header_to_test is already populated
+   *
+   * - Check version is allowed
+   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+   */
+
+  /* Header analysis to find slot based on number with magic tag */
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /* Get the version of active_slot */
+  cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+
+  if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
+  {
+    /* The installation is forbidden */
+    /* Memorize this error as this will be handled as a critical failure */
+    SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+
+    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /* leave now to handle the critical failure in the appropriate FSM state */
+    e_ret_status = SFU_ERROR;
+  }
+  else
+  {
+    /* the anti-rollback check succeeds: the version is fine */
+    /* double check to avoid basic hardware attack attack */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    e_ret_status = SFU_IMG_CheckFwVersion(active_slot, verif_ver, fw_image_header_to_test.FwVersion);
+  }
+
+  /* Return the result */
+  return (e_ret_status);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_internal.h
new file mode 100644
index 00000000..469b89ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_internal.h
@@ -0,0 +1,136 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_internal.h
+  * @author  MCD Application Team
+  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
+  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
+  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
+  *          fw_image_header_to_test to install an KMS blob.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_INTERNAL_H
+#define SFU_FWIMG_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_fwimg_regions.h"
+#include "kms_blob_metadata.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Payload Buffer descriptor.
+  * This structure describes how a Firmware is split in Flash.
+  * In the nominal case a Firmware is stored in 1 contiguous area.
+  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
+  * decrypt operation).
+  */
+typedef struct
+{
+  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
+  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
+} SE_Ex_PayloadDescTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief SFU_IMG Flash Status Type Definition
+  * Status of a FLASH operation.
+  */
+typedef enum
+{
+  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
+  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
+  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
+  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
+} SFU_IMG_StatusTypeDef;
+
+/**
+  * @brief RAM chunk used for decryption / comparison / swap
+  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
+  * some function allocates 2 buffer of this size in stack.
+  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
+  */
+#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
+
+#define SFU_IMG_CHUNK_SIZE  (512UL)
+#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief  Status Macro
+  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
+  * activated) and the execution continues.
+  */
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                   while(1==1){;} \
+                                 } while(0==1){;}
+#else
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                 } while(0==1){;}
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
+extern uint32_t SFU_IMG_Line;
+
+extern SE_FwRawHeaderTypeDef fw_image_header_validated;
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/* Exported functions : helper ---------------------------------------------- */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
+SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
+                          uint8_t  *pPayload, uint32_t SE_FwType);
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType);
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_INTERNAL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_regions.h
new file mode 100644
index 00000000..e97bf326
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_regions.h
@@ -0,0 +1,103 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_regions.h
+  * @author  MCD Application Team
+  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_REGIONS_H
+#define SFU_FWIMG_REGIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "se_crypto_config.h"
+
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  *  Slot list : 2 slots per image configuration + swap
+  */
+#define NB_SLOTS      4U
+#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
+#define SLOT_ACTIVE_1 1U
+#define SLOT_DWL_1    2U
+#define SLOT_SWAP     3U
+
+/* Calculation of the size of a slot */
+#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
+
+/*
+ * Design constraint: the image slot size must be a multiple of the swap area size.
+ * And of course both image slots must have the same size.
+ */
+#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
+
+/*
+ * Checking that the slot sizes are consistent with the .icf file
+ * Sizes expressed in bytes (+1 because the end address belongs to the slot)
+ * The checks are executed at runtime in the SFU_Img_Init() function.
+ */
+#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
+
+/**
+  * Image starting offset to add to the  address of 1st block
+  */
+#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
+
+
+/* External variables --------------------------------------------------------*/
+extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
+extern const uint32_t  SlotStartAdd[NB_SLOTS];
+extern const uint32_t  SlotEndAdd[NB_SLOTS];
+
+#if  (defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C))
+
+const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
+                                            SLOT_ACTIVE_1_HEADER,
+                                            SLOT_BLOB_DWL_1_START,
+                                            0U,
+                                          };
+/* List of slot start address */
+const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
+                                            SLOT_ACTIVE_1_START,
+                                            SLOT_BLOB_DWL_1_START,
+                                            0U,
+                                          };
+/* List of slot end address */
+const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
+                                            SLOT_ACTIVE_1_END,
+                                            SLOT_BLOB_DWL_1_END,
+                                            0U,
+                                          };
+#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_REGIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_services.h
new file mode 100644
index 00000000..08724f4a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_fwimg_services.h
@@ -0,0 +1,97 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_services.h
+  * @author  MCD Application Team
+  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
+  *          API definitions.
+  *          These services can be called by the bootloader to deal with images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_SERVICES_H
+#define SFU_FWIMG_SERVICES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_IMG Initialization Status Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_IMG_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_IMG Image Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
+  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
+  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
+  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
+} SFU_IMG_ImgInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall);
+#else
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_SERVICES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c
new file mode 100644
index 00000000..9083965c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c
@@ -0,0 +1,747 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
+#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
+                               STM32 board specificities */
+#include "tkms.h"
+#include "sfu_interface_crypto_scheme.h"
+#include <string.h>
+#include "kms_platf_objects_interface.h"     /* To get keys handle definitions */
+
+/* Private defines -----------------------------------------------------------*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+#define GCM_TAGBITS_SIZE          128
+#define GCM_IVLEN_BITS            16
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+/* Private variables ---------------------------------------------------------*/
+CK_SESSION_HANDLE EncryptSession;
+CK_SESSION_HANDLE DecryptSession;
+CK_SESSION_HANDLE AuthenticateSession;
+CK_SESSION_HANDLE VerifySession;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static uint8_t *gcm_tag_header;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Get AES key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/**
+  * @brief  Get ECDSA key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
+
+
+/**
+  * @brief Secure Engine Decrypt Init function.
+  *        It is a wrapper of Decrypt_Init function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+  gcm_tag_header = pxSE_Metadata->FwTag;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_MECHANISM cktest_aes_cbc_mechanism =
+  {
+    CKM_AES_CBC,
+    iv_cbc,
+    SE_IV_LEN
+  };
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * In this crypto scheme the Firmware is not encrypted.
+   * The Decrypt operation is called anyhow before installing the firmware.
+   * Indeed, it allows moving the Firmware image blocks in FLASH.
+   * These moves are mandatory to create the appropriate mapping in FLASH
+   * allowing the swap procedure to run without using the swap area at each and every move.
+   *
+   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
+   */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the decryption session */
+  if (se_status == SE_SUCCESS)
+  {
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do as we won't decrypt anything */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Append function.
+  *        It is a wrapper of Decrypt_Append function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffe pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
+  if (0 == InputSize)
+  {
+    /* Nothing to do but we must return a success for the decrypt operation to continue */
+    return (SE_SUCCESS);
+  }
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  /* Buffer decryption */
+  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * The firmware is not encrypted.
+   * The only thing we need to do is to recopy the input buffer in the output buffer
+   */
+  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
+  *pOutputSize = InputSize;
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Finish function.
+  *        It is a wrapper of Decrypt_Finish function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  *peSE_Status = SE_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  memcpy(pOutputBuffer, gcm_tag_header, 16);
+
+  /* End-up decryption session */
+  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do */
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Close the session */
+  rv = C_CloseSession(DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Init function.
+  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  CK_MECHANISM cktest_sha_256_mechanism =
+  {
+    CKM_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize encryption session  */
+    rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest initialization */
+  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Append function.
+  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Buffer encryption */
+  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
+                       (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest calculation */
+  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Finish function.
+  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* End-up encryption session */
+  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* End-up Digest calculation */
+  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Close the session */
+  rv = C_CloseSession(AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Verify Raw Fw Header Tag.
+  *        It verifies the signature of a raw header file.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pFwRawHeader pointer to RawHeader Buffer.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  int32_t fw_raw_header_output_length = SE_TAG_LEN;
+  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
+  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    (CK_BYTE_PTR)gcm_header,
+    ((int32_t)SE_FW_AUTH_LEN),
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  const uint8_t *pPayload;                        /* Metadata payload */
+  int32_t payloadSize;                            /* Metadata length to be considered for hash */
+  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
+  CK_OBJECT_HANDLE hECDSAKey = 0UL;
+  CK_MECHANISM cktest_ecdsa_256_mechanism =
+  {
+    CKM_ECDSA_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointers allocation */
+  if (NULL == pxFwRawHeader)
+  {
+    *peSE_Status = SE_KO;
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  gcm_tag_header = pxFwRawHeader->HeaderSignature;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up decryption session  : control if the tag is correct */
+  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
+
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  pPayload = (const uint8_t *)pxFwRawHeader;
+  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up verification process : control if the signature is correct */
+  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Double Check to avoid basic fault injection */
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+
+    if (se_status == SE_SUCCESS)
+    {
+      /* End-up verification process : control if the signature is correct */
+      rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+      if (rv != CKR_OK)
+      {
+        se_status = SE_ERROR;
+        *peSE_Status = SE_KO;
+      }
+    }
+  }
+
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+  /* Close the session */
+  rv = C_CloseSession(VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_kms.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_kms.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_kms.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_kms.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_kms.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_kms.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_kms.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_kms.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_loader.c
new file mode 100644
index 00000000..fb5936c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_loader.c
@@ -0,0 +1,803 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update LOADER module.
+  *          This file provides set of firmware functions to manage SFU local
+  *          loader functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include <stdlib.h>
+#include "main.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h" /* for metadata authentication */
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_services.h"      /* for version checking & to check if a valid FW is installed (the local
+                                        bootloader is a kind of "application" running in SB_SFU) */
+#include "app_sfu.h"
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t
+fw_decrypted_chunk[SFU_COM_YMODEM_PACKET_1K_SIZE];/*!< Buffer used for decryption during reception process */
+static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
+static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
+static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
+static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
+static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
+static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
+static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
+static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_Init(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  */
+
+  /*
+   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
+   * when doing a length alignment before writing in FLASH.
+   */
+  if (0U != (uint32_t)(sizeof(fw_decrypted_chunk) % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The decrypt buffer must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Decrypt buffer size (%d) is not matching the FLASH constraints", sizeof(fw_decrypted_chunk));
+    return SFU_ERROR;
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  DeInitialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DeInit(void)
+{
+  /*
+   * ADD SRC CODE HERE
+   */
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Download a new User Fw.
+  *         Writes firmware received via Ymodem in FLASH.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  p_DwlSlot identification of the downloaded area
+  * @param  p_Size Size of the downloaded image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
+                                             uint32_t *pSize)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
+  SE_StatusTypeDef e_se_status;
+  int32_t fw_tag_len = 0;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  /* Check the pointers allocation */
+  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Refresh Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Transfer FW Image via YMODEM protocol */
+  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
+
+  /* Initialize global variables to be used during the YMODEM process */
+  m_uDwlAreaAddress = 0U;
+  m_uDwlAreaStart = 0U;
+  m_uDwlAreaSize = 0U;
+  m_uFileSizeYmodem = 0U;
+  m_uNbrBlocksYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uDwlSlot = SLOT_ACTIVE_1;
+  m_LoaderStatus = SFU_LOADER_ERR_COM;
+
+  /* Receive the FW in RAM and write it in the Flash*/
+  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
+  {
+    if (*pSize > 0U)
+    {
+      /* File download correct*/
+      m_LoaderStatus = SFU_LOADER_OK;
+    }
+  }
+  else
+  {
+    /* Nothing to do : m_LoaderStatus updated during during YModem process */
+  }
+
+  /* Provide slot information to the caller
+     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
+     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
+  *pDwlSlot = m_uDwlSlot;
+
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    /* End of decryption process */
+    fw_tag_len = sizeof(fw_tag_output);
+    if (SE_Decrypt_Finish(&e_se_status, fw_tag_output, &fw_tag_len) != SE_SUCCESS)
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+
+    }
+    else if (e_se_status != SE_OK)
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+    }
+    else
+    {
+      /* Nothing */
+    }
+  }
+
+  *peSFU_LOADER_Status = m_LoaderStatus;
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+  int32_t fw_decrypted_chunk_size;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet*/
+    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
+  if (m_uPacketsReceived == 1U)
+  {
+
+    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+    }
+
+    /* Clear Download application area (including TRAILERS area) */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+          SFU_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    /* Initialize decryption process */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if (e_se_status != SE_OK)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /* Store FW image header in Flash */
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, SE_FW_HEADER_TOT_LEN) ==
+            SFU_SUCCESS)
+        {
+          /* Shift the DWL area pointer */
+          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+          rx_size -= SE_FW_HEADER_TOT_LEN;
+          p_data += SE_FW_HEADER_TOT_LEN;
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
+      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+      {
+        m_uDwlAreaAddress += rx_size;
+        p_data += rx_size;
+        rx_size = 0U;
+      }
+      /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be deccrypted */
+      else
+      {
+        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+      }
+    }
+
+    /* remaining bytes to decrypt ? */
+    if (rx_size != 0U)
+    {
+      fw_decrypted_chunk_size = rx_size;
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
+              != SE_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /*Nothing */
+      }
+    }
+  }
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL image size */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Set dimension to the appropriate length for FLASH programming.
+     * Example: 64-bit length for L4.
+     */
+    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
+    {
+      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+      uOldSize = rx_size;
+      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+      while (uOldSize < rx_size)
+      {
+        fw_decrypted_chunk[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL area */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Write Data in Flash */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress += (rx_size);
+    }
+    else
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#else /* MINICOM_YMODEM */
+/* Minicom variant of the YMODEM protocol: uses 128B packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+  int32_t fw_decrypted_chunk_size;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
+    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_SIZE);
+    }
+  }
+
+
+  /*
+   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
+   */
+
+  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
+     not encrypted  */
+  if (1 == m_uPacketsReceived)
+  {
+    /* First packet: beginning of header */
+    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
+    {
+      /* Copy the beginning of the header */
+      memcpy(fw_header, p_data, rx_size);
+      rx_size = 0U; /* nothing more to do */
+    }
+    else
+    {
+      /* Unexpected case */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else if (2U == m_uPacketsReceived)
+  {
+    /* Second packet: end of header (64 bytes) */
+    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
+    rx_size -= 64U;
+    p_data += 64U;
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+
+      /* Clear Download application area (including TRAILERS area) */
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+              SFU_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* Initialize decryption process */
+        if ((e_ret_status == SFU_SUCCESS)
+            && (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS))
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+          e_ret_status = SFU_ERROR;
+        }
+        else if (e_se_status != SE_OK)
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+          e_ret_status = SFU_ERROR;
+        }
+        else
+        {
+          /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
+          if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
+              == SFU_SUCCESS)
+          {
+            /* Shift the DWL area pointer */
+            m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+          }
+          else
+          {
+            m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+      }
+      /* The remaining 64 bytes of data must be handled : standard processing */
+    }
+  }
+  /*
+   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
+   */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding
+     */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+      {
+        /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
+        m_uDwlAreaAddress += rx_size;
+        p_data += rx_size;
+        rx_size = 0U;
+      }
+      else
+      {
+        /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be decrypted */
+        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+      }
+    }
+
+    /* remaining bytes to decrypt ? */
+    if (rx_size != 0)
+    {
+      fw_decrypted_chunk_size = rx_size;
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
+              != SE_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /*Nothing */
+      }
+
+      /* Check size to avoid writing beyond DWL image size */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Set dimension to the appropriate length for FLASH programming.
+       * Example: 64-bit length for L4.
+       */
+      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+           sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+        uOldSize = rx_size;
+        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                             (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+        while (uOldSize < rx_size)
+        {
+          p_data[uOldSize] = 0xFF;
+          uOldSize++;
+        }
+      }
+
+      /* Check size to avoid writing beyond DWL area */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Write Data in Flash */
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
+        {
+          m_uDwlAreaAddress += (rx_size);
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+
+
+/**
+  * @brief  Verifies the Raw Fw Header received. It checks if the header is
+  *         authentic and if the fields are ok with the device (e.g. size and version).
+  * @note   Please note that when the new image is installed, this metadata is checked
+  *         by @ref SFU_IMG_CheckCandidateVersion.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  pBuffer: pointer to header Buffer.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef              e_se_status;
+  SE_FwRawHeaderTypeDef         *p_x_fw_raw_header;
+  SFU_FwImageFlashTypeDef       fw_image_flash_data;
+  uint16_t                      cur_ver;
+  uint16_t                      verif_ver;
+  uint32_t                      active_slot;
+
+  /*Parse the received buffer*/
+  p_x_fw_raw_header = (SE_FwRawHeaderTypeDef *)(uint32_t)pBuffer;
+  /*Check if the received header packet is authentic*/
+  if (SE_VerifyHeaderSignature(&e_se_status, p_x_fw_raw_header) != SE_ERROR)
+  {
+    active_slot = SFU_IMG_GetFwImageSlot(p_x_fw_raw_header);
+    /*
+     * 1 slot per image configuration. Identify the download area.
+     *   It will be based on SFU magic :
+     *   - dwl slot is the active_slot if configured.
+     *   - else : SLOT_ACTIVE_1
+     */
+    m_uDwlSlot = active_slot;
+    if (SLOT_SIZE(m_uDwlSlot) == 1U)
+    {
+      m_uDwlSlot = SLOT_ACTIVE_1;
+    }
+    SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
+
+    /* Assign the download flash address to be used during the YMODEM process */
+    m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
+    m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
+
+    /*
+     * Check if the version is allowed
+     * ==> SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+     */
+    cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, cur_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+
+
+    /*
+     * Control of version and length is done twice to avoid basic hardware attack
+     * This more important for the 1 image configuration as the installation is done during the download procedure
+     * For the 2 images configuration anti-rollback will be checked again during installation process
+     */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, verif_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, verif_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+  }
+  else
+  {
+    /* Header authentication failure */
+    m_LoaderStatus = SFU_LOADER_ERR_AUTH_FAILED;
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_loader.h
new file mode 100644
index 00000000..7467d978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_loader.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update local
+  *          loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOADER_H
+#define SFU_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Local loader status Type Definition
+  */
+typedef enum
+{
+  SFU_LOADER_OK                            = 0x00U,
+  SFU_LOADER_ERR_COM                       = 0x01U,
+  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
+  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
+  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
+  SFU_LOADER_ERR_FLASH                     = 0x05U,
+  SFU_LOADER_ERR_CRYPTO                    = 0x06U
+} SFU_LOADER_StatusTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LOADER_Init(void);
+SFU_ErrorStatus SFU_LOADER_DeInit(void);
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
+                                             uint32_t *p_Size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_new_image.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_new_image.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_new_image.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_new_image.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_new_image.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_new_image.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_new_image.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_new_image.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_test.c
new file mode 100644
index 00000000..213ef868
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_test.c
@@ -0,0 +1,328 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_test.h"
+#include "main.h"
+#include "sfu_trace.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "string.h" /* required for strncmp */
+
+#if defined(SFU_TEST_PROTECTION)
+
+extern RTC_HandleTypeDef RtcHandle;
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Automatic tests : list of tests (Address, Message, Operation */
+/* Flash programming by 64 bits */
+#define SHIFT_FLASH_WRITE (8U-1U)
+
+/* Private variables ---------------------------------------------------------*/
+static ProtectionTest_t aProtectTests[] =
+{
+#ifdef SFU_MPU_PROTECT_ENABLE
+  {SFU_RAM_BASE, "MPU SRAM1 start add", TEST_EXECUTE},
+  {SFU_RAM_END - 3U, "MPU SRAM1 end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
+  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
+  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
+  /* READ_FLASH is possible as we are privileged when there is no MPU isolation but WRITE_FLASH must fail */
+  {INTVECT_START, "Init. Vector", TEST_WRITE_FLASH},
+  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_WRP_PROTECT_ENABLE
+  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
+  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
+  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
+#endif /* SFU_WRP_PROTECT_ENABLE */
+#ifdef SFU_PCROP_PROTECT_ENABLE
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
+  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
+                                                                                         writing test */
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
+  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+#if defined(TEST_ISOLATION)
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
+  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
+                                                                         64bits writing test + WRP protection applies */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
+  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
+  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
+                                                                    that initializes all the variables in the binary. */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
+  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+#endif /* TEST_ISOLATION  */
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Testing the MPU protection of the OBs */
+  /*
+   * WL55JC
+   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
+   * 0x1FFF 7818 Reserved Write protection 1A
+   * 0x1FFF 7820 Reserved Write protection 1B
+   */
+  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFF7800", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFF7818", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFF7820", TEST_WRITE_FLASH},
+#endif /* SFU_MPU_PROTECT_ENABLE  */
+  {0xAAAAAAAA, "Execution successful", TEST_END},
+};
+
+
+/* Automatic test : list of operation */
+uint8_t aTestOperation[][20] =
+{
+  "write 8 bytes",
+  "read 1 byte",
+  "erase 512 bytes",
+  "write 4 bytes",
+  "read 1 byte",
+  "execute",
+  "end"
+};
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_TEST_Protection(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
+  * @param  None.
+  * @retval None.
+  */
+static void SFU_TEST_Protection(void)
+{
+  uint32_t test_idx;
+  uint32_t flashErrCode = 0;
+  uint64_t pattern = 0U;
+  uint32_t page_error = 0U;
+  FLASH_EraseInitTypeDef p_erase_init;
+  TestStatus status = TEST_IN_PROGRESS;
+  __IO uint8_t tmp;
+  void (*func)(void);
+
+  /*
+    * Now checking the security
+    * We will try to access protected @ and run protected code.
+    * Each time a a flash error will be raised or a reset will be generated by IP protection.
+    * At next boot we read the backup register to check the next @ until all addresses have been verified.
+    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
+    * FWALL/Code Isolation
+    */
+
+  do
+  {
+    /* slow down execution */
+    HAL_Delay(100);
+
+    /* Increment test number for next execution */
+    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
+    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
+           aProtectTests[test_idx].address);
+
+    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
+    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
+        && (aProtectTests[test_idx].address > 0x00000FFFU))
+    {
+      switch (aProtectTests[test_idx].type)
+      {
+        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_FLASH :
+          HAL_FLASH_Unlock();
+          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
+          HAL_FLASH_Lock();
+          flashErrCode = HAL_FLASH_GetError();
+          printf("\r\nflash error code: %x", flashErrCode);
+          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+
+          /*
+           * OBs protection test: MPU generates a MEMORY FAULT and a RESET
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("OBs @", (const char *)aProtectTests[test_idx].msg, 5))
+          {
+            status = TEST_ERROR;
+          }
+          /* else not an OB protection test so probably not an error */
+          break;
+
+        /* Trying to read in FLASH : RDP set in case of PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_READ_FLASH :
+          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
+          HAL_Delay(1);                                                 /* ensure Flag is set */
+          /*
+           * When Isolation activated : RESET should be generated
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
+          {
+            status = TEST_ERROR;
+          }
+
+          break;
+
+        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_ERASE_FLASH :
+          HAL_FLASH_Unlock();
+          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
+          p_erase_init.NbPages     = 1;
+          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
+          HAL_FLASH_Lock();
+          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+          break;
+
+        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_RAM :
+          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
+          status = TEST_ERROR;
+          break;
+
+        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_READ_RAM :
+          tmp = *(uint8_t *)aProtectTests[test_idx].address;
+          printf(" value : %d ", tmp);
+          status = TEST_ERROR;
+          break;
+
+          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
+        case TEST_EXECUTE :
+          func = (void(*)(void))(aProtectTests[test_idx].address);
+          func();
+          status = TEST_ERROR;
+          break;
+
+        /* End of execution */
+        case TEST_END :
+          status = TEST_COMPLETED;
+          break;
+
+        default :
+          break;
+      }
+    }
+  } while (status == TEST_IN_PROGRESS) ;
+
+  if (status == TEST_ERROR)
+  {
+    SFU_TEST_Error();
+  }
+  else if (status == TEST_COMPLETED)
+  {
+    /* reset for next run (need a RESET of the platform to restart a session) */
+    printf("\b\b\b\b\b\b\b\b");
+    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
+  }
+}
+
+/**
+  * @brief  Initialization of backup register and start test
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Init(void)
+{
+  /* Use register DR0 to know which if the test sequence is in progress or done */
+  /* Use register DR1 to know which test to run after a reset */
+
+  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
+  {
+    return;
+  }
+  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
+                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
+                                                                  reset test index (DR1) */
+  {
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+  }
+
+  /* Start test */
+  SFU_TEST_Protection();
+}
+
+/**
+  * @brief  Reset backup register to be able to execute a new test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Reset(void)
+{
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+}
+
+/**
+  * @brief  Error detected during test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Error(void)
+{
+  printf(" ===> KO!!!!!");
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
+}
+
+#endif /* SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_test.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_test.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/BFU/App/sfu_test.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_test.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_trace.h
new file mode 100644
index 00000000..cf6d3387
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/App/sfu_trace.h
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SFU_TRACE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TRACE_H
+#define SFU_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_com_trace.h"
+#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+/* External variables --------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid
+                                                                        faults. printf is not rieentrant */
+#define TRACE   (void) printf
+#else
+#define TRACE(...)
+#define TRACE_IRQ(pbuffer)
+#endif /* SFU_DEBUG_MODE */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level.c
new file mode 100644
index 00000000..e637a536
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level.c
@@ -0,0 +1,530 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.c
+  * @author  MCD Application Team
+  * @brief   SFU Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+extern RTC_HandleTypeDef RtcHandle;
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+/* Private variables ---------------------------------------------------------*/
+static UART_HandleTypeDef   UartHandle;
+static CRC_HandleTypeDef    CrcHandle;
+
+/* Private function prototypes -----------------------------------------------*/
+static void     SFU_LL_Error_Handler(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Initialize CRC */
+  e_ret_status = SFU_LL_CRC_Init();
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF CRC Init.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure the peripheral clock */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+
+  /* Configure CRC with default polynomial - standard configuration */
+  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU  IF CRC Configuration.
+  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
+  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Check the parameters */
+  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
+
+  /* Switch to the selected configuration */
+  CrcHandle.Instance = CRC;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  switch (eCRCConfg)
+  {
+    case SFU_CRC_CONFIG_DEFAULT:
+      /* The Default polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+      /* The default init value is used */
+      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+      /* The input data are 32-bit long words */
+      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    case SFU_CRC_CONFIG_16BIT:
+      /* The CRC-16-CCIT polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+      /* The zero init value is used */
+      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+      CrcHandle.Init.InitValue               = 0U;
+      /* The input data are 8-bit long */
+      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    default:
+      /* Invalid parameter */
+      e_ret_status = SFU_ERROR;
+      break;
+  }
+
+  /* Proceed to CRC Init (Correct Parameters) */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  SFU IF CRC Calculate.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  BufferLength: buffer length in bytes.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
+}
+
+/**
+  * @brief SFU UART Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = SFU_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+  if (HAL_UART_Init(&UartHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief SFU IF UART DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  SFU IF Write data (send).
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  DataLength: pointer to the 128bit data to write.
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  Timeout: Timeout duration.
+  * @retval status of the write operation
+  *         SFU_ERROR : if the write operation is not performed
+  *         SFU_SUCCESS : if the write operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF Read data (receive).
+  * @param  pData: pointer to the 128bit data where to store the received data.
+  * @param  DataLength: the length of the data to be read in bytes.
+  * @param Timeout: Timeout duration.
+  * @retval status of the read operation
+  *         SFU_ERROR : if the read operation is not performed
+  *         SFU_SUCCESS : if the read operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU HAL IF Flush.
+  * @param  None.
+  * @retval status of the operation.
+  */
+SFU_ErrorStatus SFU_LL_UART_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+
+  return SFU_SUCCESS;
+}
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief SFU IF RTC Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief SFU IF RTC DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+/**
+  * @brief SFU IF RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer.
+  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  *        the RTC clock source; in this case the Backup domain will be reset in
+  *        order to modify the RTC Clock source, as consequence RTC registers (including
+  *        the backup registers) and RCC_BDCR register are set to their reset values.
+  * @retval None
+  */
+void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  RCC_OscInitTypeDef        RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+  UNUSED(hrtc);
+  /*-1- Enables access to the backup domain */
+  /* To enable access on RTC registers */
+
+  HAL_PWR_EnableBkUpAccess();
+
+  /*-2- Configure LSE/LSI as RTC clock source */
+#ifdef RTC_CLOCK_SOURCE_LSE
+
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#elif defined (RTC_CLOCK_SOURCE_LSI)
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
+  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#else
+#error Please select the RTC Clock source inside the main.h file
+#endif /*RTC_CLOCK_SOURCE_LSE*/
+
+  /*-3- Enable RTC peripheral Clocks */
+  /* Enable RTC Clock */
+  __HAL_RCC_RTC_ENABLE();
+
+  /* Enable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_ENABLE();
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  /*-4- Configure the NVIC for RTC Tamper */
+  HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_SSRU_IRQn, 0x0FU, 0U);
+  HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+
+  __HAL_RCC_RTC_DISABLE();
+
+  /* Disable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_DISABLE();
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in SFU application.
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral Clock Enable */
+    SFU_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    SFU_UART_TX_GPIO_CLK_ENABLE();
+    SFU_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : SFU_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
+    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : SFU_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
+    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral clock disable */
+    SFU_UART_CLK_DISABLE();
+
+    /* GPIO DeInit*/
+    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
+    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
+
+  }
+
+
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @param  None
+  * @retval None
+  */
+static void SFU_LL_Error_Handler(void)
+{
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  while (1 == 1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level.h
new file mode 100644
index 00000000..3532844d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level.h
@@ -0,0 +1,130 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef  SFU_LOW_LEVEL_H
+#define  SFU_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU CRC Configuration definition
+  */
+typedef enum
+{
+  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
+  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
+  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
+} SFU_CRC_ConfigTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Uncomment to enable the adequate Clock Source */
+#define RTC_CLOCK_SOURCE_LSI
+/*#define RTC_CLOCK_SOURCE_LSE*/
+
+#ifdef RTC_CLOCK_SOURCE_LSI
+#define RTC_ASYNCH_PREDIV    0x1FU
+#define RTC_SYNCH_PREDIV     0x3FF
+#endif /* RTC_CLOCK_SOURCE_LSI */
+
+#ifdef RTC_CLOCK_SOURCE_LSE
+#define RTC_ASYNCH_PREDIV  0x7FU
+#define RTC_SYNCH_PREDIV   0x00FFU
+#endif /* RTC_CLOCK_SOURCE_LSE */
+
+/* External variables --------------------------------------------------------*/
+extern __IO uint32_t  DummyMemAccess;
+#if defined(SFU_LOW_LEVEL_C)
+#if defined(IT_MANAGEMENT)
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+__IO uint32_t DummyMemAccess;
+#endif /* defined(IT_MANAGEMENT) */
+#endif /* defined(SFU_LOW_LEVEL_C) */
+
+
+/* Exported macros -----------------------------------------------------------*/
+#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
+                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
+                               ((CONF) == SFU_CRC_CONFIG_16BIT))
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+#define SFU_LL_DummyAccess() \
+  do{ \
+  }while(0)
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus    SFU_LL_Init(void);
+SFU_ErrorStatus    SFU_LL_DeInit(void);
+
+SFU_ErrorStatus    SFU_LL_CRC_Init(void);
+SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
+uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
+
+SFU_ErrorStatus    SFU_LL_UART_Init(void);
+SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
+SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Flush(void);
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus SFU_LL_RTC_Init(void);
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
+void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  SFU_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash.c
new file mode 100644
index 00000000..4cea3348
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash.c
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_fwimg_regions.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  e_ret_status = SFU_LL_FLASH_INT_Init();
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                   const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pFlash < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+}
+
+/**
+  * @brief  This function configure the flash to be able to execute code
+  * @param  Addr: flash address
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
+{
+  /*
+   * Internal flash : nothing to do
+   * External flash : configure memory mapped mode
+   */
+
+  /* Check Flash address */
+  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
+  }
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
+{
+  /* Check Flash address */
+  if (Addr < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_GetPage(Addr);
+  }
+  else
+  {
+    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
+  }
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash.h
new file mode 100644
index 00000000..726365d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_H
+#define SFU_LOW_LEVEL_FLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
+  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
+  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
+  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
+  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
+  SFU_FLASH_SUCCESS           /*!< Flash Success */
+} SFU_FLASH_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define INVALID_SECTOR 0xFFFFFFFFU
+#define INVALID_PAGE   0xFFFFFFFFU
+#define INVALID_BANK   0xFFFFFFFFU
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                   const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
+
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c
new file mode 100644
index 00000000..7b10b14d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU external
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_low_level_security.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+/* No external flash available on this product
+   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
+       systematically during startup phase */
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pStart);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  UNUSED(pFlash);
+  UNUSED(Pattern1);
+  UNUSED(Pattern2);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
+{
+  UNUSED(SlotNumber);
+  return SFU_SUCCESS;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h
new file mode 100644
index 00000000..08566d80
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for external flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
+#define SFU_LOW_LEVEL_FLASH_EXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+#define EXTERNAL_FLASH_ADDRESS  0x90000000U
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c
new file mode 100644
index 00000000..1e8db303
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c
@@ -0,0 +1,474 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU internal
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "string.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+
+/* Private variables ---------------------------------------------------------*/
+static __IO uint32_t DoubleECC_Error_Counter = 0U;
+
+
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t first_page;
+  uint32_t nb_pages;
+  uint32_t chunk_nb_pages;
+  uint32_t length = Length;
+
+  /* Check the pointers allocation */
+  if (pFlashStatus == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  *pFlashStatus = SFU_FLASH_SUCCESS;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = SFU_LL_FLASH_INT_GetPage(start);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
+      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        p_erase_init.Page = first_page;
+        p_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_ERASE;
+        }
+        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
+      } while (nb_pages > 0U);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      if (HAL_FLASH_Lock() != HAL_OK)
+      {
+        e_ret_status = SFU_ERROR;
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+      }
+    }
+    else
+    {
+      *pFlashStatus = SFU_FLASH_ERR_HAL;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Check the pointers allocation */
+  if ((pFlashStatus == NULL) || (pSource == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     writing operation should be executed inside secure environment */
+  if ((inside_header == 1U) && (Length != 0U))
+  {
+    /* SE Access */
+    SE_StatusTypeDef se_status;
+    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
+    if (se_ret_status == SE_SUCCESS)
+    {
+      e_ret_status = SFU_SUCCESS;
+      *pFlashStatus = SFU_FLASH_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+      *pFlashStatus = SFU_FLASH_ERROR;
+    }
+  }
+  /* Writing operation executed by SBSFU */
+  else
+  {
+    *pFlashStatus = SFU_FLASH_ERROR;
+
+    /* Clear error flags raised during previous operation */
+    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Unlock the Flash to enable the flash control register access *************/
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+
+      }
+      else
+      {
+        /* DataLength must be a multiple of 64 bit */
+        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
+        {
+          *pFlashStatus = SFU_FLASH_ERROR;
+
+          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+          be done by word */
+          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
+              == HAL_OK)
+          {
+            /* Check the written value */
+            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
+            {
+              /* Flash content doesn't match SRAM content */
+              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
+              e_ret_status = SFU_ERROR;
+            }
+            else
+            {
+              /* Increment FLASH Destination address */
+              destination = destination + sizeof(SFU_LL_FLASH_write_t);
+              e_ret_status = SFU_SUCCESS;
+              *pFlashStatus = SFU_FLASH_SUCCESS;
+            }
+          }
+          else
+          {
+            /* Error occurred while writing data in Flash memory */
+            *pFlashStatus = SFU_FLASH_ERR_WRITING;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+        /* Lock the Flash to disable the flash control register access (recommended
+        to protect the FLASH memory against possible unwanted operation) */
+        if (HAL_FLASH_Lock() != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_HAL;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus se_ret_status;
+  SE_StatusTypeDef se_status;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     reading operation should be executed inside secure environment */
+  if (inside_header == 1U)
+  {
+    /* SE Access */
+    DoubleECC_Error_Counter = 0U;
+    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
+    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  /* Reading operation executed by SBSFU */
+  else
+  {
+    DoubleECC_Error_Counter = 0U;
+    /* Do not use memcpy from lib : ECC error should be checked at each loop */
+    for (i = 0; (i < Length) && (DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+    {
+      *pDestination = *pSource;
+    }
+    if (DoubleECC_Error_Counter == 0U)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  uint32_t flash = (uint32_t) pFlash;
+  uint32_t i;
+
+  /* Comparison executed by SBSFU ==> flash area could not be located inside secured environment */
+  for ( i = 0U; i < Length; i += 4U)
+  {
+    if ((*(uint32_t *)(flash + i) != Pattern1) &&  (*(uint32_t *)(flash + i) != Pattern2))
+    {
+      return SFU_ERROR;
+    }
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+
+
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retvat void
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    while (1 == 1)
+    {
+      SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_UNKNOWN);
+    }
+  }
+}
+
+
+/**
+  * @brief  HardFault Handler
+  * @param  None.
+  * @retval None.
+  */
+void HardFault_Handler(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h
new file mode 100644
index 00000000..5ef51fc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for internal flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_INT_H
+#define SFU_LOW_LEVEL_FLASH_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash Write Access Constraints (size and alignment)
+  *
+  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
+  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
+  *
+  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
+  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
+  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
+  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_FirmwareToResume).
+  */
+
+/* double-word is the default setting for most platforms */
+typedef uint64_t SFU_LL_FLASH_write_t;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Length of a MAGIC tag (32 bytes).
+  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
+  */
+#define MAGIC_LENGTH ((uint32_t)32U)
+
+/* External variables --------------------------------------------------------*/
+#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
+void NMI_Handler(void);
+void HardFault_Handler(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_security.c
new file mode 100644
index 00000000..de1341a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_security.c
@@ -0,0 +1,1104 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SFU Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "stm32wlxx_it.h"
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#if     !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_RDP_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_RDP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+#ifndef  SFU_TAMPER_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_TAMPER_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_IWDG_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+
+  {
+    {
+      MPU_REGION_NUMBER0, SFU_PROTECT_MPU_AREA_USER_START,     SFU_PROTECT_MPU_AREA_USER_SIZE,
+      SFU_PROTECT_MPU_AREA_USER_PERM,     SFU_PROTECT_MPU_AREA_USER_EXEC,     SFU_PROTECT_MPU_AREA_USER_SREG
+    },
+{
+  MPU_REGION_NUMBER1, SFU_PROTECT_MPU_AREA_SFUEN_START_0,  SFU_PROTECT_MPU_AREA_SFUEN_SIZE_0,
+  SFU_PROTECT_MPU_AREA_SFUEN_PERM,    SFU_PROTECT_MPU_AREA_SFUEN_EXEC,    SFU_PROTECT_MPU_AREA_SFUEN_SREG_0
+},
+#if  !defined(__GNUC__)
+{
+  MPU_REGION_NUMBER2, SFU_PROTECT_MPU_AREA_SFUEN_START_1,  SFU_PROTECT_MPU_AREA_SFUEN_SIZE_1,
+  SFU_PROTECT_MPU_AREA_SFUEN_PERM,    SFU_PROTECT_MPU_AREA_SFUEN_EXEC,    SFU_PROTECT_MPU_AREA_SFUEN_SREG_1
+},
+#endif /* !__GNUC__ */
+{
+  MPU_REGION_NUMBER3, SFU_PROTECT_MPU_AREA_VECT_START,     SFU_PROTECT_MPU_AREA_VECT_SIZE,
+  SFU_PROTECT_MPU_AREA_VECT_PERM,     SFU_PROTECT_MPU_AREA_VECT_EXEC,     SFU_PROTECT_MPU_AREA_VECT_SREG
+},
+{
+  MPU_REGION_NUMBER4, SFU_PROTECT_MPU_AREA_OB_BANK1_START, SFU_PROTECT_MPU_AREA_OB_BANK1_SIZE,
+  SFU_PROTECT_MPU_AREA_OB_BANK1_PERM, SFU_PROTECT_MPU_AREA_OB_BANK1_EXEC, SFU_PROTECT_MPU_AREA_OB_BANK1_SREG
+},
+{
+  MPU_REGION_NUMBER5, SFU_PROTECT_MPU_AREA_PERIPH_START,   SFU_PROTECT_MPU_AREA_PERIPH_SIZE,
+  SFU_PROTECT_MPU_AREA_PERIPH_PERM,   SFU_PROTECT_MPU_AREA_PERIPH_EXEC,   SFU_PROTECT_MPU_AREA_PERIPH_SREG
+},
+  };
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+
+
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void) HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  (void) HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA_A  **********/
+  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
+  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set Flash configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply PCRoP ******************************************************/
+
+
+    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
+#ifdef SFU_RDP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_RDP_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        (void) HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Lock the Options Bytes ***************************************************/
+  (void) HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void) HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#else
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  /* Check/Apply  ANTI_TAMPER *************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#else
+#ifdef SFU_TEST_PROTECTION
+  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_TEST_PROTECTION */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+  /* Check/Apply  CLOCK_MONITOR **********************************************/
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
+
+  /* Check/Apply  TEMP_MONITOR **********************************************/
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Return the reset source  detected after a reboot. The related flag is reset
+  *         at the end of this function.
+  * @param  peResetpSourceId: to be filled with the detected source of reset
+  * @note   In case of multiple reset sources this function return only one of them.
+  *         It can be improved returning and managing a combination of them.
+  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
+{
+  /* Check if the last reset has been generated from a Watchdog exception */
+  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
+      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
+  {
+    *peResetpSourceId = SFU_RESET_WDG_RESET;
+
+  }
+
+
+  /* Check if the last reset has been generated from a Low Power reset */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_LOW_POWER;
+
+  }
+
+  /* Check if the last reset has been generated from a Software reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_SW_RESET;
+
+  }
+  /* Check if the last reset has been generated from an Option Byte Loader reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_OB_LOADER;
+  }
+  /* Check if the last reset has been generated from a Hw pin reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_HW_RESET;
+
+  }
+  /* Unknown */
+  else
+  {
+    *peResetpSourceId = SFU_RESET_UNKNOWN;
+  }
+}
+
+/**
+  * @brief  Clear the reset sources. This function should be called after the actions
+  *         on the reset sources has been already taken.
+  * @param  none
+  * @note   none
+  * @retval none
+  */
+void SFU_LL_SECU_ClearResetSources()
+{
+  /* Clear reset flags  */
+  __HAL_RCC_CLEAR_RESET_FLAGS();
+}
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply BOOT_LOCK ****************************************************/
+  if ((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Flash configuration */
+  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+/**
+  * @brief  Apply the RDP protection
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply RDP **********************************************************/
+  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
+  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
+#else
+    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
+    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+  return e_ret_status;
+}
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  if ((psFlashOptionBytes->WRPStartOffset == SFU_PROTECT_WRP_PAGE_START_1) &&
+      (psFlashOptionBytes->WRPEndOffset   == SFU_PROTECT_WRP_PAGE_END_1))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
+    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
+    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER6;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER7;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  return SFU_SUCCESS;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Apply MPU protection before executing Standalone loader
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_StandaloneLoader(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER6;
+  MPU_InitStruct.BaseAddress          = LOADER_PROTECT_MPU_AREA_START;
+  MPU_InitStruct.Size                 = LOADER_PROTECT_MPU_AREA_SIZE;
+  MPU_InitStruct.SubRegionDisable     = LOADER_PROTECT_MPU_AREA_SREG;
+  MPU_InitStruct.AccessPermission     = LOADER_PROTECT_MPU_AREA_PERM;
+  MPU_InitStruct.DisableExec          = LOADER_PROTECT_MPU_AREA_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  return SFU_SUCCESS;
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t mpu_region_num; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+    MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+    MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
+          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
+          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    /* Enables the MPU */
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    /* Enables memory fault exception */
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    if ((SCB->SHCSR & SCB_SHCSR_MEMFAULTENA_Msk) != SCB_SHCSR_MEMFAULTENA_Msk)
+    {
+      return SFU_ERROR;
+    }
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+
+  e_ret_status = SFU_SUCCESS;
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return SFU_SUCCESS;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#else
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  Apply ANTI TAMPER protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  RTC_TamperTypeDef  stamperstructure;
+
+  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
+  TAMPER_GPIO_CLK_ENABLE();
+
+  /* Configure Tamper Pin */
+  /* tamper is an additional function */
+  /* not an alternate Function : config not needed */
+  /* Configure the RTC peripheral */
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    /* Configure RTC Tamper */
+    stamperstructure.Tamper                       = RTC_TAMPER_ID;
+    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
+    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
+    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
+    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
+    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
+    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
+    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
+    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
+
+    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
+    {
+
+      /* Clear the Tamper interrupt pending bit */
+      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
+    }
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply CLOCK MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a clock monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Clock Monitoring */
+  /* Add your code here for customization
+     e.g. if HSE or LSE is used enable the CSS!
+   ...
+   ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply TEMP MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a temperature monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Temperature Monitoring */
+  /* Add your code here for customization
+     ...
+     ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_security.h
new file mode 100644
index 00000000..91ab2aa8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/BFU/Target/sfu_low_level_security.h
@@ -0,0 +1,288 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  */
+
+#define SFU_PROTECT_MPU_AREA_USER_START         ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE          MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_PERM          MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXEC          MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_SREG          0x00U      /*!< All subregions activated */
+
+/**
+  * @brief Region 1 and Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys). Inner region inside
+  *                                the Region 0
+  */
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)       /*!< 8 sub-regions is the maximum */
+#define SFU_PROTECT_MPU_AREA_SFUEN_START_0      FLASH_BASE
+#define SFU_PROTECT_MPU_AREA_SFUEN_START_1      0x0800C000
+#define SFU_PROTECT_MPU_AREA_SFUEN_SIZE_0       MPU_REGION_SIZE_64KB
+#define SFU_PROTECT_MPU_AREA_SFUEN_SIZE_1       MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_AREA_SFUEN_PERM         MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_SFUEN_EXEC         MPU_INSTRUCTION_ACCESS_ENABLE
+#if defined(__GNUC__)
+#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_0       0x80U      /*!< 64 bytes / 8 * 7 ==> 56 bytes */
+#else /* __GNUC__ */
+#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_0       0xC0U      /*!< 64 bytes / 8 * 6 ==> 48 bytes */
+#endif /* __GNUC__ */
+#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_1       0x00U      /*!< All subregions activated */
+
+/**
+  * @brief Region 3 - Vector Table: Vector Table must be Read-Only under privileged access. Inner region inside the
+  *                   Region 1
+  */
+#define SFU_PROTECT_MPU_AREA_VECT_START         ((uint32_t) INTVECT_START) /*!< Vector table memory area */
+#define SFU_PROTECT_MPU_AREA_VECT_SIZE          MPU_REGION_SIZE_512B
+#define SFU_PROTECT_MPU_AREA_VECT_PERM          MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_AREA_VECT_EXEC          MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_AREA_VECT_SREG          0x00U                   /*!< All subregions activated */
+
+/**
+  * @brief Region 4 - Inner region inside the Region 0 . The Option Bytes. Once the Option Bytes have been set,
+  *                   only reading will be possible
+  */
+
+/*
+ * WLxx
+ * Single Bank
+ * [ 1FFF7800 1FFF7808 1FFF7810 1FFF7818 1FFF7820]: 40 bytes to be protected
+ * The MPU can be used to protect up to eight memory regions.
+ * These, in turn can have eight subregions, if the region is at least 256 bytes.
+ * Here, we define a 64B region so subregions cannot be used.
+ */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_START     ((uint32_t)0x1FFF7800U) /*!< Option Bytes in bank 1        */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_SIZE      MPU_REGION_SIZE_64B     /*!< Protecting more than required */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_PERM      MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_EXEC      MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_SREG      0x00U                   /*!< Subregion mask to deactivate unexpected
+                                                                             MPU subregions: 0x1F should be set but it
+                                                                             would have no effect as we have a 64B
+                                                                             region */
+
+/**
+  * @brief  Region 5 - Peripherals Area
+  */
+#define SFU_PROTECT_MPU_AREA_PERIPH_START       PERIPH_BASE                  /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_AREA_PERIPH_SIZE        MPU_REGION_SIZE_512MB        /*!< To be coherent with the peripherals
+                                                                                  memory area */
+#define SFU_PROTECT_MPU_AREA_PERIPH_PERM        MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_PERIPH_EXEC        MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_PERIPH_SREG        0x00U                        /*!< All subregions activated */
+
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * @brief Region 6 & 7 - Enable the execution of the active slots
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+/**
+  * Region definition : from 0x0801 0000 ==> 0x0801 07FF (remove 2 kbytes)
+  */
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START  SLOT_BLOB_DWL_1_START
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_2KB
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG   0x00U                       /*!< All subregions activated */
+#else /* __GNUC__ && !__ARMCC_VERSION */
+/**
+  * Region definition : from 0x0800 F800 ==> 0x0800 FFFF (2 kbytes)
+  */
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START  SLOT_ACTIVE_1_START
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_2KB
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG   0x00U                       /*!< All subregions activated */
+#endif /* __GNUC__ && !__ARMCC_VERSION */
+/**
+  * Additional Region definition : from 0x0801 0000 ==> 0x0803 FFFF (192 kbytes)
+  */
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_START  FLASH_BASE
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_256KB
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SREG   0x03U                    /*!< 256 Kbytes / 8 * 6 ==> 192 Kbytes */
+
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
+  * @{
+  */
+#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define RTC_TAMPER_ID                      RTC_TAMPER_1
+#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
+  * @{
+  */
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
+  * @{
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
+  * @{
+  */
+typedef enum
+{
+  SFU_RESET_UNKNOWN = 0x00U,
+  SFU_RESET_WDG_RESET,
+  SFU_RESET_LOW_POWER,
+  SFU_RESET_HW_RESET,
+  SFU_RESET_BOR_RESET,
+  SFU_RESET_SW_RESET,
+  SFU_RESET_OB_LOADER,
+} SFU_RESET_IdTypeDef;
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
+  * @{
+  */
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
+                                                                            separate section to support PCRoP */
+#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
+#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
+                                                                            Std Protections cannot be
+                                                                            added/removed/modified */
+#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
+                                                                            boot in bank1! */
+
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
+#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
+#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
+                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
+                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
+                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | SFU_RUNTIME_PROTECTION_TEMP_MONITOR)
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
+
+/* Exported functions ------------------------------------------------------- */
+#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
+/*!<SFU Redirect of RTC Tamper Event Callback*/
+#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
+
+SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
+void               SFU_LL_SECU_ClearResetSources(void);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+#ifdef SFU_DMA_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+#ifdef SFU_DAP_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#if defined(SFU_MPU_PROTECT_ENABLE)
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_StandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/app_hw.h
new file mode 100644
index 00000000..696d8368
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/app_hw.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    app_hw.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update hardware
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_HW_H
+#define APP_HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported macros -----------------------------------------------------------*/
+/* At power-on, the capacitor related to SW1 button needs to charge.
+ * The charging time must be waited to be sure that a low level is a real one. */
+#define BUTTON_INIT() \
+  BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);                               \
+  if ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET) \
+  {                                                                       \
+     HAL_Delay(6U);                                                       \
+  }
+
+#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_HW_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/main.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/main.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/main.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Src/main.c
new file mode 100644
index 00000000..8891771b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Src/main.c
@@ -0,0 +1,157 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Secure Boot and Secure Firmware Update.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_boot.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  main function
+  * @param  None
+  * @retval int
+  */
+int main(void)
+{
+
+  /* MCU Configuration--------------------------------------------------------*/
+  /* Configure the system clock using LL functions */
+  SystemClock_Config();
+
+  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
+  (void) HAL_Init();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+  /*
+   * As the secure mode has not been entered yet, we do not configure BSP right now .
+   * The BSP will be configured by the bootloader.
+   */
+
+
+  /* Launch the Bootloader----------------------------------------------------*/
+  /*
+   * This is the beginning of the secure part:
+   * security mechanisms will be enabled.
+   * The function below should not return (unless a critical failure is encountered).
+   */
+  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
+
+  /* Security or SecureBoot initialization failure. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follows :
+  *            System Clock source            = PLL (MSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            AHB1 Prescaler                 = 1
+  *            AHB3 Prescaler                 = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            MSI Frequency(Hz)              = 4000000
+  *            PLL_M                          = 1
+  *            PLL_N                          = 24
+  *            PLL_R                          = 2
+  *            Flash Latency(WS)              = 2
+  *            Voltage range                  = 1
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  LL_FLASH_SetLatency(LL_FLASH_LATENCY_2);
+
+  while(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_2)
+  {
+  };
+
+  LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
+  LL_RCC_MSI_Enable();
+
+   /* Wait till MSI is ready */
+  while(LL_RCC_MSI_IsReady() != 1)
+  {
+  };
+
+  LL_RCC_MSI_EnableRangeSelection();
+  LL_RCC_MSI_SetRange(LL_RCC_MSIRANGE_6);
+  LL_RCC_MSI_SetCalibTrimming(0);
+  LL_RCC_PLL_ConfigDomain_SYS(LL_RCC_PLLSOURCE_MSI, LL_RCC_PLLM_DIV_1, 24, LL_RCC_PLLR_DIV_2);
+  LL_RCC_PLL_EnableDomain_SYS();
+  LL_RCC_PLL_Enable();
+
+   /* Wait till PLL is ready */
+  while(LL_RCC_PLL_IsReady() != 1)
+  {
+  };
+
+  LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL);
+
+   /* Wait till System clock is ready */
+  while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL)
+  {
+  };
+
+  LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
+  LL_RCC_SetAHB3Prescaler(LL_RCC_SYSCLK_DIV_1);
+  LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
+  LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1);
+
+  LL_Init1msTick(48000000);
+
+  /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */
+  LL_SetSystemCoreClock(48000000);
+}
+
+
+
+
+
+#ifdef USE_FULL_ASSERT
+
+/**
+  * @brief Reports the name of the source file and the source line number
+  * where the assert_param error has occurred.
+  * @param file: pointer to the source file name
+  * @param line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+
+}
+
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..b68f7c5a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,123 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/* Global variables ----------------------------------------------------------*/
+/* RTC handler declaration */
+RTC_HandleTypeDef RtcHandle;
+
+/* Functions Definition ------------------------------------------------------*/
+/******************************************************************************/
+/*            Cortex-M4 Processor Interruption and Exception Handlers         */
+/******************************************************************************/
+
+/* Exception handlers are implemented in the various source files of sbsfu application */
+
+/* NMI exception handler is implemented in sfu_low_level_flash_int.c file */
+/* Hard Fault exception handler is implemented in sfu_boot.c file */
+/* Memory Manage exception handler is implemented in sfu_boot.c file */
+/**
+  * @brief  This function handles Bus Fault exception.
+  * @param  None
+  * @retval None
+  */
+void BusFault_Handler(void)
+{
+  /* Go to infinite loop when Bus Fault exception occurs */
+  while (1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Usage Fault exception.
+  * @param  None
+  * @retval None
+  */
+void UsageFault_Handler(void)
+{
+  /* Go to infinite loop when Usage Fault exception occurs */
+  while (1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles SVCall exception.
+  * @param  None
+  * @retval None
+  */
+void SVC_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles Debug Monitor exception.
+  * @param  None
+  * @retval None
+  */
+void DebugMon_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers                  */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                               */
+/******************************************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler()
+{
+  HAL_RTCEx_TamperIRQHandler(&RtcHandle);
+}
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/Project.ewp
new file mode 100644
index 00000000..fc340dac
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/Project.ewp
@@ -0,0 +1,1229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_BFU</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>KMS_ENABLED</state>
+          <state>DISABLE_IMAGE_STATE_HANDLING</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\Core\Inc</state>
+          <state>$PROJ_DIR$\..\BFU\App</state>
+          <state>$PROJ_DIR$\..\BFU\Target</state>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>Project.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$\se_interface_appli.o"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state>$PROJ_DIR$.\..\..\1_Image_SECoreBin\EWARM\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>Core</name>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+      </file>
+    </group>
+    <group>
+      <name>BFU</name>
+      <group>
+        <name>App</name>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_loader.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_boot.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_com_loader.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_com_trace.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_error.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_test.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_fwimg_common.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_new_image.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_kms.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_interface_crypto_scheme.c</name>
+        </file>
+      </group>
+      <group>
+        <name>Target</name>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash_int.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash_ext.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_security.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32WLxx_LL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/steering_file.txt
new file mode 100644
index 00000000..8349caff
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/steering_file.txt
@@ -0,0 +1,37 @@
+show SE_APP_GetActiveFwInfo
+show SE_KMS_Initialize
+show SE_KMS_Finalize
+show SE_KMS_GetInfo
+show SE_KMS_GetFunctionList
+show SE_KMS_GetSlotList
+show SE_KMS_GetSlotInfo
+show SE_KMS_GetTokenInfo
+show SE_KMS_GetMechanismInfo
+show SE_KMS_OpenSession
+show SE_KMS_CloseSession
+show SE_KMS_CreateObject
+show SE_KMS_DestroyObject
+show SE_KMS_GetAttributeValue
+show SE_KMS_SetAttributeValue
+show SE_KMS_FindObjectsInit
+show SE_KMS_FindObjects
+show SE_KMS_FindObjectsFinal
+show SE_KMS_EncryptInit
+show SE_KMS_Encrypt
+show SE_KMS_EncryptUpdate
+show SE_KMS_EncryptFinal
+show SE_KMS_DecryptInit
+show SE_KMS_Decrypt
+show SE_KMS_DecryptUpdate
+show SE_KMS_DecryptFinal
+show SE_KMS_DigestInit
+show SE_KMS_Digest
+show SE_KMS_DigestUpdate
+show SE_KMS_DigestFinal
+show SE_KMS_SignInit
+show SE_KMS_Sign
+show SE_KMS_VerifyInit
+show SE_KMS_Verify
+show SE_KMS_DeriveKey
+show SE_KMS_GenerateKeyPair
+show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/BFU.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/BFU.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/BFU.sct
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/BFU.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/Project.uvoptx
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/Project.uvoptx
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/Project.uvoptx
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..3888d591
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/Project.uvprojx
@@ -0,0 +1,698 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_BFU</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>BFU</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-Wno-format</MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../Core/Inc;../BFU/App;../BFU/Target;../../1_Image_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>BFU.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--symdefs=se_interface_appli.txt
+--keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>se_core_bin.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>se_core_bin.s</FilePath>
+            </File>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/BFU/App</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_boot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_boot.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_com_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_error.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_error.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_fwimg_common.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_interface_crypto_scheme.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_interface_crypto_scheme.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_kms.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_new_image.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_test.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/BFU/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash_ext.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash_int.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/Target/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_bootloader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_ll_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components/>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/se_core_bin.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/se_core_bin.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/se_core_bin.s
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/se_core_bin.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..635041a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/.cproject
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="BFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../BFU/App | ../../../BFU/Target | ../../../../1_Image_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/BFU.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_BFU}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../BFU/App"/>
+									<listOptionValue builtIn="false" value="../../BFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/BFU.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/BFU.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+					<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.298519129" name="se_interface_application.c" rcbsApplicability="disable" resourcePath="Middlewares/STM32_Secure_Engine/se_interface_application.c" toolsToInvoke="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898.810348834">
+						<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898.810348834" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898">
+							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.310263369" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<listOptionValue builtIn="false" value="../../Core/Inc"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+								<listOptionValue builtIn="false" value="../../BFU/App"/>
+								<listOptionValue builtIn="false" value="../../BFU/Target"/>
+								<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+								<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+							</option>
+							<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1223368002" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+						</tool>
+					</fileInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_BFU.null.839446873" name="1_Image_BFU"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1415671833;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1687290193">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/.project
new file mode 100644
index 00000000..c2f439f1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/.project
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_BFU</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_LL_Driver/stm32wlxx_ll_utils.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/se_interface_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_application.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_bootloader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_boot.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_boot.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_com_loader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_com_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_error.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_error.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_fwimg_common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_fwimg_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_interface_crypto_scheme.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_interface_crypto_scheme.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_loader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_new_image.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_test.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_test.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash_ext.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash_ext.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash_int.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash_int.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/Application/Core/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/Application/Core/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/Application/Core/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/BFU.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/BFU.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/BFU.ld
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/BFU.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/se_interface.txt
new file mode 100644
index 00000000..05aa5e0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/STM32CubeIDE/se_interface.txt
@@ -0,0 +1,40 @@
+SE_APP_GetActiveFwInfo
+SE_APP_SVC_Handler
+SE_SYS_SaveDisableIrq
+SE_SYS_RestoreEnableIrq
+SE_KMS_Initialize
+SE_KMS_Finalize
+SE_KMS_GetInfo
+SE_KMS_GetFunctionList
+SE_KMS_GetSlotList
+SE_KMS_GetSlotInfo
+SE_KMS_GetTokenInfo
+SE_KMS_GetMechanismInfo
+SE_KMS_OpenSession
+SE_KMS_CloseSession
+SE_KMS_CreateObject
+SE_KMS_DestroyObject
+SE_KMS_GetAttributeValue
+SE_KMS_SetAttributeValue
+SE_KMS_FindObjectsInit
+SE_KMS_FindObjects
+SE_KMS_FindObjectsFinal
+SE_KMS_EncryptInit
+SE_KMS_Encrypt
+SE_KMS_EncryptUpdate
+SE_KMS_EncryptFinal
+SE_KMS_DecryptInit
+SE_KMS_Decrypt
+SE_KMS_DecryptUpdate
+SE_KMS_DecryptFinal
+SE_KMS_DigestInit
+SE_KMS_Digest
+SE_KMS_DigestUpdate
+SE_KMS_DigestFinal
+SE_KMS_SignInit
+SE_KMS_Sign
+SE_KMS_VerifyInit
+SE_KMS_Verify
+SE_KMS_DeriveKey
+SE_KMS_GenerateKeyPair
+SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/readme.txt
new file mode 100644
index 00000000..9961bd10
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_BFU/readme.txt
@@ -0,0 +1,174 @@
+/**
+  @page 1_Image_BFU / Boot and Firmware Update Demo Application
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows Boot and Firmware Update example.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+The Boot (B) and Firmware Update (FU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates.
+In addition, Secure Boot (Root of Trust services) checks and activates the STM32 security mechanisms (if any), and checks the
+authenticity and integrity of user application code before every execution to ensure that invalid or malicious code
+cannot be run. The Firmware Update application receives the encrypted firmware image, decrypts it, then checks
+the authenticity and integrity of the code before installing it.
+
+The key management services provide cryptographic services to the user application through the pkcs11 APIs
+(KEY ID based APIs). User application keys are stored and can be updated in a secure way (authenticity check, data decryption and
+data integrity check).
+This example handles 1 firmware image with 1 single slot in FLASH allowing to maximize the user application size.
+As a consequence, some features are not available:
+   - download a new firmware image from the application
+   - resume firmware update procedure in case of power off during installation
+
+To be easily tailorable to 128 Kbytes footprint, SFU_DEBUG_MODE compilation switch is disabled.
+As a consequence there is no print on terminal during BFU execution.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from the
+STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, SBSFU, MPU
+
+@par Directory contents
+
+   - 1_Image_BFU/Core/Src/main.c                           Main application file
+   - 1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c              HAL MSP module
+   - 1_Image_BFU/Core/Src/stm32wlxx_it.c                   STM32 interrupt handlers
+   - 1_Image_BFU/Core/Inc/app_hw.h                         Hardware definitions for application
+   - 1_Image_BFU/Core/Inc/main.h                           Header file for main.c
+   - 1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h             HAL configuration file
+   - 1_Image_BFU/Core/Inc/stm32wlxx_it.h                   Header file for stm32wlxx_it.c
+   - 1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h          BSP configuration file
+   - 1_Image_BFU/BFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
+   - 1_Image_BFU/BFU/App/sfu_com_loader.c                BFU communication module: local loader part
+   - 1_Image_BFU/BFU/App/sfu_com_trace.c                 BFU communication module: trace part
+   - 1_Image_BFU/BFU/App/sfu_error.c                     BFU errors management
+   - 1_Image_BFU/BFU/App/sfu_fwimg_common.c              BFU image handling: common functionalities/services
+   - 1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
+   - 1_Image_BFU/BFU/App/sfu_kms.c                       Key management service blob importation handling
+   - 1_Image_BFU/BFU/App/sfu_loader.c                    BFU Local Loader
+   - 1_Image_BFU/BFU/App/sfu_new_image.c                 BFU image handling: manage the new firmware image storage and installation
+   - 1_Image_BFU/BFU/App/sfu_test.c                      BFU security protection automatic test
+   - 1_Image_BFU/BFU/App/app_sfu.h                       Software configuration of BFU application
+   - 1_Image_BFU/BFU/App/sfu_boot.h                      Header file for sfu_boot.c
+   - 1_Image_BFU/BFU/App/sfu_com_loader.h                Header file for sfu_com_loader.c
+   - 1_Image_BFU/BFU/App/sfu_com_trace.h                 Header file for sfu_com_trace.c
+   - 1_Image_BFU/BFU/App/sfu_def.h                       General definition for BFU application
+   - 1_Image_BFU/BFU/App/sfu_error.h                     Header file for sfu_error.c file
+   - 1_Image_BFU/BFU/App/sfu_fsm_states.h                BFU FSM states definitions
+   - 1_Image_BFU/BFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling (sfu_fwimg_core.c and sfu_fwimg_services.c)
+   - 1_Image_BFU/BFU/App/sfu_fwimg_regions.h             FLASH regions definitions for image handling
+   - 1_Image_BFU/BFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
+   - 1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
+   - 1_Image_BFU/BFU/App/sfu_kms.h                       Header file for sfu_kms.c
+   - 1_Image_BFU/BFU/App/sfu_loader.h                    Header file for sfu_loader.c
+   - 1_Image_BFU/BFU/App/sfu_new_image.h                 Header file for sfu_new_image.c
+   - 1_Image_BFU/BFU/App/sfu_test.h                      Header file for sfu_test.c
+   - 1_Image_BFU/BFU/App/sfu_trace.h                     Header file for sfu_trace.c
+   - 1_Image_BFU/BFU/Target/sfu_low_level.c              BFU general low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash.c        BFU flash low level interface (wrapper)
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c    BFU internal flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c    BFU external flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_security.c     BFU security low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level.h              Header file for general low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash.h        Header file for flash low level interface (wrapper)
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h    Header file for internal flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h    Header file for external flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_security.h     Header file for security low level interface
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices.
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
+   - This example needs a terminal emulator.
+   - By default, SBSFU is configured in development mode. To switch in production mode, refer to AN5056 "Integration
+     guide - software expansion for STM32Cube" available from the STMicroelectronics microcontroller website
+     www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files.
+     As a workaround, it is advised to use the subst.exe command from within a command prompt to set up a local drive
+     out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par How to use it ?
+
+Several steps to run BFU application :
+
+1. Compile projects in the following order. This is mandatory as each project requests some objects generated by the
+   compilation of the previous one:
+   - 1_Image_SECoreBin (see also SECoreBin/readme.txt)
+   - 1_Image_BFU
+   - 1_Image_UserApp (see also UserApp/readme.txt)
+
+2. Before loading BFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that the
+   following are valid for the device:
+   - RDP Level 0
+   - Write Protection disabled on all FLASH pages
+   - Chip has been erased
+
+3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator that can be downloaded
+   from https://osdn.net/projects/ttssh2/) for UART connection with the board.
+   Support of YMODEM protocol is required. Serial port configuration should be :
+   - Baud rate = 115200
+   - Data = 8 bits
+   - Parity = none
+   - Stop = 1 bit
+   - Flow control = none
+
+4. Load BFU image into target memory with your preferred toolchain or STM32CubeProgammer.
+
+5. Once the BFU software is downloaded, power cycle the board (unplug/plug USB cable) : the BFU
+   application starts and configures the security mechanisms if some of them are enabled.
+
+6. [If RDP is enabled] Power cycle the board a second time (unplug/plug the USB cable): the BFU application starts with
+   the configured securities turned on and the Tera Term connection is possible.
+   Caution: Make sure to use an up-to-date version of ST-LINK firmware else BFU may not start.
+
+7. At startup (Power On or Reset button pushed) :
+   - Green LED blinks every 3 seconds when a local download is waited.
+   - Green LED blinks every 250 ms in case of error in option bytes configuration.
+   - 'C' is displayed when BFU is ready for a firmware image download. To be easily tailorable to 128 Kbytes footprint,
+     SFU_DEBUG_MODE compilation switch is disabled. As a consequence there is no print on terminal during BFU
+     execution.
+
+8. Send the user encrypted firmware file (\1_Image\1_Image_UserApp\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
+Note2 : The following steps enable the protections disabled by default:
+        - Comment "SECBOOT_DISABLE_SECURITY_IPS" in app_sfu.h. This will enable RDP, WRP, DAP, DMA, IWDG protections
+          as well as attack surface reduction with MPU.
+        - As TAMPER detection can be very sensitive, the protection remains disabled by default.
+          Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
+        - In Linker_Common, update the mapping by:
+           - Renaming "mapping_fwimg.icf" to "mapping_fwimg_no_sec.icf".
+           - Renaming "mapping_sbsfu.icf" to "mapping_sbsfu_no_sec.icf".
+           - Renaming "mapping_fwimg_sec.icf" to "mapping_fwimg.icf".
+           - Renaming "mapping_sbsfu_sec.icf" to "mapping_sbsfu.icf".
+        These features achieve an attack surface reduction but will not make it possible to protect secrets.
+Note3 : for Linux users Minicom can be used but to do so you need to compile the BFU project with the MINICOM_YMODEM
+        switch enabled (app_sfu.h)
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/Binary/ECCKEY.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/Binary/ECCKEY.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/Binary/ECCKEY.txt
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/Binary/ECCKEY.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/Binary/iv.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/Binary/iv.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/Binary/iv.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/Binary/iv.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/Project.ewp
new file mode 100644
index 00000000..e381814c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/Project.ewp
@@ -0,0 +1,1054 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\KMS_Blob.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/postbuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/postbuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/postbuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/stm32wl55xx_flash_cm4.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/EWARM/stm32wl55xx_flash_cm4.icf
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/EWARM/stm32wl55xx_flash_cm4.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/KMS_Blob.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/KMS_Blob.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/KMS_Blob.sct
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/KMS_Blob.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/KMS_blob.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/KMS_blob.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/KMS_blob.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/KMS_blob.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..f5c7e0c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_KMS_Blob</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>KMS_blob</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../1_Image_SECoreBin/Inc</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>0</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>KMS_Blob.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--diag_suppress L6305W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>kms_blob_example_keys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_1_Image_KMS_Blob"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/postbuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/MDK-ARM/postbuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/MDK-ARM/postbuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..447ffaf6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/STM32CubeIDE/.cproject
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../1_Image_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/KMS_Blob.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_KMS_Blob.null.1082786794" name="1_Image_KMS_Blob"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1003497030;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1841871715">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/STM32CubeIDE/.project
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/.project
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/STM32CubeIDE/.project
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/Src/kms_blob_example_keys.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/Src/kms_blob_example_keys.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/Src/kms_blob_example_keys.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/Src/kms_blob_example_keys.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/readme.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_KMS_Blob/readme.txt
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_KMS_Blob/readme.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Binary/ECCKEY1.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Binary/ECCKEY1.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Binary/ECCKEY1.txt
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Binary/ECCKEY1.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Binary/nonce.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Binary/nonce.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Binary/nonce.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Binary/nonce.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/Project.ewp
new file mode 100644
index 00000000..37823294
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/Project.ewp
@@ -0,0 +1,1181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>KMS_ENABLED</state>
+          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
+          <state>IT_MANAGEMENT_DISABLED</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
+          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\App</state>
+          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\Target</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
+        <postbuild></postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>SE_CallGate</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
+      </file>
+    </group>
+    <group>
+      <name>Third_Party</name>
+      <group>
+        <name>mbed-crypto</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
+        </file>
+      </group>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..1613be66
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,123 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% %headerbin%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..410c0cd7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,119 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..70c88811
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,122 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/prebuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/EWARM/prebuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/prebuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..3faa0f34
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,24 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit};
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
+place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
+place in SE_CODE_NOKEY_ROM_region {readonly};
+place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
+keep { section .SE_embedded_Keys };
+place in SE_RAM_region {readwrite};
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/ca_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/ca_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/ca_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/ca_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/ca_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/ca_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/ca_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/ca_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_config.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_mem_pool_def.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_mem_pool_def.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_mem_pool_def.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_platf_objects_interface.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_platf_objects_interface.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/kms_platf_objects_interface.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/kms_platf_objects_interface.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/mbed_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/mbed_crypto_config.h
new file mode 100644
index 00000000..5ea26e4f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/mbed_crypto_config.h
@@ -0,0 +1,1976 @@
+/**
+ * \file config.h
+ *
+ * \brief Configuration options (set of defines)
+ *
+ *  This set of compile-time options may be used to enable
+ *  or disable features selectively, and reduce the global
+ *  memory footprint.
+ */
+/*
+ *  Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  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.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+/**
+ * \name SECTION: System support
+ *
+ * This section sets system specific settings.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_HAVE_ASM
+ *
+ * The compiler has support for asm().
+ *
+ * Requires support for asm() in compiler.
+ *
+ * Used in:
+ *      library/aria.c
+ *      library/timing.c
+ *      include/mbedtls/bn_mul.h
+ *
+ * Required by:
+ *      MBEDTLS_AESNI_C
+ *      MBEDTLS_PADLOCK_C
+ *
+ * Comment to disable the use of assembly code.
+ */
+//#define MBEDTLS_HAVE_ASM
+
+/**
+ * \def MBEDTLS_NO_UDBL_DIVISION
+ *
+ * The platform lacks support for double-width integer division (64-bit
+ * division on a 32-bit platform, 128-bit division on a 64-bit platform).
+ *
+ * Used in:
+ *      include/mbedtls/bignum.h
+ *      library/bignum.c
+ *
+ * The bignum code uses double-width division to speed up some operations.
+ * Double-width division is often implemented in software that needs to
+ * be linked with the program. The presence of a double-width integer
+ * type is usually detected automatically through preprocessor macros,
+ * but the automatic detection cannot know whether the code needs to
+ * and can be linked with an implementation of division for that type.
+ * By default division is assumed to be usable if the type is present.
+ * Uncomment this option to prevent the use of double-width division.
+ *
+ * Note that division for the native integer type is always required.
+ * Furthermore, a 64-bit type is always required even on a 32-bit
+ * platform, but it need not support multiplication or division. In some
+ * cases it is also desirable to disable some double-width operations. For
+ * example, if double-width division is implemented in software, disabling
+ * it can reduce code size in some embedded targets.
+ */
+//#define MBEDTLS_NO_UDBL_DIVISION
+
+/**
+ * \def MBEDTLS_NO_64BIT_MULTIPLICATION
+ *
+ * The platform lacks support for 32x32 -> 64-bit multiplication.
+ *
+ * Used in:
+ *      library/poly1305.c
+ *
+ * Some parts of the library may use multiplication of two unsigned 32-bit
+ * operands with a 64-bit result in order to speed up computations. On some
+ * platforms, this is not available in hardware and has to be implemented in
+ * software, usually in a library provided by the toolchain.
+ *
+ * Sometimes it is not desirable to have to link to that library. This option
+ * removes the dependency of that library on platforms that lack a hardware
+ * 64-bit multiplier by embedding a software implementation in Mbed TLS.
+ *
+ * Note that depending on the compiler, this may decrease performance compared
+ * to using the library function provided by the toolchain.
+ */
+//#define MBEDTLS_NO_64BIT_MULTIPLICATION
+
+/**
+ * \def MBEDTLS_HAVE_SSE2
+ *
+ * CPU supports SSE2 instruction set.
+ *
+ * Uncomment if the CPU supports SSE2 (IA-32 specific).
+ */
+//#define MBEDTLS_HAVE_SSE2
+
+/**
+ * \def MBEDTLS_HAVE_TIME
+ *
+ * System has time.h and time().
+ * The time does not need to be correct, only time differences are used,
+ * by contrast with MBEDTLS_HAVE_TIME_DATE
+ *
+ * Defining MBEDTLS_HAVE_TIME allows you to specify MBEDTLS_PLATFORM_TIME_ALT,
+ * MBEDTLS_PLATFORM_TIME_MACRO, MBEDTLS_PLATFORM_TIME_TYPE_MACRO and
+ * MBEDTLS_PLATFORM_STD_TIME.
+ *
+ * Comment if your system does not support time functions
+ */
+//#define MBEDTLS_HAVE_TIME
+
+/**
+ * \def MBEDTLS_HAVE_TIME_DATE
+ *
+ * System has time.h, time(), and an implementation for
+ * mbedtls_platform_gmtime_r() (see below).
+ * The time needs to be correct (not necessarily very accurate, but at least
+ * the date should be correct). This is used to verify the validity period of
+ * X.509 certificates.
+ *
+ * Comment if your system does not have a correct clock.
+ *
+ * \note mbedtls_platform_gmtime_r() is an abstraction in platform_util.h that
+ * behaves similarly to the gmtime_r() function from the C standard. Refer to
+ * the documentation for mbedtls_platform_gmtime_r() for more information.
+ *
+ * \note It is possible to configure an implementation for
+ * mbedtls_platform_gmtime_r() at compile-time by using the macro
+ * MBEDTLS_PLATFORM_GMTIME_R_ALT.
+ */
+//#define MBEDTLS_HAVE_TIME_DATE
+
+/**
+ * \def MBEDTLS_PLATFORM_MEMORY
+ *
+ * Enable the memory allocation layer.
+ *
+ * By default mbed TLS uses the system-provided calloc() and free().
+ * This allows different allocators (self-implemented or provided) to be
+ * provided to the platform abstraction layer.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY without the
+ * MBEDTLS_PLATFORM_{FREE,CALLOC}_MACROs will provide
+ * "mbedtls_platform_set_calloc_free()" allowing you to set an alternative calloc() and
+ * free() function pointer at runtime.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY and specifying
+ * MBEDTLS_PLATFORM_{CALLOC,FREE}_MACROs will allow you to specify the
+ * alternate function at compile time.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Enable this layer to allow use of alternative memory allocators.
+ */
+//#define MBEDTLS_PLATFORM_MEMORY
+
+/**
+ * \def MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+ *
+ * Do not assign standard functions in the platform layer (e.g. calloc() to
+ * MBEDTLS_PLATFORM_STD_CALLOC and printf() to MBEDTLS_PLATFORM_STD_PRINTF)
+ *
+ * This makes sure there are no linking errors on platforms that do not support
+ * these functions. You will HAVE to provide alternatives, either at runtime
+ * via the platform_set_xxx() functions or at compile time by setting
+ * the MBEDTLS_PLATFORM_STD_XXX defines, or enabling a
+ * MBEDTLS_PLATFORM_XXX_MACRO.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Uncomment to prevent default assignment of standard functions in the
+ * platform layer.
+ */
+//#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+/**
+ * \def MBEDTLS_PLATFORM_EXIT_ALT
+ *
+ * MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let mbed TLS support the
+ * function in the platform abstraction layer.
+ *
+ * Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, mbed TLS will
+ * provide a function "mbedtls_platform_set_printf()" that allows you to set an
+ * alternative printf function pointer.
+ *
+ * All these define require MBEDTLS_PLATFORM_C to be defined!
+ *
+ * \note MBEDTLS_PLATFORM_SNPRINTF_ALT is required on Windows;
+ * it will be enabled automatically by check_config.h
+ *
+ * \warning MBEDTLS_PLATFORM_XXX_ALT cannot be defined at the same time as
+ * MBEDTLS_PLATFORM_XXX_MACRO!
+ *
+ * Requires: MBEDTLS_PLATFORM_TIME_ALT requires MBEDTLS_HAVE_TIME
+ *
+ * Uncomment a macro to enable alternate implementation of specific base
+ * platform function
+ */
+//#define MBEDTLS_PLATFORM_EXIT_ALT
+//#define MBEDTLS_PLATFORM_TIME_ALT
+//#define MBEDTLS_PLATFORM_FPRINTF_ALT
+//#define MBEDTLS_PLATFORM_PRINTF_ALT
+//#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_VSNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_NV_SEED_ALT
+//#define MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
+
+/**
+ * \def MBEDTLS_DEPRECATED_WARNING
+ *
+ * Mark deprecated functions so that they generate a warning if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * This only works with GCC and Clang. With other compilers, you may want to
+ * use MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Uncomment to get warnings on using deprecated functions.
+ */
+//#define MBEDTLS_DEPRECATED_WARNING
+
+/**
+ * \def MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Remove deprecated functions so that they generate an error if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * Uncomment to get errors on using deprecated functions.
+ */
+#define MBEDTLS_DEPRECATED_REMOVED
+
+/**
+ * \def MBEDTLS_CHECK_PARAMS
+ *
+ * This configuration option controls whether the library validates more of
+ * the parameters passed to it.
+ *
+ * When this flag is not defined, the library only attempts to validate an
+ * input parameter if: (1) they may come from the outside world (such as the
+ * network, the filesystem, etc.) or (2) not validating them could result in
+ * internal memory errors such as overflowing a buffer controlled by the
+ * library. On the other hand, it doesn't attempt to validate parameters whose
+ * values are fully controlled by the application (such as pointers).
+ *
+ * When this flag is defined, the library additionally attempts to validate
+ * parameters that are fully controlled by the application, and should always
+ * be valid if the application code is fully correct and trusted.
+ *
+ * For example, when a function accepts as input a pointer to a buffer that may
+ * contain untrusted data, and its documentation mentions that this pointer
+ * must not be NULL:
+ * - the pointer is checked to be non-NULL only if this option is enabled
+ * - the content of the buffer is always validated
+ *
+ * When this flag is defined, if a library function receives a parameter that
+ * is invalid, it will:
+ * - invoke the macro MBEDTLS_PARAM_FAILED() which by default expands to a
+ *   call to the function mbedtls_param_failed()
+ * - immediately return (with a specific error code unless the function
+ *   returns void and can't communicate an error).
+ *
+ * When defining this flag, you also need to:
+ * - either provide a definition of the function mbedtls_param_failed() in
+ *   your application (see platform_util.h for its prototype) as the library
+ *   calls that function, but does not provide a default definition for it,
+ * - or provide a different definition of the macro MBEDTLS_PARAM_FAILED()
+ *   below if the above mechanism is not flexible enough to suit your needs.
+ *   See the documentation of this macro later in this file.
+ *
+ * Uncomment to enable validation of application-controlled parameters.
+ */
+//#define MBEDTLS_CHECK_PARAMS
+
+/* \} name SECTION: System support */
+
+/**
+ * \name SECTION: mbed TLS feature support
+ *
+ * This section sets support for features that are or are not needed
+ * within the modules that are enabled.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_TIMING_ALT
+ *
+ * Uncomment to provide your own alternate implementation for mbedtls_timing_hardclock(),
+ * mbedtls_timing_get_timer(), mbedtls_set_alarm(), mbedtls_set/get_delay()
+ *
+ * Only works if you have MBEDTLS_TIMING_C enabled.
+ *
+ * You will need to provide a header "timing_alt.h" and an implementation at
+ * compile time.
+ */
+//#define MBEDTLS_TIMING_ALT
+
+/**
+ * \def MBEDTLS_AES_ALT
+ *
+ * MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternate core implementation of a symmetric crypto, an arithmetic or hash
+ * module (e.g. platform specific assembly optimized implementations). Keep
+ * in mind that the function prototypes should remain the same.
+ *
+ * This replaces the whole module. If you only want to replace one of the
+ * functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_AES_ALT, mbed TLS will no longer
+ * provide the "struct mbedtls_aes_context" definition and omit the base
+ * function declarations and implementations. "aes_alt.h" will be included from
+ * "aes.h" to include the new function definitions.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * module.
+ *
+ * \warning   MD2, MD4, MD5, ARC4, DES and SHA-1 are considered weak and their
+ *            use constitutes a security risk. If possible, we recommend
+ *            avoiding dependencies on them, and considering stronger message
+ *            digests and ciphers instead.
+ *
+ */
+//#define MBEDTLS_AES_ALT
+//#define MBEDTLS_ARC4_ALT
+//#define MBEDTLS_ARIA_ALT
+//#define MBEDTLS_BLOWFISH_ALT
+//#define MBEDTLS_CAMELLIA_ALT
+//#define MBEDTLS_CCM_ALT
+//#define MBEDTLS_CHACHA20_ALT
+//#define MBEDTLS_CHACHAPOLY_ALT
+//#define MBEDTLS_CMAC_ALT
+//#define MBEDTLS_DES_ALT
+//#define MBEDTLS_DHM_ALT
+//#define MBEDTLS_ECJPAKE_ALT
+//#define MBEDTLS_GCM_ALT
+//#define MBEDTLS_NIST_KW_ALT
+//#define MBEDTLS_MD2_ALT
+//#define MBEDTLS_MD4_ALT
+//#define MBEDTLS_MD5_ALT
+//#define MBEDTLS_POLY1305_ALT
+//#define MBEDTLS_RIPEMD160_ALT
+//#define MBEDTLS_RSA_ALT
+//#define MBEDTLS_SHA1_ALT
+//#define MBEDTLS_SHA256_ALT
+//#define MBEDTLS_SHA512_ALT
+//#define MBEDTLS_XTEA_ALT
+
+/*
+ * When replacing the elliptic curve module, pleace consider, that it is
+ * implemented with two .c files:
+ *      - ecp.c
+ *      - ecp_curves.c
+ * You can replace them very much like all the other MBEDTLS__MODULE_NAME__ALT
+ * macros as described above. The only difference is that you have to make sure
+ * that you provide functionality for both .c files.
+ */
+//#define MBEDTLS_ECP_ALT
+
+/**
+ * \def MBEDTLS_MD2_PROCESS_ALT
+ *
+ * MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use you
+ * alternate core implementation of symmetric crypto or hash function. Keep in
+ * mind that function prototypes should remain the same.
+ *
+ * This replaces only one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, mbed TLS will
+ * no longer provide the mbedtls_sha1_process() function, but it will still provide
+ * the other function (using your mbedtls_sha1_process() function) and the definition
+ * of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible
+ * with this definition.
+ *
+ * \note Because of a signature change, the core AES encryption and decryption routines are
+ *       currently named mbedtls_aes_internal_encrypt and mbedtls_aes_internal_decrypt,
+ *       respectively. When setting up alternative implementations, these functions should
+ *       be overridden, but the wrapper functions mbedtls_aes_decrypt and mbedtls_aes_encrypt
+ *       must stay untouched.
+ *
+ * \note If you use the AES_xxx_ALT macros, then is is recommended to also set
+ *       MBEDTLS_AES_ROM_TABLES in order to help the linker garbage-collect the AES
+ *       tables.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ *
+ * \warning   MD2, MD4, MD5, DES and SHA-1 are considered weak and their use
+ *            constitutes a security risk. If possible, we recommend avoiding
+ *            dependencies on them, and considering stronger message digests
+ *            and ciphers instead.
+ *
+ */
+//#define MBEDTLS_MD2_PROCESS_ALT
+//#define MBEDTLS_MD4_PROCESS_ALT
+//#define MBEDTLS_MD5_PROCESS_ALT
+//#define MBEDTLS_RIPEMD160_PROCESS_ALT
+//#define MBEDTLS_SHA1_PROCESS_ALT
+//#define MBEDTLS_SHA256_PROCESS_ALT
+//#define MBEDTLS_SHA512_PROCESS_ALT
+//#define MBEDTLS_DES_SETKEY_ALT
+//#define MBEDTLS_DES_CRYPT_ECB_ALT
+//#define MBEDTLS_DES3_CRYPT_ECB_ALT
+//#define MBEDTLS_AES_SETKEY_ENC_ALT
+//#define MBEDTLS_AES_SETKEY_DEC_ALT
+//#define MBEDTLS_AES_ENCRYPT_ALT
+//#define MBEDTLS_AES_DECRYPT_ALT
+//#define MBEDTLS_ECDH_GEN_PUBLIC_ALT
+//#define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
+//#define MBEDTLS_ECDSA_VERIFY_ALT
+//#define MBEDTLS_ECDSA_SIGN_ALT
+//#define MBEDTLS_ECDSA_GENKEY_ALT
+
+/**
+ * \def MBEDTLS_ECP_INTERNAL_ALT
+ *
+ * Expose a part of the internal interface of the Elliptic Curve Point module.
+ *
+ * MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternative core implementation of elliptic curve arithmetic. Keep in mind
+ * that function prototypes should remain the same.
+ *
+ * This partially replaces one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation
+ * is still present and it is used for group structures not supported by the
+ * alternative.
+ *
+ * Any of these options become available by defining MBEDTLS_ECP_INTERNAL_ALT
+ * and implementing the following functions:
+ *      unsigned char mbedtls_internal_ecp_grp_capable(
+ *          const mbedtls_ecp_group *grp )
+ *      int  mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp )
+ *      void mbedtls_internal_ecp_free( const mbedtls_ecp_group *grp )
+ * The mbedtls_internal_ecp_grp_capable function should return 1 if the
+ * replacement functions implement arithmetic for the given group and 0
+ * otherwise.
+ * The functions mbedtls_internal_ecp_init and mbedtls_internal_ecp_free are
+ * called before and after each point operation and provide an opportunity to
+ * implement optimized set up and tear down instructions.
+ *
+ * Example: In case you uncomment MBEDTLS_ECP_INTERNAL_ALT and
+ * MBEDTLS_ECP_DOUBLE_JAC_ALT, mbed TLS will still provide the ecp_double_jac
+ * function, but will use your mbedtls_internal_ecp_double_jac if the group is
+ * supported (your mbedtls_internal_ecp_grp_capable function returns 1 when
+ * receives it as an argument). If the group is not supported then the original
+ * implementation is used. The other functions and the definition of
+ * mbedtls_ecp_group and mbedtls_ecp_point will not change, so your
+ * implementation of mbedtls_internal_ecp_double_jac and
+ * mbedtls_internal_ecp_grp_capable must be compatible with this definition.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ */
+/* Required for all the functions in this section */
+//#define MBEDTLS_ECP_INTERNAL_ALT
+/* Support for Weierstrass curves with Jacobi representation */
+//#define MBEDTLS_ECP_RANDOMIZE_JAC_ALT
+//#define MBEDTLS_ECP_ADD_MIXED_ALT
+//#define MBEDTLS_ECP_DOUBLE_JAC_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_ALT
+/* Support for curves with Montgomery arithmetic */
+//#define MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT
+//#define MBEDTLS_ECP_RANDOMIZE_MXZ_ALT
+//#define MBEDTLS_ECP_NORMALIZE_MXZ_ALT
+
+/**
+ * \def MBEDTLS_TEST_NULL_ENTROPY
+ *
+ * Enables testing and use of mbed TLS without any configured entropy sources.
+ * This permits use of the library on platforms before an entropy source has
+ * been integrated (see for example the MBEDTLS_ENTROPY_HARDWARE_ALT or the
+ * MBEDTLS_ENTROPY_NV_SEED switches).
+ *
+ * WARNING! This switch MUST be disabled in production builds, and is suitable
+ * only for development.
+ * Enabling the switch negates any security provided by the library.
+ *
+ * Requires MBEDTLS_ENTROPY_C, MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ */
+//#define MBEDTLS_TEST_NULL_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_HARDWARE_ALT
+ *
+ * Uncomment this macro to let mbed TLS use your own implementation of a
+ * hardware entropy collector.
+ *
+ * Your function must be called \c mbedtls_hardware_poll(), have the same
+ * prototype as declared in entropy_poll.h, and accept NULL as first argument.
+ *
+ * Uncomment to use your own hardware entropy collector.
+ */
+//#define MBEDTLS_ENTROPY_HARDWARE_ALT
+
+/**
+ * \def MBEDTLS_AES_ROM_TABLES
+ *
+ * Use precomputed AES tables stored in ROM.
+ *
+ * Uncomment this macro to use precomputed AES tables stored in ROM.
+ * Comment this macro to generate AES tables in RAM at runtime.
+ *
+ * Tradeoff: Using precomputed ROM tables reduces RAM usage by ~8kb
+ * (or ~2kb if \c MBEDTLS_AES_FEWER_TABLES is used) and reduces the
+ * initialization time before the first AES operation can be performed.
+ * It comes at the cost of additional ~8kb ROM use (resp. ~2kb if \c
+ * MBEDTLS_AES_FEWER_TABLES below is used), and potentially degraded
+ * performance if ROM access is slower than RAM access.
+ *
+ * This option is independent of \c MBEDTLS_AES_FEWER_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_ROM_TABLES
+
+/**
+ * \def MBEDTLS_AES_FEWER_TABLES
+ *
+ * Use less ROM/RAM for AES tables.
+ *
+ * Uncommenting this macro omits 75% of the AES tables from
+ * ROM / RAM (depending on the value of \c MBEDTLS_AES_ROM_TABLES)
+ * by computing their values on the fly during operations
+ * (the tables are entry-wise rotations of one another).
+ *
+ * Tradeoff: Uncommenting this reduces the RAM / ROM footprint
+ * by ~6kb but at the cost of more arithmetic operations during
+ * runtime. Specifically, one has to compare 4 accesses within
+ * different tables to 4 accesses with additional arithmetic
+ * operations within the same table. The performance gain/loss
+ * depends on the system and memory details.
+ *
+ * This option is independent of \c MBEDTLS_AES_ROM_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_FEWER_TABLES
+
+/**
+ * \def MBEDTLS_CAMELLIA_SMALL_MEMORY
+ *
+ * Use less ROM for the Camellia implementation (saves about 768 bytes).
+ *
+ * Uncomment this macro to use less memory for Camellia.
+ */
+//#define MBEDTLS_CAMELLIA_SMALL_MEMORY
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CBC
+ *
+ * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CBC
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CFB
+ *
+ * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CTR
+ *
+ * Enable Counter Block Cipher mode (CTR) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CTR
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_OFB
+ *
+ * Enable Output Feedback mode (OFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_OFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_XTS
+ *
+ * Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
+ */
+//#define MBEDTLS_CIPHER_MODE_XTS
+
+/**
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+ *
+ * Enable NULL cipher.
+ * Warning: Only do so when you know what you are doing. This allows for
+ * encryption or channels without any security!
+ *
+ * This module is required to support the TLS ciphersuites that use the NULL
+ * cipher.
+ *
+ * Uncomment this macro to enable the NULL cipher
+ */
+//#define MBEDTLS_CIPHER_NULL_CIPHER
+
+/**
+ * \def MBEDTLS_CIPHER_PADDING_PKCS7
+ *
+ * MBEDTLS_CIPHER_PADDING_XXX: Uncomment or comment macros to add support for
+ * specific padding modes in the cipher layer with cipher modes that support
+ * padding (e.g. CBC)
+ *
+ * If you disable all padding modes, only full blocks can be used with CBC.
+ *
+ * Enable padding modes in the cipher layer.
+ */
+//#define MBEDTLS_CIPHER_PADDING_PKCS7
+//#define MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS
+//#define MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN
+//#define MBEDTLS_CIPHER_PADDING_ZEROS
+
+/**
+ * \def MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ *
+ * MBEDTLS_ECP_XXXX_ENABLED: Enables specific curves within the Elliptic Curve
+ * module.  By default all supported curves are enabled.
+ *
+ * Comment macros to disable the curve and functions for it
+ */
+//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE448_ENABLED
+
+/**
+ * \def MBEDTLS_ECP_NIST_OPTIM
+ *
+ * Enable specific 'modulo p' routines for each NIST prime.
+ * Depending on the prime and architecture, makes operations 4 to 8 times
+ * faster on the corresponding curve.
+ *
+ * Comment this macro to disable NIST curves optimisation.
+ */
+//#define MBEDTLS_ECP_NIST_OPTIM
+
+/**
+ * \def MBEDTLS_ECP_RESTARTABLE
+ *
+ * Enable "non-blocking" ECC operations that can return early and be resumed.
+ *
+ * This allows various functions to pause by returning
+ * #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in Mbed TLS's SSL module,
+ * MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in order
+ * to further progress and eventually complete their operation. This is
+ * controlled through mbedtls_ecp_set_max_ops() which limits the maximum number
+ * of ECC operations a function may perform before pausing; see
+ * mbedtls_ecp_set_max_ops() for more information.
+ *
+ * This is useful in non-threaded environments if you want to avoid blocking
+ * for too long on ECC (and, hence, X.509 or SSL/TLS) operations.
+ *
+ * Uncomment this macro to enable restartable ECC computations.
+ *
+ * \note  This option only works with the default software implementation of
+ *        elliptic curve functionality. It is incompatible with
+ *        MBEDTLS_ECP_ALT, MBEDTLS_ECDH_XXX_ALT and MBEDTLS_ECDSA_XXX_ALT.
+ */
+//#define MBEDTLS_ECP_RESTARTABLE
+
+/**
+ * \def MBEDTLS_ECDSA_DETERMINISTIC
+ *
+ * Enable deterministic ECDSA (RFC 6979).
+ * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
+ * may result in a compromise of the long-term signing key. This is avoided by
+ * the deterministic variant.
+ *
+ * Requires: MBEDTLS_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+ */
+//#define MBEDTLS_ECDSA_DETERMINISTIC
+
+/**
+ * \def MBEDTLS_PK_PARSE_EC_EXTENDED
+ *
+ * Enhance support for reading EC keys using variants of SEC1 not allowed by
+ * RFC 5915 and RFC 5480.
+ *
+ * Currently this means parsing the SpecifiedECDomain choice of EC
+ * parameters (only known groups are supported, not arbitrary domains, to
+ * avoid validation issues).
+ *
+ * Disable if you only need to support RFC 5915 + 5480 key formats.
+ */
+//#define MBEDTLS_PK_PARSE_EC_EXTENDED
+
+/**
+ * \def MBEDTLS_ERROR_STRERROR_DUMMY
+ *
+ * Enable a dummy error function to make use of mbedtls_strerror() in
+ * third party libraries easier when MBEDTLS_ERROR_C is disabled
+ * (no effect when MBEDTLS_ERROR_C is enabled).
+ *
+ * You can safely disable this if MBEDTLS_ERROR_C is enabled, or if you're
+ * not using mbedtls_strerror() or error_strerror() in your application.
+ *
+ * Disable if you run into name conflicts and want to really remove the
+ * mbedtls_strerror()
+ */
+//#define MBEDTLS_ERROR_STRERROR_DUMMY
+
+/**
+ * \def MBEDTLS_GENPRIME
+ *
+ * Enable the prime-number generation code.
+ *
+ * Requires: MBEDTLS_BIGNUM_C
+ */
+//#define MBEDTLS_GENPRIME
+
+/**
+ * \def MBEDTLS_FS_IO
+ *
+ * Enable functions that use the filesystem.
+ */
+//#define MBEDTLS_FS_IO
+
+/**
+ * \def MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ * Do not add default entropy sources. These are the platform specific,
+ * mbedtls_timing_hardclock and HAVEGE based poll functions.
+ *
+ * This is useful to have more control over the added entropy sources in an
+ * application.
+ *
+ * Uncomment this macro to prevent loading of default entropy functions.
+ */
+//#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+
+/**
+ * \def MBEDTLS_NO_PLATFORM_ENTROPY
+ *
+ * Do not use built-in platform entropy functions.
+ * This is useful if your platform does not support
+ * standards like the /dev/urandom or Windows CryptoAPI.
+ *
+ * Uncomment this macro to disable the built-in platform entropy functions.
+ */
+//#define MBEDTLS_NO_PLATFORM_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_FORCE_SHA256
+ *
+ * Force the entropy accumulator to use a SHA-256 accumulator instead of the
+ * default SHA-512 based one (if both are available).
+ *
+ * Requires: MBEDTLS_SHA256_C
+ *
+ * On 32-bit systems SHA-256 can be much faster than SHA-512. Use this option
+ * if you have performance concerns.
+ *
+ * This option is only useful if both MBEDTLS_SHA256_C and
+ * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
+ */
+//#define MBEDTLS_ENTROPY_FORCE_SHA256
+
+/**
+ * \def MBEDTLS_ENTROPY_NV_SEED
+ *
+ * Enable the non-volatile (NV) seed file-based entropy source.
+ * (Also enables the NV seed read/write functions in the platform layer)
+ *
+ * This is crucial (if not required) on systems that do not have a
+ * cryptographic entropy source (in hardware or kernel) available.
+ *
+ * Requires: MBEDTLS_ENTROPY_C, MBEDTLS_PLATFORM_C
+ *
+ * \note The read/write functions that are used by the entropy source are
+ *       determined in the platform layer, and can be modified at runtime and/or
+ *       compile-time depending on the flags (MBEDTLS_PLATFORM_NV_SEED_*) used.
+ *
+ * \note If you use the default implementation functions that read a seedfile
+ *       with regular fopen(), please make sure you make a seedfile with the
+ *       proper name (defined in MBEDTLS_PLATFORM_STD_NV_SEED_FILE) and at
+ *       least MBEDTLS_ENTROPY_BLOCK_SIZE bytes in size that can be read from
+ *       and written to or you will get an entropy source error! The default
+ *       implementation will only use the first MBEDTLS_ENTROPY_BLOCK_SIZE
+ *       bytes from the file.
+ *
+ * \note The entropy collector will write to the seed file before entropy is
+ *       given to an external source, to update it.
+ */
+//#define MBEDTLS_ENTROPY_NV_SEED
+
+/* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+ *
+ * In PSA key storage, encode the owner of the key.
+ *
+ * This is only meaningful when building the library as part of a
+ * multi-client service. When you activate this option, you must provide
+ * an implementation of the type psa_key_owner_id_t and a translation
+ * from psa_key_file_id_t to file name in all the storage backends that
+ * you wish to support.
+ *
+ * Note that this option is meant for internal use only and may be removed
+ * without notice.
+ */
+//#define MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+
+/**
+ * \def MBEDTLS_MEMORY_DEBUG
+ *
+ * Enable debugging of buffer allocator memory issues. Automatically prints
+ * (to stderr) all (fatal) messages on memory allocation issues. Enables
+ * function for 'debug output' of allocated memory.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Uncomment this macro to let the buffer allocator print out error messages.
+ */
+//#define MBEDTLS_MEMORY_DEBUG
+
+/**
+ * \def MBEDTLS_MEMORY_BACKTRACE
+ *
+ * Include backtrace information with each allocated block.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *           GLIBC-compatible backtrace() an backtrace_symbols() support
+ *
+ * Uncomment this macro to include backtrace information
+ */
+//#define MBEDTLS_MEMORY_BACKTRACE
+
+/**
+ * \def MBEDTLS_PK_RSA_ALT_SUPPORT
+ *
+ * Support external private RSA keys (eg from a HSM) in the PK layer.
+ *
+ * Comment this macro to disable support for external private RSA keys.
+ */
+//#define MBEDTLS_PK_RSA_ALT_SUPPORT
+
+/**
+ * \def MBEDTLS_PKCS1_V15
+ *
+ * Enable support for PKCS#1 v1.5 encoding.
+ *
+ * Requires: MBEDTLS_RSA_C
+ *
+ * This enables support for PKCS#1 v1.5 operations.
+ */
+//#define MBEDTLS_PKCS1_V15
+
+/**
+ * \def MBEDTLS_PKCS1_V21
+ *
+ * Enable support for PKCS#1 v2.1 encoding.
+ *
+ * Requires: MBEDTLS_MD_C, MBEDTLS_RSA_C
+ *
+ * This enables support for RSAES-OAEP and RSASSA-PSS operations.
+ */
+//#define MBEDTLS_PKCS1_V21
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_SPM
+ *
+ * When MBEDTLS_PSA_CRYPTO_SPM is defined, the code is built for SPM (Secure
+ * Partition Manager) integration which separates the code into two parts: a
+ * NSPE (Non-Secure Process Environment) and an SPE (Secure Process
+ * Environment).
+ *
+ * Module:  library/psa_crypto.c
+ * Requires: MBEDTLS_PSA_CRYPTO_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_SPM
+
+/**
+ * \def MBEDTLS_PSA_INJECT_ENTROPY
+ *
+ * Enable support for entropy injection at first boot. This feature is
+ * required on systems that do not have a built-in entropy source (TRNG).
+ * This feature is currently not supported on systems that have a built-in
+ * entropy source.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_STORAGE_C, MBEDTLS_ENTROPY_NV_SEED
+ *
+ */
+//#define MBEDTLS_PSA_INJECT_ENTROPY
+
+/**
+ * \def MBEDTLS_RSA_NO_CRT
+ *
+ * Do not use the Chinese Remainder Theorem
+ * for the RSA private operation.
+ *
+ * Uncomment this macro to disable the use of CRT in RSA.
+ *
+ */
+//#define MBEDTLS_RSA_NO_CRT
+
+/**
+ * \def MBEDTLS_SELF_TEST
+ *
+ * Enable the checkup functions (*_self_test).
+ */
+//#define MBEDTLS_SELF_TEST
+
+/**
+ * \def MBEDTLS_SHA256_SMALLER
+ *
+ * Enable an implementation of SHA-256 that has lower ROM footprint but also
+ * lower performance.
+ *
+ * The default implementation is meant to be a reasonable compromise between
+ * performance and size. This version optimizes more aggressively for size at
+ * the expense of performance. Eg on Cortex-M4 it reduces the size of
+ * mbedtls_sha256_process() from ~2KB to ~0.5KB for a performance hit of about
+ * 30%.
+ *
+ * Uncomment to enable the smaller implementation of SHA256.
+ */
+#define MBEDTLS_SHA256_SMALLER
+
+/**
+ * \def MBEDTLS_THREADING_ALT
+ *
+ * Provide your own alternate threading implementation.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to allow your own alternate threading implementation.
+ */
+//#define MBEDTLS_THREADING_ALT
+
+/**
+ * \def MBEDTLS_THREADING_PTHREAD
+ *
+ * Enable the pthread wrapper layer for the threading layer.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to enable pthread mutexes.
+ */
+//#define MBEDTLS_THREADING_PTHREAD
+
+/**
+ * \def MBEDTLS_USE_PSA_CRYPTO
+ *
+ * Make the X.509 and TLS library use PSA for cryptographic operations, see
+ * #MBEDTLS_PSA_CRYPTO_C.
+ *
+ * Note: this option is still in progress, the full X.509 and TLS modules are
+ * not covered yet, but parts that are not ported to PSA yet will still work
+ * as usual, so enabling this option should not break backwards compatibility.
+ *
+ * \warning  Support for PSA is still an experimental feature.
+ *           Any public API that depends on this option may change
+ *           at any time until this warning is removed.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C.
+ */
+//#define MBEDTLS_USE_PSA_CRYPTO
+
+/**
+ * \def MBEDTLS_VERSION_FEATURES
+ *
+ * Allow run-time checking of compile-time enabled features. Thus allowing users
+ * to check at run-time if the library is for instance compiled with threading
+ * support via mbedtls_version_check_feature().
+ *
+ * Requires: MBEDTLS_VERSION_C
+ *
+ * Comment this to disable run-time checking and save ROM space
+ */
+//#define MBEDTLS_VERSION_FEATURES
+
+/* \} name SECTION: mbed TLS feature support */
+
+/**
+ * \name SECTION: mbed TLS modules
+ *
+ * This section enables or disables entire modules in mbed TLS
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_AESNI_C
+ *
+ * Enable AES-NI support on x86-64.
+ *
+ * Module:  library/aesni.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the AES-NI instructions on x86-64
+ */
+//#define MBEDTLS_AESNI_C
+
+/**
+ * \def MBEDTLS_AES_C
+ *
+ * Enable the AES block cipher.
+ *
+ * Module:  library/aes.c
+ * Caller:  library/cipher.c
+ *          library/pem.c
+ *          library/ctr_drbg.c
+ *
+ * This module is required to support the TLS ciphersuites that use the AES
+ * cipher.
+ *
+ * PEM_PARSE uses AES for decrypting encrypted keys.
+ */
+//#define MBEDTLS_AES_C
+
+/**
+ * \def MBEDTLS_ARC4_C
+ *
+ * Enable the ARCFOUR stream cipher.
+ *
+ * Module:  library/arc4.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the ARC4
+ * cipher.
+ *
+ * \warning   ARC4 is considered a weak cipher and its use constitutes a
+ *            security risk. If possible, we recommend avoidng dependencies on
+ *            it, and considering stronger ciphers instead.
+ *
+ */
+//#define MBEDTLS_ARC4_C
+
+/**
+ * \def MBEDTLS_ASN1_PARSE_C
+ *
+ * Enable the generic ASN1 parser.
+ *
+ * Module:  library/asn1.c
+ * Caller:  library/dhm.c
+ *          library/pkcs12.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ */
+//#define MBEDTLS_ASN1_PARSE_C
+
+/**
+ * \def MBEDTLS_ASN1_WRITE_C
+ *
+ * Enable the generic ASN1 writer.
+ *
+ * Module:  library/asn1write.c
+ * Caller:  library/ecdsa.c
+ *          library/pkwrite.c
+ */
+//#define MBEDTLS_ASN1_WRITE_C
+
+/**
+ * \def MBEDTLS_BASE64_C
+ *
+ * Enable the Base64 module.
+ *
+ * Module:  library/base64.c
+ * Caller:  library/pem.c
+ *
+ * This module is required for PEM support (required by X.509).
+ */
+//#define MBEDTLS_BASE64_C
+
+/**
+ * \def MBEDTLS_BIGNUM_C
+ *
+ * Enable the multi-precision integer library.
+ *
+ * Module:  library/bignum.c
+ * Caller:  library/dhm.c
+ *          library/ecp.c
+ *          library/ecdsa.c
+ *          library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is required for RSA, DHM and ECC (ECDH, ECDSA) support.
+ */
+//#define MBEDTLS_BIGNUM_C
+
+/**
+ * \def MBEDTLS_BLOWFISH_C
+ *
+ * Enable the Blowfish block cipher.
+ *
+ * Module:  library/blowfish.c
+ */
+//#define MBEDTLS_BLOWFISH_C
+
+/**
+ * \def MBEDTLS_CAMELLIA_C
+ *
+ * Enable the Camellia block cipher.
+ *
+ * Module:  library/camellia.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * Camellia cipher.
+ */
+//#define MBEDTLS_CAMELLIA_C
+
+/**
+ * \def MBEDTLS_ARIA_C
+ *
+ * Enable the ARIA block cipher.
+ *
+ * Module:  library/aria.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * ARIA cipher.
+ */
+//#define MBEDTLS_ARIA_C
+
+/**
+ * \def MBEDTLS_CCM_C
+ *
+ * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
+ *
+ * Module:  library/ccm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support AES-CCM ciphersuites in TLS.
+ */
+//#define MBEDTLS_CCM_C
+
+/**
+ * \def MBEDTLS_CHACHA20_C
+ *
+ * Enable the ChaCha20 stream cipher.
+ *
+ * Module:  library/chacha20.c
+ */
+//#define MBEDTLS_CHACHA20_C
+
+/**
+ * \def MBEDTLS_CHACHAPOLY_C
+ *
+ * Enable the ChaCha20-Poly1305 AEAD algorithm.
+ *
+ * Module:  library/chachapoly.c
+ *
+ * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
+ */
+//#define MBEDTLS_CHACHAPOLY_C
+
+/**
+ * \def MBEDTLS_CIPHER_C
+ *
+ * Enable the generic cipher layer.
+ *
+ * Module:  library/cipher.c
+ *
+ * Uncomment to enable generic cipher wrappers.
+ */
+//#define MBEDTLS_CIPHER_C
+
+/**
+ * \def MBEDTLS_CMAC_C
+ *
+ * Enable the CMAC (Cipher-based Message Authentication Code) mode for block
+ * ciphers.
+ *
+ * Module:  library/cmac.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
+ *
+ */
+//#define MBEDTLS_CMAC_C
+
+/**
+ * \def MBEDTLS_CTR_DRBG_C
+ *
+ * Enable the CTR_DRBG AES-based random generator.
+ * The CTR_DRBG generator uses AES-256 by default.
+ * To use AES-128 instead, enable MBEDTLS_CTR_DRBG_USE_128_BIT_KEY below.
+ *
+ * Module:  library/ctr_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_AES_C
+ *
+ * This module provides the CTR_DRBG AES random number generator.
+ */
+//#define MBEDTLS_CTR_DRBG_C
+
+/**
+ * \def MBEDTLS_DES_C
+ *
+ * Enable the DES block cipher.
+ *
+ * Module:  library/des.c
+ * Caller:  library/pem.c
+ *          library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the DES
+ * cipher.
+ *
+ * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
+ *
+ * \warning   DES is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ */
+//#define MBEDTLS_DES_C
+
+/**
+ * \def MBEDTLS_DHM_C
+ *
+ * Enable the Diffie-Hellman-Merkle module.
+ *
+ * Module:  library/dhm.c
+ *
+ * This module is used by the following key exchanges:
+ *      DHE-RSA, DHE-PSK
+ *
+ * \warning    Using DHE constitutes a security risk as it
+ *             is not possible to validate custom DH parameters.
+ *             If possible, it is recommended users should consider
+ *             preferring other methods of key exchange.
+ *             See dhm.h for more details.
+ *
+ */
+//#define MBEDTLS_DHM_C
+
+/**
+ * \def MBEDTLS_ECDH_C
+ *
+ * Enable the elliptic curve Diffie-Hellman library.
+ *
+ * Module:  library/ecdh.c
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
+ *
+ * Requires: MBEDTLS_ECP_C
+ */
+//#define MBEDTLS_ECDH_C
+
+/**
+ * \def MBEDTLS_ECDSA_C
+ *
+ * Enable the elliptic curve DSA library.
+ *
+ * Module:  library/ecdsa.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_ASN1_WRITE_C, MBEDTLS_ASN1_PARSE_C
+ */
+//#define MBEDTLS_ECDSA_C
+
+/**
+ * \def MBEDTLS_ECJPAKE_C
+ *
+ * Enable the elliptic curve J-PAKE library.
+ *
+ * \warning This is currently experimental. EC J-PAKE support is based on the
+ * Thread v1.0.0 specification; incompatible changes to the specification
+ * might still happen. For this reason, this is disabled by default.
+ *
+ * Module:  library/ecjpake.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECJPAKE
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_MD_C
+ */
+//#define MBEDTLS_ECJPAKE_C
+
+/**
+ * \def MBEDTLS_ECP_C
+ *
+ * Enable the elliptic curve over GF(p) library.
+ *
+ * Module:  library/ecp.c
+ * Caller:  library/ecdh.c
+ *          library/ecdsa.c
+ *          library/ecjpake.c
+ *
+ * Requires: MBEDTLS_BIGNUM_C and at least one MBEDTLS_ECP_DP_XXX_ENABLED
+ */
+//#define MBEDTLS_ECP_C
+
+/**
+ * \def MBEDTLS_ENTROPY_C
+ *
+ * Enable the platform-specific entropy code.
+ *
+ * Module:  library/entropy.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SHA512_C or MBEDTLS_SHA256_C
+ *
+ * This module provides a generic entropy pool
+ */
+//#define MBEDTLS_ENTROPY_C
+
+/**
+ * \def MBEDTLS_ERROR_C
+ *
+ * Enable error code to error string conversion.
+ *
+ * Module:  library/error.c
+ * Caller:
+ *
+ * This module enables mbedtls_strerror().
+ */
+//#define MBEDTLS_ERROR_C
+
+/**
+ * \def MBEDTLS_GCM_C
+ *
+ * Enable the Galois/Counter Mode (GCM) for AES.
+ *
+ * Module:  library/gcm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support the TLS ciphersuites that use GCM.
+ */
+//#define MBEDTLS_GCM_C
+
+/**
+ * \def MBEDTLS_HAVEGE_C
+ *
+ * Enable the HAVEGE random generator.
+ *
+ * Warning: the HAVEGE random generator is not suitable for virtualized
+ *          environments
+ *
+ * Warning: the HAVEGE random generator is dependent on timing and specific
+ *          processor traits. It is therefore not advised to use HAVEGE as
+ *          your applications primary random generator or primary entropy pool
+ *          input. As a secondary input to your entropy pool, it IS able add
+ *          the (limited) extra entropy it provides.
+ *
+ * Module:  library/havege.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_TIMING_C
+ *
+ * Uncomment to enable the HAVEGE random generator.
+ */
+//#define MBEDTLS_HAVEGE_C
+
+/**
+ * \def MBEDTLS_HKDF_C
+ *
+ * Enable the HKDF algorithm (RFC 5869).
+ *
+ * Module:  library/hkdf.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the Hashed Message Authentication Code
+ * (HMAC)-based key derivation function (HKDF).
+ */
+//#define MBEDTLS_HKDF_C
+
+/**
+ * \def MBEDTLS_HMAC_DRBG_C
+ *
+ * Enable the HMAC_DRBG random generator.
+ *
+ * Module:  library/hmac_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+ */
+//#define MBEDTLS_HMAC_DRBG_C
+
+/**
+ * \def MBEDTLS_NIST_KW_C
+ *
+ * Enable the Key Wrapping mode for 128-bit block ciphers,
+ * as defined in NIST SP 800-38F. Only KW and KWP modes
+ * are supported. At the moment, only AES is approved by NIST.
+ *
+ * Module:  library/nist_kw.c
+ *
+ * Requires: MBEDTLS_AES_C and MBEDTLS_CIPHER_C
+ */
+//#define MBEDTLS_NIST_KW_C
+
+/**
+ * \def MBEDTLS_MD_C
+ *
+ * Enable the generic message digest layer.
+ *
+ * Module:  library/md.c
+ * Caller:
+ *
+ * Uncomment to enable generic message digest wrappers.
+ */
+//#define MBEDTLS_MD_C
+
+/**
+ * \def MBEDTLS_MD2_C
+ *
+ * Enable the MD2 hash algorithm.
+ *
+ * Module:  library/md2.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD2-signed X.509 certs.
+ *
+ * \warning   MD2 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD2_C
+
+/**
+ * \def MBEDTLS_MD4_C
+ *
+ * Enable the MD4 hash algorithm.
+ *
+ * Module:  library/md4.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD4-signed X.509 certs.
+ *
+ * \warning   MD4 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD4_C
+
+/**
+ * \def MBEDTLS_MD5_C
+ *
+ * Enable the MD5 hash algorithm.
+ *
+ * Module:  library/md5.c
+ * Caller:  library/md.c
+ *          library/pem.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, and for TLS 1.2
+ * depending on the handshake parameters. Further, it is used for checking
+ * MD5-signed certificates, and for PBKDF1 when decrypting PEM-encoded
+ * encrypted keys.
+ *
+ * \warning   MD5 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD5_C
+
+/**
+ * \def MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Enable the buffer allocator implementation that makes use of a (stack)
+ * based buffer to 'allocate' dynamic memory. (replaces calloc() and free()
+ * calls)
+ *
+ * Module:  library/memory_buffer_alloc.c
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *           MBEDTLS_PLATFORM_MEMORY (to use it within mbed TLS)
+ *
+ * Enable this module to enable the buffer memory allocator.
+ */
+//#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+
+/**
+ * \def MBEDTLS_OID_C
+ *
+ * Enable the OID database.
+ *
+ * Module:  library/oid.c
+ * Caller:  library/asn1write.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ *          library/pkwrite.c
+ *          library/rsa.c
+ *
+ * This modules translates between OIDs and internal values.
+ */
+//#define MBEDTLS_OID_C
+
+/**
+ * \def MBEDTLS_PADLOCK_C
+ *
+ * Enable VIA Padlock support on x86.
+ *
+ * Module:  library/padlock.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the VIA PadLock on x86.
+ */
+//#define MBEDTLS_PADLOCK_C
+
+/**
+ * \def MBEDTLS_PEM_PARSE_C
+ *
+ * Enable PEM decoding / parsing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/dhm.c
+ *          library/pkparse.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for decoding / parsing PEM files.
+ */
+//#define MBEDTLS_PEM_PARSE_C
+
+/**
+ * \def MBEDTLS_PEM_WRITE_C
+ *
+ * Enable PEM encoding / writing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for encoding / writing PEM files.
+ */
+//#define MBEDTLS_PEM_WRITE_C
+
+/**
+ * \def MBEDTLS_PK_C
+ *
+ * Enable the generic public (asymmetric) key layer.
+ *
+ * Module:  library/pk.c
+ *
+ * Requires: MBEDTLS_RSA_C or MBEDTLS_ECP_C
+ *
+ * Uncomment to enable generic public key wrappers.
+ */
+//#define MBEDTLS_PK_C
+
+/**
+ * \def MBEDTLS_PK_PARSE_C
+ *
+ * Enable the generic public (asymmetric) key parser.
+ *
+ * Module:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key parse functions.
+ */
+//#define MBEDTLS_PK_PARSE_C
+
+/**
+ * \def MBEDTLS_PK_WRITE_C
+ *
+ * Enable the generic public (asymmetric) key writer.
+ *
+ * Module:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key write functions.
+ */
+//#define MBEDTLS_PK_WRITE_C
+
+/**
+ * \def MBEDTLS_PKCS5_C
+ *
+ * Enable PKCS#5 functions.
+ *
+ * Module:  library/pkcs5.c
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the PKCS#5 functions.
+ */
+//#define MBEDTLS_PKCS5_C
+
+/**
+ * \def MBEDTLS_PKCS12_C
+ *
+ * Enable PKCS#12 PBE functions.
+ * Adds algorithms for parsing PKCS#8 encrypted private keys
+ *
+ * Module:  library/pkcs12.c
+ * Caller:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_CIPHER_C, MBEDTLS_MD_C
+ * Can use:  MBEDTLS_ARC4_C
+ *
+ * This module enables PKCS#12 functions.
+ */
+//#define MBEDTLS_PKCS12_C
+
+/**
+ * \def MBEDTLS_PLATFORM_C
+ *
+ * Enable the platform abstraction layer that allows you to re-assign
+ * functions like calloc(), free(), snprintf(), printf(), fprintf(), exit().
+ *
+ * Enabling MBEDTLS_PLATFORM_C enables to use of MBEDTLS_PLATFORM_XXX_ALT
+ * or MBEDTLS_PLATFORM_XXX_MACRO directives, allowing the functions mentioned
+ * above to be specified at runtime or compile time respectively.
+ *
+ * \note This abstraction layer must be enabled on Windows (including MSYS2)
+ * as other module rely on it for a fixed snprintf implementation.
+ *
+ * Module:  library/platform.c
+ * Caller:  Most other .c files
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+//#define MBEDTLS_PLATFORM_C
+
+/**
+ * \def MBEDTLS_POLY1305_C
+ *
+ * Enable the Poly1305 MAC algorithm.
+ *
+ * Module:  library/poly1305.c
+ * Caller:  library/chachapoly.c
+ */
+//#define MBEDTLS_POLY1305_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_C
+ *
+ * Enable the Platform Security Architecture cryptography API.
+ *
+ * Module:  library/psa_crypto.c
+ *
+ * Requires: MBEDTLS_CTR_DRBG_C, MBEDTLS_ENTROPY_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_STORAGE_C
+ *
+ * Enable the Platform Security Architecture persistent key storage.
+ *
+ * Module:  library/psa_crypto_storage.c
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C,
+ *           either MBEDTLS_PSA_ITS_FILE_C or a native implementation of
+ *           the PSA ITS interface
+ */
+//#define MBEDTLS_PSA_CRYPTO_STORAGE_C
+
+/**
+ * \def MBEDTLS_PSA_ITS_FILE_C
+ *
+ * Enable the emulation of the Platform Security Architecture
+ * Internal Trusted Storage (PSA ITS) over files.
+ *
+ * Module:  library/psa_its_file.c
+ *
+ * Requires: MBEDTLS_FS_IO
+ */
+//#define MBEDTLS_PSA_ITS_FILE_C
+
+/**
+ * \def MBEDTLS_RIPEMD160_C
+ *
+ * Enable the RIPEMD-160 hash algorithm.
+ *
+ * Module:  library/ripemd160.c
+ * Caller:  library/md.c
+ *
+ */
+//#define MBEDTLS_RIPEMD160_C
+
+/**
+ * \def MBEDTLS_RSA_C
+ *
+ * Enable the RSA public-key cryptosystem.
+ *
+ * Module:  library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is used by the following key exchanges:
+ *      RSA, DHE-RSA, ECDHE-RSA, RSA-PSK
+ *
+ * Requires: MBEDTLS_BIGNUM_C, MBEDTLS_OID_C
+ */
+/* #define MBEDTLS_RSA_C */
+
+/**
+ * \def MBEDTLS_SHA1_C
+ *
+ * Enable the SHA1 cryptographic hash algorithm.
+ *
+ * Module:  library/sha1.c
+ * Caller:  library/md.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, for TLS 1.2
+ * depending on the handshake parameters, and for SHA1-signed certificates.
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. If possible, we recommend avoiding dependencies
+ *            on it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_SHA1_C
+
+/**
+ * \def MBEDTLS_SHA256_C
+ *
+ * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
+ *
+ * Module:  library/sha256.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-224 and SHA-256.
+ * This module is required for the SSL/TLS 1.2 PRF function.
+ */
+#define MBEDTLS_SHA256_C
+
+/**
+ * \def MBEDTLS_SHA512_C
+ *
+ * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
+ *
+ * Module:  library/sha512.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-384 and SHA-512.
+ */
+//#define MBEDTLS_SHA512_C
+
+/**
+ * \def MBEDTLS_THREADING_C
+ *
+ * Enable the threading abstraction layer.
+ * By default mbed TLS assumes it is used in a non-threaded environment or that
+ * contexts are not shared between threads. If you do intend to use contexts
+ * between threads, you will need to enable this layer to prevent race
+ * conditions. See also our Knowledge Base article about threading:
+ * https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
+ *
+ * Module:  library/threading.c
+ *
+ * This allows different threading implementations (self-implemented or
+ * provided).
+ *
+ * You will have to enable either MBEDTLS_THREADING_ALT or
+ * MBEDTLS_THREADING_PTHREAD.
+ *
+ * Enable this layer to allow use of mutexes within mbed TLS
+ */
+//#define MBEDTLS_THREADING_C
+
+/**
+ * \def MBEDTLS_TIMING_C
+ *
+ * Enable the semi-portable timing interface.
+ *
+ * \note The provided implementation only works on POSIX/Unix (including Linux,
+ * BSD and OS X) and Windows. On other platforms, you can either disable that
+ * module and provide your own implementations of the callbacks needed by Mbed
+ * TLS's \c mbedtls_ssl_set_timer_cb() for DTLS, or leave it enabled and
+ * provide your own implementation of the whole module by setting
+ * \c MBEDTLS_TIMING_ALT in the current file.
+ *
+ * \note See also our Knowledge Base article about porting to a new
+ * environment:
+ * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS
+ *
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+//#define MBEDTLS_TIMING_C
+
+/**
+ * \def MBEDTLS_VERSION_C
+ *
+ * Enable run-time version information.
+ *
+ * Module:  library/version.c
+ *
+ * This module provides run-time version information.
+ */
+//#define MBEDTLS_VERSION_C
+
+/**
+ * \def MBEDTLS_XTEA_C
+ *
+ * Enable the XTEA block cipher.
+ *
+ * Module:  library/xtea.c
+ * Caller:
+ */
+//#define MBEDTLS_XTEA_C
+
+/* \} name SECTION: mbed TLS modules */
+
+/**
+ * \name SECTION: Module configuration options
+ *
+ * This section allows for the setting of module specific sizes and
+ * configuration options. The default values are already present in the
+ * relevant header files and should suffice for the regular use cases.
+ *
+ * Our advice is to enable options and change their values here
+ * only if you have a good reason and know the consequences.
+ *
+ * Please check the respective header file for documentation on these
+ * parameters (to prevent duplicate documentation).
+ * \{
+ */
+
+/* MPI / BIGNUM options */
+//#define MBEDTLS_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
+//#define MBEDTLS_MPI_MAX_SIZE            1024 /**< Maximum number of bytes for usable MPIs. */
+
+/* CTR_DRBG options */
+//#define MBEDTLS_CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+//#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
+//#define MBEDTLS_CTR_DRBG_USE_128_BIT_KEY              /**< Use 128-bit key for CTR_DRBG - may reduce security (see ctr_drbg.h) */
+
+/* HMAC_DRBG options */
+//#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_HMAC_DRBG_MAX_INPUT           256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_HMAC_DRBG_MAX_REQUEST        1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT      384 /**< Maximum size of (re)seed buffer */
+
+/* ECP options */
+//#define MBEDTLS_ECP_MAX_BITS             521 /**< Maximum bit size of groups */
+//#define MBEDTLS_ECP_WINDOW_SIZE            6 /**< Maximum window size used */
+//#define MBEDTLS_ECP_FIXED_POINT_OPTIM      1 /**< Enable fixed-point speed-up */
+
+/* Entropy options */
+//#define MBEDTLS_ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
+//#define MBEDTLS_ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
+//#define MBEDTLS_ENTROPY_MIN_HARDWARE               32 /**< Default minimum number of bytes required for the hardware entropy source mbedtls_hardware_poll() before entropy is released */
+
+/* Memory buffer allocator options */
+//#define MBEDTLS_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
+
+/* Platform options */
+//#define MBEDTLS_PLATFORM_STD_MEM_HDR   <stdlib.h> /**< Header to include if MBEDTLS_PLATFORM_NO_STD_FUNCTIONS is defined. Don't define if no header is needed. */
+//#define MBEDTLS_PLATFORM_STD_CALLOC        calloc /**< Default allocator to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_FREE            free /**< Default free to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT            exit /**< Default exit to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_TIME            time /**< Default time to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_STD_FPRINTF      fprintf /**< Default fprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_PRINTF        printf /**< Default printf to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_STD_SNPRINTF    snprintf /**< Default snprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS       0 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE       1 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_READ   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_FILE  "seedfile" /**< Seed file to read/write with default implementation */
+
+/* To Use Function Macros MBEDTLS_PLATFORM_C must be enabled */
+/* MBEDTLS_PLATFORM_XXX_MACRO and MBEDTLS_PLATFORM_XXX_ALT cannot both be defined */
+//#define MBEDTLS_PLATFORM_CALLOC_MACRO        calloc /**< Default allocator macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_FREE_MACRO            free /**< Default free macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_EXIT_MACRO            exit /**< Default exit macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_TIME_MACRO            time /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO       time_t /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_FPRINTF_MACRO      fprintf /**< Default fprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_PRINTF_MACRO        printf /**< Default printf macro to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_SNPRINTF_MACRO    snprintf /**< Default snprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_VSNPRINTF_MACRO    vsnprintf /**< Default vsnprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+
+/**
+ * Uncomment the macro to let mbed TLS use your alternate implementation of
+ * mbedtls_platform_zeroize(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * mbedtls_platform_zeroize() is a widely used function across the library to
+ * zero a block of memory. The implementation is expected to be secure in the
+ * sense that it has been written to prevent the compiler from removing calls
+ * to mbedtls_platform_zeroize() as part of redundant code elimination
+ * optimizations. However, it is difficult to guarantee that calls to
+ * mbedtls_platform_zeroize() will not be optimized by the compiler as older
+ * versions of the C language standards do not provide a secure implementation
+ * of memset(). Therefore, MBEDTLS_PLATFORM_ZEROIZE_ALT enables users to
+ * configure their own implementation of mbedtls_platform_zeroize(), for
+ * example by using directives specific to their compiler, features from newer
+ * C standards (e.g using memset_s() in C11) or calling a secure memset() from
+ * their system (e.g explicit_bzero() in BSD).
+ */
+//#define MBEDTLS_PLATFORM_ZEROIZE_ALT
+
+/**
+ * Uncomment the macro to let Mbed TLS use your alternate implementation of
+ * mbedtls_platform_gmtime_r(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * gmtime() is not a thread-safe function as defined in the C standard. The
+ * library will try to use safer implementations of this function, such as
+ * gmtime_r() when available. However, if Mbed TLS cannot identify the target
+ * system, the implementation of mbedtls_platform_gmtime_r() will default to
+ * using the standard gmtime(). In this case, calls from the library to
+ * gmtime() will be guarded by the global mutex mbedtls_threading_gmtime_mutex
+ * if MBEDTLS_THREADING_C is enabled. We recommend that calls from outside the
+ * library are also guarded with this mutex to avoid race conditions. However,
+ * if the macro MBEDTLS_PLATFORM_GMTIME_R_ALT is defined, Mbed TLS will
+ * unconditionally use the implementation for mbedtls_platform_gmtime_r()
+ * supplied at compile time.
+ */
+//#define MBEDTLS_PLATFORM_GMTIME_R_ALT
+
+/* \} name SECTION: Customisation configuration options */
+
+/* Target and application specific configurations
+ *
+ * Allow user to override any previous default.
+ *
+ */
+#if defined(MBEDTLS_USER_CONFIG_FILE)
+#include MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#include "mbedtls/check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/nvms_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/nvms_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/nvms_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/se_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/se_crypto_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/se_crypto_config.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/se_crypto_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/se_def_metadata.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/se_def_metadata.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/se_def_metadata.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/se_def_metadata.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/se_low_level.h
new file mode 100644
index 00000000..bd8b79e1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/se_low_level.h
@@ -0,0 +1,184 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Engine low level interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_LOW_LEVEL_H
+#define SE_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+
+/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
+   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
+#include "sfu_fwimg_regions.h"
+
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup SE
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
+  * @{
+  */
+/**
+  * @brief flash handling constants: these constants are used in se_fwimg.c
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
+  * @{
+  */
+
+/**
+  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
+  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
+  * 32-bit word.
+  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
+  */
+#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
+  do{                                  \
+    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
+  }while(0)
+
+/**
+  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
+  */
+#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
+  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
+  * @{
+  */
+
+/**
+  * MPU : Enter/Exit secured area ==> nothing to do
+  */
+#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
+#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
+
+/** @addtogroup SE_LOW_LEVEL_Exported_Functions
+  * @{
+  */
+void SE_LL_CORE_Cleanup(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_Functions
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void);
+SE_ErrorStatus SE_LL_CRC_Init(void);
+SE_ErrorStatus SE_LL_CRC_DeInit(void);
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..790df77b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/Project.uvoptx
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_SECoreBin</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>0x20005AF8</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\data_init.c</PathWithFileName>
+      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
+      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
+      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
+      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
+      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
+      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..46bcfce1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/Project.uvprojx
@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_SECoreBin</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>SECoreBin</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name>prebuild.bat .</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../1_Image_BFU/BFU/App;../../1_Image_BFU/BFU/Target;../../Linker_Common/MDK-ARM</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SECoreBin.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--entry=SE_CallGate
+--diag_suppress L6404W
+--diag_suppress L6314W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>data_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\data_init.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ca_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>nvms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/nvms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_low_level.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_callgate.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_exception.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_fwimg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_der_x962.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_digest.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_dyn_obj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_ecc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_enc_dec.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_key_mgt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_nvm_storage.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_platf_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+          <Files>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
+            <File>
+              <FileName>sha256.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_1_Image_SECoreBin"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct
new file mode 100644
index 00000000..a5aba32a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct
@@ -0,0 +1,26 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+
+; *** regions needed by SE_CoreBin project ***
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
+  *(.SE_CallGate_Code)
+  }
+  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
+  *(.SE_embedded_Keys)
+  }
+  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
+  *(.SE_Startup_Code)
+  }
+  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_ROM_REGION_SIZE{
+  .ANY (+RO)
+  } 
+  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/data_init.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/data_init.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/data_init.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/data_init.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/postbuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/postbuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/postbuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/prebuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/MDK-ARM/prebuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/MDK-ARM/prebuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..8c2f37a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/.cproject
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../1_Image_BFU/CM4/BFU/App | ../../../1_Image_BFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SECoreBin.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value=".."/>
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/App"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_SECoreBin.null.394363235" name="1_Image_SECoreBin"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/.project
new file mode 100644
index 00000000..e65aa4fa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/.project
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_SECoreBin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ca_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld
new file mode 100644
index 00000000..3cb3b060
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld
@@ -0,0 +1,152 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(SE_CallGate)
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_CallGate_Code :
+  {
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    KEEP(*(.SE_CallGate_Code))
+  } > SE_CallGate_ROM_region
+
+  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
+
+  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SE_Code_NoKey_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SE_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SE_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/ca_low_level.c
new file mode 100644
index 00000000..30759a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/ca_low_level.c
@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_C
+#define CA_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "CryptoApi/ca.h"
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#include "mbedtls/entropy_poll.h"
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#define COMPILER_BARRIER() __DMB();__DSB();
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static RNG_HandleTypeDef handle;
+static uint8_t users = 0;
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private function prototypes -----------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta);
+static void RNG_Init(void);
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length);
+static void RNG_DeInit(void);
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Exported functions implementation -----------------------------------------*/
+
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+
+/**
+  * @brief CRYP MSP Initialization
+  * This function configures the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Release AES/CRYP from reset state */
+    __HAL_RCC_AES_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_AES_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief CRYP MSP De-Initialization
+  * This function freeze the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_AES_CLK_DISABLE();
+    /* Force AES/CRYP into reset state */
+    __HAL_RCC_AES_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/**
+  * @brief      PKA MSP Initialization
+  *             This function configures the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Release PKA from reset state */
+    __HAL_RCC_PKA_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_PKA_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief      PKA MSP De-Initialization
+  *             This function freeze the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_PKA_CLK_DISABLE();
+    /* Force PKA into reset state */
+    __HAL_RCC_PKA_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta)
+{
+  COMPILER_BARRIER();
+  uint8_t newValue;
+  do
+  {
+    newValue = __LDREXB(valuePtr) + delta;
+  } while (__STREXB(newValue, valuePtr));
+  COMPILER_BARRIER();
+  return newValue;
+}
+
+static void RNG_Init(void)
+{
+  uint32_t dummy;
+
+  /*  We're only supporting a single user of RNG */
+  if (atomic_incr_u8(&users, 1) > 1)
+  {
+    while (1);
+  }
+
+  /* Select MSI as RNG clock source */
+  __HAL_RCC_RNG_CONFIG(RCC_RNGCLKSOURCE_MSI);
+
+  /* RNG Peripheral clock enable */
+  __HAL_RCC_RNG_CLK_ENABLE();
+
+  /* Initialize RNG instance */
+  handle.Instance = RNG;
+  handle.State = HAL_RNG_STATE_RESET;
+  handle.Lock = HAL_UNLOCKED;
+
+  HAL_RNG_Init(&handle);
+
+  /* first random number generated after setting the RNGEN bit should not be used */
+  HAL_RNG_GenerateRandomNumber(&handle, &dummy);
+}
+
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length)
+{
+  int32_t ret = 0;
+  __IO uint8_t random[4];
+  *output_length = 0;
+
+  /* Get Random byte */
+  while ((*output_length < length) && (ret == 0))
+  {
+    if (HAL_RNG_GenerateRandomNumber(&handle, (uint32_t *)random) != HAL_OK)
+    {
+      ret = -1;
+    }
+    else
+    {
+      for (uint8_t i = 0; (i < 4) && (*output_length < length) ; i++)
+      {
+        *output++ = random[i];
+        *output_length += 1;
+        random[i] = 0;
+      }
+    }
+  }
+  /* Just be extra sure that we didn't do it wrong */
+  if ((__HAL_RNG_GET_FLAG(&handle, (RNG_FLAG_CECS | RNG_FLAG_SECS))) != 0)
+  {
+    *output_length = 0;
+  }
+}
+
+static void RNG_DeInit(void)
+{
+  /*Disable the RNG peripheral */
+  HAL_RNG_DeInit(&handle);
+  /* RNG Peripheral clock disable - assume we're the only users of RNG  */
+  __HAL_RCC_RNG_CLK_DISABLE();
+
+  users = 0;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+  RNG_Init();
+  RNG_GetBytes(output, len, olen);
+  RNG_DeInit();
+  if (*olen != len)
+  {
+    return -1;
+  }
+  return 0;
+}
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+/**
+  * @brief      CRC initialization
+  *             This function release reset and clock CRC IP peripheral
+  * @retval None
+  */
+void CA_LL_CRC_Init(void)
+{
+  /* Force CRC into reset state */
+  __HAL_RCC_CRC_FORCE_RESET();
+  /* Release CRC from reset state */
+  __HAL_RCC_CRC_RELEASE_RESET();
+  /* Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+}
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#endif /* CA_LOW_LEVEL_C */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/kms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/kms_low_level.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/kms_low_level.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/kms_low_level.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/nvms_low_level.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Src/nvms_low_level.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/nvms_low_level.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/se_low_level.c
new file mode 100644
index 00000000..cfec9ebf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/Src/se_low_level.c
@@ -0,0 +1,706 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SE_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#endif /* __CC_ARM */
+#include "se_exception.h"
+#include "string.h"
+
+#ifdef KMS_ENABLED
+#include "kms.h"
+#include "kms_objects.h"
+#include "kms_platf_objects_config.h"
+#endif /* KMS_ENABLED */
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+/** @defgroup  SE_HARDWARE SE Hardware Interface
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Private_Variables Private Variables
+  * @{
+  */
+static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
+
+static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Private_Functions Private Functions
+  * @{
+  */
+
+static uint32_t SE_LL_GetPage(uint32_t Address);
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  Set CRC configuration and call HAL CRC initialization function.
+  * @param  None.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  CrcHandle.Instance = CRC;
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The Default polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+  /* The default init value is used */
+  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+  /* CRC Init*/
+  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_Init(void)
+{
+  /* CRC Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  return SE_LL_CRC_Config();
+}
+
+/**
+  * @brief  Wrapper to HAL CRC de-initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_DeInit(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
+  {
+    /* Initialization OK */
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC Calculate function.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  uBufferLength: buffer length in 32-bits word.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  This function does an erase of nb pages in user flash area
+  * @param  pStart: pointer to  user flash area
+  * @param  Length: number of bytes.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SE_ErrorStatus e_ret_status = SE_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    /* Fill EraseInit structure*/
+    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
+    p_erase_init.Page          = SE_LL_GetPage(start);
+    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
+    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+    {
+      e_ret_status = SE_ERROR;
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Write in Flash  protected area
+  * @param  pDestination pointer to destination area in Flash
+  * @param  pSource pointer to input buffer
+  * @param  Length number of bytes to be written
+  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
+  */
+
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SE_ErrorStatus ret = SE_SUCCESS;
+  uint32_t i;
+  uint32_t verified = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  if (Length == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Area should be inside 1 of the firmware image headers */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    for (i = 0U; i < Length; i += 8U)
+    {
+      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
+      {
+        ret = SE_ERROR;
+        break;
+      }
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) */
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    ret = SE_ERROR;
+  }
+  return ret;
+}
+
+/**
+  * @brief  Read in Flash protected area
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to read
+  * @param  Length: Length in bytes of data buffer
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  uint32_t source = (uint32_t)pSource;
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+  uint32_t i;
+  uint32_t verified = 0U;
+
+  /* Area should be inside 1 of the firmware image headers
+     or inside 1 of the download areas */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
+        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
+    {
+      verified = 1U;
+    }
+  }
+
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  SE_DoubleECC_Error_Counter = 0U;
+  /* Do not use memcpy from lib : ECC error should be checked at each loop */
+  for (i = 0; (i < Length) && (SE_DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+  {
+    *pDestination = *pSource;
+  }
+  if (SE_DoubleECC_Error_Counter == 0U)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  SE_DoubleECC_Error_Counter = 0U;
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
+  * @param pxSE_Metadata: Firmware metadata.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(pxSE_Metadata);
+  return SE_SUCCESS;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= (SE_REGION_RAM_END + 1U))))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is in sbsfu ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
+                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
+                            || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
+                           )))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Lock the embedded keys used by SBSFU
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void)
+{
+#ifdef KMS_ENABLED
+  uint32_t i_key_locked = 0U;
+  uint32_t i_ctrl = 0U;
+
+#ifdef KMS_INDEX_BLOBIMPORT_VERIFY
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_VERIFY) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_VERIFY */
+#ifdef KMS_INDEX_BLOBIMPORT_DECRYPT
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_DECRYPT) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_DECRYPT */
+#ifdef KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE */
+  if(i_ctrl == i_key_locked)
+  {
+    return SE_SUCCESS;
+  }
+  else
+  {
+    return SE_ERROR;
+  }
+#else /* KMS_ENABLED */
+  return SE_SUCCESS;
+#endif /* KMS_ENABLED */
+}
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t SE_LL_GetPage(uint32_t Address)
+{
+  uint32_t page;
+
+  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
+  {
+    /* Bank 1 */
+    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
+  }
+  else
+  {
+    /* Bank 2 */
+    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
+  }
+  return page;
+}
+
+/**
+  * @brief  Gets the bank of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The bank of a given address
+  */
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retval None.
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    SE_DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    /* This exception occurs for another reason than flash double ECC errors */
+    SE_NMI_ExceptionHandler();
+  }
+}
+
+/**
+  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
+  * @param  None.
+  * @retvat void
+  */
+void HardFault_Handler(void)
+{
+  SE_NMI_ExceptionHandler();
+}
+
+/**
+  * @brief  Cleanup SE CORE
+  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
+  *
+  */
+void  SE_LL_CORE_Cleanup(void)
+{
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/readme.txt
new file mode 100644
index 00000000..205abd15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_SECoreBin/readme.txt
@@ -0,0 +1,107 @@
+/**
+  @page 1_Image_SECoreBin / Secure Engine Core binary generation.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Secure Engine Core binary generation.
+  *          SE Core binary exports SE CallGate function entry point for
+  *          FU Application.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application is used to generate Secure Engine Core binary file to be linked
+with Boot & Firmware Update application (BFU).
+SE Core binary exports a single entry point to SE CallGate function and a startup method for data initialization.
+It is based on the Secure Engine Middleware.
+
+Generated SE Core Binary embeds Key Management Services accessible through this same single entry point using APIs
+defined by tKMS interface.
+
+It has to be compiled before BFU project.
+
+Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default
+cryptographic scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are
+provided and can be selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
+   - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
+   - SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+   - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 1_Image_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
+   - 1_Image_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
+   - 1_Image_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
+   - 1_Image_SECoreBin/Src/se_low_level.c                      Low level interface
+   - 1_Image_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
+   - 1_Image_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
+   - 1_Image_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
+   - 1_Image_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
+   - 1_Image_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
+   - 1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
+                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
+   - 1_Image_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
+                                                                Exported to KMS user to ease embedded object usage
+   - 1_Image_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
+   - 1_Image_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
+   - 1_Image_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
+   - 1_Image_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
+   - 1_Image_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
+   - 1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
+   - 1_Image_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
+   - 1_Image_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
+   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files. As a workaround, it is advised to use the subst.exe command from within a command prompt to set up
+     a local drive out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+   
+@par IDE prebuild script
+
+In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
+This preliminary processing is in charge of:
+   - determining the requested cryptographic scheme
+   - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of BFU & Blob importation
+     keys into the KMS embedded objects pattern file)
+   - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
+
+A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic
+key). The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+In order to generate Secure Engine Core binary file, you must do the following :
+   - Open your preferred toolchain
+   - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/Project.ewp
new file mode 100644
index 00000000..bcf00fec
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/Project.ewp
@@ -0,0 +1,1192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_UserApp</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>KMS_ENABLED</state>
+          <state>DISABLE_IMAGE_STATE_HANDLING</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
+          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\App</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\UserApp.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\1_Image_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 1 1"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\com.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\common.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\fw_update_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_user_code.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\test_protections.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ymodem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\flash_if.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_object_update_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_derive_key.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_encrypt_decrypt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_find.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_sign_verify.c</name>
+      </file>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\1_Image_BFU\EWARM\se_interface_appli.o</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..ae672ac8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,43 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_ROM_start__      = __ICFEDIT_SLOT_Active_1_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__        = __ICFEDIT_SLOT_Active_1_end__ ;
+define symbol __ICFEDIT_region_RAM_start__      = __ICFEDIT_SE_region_RAM_end__ + 1;
+define symbol __ICFEDIT_region_RAM_end__        = 0x20017FFF;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];
+define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly, last section aes_block_padding };
+place in RAM_region   { readwrite, block CSTACK, block HEAP };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/com.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/com.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/com.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/com.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/common.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/common.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/common.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/common.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/flash_if.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/flash_if.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/flash_if.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/fw_update_app.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/fw_update_app.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/fw_update_app.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/fw_update_app.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/main.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/main.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/main.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/se_user_code.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/se_user_code.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/se_user_code.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/se_user_code.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/sfu_app_new_image.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/sfu_app_new_image.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/sfu_app_new_image.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/sfu_app_new_image.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/test_protections.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/test_protections.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/test_protections.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/test_protections.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/tkms_app.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/tkms_app.h
new file mode 100644
index 00000000..da212f0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/tkms_app.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for tkms application examples.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_APP_H
+#define KMS_APP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported macros -----------------------------------------------------------*/
+#if  defined(SFU_IWDG_PROTECT_ENABLE)
+/* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register */
+#define INVOKE_SCHEDULE_NEEDS()            \
+  do {                                     \
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);  \
+  } while(0);
+#else
+#define INVOKE_SCHEDULE_NEEDS()            \
+  do {                                     \
+    ;                                      \
+  } while(0);
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+
+
+/* Exported functions ------------------------------------------------------- */
+void tkms_app_menu(void);
+void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length);
+
+CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage);
+CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage);
+CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage);
+CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pMessage);
+CK_RV tkms_app_find(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_APP_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/ymodem.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/ymodem.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Inc/ymodem.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Inc/ymodem.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..3fcb2555
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/Project.uvoptx
@@ -0,0 +1,759 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_UserApp</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>0</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>0</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_CM4.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=98,207,509,709,0)(1007=673,180,880,401,0)(1008=566,409,942,645,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>2</SubType>
+          <ItemText>0x2000A400</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+      <SystemViewers>
+        <Entry>
+          <Name>System Viewer\DBGMCU</Name>
+          <WinId>35904</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\NVIC</Name>
+          <WinId>35901</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\SCB</Name>
+          <WinId>35905</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\SYSCFG</Name>
+          <WinId>35903</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\SYSCFG_continue</Name>
+          <WinId>35902</WinId>
+        </Entry>
+      </SystemViewers>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/com.c</PathWithFileName>
+      <FilenameWithoutPath>com.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/common.c</PathWithFileName>
+      <FilenameWithoutPath>common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/fw_update_app.c</PathWithFileName>
+      <FilenameWithoutPath>fw_update_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_object_update_app.c</PathWithFileName>
+      <FilenameWithoutPath>kms_object_update_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_user_code.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_code.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/test_protections.c</PathWithFileName>
+      <FilenameWithoutPath>test_protections.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_derive_key.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_derive_key.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_encrypt_decrypt.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_encrypt_decrypt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_find.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_find.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ymodem.c</PathWithFileName>
+      <FilenameWithoutPath>ymodem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>3</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\1_Image_BFU\MDK-ARM\STM32WL55JC_Nucleo\Exe\se_interface_appli.txt</PathWithFileName>
+      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..0b7cb8ce
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/Project.uvprojx
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_UserApp</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>UserApp</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\1_Image_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED,DISABLE_IMAGE_STATE_HANDLING</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../1_Image_SECoreBin/Inc;../../1_Image_BFU/BFU/App;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>.\UserApp.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>com.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/com.c</FilePath>
+            </File>
+            <File>
+              <FileName>common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/common.c</FilePath>
+            </File>
+            <File>
+              <FileName>flash_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/flash_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>fw_update_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/fw_update_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_object_update_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_object_update_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_code.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_user_code.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>test_protections.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/test_protections.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_derive_key.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_derive_key.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_encrypt_decrypt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_encrypt_decrypt.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_find.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_find.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_sign_verify.c</FilePath>
+            </File>
+            <File>
+              <FileName>ymodem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ymodem.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_appli.txt</FileName>
+              <FileType>3</FileType>
+              <FilePath>..\..\1_Image_BFU\MDK-ARM\STM32WL55JC_Nucleo\Exe\se_interface_appli.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_1_Image_UserApp"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/UserApp.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/UserApp.sct
new file mode 100644
index 00000000..e0efa2a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/UserApp.sct
@@ -0,0 +1,29 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_1_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+  ROM_region +0 {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+; SBSFU RAM area is reused for UserApp  
+  RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE {
+  .ANY (STACK)
+  .ANY (HEAP)
+  .ANY (+RW +ZI)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/startup_stm32wl55xx_cm4.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/MDK-ARM/startup_stm32wl55xx_cm4.s
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/MDK-ARM/startup_stm32wl55xx_cm4.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..600b23f4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/.cproject
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="UserApp" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../1_Image_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;" prebuildStep="">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../1_Image_BFU/BFU/App | ../../../1_Image_BFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/UserApp.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_UserApp}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="DISABLE_IMAGE_STATE_HANDLING"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/App"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata.1159753008" name="Place data in their own sections (-fdata-sections)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1663313052" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.793375251" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs">
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/STM32CubeIDE/Debug/se_interface_app.o"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath.741843002" name="Use C math library (-Wl,--start-group -lc -lm -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/UserApp.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_UserApp.null.394363235" name="1_Image_UserApp"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/1_Image_UserApp"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/1_Image_UserApp"/>
+		</configuration>
+	</storageModule>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/.project
new file mode 100644
index 00000000..8787579a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/.project
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_UserApp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/com.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/com.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/flash_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/flash_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/fw_update_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/fw_update_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_object_update_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/kms_object_update_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_user_code.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/se_user_code.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/test_protections.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/test_protections.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_derive_key.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_derive_key.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_encrypt_decrypt.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_encrypt_decrypt.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_find.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_find.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ymodem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/ymodem.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/1_Image_BFU/STM32CubeIDE/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/Application/User/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/Application/User/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/Application/User/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/Application/User/sysmem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/Application/User/sysmem.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/Application/User/sysmem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/UserApp.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/UserApp.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/UserApp.ld
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/STM32CubeIDE/UserApp.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/com.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/com.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/com.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/com.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/common.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/common.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/common.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/common.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/flash_if.c
new file mode 100644
index 00000000..6ecbce70
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/flash_if.c
@@ -0,0 +1,361 @@
+/**
+  ******************************************************************************
+  * @file    flash_if.c
+  * @author  MCD Application Team
+  * @brief   FLASH Interface module.
+  *          This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "flash_if.h"
+#include "string.h"
+#include <stdio.h>
+
+/* Uncomment the line below if you want some debug logs */
+#define FLASH_IF_DBG
+#ifdef FLASH_IF_DBG
+#define FLASH_IF_TRACE printf
+#else
+#define FLASH_IF_TRACE(...)
+#endif /* FLASH_IF_DBG */
+
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+#define EXTERNAL_FLASH_ADDRESS    0x90000000U
+
+
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+
+
+/* Private function prototypes -----------------------------------------------*/
+static uint32_t GetPage(uint32_t uAddr);
+static HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void);
+
+/* Public functions : wrapper ---------------------------------------------------------*/
+
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_If_Init(void)
+{
+  HAL_StatusTypeDef e_ret_status = HAL_OK;
+
+  e_ret_status = FLASH_INT_Init();
+  if (e_ret_status == HAL_OK)
+  {
+    e_ret_status = FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pStart: flash address to be erased
+  * @param  uLength: number of bytes
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Erase_Size(pStart, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Erase_Size(pStart, uLength);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Write(pDestination, pSource, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Write(pDestination, pSource, uLength);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Read(pDestination, pSource, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Read(pDestination, pSource, uLength);
+  }
+}
+
+/* Public functions : internal flash --------------------------------------------------------- */
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_INT_Init(void)
+{
+  return HAL_OK;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pStart: Start of user flash area
+  * @param  uLength: number of bytes.
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  uint32_t page_error = 0U;
+  uint32_t uStart = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef x_erase_init;
+  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
+  uint32_t first_page = 0U;
+  uint32_t nb_pages = 0U;
+  uint32_t chunk_nb_pages;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = FLASH_INT_If_Clear_Error();
+
+  if (e_ret_status == HAL_OK)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = GetPage(uStart);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = GetPage(uStart + uLength - 1U) - first_page + 1U;
+      x_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        x_erase_init.Page = first_page;
+        x_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&x_erase_init, &page_error) != HAL_OK)
+        {
+          HAL_FLASH_GetError();
+          e_ret_status = HAL_ERROR;
+        }
+        /* Refresh Watchdog */
+        WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+      } while (nb_pages > 0);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      HAL_FLASH_Lock();
+
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
+  uint32_t i = 0U;
+  uint32_t pdata = (uint32_t)pSource;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = FLASH_INT_If_Clear_Error();
+
+  if (e_ret_status == HAL_OK)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() != HAL_OK)
+    {
+      return HAL_ERROR;
+
+    }
+    else
+    {
+      /* DataLength must be a multiple of 64 bit */
+      for (i = 0U; i < uLength; i += 8U)
+      {
+        /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+        be done by word */
+        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)pDestination,  *((uint64_t *)(pdata + i)))
+            == HAL_OK)
+        {
+          /* Check the written value */
+          if (*(uint64_t *)pDestination != *(uint64_t *)(pdata + i))
+          {
+            /* Flash content doesn't match SRAM content */
+            e_ret_status = HAL_ERROR;
+            break;
+          }
+          /* Increment FLASH Destination address */
+          pDestination = (void *)((uint32_t)pDestination + 8U);
+        }
+        else
+        {
+          /* Error occurred while writing data in Flash memory */
+          e_ret_status = HAL_ERROR;
+          break;
+        }
+      }
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      HAL_FLASH_Lock();
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  memcpy(pDestination, pSource, uLength);
+  return HAL_OK;
+}
+
+/* Public functions : external flash ---------------------------------------------------------*/
+
+HAL_StatusTypeDef FLASH_EXT_Init(void)
+{
+  return HAL_OK;
+}
+
+/* No external flash available on this product
+   ==> return SFU_ERROR */
+
+HAL_StatusTypeDef FLASH_EXT_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+HAL_StatusTypeDef FLASH_EXT_If_Write(void  *pDestination, const void *pSource, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+HAL_StatusTypeDef FLASH_EXT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+/* Private functions ---------------------------------------------------------*/
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      ret = HAL_OK;
+    }
+#ifdef FLASH_IF_DBG
+    else
+    {
+      FLASH_IF_TRACE("[FLASH_IF] Lock failure\r\n");
+    }
+#endif /* FLASH_IF_DBG */
+  }
+#ifdef FLASH_IF_DBG
+  else
+  {
+    FLASH_IF_TRACE("[FLASH_IF] Unlock failure\r\n");
+  }
+#endif /* FLASH_IF_DBG */
+  return ret;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+uint32_t GetPage(uint32_t Addr)
+{
+  uint32_t page = 0U;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/fw_update_app.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/fw_update_app.c
new file mode 100644
index 00000000..f29c01c3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/fw_update_app.c
@@ -0,0 +1,144 @@
+/**
+  ******************************************************************************
+  * @file    fw_update_app.c
+  * @author  MCD Application Team
+  * @brief   Firmware Update module.
+  *          This file provides set of firmware functions to manage Firmware
+  *          Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "fw_update_app.h"
+#include "se_interface_application.h"
+#include "sfu_fwimg_regions.h"
+#include "string.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#elif defined(__CC_ARM)
+#include "mapping_fwimg.h"
+#include "mapping_sbsfu.h"
+#endif /* __ARMCC_VERSION */
+#include "ymodem.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+#define ALL_SLOTS 255U                   /*!< Validate all new firmware installed in a single request */
+/* Global variables ----------------------------------------------------------*/
+
+
+/* Private function prototypes -----------------------------------------------*/
+
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Run FW Update process.
+  * @param  None
+  * @retval HAL Status.
+  */
+#if defined(EXTERNAL_LOADER)
+void FW_UPDATE_Run(void)
+{
+  /* Print Firmware Update welcome message */
+  printf("\r\n================ New Fw Download =========================\r\n\n");
+
+  /* Standalone loader communication : execution requested */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+
+  NVIC_SystemReset();
+}
+
+#else
+void FW_UPDATE_Run(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#endif
+
+
+#if defined(EXTERNAL_LOADER)
+/**
+  * @brief  Run Multiple FW Update process.
+  * @param  None
+  * @retval None.
+  */
+void FW_UPDATE_MULTIPLE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#else
+/**
+  * @brief  Run Multiple FW Update process.
+  * @param  None
+  * @retval None.
+  */
+void FW_UPDATE_MULTIPLE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#endif
+
+
+#if defined(EXTERNAL_LOADER)
+/**
+  * @brief  Run validation of a FW image menu.
+  * @param  None
+  * @retval None.
+  */
+void FW_VALIDATE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#else
+/**
+  * @brief  Run validation of a FW image menu.
+  * @param  None
+  * @retval None.
+  */
+void FW_VALIDATE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#endif
+
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/kms_object_update_app.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/kms_object_update_app.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/kms_object_update_app.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/kms_object_update_app.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/main.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/main.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/main.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/se_user_code.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/se_user_code.c
new file mode 100644
index 00000000..894f1ed6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/se_user_code.c
@@ -0,0 +1,191 @@
+/**
+  ******************************************************************************
+  * @file    se_user_code.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine User code example module.
+  *          This file demonstrates how to call user defined services running
+  *          in Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "se_user_code.h"
+#include "se_interface_application.h"
+#include "sfu_fwimg_regions.h"
+#include <string.h> /* needed for memset */
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  SE_USER_CODE Secure Engine User Code Example
+  * @brief Example of user defined code running in Secure Engine.
+  *        This code provides user defined services to the user application.
+  * @{
+  */
+
+/** @defgroup  SE_USER_CODE_Private_Variables Private Variables
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @defgroup  SE_USER_CODE_Private_Functions Private Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the SE_USER_CODE Menu choices on hyperterminal
+  * @param  None.
+  * @retval None.
+  */
+static void SE_USER_CODE_PrintMenu(void)
+{
+  printf("\r\n=== Call User Defined Code running in Secure Engine ===\r\n\n");
+  printf("  Get firmware information of SLOT_ACTIVE_1 ------------- 1\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Get FW information.
+  * @param  SlotNumber slot identification
+  * @retval HAL Status.
+  */
+static void SE_USER_CODE_GetFwInfo(uint32_t SlotNumber)
+{
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+  SE_APP_ActiveFwInfo_t sl_FwInfo;
+
+  memset(&sl_FwInfo, 0xFF, sizeof(SE_APP_ActiveFwInfo_t));
+
+
+
+  /* Get FW info */
+  se_retCode = SE_APP_GetActiveFwInfo(&se_Status, SlotNumber, &sl_FwInfo);
+
+  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+  {
+    /* Print the result */
+    printf("Firmware Info:\r\n");
+    printf("\tActiveFwVersion: %d\r\n", sl_FwInfo.ActiveFwVersion);
+    printf("\tActiveFwSize: %d bytes\r\n", sl_FwInfo.ActiveFwSize);
+  }
+  else
+  {
+    /* Failure */
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+
+}
+
+
+/**
+  * @}
+  */
+
+/** @addtogroup  SE_USER_CODE_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Run get firmware info menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+void SE_USER_CODE_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+
+  /*Print Main Menu message*/
+  SE_USER_CODE_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          if (SlotStartAdd[slot_number] == 0U)
+          {
+            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+          }
+          else
+          {
+            SE_USER_CODE_GetFwInfo(slot_number);
+          }
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (exit != 1U)
+      {
+        if (SlotStartAdd[slot_number] == 0U)
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          SE_USER_CODE_GetFwInfo(slot_number);
+        }
+
+        /*Print Main Menu message*/
+        SE_USER_CODE_PrintMenu();
+      }
+    }
+  }
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..2f44492a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/stm32wlxx_it.c
@@ -0,0 +1,220 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+#include "test_protections.h"
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+RTC_HandleTypeDef RtcHandle;
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+
+/******************************************************************************/
+/*            Cortex-M4 Processor Exceptions Handlers                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles NMI exception.
+  * @param  None
+  * @retval None
+  */
+void NMI_Handler(void)
+{
+  /* Go to infinite loop when NMI exception occurs */
+  while (1)
+  {
+    printf("NMI exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Hard Fault exception.
+  * @param  None
+  * @retval None
+  */
+void HardFault_Handler(void)
+{
+  /* Go to infinite loop when Memory Manage exception occurs */
+  while (1)
+  {
+    printf("Hard Fault exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Memory Manage exception.
+  * @param  None
+  * @retval None
+  */
+void MemManage_Handler(void)
+{
+  /* Go to infinite loop when Memory Manage exception occurs */
+  while (1)
+  {
+    printf("Memory Manage exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Bus Fault exception.
+  * @param  None
+  * @retval None
+  */
+void BusFault_Handler(void)
+{
+  /* Go to infinite loop when Bus Fault exception occurs */
+  while (1)
+  {
+    printf("Bus Fault exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Usage Fault exception.
+  * @param  None
+  * @retval None
+  */
+void UsageFault_Handler(void)
+{
+  /* Go to infinite loop when Usage Fault exception occurs */
+  while (1)
+  {
+    printf("Usage Fault exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles SVCall exception.
+  * @param  None
+  * @retval None
+  */
+void SVC_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles Debug Monitor exception.
+  * @param  None
+  * @retval None
+  */
+void DebugMon_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers             */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles Flash operation error interrupt request.
+  * @param  None
+  * @retval None
+  */
+void FLASH_IRQHandler(void)
+{
+  HAL_FLASH_IRQHandler();
+}
+
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler()
+{
+  /* Store in the handle the Internal Tamper enabled */
+  SET_BIT(RtcHandle.IsEnabled.TampFeatures, RTC_TAMPER_ID);
+
+  RtcHandle.Instance = RTC;
+  HAL_RTCEx_TamperIRQHandler(&RtcHandle);
+}
+
+void BUTTON_IRQHANDLER(void)
+{
+  HAL_GPIO_EXTI_IRQHandler(BUTTON_EXTI_LINE);
+}
+
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  if (GPIO_Pin == BUTTON_EXTI_LINE)
+  {
+    printf("\r\nUser IRQ Handler: User Button pressed\r\n");
+  }
+}
+
+/**
+  * @brief  This function handles PPP interrupt request.
+  * @param  None
+  * @retval None
+  */
+/*void PPP_IRQHandler(void)
+{
+}*/
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/system_stm32wlxx.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/system_stm32wlxx.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/system_stm32wlxx.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/test_protections.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/test_protections.c
new file mode 100644
index 00000000..38b51f1a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/test_protections.c
@@ -0,0 +1,458 @@
+/**
+  ******************************************************************************
+  * @file    test_protections.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define TEST_PROTECTIONS_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "test_protections.h"
+#include "se_def.h"
+#include "se_interface_application.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "sfu_fwimg_regions.h" /* required for corruption tests (a real user application should NOT need this file) */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup TEST_PROTECTIONS Test protections
+  * @{
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Private_Defines Private Defines
+  * @{
+  */
+
+/**
+  * @brief  Isolated enclave Test.
+  */
+/*!< Address used to test SE CODE protection*/
+#define TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS     ((uint32_t) SE_CALLGATE_REGION_ROM_START)
+/*!< Address used to test SE VDATA protection*/
+#define TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS     ((uint32_t) SE_REGION_RAM_START)
+
+/**
+  * @brief  WRP Test.
+  */
+/*!< Address used to test WRP protection */
+#define TEST_PROTECTIONS_WRP_FLASH_ADDRESS            ((uint32_t) (KMS_DATASTORAGE_START - 0x1000))
+/*!< WRP Test Size */
+#define TEST_PROTECTIONS_WRP_FLASH_SIZE               ((uint32_t)0x800U)
+
+/**
+  * @brief  IWDG Test.
+  */
+/*!< IWDG Test delay in ms (it has to be greater than what used in SB)*/
+#define TEST_PROTECTIONS_IWDG_DELAY                   ((uint32_t)10000U)
+
+/**
+  * @brief  TAMPER Test.
+  */
+#define TEST_PROTECTIONS_TAMPER_DELAY                 ((uint32_t)10U)         /*!< TAMPER Test delay in s */
+
+/**
+  * @brief  CORRUPT_IMAGE Test.
+  */
+/*!< CORRUPT_IMAGE Test: address where data will be corrupted: address of active slot + offset */
+#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(A)  ((uint32_t)(SlotStartAdd[A] \
+                                                                     +SFU_IMG_IMAGE_OFFSET))
+/*!< CORRUPT_IMAGE Test: size of data to be corrupted */
+#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE     ((uint32_t)32U)
+
+/** @defgroup  TEST_PROTECTIONS_Private_Variables Private Variables
+  * @{
+  */
+static uint8_t uRead_WRP[TEST_PROTECTIONS_WRP_FLASH_SIZE]; /*!< RTC handler used for TAMPER Test  */
+static uint32_t m_uTamperEvent = 0U;                /*!< Tamper Event */
+
+/** @defgroup  TEST_PROTECTIONS_Private_Functions Private Functions
+  * @{
+  */
+static void TEST_PROTECTIONS_RunWRP(void);
+static void TEST_PROTECTIONS_RunTAMPER(void);
+static void TEST_PROTECTIONS_RunIWDG(void);
+static void TEST_PROTECTIONS_CORRUPT_RunMenu(void);
+static void TEST_PROTECTIONS_PrintTestingMenu(void);
+/**
+  * @}
+  */
+
+
+
+
+/** @defgroup  TEST_PROTECTIONS_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void TEST_PROTECTIONS_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint8_t exit = 0U;
+
+  /* Print Main Menu message */
+  TEST_PROTECTIONS_PrintTestingMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
+       reload register*/
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          TEST_PROTECTIONS_CORRUPT_RunMenu();
+          break;
+        case '2' :
+          TEST_PROTECTIONS_RunWRP();
+          break;
+        case '3' :
+          TEST_PROTECTIONS_RunIWDG();
+          break;
+        case '4' :
+          TEST_PROTECTIONS_RunTAMPER();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+      /*Print Main Menu message*/
+      TEST_PROTECTIONS_PrintTestingMenu();
+    }
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup  TEST_PROTECTIONS_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_PrintTestingMenu(void)
+{
+  printf("\r\n=================== Test Menu ============================\r\n\n");
+  printf("  Test : CORRUPT ACTIVE IMAGE --------------------------- 1\r\n\n");
+  printf("  Test Protection: WRP ---------------------------------- 2\r\n\n");
+  printf("  Test Protection: IWDG --------------------------------- 3\r\n\n");
+  printf("  Test Protection: TAMPER ------------------------------- 4\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+
+/**
+  * @brief  TEST Run WRP
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunWRP(void)
+{
+  uint32_t i = 0U;
+  uint32_t address = 0U;
+
+  printf("\r\n====== Test Protection: WRP ===========================\r\n\n");
+
+  address = TEST_PROTECTIONS_WRP_FLASH_ADDRESS;
+
+  /* 1 - Read Page to be used for restoring*/
+  printf("  -- Reading 0x%x bytes at address: 0x%x (for backup)\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
+         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+  for (i = 0U; i < TEST_PROTECTIONS_WRP_FLASH_SIZE; i++)
+  {
+    uRead_WRP[i] = *((uint8_t *)(address + i));
+  }
+
+  /* 2 - Erasing page */
+  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
+         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+  /* Check that it is not allowed to erase this page */
+  if (FLASH_If_Erase_Size((void *)address, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
+  {
+    /* Error returned during programmation. */
+    /* Check that WRPERR flag is set */
+    if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
+    {
+      printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
+    }
+  }
+  else
+  {
+    /* 3 - Writing Data previously read*/
+    if (FLASH_If_Write((void *)address, uRead_WRP, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
+    {
+      /* Error returned during programmation. */
+      printf("-- !! HAL_FLASH_ERROR: FLASH Write error\r\n\n");
+
+      /* Check that WRPERR flag is set */
+      if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
+      {
+        printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
+      }
+    }
+    else
+    {
+      printf("  -- Written successfully at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+      /*No Errors detected means WRP was not enabled*/
+      printf("  -- !! WRP protection is NOT ENABLED !!\r\n\n");
+    }
+  }
+}
+
+/**
+  * @brief  TEST Run CORRUPT_IMAGE
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunCORRUPT(uint32_t slot_number)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  uint8_t pattern[TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE] = {0};
+
+  /* On this series, there is no MPU to disable to allow flash corruption. */
+
+  /* Erase first sector of active slot */
+  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n", TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE,
+         TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number));
+  printf("  -- At next boot Signature Verification will fail. Download a new FW to restore FW image !!\r\n\n");
+
+  /* On this series, the memory corruption is performed by writing again the flash (but not header).
+     The header is preserved for anti-rollback check. */
+  ret = FLASH_If_Write((void *)(TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number)), (void *) &pattern,
+                       TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE);
+
+  /* This code may not be reached, due to the memory corruption performed.
+     In this case, the execution will probably trig hard fault exception (while (1)),
+     then watchdog reset. */
+  if (ret == HAL_OK)
+  {
+    NVIC_SystemReset();
+  }
+  else
+  {
+    printf("-- !! HAL_FLASH_ERROR_CORRUPT_IMAGE: erasing failure ...\r\n\n");
+  }
+}
+
+/**
+  * @brief  Display the corruption menu
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_CORRUPT_PrintMenu(void)
+{
+  printf("\r\n============  Test: CORRUPT ACTIVE IMAGE ============\r\n\n");
+  printf("  Corrupt image from SLOT_ACTIVE_1 ---------------------- 1\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Run get firmware info menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+static void TEST_PROTECTIONS_CORRUPT_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+
+  /*Print Main Menu message*/
+  TEST_PROTECTIONS_CORRUPT_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (exit != 1U)
+      {
+        if (SlotStartAdd[slot_number] == 0U)
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          TEST_PROTECTIONS_RunCORRUPT(slot_number);
+        }
+
+        /*Print Main Menu message*/
+        TEST_PROTECTIONS_CORRUPT_PrintMenu();
+      }
+    }
+  }
+}
+
+
+/**
+  * @brief  TEST Run TAMPER
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunTAMPER(void)
+{
+  uint32_t i = 0U;
+  m_uTamperEvent = 0U;
+
+  printf("\r\n====== Test Protection: TAMPER ========================\r\n\n");
+  /* Print instructions*/
+  printf("  -- Pull PC13 (CN7.23) to GND \r\n\n");
+  printf("  -- -- Note: sometimes it may be enough to put your finger close to PC13 (CN7.23)\r\n\n");
+  printf("  -- Should reset if TAMPER is enabled. \r\n\n");
+  printf("  Waiting for 10 seconds...\r\n\n")  ;
+
+  /* #2 - Wait 10 seconds*/
+  while ((i < TEST_PROTECTIONS_TAMPER_DELAY) && (m_uTamperEvent == 0U))
+  {
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register
+     */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+    HAL_Delay(1000U);
+    i++;
+  }
+  if (m_uTamperEvent == 0U)
+  {
+    printf("\r\n\n  -- Waited 10 seconds, if you have connected TAMPER pin to GND it means TAMPER protection ");
+    printf("is NOT ENABLED !! \r\n\n");
+  }
+  else
+  {
+    printf("\r\n\n  -- TAMPER Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  TEST Run IWDG
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunIWDG(void)
+{
+  printf("\r\n====== Test Protection: IWDG ===========================\r\n\n");
+
+  /* Wait for TEST_PROTECTIONS_IWDG_DELAY*/
+  printf("  -- Waiting %d (ms). Should reset if IWDG is enabled. \r\n\n", TEST_PROTECTIONS_IWDG_DELAY);
+
+  HAL_Delay(TEST_PROTECTIONS_IWDG_DELAY);
+
+  /* No Reset means IWDG was not enabled*/
+  printf("  -- !! IWDG protection is NOT ENABLED !!\r\n\n");
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup TEST_PROTECTIONS_Callback_Functions Callback Functions
+  * @{
+  */
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void CALLBACK_Antitamper(void)
+{
+  /*Set tamper event variable*/
+  m_uTamperEvent = 1U;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app.c
new file mode 100644
index 00000000..50a2847b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app.c
@@ -0,0 +1,207 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app.c
+  * @author  MCD Application Team
+  * @brief   tKMS application examples module.
+  *          This file provides examples of KMS API usages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+extern void KMS_UPDATE_StartLocalUpdate(void);  /* Function to perform Ymodem download of blob image to import */
+
+static void tkms_app_print_menu(void)
+{
+  (void)printf("\r\n======================= tKMS Examples Menu ===========================\r\n\n");
+  (void)printf("  (*) Requires execution of 'Import Blob' test (3) prior to execute this one\r\n\n");
+  (void)printf("  TKMS - Test All (*)                               --------------------- 0\r\n\n");
+  (void)printf("  TKMS - Tests AES-GCM Embedded key                 --------------------- 1\r\n\n");
+  (void)printf("  TKMS - Tests AES-CBC Embedded key                 --------------------- 2\r\n\n");
+  (void)printf("  TKMS - Import blob                                --------------------- 3\r\n\n");
+  (void)printf("  TKMS - Tests RSA Static key (*)                   --------------------- 4\r\n\n");
+  (void)printf("  TKMS - Tests Derive Static key (*)                --------------------- 5\r\n\n");
+  (void)printf("  TKMS - Tests key finding                          --------------------- 6\r\n\n");
+  (void)printf("  Exit tKMS Examples Menu                           --------------------- x\r\n\n");
+}
+
+void tkms_app_menu(void)
+{
+  uint8_t key;
+  uint8_t exit = 0U;
+  CK_RV ret_status;
+  uint8_t tests_executed; /* Tests executed count */
+  uint8_t tests_success;  /* Tests success count */
+  uint8_t clear_buffer[128] = "STM32 Key Management Services - Example buffer"; /* Clear text test buffer */
+
+  /* Initialize tKMS for subsequent usage */
+  ret_status = C_Initialize(NULL);
+  if (ret_status != CKR_OK)
+  {
+    (void)printf("tKMS initialization failed\r\n");
+    exit = 1;
+  }
+  else
+  {
+    tkms_app_print_menu();
+  }
+
+  while (exit == 0U)  /* Till user request to exit this menu, loop on it */
+  {
+    key = 0U;
+
+    INVOKE_SCHEDULE_NEEDS();
+
+    /* Clean the user input path */
+    (void)COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)  /* User pressed key */
+      {
+        case '0' :
+          /*
+           * Execute the whole supported tests in sequence
+           * For each test:
+           * - call INVOKE_SCHEDULE_NEEDS to rewarm WDG
+           * - check results and report test status
+           * At the end, global result is provided
+           */
+          tests_executed = 0U;
+          tests_success = 0U;
+          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
+          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
+          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_find();
+          (void)printf("Find key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          /* Report final status */
+          if (tests_success == tests_executed)
+          {
+            (void)printf("CUMULATIVE RESULT: ALL TESTS PASSED\r\n");
+          }
+          else
+          {
+            (void)printf("CUMULATIVE RESULT: %d/%d success\r\n", tests_success, tests_executed);
+          }
+          tkms_app_print_menu();
+          break;
+
+        /* 1 = TKMS - Tests AES-GCM Embedded key */
+        case '1' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 2 = Tests AES-CBC Embedded key */
+        case '2' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 3 = Import Blob */
+        case '3':
+          INVOKE_SCHEDULE_NEEDS();
+          KMS_UPDATE_StartLocalUpdate();
+          tkms_app_print_menu();
+          break;
+        /* 4 = Tests RSA Static key (requires blob import) */
+        case '4' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
+          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 5 = Tests Key derivation (requires blob import) */
+        case '5':
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
+          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 6 = Tests Key finding */
+        case '6':
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_find();
+          (void)printf("Find key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        case 'x':
+          exit = 1;
+          break;
+
+        default:
+          (void)printf("Invalid Number !\r");
+          tkms_app_print_menu();
+          break;
+      }
+    }
+  }
+
+  /* Finalize tKMS since no more in use */
+  ret_status = C_Finalize(NULL);
+  if (ret_status != CKR_OK)
+  {
+    (void)printf("tKMS finalization failed\r\n");
+  }
+}
+
+/*
+ * Utilities to format buffer in string for display in traces
+ */
+void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length)
+{
+  uint8_t ascii[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+  uint8_t *ptmp = pstr;
+  uint8_t *ptmp2 = pbuff;
+  for (uint32_t i = 0UL; i < length; i += 1UL)
+  {
+    *ptmp = ascii[*ptmp2 >> 4];
+    ptmp++;
+    *ptmp = ascii[*ptmp2 & 0x0FUL];
+    ptmp++;
+    ptmp2++;
+  }
+  *ptmp = 0U;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_derive_key.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_derive_key.c
new file mode 100644
index 00000000..6d6e7ebb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_derive_key.c
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_derive_key.c
+  * @author  MCD Application Team
+  * @brief   tKMS application examples module.
+  *          This file provides examples of KMS API usage to derivate a key
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define EC_POINT_MAX_LEN          (3U + (2U * 32U))   /* EC Point Max Length : X962 header + DER header +
+                                                         NIST-P256 *2 - > (0x04|LEN|0x04|X|Y) */
+#define DH_SECRET_X_MAX_LEN       (32U)               /* DH Secret X Max Length */
+
+/* Private structures --------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+
+
+/**
+  * @brief  Key derivation
+  *         This example is showing how to use key derivation to create
+  *         a specific session key.
+  * @note
+  *     Key derivation shared information between emitter and receiver
+  *       - Secret derivation Key: stored in KMS under
+  *                  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE object handle
+  *       - Session key variation: transmitted or calculated by both emitter & receiver
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pClearMessage)
+{
+  uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
+  uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
+  /* Generated key template definition */
+  CK_ULONG DeriveKey_template_class = CKO_SECRET_KEY;
+  CK_ULONG DeriveKey_template_destroyable = CK_TRUE;
+  CK_ULONG DeriveKey_template_encrypt = CK_TRUE;
+  CK_ULONG DeriveKey_template_decrypt = CK_TRUE;
+  CK_ULONG DeriveKey_template_extract = CK_TRUE;
+  CK_ATTRIBUTE DeriveKey_template[] =
+  {
+    {CKA_CLASS, (CK_VOID_PTR) &DeriveKey_template_class,       sizeof(CK_ULONG)},
+    {CKA_DESTROYABLE, (CK_VOID_PTR) &DeriveKey_template_destroyable, sizeof(CK_ULONG)},
+    {CKA_ENCRYPT, (CK_VOID_PTR) &DeriveKey_template_encrypt,     sizeof(CK_ULONG)},
+    {CKA_DECRYPT, (CK_VOID_PTR) &DeriveKey_template_decrypt,     sizeof(CK_ULONG)},
+    {CKA_EXTRACTABLE, (CK_VOID_PTR) &DeriveKey_template_extract,     sizeof(CK_ULONG)}
+  };
+  /* Template to retrieve generate key value */
+  CK_ATTRIBUTE GetKey_template[] = {{CKA_VALUE, (CK_VOID_PTR) &DeriveKey_template_class, 32UL}};
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  /* Key derivation */
+  uint8_t session_variant[32] = "My session variation 0122004578";
+  CK_MECHANISM      mech = {CKM_AES_ECB_ENCRYPT_DATA, session_variant, 32};
+  CK_OBJECT_HANDLE  derivedKeyHdle = 0UL;
+  uint8_t derivedKey[32] = {0};
+  /* AES encryption / decryption */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)cbc_iv, sizeof(cbc_iv) };
+  uint8_t tag[16] = {0};
+  uint32_t tag_lenth;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Derive key with pass phrase */
+  if (rv == CKR_OK)
+  {
+    rv = C_DeriveKey(session, &(mech), (CK_OBJECT_HANDLE)KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE,
+                     &DeriveKey_template[0], sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derivedKeyHdle);
+  }
+
+  /* Get derived key to display */
+  if (rv == CKR_OK)
+  {
+    GetKey_template[0].pValue = derivedKey;
+    rv = C_GetAttributeValue(session, derivedKeyHdle, &(GetKey_template[0]), sizeof(GetKey_template) /
+                             sizeof(CK_ATTRIBUTE));
+  }
+  if (rv == CKR_OK)
+  {
+    (void)printf("--- Derivating key --------------------------------------------\r\n");
+    (void)printf("--- AES ECB\r\n");
+    (void)printf("--- Pass phrase   [%s]\r\n", session_variant);
+    tkms_buff2str(derivedKey, a_string, 32);
+    (void)printf("--- Derived key   [%s]\r\n", a_string);
+  }
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES CBC\r\n");
+  (void)printf("--- IV      [%s]\r\n", cbc_iv);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Remove key once no more needed */
+  if (rv == CKR_OK)
+  {
+    rv = C_DestroyObject(session, derivedKeyHdle);
+  }
+
+  /* Verify key is no more usable */
+  if (rv == CKR_OK)
+  {
+    if (C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle) == CKR_OK)
+    {
+      rv = CKR_FUNCTION_FAILED;
+    }
+  }
+
+  /* Close sessions */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c
new file mode 100644
index 00000000..5692f717
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c
@@ -0,0 +1,293 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_encrypt_decrypt.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to encrypt & decrypt
+  *          messages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines ---------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+static uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
+static uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
+
+/**
+  * @brief  AES GCM 128 Bits
+  *         This example is showing how to use AES GCM encryption/decryption to
+  *         authenticate and protect a message.
+  * @note
+  *     Shared information between emitter and receiver
+  *       - Secret encryption/decryption Key: stored in KMS under
+  *                        KMS_KEY_AES128_OBJECT_HANDLE object handle
+  *       - Encrypted message: transmitted from emitter to sender
+  *       - Initialization Vector: transmitted from emitter to sender
+  *       - Message Header: transmitted from emitter to sender
+  *       - Authentication Tag: transmitted from emitter to sender
+  *                      (calculated during encryption, verified during decryption)
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t tag[16] = {0};  /* 128 bits tag size */
+  uint32_t tag_lenth = 0UL;
+
+  /* AES GCM Configuration variables */
+  uint8_t gcm_iv[12] = ">GCM VECTOR";
+  uint8_t gcm_header[16] = ">AES GCM Header";
+  /* Prepare GCM mechanism */
+  CK_GCM_PARAMS gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    sizeof(gcm_iv),
+    (CK_BYTE_PTR)gcm_header,
+    sizeof(gcm_header),
+    128   /* Tag length in Bits */
+  };
+  CK_MECHANISM aes_gcm_mechanism = { CKM_AES_GCM, (CK_VOID_PTR *)(uint32_t) &gcm_params, sizeof(gcm_params) };
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES GCM\r\n");
+  (void)printf("--- IV      [%s]\r\n", gcm_iv);
+  (void)printf("--- Header  [%s]\r\n", gcm_header);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+  tkms_buff2str(tag, a_string, tag_lenth);
+  (void)printf("--- Tag     [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  if (rv == CKR_OK)
+  {
+    (void)printf(">>> Decrypted message authenticated\r\n");
+  }
+  else
+  {
+    (void)printf("XXX Decrypted message not authenticated\r\n");
+  }
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)     /* Tag verification done into C_DecryptFinal, thus tag check reflected into rv */
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/**
+  * @brief  AES CBC 256 Bits
+  *         This example is showing how to use AES CBC encryption/decryption to
+  *         protect a message.
+  * @note
+  *     CBC shared information between emitter and receiver
+  *       - Secret encryption/decryption Key: stored in KMS under
+  *                             KMS_KEY_AESC256_OBJECT_HANDLE object handle
+  *       - Encrypted message: transmitted from emitter to sender
+  *       - Initialization Vector: transmitted from emitter to sender
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t tag[16] = {0};
+  uint32_t tag_lenth;
+
+  /* AES CBC Configuration variables */
+  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)(uint32_t)cbc_iv, sizeof(cbc_iv) };
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES CBC\r\n");
+  (void)printf("--- IV      [%s]\r\n", cbc_iv);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES CBC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES CBC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth); /* In case of AES CBC, no tag comparison is done */
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_find.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_find.c
new file mode 100644
index 00000000..6241319d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_find.c
@@ -0,0 +1,96 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_find.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to find
+  *          objects.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_KEY_AES128 "USERCRYP128"
+#define TEST_KEY_AES256 "USERCRYP256"
+/* Private variables ---------------------------------------------------------*/
+
+/**
+  * @brief  Object search
+  *         This example is showing how to find an object.
+  * @param  None
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_find(void)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_ATTRIBUTE object_template;
+  CK_OBJECT_HANDLE object_handle;
+  CK_ULONG count;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Fill in the template with the attribute to retrieve the specific key
+  (CKA_LABEL is used to refer to a specific object) */
+  object_template.type = CKA_LABEL;
+  object_template.pValue = TEST_KEY_AES128;
+  object_template.ulValueLen = sizeof(TEST_KEY_AES128);
+
+  (void)printf("--- Find Object -----------------------------------------------------\r\n");
+  (void)printf("--- Label [%s]\r\n", (uint8_t *)object_template.pValue);
+
+  /* Find Objects Init : template of the object to retrieve is passed to KMS */
+  if (rv == CKR_OK)
+  {
+    rv = C_FindObjectsInit(session, (CK_ATTRIBUTE_PTR)&object_template, 1);
+  }
+
+  /* Find Objects : Find object corresponding to the template specified in FindObjectsInit */
+  if (rv == CKR_OK)
+  {
+    count = 1;
+    rv = C_FindObjects(session, &object_handle, 1, &count);
+  }
+
+  /* Find Objects Final: Finalize the operation */
+  if (rv == CKR_OK)
+  {
+    rv = C_FindObjectsFinal(session);
+  }
+
+  if (rv == CKR_OK)
+  {
+    (void)printf("--- Object Found ------------------------------------------------\r\n");
+    (void)printf("--- Object Handle [%d]\r\n", object_handle);
+  }
+  else
+  {
+    printf("--- Object Not Found --------------------------------------------\r\n");
+  }
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_sign_verify.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_sign_verify.c
new file mode 100644
index 00000000..c4a0c8aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/tkms_app_sign_verify.c
@@ -0,0 +1,123 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_sign_verify.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to sign & verify
+  *          messages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+static uint8_t signature[2048 / 8] __attribute__((aligned(8))) = {0};
+
+
+/**
+  * @brief  RSA 1024 Bits
+  *         This example is showing how to use RSA signature to
+  *         authenticate a message.
+  * @note
+  *     RSA shared information between emitter and receiver
+  *       - Secret signature/verification Key: stored in KMS under
+  *         KMS_KEY_RSA2048_OBJECT_HANDLE object handle
+  *       - Message to authenticate: transmitted from emitter to sender
+  *       - Signature: transmitted from emitter to sender
+  *             (calculated by emitter, verified by receiver)
+  * @param  length  Length of the clear text for signature/verification tests
+  * @param  pMessage  Clear text for signature/verification tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage)
+{
+
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t signature_length = 0UL;
+
+  /* Prepare RSA mechanism */
+  CK_MECHANISM rsa_mechanism = { CKM_SHA256_RSA_PKCS, (CK_VOID_PTR *) NULL, 0};
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Signature --------------------------------------------------------------*/
+  (void)printf("--- Signing -----------------------------------------------------\r\n");
+  (void)printf("--- RSA 1024 bits\r\n");
+  (void)printf("--- Message [%s]\r\n", pMessage);
+  tkms_buff2str(pMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to sign message using RSA with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_SignInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
+  }
+
+  /* Sign message */
+  if (rv == CKR_OK)
+  {
+    signature_length = sizeof(signature);
+    rv = C_Sign(session, pMessage, length,
+                signature, &signature_length);
+  }
+
+  (void)printf("--- Signed ------------------------------------------------------\r\n");
+  tkms_buff2str(signature, a_string, signature_length);
+  (void)printf("--- Signature [0x%s]\r\n", a_string);
+  (void)printf("--- Length    [%d]\r\n", signature_length);
+
+  /* Verification ------------------------------------------------------------*/
+
+  /* Configure session to verify message using RSA with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_VerifyInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
+  }
+
+  /* Verify message */
+  if (rv == CKR_OK)
+  {
+    rv = C_Verify(session, pMessage, length,
+                  signature, signature_length);
+  }
+
+  if (rv == CKR_OK)
+  {
+    (void)printf(">>> Message authenticated\r\n");
+  }
+  else
+  {
+    (void)printf("XXX Message not authenticated\r\n");
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/ymodem.c b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/ymodem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/Src/ymodem.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/Src/ymodem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/readme.txt
new file mode 100644
index 00000000..3aaad43b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/1_Image_UserApp/readme.txt
@@ -0,0 +1,136 @@
+/**
+  @page 1_Image_UserApp / Firmware Update - User Application Demo
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows a User Application
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application demonstrates firmware download capabilities and provides a set of functions to test the active
+protections offered by Secure Boot and Secure Engine.
+It also demonstrates key management services through basic examples and specific boot
+mechanism (firmware update decryption, verification...)
+A terminal connected with the board via VCOM is needed to communicate with the board and to select which feature
+to demonstrate.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from
+the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 1_Image_UserApp/Src/com.c                    Communication module file
+   - 1_Image_UserApp/Src/common.c                 Common module file
+   - 1_Image_UserApp/Src/flash_if.c               Flash interface file
+   - 1_Image_UserApp/Src/fw_update_app.c          Firmware update application
+   - 1_Image_UserApp/Src/kms_object_update_app.c  KMS Blob update application
+   - 1_Image_UserApp/Src/main.c                   Main program
+   - 1_Image_UserApp/Src/se_user_code.c           Call user defined services running in Secure Engine
+   - 1_Image_UserApp/Src/stm32wlxx_it.c           Interrupt handlers
+   - 1_Image_UserApp/Src/system_stm32wlxx.c       STM32 system file
+   - 1_Image_UserApp/Src/test_protections.c       Protection test
+   - 1_Image_UserApp/Src/tkms_app.c               tKMS tests
+   - 1_Image_UserApp/Src/tkms_app_derive_key.c    tKMS key derivation tests
+   - 1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c tKMS encryption/decryption tests
+   - 1_Image_UserApp/Src/tkms_app_sign_verify.c   tKMS signature/verification tests
+   - 1_Image_UserApp/Src/ymodem.c                 Ymodem communication module
+   - 1_Image_UserApp/Inc/com.h                    Header for com.c file
+   - 1_Image_UserApp/Inc/common.h                 Header for common.c file
+   - 1_Image_UserApp/Inc/flash_if.h               Header for flash_if.c file
+   - 1_Image_UserApp/Inc/fw_update_app.h          Header for fw_update_app.c file
+   - 1_Image_UserApp/Inc/main.h                   Header for main.c file
+   - 1_Image_UserApp/Inc/se_user_code.h           Header file for se_user_code.c
+   - 1_Image_UserApp/Inc/sfu_app_new_image.h      Definition for the new blob storage and installation
+   - 1_Image_UserApp/Inc/stm32wlxx_hal_conf.h     HAL configuration file
+   - 1_Image_UserApp/Inc/stm32wlxx_it.h           Header for stm32wlxx_it.c file
+   - 1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h  BSP configuration file
+   - 1_Image_UserApp/Inc/test_protections.h       Header for test_protections.c file
+   - 1_Image_UserApp/Inc/tkms_app.h               Header for tkms_app.c file
+   - 1_Image_UserApp/Inc/ymodem.h                 Header for ymodem.c file
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices.
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
+    is a feature provided by STM32Cube programmer available on www.st.com.
+  - This example is based on se_interface_application.o module exported by BFU project.
+  - This example needs a terminal emulator.
+  - Microsoft Windows has a limitation whereby paths to files and directories cannot
+    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
+    shell scripts) to fail reading from or writing to such files.
+    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
+    up a local drive out of an existing directory on the hard drive, such as:
+    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par IDE postbuild script
+
+In order to ease the development process, a postbuild script ("postbuild.bat") is integrated in each IDE project.
+This postbuild script:
+ - is generated when compiling the Secure Engine Core project,
+ - prepares the firmware image of the user application to be installed in the device.
+
+A known limitation of this integration occurs when you update the firmware version (parameter of postbuild.bat script).
+The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+Refer to BFU readme and follow steps by steps instructions.
+
+Once executed, this user application gives access to a menu which allows:
+  1 - to download a new firmware : feature not supported in 1 firmware image example
+  2 - to test protections (WRP, IWDG, TAMPER)
+  3 - to demonstrate how to call user defined services running in Secure Engine
+  4 - to provide access to multiple images feature (not supported)
+  5 - to validate a firmware image at first start-up (not supported)
+  a - to demonstrate usage of key management services
+
+1. Pressing 1 allows to download a new firmware.
+Feature not supported in 1 firmware image example
+
+2. Pressing 2 allows to test protections.
+
+ - CORRUPT IMAGE test (#1): causes a signature verification failure at next boot
+ - WRP test (#2): causes an error trying to erase write protected code
+ - IWDG test (#3): causes a reset simulating a deadlock by not refreshing the watchdog
+ - TAMPER test (#4): causes a reset if a tamper event is detected. In order to generate a tamper event,
+   user has to connect PC13 (CN7.23) to GND (It may be enough to put your finger close to PC13 (CN7.23)).
+
+3. Pressing 3 allows to call user defined services running in Secure Engine.
+As an example, after selecting the firmware image, SE_APP_GetActiveFwInfo service is called in order
+to display the information located in the protected area such as version and size.
+
+4. This menu is dedicated to multiple images feature.
+Feature not available as there is no firmware download area.
+
+5. This menu is dedicated to image validation.
+Feature available under ENABLE_IMAGE_STATE_HANDLING compilation switch, not available in this example.
+
+a. Pressing a allows to enter specific key management services test menu.
+With this menu, you should be able to try encryption/decryption, signature/verification or key derivation mechanisms.
+
+
+Note1 : There is only 1 active slot configured in this example.
+Note2 : for Linux users Minicom can be used but to do so you need to compile the UserApp project with the MINICOM_YMODEM
+        switch enabled (ymodem.h)
+
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_export.h
new file mode 100644
index 00000000..fbe0d145
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_export.h
@@ -0,0 +1,100 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t __ICFEDIT_intvec_start__;
+#define INTVECT_START ((uint32_t)& __ICFEDIT_intvec_start__)
+extern uint32_t __ICFEDIT_SE_Startup_region_ROM_start__;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Startup_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_start__;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_end__;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_start__;
+#define SE_IF_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_end__;
+#define SE_IF_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_start__;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_end__;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_CallGate_region_ROM_start__;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_CallGate_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_start__;
+#define SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_end__;
+#define SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_start__;
+#define SE_REGION_RAM_START ((uint32_t)& __ICFEDIT_SE_region_RAM_start__)
+extern uint32_t __ICFEDIT_SE_region_RAM_end__ ;
+#define SE_REGION_RAM_END ((uint32_t)& __ICFEDIT_SE_region_RAM_end__)
+extern uint32_t __ICFEDIT_SB_region_RAM_start__ ;
+#define SB_REGION_RAM_START ((uint32_t)& __ICFEDIT_SB_region_RAM_start__)
+extern uint32_t __ICFEDIT_SB_region_RAM_end__ ;
+#define SB_REGION_RAM_END ((uint32_t)& __ICFEDIT_SB_region_RAM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_stack_top__;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& __ICFEDIT_SE_region_RAM_stack_top__)
+
+extern uint32_t __ICFEDIT_KMS_DataStorage_start__ ;
+#define KMS_DATASTORAGE_START ((uint32_t)& __ICFEDIT_KMS_DataStorage_start__)
+extern uint32_t __ICFEDIT_KMS_DataStorage_end__ ;
+#define KMS_DATASTORAGE_END ((uint32_t)& __ICFEDIT_KMS_DataStorage_end__)
+
+
+#if defined (__ICCARM__) || defined(__GNUC__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_header__;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_1_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_start__;
+#define SLOT_ACTIVE_1_START ((uint32_t)& __ICFEDIT_SLOT_Active_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_end__;
+#define SLOT_ACTIVE_1_END ((uint32_t)& __ICFEDIT_SLOT_Active_1_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_header__;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_2_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_start__;
+#define SLOT_ACTIVE_2_START ((uint32_t)& __ICFEDIT_SLOT_Active_2_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_end__;
+#define SLOT_ACTIVE_2_END ((uint32_t)& __ICFEDIT_SLOT_Active_2_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_header__;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_3_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_start__;
+#define SLOT_ACTIVE_3_START ((uint32_t)& __ICFEDIT_SLOT_Active_3_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_end__;
+#define SLOT_ACTIVE_3_END ((uint32_t)& __ICFEDIT_SLOT_Active_3_end__)
+extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_start__;
+#define SLOT_BLOB_DWL_1_START ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_end__;
+#define SLOT_BLOB_DWL_1_END ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_end__)
+#endif /* __ICCARM__ || __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_fwimg.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_fwimg.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_fwimg.icf
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_fwimg.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_fwimg_sec.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_fwimg_sec.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_fwimg_sec.icf
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_fwimg_sec.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_sbsfu.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_sbsfu.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_sbsfu.icf
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_sbsfu.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_sbsfu_sec.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_sbsfu_sec.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/EWARM/mapping_sbsfu_sec.icf
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/EWARM/mapping_sbsfu_sec.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_fwimg.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_fwimg.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_fwimg.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_fwimg.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_fwimg_sec.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_fwimg_sec.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_fwimg_sec.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_fwimg_sec.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_sbsfu.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_sbsfu.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_sbsfu.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_sbsfu.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_sbsfu_sec.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_sbsfu_sec.h
similarity index 99%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_sbsfu_sec.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_sbsfu_sec.h
index 831ee903..d1d04427 100644
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/MDK-ARM/mapping_sbsfu_sec.h
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/MDK-ARM/mapping_sbsfu_sec.h
@@ -36,7 +36,7 @@
 
 /* SE Embedded Keys */
 #define SE_KEY_REGION_ROM_START         (SE_CALLGATE_REGION_ROM_END + 0x1)
-#define SE_KEY_REGION_ROM_END           (SE_KEY_REGION_ROM_START + 0x2FF)
+#define SE_KEY_REGION_ROM_END           (SE_KEY_REGION_ROM_START + 0x1FF)
 
 /* SE Startup                               */
 #define SE_STARTUP_REGION_ROM_START     (SE_KEY_REGION_ROM_END + 1)
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_export.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_export.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_export.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_fwimg.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_fwimg_sec.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_fwimg_sec.ld
similarity index 80%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_fwimg_sec.ld
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_fwimg_sec.ld
index fa7b4e36..55ea444a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_fwimg_sec.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_fwimg_sec.ld
@@ -5,13 +5,13 @@
 /* Slots must be aligned on sector size */
 
 /* Active slot #1 (194 kbytes) */
-SLOT_Active_1_start  = 0x0800F800;  
+SLOT_Active_1_start  = 0x08010800;
 SLOT_Active_1_end    = 0x0803FFFF;
 SLOT_Active_1_header = SLOT_Active_1_start;
 
 /* Dwl slot #1 : (2 kbytes) */
-SLOT_Blob_Dwl_1_start = 0x0800F000;  
-SLOT_Blob_Dwl_1_end   = 0x0800F7FF;
+SLOT_Blob_Dwl_1_start = 0x08010000;
+SLOT_Blob_Dwl_1_end   = 0x080107FF;
 
 /* Slots not configured */
 SLOT_Active_2_header = 0x00000000;
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
new file mode 100644
index 00000000..29efab53
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
@@ -0,0 +1,85 @@
+/*
+** LinkerScript
+*/
+
+/******************************************************************************/
+/*                               ROM section                                  */
+/******************************************************************************/
+
+/* Vector table */
+INTVECT_start                  = 0x08000000;
+Vector_size                    = 0x200;
+
+/* SE Code region protected by MPU isolation */
+SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start; /* No need to do +4 as we have dummy bytes in SE_CoreBin .ld file */
+SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
+
+/* SE Embedded Keys */
+SE_Key_region_ROM_start        = SE_CallGate_region_ROM_end + 0x1;
+SE_Key_region_ROM_end          = SE_Key_region_ROM_start + 0x1FF;
+
+/* SE Startup */
+SE_Startup_region_ROM_start    = SE_Key_region_ROM_end + 0x1;
+SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
+SE_Code_region_ROM_end         = SE_Startup_region_ROM_start + 0x73FF;
+
+/* SE IF ROM */
+SE_IF_region_ROM_start         = SE_Code_region_ROM_end + 0x1; 
+SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0xEFF;
+
+/* SBSFU Code region */
+SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
+SB_region_ROM_end              = 0x0800CFFF;
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+KMS_DataStorage_start          = 0x0800D000;
+KMS_DataStorage_end            = 0x0800EFFF;
+
+/* ROM regions size definition */
+SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
+SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
+SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
+SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
+SE_Code_NoKey_region_ROM_size  = SE_Code_region_ROM_end - SE_Code_NoKey_region_ROM_start + 0x1;
+SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
+SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
+KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* SE RAM region */
+SE_region_RAM_start            = 0x20000000;
+SE_region_RAM_stack_top        = 0x20000C00;                /* Secure Engine's private stack */
+SE_region_RAM_end              = 0x200033FF;
+
+/* SBSFU RAM region */
+SB_region_RAM_start            = SE_region_RAM_end + 0x1;
+SB_region_RAM_end              = 0x20007FFF;
+
+/* RAM regions size definition */
+SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
+SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM/ROM regions                               */
+/*                                                                            */
+/******************************************************************************/
+
+MEMORY
+{
+ INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
+ SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
+ SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
+ SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
+ SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
+ SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
+ SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
+ SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
+ SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
+ SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_sbsfu_sec.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_sbsfu_sec.ld
similarity index 92%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_sbsfu_sec.ld
rename to Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_sbsfu_sec.ld
index 3c0a9a2b..66bd9215 100644
--- a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/Linker_Common/STM32CubeIDE/mapping_sbsfu_sec.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_1_Slot/Linker_Common/STM32CubeIDE/mapping_sbsfu_sec.ld
@@ -12,17 +12,17 @@ Vector_size                    = 0x200;
 
 /* SE Code region protected by MPU isolation */
 SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
-SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start + 0x4;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start; /* No need to do +4 as we have dummy bytes in SE_CoreBin .ld file */
 SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
 
 /* SE Embedded Keys */
 SE_Key_region_ROM_start        = SE_CallGate_region_ROM_end + 0x1;
-SE_Key_region_ROM_end          = SE_Key_region_ROM_start + 0x2FF;
+SE_Key_region_ROM_end          = SE_Key_region_ROM_start + 0x1FF;
 
 /* SE Startup */
 SE_Startup_region_ROM_start    = SE_Key_region_ROM_end + 0x1;
 SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
-SE_Code_region_ROM_end         = SE_Startup_region_ROM_start + 0x72FF;
+SE_Code_region_ROM_end         = SE_Startup_region_ROM_start + 0x73FF;
 
 /* SE IF ROM */
 SE_IF_region_ROM_start         = SE_Code_region_ROM_end + 0x1; 
@@ -30,12 +30,12 @@ SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0xEFF;
 
 /* SBSFU Code region */
 SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
-SB_region_ROM_end              = 0x0800CFFF;
+SB_region_ROM_end              = 0x0800DFFF;
 
 /* KMS Data Storage (NVMS) region protected area */
 /* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
-KMS_DataStorage_start          = 0x0800D000;
-KMS_DataStorage_end            = 0x0800EFFF;
+KMS_DataStorage_start          = 0x0800E000;
+KMS_DataStorage_end            = 0x0800FFFF;
 
 /* ROM regions size definition */
 SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/app_sfu.h
new file mode 100644
index 00000000..ef3e6f8a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/app_sfu.h
@@ -0,0 +1,243 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_crypto_config.h"
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Use this define to choose the type of Firmware Image Programming you want to use.
+  * This version supports only 2 modes:
+  *
+  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
+  *       The image is received in encrypted format.
+  *       The image must be decrypted to be installed:
+  *         this is done according to the selected crypto scheme,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  * SFU_CLEAR_IMAGE: Clear Firmware Image
+  *       The image is received in clear format.
+  *       No decrypt operation is needed before installing the image:
+  *         the selected crypto scheme must be compatible with this choice,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  *
+  */
+#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
+#else
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
+#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
+
+#define SFU_DEBUG_MODE               /*!< Comment this define to optimize memory footprint (debug mode removed)
+                                          No more print on terminal during SBSFU execution */
+
+/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
+                                          this switch activates more debug prints in the console (FSM state info...) */
+
+
+/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
+                                                          When this switch is activated, the FWIMG part of SB_SFU will
+                                                          block when an abnormal error is encountered */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
+#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
+#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
+
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
+#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
+
+/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
+                                           Automatically executed @startup */
+#if defined(SFU_TEST_PROTECTION)
+#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
+#endif /* SFU_TEST_PROTECTION */
+
+/**
+  * SB_SFU status LED.
+  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
+  * This is useful when no log is enabled.
+  *
+  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
+  * \li For the other situations, please check the other defines below.
+  */
+#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
+#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
+                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
+#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
+
+
+/**
+  * Optional Features Software Configuration
+  */
+#if !defined(SFU_TEST_PROTECTION)
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+#else
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
+#endif /* SFU_TEST_PROTECTION */
+
+#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
+#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
+#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
+
+/* Uncomment the define below if you want to use minicom with Linux */
+/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
+
+#if defined(MINICOM_YMODEM)
+/* Minicom does not accept the debug prints during the YMODEM session */
+#undef SFU_VERBOSE_DEBUG_MODE
+#endif /* MINICOM_YMODEM */
+
+/* Uncomment the define below if you want to remove the swap area
+   ==> partial update is not supported in this configuration
+   ==> image validation is not supported in this configuration */
+/*#define SFU_NO_SWAP*/                              /*!< FW upgrade installation process without swap area */
+
+/* Multi-images configuration :
+   - Max : 3 Active images and 3 Download area
+   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
+   - Active slot identified with SFU magic (1,2,3) information from header
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+   - FW image valide all feature authorized from master slot
+*/
+#define SFU_NB_MAX_ACTIVE_IMAGE 1U                        /*!< 1 active image managed */
+#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 dwl area managed */
+#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
+
+
+/* The define below allows disabling all security IPs at once.
+ *
+ * Enabled: all security IPs (WRP, watchdog...) are disabled.
+ * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
+ *
+ */
+
+#define SECBOOT_DISABLE_SECURITY_IPS  /*!< Disable all security IPs at once when activated */
+
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_WRP_PROTECT_ENABLE
+#define SFU_RDP_PROTECT_ENABLE
+/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
+                                             neither connected to GND nor to 5V (floating level), there are too many
+                                             spurious tamper event detected */
+#define SFU_DAP_PROTECT_ENABLE     /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
+                                        It might be difficult to reconnect the Debugger.*/
+#define SFU_DMA_PROTECT_ENABLE
+#define SFU_IWDG_PROTECT_ENABLE    /*!< WARNING:
+                                        1. Be Careful if enabling this protection. IWDG will be active also after
+                                           switching to UserApp: a refresh is needed.
+                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
+                                           platform (flash size...)*/
+#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
+                                        Enables/Disables the MPU protection.
+                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
+                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
+                                        addition to the overall MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
+                                        executable area */
+
+
+/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
+                                                 steps.
+                                                 When enabling this lock, Static protections cannot be modified any more
+                                                 and Debug is finally disabled. */
+
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
+                                                      completely disabled, OB update no more possible  */
+
+
+#else
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
+                                                      field should set it as Level2 */
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+/**
+  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
+  * This define is taken into account only if RDP level 2 is not set.
+  * If RDP level 2 is set no modification can be done anyway.
+  *
+  * Enabled: Option Bytes Development Mode enabled.
+  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
+  *          If an OB is not set though it should be then this setting is automatically corrected.
+  *          This applies only as long as RDP level 2 is not set.
+  *
+  * Disabled: Option Bytes Development Mode disabled.
+  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
+              the first time.
+  *           SB_SFU checks the Option Bytes configuration but does not correct it.
+  *           If a problem is detected an error message is reported and the execution stops.
+  */
+#define SECBOOT_OB_DEV_MODE
+
+
+#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
+                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
+
+
+/**
+  * Application Configuration
+  *
+  */
+#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
+                                              You can also define an upper bound here if you plan to use it */
+
+#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
+                                              no FW installed or due to an attack attempt). Could be different from
+                                              SFU_FW_VERSION_START_NUM */
+
+/**
+  * Features compatibility control
+  */
+#if defined(SFU_NO_SWAP) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_NO_SWAP process"
+#endif
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_SECURE_USER_PROTECT_ENABLE process"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_boot.c
new file mode 100644
index 00000000..e748ea93
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_boot.c
@@ -0,0 +1,1715 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.c
+  * @author  MCD Application Team
+  * @brief   SFU BOOT module
+  *          This file provides firmware functions to manage the following
+  *          functionalities of the Secure Boot:
+  *           + Initialization and de-initialization functions
+  *           + Secure Boot Control functions
+  *           + Secure Boot State functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_BOOT_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+#include "sfu_boot.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
+
+/*
+ * The sfu_com init is provided by the sfu_com_trace module by default.
+ * If not, then it is taken from the sfu_com_loader module.
+ */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_trace.h"
+#else
+#include "sfu_trace.h"      /* needed anyhow even if the defines will be empty */
+#include "sfu_com_loader.h" /* needed only for the COM init/de-init */
+#endif /* SFU_DEBUG_MODE  || SFU_TEST_PROTECTION */
+#include "se_def.h"
+#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
+#include "sfu_new_image.h"            /* the local loader is a kind of "application" running in SB_SFU so it needs the
+                                         services to install a FW image */
+#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
+#include "sfu_test.h"                 /* auto tests */
+#include "sfu_fwimg_internal.h"
+
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "sfu_kms.h"
+#endif /* KMS_ENABLED */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct
+{
+  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
+  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
+} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
+                                                     information using during the SM evolution. */
+
+/* Private defines -----------------------------------------------------------*/
+#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
+#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
+#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
+                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
+
+#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
+                                    maintained for future customization/expansion of the field itself */
+
+#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
+
+/* Private macros ------------------------------------------------------------*/
+#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    if (Status == SFU_SUCCESS){                                         \
+      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
+    }                                                                   \
+    else {                                                              \
+      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
+    }                                                                   \
+  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
+
+
+#define SFU_SET_SM_CURR_STATE(NewState)                                 \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    m_StateMachineContext.CurrState = NewState;                         \
+  }while(0) /*!< Set a State Machine state*/
+
+/* Private variables ---------------------------------------------------------*/
+/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
+static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
+                                                                         SFU_STATE_INITIAL
+                                                                        };
+
+/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
+static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToResume = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToRollback = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+uint8_t initialDeviceStatusCheck;
+
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_BOOT_Init(void);
+static SFU_ErrorStatus SFU_BOOT_DeInit(void);
+static void SFU_BOOT_BspConfiguration(void);
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
+static void SFU_BOOT_SM_CheckStatusOnReset(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static void SFU_BOOT_SM_CheckNewFwToDownload(void);
+static void SFU_BOOT_SM_DownloadNewUserFw(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
+static void SFU_BOOT_SM_InstallKMSBlob(void);
+#endif /* KMS_ENABLED */
+static void SFU_BOOT_SM_CheckUserFwStatus(void);
+static void SFU_BOOT_SM_VerifyUserFwSignature(void);
+static void SFU_BOOT_SM_ExecuteUserFw(void);
+static void SFU_BOOT_SM_HandleCriticalFailure(void);
+static void SFU_BOOT_SM_RebootStateMachine(void);
+static void SFU_BOOT_SM_InstallNewUserFw(void);
+static void SFU_BOOT_SM_ResumeInstallNewUserFw(void);
+static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
+static void SFU_BOOT_ManageResetSources(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
+  *        In the nominal case, the bootloader service runs until the user application is launched.
+  *        When no valid user application can be run (after installing a new image or not),
+  *        if the local loader feature is not enabled then the execution stops,
+  *        otherwise a local download will be awaited.
+  *        If the state machine encounters a major issue then a reboot is triggered.
+  * @param None.
+  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
+  * @note Constraints
+  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
+  *       2. This function also takes care of BSP initialization after enabling the secure mode.
+  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
+  *       3. No other entity should handle the initialization of the Secure Engine.
+  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
+  *          configurations will be overwritten).
+  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
+  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
+  *          error cause.
+  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
+  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
+  *          new image).
+  * @note Settings are handled at compilation time:
+  *       1. See compiler switches in main.h for secure IPs settings
+  *       2. The trace system is configured in the sfu_trace.h file
+  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
+  *          stage.
+  */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
+{
+  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
+
+  /*
+   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
+   * "automatically" managed by SBSFU compiler command
+   */
+  if (SE_Startup() == SE_SUCCESS)
+  {
+    /* Security Configuration */
+    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
+    {
+      /* Board BSP  Configuration */
+      SFU_BOOT_BspConfiguration();
+
+      /* Configure the Secure Boot and start the State machine */
+      if (SFU_BOOT_Init() == SFU_SUCCESS)
+      {
+        /* Start the Secure Boot State Machine */
+        (void) SFU_BOOT_SM_Run();
+      }
+      else
+      {
+        /* failure when initializing the secure boot service */
+        e_ret_code = SFU_BOOT_INIT_FAIL;
+      }
+    }
+    else
+    {
+      /* failure when configuring the security IPs  */
+      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
+    }
+  }
+  else
+  {
+    /* failure at secure engine initialization stage */
+    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
+  }
+
+  /*
+   * This point should not be reached unless a critical init failure occurred
+   * Return the error code
+   */
+  return (e_ret_code);
+}
+
+/**
+  * @brief  Force System Reboot
+  * @param  None
+  * @retval None
+  */
+void SFU_BOOT_ForceReboot(void)
+{
+  /*
+   * WARNING: The follow TRACEs are for debug only. This function could be called
+   * inside an IRQ so the below printf could not be executed or could generate a fault!
+   */
+  TRACE("\r\n========= End of Execution ==========");
+  TRACE("\r\n\r\n\r\n");
+
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/**
+  * @brief  Initialize the Secure Boot State machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_Init(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
+   * download)
+   */
+  initialDeviceStatusCheck = 1U;
+
+  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
+  if (SFU_LL_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Flash interface initialization */
+  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* The COM modules is required only if the trace or the local download is enabled */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
+  if (SFU_COM_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  /* Call the SFU_LOADER module Init */
+  if (SFU_LOADER_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+  /* Call the Exception module Init */
+  if (SFU_EXCPT_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Call the image handling Init  */
+  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
+  {
+    return SFU_ERROR;
+  } /* else continue */
+
+#ifdef SFU_TEST_PROTECTION
+  SFU_TEST_Init();
+#endif /* SFU_TEST_PROTECTION */
+
+  TRACE("\r\n\r\n");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  TRACE("\r\n=                                                                    =");
+  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n\r\n");
+
+  /* Initialize the Secure Engine that will be used for all the most critical operations */
+  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
+  }
+  else
+  {
+    e_ret_status = SFU_SUCCESS;
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize the Secure Boot State machine.
+  * @param  None
+  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
+  *         The bootloader can terminate:
+  *         1. with an init failure : no de-init needed
+  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
+  *            by this function.
+  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
+  *            required security mechanisms.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_DeInit(void)
+{
+  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  if (SFU_COM_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+  if (SFU_LL_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  BSP Initialization.
+  *         Called when the secure mode is enabled.
+  * @note   The BSP configuration should be handled only in this function.
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_BspConfiguration()
+{
+  /* LED Init*/
+  (void) BSP_LED_Init(SFU_STATUS_LED);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* User Button */
+  BUTTON_INIT();
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Execute the Secure Boot state machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
+  void (*fnStateMachineFunction)(void);
+  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+                                                 SFU_BOOT_SM_CheckNewFwToDownload,
+                                                 SFU_BOOT_SM_DownloadNewUserFw,
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
+                                                 SFU_BOOT_SM_InstallKMSBlob,
+#endif /* KMS_ENABLED */
+                                                 SFU_BOOT_SM_CheckUserFwStatus,
+                                                 SFU_BOOT_SM_InstallNewUserFw,
+                                                 SFU_BOOT_SM_VerifyUserFwSignature,
+                                                 SFU_BOOT_SM_ExecuteUserFw,
+                                                 SFU_BOOT_SM_ResumeInstallNewUserFw,
+                                                 SFU_BOOT_SM_RollbackInstallPrevUserFw,
+                                                 SFU_BOOT_SM_HandleCriticalFailure,
+                                                 SFU_BOOT_SM_RebootStateMachine
+                                                };
+
+  /* Start the State Machine loop/evolution */
+  while (e_ret_status == SFU_SUCCESS)
+  {
+    /* Always execute a security/safety check before moving to the next state */
+    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
+    {
+      /* Get the right StateMachine function according to the current state */
+      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
+
+      /* Call the State Machine function associated to the current state */
+      fnStateMachineFunction();
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* If the State Machine cannot evolve anymore, reboot is the only option */
+
+  /* Set the error before forcing a reboot */
+  SFU_EXCPT_SetError(SFU_EXCPT_UNKNOWN);
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+  return e_ret_status;
+}
+
+/** @brief  Check the Reset status in order to understand the last cause of Reset
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckStatusOnReset(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
+
+  /* Check the wakeup sources */
+  SFU_BOOT_ManageResetSources();
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* When the local loader feature is supported we need to check if a local download is requested */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+#ifdef KMS_ENABLED
+  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* When the local loader feature is disabled go directly to the check of the FW status */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Check if a new UserApp firmware is available for downloading.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckNewFwToDownload(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_DWL_REQ)
+  {
+    TRACE("\r\n= [SBOOT] STATE: execution standalone loader");
+    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+    /* This is unreachable code (dead code) in principle...
+    At this point we should not be able to reach the following instructions.
+    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
+    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
+    if (0U != BUTTON_PUSHED())
+    {
+      /* Download requested */
+      e_ret_status = SFU_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /*
+     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
+     * download to start
+     */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+#ifdef KMS_ENABLED
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
+
+#ifdef KMS_ENABLED
+/**
+  * @brief  Check if a KMSBlob is waiting for installation.
+  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
+  *         disabled.
+  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
+  *         enabled.
+  *         In this latter case,
+  *               if a new Firmware download is requested,
+  *               it has priority over the KMS blob installation,
+  *               and the KMS blob installation request will be lost.
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
+
+  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
+  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
+
+  /* Check if a Blob Installation is requested or on-going */
+  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
+
+  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
+  {
+    /* Blob installation requested */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+/**
+  * @brief  Check if a KMSBlob is waiting for install.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallKMSBlob(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  uint8_t         *pBlobHdr;
+  uint8_t         *pBlobInFlash;
+  CK_RV           e_status;
+
+  /* At boot-up, Managing ImportBlob through KMS services.  */
+  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
+
+  /* Here we will Launch SE service to take consume the Blob */
+  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
+  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
+  }
+  else
+  {
+    /* Initialize KMS in order to be able to import blob using internal algorithms */
+    e_status = C_Initialize(NULL);
+    if (e_status == CKR_OK)
+    {
+      /* we do not take the return value into account as we will not retry the import in case of issue */
+      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
+
+      if (e_status != CKR_OK)
+      {
+        (void)C_Finalize(NULL);
+      }
+      else
+      {
+        e_status = C_Finalize(NULL);
+      }
+    }
+
+    if (e_status != CKR_OK)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
+    }
+
+    /* In any case, we remove the Blob To Install (regardless of the result) */
+    e_ret_status = SFU_KMS_EraseBlob();
+
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
+    }
+
+    /* Display the KMS import result */
+    switch (e_status)
+    {
+      case CKR_OK:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
+        e_ret_status = SFU_SUCCESS;
+        break;
+
+      case CKR_SIGNATURE_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DATA_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DEVICE_ERROR:
+        /* At boot-up, NVM Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_OPERATION_ACTIVE:
+        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      default:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
+        e_ret_status = SFU_ERROR;
+        break;
+    }
+  }
+
+  /* Set the next State Machine regardless of the KMS import result */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+#endif /* KMS_ENABLED */
+
+
+/**
+  * @brief  Check the Status of the Fw Image to work on  in order to set the next
+  *         State Machine state accordingly
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckUserFwStatus(void)
+{
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  SFU_IMG_ImgInstallStateTypeDef e_PendingInstallStatus;
+  uint32_t i;
+
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_INSTALL_REQ)
+  {
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[SLOT_DWL_1],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * Notify the Secure Boot that a new image has been downloaded
+       */
+      e_ret_status = SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated);
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    if (e_ret_status == SFU_ERROR)
+    {
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* In all cases, standard SBSFU start-up at next reset */
+    STANDALONE_LOADER_STATE = STANDALONE_LOADER_NO_REQ;
+  }
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+  /* Check if there is a pending action related to a FW update procedure */
+  e_PendingInstallStatus = SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall, &m_ActiveSlotToResume,
+                                                            &m_ActiveSlotToRollback);
+
+  switch (e_PendingInstallStatus)
+  {
+    case SFU_IMG_FWIMAGE_ROLLBACK:
+      /*
+       * The new FW image has not been validated : rollback requested @ next reset
+       * Rollback is done assuming the previous image was backed-up in corresponding dwl slot
+       * As example : new image installed in SLOT_ACTIVE_2. Previous image was backed-up in SLOT_DWL_2
+       */
+      /* Identify corresponding backed-up slot */
+      m_DwlSlotToInstall = m_ActiveSlotToRollback - SLOT_ACTIVE_1 + SLOT_DWL_1;
+      TRACE("\r\n\t  Installation not validated: rollback procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
+            m_ActiveSlotToRollback, m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_ROLLBACK_PREV_USER_FW);
+      break;
+
+    case SFU_IMG_FWUPDATE_STOPPED:
+      /* The installation of a downloaded FW has been interrupted */
+      /* We perform a resume of the installation */
+      TRACE("\r\n\t  Installation Failed: resume installation procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
+            m_ActiveSlotToResume, m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_RESUME_INSTALL_NEW_USER_FW);
+      break;
+
+    case SFU_IMG_FWIMAGE_TO_INSTALL:
+      /*
+       * A new FW is detected in the dwl slot and ready to be installed
+       */
+      TRACE("\r\n\t  New Fw to be installed from slot SLOT_DWL_%d", m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_INSTALL_NEW_USER_FW);
+      break;
+
+    case SFU_IMG_NO_FWUPDATE:
+      /*
+       * No FW image installation pending :
+       *   1- Priority to MASTER_SLOT : check if a firmware is detected
+       *   2- No firmware identified : verify other slots and start execution on the last detected firmware
+       *   3- No active firmware candidate for execution ==> Local download
+       *
+       * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
+       */
+      m_ActiveSlotToExecute = 0U;
+
+      /* 1- Priority to MASTER_SLOT : check if a firmware is detected */
+      if (MASTER_SLOT != 0xFFU)
+      {
+        if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
+        {
+          m_ActiveSlotToExecute = MASTER_SLOT;
+          TRACE("\r\n\t  A FW is detected in the slot SLOT_ACTIVE_%d", m_ActiveSlotToExecute);
+          SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+        }
+      }
+
+      /* 2- No firmware identified : verify other slots and start execution on the last detected firmware */
+      if (m_ActiveSlotToExecute == 0U)
+      {
+        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+        {
+          if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
+          {
+            if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+            {
+              m_ActiveSlotToExecute = SLOT_ACTIVE_1 + i;
+              TRACE("\r\n\t  A FW is detected in the slot SLOT_ACTIVE_%d", m_ActiveSlotToExecute);
+              SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+            }
+          }
+        }
+      }
+
+      /* 3- No active firmware candidate for execution ==> Local download */
+      if (m_ActiveSlotToExecute == 0U)
+      {
+        /* Control if all active slot are empty */
+        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+        {
+          if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
+          {
+            if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+            {
+              /*
+               * We should never reach this code.
+               * Could come from an attack ==> as an example we invalidate current firmware.
+               */
+              TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+              (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+            }
+          }
+        }
+
+        /*
+         * No valid FW is present in the active slot
+         * and there is no FW to be installed in UserApp download area: local download (when possible)
+         */
+        if (1U == initialDeviceStatusCheck)
+        {
+          TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+          /* Waiting for a local download is automatic, no trigger required. */
+          TRACE("\r\n\t  Waiting for the local download to start... ");
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+          initialDeviceStatusCheck = 0U;
+#ifdef SFU_TEST_PROTECTION
+          SFU_TEST_Reset();
+#endif /* SFU_TEST_PROTECTION */
+        }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        else
+        {
+          /*
+           * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
+           *   If a FW is present in the active slot => it is checked then launched.
+           *   If there is a FW to install => the installation procedure starts.
+           *   If no FW is present and no installation is pending:
+           *      - if the local loader feature is enabled we enter the local download state
+           *      - if the local loader feature is disabled, the execution is stopped.
+           */
+          TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS should not be entered more than once per boot.");
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+        SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+        /*
+         * When the local loader feature is disabled it is not possible to enter the local download state.
+         * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
+         * So we end up waiting for the user to reboot (or the IWDG to expire).
+         */
+        TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
+        while (1 == 1)
+        {
+          (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+        }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+      }
+      break;
+
+    default:
+      TRACE("\r\n\t  Flash State Unknown, Critical failure");
+      /* If not in one of the previous state, something bad occurred */
+      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+      break;
+  }
+}
+
+
+#if SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   Reset is generated at by standalone loader when FW is downloaded.
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /* Jump into standalone loader */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+  e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /*
+   * Download area will be chosen as following. After header analysis :
+   *   - same DWL slot number as SFU magic number, if the slot is configured.
+   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
+   *   - by default : SLOT_DWL_1
+   */
+  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
+          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
+          fw_image_header_validated.PartialFwOffset, u_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * Notify the Secure Boot that a new image has been downloaded
+     * by calling the SE interface function to trigger the installation procedure at next reboot.
+     */
+    if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
+    {
+      /* Erase downloaded image */
+      (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
+
+      /* no specific error cause set */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    /* Erase downloaded image */
+    (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
+
+    /* Memorize the specific error cause if any before handling this critical failure */
+    switch (e_ret_status_app)
+    {
+      case SFU_LOADER_ERR_COM:
+        SFU_EXCPT_SetError(SFU_EXCPT_COM_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_VERSION:
+        SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_LENGTH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FW_TOO_BIG);
+        break;
+      case SFU_LOADER_ERR_AUTH_FAILED:
+        SFU_EXCPT_SetError(SFU_EXCPT_HEADER_AUTH_ERR);
+        break;
+      case SFU_LOADER_ERR_FLASH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FLASH_ERR);
+        break;
+      case SFU_LOADER_ERR_CRYPTO:
+        SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+        break;
+      default:
+        /* no specific error cause */
+        break;
+    }
+  } /* else error with no specific error cause */
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+/**
+  * @brief  Install the new UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: INSTALL NEW USER FIRMWARE ");
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_SECOND_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /* Check the candidate version vs current active version */
+  e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    /* Erase downloaded FW in case of authentication/integrity error */
+    (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
+  }
+  else
+  {
+    /* Secure coding : double check the candidate version vs current active version */
+    e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+  }
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* Launch the Firmware Installation procedure */
+    e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
+  }
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /*
+     * The FW installation succeeded: the previous FW is now backed up in the dwl slot.
+     * Nothing more to do, in the next FSM state we are going to verify the FW again and execute it if possible.
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FW installation succeeded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * The FW installation failed: we need to reboot and the resume procedure will be triggered at next boot.
+     * Nothing more to do, the next FSM state (HANDLE_CRITICAL_FAILURE) will deal with it.
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FW installation failed!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+}
+
+/**
+  * @brief  Execute a UserApp Fw installation resume
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ResumeInstallNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: RESUME INSTALLATION OF NEW USER FIRMWARE");
+
+  /*
+   * This resume installation procedure continue installation of new User FW in the active slot
+   */
+  e_ret_status = SFU_IMG_TriggerResumeInstallation(m_ActiveSlotToResume, m_DwlSlotToInstall);
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    /* No specific error cause managed here because the FSM state already provides the information. */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+}
+
+/**
+  * @brief  Execute a rollback to the previous UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void)
+{
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: ROLLBACK INSTALLATION TO PREVIOUS USER FIRMWARE");
+
+  /*
+   * Rollack installation to the previous User FW from Dwl_Slot
+   */
+  e_ret_status = SFU_IMG_TriggerRollbackInstallation(m_ActiveSlotToRollback, m_DwlSlotToInstall);
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    /* No specific error cause managed here because the FSM state already provides the information. */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+#else
+  TRACE("\r\n= [SBOOT] STATE: ROLLBACK NOT SUPPORTED");
+
+  /* No specific error cause managed here because the FSM state already provides the information. */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+#endif /* ENABLE_IMAGE_STATE_HANDLING && !(SFU_NO_SWAP) */
+}
+
+
+/**
+  * @brief  Verify the UserApp Fw signature before executing it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_VerifyUserFwSignature(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
+
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /*
+   * With the 2 images handling:
+   *       1. the header signature is verified  when installing a new firmware
+   *       2. the firmware signature is checked when installing a new firmware
+   *       3. remaining part of active slot is kept "clean" during installation procedure
+   * So following checks should never fail.
+   */
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
+        if (SFU_SUCCESS == e_ret_status)
+        {
+          /* Check the FW signature */
+          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
+          if (SFU_SUCCESS == e_ret_status)
+          {
+            /* Verify that there is no additional code beyond firmware image */
+            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
+            if (SFU_SUCCESS != e_ret_status)
+            {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+            }
+          }
+          else
+          {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          }
+        }
+        else
+        {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        }
+        /*
+         * One of the checks fails :
+         *  - Header signature
+         *  - FW signature
+         *  - No malicious code
+         *  ==> Active slot should be invalidated
+         */
+        if (SFU_SUCCESS != e_ret_status)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+        else
+        {
+          /* Verify if authentication and integrity controls performed */
+          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+        }
+      }
+      else
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ExecuteUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+
+  /* Double security check for all active slots :
+     - Control twice the Header signature will avoid basic hardware attack
+     - Control twice the FW signature will avoid basic hardware attack */
+
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+        /* Check the FW signature */
+        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+        /* Move the state to SELFTEST for the new images */
+        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Image state cannot be changed : What to do ?
+             ==> decision to continue execution */
+          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
+        }
+#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
+
+        /* Verify if authentication and integrity controls performed */
+        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+      }
+    }
+  }
+
+  /*
+   * You may decide to implement additional checks before running the Firmware.
+   * For the time being we launch the FW present in the active slot.
+   *
+   * The bootloader must also take care of the security aspects:
+   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
+   *   B.lock the SE services the UserApp is not allowed to call
+   *   C.leave secure boot mode
+   */
+
+  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
+  e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+    SFU_EXCPT_SetError(SFU_EXCPT_FLASH_CFG_ERR);
+
+    /* This is the last operation executed. Force a System Reset */
+    SFU_BOOT_ForceReboot();
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Double instruction to avoid basic fault injection */
+      if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+      {
+        /* De-initialize the SB_SFU bootloader before launching the UserApp */
+        (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
+
+        /* Last flow control : lock service */
+        FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
+
+        /* This function should not return */
+        e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
+
+        /* This point should not be reached */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        /* We do not memorize any specific error, the FSM state is already providing the info */
+        TRACE("\r\n\t  SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        while (1 == 1)
+        {
+          ;    /* wait for watchdog */
+        }
+      }
+      else
+      {
+        /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+        SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+        /* This is the last operation executed. Force a System Reset */
+        SFU_BOOT_ForceReboot();
+      }
+    }
+    else
+    {
+      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+      SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+      /* This is the last operation executed. Force a System Reset */
+      SFU_BOOT_ForceReboot();
+    }
+  }
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
+  * @param  None
+  * @note   After a Critical Failure a Reboot will be called.
+  * @retval None
+  */
+static void SFU_BOOT_SM_HandleCriticalFailure(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+     The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
+}
+
+/**
+  * @brief  The state machine is aborted and a Reset is triggered
+  * @param  None
+  * @note   You are in this condition because it's not possible to continue without
+            compromising the stability or the security of the solution.
+  * @retval None
+  */
+static void SFU_BOOT_SM_RebootStateMachine(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
+
+  /*
+   * In case some clean-up must be done before resetting.
+   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
+   */
+  (void)SFU_BOOT_DeInit();
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Jump into standalone loader
+  * @param  None
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+
+
+  /* Lock part of Secure Engine services */
+  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Give execution rights to standalone loader */
+      e_ret_status = SFU_LL_SECU_SetProtectionMPU_StandaloneLoader();
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Initialize address to jump */
+    jump_address = *(__IO uint32_t *)(((uint32_t)LOADER_REGION_ROM_START + 4));
+    p_jump_to_function = (Function_Pointer) jump_address;
+
+    /* Initialize loader's Stack Pointer */
+    __set_MSP(*(__IO uint32_t *)(LOADER_REGION_ROM_START));
+
+    /* Jump into loader */
+    p_jump_to_function();
+  }
+
+  /* The point below should NOT be reached */
+  return e_ret_status;
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply Static protections involving Option Bytes */
+  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  System security configuration
+  * @param  None
+  * @note   Check and apply the security protections. This has to be done as soon
+  *         as possible after a reset
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  /* WARNING: The following CheckApplySecurityProtection function must be called
+     as soon as possible after a Reset in order to be sure the system is secured
+     before starting any other operation. The drawback is that the ErrorManagement
+     is not initialized yet, so in case of failure of this function, there will not be
+     any error stored into the BootInfo or other visible effects.  */
+
+  /* Very few things are already initialized at this stage. Need additional initialization
+     to show a message that is added as below only in Debug/Test mode */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  (void) SFU_COM_Init();
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
+  {
+    /* WARNING: This might be generated by an attempted attack or a bug of your code!
+       Add your code here in order to implement a custom action for this event,
+       e.g. trigger a mass erase or take any other action in order to
+       protect your system, or simply discard it if this is expected.
+       ...
+       ...
+    */
+    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
+  }
+  else
+  {
+    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
+  *         a malicious code removing some of the applied security/integrity features.
+  *         The IWDG is also refreshed in this function.
+  * @param  None
+  * @note   This function must be called with a frequency greater than 0.25Hz!
+  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
+  *         So the User App should continue to refresh the IWDG counter.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Refresh the IWDG */
+  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
+
+
+  /* Add your code here for customization:
+     e.g. for additional security or safety periodic check.
+     ...
+     ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_ManageResetSources(void)
+{
+  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
+
+  /* Check the wakeup sources */
+  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
+  switch (e_wakeup_source_id)
+  {
+    /*
+     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
+     * RCC_CSR flags can be used to do so.
+     */
+
+    case SFU_RESET_WDG_RESET:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_LOW_POWER:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_HW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_BOR_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_SW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_OB_LOADER:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    default:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+  }
+
+  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
+  SFU_LL_SECU_ClearResetSources();
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Memory Fault.
+  * @note  After a Memory Fault could not be possible to execute additional code
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_MEMORYFAULT(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_MEMORY_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_boot.h
new file mode 100644
index 00000000..45d6ca7d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_boot.h
@@ -0,0 +1,205 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module, part of the SFU-En project (SB/SFU).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Init Error Type Definition
+  */
+typedef enum
+{
+  SFU_BOOT_SECENG_INIT_FAIL,   /*!< failure at secure engine initialization stage */
+  SFU_BOOT_SECIPS_CFG_FAIL,    /*!< failure when configuring the security IPs  */
+  SFU_BOOT_INIT_FAIL,          /*!< failure when initializing the secure boot service  */
+  SFU_BOOT_INIT_ERROR          /*!< Service cannot start: unspecified error */
+} SFU_BOOT_InitErrorTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Steps definition
+  */
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+#define FLOW_STEP_AUTHENTICATE 0x00007999U       /*!< Step AUTHENTICATE value */
+#define FLOW_STEP_INTEGRITY 0x0000aab5U          /*!< Step INTEGRITY value */
+#define FLOW_STEP_LOCK_SERVICE 0x0000b4abU       /*!< Step LOCK SERVICE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0000cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_PCROP_PROTECT_ENABLE
+#define FLOW_STEP_PCROP 0x0000d2d3U              /*!< Step PCROP value */
+#else
+#define FLOW_STEP_PCROP 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_UBE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_PCROP (FLOW_CTRL_WRP ^ FLOW_STEP_PCROP)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_PCROP ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
+#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values crypto operations
+  */
+#define FLOW_CTRL_AUTHENTICATE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_AUTHENTICATE)
+#define FLOW_CTRL_INTEGRITY (FLOW_CTRL_AUTHENTICATE ^ FLOW_STEP_INTEGRITY)
+#define FLOW_CTRL_LOCK_SERVICE (FLOW_CTRL_INTEGRITY ^ FLOW_STEP_LOCK_SERVICE)
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+
+/* Exported macros -----------------------------------------------------------*/
+/** Control with STEP operation :
+  * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+/** STEP update only :
+  * (uFlowValue XOR STEP_VALUE)
+  */
+#define FLOW_STEP(B,A) \
+  do{ \
+    (B) ^= (A);\
+  }while(0)
+
+
+/* Exported functions ------------------------------------------------------- */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService(void);
+void SFU_BOOT_ForceReboot(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_loader.c
new file mode 100644
index 00000000..f7599f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_loader.c
@@ -0,0 +1,544 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
+#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
+
+/* Private macros ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
+#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
+#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+/**
+  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
+  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
+  * @param  puSize: size of received file.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
+{
+  uint32_t i;
+  uint32_t packet_length = 0U;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t filesize = 0U;
+  uint32_t packets_received;
+  uint8_t *file_ptr;
+  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
+                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(8)));
+
+  /* Check the pointers allocation */
+  if ((peCOMStatus == NULL) || (puSize == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  *peCOMStatus = SFU_COM_YMODEM_OK;
+
+  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *peCOMStatus = SFU_COM_YMODEM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *puSize = filesize;
+              file_done = 1U;
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
+              {
+                /* No NACK sent for a better synchro with remote : packet will be repeated */
+              }
+              else
+              {
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name skipped */
+                    i = 0U;
+                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
+                    {
+                      i++;
+                      file_ptr++;
+                    }
+                    /* end of file name ('\0') skipped */
+                    file_ptr++;
+
+                    /* File size extraction */
+                    i = 0U;
+                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
+                    {
+                      file_size[i] = *file_ptr;
+                      i++;
+                      file_ptr++;
+                    }
+                    file_size[i] = (uint8_t) '\0';
+                    (void) Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call*/
+                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
+                    {
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                      (void) SFU_LL_UART_Flush();
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
+                    }
+                    else
+                    {
+                      /* End session */
+                      tmp = SFU_COM_YMODEM_CA;
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      return SFU_ERROR;
+                    }
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                    file_done = 1U;
+                    session_done = 1U;
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  /* Data packet received callback call*/
+                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX],
+                                                           packet_length) == SFU_SUCCESS)
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* End session */
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    *peCOMStatus = SFU_COM_YMODEM_DATA;
+                  }
+
+                }
+                packets_received ++;
+                session_begin = 1;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          break;
+        default:
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
+          {
+            /* Abort communication */
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          }
+          else
+          {
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            /* Minicom does not accept this extra character */
+            TRACE("\b.");                                 /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+            /*
+             * Toggling the LED in case no console is available: the toggling frequency depends on
+             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
+             */
+            (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          }
+          break;
+      }
+    }
+  }
+  /* Make sure the status LED is turned off */
+  (void) BSP_LED_Off(SFU_STATUS_LED);
+
+  if (*peCOMStatus == SFU_COM_YMODEM_OK)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+/**
+  * @brief  Transmit a byte to the COM Port.
+  * @param  uParam: The byte to be sent.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
+{
+  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
+}
+
+/**
+  * @brief  Convert a string to an integer.
+  * @param  pInputStr: The string to be converted.
+  * @param  pIntNum: The integer value.
+  * @retval 1: Correct
+  *         0: Error
+  */
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+  uint8_t  digit;
+
+  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        digit = CONVERTHEX(pInputStr[i]);
+        val = (val << 4U) + digit;
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == (uint8_t)'\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == (uint8_t)'\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        digit =  CONVERTDEC(pInputStr[i]);
+        val = (val * 10U) + digit;
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData: pointer to received data.
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeOut: receive timeout (ms).
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  SFU_ErrorStatus eRetStatus;
+
+  uint8_t char1;
+
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0; /* index indicating where to write in pData */
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
+
+  if (eRetStatus == SFU_SUCCESS)
+  {
+    status = HAL_OK;
+
+    switch (char1)
+    {
+      case SFU_COM_YMODEM_SOH:
+        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
+        break;
+      case SFU_COM_YMODEM_STX:
+        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+        break;
+      case SFU_COM_YMODEM_EOT:
+        break;
+      case SFU_COM_YMODEM_CA:
+        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
+        {
+          packet_size = 2U;
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      case SFU_COM_YMODEM_ABORT1:
+      case SFU_COM_YMODEM_ABORT2:
+        status = HAL_BUSY;
+        break;
+      case SFU_COM_YMODEM_RB:
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
+    {
+
+#ifndef MINICOM_YMODEM
+      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX],
+                                       (uint16_t)(packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
+#else
+      eRetStatus = SFU_SUCCESS;
+      /* Receive byte per byte until no data left or no space left in buffer */
+      while ((SFU_SUCCESS == eRetStatus) &&
+             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
+              SFU_COM_YMODEM_PACKET_DATA_INDEX +
+              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
+            )
+      {
+        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
+                                         1U, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        /* We received some bytes */
+        eRetStatus = SFU_SUCCESS;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (eRetStatus == SFU_SUCCESS)
+      {
+        status = HAL_OK;
+
+        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
+                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
+        {
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC*/
+          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
+          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
+
+          /*Configure CRC with 16-bit polynomial*/
+          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
+          {
+            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
+            {
+              packet_size = 0U;
+              status = HAL_ERROR;
+            }
+
+          }
+          else
+          {
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        status = HAL_ERROR;
+      }
+    }
+  }
+  else
+  {
+    status = HAL_ERROR;
+  }
+
+  *puLength = packet_size;
+  return status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(uFileSize);
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(pData);
+  UNUSED(uSize);
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_loader.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_loader.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_com_trace.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_trace.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_com_trace.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_trace.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_com_trace.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_trace.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_com_trace.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_com_trace.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_def.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_def.h
new file mode 100644
index 00000000..78458507
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_def.h
@@ -0,0 +1,83 @@
+/**
+  ******************************************************************************
+  * @file    sfu_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains the general definitions for SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_DEF_H
+#define SFU_DEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU Error Typedef
+  */
+typedef enum
+{
+  SFU_ERROR = 0x00001FE1U,
+  SFU_SUCCESS = 0x00122F11U
+} SFU_ErrorStatus;
+
+/* Exported constants --------------------------------------------------------*/
+
+#define SFU_RAM_BASE             ((uint32_t) SE_REGION_RAM_START)
+#define SFU_RAM_END              ((uint32_t) SB_REGION_RAM_END)
+#define SFU_SB_RAM_BASE          ((uint32_t) SB_REGION_RAM_START)
+#define SFU_SB_RAM_END           ((uint32_t) SB_REGION_RAM_END)
+
+
+#define SFU_BOOT_BASE_ADDR       ((uint32_t) INTVECT_START)           /* SFU Boot Address */
+#define SFU_ROM_ADDR_END         ((uint32_t) SB_REGION_ROM_END)       /* SBSFU end Address (covering all the SBSFU
+                                                                         executable code) */
+
+#define SFU_SENG_ROM_ADDR_START  ((uint32_t) SE_CODE_REGION_ROM_START)/* Secure Engine area address START */
+#define SFU_SENG_ROM_ADDR_END    ((uint32_t) SE_CODE_REGION_ROM_END)  /* Secure Engine area address END - SE includes
+                                                                         everything up to the License */
+#define SFU_SENG_ROM_SIZE        ((uint32_t) (SFU_SENG_ROM_ADDR_END - \
+                                              SFU_SENG_ROM_ADDR_START + 1U)) /* Secure Engine area size */
+
+#define SFU_KEYS_ROM_ADDR_START  ((uint32_t) SE_KEY_REGION_ROM_START) /* Keys Area (Keys + Keys Retrieve function)
+                                                                         START. This is the PCRoP Area */
+#define SFU_KEYS_ROM_ADDR_END    ((uint32_t) SE_KEY_REGION_ROM_END)   /* Keys Area (Keys + Keys Retrieve function) END.
+                                                                         This is the PCRoP Area */
+
+#define SFU_SENG_RAM_ADDR_START  ((uint32_t) SE_REGION_RAM_START)   /* Secure Engine reserved RAM1 area START
+                                                                       address */
+#define SFU_SENG_RAM_ADDR_END    ((uint32_t) SE_REGION_RAM_END)     /* Secure Engine reserved RAM1 area END address */
+#define SFU_SENG_RAM_SIZE        ((uint32_t) (SFU_SENG_RAM_ADDR_END - \
+                                              SFU_SENG_RAM_ADDR_START + 1U)) /* Secure Engine reserved RAM area SIZE */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_DEF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_error.c
new file mode 100644
index 00000000..69712062
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_error.c
@@ -0,0 +1,236 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.c
+  * @author  MCD Application Team
+  * @brief   SFU ERROR
+  *          This file provides set of firmware functions for SB_SFU errors handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "sfu_low_level_security.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_boot.h"
+#include "sfu_test.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+/**
+  *  The following strings associated to the exceptions/errors are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
+  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
+  */
+static char *m_aErrorStrings[] ={  "No error. Success",
+                                   "Memory fault",
+                                   "Hard fault",
+                                   "Tampering fault",
+                                   "SE lock cannot be set",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Fw too big",
+                                   "File not correctly received",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Fw header authentication error",
+                                   "Fw decryption error",
+                                   "Fw signature check error",
+                                   "Flash error",
+                                   "External flash configuration error.",
+                                   "Header erasing error",
+                                   "Header validation error",
+                                   "Additional code detected beyond FW",
+                                   "Error during swap process",
+                                   "Error during rollback process",
+                                   "Backed-up fw not identified",
+                                   "Backup copy error",
+                                   "Dwl slot erasing error",
+                                   "Trailer erasing error",
+                                   "Trailer update error",
+                                   "Magic tag update error",
+                                   "Fw version rejected (anti-rollback)",
+                                   "Unknown error"
+                                };
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Print relevant errpr message.
+  * @param  Error Error code.
+  * @retval None
+  */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  if (eExceptionId <= SFU_EXCPT_UNKNOWN)
+  {
+#ifdef SFU_DEBUG_MODE
+    TRACE("\r\n\t%s",m_aErrorStrings[(uint32_t) eExceptionId]);
+#endif /* SFU_DEBUG_MODE */
+  }
+}
+
+
+/**
+  * @brief  Manage the Exception generated by an IRQ
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   Because of the interruption of the State Machine execution,
+  *         it's not possible to continue without compromising the stability or
+  *         the security of the solution. A System Reset is forced at the end.
+  * @retval None
+  */
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+#ifdef SFU_DEBUG_MODE
+  uint8_t message[150];
+  uint32_t i = 0U;
+
+  /* Avoid warning with cast frombetween char* and uint8_t* */
+  while ((m_aErrorStrings[(uint32_t) eExceptionId][i] != 0u) && (i < 149U))
+  {
+    message[i] = m_aErrorStrings[(uint32_t) eExceptionId][i];
+    i++;
+  }
+  message[i] = 0U;
+
+  /* Print relevant error message */
+  TRACE_IRQ((uint8_t *)"\r\n\t  ");
+  TRACE_IRQ(message);
+#endif /* SFU_DEBUG_MODE */
+
+  /* Try to take an action */
+  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+  The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_BOOT_ForceReboot();
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+void SFU_EXCPT_Security_Error(void)
+{
+  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
+  HAL_Delay(1000);
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/**
+  * @brief  SFU Exception Initialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_Init(void)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU Exception DeInitialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status;
+  /* ADD SRC CODE HERE
+      ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   A System Reset is forced at the end by the caller of this function.
+  *         WARNING: Be aware that this function can be called by an IRQ while
+  *         using the printf, since the printf is not a reentrant function, and using
+  *         the printf inside this function as well, a fault will likely occur.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  switch (eExceptionId)
+  {
+    case SFU_EXCPT_TAMPERING_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_MEMORY_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_HARD_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+#ifdef SFU_TEST_PROTECTION
+      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
+         ==> this is not an error */
+#endif /* SFU_TEST_PROTECTION */
+      break;
+
+    default:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+  }
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_error.h
new file mode 100644
index 00000000..6506d102
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_error.h
@@ -0,0 +1,93 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.h
+  * @author  MCD Application Team
+  * @brief   This file contains the error handling elements for SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_ERROR_H
+#define SFU_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * This enum must start from 0.
+  * When adding a new error in the enum below please also:
+  *  1. update IS_SFU_EXCPT
+  *  2. update m_aErrorStrings
+  */
+typedef enum
+{
+  SFU_EXCPT_NONE = 0UL,
+  /* System errors */
+  SFU_EXCPT_MEMORY_FAULT,
+  SFU_EXCPT_HARD_FAULT,
+  SFU_EXCPT_TAMPERING_FAULT,
+  /* Specific errors */
+  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
+  SFU_EXCPT_COM_ERR,               /* COM error during the local download of the binary */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  SFU_EXCPT_HEADER_AUTH_ERR,       /* header authentication failure */
+  SFU_EXCPT_DECRYPT_ERR,           /* Decrypt failure */
+  SFU_EXCPT_SIGNATURE_ERR,         /* Signature check failure */
+  SFU_EXCPT_FLASH_ERR,             /* Problem with FLASH */
+  SFU_EXCPT_FLASH_CFG_ERR,         /* Flash configuration issue (external flash) */
+  SFU_EXCPT_HEADER_ERASING_ERR,    /* Header erasing failure */
+  SFU_EXCPT_HEADER_VALIDATION_ERR, /* Header validation failure */
+  SFU_EXCPT_ADDITIONAL_CODE_ERR,   /* Additional code detected beyond the firmware image (malicious SW) */
+  SFU_EXCPT_FWIMG_SWAP_ERR,        /* Problem while swapping the images */
+  SFU_EXCPT_FWIMG_ROLLBACK_ERR,    /* Problem during rollback process */
+  SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR,/* Backed-up firmware not identified */
+  SFU_EXCPT_BACKUP_COPY_FAILURE_ERR, /* Copy in the backup slot failure */
+  SFU_EXCPT_DWL_SLOT_ERASING_ERR,  /* Dwl slot erasing failure */
+  SFU_EXCPT_TRAILER_ERASING_ERR,   /* Trailer update failure */
+  SFU_EXCPT_TRAILER_UPDATE_ERR,    /* Trailer update failure */
+  SFU_EXCPT_FWIMG_MAGIC_ERR,       /* Problem with a FWIMG pattern */
+  SFU_EXCPT_VERSION_ERR,           /* Anti-rollback check rejected the version to be installed */
+  /* Unknown error */
+  SFU_EXCPT_UNKNOWN                /* To be kept as last error */
+} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
+
+/* External variables --------------------------------------------------------*/
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_Security_Error(void);
+
+SFU_ErrorStatus SFU_EXCPT_Init(void);
+SFU_ErrorStatus SFU_EXCPT_DeInit(void);
+
+void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_ERROR_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fsm_states.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fsm_states.h
new file mode 100644
index 00000000..5eed78d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fsm_states.h
@@ -0,0 +1,115 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fsm_states.h
+  * @author  MCD Application Team
+  * @brief   This file defines the SB_SFU Finite State Machine states.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FSM_STATES_H
+#define SFU_FSM_STATES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * FSM states: this enum must start from 0.
+  */
+typedef enum
+{
+  SFU_STATE_CHECK_STATUS_ON_RESET = 0U, /*!< checks the reset cause and decide how to proceed     */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD,   /*!< SFU checks if a local download must be handled       */
+  SFU_STATE_DOWNLOAD_NEW_USER_FW,       /*!< downloads the encrypted firmware to be installed     */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+  SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL, /*!< SFU checks if a kms blob download must be handled    */
+  SFU_STATE_INSTALL_KMS_BLOB,          /* !< download the new kms_blob */
+#endif /* KMS_ENABLED */
+  SFU_STATE_VERIFY_USER_FW_STATUS,      /*!< checks the internal FLASH state to derive a status   */
+  SFU_STATE_INSTALL_NEW_USER_FW,        /*!< decrypts and installs the firmware stored in dwl slot*/
+  SFU_STATE_VERIFY_USER_FW_SIGNATURE,   /*!< checks the validity of the active firmware           */
+  SFU_STATE_EXECUTE_USER_FW,            /*!< launch the user application                          */
+  SFU_STATE_RESUME_INSTALL_NEW_USER_FW, /*!< resume interrupted installation of firmware          */
+  SFU_STATE_ROLLBACK_PREV_USER_FW,      /*!< rollback with previous firmware                      */
+  SFU_STATE_HANDLE_CRITICAL_FAILURE,    /*!< deal with the critical failures                      */
+  SFU_STATE_REBOOT_STATE_MACHINE        /*!< a reboot is forced                                   */
+} SFU_BOOT_StateMachineTypeDef; /*!< SFU BOOT State Machine States */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  The following strings associated to the SM state are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the SFU_BOOT_StateMachineTypeDef defined above.
+  *           And the above enum must be a sequence starting from 0
+  */
+#ifdef SFU_DEBUG_MODE
+#if defined(SFU_VERBOSE_DEBUG_MODE) && defined (SFU_BOOT_C)
+char *m_aStateMachineStrings[] = { "Checking Status on Reset.",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Checking if new Fw Image available to download.",
+                                   "Downloading new Fw Image.",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Verifying Fw Image status.",
+                                   "Installing new Fw Image.",
+                                   "Verifying Fw Image signature.",
+                                   "Executing Fw Image.",
+                                   "Resuming installation of new Fw Image.",
+                                   "Rollback with previous Fw Image.",
+                                   "Handling a critical failure.",
+                                   "Rebooting the State Machine"
+                                 };
+#endif /* SFU_VERBOSE_DEBUG_MODE && SFU_BOOT_C */
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Exported macros -----------------------------------------------------------*/
+/************ SFU SM States****************************************************/
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_DOWNLOAD_NEW_USER_FW)     || \
+                                 ((STATE) == (uint8_t)SFU_STATE_INSTALL_NEW_USER_FW)      || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_RESUME_INSTALL_NEW_USER_FW)|| \
+                                 ((STATE) == (uint8_t)SFU_STATE_ROLLBACK_PREV_USER_FW)|| \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#else
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_INSTALL_NEW_USER_FW)      || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_RESUME_INSTALL_NEW_USER_FW)|| \
+                                 ((STATE) == (uint8_t)SFU_STATE_ROLLBACK_PREV_USER_FW)|| \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FSM_STATES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_common.c
new file mode 100644
index 00000000..a8fd85f8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_common.c
@@ -0,0 +1,1137 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_common.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the "common" functionalities of the image handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_COMMON_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+SFU_IMG_StatusTypeDef SFU_IMG_Status;
+uint32_t SFU_IMG_Line;
+
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+
+/**
+  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_to_test;
+
+/* Functions Definition : helper ---------------------------------------------*/
+/**
+  * @brief  Memory compare with constant time execution.
+  * @note   Objective is to avoid basic attacks based on time execution
+  * @param  pAdd1 Address of the first buffer to compare
+  * @param  pAdd2 Address of the second buffer to compare
+  * @param  Size Size of the comparison
+  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
+  */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
+{
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  for (i = 0U; i < Size; i++)
+  {
+    result |= pAdd1[i] ^ pAdd2[i];
+  }
+
+  if (result == 0x00U)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+
+/**
+  * @brief  Check header signature
+  * @param  pFwImageHeader: pointer to raw header.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef se_status;
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
+  {
+    /* Unused bytes should be set at 0x00 value
+       Comparison with constant time execution */
+    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
+    {
+      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
+    }
+
+    if (result == 0x00U)
+    {
+      /* Check signature of the FW header */
+      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
+      {
+        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
+  *        It handles Firmware TAG verification of a complete buffer by calling
+  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
+  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
+  *        and at the end compare the obtained TAG with the one provided as input
+  *        in pSE_GMCInit parameter.
+  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
+  * @param pSE_Status: Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param SlotNumber index of the slot in the list
+  * @param pSE_Metadata: Firmware metadata.
+  * @param pSE_Payload: pointer to Payload Buffer descriptor.
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_ret_status = SE_ERROR;
+  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
+  /* Loop variables */
+  uint32_t i;
+  uint32_t j;
+  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
+  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
+  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
+  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
+  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
+  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(8)));
+  /* FW chunk produced by the verification procedure if any   */
+  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* FW chunk provided as input to the verification procedure */
+  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* Variables to handle the FW image (this will be split in chunks) */
+  uint32_t payloadsize;
+  uint32_t ppayload;
+  uint32_t scatter_nb;
+  /* Variables to handle FW image size and tag */
+  uint32_t fw_size;
+  uint8_t *fw_tag;
+
+  /* Check the pointers allocation */
+  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
+  {
+    return SFU_ERROR;
+  }
+  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check the parameters value and set fw_size and fw_tag to check */
+  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
+  {
+    fw_size = pSE_Metadata->FwSize;
+    fw_tag = pSE_Metadata->FwTag;
+  }
+  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
+  {
+    fw_size = pSE_Metadata->PartialFwSize;
+    fw_tag = pSE_Metadata->PartialFwTag;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+
+  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
+  {
+    return SFU_ERROR;
+  }
+
+  /*  fix number of scatter block */
+  if (pSE_Payload->PayloadSize[1] != 0U)
+  {
+    scatter_nb = 2U;
+  }
+  else
+  {
+    scatter_nb = 1U;
+  }
+
+
+  /* Encryption process*/
+  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
+
+  /* check for initialization errors */
+  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    for (j = 0; j < scatter_nb; j++)
+    {
+      payloadsize = pSE_Payload->PayloadSize[j];
+      ppayload = pSE_Payload->pPayload[j];
+      i = 0;
+      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
+
+      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
+             (sfu_ret_status == SFU_SUCCESS))
+      {
+
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        ppayload += fw_chunk_size;
+        fw_verified_total_size += fw_chunk_size;
+        i++;
+      }
+      /* this the last path , size can be smaller */
+      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
+      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+      {
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
+                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)),
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        fw_verified_total_size += fw_chunk_size;
+      }
+    }
+  }
+
+  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    if (fw_verified_total_size <= fw_size)
+    {
+      /* Do the Finalization, check the authentication TAG*/
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
+
+      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
+        {
+          *pSeStatus = SE_SIGNATURE_ERR;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+
+          /* Save result for active slot :
+             to avoid single fault attack the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
+          }
+        }
+        else
+        {
+          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+
+          /* Save result for active slot :
+             to avoid single fault attacje the signature will be doble checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag_output, SE_TAG_LEN);
+          }
+        }
+      }
+      else
+      {
+        sfu_ret_status = SFU_ERROR;
+      }
+    }
+    else
+    {
+      sfu_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    sfu_ret_status = SFU_ERROR;
+  }
+  return sfu_ret_status;
+}
+
+/**
+  * @brief Fill authenticated info in SE_FwImage.
+  * @param SFU_APP_Status
+  * @param pBuffer
+  * @param BufferSize
+  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
+{
+  /* Check the pointers allocation */
+  if ((pFwHeader == NULL) || (pBuffer == NULL))
+  {
+    return SFU_ERROR;
+  }
+  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Verify Image Header in the slot given as a parameter
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
+  * @note   Not used in Alpha version -
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* use api read to detect possible ECC error */
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                   sizeof(SE_FwRawHeaderTypeDef));
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify signature */
+    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify Fw signature of binary contiguous in flash
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  SlotNumber flash slot to check
+  * @param  pFwImageHeader pointer to fw header
+  * @param  SlotNumber flash slot to check
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
+                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType)
+{
+  SE_Ex_PayloadDescTypeDef  pse_payload;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*  put it OK, to discriminate error in SFU FWIMG parts */
+  *pSeStatus = SE_OK;
+
+  /* Check the parameters value */
+  if (pFwImageHeader == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check SE_FwType parameter, and fix size and offset accordingly */
+  switch (SE_FwType)
+  {
+    case SE_FW_IMAGE_COMPLETE :
+      fw_size = pFwImageHeader->FwSize;
+      fw_offset = 0U;
+      break;
+    case SE_FW_IMAGE_PARTIAL :
+      fw_size = pFwImageHeader->PartialFwSize;
+#if  !defined(SFU_NO_SWAP)
+      fw_offset = pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+#else
+      fw_offset = pFwImageHeader->PartialFwOffset;
+#endif /* !SFU_NO_SWAP */
+      break;
+    default :
+      /* error */
+      fw_size = 0U;
+      fw_offset = 0U;
+      break;
+  }
+
+  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
+  pse_payload.PayloadSize[0] = fw_size;
+  pse_payload.pPayload[1] = 0U;
+  pse_payload.PayloadSize[1] = 0U;
+
+  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
+}
+
+/**
+  * @brief Verifies the validity of a slot.
+  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
+  * @param pSlotBegin Start address of a slot.
+  * @param uSlotSize Size of a slot.
+  * @param uFwSize Size of the firmware image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
+{
+  uint8_t *pdata;
+  uint32_t length;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check is already clean */
+  pdata = pSlotBegin + SFU_IMG_IMAGE_OFFSET + uFwSize;
+  length = uSlotSize - SFU_IMG_IMAGE_OFFSET - uFwSize;
+  e_ret_status = SFU_LL_FLASH_Compare(pdata, 0x00000000U, 0xFFFFFFFFU, length);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function clean-up the flash
+  * @note   Not designed to clean-up area inside secure engine isolation.
+  * @note   To clean the slot without erasing the header we write "0x00" except if already written
+  * @param  pSlotBegin Start address of a slot.
+  * @param  uSlotSize Size of a slot.
+  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t pdata;
+  uint32_t slot_begin;
+  SFU_LL_FLASH_write_t pattern;
+  SFU_LL_FLASH_write_t value;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  /* Clean-up pattern initialization */
+  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
+
+  /* Cleaning operation */
+  slot_begin = (uint32_t) pSlotBegin;
+  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
+  {
+    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* If read succeed, then the pattern write is performed only if pattern is not already present */
+      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                          sizeof(SFU_LL_FLASH_write_t));
+      }
+    }
+    else
+    {
+      /* If read fail, then the write is performed unconditionally */
+      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                        sizeof(SFU_LL_FLASH_write_t));
+    }
+
+    /* Reload Watchdog every 4Kbytes */
+    if ((pdata % 0x1000U) == 0U)
+    {
+      (void) SFU_LL_SECU_IWDG_Refresh();
+    }
+  }
+  return e_ret_status;
+}
+
+/* Functions Definition : services ------------------------------------------- */
+
+/**
+  * @brief FW Image Handling (FWIMG) initialization function.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
+{
+  uint32_t i;
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+#if  !defined(SFU_NO_SWAP)
+  SFU_IMG_InitStatusTypeDef e_swap_ret_status;
+#endif /*(GENERATOR_2_FW_IMAGE) && !(SFU_NO_SWAP) */
+
+  /*
+   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
+   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
+   * starting with 0s.
+   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
+   * side-effects).
+   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
+   */
+  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
+
+  /*
+   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
+      } /* else active slot is properly aligned */
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_DWL_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_DWL_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_DWL_1 + 1U]);
+      } /* else dwl slot is properly aligned */
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
+   */
+  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
+  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
+   */
+  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the chunks used for decrypt match the FLASH constraints
+   */
+  if (0U != (uint32_t)(SFU_IMG_CHUNK_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The size of the chunks used to store the decrypted data must be a multiple of the FLASH write length */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] Decrypt chunk size (%d) is not matching the FLASH constraints\r\n", SFU_IMG_CHUNK_SIZE);
+  } /* else the decrypt chunk size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the chunk size used for decrypt is fine with regards to AES CBC constraints.
+   *               This block alignment constraint does not exist for AES GCM but we do not want to specialize the code
+   *               for a specific crypto scheme.
+   */
+  if (0U != (uint32_t)((uint32_t)SFU_IMG_CHUNK_SIZE % (uint32_t)AES_BLOCK_SIZE))
+  {
+    /* For AES CBC block encryption/decryption the chunks must be aligned on the AES block size */
+    e_ret_status = SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] Chunk size (%d) is not matching the AES CBC constraints\r\n", SFU_IMG_CHUNK_SIZE);
+  }
+
+  /*
+   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (((SlotStartAdd[SLOT_ACTIVE_1 + i] - FLASH_BASE) / FLASH_PAGE_SIZE) <= SFU_PROTECT_WRP_PAGE_END_1)
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the dwl slot does not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_DWL_1 + i];
+    if (start_add != 0U)
+#else /* (__GNUC__) */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (((SlotStartAdd[SLOT_DWL_1 + i] - FLASH_BASE) / FLASH_PAGE_SIZE) <= SFU_PROTECT_WRP_PAGE_END_1)
+      {
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
+   */
+  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
+        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap dwl slot area
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_DWL_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_DWL_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_DWL_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+#if  !defined(SFU_NO_SWAP)
+  /*
+   * Sanity check: specific swap process checks
+   */
+  e_swap_ret_status = SFU_IMG_CheckSwapImageHandling();
+  if (e_swap_ret_status != SFU_IMG_INIT_OK)
+  {
+    e_ret_status = e_swap_ret_status;
+  }
+#endif /* defined(SFU_NO_SWAP) */
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief This function makes sure the current active firmware will not be considered as valid any more.
+  *        This function alters the FLASH content.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
+  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image metadata.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  * @note This function populates the FWIMG module variable: fw_image_header_validated
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
+{
+  /*
+   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
+   */
+  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
+  *       fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (SFU_ERROR == e_ret_status)
+  {
+    /* We do not memorize any specific error, the FSM state is already providing the info */
+    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
+  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
+}
+
+/**
+  * @brief Verifies if no malicious code in active slot.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
+{
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
+}
+
+/**
+  * @brief  Control firmware signature
+  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
+                    SE_TAG_LEN) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  else
+  {
+    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+    return SFU_SUCCESS;
+  }
+
+}
+
+/**
+  * @brief Launches the user application.
+  *        The caller must be prepared to never get the hand back after calling this function.
+  *        If a problem occurs, it must be memorized in the bootinfo area.
+  *        If the caller gets the hand back then this situation must be handled as a critical error.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met
+  *       (typically: no security check performed before launching the firmware).
+  * @note This function only handles the "system" aspects.
+  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
+  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
+  *       function (as this needs to be done just before jumping into the user application).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Verify if authentication/integrity/lock SE service performed */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
+
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+
+#if defined(SFU_MPU_PROTECT_ENABLE)
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+  e_ret_status = SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+  HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+  /* Avoid systick interruption during UserApp start-up
+     systick will be re-initialized by HAL_Init() during execution of main() from UserApp */
+  HAL_SuspendTick();
+
+  /* Initialize address of user application to jump into */
+  jump_address = *(__IO uint32_t *)((SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET + 4));
+  p_jump_to_function = (Function_Pointer) jump_address;
+
+  /* Initialize user application's Stack Pointer */
+  __set_MSP(*(__IO uint32_t *)(SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET));
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* JUMP into User App */
+    p_jump_to_function();
+  }
+
+  /* The point below should NOT be reached */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Get the version of the active FW
+  * @note It is up to the caller to make sure the active slot contains a valid active FW.
+  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
+  *       fails.
+  * @param  SlotNumber index of the slot in the list
+  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
+  */
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
+{
+  SE_FwRawHeaderTypeDef fw_image_header;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint16_t version = 0;
+
+  /* check the header of the active FW */
+  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* retrieve the version from the header without any further check */
+    version = fw_image_header.FwVersion;
+  }
+
+  return (version);
+}
+
+/**
+  * @brief Detect if a FW is present in a slot.
+  * @note  Detection done based on MAGIC header + FW signature. Header verification
+  *        not done at this stage for timing optimization.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
+  SE_FwRawHeaderTypeDef *p_header;
+
+  /* Read header */
+  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
+  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
+  {
+    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
+    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
+    {
+      /*
+       * Control if the first 32 bytes (could be more but time consuming ...) are significants
+       * At this location we should find the vector table.
+       * Objective is to detect if the FW image has been erased
+       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
+       */
+      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Validate the active FW image in active slot by installing the header
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /* Header writing: encrypted part with signature */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
+                                    SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+  /* Header writing : Do not update image state part */
+
+  /* Header writing: previous FW image fingerprint */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
+                                                                    SE_FW_HEADER_FINGERPRINT_LEN),
+                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Get firmware image ID from header.
+  * @param  pFwImageHeader pointer to a structure to handle the header info
+  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
+  */
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  uint32_t active_slot;
+
+  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_1;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_2;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_3;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
+  else
+  {
+    active_slot = SLOT_INACTIVE;
+  }
+
+  return active_slot;
+}
+
+/**
+  * @brief  Check candidate image version is allowed.
+  * @param  ActiveSlot Slot identification used in case of secure counters usage
+  * @param  CurrentVersion Version of currently installed image if any
+  * @param  CandidateVersion Version of candidate image
+  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  UNUSED(ActiveSlot);
+
+  /* If the header of the active firmware is not valid, the CurrentVersion is 0 */
+  if (CurrentVersion == 0U)
+  {
+    /*
+     * If the header of the active firmware is not valide (could comes from an attak atempt, we authorize only the
+     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
+     */
+    if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * It is not allowed to install a Firmware with a lower version than the active firmware.
+     * But we authorize the re-installation of the current firmware version.
+     * We also check that the candidate version is at least the min. allowed version for this device.
+     */
+    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief Verifies the validity of the metadata associated to a candidate image.
+  *        The anti-rollback check is performed.
+  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure):
+  *       SFU_IMG_CheckPendingInstallation should be called first.
+  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
+  *       @ref SFU_APP_VerifyFwHeader.
+  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint32_t active_slot;
+  uint16_t cur_ver;
+  uint16_t verif_ver;
+
+  /*
+   * - Candidate FW Header Authentication
+   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
+   *       As a consequence: fw_image_header_to_test is already populated
+   *
+   * - Check version is allowed
+   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+   */
+
+  /* Header analysis to find slot based on number with magic tag */
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /* Get the version of active_slot */
+  cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+
+  if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
+  {
+    /* The installation is forbidden */
+    /* Memorize this error as this will be handled as a critical failure */
+    SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+
+    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /* leave now to handle the critical failure in the appropriate FSM state */
+    e_ret_status = SFU_ERROR;
+  }
+  else
+  {
+    /* the anti-rollback check succeeds: the version is fine */
+    /* double check to avoid basic hardware attack attack */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    e_ret_status = SFU_IMG_CheckFwVersion(active_slot, verif_ver, fw_image_header_to_test.FwVersion);
+  }
+
+  /* Return the result */
+  return (e_ret_status);
+}
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_internal.h
new file mode 100644
index 00000000..a2e0d18c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_internal.h
@@ -0,0 +1,134 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_internal.h
+  * @author  MCD Application Team
+  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
+  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
+  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
+  *          fw_image_header_to_test to install an KMS blob.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_INTERNAL_H
+#define SFU_FWIMG_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_fwimg_regions.h"
+#include "kms_blob_metadata.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Payload Buffer descriptor.
+  * This structure describes how a Firmware is split in Flash.
+  * In the nominal case a Firmware is stored in 1 contiguous area.
+  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
+  * decrypt operation).
+  */
+typedef struct
+{
+  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
+  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
+} SE_Ex_PayloadDescTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief SFU_IMG Flash Status Type Definition
+  * Status of a FLASH operation.
+  */
+typedef enum
+{
+  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
+  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
+  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
+  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
+} SFU_IMG_StatusTypeDef;
+
+/**
+  * @brief RAM chunk used for decryption / comparison / swap
+  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
+  * some function allocates 2 buffer of this size in stack.
+  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
+  */
+#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
+
+#define SFU_IMG_CHUNK_SIZE  (512UL)
+#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief  Status Macro
+  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
+  * activated) and the execution continues.
+  */
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                   while(1==1){;} \
+                                 } while(0==1){;}
+#else
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                 } while(0==1){;}
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
+extern uint32_t SFU_IMG_Line;
+
+extern SE_FwRawHeaderTypeDef fw_image_header_validated;
+extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
+
+/* Exported functions : helper ---------------------------------------------- */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
+SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
+                          uint8_t  *pPayload, uint32_t SE_FwType);
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType);
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_INTERNAL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_no_swap.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_no_swap.c
new file mode 100644
index 00000000..f0fe88d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_no_swap.c
@@ -0,0 +1,919 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_no_swap.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the specific functionalities of the image handling for
+  *          the installation process without swap area.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_NO_SWAP_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+
+#if  defined(SFU_NO_SWAP)
+/* Private macros ------------------------------------------------------------*/
+#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH)
+
+/*             DWL_SLOT_REGION_SIZE             */
+/* <------------------------------------------> */
+/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH| */
+/* | header 1     | header 2     |SWAP magic  | */
+
+#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A] + SLOT_SIZE(A) - TRAILER_HEADER))
+#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
+#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
+
+#endif /* defined(SFU_NO_SWAP) */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#if  defined(SFU_NO_SWAP)
+
+/**
+  * @brief  Write Trailer Headers : TEST + VALID + SWAP
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  /* everything is in place , just compute from present data and write it */
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t  magic[MAGIC_LENGTH];
+  uint32_t buffer;
+
+  /* Write Headers VALID + TEST */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
+                                    SE_FW_HEADER_TOT_LEN);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
+                                      SE_FW_HEADER_TOT_LEN);
+  }
+
+  /* Write Magic */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    buffer = (uint32_t) pValidHeader;
+    (void) memcpy(&magic[0U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
+    buffer = (uint32_t) pTestHeader;
+    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                  MAGIC_LENGTH / 2U);
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check the magic from trailer or counter
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
+{
+  uint8_t  magic[MAGIC_LENGTH];
+  uint8_t  signature_valid[MAGIC_LENGTH / 2];
+  uint8_t  signature_test[MAGIC_LENGTH / 2];
+  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
+
+  /* Pattern initialization */
+  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
+
+  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
+  if (SFU_LL_FLASH_Read(signature_valid,
+                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_valid)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(signature_test,
+                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_test)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /*
+   * Check magic validity :
+   *  - last 16 bytes of validated header
+   *  - last 16 bytes of test header
+   *  - significant values (not an erased flash pattern)
+   */
+  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
+      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
+      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0))
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  check trailer validity to allow resume installation.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus  FirmwareToResume(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+
+  /*
+   *  Initial conditions to be fulfilled :
+   *   - Trailer magic is present
+   *   - Active slot number is correct
+   *   - test header from trailer is signed
+   *   - header from dwl slot is same as the one from trailer
+   */
+
+  /* check trailer Magic */
+  e_ret_status = CheckTrailerMagic(DwlSlot);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate the pTestHeader and verify it the active slot is correct */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate pTestHeader parameter */
+    e_ret_status = ParseFWInfo(pTestHeader, fw_header_trailer_test);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Active slot number correct ?
+       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
+    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
+    {
+      /* Check header test field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
+    }
+    else
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not valid!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Read header from dwl slot and verify this is the same as the test header from trailer */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
+                                     sizeof(fw_header_dwl_slot));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (memcmp(fw_header_dwl_slot, fw_header_trailer_test, SE_FW_AUTH_LEN) != 0U)
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not same as dwl slot header!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* First part KO : return error */
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Read header in active slot if any */
+  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                   sizeof(fw_header_active_slot));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify the header signature in active slot */
+    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
+
+    /* Populate pValidHeader parameter */
+    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header valid field in trailer */
+      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                       sizeof(fw_header_trailer_valid));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * 3 cases:
+       * - Header in active slot is identical to the header valid field
+       *   ==> installation interrupted very early. Resume install must be triggered.
+       * - Header in active slot is identical to the header test field
+       *   ==> installation interrupted after active header erasing. Resume install must be triggered.
+       * - Any other values
+       *   ==> Hack tentative, resume install must not be triggered.
+       */
+
+      /* Check if header in active slot is same as header valid in trailer */
+      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, SE_FW_AUTH_LEN) != 0)
+      {
+        /* Check candidate image version : should be OK */
+        e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+      }
+      /* Check if header in active slot is same as header test in trailer */
+      else if (memcmp(fw_header_active_slot, fw_header_trailer_test, SE_FW_AUTH_LEN) == 0U)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+      else
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  No resume required : Header in active slot is neither sames TRAILER_HDR_TEST as nor TRAILER_VALID_TEST!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        e_ret_status = SFU_ERROR;
+      }
+    }
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+  else
+  {
+    /*
+     * Header in active slot is not valid.
+     * It is considered this can not be hack attempt, because header in active slot is in
+     * protected area.
+     * Possible reasons:
+     * - Installation has been interrupted during very first image installation (active slot was empty)
+     * - Installation has been interrupted during reconstitution of first sector of active slot
+     * If header test field in trailer is signed and with proper version, we resume install.
+     */
+
+    /* Read header valid field in trailer */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                     sizeof(fw_header_trailer_valid));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check header valid field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* active slot was containing an active image */
+
+        /* Populate pValidHeader parameter */
+        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /* Check candidate image version */
+          e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+        }
+      }
+      else
+      {
+        /* active slot was empty : we authorize only the installation of a specific version identified by
+           SFU_FW_VERSION_INIT_NUM */
+        if (pTestHeader->FwVersion == SFU_FW_VERSION_INIT_NUM)
+        {
+          /* active slot was empty or was containing bricked Fw image */
+          e_ret_status = SFU_SUCCESS;
+        }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        else
+        {
+          TRACE("\r\n\t  Init version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, pTestHeader->FwVersion);
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+    }
+
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify signature on encrypted FW
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus VerifyFwSignatureBeforeDecrypt(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_decrypted_chunk_size;
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t fw_authenticated_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_authenticated_chunk_size;
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+  uint32_t fw_index;
+  uint32_t size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  /* Verify header presence */
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process initialization
+     ================================= */
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+  if (se_ret_status == SE_SUCCESS)
+  {
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+    se_ret_status = SE_AuthenticateFW_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+
+    /* Skip header : no decryption needed */
+    fw_index = SFU_IMG_IMAGE_OFFSET;
+
+    e_ret_status = SFU_SUCCESS;
+    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
+           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Set size of reading/decryption */
+      size = SFU_IMG_CHUNK_SIZE;
+
+      /* Last pass ? */
+      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
+      {
+        /* Default chunk size can be troncated at end of file */
+        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
+      }
+
+      /* read then decrypt phase
+       ======================= */
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        fw_decrypted_chunk_size = size;
+        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
+                                          (int32_t *)&fw_decrypted_chunk_size);
+
+        if (se_ret_status == SE_SUCCESS)
+        {
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+          fw_authenticated_chunk_size = sizeof(fw_authenticated_chunk);
+          se_ret_status = SE_AuthenticateFW_Append(&e_se_status, fw_decrypted_chunk, (int32_t)size,
+                                                   fw_authenticated_chunk, (int32_t *)&fw_authenticated_chunk_size);
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+          fw_index += size;
+        }
+      }
+    }
+  }
+
+  /* Do the Finalization, check the authentication TAG
+     ================================================= */
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
+  {
+    e_ret_status = SFU_ERROR;
+
+    /* Finalization stage */
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if (se_ret_status == SE_SUCCESS)
+    {
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+      e_ret_status = SFU_SUCCESS;
+#else
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status = SE_AuthenticateFW_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+      if ((se_ret_status == SE_SUCCESS) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, pFwImageHeader->FwTag, SE_TAG_LEN) == SFU_SUCCESS)
+        {
+          e_ret_status = SFU_SUCCESS;
+        }
+      }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Decrypt Image from dwl slot to active slot
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus DecryptImageFromDwlSlotToActiveSlot(uint32_t ActiveSlot, uint32_t DwlSlot,
+                                                           SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_index;
+  uint32_t size;
+  uint32_t fw_decrypted_chunk_size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  TRACE("\r\n\t  Image preparation done.\r\n\t  Installation started ...");
+
+  /* Verify header presence */
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Control the firwmare size vs slot size */
+  if ((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) > SLOT_SIZE(ActiveSlot))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process initialization
+     ================================= */
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+  if (se_ret_status == SE_SUCCESS)
+  {
+
+    /* Erasing operation
+     ================= */
+
+    /*
+     *  The header may not be contiguous with the FW image : 2 erasing operations needed
+     */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                           SFU_IMG_IMAGE_OFFSET);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                             (uint8_t *)(SlotStartAdd[ActiveSlot] + SFU_IMG_IMAGE_OFFSET),
+                                             SLOT_SIZE(ActiveSlot) - SFU_IMG_IMAGE_OFFSET);
+    }
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /*
+     * Save immediately the new active FW header
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_IMG_Validation(ActiveSlot, pFwImageHeader);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  Header writing failure!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+    }
+
+    /*
+     * Skip header : no decryption needed
+     */
+    fw_index = SFU_IMG_IMAGE_OFFSET;
+
+    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
+           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Refresh Watchdog every 10 iterations */
+      if ((fw_index % 10U) != 0U)
+      {
+        (void) SFU_LL_SECU_IWDG_Refresh();
+      }
+
+      /* Set size of reading/decryption */
+      size = SFU_IMG_CHUNK_SIZE;
+
+      /* Last pass ? */
+      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
+      {
+        /* Default chunk size can be troncated at end of file */
+        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
+      }
+
+      /* read then decrypt phase
+       ======================= */
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        fw_decrypted_chunk_size = size;
+        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
+                                          (int32_t *)&fw_decrypted_chunk_size);
+
+        /*
+        * writing phase
+        * =============== */
+        if (se_ret_status == SE_SUCCESS)
+        {
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotStartAdd[ActiveSlot] + fw_index),
+                                            fw_decrypted_chunk, size);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+          /* Update pointer */
+          fw_index += size;
+        }
+      }
+    }
+  }
+
+#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_index);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#endif /* SFU_ENCRYPTED_IMAGE */
+
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
+  {
+    /* Do the Finalization, check the authentication TAG*/
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if (se_ret_status != SE_SUCCESS)
+    {
+      e_ret_status = SFU_ERROR;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Install the new version
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                         SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+
+  /*
+   * Verify FW Image signature in dwl slot
+   */
+  e_ret_status = VerifyFwSignatureBeforeDecrypt(DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_SIGNATURE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Control if there is no additional code beyond the firmware image (malicious SW)
+   */
+  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot), pTestHeader->FwSize);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_ADDITIONAL_CODE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Write trailer : memorize installation process started
+   */
+  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_UPDATE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Decrypt the FW image : from dwl slot to active slot
+   */
+  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+    return e_ret_status;
+  }
+
+
+  /*
+   * erase downloaded FW after installation
+   */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    SFU_EXCPT_SetError(SFU_EXCPT_DWL_SLOT_ERASING_ERR);
+    return e_ret_status;
+  }
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to be populated
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+
+  /* Verify FW Image Header tag in dwl slot */
+  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
+                         SFU_IMG_IMAGE_OFFSET);
+
+    /* Check if there is enough room for the trailers */
+    if (trailer_begin < end_of_test_image)
+    {
+      /*
+       * This error causes is not memorized in the BootInfo area because there won't be any error handling
+       * procedure.
+       * If this function returns that no new firmware can be installed (as this may be a normal case).
+       */
+      e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+    else
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SFU_NO_SWAP) */
+
+
+
+/* Functions Definition : services ------------------------------------------- */
+
+#if  defined(SFU_NO_SWAP)
+/**
+  * @brief Checks if there is a pending firmware installation.
+  *        2 situations can occur:
+  *        A. Pending firmware installation: a firmware is ready to be installed.
+  *        B. No firmware installation pending
+  * @note  The anti-rollback check is not taken into account at this stage.
+  * @note  This function populates the FWIMG module variables: fw_image_header_to_test
+  * @param  pDwlSlotToInstall identification of the downloaded slot to install
+  * @param  pActiveSlotToResume identification of the active slot to resume
+  * @param  pActiveSlotToRollback identification of the active slot to rollback
+  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, no pending action)
+  */
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback)
+{
+  SFU_IMG_ImgInstallStateTypeDef e_ret_state = SFU_IMG_NO_FWUPDATE;
+  uint32_t i;
+  uint32_t j;
+
+  /* No rollback capability in "NO_SWAP" configuration */
+  *pActiveSlotToResume = SLOT_INACTIVE;
+  *pActiveSlotToRollback = SLOT_INACTIVE;
+  *pDwlSlotToInstall = SLOT_INACTIVE;
+
+  /* Check image installation stopped
+     ================================ */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+      {
+        /* Slot configured ? */
+        if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+        {
+          if (SFU_SUCCESS == FirmwareToResume(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
+                                               &fw_image_header_to_test))
+          {
+            /* A Firmware Update has been stopped
+             * fw_image_header_to_test & fw_image_header_validated have been populated
+             * Stop at first occurrence : next ones if any will be resumed after reset
+             */
+            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
+            *pDwlSlotToInstall = SLOT_DWL_1 + j;
+            return SFU_IMG_FWUPDATE_STOPPED;
+          }
+        }
+      }
+    }
+  }
+
+  /* Install new firmware if requested
+     ================================= */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + i, &fw_image_header_to_test))
+      {
+        /*
+         * A Firmware is available for installation:
+         * fw_image_header_to_test has been populated
+         * Stop at first occurrence : next ones if any will be installed after reset
+         */
+        *pDwlSlotToInstall = SLOT_DWL_1 + i;
+        return SFU_IMG_FWIMAGE_TO_INSTALL;
+      }
+    }
+  }
+
+  return e_ret_state;
+}
+
+/**
+  * @brief Resume installation : not required but present for compatibility with swap process
+  *        If installation procedure is interrupted (e.g.: switch off) it will be restarted from begin at next reboot.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS
+  */
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+
+  /*
+   * Decrypt the FW image : from dwl slot to active slot
+   */
+  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, &fw_image_header_to_test);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+  }
+
+  /*
+   * erase downloaded FW after installation
+   */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    SFU_EXCPT_SetError(SFU_EXCPT_DWL_SLOT_ERASING_ERR);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Resume procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Resume procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
+  *        valid if the checks are successful.
+  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
+  *        afterwards if the cryptographic scheme allows this (signature check for instance).
+  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
+  *        This function modifies the FLASH content.
+  *        If this procedure is interrupted (e.g.: switch off) installation will be restarted from begin at next reboot.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint32_t active_slot;
+
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /*
+   * Populate fw_image_header_validated
+   */
+  pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
+                                   sizeof(fw_image_header_validated));
+  
+  /*
+   * Installing the new firmware image consists in decrypting the candidate firmware image.
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
+  }
+
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    /* Erase downloaded FW in case of installation  error */
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Installation procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Installation procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  /* return the installation result */
+  return (e_ret_status);
+}
+#endif /* (SFU_NO_SWAP) */
+
+
+#if   defined(SFU_NO_SWAP)
+/**
+  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
+
+  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
+                                             SLOT_SIZE(DwlSlot));
+  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  return ((e_ret_status_dwl != SFU_SUCCESS) ?  SFU_ERROR : SFU_SUCCESS);
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SFU_NO_SWAP) */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_regions.h
new file mode 100644
index 00000000..0408a5ee
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_regions.h
@@ -0,0 +1,103 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_regions.h
+  * @author  MCD Application Team
+  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_REGIONS_H
+#define SFU_FWIMG_REGIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "se_crypto_config.h"
+
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  *  Slot list : 2 slots per image configuration + swap
+  */
+#define NB_SLOTS      4U
+#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
+#define SLOT_ACTIVE_1 1U
+#define SLOT_DWL_1    2U
+#define SLOT_SWAP     3U
+
+/* Calculation of the size of a slot */
+#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
+
+/*
+ * Design constraint: the image slot size must be a multiple of the swap area size.
+ * And of course both image slots must have the same size.
+ */
+#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
+
+/*
+ * Checking that the slot sizes are consistent with the .icf file
+ * Sizes expressed in bytes (+1 because the end address belongs to the slot)
+ * The checks are executed at runtime in the SFU_Img_Init() function.
+ */
+#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
+
+/**
+  * Image starting offset to add to the  address of 1st block
+  */
+#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
+
+
+/* External variables --------------------------------------------------------*/
+extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
+extern const uint32_t  SlotStartAdd[NB_SLOTS];
+extern const uint32_t  SlotEndAdd[NB_SLOTS];
+
+#if  (defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C))
+
+const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
+                                            SLOT_ACTIVE_1_HEADER,
+                                            SLOT_DWL_1_START,
+                                            SWAP_START,
+                                          };
+/* List of slot start address */
+const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
+                                            SLOT_ACTIVE_1_START,
+                                            SLOT_DWL_1_START,
+                                            SWAP_START,
+                                          };
+/* List of slot end address */
+const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
+                                            SLOT_ACTIVE_1_END,
+                                            SLOT_DWL_1_END,
+                                            SWAP_END,
+                                          };
+#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_REGIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_services.h
new file mode 100644
index 00000000..4d127d81
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_services.h
@@ -0,0 +1,95 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_services.h
+  * @author  MCD Application Team
+  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
+  *          API definitions.
+  *          These services can be called by the bootloader to deal with images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_SERVICES_H
+#define SFU_FWIMG_SERVICES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_IMG Initialization Status Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_IMG_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_IMG Image Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
+  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
+  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
+  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
+} SFU_IMG_ImgInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback);
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_SERVICES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_swap.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_swap.c
new file mode 100644
index 00000000..e2200b32
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_fwimg_swap.c
@@ -0,0 +1,2317 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_swap.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the specific functionalities of the image handling for
+  *          the installation process with swap area.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_SWAP_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h" /* to have definitions like SFU_IMG_InitStatusTypeDef
+                                   (required by sfu_fwimg_internal.h) */
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+#if  !defined(SFU_NO_SWAP)
+
+/* Private macros ------------------------------------------------------------*/
+#define TRAILER_INDEX(A)  (SLOT_SIZE(A) / SLOT_SIZE(SLOT_SWAP))
+/*  position of image begin on 1st block */
+#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH + MAGIC_LENGTH)
+
+/*                                         DWL_SLOT_REGION_SIZE                                             */
+/* <----------------------------------------------------------------------------------------------------->  */
+/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH|N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t) */
+/* | header 1     | header 2     |SWAP magic  |CLEAN pat.  | N*CPY_TO_ACTIVE_SLOT  | N*CPY_TO_DWL_SLOT      */
+/*                                                                                                          */
+/* Please note that the size of the trailer area (N*CPY_TO_SLOTx) depends directly on SFU_LL_FLASH_write_t type, */
+/* so it can differ from one platform to another (this is FLASH-dependent)                                       */
+#define TRAILER_SIZE(A) ((sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A)))\
+                         + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) + (uint32_t)(TRAILER_HEADER))
+#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A]\
+                                        + SLOT_SIZE(A) - TRAILER_SIZE(A)))
+#define TRAILER_CPY_TO_DWL_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
+                                              + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) \
+                                              + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
+#define TRAILER_CPY_TO_ACTIVE_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
+                                                 + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
+
+#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
+#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_CLEAN_ADDR(A)((uint8_t *)(TRAILER_BEGIN(A)\
+                                          + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH))
+
+#define CHUNK_1_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
+                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+#define CHUNK_0_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
+                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+
+#define CHUNK_0_ADDR_HEADER(A,B,C) ((((B)==0) && ((C)==0))?\
+                                    (uint8_t *)(SlotHeaderAdd[(A)]) : \
+                                    (uint8_t *)(SlotStartAdd[(A)]\
+                                                +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+
+#define CHUNK_0_ADDR_MODIFIED(A,B,C) ((((B)==0) && ((C)==0))?\
+                                      ((uint8_t*)(SlotStartAdd[(A)] + SFU_IMG_IMAGE_OFFSET)) : \
+                                      ((uint8_t*)(SlotStartAdd[(A)] + (SLOT_SIZE(SLOT_SWAP)*(B)) \
+                                                  + (SFU_IMG_CHUNK_SIZE*(C)))))
+#define CHUNK_SWAP_ADDR(B) ((uint8_t *)(SlotStartAdd[SLOT_SWAP]+(SFU_IMG_CHUNK_SIZE*(B))))
+
+/* Private variables ----------------------------------------------------------*/
+/* Trailer pattern : sizeof of write access type */
+static const int8_t SWAPPED[sizeof(SFU_LL_FLASH_write_t)] __attribute__((aligned(8))) = {0, 0, 0, 0, 0, 0, 0, 0};
+static const int8_t NOT_SWAPPED[sizeof(SFU_LL_FLASH_write_t)]  __attribute__((aligned(8))) = {-1, -1, -1, -1, -1, -1,
+                                                                                              -1, -1
+                                                                                             };
+
+/* Functions Definition : helper ---------------------------------------------*/
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Checks if a rollback is required
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if Image should be rollbacked, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToRollback(uint32_t SlotNumber, SE_FwStateTypeDef MasterSlotState)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus e_ret_status_se;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+  SE_FwStateTypeDef e_next_image_state;
+
+
+  /* If an image is detected, read the image state :
+   * if image is new, nothing to do. Switch from NEW to SELFTEST will be done before when launching user application.
+   * if image is selftest, set to invalid. Rollback required.
+   * if image is valid, nothing to do.
+   * if image is invalid, Rollback is required.
+   */
+  if (SFU_SUCCESS == SFU_IMG_DetectFW(SlotNumber))
+  {
+    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
+    if (e_ret_status_se == SE_SUCCESS)
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  SLOT_ACTIVE_%d state = %d", SlotNumber, image_state);
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+      switch (image_state)
+      {
+        case FWIMG_STATE_NEW:
+        {
+          /* Multiple reset can occur during installation
+           * Switch from NEW to SELFTEST will be done before when launching user application
+           */
+          break;
+        }
+        case FWIMG_STATE_SELFTEST:
+        {
+          if (MasterSlotState == FWIMG_STATE_VALID_ALL)
+          {
+            /* Master slot is in VALID_ALL state, all other images should be validated
+             * Compare to successive validation operations VALID_ALL is a single request thus robust to reset
+             */
+            e_next_image_state = FWIMG_STATE_VALID;
+            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            if (e_ret_status_se != SE_SUCCESS)
+            {
+              TRACE("\r\n\t  SLOT_ACTIVE_%d state update error", SlotNumber);
+            }
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+            e_ret_status = SFU_ERROR;
+          }
+          else
+          {
+            /* Bootloader should never find an image in SELFTEST state - bootloader
+             * assumes self test was not able to complete and marks image as INVALID
+             */
+            e_next_image_state = FWIMG_STATE_INVALID;
+            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            if (e_ret_status_se != SE_SUCCESS)
+            {
+              TRACE("\r\n\t  SLOT_ACTIVE_%d state update error", SlotNumber);
+            }
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+            e_ret_status = SFU_SUCCESS;
+          }
+          break;
+        }
+        case FWIMG_STATE_VALID:
+        case FWIMG_STATE_VALID_ALL:
+        {
+          break;
+        }
+        default:
+        {
+          /* image may be in INVALID state
+           * Image marked as invalid failed selftest so we need to attempt a rollback to last good image
+           */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Updates the finger print of the new firmware the header signature of the previous firmware
+  * @param  pNewHeader: pointer in ram to header of new installed fw
+  * @param  pPrevHeader: pointer in ram to header of backed-up fw
+  * @retval none
+  */
+static void UpdateHeaderFingerPrint(SE_FwRawHeaderTypeDef *pNewHeader, SE_FwRawHeaderTypeDef *pPrevHeader)
+{
+  (void) memcpy(pNewHeader->PrevHeaderFingerprint, pPrevHeader->HeaderSignature,
+                sizeof(pNewHeader->PrevHeaderFingerprint));
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+/**
+  * @brief  Check the magic from trailer or counter
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
+{
+  uint8_t  magic[MAGIC_LENGTH];
+  uint8_t  clean[MAGIC_LENGTH];
+  uint8_t  signature_valid[MAGIC_LENGTH / 2];
+  uint8_t  signature_test[MAGIC_LENGTH / 2];
+  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
+
+  /* Pattern initialization */
+  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
+
+  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
+  if (SFU_LL_FLASH_Read(signature_valid,
+                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_valid)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(signature_test,
+                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_test)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(clean, TRAILER_CLEAN_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /*
+   * Check magic validity :
+   *  - last 16 bytes of validated header
+   *  - last 16 bytes of test header
+   *  - significant values (not an erased flash pattern)
+   *
+   *  Check clean tag not set :
+   *  - should be erased flash pattern but not clean-up paatern (0x55 0x55 ...)
+   */
+  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
+      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
+      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0)
+      || (memcmp(clean, erased_flash_pattern, MAGIC_LENGTH) != 0))
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Write the minimum value possible on the flash
+  * @param  pAddr: pointer to address to write .
+  * @param  pValue: pointer to the value to write
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  *
+  * @note This function should be FLASH dependent.
+  *       We abstract this dependency thanks to the type SFU_LL_FLASH_write_t.
+  *       See @ref SFU_LL_FLASH_write_t
+  */
+static SFU_ErrorStatus AtomicWrite(uint8_t *pAddr, SFU_LL_FLASH_write_t *pValue)
+{
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  return SFU_LL_FLASH_Write(&flash_if_info, pAddr, (uint8_t *)pValue, sizeof(SFU_LL_FLASH_write_t));
+}
+
+/**
+  * @brief  Clean Magic value
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CleanMagicValue(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t clean_tag[MAGIC_LENGTH];
+
+  /* set the clean tag into trailer */
+  (void) memset(clean_tag, 0x55, MAGIC_LENGTH);
+  return SFU_LL_FLASH_Write(&flash_if_info, TRAILER_CLEAN_ADDR(DwlSlot), clean_tag, MAGIC_LENGTH);
+}
+
+/**
+  * @brief  Write Trailer Headers : TEST + VALID + SWAP
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  /* everything is in place , just compute from present data and write it */
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t  magic[MAGIC_LENGTH];
+  uint32_t buffer;
+
+  /* Write Headers VALID + TEST */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
+                                    SE_FW_HEADER_TOT_LEN);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
+                                      SE_FW_HEADER_TOT_LEN);
+  }
+
+  /* Write Magic */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    buffer = (uint32_t) pValidHeader;
+    (void) memcpy(&magic[0U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
+    buffer = (uint32_t) pTestHeader;
+    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                  MAGIC_LENGTH / 2U);
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the size of the swap area in a given slot sector.
+  * @note   The erasure occurs at @: @slot + index*swap_area_size
+  * @param  SlotNumber index of the slot in the list
+  * @param  Index This is the number of "swap size" we jump from the slot start
+  * @retval SFU_ SUCCESS if valid, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus EraseSlotIndex(uint32_t SlotNumber, uint32_t index)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t buffer;
+
+  buffer = SlotStartAdd[SlotNumber];
+  buffer = buffer + (SLOT_SIZE(SLOT_SWAP) * index);
+
+  /* If this is an active slot and the index is 0 then header is concerned */
+  if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber <= (SLOT_ACTIVE_1 + SFU_NB_MAX_ACTIVE_IMAGE)) && (index == 0U))
+  {
+
+    /*
+     *  As the header may not be contiguous with FW, this action is split in 2 actions :
+     *    - HEADER : executed in secured environment
+     *    - remaining part : done by SBSFU
+     */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                           SFU_IMG_IMAGE_OFFSET) ;
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SlotNumber] +
+                                             SFU_IMG_IMAGE_OFFSET, SLOT_SIZE(SLOT_SWAP) - SFU_IMG_IMAGE_OFFSET);
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)buffer, SLOT_SIZE(SLOT_SWAP)) ;
+  }
+
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify image signature of binary after decryption
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus VerifyFwSignatureAfterDecrypt(SE_StatusTypeDef *pSeStatus, uint32_t DwlSlot,
+                                                     SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SE_Ex_PayloadDescTypeDef payload_desc;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*
+   * The values below are not necessarily matching the way the firmware
+   * has been spread in FLASH but this is adjusted later on in the this function.
+   */
+  payload_desc.pPayload[0] = SlotStartAdd[SLOT_SWAP];
+  payload_desc.PayloadSize[0] = SLOT_SIZE(SLOT_SWAP);
+  payload_desc.pPayload[1] = SlotStartAdd[DwlSlot];
+  payload_desc.PayloadSize[1] = SLOT_SIZE(DwlSlot);
+
+  fw_size = pFwImageHeader->PartialFwSize;
+  fw_offset = (SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
+              SLOT_SIZE(SLOT_SWAP);
+
+  /*
+   * Adjusting the description of the way the Firmware is written in FLASH.
+   */
+  payload_desc.pPayload[0] = payload_desc.pPayload[0] + fw_offset;
+
+  /* The first part contains the execution offset so the payload size must be adjusted accordingly */
+  payload_desc.PayloadSize[0] = payload_desc.PayloadSize[0] - fw_offset;
+
+  if (fw_size <= payload_desc.PayloadSize[0])
+  {
+    /* The firmware is written fully in a contiguous manner */
+    payload_desc.PayloadSize[0] = fw_size;
+    payload_desc.PayloadSize[1] = 0U;
+    payload_desc.pPayload[1] = 0U;
+  }
+  else
+  {
+    /*
+     * The firmware is too big to be contained in the first payload slot.
+     * So, the firmware is split in 2 non-contiguous parts
+     */
+
+    if ((payload_desc.pPayload[1] == 0U)
+        || (payload_desc.PayloadSize[1] < (fw_size - payload_desc.PayloadSize[0])))
+    {
+      return SFU_ERROR;
+    }
+
+    /* The second part contains the end of the firmware so the size is the total size - size already stored in the
+       first area */
+    payload_desc.PayloadSize[1] = fw_size - payload_desc.PayloadSize[0];
+
+  }
+
+  /* Signature Verification */
+  return VerifyFwSignatureScatter(pSeStatus, DwlSlot, pFwImageHeader, &payload_desc, SE_FW_IMAGE_PARTIAL);
+}
+
+
+/**
+  * @brief  Swap active slot with decrypted FW to install
+  *         With the 2 images implementation, installing a new Firmware Image means swapping active slot and dwl slot.
+  *         To perform this swap, the image to be installed is split in blocks of the swap size:
+  *         SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP) blocks to be swapped .
+  *         Each of these blocks is swapped using smaller chunks of SFU_IMG_CHUNK_SIZE size.
+  *         The swap starts from the tail of the image and ends with the beginning of the image ("swap from tail to
+  *         head").
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus SwapFirmwareImages(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_LL_FLASH_write_t trailer;
+  int32_t index_active_slot;
+  int32_t index_dwl_slot_write;
+  int32_t index_dwl_slot_read;
+  int32_t chunk;
+  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  int32_t index_active_slot_partial_begin;
+  int32_t index_active_slot_partial_end;
+  int32_t index_active_slot_final_end;
+  int32_t index_dwl_slot_partial_end;
+  int32_t index_active_slot_empty_begin;
+  /* number_of_index_active_slot is the number of blocks in active slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
+  uint32_t number_of_index_active_slot = SLOT_SIZE(ActiveSlot) / SLOT_SIZE(SLOT_SWAP);
+  /* number_of_index_dwl_slot is the number of blocks in dwl slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
+  uint32_t number_of_index_dwl_slot = SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP);
+  /* number_of_chunk is the number of chunks used to swap 1 block (moving a block of SLOT_SIZE(SLOT_SWAP) bytes
+     split in number_of_chunk chunks of SFU_IMG_CHUNK_SIZE bytes) */
+  uint32_t number_of_chunk = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  uint32_t write_len;
+  uint32_t offset_block_partial_begin;
+  uint32_t offset_block_partial_end;
+  uint32_t offset_block_final_end;
+
+  TRACE("\r\n\t  Image preparation done.\r\n\t  Swapping the firmware images");
+
+  /* index_active_slot_partial_begin is the index of first block (of SLOT_SIZE(SLOT_SWAP) bytes) in active slot
+     impacted by partial image */
+  index_active_slot_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) /
+                                    SLOT_SIZE(SLOT_SWAP);
+
+  /* offset_block_partial_begin is the offset of first byte of partial image inside index_active_slot_partial_begin
+     block */
+  offset_block_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) %
+                               SLOT_SIZE(SLOT_SWAP);
+
+  /* In case of COMPLETE update, the full slots are swapped
+     Assumption : DwlSlot is at least greater than ActiveSlot */
+  if ((pFwImageHeader->FwSize == pFwImageHeader->PartialFwSize) && (SLOT_SIZE(DwlSlot) >= SLOT_SIZE(ActiveSlot)))
+  {
+    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in active slot */
+    index_active_slot_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_partial_end is the offset of first byte following partial image, inside
+       index_active_slot_partial_end block */
+    offset_block_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
+
+    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in dwl slot or swap area */
+    index_dwl_slot_partial_end = ((SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP)) - 1U;
+
+    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following final
+       image in active slot */
+    index_active_slot_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
+       block */
+    offset_block_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
+
+    /* set index_dwl_slot_write: starting from the end */
+    index_dwl_slot_write = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+  }
+  else
+  {
+    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in active slot */
+    index_active_slot_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
+                                     pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_partial_end is the offset of first byte following partial image, inside
+       index_active_slot_partial_end block */
+    offset_block_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
+                                pFwImageHeader->PartialFwSize) % SLOT_SIZE(SLOT_SWAP);
+
+    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in dwl slot or swap area */
+    index_dwl_slot_partial_end = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
+                                                            SLOT_SIZE(SLOT_SWAP))) % SLOT_SIZE(SLOT_SWAP) +
+                                   pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP)) - 1U;
+
+    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       final image in active slot */
+    index_active_slot_final_end = ((SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) / SLOT_SIZE(SLOT_SWAP));
+
+    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
+       block */
+    offset_block_final_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) % SLOT_SIZE(SLOT_SWAP);
+
+    /* set index_dwl_slot_write: starting from the end, block index in dwl slot or swap area to receive block from
+       active slot */
+    if (index_active_slot_partial_end == (number_of_index_active_slot - 1))
+    {
+      /* last block of dwl slot can only receive last block of active slot, due to trailer presence */
+      index_dwl_slot_write = number_of_index_dwl_slot - 1;
+    }
+    else
+    {
+      index_dwl_slot_write = number_of_index_dwl_slot - 2;
+    }
+  }
+
+  /* set index_active_slot: starting from the end, block index from active slot to copy in dwl slot */
+  index_active_slot = index_active_slot_partial_end;
+
+  /* set index_dwl_slot_read: starting from the end, block index in dwl slot or swap area to copy updated image to
+     active slot */
+  index_dwl_slot_read = index_dwl_slot_partial_end;
+
+  /* Adjust indexes in case offset is 0: in this case, first block to swap is the previous one */
+  if (offset_block_partial_end == 0)
+  {
+    index_active_slot--;
+    index_dwl_slot_read--;
+  }
+
+  /*
+   * dwl slot read index should be lower than dwl slot write index.
+   * If not the case, the dwl slot is not big enough to manage this partial firmware image
+   * (depends on offset and size).
+   */
+  if (index_dwl_slot_read >= index_dwl_slot_write)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Swap one block at each loop, until all targeted blocks of active slot have been copied
+   * Concerned blocks are:
+   * 1- block impacted by partial image
+   * 2- first block containing the header
+   */
+  while (index_active_slot >= 0)
+  {
+    /* Reload watchdoag every SWAP size */
+    SFU_LL_SECU_IWDG_Refresh();
+
+    TRACE(".");
+
+    if ((index_dwl_slot_write < -1) || (index_dwl_slot_read < -1))
+    {
+      return SFU_ERROR;
+    }
+
+    /* If CPY_TO_DWL_SLOT(i) is still virgin, then swap the block from active slot to dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
+                                     TRAILER_CPY_TO_DWL_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 - index_active_slot),
+                                     sizeof(trailer));
+    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
+    {
+      /* Erase destination block in dwl slot or swap, if not the trailer block */
+      if (index_dwl_slot_write != (number_of_index_dwl_slot - 1))
+      {
+        if (index_dwl_slot_write == -1)
+        {
+          /* Erase the swap */
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
+                                                 SLOT_SIZE(SLOT_SWAP));
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
+        }
+        else /* index_dwl_slot_write >= 0 */
+        {
+          /* erase the size of "swap area" at @: Dwl slot + index_dwl_slot_write*swap_area_size */
+          e_ret_status = EraseSlotIndex(DwlSlot, index_dwl_slot_write);
+        }
+        if (e_ret_status !=  SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+
+      /* Copy the block from active slot to dwl slot or swap (using "number_of_chunk" chunks) */
+      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
+      {
+        /* ignore return value,  no double ecc error is expected, area already read before */
+        (void)SFU_LL_FLASH_Read(buffer, CHUNK_0_ADDR_HEADER(ActiveSlot, index_active_slot, chunk), sizeof(buffer));
+        write_len = sizeof(buffer);
+        if (index_dwl_slot_write == -1)
+        {
+          /* Destination block is the swap */
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_SWAP_ADDR(chunk), buffer, write_len);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+          if (e_ret_status != SFU_SUCCESS)
+          {
+            return SFU_ERROR;
+          }
+        }
+        else /* index_dwl_slot_write >= 0 */
+        {
+          /* Destination block is in dwl slot: Do not overwrite the trailer. */
+          if (((uint32_t)CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk)) < (uint32_t)TRAILER_BEGIN(DwlSlot))
+          {
+            /*  write is possible length can be modified  */
+            if ((uint32_t)(CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) + write_len) >
+                (uint32_t)TRAILER_BEGIN(DwlSlot))
+            {
+              write_len = TRAILER_BEGIN(DwlSlot) - CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk);
+            }
+            e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                              buffer, write_len);
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+      }
+
+      /*
+       * The block of the active firmware has been backed up.
+       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
+       */
+      e_ret_status  = AtomicWrite(TRAILER_CPY_TO_DWL_SLOT(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
+                                  (SFU_LL_FLASH_write_t *) SWAPPED);
+
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+        return SFU_ERROR;
+      }
+    }
+
+    /* If CPY_TO_ACTIVE_SLOT(i) is still virgin, then swap the block from dwl slot to active slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
+                                     TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 -
+                                                                index_active_slot),
+                                     sizeof(trailer));
+    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
+    {
+      /* erase the size of "swap area" at @: active slot + index_active_slot*swap_area_size*/
+      e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
+
+      if (e_ret_status !=  SFU_SUCCESS)
+      {
+        return SFU_ERROR;
+      }
+
+      /*
+       * Fill block in active slot:
+       * The appropriate update image block of dwl slot together with initial image block that has been backed up in
+       * dwl slot,
+       * are associated to constitute final block in active slot (installing the block of the new firmware image).
+       */
+      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
+      {
+        /* Read complete chunk of updated image */
+        if (index_dwl_slot_read == -1)
+        {
+          /* ignore return value, no double ecc error is expected, area already read before */
+          (void)SFU_LL_FLASH_Read(buffer, CHUNK_SWAP_ADDR(chunk), sizeof(buffer));
+        }
+        else /* index_dwl_slot_read >= 0 */
+        {
+          /* ignore return value, no double ecc error is expected, area already read before */
+          (void)SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_read, chunk), sizeof(buffer));
+        }
+
+        /* Last impacted block: end of block has to be updated with initial image */
+        if (index_active_slot == index_active_slot_partial_end)
+        {
+          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
+          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) >= (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
+                                                                                  0) + offset_block_partial_end))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             sizeof(buffer));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+
+          /* If chunk is partially impacted by updated image, end of chunk is updated with the initial image content */
+          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) < (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
+                                                                                  0) + offset_block_partial_end))
+              && ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1))) >
+                  (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_end)))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer + (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
+                                             CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) +
+                                             (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
+                                             sizeof(buffer) - (offset_block_partial_end % SFU_IMG_CHUNK_SIZE));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+
+        /* First impacted block: beginning of block has to be updated with initial image */
+        if (index_active_slot == index_active_slot_partial_begin)
+        {
+          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
+          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) <=
+              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             sizeof(buffer));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+
+          /* If chunk is partially impacted by updated image, beginning of chunk is updated with the initial image
+             content */
+          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) <
+               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)) &&
+              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) >
+               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             offset_block_partial_begin % SFU_IMG_CHUNK_SIZE);
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+        /* Header block not impacted by partial image: complete block, except header, is updated with initial image */
+        else if (index_active_slot == 0)
+        {
+          /* check return value, as this area has not been read before */
+          e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk), sizeof(buffer));
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+          if (e_ret_status != SFU_SUCCESS)
+          {
+            return SFU_ERROR;
+          }
+        }
+
+        /* Last block of final image: end of block has to be cleaned with empty data */
+        if (index_active_slot == index_active_slot_final_end)
+        {
+          /* If chunk is completely beyond the final image, then chunk takes empty data */
+          if (CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) >=
+              CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)
+          {
+            memset(buffer, 0xFF, sizeof(buffer));
+          }
+
+          /* If chunk is partially beyond the final image, then chunk is partially updated with empty data */
+          if ((CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) <
+               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)) &&
+              (CHUNK_0_ADDR(ActiveSlot, index_active_slot, (chunk + 1)) >
+               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)))
+          {
+            memset(buffer + (offset_block_final_end % SFU_IMG_CHUNK_SIZE), 0xFF,
+                   sizeof(buffer) - (offset_block_final_end % SFU_IMG_CHUNK_SIZE));
+          }
+        }
+
+        write_len = SFU_IMG_CHUNK_SIZE;
+        /*  don't copy header in active slot
+            this will be done at the end during validation step */
+        if ((index_active_slot == 0) && (chunk == 0))
+        {
+          write_len = write_len - SFU_IMG_IMAGE_OFFSET;
+        }
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_0_ADDR_MODIFIED(ActiveSlot, index_active_slot, chunk),
+                                          buffer, write_len);
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+        if (e_ret_status != SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+
+      /*
+       * The block of the active firmware has been backed up.
+       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
+       * Except for block 0, because block 0 is incomplete at this stage (final header installation not yet done)
+       */
+      if (index_active_slot != 0)
+      {
+        e_ret_status  = AtomicWrite(TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot,
+                                                               (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
+                                    (SFU_LL_FLASH_write_t *) SWAPPED);
+
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+        if (e_ret_status != SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+    }
+
+    /* Decrement all block indexes */
+    index_dwl_slot_write--;
+    index_dwl_slot_read--;
+    index_active_slot--;
+
+    /*
+     * After having copied the impacted image blocks from active slot, copy also the first block
+     * due to header, if not already copied among the impacted image blocks.
+     */
+    if ((index_active_slot < index_active_slot_partial_begin) && (index_active_slot >= 0))
+    {
+      index_active_slot = 0;
+      index_dwl_slot_read = -1;  /* force read from swap area, to avoid exiting dwl slot / swap index allowed range */
+    }
+  }
+
+  /*
+   * Now, erase the blocks in active slot, located after final image
+   */
+  if (offset_block_final_end == 0)
+  {
+    index_active_slot_empty_begin = index_active_slot_final_end;
+  }
+  else
+  {
+    index_active_slot_empty_begin = index_active_slot_final_end + 1;
+  }
+  index_active_slot = number_of_index_active_slot - 1;
+  while (index_active_slot >= index_active_slot_empty_begin)
+  {
+    e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
+    if (e_ret_status !=  SFU_SUCCESS)
+    {
+      return SFU_ERROR;
+    }
+
+    /* Decrement block index */
+    index_active_slot--;
+  }
+
+  return e_ret_status;
+}
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/**
+  * @brief  Executes a rollback to the original firmware if a firmware update fails
+  * @param  ActiveSlot identification of the new active image
+  * @param  DwlSlot identification of previous firmware image (backed-up slot)
+  * @param  pFwImageHeader pointer in ram to the header of the backed-up FW
+  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
+  */
+static SFU_ErrorStatus RollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot,
+                                            SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t number_chunk_per_sector = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  SE_FwRawHeaderTypeDef *p_header;
+  uint32_t size;
+  uint32_t pass_index;
+  uint32_t erase_index;
+  uint32_t fw_source_address;
+  uint32_t fw_dest_write_address;
+  uint32_t fw_dest_erase_address;
+
+  if (number_chunk_per_sector == 0U)
+  {
+    return SFU_ERROR;
+  }
+
+  size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET;
+  fw_source_address = SlotStartAdd[DwlSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
+  fw_dest_write_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
+  fw_dest_erase_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SLOT_SIZE(SLOT_SWAP)) * SLOT_SIZE(SLOT_SWAP));
+  pass_index = ((size - 1U) / SFU_IMG_CHUNK_SIZE) + 1U;
+  erase_index = (pass_index - 1U) / number_chunk_per_sector * number_chunk_per_sector;
+
+  /* Erase the part of the active slot that will not be updated
+     ========================================================== */
+  size = (SLOT_SIZE(ActiveSlot) - (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)) / SLOT_SIZE(SLOT_SWAP) *
+         SLOT_SIZE(SLOT_SWAP);
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)(fw_dest_erase_address + SLOT_SIZE(SLOT_SWAP)),
+                                         size);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  while ((e_ret_status == SFU_SUCCESS) && (pass_index > 0U))
+  {
+    /* Reading phase
+       =============== */
+    e_ret_status = SFU_LL_FLASH_Read(buffer, (uint8_t *) fw_source_address, SFU_IMG_CHUNK_SIZE);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+    /* Erasing operation when aligned on erase_index
+       ============================================= */
+
+    /*
+     *  The header may not be contiguous with the FW image : 2 erasing operations needed
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if ((((pass_index - 1U) / number_chunk_per_sector) * number_chunk_per_sector) == erase_index)
+      {
+        (void) SFU_LL_SECU_IWDG_Refresh();
+        size = 0U;
+        if (erase_index == 0U)
+        {
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                                 SFU_IMG_IMAGE_OFFSET);
+          size = SFU_IMG_IMAGE_OFFSET;
+        }
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) fw_dest_erase_address + size,
+                                                 SLOT_SIZE(SLOT_SWAP) - size);
+        }
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+        erase_index -= number_chunk_per_sector;
+        fw_dest_erase_address -= SLOT_SIZE(SLOT_SWAP);
+      }
+    }
+
+    /* Writing phase
+       ============= */
+    /*
+     * Header is under isolated environment protection
+     * Thus the writing operation is split in 2 actions (HEADER + remaining part)
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      size = 0U;
+      if (pass_index == 1U)
+      {
+        /* Ensure there is no Fingerprint in original firmware header
+         * This stops someone attempting multiple rollbacks by writing fake fingerprint in original header
+         */
+        p_header = (SE_FwRawHeaderTypeDef *) buffer;
+        (void) memset(p_header->PrevHeaderFingerprint, 0x00, sizeof(p_header->PrevHeaderFingerprint));
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],  buffer,
+                                          SFU_IMG_IMAGE_OFFSET);
+        size = SFU_IMG_IMAGE_OFFSET;
+      }
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) fw_dest_write_address + size,  buffer + size,
+                                          SFU_IMG_CHUNK_SIZE - size);
+      }
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+    }
+
+    /* Index update
+       ============ */
+    pass_index--;
+    fw_source_address -= SFU_IMG_CHUNK_SIZE;
+    fw_dest_write_address -= SFU_IMG_CHUNK_SIZE;
+  }
+
+  return e_ret_status;
+}
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+
+/**
+  * @brief Decrypt Image in dwl slot
+  * @ note Decrypt is done from dwl slot to dwl slot + swap with 2 images (swap contains 1st sector)
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer in ram to the header to decrypt
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus DecryptImageInDwlSlot(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  uint32_t NumberOfChunkPerSwap = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  /*  chunk size is the maximum , the 1st block can be smaller */
+  /*  the chunk is static to avoid  large stack */
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_source_address = 0U;
+  uint32_t fw_dest_address_write = 0U;
+  uint32_t fw_dest_erase_address = 0U;
+  uint32_t fw_decrypted_total_size = 0U;
+  uint32_t size;
+  uint32_t oldsize;
+  uint32_t fw_decrypted_chunk_size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+  uint32_t pass_index = 0U;
+  uint32_t erase_index = 0U;
+
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process*/
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_PARTIAL);
+  if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK))
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Decryption loop*/
+    while ((e_ret_status == SFU_SUCCESS) && (fw_decrypted_total_size < (pFwImageHeader->PartialFwSize)) &&
+           (e_se_status == SE_OK))
+    {
+      if (pass_index == NumberOfChunkPerSwap)
+      {
+        fw_dest_address_write = SlotStartAdd[DwlSlot];
+        fw_dest_erase_address =  fw_dest_address_write;
+        erase_index = NumberOfChunkPerSwap;
+      }
+      if (pass_index == 0U)
+      {
+        fw_source_address = SlotStartAdd[DwlSlot] + SFU_IMG_IMAGE_OFFSET +
+                            (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP));
+        fw_dest_erase_address = SlotStartAdd[SLOT_SWAP];
+        fw_dest_address_write = fw_dest_erase_address + ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
+                                                                                  SLOT_SIZE(SLOT_SWAP))) %
+                                                         SLOT_SIZE(SLOT_SWAP));
+        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk) -
+                                  ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
+                                   sizeof(fw_decrypted_chunk));
+        if (fw_decrypted_chunk_size > pFwImageHeader->PartialFwSize)
+        {
+          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize;
+        }
+        pass_index = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)))
+                       % SLOT_SIZE(SLOT_SWAP)) / sizeof(fw_decrypted_chunk));
+      }
+      else
+      {
+        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk);
+
+        /* For the last 2 pass, divide by 2 remaining buffer to ensure that :
+         *     - chunk size greater than 16 bytes : minimum size of a block to be decrypted
+         *     - except last one chunk size is 16 bytes aligned
+         *
+         * Pass n - 1 : remaining bytes / 2 with (16 bytes alignment for crypto AND sizeof(SFU_LL_FLASH_write_t) for
+         *              flash programming)
+         * Pass n : remaining bytes
+         */
+
+        /* Last pass : n */
+        if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < fw_decrypted_chunk_size)
+        {
+          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize - fw_decrypted_total_size;
+        }
+        /* Previous pass : n - 1 */
+        else if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < ((2U * fw_decrypted_chunk_size) - 16U))
+        {
+          fw_decrypted_chunk_size = ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) / 32U) * 16U;
+
+          /* Set dimension to the appropriate length for FLASH programming.
+           * Example: 64-bit length for L4.
+           */
+          if ((fw_decrypted_chunk_size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
+          {
+            fw_decrypted_chunk_size = fw_decrypted_chunk_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                                                                 (fw_decrypted_chunk_size %
+                                                                  (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+          }
+        }
+        /* All others pass */
+        else
+        {
+          /* nothing */
+        }
+      }
+
+      size = fw_decrypted_chunk_size;
+
+      /* Decrypt Append*/
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *) fw_source_address, size);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+        break;
+      }
+      if (size != 0U)
+      {
+        se_ret_status = SE_Decrypt_Append(&e_se_status, (uint8_t *)fw_encrypted_chunk, (int32_t)size,
+                                          fw_decrypted_chunk, (int32_t *)&fw_decrypted_chunk_size);
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+        fw_decrypted_chunk_size = 0U;
+      }
+      if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK) && (fw_decrypted_chunk_size == size))
+      {
+        /* Erase Page */
+        if ((pass_index == erase_index)
+            || (pass_index == ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) /
+                               sizeof(fw_decrypted_chunk))))
+        {
+          (void) SFU_LL_SECU_IWDG_Refresh();
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address,
+                                                 SLOT_SIZE(SLOT_SWAP)) ;
+          erase_index += NumberOfChunkPerSwap;
+          fw_dest_erase_address += SLOT_SIZE(SLOT_SWAP);
+        }
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /*
+           * For last pass with remaining size not aligned on 16 bytes : Set dimension AFTER decrypt to the appropriate
+           * length for FLASH programming.
+           * Example: 64-bit length for L4.
+           */
+          if ((size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
+          {
+            /*
+            * By construction, SFU_IMG_CHUNK_SIZE is a multiple of sizeof(SFU_LL_FLASH_write_t) so there is no risk to
+             * read out of the buffer
+             */
+            oldsize = size;
+            size = size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+            while (oldsize < size)
+            {
+              fw_decrypted_chunk[oldsize] = 0xFF;
+              oldsize++;
+            }
+          }
+
+          /* Write Decrypted Data in Flash - size has to be 32-bit aligned */
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)fw_dest_address_write,  fw_decrypted_chunk,
+                                            size);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+          if (e_ret_status == SFU_SUCCESS)
+          {
+            /* Update flash pointer */
+            fw_dest_address_write  += (size);
+
+            /* Update source pointer */
+            fw_source_address += size;
+            fw_decrypted_total_size += size;
+            (void) memset(fw_decrypted_chunk, 0xff, sizeof(fw_decrypted_chunk));
+            pass_index += 1U;
+
+          }
+        }
+      }
+    }
+  }
+
+#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_decrypted_total_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#endif /* SFU_ENCRYPTED_IMAGE */
+
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS) && (e_se_status == SE_OK))
+  {
+    /* Do the Finalization, check the authentication TAG*/
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if ((se_ret_status != SE_SUCCESS) || (e_se_status != SE_OK))
+    {
+      e_ret_status = SFU_ERROR;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+    else
+    {
+      /* erase the remaining part of the image after shifting inside dwl slot */
+      if (pass_index <= NumberOfChunkPerSwap)
+      {
+        fw_dest_erase_address = SlotStartAdd[DwlSlot];
+      }
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address, SLOT_SIZE(SLOT_SWAP));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  check trailer validity to allow resume installation.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus  FirmwareToResume(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN];
+
+  /*
+   *  Initial conditions to be fulfilled :
+   *   - Trailer magic is present
+   *   - Active slot number is correct
+   *   - test header from trailer is signed
+   */
+
+  /* check trailer Magic */
+  e_ret_status = CheckTrailerMagic(DwlSlot);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate the pTestHeader and verify it the active slot is correct */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate pTestHeader parameter */
+    e_ret_status = ParseFWInfo(pTestHeader, fw_header_trailer_test);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Active slot number correct ?
+       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
+    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
+    {
+      /* Check header test field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
+    }
+    else
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not valid!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Read header in active slot if any */
+  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                   sizeof(fw_header_active_slot));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify the header signature in active slot */
+    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
+
+    /* Populate pValidHeader parameter */
+    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header valid field in trailer */
+      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                       sizeof(fw_header_trailer_valid));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check if header in active slot is same as header valid in trailer */
+      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, SE_FW_AUTH_LEN) != 0)
+      {
+        /*
+         * Header in active slot is not identical to header valid field:
+         * Either install is already complete (if header in active slot is same as header test field in trailer),
+         * or there is hack tentative.
+         * In both cases, resume install must not be triggered.
+         */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  No resume required : TRAILER_HDR_VALID already stored in active slot!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /* Check candidate image version */
+        e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+      }
+    }
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+  else
+  {
+    /*
+     * Header in active slot is not valid.
+     * It is considered this can not be hack attempt, because header in active slot is in
+     * protected area.
+     * Possible reasons:
+     * - Swap has been interrupted during very first image installation (active slot was empty)
+     * - Swap has been interrupted during reconstitution of first sector of active slot
+     * If header test field in trailer is signed and with proper version, we resume install.
+     */
+
+    /* Read header valid field in trailer */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                     sizeof(fw_header_trailer_valid));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check header valid field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* active slot was containing an active image */
+
+        /* Populate pValidHeader parameter */
+        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /* Check candidate image version */
+          e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+        }
+      }
+      else
+      {
+        /* active slot was empty or was containing bricked Fw image */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+
+  return e_ret_status;
+}
+
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus e_ret_status_se;
+  SE_StatusTypeDef e_se_status;
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+
+  /*
+    * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
+    * to be able to handle a specific error cause.
+    */
+  /*  check swap header */
+  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, DwlSlot, &image_state);
+    if (e_ret_status_se == SE_SUCCESS)
+    {
+      /* Control the size of image to be installed taking into account trailers */
+      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET);
+
+      if ((image_state != FWIMG_STATE_NEW) || (trailer_begin < end_of_test_image))
+      {
+        /*
+          * These error causes are not memorized in the BootInfo area because there won't be any error handling
+          * procedure.
+          * If this function returns that no new firmware can be installed (as this may be a normal case).
+          */
+        e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        if (image_state != FWIMG_STATE_NEW)
+        {
+          TRACE("\r\n\t  The image state of SLOT_DWL_%d is not FWIMG_STATE_NEW!", DwlSlot);
+        }
+        if (trailer_begin < end_of_test_image)
+        {
+          TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  return e_ret_status;
+}
+
+#else
+
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *p_header_swap;
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+  int32_t ret;
+  /*
+     * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
+     * to be able to handle a specific error cause.
+     */
+
+  /*  check swap header */
+  e_ret_status = CheckAndGetFWHeader(SLOT_SWAP, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*  compare the header in dwl slot with the header in swap */
+    p_header_swap = (uint8_t *) pFwImageHeader;
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
+                                     sizeof(fw_header_dwl_slot));
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* image header in dwl slot not consistent with swap header */
+      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
+                           SFU_IMG_IMAGE_OFFSET);
+
+      /* the header in swap must be the same as the header in dwl slot */
+      ret = memcmp(fw_header_dwl_slot, p_header_swap, SE_FW_HEADER_TOT_LEN);
+
+      /* Check if there is enough room for the trailers */
+      if ((trailer_begin < end_of_test_image) || (ret != 0))
+      {
+        /*
+          * These error causes are not memorized in the BootInfo area because there won't be any error handling
+          * procedure.
+          * If this function returns that no new firmware can be installed (as this may be a normal case).
+          */
+        e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        if (trailer_begin < end_of_test_image)
+        {
+          TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+        } /* check next error cause */
+
+        if (ret != 0)
+        {
+          TRACE("\r\n\t  The headers in dwl slot and swap area do not match!");
+        } /* else do not print the message(s) again */
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+
+/**
+  * @brief Prepares the Candidate FW image for Installation.
+  *        This stage depends on the supported features: in this example this consists in decrypting the candidate
+  *        image.
+  * @note Even if the Firmware Image is in clear format the decrypt function is called.
+  *       But, in this case no decrypt is performed, it is only a set of copy operations
+  *       to organize the Firmware Image in FLASH as expected by the swap procedure.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus PrepareCandidateImageForInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+    * Control if there is no additional code beyond the firmware image (malicious SW)
+    */
+  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot),
+                            pFwImageHeader->PartialFwSize + (pFwImageHeader->PartialFwOffset %
+                                                             SLOT_SIZE(SLOT_SWAP)));
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_ADDITIONAL_CODE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * Pre-condition: all checks have been performed,
+    *                so all FWIMG module variables are populated.
+    * Now we can decrypt in FLASH.
+    *
+    * Initial FLASH state (focus on dwl slot and swap area):
+    *
+    * Depending on partial FW offset, we can have:
+    * <dwl slot>   : {Candidate Image Header + encrypted FW - page k}
+    *                {encrypted FW - page k+1}
+    *                .....
+    *                {encrypted FW - page k+N}
+    *                .....
+    * </dwl slot>
+    * or:
+    * <dwl slot>   : {Candidate Image Header }
+    *                {encrypted FW - page k}
+    *                .....
+    *                {encrypted FW - page k+N}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area>  : {Candidate Image Header}
+    * </Swap area>
+    */
+  e_ret_status =  DecryptImageInDwlSlot(DwlSlot, pFwImageHeader);
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page k}
+    * </Swap area>
+    *
+    * The Candidate FW image has been decrypted
+    * and a "hole" has been created in dwl slot to be able to swap.
+    */
+
+  e_ret_status = VerifyFwSignatureAfterDecrypt(&e_se_status, DwlSlot, pFwImageHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_SIGNATURE_ERR);
+  }
+
+  /* Return the result of this preparation */
+  return (e_ret_status);
+}
+
+
+/**
+  * @brief  Install the new version
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                         SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area> : {No Header (shift) + decrypted FW data from page k}
+    * </Swap area>
+    *
+    */
+
+  /* erase "swap area" size at the end of dwl slot */
+  e_ret_status = EraseSlotIndex(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1U));
+  if (e_ret_status !=  SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_ERASING_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    *                {at least the swap area size at the end of the last page of dwl slot is empty }
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
+    * </Swap area>
+    *
+    */
+
+
+  /*  write trailer  */
+  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_UPDATE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    *                {the last page of dwl slot ends with the trailer magic patterns and the free space for the trailer
+    *                 info}
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
+    * </Swap area>
+    *
+    * The trailer magic patterns is ActiveFwHeader|CandidateFwHeader|SWAPmagic.
+    * This is followed by a free space to store the trailer info (N*CPY_TO_ACTIVE_SLOT) and (N*CPY_TO_DWL_SLOT):
+    *
+    *<------------------------------------------ Last page of dwl slot --------------------------------------->
+    * |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH |N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t)
+    * | header 1     | header 2     |SWAP magic  |CLEAN pattern|N*CPY_TO_ACTIVE_SLOT   | N*CPY_TO_DWL_SLOT
+    *
+    */
+
+  /*  swap  */
+  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_SWAP_ERR);
+    return e_ret_status;
+  }
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /* Update fingerprint from previous FW image */
+  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Validate immediately the new active FW */
+  e_ret_status = SFU_IMG_Validation(ActiveSlot, pTestHeader);
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_HEADER_VALIDATION_ERR);
+    return e_ret_status;
+  }
+
+  /* clear swap pattern */
+  e_ret_status = CleanMagicValue(DwlSlot);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Memorize the error */
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_MAGIC_ERR);
+    return e_ret_status;
+  }
+
+  return e_ret_status;   /* Leave the function now */
+}
+
+/* Functions Definition : services ------------------------------------------- */
+/**
+  * @brief FW Image Handling (FWIMG) initialization function from swap process.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void)
+{
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+  uint32_t i;
+
+  /*
+   * Sanity check: let's make sure the slot sizes are correct
+   * to avoid discrepancies between linker definitions and constants in sfu_fwimg_regions.h
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP))))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d size (%d) must be a multiple of swap size (%d)\r\n",
+              SLOT_ACTIVE_1 + i, SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP));
+        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
+      }
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP))))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d size (%d) must be a multiple of swap size (%d)\r\n",
+              i + 1U, SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP));
+        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the slot size is correct with regards to the swap procedure constraints.
+   * The swap procedure cannot succeed if the trailer info size is bigger than what a chunk used for swapping can carry.
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (((int32_t)(SFU_IMG_CHUNK_SIZE - (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)))) < 0)
+      {
+        e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+        TRACE("\r\n= [FWIMG] %d bytes required for the swap metadata of SLOT_DWL_%d is too much\r\n",
+              (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)), i + 1U);
+      } /* else the swap settings are fine from a metadata size perspective */
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the swap size is correct with regards to the swap procedure constraints.
+   * The swap size must be a multiple of the chunks size used to do the swap.
+   */
+#if defined(__GNUC__)
+  __IO uint32_t swap_size = SLOT_SIZE(SLOT_SWAP), swap_chunk = SFU_IMG_CHUNK_SIZE;
+  if (0U != ((uint32_t)(swap_size % swap_chunk)))
+#else
+  if (0U != ((uint32_t)(SLOT_SIZE(SLOT_SWAP) % SFU_IMG_CHUNK_SIZE)))
+#endif /* __GNUC__ */
+  {
+    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the swap size (%d) is not a multiple\r\n",
+          SFU_IMG_CHUNK_SIZE, SLOT_SIZE(SLOT_SWAP));
+  } /* else the swap settings are fine from a chunk size perspective */
+
+  /*
+   * Sanity check: let's make sure the chunks used for the swap procedure are big enough with regards to the offset
+   * giving the start @ of the firmware
+   */
+  if (((int32_t)(SFU_IMG_CHUNK_SIZE - SFU_IMG_IMAGE_OFFSET)) < 0)
+  {
+    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the firmware start offset is %d bytes\r\n",
+          SFU_IMG_CHUNK_SIZE, SFU_IMG_IMAGE_OFFSET);
+  } /* else the swap settings are fine from a firmware start offset perspective */
+
+  /*
+   * Sanity check: let's make sure SWAP slot is properly aligned with regards to flash constraints
+   */
+
+  if (!IS_ALIGNED(SlotStartAdd[SLOT_SWAP]))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] swap (%x) is not properly aligned\r\n",
+          SlotStartAdd[SLOT_SWAP]);
+  } /* else swap is properly aligned */
+
+  /*
+   * Sanity check: let's make sure the swap area does not overlap SB code area protected by WRP)
+   */
+  if (((SlotStartAdd[SLOT_SWAP] - FLASH_BASE) / FLASH_PAGE_SIZE) <= SFU_PROTECT_WRP_PAGE_END_1)
+  {
+    TRACE("\r\n= [FWIMG] SWAP overlaps SBSFU code area protected by WRP\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap Swap area)
+   */
+  if (!(((SlotStartAdd[SLOT_SWAP]) > KMS_DATASTORAGE_END)
+        || ((SlotEndAdd[SLOT_SWAP]) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps Swap area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /* FWIMG core initialization completed */
+  return e_ret_status;
+}
+
+
+
+/**
+  * @brief Checks if there is a pending firmware installation.
+  *        3 situations can occur:
+  *        A. Pending firmware installation: a firmware is ready to be installed but the installation has never been
+  *           triggered so far.
+  *        B. Pending firmware installation resume: a firmware installation has been interrupted and a resume procedure
+  *           is required to finalize installation.
+  *        C. No firmware installation pending
+  * @note  The anti-rollback check is not taken into account at this stage.
+  *        But, if the firmware to be installed already carries some metadata (VALID tag) a newly downloaded firmware
+  *        should not have then the installation is not considered as pending.
+  * @note This function populates the FWIMG module variables:
+  *        - case SFU_IMG_FWUPDATE_STOPPED : fw_image_header_to_test & fw_image_header_validated
+  *        - case SFU_IMG_FWIMAGE_TO_INSTALL : fw_image_header_to_test
+  *        - case SFU_IMG_NO_FWUPDATE : none
+  * @param  pDwlSlotToInstall identification of the downloaded slot to install
+  * @param  pActiveSlotToResume identification of the active slot to resume
+  * @param  pActiveSlotToRollback identification of the active slot to rollback
+  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, pending resume install, no
+  *         pending action)
+  */
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback)
+{
+  uint32_t i;
+  uint32_t j;
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  SE_FwStateTypeDef master_slot_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /*
+   * The order of the checks is important:
+   *
+   * A. Check if a FW update has been interrupted first.
+   *    This check is based on the content of the trailer area and the validity of the update image.
+   *
+   * B. Check if a Firmware image is waiting to be installed.
+   */
+
+  /* Init values */
+  *pActiveSlotToResume = SLOT_INACTIVE;
+  *pActiveSlotToRollback = SLOT_INACTIVE;
+  *pDwlSlotToInstall = SLOT_INACTIVE;
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /*
+   * Read MASTER_SLOT state (if configured == (!= 255)) :
+   *   In case of VALID_ALL state, all other slots in SELF_TEST should be validated
+   *   Else all other slots in SELF_TEST are invalidated
+   */
+  if (MASTER_SLOT != 0xFFU)
+  {
+    if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
+    {
+      if (SE_SFU_IMG_GetActiveFwState(&e_se_status, MASTER_SLOT, &master_slot_state) != SE_SUCCESS)
+      {
+        master_slot_state = FWIMG_STATE_INVALID;
+      }
+    }
+  }
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Check image installation stopped or installation to be done
+     =========================================================== */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+      /* Rollback if seltftest not validated
+         =================================== */
+      if (SFU_SUCCESS == FirmwareToRollback(SLOT_ACTIVE_1 + i, master_slot_state))
+      {
+        /* The firmware state is either FWIMG_STATE_SELFTEST or FWIMG_STATE_INVALID
+         * Rollback is required
+         * Stop at first occurrence : next ones if any will be resumed after reset
+         */
+        *pActiveSlotToRollback = SLOT_ACTIVE_1 + i;
+        return SFU_IMG_FWIMAGE_ROLLBACK;
+      }
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+      /* Check trailer valide : installation stopped ?
+         ============================================= */
+      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+      {
+        /* Slot configured ? */
+        if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+        {
+          if (SFU_SUCCESS == FirmwareToResume(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
+                                               &fw_image_header_to_test))
+          {
+            /* A Firmware Update has been stopped
+             * fw_image_header_to_test & fw_image_header_validated have been populated
+             * Stop at first occurrence : next ones if any will be resumed after reset
+             */
+            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
+            *pDwlSlotToInstall = SLOT_DWL_1 + j;
+            return SFU_IMG_FWUPDATE_STOPPED;
+          }
+        }
+      }
+    }
+  }
+
+  /* Install new firmware if requested in the swap
+     ============================================= */
+  for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+    {
+      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + j, &fw_image_header_to_test))
+      {
+        /*
+         * A Firmware is available for installation:
+         * fw_image_header_to_test has been populated
+         * Stop at first occurrence : next ones if any will be installed after reset
+         */
+        *pDwlSlotToInstall = SLOT_DWL_1 + j;
+        return SFU_IMG_FWIMAGE_TO_INSTALL;
+      }
+    }
+  }
+
+  return SFU_IMG_NO_FWUPDATE;
+}
+
+/**
+  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
+  *        valid if the checks are successful.
+  *        The anti-rollback check is performed and errors are memorized in the bootinfo area, but no action is taken
+  *        in this procedure.
+  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
+  *        afterwards if the cryptographic scheme allows this (signature check for instance).
+  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
+  *        This function modifies the FLASH content.
+  *        If this procedure is interrupted during image preparation stage (e.g.: switch off) it cannot be resumed.
+  *        If it is interrupted during installation stage, it can be resumed.
+  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *        running the procedure): SFU_IMG_CheckPendingInstallation, SFU_IMG_CheckCandidateVersion should be called
+  *        first.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint32_t active_slot = 0U;
+
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /*
+   * The preparation stage consists in decrypting the candidate firmware image.
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
+   */
+  e_ret_status = PrepareCandidateImageForInstall(DwlSlot, &fw_image_header_to_test);
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    goto exit;
+  }
+
+  /*
+   * Populate fw_image_header_validated
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
+                                     sizeof(fw_image_header_validated));
+  }
+
+  /*
+   * Installing the new firmware image consists in swapping the 2 FW images.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
+  }
+
+exit:
+  /* Erase downloaded FW in case of authentication/integrity error
+     Erase downloaded FW also in case of installation issue to avoid any infinite loop */
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Installation procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Installation procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  /* return the installation result */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Resume installation of new valid firmware after installation failure.
+  *        If this procedure is interrupted before its completion (e.g.: switch off) it can be resumed.
+  *        This function is dedicated (only) to the resume of installation when a new firmware installation is stopped
+  *        before its completion.
+  *        This function does not handle explicitly the metadata tagging the firmware as valid: these metadata must
+  *        have been preserved during the installation procedure.
+  *        This function modifies the FLASH content.
+  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *        running the procedure): need to make sure an installation has been interrupted.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+   * resume swap process
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation()call.
+   */
+  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, &fw_image_header_to_test);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_SWAP_ERR);
+    goto exit;
+  }
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /* Update fingerprint from previous FW image */
+  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Validate immediately the new active FW */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_IMG_Validation(ActiveSlot, &fw_image_header_to_test);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_EXCPT_SetError(SFU_EXCPT_HEADER_VALIDATION_ERR);
+      goto exit;
+    }
+  }
+
+  /* clear swap pattern */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = CleanMagicValue(DwlSlot);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      /* Memorize the error */
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_MAGIC_ERR);
+      goto exit;
+    }
+  }
+
+exit:
+  /* Erase downloaded FW in case of installation issue to avoid any infinite loop */
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Resume procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Resume procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return e_ret_status;
+}
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/**
+  * @brief Executes a rollback to the original firmware if a firmware update fails
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t zero_buffer[32U] = {0U};
+  SE_FwRawHeaderTypeDef active_header;
+  SE_FwRawHeaderTypeDef dwl_header;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+
+  /* Verify slot 1 header is from fw that triggered the update */
+  /* Backed-up header is in flash Slot1 at pHdr address */
+  /* Load current header (start of Slot 0, normally behind the firewall) */
+  e_ret_status =  SFU_LL_FLASH_Read((uint8_t *)&active_header, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                    sizeof(dwl_header));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* if fingerprint is 0x00 we cannot do rollback */
+    if (0U == memcmp(active_header.PrevHeaderFingerprint, zero_buffer, sizeof(active_header.PrevHeaderFingerprint)))
+    {
+      e_ret_status = SFU_ERROR;
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR);
+      goto exit;
+    }
+  }
+
+  /* Get and check previous FW header saved in DWL slot
+     then compare header signature with active slot header finger print */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = CheckAndGetFWHeader(DwlSlot, &dwl_header);
+    if (SFU_SUCCESS == e_ret_status)
+    {
+      /* Fingerprint of active firmware should be the signature of previous firmware */
+      if (0 != memcmp(active_header.PrevHeaderFingerprint, dwl_header.HeaderSignature,
+                      sizeof(active_header.PrevHeaderFingerprint)))
+      {
+        e_ret_status = SFU_ERROR;
+        SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR);
+        goto exit;
+      }
+    }
+  }
+
+  /* Rollback execution */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = RollbackInstallation(ActiveSlot, DwlSlot, &dwl_header);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_ERR);
+      goto exit;
+    }
+  }
+
+exit:
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Rollback is complete, now erase downloaded image to prevent an attempt to
+     * reinstall
+     */
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+  else
+  {
+    /* Erase the header of active slot to avoid any infinite loop */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                           SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Rollback procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Rollback procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Updates the state of the current firmware
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SE_ErrorStatus e_ret_status_se;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+  SE_FwStateTypeDef e_next_image_state;
+
+  /* Read Image state : if image is new, set to self test
+   *
+   * An OTA image arrives on the device in the NEW state
+   * The bootloader switches the new image to SELFTEST state so
+   * that when the image boots it can detect that it should carry out the
+   * self test routine
+   */
+  e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
+  if (e_ret_status_se == SE_SUCCESS)
+  {
+    if (image_state == FWIMG_STATE_NEW)
+    {
+      e_next_image_state = FWIMG_STATE_SELFTEST;
+      e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+      if (e_ret_status_se == SE_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+      else
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  SLOT_ACTIVE_%d state = %d failed to switch in FWIMG_STATE_SELFTEST", SlotNumber,
+              image_state);
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+  return e_ret_status;
+}
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @brief  Get size of the trailer
+  * @note   This area mapped at the end of a dwl slot is not available for the firmware image
+  * @param  SlotNumber index of the slot in the list
+  * @retval Size of the trailer.
+  */
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber)
+{
+  return TRAILER_SIZE(SlotNumber);
+}
+
+/**
+  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
+  SFU_ErrorStatus e_ret_status_swap = SFU_ERROR;
+
+  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
+                                             SLOT_SIZE(DwlSlot));
+  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  e_ret_status_swap = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
+                                              SLOT_SIZE(SLOT_SWAP));
+  STATUS_FWIMG(e_ret_status_swap == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  return (((e_ret_status_swap != SFU_SUCCESS) || (e_ret_status_dwl != SFU_SUCCESS)) ?  SFU_ERROR : SFU_SUCCESS);
+}
+
+#endif /* !(SFU_NO_SWAP) */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c
new file mode 100644
index 00000000..9083965c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c
@@ -0,0 +1,747 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
+#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
+                               STM32 board specificities */
+#include "tkms.h"
+#include "sfu_interface_crypto_scheme.h"
+#include <string.h>
+#include "kms_platf_objects_interface.h"     /* To get keys handle definitions */
+
+/* Private defines -----------------------------------------------------------*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+#define GCM_TAGBITS_SIZE          128
+#define GCM_IVLEN_BITS            16
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+/* Private variables ---------------------------------------------------------*/
+CK_SESSION_HANDLE EncryptSession;
+CK_SESSION_HANDLE DecryptSession;
+CK_SESSION_HANDLE AuthenticateSession;
+CK_SESSION_HANDLE VerifySession;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static uint8_t *gcm_tag_header;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Get AES key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/**
+  * @brief  Get ECDSA key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
+
+
+/**
+  * @brief Secure Engine Decrypt Init function.
+  *        It is a wrapper of Decrypt_Init function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+  gcm_tag_header = pxSE_Metadata->FwTag;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_MECHANISM cktest_aes_cbc_mechanism =
+  {
+    CKM_AES_CBC,
+    iv_cbc,
+    SE_IV_LEN
+  };
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * In this crypto scheme the Firmware is not encrypted.
+   * The Decrypt operation is called anyhow before installing the firmware.
+   * Indeed, it allows moving the Firmware image blocks in FLASH.
+   * These moves are mandatory to create the appropriate mapping in FLASH
+   * allowing the swap procedure to run without using the swap area at each and every move.
+   *
+   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
+   */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the decryption session */
+  if (se_status == SE_SUCCESS)
+  {
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do as we won't decrypt anything */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Append function.
+  *        It is a wrapper of Decrypt_Append function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffe pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
+  if (0 == InputSize)
+  {
+    /* Nothing to do but we must return a success for the decrypt operation to continue */
+    return (SE_SUCCESS);
+  }
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  /* Buffer decryption */
+  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * The firmware is not encrypted.
+   * The only thing we need to do is to recopy the input buffer in the output buffer
+   */
+  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
+  *pOutputSize = InputSize;
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Finish function.
+  *        It is a wrapper of Decrypt_Finish function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  *peSE_Status = SE_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  memcpy(pOutputBuffer, gcm_tag_header, 16);
+
+  /* End-up decryption session */
+  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do */
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Close the session */
+  rv = C_CloseSession(DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Init function.
+  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  CK_MECHANISM cktest_sha_256_mechanism =
+  {
+    CKM_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize encryption session  */
+    rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest initialization */
+  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Append function.
+  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Buffer encryption */
+  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
+                       (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest calculation */
+  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Finish function.
+  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* End-up encryption session */
+  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* End-up Digest calculation */
+  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Close the session */
+  rv = C_CloseSession(AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Verify Raw Fw Header Tag.
+  *        It verifies the signature of a raw header file.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pFwRawHeader pointer to RawHeader Buffer.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  int32_t fw_raw_header_output_length = SE_TAG_LEN;
+  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
+  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    (CK_BYTE_PTR)gcm_header,
+    ((int32_t)SE_FW_AUTH_LEN),
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  const uint8_t *pPayload;                        /* Metadata payload */
+  int32_t payloadSize;                            /* Metadata length to be considered for hash */
+  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
+  CK_OBJECT_HANDLE hECDSAKey = 0UL;
+  CK_MECHANISM cktest_ecdsa_256_mechanism =
+  {
+    CKM_ECDSA_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointers allocation */
+  if (NULL == pxFwRawHeader)
+  {
+    *peSE_Status = SE_KO;
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  gcm_tag_header = pxFwRawHeader->HeaderSignature;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up decryption session  : control if the tag is correct */
+  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
+
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  pPayload = (const uint8_t *)pxFwRawHeader;
+  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up verification process : control if the signature is correct */
+  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Double Check to avoid basic fault injection */
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+
+    if (se_status == SE_SUCCESS)
+    {
+      /* End-up verification process : control if the signature is correct */
+      rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+      if (rv != CKR_OK)
+      {
+        se_status = SE_ERROR;
+        *peSE_Status = SE_KO;
+      }
+    }
+  }
+
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+  /* Close the session */
+  rv = C_CloseSession(VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_kms.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_kms.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_kms.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_kms.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_loader.c
new file mode 100644
index 00000000..30a80b45
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_loader.c
@@ -0,0 +1,785 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update LOADER module.
+  *          This file provides set of firmware functions to manage SFU local
+  *          loader functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include <stdlib.h>
+#include "main.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h" /* for metadata authentication */
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_services.h"      /* for version checking & to check if a valid FW is installed (the local
+                                        bootloader is a kind of "application" running in SB_SFU) */
+#include "app_sfu.h"
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef MINICOM_YMODEM
+/*
+ * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
+ * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
+ */
+/* With Minicom YMODEM each packet carries 128 bytes of data */
+static uint8_t alignedBuffer[SFU_COM_YMODEM_PACKET_SIZE] __attribute__((aligned(8)));
+#endif /* MINICOM_YMODEM */
+static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
+static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
+static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
+static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
+static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
+static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
+static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
+static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_Init(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  */
+
+  /*
+   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
+   * when doing a length alignment before writing in FLASH.
+   */
+#ifndef MINICOM_YMODEM
+  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_1K_SIZE bytes of payload */
+  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_1K_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints",
+          SFU_COM_YMODEM_PACKET_1K_SIZE);
+    return SFU_ERROR;
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+#else /* MINICOM_YMODEM */
+  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_SIZE bytes of payload */
+  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints", SFU_COM_YMODEM_PACKET_SIZE);
+    return SFU_ERROR;
+  }
+#endif /* MINICOM_YMODEM */
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  DeInitialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DeInit(void)
+{
+  /*
+   * ADD SRC CODE HERE
+   */
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Download a new User Fw.
+  *         Writes firmware received via Ymodem in FLASH.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  p_DwlSlot identification of the downloaded area
+  * @param  p_Size Size of the downloaded image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
+                                             uint32_t *pSize)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
+
+  /* Check the pointers allocation */
+  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Refresh Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Transfer FW Image via YMODEM protocol */
+  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
+
+  /* Initialize global variables to be used during the YMODEM process */
+  m_uDwlAreaAddress = 0U;
+  m_uDwlAreaStart = 0U;
+  m_uDwlAreaSize = 0U;
+  m_uFileSizeYmodem = 0U;
+  m_uNbrBlocksYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uDwlSlot = SLOT_DWL_1;
+  m_LoaderStatus = SFU_LOADER_ERR_COM;
+
+  /* Receive the FW in RAM and write it in the Flash*/
+  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
+  {
+    if (*pSize > 0U)
+    {
+      /* File download correct*/
+      m_LoaderStatus = SFU_LOADER_OK;
+    }
+  }
+  else
+  {
+    /* Nothing to do : m_LoaderStatus updated during during YModem process */
+  }
+
+  /* Provide slot information to the caller
+     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
+     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
+  *pDwlSlot = m_uDwlSlot;
+
+
+  *peSFU_LOADER_Status = m_LoaderStatus;
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+#if  !defined(SFU_NO_SWAP)
+  uint32_t uLength;
+#endif /* !SFU_NO_SWAP */
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet*/
+    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
+  if (m_uPacketsReceived == 1U)
+  {
+
+    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+#if   defined(SFU_NO_SWAP)
+
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+#else
+      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
+         Partial Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwSize +
+                      (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
+                      SFU_IMG_IMAGE_OFFSET;
+#endif /* (SFU_NO_SWAP) */
+    }
+
+    /* Clear Download application area (including TRAILERS area) */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+          SFU_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+  }
+
+#if  !defined(SFU_NO_SWAP)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* This packet : contains end of FW header */
+    if ((m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)) &&
+        ((m_uDwlAreaAddress + rx_size) >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE bytes length) */
+      uLength = SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE;
+      if (uLength == 0U)
+      {
+        uLength = SFU_COM_YMODEM_PACKET_1K_SIZE;
+      }
+      if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, uLength) == SFU_SUCCESS)
+      {
+        /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
+        m_uDwlAreaAddress += uLength + (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset %
+                                        SLOT_SIZE(SLOT_SWAP));
+
+        /* Update remaining packet size to write */
+        rx_size -= uLength;
+
+        /* Update p_data pointer to received packet data */
+        p_data += uLength;
+      }
+      else
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+#endif /* !SFU_NO_SWAP */
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL image size */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Set dimension to the appropriate length for FLASH programming.
+     * Example: 64-bit length for L4.
+     */
+    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
+    {
+      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+      uOldSize = rx_size;
+      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+      while (uOldSize < rx_size)
+      {
+        p_data[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL area */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Write Data in Flash */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, rx_size) == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress += (rx_size);
+    }
+    else
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#else /* MINICOM_YMODEM */
+/* Minicom variant of the YMODEM protocol: uses 128B packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
+    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_SIZE);
+    }
+  }
+
+
+  /*
+   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
+   */
+
+  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
+     not encrypted  */
+  if (1 == m_uPacketsReceived)
+  {
+    /* First packet: beginning of header */
+    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
+    {
+      /* Copy the beginning of the header */
+      memcpy(fw_header, p_data, rx_size);
+      rx_size = 0U; /* nothing more to do */
+    }
+    else
+    {
+      /* Unexpected case */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else if (2U == m_uPacketsReceived)
+  {
+    /* Second packet: end of header (64 bytes) */
+    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
+    rx_size -= 64U;
+    p_data += 64U;
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
+         Partial Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwSize +
+                      (((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
+                      SFU_IMG_IMAGE_OFFSET;
+
+      /* Clear Download application area (including TRAILERS area) */
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+              SFU_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
+            == SFU_SUCCESS)
+        {
+          /* Shift the DWL area pointer (still to be aligned image with (PartialFwOffset % sector size) in DWL area ) */
+          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+      /* The remaining 64 bytes of data must be handled : standard processing */
+    }
+  }
+  /*
+   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
+   */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * End of the second packet (64B) or full 128B packet
+     * Skip padding bytes then take partial FW offset into account
+     */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      /* Skip the padding bytes */
+      m_uDwlAreaAddress += rx_size;
+      rx_size = 0U;
+    }
+    else
+    {
+      /*
+       * m_uDwlAreaAddress >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)
+       */
+      if (((SFU_IMG_IMAGE_OFFSET / SFU_COM_YMODEM_PACKET_SIZE) + 1) == m_uPacketsReceived)
+      {
+        /* End of padding bytes : We must take the partial offset into account */
+        m_uDwlAreaAddress += ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+      }
+      /* else nothing more to do */
+
+      /* Check size to avoid writing beyond DWL image size */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /*
+       * Set dimension to the appropriate length for FLASH programming.
+       * Example: 64-bit length for L4.
+       */
+      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        /*
+         * By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         * sizeof(SFU_IMG_write_t) to avoid reading out of the buffer
+         */
+        uOldSize = rx_size;
+        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                             (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+        while (uOldSize < rx_size)
+        {
+          p_data[uOldSize] = 0xFF;
+          uOldSize++;
+        }
+      }
+
+      /* Check size to avoid writing beyond DWL area */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Write Data in Flash */
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /*
+         * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
+         * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
+         */
+        memcpy(alignedBuffer, p_data, rx_size);
+
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, alignedBuffer, rx_size) == SFU_SUCCESS)
+        {
+          m_uDwlAreaAddress += (rx_size);
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+
+
+/**
+  * @brief  Verifies the Raw Fw Header received. It checks if the header is
+  *         authentic and if the fields are ok with the device (e.g. size and version).
+  * @note   Please note that when the new image is installed, this metadata is checked
+  *         by @ref SFU_IMG_CheckCandidateVersion.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  pBuffer: pointer to header Buffer.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef              e_se_status;
+  SE_FwRawHeaderTypeDef         *p_x_fw_raw_header;
+  SFU_FwImageFlashTypeDef       fw_image_flash_data;
+  uint16_t                      cur_ver;
+  uint16_t                      verif_ver;
+  uint32_t                      active_slot;
+
+  /*Parse the received buffer*/
+  p_x_fw_raw_header = (SE_FwRawHeaderTypeDef *)(uint32_t)pBuffer;
+  /*Check if the received header packet is authentic*/
+  if (SE_VerifyHeaderSignature(&e_se_status, p_x_fw_raw_header) != SE_ERROR)
+  {
+    active_slot = SFU_IMG_GetFwImageSlot(p_x_fw_raw_header);
+    /*
+     * 2 slots per image configuration. Identify the download area.
+     *   It will be based on SFU magic :
+     *   - same number as active_slot if configured.
+     *   - else : SLOT_DWL_1
+     *    As example : Header magic is SFU2, active slot is SLOT_ACTIVE_2 and dwl slot will be SLOT_DWL2.
+     */
+    m_uDwlSlot = active_slot - SLOT_ACTIVE_1 + SLOT_DWL_1;
+    if (SLOT_SIZE(m_uDwlSlot) == 1U)
+    {
+      m_uDwlSlot = SLOT_DWL_1;
+    }
+    SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
+
+    /* Assign the download flash address to be used during the YMODEM process */
+    m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
+    m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
+
+    /*
+     * Check if the version is allowed
+     * ==> SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+     */
+    cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+#if  defined(SFU_NO_SWAP)
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+#else
+      /*
+       * Check length :
+       *      We do not check the length versus the trailer constraint because this check is already implemented in
+       *      FirmwareToInstall().
+       *      If the firmware is too big to have some room left for the trailer info then the installation will not be
+       *      triggered.
+       *      The interest is to avoid duplicating the checks (checking just in time).
+       *      This is also because in the case of a download handled by the UserApp we cannot rely on the checks done
+       *      by the UserApp before installing a FW.
+       *      The drawback is that the firmware can be downloaded in dwl slot though it is too big.
+       *
+       *      Nevertheless, we can still detect if the FW is too big to be downloaded (cannot be written in dwl slot).
+       *      This will avoid download issues (but the installation itself can still be rejected) or overflows.
+       *      The dwl slot must contain the HEADER and also the binary FW (encrypted).
+       *      But there is an offset of FW_OFFSET_IMAGE bytes to respect.
+       */
+      if ((p_x_fw_raw_header->PartialFwSize + (p_x_fw_raw_header->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) >
+          (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+#endif /* SFU_NO_SWAP */
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, cur_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+
+
+    /*
+     * Control of version and length is done twice to avoid basic hardware attack
+     * This more important for the 1 image configuration as the installation is done during the download procedure
+     * For the 2 images configuration anti-rollback will be checked again during installation process
+     */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, verif_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+#if  defined(SFU_NO_SWAP)
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+#else
+      /*
+       * Check length :
+       *      We do not check the length versus the trailer constraint because this check is already implemented in
+       *      FirmwareToInstall().
+       *      If the firmware is too big to have some room left for the trailer info then the installation will not be
+       *      triggered.
+       *      The interest is to avoid duplicating the checks (checking just in time).
+       *      This is also because in the case of a download handled by the UserApp we cannot rely on the checks done
+       *      by the UserApp before installing a FW.
+       *      The drawback is that the firmware can be downloaded in dwl slot though it is too big.
+       *
+       *      Nevertheless, we can still detect if the FW is too big to be downloaded (cannot be written in dwl slot).
+       *      This will avoid download issues (but the installation itself can still be rejected) or overflows.
+       *      The dwl slot must contain the HEADER and also the binary FW (encrypted).
+       *      But there is an offset of FW_OFFSET_IMAGE bytes to respect.
+       */
+      if ((p_x_fw_raw_header->PartialFwSize + (p_x_fw_raw_header->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) >
+          (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+#endif /* SFU_NO_SWAP */
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, verif_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+  }
+  else
+  {
+    /* Header authentication failure */
+    m_LoaderStatus = SFU_LOADER_ERR_AUTH_FAILED;
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_loader.h
new file mode 100644
index 00000000..7467d978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_loader.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update local
+  *          loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOADER_H
+#define SFU_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Local loader status Type Definition
+  */
+typedef enum
+{
+  SFU_LOADER_OK                            = 0x00U,
+  SFU_LOADER_ERR_COM                       = 0x01U,
+  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
+  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
+  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
+  SFU_LOADER_ERR_FLASH                     = 0x05U,
+  SFU_LOADER_ERR_CRYPTO                    = 0x06U
+} SFU_LOADER_StatusTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LOADER_Init(void);
+SFU_ErrorStatus SFU_LOADER_DeInit(void);
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
+                                             uint32_t *p_Size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_new_image.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_new_image.c
new file mode 100644
index 00000000..8588f3a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_new_image.c
@@ -0,0 +1,98 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar file integrated in the user
+  *          application.
+  * @note    This file is compiled in the scope of SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_new_image.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_regions.h"
+#include "se_def_metadata.h"
+#include <string.h> /* needed for memset (see WriteInstallHeader)*/
+
+#if  !defined(SFU_NO_SWAP)
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Write the header of the firmware to install
+  * @param  pfw_header pointer to header to write.
+  * @retval SFU_SUCCESS on success otherwise SFU_ERROR
+  */
+static SFU_ErrorStatus WriteInstallHeader(uint8_t *pfw_header)
+{
+  SFU_ErrorStatus ret = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  ret = SFU_LL_FLASH_Erase_Size(&flash_if_info, (uint8_t *) SlotStartAdd[SLOT_SWAP], SFU_IMG_IMAGE_OFFSET);
+  if (ret == SFU_SUCCESS)
+  {
+    ret = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *)SlotStartAdd[SLOT_SWAP], pfw_header, SE_FW_HEADER_TOT_LEN);
+  }
+  return ret;
+}
+#endif /* !SFU_NO_SWAP*/
+
+/**
+  * @brief  Write in Flash the next header image to install.
+  *         This function is used by the local loader to request a Firmware installation (at next reboot).
+  * @param  fw_header FW header of the FW to be installed
+  * @retval SFU_SUCCESS if successful, otherwise SFU_ERROR
+  */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header)
+{
+#if  !defined(SFU_NO_SWAP)
+  if (fw_header == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if (WriteInstallHeader(fw_header) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+#else
+  return SFU_SUCCESS;           /* Nothing to do */
+#endif /* !SFU_NO_SWAP*/
+}
+
+/**
+  * @brief  Provide the area descriptor to write a FW image in Flash.
+  *         This function is used by the local loader to know where to store a new Firmware Image before asking for its
+  *         installation.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pArea pointer to area descriptor
+  * @retval none
+  */
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea)
+{
+  pArea->DownloadAddr = SlotStartAdd[DwlSlot];
+#if  !defined(SFU_NO_SWAP)
+  pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(DwlSlot) - SFU_IMG_GetTrailerSize(DwlSlot);
+#else
+  pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(DwlSlot);
+#endif /* !(SFU_NO_SWAP) */
+  pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_new_image.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_new_image.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_new_image.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_new_image.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_test.c
new file mode 100644
index 00000000..948269d2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_test.c
@@ -0,0 +1,336 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_test.h"
+#include "main.h"
+#include "sfu_trace.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "string.h" /* required for strncmp */
+
+#if defined(SFU_TEST_PROTECTION)
+
+extern RTC_HandleTypeDef RtcHandle;
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Automatic tests : list of tests (Address, Message, Operation */
+/* Flash programming by 64 bits */
+#define SHIFT_FLASH_WRITE (8U-1U)
+
+/* Private variables ---------------------------------------------------------*/
+static ProtectionTest_t aProtectTests[] =
+{
+#ifdef SFU_MPU_PROTECT_ENABLE
+  {SFU_RAM_BASE, "MPU SRAM1 start add", TEST_EXECUTE},
+  {SFU_RAM_END - 3U, "MPU SRAM1 end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
+  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
+  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
+  /* READ_FLASH is possible as we are privileged when there is no MPU isolation but WRITE_FLASH must fail */
+  {INTVECT_START, "Init. Vector", TEST_WRITE_FLASH},
+  {SLOT_DWL_1_START, "MPU code dwl slot1 begin add", TEST_EXECUTE},
+  {SLOT_DWL_1_END - 3U, "MPU code dwl slot1 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SLOT_DWL_2_START, "MPU code dwl slot2 begin add", TEST_EXECUTE},
+  {SLOT_DWL_2_END - 3U, "MPU code dwl slot2 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SLOT_DWL_3_START, "MPU code dwl slot3 begin add", TEST_EXECUTE},
+  {SLOT_DWL_3_END - 3U, "MPU code dwl slot3 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SWAP_START, "MPU code swap begin add", TEST_EXECUTE},
+  {SWAP_END - 3U, "MPU code swap end add", TEST_EXECUTE},       /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_WRP_PROTECT_ENABLE
+  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
+  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
+  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
+#endif /* SFU_WRP_PROTECT_ENABLE */
+#ifdef SFU_PCROP_PROTECT_ENABLE
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
+  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
+                                                                                         writing test */
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
+  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+#if defined(TEST_ISOLATION)
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
+  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
+                                                                         64bits writing test + WRP protection applies */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
+  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
+  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
+                                                                    that initializes all the variables in the binary. */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
+  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+#endif /* TEST_ISOLATION  */
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Testing the MPU protection of the OBs */
+  /*
+   * WL55JC
+   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
+   * 0x1FFF 7818 Reserved Write protection 1A
+   * 0x1FFF 7820 Reserved Write protection 1B
+   */
+  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFF7800", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFF7818", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFF7820", TEST_WRITE_FLASH},
+#endif /* SFU_MPU_PROTECT_ENABLE  */
+  {0xAAAAAAAA, "Execution successful", TEST_END},
+};
+
+
+/* Automatic test : list of operation */
+uint8_t aTestOperation[][20] =
+{
+  "write 8 bytes",
+  "read 1 byte",
+  "erase 512 bytes",
+  "write 4 bytes",
+  "read 1 byte",
+  "execute",
+  "end"
+};
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_TEST_Protection(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
+  * @param  None.
+  * @retval None.
+  */
+static void SFU_TEST_Protection(void)
+{
+  uint32_t test_idx;
+  uint32_t flashErrCode = 0;
+  uint64_t pattern = 0U;
+  uint32_t page_error = 0U;
+  FLASH_EraseInitTypeDef p_erase_init;
+  TestStatus status = TEST_IN_PROGRESS;
+  __IO uint8_t tmp;
+  void (*func)(void);
+
+  /*
+    * Now checking the security
+    * We will try to access protected @ and run protected code.
+    * Each time a a flash error will be raised or a reset will be generated by IP protection.
+    * At next boot we read the backup register to check the next @ until all addresses have been verified.
+    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
+    * FWALL/Code Isolation
+    */
+
+  do
+  {
+    /* slow down execution */
+    HAL_Delay(100);
+
+    /* Increment test number for next execution */
+    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
+    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
+           aProtectTests[test_idx].address);
+
+    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
+    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
+        && (aProtectTests[test_idx].address > 0x00000FFFU))
+    {
+      switch (aProtectTests[test_idx].type)
+      {
+        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_FLASH :
+          HAL_FLASH_Unlock();
+          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
+          HAL_FLASH_Lock();
+          flashErrCode = HAL_FLASH_GetError();
+          printf("\r\nflash error code: %x", flashErrCode);
+          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+
+          /*
+           * OBs protection test: MPU generates a MEMORY FAULT and a RESET
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("OBs @", (const char *)aProtectTests[test_idx].msg, 5))
+          {
+            status = TEST_ERROR;
+          }
+          /* else not an OB protection test so probably not an error */
+          break;
+
+        /* Trying to read in FLASH : RDP set in case of PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_READ_FLASH :
+          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
+          HAL_Delay(1);                                                 /* ensure Flag is set */
+          /*
+           * When Isolation activated : RESET should be generated
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
+          {
+            status = TEST_ERROR;
+          }
+
+          break;
+
+        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_ERASE_FLASH :
+          HAL_FLASH_Unlock();
+          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
+          p_erase_init.NbPages     = 1;
+          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
+          HAL_FLASH_Lock();
+          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+          break;
+
+        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_RAM :
+          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
+          status = TEST_ERROR;
+          break;
+
+        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_READ_RAM :
+          tmp = *(uint8_t *)aProtectTests[test_idx].address;
+          printf(" value : %d ", tmp);
+          status = TEST_ERROR;
+          break;
+
+          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
+        case TEST_EXECUTE :
+          func = (void(*)(void))(aProtectTests[test_idx].address);
+          func();
+          status = TEST_ERROR;
+          break;
+
+        /* End of execution */
+        case TEST_END :
+          status = TEST_COMPLETED;
+          break;
+
+        default :
+          break;
+      }
+    }
+  } while (status == TEST_IN_PROGRESS) ;
+
+  if (status == TEST_ERROR)
+  {
+    SFU_TEST_Error();
+  }
+  else if (status == TEST_COMPLETED)
+  {
+    /* reset for next run (need a RESET of the platform to restart a session) */
+    printf("\b\b\b\b\b\b\b\b");
+    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
+  }
+}
+
+/**
+  * @brief  Initialization of backup register and start test
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Init(void)
+{
+  /* Use register DR0 to know which if the test sequence is in progress or done */
+  /* Use register DR1 to know which test to run after a reset */
+
+  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
+  {
+    return;
+  }
+  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
+                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
+                                                                  reset test index (DR1) */
+  {
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+  }
+
+  /* Start test */
+  SFU_TEST_Protection();
+}
+
+/**
+  * @brief  Reset backup register to be able to execute a new test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Reset(void)
+{
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+}
+
+/**
+  * @brief  Error detected during test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Error(void)
+{
+  printf(" ===> KO!!!!!");
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
+}
+
+#endif /* SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_test.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_test.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_trace.h
new file mode 100644
index 00000000..cf6d3387
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/App/sfu_trace.h
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SFU_TRACE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TRACE_H
+#define SFU_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_com_trace.h"
+#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+/* External variables --------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid
+                                                                        faults. printf is not rieentrant */
+#define TRACE   (void) printf
+#else
+#define TRACE(...)
+#define TRACE_IRQ(pbuffer)
+#endif /* SFU_DEBUG_MODE */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level.c
new file mode 100644
index 00000000..e637a536
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level.c
@@ -0,0 +1,530 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.c
+  * @author  MCD Application Team
+  * @brief   SFU Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+extern RTC_HandleTypeDef RtcHandle;
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+/* Private variables ---------------------------------------------------------*/
+static UART_HandleTypeDef   UartHandle;
+static CRC_HandleTypeDef    CrcHandle;
+
+/* Private function prototypes -----------------------------------------------*/
+static void     SFU_LL_Error_Handler(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Initialize CRC */
+  e_ret_status = SFU_LL_CRC_Init();
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF CRC Init.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure the peripheral clock */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+
+  /* Configure CRC with default polynomial - standard configuration */
+  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU  IF CRC Configuration.
+  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
+  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Check the parameters */
+  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
+
+  /* Switch to the selected configuration */
+  CrcHandle.Instance = CRC;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  switch (eCRCConfg)
+  {
+    case SFU_CRC_CONFIG_DEFAULT:
+      /* The Default polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+      /* The default init value is used */
+      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+      /* The input data are 32-bit long words */
+      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    case SFU_CRC_CONFIG_16BIT:
+      /* The CRC-16-CCIT polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+      /* The zero init value is used */
+      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+      CrcHandle.Init.InitValue               = 0U;
+      /* The input data are 8-bit long */
+      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    default:
+      /* Invalid parameter */
+      e_ret_status = SFU_ERROR;
+      break;
+  }
+
+  /* Proceed to CRC Init (Correct Parameters) */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  SFU IF CRC Calculate.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  BufferLength: buffer length in bytes.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
+}
+
+/**
+  * @brief SFU UART Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = SFU_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+  if (HAL_UART_Init(&UartHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief SFU IF UART DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  SFU IF Write data (send).
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  DataLength: pointer to the 128bit data to write.
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  Timeout: Timeout duration.
+  * @retval status of the write operation
+  *         SFU_ERROR : if the write operation is not performed
+  *         SFU_SUCCESS : if the write operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF Read data (receive).
+  * @param  pData: pointer to the 128bit data where to store the received data.
+  * @param  DataLength: the length of the data to be read in bytes.
+  * @param Timeout: Timeout duration.
+  * @retval status of the read operation
+  *         SFU_ERROR : if the read operation is not performed
+  *         SFU_SUCCESS : if the read operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU HAL IF Flush.
+  * @param  None.
+  * @retval status of the operation.
+  */
+SFU_ErrorStatus SFU_LL_UART_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+
+  return SFU_SUCCESS;
+}
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief SFU IF RTC Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief SFU IF RTC DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+/**
+  * @brief SFU IF RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer.
+  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  *        the RTC clock source; in this case the Backup domain will be reset in
+  *        order to modify the RTC Clock source, as consequence RTC registers (including
+  *        the backup registers) and RCC_BDCR register are set to their reset values.
+  * @retval None
+  */
+void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  RCC_OscInitTypeDef        RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+  UNUSED(hrtc);
+  /*-1- Enables access to the backup domain */
+  /* To enable access on RTC registers */
+
+  HAL_PWR_EnableBkUpAccess();
+
+  /*-2- Configure LSE/LSI as RTC clock source */
+#ifdef RTC_CLOCK_SOURCE_LSE
+
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#elif defined (RTC_CLOCK_SOURCE_LSI)
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
+  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#else
+#error Please select the RTC Clock source inside the main.h file
+#endif /*RTC_CLOCK_SOURCE_LSE*/
+
+  /*-3- Enable RTC peripheral Clocks */
+  /* Enable RTC Clock */
+  __HAL_RCC_RTC_ENABLE();
+
+  /* Enable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_ENABLE();
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  /*-4- Configure the NVIC for RTC Tamper */
+  HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_SSRU_IRQn, 0x0FU, 0U);
+  HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+
+  __HAL_RCC_RTC_DISABLE();
+
+  /* Disable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_DISABLE();
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in SFU application.
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral Clock Enable */
+    SFU_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    SFU_UART_TX_GPIO_CLK_ENABLE();
+    SFU_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : SFU_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
+    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : SFU_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
+    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral clock disable */
+    SFU_UART_CLK_DISABLE();
+
+    /* GPIO DeInit*/
+    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
+    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
+
+  }
+
+
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @param  None
+  * @retval None
+  */
+static void SFU_LL_Error_Handler(void)
+{
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  while (1 == 1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level.h
new file mode 100644
index 00000000..3532844d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level.h
@@ -0,0 +1,130 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef  SFU_LOW_LEVEL_H
+#define  SFU_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU CRC Configuration definition
+  */
+typedef enum
+{
+  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
+  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
+  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
+} SFU_CRC_ConfigTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Uncomment to enable the adequate Clock Source */
+#define RTC_CLOCK_SOURCE_LSI
+/*#define RTC_CLOCK_SOURCE_LSE*/
+
+#ifdef RTC_CLOCK_SOURCE_LSI
+#define RTC_ASYNCH_PREDIV    0x1FU
+#define RTC_SYNCH_PREDIV     0x3FF
+#endif /* RTC_CLOCK_SOURCE_LSI */
+
+#ifdef RTC_CLOCK_SOURCE_LSE
+#define RTC_ASYNCH_PREDIV  0x7FU
+#define RTC_SYNCH_PREDIV   0x00FFU
+#endif /* RTC_CLOCK_SOURCE_LSE */
+
+/* External variables --------------------------------------------------------*/
+extern __IO uint32_t  DummyMemAccess;
+#if defined(SFU_LOW_LEVEL_C)
+#if defined(IT_MANAGEMENT)
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+__IO uint32_t DummyMemAccess;
+#endif /* defined(IT_MANAGEMENT) */
+#endif /* defined(SFU_LOW_LEVEL_C) */
+
+
+/* Exported macros -----------------------------------------------------------*/
+#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
+                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
+                               ((CONF) == SFU_CRC_CONFIG_16BIT))
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+#define SFU_LL_DummyAccess() \
+  do{ \
+  }while(0)
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus    SFU_LL_Init(void);
+SFU_ErrorStatus    SFU_LL_DeInit(void);
+
+SFU_ErrorStatus    SFU_LL_CRC_Init(void);
+SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
+uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
+
+SFU_ErrorStatus    SFU_LL_UART_Init(void);
+SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
+SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Flush(void);
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus SFU_LL_RTC_Init(void);
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
+void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  SFU_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash.c
new file mode 100644
index 00000000..4cea3348
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash.c
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_fwimg_regions.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  e_ret_status = SFU_LL_FLASH_INT_Init();
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                   const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pFlash < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+}
+
+/**
+  * @brief  This function configure the flash to be able to execute code
+  * @param  Addr: flash address
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
+{
+  /*
+   * Internal flash : nothing to do
+   * External flash : configure memory mapped mode
+   */
+
+  /* Check Flash address */
+  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
+  }
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
+{
+  /* Check Flash address */
+  if (Addr < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_GetPage(Addr);
+  }
+  else
+  {
+    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
+  }
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash.h
new file mode 100644
index 00000000..726365d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_H
+#define SFU_LOW_LEVEL_FLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
+  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
+  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
+  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
+  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
+  SFU_FLASH_SUCCESS           /*!< Flash Success */
+} SFU_FLASH_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define INVALID_SECTOR 0xFFFFFFFFU
+#define INVALID_PAGE   0xFFFFFFFFU
+#define INVALID_BANK   0xFFFFFFFFU
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                   const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
+
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c
new file mode 100644
index 00000000..7b10b14d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU external
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_low_level_security.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+/* No external flash available on this product
+   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
+       systematically during startup phase */
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pStart);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  UNUSED(pFlash);
+  UNUSED(Pattern1);
+  UNUSED(Pattern2);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
+{
+  UNUSED(SlotNumber);
+  return SFU_SUCCESS;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h
new file mode 100644
index 00000000..08566d80
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for external flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
+#define SFU_LOW_LEVEL_FLASH_EXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+#define EXTERNAL_FLASH_ADDRESS  0x90000000U
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c
new file mode 100644
index 00000000..1e8db303
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c
@@ -0,0 +1,474 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU internal
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "string.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+
+/* Private variables ---------------------------------------------------------*/
+static __IO uint32_t DoubleECC_Error_Counter = 0U;
+
+
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t first_page;
+  uint32_t nb_pages;
+  uint32_t chunk_nb_pages;
+  uint32_t length = Length;
+
+  /* Check the pointers allocation */
+  if (pFlashStatus == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  *pFlashStatus = SFU_FLASH_SUCCESS;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = SFU_LL_FLASH_INT_GetPage(start);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
+      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        p_erase_init.Page = first_page;
+        p_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_ERASE;
+        }
+        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
+      } while (nb_pages > 0U);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      if (HAL_FLASH_Lock() != HAL_OK)
+      {
+        e_ret_status = SFU_ERROR;
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+      }
+    }
+    else
+    {
+      *pFlashStatus = SFU_FLASH_ERR_HAL;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Check the pointers allocation */
+  if ((pFlashStatus == NULL) || (pSource == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     writing operation should be executed inside secure environment */
+  if ((inside_header == 1U) && (Length != 0U))
+  {
+    /* SE Access */
+    SE_StatusTypeDef se_status;
+    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
+    if (se_ret_status == SE_SUCCESS)
+    {
+      e_ret_status = SFU_SUCCESS;
+      *pFlashStatus = SFU_FLASH_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+      *pFlashStatus = SFU_FLASH_ERROR;
+    }
+  }
+  /* Writing operation executed by SBSFU */
+  else
+  {
+    *pFlashStatus = SFU_FLASH_ERROR;
+
+    /* Clear error flags raised during previous operation */
+    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Unlock the Flash to enable the flash control register access *************/
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+
+      }
+      else
+      {
+        /* DataLength must be a multiple of 64 bit */
+        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
+        {
+          *pFlashStatus = SFU_FLASH_ERROR;
+
+          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+          be done by word */
+          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
+              == HAL_OK)
+          {
+            /* Check the written value */
+            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
+            {
+              /* Flash content doesn't match SRAM content */
+              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
+              e_ret_status = SFU_ERROR;
+            }
+            else
+            {
+              /* Increment FLASH Destination address */
+              destination = destination + sizeof(SFU_LL_FLASH_write_t);
+              e_ret_status = SFU_SUCCESS;
+              *pFlashStatus = SFU_FLASH_SUCCESS;
+            }
+          }
+          else
+          {
+            /* Error occurred while writing data in Flash memory */
+            *pFlashStatus = SFU_FLASH_ERR_WRITING;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+        /* Lock the Flash to disable the flash control register access (recommended
+        to protect the FLASH memory against possible unwanted operation) */
+        if (HAL_FLASH_Lock() != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_HAL;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus se_ret_status;
+  SE_StatusTypeDef se_status;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     reading operation should be executed inside secure environment */
+  if (inside_header == 1U)
+  {
+    /* SE Access */
+    DoubleECC_Error_Counter = 0U;
+    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
+    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  /* Reading operation executed by SBSFU */
+  else
+  {
+    DoubleECC_Error_Counter = 0U;
+    /* Do not use memcpy from lib : ECC error should be checked at each loop */
+    for (i = 0; (i < Length) && (DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+    {
+      *pDestination = *pSource;
+    }
+    if (DoubleECC_Error_Counter == 0U)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  uint32_t flash = (uint32_t) pFlash;
+  uint32_t i;
+
+  /* Comparison executed by SBSFU ==> flash area could not be located inside secured environment */
+  for ( i = 0U; i < Length; i += 4U)
+  {
+    if ((*(uint32_t *)(flash + i) != Pattern1) &&  (*(uint32_t *)(flash + i) != Pattern2))
+    {
+      return SFU_ERROR;
+    }
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+
+
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retvat void
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    while (1 == 1)
+    {
+      SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_UNKNOWN);
+    }
+  }
+}
+
+
+/**
+  * @brief  HardFault Handler
+  * @param  None.
+  * @retval None.
+  */
+void HardFault_Handler(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h
new file mode 100644
index 00000000..5ef51fc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for internal flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_INT_H
+#define SFU_LOW_LEVEL_FLASH_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash Write Access Constraints (size and alignment)
+  *
+  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
+  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
+  *
+  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
+  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
+  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
+  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_FirmwareToResume).
+  */
+
+/* double-word is the default setting for most platforms */
+typedef uint64_t SFU_LL_FLASH_write_t;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Length of a MAGIC tag (32 bytes).
+  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
+  */
+#define MAGIC_LENGTH ((uint32_t)32U)
+
+/* External variables --------------------------------------------------------*/
+#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
+void NMI_Handler(void);
+void HardFault_Handler(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_security.c
new file mode 100644
index 00000000..f6411633
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_security.c
@@ -0,0 +1,1102 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SFU Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "stm32wlxx_it.h"
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#if     !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_RDP_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_RDP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+#ifndef  SFU_TAMPER_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_TAMPER_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_IWDG_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+
+  {
+    {
+      MPU_REGION_NUMBER0, SFU_PROTECT_MPU_AREA_USER_START,     SFU_PROTECT_MPU_AREA_USER_SIZE,
+      SFU_PROTECT_MPU_AREA_USER_PERM,     SFU_PROTECT_MPU_AREA_USER_EXEC,     SFU_PROTECT_MPU_AREA_USER_SREG
+    },
+{
+  MPU_REGION_NUMBER1, SFU_PROTECT_MPU_AREA_SFUEN_START_0,  SFU_PROTECT_MPU_AREA_SFUEN_SIZE_0,
+  SFU_PROTECT_MPU_AREA_SFUEN_PERM,    SFU_PROTECT_MPU_AREA_SFUEN_EXEC,    SFU_PROTECT_MPU_AREA_SFUEN_SREG_0
+},
+{
+  MPU_REGION_NUMBER2, SFU_PROTECT_MPU_AREA_SFUEN_START_1,  SFU_PROTECT_MPU_AREA_SFUEN_SIZE_1,
+  SFU_PROTECT_MPU_AREA_SFUEN_PERM,    SFU_PROTECT_MPU_AREA_SFUEN_EXEC,    SFU_PROTECT_MPU_AREA_SFUEN_SREG_1
+},
+{
+  MPU_REGION_NUMBER3, SFU_PROTECT_MPU_AREA_VECT_START,     SFU_PROTECT_MPU_AREA_VECT_SIZE,
+  SFU_PROTECT_MPU_AREA_VECT_PERM,     SFU_PROTECT_MPU_AREA_VECT_EXEC,     SFU_PROTECT_MPU_AREA_VECT_SREG
+},
+{
+  MPU_REGION_NUMBER4, SFU_PROTECT_MPU_AREA_OB_BANK1_START, SFU_PROTECT_MPU_AREA_OB_BANK1_SIZE,
+  SFU_PROTECT_MPU_AREA_OB_BANK1_PERM, SFU_PROTECT_MPU_AREA_OB_BANK1_EXEC, SFU_PROTECT_MPU_AREA_OB_BANK1_SREG
+},
+{
+  MPU_REGION_NUMBER5, SFU_PROTECT_MPU_AREA_PERIPH_START,   SFU_PROTECT_MPU_AREA_PERIPH_SIZE,
+  SFU_PROTECT_MPU_AREA_PERIPH_PERM,   SFU_PROTECT_MPU_AREA_PERIPH_EXEC,   SFU_PROTECT_MPU_AREA_PERIPH_SREG
+},
+  };
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+
+
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void) HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  (void) HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA_A  **********/
+  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
+  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set Flash configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply PCRoP ******************************************************/
+
+
+    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
+#ifdef SFU_RDP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_RDP_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        (void) HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Lock the Options Bytes ***************************************************/
+  (void) HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void) HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#else
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  /* Check/Apply  ANTI_TAMPER *************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#else
+#ifdef SFU_TEST_PROTECTION
+  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_TEST_PROTECTION */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+  /* Check/Apply  CLOCK_MONITOR **********************************************/
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
+
+  /* Check/Apply  TEMP_MONITOR **********************************************/
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Return the reset source  detected after a reboot. The related flag is reset
+  *         at the end of this function.
+  * @param  peResetpSourceId: to be filled with the detected source of reset
+  * @note   In case of multiple reset sources this function return only one of them.
+  *         It can be improved returning and managing a combination of them.
+  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
+{
+  /* Check if the last reset has been generated from a Watchdog exception */
+  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
+      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
+  {
+    *peResetpSourceId = SFU_RESET_WDG_RESET;
+
+  }
+
+
+  /* Check if the last reset has been generated from a Low Power reset */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_LOW_POWER;
+
+  }
+
+  /* Check if the last reset has been generated from a Software reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_SW_RESET;
+
+  }
+  /* Check if the last reset has been generated from an Option Byte Loader reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_OB_LOADER;
+  }
+  /* Check if the last reset has been generated from a Hw pin reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_HW_RESET;
+
+  }
+  /* Unknown */
+  else
+  {
+    *peResetpSourceId = SFU_RESET_UNKNOWN;
+  }
+}
+
+/**
+  * @brief  Clear the reset sources. This function should be called after the actions
+  *         on the reset sources has been already taken.
+  * @param  none
+  * @note   none
+  * @retval none
+  */
+void SFU_LL_SECU_ClearResetSources()
+{
+  /* Clear reset flags  */
+  __HAL_RCC_CLEAR_RESET_FLAGS();
+}
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply BOOT_LOCK ****************************************************/
+  if ((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Flash configuration */
+  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+/**
+  * @brief  Apply the RDP protection
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply RDP **********************************************************/
+  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
+  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
+#else
+    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
+    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+  return e_ret_status;
+}
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  if ((psFlashOptionBytes->WRPStartOffset == SFU_PROTECT_WRP_PAGE_START_1) &&
+      (psFlashOptionBytes->WRPEndOffset   == SFU_PROTECT_WRP_PAGE_END_1))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
+    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
+    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER6;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER7;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  return SFU_SUCCESS;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Apply MPU protection before executing Standalone loader
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_StandaloneLoader(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER6;
+  MPU_InitStruct.BaseAddress          = LOADER_PROTECT_MPU_AREA_START;
+  MPU_InitStruct.Size                 = LOADER_PROTECT_MPU_AREA_SIZE;
+  MPU_InitStruct.SubRegionDisable     = LOADER_PROTECT_MPU_AREA_SREG;
+  MPU_InitStruct.AccessPermission     = LOADER_PROTECT_MPU_AREA_PERM;
+  MPU_InitStruct.DisableExec          = LOADER_PROTECT_MPU_AREA_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  return SFU_SUCCESS;
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t mpu_region_num; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+    MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+    MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
+          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
+          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    /* Enables the MPU */
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    /* Enables memory fault exception */
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    if ((SCB->SHCSR & SCB_SHCSR_MEMFAULTENA_Msk) != SCB_SHCSR_MEMFAULTENA_Msk)
+    {
+      return SFU_ERROR;
+    }
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+
+  e_ret_status = SFU_SUCCESS;
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return SFU_SUCCESS;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#else
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  Apply ANTI TAMPER protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  RTC_TamperTypeDef  stamperstructure;
+
+  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
+  TAMPER_GPIO_CLK_ENABLE();
+
+  /* Configure Tamper Pin */
+  /* tamper is an additional function */
+  /* not an alternate Function : config not needed */
+  /* Configure the RTC peripheral */
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    /* Configure RTC Tamper */
+    stamperstructure.Tamper                       = RTC_TAMPER_ID;
+    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
+    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
+    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
+    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
+    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
+    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
+    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
+    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
+
+    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
+    {
+
+      /* Clear the Tamper interrupt pending bit */
+      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
+    }
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply CLOCK MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a clock monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Clock Monitoring */
+  /* Add your code here for customization
+     e.g. if HSE or LSE is used enable the CSS!
+   ...
+   ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply TEMP MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a temperature monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Temperature Monitoring */
+  /* Add your code here for customization
+     ...
+     ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_security.h
new file mode 100644
index 00000000..0a412500
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/BFU/Target/sfu_low_level_security.h
@@ -0,0 +1,273 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  */
+
+#define SFU_PROTECT_MPU_AREA_USER_START         ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE          MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_PERM          MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXEC          MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_SREG          0x00U      /*!< All subregions activated */
+
+/**
+  * @brief Region 1 and Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys). Inner region inside
+  *                                the Region 0
+  */
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)       /*!< 8 sub-regions is the maximum */
+#define SFU_PROTECT_MPU_AREA_SFUEN_START_0      FLASH_BASE
+#define SFU_PROTECT_MPU_AREA_SFUEN_START_1      0x08010000
+#define SFU_PROTECT_MPU_AREA_SFUEN_SIZE_0       MPU_REGION_SIZE_64KB
+#define SFU_PROTECT_MPU_AREA_SFUEN_SIZE_1       MPU_REGION_SIZE_16KB
+#define SFU_PROTECT_MPU_AREA_SFUEN_PERM         MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_SFUEN_EXEC         MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_0       0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_1       0xC0U      /*!< 16 bytes / 8 * 6 ==> 12 bytes */
+
+/**
+  * @brief Region 3 - Vector Table: Vector Table must be Read-Only under privileged access. Inner region inside the
+  *                   Region 1
+  */
+#define SFU_PROTECT_MPU_AREA_VECT_START         ((uint32_t) INTVECT_START) /*!< Vector table memory area */
+#define SFU_PROTECT_MPU_AREA_VECT_SIZE          MPU_REGION_SIZE_512B
+#define SFU_PROTECT_MPU_AREA_VECT_PERM          MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_AREA_VECT_EXEC          MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_AREA_VECT_SREG          0x00U                   /*!< All subregions activated */
+
+/**
+  * @brief Region 4 - Inner region inside the Region 0 . The Option Bytes. Once the Option Bytes have been set,
+  *                   only reading will be possible
+  */
+
+/*
+ * WLxx
+ * Single Bank
+ * [ 1FFF7800 1FFF7808 1FFF7810 1FFF7818 1FFF7820]: 40 bytes to be protected
+ * The MPU can be used to protect up to eight memory regions.
+ * These, in turn can have eight subregions, if the region is at least 256 bytes.
+ * Here, we define a 64B region so subregions cannot be used.
+ */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_START     ((uint32_t)0x1FFF7800U) /*!< Option Bytes in bank 1        */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_SIZE      MPU_REGION_SIZE_64B     /*!< Protecting more than required */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_PERM      MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_EXEC      MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_SREG      0x00U                   /*!< Subregion mask to deactivate unexpected
+                                                                             MPU subregions: 0x1F should be set but it
+                                                                             would have no effect as we have a 64B
+                                                                             region */
+
+/**
+  * @brief  Region 5 - Peripherals Area
+  */
+#define SFU_PROTECT_MPU_AREA_PERIPH_START       PERIPH_BASE                  /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_AREA_PERIPH_SIZE        MPU_REGION_SIZE_512MB        /*!< To be coherent with the peripherals
+                                                                                  memory area */
+#define SFU_PROTECT_MPU_AREA_PERIPH_PERM        MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_PERIPH_EXEC        MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_PERIPH_SREG        0x00U                        /*!< All subregions activated */
+
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * @brief Region 6 & 7 - Enable the execution of the active slots
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+/**
+  * Region definition : from 0x0802 B000 ==> 0x0802 BFFF (4 kbytes)
+  */
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START  SLOT_ACTIVE_1_START
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_4KB
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG   0x00U                       /*!< All subregions activated */
+/**
+  * Additional Region definition : from 0x0802 C000 ==> 0x0803 FFFF (80 kbytes)
+  */
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_START  0x08020000
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_128KB
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SREG   0x07U                    /*!< 128 Kbytes / 8 * 5 ==> 80 Kbytes */
+
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
+  * @{
+  */
+#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define RTC_TAMPER_ID                      RTC_TAMPER_1
+#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
+  * @{
+  */
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
+  * @{
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
+  * @{
+  */
+typedef enum
+{
+  SFU_RESET_UNKNOWN = 0x00U,
+  SFU_RESET_WDG_RESET,
+  SFU_RESET_LOW_POWER,
+  SFU_RESET_HW_RESET,
+  SFU_RESET_BOR_RESET,
+  SFU_RESET_SW_RESET,
+  SFU_RESET_OB_LOADER,
+} SFU_RESET_IdTypeDef;
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
+  * @{
+  */
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
+                                                                            separate section to support PCRoP */
+#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
+#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
+                                                                            Std Protections cannot be
+                                                                            added/removed/modified */
+#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
+                                                                            boot in bank1! */
+
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
+#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
+#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
+                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
+                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
+                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | SFU_RUNTIME_PROTECTION_TEMP_MONITOR)
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
+
+/* Exported functions ------------------------------------------------------- */
+#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
+/*!<SFU Redirect of RTC Tamper Event Callback*/
+#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
+
+SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
+void               SFU_LL_SECU_ClearResetSources(void);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+#ifdef SFU_DMA_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+#ifdef SFU_DAP_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#if defined(SFU_MPU_PROTECT_ENABLE)
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_StandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/app_hw.h
new file mode 100644
index 00000000..696d8368
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/app_hw.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    app_hw.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update hardware
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_HW_H
+#define APP_HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported macros -----------------------------------------------------------*/
+/* At power-on, the capacitor related to SW1 button needs to charge.
+ * The charging time must be waited to be sure that a low level is a real one. */
+#define BUTTON_INIT() \
+  BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);                               \
+  if ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET) \
+  {                                                                       \
+     HAL_Delay(6U);                                                       \
+  }
+
+#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_HW_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/main.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/main.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..df90b1f3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..209c9d61
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,54 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* External variables --------------------------------------------------------*/
+extern RTC_HandleTypeDef    RtcHandle;
+
+/* Exported functions ------------------------------------------------------- */
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler(void);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/main.c
new file mode 100644
index 00000000..d2bf7435
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/main.c
@@ -0,0 +1,154 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Secure Boot and Secure Firmware Update.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_boot.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  main function
+  * @param  None
+  * @retval int
+  */
+int main(void)
+{
+
+  /* MCU Configuration--------------------------------------------------------*/
+  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
+  (void) HAL_Init();
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+  /*
+   * As the secure mode has not been entered yet, we do not configure BSP right now .
+   * The BSP will be configured by the bootloader.
+   */
+
+
+  /* Launch the Bootloader----------------------------------------------------*/
+  /*
+   * This is the beginning of the secure part:
+   * security mechanisms will be enabled.
+   * The function below should not return (unless a critical failure is encountered).
+   */
+  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
+
+  /* Security or SecureBoot initialization failure. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+
+
+
+
+#ifdef USE_FULL_ASSERT
+
+/**
+  * @brief Reports the name of the source file and the source line number
+  * where the assert_param error has occurred.
+  * @param file: pointer to the source file name
+  * @param line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+
+}
+
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..fb0c4eda
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,92 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_msp.c
+  * @author  MCD Application Team
+  * @brief   This file provides code for the MSP Initialization
+  *          and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+
+  HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
+
+  /* System interrupt init*/
+  /* MemoryManagement_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(MemoryManagement_IRQn, 0U, 0U);
+  /* BusFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(BusFault_IRQn, 0U, 0U);
+  /* UsageFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(UsageFault_IRQn, 0U, 0U);
+  /* DebugMonitor_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DebugMonitor_IRQn, 0U, 0U);
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0U, 0U);
+
+}
+
+/**
+  * @brief RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspInit(hrtc);
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in this example.
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspDeInit(hrtc);
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspInit(huart);
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in this example:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspDeInit(huart);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..b68f7c5a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,123 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/* Global variables ----------------------------------------------------------*/
+/* RTC handler declaration */
+RTC_HandleTypeDef RtcHandle;
+
+/* Functions Definition ------------------------------------------------------*/
+/******************************************************************************/
+/*            Cortex-M4 Processor Interruption and Exception Handlers         */
+/******************************************************************************/
+
+/* Exception handlers are implemented in the various source files of sbsfu application */
+
+/* NMI exception handler is implemented in sfu_low_level_flash_int.c file */
+/* Hard Fault exception handler is implemented in sfu_boot.c file */
+/* Memory Manage exception handler is implemented in sfu_boot.c file */
+/**
+  * @brief  This function handles Bus Fault exception.
+  * @param  None
+  * @retval None
+  */
+void BusFault_Handler(void)
+{
+  /* Go to infinite loop when Bus Fault exception occurs */
+  while (1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Usage Fault exception.
+  * @param  None
+  * @retval None
+  */
+void UsageFault_Handler(void)
+{
+  /* Go to infinite loop when Usage Fault exception occurs */
+  while (1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles SVCall exception.
+  * @param  None
+  * @retval None
+  */
+void SVC_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles Debug Monitor exception.
+  * @param  None
+  * @retval None
+  */
+void DebugMon_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers                  */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                               */
+/******************************************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler()
+{
+  HAL_RTCEx_TamperIRQHandler(&RtcHandle);
+}
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/Project.ewd
new file mode 100644
index 00000000..a98ad64e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_BFU</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/Project.ewp
new file mode 100644
index 00000000..b5f1e71d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/Project.ewp
@@ -0,0 +1,1229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_BFU</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>KMS_ENABLED</state>
+          <state>DISABLE_IMAGE_STATE_HANDLING</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\Core\Inc</state>
+          <state>$PROJ_DIR$\..\BFU\App</state>
+          <state>$PROJ_DIR$\..\BFU\Target</state>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>Project.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$\se_interface_appli.o"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state>$PROJ_DIR$.\..\..\1_Image_SECoreBin\EWARM\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>Core</name>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+      </file>
+    </group>
+    <group>
+      <name>BFU</name>
+      <group>
+        <name>App</name>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_loader.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_boot.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_com_loader.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_com_trace.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_error.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_test.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_fwimg_common.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_fwimg_no_swap.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_fwimg_swap.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_new_image.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_kms.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_interface_crypto_scheme.c</name>
+        </file>
+      </group>
+      <group>
+        <name>Target</name>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash_int.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash_ext.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_security.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/steering_file.txt
new file mode 100644
index 00000000..8349caff
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/steering_file.txt
@@ -0,0 +1,37 @@
+show SE_APP_GetActiveFwInfo
+show SE_KMS_Initialize
+show SE_KMS_Finalize
+show SE_KMS_GetInfo
+show SE_KMS_GetFunctionList
+show SE_KMS_GetSlotList
+show SE_KMS_GetSlotInfo
+show SE_KMS_GetTokenInfo
+show SE_KMS_GetMechanismInfo
+show SE_KMS_OpenSession
+show SE_KMS_CloseSession
+show SE_KMS_CreateObject
+show SE_KMS_DestroyObject
+show SE_KMS_GetAttributeValue
+show SE_KMS_SetAttributeValue
+show SE_KMS_FindObjectsInit
+show SE_KMS_FindObjects
+show SE_KMS_FindObjectsFinal
+show SE_KMS_EncryptInit
+show SE_KMS_Encrypt
+show SE_KMS_EncryptUpdate
+show SE_KMS_EncryptFinal
+show SE_KMS_DecryptInit
+show SE_KMS_Decrypt
+show SE_KMS_DecryptUpdate
+show SE_KMS_DecryptFinal
+show SE_KMS_DigestInit
+show SE_KMS_Digest
+show SE_KMS_DigestUpdate
+show SE_KMS_DigestFinal
+show SE_KMS_SignInit
+show SE_KMS_Sign
+show SE_KMS_VerifyInit
+show SE_KMS_Verify
+show SE_KMS_DeriveKey
+show SE_KMS_GenerateKeyPair
+show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..3aa0929b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,30 @@
+/*###ICF### Set of symbols used in SE and BFU projects ****/
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x1A00;
+define symbol __ICFEDIT_size_heap__ = 0;
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section SE_CORE_Bin };
+place in SE_IF_ROM_region {section .SE_IF_Code};
+place in SB_ROM_region    { readonly };
+place in SB_RAM_region    { readwrite, block CSTACK, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/BFU.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/BFU.sct
new file mode 100644
index 00000000..d5e2d56c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/BFU.sct
@@ -0,0 +1,47 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+; *** regions needed by SBSFU project ***
+LR_ROM_Vector INTVECT_START VECTOR_SIZE {
+  vector_start INTVECT_START VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+}
+
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CODE_REGION_ROM_START FIXED {
+  *(SE_CORE_Bin)
+  }
+}
+
+LR_IF SE_IF_REGION_ROM_START {  
+  SE_IF_region_ROM SE_IF_REGION_ROM_START FIXED SE_IF_ROM_REGION_SIZE {
+  se_interface_application.o (+RO)
+  se_interface_bootloader.o (+RO)
+  se_interface_common.o (+RO)
+  se_interface_kms.o (+RO)
+  }
+}
+
+LR_SB SB_REGION_ROM_START {
+  SB_region_ROM SB_REGION_ROM_START FIXED SB_ROM_REGION_SIZE {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  
+  SB_RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  .ANY (STACK)
+  .ANY (HEAP)
+  }
+}
+
+LR_KMS_DataStorage KMS_DATASTORAGE_START KMS_DATASTORAGE_SIZE {
+  ER_KMS_DataStorage KMS_DATASTORAGE_START FILL 0X00000000 KMS_DATASTORAGE_SIZE {
+  }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..63eceab2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/Project.uvoptx
@@ -0,0 +1,916 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_BFU</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7  -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <WatchWindow1>
+        <Ww>
+          <count>0</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>e_ret_status</ItemText>
+        </Ww>
+      </WatchWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>0</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>se_core_bin.s</PathWithFileName>
+      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/BFU/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_boot.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\App\sfu_com_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\App\sfu_com_trace.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_error.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_fwimg_common.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_fwimg_no_swap.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_no_swap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_fwimg_swap.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_swap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_kms.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\App\sfu_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\App\sfu_new_image.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_new_image.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_test.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/BFU/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\Target\sfu_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\Target\sfu_low_level_flash.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\Target\sfu_low_level_flash_ext.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\Target\sfu_low_level_flash_int.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/Target/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..08fb83f2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/Project.uvprojx
@@ -0,0 +1,708 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_BFU</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>BFU</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-Wno-format</MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../Core/Inc;../BFU/App;../BFU/Target;../../1_Image_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>BFU.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--symdefs=se_interface_appli.txt
+--keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>se_core_bin.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>se_core_bin.s</FilePath>
+            </File>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/BFU/App</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_boot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_boot.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_com_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_error.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_error.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_fwimg_common.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_no_swap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_fwimg_no_swap.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_swap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_fwimg_swap.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_interface_crypto_scheme.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_interface_crypto_scheme.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_kms.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_new_image.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_test.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/BFU/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash_ext.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash_int.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/Target/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_bootloader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_ll_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components/>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt
new file mode 100644
index 00000000..6a8982e0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt
@@ -0,0 +1,38 @@
+#<SYMDEFS># ARM Linker, 6120001: Last Updated: Fri Sep 25 17:55:14 2020
+0x08007d01 T SE_APP_GetActiveFwInfo
+0x08008445 T SE_KMS_Initialize
+0x08008171 T SE_KMS_Finalize
+0x08008309 T SE_KMS_GetInfo
+0x08008305 T SE_KMS_GetFunctionList
+0x080083a5 T SE_KMS_GetSlotList
+0x08008371 T SE_KMS_GetSlotInfo
+0x080083dd T SE_KMS_GetTokenInfo
+0x08008339 T SE_KMS_GetMechanismInfo
+0x080084d9 T SE_KMS_OpenSession
+0x08007dfd T SE_KMS_CloseSession
+0x08007e29 T SE_KMS_CreateObject
+0x08007f81 T SE_KMS_DestroyObject
+0x080082c9 T SE_KMS_GetAttributeValue
+0x08008515 T SE_KMS_SetAttributeValue
+0x0800820d T SE_KMS_FindObjectsInit
+0x080081a1 T SE_KMS_FindObjects
+0x080081dd T SE_KMS_FindObjectsFinal
+0x080080fd T SE_KMS_EncryptInit
+0x08008089 T SE_KMS_Encrypt
+0x08008135 T SE_KMS_EncryptUpdate
+0x080080c5 T SE_KMS_EncryptFinal
+0x08007ed1 T SE_KMS_DecryptInit
+0x08007e61 T SE_KMS_Decrypt
+0x08007f05 T SE_KMS_DecryptUpdate
+0x08007e9d T SE_KMS_DecryptFinal
+0x08008021 T SE_KMS_DigestInit
+0x08007fb1 T SE_KMS_Digest
+0x08008051 T SE_KMS_DigestUpdate
+0x08007fed T SE_KMS_DigestFinal
+0x08008591 T SE_KMS_SignInit
+0x08008551 T SE_KMS_Sign
+0x08008609 T SE_KMS_VerifyInit
+0x080085c9 T SE_KMS_Verify
+0x08007f41 T SE_KMS_DeriveKey
+0x08008245 T SE_KMS_GenerateKeyPair
+0x08008291 T SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/se_core_bin.s b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/se_core_bin.s
new file mode 100644
index 00000000..0d96feed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/se_core_bin.s
@@ -0,0 +1,20 @@
+;/******************************************************************************
+;* File Name          : se_core_bin.s
+;* Author             : MCD Application Team
+;* Description        : Include SECoreBin binary.
+;********************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;******************************************************************************
+;
+;
+ AREA SE_CORE_Bin, CODE, READONLY
+ INCBIN .\..\..\1_Image_SECoreBin\MDK-ARM\STM32WL55JC_Nucleo\Exe\SECoreBin.bin
+ END
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..7b638c87
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,365 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;*
+;* This software component is licensed by ST under 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:
+;*                        opensource.org/licenses/Apache-2.0
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1A00
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x0
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..635041a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/.cproject
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="BFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../BFU/App | ../../../BFU/Target | ../../../../1_Image_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/BFU.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_BFU}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../BFU/App"/>
+									<listOptionValue builtIn="false" value="../../BFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/BFU.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/BFU.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+					<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.298519129" name="se_interface_application.c" rcbsApplicability="disable" resourcePath="Middlewares/STM32_Secure_Engine/se_interface_application.c" toolsToInvoke="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898.810348834">
+						<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898.810348834" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898">
+							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.310263369" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<listOptionValue builtIn="false" value="../../Core/Inc"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+								<listOptionValue builtIn="false" value="../../BFU/App"/>
+								<listOptionValue builtIn="false" value="../../BFU/Target"/>
+								<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+								<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+							</option>
+							<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1223368002" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+						</tool>
+					</fileInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_BFU.null.839446873" name="1_Image_BFU"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1415671833;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1687290193">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/.project
new file mode 100644
index 00000000..e1053b57
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/.project
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_BFU</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_LL_Driver/stm32wlxx_ll_utils.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/se_interface_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_application.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_bootloader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_boot.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_boot.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_com_loader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_com_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_error.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_error.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_fwimg_common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_fwimg_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_fwimg_swap.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_fwimg_swap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_fwimg_no_swap.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_fwimg_no_swap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_interface_crypto_scheme.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_interface_crypto_scheme.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_loader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_new_image.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_test.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_test.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash_ext.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash_ext.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash_int.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash_int.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c
new file mode 100644
index 00000000..3c5470dc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    sfu_secorebin_inc.c
+  * @author  MCD Application Team
+  * @brief   Include SECoreBin binary.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+
+#if defined (__GNUC__)
+asm(".section SE_CORE_Bin,\"a\";"
+                             ".incbin \"../../1_Image_SECoreBin/STM32CubeIDE/Debug/SECoreBin.bin\";"
+);
+#endif 
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Core/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/Core/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Core/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/BFU.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/BFU.ld
new file mode 100644
index 00000000..f6726648
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/BFU.ld
@@ -0,0 +1,162 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0;                /* required amount of heap  */
+_Min_Stack_Size = 0x2000;          /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >INTVECT_ROM_region
+  
+  SE_CORE_Bin :
+  {
+    KEEP(*(SE_CORE_Bin));
+  } > SE_ROM_region
+
+  .SE_IF_Code : { KEEP(*se_interface_application.o (.text .text*))
+                  KEEP(*se_interface_bootloader.o (.text .text*))
+                  KEEP(*se_interface_common.o (.text .text*))
+                  KEEP(*se_interface_kms.o (.text .text*))
+  } >SE_IF_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SB_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SB_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SB_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SB_RAM_region AT>SB_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/se_interface.txt
new file mode 100644
index 00000000..05aa5e0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/STM32CubeIDE/se_interface.txt
@@ -0,0 +1,40 @@
+SE_APP_GetActiveFwInfo
+SE_APP_SVC_Handler
+SE_SYS_SaveDisableIrq
+SE_SYS_RestoreEnableIrq
+SE_KMS_Initialize
+SE_KMS_Finalize
+SE_KMS_GetInfo
+SE_KMS_GetFunctionList
+SE_KMS_GetSlotList
+SE_KMS_GetSlotInfo
+SE_KMS_GetTokenInfo
+SE_KMS_GetMechanismInfo
+SE_KMS_OpenSession
+SE_KMS_CloseSession
+SE_KMS_CreateObject
+SE_KMS_DestroyObject
+SE_KMS_GetAttributeValue
+SE_KMS_SetAttributeValue
+SE_KMS_FindObjectsInit
+SE_KMS_FindObjects
+SE_KMS_FindObjectsFinal
+SE_KMS_EncryptInit
+SE_KMS_Encrypt
+SE_KMS_EncryptUpdate
+SE_KMS_EncryptFinal
+SE_KMS_DecryptInit
+SE_KMS_Decrypt
+SE_KMS_DecryptUpdate
+SE_KMS_DecryptFinal
+SE_KMS_DigestInit
+SE_KMS_Digest
+SE_KMS_DigestUpdate
+SE_KMS_DigestFinal
+SE_KMS_SignInit
+SE_KMS_Sign
+SE_KMS_VerifyInit
+SE_KMS_Verify
+SE_KMS_DeriveKey
+SE_KMS_GenerateKeyPair
+SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/readme.txt
new file mode 100644
index 00000000..82e264f5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_BFU/readme.txt
@@ -0,0 +1,166 @@
+/**
+  @page 1_Image_BFU / Boot and Firmware Update Demo Application
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows Boot and Firmware Update example.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+The Boot (B) and Firmware Update (FU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates.
+In addition, Secure Boot (Root of Trust services) checks and activates the STM32 security mechanisms (if any), and checks the
+authenticity and integrity of user application code before every execution to ensure that invalid or malicious code
+cannot be run. The Firmware Update application receives the encrypted firmware image, decrypts it, then checks
+the authenticity and integrity of the code before installing it.
+
+The key management services provide cryptographic services to the user application through the pkcs11 APIs
+(KEY ID based APIs). User application keys are stored and can be updated in a secure way (authenticity check, data decryption and
+data integrity check).
+This example handles 2 firmware images located in 1 active slot and 1 download area in FLASH allowing to demonstrate
+features like:
+   - download a new firmware image from the application
+   - resume firmware update procedure in case of power off during installation
+   - rollback on the previous firmware if the new active image is not validated (selft-tests KO) at first start-up.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from the
+STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, SBSFU, MPU
+
+@par Directory contents
+
+   - 1_Image_BFU/Core/Src/main.c                           Main application file
+   - 1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c              HAL MSP module
+   - 1_Image_BFU/Core/Src/stm32wlxx_it.c                   STM32 interrupt handlers
+   - 1_Image_BFU/Core/Inc/app_hw.h                         Hardware definitions for application
+   - 1_Image_BFU/Core/Inc/main.h                           Header file for main.c
+   - 1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h             HAL configuration file
+   - 1_Image_BFU/Core/Inc/stm32wlxx_it.h                   Header file for stm32wlxx_it.c
+   - 1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h          BSP configuration file
+   - 1_Image_BFU/BFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
+   - 1_Image_BFU/BFU/App/sfu_com_loader.c                BFU communication module: local loader part
+   - 1_Image_BFU/BFU/App/sfu_com_trace.c                 BFU communication module: trace part
+   - 1_Image_BFU/BFU/App/sfu_error.c                     BFU errors management
+   - 1_Image_BFU/BFU/App/sfu_fwimg_common.c              BFU image handling: common functionalities/services
+   - 1_Image_BFU/BFU/App/sfu_fwimg_swap.c                BFU image handling: FW upgrade without swap area services
+   - 1_Image_BFU/BFU/App/sfu_fwimg_no_swap.c             BFU image handling: FW upgrade with swap area services
+   - 1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
+   - 1_Image_BFU/BFU/App/sfu_kms.c                       Key management service blob importation handling
+   - 1_Image_BFU/BFU/App/sfu_loader.c                    BFU Local Loader
+   - 1_Image_BFU/BFU/App/sfu_new_image.c                 BFU image handling: manage the new firmware image storage and installation
+   - 1_Image_BFU/BFU/App/sfu_test.c                      BFU security protection automatic test
+   - 1_Image_BFU/BFU/App/app_sfu.h                       Software configuration of BFU application
+   - 1_Image_BFU/BFU/App/sfu_boot.h                      Header file for sfu_boot.c
+   - 1_Image_BFU/BFU/App/sfu_com_loader.h                Header file for sfu_com_loader.c
+   - 1_Image_BFU/BFU/App/sfu_com_trace.h                 Header file for sfu_com_trace.c
+   - 1_Image_BFU/BFU/App/sfu_def.h                       General definition for BFU application
+   - 1_Image_BFU/BFU/App/sfu_error.h                     Header file for sfu_error.c file
+   - 1_Image_BFU/BFU/App/sfu_fsm_states.h                BFU FSM states definitions
+   - 1_Image_BFU/BFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling (sfu_fwimg_core.c and sfu_fwimg_services.c)
+   - 1_Image_BFU/BFU/App/sfu_fwimg_regions.h             FLASH regions definitions for image handling
+   - 1_Image_BFU/BFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
+   - 1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
+   - 1_Image_BFU/BFU/App/sfu_kms.h                       Header file for sfu_kms.c
+   - 1_Image_BFU/BFU/App/sfu_loader.h                    Header file for sfu_loader.c
+   - 1_Image_BFU/BFU/App/sfu_new_image.h                 Header file for sfu_new_image.c
+   - 1_Image_BFU/BFU/App/sfu_test.h                      Header file for sfu_test.c
+   - 1_Image_BFU/BFU/App/sfu_trace.h                     Header file for sfu_trace.c
+   - 1_Image_BFU/BFU/Target/sfu_low_level.c              BFU general low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash.c        BFU flash low level interface (wrapper)
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c    BFU internal flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c    BFU external flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_security.c     BFU security low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level.h              Header file for general low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash.h        Header file for flash low level interface (wrapper)
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h    Header file for internal flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h    Header file for external flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_security.h     Header file for security low level interface
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices.
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
+   - This example needs a terminal emulator.
+   - By default, SBSFU is configured in development mode. To switch in production mode, refer to AN5056 "Integration
+     guide - software expansion for STM32Cube" available from the STMicroelectronics microcontroller website
+     www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files.
+     As a workaround, it is advised to use the subst.exe command from within a command prompt to set up a local drive
+     out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par How to use it ?
+
+Several steps to run BFU application :
+
+1. Compile projects in the following order. This is mandatory as each project requests some objects generated by the
+   compilation of the previous one:
+   - 1_Image_SECoreBin (see also SECoreBin/readme.txt)
+   - 1_Image_BFU
+   - 1_Image_UserApp (see also UserApp/readme.txt)
+
+2. Before loading BFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that the
+   following are valid for the device:
+   - RDP Level 0
+   - Write Protection disabled on all FLASH pages
+   - Chip has been erased
+
+3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator that can be downloaded
+   from https://osdn.net/projects/ttssh2/) for UART connection with the board.
+   Support of YMODEM protocol is required. Serial port configuration should be :
+   - Baud rate = 115200
+   - Data = 8 bits
+   - Parity = none
+   - Stop = 1 bit
+   - Flow control = none
+
+4. Load BFU image into target memory with your preferred toolchain or STM32CubeProgammer.
+
+5. Once the BFU software is downloaded, power cycle the board (unplug/plug USB cable) : the BFU
+   application starts and configures the security mechanisms if some of them are enabled.
+
+6. [If RDP is enabled] Power cycle the board a second time (unplug/plug the USB cable): the BFU application starts with
+   the configured securities turned on and the Tera Term connection is possible.
+   Caution: Make sure to use an up-to-date version of ST-LINK firmware else BFU may not start.
+
+7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
+   Green LED blinks every 3 seconds when a local download is waited.
+   Green LED blinks every 250 ms in case of error in option bytes configuration.
+
+8. Send the user encrypted firmware file (\2_Slots\1_Image_UserApp\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
+Note2 : The following steps enable the protections disabled by default:
+        - Comment "SECBOOT_DISABLE_SECURITY_IPS" in app_sfu.h. This will enable RDP, WRP, DAP, DMA, IWDG protections
+          as well as attack surface reduction with MPU.
+        - As TAMPER detection can be very sensitive, the protection remains disabled by default.
+          Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
+        These features achieve an attack surface reduction but will not make it possible to protect secrets.
+Note3 : for Linux users Minicom can be used but to do so you need to compile the BFU project with the MINICOM_YMODEM
+        switch enabled (app_sfu.h)
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/Binary/ECCKEY.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/Binary/ECCKEY.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/Binary/ECCKEY.txt
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/Binary/ECCKEY.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/Binary/iv.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/Binary/iv.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/Binary/iv.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/Binary/iv.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/Project.ewd
new file mode 100644
index 00000000..62ef1fde
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/Project.ewp
new file mode 100644
index 00000000..e381814c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/Project.ewp
@@ -0,0 +1,1054 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\KMS_Blob.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/postbuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/postbuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/postbuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/stm32wl55xx_flash_cm4.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/EWARM/stm32wl55xx_flash_cm4.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/KMS_Blob.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/KMS_Blob.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/KMS_blob.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/KMS_blob.bin
new file mode 100644
index 00000000..bd13cab7
Binary files /dev/null and b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/KMS_blob.bin differ
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..4a478254
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_KMS_Blob</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>1</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>0</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>BIN\UL2CM3.DLL</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_blob_example_keys.c</PathWithFileName>
+      <FilenameWithoutPath>kms_blob_example_keys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..f5c7e0c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_KMS_Blob</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>KMS_blob</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../1_Image_SECoreBin/Inc</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>0</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>KMS_Blob.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--diag_suppress L6305W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>kms_blob_example_keys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_1_Image_KMS_Blob"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/postbuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/MDK-ARM/postbuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..447ffaf6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/STM32CubeIDE/.cproject
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../1_Image_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/KMS_Blob.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_KMS_Blob.null.1082786794" name="1_Image_KMS_Blob"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1003497030;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1841871715">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/STM32CubeIDE/.project
new file mode 100644
index 00000000..ae535727
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/STM32CubeIDE/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_KMS_Blob</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_blob_example_keys.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_blob_example_keys.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/Src/kms_blob_example_keys.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/Src/kms_blob_example_keys.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/Src/kms_blob_example_keys.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/readme.txt
new file mode 100644
index 00000000..d7ddf143
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_KMS_Blob/readme.txt
@@ -0,0 +1,62 @@
+/**
+  @page 1_Image_KMS_Blob / Key Management Services / Blob generation project.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2019 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Key Management Services Blob generation.
+  *          Allows to generate Blob to be injected to a device supporting
+  *          KMS ImportBlob().
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description 
+
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+
+You can edit your own keys to generate your own Blob.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Cryptography, KMS, Provisioning
+
+@par Directory contents
+
+   - 1_Image_KMS_Blob/Src/kms_blob_example_keys.c             KMS blob objects definition
+   - 1_Image_KMS_Blob/Binary/ECCKEY.txt                       Private ECCDSA key for signature verification
+   - 1_Image_KMS_Blob/Binary/iv.bin                           Encryption/decryption initialization vector
+   - 1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - Python installation required. In addition, install the appropriate python modules as described in
+    Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages\readme.txt
+    
+    
+@par How to use it ? 
+
+In order to generate Secure Key Storage Blob file, you must do the following :
+ - Edit the .c source file, where examples of keys are provided. Update with your own keys.
+ - Open your preferred toolchain 
+ - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/ECCKEY1.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Binary/ECCKEY1.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/ECCKEY1.txt
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Binary/ECCKEY1.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/nonce.bin b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Binary/nonce.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/nonce.bin
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Binary/nonce.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/Project.ewd
new file mode 100644
index 00000000..02776c9f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/Project.ewp
new file mode 100644
index 00000000..37823294
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/Project.ewp
@@ -0,0 +1,1181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>KMS_ENABLED</state>
+          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
+          <state>IT_MANAGEMENT_DISABLED</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
+          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\App</state>
+          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\Target</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
+        <postbuild></postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>SE_CallGate</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
+      </file>
+    </group>
+    <group>
+      <name>Third_Party</name>
+      <group>
+        <name>mbed-crypto</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
+        </file>
+      </group>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..c46620a8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,155 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+
+set "nonce=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% %headerbin%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %partialbin% %partialsfu%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..2276fbc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,145 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% -o %offset% --pfw %partialbin% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..91bbd1d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,154 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "iv=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %partialbin% %partialsfu%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% -o %offset% --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/prebuild.bat
new file mode 100644
index 00000000..4e8662aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V7M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\1_Image_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\1_Image_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..3faa0f34
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,24 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit};
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
+place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
+place in SE_CODE_NOKEY_ROM_region {readonly};
+place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
+keep { section .SE_embedded_Keys };
+place in SE_RAM_region {readwrite};
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/ca_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/ca_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/ca_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/ca_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/ca_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/ca_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/ca_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_config.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_mem_pool_def.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_mem_pool_def.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_platf_objects_interface.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/kms_platf_objects_interface.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/mbed_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/mbed_crypto_config.h
new file mode 100644
index 00000000..5ea26e4f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/mbed_crypto_config.h
@@ -0,0 +1,1976 @@
+/**
+ * \file config.h
+ *
+ * \brief Configuration options (set of defines)
+ *
+ *  This set of compile-time options may be used to enable
+ *  or disable features selectively, and reduce the global
+ *  memory footprint.
+ */
+/*
+ *  Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  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.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+/**
+ * \name SECTION: System support
+ *
+ * This section sets system specific settings.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_HAVE_ASM
+ *
+ * The compiler has support for asm().
+ *
+ * Requires support for asm() in compiler.
+ *
+ * Used in:
+ *      library/aria.c
+ *      library/timing.c
+ *      include/mbedtls/bn_mul.h
+ *
+ * Required by:
+ *      MBEDTLS_AESNI_C
+ *      MBEDTLS_PADLOCK_C
+ *
+ * Comment to disable the use of assembly code.
+ */
+//#define MBEDTLS_HAVE_ASM
+
+/**
+ * \def MBEDTLS_NO_UDBL_DIVISION
+ *
+ * The platform lacks support for double-width integer division (64-bit
+ * division on a 32-bit platform, 128-bit division on a 64-bit platform).
+ *
+ * Used in:
+ *      include/mbedtls/bignum.h
+ *      library/bignum.c
+ *
+ * The bignum code uses double-width division to speed up some operations.
+ * Double-width division is often implemented in software that needs to
+ * be linked with the program. The presence of a double-width integer
+ * type is usually detected automatically through preprocessor macros,
+ * but the automatic detection cannot know whether the code needs to
+ * and can be linked with an implementation of division for that type.
+ * By default division is assumed to be usable if the type is present.
+ * Uncomment this option to prevent the use of double-width division.
+ *
+ * Note that division for the native integer type is always required.
+ * Furthermore, a 64-bit type is always required even on a 32-bit
+ * platform, but it need not support multiplication or division. In some
+ * cases it is also desirable to disable some double-width operations. For
+ * example, if double-width division is implemented in software, disabling
+ * it can reduce code size in some embedded targets.
+ */
+//#define MBEDTLS_NO_UDBL_DIVISION
+
+/**
+ * \def MBEDTLS_NO_64BIT_MULTIPLICATION
+ *
+ * The platform lacks support for 32x32 -> 64-bit multiplication.
+ *
+ * Used in:
+ *      library/poly1305.c
+ *
+ * Some parts of the library may use multiplication of two unsigned 32-bit
+ * operands with a 64-bit result in order to speed up computations. On some
+ * platforms, this is not available in hardware and has to be implemented in
+ * software, usually in a library provided by the toolchain.
+ *
+ * Sometimes it is not desirable to have to link to that library. This option
+ * removes the dependency of that library on platforms that lack a hardware
+ * 64-bit multiplier by embedding a software implementation in Mbed TLS.
+ *
+ * Note that depending on the compiler, this may decrease performance compared
+ * to using the library function provided by the toolchain.
+ */
+//#define MBEDTLS_NO_64BIT_MULTIPLICATION
+
+/**
+ * \def MBEDTLS_HAVE_SSE2
+ *
+ * CPU supports SSE2 instruction set.
+ *
+ * Uncomment if the CPU supports SSE2 (IA-32 specific).
+ */
+//#define MBEDTLS_HAVE_SSE2
+
+/**
+ * \def MBEDTLS_HAVE_TIME
+ *
+ * System has time.h and time().
+ * The time does not need to be correct, only time differences are used,
+ * by contrast with MBEDTLS_HAVE_TIME_DATE
+ *
+ * Defining MBEDTLS_HAVE_TIME allows you to specify MBEDTLS_PLATFORM_TIME_ALT,
+ * MBEDTLS_PLATFORM_TIME_MACRO, MBEDTLS_PLATFORM_TIME_TYPE_MACRO and
+ * MBEDTLS_PLATFORM_STD_TIME.
+ *
+ * Comment if your system does not support time functions
+ */
+//#define MBEDTLS_HAVE_TIME
+
+/**
+ * \def MBEDTLS_HAVE_TIME_DATE
+ *
+ * System has time.h, time(), and an implementation for
+ * mbedtls_platform_gmtime_r() (see below).
+ * The time needs to be correct (not necessarily very accurate, but at least
+ * the date should be correct). This is used to verify the validity period of
+ * X.509 certificates.
+ *
+ * Comment if your system does not have a correct clock.
+ *
+ * \note mbedtls_platform_gmtime_r() is an abstraction in platform_util.h that
+ * behaves similarly to the gmtime_r() function from the C standard. Refer to
+ * the documentation for mbedtls_platform_gmtime_r() for more information.
+ *
+ * \note It is possible to configure an implementation for
+ * mbedtls_platform_gmtime_r() at compile-time by using the macro
+ * MBEDTLS_PLATFORM_GMTIME_R_ALT.
+ */
+//#define MBEDTLS_HAVE_TIME_DATE
+
+/**
+ * \def MBEDTLS_PLATFORM_MEMORY
+ *
+ * Enable the memory allocation layer.
+ *
+ * By default mbed TLS uses the system-provided calloc() and free().
+ * This allows different allocators (self-implemented or provided) to be
+ * provided to the platform abstraction layer.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY without the
+ * MBEDTLS_PLATFORM_{FREE,CALLOC}_MACROs will provide
+ * "mbedtls_platform_set_calloc_free()" allowing you to set an alternative calloc() and
+ * free() function pointer at runtime.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY and specifying
+ * MBEDTLS_PLATFORM_{CALLOC,FREE}_MACROs will allow you to specify the
+ * alternate function at compile time.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Enable this layer to allow use of alternative memory allocators.
+ */
+//#define MBEDTLS_PLATFORM_MEMORY
+
+/**
+ * \def MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+ *
+ * Do not assign standard functions in the platform layer (e.g. calloc() to
+ * MBEDTLS_PLATFORM_STD_CALLOC and printf() to MBEDTLS_PLATFORM_STD_PRINTF)
+ *
+ * This makes sure there are no linking errors on platforms that do not support
+ * these functions. You will HAVE to provide alternatives, either at runtime
+ * via the platform_set_xxx() functions or at compile time by setting
+ * the MBEDTLS_PLATFORM_STD_XXX defines, or enabling a
+ * MBEDTLS_PLATFORM_XXX_MACRO.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Uncomment to prevent default assignment of standard functions in the
+ * platform layer.
+ */
+//#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+/**
+ * \def MBEDTLS_PLATFORM_EXIT_ALT
+ *
+ * MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let mbed TLS support the
+ * function in the platform abstraction layer.
+ *
+ * Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, mbed TLS will
+ * provide a function "mbedtls_platform_set_printf()" that allows you to set an
+ * alternative printf function pointer.
+ *
+ * All these define require MBEDTLS_PLATFORM_C to be defined!
+ *
+ * \note MBEDTLS_PLATFORM_SNPRINTF_ALT is required on Windows;
+ * it will be enabled automatically by check_config.h
+ *
+ * \warning MBEDTLS_PLATFORM_XXX_ALT cannot be defined at the same time as
+ * MBEDTLS_PLATFORM_XXX_MACRO!
+ *
+ * Requires: MBEDTLS_PLATFORM_TIME_ALT requires MBEDTLS_HAVE_TIME
+ *
+ * Uncomment a macro to enable alternate implementation of specific base
+ * platform function
+ */
+//#define MBEDTLS_PLATFORM_EXIT_ALT
+//#define MBEDTLS_PLATFORM_TIME_ALT
+//#define MBEDTLS_PLATFORM_FPRINTF_ALT
+//#define MBEDTLS_PLATFORM_PRINTF_ALT
+//#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_VSNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_NV_SEED_ALT
+//#define MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
+
+/**
+ * \def MBEDTLS_DEPRECATED_WARNING
+ *
+ * Mark deprecated functions so that they generate a warning if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * This only works with GCC and Clang. With other compilers, you may want to
+ * use MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Uncomment to get warnings on using deprecated functions.
+ */
+//#define MBEDTLS_DEPRECATED_WARNING
+
+/**
+ * \def MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Remove deprecated functions so that they generate an error if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * Uncomment to get errors on using deprecated functions.
+ */
+#define MBEDTLS_DEPRECATED_REMOVED
+
+/**
+ * \def MBEDTLS_CHECK_PARAMS
+ *
+ * This configuration option controls whether the library validates more of
+ * the parameters passed to it.
+ *
+ * When this flag is not defined, the library only attempts to validate an
+ * input parameter if: (1) they may come from the outside world (such as the
+ * network, the filesystem, etc.) or (2) not validating them could result in
+ * internal memory errors such as overflowing a buffer controlled by the
+ * library. On the other hand, it doesn't attempt to validate parameters whose
+ * values are fully controlled by the application (such as pointers).
+ *
+ * When this flag is defined, the library additionally attempts to validate
+ * parameters that are fully controlled by the application, and should always
+ * be valid if the application code is fully correct and trusted.
+ *
+ * For example, when a function accepts as input a pointer to a buffer that may
+ * contain untrusted data, and its documentation mentions that this pointer
+ * must not be NULL:
+ * - the pointer is checked to be non-NULL only if this option is enabled
+ * - the content of the buffer is always validated
+ *
+ * When this flag is defined, if a library function receives a parameter that
+ * is invalid, it will:
+ * - invoke the macro MBEDTLS_PARAM_FAILED() which by default expands to a
+ *   call to the function mbedtls_param_failed()
+ * - immediately return (with a specific error code unless the function
+ *   returns void and can't communicate an error).
+ *
+ * When defining this flag, you also need to:
+ * - either provide a definition of the function mbedtls_param_failed() in
+ *   your application (see platform_util.h for its prototype) as the library
+ *   calls that function, but does not provide a default definition for it,
+ * - or provide a different definition of the macro MBEDTLS_PARAM_FAILED()
+ *   below if the above mechanism is not flexible enough to suit your needs.
+ *   See the documentation of this macro later in this file.
+ *
+ * Uncomment to enable validation of application-controlled parameters.
+ */
+//#define MBEDTLS_CHECK_PARAMS
+
+/* \} name SECTION: System support */
+
+/**
+ * \name SECTION: mbed TLS feature support
+ *
+ * This section sets support for features that are or are not needed
+ * within the modules that are enabled.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_TIMING_ALT
+ *
+ * Uncomment to provide your own alternate implementation for mbedtls_timing_hardclock(),
+ * mbedtls_timing_get_timer(), mbedtls_set_alarm(), mbedtls_set/get_delay()
+ *
+ * Only works if you have MBEDTLS_TIMING_C enabled.
+ *
+ * You will need to provide a header "timing_alt.h" and an implementation at
+ * compile time.
+ */
+//#define MBEDTLS_TIMING_ALT
+
+/**
+ * \def MBEDTLS_AES_ALT
+ *
+ * MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternate core implementation of a symmetric crypto, an arithmetic or hash
+ * module (e.g. platform specific assembly optimized implementations). Keep
+ * in mind that the function prototypes should remain the same.
+ *
+ * This replaces the whole module. If you only want to replace one of the
+ * functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_AES_ALT, mbed TLS will no longer
+ * provide the "struct mbedtls_aes_context" definition and omit the base
+ * function declarations and implementations. "aes_alt.h" will be included from
+ * "aes.h" to include the new function definitions.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * module.
+ *
+ * \warning   MD2, MD4, MD5, ARC4, DES and SHA-1 are considered weak and their
+ *            use constitutes a security risk. If possible, we recommend
+ *            avoiding dependencies on them, and considering stronger message
+ *            digests and ciphers instead.
+ *
+ */
+//#define MBEDTLS_AES_ALT
+//#define MBEDTLS_ARC4_ALT
+//#define MBEDTLS_ARIA_ALT
+//#define MBEDTLS_BLOWFISH_ALT
+//#define MBEDTLS_CAMELLIA_ALT
+//#define MBEDTLS_CCM_ALT
+//#define MBEDTLS_CHACHA20_ALT
+//#define MBEDTLS_CHACHAPOLY_ALT
+//#define MBEDTLS_CMAC_ALT
+//#define MBEDTLS_DES_ALT
+//#define MBEDTLS_DHM_ALT
+//#define MBEDTLS_ECJPAKE_ALT
+//#define MBEDTLS_GCM_ALT
+//#define MBEDTLS_NIST_KW_ALT
+//#define MBEDTLS_MD2_ALT
+//#define MBEDTLS_MD4_ALT
+//#define MBEDTLS_MD5_ALT
+//#define MBEDTLS_POLY1305_ALT
+//#define MBEDTLS_RIPEMD160_ALT
+//#define MBEDTLS_RSA_ALT
+//#define MBEDTLS_SHA1_ALT
+//#define MBEDTLS_SHA256_ALT
+//#define MBEDTLS_SHA512_ALT
+//#define MBEDTLS_XTEA_ALT
+
+/*
+ * When replacing the elliptic curve module, pleace consider, that it is
+ * implemented with two .c files:
+ *      - ecp.c
+ *      - ecp_curves.c
+ * You can replace them very much like all the other MBEDTLS__MODULE_NAME__ALT
+ * macros as described above. The only difference is that you have to make sure
+ * that you provide functionality for both .c files.
+ */
+//#define MBEDTLS_ECP_ALT
+
+/**
+ * \def MBEDTLS_MD2_PROCESS_ALT
+ *
+ * MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use you
+ * alternate core implementation of symmetric crypto or hash function. Keep in
+ * mind that function prototypes should remain the same.
+ *
+ * This replaces only one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, mbed TLS will
+ * no longer provide the mbedtls_sha1_process() function, but it will still provide
+ * the other function (using your mbedtls_sha1_process() function) and the definition
+ * of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible
+ * with this definition.
+ *
+ * \note Because of a signature change, the core AES encryption and decryption routines are
+ *       currently named mbedtls_aes_internal_encrypt and mbedtls_aes_internal_decrypt,
+ *       respectively. When setting up alternative implementations, these functions should
+ *       be overridden, but the wrapper functions mbedtls_aes_decrypt and mbedtls_aes_encrypt
+ *       must stay untouched.
+ *
+ * \note If you use the AES_xxx_ALT macros, then is is recommended to also set
+ *       MBEDTLS_AES_ROM_TABLES in order to help the linker garbage-collect the AES
+ *       tables.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ *
+ * \warning   MD2, MD4, MD5, DES and SHA-1 are considered weak and their use
+ *            constitutes a security risk. If possible, we recommend avoiding
+ *            dependencies on them, and considering stronger message digests
+ *            and ciphers instead.
+ *
+ */
+//#define MBEDTLS_MD2_PROCESS_ALT
+//#define MBEDTLS_MD4_PROCESS_ALT
+//#define MBEDTLS_MD5_PROCESS_ALT
+//#define MBEDTLS_RIPEMD160_PROCESS_ALT
+//#define MBEDTLS_SHA1_PROCESS_ALT
+//#define MBEDTLS_SHA256_PROCESS_ALT
+//#define MBEDTLS_SHA512_PROCESS_ALT
+//#define MBEDTLS_DES_SETKEY_ALT
+//#define MBEDTLS_DES_CRYPT_ECB_ALT
+//#define MBEDTLS_DES3_CRYPT_ECB_ALT
+//#define MBEDTLS_AES_SETKEY_ENC_ALT
+//#define MBEDTLS_AES_SETKEY_DEC_ALT
+//#define MBEDTLS_AES_ENCRYPT_ALT
+//#define MBEDTLS_AES_DECRYPT_ALT
+//#define MBEDTLS_ECDH_GEN_PUBLIC_ALT
+//#define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
+//#define MBEDTLS_ECDSA_VERIFY_ALT
+//#define MBEDTLS_ECDSA_SIGN_ALT
+//#define MBEDTLS_ECDSA_GENKEY_ALT
+
+/**
+ * \def MBEDTLS_ECP_INTERNAL_ALT
+ *
+ * Expose a part of the internal interface of the Elliptic Curve Point module.
+ *
+ * MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternative core implementation of elliptic curve arithmetic. Keep in mind
+ * that function prototypes should remain the same.
+ *
+ * This partially replaces one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation
+ * is still present and it is used for group structures not supported by the
+ * alternative.
+ *
+ * Any of these options become available by defining MBEDTLS_ECP_INTERNAL_ALT
+ * and implementing the following functions:
+ *      unsigned char mbedtls_internal_ecp_grp_capable(
+ *          const mbedtls_ecp_group *grp )
+ *      int  mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp )
+ *      void mbedtls_internal_ecp_free( const mbedtls_ecp_group *grp )
+ * The mbedtls_internal_ecp_grp_capable function should return 1 if the
+ * replacement functions implement arithmetic for the given group and 0
+ * otherwise.
+ * The functions mbedtls_internal_ecp_init and mbedtls_internal_ecp_free are
+ * called before and after each point operation and provide an opportunity to
+ * implement optimized set up and tear down instructions.
+ *
+ * Example: In case you uncomment MBEDTLS_ECP_INTERNAL_ALT and
+ * MBEDTLS_ECP_DOUBLE_JAC_ALT, mbed TLS will still provide the ecp_double_jac
+ * function, but will use your mbedtls_internal_ecp_double_jac if the group is
+ * supported (your mbedtls_internal_ecp_grp_capable function returns 1 when
+ * receives it as an argument). If the group is not supported then the original
+ * implementation is used. The other functions and the definition of
+ * mbedtls_ecp_group and mbedtls_ecp_point will not change, so your
+ * implementation of mbedtls_internal_ecp_double_jac and
+ * mbedtls_internal_ecp_grp_capable must be compatible with this definition.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ */
+/* Required for all the functions in this section */
+//#define MBEDTLS_ECP_INTERNAL_ALT
+/* Support for Weierstrass curves with Jacobi representation */
+//#define MBEDTLS_ECP_RANDOMIZE_JAC_ALT
+//#define MBEDTLS_ECP_ADD_MIXED_ALT
+//#define MBEDTLS_ECP_DOUBLE_JAC_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_ALT
+/* Support for curves with Montgomery arithmetic */
+//#define MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT
+//#define MBEDTLS_ECP_RANDOMIZE_MXZ_ALT
+//#define MBEDTLS_ECP_NORMALIZE_MXZ_ALT
+
+/**
+ * \def MBEDTLS_TEST_NULL_ENTROPY
+ *
+ * Enables testing and use of mbed TLS without any configured entropy sources.
+ * This permits use of the library on platforms before an entropy source has
+ * been integrated (see for example the MBEDTLS_ENTROPY_HARDWARE_ALT or the
+ * MBEDTLS_ENTROPY_NV_SEED switches).
+ *
+ * WARNING! This switch MUST be disabled in production builds, and is suitable
+ * only for development.
+ * Enabling the switch negates any security provided by the library.
+ *
+ * Requires MBEDTLS_ENTROPY_C, MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ */
+//#define MBEDTLS_TEST_NULL_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_HARDWARE_ALT
+ *
+ * Uncomment this macro to let mbed TLS use your own implementation of a
+ * hardware entropy collector.
+ *
+ * Your function must be called \c mbedtls_hardware_poll(), have the same
+ * prototype as declared in entropy_poll.h, and accept NULL as first argument.
+ *
+ * Uncomment to use your own hardware entropy collector.
+ */
+//#define MBEDTLS_ENTROPY_HARDWARE_ALT
+
+/**
+ * \def MBEDTLS_AES_ROM_TABLES
+ *
+ * Use precomputed AES tables stored in ROM.
+ *
+ * Uncomment this macro to use precomputed AES tables stored in ROM.
+ * Comment this macro to generate AES tables in RAM at runtime.
+ *
+ * Tradeoff: Using precomputed ROM tables reduces RAM usage by ~8kb
+ * (or ~2kb if \c MBEDTLS_AES_FEWER_TABLES is used) and reduces the
+ * initialization time before the first AES operation can be performed.
+ * It comes at the cost of additional ~8kb ROM use (resp. ~2kb if \c
+ * MBEDTLS_AES_FEWER_TABLES below is used), and potentially degraded
+ * performance if ROM access is slower than RAM access.
+ *
+ * This option is independent of \c MBEDTLS_AES_FEWER_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_ROM_TABLES
+
+/**
+ * \def MBEDTLS_AES_FEWER_TABLES
+ *
+ * Use less ROM/RAM for AES tables.
+ *
+ * Uncommenting this macro omits 75% of the AES tables from
+ * ROM / RAM (depending on the value of \c MBEDTLS_AES_ROM_TABLES)
+ * by computing their values on the fly during operations
+ * (the tables are entry-wise rotations of one another).
+ *
+ * Tradeoff: Uncommenting this reduces the RAM / ROM footprint
+ * by ~6kb but at the cost of more arithmetic operations during
+ * runtime. Specifically, one has to compare 4 accesses within
+ * different tables to 4 accesses with additional arithmetic
+ * operations within the same table. The performance gain/loss
+ * depends on the system and memory details.
+ *
+ * This option is independent of \c MBEDTLS_AES_ROM_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_FEWER_TABLES
+
+/**
+ * \def MBEDTLS_CAMELLIA_SMALL_MEMORY
+ *
+ * Use less ROM for the Camellia implementation (saves about 768 bytes).
+ *
+ * Uncomment this macro to use less memory for Camellia.
+ */
+//#define MBEDTLS_CAMELLIA_SMALL_MEMORY
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CBC
+ *
+ * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CBC
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CFB
+ *
+ * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CTR
+ *
+ * Enable Counter Block Cipher mode (CTR) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CTR
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_OFB
+ *
+ * Enable Output Feedback mode (OFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_OFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_XTS
+ *
+ * Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
+ */
+//#define MBEDTLS_CIPHER_MODE_XTS
+
+/**
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+ *
+ * Enable NULL cipher.
+ * Warning: Only do so when you know what you are doing. This allows for
+ * encryption or channels without any security!
+ *
+ * This module is required to support the TLS ciphersuites that use the NULL
+ * cipher.
+ *
+ * Uncomment this macro to enable the NULL cipher
+ */
+//#define MBEDTLS_CIPHER_NULL_CIPHER
+
+/**
+ * \def MBEDTLS_CIPHER_PADDING_PKCS7
+ *
+ * MBEDTLS_CIPHER_PADDING_XXX: Uncomment or comment macros to add support for
+ * specific padding modes in the cipher layer with cipher modes that support
+ * padding (e.g. CBC)
+ *
+ * If you disable all padding modes, only full blocks can be used with CBC.
+ *
+ * Enable padding modes in the cipher layer.
+ */
+//#define MBEDTLS_CIPHER_PADDING_PKCS7
+//#define MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS
+//#define MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN
+//#define MBEDTLS_CIPHER_PADDING_ZEROS
+
+/**
+ * \def MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ *
+ * MBEDTLS_ECP_XXXX_ENABLED: Enables specific curves within the Elliptic Curve
+ * module.  By default all supported curves are enabled.
+ *
+ * Comment macros to disable the curve and functions for it
+ */
+//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE448_ENABLED
+
+/**
+ * \def MBEDTLS_ECP_NIST_OPTIM
+ *
+ * Enable specific 'modulo p' routines for each NIST prime.
+ * Depending on the prime and architecture, makes operations 4 to 8 times
+ * faster on the corresponding curve.
+ *
+ * Comment this macro to disable NIST curves optimisation.
+ */
+//#define MBEDTLS_ECP_NIST_OPTIM
+
+/**
+ * \def MBEDTLS_ECP_RESTARTABLE
+ *
+ * Enable "non-blocking" ECC operations that can return early and be resumed.
+ *
+ * This allows various functions to pause by returning
+ * #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in Mbed TLS's SSL module,
+ * MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in order
+ * to further progress and eventually complete their operation. This is
+ * controlled through mbedtls_ecp_set_max_ops() which limits the maximum number
+ * of ECC operations a function may perform before pausing; see
+ * mbedtls_ecp_set_max_ops() for more information.
+ *
+ * This is useful in non-threaded environments if you want to avoid blocking
+ * for too long on ECC (and, hence, X.509 or SSL/TLS) operations.
+ *
+ * Uncomment this macro to enable restartable ECC computations.
+ *
+ * \note  This option only works with the default software implementation of
+ *        elliptic curve functionality. It is incompatible with
+ *        MBEDTLS_ECP_ALT, MBEDTLS_ECDH_XXX_ALT and MBEDTLS_ECDSA_XXX_ALT.
+ */
+//#define MBEDTLS_ECP_RESTARTABLE
+
+/**
+ * \def MBEDTLS_ECDSA_DETERMINISTIC
+ *
+ * Enable deterministic ECDSA (RFC 6979).
+ * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
+ * may result in a compromise of the long-term signing key. This is avoided by
+ * the deterministic variant.
+ *
+ * Requires: MBEDTLS_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+ */
+//#define MBEDTLS_ECDSA_DETERMINISTIC
+
+/**
+ * \def MBEDTLS_PK_PARSE_EC_EXTENDED
+ *
+ * Enhance support for reading EC keys using variants of SEC1 not allowed by
+ * RFC 5915 and RFC 5480.
+ *
+ * Currently this means parsing the SpecifiedECDomain choice of EC
+ * parameters (only known groups are supported, not arbitrary domains, to
+ * avoid validation issues).
+ *
+ * Disable if you only need to support RFC 5915 + 5480 key formats.
+ */
+//#define MBEDTLS_PK_PARSE_EC_EXTENDED
+
+/**
+ * \def MBEDTLS_ERROR_STRERROR_DUMMY
+ *
+ * Enable a dummy error function to make use of mbedtls_strerror() in
+ * third party libraries easier when MBEDTLS_ERROR_C is disabled
+ * (no effect when MBEDTLS_ERROR_C is enabled).
+ *
+ * You can safely disable this if MBEDTLS_ERROR_C is enabled, or if you're
+ * not using mbedtls_strerror() or error_strerror() in your application.
+ *
+ * Disable if you run into name conflicts and want to really remove the
+ * mbedtls_strerror()
+ */
+//#define MBEDTLS_ERROR_STRERROR_DUMMY
+
+/**
+ * \def MBEDTLS_GENPRIME
+ *
+ * Enable the prime-number generation code.
+ *
+ * Requires: MBEDTLS_BIGNUM_C
+ */
+//#define MBEDTLS_GENPRIME
+
+/**
+ * \def MBEDTLS_FS_IO
+ *
+ * Enable functions that use the filesystem.
+ */
+//#define MBEDTLS_FS_IO
+
+/**
+ * \def MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ * Do not add default entropy sources. These are the platform specific,
+ * mbedtls_timing_hardclock and HAVEGE based poll functions.
+ *
+ * This is useful to have more control over the added entropy sources in an
+ * application.
+ *
+ * Uncomment this macro to prevent loading of default entropy functions.
+ */
+//#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+
+/**
+ * \def MBEDTLS_NO_PLATFORM_ENTROPY
+ *
+ * Do not use built-in platform entropy functions.
+ * This is useful if your platform does not support
+ * standards like the /dev/urandom or Windows CryptoAPI.
+ *
+ * Uncomment this macro to disable the built-in platform entropy functions.
+ */
+//#define MBEDTLS_NO_PLATFORM_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_FORCE_SHA256
+ *
+ * Force the entropy accumulator to use a SHA-256 accumulator instead of the
+ * default SHA-512 based one (if both are available).
+ *
+ * Requires: MBEDTLS_SHA256_C
+ *
+ * On 32-bit systems SHA-256 can be much faster than SHA-512. Use this option
+ * if you have performance concerns.
+ *
+ * This option is only useful if both MBEDTLS_SHA256_C and
+ * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
+ */
+//#define MBEDTLS_ENTROPY_FORCE_SHA256
+
+/**
+ * \def MBEDTLS_ENTROPY_NV_SEED
+ *
+ * Enable the non-volatile (NV) seed file-based entropy source.
+ * (Also enables the NV seed read/write functions in the platform layer)
+ *
+ * This is crucial (if not required) on systems that do not have a
+ * cryptographic entropy source (in hardware or kernel) available.
+ *
+ * Requires: MBEDTLS_ENTROPY_C, MBEDTLS_PLATFORM_C
+ *
+ * \note The read/write functions that are used by the entropy source are
+ *       determined in the platform layer, and can be modified at runtime and/or
+ *       compile-time depending on the flags (MBEDTLS_PLATFORM_NV_SEED_*) used.
+ *
+ * \note If you use the default implementation functions that read a seedfile
+ *       with regular fopen(), please make sure you make a seedfile with the
+ *       proper name (defined in MBEDTLS_PLATFORM_STD_NV_SEED_FILE) and at
+ *       least MBEDTLS_ENTROPY_BLOCK_SIZE bytes in size that can be read from
+ *       and written to or you will get an entropy source error! The default
+ *       implementation will only use the first MBEDTLS_ENTROPY_BLOCK_SIZE
+ *       bytes from the file.
+ *
+ * \note The entropy collector will write to the seed file before entropy is
+ *       given to an external source, to update it.
+ */
+//#define MBEDTLS_ENTROPY_NV_SEED
+
+/* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+ *
+ * In PSA key storage, encode the owner of the key.
+ *
+ * This is only meaningful when building the library as part of a
+ * multi-client service. When you activate this option, you must provide
+ * an implementation of the type psa_key_owner_id_t and a translation
+ * from psa_key_file_id_t to file name in all the storage backends that
+ * you wish to support.
+ *
+ * Note that this option is meant for internal use only and may be removed
+ * without notice.
+ */
+//#define MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+
+/**
+ * \def MBEDTLS_MEMORY_DEBUG
+ *
+ * Enable debugging of buffer allocator memory issues. Automatically prints
+ * (to stderr) all (fatal) messages on memory allocation issues. Enables
+ * function for 'debug output' of allocated memory.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Uncomment this macro to let the buffer allocator print out error messages.
+ */
+//#define MBEDTLS_MEMORY_DEBUG
+
+/**
+ * \def MBEDTLS_MEMORY_BACKTRACE
+ *
+ * Include backtrace information with each allocated block.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *           GLIBC-compatible backtrace() an backtrace_symbols() support
+ *
+ * Uncomment this macro to include backtrace information
+ */
+//#define MBEDTLS_MEMORY_BACKTRACE
+
+/**
+ * \def MBEDTLS_PK_RSA_ALT_SUPPORT
+ *
+ * Support external private RSA keys (eg from a HSM) in the PK layer.
+ *
+ * Comment this macro to disable support for external private RSA keys.
+ */
+//#define MBEDTLS_PK_RSA_ALT_SUPPORT
+
+/**
+ * \def MBEDTLS_PKCS1_V15
+ *
+ * Enable support for PKCS#1 v1.5 encoding.
+ *
+ * Requires: MBEDTLS_RSA_C
+ *
+ * This enables support for PKCS#1 v1.5 operations.
+ */
+//#define MBEDTLS_PKCS1_V15
+
+/**
+ * \def MBEDTLS_PKCS1_V21
+ *
+ * Enable support for PKCS#1 v2.1 encoding.
+ *
+ * Requires: MBEDTLS_MD_C, MBEDTLS_RSA_C
+ *
+ * This enables support for RSAES-OAEP and RSASSA-PSS operations.
+ */
+//#define MBEDTLS_PKCS1_V21
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_SPM
+ *
+ * When MBEDTLS_PSA_CRYPTO_SPM is defined, the code is built for SPM (Secure
+ * Partition Manager) integration which separates the code into two parts: a
+ * NSPE (Non-Secure Process Environment) and an SPE (Secure Process
+ * Environment).
+ *
+ * Module:  library/psa_crypto.c
+ * Requires: MBEDTLS_PSA_CRYPTO_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_SPM
+
+/**
+ * \def MBEDTLS_PSA_INJECT_ENTROPY
+ *
+ * Enable support for entropy injection at first boot. This feature is
+ * required on systems that do not have a built-in entropy source (TRNG).
+ * This feature is currently not supported on systems that have a built-in
+ * entropy source.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_STORAGE_C, MBEDTLS_ENTROPY_NV_SEED
+ *
+ */
+//#define MBEDTLS_PSA_INJECT_ENTROPY
+
+/**
+ * \def MBEDTLS_RSA_NO_CRT
+ *
+ * Do not use the Chinese Remainder Theorem
+ * for the RSA private operation.
+ *
+ * Uncomment this macro to disable the use of CRT in RSA.
+ *
+ */
+//#define MBEDTLS_RSA_NO_CRT
+
+/**
+ * \def MBEDTLS_SELF_TEST
+ *
+ * Enable the checkup functions (*_self_test).
+ */
+//#define MBEDTLS_SELF_TEST
+
+/**
+ * \def MBEDTLS_SHA256_SMALLER
+ *
+ * Enable an implementation of SHA-256 that has lower ROM footprint but also
+ * lower performance.
+ *
+ * The default implementation is meant to be a reasonable compromise between
+ * performance and size. This version optimizes more aggressively for size at
+ * the expense of performance. Eg on Cortex-M4 it reduces the size of
+ * mbedtls_sha256_process() from ~2KB to ~0.5KB for a performance hit of about
+ * 30%.
+ *
+ * Uncomment to enable the smaller implementation of SHA256.
+ */
+#define MBEDTLS_SHA256_SMALLER
+
+/**
+ * \def MBEDTLS_THREADING_ALT
+ *
+ * Provide your own alternate threading implementation.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to allow your own alternate threading implementation.
+ */
+//#define MBEDTLS_THREADING_ALT
+
+/**
+ * \def MBEDTLS_THREADING_PTHREAD
+ *
+ * Enable the pthread wrapper layer for the threading layer.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to enable pthread mutexes.
+ */
+//#define MBEDTLS_THREADING_PTHREAD
+
+/**
+ * \def MBEDTLS_USE_PSA_CRYPTO
+ *
+ * Make the X.509 and TLS library use PSA for cryptographic operations, see
+ * #MBEDTLS_PSA_CRYPTO_C.
+ *
+ * Note: this option is still in progress, the full X.509 and TLS modules are
+ * not covered yet, but parts that are not ported to PSA yet will still work
+ * as usual, so enabling this option should not break backwards compatibility.
+ *
+ * \warning  Support for PSA is still an experimental feature.
+ *           Any public API that depends on this option may change
+ *           at any time until this warning is removed.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C.
+ */
+//#define MBEDTLS_USE_PSA_CRYPTO
+
+/**
+ * \def MBEDTLS_VERSION_FEATURES
+ *
+ * Allow run-time checking of compile-time enabled features. Thus allowing users
+ * to check at run-time if the library is for instance compiled with threading
+ * support via mbedtls_version_check_feature().
+ *
+ * Requires: MBEDTLS_VERSION_C
+ *
+ * Comment this to disable run-time checking and save ROM space
+ */
+//#define MBEDTLS_VERSION_FEATURES
+
+/* \} name SECTION: mbed TLS feature support */
+
+/**
+ * \name SECTION: mbed TLS modules
+ *
+ * This section enables or disables entire modules in mbed TLS
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_AESNI_C
+ *
+ * Enable AES-NI support on x86-64.
+ *
+ * Module:  library/aesni.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the AES-NI instructions on x86-64
+ */
+//#define MBEDTLS_AESNI_C
+
+/**
+ * \def MBEDTLS_AES_C
+ *
+ * Enable the AES block cipher.
+ *
+ * Module:  library/aes.c
+ * Caller:  library/cipher.c
+ *          library/pem.c
+ *          library/ctr_drbg.c
+ *
+ * This module is required to support the TLS ciphersuites that use the AES
+ * cipher.
+ *
+ * PEM_PARSE uses AES for decrypting encrypted keys.
+ */
+//#define MBEDTLS_AES_C
+
+/**
+ * \def MBEDTLS_ARC4_C
+ *
+ * Enable the ARCFOUR stream cipher.
+ *
+ * Module:  library/arc4.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the ARC4
+ * cipher.
+ *
+ * \warning   ARC4 is considered a weak cipher and its use constitutes a
+ *            security risk. If possible, we recommend avoidng dependencies on
+ *            it, and considering stronger ciphers instead.
+ *
+ */
+//#define MBEDTLS_ARC4_C
+
+/**
+ * \def MBEDTLS_ASN1_PARSE_C
+ *
+ * Enable the generic ASN1 parser.
+ *
+ * Module:  library/asn1.c
+ * Caller:  library/dhm.c
+ *          library/pkcs12.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ */
+//#define MBEDTLS_ASN1_PARSE_C
+
+/**
+ * \def MBEDTLS_ASN1_WRITE_C
+ *
+ * Enable the generic ASN1 writer.
+ *
+ * Module:  library/asn1write.c
+ * Caller:  library/ecdsa.c
+ *          library/pkwrite.c
+ */
+//#define MBEDTLS_ASN1_WRITE_C
+
+/**
+ * \def MBEDTLS_BASE64_C
+ *
+ * Enable the Base64 module.
+ *
+ * Module:  library/base64.c
+ * Caller:  library/pem.c
+ *
+ * This module is required for PEM support (required by X.509).
+ */
+//#define MBEDTLS_BASE64_C
+
+/**
+ * \def MBEDTLS_BIGNUM_C
+ *
+ * Enable the multi-precision integer library.
+ *
+ * Module:  library/bignum.c
+ * Caller:  library/dhm.c
+ *          library/ecp.c
+ *          library/ecdsa.c
+ *          library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is required for RSA, DHM and ECC (ECDH, ECDSA) support.
+ */
+//#define MBEDTLS_BIGNUM_C
+
+/**
+ * \def MBEDTLS_BLOWFISH_C
+ *
+ * Enable the Blowfish block cipher.
+ *
+ * Module:  library/blowfish.c
+ */
+//#define MBEDTLS_BLOWFISH_C
+
+/**
+ * \def MBEDTLS_CAMELLIA_C
+ *
+ * Enable the Camellia block cipher.
+ *
+ * Module:  library/camellia.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * Camellia cipher.
+ */
+//#define MBEDTLS_CAMELLIA_C
+
+/**
+ * \def MBEDTLS_ARIA_C
+ *
+ * Enable the ARIA block cipher.
+ *
+ * Module:  library/aria.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * ARIA cipher.
+ */
+//#define MBEDTLS_ARIA_C
+
+/**
+ * \def MBEDTLS_CCM_C
+ *
+ * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
+ *
+ * Module:  library/ccm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support AES-CCM ciphersuites in TLS.
+ */
+//#define MBEDTLS_CCM_C
+
+/**
+ * \def MBEDTLS_CHACHA20_C
+ *
+ * Enable the ChaCha20 stream cipher.
+ *
+ * Module:  library/chacha20.c
+ */
+//#define MBEDTLS_CHACHA20_C
+
+/**
+ * \def MBEDTLS_CHACHAPOLY_C
+ *
+ * Enable the ChaCha20-Poly1305 AEAD algorithm.
+ *
+ * Module:  library/chachapoly.c
+ *
+ * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
+ */
+//#define MBEDTLS_CHACHAPOLY_C
+
+/**
+ * \def MBEDTLS_CIPHER_C
+ *
+ * Enable the generic cipher layer.
+ *
+ * Module:  library/cipher.c
+ *
+ * Uncomment to enable generic cipher wrappers.
+ */
+//#define MBEDTLS_CIPHER_C
+
+/**
+ * \def MBEDTLS_CMAC_C
+ *
+ * Enable the CMAC (Cipher-based Message Authentication Code) mode for block
+ * ciphers.
+ *
+ * Module:  library/cmac.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
+ *
+ */
+//#define MBEDTLS_CMAC_C
+
+/**
+ * \def MBEDTLS_CTR_DRBG_C
+ *
+ * Enable the CTR_DRBG AES-based random generator.
+ * The CTR_DRBG generator uses AES-256 by default.
+ * To use AES-128 instead, enable MBEDTLS_CTR_DRBG_USE_128_BIT_KEY below.
+ *
+ * Module:  library/ctr_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_AES_C
+ *
+ * This module provides the CTR_DRBG AES random number generator.
+ */
+//#define MBEDTLS_CTR_DRBG_C
+
+/**
+ * \def MBEDTLS_DES_C
+ *
+ * Enable the DES block cipher.
+ *
+ * Module:  library/des.c
+ * Caller:  library/pem.c
+ *          library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the DES
+ * cipher.
+ *
+ * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
+ *
+ * \warning   DES is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ */
+//#define MBEDTLS_DES_C
+
+/**
+ * \def MBEDTLS_DHM_C
+ *
+ * Enable the Diffie-Hellman-Merkle module.
+ *
+ * Module:  library/dhm.c
+ *
+ * This module is used by the following key exchanges:
+ *      DHE-RSA, DHE-PSK
+ *
+ * \warning    Using DHE constitutes a security risk as it
+ *             is not possible to validate custom DH parameters.
+ *             If possible, it is recommended users should consider
+ *             preferring other methods of key exchange.
+ *             See dhm.h for more details.
+ *
+ */
+//#define MBEDTLS_DHM_C
+
+/**
+ * \def MBEDTLS_ECDH_C
+ *
+ * Enable the elliptic curve Diffie-Hellman library.
+ *
+ * Module:  library/ecdh.c
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
+ *
+ * Requires: MBEDTLS_ECP_C
+ */
+//#define MBEDTLS_ECDH_C
+
+/**
+ * \def MBEDTLS_ECDSA_C
+ *
+ * Enable the elliptic curve DSA library.
+ *
+ * Module:  library/ecdsa.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_ASN1_WRITE_C, MBEDTLS_ASN1_PARSE_C
+ */
+//#define MBEDTLS_ECDSA_C
+
+/**
+ * \def MBEDTLS_ECJPAKE_C
+ *
+ * Enable the elliptic curve J-PAKE library.
+ *
+ * \warning This is currently experimental. EC J-PAKE support is based on the
+ * Thread v1.0.0 specification; incompatible changes to the specification
+ * might still happen. For this reason, this is disabled by default.
+ *
+ * Module:  library/ecjpake.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECJPAKE
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_MD_C
+ */
+//#define MBEDTLS_ECJPAKE_C
+
+/**
+ * \def MBEDTLS_ECP_C
+ *
+ * Enable the elliptic curve over GF(p) library.
+ *
+ * Module:  library/ecp.c
+ * Caller:  library/ecdh.c
+ *          library/ecdsa.c
+ *          library/ecjpake.c
+ *
+ * Requires: MBEDTLS_BIGNUM_C and at least one MBEDTLS_ECP_DP_XXX_ENABLED
+ */
+//#define MBEDTLS_ECP_C
+
+/**
+ * \def MBEDTLS_ENTROPY_C
+ *
+ * Enable the platform-specific entropy code.
+ *
+ * Module:  library/entropy.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SHA512_C or MBEDTLS_SHA256_C
+ *
+ * This module provides a generic entropy pool
+ */
+//#define MBEDTLS_ENTROPY_C
+
+/**
+ * \def MBEDTLS_ERROR_C
+ *
+ * Enable error code to error string conversion.
+ *
+ * Module:  library/error.c
+ * Caller:
+ *
+ * This module enables mbedtls_strerror().
+ */
+//#define MBEDTLS_ERROR_C
+
+/**
+ * \def MBEDTLS_GCM_C
+ *
+ * Enable the Galois/Counter Mode (GCM) for AES.
+ *
+ * Module:  library/gcm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support the TLS ciphersuites that use GCM.
+ */
+//#define MBEDTLS_GCM_C
+
+/**
+ * \def MBEDTLS_HAVEGE_C
+ *
+ * Enable the HAVEGE random generator.
+ *
+ * Warning: the HAVEGE random generator is not suitable for virtualized
+ *          environments
+ *
+ * Warning: the HAVEGE random generator is dependent on timing and specific
+ *          processor traits. It is therefore not advised to use HAVEGE as
+ *          your applications primary random generator or primary entropy pool
+ *          input. As a secondary input to your entropy pool, it IS able add
+ *          the (limited) extra entropy it provides.
+ *
+ * Module:  library/havege.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_TIMING_C
+ *
+ * Uncomment to enable the HAVEGE random generator.
+ */
+//#define MBEDTLS_HAVEGE_C
+
+/**
+ * \def MBEDTLS_HKDF_C
+ *
+ * Enable the HKDF algorithm (RFC 5869).
+ *
+ * Module:  library/hkdf.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the Hashed Message Authentication Code
+ * (HMAC)-based key derivation function (HKDF).
+ */
+//#define MBEDTLS_HKDF_C
+
+/**
+ * \def MBEDTLS_HMAC_DRBG_C
+ *
+ * Enable the HMAC_DRBG random generator.
+ *
+ * Module:  library/hmac_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+ */
+//#define MBEDTLS_HMAC_DRBG_C
+
+/**
+ * \def MBEDTLS_NIST_KW_C
+ *
+ * Enable the Key Wrapping mode for 128-bit block ciphers,
+ * as defined in NIST SP 800-38F. Only KW and KWP modes
+ * are supported. At the moment, only AES is approved by NIST.
+ *
+ * Module:  library/nist_kw.c
+ *
+ * Requires: MBEDTLS_AES_C and MBEDTLS_CIPHER_C
+ */
+//#define MBEDTLS_NIST_KW_C
+
+/**
+ * \def MBEDTLS_MD_C
+ *
+ * Enable the generic message digest layer.
+ *
+ * Module:  library/md.c
+ * Caller:
+ *
+ * Uncomment to enable generic message digest wrappers.
+ */
+//#define MBEDTLS_MD_C
+
+/**
+ * \def MBEDTLS_MD2_C
+ *
+ * Enable the MD2 hash algorithm.
+ *
+ * Module:  library/md2.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD2-signed X.509 certs.
+ *
+ * \warning   MD2 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD2_C
+
+/**
+ * \def MBEDTLS_MD4_C
+ *
+ * Enable the MD4 hash algorithm.
+ *
+ * Module:  library/md4.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD4-signed X.509 certs.
+ *
+ * \warning   MD4 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD4_C
+
+/**
+ * \def MBEDTLS_MD5_C
+ *
+ * Enable the MD5 hash algorithm.
+ *
+ * Module:  library/md5.c
+ * Caller:  library/md.c
+ *          library/pem.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, and for TLS 1.2
+ * depending on the handshake parameters. Further, it is used for checking
+ * MD5-signed certificates, and for PBKDF1 when decrypting PEM-encoded
+ * encrypted keys.
+ *
+ * \warning   MD5 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD5_C
+
+/**
+ * \def MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Enable the buffer allocator implementation that makes use of a (stack)
+ * based buffer to 'allocate' dynamic memory. (replaces calloc() and free()
+ * calls)
+ *
+ * Module:  library/memory_buffer_alloc.c
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *           MBEDTLS_PLATFORM_MEMORY (to use it within mbed TLS)
+ *
+ * Enable this module to enable the buffer memory allocator.
+ */
+//#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+
+/**
+ * \def MBEDTLS_OID_C
+ *
+ * Enable the OID database.
+ *
+ * Module:  library/oid.c
+ * Caller:  library/asn1write.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ *          library/pkwrite.c
+ *          library/rsa.c
+ *
+ * This modules translates between OIDs and internal values.
+ */
+//#define MBEDTLS_OID_C
+
+/**
+ * \def MBEDTLS_PADLOCK_C
+ *
+ * Enable VIA Padlock support on x86.
+ *
+ * Module:  library/padlock.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the VIA PadLock on x86.
+ */
+//#define MBEDTLS_PADLOCK_C
+
+/**
+ * \def MBEDTLS_PEM_PARSE_C
+ *
+ * Enable PEM decoding / parsing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/dhm.c
+ *          library/pkparse.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for decoding / parsing PEM files.
+ */
+//#define MBEDTLS_PEM_PARSE_C
+
+/**
+ * \def MBEDTLS_PEM_WRITE_C
+ *
+ * Enable PEM encoding / writing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for encoding / writing PEM files.
+ */
+//#define MBEDTLS_PEM_WRITE_C
+
+/**
+ * \def MBEDTLS_PK_C
+ *
+ * Enable the generic public (asymmetric) key layer.
+ *
+ * Module:  library/pk.c
+ *
+ * Requires: MBEDTLS_RSA_C or MBEDTLS_ECP_C
+ *
+ * Uncomment to enable generic public key wrappers.
+ */
+//#define MBEDTLS_PK_C
+
+/**
+ * \def MBEDTLS_PK_PARSE_C
+ *
+ * Enable the generic public (asymmetric) key parser.
+ *
+ * Module:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key parse functions.
+ */
+//#define MBEDTLS_PK_PARSE_C
+
+/**
+ * \def MBEDTLS_PK_WRITE_C
+ *
+ * Enable the generic public (asymmetric) key writer.
+ *
+ * Module:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key write functions.
+ */
+//#define MBEDTLS_PK_WRITE_C
+
+/**
+ * \def MBEDTLS_PKCS5_C
+ *
+ * Enable PKCS#5 functions.
+ *
+ * Module:  library/pkcs5.c
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the PKCS#5 functions.
+ */
+//#define MBEDTLS_PKCS5_C
+
+/**
+ * \def MBEDTLS_PKCS12_C
+ *
+ * Enable PKCS#12 PBE functions.
+ * Adds algorithms for parsing PKCS#8 encrypted private keys
+ *
+ * Module:  library/pkcs12.c
+ * Caller:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_CIPHER_C, MBEDTLS_MD_C
+ * Can use:  MBEDTLS_ARC4_C
+ *
+ * This module enables PKCS#12 functions.
+ */
+//#define MBEDTLS_PKCS12_C
+
+/**
+ * \def MBEDTLS_PLATFORM_C
+ *
+ * Enable the platform abstraction layer that allows you to re-assign
+ * functions like calloc(), free(), snprintf(), printf(), fprintf(), exit().
+ *
+ * Enabling MBEDTLS_PLATFORM_C enables to use of MBEDTLS_PLATFORM_XXX_ALT
+ * or MBEDTLS_PLATFORM_XXX_MACRO directives, allowing the functions mentioned
+ * above to be specified at runtime or compile time respectively.
+ *
+ * \note This abstraction layer must be enabled on Windows (including MSYS2)
+ * as other module rely on it for a fixed snprintf implementation.
+ *
+ * Module:  library/platform.c
+ * Caller:  Most other .c files
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+//#define MBEDTLS_PLATFORM_C
+
+/**
+ * \def MBEDTLS_POLY1305_C
+ *
+ * Enable the Poly1305 MAC algorithm.
+ *
+ * Module:  library/poly1305.c
+ * Caller:  library/chachapoly.c
+ */
+//#define MBEDTLS_POLY1305_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_C
+ *
+ * Enable the Platform Security Architecture cryptography API.
+ *
+ * Module:  library/psa_crypto.c
+ *
+ * Requires: MBEDTLS_CTR_DRBG_C, MBEDTLS_ENTROPY_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_STORAGE_C
+ *
+ * Enable the Platform Security Architecture persistent key storage.
+ *
+ * Module:  library/psa_crypto_storage.c
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C,
+ *           either MBEDTLS_PSA_ITS_FILE_C or a native implementation of
+ *           the PSA ITS interface
+ */
+//#define MBEDTLS_PSA_CRYPTO_STORAGE_C
+
+/**
+ * \def MBEDTLS_PSA_ITS_FILE_C
+ *
+ * Enable the emulation of the Platform Security Architecture
+ * Internal Trusted Storage (PSA ITS) over files.
+ *
+ * Module:  library/psa_its_file.c
+ *
+ * Requires: MBEDTLS_FS_IO
+ */
+//#define MBEDTLS_PSA_ITS_FILE_C
+
+/**
+ * \def MBEDTLS_RIPEMD160_C
+ *
+ * Enable the RIPEMD-160 hash algorithm.
+ *
+ * Module:  library/ripemd160.c
+ * Caller:  library/md.c
+ *
+ */
+//#define MBEDTLS_RIPEMD160_C
+
+/**
+ * \def MBEDTLS_RSA_C
+ *
+ * Enable the RSA public-key cryptosystem.
+ *
+ * Module:  library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is used by the following key exchanges:
+ *      RSA, DHE-RSA, ECDHE-RSA, RSA-PSK
+ *
+ * Requires: MBEDTLS_BIGNUM_C, MBEDTLS_OID_C
+ */
+/* #define MBEDTLS_RSA_C */
+
+/**
+ * \def MBEDTLS_SHA1_C
+ *
+ * Enable the SHA1 cryptographic hash algorithm.
+ *
+ * Module:  library/sha1.c
+ * Caller:  library/md.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, for TLS 1.2
+ * depending on the handshake parameters, and for SHA1-signed certificates.
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. If possible, we recommend avoiding dependencies
+ *            on it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_SHA1_C
+
+/**
+ * \def MBEDTLS_SHA256_C
+ *
+ * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
+ *
+ * Module:  library/sha256.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-224 and SHA-256.
+ * This module is required for the SSL/TLS 1.2 PRF function.
+ */
+#define MBEDTLS_SHA256_C
+
+/**
+ * \def MBEDTLS_SHA512_C
+ *
+ * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
+ *
+ * Module:  library/sha512.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-384 and SHA-512.
+ */
+//#define MBEDTLS_SHA512_C
+
+/**
+ * \def MBEDTLS_THREADING_C
+ *
+ * Enable the threading abstraction layer.
+ * By default mbed TLS assumes it is used in a non-threaded environment or that
+ * contexts are not shared between threads. If you do intend to use contexts
+ * between threads, you will need to enable this layer to prevent race
+ * conditions. See also our Knowledge Base article about threading:
+ * https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
+ *
+ * Module:  library/threading.c
+ *
+ * This allows different threading implementations (self-implemented or
+ * provided).
+ *
+ * You will have to enable either MBEDTLS_THREADING_ALT or
+ * MBEDTLS_THREADING_PTHREAD.
+ *
+ * Enable this layer to allow use of mutexes within mbed TLS
+ */
+//#define MBEDTLS_THREADING_C
+
+/**
+ * \def MBEDTLS_TIMING_C
+ *
+ * Enable the semi-portable timing interface.
+ *
+ * \note The provided implementation only works on POSIX/Unix (including Linux,
+ * BSD and OS X) and Windows. On other platforms, you can either disable that
+ * module and provide your own implementations of the callbacks needed by Mbed
+ * TLS's \c mbedtls_ssl_set_timer_cb() for DTLS, or leave it enabled and
+ * provide your own implementation of the whole module by setting
+ * \c MBEDTLS_TIMING_ALT in the current file.
+ *
+ * \note See also our Knowledge Base article about porting to a new
+ * environment:
+ * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS
+ *
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+//#define MBEDTLS_TIMING_C
+
+/**
+ * \def MBEDTLS_VERSION_C
+ *
+ * Enable run-time version information.
+ *
+ * Module:  library/version.c
+ *
+ * This module provides run-time version information.
+ */
+//#define MBEDTLS_VERSION_C
+
+/**
+ * \def MBEDTLS_XTEA_C
+ *
+ * Enable the XTEA block cipher.
+ *
+ * Module:  library/xtea.c
+ * Caller:
+ */
+//#define MBEDTLS_XTEA_C
+
+/* \} name SECTION: mbed TLS modules */
+
+/**
+ * \name SECTION: Module configuration options
+ *
+ * This section allows for the setting of module specific sizes and
+ * configuration options. The default values are already present in the
+ * relevant header files and should suffice for the regular use cases.
+ *
+ * Our advice is to enable options and change their values here
+ * only if you have a good reason and know the consequences.
+ *
+ * Please check the respective header file for documentation on these
+ * parameters (to prevent duplicate documentation).
+ * \{
+ */
+
+/* MPI / BIGNUM options */
+//#define MBEDTLS_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
+//#define MBEDTLS_MPI_MAX_SIZE            1024 /**< Maximum number of bytes for usable MPIs. */
+
+/* CTR_DRBG options */
+//#define MBEDTLS_CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+//#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
+//#define MBEDTLS_CTR_DRBG_USE_128_BIT_KEY              /**< Use 128-bit key for CTR_DRBG - may reduce security (see ctr_drbg.h) */
+
+/* HMAC_DRBG options */
+//#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_HMAC_DRBG_MAX_INPUT           256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_HMAC_DRBG_MAX_REQUEST        1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT      384 /**< Maximum size of (re)seed buffer */
+
+/* ECP options */
+//#define MBEDTLS_ECP_MAX_BITS             521 /**< Maximum bit size of groups */
+//#define MBEDTLS_ECP_WINDOW_SIZE            6 /**< Maximum window size used */
+//#define MBEDTLS_ECP_FIXED_POINT_OPTIM      1 /**< Enable fixed-point speed-up */
+
+/* Entropy options */
+//#define MBEDTLS_ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
+//#define MBEDTLS_ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
+//#define MBEDTLS_ENTROPY_MIN_HARDWARE               32 /**< Default minimum number of bytes required for the hardware entropy source mbedtls_hardware_poll() before entropy is released */
+
+/* Memory buffer allocator options */
+//#define MBEDTLS_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
+
+/* Platform options */
+//#define MBEDTLS_PLATFORM_STD_MEM_HDR   <stdlib.h> /**< Header to include if MBEDTLS_PLATFORM_NO_STD_FUNCTIONS is defined. Don't define if no header is needed. */
+//#define MBEDTLS_PLATFORM_STD_CALLOC        calloc /**< Default allocator to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_FREE            free /**< Default free to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT            exit /**< Default exit to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_TIME            time /**< Default time to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_STD_FPRINTF      fprintf /**< Default fprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_PRINTF        printf /**< Default printf to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_STD_SNPRINTF    snprintf /**< Default snprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS       0 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE       1 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_READ   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_FILE  "seedfile" /**< Seed file to read/write with default implementation */
+
+/* To Use Function Macros MBEDTLS_PLATFORM_C must be enabled */
+/* MBEDTLS_PLATFORM_XXX_MACRO and MBEDTLS_PLATFORM_XXX_ALT cannot both be defined */
+//#define MBEDTLS_PLATFORM_CALLOC_MACRO        calloc /**< Default allocator macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_FREE_MACRO            free /**< Default free macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_EXIT_MACRO            exit /**< Default exit macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_TIME_MACRO            time /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO       time_t /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_FPRINTF_MACRO      fprintf /**< Default fprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_PRINTF_MACRO        printf /**< Default printf macro to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_SNPRINTF_MACRO    snprintf /**< Default snprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_VSNPRINTF_MACRO    vsnprintf /**< Default vsnprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+
+/**
+ * Uncomment the macro to let mbed TLS use your alternate implementation of
+ * mbedtls_platform_zeroize(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * mbedtls_platform_zeroize() is a widely used function across the library to
+ * zero a block of memory. The implementation is expected to be secure in the
+ * sense that it has been written to prevent the compiler from removing calls
+ * to mbedtls_platform_zeroize() as part of redundant code elimination
+ * optimizations. However, it is difficult to guarantee that calls to
+ * mbedtls_platform_zeroize() will not be optimized by the compiler as older
+ * versions of the C language standards do not provide a secure implementation
+ * of memset(). Therefore, MBEDTLS_PLATFORM_ZEROIZE_ALT enables users to
+ * configure their own implementation of mbedtls_platform_zeroize(), for
+ * example by using directives specific to their compiler, features from newer
+ * C standards (e.g using memset_s() in C11) or calling a secure memset() from
+ * their system (e.g explicit_bzero() in BSD).
+ */
+//#define MBEDTLS_PLATFORM_ZEROIZE_ALT
+
+/**
+ * Uncomment the macro to let Mbed TLS use your alternate implementation of
+ * mbedtls_platform_gmtime_r(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * gmtime() is not a thread-safe function as defined in the C standard. The
+ * library will try to use safer implementations of this function, such as
+ * gmtime_r() when available. However, if Mbed TLS cannot identify the target
+ * system, the implementation of mbedtls_platform_gmtime_r() will default to
+ * using the standard gmtime(). In this case, calls from the library to
+ * gmtime() will be guarded by the global mutex mbedtls_threading_gmtime_mutex
+ * if MBEDTLS_THREADING_C is enabled. We recommend that calls from outside the
+ * library are also guarded with this mutex to avoid race conditions. However,
+ * if the macro MBEDTLS_PLATFORM_GMTIME_R_ALT is defined, Mbed TLS will
+ * unconditionally use the implementation for mbedtls_platform_gmtime_r()
+ * supplied at compile time.
+ */
+//#define MBEDTLS_PLATFORM_GMTIME_R_ALT
+
+/* \} name SECTION: Customisation configuration options */
+
+/* Target and application specific configurations
+ *
+ * Allow user to override any previous default.
+ *
+ */
+#if defined(MBEDTLS_USER_CONFIG_FILE)
+#include MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#include "mbedtls/check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/nvms_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/nvms_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/nvms_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/se_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/se_crypto_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/se_crypto_config.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/se_crypto_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/se_def_metadata.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/se_def_metadata.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/se_def_metadata.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/se_def_metadata.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/se_low_level.h
new file mode 100644
index 00000000..bd8b79e1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/se_low_level.h
@@ -0,0 +1,184 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Engine low level interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_LOW_LEVEL_H
+#define SE_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+
+/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
+   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
+#include "sfu_fwimg_regions.h"
+
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup SE
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
+  * @{
+  */
+/**
+  * @brief flash handling constants: these constants are used in se_fwimg.c
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
+  * @{
+  */
+
+/**
+  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
+  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
+  * 32-bit word.
+  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
+  */
+#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
+  do{                                  \
+    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
+  }while(0)
+
+/**
+  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
+  */
+#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
+  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
+  * @{
+  */
+
+/**
+  * MPU : Enter/Exit secured area ==> nothing to do
+  */
+#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
+#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
+
+/** @addtogroup SE_LOW_LEVEL_Exported_Functions
+  * @{
+  */
+void SE_LL_CORE_Cleanup(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_Functions
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void);
+SE_ErrorStatus SE_LL_CRC_Init(void);
+SE_ErrorStatus SE_LL_CRC_DeInit(void);
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..790df77b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/Project.uvoptx
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_SECoreBin</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>0x20005AF8</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\data_init.c</PathWithFileName>
+      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
+      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
+      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
+      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
+      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
+      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..46bcfce1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/Project.uvprojx
@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_SECoreBin</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>SECoreBin</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name>prebuild.bat .</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../1_Image_BFU/BFU/App;../../1_Image_BFU/BFU/Target;../../Linker_Common/MDK-ARM</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SECoreBin.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--entry=SE_CallGate
+--diag_suppress L6404W
+--diag_suppress L6314W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>data_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\data_init.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ca_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>nvms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/nvms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_low_level.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_callgate.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_exception.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_fwimg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_der_x962.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_digest.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_dyn_obj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_ecc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_enc_dec.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_key_mgt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_nvm_storage.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_platf_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+          <Files>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
+            <File>
+              <FileName>sha256.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_1_Image_SECoreBin"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..db1d9d8c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,122 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\MDK-ARM\\STM32WL55JC_Nucleo\\Exe\\BFU.axf"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..dced100d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,119 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\MDK-ARM\\STM32WL55JC_Nucleo\\Exe\\BFU.axf"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..aff8ddbb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,121 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\MDK-ARM\\STM32WL55JC_Nucleo\\Exe\\BFU.axf"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct
new file mode 100644
index 00000000..a5aba32a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct
@@ -0,0 +1,26 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+
+; *** regions needed by SE_CoreBin project ***
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
+  *(.SE_CallGate_Code)
+  }
+  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
+  *(.SE_embedded_Keys)
+  }
+  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
+  *(.SE_Startup_Code)
+  }
+  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_ROM_REGION_SIZE{
+  .ANY (+RO)
+  } 
+  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/data_init.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/data_init.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/data_init.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/data_init.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/postbuild.bat
new file mode 100644
index 00000000..aff8ddbb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/postbuild.bat
@@ -0,0 +1,121 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\MDK-ARM\\STM32WL55JC_Nucleo\\Exe\\BFU.axf"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/prebuild.bat
new file mode 100644
index 00000000..4e8662aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/MDK-ARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V7M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\1_Image_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\1_Image_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..8c2f37a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/.cproject
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../1_Image_BFU/CM4/BFU/App | ../../../1_Image_BFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SECoreBin.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value=".."/>
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/App"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_SECoreBin.null.394363235" name="1_Image_SECoreBin"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/.project
new file mode 100644
index 00000000..e65aa4fa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/.project
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_SECoreBin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ca_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/Core/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld
new file mode 100644
index 00000000..3cb3b060
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld
@@ -0,0 +1,152 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(SE_CallGate)
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_CallGate_Code :
+  {
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    KEEP(*(.SE_CallGate_Code))
+  } > SE_CallGate_ROM_region
+
+  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
+
+  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SE_Code_NoKey_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SE_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SE_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/ca_low_level.c
new file mode 100644
index 00000000..30759a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/ca_low_level.c
@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_C
+#define CA_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "CryptoApi/ca.h"
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#include "mbedtls/entropy_poll.h"
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#define COMPILER_BARRIER() __DMB();__DSB();
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static RNG_HandleTypeDef handle;
+static uint8_t users = 0;
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private function prototypes -----------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta);
+static void RNG_Init(void);
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length);
+static void RNG_DeInit(void);
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Exported functions implementation -----------------------------------------*/
+
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+
+/**
+  * @brief CRYP MSP Initialization
+  * This function configures the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Release AES/CRYP from reset state */
+    __HAL_RCC_AES_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_AES_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief CRYP MSP De-Initialization
+  * This function freeze the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_AES_CLK_DISABLE();
+    /* Force AES/CRYP into reset state */
+    __HAL_RCC_AES_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/**
+  * @brief      PKA MSP Initialization
+  *             This function configures the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Release PKA from reset state */
+    __HAL_RCC_PKA_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_PKA_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief      PKA MSP De-Initialization
+  *             This function freeze the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_PKA_CLK_DISABLE();
+    /* Force PKA into reset state */
+    __HAL_RCC_PKA_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta)
+{
+  COMPILER_BARRIER();
+  uint8_t newValue;
+  do
+  {
+    newValue = __LDREXB(valuePtr) + delta;
+  } while (__STREXB(newValue, valuePtr));
+  COMPILER_BARRIER();
+  return newValue;
+}
+
+static void RNG_Init(void)
+{
+  uint32_t dummy;
+
+  /*  We're only supporting a single user of RNG */
+  if (atomic_incr_u8(&users, 1) > 1)
+  {
+    while (1);
+  }
+
+  /* Select MSI as RNG clock source */
+  __HAL_RCC_RNG_CONFIG(RCC_RNGCLKSOURCE_MSI);
+
+  /* RNG Peripheral clock enable */
+  __HAL_RCC_RNG_CLK_ENABLE();
+
+  /* Initialize RNG instance */
+  handle.Instance = RNG;
+  handle.State = HAL_RNG_STATE_RESET;
+  handle.Lock = HAL_UNLOCKED;
+
+  HAL_RNG_Init(&handle);
+
+  /* first random number generated after setting the RNGEN bit should not be used */
+  HAL_RNG_GenerateRandomNumber(&handle, &dummy);
+}
+
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length)
+{
+  int32_t ret = 0;
+  __IO uint8_t random[4];
+  *output_length = 0;
+
+  /* Get Random byte */
+  while ((*output_length < length) && (ret == 0))
+  {
+    if (HAL_RNG_GenerateRandomNumber(&handle, (uint32_t *)random) != HAL_OK)
+    {
+      ret = -1;
+    }
+    else
+    {
+      for (uint8_t i = 0; (i < 4) && (*output_length < length) ; i++)
+      {
+        *output++ = random[i];
+        *output_length += 1;
+        random[i] = 0;
+      }
+    }
+  }
+  /* Just be extra sure that we didn't do it wrong */
+  if ((__HAL_RNG_GET_FLAG(&handle, (RNG_FLAG_CECS | RNG_FLAG_SECS))) != 0)
+  {
+    *output_length = 0;
+  }
+}
+
+static void RNG_DeInit(void)
+{
+  /*Disable the RNG peripheral */
+  HAL_RNG_DeInit(&handle);
+  /* RNG Peripheral clock disable - assume we're the only users of RNG  */
+  __HAL_RCC_RNG_CLK_DISABLE();
+
+  users = 0;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+  RNG_Init();
+  RNG_GetBytes(output, len, olen);
+  RNG_DeInit();
+  if (*olen != len)
+  {
+    return -1;
+  }
+  return 0;
+}
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+/**
+  * @brief      CRC initialization
+  *             This function release reset and clock CRC IP peripheral
+  * @retval None
+  */
+void CA_LL_CRC_Init(void)
+{
+  /* Force CRC into reset state */
+  __HAL_RCC_CRC_FORCE_RESET();
+  /* Release CRC from reset state */
+  __HAL_RCC_CRC_RELEASE_RESET();
+  /* Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+}
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#endif /* CA_LOW_LEVEL_C */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/kms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/kms_low_level.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/kms_low_level.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/kms_low_level.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/nvms_low_level.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/nvms_low_level.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/nvms_low_level.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/se_low_level.c
new file mode 100644
index 00000000..cfec9ebf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/Src/se_low_level.c
@@ -0,0 +1,706 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SE_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#endif /* __CC_ARM */
+#include "se_exception.h"
+#include "string.h"
+
+#ifdef KMS_ENABLED
+#include "kms.h"
+#include "kms_objects.h"
+#include "kms_platf_objects_config.h"
+#endif /* KMS_ENABLED */
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+/** @defgroup  SE_HARDWARE SE Hardware Interface
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Private_Variables Private Variables
+  * @{
+  */
+static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
+
+static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Private_Functions Private Functions
+  * @{
+  */
+
+static uint32_t SE_LL_GetPage(uint32_t Address);
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  Set CRC configuration and call HAL CRC initialization function.
+  * @param  None.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  CrcHandle.Instance = CRC;
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The Default polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+  /* The default init value is used */
+  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+  /* CRC Init*/
+  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_Init(void)
+{
+  /* CRC Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  return SE_LL_CRC_Config();
+}
+
+/**
+  * @brief  Wrapper to HAL CRC de-initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_DeInit(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
+  {
+    /* Initialization OK */
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC Calculate function.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  uBufferLength: buffer length in 32-bits word.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  This function does an erase of nb pages in user flash area
+  * @param  pStart: pointer to  user flash area
+  * @param  Length: number of bytes.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SE_ErrorStatus e_ret_status = SE_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    /* Fill EraseInit structure*/
+    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
+    p_erase_init.Page          = SE_LL_GetPage(start);
+    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
+    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+    {
+      e_ret_status = SE_ERROR;
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Write in Flash  protected area
+  * @param  pDestination pointer to destination area in Flash
+  * @param  pSource pointer to input buffer
+  * @param  Length number of bytes to be written
+  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
+  */
+
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SE_ErrorStatus ret = SE_SUCCESS;
+  uint32_t i;
+  uint32_t verified = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  if (Length == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Area should be inside 1 of the firmware image headers */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    for (i = 0U; i < Length; i += 8U)
+    {
+      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
+      {
+        ret = SE_ERROR;
+        break;
+      }
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) */
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    ret = SE_ERROR;
+  }
+  return ret;
+}
+
+/**
+  * @brief  Read in Flash protected area
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to read
+  * @param  Length: Length in bytes of data buffer
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  uint32_t source = (uint32_t)pSource;
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+  uint32_t i;
+  uint32_t verified = 0U;
+
+  /* Area should be inside 1 of the firmware image headers
+     or inside 1 of the download areas */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
+        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
+    {
+      verified = 1U;
+    }
+  }
+
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  SE_DoubleECC_Error_Counter = 0U;
+  /* Do not use memcpy from lib : ECC error should be checked at each loop */
+  for (i = 0; (i < Length) && (SE_DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+  {
+    *pDestination = *pSource;
+  }
+  if (SE_DoubleECC_Error_Counter == 0U)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  SE_DoubleECC_Error_Counter = 0U;
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
+  * @param pxSE_Metadata: Firmware metadata.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(pxSE_Metadata);
+  return SE_SUCCESS;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= (SE_REGION_RAM_END + 1U))))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is in sbsfu ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
+                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
+                            || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
+                           )))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Lock the embedded keys used by SBSFU
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void)
+{
+#ifdef KMS_ENABLED
+  uint32_t i_key_locked = 0U;
+  uint32_t i_ctrl = 0U;
+
+#ifdef KMS_INDEX_BLOBIMPORT_VERIFY
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_VERIFY) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_VERIFY */
+#ifdef KMS_INDEX_BLOBIMPORT_DECRYPT
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_DECRYPT) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_DECRYPT */
+#ifdef KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE */
+  if(i_ctrl == i_key_locked)
+  {
+    return SE_SUCCESS;
+  }
+  else
+  {
+    return SE_ERROR;
+  }
+#else /* KMS_ENABLED */
+  return SE_SUCCESS;
+#endif /* KMS_ENABLED */
+}
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t SE_LL_GetPage(uint32_t Address)
+{
+  uint32_t page;
+
+  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
+  {
+    /* Bank 1 */
+    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
+  }
+  else
+  {
+    /* Bank 2 */
+    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
+  }
+  return page;
+}
+
+/**
+  * @brief  Gets the bank of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The bank of a given address
+  */
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retval None.
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    SE_DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    /* This exception occurs for another reason than flash double ECC errors */
+    SE_NMI_ExceptionHandler();
+  }
+}
+
+/**
+  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
+  * @param  None.
+  * @retvat void
+  */
+void HardFault_Handler(void)
+{
+  SE_NMI_ExceptionHandler();
+}
+
+/**
+  * @brief  Cleanup SE CORE
+  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
+  *
+  */
+void  SE_LL_CORE_Cleanup(void)
+{
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/readme.txt
new file mode 100644
index 00000000..205abd15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_SECoreBin/readme.txt
@@ -0,0 +1,107 @@
+/**
+  @page 1_Image_SECoreBin / Secure Engine Core binary generation.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Secure Engine Core binary generation.
+  *          SE Core binary exports SE CallGate function entry point for
+  *          FU Application.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application is used to generate Secure Engine Core binary file to be linked
+with Boot & Firmware Update application (BFU).
+SE Core binary exports a single entry point to SE CallGate function and a startup method for data initialization.
+It is based on the Secure Engine Middleware.
+
+Generated SE Core Binary embeds Key Management Services accessible through this same single entry point using APIs
+defined by tKMS interface.
+
+It has to be compiled before BFU project.
+
+Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default
+cryptographic scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are
+provided and can be selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
+   - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
+   - SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+   - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 1_Image_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
+   - 1_Image_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
+   - 1_Image_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
+   - 1_Image_SECoreBin/Src/se_low_level.c                      Low level interface
+   - 1_Image_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
+   - 1_Image_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
+   - 1_Image_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
+   - 1_Image_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
+   - 1_Image_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
+   - 1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
+                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
+   - 1_Image_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
+                                                                Exported to KMS user to ease embedded object usage
+   - 1_Image_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
+   - 1_Image_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
+   - 1_Image_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
+   - 1_Image_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
+   - 1_Image_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
+   - 1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
+   - 1_Image_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
+   - 1_Image_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
+   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files. As a workaround, it is advised to use the subst.exe command from within a command prompt to set up
+     a local drive out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+   
+@par IDE prebuild script
+
+In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
+This preliminary processing is in charge of:
+   - determining the requested cryptographic scheme
+   - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of BFU & Blob importation
+     keys into the KMS embedded objects pattern file)
+   - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
+
+A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic
+key). The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+In order to generate Secure Engine Core binary file, you must do the following :
+   - Open your preferred toolchain
+   - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/Project.ewd
new file mode 100644
index 00000000..b17c2229
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_UserApp</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/Project.ewp
new file mode 100644
index 00000000..53fe7196
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/Project.ewp
@@ -0,0 +1,1198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_UserApp</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>KMS_ENABLED</state>
+          <state>DISABLE_IMAGE_STATE_HANDLING</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
+          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\App</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\UserApp.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\1_Image_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 1 1"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\com.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\common.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\fw_update_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_user_code.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\test_protections.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ymodem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\flash_if.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_object_update_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_derive_key.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_encrypt_decrypt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_find.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_sign_verify.c</name>
+      </file>
+    </group>
+    <group>
+      <name>SFU_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\sfu_app_new_image.c</name>
+      </file>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\1_Image_BFU\EWARM\se_interface_appli.o</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..ae672ac8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,43 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_ROM_start__      = __ICFEDIT_SLOT_Active_1_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__        = __ICFEDIT_SLOT_Active_1_end__ ;
+define symbol __ICFEDIT_region_RAM_start__      = __ICFEDIT_SE_region_RAM_end__ + 1;
+define symbol __ICFEDIT_region_RAM_end__        = 0x20017FFF;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];
+define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly, last section aes_block_padding };
+place in RAM_region   { readwrite, block CSTACK, block HEAP };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/com.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/com.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/com.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/com.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/common.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/common.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/common.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/common.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/flash_if.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/flash_if.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/flash_if.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/fw_update_app.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/fw_update_app.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/fw_update_app.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/fw_update_app.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/main.h
new file mode 100644
index 00000000..2b6c9321
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/main.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for main application file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAIN_H
+#define MAIN_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "com.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* User can use this section to tailor UARTx instance used and associated
+   resources */
+
+#define BUTTON_INIT()         BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);
+#define BUTTON_PUSHED()      (BSP_PB_GetState(BUTTON_SW1) == GPIO_PIN_RESET)
+#define BUTTON_INIT_EXTI()    BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI)
+#define BUTTON_IRQHANDLER     EXTI0_IRQHandler
+#define BUTTON_EXTI_LINE      BUTTON_SW1_PIN
+
+/* Definition for USARTx clock resources */
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Maximum Timeout values for flags waiting loops.
+   You may modify these timeout values depending on CPU frequency and application
+   conditions (interrupts routines ...). */
+#define SFU_UART_TIMEOUT_MAX                   1000U
+
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+#endif /* MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/se_user_code.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/se_user_code.h
new file mode 100644
index 00000000..259569d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/se_user_code.h
@@ -0,0 +1,65 @@
+/**
+  ******************************************************************************
+  * @file    se_user_code.h
+  * @author  MCD Application Team
+  * @brief   Secure Engine User code example module.
+  *          This file demonstrates how to call user defined services running
+  *          in Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_USER_CODE_H
+#define SE_USER_CODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup SE_USER_CODE Secure Engine User Code Example
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+/** @addtogroup  SE_USER_CODE_Exported_Functions
+  * @{
+  */
+
+void SE_USER_CODE_RunMenu(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_USER_CODE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/sfu_app_new_image.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/sfu_app_new_image.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..e1d0d6af
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+/* #define HAL_TIM_MODULE_ENABLED */
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..b2e599ac
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_it.h
@@ -0,0 +1,69 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+void FLASH_IRQHandler(void);
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler(void);
+void BUTTON_IRQHANDLER(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/test_protections.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/test_protections.h
new file mode 100644
index 00000000..1fa6819f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/test_protections.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    test_protections.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Test Protections functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef TEST_PROTECTIONS_H
+#define TEST_PROTECTIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+
+/* Exported constants --------------------------------------------------------*/
+/* Tamper instance used by SBSFU */
+#define RTC_TAMPER_ID RTC_TAMPER_1
+
+/* Exported macros -----------------------------------------------------------*/
+/* SFU Redirect of RTC Tamper Event Callback*/
+#define  CALLBACK_Antitamper(void) HAL_RTCEx_Tamper1EventCallback(RTC_HandleTypeDef *hrtc)
+
+/* Exported functions ------------------------------------------------------- */
+void     TEST_PROTECTIONS_RunMenu(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* TEST_PROTECTIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/tkms_app.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/tkms_app.h
new file mode 100644
index 00000000..da212f0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/tkms_app.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for tkms application examples.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_APP_H
+#define KMS_APP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported macros -----------------------------------------------------------*/
+#if  defined(SFU_IWDG_PROTECT_ENABLE)
+/* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register */
+#define INVOKE_SCHEDULE_NEEDS()            \
+  do {                                     \
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);  \
+  } while(0);
+#else
+#define INVOKE_SCHEDULE_NEEDS()            \
+  do {                                     \
+    ;                                      \
+  } while(0);
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+
+
+/* Exported functions ------------------------------------------------------- */
+void tkms_app_menu(void);
+void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length);
+
+CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage);
+CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage);
+CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage);
+CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pMessage);
+CK_RV tkms_app_find(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_APP_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/ymodem.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/ymodem.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/ymodem.h
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Inc/ymodem.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..e39030e8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/Project.uvoptx
@@ -0,0 +1,771 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_UserApp</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>0</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>0</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_CM4.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=98,207,509,709,0)(1007=673,180,880,401,0)(1008=566,409,942,645,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>2</SubType>
+          <ItemText>0x2000A400</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+      <SystemViewers>
+        <Entry>
+          <Name>System Viewer\DBGMCU</Name>
+          <WinId>35904</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\NVIC</Name>
+          <WinId>35901</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\SCB</Name>
+          <WinId>35905</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\SYSCFG</Name>
+          <WinId>35903</WinId>
+        </Entry>
+        <Entry>
+          <Name>System Viewer\SYSCFG_continue</Name>
+          <WinId>35902</WinId>
+        </Entry>
+      </SystemViewers>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/com.c</PathWithFileName>
+      <FilenameWithoutPath>com.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/common.c</PathWithFileName>
+      <FilenameWithoutPath>common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/fw_update_app.c</PathWithFileName>
+      <FilenameWithoutPath>fw_update_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_object_update_app.c</PathWithFileName>
+      <FilenameWithoutPath>kms_object_update_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_user_code.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_code.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/sfu_app_new_image.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_app_new_image.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/test_protections.c</PathWithFileName>
+      <FilenameWithoutPath>test_protections.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_derive_key.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_derive_key.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_encrypt_decrypt.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_encrypt_decrypt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_find.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_find.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ymodem.c</PathWithFileName>
+      <FilenameWithoutPath>ymodem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>3</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\1_Image_BFU\MDK-ARM\STM32WL55JC_Nucleo\Exe\se_interface_appli.txt</PathWithFileName>
+      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..1e679dd1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/Project.uvprojx
@@ -0,0 +1,637 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_UserApp</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>UserApp</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\1_Image_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED,DISABLE_IMAGE_STATE_HANDLING</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../1_Image_SECoreBin/Inc;../../1_Image_BFU/BFU/App;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>.\UserApp.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>com.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/com.c</FilePath>
+            </File>
+            <File>
+              <FileName>common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/common.c</FilePath>
+            </File>
+            <File>
+              <FileName>flash_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/flash_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>fw_update_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/fw_update_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_object_update_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_object_update_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_code.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_user_code.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_app_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/sfu_app_new_image.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>test_protections.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/test_protections.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_derive_key.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_derive_key.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_encrypt_decrypt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_encrypt_decrypt.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_find.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_find.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_sign_verify.c</FilePath>
+            </File>
+            <File>
+              <FileName>ymodem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ymodem.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_appli.txt</FileName>
+              <FileType>3</FileType>
+              <FilePath>..\..\1_Image_BFU\MDK-ARM\STM32WL55JC_Nucleo\Exe\se_interface_appli.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_1_Image_UserApp"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/UserApp.sct b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/UserApp.sct
new file mode 100644
index 00000000..e0efa2a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/UserApp.sct
@@ -0,0 +1,29 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_1_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+  ROM_region +0 {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+; SBSFU RAM area is reused for UserApp  
+  RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE {
+  .ANY (STACK)
+  .ANY (HEAP)
+  .ANY (+RW +ZI)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..fba95749
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,371 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;*
+;* This software component is licensed by ST under 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:
+;*                        opensource.org/licenses/Apache-2.0
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size      EQU     0x00000800
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size       EQU     0x00000200
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..600b23f4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/.cproject
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="UserApp" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../1_Image_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;" prebuildStep="">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../1_Image_BFU/BFU/App | ../../../1_Image_BFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/UserApp.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_UserApp}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="DISABLE_IMAGE_STATE_HANDLING"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/App"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata.1159753008" name="Place data in their own sections (-fdata-sections)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1663313052" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.793375251" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs">
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/STM32CubeIDE/Debug/se_interface_app.o"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath.741843002" name="Use C math library (-Wl,--start-group -lc -lm -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/UserApp.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_UserApp.null.394363235" name="1_Image_UserApp"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/1_Image_UserApp"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/1_Image_UserApp"/>
+		</configuration>
+	</storageModule>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/.project
new file mode 100644
index 00000000..ce4d1322
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/.project
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_UserApp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/com.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/com.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/flash_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/flash_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/fw_update_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/fw_update_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_object_update_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/kms_object_update_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_user_code.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/se_user_code.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_app_new_image.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/sfu_app_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/test_protections.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/test_protections.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_derive_key.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_derive_key.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_encrypt_decrypt.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_encrypt_decrypt.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_find.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_find.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ymodem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/ymodem.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/1_Image_BFU/STM32CubeIDE/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/Application/User/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/Application/User/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/Application/User/sysmem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/Application/User/sysmem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/UserApp.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/UserApp.ld
new file mode 100644
index 00000000..a9d6c851
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/STM32CubeIDE/UserApp.ld
@@ -0,0 +1,174 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size  = 0x200; /* required amount of heap  */
+_Min_Stack_Size = 0x800; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  ISR_VECTOR (rx)    : ORIGIN = (SLOT_Active_1_start + 0x200), LENGTH = Vector_size
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_1_start + Vector_size + 0x200), LENGTH = (SLOT_Active_1_end - SLOT_Active_1_start + 1 - 0x200 - Vector_size)
+  APPLI_RAM  (xrw)   : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+}
+
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    FILL(0);
+    . = ORIGIN(ISR_VECTOR) + LENGTH(ISR_VECTOR) - 1;
+    BYTE(0)
+    . = ALIGN(8);
+  } >ISR_VECTOR
+
+  .SE_IF_Code : {
+    KEEP(*se_interface_app.o (.text .text*))
+    KEEP(*se_interface_kms.o (.text .text*))
+  } >SE_IF_ROM_region
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .ARM.extab   : { 
+    . = ALIGN(8);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .ARM : {
+    . = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .init_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .fini_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+    
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/com.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/com.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/com.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/com.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/common.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/common.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/common.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/common.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/flash_if.c
new file mode 100644
index 00000000..6ecbce70
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/flash_if.c
@@ -0,0 +1,361 @@
+/**
+  ******************************************************************************
+  * @file    flash_if.c
+  * @author  MCD Application Team
+  * @brief   FLASH Interface module.
+  *          This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "flash_if.h"
+#include "string.h"
+#include <stdio.h>
+
+/* Uncomment the line below if you want some debug logs */
+#define FLASH_IF_DBG
+#ifdef FLASH_IF_DBG
+#define FLASH_IF_TRACE printf
+#else
+#define FLASH_IF_TRACE(...)
+#endif /* FLASH_IF_DBG */
+
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+#define EXTERNAL_FLASH_ADDRESS    0x90000000U
+
+
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+
+
+/* Private function prototypes -----------------------------------------------*/
+static uint32_t GetPage(uint32_t uAddr);
+static HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void);
+
+/* Public functions : wrapper ---------------------------------------------------------*/
+
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_If_Init(void)
+{
+  HAL_StatusTypeDef e_ret_status = HAL_OK;
+
+  e_ret_status = FLASH_INT_Init();
+  if (e_ret_status == HAL_OK)
+  {
+    e_ret_status = FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pStart: flash address to be erased
+  * @param  uLength: number of bytes
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Erase_Size(pStart, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Erase_Size(pStart, uLength);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Write(pDestination, pSource, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Write(pDestination, pSource, uLength);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Read(pDestination, pSource, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Read(pDestination, pSource, uLength);
+  }
+}
+
+/* Public functions : internal flash --------------------------------------------------------- */
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_INT_Init(void)
+{
+  return HAL_OK;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pStart: Start of user flash area
+  * @param  uLength: number of bytes.
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  uint32_t page_error = 0U;
+  uint32_t uStart = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef x_erase_init;
+  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
+  uint32_t first_page = 0U;
+  uint32_t nb_pages = 0U;
+  uint32_t chunk_nb_pages;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = FLASH_INT_If_Clear_Error();
+
+  if (e_ret_status == HAL_OK)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = GetPage(uStart);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = GetPage(uStart + uLength - 1U) - first_page + 1U;
+      x_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        x_erase_init.Page = first_page;
+        x_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&x_erase_init, &page_error) != HAL_OK)
+        {
+          HAL_FLASH_GetError();
+          e_ret_status = HAL_ERROR;
+        }
+        /* Refresh Watchdog */
+        WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+      } while (nb_pages > 0);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      HAL_FLASH_Lock();
+
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
+  uint32_t i = 0U;
+  uint32_t pdata = (uint32_t)pSource;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = FLASH_INT_If_Clear_Error();
+
+  if (e_ret_status == HAL_OK)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() != HAL_OK)
+    {
+      return HAL_ERROR;
+
+    }
+    else
+    {
+      /* DataLength must be a multiple of 64 bit */
+      for (i = 0U; i < uLength; i += 8U)
+      {
+        /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+        be done by word */
+        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)pDestination,  *((uint64_t *)(pdata + i)))
+            == HAL_OK)
+        {
+          /* Check the written value */
+          if (*(uint64_t *)pDestination != *(uint64_t *)(pdata + i))
+          {
+            /* Flash content doesn't match SRAM content */
+            e_ret_status = HAL_ERROR;
+            break;
+          }
+          /* Increment FLASH Destination address */
+          pDestination = (void *)((uint32_t)pDestination + 8U);
+        }
+        else
+        {
+          /* Error occurred while writing data in Flash memory */
+          e_ret_status = HAL_ERROR;
+          break;
+        }
+      }
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      HAL_FLASH_Lock();
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  memcpy(pDestination, pSource, uLength);
+  return HAL_OK;
+}
+
+/* Public functions : external flash ---------------------------------------------------------*/
+
+HAL_StatusTypeDef FLASH_EXT_Init(void)
+{
+  return HAL_OK;
+}
+
+/* No external flash available on this product
+   ==> return SFU_ERROR */
+
+HAL_StatusTypeDef FLASH_EXT_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+HAL_StatusTypeDef FLASH_EXT_If_Write(void  *pDestination, const void *pSource, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+HAL_StatusTypeDef FLASH_EXT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+/* Private functions ---------------------------------------------------------*/
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      ret = HAL_OK;
+    }
+#ifdef FLASH_IF_DBG
+    else
+    {
+      FLASH_IF_TRACE("[FLASH_IF] Lock failure\r\n");
+    }
+#endif /* FLASH_IF_DBG */
+  }
+#ifdef FLASH_IF_DBG
+  else
+  {
+    FLASH_IF_TRACE("[FLASH_IF] Unlock failure\r\n");
+  }
+#endif /* FLASH_IF_DBG */
+  return ret;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+uint32_t GetPage(uint32_t Addr)
+{
+  uint32_t page = 0U;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/fw_update_app.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/fw_update_app.c
new file mode 100644
index 00000000..650c85a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/fw_update_app.c
@@ -0,0 +1,802 @@
+/**
+  ******************************************************************************
+  * @file    fw_update_app.c
+  * @author  MCD Application Team
+  * @brief   Firmware Update module.
+  *          This file provides set of firmware functions to manage Firmware
+  *          Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "fw_update_app.h"
+#include "se_interface_application.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_app_new_image.h"
+#include "string.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#elif defined(__CC_ARM)
+#include "mapping_fwimg.h"
+#include "mapping_sbsfu.h"
+#endif /* __ARMCC_VERSION */
+#include "ymodem.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+#define ALL_SLOTS 255U                   /*!< Validate all new firmware installed in a single request */
+/* Global variables ----------------------------------------------------------*/
+
+#if !defined(EXTERNAL_LOADER)
+static uint32_t m_uFileSizeYmodem = 0U;  /*!< Ymodem File size*/
+static uint32_t m_uNbrBlocksYmodem = 0U; /*!< Ymodem Number of blocks*/
+static uint32_t m_uPacketsReceived = 0U; /*!< Ymodem packets received*/
+
+#ifdef MINICOM_YMODEM
+/*
+ * With Minicom Ymodem, the data offset is not aligned because PACKET_DATA_INDEX is 7
+ * So we cannot write in FLASH with pData as source, we need a copy in an aligned buffer
+ */
+/* With Minicom YMODEM each packet carries 128 bytes of data */
+static uint8_t alignedBuffer[PACKET_SIZE] __attribute__((aligned(8)));
+#endif /* MINICOM_YMODEM */
+#endif /* !EXTERNAL_LOADER */
+
+/* Private function prototypes -----------------------------------------------*/
+
+#if !defined(EXTERNAL_LOADER)
+static HAL_StatusTypeDef FW_UPDATE_DownloadNewFirmware(SFU_FwImageFlashTypeDef *pFwImageDwlArea);
+#endif /* !EXTERNAL_LOADER */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Run FW Update process.
+  * @param  None
+  * @retval HAL Status.
+  */
+#if defined(EXTERNAL_LOADER)
+void FW_UPDATE_Run(void)
+{
+  /* Print Firmware Update welcome message */
+  printf("\r\n================ New Fw Download =========================\r\n\n");
+
+  /* Standalone loader communication : execution requested */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+
+  NVIC_SystemReset();
+}
+
+#else
+void FW_UPDATE_Run(void)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  uint8_t  fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+  SFU_FwImageFlashTypeDef fw_image_dwl_area;
+
+  /* Print Firmware Update welcome message */
+  printf("\r\n================ New Fw Download =========================\r\n\n");
+
+  /* Get Info about the download area */
+  SFU_APP_GetDownloadAreaInfo(SLOT_DWL_1, &fw_image_dwl_area);
+
+  /* Download new firmware image*/
+  ret = FW_UPDATE_DownloadNewFirmware(&fw_image_dwl_area);
+
+  if (HAL_OK == ret)
+  {
+    /* Read header in dwl slot */
+    ret = FLASH_If_Read(fw_header_dwl_slot, (void *) fw_image_dwl_area.DownloadAddr, SE_FW_HEADER_TOT_LEN);
+
+    /* Ask for installation at next reset */
+    (void)SFU_APP_InstallAtNextReset((uint8_t *) fw_header_dwl_slot);
+
+    /* System Reboot*/
+    printf("  -- Image correctly downloaded - reboot\r\n\n");
+    HAL_Delay(1000U);
+    NVIC_SystemReset();
+  }
+
+  if (ret != HAL_OK)
+  {
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+}
+#endif /* EXTERNAL_LOADER */
+
+
+#if defined(EXTERNAL_LOADER)
+/**
+  * @brief  Run Multiple FW Update process.
+  * @param  None
+  * @retval None.
+  */
+void FW_UPDATE_MULTIPLE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#else
+/**
+  * @brief  Print Multiple FW Update menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+static void FW_UPDATE_MULTIPLE_PrintMenu(void)
+{
+  /* Print Multiple Download menu */
+  printf("\r\n============= Multiple Download Menu ================\r\n\n");
+  printf("  Download firmware in DWL_SLOT #1 ---------------------- 1\r\n\n");
+  printf("  Start installation ------------------------------------ 4\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Run Multiple FW Update process.
+  * @param  None
+  * @retval None.
+  */
+void FW_UPDATE_MULTIPLE_RunMenu(void)
+{
+  SFU_FwImageFlashTypeDef fw_image_dwl_area;
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t i = 0U;
+  uint32_t several_dwl_area = 1U;
+  uint32_t slot_number = 0U;
+  static  uint8_t fw_to_install = 0U;
+  uint8_t  fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+
+  /* Print Menu */
+  FW_UPDATE_MULTIPLE_PrintMenu();
+
+  /* Verify if at least 2 DWL areas exist */
+  for (i = 1U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      several_dwl_area++;
+    }
+  }
+
+  if (several_dwl_area == 1)
+  {
+    printf("  -- !!Only 1 download area configured - feature not available!! \r\n\n");
+    return;
+  }
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
+       reload register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_DWL_1 + 0U;
+          break;
+        case '4' :
+          /*
+           * When IMAGE_STATE_HANDLING switch is not activated :
+           *  - requesting installation means writing the header in the SWAP slot then reset.
+           *  - else, reset is enough. Image state set as NEW in the header of dwl_slot will identify the dwl_slot
+           *    to install.
+           */
+          /* Get Info about the download area */
+          SFU_APP_GetDownloadAreaInfo(fw_to_install, &fw_image_dwl_area);
+
+          /* Read header in dwl slot */
+          FLASH_If_Read(fw_header_dwl_slot, (void *) fw_image_dwl_area.DownloadAddr, SE_FW_HEADER_TOT_LEN);
+
+          /* Ask for installation at next reset */
+          (void)SFU_APP_InstallAtNextReset((uint8_t *) fw_header_dwl_slot);
+
+          /* System Reboot*/
+          printf("  -- Installation requested - Reboot");
+          HAL_Delay(1000U);
+          NVIC_SystemReset();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (slot_number != 0U)
+      {
+        /* Get Info about the download area */
+        SFU_APP_GetDownloadAreaInfo(slot_number, &fw_image_dwl_area);
+
+        if ((fw_image_dwl_area.DownloadAddr != 0U) && (fw_image_dwl_area.MaxSizeInBytes != 0U))
+        {
+          /* Download new firmware image*/
+          if (FW_UPDATE_DownloadNewFirmware(&fw_image_dwl_area) == HAL_OK)
+          {
+            fw_to_install = slot_number;
+          }
+          else
+          {
+            printf("  -- !!Download failed!! \r\n\n");
+            HAL_Delay(1000U);
+          }
+        }
+        else
+        {
+          printf("  -- !!Download slot not configured!! \r\n\n");
+          HAL_Delay(1000U);
+        }
+      }
+
+      /* Print Menu */
+      FW_UPDATE_MULTIPLE_PrintMenu();
+    }
+  }
+}
+#endif /* EXTERNAL_LOADER */
+
+#if !defined(EXTERNAL_LOADER)
+/**
+  * @brief Download a new Firmware from the host.
+  * @retval HAL status
+  */
+static HAL_StatusTypeDef FW_UPDATE_DownloadNewFirmware(SFU_FwImageFlashTypeDef *pFwImageDwlArea)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  COM_StatusTypeDef e_result;
+  uint32_t u_fw_size;
+  YMODEM_CallbacksTypeDef ymodemCb = {Ymodem_HeaderPktRxCpltCallback, Ymodem_DataPktRxCpltCallback};
+
+  printf("  -- Send Firmware \r\n\n");
+  /* Refresh Watchdog */
+  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+  /* Clear download area */
+  printf("  -- -- Erasing download area ...\r\n\n");
+  if ((ret = FLASH_If_Erase_Size((void *)(pFwImageDwlArea->DownloadAddr), pFwImageDwlArea->MaxSizeInBytes)) == HAL_OK)
+  {
+    /* Download binary */
+    printf("  -- -- File> Transfer> YMODEM> Send ");
+
+    /*Init of Ymodem*/
+    Ymodem_Init();
+
+    /*Receive through Ymodem*/
+    e_result = Ymodem_Receive(&u_fw_size, pFwImageDwlArea->DownloadAddr, &ymodemCb);
+    printf("\r\n\n");
+
+    if ((e_result == COM_OK))
+    {
+      printf("  -- -- Programming Completed Successfully!\r\n\n");
+      printf("  -- -- Bytes: %d\r\n\n", u_fw_size);
+      ret = HAL_OK;
+    }
+    else if (e_result == COM_ABORT)
+    {
+      printf("  -- -- !!Aborted by user!!\r\n\n");
+      ret = HAL_ERROR;
+    }
+    else
+    {
+      printf("  -- -- !!Error during file download!!\r\n\n");
+      ret = HAL_ERROR;
+    }
+  }
+  return ret;
+}
+#endif /* !(EXTERNAL_LOADER) */
+
+#if defined(EXTERNAL_LOADER)
+/**
+  * @brief  Run validation of a FW image menu.
+  * @param  None
+  * @retval None.
+  */
+void FW_VALIDATE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#else
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Display the validation firmware menu choices on hyperterminal
+  * @param  None.
+  * @retval None.
+  */
+static void FW_VALIDATE_PrintMenu(void)
+{
+  printf("\r\n========== Validation of FW Image ============\r\n\n");
+  printf("  Validate all firmwares ------------------------- 0\r\n\n");
+  printf("  Validate firmware of SLOT_ACTIVE_1 ------------- 1\r\n\n");
+  printf("  Validate firmware of SLOT_ACTIVE_2 ------------- 2\r\n\n");
+  printf("  Validate firmware of SLOT_ACTIVE_3 ------------- 3\r\n\n");
+  printf("  Previous Menu ---------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+/**
+  * @brief  Run validation of a FW image menu.
+  * @param  None
+  * @retval None.
+  */
+void FW_VALIDATE_RunMenu(void)
+{
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+  SE_FwStateTypeDef fw_state = FWIMG_STATE_INVALID;
+
+  /*Print Main Menu message*/
+  FW_VALIDATE_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '0' :
+          slot_number = VALID_ALL_SLOTS;
+          break;
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          break;
+        case '2' :
+          slot_number = SLOT_ACTIVE_2;
+          break;
+        case '3' :
+          slot_number = SLOT_ACTIVE_3;
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (slot_number != 0U)
+      {
+        if ((slot_number != ALL_SLOTS) && (SlotStartAdd[slot_number] == 0U))
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          SE_APP_GetActiveFwState(&se_Status, slot_number, &fw_state);
+          if (fw_state != FWIMG_STATE_SELFTEST )
+          {
+            printf("Firmware not is SELF_TEST state\r\n");
+          }
+          else
+          {
+            se_retCode = SE_APP_ValidateFw(&se_Status, slot_number);
+            if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+            {
+              printf("Firmware validated\r\n");
+            }
+            else
+            {
+              printf("Firmware validation failure\r\n");
+            }
+          }
+        }
+        /*Print Main Menu message*/
+        FW_VALIDATE_PrintMenu();
+      }
+    }
+  }
+#else
+  printf("  Feature not supported ! \r\n");
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+}
+#endif /* EXTERNAL_LOADER */
+
+
+
+#if !defined(EXTERNAL_LOADER)
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize Dimension of the file that will be received (Bytes).
+  * @retval None
+  */
+HAL_StatusTypeDef Ymodem_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (PACKET_1K_SIZE - 1U)) / PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (PACKET_SIZE - 1U)) / PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return HAL_OK;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData Pointer to the buffer.
+  * @param  uSize Packet dimension (Bytes).
+  * @retval None
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
+{
+  /* Start address of downloaded area : initialized with first packet (header) */
+  static uint32_t m_uDwlImgStart = 0U;
+
+  /* End address of downloaded Image : initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgEnd = 0U;
+
+  /* Current destination address for data packet : initialized with first packet (header), incremented at each
+     flash write */
+  static uint32_t m_uDwlImgCurrent = 0U;
+
+  HAL_StatusTypeDef e_ret_status = HAL_OK;
+  uint32_t uLength;
+  uint32_t uOldSize;
+#if !defined(SFU_NO_SWAP)
+  SE_FwRawHeaderTypeDef fw_header_dwl;
+#endif /* (SFU_NO_SWAP) */
+
+  m_uPacketsReceived++;
+
+  /*Increase the number of received packets*/
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem) /*Last Packet*/
+  {
+    /*Extracting actual payload from last packet*/
+    if (0 == (m_uFileSizeYmodem % PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      uSize = PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      uSize = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / PACKET_1K_SIZE) * PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains header information: PartialFwSize and PartialFwOffset information */
+  if (m_uPacketsReceived == 1)
+  {
+    /* Start of Download area */
+    m_uDwlImgStart = uFlashDestination;
+
+    /* Initialize Current destination address for data packet */
+    m_uDwlImgCurrent = uFlashDestination;
+
+    /* End of Image to be downloaded */
+#if defined(SFU_NO_SWAP)
+    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->FwSize + SFU_IMG_IMAGE_OFFSET;
+#else
+    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->PartialFwSize
+                   + (((SE_FwRawHeaderTypeDef *)pData)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))
+                   + SFU_IMG_IMAGE_OFFSET;
+#endif /* SFU_NO_SWAP */
+  }
+
+  /* This packet : contains end of FW header */
+  if ((m_uDwlImgCurrent < (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)) &&
+      ((m_uDwlImgCurrent + uSize) >= (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)))
+  {
+    /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE bytes length) */
+    uLength = SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE;
+    if (uLength == 0)
+    {
+      uLength = PACKET_1K_SIZE;
+    }
+    if (FLASH_If_Write((void *)m_uDwlImgCurrent, pData, uLength) == HAL_OK)
+    {
+#if defined(SFU_NO_SWAP)
+      m_uDwlImgCurrent += uLength;
+#else
+      /*
+       * Read header from dwl area : in some configuration header can be transmitted with 2 YMODEM packets
+       * ==> pData contains only the last part of the header and cannot be used to retrieve PartialFwOffset
+       */
+      e_ret_status = FLASH_If_Read((uint8_t *)&fw_header_dwl, (void *) m_uDwlImgStart, SE_FW_HEADER_TOT_LEN);
+
+      /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
+      m_uDwlImgCurrent += uLength + fw_header_dwl.PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+#endif /* SFU_NO_SWAP */
+
+      /* Update remaining packet size to write */
+      uSize -= uLength;
+
+      /* Update pData pointer to received packet data */
+      pData += uLength;
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  /* Skip data write if all has been already written as part of the header */
+  if (uSize != 0U)
+  {
+    /*Adjust dimension to unitary flash programming length */
+    if (uSize % FLASH_IF_MIN_WRITE_LEN != 0U)
+    {
+      uOldSize = uSize;
+      uSize += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
+      m_uDwlImgEnd += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
+      while (uOldSize < uSize)
+      {
+        pData[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+
+    /* Write Data in Flash - size has to be 64-bit aligned */
+
+    /* Write in flash only if not beyond allowed area */
+    if (((m_uDwlImgCurrent + uSize) <= m_uDwlImgEnd) && (e_ret_status == HAL_OK))
+    {
+      if (FLASH_If_Write((void *)m_uDwlImgCurrent, pData, uSize) == HAL_OK)
+      {
+        e_ret_status = HAL_OK;
+
+        /* Move Current destination address for next packet */
+        m_uDwlImgCurrent += uSize;
+      }
+      else
+      {
+        e_ret_status = HAL_ERROR;
+      }
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == HAL_ERROR)
+  {
+
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+  return e_ret_status;
+}
+#else
+/* Minicom YMODEM */
+HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
+{
+  /* Start address of downloaded area : initialized with first packet (header) */
+  static uint32_t m_uDwlImgStart = 0U;
+
+  /* End address of downloaded Image : initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgEnd = 0U;
+
+  /* Current destination address for data packet : initialized with first packet (header), incremented at each
+     flash write */
+  static uint32_t m_uDwlImgCurrent = 0U;
+
+  HAL_StatusTypeDef e_ret_status = HAL_OK;
+  uint32_t uLength;
+  uint32_t uOldSize;
+  SE_FwRawHeaderTypeDef fw_header_dwl;
+
+  m_uPacketsReceived++;
+
+  /*Increase the number of received packets*/
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem) /*Last Packet*/
+  {
+    /*Extracting actual payload from last packet*/
+    if (0 == (m_uFileSizeYmodem % PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      uSize = PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      uSize = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / PACKET_SIZE) * PACKET_SIZE);
+    }
+  }
+
+  /* First packet : Contains header information: PartialFwSize and PartialFwOffset information */
+  if (m_uPacketsReceived == 1)
+  {
+    /* Start of Download area */
+    m_uDwlImgStart = uFlashDestination;
+
+    /* Initialize Current destination address for data packet */
+    m_uDwlImgCurrent = uFlashDestination;
+
+    /* End of Image to be downloaded */
+#if defined(SFU_NO_SWAP)
+    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->FwSize + SFU_IMG_IMAGE_OFFSET;
+#else
+    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->PartialFwSize
+                   + (((SE_FwRawHeaderTypeDef *)pData)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))
+                   + SFU_IMG_IMAGE_OFFSET;
+#endif /* SFU_NO_SWAP */
+
+  }
+
+  /* This packet : contains end of FW header */
+  if ((m_uDwlImgCurrent < (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)) &&
+      ((m_uDwlImgCurrent + uSize) >= (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)))
+  {
+    /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE bytes length) */
+    uLength = SFU_IMG_IMAGE_OFFSET % PACKET_SIZE;
+    if (uLength == 0)
+    {
+      uLength = PACKET_SIZE;
+    }
+
+    memcpy(alignedBuffer, pData, uLength);
+
+    if (FLASH_If_Write((void *)m_uDwlImgCurrent, alignedBuffer, uLength) == HAL_OK)
+    {
+#if defined(SFU_NO_SWAP)
+      m_uDwlImgCurrent += uLength;
+#else
+      /*
+       * Read header from dwl area : in some configuration header can be transmitted with 2 YMODEM packets
+       * ==> pData contains only the last part of the header and cannot be used to retrieve PartialFwOffset
+       */
+      e_ret_status = FLASH_If_Read((uint8_t *)&fw_header_dwl, (void *) m_uDwlImgStart, SE_FW_HEADER_TOT_LEN);
+      /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
+      m_uDwlImgCurrent += uLength + fw_header_dwl.PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+#endif /* SFU_NO_SWAP */
+
+      /* Update remaining packet size to write */
+      uSize -= uLength;
+
+      /* Update pData pointer to received packet data */
+      pData += uLength;
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+  /* Skip data write if all has been already written as part of the header */
+  if (uSize != 0U)
+  {
+    /*Adjust dimension to unitary flash programming length */
+    if (uSize % FLASH_IF_MIN_WRITE_LEN != 0U)
+    {
+      uOldSize = uSize;
+      uSize += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
+      m_uDwlImgEnd += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
+      while (uOldSize < uSize)
+      {
+        pData[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+
+    /* Write Data in Flash - size has to be 64-bit aligned */
+
+
+    /* Write in flash only if not beyond allowed area */
+    if (((m_uDwlImgCurrent + uSize) <= m_uDwlImgEnd) && (e_ret_status == HAL_OK))
+    {
+      memcpy(alignedBuffer, pData, uSize);
+
+      if (FLASH_If_Write((void *)m_uDwlImgCurrent, alignedBuffer, uSize) == HAL_OK)
+      {
+        e_ret_status = HAL_OK;
+
+        /* Move Current destination address for next packet */
+        m_uDwlImgCurrent += uSize;
+      }
+      else
+      {
+        e_ret_status = HAL_ERROR;
+      }
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == HAL_ERROR)
+  {
+
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+#endif /* !(EXTERNAL_LOADER) */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/kms_object_update_app.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/kms_object_update_app.c
new file mode 100644
index 00000000..477c6f64
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/kms_object_update_app.c
@@ -0,0 +1,337 @@
+/**
+  ******************************************************************************
+  * @file    kms_object_update_app.c
+  * @author  MCD Application Team
+  * @brief   Firmware Update module.
+  *          This file provides set of firmware functions to manage KMS
+  *          Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "ymodem.h"
+#include "stm32wlxx_hal.h"
+#include "fw_update_app.h"
+
+#include "sfu_app_new_image.h"
+#include "sfu_fwimg_regions.h"
+
+#include "string.h"
+
+#include "kms.h"
+#include "pkcs11.h"
+#include "kms_blob_metadata.h"
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  FW_UPDATE Firmware Update Example
+  * @{
+  */
+static uint32_t m_uFileSizeYmodem = 0U;  /* !< Ymodem File size*/
+static uint32_t m_uNbrBlocksYmodem = 0U; /* !< Ymodem Number of blocks*/
+static uint32_t m_uPacketsReceived = 0U; /* !< Ymodem packets received*/
+
+
+/** @defgroup  FW_UPDATE_Private_Functions Private Functions
+  * @{
+  */
+static void KMS_UPDATE_PrintMenu(void);
+static HAL_StatusTypeDef KMS_UPDATE_ImportBlob(SFU_FwImageFlashTypeDef *pFwImageDwlArea);
+
+HAL_StatusTypeDef KMS_UPDATE_GetDownloadAreaInfo(SFU_FwImageFlashTypeDef *pArea);
+void KMS_UPDATE_StartLocalUpdate(void);
+
+
+HAL_StatusTypeDef Ymodem_BlobHeaderPktRxCpltCallback(uint32_t uFileSize);
+HAL_StatusTypeDef Ymodem_BlobDataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize);
+
+/**
+  * @}
+  */
+/** @defgroup  FW_UPDATE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup  FW_UPDATE_Control_Functions Control Functions
+  * @{
+   */
+
+/**
+  * @brief  Provide the area descriptor to write a KMS image in Flash.
+  *         This function is used by the User Application to know where to store a new KMS Blob Image before asking for
+  *         its installation.
+  * @param  pArea pointer to area descriptor
+  * @retval HAL_OK if successful, otherwise HAL_ERROR
+  */
+HAL_StatusTypeDef KMS_UPDATE_GetDownloadAreaInfo(SFU_FwImageFlashTypeDef *pArea)
+{
+  HAL_StatusTypeDef ret;
+  if (pArea != NULL)
+  {
+    pArea->DownloadAddr = SlotStartAdd[SLOT_DWL_1];
+    pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(SLOT_DWL_1);
+    pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
+    ret =  HAL_OK;
+  }
+  else
+  {
+    ret = HAL_ERROR;
+  }
+  return ret;
+}
+
+
+/**
+  * @brief  Run KMS Blob Update process.
+  * @param  None
+  * @retval HAL Status.
+  */
+void KMS_UPDATE_StartLocalUpdate(void)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  uint8_t  fw_header_input[SE_FW_HEADER_TOT_LEN];
+  SFU_FwImageFlashTypeDef fw_image_dwl_area;
+
+  /* Print Firmware Update welcome message */
+  KMS_UPDATE_PrintMenu();
+
+  /* Get Info about the download area */
+  if (KMS_UPDATE_GetDownloadAreaInfo(&fw_image_dwl_area) != HAL_ERROR)
+  {
+    /* Download new blob image*/
+    ret = KMS_UPDATE_ImportBlob(&fw_image_dwl_area);
+
+    if (HAL_OK == ret)
+    {
+      /* Read header in SWAP Area */
+      (void)memcpy(fw_header_input, (uint32_t *)(fw_image_dwl_area.DownloadAddr), sizeof(fw_header_input));
+
+      /* Ask for installation at next reset */
+      /* FOR KMS, data are directly written to the SWAP Area. */
+      /* So in the next reset, we will detect that a KMS Header is present */
+      /* This will launch a call to KMS ImportBlob */
+
+      /* System Reboot*/
+      (void)printf("  -- Image correctly downloaded - reboot\r\n\n");
+      HAL_Delay(1000U);
+      NVIC_SystemReset();
+    }
+  }
+
+  if (ret != HAL_OK)
+  {
+    (void)printf("  -- !!Operation failed!! \r\n\n");
+  }
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup  FW_UPDATE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the KMS Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+static void KMS_UPDATE_PrintMenu(void)
+{
+  (void)printf("\r\n================ New KMS Blob Download =========================\r\n\n");
+}
+
+/**
+  * @brief Download a new BLOB from the host.
+  * @retval HAL status
+  */
+static HAL_StatusTypeDef KMS_UPDATE_ImportBlob(SFU_FwImageFlashTypeDef *pFwImageDwlArea)
+{
+  HAL_StatusTypeDef ret;
+  COM_StatusTypeDef e_result;
+  uint32_t u_fw_size;
+  YMODEM_CallbacksTypeDef ymodemCb = {Ymodem_BlobHeaderPktRxCpltCallback, Ymodem_BlobDataPktRxCpltCallback};
+
+  (void)printf("  -- Send KMS Blob \r\n\n");
+  /* Refresh Watchdog */
+  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+  /* Clear download area */
+  (void)printf("  -- -- Erasing download area ...\r\n\n");
+  ret = FLASH_If_Erase_Size((uint32_t *)(pFwImageDwlArea->DownloadAddr), pFwImageDwlArea->MaxSizeInBytes);
+  if (ret == HAL_OK)
+  {
+    /* Download binary */
+    (void)printf("  -- -- File> Transfer> YMODEM> Send ");
+
+    /*Init of Ymodem*/
+    Ymodem_Init();
+
+    /*Receive through Ymodem*/
+    e_result = Ymodem_Receive(&u_fw_size, pFwImageDwlArea->DownloadAddr, &ymodemCb);
+    (void)printf("\r\n\n");
+
+    if ((e_result == COM_OK))
+    {
+      (void)printf("  -- -- Programming Completed Successfully!\r\n\n");
+      (void)printf("  -- -- Bytes: %d\r\n\n", u_fw_size);
+      ret = HAL_OK;
+    }
+    else if (e_result == COM_ABORT)
+    {
+      (void)printf("  -- -- !!Aborted by user!!\r\n\n");
+      ret = HAL_ERROR;
+    }
+    else
+    {
+      (void)printf("  -- -- !!Error during file download!!\r\n\n");
+      ret = HAL_ERROR;
+    }
+  }
+  return ret;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize Dimension of the file that will be received (Bytes).
+  * @retval None
+  */
+HAL_StatusTypeDef Ymodem_BlobHeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /* compute the number of 1K blocks */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (PACKET_1K_SIZE - 1U)) / PACKET_1K_SIZE;
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return HAL_OK;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData Pointer to the buffer.
+  * @param  uSize Packet dimension (Bytes).
+  * @retval None
+  */
+HAL_StatusTypeDef Ymodem_BlobDataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
+{
+  /* End address of downloaded Image : initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgEnd = 0U;
+  /* Current destination address for data packet : initialized with first packet (header), incremented at each flash
+     write */
+  static uint32_t m_uDwlImgCurrent = 0U;
+  uint32_t tmpSize = uSize;
+
+  HAL_StatusTypeDef e_ret_status;
+
+  m_uPacketsReceived++;
+
+  /*Increase the number of received packets*/
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem) /*Last Packet*/
+  {
+    /*Extracting actual payload from last packet*/
+    if (0UL == (m_uFileSizeYmodem % PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      tmpSize = PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      tmpSize = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / PACKET_1K_SIZE) * PACKET_1K_SIZE);
+    }
+
+    m_uPacketsReceived = 0U;
+  }
+
+  /* First packet : Contains the FW header */
+  if (m_uPacketsReceived == 1UL)
+  {
+    /* End of Image to be downloaded */
+    m_uDwlImgEnd = uFlashDestination + ((KMS_BlobRawHeaderTypeDef *)(uint32_t)pData)->BlobSize + KMS_BLOB_IMG_OFFSET;
+    /* Initialize Current destination address for data packet */
+    m_uDwlImgCurrent = uFlashDestination;
+  }
+
+  /*Adjust dimension to 64-bit length */
+  if ((tmpSize % FLASH_IF_MIN_WRITE_LEN) != 0U)
+  {
+    tmpSize += (FLASH_IF_MIN_WRITE_LEN - (tmpSize % FLASH_IF_MIN_WRITE_LEN));
+    m_uDwlImgEnd += (FLASH_IF_MIN_WRITE_LEN - (tmpSize % FLASH_IF_MIN_WRITE_LEN));
+  }
+
+  /* Write Data in Flash - size has to be 64-bit aligned */
+
+  /* Write in flash only if not beyond allowed area */
+  if ((m_uDwlImgCurrent + tmpSize) <= m_uDwlImgEnd)
+  {
+    if (FLASH_If_Write((uint32_t *)m_uDwlImgCurrent, pData, tmpSize) == HAL_OK)
+    {
+      e_ret_status = HAL_OK;
+      m_uDwlImgCurrent += tmpSize;
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+  else
+  {
+    e_ret_status = HAL_ERROR;
+  }
+
+  if (e_ret_status == HAL_ERROR)
+  {
+
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/main.c
new file mode 100644
index 00000000..478218a4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/main.c
@@ -0,0 +1,303 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Firmware Update, protections
+  *          and crypto testing functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "flash_if.h"
+#include "se_interface_application.h"
+#include "common.h"
+#include "test_protections.h"
+#include "fw_update_app.h"
+#include "se_user_code.h"
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "tkms_app.h"
+#endif /* KMS_ENABLED */
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+#define USER_APP_NBLINKS  ((uint8_t) 1U)
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+uint8_t *pUserAppId;
+const uint8_t UserAppId = 'A';
+SE_ErrorStatus eRetStatus = SE_ERROR;
+SE_StatusTypeDef eStatus;
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+void FW_APP_PrintMainMenu(void);
+void FW_APP_Run(void);
+
+/**
+  * @brief  Main program
+  * @param  None
+  * @retval None
+  */
+int main(void)
+{
+  uint32_t i = 0U;
+  /*  set example to const : this const changes in binary without rebuild */
+  pUserAppId = (uint8_t *)&UserAppId;
+
+  /* STM32WLxx HAL library initialization:
+  - Configure the Flash prefetch
+  - Systick timer is configured by default as source of time base, but user
+  can eventually implement his proper time base source (a general purpose
+  timer for example or other time source), keeping in mind that Time base
+  duration should be kept 1ms since PPP_TIMEOUT_VALUEs are defined and
+  handled in milliseconds basis.
+  - Set NVIC Group Priority to 4
+  - Low Level Initialization
+  */
+  HAL_Init();
+
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* Flash driver initialization*/
+  FLASH_If_Init();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+
+  /* LED Init*/
+  BSP_LED_Init(LED_GREEN);
+  for (i = 0U; i < USER_APP_NBLINKS; i++)
+  {
+    BSP_LED_Toggle(LED_GREEN);
+    HAL_Delay(100U);
+    BSP_LED_Toggle(LED_GREEN);
+    HAL_Delay(100U);
+    BSP_LED_Toggle(LED_GREEN);
+    HAL_Delay(100U);
+    BSP_LED_Toggle(LED_GREEN);
+    HAL_Delay(100U);
+  }
+
+  /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register*/
+  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+  /* Configure Communication module */
+  COM_Init();
+
+  /* Configure button in EXTI mode */
+  BUTTON_INIT_EXTI();
+
+  printf("\r\n======================================================================");
+  printf("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  printf("\r\n=                                                                    =");
+  printf("\r\n=                          User App #%c                               =", *pUserAppId);
+  printf("\r\n======================================================================");
+  printf("\r\n\r\n");
+
+
+  /* User App firmware runs*/
+  FW_APP_Run();
+
+  while (1U)
+  {}
+
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void FW_APP_PrintMainMenu(void)
+{
+  printf("\r\n=================== Main Menu ============================\r\n\n");
+  printf("  Download a new Fw Image ------------------------------- 1\r\n\n");
+  printf("  Test Protections -------------------------------------- 2\r\n\n");
+  printf("  Test SE User Code ------------------------------------- 3\r\n\n");
+  printf("  Multiple download ------------------------------------- 4\r\n\n");
+  printf("  Validate a FW Image------------------------------------ 5\r\n\n");
+#ifdef KMS_ENABLED
+  printf("  Test tKMS --------------------------------------------- a\r\n\n");
+#endif /* KMS_ENABLED */
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void FW_APP_Run(void)
+{
+  uint8_t key = 0U;
+
+  /* Print Main Menu message*/
+  FW_APP_PrintMainMenu();
+
+  while (1U)
+  {
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          FW_UPDATE_Run();
+          break;
+        case '2' :
+          TEST_PROTECTIONS_RunMenu();
+          break;
+        case '3' :
+          SE_USER_CODE_RunMenu();
+          break;
+        case '4' :
+          FW_UPDATE_MULTIPLE_RunMenu();
+          break;
+        case '5' :
+          FW_VALIDATE_RunMenu();
+          break;
+#ifdef KMS_ENABLED
+        case 'a' :
+          tkms_app_menu();
+          break;
+#endif /* KMS_ENABLED */
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      /*Print Main Menu message*/
+      FW_APP_PrintMainMenu();
+    }
+
+    BSP_LED_Toggle(LED_GREEN);
+  }
+}
+
+
+#ifdef  USE_FULL_ASSERT
+
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* User can add his own implementation to report the file name and line number,
+   ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+
+  /* Infinite loop */
+  while (1U)
+  {
+  }
+}
+#endif /* USE_FULL_ASSERT */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/se_user_code.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/se_user_code.c
new file mode 100644
index 00000000..894f1ed6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/se_user_code.c
@@ -0,0 +1,191 @@
+/**
+  ******************************************************************************
+  * @file    se_user_code.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine User code example module.
+  *          This file demonstrates how to call user defined services running
+  *          in Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "se_user_code.h"
+#include "se_interface_application.h"
+#include "sfu_fwimg_regions.h"
+#include <string.h> /* needed for memset */
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  SE_USER_CODE Secure Engine User Code Example
+  * @brief Example of user defined code running in Secure Engine.
+  *        This code provides user defined services to the user application.
+  * @{
+  */
+
+/** @defgroup  SE_USER_CODE_Private_Variables Private Variables
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @defgroup  SE_USER_CODE_Private_Functions Private Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the SE_USER_CODE Menu choices on hyperterminal
+  * @param  None.
+  * @retval None.
+  */
+static void SE_USER_CODE_PrintMenu(void)
+{
+  printf("\r\n=== Call User Defined Code running in Secure Engine ===\r\n\n");
+  printf("  Get firmware information of SLOT_ACTIVE_1 ------------- 1\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Get FW information.
+  * @param  SlotNumber slot identification
+  * @retval HAL Status.
+  */
+static void SE_USER_CODE_GetFwInfo(uint32_t SlotNumber)
+{
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+  SE_APP_ActiveFwInfo_t sl_FwInfo;
+
+  memset(&sl_FwInfo, 0xFF, sizeof(SE_APP_ActiveFwInfo_t));
+
+
+
+  /* Get FW info */
+  se_retCode = SE_APP_GetActiveFwInfo(&se_Status, SlotNumber, &sl_FwInfo);
+
+  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+  {
+    /* Print the result */
+    printf("Firmware Info:\r\n");
+    printf("\tActiveFwVersion: %d\r\n", sl_FwInfo.ActiveFwVersion);
+    printf("\tActiveFwSize: %d bytes\r\n", sl_FwInfo.ActiveFwSize);
+  }
+  else
+  {
+    /* Failure */
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+
+}
+
+
+/**
+  * @}
+  */
+
+/** @addtogroup  SE_USER_CODE_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Run get firmware info menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+void SE_USER_CODE_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+
+  /*Print Main Menu message*/
+  SE_USER_CODE_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          if (SlotStartAdd[slot_number] == 0U)
+          {
+            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+          }
+          else
+          {
+            SE_USER_CODE_GetFwInfo(slot_number);
+          }
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (exit != 1U)
+      {
+        if (SlotStartAdd[slot_number] == 0U)
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          SE_USER_CODE_GetFwInfo(slot_number);
+        }
+
+        /*Print Main Menu message*/
+        SE_USER_CODE_PrintMenu();
+      }
+    }
+  }
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/sfu_app_new_image.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/sfu_app_new_image.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/sfu_app_new_image.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/sfu_app_new_image.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..2f44492a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/stm32wlxx_it.c
@@ -0,0 +1,220 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+#include "test_protections.h"
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+RTC_HandleTypeDef RtcHandle;
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+
+/******************************************************************************/
+/*            Cortex-M4 Processor Exceptions Handlers                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles NMI exception.
+  * @param  None
+  * @retval None
+  */
+void NMI_Handler(void)
+{
+  /* Go to infinite loop when NMI exception occurs */
+  while (1)
+  {
+    printf("NMI exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Hard Fault exception.
+  * @param  None
+  * @retval None
+  */
+void HardFault_Handler(void)
+{
+  /* Go to infinite loop when Memory Manage exception occurs */
+  while (1)
+  {
+    printf("Hard Fault exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Memory Manage exception.
+  * @param  None
+  * @retval None
+  */
+void MemManage_Handler(void)
+{
+  /* Go to infinite loop when Memory Manage exception occurs */
+  while (1)
+  {
+    printf("Memory Manage exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Bus Fault exception.
+  * @param  None
+  * @retval None
+  */
+void BusFault_Handler(void)
+{
+  /* Go to infinite loop when Bus Fault exception occurs */
+  while (1)
+  {
+    printf("Bus Fault exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Usage Fault exception.
+  * @param  None
+  * @retval None
+  */
+void UsageFault_Handler(void)
+{
+  /* Go to infinite loop when Usage Fault exception occurs */
+  while (1)
+  {
+    printf("Usage Fault exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles SVCall exception.
+  * @param  None
+  * @retval None
+  */
+void SVC_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles Debug Monitor exception.
+  * @param  None
+  * @retval None
+  */
+void DebugMon_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers             */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles Flash operation error interrupt request.
+  * @param  None
+  * @retval None
+  */
+void FLASH_IRQHandler(void)
+{
+  HAL_FLASH_IRQHandler();
+}
+
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler()
+{
+  /* Store in the handle the Internal Tamper enabled */
+  SET_BIT(RtcHandle.IsEnabled.TampFeatures, RTC_TAMPER_ID);
+
+  RtcHandle.Instance = RTC;
+  HAL_RTCEx_TamperIRQHandler(&RtcHandle);
+}
+
+void BUTTON_IRQHANDLER(void)
+{
+  HAL_GPIO_EXTI_IRQHandler(BUTTON_EXTI_LINE);
+}
+
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  if (GPIO_Pin == BUTTON_EXTI_LINE)
+  {
+    printf("\r\nUser IRQ Handler: User Button pressed\r\n");
+  }
+}
+
+/**
+  * @brief  This function handles PPP interrupt request.
+  * @param  None
+  * @retval None
+  */
+/*void PPP_IRQHandler(void)
+{
+}*/
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/system_stm32wlxx.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/system_stm32wlxx.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/test_protections.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/test_protections.c
new file mode 100644
index 00000000..38b51f1a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/test_protections.c
@@ -0,0 +1,458 @@
+/**
+  ******************************************************************************
+  * @file    test_protections.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define TEST_PROTECTIONS_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "test_protections.h"
+#include "se_def.h"
+#include "se_interface_application.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "sfu_fwimg_regions.h" /* required for corruption tests (a real user application should NOT need this file) */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup TEST_PROTECTIONS Test protections
+  * @{
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Private_Defines Private Defines
+  * @{
+  */
+
+/**
+  * @brief  Isolated enclave Test.
+  */
+/*!< Address used to test SE CODE protection*/
+#define TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS     ((uint32_t) SE_CALLGATE_REGION_ROM_START)
+/*!< Address used to test SE VDATA protection*/
+#define TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS     ((uint32_t) SE_REGION_RAM_START)
+
+/**
+  * @brief  WRP Test.
+  */
+/*!< Address used to test WRP protection */
+#define TEST_PROTECTIONS_WRP_FLASH_ADDRESS            ((uint32_t) (KMS_DATASTORAGE_START - 0x1000))
+/*!< WRP Test Size */
+#define TEST_PROTECTIONS_WRP_FLASH_SIZE               ((uint32_t)0x800U)
+
+/**
+  * @brief  IWDG Test.
+  */
+/*!< IWDG Test delay in ms (it has to be greater than what used in SB)*/
+#define TEST_PROTECTIONS_IWDG_DELAY                   ((uint32_t)10000U)
+
+/**
+  * @brief  TAMPER Test.
+  */
+#define TEST_PROTECTIONS_TAMPER_DELAY                 ((uint32_t)10U)         /*!< TAMPER Test delay in s */
+
+/**
+  * @brief  CORRUPT_IMAGE Test.
+  */
+/*!< CORRUPT_IMAGE Test: address where data will be corrupted: address of active slot + offset */
+#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(A)  ((uint32_t)(SlotStartAdd[A] \
+                                                                     +SFU_IMG_IMAGE_OFFSET))
+/*!< CORRUPT_IMAGE Test: size of data to be corrupted */
+#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE     ((uint32_t)32U)
+
+/** @defgroup  TEST_PROTECTIONS_Private_Variables Private Variables
+  * @{
+  */
+static uint8_t uRead_WRP[TEST_PROTECTIONS_WRP_FLASH_SIZE]; /*!< RTC handler used for TAMPER Test  */
+static uint32_t m_uTamperEvent = 0U;                /*!< Tamper Event */
+
+/** @defgroup  TEST_PROTECTIONS_Private_Functions Private Functions
+  * @{
+  */
+static void TEST_PROTECTIONS_RunWRP(void);
+static void TEST_PROTECTIONS_RunTAMPER(void);
+static void TEST_PROTECTIONS_RunIWDG(void);
+static void TEST_PROTECTIONS_CORRUPT_RunMenu(void);
+static void TEST_PROTECTIONS_PrintTestingMenu(void);
+/**
+  * @}
+  */
+
+
+
+
+/** @defgroup  TEST_PROTECTIONS_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void TEST_PROTECTIONS_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint8_t exit = 0U;
+
+  /* Print Main Menu message */
+  TEST_PROTECTIONS_PrintTestingMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
+       reload register*/
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          TEST_PROTECTIONS_CORRUPT_RunMenu();
+          break;
+        case '2' :
+          TEST_PROTECTIONS_RunWRP();
+          break;
+        case '3' :
+          TEST_PROTECTIONS_RunIWDG();
+          break;
+        case '4' :
+          TEST_PROTECTIONS_RunTAMPER();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+      /*Print Main Menu message*/
+      TEST_PROTECTIONS_PrintTestingMenu();
+    }
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup  TEST_PROTECTIONS_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_PrintTestingMenu(void)
+{
+  printf("\r\n=================== Test Menu ============================\r\n\n");
+  printf("  Test : CORRUPT ACTIVE IMAGE --------------------------- 1\r\n\n");
+  printf("  Test Protection: WRP ---------------------------------- 2\r\n\n");
+  printf("  Test Protection: IWDG --------------------------------- 3\r\n\n");
+  printf("  Test Protection: TAMPER ------------------------------- 4\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+
+/**
+  * @brief  TEST Run WRP
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunWRP(void)
+{
+  uint32_t i = 0U;
+  uint32_t address = 0U;
+
+  printf("\r\n====== Test Protection: WRP ===========================\r\n\n");
+
+  address = TEST_PROTECTIONS_WRP_FLASH_ADDRESS;
+
+  /* 1 - Read Page to be used for restoring*/
+  printf("  -- Reading 0x%x bytes at address: 0x%x (for backup)\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
+         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+  for (i = 0U; i < TEST_PROTECTIONS_WRP_FLASH_SIZE; i++)
+  {
+    uRead_WRP[i] = *((uint8_t *)(address + i));
+  }
+
+  /* 2 - Erasing page */
+  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
+         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+  /* Check that it is not allowed to erase this page */
+  if (FLASH_If_Erase_Size((void *)address, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
+  {
+    /* Error returned during programmation. */
+    /* Check that WRPERR flag is set */
+    if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
+    {
+      printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
+    }
+  }
+  else
+  {
+    /* 3 - Writing Data previously read*/
+    if (FLASH_If_Write((void *)address, uRead_WRP, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
+    {
+      /* Error returned during programmation. */
+      printf("-- !! HAL_FLASH_ERROR: FLASH Write error\r\n\n");
+
+      /* Check that WRPERR flag is set */
+      if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
+      {
+        printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
+      }
+    }
+    else
+    {
+      printf("  -- Written successfully at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+      /*No Errors detected means WRP was not enabled*/
+      printf("  -- !! WRP protection is NOT ENABLED !!\r\n\n");
+    }
+  }
+}
+
+/**
+  * @brief  TEST Run CORRUPT_IMAGE
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunCORRUPT(uint32_t slot_number)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  uint8_t pattern[TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE] = {0};
+
+  /* On this series, there is no MPU to disable to allow flash corruption. */
+
+  /* Erase first sector of active slot */
+  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n", TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE,
+         TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number));
+  printf("  -- At next boot Signature Verification will fail. Download a new FW to restore FW image !!\r\n\n");
+
+  /* On this series, the memory corruption is performed by writing again the flash (but not header).
+     The header is preserved for anti-rollback check. */
+  ret = FLASH_If_Write((void *)(TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number)), (void *) &pattern,
+                       TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE);
+
+  /* This code may not be reached, due to the memory corruption performed.
+     In this case, the execution will probably trig hard fault exception (while (1)),
+     then watchdog reset. */
+  if (ret == HAL_OK)
+  {
+    NVIC_SystemReset();
+  }
+  else
+  {
+    printf("-- !! HAL_FLASH_ERROR_CORRUPT_IMAGE: erasing failure ...\r\n\n");
+  }
+}
+
+/**
+  * @brief  Display the corruption menu
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_CORRUPT_PrintMenu(void)
+{
+  printf("\r\n============  Test: CORRUPT ACTIVE IMAGE ============\r\n\n");
+  printf("  Corrupt image from SLOT_ACTIVE_1 ---------------------- 1\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Run get firmware info menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+static void TEST_PROTECTIONS_CORRUPT_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+
+  /*Print Main Menu message*/
+  TEST_PROTECTIONS_CORRUPT_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (exit != 1U)
+      {
+        if (SlotStartAdd[slot_number] == 0U)
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          TEST_PROTECTIONS_RunCORRUPT(slot_number);
+        }
+
+        /*Print Main Menu message*/
+        TEST_PROTECTIONS_CORRUPT_PrintMenu();
+      }
+    }
+  }
+}
+
+
+/**
+  * @brief  TEST Run TAMPER
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunTAMPER(void)
+{
+  uint32_t i = 0U;
+  m_uTamperEvent = 0U;
+
+  printf("\r\n====== Test Protection: TAMPER ========================\r\n\n");
+  /* Print instructions*/
+  printf("  -- Pull PC13 (CN7.23) to GND \r\n\n");
+  printf("  -- -- Note: sometimes it may be enough to put your finger close to PC13 (CN7.23)\r\n\n");
+  printf("  -- Should reset if TAMPER is enabled. \r\n\n");
+  printf("  Waiting for 10 seconds...\r\n\n")  ;
+
+  /* #2 - Wait 10 seconds*/
+  while ((i < TEST_PROTECTIONS_TAMPER_DELAY) && (m_uTamperEvent == 0U))
+  {
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register
+     */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+    HAL_Delay(1000U);
+    i++;
+  }
+  if (m_uTamperEvent == 0U)
+  {
+    printf("\r\n\n  -- Waited 10 seconds, if you have connected TAMPER pin to GND it means TAMPER protection ");
+    printf("is NOT ENABLED !! \r\n\n");
+  }
+  else
+  {
+    printf("\r\n\n  -- TAMPER Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  TEST Run IWDG
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunIWDG(void)
+{
+  printf("\r\n====== Test Protection: IWDG ===========================\r\n\n");
+
+  /* Wait for TEST_PROTECTIONS_IWDG_DELAY*/
+  printf("  -- Waiting %d (ms). Should reset if IWDG is enabled. \r\n\n", TEST_PROTECTIONS_IWDG_DELAY);
+
+  HAL_Delay(TEST_PROTECTIONS_IWDG_DELAY);
+
+  /* No Reset means IWDG was not enabled*/
+  printf("  -- !! IWDG protection is NOT ENABLED !!\r\n\n");
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup TEST_PROTECTIONS_Callback_Functions Callback Functions
+  * @{
+  */
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void CALLBACK_Antitamper(void)
+{
+  /*Set tamper event variable*/
+  m_uTamperEvent = 1U;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app.c
new file mode 100644
index 00000000..50a2847b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app.c
@@ -0,0 +1,207 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app.c
+  * @author  MCD Application Team
+  * @brief   tKMS application examples module.
+  *          This file provides examples of KMS API usages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+extern void KMS_UPDATE_StartLocalUpdate(void);  /* Function to perform Ymodem download of blob image to import */
+
+static void tkms_app_print_menu(void)
+{
+  (void)printf("\r\n======================= tKMS Examples Menu ===========================\r\n\n");
+  (void)printf("  (*) Requires execution of 'Import Blob' test (3) prior to execute this one\r\n\n");
+  (void)printf("  TKMS - Test All (*)                               --------------------- 0\r\n\n");
+  (void)printf("  TKMS - Tests AES-GCM Embedded key                 --------------------- 1\r\n\n");
+  (void)printf("  TKMS - Tests AES-CBC Embedded key                 --------------------- 2\r\n\n");
+  (void)printf("  TKMS - Import blob                                --------------------- 3\r\n\n");
+  (void)printf("  TKMS - Tests RSA Static key (*)                   --------------------- 4\r\n\n");
+  (void)printf("  TKMS - Tests Derive Static key (*)                --------------------- 5\r\n\n");
+  (void)printf("  TKMS - Tests key finding                          --------------------- 6\r\n\n");
+  (void)printf("  Exit tKMS Examples Menu                           --------------------- x\r\n\n");
+}
+
+void tkms_app_menu(void)
+{
+  uint8_t key;
+  uint8_t exit = 0U;
+  CK_RV ret_status;
+  uint8_t tests_executed; /* Tests executed count */
+  uint8_t tests_success;  /* Tests success count */
+  uint8_t clear_buffer[128] = "STM32 Key Management Services - Example buffer"; /* Clear text test buffer */
+
+  /* Initialize tKMS for subsequent usage */
+  ret_status = C_Initialize(NULL);
+  if (ret_status != CKR_OK)
+  {
+    (void)printf("tKMS initialization failed\r\n");
+    exit = 1;
+  }
+  else
+  {
+    tkms_app_print_menu();
+  }
+
+  while (exit == 0U)  /* Till user request to exit this menu, loop on it */
+  {
+    key = 0U;
+
+    INVOKE_SCHEDULE_NEEDS();
+
+    /* Clean the user input path */
+    (void)COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)  /* User pressed key */
+      {
+        case '0' :
+          /*
+           * Execute the whole supported tests in sequence
+           * For each test:
+           * - call INVOKE_SCHEDULE_NEEDS to rewarm WDG
+           * - check results and report test status
+           * At the end, global result is provided
+           */
+          tests_executed = 0U;
+          tests_success = 0U;
+          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
+          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
+          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_find();
+          (void)printf("Find key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          /* Report final status */
+          if (tests_success == tests_executed)
+          {
+            (void)printf("CUMULATIVE RESULT: ALL TESTS PASSED\r\n");
+          }
+          else
+          {
+            (void)printf("CUMULATIVE RESULT: %d/%d success\r\n", tests_success, tests_executed);
+          }
+          tkms_app_print_menu();
+          break;
+
+        /* 1 = TKMS - Tests AES-GCM Embedded key */
+        case '1' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 2 = Tests AES-CBC Embedded key */
+        case '2' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 3 = Import Blob */
+        case '3':
+          INVOKE_SCHEDULE_NEEDS();
+          KMS_UPDATE_StartLocalUpdate();
+          tkms_app_print_menu();
+          break;
+        /* 4 = Tests RSA Static key (requires blob import) */
+        case '4' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
+          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 5 = Tests Key derivation (requires blob import) */
+        case '5':
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
+          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 6 = Tests Key finding */
+        case '6':
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_find();
+          (void)printf("Find key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        case 'x':
+          exit = 1;
+          break;
+
+        default:
+          (void)printf("Invalid Number !\r");
+          tkms_app_print_menu();
+          break;
+      }
+    }
+  }
+
+  /* Finalize tKMS since no more in use */
+  ret_status = C_Finalize(NULL);
+  if (ret_status != CKR_OK)
+  {
+    (void)printf("tKMS finalization failed\r\n");
+  }
+}
+
+/*
+ * Utilities to format buffer in string for display in traces
+ */
+void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length)
+{
+  uint8_t ascii[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+  uint8_t *ptmp = pstr;
+  uint8_t *ptmp2 = pbuff;
+  for (uint32_t i = 0UL; i < length; i += 1UL)
+  {
+    *ptmp = ascii[*ptmp2 >> 4];
+    ptmp++;
+    *ptmp = ascii[*ptmp2 & 0x0FUL];
+    ptmp++;
+    ptmp2++;
+  }
+  *ptmp = 0U;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_derive_key.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_derive_key.c
new file mode 100644
index 00000000..6d6e7ebb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_derive_key.c
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_derive_key.c
+  * @author  MCD Application Team
+  * @brief   tKMS application examples module.
+  *          This file provides examples of KMS API usage to derivate a key
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define EC_POINT_MAX_LEN          (3U + (2U * 32U))   /* EC Point Max Length : X962 header + DER header +
+                                                         NIST-P256 *2 - > (0x04|LEN|0x04|X|Y) */
+#define DH_SECRET_X_MAX_LEN       (32U)               /* DH Secret X Max Length */
+
+/* Private structures --------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+
+
+/**
+  * @brief  Key derivation
+  *         This example is showing how to use key derivation to create
+  *         a specific session key.
+  * @note
+  *     Key derivation shared information between emitter and receiver
+  *       - Secret derivation Key: stored in KMS under
+  *                  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE object handle
+  *       - Session key variation: transmitted or calculated by both emitter & receiver
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pClearMessage)
+{
+  uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
+  uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
+  /* Generated key template definition */
+  CK_ULONG DeriveKey_template_class = CKO_SECRET_KEY;
+  CK_ULONG DeriveKey_template_destroyable = CK_TRUE;
+  CK_ULONG DeriveKey_template_encrypt = CK_TRUE;
+  CK_ULONG DeriveKey_template_decrypt = CK_TRUE;
+  CK_ULONG DeriveKey_template_extract = CK_TRUE;
+  CK_ATTRIBUTE DeriveKey_template[] =
+  {
+    {CKA_CLASS, (CK_VOID_PTR) &DeriveKey_template_class,       sizeof(CK_ULONG)},
+    {CKA_DESTROYABLE, (CK_VOID_PTR) &DeriveKey_template_destroyable, sizeof(CK_ULONG)},
+    {CKA_ENCRYPT, (CK_VOID_PTR) &DeriveKey_template_encrypt,     sizeof(CK_ULONG)},
+    {CKA_DECRYPT, (CK_VOID_PTR) &DeriveKey_template_decrypt,     sizeof(CK_ULONG)},
+    {CKA_EXTRACTABLE, (CK_VOID_PTR) &DeriveKey_template_extract,     sizeof(CK_ULONG)}
+  };
+  /* Template to retrieve generate key value */
+  CK_ATTRIBUTE GetKey_template[] = {{CKA_VALUE, (CK_VOID_PTR) &DeriveKey_template_class, 32UL}};
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  /* Key derivation */
+  uint8_t session_variant[32] = "My session variation 0122004578";
+  CK_MECHANISM      mech = {CKM_AES_ECB_ENCRYPT_DATA, session_variant, 32};
+  CK_OBJECT_HANDLE  derivedKeyHdle = 0UL;
+  uint8_t derivedKey[32] = {0};
+  /* AES encryption / decryption */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)cbc_iv, sizeof(cbc_iv) };
+  uint8_t tag[16] = {0};
+  uint32_t tag_lenth;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Derive key with pass phrase */
+  if (rv == CKR_OK)
+  {
+    rv = C_DeriveKey(session, &(mech), (CK_OBJECT_HANDLE)KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE,
+                     &DeriveKey_template[0], sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derivedKeyHdle);
+  }
+
+  /* Get derived key to display */
+  if (rv == CKR_OK)
+  {
+    GetKey_template[0].pValue = derivedKey;
+    rv = C_GetAttributeValue(session, derivedKeyHdle, &(GetKey_template[0]), sizeof(GetKey_template) /
+                             sizeof(CK_ATTRIBUTE));
+  }
+  if (rv == CKR_OK)
+  {
+    (void)printf("--- Derivating key --------------------------------------------\r\n");
+    (void)printf("--- AES ECB\r\n");
+    (void)printf("--- Pass phrase   [%s]\r\n", session_variant);
+    tkms_buff2str(derivedKey, a_string, 32);
+    (void)printf("--- Derived key   [%s]\r\n", a_string);
+  }
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES CBC\r\n");
+  (void)printf("--- IV      [%s]\r\n", cbc_iv);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Remove key once no more needed */
+  if (rv == CKR_OK)
+  {
+    rv = C_DestroyObject(session, derivedKeyHdle);
+  }
+
+  /* Verify key is no more usable */
+  if (rv == CKR_OK)
+  {
+    if (C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle) == CKR_OK)
+    {
+      rv = CKR_FUNCTION_FAILED;
+    }
+  }
+
+  /* Close sessions */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c
new file mode 100644
index 00000000..5692f717
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c
@@ -0,0 +1,293 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_encrypt_decrypt.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to encrypt & decrypt
+  *          messages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines ---------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+static uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
+static uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
+
+/**
+  * @brief  AES GCM 128 Bits
+  *         This example is showing how to use AES GCM encryption/decryption to
+  *         authenticate and protect a message.
+  * @note
+  *     Shared information between emitter and receiver
+  *       - Secret encryption/decryption Key: stored in KMS under
+  *                        KMS_KEY_AES128_OBJECT_HANDLE object handle
+  *       - Encrypted message: transmitted from emitter to sender
+  *       - Initialization Vector: transmitted from emitter to sender
+  *       - Message Header: transmitted from emitter to sender
+  *       - Authentication Tag: transmitted from emitter to sender
+  *                      (calculated during encryption, verified during decryption)
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t tag[16] = {0};  /* 128 bits tag size */
+  uint32_t tag_lenth = 0UL;
+
+  /* AES GCM Configuration variables */
+  uint8_t gcm_iv[12] = ">GCM VECTOR";
+  uint8_t gcm_header[16] = ">AES GCM Header";
+  /* Prepare GCM mechanism */
+  CK_GCM_PARAMS gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    sizeof(gcm_iv),
+    (CK_BYTE_PTR)gcm_header,
+    sizeof(gcm_header),
+    128   /* Tag length in Bits */
+  };
+  CK_MECHANISM aes_gcm_mechanism = { CKM_AES_GCM, (CK_VOID_PTR *)(uint32_t) &gcm_params, sizeof(gcm_params) };
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES GCM\r\n");
+  (void)printf("--- IV      [%s]\r\n", gcm_iv);
+  (void)printf("--- Header  [%s]\r\n", gcm_header);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+  tkms_buff2str(tag, a_string, tag_lenth);
+  (void)printf("--- Tag     [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  if (rv == CKR_OK)
+  {
+    (void)printf(">>> Decrypted message authenticated\r\n");
+  }
+  else
+  {
+    (void)printf("XXX Decrypted message not authenticated\r\n");
+  }
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)     /* Tag verification done into C_DecryptFinal, thus tag check reflected into rv */
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/**
+  * @brief  AES CBC 256 Bits
+  *         This example is showing how to use AES CBC encryption/decryption to
+  *         protect a message.
+  * @note
+  *     CBC shared information between emitter and receiver
+  *       - Secret encryption/decryption Key: stored in KMS under
+  *                             KMS_KEY_AESC256_OBJECT_HANDLE object handle
+  *       - Encrypted message: transmitted from emitter to sender
+  *       - Initialization Vector: transmitted from emitter to sender
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t tag[16] = {0};
+  uint32_t tag_lenth;
+
+  /* AES CBC Configuration variables */
+  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)(uint32_t)cbc_iv, sizeof(cbc_iv) };
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES CBC\r\n");
+  (void)printf("--- IV      [%s]\r\n", cbc_iv);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES CBC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES CBC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth); /* In case of AES CBC, no tag comparison is done */
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_find.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_find.c
new file mode 100644
index 00000000..6241319d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_find.c
@@ -0,0 +1,96 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_find.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to find
+  *          objects.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_KEY_AES128 "USERCRYP128"
+#define TEST_KEY_AES256 "USERCRYP256"
+/* Private variables ---------------------------------------------------------*/
+
+/**
+  * @brief  Object search
+  *         This example is showing how to find an object.
+  * @param  None
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_find(void)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_ATTRIBUTE object_template;
+  CK_OBJECT_HANDLE object_handle;
+  CK_ULONG count;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Fill in the template with the attribute to retrieve the specific key
+  (CKA_LABEL is used to refer to a specific object) */
+  object_template.type = CKA_LABEL;
+  object_template.pValue = TEST_KEY_AES128;
+  object_template.ulValueLen = sizeof(TEST_KEY_AES128);
+
+  (void)printf("--- Find Object -----------------------------------------------------\r\n");
+  (void)printf("--- Label [%s]\r\n", (uint8_t *)object_template.pValue);
+
+  /* Find Objects Init : template of the object to retrieve is passed to KMS */
+  if (rv == CKR_OK)
+  {
+    rv = C_FindObjectsInit(session, (CK_ATTRIBUTE_PTR)&object_template, 1);
+  }
+
+  /* Find Objects : Find object corresponding to the template specified in FindObjectsInit */
+  if (rv == CKR_OK)
+  {
+    count = 1;
+    rv = C_FindObjects(session, &object_handle, 1, &count);
+  }
+
+  /* Find Objects Final: Finalize the operation */
+  if (rv == CKR_OK)
+  {
+    rv = C_FindObjectsFinal(session);
+  }
+
+  if (rv == CKR_OK)
+  {
+    (void)printf("--- Object Found ------------------------------------------------\r\n");
+    (void)printf("--- Object Handle [%d]\r\n", object_handle);
+  }
+  else
+  {
+    printf("--- Object Not Found --------------------------------------------\r\n");
+  }
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_sign_verify.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_sign_verify.c
new file mode 100644
index 00000000..c4a0c8aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/tkms_app_sign_verify.c
@@ -0,0 +1,123 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_sign_verify.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to sign & verify
+  *          messages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+static uint8_t signature[2048 / 8] __attribute__((aligned(8))) = {0};
+
+
+/**
+  * @brief  RSA 1024 Bits
+  *         This example is showing how to use RSA signature to
+  *         authenticate a message.
+  * @note
+  *     RSA shared information between emitter and receiver
+  *       - Secret signature/verification Key: stored in KMS under
+  *         KMS_KEY_RSA2048_OBJECT_HANDLE object handle
+  *       - Message to authenticate: transmitted from emitter to sender
+  *       - Signature: transmitted from emitter to sender
+  *             (calculated by emitter, verified by receiver)
+  * @param  length  Length of the clear text for signature/verification tests
+  * @param  pMessage  Clear text for signature/verification tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage)
+{
+
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t signature_length = 0UL;
+
+  /* Prepare RSA mechanism */
+  CK_MECHANISM rsa_mechanism = { CKM_SHA256_RSA_PKCS, (CK_VOID_PTR *) NULL, 0};
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Signature --------------------------------------------------------------*/
+  (void)printf("--- Signing -----------------------------------------------------\r\n");
+  (void)printf("--- RSA 1024 bits\r\n");
+  (void)printf("--- Message [%s]\r\n", pMessage);
+  tkms_buff2str(pMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to sign message using RSA with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_SignInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
+  }
+
+  /* Sign message */
+  if (rv == CKR_OK)
+  {
+    signature_length = sizeof(signature);
+    rv = C_Sign(session, pMessage, length,
+                signature, &signature_length);
+  }
+
+  (void)printf("--- Signed ------------------------------------------------------\r\n");
+  tkms_buff2str(signature, a_string, signature_length);
+  (void)printf("--- Signature [0x%s]\r\n", a_string);
+  (void)printf("--- Length    [%d]\r\n", signature_length);
+
+  /* Verification ------------------------------------------------------------*/
+
+  /* Configure session to verify message using RSA with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_VerifyInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
+  }
+
+  /* Verify message */
+  if (rv == CKR_OK)
+  {
+    rv = C_Verify(session, pMessage, length,
+                  signature, signature_length);
+  }
+
+  if (rv == CKR_OK)
+  {
+    (void)printf(">>> Message authenticated\r\n");
+  }
+  else
+  {
+    (void)printf("XXX Message not authenticated\r\n");
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/ymodem.c b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/ymodem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/ymodem.c
rename to Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/Src/ymodem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/readme.txt b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/readme.txt
new file mode 100644
index 00000000..4d3e4b19
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/1_Image_UserApp/readme.txt
@@ -0,0 +1,152 @@
+/**
+  @page 1_Image_UserApp / Firmware Update - User Application Demo
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows a User Application
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application demonstrates firmware download capabilities and provides a set of functions to test the active
+protections offered by Secure Boot and Secure Engine.
+It also demonstrates key management services through basic examples and specific boot
+mechanism (firmware update decryption, verification...)
+A terminal connected with the board via VCOM is needed to communicate with the board and to select which feature
+to demonstrate.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from
+the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 1_Image_UserApp/Src/com.c                    Communication module file
+   - 1_Image_UserApp/Src/common.c                 Common module file
+   - 1_Image_UserApp/Src/flash_if.c               Flash interface file
+   - 1_Image_UserApp/Src/fw_update_app.c          Firmware update application
+   - 1_Image_UserApp/Src/kms_object_update_app.c  KMS Blob update application
+   - 1_Image_UserApp/Src/main.c                   Main program
+   - 1_Image_UserApp/Src/se_user_code.c           Call user defined services running in Secure Engine
+   - 1_Image_UserApp/Src/sfu_app_new_image.c      Manage the new firmware image storage and installation
+   - 1_Image_UserApp/Src/stm32wlxx_it.c           Interrupt handlers
+   - 1_Image_UserApp/Src/system_stm32wlxx.c       STM32 system file
+   - 1_Image_UserApp/Src/test_protections.c       Protection test
+   - 1_Image_UserApp/Src/tkms_app.c               tKMS tests
+   - 1_Image_UserApp/Src/tkms_app_derive_key.c    tKMS key derivation tests
+   - 1_Image_UserApp/Src/tkms_app_encrypt_decrypt.c tKMS encryption/decryption tests
+   - 1_Image_UserApp/Src/tkms_app_sign_verify.c   tKMS signature/verification tests
+   - 1_Image_UserApp/Src/ymodem.c                 Ymodem communication module
+   - 1_Image_UserApp/Inc/com.h                    Header for com.c file
+   - 1_Image_UserApp/Inc/common.h                 Header for common.c file
+   - 1_Image_UserApp/Inc/flash_if.h               Header for flash_if.c file
+   - 1_Image_UserApp/Inc/fw_update_app.h          Header for fw_update_app.c file
+   - 1_Image_UserApp/Inc/main.h                   Header for main.c file
+   - 1_Image_UserApp/Inc/se_user_code.h           Header file for se_user_code.c
+   - 1_Image_UserApp/Inc/sfu_app_new_image.h      Header file for sfu_app_new_image.c
+   - 1_Image_UserApp/Inc/stm32wlxx_hal_conf.h     HAL configuration file
+   - 1_Image_UserApp/Inc/stm32wlxx_it.h           Header for stm32wlxx_it.c file
+   - 1_Image_UserApp/Inc/stm32wlxx_nucleo_conf.h  BSP configuration file
+   - 1_Image_UserApp/Inc/test_protections.h       Header for test_protections.c file
+   - 1_Image_UserApp/Inc/tkms_app.h               Header for tkms_app.c file
+   - 1_Image_UserApp/Inc/ymodem.h                 Header for ymodem.c file
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices.
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
+    is a feature provided by STM32Cube programmer available on www.st.com.
+  - This example is based on se_interface_application.o module exported by BFU project.
+  - This example needs a terminal emulator.
+  - Microsoft Windows has a limitation whereby paths to files and directories cannot
+    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
+    shell scripts) to fail reading from or writing to such files.
+    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
+    up a local drive out of an existing directory on the hard drive, such as:
+    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par IDE postbuild script
+
+In order to ease the development process, a postbuild script ("postbuild.bat") is integrated in each IDE project.
+This postbuild script:
+ - is generated when compiling the Secure Engine Core project,
+ - prepares the firmware image of the user application to be installed in the device.
+ - prepares the new portion of firmware image: part of firmware image which changed vs a reference firmware image.
+   The reference firmware image is provided to the postbuild script by manually copying the UserApp.bin of the running
+   application into RefUserApp.bin (in folder 1_Image_UserApp/IDE).
+
+   As an example, once original user application has been built, downloaded and installed, you may create the
+   RefUserApp.bin, then change UserAppId constant from 'A' to 'B' in source file main.c, then build again the user
+   application.
+   At post processing stage, the portion of code containing the UserAppId will be identified as a difference vs
+   the reference binary file and a PartialUserApp.sfb will be generated in 1_Image_UserApp_M0Plus/Binary folder.
+
+A known limitation of this integration occurs when you update the firmware version (parameter of postbuild.bat script).
+The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+Refer to BFU readme and follow steps by steps instructions.
+
+Once executed, this user application gives access to a menu which allows:
+  1 - to download a new firmware
+  2 - to test protections (WRP, IWDG, TAMPER)
+  3 - to demonstrate how to call user defined services running in Secure Engine
+  4 - to provide access to multiple images feature (not supported)
+  5 - to validate a firmware image at first start-up (not supported)
+  a - to demonstrate usage of key management services
+
+1. Pressing 1 allows to download a new firmware.
+Send the user encrypted firmware file (.sfb) with Tera Term by using menu "File > Transfer > YMODEM > Send..."
+After the download, the system reboots.
+The downloaded encrypted firmware is detected, decrypted, installed and executed.
+
+The downloaded image can be either a complete UserApp.sfb or a PartialUserApp.sfb.
+To download a PartialUserApp.sfb, it is mandatory to have previously installed the UserApp.sfb identified as reference
+into the device.
+
+2. Pressing 2 allows to test protections.
+
+ - CORRUPT IMAGE test (#1): causes a signature verification failure at next boot
+ - WRP test (#2): causes an error trying to erase write protected code
+ - IWDG test (#3): causes a reset simulating a deadlock by not refreshing the watchdog
+ - TAMPER test (#4): causes a reset if a tamper event is detected. In order to generate a tamper event,
+   user has to connect PC13 (CN7.23) to GND (It may be enough to put your finger close to PC13 (CN7.23)).
+
+3. Pressing 3 allows to call user defined services running in Secure Engine.
+As an example, after selecting the firmware image, SE_APP_GetActiveFwInfo service is called in order
+to display the information located in the protected area such as version and size.
+
+4. This menu is dedicated to multiple images feature.
+Feature not available as there is only 1 download area configured.
+
+5. This menu is dedicated to image validation.
+Feature available under ENABLE_IMAGE_STATE_HANDLING compilation switch, not available in this example.
+
+a. Pressing a allows to enter specific key management services test menu.
+With this menu, you should be able to try encryption/decryption, signature/verification or key derivation mechanisms.
+
+
+Note1 : There is only 1 active slot configured in this example.
+Note2 : for Linux users Minicom can be used but to do so you need to compile the UserApp project with the MINICOM_YMODEM
+        switch enabled (ymodem.h)
+
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_export.h
new file mode 100644
index 00000000..f43d6d6e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_export.h
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t __ICFEDIT_intvec_start__;
+#define INTVECT_START ((uint32_t)& __ICFEDIT_intvec_start__)
+extern uint32_t __ICFEDIT_SE_Startup_region_ROM_start__;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Startup_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_start__;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_end__;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_start__;
+#define SE_IF_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_end__;
+#define SE_IF_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_start__;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_end__;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_CallGate_region_ROM_start__;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_CallGate_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_start__;
+#define SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_end__;
+#define SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_start__;
+#define SE_REGION_RAM_START ((uint32_t)& __ICFEDIT_SE_region_RAM_start__)
+extern uint32_t __ICFEDIT_SE_region_RAM_end__ ;
+#define SE_REGION_RAM_END ((uint32_t)& __ICFEDIT_SE_region_RAM_end__)
+extern uint32_t __ICFEDIT_SB_region_RAM_start__ ;
+#define SB_REGION_RAM_START ((uint32_t)& __ICFEDIT_SB_region_RAM_start__)
+extern uint32_t __ICFEDIT_SB_region_RAM_end__ ;
+#define SB_REGION_RAM_END ((uint32_t)& __ICFEDIT_SB_region_RAM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_stack_top__;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& __ICFEDIT_SE_region_RAM_stack_top__)
+
+extern uint32_t __ICFEDIT_KMS_DataStorage_start__ ;
+#define KMS_DATASTORAGE_START ((uint32_t)& __ICFEDIT_KMS_DataStorage_start__)
+extern uint32_t __ICFEDIT_KMS_DataStorage_end__ ;
+#define KMS_DATASTORAGE_END ((uint32_t)& __ICFEDIT_KMS_DataStorage_end__)
+
+
+#if defined (__ICCARM__) || defined(__GNUC__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_header__;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_1_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_start__;
+#define SLOT_ACTIVE_1_START ((uint32_t)& __ICFEDIT_SLOT_Active_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_end__;
+#define SLOT_ACTIVE_1_END ((uint32_t)& __ICFEDIT_SLOT_Active_1_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_header__;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_2_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_start__;
+#define SLOT_ACTIVE_2_START ((uint32_t)& __ICFEDIT_SLOT_Active_2_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_end__;
+#define SLOT_ACTIVE_2_END ((uint32_t)& __ICFEDIT_SLOT_Active_2_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_header__;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_3_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_start__;
+#define SLOT_ACTIVE_3_START ((uint32_t)& __ICFEDIT_SLOT_Active_3_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_end__;
+#define SLOT_ACTIVE_3_END ((uint32_t)& __ICFEDIT_SLOT_Active_3_end__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_1_start__;
+#define SLOT_DWL_1_START ((uint32_t)& __ICFEDIT_SLOT_Dwl_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_1_end__;
+#define SLOT_DWL_1_END ((uint32_t)& __ICFEDIT_SLOT_Dwl_1_end__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_2_start__;
+#define SLOT_DWL_2_START ((uint32_t)& __ICFEDIT_SLOT_Dwl_2_start__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_2_end__;
+#define SLOT_DWL_2_END ((uint32_t)& __ICFEDIT_SLOT_Dwl_2_end__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_3_start__;
+#define SLOT_DWL_3_START ((uint32_t)& __ICFEDIT_SLOT_Dwl_3_start__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_3_end__;
+#define SLOT_DWL_3_END ((uint32_t)& __ICFEDIT_SLOT_Dwl_3_end__)
+extern uint32_t __ICFEDIT_SWAP_start__;
+#define SWAP_START ((uint32_t)& __ICFEDIT_SWAP_start__)
+extern uint32_t __ICFEDIT_SWAP_end__;
+#define SWAP_END ((uint32_t)& __ICFEDIT_SWAP_end__)
+#endif /* __ICCARM__ || __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_fwimg.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_fwimg.icf
new file mode 100644
index 00000000..3f9c5724
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_fwimg.icf
@@ -0,0 +1,28 @@
+/*###ICF### Set of symbols used in SE and BFU projects ****/
+
+/* Slots must be aligned on sector size */
+
+/* swap region (4 kbytes) */
+define exported symbol  __ICFEDIT_SWAP_start__  = 0x08015000;
+define exported symbol  __ICFEDIT_SWAP_end__    = 0x08015FFF;
+
+/* Active slot #1 (84 Kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_1_start__ = 0x0802B000;
+define exported symbol  __ICFEDIT_SLOT_Active_1_end__   = 0x0803FFFF;
+define exported symbol  __ICFEDIT_SLOT_Active_1_header__= __ICFEDIT_SLOT_Active_1_start__;
+
+/* Dwl slot #1 (84 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Dwl_1_start__    = 0x08016000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_1_end__      = 0x0802AFFF;
+
+/* Slots not configured */
+define exported symbol  __ICFEDIT_SLOT_Active_2_header__= 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_start__ = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_end__   = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_header__= 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_start__ = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_end__   = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_2_start__    = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_2_end__      = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_3_start__    = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_3_end__      = 0x00000000;
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_sbsfu.icf b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_sbsfu.icf
new file mode 100644
index 00000000..f41ea3ac
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/EWARM/mapping_sbsfu.icf
@@ -0,0 +1,63 @@
+/*###ICF### Set of symbols used in SE and BFU projects ****/
+
+/******************************************************************************/
+/*                              ROM section                                   */
+/******************************************************************************/
+
+/* Vector table */
+define exported symbol __ICFEDIT_intvec_start__                    = 0x08000000;
+define exported symbol __ICFEDIT_Vector_size__                     = 0x200;
+
+/* SE Code region */
+define exported symbol __ICFEDIT_SE_Code_region_ROM_start__       = __ICFEDIT_intvec_start__ + __ICFEDIT_Vector_size__;
+define exported symbol __ICFEDIT_SE_CallGate_region_ROM_start__   = __ICFEDIT_SE_Code_region_ROM_start__+ 4;
+define exported symbol __ICFEDIT_SE_CallGate_Region_ROM_End__     = __ICFEDIT_SE_Code_region_ROM_start__ + 0x1FF;
+
+/* SE key region */
+define exported symbol __ICFEDIT_SE_Key_region_ROM_start__        = __ICFEDIT_SE_CallGate_Region_ROM_End__ + 1;
+define exported symbol __ICFEDIT_SE_Key_region_ROM_end__          = __ICFEDIT_SE_Key_region_ROM_start__ + 0x2FF;
+
+/* SE Startup */
+define exported symbol __ICFEDIT_SE_Startup_region_ROM_start__    = __ICFEDIT_SE_Key_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SE_Code_nokey_region_ROM_start__ = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x100;
+define exported symbol __ICFEDIT_SE_Code_region_ROM_end__         = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x80FF;
+
+/* SE IF ROM: used to locate Secure Engine interface code */
+define exported symbol __ICFEDIT_SE_IF_region_ROM_start__         = __ICFEDIT_SE_Code_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SE_IF_region_ROM_end__           = __ICFEDIT_SE_IF_region_ROM_start__ + 0x7FF;
+
+/* SBSFU Code region */
+define exported symbol __ICFEDIT_SB_region_ROM_start__            = __ICFEDIT_SE_IF_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_ROM_end__              = 0x08012FFF;
+
+/* KMS Data Storage (NVMS) region */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+define exported symbol __ICFEDIT_KMS_DataStorage_start__          = 0x08013000;
+define exported symbol __ICFEDIT_KMS_DataStorage_end__            = 0x08014FFF;
+
+/* ROM regions definition : ordered  */
+define region SE_CallGate_ROM_Region     = mem:[from __ICFEDIT_SE_CallGate_region_ROM_start__ to __ICFEDIT_SE_CallGate_Region_ROM_End__];
+define region SE_Key_ROM_region          = mem:[from __ICFEDIT_SE_Key_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_end__];
+define region SE_ROM_region              = mem:[from __ICFEDIT_SE_Code_region_ROM_start__ to __ICFEDIT_SE_Code_region_ROM_end__];
+define region SE_CODE_NOKEY_ROM_region   = mem:[from __ICFEDIT_SE_Code_nokey_region_ROM_start__ to __ICFEDIT_SE_Code_region_ROM_end__];
+define region SE_IF_ROM_region           = mem:[from __ICFEDIT_SE_IF_region_ROM_start__ to __ICFEDIT_SE_IF_region_ROM_end__];
+define region SB_ROM_region              = mem:[from __ICFEDIT_SB_region_ROM_start__ to __ICFEDIT_SB_region_ROM_end__];
+define region KMS_DataStorage            = mem:[from __ICFEDIT_KMS_DataStorage_start__ to __ICFEDIT_KMS_DataStorage_end__];
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* SE RAM region */
+define exported symbol __ICFEDIT_SE_region_RAM_start__     = 0x20000000;
+define exported symbol __ICFEDIT_SE_region_RAM_stack_top__ = 0x20000C00; /* Secure Engine's private stack */
+define exported symbol __ICFEDIT_SE_region_RAM_end__       = 0x200033FF;
+
+/* SBSFU RAM region */
+define exported symbol __ICFEDIT_SB_region_RAM_start__ = __ICFEDIT_SE_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_RAM_end__   = 0x20007FFF;
+
+/* RAM regions definition */
+define region SE_RAM_region    = mem:[from __ICFEDIT_SE_region_RAM_stack_top__ to __ICFEDIT_SE_region_RAM_end__];
+define region SB_RAM_region    = mem:[from __ICFEDIT_SB_region_RAM_start__ to __ICFEDIT_SB_region_RAM_end__];
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/MDK-ARM/mapping_fwimg.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/MDK-ARM/mapping_fwimg.h
new file mode 100644
index 00000000..71988d44
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/MDK-ARM/mapping_fwimg.h
@@ -0,0 +1,51 @@
+/**
+  ******************************************************************************
+  * @file    mapping_fwimg.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for firmware images mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_FWIMG_H
+#define MAPPING_FWIMG_H
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* swap  (4 kbytes) */
+#define SWAP_START                   0x08015000
+#define SWAP_END                     0x08015FFF
+
+/* Active slot #1  (84 kbytes) */
+#define SLOT_ACTIVE_1_START          0x0802B000
+#define SLOT_ACTIVE_1_END            0x0803FFFF
+#define SLOT_ACTIVE_1_HEADER         SLOT_ACTIVE_1_START
+
+/* Dwl slot #1  (84 kbytes) */
+#define SLOT_DWL_1_START             0x08016000
+#define SLOT_DWL_1_END               0x0802AFFF
+
+/* Slots not configured */
+#define SLOT_ACTIVE_2_HEADER         0x00000000
+#define SLOT_ACTIVE_2_START          0x00000000
+#define SLOT_ACTIVE_2_END            0x00000000
+#define SLOT_ACTIVE_3_HEADER         0x00000000
+#define SLOT_ACTIVE_3_START          0x00000000
+#define SLOT_ACTIVE_3_END            0x00000000
+#define SLOT_DWL_2_START             0x00000000
+#define SLOT_DWL_2_END               0x00000000
+#define SLOT_DWL_3_START             0x00000000
+#define SLOT_DWL_3_END               0x00000000
+
+#endif
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/MDK-ARM/mapping_sbsfu.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/MDK-ARM/mapping_sbsfu.h
new file mode 100644
index 00000000..d154b35b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/MDK-ARM/mapping_sbsfu.h
@@ -0,0 +1,86 @@
+/**
+  ******************************************************************************
+  * @file    mapping_sbsfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SBSFU mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_SBSFU_H
+#define MAPPING_SBSFU_H
+
+/*****************************************************************************/
+/*                                ROM section                                */
+/*****************************************************************************/
+
+/* Vector table  */
+#define VECTOR_SIZE                     0x200
+#define INTVECT_START                   0x08000000
+
+/* SE Code region protected by MPU isolation */
+#define SE_CODE_REGION_ROM_START        (INTVECT_START + VECTOR_SIZE)
+#define SE_CALLGATE_REGION_ROM_START    (SE_CODE_REGION_ROM_START + 4)
+#define SE_CALLGATE_REGION_ROM_END      (SE_CODE_REGION_ROM_START + 0x1FF)
+
+/* SE Embedded Keys */
+#define SE_KEY_REGION_ROM_START         (SE_CALLGATE_REGION_ROM_END + 0x1)
+#define SE_KEY_REGION_ROM_END           (SE_KEY_REGION_ROM_START + 0x2FF)
+
+/* SE Startup                               */
+#define SE_STARTUP_REGION_ROM_START     (SE_KEY_REGION_ROM_END + 1)
+#define SE_CODE_NOKEY_REGION_ROM_START  (SE_STARTUP_REGION_ROM_START + 0x100)
+#define SE_CODE_REGION_ROM_END          (SE_STARTUP_REGION_ROM_START + 0x80FF)
+
+/* SE IF ROM: used to locate Secure Engine interface code */
+#define SE_IF_REGION_ROM_START          (SE_CODE_REGION_ROM_END + 0x1)
+#define SE_IF_REGION_ROM_END            (SE_IF_REGION_ROM_START + 0xAFF)
+
+/* SBSFU Code region */
+#define SB_REGION_ROM_START             (SE_IF_REGION_ROM_END + 1)
+#define SB_REGION_ROM_END               0x08012FFF
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+#define KMS_DATASTORAGE_START           0x08013000
+#define KMS_DATASTORAGE_END             0x08014FFF
+
+/* ROM regions size definition */
+#define SE_CALLGATE_REGION_ROM_SIZE     (SE_CALLGATE_REGION_ROM_END - SE_CALLGATE_REGION_ROM_START + 0x1)
+#define SE_KEY_REGION_ROM_SIZE          (SE_KEY_REGION_ROM_END - SE_KEY_REGION_ROM_START + 0x1)
+#define SE_ROM_REGION_SIZE              (SE_CODE_REGION_ROM_END - SE_CODE_NOKEY_REGION_ROM_START + 0x1)
+#define SE_IF_ROM_REGION_SIZE           (SE_IF_REGION_ROM_END - SE_IF_REGION_ROM_START + 0x1)
+#define SB_ROM_REGION_SIZE              (SB_REGION_ROM_END - SB_REGION_ROM_START + 0x1)
+#define KMS_DATASTORAGE_SIZE            (KMS_DATASTORAGE_END - KMS_DATASTORAGE_START + 0x1)
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* SE RAM region */
+#define SE_REGION_RAM_START             0x20000000
+#define SE_REGION_RAM_STACK_TOP         0x20000C00                /* Secure Engine's private stack */
+#define SE_REGION_RAM_END               0x200033FF
+
+/* SBSFU RAM region */
+#define SB_REGION_RAM_START             (SE_REGION_RAM_END + 0x1)
+#define SB_REGION_RAM_END               0x20007FFF
+
+/* RAM regions definition */
+#define SE_RAM_REGION_SIZE              (SE_REGION_RAM_END - SE_REGION_RAM_STACK_TOP + 0x1)
+#define SB_RAM_REGION_SIZE              (SB_REGION_RAM_END - SB_REGION_RAM_START + 0x1)
+
+#endif
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_export.h
new file mode 100644
index 00000000..b7f862f6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_export.h
@@ -0,0 +1,110 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t INTVECT_start;
+#define INTVECT_START ((uint32_t)& INTVECT_start)
+extern uint32_t SE_Startup_region_ROM_start;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& SE_Startup_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_start;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& SE_Code_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_end;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& SE_Code_region_ROM_end)
+extern uint32_t SE_IF_region_ROM_start;
+#define SE_IF_REGION_ROM_START ((uint32_t)& SE_IF_region_ROM_start)
+extern uint32_t SE_IF_region_ROM_end;
+#define SE_IF_REGION_ROM_END ((uint32_t)& SE_IF_region_ROM_end)
+extern uint32_t SE_Key_region_ROM_start;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& SE_Key_region_ROM_start)
+extern uint32_t SE_Key_region_ROM_end;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& SE_Key_region_ROM_end)
+extern uint32_t SE_CallGate_region_ROM_start;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& SE_CallGate_region_ROM_start)
+extern uint32_t SB_region_ROM_start;
+#define SB_REGION_ROM_START ((uint32_t)& SB_region_ROM_start)
+extern uint32_t SB_region_ROM_end;
+#define SB_REGION_ROM_END ((uint32_t)& SB_region_ROM_end)
+extern uint32_t SE_region_RAM_start;
+#define SE_REGION_RAM_START ((uint32_t)& SE_region_RAM_start)
+extern uint32_t SE_region_RAM_end;
+#define SE_REGION_RAM_END ((uint32_t)& SE_region_RAM_end)
+extern uint32_t SB_region_RAM_start;
+#define SB_REGION_RAM_START ((uint32_t)& SB_region_RAM_start)
+extern uint32_t SB_region_RAM_end;
+#define SB_REGION_RAM_END ((uint32_t)& SB_region_RAM_end)
+extern uint32_t SE_region_RAM_stack_top;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& SE_region_RAM_stack_top)
+
+extern uint32_t KMS_DataStorage_start;
+#define KMS_DATASTORAGE_START ((uint32_t)& KMS_DataStorage_start)
+extern uint32_t KMS_DataStorage_end;
+#define KMS_DATASTORAGE_END ((uint32_t)& KMS_DataStorage_end)
+
+extern uint32_t SLOT_Active_1_header;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& SLOT_Active_1_header)
+extern uint32_t SLOT_Active_1_start;
+#define SLOT_ACTIVE_1_START ((uint32_t)& SLOT_Active_1_start)
+extern uint32_t SLOT_Active_1_end;
+#define SLOT_ACTIVE_1_END ((uint32_t)& SLOT_Active_1_end)
+extern uint32_t SLOT_Active_2_header;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& SLOT_Active_2_header)
+extern uint32_t SLOT_Active_2_start;
+#define SLOT_ACTIVE_2_START ((uint32_t)& SLOT_Active_2_start)
+extern uint32_t SLOT_Active_2_end;
+#define SLOT_ACTIVE_2_END ((uint32_t)& SLOT_Active_2_end)
+extern uint32_t SLOT_Active_3_header;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& SLOT_Active_3_header)
+extern uint32_t SLOT_Active_3_start;
+#define SLOT_ACTIVE_3_START ((uint32_t)& SLOT_Active_3_start)
+extern uint32_t SLOT_Active_3_end;
+#define SLOT_ACTIVE_3_END ((uint32_t)& SLOT_Active_3_end)
+extern uint32_t SLOT_Dwl_1_start;
+#define SLOT_DWL_1_START ((uint32_t)& SLOT_Dwl_1_start)
+extern uint32_t SLOT_Dwl_1_end;
+#define SLOT_DWL_1_END ((uint32_t)& SLOT_Dwl_1_end)
+extern uint32_t SLOT_Dwl_2_start;
+#define SLOT_DWL_2_START ((uint32_t)& SLOT_Dwl_2_start)
+extern uint32_t SLOT_Dwl_2_end;
+#define SLOT_DWL_2_END ((uint32_t)& SLOT_Dwl_2_end)
+extern uint32_t SLOT_Dwl_3_start;
+#define SLOT_DWL_3_START ((uint32_t)& SLOT_Dwl_3_start)
+extern uint32_t SLOT_Dwl_3_end;
+#define SLOT_DWL_3_END ((uint32_t)& SLOT_Dwl_3_end)
+extern uint32_t SWAP_start;
+#define SWAP_START ((uint32_t)& SWAP_start)
+extern uint32_t SWAP_end;
+#define SWAP_END ((uint32_t)& SWAP_end)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_fwimg.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
new file mode 100644
index 00000000..3c67bd5a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
@@ -0,0 +1,31 @@
+/*
+** LinkerScript
+*/
+
+/* Slots must be aligned on sector size */
+
+/* Swap sector : 4 kbytes */  
+SWAP_start           = 0x08015000;  
+SWAP_end             = 0x08015FFF;
+
+/* Active slot #1 (84 kbytes) */
+SLOT_Active_1_start  = 0x0802B000;  
+SLOT_Active_1_end    = 0x0803FFFF;
+SLOT_Active_1_header = SLOT_Active_1_start;
+
+/* Dwl slot #1 : (84 kbytes) */
+SLOT_Dwl_1_start     = 0x08016000;
+SLOT_Dwl_1_end       = 0x0802AFFF;
+
+/* Slots not configured */
+SLOT_Active_2_header = 0x00000000;
+SLOT_Active_2_start  = 0x00000000;  
+SLOT_Active_2_end    = 0x00000000;
+SLOT_Active_3_header = 0x00000000;
+SLOT_Active_3_start  = 0x00000000;
+SLOT_Active_3_end    = 0x00000000;
+SLOT_Dwl_2_start     = 0x00000000;
+SLOT_Dwl_2_end       = 0x00000000;
+SLOT_Dwl_3_start     = 0x00000000;
+SLOT_Dwl_3_end       = 0x00000000;
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
new file mode 100644
index 00000000..9f8d4aff
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/BFU_2_Slots/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
@@ -0,0 +1,85 @@
+/*
+** LinkerScript
+*/
+
+/******************************************************************************/
+/*                               ROM section                                  */
+/******************************************************************************/
+
+/* Vector table */
+INTVECT_start                  = 0x08000000;
+Vector_size                    = 0x200;
+
+/* SE Code region protected by MPU isolation */
+SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start; /* No need to do +4 as we have dummy bytes in SE_CoreBin .ld file */
+SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
+
+/* SE Embedded Keys */
+SE_Key_region_ROM_start        = SE_CallGate_region_ROM_end + 0x1;
+SE_Key_region_ROM_end          = SE_Key_region_ROM_start + 0x2FF;
+
+/* SE Startup */
+SE_Startup_region_ROM_start    = SE_Key_region_ROM_end + 0x1;
+SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
+SE_Code_region_ROM_end         = SE_Startup_region_ROM_start + 0x80FF;
+
+/* SE IF ROM */
+SE_IF_region_ROM_start         = SE_Code_region_ROM_end + 0x1; 
+SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0xEFF;
+
+/* SBSFU Code region */
+SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
+SB_region_ROM_end              = 0x08012FFF;
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+KMS_DataStorage_start          = 0x08013000;
+KMS_DataStorage_end            = 0x08014FFF;
+
+/* ROM regions size definition */
+SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
+SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
+SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
+SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
+SE_Code_NoKey_region_ROM_size  = SE_Code_region_ROM_end - SE_Code_NoKey_region_ROM_start + 0x1;
+SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
+SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
+KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* SE RAM region */
+SE_region_RAM_start            = 0x20000000;
+SE_region_RAM_stack_top        = 0x20000C00;                /* Secure Engine's private stack */
+SE_region_RAM_end              = 0x200033FF;
+
+/* SBSFU RAM region */
+SB_region_RAM_start            = SE_region_RAM_end + 0x1;
+SB_region_RAM_end              = 0x20007FFF;
+
+/* RAM regions size definition */
+SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
+SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM/ROM regions                               */
+/*                                                                            */
+/******************************************************************************/
+
+MEMORY
+{
+ INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
+ SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
+ SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
+ SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
+ SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
+ SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
+ SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
+ SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
+ SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
+ SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/FatFs/FatFs_uSD_Standalone/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/FatFs/FatFs_uSD_Standalone/STM32CubeIDE/.cproject
index 4a5389db..21a46a76 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FatFs/FatFs_uSD_Standalone/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/FatFs/FatFs_uSD_Standalone/STM32CubeIDE/.cproject
@@ -110,7 +110,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.2017482354" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.717755585" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1583085785" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1583085785" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1073968299" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
@@ -132,7 +132,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1821971300" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1777734038" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.441563950" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.441563950" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.128162926" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1694147221" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Applications/FatFs/FatFs_uSD_Standalone/readme.txt b/Projects/NUCLEO-WL55JC/Applications/FatFs/FatFs_uSD_Standalone/readme.txt
index 193d04c1..12d34a3e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FatFs/FatFs_uSD_Standalone/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/FatFs/FatFs_uSD_Standalone/readme.txt
@@ -104,7 +104,7 @@ FatFs, SD Card, File system, FAT Volume, Format, Mount, Read, Write,
 
 @par Hardware and Software environment
 
-  - This application runs on STM32WLR5JCxx devices
+  - This application runs on STM32WL55JCxx devices
 
   - This application has been tested with NUCLEO-WL55JC RevC board and can be
     easily tailored to any other supported device and development board.
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_HSEM_DualCore/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_HSEM_DualCore/CM4/Src/main.c
index 224998ee..eef48c22 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_HSEM_DualCore/CM4/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_HSEM_DualCore/CM4/Src/main.c
@@ -64,11 +64,6 @@ osMessageQueueId_t osqueueHandle;
 const osMessageQueueAttr_t osqueue_attributes = {
   .name = "osqueue"
 };
-/* Definitions for osSemaphore */
-osSemaphoreId_t osSemaphoreHandle;
-const osSemaphoreAttr_t osSemaphore_attributes = {
-  .name = "osSemaphore"
-};
 /* USER CODE BEGIN PV */
 uint32_t   osQueueMsg;
 uint32_t Queue_value = 100;
@@ -132,8 +127,6 @@ int main(void)
   /* USER CODE END RTOS_MUTEX */
 
   /* Create the semaphores(s) */
-  /* creation of osSemaphore */
-//  osSemaphoreHandle = osSemaphoreNew(1, 1, &osSemaphore_attributes);
 
   /* USER CODE BEGIN RTOS_SEMAPHORES */
   /* add semaphores, ... */
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_LowPower/EWARM/FreeRTOS_LowPower.ewp b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_LowPower/EWARM/FreeRTOS_LowPower.ewp
index 6a3289c8..8c38a38f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_LowPower/EWARM/FreeRTOS_LowPower.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_LowPower/EWARM/FreeRTOS_LowPower.ewp
@@ -1,1166 +1,1176 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <fileVersion>3</fileVersion>
-  <configuration>
-    <name>FreeRTOS_LowPower</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>29</version>
-        <wantNonLocal>1</wantNonLocal>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>FreeRTOS_LowPower</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
         <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>FreeRTOS_LowPower/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>FreeRTOS_LowPower/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>FreeRTOS_LowPower/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.20.1.14181</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state></state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../Drivers/STM32L5xx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state>$PROJ_DIR$\..\Inc</state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>FreeRTOS_LowPower.hex</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>20</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>FreeRTOS_LowPower.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Unitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-  </configuration>
-  <group>
-    <name>Application</name>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>FreeRTOS_LowPower/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>FreeRTOS_LowPower/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>FreeRTOS_LowPower/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state>$PROJ_DIR$\..\Inc</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>FreeRTOS_LowPower.hex</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>FreeRTOS_LowPower.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
     <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$/startup_stm32wl55xx_cm4.s</name>
-      </file>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\app_freertos.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_timebase_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
     </group>
     <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_msp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_timebase_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/app_freertos.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$/../readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
+        <name>Doc</name>
         <file>
-          <name>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+            <name>$PROJ_DIR$\..\readme.txt</name>
         </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</name>
-      </file>
     </group>
     <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/system_stm32wlxx.c</name>
-      </file>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
     </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
     <group>
-      <name>FreeRTOS</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s</name>
-      </file>
+        <name>Middlewares</name>
+        <group>
+            <name>FreeRTOS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\port.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\portasm.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c</name>
+            </file>
+        </group>
     </group>
-  </group>
 </project>
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_LowPower/FreeRTOS_LowPower.ioc b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_LowPower/FreeRTOS_LowPower.ioc
index ab9a1861..eb777dd0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_LowPower/FreeRTOS_LowPower.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_LowPower/FreeRTOS_LowPower.ioc
@@ -165,3 +165,5 @@ VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2
 VP_SYS_VS_tim17.Mode=TIM17
 VP_SYS_VS_tim17.Signal=SYS_VS_tim17
 board=custom
+ProjectManager.Example=FreeRTOS_LowPower
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/FreeRTOS_Queues.ewp b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/FreeRTOS_Queues.ewp
index 9fe8f6a6..24d1128c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/FreeRTOS_Queues.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Queues/EWARM/FreeRTOS_Queues.ewp
@@ -1,1166 +1,1176 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <fileVersion>3</fileVersion>
-  <configuration>
-    <name>FreeRTOS_Queues</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>29</version>
-        <wantNonLocal>1</wantNonLocal>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>FreeRTOS_Queues</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
         <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>FreeRTOS_Queues/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>FreeRTOS_Queues/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>FreeRTOS_Queues/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.20.1.14181</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state></state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../Drivers/STM32L5xx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state>$PROJ_DIR$\..\Inc</state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>FreeRTOS_Queues.hex</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>20</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>FreeRTOS_Queues.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Unitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-  </configuration>
-  <group>
-    <name>Application</name>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>FreeRTOS_Queues/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>FreeRTOS_Queues/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>FreeRTOS_Queues/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state>$PROJ_DIR$\..\Inc</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>FreeRTOS_Queues.hex</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>FreeRTOS_Queues.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
     <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$/startup_stm32wl55xx_cm4.s</name>
-      </file>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\app_freertos.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_timebase_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
     </group>
     <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_msp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_timebase_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/app_freertos.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$/../readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
+        <name>Doc</name>
         <file>
-          <name>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+            <name>$PROJ_DIR$\..\readme.txt</name>
         </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</name>
-      </file>
     </group>
     <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/system_stm32wlxx.c</name>
-      </file>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
     </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
     <group>
-      <name>FreeRTOS</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s</name>
-      </file>
+        <name>Middlewares</name>
+        <group>
+            <name>FreeRTOS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\port.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\portasm.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c</name>
+            </file>
+        </group>
     </group>
-  </group>
 </project>
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc
index cb7dfa3f..88b93ce3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Queues/FreeRTOS_Queues.ioc
@@ -165,3 +165,5 @@ VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2
 VP_SYS_VS_tim17.Mode=TIM17
 VP_SYS_VS_tim17.Signal=SYS_VS_tim17
 board=custom
+ProjectManager.Example=FreeRTOS_Queues
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/FreeRTOS_Semaphore.ewp b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/FreeRTOS_Semaphore.ewp
index 6df487ee..ac483150 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/FreeRTOS_Semaphore.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Semaphore/EWARM/FreeRTOS_Semaphore.ewp
@@ -1,1166 +1,1176 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <fileVersion>3</fileVersion>
-  <configuration>
-    <name>FreeRTOS_Semaphore</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>29</version>
-        <wantNonLocal>1</wantNonLocal>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>FreeRTOS_Semaphore</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
         <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>FreeRTOS_Semaphore/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>FreeRTOS_Semaphore/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>FreeRTOS_Semaphore/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.20.1.14181</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state></state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../Drivers/STM32L5xx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state>$PROJ_DIR$\..\Inc</state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>FreeRTOS_Semaphore.hex</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>20</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>FreeRTOS_Semaphore.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Unitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-  </configuration>
-  <group>
-    <name>Application</name>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>FreeRTOS_Semaphore/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>FreeRTOS_Semaphore/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>FreeRTOS_Semaphore/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state>$PROJ_DIR$\..\Inc</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>FreeRTOS_Semaphore.hex</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>FreeRTOS_Semaphore.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
     <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$/startup_stm32wl55xx_cm4.s</name>
-      </file>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\app_freertos.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_timebase_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
     </group>
     <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_msp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_timebase_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/app_freertos.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$/../readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
+        <name>Doc</name>
         <file>
-          <name>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+            <name>$PROJ_DIR$\..\readme.txt</name>
         </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</name>
-      </file>
     </group>
     <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/system_stm32wlxx.c</name>
-      </file>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
     </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
     <group>
-      <name>FreeRTOS</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s</name>
-      </file>
+        <name>Middlewares</name>
+        <group>
+            <name>FreeRTOS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\port.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\portasm.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c</name>
+            </file>
+        </group>
     </group>
-  </group>
 </project>
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc
index 5ab0ce38..41013dd3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Semaphore/FreeRTOS_Semaphore.ioc
@@ -165,3 +165,5 @@ VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2
 VP_SYS_VS_tim17.Mode=TIM17
 VP_SYS_VS_tim17.Signal=SYS_VS_tim17
 board=custom
+ProjectManager.Example=FreeRTOS_Semaphore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_StopMode/EWARM/FreeRTOS_StopMode.ewp b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_StopMode/EWARM/FreeRTOS_StopMode.ewp
index 401ea45a..26219338 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_StopMode/EWARM/FreeRTOS_StopMode.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_StopMode/EWARM/FreeRTOS_StopMode.ewp
@@ -1,1169 +1,1179 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <fileVersion>3</fileVersion>
-  <configuration>
-    <name>FreeRTOS_StopMode</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>29</version>
-        <wantNonLocal>1</wantNonLocal>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>FreeRTOS_StopMode</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
         <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>FreeRTOS_StopMode/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>FreeRTOS_StopMode/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>FreeRTOS_StopMode/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.20.1.14181</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state></state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../Drivers/STM32L5xx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state>$PROJ_DIR$\..\Inc</state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>FreeRTOS_StopMode.hex</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>20</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>FreeRTOS_StopMode.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Unitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-  </configuration>
-  <group>
-    <name>Application</name>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>FreeRTOS_StopMode/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>FreeRTOS_StopMode/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>FreeRTOS_StopMode/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state>$PROJ_DIR$\..\Inc</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>FreeRTOS_StopMode.hex</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>FreeRTOS_StopMode.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
     <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$/startup_stm32wl55xx_cm4.s</name>
-      </file>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\app_freertos.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_timebase_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
     </group>
     <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_msp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_timebase_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/app_freertos.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$/../readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
+        <name>Doc</name>
         <file>
-          <name>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+            <name>$PROJ_DIR$\..\readme.txt</name>
         </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</name>
-      </file>
     </group>
     <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/system_stm32wlxx.c</name>
-      </file>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_lptim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
     </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
     <group>
-      <name>FreeRTOS</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s</name>
-      </file>
+        <name>Middlewares</name>
+        <group>
+            <name>FreeRTOS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\port.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\portasm.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c</name>
+            </file>
+        </group>
     </group>
-  </group>
 </project>
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_StopMode/FreeRTOS_StopMode.ioc b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_StopMode/FreeRTOS_StopMode.ioc
index 9b7a286c..a72f06b9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_StopMode/FreeRTOS_StopMode.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_StopMode/FreeRTOS_StopMode.ioc
@@ -179,3 +179,5 @@ VP_LPTIM1_VS_LPTIM_counterModeInternalClock.Signal=LPTIM1_VS_LPTIM_counterModeIn
 VP_SYS_VS_tim17.Mode=TIM17
 VP_SYS_VS_tim17.Signal=SYS_VS_tim17
 board=custom
+ProjectManager.Example=FreeRTOS_StopMode
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/FreeRTOS_ThreadCreation.ewp b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/FreeRTOS_ThreadCreation.ewp
index cd5f9233..b27bb89c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/FreeRTOS_ThreadCreation.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadCreation/EWARM/FreeRTOS_ThreadCreation.ewp
@@ -1,1166 +1,1176 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <fileVersion>3</fileVersion>
-  <configuration>
-    <name>FreeRTOS_ThreadCreation</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>29</version>
-        <wantNonLocal>1</wantNonLocal>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>FreeRTOS_ThreadCreation</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
         <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>FreeRTOS_ThreadCreation/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>FreeRTOS_ThreadCreation/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>FreeRTOS_ThreadCreation/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.20.1.14181</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state></state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../Drivers/STM32L5xx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state>$PROJ_DIR$\..\Inc</state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>FreeRTOS_ThreadCreation.hex</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>20</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>FreeRTOS_ThreadCreation.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Unitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-  </configuration>
-  <group>
-    <name>Application</name>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>FreeRTOS_ThreadCreation/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>FreeRTOS_ThreadCreation/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>FreeRTOS_ThreadCreation/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state>$PROJ_DIR$\..\Inc</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>FreeRTOS_ThreadCreation.hex</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>FreeRTOS_ThreadCreation.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
     <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$/startup_stm32wl55xx_cm4.s</name>
-      </file>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\app_freertos.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_timebase_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
     </group>
     <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_msp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_timebase_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/app_freertos.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$/../readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
+        <name>Doc</name>
         <file>
-          <name>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+            <name>$PROJ_DIR$\..\readme.txt</name>
         </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</name>
-      </file>
     </group>
     <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/system_stm32wlxx.c</name>
-      </file>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
     </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
     <group>
-      <name>FreeRTOS</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s</name>
-      </file>
+        <name>Middlewares</name>
+        <group>
+            <name>FreeRTOS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\port.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\portasm.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c</name>
+            </file>
+        </group>
     </group>
-  </group>
 </project>
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadCreation/FreeRTOS_ThreadCreation.ioc b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadCreation/FreeRTOS_ThreadCreation.ioc
index da293837..e60333f1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadCreation/FreeRTOS_ThreadCreation.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadCreation/FreeRTOS_ThreadCreation.ioc
@@ -164,3 +164,5 @@ VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2
 VP_SYS_VS_tim17.Mode=TIM17
 VP_SYS_VS_tim17.Signal=SYS_VS_tim17
 board=custom
+ProjectManager.Example=FreeRTOS_ThreadCreation
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadFlags/EWARM/FreeRTOS_ThreadFlags.ewp b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadFlags/EWARM/FreeRTOS_ThreadFlags.ewp
index 939a4992..e92f27c9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadFlags/EWARM/FreeRTOS_ThreadFlags.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadFlags/EWARM/FreeRTOS_ThreadFlags.ewp
@@ -1,1166 +1,1176 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <fileVersion>3</fileVersion>
-  <configuration>
-    <name>FreeRTOS_ThreadFlags</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>29</version>
-        <wantNonLocal>1</wantNonLocal>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>FreeRTOS_ThreadFlags</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
         <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>FreeRTOS_ThreadFlags/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>FreeRTOS_ThreadFlags/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>FreeRTOS_ThreadFlags/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.20.1.14181</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state></state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../Drivers/STM32L5xx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state>$PROJ_DIR$\..\Inc</state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>FreeRTOS_ThreadFlags.hex</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>20</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>FreeRTOS_ThreadFlags.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Unitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-  </configuration>
-  <group>
-    <name>Application</name>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>FreeRTOS_ThreadFlags/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>FreeRTOS_ThreadFlags/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>FreeRTOS_ThreadFlags/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state>$PROJ_DIR$\..\Inc</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>FreeRTOS_ThreadFlags.hex</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>FreeRTOS_ThreadFlags.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
     <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$/startup_stm32wl55xx_cm4.s</name>
-      </file>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\app_freertos.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_timebase_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
     </group>
     <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_msp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_timebase_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/app_freertos.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$/../readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
+        <name>Doc</name>
         <file>
-          <name>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+            <name>$PROJ_DIR$\..\readme.txt</name>
         </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</name>
-      </file>
     </group>
     <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/system_stm32wlxx.c</name>
-      </file>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
     </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
     <group>
-      <name>FreeRTOS</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s</name>
-      </file>
+        <name>Middlewares</name>
+        <group>
+            <name>FreeRTOS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\port.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\portasm.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c</name>
+            </file>
+        </group>
     </group>
-  </group>
 </project>
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadFlags/FreeRTOS_ThreadFlags.ioc b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadFlags/FreeRTOS_ThreadFlags.ioc
index 8121953f..4df8d931 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadFlags/FreeRTOS_ThreadFlags.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_ThreadFlags/FreeRTOS_ThreadFlags.ioc
@@ -164,3 +164,5 @@ VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2
 VP_SYS_VS_tim17.Mode=TIM17
 VP_SYS_VS_tim17.Signal=SYS_VS_tim17
 board=custom
+ProjectManager.Example=FreeRTOS_ThreadFlags
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/FreeRTOS_Timers.ewp b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/FreeRTOS_Timers.ewp
index 63bcc621..f5a55d85 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/FreeRTOS_Timers.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Timers/EWARM/FreeRTOS_Timers.ewp
@@ -1,1166 +1,1176 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
-  <fileVersion>3</fileVersion>
-  <configuration>
-    <name>FreeRTOS_Timers</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>29</version>
-        <wantNonLocal>1</wantNonLocal>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>FreeRTOS_Timers</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
         <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>FreeRTOS_Timers/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>FreeRTOS_Timers/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>FreeRTOS_Timers/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.20.1.14181</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state></state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../Drivers/STM32L5xx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
-          <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state>$PROJ_DIR$\..\Inc</state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>FreeRTOS_Timers.hex</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>20</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>FreeRTOS_Timers.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Unitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data></data>
-    </settings>
-  </configuration>
-  <group>
-    <name>Application</name>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>FreeRTOS_Timers/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>FreeRTOS_Timers/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>FreeRTOS_Timers/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state>$PROJ_DIR$\..\Inc</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>FreeRTOS_Timers.hex</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>FreeRTOS_Timers.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
     <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$/startup_stm32wl55xx_cm4.s</name>
-      </file>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\app_freertos.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_hal_timebase_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
     </group>
     <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_msp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/stm32wlxx_hal_timebase_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/app_freertos.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$/../readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
+        <name>Doc</name>
         <file>
-          <name>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+            <name>$PROJ_DIR$\..\readme.txt</name>
         </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</name>
-      </file>
     </group>
     <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$/../Src/system_stm32wlxx.c</name>
-      </file>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
     </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
     <group>
-      <name>FreeRTOS</name>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/port.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/IAR/ARM_CM3/portasm.s</name>
-      </file>
+        <name>Middlewares</name>
+        <group>
+            <name>FreeRTOS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\CMSIS_RTOS_V2\cmsis_os2.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\croutine.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\event_groups.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\MemMang\heap_4.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\list.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\port.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\IAR\ARM_CM3\portasm.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\stream_buffer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\tasks.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\timers.c</name>
+            </file>
+        </group>
     </group>
-  </group>
 </project>
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc
index b44fe4bf..2f076de6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/FreeRTOS/FreeRTOS_Timers/FreeRTOS_Timers.ioc
@@ -165,3 +165,5 @@ VP_FREERTOS_VS_CMSIS_V2.Signal=FREERTOS_VS_CMSIS_V2
 VP_SYS_VS_tim17.Mode=TIM17
 VP_SYS_VS_tim17.Signal=SYS_VS_tim17
 board=custom
+ProjectManager.Example=FreeRTOS_Timers
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Binary/STM32CubeIDE/postbuild.sh b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Binary/STM32CubeIDE/postbuild.sh
deleted file mode 100644
index dd265db1..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Binary/STM32CubeIDE/postbuild.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-# arg1 is the build directory
-# arg2 is the bin file path+name without extension
-# arg3 is the version
-
-projectdir=$1
-execname=$2
-version=$3
-
-userAppBinary=$projectdir"Binary"
-bin=$projectdir"/"$execname".bin"
-
-kmsu=$userAppBinary"/"$execname".kmsu"
-kmsb=$userAppBinary"/"$execname".kmsb"
-sign=$userAppBinary"/"$execname".sign"
-
-iv=$userAppBinary"/iv.bin"
-oemkey=$userAppBinary"/OEM_KEY_COMPANY1_key_AES_CBC.bin"
-ecckey=$userAppBinary"/ECCKEY.txt"
-
-current_directory=`pwd`
-cd $1../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname | grep -i -e windows -e mingw
-
-if [ $? == 0 ] && [   -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  cmd=""
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-echo "$cmd $prepareimage" > $1/output.txt
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-command=$cmd" "$prepareimage" enc -k "$oemkey" -i "$iv" "$bin" "$kmsu
-echo $command
-$command >> "$projectdir"/output.txt
-ret=$?
-if [ $ret == 0 ]; then
-# -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
-  command=$cmd" "$prepareimage" sha256 "$bin" "$sign" -p 16"
-  echo $command
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret == 0 ]; then 
-    command=$cmd" "$prepareimage" pack -k "$ecckey" -m "KMSB" -r 28 -v "$version" -i "$iv" -f "$kmsu" -t "$sign" -o 320 "$kmsb
-    echo $command
-    $command >> $projectdir"/output.txt"
-    ret=$?
-  fi
-fi
-
-if [ $ret == 0 ]; then
-  rm $sign
-  rm $kmsu
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/EWARM/KMS_Blob_Example.ewp b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/EWARM/KMS_Blob_Example.ewp
index 23d5cc58..55c62bc9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/EWARM/KMS_Blob_Example.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/EWARM/KMS_Blob_Example.ewp
@@ -1217,6 +1217,9 @@
       <file>
         <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</name>
       </file>
+      <file>
+        <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</name>
+      </file>
       <file>
         <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</name>
       </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/Inc/kms_config.h
index fce72366..6c377424 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 #define KMS_NVM_SLOT_NUMBERS                     (10UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,6 +167,7 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 //#define KMS_DERIVE_KEY
 
@@ -164,18 +181,21 @@ extern "C" {
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 #define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 //#define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/Inc/stm32wlxx_nucleo_conf.h
index 6b8db4f7..0af7b23e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/Inc/stm32wlxx_nucleo_conf.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -51,21 +50,6 @@
 
 /* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
 
 /**
   * @}
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/KMS_Blob_Example.ioc b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/KMS_Blob_Example.ioc
index 54b16ec6..08099f63 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/KMS_Blob_Example.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/KMS_Blob_Example.ioc
@@ -47,8 +47,8 @@ Mcu.PinsNb=2
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
@@ -60,6 +60,13 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -73,7 +80,7 @@ ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0xC00
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=false
+ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
 ProjectManager.MainLocation=Src
 ProjectManager.NoMain=false
@@ -132,3 +139,5 @@ VP_KMS_VS_KMS.Signal=KMS_VS_KMS
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=KMS_Blob_Example
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/readme.txt b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/readme.txt
index 6616adc4..18ced965 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Blob_Example/readme.txt
@@ -55,9 +55,9 @@ Cryptography, KMS, Provisioning
 
 @par Directory contents 
 
-  - KMS/KMS_Blob_Example/Inc/stm32wlxx_nucleo_conf.h     BSP configuration file
-  - KMS/KMS_Blob_Example/Inc/stm32wlxx_hal_conf.h    HAL configuration file
-  - KMS/KMS_Blob_Example/Inc/stm32wlxx_it.h          Interrupt handlers header file
+  - KMS/KMS_Blob_Example/Inc/stm32wlxx_nucleo_conf.h       BSP configuration file
+  - KMS/KMS_Blob_Example/Inc/stm32wlxx_hal_conf.h          HAL configuration file
+  - KMS/KMS_Blob_Example/Inc/stm32wlxx_it.h                Interrupt handlers header file
   - KMS/KMS_Blob_Example/Inc/app_kms.h                     Header for app_kms.c module
   - KMS/KMS_Blob_Example/Inc/ca_conf.h                     Cryptographic configuration file
   - KMS/KMS_Blob_Example/Inc/ca_low_level.h                Header for ca_low_level.c module
@@ -73,8 +73,8 @@ Cryptography, KMS, Provisioning
   - KMS/KMS_Blob_Example/Inc/mbedtls_config.h              MBED crypto configuration file
   - KMS/KMS_Blob_Example/Inc/nvms_low_level.h              Header for nvms_low_level.c module
   - KMS/KMS_Blob_Example/Inc/ymodem.h                      Header for ymodem.c module
-  - KMS/KMS_Blob_Example/Src/stm32wlxx_it.c          Interrupt handlers
-  - KMS/KMS_Blob_Example/Src/stm32wlxx_hal_msp.c     HAL MSP module
+  - KMS/KMS_Blob_Example/Src/stm32wlxx_it.c                Interrupt handlers
+  - KMS/KMS_Blob_Example/Src/stm32wlxx_hal_msp.c           HAL MSP module
   - KMS/KMS_Blob_Example/Src/app_kms.c                     KMS application
   - KMS/KMS_Blob_Example/Src/ca_low_level.c                Cryptographic low level source file
   - KMS/KMS_Blob_Example/Src/com.c                         Communication module file
@@ -84,7 +84,7 @@ Cryptography, KMS, Provisioning
   - KMS/KMS_Blob_Example/Src/kms_object_update_app.c       KMS blob image download and import source file
   - KMS/KMS_Blob_Example/Src/main.c                        Main program
   - KMS/KMS_Blob_Example/Src/nvms_low_level.c              NVMS low level source file
-  - KMS/KMS_Blob_Example/Src/system_stm32wlxx.c      STM32WLxx system source file
+  - KMS/KMS_Blob_Example/Src/system_stm32wlxx.c            STM32WLxx system source file
   - KMS/KMS_Blob_Example/Src/ymodem.c                      Ymodem communication protocol source file
 
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/EWARM/KMS_Derive_Key.ewp b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/EWARM/KMS_Derive_Key.ewp
index 33da7727..73cce347 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/EWARM/KMS_Derive_Key.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/EWARM/KMS_Derive_Key.ewp
@@ -1199,6 +1199,9 @@
       <file>
         <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</name>
       </file>
+      <file>
+        <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</name>
+      </file>
       <file>
         <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</name>
       </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/Inc/kms_config.h
index 1ee9626c..cd00a852 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 #define KMS_NVM_SLOT_NUMBERS                     (10UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,6 +167,7 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 #define KMS_DERIVE_KEY
 
@@ -164,18 +181,21 @@ extern "C" {
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 #define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 #define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/Inc/stm32wlxx_nucleo_conf.h
index 6b8db4f7..0af7b23e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/Inc/stm32wlxx_nucleo_conf.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -51,21 +50,6 @@
 
 /* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
 
 /**
   * @}
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/KMS_Derive_Key.ioc b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/KMS_Derive_Key.ioc
index 7deeb778..f1f3f540 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/KMS_Derive_Key.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/KMS_Derive_Key.ioc
@@ -46,8 +46,8 @@ Mcu.PinsNb=2
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
@@ -59,6 +59,13 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -72,7 +79,7 @@ ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=false
+ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
 ProjectManager.MainLocation=Src
 ProjectManager.NoMain=false
@@ -131,3 +138,5 @@ VP_KMS_VS_KMS.Signal=KMS_VS_KMS
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=KMS_Derive_Key
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/readme.txt b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/readme.txt
index ad6dd6ea..9d3a0f60 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Derive_Key/readme.txt
@@ -55,9 +55,9 @@ Cryptography, KMS, Key generation
 
 @par Directory contents 
 
-  - KMS/KMS_Derive_Key/Inc/stm32wlxx_nucleo_conf.h     BSP configuration file
-  - KMS/KMS_Derive_Key/Inc/stm32wlxx_hal_conf.h    HAL configuration file
-  - KMS/KMS_Derive_Key/Inc/stm32wlxx_it.h          Interrupt handlers header file
+  - KMS/KMS_Derive_Key/Inc/stm32wlxx_nucleo_conf.h       BSP configuration file
+  - KMS/KMS_Derive_Key/Inc/stm32wlxx_hal_conf.h          HAL configuration file
+  - KMS/KMS_Derive_Key/Inc/stm32wlxx_it.h                Interrupt handlers header file
   - KMS/KMS_Derive_Key/Inc/app_kms.h                     Header for app_kms.c module
   - KMS/KMS_Derive_Key/Inc/ca_conf.h                     Cryptographic configuration file
   - KMS/KMS_Derive_Key/Inc/ca_low_level.h                Header for ca_low_level.c module
@@ -70,15 +70,15 @@ Cryptography, KMS, Key generation
   - KMS/KMS_Derive_Key/Inc/main.h                        Header for main.c module
   - KMS/KMS_Derive_Key/Inc/mbedtls_config.h              MBED crypto configuration file
   - KMS/KMS_Derive_Key/Inc/nvms_low_level.h              Header for nvms_low_level.c module
-  - KMS/KMS_Derive_Key/Src/stm32wlxx_it.c          Interrupt handlers
-  - KMS/KMS_Derive_Key/Src/stm32wlxx_hal_msp.c     HAL MSP module
+  - KMS/KMS_Derive_Key/Src/stm32wlxx_it.c                Interrupt handlers
+  - KMS/KMS_Derive_Key/Src/stm32wlxx_hal_msp.c           HAL MSP module
   - KMS/KMS_Derive_Key/Src/app_kms.c                     KMS application
   - KMS/KMS_Derive_Key/Src/ca_low_level.c                Cryptographic low level source file
   - KMS/KMS_Derive_Key/Src/com.c                         Communication module file
   - KMS/KMS_Derive_Key/Src/kms_low_level.c               KMS low level source file
   - KMS/KMS_Derive_Key/Src/main.c                        Main program
   - KMS/KMS_Derive_Key/Src/nvms_low_level.c              NVMS low level source file
-  - KMS/KMS_Derive_Key/Src/system_stm32wlxx.c      STM32WLxx system source file
+  - KMS/KMS_Derive_Key/Src/system_stm32wlxx.c            STM32WLxx system source file
 
 
 @par Hardware and Software environment
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/EWARM/KMS_Embedded_AES_Keys.ewp b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/EWARM/KMS_Embedded_AES_Keys.ewp
index 5cab66b9..5d2181ad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/EWARM/KMS_Embedded_AES_Keys.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/EWARM/KMS_Embedded_AES_Keys.ewp
@@ -1064,9 +1064,6 @@
       <file>
         <name>$PROJ_DIR$/../Src/kms_low_level.c</name>
       </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/nvms_low_level.c</name>
-      </file>
       <file>
         <name>$PROJ_DIR$/../Src/ca_low_level.c</name>
       </file>
@@ -1199,6 +1196,9 @@
       <file>
         <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</name>
       </file>
+      <file>
+        <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</name>
+      </file>
       <file>
         <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</name>
       </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/kms_config.h
index c4085f54..0c4f11a8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 //#define KMS_NVM_SLOT_NUMBERS                     (50UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,6 +167,7 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 //#define KMS_DERIVE_KEY
 
@@ -164,18 +181,21 @@ extern "C" {
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 //#define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 //#define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/nvms_low_level.h
deleted file mode 100644
index 9cedc390..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/nvms_low_level.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    nvms_low_level.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Key Management Services (KMS)
-  *          module NVM Low Level access to physical storage (Flash...)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#ifndef NVMS_LOW_LEVEL_H
-#define NVMS_LOW_LEVEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Includes */
-/* USER CODE END NVMS_LOW_LEVEL_Includes */
-
-/** @addtogroup Key_Management_Services Key Management Services (KMS)
-  * @{
-  */
-
-/** @addtogroup KMS_NVMLL NVM Low Level access
-  * @{
-  */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Exported_Types */
-/* USER CODE END NVMS_LOW_LEVEL_Exported_Types */
-
-/** @addtogroup KMS_NVMLL_Exported_Types Exported Types
-  * @{
-  */
-
-/**
-  * @brief   Block identifiers.
-  */
-typedef enum
-{
-  NVMS_BLOCK0 = 0,    /*!< Block ID 0 */
-  NVMS_BLOCK1 = 1,    /*!< Block ID 1 */
-} nvms_block_t;
-
-/**
-  * @}
-  */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Exported_Constants */
-/* USER CODE END NVMS_LOW_LEVEL_Exported_Constants */
-
-/** @addtogroup KMS_NVMLL_Exported_Constants Exported Constants
-  * @{
-  */
-
-#define NVMS_LL_ERASED           0xFFFFFFFFU    /*!< Value used to notifies data has been erased */
-
-/**
-  * @brief NVM writing granularity size
-  * @note  Not physical flash page size, but writing granularity size -> 8 bytes
-  */
-#define NVMS_LL_PAGE_SIZE    8
-
-/**
-  * @}
-  */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Exported_Function_Prototypes */
-/* USER CODE END NVMS_LOW_LEVEL_Exported_Function_Prototypes */
-
-/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
-  * @{
-  */
-void NVMS_LL_Init(void);
-bool NVMS_LL_IsBlockErased(nvms_block_t block);
-bool NVMS_LL_BlockErase(nvms_block_t block);
-bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size);
-
-/* Exported in line functions ------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Exported_In_Line_Function */
-/* USER CODE END NVMS_LOW_LEVEL_Exported_In_Line_Function */
-
-/**
-  * @brief   Returns the base address of the specified flash block
-  * @param   block block identifier
-  * @retval  pointer to the block base
-  */
-/* Template version */
-static inline uint32_t NVMS_LL_GetBlockAddress(nvms_block_t block)
-{
-  /* USER CODE BEGIN NVMS_LL_GetBlockAddress */
-  return 0UL;
-  /* USER CODE END NVMS_LL_GetBlockAddress */
-}
-
-/**
-  * @brief   Returns the size of the flash blocks
-  * @note    Blocks are required to be of equal size
-  * @retval  Block size
-  */
-/* Template version */
-static inline size_t NVMS_LL_GetBlockSize(void)
-{
-  /* USER CODE BEGIN NVMS_LL_GetBlockSize */
-  return 0;
-  /* USER CODE END NVMS_LL_GetBlockSize */
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NVMS_LOW_LEVEL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_nucleo_conf.h
index 6b8db4f7..0af7b23e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_nucleo_conf.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -51,21 +50,6 @@
 
 /* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
 
 /**
   * @}
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/KMS_Embedded_AES_Keys.ioc b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/KMS_Embedded_AES_Keys.ioc
index fc30d9da..2a6a0b5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/KMS_Embedded_AES_Keys.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/KMS_Embedded_AES_Keys.ioc
@@ -1,7 +1,7 @@
 #MicroXplorer Configuration settings - do not modify
 File.Version=6
 GPIO.groupedBy=
-KMS.IPParameters=KMS_NVM_ENABLED,KMS_NB_SESSIONS_MAX,KMS_DIGEST,KMS_SIGN,KMS_VERIFY,KMS_SEARCH,KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT,KMS_PKCS11_COMPLIANCE,KMS_MEM_LOGGING,KMS_AES_CBC,KMS_AES_GCM,KMS_RSA_1024,KMS_RSA_2048,KMS_ENCRYPT,KMS_DECRYPT,KMS_NIKMS_ROUTER_BYPASS,KMS_NVM_DYNAMIC_ENABLED,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_IMPORT_BLOB,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_MEM_CLEANING,KMS_EC_SECP192,KMS_EC_SECP256,KMS_EC_SECP384
+KMS.IPParameters=KMS_NVM_ENABLED,KMS_NB_SESSIONS_MAX,KMS_DIGEST,KMS_SIGN,KMS_VERIFY,KMS_SEARCH,KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT,KMS_PKCS11_COMPLIANCE,KMS_MEM_LOGGING,KMS_AES_CBC,KMS_AES_GCM,KMS_RSA_1024,KMS_RSA_2048,KMS_ENCRYPT,KMS_DECRYPT,KMS_NIKMS_ROUTER_BYPASS,KMS_NVM_DYNAMIC_ENABLED,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_IMPORT_BLOB,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_MEM_CLEANING,KMS_EC_SECP192,KMS_EC_SECP256,KMS_EC_SECP384,KMS_VM_DYNAMIC_ENABLED
 KMS.KMS_AES_CBC=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT
 KMS.KMS_AES_GCM=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT
 KMS.KMS_ATTRIBUTES=//\#define KMS_ATTRIBUTES
@@ -29,6 +29,7 @@ KMS.KMS_RSA_2048=//\#define KMS_RSA_2048
 KMS.KMS_SEARCH=//\#define KMS_SEARCH
 KMS.KMS_SIGN=//\#define KMS_SIGN
 KMS.KMS_VERIFY=//\#define KMS_VERIFY
+KMS.KMS_VM_DYNAMIC_ENABLED=//\#define KMS_VM_DYNAMIC_ENABLED
 KeepUserPlacement=true
 Mcu.ContextProject=MonoOnDualCore
 Mcu.Family=STM32WL
@@ -45,8 +46,8 @@ Mcu.PinsNb=2
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
@@ -58,6 +59,13 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -71,7 +79,7 @@ ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=false
+ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
 ProjectManager.MainLocation=Src
 ProjectManager.NoMain=false
@@ -130,3 +138,5 @@ VP_KMS_VS_KMS.Signal=KMS_VS_KMS
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=KMS_Embedded_AES_Keys
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/MDK-ARM/KMS_Embedded_AES_Keys.uvoptx b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/MDK-ARM/KMS_Embedded_AES_Keys.uvoptx
index a194073c..874b1e8a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/MDK-ARM/KMS_Embedded_AES_Keys.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/MDK-ARM/KMS_Embedded_AES_Keys.uvoptx
@@ -299,18 +299,6 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
       <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
       <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -326,7 +314,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>10</FileNumber>
+      <FileNumber>9</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -346,7 +334,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>11</FileNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -366,7 +354,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>12</FileNumber>
+      <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -378,7 +366,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>13</FileNumber>
+      <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -390,7 +378,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>14</FileNumber>
+      <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -402,7 +390,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>15</FileNumber>
+      <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -414,7 +402,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>16</FileNumber>
+      <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -426,7 +414,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>17</FileNumber>
+      <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -438,7 +426,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>18</FileNumber>
+      <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -450,7 +438,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>19</FileNumber>
+      <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -462,7 +450,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>20</FileNumber>
+      <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -474,7 +462,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -486,7 +474,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -498,7 +486,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -510,7 +498,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -522,7 +510,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -534,7 +522,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -546,7 +534,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -558,7 +546,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -570,7 +558,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -582,7 +570,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -602,7 +590,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -622,7 +610,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -634,7 +622,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -646,7 +634,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -658,7 +646,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>35</FileNumber>
+      <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -670,7 +658,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>36</FileNumber>
+      <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -682,7 +670,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>37</FileNumber>
+      <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -694,7 +682,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>38</FileNumber>
+      <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -706,7 +694,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>39</FileNumber>
+      <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -718,7 +706,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>40</FileNumber>
+      <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -730,7 +718,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>41</FileNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -742,7 +730,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>42</FileNumber>
+      <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -754,7 +742,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>43</FileNumber>
+      <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -766,7 +754,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>44</FileNumber>
+      <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -778,7 +766,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>45</FileNumber>
+      <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -790,7 +778,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>46</FileNumber>
+      <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -802,7 +790,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>47</FileNumber>
+      <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -814,7 +802,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>48</FileNumber>
+      <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -826,7 +814,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>49</FileNumber>
+      <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -838,7 +826,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>50</FileNumber>
+      <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -850,7 +838,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>51</FileNumber>
+      <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -862,7 +850,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>52</FileNumber>
+      <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -874,7 +862,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>53</FileNumber>
+      <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -886,7 +874,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>54</FileNumber>
+      <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -898,7 +886,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>55</FileNumber>
+      <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -910,7 +898,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>56</FileNumber>
+      <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -922,7 +910,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>57</FileNumber>
+      <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -934,7 +922,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>58</FileNumber>
+      <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -946,7 +934,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>59</FileNumber>
+      <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -958,7 +946,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>60</FileNumber>
+      <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -970,7 +958,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>61</FileNumber>
+      <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -982,7 +970,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>62</FileNumber>
+      <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -994,7 +982,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>63</FileNumber>
+      <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1014,7 +1002,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>64</FileNumber>
+      <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1026,7 +1014,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>65</FileNumber>
+      <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1038,7 +1026,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>66</FileNumber>
+      <FileNumber>65</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1050,7 +1038,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>67</FileNumber>
+      <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/MDK-ARM/KMS_Embedded_AES_Keys.uvprojx b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/MDK-ARM/KMS_Embedded_AES_Keys.uvprojx
index c0a9232c..a20f38c2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/MDK-ARM/KMS_Embedded_AES_Keys.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/MDK-ARM/KMS_Embedded_AES_Keys.uvprojx
@@ -423,11 +423,6 @@
               <FileType>1</FileType>
               <FilePath>../Src/kms_low_level.c</FilePath>
             </File>
-            <File>
-              <FileName>nvms_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/nvms_low_level.c</FilePath>
-            </File>
             <File>
               <FileName>ca_low_level.c</FileName>
               <FileType>1</FileType>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/STM32CubeIDE/.project
index e010dff0..e8129886 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/STM32CubeIDE/.project
@@ -67,11 +67,6 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/main.c</locationURI>
 		</link>
-		<link>
-			<name>Application/User/nvms_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
-		</link>
 		<link>
 			<name>Application/User/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Src/nvms_low_level.c
deleted file mode 100644
index 9f0b80e1..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/Src/nvms_low_level.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    nvms_low_level.c
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Key Management Services (KMS)
-  *          module NVM Low Level access to physical storage (Flash...)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#include <string.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-#include "nvms_low_level.h"
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Includes */
-/* USER CODE END NVMS_LOW_LEVEL_Includes */
-
-/** @addtogroup Key_Management_Services Key Management Services (KMS)
-  * @{
-  */
-
-/** @addtogroup KMS_NVMLL NVM Low Level access
-  * @{
-  */
-
-/* Private types -------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Types */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Types */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Defines */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Defines */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Macros */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Macros */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Variables */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Variables */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Function_Prototypes */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Function_Prototypes */
-
-/* Private function ----------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Functions */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Functions */
-
-/* Exported functions --------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Exported_Functions */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Exported_Functions */
-
-/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
-  * @{
-  */
-
-/**
-  * @brief   Flash low level driver initialization.
-  */
-void NVMS_LL_Init(void)
-{
-  /* USER CODE BEGIN NVMS_LL_Init */
-  /* USER CODE END NVMS_LL_Init */
-}
-
-/**
-  * @brief   Determines if a flash block is in erased state.
-  *
-  * @param   block         the block identifier
-  * @return                  The block state.
-  * @retval false            if the block is not in erased state.
-  * @retval true             if the block is in erased state.
-  */
-
-/* Template version of the function */
-bool NVMS_LL_IsBlockErased(nvms_block_t block)
-{
-  /* USER CODE BEGIN NVMS_LL_IsBlockErased */
-
-  return false;
-  /* USER CODE END NVMS_LL_IsBlockErased */
-}
-
-/**
-  * @brief   Erases a block.
-  * @note    The erase operation is verified internally.
-  *
-  * @param   block         the block identifier
-  * @return                  The operation status.
-  * @retval false            if the operation is successful.
-  * @retval true             if the erase operation failed.
-  */
-/* Template version of the function */
-bool NVMS_LL_BlockErase(nvms_block_t block)
-{
-  /* USER CODE BEGIN NVMS_LL_BlockErase */
-
-  return true;
-  /* USER CODE END NVMS_LL_BlockErase */
-}
-
-/**
-  * @brief   Writes data.
-  * @note    The write operation is verified internally.
-  * @note    If the write operation partially writes flash pages then the
-  *          unwritten bytes are left to the filler value.
-  *
-  * @param   source        pointer to the data to be written
-  * @param   destination   pointer to the flash position
-  * @param   size          size of data
-  * @return                  The operation status.
-  * @retval false            if the operation is successful.
-  * @retval true             if the write operation failed.
-  */
-/* Template version of the function */
-bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size)
-{
-  /* USER CODE BEGIN NVMS_LL_Write */
-  return true;
-  /* USER CODE END NVMS_LL_Write */
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/readme.txt b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/readme.txt
index c6abb0a7..44ef4dc7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_AES_Keys/readme.txt
@@ -54,9 +54,9 @@ Cryptography, KMS, cipher, decipher, AES, AESCBC, AESGCM
 
 @par Directory contents 
 
-  - KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_nucleo_conf.h     BSP configuration file
-  - KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_hal_conf.h    HAL configuration file
-  - KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_it.h          Interrupt handlers header file
+  - KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_nucleo_conf.h       BSP configuration file
+  - KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_hal_conf.h          HAL configuration file
+  - KMS/KMS_Embedded_AES_Keys/Inc/stm32wlxx_it.h                Interrupt handlers header file
   - KMS/KMS_Embedded_AES_Keys/Inc/app_kms.h                     Header for app_kms.c module
   - KMS/KMS_Embedded_AES_Keys/Inc/ca_conf.h                     Cryptographic configuration file
   - KMS/KMS_Embedded_AES_Keys/Inc/ca_low_level.h                Header for ca_low_level.c module
@@ -68,16 +68,14 @@ Cryptography, KMS, cipher, decipher, AES, AESCBC, AESGCM
   - KMS/KMS_Embedded_AES_Keys/Inc/kms_platf_objects_interface.h KMS embedded objects interface files
   - KMS/KMS_Embedded_AES_Keys/Inc/main.h                        Header for main.c module
   - KMS/KMS_Embedded_AES_Keys/Inc/mbedtls_config.h              MBED crypto configuration file
-  - KMS/KMS_Embedded_AES_Keys/Inc/nvms_low_level.h              Header for nvms_low_level.c module
-  - KMS/KMS_Embedded_AES_Keys/Src/stm32wlxx_it.c          Interrupt handlers
-  - KMS/KMS_Embedded_AES_Keys/Src/stm32wlxx_hal_msp.c     HAL MSP module
+  - KMS/KMS_Embedded_AES_Keys/Src/stm32wlxx_it.c                Interrupt handlers
+  - KMS/KMS_Embedded_AES_Keys/Src/stm32wlxx_hal_msp.c           HAL MSP module
   - KMS/KMS_Embedded_AES_Keys/Src/app_kms.c                     KMS application
   - KMS/KMS_Embedded_AES_Keys/Src/ca_low_level.c                Cryptographic low level source file
   - KMS/KMS_Embedded_AES_Keys/Src/com.c                         Communication module file
   - KMS/KMS_Embedded_AES_Keys/Src/kms_low_level.c               KMS low level source file
   - KMS/KMS_Embedded_AES_Keys/Src/main.c                        Main program
-  - KMS/KMS_Embedded_AES_Keys/Src/nvms_low_level.c              NVMS low level source file
-  - KMS/KMS_Embedded_AES_Keys/Src/system_stm32wlxx.c      STM32WLxx system source file
+  - KMS/KMS_Embedded_AES_Keys/Src/system_stm32wlxx.c            STM32WLxx system source file
 
 
 @par Hardware and Software environment
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/EWARM/KMS_Embedded_RSA_Key.ewp b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/EWARM/KMS_Embedded_RSA_Key.ewp
index c70bd371..49827808 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/EWARM/KMS_Embedded_RSA_Key.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/EWARM/KMS_Embedded_RSA_Key.ewp
@@ -1064,9 +1064,6 @@
       <file>
         <name>$PROJ_DIR$/../Src/kms_low_level.c</name>
       </file>
-      <file>
-        <name>$PROJ_DIR$/../Src/nvms_low_level.c</name>
-      </file>
       <file>
         <name>$PROJ_DIR$/../Src/ca_low_level.c</name>
       </file>
@@ -1199,6 +1196,9 @@
       <file>
         <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</name>
       </file>
+      <file>
+        <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</name>
+      </file>
       <file>
         <name>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</name>
       </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/kms_config.h
index 35365856..81480c8b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 //#define KMS_NVM_SLOT_NUMBERS                     (50UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,6 +167,7 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 //#define KMS_DERIVE_KEY
 
@@ -164,18 +181,21 @@ extern "C" {
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 //#define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 //#define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/nvms_low_level.h
deleted file mode 100644
index 9cedc390..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/nvms_low_level.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    nvms_low_level.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Key Management Services (KMS)
-  *          module NVM Low Level access to physical storage (Flash...)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#ifndef NVMS_LOW_LEVEL_H
-#define NVMS_LOW_LEVEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Includes */
-/* USER CODE END NVMS_LOW_LEVEL_Includes */
-
-/** @addtogroup Key_Management_Services Key Management Services (KMS)
-  * @{
-  */
-
-/** @addtogroup KMS_NVMLL NVM Low Level access
-  * @{
-  */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Exported_Types */
-/* USER CODE END NVMS_LOW_LEVEL_Exported_Types */
-
-/** @addtogroup KMS_NVMLL_Exported_Types Exported Types
-  * @{
-  */
-
-/**
-  * @brief   Block identifiers.
-  */
-typedef enum
-{
-  NVMS_BLOCK0 = 0,    /*!< Block ID 0 */
-  NVMS_BLOCK1 = 1,    /*!< Block ID 1 */
-} nvms_block_t;
-
-/**
-  * @}
-  */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Exported_Constants */
-/* USER CODE END NVMS_LOW_LEVEL_Exported_Constants */
-
-/** @addtogroup KMS_NVMLL_Exported_Constants Exported Constants
-  * @{
-  */
-
-#define NVMS_LL_ERASED           0xFFFFFFFFU    /*!< Value used to notifies data has been erased */
-
-/**
-  * @brief NVM writing granularity size
-  * @note  Not physical flash page size, but writing granularity size -> 8 bytes
-  */
-#define NVMS_LL_PAGE_SIZE    8
-
-/**
-  * @}
-  */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Exported_Function_Prototypes */
-/* USER CODE END NVMS_LOW_LEVEL_Exported_Function_Prototypes */
-
-/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
-  * @{
-  */
-void NVMS_LL_Init(void);
-bool NVMS_LL_IsBlockErased(nvms_block_t block);
-bool NVMS_LL_BlockErase(nvms_block_t block);
-bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size);
-
-/* Exported in line functions ------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Exported_In_Line_Function */
-/* USER CODE END NVMS_LOW_LEVEL_Exported_In_Line_Function */
-
-/**
-  * @brief   Returns the base address of the specified flash block
-  * @param   block block identifier
-  * @retval  pointer to the block base
-  */
-/* Template version */
-static inline uint32_t NVMS_LL_GetBlockAddress(nvms_block_t block)
-{
-  /* USER CODE BEGIN NVMS_LL_GetBlockAddress */
-  return 0UL;
-  /* USER CODE END NVMS_LL_GetBlockAddress */
-}
-
-/**
-  * @brief   Returns the size of the flash blocks
-  * @note    Blocks are required to be of equal size
-  * @retval  Block size
-  */
-/* Template version */
-static inline size_t NVMS_LL_GetBlockSize(void)
-{
-  /* USER CODE BEGIN NVMS_LL_GetBlockSize */
-  return 0;
-  /* USER CODE END NVMS_LL_GetBlockSize */
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NVMS_LOW_LEVEL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_nucleo_conf.h
index 6b8db4f7..0af7b23e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_nucleo_conf.h
@@ -6,13 +6,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -51,21 +50,6 @@
 
 /* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
 
 /**
   * @}
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/KMS_Embedded_RSA_Key.ioc b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/KMS_Embedded_RSA_Key.ioc
index 94f2e3a5..bde43582 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/KMS_Embedded_RSA_Key.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/KMS_Embedded_RSA_Key.ioc
@@ -1,7 +1,7 @@
 #MicroXplorer Configuration settings - do not modify
 File.Version=6
 GPIO.groupedBy=
-KMS.IPParameters=KMS_NVM_ENABLED,KMS_NB_SESSIONS_MAX,KMS_DIGEST,KMS_SIGN,KMS_VERIFY,KMS_SEARCH,KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT,KMS_PKCS11_COMPLIANCE,KMS_MEM_LOGGING,KMS_RSA_1024,KMS_RSA_2048,KMS_ENCRYPT,KMS_DECRYPT,KMS_RSA,KMS_SHA1,KMS_NIKMS_ROUTER_BYPASS,KMS_NVM_DYNAMIC_ENABLED,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_IMPORT_BLOB,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_MEM_CLEANING,KMS_EC_SECP192,KMS_EC_SECP256,KMS_EC_SECP384
+KMS.IPParameters=KMS_NVM_ENABLED,KMS_NB_SESSIONS_MAX,KMS_DIGEST,KMS_SIGN,KMS_VERIFY,KMS_SEARCH,KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT,KMS_PKCS11_COMPLIANCE,KMS_MEM_LOGGING,KMS_RSA_1024,KMS_RSA_2048,KMS_ENCRYPT,KMS_DECRYPT,KMS_RSA,KMS_SHA1,KMS_NIKMS_ROUTER_BYPASS,KMS_NVM_DYNAMIC_ENABLED,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_IMPORT_BLOB,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_MEM_CLEANING,KMS_EC_SECP192,KMS_EC_SECP256,KMS_EC_SECP384,KMS_VM_DYNAMIC_ENABLED
 KMS.KMS_ATTRIBUTES=//\#define KMS_ATTRIBUTES
 KMS.KMS_DECRYPT=//\#define KMS_DECRYPT
 KMS.KMS_DERIVE_KEY=//\#define KMS_DERIVE_KEY
@@ -29,6 +29,7 @@ KMS.KMS_SEARCH=//\#define KMS_SEARCH
 KMS.KMS_SHA1=KMS_FCT_DIGEST
 KMS.KMS_SIGN=\#define KMS_SIGN
 KMS.KMS_VERIFY=\#define KMS_VERIFY
+KMS.KMS_VM_DYNAMIC_ENABLED=//\#define KMS_VM_DYNAMIC_ENABLED
 KeepUserPlacement=true
 Mcu.ContextProject=MonoOnDualCore
 Mcu.Family=STM32WL
@@ -45,8 +46,8 @@ Mcu.PinsNb=2
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
@@ -58,6 +59,13 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -71,7 +79,7 @@ ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x400
 ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=false
+ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
 ProjectManager.MainLocation=Src
 ProjectManager.NoMain=false
@@ -130,3 +138,5 @@ VP_KMS_VS_KMS.Signal=KMS_VS_KMS
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=KMS_Embedded_RSA_Key
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/MDK-ARM/KMS_Embedded_RSA_Key.uvoptx b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/MDK-ARM/KMS_Embedded_RSA_Key.uvoptx
index 87f9588d..e5eb15f7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/MDK-ARM/KMS_Embedded_RSA_Key.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/MDK-ARM/KMS_Embedded_RSA_Key.uvoptx
@@ -299,18 +299,6 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
       <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
       <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -326,7 +314,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>10</FileNumber>
+      <FileNumber>9</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -346,7 +334,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>11</FileNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -366,7 +354,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>12</FileNumber>
+      <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -378,7 +366,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>13</FileNumber>
+      <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -390,7 +378,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>14</FileNumber>
+      <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -402,7 +390,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>15</FileNumber>
+      <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -414,7 +402,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>16</FileNumber>
+      <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -426,7 +414,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>17</FileNumber>
+      <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -438,7 +426,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>18</FileNumber>
+      <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -450,7 +438,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>19</FileNumber>
+      <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -462,7 +450,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>20</FileNumber>
+      <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -474,7 +462,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -486,7 +474,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -498,7 +486,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -510,7 +498,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -522,7 +510,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -534,7 +522,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -546,7 +534,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -558,7 +546,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -570,7 +558,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -582,7 +570,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -602,7 +590,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -622,7 +610,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -634,7 +622,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -646,7 +634,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -658,7 +646,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>35</FileNumber>
+      <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -670,7 +658,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>36</FileNumber>
+      <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -682,7 +670,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>37</FileNumber>
+      <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -694,7 +682,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>38</FileNumber>
+      <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -706,7 +694,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>39</FileNumber>
+      <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -718,7 +706,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>40</FileNumber>
+      <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -730,7 +718,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>41</FileNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -742,7 +730,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>42</FileNumber>
+      <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -754,7 +742,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>43</FileNumber>
+      <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -766,7 +754,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>44</FileNumber>
+      <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -778,7 +766,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>45</FileNumber>
+      <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -790,7 +778,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>46</FileNumber>
+      <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -802,7 +790,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>47</FileNumber>
+      <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -814,7 +802,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>48</FileNumber>
+      <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -826,7 +814,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>49</FileNumber>
+      <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -838,7 +826,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>50</FileNumber>
+      <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -850,7 +838,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>51</FileNumber>
+      <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -862,7 +850,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>52</FileNumber>
+      <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -874,7 +862,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>53</FileNumber>
+      <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -886,7 +874,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>54</FileNumber>
+      <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -898,7 +886,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>55</FileNumber>
+      <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -910,7 +898,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>56</FileNumber>
+      <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -922,7 +910,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>57</FileNumber>
+      <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -934,7 +922,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>58</FileNumber>
+      <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -946,7 +934,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>59</FileNumber>
+      <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -958,7 +946,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>60</FileNumber>
+      <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -970,7 +958,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>61</FileNumber>
+      <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -982,7 +970,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>62</FileNumber>
+      <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -994,7 +982,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>63</FileNumber>
+      <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1014,7 +1002,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>64</FileNumber>
+      <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1026,7 +1014,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>65</FileNumber>
+      <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1038,7 +1026,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>66</FileNumber>
+      <FileNumber>65</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1050,7 +1038,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>67</FileNumber>
+      <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/MDK-ARM/KMS_Embedded_RSA_Key.uvprojx b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/MDK-ARM/KMS_Embedded_RSA_Key.uvprojx
index 19b41b33..dcf736e6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/MDK-ARM/KMS_Embedded_RSA_Key.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/MDK-ARM/KMS_Embedded_RSA_Key.uvprojx
@@ -423,11 +423,6 @@
               <FileType>1</FileType>
               <FilePath>../Src/kms_low_level.c</FilePath>
             </File>
-            <File>
-              <FileName>nvms_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/nvms_low_level.c</FilePath>
-            </File>
             <File>
               <FileName>ca_low_level.c</FileName>
               <FileType>1</FileType>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/STM32CubeIDE/.project
index cee9b9b8..23041a93 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/STM32CubeIDE/.project
@@ -67,11 +67,6 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/main.c</locationURI>
 		</link>
-		<link>
-			<name>Application/User/nvms_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
-		</link>
 		<link>
 			<name>Application/User/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Src/nvms_low_level.c
deleted file mode 100644
index 9f0b80e1..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/Src/nvms_low_level.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    nvms_low_level.c
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Key Management Services (KMS)
-  *          module NVM Low Level access to physical storage (Flash...)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#include <string.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-#include "nvms_low_level.h"
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Includes */
-/* USER CODE END NVMS_LOW_LEVEL_Includes */
-
-/** @addtogroup Key_Management_Services Key Management Services (KMS)
-  * @{
-  */
-
-/** @addtogroup KMS_NVMLL NVM Low Level access
-  * @{
-  */
-
-/* Private types -------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Types */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Types */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Defines */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Defines */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Macros */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Macros */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Variables */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Variables */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Function_Prototypes */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Function_Prototypes */
-
-/* Private function ----------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Functions */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Functions */
-
-/* Exported functions --------------------------------------------------------*/
-/* USER CODE BEGIN NVMS_LOW_LEVEL_Private_Exported_Functions */
-/* USER CODE END NVMS_LOW_LEVEL_Private_Exported_Functions */
-
-/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
-  * @{
-  */
-
-/**
-  * @brief   Flash low level driver initialization.
-  */
-void NVMS_LL_Init(void)
-{
-  /* USER CODE BEGIN NVMS_LL_Init */
-  /* USER CODE END NVMS_LL_Init */
-}
-
-/**
-  * @brief   Determines if a flash block is in erased state.
-  *
-  * @param   block         the block identifier
-  * @return                  The block state.
-  * @retval false            if the block is not in erased state.
-  * @retval true             if the block is in erased state.
-  */
-
-/* Template version of the function */
-bool NVMS_LL_IsBlockErased(nvms_block_t block)
-{
-  /* USER CODE BEGIN NVMS_LL_IsBlockErased */
-
-  return false;
-  /* USER CODE END NVMS_LL_IsBlockErased */
-}
-
-/**
-  * @brief   Erases a block.
-  * @note    The erase operation is verified internally.
-  *
-  * @param   block         the block identifier
-  * @return                  The operation status.
-  * @retval false            if the operation is successful.
-  * @retval true             if the erase operation failed.
-  */
-/* Template version of the function */
-bool NVMS_LL_BlockErase(nvms_block_t block)
-{
-  /* USER CODE BEGIN NVMS_LL_BlockErase */
-
-  return true;
-  /* USER CODE END NVMS_LL_BlockErase */
-}
-
-/**
-  * @brief   Writes data.
-  * @note    The write operation is verified internally.
-  * @note    If the write operation partially writes flash pages then the
-  *          unwritten bytes are left to the filler value.
-  *
-  * @param   source        pointer to the data to be written
-  * @param   destination   pointer to the flash position
-  * @param   size          size of data
-  * @return                  The operation status.
-  * @retval false            if the operation is successful.
-  * @retval true             if the write operation failed.
-  */
-/* Template version of the function */
-bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size)
-{
-  /* USER CODE BEGIN NVMS_LL_Write */
-  return true;
-  /* USER CODE END NVMS_LL_Write */
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/readme.txt b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/readme.txt
index 069f6991..f8d24f74 100644
--- a/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/KMS/KMS_Embedded_RSA_Key/readme.txt
@@ -51,9 +51,9 @@ Cryptography, KMS, Authentication, RSA
 
 @par Directory contents 
 
-  - KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_nucleo_conf.h     BSP configuration file
-  - KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_hal_conf.h    HAL configuration file
-  - KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_it.h          Interrupt handlers header file
+  - KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_nucleo_conf.h       BSP configuration file
+  - KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_hal_conf.h          HAL configuration file
+  - KMS/KMS_Embedded_RSA_Key/Inc/stm32wlxx_it.h                Interrupt handlers header file
   - KMS/KMS_Embedded_RSA_Key/Inc/app_kms.h                     Header for app_kms.c module
   - KMS/KMS_Embedded_RSA_Key/Inc/ca_conf.h                     Cryptographic configuration file
   - KMS/KMS_Embedded_RSA_Key/Inc/ca_low_level.h                Header for ca_low_level.c module
@@ -65,16 +65,14 @@ Cryptography, KMS, Authentication, RSA
   - KMS/KMS_Embedded_RSA_Key/Inc/kms_platf_objects_interface.h KMS embedded objects interface files
   - KMS/KMS_Embedded_RSA_Key/Inc/main.h                        Header for main.c module
   - KMS/KMS_Embedded_RSA_Key/Inc/mbedtls_config.h              MBED crypto configuration file
-  - KMS/KMS_Embedded_RSA_Key/Inc/nvms_low_level.h              Header for nvms_low_level.c module
-  - KMS/KMS_Embedded_RSA_Key/Src/stm32wlxx_it.c          Interrupt handlers
-  - KMS/KMS_Embedded_RSA_Key/Src/stm32wlxx_hal_msp.c     HAL MSP module
+  - KMS/KMS_Embedded_RSA_Key/Src/stm32wlxx_it.c                Interrupt handlers
+  - KMS/KMS_Embedded_RSA_Key/Src/stm32wlxx_hal_msp.c           HAL MSP module
   - KMS/KMS_Embedded_RSA_Key/Src/app_kms.c                     KMS application
   - KMS/KMS_Embedded_RSA_Key/Src/ca_low_level.c                Cryptographic low level source file
   - KMS/KMS_Embedded_RSA_Key/Src/com.c                         Communication module file
   - KMS/KMS_Embedded_RSA_Key/Src/kms_low_level.c               KMS low level source file
   - KMS/KMS_Embedded_RSA_Key/Src/main.c                        Main program
-  - KMS/KMS_Embedded_RSA_Key/Src/nvms_low_level.c              NVMS low level source file
-  - KMS/KMS_Embedded_RSA_Key/Src/system_stm32wlxx.c      STM32WLxx system source file
+  - KMS/KMS_Embedded_RSA_Key/Src/system_stm32wlxx.c            STM32WLxx system source file
 
 
 @par Hardware and Software environment
diff --git a/Projects/NUCLEO-WL55JC/Applications/LICENSE.md b/Projects/NUCLEO-WL55JC/Applications/LICENSE.md
new file mode 100644
index 00000000..1af52330
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LICENSE.md
@@ -0,0 +1,80 @@
+SLA0044 Rev5/February 2018
+
+## Software license agreement
+
+### __ULTIMATE LIBERTY SOFTWARE LICENSE AGREEMENT__
+
+BY INSTALLING, COPYING, DOWNLOADING, ACCESSING OR OTHERWISE USING THIS SOFTWARE
+OR ANY PART THEREOF (AND THE RELATED DOCUMENTATION) FROM STMICROELECTRONICS
+INTERNATIONAL N.V, SWISS BRANCH AND/OR ITS AFFILIATED COMPANIES
+(STMICROELECTRONICS), THE RECIPIENT, ON BEHALF OF HIMSELF OR HERSELF, OR ON
+BEHALF OF ANY ENTITY BY WHICH SUCH RECIPIENT IS EMPLOYED AND/OR ENGAGED AGREES
+TO BE BOUND BY THIS SOFTWARE LICENSE AGREEMENT.
+
+Under STMicroelectronics’ intellectual property rights, the redistribution,
+reproduction and use in source and binary forms of the software or any part
+thereof, with or without modification, are permitted provided that the following
+conditions are met:
+
+1. Redistribution of source code (modified or not) must retain any copyright
+notice, this list of conditions and the disclaimer set forth below as items 10
+and 11.
+
+2. Redistributions in binary form, except as embedded into microcontroller or
+microprocessor device manufactured by or for STMicroelectronics or a software
+update for such device, must reproduce any copyright notice provided with the
+binary code, this list of conditions, and the disclaimer set forth below as
+items 10 and 11, in documentation and/or other materials provided with the
+distribution.
+
+3. Neither the name of STMicroelectronics nor the names of other contributors to
+this software may be used to endorse or promote products derived from this
+software or part thereof without specific written permission.
+
+4. This software or any part thereof, including modifications and/or derivative
+works of this software, must be used and execute solely and exclusively on or in
+combination with a microcontroller or microprocessor device manufactured by or
+for STMicroelectronics.
+
+5. No use, reproduction or redistribution of this software partially or totally
+may be done in any manner that would subject this software to any Open Source
+Terms. “Open Source Terms” shall mean any open source license which requires as
+part of distribution of software that the source code of such software is
+distributed therewith or otherwise made available, or open source license that
+substantially complies with the Open Source definition specified at
+www.opensource.org and any other comparable open source license such as for
+example GNU General Public License (GPL), Eclipse Public License (EPL), Apache
+Software License, BSD license or MIT license.
+
+6. STMicroelectronics has no obligation to provide any maintenance, support or
+updates for the software.
+
+7. The software is and will remain the exclusive property of STMicroelectronics
+and its licensors. The recipient will not take any action that jeopardizes
+STMicroelectronics and its licensors' proprietary rights or acquire any rights
+in the software, except the limited rights specified hereunder.
+
+8. The recipient shall comply with all applicable laws and regulations affecting
+the use of the software or any part thereof including any applicable export
+control law or regulation.
+
+9. Redistribution and use of this software or any part thereof other than as
+permitted under this license is void and will automatically terminate your
+rights under this license.
+
+10. THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, WHICH ARE
+DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT SHALL
+STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+11. EXCEPT AS EXPRESSLY PERMITTED HEREUNDER, NO LICENSE OR OTHER RIGHTS, WHETHER
+EXPRESS OR IMPLIED, ARE GRANTED UNDER ANY PATENT OR OTHER INTELLECTUAL PROPERTY
+RIGHTS OF STMICROELECTRONICS OR ANY THIRD PARTY.
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/.extSettings b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/board_resources.h
deleted file mode 100644
index 953761d8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/board_resources.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/main.h
index 7665e1c1..6fd91c18 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -62,23 +61,22 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
 #define LED1_Pin GPIO_PIN_15
 #define LED1_GPIO_Port GPIOB
 #define LED2_Pin GPIO_PIN_9
 #define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
 #define RF_CTRL3_Pin GPIO_PIN_3
 #define RF_CTRL3_GPIO_Port GPIOC
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
 #define RF_CTRL2_Pin GPIO_PIN_5
 #define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define RF_CTRL1_Pin GPIO_PIN_4
 #define RF_CTRL1_GPIO_Port GPIOC
 #define BUT3_Pin GPIO_PIN_6
@@ -91,8 +89,8 @@ void Error_Handler(void);
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32wlxx_hal_conf.h
index a5fe461f..f027e308 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32wlxx_nucleo_conf.h
index 0390fb82..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     10U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_app.h
index b185d933..e5077a35 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -33,6 +35,11 @@ extern "C" {
 
 /* USER CODE END Includes */
 
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -68,36 +75,30 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
 /**
   * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
-  * @param  none
   * @retval battery level
   */
 uint8_t GetBatteryLevel(void);
 
 /**
   * @brief  callback to get the current temperature in the MCU
-  * @param  none
   * @retval temperature level
   */
 uint16_t GetTemperatureLevel(void);
 
 /**
   * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
+  * @param  id unique ID
   */
 void GetUniqueId(uint8_t *id);
 
 /**
   * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
   * @retval devAddr Device Address
   */
 uint32_t GetDevAddr(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_conf.h
index 47d27319..7f902a10 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief  Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_debug.h
index bbae8f87..710e8852 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/sys_debug.h
@@ -43,89 +43,89 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/**  Definition for Debug Line 1   **/
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 /* USER CODE BEGIN EC */
 
@@ -137,39 +137,41 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
@@ -177,9 +179,20 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initializes the debug
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/usart.h
index c196d42b..29cb339e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/utilities_conf.h
index 59d28ada..3317d66e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/utilities_def.h
index fcd819ae..8b78768e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/main.c
index 1eb7044b..070513c4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -157,6 +158,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/rtc.c
index 4464f7dc..c616f129 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,10 +71,13 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/stm32wlxx_it.c
index a608058e..c5783cd8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/stm32wlxx_it.c
@@ -76,7 +76,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -187,7 +189,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/sys_app.c
index 8d6d60a8..3d9af3ae 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,9 +27,9 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -65,16 +67,10 @@
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
-  */
-static void Gpio_PreInit(void);
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -82,16 +78,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -100,13 +92,15 @@ void SystemApp_Init(void)
 
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-  /*Initialises timer and RTC*/
+
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
-  Gpio_PreInit();
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -114,6 +108,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -128,6 +123,7 @@ void SystemApp_Init(void)
 #elif !defined (LOW_POWER_DISABLE)
 #error LOW_POWER_DISABLE not defined
 #endif /* LOW_POWER_DISABLE */
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
@@ -135,8 +131,6 @@ void SystemApp_Init(void)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -160,7 +154,7 @@ uint8_t GetBatteryLevel(void)
 
   batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
 
-  /* Convert batterey level from mV to linea scale: 1 (very low) to 254 (fully charged) */
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
   if (batteryLevelmV > VDD_BAT)
   {
     batteryLevel = LORAWAN_MAX_BAT;
@@ -254,11 +248,12 @@ uint32_t GetDevAddr(void)
 
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
+
 static void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -272,45 +267,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -351,13 +307,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -372,13 +326,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -389,13 +341,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -410,4 +360,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/sys_debug.c
index 2e4c40f7..f0395f5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/sys_debug.c
@@ -41,6 +41,7 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
+
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 
@@ -58,39 +59,121 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
-  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
-  /* Enable the GPIO Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
   GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -108,44 +191,42 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
 #endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
-
-  /* USER CODE END DBG_Init_Last */
-}
-/* USER CODE BEGIN EF */
+#endif /* CORE_CM4 */
 
-/* USER CODE END EF */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-/* Private Functions Definition -----------------------------------------------*/
+  /* USER CODE END DBG_ProbesInit_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/timer_if.c
index 615131a0..66e51602 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -104,6 +104,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -153,7 +164,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -173,9 +183,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -183,18 +193,21 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
     /*overload RTC feature enable*/
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -277,64 +290,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,7 +379,7 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
@@ -383,6 +402,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -392,16 +412,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -428,24 +448,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/usart.c
index 343006bc..476eb1f2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_lpuart1_tx;
 void MX_LPUART1_UART_Init(void)
 {
 
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
-  hlpuart1.Init.BaudRate = LPUART_BAUDRATE;
+  hlpuart1.Init.BaudRate = 9600;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
   hlpuart1.Init.StopBits = UART_STOPBITS_1;
   hlpuart1.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_LPUART1_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/usart_if.c
index cfa581cd..36217a2f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&hlpuart1);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/LoRaWAN_AT_Slave.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/LoRaWAN_AT_Slave.ewd
index bb229a58..0bd50570 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/LoRaWAN_AT_Slave.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/LoRaWAN_AT_Slave.ewd
@@ -40,11 +40,11 @@
                 </option>
                 <option>
                     <name>MemOverride</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\config\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/LoRaWAN_AT_Slave.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/LoRaWAN_AT_Slave.ewp
index e3c27069..718709c9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/LoRaWAN_AT_Slave.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/LoRaWAN_AT_Slave.ewp
@@ -16,15 +16,15 @@
                 <debug>1</debug>
                 <option>
                     <name>ExePath</name>
-                    <state>LoRaWAN_AT_Slave\Exe</state>
+                    <state>LoRaWAN_AT_Slave/Exe</state>
                 </option>
                 <option>
                     <name>ObjPath</name>
-                    <state>LoRaWAN_AT_Slave\Obj</state>
+                    <state>LoRaWAN_AT_Slave/Obj</state>
                 </option>
                 <option>
                     <name>ListPath</name>
-                    <state>LoRaWAN_AT_Slave\List</state>
+                    <state>LoRaWAN_AT_Slave/List</state>
                 </option>
                 <option>
                     <name>GEndianMode</name>
@@ -32,11 +32,11 @@
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
                 </option>
                 <option>
                     <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
                 </option>
                 <option>
                     <name>GOutputBinary</name>
@@ -108,7 +108,7 @@
                 <option>
                     <name>GeneralMisraRules04</name>
                     <version>0</version>
-                    <state>011111111111111110111111111111111111111111111010110100111111111111110111111111111111111111111111111111110111111011111111111111111111111111111</state>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
                 </option>
                 <option>
                     <name>RTConfigPath2</name>
@@ -218,10 +218,15 @@
                 <version>34</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>CCDefines</name>
-                    <state>STM32WL55xx</state>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
                 </option>
                 <option>
                     <name>CCPreprocFile</name>
@@ -350,22 +355,23 @@
                     <state>$PROJ_DIR$/../LoRaWAN/App</state>
                     <state>$PROJ_DIR$/../LoRaWAN/Target</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -428,11 +434,11 @@
                 </option>
                 <option>
                     <name>IccStaticDestr</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCppInlineSemantics</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCmsis</name>
@@ -442,10 +448,6 @@
                     <name>IccFloatSemantics</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCNoLiteralPool</name>
                     <state>0</state>
@@ -784,7 +786,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1050,75 +1052,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>App</name>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\app_lorawan.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\lora_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\lora_at.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\lora_command.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\lora_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\test_rf.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1126,10 +1059,82 @@
             </file>
         </group>
         <group>
-            <name>Target</name>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\Target\radio_board_if.c</name>
-            </file>
+            <name>User</name>
+            <group>
+                <name>Core</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
+                </file>
+            </group>
+            <group>
+                <name>LoRaWAN</name>
+                <group>
+                    <name>App</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\app_lorawan.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\lora_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\lora_at.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\lora_command.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\lora_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\test_rf.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Target</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\Target\radio_board_if.c</name>
+                    </file>
+                </group>
+            </group>
         </group>
     </group>
     <group>
@@ -1142,9 +1147,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_AT_Slave</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1214,114 +1216,111 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
+            </file>
         </group>
     </group>
     <group>
         <name>Middlewares</name>
         <group>
             <name>LoRaWAN</name>
-            <group>
-                <name>Crypto</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
-                </file>
-            </group>
-            <group>
-                <name>LmHandler</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmCtxMgmt.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Mac</name>
-                <group>
-                    <name>Region</name>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
-                    </file>
-                </group>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Utilities</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
-                </file>
-            </group>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
+            </file>
         </group>
         <group>
             <name>SubGHz_Phy</name>
@@ -1331,6 +1330,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/Commissioning.h
index bb1c4293..f827d8ed 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/Commissioning.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/Commissioning.h
@@ -26,21 +26,19 @@
   * @brief   End-device commissioning parameters
   ******************************************************************************
  */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __COMMISSIONING_H__
 #define __COMMISSIONING_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 /*!
  ******************************************************************************
  ********************************** WARNING ***********************************
  ******************************************************************************
 
- The LoRaWAN AES128 keys are stored and provisionned on secure-elements.
+ The LoRaWAN AES128 keys are stored and provisioned on secure-elements.
 
- This project providdes a software emulated secure-element.
+ This project provides a software emulated secure-element.
  The LoRaWAN AES128 keys SHALL be updated under
  src/peripherals/<secure-element name>-se\se-identity.h file.
 
@@ -81,8 +79,4 @@ extern "C" {
 
 /* USER CODE END EC2 */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.c
index ba6f23a9..f7038db8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_lorawan.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.h
index 2c49b393..fbe16b6d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_LORAWAN_H__
 #define __APP_LORAWAN_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported Functions Prototypes------------------------------------------------------- */
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Init(void);
 
 /**
   * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.c
index d89da022..32705b18 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -58,46 +60,22 @@
 /* USER CODE END PM */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  LED Tx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnTxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Rx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnRxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Join timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnJoinTimerLedEvent(void *context);
-
 /**
   * @brief  join event callback function
-  * @param  params
-  * @retval none
+  * @param  joinParams status of join
   */
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
 
 /**
   * @brief  tx event callback function
-  * @param  params
-  * @retval none
+  * @param  params status of last Tx
   */
 static void OnTxData(LmHandlerTxParams_t *params);
 
 /**
-  * @brief callback when LoRa endNode has received a frame
-  * @param appData
-  * @param params
-  * @retval None
+  * @brief callback when LoRa application has received a frame
+  * @param appData data received in the last Rx
+  * @param params status of last Rx
   */
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
@@ -109,13 +87,29 @@ static void OnMacProcessNotify(void);
 
 /**
   * @brief  call back when LoRaWan Stack needs update
-  * @param  none
-  * @retval none
   */
 static void CmdProcessNotify(void);
 
 /* USER CODE BEGIN PFP */
 
+/**
+  * @brief  LED Tx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnTxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Rx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnRxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Join timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnJoinTimerLedEvent(void *context);
+
 /* USER CODE END PFP */
 
 /* Private variables ---------------------------------------------------------*/
@@ -126,6 +120,8 @@ static LmHandlerCallbacks_t LmHandlerCallbacks =
 {
   .GetBatteryLevel =           GetBatteryLevel,
   .GetTemperature =            GetTemperatureLevel,
+  .GetUniqueId =               GetUniqueId,
+  .GetDevAddr =                GetDevAddr,
   .OnMacProcess =              OnMacProcessNotify,
   .OnJoinRequest =             OnJoinRequest,
   .OnTxData =                  OnTxData,
@@ -144,6 +140,7 @@ static LmHandlerParams_t LmHandlerParams =
   .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
 };
 
+/* USER CODE BEGIN PV */
 /**
   * @brief Timer to handle the application Tx Led to toggle
   */
@@ -159,8 +156,6 @@ static UTIL_TIMER_Object_t RxLedTimer;
   */
 static UTIL_TIMER_Object_t JoinLedTimer;
 
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Exported functions ---------------------------------------------------------*/
@@ -170,24 +165,14 @@ static UTIL_TIMER_Object_t JoinLedTimer;
 
 void LoRaWAN_Init(void)
 {
+  CMD_Init(CmdProcessNotify);
+
   /* USER CODE BEGIN LoRaWAN_Init_1 */
 
-  /* USER CODE END LoRaWAN_Init_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Init(LED_BLUE);
   BSP_LED_Init(LED_GREEN);
   BSP_LED_Init(LED_RED);
   BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-  SYS_LED_Init(SYS_LED_RED);
-  SYS_PB_Init(SYS_BUTTON2, SYS_BUTTON_MODE_EXTI);
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-
-  CMD_Init(CmdProcessNotify);
 
   /* Get LoRa APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION:        V%X.%X.%X\r\n",
@@ -214,6 +199,8 @@ void LoRaWAN_Init(void)
   UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
   UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
 
+  /* USER CODE END LoRaWAN_Init_1 */
+
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_LmHandlerProcess), UTIL_SEQ_RFU, LmHandlerProcess);
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_Vcom), UTIL_SEQ_RFU, CMD_Process);
 
@@ -225,15 +212,19 @@ void LoRaWAN_Init(void)
 
   LmHandlerConfigure(&LmHandlerParams);
 
+  /* USER CODE BEGIN LoRaWAN_Init_Last */
   UTIL_TIMER_Start(&JoinLedTimer);
 
   APP_PPRINTF("ATtention command interface\r\n");
   APP_PPRINTF("AT? to list all available functions\r\n");
-  /* USER CODE BEGIN LoRaWAN_Init_Last */
 
   /* USER CODE END LoRaWAN_Init_Last */
 }
 
+/* USER CODE BEGIN PB_Callbacks */
+
+/* USER CODE END PB_Callbacks */
+
 /* Private functions ---------------------------------------------------------*/
 /* USER CODE BEGIN PrFD */
 
@@ -242,115 +233,65 @@ void LoRaWAN_Init(void)
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
 {
   /* USER CODE BEGIN OnRxData_1 */
-
-  /* USER CODE END OnRxData_1 */
-  if ((appData != NULL) && (params != NULL))
+  if ((appData != NULL) || (params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
     BSP_LED_On(LED_BLUE) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
+
     UTIL_TIMER_Start(&RxLedTimer);
 
     AT_event_receive(appData, params);
   }
-
-  /* USER CODE BEGIN OnRxData_2 */
-
-  /* USER CODE END OnRxData_2 */
+  /* USER CODE END OnRxData_1 */
 }
 
+/* USER CODE BEGIN PrFD_LedEvents */
 static void OnTxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnTxTimerLedEvent_1 */
-
-  /* USER CODE END OnTxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_GREEN) ;
-#else
-  SYS_LED_Off(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnTxTimerLedEvent_2 */
-
-  /* USER CODE END OnTxTimerLedEvent_2 */
 }
 
 static void OnRxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnRxTimerLedEvent_1 */
-
-  /* USER CODE END OnRxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_BLUE) ;
-#else
-  SYS_LED_Off(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnRxTimerLedEvent_2 */
-
-  /* USER CODE END OnRxTimerLedEvent_2 */
 }
 
 static void OnJoinTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnJoinTimerLedEvent_1 */
-
-  /* USER CODE END OnJoinTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Toggle(LED_RED) ;
-#else
-  SYS_LED_Toggle(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnJoinTimerLedEvent_2 */
-
-  /* USER CODE END OnJoinTimerLedEvent_2 */
 }
 
+/* USER CODE END PrFD_LedEvents */
+
 static void OnTxData(LmHandlerTxParams_t *params)
 {
   /* USER CODE BEGIN OnTxData_1 */
-
-  /* USER CODE END OnTxData_1 */
-  if ((params != NULL) && (params->IsMcpsConfirm != 0))
+  if ((params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_GREEN) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-    UTIL_TIMER_Start(&TxLedTimer);
+    /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
+    if (params->IsMcpsConfirm != 0)
+    {
+      BSP_LED_On(LED_GREEN) ;
+      UTIL_TIMER_Start(&TxLedTimer);
+    }
+    AT_event_confirm(params);
   }
-  AT_event_confirm(params);
-
-  /* USER CODE BEGIN OnTxData_2 */
-
-  /* USER CODE END OnTxData_2 */
+  /* USER CODE END OnTxData_1 */
 }
 
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
 {
   /* USER CODE BEGIN OnJoinRequest_1 */
-
-  /* USER CODE END OnJoinRequest_1 */
   if (joinParams != NULL)
   {
     if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
     {
       UTIL_TIMER_Stop(&JoinLedTimer);
-
-#if defined(USE_BSP_DRIVER)
       BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-      SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
 
     }
+    AT_event_join(joinParams);
   }
-  AT_event_join(joinParams);
-
-  /* USER CODE BEGIN OnJoinRequest_2 */
-
-  /* USER CODE END OnJoinRequest_2 */
+  /* USER CODE END OnJoinRequest_1 */
 }
 
 static void CmdProcessNotify(void)
@@ -370,6 +311,7 @@ static void OnMacProcessNotify(void)
 
   /* USER CODE END OnMacProcessNotify_1 */
   UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LmHandlerProcess), CFG_SEQ_Prio_0);
+
   /* USER CODE BEGIN OnMacProcessNotify_2 */
 
   /* USER CODE END OnMacProcessNotify_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.h
index 9a3997ad..55f3793e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_APP_H__
@@ -77,8 +79,6 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void LoRaWAN_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app_version.h
index 0428551f..2de4d3bf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.c
index 01df3534..c683521c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_at.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -83,47 +85,81 @@ static UTIL_TIMER_Object_t TxCertifTimer;
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief  Get 4 bytes values in hexa
-  * @param  The string containing the 16 bytes, something like ab:cd:01:21
-  * @param  The buffer that will contain the bytes read
+  * @brief  Get 4 bytes values in hex
+  * @param  from string containing the 16 bytes, something like ab:cd:01:21
+  * @param  value buffer that will contain the bytes read
   * @retval The number of bytes read
   */
 static int32_t sscanf_uint32_as_hhx(const char *from, uint32_t *value);
 
+/**
+  * @brief  Get 16 bytes values in hex
+  * @param  from string containing the 16 bytes, something like ab:cd:01:...
+  * @param  pt buffer that will contain the bytes read
+  * @retval The number of bytes read
+  */
+static int sscanf_16_hhx(const char *from, uint8_t *pt);
+
 /**
   * @brief  Print 4 bytes as %02x
-  * @param  the value containing the 4 bytes to print
-  * @retval None
+  * @param  value containing the 4 bytes to print
   */
 static void print_uint32_as_02x(uint32_t value);
 
 /**
-  * @brief  Print 8 bytes as %02x
-  * @param  the pointer containing the 8 bytes to print
-  * @retval None
+  * @brief  Print 16 bytes as %02X
+  * @param  pt pointer containing the 16 bytes to print
+  */
+static void print_16_02x(uint8_t *pt);
+
+/**
+  * @brief  Print 8 bytes as %02X
+  * @param  pt pointer containing the 8 bytes to print
   */
 static void print_8_02x(uint8_t *pt);
 
 /**
   * @brief  Print an int
-  * @param  the value to print
-  * @retval None
+  * @param  value to print
   */
 static void print_d(int32_t value);
 
 /**
   * @brief  Print an unsigned int
-  * @param  the value to print
-  * @retval None
+  * @param  value to print
   */
 static void print_u(uint32_t value);
 
+/**
+  * @brief  Certif Rejoin timer callback function
+  * @param  context ptr of Certif Rejoin context
+  */
 static void OnCertifTimer(void *context);
 
+/**
+  * @brief  Certif send function
+  */
 static void CertifSend(void);
 
+/**
+  * @brief  Check if character in parameter is alphanumeric
+  * @param  Char for the alphanumeric check
+  */
 static int32_t isHex(char Char);
 
+/**
+  * @brief  Converts hex string to a nibble ( 0x0X )
+  * @param  Char hex string
+  * @retval the nibble. Returns 0xF0 in case input was not an hex string (a..f; A..F or 0..9)
+  */
+static uint8_t Char2Nibble(char Char);
+
+/**
+  * @brief  Convert a string into a buffer of data
+  * @param  str string to convert
+  * @param  data output buffer
+  * @param  Size of input string
+  */
 static int32_t stringToData(const char *str, uint8_t *data, uint32_t Size);
 
 /* USER CODE BEGIN PFP */
@@ -131,6 +167,17 @@ static int32_t stringToData(const char *str, uint8_t *data, uint32_t Size);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
+ATEerror_t AT_return_ok(const char *param)
+{
+  return AT_OK;
+}
+
+ATEerror_t AT_return_error(const char *param)
+{
+  return AT_ERROR;
+}
+
+/* --------------- Application events --------------- */
 void AT_event_join(LmHandlerJoinParams_t *params)
 {
   /* USER CODE BEGIN AT_event_join_1 */
@@ -169,19 +216,30 @@ void AT_event_receive(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
       ReceivedDataSize = appData->BufferSize;
     }
 
-    /*aynchronous notification to the host*/
-    AT_PRINTF("+EVT:%d:%02x:", appData->Port, ReceivedDataSize);
+    /*asynchronous notification to the host*/
+    AT_PRINTF("+EVT:%d:%02X:", appData->Port, ReceivedDataSize);
 
     for (uint8_t i = 0; i < ReceivedDataSize; i++)
     {
       AT_PRINTF("%02x", appData->Buffer[i]);
     }
     AT_PRINTF("\r\n");
-    if (params != NULL)
+  }
+
+  if (params != NULL)
+  {
+    if (params->LinkCheck == true)
+    {
+      AT_PRINTF("+EVT:RX_%s, DR %d, RSSI %d, SNR %d, DMODM %d, GWN %d\r\n", slotStrings[params->RxSlot], params->Datarate,
+                params->Rssi, params->Snr, params->DemodMargin, params->NbGateways);
+    }
+    else
     {
-      AT_PRINTF("+EVT:RX_%s, DR %d, RSSI %d, SNR %d\r\n", slotStrings[params->RxSlot], params->Datarate, params->Rssi, params->Snr);
+      AT_PRINTF("+EVT:RX_%s, DR %d, RSSI %d, SNR %d\r\n", slotStrings[params->RxSlot], params->Datarate, params->Rssi,
+                params->Snr);
     }
   }
+
   /* USER CODE BEGIN AT_event_receive_2 */
 
   /* USER CODE END AT_event_receive_2 */
@@ -201,16 +259,7 @@ void AT_event_confirm(LmHandlerTxParams_t *params)
   /* USER CODE END AT_event_confirm_2 */
 }
 
-ATEerror_t AT_return_ok(const char *param)
-{
-  return AT_OK;
-}
-
-ATEerror_t AT_return_error(const char *param)
-{
-  return AT_ERROR;
-}
-
+/* --------------- General commands --------------- */
 ATEerror_t AT_reset(const char *param)
 {
   /* USER CODE BEGIN AT_reset_1 */
@@ -222,98 +271,70 @@ ATEerror_t AT_reset(const char *param)
   /* USER CODE END AT_reset_2 */
 }
 
-ATEerror_t AT_Region_get(const char *param)
+ATEerror_t AT_verbose_get(const char *param)
 {
-  /* USER CODE BEGIN AT_Region_get_1 */
-
-  /* USER CODE END AT_Region_get_1 */
-  const char *regionStrings[] = { "AS923", "AU915", "CN470", "CN779", "EU433", "EU868", "KR920", "IN865", "US915", "RU864" };
-  LoRaMacRegion_t region;
-  if (LmHandlerGetActiveRegion(&region) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return AT_PARAM_ERROR;
-  }
-
-  if (region > LORAMAC_REGION_RU864)
-  {
-    return AT_PARAM_ERROR;
-  }
+  /* USER CODE BEGIN AT_verbose_get_1 */
 
-  AT_PRINTF("%d:%s\r\n", region, regionStrings[region]);
+  /* USER CODE END AT_verbose_get_1 */
+  print_u(UTIL_ADV_TRACE_GetVerboseLevel());
   return AT_OK;
-  /* USER CODE BEGIN AT_Region_get_2 */
+  /* USER CODE BEGIN AT_verbose_get_2 */
 
-  /* USER CODE END AT_Region_get_2 */
+  /* USER CODE END AT_verbose_get_2 */
 }
 
-ATEerror_t AT_Region_set(const char *param)
+ATEerror_t AT_verbose_set(const char *param)
 {
-  /* USER CODE BEGIN AT_Region_set_1 */
+  /* USER CODE BEGIN AT_verbose_set_1 */
 
-  /* USER CODE END AT_Region_set_1 */
-  LoRaMacRegion_t region;
-  if (tiny_sscanf(param, "%hhu", &region) != 1)
+  /* USER CODE END AT_verbose_set_1 */
+  const char *buf = param;
+  int32_t lvl_nb;
+
+  /* read and set the verbose level */
+  if (1 != tiny_sscanf(buf, "%u", &lvl_nb))
   {
+    AT_PRINTF("AT+VL: verbose level is not well set\r\n");
     return AT_PARAM_ERROR;
   }
-  if (region > LORAMAC_REGION_RU864)
+  if ((lvl_nb > VLEVEL_H) || (lvl_nb < VLEVEL_OFF))
   {
+    AT_PRINTF("AT+VL: verbose level out of range => 0(VLEVEL_OFF) to 3(VLEVEL_H)\r\n");
     return AT_PARAM_ERROR;
   }
 
-  if (LmHandlerSetActiveRegion(region) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return AT_PARAM_ERROR;
-  }
+  UTIL_ADV_TRACE_SetVerboseLevel(lvl_nb);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_Region_set_2 */
+  /* USER CODE BEGIN AT_verbose_set_2 */
 
-  /* USER CODE END AT_Region_set_2 */
+  /* USER CODE END AT_verbose_set_2 */
 }
 
-ATEerror_t AT_DevEUI_get(const char *param)
+ATEerror_t AT_LocalTime_get(const char *param)
 {
-  /* USER CODE BEGIN AT_DevEUI_get_1 */
-
-  /* USER CODE END AT_DevEUI_get_1 */
-  uint8_t devEUI[8];
-  if (LmHandlerGetDevEUI(devEUI) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return AT_PARAM_ERROR;
-  }
-
-  print_8_02x(devEUI);
-  return AT_OK;
-  /* USER CODE BEGIN AT_DevEUI_get_2 */
+  /* USER CODE BEGIN AT_LocalTime_get_1 */
 
-  /* USER CODE END AT_DevEUI_get_2 */
-}
+  /* USER CODE END AT_LocalTime_get_1 */
+  struct tm localtime;
+  SysTime_t UnixEpoch = SysTimeGet();
+  UnixEpoch.Seconds -= 18; /*removing leap seconds*/
 
-ATEerror_t AT_DevEUI_set(const char *param)
-{
-  /* USER CODE BEGIN AT_DevEUI_set_1 */
+  UnixEpoch.Seconds += 3600 * 2; /*adding 2 hours*/
 
-  /* USER CODE END AT_DevEUI_set_1 */
-  uint8_t devEui[8];
-  if (tiny_sscanf(param, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-                  &devEui[0], &devEui[1], &devEui[2], &devEui[3],
-                  &devEui[4], &devEui[5], &devEui[6], &devEui[7]) != 8)
-  {
-    return AT_PARAM_ERROR;
-  }
+  SysTimeLocalTime(UnixEpoch.Seconds,  & localtime);
 
-  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetDevEUI(devEui))
-  {
-    return AT_ERROR;
-  }
+  AT_PRINTF("LTIME:%02dh%02dm%02ds on %02d/%02d/%04d\r\n",
+            localtime.tm_hour, localtime.tm_min, localtime.tm_sec,
+            localtime.tm_mday, localtime.tm_mon + 1, localtime.tm_year + 1900);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_DevEUI_set_2 */
+  /* USER CODE BEGIN AT_LocalTime_get_2 */
 
-  /* USER CODE END AT_DevEUI_set_2 */
+  /* USER CODE END AT_LocalTime_get_2 */
 }
 
+/* --------------- Keys, IDs and EUIs management commands --------------- */
 ATEerror_t AT_JoinEUI_get(const char *param)
 {
   /* USER CODE BEGIN AT_JoinEUI_get_1 */
@@ -356,483 +377,615 @@ ATEerror_t AT_JoinEUI_set(const char *param)
   /* USER CODE END AT_JoinEUI_set_2 */
 }
 
-ATEerror_t AT_DevAddr_get(const char *param)
+ATEerror_t AT_NwkKey_get(const char *param)
 {
-  /* USER CODE BEGIN AT_DevAddr_get_1 */
+  /* USER CODE BEGIN AT_NwkKey_get_1 */
 
-  /* USER CODE END AT_DevAddr_get_1 */
-  uint32_t devAddr;
-  if (LmHandlerGetDevAddr(&devAddr) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_NwkKey_get_1 */
+  uint8_t nwkKey[16];
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerGetNwkKey(nwkKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
+  print_16_02x(nwkKey);
 
-  print_uint32_as_02x(devAddr);
   return AT_OK;
-  /* USER CODE BEGIN AT_DevAddr_get_2 */
+  /* USER CODE BEGIN AT_NwkKey_get_2 */
 
-  /* USER CODE END AT_DevAddr_get_2 */
+  /* USER CODE END AT_NwkKey_get_2 */
 }
 
-ATEerror_t AT_DevAddr_set(const char *param)
+ATEerror_t AT_NwkKey_set(const char *param)
 {
-  /* USER CODE BEGIN AT_DevAddr_set_1 */
+  /* USER CODE BEGIN AT_NwkKey_set_1 */
 
-  /* USER CODE END AT_DevAddr_set_1 */
-  uint32_t devAddr;
-  if (sscanf_uint32_as_hhx(param, &devAddr) != 4)
+  /* USER CODE END AT_NwkKey_set_1 */
+  uint8_t nwkKey[16];
+  if (sscanf_16_hhx(param, nwkKey) != 16)
   {
     return AT_PARAM_ERROR;
   }
 
-  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetDevAddr(devAddr))
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetNwkKey(nwkKey))
   {
     return AT_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_DevAddr_set_2 */
+  /* USER CODE BEGIN AT_NwkKey_set_2 */
 
-  /* USER CODE END AT_DevAddr_set_2 */
+  /* USER CODE END AT_NwkKey_set_2 */
 }
 
-ATEerror_t AT_ADR_get(const char *param)
+ATEerror_t AT_AppKey_get(const char *param)
 {
-  /* USER CODE BEGIN AT_ADR_get_1 */
+  /* USER CODE BEGIN AT_AppKey_get_1 */
 
-  /* USER CODE END AT_ADR_get_1 */
-  bool adrEnable;
-  if (LmHandlerGetAdrEnable(&adrEnable) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_AppKey_get_1 */
+  uint8_t appKey[16];
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerGetAppKey(appKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
+  print_16_02x(appKey);
 
-  print_d(adrEnable);
   return AT_OK;
-  /* USER CODE BEGIN AT_ADR_get_2 */
+  /* USER CODE BEGIN AT_AppKey_get_2 */
 
-  /* USER CODE END AT_ADR_get_2 */
+  /* USER CODE END AT_AppKey_get_2 */
 }
 
-ATEerror_t AT_ADR_set(const char *param)
+ATEerror_t AT_AppKey_set(const char *param)
 {
-  /* USER CODE BEGIN AT_ADR_set_1 */
+  /* USER CODE BEGIN AT_AppKey_set_1 */
 
-  /* USER CODE END AT_ADR_set_1 */
-  switch (param[0])
+  /* USER CODE END AT_AppKey_set_1 */
+  uint8_t appKey[16];
+  if (sscanf_16_hhx(param, appKey) != 16)
   {
-    case '0':
-    case '1':
-      LmHandlerSetAdrEnable(param[0] - '0');
-      break;
-    default:
-      return AT_PARAM_ERROR;
+    return AT_PARAM_ERROR;
+  }
+
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetAppKey(appKey))
+  {
+    return AT_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_ADR_set_2 */
+  /* USER CODE BEGIN AT_AppKey_set_2 */
 
-  /* USER CODE END AT_ADR_set_2 */
+  /* USER CODE END AT_AppKey_set_2 */
 }
 
-ATEerror_t AT_TransmitPower_get(const char *param)
+ATEerror_t AT_NwkSKey_get(const char *param)
 {
-  /* USER CODE BEGIN AT_TransmitPower_get_1 */
+  /* USER CODE BEGIN AT_NwkSKey_get_1 */
 
-  /* USER CODE END AT_TransmitPower_get_1 */
-  int8_t txPower;
-  if (LmHandlerGetTxPower(&txPower) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_NwkSKey_get_1 */
+  uint8_t nwkSKey[16];
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerGetNwkSKey(nwkSKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
+  print_16_02x(nwkSKey);
 
-  print_d(txPower);
   return AT_OK;
-  /* USER CODE BEGIN AT_TransmitPower_get_2 */
+  /* USER CODE BEGIN AT_NwkSKey_get_2 */
 
-  /* USER CODE END AT_TransmitPower_get_2 */
+  /* USER CODE END AT_NwkSKey_get_2 */
 }
 
-ATEerror_t AT_TransmitPower_set(const char *param)
+ATEerror_t AT_NwkSKey_set(const char *param)
 {
-  /* USER CODE BEGIN AT_TransmitPower_set_1 */
+  /* USER CODE BEGIN AT_NwkSKey_set_1 */
 
-  /* USER CODE END AT_TransmitPower_set_1 */
-  int8_t txPower;
-  if (tiny_sscanf(param, "%hhu", &txPower) != 1)
+  /* USER CODE END AT_NwkSKey_set_1 */
+  uint8_t nwkSKey[16];
+  if (sscanf_16_hhx(param, nwkSKey) != 16)
   {
     return AT_PARAM_ERROR;
   }
 
-  if (LmHandlerSetTxPower(txPower) != LORAMAC_HANDLER_SUCCESS)
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetNwkSKey(nwkSKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_TransmitPower_set_2 */
+  /* USER CODE BEGIN AT_NwkSKey_set_2 */
 
-  /* USER CODE END AT_TransmitPower_set_2 */
+  /* USER CODE END AT_NwkSKey_set_2 */
 }
 
-ATEerror_t AT_DataRate_get(const char *param)
+ATEerror_t AT_AppSKey_get(const char *param)
 {
-  /* USER CODE BEGIN AT_DataRate_get_1 */
+  /* USER CODE BEGIN AT_AppSKey_get_1 */
 
-  /* USER CODE END AT_DataRate_get_1 */
-  int8_t txDatarate;
-  if (LmHandlerGetTxDatarate(&txDatarate) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_AppSKey_get_1 */
+  uint8_t appSKey[16];
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerGetAppSKey(appSKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
+  print_16_02x(appSKey);
 
-  print_d(txDatarate);
   return AT_OK;
-  /* USER CODE BEGIN AT_DataRate_get_2 */
+  /* USER CODE BEGIN AT_AppSKey_get_2 */
 
-  /* USER CODE END AT_DataRate_get_2 */
+  /* USER CODE END AT_AppSKey_get_2 */
 }
 
-ATEerror_t AT_DataRate_set(const char *param)
+ATEerror_t AT_AppSKey_set(const char *param)
 {
-  /* USER CODE BEGIN AT_DataRate_set_1 */
-
-  /* USER CODE END AT_DataRate_set_1 */
-  int8_t datarate;
+  /* USER CODE BEGIN AT_AppSKey_set_1 */
 
-  if (tiny_sscanf(param, "%hhu", &datarate) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  if ((datarate < 0) || (datarate > 15))
+  /* USER CODE END AT_AppSKey_set_1 */
+  uint8_t appSKey[16];
+  if (sscanf_16_hhx(param, appSKey) != 16)
   {
     return AT_PARAM_ERROR;
   }
 
-  if (LmHandlerSetTxDatarate(datarate) != LORAMAC_HANDLER_SUCCESS)
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetAppSKey(appSKey))
   {
     return AT_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_DataRate_set_2 */
+  /* USER CODE BEGIN AT_AppSKey_set_2 */
 
-  /* USER CODE END AT_DataRate_set_2 */
+  /* USER CODE END AT_AppSKey_set_2 */
 }
 
-ATEerror_t AT_DutyCycle_get(const char *param)
+ATEerror_t AT_DevAddr_get(const char *param)
 {
-  /* USER CODE BEGIN AT_DutyCycle_get_1 */
+  /* USER CODE BEGIN AT_DevAddr_get_1 */
 
-  /* USER CODE END AT_DutyCycle_get_1 */
-  bool dutyCycleEnable;
-  if (LmHandlerGetDutyCycleEnable(&dutyCycleEnable) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DevAddr_get_1 */
+  uint32_t devAddr;
+  if (LmHandlerGetDevAddr(&devAddr) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_d(dutyCycleEnable);
+  print_uint32_as_02x(devAddr);
   return AT_OK;
-  /* USER CODE BEGIN AT_DutyCycle_get_2 */
+  /* USER CODE BEGIN AT_DevAddr_get_2 */
 
-  /* USER CODE END AT_DutyCycle_get_2 */
+  /* USER CODE END AT_DevAddr_get_2 */
 }
 
-ATEerror_t AT_DutyCycle_set(const char *param)
+ATEerror_t AT_DevAddr_set(const char *param)
 {
-  /* USER CODE BEGIN AT_DutyCycle_set_1 */
+  /* USER CODE BEGIN AT_DevAddr_set_1 */
 
-  /* USER CODE END AT_DutyCycle_set_1 */
-  switch (param[0])
+  /* USER CODE END AT_DevAddr_set_1 */
+  uint32_t devAddr;
+  if (sscanf_uint32_as_hhx(param, &devAddr) != 4)
   {
-    case '0':
-    case '1':
-      LmHandlerSetDutyCycleEnable(param[0] - '0');
-      break;
-    default:
-      return AT_PARAM_ERROR;
+    return AT_PARAM_ERROR;
   }
 
-  return AT_OK;
-  /* USER CODE BEGIN AT_DutyCycle_set_2 */
-
-  /* USER CODE END AT_DutyCycle_set_2 */
-}
-
-ATEerror_t AT_Rx2Frequency_get(const char *param)
-{
-  /* USER CODE BEGIN AT_Rx2Frequency_get_1 */
-
-  /* USER CODE END AT_Rx2Frequency_get_1 */
-  RxChannelParams_t rx2Params;
-  LmHandlerGetRX2Params(&rx2Params);
-  print_d(rx2Params.Frequency);
-  return AT_OK;
-  /* USER CODE BEGIN AT_Rx2Frequency_get_2 */
-
-  /* USER CODE END AT_Rx2Frequency_get_2 */
-}
-
-ATEerror_t AT_Rx2DataRate_get(const char *param)
-{
-  /* USER CODE BEGIN AT_Rx2DataRate_get_1 */
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetDevAddr(devAddr))
+  {
+    return AT_ERROR;
+  }
 
-  /* USER CODE END AT_Rx2DataRate_get_1 */
-  RxChannelParams_t rx2Params;
-  LmHandlerGetRX2Params(&rx2Params);
-  print_d(rx2Params.Datarate);
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx2DataRate_get_2 */
+  /* USER CODE BEGIN AT_DevAddr_set_2 */
 
-  /* USER CODE END AT_Rx2DataRate_get_2 */
+  /* USER CODE END AT_DevAddr_set_2 */
 }
 
-ATEerror_t AT_Rx1Delay_get(const char *param)
+ATEerror_t AT_DevEUI_get(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx1Delay_get_1 */
+  /* USER CODE BEGIN AT_DevEUI_get_1 */
 
-  /* USER CODE END AT_Rx1Delay_get_1 */
-  uint32_t rxDelay;
-  if (LmHandlerGetRx1Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DevEUI_get_1 */
+  uint8_t devEUI[8];
+  if (LmHandlerGetDevEUI(devEUI) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_u(rxDelay);
+  print_8_02x(devEUI);
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx1Delay_get_2 */
+  /* USER CODE BEGIN AT_DevEUI_get_2 */
 
-  /* USER CODE END AT_Rx1Delay_get_2 */
+  /* USER CODE END AT_DevEUI_get_2 */
 }
 
-ATEerror_t AT_Rx2Delay_get(const char *param)
+ATEerror_t AT_DevEUI_set(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx2Delay_get_1 */
+  /* USER CODE BEGIN AT_DevEUI_set_1 */
 
-  /* USER CODE END AT_Rx2Delay_get_1 */
-  uint32_t rxDelay;
-  if (LmHandlerGetRx2Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DevEUI_set_1 */
+  uint8_t devEui[8];
+  if (tiny_sscanf(param, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+                  &devEui[0], &devEui[1], &devEui[2], &devEui[3],
+                  &devEui[4], &devEui[5], &devEui[6], &devEui[7]) != 8)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_u(rxDelay);
-  return AT_OK;
-  /* USER CODE BEGIN AT_Rx2Delay_get_2 */
-
-  /* USER CODE END AT_Rx2Delay_get_2 */
-}
-
-ATEerror_t AT_JoinAcceptDelay1_get(const char *param)
-{
-  /* USER CODE BEGIN AT_JoinAcceptDelay1_get_1 */
-
-  /* USER CODE END AT_JoinAcceptDelay1_get_1 */
-  uint32_t rxDelay;
-  if (LmHandlerGetJoinRx1Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetDevEUI(devEui))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
 
-  print_u(rxDelay);
   return AT_OK;
-  /* USER CODE BEGIN AT_JoinAcceptDelay1_get_2 */
+  /* USER CODE BEGIN AT_DevEUI_set_2 */
 
-  /* USER CODE END AT_JoinAcceptDelay1_get_2 */
+  /* USER CODE END AT_DevEUI_set_2 */
 }
 
-ATEerror_t AT_JoinAcceptDelay2_get(const char *param)
+ATEerror_t AT_NetworkID_get(const char *param)
 {
-  /* USER CODE BEGIN AT_JoinAcceptDelay2_get_1 */
+  /* USER CODE BEGIN AT_NetworkID_get_1 */
 
-  /* USER CODE END AT_JoinAcceptDelay2_get_1 */
-  uint32_t rxDelay;
-  if (LmHandlerGetJoinRx2Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_NetworkID_get_1 */
+  uint32_t networkId;
+  if (LmHandlerGetNetworkID(&networkId) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_u(rxDelay);
+  print_d(networkId);
   return AT_OK;
-  /* USER CODE BEGIN AT_JoinAcceptDelay2_get_2 */
+  /* USER CODE BEGIN AT_NetworkID_get_2 */
 
-  /* USER CODE END AT_JoinAcceptDelay2_get_2 */
+  /* USER CODE END AT_NetworkID_get_2 */
 }
 
-ATEerror_t AT_Rx2Frequency_set(const char *param)
+ATEerror_t AT_NetworkID_set(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx2Frequency_set_1 */
-
-  /* USER CODE END AT_Rx2Frequency_set_1 */
-  RxChannelParams_t rx2Params;
-
-  /* Get the current configuration of RX2 */
-  LmHandlerGetRX2Params(&rx2Params);
+  /* USER CODE BEGIN AT_NetworkID_set_1 */
 
-  /* Update the frequency with scanf */
-  if (tiny_sscanf(param, "%lu", &(rx2Params.Frequency)) != 1)
+  /* USER CODE END AT_NetworkID_set_1 */
+  uint32_t networkId;
+  if (tiny_sscanf(param, "%u", &networkId) != 1)
   {
     return AT_PARAM_ERROR;
   }
-  else if (LmHandlerSetRX2Params(&rx2Params) != LORAMAC_HANDLER_SUCCESS)
+
+  if (networkId > 127)
   {
     return AT_PARAM_ERROR;
   }
 
+  LmHandlerSetNetworkID(networkId);
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx2Frequency_set_2 */
+  /* USER CODE BEGIN AT_NetworkID_set_2 */
 
-  /* USER CODE END AT_Rx2Frequency_set_2 */
+  /* USER CODE END AT_NetworkID_set_2 */
 }
 
-ATEerror_t AT_Rx2DataRate_set(const char *param)
+/* --------------- LoRaWAN join and send data commands --------------- */
+ATEerror_t AT_Join(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx2DataRate_set_1 */
-
-  /* USER CODE END AT_Rx2DataRate_set_1 */
-  RxChannelParams_t rx2Params;
-
-  /* Get the current configuration of RX2 */
-  LmHandlerGetRX2Params(&rx2Params);
+  /* USER CODE BEGIN AT_Join_1 */
 
-  /* Update the Datarate with scanf */
-  if (tiny_sscanf(param, "%hhu", &(rx2Params.Datarate)) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (rx2Params.Datarate > 15)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (LmHandlerSetRX2Params(&rx2Params) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_Join_1 */
+  switch (param[0])
   {
-    return AT_PARAM_ERROR;
+    case '0':
+      LmHandlerJoin(ACTIVATION_TYPE_ABP);
+      break;
+    case '1':
+      LmHandlerJoin(ACTIVATION_TYPE_OTAA);
+      break;
+    default:
+      return AT_PARAM_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx2DataRate_set_2 */
+  /* USER CODE BEGIN AT_Join_2 */
 
-  /* USER CODE END AT_Rx2DataRate_set_2 */
+  /* USER CODE END AT_Join_2 */
 }
 
-ATEerror_t AT_Rx1Delay_set(const char *param)
+ATEerror_t AT_Link_Check(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx1Delay_set_1 */
+  /* USER CODE BEGIN AT_Link_Check_1 */
 
-  /* USER CODE END AT_Rx1Delay_set_1 */
-  uint32_t rxDelay;
-  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (LmHandlerSetRx1Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_Link_Check_1 */
+  if (LmHandlerLinkCheckReq() != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx1Delay_set_2 */
+  /* USER CODE BEGIN AT_Link_Check_2 */
 
-  /* USER CODE END AT_Rx1Delay_set_2 */
+  /* USER CODE END AT_Link_Check_2 */
 }
 
-ATEerror_t AT_Rx2Delay_set(const char *param)
+ATEerror_t AT_Send(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx2Delay_set_1 */
+  /* USER CODE BEGIN AT_Send_1 */
 
-  /* USER CODE END AT_Rx2Delay_set_1 */
-  uint32_t rxDelay;
-  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (LmHandlerSetRx2Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_Send_1 */
+  const char *buf = param;
+  uint16_t bufSize = strlen(param);
+  uint32_t appPort;
+  LmHandlerMsgTypes_t isTxConfirmed;
+  unsigned size = 0;
+  char hex[3] = {0, 0, 0};
+  UTIL_TIMER_Time_t nextTxIn = 0;
+  LmHandlerErrorStatus_t lmhStatus = LORAMAC_HANDLER_ERROR;
+  ATEerror_t status = AT_ERROR;
+
+  /* read and set the application port */
+  if (1 != tiny_sscanf(buf, "%u:", &appPort))
   {
+    AT_PRINTF("AT+SEND without the application port\r\n");
     return AT_PARAM_ERROR;
   }
 
-  return AT_OK;
-  /* USER CODE BEGIN AT_Rx2Delay_set_2 */
-
-  /* USER CODE END AT_Rx2Delay_set_2 */
-}
-
-ATEerror_t AT_JoinAcceptDelay1_set(const char *param)
-{
-  /* USER CODE BEGIN AT_JoinAcceptDelay1_set_1 */
+  /* skip the application port */
+  while (('0' <= buf[0]) && (buf[0] <= '9') && bufSize > 1)
+  {
+    buf ++;
+    bufSize --;
+  };
 
-  /* USER CODE END AT_JoinAcceptDelay1_set_1 */
-  uint32_t rxDelay;
-  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
+  if ((bufSize == 0) || (':' != buf[0]))
   {
+    AT_PRINTF("AT+SEND missing : character after app port\r\n");
     return AT_PARAM_ERROR;
   }
-  else if (LmHandlerSetJoinRx1Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  else
   {
-    return AT_PARAM_ERROR;
+    /* skip the char ':' */
+    buf ++;
+    bufSize --;
   }
 
-  return AT_OK;
-  /* USER CODE BEGIN AT_JoinAcceptDelay1_set_2 */
-
-  /* USER CODE END AT_JoinAcceptDelay1_set_2 */
-}
-
-ATEerror_t AT_JoinAcceptDelay2_set(const char *param)
-{
-  /* USER CODE BEGIN AT_JoinAcceptDelay2_set_1 */
+  switch (buf[0])
+  {
+    case '0':
+      isTxConfirmed = LORAMAC_HANDLER_UNCONFIRMED_MSG;
+      break;
+    case '1':
+      isTxConfirmed = LORAMAC_HANDLER_CONFIRMED_MSG;
+      break;
+    default:
+      AT_PRINTF("AT+SEND without the acknowledge flag\r\n");
+      return AT_PARAM_ERROR;
+  }
 
-  /* USER CODE END AT_JoinAcceptDelay2_set_1 */
-  uint32_t rxDelay;
-  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
+  if (bufSize > 0)
   {
-    return AT_PARAM_ERROR;
+    /* skip the acknowledge flag */
+    buf ++;
+    bufSize --;
   }
-  else if (LmHandlerSetJoinRx2Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+
+  if ((bufSize == 0) || (':' != buf[0]))
   {
+    AT_PRINTF("AT+SEND missing : character after ack flag\r\n");
     return AT_PARAM_ERROR;
   }
-
+  else
+  {
+    /* skip the char ':' */
+    buf ++;
+    bufSize --;
+  }
+
+  while ((size < LORAWAN_APP_DATA_BUFFER_MAX_SIZE) && (bufSize > 1))
+  {
+    hex[0] = buf[size * 2];
+    hex[1] = buf[size * 2 + 1];
+    if (tiny_sscanf(hex, "%hhx", &AppData.Buffer[size]) != 1)
+    {
+      return AT_PARAM_ERROR;
+    }
+    size++;
+    bufSize -= 2;
+  }
+  if (bufSize != 0)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  AppData.BufferSize = size;
+  AppData.Port = appPort;
+
+  lmhStatus = LmHandlerSend(&AppData, isTxConfirmed, &nextTxIn, false);
+
+  switch (lmhStatus)
+  {
+    case LORAMAC_HANDLER_SUCCESS:
+      status = (nextTxIn > 0) ? AT_DUTYCYCLE_RESTRICTED : AT_OK;
+      break;
+    case LORAMAC_HANDLER_BUSY_ERROR:
+    case LORAMAC_HANDLER_COMPLIANCE_RUNNING:
+      status = (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET) ? AT_NO_NET_JOINED : AT_BUSY_ERROR;
+      break;
+    case LORAMAC_HANDLER_NO_NETWORK_JOINED:
+      status = AT_NO_NET_JOINED;
+      break;
+    case LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED:
+      status = AT_DUTYCYCLE_RESTRICTED;
+      break;
+    case LORAMAC_HANDLER_CRYPTO_ERROR:
+      status = AT_CRYPTO_ERROR;
+      break;
+    case LORAMAC_HANDLER_ERROR:
+    default:
+      status = AT_ERROR;
+      break;
+  }
+
+  return status;
+  /* USER CODE BEGIN AT_Send_2 */
+
+  /* USER CODE END AT_Send_2 */
+}
+
+/* --------------- LoRaWAN network management commands --------------- */
+ATEerror_t AT_version_get(const char *param)
+{
+  /* USER CODE BEGIN AT_version_get_1 */
+
+  /* USER CODE END AT_version_get_1 */
+  /* Get LoRa APP version*/
+  AT_PRINTF("APP_VERSION:        V%X.%X.%X\r\n",
+            (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+            (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+            (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW LoraWAN info */
+  AT_PRINTF("MW_LORAWAN_VERSION: V%X.%X.%X\r\n",
+            (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_MAIN_SHIFT),
+            (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_SUB1_SHIFT),
+            (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW SubGhz_Phy info */
+  AT_PRINTF("MW_RADIO_VERSION:   V%X.%X.%X\r\n",
+            (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_MAIN_SHIFT),
+            (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB1_SHIFT),
+            (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
   return AT_OK;
-  /* USER CODE BEGIN AT_JoinAcceptDelay2_set_2 */
+  /* USER CODE BEGIN AT_version_get_2 */
 
-  /* USER CODE END AT_JoinAcceptDelay2_set_2 */
+  /* USER CODE END AT_version_get_2 */
 }
 
-ATEerror_t AT_NetworkID_get(const char *param)
+ATEerror_t AT_ADR_get(const char *param)
 {
-  /* USER CODE BEGIN AT_NetworkID_get_1 */
+  /* USER CODE BEGIN AT_ADR_get_1 */
 
-  /* USER CODE END AT_NetworkID_get_1 */
-  uint32_t networkId;
-  if (LmHandlerGetNetworkID(&networkId) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_ADR_get_1 */
+  bool adrEnable;
+  if (LmHandlerGetAdrEnable(&adrEnable) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_uint32_as_02x(networkId);
+  print_d(adrEnable);
   return AT_OK;
-  /* USER CODE BEGIN AT_NetworkID_get_2 */
+  /* USER CODE BEGIN AT_ADR_get_2 */
 
-  /* USER CODE END AT_NetworkID_get_2 */
+  /* USER CODE END AT_ADR_get_2 */
 }
 
-ATEerror_t AT_NetworkID_set(const char *param)
+ATEerror_t AT_ADR_set(const char *param)
 {
-  /* USER CODE BEGIN AT_NetworkID_set_1 */
+  /* USER CODE BEGIN AT_ADR_set_1 */
 
-  /* USER CODE END AT_NetworkID_set_1 */
-  uint32_t networkId;
-  if (sscanf_uint32_as_hhx(param, &networkId) != 4)
+  /* USER CODE END AT_ADR_set_1 */
+  switch (param[0])
+  {
+    case '0':
+    case '1':
+      LmHandlerSetAdrEnable(param[0] - '0');
+      break;
+    default:
+      return AT_PARAM_ERROR;
+  }
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_ADR_set_2 */
+
+  /* USER CODE END AT_ADR_set_2 */
+}
+
+ATEerror_t AT_DataRate_get(const char *param)
+{
+  /* USER CODE BEGIN AT_DataRate_get_1 */
+
+  /* USER CODE END AT_DataRate_get_1 */
+  int8_t txDatarate;
+  if (LmHandlerGetTxDatarate(&txDatarate) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  LmHandlerSetNetworkID(networkId);
+  print_d(txDatarate);
   return AT_OK;
-  /* USER CODE BEGIN AT_NetworkID_set_2 */
+  /* USER CODE BEGIN AT_DataRate_get_2 */
 
-  /* USER CODE END AT_NetworkID_set_2 */
+  /* USER CODE END AT_DataRate_get_2 */
+}
+
+ATEerror_t AT_DataRate_set(const char *param)
+{
+  /* USER CODE BEGIN AT_DataRate_set_1 */
+
+  /* USER CODE END AT_DataRate_set_1 */
+  int8_t datarate;
+
+  if (tiny_sscanf(param, "%hhu", &datarate) != 1)
+  {
+    return AT_PARAM_ERROR;
+  }
+  if ((datarate < 0) || (datarate > 15))
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (LmHandlerSetTxDatarate(datarate) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_ERROR;
+  }
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_DataRate_set_2 */
+
+  /* USER CODE END AT_DataRate_set_2 */
+}
+
+ATEerror_t AT_Region_get(const char *param)
+{
+  /* USER CODE BEGIN AT_Region_get_1 */
+
+  /* USER CODE END AT_Region_get_1 */
+  const char *regionStrings[] = { "AS923", "AU915", "CN470", "CN779", "EU433", "EU868", "KR920", "IN865", "US915", "RU864" };
+  LoRaMacRegion_t region;
+  if (LmHandlerGetActiveRegion(&region) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (region > LORAMAC_REGION_RU864)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  AT_PRINTF("%d:%s\r\n", region, regionStrings[region]);
+  return AT_OK;
+  /* USER CODE BEGIN AT_Region_get_2 */
+
+  /* USER CODE END AT_Region_get_2 */
+}
+
+ATEerror_t AT_Region_set(const char *param)
+{
+  /* USER CODE BEGIN AT_Region_set_1 */
+
+  /* USER CODE END AT_Region_set_1 */
+  LoRaMacRegion_t region;
+  if (tiny_sscanf(param, "%hhu", &region) != 1)
+  {
+    return AT_PARAM_ERROR;
+  }
+  if (region > LORAMAC_REGION_RU864)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (LmHandlerSetActiveRegion(region) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_Region_set_2 */
+
+  /* USER CODE END AT_Region_set_2 */
 }
 
 ATEerror_t AT_DeviceClass_get(const char *param)
@@ -944,519 +1097,405 @@ ATEerror_t AT_DeviceClass_set(const char *param)
   /* USER CODE END AT_DeviceClass_set_2 */
 }
 
-ATEerror_t AT_PingSlot_get(const char *param)
+ATEerror_t AT_DutyCycle_get(const char *param)
 {
-  /* USER CODE BEGIN AT_PingSlot_get_1 */
-
-  /* USER CODE END AT_PingSlot_get_1 */
-  uint8_t periodicity;
+  /* USER CODE BEGIN AT_DutyCycle_get_1 */
 
-  if (LmHandlerGetPingPeriodicity(&periodicity) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DutyCycle_get_1 */
+  bool dutyCycleEnable;
+  if (LmHandlerGetDutyCycleEnable(&dutyCycleEnable) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_d(periodicity);
+  print_d(dutyCycleEnable);
   return AT_OK;
-  /* USER CODE BEGIN AT_PingSlot_get_2 */
+  /* USER CODE BEGIN AT_DutyCycle_get_2 */
 
-  /* USER CODE END AT_PingSlot_get_2 */
+  /* USER CODE END AT_DutyCycle_get_2 */
 }
 
-ATEerror_t AT_PingSlot_set(const char *param)
+ATEerror_t AT_DutyCycle_set(const char *param)
 {
-  /* USER CODE BEGIN AT_PingSlot_set_1 */
-
-  /* USER CODE END AT_PingSlot_set_1 */
-  uint8_t periodicity;
+  /* USER CODE BEGIN AT_DutyCycle_set_1 */
 
-  if (tiny_sscanf(param, "%hhu", &periodicity) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (periodicity > 7)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (LmHandlerSetPingPeriodicity(periodicity) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DutyCycle_set_1 */
+  switch (param[0])
   {
-    return AT_PARAM_ERROR;
+    case '0':
+    case '1':
+      LmHandlerSetDutyCycleEnable(param[0] - '0');
+      break;
+    default:
+      return AT_PARAM_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_PingSlot_set_2 */
+  /* USER CODE BEGIN AT_DutyCycle_set_2 */
 
-  /* USER CODE END AT_PingSlot_set_2 */
+  /* USER CODE END AT_DutyCycle_set_2 */
 }
 
-ATEerror_t AT_LocalTime_get(const char *param)
+ATEerror_t AT_JoinAcceptDelay1_get(const char *param)
 {
-  /* USER CODE BEGIN AT_LocalTime_get_1 */
-
-  /* USER CODE END AT_LocalTime_get_1 */
-  struct tm localtime;
-  SysTime_t UnixEpoch = SysTimeGet();
-  UnixEpoch.Seconds -= 18; /*removing leap seconds*/
+  /* USER CODE BEGIN AT_JoinAcceptDelay1_get_1 */
 
-  UnixEpoch.Seconds += 3600 * 2; /*adding 2 hours*/
-
-  SysTimeLocalTime(UnixEpoch.Seconds,  & localtime);
-
-  AT_PRINTF("LTIME:%02dh%02dm%02ds on %02d/%02d/%04d\r\n",
-            localtime.tm_hour, localtime.tm_min, localtime.tm_sec,
-            localtime.tm_mday, localtime.tm_mon + 1, localtime.tm_year + 1900);
+  /* USER CODE END AT_JoinAcceptDelay1_get_1 */
+  uint32_t rxDelay;
+  if (LmHandlerGetJoinRx1Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
 
+  print_u(rxDelay);
   return AT_OK;
-  /* USER CODE BEGIN AT_LocalTime_get_2 */
+  /* USER CODE BEGIN AT_JoinAcceptDelay1_get_2 */
 
-  /* USER CODE END AT_LocalTime_get_2 */
+  /* USER CODE END AT_JoinAcceptDelay1_get_2 */
 }
 
-ATEerror_t AT_Join(const char *param)
+ATEerror_t AT_JoinAcceptDelay1_set(const char *param)
 {
-  /* USER CODE BEGIN AT_Join_1 */
+  /* USER CODE BEGIN AT_JoinAcceptDelay1_set_1 */
 
-  /* USER CODE END AT_Join_1 */
-  switch (param[0])
+  /* USER CODE END AT_JoinAcceptDelay1_set_1 */
+  uint32_t rxDelay;
+  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
   {
-    case '0':
-      LmHandlerJoin(ACTIVATION_TYPE_ABP);
-      break;
-    case '1':
-      LmHandlerJoin(ACTIVATION_TYPE_OTAA);
-      break;
-    default:
-      return AT_PARAM_ERROR;
+    return AT_PARAM_ERROR;
+  }
+  else if (LmHandlerSetJoinRx1Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_Join_2 */
+  /* USER CODE BEGIN AT_JoinAcceptDelay1_set_2 */
 
-  /* USER CODE END AT_Join_2 */
+  /* USER CODE END AT_JoinAcceptDelay1_set_2 */
 }
 
-ATEerror_t AT_Send(const char *param)
+ATEerror_t AT_JoinAcceptDelay2_get(const char *param)
 {
-  /* USER CODE BEGIN AT_Send_1 */
-
-  /* USER CODE END AT_Send_1 */
-  const char *buf = param;
-  uint16_t bufSize = strlen(param);
-  uint32_t appPort;
-  LmHandlerMsgTypes_t isTxConfirmed;
-  unsigned size = 0;
-  char hex[3] = {0, 0, 0};
-  UTIL_TIMER_Time_t nextTxIn = 0;
-  LmHandlerErrorStatus_t lmhStatus = LORAMAC_HANDLER_ERROR;
-  ATEerror_t status = AT_ERROR;
+  /* USER CODE BEGIN AT_JoinAcceptDelay2_get_1 */
 
-  /* read and set the application port */
-  if (1 != tiny_sscanf(buf, "%u:", &appPort))
+  /* USER CODE END AT_JoinAcceptDelay2_get_1 */
+  uint32_t rxDelay;
+  if (LmHandlerGetJoinRx2Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
   {
-    AT_PRINTF("AT+SEND without the application port\r\n");
     return AT_PARAM_ERROR;
   }
 
-  /* skip the application port */
-  while (('0' <= buf[0]) && (buf[0] <= '9') && bufSize > 1)
-  {
-    buf ++;
-    bufSize --;
-  };
-
-  if ((bufSize == 0) || (':' != buf[0]))
-  {
-    AT_PRINTF("AT+SEND missing : character after app port\r\n");
-    return AT_PARAM_ERROR;
-  }
-  else
-  {
-    /* skip the char ':' */
-    buf ++;
-    bufSize --;
-  }
+  print_u(rxDelay);
+  return AT_OK;
+  /* USER CODE BEGIN AT_JoinAcceptDelay2_get_2 */
 
-  switch (buf[0])
-  {
-    case '0':
-      isTxConfirmed = LORAMAC_HANDLER_UNCONFIRMED_MSG;
-      break;
-    case '1':
-      isTxConfirmed = LORAMAC_HANDLER_CONFIRMED_MSG;
-      break;
-    default:
-      AT_PRINTF("AT+SEND without the acknowledge flag\r\n");
-      return AT_PARAM_ERROR;
-  }
+  /* USER CODE END AT_JoinAcceptDelay2_get_2 */
+}
 
-  if (bufSize > 0)
-  {
-    /* skip the acknowledge flag */
-    buf ++;
-    bufSize --;
-  }
+ATEerror_t AT_JoinAcceptDelay2_set(const char *param)
+{
+  /* USER CODE BEGIN AT_JoinAcceptDelay2_set_1 */
 
-  if ((bufSize == 0) || (':' != buf[0]))
+  /* USER CODE END AT_JoinAcceptDelay2_set_1 */
+  uint32_t rxDelay;
+  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
   {
-    AT_PRINTF("AT+SEND missing : character after ack flag\r\n");
     return AT_PARAM_ERROR;
   }
-  else
-  {
-    /* skip the char ':' */
-    buf ++;
-    bufSize --;
-  }
-
-  while ((size < LORAWAN_APP_DATA_BUFFER_MAX_SIZE) && (bufSize > 1))
-  {
-    hex[0] = buf[size * 2];
-    hex[1] = buf[size * 2 + 1];
-    if (tiny_sscanf(hex, "%hhx", &AppData.Buffer[size]) != 1)
-    {
-      return AT_PARAM_ERROR;
-    }
-    size++;
-    bufSize -= 2;
-  }
-  if (bufSize != 0)
+  else if (LmHandlerSetJoinRx2Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  AppData.BufferSize = size;
-  AppData.Port = appPort;
-
-  lmhStatus = LmHandlerSend(&AppData, isTxConfirmed, &nextTxIn, false);
-
-  switch (lmhStatus)
-  {
-  case LORAMAC_HANDLER_SUCCESS:
-    status = (nextTxIn > 0)?AT_DUTYCYLE_RESTRICTED:AT_OK;
-    break;
-  case LORAMAC_HANDLER_BUSY_ERROR:
-  case LORAMAC_HANDLER_COMPLIANCE_RUNNING:
-    status = (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)?AT_NO_NET_JOINED:AT_BUSY_ERROR;
-    break;
-  case LORAMAC_HANDLER_NO_NETWORK_JOINED:
-    status = AT_NO_NET_JOINED;
-    break;
-  case LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED:
-    status = AT_DUTYCYLE_RESTRICTED;
-    break;
-  case LORAMAC_HANDLER_CRYPTO_ERROR:
-    status = AT_CRYPTO_ERROR;
-    break;
-  case LORAMAC_HANDLER_ERROR:
-  default:
-    status = AT_ERROR;
-    break;
-  }
-
-  return status;
-  /* USER CODE BEGIN AT_Send_2 */
+  return AT_OK;
+  /* USER CODE BEGIN AT_JoinAcceptDelay2_set_2 */
 
-  /* USER CODE END AT_Send_2 */
+  /* USER CODE END AT_JoinAcceptDelay2_set_2 */
 }
 
-ATEerror_t AT_version_get(const char *param)
+ATEerror_t AT_Rx1Delay_get(const char *param)
 {
-  /* USER CODE BEGIN AT_version_get_1 */
-
-  /* USER CODE END AT_version_get_1 */
-  /* Get LoRa APP version*/
-  AT_PRINTF("APP_VERSION:        V%X.%X.%X\r\n",
-            (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
-            (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
-            (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
-
-  /* Get MW LoraWAN info */
-  AT_PRINTF("MW_LORAWAN_VERSION: V%X.%X.%X\r\n",
-            (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_MAIN_SHIFT),
-            (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_SUB1_SHIFT),
-            (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_SUB2_SHIFT));
+  /* USER CODE BEGIN AT_Rx1Delay_get_1 */
 
-  /* Get MW SubGhz_Phy info */
-  AT_PRINTF("MW_RADIO_VERSION:   V%X.%X.%X\r\n",
-            (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_MAIN_SHIFT),
-            (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB1_SHIFT),
-            (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB2_SHIFT));
+  /* USER CODE END AT_Rx1Delay_get_1 */
+  uint32_t rxDelay;
+  if (LmHandlerGetRx1Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
 
+  print_u(rxDelay);
   return AT_OK;
-  /* USER CODE BEGIN AT_version_get_2 */
+  /* USER CODE BEGIN AT_Rx1Delay_get_2 */
 
-  /* USER CODE END AT_version_get_2 */
+  /* USER CODE END AT_Rx1Delay_get_2 */
 }
 
-ATEerror_t AT_bat_get(const char *param)
+ATEerror_t AT_Rx1Delay_set(const char *param)
 {
-  /* USER CODE BEGIN AT_bat_get_1 */
+  /* USER CODE BEGIN AT_Rx1Delay_set_1 */
 
-  /* USER CODE END AT_bat_get_1 */
-  print_d(SYS_GetBatteryLevel());
+  /* USER CODE END AT_Rx1Delay_set_1 */
+  uint32_t rxDelay;
+  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
+  {
+    return AT_PARAM_ERROR;
+  }
+  else if (LmHandlerSetRx1Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_bat_get_2 */
+  /* USER CODE BEGIN AT_Rx1Delay_set_2 */
 
-  /* USER CODE END AT_bat_get_2 */
+  /* USER CODE END AT_Rx1Delay_set_2 */
 }
 
-ATEerror_t AT_test_txTone(const char *param)
+ATEerror_t AT_Rx2Delay_get(const char *param)
 {
-  /* USER CODE BEGIN AT_test_txTone_1 */
+  /* USER CODE BEGIN AT_Rx2Delay_get_1 */
 
-  /* USER CODE END AT_test_txTone_1 */
-  if (0U == TST_TxTone())
-  {
-    return AT_OK;
-  }
-  else
+  /* USER CODE END AT_Rx2Delay_get_1 */
+  uint32_t rxDelay;
+  if (LmHandlerGetRx2Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
   {
-    return AT_BUSY_ERROR;
+    return AT_PARAM_ERROR;
   }
-  /* USER CODE BEGIN AT_test_txTone_2 */
 
-  /* USER CODE END AT_test_txTone_2 */
+  print_u(rxDelay);
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2Delay_get_2 */
+
+  /* USER CODE END AT_Rx2Delay_get_2 */
 }
 
-ATEerror_t AT_test_rxRssi(const char *param)
+ATEerror_t AT_Rx2Delay_set(const char *param)
 {
-  /* USER CODE BEGIN AT_test_rxRssi_1 */
+  /* USER CODE BEGIN AT_Rx2Delay_set_1 */
 
-  /* USER CODE END AT_test_rxRssi_1 */
-  if (0U == TST_RxRssi())
+  /* USER CODE END AT_Rx2Delay_set_1 */
+  uint32_t rxDelay;
+  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
   {
-    return AT_OK;
+    return AT_PARAM_ERROR;
   }
-  else
+  else if (LmHandlerSetRx2Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
   {
-    return AT_BUSY_ERROR;
+    return AT_PARAM_ERROR;
   }
-  /* USER CODE BEGIN AT_test_rxRssi_2 */
 
-  /* USER CODE END AT_test_rxRssi_2 */
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2Delay_set_2 */
+
+  /* USER CODE END AT_Rx2Delay_set_2 */
 }
 
-ATEerror_t AT_test_tx(const char *param)
+ATEerror_t AT_Rx2DataRate_get(const char *param)
 {
-  /* USER CODE BEGIN AT_test_tx_1 */
-
-  /* USER CODE END AT_test_tx_1 */
-  const char *buf = param;
-  uint32_t nb_packet;
-
-  if (1 != tiny_sscanf(buf, "%u", &nb_packet))
-  {
-    AT_PRINTF("AT+TTX: nb packets sent is missing\r\n");
-    return AT_PARAM_ERROR;
-  }
+  /* USER CODE BEGIN AT_Rx2DataRate_get_1 */
 
-  if (0U == TST_TX_Start(nb_packet))
-  {
-    return AT_OK;
-  }
-  else
-  {
-    return AT_BUSY_ERROR;
-  }
-  /* USER CODE BEGIN AT_test_tx_2 */
+  /* USER CODE END AT_Rx2DataRate_get_1 */
+  RxChannelParams_t rx2Params;
+  LmHandlerGetRX2Params(&rx2Params);
+  print_d(rx2Params.Datarate);
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2DataRate_get_2 */
 
-  /* USER CODE END AT_test_tx_2 */
+  /* USER CODE END AT_Rx2DataRate_get_2 */
 }
 
-/**
-  * @brief  Start Tx hopping
-  * @param  String parameter
-  * @retval AT_OK
-  */
-ATEerror_t AT_test_tx_hopping(const char *param)
+ATEerror_t AT_Rx2DataRate_set(const char *param)
 {
-  /* USER CODE BEGIN AT_test_tx_hopping_1 */
+  /* USER CODE BEGIN AT_Rx2DataRate_set_1 */
 
-  /* USER CODE END AT_test_tx_hopping_1 */
-  const char *buf = param;
-  uint32_t freq_start;
-  uint32_t freq_stop;
-  uint32_t delta_f;
-  uint32_t nb_tx;
+  /* USER CODE END AT_Rx2DataRate_set_1 */
+  RxChannelParams_t rx2Params;
 
-  testParameter_t test_param;
-  uint32_t hop_freq;
+  /* Get the current configuration of RX2 */
+  LmHandlerGetRX2Params(&rx2Params);
 
-  if (4 != tiny_sscanf(buf, "%u,%u,%u,%u", &freq_start, &freq_stop, &delta_f, &nb_tx))
+  /* Update the Datarate with scanf */
+  if (tiny_sscanf(param, "%hhu", &(rx2Params.Datarate)) != 1)
   {
     return AT_PARAM_ERROR;
   }
-
-  /*if freq is set in MHz, convert to Hz*/
-  if (freq_start < 1000)
-  {
-    freq_start *= 1000000;
-  }
-  if (freq_stop < 1000)
+  else if (rx2Params.Datarate > 15)
   {
-    freq_stop *= 1000000;
+    return AT_PARAM_ERROR;
   }
-  /**/
-  hop_freq = freq_start;
-
-  for (int i = 0; i < nb_tx; i++)
+  else if (LmHandlerSetRX2Params(&rx2Params) != LORAMAC_HANDLER_SUCCESS)
   {
-    /*get current config*/
-    TST_get_config(&test_param);
-
-    /*increment frequency*/
-    test_param.freq = hop_freq;
-    /*Set new config*/
-    TST_set_config(&test_param);
-
-    APP_TPRINTF("Tx Hop at %dHz. %d of %d\r\n", hop_freq, i, nb_tx);
-
-    if (0U != TST_TX_Start(1))
-    {
-      return AT_BUSY_ERROR;
-    }
+    return AT_PARAM_ERROR;
+  }
 
-    hop_freq += delta_f;
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2DataRate_set_2 */
 
-    if (hop_freq > freq_stop)
-    {
-      hop_freq = freq_start;
-    }
-  }
+  /* USER CODE END AT_Rx2DataRate_set_2 */
+}
+
+ATEerror_t AT_Rx2Frequency_get(const char *param)
+{
+  /* USER CODE BEGIN AT_Rx2Frequency_get_1 */
 
+  /* USER CODE END AT_Rx2Frequency_get_1 */
+  RxChannelParams_t rx2Params;
+  LmHandlerGetRX2Params(&rx2Params);
+  print_d(rx2Params.Frequency);
   return AT_OK;
-  /* USER CODE BEGIN AT_test_tx_hopping_2 */
+  /* USER CODE BEGIN AT_Rx2Frequency_get_2 */
 
-  /* USER CODE END AT_test_tx_hopping_2 */
+  /* USER CODE END AT_Rx2Frequency_get_2 */
 }
 
-ATEerror_t AT_test_rx(const char *param)
+ATEerror_t AT_Rx2Frequency_set(const char *param)
 {
-  /* USER CODE BEGIN AT_test_rx_1 */
+  /* USER CODE BEGIN AT_Rx2Frequency_set_1 */
 
-  /* USER CODE END AT_test_rx_1 */
-  const char *buf = param;
-  uint32_t nb_packet;
+  /* USER CODE END AT_Rx2Frequency_set_1 */
+  RxChannelParams_t rx2Params;
 
-  if (1 != tiny_sscanf(buf, "%u", &nb_packet))
-  {
-    AT_PRINTF("AT+TRX: nb expected packets is missing\r\n");
-    return AT_PARAM_ERROR;
-  }
+  /* Get the current configuration of RX2 */
+  LmHandlerGetRX2Params(&rx2Params);
 
-  if (0U == TST_RX_Start(nb_packet))
+  /* Update the frequency with scanf */
+  if (tiny_sscanf(param, "%lu", &(rx2Params.Frequency)) != 1)
   {
-    return AT_OK;
+    return AT_PARAM_ERROR;
   }
-  else
+  else if (LmHandlerSetRX2Params(&rx2Params) != LORAMAC_HANDLER_SUCCESS)
   {
-    return AT_BUSY_ERROR;
+    return AT_PARAM_ERROR;
   }
-  /* USER CODE BEGIN AT_test_rx_2 */
 
-  /* USER CODE END AT_test_rx_2 */
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2Frequency_set_2 */
+
+  /* USER CODE END AT_Rx2Frequency_set_2 */
 }
 
-ATEerror_t AT_write_register(const char *param)
+ATEerror_t AT_TransmitPower_get(const char *param)
 {
-  /* USER CODE BEGIN AT_write_register_1 */
-
-  /* USER CODE END AT_write_register_1 */
-  uint8_t add[2];
-  uint16_t add16;
-  uint8_t data;
+  /* USER CODE BEGIN AT_TransmitPower_get_1 */
 
-  if (strlen(param) != 7)
+  /* USER CODE END AT_TransmitPower_get_1 */
+  int8_t txPower;
+  if (LmHandlerGetTxPower(&txPower) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  if (stringToData(param, add, 2) != 0)
+  print_d(txPower);
+  return AT_OK;
+  /* USER CODE BEGIN AT_TransmitPower_get_2 */
+
+  /* USER CODE END AT_TransmitPower_get_2 */
+}
+
+ATEerror_t AT_TransmitPower_set(const char *param)
+{
+  /* USER CODE BEGIN AT_TransmitPower_set_1 */
+
+  /* USER CODE END AT_TransmitPower_set_1 */
+  int8_t txPower;
+  if (tiny_sscanf(param, "%hhu", &txPower) != 1)
   {
     return AT_PARAM_ERROR;
   }
-  param += 5;
-  if (stringToData(param, &data, 1) != 0)
+
+  if (LmHandlerSetTxPower(txPower) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
-  add16 = (((uint16_t)add[0]) << 8) + (uint16_t)add[1];
-  Radio.Write(add16, data);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_write_register_2 */
+  /* USER CODE BEGIN AT_TransmitPower_set_2 */
 
-  /* USER CODE END AT_write_register_2 */
+  /* USER CODE END AT_TransmitPower_set_2 */
 }
 
-ATEerror_t AT_read_register(const char *param)
+ATEerror_t AT_PingSlot_get(const char *param)
 {
-  /* USER CODE BEGIN AT_read_register_1 */
-
-  /* USER CODE END AT_read_register_1 */
-  uint8_t add[2];
-  uint16_t add16;
-  uint8_t data;
+  /* USER CODE BEGIN AT_PingSlot_get_1 */
 
-  if (strlen(param) != 4)
-  {
-    return AT_PARAM_ERROR;
-  }
+  /* USER CODE END AT_PingSlot_get_1 */
+  uint8_t periodicity;
 
-  if (stringToData(param, add, 2) != 0)
+  if (LmHandlerGetPingPeriodicity(&periodicity) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  add16 = (((uint16_t)add[0]) << 8) + (uint16_t)add[1];
-  data = Radio.Read(add16);
-  AT_PRINTF("REG 0x%04X=0x%02X", add16, data);
-
+  print_d(periodicity);
   return AT_OK;
-  /* USER CODE BEGIN AT_read_register_2 */
+  /* USER CODE BEGIN AT_PingSlot_get_2 */
 
-  /* USER CODE END AT_read_register_2 */
+  /* USER CODE END AT_PingSlot_get_2 */
 }
 
-ATEerror_t AT_verbose_set(const char *param)
+ATEerror_t AT_PingSlot_set(const char *param)
 {
-  /* USER CODE BEGIN AT_verbose_set_1 */
+  /* USER CODE BEGIN AT_PingSlot_set_1 */
 
-  /* USER CODE END AT_verbose_set_1 */
-  const char *buf = param;
-  int32_t lvl_nb;
+  /* USER CODE END AT_PingSlot_set_1 */
+  uint8_t periodicity;
 
-  /* read and set the verbose level */
-  if (1 != tiny_sscanf(buf, "%u", &lvl_nb))
+  if (tiny_sscanf(param, "%hhu", &periodicity) != 1)
   {
-    AT_PRINTF("AT+VL: verbose level is not well set\r\n");
     return AT_PARAM_ERROR;
   }
-  if ((lvl_nb > VLEVEL_H) || (lvl_nb < VLEVEL_OFF))
+  else if (periodicity > 7)
+  {
+    return AT_PARAM_ERROR;
+  }
+  else if (LmHandlerSetPingPeriodicity(periodicity) != LORAMAC_HANDLER_SUCCESS)
   {
-    AT_PRINTF("AT+VL: verbose level out of range => 0(VLEVEL_OFF) to 3(VLEVEL_H)\r\n");
     return AT_PARAM_ERROR;
   }
-
-  UTIL_ADV_TRACE_SetVerboseLevel(lvl_nb);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_verbose_set_2 */
+  /* USER CODE BEGIN AT_PingSlot_set_2 */
 
-  /* USER CODE END AT_verbose_set_2 */
+  /* USER CODE END AT_PingSlot_set_2 */
 }
 
-ATEerror_t AT_verbose_get(const char *param)
+/* --------------- Radio tests commands --------------- */
+ATEerror_t AT_test_txTone(const char *param)
 {
-  /* USER CODE BEGIN AT_verbose_get_1 */
+  /* USER CODE BEGIN AT_test_txTone_1 */
 
-  /* USER CODE END AT_verbose_get_1 */
-  print_u(UTIL_ADV_TRACE_GetVerboseLevel());
-  return AT_OK;
-  /* USER CODE BEGIN AT_verbose_get_2 */
+  /* USER CODE END AT_test_txTone_1 */
+  if (0U == TST_TxTone())
+  {
+    return AT_OK;
+  }
+  else
+  {
+    return AT_BUSY_ERROR;
+  }
+  /* USER CODE BEGIN AT_test_txTone_2 */
 
-  /* USER CODE END AT_verbose_get_2 */
+  /* USER CODE END AT_test_txTone_2 */
+}
+
+ATEerror_t AT_test_rxRssi(const char *param)
+{
+  /* USER CODE BEGIN AT_test_rxRssi_1 */
+
+  /* USER CODE END AT_test_rxRssi_1 */
+  if (0U == TST_RxRssi())
+  {
+    return AT_OK;
+  }
+  else
+  {
+    return AT_BUSY_ERROR;
+  }
+  /* USER CODE BEGIN AT_test_rxRssi_2 */
+
+  /* USER CODE END AT_test_rxRssi_2 */
 }
 
 ATEerror_t AT_test_get_config(const char *param)
@@ -1475,23 +1514,23 @@ ATEerror_t AT_test_get_config(const char *param)
   if (testParam.modulation == 0)
   {
     /*fsk*/
-    AT_PRINTF("3: Bandwidth= %d kHz\r\n", testParam.bandwidth);
+    AT_PRINTF("3: Bandwidth= %d Hz\r\n", testParam.bandwidth);
     AT_PRINTF("4: FSK datarate= %d bps\r\n", testParam.loraSf_datarate);
     AT_PRINTF("5: Coding Rate not applicable\r\n");
     AT_PRINTF("6: LNA State= %d  \r\n", testParam.lna);
     AT_PRINTF("7: PA Boost State= %d  \r\n", testParam.paBoost);
     AT_PRINTF("8: modulation FSK\r\n");
     AT_PRINTF("9: Payload len= %d Bytes\r\n", testParam.payloadLen);
-    AT_PRINTF("10: FSK deviation= %d \r\n", testParam.fskDev);
+    AT_PRINTF("10: FSK deviation= %d Hz\r\n", testParam.fskDev);
     AT_PRINTF("11: LowDRopt not applicable\r\n");
     AT_PRINTF("12: FSK gaussian BT product= %d \r\n", testParam.BTproduct);
   }
   else if (testParam.modulation == 1)
   {
     /*Lora*/
-    AT_PRINTF("3: Bandwidth= %d Hz\r\n", loraBW[testParam.bandwidth]);
+    AT_PRINTF("3: Bandwidth= %d (=%d Hz)\r\n", testParam.bandwidth, loraBW[testParam.bandwidth]);
     AT_PRINTF("4: SF= %d \r\n", testParam.loraSf_datarate);
-    AT_PRINTF("5: CR= 4/%d \r\n", testParam.codingRate + 4);
+    AT_PRINTF("5: CR= %d (=4/%d) \r\n", testParam.codingRate, testParam.codingRate + 4);
     AT_PRINTF("6: LNA State= %d  \r\n", testParam.lna);
     AT_PRINTF("7: PA Boost State= %d  \r\n", testParam.paBoost);
     AT_PRINTF("8: modulation LORA\r\n");
@@ -1521,20 +1560,20 @@ ATEerror_t AT_test_set_config(const char *param)
   /* USER CODE BEGIN AT_test_set_config_1 */
 
   /* USER CODE END AT_test_set_config_1 */
-  testParameter_t testParam;
-  int32_t power = 14;
-  uint32_t crNum;
+  testParameter_t testParam = {0};
   uint32_t freq;
-  uint32_t loraSf_datarate;
+  int32_t power;
   uint32_t bandwidth;
+  uint32_t loraSf_datarate;
   uint32_t codingRate;
   uint32_t lna;
   uint32_t paBoost;
-  uint32_t modulation = 1; /*Lora default in legacy*/
-  uint32_t payloadLen = 16; /*Lora default in legacy*/
-  uint32_t fskdDeviation = 25000; /*Lora default in legacy*/
-  uint32_t lowDrOpt = 2; /*Lora default in legacy*/
-  uint32_t BTproduct = 3; /*Lora default in legacy*/
+  uint32_t modulation;
+  uint32_t payloadLen;
+  uint32_t fskDeviation;
+  uint32_t lowDrOpt;
+  uint32_t BTproduct;
+  uint32_t crNum;
 
   if (13 == tiny_sscanf(param, "%d:%d:%d:%d:%d/%d:%d:%d:%d:%d:%d:%d:%d",
                         &freq,
@@ -1547,211 +1586,180 @@ ATEerror_t AT_test_set_config(const char *param)
                         &paBoost,
                         &modulation,
                         &payloadLen,
-                        &fskdDeviation,
+                        &fskDeviation,
                         &lowDrOpt,
                         &BTproduct))
   {
     /*extend to new format for extended*/
   }
-  else if (8 == tiny_sscanf(param, "%d:%d:%d:%d:%d/%d:%d:%d",
-                            &freq,
-                            &power,
-                            &bandwidth,
-                            &loraSf_datarate,
-                            &crNum,
-                            &codingRate,
-                            &lna,
-                            &paBoost))
-  {
-    /*legacy*/
-    if (bandwidth == 500)
-    {
-      bandwidth = BW_500kHz;
-    }
-    else if (bandwidth == 250)
-    {
-      bandwidth = BW_250kHz;
-    }
-    else if (bandwidth == 125)
-    {
-      bandwidth = BW_125kHz;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
-  }
   else
   {
     return AT_PARAM_ERROR;
   }
-  /* Power  check and set*/
-  if ((power >= -9) && (power <= 22))
+  /*get current config*/
+  TST_get_config(&testParam);
+
+  /* 8: modulation check and set */
+  /* first check because required for others */
+  if (modulation == 0)
   {
-    testParam.power = power;
+    testParam.modulation = TEST_FSK;
+  }
+  else if (modulation == 1)
+  {
+    testParam.modulation = TEST_LORA;
+  }
+  else if (modulation == 2)
+  {
+    testParam.modulation = TEST_BPSK;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
-  /* payloadLen check and set*/
-  if ((payloadLen != 0) && (payloadLen <= 256))
+
+  /* 1: frequency check and set */
+  if (freq < 1000)
   {
-    testParam.payloadLen = payloadLen;
+    /*given in MHz*/
+    testParam.freq = freq * 1000000;
+  }
+  else
+  {
+    testParam.freq = freq;
+  }
+
+  /* 2: power check and set */
+  if ((power >= -9) && (power <= 22))
+  {
+    testParam.power = power;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
 
-  /*modulation check and set*/
-  if (modulation == 0)
+  /* 3: bandwidth check and set */
+  if ((testParam.modulation == TEST_FSK) && (bandwidth >= 4800) && (bandwidth <= 467000))
   {
-    /*modulation fsk=0 or lora=1*/
-    testParam.modulation = TEST_FSK;
+    testParam.bandwidth = bandwidth;
   }
-  else if (modulation == 1)
+  else if ((testParam.modulation == TEST_LORA) && (bandwidth <= BW_500kHz))
   {
-    /*modulation fsk=0 or lora=1*/
-    testParam.modulation = TEST_LORA;
+    testParam.bandwidth = bandwidth;
   }
-  else if (modulation == 2)
+  else if (testParam.modulation == TEST_BPSK)
   {
-    /*modulation fsk=0 or lora=1*/
-    testParam.modulation = TEST_BPSK;
+    /* Not used */
   }
   else
   {
     return AT_PARAM_ERROR;
   }
 
-  /* frequency check and set*/
-  if (freq < 1000)
+  /* 4: datarate/spreading factor check and set */
+  if ((testParam.modulation == TEST_FSK) && (loraSf_datarate >= 600) && (loraSf_datarate <= 300000))
   {
-    /*given in MHz*/
-    testParam.freq = freq * 1000000;
+    testParam.loraSf_datarate = loraSf_datarate;
+  }
+  else if ((testParam.modulation == TEST_LORA) && (loraSf_datarate >= 5) && (loraSf_datarate <= 12))
+  {
+    testParam.loraSf_datarate = loraSf_datarate;
+  }
+  else if ((testParam.modulation == TEST_BPSK) && (loraSf_datarate <= 1000))
+  {
+    testParam.loraSf_datarate = loraSf_datarate;
   }
   else
   {
-    testParam.freq = freq;
+    return AT_PARAM_ERROR;
   }
 
-  /* bandwidth check and set*/
-  if (testParam.modulation == 0)
+  /* 5: coding rate check and set */
+  if ((testParam.modulation == TEST_FSK) || (testParam.modulation == TEST_BPSK))
   {
-    /*fsk bandwidth check and set*/
-    if ((bandwidth >= 4800) && (bandwidth <= 467000))
-    {
-      testParam.bandwidth = bandwidth;
-    }
-    else
-    {
-
-      return AT_PARAM_ERROR;
-    }
+    /* Not used */
   }
-  else if (testParam.modulation == 1)
+  else if ((testParam.modulation == TEST_LORA) && ((codingRate >= 5) && (codingRate <= 8)))
   {
-    /*Lora modulation check and set*/
-    if (bandwidth <= BW_500kHz)
-    {
-      testParam.bandwidth = bandwidth;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
+    testParam.codingRate = codingRate - 4;
   }
   else
   {
+    return AT_PARAM_ERROR;
   }
 
-  if (lowDrOpt <= 2)
+  /* 6: lna state check and set */
+  if (lna <= 1)
   {
-    testParam.lowDrOpt = lowDrOpt;
+    testParam.lna = lna;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
 
-  if (testParam.modulation == 0)
+  /* 7: pa boost check and set */
+  if (paBoost <= 1)
   {
-    /*fsk modulation check and set*/
-    if ((loraSf_datarate >= 600) && (loraSf_datarate <= 300000))
-    {
-      testParam.loraSf_datarate = loraSf_datarate;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
+    /* Not used */
+    testParam.paBoost = paBoost;
   }
-  else if (testParam.modulation == 1)
+
+  /* 9: payloadLen check and set */
+  if ((payloadLen != 0) && (payloadLen < 256))
   {
-    /*Lora modulation*/
-    /*spreading factor check and set*/
-    if ((loraSf_datarate >= 5) && (loraSf_datarate <= 12))
-    {
-      testParam.loraSf_datarate = loraSf_datarate;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
+    testParam.payloadLen = payloadLen;
   }
-  else if (testParam.modulation == 2)
+  else
   {
-    /*BPSK modulation*/
-    /*spreading factor check and set*/
-    if (loraSf_datarate <= 1000)
-    {
-      testParam.loraSf_datarate = loraSf_datarate;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
+    return AT_PARAM_ERROR;
   }
 
-  /* coding rate numerator check and set*/
-  if (crNum != 4)
+  /* 10: fsk Deviation check and set */
+  if ((testParam.modulation == TEST_LORA) || (testParam.modulation == TEST_BPSK))
   {
-    return AT_PARAM_ERROR;
+    /* Not used */
   }
-  /* check coding rate denominator is ok*/
-  if ((codingRate >= 5) && (codingRate <= 8))
+  else if ((testParam.modulation == TEST_FSK) && ((fskDeviation >= 600) && (fskDeviation <= 200000)))
   {
-    testParam.codingRate = codingRate - 4;
+    /*given in MHz*/
+    testParam.fskDev = fskDeviation;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
-  /* fsk BT product check and set*/
-  if (BTproduct <= 4)
+
+  /* 11: low datarate optimization check and set */
+  if ((testParam.modulation == TEST_FSK) || (testParam.modulation == TEST_BPSK))
   {
-    /*given in MHz*/
-    testParam.BTproduct = BTproduct;
+    /* Not used */
+  }
+  else if ((testParam.modulation == TEST_LORA) && (lowDrOpt <= 2))
+  {
+    testParam.lowDrOpt = lowDrOpt;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
-  /* fskdDeviation check and se*/
-  if ((fskdDeviation >= 600) && (fskdDeviation <= 200000))
+
+  /* 12: FSK gaussian BT product check and set */
+  if ((testParam.modulation == TEST_LORA) || (testParam.modulation == TEST_BPSK))
+  {
+    /* Not used */
+  }
+  else if ((testParam.modulation == TEST_FSK) && (BTproduct <= 4))
   {
     /*given in MHz*/
-    testParam.fskDev = fskdDeviation;
+    testParam.BTproduct = BTproduct;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
 
-  testParam.lna = lna;
-  testParam.paBoost = paBoost;
-
   TST_set_config(&testParam);
 
   return AT_OK;
@@ -1760,19 +1768,59 @@ ATEerror_t AT_test_set_config(const char *param)
   /* USER CODE END AT_test_set_config_2 */
 }
 
-ATEerror_t AT_test_stop(const char *param)
+ATEerror_t AT_test_tx(const char *param)
 {
-  /* USER CODE BEGIN AT_test_stop_1 */
+  /* USER CODE BEGIN AT_test_tx_1 */
 
-  /* USER CODE END AT_test_stop_1 */
-  TST_stop();
-  AT_PRINTF("Test Stop\r\n");
-  return AT_OK;
-  /* USER CODE BEGIN AT_test_stop_2 */
+  /* USER CODE END AT_test_tx_1 */
+  const char *buf = param;
+  uint32_t nb_packet;
 
-  /* USER CODE END AT_test_stop_2 */
+  if (1 != tiny_sscanf(buf, "%u", &nb_packet))
+  {
+    AT_PRINTF("AT+TTX: nb packets sent is missing\r\n");
+    return AT_PARAM_ERROR;
+  }
+
+  if (0U == TST_TX_Start(nb_packet))
+  {
+    return AT_OK;
+  }
+  else
+  {
+    return AT_BUSY_ERROR;
+  }
+  /* USER CODE BEGIN AT_test_tx_2 */
+
+  /* USER CODE END AT_test_tx_2 */
 }
 
+ATEerror_t AT_test_rx(const char *param)
+{
+  /* USER CODE BEGIN AT_test_rx_1 */
+
+  /* USER CODE END AT_test_rx_1 */
+  const char *buf = param;
+  uint32_t nb_packet;
+
+  if (1 != tiny_sscanf(buf, "%u", &nb_packet))
+  {
+    AT_PRINTF("AT+TRX: nb expected packets is missing\r\n");
+    return AT_PARAM_ERROR;
+  }
+
+  if (0U == TST_RX_Start(nb_packet))
+  {
+    return AT_OK;
+  }
+  else
+  {
+    return AT_BUSY_ERROR;
+  }
+  /* USER CODE BEGIN AT_test_rx_2 */
+
+  /* USER CODE END AT_test_rx_2 */
+}
 ATEerror_t AT_Certif(const char *param)
 {
   /* USER CODE BEGIN AT_Certif_1 */
@@ -1800,6 +1848,156 @@ ATEerror_t AT_Certif(const char *param)
   /* USER CODE END AT_Certif_2 */
 }
 
+ATEerror_t AT_test_tx_hopping(const char *param)
+{
+  /* USER CODE BEGIN AT_test_tx_hopping_1 */
+
+  /* USER CODE END AT_test_tx_hopping_1 */
+  const char *buf = param;
+  uint32_t freq_start;
+  uint32_t freq_stop;
+  uint32_t delta_f;
+  uint32_t nb_tx;
+
+  testParameter_t test_param;
+  uint32_t hop_freq;
+
+  if (4 != tiny_sscanf(buf, "%u,%u,%u,%u", &freq_start, &freq_stop, &delta_f, &nb_tx))
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  /*if freq is set in MHz, convert to Hz*/
+  if (freq_start < 1000)
+  {
+    freq_start *= 1000000;
+  }
+  if (freq_stop < 1000)
+  {
+    freq_stop *= 1000000;
+  }
+  /**/
+  hop_freq = freq_start;
+
+  for (int i = 0; i < nb_tx; i++)
+  {
+    /*get current config*/
+    TST_get_config(&test_param);
+
+    /*increment frequency*/
+    test_param.freq = hop_freq;
+    /*Set new config*/
+    TST_set_config(&test_param);
+
+    APP_TPRINTF("Tx Hop at %dHz. %d of %d\r\n", hop_freq, i, nb_tx);
+
+    if (0U != TST_TX_Start(1))
+    {
+      return AT_BUSY_ERROR;
+    }
+
+    hop_freq += delta_f;
+
+    if (hop_freq > freq_stop)
+    {
+      hop_freq = freq_start;
+    }
+  }
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_test_tx_hopping_2 */
+
+  /* USER CODE END AT_test_tx_hopping_2 */
+}
+
+ATEerror_t AT_test_stop(const char *param)
+{
+  /* USER CODE BEGIN AT_test_stop_1 */
+
+  /* USER CODE END AT_test_stop_1 */
+  TST_stop();
+  AT_PRINTF("Test Stop\r\n");
+  return AT_OK;
+  /* USER CODE BEGIN AT_test_stop_2 */
+
+  /* USER CODE END AT_test_stop_2 */
+}
+
+ATEerror_t AT_write_register(const char *param)
+{
+  /* USER CODE BEGIN AT_write_register_1 */
+
+  /* USER CODE END AT_write_register_1 */
+  uint8_t add[2];
+  uint16_t add16;
+  uint8_t data;
+
+  if (strlen(param) != 7)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (stringToData(param, add, 2) != 0)
+  {
+    return AT_PARAM_ERROR;
+  }
+  param += 5;
+  if (stringToData(param, &data, 1) != 0)
+  {
+    return AT_PARAM_ERROR;
+  }
+  add16 = (((uint16_t)add[0]) << 8) + (uint16_t)add[1];
+  Radio.Write(add16, data);
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_write_register_2 */
+
+  /* USER CODE END AT_write_register_2 */
+}
+
+ATEerror_t AT_read_register(const char *param)
+{
+  /* USER CODE BEGIN AT_read_register_1 */
+
+  /* USER CODE END AT_read_register_1 */
+  uint8_t add[2];
+  uint16_t add16;
+  uint8_t data;
+
+  if (strlen(param) != 4)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (stringToData(param, add, 2) != 0)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  add16 = (((uint16_t)add[0]) << 8) + (uint16_t)add[1];
+  data = Radio.Read(add16);
+  AT_PRINTF("REG 0x%04X=0x%02X", add16, data);
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_read_register_2 */
+
+  /* USER CODE END AT_read_register_2 */
+}
+
+/* --------------- Information command --------------- */
+ATEerror_t AT_bat_get(const char *param)
+{
+  /* USER CODE BEGIN AT_bat_get_1 */
+
+  /* USER CODE END AT_bat_get_1 */
+  print_d(SYS_GetBatteryLevel());
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_bat_get_2 */
+
+  /* USER CODE END AT_bat_get_2 */
+}
+
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
@@ -1820,12 +2018,26 @@ static int32_t sscanf_uint32_as_hhx(const char *from, uint32_t *value)
   /* USER CODE END sscanf_uint32_as_hhx_2 */
 }
 
+static int sscanf_16_hhx(const char *from, uint8_t *pt)
+{
+  /* USER CODE BEGIN sscanf_16_hhx_1 */
+
+  /* USER CODE END sscanf_16_hhx_1 */
+  return tiny_sscanf(from, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+                     &pt[0], &pt[1], &pt[2], &pt[3], &pt[4], &pt[5], &pt[6],
+                     &pt[7], &pt[8], &pt[9], &pt[10], &pt[11], &pt[12], &pt[13],
+                     &pt[14], &pt[15]);
+  /* USER CODE BEGIN sscanf_16_hhx_2 */
+
+  /* USER CODE END sscanf_16_hhx_2 */
+}
+
 static void print_uint32_as_02x(uint32_t value)
 {
   /* USER CODE BEGIN print_uint32_as_02x_1 */
 
   /* USER CODE END print_uint32_as_02x_1 */
-  AT_PRINTF("%02x:%02x:%02x:%02x\r\n",
+  AT_PRINTF("%02X:%02X:%02X:%02X\r\n",
             (unsigned)((unsigned char *)(&value))[3],
             (unsigned)((unsigned char *)(&value))[2],
             (unsigned)((unsigned char *)(&value))[1],
@@ -1835,12 +2047,27 @@ static void print_uint32_as_02x(uint32_t value)
   /* USER CODE END print_uint32_as_02x_2 */
 }
 
+static void print_16_02x(uint8_t *pt)
+{
+  /* USER CODE BEGIN print_16_02x_1 */
+
+  /* USER CODE END print_16_02x_1 */
+  AT_PRINTF("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n",
+            pt[0], pt[1], pt[2], pt[3],
+            pt[4], pt[5], pt[6], pt[7],
+            pt[8], pt[9], pt[10], pt[11],
+            pt[12], pt[13], pt[14], pt[15]);
+  /* USER CODE BEGIN print_16_02x_2 */
+
+  /* USER CODE END print_16_02x_2 */
+}
+
 static void print_8_02x(uint8_t *pt)
 {
   /* USER CODE BEGIN print_8_02x_1 */
 
   /* USER CODE END print_8_02x_1 */
-  AT_PRINTF("%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\r\n",
+  AT_PRINTF("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n",
             pt[0], pt[1], pt[2], pt[3], pt[4], pt[5], pt[6], pt[7]);
   /* USER CODE BEGIN print_8_02x_2 */
 
@@ -1890,7 +2117,7 @@ static void CertifSend(void)
   AppData.Port = 99;
 
   /* Restart Tx to prevent a previous Join Failed */
-  if(LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
   {
     UTIL_TIMER_Start(&TxCertifTimer);
   }
@@ -1933,7 +2160,7 @@ static int32_t stringToData(const char *str, uint8_t *data, uint32_t Size)
     hex[0] = *str++;
     hex[1] = *str++;
 
-    /*check if input is hexa */
+    /*check if input is hex */
     if ((isHex(hex[0]) == -1) || (isHex(hex[1]) == -1))
     {
       return -1;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.h
index 62240a08..caacbafb 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_at.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_AT_H__
@@ -48,7 +50,7 @@ typedef enum eATEerror
   AT_NO_NET_JOINED,
   AT_RX_ERROR,
   AT_NO_CLASS_B_ENABLE,
-  AT_DUTYCYLE_RESTRICTED,
+  AT_DUTYCYCLE_RESTRICTED,
   AT_CRYPTO_ERROR,
   AT_MAX,
 } ATEerror_t;
@@ -77,45 +79,52 @@ typedef enum eATEerror
 /* General commands */
 #define AT_RESET      "Z"
 #define AT_VL         "+VL"
-#define AT_VER        "+VER"
+#define AT_LTIME      "+LTIME"
 
-/* MAC Commands */
-#define AT_BAND       "+BAND"
-#define AT_DEUI       "+DEUI"
-#define AT_DADDR      "+DADDR"
+/* Keys, IDs and EUIs management commands */
 #define AT_JOINEUI    "+APPEUI" /*to match with V1.0.x specification- For V1.1.x "+APPEUI" will be replaced by "+JOINEUI"*/
+#define AT_NWKKEY     "+NWKKEY"
+#define AT_APPKEY     "+APPKEY"
+#define AT_NWKSKEY    "+NWKSKEY"
+#define AT_APPSKEY    "+APPSKEY"
+#define AT_DADDR      "+DADDR"
+#define AT_DEUI       "+DEUI"
+#define AT_NWKID      "+NWKID"
+
+/* LoRaWAN join and send data commands */
+#define AT_JOIN       "+JOIN"
+#define AT_LINKC      "+LINKC"
+#define AT_SEND       "+SEND"
+
+/* LoRaWAN network management commands */
+#define AT_VER        "+VER"
 #define AT_ADR        "+ADR"
 #define AT_DR         "+DR"
-#define AT_TXP        "+TXP"
+#define AT_BAND       "+BAND"
+#define AT_CLASS      "+CLASS"
 #define AT_DCS        "+DCS"
-#define AT_RX2FQ      "+RX2FQ"
-#define AT_RX2DR      "+RX2DR"
-#define AT_RX1DL      "+RX1DL"
-#define AT_RX2DL      "+RX2DL"
 #define AT_JN1DL      "+JN1DL"
 #define AT_JN2DL      "+JN2DL"
-#define AT_NWKID      "+NWKID"
-#define AT_CLASS      "+CLASS"
-#define AT_JOIN       "+JOIN"
-#define AT_SEND       "+SEND"
+#define AT_RX1DL      "+RX1DL"
+#define AT_RX2DL      "+RX2DL"
+#define AT_RX2DR      "+RX2DR"
+#define AT_RX2FQ      "+RX2FQ"
+#define AT_TXP        "+TXP"
 #define AT_PGSLOT     "+PGSLOT"
-#define AT_LTIME      "+LTIME"
-#define AT_REGW       "+REGW"
-#define AT_REGR       "+REGR"
 
-/* Radio Tests Commands */
-#define AT_TRSSI      "+TRSSI"
+/* Radio tests commands */
 #define AT_TTONE      "+TTONE"
-#define AT_TTLRA      "+TTLRA"
-#define AT_TRLRA      "+TRLRA"
+#define AT_TRSSI      "+TRSSI"
+#define AT_TCONF      "+TCONF"
 #define AT_TTX        "+TTX"
 #define AT_TRX        "+TRX"
+#define AT_CERTIF     "+CERTIF"
 #define AT_TTH        "+TTH"
-#define AT_TCONF      "+TCONF"
 #define AT_TOFF       "+TOFF"
-#define AT_CERTIF     "+CERTIF"
+#define AT_REGW       "+REGW"
+#define AT_REGR       "+REGR"
 
-/* Peripherical Commands */
+/* Information command */
 #define AT_BAT        "+BAT"
 
 /* USER CODE BEGIN EM */
@@ -123,10 +132,24 @@ typedef enum eATEerror
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Return AT_OK in all cases
+  * @param  param string of the AT command - unused
+  * @retval AT_OK
+  */
+ATEerror_t AT_return_ok(const char *param);
+
+/**
+  * @brief  Return AT_ERROR in all cases
+  * @param  param string of the AT command - unused
+  * @retval AT_ERROR
+  */
+ATEerror_t AT_return_error(const char *param);
+
+/* --------------- Application events --------------- */
 /**
   * @brief  Event callback on join
   * @param params
-  * @retval None
   */
 void AT_event_join(LmHandlerJoinParams_t *params);
 
@@ -134,402 +157,455 @@ void AT_event_join(LmHandlerJoinParams_t *params);
   * @brief  Event callback on received data
   * @param appData
   * @param params
-  * @retval None
   */
 void AT_event_receive(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
 /**
   * @brief  Event callback on confirmed acknowledge
   * @param  params
-  * @retval None
   */
 void AT_event_confirm(LmHandlerTxParams_t *params);
 
+/* --------------- General commands --------------- */
 /**
-  * @brief  Return AT_OK in all cases
-  * @param  Param string of the AT command - unused
+  * @brief  Trig a reset of the MCU
+  * @param  param string of the AT command - unused
   * @retval AT_OK
   */
-ATEerror_t AT_return_ok(const char *param);
+ATEerror_t AT_reset(const char *param);
 
 /**
-  * @brief  Return AT_ERROR in all cases
-  * @param  Param string of the AT command - unused
-  * @retval AT_ERROR
+  * @brief  Get the verbose level
+  * @param  param String parameter
+  * @retval AT_OK
   */
-ATEerror_t AT_return_error(const char *param);
+ATEerror_t AT_verbose_get(const char *param);
 
 /**
-  * @brief  Trig a reset of the MCU
-  * @param  Param string of the AT command - unused
+  * @brief  Set the verbose level
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_reset(const char *param);
+ATEerror_t AT_verbose_set(const char *param);
 
 /**
-  * @brief  Print actual Active Region
-  * @param  Param string of the AT command - unused
+  * @brief  Get the local time in UTC format
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_Region_get(const char *param);
+ATEerror_t AT_LocalTime_get(const char *param);
 
+/* --------------- Keys, IDs and EUIs management commands --------------- */
 /**
-  * @brief  Set Active Region
-  * @param  Param string of the AT command
-  * @retval AT_OK if OK
+  * @brief  Print Join Eui
+  * @param  param string of the AT command
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Region_set(const char *param);
+ATEerror_t AT_JoinEUI_get(const char *param);
 
 /**
-  * @brief  Print Device EUI
-  * @param  Param string of the AT command - unused
+  * @brief  Set Join Eui
+  * @param  param string of the AT command
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  */
+ATEerror_t AT_JoinEUI_set(const char *param);
+
+/**
+  * @brief  Print Network Key
+  * @param  param string of the AT command
   * @retval AT_OK
   */
-ATEerror_t AT_DevEUI_get(const char *param);
+ATEerror_t AT_NwkKey_get(const char *param);
 
 /**
-  * @brief  Set Device EUI
-  * @param  Param string of the AT command
-  * @retval AT_OK if OK
+  * @brief  Set Network Key
+  * @param  param string of the AT command
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DevEUI_set(const char *param);
+ATEerror_t AT_NwkKey_set(const char *param);
 
 /**
-  * @brief  Print Join Eui
-  * @param  Param string of the AT command
+  * @brief  Print Application Key
+  * @param  param string of the AT command
+  * @retval AT_OK
+  */
+ATEerror_t AT_AppKey_get(const char *param);
+
+/**
+  * @brief  Set Application Key
+  * @param  param string of the AT command
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_JoinEUI_get(const char *param);
+ATEerror_t AT_AppKey_set(const char *param);
 
 /**
-  * @brief  Set Join Eui
-  * @param  Param string of the AT command
+  * @brief  Print Network Session Key
+  * @param  param string of the AT command
+  * @retval AT_OK
+  */
+ATEerror_t AT_NwkSKey_get(const char *param);
+
+/**
+  * @brief  Set Network Session Key
+  * @param  param String pointing to provided DevAddr
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_JoinEUI_set(const char *param);
+ATEerror_t AT_NwkSKey_set(const char *param);
+
+/**
+  * @brief  Print Application Session Key
+  * @param  param string of the AT command
+  * @retval AT_OK
+  */
+ATEerror_t AT_AppSKey_get(const char *param);
+
+/**
+  * @brief  Set Application Session Key
+  * @param  param String pointing to provided DevAddr
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  */
+ATEerror_t AT_AppSKey_set(const char *param);
 
 /**
   * @brief  Print the DevAddr
-  * @param  String pointing to provided DevAddr
+  * @param  param String pointing to provided DevAddr
   * @retval AT_OK
   */
 ATEerror_t AT_DevAddr_get(const char *param);
 
 /**
   * @brief  Set DevAddr
-  * @param  String pointing to provided DevAddr
+  * @param  param String pointing to provided DevAddr
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_DevAddr_set(const char *param);
 
 /**
-  * @brief  Print Adaptative Data Rate setting
-  * @param  String pointing to provided ADR setting
+  * @brief  Print Device EUI
+  * @param  param string of the AT command - unused
+  * @retval AT_OK
+  */
+ATEerror_t AT_DevEUI_get(const char *param);
+
+/**
+  * @brief  Set Device EUI
+  * @param  param string of the AT command
+  * @retval AT_OK if OK
+  */
+ATEerror_t AT_DevEUI_set(const char *param);
+
+/**
+  * @brief  Print the Network ID
+  * @param  param String pointing to provided parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_ADR_get(const char *param);
+ATEerror_t AT_NetworkID_get(const char *param);
 
 /**
-  * @brief  Set Adaptative Data Rate setting
-  * @param  String pointing to provided ADR setting
+  * @brief  Set the Network ID
+  * @param  param String pointing to provided parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_ADR_set(const char *param);
+ATEerror_t AT_NetworkID_set(const char *param);
 
+/* --------------- LoRaWAN join and send data commands --------------- */
 /**
-  * @brief  Print Data Rate
-  * @param  String pointing to provided rate
+  * @brief  Join a network
+  * @param  param String parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DataRate_get(const char *param);
+ATEerror_t AT_Join(const char *param);
 
 /**
-  * @brief  Set Data Rate
-  * @param  String pointing to provided rate
+  * @brief  Piggyback a Link Check Request to the next uplink
+  * @param  param String parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DataRate_set(const char *param);
+ATEerror_t AT_Link_Check(const char *param);
 
 /**
-  * @brief  Set ETSI Duty Cycle parameter
-  * @param  String pointing to provided Duty Cycle value
+  * @brief  Print last received message
+  * @param  param String parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DutyCycle_set(const char *param);
+ATEerror_t AT_Send(const char *param);
 
+/* --------------- LoRaWAN network management commands --------------- */
 /**
-  * @brief  Get ETSI Duty Cycle parameter
-  * @param  0 if disable, 1 if enable
+  * @brief  Print the version of the AT_Slave FW
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_DutyCycle_get(const char *param);
+ATEerror_t AT_version_get(const char *param);
 
 /**
-  * @brief  Print Rx2 window frequency
-  * @param  String pointing to parameter
+  * @brief  Print Adaptive Data Rate setting
+  * @param  param String pointing to provided ADR setting
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx2Frequency_get(const char *param);
+ATEerror_t AT_ADR_get(const char *param);
 
 /**
-  * @brief  Print Rx2 window data rate
-  * @param  String pointing to parameter
+  * @brief  Set Adaptive Data Rate setting
+  * @param  param String pointing to provided ADR setting
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx2DataRate_get(const char *param);
+ATEerror_t AT_ADR_set(const char *param);
 
 /**
-  * @brief  Print Transmit Power
-  * @param  String pointing to provided power
+  * @brief  Print Data Rate
+  * @param  param String pointing to provided rate
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_TransmitPower_get(const char *param);
+ATEerror_t AT_DataRate_get(const char *param);
 
 /**
-  * @brief  Print the delay between the end of the Tx and the Rx Window 1
-  * @param  String pointing to provided param
+  * @brief  Set Data Rate
+  * @param  param String pointing to provided rate
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx1Delay_get(const char *param);
+ATEerror_t AT_DataRate_set(const char *param);
 
 /**
-  * @brief  Print the delay between the end of the Tx and the Rx Window 2
-  * @param  String pointing to provided param
-  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  * @brief  Print actual Active Region
+  * @param  param string of the AT command - unused
+  * @retval AT_OK
   */
-ATEerror_t AT_Rx2Delay_get(const char *param);
+ATEerror_t AT_Region_get(const char *param);
 
 /**
-  * @brief  Print the delay between the end of the Tx and the Join Rx Window 1
-  * @param  String pointing to provided param
-  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  * @brief  Set Active Region
+  * @param  param string of the AT command
+  * @retval AT_OK if OK
   */
-ATEerror_t AT_JoinAcceptDelay1_get(const char *param);
+ATEerror_t AT_Region_set(const char *param);
 
 /**
-  * @brief  Print the delay between the end of the Tx and the Join Rx Window 2
-  * @param  String pointing to provided param
+  * @brief  Print the Device Class
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_JoinAcceptDelay2_get(const char *param);
+ATEerror_t AT_DeviceClass_get(const char *param);
 
 /**
-  * @brief  Set Transmit Power
-  * @param  String pointing to provided power
+  * @brief  Set the Device Class
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_TransmitPower_set(const char *param);
+ATEerror_t AT_DeviceClass_set(const char *param);
 
 /**
-  * @brief  Set Rx2 window frequency
-  * @param  String pointing to parameter
-  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  * @brief  Get ETSI Duty Cycle parameter
+  * @param  param String pointing to provided param
+  * @retval AT_OK
   */
-ATEerror_t AT_Rx2Frequency_set(const char *param);
+ATEerror_t AT_DutyCycle_get(const char *param);
 
 /**
-  * @brief  Set Rx2 window data rate
-  * @param  String pointing to parameter
+  * @brief  Set ETSI Duty Cycle parameter
+  * @param  param String pointing to provided Duty Cycle value
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx2DataRate_set(const char *param);
+ATEerror_t AT_DutyCycle_set(const char *param);
 
 /**
-  * @brief  Set the delay between the end of the Tx and the Rx Window 1
-  * @param  String pointing to provided param
+  * @brief  Print the delay between the end of the Tx and the Join Rx Window 1
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx1Delay_set(const char *param);
+ATEerror_t AT_JoinAcceptDelay1_get(const char *param);
 
 /**
-  * @brief  Set the delay between the end of the Tx and the Rx Window 2
-  * @param  String pointing to provided param
+  * @brief  Set the delay between the end of the Tx and the Join Rx Window 1
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx2Delay_set(const char *param);
+ATEerror_t AT_JoinAcceptDelay1_set(const char *param);
 
 /**
-  * @brief  Set the delay between the end of the Tx and the Join Rx Window 1
-  * @param  String pointing to provided param
+  * @brief  Print the delay between the end of the Tx and the Join Rx Window 2
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_JoinAcceptDelay1_set(const char *param);
+ATEerror_t AT_JoinAcceptDelay2_get(const char *param);
 
 /**
   * @brief  Set the delay between the end of the Tx and the Join Rx Window 2
-  * @param  String pointing to provided param
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_JoinAcceptDelay2_set(const char *param);
 
 /**
-  * @brief  Print the Network ID
-  * @param  String pointing to provided parameter
+  * @brief  Print the delay between the end of the Tx and the Rx Window 1
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_NetworkID_get(const char *param);
+ATEerror_t AT_Rx1Delay_get(const char *param);
 
 /**
-  * @brief  Set the Network ID
-  * @param  String pointing to provided parameter
+  * @brief  Set the delay between the end of the Tx and the Rx Window 1
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_NetworkID_set(const char *param);
+ATEerror_t AT_Rx1Delay_set(const char *param);
 
 /**
-  * @brief  Print the Device Class
-  * @param  String pointing to provided param
+  * @brief  Print the delay between the end of the Tx and the Rx Window 2
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DeviceClass_get(const char *param);
+ATEerror_t AT_Rx2Delay_get(const char *param);
 
 /**
-  * @brief  Set the Device Class
-  * @param  String pointing to provided param
+  * @brief  Set the delay between the end of the Tx and the Rx Window 2
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DeviceClass_set(const char *param);
+ATEerror_t AT_Rx2Delay_set(const char *param);
 
 /**
-  * @brief  Join a network
-  * @param  String parameter
+  * @brief  Print Rx2 window data rate
+  * @param  param String pointing to parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Join(const char *param);
+ATEerror_t AT_Rx2DataRate_get(const char *param);
 
 /**
-  * @brief  Print last received message
-  * @param  String parameter
+  * @brief  Set Rx2 window data rate
+  * @param  param String pointing to parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Send(const char *param);
+ATEerror_t AT_Rx2DataRate_set(const char *param);
 
 /**
-  * @brief  Print the version of the AT_Slave FW
-  * @param  String parameter
-  * @retval AT_OK
+  * @brief  Print Rx2 window frequency
+  * @param  param String pointing to parameter
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_version_get(const char *param);
+ATEerror_t AT_Rx2Frequency_get(const char *param);
 
 /**
-  * @brief  Get the battery level
-  * @param  String parameter
-  * @retval AT_OK
+  * @brief  Set Rx2 window frequency
+  * @param  param String pointing to parameter
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_bat_get(const char *param);
+ATEerror_t AT_Rx2Frequency_set(const char *param);
+
+/**
+  * @brief  Print Transmit Power
+  * @param  param String pointing to provided power
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  */
+ATEerror_t AT_TransmitPower_get(const char *param);
+
+/**
+  * @brief  Set Transmit Power
+  * @param  param String pointing to provided power
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  */
+ATEerror_t AT_TransmitPower_set(const char *param);
 
 /**
   * @brief  Get the unicast pingslot periodicity, Data rate and PsFrequency
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PingSlot_get(const char *param);
 
 /**
   * @brief  Set the unicast pingslot periodicity
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PingSlot_set(const char *param);
 
+/* --------------- Radio tests commands --------------- */
 /**
-  * @brief  Get the local time in UTC format
-  * @param  String parameter
+  * @brief  Start Tx test
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_LocalTime_get(const char *param);
+ATEerror_t AT_test_txTone(const char *param);
 
 /**
-  * @brief  Sart Tx test
-  * @param  String parameter
+  * @brief  Start Rx tone
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_test_txTone(const char *param);
+ATEerror_t AT_test_rxRssi(const char *param);
 
 /**
-  * @brief  Sart Rx tone
-  * @param  String parameter
+  * @brief  Get Rx or Tx test config
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_test_rxRssi(const char *param);
+ATEerror_t AT_test_get_config(const char *param);
 
 /**
-  * @brief  stop Rx or Tx test
-  * @param  String parameter
+  * @brief  Set Rx or Tx test config
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_test_stop(const char *param);
+ATEerror_t AT_test_set_config(const char *param);
 
 /**
   * @brief  Start Tx LoRa test
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_tx(const char *param);
 
 /**
   * @brief  Start Rx LoRa test
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_rx(const char *param);
 
-/**
-  * @brief  Start Tx hopping
-  * @param  String parameter
-  * @retval AT_OK
-  */
-ATEerror_t AT_test_tx_hopping(const char *param);
-
-/**
-  * @brief  Set Rx or Tx test config
-  * @param  String parameter
-  * @retval AT_OK
-  */
-ATEerror_t AT_test_set_config(const char *param);
-
-/**
-  * @brief  Get Rx or Tx test config
-  * @param  String parameter
-  * @retval AT_OK
-  */
-ATEerror_t AT_test_get_config(const char *param);
-
 /**
   * @brief  set the Modem in Certif Mode
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_Certif(const char *param);
 
 /**
-  * @brief  Get the verbose level
-  * @param  String parameter
+  * @brief  Start Tx hopping
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_verbose_get(const char *param);
+ATEerror_t AT_test_tx_hopping(const char *param);
 
 /**
-  * @brief  Set the verbose level
-  * @param  String parameter
+  * @brief  stop Rx or Tx test
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_verbose_set(const char *param);
+ATEerror_t AT_test_stop(const char *param);
 
 /**
   * @brief  Write Radio Register
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_write_register(const char *param);
 
 /**
   * @brief  Read Radio Register
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_read_register(const char *param);
 
+/* --------------- Information command --------------- */
+/**
+  * @brief  Get the battery level
+  * @param  param String parameter
+  * @retval AT_OK
+  */
+ATEerror_t AT_bat_get(const char *param);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_command.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_command.c
index 97bfdeac..dd8a0e71 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_command.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_command.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_command.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <string.h>
@@ -59,7 +61,6 @@ struct ATCommand_s
 /* Private define ------------------------------------------------------------*/
 #define CMD_SIZE                        540
 #define CIRC_BUFF_SIZE                  8
-#define HELP_DISPLAY_FLUSH_DELAY        100
 
 /* USER CODE BEGIN PD */
 
@@ -85,7 +86,7 @@ static const char *const ATError_description[] =
   "\r\nAT_NO_NETWORK_JOINED\r\n",   /* AT_NO_NET_JOINED */
   "\r\nAT_RX_ERROR\r\n",            /* AT_RX_ERROR */
   "\r\nAT_NO_CLASS_B_ENABLE\r\n",   /* AT_NO_CLASS_B_ENABLE */
-  "\r\nAT_DUTYCYLE_RESTRICTED\r\n", /* AT_DUTYCYLE_RESTRICTED */
+  "\r\nAT_DUTYCYCLE_RESTRICTED\r\n", /* AT_DUTYCYCLE_RESTRICTED */
   "\r\nAT_CRYPTO_ERROR\r\n",        /* AT_CRYPTO_ERROR */
   "\r\nerror unknown\r\n",          /* AT_MAX */
 };
@@ -95,6 +96,7 @@ static const char *const ATError_description[] =
   */
 static const struct ATCommand_s ATCommand[] =
 {
+  /* General commands */
   {
     .string = AT_RESET,
     .size_string = sizeof(AT_RESET) - 1,
@@ -118,178 +120,181 @@ static const struct ATCommand_s ATCommand[] =
   },
 
   {
-    .string = AT_VER,
-    .size_string = sizeof(AT_VER) - 1,
+    .string = AT_LTIME,
+    .size_string = sizeof(AT_LTIME) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_VER" Get the FW version\r\n",
+    .help_string = "AT"AT_LTIME" Get the local time in UTC format\r\n",
 #endif /* !NO_HELP */
-    .get = AT_version_get,
+    .get = AT_LocalTime_get,
     .set = AT_return_error,
     .run = AT_return_error,
   },
 
+  /* Keys, IDs and EUIs management commands */
   {
-    .string = AT_BAND,
-    .size_string = sizeof(AT_BAND) - 1,
+    .string = AT_JOINEUI,
+    .size_string = sizeof(AT_JOINEUI) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_BAND"=<BandID><CR>. Get or Set the Active Region BandID=[0:AS923, 1:AU915, 2:CN470, 3:CN779, 4:EU433, 5:EU868, 6:KR920, 7:IN865, 8:US915, 9:RU864]\r\n",
+    .help_string = "AT"AT_JOINEUI"=<XX:XX:XX:XX:XX:XX:XX:XX><CR>. Get or Set the App Eui\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Region_get,
-    .set = AT_Region_set,
+    .get = AT_JoinEUI_get,
+    .set = AT_JoinEUI_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_DEUI,
-    .size_string = sizeof(AT_DEUI) - 1,
+    .string = AT_NWKKEY,
+    .size_string = sizeof(AT_NWKKEY) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_DEUI"=<XX:XX:XX:XX:XX:XX:XX:XX><CR>. Get or Set the Device EUI\r\n",
+    .help_string = "AT"AT_NWKKEY"=<XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX><CR>: Get or Set the Network Key\r\n",
 #endif /* !NO_HELP */
-    .get = AT_DevEUI_get,
-    .set = AT_DevEUI_set,
+    .get = AT_NwkKey_get,
+    .set = AT_NwkKey_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_DADDR,
-    .size_string = sizeof(AT_DADDR) - 1,
+    .string = AT_APPKEY,
+    .size_string = sizeof(AT_APPKEY) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_DADDR"=<XXXXXXXX><CR>. Get or Set the Device address\r\n",
+    .help_string = "AT"AT_APPKEY"=<XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX><CR>: Get or Set the Application Key\r\n",
 #endif /* !NO_HELP */
-    .get = AT_DevAddr_get,
-    .set = AT_DevAddr_set,
+    .get = AT_AppKey_get,
+    .set = AT_AppKey_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_JOINEUI,
-    .size_string = sizeof(AT_JOINEUI) - 1,
+    .string = AT_NWKSKEY,
+    .size_string = sizeof(AT_NWKSKEY) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_JOINEUI"=<XX:XX:XX:XX:XX:XX:XX:XX><CR>. Get or Set the App Eui\r\n",
+    .help_string = "AT"AT_NWKSKEY"=<XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX><CR>: Get or Set the Network Session Key\r\n",
 #endif /* !NO_HELP */
-    .get = AT_JoinEUI_get,
-    .set = AT_JoinEUI_set,
+    .get = AT_NwkSKey_get,
+    .set = AT_NwkSKey_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_ADR,
-    .size_string = sizeof(AT_ADR) - 1,
+    .string = AT_APPSKEY,
+    .size_string = sizeof(AT_APPSKEY) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_ADR"=<ADR><CR>. Get or Set the Adaptive Data Rate setting ADR=[0:off, 1:on]\r\n",
+    .help_string = "AT"AT_APPSKEY"=<XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX><CR>: Get or Set the Application Session Key\r\n",
 #endif /* !NO_HELP */
-    .get = AT_ADR_get,
-    .set = AT_ADR_set,
+    .get = AT_AppSKey_get,
+    .set = AT_AppSKey_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_DR,
-    .size_string = sizeof(AT_DR) - 1,
+    .string = AT_DADDR,
+    .size_string = sizeof(AT_DADDR) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_DR"=<DataRate><CR>. Get or Set the Tx DataRate=[0..7]\r\n",
+    .help_string = "AT"AT_DADDR"=<XXXXXXXX><CR>. Get or Set the Device address\r\n",
 #endif /* !NO_HELP */
-    .get = AT_DataRate_get,
-    .set = AT_DataRate_set,
+    .get = AT_DevAddr_get,
+    .set = AT_DevAddr_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_TXP,
-    .size_string = sizeof(AT_TXP) - 1,
+    .string = AT_DEUI,
+    .size_string = sizeof(AT_DEUI) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TXP"=<Power><CR>. Get or Set the Transmit Power=[0..15](valid range according to region)\r\n",
+    .help_string = "AT"AT_DEUI"=<XX:XX:XX:XX:XX:XX:XX:XX><CR>. Get or Set the Device EUI\r\n",
 #endif /* !NO_HELP */
-    .get = AT_TransmitPower_get,
-    .set = AT_TransmitPower_set,
+    .get = AT_DevEUI_get,
+    .set = AT_DevEUI_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_DCS,
-    .size_string = sizeof(AT_DCS) - 1,
+    .string = AT_NWKID,
+    .size_string = sizeof(AT_NWKID) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_DCS"=<DutyCycle><CR>. Get or Set the ETSI DutyCycle=[0:disable, 1:enable] - Only for testing\r\n",
+    .help_string = "AT"AT_NWKID"=<NwkID><CR>. Get or Set the Network ID=[0..127]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_DutyCycle_get,
-    .set = AT_DutyCycle_set,
+    .get = AT_NetworkID_get,
+    .set = AT_NetworkID_set,
     .run = AT_return_error,
   },
 
+  /* LoRaWAN join and send data commands */
   {
-    .string = AT_RX2FQ,
-    .size_string = sizeof(AT_RX2FQ) - 1,
+    .string = AT_JOIN,
+    .size_string = sizeof(AT_JOIN) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_RX2FQ"=<Freq><CR>. Get or Set the Rx2 window Freq in Hz\r\n",
+    .help_string = "AT"AT_JOIN"=<Mode><CR>. Join network with Mode=[0:ABP, 1:OTAA]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Rx2Frequency_get,
-    .set = AT_Rx2Frequency_set,
+    .get = AT_return_error,
+    .set = AT_Join,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_RX2DR,
-    .size_string = sizeof(AT_RX2DR) - 1,
+    .string = AT_LINKC,
+    .size_string = sizeof(AT_LINKC) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_RX2DR"=<DataRate><CR>. Get or Set the Rx2 window DataRate=[0..7]\r\n",
+    .help_string = "AT"AT_LINKC". Piggyback a Link Check Request to the next uplink\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Rx2DataRate_get,
-    .set = AT_Rx2DataRate_set,
-    .run = AT_return_error,
+    .get = AT_return_error,
+    .set = AT_return_error,
+    .run = AT_Link_Check,
   },
 
   {
-    .string = AT_RX1DL,
-    .size_string = sizeof(AT_RX1DL) - 1,
+    .string = AT_SEND,
+    .size_string = sizeof(AT_SEND) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_RX1DL"=<Delay><CR>. Get or Set the delay between the end of the Tx and the Rx Window 1 in ms\r\n",
+    .help_string = "AT"AT_SEND"=<Port>:<Ack>:<Payload><CR>. Send binary data with the application Port=[1..199] and Ack=[0:unconfirmed, 1:confirmed]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Rx1Delay_get,
-    .set = AT_Rx1Delay_set,
+    .get = AT_return_error,
+    .set = AT_Send,
     .run = AT_return_error,
   },
 
+  /* LoRaWAN network management commands */
   {
-    .string = AT_RX2DL,
-    .size_string = sizeof(AT_RX2DL) - 1,
+    .string = AT_VER,
+    .size_string = sizeof(AT_VER) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_RX2DL"=<Delay><CR>. Get or Set the delay between the end of the Tx and the Rx Window 2 in ms\r\n",
+    .help_string = "AT"AT_VER" Get the FW version\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Rx2Delay_get,
-    .set = AT_Rx2Delay_set,
+    .get = AT_version_get,
+    .set = AT_return_error,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_JN1DL,
-    .size_string = sizeof(AT_JN1DL) - 1,
+    .string = AT_ADR,
+    .size_string = sizeof(AT_ADR) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_JN1DL"=<Delay><CR>. Get or Set the Join Accept Delay between the end of the Tx and the Join Rx Window 1 in ms\r\n",
+    .help_string = "AT"AT_ADR"=<ADR><CR>. Get or Set the Adaptive Data Rate setting ADR=[0:off, 1:on]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_JoinAcceptDelay1_get,
-    .set = AT_JoinAcceptDelay1_set,
+    .get = AT_ADR_get,
+    .set = AT_ADR_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_JN2DL,
-    .size_string = sizeof(AT_JN2DL) - 1,
+    .string = AT_DR,
+    .size_string = sizeof(AT_DR) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_JN2DL"=<Delay><CR>. Get or Set the Join Accept Delay between the end of the Tx and the Join Rx Window 2 in ms\r\n",
+    .help_string = "AT"AT_DR"=<DataRate><CR>. Get or Set the Tx DataRate=[0..7]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_JoinAcceptDelay2_get,
-    .set = AT_JoinAcceptDelay2_set,
+    .get = AT_DataRate_get,
+    .set = AT_DataRate_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_NWKID,
-    .size_string = sizeof(AT_NWKID) - 1,
+    .string = AT_BAND,
+    .size_string = sizeof(AT_BAND) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_NWKID"=<NwkID><CR>. Get or Set the Network ID=[0..127]\r\n",
+    .help_string = "AT"AT_BAND"=<BandID><CR>. Get or Set the Active Region BandID=[0:AS923, 1:AU915, 2:CN470, 3:CN779, 4:EU433, 5:EU868, 6:KR920, 7:IN865, 8:US915, 9:RU864]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_NetworkID_get,
-    .set = AT_NetworkID_set,
+    .get = AT_Region_get,
+    .set = AT_Region_set,
     .run = AT_return_error,
   },
 
@@ -305,83 +310,105 @@ static const struct ATCommand_s ATCommand[] =
   },
 
   {
-    .string = AT_JOIN,
-    .size_string = sizeof(AT_JOIN) - 1,
+    .string = AT_DCS,
+    .size_string = sizeof(AT_DCS) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_JOIN"=<Mode><CR>. Join network with Mode=[0:ABP, 1:OTAA]\r\n",
+    .help_string = "AT"AT_DCS"=<DutyCycle><CR>. Get or Set the ETSI DutyCycle=[0:disable, 1:enable] - Only for testing\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_Join,
+    .get = AT_DutyCycle_get,
+    .set = AT_DutyCycle_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_SEND,
-    .size_string = sizeof(AT_SEND) - 1,
+    .string = AT_JN1DL,
+    .size_string = sizeof(AT_JN1DL) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_SEND"=<Port>:<Ack>:<Payload><CR>. Send binary data with the application Port=[1..199] and Ack=[0:unconfirmed, 1:confirmed]\r\n",
+    .help_string = "AT"AT_JN1DL"=<Delay><CR>. Get or Set the Join Accept Delay between the end of the Tx and the Join Rx Window 1 in ms\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_Send,
+    .get = AT_JoinAcceptDelay1_get,
+    .set = AT_JoinAcceptDelay1_set,
     .run = AT_return_error,
   },
+
   {
-    .string = AT_PGSLOT,
-    .size_string = sizeof(AT_PGSLOT) - 1,
+    .string = AT_JN2DL,
+    .size_string = sizeof(AT_JN2DL) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_PGSLOT"=<Period><CR>. Set or Get the unicast ping slot Period=[0:1s .. 7:128s](=2^Period)\r\n",
+    .help_string = "AT"AT_JN2DL"=<Delay><CR>. Get or Set the Join Accept Delay between the end of the Tx and the Join Rx Window 2 in ms\r\n",
 #endif /* !NO_HELP */
-    .get = AT_PingSlot_get,
-    .set = AT_PingSlot_set,
+    .get = AT_JoinAcceptDelay2_get,
+    .set = AT_JoinAcceptDelay2_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_LTIME,
-    .size_string = sizeof(AT_LTIME) - 1,
+    .string = AT_RX1DL,
+    .size_string = sizeof(AT_RX1DL) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_LTIME" Get the local time in UTC format\r\n",
+    .help_string = "AT"AT_RX1DL"=<Delay><CR>. Get or Set the delay between the end of the Tx and the Rx Window 1 in ms\r\n",
 #endif /* !NO_HELP */
-    .get = AT_LocalTime_get,
-    .set = AT_return_error,
+    .get = AT_Rx1Delay_get,
+    .set = AT_Rx1Delay_set,
     .run = AT_return_error,
   },
 
-#ifdef AT_RADIO_ACCESS
   {
-    .string = AT_REGW,
-    .size_string = sizeof(AT_REGW) - 1,
+    .string = AT_RX2DL,
+    .size_string = sizeof(AT_RX2DL) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_REGW"=<Addr>:<Data><CR> Write Radio Register Addr=[4 hexa char], Data=[2 hexa char]\r\n",
+    .help_string = "AT"AT_RX2DL"=<Delay><CR>. Get or Set the delay between the end of the Tx and the Rx Window 2 in ms\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_write_register,
+    .get = AT_Rx2Delay_get,
+    .set = AT_Rx2Delay_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_REGR,
-    .size_string = sizeof(AT_REGR) - 1,
+    .string = AT_RX2DR,
+    .size_string = sizeof(AT_RX2DR) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_REGR"=<Addr><CR>. Read Radio Register Addr=[4 hexa char]\r\n",
+    .help_string = "AT"AT_RX2DR"=<DataRate><CR>. Get or Set the Rx2 window DataRate=[0..7]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_read_register,
+    .get = AT_Rx2DataRate_get,
+    .set = AT_Rx2DataRate_set,
     .run = AT_return_error,
   },
-#endif /*AT_RADIO_ACCESS*/
 
   {
-    .string = AT_TRSSI,
-    .size_string = sizeof(AT_TRSSI) - 1,
+    .string = AT_RX2FQ,
+    .size_string = sizeof(AT_RX2FQ) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TRSSI" Starts RF RSSI tone test\r\n",
+    .help_string = "AT"AT_RX2FQ"=<Freq><CR>. Get or Set the Rx2 window Freq in Hz\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_return_error,
-    .run = AT_test_rxRssi,
+    .get = AT_Rx2Frequency_get,
+    .set = AT_Rx2Frequency_set,
+    .run = AT_return_error,
   },
 
+  {
+    .string = AT_TXP,
+    .size_string = sizeof(AT_TXP) - 1,
+#ifndef NO_HELP
+    .help_string = "AT"AT_TXP"=<Power><CR>. Get or Set the Transmit Power=[0..15](valid range according to region)\r\n",
+#endif /* !NO_HELP */
+    .get = AT_TransmitPower_get,
+    .set = AT_TransmitPower_set,
+    .run = AT_return_error,
+  },
+
+  {
+    .string = AT_PGSLOT,
+    .size_string = sizeof(AT_PGSLOT) - 1,
+#ifndef NO_HELP
+    .help_string = "AT"AT_PGSLOT"=<Period><CR>. Set or Get the unicast ping slot Period=[0:1s .. 7:128s](=2^Period)\r\n",
+#endif /* !NO_HELP */
+    .get = AT_PingSlot_get,
+    .set = AT_PingSlot_set,
+    .run = AT_return_error,
+  },
+
+  /* Radio tests commands */
   {
     .string = AT_TTONE,
     .size_string = sizeof(AT_TTONE) - 1,
@@ -394,24 +421,26 @@ static const struct ATCommand_s ATCommand[] =
   },
 
   {
-    .string = AT_TTLRA,
-    .size_string = sizeof(AT_TTLRA) - 1,
+    .string = AT_TRSSI,
+    .size_string = sizeof(AT_TRSSI) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TTLRA"=<PacketNb><CR>. Set Nb of packets sent with RF Tx test\r\n",
+    .help_string = "AT"AT_TRSSI" Starts RF RSSI tone test\r\n",
 #endif /* !NO_HELP */
     .get = AT_return_error,
-    .set = AT_test_tx,
-    .run = AT_return_error,
+    .set = AT_return_error,
+    .run = AT_test_rxRssi,
   },
 
   {
-    .string = AT_TRLRA,
-    .size_string = sizeof(AT_TRLRA) - 1,
+    .string = AT_TCONF,
+    .size_string = sizeof(AT_TCONF) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TRLRA"=<PacketNb><CR>. Set Nb of packets to be received with RF Rx test\r\n",
+    .help_string = "AT"AT_TCONF"=<Freq in Hz>:<Power in dBm>:<Lora Bandwidth <0 to 6>, or FSK Bandwidth in Hz>:<Lora SF or FSK datarate (bps)>:<CodingRate 4/5, 4/6, 4/7, 4/8>:\r\n\
+         <Lna>:<PA Boost>:<Modulation 0:FSK, 1:Lora, 2:BPSK>:<PayloadLen in Bytes>:<FskDeviation in Hz>:<LowDrOpt 0:off, 1:on, 2:Auto>:\r\n\
+         <BTproduct: 0:no Gaussian Filter Applied, 1:BT=0,3, 2:BT=0,5, 3:BT=0,7, 4:BT=1><CR>. Configure RF test\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_test_rx,
+    .get = AT_test_get_config,
+    .set = AT_test_set_config,
     .run = AT_return_error,
   },
 
@@ -438,26 +467,24 @@ static const struct ATCommand_s ATCommand[] =
   },
 
   {
-    .string = AT_TTH,
-    .size_string = sizeof(AT_TTH) - 1,
+    .string = AT_CERTIF,
+    .size_string = sizeof(AT_CERTIF) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TTH"=<Fstart>,<Fstop>,<Fdelta>,<PacketNb><CR>. Starts RF Tx hopping test from Fstart to Fstop in Hz or MHz, Fdelta in Hz\r\n",
+    .help_string = "AT"AT_CERTIF"=<Mode><CR>. Set the module in LoraWan Certification with Join Mode=[0:ABP, 1:OTAA]\r\n",
 #endif /* !NO_HELP */
     .get = AT_return_error,
-    .set = AT_test_tx_hopping,
+    .set = AT_Certif,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_TCONF,
-    .size_string = sizeof(AT_TCONF) - 1,
+    .string = AT_TTH,
+    .size_string = sizeof(AT_TTH) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TCONF"=<Freq in Hz>:<Power in dBm>:<Bandwidth in kHz>:<SF>:4/<CodingRate>:<Lna>:<PA Boost>:\r\n\
-         <Modulation 0:FSK, 1:Lora, 2:BPSK>:<PayloadLen in Bytes>:<FskDeviation in Hz>:<LowDrOpt 0:off, 1:on, 2:Auto>:\r\n\
-         <BTproduct: 0:no Gaussian Filter Applied, 1:BT=0,3, 2:BT=0,5, 3:BT=0,7, 4:BT=1><CR>. Configure RF test\r\n",
+    .help_string = "AT"AT_TTH"=<Fstart>,<Fstop>,<Fdelta>,<PacketNb><CR>. Starts RF Tx hopping test from Fstart to Fstop in Hz or MHz, Fdelta in Hz\r\n",
 #endif /* !NO_HELP */
-    .get = AT_test_get_config,
-    .set = AT_test_set_config,
+    .get = AT_return_error,
+    .set = AT_test_tx_hopping,
     .run = AT_return_error,
   },
 
@@ -472,27 +499,44 @@ static const struct ATCommand_s ATCommand[] =
     .run = AT_test_stop,
   },
 
+#ifdef AT_RADIO_ACCESS
   {
-    .string = AT_CERTIF,
-    .size_string = sizeof(AT_CERTIF) - 1,
+    .string = AT_REGW,
+    .size_string = sizeof(AT_REGW) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_CERTIF"=<Mode><CR>. Set the module in LoraWan Certification with Join Mode=[0:ABP, 1:OTAA]\r\n",
+    .help_string = "AT"AT_REGW"=<Addr>:<Data><CR> Write Radio Register Addr=[4 hex char], Data=[2 hex char]\r\n",
 #endif /* !NO_HELP */
     .get = AT_return_error,
-    .set = AT_Certif,
+    .set = AT_write_register,
     .run = AT_return_error,
   },
 
+  {
+    .string = AT_REGR,
+    .size_string = sizeof(AT_REGR) - 1,
+#ifndef NO_HELP
+    .help_string = "AT"AT_REGR"=<Addr><CR>. Read Radio Register Addr=[4 hex char]\r\n",
+#endif /* !NO_HELP */
+    .get = AT_return_error,
+    .set = AT_read_register,
+    .run = AT_return_error,
+  },
+#endif /*AT_RADIO_ACCESS*/
+
+  /* Information command */
   {
     .string = AT_BAT,
     .size_string = sizeof(AT_BAT) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_BAT" Get the battery Level=[0..254]\r\n",
+    .help_string = "AT"AT_BAT" Get the battery Level in mV\r\n",
 #endif /* !NO_HELP */
     .get = AT_bat_get,
     .set = AT_return_error,
     .run = AT_return_error,
   },
+  /* USER CODE BEGIN ATCommand */
+
+  /* USER CODE END ATCommand */
 };
 
 static char circBuffer[CIRC_BUFF_SIZE];
@@ -511,15 +555,13 @@ static uint32_t circBuffOverflow = 0;
 
 /**
   * @brief  Parse a command and process it
-  * @param  The command
-  * @retval None
+  * @param  cmd The command
   */
 static void parse_cmd(const char *cmd);
 
 /**
   * @brief  Print a string corresponding to an ATEerror_t
-  * @param  The AT error code
-  * @retval None
+  * @param  error_type The AT error code
   */
 static void com_error(ATEerror_t error_type);
 
@@ -528,20 +570,17 @@ static void com_error(ATEerror_t error_type);
   * @param  rxChar th char received
   * @param  size
   * @param  error
-  * @retval None
   */
 static void CMD_GetChar(uint8_t *rxChar, uint16_t size, uint8_t error);
 
 /**
-  * @brief  CNotifies the upper layer that a charchter has been receveid
-  * @param  None
-  * @retval None
+  * @brief  CNotifies the upper layer that a character has been received
   */
 static void (*NotifyCb)(void);
 
 /**
   * @brief  Remove backspace and its preceding character in the Command string
-  * @param  Command string to process
+  * @param  cmd string to process
   * @retval 0 when OK, otherwise error
   */
 static int32_t CMD_ProcessBackSpace(char *cmd);
@@ -764,9 +803,11 @@ static void parse_cmd(const char *cmd)
     {
       AT_PPRINTF(ATCommand[i].help_string);
     }
-    /* Wait for the message queue to be flushed in order
-       not to disturb following com_error() display */
-    HAL_Delay(HELP_DISPLAY_FLUSH_DELAY);
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
 #endif /* !NO_HELP */
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_command.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_command.h
index 5a68b81d..65210c30 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_command.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_command.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_command.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_COMMAND_H__
@@ -56,17 +58,12 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief Initializes command module
-  *
-  * @param [IN] cb to signal appli that character has been received
-  * @retval None
+  * @param CmdProcessNotify cb to signal application that character has been received
   */
 void CMD_Init(void (*CmdProcessNotify)(void));
 
 /**
   * @brief Process the command
-  *
-  * @param [IN] None
-  * @retval None
   */
 void CMD_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.c
index 74150427..3fd1204b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.c
@@ -16,20 +17,17 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "LoRaMac.h"
 #include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
 
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
 /* Private typedef -----------------------------------------------------------*/
 
 /* USER CODE BEGIN PTD */
@@ -112,6 +110,10 @@ void LoraInfo_Init(void)
   if (loraInfo.Region == 0)
   {
     APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
     while (1) {} /* At least one region shall be defined */
   }
 
@@ -126,7 +128,7 @@ void LoraInfo_Init(void)
   loraInfo.ActivationMode = 3;
 #else /* LORAWAN_KMS == 1 */
   loraInfo.Kms = 1;
-  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALISATION + (OVER_THE_AIR_ACTIVATION << 1);
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
 #endif /* LORAWAN_KMS */
   /* USER CODE BEGIN LoraInfo_Init_2 */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.h
index 92abccde..0608fd34 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #ifndef __LORA_INFO_H__
 #define __LORA_INFO_H__
 
@@ -68,15 +71,12 @@ typedef struct
 
 /* Exported functions ------------------------------------------------------- */
 /**
-  * @brief initialises the LoraInfo table
-  * @param none
-  * @retval  none
+  * @brief initialize the LoraInfo table
   */
 void LoraInfo_Init(void);
 
 /**
   * @brief returns the pointer to the LoraInfo capabilities table
-  * @param none
   * @retval LoraInfo pointer
   */
 LoraInfo_t *LoraInfo_GetPtr(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/se-identity.h
index 77f059d3..9b628efe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/se-identity.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/se-identity.h
@@ -1,5 +1,5 @@
 /*!
- * \file      se-identity_template.h
+ * \file      se-identity.h
  *
  * \brief     Secure Element identity and keys
  *
@@ -28,11 +28,12 @@
   *
   *          Portions COPYRIGHT 2020 STMicroelectronics
   *
-  * @file    se-identity_template.c
+  * @file    se-identity.h
   * @author  MCD Application Team
   * @brief   Secure Element identity and keys
   ******************************************************************************
   */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SOFT_SE_IDENTITY_H__
 #define __SOFT_SE_IDENTITY_H__
@@ -145,7 +146,7 @@ extern "C" {
 
 #if (USE_LRWAN_1_1_X_CRYPTO == 1)
 #define SESSION_KEYS_LIST                                                                                           \
-           {                                                                                                        \
+        {                                                                                                           \
             /*!                                                                                                     \
              * Join session integrity key (Dynamically updated)                                                     \
              * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.c
index bcedb56e..42791f33 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    test_rf.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -46,7 +48,7 @@
 #define SF12                          12
 #define CR4o5                         1
 #define EMISSION_POWER                P_14dBm
-#define CONTIUNUOUS_TIMEOUT           0xFFFF
+#define CONTINUOUS_TIMEOUT           0xFFFF
 #define LORA_PREAMBLE_LENGTH          8         /* Same for Tx and Rx */
 #define LORA_SYMBOL_TIMEOUT           30        /* Symbols */
 #define TX_TIMEOUT_VALUE              3000
@@ -84,13 +86,18 @@ static __IO uint32_t RadioRxDone_flag = 0;
 static __IO uint32_t RadioRxTimeout_flag = 0;
 static __IO uint32_t RadioError_flag = 0;
 static __IO int16_t last_rx_rssi = 0;
-static __IO int8_t last_rx_snr = 0;
+static __IO int8_t last_rx_LoraSnr_FskCfo = 0;
 
 /*!
  * Radio events function pointer
  */
 static RadioEvents_t RadioEvents;
 
+/*!
+ * Radio test payload pointer
+ */
+static uint8_t payload[256] = {0};
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
@@ -142,7 +149,7 @@ int32_t TST_TxTone(void)
 
     APP_TPRINTF("Tx FSK Test\r\n");
 
-    Radio.SetTxContinuousWave(testParam.freq, testParam.power, CONTIUNUOUS_TIMEOUT);
+    Radio.SetTxContinuousWave(testParam.freq, testParam.power, CONTINUOUS_TIMEOUT);
 
     return 0;
   }
@@ -263,7 +270,6 @@ int32_t TST_TX_Start(int32_t nb_packet)
 
   /* USER CODE END TST_TX_Start_1 */
   int32_t i;
-  uint8_t payload[256] = {0};
   TxConfigGeneric_t TxConfig;
 
   if ((TestState & TX_TEST_LORA) != TX_TEST_LORA)
@@ -378,7 +384,7 @@ int32_t TST_RX_Start(int32_t nb_packet)
   uint32_t count_RxOk = 0;
   uint32_t count_RxKo = 0;
   uint32_t PER = 0;
-  RxConfigGeneric_t RxConfig;
+  RxConfigGeneric_t RxConfig = {0};
 
   if (((TestState & RX_TEST_LORA) != RX_TEST_LORA) && (nb_packet > 0))
   {
@@ -407,11 +413,14 @@ int32_t TST_RX_Start(int32_t nb_packet)
         RxConfig.fsk.PreambleLen = 3; /*in Byte*/
         RxConfig.fsk.SyncWordLength = 3; /*in Byte*/
         RxConfig.fsk.SyncWord = syncword; /*SyncWord Buffer*/
+        RxConfig.fsk.PreambleMinDetect = RADIO_FSK_PREAMBLE_DETECTOR_08_BITS;
         RxConfig.fsk.whiteSeed = 0x01FF ; /*WhiteningSeed*/
         RxConfig.fsk.LengthMode = RADIO_FSK_PACKET_VARIABLE_LENGTH; /* If the header is explicit, it will be transmitted in the GFSK packet. If the header is implicit, it will not be transmitted*/
         RxConfig.fsk.CrcLength = RADIO_FSK_CRC_2_BYTES_CCIT;       /* Size of the CRC block in the GFSK packet*/
         RxConfig.fsk.CrcPolynomial = 0x1021;
         RxConfig.fsk.Whitening = RADIO_FSK_DC_FREE_OFF;
+        RxConfig.fsk.MaxPayloadLength = 255;
+        RxConfig.fsk.AddrComp = RADIO_FSK_ADDRESSCOMP_FILT_OFF;
         Radio.RadioSetRxGenericConfig(GENERIC_FSK, &RxConfig, RX_CONTINUOUS_ON, 0);
       }
       else if (testParam.modulation == TEST_LORA)
@@ -441,9 +450,16 @@ int32_t TST_RX_Start(int32_t nb_packet)
       if (RadioRxDone_flag == 1)
       {
         int16_t rssi = last_rx_rssi;
-        int8_t snr = last_rx_snr;
+        int8_t LoraSnr_FskCfo = last_rx_LoraSnr_FskCfo;
         APP_TPRINTF("OnRxDone\r\n");
-        APP_TPRINTF("RssiValue=%d dBm, SnrValue=%d\r\n", rssi, snr);
+        if (testParam.modulation == TEST_FSK)
+        {
+          APP_TPRINTF("RssiValue=%d dBm, cfo=%dkHz\r\n", rssi, LoraSnr_FskCfo);
+        }
+        else
+        {
+          APP_TPRINTF("RssiValue=%d dBm, SnrValue=%ddB\r\n", rssi, LoraSnr_FskCfo);
+        }
       }
 
       if (RadioRxTimeout_flag == 1)
@@ -505,13 +521,13 @@ void OnTxDone(void)
   /* USER CODE END OnTxDone_2 */
 }
 
-void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
+void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo)
 {
   /* USER CODE BEGIN OnRxDone_1 */
 
   /* USER CODE END OnRxDone_1 */
   last_rx_rssi = rssi;
-  last_rx_snr = snr;
+  last_rx_LoraSnr_FskCfo = LoraSnr_FskCfo;
 
   /* Set Rxdone flag */
   RadioRxDone_flag = 1;
@@ -566,6 +582,8 @@ static int32_t Prbs9_generator(uint8_t *payload, uint8_t len)
 
   /* USER CODE END Prbs9_generator_1 */
   uint16_t prbs9_val = PRBS9_INIT;
+  /*init payload to 0*/
+  UTIL_MEM_set_8(payload, 0, len);
 
   for (int32_t i = 0; i < len * 8; i++)
   {
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.h
index 1267529d..10fecb04 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    test_rf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TEST_RF_H__
@@ -88,50 +90,47 @@ typedef struct
 /* Exported functions ------------------------------------------------------- */
 /**
   * @brief RF Tone test command
-  * @param [IN] none
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_TxTone(void);
 
 /**
   * @brief RF Receive  test command
-  * @param  [IN] none
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_RxRssi(void);
 
 /**
   * @brief RF Transmit LORA test command
-  * @Note Transmits [0x00, 0x11, 0x22, ... 0xFF]
-  * @param [IN] nb of packets
+  * @note Transmits [0x00, 0x11, 0x22, ... 0xFF]
+  * @param[in] nb_packet nb of packets
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_TX_Start(int32_t nb_packet);
 
 /**
   * @brief RF Receive LORA test command
-  * @param [IN] nb of packets
+  * @param[in] nb_packet nb of packets
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_RX_Start(int32_t nb_packet);
 
 /**
   * @brief RF Set Radio Configuration test command
-  * @param [IN] Param
+  * @param[in] Param Pointer config param
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_set_config(testParameter_t *Param);
 
 /**
   * @brief RF Get Radio Configuration test command
-  * @param [IN] Pointer config param
+  * @param[in] Param Pointer config param
   * @retval LoRa status
   */
 int32_t TST_get_config(testParameter_t *Param);
 
 /**
   * @brief RF test stop
-  * @param [IN] None
   * @retval LoRa status
   */
 int32_t TST_stop(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/lorawan_conf.h
index 22a1d086..8e25c9bd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/lorawan_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/lorawan_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lorawan_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORAWAN_CONF_H__
@@ -25,8 +27,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-#include "sys_app.h"   /* needed for APP_PRINTF */
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -40,7 +40,7 @@ extern "C" {
 
 /* Region ------------------------------------*/
 /* the region listed here will be linked in the MW code */
-/* the applic (on sys_conf.h) shall just configure one region at the time */
+/* the application (on sys_conf.h) shall just configure one region at the time */
 /*#define REGION_AS923*/
 /*#define REGION_AU915*/
 /*#define REGION_CN470*/
@@ -52,15 +52,30 @@ extern "C" {
 #define REGION_US915
 /*#define REGION_RU864*/
 
-#define HYBRID_ENABLED          0
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
 
-#define KEY_LOG_ENABLED         1
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
 
 /* Class B ------------------------------------*/
 #define LORAMAC_CLASSB_ENABLED  0
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-/* CLASS B LSE crystall calibration*/
+/* CLASS B LSE crystal calibration*/
 /**
   * \brief Temperature coefficient of the clock source
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.h
index 3e3c7abb..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     10U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_conf.h
index 29cc81b5..375c9ddc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,7 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
-#include "stm32_mem.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,20 +48,16 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-
-/**
-  * @brief Max payload buffer size
-  */
-#define RADIO_RX_BUF_SIZE          255
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -67,25 +65,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -125,6 +140,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/systime.h
index f3ce93b2..1991b928 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/systime.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/systime.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    systime.h
@@ -16,8 +17,9 @@
   *
   ******************************************************************************
   */
-/* Define to prevent recursive inclusion -------------------------------------*/
+/* USER CODE END Header */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTIME_H__
 #define __SYSTIME_H__
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN_AT_Slave.ioc b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN_AT_Slave.ioc
index 2587b4ec..5b93f8ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN_AT_Slave.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/LoRaWAN_AT_Slave.ioc
@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
@@ -29,19 +29,18 @@ Dma.RequestsNb=1
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
-LORAWAN.Activate_BOARD_RESOURCES=M4
 LORAWAN.Activate_DEBUG_LINE=true
-LORAWAN.Activate_RADIO_BOARD_INTERFACE=true
-LORAWAN.IPParameters=Activate_DEBUG_LINE,SUBGHZ_APPLICATION,Activate_BOARD_RESOURCES,Activate_RADIO_BOARD_INTERFACE
+LORAWAN.Activate_RADIO_BOARD_INTERFACE=Bsp
+LORAWAN.IPParameters=Activate_RADIO_BOARD_INTERFACE,SUBGHZ_APPLICATION,Activate_DEBUG_LINE
 LORAWAN.SUBGHZ_APPLICATION=LORA_AT_SLAVE
-LPUART1.BaudRate=LPUART_BAUDRATE
+LPUART1.BaudRate=9600
 LPUART1.FIFOMode=UART_FIFOMODE_ENABLE
-LPUART1.IPParameters=BaudRate,FIFOMode
-LoRaWAN.BSP.number=16
+LPUART1.IPParameters=FIFOMode,BaudRate
+LoRaWAN.BSP.number=7
 LoRaWAN0.BSP.STBoard=false
 LoRaWAN0.BSP.api=Unknown
 LoRaWAN0.BSP.component=
-LoRaWAN0.BSP.condition=SEM_LORA_AT_SLAVE | SEM_LORA_END_NODE
+LoRaWAN0.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_ADC
 LoRaWAN0.BSP.i2caddr=0
 LoRaWAN0.BSP.i2creg=
 LoRaWAN0.BSP.instance=ADC
@@ -53,7 +52,7 @@ LoRaWAN0.BSP.solution=ADC
 LoRaWAN1.BSP.STBoard=false
 LoRaWAN1.BSP.api=Unknown
 LoRaWAN1.BSP.component=
-LoRaWAN1.BSP.condition=
+LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_RTC
 LoRaWAN1.BSP.i2caddr=0
 LoRaWAN1.BSP.i2creg=
 LoRaWAN1.BSP.instance=RTC
@@ -62,231 +61,126 @@ LoRaWAN1.BSP.mode=RTC Enabled
 LoRaWAN1.BSP.name=RTC
 LoRaWAN1.BSP.semaphore=
 LoRaWAN1.BSP.solution=RTC
-LoRaWAN10.BSP.STBoard=false
-LoRaWAN10.BSP.api=Unknown
-LoRaWAN10.BSP.component=
-LoRaWAN10.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN10.BSP.i2caddr=0
-LoRaWAN10.BSP.i2creg=
-LoRaWAN10.BSP.instance=PA0
-LoRaWAN10.BSP.ip=GPIO
-LoRaWAN10.BSP.mode=EXTI
-LoRaWAN10.BSP.name=BUTTON 1
-LoRaWAN10.BSP.semaphore=
-LoRaWAN10.BSP.solution=PA0
-LoRaWAN11.BSP.STBoard=false
-LoRaWAN11.BSP.api=Unknown
-LoRaWAN11.BSP.component=
-LoRaWAN11.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN11.BSP.i2caddr=0
-LoRaWAN11.BSP.i2creg=
-LoRaWAN11.BSP.instance=PC3
-LoRaWAN11.BSP.ip=GPIO
-LoRaWAN11.BSP.mode=Output
-LoRaWAN11.BSP.name=RF SW CTRL 3
-LoRaWAN11.BSP.semaphore=
-LoRaWAN11.BSP.solution=PC3
-LoRaWAN12.BSP.STBoard=false
-LoRaWAN12.BSP.api=Unknown
-LoRaWAN12.BSP.component=
-LoRaWAN12.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN12.BSP.i2caddr=0
-LoRaWAN12.BSP.i2creg=
-LoRaWAN12.BSP.instance=PC4
-LoRaWAN12.BSP.ip=GPIO
-LoRaWAN12.BSP.mode=Output
-LoRaWAN12.BSP.name=RF SW CTRL 1
-LoRaWAN12.BSP.semaphore=
-LoRaWAN12.BSP.solution=PC4
-LoRaWAN13.BSP.STBoard=false
-LoRaWAN13.BSP.api=Unknown
-LoRaWAN13.BSP.component=
-LoRaWAN13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN13.BSP.i2caddr=0
-LoRaWAN13.BSP.i2creg=
-LoRaWAN13.BSP.instance=PC5
-LoRaWAN13.BSP.ip=GPIO
-LoRaWAN13.BSP.mode=Output
-LoRaWAN13.BSP.name=RF SW CTRL 2
-LoRaWAN13.BSP.semaphore=
-LoRaWAN13.BSP.solution=PC5
-LoRaWAN14.BSP.STBoard=false
-LoRaWAN14.BSP.api=Unknown
-LoRaWAN14.BSP.component=
-LoRaWAN14.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN14.BSP.i2caddr=0
-LoRaWAN14.BSP.i2creg=
-LoRaWAN14.BSP.instance=PC6
-LoRaWAN14.BSP.ip=GPIO
-LoRaWAN14.BSP.mode=EXTI
-LoRaWAN14.BSP.name=BUTTON 3
-LoRaWAN14.BSP.semaphore=
-LoRaWAN14.BSP.solution=PC6
-LoRaWAN15.BSP.STBoard=false
-LoRaWAN15.BSP.api=Unknown
-LoRaWAN15.BSP.component=
-LoRaWAN15.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN15.BSP.i2caddr=0
-LoRaWAN15.BSP.i2creg=
-LoRaWAN15.BSP.instance=PA1
-LoRaWAN15.BSP.ip=GPIO
-LoRaWAN15.BSP.mode=EXTI
-LoRaWAN15.BSP.name=BUTTON 2
-LoRaWAN15.BSP.semaphore=
-LoRaWAN15.BSP.solution=PA1
 LoRaWAN2.BSP.STBoard=false
 LoRaWAN2.BSP.api=Unknown
 LoRaWAN2.BSP.component=
-LoRaWAN2.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN2.BSP.condition=SEM_LORA_AT_SLAVE
 LoRaWAN2.BSP.i2caddr=0
 LoRaWAN2.BSP.i2creg=
-LoRaWAN2.BSP.instance=PB12
-LoRaWAN2.BSP.ip=GPIO
-LoRaWAN2.BSP.mode=Output
-LoRaWAN2.BSP.name=Debug Line 1
+LoRaWAN2.BSP.instance=LPUART1
+LoRaWAN2.BSP.ip=LPUART
+LoRaWAN2.BSP.mode=Asynchronous
+LoRaWAN2.BSP.name=USART
 LoRaWAN2.BSP.semaphore=
-LoRaWAN2.BSP.solution=PB12
+LoRaWAN2.BSP.solution=LPUART1
 LoRaWAN3.BSP.STBoard=false
 LoRaWAN3.BSP.api=Unknown
 LoRaWAN3.BSP.component=
-LoRaWAN3.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN3.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN3.BSP.i2caddr=0
 LoRaWAN3.BSP.i2creg=
-LoRaWAN3.BSP.instance=PB13
+LoRaWAN3.BSP.instance=PB12
 LoRaWAN3.BSP.ip=GPIO
 LoRaWAN3.BSP.mode=Output
-LoRaWAN3.BSP.name=Debug Line 2
+LoRaWAN3.BSP.name=Debug Line 1
 LoRaWAN3.BSP.semaphore=
-LoRaWAN3.BSP.solution=PB13
+LoRaWAN3.BSP.solution=PB12
 LoRaWAN4.BSP.STBoard=false
 LoRaWAN4.BSP.api=Unknown
 LoRaWAN4.BSP.component=
-LoRaWAN4.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN4.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN4.BSP.i2caddr=0
 LoRaWAN4.BSP.i2creg=
-LoRaWAN4.BSP.instance=PB14
+LoRaWAN4.BSP.instance=PB13
 LoRaWAN4.BSP.ip=GPIO
 LoRaWAN4.BSP.mode=Output
-LoRaWAN4.BSP.name=Debug Line 3
+LoRaWAN4.BSP.name=Debug Line 2
 LoRaWAN4.BSP.semaphore=
-LoRaWAN4.BSP.solution=PB14
+LoRaWAN4.BSP.solution=PB13
 LoRaWAN5.BSP.STBoard=false
 LoRaWAN5.BSP.api=Unknown
 LoRaWAN5.BSP.component=
-LoRaWAN5.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN5.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN5.BSP.i2caddr=0
 LoRaWAN5.BSP.i2creg=
-LoRaWAN5.BSP.instance=PB10
+LoRaWAN5.BSP.instance=PB14
 LoRaWAN5.BSP.ip=GPIO
 LoRaWAN5.BSP.mode=Output
-LoRaWAN5.BSP.name=Debug Line 4
+LoRaWAN5.BSP.name=Debug Line 3
 LoRaWAN5.BSP.semaphore=
-LoRaWAN5.BSP.solution=PB10
+LoRaWAN5.BSP.solution=PB14
 LoRaWAN6.BSP.STBoard=false
 LoRaWAN6.BSP.api=Unknown
 LoRaWAN6.BSP.component=
-LoRaWAN6.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
+LoRaWAN6.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN6.BSP.i2caddr=0
 LoRaWAN6.BSP.i2creg=
-LoRaWAN6.BSP.instance=PB11
+LoRaWAN6.BSP.instance=PB10
 LoRaWAN6.BSP.ip=GPIO
 LoRaWAN6.BSP.mode=Output
-LoRaWAN6.BSP.name=LED 3
+LoRaWAN6.BSP.name=Debug Line 4
 LoRaWAN6.BSP.semaphore=
-LoRaWAN6.BSP.solution=PB11
-LoRaWAN7.BSP.STBoard=false
-LoRaWAN7.BSP.api=Unknown
-LoRaWAN7.BSP.component=
-LoRaWAN7.BSP.condition=SEM_LORA_AT_SLAVE
-LoRaWAN7.BSP.i2caddr=0
-LoRaWAN7.BSP.i2creg=
-LoRaWAN7.BSP.instance=LPUART1
-LoRaWAN7.BSP.ip=LPUART
-LoRaWAN7.BSP.mode=Asynchronous
-LoRaWAN7.BSP.name=USART
-LoRaWAN7.BSP.semaphore=
-LoRaWAN7.BSP.solution=LPUART1
-LoRaWAN8.BSP.STBoard=false
-LoRaWAN8.BSP.api=Unknown
-LoRaWAN8.BSP.component=
-LoRaWAN8.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN8.BSP.i2caddr=0
-LoRaWAN8.BSP.i2creg=
-LoRaWAN8.BSP.instance=PB9
-LoRaWAN8.BSP.ip=GPIO
-LoRaWAN8.BSP.mode=Output
-LoRaWAN8.BSP.name=LED 2
-LoRaWAN8.BSP.semaphore=
-LoRaWAN8.BSP.solution=PB9
-LoRaWAN9.BSP.STBoard=false
-LoRaWAN9.BSP.api=Unknown
-LoRaWAN9.BSP.component=
-LoRaWAN9.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN9.BSP.i2caddr=0
-LoRaWAN9.BSP.i2creg=
-LoRaWAN9.BSP.instance=PB15
-LoRaWAN9.BSP.ip=GPIO
-LoRaWAN9.BSP.mode=Output
-LoRaWAN9.BSP.name=LED 1
-LoRaWAN9.BSP.semaphore=
-LoRaWAN9.BSP.solution=PB15
+LoRaWAN6.BSP.solution=PB10
 Mcu.ContextProject=MonoOnDualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=SUBGHZ
-Mcu.IP11=SYS
-Mcu.IP12=TIMER
-Mcu.IP13=TINY_LPM
-Mcu.IP2=DMA
-Mcu.IP3=LORAWAN
-Mcu.IP4=LPUART1
-Mcu.IP5=MISC
-Mcu.IP6=NVIC
-Mcu.IP7=RCC
-Mcu.IP8=RTC
-Mcu.IP9=SEQUENCER_M4
-Mcu.IPNb=14
+Mcu.IP10=SEQUENCER_M4
+Mcu.IP11=SUBGHZ
+Mcu.IP12=SYS
+Mcu.IP13=TIMER
+Mcu.IP14=TINY_LPM
+Mcu.IP2=DEBUG
+Mcu.IP3=DMA
+Mcu.IP4=LORAWAN
+Mcu.IP5=LPUART1
+Mcu.IP6=MISC
+Mcu.IP7=NVIC
+Mcu.IP8=RCC
+Mcu.IP9=RTC
+Mcu.IPNb=15
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_LORAWAN_VS_LoRaWAN
-Mcu.Pin23=VP_MISC_VS_MISC
-Mcu.Pin24=VP_RTC_VS_RTC_Activate
-Mcu.Pin25=VP_RTC_VS_RTC_Calendar
-Mcu.Pin26=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin27=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin28=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin29=VP_SYS_VS_Systick
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_TIMER_VS_TIMER
-Mcu.Pin31=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=32
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_LORAWAN_VS_LoRaWAN
+Mcu.Pin25=VP_MISC_VS_MISC
+Mcu.Pin26=VP_RTC_VS_RTC_Activate
+Mcu.Pin27=VP_RTC_VS_RTC_Calendar
+Mcu.Pin28=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin29=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin31=VP_SYS_VS_None
+Mcu.Pin32=VP_TIMER_VS_TIMER
+Mcu.Pin33=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=34
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);LPUART_BAUDRATE,9600
+Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -300,21 +194,24 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.RTC_Alarm_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.TAMP_STAMP_LSECSS_SSRU_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.TimeBase=None
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4MonoOnDual
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4MonoOnDual
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -329,40 +226,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=LPUART1_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4MonoOnDual
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4MonoOnDual
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4MonoOnDual
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4MonoOnDual
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4MonoOnDual
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4MonoOnDual
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4MonoOnDual
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -370,26 +260,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4MonoOnDual
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4MonoOnDual
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4MonoOnDual
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4MonoOnDual
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -416,7 +309,7 @@ ProjectManager.StackSize=0x800
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false,2-MX_DMA_Init-DMA-true-HAL-false,3-SystemClock_Config-RCC-false-HAL-false,4-MX_ADC_Init-ADC-true-HAL-false,5-MX_LPUART1_UART_Init-LPUART1-true-HAL-false,6-MX_RTC_Init-RTC-true-HAL-false,7-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false,8-MX_LoRaWAN_Init-LORAWAN-false-HAL-false
+ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false,2-MX_DMA_Init-DMA-true-HAL-false,3-SystemClock_Config-RCC-false-HAL-false,4-MX_ADC_Init-ADC-true-HAL-false,5-MX_RTC_Init-RTC-true-HAL-false,6-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false,8-MX_LPUART1_UART_Init-LPUART1-true-HAL-false
 RCC.AHBFreq_Value=48000000
 RCC.APB1Freq_Value=48000000
 RCC.APB1TimFreq_Value=48000000
@@ -426,6 +319,7 @@ RCC.APB3Freq_Value=48000000
 RCC.CortexFreq_Value=48000000
 RCC.FCLKCortexFreq_Value=48000000
 RCC.FamilyName=M
+RCC.HCLK2Freq_Value=4000000
 RCC.HCLK3Freq_Value=48000000
 RCC.HCLKFreq_Value=48000000
 RCC.HSE_VALUE=8000000
@@ -434,7 +328,7 @@ RCC.I2C1Freq_Value=48000000
 RCC.I2C2Freq_Value=48000000
 RCC.I2C3Freq_Value=48000000
 RCC.I2S2Freq_Value=16000000
-RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,CortexFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
+RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,CortexFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
 RCC.LPTIM1Freq_Value=48000000
 RCC.LPTIM2Freq_Value=48000000
 RCC.LPTIM3Freq_Value=48000000
@@ -453,6 +347,7 @@ RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
 RCC.RTCFreq_Value=32768
 RCC.SYSCLKFreq_VALUE=48000000
 RCC.USART1Freq_Value=48000000
+RCC.USART2CLockSelection=RCC_USART2CLKSOURCE_SYSCLK
 RCC.USART2Freq_Value=48000000
 RCC.VCOInputFreq_Value=48000000
 RCC.VCOOutputFreq_Value=384000000
@@ -460,7 +355,7 @@ RTC.Alarm-Alarm\ A=RTC_ALARM_A
 RTC.AsynchPrediv=RTC_PREDIV_A
 RTC.BinMode=RTC_BINARY_ONLY
 RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
-RTC.IPParameters=Alarm-Alarm A,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A
+RTC.IPParameters=Alarm-Alarm A,AsynchPrediv,BinMode,BinaryAutoClr_A-Alarm A
 SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI0.ConfNb=1
 SH.GPXTI1.0=GPIO_EXTI1
@@ -489,10 +384,13 @@ VP_SEQUENCER_M4_VS_SEQUENCER.Mode=SEQUENCER_Enabled
 VP_SEQUENCER_M4_VS_SEQUENCER.Signal=SEQUENCER_M4_VS_SEQUENCER
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=LoRaWAN_AT_Slave
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/LoRaWAN_AT_Slave.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/LoRaWAN_AT_Slave.uvoptx
index 9374c312..f8187530 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/LoRaWAN_AT_Slave.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/LoRaWAN_AT_Slave.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>32000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,91 +195,91 @@
   </Target>
 
   <Group>
-    <GroupName>Application/App</GroupName>
-    <tvExp>1</tvExp>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/App/app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/App/lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/App/lora_at.c</PathWithFileName>
-      <FilenameWithoutPath>lora_at.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/App/lora_command.c</PathWithFileName>
-      <FilenameWithoutPath>lora_command.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/App/test_rf.c</PathWithFileName>
-      <FilenameWithoutPath>test_rf.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\LoRaWAN\App\lora_info.c</PathWithFileName>
-      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
       <FileNumber>7</FileNumber>
@@ -267,8 +287,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -279,8 +299,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -291,8 +311,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -303,8 +323,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -315,8 +335,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -327,8 +347,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -339,8 +359,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -351,8 +371,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -363,151 +383,151 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/LoRaWAN/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/lora_at.c</PathWithFileName>
+      <FilenameWithoutPath>lora_at.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/lora_command.c</PathWithFileName>
+      <FilenameWithoutPath>lora_command.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\Core\Src\board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/test_rf.c</PathWithFileName>
+      <FilenameWithoutPath>test_rf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>22</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/lora_info.c</PathWithFileName>
+      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/Target</GroupName>
+    <GroupName>Doc</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
+      <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/Target/radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Doc</GroupName>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>24</FileNumber>
-      <FileType>5</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
       <FileNumber>25</FileNumber>
@@ -523,7 +543,7 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -535,606 +555,622 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
-      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
-      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
-      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
-    <tvExp>1</tvExp>
+    <GroupName>Middlewares/LoRaWAN</GroupName>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
+      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</PathWithFileName>
-      <FilenameWithoutPath>NvmCtxMgmt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
+      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
+      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
+      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</PathWithFileName>
+      <FilenameWithoutPath>RegionBaseUS.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
-      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</PathWithFileName>
+      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</PathWithFileName>
+      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</PathWithFileName>
+      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</PathWithFileName>
-      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</PathWithFileName>
-      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</PathWithFileName>
-      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</PathWithFileName>
-      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</PathWithFileName>
-      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>13</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>73</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>74</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>75</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</PathWithFileName>
+      <FilenameWithoutPath>NvmDataMgmt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>76</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
       <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -1149,26 +1185,38 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>73</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>77</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>74</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>78</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>79</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1181,8 +1229,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>75</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>80</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1193,86 +1241,86 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>76</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>81</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>77</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>82</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>78</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>83</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>79</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>84</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>80</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>85</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>81</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>86</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>82</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>87</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/LoRaWAN_AT_Slave.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/LoRaWAN_AT_Slave.uvprojx
index bcfd9751..a72cc56c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/LoRaWAN_AT_Slave.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/LoRaWAN_AT_Slave.uvprojx
@@ -10,15 +10,15 @@
       <TargetName>LoRaWAN_AT_Slave</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LoRaWAN_AT_Slave\Exe\</OutputDirectory>
+          <OutputDirectory>LoRaWAN_AT_Slave\</OutputDirectory>
           <OutputName>LoRaWAN_AT_Slave</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -138,10 +138,10 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -183,8 +183,9 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -335,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>STM32WL55xx,CORE_CM4</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../LoRaWAN/App;../LoRaWAN/Target;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/region;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace</IncludePath>
+              <IncludePath>../Core/Inc;../LoRaWAN/App;../LoRaWAN/Target;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -351,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -380,47 +381,52 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/App</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>app_lorawan.c</FileName>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../LoRaWAN/App/app_lorawan.c</FilePath>
+              <FilePath>../Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>lora_app.c</FileName>
+              <FileName>adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../LoRaWAN/App/lora_app.c</FilePath>
+              <FilePath>../Core/Src/adc.c</FilePath>
             </File>
             <File>
-              <FileName>lora_at.c</FileName>
+              <FileName>dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../LoRaWAN/App/lora_at.c</FilePath>
+              <FilePath>../Core/Src/dma.c</FilePath>
             </File>
             <File>
-              <FileName>lora_command.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../LoRaWAN/App/lora_command.c</FilePath>
+              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>test_rf.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../LoRaWAN/App/test_rf.c</FilePath>
+              <FilePath>../Core/Src/sys_app.c</FilePath>
             </File>
             <File>
-              <FileName>lora_info.c</FileName>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\LoRaWAN\App\lora_info.c</FilePath>
+              <FilePath>../Core/Src/sys_debug.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Core</GroupName>
-          <Files>
             <File>
-              <FileName>adc.c</FileName>
+              <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/adc.c</FilePath>
+              <FilePath>../Core/Src/timer_if.c</FilePath>
             </File>
             <File>
               <FileName>adc_if.c</FileName>
@@ -428,14 +434,14 @@
               <FilePath>../Core/Src/adc_if.c</FilePath>
             </File>
             <File>
-              <FileName>dma.c</FileName>
+              <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/dma.c</FilePath>
+              <FilePath>../Core/Src/usart_if.c</FilePath>
             </File>
             <File>
-              <FileName>main.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/main.c</FilePath>
+              <FilePath>../Core/Src/usart.c</FilePath>
             </File>
             <File>
               <FileName>rtc.c</FileName>
@@ -443,74 +449,64 @@
               <FilePath>../Core/Src/rtc.c</FilePath>
             </File>
             <File>
-              <FileName>timer_if.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/timer_if.c</FilePath>
+              <FilePath>../Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
               <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/LoRaWAN/Target</GroupName>
+          <Files>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
-            </File>
-            <File>
-              <FileName>subghz.c</FileName>
+              <FileName>radio_board_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/subghz.c</FilePath>
+              <FilePath>../LoRaWAN/Target/radio_board_if.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/LoRaWAN/App</GroupName>
+          <Files>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>app_lorawan.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_app.c</FilePath>
+              <FilePath>../LoRaWAN/App/app_lorawan.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>lora_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_debug.c</FilePath>
+              <FilePath>../LoRaWAN/App/lora_app.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>lora_at.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart.c</FilePath>
+              <FilePath>../LoRaWAN/App/lora_at.c</FilePath>
             </File>
             <File>
-              <FileName>usart_if.c</FileName>
+              <FileName>lora_command.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart_if.c</FilePath>
+              <FilePath>../LoRaWAN/App/lora_command.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>test_rf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Core\Src\board_resources.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FilePath>../LoRaWAN/App/test_rf.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Target</GroupName>
-          <Files>
             <File>
-              <FileName>radio_board_if.c</FileName>
+              <FileName>lora_info.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../LoRaWAN/Target/radio_board_if.c</FilePath>
+              <FilePath>../LoRaWAN/App/lora_info.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -528,30 +524,20 @@
           <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
           <Files>
             <File>
-              <FileName>stm32wlxx_nucleo_radio.c</FileName>
+              <FileName>stm32wlxx_nucleo.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -563,24 +549,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -598,39 +579,39 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_uart.c</FileName>
@@ -642,96 +623,66 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-          <Files>
             <File>
-              <FileName>lorawan_aes.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
-            </File>
-            <File>
-              <FileName>cmac.c</FileName>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
             </File>
             <File>
-              <FileName>soft-se.c</FileName>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
-          <Files>
             <File>
-              <FileName>LmHandler.c</FileName>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
             <File>
-              <FileName>LmhpCompliance.c</FileName>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
             </File>
             <File>
-              <FileName>NvmCtxMgmt.c</FileName>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
+          <GroupName>Drivers/CMSIS</GroupName>
           <Files>
             <File>
-              <FileName>LoRaMac.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacAdr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacClassB.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacCommands.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
+              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/LoRaWAN</GroupName>
+          <Files>
             <File>
-              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileName>LmhpCompliance.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCrypto.c</FileName>
+              <FileName>cmac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacParser.c</FileName>
+              <FileName>lorawan_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacSerializer.c</FileName>
+              <FileName>soft-se.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-          <Files>
             <File>
               <FileName>Region.c</FileName>
               <FileType>1</FileType>
@@ -747,6 +698,11 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</FilePath>
             </File>
+            <File>
+              <FileName>RegionBaseUS.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</FilePath>
+            </File>
             <File>
               <FileName>RegionCN470.c</FileName>
               <FileType>1</FileType>
@@ -792,11 +748,56 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-          <Files>
+            <File>
+              <FileName>LoRaMac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacAdr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacClassB.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCommands.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCrypto.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacParser.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacSerializer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmHandler.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
+            </File>
+            <File>
+              <FileName>NvmDataMgmt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</FilePath>
+            </File>
             <File>
               <FileName>utilities.c</FileName>
               <FileType>1</FileType>
@@ -808,14 +809,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -828,39 +834,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -884,4 +890,19 @@
     <files/>
   </RTE>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
 </Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/startup_stm32wl55xx_cm4.s
index 7f10bb2c..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size      EQU     0x00000800
+Stack_Size		EQU     0x800
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x00000200
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/.cproject
index 82b05f31..216aa824 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/.cproject
@@ -1,175 +1,178 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1466985998">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1466985998" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.993818982">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.993818982" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1466985998" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1466985998." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1190768917" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1799137810" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.5585584" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801697261" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2025793403" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.392620907" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2021892859" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1557389453" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1608474235" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.839273790" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.754271990" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1404283493" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1953189115" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.993818982" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.993818982." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.340710555" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1160692907" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.26482487" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041027624" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.940129" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1898148923" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/Target | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../LoRaWAN/App | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1041442082" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1545835876" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1972905663" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2101870618" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1673468815" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1285693248" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1809804327" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1343658397" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1489840519" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1088368083" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.194190494" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.513493159" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.554869945" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2078227995" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1699266376" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1396284139" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.694212381" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.142375897" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../LoRaWAN/Target"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1598314445" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.658107701" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.463240453" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1423258420" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2068965098" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1885748107" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1110682095" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1405257857" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.479062137" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.419274375" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.73018535" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2131659321" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.224188401" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1627293715" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.577449596" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.143035263" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.405337869" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.19084737" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.969900936" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1497353917" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.760231524" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.148504329" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.363071159" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1686294799" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.629782899" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1571540258" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1888834691" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1644538875" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.518941311" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.2101079837" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.749554787" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1084321684" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2075903762" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1419000794">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1419000794" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.661531104">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.661531104" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1419000794" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1419000794." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1455908214" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1408083214" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.78030957" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1163853994" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.603807858" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2031399645" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1757190645" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.332265939" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.51625410" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1885755997" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.327412967" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.102582833" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1408846107" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.661531104" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.661531104." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.910660072" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.976662759" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1205514939" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1694334863" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.197619651" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.785528841" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/Target | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../LoRaWAN/App | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.380622319" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.44862" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.945961093" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.617123271" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1430090139" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1262357634" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.937119445" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1321844335" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.589264167" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.903744710" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1525021804" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1316814931" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.97737383" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.738060588" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2100889725" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../LoRaWAN/Target"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2008132871" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.829665139" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1142361030" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2127344898" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1876971924" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.872124420" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1088190315" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.13685963" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1165782354" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1122299919" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.149358669" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.390407646" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.645362053" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.611415873" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.557570763" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.104558393" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1155679616" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.690607626" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1044333348" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.337556064" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1811052668" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1038893736" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.968896632" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.954284219" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.105816108" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1277463389" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1837181843" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1529974741" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1802154744" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.2062982429" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.845484545" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1161219999" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1545146219" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -177,19 +180,27 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LoRaWAN_AT_Slave.null.1602336706" name="LoRaWAN_AT_Slave"/>
+		<project id="LoRaWAN_AT_Slave.null.1760940391" name="LoRaWAN_AT_Slave"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1419000794;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1419000794.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1262357634;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2008132871">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.993818982;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.993818982.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.554869945;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.658107701">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1466985998;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1466985998.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1489840519;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1598314445">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.661531104;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.661531104.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.903744710;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.829665139">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
-	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/LoRaWAN_AT_Slave"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/LoRaWAN_AT_Slave"/>
+		</configuration>
+	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/.project
index 8e9a13af..4275e926 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/.project
@@ -25,7 +25,6 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
@@ -36,417 +35,437 @@
 		<link>
 			<name>LoRaWAN_AT_Slave.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN_AT_Slave.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN_AT_Slave.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/app_lorawan.c</name>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/App/app_lorawan.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/lora_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/App/lora_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/lora_at.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/App/lora_at.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/lora_command.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/App/lora_command.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/lora_info.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_info.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/test_rf.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/App/test_rf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/adc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/adc_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/board_resources.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/dma.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/main.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/rtc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32_lpm_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_it.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/subghz.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_debug.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_debug.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/timer_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/radio_board_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<name>Middlewares/LoRaWAN/LmHandler.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
+			<name>Middlewares/LoRaWAN/LmhpCompliance.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMac.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacAdr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacClassB.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacCommands.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacConfirmQueue.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacCrypto.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacParser.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacSerializer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<name>Middlewares/LoRaWAN/NvmDataMgmt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<name>Middlewares/LoRaWAN/Region.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<name>Middlewares/LoRaWAN/RegionAS923.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<name>Middlewares/LoRaWAN/RegionAU915.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<name>Middlewares/LoRaWAN/RegionBaseUS.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<name>Middlewares/LoRaWAN/RegionCN470.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<name>Middlewares/LoRaWAN/RegionCN779.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<name>Middlewares/LoRaWAN/RegionCommon.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<name>Middlewares/LoRaWAN/RegionEU433.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<name>Middlewares/LoRaWAN/RegionEU868.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<name>Middlewares/LoRaWAN/RegionIN865.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
+			<name>Middlewares/LoRaWAN/RegionKR920.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Middlewares/LoRaWAN/RegionRU864.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Middlewares/LoRaWAN/RegionUS915.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/cmac.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/lorawan_aes.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/soft-se.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Crypto/lorawan_aes.c</name>
+			<name>Middlewares/LoRaWAN/utilities.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Crypto/cmac.c</name>
+			<name>Middlewares/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Crypto/soft-se.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/LmHandler/LmHandler.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/LmHandler/LmhpCompliance.c</name>
+			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/LmHandler/NvmCtxMgmt.c</name>
+			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMac.c</name>
+			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacAdr.c</name>
+			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacClassB.c</name>
+			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacCommands.c</name>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacConfirmQueue.c</name>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacCrypto.c</name>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacParser.c</name>
+			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacSerializer.c</name>
+			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Utilities/utilities.c</name>
+			<name>Application/User/Core/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/Region.c</name>
+			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionAS923.c</name>
+			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionAU915.c</name>
+			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionCN470.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionCN779.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionCommon.c</name>
+			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/app_lorawan.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionEU433.c</name>
+			<name>Application/User/LoRaWAN/App/lora_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_app.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionEU868.c</name>
+			<name>Application/User/LoRaWAN/App/lora_at.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_at.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionIN865.c</name>
+			<name>Application/User/LoRaWAN/App/lora_command.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_command.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionKR920.c</name>
+			<name>Application/User/LoRaWAN/App/lora_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_info.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionRU864.c</name>
+			<name>Application/User/LoRaWAN/App/test_rf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/test_rf.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionUS915.c</name>
+			<name>Application/User/LoRaWAN/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/Target/radio_board_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/Core/sysmem.c
deleted file mode 100644
index 656b3aa2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/Core/sysmem.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- ******************************************************************************
- * @file      sysmem.c
- * @author    Generated by STM32CubeIDE
- * @brief     STM32CubeIDE System Memory calls file
- *
- *            For more information about which C functions
- *            need which of these lowlevel functions
- *            please consult the newlib libc manual
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- ******************************************************************************
- */
-
-/* Includes */
-#include <errno.h>
-#include <stdint.h>
-
-/**
- * Pointer to the current high watermark of the heap usage
- */
-static uint8_t *__sbrk_heap_end = NULL;
-
-/**
- * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
- *        and others from the C library
- *
- * @verbatim
- * ############################################################################
- * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
- * #         #        #                         # Reserved by _Min_Stack_Size #
- * ############################################################################
- * ^-- RAM start      ^-- _end                             _estack, RAM end --^
- * @endverbatim
- *
- * This implementation starts allocating at the '_end' linker symbol
- * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
- * The implementation considers '_estack' linker symbol to be RAM end
- * NOTE: If the MSP stack, at any point during execution, grows larger than the
- * reserved size, please increase the '_Min_Stack_Size'.
- *
- * @param incr Memory size
- * @return Pointer to allocated memory
- */
-void *_sbrk(ptrdiff_t incr)
-{
-  extern uint8_t _end; /* Symbol defined in the linker script */
-  extern uint8_t _estack; /* Symbol defined in the linker script */
-  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
-  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
-  const uint8_t *max_heap = (uint8_t *)stack_limit;
-  uint8_t *prev_heap_end;
-
-  /* Initialize  heap end at first call */
-  if (NULL == __sbrk_heap_end)
-  {
-    __sbrk_heap_end = &_end;
-  }
-
-  /* Protect heap from growing into the reserved MSP stack */
-  if (__sbrk_heap_end + incr > max_heap)
-  {
-    errno = ENOMEM;
-    return (void *)-1;
-  }
-
-  prev_heap_end = __sbrk_heap_end;
-  __sbrk_heap_end += incr;
-
-  return (void *)prev_heap_end;
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Core/sysmem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/sysmem.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Core/sysmem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
index 002329fa..f2b8d4d8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -1,39 +1,73 @@
 /*
-** LinkerScript
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
 */
 
 /* Entry Point */
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "SRAM1" Ram type memory */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
 
-_Min_Heap_Size  = 0x200; /* required amount of heap  */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
 _Min_Stack_Size = 0x800 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 256K
-  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K    /* Non-backup SRAM1 */
-  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K    /* Backup SRAM2 */
+  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 256K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -43,80 +77,82 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
-  /* Initialized data sections into "SRAM1" Ram type memory */
-  .data : 
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM1 AT> ROM
 
-  /* Uninitialized data section into "SRAM1" Ram type memory */
-  . = ALIGN(8);
+  } >RAM1 AT> FLASH
+
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -126,34 +162,12 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM1
 
-  /* Data section into "SRAM1" Ram type memory: Non-backup SRAM1 dedicated to CM4 */
-  . = ALIGN(8);
-  RAM1_region :
-  {
-    _sRAM1_region = .;         /* define a global symbol at section start */
-    *(.RAM1_region)
-
-    . = ALIGN(8);
-    _eRAM1_region = .;         /* define a global symbol at section end */
-  } >RAM1
-
-  /* Data section into "SRAM2" Ram type memory: Backup SRAM2 dedicated to CM4 */
-  . = ALIGN(8);
-  RAM2_region :
-  {
-    _sRAM2_region = .;         /* define a global symbol at section start */
-    *(.RAM2_region)
-
-    . = ALIGN(8);
-    _eRAM2_region = .;         /* define a global symbol at section end */
-  } >RAM2
-
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
   ._user_heap_stack :
   {
     . = ALIGN(8);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeMonitor/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeMonitor/readme.txt
index 11e17ba4..57618e6c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeMonitor/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/STM32CubeMonitor/readme.txt
@@ -1,18 +1,18 @@
 
-STM32WLxx Wireless Long Range RF test Readme file 
+STM32WLxx Wireless Long Range RF test Readme file
 
 ******************************************************************************
  Copyright (c) 2020 STMicroelectronics.
- All rights reserved. 
- This software component is licensed by ST under license SLA0048, the "License"; 
- You may not use this file except in compliance with the License. 
+ All rights reserved.
+ This software component is licensed by ST under license SLA0048, the "License";
+ You may not use this file except in compliance with the License.
  You may obtain a copy of the License at: www.st.com/SLA0048
- 
+
  The sub-flow "ui-table handler" is licensed under under Apache License, Version 2.0
  You may obtain a copy of the License at:opensource.org/licenses/Apache-2.0
- 
+
 ******************************************************************************
- 
+
 
 The STM32 Wireless Long Range RF test flow is used to test the wireless part of STM32WL. The test flow can be used to :
 - Display the Received Signal Strength Indicator (RSSI)
@@ -24,7 +24,7 @@ The STM32 Wireless Long Range RF test flow is used to test the wireless part of
 
 This directory contains the flow to be loaded in STM32CubeMonitor. (WLR_RF_test.json)
 
-The information to install and use the dashboard are available in wiki at 
+The information to install and use the dashboard are available in wiki at
 https://wiki.st.com/stm32mcu/wiki/STM32CubeMonitor:Wireless_Long_Range_RF_Test
 
 This application is targeting boards embedding the STM32WLxx with AT_Slave firmware.
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/readme.txt
index bca40891..0e37e35c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave/readme.txt
@@ -1,9 +1,9 @@
 /**
   @page LoRaWAN_AT_Slave Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/LoRaWAN/LoRaWAN_AT_Slave/readme.txt 
+  * @file    Applications/LoRaWAN/LoRaWAN_AT_Slave/readme.txt
   * @author  MCD Application Team
   * @brief   This application is a simple demo application software of a LoRa
   *          modem controlled though AT command interface over UART by an
@@ -35,13 +35,12 @@ This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx
 
 Applications, SubGHz_Phy, LoRaWAN, AT_Slave, SingleCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - LoRaWAN_AT_Slave/Core/Inc/adc.h                                             This file contains all the function prototypes for
                                                                                 the adc.c file
   - LoRaWAN_AT_Slave/Core/Inc/adc_if.h                                          Header for ADC interface configuration
-  - LoRaWAN_AT_Slave/Core/Inc/board_resources.h                                 Header for driver at.c module
   - LoRaWAN_AT_Slave/Core/Inc/dma.h                                             This file contains all the function prototypes for
                                                                                 the dma.c file
   - LoRaWAN_AT_Slave/Core/Inc/main.h                                            : Header for main.c file.
@@ -83,7 +82,6 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, SingleCore
   - LoRaWAN_AT_Slave/Core/Src/adc.c                                             This file provides code for the configuration
                                                                                 of the ADC instances.
   - LoRaWAN_AT_Slave/Core/Src/adc_if.c                                          Read status related to the chip (battery level, VREF, chip temperature)
-  - LoRaWAN_AT_Slave/Core/Src/board_resources.c                                 Source file
   - LoRaWAN_AT_Slave/Core/Src/dma.c                                             This file provides code for the configuration
                                                                                 of all the requested memory to memory DMA transfers.
   - LoRaWAN_AT_Slave/Core/Src/main.c                                            : Main program body
@@ -101,7 +99,7 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, SingleCore
   - LoRaWAN_AT_Slave/Core/Src/timer_if.c                                        Configure RTC Alarm, Tick and Calendar manager
   - LoRaWAN_AT_Slave/Core/Src/usart.c                                           This file provides code for the configuration
                                                                                 of the USART instances.
-  - LoRaWAN_AT_Slave/Core/Src/usart_if.c                                        Configuration of UART MX driver interface for hyperterminal communication
+  - LoRaWAN_AT_Slave/Core/Src/usart_if.c                                        Configuration of UART driver interface for hyperterminal communication
   - LoRaWAN_AT_Slave/LoRaWAN/App/app_lorawan.c                                  Application of the LRWAN Middleware
   - LoRaWAN_AT_Slave/LoRaWAN/App/lora_app.c                                     Application of the LRWAN Middleware
   - LoRaWAN_AT_Slave/LoRaWAN/App/lora_at.c                                      AT command API
@@ -109,24 +107,23 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, SingleCore
   - LoRaWAN_AT_Slave/LoRaWAN/App/lora_info.c                                    To give info to the application about LoRaWAN configuration
   - LoRaWAN_AT_Slave/LoRaWAN/App/test_rf.c                                      manages tx tests
   - LoRaWAN_AT_Slave/LoRaWAN/Target/radio_board_if.c                            This file provides an interface layer between MW and Radio Board
-  - LoRaWAN_AT_Slave/STM32CubeIDE/Application/Core/syscalls.c                   STM32CubeIDE Minimal System calls file
-  - LoRaWAN_AT_Slave/STM32CubeIDE/Application/Core/sysmem.c                     STM32CubeIDE System Memory calls file
+  - LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Core/syscalls.c              STM32CubeIDE Minimal System calls file
+  - LoRaWAN_AT_Slave/STM32CubeIDE/Application/User/Core/sysmem.c                STM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - sys_conf.h, radio_conf.h, lorawan_conf.h, lora_app.h, Commissioning.h, se-identity.h, mw_log_conf.h, radio_board_if.h, nucleo_conf.h, main.h, etc
-    - Careful: 
+    - sys_conf.h, radio_conf.h, lorawan_conf.h, lora_app.h, Commissioning.h, se-identity.h, mw_log_conf.h, main.h, etc
+    - Careful:
         - the region and class chosen on LoRaWAN/App/lora_app.h shall be compatible with LoRaWAN/Target/lorawan_conf.h list
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
 
   -Set Up:
 
@@ -137,9 +134,9 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, SingleCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all files and load your image into target memory
   - Run the example
   - Open a Terminal, connected the LoRa Object
@@ -149,5 +146,10 @@ In order to make the program work, you must do the following :
   - type AT? to get all available commands
   - Send your AT commands by typing them in the terminal
 
+@par How to debug ?
+  - make sure the flag DEBUGGER_ENABLED to 1 in sys_conf.h
+  - simpler to define the flag LOW_POWER_DISABLE to 1 as well
+  - compile, download and attach
+
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/.extSettings b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
index 45049335..40330641 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM0PLUS_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_CommandRcv_cb     command callback
   * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_config.h
index 4534c749..6d61b1e2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 #define KMS_NVM_SLOT_NUMBERS                     (50UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,31 +167,35 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 #define KMS_DERIVE_KEY
 
 /**
   * @brief KMS_SEARCH Uncomment the below line to support key search or mechanism search services
   */
-//#define KMS_SEARCH
+#define KMS_SEARCH
 
 /**
   * @brief KMS_GENERATE_KEYS Uncomment the below line to support key generation services
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 #define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 #define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_if.h
index 9a324008..1c890dbe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    kms_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef KMS_IF_H
@@ -67,4 +69,3 @@ extern "C" {
 #endif /* KMS_IF_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
index 8cf9cfbf..c6688943 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
@@ -37,13 +37,11 @@ extern "C" {
  * - Pool #3 is a 512 Bytes pool
  */
 /* USER CODE BEGIN KMS_MEM_POOL_Declare */
-
 KMS_MEM_DECLARE_POOL_START()
 KMS_MEM_DECLARE_POOL_ENTRY(1,256)
 KMS_MEM_DECLARE_POOL_ENTRY(2,256)
 KMS_MEM_DECLARE_POOL_ENTRY(3,512)
 KMS_MEM_DECLARE_POOL_END()
-
 /* USER CODE END KMS_MEM_POOL_Declare */
 
 /* USER CODE BEGIN KMS_MEM_POOL_DEF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
index d18e56d1..10bb7b7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
@@ -27,6 +27,7 @@
 /* USER CODE BEGIN KMS_PLATF_OBJECTS_CONFIG_Includes */
 #include "stm32wlxx.h"
 #include "Commissioning.h"
+#include "lorawan_conf.h" /* KEY_EXTRACTABLE */
 /* USER CODE END KMS_PLATF_OBJECTS_CONFIG_Includes */
 
 #ifdef __cplusplus
@@ -95,121 +96,135 @@ extern "C" {
 #pragma arm section rodata = ".USER_embedded_Keys"
 #endif
 
-KMS_DECLARE_BLOB_STRUCT(, 32)
+KMS_DECLARE_BLOB_STRUCT(, 21);
+KMS_DECLARE_BLOB_STRUCT(, 27);
 
+/* These objects are used by user tKMS application                 */
+#if defined(__GNUC__)
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
+#endif
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-/* These objects are used by user tKMS application                 */
-static const kms_obj_keyhead_32_t   Lorawan_Zero_Key =
+static const kms_obj_keyhead_27_t   Lorawan_Zero_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   1,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    CKA_DERIVE,       sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_App_Key =
+static const kms_obj_keyhead_27_t   Lorawan_App_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   2,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_APP_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_Nwk_Key =
+static const kms_obj_keyhead_27_t   Lorawan_Nwk_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   3,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_NWK_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_Nwk_S_Key =
+static const kms_obj_keyhead_21_t   Lorawan_Nwk_S_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  6,                               /*  uint32_t object_id; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_App_S_Key =
+static const kms_obj_keyhead_21_t   Lorawan_App_S_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  7,                               /*  uint32_t object_id; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_APP_S_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
@@ -218,6 +233,8 @@ static const kms_obj_keyhead_32_t   Lorawan_App_S_Key =
 #pragma default_variable_attributes =
 #elif defined(__CC_ARM)
 #pragma arm section code
+#elif defined(__GNUC__)
+#pragma GCC pop_options
 #endif
 /* USER CODE END KMS_PLATF_OBJECTS_CONFIG_Embedded_Objects_Definition */
 
@@ -232,11 +249,30 @@ const kms_obj_keyhead_t * const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBE
 {
 /* USER CODE BEGIN KMS_PlatfObjects_EmbeddedList */
   /* UserApp example keys */
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
   (kms_obj_keyhead_t *) &Lorawan_Zero_Key,            /* Index = 1 */
+#else
+  (kms_obj_keyhead_t *) NULL,                         /* Index = 1 */
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
   (kms_obj_keyhead_t *) &Lorawan_App_Key,             /* Index = 2 */
   (kms_obj_keyhead_t *) &Lorawan_Nwk_Key,             /* Index = 3 */
   (kms_obj_keyhead_t *) &Lorawan_Nwk_S_Key,           /* Index = 4 */
   (kms_obj_keyhead_t *) &Lorawan_App_S_Key,           /* Index = 5 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 8 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 12 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 13 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 14 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 15 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 16 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 20 */
 /* USER CODE END KMS_PlatfObjects_EmbeddedList */
 };
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/main.h
index 7afa4891..d6e56436 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/main.h
@@ -29,6 +29,7 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
+
 #include "app_kms.h"
 
 /* Private includes ----------------------------------------------------------*/
@@ -62,33 +63,14 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
index e3e06495..a2de8eb7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 /*#define HAL_UART_MODULE_ENABLED   */
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_app.h
index 2ed00a30..52839726 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -38,6 +40,10 @@ extern "C" {
 /* currently not supported */
 /* #define ALLOW_KMS_VIA_MBMUX */
 
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -71,29 +77,39 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
   */
 void SystemApp_Init(void);
 
 /**
   * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
+  * @param  id unique ID
   */
 void GetUniqueId(uint8_t *id);
 
 /**
   * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
   * @retval devAddr Device Address
   */
 uint32_t GetDevAddr(void);
 
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
 void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_conf.h
index 3a44ccfe..f026efa4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief CM0PLUS Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
index 433b7f3a..1d672420 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -35,7 +37,6 @@ extern "C" {
 #include "stm32_tiny_vsnprintf.h"
 
 #include "mbmuxif_trace.h"
-
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h
index cec8bb33..0f27bf45 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c
index 617042e8..1d49b00f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c
index ad72640a..d8ea5d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,7 +82,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* Enable C2AHB3 peripherals clock. */
@@ -89,14 +91,14 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccCommandRcv = IPCC_IF_CommandRcv_cb;
   IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c
index 3c498ca5..75f811e1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c
@@ -80,8 +80,8 @@ int main(void)
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
-  MX_LoRaWAN_Init();
   MX_KMS_Init();
+  MX_LoRaWAN_Init();
   /* USER CODE BEGIN 2 */
 
   /* USER CODE END 2 */
@@ -110,6 +110,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c
index f74cd49b..ab828d03 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,17 +71,20 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
   /** Enable the Alarm B
   */
   sAlarm.Alarm = RTC_ALARM_B;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
index 3dfcda11..eb2e798d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm_if.h"
 
 /* USER CODE BEGIN Includes */
@@ -91,7 +93,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C2STOP_C2STB();
@@ -110,7 +111,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
index d453b28c..c5323b14 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -75,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -128,7 +130,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/sys_app.c
index ba535e3b..c0f8decf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -27,15 +29,14 @@
 #include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-
 #include "msg_id.h"
-#include "features_info.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
 #include "mbmuxif_radio.h"
+#include "features_info.h"
 #include "mbmuxif_lora.h"
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-#include "mbmuxif_kms.h"
+/* #include "mbmuxif_kms.h" */
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
@@ -54,6 +55,7 @@
 
 /* Private define ------------------------------------------------------------*/
 #define MAX_TS_SIZE (int) 16
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -71,8 +73,6 @@
 /* Private function prototypes -----------------------------------------------*/
 /**
   * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
-  * @param none
-  * @retval  none
   */
 static void System_Init(void);
 
@@ -80,16 +80,12 @@ static void System_Init(void);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises MBMUXIF System and send a notification to Cm4 when ready
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   int8_t init_status;
@@ -98,6 +94,7 @@ void SystemApp_Init(void)
   /* USER CODE END SystemApp_Init_1 */
 
   /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
   /*Init low power manager*/
@@ -115,7 +112,7 @@ void SystemApp_Init(void)
   /* Init Feat_Info table */
   FEAT_INFO_Init();
 
-  /* Note: the trace is initialised in the context of MBMUXIF because it uses the MB on Cm0 side */
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
@@ -124,19 +121,14 @@ void SystemApp_Init(void)
 
   System_Init();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
 
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
-  */
 void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -156,7 +148,7 @@ void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Kms_Cmd_1 */
 
   /* USER CODE END Process_Kms_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
 
   APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
 
@@ -197,19 +189,19 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   switch (ComObj->MsgId)
   {
     case SYS_OTHER_MSG_ID:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
 
-  /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
       break;
 
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
 
-  /* USER CODE END Process_Sys_Cmd_switch_case */
+    /* USER CODE END Process_Sys_Cmd_switch_case */
 
     default:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
 
-  /* USER CODE END Process_Sys_Cmd_switch_default */
+      /* USER CODE END Process_Sys_Cmd_switch_default */
       break;
   }
 
@@ -221,16 +213,16 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Cmd_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -239,8 +231,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -299,20 +289,23 @@ uint32_t GetDevAddr(void)
   /* USER CODE BEGIN GetDevAddr_1 */
 
   /* USER CODE END GetDevAddr_1 */
+
   val = LL_FLASH_GetUDN();
   if (val == 0xFFFFFFFF)
   {
     val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
   }
+
   /* USER CODE BEGIN GetDevAddr_2 */
 
   /* USER CODE END GetDevAddr_2 */
   return val;
+
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
 static void System_Init(void)
@@ -324,7 +317,7 @@ static void System_Init(void)
   LL_C2_PWR_DisableInternWU();
 
   /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
-  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach onlt Cm4 */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
   LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
   LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
 
@@ -385,10 +378,7 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -403,13 +393,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -420,13 +408,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/timer_if.c
index 6133e380..6405002c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -106,6 +106,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -155,7 +166,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -175,9 +185,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -185,7 +195,7 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A and Alarm B enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
     /*overload RTC feature enable*/
@@ -193,11 +203,14 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -280,64 +293,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,9 +379,9 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
 {
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
   MBMUX_ComParam_t *com_obj;
 
   if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
@@ -376,9 +395,9 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
       MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
     }
   }
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
 }
 
 void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
@@ -386,7 +405,7 @@ void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
@@ -409,6 +428,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -418,16 +438,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -454,24 +474,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
index bb1c4293..f827d8ed 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
@@ -26,21 +26,19 @@
   * @brief   End-device commissioning parameters
   ******************************************************************************
  */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __COMMISSIONING_H__
 #define __COMMISSIONING_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 /*!
  ******************************************************************************
  ********************************** WARNING ***********************************
  ******************************************************************************
 
- The LoRaWAN AES128 keys are stored and provisionned on secure-elements.
+ The LoRaWAN AES128 keys are stored and provisioned on secure-elements.
 
- This project providdes a software emulated secure-element.
+ This project provides a software emulated secure-element.
  The LoRaWAN AES128 keys SHALL be updated under
  src/peripherals/<secure-element name>-se\se-identity.h file.
 
@@ -81,8 +79,4 @@ extern "C" {
 
 /* USER CODE END EC2 */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
index bd1de5a0..bcd8821e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_lorawan.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
index 2c49b393..fbe16b6d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_LORAWAN_H__
 #define __APP_LORAWAN_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported Functions Prototypes------------------------------------------------------- */
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Init(void);
 
 /**
   * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
index 804a2ea0..2c3ddcdf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sys_app.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
index 25340cb3..8bf1f9f1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_APP_H__
 #define __LORA_APP_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
index 55a1f921..dc745797 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
index 77f059d3..9b628efe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
@@ -1,5 +1,5 @@
 /*!
- * \file      se-identity_template.h
+ * \file      se-identity.h
  *
  * \brief     Secure Element identity and keys
  *
@@ -28,11 +28,12 @@
   *
   *          Portions COPYRIGHT 2020 STMicroelectronics
   *
-  * @file    se-identity_template.c
+  * @file    se-identity.h
   * @author  MCD Application Team
   * @brief   Secure Element identity and keys
   ******************************************************************************
   */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SOFT_SE_IDENTITY_H__
 #define __SOFT_SE_IDENTITY_H__
@@ -145,7 +146,7 @@ extern "C" {
 
 #if (USE_LRWAN_1_1_X_CRYPTO == 1)
 #define SESSION_KEYS_LIST                                                                                           \
-           {                                                                                                        \
+        {                                                                                                           \
             /*!                                                                                                     \
              * Join session integrity key (Dynamically updated)                                                     \
              * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
index 8fdf8b4b..e7610e08 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lorawan_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORAWAN_CONF_H__
@@ -25,8 +27,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-#include "sys_app.h"   /* needed for APP_PRINTF */
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -51,12 +51,12 @@ extern "C" {
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
 #else /* LORAWAN_KMS == 1 */
 #define OVER_THE_AIR_ACTIVATION 1
-#define ACTIVATION_BY_PERSONALISATION 1
-#endif
+#define ACTIVATION_BY_PERSONALIZATION 1
+#endif /* LORAWAN_KMS */
 
 /* Region ------------------------------------*/
 /* the region listed here will be linked in the CM0 MW code */
-/* the applic (on CM4/sys_conf.h) shall just configure one region at the time */
+/* the application (on CM4/sys_conf.h) shall just configure one region at the time */
 /*#define REGION_AS923*/
 /*#define REGION_AU915*/
 /*#define REGION_CN470*/
@@ -68,15 +68,30 @@ extern "C" {
 #define REGION_US915
 /*#define REGION_RU864*/
 
-#define HYBRID_ENABLED          0
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
 
-#define KEY_LOG_ENABLED         1
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
 
 /* Class B ------------------------------------*/
 #define LORAMAC_CLASSB_ENABLED  0
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-/* CLASS B LSE crystall calibration*/
+/* CLASS B LSE crystal calibration*/
 /**
   * \brief Temperature coefficient of the clock source
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
index 3e3c7abb..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     10U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
index 3a3fd8a1..08263606 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,6 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,12 +49,12 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief Max payload buffer size
@@ -65,6 +68,7 @@ extern "C" {
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -72,25 +76,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -130,6 +151,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
index f3ce93b2..1991b928 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    systime.h
@@ -16,8 +17,9 @@
   *
   ******************************************************************************
   */
-/* Define to prevent recursive inclusion -------------------------------------*/
+/* USER CODE END Header */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTIME_H__
 #define __SYSTIME_H__
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
index 4d15f862..39228252 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_mem.h"
@@ -47,11 +49,11 @@
 typedef enum TxEventType_e
 {
   /*!
-   * @brief AppdataTransmition issue based on timer every TxDutyCycleTime
+   * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
    */
   TX_ON_TIMER,
   /*!
-   * @brief AppdataTransmition external event plugged on OnSendEvent( )
+   * @brief Appdata Transmission external event plugged on OnSendEvent( )
    */
   TX_ON_EVENT
 } TxEventType_t;
@@ -64,10 +66,10 @@ typedef enum TxEventType_e
 #ifndef MAX
 #define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #endif /* MAX */
-#define MCPS_SIZE MAX(sizeof(McpsConfirm_t), sizeof(McpsIndication_t))
-#define MLME_SIZE MAX(sizeof(MlmeConfirm_t), sizeof(MlmeIndication_t))
-#define LORA_MBWRAP_SHBUF_SIZE MAX(MCPS_SIZE, MLME_SIZE)
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
+#define LMH_ON_JOIN_SIZE (sizeof(LmHandlerJoinParams_t))
+#define LMH_ON_TX_SIZE   (sizeof(LmHandlerTxParams_t))
+#define LMH_ON_RX_SIZE   (((sizeof(LmHandlerAppData_t) + 7) & ~7) + 256 + (sizeof(LmHandlerRxParams_t)))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(LMH_ON_JOIN_SIZE, MAX(LMH_ON_TX_SIZE, LMH_ON_RX_SIZE))
 
 /* USER CODE BEGIN PD */
 
@@ -83,25 +85,50 @@ static uint8_t GetBatteryLevel_mbwrapper(void);
 
 static uint16_t GetTemperatureLevel_mbwrapper(void);
 
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size);
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params);
+
 static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams);
 
 static void OnTxData_mbwrapper(LmHandlerTxParams_t *params);
 
 static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass);
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params);
+
+static void OnSysTimeUpdate_mbwrapper(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM0+ to CM4
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
 static LmHandlerCallbacks_t callback_mbwrapper =
 {
   .GetBatteryLevel =           GetBatteryLevel_mbwrapper,
   .GetTemperature =            GetTemperatureLevel_mbwrapper,
+  .GetUniqueId =               GetUniqueId,
+  .GetDevAddr =                GetDevAddr,
   .OnMacProcess =              OnMacProcessNotify,
+  .OnNvmDataChange =           OnNvmDataChange_mbwrapper,
+  .OnNetworkParametersChange = OnNetworkParametersChange_mbwrapper,
   .OnJoinRequest =             OnJoinRequest_mbwrapper,
   .OnTxData =                  OnTxData_mbwrapper,
   .OnRxData =                  OnRxData_mbwrapper,
+  .OnClassChange =             OnClassChange_mbwrapper,
+  .OnBeaconStatusChange =      OnBeaconStatusChange_mbwrapper,
+  .OnSysTimeUpdate =           OnSysTimeUpdate_mbwrapper
 };
 
 /* USER CODE BEGIN PV */
@@ -114,17 +141,19 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Lora_Cmd_1 */
 
   /* USER CODE END Process_Lora_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;
+  uint32_t *com_buffer = NULL;
   LmHandlerErrorStatus_t errorStatus;
   LmHandlerFlagStatus_t flagStatus;
   int32_t ret_code;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(LoRa)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
-    case LMHANDLER_INITIALIZATION_ID:
+    case   LMHANDLER_INITIALIZATION_ID:
       errorStatus = LmHandlerInit(&callback_mbwrapper);
 
       /* prepare response buffer */
@@ -141,7 +170,7 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = (uint32_t) errorStatus; /* */
       break;
 
-    case LMHANDLER_JOIN_STATUS_ID:
+    case   LMHANDLER_JOIN_STATUS_ID:
       flagStatus = LmHandlerJoinStatus();
 
       /* prepare response buffer */
@@ -222,6 +251,54 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal = (uint32_t) ret_code; /* */
       break;
+    case   LMHANDLER_GET_NWKKEY_ID:
+      ret_code = LmHandlerGetNwkKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKKEY_ID:
+      ret_code = LmHandlerSetNwkKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPKEY_ID:
+      ret_code = LmHandlerGetAppKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPKEY_ID:
+      ret_code = LmHandlerSetAppKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_NWKSKEY_ID:
+      ret_code = LmHandlerGetNwkSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKSKEY_ID:
+      ret_code = LmHandlerSetNwkSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPSKEY_ID:
+      ret_code = LmHandlerGetAppSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPSKEY_ID:
+      ret_code = LmHandlerSetAppSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
     case   LMHANDLER_GET_NWKID_ID:
       ret_code = LmHandlerGetNetworkID((uint32_t *) com_buffer[0]);
       /* prepare response buffer */
@@ -384,6 +461,18 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal = (uint32_t) ret_code; /* */
       break;
+    case LMHANDLER_LINK_CHECK_REQ_ID:
+      ret_code = LmHandlerLinkCheckReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case LMHANDLER_DEVICE_TIME_REQ_ID:
+      ret_code = LmHandlerDeviceTimeReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
     case   LMHANDLER_INFO_INIT_ID:
       LoraInfo_Init();
       /* prepare response buffer */
@@ -462,19 +551,92 @@ static uint16_t GetTemperatureLevel_mbwrapper(void)
   /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
 }
 
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size)
+{
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_1 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)state;
+  com_buffer[1] = (uint32_t)size;
+  com_obj->ParamCnt = 2;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_2 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_2 */
+}
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params)
+{
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_1 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(CommissioningParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_2 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_2 */
+}
+
 static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams)
 {
   /* USER CODE BEGIN OnJoinRequest_mbwrapper_1 */
 
   /* USER CODE END OnJoinRequest_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
+  if (joinParams != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_JOIN_REQ_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (joinParams == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
   com_obj->ParamCnt = 1;
 
   MBMUXIF_LoraSendNotif();
@@ -492,13 +654,27 @@ static void OnTxData_mbwrapper(LmHandlerTxParams_t *params)
 
   /* USER CODE END OnTxData_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_TX_DATA_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
   com_obj->ParamCnt = 1;
 
   MBMUXIF_LoraSendNotif();
@@ -516,16 +692,50 @@ static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t
 
   /* USER CODE END OnRxData_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  /* need to 8-align the next address */
-  uint8_t next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
+  uint32_t *com_buffer = NULL;
+  uint8_t next_addr = 0;
+
+  if (appData != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
+    /* need to 8-align the next address */
+    next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
+
+    if (appData->BufferSize > 0)
+    {
+      UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], appData->Buffer, appData->BufferSize);
+      ((LmHandlerAppData_t *)aLoraMbWrapShare2Buffer)->Buffer = &aLoraMbWrapShare2Buffer[next_addr];
+      next_addr = (appData->BufferSize + 7) & ~7;
+    }
+  }
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
+  }
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
-  UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_RX_DATA_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
-  com_obj->ParamBuf[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (appData == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
+  if (params == NULL)
+  {
+    com_buffer[1] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
+  }
+
   com_obj->ParamCnt = 2;
 
   MBMUXIF_LoraSendNotif();
@@ -537,6 +747,86 @@ static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t
   /* USER CODE END OnRxData_mbwrapper_2 */
 }
 
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass)
+{
+  /* USER CODE BEGIN OnClassChange_mbwrapper_1 */
+
+  /* USER CODE END OnClassChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_CLASS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)deviceClass;
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnClassChange_mbwrapper_2 */
+
+  /* USER CODE END OnClassChange_mbwrapper_2 */
+}
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerBeaconParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
+static void OnSysTimeUpdate_mbwrapper(void)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
index a07ea737..bc600e5f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LMHANDLER_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c
index 3ce58f07..61a6eb3d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stddef.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/lora_info.c
index 9d845793..e95e07d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/lora_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/lora_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.c
@@ -16,10 +17,12 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "LoRaMac.h"
 #include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
 #include "platform.h" /* Needed for Error_Handler */
 #include "features_info.h"
 
@@ -27,11 +30,6 @@
 
 /* USER CODE END Includes */
 
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
 /* Private typedef -----------------------------------------------------------*/
 
 /* USER CODE BEGIN PTD */
@@ -58,9 +56,7 @@
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief initialises the LoraMacInfo capabilities table
-  * @param none
-  * @retval  none
+  * @brief initialize the LoraMacInfo capabilities table
   */
 void StoreValueInFeatureListTable(void);
 
@@ -120,6 +116,10 @@ void LoraInfo_Init(void)
   if (loraInfo.Region == 0)
   {
     APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
     while (1) {} /* At least one region shall be defined */
   }
 
@@ -134,7 +134,7 @@ void LoraInfo_Init(void)
   loraInfo.ActivationMode = 3;
 #else /* LORAWAN_KMS == 1 */
   loraInfo.Kms = 1;
-  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALISATION + (OVER_THE_AIR_ACTIVATION << 1);
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
 #endif /* LORAWAN_KMS */
 
   /* For DualCore */
@@ -188,7 +188,7 @@ void StoreValueInFeatureListTable(void)
 
   if (found)
   {
-    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t)/sizeof(uint32_t);
+    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t) / sizeof(uint32_t);
     p_feature->Feat_Info_Config_Ptr = &loraInfo;
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c
index 013f7100..ef887470 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -51,15 +54,53 @@
 
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -67,11 +108,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -80,27 +116,23 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   uint8_t i;
   IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
 
-  p_MBMUX_ComTable = pMBMUX_ComTable;
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
 
   for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
   {
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
   }
   /* USER CODE BEGIN MBMUX_Init_Last */
 
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval  return -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
-  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
 {
   uint8_t channel_idx;
@@ -116,15 +148,19 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   {
     /* channel has been registered by CM4 registered */
     channel_idx = check_existing_feature_registration;
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm0plusCb = MsgCb;
-    }
-    else
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
     {
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm0plusCb = MsgCb;
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
     }
-    ret = channel_idx;
   }
   /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
 
@@ -132,13 +168,6 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -155,11 +184,11 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
       /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
       IPCC_IF_ResponseSnd(mb_ch);
 
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
     else
     {
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
   }
   /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
@@ -167,12 +196,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -199,11 +222,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Notif to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
@@ -214,7 +232,7 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
   if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
   {
-    while (1) {}
+    Error_Handler();
   }
   return IPCC_IF_NotificationSnd(mb_ch);
   /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
@@ -222,11 +240,6 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_NotificationSnd_Last */
 }
 
-/**
-  * @brief Send response to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
@@ -241,17 +254,118 @@ uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_ResponseSnd_Last */
 }
 
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
 /* USER CODE BEGIN EFD */
 
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
@@ -260,18 +374,13 @@ static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
@@ -280,19 +389,13 @@ static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
   return;
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -304,17 +407,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h
index e91b1547..a938e544 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM0PLUS_H__
@@ -52,19 +54,58 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 0ec2ec5d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *KmsComObj;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskKmsCmdRcv(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers KMS feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsCmdRcvCb);
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskKmsCmdRcv);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Sends a Kms-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendResp(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_1 */
-  if (MBMUX_ResponseSnd(FEAT_INFO_KMS_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_1 */
-  KmsComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_Last */
-}
-
-/**
-  * @brief  KMS task to process the command
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskKmsCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_1 */
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-  Process_Kms_Cmd(KmsComObj);
-#endif /* ALLOW_KMS_VIA_MBMUX */
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
deleted file mode 100644
index 12b71c19..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM0PLUS_H__
-#define __MBMUXIF_KMS_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-void MBMUXIF_KmsSendResp(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
index d0cc04c2..26630e54 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to register and handle LoraWAN to MBMUX
+  * @brief   allows CM0 application to register and handle LoraWAN to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -56,21 +58,27 @@ static MBMUX_ComParam_t *LoraComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the command
+  */
 static void MBMUXIF_TaskLoraCmdRcv(void);
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers LORA feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_LoraInit(void)
 {
   int8_t ret;
@@ -95,11 +103,6 @@ int8_t MBMUXIF_LoraInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Lora feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_1 */
@@ -108,7 +111,7 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_Last */
@@ -116,11 +119,6 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Lora-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendNotif(void)
 {
   /* to check vs radio. radio call this on irq so it moves here on task */
@@ -134,18 +132,13 @@ void MBMUXIF_LoraSendNotif(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_LoraSendNotif_Last */
 
   /* USER CODE END MBMUXIF_LoraSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Lora-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendResp_1 */
@@ -153,7 +146,7 @@ void MBMUXIF_LoraSendResp(void)
   /* USER CODE END MBMUXIF_LoraSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_LoraSendResp_Last */
 
@@ -165,11 +158,6 @@ void MBMUXIF_LoraSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  LORA acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_1 */
@@ -181,11 +169,6 @@ static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_Last */
 }
 
-/**
-  * @brief  LORA command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_1 */
@@ -198,11 +181,6 @@ static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_Last */
 }
 
-/**
-  * @brief  LORA task to process the command
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskLoraCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
index 75fda6ea..558f081f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.h
   * @author  MCD Application Team
-  * @brief   API provided to CM0PLUS applic to register and handle LoraWAN via MBMUX
+  * @brief   API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_LORA_CM0PLUS_H__
@@ -52,9 +54,30 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_LoraSendNotif(void);
+
+/**
+  * @brief   Sends a Lora-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_LoraSendResp(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
index 3ba64a2b..fe5fd070 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -57,22 +59,33 @@ static MBMUX_ComParam_t *RadioComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
 static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
 static void MBMUXIF_TaskRadioNotifSnd(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers RADIO feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   int8_t ret;
@@ -99,11 +112,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
@@ -112,7 +120,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
@@ -120,11 +128,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendNotif(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
@@ -136,11 +139,6 @@ void MBMUXIF_RadioSendNotif(void)
   /* USER CODE END MBMUXIF_RadioSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Radio-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
@@ -148,7 +146,7 @@ void MBMUXIF_RadioSendResp(void)
   /* USER CODE END MBMUXIF_RadioSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
 
@@ -160,11 +158,6 @@ void MBMUXIF_RadioSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
@@ -176,11 +169,6 @@ static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
@@ -193,11 +181,6 @@ static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the command
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
@@ -209,11 +192,6 @@ static void MBMUXIF_TaskRadioCmdRcv(void)
   /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
 }
 
-/**
-  * @brief  RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifSnd(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
@@ -225,7 +203,7 @@ static void MBMUXIF_TaskRadioNotifSnd(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
index 44fab48f..7e226c6c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM0PLUS_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_RadioSendResp(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
index a3ce77e9..67725244 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to handle the SYSTEM MBMUX channel
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -63,27 +65,59 @@ static MBMUX_ComParam_t *SystemComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
 static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
 
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf);
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
 
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
@@ -118,7 +152,7 @@ int8_t MBMUXIF_SystemInit(void)
 
   if (ret >= 0)
   {
-    /* Notify Cm4 that MBMUXIF_System and RTC are initialised on Cm0 side */
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
     /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
     while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
     pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
@@ -130,14 +164,6 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Get synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
@@ -146,11 +172,6 @@ uint16_t MBMUXIF_GetCpusSynchroFlag(void)
   return pMb_RefTable->SynchronizeCpusAtBoot;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
@@ -159,7 +180,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
 
@@ -167,11 +188,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   return com_param_ptr;
 }
 
-/**
-  * @brief Sends a System-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
@@ -183,18 +199,13 @@ void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
@@ -202,26 +213,21 @@ void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
 }
 
-/**
-  * @brief Sends a System-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
 
-  /* USER CODE END EFMBMUXIF_SystemSendResp_1 */
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
   if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
 
@@ -238,7 +244,7 @@ int16_t MBMUXIF_ChipRevId(void)
   int16_t ret = pMb_RefTable->ChipRevId;
   /* USER CODE BEGIN MBMUXIF_ChipRevId */
 
-  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+  /* USER CODE END MBMUXIF_ChipRevId */
   return ret ;
 }
 
@@ -247,35 +253,24 @@ int16_t MBMUXIF_ChipRevId(void)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 {
   SystemComObj = (MBMUX_ComParam_t *) ComObj;
-  uint32_t *com_buffer = SystemComObj->ParamBuf;
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
 
   /* process Command on Isr or schedule a task*/
   switch (SystemComObj->MsgId)
@@ -285,14 +280,9 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
       MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
       break;
 
-    case SYS_REGISTER_FEATURE_MSG_ID:
-      SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
-      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-      break;
-
     /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
     default:
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
@@ -301,89 +291,68 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
 
 }
 
-/**
-  * @brief  SYSTEM task to process the command
-  * @param  none
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemCmdRcv(void)
 {
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
-  Process_Sys_Cmd(SystemComObj);
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
 
 }
 
-/**
-  * @brief  SYSTEM PRIO_A acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
 }
 
-/**
-  * @brief  Retrieve the feature that needs MbMux registration and call correspondent Init
-  * @param  pointer to parameter buffer of the command
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  */
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
 {
   int8_t ret = -2; /* feature not supported */
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  switch (ParamBuf[0])
+  switch (pBuf[0])
   {
     case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
       ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
@@ -407,6 +376,9 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
       ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
       break;
 
@@ -416,17 +388,23 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
       ret = MBMUXIF_LoraInit();
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora registration done\r\n");
       break;
 
     case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox not supported\r\n");
       break;
 
     /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
     default:
       break;
@@ -434,7 +412,7 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
   return ret;
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
index 01dff052..f780cdde 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM0PLUS_H__
@@ -54,11 +56,44 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -66,6 +101,10 @@ void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
 int16_t MBMUXIF_ChipRevId(void);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
index 04c9f7b6..05704d23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -25,6 +27,7 @@
 #include "msg_id.h"
 #include "stm32_seq.h"
 #include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
 
 /* USER CODE BEGIN Includes */
 
@@ -46,15 +49,43 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
-static void (*TraceUtilCpltCallback)(void *);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
 
 /* USER CODE BEGIN PFP */
@@ -75,12 +106,6 @@ const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
 /* USER CODE END PTD */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
 {
   int8_t ret;
@@ -92,6 +117,8 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
   if (ret >= 0)
   {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
     /*Initialize the terminal */
     UTIL_ADV_TRACE_Init();
     UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
@@ -107,11 +134,6 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Trace feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
@@ -120,7 +142,7 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
@@ -128,11 +150,6 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendNotif_NoWait(void)
 {
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
@@ -140,7 +157,7 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
   /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
 
@@ -152,14 +169,6 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
 /* USER CODE END EFD */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief The trace utilities inform the mbmuxif which func to call
-  *        once the Mb transmission is completed
-  * @param:  "stm32_adv_trace.c callback"
-  * @retval: none
-  */
-
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
@@ -172,26 +181,23 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
   /* USER CODE END MBMUXIF_TraceBufferInit_Last */
 }
 
-/**
-  * @brief TraceBufferSend sends the formatted buffer to CM4 which
-  *        posts it to the circular queue for printing
-  * @param:  strFormat: string to be printed
-  * @retval: 0 when ok, -1 when circular queue is full
-  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
 
   /* USER CODE END MBMUXIF_TraceBufferSend_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
 
-  /* notify CM4 that CM0PLUS is initialised */
+  /* notify CM4 that CM0PLUS is initialized */
   com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
   if (com_obj != NULL)
   {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
     com_obj->MsgId = TRACE_SEND_MSG_ID;
-    com_obj->ParamBuf[0] = (uint32_t) buf;
-    com_obj->ParamBuf[1] = (uint32_t) bufSize;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
     com_obj->ParamCnt = 2;
     MBMUXIF_TraceSendNotif_NoWait();
   }
@@ -202,24 +208,28 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bu
 }
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TRACE acknowledge callbacks: set event to release waiting task
-  *             and use callback to check if other trace need to be sent to CM4
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
-  TraceUtilCpltCallback(NULL);
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
 }
 
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
index 490321d2..8aad9276 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle TRACE via MBMUX
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM0PLUS_H__
@@ -52,8 +54,23 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendNotif_NoWait(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
index c09f8d55..063d379e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -47,7 +49,6 @@
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
 
 /* USER CODE BEGIN PD */
 
@@ -59,7 +60,15 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_S
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-static  RadioEvents_t    radioevents_mbwrapper;
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/**
+  * @brief local structure of radio callbacks for command processes
+  */
+static  RadioEvents_t radioevents_mbwrapper;
 
 /* USER CODE BEGIN PV */
 
@@ -79,10 +88,10 @@ static void RadioTxTimeout_mbwrapper(void);
 /*!
  * \brief Rx Done callback prototype.
  *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
+ * \param[in] payload Received buffer pointer
+ * \param[in] size    Received buffer size
+ * \param[in] rssi    RSSI value computed while receiving the frame [dBm]
+ * \param[in] snr     Raw SNR value given by the radio hardware
  *                     FSK : N/A ( set to 0 )
  *                     LoRa: SNR value in dB
  */
@@ -108,13 +117,15 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Radio_Cmd_1 */
 
   /* USER CODE END Process_Radio_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = NULL;
   uint32_t ret_uint;
   int32_t ret_int;
   RadioState_t status;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
@@ -242,7 +253,7 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = 0; /* */
       break;
 
-    case RADIO_SET_TX_CONTINOUS_WAVE_ID:
+    case RADIO_SET_TX_CONTINUOUS_WAVE_ID:
       Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -411,16 +422,26 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
 
   /* USER CODE END RadioRxDone_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
+  uint32_t *com_buffer = NULL ;
   uint16_t i = 0;
 
   /* copy data from Cm0 private memory to shared memory */
-  UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  if (payload != NULL)
+  {
+    UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  }
 
   com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
   com_obj->MsgId = RADIO_RX_DONE_CB_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (payload == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  }
   com_buffer[i++] = (uint32_t) size;
   com_buffer[i++] = (uint32_t) rssi;
   com_buffer[i++] = (uint32_t) snr;
@@ -435,7 +456,7 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
   /* once event is received and semaphore released: */
 
   /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
-     this migh be requested just if the buffer should be processed by the applic and the stack */
+     this might be requested just if the buffer should be processed by the application and the stack */
   /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
   return;
   /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
index 4b3da2cd..ac6a70d3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/ipcc_if.h
index 49ee1e48..e891e529 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM4_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_ResponseRcv_cb     response callback
   * @param  IPCC_IF_NotificationRcv_cb notification callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/main.h
index 7665e1c1..0831d7f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -61,38 +60,18 @@ void Error_Handler(void);
 /* Private defines -----------------------------------------------------------*/
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
-#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
index 75f1386d..2fffde50 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 /*#define HAL_SUBGHZ_MODULE_ENABLED   */
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/sys_app.h
index ab592978..59d790a6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -35,6 +37,10 @@ extern "C" {
 /* USER CODE END Includes */
 
 /* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -70,24 +76,24 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
 void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
 
 /**
   * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
-  * @param  none
   * @retval battery level
   */
 uint8_t GetBatteryLevel(void);
 
 /**
   * @brief  callback to get the current temperature in the MCU
-  * @param  none
   * @retval temperature level
   */
 uint16_t GetTemperatureLevel(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/sys_conf.h
index ee13715b..01aa7a98 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -41,24 +43,28 @@ extern "C" {
   * @brief CM4 Verbose level for all trace logs
   * @note In AT_SLAVE usart speed is just 9600. VLEVEL_H will not work
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/usart.h
index c196d42b..29cb339e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h
index dae79470..ebd9cc7a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h
index 66024db2..973afab4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
@@ -72,6 +76,9 @@ typedef enum
 typedef enum
 {
   /* CM4 */
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t_0 */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t_0 */
   CFG_SEQ_Task_MbSystemNotifRcv,
   CFG_SEQ_Task_MbLoRaNotifRcv,
   CFG_SEQ_Task_MbRadioNotifRcv,
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc.c
index ad6e2e7c..fdcbc616 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c
index abfae080..672a366f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,21 +82,21 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* IPCC EXTI (AIEC) line for CPU1  */
   LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
   IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/main.c
index 25a3f790..39c26a02 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -158,6 +159,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_it.c
index 78324eb9..877470fb 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_it.c
@@ -75,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -186,7 +188,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/sys_app.c
index f7b9c727..8195199d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,15 +27,17 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 #include "msg_id.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
-#include "mbmuxif_lora.h"
 #include "mbmuxif_radio.h"
-/*#include "mbmuxif_kms.h"*/
+#include "mbmuxif_lora.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
 
@@ -68,23 +72,21 @@
 /* Private variables ---------------------------------------------------------*/
 uint32_t InstanceIndex;
 uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_Init(void);
-
 /**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
   */
-static void Gpio_PreInit(void);
+static void MBMUXIF_Init(void);
+
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -92,15 +94,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
+
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -110,10 +109,8 @@ void SystemApp_Init(void)
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
 
-  Gpio_PreInit();
-
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -121,6 +118,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -141,14 +139,14 @@ void SystemApp_Init(void)
 
   UTIL_TIMER_Init();
 
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief  Process System Notifications
-  */
 void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Sys_Notif_1 */
@@ -160,14 +158,24 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 
   switch (notif_ack_id)
   {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
     case SYS_OTHER_MSG_ID:
       APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
       /* prepare ack buffer*/
       ComObj->ParamCnt = 0;
-      ComObj->ReturnVal = 7; /* dummy value for test */
-      break;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
 
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
     default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
       break;
   }
 
@@ -179,16 +187,16 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Notif_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -197,8 +205,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -222,7 +228,7 @@ uint8_t GetBatteryLevel(void)
 
   batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
 
-  /* Convert batterey level from mV to linea scale: 1 (very low) to 254 (fully charged) */
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
   if (batteryLevelmV > VDD_BAT)
   {
     batteryLevel = LORAWAN_MAX_BAT;
@@ -256,51 +262,46 @@ uint16_t GetTemperatureLevel(void)
   return temperatureLevel;
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Test: Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialises other features
-  * @param none
-  * @retval none
-  */
 static void MBMUXIF_Init(void)
 {
   /* USER CODE BEGIN MBMUXIF_Init_1 */
 
   /* USER CODE END MBMUXIF_Init_1 */
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
   int8_t init_status;
 
-  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
 
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   /* start CM0PLUS */
-  /* Note: when debugging in order to connect with the deggugger CPUU2 shall be start using workspace CM4 starts CM0PLUS */
-  /* On the other hand is up to the devepoper make sure the CM0PLUS debugger is run after CM4 debugger */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
   HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-  /* CM4 has started and it has reset the mailbox and initialised the MbMux; */
-  /* once CM0PLUS is also initialised it send a SYS notification */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialisation done: Wait for CM0PLUS \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
 
-  MBMUXIF_WaitCm0MbmuxIsInitialised();
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
-  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supprted_features_list);
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
 
-  APP_LOG(TS_ON, VLEVEL_H, "System Initialisation CM4-CM0PLUS completed \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
 
   init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
   if (init_status < 0)
@@ -349,45 +350,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -428,13 +390,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -449,13 +409,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -466,13 +424,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -487,4 +443,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/timer_if.c
index e04bdfc6..f02a544d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/timer_if.c
@@ -21,8 +21,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -163,9 +163,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   /** Configure the Instance */
   hrtc.Instance = RTC;
   HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
@@ -245,64 +245,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -325,6 +331,7 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -334,16 +341,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -370,24 +377,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart.c
index 343006bc..476eb1f2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_lpuart1_tx;
 void MX_LPUART1_UART_Init(void)
 {
 
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
-  hlpuart1.Init.BaudRate = LPUART_BAUDRATE;
+  hlpuart1.Init.BaudRate = 9600;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
   hlpuart1.Init.StopBits = UART_STOPBITS_1;
   hlpuart1.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_LPUART1_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart_if.c
index cfa581cd..36217a2f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&hlpuart1);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.c
index ba6f23a9..f7038db8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_lorawan.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.h
index 2c49b393..fbe16b6d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_LORAWAN_H__
 #define __APP_LORAWAN_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported Functions Prototypes------------------------------------------------------- */
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Init(void);
 
 /**
   * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.c
index ae411cc2..f134fff9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -56,46 +58,22 @@
 /* USER CODE END PM */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  LED Tx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnTxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Rx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnRxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Join timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnJoinTimerLedEvent(void *context);
-
 /**
   * @brief  join event callback function
-  * @param  params
-  * @retval none
+  * @param  joinParams status of join
   */
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
 
 /**
   * @brief  tx event callback function
-  * @param  params
-  * @retval none
+  * @param  params status of last Tx
   */
 static void OnTxData(LmHandlerTxParams_t *params);
 
 /**
-  * @brief callback when LoRa endNode has received a frame
-  * @param appData
-  * @param params
-  * @retval None
+  * @brief callback when LoRa application has received a frame
+  * @param appData data received in the last Rx
+  * @param params status of last Rx
   */
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
@@ -108,13 +86,29 @@ static void OnMacProcessNotify(void);
 
 /**
   * @brief  call back when LoRaWan Stack needs update
-  * @param  none
-  * @retval none
   */
 static void CmdProcessNotify(void);
 
 /* USER CODE BEGIN PFP */
 
+/**
+  * @brief  LED Tx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnTxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Rx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnRxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Join timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnJoinTimerLedEvent(void *context);
+
 /* USER CODE END PFP */
 
 /* Private variables ---------------------------------------------------------*/
@@ -143,6 +137,7 @@ static LmHandlerParams_t LmHandlerParams =
   .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
 };
 
+/* USER CODE BEGIN PV */
 /**
   * @brief Timer to handle the application Tx Led to toggle
   */
@@ -158,8 +153,6 @@ static UTIL_TIMER_Object_t RxLedTimer;
   */
 static UTIL_TIMER_Object_t JoinLedTimer;
 
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Exported functions ---------------------------------------------------------*/
@@ -172,24 +165,14 @@ void LoRaWAN_Init(void)
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
   uint32_t lora_cm0plus_app;
 
+  CMD_Init(CmdProcessNotify);
+
   /* USER CODE BEGIN LoRaWAN_Init_1 */
 
-  /* USER CODE END LoRaWAN_Init_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Init(LED_BLUE);
   BSP_LED_Init(LED_GREEN);
   BSP_LED_Init(LED_RED);
   BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-  SYS_LED_Init(SYS_LED_RED);
-  SYS_PB_Init(SYS_BUTTON2, SYS_BUTTON_MODE_EXTI);
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-
-  CMD_Init(CmdProcessNotify);
 
   /* Get CM4 LoRa APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
@@ -220,7 +203,6 @@ void LoRaWAN_Init(void)
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
-
   UTIL_TIMER_Create(&TxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerLedEvent, NULL);
   UTIL_TIMER_Create(&RxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnRxTimerLedEvent, NULL);
   UTIL_TIMER_Create(&JoinLedTimer, 0xFFFFFFFFU, UTIL_TIMER_PERIODIC, OnJoinTimerLedEvent, NULL);
@@ -228,6 +210,8 @@ void LoRaWAN_Init(void)
   UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
   UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
 
+  /* USER CODE END LoRaWAN_Init_1 */
+
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLmHandlerProcess), UTIL_SEQ_RFU, LmHandlerProcess);
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbVcom), UTIL_SEQ_RFU, CMD_Process);
   /* Init the Lora Stack*/
@@ -235,15 +219,19 @@ void LoRaWAN_Init(void)
 
   LmHandlerConfigure(&LmHandlerParams);
 
+  /* USER CODE BEGIN LoRaWAN_Init_Last */
   UTIL_TIMER_Start(&JoinLedTimer);
 
   APP_PPRINTF("ATtention command interface\r\n");
   APP_PPRINTF("AT? to list all available functions\r\n");
-  /* USER CODE BEGIN LoRaWAN_Init_Last */
 
   /* USER CODE END LoRaWAN_Init_Last */
 }
 
+/* USER CODE BEGIN PB_Callbacks */
+
+/* USER CODE END PB_Callbacks */
+
 /* Private functions ---------------------------------------------------------*/
 /* USER CODE BEGIN PrFD */
 
@@ -252,115 +240,65 @@ void LoRaWAN_Init(void)
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
 {
   /* USER CODE BEGIN OnRxData_1 */
-
-  /* USER CODE END OnRxData_1 */
-  if ((appData != NULL) && (params != NULL))
+  if ((appData != NULL) || (params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
     BSP_LED_On(LED_BLUE) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
+
     UTIL_TIMER_Start(&RxLedTimer);
 
     AT_event_receive(appData, params);
   }
-
-  /* USER CODE BEGIN OnRxData_2 */
-
-  /* USER CODE END OnRxData_2 */
+  /* USER CODE END OnRxData_1 */
 }
 
+/* USER CODE BEGIN PrFD_LedEvents */
 static void OnTxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnTxTimerLedEvent_1 */
-
-  /* USER CODE END OnTxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_GREEN) ;
-#else
-  SYS_LED_Off(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnTxTimerLedEvent_2 */
-
-  /* USER CODE END OnTxTimerLedEvent_2 */
 }
 
 static void OnRxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnRxTimerLedEvent_1 */
-
-  /* USER CODE END OnRxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_BLUE) ;
-#else
-  SYS_LED_Off(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnRxTimerLedEvent_2 */
-
-  /* USER CODE END OnRxTimerLedEvent_2 */
 }
 
 static void OnJoinTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnJoinTimerLedEvent_1 */
-
-  /* USER CODE END OnJoinTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Toggle(LED_RED) ;
-#else
-  SYS_LED_Toggle(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnJoinTimerLedEvent_2 */
-
-  /* USER CODE END OnJoinTimerLedEvent_2 */
 }
 
+/* USER CODE END PrFD_LedEvents */
+
 static void OnTxData(LmHandlerTxParams_t *params)
 {
   /* USER CODE BEGIN OnTxData_1 */
-
-  /* USER CODE END OnTxData_1 */
-  if ((params != NULL) && (params->IsMcpsConfirm != 0))
+  if ((params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_GREEN) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-    UTIL_TIMER_Start(&TxLedTimer);
+    /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
+    if (params->IsMcpsConfirm != 0)
+    {
+      BSP_LED_On(LED_GREEN) ;
+      UTIL_TIMER_Start(&TxLedTimer);
+    }
+    AT_event_confirm(params);
   }
-  AT_event_confirm(params);
-
-  /* USER CODE BEGIN OnTxData_2 */
-
-  /* USER CODE END OnTxData_2 */
+  /* USER CODE END OnTxData_1 */
 }
 
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
 {
   /* USER CODE BEGIN OnJoinRequest_1 */
-
-  /* USER CODE END OnJoinRequest_1 */
   if (joinParams != NULL)
   {
     if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
     {
       UTIL_TIMER_Stop(&JoinLedTimer);
-
-#if defined(USE_BSP_DRIVER)
       BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-      SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
 
     }
+    AT_event_join(joinParams);
   }
-  AT_event_join(joinParams);
-
-  /* USER CODE BEGIN OnJoinRequest_2 */
-
-  /* USER CODE END OnJoinRequest_2 */
+  /* USER CODE END OnJoinRequest_1 */
 }
 
 static void CmdProcessNotify(void)
@@ -379,9 +317,6 @@ static void OnMacProcessNotify(void)
   /* USER CODE BEGIN OnMacProcessNotify_1 */
 
   /* USER CODE END OnMacProcessNotify_1 */
-  /* USER CODE BEGIN OnMacProcessNotify_2 */
-
-  /* USER CODE END OnMacProcessNotify_2 */
 }
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.h
index 9a3997ad..55f3793e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_APP_H__
@@ -77,8 +79,6 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void LoRaWAN_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app_version.h
index b11647cf..a25c35b9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.c
index 99d4b69c..193fb5cd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_at.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -82,47 +84,81 @@ static UTIL_TIMER_Object_t TxCertifTimer;
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief  Get 4 bytes values in hexa
-  * @param  The string containing the 16 bytes, something like ab:cd:01:21
-  * @param  The buffer that will contain the bytes read
+  * @brief  Get 4 bytes values in hex
+  * @param  from string containing the 16 bytes, something like ab:cd:01:21
+  * @param  value buffer that will contain the bytes read
   * @retval The number of bytes read
   */
 static int32_t sscanf_uint32_as_hhx(const char *from, uint32_t *value);
 
+/**
+  * @brief  Get 16 bytes values in hex
+  * @param  from string containing the 16 bytes, something like ab:cd:01:...
+  * @param  pt buffer that will contain the bytes read
+  * @retval The number of bytes read
+  */
+static int sscanf_16_hhx(const char *from, uint8_t *pt);
+
 /**
   * @brief  Print 4 bytes as %02x
-  * @param  the value containing the 4 bytes to print
-  * @retval None
+  * @param  value containing the 4 bytes to print
   */
 static void print_uint32_as_02x(uint32_t value);
 
 /**
-  * @brief  Print 8 bytes as %02x
-  * @param  the pointer containing the 8 bytes to print
-  * @retval None
+  * @brief  Print 16 bytes as %02X
+  * @param  pt pointer containing the 16 bytes to print
+  */
+static void print_16_02x(uint8_t *pt);
+
+/**
+  * @brief  Print 8 bytes as %02X
+  * @param  pt pointer containing the 8 bytes to print
   */
 static void print_8_02x(uint8_t *pt);
 
 /**
   * @brief  Print an int
-  * @param  the value to print
-  * @retval None
+  * @param  value to print
   */
 static void print_d(int32_t value);
 
 /**
   * @brief  Print an unsigned int
-  * @param  the value to print
-  * @retval None
+  * @param  value to print
   */
 static void print_u(uint32_t value);
 
+/**
+  * @brief  Certif Rejoin timer callback function
+  * @param  context ptr of Certif Rejoin context
+  */
 static void OnCertifTimer(void *context);
 
+/**
+  * @brief  Certif send function
+  */
 static void CertifSend(void);
 
+/**
+  * @brief  Check if character in parameter is alphanumeric
+  * @param  Char for the alphanumeric check
+  */
 static int32_t isHex(char Char);
 
+/**
+  * @brief  Converts hex string to a nibble ( 0x0X )
+  * @param  Char hex string
+  * @retval the nibble. Returns 0xF0 in case input was not an hex string (a..f; A..F or 0..9)
+  */
+static uint8_t Char2Nibble(char Char);
+
+/**
+  * @brief  Convert a string into a buffer of data
+  * @param  str string to convert
+  * @param  data output buffer
+  * @param  Size of input string
+  */
 static int32_t stringToData(const char *str, uint8_t *data, uint32_t Size);
 
 /* USER CODE BEGIN PFP */
@@ -130,6 +166,17 @@ static int32_t stringToData(const char *str, uint8_t *data, uint32_t Size);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
+ATEerror_t AT_return_ok(const char *param)
+{
+  return AT_OK;
+}
+
+ATEerror_t AT_return_error(const char *param)
+{
+  return AT_ERROR;
+}
+
+/* --------------- Application events --------------- */
 void AT_event_join(LmHandlerJoinParams_t *params)
 {
   /* USER CODE BEGIN AT_event_join_1 */
@@ -168,19 +215,30 @@ void AT_event_receive(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
       ReceivedDataSize = appData->BufferSize;
     }
 
-    /*aynchronous notification to the host*/
-    AT_PRINTF("+EVT:%d:%02x:", appData->Port, ReceivedDataSize);
+    /*asynchronous notification to the host*/
+    AT_PRINTF("+EVT:%d:%02X:", appData->Port, ReceivedDataSize);
 
     for (uint8_t i = 0; i < ReceivedDataSize; i++)
     {
       AT_PRINTF("%02x", appData->Buffer[i]);
     }
     AT_PRINTF("\r\n");
-    if (params != NULL)
+  }
+
+  if (params != NULL)
+  {
+    if (params->LinkCheck == true)
+    {
+      AT_PRINTF("+EVT:RX_%s, DR %d, RSSI %d, SNR %d, DMODM %d, GWN %d\r\n", slotStrings[params->RxSlot], params->Datarate,
+                params->Rssi, params->Snr, params->DemodMargin, params->NbGateways);
+    }
+    else
     {
-      AT_PRINTF("+EVT:RX_%s, DR %d, RSSI %d, SNR %d\r\n", slotStrings[params->RxSlot], params->Datarate, params->Rssi, params->Snr);
+      AT_PRINTF("+EVT:RX_%s, DR %d, RSSI %d, SNR %d\r\n", slotStrings[params->RxSlot], params->Datarate, params->Rssi,
+                params->Snr);
     }
   }
+
   /* USER CODE BEGIN AT_event_receive_2 */
 
   /* USER CODE END AT_event_receive_2 */
@@ -200,16 +258,7 @@ void AT_event_confirm(LmHandlerTxParams_t *params)
   /* USER CODE END AT_event_confirm_2 */
 }
 
-ATEerror_t AT_return_ok(const char *param)
-{
-  return AT_OK;
-}
-
-ATEerror_t AT_return_error(const char *param)
-{
-  return AT_ERROR;
-}
-
+/* --------------- General commands --------------- */
 ATEerror_t AT_reset(const char *param)
 {
   /* USER CODE BEGIN AT_reset_1 */
@@ -221,98 +270,70 @@ ATEerror_t AT_reset(const char *param)
   /* USER CODE END AT_reset_2 */
 }
 
-ATEerror_t AT_Region_get(const char *param)
+ATEerror_t AT_verbose_get(const char *param)
 {
-  /* USER CODE BEGIN AT_Region_get_1 */
-
-  /* USER CODE END AT_Region_get_1 */
-  const char *regionStrings[] = { "AS923", "AU915", "CN470", "CN779", "EU433", "EU868", "KR920", "IN865", "US915", "RU864" };
-  LoRaMacRegion_t region;
-  if (LmHandlerGetActiveRegion(&region) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return AT_PARAM_ERROR;
-  }
-
-  if (region > LORAMAC_REGION_RU864)
-  {
-    return AT_PARAM_ERROR;
-  }
+  /* USER CODE BEGIN AT_verbose_get_1 */
 
-  AT_PRINTF("%d:%s\r\n", region, regionStrings[region]);
+  /* USER CODE END AT_verbose_get_1 */
+  print_u(UTIL_ADV_TRACE_GetVerboseLevel());
   return AT_OK;
-  /* USER CODE BEGIN AT_Region_get_2 */
+  /* USER CODE BEGIN AT_verbose_get_2 */
 
-  /* USER CODE END AT_Region_get_2 */
+  /* USER CODE END AT_verbose_get_2 */
 }
 
-ATEerror_t AT_Region_set(const char *param)
+ATEerror_t AT_verbose_set(const char *param)
 {
-  /* USER CODE BEGIN AT_Region_set_1 */
+  /* USER CODE BEGIN AT_verbose_set_1 */
 
-  /* USER CODE END AT_Region_set_1 */
-  LoRaMacRegion_t region;
-  if (tiny_sscanf(param, "%hhu", &region) != 1)
+  /* USER CODE END AT_verbose_set_1 */
+  const char *buf = param;
+  int32_t lvl_nb;
+
+  /* read and set the verbose level */
+  if (1 != tiny_sscanf(buf, "%u", &lvl_nb))
   {
+    AT_PRINTF("AT+VL: verbose level is not well set\r\n");
     return AT_PARAM_ERROR;
   }
-  if (region > LORAMAC_REGION_RU864)
+  if ((lvl_nb > VLEVEL_H) || (lvl_nb < VLEVEL_OFF))
   {
+    AT_PRINTF("AT+VL: verbose level out of range => 0(VLEVEL_OFF) to 3(VLEVEL_H)\r\n");
     return AT_PARAM_ERROR;
   }
 
-  if (LmHandlerSetActiveRegion(region) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return AT_PARAM_ERROR;
-  }
+  UTIL_ADV_TRACE_SetVerboseLevel(lvl_nb);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_Region_set_2 */
+  /* USER CODE BEGIN AT_verbose_set_2 */
 
-  /* USER CODE END AT_Region_set_2 */
+  /* USER CODE END AT_verbose_set_2 */
 }
 
-ATEerror_t AT_DevEUI_get(const char *param)
+ATEerror_t AT_LocalTime_get(const char *param)
 {
-  /* USER CODE BEGIN AT_DevEUI_get_1 */
-
-  /* USER CODE END AT_DevEUI_get_1 */
-  uint8_t devEUI[8];
-  if (LmHandlerGetDevEUI(devEUI) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return AT_PARAM_ERROR;
-  }
-
-  print_8_02x(devEUI);
-  return AT_OK;
-  /* USER CODE BEGIN AT_DevEUI_get_2 */
+  /* USER CODE BEGIN AT_LocalTime_get_1 */
 
-  /* USER CODE END AT_DevEUI_get_2 */
-}
+  /* USER CODE END AT_LocalTime_get_1 */
+  struct tm localtime;
+  SysTime_t UnixEpoch = SysTimeGet();
+  UnixEpoch.Seconds -= 18; /*removing leap seconds*/
 
-ATEerror_t AT_DevEUI_set(const char *param)
-{
-  /* USER CODE BEGIN AT_DevEUI_set_1 */
+  UnixEpoch.Seconds += 3600 * 2; /*adding 2 hours*/
 
-  /* USER CODE END AT_DevEUI_set_1 */
-  uint8_t devEui[8];
-  if (tiny_sscanf(param, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-                  &devEui[0], &devEui[1], &devEui[2], &devEui[3],
-                  &devEui[4], &devEui[5], &devEui[6], &devEui[7]) != 8)
-  {
-    return AT_PARAM_ERROR;
-  }
+  SysTimeLocalTime(UnixEpoch.Seconds,  & localtime);
 
-  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetDevEUI(devEui))
-  {
-    return AT_ERROR;
-  }
+  AT_PRINTF("LTIME:%02dh%02dm%02ds on %02d/%02d/%04d\r\n",
+            localtime.tm_hour, localtime.tm_min, localtime.tm_sec,
+            localtime.tm_mday, localtime.tm_mon + 1, localtime.tm_year + 1900);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_DevEUI_set_2 */
+  /* USER CODE BEGIN AT_LocalTime_get_2 */
 
-  /* USER CODE END AT_DevEUI_set_2 */
+  /* USER CODE END AT_LocalTime_get_2 */
 }
 
+/* --------------- Keys, IDs and EUIs management commands --------------- */
 ATEerror_t AT_JoinEUI_get(const char *param)
 {
   /* USER CODE BEGIN AT_JoinEUI_get_1 */
@@ -355,483 +376,630 @@ ATEerror_t AT_JoinEUI_set(const char *param)
   /* USER CODE END AT_JoinEUI_set_2 */
 }
 
-ATEerror_t AT_DevAddr_get(const char *param)
+ATEerror_t AT_NwkKey_get(const char *param)
 {
-  /* USER CODE BEGIN AT_DevAddr_get_1 */
+  /* USER CODE BEGIN AT_NwkKey_get_1 */
 
-  /* USER CODE END AT_DevAddr_get_1 */
-  uint32_t devAddr;
-  if (LmHandlerGetDevAddr(&devAddr) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_NwkKey_get_1 */
+  uint8_t nwkKey[16];
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerGetNwkKey(nwkKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
+  print_16_02x(nwkKey);
 
-  print_uint32_as_02x(devAddr);
   return AT_OK;
-  /* USER CODE BEGIN AT_DevAddr_get_2 */
+  /* USER CODE BEGIN AT_NwkKey_get_2 */
 
-  /* USER CODE END AT_DevAddr_get_2 */
+  /* USER CODE END AT_NwkKey_get_2 */
 }
 
-ATEerror_t AT_DevAddr_set(const char *param)
+ATEerror_t AT_NwkKey_set(const char *param)
 {
-  /* USER CODE BEGIN AT_DevAddr_set_1 */
+  /* USER CODE BEGIN AT_NwkKey_set_1 */
 
-  /* USER CODE END AT_DevAddr_set_1 */
-  uint32_t devAddr;
-  if (sscanf_uint32_as_hhx(param, &devAddr) != 4)
+  /* USER CODE END AT_NwkKey_set_1 */
+  uint8_t nwkKey[16];
+  if (sscanf_16_hhx(param, nwkKey) != 16)
   {
     return AT_PARAM_ERROR;
   }
 
-  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetDevAddr(devAddr))
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetNwkKey(nwkKey))
   {
     return AT_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_DevAddr_set_2 */
+  /* USER CODE BEGIN AT_NwkKey_set_2 */
 
-  /* USER CODE END AT_DevAddr_set_2 */
+  /* USER CODE END AT_NwkKey_set_2 */
 }
 
-ATEerror_t AT_ADR_get(const char *param)
+ATEerror_t AT_AppKey_get(const char *param)
 {
-  /* USER CODE BEGIN AT_ADR_get_1 */
+  /* USER CODE BEGIN AT_AppKey_get_1 */
 
-  /* USER CODE END AT_ADR_get_1 */
-  bool adrEnable;
-  if (LmHandlerGetAdrEnable(&adrEnable) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_AppKey_get_1 */
+  uint8_t appKey[16];
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerGetAppKey(appKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
+  print_16_02x(appKey);
 
-  print_d(adrEnable);
   return AT_OK;
-  /* USER CODE BEGIN AT_ADR_get_2 */
+  /* USER CODE BEGIN AT_AppKey_get_2 */
 
-  /* USER CODE END AT_ADR_get_2 */
+  /* USER CODE END AT_AppKey_get_2 */
 }
 
-ATEerror_t AT_ADR_set(const char *param)
+ATEerror_t AT_AppKey_set(const char *param)
 {
-  /* USER CODE BEGIN AT_ADR_set_1 */
+  /* USER CODE BEGIN AT_AppKey_set_1 */
 
-  /* USER CODE END AT_ADR_set_1 */
-  switch (param[0])
+  /* USER CODE END AT_AppKey_set_1 */
+  uint8_t appKey[16];
+  if (sscanf_16_hhx(param, appKey) != 16)
   {
-    case '0':
-    case '1':
-      LmHandlerSetAdrEnable(param[0] - '0');
-      break;
-    default:
-      return AT_PARAM_ERROR;
+    return AT_PARAM_ERROR;
+  }
+
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetAppKey(appKey))
+  {
+    return AT_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_ADR_set_2 */
+  /* USER CODE BEGIN AT_AppKey_set_2 */
 
-  /* USER CODE END AT_ADR_set_2 */
+  /* USER CODE END AT_AppKey_set_2 */
 }
 
-ATEerror_t AT_TransmitPower_get(const char *param)
+ATEerror_t AT_NwkSKey_get(const char *param)
 {
-  /* USER CODE BEGIN AT_TransmitPower_get_1 */
+  /* USER CODE BEGIN AT_NwkSKey_get_1 */
 
-  /* USER CODE END AT_TransmitPower_get_1 */
-  int8_t txPower;
-  if (LmHandlerGetTxPower(&txPower) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_NwkSKey_get_1 */
+  uint8_t nwkSKey[16];
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerGetNwkSKey(nwkSKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
+  print_16_02x(nwkSKey);
 
-  print_d(txPower);
   return AT_OK;
-  /* USER CODE BEGIN AT_TransmitPower_get_2 */
+  /* USER CODE BEGIN AT_NwkSKey_get_2 */
 
-  /* USER CODE END AT_TransmitPower_get_2 */
+  /* USER CODE END AT_NwkSKey_get_2 */
 }
 
-ATEerror_t AT_TransmitPower_set(const char *param)
+ATEerror_t AT_NwkSKey_set(const char *param)
 {
-  /* USER CODE BEGIN AT_TransmitPower_set_1 */
+  /* USER CODE BEGIN AT_NwkSKey_set_1 */
 
-  /* USER CODE END AT_TransmitPower_set_1 */
-  int8_t txPower;
-  if (tiny_sscanf(param, "%hhu", &txPower) != 1)
+  /* USER CODE END AT_NwkSKey_set_1 */
+  uint8_t nwkSKey[16];
+  if (sscanf_16_hhx(param, nwkSKey) != 16)
   {
     return AT_PARAM_ERROR;
   }
 
-  if (LmHandlerSetTxPower(txPower) != LORAMAC_HANDLER_SUCCESS)
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetNwkSKey(nwkSKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_TransmitPower_set_2 */
+  /* USER CODE BEGIN AT_NwkSKey_set_2 */
 
-  /* USER CODE END AT_TransmitPower_set_2 */
+  /* USER CODE END AT_NwkSKey_set_2 */
 }
 
-ATEerror_t AT_DataRate_get(const char *param)
+ATEerror_t AT_AppSKey_get(const char *param)
 {
-  /* USER CODE BEGIN AT_DataRate_get_1 */
+  /* USER CODE BEGIN AT_AppSKey_get_1 */
 
-  /* USER CODE END AT_DataRate_get_1 */
-  int8_t txDatarate;
-  if (LmHandlerGetTxDatarate(&txDatarate) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_AppSKey_get_1 */
+  uint8_t appSKey[16];
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerGetAppSKey(appSKey))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
+  print_16_02x(appSKey);
 
-  print_d(txDatarate);
   return AT_OK;
-  /* USER CODE BEGIN AT_DataRate_get_2 */
+  /* USER CODE BEGIN AT_AppSKey_get_2 */
 
-  /* USER CODE END AT_DataRate_get_2 */
+  /* USER CODE END AT_AppSKey_get_2 */
 }
 
-ATEerror_t AT_DataRate_set(const char *param)
+ATEerror_t AT_AppSKey_set(const char *param)
 {
-  /* USER CODE BEGIN AT_DataRate_set_1 */
-
-  /* USER CODE END AT_DataRate_set_1 */
-  int8_t datarate;
+  /* USER CODE BEGIN AT_AppSKey_set_1 */
 
-  if (tiny_sscanf(param, "%hhu", &datarate) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  if ((datarate < 0) || (datarate > 15))
+  /* USER CODE END AT_AppSKey_set_1 */
+  uint8_t appSKey[16];
+  if (sscanf_16_hhx(param, appSKey) != 16)
   {
     return AT_PARAM_ERROR;
   }
 
-  if (LmHandlerSetTxDatarate(datarate) != LORAMAC_HANDLER_SUCCESS)
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetAppSKey(appSKey))
   {
     return AT_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_DataRate_set_2 */
+  /* USER CODE BEGIN AT_AppSKey_set_2 */
 
-  /* USER CODE END AT_DataRate_set_2 */
+  /* USER CODE END AT_AppSKey_set_2 */
 }
 
-ATEerror_t AT_DutyCycle_get(const char *param)
+ATEerror_t AT_DevAddr_get(const char *param)
 {
-  /* USER CODE BEGIN AT_DutyCycle_get_1 */
+  /* USER CODE BEGIN AT_DevAddr_get_1 */
 
-  /* USER CODE END AT_DutyCycle_get_1 */
-  bool dutyCycleEnable;
-  if (LmHandlerGetDutyCycleEnable(&dutyCycleEnable) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DevAddr_get_1 */
+  uint32_t devAddr;
+  if (LmHandlerGetDevAddr(&devAddr) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_d(dutyCycleEnable);
+  print_uint32_as_02x(devAddr);
   return AT_OK;
-  /* USER CODE BEGIN AT_DutyCycle_get_2 */
+  /* USER CODE BEGIN AT_DevAddr_get_2 */
 
-  /* USER CODE END AT_DutyCycle_get_2 */
+  /* USER CODE END AT_DevAddr_get_2 */
 }
 
-ATEerror_t AT_DutyCycle_set(const char *param)
+ATEerror_t AT_DevAddr_set(const char *param)
 {
-  /* USER CODE BEGIN AT_DutyCycle_set_1 */
+  /* USER CODE BEGIN AT_DevAddr_set_1 */
 
-  /* USER CODE END AT_DutyCycle_set_1 */
-  switch (param[0])
+  /* USER CODE END AT_DevAddr_set_1 */
+  uint32_t devAddr;
+  if (sscanf_uint32_as_hhx(param, &devAddr) != 4)
   {
-    case '0':
-    case '1':
-      LmHandlerSetDutyCycleEnable(param[0] - '0');
-      break;
-    default:
-      return AT_PARAM_ERROR;
+    return AT_PARAM_ERROR;
   }
 
-  return AT_OK;
-  /* USER CODE BEGIN AT_DutyCycle_set_2 */
-
-  /* USER CODE END AT_DutyCycle_set_2 */
-}
-
-ATEerror_t AT_Rx2Frequency_get(const char *param)
-{
-  /* USER CODE BEGIN AT_Rx2Frequency_get_1 */
-
-  /* USER CODE END AT_Rx2Frequency_get_1 */
-  RxChannelParams_t rx2Params;
-  LmHandlerGetRX2Params(&rx2Params);
-  print_d(rx2Params.Frequency);
-  return AT_OK;
-  /* USER CODE BEGIN AT_Rx2Frequency_get_2 */
-
-  /* USER CODE END AT_Rx2Frequency_get_2 */
-}
-
-ATEerror_t AT_Rx2DataRate_get(const char *param)
-{
-  /* USER CODE BEGIN AT_Rx2DataRate_get_1 */
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetDevAddr(devAddr))
+  {
+    return AT_ERROR;
+  }
 
-  /* USER CODE END AT_Rx2DataRate_get_1 */
-  RxChannelParams_t rx2Params;
-  LmHandlerGetRX2Params(&rx2Params);
-  print_d(rx2Params.Datarate);
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx2DataRate_get_2 */
+  /* USER CODE BEGIN AT_DevAddr_set_2 */
 
-  /* USER CODE END AT_Rx2DataRate_get_2 */
+  /* USER CODE END AT_DevAddr_set_2 */
 }
 
-ATEerror_t AT_Rx1Delay_get(const char *param)
+ATEerror_t AT_DevEUI_get(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx1Delay_get_1 */
+  /* USER CODE BEGIN AT_DevEUI_get_1 */
 
-  /* USER CODE END AT_Rx1Delay_get_1 */
-  uint32_t rxDelay;
-  if (LmHandlerGetRx1Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DevEUI_get_1 */
+  uint8_t devEUI[8];
+  if (LmHandlerGetDevEUI(devEUI) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_u(rxDelay);
+  print_8_02x(devEUI);
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx1Delay_get_2 */
+  /* USER CODE BEGIN AT_DevEUI_get_2 */
 
-  /* USER CODE END AT_Rx1Delay_get_2 */
+  /* USER CODE END AT_DevEUI_get_2 */
 }
 
-ATEerror_t AT_Rx2Delay_get(const char *param)
+ATEerror_t AT_DevEUI_set(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx2Delay_get_1 */
+  /* USER CODE BEGIN AT_DevEUI_set_1 */
 
-  /* USER CODE END AT_Rx2Delay_get_1 */
-  uint32_t rxDelay;
-  if (LmHandlerGetRx2Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DevEUI_set_1 */
+  uint8_t devEui[8];
+  if (tiny_sscanf(param, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+                  &devEui[0], &devEui[1], &devEui[2], &devEui[3],
+                  &devEui[4], &devEui[5], &devEui[6], &devEui[7]) != 8)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_u(rxDelay);
-  return AT_OK;
-  /* USER CODE BEGIN AT_Rx2Delay_get_2 */
-
-  /* USER CODE END AT_Rx2Delay_get_2 */
-}
-
-ATEerror_t AT_JoinAcceptDelay1_get(const char *param)
-{
-  /* USER CODE BEGIN AT_JoinAcceptDelay1_get_1 */
-
-  /* USER CODE END AT_JoinAcceptDelay1_get_1 */
-  uint32_t rxDelay;
-  if (LmHandlerGetJoinRx1Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  if (LORAMAC_HANDLER_SUCCESS != LmHandlerSetDevEUI(devEui))
   {
-    return AT_PARAM_ERROR;
+    return AT_ERROR;
   }
 
-  print_u(rxDelay);
   return AT_OK;
-  /* USER CODE BEGIN AT_JoinAcceptDelay1_get_2 */
+  /* USER CODE BEGIN AT_DevEUI_set_2 */
 
-  /* USER CODE END AT_JoinAcceptDelay1_get_2 */
+  /* USER CODE END AT_DevEUI_set_2 */
 }
 
-ATEerror_t AT_JoinAcceptDelay2_get(const char *param)
+ATEerror_t AT_NetworkID_get(const char *param)
 {
-  /* USER CODE BEGIN AT_JoinAcceptDelay2_get_1 */
+  /* USER CODE BEGIN AT_NetworkID_get_1 */
 
-  /* USER CODE END AT_JoinAcceptDelay2_get_1 */
-  uint32_t rxDelay;
-  if (LmHandlerGetJoinRx2Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_NetworkID_get_1 */
+  uint32_t networkId;
+  if (LmHandlerGetNetworkID(&networkId) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_u(rxDelay);
+  print_d(networkId);
   return AT_OK;
-  /* USER CODE BEGIN AT_JoinAcceptDelay2_get_2 */
+  /* USER CODE BEGIN AT_NetworkID_get_2 */
 
-  /* USER CODE END AT_JoinAcceptDelay2_get_2 */
+  /* USER CODE END AT_NetworkID_get_2 */
 }
 
-ATEerror_t AT_Rx2Frequency_set(const char *param)
+ATEerror_t AT_NetworkID_set(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx2Frequency_set_1 */
-
-  /* USER CODE END AT_Rx2Frequency_set_1 */
-  RxChannelParams_t rx2Params;
-
-  /* Get the current configuration of RX2 */
-  LmHandlerGetRX2Params(&rx2Params);
+  /* USER CODE BEGIN AT_NetworkID_set_1 */
 
-  /* Update the frequency with scanf */
-  if (tiny_sscanf(param, "%lu", &(rx2Params.Frequency)) != 1)
+  /* USER CODE END AT_NetworkID_set_1 */
+  uint32_t networkId;
+  if (tiny_sscanf(param, "%u", &networkId) != 1)
   {
     return AT_PARAM_ERROR;
   }
-  else if (LmHandlerSetRX2Params(&rx2Params) != LORAMAC_HANDLER_SUCCESS)
+
+  if (networkId > 127)
   {
     return AT_PARAM_ERROR;
   }
 
+  LmHandlerSetNetworkID(networkId);
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx2Frequency_set_2 */
+  /* USER CODE BEGIN AT_NetworkID_set_2 */
 
-  /* USER CODE END AT_Rx2Frequency_set_2 */
+  /* USER CODE END AT_NetworkID_set_2 */
 }
 
-ATEerror_t AT_Rx2DataRate_set(const char *param)
+/* --------------- LoRaWAN join and send data commands --------------- */
+ATEerror_t AT_Join(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx2DataRate_set_1 */
-
-  /* USER CODE END AT_Rx2DataRate_set_1 */
-  RxChannelParams_t rx2Params;
-
-  /* Get the current configuration of RX2 */
-  LmHandlerGetRX2Params(&rx2Params);
+  /* USER CODE BEGIN AT_Join_1 */
 
-  /* Update the Datarate with scanf */
-  if (tiny_sscanf(param, "%hhu", &(rx2Params.Datarate)) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (rx2Params.Datarate > 15)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (LmHandlerSetRX2Params(&rx2Params) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_Join_1 */
+  switch (param[0])
   {
-    return AT_PARAM_ERROR;
+    case '0':
+      LmHandlerJoin(ACTIVATION_TYPE_ABP);
+      break;
+    case '1':
+      LmHandlerJoin(ACTIVATION_TYPE_OTAA);
+      break;
+    default:
+      return AT_PARAM_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx2DataRate_set_2 */
+  /* USER CODE BEGIN AT_Join_2 */
 
-  /* USER CODE END AT_Rx2DataRate_set_2 */
+  /* USER CODE END AT_Join_2 */
 }
 
-ATEerror_t AT_Rx1Delay_set(const char *param)
+ATEerror_t AT_Link_Check(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx1Delay_set_1 */
+  /* USER CODE BEGIN AT_Link_Check_1 */
 
-  /* USER CODE END AT_Rx1Delay_set_1 */
-  uint32_t rxDelay;
-  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (LmHandlerSetRx1Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_Link_Check_1 */
+  if (LmHandlerLinkCheckReq() != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_Rx1Delay_set_2 */
+  /* USER CODE BEGIN AT_Link_Check_2 */
 
-  /* USER CODE END AT_Rx1Delay_set_2 */
+  /* USER CODE END AT_Link_Check_2 */
 }
 
-ATEerror_t AT_Rx2Delay_set(const char *param)
+ATEerror_t AT_Send(const char *param)
 {
-  /* USER CODE BEGIN AT_Rx2Delay_set_1 */
+  /* USER CODE BEGIN AT_Send_1 */
 
-  /* USER CODE END AT_Rx2Delay_set_1 */
-  uint32_t rxDelay;
-  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (LmHandlerSetRx2Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_Send_1 */
+  const char *buf = param;
+  uint16_t bufSize = strlen(param);
+  uint32_t appPort;
+  LmHandlerMsgTypes_t isTxConfirmed;
+  unsigned size = 0;
+  char hex[3] = {0, 0, 0};
+  UTIL_TIMER_Time_t nextTxIn = 0;
+  LmHandlerErrorStatus_t lmhStatus = LORAMAC_HANDLER_ERROR;
+  ATEerror_t status = AT_ERROR;
+
+  /* read and set the application port */
+  if (1 != tiny_sscanf(buf, "%u:", &appPort))
   {
+    AT_PRINTF("AT+SEND without the application port\r\n");
     return AT_PARAM_ERROR;
   }
 
-  return AT_OK;
-  /* USER CODE BEGIN AT_Rx2Delay_set_2 */
-
-  /* USER CODE END AT_Rx2Delay_set_2 */
-}
-
-ATEerror_t AT_JoinAcceptDelay1_set(const char *param)
-{
-  /* USER CODE BEGIN AT_JoinAcceptDelay1_set_1 */
+  /* skip the application port */
+  while (('0' <= buf[0]) && (buf[0] <= '9') && bufSize > 1)
+  {
+    buf ++;
+    bufSize --;
+  };
 
-  /* USER CODE END AT_JoinAcceptDelay1_set_1 */
-  uint32_t rxDelay;
-  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
+  if ((bufSize == 0) || (':' != buf[0]))
   {
+    AT_PRINTF("AT+SEND missing : character after app port\r\n");
     return AT_PARAM_ERROR;
   }
-  else if (LmHandlerSetJoinRx1Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  else
   {
-    return AT_PARAM_ERROR;
+    /* skip the char ':' */
+    buf ++;
+    bufSize --;
   }
 
-  return AT_OK;
-  /* USER CODE BEGIN AT_JoinAcceptDelay1_set_2 */
-
-  /* USER CODE END AT_JoinAcceptDelay1_set_2 */
-}
-
-ATEerror_t AT_JoinAcceptDelay2_set(const char *param)
-{
-  /* USER CODE BEGIN AT_JoinAcceptDelay2_set_1 */
+  switch (buf[0])
+  {
+    case '0':
+      isTxConfirmed = LORAMAC_HANDLER_UNCONFIRMED_MSG;
+      break;
+    case '1':
+      isTxConfirmed = LORAMAC_HANDLER_CONFIRMED_MSG;
+      break;
+    default:
+      AT_PRINTF("AT+SEND without the acknowledge flag\r\n");
+      return AT_PARAM_ERROR;
+  }
 
-  /* USER CODE END AT_JoinAcceptDelay2_set_1 */
-  uint32_t rxDelay;
-  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
+  if (bufSize > 0)
   {
-    return AT_PARAM_ERROR;
+    /* skip the acknowledge flag */
+    buf ++;
+    bufSize --;
   }
-  else if (LmHandlerSetJoinRx2Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+
+  if ((bufSize == 0) || (':' != buf[0]))
   {
+    AT_PRINTF("AT+SEND missing : character after ack flag\r\n");
     return AT_PARAM_ERROR;
   }
-
+  else
+  {
+    /* skip the char ':' */
+    buf ++;
+    bufSize --;
+  }
+
+  while ((size < LORAWAN_APP_DATA_BUFFER_MAX_SIZE) && (bufSize > 1))
+  {
+    hex[0] = buf[size * 2];
+    hex[1] = buf[size * 2 + 1];
+    if (tiny_sscanf(hex, "%hhx", &AppData.Buffer[size]) != 1)
+    {
+      return AT_PARAM_ERROR;
+    }
+    size++;
+    bufSize -= 2;
+  }
+  if (bufSize != 0)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  AppData.BufferSize = size;
+  AppData.Port = appPort;
+
+  lmhStatus = LmHandlerSend(&AppData, isTxConfirmed, &nextTxIn, false);
+
+  switch (lmhStatus)
+  {
+    case LORAMAC_HANDLER_SUCCESS:
+      status = (nextTxIn > 0) ? AT_DUTYCYCLE_RESTRICTED : AT_OK;
+      break;
+    case LORAMAC_HANDLER_BUSY_ERROR:
+    case LORAMAC_HANDLER_COMPLIANCE_RUNNING:
+      status = (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET) ? AT_NO_NET_JOINED : AT_BUSY_ERROR;
+      break;
+    case LORAMAC_HANDLER_NO_NETWORK_JOINED:
+      status = AT_NO_NET_JOINED;
+      break;
+    case LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED:
+      status = AT_DUTYCYCLE_RESTRICTED;
+      break;
+    case LORAMAC_HANDLER_CRYPTO_ERROR:
+      status = AT_CRYPTO_ERROR;
+      break;
+    case LORAMAC_HANDLER_ERROR:
+    default:
+      status = AT_ERROR;
+      break;
+  }
+
+  return status;
+  /* USER CODE BEGIN AT_Send_2 */
+
+  /* USER CODE END AT_Send_2 */
+}
+
+/* --------------- LoRaWAN network management commands --------------- */
+ATEerror_t AT_version_get(const char *param)
+{
+  /* USER CODE BEGIN AT_version_get_1 */
+
+  /* USER CODE END AT_version_get_1 */
+  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
+  uint32_t lora_cm0plus_app;
+
+  /* Get CM4 LoRa APP version*/
+  AT_PRINTF("M4 APP_VERSION:     V%X.%X.%X\r\n",
+            (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+            (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+            (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get CM0 LoRa APP version*/
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  AT_PRINTF("M0PLUS_APP_VERSION: V%X.%X.%X\r\n",
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW LoraWAN info */
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_LORAWAN_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  AT_PRINTF("MW_LORAWAN_VERSION: V%X.%X.%X\r\n",
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW SubGhz_Phy info */
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  AT_PRINTF("MW_RADIO_VERSION:   V%X.%X.%X\r\n",
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
   return AT_OK;
-  /* USER CODE BEGIN AT_JoinAcceptDelay2_set_2 */
+  /* USER CODE BEGIN AT_version_get_2 */
 
-  /* USER CODE END AT_JoinAcceptDelay2_set_2 */
+  /* USER CODE END AT_version_get_2 */
 }
 
-ATEerror_t AT_NetworkID_get(const char *param)
+ATEerror_t AT_ADR_get(const char *param)
 {
-  /* USER CODE BEGIN AT_NetworkID_get_1 */
+  /* USER CODE BEGIN AT_ADR_get_1 */
 
-  /* USER CODE END AT_NetworkID_get_1 */
-  uint32_t networkId;
-  if (LmHandlerGetNetworkID(&networkId) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_ADR_get_1 */
+  bool adrEnable;
+  if (LmHandlerGetAdrEnable(&adrEnable) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_uint32_as_02x(networkId);
+  print_d(adrEnable);
   return AT_OK;
-  /* USER CODE BEGIN AT_NetworkID_get_2 */
+  /* USER CODE BEGIN AT_ADR_get_2 */
 
-  /* USER CODE END AT_NetworkID_get_2 */
+  /* USER CODE END AT_ADR_get_2 */
 }
 
-ATEerror_t AT_NetworkID_set(const char *param)
+ATEerror_t AT_ADR_set(const char *param)
 {
-  /* USER CODE BEGIN AT_NetworkID_set_1 */
+  /* USER CODE BEGIN AT_ADR_set_1 */
 
-  /* USER CODE END AT_NetworkID_set_1 */
-  uint32_t networkId;
-  if (sscanf_uint32_as_hhx(param, &networkId) != 4)
+  /* USER CODE END AT_ADR_set_1 */
+  switch (param[0])
+  {
+    case '0':
+    case '1':
+      LmHandlerSetAdrEnable(param[0] - '0');
+      break;
+    default:
+      return AT_PARAM_ERROR;
+  }
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_ADR_set_2 */
+
+  /* USER CODE END AT_ADR_set_2 */
+}
+
+ATEerror_t AT_DataRate_get(const char *param)
+{
+  /* USER CODE BEGIN AT_DataRate_get_1 */
+
+  /* USER CODE END AT_DataRate_get_1 */
+  int8_t txDatarate;
+  if (LmHandlerGetTxDatarate(&txDatarate) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  LmHandlerSetNetworkID(networkId);
+  print_d(txDatarate);
   return AT_OK;
-  /* USER CODE BEGIN AT_NetworkID_set_2 */
+  /* USER CODE BEGIN AT_DataRate_get_2 */
 
-  /* USER CODE END AT_NetworkID_set_2 */
+  /* USER CODE END AT_DataRate_get_2 */
+}
+
+ATEerror_t AT_DataRate_set(const char *param)
+{
+  /* USER CODE BEGIN AT_DataRate_set_1 */
+
+  /* USER CODE END AT_DataRate_set_1 */
+  int8_t datarate;
+
+  if (tiny_sscanf(param, "%hhu", &datarate) != 1)
+  {
+    return AT_PARAM_ERROR;
+  }
+  if ((datarate < 0) || (datarate > 15))
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (LmHandlerSetTxDatarate(datarate) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_ERROR;
+  }
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_DataRate_set_2 */
+
+  /* USER CODE END AT_DataRate_set_2 */
+}
+
+ATEerror_t AT_Region_get(const char *param)
+{
+  /* USER CODE BEGIN AT_Region_get_1 */
+
+  /* USER CODE END AT_Region_get_1 */
+  const char *regionStrings[] = { "AS923", "AU915", "CN470", "CN779", "EU433", "EU868", "KR920", "IN865", "US915", "RU864" };
+  LoRaMacRegion_t region;
+  if (LmHandlerGetActiveRegion(&region) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (region > LORAMAC_REGION_RU864)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  AT_PRINTF("%d:%s\r\n", region, regionStrings[region]);
+  return AT_OK;
+  /* USER CODE BEGIN AT_Region_get_2 */
+
+  /* USER CODE END AT_Region_get_2 */
+}
+
+ATEerror_t AT_Region_set(const char *param)
+{
+  /* USER CODE BEGIN AT_Region_set_1 */
+
+  /* USER CODE END AT_Region_set_1 */
+  LoRaMacRegion_t region;
+  if (tiny_sscanf(param, "%hhu", &region) != 1)
+  {
+    return AT_PARAM_ERROR;
+  }
+  if (region > LORAMAC_REGION_RU864)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (LmHandlerSetActiveRegion(region) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_Region_set_2 */
+
+  /* USER CODE END AT_Region_set_2 */
 }
 
 ATEerror_t AT_DeviceClass_get(const char *param)
@@ -943,534 +1111,405 @@ ATEerror_t AT_DeviceClass_set(const char *param)
   /* USER CODE END AT_DeviceClass_set_2 */
 }
 
-ATEerror_t AT_PingSlot_get(const char *param)
+ATEerror_t AT_DutyCycle_get(const char *param)
 {
-  /* USER CODE BEGIN AT_PingSlot_get_1 */
-
-  /* USER CODE END AT_PingSlot_get_1 */
-  uint8_t periodicity;
+  /* USER CODE BEGIN AT_DutyCycle_get_1 */
 
-  if (LmHandlerGetPingPeriodicity(&periodicity) != LORAMAC_HANDLER_SUCCESS)
+  /* USER CODE END AT_DutyCycle_get_1 */
+  bool dutyCycleEnable;
+  if (LmHandlerGetDutyCycleEnable(&dutyCycleEnable) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  print_d(periodicity);
+  print_d(dutyCycleEnable);
   return AT_OK;
-  /* USER CODE BEGIN AT_PingSlot_get_2 */
+  /* USER CODE BEGIN AT_DutyCycle_get_2 */
 
-  /* USER CODE END AT_PingSlot_get_2 */
+  /* USER CODE END AT_DutyCycle_get_2 */
 }
 
-ATEerror_t AT_PingSlot_set(const char *param)
+ATEerror_t AT_DutyCycle_set(const char *param)
 {
-  /* USER CODE BEGIN AT_PingSlot_set_1 */
-
-  /* USER CODE END AT_PingSlot_set_1 */
-  uint8_t periodicity;
+  /* USER CODE BEGIN AT_DutyCycle_set_1 */
 
-  if (tiny_sscanf(param, "%hhu", &periodicity) != 1)
-  {
-    return AT_PARAM_ERROR;
-  }
-  else if (periodicity > 7)
+  /* USER CODE END AT_DutyCycle_set_1 */
+  switch (param[0])
   {
-    return AT_PARAM_ERROR;
-  }
-  else if (LmHandlerSetPingPeriodicity(periodicity) != LORAMAC_HANDLER_SUCCESS)
-  {
-    return AT_PARAM_ERROR;
+    case '0':
+    case '1':
+      LmHandlerSetDutyCycleEnable(param[0] - '0');
+      break;
+    default:
+      return AT_PARAM_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_PingSlot_set_2 */
+  /* USER CODE BEGIN AT_DutyCycle_set_2 */
 
-  /* USER CODE END AT_PingSlot_set_2 */
+  /* USER CODE END AT_DutyCycle_set_2 */
 }
 
-ATEerror_t AT_LocalTime_get(const char *param)
+ATEerror_t AT_JoinAcceptDelay1_get(const char *param)
 {
-  /* USER CODE BEGIN AT_LocalTime_get_1 */
-
-  /* USER CODE END AT_LocalTime_get_1 */
-  struct tm localtime;
-  SysTime_t UnixEpoch = SysTimeGet();
-  UnixEpoch.Seconds -= 18; /*removing leap seconds*/
-
-  UnixEpoch.Seconds += 3600 * 2; /*adding 2 hours*/
-
-  SysTimeLocalTime(UnixEpoch.Seconds,  & localtime);
+  /* USER CODE BEGIN AT_JoinAcceptDelay1_get_1 */
 
-  AT_PRINTF("LTIME:%02dh%02dm%02ds on %02d/%02d/%04d\r\n",
-            localtime.tm_hour, localtime.tm_min, localtime.tm_sec,
-            localtime.tm_mday, localtime.tm_mon + 1, localtime.tm_year + 1900);
+  /* USER CODE END AT_JoinAcceptDelay1_get_1 */
+  uint32_t rxDelay;
+  if (LmHandlerGetJoinRx1Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
 
+  print_u(rxDelay);
   return AT_OK;
-  /* USER CODE BEGIN AT_LocalTime_get_2 */
+  /* USER CODE BEGIN AT_JoinAcceptDelay1_get_2 */
 
-  /* USER CODE END AT_LocalTime_get_2 */
+  /* USER CODE END AT_JoinAcceptDelay1_get_2 */
 }
 
-ATEerror_t AT_Join(const char *param)
+ATEerror_t AT_JoinAcceptDelay1_set(const char *param)
 {
-  /* USER CODE BEGIN AT_Join_1 */
+  /* USER CODE BEGIN AT_JoinAcceptDelay1_set_1 */
 
-  /* USER CODE END AT_Join_1 */
-  switch (param[0])
+  /* USER CODE END AT_JoinAcceptDelay1_set_1 */
+  uint32_t rxDelay;
+  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
   {
-    case '0':
-      LmHandlerJoin(ACTIVATION_TYPE_ABP);
-      break;
-    case '1':
-      LmHandlerJoin(ACTIVATION_TYPE_OTAA);
-      break;
-    default:
-      return AT_PARAM_ERROR;
+    return AT_PARAM_ERROR;
+  }
+  else if (LmHandlerSetJoinRx1Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
   }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_Join_2 */
+  /* USER CODE BEGIN AT_JoinAcceptDelay1_set_2 */
 
-  /* USER CODE END AT_Join_2 */
+  /* USER CODE END AT_JoinAcceptDelay1_set_2 */
 }
 
-ATEerror_t AT_Send(const char *param)
+ATEerror_t AT_JoinAcceptDelay2_get(const char *param)
 {
-  /* USER CODE BEGIN AT_Send_1 */
-
-  /* USER CODE END AT_Send_1 */
-  const char *buf = param;
-  uint16_t bufSize = strlen(param);
-  uint32_t appPort;
-  LmHandlerMsgTypes_t isTxConfirmed;
-  unsigned size = 0;
-  char hex[3] = {0, 0, 0};
-  UTIL_TIMER_Time_t nextTxIn = 0;
-  LmHandlerErrorStatus_t lmhStatus = LORAMAC_HANDLER_ERROR;
-  ATEerror_t status = AT_ERROR;
+  /* USER CODE BEGIN AT_JoinAcceptDelay2_get_1 */
 
-  /* read and set the application port */
-  if (1 != tiny_sscanf(buf, "%u:", &appPort))
+  /* USER CODE END AT_JoinAcceptDelay2_get_1 */
+  uint32_t rxDelay;
+  if (LmHandlerGetJoinRx2Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
   {
-    AT_PRINTF("AT+SEND without the application port\r\n");
     return AT_PARAM_ERROR;
   }
 
-  /* skip the application port */
-  while (('0' <= buf[0]) && (buf[0] <= '9') && bufSize > 1)
-  {
-    buf ++;
-    bufSize --;
-  };
-
-  if ((bufSize == 0) || (':' != buf[0]))
-  {
-    AT_PRINTF("AT+SEND missing : character after app port\r\n");
-    return AT_PARAM_ERROR;
-  }
-  else
-  {
-    /* skip the char ':' */
-    buf ++;
-    bufSize --;
-  }
+  print_u(rxDelay);
+  return AT_OK;
+  /* USER CODE BEGIN AT_JoinAcceptDelay2_get_2 */
 
-  switch (buf[0])
-  {
-    case '0':
-      isTxConfirmed = LORAMAC_HANDLER_UNCONFIRMED_MSG;
-      break;
-    case '1':
-      isTxConfirmed = LORAMAC_HANDLER_CONFIRMED_MSG;
-      break;
-    default:
-      AT_PRINTF("AT+SEND without the acknowledge flag\r\n");
-      return AT_PARAM_ERROR;
-  }
+  /* USER CODE END AT_JoinAcceptDelay2_get_2 */
+}
 
-  if (bufSize > 0)
-  {
-    /* skip the acknowledge flag */
-    buf ++;
-    bufSize --;
-  }
+ATEerror_t AT_JoinAcceptDelay2_set(const char *param)
+{
+  /* USER CODE BEGIN AT_JoinAcceptDelay2_set_1 */
 
-  if ((bufSize == 0) || (':' != buf[0]))
+  /* USER CODE END AT_JoinAcceptDelay2_set_1 */
+  uint32_t rxDelay;
+  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
   {
-    AT_PRINTF("AT+SEND missing : character after ack flag\r\n");
     return AT_PARAM_ERROR;
   }
-  else
-  {
-    /* skip the char ':' */
-    buf ++;
-    bufSize --;
-  }
-
-  while ((size < LORAWAN_APP_DATA_BUFFER_MAX_SIZE) && (bufSize > 1))
-  {
-    hex[0] = buf[size * 2];
-    hex[1] = buf[size * 2 + 1];
-    if (tiny_sscanf(hex, "%hhx", &AppData.Buffer[size]) != 1)
-    {
-      return AT_PARAM_ERROR;
-    }
-    size++;
-    bufSize -= 2;
-  }
-  if (bufSize != 0)
+  else if (LmHandlerSetJoinRx2Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  AppData.BufferSize = size;
-  AppData.Port = appPort;
-
-  lmhStatus = LmHandlerSend(&AppData, isTxConfirmed, &nextTxIn, false);
-
-  switch (lmhStatus)
-  {
-  case LORAMAC_HANDLER_SUCCESS:
-    status = (nextTxIn > 0)?AT_DUTYCYLE_RESTRICTED:AT_OK;
-    break;
-  case LORAMAC_HANDLER_BUSY_ERROR:
-  case LORAMAC_HANDLER_COMPLIANCE_RUNNING:
-    status = (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)?AT_NO_NET_JOINED:AT_BUSY_ERROR;
-    break;
-  case LORAMAC_HANDLER_NO_NETWORK_JOINED:
-    status = AT_NO_NET_JOINED;
-    break;
-  case LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED:
-    status = AT_DUTYCYLE_RESTRICTED;
-    break;
-  case LORAMAC_HANDLER_CRYPTO_ERROR:
-    status = AT_CRYPTO_ERROR;
-    break;
-  case LORAMAC_HANDLER_ERROR:
-  default:
-    status = AT_ERROR;
-    break;
-  }
-
-  return status;
-  /* USER CODE BEGIN AT_Send_2 */
+  return AT_OK;
+  /* USER CODE BEGIN AT_JoinAcceptDelay2_set_2 */
 
-  /* USER CODE END AT_Send_2 */
+  /* USER CODE END AT_JoinAcceptDelay2_set_2 */
 }
 
-ATEerror_t AT_version_get(const char *param)
+ATEerror_t AT_Rx1Delay_get(const char *param)
 {
-  /* USER CODE BEGIN AT_version_get_1 */
-
-  /* USER CODE END AT_version_get_1 */
-  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
-  uint32_t lora_cm0plus_app;
-
-  /* Get CM4 LoRa APP version*/
-  AT_PRINTF("M4 APP_VERSION:     V%X.%X.%X\r\n",
-            (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
-            (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
-            (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
-
-  /* Get CM0 LoRa APP version*/
-  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
-  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
-  AT_PRINTF("M0PLUS_APP_VERSION: V%X.%X.%X\r\n",
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
-
-  /* Get MW LoraWAN info */
-  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_LORAWAN_ID);
-  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
-  AT_PRINTF("MW_LORAWAN_VERSION: V%X.%X.%X\r\n",
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+  /* USER CODE BEGIN AT_Rx1Delay_get_1 */
 
-  /* Get MW SubGhz_Phy info */
-  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
-  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
-  AT_PRINTF("MW_RADIO_VERSION:   V%X.%X.%X\r\n",
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
-            (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+  /* USER CODE END AT_Rx1Delay_get_1 */
+  uint32_t rxDelay;
+  if (LmHandlerGetRx1Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
 
+  print_u(rxDelay);
   return AT_OK;
-  /* USER CODE BEGIN AT_version_get_2 */
+  /* USER CODE BEGIN AT_Rx1Delay_get_2 */
 
-  /* USER CODE END AT_version_get_2 */
+  /* USER CODE END AT_Rx1Delay_get_2 */
 }
 
-ATEerror_t AT_bat_get(const char *param)
+ATEerror_t AT_Rx1Delay_set(const char *param)
 {
-  /* USER CODE BEGIN AT_bat_get_1 */
+  /* USER CODE BEGIN AT_Rx1Delay_set_1 */
 
-  /* USER CODE END AT_bat_get_1 */
-  print_d(SYS_GetBatteryLevel());
+  /* USER CODE END AT_Rx1Delay_set_1 */
+  uint32_t rxDelay;
+  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
+  {
+    return AT_PARAM_ERROR;
+  }
+  else if (LmHandlerSetRx1Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
+  {
+    return AT_PARAM_ERROR;
+  }
 
   return AT_OK;
-  /* USER CODE BEGIN AT_bat_get_2 */
+  /* USER CODE BEGIN AT_Rx1Delay_set_2 */
 
-  /* USER CODE END AT_bat_get_2 */
+  /* USER CODE END AT_Rx1Delay_set_2 */
 }
 
-ATEerror_t AT_test_txTone(const char *param)
+ATEerror_t AT_Rx2Delay_get(const char *param)
 {
-  /* USER CODE BEGIN AT_test_txTone_1 */
+  /* USER CODE BEGIN AT_Rx2Delay_get_1 */
 
-  /* USER CODE END AT_test_txTone_1 */
-  if (0U == TST_TxTone())
-  {
-    return AT_OK;
-  }
-  else
+  /* USER CODE END AT_Rx2Delay_get_1 */
+  uint32_t rxDelay;
+  if (LmHandlerGetRx2Delay(&rxDelay) != LORAMAC_HANDLER_SUCCESS)
   {
-    return AT_BUSY_ERROR;
+    return AT_PARAM_ERROR;
   }
-  /* USER CODE BEGIN AT_test_txTone_2 */
 
-  /* USER CODE END AT_test_txTone_2 */
+  print_u(rxDelay);
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2Delay_get_2 */
+
+  /* USER CODE END AT_Rx2Delay_get_2 */
 }
 
-ATEerror_t AT_test_rxRssi(const char *param)
+ATEerror_t AT_Rx2Delay_set(const char *param)
 {
-  /* USER CODE BEGIN AT_test_rxRssi_1 */
+  /* USER CODE BEGIN AT_Rx2Delay_set_1 */
 
-  /* USER CODE END AT_test_rxRssi_1 */
-  if (0U == TST_RxRssi())
+  /* USER CODE END AT_Rx2Delay_set_1 */
+  uint32_t rxDelay;
+  if (tiny_sscanf(param, "%lu", &rxDelay) != 1)
   {
-    return AT_OK;
+    return AT_PARAM_ERROR;
   }
-  else
+  else if (LmHandlerSetRx2Delay(rxDelay) != LORAMAC_HANDLER_SUCCESS)
   {
-    return AT_BUSY_ERROR;
+    return AT_PARAM_ERROR;
   }
-  /* USER CODE BEGIN AT_test_rxRssi_2 */
 
-  /* USER CODE END AT_test_rxRssi_2 */
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2Delay_set_2 */
+
+  /* USER CODE END AT_Rx2Delay_set_2 */
 }
 
-ATEerror_t AT_test_tx(const char *param)
+ATEerror_t AT_Rx2DataRate_get(const char *param)
 {
-  /* USER CODE BEGIN AT_test_tx_1 */
-
-  /* USER CODE END AT_test_tx_1 */
-  const char *buf = param;
-  uint32_t nb_packet;
-
-  if (1 != tiny_sscanf(buf, "%u", &nb_packet))
-  {
-    AT_PRINTF("AT+TTX: nb packets sent is missing\r\n");
-    return AT_PARAM_ERROR;
-  }
+  /* USER CODE BEGIN AT_Rx2DataRate_get_1 */
 
-  if (0U == TST_TX_Start(nb_packet))
-  {
-    return AT_OK;
-  }
-  else
-  {
-    return AT_BUSY_ERROR;
-  }
-  /* USER CODE BEGIN AT_test_tx_2 */
+  /* USER CODE END AT_Rx2DataRate_get_1 */
+  RxChannelParams_t rx2Params;
+  LmHandlerGetRX2Params(&rx2Params);
+  print_d(rx2Params.Datarate);
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2DataRate_get_2 */
 
-  /* USER CODE END AT_test_tx_2 */
+  /* USER CODE END AT_Rx2DataRate_get_2 */
 }
 
-/**
-  * @brief  Start Tx hopping
-  * @param  String parameter
-  * @retval AT_OK
-  */
-ATEerror_t AT_test_tx_hopping(const char *param)
+ATEerror_t AT_Rx2DataRate_set(const char *param)
 {
-  /* USER CODE BEGIN AT_test_tx_hopping_1 */
+  /* USER CODE BEGIN AT_Rx2DataRate_set_1 */
 
-  /* USER CODE END AT_test_tx_hopping_1 */
-  const char *buf = param;
-  uint32_t freq_start;
-  uint32_t freq_stop;
-  uint32_t delta_f;
-  uint32_t nb_tx;
+  /* USER CODE END AT_Rx2DataRate_set_1 */
+  RxChannelParams_t rx2Params;
 
-  testParameter_t test_param;
-  uint32_t hop_freq;
+  /* Get the current configuration of RX2 */
+  LmHandlerGetRX2Params(&rx2Params);
 
-  if (4 != tiny_sscanf(buf, "%u,%u,%u,%u", &freq_start, &freq_stop, &delta_f, &nb_tx))
+  /* Update the Datarate with scanf */
+  if (tiny_sscanf(param, "%hhu", &(rx2Params.Datarate)) != 1)
   {
     return AT_PARAM_ERROR;
   }
-
-  /*if freq is set in MHz, convert to Hz*/
-  if (freq_start < 1000)
-  {
-    freq_start *= 1000000;
-  }
-  if (freq_stop < 1000)
+  else if (rx2Params.Datarate > 15)
   {
-    freq_stop *= 1000000;
+    return AT_PARAM_ERROR;
   }
-  /**/
-  hop_freq = freq_start;
-
-  for (int i = 0; i < nb_tx; i++)
+  else if (LmHandlerSetRX2Params(&rx2Params) != LORAMAC_HANDLER_SUCCESS)
   {
-    /*get current config*/
-    TST_get_config(&test_param);
-
-    /*increment frequency*/
-    test_param.freq = hop_freq;
-    /*Set new config*/
-    TST_set_config(&test_param);
-
-    APP_TPRINTF("Tx Hop at %dHz. %d of %d\r\n", hop_freq, i, nb_tx);
-
-    if (0U != TST_TX_Start(1))
-    {
-      return AT_BUSY_ERROR;
-    }
+    return AT_PARAM_ERROR;
+  }
 
-    hop_freq += delta_f;
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2DataRate_set_2 */
 
-    if (hop_freq > freq_stop)
-    {
-      hop_freq = freq_start;
-    }
-  }
+  /* USER CODE END AT_Rx2DataRate_set_2 */
+}
+
+ATEerror_t AT_Rx2Frequency_get(const char *param)
+{
+  /* USER CODE BEGIN AT_Rx2Frequency_get_1 */
 
+  /* USER CODE END AT_Rx2Frequency_get_1 */
+  RxChannelParams_t rx2Params;
+  LmHandlerGetRX2Params(&rx2Params);
+  print_d(rx2Params.Frequency);
   return AT_OK;
-  /* USER CODE BEGIN AT_test_tx_hopping_2 */
+  /* USER CODE BEGIN AT_Rx2Frequency_get_2 */
 
-  /* USER CODE END AT_test_tx_hopping_2 */
+  /* USER CODE END AT_Rx2Frequency_get_2 */
 }
 
-ATEerror_t AT_test_rx(const char *param)
+ATEerror_t AT_Rx2Frequency_set(const char *param)
 {
-  /* USER CODE BEGIN AT_test_rx_1 */
+  /* USER CODE BEGIN AT_Rx2Frequency_set_1 */
 
-  /* USER CODE END AT_test_rx_1 */
-  const char *buf = param;
-  uint32_t nb_packet;
+  /* USER CODE END AT_Rx2Frequency_set_1 */
+  RxChannelParams_t rx2Params;
 
-  if (1 != tiny_sscanf(buf, "%u", &nb_packet))
-  {
-    AT_PRINTF("AT+TRX: nb expected packets is missing\r\n");
-    return AT_PARAM_ERROR;
-  }
+  /* Get the current configuration of RX2 */
+  LmHandlerGetRX2Params(&rx2Params);
 
-  if (0U == TST_RX_Start(nb_packet))
+  /* Update the frequency with scanf */
+  if (tiny_sscanf(param, "%lu", &(rx2Params.Frequency)) != 1)
   {
-    return AT_OK;
+    return AT_PARAM_ERROR;
   }
-  else
+  else if (LmHandlerSetRX2Params(&rx2Params) != LORAMAC_HANDLER_SUCCESS)
   {
-    return AT_BUSY_ERROR;
+    return AT_PARAM_ERROR;
   }
-  /* USER CODE BEGIN AT_test_rx_2 */
 
-  /* USER CODE END AT_test_rx_2 */
+  return AT_OK;
+  /* USER CODE BEGIN AT_Rx2Frequency_set_2 */
+
+  /* USER CODE END AT_Rx2Frequency_set_2 */
 }
 
-ATEerror_t AT_write_register(const char *param)
+ATEerror_t AT_TransmitPower_get(const char *param)
 {
-  /* USER CODE BEGIN AT_write_register_1 */
-
-  /* USER CODE END AT_write_register_1 */
-  uint8_t add[2];
-  uint16_t add16;
-  uint8_t data;
+  /* USER CODE BEGIN AT_TransmitPower_get_1 */
 
-  if (strlen(param) != 7)
+  /* USER CODE END AT_TransmitPower_get_1 */
+  int8_t txPower;
+  if (LmHandlerGetTxPower(&txPower) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  if (stringToData(param, add, 2) != 0)
+  print_d(txPower);
+  return AT_OK;
+  /* USER CODE BEGIN AT_TransmitPower_get_2 */
+
+  /* USER CODE END AT_TransmitPower_get_2 */
+}
+
+ATEerror_t AT_TransmitPower_set(const char *param)
+{
+  /* USER CODE BEGIN AT_TransmitPower_set_1 */
+
+  /* USER CODE END AT_TransmitPower_set_1 */
+  int8_t txPower;
+  if (tiny_sscanf(param, "%hhu", &txPower) != 1)
   {
     return AT_PARAM_ERROR;
   }
-  param += 5;
-  if (stringToData(param, &data, 1) != 0)
+
+  if (LmHandlerSetTxPower(txPower) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
-  add16 = (((uint16_t)add[0]) << 8) + (uint16_t)add[1];
-  Radio.Write(add16, data);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_write_register_2 */
+  /* USER CODE BEGIN AT_TransmitPower_set_2 */
 
-  /* USER CODE END AT_write_register_2 */
+  /* USER CODE END AT_TransmitPower_set_2 */
 }
 
-ATEerror_t AT_read_register(const char *param)
+ATEerror_t AT_PingSlot_get(const char *param)
 {
-  /* USER CODE BEGIN AT_read_register_1 */
-
-  /* USER CODE END AT_read_register_1 */
-  uint8_t add[2];
-  uint16_t add16;
-  uint8_t data;
+  /* USER CODE BEGIN AT_PingSlot_get_1 */
 
-  if (strlen(param) != 4)
-  {
-    return AT_PARAM_ERROR;
-  }
+  /* USER CODE END AT_PingSlot_get_1 */
+  uint8_t periodicity;
 
-  if (stringToData(param, add, 2) != 0)
+  if (LmHandlerGetPingPeriodicity(&periodicity) != LORAMAC_HANDLER_SUCCESS)
   {
     return AT_PARAM_ERROR;
   }
 
-  add16 = (((uint16_t)add[0]) << 8) + (uint16_t)add[1];
-  data = Radio.Read(add16);
-  AT_PRINTF("REG 0x%04X=0x%02X", add16, data);
-
+  print_d(periodicity);
   return AT_OK;
-  /* USER CODE BEGIN AT_read_register_2 */
+  /* USER CODE BEGIN AT_PingSlot_get_2 */
 
-  /* USER CODE END AT_read_register_2 */
+  /* USER CODE END AT_PingSlot_get_2 */
 }
 
-ATEerror_t AT_verbose_set(const char *param)
+ATEerror_t AT_PingSlot_set(const char *param)
 {
-  /* USER CODE BEGIN AT_verbose_set_1 */
+  /* USER CODE BEGIN AT_PingSlot_set_1 */
 
-  /* USER CODE END AT_verbose_set_1 */
-  const char *buf = param;
-  int32_t lvl_nb;
+  /* USER CODE END AT_PingSlot_set_1 */
+  uint8_t periodicity;
 
-  /* read and set the verbose level */
-  if (1 != tiny_sscanf(buf, "%u", &lvl_nb))
+  if (tiny_sscanf(param, "%hhu", &periodicity) != 1)
   {
-    AT_PRINTF("AT+VL: verbose level is not well set\r\n");
     return AT_PARAM_ERROR;
   }
-  if ((lvl_nb > VLEVEL_H) || (lvl_nb < VLEVEL_OFF))
+  else if (periodicity > 7)
+  {
+    return AT_PARAM_ERROR;
+  }
+  else if (LmHandlerSetPingPeriodicity(periodicity) != LORAMAC_HANDLER_SUCCESS)
   {
-    AT_PRINTF("AT+VL: verbose level out of range => 0(VLEVEL_OFF) to 3(VLEVEL_H)\r\n");
     return AT_PARAM_ERROR;
   }
-
-  UTIL_ADV_TRACE_SetVerboseLevel(lvl_nb);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_verbose_set_2 */
+  /* USER CODE BEGIN AT_PingSlot_set_2 */
 
-  /* USER CODE END AT_verbose_set_2 */
+  /* USER CODE END AT_PingSlot_set_2 */
 }
 
-ATEerror_t AT_verbose_get(const char *param)
+/* --------------- Radio tests commands --------------- */
+ATEerror_t AT_test_txTone(const char *param)
 {
-  /* USER CODE BEGIN AT_verbose_get_1 */
+  /* USER CODE BEGIN AT_test_txTone_1 */
 
-  /* USER CODE END AT_verbose_get_1 */
-  print_u(UTIL_ADV_TRACE_GetVerboseLevel());
-  return AT_OK;
-  /* USER CODE BEGIN AT_verbose_get_2 */
+  /* USER CODE END AT_test_txTone_1 */
+  if (0U == TST_TxTone())
+  {
+    return AT_OK;
+  }
+  else
+  {
+    return AT_BUSY_ERROR;
+  }
+  /* USER CODE BEGIN AT_test_txTone_2 */
 
-  /* USER CODE END AT_verbose_get_2 */
+  /* USER CODE END AT_test_txTone_2 */
+}
+
+ATEerror_t AT_test_rxRssi(const char *param)
+{
+  /* USER CODE BEGIN AT_test_rxRssi_1 */
+
+  /* USER CODE END AT_test_rxRssi_1 */
+  if (0U == TST_RxRssi())
+  {
+    return AT_OK;
+  }
+  else
+  {
+    return AT_BUSY_ERROR;
+  }
+  /* USER CODE BEGIN AT_test_rxRssi_2 */
+
+  /* USER CODE END AT_test_rxRssi_2 */
 }
 
 ATEerror_t AT_test_get_config(const char *param)
@@ -1489,23 +1528,23 @@ ATEerror_t AT_test_get_config(const char *param)
   if (testParam.modulation == 0)
   {
     /*fsk*/
-    AT_PRINTF("3: Bandwidth= %d kHz\r\n", testParam.bandwidth);
+    AT_PRINTF("3: Bandwidth= %d Hz\r\n", testParam.bandwidth);
     AT_PRINTF("4: FSK datarate= %d bps\r\n", testParam.loraSf_datarate);
     AT_PRINTF("5: Coding Rate not applicable\r\n");
     AT_PRINTF("6: LNA State= %d  \r\n", testParam.lna);
     AT_PRINTF("7: PA Boost State= %d  \r\n", testParam.paBoost);
     AT_PRINTF("8: modulation FSK\r\n");
     AT_PRINTF("9: Payload len= %d Bytes\r\n", testParam.payloadLen);
-    AT_PRINTF("10: FSK deviation= %d \r\n", testParam.fskDev);
+    AT_PRINTF("10: FSK deviation= %d Hz\r\n", testParam.fskDev);
     AT_PRINTF("11: LowDRopt not applicable\r\n");
     AT_PRINTF("12: FSK gaussian BT product= %d \r\n", testParam.BTproduct);
   }
   else if (testParam.modulation == 1)
   {
     /*Lora*/
-    AT_PRINTF("3: Bandwidth= %d Hz\r\n", loraBW[testParam.bandwidth]);
+    AT_PRINTF("3: Bandwidth= %d (=%d Hz)\r\n", testParam.bandwidth, loraBW[testParam.bandwidth]);
     AT_PRINTF("4: SF= %d \r\n", testParam.loraSf_datarate);
-    AT_PRINTF("5: CR= 4/%d \r\n", testParam.codingRate + 4);
+    AT_PRINTF("5: CR= %d (=4/%d) \r\n", testParam.codingRate, testParam.codingRate + 4);
     AT_PRINTF("6: LNA State= %d  \r\n", testParam.lna);
     AT_PRINTF("7: PA Boost State= %d  \r\n", testParam.paBoost);
     AT_PRINTF("8: modulation LORA\r\n");
@@ -1535,20 +1574,20 @@ ATEerror_t AT_test_set_config(const char *param)
   /* USER CODE BEGIN AT_test_set_config_1 */
 
   /* USER CODE END AT_test_set_config_1 */
-  testParameter_t testParam;
-  int32_t power = 14;
-  uint32_t crNum;
+  testParameter_t testParam = {0};
   uint32_t freq;
-  uint32_t loraSf_datarate;
+  int32_t power;
   uint32_t bandwidth;
+  uint32_t loraSf_datarate;
   uint32_t codingRate;
   uint32_t lna;
   uint32_t paBoost;
-  uint32_t modulation = 1; /*Lora default in legacy*/
-  uint32_t payloadLen = 16; /*Lora default in legacy*/
-  uint32_t fskdDeviation = 25000; /*Lora default in legacy*/
-  uint32_t lowDrOpt = 2; /*Lora default in legacy*/
-  uint32_t BTproduct = 3; /*Lora default in legacy*/
+  uint32_t modulation;
+  uint32_t payloadLen;
+  uint32_t fskDeviation;
+  uint32_t lowDrOpt;
+  uint32_t BTproduct;
+  uint32_t crNum;
 
   if (13 == tiny_sscanf(param, "%d:%d:%d:%d:%d/%d:%d:%d:%d:%d:%d:%d:%d",
                         &freq,
@@ -1561,211 +1600,180 @@ ATEerror_t AT_test_set_config(const char *param)
                         &paBoost,
                         &modulation,
                         &payloadLen,
-                        &fskdDeviation,
+                        &fskDeviation,
                         &lowDrOpt,
                         &BTproduct))
   {
     /*extend to new format for extended*/
   }
-  else if (8 == tiny_sscanf(param, "%d:%d:%d:%d:%d/%d:%d:%d",
-                            &freq,
-                            &power,
-                            &bandwidth,
-                            &loraSf_datarate,
-                            &crNum,
-                            &codingRate,
-                            &lna,
-                            &paBoost))
-  {
-    /*legacy*/
-    if (bandwidth == 500)
-    {
-      bandwidth = BW_500kHz;
-    }
-    else if (bandwidth == 250)
-    {
-      bandwidth = BW_250kHz;
-    }
-    else if (bandwidth == 125)
-    {
-      bandwidth = BW_125kHz;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
-  }
   else
   {
     return AT_PARAM_ERROR;
   }
-  /* Power  check and set*/
-  if ((power >= -9) && (power <= 22))
+  /*get current config*/
+  TST_get_config(&testParam);
+
+  /* 8: modulation check and set */
+  /* first check because required for others */
+  if (modulation == 0)
   {
-    testParam.power = power;
+    testParam.modulation = TEST_FSK;
+  }
+  else if (modulation == 1)
+  {
+    testParam.modulation = TEST_LORA;
+  }
+  else if (modulation == 2)
+  {
+    testParam.modulation = TEST_BPSK;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
-  /* payloadLen check and set*/
-  if ((payloadLen != 0) && (payloadLen <= 256))
+
+  /* 1: frequency check and set */
+  if (freq < 1000)
   {
-    testParam.payloadLen = payloadLen;
+    /*given in MHz*/
+    testParam.freq = freq * 1000000;
+  }
+  else
+  {
+    testParam.freq = freq;
+  }
+
+  /* 2: power check and set */
+  if ((power >= -9) && (power <= 22))
+  {
+    testParam.power = power;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
 
-  /*modulation check and set*/
-  if (modulation == 0)
+  /* 3: bandwidth check and set */
+  if ((testParam.modulation == TEST_FSK) && (bandwidth >= 4800) && (bandwidth <= 467000))
   {
-    /*modulation fsk=0 or lora=1*/
-    testParam.modulation = TEST_FSK;
+    testParam.bandwidth = bandwidth;
   }
-  else if (modulation == 1)
+  else if ((testParam.modulation == TEST_LORA) && (bandwidth <= BW_500kHz))
   {
-    /*modulation fsk=0 or lora=1*/
-    testParam.modulation = TEST_LORA;
+    testParam.bandwidth = bandwidth;
   }
-  else if (modulation == 2)
+  else if (testParam.modulation == TEST_BPSK)
   {
-    /*modulation fsk=0 or lora=1*/
-    testParam.modulation = TEST_BPSK;
+    /* Not used */
   }
   else
   {
     return AT_PARAM_ERROR;
   }
 
-  /* frequency check and set*/
-  if (freq < 1000)
+  /* 4: datarate/spreading factor check and set */
+  if ((testParam.modulation == TEST_FSK) && (loraSf_datarate >= 600) && (loraSf_datarate <= 300000))
   {
-    /*given in MHz*/
-    testParam.freq = freq * 1000000;
+    testParam.loraSf_datarate = loraSf_datarate;
+  }
+  else if ((testParam.modulation == TEST_LORA) && (loraSf_datarate >= 5) && (loraSf_datarate <= 12))
+  {
+    testParam.loraSf_datarate = loraSf_datarate;
+  }
+  else if ((testParam.modulation == TEST_BPSK) && (loraSf_datarate <= 1000))
+  {
+    testParam.loraSf_datarate = loraSf_datarate;
   }
   else
   {
-    testParam.freq = freq;
+    return AT_PARAM_ERROR;
   }
 
-  /* bandwidth check and set*/
-  if (testParam.modulation == 0)
+  /* 5: coding rate check and set */
+  if ((testParam.modulation == TEST_FSK) || (testParam.modulation == TEST_BPSK))
   {
-    /*fsk bandwidth check and set*/
-    if ((bandwidth >= 4800) && (bandwidth <= 467000))
-    {
-      testParam.bandwidth = bandwidth;
-    }
-    else
-    {
-
-      return AT_PARAM_ERROR;
-    }
+    /* Not used */
   }
-  else if (testParam.modulation == 1)
+  else if ((testParam.modulation == TEST_LORA) && ((codingRate >= 5) && (codingRate <= 8)))
   {
-    /*Lora modulation check and set*/
-    if (bandwidth <= BW_500kHz)
-    {
-      testParam.bandwidth = bandwidth;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
+    testParam.codingRate = codingRate - 4;
   }
   else
   {
+    return AT_PARAM_ERROR;
   }
 
-  if (lowDrOpt <= 2)
+  /* 6: lna state check and set */
+  if (lna <= 1)
   {
-    testParam.lowDrOpt = lowDrOpt;
+    testParam.lna = lna;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
 
-  if (testParam.modulation == 0)
+  /* 7: pa boost check and set */
+  if (paBoost <= 1)
   {
-    /*fsk modulation check and set*/
-    if ((loraSf_datarate >= 600) && (loraSf_datarate <= 300000))
-    {
-      testParam.loraSf_datarate = loraSf_datarate;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
+    /* Not used */
+    testParam.paBoost = paBoost;
   }
-  else if (testParam.modulation == 1)
+
+  /* 9: payloadLen check and set */
+  if ((payloadLen != 0) && (payloadLen < 256))
   {
-    /*Lora modulation*/
-    /*spreading factor check and set*/
-    if ((loraSf_datarate >= 5) && (loraSf_datarate <= 12))
-    {
-      testParam.loraSf_datarate = loraSf_datarate;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
+    testParam.payloadLen = payloadLen;
   }
-  else if (testParam.modulation == 2)
+  else
   {
-    /*BPSK modulation*/
-    /*spreading factor check and set*/
-    if (loraSf_datarate <= 1000)
-    {
-      testParam.loraSf_datarate = loraSf_datarate;
-    }
-    else
-    {
-      return AT_PARAM_ERROR;
-    }
+    return AT_PARAM_ERROR;
   }
 
-  /* coding rate numerator check and set*/
-  if (crNum != 4)
+  /* 10: fsk Deviation check and set */
+  if ((testParam.modulation == TEST_LORA) || (testParam.modulation == TEST_BPSK))
   {
-    return AT_PARAM_ERROR;
+    /* Not used */
   }
-  /* check coding rate denominator is ok*/
-  if ((codingRate >= 5) && (codingRate <= 8))
+  else if ((testParam.modulation == TEST_FSK) && ((fskDeviation >= 600) && (fskDeviation <= 200000)))
   {
-    testParam.codingRate = codingRate - 4;
+    /*given in MHz*/
+    testParam.fskDev = fskDeviation;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
-  /* fsk BT product check and set*/
-  if (BTproduct <= 4)
+
+  /* 11: low datarate optimization check and set */
+  if ((testParam.modulation == TEST_FSK) || (testParam.modulation == TEST_BPSK))
   {
-    /*given in MHz*/
-    testParam.BTproduct = BTproduct;
+    /* Not used */
+  }
+  else if ((testParam.modulation == TEST_LORA) && (lowDrOpt <= 2))
+  {
+    testParam.lowDrOpt = lowDrOpt;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
-  /* fskdDeviation check and se*/
-  if ((fskdDeviation >= 600) && (fskdDeviation <= 200000))
+
+  /* 12: FSK gaussian BT product check and set */
+  if ((testParam.modulation == TEST_LORA) || (testParam.modulation == TEST_BPSK))
+  {
+    /* Not used */
+  }
+  else if ((testParam.modulation == TEST_FSK) && (BTproduct <= 4))
   {
     /*given in MHz*/
-    testParam.fskDev = fskdDeviation;
+    testParam.BTproduct = BTproduct;
   }
   else
   {
     return AT_PARAM_ERROR;
   }
 
-  testParam.lna = lna;
-  testParam.paBoost = paBoost;
-
   TST_set_config(&testParam);
 
   return AT_OK;
@@ -1774,19 +1782,59 @@ ATEerror_t AT_test_set_config(const char *param)
   /* USER CODE END AT_test_set_config_2 */
 }
 
-ATEerror_t AT_test_stop(const char *param)
+ATEerror_t AT_test_tx(const char *param)
 {
-  /* USER CODE BEGIN AT_test_stop_1 */
+  /* USER CODE BEGIN AT_test_tx_1 */
 
-  /* USER CODE END AT_test_stop_1 */
-  TST_stop();
-  AT_PRINTF("Test Stop\r\n");
-  return AT_OK;
-  /* USER CODE BEGIN AT_test_stop_2 */
+  /* USER CODE END AT_test_tx_1 */
+  const char *buf = param;
+  uint32_t nb_packet;
 
-  /* USER CODE END AT_test_stop_2 */
+  if (1 != tiny_sscanf(buf, "%u", &nb_packet))
+  {
+    AT_PRINTF("AT+TTX: nb packets sent is missing\r\n");
+    return AT_PARAM_ERROR;
+  }
+
+  if (0U == TST_TX_Start(nb_packet))
+  {
+    return AT_OK;
+  }
+  else
+  {
+    return AT_BUSY_ERROR;
+  }
+  /* USER CODE BEGIN AT_test_tx_2 */
+
+  /* USER CODE END AT_test_tx_2 */
 }
 
+ATEerror_t AT_test_rx(const char *param)
+{
+  /* USER CODE BEGIN AT_test_rx_1 */
+
+  /* USER CODE END AT_test_rx_1 */
+  const char *buf = param;
+  uint32_t nb_packet;
+
+  if (1 != tiny_sscanf(buf, "%u", &nb_packet))
+  {
+    AT_PRINTF("AT+TRX: nb expected packets is missing\r\n");
+    return AT_PARAM_ERROR;
+  }
+
+  if (0U == TST_RX_Start(nb_packet))
+  {
+    return AT_OK;
+  }
+  else
+  {
+    return AT_BUSY_ERROR;
+  }
+  /* USER CODE BEGIN AT_test_rx_2 */
+
+  /* USER CODE END AT_test_rx_2 */
+}
 ATEerror_t AT_Certif(const char *param)
 {
   /* USER CODE BEGIN AT_Certif_1 */
@@ -1814,6 +1862,156 @@ ATEerror_t AT_Certif(const char *param)
   /* USER CODE END AT_Certif_2 */
 }
 
+ATEerror_t AT_test_tx_hopping(const char *param)
+{
+  /* USER CODE BEGIN AT_test_tx_hopping_1 */
+
+  /* USER CODE END AT_test_tx_hopping_1 */
+  const char *buf = param;
+  uint32_t freq_start;
+  uint32_t freq_stop;
+  uint32_t delta_f;
+  uint32_t nb_tx;
+
+  testParameter_t test_param;
+  uint32_t hop_freq;
+
+  if (4 != tiny_sscanf(buf, "%u,%u,%u,%u", &freq_start, &freq_stop, &delta_f, &nb_tx))
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  /*if freq is set in MHz, convert to Hz*/
+  if (freq_start < 1000)
+  {
+    freq_start *= 1000000;
+  }
+  if (freq_stop < 1000)
+  {
+    freq_stop *= 1000000;
+  }
+  /**/
+  hop_freq = freq_start;
+
+  for (int i = 0; i < nb_tx; i++)
+  {
+    /*get current config*/
+    TST_get_config(&test_param);
+
+    /*increment frequency*/
+    test_param.freq = hop_freq;
+    /*Set new config*/
+    TST_set_config(&test_param);
+
+    APP_TPRINTF("Tx Hop at %dHz. %d of %d\r\n", hop_freq, i, nb_tx);
+
+    if (0U != TST_TX_Start(1))
+    {
+      return AT_BUSY_ERROR;
+    }
+
+    hop_freq += delta_f;
+
+    if (hop_freq > freq_stop)
+    {
+      hop_freq = freq_start;
+    }
+  }
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_test_tx_hopping_2 */
+
+  /* USER CODE END AT_test_tx_hopping_2 */
+}
+
+ATEerror_t AT_test_stop(const char *param)
+{
+  /* USER CODE BEGIN AT_test_stop_1 */
+
+  /* USER CODE END AT_test_stop_1 */
+  TST_stop();
+  AT_PRINTF("Test Stop\r\n");
+  return AT_OK;
+  /* USER CODE BEGIN AT_test_stop_2 */
+
+  /* USER CODE END AT_test_stop_2 */
+}
+
+ATEerror_t AT_write_register(const char *param)
+{
+  /* USER CODE BEGIN AT_write_register_1 */
+
+  /* USER CODE END AT_write_register_1 */
+  uint8_t add[2];
+  uint16_t add16;
+  uint8_t data;
+
+  if (strlen(param) != 7)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (stringToData(param, add, 2) != 0)
+  {
+    return AT_PARAM_ERROR;
+  }
+  param += 5;
+  if (stringToData(param, &data, 1) != 0)
+  {
+    return AT_PARAM_ERROR;
+  }
+  add16 = (((uint16_t)add[0]) << 8) + (uint16_t)add[1];
+  Radio.Write(add16, data);
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_write_register_2 */
+
+  /* USER CODE END AT_write_register_2 */
+}
+
+ATEerror_t AT_read_register(const char *param)
+{
+  /* USER CODE BEGIN AT_read_register_1 */
+
+  /* USER CODE END AT_read_register_1 */
+  uint8_t add[2];
+  uint16_t add16;
+  uint8_t data;
+
+  if (strlen(param) != 4)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  if (stringToData(param, add, 2) != 0)
+  {
+    return AT_PARAM_ERROR;
+  }
+
+  add16 = (((uint16_t)add[0]) << 8) + (uint16_t)add[1];
+  data = Radio.Read(add16);
+  AT_PRINTF("REG 0x%04X=0x%02X", add16, data);
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_read_register_2 */
+
+  /* USER CODE END AT_read_register_2 */
+}
+
+/* --------------- Information command --------------- */
+ATEerror_t AT_bat_get(const char *param)
+{
+  /* USER CODE BEGIN AT_bat_get_1 */
+
+  /* USER CODE END AT_bat_get_1 */
+  print_d(SYS_GetBatteryLevel());
+
+  return AT_OK;
+  /* USER CODE BEGIN AT_bat_get_2 */
+
+  /* USER CODE END AT_bat_get_2 */
+}
+
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
@@ -1834,12 +2032,26 @@ static int32_t sscanf_uint32_as_hhx(const char *from, uint32_t *value)
   /* USER CODE END sscanf_uint32_as_hhx_2 */
 }
 
+static int sscanf_16_hhx(const char *from, uint8_t *pt)
+{
+  /* USER CODE BEGIN sscanf_16_hhx_1 */
+
+  /* USER CODE END sscanf_16_hhx_1 */
+  return tiny_sscanf(from, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+                     &pt[0], &pt[1], &pt[2], &pt[3], &pt[4], &pt[5], &pt[6],
+                     &pt[7], &pt[8], &pt[9], &pt[10], &pt[11], &pt[12], &pt[13],
+                     &pt[14], &pt[15]);
+  /* USER CODE BEGIN sscanf_16_hhx_2 */
+
+  /* USER CODE END sscanf_16_hhx_2 */
+}
+
 static void print_uint32_as_02x(uint32_t value)
 {
   /* USER CODE BEGIN print_uint32_as_02x_1 */
 
   /* USER CODE END print_uint32_as_02x_1 */
-  AT_PRINTF("%02x:%02x:%02x:%02x\r\n",
+  AT_PRINTF("%02X:%02X:%02X:%02X\r\n",
             (unsigned)((unsigned char *)(&value))[3],
             (unsigned)((unsigned char *)(&value))[2],
             (unsigned)((unsigned char *)(&value))[1],
@@ -1849,12 +2061,27 @@ static void print_uint32_as_02x(uint32_t value)
   /* USER CODE END print_uint32_as_02x_2 */
 }
 
+static void print_16_02x(uint8_t *pt)
+{
+  /* USER CODE BEGIN print_16_02x_1 */
+
+  /* USER CODE END print_16_02x_1 */
+  AT_PRINTF("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n",
+            pt[0], pt[1], pt[2], pt[3],
+            pt[4], pt[5], pt[6], pt[7],
+            pt[8], pt[9], pt[10], pt[11],
+            pt[12], pt[13], pt[14], pt[15]);
+  /* USER CODE BEGIN print_16_02x_2 */
+
+  /* USER CODE END print_16_02x_2 */
+}
+
 static void print_8_02x(uint8_t *pt)
 {
   /* USER CODE BEGIN print_8_02x_1 */
 
   /* USER CODE END print_8_02x_1 */
-  AT_PRINTF("%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\r\n",
+  AT_PRINTF("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n",
             pt[0], pt[1], pt[2], pt[3], pt[4], pt[5], pt[6], pt[7]);
   /* USER CODE BEGIN print_8_02x_2 */
 
@@ -1904,7 +2131,7 @@ static void CertifSend(void)
   AppData.Port = 99;
 
   /* Restart Tx to prevent a previous Join Failed */
-  if(LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
+  if (LmHandlerJoinStatus() != LORAMAC_HANDLER_SET)
   {
     UTIL_TIMER_Start(&TxCertifTimer);
   }
@@ -1947,7 +2174,7 @@ static int32_t stringToData(const char *str, uint8_t *data, uint32_t Size)
     hex[0] = *str++;
     hex[1] = *str++;
 
-    /*check if input is hexa */
+    /*check if input is hex */
     if ((isHex(hex[0]) == -1) || (isHex(hex[1]) == -1))
     {
       return -1;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.h
index 62240a08..caacbafb 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_at.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_AT_H__
@@ -48,7 +50,7 @@ typedef enum eATEerror
   AT_NO_NET_JOINED,
   AT_RX_ERROR,
   AT_NO_CLASS_B_ENABLE,
-  AT_DUTYCYLE_RESTRICTED,
+  AT_DUTYCYCLE_RESTRICTED,
   AT_CRYPTO_ERROR,
   AT_MAX,
 } ATEerror_t;
@@ -77,45 +79,52 @@ typedef enum eATEerror
 /* General commands */
 #define AT_RESET      "Z"
 #define AT_VL         "+VL"
-#define AT_VER        "+VER"
+#define AT_LTIME      "+LTIME"
 
-/* MAC Commands */
-#define AT_BAND       "+BAND"
-#define AT_DEUI       "+DEUI"
-#define AT_DADDR      "+DADDR"
+/* Keys, IDs and EUIs management commands */
 #define AT_JOINEUI    "+APPEUI" /*to match with V1.0.x specification- For V1.1.x "+APPEUI" will be replaced by "+JOINEUI"*/
+#define AT_NWKKEY     "+NWKKEY"
+#define AT_APPKEY     "+APPKEY"
+#define AT_NWKSKEY    "+NWKSKEY"
+#define AT_APPSKEY    "+APPSKEY"
+#define AT_DADDR      "+DADDR"
+#define AT_DEUI       "+DEUI"
+#define AT_NWKID      "+NWKID"
+
+/* LoRaWAN join and send data commands */
+#define AT_JOIN       "+JOIN"
+#define AT_LINKC      "+LINKC"
+#define AT_SEND       "+SEND"
+
+/* LoRaWAN network management commands */
+#define AT_VER        "+VER"
 #define AT_ADR        "+ADR"
 #define AT_DR         "+DR"
-#define AT_TXP        "+TXP"
+#define AT_BAND       "+BAND"
+#define AT_CLASS      "+CLASS"
 #define AT_DCS        "+DCS"
-#define AT_RX2FQ      "+RX2FQ"
-#define AT_RX2DR      "+RX2DR"
-#define AT_RX1DL      "+RX1DL"
-#define AT_RX2DL      "+RX2DL"
 #define AT_JN1DL      "+JN1DL"
 #define AT_JN2DL      "+JN2DL"
-#define AT_NWKID      "+NWKID"
-#define AT_CLASS      "+CLASS"
-#define AT_JOIN       "+JOIN"
-#define AT_SEND       "+SEND"
+#define AT_RX1DL      "+RX1DL"
+#define AT_RX2DL      "+RX2DL"
+#define AT_RX2DR      "+RX2DR"
+#define AT_RX2FQ      "+RX2FQ"
+#define AT_TXP        "+TXP"
 #define AT_PGSLOT     "+PGSLOT"
-#define AT_LTIME      "+LTIME"
-#define AT_REGW       "+REGW"
-#define AT_REGR       "+REGR"
 
-/* Radio Tests Commands */
-#define AT_TRSSI      "+TRSSI"
+/* Radio tests commands */
 #define AT_TTONE      "+TTONE"
-#define AT_TTLRA      "+TTLRA"
-#define AT_TRLRA      "+TRLRA"
+#define AT_TRSSI      "+TRSSI"
+#define AT_TCONF      "+TCONF"
 #define AT_TTX        "+TTX"
 #define AT_TRX        "+TRX"
+#define AT_CERTIF     "+CERTIF"
 #define AT_TTH        "+TTH"
-#define AT_TCONF      "+TCONF"
 #define AT_TOFF       "+TOFF"
-#define AT_CERTIF     "+CERTIF"
+#define AT_REGW       "+REGW"
+#define AT_REGR       "+REGR"
 
-/* Peripherical Commands */
+/* Information command */
 #define AT_BAT        "+BAT"
 
 /* USER CODE BEGIN EM */
@@ -123,10 +132,24 @@ typedef enum eATEerror
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Return AT_OK in all cases
+  * @param  param string of the AT command - unused
+  * @retval AT_OK
+  */
+ATEerror_t AT_return_ok(const char *param);
+
+/**
+  * @brief  Return AT_ERROR in all cases
+  * @param  param string of the AT command - unused
+  * @retval AT_ERROR
+  */
+ATEerror_t AT_return_error(const char *param);
+
+/* --------------- Application events --------------- */
 /**
   * @brief  Event callback on join
   * @param params
-  * @retval None
   */
 void AT_event_join(LmHandlerJoinParams_t *params);
 
@@ -134,402 +157,455 @@ void AT_event_join(LmHandlerJoinParams_t *params);
   * @brief  Event callback on received data
   * @param appData
   * @param params
-  * @retval None
   */
 void AT_event_receive(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
 /**
   * @brief  Event callback on confirmed acknowledge
   * @param  params
-  * @retval None
   */
 void AT_event_confirm(LmHandlerTxParams_t *params);
 
+/* --------------- General commands --------------- */
 /**
-  * @brief  Return AT_OK in all cases
-  * @param  Param string of the AT command - unused
+  * @brief  Trig a reset of the MCU
+  * @param  param string of the AT command - unused
   * @retval AT_OK
   */
-ATEerror_t AT_return_ok(const char *param);
+ATEerror_t AT_reset(const char *param);
 
 /**
-  * @brief  Return AT_ERROR in all cases
-  * @param  Param string of the AT command - unused
-  * @retval AT_ERROR
+  * @brief  Get the verbose level
+  * @param  param String parameter
+  * @retval AT_OK
   */
-ATEerror_t AT_return_error(const char *param);
+ATEerror_t AT_verbose_get(const char *param);
 
 /**
-  * @brief  Trig a reset of the MCU
-  * @param  Param string of the AT command - unused
+  * @brief  Set the verbose level
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_reset(const char *param);
+ATEerror_t AT_verbose_set(const char *param);
 
 /**
-  * @brief  Print actual Active Region
-  * @param  Param string of the AT command - unused
+  * @brief  Get the local time in UTC format
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_Region_get(const char *param);
+ATEerror_t AT_LocalTime_get(const char *param);
 
+/* --------------- Keys, IDs and EUIs management commands --------------- */
 /**
-  * @brief  Set Active Region
-  * @param  Param string of the AT command
-  * @retval AT_OK if OK
+  * @brief  Print Join Eui
+  * @param  param string of the AT command
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Region_set(const char *param);
+ATEerror_t AT_JoinEUI_get(const char *param);
 
 /**
-  * @brief  Print Device EUI
-  * @param  Param string of the AT command - unused
+  * @brief  Set Join Eui
+  * @param  param string of the AT command
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  */
+ATEerror_t AT_JoinEUI_set(const char *param);
+
+/**
+  * @brief  Print Network Key
+  * @param  param string of the AT command
   * @retval AT_OK
   */
-ATEerror_t AT_DevEUI_get(const char *param);
+ATEerror_t AT_NwkKey_get(const char *param);
 
 /**
-  * @brief  Set Device EUI
-  * @param  Param string of the AT command
-  * @retval AT_OK if OK
+  * @brief  Set Network Key
+  * @param  param string of the AT command
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DevEUI_set(const char *param);
+ATEerror_t AT_NwkKey_set(const char *param);
 
 /**
-  * @brief  Print Join Eui
-  * @param  Param string of the AT command
+  * @brief  Print Application Key
+  * @param  param string of the AT command
+  * @retval AT_OK
+  */
+ATEerror_t AT_AppKey_get(const char *param);
+
+/**
+  * @brief  Set Application Key
+  * @param  param string of the AT command
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_JoinEUI_get(const char *param);
+ATEerror_t AT_AppKey_set(const char *param);
 
 /**
-  * @brief  Set Join Eui
-  * @param  Param string of the AT command
+  * @brief  Print Network Session Key
+  * @param  param string of the AT command
+  * @retval AT_OK
+  */
+ATEerror_t AT_NwkSKey_get(const char *param);
+
+/**
+  * @brief  Set Network Session Key
+  * @param  param String pointing to provided DevAddr
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_JoinEUI_set(const char *param);
+ATEerror_t AT_NwkSKey_set(const char *param);
+
+/**
+  * @brief  Print Application Session Key
+  * @param  param string of the AT command
+  * @retval AT_OK
+  */
+ATEerror_t AT_AppSKey_get(const char *param);
+
+/**
+  * @brief  Set Application Session Key
+  * @param  param String pointing to provided DevAddr
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  */
+ATEerror_t AT_AppSKey_set(const char *param);
 
 /**
   * @brief  Print the DevAddr
-  * @param  String pointing to provided DevAddr
+  * @param  param String pointing to provided DevAddr
   * @retval AT_OK
   */
 ATEerror_t AT_DevAddr_get(const char *param);
 
 /**
   * @brief  Set DevAddr
-  * @param  String pointing to provided DevAddr
+  * @param  param String pointing to provided DevAddr
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_DevAddr_set(const char *param);
 
 /**
-  * @brief  Print Adaptative Data Rate setting
-  * @param  String pointing to provided ADR setting
+  * @brief  Print Device EUI
+  * @param  param string of the AT command - unused
+  * @retval AT_OK
+  */
+ATEerror_t AT_DevEUI_get(const char *param);
+
+/**
+  * @brief  Set Device EUI
+  * @param  param string of the AT command
+  * @retval AT_OK if OK
+  */
+ATEerror_t AT_DevEUI_set(const char *param);
+
+/**
+  * @brief  Print the Network ID
+  * @param  param String pointing to provided parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_ADR_get(const char *param);
+ATEerror_t AT_NetworkID_get(const char *param);
 
 /**
-  * @brief  Set Adaptative Data Rate setting
-  * @param  String pointing to provided ADR setting
+  * @brief  Set the Network ID
+  * @param  param String pointing to provided parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_ADR_set(const char *param);
+ATEerror_t AT_NetworkID_set(const char *param);
 
+/* --------------- LoRaWAN join and send data commands --------------- */
 /**
-  * @brief  Print Data Rate
-  * @param  String pointing to provided rate
+  * @brief  Join a network
+  * @param  param String parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DataRate_get(const char *param);
+ATEerror_t AT_Join(const char *param);
 
 /**
-  * @brief  Set Data Rate
-  * @param  String pointing to provided rate
+  * @brief  Piggyback a Link Check Request to the next uplink
+  * @param  param String parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DataRate_set(const char *param);
+ATEerror_t AT_Link_Check(const char *param);
 
 /**
-  * @brief  Set ETSI Duty Cycle parameter
-  * @param  String pointing to provided Duty Cycle value
+  * @brief  Print last received message
+  * @param  param String parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DutyCycle_set(const char *param);
+ATEerror_t AT_Send(const char *param);
 
+/* --------------- LoRaWAN network management commands --------------- */
 /**
-  * @brief  Get ETSI Duty Cycle parameter
-  * @param  0 if disable, 1 if enable
+  * @brief  Print the version of the AT_Slave FW
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_DutyCycle_get(const char *param);
+ATEerror_t AT_version_get(const char *param);
 
 /**
-  * @brief  Print Rx2 window frequency
-  * @param  String pointing to parameter
+  * @brief  Print Adaptive Data Rate setting
+  * @param  param String pointing to provided ADR setting
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx2Frequency_get(const char *param);
+ATEerror_t AT_ADR_get(const char *param);
 
 /**
-  * @brief  Print Rx2 window data rate
-  * @param  String pointing to parameter
+  * @brief  Set Adaptive Data Rate setting
+  * @param  param String pointing to provided ADR setting
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx2DataRate_get(const char *param);
+ATEerror_t AT_ADR_set(const char *param);
 
 /**
-  * @brief  Print Transmit Power
-  * @param  String pointing to provided power
+  * @brief  Print Data Rate
+  * @param  param String pointing to provided rate
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_TransmitPower_get(const char *param);
+ATEerror_t AT_DataRate_get(const char *param);
 
 /**
-  * @brief  Print the delay between the end of the Tx and the Rx Window 1
-  * @param  String pointing to provided param
+  * @brief  Set Data Rate
+  * @param  param String pointing to provided rate
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx1Delay_get(const char *param);
+ATEerror_t AT_DataRate_set(const char *param);
 
 /**
-  * @brief  Print the delay between the end of the Tx and the Rx Window 2
-  * @param  String pointing to provided param
-  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  * @brief  Print actual Active Region
+  * @param  param string of the AT command - unused
+  * @retval AT_OK
   */
-ATEerror_t AT_Rx2Delay_get(const char *param);
+ATEerror_t AT_Region_get(const char *param);
 
 /**
-  * @brief  Print the delay between the end of the Tx and the Join Rx Window 1
-  * @param  String pointing to provided param
-  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  * @brief  Set Active Region
+  * @param  param string of the AT command
+  * @retval AT_OK if OK
   */
-ATEerror_t AT_JoinAcceptDelay1_get(const char *param);
+ATEerror_t AT_Region_set(const char *param);
 
 /**
-  * @brief  Print the delay between the end of the Tx and the Join Rx Window 2
-  * @param  String pointing to provided param
+  * @brief  Print the Device Class
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_JoinAcceptDelay2_get(const char *param);
+ATEerror_t AT_DeviceClass_get(const char *param);
 
 /**
-  * @brief  Set Transmit Power
-  * @param  String pointing to provided power
+  * @brief  Set the Device Class
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_TransmitPower_set(const char *param);
+ATEerror_t AT_DeviceClass_set(const char *param);
 
 /**
-  * @brief  Set Rx2 window frequency
-  * @param  String pointing to parameter
-  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  * @brief  Get ETSI Duty Cycle parameter
+  * @param  param String pointing to provided param
+  * @retval AT_OK
   */
-ATEerror_t AT_Rx2Frequency_set(const char *param);
+ATEerror_t AT_DutyCycle_get(const char *param);
 
 /**
-  * @brief  Set Rx2 window data rate
-  * @param  String pointing to parameter
+  * @brief  Set ETSI Duty Cycle parameter
+  * @param  param String pointing to provided Duty Cycle value
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx2DataRate_set(const char *param);
+ATEerror_t AT_DutyCycle_set(const char *param);
 
 /**
-  * @brief  Set the delay between the end of the Tx and the Rx Window 1
-  * @param  String pointing to provided param
+  * @brief  Print the delay between the end of the Tx and the Join Rx Window 1
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx1Delay_set(const char *param);
+ATEerror_t AT_JoinAcceptDelay1_get(const char *param);
 
 /**
-  * @brief  Set the delay between the end of the Tx and the Rx Window 2
-  * @param  String pointing to provided param
+  * @brief  Set the delay between the end of the Tx and the Join Rx Window 1
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Rx2Delay_set(const char *param);
+ATEerror_t AT_JoinAcceptDelay1_set(const char *param);
 
 /**
-  * @brief  Set the delay between the end of the Tx and the Join Rx Window 1
-  * @param  String pointing to provided param
+  * @brief  Print the delay between the end of the Tx and the Join Rx Window 2
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_JoinAcceptDelay1_set(const char *param);
+ATEerror_t AT_JoinAcceptDelay2_get(const char *param);
 
 /**
   * @brief  Set the delay between the end of the Tx and the Join Rx Window 2
-  * @param  String pointing to provided param
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_JoinAcceptDelay2_set(const char *param);
 
 /**
-  * @brief  Print the Network ID
-  * @param  String pointing to provided parameter
+  * @brief  Print the delay between the end of the Tx and the Rx Window 1
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_NetworkID_get(const char *param);
+ATEerror_t AT_Rx1Delay_get(const char *param);
 
 /**
-  * @brief  Set the Network ID
-  * @param  String pointing to provided parameter
+  * @brief  Set the delay between the end of the Tx and the Rx Window 1
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_NetworkID_set(const char *param);
+ATEerror_t AT_Rx1Delay_set(const char *param);
 
 /**
-  * @brief  Print the Device Class
-  * @param  String pointing to provided param
+  * @brief  Print the delay between the end of the Tx and the Rx Window 2
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DeviceClass_get(const char *param);
+ATEerror_t AT_Rx2Delay_get(const char *param);
 
 /**
-  * @brief  Set the Device Class
-  * @param  String pointing to provided param
+  * @brief  Set the delay between the end of the Tx and the Rx Window 2
+  * @param  param String pointing to provided param
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_DeviceClass_set(const char *param);
+ATEerror_t AT_Rx2Delay_set(const char *param);
 
 /**
-  * @brief  Join a network
-  * @param  String parameter
+  * @brief  Print Rx2 window data rate
+  * @param  param String pointing to parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Join(const char *param);
+ATEerror_t AT_Rx2DataRate_get(const char *param);
 
 /**
-  * @brief  Print last received message
-  * @param  String parameter
+  * @brief  Set Rx2 window data rate
+  * @param  param String pointing to parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_Send(const char *param);
+ATEerror_t AT_Rx2DataRate_set(const char *param);
 
 /**
-  * @brief  Print the version of the AT_Slave FW
-  * @param  String parameter
-  * @retval AT_OK
+  * @brief  Print Rx2 window frequency
+  * @param  param String pointing to parameter
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_version_get(const char *param);
+ATEerror_t AT_Rx2Frequency_get(const char *param);
 
 /**
-  * @brief  Get the battery level
-  * @param  String parameter
-  * @retval AT_OK
+  * @brief  Set Rx2 window frequency
+  * @param  param String pointing to parameter
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
-ATEerror_t AT_bat_get(const char *param);
+ATEerror_t AT_Rx2Frequency_set(const char *param);
+
+/**
+  * @brief  Print Transmit Power
+  * @param  param String pointing to provided power
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  */
+ATEerror_t AT_TransmitPower_get(const char *param);
+
+/**
+  * @brief  Set Transmit Power
+  * @param  param String pointing to provided power
+  * @retval AT_OK if OK, or an appropriate AT_xxx error code
+  */
+ATEerror_t AT_TransmitPower_set(const char *param);
 
 /**
   * @brief  Get the unicast pingslot periodicity, Data rate and PsFrequency
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PingSlot_get(const char *param);
 
 /**
   * @brief  Set the unicast pingslot periodicity
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PingSlot_set(const char *param);
 
+/* --------------- Radio tests commands --------------- */
 /**
-  * @brief  Get the local time in UTC format
-  * @param  String parameter
+  * @brief  Start Tx test
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_LocalTime_get(const char *param);
+ATEerror_t AT_test_txTone(const char *param);
 
 /**
-  * @brief  Sart Tx test
-  * @param  String parameter
+  * @brief  Start Rx tone
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_test_txTone(const char *param);
+ATEerror_t AT_test_rxRssi(const char *param);
 
 /**
-  * @brief  Sart Rx tone
-  * @param  String parameter
+  * @brief  Get Rx or Tx test config
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_test_rxRssi(const char *param);
+ATEerror_t AT_test_get_config(const char *param);
 
 /**
-  * @brief  stop Rx or Tx test
-  * @param  String parameter
+  * @brief  Set Rx or Tx test config
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_test_stop(const char *param);
+ATEerror_t AT_test_set_config(const char *param);
 
 /**
   * @brief  Start Tx LoRa test
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_tx(const char *param);
 
 /**
   * @brief  Start Rx LoRa test
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_rx(const char *param);
 
-/**
-  * @brief  Start Tx hopping
-  * @param  String parameter
-  * @retval AT_OK
-  */
-ATEerror_t AT_test_tx_hopping(const char *param);
-
-/**
-  * @brief  Set Rx or Tx test config
-  * @param  String parameter
-  * @retval AT_OK
-  */
-ATEerror_t AT_test_set_config(const char *param);
-
-/**
-  * @brief  Get Rx or Tx test config
-  * @param  String parameter
-  * @retval AT_OK
-  */
-ATEerror_t AT_test_get_config(const char *param);
-
 /**
   * @brief  set the Modem in Certif Mode
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_Certif(const char *param);
 
 /**
-  * @brief  Get the verbose level
-  * @param  String parameter
+  * @brief  Start Tx hopping
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_verbose_get(const char *param);
+ATEerror_t AT_test_tx_hopping(const char *param);
 
 /**
-  * @brief  Set the verbose level
-  * @param  String parameter
+  * @brief  stop Rx or Tx test
+  * @param  param String parameter
   * @retval AT_OK
   */
-ATEerror_t AT_verbose_set(const char *param);
+ATEerror_t AT_test_stop(const char *param);
 
 /**
   * @brief  Write Radio Register
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_write_register(const char *param);
 
 /**
   * @brief  Read Radio Register
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_read_register(const char *param);
 
+/* --------------- Information command --------------- */
+/**
+  * @brief  Get the battery level
+  * @param  param String parameter
+  * @retval AT_OK
+  */
+ATEerror_t AT_bat_get(const char *param);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_command.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_command.c
index 97bfdeac..dd8a0e71 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_command.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_command.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_command.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <string.h>
@@ -59,7 +61,6 @@ struct ATCommand_s
 /* Private define ------------------------------------------------------------*/
 #define CMD_SIZE                        540
 #define CIRC_BUFF_SIZE                  8
-#define HELP_DISPLAY_FLUSH_DELAY        100
 
 /* USER CODE BEGIN PD */
 
@@ -85,7 +86,7 @@ static const char *const ATError_description[] =
   "\r\nAT_NO_NETWORK_JOINED\r\n",   /* AT_NO_NET_JOINED */
   "\r\nAT_RX_ERROR\r\n",            /* AT_RX_ERROR */
   "\r\nAT_NO_CLASS_B_ENABLE\r\n",   /* AT_NO_CLASS_B_ENABLE */
-  "\r\nAT_DUTYCYLE_RESTRICTED\r\n", /* AT_DUTYCYLE_RESTRICTED */
+  "\r\nAT_DUTYCYCLE_RESTRICTED\r\n", /* AT_DUTYCYCLE_RESTRICTED */
   "\r\nAT_CRYPTO_ERROR\r\n",        /* AT_CRYPTO_ERROR */
   "\r\nerror unknown\r\n",          /* AT_MAX */
 };
@@ -95,6 +96,7 @@ static const char *const ATError_description[] =
   */
 static const struct ATCommand_s ATCommand[] =
 {
+  /* General commands */
   {
     .string = AT_RESET,
     .size_string = sizeof(AT_RESET) - 1,
@@ -118,178 +120,181 @@ static const struct ATCommand_s ATCommand[] =
   },
 
   {
-    .string = AT_VER,
-    .size_string = sizeof(AT_VER) - 1,
+    .string = AT_LTIME,
+    .size_string = sizeof(AT_LTIME) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_VER" Get the FW version\r\n",
+    .help_string = "AT"AT_LTIME" Get the local time in UTC format\r\n",
 #endif /* !NO_HELP */
-    .get = AT_version_get,
+    .get = AT_LocalTime_get,
     .set = AT_return_error,
     .run = AT_return_error,
   },
 
+  /* Keys, IDs and EUIs management commands */
   {
-    .string = AT_BAND,
-    .size_string = sizeof(AT_BAND) - 1,
+    .string = AT_JOINEUI,
+    .size_string = sizeof(AT_JOINEUI) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_BAND"=<BandID><CR>. Get or Set the Active Region BandID=[0:AS923, 1:AU915, 2:CN470, 3:CN779, 4:EU433, 5:EU868, 6:KR920, 7:IN865, 8:US915, 9:RU864]\r\n",
+    .help_string = "AT"AT_JOINEUI"=<XX:XX:XX:XX:XX:XX:XX:XX><CR>. Get or Set the App Eui\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Region_get,
-    .set = AT_Region_set,
+    .get = AT_JoinEUI_get,
+    .set = AT_JoinEUI_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_DEUI,
-    .size_string = sizeof(AT_DEUI) - 1,
+    .string = AT_NWKKEY,
+    .size_string = sizeof(AT_NWKKEY) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_DEUI"=<XX:XX:XX:XX:XX:XX:XX:XX><CR>. Get or Set the Device EUI\r\n",
+    .help_string = "AT"AT_NWKKEY"=<XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX><CR>: Get or Set the Network Key\r\n",
 #endif /* !NO_HELP */
-    .get = AT_DevEUI_get,
-    .set = AT_DevEUI_set,
+    .get = AT_NwkKey_get,
+    .set = AT_NwkKey_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_DADDR,
-    .size_string = sizeof(AT_DADDR) - 1,
+    .string = AT_APPKEY,
+    .size_string = sizeof(AT_APPKEY) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_DADDR"=<XXXXXXXX><CR>. Get or Set the Device address\r\n",
+    .help_string = "AT"AT_APPKEY"=<XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX><CR>: Get or Set the Application Key\r\n",
 #endif /* !NO_HELP */
-    .get = AT_DevAddr_get,
-    .set = AT_DevAddr_set,
+    .get = AT_AppKey_get,
+    .set = AT_AppKey_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_JOINEUI,
-    .size_string = sizeof(AT_JOINEUI) - 1,
+    .string = AT_NWKSKEY,
+    .size_string = sizeof(AT_NWKSKEY) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_JOINEUI"=<XX:XX:XX:XX:XX:XX:XX:XX><CR>. Get or Set the App Eui\r\n",
+    .help_string = "AT"AT_NWKSKEY"=<XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX><CR>: Get or Set the Network Session Key\r\n",
 #endif /* !NO_HELP */
-    .get = AT_JoinEUI_get,
-    .set = AT_JoinEUI_set,
+    .get = AT_NwkSKey_get,
+    .set = AT_NwkSKey_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_ADR,
-    .size_string = sizeof(AT_ADR) - 1,
+    .string = AT_APPSKEY,
+    .size_string = sizeof(AT_APPSKEY) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_ADR"=<ADR><CR>. Get or Set the Adaptive Data Rate setting ADR=[0:off, 1:on]\r\n",
+    .help_string = "AT"AT_APPSKEY"=<XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX><CR>: Get or Set the Application Session Key\r\n",
 #endif /* !NO_HELP */
-    .get = AT_ADR_get,
-    .set = AT_ADR_set,
+    .get = AT_AppSKey_get,
+    .set = AT_AppSKey_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_DR,
-    .size_string = sizeof(AT_DR) - 1,
+    .string = AT_DADDR,
+    .size_string = sizeof(AT_DADDR) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_DR"=<DataRate><CR>. Get or Set the Tx DataRate=[0..7]\r\n",
+    .help_string = "AT"AT_DADDR"=<XXXXXXXX><CR>. Get or Set the Device address\r\n",
 #endif /* !NO_HELP */
-    .get = AT_DataRate_get,
-    .set = AT_DataRate_set,
+    .get = AT_DevAddr_get,
+    .set = AT_DevAddr_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_TXP,
-    .size_string = sizeof(AT_TXP) - 1,
+    .string = AT_DEUI,
+    .size_string = sizeof(AT_DEUI) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TXP"=<Power><CR>. Get or Set the Transmit Power=[0..15](valid range according to region)\r\n",
+    .help_string = "AT"AT_DEUI"=<XX:XX:XX:XX:XX:XX:XX:XX><CR>. Get or Set the Device EUI\r\n",
 #endif /* !NO_HELP */
-    .get = AT_TransmitPower_get,
-    .set = AT_TransmitPower_set,
+    .get = AT_DevEUI_get,
+    .set = AT_DevEUI_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_DCS,
-    .size_string = sizeof(AT_DCS) - 1,
+    .string = AT_NWKID,
+    .size_string = sizeof(AT_NWKID) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_DCS"=<DutyCycle><CR>. Get or Set the ETSI DutyCycle=[0:disable, 1:enable] - Only for testing\r\n",
+    .help_string = "AT"AT_NWKID"=<NwkID><CR>. Get or Set the Network ID=[0..127]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_DutyCycle_get,
-    .set = AT_DutyCycle_set,
+    .get = AT_NetworkID_get,
+    .set = AT_NetworkID_set,
     .run = AT_return_error,
   },
 
+  /* LoRaWAN join and send data commands */
   {
-    .string = AT_RX2FQ,
-    .size_string = sizeof(AT_RX2FQ) - 1,
+    .string = AT_JOIN,
+    .size_string = sizeof(AT_JOIN) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_RX2FQ"=<Freq><CR>. Get or Set the Rx2 window Freq in Hz\r\n",
+    .help_string = "AT"AT_JOIN"=<Mode><CR>. Join network with Mode=[0:ABP, 1:OTAA]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Rx2Frequency_get,
-    .set = AT_Rx2Frequency_set,
+    .get = AT_return_error,
+    .set = AT_Join,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_RX2DR,
-    .size_string = sizeof(AT_RX2DR) - 1,
+    .string = AT_LINKC,
+    .size_string = sizeof(AT_LINKC) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_RX2DR"=<DataRate><CR>. Get or Set the Rx2 window DataRate=[0..7]\r\n",
+    .help_string = "AT"AT_LINKC". Piggyback a Link Check Request to the next uplink\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Rx2DataRate_get,
-    .set = AT_Rx2DataRate_set,
-    .run = AT_return_error,
+    .get = AT_return_error,
+    .set = AT_return_error,
+    .run = AT_Link_Check,
   },
 
   {
-    .string = AT_RX1DL,
-    .size_string = sizeof(AT_RX1DL) - 1,
+    .string = AT_SEND,
+    .size_string = sizeof(AT_SEND) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_RX1DL"=<Delay><CR>. Get or Set the delay between the end of the Tx and the Rx Window 1 in ms\r\n",
+    .help_string = "AT"AT_SEND"=<Port>:<Ack>:<Payload><CR>. Send binary data with the application Port=[1..199] and Ack=[0:unconfirmed, 1:confirmed]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Rx1Delay_get,
-    .set = AT_Rx1Delay_set,
+    .get = AT_return_error,
+    .set = AT_Send,
     .run = AT_return_error,
   },
 
+  /* LoRaWAN network management commands */
   {
-    .string = AT_RX2DL,
-    .size_string = sizeof(AT_RX2DL) - 1,
+    .string = AT_VER,
+    .size_string = sizeof(AT_VER) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_RX2DL"=<Delay><CR>. Get or Set the delay between the end of the Tx and the Rx Window 2 in ms\r\n",
+    .help_string = "AT"AT_VER" Get the FW version\r\n",
 #endif /* !NO_HELP */
-    .get = AT_Rx2Delay_get,
-    .set = AT_Rx2Delay_set,
+    .get = AT_version_get,
+    .set = AT_return_error,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_JN1DL,
-    .size_string = sizeof(AT_JN1DL) - 1,
+    .string = AT_ADR,
+    .size_string = sizeof(AT_ADR) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_JN1DL"=<Delay><CR>. Get or Set the Join Accept Delay between the end of the Tx and the Join Rx Window 1 in ms\r\n",
+    .help_string = "AT"AT_ADR"=<ADR><CR>. Get or Set the Adaptive Data Rate setting ADR=[0:off, 1:on]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_JoinAcceptDelay1_get,
-    .set = AT_JoinAcceptDelay1_set,
+    .get = AT_ADR_get,
+    .set = AT_ADR_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_JN2DL,
-    .size_string = sizeof(AT_JN2DL) - 1,
+    .string = AT_DR,
+    .size_string = sizeof(AT_DR) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_JN2DL"=<Delay><CR>. Get or Set the Join Accept Delay between the end of the Tx and the Join Rx Window 2 in ms\r\n",
+    .help_string = "AT"AT_DR"=<DataRate><CR>. Get or Set the Tx DataRate=[0..7]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_JoinAcceptDelay2_get,
-    .set = AT_JoinAcceptDelay2_set,
+    .get = AT_DataRate_get,
+    .set = AT_DataRate_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_NWKID,
-    .size_string = sizeof(AT_NWKID) - 1,
+    .string = AT_BAND,
+    .size_string = sizeof(AT_BAND) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_NWKID"=<NwkID><CR>. Get or Set the Network ID=[0..127]\r\n",
+    .help_string = "AT"AT_BAND"=<BandID><CR>. Get or Set the Active Region BandID=[0:AS923, 1:AU915, 2:CN470, 3:CN779, 4:EU433, 5:EU868, 6:KR920, 7:IN865, 8:US915, 9:RU864]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_NetworkID_get,
-    .set = AT_NetworkID_set,
+    .get = AT_Region_get,
+    .set = AT_Region_set,
     .run = AT_return_error,
   },
 
@@ -305,83 +310,105 @@ static const struct ATCommand_s ATCommand[] =
   },
 
   {
-    .string = AT_JOIN,
-    .size_string = sizeof(AT_JOIN) - 1,
+    .string = AT_DCS,
+    .size_string = sizeof(AT_DCS) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_JOIN"=<Mode><CR>. Join network with Mode=[0:ABP, 1:OTAA]\r\n",
+    .help_string = "AT"AT_DCS"=<DutyCycle><CR>. Get or Set the ETSI DutyCycle=[0:disable, 1:enable] - Only for testing\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_Join,
+    .get = AT_DutyCycle_get,
+    .set = AT_DutyCycle_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_SEND,
-    .size_string = sizeof(AT_SEND) - 1,
+    .string = AT_JN1DL,
+    .size_string = sizeof(AT_JN1DL) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_SEND"=<Port>:<Ack>:<Payload><CR>. Send binary data with the application Port=[1..199] and Ack=[0:unconfirmed, 1:confirmed]\r\n",
+    .help_string = "AT"AT_JN1DL"=<Delay><CR>. Get or Set the Join Accept Delay between the end of the Tx and the Join Rx Window 1 in ms\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_Send,
+    .get = AT_JoinAcceptDelay1_get,
+    .set = AT_JoinAcceptDelay1_set,
     .run = AT_return_error,
   },
+
   {
-    .string = AT_PGSLOT,
-    .size_string = sizeof(AT_PGSLOT) - 1,
+    .string = AT_JN2DL,
+    .size_string = sizeof(AT_JN2DL) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_PGSLOT"=<Period><CR>. Set or Get the unicast ping slot Period=[0:1s .. 7:128s](=2^Period)\r\n",
+    .help_string = "AT"AT_JN2DL"=<Delay><CR>. Get or Set the Join Accept Delay between the end of the Tx and the Join Rx Window 2 in ms\r\n",
 #endif /* !NO_HELP */
-    .get = AT_PingSlot_get,
-    .set = AT_PingSlot_set,
+    .get = AT_JoinAcceptDelay2_get,
+    .set = AT_JoinAcceptDelay2_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_LTIME,
-    .size_string = sizeof(AT_LTIME) - 1,
+    .string = AT_RX1DL,
+    .size_string = sizeof(AT_RX1DL) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_LTIME" Get the local time in UTC format\r\n",
+    .help_string = "AT"AT_RX1DL"=<Delay><CR>. Get or Set the delay between the end of the Tx and the Rx Window 1 in ms\r\n",
 #endif /* !NO_HELP */
-    .get = AT_LocalTime_get,
-    .set = AT_return_error,
+    .get = AT_Rx1Delay_get,
+    .set = AT_Rx1Delay_set,
     .run = AT_return_error,
   },
 
-#ifdef AT_RADIO_ACCESS
   {
-    .string = AT_REGW,
-    .size_string = sizeof(AT_REGW) - 1,
+    .string = AT_RX2DL,
+    .size_string = sizeof(AT_RX2DL) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_REGW"=<Addr>:<Data><CR> Write Radio Register Addr=[4 hexa char], Data=[2 hexa char]\r\n",
+    .help_string = "AT"AT_RX2DL"=<Delay><CR>. Get or Set the delay between the end of the Tx and the Rx Window 2 in ms\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_write_register,
+    .get = AT_Rx2Delay_get,
+    .set = AT_Rx2Delay_set,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_REGR,
-    .size_string = sizeof(AT_REGR) - 1,
+    .string = AT_RX2DR,
+    .size_string = sizeof(AT_RX2DR) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_REGR"=<Addr><CR>. Read Radio Register Addr=[4 hexa char]\r\n",
+    .help_string = "AT"AT_RX2DR"=<DataRate><CR>. Get or Set the Rx2 window DataRate=[0..7]\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_read_register,
+    .get = AT_Rx2DataRate_get,
+    .set = AT_Rx2DataRate_set,
     .run = AT_return_error,
   },
-#endif /*AT_RADIO_ACCESS*/
 
   {
-    .string = AT_TRSSI,
-    .size_string = sizeof(AT_TRSSI) - 1,
+    .string = AT_RX2FQ,
+    .size_string = sizeof(AT_RX2FQ) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TRSSI" Starts RF RSSI tone test\r\n",
+    .help_string = "AT"AT_RX2FQ"=<Freq><CR>. Get or Set the Rx2 window Freq in Hz\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_return_error,
-    .run = AT_test_rxRssi,
+    .get = AT_Rx2Frequency_get,
+    .set = AT_Rx2Frequency_set,
+    .run = AT_return_error,
   },
 
+  {
+    .string = AT_TXP,
+    .size_string = sizeof(AT_TXP) - 1,
+#ifndef NO_HELP
+    .help_string = "AT"AT_TXP"=<Power><CR>. Get or Set the Transmit Power=[0..15](valid range according to region)\r\n",
+#endif /* !NO_HELP */
+    .get = AT_TransmitPower_get,
+    .set = AT_TransmitPower_set,
+    .run = AT_return_error,
+  },
+
+  {
+    .string = AT_PGSLOT,
+    .size_string = sizeof(AT_PGSLOT) - 1,
+#ifndef NO_HELP
+    .help_string = "AT"AT_PGSLOT"=<Period><CR>. Set or Get the unicast ping slot Period=[0:1s .. 7:128s](=2^Period)\r\n",
+#endif /* !NO_HELP */
+    .get = AT_PingSlot_get,
+    .set = AT_PingSlot_set,
+    .run = AT_return_error,
+  },
+
+  /* Radio tests commands */
   {
     .string = AT_TTONE,
     .size_string = sizeof(AT_TTONE) - 1,
@@ -394,24 +421,26 @@ static const struct ATCommand_s ATCommand[] =
   },
 
   {
-    .string = AT_TTLRA,
-    .size_string = sizeof(AT_TTLRA) - 1,
+    .string = AT_TRSSI,
+    .size_string = sizeof(AT_TRSSI) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TTLRA"=<PacketNb><CR>. Set Nb of packets sent with RF Tx test\r\n",
+    .help_string = "AT"AT_TRSSI" Starts RF RSSI tone test\r\n",
 #endif /* !NO_HELP */
     .get = AT_return_error,
-    .set = AT_test_tx,
-    .run = AT_return_error,
+    .set = AT_return_error,
+    .run = AT_test_rxRssi,
   },
 
   {
-    .string = AT_TRLRA,
-    .size_string = sizeof(AT_TRLRA) - 1,
+    .string = AT_TCONF,
+    .size_string = sizeof(AT_TCONF) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TRLRA"=<PacketNb><CR>. Set Nb of packets to be received with RF Rx test\r\n",
+    .help_string = "AT"AT_TCONF"=<Freq in Hz>:<Power in dBm>:<Lora Bandwidth <0 to 6>, or FSK Bandwidth in Hz>:<Lora SF or FSK datarate (bps)>:<CodingRate 4/5, 4/6, 4/7, 4/8>:\r\n\
+         <Lna>:<PA Boost>:<Modulation 0:FSK, 1:Lora, 2:BPSK>:<PayloadLen in Bytes>:<FskDeviation in Hz>:<LowDrOpt 0:off, 1:on, 2:Auto>:\r\n\
+         <BTproduct: 0:no Gaussian Filter Applied, 1:BT=0,3, 2:BT=0,5, 3:BT=0,7, 4:BT=1><CR>. Configure RF test\r\n",
 #endif /* !NO_HELP */
-    .get = AT_return_error,
-    .set = AT_test_rx,
+    .get = AT_test_get_config,
+    .set = AT_test_set_config,
     .run = AT_return_error,
   },
 
@@ -438,26 +467,24 @@ static const struct ATCommand_s ATCommand[] =
   },
 
   {
-    .string = AT_TTH,
-    .size_string = sizeof(AT_TTH) - 1,
+    .string = AT_CERTIF,
+    .size_string = sizeof(AT_CERTIF) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TTH"=<Fstart>,<Fstop>,<Fdelta>,<PacketNb><CR>. Starts RF Tx hopping test from Fstart to Fstop in Hz or MHz, Fdelta in Hz\r\n",
+    .help_string = "AT"AT_CERTIF"=<Mode><CR>. Set the module in LoraWan Certification with Join Mode=[0:ABP, 1:OTAA]\r\n",
 #endif /* !NO_HELP */
     .get = AT_return_error,
-    .set = AT_test_tx_hopping,
+    .set = AT_Certif,
     .run = AT_return_error,
   },
 
   {
-    .string = AT_TCONF,
-    .size_string = sizeof(AT_TCONF) - 1,
+    .string = AT_TTH,
+    .size_string = sizeof(AT_TTH) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_TCONF"=<Freq in Hz>:<Power in dBm>:<Bandwidth in kHz>:<SF>:4/<CodingRate>:<Lna>:<PA Boost>:\r\n\
-         <Modulation 0:FSK, 1:Lora, 2:BPSK>:<PayloadLen in Bytes>:<FskDeviation in Hz>:<LowDrOpt 0:off, 1:on, 2:Auto>:\r\n\
-         <BTproduct: 0:no Gaussian Filter Applied, 1:BT=0,3, 2:BT=0,5, 3:BT=0,7, 4:BT=1><CR>. Configure RF test\r\n",
+    .help_string = "AT"AT_TTH"=<Fstart>,<Fstop>,<Fdelta>,<PacketNb><CR>. Starts RF Tx hopping test from Fstart to Fstop in Hz or MHz, Fdelta in Hz\r\n",
 #endif /* !NO_HELP */
-    .get = AT_test_get_config,
-    .set = AT_test_set_config,
+    .get = AT_return_error,
+    .set = AT_test_tx_hopping,
     .run = AT_return_error,
   },
 
@@ -472,27 +499,44 @@ static const struct ATCommand_s ATCommand[] =
     .run = AT_test_stop,
   },
 
+#ifdef AT_RADIO_ACCESS
   {
-    .string = AT_CERTIF,
-    .size_string = sizeof(AT_CERTIF) - 1,
+    .string = AT_REGW,
+    .size_string = sizeof(AT_REGW) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_CERTIF"=<Mode><CR>. Set the module in LoraWan Certification with Join Mode=[0:ABP, 1:OTAA]\r\n",
+    .help_string = "AT"AT_REGW"=<Addr>:<Data><CR> Write Radio Register Addr=[4 hex char], Data=[2 hex char]\r\n",
 #endif /* !NO_HELP */
     .get = AT_return_error,
-    .set = AT_Certif,
+    .set = AT_write_register,
     .run = AT_return_error,
   },
 
+  {
+    .string = AT_REGR,
+    .size_string = sizeof(AT_REGR) - 1,
+#ifndef NO_HELP
+    .help_string = "AT"AT_REGR"=<Addr><CR>. Read Radio Register Addr=[4 hex char]\r\n",
+#endif /* !NO_HELP */
+    .get = AT_return_error,
+    .set = AT_read_register,
+    .run = AT_return_error,
+  },
+#endif /*AT_RADIO_ACCESS*/
+
+  /* Information command */
   {
     .string = AT_BAT,
     .size_string = sizeof(AT_BAT) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_BAT" Get the battery Level=[0..254]\r\n",
+    .help_string = "AT"AT_BAT" Get the battery Level in mV\r\n",
 #endif /* !NO_HELP */
     .get = AT_bat_get,
     .set = AT_return_error,
     .run = AT_return_error,
   },
+  /* USER CODE BEGIN ATCommand */
+
+  /* USER CODE END ATCommand */
 };
 
 static char circBuffer[CIRC_BUFF_SIZE];
@@ -511,15 +555,13 @@ static uint32_t circBuffOverflow = 0;
 
 /**
   * @brief  Parse a command and process it
-  * @param  The command
-  * @retval None
+  * @param  cmd The command
   */
 static void parse_cmd(const char *cmd);
 
 /**
   * @brief  Print a string corresponding to an ATEerror_t
-  * @param  The AT error code
-  * @retval None
+  * @param  error_type The AT error code
   */
 static void com_error(ATEerror_t error_type);
 
@@ -528,20 +570,17 @@ static void com_error(ATEerror_t error_type);
   * @param  rxChar th char received
   * @param  size
   * @param  error
-  * @retval None
   */
 static void CMD_GetChar(uint8_t *rxChar, uint16_t size, uint8_t error);
 
 /**
-  * @brief  CNotifies the upper layer that a charchter has been receveid
-  * @param  None
-  * @retval None
+  * @brief  CNotifies the upper layer that a character has been received
   */
 static void (*NotifyCb)(void);
 
 /**
   * @brief  Remove backspace and its preceding character in the Command string
-  * @param  Command string to process
+  * @param  cmd string to process
   * @retval 0 when OK, otherwise error
   */
 static int32_t CMD_ProcessBackSpace(char *cmd);
@@ -764,9 +803,11 @@ static void parse_cmd(const char *cmd)
     {
       AT_PPRINTF(ATCommand[i].help_string);
     }
-    /* Wait for the message queue to be flushed in order
-       not to disturb following com_error() display */
-    HAL_Delay(HELP_DISPLAY_FLUSH_DELAY);
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
 #endif /* !NO_HELP */
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_command.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_command.h
index 5a68b81d..65210c30 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_command.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_command.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_command.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_COMMAND_H__
@@ -56,17 +58,12 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief Initializes command module
-  *
-  * @param [IN] cb to signal appli that character has been received
-  * @retval None
+  * @param CmdProcessNotify cb to signal application that character has been received
   */
 void CMD_Init(void (*CmdProcessNotify)(void));
 
 /**
   * @brief Process the command
-  *
-  * @param [IN] None
-  * @retval None
   */
 void CMD_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/test_rf.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/test_rf.c
index bcedb56e..42791f33 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/test_rf.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/test_rf.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    test_rf.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -46,7 +48,7 @@
 #define SF12                          12
 #define CR4o5                         1
 #define EMISSION_POWER                P_14dBm
-#define CONTIUNUOUS_TIMEOUT           0xFFFF
+#define CONTINUOUS_TIMEOUT           0xFFFF
 #define LORA_PREAMBLE_LENGTH          8         /* Same for Tx and Rx */
 #define LORA_SYMBOL_TIMEOUT           30        /* Symbols */
 #define TX_TIMEOUT_VALUE              3000
@@ -84,13 +86,18 @@ static __IO uint32_t RadioRxDone_flag = 0;
 static __IO uint32_t RadioRxTimeout_flag = 0;
 static __IO uint32_t RadioError_flag = 0;
 static __IO int16_t last_rx_rssi = 0;
-static __IO int8_t last_rx_snr = 0;
+static __IO int8_t last_rx_LoraSnr_FskCfo = 0;
 
 /*!
  * Radio events function pointer
  */
 static RadioEvents_t RadioEvents;
 
+/*!
+ * Radio test payload pointer
+ */
+static uint8_t payload[256] = {0};
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
@@ -142,7 +149,7 @@ int32_t TST_TxTone(void)
 
     APP_TPRINTF("Tx FSK Test\r\n");
 
-    Radio.SetTxContinuousWave(testParam.freq, testParam.power, CONTIUNUOUS_TIMEOUT);
+    Radio.SetTxContinuousWave(testParam.freq, testParam.power, CONTINUOUS_TIMEOUT);
 
     return 0;
   }
@@ -263,7 +270,6 @@ int32_t TST_TX_Start(int32_t nb_packet)
 
   /* USER CODE END TST_TX_Start_1 */
   int32_t i;
-  uint8_t payload[256] = {0};
   TxConfigGeneric_t TxConfig;
 
   if ((TestState & TX_TEST_LORA) != TX_TEST_LORA)
@@ -378,7 +384,7 @@ int32_t TST_RX_Start(int32_t nb_packet)
   uint32_t count_RxOk = 0;
   uint32_t count_RxKo = 0;
   uint32_t PER = 0;
-  RxConfigGeneric_t RxConfig;
+  RxConfigGeneric_t RxConfig = {0};
 
   if (((TestState & RX_TEST_LORA) != RX_TEST_LORA) && (nb_packet > 0))
   {
@@ -407,11 +413,14 @@ int32_t TST_RX_Start(int32_t nb_packet)
         RxConfig.fsk.PreambleLen = 3; /*in Byte*/
         RxConfig.fsk.SyncWordLength = 3; /*in Byte*/
         RxConfig.fsk.SyncWord = syncword; /*SyncWord Buffer*/
+        RxConfig.fsk.PreambleMinDetect = RADIO_FSK_PREAMBLE_DETECTOR_08_BITS;
         RxConfig.fsk.whiteSeed = 0x01FF ; /*WhiteningSeed*/
         RxConfig.fsk.LengthMode = RADIO_FSK_PACKET_VARIABLE_LENGTH; /* If the header is explicit, it will be transmitted in the GFSK packet. If the header is implicit, it will not be transmitted*/
         RxConfig.fsk.CrcLength = RADIO_FSK_CRC_2_BYTES_CCIT;       /* Size of the CRC block in the GFSK packet*/
         RxConfig.fsk.CrcPolynomial = 0x1021;
         RxConfig.fsk.Whitening = RADIO_FSK_DC_FREE_OFF;
+        RxConfig.fsk.MaxPayloadLength = 255;
+        RxConfig.fsk.AddrComp = RADIO_FSK_ADDRESSCOMP_FILT_OFF;
         Radio.RadioSetRxGenericConfig(GENERIC_FSK, &RxConfig, RX_CONTINUOUS_ON, 0);
       }
       else if (testParam.modulation == TEST_LORA)
@@ -441,9 +450,16 @@ int32_t TST_RX_Start(int32_t nb_packet)
       if (RadioRxDone_flag == 1)
       {
         int16_t rssi = last_rx_rssi;
-        int8_t snr = last_rx_snr;
+        int8_t LoraSnr_FskCfo = last_rx_LoraSnr_FskCfo;
         APP_TPRINTF("OnRxDone\r\n");
-        APP_TPRINTF("RssiValue=%d dBm, SnrValue=%d\r\n", rssi, snr);
+        if (testParam.modulation == TEST_FSK)
+        {
+          APP_TPRINTF("RssiValue=%d dBm, cfo=%dkHz\r\n", rssi, LoraSnr_FskCfo);
+        }
+        else
+        {
+          APP_TPRINTF("RssiValue=%d dBm, SnrValue=%ddB\r\n", rssi, LoraSnr_FskCfo);
+        }
       }
 
       if (RadioRxTimeout_flag == 1)
@@ -505,13 +521,13 @@ void OnTxDone(void)
   /* USER CODE END OnTxDone_2 */
 }
 
-void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
+void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo)
 {
   /* USER CODE BEGIN OnRxDone_1 */
 
   /* USER CODE END OnRxDone_1 */
   last_rx_rssi = rssi;
-  last_rx_snr = snr;
+  last_rx_LoraSnr_FskCfo = LoraSnr_FskCfo;
 
   /* Set Rxdone flag */
   RadioRxDone_flag = 1;
@@ -566,6 +582,8 @@ static int32_t Prbs9_generator(uint8_t *payload, uint8_t len)
 
   /* USER CODE END Prbs9_generator_1 */
   uint16_t prbs9_val = PRBS9_INIT;
+  /*init payload to 0*/
+  UTIL_MEM_set_8(payload, 0, len);
 
   for (int32_t i = 0; i < len * 8; i++)
   {
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/test_rf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/test_rf.h
index 1267529d..10fecb04 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/test_rf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/test_rf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    test_rf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TEST_RF_H__
@@ -88,50 +90,47 @@ typedef struct
 /* Exported functions ------------------------------------------------------- */
 /**
   * @brief RF Tone test command
-  * @param [IN] none
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_TxTone(void);
 
 /**
   * @brief RF Receive  test command
-  * @param  [IN] none
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_RxRssi(void);
 
 /**
   * @brief RF Transmit LORA test command
-  * @Note Transmits [0x00, 0x11, 0x22, ... 0xFF]
-  * @param [IN] nb of packets
+  * @note Transmits [0x00, 0x11, 0x22, ... 0xFF]
+  * @param[in] nb_packet nb of packets
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_TX_Start(int32_t nb_packet);
 
 /**
   * @brief RF Receive LORA test command
-  * @param [IN] nb of packets
+  * @param[in] nb_packet nb of packets
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_RX_Start(int32_t nb_packet);
 
 /**
   * @brief RF Set Radio Configuration test command
-  * @param [IN] Param
+  * @param[in] Param Pointer config param
   * @retval status 0 ok, -1 ko
   */
 int32_t TST_set_config(testParameter_t *Param);
 
 /**
   * @brief RF Get Radio Configuration test command
-  * @param [IN] Pointer config param
+  * @param[in] Param Pointer config param
   * @retval LoRa status
   */
 int32_t TST_get_config(testParameter_t *Param);
 
 /**
   * @brief RF test stop
-  * @param [IN] None
   * @retval LoRa status
   */
 int32_t TST_stop(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
index 1f6f2c02..b97a4240 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lorawan_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORAWAN_CONF_H__
@@ -25,7 +27,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/systime.h
index f3ce93b2..1991b928 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/systime.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/systime.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    systime.h
@@ -16,8 +17,9 @@
   *
   ******************************************************************************
   */
-/* Define to prevent recursive inclusion -------------------------------------*/
+/* USER CODE END Header */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTIME_H__
 #define __SYSTIME_H__
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
index 65512b2d..f8a2aa5b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -48,10 +50,15 @@
 #ifndef MAX
 #define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #endif /* MAX */
-#define MCPS_MLME_SIZE MAX(sizeof(McpsReq_t), sizeof(MlmeReq_t))
-#define MCPS_MLME_2_SIZE MAX(MCPS_MLME_SIZE, sizeof(MibRequestConfirm_t))
-#define LORA_MBWRAP_SHBUF_SIZE MAX(MCPS_MLME_2_SIZE, sizeof(McChannelParams_t))
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
+#define LMH_CONFIG_SIZE     (sizeof(LmHandlerParams_t))
+#define LMH_SEND_SIZE       (256 + sizeof(UTIL_TIMER_Time_t))
+#define LMH_GET_CLASS_SIZE  (sizeof(DeviceClass_t))
+#define LMH_EUI_SIZE        (SE_EUI_SIZE)
+#define LMH_KEY_SIZE        (SE_KEY_SIZE)
+#define LMH_REGION_SIZE     (sizeof(LoRaMacRegion_t))
+#define LMH_RX_PARAM_SIZE   (sizeof(RxChannelParams_t))
+#define LMH_BEACON_SIZE     (sizeof(BeaconState_t))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(MAX(MAX(LMH_CONFIG_SIZE, LMH_SEND_SIZE), MAX(LMH_GET_CLASS_SIZE, LMH_EUI_SIZE)), MAX(MAX(LMH_KEY_SIZE, LMH_REGION_SIZE), MAX(LMH_RX_PARAM_SIZE, LMH_BEACON_SIZE)))
 
 /* USER CODE BEGIN PD */
 
@@ -63,6 +70,14 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM4 to CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
 static LmHandlerCallbacks_t callback_mbwrapper;
 
 /* USER CODE BEGIN PV */
@@ -98,9 +113,14 @@ LmHandlerErrorStatus_t LmHandlerInit(LmHandlerCallbacks_t *handlerCallbacks)
 
   callback_mbwrapper.GetBatteryLevel = handlerCallbacks->GetBatteryLevel;
   callback_mbwrapper.GetTemperature = handlerCallbacks->GetTemperature;
+  callback_mbwrapper.OnNvmDataChange = handlerCallbacks->OnNvmDataChange;
+  callback_mbwrapper.OnNetworkParametersChange = handlerCallbacks->OnNetworkParametersChange;
   callback_mbwrapper.OnJoinRequest = handlerCallbacks->OnJoinRequest;
   callback_mbwrapper.OnTxData = handlerCallbacks->OnTxData;
   callback_mbwrapper.OnRxData = handlerCallbacks->OnRxData;
+  callback_mbwrapper.OnClassChange = handlerCallbacks->OnClassChange;
+  callback_mbwrapper.OnBeaconStatusChange = handlerCallbacks->OnBeaconStatusChange;
+  callback_mbwrapper.OnSysTimeUpdate = handlerCallbacks->OnSysTimeUpdate;
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_INITIALIZATION_ID;
@@ -230,6 +250,7 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   uint32_t *com_buffer ;
   uint16_t i = 0;
   uint32_t ret;
+  uint8_t next_addr = 0;
 
   if ((appData == NULL) || (appData->Buffer == NULL))
   {
@@ -237,11 +258,17 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  /* need to 8-align the next address */
-  uint8_t next_addr = (appData->BufferSize + 7) & ~7;
+  if (appData->BufferSize > 0)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
+    /* need to 8-align the next address */
+    next_addr = (appData->BufferSize + 7) & ~7;
+  }
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
-  UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SEND_ID;
@@ -250,14 +277,24 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   com_buffer[i++] = (uint32_t) appData->BufferSize;
   com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
   com_buffer[i++] = (uint32_t) isTxConfirmed;
-  com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
+  if (nextTxIn == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
+  }
   com_buffer[i++] = (uint32_t) allowDelayedTx;
   com_obj->ParamCnt = i;
 
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
+  }
 
   ret = com_obj->ReturnVal;
   return (LmHandlerErrorStatus_t) ret;
@@ -311,7 +348,7 @@ LmHandlerErrorStatus_t LmHandlerRequestClass(DeviceClass_t newClass)
   /* USER CODE END LmHandlerRequestClass_2 */
 }
 
-int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
+LmHandlerErrorStatus_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
 {
   /* USER CODE BEGIN LmHandlerGetCurrentClass_1 */
 
@@ -341,13 +378,13 @@ int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
   UTIL_MEM_cpy_8(deviceClass, aLoraMbWrapShareBuffer, sizeof(DeviceClass_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetCurrentClass_2 */
 
   /* USER CODE END LmHandlerGetCurrentClass_2 */
 }
 
-int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
+LmHandlerErrorStatus_t LmHandlerGetDevEUI(uint8_t *devEUI)
 {
   /* USER CODE BEGIN LmHandlerGetDevEUI_1 */
 
@@ -363,7 +400,7 @@ int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_GET_DEVEUI_ID;
@@ -374,16 +411,16 @@ int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDevEUI_2 */
 
   /* USER CODE END LmHandlerGetDevEUI_2 */
 }
 
-int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
+LmHandlerErrorStatus_t LmHandlerSetDevEUI(uint8_t *devEUI)
 {
   /* USER CODE BEGIN LmHandlerSetDevEUI_1 */
 
@@ -399,7 +436,7 @@ int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SET_DEVEUI_ID;
@@ -410,16 +447,16 @@ int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDevEUI_2 */
 
   /* USER CODE END LmHandlerSetDevEUI_2 */
 }
 
-int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
+LmHandlerErrorStatus_t LmHandlerGetAppEUI(uint8_t *appEUI)
 {
   /* USER CODE BEGIN LmHandlerGetAppEUI_1 */
 
@@ -435,7 +472,7 @@ int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_GET_APPEUI_ID;
@@ -446,16 +483,16 @@ int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetAppEUI_2 */
 
   /* USER CODE END LmHandlerGetAppEUI_2 */
 }
 
-int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
+LmHandlerErrorStatus_t LmHandlerSetAppEUI(uint8_t *appEUI)
 {
   /* USER CODE BEGIN LmHandlerSetAppEUI_1 */
 
@@ -471,7 +508,7 @@ int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SET_APPEUI_ID;
@@ -482,16 +519,304 @@ int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetAppEUI_2 */
 
   /* USER CODE END LmHandlerSetAppEUI_2 */
 }
 
-int32_t LmHandlerGetNetworkID(uint32_t *networkId)
+LmHandlerErrorStatus_t LmHandlerGetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNwkKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNwkKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppKey_1 */
+
+  /* USER CODE END LmHandlerGetAppKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppKey_2 */
+
+  /* USER CODE END LmHandlerGetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppKey_1 */
+
+  /* USER CODE END LmHandlerSetAppKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppKey_2 */
+
+  /* USER CODE END LmHandlerSetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppSKey_1 */
+
+  /* USER CODE END LmHandlerGetAppSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppSKey_2 */
+
+  /* USER CODE END LmHandlerGetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppSKey_1 */
+
+  /* USER CODE END LmHandlerSetAppSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppSKey_2 */
+
+  /* USER CODE END LmHandlerSetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNetworkID(uint32_t *networkId)
 {
   /* USER CODE BEGIN LmHandlerGetNetworkID_1 */
 
@@ -518,13 +843,13 @@ int32_t LmHandlerGetNetworkID(uint32_t *networkId)
   *networkId = (aLoraMbWrapShareBuffer[3] << 24) | (aLoraMbWrapShareBuffer[2] << 16) | (aLoraMbWrapShareBuffer[1] << 8) | aLoraMbWrapShareBuffer[0];
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetNetworkID_2 */
 
   /* USER CODE END LmHandlerGetNetworkID_2 */
 }
 
-int32_t LmHandlerSetNetworkID(uint32_t networkId)
+LmHandlerErrorStatus_t LmHandlerSetNetworkID(uint32_t networkId)
 {
   /* USER CODE BEGIN LmHandlerSetNetworkID_1 */
 
@@ -545,13 +870,13 @@ int32_t LmHandlerSetNetworkID(uint32_t networkId)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetNetworkID_2 */
 
   /* USER CODE END LmHandlerSetNetworkID_2 */
 }
 
-int32_t LmHandlerGetDevAddr(uint32_t *devAddr)
+LmHandlerErrorStatus_t LmHandlerGetDevAddr(uint32_t *devAddr)
 {
   /* USER CODE BEGIN LmHandlerGetDevAddr_1 */
 
@@ -581,13 +906,13 @@ int32_t LmHandlerGetDevAddr(uint32_t *devAddr)
   UTIL_MEM_cpy_8(devAddr, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDevAddr_2 */
 
   /* USER CODE END LmHandlerGetDevAddr_2 */
 }
 
-int32_t LmHandlerSetDevAddr(uint32_t devAddr)
+LmHandlerErrorStatus_t LmHandlerSetDevAddr(uint32_t devAddr)
 {
   /* USER CODE BEGIN LmHandlerSetDevAddr_1 */
 
@@ -608,13 +933,13 @@ int32_t LmHandlerSetDevAddr(uint32_t devAddr)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDevAddr_2 */
 
   /* USER CODE END LmHandlerSetDevAddr_2 */
 }
 
-int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
+LmHandlerErrorStatus_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
 {
   /* USER CODE BEGIN LmHandlerGetActiveRegion_1 */
 
@@ -644,13 +969,13 @@ int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
   UTIL_MEM_cpy_8(region, aLoraMbWrapShareBuffer, sizeof(LoRaMacRegion_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetActiveRegion_2 */
 
   /* USER CODE END LmHandlerGetActiveRegion_2 */
 }
 
-int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
+LmHandlerErrorStatus_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
 {
   /* USER CODE BEGIN LmHandlerSetActiveRegion_1 */
 
@@ -674,13 +999,13 @@ int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetActiveRegion_2 */
 
   /* USER CODE END LmHandlerSetActiveRegion_2 */
 }
 
-int32_t LmHandlerGetAdrEnable(bool *adrEnable)
+LmHandlerErrorStatus_t LmHandlerGetAdrEnable(bool *adrEnable)
 {
   /* USER CODE BEGIN LmHandlerGetAdrEnable_1 */
 
@@ -710,13 +1035,13 @@ int32_t LmHandlerGetAdrEnable(bool *adrEnable)
   UTIL_MEM_cpy_8(adrEnable, aLoraMbWrapShareBuffer, sizeof(bool));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetAdrEnable_2 */
 
   /* USER CODE END LmHandlerGetAdrEnable_2 */
 }
 
-int32_t LmHandlerSetAdrEnable(bool adrEnable)
+LmHandlerErrorStatus_t LmHandlerSetAdrEnable(bool adrEnable)
 {
   /* USER CODE BEGIN LmHandlerSetAdrEnable_1 */
 
@@ -737,13 +1062,13 @@ int32_t LmHandlerSetAdrEnable(bool adrEnable)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetAdrEnable_2 */
 
   /* USER CODE END LmHandlerSetAdrEnable_2 */
 }
 
-int32_t LmHandlerGetTxDatarate(int8_t *txDatarate)
+LmHandlerErrorStatus_t LmHandlerGetTxDatarate(int8_t *txDatarate)
 {
   /* USER CODE BEGIN LmHandlerGetTxDatarate_1 */
 
@@ -773,13 +1098,13 @@ int32_t LmHandlerGetTxDatarate(int8_t *txDatarate)
   UTIL_MEM_cpy_8(txDatarate, aLoraMbWrapShareBuffer, sizeof(int8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetTxDatarate_2 */
 
   /* USER CODE END LmHandlerGetTxDatarate_2 */
 }
 
-int32_t LmHandlerSetTxDatarate(int8_t txDatarate)
+LmHandlerErrorStatus_t LmHandlerSetTxDatarate(int8_t txDatarate)
 {
   /* USER CODE BEGIN LmHandlerSetTxDatarate_1 */
 
@@ -800,13 +1125,13 @@ int32_t LmHandlerSetTxDatarate(int8_t txDatarate)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetTxDatarate_2 */
 
   /* USER CODE END LmHandlerSetTxDatarate_2 */
 }
 
-int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
+LmHandlerErrorStatus_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
 {
   /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_1 */
 
@@ -836,13 +1161,13 @@ int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
   UTIL_MEM_cpy_8(dutyCycleEnable, aLoraMbWrapShareBuffer, sizeof(bool));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_2 */
 
   /* USER CODE END LmHandlerGetDutyCycleEnable_2 */
 }
 
-int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
+LmHandlerErrorStatus_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
 {
   /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_1 */
 
@@ -863,13 +1188,13 @@ int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_2 */
 
   /* USER CODE END LmHandlerSetDutyCycleEnable_2 */
 }
 
-int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
+LmHandlerErrorStatus_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
 {
   /* USER CODE BEGIN LmHandlerGetRX2Params_1 */
 
@@ -899,13 +1224,13 @@ int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
   UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRX2Params_2 */
 
   /* USER CODE END LmHandlerGetRX2Params_2 */
 }
 
-int32_t LmHandlerGetTxPower(int8_t *txPower)
+LmHandlerErrorStatus_t LmHandlerGetTxPower(int8_t *txPower)
 {
   /* USER CODE BEGIN LmHandlerGetTxPower_1 */
 
@@ -935,13 +1260,13 @@ int32_t LmHandlerGetTxPower(int8_t *txPower)
   UTIL_MEM_cpy_8(txPower, aLoraMbWrapShareBuffer, sizeof(int8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetTxPower_2 */
 
   /* USER CODE END LmHandlerGetTxPower_2 */
 }
 
-int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetRx1Delay_1 */
 
@@ -971,13 +1296,13 @@ int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRx1Delay_2 */
 
   /* USER CODE END LmHandlerGetRx1Delay_2 */
 }
 
-int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetRx2Delay_1 */
 
@@ -1007,13 +1332,13 @@ int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRx2Delay_2 */
 
   /* USER CODE END LmHandlerGetRx2Delay_2 */
 }
 
-int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_1 */
 
@@ -1043,13 +1368,13 @@ int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_2 */
 
   /* USER CODE END LmHandlerGetJoinRx1Delay_2 */
 }
 
-int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_1 */
 
@@ -1079,13 +1404,13 @@ int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_2 */
 
   /* USER CODE END LmHandlerGetJoinRx2Delay_2 */
 }
 
-int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
+LmHandlerErrorStatus_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
 {
   /* USER CODE BEGIN LmHandlerSetRX2Params_1 */
 
@@ -1115,13 +1440,13 @@ int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
   UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRX2Params_2 */
 
   /* USER CODE END LmHandlerSetRX2Params_2 */
 }
 
-int32_t LmHandlerSetTxPower(int8_t txPower)
+LmHandlerErrorStatus_t LmHandlerSetTxPower(int8_t txPower)
 {
   /* USER CODE BEGIN LmHandlerSetTxPower_1 */
 
@@ -1142,13 +1467,13 @@ int32_t LmHandlerSetTxPower(int8_t txPower)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetTxPower_2 */
 
   /* USER CODE END LmHandlerSetTxPower_2 */
 }
 
-int32_t LmHandlerSetRx1Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetRx1Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetRx1Delay_1 */
 
@@ -1169,13 +1494,13 @@ int32_t LmHandlerSetRx1Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRx1Delay_2 */
 
   /* USER CODE END LmHandlerSetRx1Delay_2 */
 }
 
-int32_t LmHandlerSetRx2Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetRx2Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetRx2Delay_1 */
 
@@ -1196,13 +1521,13 @@ int32_t LmHandlerSetRx2Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRx2Delay_2 */
 
   /* USER CODE END LmHandlerSetRx2Delay_2 */
 }
 
-int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_1 */
 
@@ -1223,13 +1548,13 @@ int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_2 */
 
   /* USER CODE END LmHandlerSetJoinRx1Delay_2 */
 }
 
-int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_1 */
 
@@ -1250,13 +1575,13 @@ int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_2 */
 
   /* USER CODE END LmHandlerSetJoinRx2Delay_2 */
 }
 
-int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
+LmHandlerErrorStatus_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
 {
   /* USER CODE BEGIN LmHandlerGetPingPeriodicity_1 */
 
@@ -1286,13 +1611,13 @@ int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
   UTIL_MEM_cpy_8(pingPeriodicity, aLoraMbWrapShareBuffer, sizeof(uint8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetPingPeriodicity_2 */
 
   /* USER CODE END LmHandlerGetPingPeriodicity_2 */
 }
 
-int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
+LmHandlerErrorStatus_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
 {
   /* USER CODE BEGIN LmHandlerSetPingPeriodicity_1 */
 
@@ -1313,13 +1638,13 @@ int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetPingPeriodicity_2 */
 
   /* USER CODE END LmHandlerSetPingPeriodicity_2 */
 }
 
-int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
+LmHandlerErrorStatus_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
 {
   /* USER CODE BEGIN LmHandlerGetBeaconState_1 */
 
@@ -1349,12 +1674,56 @@ int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
   UTIL_MEM_cpy_8(beaconState, aLoraMbWrapShareBuffer, sizeof(BeaconState_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetBeaconState_2 */
 
   /* USER CODE END LmHandlerGetBeaconState_2 */
 }
 
+LmHandlerErrorStatus_t LmHandlerLinkCheckReq(void)
+{
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_1 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_LINK_CHECK_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_2 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerDeviceTimeReq(void)
+{
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_1 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_DEVICE_TIME_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_2 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_2 */
+}
+
 void LoraInfo_Init(void)
 {
   /* USER CODE BEGIN LoraInfo_Init_1 */
@@ -1389,18 +1758,13 @@ LoraInfo_t *LoraInfo_GetPtr(void)
   /* USER CODE END LoraInfo_GetPtr_2 */
 }
 
-/**
-  * @brief This function processes the callbacks and primitives from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Lora_Notif_1 */
 
   /* USER CODE END Process_Lora_Notif_1 */
   uint32_t *com_buffer = ComObj->ParamBuf;
-  uint32_t    cb_ret;
+  uint32_t cb_ret = 0;
 
   /* Lora Notif received */
   APP_LOG(TS_ON, VLEVEL_H, "CM4<(LoRa)\r\n");
@@ -1416,7 +1780,7 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -1430,13 +1794,33 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal =  cb_ret; /* */
       break;
 
+    case LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNvmDataChange != NULL)
+      {
+        callback_mbwrapper.OnNvmDataChange((LmHandlerNvmContextStates_t) com_buffer[0], (uint16_t) com_buffer[1]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNetworkParametersChange != NULL)
+      {
+        callback_mbwrapper.OnNetworkParametersChange((CommissioningParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
     case LMHANDLER_ON_JOIN_REQ_CB_ID:
       if (callback_mbwrapper.OnJoinRequest != NULL)
       {
@@ -1466,6 +1850,36 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal =  0; /* */
       break;
+
+    case LMHANDLER_ON_CLASS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnClassChange != NULL)
+      {
+        callback_mbwrapper.OnClassChange((DeviceClass_t) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnBeaconStatusChange != NULL)
+      {
+        callback_mbwrapper.OnBeaconStatusChange((LmHandlerBeaconParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID:
+      if (callback_mbwrapper.OnSysTimeUpdate != NULL)
+      {
+        callback_mbwrapper.OnSysTimeUpdate();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
     default:
       break;
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
index 82ac862c..1218ce87 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LMHANDLER_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM0+
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Lora_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.c
index 76152897..8328a537 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -58,11 +61,44 @@ static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -70,11 +106,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -107,11 +138,6 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief The application informs MBMUX about the CM0PLUS supported feature list
-  * @param p_CM0PLUS_FeatureList  pointer to the list of CM0PLUS features
-  * @retval  none
-  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
 {
   /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
@@ -123,15 +149,6 @@ void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
   /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval   channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
 {
   int8_t check_if_feature_provided_by_cm0plus = 0;
@@ -203,13 +220,6 @@ int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -235,9 +245,9 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
     }
     else
     {
-      /* Make sure to clear pending IRQ Notification before unregistering the callback */
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
       /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
-      /* if the mask is removed by anyone, the unwhished IRQ is generated if SR isn't cleaned */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
       IPCC_IF_AcknowledgeSnd(mb_ch);
 
       p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
@@ -254,12 +264,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the MailBox com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -286,11 +290,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Cmd to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_CommandSnd_1 */
@@ -309,11 +308,6 @@ int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_CommandSnd_Last */
 }
 
-/**
-  * @brief Send ack to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
@@ -333,12 +327,6 @@ uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Check if the FEATURE is in the CM0 table and return it's position
-  * @param e_featID  identifier of the feature
-  * @retval 0 not present, 1 present
-  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
 {
   int8_t ret = 0;
@@ -370,11 +358,6 @@ static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_feat
   return ret;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
@@ -390,11 +373,6 @@ static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
@@ -410,11 +388,6 @@ static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Find the first channel not yet associated to a feature (available)
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means no channel available
-  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
@@ -475,12 +448,6 @@ static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
   /* USER CODE END MBMUX_FindChStillUnregistered_Last */
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -492,17 +459,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.h
index fd31da65..a15773f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM4_H__
@@ -52,23 +54,60 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
-                             void (*MsgCm4Cb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
-
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 1b866fbe..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmuxif_sys.h"
-#include "stm32_mem.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aKmsCmdRespBuff[MAX_PARAM_OF_KMS_CMD_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers KMS feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeature(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsRespRcvCb, aKmsCmdRespBuff, sizeof(aKmsCmdRespBuff));
-  if (ret >= 0)
-  {
-    /* Note: Kms uses only NOTIF_ACK channel, the SEQ_TASK only on CM0PLUS */
-
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_KMS_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Kms feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void)
-{
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP);
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  if (com_param_ptr == NULL)
-  {
-    Error_Handler(); /* ErrorHandler() : feature isn't registered */
-  }
-
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-  return com_param_ptr;
-}
-
-/**
-  * @brief Sends a Kms-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendCmd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_1 */
-  if (MBMUX_CommandSnd(FEAT_INFO_KMS_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS response callbacks: set event to release waiting task
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.h
deleted file mode 100644
index cfc715c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM4_H__
-#define __MBMUXIF_KMS_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void);
-void MBMUXIF_KmsSendCmd(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.c
index 7d490cb2..85c7237c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle LoraWAN via MBMUX
+  * @brief   allows CM4 application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -56,7 +58,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *LoraComObj;
 
+/**
+  * @brief LoRa cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraCmdRespBuff[MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief LoRa notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -64,8 +73,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LOR
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the notification
+  */
 static void MBMUXIF_TaskLoraNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -73,16 +95,6 @@ static void MBMUXIF_TaskLoraNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers LORA feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_LoraInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_system_info;
@@ -129,11 +141,6 @@ int8_t MBMUXIF_LoraInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Lora feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_1 */
@@ -142,7 +149,7 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_Last */
@@ -150,11 +157,6 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Lora-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendCmd_1 */
@@ -173,11 +175,6 @@ void MBMUXIF_LoraSendCmd(void)
   /* USER CODE END MBMUXIF_LoraSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Lora-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendAck_1 */
@@ -197,11 +194,6 @@ void MBMUXIF_LoraSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  LORA response callbacks: set event to release waiting task
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_1 */
@@ -213,11 +205,6 @@ static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_Last */
 }
 
-/**
-  * @brief  LORA notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_1 */
@@ -230,11 +217,6 @@ static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_Last */
 }
 
-/**
-  * @brief  LORA task to process the notification
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskLoraNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.h
index c7911ad1..ff6c5791 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.h
   * @author  MCD Application Team
-  * @brief   API provided to CM4 applic to register and handle LoraWAN via MBMUX
+  * @brief   API provided to CM4 application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_LORA_CM4_H__
@@ -52,9 +54,30 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_LoraSendCmd(void);
+
+/**
+  * @brief   Sends a Lora-Ack via Ipcc without waiting for the ack
+  */
 void MBMUXIF_LoraSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c
index 26d69db0..81fc561a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -55,7 +57,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *RadioComObj;
 
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -63,8 +72,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RA
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
 static void MBMUXIF_TaskRadioNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -72,16 +94,6 @@ static void MBMUXIF_TaskRadioNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers RADIO feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
@@ -125,11 +137,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
@@ -138,7 +145,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
@@ -146,11 +153,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
@@ -169,11 +171,6 @@ void MBMUXIF_RadioSendCmd(void)
   /* USER CODE END MBMUXIF_RadioSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Radio-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
@@ -193,11 +190,6 @@ void MBMUXIF_RadioSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO response callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
@@ -209,11 +201,6 @@ static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
@@ -226,11 +213,6 @@ static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the notification
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h
index 1f4c2454..3d565fcd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM4_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_RadioSendAck(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c
index c937c14c..1884bb44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -53,10 +55,10 @@
 
 /* Private variables ---------------------------------------------------------*/
 static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
-static __IO uint8_t AllowSeqencerForSysCmd = 0;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
 static __IO uint8_t MbSystemRespRcvFlag;
 
-UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(4) ;
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
 
 MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
 MBMUX_ComParam_t *SystemComObj;
@@ -64,23 +66,54 @@ MBMUX_ComParam_t *SystemComObj;
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
 static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -88,47 +121,54 @@ static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
 
   /* USER CODE END MBMUXIF_SystemInit_1 */
 
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
   /* Get the Dual boot configuration status */
   HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
 
   if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
   {
-    APP_PPRINTF("\r\n WARNING: There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n",  (uint32_t) pMb_RefTable);
-    APP_PPRINTF(" and the address calculated according to the IPCCDBA option byte: 0x%X \r\n", OptionsBytesStruct.IPCCdataBufAddr);
-    APP_PPRINTF(" The execution enters now in a while(1){}  \r\n");
-    APP_PPRINTF(" please check the CM4\\MbMux\\mbmuxif_sys.c or update the scatter file \r\n\r\n");
-
-    /* USER CODE BEGIN MBMUXIF_SystemInit_Prevent_OB_Programming */
-      /* If you are sure you need to reprogram the IPCCDBA set #if to 0 (to avoid while(1){}) */
-      /* Please first check the  CM4 scatter file.*/
-      /* Make sure that the MAPPING_TABLE is placed in SRAM2 (memory with retention) */
-      /* Examples of scatter files available in the LoraWAN and Sigfox DualCore Applications pack*/
-      /* */
-      /* After HAL_FLASH_OB_Launch you will have to unplug and plug the board from power after this operation.*/
-      /* Additionally possible Issue under investigation, i.e.: */
-      /* In some cases happen that unplugging the chip power is not sufficient */
-      /* if so you need to reboot from RAM putting the BOOT0 pin to 3v3 */
-      /* attach with Cube Programmer and full erase the chip memory. */
-      /* */
-      /* PS: of course if you are attached with the debugger, it will not respond anymore after HAL_FLASH_OB_Launch*/
-#if 1
-    /* USER CODE END MBMUXIF_SystemInit_Prevent_OB_Programming */
-    while(1){}
-#else
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
 
     /* write FLASH->IPCCBR option byte */
     /* Unlock the Flash to enable the flash control register access *************/
@@ -140,7 +180,7 @@ int8_t MBMUXIF_SystemInit(void)
     HAL_FLASH_OB_Unlock();
 
     /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
-    OptionsBytesStruct.OptionType  = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
     OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
 
     if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
@@ -170,10 +210,8 @@ int8_t MBMUXIF_SystemInit(void)
     (void) HAL_FLASH_OB_Lock();
     /* Lock the Flash to disable the flash control register access  *********/
     (void) HAL_FLASH_Lock();
-#endif
   }
-  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
-
+  /* Init MailBoxMultiplexer */
   MBMUX_Init(pMb_RefTable);
 
   ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
@@ -186,16 +224,13 @@ int8_t MBMUXIF_SystemInit(void)
     ret = 0;
     UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
   }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
 
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
   /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
   /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-#else
-#warning "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_ON */
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
 
@@ -203,14 +238,9 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
-  int8_t ret=0;
+  int8_t ret = 0;
 
   /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
 
@@ -259,14 +289,6 @@ int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
   return ret;
 }
 
-/**
-  * @brief Set synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
 {
   pMb_RefTable->SynchronizeCpusAtBoot = flag;
@@ -275,26 +297,16 @@ void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
   /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
 }
 
-/**
-  * @brief gives green light to Cm0 to Initialised MBMUX on its side
-  * @param none
-  * @retval  none
-  */
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void)
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
 {
   while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
   {
   }
-  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
 
-  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
@@ -303,30 +315,19 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPr
   /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
 }
 
-/**
-  * @brief To allow SystemCmd to use the sequencer (hence entering in low power)
-  * @note  For compatib with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The applic can call this API at the end of the Init
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void)
 {
-  AllowSeqencerForSysCmd = 1;
+  AllowSequencerForSysCmd = 1;
   /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
 
   /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
 }
 
-/**
-  * @brief Sends a System-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
@@ -339,7 +340,7 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
     MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
     if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
     {
-      if (AllowSeqencerForSysCmd)
+      if (AllowSequencerForSysCmd)
       {
         UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
       }
@@ -356,20 +357,15 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
 
-  /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
 
   /* USER CODE END MBMUXIF_SystemSendCmd_Last */
 }
 
-/**
-  * @brief Sends a System-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
@@ -384,17 +380,11 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendAck_Last */
 }
 
-/* USER CODE BEGIN ExpoF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExpoF */
+/* USER CODE END EF */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief   Gets the pointer to CM0PLUS capabilities info table
-  * @param   none
-  * @retval  pointer to CM0PLUS capabilities info table
-  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
 {
   MBMUX_ComParam_t *com_obj;
@@ -421,14 +411,9 @@ FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
   return (FEAT_INFO_List_t *) ret;   /* need to verify */
 }
 
-/**
-  * @brief returns the pointer to the Capability Info table of a given feature
-  * @param e_featID ID of the feature from which retrieve the ptr
-  * @retval  LoRaMacInfoTable pointer
-  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
 {
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list = NULL;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
   FEAT_INFO_Param_t  *p_feature = NULL;
   uint8_t i;
   uint8_t cm0plus_nr_of_supported_features;
@@ -438,15 +423,15 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
 
   /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
 
-  if (p_cm0plus_supprted_features_list != NULL)
+  if (p_cm0plus_supported_features_list != NULL)
   {
-    cm0plus_nr_of_supported_features = p_cm0plus_supprted_features_list->Feat_Info_Cnt;
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
 
     for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
     {
-      p_feature = i + p_cm0plus_supprted_features_list->Feat_Info_TableAddress;
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
       if (p_feature->Feat_Info_Feature_Id == e_featID)
       {
         found = 1;
@@ -466,12 +451,6 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
   return  p_feature;
 }
 
-/**
-  * @brief Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @retval   0 ok, else error code
-  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 {
   MBMUX_ComParam_t *com_obj;
@@ -506,11 +485,6 @@ int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM response callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
@@ -519,7 +493,7 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 
   /* During "SystemInit sequence" Flag is used instead of Sequencer */
   MbSystemRespRcvFlag = 1;
-  if (AllowSeqencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
   {
     UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
   }
@@ -528,11 +502,6 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
@@ -545,11 +514,6 @@ static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM task to process the notification
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
@@ -561,11 +525,6 @@ static void MBMUXIF_TaskSystemNotifRcv(void)
   /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
@@ -573,11 +532,6 @@ static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
@@ -591,11 +545,6 @@ static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
@@ -603,11 +552,6 @@ static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h
index d6f9cc5c..61f37d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM4_H__
@@ -55,13 +57,56 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -69,8 +114,24 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c
index b42f9402..c91551a5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to receive by CM0 TRACE via MBMUX
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -46,25 +48,26 @@
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
-
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
 /* USER CODE BEGIN PM */
 
 /* USER CODE END PM */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_TraceInit(void)
 {
   int8_t ret;
@@ -90,23 +93,18 @@ int8_t MBMUXIF_TraceInit(void)
   return ret;
 }
 
-/**
-  * @brief Sends a Trace-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendAck(void)
 {
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
 
-/* USER CODE END MBMUXIF_TraceSendAck_1 */
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
   if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
   {
     Error_Handler();
   }
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
 
-/* USER CODE END MBMUXIF_TraceSendAck_Last */
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
 }
 
 /* USER CODE BEGIN EFD */
@@ -114,16 +112,11 @@ void MBMUXIF_TraceSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 {
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
   MBMUX_ComParam_t *TraceComObj;
   uint32_t  notif_ack_id;
   uint8_t *buffer;
@@ -151,9 +144,9 @@ static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 
   /* Send ack */
   MBMUXIF_TraceSendAck();
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
 }
 
 /* USER CODE BEGIN PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h
index 7a8d3fa7..f98a156d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle TRACE via MBMUX
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM4_H__
@@ -52,7 +54,15 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c
index 1326f87b..fd0e305e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "radio_mbwrapper.h"
@@ -72,38 +75,38 @@ static void RadioIrqProcess(void);
 /*!
  * \brief Initializes the radio
  *
- * \param [IN] events Structure containing the driver callback functions
+ * \param[in] events Structure containing the driver callback functions
  */
 static void RadioInit(RadioEvents_t *events);
 
 /*!
  * Return current radio status
  *
- * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
  */
 static RadioState_t RadioGetStatus(void);
 
 /*!
  * \brief Configures the radio with the given modem
  *
- * \param [IN] modem Modem to be used [0: FSK, 1: LoRa]
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
  */
 static void RadioSetModem(RadioModems_t modem);
 
 /*!
  * \brief Sets the channel frequency
  *
- * \param [IN] freq         Channel RF frequency
+ * \param[in] freq Channel RF frequency
  */
 static void RadioSetChannel(uint32_t freq);
 
 /*!
   * \brief Checks if the channel is free for the given time
   *
-  * \param [IN] freq                Channel RF frequency in Hertz
-  * \param [IN] rxBandwidth         Rx bandwidth in Hertz
-  * \param [IN] rssiThresh          RSSI threshold in dBm
-  * \param [IN] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
   *
   * \retval isFree         [true: Channel is free, false: Channel is not free]
   */
@@ -125,40 +128,40 @@ static uint32_t RadioRandom(void);
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: N/A ( set to 0 )
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [false: single mode, true: continuous mode]
  */
 static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
@@ -172,37 +175,37 @@ static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] fdev         Sets the frequency deviation (FSK only)
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
  *                          FSK : [Hz]
  *                          LoRa: 0
- * \param [IN] bandwidth    Sets the bandwidth (LoRa only)
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
  *                          FSK : 0
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the preamble length
+ * \param[in] preambleLen  Sets the preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] crcOn        Enables disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] timeout      Transmission timeout [ms]
  */
 static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
                              uint32_t bandwidth, uint32_t datarate,
@@ -213,7 +216,7 @@ static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
 /*!
  * \brief Checks if the given RF frequency is supported by the hardware
  *
- * \param [IN] frequency RF frequency to be checked
+ * \param[in] frequency RF frequency to be checked
  * \retval isSupported [true: supported, false: unsupported]
  */
 static bool RadioCheckRfFrequency(uint32_t frequency);
@@ -221,26 +224,26 @@ static bool RadioCheckRfFrequency(uint32_t frequency);
 /*!
  * \brief Computes the packet time on air in ms for the given payload
  *
- * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] spreadingFactor  Sets the Spreading Factor
+ * \param[in] spreadingFactor  Sets the Spreading Factor
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
  *
  * \retval airTime        Computed airTime (ms) for the given packet payload length
  */
@@ -253,8 +256,8 @@ static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
  * \brief Sends the buffer of size. Prepares the packet to be sent and sets
  *        the radio in transmission
  *
- * \param [IN]: buffer     Buffer pointer
- * \param [IN]: size       Buffer size
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
  */
 static void RadioSend(uint8_t *buffer, uint8_t size);
 
@@ -270,7 +273,7 @@ static void RadioStandby(void);
 
 /*!
  * \brief Sets the radio in reception mode for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRx(uint32_t timeout);
@@ -283,15 +286,17 @@ static void RadioStartCad(void);
 /*!
  * \brief Sets the radio in continuous wave transmission mode
  *
- * \param [IN]: freq       Channel RF frequency
- * \param [IN]: power      Sets the output power [dBm]
- * \param [IN]: time       Transmission mode timeout [s]
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
  */
 static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
 
 /*!
  * \brief Reads the current RSSI value
  *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
  * \retval rssiValue Current RSSI value in [dBm]
  */
 static int16_t RadioRssi(RadioModems_t modem);
@@ -299,15 +304,15 @@ static int16_t RadioRssi(RadioModems_t modem);
 /*!
  * \brief Writes the radio register at the specified address
  *
- * \param [IN]: addr Register address
- * \param [IN]: data New register value
+ * \param[in] addr Register address
+ * \param[in] data New register value
  */
 static void RadioWrite(uint16_t addr, uint8_t data);
 
 /*!
  * \brief Reads the radio register at the specified address
  *
- * \param [IN]: addr Register address
+ * \param[in] addr Register address
  * \retval data Register value
  */
 static uint8_t RadioRead(uint16_t addr);
@@ -315,26 +320,26 @@ static uint8_t RadioRead(uint16_t addr);
 /*!
  * \brief Writes multiple radio registers starting at address
  *
- * \param [IN] addr   First Radio register address
- * \param [IN] buffer Buffer containing the new register's values
- * \param [IN] size   Number of registers to be written
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
  */
 static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Reads multiple radio registers starting at address
  *
- * \param [IN] addr First Radio register address
- * \param [OUT] buffer Buffer where to copy the registers data
- * \param [IN] size Number of registers to be read
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
  */
 static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Sets the maximum payload length.
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] max        Maximum payload length in bytes
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
  */
 static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
 
@@ -343,7 +348,7 @@ static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
  *
  * \remark Applies to LoRa modem only
  *
- * \param [IN] enable if true, it enables a public network
+ * \param[in] enable if true, it enables a public network
  */
 static void RadioSetPublicNetwork(bool enable);
 
@@ -356,7 +361,7 @@ static uint32_t RadioGetWakeUpTime(void);
 
 /*!
  * \brief Sets the radio in reception mode with Max LNA gain for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRxBoosted(uint32_t timeout);
@@ -364,51 +369,49 @@ static void RadioRxBoosted(uint32_t timeout);
 /*!
  * \brief Sets the Rx duty cycle management parameters
  *
- * \param [in]  rxTime        Structure describing reception timeout value
- * \param [in]  sleepTime     Structure describing sleep timeout value
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
  */
 static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
 
 /*!
  * \brief Set Tx PRBS modulated wave
- * \retval none
  */
 static void RadioTxPrbs(void);
 
 /*!
  * \brief Set Tx continuous wave
- * \param [in]  power  Tx power level [0..15]
- * \retval none
+ * \param[in]  power  Tx power level [0..15]
  */
 static void RadioTxCw(int8_t power);
 
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [0: single mode, otherwise continuous mode]
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
  * \return 0 when no parameters error, -1 otherwise
  */
-static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t* config,
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
                                        uint32_t rxContinuous, uint32_t symbTimeout);
 
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
                             bpsk field to be used if modem =GENERIC_BPSK
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
  * \return 0 when no parameters error, -1 otherwise
  */
 static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
@@ -461,11 +464,6 @@ const struct Radio_s Radio =
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief This function processes the radio events callbacks  from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Radio_Notif_1 */
@@ -486,7 +484,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -500,7 +498,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -564,7 +562,7 @@ static void RadioInit(RadioEvents_t *events)
 
   if (events == NULL)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   radioevents_wrap.TxDone = events->TxDone;
@@ -590,7 +588,7 @@ static void RadioInit(RadioEvents_t *events)
 /*!
   * Return current radio status
   *
-  * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
   */
 static RadioState_t RadioGetStatus(void)
 {
@@ -999,7 +997,7 @@ static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
   uint16_t i = 0;
 
   com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_CONTINOUS_WAVE_ID;
+  com_obj->MsgId = RADIO_SET_TX_CONTINUOUS_WAVE_ID;
   com_buffer = com_obj->ParamBuf;
   com_buffer[i++] = (uint32_t) freq;
   com_buffer[i++] = (uint32_t) power;
@@ -1424,10 +1422,4 @@ static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t
 
 /* USER CODE END PrFD */
 
-/**
-  * @}
-  *
-  */
-
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h
index f73a1283..e7eebe2c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/board_resources.h
deleted file mode 100644
index 8cf7f3ed..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/board_resources.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON1_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON3_EXTI_IRQn              EXTI15_4_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
index 0390fb82..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     10U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/features_info.h
index f03a3e85..692c3088 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/features_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/features_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTEM_INFO_H
@@ -36,7 +38,7 @@ extern "C" {
 /**
   * @brief Feature enumeration
   * @note This is the list of all available feature so far,
-          the one available in a fiven build are listed in the Feat_Info_Table[]
+          the one available in a given build are listed in the Feat_Info_Table[]
           to keep compatibility, in order to add a feature
           use a new value to the bottom without changing the existing order
   */
@@ -115,7 +117,6 @@ typedef struct
 /* Exported functions ------------------------------------------------------- */
 /**
   * @brief  Init configuration params by calling specific feature xxx_info.c
-  * @return void
   */
 void FEAT_INFO_Init(void);
 /**
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/lora_info.h
index 92abccde..0608fd34 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/lora_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/lora_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #ifndef __LORA_INFO_H__
 #define __LORA_INFO_H__
 
@@ -68,15 +71,12 @@ typedef struct
 
 /* Exported functions ------------------------------------------------------- */
 /**
-  * @brief initialises the LoraInfo table
-  * @param none
-  * @retval  none
+  * @brief initialize the LoraInfo table
   */
 void LoraInfo_Init(void);
 
 /**
   * @brief returns the pointer to the LoraInfo capabilities table
-  * @param none
   * @retval LoraInfo pointer
   */
 LoraInfo_t *LoraInfo_GetPtr(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/mbmux_table.h
index 2874d9de..84cb7539 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/mbmux_table.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/mbmux_table.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux_table.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_TABLE_H__
@@ -48,12 +50,14 @@ typedef enum
   MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
 } MBMUX_ComType_t;
 
+/* Shared memory tables */
+
 typedef struct
 {
   uint32_t MsgId;
   void (*MsgCm4Cb)(void *ComObj);
-  void (*MsgCm0plusCb)(void *ComObj);
-  uint16_t BufSize;      /*!<  size of the array given by the applic */
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
   uint16_t ParamCnt;     /*!<  nr of words composing the message */
   uint32_t *ParamBuf;
   uint32_t ReturnVal;    /*!<  only used in RX */
@@ -66,7 +70,19 @@ typedef struct
   uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
   __IO uint16_t           SynchronizeCpusAtBoot;
   uint16_t                ChipRevId;
-} MBMUX_ComTable_t;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
 
 /* USER CODE BEGIN ET */
 
@@ -87,3 +103,5 @@ typedef struct
 #endif
 
 #endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/msg_id.h
index 74a0a3cc..b1050113 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/msg_id.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/MbMux/msg_id.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    msg_id.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MSG_ID_H__
@@ -62,6 +64,14 @@ typedef enum
   LMHANDLER_SET_DEVEUI_ID,
   LMHANDLER_GET_APPEUI_ID,
   LMHANDLER_SET_APPEUI_ID,
+  LMHANDLER_GET_NWKKEY_ID,
+  LMHANDLER_SET_NWKKEY_ID,
+  LMHANDLER_GET_APPKEY_ID,
+  LMHANDLER_SET_APPKEY_ID,
+  LMHANDLER_GET_NWKSKEY_ID,
+  LMHANDLER_SET_NWKSKEY_ID,
+  LMHANDLER_GET_APPSKEY_ID,
+  LMHANDLER_SET_APPSKEY_ID,
   LMHANDLER_GET_NWKID_ID,
   LMHANDLER_SET_NWKID_ID,
   LMHANDLER_GET_DEVADDR_ID,
@@ -89,14 +99,21 @@ typedef enum
   LMHANDLER_GET_PING_PERIODICITY_ID,
   LMHANDLER_SET_PING_PERIODICITY_ID,
   LMHANDLER_GET_BEACON_STATE_ID,
+  LMHANDLER_LINK_CHECK_REQ_ID,
+  LMHANDLER_DEVICE_TIME_REQ_ID,
 
   LMHANDLER_INFO_INIT_ID,
   /* NotifAck */
   LMHANDLER_GET_BATTERY_LEVEL_CB_ID,
   LMHANDLER_GET_TEMPERATURE_CB_ID,
+  LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID,
+  LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID,
   LMHANDLER_ON_JOIN_REQ_CB_ID,
   LMHANDLER_ON_TX_DATA_CB_ID,
   LMHANDLER_ON_RX_DATA_CB_ID,
+  LMHANDLER_ON_CLASS_CHANGE_CB_ID,
+  LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID,
+  LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID,
   LMHANDLER_ON_MAC_PROCESS_CB_ID,
   /* USER CODE BEGIN LORA_MsgIdTypeDef */
 
@@ -122,7 +139,7 @@ typedef enum
   RADIO_STANDBY_ID,
   RADIO_RX_ID,
   RADIO_START_CAD_ID,
-  RADIO_SET_TX_CONTINOUS_WAVE_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
   RADIO_RSSI_ID,
   RADIO_WRITE_ID,
   RADIO_READ_ID,
@@ -216,3 +233,5 @@ typedef enum
 #endif
 
 #endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.c
index 807e1bb4..d01a65d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.c
@@ -41,9 +41,6 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
-#define DBGMCU_LPM   0   /* if 1 enables/disables the Debug Module during LowPower modes */
-                         /* if 0 it does not modify the DBGMCU_CR_DBG registers */
-                         /* in DualCore few issues are under investigation when 1 */
 
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
@@ -62,12 +59,90 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
   GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
@@ -75,57 +150,49 @@ void DBG_Init(void)
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  /* make sure a pin is not used simultaneusly by the two cores */
-  /* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
 #if defined(CORE_CM4)
 
   /* Enable the GPIO_LINES Clock */
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
 
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+#else /* CORE_CM0PLUS */
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-#if defined (DBGMCU_LPM) && ( DBGMCU_LPM == 1 )
-  /* careful does not work correctly in dual core: Bugzilla 71087 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
-#elif defined (DBGMCU_LPM) && ( DBGMCU_LPM == 0 )
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
-#elif !defined (DBGMCU_LPM)
-#error "DBGMCU_LPM not defined or out of range <0,1>"
-#endif /* DBGMCU_LPM */
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
 
-#else /* CORE_CM0PLUS */
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
 
-  /* Enable the GPIO_LINES Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN ;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
+  /* HW alternate functions for monitoring RF */
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -143,7 +210,7 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /* LDO_rdy & BUCK_rdy */
+  /* LDO_rdy & BUCK_rdy (SMPS) */
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
   GPIO_InitStruct.Pull   = GPIO_NOPULL;
   GPIO_InitStruct.Pin    = (GPIO_PIN_2);
@@ -158,40 +225,29 @@ void DBG_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-#endif /* CORE_CM4 */
+#endif /* CORE_CM0PLUS */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#if defined(CORE_CM4)
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
 #endif /* CORE_CM4 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-  /* USER CODE END DBG_Init_Last */
+  /* USER CODE END DBG_ProbesInit_Last */
 }
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.h
index 162d992f..28890d05 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.h
@@ -43,94 +43,96 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/* make sure a pin is not used simultaneusly by the two cores */
-/* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
 #if defined(CORE_CM0PLUS)
-/**  Definition for Debug Line 1   **/
+
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 #else
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-#endif /* CORE_CM4 */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
 
 /* USER CODE BEGIN EC */
 
@@ -142,49 +144,66 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
 /**
-  * @brief Initializes the debug
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/Common/System/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.ewd
index cf1cb9ae..992eede7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.ewd
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.ewp
index a82f7f63..016b64a6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.ewp
@@ -226,6 +226,7 @@
                     <name>CCDefines</name>
                     <state>CORE_CM0PLUS</state>
                     <state>KMS_ENABLED</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                     <state>MBEDTLS_CONFIG_FILE="mbedtls_config.h"</state>
                 </option>
@@ -358,8 +359,9 @@
                     <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/Target</state>
                     <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
@@ -1068,48 +1070,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1117,68 +1077,119 @@
             </file>
         </group>
         <group>
-            <name>KMS</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>LoRaWAN</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
-                </file>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>KMS</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
             </group>
             <group>
-                <name>Target</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
-                </file>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
         </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>LoRaWAN_AT_Slave_DualCore_CM0PLUS</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
-            </file>
-        </group>
     </group>
     <group>
         <name>Doc</name>
@@ -1190,9 +1201,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_AT_Slave_DualCore_CM0PLUS</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1268,6 +1276,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1361,6 +1375,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_vm_storage.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\HAL\mac_stm32hal.c</name>
             </file>
@@ -1373,102 +1390,90 @@
         </group>
         <group>
             <name>LoRaWAN</name>
-            <group>
-                <name>Crypto</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
-                </file>
-            </group>
-            <group>
-                <name>LmHandler</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmCtxMgmt.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Mac</name>
-                <group>
-                    <name>Region</name>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
-                    </file>
-                </group>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Utilities</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
-                </file>
-            </group>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
+            </file>
         </group>
         <group>
             <name>mbed-crypto</name>
@@ -1490,6 +1495,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM4.ewd
index 9d1594f9..e0788305 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM4.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM4.ewd
@@ -184,7 +184,7 @@
                 </option>
                 <option>
                     <name>OCMulticoreMaster</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>OCMulticorePort</name>
@@ -192,15 +192,15 @@
                 </option>
                 <option>
                     <name>OCMulticoreWorkspace</name>
-                    <state>$PROJ_DIR$\Project.eww</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveProject</name>
-                    <state>LoRaWAN_AT_Slave_DualCore_CM0PLUS</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveConfiguration</name>
-                    <state>MBMUX_STM32WL_M0_FLASH</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCDownloadExtraImage</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM4.ewp
index 5f25f836..d2fae3ed 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM4.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/LoRaWAN_AT_Slave_DualCore_CM4.ewp
@@ -225,6 +225,7 @@
                 <option>
                     <name>CCDefines</name>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                 </option>
                 <option>
@@ -355,8 +356,9 @@
                     <state>$PROJ_DIR$/../CM4/LoRaWAN/Target</state>
                     <state>$PROJ_DIR$/../CM4/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
@@ -1019,7 +1021,7 @@
                 </option>
                 <option>
                     <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>LoRaWAN_AT_Slave_DualCore_CM4_import_lib.o</state>
+                    <state>###Unitialized###</state>
                 </option>
             </data>
         </settings>
@@ -1052,54 +1054,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1107,55 +1061,106 @@
             </file>
         </group>
         <group>
-            <name>LoRaWAN</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_at.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_command.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\test_rf.c</name>
-                </file>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_at.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_command.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\test_rf.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
-        </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>LoRaWAN_AT_Slave_DualCore_CM4</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
-            </file>
         </group>
     </group>
     <group>
@@ -1168,14 +1173,14 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_AT_Slave_DualCore_CM4</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
                     <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
                 </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
             </group>
         </group>
         <group>
@@ -1237,6 +1242,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
             </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
index a6cf0145..cd6560d5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
index 6f11cd34..3e66df44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -11,10 +11,10 @@ define symbol __ICFEDIT_region_ROM_end__      = 0x0803CFFF;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_start__   = 0x0803E500;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_end__     = 0x0803E7FF;
 /***** SRAM2 shared allocated by M0+ *****/
-define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x2000B000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000BFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20009000;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20009FFF;
 /***** SRAM2 dedicated to M0+ *****/
-define symbol __ICFEDIT_region_RAM2_start__   = 0x2000C000;
+define symbol __ICFEDIT_region_RAM2_start__   = 0x2000A000;
 define symbol __ICFEDIT_region_RAM2_end__     = 0x2000FFFF;
 
 /* KMS Data Storage (NVMS) region */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
index 6f32a5f9..b8551a3e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
@@ -13,7 +13,7 @@ define symbol __ICFEDIT_region_RAM_start__    = 0x20000000;
 define symbol __ICFEDIT_region_RAM_end__      = 0x20007FFF;
 /***** SRAM2 shared allocated by M4 *****/
 define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20008000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000AFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20008FFF;
 
 /*-Sizes-*/
 define symbol __ICFEDIT_size_cstack__ = 0x800;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/LoRaWAN_AT_Slave_DualCore.ioc b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/LoRaWAN_AT_Slave_DualCore.ioc
index a192a393..af332e88 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/LoRaWAN_AT_Slave_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/LoRaWAN_AT_Slave_DualCore.ioc
@@ -1,12 +1,12 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=NbrOfConversion,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
 ADC.SamplingTimeCommon2=ADC_SAMPLETIME_160CYCLES_5
 ADC.SelectedChannel=ADC_CHANNEL_TEMPSENSOR|ADC_CHANNEL_VREFINT
-CortexM0Plus.IPs=IPCC,LORAWAN,RCC,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,DMA,NVIC2\:I,RTC\:I,SUBGHZ\:I,ADV_TRACE,MISC,TIMER,TINY_LPM,KMS\:I,GTZC_S\:I,SEQUENCER_M0PLUS\:I
+CortexM0Plus.IPs=IPCC,LORAWAN,RCC,SUBGHZ_PHY,SYS_M0PLUS\:I,DMA,NVIC2\:I,RTC\:I,SUBGHZ\:I,ADV_TRACE,MISC,TIMER,TINY_LPM,KMS\:I,GTZC_S\:I,SEQUENCER_M0PLUS\:I,SIGFOX
 CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,DMA\:I,NVIC1\:I,ADC\:I,RTC,ADV_TRACE\:I,MISC\:I,TIMER\:I,TINY_LPM\:I,LPUART1\:I,GTZC_NS\:I,SEQUENCER_M4\:I
 Dma.LPUART1_TX.0.Channel_PRIV_NPRIV=DMA_CHANNEL_NPRIV_DISABLE
 Dma.LPUART1_TX.0.Direction=DMA_MEMORY_TO_PERIPH
@@ -29,8 +29,8 @@ Dma.LPUART1_TX.0.SyncSignalID=NONE
 Dma.Request0=LPUART1_TX
 Dma.RequestsNb=1
 File.Version=6
-GPIO.groupedBy=Group By Peripherals
-KMS.IPParameters=KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_CMAC,KMS_AES_GCM,KMS_MEM_LOGGING,KMS_NB_SESSIONS_MAX
+GPIO.groupedBy=
+KMS.IPParameters=KMS_NB_SESSIONS_MAX,KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_SEARCH,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_LOGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_GCM,KMS_AES_CMAC,KMS_VM_DYNAMIC_ENABLED,KMS_NVM_ENABLED,KMS_NVM_DYNAMIC_ENABLED
 KMS.KMS_AES_CBC=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT
 KMS.KMS_AES_CMAC=KMS_FCT_SIGN|KMS_FCT_VERIFY
 KMS.KMS_AES_ECB=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY
@@ -39,28 +39,34 @@ KMS.KMS_ATTRIBUTES=\#define KMS_ATTRIBUTES
 KMS.KMS_DECRYPT=\#define KMS_DECRYPT
 KMS.KMS_DERIVE_KEY=\#define KMS_DERIVE_KEY
 KMS.KMS_ENCRYPT=\#define KMS_ENCRYPT
-KMS.KMS_MEM_DEBUGGING=\#define KMS_MEM_DEBUGGING
 KMS.KMS_MEM_LOGGING=//\#define KMS_MEM_LOGGING
 KMS.KMS_MEM_USE_ALLOCATOR=KMS_MEM_USE_POOL_ALLOCATOR
 KMS.KMS_NB_SESSIONS_MAX=1
 KMS.KMS_NIKMS_ROUTER_BYPASS=\#define KMS_NIKMS_ROUTER_BYPASS
+KMS.KMS_NVM_DYNAMIC_ENABLED=\#define KMS_NVM_DYNAMIC_ENABLED
+KMS.KMS_NVM_ENABLED=\#define KMS_NVM_ENABLED
 KMS.KMS_OBJECTS=\#define KMS_OBJECTS
+KMS.KMS_SEARCH=\#define KMS_SEARCH
 KMS.KMS_SIGN=\#define KMS_SIGN
 KMS.KMS_VERIFY=\#define KMS_VERIFY
+KMS.KMS_VM_DYNAMIC_ENABLED=//\#define KMS_VM_DYNAMIC_ENABLED
 KeepUserPlacement=false
-LORAWAN.Activate_BOARD_RESOURCES=M4
 LORAWAN.Activate_DEBUG_LINE=true
-LORAWAN.Activate_RADIO_BOARD_INTERFACE=true
-LORAWAN.IPParameters=Activate_BOARD_RESOURCES,Activate_DEBUG_LINE,Activate_RADIO_BOARD_INTERFACE,SUBGHZ_APPLICATION
+LORAWAN.Activate_RADIO_BOARD_INTERFACE=Bsp
+LORAWAN.IPParameters=USE_ADC,USE_RTC,USE_UART,USE_LPM,SUBGHZ_APPLICATION,Activate_DEBUG_LINE,Activate_RADIO_BOARD_INTERFACE
 LORAWAN.SUBGHZ_APPLICATION=LORA_AT_SLAVE
-LPUART1.BaudRate=LPUART_BAUDRATE
+LORAWAN.USE_ADC=true
+LORAWAN.USE_LPM=true
+LORAWAN.USE_RTC=true
+LORAWAN.USE_UART=true
+LPUART1.BaudRate=9600
 LPUART1.FIFOMode=UART_FIFOMODE_ENABLE
 LPUART1.IPParameters=BaudRate,FIFOMode
-LoRaWAN.BSP.number=16
+LoRaWAN.BSP.number=7
 LoRaWAN0.BSP.STBoard=false
 LoRaWAN0.BSP.api=Unknown
 LoRaWAN0.BSP.component=
-LoRaWAN0.BSP.condition=SEM_LORA_AT_SLAVE | SEM_LORA_END_NODE
+LoRaWAN0.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_ADC
 LoRaWAN0.BSP.i2caddr=0
 LoRaWAN0.BSP.i2creg=
 LoRaWAN0.BSP.instance=ADC
@@ -72,7 +78,7 @@ LoRaWAN0.BSP.solution=ADC
 LoRaWAN1.BSP.STBoard=false
 LoRaWAN1.BSP.api=Unknown
 LoRaWAN1.BSP.component=
-LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION
+LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_RTC
 LoRaWAN1.BSP.i2caddr=0
 LoRaWAN1.BSP.i2creg=
 LoRaWAN1.BSP.instance=RTC
@@ -81,174 +87,66 @@ LoRaWAN1.BSP.mode=RTC Enabled
 LoRaWAN1.BSP.name=RTC
 LoRaWAN1.BSP.semaphore=
 LoRaWAN1.BSP.solution=RTC
-LoRaWAN10.BSP.STBoard=false
-LoRaWAN10.BSP.api=Unknown
-LoRaWAN10.BSP.component=
-LoRaWAN10.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN10.BSP.i2caddr=0
-LoRaWAN10.BSP.i2creg=
-LoRaWAN10.BSP.instance=PC3
-LoRaWAN10.BSP.ip=GPIO
-LoRaWAN10.BSP.mode=Output
-LoRaWAN10.BSP.name=RF SW CTRL 3
-LoRaWAN10.BSP.semaphore=
-LoRaWAN10.BSP.solution=PC3
-LoRaWAN11.BSP.STBoard=false
-LoRaWAN11.BSP.api=Unknown
-LoRaWAN11.BSP.component=
-LoRaWAN11.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN11.BSP.i2caddr=0
-LoRaWAN11.BSP.i2creg=
-LoRaWAN11.BSP.instance=PA0
-LoRaWAN11.BSP.ip=GPIO
-LoRaWAN11.BSP.mode=EXTI
-LoRaWAN11.BSP.name=BUTTON 1
-LoRaWAN11.BSP.semaphore=
-LoRaWAN11.BSP.solution=PA0
-LoRaWAN12.BSP.STBoard=false
-LoRaWAN12.BSP.api=Unknown
-LoRaWAN12.BSP.component=
-LoRaWAN12.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN12.BSP.i2caddr=0
-LoRaWAN12.BSP.i2creg=
-LoRaWAN12.BSP.instance=PC4
-LoRaWAN12.BSP.ip=GPIO
-LoRaWAN12.BSP.mode=Output
-LoRaWAN12.BSP.name=RF SW CTRL 1
-LoRaWAN12.BSP.semaphore=
-LoRaWAN12.BSP.solution=PC4
-LoRaWAN13.BSP.STBoard=false
-LoRaWAN13.BSP.api=Unknown
-LoRaWAN13.BSP.component=
-LoRaWAN13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN13.BSP.i2caddr=0
-LoRaWAN13.BSP.i2creg=
-LoRaWAN13.BSP.instance=PC5
-LoRaWAN13.BSP.ip=GPIO
-LoRaWAN13.BSP.mode=Output
-LoRaWAN13.BSP.name=RF SW CTRL 2
-LoRaWAN13.BSP.semaphore=
-LoRaWAN13.BSP.solution=PC5
-LoRaWAN14.BSP.STBoard=false
-LoRaWAN14.BSP.api=Unknown
-LoRaWAN14.BSP.component=
-LoRaWAN14.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN14.BSP.i2caddr=0
-LoRaWAN14.BSP.i2creg=
-LoRaWAN14.BSP.instance=PC6
-LoRaWAN14.BSP.ip=GPIO
-LoRaWAN14.BSP.mode=EXTI
-LoRaWAN14.BSP.name=BUTTON 3
-LoRaWAN14.BSP.semaphore=
-LoRaWAN14.BSP.solution=PC6
-LoRaWAN15.BSP.STBoard=false
-LoRaWAN15.BSP.api=Unknown
-LoRaWAN15.BSP.component=
-LoRaWAN15.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN15.BSP.i2caddr=0
-LoRaWAN15.BSP.i2creg=
-LoRaWAN15.BSP.instance=PA1
-LoRaWAN15.BSP.ip=GPIO
-LoRaWAN15.BSP.mode=EXTI
-LoRaWAN15.BSP.name=BUTTON 2
-LoRaWAN15.BSP.semaphore=
-LoRaWAN15.BSP.solution=PA1
 LoRaWAN2.BSP.STBoard=false
 LoRaWAN2.BSP.api=Unknown
 LoRaWAN2.BSP.component=
-LoRaWAN2.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN2.BSP.condition=SEM_LORA_AT_SLAVE
 LoRaWAN2.BSP.i2caddr=0
 LoRaWAN2.BSP.i2creg=
-LoRaWAN2.BSP.instance=PB12
-LoRaWAN2.BSP.ip=GPIO
-LoRaWAN2.BSP.mode=Output
-LoRaWAN2.BSP.name=Debug Line 1
+LoRaWAN2.BSP.instance=LPUART1
+LoRaWAN2.BSP.ip=LPUART
+LoRaWAN2.BSP.mode=Asynchronous
+LoRaWAN2.BSP.name=USART
 LoRaWAN2.BSP.semaphore=
-LoRaWAN2.BSP.solution=PB12
+LoRaWAN2.BSP.solution=LPUART1
 LoRaWAN3.BSP.STBoard=false
 LoRaWAN3.BSP.api=Unknown
 LoRaWAN3.BSP.component=
-LoRaWAN3.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN3.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN3.BSP.i2caddr=0
 LoRaWAN3.BSP.i2creg=
-LoRaWAN3.BSP.instance=PB13
+LoRaWAN3.BSP.instance=PB12
 LoRaWAN3.BSP.ip=GPIO
 LoRaWAN3.BSP.mode=Output
-LoRaWAN3.BSP.name=Debug Line 2
+LoRaWAN3.BSP.name=Debug Line 1
 LoRaWAN3.BSP.semaphore=
-LoRaWAN3.BSP.solution=PB13
+LoRaWAN3.BSP.solution=PB12
 LoRaWAN4.BSP.STBoard=false
 LoRaWAN4.BSP.api=Unknown
 LoRaWAN4.BSP.component=
-LoRaWAN4.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN4.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN4.BSP.i2caddr=0
 LoRaWAN4.BSP.i2creg=
-LoRaWAN4.BSP.instance=PB14
+LoRaWAN4.BSP.instance=PB13
 LoRaWAN4.BSP.ip=GPIO
 LoRaWAN4.BSP.mode=Output
-LoRaWAN4.BSP.name=Debug Line 3
+LoRaWAN4.BSP.name=Debug Line 2
 LoRaWAN4.BSP.semaphore=
-LoRaWAN4.BSP.solution=PB14
+LoRaWAN4.BSP.solution=PB13
 LoRaWAN5.BSP.STBoard=false
 LoRaWAN5.BSP.api=Unknown
 LoRaWAN5.BSP.component=
-LoRaWAN5.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN5.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN5.BSP.i2caddr=0
 LoRaWAN5.BSP.i2creg=
-LoRaWAN5.BSP.instance=PB10
+LoRaWAN5.BSP.instance=PB14
 LoRaWAN5.BSP.ip=GPIO
 LoRaWAN5.BSP.mode=Output
-LoRaWAN5.BSP.name=Debug Line 4
+LoRaWAN5.BSP.name=Debug Line 3
 LoRaWAN5.BSP.semaphore=
-LoRaWAN5.BSP.solution=PB10
+LoRaWAN5.BSP.solution=PB14
 LoRaWAN6.BSP.STBoard=false
 LoRaWAN6.BSP.api=Unknown
 LoRaWAN6.BSP.component=
-LoRaWAN6.BSP.condition=SEM_LORA_AT_SLAVE
+LoRaWAN6.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN6.BSP.i2caddr=0
 LoRaWAN6.BSP.i2creg=
-LoRaWAN6.BSP.instance=LPUART1
-LoRaWAN6.BSP.ip=LPUART
-LoRaWAN6.BSP.mode=Asynchronous
-LoRaWAN6.BSP.name=USART
+LoRaWAN6.BSP.instance=PB10
+LoRaWAN6.BSP.ip=GPIO
+LoRaWAN6.BSP.mode=Output
+LoRaWAN6.BSP.name=Debug Line 4
 LoRaWAN6.BSP.semaphore=
-LoRaWAN6.BSP.solution=LPUART1
-LoRaWAN7.BSP.STBoard=false
-LoRaWAN7.BSP.api=Unknown
-LoRaWAN7.BSP.component=
-LoRaWAN7.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN7.BSP.i2caddr=0
-LoRaWAN7.BSP.i2creg=
-LoRaWAN7.BSP.instance=PB11
-LoRaWAN7.BSP.ip=GPIO
-LoRaWAN7.BSP.mode=Output
-LoRaWAN7.BSP.name=LED 3
-LoRaWAN7.BSP.semaphore=
-LoRaWAN7.BSP.solution=PB11
-LoRaWAN8.BSP.STBoard=false
-LoRaWAN8.BSP.api=Unknown
-LoRaWAN8.BSP.component=
-LoRaWAN8.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN8.BSP.i2caddr=0
-LoRaWAN8.BSP.i2creg=
-LoRaWAN8.BSP.instance=PB9
-LoRaWAN8.BSP.ip=GPIO
-LoRaWAN8.BSP.mode=Output
-LoRaWAN8.BSP.name=LED 2
-LoRaWAN8.BSP.semaphore=
-LoRaWAN8.BSP.solution=PB9
-LoRaWAN9.BSP.STBoard=false
-LoRaWAN9.BSP.api=Unknown
-LoRaWAN9.BSP.component=
-LoRaWAN9.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN9.BSP.i2caddr=0
-LoRaWAN9.BSP.i2creg=
-LoRaWAN9.BSP.instance=PB15
-LoRaWAN9.BSP.ip=GPIO
-LoRaWAN9.BSP.mode=Output
-LoRaWAN9.BSP.name=LED 1
-LoRaWAN9.BSP.semaphore=
-LoRaWAN9.BSP.solution=PB15
+LoRaWAN6.BSP.solution=PB10
 Mcu.Context0=CortexM4
 Mcu.Context1=CortexM0Plus
 Mcu.ContextNb=2
@@ -256,69 +154,72 @@ Mcu.ContextProject=DualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=RCC
-Mcu.IP11=RTC
-Mcu.IP12=SEQUENCER_M0PLUS
-Mcu.IP13=SEQUENCER_M4
-Mcu.IP14=SUBGHZ
-Mcu.IP15=SYS_M0PLUS
-Mcu.IP16=SYS
-Mcu.IP17=TIMER
-Mcu.IP18=TINY_LPM
-Mcu.IP2=DMA
-Mcu.IP3=IPCC
-Mcu.IP4=KMS
-Mcu.IP5=LORAWAN
-Mcu.IP6=LPUART1
-Mcu.IP7=MISC
-Mcu.IP8=NVIC1
-Mcu.IP9=NVIC2
-Mcu.IPNb=19
+Mcu.IP10=NVIC2
+Mcu.IP11=RCC
+Mcu.IP12=RTC
+Mcu.IP13=SEQUENCER_M0PLUS
+Mcu.IP14=SEQUENCER_M4
+Mcu.IP15=SUBGHZ
+Mcu.IP16=SYS_M0PLUS
+Mcu.IP17=SYS
+Mcu.IP18=TIMER
+Mcu.IP19=TINY_LPM
+Mcu.IP2=DEBUG
+Mcu.IP3=DMA
+Mcu.IP4=IPCC
+Mcu.IP5=KMS
+Mcu.IP6=LORAWAN
+Mcu.IP7=LPUART1
+Mcu.IP8=MISC
+Mcu.IP9=NVIC1
+Mcu.IPNb=20
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_IPCC_VS_IPCC
-Mcu.Pin23=VP_KMS_VS_KMS
-Mcu.Pin24=VP_LORAWAN_VS_LoRaWAN
-Mcu.Pin25=VP_MISC_VS_MISC
-Mcu.Pin26=VP_RTC_VS_RTC_Activate
-Mcu.Pin27=VP_RTC_VS_RTC_Calendar
-Mcu.Pin28=VP_RTC_VS_RTC_Alarm_B_Intern
-Mcu.Pin29=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
-Mcu.Pin31=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin32=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin33=VP_SYS_VS_Systick
-Mcu.Pin34=VP_SYS_M0PLUS_VS_Systick
-Mcu.Pin35=VP_TIMER_VS_TIMER
-Mcu.Pin36=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=37
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_IPCC_VS_IPCC
+Mcu.Pin25=VP_KMS_VS_KMS
+Mcu.Pin26=VP_LORAWAN_VS_LoRaWAN
+Mcu.Pin27=VP_MISC_VS_MISC
+Mcu.Pin28=VP_RTC_VS_RTC_Activate
+Mcu.Pin29=VP_RTC_VS_RTC_Calendar
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_RTC_VS_RTC_Alarm_B_Intern
+Mcu.Pin31=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin32=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
+Mcu.Pin33=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin34=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin35=VP_SYS_VS_None
+Mcu.Pin36=VP_SYS_M0PLUS_VS_None
+Mcu.Pin37=VP_TIMER_VS_TIMER
+Mcu.Pin38=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=39
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);LPUART_BAUDRATE,9600
+Mcu.UserConstants=RTC_N_PREDIV_S-CortexM0Plus,10;RTC_PREDIV_S-CortexM0Plus,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A-CortexM0Plus,((1<<(15-RTC_N_PREDIV_S))-1);RTC_N_PREDIV_S-CortexM4,10;RTC_PREDIV_S-CortexM4,((1<<RTC_N_PREDIV_S)-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -332,7 +233,8 @@ NVIC1.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC1.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC1.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC1.SysTick_IRQn=true\:15\:0\:true\:false\:true\:false\:false
+NVIC1.TimeBase=None
 NVIC1.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.ForceEnableDMAVector=true
 NVIC2.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -342,19 +244,22 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.RTC_LSECSS_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC2.SysTick_IRQn=true\:3\:0\:false\:false\:true\:false\:false
+NVIC2.TimeBase=None
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -369,40 +274,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=LPUART1_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -410,26 +308,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -442,7 +343,7 @@ ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32WL55JCIx
 ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
-ProjectManager.HeapSize=0x400
+ProjectManager.HeapSize=M4-0x200,M0P-0x400
 ProjectManager.KeepUserCode=true
 ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
@@ -453,11 +354,11 @@ ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=LoRaWAN_AT_Slave_DualCore.ioc
 ProjectManager.ProjectName=LoRaWAN_AT_Slave_DualCore
 ProjectManager.RegisterCallBack=
-ProjectManager.StackSize=0x1000
+ProjectManager.StackSize=M4-0x800,M0P-0x1000
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,6-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM4,false-7-MX_RTC_Init-RTC-true-HAL-false-CortexM4,8-MX_LPUART1_UART_Init-LPUART1-true-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,4-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,6-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM0Plus,7-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus
+ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,6-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM4,false-7-MX_RTC_Init-RTC-true-HAL-false-CortexM4,8-MX_LPUART1_UART_Init-LPUART1-true-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,4-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,5-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,6-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM0Plus
 RCC.AHBFreq_Value=48000000
 RCC.APB1Freq_Value=48000000
 RCC.APB1TimFreq_Value=48000000
@@ -468,6 +369,7 @@ RCC.Cortex2Freq_Value=48000000
 RCC.CortexFreq_Value=48000000
 RCC.FCLK2Freq_Value=48000000
 RCC.FCLKCortexFreq_Value=48000000
+RCC.FLatency=FLASH_LATENCY_2
 RCC.FamilyName=M
 RCC.HCLK2Freq_Value=48000000
 RCC.HCLK3Freq_Value=48000000
@@ -478,7 +380,7 @@ RCC.I2C1Freq_Value=48000000
 RCC.I2C2Freq_Value=48000000
 RCC.I2C3Freq_Value=48000000
 RCC.I2S2Freq_Value=16000000
-RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
+RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FLatency,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,PWR_Regulator_Voltage_Scale,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
 RCC.LPTIM1Freq_Value=48000000
 RCC.LPTIM2Freq_Value=48000000
 RCC.LPTIM3Freq_Value=48000000
@@ -492,12 +394,12 @@ RCC.PLLPoutputFreq_Value=192000000
 RCC.PLLQoutputFreq_Value=192000000
 RCC.PLLRCLKFreq_Value=192000000
 RCC.PWRFreq_Value=48000000
+RCC.PWR_Regulator_Voltage_Scale=PWR_REGULATOR_VOLTAGE_SCALE1
 RCC.RNGFreq_Value=32000
 RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
 RCC.RTCFreq_Value=32768
 RCC.SYSCLKFreq_VALUE=48000000
 RCC.USART1Freq_Value=48000000
-RCC.USART2CLockSelection=RCC_USART2CLKSOURCE_SYSCLK
 RCC.USART2Freq_Value=48000000
 RCC.VCOInputFreq_Value=48000000
 RCC.VCOOutputFreq_Value=384000000
@@ -507,8 +409,7 @@ RTC.AsynchPrediv=RTC_PREDIV_A
 RTC.BinMode=RTC_BINARY_ONLY
 RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
 RTC.BinaryAutoClr_B-Alarm\ B=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
-RTC.Format=RTC_FORMAT_BIN
-RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B,Format
+RTC.IPParameters=Alarm-Alarm A,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,Alarm_B-Alarm B,BinaryAutoClr_B-Alarm B
 SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI0.ConfNb=1
 SH.GPXTI1.0=GPIO_EXTI1
@@ -547,12 +448,15 @@ VP_SEQUENCER_M4_VS_SEQUENCER.Mode=SEQUENCER_Enabled
 VP_SEQUENCER_M4_VS_SEQUENCER.Signal=SEQUENCER_M4_VS_SEQUENCER
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_M0PLUS_VS_Systick.Mode=SysTick
-VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_M0PLUS_VS_None.Mode=None
+VP_SYS_M0PLUS_VS_None.Signal=SYS_M0PLUS_VS_None
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=LoRaWAN_AT_Slave_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvoptx
index f89e9b63..b1258a31 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>12000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -119,13 +119,33 @@
       <TargetDriverDllRegistry>
         <SetRegEntry>
           <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O974 -SF4000 -C0 -A1 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 )  -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM0+ -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U-O142 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,239 +203,239 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>14</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/KMS/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
-      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/App/app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/App/lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
       <FileNumber>18</FileNumber>
@@ -423,15 +443,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MbMux</GroupName>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -455,8 +475,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/lora_info.c</PathWithFileName>
+      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -467,8 +487,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/lora_info.c</PathWithFileName>
-      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -491,8 +511,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_lora.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -503,8 +523,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_lora.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -515,8 +535,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -527,8 +547,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -539,20 +559,28 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -565,7 +593,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>29</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
@@ -585,7 +613,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -597,7 +625,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -611,31 +639,23 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
       <FileNumber>33</FileNumber>
@@ -643,8 +663,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -655,8 +675,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -667,8 +687,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -679,8 +699,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -715,8 +735,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -727,8 +747,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -739,8 +759,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -751,8 +771,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -763,8 +783,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -775,8 +795,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -787,8 +807,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -799,8 +819,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -811,8 +831,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -823,8 +843,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -835,8 +855,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -847,8 +867,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -859,31 +879,31 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/KMS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>11</GroupNumber>
       <FileNumber>53</FileNumber>
@@ -891,379 +911,379 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/KMS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
-      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
-      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
-      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_vm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
-      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
+      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
-      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
+      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
-      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
-      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>73</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
-      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>74</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
-      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
+      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>75</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
-      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>76</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
-      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>77</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
-      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>78</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>79</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>80</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>81</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>82</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>83</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
-      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>12</GroupNumber>
       <FileNumber>84</FileNumber>
@@ -1271,8 +1291,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
-      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1283,8 +1303,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
-      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1295,15 +1315,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
-      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
+    <GroupName>Middlewares/mbed-crypto</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -1315,8 +1335,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</PathWithFileName>
+      <FilenameWithoutPath>sha1.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1327,8 +1347,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1339,15 +1359,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</PathWithFileName>
-      <FilenameWithoutPath>NvmCtxMgmt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
+    <GroupName>Middlewares/LoRaWAN</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -1359,8 +1379,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1371,8 +1391,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</PathWithFileName>
+      <FilenameWithoutPath>NvmDataMgmt.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1383,8 +1403,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1395,8 +1415,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
+      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1407,8 +1427,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
+      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1419,8 +1439,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
+      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1431,8 +1451,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
+      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1443,70 +1463,50 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>98</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
-      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>99</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</PathWithFileName>
+      <FilenameWithoutPath>RegionBaseUS.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>100</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>101</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
       <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>102</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>101</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1517,8 +1517,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>103</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>102</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1529,8 +1529,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>104</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>103</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1541,8 +1541,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>105</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>104</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1553,8 +1553,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>106</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>105</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1565,8 +1565,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>107</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>106</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1577,8 +1577,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>108</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>107</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1589,8 +1589,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>109</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>108</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1600,67 +1600,111 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>16</GroupNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>109</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>110</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
-      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/mbed-crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>111</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
-      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>112</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</PathWithFileName>
-      <FilenameWithoutPath>sha1.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>113</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
-      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>114</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>115</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>116</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>117</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
+      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1673,26 +1717,38 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>18</GroupNumber>
-      <FileNumber>114</FileNumber>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>118</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>18</GroupNumber>
-      <FileNumber>115</FileNumber>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>119</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>120</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1705,8 +1761,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>116</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>121</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1717,86 +1773,86 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>117</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>122</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>118</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>123</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>119</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>124</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>120</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>125</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>121</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>126</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>122</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>127</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>123</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>128</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvprojx
index 24cfc414..f260d85a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvprojx
@@ -16,14 +16,14 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM0P</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <FlashDriverDll></FlashDriverDll>
           <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <RegisterFile></RegisterFile>
           <MemoryEnv></MemoryEnv>
           <Cmp></Cmp>
           <Asm></Asm>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LoRaWAN_AT_Slave_DualCore_CM0PLUS\Exe\</OutputDirectory>
+          <OutputDirectory>LoRaWAN_AT_Slave_DualCore_CM0PLUS\</OutputDirectory>
           <OutputName>LoRaWAN_AT_Slave_DualCore_CM0PLUS</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -110,13 +110,13 @@
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDllArguments>-REMAP</SimDllArguments>
           <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
           <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDllArguments> </TargetDllArguments>
           <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
         </DllOption>
         <DebugOption>
           <OPTHX>
@@ -134,11 +134,11 @@
             <RunIndependent>0</RunIndependent>
             <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
+            <DriverSelection>4101</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -186,7 +186,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <hadIRAM2>0</hadIRAM2>
+            <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>1</useUlib>
@@ -194,7 +194,7 @@
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
             <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
+            <RwSelD>4</RwSelD>
             <CodeSel>0</CodeSel>
             <OptFeed>0</OptFeed>
             <NoZi1>0</NoZi1>
@@ -211,7 +211,7 @@
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
             <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
+            <Im2Chk>1</Im2Chk>
             <OnChipMemories>
               <Ocm1>
                 <Type>0</Type>
@@ -245,13 +245,13 @@
               </Ocm6>
               <IRAM>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -275,8 +275,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -300,13 +300,13 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x2000c000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM0PLUS,KMS_ENABLED,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM0PLUS,KMS_ENABLED,USE_HAL_DRIVER,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,198 +381,142 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>ca_low_level.c</FileName>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_lorawan.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/App/app_lorawan.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>lora_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/App/lora_app.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+          <Files>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>radio_board_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+          <Files>
             <File>
-              <FileName>kms_low_level.c</FileName>
+              <FileName>app_kms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
             <File>
               <FileName>main.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>nvms_low_level.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>kms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>nvms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>ca_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
               <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/KMS/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_kms.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_lorawan.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/App/app_lorawan.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>lora_app.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/App/lora_app.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/Target</GroupName>
-          <Files>
             <File>
-              <FileName>radio_board_if.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
           <Files>
             <File>
               <FileName>features_info.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/MbMux/features_info.c</FilePath>
             </File>
-            <File>
-              <FileName>LmHandler_mbwrapper.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</FilePath>
-            </File>
             <File>
               <FileName>lora_info.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/MbMux/lora_info.c</FilePath>
             </File>
             <File>
-              <FileName>mbmux.c</FileName>
+              <FileName>LmHandler_mbwrapper.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_kms.c</FileName>
+              <FileName>mbmux.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
             </File>
             <File>
               <FileName>mbmuxif_lora.c</FileName>
@@ -601,6 +545,16 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>Doc</GroupName>
           <Files>
@@ -627,37 +581,32 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
             <File>
-              <FileName>stm32wlxx_hal.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_dma.c</FileName>
@@ -670,24 +619,29 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_ipcc.c</FileName>
@@ -695,194 +649,240 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/KMS</GroupName>
+          <GroupName>Drivers/CMSIS</GroupName>
           <Files>
             <File>
-              <FileName>ca_aes.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
-            </File>
-            <File>
-              <FileName>ca_aes_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>ca_aes_mbed.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/KMS</GroupName>
+          <Files>
             <File>
-              <FileName>ca_core.c</FileName>
+              <FileName>kms_der_x962.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc.c</FileName>
+              <FileName>kms_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_hal.c</FileName>
+              <FileName>kms_entry.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_mbed.c</FileName>
+              <FileName>kms_init.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash.c</FileName>
+              <FileName>kms_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash_mbed.c</FileName>
+              <FileName>kms_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_if_utils.c</FileName>
+              <FileName>kms_platf_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng.c</FileName>
+              <FileName>kms_digest.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng_mbed.c</FileName>
+              <FileName>kms_dyn_obj.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa.c</FileName>
+              <FileName>kms_enc_dec.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa_hal.c</FileName>
+              <FileName>kms_key_mgt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa_mbed.c</FileName>
+              <FileName>kms_nvm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
             </File>
             <File>
-              <FileName>kms_der_x962.c</FileName>
+              <FileName>kms_sign_verify.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
             </File>
             <File>
-              <FileName>kms_digest.c</FileName>
+              <FileName>kms_vm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls></MiscControls>
+                      <Define></Define>
+                      <Undefine></Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
             </File>
             <File>
-              <FileName>kms_dyn_obj.c</FileName>
+              <FileName>kms_interface.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
             </File>
             <File>
-              <FileName>kms_ecc.c</FileName>
+              <FileName>tkms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
             </File>
             <File>
-              <FileName>kms_enc_dec.c</FileName>
+              <FileName>ca_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
             </File>
             <File>
-              <FileName>kms_entry.c</FileName>
+              <FileName>ca_core.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
             </File>
             <File>
-              <FileName>kms_init.c</FileName>
+              <FileName>ca_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>kms_interface.c</FileName>
+              <FileName>ca_hash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
             </File>
             <File>
-              <FileName>kms_key_mgt.c</FileName>
+              <FileName>ca_if_utils.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
             </File>
             <File>
-              <FileName>kms_mem.c</FileName>
+              <FileName>ca_rng.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
             </File>
             <File>
-              <FileName>kms_nvm_storage.c</FileName>
+              <FileName>ca_rsa.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
             </File>
             <File>
-              <FileName>kms_objects.c</FileName>
+              <FileName>ca_aes_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_platf_objects.c</FileName>
+              <FileName>ca_ecc_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_sign_verify.c</FileName>
+              <FileName>ca_rsa_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
             </File>
             <File>
               <FileName>mac_stm32hal.c</FileName>
@@ -895,100 +895,85 @@
               <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</FilePath>
             </File>
             <File>
-              <FileName>tkms.c</FileName>
+              <FileName>ca_aes_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-          <Files>
             <File>
-              <FileName>cmac.c</FileName>
+              <FileName>ca_ecc_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>lorawan_aes.c</FileName>
+              <FileName>ca_hash_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>soft-se.c</FileName>
+              <FileName>ca_rng_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+            </File>
+            <File>
+              <FileName>ca_rsa_mbed.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
+          <GroupName>Middlewares/mbed-crypto</GroupName>
           <Files>
             <File>
-              <FileName>LmHandler.c</FileName>
+              <FileName>sha1.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</FilePath>
             </File>
             <File>
-              <FileName>LmhpCompliance.c</FileName>
+              <FileName>sha256.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
             </File>
             <File>
-              <FileName>NvmCtxMgmt.c</FileName>
+              <FileName>platform_util.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
+          <GroupName>Middlewares/LoRaWAN</GroupName>
           <Files>
             <File>
-              <FileName>LoRaMac.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacAdr.c</FileName>
+              <FileName>LmHandler.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacClassB.c</FileName>
+              <FileName>NvmDataMgmt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCommands.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileName>LmhpCompliance.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCrypto.c</FileName>
+              <FileName>cmac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacParser.c</FileName>
+              <FileName>lorawan_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacSerializer.c</FileName>
+              <FileName>soft-se.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-          <Files>
             <File>
               <FileName>Region.c</FileName>
               <FileType>1</FileType>
@@ -1004,6 +989,11 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</FilePath>
             </File>
+            <File>
+              <FileName>RegionBaseUS.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</FilePath>
+            </File>
             <File>
               <FileName>RegionCN470.c</FileName>
               <FileType>1</FileType>
@@ -1049,35 +1039,50 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-          <Files>
             <File>
-              <FileName>utilities.c</FileName>
+              <FileName>LoRaMac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/mbed-crypto</GroupName>
-          <Files>
             <File>
-              <FileName>platform_util.c</FileName>
+              <FileName>LoRaMacAdr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
             </File>
             <File>
-              <FileName>sha1.c</FileName>
+              <FileName>LoRaMacClassB.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
             </File>
             <File>
-              <FileName>sha256.c</FileName>
+              <FileName>LoRaMacCommands.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCrypto.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacParser.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacSerializer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+            </File>
+            <File>
+              <FileName>utilities.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1085,14 +1090,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1105,39 +1115,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1151,8 +1161,8 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
         <targetInfos>
           <targetInfo name="LoRaWAN_AT_Slave_DualCore_CM0PLUS"/>
         </targetInfos>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM4.uvoptx
index 7dcefe3a..c835a9db 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM4.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM4.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>48000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O2254 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U-O142 -O2766 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,290 +195,286 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>1</tvExp>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/lora_at.c</PathWithFileName>
+      <FilenameWithoutPath>lora_at.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/lora_command.c</PathWithFileName>
+      <FilenameWithoutPath>lora_command.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/test_rf.c</PathWithFileName>
+      <FilenameWithoutPath>test_rf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>16</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/lora_at.c</PathWithFileName>
-      <FilenameWithoutPath>lora_at.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/lora_command.c</PathWithFileName>
-      <FilenameWithoutPath>lora_command.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/test_rf.c</PathWithFileName>
-      <FilenameWithoutPath>test_rf.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MbMux</GroupName>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -469,8 +485,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -481,20 +497,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -505,8 +509,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -517,8 +521,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -529,8 +533,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -541,8 +545,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -561,8 +565,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -581,8 +585,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -592,23 +596,15 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -620,6 +616,30 @@
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>33</FileNumber>
@@ -627,8 +647,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -639,8 +659,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -651,8 +671,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -663,8 +683,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -675,8 +695,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -687,8 +707,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -699,8 +719,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -711,8 +731,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -723,8 +743,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -735,8 +755,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -747,8 +767,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -759,8 +779,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -771,8 +791,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -783,8 +803,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -795,8 +815,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -807,8 +827,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -819,8 +839,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -831,8 +851,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -843,8 +863,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -855,15 +875,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Utilities</GroupName>
+    <GroupName>Drivers/CMSIS</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -875,25 +895,33 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -905,62 +933,74 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>61</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM4.uvprojx
index 8d2c6ce4..9338763d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM4.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/LoRaWAN_AT_Slave_DualCore_CM4.uvprojx
@@ -16,9 +16,9 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20007FFF) IRAM2(0x20008000-0x2000AFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LoRaWAN_AT_Slave_DualCore_CM4\Exe\</OutputDirectory>
+          <OutputDirectory>LoRaWAN_AT_Slave_DualCore_CM4\</OutputDirectory>
           <OutputName>LoRaWAN_AT_Slave_DualCore_CM4</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -138,7 +138,7 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -183,7 +183,7 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
@@ -246,7 +246,7 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
@@ -301,12 +301,12 @@
               <OCR_RVCT9>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
                 <StartAddress>0x20008000</StartAddress>
-                <Size>0x3000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM4,STM32WL55xx</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,67 +381,92 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>adc.c</FileName>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+          <Files>
             <File>
-              <FileName>adc_if.c</FileName>
+              <FileName>app_lorawan.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/app_lorawan.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>lora_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/lora_app.c</FilePath>
             </File>
             <File>
-              <FileName>dma.c</FileName>
+              <FileName>lora_at.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/dma.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/lora_at.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>lora_command.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/lora_command.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>test_rf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/test_rf.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
             <File>
               <FileName>main.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileName>dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+              <FilePath>../CM4/Core/Src/dma.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
               <FileName>timer_if.c</FileName>
@@ -449,59 +474,34 @@
               <FilePath>../CM4/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>adc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/usart.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
             </File>
             <File>
               <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/usart_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/App</GroupName>
-          <Files>
-            <File>
-              <FileName>app_lorawan.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/app_lorawan.c</FilePath>
-            </File>
             <File>
-              <FileName>lora_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/lora_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>lora_at.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/lora_at.c</FilePath>
+              <FilePath>../CM4/Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>lora_command.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/lora_command.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>test_rf.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/test_rf.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
           <Files>
             <File>
               <FileName>LmHandler_mbwrapper.c</FileName>
@@ -513,62 +513,6 @@
               <FileType>1</FileType>
               <FilePath>../CM4/MbMux/mbmux.c</FilePath>
             </File>
-            <File>
-              <FileName>mbmuxif_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
-            </File>
             <File>
               <FileName>mbmuxif_lora.c</FileName>
               <FileType>1</FileType>
@@ -614,26 +558,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -645,24 +579,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -680,9 +609,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -695,24 +629,24 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_uart.c</FileName>
@@ -725,9 +659,34 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -740,39 +699,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/Project.uvmpw
index 92479c18..a84715c2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/Project.uvmpw
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/Project.uvmpw
@@ -9,13 +9,13 @@
 
   <project>
     <PathAndName>.\LoRaWAN_AT_Slave_DualCore_CM0PLUS.uvprojx</PathAndName>
+    <NodeIsActive>1</NodeIsActive>
     <NodeIsExpanded>1</NodeIsExpanded>
     <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
   </project>
 
   <project>
     <PathAndName>.\LoRaWAN_AT_Slave_DualCore_CM4.uvprojx</PathAndName>
-    <NodeIsActive>1</NodeIsActive>
     <NodeIsExpanded>1</NodeIsExpanded>
     <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
   </project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
index 5707d81c..7c9ba28d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
index a8b1492f..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size		EQU     0x1000
+Stack_Size		EQU     0x800
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size      EQU     0x400
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
index f9b3e23c..8f413233 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
@@ -10,11 +10,11 @@ LR_IROM1 0x08020000 0x00020000  {    ; load region size_region
    .ANY (+RO)
   }
   ; SRAM2 dedicated to M0+
-  RW_IRAM1 0x2000C000 0x00004000  {  ; RW data
+  RW_IRAM1 0x2000A000 0x00006000  {  ; RW data
    .ANY (+RW +ZI)
   }
 
-  RW_RAM_SHARED 0x2000B000 0x1000  {
+  RW_RAM_SHARED 0x20009000 0x1000  {
    *(MB_MEM2)
   }
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
index 79a183e1..5141de4a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -14,7 +14,7 @@ LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
    .ANY (+RW +ZI)
   }
   ; Backup SRAM2 dedicated to M4
-RW_IRAM2 0x20008000 0x00003000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+RW_IRAM2 0x20008000 0x00001000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
     *(MAPPING_TABLE)
     *(MB_MEM1)
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/.project
index a2fc722d..32bb14ac 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/.project
@@ -12,154 +12,168 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
 			<name>LoRaWAN_AT_Slave_DualCore.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN_AT_Slave_DualCore.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN_AT_Slave_DualCore.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1602235120354</id>
+			<id>1612363198992</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.cproject
index c362a809..869a89c7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.cproject
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1502812463">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1502812463" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1752196870">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1752196870" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1502812463" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1502812463." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.512297422" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.696713385" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1556895559" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1327347056" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.851804500" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.300647223" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.738790277" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1949995085" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/LoRaWAN/App | ../../../CM0PLUS/LoRaWAN/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.801177040" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1868528787" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1703344272" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1942230025" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.618453438" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1752196870" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1752196870." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1058467271" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1052641414" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1630148939" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1156808988" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.974956205" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1376336006" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../CM0PLUS/LoRaWAN/Target | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/LoRaWAN/App | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.16088902" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.960916358" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.2132173895" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1575290600" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1437719129" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.328982297" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1386305032" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.789117928" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2084764184" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1497704111" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.388226283" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1743896808" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.995826211" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1812555248" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1378825893" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1161867870" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/App"/>
@@ -50,8 +51,9 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
@@ -79,76 +81,72 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1486228149" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1901916303" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1764244664" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1592312879" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1500854404" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1468853741" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1665704476" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1566747056" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.417740781" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.174325141" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.402500563" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.765660280" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.412581200" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.246852752" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1790339299" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.206999204" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.656881440" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.760365517" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1948893561" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.2020680076" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.243345503" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.592361035" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1223484957" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1756146869" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.300030372" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.2135580238" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1131236837" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.283660902" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.2030316035" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1788352743" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.756315793" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.22784270" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1229876960" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1998587566">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1998587566" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1603833603">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1603833603" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1998587566" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1998587566." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1972236210" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1581977290" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1978629442" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.598043578" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1161112481" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1986909859" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.516974478" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.229855281" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/LoRaWAN/App | ../../../CM0PLUS/LoRaWAN/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.981762465" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1801830526" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1966703722" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.485205597" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1252443575" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1603833603" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1603833603." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.2079142150" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.863336087" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.165190467" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.951814428" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.663365996" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1116012420" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../CM0PLUS/LoRaWAN/Target | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/LoRaWAN/App | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1111311898" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.273581114" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1259544672" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.489628523" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.326063650" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1423336613" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.518993647" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.374199369" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.945971902" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.328480204" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1128700956" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.566691303" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1326215246" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2053078806" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1654780717" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/App"/>
@@ -157,8 +155,9 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
@@ -186,30 +185,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1257501392" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1810064778" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1745054597" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.974257821" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1892299669" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.381602637" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1462934379" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.168393658" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.364038712" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.2138904958" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.453467912" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.414023052" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.159861354" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1651064655" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.355105078" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1137450134" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.322854405" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1194222650" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1166968193" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.434888993" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1191738284" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.295675432" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.776735245" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.845415416" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.440002665" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1997482543" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.245356134" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.38862571" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.321086318" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.979561090" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1920743577" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1695921121" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1010508483" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -217,26 +214,27 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LoRaWAN_AT_Slave_DualCore_CM0PLUS.null.990702384" name="LoRaWAN_AT_Slave_DualCore_CM0PLUS"/>
+		<project id="LoRaWAN_AT_Slave_DualCore_CM0PLUS.null.1499544460" name="LoRaWAN_AT_Slave_DualCore_CM0PLUS"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1502812463;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1502812463.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1386305032;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1486228149">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1752196870;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1752196870.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.388226283;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1901916303">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1998587566;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1998587566.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1423336613;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1257501392">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1603833603;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1603833603.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.328480204;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1810064778">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="refreshScope" versionNumber="2">
 		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/LoRaWAN_AT_Slave_DualCore_CM0plus"/>
+			<resource resourceType="PROJECT" workspacePath="/LoRaWAN_AT_Slave_DualCore_CM0PLUS"/>
 		</configuration>
 		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/LoRaWAN_AT_Slave_DualCore_CM0plus"/>
+			<resource resourceType="PROJECT" workspacePath="/LoRaWAN_AT_Slave_DualCore_CM0PLUS"/>
 		</configuration>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.project
index f347249e..85eebf8a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.project
@@ -25,601 +25,645 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_if_utils.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_interface.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_vm_storage.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/mac_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/platform_util.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/platform_util.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/rsa_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/sha1.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha1.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/sha256.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/tkms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LmHandler.c</name>
+			<name>Application/User/Core/ca_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LmhpCompliance.c</name>
+			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMac.c</name>
+			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacAdr.c</name>
+			<name>Application/User/Core/kms_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacClassB.c</name>
+			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacCommands.c</name>
+			<name>Application/User/Core/nvms_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacConfirmQueue.c</name>
+			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacCrypto.c</name>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacParser.c</name>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacSerializer.c</name>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/NvmCtxMgmt.c</name>
+			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/Region.c</name>
+			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionAS923.c</name>
+			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionAU915.c</name>
+			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/LmHandler_mbwrapper.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCN470.c</name>
+			<name>Application/User/MbMux/features_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCN779.c</name>
+			<name>Application/User/MbMux/lora_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/lora_info.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCommon.c</name>
+			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionEU433.c</name>
+			<name>Application/User/MbMux/mbmuxif_lora.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_lora.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionEU868.c</name>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionIN865.c</name>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionKR920.c</name>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionRU864.c</name>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionUS915.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/cmac.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/lorawan_aes.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LmHandler.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/radio.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpCompliance.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/radio_driver.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMac.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/soft-se.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacAdr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/utilities.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacClassB.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ca_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCommands.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ipcc.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacConfirmQueue.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ipcc_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCrypto.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/kms_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacParser.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/main.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacSerializer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/nvms_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/NvmDataMgmt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/rtc.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/Region.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAS923.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAU915.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/subghz.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionBaseUS.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/sys_app.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN470.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/timer_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN779.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCommon.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/LmHandler_mbwrapper.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/features_info.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU433.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/features_info.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/lora_info.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU868.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/lora_info.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmux.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionIN865.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmux.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionKR920.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_lora.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionRU864.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_lora.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionUS915.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/cmac.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/lorawan_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/soft-se.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/utilities.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/KMS/App/app_kms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/KMS/App/app_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/KMS/App/app_kms.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/App/app_lorawan.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/app_lorawan.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/lora_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/App/lora_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/lora_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/Target/radio_board_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
index 9e23530f..f98fb740 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,51 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +105,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
-
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
 
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
-
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
index 2b06c01f..87472aa6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -46,25 +49,25 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x2000A000, LENGTH = 24K
-  ROM    (rx)    : ORIGIN = 0x08020000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08020000, LENGTH = 128K
   RAM_SHARED (xrw): ORIGIN = 0x20009000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -74,80 +77,96 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM AT> ROM
+
+  } >RAM AT> FLASH
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(4);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(4);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> FLASH
 
   /* Uninitialized data section into "RAM" Ram type memory */
-  . = ALIGN(8);
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -157,7 +176,7 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM
@@ -182,5 +201,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MB_MEM2       : { *(MB_MEM2) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/.cproject
index d0c2aca7..b1ddf0b0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/.cproject
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508015779">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508015779" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.928661041">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.928661041" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508015779" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508015779." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1617331729" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1055392501" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.788449504" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1489206375" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.113261906" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.65163043" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1998998285" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.153373059" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/LoRaWAN/App | ../../../CM4/LoRaWAN/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.73181259" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.878185998" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.748186352" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1563586662" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1161522758" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.928661041" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.928661041." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1432420790" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.365972819" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1066011378" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.3504602" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1687767730" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1457317402" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/LoRaWAN/App | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../CM4/LoRaWAN/Target | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1128072756" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1666561804" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1759858234" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.396593612" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1390665921" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2104500619" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1008809206" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.404263673" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.828069766" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1570673614" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.676091237" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1682717068" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1891147066" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.623812295" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.234161313" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.131666539" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/Target"/>
@@ -47,6 +48,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
@@ -63,74 +65,70 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1571881121" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1161171184" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1968935713" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1209962505" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2088232927" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1667010560" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1251023040" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1137017438" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.227148470" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1894156640" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1789497177" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1571868731" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.781986110" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1506573055" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.759010885" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.115049059" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1557461804" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.815548144" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.467850708" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.2091658595" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1234841950" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1977038068" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1775911515" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1993355463" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.714492952" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.142859540" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.814544028" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.417147559" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.480189633" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.58124759" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1110234994" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1239150736" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.229016625" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.209383420">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.209383420" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.279633766">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.279633766" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.209383420" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.209383420." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.415455202" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1636611876" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.750291671" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.148309800" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.734590016" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.66959240" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.496341862" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.56182733" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/LoRaWAN/App | ../../../CM4/LoRaWAN/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.481996948" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2118793888" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.435998233" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2080222576" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.655222551" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.279633766" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.279633766." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.359143174" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1950757091" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.407364090" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.652663335" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.766260077" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.994663552" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/LoRaWAN/App | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../CM4/LoRaWAN/Target | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1007150744" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_AT_Slave_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2077474961" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.410778050" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1116564942" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1862527447" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.38389165" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.716096662" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1519642909" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1665418478" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.823448549" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1638261492" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2017129426" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.130322406" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1117920625" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1230037152" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/Target"/>
@@ -138,6 +136,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
@@ -154,30 +153,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.750904162" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1971577934" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.960573899" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.327124852" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.956431166" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.492057226" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.331623426" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.531585555" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1853942129" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.499123653" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.815584684" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1225773071" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1005517156" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.189663059" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.813780349" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1976184523" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1957859318" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1879325854" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1657003183" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.129963485" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1890498183" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.810683822" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.718079346" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.299262736" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.694209100" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1266754665" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.111458768" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1711571725" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.140423545" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.438703217" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1035466599" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.2029615609" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1534198542" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -185,17 +182,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LoRaWAN_AT_Slave_DualCore_CM4.null.944179126" name="LoRaWAN_AT_Slave_DualCore_CM4"/>
+		<project id="LoRaWAN_AT_Slave_DualCore_CM4.null.1299812161" name="LoRaWAN_AT_Slave_DualCore_CM4"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.209383420;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.209383420.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.38389165;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.750904162">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.279633766;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.279633766.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.823448549;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1971577934">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508015779;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508015779.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1008809206;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1571881121">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.928661041;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.928661041.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.676091237;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1161171184">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
-</cproject>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/.project
index 6a3ac983..7dcc062a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/.project
@@ -25,306 +25,310 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/LmHandler_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/LmHandler_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmux.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_lora.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_lora.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_lora.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/app_lorawan.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/app_lorawan.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/lora_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/lora_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/lora_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/lora_at.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/lora_at.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/lora_at.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/lora_command.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/lora_command.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/lora_command.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/test_rf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/test_rf.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/test_rf.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
index 89dfe9e5..af218d28 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,52 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +106,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
-
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
-
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
 
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
index 1eeab01b..18f21dbf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -39,29 +42,29 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x400 ; /* required amount of heap  */
-_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x800 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 128K
   RAM_SHARED (rw): ORIGIN = 0x20008000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
     . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
     . = ALIGN(4);
@@ -76,30 +79,30 @@ SECTIONS
 
     . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
     . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  .ARM.extab   : { 
+  .ARM.extab   : {
     . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .ARM : {
     . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   .preinit_array     :
   {
@@ -108,8 +111,8 @@ SECTIONS
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .init_array :
   {
     . = ALIGN(4);
@@ -118,8 +121,8 @@ SECTIONS
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .fini_array :
   {
     . = ALIGN(4);
@@ -128,23 +131,47 @@ SECTIONS
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
     
-  } >RAM AT> ROM
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
 
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
@@ -182,6 +209,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
-   MB_MEM1 (NOLOAD)       : { *(MB_MEM1) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeMonitor/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeMonitor/readme.txt
index 11e17ba4..57618e6c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeMonitor/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/STM32CubeMonitor/readme.txt
@@ -1,18 +1,18 @@
 
-STM32WLxx Wireless Long Range RF test Readme file 
+STM32WLxx Wireless Long Range RF test Readme file
 
 ******************************************************************************
  Copyright (c) 2020 STMicroelectronics.
- All rights reserved. 
- This software component is licensed by ST under license SLA0048, the "License"; 
- You may not use this file except in compliance with the License. 
+ All rights reserved.
+ This software component is licensed by ST under license SLA0048, the "License";
+ You may not use this file except in compliance with the License.
  You may obtain a copy of the License at: www.st.com/SLA0048
- 
+
  The sub-flow "ui-table handler" is licensed under under Apache License, Version 2.0
  You may obtain a copy of the License at:opensource.org/licenses/Apache-2.0
- 
+
 ******************************************************************************
- 
+
 
 The STM32 Wireless Long Range RF test flow is used to test the wireless part of STM32WL. The test flow can be used to :
 - Display the Received Signal Strength Indicator (RSSI)
@@ -24,7 +24,7 @@ The STM32 Wireless Long Range RF test flow is used to test the wireless part of
 
 This directory contains the flow to be loaded in STM32CubeMonitor. (WLR_RF_test.json)
 
-The information to install and use the dashboard are available in wiki at 
+The information to install and use the dashboard are available in wiki at
 https://wiki.st.com/stm32mcu/wiki/STM32CubeMonitor:Wireless_Long_Range_RF_Test
 
 This application is targeting boards embedding the STM32WLxx with AT_Slave firmware.
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/readme.txt
index 66110c5d..a99f132f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/readme.txt
@@ -1,9 +1,9 @@
 /**
   @page LoRaWAN_AT_Slave_DualCore Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/readme.txt 
+  * @file    Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore/readme.txt
   * @author  MCD Application Team
   * @brief   This application is a simple demo application software of a LoRa
   *          modem controlled though AT command interface over UART by an
@@ -36,7 +36,7 @@ This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx
 
 Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Inc/ca_conf.h                        This file contains configuration for Cryptographic API (CA)
@@ -89,11 +89,10 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h               This file implements the CM0PLUS side wrapper of the LmHandler
                                                                                 interface shared between M0 and M4.
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h                             API which interfaces CM0PLUS to IPCC
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h                       Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h                      API provided to CM0PLUS applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                     API for CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                       API for CM0PLUS applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                     API for CM0PLUS applic to register and handle TRACE via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h                      API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                     API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                       API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                     API for CM0PLUS application to register and handle TRACE via MBMUX
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                   This file implements the CM0PLUS side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - LoRaWAN_AT_Slave_DualCore/CM4/Core/Inc/adc.h                                This file contains all the function prototypes for
@@ -130,14 +129,12 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
   - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.h                   This file implements the CM4 side wrapper of the LmHandler
                                                                                 interface shared between M0 and M4.
   - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.h                                 API which interfaces CM4 to IPCC
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.h                           Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.h                          API provided to CM4 applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h                         API for CM4 applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h                           API for CM4 applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h                         API for CM4 applic to register and handle TRACE via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.h                          API provided to CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h                         API for CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h                           API for CM4 application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h                         API for CM4 application to register and handle TRACE via MBMUX
   - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h                       This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
-  - LoRaWAN_AT_Slave_DualCore/Common/Board/board_resources.h                    Header for driver at.c module
   - LoRaWAN_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h              STM32WLxx_Nucleo board configuration file.
   - LoRaWAN_AT_Slave_DualCore/Common/MbMux/features_info.h                      Feature list and parameters TypeDefinitions
   - LoRaWAN_AT_Slave_DualCore/Common/MbMux/lora_info.h                          To give info to the application about LoRaWAN configuration
@@ -148,7 +145,7 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ca_low_level.c                   This file contains the low level implementations of the Cryptographic API (CA) module.
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c                           This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c                        Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c                        Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/kms_low_level.c                  This file contains implementations for Key Management Services (KMS)
                                                                                 module Low Level access to Flash, CRC...
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c                           : Main program body
@@ -156,6 +153,8 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
                                                                                 module NVM Low Level access to physical storage (Flash...)
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c                            This file provides code for the configuration
                                                                                 of the RTC instances.
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                   Interrupt Service Routines.
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                   Low layer function to enter/exit low power modes (stop, sleep)
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c                         This file provides code for the configuration
@@ -171,10 +170,9 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
                                                                                 shared between M0 and M4.
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/lora_info.c                         To give info to the application about LoRaWAN configuration
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c                             Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c                       Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c                      allows CM0 applic to register and handle LoraWAN to MBMUX
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                     allows CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                       allows CM0 applic to handle the SYSTEM MBMUX channel
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c                      allows CM0 application to register and handle LoraWAN to MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                     allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                       allows CM0 application to handle the SYSTEM MBMUX channel
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                     Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
   - LoRaWAN_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                   This file implements the CM0 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
@@ -185,7 +183,7 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
                                                                                 of all the requested memory to memory DMA transfers.
   - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc.c                               This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c                            Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c                            Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/main.c                               : Main program body
   - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c                  This file provides code for the MSP Initialization
                                                                                 and de-Initialization codes.
@@ -195,7 +193,7 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
   - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/timer_if.c                           Configure RTC Alarm, Tick and Calendar manager
   - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart.c                              This file provides code for the configuration
                                                                                 of the USART instances.
-  - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart_if.c                           Configuration of UART MX driver interface for hyperterminal communication
+  - LoRaWAN_AT_Slave_DualCore/CM4/Core/Src/usart_if.c                           Configuration of UART driver interface for hyperterminal communication
   - LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/app_lorawan.c                     Application of the LRWAN Middleware
   - LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_app.c                        Application of the LRWAN Middleware
   - LoRaWAN_AT_Slave_DualCore/CM4/LoRaWAN/App/lora_at.c                         AT command API
@@ -204,35 +202,36 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
   - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/LmHandler_mbwrapper.c                   This file implements the CM4 side wrapper of the LoraMac interface
                                                                                 shared between M0 and M4.
   - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmux.c                                 CM4 side multiplexer to map features to IPCC channels
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.c                           Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.c                          allows CM4 applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c                         allows CM4 applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c                           allows CM4 applic to handle the SYSTEM MBMUX channel.
-  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c                         allows CM4 applic to receive by CM0 TRACE via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_lora.c                          allows CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c                         allows CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c                           allows CM4 application to handle the SYSTEM MBMUX channel.
+  - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c                         allows CM4 application to receive by CM0 TRACE via MBMUX
   - LoRaWAN_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c                       This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
-  - LoRaWAN_AT_Slave_DualCore/Common/Board/board_resources.c                    Source file
   - LoRaWAN_AT_Slave_DualCore/Common/System/system_stm32wlxx.c                  CMSIS Cortex Device Peripheral Access Layer System Source File
   - LoRaWAN_AT_Slave_DualCore/Common/System/sys_debug.c                         Enables 4 debug pins for internal signals RealTime debugging
+  - LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c STM32CubeIDE Minimal System calls file
+  - LoRaWAN_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c   STM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - CM0PLUS (Mw and radio drivers config) 
-        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, radio_board_if.h, main.h, etc
-    - CM4 (Lora appli)
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, main.h, etc
+    - CM4 (Lora application)
         - sys_conf.h, lora_app.h, nucleo_conf.h, main.h, etc
-    - Careful: 
+    - Careful:
         - the region and class chosen on CM4/LoRaWAN/App/lora_app.h shall be compatible with CM0PLUS/LoRaWAN/Target/lorawan_conf.h list
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
 
   -Set Up:
 
@@ -243,11 +242,11 @@ Applications, SubGHz_Phy, LoRaWAN, AT_Slave, DualCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all CM4 files and load your image into CM4 target memory
-  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory 
+  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory
   - Reset the system (two cores)
   - Run the example
   - Open a Terminal, connected the LoRa Object
@@ -257,21 +256,23 @@ In order to make the program work, you must do the following :
   - type AT? to get all available commands
   - Send your AT commands by typing them in the terminal
 
-@par How to use IAR to debug ? 
-  - open project.eww and select CM4 project
-  - make sure the flag DEBUGGER_ON =1 in app_conf.h
-  - better to define the flag LOW_POWER_DISABLE = 1 at least on one MCU (currently debugger has problem in dual core STOP mode)
-  - compile and download (Ctrl + D)
+@par How to debug ?
+  - Open your preferred toolchain and select CM4 project
+  - define the flag DEBUGGER_ENABLED to 1 in CM4\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download
   - put a breakpoint in sys_app.c one line after HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
   - run CM4 (the above functions sets PWR_CR4_C2BOOT flag)
-  - open a second instance of project.eww and select CM0PLUS project
-  - compile and download using "Download active application" 
+  - open a second instance of your preferred toolchain and select CM0PLUS project
+  - to debug CM0PLUS as well, define the flag DEBUGGER_ENABLED to 1 in CM0PLUS\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download using "Download active application"
   - once CM0PLUS code is downloaded reset (system reset) the CM4
   - run CM4 to the breakpoint again
-  - attach to running target CM0PLUS 
+  - attach to running target CM0PLUS
          (CM0PLUS is in a while loop waiting CM4 to give green light to go further)
          (this is done to prevent CM0PLUS to execute too much code before attaching)
-  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exite the while loop
+  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exit the while loop
 
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/.extSettings b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/board_resources.h
deleted file mode 100644
index 953761d8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/board_resources.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/main.h
index 3447444b..4a727e13 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -62,24 +61,23 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
 #define LED1_Pin GPIO_PIN_15
 #define LED1_GPIO_Port GPIOB
 #define LED2_Pin GPIO_PIN_9
 #define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
 #define RF_CTRL3_Pin GPIO_PIN_3
 #define RF_CTRL3_GPIO_Port GPIOC
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
 #define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
 #define RF_CTRL2_Pin GPIO_PIN_5
 #define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define RF_CTRL1_Pin GPIO_PIN_4
 #define RF_CTRL1_GPIO_Port GPIOC
 #define BUT3_Pin GPIO_PIN_6
@@ -93,8 +91,8 @@ void Error_Handler(void);
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32wlxx_hal_conf.h
index a5fe461f..f027e308 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32wlxx_nucleo_conf.h
index 0390fb82..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     10U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_app.h
index b185d933..e5077a35 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -33,6 +35,11 @@ extern "C" {
 
 /* USER CODE END Includes */
 
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -68,36 +75,30 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
 /**
   * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
-  * @param  none
   * @retval battery level
   */
 uint8_t GetBatteryLevel(void);
 
 /**
   * @brief  callback to get the current temperature in the MCU
-  * @param  none
   * @retval temperature level
   */
 uint16_t GetTemperatureLevel(void);
 
 /**
   * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
+  * @param  id unique ID
   */
 void GetUniqueId(uint8_t *id);
 
 /**
   * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
   * @retval devAddr Device Address
   */
 uint32_t GetDevAddr(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_conf.h
index b3806936..cea8b074 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -41,29 +43,33 @@ extern "C" {
   * @brief Temperature and pressure values are retrieved from sensors shield
   *        (instead of sending dummy values). It requires MEMS IKS shield
   */
-#define SENSOR_ENABLED  0
+#define SENSOR_ENABLED              0
 
 /**
   * @brief  Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_debug.h
index bbae8f87..710e8852 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_debug.h
@@ -43,89 +43,89 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/**  Definition for Debug Line 1   **/
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 /* USER CODE BEGIN EC */
 
@@ -137,39 +137,41 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
@@ -177,9 +179,20 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initializes the debug
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_sensors.h
index 27c3485c..fc37f342 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_sensors.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/sys_sensors.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SENSORS_H__
@@ -54,13 +56,12 @@ typedef struct
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
 #define HTS221_0    0U
 #define LPS22HB_0   1U
 #endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
-
-/* USER CODE BEGIN EC */
-
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -75,15 +76,15 @@ typedef struct
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief  initialises the environmental sensor
+  * @brief  initialize the environmental sensor
   */
-void  EnvSensors_Init(void);
+int32_t EnvSensors_Init(void);
 
 /**
   * @brief  Environmental sensor  read.
   * @param  sensor_data sensor data
   */
-void EnvSensors_Read(sensor_t *sensor_data);
+int32_t EnvSensors_Read(sensor_t *sensor_data);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/usart.h
index 1315adaf..20bb5dfa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/utilities_conf.h
index f48ff71a..3317d66e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -136,9 +138,9 @@ extern "C" {
 #define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
 #define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
 #define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
-#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
 #define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
-#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
 #define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
 #define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/utilities_def.h
index 366e51bc..cd95d70b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/main.c
index 1eb7044b..070513c4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -157,6 +158,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/rtc.c
index 4464f7dc..c616f129 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,10 +71,13 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/stm32wlxx_it.c
index a6edc739..f9f3f995 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/stm32wlxx_it.c
@@ -76,7 +76,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -187,7 +189,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_app.c
index 95c07269..a3e4d33f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,9 +27,9 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 #include "sys_sensors.h"
 
 /* USER CODE BEGIN Includes */
@@ -66,16 +68,10 @@
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
-  */
-static void Gpio_PreInit(void);
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -83,16 +79,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -101,13 +93,15 @@ void SystemApp_Init(void)
 
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-  /*Initialises timer and RTC*/
+
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
-  Gpio_PreInit();
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -115,6 +109,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -132,6 +127,7 @@ void SystemApp_Init(void)
 #elif !defined (LOW_POWER_DISABLE)
 #error LOW_POWER_DISABLE not defined
 #endif /* LOW_POWER_DISABLE */
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
@@ -139,8 +135,6 @@ void SystemApp_Init(void)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -164,7 +158,7 @@ uint8_t GetBatteryLevel(void)
 
   batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
 
-  /* Convert batterey level from mV to linea scale: 1 (very low) to 254 (fully charged) */
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
   if (batteryLevelmV > VDD_BAT)
   {
     batteryLevel = LORAWAN_MAX_BAT;
@@ -258,11 +252,12 @@ uint32_t GetDevAddr(void)
 
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
+
 static void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -276,45 +271,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -355,13 +311,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -376,13 +330,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -393,13 +345,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -414,4 +364,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_debug.c
index 2e4c40f7..f0395f5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_debug.c
@@ -41,6 +41,7 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
+
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 
@@ -58,39 +59,121 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
-  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
-  /* Enable the GPIO Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
   GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -108,44 +191,42 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
 #endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
-
-  /* USER CODE END DBG_Init_Last */
-}
-/* USER CODE BEGIN EF */
+#endif /* CORE_CM4 */
 
-/* USER CODE END EF */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-/* Private Functions Definition -----------------------------------------------*/
+  /* USER CODE END DBG_ProbesInit_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_sensors.c
index e2c80e45..3afffff8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_sensors.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/sys_sensors.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.c
@@ -16,12 +17,14 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "sys_conf.h"
 #include "sys_sensors.h"
 
+/* USER CODE BEGIN Includes */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -104,9 +107,6 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN Includes */
-
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -120,15 +120,14 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
 #define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
 #define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
 #define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
 #define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
 #define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
 #define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
-
-/* USER CODE BEGIN PD */
-
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -137,6 +136,8 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -151,9 +152,6 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -162,11 +160,9 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-void EnvSensors_Read(sensor_t *sensor_data)
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
 {
-  /* USER CODE BEGIN EnvSensors_Read_1 */
-
-  /* USER CODE END EnvSensors_Read_1 */
+  /* USER CODE BEGIN EnvSensors_Read */
   float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
   float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
   float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
@@ -198,17 +194,14 @@ void EnvSensors_Read(sensor_t *sensor_data)
 
   sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
   sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
-  /* USER CODE BEGIN EnvSensors_Read_Last */
 
-  /* USER CODE END EnvSensors_Read_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Read */
 }
 
-void  EnvSensors_Init(void)
+int32_t  EnvSensors_Init(void)
 {
-  /* USER CODE BEGIN EnvSensors_Init_1 */
-
-  /* USER CODE END EnvSensors_Init_1 */
-
+  /* USER CODE BEGIN EnvSensors_Init */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
   /* Init */
 #if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
@@ -259,9 +252,8 @@ void  EnvSensors_Init(void)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif /* SENSOR_ENABLED  */
-  /* USER CODE BEGIN EnvSensors_Init_Last */
-
-  /* USER CODE END EnvSensors_Init_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/timer_if.c
index 615131a0..66e51602 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -104,6 +104,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -153,7 +164,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -173,9 +183,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -183,18 +193,21 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
     /*overload RTC feature enable*/
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -277,64 +290,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,7 +379,7 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
@@ -383,6 +402,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -392,16 +412,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -428,24 +448,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/usart.c
index 49d236d5..be36fe23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_usart2_tx;
 void MX_USART2_UART_Init(void)
 {
 
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
   huart2.Instance = USART2;
-  huart2.Init.BaudRate = USART_BAUDRATE;
+  huart2.Init.BaudRate = 115200;
   huart2.Init.WordLength = UART_WORDLENGTH_8B;
   huart2.Init.StopBits = UART_STOPBITS_1;
   huart2.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_USART2_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/usart_if.c
index f91e9839..182f1990 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&huart2);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewd
index 93a094e2..5b211ffa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewd
@@ -40,11 +40,11 @@
                 </option>
                 <option>
                     <name>MemOverride</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\config\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewp
index 873bc5f6..76e7ed5b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewp
@@ -16,15 +16,15 @@
                 <debug>1</debug>
                 <option>
                     <name>ExePath</name>
-                    <state>LoRaWAN_End_Node\Exe</state>
+                    <state>LoRaWAN_End_Node/Exe</state>
                 </option>
                 <option>
                     <name>ObjPath</name>
-                    <state>LoRaWAN_End_Node\Obj</state>
+                    <state>LoRaWAN_End_Node/Obj</state>
                 </option>
                 <option>
                     <name>ListPath</name>
-                    <state>LoRaWAN_End_Node\List</state>
+                    <state>LoRaWAN_End_Node/List</state>
                 </option>
                 <option>
                     <name>GEndianMode</name>
@@ -32,11 +32,11 @@
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
                 </option>
                 <option>
                     <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
                 </option>
                 <option>
                     <name>GOutputBinary</name>
@@ -108,7 +108,7 @@
                 <option>
                     <name>GeneralMisraRules04</name>
                     <version>0</version>
-                    <state>011111111111111110111111111111111111111111111010110100111111111111110111111111111111111111111111111111110111111011111111111111111111111111111</state>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
                 </option>
                 <option>
                     <name>RTConfigPath2</name>
@@ -218,10 +218,15 @@
                 <version>34</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>CCDefines</name>
-                    <state>STM32WL55xx</state>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
                 </option>
                 <option>
                     <name>CCPreprocFile</name>
@@ -350,22 +355,23 @@
                     <state>$PROJ_DIR$/../LoRaWAN/App</state>
                     <state>$PROJ_DIR$/../LoRaWAN/Target</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -428,11 +434,11 @@
                 </option>
                 <option>
                     <name>IccStaticDestr</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCppInlineSemantics</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCmsis</name>
@@ -442,10 +448,6 @@
                     <name>IccFloatSemantics</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCNoLiteralPool</name>
                     <state>0</state>
@@ -784,7 +786,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1050,72 +1052,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>App</name>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\app_lorawan.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\CayenneLpp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\lora_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\App\lora_info.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_sensors.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1123,10 +1059,79 @@
             </file>
         </group>
         <group>
-            <name>Target</name>
-            <file>
-                <name>$PROJ_DIR$\..\LoRaWAN\Target\radio_board_if.c</name>
-            </file>
+            <name>User</name>
+            <group>
+                <name>Core</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_sensors.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
+                </file>
+            </group>
+            <group>
+                <name>LoRaWAN</name>
+                <group>
+                    <name>App</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\app_lorawan.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\CayenneLpp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\lora_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\lora_info.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Target</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\Target\radio_board_if.c</name>
+                    </file>
+                </group>
+            </group>
         </group>
     </group>
     <group>
@@ -1139,9 +1144,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_End_Node</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1211,114 +1213,111 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
+            </file>
         </group>
     </group>
     <group>
         <name>Middlewares</name>
         <group>
             <name>LoRaWAN</name>
-            <group>
-                <name>Crypto</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
-                </file>
-            </group>
-            <group>
-                <name>LmHandler</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmCtxMgmt.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Mac</name>
-                <group>
-                    <name>Region</name>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
-                    </file>
-                </group>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Utilities</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
-                </file>
-            </group>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
+            </file>
         </group>
         <group>
             <name>SubGHz_Phy</name>
@@ -1328,6 +1327,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1350,6 +1352,9 @@
         <file>
             <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
         </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
         </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/Commissioning.h
index bb1c4293..f827d8ed 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/Commissioning.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/Commissioning.h
@@ -26,21 +26,19 @@
   * @brief   End-device commissioning parameters
   ******************************************************************************
  */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __COMMISSIONING_H__
 #define __COMMISSIONING_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 /*!
  ******************************************************************************
  ********************************** WARNING ***********************************
  ******************************************************************************
 
- The LoRaWAN AES128 keys are stored and provisionned on secure-elements.
+ The LoRaWAN AES128 keys are stored and provisioned on secure-elements.
 
- This project providdes a software emulated secure-element.
+ This project provides a software emulated secure-element.
  The LoRaWAN AES128 keys SHALL be updated under
  src/peripherals/<secure-element name>-se\se-identity.h file.
 
@@ -81,8 +79,4 @@ extern "C" {
 
 /* USER CODE END EC2 */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c
index ba6f23a9..f7038db8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_lorawan.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.h
index 2c49b393..fbe16b6d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_LORAWAN_H__
 #define __APP_LORAWAN_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported Functions Prototypes------------------------------------------------------- */
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Init(void);
 
 /**
   * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app.c
index 8bb68479..805ace5e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -52,11 +54,11 @@
 typedef enum TxEventType_e
 {
   /**
-    * @brief AppdataTransmition issue based on timer every TxDutyCycleTime
+    * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
     */
   TX_ON_TIMER,
   /**
-    * @brief AppdataTransmition external event plugged on OnSendEvent( )
+    * @brief Appdata Transmission external event plugged on OnSendEvent( )
     */
   TX_ON_EVENT
   /* USER CODE BEGIN TxEventType_t */
@@ -80,59 +82,32 @@ typedef enum TxEventType_e
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief  LoRa endNode send request
-  * @param  none
-  * @retval none
+  * @brief  LoRa End Node send request
   */
 static void SendTxData(void);
 
 /**
   * @brief  TX timer callback function
-  * @param  timer context
-  * @retval none
+  * @param  context ptr of timer context
   */
 static void OnTxTimerEvent(void *context);
 
-/**
-  * @brief  LED Tx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnTxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Rx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnRxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Join timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnJoinTimerLedEvent(void *context);
-
 /**
   * @brief  join event callback function
-  * @param  params
-  * @retval none
+  * @param  joinParams status of join
   */
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
 
 /**
   * @brief  tx event callback function
-  * @param  params
-  * @retval none
+  * @param  params status of last Tx
   */
 static void OnTxData(LmHandlerTxParams_t *params);
 
 /**
-  * @brief callback when LoRa endNode has received a frame
-  * @param appData
-  * @param params
-  * @retval None
+  * @brief callback when LoRa application has received a frame
+  * @param appData data received in the last Rx
+  * @param params status of last Rx
   */
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
@@ -144,19 +119,27 @@ static void OnMacProcessNotify(void);
 
 /* USER CODE BEGIN PFP */
 
-/* USER CODE END PFP */
+/**
+  * @brief  LED Tx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnTxTimerLedEvent(void *context);
 
-/* Private variables ---------------------------------------------------------*/
 /**
-  * @brief User application buffer
+  * @brief  LED Rx timer callback function
+  * @param  context ptr of LED context
   */
-static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+static void OnRxTimerLedEvent(void *context);
 
 /**
-  * @brief User application data structure
+  * @brief  LED Join timer callback function
+  * @param  context ptr of LED context
   */
-static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+static void OnJoinTimerLedEvent(void *context);
+
+/* USER CODE END PFP */
 
+/* Private variables ---------------------------------------------------------*/
 static ActivationType_t ActivationType = LORAWAN_DEFAULT_ACTIVATION_TYPE;
 
 /**
@@ -166,6 +149,8 @@ static LmHandlerCallbacks_t LmHandlerCallbacks =
 {
   .GetBatteryLevel =           GetBatteryLevel,
   .GetTemperature =            GetTemperatureLevel,
+  .GetUniqueId =               GetUniqueId,
+  .GetDevAddr =                GetDevAddr,
   .OnMacProcess =              OnMacProcessNotify,
   .OnJoinRequest =             OnJoinRequest,
   .OnTxData =                  OnTxData,
@@ -184,11 +169,6 @@ static LmHandlerParams_t LmHandlerParams =
   .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
 };
 
-/**
-  * @brief Specifies the state of the application LED
-  */
-static uint8_t AppLedStateOn = RESET;
-
 /**
   * @brief Type of Event to generate application Tx
   */
@@ -199,6 +179,22 @@ static TxEventType_t EventType = TX_ON_TIMER;
   */
 static UTIL_TIMER_Object_t TxTimer;
 
+/* USER CODE BEGIN PV */
+/**
+  * @brief User application buffer
+  */
+static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+
+/**
+  * @brief User application data structure
+  */
+static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+
+/**
+  * @brief Specifies the state of the application LED
+  */
+static uint8_t AppLedStateOn = RESET;
+
 /**
   * @brief Timer to handle the application Tx Led to toggle
   */
@@ -214,8 +210,6 @@ static UTIL_TIMER_Object_t RxLedTimer;
   */
 static UTIL_TIMER_Object_t JoinLedTimer;
 
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Exported functions ---------------------------------------------------------*/
@@ -227,20 +221,10 @@ void LoRaWAN_Init(void)
 {
   /* USER CODE BEGIN LoRaWAN_Init_1 */
 
-  /* USER CODE END LoRaWAN_Init_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Init(LED_BLUE);
   BSP_LED_Init(LED_GREEN);
   BSP_LED_Init(LED_RED);
   BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-  SYS_LED_Init(SYS_LED_RED);
-  SYS_PB_Init(SYS_BUTTON2, SYS_BUTTON_MODE_EXTI);
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
 
   /* Get LoRa APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION:        V%X.%X.%X\r\n",
@@ -267,6 +251,8 @@ void LoRaWAN_Init(void)
   UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
   UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
 
+  /* USER CODE END LoRaWAN_Init_1 */
+
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_LmHandlerProcess), UTIL_SEQ_RFU, LmHandlerProcess);
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), UTIL_SEQ_RFU, SendTxData);
   /* Init Info table used by LmHandler*/
@@ -277,8 +263,11 @@ void LoRaWAN_Init(void)
 
   LmHandlerConfigure(&LmHandlerParams);
 
+  /* USER CODE BEGIN LoRaWAN_Init_2 */
   UTIL_TIMER_Start(&JoinLedTimer);
 
+  /* USER CODE END LoRaWAN_Init_2 */
+
   LmHandlerJoin(ActivationType);
 
   if (EventType == TX_ON_TIMER)
@@ -290,12 +279,11 @@ void LoRaWAN_Init(void)
   }
   else
   {
+    /* USER CODE BEGIN LoRaWAN_Init_3 */
+
     /* send every time button is pushed */
-#if defined(USE_BSP_DRIVER)
     BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_PB_Init(SYS_BUTTON1, SYS_BUTTON_MODE_EXTI);
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
+    /* USER CODE END LoRaWAN_Init_3 */
   }
 
   /* USER CODE BEGIN LoRaWAN_Init_Last */
@@ -303,77 +291,33 @@ void LoRaWAN_Init(void)
   /* USER CODE END LoRaWAN_Init_Last */
 }
 
-#if defined(USE_BSP_DRIVER)
-void BSP_PB_Callback(Button_TypeDef Button)
-{
-#warning: adapt stm32wlxx_it.c to call BSP_PB_IRQHandler if you want to use BSP
-  /* USER CODE BEGIN BSP_PB_Callback_1 */
-
-  /* USER CODE END BSP_PB_Callback_1 */
-  switch (Button)
-  {
-    case  BUTTON_SW1:
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
-      /* USER CODE BEGIN PB_Callback 1 */
-      /* USER CODE END PB_Callback 1 */
-      break;
-    case  BUTTON_SW2:
-      /* USER CODE BEGIN PB_Callback 2 */
-      /* USER CODE END PB_Callback 2 */
-      break;
-    case  BUTTON_SW3:
-      /* USER CODE BEGIN PB_Callback 3 */
-      /* USER CODE END PB_Callback 3 */
-      break;
-    default:
-      break;
-  }
-  /* USER CODE BEGIN BSP_PB_Callback_Last */
-
-  /* USER CODE END BSP_PB_Callback_Last */
-}
-
-#elif defined(MX_BOARD_PSEUDODRIVER)
-
-/* Note: Current MX does not support EXTI IP neither BSP. */
+/* USER CODE BEGIN PB_Callbacks */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
 /* In order to get a push button IRS by code automatically generated */
-/* this function is today the only available possibility. */
-/* Calling BSP_PB_Callback() from here it shortcuts the BSP. */
-/* If users wants to go through the BSP, it can remove BSP_PB_Callback() from here */
-/* and add a call to BSP_PB_IRQHandler() in the USER CODE SESSION of the */
-/* correspondent EXTIn_IRQHandler() in the stm32wlxx_it.c */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_1 */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_1 */
   switch (GPIO_Pin)
   {
-    case  SYS_BUTTON1_PIN:
-      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialised */
+    case  BUTTON_SW1_PIN:
+      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
-      /* USER CODE BEGIN EXTI_Callback_Switch_B1 */
-      /* USER CODE END EXTI_Callback_Switch_B1 */
       break;
-    case  SYS_BUTTON2_PIN:
-      /* USER CODE BEGIN EXTI_Callback_Switch_B2 */
-      /* USER CODE END EXTI_Callback_Switch_B2 */
+    case  BUTTON_SW2_PIN:
+      break;
+    case  BUTTON_SW3_PIN:
       break;
-    /* USER CODE BEGIN EXTI_Callback_Switch_case */
-
-    /* USER CODE END EXTI_Callback_Switch_case */
     default:
-    /* USER CODE BEGIN EXTI_Callback_Switch_default */
-    /* USER CODE END EXTI_Callback_Switch_default */
       break;
   }
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_Last */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_Last */
 }
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER*/
+
+/* USER CODE END PB_Callbacks */
 
 /* Private functions ---------------------------------------------------------*/
 /* USER CODE BEGIN PrFD */
@@ -383,15 +327,10 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
 {
   /* USER CODE BEGIN OnRxData_1 */
-
-  /* USER CODE END OnRxData_1 */
-  if ((appData != NULL) && (params != NULL))
+  if ((appData != NULL) || (params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
     BSP_LED_On(LED_BLUE) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
+
     UTIL_TIMER_Start(&RxLedTimer);
 
     static const char *slotStrings[] = { "1", "2", "C", "C Multicast", "B Ping-Slot", "B Multicast Ping-Slot" };
@@ -434,42 +373,27 @@ static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
           if (AppLedStateOn == RESET)
           {
             APP_LOG(TS_OFF, VLEVEL_H,   "LED OFF\r\n");
-
-#if defined(USE_BSP_DRIVER)
             BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
           }
           else
           {
             APP_LOG(TS_OFF, VLEVEL_H, "LED ON\r\n");
-#if defined(USE_BSP_DRIVER)
             BSP_LED_On(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_On(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
           }
         }
         break;
-    /* USER CODE BEGIN OnRxData_Switch_case */
 
-    /* USER CODE END OnRxData_Switch_case */
       default:
-    /* USER CODE BEGIN OnRxData_Switch_default */
 
-    /* USER CODE END OnRxData_Switch_default */
         break;
     }
   }
-
-  /* USER CODE BEGIN OnRxData_2 */
-
-  /* USER CODE END OnRxData_2 */
+  /* USER CODE END OnRxData_1 */
 }
 
 static void SendTxData(void)
 {
+  /* USER CODE BEGIN SendTxData_1 */
   uint16_t pressure = 0;
   int16_t temperature = 0;
   sensor_t sensor_data;
@@ -484,9 +408,6 @@ static void SendTxData(void)
   int32_t longitude = 0;
   uint16_t altitudeGps = 0;
 #endif /* CAYENNE_LPP */
-  /* USER CODE BEGIN SendTxData_1 */
-
-  /* USER CODE END SendTxData_1 */
 
   EnvSensors_Read(&sensor_data);
   temperature = (SYS_GetTemperatureLevel() >> 8);
@@ -554,9 +475,8 @@ static void SendTxData(void)
   {
     APP_LOG(TS_ON, VLEVEL_L, "Next Tx in  : ~%d second(s)\r\n", (nextTxIn / 1000));
   }
-  /* USER CODE BEGIN SendTxData_2 */
 
-  /* USER CODE END SendTxData_2 */
+  /* USER CODE END SendTxData_1 */
 }
 
 static void OnTxTimerEvent(void *context)
@@ -573,101 +493,62 @@ static void OnTxTimerEvent(void *context)
   /* USER CODE END OnTxTimerEvent_2 */
 }
 
+/* USER CODE BEGIN PrFD_LedEvents */
 static void OnTxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnTxTimerLedEvent_1 */
-
-  /* USER CODE END OnTxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_GREEN) ;
-#else
-  SYS_LED_Off(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnTxTimerLedEvent_2 */
-
-  /* USER CODE END OnTxTimerLedEvent_2 */
 }
 
 static void OnRxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnRxTimerLedEvent_1 */
-
-  /* USER CODE END OnRxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_BLUE) ;
-#else
-  SYS_LED_Off(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnRxTimerLedEvent_2 */
-
-  /* USER CODE END OnRxTimerLedEvent_2 */
 }
 
 static void OnJoinTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnJoinTimerLedEvent_1 */
-
-  /* USER CODE END OnJoinTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Toggle(LED_RED) ;
-#else
-  SYS_LED_Toggle(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnJoinTimerLedEvent_2 */
-
-  /* USER CODE END OnJoinTimerLedEvent_2 */
 }
 
+/* USER CODE END PrFD_LedEvents */
+
 static void OnTxData(LmHandlerTxParams_t *params)
 {
   /* USER CODE BEGIN OnTxData_1 */
-
-  /* USER CODE END OnTxData_1 */
-  if ((params != NULL) && (params->IsMcpsConfirm != 0))
+  if ((params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_GREEN) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-    UTIL_TIMER_Start(&TxLedTimer);
-
-    APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
-    APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
-            params->AppData.Port, params->Datarate, params->TxPower);
-
-    APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
-    if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
-    {
-      APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
-    }
-    else
+    /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
+    if (params->IsMcpsConfirm != 0)
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
-    }
-  }
+      BSP_LED_On(LED_GREEN) ;
+      UTIL_TIMER_Start(&TxLedTimer);
 
-  /* USER CODE BEGIN OnTxData_2 */
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
+      APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
+              params->AppData.Port, params->Datarate, params->TxPower);
 
-  /* USER CODE END OnTxData_2 */
+      APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
+      if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
+      }
+    }
+  }
+  /* USER CODE END OnTxData_1 */
 }
 
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
 {
   /* USER CODE BEGIN OnJoinRequest_1 */
-
-  /* USER CODE END OnJoinRequest_1 */
   if (joinParams != NULL)
   {
     if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
     {
       UTIL_TIMER_Stop(&JoinLedTimer);
-
-#if defined(USE_BSP_DRIVER)
       BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-      SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
 
       APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOINED = ");
       if (joinParams->Mode == ACTIVATION_TYPE_ABP)
@@ -684,10 +565,7 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
       APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOIN FAILED\r\n");
     }
   }
-
-  /* USER CODE BEGIN OnJoinRequest_2 */
-
-  /* USER CODE END OnJoinRequest_2 */
+  /* USER CODE END OnJoinRequest_1 */
 }
 
 static void OnMacProcessNotify(void)
@@ -696,6 +574,7 @@ static void OnMacProcessNotify(void)
 
   /* USER CODE END OnMacProcessNotify_1 */
   UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LmHandlerProcess), CFG_SEQ_Prio_0);
+
   /* USER CODE BEGIN OnMacProcessNotify_2 */
 
   /* USER CODE END OnMacProcessNotify_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app.h
index a48306a2..b7ac7358 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_APP_H__
@@ -114,8 +116,6 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void LoRaWAN_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app_version.h
index 0428551f..2de4d3bf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_info.c
index 74150427..3fd1204b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.c
@@ -16,20 +17,17 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "LoRaMac.h"
 #include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
 
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
 /* Private typedef -----------------------------------------------------------*/
 
 /* USER CODE BEGIN PTD */
@@ -112,6 +110,10 @@ void LoraInfo_Init(void)
   if (loraInfo.Region == 0)
   {
     APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
     while (1) {} /* At least one region shall be defined */
   }
 
@@ -126,7 +128,7 @@ void LoraInfo_Init(void)
   loraInfo.ActivationMode = 3;
 #else /* LORAWAN_KMS == 1 */
   loraInfo.Kms = 1;
-  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALISATION + (OVER_THE_AIR_ACTIVATION << 1);
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
 #endif /* LORAWAN_KMS */
   /* USER CODE BEGIN LoraInfo_Init_2 */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_info.h
index 92abccde..0608fd34 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/lora_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #ifndef __LORA_INFO_H__
 #define __LORA_INFO_H__
 
@@ -68,15 +71,12 @@ typedef struct
 
 /* Exported functions ------------------------------------------------------- */
 /**
-  * @brief initialises the LoraInfo table
-  * @param none
-  * @retval  none
+  * @brief initialize the LoraInfo table
   */
 void LoraInfo_Init(void);
 
 /**
   * @brief returns the pointer to the LoraInfo capabilities table
-  * @param none
   * @retval LoraInfo pointer
   */
 LoraInfo_t *LoraInfo_GetPtr(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/se-identity.h
index 77f059d3..9b628efe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/se-identity.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/App/se-identity.h
@@ -1,5 +1,5 @@
 /*!
- * \file      se-identity_template.h
+ * \file      se-identity.h
  *
  * \brief     Secure Element identity and keys
  *
@@ -28,11 +28,12 @@
   *
   *          Portions COPYRIGHT 2020 STMicroelectronics
   *
-  * @file    se-identity_template.c
+  * @file    se-identity.h
   * @author  MCD Application Team
   * @brief   Secure Element identity and keys
   ******************************************************************************
   */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SOFT_SE_IDENTITY_H__
 #define __SOFT_SE_IDENTITY_H__
@@ -145,7 +146,7 @@ extern "C" {
 
 #if (USE_LRWAN_1_1_X_CRYPTO == 1)
 #define SESSION_KEYS_LIST                                                                                           \
-           {                                                                                                        \
+        {                                                                                                           \
             /*!                                                                                                     \
              * Join session integrity key (Dynamically updated)                                                     \
              * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/lorawan_conf.h
index 22a1d086..8e25c9bd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/lorawan_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/lorawan_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lorawan_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORAWAN_CONF_H__
@@ -25,8 +27,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-#include "sys_app.h"   /* needed for APP_PRINTF */
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -40,7 +40,7 @@ extern "C" {
 
 /* Region ------------------------------------*/
 /* the region listed here will be linked in the MW code */
-/* the applic (on sys_conf.h) shall just configure one region at the time */
+/* the application (on sys_conf.h) shall just configure one region at the time */
 /*#define REGION_AS923*/
 /*#define REGION_AU915*/
 /*#define REGION_CN470*/
@@ -52,15 +52,30 @@ extern "C" {
 #define REGION_US915
 /*#define REGION_RU864*/
 
-#define HYBRID_ENABLED          0
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
 
-#define KEY_LOG_ENABLED         1
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
 
 /* Class B ------------------------------------*/
 #define LORAMAC_CLASSB_ENABLED  0
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-/* CLASS B LSE crystall calibration*/
+/* CLASS B LSE crystal calibration*/
 /**
   * \brief Temperature coefficient of the clock source
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.h
index 3e3c7abb..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     10U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_conf.h
index 29cc81b5..375c9ddc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,7 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
-#include "stm32_mem.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,20 +48,16 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-
-/**
-  * @brief Max payload buffer size
-  */
-#define RADIO_RX_BUF_SIZE          255
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -67,25 +65,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -125,6 +140,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/systime.h
index f3ce93b2..1991b928 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/systime.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/systime.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    systime.h
@@ -16,8 +17,9 @@
   *
   ******************************************************************************
   */
-/* Define to prevent recursive inclusion -------------------------------------*/
+/* USER CODE END Header */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTIME_H__
 #define __SYSTIME_H__
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN_End_Node.ioc b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN_End_Node.ioc
index e09c45f3..506648fe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN_End_Node.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/LoRaWAN_End_Node.ioc
@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
@@ -29,17 +29,15 @@ Dma.USART2_TX.0.SyncSignalID=NONE
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
-LORAWAN.Activate_BOARD_RESOURCES=M4
 LORAWAN.Activate_DEBUG_LINE=true
-LORAWAN.Activate_RADIO_BOARD_INTERFACE=true
-LORAWAN.DEBUGGER_ON=false
-LORAWAN.IPParameters=Activate_DEBUG_LINE,Activate_BOARD_RESOURCES,DEBUGGER_ON,Activate_RADIO_BOARD_INTERFACE,SUBGHZ_APPLICATION
+LORAWAN.Activate_RADIO_BOARD_INTERFACE=Bsp
+LORAWAN.IPParameters=Activate_RADIO_BOARD_INTERFACE,SUBGHZ_APPLICATION,Activate_DEBUG_LINE
 LORAWAN.SUBGHZ_APPLICATION=LORA_END_NODE
-LoRaWAN.BSP.number=16
+LoRaWAN.BSP.number=7
 LoRaWAN0.BSP.STBoard=false
 LoRaWAN0.BSP.api=Unknown
 LoRaWAN0.BSP.component=
-LoRaWAN0.BSP.condition=SEM_LORA_AT_SLAVE | SEM_LORA_END_NODE
+LoRaWAN0.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_ADC
 LoRaWAN0.BSP.i2caddr=0
 LoRaWAN0.BSP.i2creg=
 LoRaWAN0.BSP.instance=ADC
@@ -51,7 +49,7 @@ LoRaWAN0.BSP.solution=ADC
 LoRaWAN1.BSP.STBoard=false
 LoRaWAN1.BSP.api=Unknown
 LoRaWAN1.BSP.component=
-LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION
+LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_RTC
 LoRaWAN1.BSP.i2caddr=0
 LoRaWAN1.BSP.i2creg=
 LoRaWAN1.BSP.instance=RTC
@@ -60,231 +58,126 @@ LoRaWAN1.BSP.mode=RTC Enabled
 LoRaWAN1.BSP.name=RTC
 LoRaWAN1.BSP.semaphore=
 LoRaWAN1.BSP.solution=RTC
-LoRaWAN10.BSP.STBoard=false
-LoRaWAN10.BSP.api=Unknown
-LoRaWAN10.BSP.component=
-LoRaWAN10.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN10.BSP.i2caddr=0
-LoRaWAN10.BSP.i2creg=
-LoRaWAN10.BSP.instance=PC3
-LoRaWAN10.BSP.ip=GPIO
-LoRaWAN10.BSP.mode=Output
-LoRaWAN10.BSP.name=RF SW CTRL 3
-LoRaWAN10.BSP.semaphore=
-LoRaWAN10.BSP.solution=PC3
-LoRaWAN11.BSP.STBoard=false
-LoRaWAN11.BSP.api=Unknown
-LoRaWAN11.BSP.component=
-LoRaWAN11.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN11.BSP.i2caddr=0
-LoRaWAN11.BSP.i2creg=
-LoRaWAN11.BSP.instance=PA0
-LoRaWAN11.BSP.ip=GPIO
-LoRaWAN11.BSP.mode=EXTI
-LoRaWAN11.BSP.name=BUTTON 1
-LoRaWAN11.BSP.semaphore=
-LoRaWAN11.BSP.solution=PA0
-LoRaWAN12.BSP.STBoard=false
-LoRaWAN12.BSP.api=Unknown
-LoRaWAN12.BSP.component=
-LoRaWAN12.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN12.BSP.i2caddr=0
-LoRaWAN12.BSP.i2creg=
-LoRaWAN12.BSP.instance=PC4
-LoRaWAN12.BSP.ip=GPIO
-LoRaWAN12.BSP.mode=Output
-LoRaWAN12.BSP.name=RF SW CTRL 1
-LoRaWAN12.BSP.semaphore=
-LoRaWAN12.BSP.solution=PC4
-LoRaWAN13.BSP.STBoard=false
-LoRaWAN13.BSP.api=Unknown
-LoRaWAN13.BSP.component=
-LoRaWAN13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN13.BSP.i2caddr=0
-LoRaWAN13.BSP.i2creg=
-LoRaWAN13.BSP.instance=PC5
-LoRaWAN13.BSP.ip=GPIO
-LoRaWAN13.BSP.mode=Output
-LoRaWAN13.BSP.name=RF SW CTRL 2
-LoRaWAN13.BSP.semaphore=
-LoRaWAN13.BSP.solution=PC5
-LoRaWAN14.BSP.STBoard=false
-LoRaWAN14.BSP.api=Unknown
-LoRaWAN14.BSP.component=
-LoRaWAN14.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN14.BSP.i2caddr=0
-LoRaWAN14.BSP.i2creg=
-LoRaWAN14.BSP.instance=PC6
-LoRaWAN14.BSP.ip=GPIO
-LoRaWAN14.BSP.mode=EXTI
-LoRaWAN14.BSP.name=BUTTON 3
-LoRaWAN14.BSP.semaphore=
-LoRaWAN14.BSP.solution=PC6
-LoRaWAN15.BSP.STBoard=false
-LoRaWAN15.BSP.api=Unknown
-LoRaWAN15.BSP.component=
-LoRaWAN15.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN15.BSP.i2caddr=0
-LoRaWAN15.BSP.i2creg=
-LoRaWAN15.BSP.instance=PA1
-LoRaWAN15.BSP.ip=GPIO
-LoRaWAN15.BSP.mode=EXTI
-LoRaWAN15.BSP.name=BUTTON 2
-LoRaWAN15.BSP.semaphore=
-LoRaWAN15.BSP.solution=PA1
 LoRaWAN2.BSP.STBoard=false
 LoRaWAN2.BSP.api=Unknown
 LoRaWAN2.BSP.component=
-LoRaWAN2.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN2.BSP.condition=SEM_LORA_END_NODE  | SEM_LORA_USE_UART
 LoRaWAN2.BSP.i2caddr=0
 LoRaWAN2.BSP.i2creg=
-LoRaWAN2.BSP.instance=PB12
-LoRaWAN2.BSP.ip=GPIO
-LoRaWAN2.BSP.mode=Output
-LoRaWAN2.BSP.name=Debug Line 1
+LoRaWAN2.BSP.instance=USART2
+LoRaWAN2.BSP.ip=(LPU|US)ART
+LoRaWAN2.BSP.mode=Asynchronous
+LoRaWAN2.BSP.name=USART
 LoRaWAN2.BSP.semaphore=
-LoRaWAN2.BSP.solution=PB12
+LoRaWAN2.BSP.solution=USART2
 LoRaWAN3.BSP.STBoard=false
 LoRaWAN3.BSP.api=Unknown
 LoRaWAN3.BSP.component=
-LoRaWAN3.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN3.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN3.BSP.i2caddr=0
 LoRaWAN3.BSP.i2creg=
-LoRaWAN3.BSP.instance=PB13
+LoRaWAN3.BSP.instance=PB12
 LoRaWAN3.BSP.ip=GPIO
 LoRaWAN3.BSP.mode=Output
-LoRaWAN3.BSP.name=Debug Line 2
+LoRaWAN3.BSP.name=Debug Line 1
 LoRaWAN3.BSP.semaphore=
-LoRaWAN3.BSP.solution=PB13
+LoRaWAN3.BSP.solution=PB12
 LoRaWAN4.BSP.STBoard=false
 LoRaWAN4.BSP.api=Unknown
 LoRaWAN4.BSP.component=
-LoRaWAN4.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN4.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN4.BSP.i2caddr=0
 LoRaWAN4.BSP.i2creg=
-LoRaWAN4.BSP.instance=PB14
+LoRaWAN4.BSP.instance=PB13
 LoRaWAN4.BSP.ip=GPIO
 LoRaWAN4.BSP.mode=Output
-LoRaWAN4.BSP.name=Debug Line 3
+LoRaWAN4.BSP.name=Debug Line 2
 LoRaWAN4.BSP.semaphore=
-LoRaWAN4.BSP.solution=PB14
+LoRaWAN4.BSP.solution=PB13
 LoRaWAN5.BSP.STBoard=false
 LoRaWAN5.BSP.api=Unknown
 LoRaWAN5.BSP.component=
-LoRaWAN5.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN5.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN5.BSP.i2caddr=0
 LoRaWAN5.BSP.i2creg=
-LoRaWAN5.BSP.instance=PB10
+LoRaWAN5.BSP.instance=PB14
 LoRaWAN5.BSP.ip=GPIO
 LoRaWAN5.BSP.mode=Output
-LoRaWAN5.BSP.name=Debug Line 4
+LoRaWAN5.BSP.name=Debug Line 3
 LoRaWAN5.BSP.semaphore=
-LoRaWAN5.BSP.solution=PB10
+LoRaWAN5.BSP.solution=PB14
 LoRaWAN6.BSP.STBoard=false
 LoRaWAN6.BSP.api=Unknown
 LoRaWAN6.BSP.component=
-LoRaWAN6.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
+LoRaWAN6.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN6.BSP.i2caddr=0
 LoRaWAN6.BSP.i2creg=
-LoRaWAN6.BSP.instance=PB11
+LoRaWAN6.BSP.instance=PB10
 LoRaWAN6.BSP.ip=GPIO
 LoRaWAN6.BSP.mode=Output
-LoRaWAN6.BSP.name=LED 3
+LoRaWAN6.BSP.name=Debug Line 4
 LoRaWAN6.BSP.semaphore=
-LoRaWAN6.BSP.solution=PB11
-LoRaWAN7.BSP.STBoard=false
-LoRaWAN7.BSP.api=Unknown
-LoRaWAN7.BSP.component=
-LoRaWAN7.BSP.condition=SEM_LORA_END_NODE
-LoRaWAN7.BSP.i2caddr=0
-LoRaWAN7.BSP.i2creg=
-LoRaWAN7.BSP.instance=USART2
-LoRaWAN7.BSP.ip=(LPU|US)ART
-LoRaWAN7.BSP.mode=Asynchronous
-LoRaWAN7.BSP.name=USART
-LoRaWAN7.BSP.semaphore=
-LoRaWAN7.BSP.solution=USART2
-LoRaWAN8.BSP.STBoard=false
-LoRaWAN8.BSP.api=Unknown
-LoRaWAN8.BSP.component=
-LoRaWAN8.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN8.BSP.i2caddr=0
-LoRaWAN8.BSP.i2creg=
-LoRaWAN8.BSP.instance=PB9
-LoRaWAN8.BSP.ip=GPIO
-LoRaWAN8.BSP.mode=Output
-LoRaWAN8.BSP.name=LED 2
-LoRaWAN8.BSP.semaphore=
-LoRaWAN8.BSP.solution=PB9
-LoRaWAN9.BSP.STBoard=false
-LoRaWAN9.BSP.api=Unknown
-LoRaWAN9.BSP.component=
-LoRaWAN9.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN9.BSP.i2caddr=0
-LoRaWAN9.BSP.i2creg=
-LoRaWAN9.BSP.instance=PB15
-LoRaWAN9.BSP.ip=GPIO
-LoRaWAN9.BSP.mode=Output
-LoRaWAN9.BSP.name=LED 1
-LoRaWAN9.BSP.semaphore=
-LoRaWAN9.BSP.solution=PB15
+LoRaWAN6.BSP.solution=PB10
 Mcu.ContextProject=MonoOnDualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=SYS
-Mcu.IP11=TIMER
-Mcu.IP12=TINY_LPM
-Mcu.IP13=USART2
-Mcu.IP2=DMA
-Mcu.IP3=LORAWAN
-Mcu.IP4=MISC
-Mcu.IP5=NVIC
-Mcu.IP6=RCC
-Mcu.IP7=RTC
-Mcu.IP8=SEQUENCER_M4
-Mcu.IP9=SUBGHZ
-Mcu.IPNb=14
+Mcu.IP10=SUBGHZ
+Mcu.IP11=SYS
+Mcu.IP12=TIMER
+Mcu.IP13=TINY_LPM
+Mcu.IP14=USART2
+Mcu.IP2=DEBUG
+Mcu.IP3=DMA
+Mcu.IP4=LORAWAN
+Mcu.IP5=MISC
+Mcu.IP6=NVIC
+Mcu.IP7=RCC
+Mcu.IP8=RTC
+Mcu.IP9=SEQUENCER_M4
+Mcu.IPNb=15
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_LORAWAN_VS_LoRaWAN
-Mcu.Pin23=VP_MISC_VS_MISC
-Mcu.Pin24=VP_RTC_VS_RTC_Activate
-Mcu.Pin25=VP_RTC_VS_RTC_Calendar
-Mcu.Pin26=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin27=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin28=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin29=VP_SYS_VS_Systick
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_TIMER_VS_TIMER
-Mcu.Pin31=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=32
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_LORAWAN_VS_LoRaWAN
+Mcu.Pin25=VP_MISC_VS_MISC
+Mcu.Pin26=VP_RTC_VS_RTC_Activate
+Mcu.Pin27=VP_RTC_VS_RTC_Calendar
+Mcu.Pin28=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin29=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin31=VP_SYS_VS_None
+Mcu.Pin32=VP_TIMER_VS_TIMER
+Mcu.Pin33=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=34
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);USART_BAUDRATE,115200
+Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -299,22 +192,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.RTC_Alarm_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.TAMP_STAMP_LSECSS_SSRU_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.TimeBase=None
 NVIC.USART2_IRQn=true\:2\:0\:true\:false\:true\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4MonoOnDual
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4MonoOnDual
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -329,40 +225,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=USART2_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4MonoOnDual
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4MonoOnDual
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4MonoOnDual
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4MonoOnDual
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4MonoOnDual
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4MonoOnDual
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4MonoOnDual
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -370,26 +259,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4MonoOnDual
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4MonoOnDual
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4MonoOnDual
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4MonoOnDual
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -416,7 +308,7 @@ ProjectManager.StackSize=0x800
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false,2-MX_DMA_Init-DMA-true-HAL-false,3-SystemClock_Config-RCC-false-HAL-false,4-MX_ADC_Init-ADC-true-HAL-false,5-MX_RTC_Init-RTC-true-HAL-false,6-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false,8-MX_USART2_UART_Init-USART2-true-HAL-false
+ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false,2-MX_DMA_Init-DMA-true-HAL-false,3-SystemClock_Config-RCC-false-HAL-false,4-MX_ADC_Init-ADC-true-HAL-false,5-MX_RTC_Init-RTC-true-HAL-false,6-MX_USART2_UART_Init-USART2-true-HAL-false,7-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false,8-MX_LoRaWAN_Init-LORAWAN-false-HAL-false
 RCC.AHBFreq_Value=48000000
 RCC.APB1Freq_Value=48000000
 RCC.APB1TimFreq_Value=48000000
@@ -426,6 +318,7 @@ RCC.APB3Freq_Value=48000000
 RCC.CortexFreq_Value=48000000
 RCC.FCLKCortexFreq_Value=48000000
 RCC.FamilyName=M
+RCC.HCLK2Freq_Value=4000000
 RCC.HCLK3Freq_Value=48000000
 RCC.HCLKFreq_Value=48000000
 RCC.HSE_VALUE=8000000
@@ -434,12 +327,11 @@ RCC.I2C1Freq_Value=48000000
 RCC.I2C2Freq_Value=48000000
 RCC.I2C3Freq_Value=48000000
 RCC.I2S2Freq_Value=16000000
-RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,CortexFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
+RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,CortexFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
 RCC.LPTIM1Freq_Value=48000000
 RCC.LPTIM2Freq_Value=48000000
 RCC.LPTIM3Freq_Value=48000000
-RCC.LPUART1CLockSelection=RCC_LPUART1CLKSOURCE_LSE
-RCC.LPUART1Freq_Value=32768
+RCC.LPUART1Freq_Value=48000000
 RCC.LSCOPinFreq_Value=32000
 RCC.LSE_VALUE=32768
 RCC.MCO1PinFreq_Value=48000000
@@ -461,7 +353,7 @@ RTC.Alarm-Alarm\ A=RTC_ALARM_A
 RTC.AsynchPrediv=RTC_PREDIV_A
 RTC.BinMode=RTC_BINARY_ONLY
 RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
-RTC.IPParameters=Alarm-Alarm A,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A
+RTC.IPParameters=Alarm-Alarm A,AsynchPrediv,BinMode,BinaryAutoClr_A-Alarm A
 SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI0.ConfNb=1
 SH.GPXTI1.0=GPIO_EXTI1
@@ -470,9 +362,8 @@ SH.GPXTI6.0=GPIO_EXTI6
 SH.GPXTI6.ConfNb=1
 SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
-USART2.BaudRate=USART_BAUDRATE
 USART2.FIFOMode=FIFOMODE_ENABLE
-USART2.IPParameters=VirtualMode-Asynchronous,BaudRate,FIFOMode
+USART2.IPParameters=VirtualMode-Asynchronous,FIFOMode
 USART2.VirtualMode-Asynchronous=VM_ASYNC
 VP_ADC_TempSens_Input.Mode=IN-TempSens
 VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
@@ -494,10 +385,13 @@ VP_SEQUENCER_M4_VS_SEQUENCER.Mode=SEQUENCER_Enabled
 VP_SEQUENCER_M4_VS_SEQUENCER.Signal=SEQUENCER_M4_VS_SEQUENCER
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=LoRaWAN_End_Node
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvoptx
index 4a10e92a..00c4d379 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>32000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,67 +195,67 @@
   </Target>
 
   <Group>
-    <GroupName>Application/App</GroupName>
-    <tvExp>1</tvExp>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/App/app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/App/CayenneLpp.c</PathWithFileName>
-      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/App/lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\LoRaWAN\App\lora_info.c</PathWithFileName>
-      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
       <FileNumber>5</FileNumber>
@@ -243,8 +263,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -255,8 +275,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -267,8 +287,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -279,8 +299,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_sensors.c</PathWithFileName>
+      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -291,8 +311,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -303,8 +323,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -315,8 +335,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -327,8 +347,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -339,8 +359,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -351,8 +371,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -363,8 +383,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -375,96 +395,84 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/LoRaWAN/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_sensors.c</PathWithFileName>
-      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/CayenneLpp.c</PathWithFileName>
+      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../LoRaWAN/Target/radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <PathWithFileName>../LoRaWAN/App/lora_info.c</PathWithFileName>
+      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -478,7 +486,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <FileNumber>22</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -498,7 +506,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -510,7 +518,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -523,11 +531,23 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>7</GroupNumber>
       <FileNumber>26</FileNumber>
@@ -535,238 +555,242 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
       <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>45</FileNumber>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -779,35 +803,31 @@
   </Group>
 
   <Group>
-    <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
+    <GroupName>Drivers/CMSIS</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>46</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
-      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
-      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/LoRaWAN</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>9</GroupNumber>
       <FileNumber>48</FileNumber>
@@ -815,326 +835,330 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
-      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
+      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
+      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</PathWithFileName>
-      <FilenameWithoutPath>NvmCtxMgmt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
+      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
+      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</PathWithFileName>
+      <FilenameWithoutPath>RegionBaseUS.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
-      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</PathWithFileName>
+      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</PathWithFileName>
+      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</PathWithFileName>
+      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</PathWithFileName>
-      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</PathWithFileName>
-      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</PathWithFileName>
-      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</PathWithFileName>
-      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</PathWithFileName>
-      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>13</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>73</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>74</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</PathWithFileName>
+      <FilenameWithoutPath>NvmDataMgmt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>75</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
       <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -1149,26 +1173,38 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>73</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>76</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>74</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>77</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>78</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1181,8 +1217,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>75</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>79</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1193,56 +1229,68 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>76</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>80</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>77</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>81</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>78</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>82</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>79</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>83</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>80</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>84</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>85</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1253,14 +1301,14 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>81</FileNumber>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>86</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvprojx
index d78ffdac..6a280566 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvprojx
@@ -10,15 +10,15 @@
       <TargetName>LoRaWAN_End_Node</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LoRaWAN_End_Node\Exe\</OutputDirectory>
+          <OutputDirectory>LoRaWAN_End_Node\</OutputDirectory>
           <OutputName>LoRaWAN_End_Node</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -138,10 +138,10 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -183,8 +183,9 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -335,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>STM32WL55xx,CORE_CM4</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../LoRaWAN/App;../LoRaWAN/Target;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace</IncludePath>
+              <IncludePath>../Core/Inc;../LoRaWAN/App;../LoRaWAN/Target;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -351,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -380,62 +381,52 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/App</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>app_lorawan.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../LoRaWAN/App/app_lorawan.c</FilePath>
-            </File>
-            <File>
-              <FileName>CayenneLpp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../LoRaWAN/App/CayenneLpp.c</FilePath>
-            </File>
-            <File>
-              <FileName>lora_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../LoRaWAN/App/lora_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>lora_info.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\LoRaWAN\App\lora_info.c</FilePath>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/User/Core</GroupName>
           <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/main.c</FilePath>
+            </File>
             <File>
               <FileName>adc.c</FileName>
               <FileType>1</FileType>
               <FilePath>../Core/Src/adc.c</FilePath>
             </File>
             <File>
-              <FileName>adc_if.c</FileName>
+              <FileName>dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/adc_if.c</FilePath>
+              <FilePath>../Core/Src/dma.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/board_resources.c</FilePath>
+              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>dma.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/dma.c</FilePath>
+              <FilePath>../Core/Src/sys_app.c</FilePath>
             </File>
             <File>
-              <FileName>main.c</FileName>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/main.c</FilePath>
+              <FilePath>../Core/Src/sys_debug.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>sys_sensors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/rtc.c</FilePath>
+              <FilePath>../Core/Src/sys_sensors.c</FilePath>
             </File>
             <File>
               <FileName>timer_if.c</FileName>
@@ -443,19 +434,19 @@
               <FilePath>../Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>adc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../Core/Src/adc_if.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+              <FilePath>../Core/Src/usart_if.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../Core/Src/rtc.c</FilePath>
             </File>
             <File>
               <FileName>subghz.c</FileName>
@@ -463,49 +454,54 @@
               <FilePath>../Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_debug.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_debug.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_sensors.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_sensors.c</FilePath>
+              <FilePath>../Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>usart_if.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart_if.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
+          <GroupName>Application/User/LoRaWAN/Target</GroupName>
           <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FileName>radio_board_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/Target/radio_board_if.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/Target</GroupName>
+          <GroupName>Application/User/LoRaWAN/App</GroupName>
           <Files>
             <File>
-              <FileName>radio_board_if.c</FileName>
+              <FileName>app_lorawan.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../LoRaWAN/Target/radio_board_if.c</FilePath>
+              <FilePath>../LoRaWAN/App/app_lorawan.c</FilePath>
+            </File>
+            <File>
+              <FileName>CayenneLpp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/App/CayenneLpp.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/App/lora_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_info.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/App/lora_info.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -534,24 +530,9 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -563,24 +544,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -597,6 +573,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
               <FileType>1</FileType>
@@ -608,14 +594,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -632,6 +623,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
             <File>
               <FileName>stm32wlxx_hal_uart.c</FileName>
               <FileType>1</FileType>
@@ -645,158 +646,153 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
+          <GroupName>Drivers/CMSIS</GroupName>
           <Files>
             <File>
-              <FileName>lorawan_aes.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
+              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/LoRaWAN</GroupName>
+          <Files>
+            <File>
+              <FileName>LmhpCompliance.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
             </File>
             <File>
               <FileName>cmac.c</FileName>
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
             </File>
+            <File>
+              <FileName>lorawan_aes.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
+            </File>
             <File>
               <FileName>soft-se.c</FileName>
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
-          <Files>
             <File>
-              <FileName>LmHandler.c</FileName>
+              <FileName>Region.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</FilePath>
             </File>
             <File>
-              <FileName>LmhpCompliance.c</FileName>
+              <FileName>RegionAS923.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</FilePath>
             </File>
             <File>
-              <FileName>NvmCtxMgmt.c</FileName>
+              <FileName>RegionAU915.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
-          <Files>
             <File>
-              <FileName>LoRaMac.c</FileName>
+              <FileName>RegionBaseUS.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacAdr.c</FileName>
+              <FileName>RegionCN470.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacClassB.c</FileName>
+              <FileName>RegionCN779.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCommands.c</FileName>
+              <FileName>RegionCommon.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileName>RegionEU433.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCrypto.c</FileName>
+              <FileName>RegionEU868.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacParser.c</FileName>
+              <FileName>RegionIN865.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacSerializer.c</FileName>
+              <FileName>RegionKR920.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-          <Files>
             <File>
-              <FileName>Region.c</FileName>
+              <FileName>RegionRU864.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</FilePath>
             </File>
             <File>
-              <FileName>RegionAS923.c</FileName>
+              <FileName>RegionUS915.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</FilePath>
             </File>
             <File>
-              <FileName>RegionAU915.c</FileName>
+              <FileName>LoRaMac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
             </File>
             <File>
-              <FileName>RegionCN470.c</FileName>
+              <FileName>LoRaMacAdr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
             </File>
             <File>
-              <FileName>RegionCN779.c</FileName>
+              <FileName>LoRaMacClassB.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
             </File>
             <File>
-              <FileName>RegionCommon.c</FileName>
+              <FileName>LoRaMacCommands.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
             </File>
             <File>
-              <FileName>RegionEU433.c</FileName>
+              <FileName>LoRaMacConfirmQueue.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
             </File>
             <File>
-              <FileName>RegionEU868.c</FileName>
+              <FileName>LoRaMacCrypto.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
             </File>
             <File>
-              <FileName>RegionIN865.c</FileName>
+              <FileName>LoRaMacParser.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
             </File>
             <File>
-              <FileName>RegionKR920.c</FileName>
+              <FileName>LoRaMacSerializer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
             </File>
             <File>
-              <FileName>RegionRU864.c</FileName>
+              <FileName>LmHandler.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
             </File>
             <File>
-              <FileName>RegionUS915.c</FileName>
+              <FileName>NvmDataMgmt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-          <Files>
             <File>
               <FileName>utilities.c</FileName>
               <FileType>1</FileType>
@@ -808,14 +804,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -828,24 +829,29 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
               <FileName>stm32_timer.c</FileName>
@@ -853,9 +859,9 @@
               <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -879,4 +885,19 @@
     <files/>
   </RTE>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
 </Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/startup_stm32wl55xx_cm4.s
index 7f10bb2c..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size      EQU     0x00000800
+Stack_Size		EQU     0x800
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x00000200
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/.cproject
index b7c8b9af..e72a9fb0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/.cproject
@@ -1,175 +1,176 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1482509941">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1482509941" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1482509941" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1482509941." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1809953239" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.133403873" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1169845621" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1466618490" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.68056944" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.611006265" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.55384965" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1991806295" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.89451165" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.961603001" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1057184881" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2098032333" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.276675579" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1245189394" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1668122417" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.377546145" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.653319510" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1155291299" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.2103610047" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/Target | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../LoRaWAN/App | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.611324519" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.216780214" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.288747390" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.344559782" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.137102589" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.414389759" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.88969209" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1895083473" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.349699771" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.494474042" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.185590387" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.996713053" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1022522097" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2089215826" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.17019042" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1934557908" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../LoRaWAN/Target"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.654304580" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.328304571" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1730548091" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1481999463" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.287756022" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.2102620077" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1864097544" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.449860308" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1428099590" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1746950837" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1976994278" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1944207685" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1421055350" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.796162615" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.467659430" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.638759871" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.134136717" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.841541399" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1936258395" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.465847713" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.642779066" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.665438639" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.585661314" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.119991765" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.761461515" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1642893864" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1053549156" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.833122807" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.536155632" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1555106420" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.91181407" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.16306751" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1950275040" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.638348487">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.638348487" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.842072465">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.842072465" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.638348487" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.638348487." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1174449370" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.2068769578" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.480496340" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1529309055" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1312261298" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1376643525" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.211784284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.874526011" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1643061834" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.104808495" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.270406787" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.164285363" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1323558672" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.842072465" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.842072465." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.628144182" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.2079728176" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.467096959" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1220095777" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2109882892" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.239742593" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/Target | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../LoRaWAN/App | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.504306143" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.820311016" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1121803732" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1317616676" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1232841293" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1387894228" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1186636068" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.116562187" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.879835597" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1540810907" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.633674641" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1119592399" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2024044405" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.856011892" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1851387201" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../LoRaWAN/Target"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1915858196" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1477344818" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.96774579" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2000165817" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1544313952" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1464259023" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.394418466" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.737412589" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.896745272" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1203846103" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.901266862" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1749026972" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1425112380" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.715223353" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.902399020" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.356911763" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1183040759" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.711640493" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.565660637" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.463813055" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.2012880749" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.553349603" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1253679641" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.359816335" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.517914326" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.294900630" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1006395667" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.638917960" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.942483246" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.778042775" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.542913376" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1837483445" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.807803134" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -177,19 +178,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LoRaWAN_End_Node.null.954652633" name="LoRaWAN_End_Node"/>
+		<project id="LoRaWAN_End_Node.null.790240540" name="LoRaWAN_End_Node"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.638348487;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.638348487.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1387894228;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1915858196">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.185590387;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.328304571">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1482509941;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1482509941.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.88969209;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.654304580">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.842072465;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.842072465.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1540810907;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1477344818">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="refreshScope"/>
-</cproject>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/.project
index 8d15ecf3..4f01b2fa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/.project
@@ -25,7 +25,6 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
@@ -36,407 +35,432 @@
 		<link>
 			<name>LoRaWAN_End_Node.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN_End_Node.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN_End_Node.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/CayenneLpp.c</name>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/App/CayenneLpp.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/app_lorawan.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/App/app_lorawan.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/lora_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/App/lora_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/lora_info.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_info.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/adc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/adc_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/board_resources.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/dma.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/main.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/rtc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32_lpm_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_it.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/subghz.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_debug.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_debug.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_sensors.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_sensors.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/timer_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/radio_board_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
+			<name>Middlewares/LoRaWAN/LmHandler.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
+			<name>Middlewares/LoRaWAN/LmhpCompliance.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMac.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacAdr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacClassB.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacCommands.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacConfirmQueue.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacCrypto.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacParser.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<name>Middlewares/LoRaWAN/LoRaMacSerializer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<name>Middlewares/LoRaWAN/NvmDataMgmt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<name>Middlewares/LoRaWAN/Region.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<name>Middlewares/LoRaWAN/RegionAS923.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<name>Middlewares/LoRaWAN/RegionAU915.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<name>Middlewares/LoRaWAN/RegionBaseUS.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<name>Middlewares/LoRaWAN/RegionCN470.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<name>Middlewares/LoRaWAN/RegionCN779.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<name>Middlewares/LoRaWAN/RegionCommon.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<name>Middlewares/LoRaWAN/RegionEU433.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<name>Middlewares/LoRaWAN/RegionEU868.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
+			<name>Middlewares/LoRaWAN/RegionIN865.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Middlewares/LoRaWAN/RegionKR920.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Middlewares/LoRaWAN/RegionRU864.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionUS915.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/cmac.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/lorawan_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Crypto/lorawan_aes.c</name>
+			<name>Middlewares/LoRaWAN/soft-se.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Crypto/cmac.c</name>
+			<name>Middlewares/LoRaWAN/utilities.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Crypto/soft-se.c</name>
+			<name>Middlewares/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/LmHandler/LmHandler.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/LmHandler/LmhpCompliance.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/LmHandler/NvmCtxMgmt.c</name>
+			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMac.c</name>
+			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacAdr.c</name>
+			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacClassB.c</name>
+			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacCommands.c</name>
+			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacConfirmQueue.c</name>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacCrypto.c</name>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacParser.c</name>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/LoRaMacSerializer.c</name>
+			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Utilities/utilities.c</name>
+			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/Region.c</name>
+			<name>Application/User/Core/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionAS923.c</name>
+			<name>Application/User/Core/sys_sensors.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_sensors.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionAU915.c</name>
+			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionCN470.c</name>
+			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionCN779.c</name>
+			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionCommon.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionEU433.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionEU868.c</name>
+			<name>Application/User/LoRaWAN/App/CayenneLpp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/CayenneLpp.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionIN865.c</name>
+			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/app_lorawan.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionKR920.c</name>
+			<name>Application/User/LoRaWAN/App/lora_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_app.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionRU864.c</name>
+			<name>Application/User/LoRaWAN/App/lora_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_info.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/LoRaWAN/Mac/Region/RegionUS915.c</name>
+			<name>Application/User/LoRaWAN/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/Target/radio_board_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/Core/sysmem.c
deleted file mode 100644
index 656b3aa2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/Core/sysmem.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- ******************************************************************************
- * @file      sysmem.c
- * @author    Generated by STM32CubeIDE
- * @brief     STM32CubeIDE System Memory calls file
- *
- *            For more information about which C functions
- *            need which of these lowlevel functions
- *            please consult the newlib libc manual
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- ******************************************************************************
- */
-
-/* Includes */
-#include <errno.h>
-#include <stdint.h>
-
-/**
- * Pointer to the current high watermark of the heap usage
- */
-static uint8_t *__sbrk_heap_end = NULL;
-
-/**
- * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
- *        and others from the C library
- *
- * @verbatim
- * ############################################################################
- * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
- * #         #        #                         # Reserved by _Min_Stack_Size #
- * ############################################################################
- * ^-- RAM start      ^-- _end                             _estack, RAM end --^
- * @endverbatim
- *
- * This implementation starts allocating at the '_end' linker symbol
- * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
- * The implementation considers '_estack' linker symbol to be RAM end
- * NOTE: If the MSP stack, at any point during execution, grows larger than the
- * reserved size, please increase the '_Min_Stack_Size'.
- *
- * @param incr Memory size
- * @return Pointer to allocated memory
- */
-void *_sbrk(ptrdiff_t incr)
-{
-  extern uint8_t _end; /* Symbol defined in the linker script */
-  extern uint8_t _estack; /* Symbol defined in the linker script */
-  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
-  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
-  const uint8_t *max_heap = (uint8_t *)stack_limit;
-  uint8_t *prev_heap_end;
-
-  /* Initialize  heap end at first call */
-  if (NULL == __sbrk_heap_end)
-  {
-    __sbrk_heap_end = &_end;
-  }
-
-  /* Protect heap from growing into the reserved MSP stack */
-  if (__sbrk_heap_end + incr > max_heap)
-  {
-    errno = ENOMEM;
-    return (void *)-1;
-  }
-
-  prev_heap_end = __sbrk_heap_end;
-  __sbrk_heap_end += incr;
-
-  return (void *)prev_heap_end;
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/sysmem.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/sysmem.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/sysmem.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
index 002329fa..f2b8d4d8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -1,39 +1,73 @@
 /*
-** LinkerScript
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
 */
 
 /* Entry Point */
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "SRAM1" Ram type memory */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
 
-_Min_Heap_Size  = 0x200; /* required amount of heap  */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
 _Min_Stack_Size = 0x800 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 256K
-  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K    /* Non-backup SRAM1 */
-  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K    /* Backup SRAM2 */
+  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 256K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -43,80 +77,82 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
-  /* Initialized data sections into "SRAM1" Ram type memory */
-  .data : 
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM1 AT> ROM
 
-  /* Uninitialized data section into "SRAM1" Ram type memory */
-  . = ALIGN(8);
+  } >RAM1 AT> FLASH
+
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -126,34 +162,12 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM1
 
-  /* Data section into "SRAM1" Ram type memory: Non-backup SRAM1 dedicated to CM4 */
-  . = ALIGN(8);
-  RAM1_region :
-  {
-    _sRAM1_region = .;         /* define a global symbol at section start */
-    *(.RAM1_region)
-
-    . = ALIGN(8);
-    _eRAM1_region = .;         /* define a global symbol at section end */
-  } >RAM1
-
-  /* Data section into "SRAM2" Ram type memory: Backup SRAM2 dedicated to CM4 */
-  . = ALIGN(8);
-  RAM2_region :
-  {
-    _sRAM2_region = .;         /* define a global symbol at section start */
-    *(.RAM2_region)
-
-    . = ALIGN(8);
-    _eRAM2_region = .;         /* define a global symbol at section end */
-  } >RAM2
-
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
   ._user_heap_stack :
   {
     . = ALIGN(8);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/readme.txt
index 65c8ecb4..a6b754a3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node/readme.txt
@@ -1,12 +1,12 @@
 /**
   @page LoRaWAN_End_Node Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/LoRaWAN/LoRaWAN_End_Node/readme.txt 
+  * @file    Applications/LoRaWAN/LoRaWAN_End_Node/readme.txt
   * @author  MCD Application Team
   * @brief   This application is a simple demo application software of a LoRa
-  *          modem connecting to Network server. Data sent can be checked on 
+  *          modem connecting to Network server. Data sent can be checked on
   *          Network server for eg Loriot. Traces are displayed over UART
   ******************************************************************************
   * @attention
@@ -26,6 +26,7 @@
 
 This directory contains a set of source files that implements a LoRa application
 device sending sensors data to LoRa Network server.
+Data are sent periodically on timer event or on "user button 1" depending on the configuration.
 
 This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
   ******************************************************************************
@@ -34,13 +35,12 @@ This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx
 
 Applications, SubGHz_Phy, LoRaWAN, End_Node, SingleCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - LoRaWAN_End_Node/Core/Inc/adc.h                                             This file contains all the function prototypes for
                                                                                 the adc.c file
   - LoRaWAN_End_Node/Core/Inc/adc_if.h                                          Header for ADC interface configuration
-  - LoRaWAN_End_Node/Core/Inc/board_resources.h                                 Header for driver at.c module
   - LoRaWAN_End_Node/Core/Inc/dma.h                                             This file contains all the function prototypes for
                                                                                 the dma.c file
   - LoRaWAN_End_Node/Core/Inc/main.h                                            : Header for main.c file.
@@ -81,7 +81,6 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, SingleCore
   - LoRaWAN_End_Node/Core/Src/adc.c                                             This file provides code for the configuration
                                                                                 of the ADC instances.
   - LoRaWAN_End_Node/Core/Src/adc_if.c                                          Read status related to the chip (battery level, VREF, chip temperature)
-  - LoRaWAN_End_Node/Core/Src/board_resources.c                                 Source file
   - LoRaWAN_End_Node/Core/Src/dma.c                                             This file provides code for the configuration
                                                                                 of all the requested memory to memory DMA transfers.
   - LoRaWAN_End_Node/Core/Src/main.c                                            : Main program body
@@ -100,30 +99,29 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, SingleCore
   - LoRaWAN_End_Node/Core/Src/timer_if.c                                        Configure RTC Alarm, Tick and Calendar manager
   - LoRaWAN_End_Node/Core/Src/usart.c                                           This file provides code for the configuration
                                                                                 of the USART instances.
-  - LoRaWAN_End_Node/Core/Src/usart_if.c                                        Configuration of UART MX driver interface for hyperterminal communication
+  - LoRaWAN_End_Node/Core/Src/usart_if.c                                        Configuration of UART driver interface for hyperterminal communication
   - LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c                                  Application of the LRWAN Middleware
   - LoRaWAN_End_Node/LoRaWAN/App/CayenneLpp.c                                   Implements the Cayenne Low Power Protocol
   - LoRaWAN_End_Node/LoRaWAN/App/lora_app.c                                     Application of the LRWAN Middleware
   - LoRaWAN_End_Node/LoRaWAN/App/lora_info.c                                    To give info to the application about LoRaWAN configuration
   - LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c                            This file provides an interface layer between MW and Radio Board
-  - LoRaWAN_End_Node/STM32CubeIDE/Application/Core/syscalls.c                   STM32CubeIDE Minimal System calls file
-  - LoRaWAN_End_Node/STM32CubeIDE/Application/Core/sysmem.c                     STM32CubeIDE System Memory calls file
+  - LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/syscalls.c              STM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/sysmem.c                STM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - sys_conf.h, radio_conf.h, lorawan_conf.h, lora_app.h, Commissioning.h, se-identity.h, mw_log_conf.h, radio_board_if.h, nucleo_conf.h, main.h, etc
-    - Careful: 
+    - sys_conf.h, radio_conf.h, lorawan_conf.h, lora_app.c, lora_app.h, Commissioning.h, se-identity.h, mw_log_conf.h, main.h, etc
+    - Careful:
         - the region and class chosen on LoRaWAN/App/lora_app.h shall be compatible with LoRaWAN/Target/lorawan_conf.h list
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
 
   -Set Up:
 
@@ -134,13 +132,18 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, SingleCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all files and load your image into target memory
   - Run the example
   - Open a Terminal, connected the LoRa Object
   - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
 
+@par How to debug ?
+  - make sure the flag DEBUGGER_ENABLED to 1 in sys_conf.h
+  - simpler to define the flag LOW_POWER_DISABLE to 1 as well
+  - compile, download and attach
+
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/.extSettings b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
index 45049335..40330641 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM0PLUS_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_CommandRcv_cb     command callback
   * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_config.h
index 4534c749..6d61b1e2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 #define KMS_NVM_SLOT_NUMBERS                     (50UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,31 +167,35 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 #define KMS_DERIVE_KEY
 
 /**
   * @brief KMS_SEARCH Uncomment the below line to support key search or mechanism search services
   */
-//#define KMS_SEARCH
+#define KMS_SEARCH
 
 /**
   * @brief KMS_GENERATE_KEYS Uncomment the below line to support key generation services
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 #define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 #define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
index 9a324008..1c890dbe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    kms_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef KMS_IF_H
@@ -67,4 +69,3 @@ extern "C" {
 #endif /* KMS_IF_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
index 8cf9cfbf..c6688943 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
@@ -37,13 +37,11 @@ extern "C" {
  * - Pool #3 is a 512 Bytes pool
  */
 /* USER CODE BEGIN KMS_MEM_POOL_Declare */
-
 KMS_MEM_DECLARE_POOL_START()
 KMS_MEM_DECLARE_POOL_ENTRY(1,256)
 KMS_MEM_DECLARE_POOL_ENTRY(2,256)
 KMS_MEM_DECLARE_POOL_ENTRY(3,512)
 KMS_MEM_DECLARE_POOL_END()
-
 /* USER CODE END KMS_MEM_POOL_Declare */
 
 /* USER CODE BEGIN KMS_MEM_POOL_DEF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
index d18e56d1..10bb7b7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
@@ -27,6 +27,7 @@
 /* USER CODE BEGIN KMS_PLATF_OBJECTS_CONFIG_Includes */
 #include "stm32wlxx.h"
 #include "Commissioning.h"
+#include "lorawan_conf.h" /* KEY_EXTRACTABLE */
 /* USER CODE END KMS_PLATF_OBJECTS_CONFIG_Includes */
 
 #ifdef __cplusplus
@@ -95,121 +96,135 @@ extern "C" {
 #pragma arm section rodata = ".USER_embedded_Keys"
 #endif
 
-KMS_DECLARE_BLOB_STRUCT(, 32)
+KMS_DECLARE_BLOB_STRUCT(, 21);
+KMS_DECLARE_BLOB_STRUCT(, 27);
 
+/* These objects are used by user tKMS application                 */
+#if defined(__GNUC__)
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
+#endif
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-/* These objects are used by user tKMS application                 */
-static const kms_obj_keyhead_32_t   Lorawan_Zero_Key =
+static const kms_obj_keyhead_27_t   Lorawan_Zero_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   1,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    CKA_DERIVE,       sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_App_Key =
+static const kms_obj_keyhead_27_t   Lorawan_App_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   2,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_APP_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_Nwk_Key =
+static const kms_obj_keyhead_27_t   Lorawan_Nwk_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   3,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_NWK_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_Nwk_S_Key =
+static const kms_obj_keyhead_21_t   Lorawan_Nwk_S_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  6,                               /*  uint32_t object_id; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_App_S_Key =
+static const kms_obj_keyhead_21_t   Lorawan_App_S_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  7,                               /*  uint32_t object_id; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_APP_S_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
@@ -218,6 +233,8 @@ static const kms_obj_keyhead_32_t   Lorawan_App_S_Key =
 #pragma default_variable_attributes =
 #elif defined(__CC_ARM)
 #pragma arm section code
+#elif defined(__GNUC__)
+#pragma GCC pop_options
 #endif
 /* USER CODE END KMS_PLATF_OBJECTS_CONFIG_Embedded_Objects_Definition */
 
@@ -232,11 +249,30 @@ const kms_obj_keyhead_t * const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBE
 {
 /* USER CODE BEGIN KMS_PlatfObjects_EmbeddedList */
   /* UserApp example keys */
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
   (kms_obj_keyhead_t *) &Lorawan_Zero_Key,            /* Index = 1 */
+#else
+  (kms_obj_keyhead_t *) NULL,                         /* Index = 1 */
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
   (kms_obj_keyhead_t *) &Lorawan_App_Key,             /* Index = 2 */
   (kms_obj_keyhead_t *) &Lorawan_Nwk_Key,             /* Index = 3 */
   (kms_obj_keyhead_t *) &Lorawan_Nwk_S_Key,           /* Index = 4 */
   (kms_obj_keyhead_t *) &Lorawan_App_S_Key,           /* Index = 5 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 8 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 12 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 13 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 14 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 15 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 16 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 20 */
 /* USER CODE END KMS_PlatfObjects_EmbeddedList */
 };
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
index 19dd412d..d6e56436 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
@@ -29,9 +29,9 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
+
 #include "app_kms.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -63,35 +63,14 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
index e3e06495..a2de8eb7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 /*#define HAL_UART_MODULE_ENABLED   */
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
index 2ed00a30..52839726 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -38,6 +40,10 @@ extern "C" {
 /* currently not supported */
 /* #define ALLOW_KMS_VIA_MBMUX */
 
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -71,29 +77,39 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
   */
 void SystemApp_Init(void);
 
 /**
   * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
+  * @param  id unique ID
   */
 void GetUniqueId(uint8_t *id);
 
 /**
   * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
   * @retval devAddr Device Address
   */
 uint32_t GetDevAddr(void);
 
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
 void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
index 3a44ccfe..f026efa4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief CM0PLUS Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
index 6f20721c..1d672420 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -35,7 +37,6 @@ extern "C" {
 #include "stm32_tiny_vsnprintf.h"
 
 #include "mbmuxif_trace.h"
-
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -157,9 +158,9 @@ extern "C" {
 #define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
 #define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
 #define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
-#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
 #define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
-#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
 #define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
 #define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
index cec8bb33..0f27bf45 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
index 617042e8..1d49b00f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
index ad72640a..d8ea5d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,7 +82,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* Enable C2AHB3 peripherals clock. */
@@ -89,14 +91,14 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccCommandRcv = IPCC_IF_CommandRcv_cb;
   IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
index 3c498ca5..75f811e1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
@@ -80,8 +80,8 @@ int main(void)
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
-  MX_LoRaWAN_Init();
   MX_KMS_Init();
+  MX_LoRaWAN_Init();
   /* USER CODE BEGIN 2 */
 
   /* USER CODE END 2 */
@@ -110,6 +110,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
index f74cd49b..ab828d03 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,17 +71,20 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
   /** Enable the Alarm B
   */
   sAlarm.Alarm = RTC_ALARM_B;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
index 3dfcda11..eb2e798d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm_if.h"
 
 /* USER CODE BEGIN Includes */
@@ -91,7 +93,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C2STOP_C2STB();
@@ -110,7 +111,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
index d453b28c..c5323b14 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -75,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -128,7 +130,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
index ba535e3b..c0f8decf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -27,15 +29,14 @@
 #include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-
 #include "msg_id.h"
-#include "features_info.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
 #include "mbmuxif_radio.h"
+#include "features_info.h"
 #include "mbmuxif_lora.h"
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-#include "mbmuxif_kms.h"
+/* #include "mbmuxif_kms.h" */
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
@@ -54,6 +55,7 @@
 
 /* Private define ------------------------------------------------------------*/
 #define MAX_TS_SIZE (int) 16
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -71,8 +73,6 @@
 /* Private function prototypes -----------------------------------------------*/
 /**
   * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
-  * @param none
-  * @retval  none
   */
 static void System_Init(void);
 
@@ -80,16 +80,12 @@ static void System_Init(void);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises MBMUXIF System and send a notification to Cm4 when ready
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   int8_t init_status;
@@ -98,6 +94,7 @@ void SystemApp_Init(void)
   /* USER CODE END SystemApp_Init_1 */
 
   /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
   /*Init low power manager*/
@@ -115,7 +112,7 @@ void SystemApp_Init(void)
   /* Init Feat_Info table */
   FEAT_INFO_Init();
 
-  /* Note: the trace is initialised in the context of MBMUXIF because it uses the MB on Cm0 side */
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
@@ -124,19 +121,14 @@ void SystemApp_Init(void)
 
   System_Init();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
 
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
-  */
 void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -156,7 +148,7 @@ void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Kms_Cmd_1 */
 
   /* USER CODE END Process_Kms_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
 
   APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
 
@@ -197,19 +189,19 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   switch (ComObj->MsgId)
   {
     case SYS_OTHER_MSG_ID:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
 
-  /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
       break;
 
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
 
-  /* USER CODE END Process_Sys_Cmd_switch_case */
+    /* USER CODE END Process_Sys_Cmd_switch_case */
 
     default:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
 
-  /* USER CODE END Process_Sys_Cmd_switch_default */
+      /* USER CODE END Process_Sys_Cmd_switch_default */
       break;
   }
 
@@ -221,16 +213,16 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Cmd_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -239,8 +231,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -299,20 +289,23 @@ uint32_t GetDevAddr(void)
   /* USER CODE BEGIN GetDevAddr_1 */
 
   /* USER CODE END GetDevAddr_1 */
+
   val = LL_FLASH_GetUDN();
   if (val == 0xFFFFFFFF)
   {
     val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
   }
+
   /* USER CODE BEGIN GetDevAddr_2 */
 
   /* USER CODE END GetDevAddr_2 */
   return val;
+
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
 static void System_Init(void)
@@ -324,7 +317,7 @@ static void System_Init(void)
   LL_C2_PWR_DisableInternWU();
 
   /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
-  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach onlt Cm4 */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
   LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
   LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
 
@@ -385,10 +378,7 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -403,13 +393,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -420,13 +408,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
index 6133e380..6405002c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -106,6 +106,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -155,7 +166,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -175,9 +185,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -185,7 +195,7 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A and Alarm B enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
     /*overload RTC feature enable*/
@@ -193,11 +203,14 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -280,64 +293,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,9 +379,9 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
 {
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
   MBMUX_ComParam_t *com_obj;
 
   if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
@@ -376,9 +395,9 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
       MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
     }
   }
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
 }
 
 void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
@@ -386,7 +405,7 @@ void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
@@ -409,6 +428,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -418,16 +438,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -454,24 +474,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
index bb1c4293..f827d8ed 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
@@ -26,21 +26,19 @@
   * @brief   End-device commissioning parameters
   ******************************************************************************
  */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __COMMISSIONING_H__
 #define __COMMISSIONING_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 /*!
  ******************************************************************************
  ********************************** WARNING ***********************************
  ******************************************************************************
 
- The LoRaWAN AES128 keys are stored and provisionned on secure-elements.
+ The LoRaWAN AES128 keys are stored and provisioned on secure-elements.
 
- This project providdes a software emulated secure-element.
+ This project provides a software emulated secure-element.
  The LoRaWAN AES128 keys SHALL be updated under
  src/peripherals/<secure-element name>-se\se-identity.h file.
 
@@ -81,8 +79,4 @@ extern "C" {
 
 /* USER CODE END EC2 */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
index bd1de5a0..bcd8821e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_lorawan.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
index 2c49b393..fbe16b6d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_LORAWAN_H__
 #define __APP_LORAWAN_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported Functions Prototypes------------------------------------------------------- */
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Init(void);
 
 /**
   * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
index 804a2ea0..2c3ddcdf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sys_app.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
index 25340cb3..8bf1f9f1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_APP_H__
 #define __LORA_APP_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
index 55a1f921..dc745797 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
index 77f059d3..9b628efe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
@@ -1,5 +1,5 @@
 /*!
- * \file      se-identity_template.h
+ * \file      se-identity.h
  *
  * \brief     Secure Element identity and keys
  *
@@ -28,11 +28,12 @@
   *
   *          Portions COPYRIGHT 2020 STMicroelectronics
   *
-  * @file    se-identity_template.c
+  * @file    se-identity.h
   * @author  MCD Application Team
   * @brief   Secure Element identity and keys
   ******************************************************************************
   */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SOFT_SE_IDENTITY_H__
 #define __SOFT_SE_IDENTITY_H__
@@ -145,7 +146,7 @@ extern "C" {
 
 #if (USE_LRWAN_1_1_X_CRYPTO == 1)
 #define SESSION_KEYS_LIST                                                                                           \
-           {                                                                                                        \
+        {                                                                                                           \
             /*!                                                                                                     \
              * Join session integrity key (Dynamically updated)                                                     \
              * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
index 8fdf8b4b..e7610e08 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lorawan_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORAWAN_CONF_H__
@@ -25,8 +27,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-#include "sys_app.h"   /* needed for APP_PRINTF */
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -51,12 +51,12 @@ extern "C" {
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
 #else /* LORAWAN_KMS == 1 */
 #define OVER_THE_AIR_ACTIVATION 1
-#define ACTIVATION_BY_PERSONALISATION 1
-#endif
+#define ACTIVATION_BY_PERSONALIZATION 1
+#endif /* LORAWAN_KMS */
 
 /* Region ------------------------------------*/
 /* the region listed here will be linked in the CM0 MW code */
-/* the applic (on CM4/sys_conf.h) shall just configure one region at the time */
+/* the application (on CM4/sys_conf.h) shall just configure one region at the time */
 /*#define REGION_AS923*/
 /*#define REGION_AU915*/
 /*#define REGION_CN470*/
@@ -68,15 +68,30 @@ extern "C" {
 #define REGION_US915
 /*#define REGION_RU864*/
 
-#define HYBRID_ENABLED          0
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
 
-#define KEY_LOG_ENABLED         1
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
 
 /* Class B ------------------------------------*/
 #define LORAMAC_CLASSB_ENABLED  0
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-/* CLASS B LSE crystall calibration*/
+/* CLASS B LSE crystal calibration*/
 /**
   * \brief Temperature coefficient of the clock source
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
index 3e3c7abb..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     10U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
index 3a3fd8a1..08263606 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,6 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,12 +49,12 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief Max payload buffer size
@@ -65,6 +68,7 @@ extern "C" {
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -72,25 +76,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -130,6 +151,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
index f3ce93b2..1991b928 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    systime.h
@@ -16,8 +17,9 @@
   *
   ******************************************************************************
   */
-/* Define to prevent recursive inclusion -------------------------------------*/
+/* USER CODE END Header */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTIME_H__
 #define __SYSTIME_H__
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
index 4d15f862..39228252 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_mem.h"
@@ -47,11 +49,11 @@
 typedef enum TxEventType_e
 {
   /*!
-   * @brief AppdataTransmition issue based on timer every TxDutyCycleTime
+   * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
    */
   TX_ON_TIMER,
   /*!
-   * @brief AppdataTransmition external event plugged on OnSendEvent( )
+   * @brief Appdata Transmission external event plugged on OnSendEvent( )
    */
   TX_ON_EVENT
 } TxEventType_t;
@@ -64,10 +66,10 @@ typedef enum TxEventType_e
 #ifndef MAX
 #define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #endif /* MAX */
-#define MCPS_SIZE MAX(sizeof(McpsConfirm_t), sizeof(McpsIndication_t))
-#define MLME_SIZE MAX(sizeof(MlmeConfirm_t), sizeof(MlmeIndication_t))
-#define LORA_MBWRAP_SHBUF_SIZE MAX(MCPS_SIZE, MLME_SIZE)
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
+#define LMH_ON_JOIN_SIZE (sizeof(LmHandlerJoinParams_t))
+#define LMH_ON_TX_SIZE   (sizeof(LmHandlerTxParams_t))
+#define LMH_ON_RX_SIZE   (((sizeof(LmHandlerAppData_t) + 7) & ~7) + 256 + (sizeof(LmHandlerRxParams_t)))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(LMH_ON_JOIN_SIZE, MAX(LMH_ON_TX_SIZE, LMH_ON_RX_SIZE))
 
 /* USER CODE BEGIN PD */
 
@@ -83,25 +85,50 @@ static uint8_t GetBatteryLevel_mbwrapper(void);
 
 static uint16_t GetTemperatureLevel_mbwrapper(void);
 
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size);
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params);
+
 static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams);
 
 static void OnTxData_mbwrapper(LmHandlerTxParams_t *params);
 
 static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass);
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params);
+
+static void OnSysTimeUpdate_mbwrapper(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM0+ to CM4
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
 static LmHandlerCallbacks_t callback_mbwrapper =
 {
   .GetBatteryLevel =           GetBatteryLevel_mbwrapper,
   .GetTemperature =            GetTemperatureLevel_mbwrapper,
+  .GetUniqueId =               GetUniqueId,
+  .GetDevAddr =                GetDevAddr,
   .OnMacProcess =              OnMacProcessNotify,
+  .OnNvmDataChange =           OnNvmDataChange_mbwrapper,
+  .OnNetworkParametersChange = OnNetworkParametersChange_mbwrapper,
   .OnJoinRequest =             OnJoinRequest_mbwrapper,
   .OnTxData =                  OnTxData_mbwrapper,
   .OnRxData =                  OnRxData_mbwrapper,
+  .OnClassChange =             OnClassChange_mbwrapper,
+  .OnBeaconStatusChange =      OnBeaconStatusChange_mbwrapper,
+  .OnSysTimeUpdate =           OnSysTimeUpdate_mbwrapper
 };
 
 /* USER CODE BEGIN PV */
@@ -114,17 +141,19 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Lora_Cmd_1 */
 
   /* USER CODE END Process_Lora_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;
+  uint32_t *com_buffer = NULL;
   LmHandlerErrorStatus_t errorStatus;
   LmHandlerFlagStatus_t flagStatus;
   int32_t ret_code;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(LoRa)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
-    case LMHANDLER_INITIALIZATION_ID:
+    case   LMHANDLER_INITIALIZATION_ID:
       errorStatus = LmHandlerInit(&callback_mbwrapper);
 
       /* prepare response buffer */
@@ -141,7 +170,7 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = (uint32_t) errorStatus; /* */
       break;
 
-    case LMHANDLER_JOIN_STATUS_ID:
+    case   LMHANDLER_JOIN_STATUS_ID:
       flagStatus = LmHandlerJoinStatus();
 
       /* prepare response buffer */
@@ -222,6 +251,54 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal = (uint32_t) ret_code; /* */
       break;
+    case   LMHANDLER_GET_NWKKEY_ID:
+      ret_code = LmHandlerGetNwkKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKKEY_ID:
+      ret_code = LmHandlerSetNwkKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPKEY_ID:
+      ret_code = LmHandlerGetAppKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPKEY_ID:
+      ret_code = LmHandlerSetAppKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_NWKSKEY_ID:
+      ret_code = LmHandlerGetNwkSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKSKEY_ID:
+      ret_code = LmHandlerSetNwkSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPSKEY_ID:
+      ret_code = LmHandlerGetAppSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPSKEY_ID:
+      ret_code = LmHandlerSetAppSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
     case   LMHANDLER_GET_NWKID_ID:
       ret_code = LmHandlerGetNetworkID((uint32_t *) com_buffer[0]);
       /* prepare response buffer */
@@ -384,6 +461,18 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal = (uint32_t) ret_code; /* */
       break;
+    case LMHANDLER_LINK_CHECK_REQ_ID:
+      ret_code = LmHandlerLinkCheckReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case LMHANDLER_DEVICE_TIME_REQ_ID:
+      ret_code = LmHandlerDeviceTimeReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
     case   LMHANDLER_INFO_INIT_ID:
       LoraInfo_Init();
       /* prepare response buffer */
@@ -462,19 +551,92 @@ static uint16_t GetTemperatureLevel_mbwrapper(void)
   /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
 }
 
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size)
+{
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_1 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)state;
+  com_buffer[1] = (uint32_t)size;
+  com_obj->ParamCnt = 2;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_2 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_2 */
+}
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params)
+{
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_1 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(CommissioningParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_2 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_2 */
+}
+
 static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams)
 {
   /* USER CODE BEGIN OnJoinRequest_mbwrapper_1 */
 
   /* USER CODE END OnJoinRequest_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
+  if (joinParams != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_JOIN_REQ_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (joinParams == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
   com_obj->ParamCnt = 1;
 
   MBMUXIF_LoraSendNotif();
@@ -492,13 +654,27 @@ static void OnTxData_mbwrapper(LmHandlerTxParams_t *params)
 
   /* USER CODE END OnTxData_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_TX_DATA_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
   com_obj->ParamCnt = 1;
 
   MBMUXIF_LoraSendNotif();
@@ -516,16 +692,50 @@ static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t
 
   /* USER CODE END OnRxData_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  /* need to 8-align the next address */
-  uint8_t next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
+  uint32_t *com_buffer = NULL;
+  uint8_t next_addr = 0;
+
+  if (appData != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
+    /* need to 8-align the next address */
+    next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
+
+    if (appData->BufferSize > 0)
+    {
+      UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], appData->Buffer, appData->BufferSize);
+      ((LmHandlerAppData_t *)aLoraMbWrapShare2Buffer)->Buffer = &aLoraMbWrapShare2Buffer[next_addr];
+      next_addr = (appData->BufferSize + 7) & ~7;
+    }
+  }
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
+  }
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
-  UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_RX_DATA_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
-  com_obj->ParamBuf[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (appData == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
+  if (params == NULL)
+  {
+    com_buffer[1] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
+  }
+
   com_obj->ParamCnt = 2;
 
   MBMUXIF_LoraSendNotif();
@@ -537,6 +747,86 @@ static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t
   /* USER CODE END OnRxData_mbwrapper_2 */
 }
 
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass)
+{
+  /* USER CODE BEGIN OnClassChange_mbwrapper_1 */
+
+  /* USER CODE END OnClassChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_CLASS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)deviceClass;
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnClassChange_mbwrapper_2 */
+
+  /* USER CODE END OnClassChange_mbwrapper_2 */
+}
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerBeaconParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
+static void OnSysTimeUpdate_mbwrapper(void)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
index a07ea737..bc600e5f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LMHANDLER_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
index 3ce58f07..61a6eb3d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stddef.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
index 9d845793..e95e07d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.c
@@ -16,10 +17,12 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "LoRaMac.h"
 #include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
 #include "platform.h" /* Needed for Error_Handler */
 #include "features_info.h"
 
@@ -27,11 +30,6 @@
 
 /* USER CODE END Includes */
 
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
 /* Private typedef -----------------------------------------------------------*/
 
 /* USER CODE BEGIN PTD */
@@ -58,9 +56,7 @@
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief initialises the LoraMacInfo capabilities table
-  * @param none
-  * @retval  none
+  * @brief initialize the LoraMacInfo capabilities table
   */
 void StoreValueInFeatureListTable(void);
 
@@ -120,6 +116,10 @@ void LoraInfo_Init(void)
   if (loraInfo.Region == 0)
   {
     APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
     while (1) {} /* At least one region shall be defined */
   }
 
@@ -134,7 +134,7 @@ void LoraInfo_Init(void)
   loraInfo.ActivationMode = 3;
 #else /* LORAWAN_KMS == 1 */
   loraInfo.Kms = 1;
-  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALISATION + (OVER_THE_AIR_ACTIVATION << 1);
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
 #endif /* LORAWAN_KMS */
 
   /* For DualCore */
@@ -188,7 +188,7 @@ void StoreValueInFeatureListTable(void)
 
   if (found)
   {
-    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t)/sizeof(uint32_t);
+    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t) / sizeof(uint32_t);
     p_feature->Feat_Info_Config_Ptr = &loraInfo;
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
index 013f7100..ef887470 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -51,15 +54,53 @@
 
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -67,11 +108,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -80,27 +116,23 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   uint8_t i;
   IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
 
-  p_MBMUX_ComTable = pMBMUX_ComTable;
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
 
   for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
   {
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
   }
   /* USER CODE BEGIN MBMUX_Init_Last */
 
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval  return -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
-  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
 {
   uint8_t channel_idx;
@@ -116,15 +148,19 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   {
     /* channel has been registered by CM4 registered */
     channel_idx = check_existing_feature_registration;
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm0plusCb = MsgCb;
-    }
-    else
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
     {
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm0plusCb = MsgCb;
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
     }
-    ret = channel_idx;
   }
   /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
 
@@ -132,13 +168,6 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -155,11 +184,11 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
       /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
       IPCC_IF_ResponseSnd(mb_ch);
 
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
     else
     {
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
   }
   /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
@@ -167,12 +196,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -199,11 +222,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Notif to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
@@ -214,7 +232,7 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
   if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
   {
-    while (1) {}
+    Error_Handler();
   }
   return IPCC_IF_NotificationSnd(mb_ch);
   /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
@@ -222,11 +240,6 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_NotificationSnd_Last */
 }
 
-/**
-  * @brief Send response to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
@@ -241,17 +254,118 @@ uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_ResponseSnd_Last */
 }
 
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
 /* USER CODE BEGIN EFD */
 
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
@@ -260,18 +374,13 @@ static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
@@ -280,19 +389,13 @@ static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
   return;
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -304,17 +407,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
index e91b1547..a938e544 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM0PLUS_H__
@@ -52,19 +54,58 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 0ec2ec5d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *KmsComObj;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskKmsCmdRcv(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers KMS feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsCmdRcvCb);
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskKmsCmdRcv);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Sends a Kms-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendResp(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_1 */
-  if (MBMUX_ResponseSnd(FEAT_INFO_KMS_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_1 */
-  KmsComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_Last */
-}
-
-/**
-  * @brief  KMS task to process the command
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskKmsCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_1 */
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-  Process_Kms_Cmd(KmsComObj);
-#endif /* ALLOW_KMS_VIA_MBMUX */
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
deleted file mode 100644
index 12b71c19..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM0PLUS_H__
-#define __MBMUXIF_KMS_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-void MBMUXIF_KmsSendResp(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
index d0cc04c2..26630e54 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to register and handle LoraWAN to MBMUX
+  * @brief   allows CM0 application to register and handle LoraWAN to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -56,21 +58,27 @@ static MBMUX_ComParam_t *LoraComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the command
+  */
 static void MBMUXIF_TaskLoraCmdRcv(void);
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers LORA feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_LoraInit(void)
 {
   int8_t ret;
@@ -95,11 +103,6 @@ int8_t MBMUXIF_LoraInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Lora feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_1 */
@@ -108,7 +111,7 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_Last */
@@ -116,11 +119,6 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Lora-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendNotif(void)
 {
   /* to check vs radio. radio call this on irq so it moves here on task */
@@ -134,18 +132,13 @@ void MBMUXIF_LoraSendNotif(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_LoraSendNotif_Last */
 
   /* USER CODE END MBMUXIF_LoraSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Lora-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendResp_1 */
@@ -153,7 +146,7 @@ void MBMUXIF_LoraSendResp(void)
   /* USER CODE END MBMUXIF_LoraSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_LoraSendResp_Last */
 
@@ -165,11 +158,6 @@ void MBMUXIF_LoraSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  LORA acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_1 */
@@ -181,11 +169,6 @@ static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_Last */
 }
 
-/**
-  * @brief  LORA command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_1 */
@@ -198,11 +181,6 @@ static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_Last */
 }
 
-/**
-  * @brief  LORA task to process the command
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskLoraCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
index 75fda6ea..558f081f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.h
   * @author  MCD Application Team
-  * @brief   API provided to CM0PLUS applic to register and handle LoraWAN via MBMUX
+  * @brief   API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_LORA_CM0PLUS_H__
@@ -52,9 +54,30 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_LoraSendNotif(void);
+
+/**
+  * @brief   Sends a Lora-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_LoraSendResp(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
index 3ba64a2b..fe5fd070 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -57,22 +59,33 @@ static MBMUX_ComParam_t *RadioComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
 static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
 static void MBMUXIF_TaskRadioNotifSnd(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers RADIO feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   int8_t ret;
@@ -99,11 +112,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
@@ -112,7 +120,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
@@ -120,11 +128,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendNotif(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
@@ -136,11 +139,6 @@ void MBMUXIF_RadioSendNotif(void)
   /* USER CODE END MBMUXIF_RadioSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Radio-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
@@ -148,7 +146,7 @@ void MBMUXIF_RadioSendResp(void)
   /* USER CODE END MBMUXIF_RadioSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
 
@@ -160,11 +158,6 @@ void MBMUXIF_RadioSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
@@ -176,11 +169,6 @@ static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
@@ -193,11 +181,6 @@ static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the command
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
@@ -209,11 +192,6 @@ static void MBMUXIF_TaskRadioCmdRcv(void)
   /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
 }
 
-/**
-  * @brief  RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifSnd(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
@@ -225,7 +203,7 @@ static void MBMUXIF_TaskRadioNotifSnd(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
index 44fab48f..7e226c6c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM0PLUS_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_RadioSendResp(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
index a3ce77e9..67725244 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to handle the SYSTEM MBMUX channel
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -63,27 +65,59 @@ static MBMUX_ComParam_t *SystemComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
 static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
 
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf);
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
 
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
@@ -118,7 +152,7 @@ int8_t MBMUXIF_SystemInit(void)
 
   if (ret >= 0)
   {
-    /* Notify Cm4 that MBMUXIF_System and RTC are initialised on Cm0 side */
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
     /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
     while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
     pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
@@ -130,14 +164,6 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Get synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
@@ -146,11 +172,6 @@ uint16_t MBMUXIF_GetCpusSynchroFlag(void)
   return pMb_RefTable->SynchronizeCpusAtBoot;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
@@ -159,7 +180,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
 
@@ -167,11 +188,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   return com_param_ptr;
 }
 
-/**
-  * @brief Sends a System-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
@@ -183,18 +199,13 @@ void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
@@ -202,26 +213,21 @@ void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
 }
 
-/**
-  * @brief Sends a System-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
 
-  /* USER CODE END EFMBMUXIF_SystemSendResp_1 */
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
   if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
 
@@ -238,7 +244,7 @@ int16_t MBMUXIF_ChipRevId(void)
   int16_t ret = pMb_RefTable->ChipRevId;
   /* USER CODE BEGIN MBMUXIF_ChipRevId */
 
-  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+  /* USER CODE END MBMUXIF_ChipRevId */
   return ret ;
 }
 
@@ -247,35 +253,24 @@ int16_t MBMUXIF_ChipRevId(void)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 {
   SystemComObj = (MBMUX_ComParam_t *) ComObj;
-  uint32_t *com_buffer = SystemComObj->ParamBuf;
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
 
   /* process Command on Isr or schedule a task*/
   switch (SystemComObj->MsgId)
@@ -285,14 +280,9 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
       MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
       break;
 
-    case SYS_REGISTER_FEATURE_MSG_ID:
-      SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
-      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-      break;
-
     /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
     default:
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
@@ -301,89 +291,68 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
 
 }
 
-/**
-  * @brief  SYSTEM task to process the command
-  * @param  none
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemCmdRcv(void)
 {
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
-  Process_Sys_Cmd(SystemComObj);
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
 
 }
 
-/**
-  * @brief  SYSTEM PRIO_A acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
 }
 
-/**
-  * @brief  Retrieve the feature that needs MbMux registration and call correspondent Init
-  * @param  pointer to parameter buffer of the command
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  */
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
 {
   int8_t ret = -2; /* feature not supported */
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  switch (ParamBuf[0])
+  switch (pBuf[0])
   {
     case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
       ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
@@ -407,6 +376,9 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
       ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
       break;
 
@@ -416,17 +388,23 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
       ret = MBMUXIF_LoraInit();
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora registration done\r\n");
       break;
 
     case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox not supported\r\n");
       break;
 
     /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
     default:
       break;
@@ -434,7 +412,7 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
   return ret;
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
index 01dff052..f780cdde 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM0PLUS_H__
@@ -54,11 +56,44 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -66,6 +101,10 @@ void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
 int16_t MBMUXIF_ChipRevId(void);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
index 04c9f7b6..05704d23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -25,6 +27,7 @@
 #include "msg_id.h"
 #include "stm32_seq.h"
 #include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
 
 /* USER CODE BEGIN Includes */
 
@@ -46,15 +49,43 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
-static void (*TraceUtilCpltCallback)(void *);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
 
 /* USER CODE BEGIN PFP */
@@ -75,12 +106,6 @@ const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
 /* USER CODE END PTD */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
 {
   int8_t ret;
@@ -92,6 +117,8 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
   if (ret >= 0)
   {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
     /*Initialize the terminal */
     UTIL_ADV_TRACE_Init();
     UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
@@ -107,11 +134,6 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Trace feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
@@ -120,7 +142,7 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
@@ -128,11 +150,6 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendNotif_NoWait(void)
 {
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
@@ -140,7 +157,7 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
   /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
 
@@ -152,14 +169,6 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
 /* USER CODE END EFD */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief The trace utilities inform the mbmuxif which func to call
-  *        once the Mb transmission is completed
-  * @param:  "stm32_adv_trace.c callback"
-  * @retval: none
-  */
-
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
@@ -172,26 +181,23 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
   /* USER CODE END MBMUXIF_TraceBufferInit_Last */
 }
 
-/**
-  * @brief TraceBufferSend sends the formatted buffer to CM4 which
-  *        posts it to the circular queue for printing
-  * @param:  strFormat: string to be printed
-  * @retval: 0 when ok, -1 when circular queue is full
-  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
 
   /* USER CODE END MBMUXIF_TraceBufferSend_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
 
-  /* notify CM4 that CM0PLUS is initialised */
+  /* notify CM4 that CM0PLUS is initialized */
   com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
   if (com_obj != NULL)
   {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
     com_obj->MsgId = TRACE_SEND_MSG_ID;
-    com_obj->ParamBuf[0] = (uint32_t) buf;
-    com_obj->ParamBuf[1] = (uint32_t) bufSize;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
     com_obj->ParamCnt = 2;
     MBMUXIF_TraceSendNotif_NoWait();
   }
@@ -202,24 +208,28 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bu
 }
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TRACE acknowledge callbacks: set event to release waiting task
-  *             and use callback to check if other trace need to be sent to CM4
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
-  TraceUtilCpltCallback(NULL);
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
 }
 
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
index 490321d2..8aad9276 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle TRACE via MBMUX
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM0PLUS_H__
@@ -52,8 +54,23 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendNotif_NoWait(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
index c09f8d55..063d379e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -47,7 +49,6 @@
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
 
 /* USER CODE BEGIN PD */
 
@@ -59,7 +60,15 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_S
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-static  RadioEvents_t    radioevents_mbwrapper;
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/**
+  * @brief local structure of radio callbacks for command processes
+  */
+static  RadioEvents_t radioevents_mbwrapper;
 
 /* USER CODE BEGIN PV */
 
@@ -79,10 +88,10 @@ static void RadioTxTimeout_mbwrapper(void);
 /*!
  * \brief Rx Done callback prototype.
  *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
+ * \param[in] payload Received buffer pointer
+ * \param[in] size    Received buffer size
+ * \param[in] rssi    RSSI value computed while receiving the frame [dBm]
+ * \param[in] snr     Raw SNR value given by the radio hardware
  *                     FSK : N/A ( set to 0 )
  *                     LoRa: SNR value in dB
  */
@@ -108,13 +117,15 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Radio_Cmd_1 */
 
   /* USER CODE END Process_Radio_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = NULL;
   uint32_t ret_uint;
   int32_t ret_int;
   RadioState_t status;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
@@ -242,7 +253,7 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = 0; /* */
       break;
 
-    case RADIO_SET_TX_CONTINOUS_WAVE_ID:
+    case RADIO_SET_TX_CONTINUOUS_WAVE_ID:
       Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -411,16 +422,26 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
 
   /* USER CODE END RadioRxDone_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
+  uint32_t *com_buffer = NULL ;
   uint16_t i = 0;
 
   /* copy data from Cm0 private memory to shared memory */
-  UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  if (payload != NULL)
+  {
+    UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  }
 
   com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
   com_obj->MsgId = RADIO_RX_DONE_CB_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (payload == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  }
   com_buffer[i++] = (uint32_t) size;
   com_buffer[i++] = (uint32_t) rssi;
   com_buffer[i++] = (uint32_t) snr;
@@ -435,7 +456,7 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
   /* once event is received and semaphore released: */
 
   /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
-     this migh be requested just if the buffer should be processed by the applic and the stack */
+     this might be requested just if the buffer should be processed by the application and the stack */
   /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
   return;
   /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
index 4b3da2cd..ac6a70d3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
index 49ee1e48..e891e529 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM4_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_ResponseRcv_cb     response callback
   * @param  IPCC_IF_NotificationRcv_cb notification callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
index 3447444b..14990858 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -61,40 +60,24 @@ void Error_Handler(void);
 /* Private defines -----------------------------------------------------------*/
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
-#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
 #define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define BUT2_Pin GPIO_PIN_1
 #define BUT2_GPIO_Port GPIOA
 #define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
index 75f1386d..2fffde50 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 /*#define HAL_SUBGHZ_MODULE_ENABLED   */
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
index ab592978..59d790a6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -35,6 +37,10 @@ extern "C" {
 /* USER CODE END Includes */
 
 /* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -70,24 +76,24 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
 void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
 
 /**
   * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
-  * @param  none
   * @retval battery level
   */
 uint8_t GetBatteryLevel(void);
 
 /**
   * @brief  callback to get the current temperature in the MCU
-  * @param  none
   * @retval temperature level
   */
 uint16_t GetTemperatureLevel(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
index 74840d89..a2f39fa4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -41,29 +43,33 @@ extern "C" {
   * @brief Temperature and pressure values are retrieved from sensors shield
   *        (instead of sending dummy values). It requires MEMS IKS shield
   */
-#define SENSOR_ENABLED  0
+#define SENSOR_ENABLED              0
 
 /**
   * @brief CM4 Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
index 27c3485c..fc37f342 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SENSORS_H__
@@ -54,13 +56,12 @@ typedef struct
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
 #define HTS221_0    0U
 #define LPS22HB_0   1U
 #endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
-
-/* USER CODE BEGIN EC */
-
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -75,15 +76,15 @@ typedef struct
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief  initialises the environmental sensor
+  * @brief  initialize the environmental sensor
   */
-void  EnvSensors_Init(void);
+int32_t EnvSensors_Init(void);
 
 /**
   * @brief  Environmental sensor  read.
   * @param  sensor_data sensor data
   */
-void EnvSensors_Read(sensor_t *sensor_data);
+int32_t EnvSensors_Read(sensor_t *sensor_data);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
index 1315adaf..20bb5dfa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
index 43a2ee92..ebd9cc7a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -153,9 +155,9 @@ extern "C" {
 #define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
 #define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
 #define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
-#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
 #define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
-#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
 #define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
 #define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
index 27dfedb5..f79689ba 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
@@ -72,6 +76,9 @@ typedef enum
 typedef enum
 {
   /* CM4 */
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t_0 */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t_0 */
   CFG_SEQ_Task_MbSystemNotifRcv,
   CFG_SEQ_Task_MbLoRaNotifRcv,
   CFG_SEQ_Task_MbRadioNotifRcv,
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
index ad6e2e7c..fdcbc616 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
index abfae080..672a366f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,21 +82,21 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* IPCC EXTI (AIEC) line for CPU1  */
   LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
   IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
index 25a3f790..39c26a02 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -158,6 +159,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
index 208d8cff..f1215b41 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
@@ -75,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -186,7 +188,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
index 0964bac5..2931ff92 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,16 +27,18 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 #include "sys_sensors.h"
 #include "msg_id.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
-#include "mbmuxif_lora.h"
 #include "mbmuxif_radio.h"
-/*#include "mbmuxif_kms.h"*/
+#include "mbmuxif_lora.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
 
@@ -69,23 +73,21 @@
 /* Private variables ---------------------------------------------------------*/
 uint32_t InstanceIndex;
 uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_Init(void);
-
 /**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
   */
-static void Gpio_PreInit(void);
+static void MBMUXIF_Init(void);
+
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -93,15 +95,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
+
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -111,10 +110,8 @@ void SystemApp_Init(void)
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
 
-  Gpio_PreInit();
-
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -122,6 +119,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -145,14 +143,14 @@ void SystemApp_Init(void)
 
   UTIL_TIMER_Init();
 
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief  Process System Notifications
-  */
 void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Sys_Notif_1 */
@@ -164,14 +162,24 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 
   switch (notif_ack_id)
   {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
     case SYS_OTHER_MSG_ID:
       APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
       /* prepare ack buffer*/
       ComObj->ParamCnt = 0;
-      ComObj->ReturnVal = 7; /* dummy value for test */
-      break;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
 
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
     default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
       break;
   }
 
@@ -183,16 +191,16 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Notif_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -201,8 +209,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -226,7 +232,7 @@ uint8_t GetBatteryLevel(void)
 
   batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
 
-  /* Convert batterey level from mV to linea scale: 1 (very low) to 254 (fully charged) */
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
   if (batteryLevelmV > VDD_BAT)
   {
     batteryLevel = LORAWAN_MAX_BAT;
@@ -260,51 +266,46 @@ uint16_t GetTemperatureLevel(void)
   return temperatureLevel;
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Test: Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialises other features
-  * @param none
-  * @retval none
-  */
 static void MBMUXIF_Init(void)
 {
   /* USER CODE BEGIN MBMUXIF_Init_1 */
 
   /* USER CODE END MBMUXIF_Init_1 */
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
   int8_t init_status;
 
-  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
 
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   /* start CM0PLUS */
-  /* Note: when debugging in order to connect with the deggugger CPUU2 shall be start using workspace CM4 starts CM0PLUS */
-  /* On the other hand is up to the devepoper make sure the CM0PLUS debugger is run after CM4 debugger */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
   HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-  /* CM4 has started and it has reset the mailbox and initialised the MbMux; */
-  /* once CM0PLUS is also initialised it send a SYS notification */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialisation done: Wait for CM0PLUS \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
 
-  MBMUXIF_WaitCm0MbmuxIsInitialised();
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
-  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supprted_features_list);
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
 
-  APP_LOG(TS_ON, VLEVEL_H, "System Initialisation CM4-CM0PLUS completed \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
 
   init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
   if (init_status < 0)
@@ -346,45 +347,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -425,13 +387,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -446,13 +406,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -463,13 +421,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -484,4 +440,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
index e2c80e45..3afffff8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.c
@@ -16,12 +17,14 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "sys_conf.h"
 #include "sys_sensors.h"
 
+/* USER CODE BEGIN Includes */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -104,9 +107,6 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN Includes */
-
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -120,15 +120,14 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
 #define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
 #define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
 #define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
 #define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
 #define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
 #define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
-
-/* USER CODE BEGIN PD */
-
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -137,6 +136,8 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -151,9 +152,6 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -162,11 +160,9 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-void EnvSensors_Read(sensor_t *sensor_data)
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
 {
-  /* USER CODE BEGIN EnvSensors_Read_1 */
-
-  /* USER CODE END EnvSensors_Read_1 */
+  /* USER CODE BEGIN EnvSensors_Read */
   float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
   float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
   float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
@@ -198,17 +194,14 @@ void EnvSensors_Read(sensor_t *sensor_data)
 
   sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
   sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
-  /* USER CODE BEGIN EnvSensors_Read_Last */
 
-  /* USER CODE END EnvSensors_Read_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Read */
 }
 
-void  EnvSensors_Init(void)
+int32_t  EnvSensors_Init(void)
 {
-  /* USER CODE BEGIN EnvSensors_Init_1 */
-
-  /* USER CODE END EnvSensors_Init_1 */
-
+  /* USER CODE BEGIN EnvSensors_Init */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
   /* Init */
 #if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
@@ -259,9 +252,8 @@ void  EnvSensors_Init(void)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif /* SENSOR_ENABLED  */
-  /* USER CODE BEGIN EnvSensors_Init_Last */
-
-  /* USER CODE END EnvSensors_Init_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
index e04bdfc6..f02a544d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
@@ -21,8 +21,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -163,9 +163,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   /** Configure the Instance */
   hrtc.Instance = RTC;
   HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
@@ -245,64 +245,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -325,6 +331,7 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -334,16 +341,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -370,24 +377,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
index 49d236d5..be36fe23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_usart2_tx;
 void MX_USART2_UART_Init(void)
 {
 
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
   huart2.Instance = USART2;
-  huart2.Init.BaudRate = USART_BAUDRATE;
+  huart2.Init.BaudRate = 115200;
   huart2.Init.WordLength = UART_WORDLENGTH_8B;
   huart2.Init.StopBits = UART_STOPBITS_1;
   huart2.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_USART2_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
index f91e9839..182f1990 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&huart2);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
index ba6f23a9..f7038db8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_lorawan.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
index 2c49b393..fbe16b6d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_LORAWAN_H__
 #define __APP_LORAWAN_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported Functions Prototypes------------------------------------------------------- */
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Init(void);
 
 /**
   * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
index 6531ebc5..525e95c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -50,11 +52,11 @@
 typedef enum TxEventType_e
 {
   /**
-    * @brief AppdataTransmition issue based on timer every TxDutyCycleTime
+    * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
     */
   TX_ON_TIMER,
   /**
-    * @brief AppdataTransmition external event plugged on OnSendEvent( )
+    * @brief Appdata Transmission external event plugged on OnSendEvent( )
     */
   TX_ON_EVENT
   /* USER CODE BEGIN TxEventType_t */
@@ -78,59 +80,32 @@ typedef enum TxEventType_e
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief  LoRa endNode send request
-  * @param  none
-  * @retval none
+  * @brief  LoRa End Node send request
   */
 static void SendTxData(void);
 
 /**
   * @brief  TX timer callback function
-  * @param  timer context
-  * @retval none
+  * @param  context ptr of timer context
   */
 static void OnTxTimerEvent(void *context);
 
-/**
-  * @brief  LED Tx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnTxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Rx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnRxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Join timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnJoinTimerLedEvent(void *context);
-
 /**
   * @brief  join event callback function
-  * @param  params
-  * @retval none
+  * @param  joinParams status of join
   */
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
 
 /**
   * @brief  tx event callback function
-  * @param  params
-  * @retval none
+  * @param  params status of last Tx
   */
 static void OnTxData(LmHandlerTxParams_t *params);
 
 /**
-  * @brief callback when LoRa endNode has received a frame
-  * @param appData
-  * @param params
-  * @retval None
+  * @brief callback when LoRa application has received a frame
+  * @param appData data received in the last Rx
+  * @param params status of last Rx
   */
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
@@ -143,19 +118,27 @@ static void OnMacProcessNotify(void);
 
 /* USER CODE BEGIN PFP */
 
-/* USER CODE END PFP */
+/**
+  * @brief  LED Tx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnTxTimerLedEvent(void *context);
 
-/* Private variables ---------------------------------------------------------*/
 /**
-  * @brief User application buffer
+  * @brief  LED Rx timer callback function
+  * @param  context ptr of LED context
   */
-static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+static void OnRxTimerLedEvent(void *context);
 
 /**
-  * @brief User application data structure
+  * @brief  LED Join timer callback function
+  * @param  context ptr of LED context
   */
-static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+static void OnJoinTimerLedEvent(void *context);
+
+/* USER CODE END PFP */
 
+/* Private variables ---------------------------------------------------------*/
 static ActivationType_t ActivationType = LORAWAN_DEFAULT_ACTIVATION_TYPE;
 
 /**
@@ -183,11 +166,6 @@ static LmHandlerParams_t LmHandlerParams =
   .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
 };
 
-/**
-  * @brief Specifies the state of the application LED
-  */
-static uint8_t AppLedStateOn = RESET;
-
 /**
   * @brief Type of Event to generate application Tx
   */
@@ -198,6 +176,22 @@ static TxEventType_t EventType = TX_ON_TIMER;
   */
 static UTIL_TIMER_Object_t TxTimer;
 
+/* USER CODE BEGIN PV */
+/**
+  * @brief User application buffer
+  */
+static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+
+/**
+  * @brief User application data structure
+  */
+static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+
+/**
+  * @brief Specifies the state of the application LED
+  */
+static uint8_t AppLedStateOn = RESET;
+
 /**
   * @brief Timer to handle the application Tx Led to toggle
   */
@@ -213,8 +207,6 @@ static UTIL_TIMER_Object_t RxLedTimer;
   */
 static UTIL_TIMER_Object_t JoinLedTimer;
 
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Exported functions ---------------------------------------------------------*/
@@ -229,20 +221,10 @@ void LoRaWAN_Init(void)
 
   /* USER CODE BEGIN LoRaWAN_Init_1 */
 
-  /* USER CODE END LoRaWAN_Init_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Init(LED_BLUE);
   BSP_LED_Init(LED_GREEN);
   BSP_LED_Init(LED_RED);
   BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-  SYS_LED_Init(SYS_LED_RED);
-  SYS_PB_Init(SYS_BUTTON2, SYS_BUTTON_MODE_EXTI);
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
 
   /* Get CM4 LoRa APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
@@ -273,7 +255,6 @@ void LoRaWAN_Init(void)
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
-
   UTIL_TIMER_Create(&TxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerLedEvent, NULL);
   UTIL_TIMER_Create(&RxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnRxTimerLedEvent, NULL);
   UTIL_TIMER_Create(&JoinLedTimer, 0xFFFFFFFFU, UTIL_TIMER_PERIODIC, OnJoinTimerLedEvent, NULL);
@@ -281,14 +262,19 @@ void LoRaWAN_Init(void)
   UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
   UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
 
+  /* USER CODE END LoRaWAN_Init_1 */
+
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), UTIL_SEQ_RFU, SendTxData);
   /* Init the Lora Stack*/
   LmHandlerInit(&LmHandlerCallbacks);
 
   LmHandlerConfigure(&LmHandlerParams);
 
+  /* USER CODE BEGIN LoRaWAN_Init_2 */
   UTIL_TIMER_Start(&JoinLedTimer);
 
+  /* USER CODE END LoRaWAN_Init_2 */
+
   LmHandlerJoin(ActivationType);
 
   if (EventType == TX_ON_TIMER)
@@ -300,12 +286,11 @@ void LoRaWAN_Init(void)
   }
   else
   {
+    /* USER CODE BEGIN LoRaWAN_Init_3 */
+
     /* send every time button is pushed */
-#if defined(USE_BSP_DRIVER)
     BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_PB_Init(SYS_BUTTON1, SYS_BUTTON_MODE_EXTI);
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
+    /* USER CODE END LoRaWAN_Init_3 */
   }
 
   /* USER CODE BEGIN LoRaWAN_Init_Last */
@@ -313,77 +298,33 @@ void LoRaWAN_Init(void)
   /* USER CODE END LoRaWAN_Init_Last */
 }
 
-#if defined(USE_BSP_DRIVER)
-void BSP_PB_Callback(Button_TypeDef Button)
-{
-#warning: adapt stm32wlxx_it.c to call BSP_PB_IRQHandler if you want to use BSP
-  /* USER CODE BEGIN BSP_PB_Callback_1 */
-
-  /* USER CODE END BSP_PB_Callback_1 */
-  switch (Button)
-  {
-    case  BUTTON_SW1:
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
-      /* USER CODE BEGIN PB_Callback 1 */
-      /* USER CODE END PB_Callback 1 */
-      break;
-    case  BUTTON_SW2:
-      /* USER CODE BEGIN PB_Callback 2 */
-      /* USER CODE END PB_Callback 2 */
-      break;
-    case  BUTTON_SW3:
-      /* USER CODE BEGIN PB_Callback 3 */
-      /* USER CODE END PB_Callback 3 */
-      break;
-    default:
-      break;
-  }
-  /* USER CODE BEGIN BSP_PB_Callback_Last */
-
-  /* USER CODE END BSP_PB_Callback_Last */
-}
-
-#elif defined(MX_BOARD_PSEUDODRIVER)
-
-/* Note: Current MX does not support EXTI IP neither BSP. */
+/* USER CODE BEGIN PB_Callbacks */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
 /* In order to get a push button IRS by code automatically generated */
-/* this function is today the only available possibility. */
-/* Calling BSP_PB_Callback() from here it shortcuts the BSP. */
-/* If users wants to go through the BSP, it can remove BSP_PB_Callback() from here */
-/* and add a call to BSP_PB_IRQHandler() in the USER CODE SESSION of the */
-/* correspondent EXTIn_IRQHandler() in the stm32wlxx_it.c */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_1 */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_1 */
   switch (GPIO_Pin)
   {
-    case  SYS_BUTTON1_PIN:
-      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialised */
+    case  BUTTON_SW1_PIN:
+      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
-      /* USER CODE BEGIN EXTI_Callback_Switch_B1 */
-      /* USER CODE END EXTI_Callback_Switch_B1 */
       break;
-    case  SYS_BUTTON2_PIN:
-      /* USER CODE BEGIN EXTI_Callback_Switch_B2 */
-      /* USER CODE END EXTI_Callback_Switch_B2 */
+    case  BUTTON_SW2_PIN:
+      break;
+    case  BUTTON_SW3_PIN:
       break;
-    /* USER CODE BEGIN EXTI_Callback_Switch_case */
-
-    /* USER CODE END EXTI_Callback_Switch_case */
     default:
-    /* USER CODE BEGIN EXTI_Callback_Switch_default */
-    /* USER CODE END EXTI_Callback_Switch_default */
       break;
   }
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_Last */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_Last */
 }
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER*/
+
+/* USER CODE END PB_Callbacks */
 
 /* Private functions ---------------------------------------------------------*/
 /* USER CODE BEGIN PrFD */
@@ -393,15 +334,10 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
 {
   /* USER CODE BEGIN OnRxData_1 */
-
-  /* USER CODE END OnRxData_1 */
-  if ((appData != NULL) && (params != NULL))
+  if ((appData != NULL) || (params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
     BSP_LED_On(LED_BLUE) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
+
     UTIL_TIMER_Start(&RxLedTimer);
 
     static const char *slotStrings[] = { "1", "2", "C", "C Multicast", "B Ping-Slot", "B Multicast Ping-Slot" };
@@ -444,42 +380,27 @@ static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
           if (AppLedStateOn == RESET)
           {
             APP_LOG(TS_OFF, VLEVEL_H,   "LED OFF\r\n");
-
-#if defined(USE_BSP_DRIVER)
             BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
           }
           else
           {
             APP_LOG(TS_OFF, VLEVEL_H, "LED ON\r\n");
-#if defined(USE_BSP_DRIVER)
             BSP_LED_On(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_On(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
           }
         }
         break;
-    /* USER CODE BEGIN OnRxData_Switch_case */
 
-    /* USER CODE END OnRxData_Switch_case */
       default:
-    /* USER CODE BEGIN OnRxData_Switch_default */
 
-    /* USER CODE END OnRxData_Switch_default */
         break;
     }
   }
-
-  /* USER CODE BEGIN OnRxData_2 */
-
-  /* USER CODE END OnRxData_2 */
+  /* USER CODE END OnRxData_1 */
 }
 
 static void SendTxData(void)
 {
+  /* USER CODE BEGIN SendTxData_1 */
   uint16_t pressure = 0;
   int16_t temperature = 0;
   sensor_t sensor_data;
@@ -494,9 +415,6 @@ static void SendTxData(void)
   int32_t longitude = 0;
   uint16_t altitudeGps = 0;
 #endif /* CAYENNE_LPP */
-  /* USER CODE BEGIN SendTxData_1 */
-
-  /* USER CODE END SendTxData_1 */
 
   EnvSensors_Read(&sensor_data);
   temperature = (SYS_GetTemperatureLevel() >> 8);
@@ -564,9 +482,8 @@ static void SendTxData(void)
   {
     APP_LOG(TS_ON, VLEVEL_L, "Next Tx in  : ~%d second(s)\r\n", (nextTxIn / 1000));
   }
-  /* USER CODE BEGIN SendTxData_2 */
 
-  /* USER CODE END SendTxData_2 */
+  /* USER CODE END SendTxData_1 */
 }
 
 static void OnTxTimerEvent(void *context)
@@ -583,101 +500,62 @@ static void OnTxTimerEvent(void *context)
   /* USER CODE END OnTxTimerEvent_2 */
 }
 
+/* USER CODE BEGIN PrFD_LedEvents */
 static void OnTxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnTxTimerLedEvent_1 */
-
-  /* USER CODE END OnTxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_GREEN) ;
-#else
-  SYS_LED_Off(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnTxTimerLedEvent_2 */
-
-  /* USER CODE END OnTxTimerLedEvent_2 */
 }
 
 static void OnRxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnRxTimerLedEvent_1 */
-
-  /* USER CODE END OnRxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_BLUE) ;
-#else
-  SYS_LED_Off(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnRxTimerLedEvent_2 */
-
-  /* USER CODE END OnRxTimerLedEvent_2 */
 }
 
 static void OnJoinTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnJoinTimerLedEvent_1 */
-
-  /* USER CODE END OnJoinTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Toggle(LED_RED) ;
-#else
-  SYS_LED_Toggle(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnJoinTimerLedEvent_2 */
-
-  /* USER CODE END OnJoinTimerLedEvent_2 */
 }
 
+/* USER CODE END PrFD_LedEvents */
+
 static void OnTxData(LmHandlerTxParams_t *params)
 {
   /* USER CODE BEGIN OnTxData_1 */
-
-  /* USER CODE END OnTxData_1 */
-  if ((params != NULL) && (params->IsMcpsConfirm != 0))
+  if ((params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_GREEN) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-    UTIL_TIMER_Start(&TxLedTimer);
-
-    APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
-    APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
-            params->AppData.Port, params->Datarate, params->TxPower);
-
-    APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
-    if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
-    {
-      APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
-    }
-    else
+    /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
+    if (params->IsMcpsConfirm != 0)
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
-    }
-  }
+      BSP_LED_On(LED_GREEN) ;
+      UTIL_TIMER_Start(&TxLedTimer);
 
-  /* USER CODE BEGIN OnTxData_2 */
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
+      APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
+              params->AppData.Port, params->Datarate, params->TxPower);
 
-  /* USER CODE END OnTxData_2 */
+      APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
+      if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
+      }
+    }
+  }
+  /* USER CODE END OnTxData_1 */
 }
 
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
 {
   /* USER CODE BEGIN OnJoinRequest_1 */
-
-  /* USER CODE END OnJoinRequest_1 */
   if (joinParams != NULL)
   {
     if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
     {
       UTIL_TIMER_Stop(&JoinLedTimer);
-
-#if defined(USE_BSP_DRIVER)
       BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-      SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
 
       APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOINED = ");
       if (joinParams->Mode == ACTIVATION_TYPE_ABP)
@@ -694,10 +572,7 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
       APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOIN FAILED\r\n");
     }
   }
-
-  /* USER CODE BEGIN OnJoinRequest_2 */
-
-  /* USER CODE END OnJoinRequest_2 */
+  /* USER CODE END OnJoinRequest_1 */
 }
 
 static void OnMacProcessNotify(void)
@@ -705,9 +580,6 @@ static void OnMacProcessNotify(void)
   /* USER CODE BEGIN OnMacProcessNotify_1 */
 
   /* USER CODE END OnMacProcessNotify_1 */
-  /* USER CODE BEGIN OnMacProcessNotify_2 */
-
-  /* USER CODE END OnMacProcessNotify_2 */
 }
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
index a48306a2..b7ac7358 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_APP_H__
@@ -114,8 +116,6 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void LoRaWAN_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
index b11647cf..a25c35b9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
index 1f6f2c02..b97a4240 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lorawan_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORAWAN_CONF_H__
@@ -25,7 +27,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
index f3ce93b2..1991b928 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    systime.h
@@ -16,8 +17,9 @@
   *
   ******************************************************************************
   */
-/* Define to prevent recursive inclusion -------------------------------------*/
+/* USER CODE END Header */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTIME_H__
 #define __SYSTIME_H__
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
index 65512b2d..f8a2aa5b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -48,10 +50,15 @@
 #ifndef MAX
 #define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #endif /* MAX */
-#define MCPS_MLME_SIZE MAX(sizeof(McpsReq_t), sizeof(MlmeReq_t))
-#define MCPS_MLME_2_SIZE MAX(MCPS_MLME_SIZE, sizeof(MibRequestConfirm_t))
-#define LORA_MBWRAP_SHBUF_SIZE MAX(MCPS_MLME_2_SIZE, sizeof(McChannelParams_t))
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
+#define LMH_CONFIG_SIZE     (sizeof(LmHandlerParams_t))
+#define LMH_SEND_SIZE       (256 + sizeof(UTIL_TIMER_Time_t))
+#define LMH_GET_CLASS_SIZE  (sizeof(DeviceClass_t))
+#define LMH_EUI_SIZE        (SE_EUI_SIZE)
+#define LMH_KEY_SIZE        (SE_KEY_SIZE)
+#define LMH_REGION_SIZE     (sizeof(LoRaMacRegion_t))
+#define LMH_RX_PARAM_SIZE   (sizeof(RxChannelParams_t))
+#define LMH_BEACON_SIZE     (sizeof(BeaconState_t))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(MAX(MAX(LMH_CONFIG_SIZE, LMH_SEND_SIZE), MAX(LMH_GET_CLASS_SIZE, LMH_EUI_SIZE)), MAX(MAX(LMH_KEY_SIZE, LMH_REGION_SIZE), MAX(LMH_RX_PARAM_SIZE, LMH_BEACON_SIZE)))
 
 /* USER CODE BEGIN PD */
 
@@ -63,6 +70,14 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM4 to CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
 static LmHandlerCallbacks_t callback_mbwrapper;
 
 /* USER CODE BEGIN PV */
@@ -98,9 +113,14 @@ LmHandlerErrorStatus_t LmHandlerInit(LmHandlerCallbacks_t *handlerCallbacks)
 
   callback_mbwrapper.GetBatteryLevel = handlerCallbacks->GetBatteryLevel;
   callback_mbwrapper.GetTemperature = handlerCallbacks->GetTemperature;
+  callback_mbwrapper.OnNvmDataChange = handlerCallbacks->OnNvmDataChange;
+  callback_mbwrapper.OnNetworkParametersChange = handlerCallbacks->OnNetworkParametersChange;
   callback_mbwrapper.OnJoinRequest = handlerCallbacks->OnJoinRequest;
   callback_mbwrapper.OnTxData = handlerCallbacks->OnTxData;
   callback_mbwrapper.OnRxData = handlerCallbacks->OnRxData;
+  callback_mbwrapper.OnClassChange = handlerCallbacks->OnClassChange;
+  callback_mbwrapper.OnBeaconStatusChange = handlerCallbacks->OnBeaconStatusChange;
+  callback_mbwrapper.OnSysTimeUpdate = handlerCallbacks->OnSysTimeUpdate;
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_INITIALIZATION_ID;
@@ -230,6 +250,7 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   uint32_t *com_buffer ;
   uint16_t i = 0;
   uint32_t ret;
+  uint8_t next_addr = 0;
 
   if ((appData == NULL) || (appData->Buffer == NULL))
   {
@@ -237,11 +258,17 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  /* need to 8-align the next address */
-  uint8_t next_addr = (appData->BufferSize + 7) & ~7;
+  if (appData->BufferSize > 0)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
+    /* need to 8-align the next address */
+    next_addr = (appData->BufferSize + 7) & ~7;
+  }
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
-  UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SEND_ID;
@@ -250,14 +277,24 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   com_buffer[i++] = (uint32_t) appData->BufferSize;
   com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
   com_buffer[i++] = (uint32_t) isTxConfirmed;
-  com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
+  if (nextTxIn == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
+  }
   com_buffer[i++] = (uint32_t) allowDelayedTx;
   com_obj->ParamCnt = i;
 
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
+  }
 
   ret = com_obj->ReturnVal;
   return (LmHandlerErrorStatus_t) ret;
@@ -311,7 +348,7 @@ LmHandlerErrorStatus_t LmHandlerRequestClass(DeviceClass_t newClass)
   /* USER CODE END LmHandlerRequestClass_2 */
 }
 
-int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
+LmHandlerErrorStatus_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
 {
   /* USER CODE BEGIN LmHandlerGetCurrentClass_1 */
 
@@ -341,13 +378,13 @@ int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
   UTIL_MEM_cpy_8(deviceClass, aLoraMbWrapShareBuffer, sizeof(DeviceClass_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetCurrentClass_2 */
 
   /* USER CODE END LmHandlerGetCurrentClass_2 */
 }
 
-int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
+LmHandlerErrorStatus_t LmHandlerGetDevEUI(uint8_t *devEUI)
 {
   /* USER CODE BEGIN LmHandlerGetDevEUI_1 */
 
@@ -363,7 +400,7 @@ int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_GET_DEVEUI_ID;
@@ -374,16 +411,16 @@ int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDevEUI_2 */
 
   /* USER CODE END LmHandlerGetDevEUI_2 */
 }
 
-int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
+LmHandlerErrorStatus_t LmHandlerSetDevEUI(uint8_t *devEUI)
 {
   /* USER CODE BEGIN LmHandlerSetDevEUI_1 */
 
@@ -399,7 +436,7 @@ int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SET_DEVEUI_ID;
@@ -410,16 +447,16 @@ int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDevEUI_2 */
 
   /* USER CODE END LmHandlerSetDevEUI_2 */
 }
 
-int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
+LmHandlerErrorStatus_t LmHandlerGetAppEUI(uint8_t *appEUI)
 {
   /* USER CODE BEGIN LmHandlerGetAppEUI_1 */
 
@@ -435,7 +472,7 @@ int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_GET_APPEUI_ID;
@@ -446,16 +483,16 @@ int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetAppEUI_2 */
 
   /* USER CODE END LmHandlerGetAppEUI_2 */
 }
 
-int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
+LmHandlerErrorStatus_t LmHandlerSetAppEUI(uint8_t *appEUI)
 {
   /* USER CODE BEGIN LmHandlerSetAppEUI_1 */
 
@@ -471,7 +508,7 @@ int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SET_APPEUI_ID;
@@ -482,16 +519,304 @@ int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetAppEUI_2 */
 
   /* USER CODE END LmHandlerSetAppEUI_2 */
 }
 
-int32_t LmHandlerGetNetworkID(uint32_t *networkId)
+LmHandlerErrorStatus_t LmHandlerGetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNwkKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNwkKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppKey_1 */
+
+  /* USER CODE END LmHandlerGetAppKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppKey_2 */
+
+  /* USER CODE END LmHandlerGetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppKey_1 */
+
+  /* USER CODE END LmHandlerSetAppKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppKey_2 */
+
+  /* USER CODE END LmHandlerSetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppSKey_1 */
+
+  /* USER CODE END LmHandlerGetAppSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppSKey_2 */
+
+  /* USER CODE END LmHandlerGetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppSKey_1 */
+
+  /* USER CODE END LmHandlerSetAppSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppSKey_2 */
+
+  /* USER CODE END LmHandlerSetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNetworkID(uint32_t *networkId)
 {
   /* USER CODE BEGIN LmHandlerGetNetworkID_1 */
 
@@ -518,13 +843,13 @@ int32_t LmHandlerGetNetworkID(uint32_t *networkId)
   *networkId = (aLoraMbWrapShareBuffer[3] << 24) | (aLoraMbWrapShareBuffer[2] << 16) | (aLoraMbWrapShareBuffer[1] << 8) | aLoraMbWrapShareBuffer[0];
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetNetworkID_2 */
 
   /* USER CODE END LmHandlerGetNetworkID_2 */
 }
 
-int32_t LmHandlerSetNetworkID(uint32_t networkId)
+LmHandlerErrorStatus_t LmHandlerSetNetworkID(uint32_t networkId)
 {
   /* USER CODE BEGIN LmHandlerSetNetworkID_1 */
 
@@ -545,13 +870,13 @@ int32_t LmHandlerSetNetworkID(uint32_t networkId)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetNetworkID_2 */
 
   /* USER CODE END LmHandlerSetNetworkID_2 */
 }
 
-int32_t LmHandlerGetDevAddr(uint32_t *devAddr)
+LmHandlerErrorStatus_t LmHandlerGetDevAddr(uint32_t *devAddr)
 {
   /* USER CODE BEGIN LmHandlerGetDevAddr_1 */
 
@@ -581,13 +906,13 @@ int32_t LmHandlerGetDevAddr(uint32_t *devAddr)
   UTIL_MEM_cpy_8(devAddr, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDevAddr_2 */
 
   /* USER CODE END LmHandlerGetDevAddr_2 */
 }
 
-int32_t LmHandlerSetDevAddr(uint32_t devAddr)
+LmHandlerErrorStatus_t LmHandlerSetDevAddr(uint32_t devAddr)
 {
   /* USER CODE BEGIN LmHandlerSetDevAddr_1 */
 
@@ -608,13 +933,13 @@ int32_t LmHandlerSetDevAddr(uint32_t devAddr)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDevAddr_2 */
 
   /* USER CODE END LmHandlerSetDevAddr_2 */
 }
 
-int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
+LmHandlerErrorStatus_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
 {
   /* USER CODE BEGIN LmHandlerGetActiveRegion_1 */
 
@@ -644,13 +969,13 @@ int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
   UTIL_MEM_cpy_8(region, aLoraMbWrapShareBuffer, sizeof(LoRaMacRegion_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetActiveRegion_2 */
 
   /* USER CODE END LmHandlerGetActiveRegion_2 */
 }
 
-int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
+LmHandlerErrorStatus_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
 {
   /* USER CODE BEGIN LmHandlerSetActiveRegion_1 */
 
@@ -674,13 +999,13 @@ int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetActiveRegion_2 */
 
   /* USER CODE END LmHandlerSetActiveRegion_2 */
 }
 
-int32_t LmHandlerGetAdrEnable(bool *adrEnable)
+LmHandlerErrorStatus_t LmHandlerGetAdrEnable(bool *adrEnable)
 {
   /* USER CODE BEGIN LmHandlerGetAdrEnable_1 */
 
@@ -710,13 +1035,13 @@ int32_t LmHandlerGetAdrEnable(bool *adrEnable)
   UTIL_MEM_cpy_8(adrEnable, aLoraMbWrapShareBuffer, sizeof(bool));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetAdrEnable_2 */
 
   /* USER CODE END LmHandlerGetAdrEnable_2 */
 }
 
-int32_t LmHandlerSetAdrEnable(bool adrEnable)
+LmHandlerErrorStatus_t LmHandlerSetAdrEnable(bool adrEnable)
 {
   /* USER CODE BEGIN LmHandlerSetAdrEnable_1 */
 
@@ -737,13 +1062,13 @@ int32_t LmHandlerSetAdrEnable(bool adrEnable)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetAdrEnable_2 */
 
   /* USER CODE END LmHandlerSetAdrEnable_2 */
 }
 
-int32_t LmHandlerGetTxDatarate(int8_t *txDatarate)
+LmHandlerErrorStatus_t LmHandlerGetTxDatarate(int8_t *txDatarate)
 {
   /* USER CODE BEGIN LmHandlerGetTxDatarate_1 */
 
@@ -773,13 +1098,13 @@ int32_t LmHandlerGetTxDatarate(int8_t *txDatarate)
   UTIL_MEM_cpy_8(txDatarate, aLoraMbWrapShareBuffer, sizeof(int8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetTxDatarate_2 */
 
   /* USER CODE END LmHandlerGetTxDatarate_2 */
 }
 
-int32_t LmHandlerSetTxDatarate(int8_t txDatarate)
+LmHandlerErrorStatus_t LmHandlerSetTxDatarate(int8_t txDatarate)
 {
   /* USER CODE BEGIN LmHandlerSetTxDatarate_1 */
 
@@ -800,13 +1125,13 @@ int32_t LmHandlerSetTxDatarate(int8_t txDatarate)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetTxDatarate_2 */
 
   /* USER CODE END LmHandlerSetTxDatarate_2 */
 }
 
-int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
+LmHandlerErrorStatus_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
 {
   /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_1 */
 
@@ -836,13 +1161,13 @@ int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
   UTIL_MEM_cpy_8(dutyCycleEnable, aLoraMbWrapShareBuffer, sizeof(bool));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_2 */
 
   /* USER CODE END LmHandlerGetDutyCycleEnable_2 */
 }
 
-int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
+LmHandlerErrorStatus_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
 {
   /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_1 */
 
@@ -863,13 +1188,13 @@ int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_2 */
 
   /* USER CODE END LmHandlerSetDutyCycleEnable_2 */
 }
 
-int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
+LmHandlerErrorStatus_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
 {
   /* USER CODE BEGIN LmHandlerGetRX2Params_1 */
 
@@ -899,13 +1224,13 @@ int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
   UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRX2Params_2 */
 
   /* USER CODE END LmHandlerGetRX2Params_2 */
 }
 
-int32_t LmHandlerGetTxPower(int8_t *txPower)
+LmHandlerErrorStatus_t LmHandlerGetTxPower(int8_t *txPower)
 {
   /* USER CODE BEGIN LmHandlerGetTxPower_1 */
 
@@ -935,13 +1260,13 @@ int32_t LmHandlerGetTxPower(int8_t *txPower)
   UTIL_MEM_cpy_8(txPower, aLoraMbWrapShareBuffer, sizeof(int8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetTxPower_2 */
 
   /* USER CODE END LmHandlerGetTxPower_2 */
 }
 
-int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetRx1Delay_1 */
 
@@ -971,13 +1296,13 @@ int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRx1Delay_2 */
 
   /* USER CODE END LmHandlerGetRx1Delay_2 */
 }
 
-int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetRx2Delay_1 */
 
@@ -1007,13 +1332,13 @@ int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRx2Delay_2 */
 
   /* USER CODE END LmHandlerGetRx2Delay_2 */
 }
 
-int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_1 */
 
@@ -1043,13 +1368,13 @@ int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_2 */
 
   /* USER CODE END LmHandlerGetJoinRx1Delay_2 */
 }
 
-int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_1 */
 
@@ -1079,13 +1404,13 @@ int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_2 */
 
   /* USER CODE END LmHandlerGetJoinRx2Delay_2 */
 }
 
-int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
+LmHandlerErrorStatus_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
 {
   /* USER CODE BEGIN LmHandlerSetRX2Params_1 */
 
@@ -1115,13 +1440,13 @@ int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
   UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRX2Params_2 */
 
   /* USER CODE END LmHandlerSetRX2Params_2 */
 }
 
-int32_t LmHandlerSetTxPower(int8_t txPower)
+LmHandlerErrorStatus_t LmHandlerSetTxPower(int8_t txPower)
 {
   /* USER CODE BEGIN LmHandlerSetTxPower_1 */
 
@@ -1142,13 +1467,13 @@ int32_t LmHandlerSetTxPower(int8_t txPower)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetTxPower_2 */
 
   /* USER CODE END LmHandlerSetTxPower_2 */
 }
 
-int32_t LmHandlerSetRx1Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetRx1Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetRx1Delay_1 */
 
@@ -1169,13 +1494,13 @@ int32_t LmHandlerSetRx1Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRx1Delay_2 */
 
   /* USER CODE END LmHandlerSetRx1Delay_2 */
 }
 
-int32_t LmHandlerSetRx2Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetRx2Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetRx2Delay_1 */
 
@@ -1196,13 +1521,13 @@ int32_t LmHandlerSetRx2Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRx2Delay_2 */
 
   /* USER CODE END LmHandlerSetRx2Delay_2 */
 }
 
-int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_1 */
 
@@ -1223,13 +1548,13 @@ int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_2 */
 
   /* USER CODE END LmHandlerSetJoinRx1Delay_2 */
 }
 
-int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_1 */
 
@@ -1250,13 +1575,13 @@ int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_2 */
 
   /* USER CODE END LmHandlerSetJoinRx2Delay_2 */
 }
 
-int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
+LmHandlerErrorStatus_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
 {
   /* USER CODE BEGIN LmHandlerGetPingPeriodicity_1 */
 
@@ -1286,13 +1611,13 @@ int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
   UTIL_MEM_cpy_8(pingPeriodicity, aLoraMbWrapShareBuffer, sizeof(uint8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetPingPeriodicity_2 */
 
   /* USER CODE END LmHandlerGetPingPeriodicity_2 */
 }
 
-int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
+LmHandlerErrorStatus_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
 {
   /* USER CODE BEGIN LmHandlerSetPingPeriodicity_1 */
 
@@ -1313,13 +1638,13 @@ int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetPingPeriodicity_2 */
 
   /* USER CODE END LmHandlerSetPingPeriodicity_2 */
 }
 
-int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
+LmHandlerErrorStatus_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
 {
   /* USER CODE BEGIN LmHandlerGetBeaconState_1 */
 
@@ -1349,12 +1674,56 @@ int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
   UTIL_MEM_cpy_8(beaconState, aLoraMbWrapShareBuffer, sizeof(BeaconState_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetBeaconState_2 */
 
   /* USER CODE END LmHandlerGetBeaconState_2 */
 }
 
+LmHandlerErrorStatus_t LmHandlerLinkCheckReq(void)
+{
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_1 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_LINK_CHECK_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_2 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerDeviceTimeReq(void)
+{
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_1 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_DEVICE_TIME_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_2 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_2 */
+}
+
 void LoraInfo_Init(void)
 {
   /* USER CODE BEGIN LoraInfo_Init_1 */
@@ -1389,18 +1758,13 @@ LoraInfo_t *LoraInfo_GetPtr(void)
   /* USER CODE END LoraInfo_GetPtr_2 */
 }
 
-/**
-  * @brief This function processes the callbacks and primitives from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Lora_Notif_1 */
 
   /* USER CODE END Process_Lora_Notif_1 */
   uint32_t *com_buffer = ComObj->ParamBuf;
-  uint32_t    cb_ret;
+  uint32_t cb_ret = 0;
 
   /* Lora Notif received */
   APP_LOG(TS_ON, VLEVEL_H, "CM4<(LoRa)\r\n");
@@ -1416,7 +1780,7 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -1430,13 +1794,33 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal =  cb_ret; /* */
       break;
 
+    case LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNvmDataChange != NULL)
+      {
+        callback_mbwrapper.OnNvmDataChange((LmHandlerNvmContextStates_t) com_buffer[0], (uint16_t) com_buffer[1]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNetworkParametersChange != NULL)
+      {
+        callback_mbwrapper.OnNetworkParametersChange((CommissioningParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
     case LMHANDLER_ON_JOIN_REQ_CB_ID:
       if (callback_mbwrapper.OnJoinRequest != NULL)
       {
@@ -1466,6 +1850,36 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal =  0; /* */
       break;
+
+    case LMHANDLER_ON_CLASS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnClassChange != NULL)
+      {
+        callback_mbwrapper.OnClassChange((DeviceClass_t) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnBeaconStatusChange != NULL)
+      {
+        callback_mbwrapper.OnBeaconStatusChange((LmHandlerBeaconParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID:
+      if (callback_mbwrapper.OnSysTimeUpdate != NULL)
+      {
+        callback_mbwrapper.OnSysTimeUpdate();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
     default:
       break;
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
index 82ac862c..1218ce87 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LMHANDLER_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM0+
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Lora_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
index 76152897..8328a537 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -58,11 +61,44 @@ static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -70,11 +106,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -107,11 +138,6 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief The application informs MBMUX about the CM0PLUS supported feature list
-  * @param p_CM0PLUS_FeatureList  pointer to the list of CM0PLUS features
-  * @retval  none
-  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
 {
   /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
@@ -123,15 +149,6 @@ void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
   /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval   channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
 {
   int8_t check_if_feature_provided_by_cm0plus = 0;
@@ -203,13 +220,6 @@ int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -235,9 +245,9 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
     }
     else
     {
-      /* Make sure to clear pending IRQ Notification before unregistering the callback */
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
       /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
-      /* if the mask is removed by anyone, the unwhished IRQ is generated if SR isn't cleaned */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
       IPCC_IF_AcknowledgeSnd(mb_ch);
 
       p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
@@ -254,12 +264,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the MailBox com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -286,11 +290,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Cmd to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_CommandSnd_1 */
@@ -309,11 +308,6 @@ int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_CommandSnd_Last */
 }
 
-/**
-  * @brief Send ack to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
@@ -333,12 +327,6 @@ uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Check if the FEATURE is in the CM0 table and return it's position
-  * @param e_featID  identifier of the feature
-  * @retval 0 not present, 1 present
-  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
 {
   int8_t ret = 0;
@@ -370,11 +358,6 @@ static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_feat
   return ret;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
@@ -390,11 +373,6 @@ static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
@@ -410,11 +388,6 @@ static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Find the first channel not yet associated to a feature (available)
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means no channel available
-  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
@@ -475,12 +448,6 @@ static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
   /* USER CODE END MBMUX_FindChStillUnregistered_Last */
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -492,17 +459,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
index fd31da65..a15773f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM4_H__
@@ -52,23 +54,60 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
-                             void (*MsgCm4Cb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
-
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 1b866fbe..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmuxif_sys.h"
-#include "stm32_mem.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aKmsCmdRespBuff[MAX_PARAM_OF_KMS_CMD_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers KMS feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeature(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsRespRcvCb, aKmsCmdRespBuff, sizeof(aKmsCmdRespBuff));
-  if (ret >= 0)
-  {
-    /* Note: Kms uses only NOTIF_ACK channel, the SEQ_TASK only on CM0PLUS */
-
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_KMS_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Kms feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void)
-{
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP);
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  if (com_param_ptr == NULL)
-  {
-    Error_Handler(); /* ErrorHandler() : feature isn't registered */
-  }
-
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-  return com_param_ptr;
-}
-
-/**
-  * @brief Sends a Kms-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendCmd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_1 */
-  if (MBMUX_CommandSnd(FEAT_INFO_KMS_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS response callbacks: set event to release waiting task
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.h
deleted file mode 100644
index cfc715c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM4_H__
-#define __MBMUXIF_KMS_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void);
-void MBMUXIF_KmsSendCmd(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
index 7d490cb2..85c7237c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle LoraWAN via MBMUX
+  * @brief   allows CM4 application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -56,7 +58,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *LoraComObj;
 
+/**
+  * @brief LoRa cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraCmdRespBuff[MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief LoRa notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -64,8 +73,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LOR
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the notification
+  */
 static void MBMUXIF_TaskLoraNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -73,16 +95,6 @@ static void MBMUXIF_TaskLoraNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers LORA feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_LoraInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_system_info;
@@ -129,11 +141,6 @@ int8_t MBMUXIF_LoraInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Lora feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_1 */
@@ -142,7 +149,7 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_Last */
@@ -150,11 +157,6 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Lora-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendCmd_1 */
@@ -173,11 +175,6 @@ void MBMUXIF_LoraSendCmd(void)
   /* USER CODE END MBMUXIF_LoraSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Lora-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendAck_1 */
@@ -197,11 +194,6 @@ void MBMUXIF_LoraSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  LORA response callbacks: set event to release waiting task
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_1 */
@@ -213,11 +205,6 @@ static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_Last */
 }
 
-/**
-  * @brief  LORA notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_1 */
@@ -230,11 +217,6 @@ static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_Last */
 }
 
-/**
-  * @brief  LORA task to process the notification
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskLoraNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
index c7911ad1..ff6c5791 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.h
   * @author  MCD Application Team
-  * @brief   API provided to CM4 applic to register and handle LoraWAN via MBMUX
+  * @brief   API provided to CM4 application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_LORA_CM4_H__
@@ -52,9 +54,30 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_LoraSendCmd(void);
+
+/**
+  * @brief   Sends a Lora-Ack via Ipcc without waiting for the ack
+  */
 void MBMUXIF_LoraSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
index 26d69db0..81fc561a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -55,7 +57,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *RadioComObj;
 
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -63,8 +72,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RA
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
 static void MBMUXIF_TaskRadioNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -72,16 +94,6 @@ static void MBMUXIF_TaskRadioNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers RADIO feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
@@ -125,11 +137,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
@@ -138,7 +145,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
@@ -146,11 +153,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
@@ -169,11 +171,6 @@ void MBMUXIF_RadioSendCmd(void)
   /* USER CODE END MBMUXIF_RadioSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Radio-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
@@ -193,11 +190,6 @@ void MBMUXIF_RadioSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO response callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
@@ -209,11 +201,6 @@ static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
@@ -226,11 +213,6 @@ static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the notification
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
index 1f4c2454..3d565fcd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM4_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_RadioSendAck(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
index c937c14c..1884bb44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -53,10 +55,10 @@
 
 /* Private variables ---------------------------------------------------------*/
 static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
-static __IO uint8_t AllowSeqencerForSysCmd = 0;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
 static __IO uint8_t MbSystemRespRcvFlag;
 
-UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(4) ;
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
 
 MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
 MBMUX_ComParam_t *SystemComObj;
@@ -64,23 +66,54 @@ MBMUX_ComParam_t *SystemComObj;
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
 static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -88,47 +121,54 @@ static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
 
   /* USER CODE END MBMUXIF_SystemInit_1 */
 
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
   /* Get the Dual boot configuration status */
   HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
 
   if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
   {
-    APP_PPRINTF("\r\n WARNING: There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n",  (uint32_t) pMb_RefTable);
-    APP_PPRINTF(" and the address calculated according to the IPCCDBA option byte: 0x%X \r\n", OptionsBytesStruct.IPCCdataBufAddr);
-    APP_PPRINTF(" The execution enters now in a while(1){}  \r\n");
-    APP_PPRINTF(" please check the CM4\\MbMux\\mbmuxif_sys.c or update the scatter file \r\n\r\n");
-
-    /* USER CODE BEGIN MBMUXIF_SystemInit_Prevent_OB_Programming */
-      /* If you are sure you need to reprogram the IPCCDBA set #if to 0 (to avoid while(1){}) */
-      /* Please first check the  CM4 scatter file.*/
-      /* Make sure that the MAPPING_TABLE is placed in SRAM2 (memory with retention) */
-      /* Examples of scatter files available in the LoraWAN and Sigfox DualCore Applications pack*/
-      /* */
-      /* After HAL_FLASH_OB_Launch you will have to unplug and plug the board from power after this operation.*/
-      /* Additionally possible Issue under investigation, i.e.: */
-      /* In some cases happen that unplugging the chip power is not sufficient */
-      /* if so you need to reboot from RAM putting the BOOT0 pin to 3v3 */
-      /* attach with Cube Programmer and full erase the chip memory. */
-      /* */
-      /* PS: of course if you are attached with the debugger, it will not respond anymore after HAL_FLASH_OB_Launch*/
-#if 1
-    /* USER CODE END MBMUXIF_SystemInit_Prevent_OB_Programming */
-    while(1){}
-#else
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
 
     /* write FLASH->IPCCBR option byte */
     /* Unlock the Flash to enable the flash control register access *************/
@@ -140,7 +180,7 @@ int8_t MBMUXIF_SystemInit(void)
     HAL_FLASH_OB_Unlock();
 
     /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
-    OptionsBytesStruct.OptionType  = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
     OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
 
     if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
@@ -170,10 +210,8 @@ int8_t MBMUXIF_SystemInit(void)
     (void) HAL_FLASH_OB_Lock();
     /* Lock the Flash to disable the flash control register access  *********/
     (void) HAL_FLASH_Lock();
-#endif
   }
-  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
-
+  /* Init MailBoxMultiplexer */
   MBMUX_Init(pMb_RefTable);
 
   ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
@@ -186,16 +224,13 @@ int8_t MBMUXIF_SystemInit(void)
     ret = 0;
     UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
   }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
 
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
   /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
   /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-#else
-#warning "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_ON */
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
 
@@ -203,14 +238,9 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
-  int8_t ret=0;
+  int8_t ret = 0;
 
   /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
 
@@ -259,14 +289,6 @@ int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
   return ret;
 }
 
-/**
-  * @brief Set synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
 {
   pMb_RefTable->SynchronizeCpusAtBoot = flag;
@@ -275,26 +297,16 @@ void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
   /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
 }
 
-/**
-  * @brief gives green light to Cm0 to Initialised MBMUX on its side
-  * @param none
-  * @retval  none
-  */
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void)
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
 {
   while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
   {
   }
-  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
 
-  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
@@ -303,30 +315,19 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPr
   /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
 }
 
-/**
-  * @brief To allow SystemCmd to use the sequencer (hence entering in low power)
-  * @note  For compatib with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The applic can call this API at the end of the Init
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void)
 {
-  AllowSeqencerForSysCmd = 1;
+  AllowSequencerForSysCmd = 1;
   /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
 
   /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
 }
 
-/**
-  * @brief Sends a System-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
@@ -339,7 +340,7 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
     MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
     if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
     {
-      if (AllowSeqencerForSysCmd)
+      if (AllowSequencerForSysCmd)
       {
         UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
       }
@@ -356,20 +357,15 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
 
-  /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
 
   /* USER CODE END MBMUXIF_SystemSendCmd_Last */
 }
 
-/**
-  * @brief Sends a System-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
@@ -384,17 +380,11 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendAck_Last */
 }
 
-/* USER CODE BEGIN ExpoF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExpoF */
+/* USER CODE END EF */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief   Gets the pointer to CM0PLUS capabilities info table
-  * @param   none
-  * @retval  pointer to CM0PLUS capabilities info table
-  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
 {
   MBMUX_ComParam_t *com_obj;
@@ -421,14 +411,9 @@ FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
   return (FEAT_INFO_List_t *) ret;   /* need to verify */
 }
 
-/**
-  * @brief returns the pointer to the Capability Info table of a given feature
-  * @param e_featID ID of the feature from which retrieve the ptr
-  * @retval  LoRaMacInfoTable pointer
-  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
 {
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list = NULL;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
   FEAT_INFO_Param_t  *p_feature = NULL;
   uint8_t i;
   uint8_t cm0plus_nr_of_supported_features;
@@ -438,15 +423,15 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
 
   /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
 
-  if (p_cm0plus_supprted_features_list != NULL)
+  if (p_cm0plus_supported_features_list != NULL)
   {
-    cm0plus_nr_of_supported_features = p_cm0plus_supprted_features_list->Feat_Info_Cnt;
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
 
     for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
     {
-      p_feature = i + p_cm0plus_supprted_features_list->Feat_Info_TableAddress;
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
       if (p_feature->Feat_Info_Feature_Id == e_featID)
       {
         found = 1;
@@ -466,12 +451,6 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
   return  p_feature;
 }
 
-/**
-  * @brief Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @retval   0 ok, else error code
-  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 {
   MBMUX_ComParam_t *com_obj;
@@ -506,11 +485,6 @@ int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM response callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
@@ -519,7 +493,7 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 
   /* During "SystemInit sequence" Flag is used instead of Sequencer */
   MbSystemRespRcvFlag = 1;
-  if (AllowSeqencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
   {
     UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
   }
@@ -528,11 +502,6 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
@@ -545,11 +514,6 @@ static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM task to process the notification
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
@@ -561,11 +525,6 @@ static void MBMUXIF_TaskSystemNotifRcv(void)
   /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
@@ -573,11 +532,6 @@ static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
@@ -591,11 +545,6 @@ static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
@@ -603,11 +552,6 @@ static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
index d6f9cc5c..61f37d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM4_H__
@@ -55,13 +57,56 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -69,8 +114,24 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
index b42f9402..c91551a5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to receive by CM0 TRACE via MBMUX
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -46,25 +48,26 @@
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
-
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
 /* USER CODE BEGIN PM */
 
 /* USER CODE END PM */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_TraceInit(void)
 {
   int8_t ret;
@@ -90,23 +93,18 @@ int8_t MBMUXIF_TraceInit(void)
   return ret;
 }
 
-/**
-  * @brief Sends a Trace-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendAck(void)
 {
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
 
-/* USER CODE END MBMUXIF_TraceSendAck_1 */
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
   if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
   {
     Error_Handler();
   }
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
 
-/* USER CODE END MBMUXIF_TraceSendAck_Last */
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
 }
 
 /* USER CODE BEGIN EFD */
@@ -114,16 +112,11 @@ void MBMUXIF_TraceSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 {
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
   MBMUX_ComParam_t *TraceComObj;
   uint32_t  notif_ack_id;
   uint8_t *buffer;
@@ -151,9 +144,9 @@ static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 
   /* Send ack */
   MBMUXIF_TraceSendAck();
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
 }
 
 /* USER CODE BEGIN PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
index 7a8d3fa7..f98a156d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle TRACE via MBMUX
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM4_H__
@@ -52,7 +54,15 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
index 1326f87b..fd0e305e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "radio_mbwrapper.h"
@@ -72,38 +75,38 @@ static void RadioIrqProcess(void);
 /*!
  * \brief Initializes the radio
  *
- * \param [IN] events Structure containing the driver callback functions
+ * \param[in] events Structure containing the driver callback functions
  */
 static void RadioInit(RadioEvents_t *events);
 
 /*!
  * Return current radio status
  *
- * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
  */
 static RadioState_t RadioGetStatus(void);
 
 /*!
  * \brief Configures the radio with the given modem
  *
- * \param [IN] modem Modem to be used [0: FSK, 1: LoRa]
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
  */
 static void RadioSetModem(RadioModems_t modem);
 
 /*!
  * \brief Sets the channel frequency
  *
- * \param [IN] freq         Channel RF frequency
+ * \param[in] freq Channel RF frequency
  */
 static void RadioSetChannel(uint32_t freq);
 
 /*!
   * \brief Checks if the channel is free for the given time
   *
-  * \param [IN] freq                Channel RF frequency in Hertz
-  * \param [IN] rxBandwidth         Rx bandwidth in Hertz
-  * \param [IN] rssiThresh          RSSI threshold in dBm
-  * \param [IN] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
   *
   * \retval isFree         [true: Channel is free, false: Channel is not free]
   */
@@ -125,40 +128,40 @@ static uint32_t RadioRandom(void);
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: N/A ( set to 0 )
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [false: single mode, true: continuous mode]
  */
 static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
@@ -172,37 +175,37 @@ static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] fdev         Sets the frequency deviation (FSK only)
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
  *                          FSK : [Hz]
  *                          LoRa: 0
- * \param [IN] bandwidth    Sets the bandwidth (LoRa only)
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
  *                          FSK : 0
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the preamble length
+ * \param[in] preambleLen  Sets the preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] crcOn        Enables disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] timeout      Transmission timeout [ms]
  */
 static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
                              uint32_t bandwidth, uint32_t datarate,
@@ -213,7 +216,7 @@ static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
 /*!
  * \brief Checks if the given RF frequency is supported by the hardware
  *
- * \param [IN] frequency RF frequency to be checked
+ * \param[in] frequency RF frequency to be checked
  * \retval isSupported [true: supported, false: unsupported]
  */
 static bool RadioCheckRfFrequency(uint32_t frequency);
@@ -221,26 +224,26 @@ static bool RadioCheckRfFrequency(uint32_t frequency);
 /*!
  * \brief Computes the packet time on air in ms for the given payload
  *
- * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] spreadingFactor  Sets the Spreading Factor
+ * \param[in] spreadingFactor  Sets the Spreading Factor
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
  *
  * \retval airTime        Computed airTime (ms) for the given packet payload length
  */
@@ -253,8 +256,8 @@ static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
  * \brief Sends the buffer of size. Prepares the packet to be sent and sets
  *        the radio in transmission
  *
- * \param [IN]: buffer     Buffer pointer
- * \param [IN]: size       Buffer size
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
  */
 static void RadioSend(uint8_t *buffer, uint8_t size);
 
@@ -270,7 +273,7 @@ static void RadioStandby(void);
 
 /*!
  * \brief Sets the radio in reception mode for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRx(uint32_t timeout);
@@ -283,15 +286,17 @@ static void RadioStartCad(void);
 /*!
  * \brief Sets the radio in continuous wave transmission mode
  *
- * \param [IN]: freq       Channel RF frequency
- * \param [IN]: power      Sets the output power [dBm]
- * \param [IN]: time       Transmission mode timeout [s]
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
  */
 static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
 
 /*!
  * \brief Reads the current RSSI value
  *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
  * \retval rssiValue Current RSSI value in [dBm]
  */
 static int16_t RadioRssi(RadioModems_t modem);
@@ -299,15 +304,15 @@ static int16_t RadioRssi(RadioModems_t modem);
 /*!
  * \brief Writes the radio register at the specified address
  *
- * \param [IN]: addr Register address
- * \param [IN]: data New register value
+ * \param[in] addr Register address
+ * \param[in] data New register value
  */
 static void RadioWrite(uint16_t addr, uint8_t data);
 
 /*!
  * \brief Reads the radio register at the specified address
  *
- * \param [IN]: addr Register address
+ * \param[in] addr Register address
  * \retval data Register value
  */
 static uint8_t RadioRead(uint16_t addr);
@@ -315,26 +320,26 @@ static uint8_t RadioRead(uint16_t addr);
 /*!
  * \brief Writes multiple radio registers starting at address
  *
- * \param [IN] addr   First Radio register address
- * \param [IN] buffer Buffer containing the new register's values
- * \param [IN] size   Number of registers to be written
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
  */
 static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Reads multiple radio registers starting at address
  *
- * \param [IN] addr First Radio register address
- * \param [OUT] buffer Buffer where to copy the registers data
- * \param [IN] size Number of registers to be read
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
  */
 static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Sets the maximum payload length.
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] max        Maximum payload length in bytes
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
  */
 static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
 
@@ -343,7 +348,7 @@ static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
  *
  * \remark Applies to LoRa modem only
  *
- * \param [IN] enable if true, it enables a public network
+ * \param[in] enable if true, it enables a public network
  */
 static void RadioSetPublicNetwork(bool enable);
 
@@ -356,7 +361,7 @@ static uint32_t RadioGetWakeUpTime(void);
 
 /*!
  * \brief Sets the radio in reception mode with Max LNA gain for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRxBoosted(uint32_t timeout);
@@ -364,51 +369,49 @@ static void RadioRxBoosted(uint32_t timeout);
 /*!
  * \brief Sets the Rx duty cycle management parameters
  *
- * \param [in]  rxTime        Structure describing reception timeout value
- * \param [in]  sleepTime     Structure describing sleep timeout value
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
  */
 static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
 
 /*!
  * \brief Set Tx PRBS modulated wave
- * \retval none
  */
 static void RadioTxPrbs(void);
 
 /*!
  * \brief Set Tx continuous wave
- * \param [in]  power  Tx power level [0..15]
- * \retval none
+ * \param[in]  power  Tx power level [0..15]
  */
 static void RadioTxCw(int8_t power);
 
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [0: single mode, otherwise continuous mode]
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
  * \return 0 when no parameters error, -1 otherwise
  */
-static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t* config,
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
                                        uint32_t rxContinuous, uint32_t symbTimeout);
 
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
                             bpsk field to be used if modem =GENERIC_BPSK
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
  * \return 0 when no parameters error, -1 otherwise
  */
 static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
@@ -461,11 +464,6 @@ const struct Radio_s Radio =
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief This function processes the radio events callbacks  from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Radio_Notif_1 */
@@ -486,7 +484,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -500,7 +498,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -564,7 +562,7 @@ static void RadioInit(RadioEvents_t *events)
 
   if (events == NULL)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   radioevents_wrap.TxDone = events->TxDone;
@@ -590,7 +588,7 @@ static void RadioInit(RadioEvents_t *events)
 /*!
   * Return current radio status
   *
-  * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
   */
 static RadioState_t RadioGetStatus(void)
 {
@@ -999,7 +997,7 @@ static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
   uint16_t i = 0;
 
   com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_CONTINOUS_WAVE_ID;
+  com_obj->MsgId = RADIO_SET_TX_CONTINUOUS_WAVE_ID;
   com_buffer = com_obj->ParamBuf;
   com_buffer[i++] = (uint32_t) freq;
   com_buffer[i++] = (uint32_t) power;
@@ -1424,10 +1422,4 @@ static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t
 
 /* USER CODE END PrFD */
 
-/**
-  * @}
-  *
-  */
-
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
index f73a1283..e7eebe2c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.h
deleted file mode 100644
index 8cf7f3ed..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON1_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON3_EXTI_IRQn              EXTI15_4_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
index 0390fb82..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     10U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
index f03a3e85..692c3088 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTEM_INFO_H
@@ -36,7 +38,7 @@ extern "C" {
 /**
   * @brief Feature enumeration
   * @note This is the list of all available feature so far,
-          the one available in a fiven build are listed in the Feat_Info_Table[]
+          the one available in a given build are listed in the Feat_Info_Table[]
           to keep compatibility, in order to add a feature
           use a new value to the bottom without changing the existing order
   */
@@ -115,7 +117,6 @@ typedef struct
 /* Exported functions ------------------------------------------------------- */
 /**
   * @brief  Init configuration params by calling specific feature xxx_info.c
-  * @return void
   */
 void FEAT_INFO_Init(void);
 /**
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
index 92abccde..0608fd34 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #ifndef __LORA_INFO_H__
 #define __LORA_INFO_H__
 
@@ -68,15 +71,12 @@ typedef struct
 
 /* Exported functions ------------------------------------------------------- */
 /**
-  * @brief initialises the LoraInfo table
-  * @param none
-  * @retval  none
+  * @brief initialize the LoraInfo table
   */
 void LoraInfo_Init(void);
 
 /**
   * @brief returns the pointer to the LoraInfo capabilities table
-  * @param none
   * @retval LoraInfo pointer
   */
 LoraInfo_t *LoraInfo_GetPtr(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
index 2874d9de..84cb7539 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux_table.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_TABLE_H__
@@ -48,12 +50,14 @@ typedef enum
   MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
 } MBMUX_ComType_t;
 
+/* Shared memory tables */
+
 typedef struct
 {
   uint32_t MsgId;
   void (*MsgCm4Cb)(void *ComObj);
-  void (*MsgCm0plusCb)(void *ComObj);
-  uint16_t BufSize;      /*!<  size of the array given by the applic */
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
   uint16_t ParamCnt;     /*!<  nr of words composing the message */
   uint32_t *ParamBuf;
   uint32_t ReturnVal;    /*!<  only used in RX */
@@ -66,7 +70,19 @@ typedef struct
   uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
   __IO uint16_t           SynchronizeCpusAtBoot;
   uint16_t                ChipRevId;
-} MBMUX_ComTable_t;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
 
 /* USER CODE BEGIN ET */
 
@@ -87,3 +103,5 @@ typedef struct
 #endif
 
 #endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
index 74a0a3cc..b1050113 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    msg_id.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MSG_ID_H__
@@ -62,6 +64,14 @@ typedef enum
   LMHANDLER_SET_DEVEUI_ID,
   LMHANDLER_GET_APPEUI_ID,
   LMHANDLER_SET_APPEUI_ID,
+  LMHANDLER_GET_NWKKEY_ID,
+  LMHANDLER_SET_NWKKEY_ID,
+  LMHANDLER_GET_APPKEY_ID,
+  LMHANDLER_SET_APPKEY_ID,
+  LMHANDLER_GET_NWKSKEY_ID,
+  LMHANDLER_SET_NWKSKEY_ID,
+  LMHANDLER_GET_APPSKEY_ID,
+  LMHANDLER_SET_APPSKEY_ID,
   LMHANDLER_GET_NWKID_ID,
   LMHANDLER_SET_NWKID_ID,
   LMHANDLER_GET_DEVADDR_ID,
@@ -89,14 +99,21 @@ typedef enum
   LMHANDLER_GET_PING_PERIODICITY_ID,
   LMHANDLER_SET_PING_PERIODICITY_ID,
   LMHANDLER_GET_BEACON_STATE_ID,
+  LMHANDLER_LINK_CHECK_REQ_ID,
+  LMHANDLER_DEVICE_TIME_REQ_ID,
 
   LMHANDLER_INFO_INIT_ID,
   /* NotifAck */
   LMHANDLER_GET_BATTERY_LEVEL_CB_ID,
   LMHANDLER_GET_TEMPERATURE_CB_ID,
+  LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID,
+  LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID,
   LMHANDLER_ON_JOIN_REQ_CB_ID,
   LMHANDLER_ON_TX_DATA_CB_ID,
   LMHANDLER_ON_RX_DATA_CB_ID,
+  LMHANDLER_ON_CLASS_CHANGE_CB_ID,
+  LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID,
+  LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID,
   LMHANDLER_ON_MAC_PROCESS_CB_ID,
   /* USER CODE BEGIN LORA_MsgIdTypeDef */
 
@@ -122,7 +139,7 @@ typedef enum
   RADIO_STANDBY_ID,
   RADIO_RX_ID,
   RADIO_START_CAD_ID,
-  RADIO_SET_TX_CONTINOUS_WAVE_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
   RADIO_RSSI_ID,
   RADIO_WRITE_ID,
   RADIO_READ_ID,
@@ -216,3 +233,5 @@ typedef enum
 #endif
 
 #endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
index 807e1bb4..d01a65d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
@@ -41,9 +41,6 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
-#define DBGMCU_LPM   0   /* if 1 enables/disables the Debug Module during LowPower modes */
-                         /* if 0 it does not modify the DBGMCU_CR_DBG registers */
-                         /* in DualCore few issues are under investigation when 1 */
 
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
@@ -62,12 +59,90 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
   GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
@@ -75,57 +150,49 @@ void DBG_Init(void)
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  /* make sure a pin is not used simultaneusly by the two cores */
-  /* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
 #if defined(CORE_CM4)
 
   /* Enable the GPIO_LINES Clock */
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
 
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+#else /* CORE_CM0PLUS */
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-#if defined (DBGMCU_LPM) && ( DBGMCU_LPM == 1 )
-  /* careful does not work correctly in dual core: Bugzilla 71087 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
-#elif defined (DBGMCU_LPM) && ( DBGMCU_LPM == 0 )
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
-#elif !defined (DBGMCU_LPM)
-#error "DBGMCU_LPM not defined or out of range <0,1>"
-#endif /* DBGMCU_LPM */
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
 
-#else /* CORE_CM0PLUS */
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
 
-  /* Enable the GPIO_LINES Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN ;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
+  /* HW alternate functions for monitoring RF */
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -143,7 +210,7 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /* LDO_rdy & BUCK_rdy */
+  /* LDO_rdy & BUCK_rdy (SMPS) */
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
   GPIO_InitStruct.Pull   = GPIO_NOPULL;
   GPIO_InitStruct.Pin    = (GPIO_PIN_2);
@@ -158,40 +225,29 @@ void DBG_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-#endif /* CORE_CM4 */
+#endif /* CORE_CM0PLUS */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#if defined(CORE_CM4)
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
 #endif /* CORE_CM4 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-  /* USER CODE END DBG_Init_Last */
+  /* USER CODE END DBG_ProbesInit_Last */
 }
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
index 162d992f..28890d05 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
@@ -43,94 +43,96 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/* make sure a pin is not used simultaneusly by the two cores */
-/* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
 #if defined(CORE_CM0PLUS)
-/**  Definition for Debug Line 1   **/
+
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 #else
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-#endif /* CORE_CM4 */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
 
 /* USER CODE BEGIN EC */
 
@@ -142,49 +144,66 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
 /**
-  * @brief Initializes the debug
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
index 96d91056..8de99d5f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1106,11 +1106,11 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>1</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
index ba682a62..f1acf413 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
@@ -226,6 +226,7 @@
                     <name>CCDefines</name>
                     <state>CORE_CM0PLUS</state>
                     <state>KMS_ENABLED</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                     <state>MBEDTLS_CONFIG_FILE="mbedtls_config.h"</state>
                 </option>
@@ -358,8 +359,9 @@
                     <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/Target</state>
                     <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
@@ -1068,48 +1070,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1117,68 +1077,119 @@
             </file>
         </group>
         <group>
-            <name>KMS</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>LoRaWAN</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
-                </file>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>KMS</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
             </group>
             <group>
-                <name>Target</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
-                </file>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
         </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>LoRaWAN_End_Node_DualCore_CM0PLUS</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
-            </file>
-        </group>
     </group>
     <group>
         <name>Doc</name>
@@ -1190,9 +1201,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_End_Node_DualCore_CM0PLUS</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1268,6 +1276,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1361,6 +1375,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_vm_storage.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\HAL\mac_stm32hal.c</name>
             </file>
@@ -1373,102 +1390,90 @@
         </group>
         <group>
             <name>LoRaWAN</name>
-            <group>
-                <name>Crypto</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
-                </file>
-            </group>
-            <group>
-                <name>LmHandler</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmCtxMgmt.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Mac</name>
-                <group>
-                    <name>Region</name>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
-                    </file>
-                </group>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Utilities</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
-                </file>
-            </group>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
+            </file>
         </group>
         <group>
             <name>mbed-crypto</name>
@@ -1490,6 +1495,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
index d79b2e13..4b1f218f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
@@ -44,7 +44,7 @@
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -112,7 +112,7 @@
                 </option>
                 <option>
                     <name>FlashLoadersV3</name>
-                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCImagesSuppressCheck1</name>
@@ -184,7 +184,7 @@
                 </option>
                 <option>
                     <name>OCMulticoreMaster</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>OCMulticorePort</name>
@@ -192,15 +192,15 @@
                 </option>
                 <option>
                     <name>OCMulticoreWorkspace</name>
-                    <state>$PROJ_DIR$\Project.eww</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveProject</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveConfiguration</name>
-                    <state>MBMUX_STM32WL_M0_FLASH</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCDownloadExtraImage</name>
@@ -1106,11 +1106,11 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>0</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
index 6d3d54b8..a0da7854 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
@@ -225,6 +225,7 @@
                 <option>
                     <name>CCDefines</name>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                 </option>
                 <option>
@@ -355,8 +356,9 @@
                     <state>$PROJ_DIR$/../CM4/LoRaWAN/Target</state>
                     <state>$PROJ_DIR$/../CM4/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
@@ -1019,7 +1021,7 @@
                 </option>
                 <option>
                     <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM4_import_lib.o</state>
+                    <state>###Unitialized###</state>
                 </option>
             </data>
         </settings>
@@ -1052,57 +1054,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1110,49 +1061,103 @@
             </file>
         </group>
         <group>
-            <name>LoRaWAN</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\CayenneLpp.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
-                </file>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\CayenneLpp.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
-        </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>LoRaWAN_End_Node_DualCore_CM4</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
-            </file>
         </group>
     </group>
     <group>
@@ -1165,14 +1170,14 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_End_Node_DualCore_CM4</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
                     <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
                 </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
             </group>
         </group>
         <group>
@@ -1234,6 +1239,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
             </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
index a6cf0145..cd6560d5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
index 6f11cd34..3e66df44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -11,10 +11,10 @@ define symbol __ICFEDIT_region_ROM_end__      = 0x0803CFFF;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_start__   = 0x0803E500;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_end__     = 0x0803E7FF;
 /***** SRAM2 shared allocated by M0+ *****/
-define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x2000B000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000BFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20009000;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20009FFF;
 /***** SRAM2 dedicated to M0+ *****/
-define symbol __ICFEDIT_region_RAM2_start__   = 0x2000C000;
+define symbol __ICFEDIT_region_RAM2_start__   = 0x2000A000;
 define symbol __ICFEDIT_region_RAM2_end__     = 0x2000FFFF;
 
 /* KMS Data Storage (NVMS) region */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
index 6f32a5f9..b8551a3e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
@@ -13,7 +13,7 @@ define symbol __ICFEDIT_region_RAM_start__    = 0x20000000;
 define symbol __ICFEDIT_region_RAM_end__      = 0x20007FFF;
 /***** SRAM2 shared allocated by M4 *****/
 define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20008000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000AFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20008FFF;
 
 /*-Sizes-*/
 define symbol __ICFEDIT_size_cstack__ = 0x800;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/LoRaWAN_End_Node_DualCore.ioc b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/LoRaWAN_End_Node_DualCore.ioc
index b0f53820..9d94c36c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/LoRaWAN_End_Node_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/LoRaWAN_End_Node_DualCore.ioc
@@ -1,13 +1,14 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
 ADC.SamplingTimeCommon2=ADC_SAMPLETIME_160CYCLES_5
 ADC.SelectedChannel=ADC_CHANNEL_TEMPSENSOR|ADC_CHANNEL_VREFINT
 CortexM0Plus.IPs=IPCC,LORAWAN,RCC,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,DMA,NVIC2\:I,RTC\:I,SUBGHZ\:I,ADV_TRACE,MISC,TIMER,TINY_LPM,KMS\:I,GTZC_S\:I,SEQUENCER_M0PLUS\:I
-CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,DMA\:I,NVIC1\:I,ADC\:I,USART2\:I,RTC,ADV_TRACE\:I,MISC\:I,TIMER\:I,TINY_LPM\:I,GTZC_NS\:I,SEQUENCER_M4\:I
+CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,DMA\:I,NVIC1\:I,ADC\:I,USART2\:I,RTC,ADV_TRACE\:I,MISC\:I,TIMER\:I,TINY_LPM\:I,GTZC_NS\:I,SEQUENCER_M4\:I,LPUART1\:I
+CortexM4.Pins=PA0,PA1
 Dma.Request0=USART2_TX
 Dma.RequestsNb=1
 Dma.USART2_TX.0.Channel_PRIV_NPRIV=DMA_CHANNEL_NPRIV_DISABLE
@@ -30,7 +31,7 @@ Dma.USART2_TX.0.SyncRequestNumber=1
 Dma.USART2_TX.0.SyncSignalID=NONE
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
-KMS.IPParameters=KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_CMAC,KMS_AES_GCM,KMS_MEM_LOGGING,KMS_NB_SESSIONS_MAX
+KMS.IPParameters=KMS_NB_SESSIONS_MAX,KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_SEARCH,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_LOGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_GCM,KMS_AES_CMAC,KMS_VM_DYNAMIC_ENABLED,KMS_NVM_ENABLED,KMS_NVM_DYNAMIC_ENABLED
 KMS.KMS_AES_CBC=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT
 KMS.KMS_AES_CMAC=KMS_FCT_SIGN|KMS_FCT_VERIFY
 KMS.KMS_AES_ECB=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY
@@ -39,25 +40,31 @@ KMS.KMS_ATTRIBUTES=\#define KMS_ATTRIBUTES
 KMS.KMS_DECRYPT=\#define KMS_DECRYPT
 KMS.KMS_DERIVE_KEY=\#define KMS_DERIVE_KEY
 KMS.KMS_ENCRYPT=\#define KMS_ENCRYPT
-KMS.KMS_MEM_DEBUGGING=\#define KMS_MEM_DEBUGGING
 KMS.KMS_MEM_LOGGING=//\#define KMS_MEM_LOGGING
 KMS.KMS_MEM_USE_ALLOCATOR=KMS_MEM_USE_POOL_ALLOCATOR
 KMS.KMS_NB_SESSIONS_MAX=1
 KMS.KMS_NIKMS_ROUTER_BYPASS=\#define KMS_NIKMS_ROUTER_BYPASS
+KMS.KMS_NVM_DYNAMIC_ENABLED=\#define KMS_NVM_DYNAMIC_ENABLED
+KMS.KMS_NVM_ENABLED=\#define KMS_NVM_ENABLED
 KMS.KMS_OBJECTS=\#define KMS_OBJECTS
+KMS.KMS_SEARCH=\#define KMS_SEARCH
 KMS.KMS_SIGN=\#define KMS_SIGN
 KMS.KMS_VERIFY=\#define KMS_VERIFY
+KMS.KMS_VM_DYNAMIC_ENABLED=//\#define KMS_VM_DYNAMIC_ENABLED
 KeepUserPlacement=false
-LORAWAN.Activate_BOARD_RESOURCES=both
 LORAWAN.Activate_DEBUG_LINE=true
-LORAWAN.Activate_RADIO_BOARD_INTERFACE=true
-LORAWAN.IPParameters=Activate_BOARD_RESOURCES,Activate_DEBUG_LINE,Activate_RADIO_BOARD_INTERFACE,SUBGHZ_APPLICATION
+LORAWAN.Activate_RADIO_BOARD_INTERFACE=Bsp
+LORAWAN.IPParameters=USE_ADC,USE_RTC,USE_UART,USE_LPM,SUBGHZ_APPLICATION,Activate_DEBUG_LINE,Activate_RADIO_BOARD_INTERFACE
 LORAWAN.SUBGHZ_APPLICATION=LORA_END_NODE
-LoRaWAN.BSP.number=16
+LORAWAN.USE_ADC=true
+LORAWAN.USE_LPM=true
+LORAWAN.USE_RTC=true
+LORAWAN.USE_UART=true
+LoRaWAN.BSP.number=7
 LoRaWAN0.BSP.STBoard=false
 LoRaWAN0.BSP.api=Unknown
 LoRaWAN0.BSP.component=
-LoRaWAN0.BSP.condition=SEM_LORA_AT_SLAVE | SEM_LORA_END_NODE
+LoRaWAN0.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_ADC
 LoRaWAN0.BSP.i2caddr=0
 LoRaWAN0.BSP.i2creg=
 LoRaWAN0.BSP.instance=ADC
@@ -69,7 +76,7 @@ LoRaWAN0.BSP.solution=ADC
 LoRaWAN1.BSP.STBoard=false
 LoRaWAN1.BSP.api=Unknown
 LoRaWAN1.BSP.component=
-LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION
+LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_RTC
 LoRaWAN1.BSP.i2caddr=0
 LoRaWAN1.BSP.i2creg=
 LoRaWAN1.BSP.instance=RTC
@@ -78,174 +85,66 @@ LoRaWAN1.BSP.mode=RTC Enabled
 LoRaWAN1.BSP.name=RTC
 LoRaWAN1.BSP.semaphore=
 LoRaWAN1.BSP.solution=RTC
-LoRaWAN10.BSP.STBoard=false
-LoRaWAN10.BSP.api=Unknown
-LoRaWAN10.BSP.component=
-LoRaWAN10.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN10.BSP.i2caddr=0
-LoRaWAN10.BSP.i2creg=
-LoRaWAN10.BSP.instance=PC3
-LoRaWAN10.BSP.ip=GPIO
-LoRaWAN10.BSP.mode=Output
-LoRaWAN10.BSP.name=RF SW CTRL 3
-LoRaWAN10.BSP.semaphore=
-LoRaWAN10.BSP.solution=PC3
-LoRaWAN11.BSP.STBoard=false
-LoRaWAN11.BSP.api=Unknown
-LoRaWAN11.BSP.component=
-LoRaWAN11.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN11.BSP.i2caddr=0
-LoRaWAN11.BSP.i2creg=
-LoRaWAN11.BSP.instance=PA0
-LoRaWAN11.BSP.ip=GPIO
-LoRaWAN11.BSP.mode=EXTI
-LoRaWAN11.BSP.name=BUTTON 1
-LoRaWAN11.BSP.semaphore=
-LoRaWAN11.BSP.solution=PA0
-LoRaWAN12.BSP.STBoard=false
-LoRaWAN12.BSP.api=Unknown
-LoRaWAN12.BSP.component=
-LoRaWAN12.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN12.BSP.i2caddr=0
-LoRaWAN12.BSP.i2creg=
-LoRaWAN12.BSP.instance=PC4
-LoRaWAN12.BSP.ip=GPIO
-LoRaWAN12.BSP.mode=Output
-LoRaWAN12.BSP.name=RF SW CTRL 1
-LoRaWAN12.BSP.semaphore=
-LoRaWAN12.BSP.solution=PC4
-LoRaWAN13.BSP.STBoard=false
-LoRaWAN13.BSP.api=Unknown
-LoRaWAN13.BSP.component=
-LoRaWAN13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN13.BSP.i2caddr=0
-LoRaWAN13.BSP.i2creg=
-LoRaWAN13.BSP.instance=PC5
-LoRaWAN13.BSP.ip=GPIO
-LoRaWAN13.BSP.mode=Output
-LoRaWAN13.BSP.name=RF SW CTRL 2
-LoRaWAN13.BSP.semaphore=
-LoRaWAN13.BSP.solution=PC5
-LoRaWAN14.BSP.STBoard=false
-LoRaWAN14.BSP.api=Unknown
-LoRaWAN14.BSP.component=
-LoRaWAN14.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN14.BSP.i2caddr=0
-LoRaWAN14.BSP.i2creg=
-LoRaWAN14.BSP.instance=PC6
-LoRaWAN14.BSP.ip=GPIO
-LoRaWAN14.BSP.mode=EXTI
-LoRaWAN14.BSP.name=BUTTON 3
-LoRaWAN14.BSP.semaphore=
-LoRaWAN14.BSP.solution=PC6
-LoRaWAN15.BSP.STBoard=false
-LoRaWAN15.BSP.api=Unknown
-LoRaWAN15.BSP.component=
-LoRaWAN15.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN15.BSP.i2caddr=0
-LoRaWAN15.BSP.i2creg=
-LoRaWAN15.BSP.instance=PA1
-LoRaWAN15.BSP.ip=GPIO
-LoRaWAN15.BSP.mode=EXTI
-LoRaWAN15.BSP.name=BUTTON 2
-LoRaWAN15.BSP.semaphore=
-LoRaWAN15.BSP.solution=PA1
 LoRaWAN2.BSP.STBoard=false
 LoRaWAN2.BSP.api=Unknown
 LoRaWAN2.BSP.component=
-LoRaWAN2.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN2.BSP.condition=SEM_LORA_END_NODE  | SEM_LORA_USE_UART
 LoRaWAN2.BSP.i2caddr=0
 LoRaWAN2.BSP.i2creg=
-LoRaWAN2.BSP.instance=PB12
-LoRaWAN2.BSP.ip=GPIO
-LoRaWAN2.BSP.mode=Output
-LoRaWAN2.BSP.name=Debug Line 1
+LoRaWAN2.BSP.instance=USART2
+LoRaWAN2.BSP.ip=(LPU|US)ART
+LoRaWAN2.BSP.mode=Asynchronous
+LoRaWAN2.BSP.name=USART
 LoRaWAN2.BSP.semaphore=
-LoRaWAN2.BSP.solution=PB12
+LoRaWAN2.BSP.solution=USART2
 LoRaWAN3.BSP.STBoard=false
 LoRaWAN3.BSP.api=Unknown
 LoRaWAN3.BSP.component=
-LoRaWAN3.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN3.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN3.BSP.i2caddr=0
 LoRaWAN3.BSP.i2creg=
-LoRaWAN3.BSP.instance=PB13
+LoRaWAN3.BSP.instance=PB12
 LoRaWAN3.BSP.ip=GPIO
 LoRaWAN3.BSP.mode=Output
-LoRaWAN3.BSP.name=Debug Line 2
+LoRaWAN3.BSP.name=Debug Line 1
 LoRaWAN3.BSP.semaphore=
-LoRaWAN3.BSP.solution=PB13
+LoRaWAN3.BSP.solution=PB12
 LoRaWAN4.BSP.STBoard=false
 LoRaWAN4.BSP.api=Unknown
 LoRaWAN4.BSP.component=
-LoRaWAN4.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN4.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN4.BSP.i2caddr=0
 LoRaWAN4.BSP.i2creg=
-LoRaWAN4.BSP.instance=PB14
+LoRaWAN4.BSP.instance=PB13
 LoRaWAN4.BSP.ip=GPIO
 LoRaWAN4.BSP.mode=Output
-LoRaWAN4.BSP.name=Debug Line 3
+LoRaWAN4.BSP.name=Debug Line 2
 LoRaWAN4.BSP.semaphore=
-LoRaWAN4.BSP.solution=PB14
+LoRaWAN4.BSP.solution=PB13
 LoRaWAN5.BSP.STBoard=false
 LoRaWAN5.BSP.api=Unknown
 LoRaWAN5.BSP.component=
-LoRaWAN5.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN5.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN5.BSP.i2caddr=0
 LoRaWAN5.BSP.i2creg=
-LoRaWAN5.BSP.instance=PB10
+LoRaWAN5.BSP.instance=PB14
 LoRaWAN5.BSP.ip=GPIO
 LoRaWAN5.BSP.mode=Output
-LoRaWAN5.BSP.name=Debug Line 4
+LoRaWAN5.BSP.name=Debug Line 3
 LoRaWAN5.BSP.semaphore=
-LoRaWAN5.BSP.solution=PB10
+LoRaWAN5.BSP.solution=PB14
 LoRaWAN6.BSP.STBoard=false
 LoRaWAN6.BSP.api=Unknown
 LoRaWAN6.BSP.component=
-LoRaWAN6.BSP.condition=SEM_LORA_END_NODE
+LoRaWAN6.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN6.BSP.i2caddr=0
 LoRaWAN6.BSP.i2creg=
-LoRaWAN6.BSP.instance=USART2
-LoRaWAN6.BSP.ip=(LPU|US)ART
-LoRaWAN6.BSP.mode=Asynchronous
-LoRaWAN6.BSP.name=USART
+LoRaWAN6.BSP.instance=PB10
+LoRaWAN6.BSP.ip=GPIO
+LoRaWAN6.BSP.mode=Output
+LoRaWAN6.BSP.name=Debug Line 4
 LoRaWAN6.BSP.semaphore=
-LoRaWAN6.BSP.solution=USART2
-LoRaWAN7.BSP.STBoard=false
-LoRaWAN7.BSP.api=Unknown
-LoRaWAN7.BSP.component=
-LoRaWAN7.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN7.BSP.i2caddr=0
-LoRaWAN7.BSP.i2creg=
-LoRaWAN7.BSP.instance=PB11
-LoRaWAN7.BSP.ip=GPIO
-LoRaWAN7.BSP.mode=Output
-LoRaWAN7.BSP.name=LED 3
-LoRaWAN7.BSP.semaphore=
-LoRaWAN7.BSP.solution=PB11
-LoRaWAN8.BSP.STBoard=false
-LoRaWAN8.BSP.api=Unknown
-LoRaWAN8.BSP.component=
-LoRaWAN8.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN8.BSP.i2caddr=0
-LoRaWAN8.BSP.i2creg=
-LoRaWAN8.BSP.instance=PB9
-LoRaWAN8.BSP.ip=GPIO
-LoRaWAN8.BSP.mode=Output
-LoRaWAN8.BSP.name=LED 2
-LoRaWAN8.BSP.semaphore=
-LoRaWAN8.BSP.solution=PB9
-LoRaWAN9.BSP.STBoard=false
-LoRaWAN9.BSP.api=Unknown
-LoRaWAN9.BSP.component=
-LoRaWAN9.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN9.BSP.i2caddr=0
-LoRaWAN9.BSP.i2creg=
-LoRaWAN9.BSP.instance=PB15
-LoRaWAN9.BSP.ip=GPIO
-LoRaWAN9.BSP.mode=Output
-LoRaWAN9.BSP.name=LED 1
-LoRaWAN9.BSP.semaphore=
-LoRaWAN9.BSP.solution=PB15
+LoRaWAN6.BSP.solution=PB10
 Mcu.Context0=CortexM4
 Mcu.Context1=CortexM0Plus
 Mcu.ContextNb=2
@@ -253,69 +152,72 @@ Mcu.ContextProject=DualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=RTC
-Mcu.IP11=SEQUENCER_M0PLUS
-Mcu.IP12=SEQUENCER_M4
-Mcu.IP13=SUBGHZ
-Mcu.IP14=SYS_M0PLUS
-Mcu.IP15=SYS
-Mcu.IP16=TIMER
-Mcu.IP17=TINY_LPM
-Mcu.IP18=USART2
-Mcu.IP2=DMA
-Mcu.IP3=IPCC
-Mcu.IP4=KMS
-Mcu.IP5=LORAWAN
-Mcu.IP6=MISC
-Mcu.IP7=NVIC1
-Mcu.IP8=NVIC2
-Mcu.IP9=RCC
-Mcu.IPNb=19
+Mcu.IP10=RCC
+Mcu.IP11=RTC
+Mcu.IP12=SEQUENCER_M0PLUS
+Mcu.IP13=SEQUENCER_M4
+Mcu.IP14=SUBGHZ
+Mcu.IP15=SYS_M0PLUS
+Mcu.IP16=SYS
+Mcu.IP17=TIMER
+Mcu.IP18=TINY_LPM
+Mcu.IP19=USART2
+Mcu.IP2=DEBUG
+Mcu.IP3=DMA
+Mcu.IP4=IPCC
+Mcu.IP5=KMS
+Mcu.IP6=LORAWAN
+Mcu.IP7=MISC
+Mcu.IP8=NVIC1
+Mcu.IP9=NVIC2
+Mcu.IPNb=20
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_IPCC_VS_IPCC
-Mcu.Pin23=VP_KMS_VS_KMS
-Mcu.Pin24=VP_LORAWAN_VS_LoRaWAN
-Mcu.Pin25=VP_MISC_VS_MISC
-Mcu.Pin26=VP_RTC_VS_RTC_Activate
-Mcu.Pin27=VP_RTC_VS_RTC_Calendar
-Mcu.Pin28=VP_RTC_VS_RTC_Alarm_B_Intern
-Mcu.Pin29=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
-Mcu.Pin31=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin32=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin33=VP_SYS_VS_Systick
-Mcu.Pin34=VP_SYS_M0PLUS_VS_Systick
-Mcu.Pin35=VP_TIMER_VS_TIMER
-Mcu.Pin36=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=37
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_IPCC_VS_IPCC
+Mcu.Pin25=VP_KMS_VS_KMS
+Mcu.Pin26=VP_LORAWAN_VS_LoRaWAN
+Mcu.Pin27=VP_MISC_VS_MISC
+Mcu.Pin28=VP_RTC_VS_RTC_Activate
+Mcu.Pin29=VP_RTC_VS_RTC_Calendar
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_RTC_VS_RTC_Alarm_B_Intern
+Mcu.Pin31=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin32=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
+Mcu.Pin33=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin34=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin35=VP_SYS_VS_None
+Mcu.Pin36=VP_SYS_M0PLUS_VS_None
+Mcu.Pin37=VP_TIMER_VS_TIMER
+Mcu.Pin38=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=39
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);USART_BAUDRATE,115200
+Mcu.UserConstants=RTC_N_PREDIV_S-CortexM0Plus,10;RTC_PREDIV_S-CortexM0Plus,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A-CortexM0Plus,((1<<(15-RTC_N_PREDIV_S))-1);RTC_N_PREDIV_S-CortexM4,10;RTC_PREDIV_S-CortexM4,((1<<RTC_N_PREDIV_S)-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -330,7 +232,8 @@ NVIC1.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC1.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC1.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC1.SysTick_IRQn=true\:15\:0\:true\:false\:true\:false\:false
+NVIC1.TimeBase=None
 NVIC1.USART2_IRQn=true\:2\:0\:true\:false\:true\:true\:true
 NVIC1.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.ForceEnableDMAVector=true
@@ -341,19 +244,24 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.RTC_LSECSS_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC2.SysTick_IRQn=true\:3\:0\:false\:false\:true\:false\:false
+NVIC2.TimeBase=None
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.ContextOwner=CortexM4
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.ContextOwner=CortexM4
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -368,40 +276,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=USART2_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -409,26 +310,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -441,7 +345,7 @@ ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32WL55JCIx
 ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
-ProjectManager.HeapSize=0x400
+ProjectManager.HeapSize=M4-0x200,M0P-0x400
 ProjectManager.KeepUserCode=true
 ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
@@ -452,11 +356,11 @@ ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=LoRaWAN_End_Node_DualCore.ioc
 ProjectManager.ProjectName=LoRaWAN_End_Node_DualCore
 ProjectManager.RegisterCallBack=
-ProjectManager.StackSize=0x1000
+ProjectManager.StackSize=M4-0x800,M0P-0x1000
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_USART2_UART_Init-USART2-true-HAL-false-CortexM4,6-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM4,false-8-MX_RTC_Init-RTC-true-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,4-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,6-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM0Plus,7-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus
+ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_USART2_UART_Init-USART2-true-HAL-false-CortexM4,6-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM4,false-8-MX_RTC_Init-RTC-true-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,4-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,5-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,6-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM0Plus
 RCC.AHBFreq_Value=48000000
 RCC.APB1Freq_Value=48000000
 RCC.APB1TimFreq_Value=48000000
@@ -467,6 +371,7 @@ RCC.Cortex2Freq_Value=48000000
 RCC.CortexFreq_Value=48000000
 RCC.FCLK2Freq_Value=48000000
 RCC.FCLKCortexFreq_Value=48000000
+RCC.FLatency=FLASH_LATENCY_2
 RCC.FamilyName=M
 RCC.HCLK2Freq_Value=48000000
 RCC.HCLK3Freq_Value=48000000
@@ -477,11 +382,12 @@ RCC.I2C1Freq_Value=48000000
 RCC.I2C2Freq_Value=48000000
 RCC.I2C3Freq_Value=48000000
 RCC.I2S2Freq_Value=16000000
-RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
+RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FLatency,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,PWR_Regulator_Voltage_Scale,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
 RCC.LPTIM1Freq_Value=48000000
 RCC.LPTIM2Freq_Value=48000000
 RCC.LPTIM3Freq_Value=48000000
-RCC.LPUART1Freq_Value=48000000
+RCC.LPUART1CLockSelection=RCC_LPUART1CLKSOURCE_LSE
+RCC.LPUART1Freq_Value=32768
 RCC.LSCOPinFreq_Value=32000
 RCC.LSE_VALUE=32768
 RCC.MCO1PinFreq_Value=48000000
@@ -490,6 +396,7 @@ RCC.PLLPoutputFreq_Value=192000000
 RCC.PLLQoutputFreq_Value=192000000
 RCC.PLLRCLKFreq_Value=192000000
 RCC.PWRFreq_Value=48000000
+RCC.PWR_Regulator_Voltage_Scale=PWR_REGULATOR_VOLTAGE_SCALE1
 RCC.RNGFreq_Value=32000
 RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
 RCC.RTCFreq_Value=32768
@@ -505,8 +412,7 @@ RTC.AsynchPrediv=RTC_PREDIV_A
 RTC.BinMode=RTC_BINARY_ONLY
 RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
 RTC.BinaryAutoClr_B-Alarm\ B=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
-RTC.Format=RTC_FORMAT_BIN
-RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B,Format
+RTC.IPParameters=Alarm-Alarm A,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,Alarm_B-Alarm B,BinaryAutoClr_B-Alarm B
 SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI0.ConfNb=1
 SH.GPXTI1.0=GPIO_EXTI1
@@ -517,9 +423,8 @@ SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
 SYS.userName=SYS_M4
 SYS_M0PLUS.userName=SYS_M0+
-USART2.BaudRate=USART_BAUDRATE
 USART2.FIFOMode=FIFOMODE_ENABLE
-USART2.IPParameters=VirtualMode-Asynchronous,BaudRate,FIFOMode
+USART2.IPParameters=VirtualMode-Asynchronous,FIFOMode
 USART2.VirtualMode-Asynchronous=VM_ASYNC
 VP_ADC_TempSens_Input.Mode=IN-TempSens
 VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
@@ -549,12 +454,15 @@ VP_SEQUENCER_M4_VS_SEQUENCER.Mode=SEQUENCER_Enabled
 VP_SEQUENCER_M4_VS_SEQUENCER.Signal=SEQUENCER_M4_VS_SEQUENCER
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_M0PLUS_VS_Systick.Mode=SysTick
-VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_M0PLUS_VS_None.Mode=None
+VP_SYS_M0PLUS_VS_None.Signal=SYS_M0PLUS_VS_None
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=LoRaWAN_End_Node_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
index 1931f488..79e70570 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>12000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -73,7 +73,7 @@
         <LExpSel>0</LExpSel>
       </OPTXL>
       <OPTFL>
-        <tvExp>0</tvExp>
+        <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O974 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Name>-U-O142 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,239 +203,239 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>14</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/KMS/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
-      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/App/app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/App/lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
       <FileNumber>18</FileNumber>
@@ -423,15 +443,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MbMux</GroupName>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -455,8 +475,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/lora_info.c</PathWithFileName>
+      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -467,8 +487,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/lora_info.c</PathWithFileName>
-      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -491,8 +511,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_lora.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -503,8 +523,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_lora.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -515,8 +535,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -527,8 +547,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -539,20 +559,28 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -565,7 +593,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>29</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
@@ -585,7 +613,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -597,7 +625,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -611,31 +639,23 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
       <FileNumber>33</FileNumber>
@@ -643,8 +663,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -655,8 +675,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -667,8 +687,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -679,8 +699,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -715,9 +735,9 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
@@ -727,8 +747,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -739,8 +759,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -751,8 +771,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -763,8 +783,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -775,8 +795,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -787,8 +807,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -799,8 +819,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -811,8 +831,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -823,8 +843,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -835,8 +855,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -847,8 +867,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -859,31 +879,31 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/KMS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>11</GroupNumber>
       <FileNumber>53</FileNumber>
@@ -891,379 +911,379 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/KMS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
-      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
-      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
-      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_vm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
-      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
+      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
-      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
+      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
-      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
-      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>73</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
-      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>74</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
-      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
+      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>75</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
-      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>76</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
-      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>77</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
-      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>78</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>79</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>80</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>81</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>82</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>83</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
-      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>12</GroupNumber>
       <FileNumber>84</FileNumber>
@@ -1271,8 +1291,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
-      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1283,8 +1303,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
-      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1295,15 +1315,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
-      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
+    <GroupName>Middlewares/mbed-crypto</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -1315,8 +1335,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</PathWithFileName>
+      <FilenameWithoutPath>sha1.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1327,8 +1347,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1339,15 +1359,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</PathWithFileName>
-      <FilenameWithoutPath>NvmCtxMgmt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
+    <GroupName>Middlewares/LoRaWAN</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -1359,8 +1379,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1371,8 +1391,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</PathWithFileName>
+      <FilenameWithoutPath>NvmDataMgmt.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1383,8 +1403,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1395,8 +1415,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
+      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1407,8 +1427,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
+      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1419,8 +1439,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
+      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1431,8 +1451,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
+      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1443,70 +1463,50 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>98</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
-      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>99</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</PathWithFileName>
+      <FilenameWithoutPath>RegionBaseUS.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>100</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>101</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
       <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>102</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>101</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1517,8 +1517,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>103</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>102</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1529,8 +1529,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>104</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>103</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1541,8 +1541,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>105</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>104</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1553,8 +1553,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>106</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>105</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1565,8 +1565,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>107</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>106</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1577,8 +1577,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>108</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>107</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1589,8 +1589,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>109</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>108</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1600,67 +1600,111 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>16</GroupNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>109</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>110</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
-      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/mbed-crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>111</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
-      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>112</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</PathWithFileName>
-      <FilenameWithoutPath>sha1.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>113</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
-      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>114</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>115</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>116</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>117</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
+      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1673,26 +1717,38 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>18</GroupNumber>
-      <FileNumber>114</FileNumber>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>118</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>18</GroupNumber>
-      <FileNumber>115</FileNumber>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>119</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>120</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1705,8 +1761,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>116</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>121</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1717,86 +1773,86 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>117</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>122</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>118</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>123</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>119</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>124</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>120</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>125</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>121</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>126</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>122</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>127</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
-      <FileNumber>123</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>128</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
index 0420af12..55b2f300 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
@@ -16,14 +16,14 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM0P</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <FlashDriverDll></FlashDriverDll>
           <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <RegisterFile></RegisterFile>
           <MemoryEnv></MemoryEnv>
           <Cmp></Cmp>
           <Asm></Asm>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM0PLUS\Exe\</OutputDirectory>
+          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM0PLUS\</OutputDirectory>
           <OutputName>LoRaWAN_End_Node_DualCore_CM0PLUS</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -110,13 +110,13 @@
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDllArguments>-REMAP</SimDllArguments>
           <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
           <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDllArguments> </TargetDllArguments>
           <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
         </DllOption>
         <DebugOption>
           <OPTHX>
@@ -134,14 +134,14 @@
             <RunIndependent>0</RunIndependent>
             <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
+            <DriverSelection>4101</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -186,7 +186,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <hadIRAM2>0</hadIRAM2>
+            <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>1</useUlib>
@@ -194,7 +194,7 @@
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
             <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
+            <RwSelD>4</RwSelD>
             <CodeSel>0</CodeSel>
             <OptFeed>0</OptFeed>
             <NoZi1>0</NoZi1>
@@ -211,7 +211,7 @@
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
             <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
+            <Im2Chk>1</Im2Chk>
             <OnChipMemories>
               <Ocm1>
                 <Type>0</Type>
@@ -245,13 +245,13 @@
               </Ocm6>
               <IRAM>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -275,8 +275,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -300,13 +300,13 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x2000c000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM0PLUS,KMS_ENABLED,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM0PLUS,KMS_ENABLED,USE_HAL_DRIVER,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,198 +381,142 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>ca_low_level.c</FileName>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_lorawan.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/App/app_lorawan.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>lora_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/App/lora_app.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+          <Files>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>radio_board_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+          <Files>
             <File>
-              <FileName>kms_low_level.c</FileName>
+              <FileName>app_kms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
             <File>
               <FileName>main.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>nvms_low_level.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>kms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>nvms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>ca_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
               <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/KMS/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_kms.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_lorawan.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/App/app_lorawan.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>lora_app.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/App/lora_app.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/Target</GroupName>
-          <Files>
             <File>
-              <FileName>radio_board_if.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
           <Files>
             <File>
               <FileName>features_info.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/MbMux/features_info.c</FilePath>
             </File>
-            <File>
-              <FileName>LmHandler_mbwrapper.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</FilePath>
-            </File>
             <File>
               <FileName>lora_info.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/MbMux/lora_info.c</FilePath>
             </File>
             <File>
-              <FileName>mbmux.c</FileName>
+              <FileName>LmHandler_mbwrapper.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_kms.c</FileName>
+              <FileName>mbmux.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
             </File>
             <File>
               <FileName>mbmuxif_lora.c</FileName>
@@ -601,6 +545,16 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>Doc</GroupName>
           <Files>
@@ -627,37 +581,32 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
             <File>
-              <FileName>stm32wlxx_hal.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_dma.c</FileName>
@@ -670,24 +619,29 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_ipcc.c</FileName>
@@ -695,194 +649,240 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/KMS</GroupName>
+          <GroupName>Drivers/CMSIS</GroupName>
           <Files>
             <File>
-              <FileName>ca_aes.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
-            </File>
-            <File>
-              <FileName>ca_aes_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>ca_aes_mbed.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/KMS</GroupName>
+          <Files>
             <File>
-              <FileName>ca_core.c</FileName>
+              <FileName>kms_der_x962.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc.c</FileName>
+              <FileName>kms_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_hal.c</FileName>
+              <FileName>kms_entry.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_mbed.c</FileName>
+              <FileName>kms_init.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash.c</FileName>
+              <FileName>kms_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash_mbed.c</FileName>
+              <FileName>kms_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_if_utils.c</FileName>
+              <FileName>kms_platf_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng.c</FileName>
+              <FileName>kms_digest.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng_mbed.c</FileName>
+              <FileName>kms_dyn_obj.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa.c</FileName>
+              <FileName>kms_enc_dec.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa_hal.c</FileName>
+              <FileName>kms_key_mgt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa_mbed.c</FileName>
+              <FileName>kms_nvm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
             </File>
             <File>
-              <FileName>kms_der_x962.c</FileName>
+              <FileName>kms_sign_verify.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
             </File>
             <File>
-              <FileName>kms_digest.c</FileName>
+              <FileName>kms_vm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls></MiscControls>
+                      <Define></Define>
+                      <Undefine></Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
             </File>
             <File>
-              <FileName>kms_dyn_obj.c</FileName>
+              <FileName>kms_interface.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
             </File>
             <File>
-              <FileName>kms_ecc.c</FileName>
+              <FileName>tkms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
             </File>
             <File>
-              <FileName>kms_enc_dec.c</FileName>
+              <FileName>ca_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
             </File>
             <File>
-              <FileName>kms_entry.c</FileName>
+              <FileName>ca_core.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
             </File>
             <File>
-              <FileName>kms_init.c</FileName>
+              <FileName>ca_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>kms_interface.c</FileName>
+              <FileName>ca_hash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
             </File>
             <File>
-              <FileName>kms_key_mgt.c</FileName>
+              <FileName>ca_if_utils.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
             </File>
             <File>
-              <FileName>kms_mem.c</FileName>
+              <FileName>ca_rng.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
             </File>
             <File>
-              <FileName>kms_nvm_storage.c</FileName>
+              <FileName>ca_rsa.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
             </File>
             <File>
-              <FileName>kms_objects.c</FileName>
+              <FileName>ca_aes_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_platf_objects.c</FileName>
+              <FileName>ca_ecc_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_sign_verify.c</FileName>
+              <FileName>ca_rsa_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
             </File>
             <File>
               <FileName>mac_stm32hal.c</FileName>
@@ -895,100 +895,85 @@
               <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</FilePath>
             </File>
             <File>
-              <FileName>tkms.c</FileName>
+              <FileName>ca_aes_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-          <Files>
             <File>
-              <FileName>cmac.c</FileName>
+              <FileName>ca_ecc_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>lorawan_aes.c</FileName>
+              <FileName>ca_hash_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>soft-se.c</FileName>
+              <FileName>ca_rng_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+            </File>
+            <File>
+              <FileName>ca_rsa_mbed.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
+          <GroupName>Middlewares/mbed-crypto</GroupName>
           <Files>
             <File>
-              <FileName>LmHandler.c</FileName>
+              <FileName>sha1.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</FilePath>
             </File>
             <File>
-              <FileName>LmhpCompliance.c</FileName>
+              <FileName>sha256.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
             </File>
             <File>
-              <FileName>NvmCtxMgmt.c</FileName>
+              <FileName>platform_util.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
+          <GroupName>Middlewares/LoRaWAN</GroupName>
           <Files>
             <File>
-              <FileName>LoRaMac.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacAdr.c</FileName>
+              <FileName>LmHandler.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacClassB.c</FileName>
+              <FileName>NvmDataMgmt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCommands.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileName>LmhpCompliance.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCrypto.c</FileName>
+              <FileName>cmac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacParser.c</FileName>
+              <FileName>lorawan_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacSerializer.c</FileName>
+              <FileName>soft-se.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-          <Files>
             <File>
               <FileName>Region.c</FileName>
               <FileType>1</FileType>
@@ -1004,6 +989,11 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</FilePath>
             </File>
+            <File>
+              <FileName>RegionBaseUS.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</FilePath>
+            </File>
             <File>
               <FileName>RegionCN470.c</FileName>
               <FileType>1</FileType>
@@ -1049,35 +1039,50 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-          <Files>
             <File>
-              <FileName>utilities.c</FileName>
+              <FileName>LoRaMac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/mbed-crypto</GroupName>
-          <Files>
             <File>
-              <FileName>platform_util.c</FileName>
+              <FileName>LoRaMacAdr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
             </File>
             <File>
-              <FileName>sha1.c</FileName>
+              <FileName>LoRaMacClassB.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
             </File>
             <File>
-              <FileName>sha256.c</FileName>
+              <FileName>LoRaMacCommands.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCrypto.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacParser.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacSerializer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+            </File>
+            <File>
+              <FileName>utilities.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1085,14 +1090,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1105,39 +1115,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1151,8 +1161,8 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
         <targetInfos>
           <targetInfo name="LoRaWAN_End_Node_DualCore_CM0PLUS"/>
         </targetInfos>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
index 904011f8..61b4d13f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>48000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -145,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O2510 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U-O142 -O2766 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -195,157 +195,181 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>1</tvExp>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/CayenneLpp.c</PathWithFileName>
+      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -357,7 +381,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -369,19 +393,19 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -392,81 +416,53 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>17</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/CayenneLpp.c</PathWithFileName>
-      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MbMux</GroupName>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -477,8 +473,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -489,20 +485,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -513,8 +497,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -525,8 +509,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -537,8 +521,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -549,8 +533,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -569,8 +553,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -589,8 +573,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -600,23 +584,15 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -628,6 +604,30 @@
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>32</FileNumber>
@@ -635,8 +635,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -647,8 +647,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -659,8 +659,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -671,8 +671,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -683,8 +683,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -695,8 +695,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -707,8 +707,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -719,8 +719,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -731,8 +731,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -743,8 +743,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -755,8 +755,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -767,8 +767,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -779,8 +779,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -791,8 +791,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -803,8 +803,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -815,8 +815,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -827,8 +827,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -839,8 +839,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -851,8 +851,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -863,15 +863,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Utilities</GroupName>
+    <GroupName>Drivers/CMSIS</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -883,25 +883,33 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -913,62 +921,74 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>60</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
index e4f4f7ab..9c8610d5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
@@ -16,9 +16,9 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20007FFF) IRAM2(0x20008000-0x2000AFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM4\Exe\</OutputDirectory>
+          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM4\</OutputDirectory>
           <OutputName>LoRaWAN_End_Node_DualCore_CM4</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -183,7 +183,7 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
@@ -246,7 +246,7 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
@@ -301,12 +301,12 @@
               <OCR_RVCT9>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
                 <StartAddress>0x20008000</StartAddress>
-                <Size>0x3000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM4,STM32WL55xx</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,67 +381,82 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>adc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc.c</FilePath>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
             <File>
-              <FileName>adc_if.c</FileName>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+          <Files>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>app_lorawan.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/app_lorawan.c</FilePath>
             </File>
             <File>
-              <FileName>dma.c</FileName>
+              <FileName>CayenneLpp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/dma.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/CayenneLpp.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>lora_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/lora_app.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>main.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM4/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>main.c</FileName>
+              <FileName>adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/main.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM4/Core/Src/dma.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
               <FileName>sys_sensors.c</FileName>
@@ -454,49 +469,34 @@
               <FilePath>../CM4/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>adc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/usart.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
             </File>
             <File>
               <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/usart_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_lorawan.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/app_lorawan.c</FilePath>
+              <FilePath>../CM4/Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>CayenneLpp.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/CayenneLpp.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>lora_app.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/lora_app.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
           <Files>
             <File>
               <FileName>LmHandler_mbwrapper.c</FileName>
@@ -508,62 +508,6 @@
               <FileType>1</FileType>
               <FilePath>../CM4/MbMux/mbmux.c</FilePath>
             </File>
-            <File>
-              <FileName>mbmuxif_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
-            </File>
             <File>
               <FileName>mbmuxif_lora.c</FileName>
               <FileType>1</FileType>
@@ -609,26 +553,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -640,24 +574,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -675,9 +604,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -690,14 +624,24 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -709,6 +653,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
             <File>
               <FileName>stm32wlxx_hal_uart.c</FileName>
               <FileType>1</FileType>
@@ -719,10 +673,15 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
             <File>
-              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -735,39 +694,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
index 5707d81c..7c9ba28d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
index a8b1492f..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size		EQU     0x1000
+Stack_Size		EQU     0x800
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size      EQU     0x400
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
index f9b3e23c..8f413233 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
@@ -10,11 +10,11 @@ LR_IROM1 0x08020000 0x00020000  {    ; load region size_region
    .ANY (+RO)
   }
   ; SRAM2 dedicated to M0+
-  RW_IRAM1 0x2000C000 0x00004000  {  ; RW data
+  RW_IRAM1 0x2000A000 0x00006000  {  ; RW data
    .ANY (+RW +ZI)
   }
 
-  RW_RAM_SHARED 0x2000B000 0x1000  {
+  RW_RAM_SHARED 0x20009000 0x1000  {
    *(MB_MEM2)
   }
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
index 79a183e1..5141de4a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -14,7 +14,7 @@ LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
    .ANY (+RW +ZI)
   }
   ; Backup SRAM2 dedicated to M4
-RW_IRAM2 0x20008000 0x00003000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+RW_IRAM2 0x20008000 0x00001000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
     *(MAPPING_TABLE)
     *(MB_MEM1)
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project
index f1422e25..6038e9e0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project
@@ -12,159 +12,168 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
 			<name>LoRaWAN_End_Node_DualCore.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN_End_Node_DualCore.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN_End_Node_DualCore.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1602235241059</id>
+			<id>1612364332328</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject
index eac1c46f..17ef6e52 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1380225569">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1380225569" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.418944704" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.654776557" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1874734359" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1576074843" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1690314232" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1876101242" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1222976036" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.536306606" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/LoRaWAN/App | ../../../CM0PLUS/LoRaWAN/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.724313685" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1913635198" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.192075519" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1692640247" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1440672287" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1380225569" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1380225569." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.457651728" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1798966542" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.687126837" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2028890985" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.403555796" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1115098606" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../CM0PLUS/LoRaWAN/Target | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/LoRaWAN/App | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1539528310" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.12400550" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.762525711" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1046905399" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.607530905" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1693655008" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.893305291" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1496750499" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1110902416" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1948481739" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1684414861" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2028919920" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.301509849" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.812359386" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.618696617" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.508379849" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/App"/>
@@ -50,8 +51,9 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
@@ -79,76 +81,72 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.666846704" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.204968758" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.953216962" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1637192753" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1135192748" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1314119857" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1765785608" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.945095231" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1111776382" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1687592588" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1632142608" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.42721143" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1749489898" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.652866658" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1921454185" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1163404519" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1466554349" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.784128254" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.458897427" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.972068633" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.517495896" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.746122958" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1212314533" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2044476129" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.875774697" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.155936653" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1723352551" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1628742402" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1063631649" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1408369084" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.45487179" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.687622709" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1952814073" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1324798759">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1324798759" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1576503454">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1576503454" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1324798759" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1324798759." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1609015834" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.770267115" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.299669503" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.702786680" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.852158097" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1329855240" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.224351885" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1590218153" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/LoRaWAN/App | ../../../CM0PLUS/LoRaWAN/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1064538798" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1272102430" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1532242542" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.321603391" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1069684914" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1576503454" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1576503454." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.117485375" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1313873871" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.120293024" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.635986929" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1183258452" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.756299540" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../CM0PLUS/LoRaWAN/Target | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/LoRaWAN/App | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1770796770" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.604195020" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.819423555" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.652199878" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1967968232" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.18035090" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.31550807" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1676079849" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2047760549" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.907906948" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1243503096" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.575082712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1472942415" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1363264640" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.348637723" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/App"/>
@@ -157,8 +155,9 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
@@ -186,30 +185,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.929471225" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.22679764" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1038889441" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.971335340" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2090616632" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1552949627" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1011916595" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.983344984" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.344570889" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.574835913" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.200993951" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.851341622" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.147461397" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1226470376" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229616307" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.35262513" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.782609849" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.110478215" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1463441783" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.734000277" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1708519410" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1452379285" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.798791730" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1818694140" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1510688229" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1168776152" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.585966459" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.895461534" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.821168809" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.283536938" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1170681661" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.930728567" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1346624623" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -217,18 +214,27 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LoRaWAN_End_Node_DualCore_CM0PLUS.null.1142642603" name="LoRaWAN_End_Node_DualCore_CM0PLUS"/>
+		<project id="LoRaWAN_End_Node_DualCore_CM0PLUS.null.834447647" name="LoRaWAN_End_Node_DualCore_CM0PLUS"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.893305291;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.666846704">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1380225569;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1380225569.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1684414861;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.204968758">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1324798759;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1324798759.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.18035090;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.929471225">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1576503454;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1576503454.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.907906948;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.22679764">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/LoRaWAN_End_Node_DualCore_CM0PLUS"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/LoRaWAN_End_Node_DualCore_CM0PLUS"/>
+		</configuration>
+	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project
index 8a5db7e5..8d332fac 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project
@@ -25,606 +25,645 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_if_utils.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_interface.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_vm_storage.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/mac_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/platform_util.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/platform_util.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/rsa_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/sha1.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha1.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/sha256.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/tkms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Application/User/Core/ca_low_level.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LmHandler.c</name>
+			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LmhpCompliance.c</name>
+			<name>Application/User/Core/kms_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMac.c</name>
+			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacAdr.c</name>
+			<name>Application/User/Core/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacClassB.c</name>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacCommands.c</name>
+			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacConfirmQueue.c</name>
+			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacCrypto.c</name>
+			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacParser.c</name>
+			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/LmHandler_mbwrapper.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacSerializer.c</name>
+			<name>Application/User/MbMux/features_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/NvmCtxMgmt.c</name>
+			<name>Application/User/MbMux/lora_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/lora_info.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/Region.c</name>
+			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionAS923.c</name>
+			<name>Application/User/MbMux/mbmuxif_lora.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_lora.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionAU915.c</name>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCN470.c</name>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCN779.c</name>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCommon.c</name>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionEU433.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionEU868.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionIN865.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LmHandler.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionKR920.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpCompliance.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionRU864.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMac.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionUS915.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacAdr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/cmac.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacClassB.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/lorawan_aes.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCommands.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/soft-se.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacConfirmQueue.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/utilities.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCrypto.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ca_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacParser.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ipcc.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacSerializer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ipcc_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/NvmDataMgmt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/kms_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/Region.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/main.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAS923.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/nvms_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAU915.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/rtc.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionBaseUS.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN470.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN779.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/subghz.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCommon.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/sys_app.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU433.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/timer_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU868.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionIN865.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/LmHandler_mbwrapper.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/features_info.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionKR920.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/features_info.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/lora_info.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionRU864.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/lora_info.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmux.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionUS915.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmux.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/cmac.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_lora.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/lorawan_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_lora.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/soft-se.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/utilities.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/KMS/App/app_kms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/KMS/App/app_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/KMS/App/app_kms.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/App/app_lorawan.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/app_lorawan.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/lora_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/App/lora_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/lora_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/Target/radio_board_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
index 9e23530f..f98fb740 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,51 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +105,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
-
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
 
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
-
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
index 2b06c01f..87472aa6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -46,25 +49,25 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x2000A000, LENGTH = 24K
-  ROM    (rx)    : ORIGIN = 0x08020000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08020000, LENGTH = 128K
   RAM_SHARED (xrw): ORIGIN = 0x20009000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -74,80 +77,96 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM AT> ROM
+
+  } >RAM AT> FLASH
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(4);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(4);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> FLASH
 
   /* Uninitialized data section into "RAM" Ram type memory */
-  . = ALIGN(8);
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -157,7 +176,7 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM
@@ -182,5 +201,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MB_MEM2       : { *(MB_MEM2) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject
index e381d87b..7e2c226a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1460535766">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1460535766" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.517486696" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1356036104" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1268685116" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1248418525" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1808427656" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.382555478" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1703274790" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1521328444" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/LoRaWAN/App | ../../../CM4/LoRaWAN/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.250785634" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1250379993" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.139407144" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1004201975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1591281622" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1460535766" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1460535766." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.752100653" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1404409918" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1294228095" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1410723818" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.701074780" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.392744620" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/LoRaWAN/App | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../CM4/LoRaWAN/Target | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.622899488" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1290969904" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.63755347" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1574113810" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1190290480" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.278468948" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1311170738" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.496130607" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1215135408" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.113915788" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.425855389" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.640483730" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1860348535" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1970660230" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2108990883" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2118241754" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/Target"/>
@@ -47,6 +48,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
@@ -63,74 +65,70 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.626620308" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1353634947" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.951856085" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1502513653" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1711642259" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1245732813" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.224688982" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1246002767" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1109291067" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1942134771" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1036786702" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1614314494" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.824696005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.700693798" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2114345391" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.329733135" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.879204678" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.850746118" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1010421103" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.137229566" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1379722875" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.775419959" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1300891610" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.238350608" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.774288899" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.134392350" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.573808072" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1476273791" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.60177521" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1548444339" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1123668136" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.419009911" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1109259019" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1035331447">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1035331447" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.629017802">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.629017802" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1035331447" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1035331447." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.610016984" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032141146" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1045306723" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1633014356" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1910907161" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1766414768" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.651517514" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.154889551" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/LoRaWAN/App | ../../../CM4/LoRaWAN/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1419245393" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1282452022" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.2084424484" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.105520158" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1580917284" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.629017802" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.629017802." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.226941082" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.276509089" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1091036734" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.618012888" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.780512002" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1601857846" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/LoRaWAN/App | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../CM4/LoRaWAN/Target | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.861317348" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1814780897" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1864333158" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1768827151" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1774619422" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1284575822" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1158908739" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.305800989" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1480332940" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1264268466" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.997833661" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.926667519" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2028405519" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1309793634" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.295537669" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/Target"/>
@@ -138,6 +136,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
@@ -154,30 +153,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.906742818" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1472467317" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.212646166" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2121390367" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1997690499" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.215553280" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1207645907" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1651962547" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1581130043" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.2105784719" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.643493899" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1678036505" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.329835982" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1248151930" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1765853178" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.347040620" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1517505208" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1555668767" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.978681214" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1062043349" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1334760225" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1145537397" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1975690733" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1921563061" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.898731115" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.598926128" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.610214237" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.773297335" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.2068163222" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1040407716" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.621707370" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1839651919" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1643152590" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -185,18 +182,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LoRaWAN_End_Node_DualCore_CM4.null.1358162801" name="LoRaWAN_End_Node_DualCore_CM4"/>
+		<project id="LoRaWAN_End_Node_DualCore_CM4.null.1565939371" name="LoRaWAN_End_Node_DualCore_CM4"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1311170738;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.626620308">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.629017802;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.629017802.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1264268466;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1472467317">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1035331447;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1035331447.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1284575822;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.906742818">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1460535766;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1460535766.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.425855389;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1353634947">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project
index a8283c46..77d37999 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project
@@ -25,301 +25,305 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_sensors.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_sensors.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_sensors.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/LmHandler_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/LmHandler_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmux.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_lora.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_lora.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_lora.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/CayenneLpp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/CayenneLpp.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/CayenneLpp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/app_lorawan.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/app_lorawan.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/lora_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/lora_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/lora_app.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
index 89dfe9e5..af218d28 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,52 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +106,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
-
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
-
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
 
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
index 1eeab01b..18f21dbf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -39,29 +42,29 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x400 ; /* required amount of heap  */
-_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x800 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 128K
   RAM_SHARED (rw): ORIGIN = 0x20008000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
     . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
     . = ALIGN(4);
@@ -76,30 +79,30 @@ SECTIONS
 
     . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
     . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  .ARM.extab   : { 
+  .ARM.extab   : {
     . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .ARM : {
     . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   .preinit_array     :
   {
@@ -108,8 +111,8 @@ SECTIONS
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .init_array :
   {
     . = ALIGN(4);
@@ -118,8 +121,8 @@ SECTIONS
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .fini_array :
   {
     . = ALIGN(4);
@@ -128,23 +131,47 @@ SECTIONS
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
     
-  } >RAM AT> ROM
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
 
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
@@ -182,6 +209,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
-   MB_MEM1 (NOLOAD)       : { *(MB_MEM1) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/readme.txt
index a7ad9a91..ab2d16a2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/readme.txt
@@ -1,12 +1,12 @@
 /**
   @page LoRaWAN_End_Node_DualCore Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/readme.txt 
+  * @file    Applications/LoRaWAN/LoRaWAN_End_Node_DualCore/readme.txt
   * @author  MCD Application Team
   * @brief   This application is a simple demo application software of a LoRa
-  *          modem connecting to Network server. Data sent can be checked on 
+  *          modem connecting to Network server. Data sent can be checked on
   *          Network server for eg Loriot. Traces are displayed over UART
   ******************************************************************************
   * @attention
@@ -26,6 +26,7 @@
 
 This directory contains a set of source files that implements a Dual Core (CM4 / CM0) LoRa application
 device sending sensors data to LoRa Network server.
+Data are sent periodically on timer event or on "user button 1" depending on the configuration.
 
 This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
   ******************************************************************************
@@ -34,7 +35,7 @@ This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx
 
 Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ca_conf.h                        This file contains configuration for Cryptographic API (CA)
@@ -87,11 +88,10 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
   - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h               This file implements the CM0PLUS side wrapper of the LmHandler
                                                                                 interface shared between M0 and M4.
   - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h                             API which interfaces CM0PLUS to IPCC
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h                       Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h                      API provided to CM0PLUS applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                     API for CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                       API for CM0PLUS applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                     API for CM0PLUS applic to register and handle TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h                      API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                     API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                       API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                     API for CM0PLUS application to register and handle TRACE via MBMUX
   - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                   This file implements the CM0PLUS side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h                                This file contains all the function prototypes for
@@ -127,14 +127,12 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
   - LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h                   This file implements the CM4 side wrapper of the LmHandler
                                                                                 interface shared between M0 and M4.
   - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h                                 API which interfaces CM4 to IPCC
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.h                           Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h                          API provided to CM4 applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h                         API for CM4 applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h                           API for CM4 applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h                         API for CM4 applic to register and handle TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h                          API provided to CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h                         API for CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h                           API for CM4 application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h                         API for CM4 application to register and handle TRACE via MBMUX
   - LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h                       This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/Common/Board/board_resources.h                    Header for driver at.c module
   - LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h              STM32WLxx_Nucleo board configuration file.
   - LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h                      Feature list and parameters TypeDefinitions
   - LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h                          To give info to the application about LoRaWAN configuration
@@ -145,7 +143,7 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ca_low_level.c                   This file contains the low level implementations of the Cryptographic API (CA) module.
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c                           This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c                        Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c                        Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/kms_low_level.c                  This file contains implementations for Key Management Services (KMS)
                                                                                 module Low Level access to Flash, CRC...
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c                           : Main program body
@@ -153,6 +151,8 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
                                                                                 module NVM Low Level access to physical storage (Flash...)
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c                            This file provides code for the configuration
                                                                                 of the RTC instances.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                   Interrupt Service Routines.
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                   Low layer function to enter/exit low power modes (stop, sleep)
   - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c                         This file provides code for the configuration
@@ -168,10 +168,9 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
                                                                                 shared between M0 and M4.
   - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c                         To give info to the application about LoRaWAN configuration
   - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c                             Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c                       Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c                      allows CM0 applic to register and handle LoraWAN to MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                     allows CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                       allows CM0 applic to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c                      allows CM0 application to register and handle LoraWAN to MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                     allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                       allows CM0 application to handle the SYSTEM MBMUX channel
   - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                     Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
   - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                   This file implements the CM0 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
@@ -182,7 +181,7 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
                                                                                 of all the requested memory to memory DMA transfers.
   - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c                               This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c                            Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c                            Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c                               : Main program body
   - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c                  This file provides code for the MSP Initialization
                                                                                 and de-Initialization codes.
@@ -193,42 +192,43 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
   - LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c                           Configure RTC Alarm, Tick and Calendar manager
   - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c                              This file provides code for the configuration
                                                                                 of the USART instances.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c                           Configuration of UART MX driver interface for hyperterminal communication
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c                           Configuration of UART driver interface for hyperterminal communication
   - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c                     Application of the LRWAN Middleware
   - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c                      Implements the Cayenne Low Power Protocol
   - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c                        Application of the LRWAN Middleware
   - LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c                   This file implements the CM4 side wrapper of the LoraMac interface
                                                                                 shared between M0 and M4.
   - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c                                 CM4 side multiplexer to map features to IPCC channels
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.c                           Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c                          allows CM4 applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c                         allows CM4 applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c                           allows CM4 applic to handle the SYSTEM MBMUX channel.
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c                         allows CM4 applic to receive by CM0 TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c                          allows CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c                         allows CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c                           allows CM4 application to handle the SYSTEM MBMUX channel.
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c                         allows CM4 application to receive by CM0 TRACE via MBMUX
   - LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c                       This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/Common/Board/board_resources.c                    Source file
   - LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c                  CMSIS Cortex Device Peripheral Access Layer System Source File
   - LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c                         Enables 4 debug pins for internal signals RealTime debugging
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c STM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c   STM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - CM0PLUS (Mw and radio drivers config) 
-        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, radio_board_if.h, main.h, etc
-    - CM4 (Lora appli)
-        - sys_conf.h, lora_app.h, nucleo_conf.h, main.h, etc
-    - Careful: 
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, main.h, etc
+    - CM4 (Lora application)
+        - sys_conf.h, lora_app.c, lora_app.h, nucleo_conf.h, main.h, etc
+    - Careful:
         - the region and class chosen on CM4/LoRaWAN/App/lora_app.h shall be compatible with CM0PLUS/LoRaWAN/Target/lorawan_conf.h list
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
 
   -Set Up:
 
@@ -239,31 +239,33 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all CM4 files and load your image into CM4 target memory
-  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory 
+  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory
   - Reset the system (two cores)
   - Run the example
   - Open a Terminal, connected the LoRa Object
   - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
 
-@par How to use IAR to debug ? 
-  - open project.eww and select CM4 project
-  - make sure the flag DEBUGGER_ON =1 in app_conf.h
-  - better to define the flag LOW_POWER_DISABLE = 1 at least on one MCU (currently debugger has problem in dual core STOP mode)
-  - compile and download (Ctrl + D)
+@par How to debug ?
+  - Open your preferred toolchain and select CM4 project
+  - define the flag DEBUGGER_ENABLED to 1 in CM4\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download
   - put a breakpoint in sys_app.c one line after HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
   - run CM4 (the above functions sets PWR_CR4_C2BOOT flag)
-  - open a second instance of project.eww and select CM0PLUS project
-  - compile and download using "Download active application" 
+  - open a second instance of your preferred toolchain and select CM0PLUS project
+  - to debug CM0PLUS as well, define the flag DEBUGGER_ENABLED to 1 in CM0PLUS\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download using "Download active application"
   - once CM0PLUS code is downloaded reset (system reset) the CM4
   - run CM4 to the breakpoint again
-  - attach to running target CM0PLUS 
+  - attach to running target CM0PLUS
          (CM0PLUS is in a while loop waiting CM4 to give green light to go further)
          (this is done to prevent CM0PLUS to execute too much code before attaching)
-  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exite the while loop
+  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exit the while loop
 
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/.extSettings b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ipcc_if.h
index 45049335..40330641 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM0PLUS_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_CommandRcv_cb     command callback
   * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_config.h
index 4534c749..6d61b1e2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 #define KMS_NVM_SLOT_NUMBERS                     (50UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,31 +167,35 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 #define KMS_DERIVE_KEY
 
 /**
   * @brief KMS_SEARCH Uncomment the below line to support key search or mechanism search services
   */
-//#define KMS_SEARCH
+#define KMS_SEARCH
 
 /**
   * @brief KMS_GENERATE_KEYS Uncomment the below line to support key generation services
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 #define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 #define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_if.h
index 9a324008..1c890dbe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    kms_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef KMS_IF_H
@@ -67,4 +69,3 @@ extern "C" {
 #endif /* KMS_IF_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_mem_pool_def.h
index 8cf9cfbf..c6688943 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_mem_pool_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_mem_pool_def.h
@@ -37,13 +37,11 @@ extern "C" {
  * - Pool #3 is a 512 Bytes pool
  */
 /* USER CODE BEGIN KMS_MEM_POOL_Declare */
-
 KMS_MEM_DECLARE_POOL_START()
 KMS_MEM_DECLARE_POOL_ENTRY(1,256)
 KMS_MEM_DECLARE_POOL_ENTRY(2,256)
 KMS_MEM_DECLARE_POOL_ENTRY(3,512)
 KMS_MEM_DECLARE_POOL_END()
-
 /* USER CODE END KMS_MEM_POOL_Declare */
 
 /* USER CODE BEGIN KMS_MEM_POOL_DEF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_platf_objects_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_platf_objects_config.h
index d18e56d1..10bb7b7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_platf_objects_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/kms_platf_objects_config.h
@@ -27,6 +27,7 @@
 /* USER CODE BEGIN KMS_PLATF_OBJECTS_CONFIG_Includes */
 #include "stm32wlxx.h"
 #include "Commissioning.h"
+#include "lorawan_conf.h" /* KEY_EXTRACTABLE */
 /* USER CODE END KMS_PLATF_OBJECTS_CONFIG_Includes */
 
 #ifdef __cplusplus
@@ -95,121 +96,135 @@ extern "C" {
 #pragma arm section rodata = ".USER_embedded_Keys"
 #endif
 
-KMS_DECLARE_BLOB_STRUCT(, 32)
+KMS_DECLARE_BLOB_STRUCT(, 21);
+KMS_DECLARE_BLOB_STRUCT(, 27);
 
+/* These objects are used by user tKMS application                 */
+#if defined(__GNUC__)
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
+#endif
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-/* These objects are used by user tKMS application                 */
-static const kms_obj_keyhead_32_t   Lorawan_Zero_Key =
+static const kms_obj_keyhead_27_t   Lorawan_Zero_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   1,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    CKA_DERIVE,       sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_App_Key =
+static const kms_obj_keyhead_27_t   Lorawan_App_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   2,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_APP_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_Nwk_Key =
+static const kms_obj_keyhead_27_t   Lorawan_Nwk_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
   3,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_NWK_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_Nwk_S_Key =
+static const kms_obj_keyhead_21_t   Lorawan_Nwk_S_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  6,                               /*  uint32_t object_id; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
-static const kms_obj_keyhead_32_t   Lorawan_App_S_Key =
+static const kms_obj_keyhead_21_t   Lorawan_App_S_Key =
 {
   KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
   KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  7,                               /*  uint32_t object_id; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
   {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_APP_S_KEY),
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
     CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
   }
 };
 
@@ -218,6 +233,8 @@ static const kms_obj_keyhead_32_t   Lorawan_App_S_Key =
 #pragma default_variable_attributes =
 #elif defined(__CC_ARM)
 #pragma arm section code
+#elif defined(__GNUC__)
+#pragma GCC pop_options
 #endif
 /* USER CODE END KMS_PLATF_OBJECTS_CONFIG_Embedded_Objects_Definition */
 
@@ -232,11 +249,30 @@ const kms_obj_keyhead_t * const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBE
 {
 /* USER CODE BEGIN KMS_PlatfObjects_EmbeddedList */
   /* UserApp example keys */
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
   (kms_obj_keyhead_t *) &Lorawan_Zero_Key,            /* Index = 1 */
+#else
+  (kms_obj_keyhead_t *) NULL,                         /* Index = 1 */
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
   (kms_obj_keyhead_t *) &Lorawan_App_Key,             /* Index = 2 */
   (kms_obj_keyhead_t *) &Lorawan_Nwk_Key,             /* Index = 3 */
   (kms_obj_keyhead_t *) &Lorawan_Nwk_S_Key,           /* Index = 4 */
   (kms_obj_keyhead_t *) &Lorawan_App_S_Key,           /* Index = 5 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 8 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 12 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 13 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 14 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 15 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 16 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 20 */
 /* USER CODE END KMS_PlatfObjects_EmbeddedList */
 };
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/main.h
index 19dd412d..d6e56436 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/main.h
@@ -29,9 +29,9 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
+
 #include "app_kms.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -63,35 +63,14 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
index e3e06495..a2de8eb7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 /*#define HAL_UART_MODULE_ENABLED   */
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/sys_app.h
index 2ed00a30..52839726 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -38,6 +40,10 @@ extern "C" {
 /* currently not supported */
 /* #define ALLOW_KMS_VIA_MBMUX */
 
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -71,29 +77,39 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
   */
 void SystemApp_Init(void);
 
 /**
   * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
+  * @param  id unique ID
   */
 void GetUniqueId(uint8_t *id);
 
 /**
   * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
   * @retval devAddr Device Address
   */
 uint32_t GetDevAddr(void);
 
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
 void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/sys_conf.h
index 3a44ccfe..f026efa4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief CM0PLUS Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/utilities_conf.h
index 6f20721c..1d672420 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -35,7 +37,6 @@ extern "C" {
 #include "stm32_tiny_vsnprintf.h"
 
 #include "mbmuxif_trace.h"
-
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -157,9 +158,9 @@ extern "C" {
 #define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
 #define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
 #define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
-#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
 #define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
-#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
 #define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
 #define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/utilities_def.h
index cec8bb33..0f27bf45 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc.c
index 617042e8..1d49b00f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc_if.c
index ad72640a..d8ea5d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,7 +82,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* Enable C2AHB3 peripherals clock. */
@@ -89,14 +91,14 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccCommandRcv = IPCC_IF_CommandRcv_cb;
   IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/main.c
index de246681..75f811e1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/main.c
@@ -80,8 +80,8 @@ int main(void)
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
-  MX_LoRaWAN_Init();
   MX_KMS_Init();
+  MX_LoRaWAN_Init();
   /* USER CODE BEGIN 2 */
 
   /* USER CODE END 2 */
@@ -102,27 +102,6 @@ int main(void)
 
 /* USER CODE END 4 */
 
- /**
-  * @brief  Period elapsed callback in non blocking mode
-  * @note   This function is called  when TIM17 interrupt took place, inside
-  * HAL_TIM_IRQHandler(). It makes a direct call to HAL_IncTick() to increment
-  * a global variable "uwTick" used as application time base.
-  * @param  htim : TIM handle
-  * @retval None
-  */
-void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
-{
-  /* USER CODE BEGIN Callback 0 */
-
-  /* USER CODE END Callback 0 */
-  if (htim->Instance == TIM17) {
-    HAL_IncTick();
-  }
-  /* USER CODE BEGIN Callback 1 */
-
-  /* USER CODE END Callback 1 */
-}
-
 /**
   * @brief  This function is executed in case of error occurrence.
   * @retval None
@@ -131,6 +110,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/rtc.c
index f74cd49b..ab828d03 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,17 +71,20 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
   /** Enable the Alarm B
   */
   sAlarm.Alarm = RTC_ALARM_B;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32_lpm_if.c
index 3dfcda11..eb2e798d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm_if.h"
 
 /* USER CODE BEGIN Includes */
@@ -91,7 +93,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C2STOP_C2STB();
@@ -110,7 +111,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32wlxx_it.c
index 1077aadd..c5323b14 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -59,8 +59,6 @@
 extern IPCC_HandleTypeDef hipcc;
 extern RTC_HandleTypeDef hrtc;
 extern SUBGHZ_HandleTypeDef hsubghz;
-extern TIM_HandleTypeDef htim17;
-
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -77,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -130,7 +130,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/sys_app.c
index ba535e3b..c0f8decf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -27,15 +29,14 @@
 #include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-
 #include "msg_id.h"
-#include "features_info.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
 #include "mbmuxif_radio.h"
+#include "features_info.h"
 #include "mbmuxif_lora.h"
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-#include "mbmuxif_kms.h"
+/* #include "mbmuxif_kms.h" */
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
@@ -54,6 +55,7 @@
 
 /* Private define ------------------------------------------------------------*/
 #define MAX_TS_SIZE (int) 16
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -71,8 +73,6 @@
 /* Private function prototypes -----------------------------------------------*/
 /**
   * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
-  * @param none
-  * @retval  none
   */
 static void System_Init(void);
 
@@ -80,16 +80,12 @@ static void System_Init(void);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises MBMUXIF System and send a notification to Cm4 when ready
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   int8_t init_status;
@@ -98,6 +94,7 @@ void SystemApp_Init(void)
   /* USER CODE END SystemApp_Init_1 */
 
   /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
   /*Init low power manager*/
@@ -115,7 +112,7 @@ void SystemApp_Init(void)
   /* Init Feat_Info table */
   FEAT_INFO_Init();
 
-  /* Note: the trace is initialised in the context of MBMUXIF because it uses the MB on Cm0 side */
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
@@ -124,19 +121,14 @@ void SystemApp_Init(void)
 
   System_Init();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
 
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
-  */
 void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -156,7 +148,7 @@ void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Kms_Cmd_1 */
 
   /* USER CODE END Process_Kms_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
 
   APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
 
@@ -197,19 +189,19 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   switch (ComObj->MsgId)
   {
     case SYS_OTHER_MSG_ID:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
 
-  /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
       break;
 
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
 
-  /* USER CODE END Process_Sys_Cmd_switch_case */
+    /* USER CODE END Process_Sys_Cmd_switch_case */
 
     default:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
 
-  /* USER CODE END Process_Sys_Cmd_switch_default */
+      /* USER CODE END Process_Sys_Cmd_switch_default */
       break;
   }
 
@@ -221,16 +213,16 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Cmd_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -239,8 +231,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -299,20 +289,23 @@ uint32_t GetDevAddr(void)
   /* USER CODE BEGIN GetDevAddr_1 */
 
   /* USER CODE END GetDevAddr_1 */
+
   val = LL_FLASH_GetUDN();
   if (val == 0xFFFFFFFF)
   {
     val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
   }
+
   /* USER CODE BEGIN GetDevAddr_2 */
 
   /* USER CODE END GetDevAddr_2 */
   return val;
+
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
 static void System_Init(void)
@@ -324,7 +317,7 @@ static void System_Init(void)
   LL_C2_PWR_DisableInternWU();
 
   /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
-  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach onlt Cm4 */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
   LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
   LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
 
@@ -385,10 +378,7 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -403,13 +393,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -420,13 +408,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/timer_if.c
index 6133e380..6405002c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -106,6 +106,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -155,7 +166,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -175,9 +185,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -185,7 +195,7 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A and Alarm B enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
     /*overload RTC feature enable*/
@@ -193,11 +203,14 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -280,64 +293,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,9 +379,9 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
 {
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
   MBMUX_ComParam_t *com_obj;
 
   if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
@@ -376,9 +395,9 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
       MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
     }
   }
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
 }
 
 void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
@@ -386,7 +405,7 @@ void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
@@ -409,6 +428,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -418,16 +438,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -454,24 +474,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/Commissioning.h
index bb1c4293..f827d8ed 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/Commissioning.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/Commissioning.h
@@ -26,21 +26,19 @@
   * @brief   End-device commissioning parameters
   ******************************************************************************
  */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __COMMISSIONING_H__
 #define __COMMISSIONING_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 /*!
  ******************************************************************************
  ********************************** WARNING ***********************************
  ******************************************************************************
 
- The LoRaWAN AES128 keys are stored and provisionned on secure-elements.
+ The LoRaWAN AES128 keys are stored and provisioned on secure-elements.
 
- This project providdes a software emulated secure-element.
+ This project provides a software emulated secure-element.
  The LoRaWAN AES128 keys SHALL be updated under
  src/peripherals/<secure-element name>-se\se-identity.h file.
 
@@ -81,8 +79,4 @@ extern "C" {
 
 /* USER CODE END EC2 */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/app_lorawan.c
index bd1de5a0..bcd8821e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/app_lorawan.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/app_lorawan.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_lorawan.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/app_lorawan.h
index 2c49b393..fbe16b6d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/app_lorawan.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/app_lorawan.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_LORAWAN_H__
 #define __APP_LORAWAN_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported Functions Prototypes------------------------------------------------------- */
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Init(void);
 
 /**
   * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app.c
index 804a2ea0..2c3ddcdf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sys_app.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app.h
index 25340cb3..8bf1f9f1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_APP_H__
 #define __LORA_APP_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app_version.h
index 55a1f921..dc745797 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/lora_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/se-identity.h
index 77f059d3..9b628efe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/se-identity.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/App/se-identity.h
@@ -1,5 +1,5 @@
 /*!
- * \file      se-identity_template.h
+ * \file      se-identity.h
  *
  * \brief     Secure Element identity and keys
  *
@@ -28,11 +28,12 @@
   *
   *          Portions COPYRIGHT 2020 STMicroelectronics
   *
-  * @file    se-identity_template.c
+  * @file    se-identity.h
   * @author  MCD Application Team
   * @brief   Secure Element identity and keys
   ******************************************************************************
   */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SOFT_SE_IDENTITY_H__
 #define __SOFT_SE_IDENTITY_H__
@@ -145,7 +146,7 @@ extern "C" {
 
 #if (USE_LRWAN_1_1_X_CRYPTO == 1)
 #define SESSION_KEYS_LIST                                                                                           \
-           {                                                                                                        \
+        {                                                                                                           \
             /*!                                                                                                     \
              * Join session integrity key (Dynamically updated)                                                     \
              * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
index 8fdf8b4b..e7610e08 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lorawan_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORAWAN_CONF_H__
@@ -25,8 +27,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-#include "sys_app.h"   /* needed for APP_PRINTF */
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -51,12 +51,12 @@ extern "C" {
 #if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
 #else /* LORAWAN_KMS == 1 */
 #define OVER_THE_AIR_ACTIVATION 1
-#define ACTIVATION_BY_PERSONALISATION 1
-#endif
+#define ACTIVATION_BY_PERSONALIZATION 1
+#endif /* LORAWAN_KMS */
 
 /* Region ------------------------------------*/
 /* the region listed here will be linked in the CM0 MW code */
-/* the applic (on CM4/sys_conf.h) shall just configure one region at the time */
+/* the application (on CM4/sys_conf.h) shall just configure one region at the time */
 /*#define REGION_AS923*/
 /*#define REGION_AU915*/
 /*#define REGION_CN470*/
@@ -68,15 +68,30 @@ extern "C" {
 #define REGION_US915
 /*#define REGION_RU864*/
 
-#define HYBRID_ENABLED          0
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
 
-#define KEY_LOG_ENABLED         1
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
 
 /* Class B ------------------------------------*/
 #define LORAMAC_CLASSB_ENABLED  0
 
 #if ( LORAMAC_CLASSB_ENABLED == 1 )
-/* CLASS B LSE crystall calibration*/
+/* CLASS B LSE crystal calibration*/
 /**
   * \brief Temperature coefficient of the clock source
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_board_if.h
index 3e3c7abb..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     10U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_conf.h
index 3a3fd8a1..08263606 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,6 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,12 +49,12 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief Max payload buffer size
@@ -65,6 +68,7 @@ extern "C" {
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -72,25 +76,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -130,6 +151,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/systime.h
index f3ce93b2..1991b928 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/systime.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/systime.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    systime.h
@@ -16,8 +17,9 @@
   *
   ******************************************************************************
   */
-/* Define to prevent recursive inclusion -------------------------------------*/
+/* USER CODE END Header */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTIME_H__
 #define __SYSTIME_H__
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/LoRaWAN/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.c
index 4d15f862..39228252 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_mem.h"
@@ -47,11 +49,11 @@
 typedef enum TxEventType_e
 {
   /*!
-   * @brief AppdataTransmition issue based on timer every TxDutyCycleTime
+   * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
    */
   TX_ON_TIMER,
   /*!
-   * @brief AppdataTransmition external event plugged on OnSendEvent( )
+   * @brief Appdata Transmission external event plugged on OnSendEvent( )
    */
   TX_ON_EVENT
 } TxEventType_t;
@@ -64,10 +66,10 @@ typedef enum TxEventType_e
 #ifndef MAX
 #define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #endif /* MAX */
-#define MCPS_SIZE MAX(sizeof(McpsConfirm_t), sizeof(McpsIndication_t))
-#define MLME_SIZE MAX(sizeof(MlmeConfirm_t), sizeof(MlmeIndication_t))
-#define LORA_MBWRAP_SHBUF_SIZE MAX(MCPS_SIZE, MLME_SIZE)
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
+#define LMH_ON_JOIN_SIZE (sizeof(LmHandlerJoinParams_t))
+#define LMH_ON_TX_SIZE   (sizeof(LmHandlerTxParams_t))
+#define LMH_ON_RX_SIZE   (((sizeof(LmHandlerAppData_t) + 7) & ~7) + 256 + (sizeof(LmHandlerRxParams_t)))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(LMH_ON_JOIN_SIZE, MAX(LMH_ON_TX_SIZE, LMH_ON_RX_SIZE))
 
 /* USER CODE BEGIN PD */
 
@@ -83,25 +85,50 @@ static uint8_t GetBatteryLevel_mbwrapper(void);
 
 static uint16_t GetTemperatureLevel_mbwrapper(void);
 
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size);
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params);
+
 static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams);
 
 static void OnTxData_mbwrapper(LmHandlerTxParams_t *params);
 
 static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass);
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params);
+
+static void OnSysTimeUpdate_mbwrapper(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM0+ to CM4
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
 static LmHandlerCallbacks_t callback_mbwrapper =
 {
   .GetBatteryLevel =           GetBatteryLevel_mbwrapper,
   .GetTemperature =            GetTemperatureLevel_mbwrapper,
+  .GetUniqueId =               GetUniqueId,
+  .GetDevAddr =                GetDevAddr,
   .OnMacProcess =              OnMacProcessNotify,
+  .OnNvmDataChange =           OnNvmDataChange_mbwrapper,
+  .OnNetworkParametersChange = OnNetworkParametersChange_mbwrapper,
   .OnJoinRequest =             OnJoinRequest_mbwrapper,
   .OnTxData =                  OnTxData_mbwrapper,
   .OnRxData =                  OnRxData_mbwrapper,
+  .OnClassChange =             OnClassChange_mbwrapper,
+  .OnBeaconStatusChange =      OnBeaconStatusChange_mbwrapper,
+  .OnSysTimeUpdate =           OnSysTimeUpdate_mbwrapper
 };
 
 /* USER CODE BEGIN PV */
@@ -114,17 +141,19 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Lora_Cmd_1 */
 
   /* USER CODE END Process_Lora_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;
+  uint32_t *com_buffer = NULL;
   LmHandlerErrorStatus_t errorStatus;
   LmHandlerFlagStatus_t flagStatus;
   int32_t ret_code;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(LoRa)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
-    case LMHANDLER_INITIALIZATION_ID:
+    case   LMHANDLER_INITIALIZATION_ID:
       errorStatus = LmHandlerInit(&callback_mbwrapper);
 
       /* prepare response buffer */
@@ -141,7 +170,7 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = (uint32_t) errorStatus; /* */
       break;
 
-    case LMHANDLER_JOIN_STATUS_ID:
+    case   LMHANDLER_JOIN_STATUS_ID:
       flagStatus = LmHandlerJoinStatus();
 
       /* prepare response buffer */
@@ -222,6 +251,54 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal = (uint32_t) ret_code; /* */
       break;
+    case   LMHANDLER_GET_NWKKEY_ID:
+      ret_code = LmHandlerGetNwkKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKKEY_ID:
+      ret_code = LmHandlerSetNwkKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPKEY_ID:
+      ret_code = LmHandlerGetAppKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPKEY_ID:
+      ret_code = LmHandlerSetAppKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_NWKSKEY_ID:
+      ret_code = LmHandlerGetNwkSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKSKEY_ID:
+      ret_code = LmHandlerSetNwkSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPSKEY_ID:
+      ret_code = LmHandlerGetAppSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPSKEY_ID:
+      ret_code = LmHandlerSetAppSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
     case   LMHANDLER_GET_NWKID_ID:
       ret_code = LmHandlerGetNetworkID((uint32_t *) com_buffer[0]);
       /* prepare response buffer */
@@ -384,6 +461,18 @@ void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal = (uint32_t) ret_code; /* */
       break;
+    case LMHANDLER_LINK_CHECK_REQ_ID:
+      ret_code = LmHandlerLinkCheckReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case LMHANDLER_DEVICE_TIME_REQ_ID:
+      ret_code = LmHandlerDeviceTimeReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
     case   LMHANDLER_INFO_INIT_ID:
       LoraInfo_Init();
       /* prepare response buffer */
@@ -462,19 +551,92 @@ static uint16_t GetTemperatureLevel_mbwrapper(void)
   /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
 }
 
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size)
+{
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_1 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)state;
+  com_buffer[1] = (uint32_t)size;
+  com_obj->ParamCnt = 2;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_2 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_2 */
+}
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params)
+{
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_1 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(CommissioningParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_2 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_2 */
+}
+
 static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams)
 {
   /* USER CODE BEGIN OnJoinRequest_mbwrapper_1 */
 
   /* USER CODE END OnJoinRequest_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
+  if (joinParams != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_JOIN_REQ_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (joinParams == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
   com_obj->ParamCnt = 1;
 
   MBMUXIF_LoraSendNotif();
@@ -492,13 +654,27 @@ static void OnTxData_mbwrapper(LmHandlerTxParams_t *params)
 
   /* USER CODE END OnTxData_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_TX_DATA_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
   com_obj->ParamCnt = 1;
 
   MBMUXIF_LoraSendNotif();
@@ -516,16 +692,50 @@ static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t
 
   /* USER CODE END OnRxData_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  /* need to 8-align the next address */
-  uint8_t next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
+  uint32_t *com_buffer = NULL;
+  uint8_t next_addr = 0;
+
+  if (appData != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
+    /* need to 8-align the next address */
+    next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
+
+    if (appData->BufferSize > 0)
+    {
+      UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], appData->Buffer, appData->BufferSize);
+      ((LmHandlerAppData_t *)aLoraMbWrapShare2Buffer)->Buffer = &aLoraMbWrapShare2Buffer[next_addr];
+      next_addr = (appData->BufferSize + 7) & ~7;
+    }
+  }
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
+  }
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
-  UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
   com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
   com_obj->MsgId = LMHANDLER_ON_RX_DATA_CB_ID;
 
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
-  com_obj->ParamBuf[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (appData == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
+  if (params == NULL)
+  {
+    com_buffer[1] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
+  }
+
   com_obj->ParamCnt = 2;
 
   MBMUXIF_LoraSendNotif();
@@ -537,6 +747,86 @@ static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t
   /* USER CODE END OnRxData_mbwrapper_2 */
 }
 
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass)
+{
+  /* USER CODE BEGIN OnClassChange_mbwrapper_1 */
+
+  /* USER CODE END OnClassChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_CLASS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)deviceClass;
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnClassChange_mbwrapper_2 */
+
+  /* USER CODE END OnClassChange_mbwrapper_2 */
+}
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerBeaconParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
+static void OnSysTimeUpdate_mbwrapper(void)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.h
index a07ea737..bc600e5f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LMHANDLER_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/features_info.c
index 3ce58f07..61a6eb3d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/features_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/features_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stddef.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/lora_info.c
index 9d845793..e95e07d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/lora_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/lora_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.c
@@ -16,10 +17,12 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "LoRaMac.h"
 #include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
 #include "platform.h" /* Needed for Error_Handler */
 #include "features_info.h"
 
@@ -27,11 +30,6 @@
 
 /* USER CODE END Includes */
 
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
 /* Private typedef -----------------------------------------------------------*/
 
 /* USER CODE BEGIN PTD */
@@ -58,9 +56,7 @@
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief initialises the LoraMacInfo capabilities table
-  * @param none
-  * @retval  none
+  * @brief initialize the LoraMacInfo capabilities table
   */
 void StoreValueInFeatureListTable(void);
 
@@ -120,6 +116,10 @@ void LoraInfo_Init(void)
   if (loraInfo.Region == 0)
   {
     APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
     while (1) {} /* At least one region shall be defined */
   }
 
@@ -134,7 +134,7 @@ void LoraInfo_Init(void)
   loraInfo.ActivationMode = 3;
 #else /* LORAWAN_KMS == 1 */
   loraInfo.Kms = 1;
-  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALISATION + (OVER_THE_AIR_ACTIVATION << 1);
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
 #endif /* LORAWAN_KMS */
 
   /* For DualCore */
@@ -188,7 +188,7 @@ void StoreValueInFeatureListTable(void)
 
   if (found)
   {
-    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t)/sizeof(uint32_t);
+    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t) / sizeof(uint32_t);
     p_feature->Feat_Info_Config_Ptr = &loraInfo;
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.c
index 013f7100..ef887470 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -51,15 +54,53 @@
 
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -67,11 +108,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -80,27 +116,23 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   uint8_t i;
   IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
 
-  p_MBMUX_ComTable = pMBMUX_ComTable;
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
 
   for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
   {
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
   }
   /* USER CODE BEGIN MBMUX_Init_Last */
 
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval  return -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
-  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
 {
   uint8_t channel_idx;
@@ -116,15 +148,19 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   {
     /* channel has been registered by CM4 registered */
     channel_idx = check_existing_feature_registration;
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm0plusCb = MsgCb;
-    }
-    else
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
     {
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm0plusCb = MsgCb;
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
     }
-    ret = channel_idx;
   }
   /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
 
@@ -132,13 +168,6 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -155,11 +184,11 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
       /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
       IPCC_IF_ResponseSnd(mb_ch);
 
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
     else
     {
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
   }
   /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
@@ -167,12 +196,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -199,11 +222,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Notif to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
@@ -214,7 +232,7 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
   if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
   {
-    while (1) {}
+    Error_Handler();
   }
   return IPCC_IF_NotificationSnd(mb_ch);
   /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
@@ -222,11 +240,6 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_NotificationSnd_Last */
 }
 
-/**
-  * @brief Send response to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
@@ -241,17 +254,118 @@ uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_ResponseSnd_Last */
 }
 
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
 /* USER CODE BEGIN EFD */
 
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
@@ -260,18 +374,13 @@ static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
@@ -280,19 +389,13 @@ static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
   return;
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -304,17 +407,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.h
index e91b1547..a938e544 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM0PLUS_H__
@@ -52,19 +54,58 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 0ec2ec5d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *KmsComObj;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskKmsCmdRcv(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers KMS feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsCmdRcvCb);
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskKmsCmdRcv);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Sends a Kms-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendResp(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_1 */
-  if (MBMUX_ResponseSnd(FEAT_INFO_KMS_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_1 */
-  KmsComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_Last */
-}
-
-/**
-  * @brief  KMS task to process the command
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskKmsCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_1 */
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-  Process_Kms_Cmd(KmsComObj);
-#endif /* ALLOW_KMS_VIA_MBMUX */
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_kms.h
deleted file mode 100644
index 12b71c19..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM0PLUS_H__
-#define __MBMUXIF_KMS_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-void MBMUXIF_KmsSendResp(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.c
index d0cc04c2..26630e54 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to register and handle LoraWAN to MBMUX
+  * @brief   allows CM0 application to register and handle LoraWAN to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -56,21 +58,27 @@ static MBMUX_ComParam_t *LoraComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the command
+  */
 static void MBMUXIF_TaskLoraCmdRcv(void);
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers LORA feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_LoraInit(void)
 {
   int8_t ret;
@@ -95,11 +103,6 @@ int8_t MBMUXIF_LoraInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Lora feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_1 */
@@ -108,7 +111,7 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_Last */
@@ -116,11 +119,6 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Lora-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendNotif(void)
 {
   /* to check vs radio. radio call this on irq so it moves here on task */
@@ -134,18 +132,13 @@ void MBMUXIF_LoraSendNotif(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_LoraSendNotif_Last */
 
   /* USER CODE END MBMUXIF_LoraSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Lora-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendResp_1 */
@@ -153,7 +146,7 @@ void MBMUXIF_LoraSendResp(void)
   /* USER CODE END MBMUXIF_LoraSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_LoraSendResp_Last */
 
@@ -165,11 +158,6 @@ void MBMUXIF_LoraSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  LORA acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_1 */
@@ -181,11 +169,6 @@ static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_Last */
 }
 
-/**
-  * @brief  LORA command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_1 */
@@ -198,11 +181,6 @@ static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_Last */
 }
 
-/**
-  * @brief  LORA task to process the command
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskLoraCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.h
index 75fda6ea..558f081f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.h
   * @author  MCD Application Team
-  * @brief   API provided to CM0PLUS applic to register and handle LoraWAN via MBMUX
+  * @brief   API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_LORA_CM0PLUS_H__
@@ -52,9 +54,30 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_LoraSendNotif(void);
+
+/**
+  * @brief   Sends a Lora-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_LoraSendResp(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.c
index 3ba64a2b..fe5fd070 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -57,22 +59,33 @@ static MBMUX_ComParam_t *RadioComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
 static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
 static void MBMUXIF_TaskRadioNotifSnd(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers RADIO feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   int8_t ret;
@@ -99,11 +112,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
@@ -112,7 +120,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
@@ -120,11 +128,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendNotif(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
@@ -136,11 +139,6 @@ void MBMUXIF_RadioSendNotif(void)
   /* USER CODE END MBMUXIF_RadioSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Radio-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
@@ -148,7 +146,7 @@ void MBMUXIF_RadioSendResp(void)
   /* USER CODE END MBMUXIF_RadioSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
 
@@ -160,11 +158,6 @@ void MBMUXIF_RadioSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
@@ -176,11 +169,6 @@ static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
@@ -193,11 +181,6 @@ static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the command
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
@@ -209,11 +192,6 @@ static void MBMUXIF_TaskRadioCmdRcv(void)
   /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
 }
 
-/**
-  * @brief  RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifSnd(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
@@ -225,7 +203,7 @@ static void MBMUXIF_TaskRadioNotifSnd(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.h
index 44fab48f..7e226c6c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM0PLUS_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_RadioSendResp(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.c
index a3ce77e9..67725244 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to handle the SYSTEM MBMUX channel
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -63,27 +65,59 @@ static MBMUX_ComParam_t *SystemComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
 static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
 
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf);
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
 
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
@@ -118,7 +152,7 @@ int8_t MBMUXIF_SystemInit(void)
 
   if (ret >= 0)
   {
-    /* Notify Cm4 that MBMUXIF_System and RTC are initialised on Cm0 side */
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
     /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
     while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
     pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
@@ -130,14 +164,6 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Get synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
@@ -146,11 +172,6 @@ uint16_t MBMUXIF_GetCpusSynchroFlag(void)
   return pMb_RefTable->SynchronizeCpusAtBoot;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
@@ -159,7 +180,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
 
@@ -167,11 +188,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   return com_param_ptr;
 }
 
-/**
-  * @brief Sends a System-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
@@ -183,18 +199,13 @@ void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
@@ -202,26 +213,21 @@ void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
 }
 
-/**
-  * @brief Sends a System-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
 
-  /* USER CODE END EFMBMUXIF_SystemSendResp_1 */
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
   if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
 
@@ -238,7 +244,7 @@ int16_t MBMUXIF_ChipRevId(void)
   int16_t ret = pMb_RefTable->ChipRevId;
   /* USER CODE BEGIN MBMUXIF_ChipRevId */
 
-  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+  /* USER CODE END MBMUXIF_ChipRevId */
   return ret ;
 }
 
@@ -247,35 +253,24 @@ int16_t MBMUXIF_ChipRevId(void)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 {
   SystemComObj = (MBMUX_ComParam_t *) ComObj;
-  uint32_t *com_buffer = SystemComObj->ParamBuf;
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
 
   /* process Command on Isr or schedule a task*/
   switch (SystemComObj->MsgId)
@@ -285,14 +280,9 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
       MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
       break;
 
-    case SYS_REGISTER_FEATURE_MSG_ID:
-      SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
-      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-      break;
-
     /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
     default:
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
@@ -301,89 +291,68 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
 
 }
 
-/**
-  * @brief  SYSTEM task to process the command
-  * @param  none
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemCmdRcv(void)
 {
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
-  Process_Sys_Cmd(SystemComObj);
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
 
 }
 
-/**
-  * @brief  SYSTEM PRIO_A acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
 }
 
-/**
-  * @brief  Retrieve the feature that needs MbMux registration and call correspondent Init
-  * @param  pointer to parameter buffer of the command
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  */
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
 {
   int8_t ret = -2; /* feature not supported */
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  switch (ParamBuf[0])
+  switch (pBuf[0])
   {
     case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
       ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
@@ -407,6 +376,9 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
       ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
       break;
 
@@ -416,17 +388,23 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
       ret = MBMUXIF_LoraInit();
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora registration done\r\n");
       break;
 
     case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox not supported\r\n");
       break;
 
     /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
     default:
       break;
@@ -434,7 +412,7 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
   return ret;
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.h
index 01dff052..f780cdde 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM0PLUS_H__
@@ -54,11 +56,44 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -66,6 +101,10 @@ void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
 int16_t MBMUXIF_ChipRevId(void);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.c
index 04c9f7b6..05704d23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -25,6 +27,7 @@
 #include "msg_id.h"
 #include "stm32_seq.h"
 #include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
 
 /* USER CODE BEGIN Includes */
 
@@ -46,15 +49,43 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
-static void (*TraceUtilCpltCallback)(void *);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
 
 /* USER CODE BEGIN PFP */
@@ -75,12 +106,6 @@ const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
 /* USER CODE END PTD */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
 {
   int8_t ret;
@@ -92,6 +117,8 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
   if (ret >= 0)
   {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
     /*Initialize the terminal */
     UTIL_ADV_TRACE_Init();
     UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
@@ -107,11 +134,6 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Trace feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
@@ -120,7 +142,7 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
@@ -128,11 +150,6 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendNotif_NoWait(void)
 {
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
@@ -140,7 +157,7 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
   /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
 
@@ -152,14 +169,6 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
 /* USER CODE END EFD */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief The trace utilities inform the mbmuxif which func to call
-  *        once the Mb transmission is completed
-  * @param:  "stm32_adv_trace.c callback"
-  * @retval: none
-  */
-
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
@@ -172,26 +181,23 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
   /* USER CODE END MBMUXIF_TraceBufferInit_Last */
 }
 
-/**
-  * @brief TraceBufferSend sends the formatted buffer to CM4 which
-  *        posts it to the circular queue for printing
-  * @param:  strFormat: string to be printed
-  * @retval: 0 when ok, -1 when circular queue is full
-  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
 
   /* USER CODE END MBMUXIF_TraceBufferSend_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
 
-  /* notify CM4 that CM0PLUS is initialised */
+  /* notify CM4 that CM0PLUS is initialized */
   com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
   if (com_obj != NULL)
   {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
     com_obj->MsgId = TRACE_SEND_MSG_ID;
-    com_obj->ParamBuf[0] = (uint32_t) buf;
-    com_obj->ParamBuf[1] = (uint32_t) bufSize;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
     com_obj->ParamCnt = 2;
     MBMUXIF_TraceSendNotif_NoWait();
   }
@@ -202,24 +208,28 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bu
 }
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TRACE acknowledge callbacks: set event to release waiting task
-  *             and use callback to check if other trace need to be sent to CM4
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
-  TraceUtilCpltCallback(NULL);
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
 }
 
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.h
index 490321d2..8aad9276 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle TRACE via MBMUX
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM0PLUS_H__
@@ -52,8 +54,23 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendNotif_NoWait(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.c
index c09f8d55..063d379e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -47,7 +49,6 @@
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
 
 /* USER CODE BEGIN PD */
 
@@ -59,7 +60,15 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_S
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-static  RadioEvents_t    radioevents_mbwrapper;
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/**
+  * @brief local structure of radio callbacks for command processes
+  */
+static  RadioEvents_t radioevents_mbwrapper;
 
 /* USER CODE BEGIN PV */
 
@@ -79,10 +88,10 @@ static void RadioTxTimeout_mbwrapper(void);
 /*!
  * \brief Rx Done callback prototype.
  *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
+ * \param[in] payload Received buffer pointer
+ * \param[in] size    Received buffer size
+ * \param[in] rssi    RSSI value computed while receiving the frame [dBm]
+ * \param[in] snr     Raw SNR value given by the radio hardware
  *                     FSK : N/A ( set to 0 )
  *                     LoRa: SNR value in dB
  */
@@ -108,13 +117,15 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Radio_Cmd_1 */
 
   /* USER CODE END Process_Radio_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = NULL;
   uint32_t ret_uint;
   int32_t ret_int;
   RadioState_t status;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
@@ -242,7 +253,7 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = 0; /* */
       break;
 
-    case RADIO_SET_TX_CONTINOUS_WAVE_ID:
+    case RADIO_SET_TX_CONTINUOUS_WAVE_ID:
       Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -411,16 +422,26 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
 
   /* USER CODE END RadioRxDone_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
+  uint32_t *com_buffer = NULL ;
   uint16_t i = 0;
 
   /* copy data from Cm0 private memory to shared memory */
-  UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  if (payload != NULL)
+  {
+    UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  }
 
   com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
   com_obj->MsgId = RADIO_RX_DONE_CB_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (payload == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  }
   com_buffer[i++] = (uint32_t) size;
   com_buffer[i++] = (uint32_t) rssi;
   com_buffer[i++] = (uint32_t) snr;
@@ -435,7 +456,7 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
   /* once event is received and semaphore released: */
 
   /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
-     this migh be requested just if the buffer should be processed by the applic and the stack */
+     this might be requested just if the buffer should be processed by the application and the stack */
   /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
   return;
   /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.h
index 4b3da2cd..ac6a70d3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/ipcc_if.h
index 49ee1e48..e891e529 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM4_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_ResponseRcv_cb     response callback
   * @param  IPCC_IF_NotificationRcv_cb notification callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/main.h
index 3447444b..14990858 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -61,40 +60,24 @@ void Error_Handler(void);
 /* Private defines -----------------------------------------------------------*/
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
-#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
 #define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define BUT2_Pin GPIO_PIN_1
 #define BUT2_GPIO_Port GPIOA
 #define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_app.h
index ab592978..59d790a6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -35,6 +37,10 @@ extern "C" {
 /* USER CODE END Includes */
 
 /* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -70,24 +76,24 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
 void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
 
 /**
   * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
-  * @param  none
   * @retval battery level
   */
 uint8_t GetBatteryLevel(void);
 
 /**
   * @brief  callback to get the current temperature in the MCU
-  * @param  none
   * @retval temperature level
   */
 uint16_t GetTemperatureLevel(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_conf.h
index 74840d89..a2f39fa4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -41,29 +43,33 @@ extern "C" {
   * @brief Temperature and pressure values are retrieved from sensors shield
   *        (instead of sending dummy values). It requires MEMS IKS shield
   */
-#define SENSOR_ENABLED  0
+#define SENSOR_ENABLED              0
 
 /**
   * @brief CM4 Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_sensors.h
index 27c3485c..fc37f342 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_sensors.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/sys_sensors.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SENSORS_H__
@@ -54,13 +56,12 @@ typedef struct
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
 #define HTS221_0    0U
 #define LPS22HB_0   1U
 #endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
-
-/* USER CODE BEGIN EC */
-
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -75,15 +76,15 @@ typedef struct
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief  initialises the environmental sensor
+  * @brief  initialize the environmental sensor
   */
-void  EnvSensors_Init(void);
+int32_t EnvSensors_Init(void);
 
 /**
   * @brief  Environmental sensor  read.
   * @param  sensor_data sensor data
   */
-void EnvSensors_Read(sensor_t *sensor_data);
+int32_t EnvSensors_Read(sensor_t *sensor_data);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/usart.h
index 1315adaf..20bb5dfa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/utilities_conf.h
index 43a2ee92..ebd9cc7a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -153,9 +155,9 @@ extern "C" {
 #define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
 #define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
 #define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
-#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
 #define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
-#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
 #define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
 #define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/utilities_def.h
index 6dad7186..2bc3c1c2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/app_freertos.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/app_freertos.c
index b0569b7d..e97bd43b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/app_freertos.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/app_freertos.c
@@ -67,21 +67,21 @@ const osThreadAttr_t defaultTask_attributes = {
   * @param  None
   * @retval None
   */
-static void  WakeUpTimer_Cb( void *context );
+static void  WakeUpTimer_Cb(void *context);
 
 /**
   * @brief  Convert time in ms to RTOS ticks
   * @param  value in milliseconds
   * @retval value in RTOS tick
   */
-static uint32_t app_freertos_ms_to_tick( uint32_t ms);
+static uint32_t app_freertos_ms_to_tick(uint32_t ms);
 
 /**
   * @brief  Convert time in RTOS ticks to ms
   * @param  value in RTOS tick
   * @retval value in milliseconds
   */
-static uint32_t app_freertos_tick_to_ms( uint32_t tick);
+static uint32_t app_freertos_tick_to_ms(uint32_t tick);
 /* USER CODE END FunctionPrototypes */
 
 void StartDefaultTask(void *argument);
@@ -98,12 +98,12 @@ void PreSleepProcessing(uint32_t *ulExpectedIdleTime)
   even lower.  For example, peripherals can be turned off here, and then back
   on again in the post sleep processing function.  For maximum power saving
   ensure all unused pins are in their lowest power state. */
-  
-  uint32_t WakeUpTimer_timeOut_ms=app_freertos_tick_to_ms(*ulExpectedIdleTime);
-  
+
+  uint32_t WakeUpTimer_timeOut_ms = app_freertos_tick_to_ms(*ulExpectedIdleTime);
+
   UTIL_TIMER_Create(&WakeUpTimer, WakeUpTimer_timeOut_ms, UTIL_TIMER_ONESHOT, WakeUpTimer_Cb, NULL);
   UTIL_TIMER_Start(&WakeUpTimer);
-  Time_BeforeSleep=UTIL_TIMER_GetCurrentTime();
+  Time_BeforeSleep = UTIL_TIMER_GetCurrentTime();
 
   /*Enter to sleep Mode using the HAL function HAL_PWR_EnterSLEEPMode with WFI instruction*/
   //HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
@@ -120,11 +120,11 @@ void PostSleepProcessing(uint32_t *ulExpectedIdleTime)
 {
   /* Called by the kernel when the MCU exits a sleep mode because
   configPOST_SLEEP_PROCESSING is #defined to PostSleepProcessing(). */
-  uint32_t SleepDuration=UTIL_TIMER_GetElapsedTime(Time_BeforeSleep);
+  uint32_t SleepDuration = UTIL_TIMER_GetElapsedTime(Time_BeforeSleep);
 
   /* Avoid compiler warnings about the unused parameter. */
   UTIL_TIMER_Stop(&WakeUpTimer);
-  *ulExpectedIdleTime= app_freertos_ms_to_tick(SleepDuration);
+  *ulExpectedIdleTime = app_freertos_ms_to_tick(SleepDuration);
 }
 /* USER CODE END PREPOSTSLEEP */
 
@@ -181,36 +181,36 @@ void StartDefaultTask(void *argument)
   MX_LoRaWAN_Init();
   /* USER CODE BEGIN StartDefaultTask */
   /* Infinite loop */
-  for(;;)
+  for (;;)
   {
-    osThreadFlagsWait(1,osFlagsWaitAll,osWaitForever);
+    osThreadFlagsWait(1, osFlagsWaitAll, osWaitForever);
   }
   /* USER CODE END StartDefaultTask */
 }
 
 /* Private application code --------------------------------------------------*/
 /* USER CODE BEGIN Application */
-static void  WakeUpTimer_Cb( void *context )
+static void  WakeUpTimer_Cb(void *context)
 {
   /*Nothing to do*/
 }
 
-static uint32_t app_freertos_ms_to_tick( uint32_t ms)
+static uint32_t app_freertos_ms_to_tick(uint32_t ms)
 {
-  uint32_t tick=ms;
+  uint32_t tick = ms;
   if (configTICK_RATE_HZ != configTICK_RATE_HZ_1MS)
   {
-    tick=(uint32_t) (( ((uint64_t)(ms)) * configTICK_RATE_HZ)/configTICK_RATE_HZ_1MS);
+    tick = (uint32_t)((((uint64_t)(ms)) * configTICK_RATE_HZ) / configTICK_RATE_HZ_1MS);
   }
   return tick;
 }
 
-static uint32_t app_freertos_tick_to_ms( uint32_t tick)
+static uint32_t app_freertos_tick_to_ms(uint32_t tick)
 {
-  uint32_t ms=tick;
+  uint32_t ms = tick;
   if (configTICK_RATE_HZ != configTICK_RATE_HZ_1MS)
   {
-    ms=(uint32_t) (( ((uint64_t)(tick)) * configTICK_RATE_HZ_1MS)/configTICK_RATE_HZ);
+    ms = (uint32_t)((((uint64_t)(tick)) * configTICK_RATE_HZ_1MS) / configTICK_RATE_HZ);
   }
   return ms;
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/dma.c
index bbff7048..39d50900 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc.c
index 837b5b5c..f00c815a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc_if.c
index abfae080..672a366f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,21 +82,21 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* IPCC EXTI (AIEC) line for CPU1  */
   LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
   IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/main.c
index c7a70b27..9701dfe7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/main.c
@@ -119,6 +119,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -186,6 +187,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32wlxx_it.c
index c14661c6..795adda0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32wlxx_it.c
@@ -77,7 +77,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/sys_app.c
index f6f015bf..b3642c3a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -24,16 +26,18 @@
 #include "adc_if.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 #include "sys_sensors.h"
 #include "msg_id.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
-#include "mbmuxif_lora.h"
 #include "mbmuxif_radio.h"
-/*#include "mbmuxif_kms.h"*/
+#include "mbmuxif_lora.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
 
@@ -68,23 +72,21 @@
 /* Private variables ---------------------------------------------------------*/
 uint32_t InstanceIndex;
 uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_Init(void);
-
 /**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
   */
-static void Gpio_PreInit(void);
+static void MBMUXIF_Init(void);
+
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -92,15 +94,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
+
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -110,10 +109,8 @@ void SystemApp_Init(void)
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
 
-  Gpio_PreInit();
-
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -121,6 +118,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -144,14 +142,14 @@ void SystemApp_Init(void)
 
   UTIL_TIMER_Init();
 
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief  Process System Notifications
-  */
 void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Sys_Notif_1 */
@@ -163,14 +161,24 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 
   switch (notif_ack_id)
   {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
     case SYS_OTHER_MSG_ID:
       APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
       /* prepare ack buffer*/
       ComObj->ParamCnt = 0;
-      ComObj->ReturnVal = 7; /* dummy value for test */
-      break;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
 
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
     default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
       break;
   }
 
@@ -193,7 +201,7 @@ uint8_t GetBatteryLevel(void)
 
   batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
 
-  /* Convert batterey level from mV to linea scale: 1 (very low) to 254 (fully charged) */
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
   if (batteryLevelmV > VDD_BAT)
   {
     batteryLevel = LORAWAN_MAX_BAT;
@@ -227,51 +235,46 @@ uint16_t GetTemperatureLevel(void)
   return temperatureLevel;
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Test: Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialises other features
-  * @param none
-  * @retval none
-  */
 static void MBMUXIF_Init(void)
 {
   /* USER CODE BEGIN MBMUXIF_Init_1 */
 
   /* USER CODE END MBMUXIF_Init_1 */
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
   int8_t init_status;
 
-  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
 
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   /* start CM0PLUS */
-  /* Note: when debugging in order to connect with the deggugger CPUU2 shall be start using workspace CM4 starts CM0PLUS */
-  /* On the other hand is up to the devepoper make sure the CM0PLUS debugger is run after CM4 debugger */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
   HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-  /* CM4 has started and it has reset the mailbox and initialised the MbMux; */
-  /* once CM0PLUS is also initialised it send a SYS notification */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialisation done: Wait for CM0PLUS \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
 
-  MBMUXIF_WaitCm0MbmuxIsInitialised();
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
-  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supprted_features_list);
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
 
-  APP_LOG(TS_ON, VLEVEL_H, "System Initialisation CM4-CM0PLUS completed \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
 
   init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
   if (init_status < 0)
@@ -313,45 +316,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -394,4 +358,3 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE END PrFD */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/sys_sensors.c
index e2c80e45..3afffff8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/sys_sensors.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/sys_sensors.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.c
@@ -16,12 +17,14 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "sys_conf.h"
 #include "sys_sensors.h"
 
+/* USER CODE BEGIN Includes */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -104,9 +107,6 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN Includes */
-
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -120,15 +120,14 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
 #define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
 #define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
 #define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
 #define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
 #define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
 #define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
-
-/* USER CODE BEGIN PD */
-
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -137,6 +136,8 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -151,9 +152,6 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -162,11 +160,9 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-void EnvSensors_Read(sensor_t *sensor_data)
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
 {
-  /* USER CODE BEGIN EnvSensors_Read_1 */
-
-  /* USER CODE END EnvSensors_Read_1 */
+  /* USER CODE BEGIN EnvSensors_Read */
   float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
   float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
   float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
@@ -198,17 +194,14 @@ void EnvSensors_Read(sensor_t *sensor_data)
 
   sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
   sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
-  /* USER CODE BEGIN EnvSensors_Read_Last */
 
-  /* USER CODE END EnvSensors_Read_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Read */
 }
 
-void  EnvSensors_Init(void)
+int32_t  EnvSensors_Init(void)
 {
-  /* USER CODE BEGIN EnvSensors_Init_1 */
-
-  /* USER CODE END EnvSensors_Init_1 */
-
+  /* USER CODE BEGIN EnvSensors_Init */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
   /* Init */
 #if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
@@ -259,9 +252,8 @@ void  EnvSensors_Init(void)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif /* SENSOR_ENABLED  */
-  /* USER CODE BEGIN EnvSensors_Init_Last */
-
-  /* USER CODE END EnvSensors_Init_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/timer_if.c
index e04bdfc6..f02a544d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/timer_if.c
@@ -21,8 +21,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -163,9 +163,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   /** Configure the Instance */
   hrtc.Instance = RTC;
   HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
@@ -245,64 +245,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -325,6 +331,7 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -334,16 +341,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -370,24 +377,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart.c
index 34eab737..68a2d50c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_usart2_tx;
 void MX_USART2_UART_Init(void)
 {
 
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
   huart2.Instance = USART2;
-  huart2.Init.BaudRate = USART_BAUDRATE;
+  huart2.Init.BaudRate = 115200;
   huart2.Init.WordLength = UART_WORDLENGTH_8B;
   huart2.Init.StopBits = UART_STOPBITS_1;
   huart2.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_USART2_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart_if.c
index f91e9839..182f1990 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&huart2);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.c
index e3ea3ead..a5ecd557 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_lorawan.h"
@@ -74,13 +76,6 @@ void MX_LoRaWAN_Init(void)
   /* USER CODE END MX_LoRaWAN_Init_3 */
 }
 
-void MX_LoRaWAN_Process(void)
-{
-  /* USER CODE BEGIN MX_LoRaWAN_Process_1 */
-
-  /* USER CODE END MX_LoRaWAN_Process_1 */
-}
-
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.h
index 2c49b393..6fdd1992 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_lorawan.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_LORAWAN_H__
 #define __APP_LORAWAN_H__
@@ -52,18 +55,9 @@ extern "C" {
 /* Exported Functions Prototypes------------------------------------------------------- */
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void MX_LoRaWAN_Init(void);
 
-/**
-  * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
-  */
-void MX_LoRaWAN_Process(void);
-
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.c
index 64e9181f..d3bd30c1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -50,11 +52,11 @@
 typedef enum TxEventType_e
 {
   /**
-    * @brief AppdataTransmition issue based on timer every TxDutyCycleTime
+    * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
     */
   TX_ON_TIMER,
   /**
-    * @brief AppdataTransmition external event plugged on OnSendEvent( )
+    * @brief Appdata Transmission external event plugged on OnSendEvent( )
     */
   TX_ON_EVENT
   /* USER CODE BEGIN TxEventType_t */
@@ -78,59 +80,32 @@ typedef enum TxEventType_e
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief  LoRa endNode send request
-  * @param  none
-  * @retval none
+  * @brief  LoRa End Node send request
   */
 static void SendTxData(void);
 
 /**
   * @brief  TX timer callback function
-  * @param  timer context
-  * @retval none
+  * @param  context ptr of timer context
   */
 static void OnTxTimerEvent(void *context);
 
-/**
-  * @brief  LED Tx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnTxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Rx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnRxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Join timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnJoinTimerLedEvent(void *context);
-
 /**
   * @brief  join event callback function
-  * @param  params
-  * @retval none
+  * @param  joinParams status of join
   */
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
 
 /**
   * @brief  tx event callback function
-  * @param  params
-  * @retval none
+  * @param  params status of last Tx
   */
 static void OnTxData(LmHandlerTxParams_t *params);
 
 /**
-  * @brief callback when LoRa endNode has received a frame
-  * @param appData
-  * @param params
-  * @retval None
+  * @brief callback when LoRa application has received a frame
+  * @param appData data received in the last Rx
+  * @param params status of last Rx
   */
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
 
@@ -143,19 +118,27 @@ static void OnMacProcessNotify(void);
 
 /* USER CODE BEGIN PFP */
 
-/* USER CODE END PFP */
+/**
+  * @brief  LED Tx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnTxTimerLedEvent(void *context);
 
-/* Private variables ---------------------------------------------------------*/
 /**
-  * @brief User application buffer
+  * @brief  LED Rx timer callback function
+  * @param  context ptr of LED context
   */
-static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+static void OnRxTimerLedEvent(void *context);
 
 /**
-  * @brief User application data structure
+  * @brief  LED Join timer callback function
+  * @param  context ptr of LED context
   */
-static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+static void OnJoinTimerLedEvent(void *context);
+
+/* USER CODE END PFP */
 
+/* Private variables ---------------------------------------------------------*/
 static ActivationType_t ActivationType = LORAWAN_DEFAULT_ACTIVATION_TYPE;
 
 /**
@@ -183,11 +166,6 @@ static LmHandlerParams_t LmHandlerParams =
   .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
 };
 
-/**
-  * @brief Specifies the state of the application LED
-  */
-static uint8_t AppLedStateOn = RESET;
-
 /**
   * @brief Type of Event to generate application Tx
   */
@@ -198,6 +176,36 @@ static TxEventType_t EventType = TX_ON_TIMER;
   */
 static UTIL_TIMER_Object_t TxTimer;
 
+osThreadId_t Thd_LoraSendProcessId;
+
+const osThreadAttr_t Thd_LoraSendProcess_attr =
+{
+  .name = CFG_APP_LORA_PROCESS_NAME,
+  .attr_bits = CFG_APP_LORA_PROCESS_ATTR_BITS,
+  .cb_mem = CFG_APP_LORA_PROCESS_CB_MEM,
+  .cb_size = CFG_APP_LORA_PROCESS_CB_SIZE,
+  .stack_mem = CFG_APP_LORA_PROCESS_STACK_MEM,
+  .priority = CFG_APP_LORA_PROCESS_PRIORITY,
+  .stack_size = CFG_APP_LORA_PROCESS_STACk_SIZE
+};
+static void Thd_LoraSendProcess(void *argument);
+
+/* USER CODE BEGIN PV */
+/**
+  * @brief User application buffer
+  */
+static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+
+/**
+  * @brief User application data structure
+  */
+static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+
+/**
+  * @brief Specifies the state of the application LED
+  */
+static uint8_t AppLedStateOn = RESET;
+
 /**
   * @brief Timer to handle the application Tx Led to toggle
   */
@@ -213,21 +221,6 @@ static UTIL_TIMER_Object_t RxLedTimer;
   */
 static UTIL_TIMER_Object_t JoinLedTimer;
 
-osThreadId_t Thd_LoraSendProcessId;
-
-const osThreadAttr_t Thd_LoraSendProcess_attr = {
-    .name = CFG_APP_LORA_PROCESS_NAME,
-    .attr_bits = CFG_APP_LORA_PROCESS_ATTR_BITS,
-    .cb_mem = CFG_APP_LORA_PROCESS_CB_MEM,
-    .cb_size = CFG_APP_LORA_PROCESS_CB_SIZE,
-    .stack_mem = CFG_APP_LORA_PROCESS_STACK_MEM,
-    .priority = CFG_APP_LORA_PROCESS_PRIORITY,
-    .stack_size = CFG_APP_LORA_PROCESS_STACk_SIZE
-};
-static void Thd_LoraSendProcess(void *argument);
-
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Exported functions ---------------------------------------------------------*/
@@ -242,20 +235,10 @@ void LoRaWAN_Init(void)
 
   /* USER CODE BEGIN LoRaWAN_Init_1 */
 
-  /* USER CODE END LoRaWAN_Init_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Init(LED_BLUE);
   BSP_LED_Init(LED_GREEN);
   BSP_LED_Init(LED_RED);
   BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-  SYS_LED_Init(SYS_LED_RED);
-  SYS_PB_Init(SYS_BUTTON2, SYS_BUTTON_MODE_EXTI);
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
 
   /* Get CM4 LoRa APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
@@ -286,7 +269,6 @@ void LoRaWAN_Init(void)
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
           (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
-
   UTIL_TIMER_Create(&TxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerLedEvent, NULL);
   UTIL_TIMER_Create(&RxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnRxTimerLedEvent, NULL);
   UTIL_TIMER_Create(&JoinLedTimer, 0xFFFFFFFFU, UTIL_TIMER_PERIODIC, OnJoinTimerLedEvent, NULL);
@@ -294,14 +276,19 @@ void LoRaWAN_Init(void)
   UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
   UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
 
+  /* USER CODE END LoRaWAN_Init_1 */
+
   Thd_LoraSendProcessId = osThreadNew(Thd_LoraSendProcess, NULL, &Thd_LoraSendProcess_attr);
   /* Init the Lora Stack*/
   LmHandlerInit(&LmHandlerCallbacks);
 
   LmHandlerConfigure(&LmHandlerParams);
 
+  /* USER CODE BEGIN LoRaWAN_Init_2 */
   UTIL_TIMER_Start(&JoinLedTimer);
 
+  /* USER CODE END LoRaWAN_Init_2 */
+
   LmHandlerJoin(ActivationType);
 
   if (EventType == TX_ON_TIMER)
@@ -313,12 +300,11 @@ void LoRaWAN_Init(void)
   }
   else
   {
+    /* USER CODE BEGIN LoRaWAN_Init_3 */
+
     /* send every time button is pushed */
-#if defined(USE_BSP_DRIVER)
     BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_PB_Init(SYS_BUTTON1, SYS_BUTTON_MODE_EXTI);
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
+    /* USER CODE END LoRaWAN_Init_3 */
   }
 
   /* USER CODE BEGIN LoRaWAN_Init_Last */
@@ -326,77 +312,33 @@ void LoRaWAN_Init(void)
   /* USER CODE END LoRaWAN_Init_Last */
 }
 
-#if defined(USE_BSP_DRIVER)
-void BSP_PB_Callback(Button_TypeDef Button)
-{
-#warning: adapt stm32wlxx_it.c to call BSP_PB_IRQHandler if you want to use BSP
-  /* USER CODE BEGIN BSP_PB_Callback_1 */
-
-  /* USER CODE END BSP_PB_Callback_1 */
-  switch (Button)
-  {
-    case  BUTTON_SW1:
-      osThreadFlagsSet( Thd_LoraSendProcessId, 1 );
-      /* USER CODE BEGIN PB_Callback 1 */
-      /* USER CODE END PB_Callback 1 */
-      break;
-    case  BUTTON_SW2:
-      /* USER CODE BEGIN PB_Callback 2 */
-      /* USER CODE END PB_Callback 2 */
-      break;
-    case  BUTTON_SW3:
-      /* USER CODE BEGIN PB_Callback 3 */
-      /* USER CODE END PB_Callback 3 */
-      break;
-    default:
-      break;
-  }
-  /* USER CODE BEGIN BSP_PB_Callback_Last */
-
-  /* USER CODE END BSP_PB_Callback_Last */
-}
-
-#elif defined(MX_BOARD_PSEUDODRIVER)
-
-/* Note: Current MX does not support EXTI IP neither BSP. */
+/* USER CODE BEGIN PB_Callbacks */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
 /* In order to get a push button IRS by code automatically generated */
-/* this function is today the only available possibility. */
-/* Calling BSP_PB_Callback() from here it shortcuts the BSP. */
-/* If users wants to go through the BSP, it can remove BSP_PB_Callback() from here */
-/* and add a call to BSP_PB_IRQHandler() in the USER CODE SESSION of the */
-/* correspondent EXTIn_IRQHandler() in the stm32wlxx_it.c */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_1 */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_1 */
   switch (GPIO_Pin)
   {
-    case  SYS_BUTTON1_PIN:
-      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialised */
-      osThreadFlagsSet( Thd_LoraSendProcessId, 1 );
-      /* USER CODE BEGIN EXTI_Callback_Switch_B1 */
-      /* USER CODE END EXTI_Callback_Switch_B1 */
+    case  BUTTON_SW1_PIN:
+      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
+      osThreadFlagsSet(Thd_LoraSendProcessId, 1);
       break;
-    case  SYS_BUTTON2_PIN:
-      /* USER CODE BEGIN EXTI_Callback_Switch_B2 */
-      /* USER CODE END EXTI_Callback_Switch_B2 */
+    case  BUTTON_SW2_PIN:
+      break;
+    case  BUTTON_SW3_PIN:
       break;
-    /* USER CODE BEGIN EXTI_Callback_Switch_case */
-
-    /* USER CODE END EXTI_Callback_Switch_case */
     default:
-    /* USER CODE BEGIN EXTI_Callback_Switch_default */
-    /* USER CODE END EXTI_Callback_Switch_default */
       break;
   }
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_Last */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_Last */
 }
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER*/
+
+/* USER CODE END PB_Callbacks */
 
 /* Private functions ---------------------------------------------------------*/
 /* USER CODE BEGIN PrFD */
@@ -409,11 +351,12 @@ static void Thd_LoraSendProcess(void *argument)
 
   /* USER CODE END Thd_LoraSendProcess_1 */
   UNUSED(argument);
-  for(;;)
+  for (;;)
   {
-    osThreadFlagsWait( 1, osFlagsWaitAny, osWaitForever);
-    SendTxData( ); /*what you want to do*/
+    osThreadFlagsWait(1, osFlagsWaitAny, osWaitForever);
+    SendTxData();  /*what you want to do*/
   }
+
   /* USER CODE BEGIN Thd_LoraSendProcess_2 */
 
   /* USER CODE END Thd_LoraSendProcess_2 */
@@ -422,15 +365,10 @@ static void Thd_LoraSendProcess(void *argument)
 static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
 {
   /* USER CODE BEGIN OnRxData_1 */
-
-  /* USER CODE END OnRxData_1 */
-  if ((appData != NULL) && (params != NULL))
+  if ((appData != NULL) || (params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
     BSP_LED_On(LED_BLUE) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
+
     UTIL_TIMER_Start(&RxLedTimer);
 
     static const char *slotStrings[] = { "1", "2", "C", "C Multicast", "B Ping-Slot", "B Multicast Ping-Slot" };
@@ -473,42 +411,27 @@ static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
           if (AppLedStateOn == RESET)
           {
             APP_LOG(TS_OFF, VLEVEL_H,   "LED OFF\r\n");
-
-#if defined(USE_BSP_DRIVER)
             BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
           }
           else
           {
             APP_LOG(TS_OFF, VLEVEL_H, "LED ON\r\n");
-#if defined(USE_BSP_DRIVER)
             BSP_LED_On(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_On(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
           }
         }
         break;
-    /* USER CODE BEGIN OnRxData_Switch_case */
 
-    /* USER CODE END OnRxData_Switch_case */
       default:
-    /* USER CODE BEGIN OnRxData_Switch_default */
 
-    /* USER CODE END OnRxData_Switch_default */
         break;
     }
   }
-
-  /* USER CODE BEGIN OnRxData_2 */
-
-  /* USER CODE END OnRxData_2 */
+  /* USER CODE END OnRxData_1 */
 }
 
 static void SendTxData(void)
 {
+  /* USER CODE BEGIN SendTxData_1 */
   uint16_t pressure = 0;
   int16_t temperature = 0;
   sensor_t sensor_data;
@@ -523,9 +446,6 @@ static void SendTxData(void)
   int32_t longitude = 0;
   uint16_t altitudeGps = 0;
 #endif /* CAYENNE_LPP */
-  /* USER CODE BEGIN SendTxData_1 */
-
-  /* USER CODE END SendTxData_1 */
 
   EnvSensors_Read(&sensor_data);
   temperature = (SYS_GetTemperatureLevel() >> 8);
@@ -593,9 +513,8 @@ static void SendTxData(void)
   {
     APP_LOG(TS_ON, VLEVEL_L, "Next Tx in  : ~%d second(s)\r\n", (nextTxIn / 1000));
   }
-  /* USER CODE BEGIN SendTxData_2 */
 
-  /* USER CODE END SendTxData_2 */
+  /* USER CODE END SendTxData_1 */
 }
 
 static void OnTxTimerEvent(void *context)
@@ -603,7 +522,7 @@ static void OnTxTimerEvent(void *context)
   /* USER CODE BEGIN OnTxTimerEvent_1 */
 
   /* USER CODE END OnTxTimerEvent_1 */
-  osThreadFlagsSet( Thd_LoraSendProcessId, 1 );
+  osThreadFlagsSet(Thd_LoraSendProcessId, 1);
 
   /*Wait for next tx slot*/
   UTIL_TIMER_Start(&TxTimer);
@@ -612,101 +531,62 @@ static void OnTxTimerEvent(void *context)
   /* USER CODE END OnTxTimerEvent_2 */
 }
 
+/* USER CODE BEGIN PrFD_LedEvents */
 static void OnTxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnTxTimerLedEvent_1 */
-
-  /* USER CODE END OnTxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_GREEN) ;
-#else
-  SYS_LED_Off(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnTxTimerLedEvent_2 */
-
-  /* USER CODE END OnTxTimerLedEvent_2 */
 }
 
 static void OnRxTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnRxTimerLedEvent_1 */
-
-  /* USER CODE END OnRxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_BLUE) ;
-#else
-  SYS_LED_Off(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnRxTimerLedEvent_2 */
-
-  /* USER CODE END OnRxTimerLedEvent_2 */
 }
 
 static void OnJoinTimerLedEvent(void *context)
 {
-  /* USER CODE BEGIN OnJoinTimerLedEvent_1 */
-
-  /* USER CODE END OnJoinTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Toggle(LED_RED) ;
-#else
-  SYS_LED_Toggle(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnJoinTimerLedEvent_2 */
-
-  /* USER CODE END OnJoinTimerLedEvent_2 */
 }
 
+/* USER CODE END PrFD_LedEvents */
+
 static void OnTxData(LmHandlerTxParams_t *params)
 {
   /* USER CODE BEGIN OnTxData_1 */
-
-  /* USER CODE END OnTxData_1 */
-  if ((params != NULL) && (params->IsMcpsConfirm != 0))
+  if ((params != NULL))
   {
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_GREEN) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-    UTIL_TIMER_Start(&TxLedTimer);
-
-    APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
-    APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
-            params->AppData.Port, params->Datarate, params->TxPower);
-
-    APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
-    if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
-    {
-      APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
-    }
-    else
+    /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
+    if (params->IsMcpsConfirm != 0)
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
-    }
-  }
+      BSP_LED_On(LED_GREEN) ;
+      UTIL_TIMER_Start(&TxLedTimer);
 
-  /* USER CODE BEGIN OnTxData_2 */
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
+      APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
+              params->AppData.Port, params->Datarate, params->TxPower);
 
-  /* USER CODE END OnTxData_2 */
+      APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
+      if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
+      }
+    }
+  }
+  /* USER CODE END OnTxData_1 */
 }
 
 static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
 {
   /* USER CODE BEGIN OnJoinRequest_1 */
-
-  /* USER CODE END OnJoinRequest_1 */
   if (joinParams != NULL)
   {
     if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
     {
       UTIL_TIMER_Stop(&JoinLedTimer);
-
-#if defined(USE_BSP_DRIVER)
       BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-      SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
 
       APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOINED = ");
       if (joinParams->Mode == ACTIVATION_TYPE_ABP)
@@ -723,10 +603,7 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
       APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOIN FAILED\r\n");
     }
   }
-
-  /* USER CODE BEGIN OnJoinRequest_2 */
-
-  /* USER CODE END OnJoinRequest_2 */
+  /* USER CODE END OnJoinRequest_1 */
 }
 
 static void OnMacProcessNotify(void)
@@ -734,9 +611,6 @@ static void OnMacProcessNotify(void)
   /* USER CODE BEGIN OnMacProcessNotify_1 */
 
   /* USER CODE END OnMacProcessNotify_1 */
-  /* USER CODE BEGIN OnMacProcessNotify_2 */
-
-  /* USER CODE END OnMacProcessNotify_2 */
 }
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.h
index a48306a2..b7ac7358 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORA_APP_H__
@@ -114,8 +116,6 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Lora Application
-  * @param None
-  * @retval None
   */
 void LoRaWAN_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app_version.h
index b11647cf..a25c35b9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/lorawan_conf.h
index 1f6f2c02..b97a4240 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/lorawan_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/lorawan_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lorawan_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LORAWAN_CONF_H__
@@ -25,7 +27,6 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/systime.h
index f3ce93b2..1991b928 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/systime.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/systime.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    systime.h
@@ -16,8 +17,9 @@
   *
   ******************************************************************************
   */
-/* Define to prevent recursive inclusion -------------------------------------*/
+/* USER CODE END Header */
 
+/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTIME_H__
 #define __SYSTIME_H__
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.c
index 65512b2d..f8a2aa5b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -48,10 +50,15 @@
 #ifndef MAX
 #define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #endif /* MAX */
-#define MCPS_MLME_SIZE MAX(sizeof(McpsReq_t), sizeof(MlmeReq_t))
-#define MCPS_MLME_2_SIZE MAX(MCPS_MLME_SIZE, sizeof(MibRequestConfirm_t))
-#define LORA_MBWRAP_SHBUF_SIZE MAX(MCPS_MLME_2_SIZE, sizeof(McChannelParams_t))
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
+#define LMH_CONFIG_SIZE     (sizeof(LmHandlerParams_t))
+#define LMH_SEND_SIZE       (256 + sizeof(UTIL_TIMER_Time_t))
+#define LMH_GET_CLASS_SIZE  (sizeof(DeviceClass_t))
+#define LMH_EUI_SIZE        (SE_EUI_SIZE)
+#define LMH_KEY_SIZE        (SE_KEY_SIZE)
+#define LMH_REGION_SIZE     (sizeof(LoRaMacRegion_t))
+#define LMH_RX_PARAM_SIZE   (sizeof(RxChannelParams_t))
+#define LMH_BEACON_SIZE     (sizeof(BeaconState_t))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(MAX(MAX(LMH_CONFIG_SIZE, LMH_SEND_SIZE), MAX(LMH_GET_CLASS_SIZE, LMH_EUI_SIZE)), MAX(MAX(LMH_KEY_SIZE, LMH_REGION_SIZE), MAX(LMH_RX_PARAM_SIZE, LMH_BEACON_SIZE)))
 
 /* USER CODE BEGIN PD */
 
@@ -63,6 +70,14 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM4 to CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
 static LmHandlerCallbacks_t callback_mbwrapper;
 
 /* USER CODE BEGIN PV */
@@ -98,9 +113,14 @@ LmHandlerErrorStatus_t LmHandlerInit(LmHandlerCallbacks_t *handlerCallbacks)
 
   callback_mbwrapper.GetBatteryLevel = handlerCallbacks->GetBatteryLevel;
   callback_mbwrapper.GetTemperature = handlerCallbacks->GetTemperature;
+  callback_mbwrapper.OnNvmDataChange = handlerCallbacks->OnNvmDataChange;
+  callback_mbwrapper.OnNetworkParametersChange = handlerCallbacks->OnNetworkParametersChange;
   callback_mbwrapper.OnJoinRequest = handlerCallbacks->OnJoinRequest;
   callback_mbwrapper.OnTxData = handlerCallbacks->OnTxData;
   callback_mbwrapper.OnRxData = handlerCallbacks->OnRxData;
+  callback_mbwrapper.OnClassChange = handlerCallbacks->OnClassChange;
+  callback_mbwrapper.OnBeaconStatusChange = handlerCallbacks->OnBeaconStatusChange;
+  callback_mbwrapper.OnSysTimeUpdate = handlerCallbacks->OnSysTimeUpdate;
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_INITIALIZATION_ID;
@@ -230,6 +250,7 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   uint32_t *com_buffer ;
   uint16_t i = 0;
   uint32_t ret;
+  uint8_t next_addr = 0;
 
   if ((appData == NULL) || (appData->Buffer == NULL))
   {
@@ -237,11 +258,17 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  /* need to 8-align the next address */
-  uint8_t next_addr = (appData->BufferSize + 7) & ~7;
+  if (appData->BufferSize > 0)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
+    /* need to 8-align the next address */
+    next_addr = (appData->BufferSize + 7) & ~7;
+  }
 
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
-  UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
+  }
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SEND_ID;
@@ -250,14 +277,24 @@ LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTy
   com_buffer[i++] = (uint32_t) appData->BufferSize;
   com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
   com_buffer[i++] = (uint32_t) isTxConfirmed;
-  com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
+  if (nextTxIn == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
+  }
   com_buffer[i++] = (uint32_t) allowDelayedTx;
   com_obj->ParamCnt = i;
 
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
+  }
 
   ret = com_obj->ReturnVal;
   return (LmHandlerErrorStatus_t) ret;
@@ -311,7 +348,7 @@ LmHandlerErrorStatus_t LmHandlerRequestClass(DeviceClass_t newClass)
   /* USER CODE END LmHandlerRequestClass_2 */
 }
 
-int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
+LmHandlerErrorStatus_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
 {
   /* USER CODE BEGIN LmHandlerGetCurrentClass_1 */
 
@@ -341,13 +378,13 @@ int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
   UTIL_MEM_cpy_8(deviceClass, aLoraMbWrapShareBuffer, sizeof(DeviceClass_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetCurrentClass_2 */
 
   /* USER CODE END LmHandlerGetCurrentClass_2 */
 }
 
-int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
+LmHandlerErrorStatus_t LmHandlerGetDevEUI(uint8_t *devEUI)
 {
   /* USER CODE BEGIN LmHandlerGetDevEUI_1 */
 
@@ -363,7 +400,7 @@ int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_GET_DEVEUI_ID;
@@ -374,16 +411,16 @@ int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDevEUI_2 */
 
   /* USER CODE END LmHandlerGetDevEUI_2 */
 }
 
-int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
+LmHandlerErrorStatus_t LmHandlerSetDevEUI(uint8_t *devEUI)
 {
   /* USER CODE BEGIN LmHandlerSetDevEUI_1 */
 
@@ -399,7 +436,7 @@ int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SET_DEVEUI_ID;
@@ -410,16 +447,16 @@ int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDevEUI_2 */
 
   /* USER CODE END LmHandlerSetDevEUI_2 */
 }
 
-int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
+LmHandlerErrorStatus_t LmHandlerGetAppEUI(uint8_t *appEUI)
 {
   /* USER CODE BEGIN LmHandlerGetAppEUI_1 */
 
@@ -435,7 +472,7 @@ int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_GET_APPEUI_ID;
@@ -446,16 +483,16 @@ int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetAppEUI_2 */
 
   /* USER CODE END LmHandlerGetAppEUI_2 */
 }
 
-int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
+LmHandlerErrorStatus_t LmHandlerSetAppEUI(uint8_t *appEUI)
 {
   /* USER CODE BEGIN LmHandlerSetAppEUI_1 */
 
@@ -471,7 +508,7 @@ int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
   }
 
   /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, 8);
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, SE_EUI_SIZE);
 
   com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
   com_obj->MsgId = LMHANDLER_SET_APPEUI_ID;
@@ -482,16 +519,304 @@ int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
   MBMUXIF_LoraSendCmd();
   /* waiting for event */
   /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, 8);
+  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetAppEUI_2 */
 
   /* USER CODE END LmHandlerSetAppEUI_2 */
 }
 
-int32_t LmHandlerGetNetworkID(uint32_t *networkId)
+LmHandlerErrorStatus_t LmHandlerGetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNwkKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNwkKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppKey_1 */
+
+  /* USER CODE END LmHandlerGetAppKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppKey_2 */
+
+  /* USER CODE END LmHandlerGetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppKey_1 */
+
+  /* USER CODE END LmHandlerSetAppKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppKey_2 */
+
+  /* USER CODE END LmHandlerSetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppSKey_1 */
+
+  /* USER CODE END LmHandlerGetAppSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppSKey_2 */
+
+  /* USER CODE END LmHandlerGetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppSKey_1 */
+
+  /* USER CODE END LmHandlerSetAppSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppSKey_2 */
+
+  /* USER CODE END LmHandlerSetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNetworkID(uint32_t *networkId)
 {
   /* USER CODE BEGIN LmHandlerGetNetworkID_1 */
 
@@ -518,13 +843,13 @@ int32_t LmHandlerGetNetworkID(uint32_t *networkId)
   *networkId = (aLoraMbWrapShareBuffer[3] << 24) | (aLoraMbWrapShareBuffer[2] << 16) | (aLoraMbWrapShareBuffer[1] << 8) | aLoraMbWrapShareBuffer[0];
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetNetworkID_2 */
 
   /* USER CODE END LmHandlerGetNetworkID_2 */
 }
 
-int32_t LmHandlerSetNetworkID(uint32_t networkId)
+LmHandlerErrorStatus_t LmHandlerSetNetworkID(uint32_t networkId)
 {
   /* USER CODE BEGIN LmHandlerSetNetworkID_1 */
 
@@ -545,13 +870,13 @@ int32_t LmHandlerSetNetworkID(uint32_t networkId)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetNetworkID_2 */
 
   /* USER CODE END LmHandlerSetNetworkID_2 */
 }
 
-int32_t LmHandlerGetDevAddr(uint32_t *devAddr)
+LmHandlerErrorStatus_t LmHandlerGetDevAddr(uint32_t *devAddr)
 {
   /* USER CODE BEGIN LmHandlerGetDevAddr_1 */
 
@@ -581,13 +906,13 @@ int32_t LmHandlerGetDevAddr(uint32_t *devAddr)
   UTIL_MEM_cpy_8(devAddr, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDevAddr_2 */
 
   /* USER CODE END LmHandlerGetDevAddr_2 */
 }
 
-int32_t LmHandlerSetDevAddr(uint32_t devAddr)
+LmHandlerErrorStatus_t LmHandlerSetDevAddr(uint32_t devAddr)
 {
   /* USER CODE BEGIN LmHandlerSetDevAddr_1 */
 
@@ -608,13 +933,13 @@ int32_t LmHandlerSetDevAddr(uint32_t devAddr)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDevAddr_2 */
 
   /* USER CODE END LmHandlerSetDevAddr_2 */
 }
 
-int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
+LmHandlerErrorStatus_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
 {
   /* USER CODE BEGIN LmHandlerGetActiveRegion_1 */
 
@@ -644,13 +969,13 @@ int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
   UTIL_MEM_cpy_8(region, aLoraMbWrapShareBuffer, sizeof(LoRaMacRegion_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetActiveRegion_2 */
 
   /* USER CODE END LmHandlerGetActiveRegion_2 */
 }
 
-int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
+LmHandlerErrorStatus_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
 {
   /* USER CODE BEGIN LmHandlerSetActiveRegion_1 */
 
@@ -674,13 +999,13 @@ int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetActiveRegion_2 */
 
   /* USER CODE END LmHandlerSetActiveRegion_2 */
 }
 
-int32_t LmHandlerGetAdrEnable(bool *adrEnable)
+LmHandlerErrorStatus_t LmHandlerGetAdrEnable(bool *adrEnable)
 {
   /* USER CODE BEGIN LmHandlerGetAdrEnable_1 */
 
@@ -710,13 +1035,13 @@ int32_t LmHandlerGetAdrEnable(bool *adrEnable)
   UTIL_MEM_cpy_8(adrEnable, aLoraMbWrapShareBuffer, sizeof(bool));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetAdrEnable_2 */
 
   /* USER CODE END LmHandlerGetAdrEnable_2 */
 }
 
-int32_t LmHandlerSetAdrEnable(bool adrEnable)
+LmHandlerErrorStatus_t LmHandlerSetAdrEnable(bool adrEnable)
 {
   /* USER CODE BEGIN LmHandlerSetAdrEnable_1 */
 
@@ -737,13 +1062,13 @@ int32_t LmHandlerSetAdrEnable(bool adrEnable)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetAdrEnable_2 */
 
   /* USER CODE END LmHandlerSetAdrEnable_2 */
 }
 
-int32_t LmHandlerGetTxDatarate(int8_t *txDatarate)
+LmHandlerErrorStatus_t LmHandlerGetTxDatarate(int8_t *txDatarate)
 {
   /* USER CODE BEGIN LmHandlerGetTxDatarate_1 */
 
@@ -773,13 +1098,13 @@ int32_t LmHandlerGetTxDatarate(int8_t *txDatarate)
   UTIL_MEM_cpy_8(txDatarate, aLoraMbWrapShareBuffer, sizeof(int8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetTxDatarate_2 */
 
   /* USER CODE END LmHandlerGetTxDatarate_2 */
 }
 
-int32_t LmHandlerSetTxDatarate(int8_t txDatarate)
+LmHandlerErrorStatus_t LmHandlerSetTxDatarate(int8_t txDatarate)
 {
   /* USER CODE BEGIN LmHandlerSetTxDatarate_1 */
 
@@ -800,13 +1125,13 @@ int32_t LmHandlerSetTxDatarate(int8_t txDatarate)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetTxDatarate_2 */
 
   /* USER CODE END LmHandlerSetTxDatarate_2 */
 }
 
-int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
+LmHandlerErrorStatus_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
 {
   /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_1 */
 
@@ -836,13 +1161,13 @@ int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
   UTIL_MEM_cpy_8(dutyCycleEnable, aLoraMbWrapShareBuffer, sizeof(bool));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_2 */
 
   /* USER CODE END LmHandlerGetDutyCycleEnable_2 */
 }
 
-int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
+LmHandlerErrorStatus_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
 {
   /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_1 */
 
@@ -863,13 +1188,13 @@ int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_2 */
 
   /* USER CODE END LmHandlerSetDutyCycleEnable_2 */
 }
 
-int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
+LmHandlerErrorStatus_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
 {
   /* USER CODE BEGIN LmHandlerGetRX2Params_1 */
 
@@ -899,13 +1224,13 @@ int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
   UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRX2Params_2 */
 
   /* USER CODE END LmHandlerGetRX2Params_2 */
 }
 
-int32_t LmHandlerGetTxPower(int8_t *txPower)
+LmHandlerErrorStatus_t LmHandlerGetTxPower(int8_t *txPower)
 {
   /* USER CODE BEGIN LmHandlerGetTxPower_1 */
 
@@ -935,13 +1260,13 @@ int32_t LmHandlerGetTxPower(int8_t *txPower)
   UTIL_MEM_cpy_8(txPower, aLoraMbWrapShareBuffer, sizeof(int8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetTxPower_2 */
 
   /* USER CODE END LmHandlerGetTxPower_2 */
 }
 
-int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetRx1Delay_1 */
 
@@ -971,13 +1296,13 @@ int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRx1Delay_2 */
 
   /* USER CODE END LmHandlerGetRx1Delay_2 */
 }
 
-int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetRx2Delay_1 */
 
@@ -1007,13 +1332,13 @@ int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetRx2Delay_2 */
 
   /* USER CODE END LmHandlerGetRx2Delay_2 */
 }
 
-int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_1 */
 
@@ -1043,13 +1368,13 @@ int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_2 */
 
   /* USER CODE END LmHandlerGetJoinRx1Delay_2 */
 }
 
-int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
+LmHandlerErrorStatus_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
 {
   /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_1 */
 
@@ -1079,13 +1404,13 @@ int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
   UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_2 */
 
   /* USER CODE END LmHandlerGetJoinRx2Delay_2 */
 }
 
-int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
+LmHandlerErrorStatus_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
 {
   /* USER CODE BEGIN LmHandlerSetRX2Params_1 */
 
@@ -1115,13 +1440,13 @@ int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
   UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRX2Params_2 */
 
   /* USER CODE END LmHandlerSetRX2Params_2 */
 }
 
-int32_t LmHandlerSetTxPower(int8_t txPower)
+LmHandlerErrorStatus_t LmHandlerSetTxPower(int8_t txPower)
 {
   /* USER CODE BEGIN LmHandlerSetTxPower_1 */
 
@@ -1142,13 +1467,13 @@ int32_t LmHandlerSetTxPower(int8_t txPower)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetTxPower_2 */
 
   /* USER CODE END LmHandlerSetTxPower_2 */
 }
 
-int32_t LmHandlerSetRx1Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetRx1Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetRx1Delay_1 */
 
@@ -1169,13 +1494,13 @@ int32_t LmHandlerSetRx1Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRx1Delay_2 */
 
   /* USER CODE END LmHandlerSetRx1Delay_2 */
 }
 
-int32_t LmHandlerSetRx2Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetRx2Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetRx2Delay_1 */
 
@@ -1196,13 +1521,13 @@ int32_t LmHandlerSetRx2Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetRx2Delay_2 */
 
   /* USER CODE END LmHandlerSetRx2Delay_2 */
 }
 
-int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_1 */
 
@@ -1223,13 +1548,13 @@ int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_2 */
 
   /* USER CODE END LmHandlerSetJoinRx1Delay_2 */
 }
 
-int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
+LmHandlerErrorStatus_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
 {
   /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_1 */
 
@@ -1250,13 +1575,13 @@ int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_2 */
 
   /* USER CODE END LmHandlerSetJoinRx2Delay_2 */
 }
 
-int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
+LmHandlerErrorStatus_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
 {
   /* USER CODE BEGIN LmHandlerGetPingPeriodicity_1 */
 
@@ -1286,13 +1611,13 @@ int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
   UTIL_MEM_cpy_8(pingPeriodicity, aLoraMbWrapShareBuffer, sizeof(uint8_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetPingPeriodicity_2 */
 
   /* USER CODE END LmHandlerGetPingPeriodicity_2 */
 }
 
-int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
+LmHandlerErrorStatus_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
 {
   /* USER CODE BEGIN LmHandlerSetPingPeriodicity_1 */
 
@@ -1313,13 +1638,13 @@ int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
   /* once event is received and semaphore released: */
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerSetPingPeriodicity_2 */
 
   /* USER CODE END LmHandlerSetPingPeriodicity_2 */
 }
 
-int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
+LmHandlerErrorStatus_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
 {
   /* USER CODE BEGIN LmHandlerGetBeaconState_1 */
 
@@ -1349,12 +1674,56 @@ int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
   UTIL_MEM_cpy_8(beaconState, aLoraMbWrapShareBuffer, sizeof(BeaconState_t));
 
   ret = com_obj->ReturnVal;
-  return (int32_t) ret;
+  return (LmHandlerErrorStatus_t) ret;
   /* USER CODE BEGIN LmHandlerGetBeaconState_2 */
 
   /* USER CODE END LmHandlerGetBeaconState_2 */
 }
 
+LmHandlerErrorStatus_t LmHandlerLinkCheckReq(void)
+{
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_1 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_LINK_CHECK_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_2 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerDeviceTimeReq(void)
+{
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_1 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_DEVICE_TIME_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_2 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_2 */
+}
+
 void LoraInfo_Init(void)
 {
   /* USER CODE BEGIN LoraInfo_Init_1 */
@@ -1389,18 +1758,13 @@ LoraInfo_t *LoraInfo_GetPtr(void)
   /* USER CODE END LoraInfo_GetPtr_2 */
 }
 
-/**
-  * @brief This function processes the callbacks and primitives from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Lora_Notif_1 */
 
   /* USER CODE END Process_Lora_Notif_1 */
   uint32_t *com_buffer = ComObj->ParamBuf;
-  uint32_t    cb_ret;
+  uint32_t cb_ret = 0;
 
   /* Lora Notif received */
   APP_LOG(TS_ON, VLEVEL_H, "CM4<(LoRa)\r\n");
@@ -1416,7 +1780,7 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -1430,13 +1794,33 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal =  cb_ret; /* */
       break;
 
+    case LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNvmDataChange != NULL)
+      {
+        callback_mbwrapper.OnNvmDataChange((LmHandlerNvmContextStates_t) com_buffer[0], (uint16_t) com_buffer[1]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNetworkParametersChange != NULL)
+      {
+        callback_mbwrapper.OnNetworkParametersChange((CommissioningParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
     case LMHANDLER_ON_JOIN_REQ_CB_ID:
       if (callback_mbwrapper.OnJoinRequest != NULL)
       {
@@ -1466,6 +1850,36 @@ void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal =  0; /* */
       break;
+
+    case LMHANDLER_ON_CLASS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnClassChange != NULL)
+      {
+        callback_mbwrapper.OnClassChange((DeviceClass_t) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnBeaconStatusChange != NULL)
+      {
+        callback_mbwrapper.OnBeaconStatusChange((LmHandlerBeaconParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID:
+      if (callback_mbwrapper.OnSysTimeUpdate != NULL)
+      {
+        callback_mbwrapper.OnSysTimeUpdate();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
     default:
       break;
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.h
index 82ac862c..1218ce87 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    LmHandler_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LMHANDLER_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM0+
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Lora_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.c
index 76152897..8328a537 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -58,11 +61,44 @@ static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -70,11 +106,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -107,11 +138,6 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief The application informs MBMUX about the CM0PLUS supported feature list
-  * @param p_CM0PLUS_FeatureList  pointer to the list of CM0PLUS features
-  * @retval  none
-  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
 {
   /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
@@ -123,15 +149,6 @@ void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
   /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval   channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
 {
   int8_t check_if_feature_provided_by_cm0plus = 0;
@@ -203,13 +220,6 @@ int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -235,9 +245,9 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
     }
     else
     {
-      /* Make sure to clear pending IRQ Notification before unregistering the callback */
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
       /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
-      /* if the mask is removed by anyone, the unwhished IRQ is generated if SR isn't cleaned */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
       IPCC_IF_AcknowledgeSnd(mb_ch);
 
       p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
@@ -254,12 +264,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the MailBox com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -286,11 +290,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Cmd to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_CommandSnd_1 */
@@ -309,11 +308,6 @@ int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_CommandSnd_Last */
 }
 
-/**
-  * @brief Send ack to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
@@ -333,12 +327,6 @@ uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Check if the FEATURE is in the CM0 table and return it's position
-  * @param e_featID  identifier of the feature
-  * @retval 0 not present, 1 present
-  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
 {
   int8_t ret = 0;
@@ -370,11 +358,6 @@ static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_feat
   return ret;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
@@ -390,11 +373,6 @@ static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
@@ -410,11 +388,6 @@ static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Find the first channel not yet associated to a feature (available)
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means no channel available
-  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
@@ -475,12 +448,6 @@ static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
   /* USER CODE END MBMUX_FindChStillUnregistered_Last */
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -492,17 +459,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.h
index fd31da65..a15773f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM4_H__
@@ -52,23 +54,60 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
-                             void (*MsgCm4Cb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
-
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_kms.c
deleted file mode 100644
index f0fb0bd1..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmuxif_sys.h"
-#include "stm32_mem.h"
-#include "cmsis_os.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aKmsCmdRespBuff[MAX_PARAM_OF_KMS_CMD_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj);
-
-static osSemaphoreId_t Sem_MbKmsRespRcv;
-
-osThreadId_t Thd_KmsNotifRcvProcessId;
-
-const osThreadAttr_t Thd_KmsNotifRcvProcess_attr =
-{
-  .name = CFG_MB_KMS_PROCESS_NAME,
-  .attr_bits = CFG_MB_KMS_PROCESS_ATTR_BITS,
-  .cb_mem = CFG_MB_KMS_PROCESS_CB_MEM,
-  .cb_size = CFG_MB_KMS_PROCESS_CB_SIZE,
-  .stack_mem = CFG_MB_KMS_PROCESS_STACK_MEM,
-  .priority = CFG_MB_KMS_PROCESS_PRIORITY,
-  .stack_size = CFG_MB_KMS_PROCESS_STACk_SIZE
-};
-static void Thd_KmsNotifRcvProcess(void *argument);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers KMS feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeature(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsRespRcvCb, aKmsCmdRespBuff, sizeof(aKmsCmdRespBuff));
-  if (ret >= 0)
-  {
-    /* Note: Kms uses only NOTIF_ACK channel, the SEQ_TASK only on CM0PLUS */
-
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_KMS_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Kms feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void)
-{
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP);
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  if (com_param_ptr == NULL)
-  {
-    Error_Handler(); /* ErrorHandler() : feature isn't registered */
-  }
-
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-  return com_param_ptr;
-}
-
-/**
-  * @brief Sends a Kms-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendCmd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_1 */
-  if (MBMUX_CommandSnd(FEAT_INFO_KMS_ID) == 0)
-  {
-    osSemaphoreAcquire(Sem_MbKmsRespRcv, osWaitForever);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS response callbacks: set event to release waiting task
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_1 */
-  osSemaphoreRelease(Sem_MbKmsRespRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_kms.h
deleted file mode 100644
index cfc715c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM4_H__
-#define __MBMUXIF_KMS_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void);
-void MBMUXIF_KmsSendCmd(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.c
index e4fccdf8..d4a62232 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle LoraWAN via MBMUX
+  * @brief   allows CM4 application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -56,7 +58,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *LoraComObj;
 
+/**
+  * @brief LoRa cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraCmdRespBuff[MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief LoRa notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -64,8 +73,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LOR
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
 static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the notification
+  */
 static void MBMUXIF_TaskLoraNotifRcv(void);
 
 static osSemaphoreId_t Sem_MbLoRaRespRcv;
@@ -88,16 +110,6 @@ static void Thd_LoraNotifRcvProcess(void *argument);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers LORA feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_LoraInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_system_info;
@@ -145,11 +157,6 @@ int8_t MBMUXIF_LoraInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Lora feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_1 */
@@ -158,7 +165,7 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_Last */
@@ -166,11 +173,6 @@ MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Lora-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendCmd_1 */
@@ -189,11 +191,6 @@ void MBMUXIF_LoraSendCmd(void)
   /* USER CODE END MBMUXIF_LoraSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Lora-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_LoraSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_LoraSendAck_1 */
@@ -213,11 +210,6 @@ void MBMUXIF_LoraSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  LORA response callbacks: set event to release waiting task
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_1 */
@@ -229,11 +221,6 @@ static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_Last */
 }
 
-/**
-  * @brief  LORA notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_1 */
@@ -246,11 +233,6 @@ static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_Last */
 }
 
-/**
-  * @brief  LORA task to process the notification
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskLoraNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.h
index c7911ad1..ff6c5791 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_lora.h
   * @author  MCD Application Team
-  * @brief   API provided to CM4 applic to register and handle LoraWAN via MBMUX
+  * @brief   API provided to CM4 application to register and handle LoraWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_LORA_CM4_H__
@@ -52,9 +54,30 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_LoraSendCmd(void);
+
+/**
+  * @brief   Sends a Lora-Ack via Ipcc without waiting for the ack
+  */
 void MBMUXIF_LoraSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.c
index bc9d9488..36c18094 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -55,7 +57,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *RadioComObj;
 
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -63,8 +72,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RA
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
 static void MBMUXIF_TaskRadioNotifRcv(void);
 
 static osSemaphoreId_t Sem_MbRadioRespRcv;
@@ -88,16 +110,6 @@ static void Thd_RadioNotifRcvProcess(void *argument);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers RADIO feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
@@ -142,11 +154,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
@@ -155,7 +162,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
@@ -163,11 +170,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
@@ -186,11 +188,6 @@ void MBMUXIF_RadioSendCmd(void)
   /* USER CODE END MBMUXIF_RadioSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Radio-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
@@ -210,11 +207,6 @@ void MBMUXIF_RadioSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO response callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
@@ -226,11 +218,6 @@ static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
@@ -243,11 +230,6 @@ static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the notification
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.h
index 1f4c2454..3d565fcd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM4_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_RadioSendAck(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.c
index e33e7da0..a12abca3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -53,10 +55,10 @@
 
 /* Private variables ---------------------------------------------------------*/
 static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
-static __IO uint8_t AllowSeqencerForSysCmd = 0;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
 static __IO uint8_t MbSystemRespRcvFlag;
 
-UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(4) ;
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
 
 MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
 MBMUX_ComParam_t *SystemComObj;
@@ -64,11 +66,9 @@ MBMUX_ComParam_t *SystemComObj;
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
 
 static osSemaphoreId_t Sem_MbSystemRespRcv;
 
@@ -91,12 +91,45 @@ static void Thd_SysNotifRcvProcess(void *argument);
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
 static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -104,47 +137,54 @@ static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
 
   /* USER CODE END MBMUXIF_SystemInit_1 */
 
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
   /* Get the Dual boot configuration status */
   HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
 
   if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
   {
-    APP_PPRINTF("\r\n WARNING: There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n",  (uint32_t) pMb_RefTable);
-    APP_PPRINTF(" and the address calculated according to the IPCCDBA option byte: 0x%X \r\n", OptionsBytesStruct.IPCCdataBufAddr);
-    APP_PPRINTF(" The execution enters now in a while(1){}  \r\n");
-    APP_PPRINTF(" please check the CM4\\MbMux\\mbmuxif_sys.c or update the scatter file \r\n\r\n");
-
-    /* USER CODE BEGIN MBMUXIF_SystemInit_Prevent_OB_Programming */
-      /* If you are sure you need to reprogram the IPCCDBA set #if to 0 (to avoid while(1){}) */
-      /* Please first check the  CM4 scatter file.*/
-      /* Make sure that the MAPPING_TABLE is placed in SRAM2 (memory with retention) */
-      /* Examples of scatter files available in the LoraWAN and Sigfox DualCore Applications pack*/
-      /* */
-      /* After HAL_FLASH_OB_Launch you will have to unplug and plug the board from power after this operation.*/
-      /* Additionally possible Issue under investigation, i.e.: */
-      /* In some cases happen that unplugging the chip power is not sufficient */
-      /* if so you need to reboot from RAM putting the BOOT0 pin to 3v3 */
-      /* attach with Cube Programmer and full erase the chip memory. */
-      /* */
-      /* PS: of course if you are attached with the debugger, it will not respond anymore after HAL_FLASH_OB_Launch*/
-#if 1
-    /* USER CODE END MBMUXIF_SystemInit_Prevent_OB_Programming */
-    while(1){}
-#else
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
 
     /* write FLASH->IPCCBR option byte */
     /* Unlock the Flash to enable the flash control register access *************/
@@ -156,7 +196,7 @@ int8_t MBMUXIF_SystemInit(void)
     HAL_FLASH_OB_Unlock();
 
     /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
-    OptionsBytesStruct.OptionType  = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
     OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
 
     if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
@@ -186,12 +226,10 @@ int8_t MBMUXIF_SystemInit(void)
     (void) HAL_FLASH_OB_Lock();
     /* Lock the Flash to disable the flash control register access  *********/
     (void) HAL_FLASH_Lock();
-#endif
   }
   Sem_MbSystemRespRcv = osSemaphoreNew(1, 0, NULL);   /*< Create the semaphore and make it busy at initialization */
 
-  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
-
+  /* Init MailBoxMultiplexer */
   MBMUX_Init(pMb_RefTable);
 
   ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
@@ -204,16 +242,13 @@ int8_t MBMUXIF_SystemInit(void)
     ret = 0;
     Thd_SysNotifRcvProcessId = osThreadNew(Thd_SysNotifRcvProcess, NULL, &Thd_SysNotifRcvProcess_attr);
   }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
 
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
   /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
   /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-#else
-#warning "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_ON */
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
 
@@ -221,14 +256,9 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
-  int8_t ret=0;
+  int8_t ret = 0;
 
   /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
 
@@ -277,14 +307,6 @@ int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
   return ret;
 }
 
-/**
-  * @brief Set synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
 {
   pMb_RefTable->SynchronizeCpusAtBoot = flag;
@@ -293,26 +315,16 @@ void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
   /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
 }
 
-/**
-  * @brief gives green light to Cm0 to Initialised MBMUX on its side
-  * @param none
-  * @retval  none
-  */
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void)
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
 {
   while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
   {
   }
-  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
 
-  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
@@ -321,30 +333,19 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPr
   /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
 }
 
-/**
-  * @brief To allow SystemCmd to use the sequencer (hence entering in low power)
-  * @note  For compatib with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The applic can call this API at the end of the Init
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void)
 {
-  AllowSeqencerForSysCmd = 1;
+  AllowSequencerForSysCmd = 1;
   /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
 
   /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
 }
 
-/**
-  * @brief Sends a System-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
@@ -357,7 +358,7 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
     MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
     if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
     {
-      if (AllowSeqencerForSysCmd)
+      if (AllowSequencerForSysCmd)
       {
         osSemaphoreAcquire(Sem_MbSystemRespRcv, osWaitForever);
       }
@@ -374,20 +375,15 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
 
-  /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
 
   /* USER CODE END MBMUXIF_SystemSendCmd_Last */
 }
 
-/**
-  * @brief Sends a System-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
@@ -402,17 +398,11 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendAck_Last */
 }
 
-/* USER CODE BEGIN ExpoF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExpoF */
+/* USER CODE END EF */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief   Gets the pointer to CM0PLUS capabilities info table
-  * @param   none
-  * @retval  pointer to CM0PLUS capabilities info table
-  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
 {
   MBMUX_ComParam_t *com_obj;
@@ -439,14 +429,9 @@ FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
   return (FEAT_INFO_List_t *) ret;   /* need to verify */
 }
 
-/**
-  * @brief returns the pointer to the Capability Info table of a given feature
-  * @param e_featID ID of the feature from which retrieve the ptr
-  * @retval  LoRaMacInfoTable pointer
-  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
 {
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list = NULL;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
   FEAT_INFO_Param_t  *p_feature = NULL;
   uint8_t i;
   uint8_t cm0plus_nr_of_supported_features;
@@ -456,15 +441,15 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
 
   /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
 
-  if (p_cm0plus_supprted_features_list != NULL)
+  if (p_cm0plus_supported_features_list != NULL)
   {
-    cm0plus_nr_of_supported_features = p_cm0plus_supprted_features_list->Feat_Info_Cnt;
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
 
     for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
     {
-      p_feature = i + p_cm0plus_supprted_features_list->Feat_Info_TableAddress;
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
       if (p_feature->Feat_Info_Feature_Id == e_featID)
       {
         found = 1;
@@ -484,12 +469,6 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
   return  p_feature;
 }
 
-/**
-  * @brief Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @retval   0 ok, else error code
-  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 {
   MBMUX_ComParam_t *com_obj;
@@ -524,11 +503,6 @@ int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM response callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
@@ -537,7 +511,7 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 
   /* During "SystemInit sequence" Flag is used instead of Sequencer */
   MbSystemRespRcvFlag = 1;
-  if (AllowSeqencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
   {
     osSemaphoreRelease(Sem_MbSystemRespRcv);
   }
@@ -546,11 +520,6 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
@@ -579,11 +548,6 @@ static void Thd_SysNotifRcvProcess(void *argument)
   /* USER CODE END Thd_SysNotifRcvProcess_Last */
 }
 
-/**
-  * @brief  SYSTEM task to process the notification
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
@@ -595,11 +559,6 @@ static void MBMUXIF_TaskSystemNotifRcv(void)
   /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
@@ -607,11 +566,6 @@ static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
@@ -625,11 +579,6 @@ static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
@@ -637,11 +586,6 @@ static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.h
index 8697022c..90e2ce4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM4_H__
@@ -100,13 +102,56 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -114,8 +159,24 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.c
index b42f9402..c91551a5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to receive by CM0 TRACE via MBMUX
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -46,25 +48,26 @@
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
-
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
 /* USER CODE BEGIN PM */
 
 /* USER CODE END PM */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_TraceInit(void)
 {
   int8_t ret;
@@ -90,23 +93,18 @@ int8_t MBMUXIF_TraceInit(void)
   return ret;
 }
 
-/**
-  * @brief Sends a Trace-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendAck(void)
 {
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
 
-/* USER CODE END MBMUXIF_TraceSendAck_1 */
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
   if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
   {
     Error_Handler();
   }
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
 
-/* USER CODE END MBMUXIF_TraceSendAck_Last */
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
 }
 
 /* USER CODE BEGIN EFD */
@@ -114,16 +112,11 @@ void MBMUXIF_TraceSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 {
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
   MBMUX_ComParam_t *TraceComObj;
   uint32_t  notif_ack_id;
   uint8_t *buffer;
@@ -151,9 +144,9 @@ static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 
   /* Send ack */
   MBMUXIF_TraceSendAck();
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
 }
 
 /* USER CODE BEGIN PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.h
index 7a8d3fa7..f98a156d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle TRACE via MBMUX
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM4_H__
@@ -52,7 +54,15 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.c
index 1326f87b..fd0e305e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "radio_mbwrapper.h"
@@ -72,38 +75,38 @@ static void RadioIrqProcess(void);
 /*!
  * \brief Initializes the radio
  *
- * \param [IN] events Structure containing the driver callback functions
+ * \param[in] events Structure containing the driver callback functions
  */
 static void RadioInit(RadioEvents_t *events);
 
 /*!
  * Return current radio status
  *
- * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
  */
 static RadioState_t RadioGetStatus(void);
 
 /*!
  * \brief Configures the radio with the given modem
  *
- * \param [IN] modem Modem to be used [0: FSK, 1: LoRa]
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
  */
 static void RadioSetModem(RadioModems_t modem);
 
 /*!
  * \brief Sets the channel frequency
  *
- * \param [IN] freq         Channel RF frequency
+ * \param[in] freq Channel RF frequency
  */
 static void RadioSetChannel(uint32_t freq);
 
 /*!
   * \brief Checks if the channel is free for the given time
   *
-  * \param [IN] freq                Channel RF frequency in Hertz
-  * \param [IN] rxBandwidth         Rx bandwidth in Hertz
-  * \param [IN] rssiThresh          RSSI threshold in dBm
-  * \param [IN] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
   *
   * \retval isFree         [true: Channel is free, false: Channel is not free]
   */
@@ -125,40 +128,40 @@ static uint32_t RadioRandom(void);
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: N/A ( set to 0 )
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [false: single mode, true: continuous mode]
  */
 static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
@@ -172,37 +175,37 @@ static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] fdev         Sets the frequency deviation (FSK only)
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
  *                          FSK : [Hz]
  *                          LoRa: 0
- * \param [IN] bandwidth    Sets the bandwidth (LoRa only)
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
  *                          FSK : 0
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the preamble length
+ * \param[in] preambleLen  Sets the preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] crcOn        Enables disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] timeout      Transmission timeout [ms]
  */
 static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
                              uint32_t bandwidth, uint32_t datarate,
@@ -213,7 +216,7 @@ static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
 /*!
  * \brief Checks if the given RF frequency is supported by the hardware
  *
- * \param [IN] frequency RF frequency to be checked
+ * \param[in] frequency RF frequency to be checked
  * \retval isSupported [true: supported, false: unsupported]
  */
 static bool RadioCheckRfFrequency(uint32_t frequency);
@@ -221,26 +224,26 @@ static bool RadioCheckRfFrequency(uint32_t frequency);
 /*!
  * \brief Computes the packet time on air in ms for the given payload
  *
- * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] spreadingFactor  Sets the Spreading Factor
+ * \param[in] spreadingFactor  Sets the Spreading Factor
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
  *
  * \retval airTime        Computed airTime (ms) for the given packet payload length
  */
@@ -253,8 +256,8 @@ static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
  * \brief Sends the buffer of size. Prepares the packet to be sent and sets
  *        the radio in transmission
  *
- * \param [IN]: buffer     Buffer pointer
- * \param [IN]: size       Buffer size
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
  */
 static void RadioSend(uint8_t *buffer, uint8_t size);
 
@@ -270,7 +273,7 @@ static void RadioStandby(void);
 
 /*!
  * \brief Sets the radio in reception mode for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRx(uint32_t timeout);
@@ -283,15 +286,17 @@ static void RadioStartCad(void);
 /*!
  * \brief Sets the radio in continuous wave transmission mode
  *
- * \param [IN]: freq       Channel RF frequency
- * \param [IN]: power      Sets the output power [dBm]
- * \param [IN]: time       Transmission mode timeout [s]
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
  */
 static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
 
 /*!
  * \brief Reads the current RSSI value
  *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
  * \retval rssiValue Current RSSI value in [dBm]
  */
 static int16_t RadioRssi(RadioModems_t modem);
@@ -299,15 +304,15 @@ static int16_t RadioRssi(RadioModems_t modem);
 /*!
  * \brief Writes the radio register at the specified address
  *
- * \param [IN]: addr Register address
- * \param [IN]: data New register value
+ * \param[in] addr Register address
+ * \param[in] data New register value
  */
 static void RadioWrite(uint16_t addr, uint8_t data);
 
 /*!
  * \brief Reads the radio register at the specified address
  *
- * \param [IN]: addr Register address
+ * \param[in] addr Register address
  * \retval data Register value
  */
 static uint8_t RadioRead(uint16_t addr);
@@ -315,26 +320,26 @@ static uint8_t RadioRead(uint16_t addr);
 /*!
  * \brief Writes multiple radio registers starting at address
  *
- * \param [IN] addr   First Radio register address
- * \param [IN] buffer Buffer containing the new register's values
- * \param [IN] size   Number of registers to be written
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
  */
 static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Reads multiple radio registers starting at address
  *
- * \param [IN] addr First Radio register address
- * \param [OUT] buffer Buffer where to copy the registers data
- * \param [IN] size Number of registers to be read
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
  */
 static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Sets the maximum payload length.
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] max        Maximum payload length in bytes
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
  */
 static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
 
@@ -343,7 +348,7 @@ static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
  *
  * \remark Applies to LoRa modem only
  *
- * \param [IN] enable if true, it enables a public network
+ * \param[in] enable if true, it enables a public network
  */
 static void RadioSetPublicNetwork(bool enable);
 
@@ -356,7 +361,7 @@ static uint32_t RadioGetWakeUpTime(void);
 
 /*!
  * \brief Sets the radio in reception mode with Max LNA gain for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRxBoosted(uint32_t timeout);
@@ -364,51 +369,49 @@ static void RadioRxBoosted(uint32_t timeout);
 /*!
  * \brief Sets the Rx duty cycle management parameters
  *
- * \param [in]  rxTime        Structure describing reception timeout value
- * \param [in]  sleepTime     Structure describing sleep timeout value
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
  */
 static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
 
 /*!
  * \brief Set Tx PRBS modulated wave
- * \retval none
  */
 static void RadioTxPrbs(void);
 
 /*!
  * \brief Set Tx continuous wave
- * \param [in]  power  Tx power level [0..15]
- * \retval none
+ * \param[in]  power  Tx power level [0..15]
  */
 static void RadioTxCw(int8_t power);
 
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [0: single mode, otherwise continuous mode]
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
  * \return 0 when no parameters error, -1 otherwise
  */
-static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t* config,
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
                                        uint32_t rxContinuous, uint32_t symbTimeout);
 
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
                             bpsk field to be used if modem =GENERIC_BPSK
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
  * \return 0 when no parameters error, -1 otherwise
  */
 static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
@@ -461,11 +464,6 @@ const struct Radio_s Radio =
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief This function processes the radio events callbacks  from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Radio_Notif_1 */
@@ -486,7 +484,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -500,7 +498,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -564,7 +562,7 @@ static void RadioInit(RadioEvents_t *events)
 
   if (events == NULL)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   radioevents_wrap.TxDone = events->TxDone;
@@ -590,7 +588,7 @@ static void RadioInit(RadioEvents_t *events)
 /*!
   * Return current radio status
   *
-  * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
   */
 static RadioState_t RadioGetStatus(void)
 {
@@ -999,7 +997,7 @@ static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
   uint16_t i = 0;
 
   com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_CONTINOUS_WAVE_ID;
+  com_obj->MsgId = RADIO_SET_TX_CONTINUOUS_WAVE_ID;
   com_buffer = com_obj->ParamBuf;
   com_buffer[i++] = (uint32_t) freq;
   com_buffer[i++] = (uint32_t) power;
@@ -1424,10 +1422,4 @@ static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t
 
 /* USER CODE END PrFD */
 
-/**
-  * @}
-  *
-  */
-
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.h
index f73a1283..e7eebe2c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/board_resources.h
deleted file mode 100644
index 8cf7f3ed..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/board_resources.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON1_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON3_EXTI_IRQn              EXTI15_4_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/stm32wlxx_nucleo_conf.h
index 0390fb82..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     10U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/features_info.h
index f03a3e85..692c3088 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/features_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/features_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTEM_INFO_H
@@ -36,7 +38,7 @@ extern "C" {
 /**
   * @brief Feature enumeration
   * @note This is the list of all available feature so far,
-          the one available in a fiven build are listed in the Feat_Info_Table[]
+          the one available in a given build are listed in the Feat_Info_Table[]
           to keep compatibility, in order to add a feature
           use a new value to the bottom without changing the existing order
   */
@@ -115,7 +117,6 @@ typedef struct
 /* Exported functions ------------------------------------------------------- */
 /**
   * @brief  Init configuration params by calling specific feature xxx_info.c
-  * @return void
   */
 void FEAT_INFO_Init(void);
 /**
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/lora_info.h
index 92abccde..0608fd34 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/lora_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/lora_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    lora_info.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #ifndef __LORA_INFO_H__
 #define __LORA_INFO_H__
 
@@ -68,15 +71,12 @@ typedef struct
 
 /* Exported functions ------------------------------------------------------- */
 /**
-  * @brief initialises the LoraInfo table
-  * @param none
-  * @retval  none
+  * @brief initialize the LoraInfo table
   */
 void LoraInfo_Init(void);
 
 /**
   * @brief returns the pointer to the LoraInfo capabilities table
-  * @param none
   * @retval LoraInfo pointer
   */
 LoraInfo_t *LoraInfo_GetPtr(void);
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/mbmux_table.h
index 2874d9de..84cb7539 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/mbmux_table.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/mbmux_table.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux_table.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_TABLE_H__
@@ -48,12 +50,14 @@ typedef enum
   MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
 } MBMUX_ComType_t;
 
+/* Shared memory tables */
+
 typedef struct
 {
   uint32_t MsgId;
   void (*MsgCm4Cb)(void *ComObj);
-  void (*MsgCm0plusCb)(void *ComObj);
-  uint16_t BufSize;      /*!<  size of the array given by the applic */
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
   uint16_t ParamCnt;     /*!<  nr of words composing the message */
   uint32_t *ParamBuf;
   uint32_t ReturnVal;    /*!<  only used in RX */
@@ -66,7 +70,19 @@ typedef struct
   uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
   __IO uint16_t           SynchronizeCpusAtBoot;
   uint16_t                ChipRevId;
-} MBMUX_ComTable_t;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
 
 /* USER CODE BEGIN ET */
 
@@ -87,3 +103,5 @@ typedef struct
 #endif
 
 #endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/msg_id.h
index 74a0a3cc..b1050113 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/msg_id.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/msg_id.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    msg_id.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MSG_ID_H__
@@ -62,6 +64,14 @@ typedef enum
   LMHANDLER_SET_DEVEUI_ID,
   LMHANDLER_GET_APPEUI_ID,
   LMHANDLER_SET_APPEUI_ID,
+  LMHANDLER_GET_NWKKEY_ID,
+  LMHANDLER_SET_NWKKEY_ID,
+  LMHANDLER_GET_APPKEY_ID,
+  LMHANDLER_SET_APPKEY_ID,
+  LMHANDLER_GET_NWKSKEY_ID,
+  LMHANDLER_SET_NWKSKEY_ID,
+  LMHANDLER_GET_APPSKEY_ID,
+  LMHANDLER_SET_APPSKEY_ID,
   LMHANDLER_GET_NWKID_ID,
   LMHANDLER_SET_NWKID_ID,
   LMHANDLER_GET_DEVADDR_ID,
@@ -89,14 +99,21 @@ typedef enum
   LMHANDLER_GET_PING_PERIODICITY_ID,
   LMHANDLER_SET_PING_PERIODICITY_ID,
   LMHANDLER_GET_BEACON_STATE_ID,
+  LMHANDLER_LINK_CHECK_REQ_ID,
+  LMHANDLER_DEVICE_TIME_REQ_ID,
 
   LMHANDLER_INFO_INIT_ID,
   /* NotifAck */
   LMHANDLER_GET_BATTERY_LEVEL_CB_ID,
   LMHANDLER_GET_TEMPERATURE_CB_ID,
+  LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID,
+  LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID,
   LMHANDLER_ON_JOIN_REQ_CB_ID,
   LMHANDLER_ON_TX_DATA_CB_ID,
   LMHANDLER_ON_RX_DATA_CB_ID,
+  LMHANDLER_ON_CLASS_CHANGE_CB_ID,
+  LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID,
+  LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID,
   LMHANDLER_ON_MAC_PROCESS_CB_ID,
   /* USER CODE BEGIN LORA_MsgIdTypeDef */
 
@@ -122,7 +139,7 @@ typedef enum
   RADIO_STANDBY_ID,
   RADIO_RX_ID,
   RADIO_START_CAD_ID,
-  RADIO_SET_TX_CONTINOUS_WAVE_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
   RADIO_RSSI_ID,
   RADIO_WRITE_ID,
   RADIO_READ_ID,
@@ -216,3 +233,5 @@ typedef enum
 #endif
 
 #endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.c
index 807e1bb4..d01a65d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.c
@@ -41,9 +41,6 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
-#define DBGMCU_LPM   0   /* if 1 enables/disables the Debug Module during LowPower modes */
-                         /* if 0 it does not modify the DBGMCU_CR_DBG registers */
-                         /* in DualCore few issues are under investigation when 1 */
 
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
@@ -62,12 +59,90 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
   GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
@@ -75,57 +150,49 @@ void DBG_Init(void)
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  /* make sure a pin is not used simultaneusly by the two cores */
-  /* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
 #if defined(CORE_CM4)
 
   /* Enable the GPIO_LINES Clock */
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
 
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+#else /* CORE_CM0PLUS */
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-#if defined (DBGMCU_LPM) && ( DBGMCU_LPM == 1 )
-  /* careful does not work correctly in dual core: Bugzilla 71087 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
-#elif defined (DBGMCU_LPM) && ( DBGMCU_LPM == 0 )
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
-#elif !defined (DBGMCU_LPM)
-#error "DBGMCU_LPM not defined or out of range <0,1>"
-#endif /* DBGMCU_LPM */
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
 
-#else /* CORE_CM0PLUS */
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
 
-  /* Enable the GPIO_LINES Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN ;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
+  /* HW alternate functions for monitoring RF */
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -143,7 +210,7 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /* LDO_rdy & BUCK_rdy */
+  /* LDO_rdy & BUCK_rdy (SMPS) */
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
   GPIO_InitStruct.Pull   = GPIO_NOPULL;
   GPIO_InitStruct.Pin    = (GPIO_PIN_2);
@@ -158,40 +225,29 @@ void DBG_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-#endif /* CORE_CM4 */
+#endif /* CORE_CM0PLUS */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#if defined(CORE_CM4)
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
 #endif /* CORE_CM4 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-  /* USER CODE END DBG_Init_Last */
+  /* USER CODE END DBG_ProbesInit_Last */
 }
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.h
index 162d992f..28890d05 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.h
@@ -43,94 +43,96 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/* make sure a pin is not used simultaneusly by the two cores */
-/* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
 #if defined(CORE_CM0PLUS)
-/**  Definition for Debug Line 1   **/
+
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 #else
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-#endif /* CORE_CM4 */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
 
 /* USER CODE BEGIN EC */
 
@@ -142,49 +144,66 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
 /**
-  * @brief Initializes the debug
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.ewd
index 5bbebcaa..62585ea6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.ewd
@@ -1106,15 +1106,15 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>1</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
-                    <state>0</state>
+                    <state>1</state>
                 </option>
             </data>
         </settings>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.ewp
index 7c563bd1..62c72257 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.ewp
@@ -32,11 +32,11 @@
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
+                    <state>Full formatting, with multibyte support.</state>
                 </option>
                 <option>
                     <name>Output description</name>
-                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
+                    <state>Full formatting, with multibyte support.</state>
                 </option>
                 <option>
                     <name>GOutputBinary</name>
@@ -117,7 +117,7 @@
                 <option>
                     <name>GBECoreSlave</name>
                     <version>26</version>
-                    <state>39</state>
+                    <state>35</state>
                 </option>
                 <option>
                     <name>OGUseCmsis</name>
@@ -226,6 +226,7 @@
                     <name>CCDefines</name>
                     <state>CORE_CM0PLUS</state>
                     <state>KMS_ENABLED</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                     <state>MBEDTLS_CONFIG_FILE="mbedtls_config.h"</state>
                 </option>
@@ -358,8 +359,9 @@
                     <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/Target</state>
                     <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
@@ -1068,48 +1070,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1117,68 +1077,119 @@
             </file>
         </group>
         <group>
-            <name>KMS</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>LoRaWAN</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
-                </file>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>KMS</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
             </group>
             <group>
-                <name>Target</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
-                </file>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
         </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
-            </file>
-        </group>
     </group>
     <group>
         <name>Doc</name>
@@ -1190,9 +1201,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1367,6 +1375,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_vm_storage.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\HAL\mac_stm32hal.c</name>
             </file>
@@ -1379,102 +1390,90 @@
         </group>
         <group>
             <name>LoRaWAN</name>
-            <group>
-                <name>Crypto</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
-                </file>
-            </group>
-            <group>
-                <name>LmHandler</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmCtxMgmt.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Mac</name>
-                <group>
-                    <name>Region</name>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
-                    </file>
-                </group>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Utilities</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
-                </file>
-            </group>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
+            </file>
         </group>
         <group>
             <name>mbed-crypto</name>
@@ -1496,6 +1495,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.ewd
index 05c2e096..86eff2e8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.ewd
@@ -44,7 +44,7 @@
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -112,7 +112,7 @@
                 </option>
                 <option>
                     <name>FlashLoadersV3</name>
-                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCImagesSuppressCheck1</name>
@@ -184,7 +184,7 @@
                 </option>
                 <option>
                     <name>OCMulticoreMaster</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>OCMulticorePort</name>
@@ -192,15 +192,15 @@
                 </option>
                 <option>
                     <name>OCMulticoreWorkspace</name>
-                    <state>$PROJ_DIR$\Project.eww</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveProject</name>
-                    <state>LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveConfiguration</name>
-                    <state>MBMUX_STM32WL_M0_FLASH</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCDownloadExtraImage</name>
@@ -1106,11 +1106,11 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>0</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.ewp
index cceeb73a..45848cd0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.ewp
@@ -225,6 +225,7 @@
                 <option>
                     <name>CCDefines</name>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                 </option>
                 <option>
@@ -355,13 +356,13 @@
                     <state>$PROJ_DIR$/../CM4/LoRaWAN/Target</state>
                     <state>$PROJ_DIR$/../CM4/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
                     <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include</state>
@@ -1055,60 +1056,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\app_freertos.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_timebase_tim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1116,49 +1063,109 @@
             </file>
         </group>
         <group>
-            <name>LoRaWAN</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\CayenneLpp.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
-                </file>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\app_freertos.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_timebase_tim.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\CayenneLpp.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
-        </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>LoRaWAN_End_Node_DualCoreFreeRTOS_CM4</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
-            </file>
         </group>
     </group>
     <group>
@@ -1171,14 +1178,14 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_End_Node_DualCoreFreeRTOS_CM4</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
                     <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
                 </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
             </group>
         </group>
         <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/startup_stm32wl55xx_cm0plus.s
index a6cf0145..cd6560d5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/stm32wl55xx_flash_cm0plus.icf
index 6f11cd34..3e66df44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -11,10 +11,10 @@ define symbol __ICFEDIT_region_ROM_end__      = 0x0803CFFF;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_start__   = 0x0803E500;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_end__     = 0x0803E7FF;
 /***** SRAM2 shared allocated by M0+ *****/
-define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x2000B000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000BFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20009000;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20009FFF;
 /***** SRAM2 dedicated to M0+ *****/
-define symbol __ICFEDIT_region_RAM2_start__   = 0x2000C000;
+define symbol __ICFEDIT_region_RAM2_start__   = 0x2000A000;
 define symbol __ICFEDIT_region_RAM2_end__     = 0x2000FFFF;
 
 /* KMS Data Storage (NVMS) region */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/stm32wl55xx_flash_cm4.icf
index 6f32a5f9..b8551a3e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/stm32wl55xx_flash_cm4.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/EWARM/stm32wl55xx_flash_cm4.icf
@@ -13,7 +13,7 @@ define symbol __ICFEDIT_region_RAM_start__    = 0x20000000;
 define symbol __ICFEDIT_region_RAM_end__      = 0x20007FFF;
 /***** SRAM2 shared allocated by M4 *****/
 define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20008000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000AFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20008FFF;
 
 /*-Sizes-*/
 define symbol __ICFEDIT_size_cstack__ = 0x800;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/LoRaWAN_End_Node_DualCoreFreeRTOS.ioc b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/LoRaWAN_End_Node_DualCoreFreeRTOS.ioc
index 2e1ca05c..0dd6b5c1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/LoRaWAN_End_Node_DualCoreFreeRTOS.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/LoRaWAN_End_Node_DualCoreFreeRTOS.ioc
@@ -1,13 +1,14 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
 ADC.SamplingTimeCommon2=ADC_SAMPLETIME_160CYCLES_5
 ADC.SelectedChannel=ADC_CHANNEL_TEMPSENSOR|ADC_CHANNEL_VREFINT
 CortexM0Plus.IPs=IPCC,LORAWAN,RCC,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,DMA,NVIC2\:I,RTC\:I,SUBGHZ\:I,ADV_TRACE,MISC,TIMER,TINY_LPM,KMS\:I,GTZC_S\:I,SEQUENCER_M0PLUS\:I
-CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,DMA\:I,NVIC1\:I,ADC\:I,USART2\:I,RTC,ADV_TRACE\:I,MISC\:I,TIMER\:I,TINY_LPM\:I,TIM17\:I,GTZC_NS\:I,SEQUENCER_M4\:I
+CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,DMA\:I,NVIC1\:I,ADC\:I,USART2\:I,RTC,ADV_TRACE\:I,MISC\:I,TIMER\:I,TINY_LPM\:I,TIM17\:I,GTZC_NS\:I,SEQUENCER_M4\:I,LPUART1\:I
+CortexM4.Pins=PA0,PA1
 Dma.Request0=USART2_TX
 Dma.RequestsNb=1
 Dma.USART2_TX.0.Channel_PRIV_NPRIV=DMA_CHANNEL_NPRIV_DISABLE
@@ -28,19 +29,18 @@ Dma.USART2_TX.0.SyncEnable=DISABLE
 Dma.USART2_TX.0.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT
 Dma.USART2_TX.0.SyncRequestNumber=1
 Dma.USART2_TX.0.SyncSignalID=NONE
+FREERTOS.FootprintOK=true
 FREERTOS.INCLUDE_vTaskCleanUpResources=1
-FREERTOS.INCLUDE_xEventGroupSetBitFromISR=0
 FREERTOS.INCLUDE_xTaskResumeFromISR=0
-FREERTOS.IPParameters=Tasks01,configENABLE_FPU,configTOTAL_HEAP_SIZE,INCLUDE_vTaskCleanUpResources,INCLUDE_xTaskResumeFromISR,configMINIMAL_STACK_SIZE,configUSE_TICKLESS_IDLE,configENABLE_BACKWARD_COMPATIBILITY,INCLUDE_xEventGroupSetBitFromISR
+FREERTOS.IPParameters=Tasks01,configENABLE_BACKWARD_COMPATIBILITY,configTOTAL_HEAP_SIZE,INCLUDE_xTaskResumeFromISR,FootprintOK,configMINIMAL_STACK_SIZE,configUSE_TICKLESS_IDLE,INCLUDE_vTaskCleanUpResources
 FREERTOS.Tasks01=defaultTask,24,512,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL
 FREERTOS.configENABLE_BACKWARD_COMPATIBILITY=0
-FREERTOS.configENABLE_FPU=0
 FREERTOS.configMINIMAL_STACK_SIZE=512
 FREERTOS.configTOTAL_HEAP_SIZE=8120
 FREERTOS.configUSE_TICKLESS_IDLE=1
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
-KMS.IPParameters=KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_CMAC,KMS_AES_GCM,KMS_MEM_LOGGING,KMS_NB_SESSIONS_MAX
+KMS.IPParameters=KMS_NB_SESSIONS_MAX,KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_SEARCH,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_LOGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_GCM,KMS_AES_CMAC,KMS_VM_DYNAMIC_ENABLED,KMS_NVM_ENABLED,KMS_NVM_DYNAMIC_ENABLED
 KMS.KMS_AES_CBC=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT
 KMS.KMS_AES_CMAC=KMS_FCT_SIGN|KMS_FCT_VERIFY
 KMS.KMS_AES_ECB=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY
@@ -49,25 +49,31 @@ KMS.KMS_ATTRIBUTES=\#define KMS_ATTRIBUTES
 KMS.KMS_DECRYPT=\#define KMS_DECRYPT
 KMS.KMS_DERIVE_KEY=\#define KMS_DERIVE_KEY
 KMS.KMS_ENCRYPT=\#define KMS_ENCRYPT
-KMS.KMS_MEM_DEBUGGING=\#define KMS_MEM_DEBUGGING
 KMS.KMS_MEM_LOGGING=//\#define KMS_MEM_LOGGING
 KMS.KMS_MEM_USE_ALLOCATOR=KMS_MEM_USE_POOL_ALLOCATOR
 KMS.KMS_NB_SESSIONS_MAX=1
 KMS.KMS_NIKMS_ROUTER_BYPASS=\#define KMS_NIKMS_ROUTER_BYPASS
+KMS.KMS_NVM_DYNAMIC_ENABLED=\#define KMS_NVM_DYNAMIC_ENABLED
+KMS.KMS_NVM_ENABLED=\#define KMS_NVM_ENABLED
 KMS.KMS_OBJECTS=\#define KMS_OBJECTS
+KMS.KMS_SEARCH=\#define KMS_SEARCH
 KMS.KMS_SIGN=\#define KMS_SIGN
 KMS.KMS_VERIFY=\#define KMS_VERIFY
+KMS.KMS_VM_DYNAMIC_ENABLED=//\#define KMS_VM_DYNAMIC_ENABLED
 KeepUserPlacement=false
-LORAWAN.Activate_BOARD_RESOURCES=both
 LORAWAN.Activate_DEBUG_LINE=true
-LORAWAN.Activate_RADIO_BOARD_INTERFACE=true
-LORAWAN.IPParameters=Activate_BOARD_RESOURCES,Activate_DEBUG_LINE,Activate_RADIO_BOARD_INTERFACE,SUBGHZ_APPLICATION
+LORAWAN.Activate_RADIO_BOARD_INTERFACE=Bsp
+LORAWAN.IPParameters=USE_ADC,USE_RTC,USE_UART,USE_LPM,SUBGHZ_APPLICATION,Activate_DEBUG_LINE,Activate_RADIO_BOARD_INTERFACE
 LORAWAN.SUBGHZ_APPLICATION=LORA_END_NODE
-LoRaWAN.BSP.number=16
+LORAWAN.USE_ADC=true
+LORAWAN.USE_LPM=true
+LORAWAN.USE_RTC=true
+LORAWAN.USE_UART=true
+LoRaWAN.BSP.number=7
 LoRaWAN0.BSP.STBoard=false
 LoRaWAN0.BSP.api=Unknown
 LoRaWAN0.BSP.component=
-LoRaWAN0.BSP.condition=SEM_LORA_AT_SLAVE | SEM_LORA_END_NODE
+LoRaWAN0.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_ADC
 LoRaWAN0.BSP.i2caddr=0
 LoRaWAN0.BSP.i2creg=
 LoRaWAN0.BSP.instance=ADC
@@ -79,7 +85,7 @@ LoRaWAN0.BSP.solution=ADC
 LoRaWAN1.BSP.STBoard=false
 LoRaWAN1.BSP.api=Unknown
 LoRaWAN1.BSP.component=
-LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION
+LoRaWAN1.BSP.condition=\!SEM_LORA_USER_APPLICATION | SEM_LORA_USE_RTC
 LoRaWAN1.BSP.i2caddr=0
 LoRaWAN1.BSP.i2creg=
 LoRaWAN1.BSP.instance=RTC
@@ -88,174 +94,66 @@ LoRaWAN1.BSP.mode=RTC Enabled
 LoRaWAN1.BSP.name=RTC
 LoRaWAN1.BSP.semaphore=
 LoRaWAN1.BSP.solution=RTC
-LoRaWAN10.BSP.STBoard=false
-LoRaWAN10.BSP.api=Unknown
-LoRaWAN10.BSP.component=
-LoRaWAN10.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN10.BSP.i2caddr=0
-LoRaWAN10.BSP.i2creg=
-LoRaWAN10.BSP.instance=PC3
-LoRaWAN10.BSP.ip=GPIO
-LoRaWAN10.BSP.mode=Output
-LoRaWAN10.BSP.name=RF SW CTRL 3
-LoRaWAN10.BSP.semaphore=
-LoRaWAN10.BSP.solution=PC3
-LoRaWAN11.BSP.STBoard=false
-LoRaWAN11.BSP.api=Unknown
-LoRaWAN11.BSP.component=
-LoRaWAN11.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN11.BSP.i2caddr=0
-LoRaWAN11.BSP.i2creg=
-LoRaWAN11.BSP.instance=PA0
-LoRaWAN11.BSP.ip=GPIO
-LoRaWAN11.BSP.mode=EXTI
-LoRaWAN11.BSP.name=BUTTON 1
-LoRaWAN11.BSP.semaphore=
-LoRaWAN11.BSP.solution=PA0
-LoRaWAN12.BSP.STBoard=false
-LoRaWAN12.BSP.api=Unknown
-LoRaWAN12.BSP.component=
-LoRaWAN12.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN12.BSP.i2caddr=0
-LoRaWAN12.BSP.i2creg=
-LoRaWAN12.BSP.instance=PC4
-LoRaWAN12.BSP.ip=GPIO
-LoRaWAN12.BSP.mode=Output
-LoRaWAN12.BSP.name=RF SW CTRL 1
-LoRaWAN12.BSP.semaphore=
-LoRaWAN12.BSP.solution=PC4
-LoRaWAN13.BSP.STBoard=false
-LoRaWAN13.BSP.api=Unknown
-LoRaWAN13.BSP.component=
-LoRaWAN13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_LORA
-LoRaWAN13.BSP.i2caddr=0
-LoRaWAN13.BSP.i2creg=
-LoRaWAN13.BSP.instance=PC5
-LoRaWAN13.BSP.ip=GPIO
-LoRaWAN13.BSP.mode=Output
-LoRaWAN13.BSP.name=RF SW CTRL 2
-LoRaWAN13.BSP.semaphore=
-LoRaWAN13.BSP.solution=PC5
-LoRaWAN14.BSP.STBoard=false
-LoRaWAN14.BSP.api=Unknown
-LoRaWAN14.BSP.component=
-LoRaWAN14.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN14.BSP.i2caddr=0
-LoRaWAN14.BSP.i2creg=
-LoRaWAN14.BSP.instance=PC6
-LoRaWAN14.BSP.ip=GPIO
-LoRaWAN14.BSP.mode=EXTI
-LoRaWAN14.BSP.name=BUTTON 3
-LoRaWAN14.BSP.semaphore=
-LoRaWAN14.BSP.solution=PC6
-LoRaWAN15.BSP.STBoard=false
-LoRaWAN15.BSP.api=Unknown
-LoRaWAN15.BSP.component=
-LoRaWAN15.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN15.BSP.i2caddr=0
-LoRaWAN15.BSP.i2creg=
-LoRaWAN15.BSP.instance=PA1
-LoRaWAN15.BSP.ip=GPIO
-LoRaWAN15.BSP.mode=EXTI
-LoRaWAN15.BSP.name=BUTTON 2
-LoRaWAN15.BSP.semaphore=
-LoRaWAN15.BSP.solution=PA1
 LoRaWAN2.BSP.STBoard=false
 LoRaWAN2.BSP.api=Unknown
 LoRaWAN2.BSP.component=
-LoRaWAN2.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN2.BSP.condition=SEM_LORA_END_NODE  | SEM_LORA_USE_UART
 LoRaWAN2.BSP.i2caddr=0
 LoRaWAN2.BSP.i2creg=
-LoRaWAN2.BSP.instance=PB12
-LoRaWAN2.BSP.ip=GPIO
-LoRaWAN2.BSP.mode=Output
-LoRaWAN2.BSP.name=Debug Line 1
+LoRaWAN2.BSP.instance=USART2
+LoRaWAN2.BSP.ip=(LPU|US)ART
+LoRaWAN2.BSP.mode=Asynchronous
+LoRaWAN2.BSP.name=USART
 LoRaWAN2.BSP.semaphore=
-LoRaWAN2.BSP.solution=PB12
+LoRaWAN2.BSP.solution=USART2
 LoRaWAN3.BSP.STBoard=false
 LoRaWAN3.BSP.api=Unknown
 LoRaWAN3.BSP.component=
-LoRaWAN3.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN3.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN3.BSP.i2caddr=0
 LoRaWAN3.BSP.i2creg=
-LoRaWAN3.BSP.instance=PB13
+LoRaWAN3.BSP.instance=PB12
 LoRaWAN3.BSP.ip=GPIO
 LoRaWAN3.BSP.mode=Output
-LoRaWAN3.BSP.name=Debug Line 2
+LoRaWAN3.BSP.name=Debug Line 1
 LoRaWAN3.BSP.semaphore=
-LoRaWAN3.BSP.solution=PB13
+LoRaWAN3.BSP.solution=PB12
 LoRaWAN4.BSP.STBoard=false
 LoRaWAN4.BSP.api=Unknown
 LoRaWAN4.BSP.component=
-LoRaWAN4.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN4.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN4.BSP.i2caddr=0
 LoRaWAN4.BSP.i2creg=
-LoRaWAN4.BSP.instance=PB14
+LoRaWAN4.BSP.instance=PB13
 LoRaWAN4.BSP.ip=GPIO
 LoRaWAN4.BSP.mode=Output
-LoRaWAN4.BSP.name=Debug Line 3
+LoRaWAN4.BSP.name=Debug Line 2
 LoRaWAN4.BSP.semaphore=
-LoRaWAN4.BSP.solution=PB14
+LoRaWAN4.BSP.solution=PB13
 LoRaWAN5.BSP.STBoard=false
 LoRaWAN5.BSP.api=Unknown
 LoRaWAN5.BSP.component=
-LoRaWAN5.BSP.condition=SEM_DEBUG_LINE_FOR_LORA
+LoRaWAN5.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN5.BSP.i2caddr=0
 LoRaWAN5.BSP.i2creg=
-LoRaWAN5.BSP.instance=PB10
+LoRaWAN5.BSP.instance=PB14
 LoRaWAN5.BSP.ip=GPIO
 LoRaWAN5.BSP.mode=Output
-LoRaWAN5.BSP.name=Debug Line 4
+LoRaWAN5.BSP.name=Debug Line 3
 LoRaWAN5.BSP.semaphore=
-LoRaWAN5.BSP.solution=PB10
+LoRaWAN5.BSP.solution=PB14
 LoRaWAN6.BSP.STBoard=false
 LoRaWAN6.BSP.api=Unknown
 LoRaWAN6.BSP.component=
-LoRaWAN6.BSP.condition=SEM_LORA_END_NODE
+LoRaWAN6.BSP.condition=SEM_PROBE_LINE_FOR_LORA
 LoRaWAN6.BSP.i2caddr=0
 LoRaWAN6.BSP.i2creg=
-LoRaWAN6.BSP.instance=USART2
-LoRaWAN6.BSP.ip=(LPU|US)ART
-LoRaWAN6.BSP.mode=Asynchronous
-LoRaWAN6.BSP.name=USART
+LoRaWAN6.BSP.instance=PB10
+LoRaWAN6.BSP.ip=GPIO
+LoRaWAN6.BSP.mode=Output
+LoRaWAN6.BSP.name=Debug Line 4
 LoRaWAN6.BSP.semaphore=
-LoRaWAN6.BSP.solution=USART2
-LoRaWAN7.BSP.STBoard=false
-LoRaWAN7.BSP.api=Unknown
-LoRaWAN7.BSP.component=
-LoRaWAN7.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN7.BSP.i2caddr=0
-LoRaWAN7.BSP.i2creg=
-LoRaWAN7.BSP.instance=PB11
-LoRaWAN7.BSP.ip=GPIO
-LoRaWAN7.BSP.mode=Output
-LoRaWAN7.BSP.name=LED 3
-LoRaWAN7.BSP.semaphore=
-LoRaWAN7.BSP.solution=PB11
-LoRaWAN8.BSP.STBoard=false
-LoRaWAN8.BSP.api=Unknown
-LoRaWAN8.BSP.component=
-LoRaWAN8.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN8.BSP.i2caddr=0
-LoRaWAN8.BSP.i2creg=
-LoRaWAN8.BSP.instance=PB9
-LoRaWAN8.BSP.ip=GPIO
-LoRaWAN8.BSP.mode=Output
-LoRaWAN8.BSP.name=LED 2
-LoRaWAN8.BSP.semaphore=
-LoRaWAN8.BSP.solution=PB9
-LoRaWAN9.BSP.STBoard=false
-LoRaWAN9.BSP.api=Unknown
-LoRaWAN9.BSP.component=
-LoRaWAN9.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_LORA | SEM_BOARD_RESOURCES_M4_FOR_LORA | SEM_BOARD_RESOURCES_BOTH_FOR_LORA
-LoRaWAN9.BSP.i2caddr=0
-LoRaWAN9.BSP.i2creg=
-LoRaWAN9.BSP.instance=PB15
-LoRaWAN9.BSP.ip=GPIO
-LoRaWAN9.BSP.mode=Output
-LoRaWAN9.BSP.name=LED 1
-LoRaWAN9.BSP.semaphore=
-LoRaWAN9.BSP.solution=PB15
+LoRaWAN6.BSP.solution=PB10
 Mcu.Context0=CortexM4
 Mcu.Context1=CortexM0Plus
 Mcu.ContextNb=2
@@ -263,78 +161,81 @@ Mcu.ContextProject=DualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=RCC
-Mcu.IP11=RTC
-Mcu.IP12=SEQUENCER_M0PLUS
-Mcu.IP13=SUBGHZ
-Mcu.IP14=SYS_M0PLUS
-Mcu.IP15=SYS
-Mcu.IP16=TIMER
-Mcu.IP17=TINY_LPM
-Mcu.IP18=USART2
-Mcu.IP2=DMA
-Mcu.IP3=FREERTOS
-Mcu.IP4=IPCC
-Mcu.IP5=KMS
-Mcu.IP6=LORAWAN
-Mcu.IP7=MISC
-Mcu.IP8=NVIC1
-Mcu.IP9=NVIC2
-Mcu.IPNb=19
+Mcu.IP10=NVIC2
+Mcu.IP11=RCC
+Mcu.IP12=RTC
+Mcu.IP13=SEQUENCER_M0PLUS
+Mcu.IP14=SUBGHZ
+Mcu.IP15=SYS_M0PLUS
+Mcu.IP16=SYS
+Mcu.IP17=TIMER
+Mcu.IP18=TINY_LPM
+Mcu.IP19=USART2
+Mcu.IP2=DEBUG
+Mcu.IP3=DMA
+Mcu.IP4=FREERTOS
+Mcu.IP5=IPCC
+Mcu.IP6=KMS
+Mcu.IP7=LORAWAN
+Mcu.IP8=MISC
+Mcu.IP9=NVIC1
+Mcu.IPNb=20
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_FREERTOS_VS_CMSIS_V2
-Mcu.Pin23=VP_IPCC_VS_IPCC
-Mcu.Pin24=VP_KMS_VS_KMS
-Mcu.Pin25=VP_LORAWAN_VS_LoRaWAN
-Mcu.Pin26=VP_MISC_VS_MISC
-Mcu.Pin27=VP_RTC_VS_RTC_Activate
-Mcu.Pin28=VP_RTC_VS_RTC_Calendar
-Mcu.Pin29=VP_RTC_VS_RTC_Alarm_B_Intern
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin31=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
-Mcu.Pin32=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin33=VP_SYS_VS_tim17
-Mcu.Pin34=VP_SYS_M0PLUS_VS_Systick
-Mcu.Pin35=VP_TIMER_VS_TIMER
-Mcu.Pin36=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=37
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_FREERTOS_VS_CMSIS_V2
+Mcu.Pin25=VP_IPCC_VS_IPCC
+Mcu.Pin26=VP_KMS_VS_KMS
+Mcu.Pin27=VP_LORAWAN_VS_LoRaWAN
+Mcu.Pin28=VP_MISC_VS_MISC
+Mcu.Pin29=VP_RTC_VS_RTC_Activate
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_RTC_VS_RTC_Calendar
+Mcu.Pin31=VP_RTC_VS_RTC_Alarm_B_Intern
+Mcu.Pin32=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin33=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
+Mcu.Pin34=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin35=VP_SYS_VS_tim17
+Mcu.Pin36=VP_SYS_M0PLUS_VS_None
+Mcu.Pin37=VP_TIMER_VS_TIMER
+Mcu.Pin38=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=39
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);USART_BAUDRATE,115200
+Mcu.UserConstants=RTC_N_PREDIV_S-CortexM4,10;RTC_PREDIV_S-CortexM4,((1<<RTC_N_PREDIV_S)-1);RTC_N_PREDIV_S-CortexM0Plus,10;RTC_PREDIV_S-CortexM0Plus,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A-CortexM0Plus,((1<<(15-RTC_N_PREDIV_S))-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC1.DMA1_Channel5_IRQn=true\:7\:0\:true\:false\:true\:false\:false\:true
+NVIC1.DMA1_Channel5_IRQn=true\:7\:0\:true\:false\:true\:true\:false\:true
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC1.EXTI0_IRQn=true\:5\:0\:false\:false\:true\:false\:true\:true
-NVIC1.EXTI1_IRQn=true\:5\:0\:false\:false\:true\:false\:true\:true
+NVIC1.EXTI0_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true
+NVIC1.EXTI1_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true
 NVIC1.ForceEnableDMAVector=true
 NVIC1.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC1.IPCC_C1_RX_IRQn=true\:6\:0\:true\:false\:true\:false\:false\:true
-NVIC1.IPCC_C1_TX_IRQn=true\:6\:0\:true\:false\:true\:false\:false\:true
+NVIC1.IPCC_C1_RX_IRQn=true\:6\:0\:true\:false\:true\:true\:false\:true
+NVIC1.IPCC_C1_TX_IRQn=true\:6\:0\:true\:false\:true\:true\:false\:true
 NVIC1.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC1.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC1.PendSV_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:false
@@ -343,11 +244,11 @@ NVIC1.SVCall_IRQn=true\:0\:0\:false\:false\:false\:false\:false\:false
 NVIC1.SavedPendsvIrqHandlerGenerated=true
 NVIC1.SavedSvcallIrqHandlerGenerated=true
 NVIC1.SavedSystickIrqHandlerGenerated=true
-NVIC1.SysTick_IRQn=true\:15\:0\:false\:false\:false\:true\:false\:true
-NVIC1.TIM17_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true
+NVIC1.SysTick_IRQn=true\:15\:0\:true\:false\:false\:true\:false\:true
+NVIC1.TIM17_IRQn=true\:15\:0\:false\:false\:true\:false\:false\:true
 NVIC1.TimeBase=TIM17_IRQn
 NVIC1.TimeBaseIP=TIM17
-NVIC1.USART2_IRQn=true\:7\:0\:true\:false\:true\:false\:true\:true
+NVIC1.USART2_IRQn=true\:7\:0\:true\:false\:true\:true\:true\:true
 NVIC1.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC2.ForceEnableDMAVector=true
 NVIC2.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -357,19 +258,24 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.RTC_LSECSS_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC2.SysTick_IRQn=true\:3\:0\:false\:false\:true\:false\:false
+NVIC2.TimeBase=None
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.ContextOwner=CortexM4
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.ContextOwner=CortexM4
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -384,40 +290,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=USART2_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -425,26 +324,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -457,7 +359,7 @@ ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32WL55JCIx
 ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
-ProjectManager.HeapSize=0x400
+ProjectManager.HeapSize=M4-0x200,M0P-0x400
 ProjectManager.KeepUserCode=true
 ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
@@ -468,11 +370,11 @@ ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=LoRaWAN_End_Node_DualCoreFreeRTOS.ioc
 ProjectManager.ProjectName=LoRaWAN_End_Node_DualCoreFreeRTOS
 ProjectManager.RegisterCallBack=
-ProjectManager.StackSize=0x1000
+ProjectManager.StackSize=M4-0x800,M0P-0x1000
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_USART2_UART_Init-USART2-true-HAL-false-CortexM4,6-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM4,false-8-MX_RTC_Init-RTC-true-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,4-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,6-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM0Plus,7-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus
+ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_USART2_UART_Init-USART2-true-HAL-false-CortexM4,6-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM4,false-8-MX_RTC_Init-RTC-true-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,4-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,5-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,6-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus,7-MX_LoRaWAN_Init-LORAWAN-false-HAL-false-CortexM0Plus
 RCC.AHBFreq_Value=48000000
 RCC.APB1Freq_Value=48000000
 RCC.APB1TimFreq_Value=48000000
@@ -483,6 +385,7 @@ RCC.Cortex2Freq_Value=48000000
 RCC.CortexFreq_Value=48000000
 RCC.FCLK2Freq_Value=48000000
 RCC.FCLKCortexFreq_Value=48000000
+RCC.FLatency=FLASH_LATENCY_2
 RCC.FamilyName=M
 RCC.HCLK2Freq_Value=48000000
 RCC.HCLK3Freq_Value=48000000
@@ -493,11 +396,12 @@ RCC.I2C1Freq_Value=48000000
 RCC.I2C2Freq_Value=48000000
 RCC.I2C3Freq_Value=48000000
 RCC.I2S2Freq_Value=16000000
-RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
+RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,Cortex2Freq_Value,CortexFreq_Value,FCLK2Freq_Value,FCLKCortexFreq_Value,FLatency,FamilyName,HCLK2Freq_Value,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1CLockSelection,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,PWR_Regulator_Voltage_Scale,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
 RCC.LPTIM1Freq_Value=48000000
 RCC.LPTIM2Freq_Value=48000000
 RCC.LPTIM3Freq_Value=48000000
-RCC.LPUART1Freq_Value=48000000
+RCC.LPUART1CLockSelection=RCC_LPUART1CLKSOURCE_LSE
+RCC.LPUART1Freq_Value=32768
 RCC.LSCOPinFreq_Value=32000
 RCC.LSE_VALUE=32768
 RCC.MCO1PinFreq_Value=48000000
@@ -506,6 +410,7 @@ RCC.PLLPoutputFreq_Value=192000000
 RCC.PLLQoutputFreq_Value=192000000
 RCC.PLLRCLKFreq_Value=192000000
 RCC.PWRFreq_Value=48000000
+RCC.PWR_Regulator_Voltage_Scale=PWR_REGULATOR_VOLTAGE_SCALE1
 RCC.RNGFreq_Value=32000
 RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
 RCC.RTCFreq_Value=32768
@@ -521,8 +426,7 @@ RTC.AsynchPrediv=RTC_PREDIV_A
 RTC.BinMode=RTC_BINARY_ONLY
 RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
 RTC.BinaryAutoClr_B-Alarm\ B=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
-RTC.Format=RTC_FORMAT_BIN
-RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B,Format
+RTC.IPParameters=Alarm-Alarm A,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,Alarm_B-Alarm B,BinaryAutoClr_B-Alarm B
 SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI0.ConfNb=1
 SH.GPXTI1.0=GPIO_EXTI1
@@ -533,9 +437,8 @@ SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
 SYS.userName=SYS_M4
 SYS_M0PLUS.userName=SYS_M0+
-USART2.BaudRate=USART_BAUDRATE
 USART2.FIFOMode=FIFOMODE_ENABLE
-USART2.IPParameters=VirtualMode-Asynchronous,BaudRate,FIFOMode
+USART2.IPParameters=VirtualMode-Asynchronous,FIFOMode
 USART2.VirtualMode-Asynchronous=VM_ASYNC
 VP_ADC_TempSens_Input.Mode=IN-TempSens
 VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
@@ -565,8 +468,8 @@ VP_SEQUENCER_M0PLUS_VS_SEQUENCER.Mode=SEQUENCER_Enabled
 VP_SEQUENCER_M0PLUS_VS_SEQUENCER.Signal=SEQUENCER_M0PLUS_VS_SEQUENCER
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_M0PLUS_VS_Systick.Mode=SysTick
-VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
+VP_SYS_M0PLUS_VS_None.Mode=None
+VP_SYS_M0PLUS_VS_None.Signal=SYS_M0PLUS_VS_None
 VP_SYS_VS_tim17.Mode=TIM17
 VP_SYS_VS_tim17.Signal=SYS_VS_tim17
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
@@ -574,3 +477,6 @@ VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=LoRaWAN_End_Node_DualCoreFreeRTOS
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvoptx
index eabc8c63..56892abd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>12000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O718 -SF4000 -C0 -A1 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Name>-U-O142 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,239 +203,239 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>14</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/KMS/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
-      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/App/app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/App/lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
       <FileNumber>18</FileNumber>
@@ -423,15 +443,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MbMux</GroupName>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -455,8 +475,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/lora_info.c</PathWithFileName>
+      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -467,8 +487,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/lora_info.c</PathWithFileName>
-      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -491,8 +511,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_lora.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -503,8 +523,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_lora.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -515,8 +535,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -527,8 +547,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -539,20 +559,28 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -565,7 +593,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>29</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
@@ -585,7 +613,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -597,7 +625,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -611,31 +639,23 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
       <FileNumber>33</FileNumber>
@@ -643,8 +663,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -655,8 +675,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -667,8 +687,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -679,8 +699,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -715,9 +735,9 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
@@ -727,8 +747,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -739,8 +759,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -751,8 +771,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -763,8 +783,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -775,8 +795,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -787,8 +807,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -799,8 +819,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -811,8 +831,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -823,8 +843,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -835,8 +855,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -847,8 +867,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -859,8 +879,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -871,20 +891,28 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>11</GroupNumber>
       <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -897,444 +925,456 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
-      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
-      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_vm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
+      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
-      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
+      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
-      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
-      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>73</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
-      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>74</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
-      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
+      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>75</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
-      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>76</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
-      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>77</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
-      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>78</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
-      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>79</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
-      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>80</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>81</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>82</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>83</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>84</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>85</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
-      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>12</GroupNumber>
+      <FileNumber>86</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
+    <GroupName>Middlewares/mbed-crypto</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>86</FileNumber>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>87</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
-      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</PathWithFileName>
+      <FilenameWithoutPath>sha1.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>87</FileNumber>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>88</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
-      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>88</FileNumber>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>89</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
-      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
+    <GroupName>Middlewares/LoRaWAN</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>89</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>90</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1345,37 +1385,17 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>90</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>13</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>91</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</PathWithFileName>
-      <FilenameWithoutPath>NvmCtxMgmt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</PathWithFileName>
+      <FilenameWithoutPath>NvmDataMgmt.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>14</GroupNumber>
       <FileNumber>92</FileNumber>
@@ -1383,8 +1403,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1395,8 +1415,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
+      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1407,8 +1427,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
+      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1419,8 +1439,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
+      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1431,8 +1451,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
+      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1443,8 +1463,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1455,8 +1475,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1467,341 +1487,317 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</PathWithFileName>
+      <FilenameWithoutPath>RegionBaseUS.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>100</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
-      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>101</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>102</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>103</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>104</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>105</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</PathWithFileName>
+      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>106</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</PathWithFileName>
-      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</PathWithFileName>
+      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>107</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</PathWithFileName>
-      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</PathWithFileName>
+      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>108</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</PathWithFileName>
-      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>109</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</PathWithFileName>
-      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>110</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</PathWithFileName>
-      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>111</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>16</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>112</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
-      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/mbed-crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>113</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
-      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>114</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</PathWithFileName>
-      <FilenameWithoutPath>sha1.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>17</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>115</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
-      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/SubGHz_Phy</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>18</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>116</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>18</GroupNumber>
+      <GroupNumber>14</GroupNumber>
       <FileNumber>117</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
+      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Utilities</GroupName>
+    <GroupName>Middlewares/SubGHz_Phy</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>19</GroupNumber>
+      <GroupNumber>15</GroupNumber>
       <FileNumber>118</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
+      <GroupNumber>15</GroupNumber>
       <FileNumber>119</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
+      <GroupNumber>15</GroupNumber>
       <FileNumber>120</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>19</GroupNumber>
+      <GroupNumber>16</GroupNumber>
       <FileNumber>121</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
+      <GroupNumber>16</GroupNumber>
       <FileNumber>122</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
+      <GroupNumber>16</GroupNumber>
       <FileNumber>123</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
+      <GroupNumber>16</GroupNumber>
       <FileNumber>124</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -1813,7 +1809,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>19</GroupNumber>
+      <GroupNumber>16</GroupNumber>
       <FileNumber>125</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -1824,6 +1820,42 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>126</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>127</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>128</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvprojx
index 3a29dea2..48ba0212 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvprojx
@@ -16,14 +16,14 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM0P</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <FlashDriverDll></FlashDriverDll>
           <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <RegisterFile></RegisterFile>
           <MemoryEnv></MemoryEnv>
           <Cmp></Cmp>
           <Asm></Asm>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS\Exe\</OutputDirectory>
+          <OutputDirectory>LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS\</OutputDirectory>
           <OutputName>LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -110,7 +110,7 @@
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDllArguments>-REMAP</SimDllArguments>
           <SimDlgDll>DARMCM1.DLL</SimDlgDll>
           <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
           <TargetDllName>SARMCM3.DLL</TargetDllName>
@@ -137,7 +137,7 @@
             <DriverSelection>4101</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
           <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
@@ -186,7 +186,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <hadIRAM2>0</hadIRAM2>
+            <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>1</useUlib>
@@ -194,7 +194,7 @@
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
             <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
+            <RwSelD>4</RwSelD>
             <CodeSel>0</CodeSel>
             <OptFeed>0</OptFeed>
             <NoZi1>0</NoZi1>
@@ -211,7 +211,7 @@
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
             <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
+            <Im2Chk>1</Im2Chk>
             <OnChipMemories>
               <Ocm1>
                 <Type>0</Type>
@@ -245,13 +245,13 @@
               </Ocm6>
               <IRAM>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -275,8 +275,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -300,13 +300,13 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x2000c000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM0PLUS,KMS_ENABLED,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM0PLUS,KMS_ENABLED,USE_HAL_DRIVER,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -357,7 +357,7 @@
               <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath>../CM0PLUS/Core/Inc</IncludePath>
+              <IncludePath>..\CM0PLUS\Core\Inc</IncludePath>
             </VariousControls>
           </Aads>
           <LDads>
@@ -381,198 +381,142 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>ca_low_level.c</FileName>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_lorawan.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/App/app_lorawan.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>lora_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/App/lora_app.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+          <Files>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>radio_board_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+          <Files>
             <File>
-              <FileName>kms_low_level.c</FileName>
+              <FileName>app_kms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
             <File>
               <FileName>main.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>nvms_low_level.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>kms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>nvms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>ca_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
               <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/KMS/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_kms.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_lorawan.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/App/app_lorawan.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>lora_app.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/App/lora_app.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/Target</GroupName>
-          <Files>
             <File>
-              <FileName>radio_board_if.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/LoRaWAN/Target/radio_board_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
           <Files>
             <File>
               <FileName>features_info.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/MbMux/features_info.c</FilePath>
             </File>
-            <File>
-              <FileName>LmHandler_mbwrapper.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</FilePath>
-            </File>
             <File>
               <FileName>lora_info.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/MbMux/lora_info.c</FilePath>
             </File>
             <File>
-              <FileName>mbmux.c</FileName>
+              <FileName>LmHandler_mbwrapper.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/LmHandler_mbwrapper.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_kms.c</FileName>
+              <FileName>mbmux.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
             </File>
             <File>
               <FileName>mbmuxif_lora.c</FileName>
@@ -601,6 +545,16 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>Doc</GroupName>
           <Files>
@@ -626,53 +580,18 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
             <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -690,14 +609,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -710,14 +629,24 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -729,11 +658,6 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
-            <File>
-              <FileName>stm32wlxx_hal_subghz.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_tim.c</FileName>
               <FileType>1</FileType>
@@ -744,155 +668,221 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/KMS</GroupName>
-          <Files>
             <File>
-              <FileName>ca_aes.c</FileName>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
             <File>
-              <FileName>ca_aes_hal.c</FileName>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
             </File>
             <File>
-              <FileName>ca_aes_mbed.c</FileName>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
             </File>
             <File>
-              <FileName>ca_core.c</FileName>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
             <File>
-              <FileName>ca_ecc.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/KMS</GroupName>
+          <Files>
             <File>
-              <FileName>ca_ecc_hal.c</FileName>
+              <FileName>kms_der_x962.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_mbed.c</FileName>
+              <FileName>kms_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash.c</FileName>
+              <FileName>kms_entry.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash_mbed.c</FileName>
+              <FileName>kms_init.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
             </File>
             <File>
-              <FileName>ca_if_utils.c</FileName>
+              <FileName>kms_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng.c</FileName>
+              <FileName>kms_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng_mbed.c</FileName>
+              <FileName>kms_platf_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa.c</FileName>
+              <FileName>kms_digest.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa_hal.c</FileName>
+              <FileName>kms_dyn_obj.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa_mbed.c</FileName>
+              <FileName>kms_enc_dec.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
             </File>
             <File>
-              <FileName>kms_der_x962.c</FileName>
+              <FileName>kms_key_mgt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
             </File>
             <File>
-              <FileName>kms_digest.c</FileName>
+              <FileName>kms_nvm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
             </File>
             <File>
-              <FileName>kms_dyn_obj.c</FileName>
+              <FileName>kms_sign_verify.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
             </File>
             <File>
-              <FileName>kms_ecc.c</FileName>
+              <FileName>kms_vm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls></MiscControls>
+                      <Define></Define>
+                      <Undefine></Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
             </File>
             <File>
-              <FileName>kms_enc_dec.c</FileName>
+              <FileName>kms_interface.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
             </File>
             <File>
-              <FileName>kms_entry.c</FileName>
+              <FileName>tkms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
             </File>
             <File>
-              <FileName>kms_init.c</FileName>
+              <FileName>ca_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
             </File>
             <File>
-              <FileName>kms_interface.c</FileName>
+              <FileName>ca_core.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
             </File>
             <File>
-              <FileName>kms_key_mgt.c</FileName>
+              <FileName>ca_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>kms_mem.c</FileName>
+              <FileName>ca_hash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
             </File>
             <File>
-              <FileName>kms_nvm_storage.c</FileName>
+              <FileName>ca_if_utils.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
             </File>
             <File>
-              <FileName>kms_objects.c</FileName>
+              <FileName>ca_rng.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
             </File>
             <File>
-              <FileName>kms_platf_objects.c</FileName>
+              <FileName>ca_rsa.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
             </File>
             <File>
-              <FileName>kms_sign_verify.c</FileName>
+              <FileName>ca_aes_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>ca_ecc_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>ca_rsa_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
             </File>
             <File>
               <FileName>mac_stm32hal.c</FileName>
@@ -905,100 +895,85 @@
               <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</FilePath>
             </File>
             <File>
-              <FileName>tkms.c</FileName>
+              <FileName>ca_aes_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-          <Files>
             <File>
-              <FileName>cmac.c</FileName>
+              <FileName>ca_ecc_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>lorawan_aes.c</FileName>
+              <FileName>ca_hash_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>soft-se.c</FileName>
+              <FileName>ca_rng_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+            </File>
+            <File>
+              <FileName>ca_rsa_mbed.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
+          <GroupName>Middlewares/mbed-crypto</GroupName>
           <Files>
             <File>
-              <FileName>LmHandler.c</FileName>
+              <FileName>sha1.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</FilePath>
             </File>
             <File>
-              <FileName>LmhpCompliance.c</FileName>
+              <FileName>sha256.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
             </File>
             <File>
-              <FileName>NvmCtxMgmt.c</FileName>
+              <FileName>platform_util.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
+          <GroupName>Middlewares/LoRaWAN</GroupName>
           <Files>
             <File>
-              <FileName>LoRaMac.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacAdr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacClassB.c</FileName>
+              <FileName>LmHandler.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCommands.c</FileName>
+              <FileName>NvmDataMgmt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileName>LmhpCompliance.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacCrypto.c</FileName>
+              <FileName>cmac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacParser.c</FileName>
+              <FileName>lorawan_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
             </File>
             <File>
-              <FileName>LoRaMacSerializer.c</FileName>
+              <FileName>soft-se.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-          <Files>
             <File>
               <FileName>Region.c</FileName>
               <FileType>1</FileType>
@@ -1014,6 +989,11 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</FilePath>
             </File>
+            <File>
+              <FileName>RegionBaseUS.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</FilePath>
+            </File>
             <File>
               <FileName>RegionCN470.c</FileName>
               <FileType>1</FileType>
@@ -1059,35 +1039,50 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-          <Files>
             <File>
-              <FileName>utilities.c</FileName>
+              <FileName>LoRaMac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/mbed-crypto</GroupName>
-          <Files>
             <File>
-              <FileName>platform_util.c</FileName>
+              <FileName>LoRaMacAdr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
             </File>
             <File>
-              <FileName>sha1.c</FileName>
+              <FileName>LoRaMacClassB.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
             </File>
             <File>
-              <FileName>sha256.c</FileName>
+              <FileName>LoRaMacCommands.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCrypto.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacParser.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacSerializer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+            </File>
+            <File>
+              <FileName>utilities.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1095,14 +1090,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1115,39 +1115,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1161,8 +1161,8 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
         <targetInfos>
           <targetInfo name="LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS"/>
         </targetInfos>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvoptx
index 10642ad6..844791f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>48000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O2254 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U-O142 -O2766 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,161 +203,185 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/app_freertos.c</PathWithFileName>
-      <FilenameWithoutPath>app_freertos.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/CayenneLpp.c</PathWithFileName>
+      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/app_freertos.c</PathWithFileName>
+      <FilenameWithoutPath>app_freertos.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_timebase_tim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_timebase_tim.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -349,7 +393,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -361,19 +405,19 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -384,80 +428,64 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>18</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/CayenneLpp.c</PathWithFileName>
-      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/LoRaWAN/App/lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_timebase_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_timebase_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>1</tvExp>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -469,7 +497,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -481,32 +509,20 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
       <PathWithFileName>../CM4/MbMux/mbmuxif_lora.c</PathWithFileName>
       <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -517,8 +533,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -529,8 +545,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -541,8 +557,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -561,8 +577,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -581,8 +597,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -592,23 +608,15 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -620,6 +628,18 @@
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>33</FileNumber>
@@ -627,8 +647,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -639,8 +659,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -651,8 +671,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -663,8 +683,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -675,8 +695,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -687,8 +707,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -699,8 +719,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -711,8 +731,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -723,8 +743,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -735,8 +755,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -747,8 +767,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -759,8 +779,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -771,8 +791,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -783,8 +803,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -795,8 +815,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -872,15 +892,23 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -888,126 +916,126 @@
 
   <Group>
     <GroupName>Middlewares/FreeRTOS</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</PathWithFileName>
-      <FilenameWithoutPath>cmsis_os2.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</PathWithFileName>
+      <FilenameWithoutPath>croutine.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/croutine.c</PathWithFileName>
-      <FilenameWithoutPath>croutine.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</PathWithFileName>
+      <FilenameWithoutPath>event_groups.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</PathWithFileName>
-      <FilenameWithoutPath>event_groups.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</PathWithFileName>
+      <FilenameWithoutPath>list.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</PathWithFileName>
-      <FilenameWithoutPath>heap_4.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</PathWithFileName>
+      <FilenameWithoutPath>queue.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/list.c</PathWithFileName>
-      <FilenameWithoutPath>list.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</PathWithFileName>
+      <FilenameWithoutPath>stream_buffer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/queue.c</PathWithFileName>
-      <FilenameWithoutPath>queue.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</PathWithFileName>
+      <FilenameWithoutPath>tasks.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</PathWithFileName>
-      <FilenameWithoutPath>stream_buffer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</PathWithFileName>
+      <FilenameWithoutPath>timers.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/tasks.c</PathWithFileName>
-      <FilenameWithoutPath>tasks.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</PathWithFileName>
+      <FilenameWithoutPath>cmsis_os2.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</PathWithFileName>
-      <FilenameWithoutPath>timers.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</PathWithFileName>
+      <FilenameWithoutPath>heap_4.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\GCC\ARM_CM3\port.c</PathWithFileName>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c</PathWithFileName>
       <FilenameWithoutPath>port.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
@@ -1021,7 +1049,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>11</GroupNumber>
       <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -1033,74 +1061,74 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>11</GroupNumber>
       <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>11</GroupNumber>
       <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>11</GroupNumber>
       <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>11</GroupNumber>
       <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>11</GroupNumber>
       <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>11</GroupNumber>
       <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvprojx
index 201d7349..23583eb2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvprojx
@@ -16,9 +16,9 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20007FFF) IRAM2(0x20008000-0x2000AFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LoRaWAN_End_Node_DualCoreFreeRTOS_CM4\Exe\</OutputDirectory>
+          <OutputDirectory>LoRaWAN_End_Node_DualCoreFreeRTOS_CM4\</OutputDirectory>
           <OutputName>LoRaWAN_End_Node_DualCoreFreeRTOS_CM4</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -183,7 +183,7 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
@@ -246,7 +246,7 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
@@ -301,19 +301,19 @@
               <OCR_RVCT9>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
                 <StartAddress>0x20008000</StartAddress>
-                <Size>0x3000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>4</Optim>
+            <Optim>7</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM4,STM32WL55xx</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include;../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include;../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -357,7 +357,7 @@
               <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath>../CM4/Core/Inc</IncludePath>
+              <IncludePath>..\CM4\Core\Inc</IncludePath>
             </VariousControls>
           </Aads>
           <LDads>
@@ -381,17 +381,52 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>adc.c</FileName>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+          <Files>
             <File>
-              <FileName>adc_if.c</FileName>
+              <FileName>app_lorawan.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
+              <FilePath>../CM4/LoRaWAN/App/app_lorawan.c</FilePath>
+            </File>
+            <File>
+              <FileName>CayenneLpp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/LoRaWAN/App/CayenneLpp.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/LoRaWAN/App/lora_app.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/main.c</FilePath>
             </File>
             <File>
               <FileName>app_freertos.c</FileName>
@@ -399,9 +434,9 @@
               <FilePath>../CM4/Core/Src/app_freertos.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc.c</FilePath>
             </File>
             <File>
               <FileName>dma.c</FileName>
@@ -418,36 +453,16 @@
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
             </File>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/main.c</FilePath>
-            </File>
             <File>
               <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
-            <File>
-              <FileName>stm32wlxx_hal_timebase_tim.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_hal_timebase_tim.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
-            </File>
             <File>
               <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
             </File>
-            <File>
-              <FileName>sys_debug.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
-            </File>
             <File>
               <FileName>sys_sensors.c</FileName>
               <FileType>1</FileType>
@@ -459,49 +474,39 @@
               <FilePath>../CM4/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>adc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/usart.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
             </File>
             <File>
               <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/usart_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FileName>usart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/usart.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_lorawan.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/app_lorawan.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>CayenneLpp.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/CayenneLpp.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
             <File>
-              <FileName>lora_app.c</FileName>
+              <FileName>stm32wlxx_hal_timebase_tim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/LoRaWAN/App/lora_app.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32wlxx_hal_timebase_tim.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
           <Files>
             <File>
               <FileName>LmHandler_mbwrapper.c</FileName>
@@ -513,62 +518,6 @@
               <FileType>1</FileType>
               <FilePath>../CM4/MbMux/mbmux.c</FilePath>
             </File>
-            <File>
-              <FileName>mbmuxif_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
-            </File>
             <File>
               <FileName>mbmuxif_lora.c</FileName>
               <FileType>1</FileType>
@@ -614,26 +563,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -645,24 +584,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -680,9 +614,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -695,14 +634,24 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -734,21 +683,21 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
             <File>
-              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Middlewares/FreeRTOS</GroupName>
           <Files>
-            <File>
-              <FileName>cmsis_os2.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</FilePath>
-            </File>
             <File>
               <FileName>croutine.c</FileName>
               <FileType>1</FileType>
@@ -759,11 +708,6 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</FilePath>
             </File>
-            <File>
-              <FileName>heap_4.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</FilePath>
-            </File>
             <File>
               <FileName>list.c</FileName>
               <FileType>1</FileType>
@@ -789,10 +733,20 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/timers.c</FilePath>
             </File>
+            <File>
+              <FileName>cmsis_os2.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</FilePath>
+            </File>
+            <File>
+              <FileName>heap_4.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</FilePath>
+            </File>
             <File>
               <FileName>port.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\FreeRTOS\Source\portable\GCC\ARM_CM3\port.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -804,11 +758,6 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
-            <File>
-              <FileName>stm32_lpm.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
-            </File>
             <File>
               <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
@@ -819,11 +768,6 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
-            <File>
-              <FileName>stm32_timer.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
-            </File>
             <File>
               <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
@@ -834,6 +778,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/Project.uvmpw
index f6762b8f..47ed3e73 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/Project.uvmpw
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/Project.uvmpw
@@ -9,13 +9,13 @@
 
   <project>
     <PathAndName>.\LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.uvprojx</PathAndName>
+    <NodeIsActive>1</NodeIsActive>
     <NodeIsExpanded>1</NodeIsExpanded>
     <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
   </project>
 
   <project>
     <PathAndName>.\LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.uvprojx</PathAndName>
-    <NodeIsActive>1</NodeIsActive>
     <NodeIsExpanded>1</NodeIsExpanded>
     <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
   </project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/startup_stm32wl55xx_cm0plus.s
index 5707d81c..7c9ba28d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/startup_stm32wl55xx_cm4.s
index a8b1492f..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size		EQU     0x1000
+Stack_Size		EQU     0x800
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size      EQU     0x400
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
index f9b3e23c..8f413233 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
@@ -10,11 +10,11 @@ LR_IROM1 0x08020000 0x00020000  {    ; load region size_region
    .ANY (+RO)
   }
   ; SRAM2 dedicated to M0+
-  RW_IRAM1 0x2000C000 0x00004000  {  ; RW data
+  RW_IRAM1 0x2000A000 0x00006000  {  ; RW data
    .ANY (+RW +ZI)
   }
 
-  RW_RAM_SHARED 0x2000B000 0x1000  {
+  RW_RAM_SHARED 0x20009000 0x1000  {
    *(MB_MEM2)
   }
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/stm32wl55xx_flash_cm4.sct
index 79a183e1..5141de4a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/stm32wl55xx_flash_cm4.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -14,7 +14,7 @@ LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
    .ANY (+RW +ZI)
   }
   ; Backup SRAM2 dedicated to M4
-RW_IRAM2 0x20008000 0x00003000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+RW_IRAM2 0x20008000 0x00001000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
     *(MAPPING_TABLE)
     *(MB_MEM1)
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/.project
index 50179fa8..84b6a079 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/.project
@@ -12,159 +12,163 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
 			<name>LoRaWAN_End_Node_DualCoreFreeRTOS.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/LoRaWAN_End_Node_DualCoreFreeRTOS.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN_End_Node_DualCoreFreeRTOS.ioc</locationURI>
 		</link>
 		<link>
-			<name>Utilities/stm32_adv_trace.c</name>
+			<name>Doc/readme.txt</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
-			<name>Utilities/stm32_lpm.c</name>
+			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
-			<name>Utilities/stm32_mem.c</name>
+			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
-			<name>Utilities/stm32_seq.c</name>
+			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1602239739489</id>
+			<id>1612372225342</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/.cproject
index 88a90e13..90b87b7d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/.cproject
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1496238033">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1496238033" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.385702995">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.385702995" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1496238033" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1496238033." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.678465812" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1675150425" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.807112163" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.603915106" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1034681912" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1308199613" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.368083017" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1778406209" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/LoRaWAN/App | ../../../CM0PLUS/LoRaWAN/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.841033362" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1706391542" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1467545074" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1811707990" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.482820529" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.385702995" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.385702995." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1482558607" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1146518022" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1963995266" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1740959439" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1043819996" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.2028829559" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../CM0PLUS/LoRaWAN/Target | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/LoRaWAN/App | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.50688095" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.970846546" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.37875142" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1545669362" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.722107155" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1397626217" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1805856362" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.883069511" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2141411511" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1101793947" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.431902198" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.664022351" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1457911915" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1902407064" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2056970101" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.203184544" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/App"/>
@@ -50,6 +51,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
@@ -79,76 +81,74 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1779705441" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.46059347" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.192226204" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1524622767" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.23583161" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1082775783" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1309289535" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1597259946" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1649488334" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1712121814" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1280281807" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.778784712" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.41169839" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1537571191" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.471301752" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.626245338" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.32891654" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.71771903" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1399403875" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1911320986" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1676780940" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1543063148" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1660006464" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1819787218" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1415624274" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.649760160" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.654685373" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886055963" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1280353511" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.2108603600" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1018581819" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1580743902" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.612395121" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1467768302">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1467768302" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1877916436">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1877916436" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1467768302" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1467768302." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1090494914" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.201413194" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.839228535" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1645286212" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1698073821" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.936529518" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1833658325" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.181312666" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/LoRaWAN/App | ../../../CM0PLUS/LoRaWAN/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1959563071" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1466573645" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1854211303" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.662963605" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1753567282" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1877916436" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1877916436." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.2131025445" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.592703064" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1029549733" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.560238952" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2033085634" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1179785185" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../CM0PLUS/LoRaWAN/Target | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/LoRaWAN/App | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1613743927" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.17359785" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1916232832" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.110428972" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.726363958" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1430093011" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.278120655" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.581721139" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.580339193" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.969797310" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.601726679" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1136311337" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2126690838" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.917345106" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1400137899" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.923682162" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1781522391" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/App"/>
@@ -157,6 +157,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
@@ -186,30 +187,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1152668584" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1114025054" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.443466489" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1006317227" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.689823515" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1857424195" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.72617249" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.977694778" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1415730703" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1755887271" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.543459862" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1090538208" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1238084524" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1670894524" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1934473103" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1441043680" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.228128417" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1320479091" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.999518568" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1916263071" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.748296718" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1687807291" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1410971617" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.632798053" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1613785775" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.66468403" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1677610690" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1505265222" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.733504926" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.71883720" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.65107610" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1725990869" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1405567853" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -217,18 +216,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.null.1471970448" name="LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS"/>
+		<project id="LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS.null.709218667" name="LoRaWAN_End_Node_DualCoreFreeRTOS_CM0PLUS"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1496238033;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1496238033.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1805856362;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1779705441">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.385702995;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.385702995.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.431902198;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.46059347">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1467768302;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1467768302.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.581721139;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1152668584">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1877916436;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1877916436.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1136311337;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1114025054">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/.project
index a839bad7..35b4022e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/.project
@@ -25,606 +25,645 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_if_utils.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_interface.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_vm_storage.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/mac_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/platform_util.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/platform_util.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/rsa_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/sha1.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha1.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/sha256.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/tkms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Application/User/Core/ca_low_level.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LmHandler.c</name>
+			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LmhpCompliance.c</name>
+			<name>Application/User/Core/kms_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMac.c</name>
+			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacAdr.c</name>
+			<name>Application/User/Core/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacClassB.c</name>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacCommands.c</name>
+			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacConfirmQueue.c</name>
+			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacCrypto.c</name>
+			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacParser.c</name>
+			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/LmHandler_mbwrapper.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/LoRaMacSerializer.c</name>
+			<name>Application/User/MbMux/features_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/NvmCtxMgmt.c</name>
+			<name>Application/User/MbMux/lora_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmCtxMgmt.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/lora_info.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/Region.c</name>
+			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionAS923.c</name>
+			<name>Application/User/MbMux/mbmuxif_lora.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_lora.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionAU915.c</name>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCN470.c</name>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCN779.c</name>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionCommon.c</name>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionEU433.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionEU868.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionIN865.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LmHandler.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionKR920.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpCompliance.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionRU864.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMac.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/RegionUS915.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacAdr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/cmac.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacClassB.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/lorawan_aes.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCommands.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/soft-se.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacConfirmQueue.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/utilities.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCrypto.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ca_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacParser.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ipcc.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacSerializer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/ipcc_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/NvmDataMgmt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/kms_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/Region.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/main.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAS923.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/nvms_low_level.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAU915.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/rtc.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionBaseUS.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN470.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN779.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/subghz.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCommon.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/sys_app.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU433.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Core/timer_if.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU868.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionIN865.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/LmHandler_mbwrapper.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/features_info.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionKR920.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/features_info.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/lora_info.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionRU864.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/lora_info.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmux.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionUS915.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmux.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/cmac.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_lora.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/lorawan_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_lora.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/soft-se.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<name>Middlewares/Third_Party/LoRaWAN/utilities.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/KMS/App/app_kms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/KMS/App/app_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/KMS/App/app_kms.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/App/app_lorawan.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/app_lorawan.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/lora_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/App/lora_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/lora_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/LoRaWAN/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/Target/radio_board_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
index 9e23530f..f98fb740 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,51 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +105,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
-
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
 
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
-
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
index 2b06c01f..393f6c27 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -46,25 +49,25 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x2000A000, LENGTH = 24K
-  ROM    (rx)    : ORIGIN = 0x08020000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08020000, LENGTH = 128K
   RAM_SHARED (xrw): ORIGIN = 0x20009000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -74,80 +77,96 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
     
-  } >RAM AT> ROM
+  } >RAM AT> FLASH
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(4);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(4);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> FLASH
 
   /* Uninitialized data section into "RAM" Ram type memory */
-  . = ALIGN(8);
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -157,7 +176,7 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM
@@ -182,5 +201,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MB_MEM2       : { *(MB_MEM2) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/.cproject
index c181d465..a63684dd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/.cproject
@@ -1,45 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508358269">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508358269" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.808041748">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.808041748" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508358269" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508358269." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1287581178" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.666459885" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.960255834" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1914613568" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1650470421" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2108065381" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1363444400" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.73456777" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/LoRaWAN/App | ../../../CM4/LoRaWAN/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1084572012" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.510973434" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1837120069" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1872317302" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.24878013" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.808041748" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.808041748." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.544972931" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.838758118" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1106103527" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.922761519" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.222040522" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.945159343" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../Common/Board | ../../../../../../../../Drivers/CMSIS/Include | ../../../CM4/LoRaWAN/Target | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/LoRaWAN/App | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1473083287" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.516758630" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1180323108" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2108610889" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.571017291" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1876759109" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.443497498" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1571782619" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1074153803" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2076211953" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1940487039" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1740964602" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1934501556" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1673386451" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.114504568" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.52829345" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1663309074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.787089658" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/Target"/>
@@ -47,11 +50,11 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/timer"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/lpm/tiny_lpm"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include"/>
@@ -66,74 +69,72 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.275832649" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1553465685" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1607540579" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.62599605" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.689135432" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.660317522" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1538690333" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.508103902" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.71542028" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.815394123" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.817819512" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1061202801" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.343374376" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.514708939" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1677787917" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2020926047" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1633996329" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1917024189" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1354617213" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.85667152" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.28881566" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1630361276" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1172633536" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.147795160" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1765623146" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1699849041" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1424050780" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.2009450011" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1183438575" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1876017993" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.435604608" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1191411255" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.91237685" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1979453617">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1979453617" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309313956">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309313956" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1979453617" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1979453617." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.95757559" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.84738510" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.802444691" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.206369390" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.338691894" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1925697116" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.647409414" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.263716595" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/LoRaWAN/App | ../../../CM4/LoRaWAN/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1743263285" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.546728472" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.332954662" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.354097691" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.986353948" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309313956" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309313956." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1691736013" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1950512778" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.997178703" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.723319507" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1680707269" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1699296888" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../Common/Board | ../../../../../../../../Drivers/CMSIS/Include | ../../../CM4/LoRaWAN/Target | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/LoRaWAN/App | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.343955366" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1850422301" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.82277993" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCoreFreeRTOS_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1921625678" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1969617320" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1825084876" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.139098146" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1250185727" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1829890857" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1207003661" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.939671367" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1157214267" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1530007321" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2032783" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1831245604" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1936254737" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.240358113" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/Target"/>
@@ -141,11 +142,11 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/timer"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/lpm/tiny_lpm"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/FreeRTOS/Source/include"/>
@@ -160,30 +161,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.825705474" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1139190965" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.411292276" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.44626010" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.606818124" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1006500670" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2132969894" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1604449934" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.227371101" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.275963837" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.400450730" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1713257814" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1052572829" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.983331960" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2053052193" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1087732531" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.711148301" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.407025935" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.714555758" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1128689903" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.778734234" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1099088834" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1921504942" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.256607369" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.406951103" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1279501811" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.332348902" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.351222636" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1908339371" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.581000417" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.151635308" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.310635253" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1746166011" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -191,18 +190,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.null.744984526" name="LoRaWAN_End_Node_DualCoreFreeRTOS_CM4"/>
+		<project id="LoRaWAN_End_Node_DualCoreFreeRTOS_CM4.null.2116141375" name="LoRaWAN_End_Node_DualCoreFreeRTOS_CM4"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508358269;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.508358269.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1074153803;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.275832649">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.808041748;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.808041748.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1934501556;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1553465685">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1979453617;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1979453617.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1250185727;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.825705474">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309313956;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309313956.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1157214267;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1139190965">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/.project
index ffb57cc1..f23d3adc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/.project
@@ -25,356 +25,360 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
-			<name>Utilities/stm32_adv_trace.c</name>
+			<name>Doc/readme.txt</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
-			<name>Utilities/stm32_lpm.c</name>
+			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
-			<name>Utilities/stm32_mem.c</name>
+			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
-			<name>Utilities/stm32_seq.c</name>
+			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/cmsis_os2.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/croutine.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/croutine.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/croutine.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/event_groups.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/event_groups.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/heap_4.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/list.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/list.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/list.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/port.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/queue.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/queue.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/queue.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/stream_buffer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/stream_buffer.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/tasks.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/tasks.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/tasks.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/FreeRTOS/timers.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/FreeRTOS/Source/timers.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/FreeRTOS/Source/timers.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/app_freertos.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/app_freertos.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/app_freertos.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_hal_timebase_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_timebase_tim.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_hal_timebase_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_sensors.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_sensors.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_sensors.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/LmHandler_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/LmHandler_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmux.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_lora.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_lora.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_lora.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/CayenneLpp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/CayenneLpp.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/CayenneLpp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/app_lorawan.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/app_lorawan.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/LoRaWAN/App/lora_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/lora_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/LoRaWAN/App/lora_app.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
index 89dfe9e5..af218d28 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,52 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +106,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
-
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
-
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
 
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
index 1eeab01b..18f21dbf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -39,29 +42,29 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x400 ; /* required amount of heap  */
-_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x800 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 128K
   RAM_SHARED (rw): ORIGIN = 0x20008000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
     . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
     . = ALIGN(4);
@@ -76,30 +79,30 @@ SECTIONS
 
     . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
     . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  .ARM.extab   : { 
+  .ARM.extab   : {
     . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .ARM : {
     . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   .preinit_array     :
   {
@@ -108,8 +111,8 @@ SECTIONS
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .init_array :
   {
     . = ALIGN(4);
@@ -118,8 +121,8 @@ SECTIONS
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .fini_array :
   {
     . = ALIGN(4);
@@ -128,23 +131,47 @@ SECTIONS
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
     
-  } >RAM AT> ROM
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
 
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
@@ -182,6 +209,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
-   MB_MEM1 (NOLOAD)       : { *(MB_MEM1) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/readme.txt
index 32ed54d3..4abf41e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/readme.txt
@@ -1,12 +1,12 @@
 /**
   @page LoRaWAN_End_Node_DualCoreFreeRTOS Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/readme.txt 
+  * @file    Applications/LoRaWAN/LoRaWAN_End_Node_DualCoreFreeRTOS/readme.txt
   * @author  MCD Application Team
   * @brief   This application is a simple demo application software of a LoRa
-  *          modem connecting to Network server. Data sent can be checked on 
+  *          modem connecting to Network server. Data sent can be checked on
   *          Network server for eg Loriot. Traces are displayed over UART
   ******************************************************************************
   * @attention
@@ -25,7 +25,8 @@
 @par Description
 
 This directory contains a set of source files that implements a Dual Core (CM4 / CM0) LoRa application
-device sending sensors data to LoRa Network server.
+device sending sensors data to LoRa Network server with FreeRTOS Task scheduler on CM4.
+Data are sent periodically on timer event or on "user button 1" depending on the configuration.
 
 This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
   ******************************************************************************
@@ -34,7 +35,7 @@ This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx
 
 Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
 
-@par Directory contents 
+@par Directory contents
 
 
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Inc/ca_conf.h                This file contains configuration for Cryptographic API (CA)
@@ -87,11 +88,10 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/LmHandler_mbwrapper.h       This file implements the CM0PLUS side wrapper of the LmHandler
                                                                                 interface shared between M0 and M4.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.h                     API which interfaces CM0PLUS to IPCC
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_kms.h               Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.h              API provided to CM0PLUS applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.h             API for CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.h               API for CM0PLUS applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.h             API for CM0PLUS applic to register and handle TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.h              API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.h             API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.h               API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.h             API for CM0PLUS application to register and handle TRACE via MBMUX
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.h           This file implements the CM0PLUS side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Inc/adc.h                        This file contains all the function prototypes for
@@ -128,14 +128,12 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.h           This file implements the CM4 side wrapper of the LmHandler
                                                                                 interface shared between M0 and M4.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.h                         API which interfaces CM4 to IPCC
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_kms.h                   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.h                  API provided to CM4 applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.h                 API for CM4 applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.h                   API for CM4 applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.h                 API for CM4 applic to register and handle TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.h                  API provided to CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.h                 API for CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.h                   API for CM4 application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.h                 API for CM4 application to register and handle TRACE via MBMUX
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.h               This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/board_resources.h            Header for driver at.c module
   - LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/stm32wlxx_nucleo_conf.h      STM32WLxx_Nucleo board configuration file.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/features_info.h              Feature list and parameters TypeDefinitions
   - LoRaWAN_End_Node_DualCoreFreeRTOS/Common/MbMux/lora_info.h                  To give info to the application about LoRaWAN configuration
@@ -146,7 +144,7 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ca_low_level.c           This file contains the low level implementations of the Cryptographic API (CA) module.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc.c                   This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc_if.c                Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/ipcc_if.c                Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/kms_low_level.c          This file contains implementations for Key Management Services (KMS)
                                                                                 module Low Level access to Flash, CRC...
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/main.c                   : Main program body
@@ -154,6 +152,8 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
                                                                                 module NVM Low Level access to physical storage (Flash...)
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/rtc.c                    This file provides code for the configuration
                                                                                 of the RTC instances.
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c      This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32wlxx_it.c           Interrupt Service Routines.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/stm32_lpm_if.c           Low layer function to enter/exit low power modes (stop, sleep)
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/Core/Src/subghz.c                 This file provides code for the configuration
@@ -169,10 +169,9 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
                                                                                 shared between M0 and M4.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/lora_info.c                 To give info to the application about LoRaWAN configuration
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmux.c                     Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_kms.c               Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.c              allows CM0 applic to register and handle LoraWAN to MBMUX
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.c             allows CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.c               allows CM0 applic to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_lora.c              allows CM0 application to register and handle LoraWAN to MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_radio.c             allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_sys.c               allows CM0 application to handle the SYSTEM MBMUX channel
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/mbmuxif_trace.c             Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM0PLUS/MbMux/radio_mbwrapper.c           This file implements the CM0 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
@@ -184,7 +183,7 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
                                                                                 of all the requested memory to memory DMA transfers.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc.c                       This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc_if.c                    Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/ipcc_if.c                    Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/main.c                       : Main program body
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/stm32wlxx_hal_msp.c          This file provides code for the MSP Initialization
                                                                                 and de-Initialization codes.
@@ -196,42 +195,43 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/timer_if.c                   Configure RTC Alarm, Tick and Calendar manager
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart.c                      This file provides code for the configuration
                                                                                 of the USART instances.
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart_if.c                   Configuration of UART MX driver interface for hyperterminal communication
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/Core/Src/usart_if.c                   Configuration of UART driver interface for hyperterminal communication
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/app_lorawan.c             Application of the LRWAN Middleware
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/CayenneLpp.c              Implements the Cayenne Low Power Protocol
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/LoRaWAN/App/lora_app.c                Application of the LRWAN Middleware
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/LmHandler_mbwrapper.c           This file implements the CM4 side wrapper of the LoraMac interface
                                                                                 shared between M0 and M4.
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmux.c                         CM4 side multiplexer to map features to IPCC channels
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_kms.c                   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.c                  allows CM4 applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.c                 allows CM4 applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.c                   allows CM4 applic to handle the SYSTEM MBMUX channel.
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.c                 allows CM4 applic to receive by CM0 TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_lora.c                  allows CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_radio.c                 allows CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_sys.c                   allows CM4 application to handle the SYSTEM MBMUX channel.
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/mbmuxif_trace.c                 allows CM4 application to receive by CM0 TRACE via MBMUX
   - LoRaWAN_End_Node_DualCoreFreeRTOS/CM4/MbMux/radio_mbwrapper.c               This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCoreFreeRTOS/Common/Board/board_resources.c            Source file
   - LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/system_stm32wlxx.c          CMSIS Cortex Device Peripheral Access Layer System Source File
   - LoRaWAN_End_Node_DualCoreFreeRTOS/Common/System/sys_debug.c                 Enables 4 debug pins for internal signals RealTime debugging
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node_DualCoreFreeRTOS/STM32CubeIDE/CM4/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - CM0PLUS (Mw and radio drivers config) 
-        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, radio_board_if.h, main.h, etc
-    - CM4 (Lora appli)
-        - sys_conf.h, lora_app.h, nucleo_conf.h, main.h, etc
-    - Careful: 
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, main.h, etc
+    - CM4 (Lora application)
+        - sys_conf.h, lora_app.c, lora_app.h, nucleo_conf.h, main.h, etc
+    - Careful:
         - the region and class chosen on CM4/LoRaWAN/App/lora_app.h shall be compatible with CM0PLUS/LoRaWAN/Target/lorawan_conf.h list
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
 
   -Set Up:
 
@@ -242,31 +242,33 @@ Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FreeRTOS
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all CM4 files and load your image into CM4 target memory
-  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory 
+  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory
   - Reset the system (two cores)
   - Run the example
   - Open a Terminal, connected the LoRa Object
   - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
 
-@par How to use IAR to debug ? 
-  - open project.eww and select CM4 project
-  - make sure the flag DEBUGGER_ON =1 in app_conf.h
-  - better to define the flag LOW_POWER_DISABLE = 1 at least on one MCU (currently debugger has problem in dual core STOP mode)
-  - compile and download (Ctrl + D)
+@par How to debug ?
+  - Open your preferred toolchain and select CM4 project
+  - define the flag DEBUGGER_ENABLED to 1 in CM4\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download
   - put a breakpoint in sys_app.c one line after HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
   - run CM4 (the above functions sets PWR_CR4_C2BOOT flag)
-  - open a second instance of project.eww and select CM0PLUS project
-  - compile and download using "Download active application" 
+  - open a second instance of your preferred toolchain and select CM0PLUS project
+  - to debug CM0PLUS as well, define the flag DEBUGGER_ENABLED to 1 in CM0PLUS\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download using "Download active application"
   - once CM0PLUS code is downloaded reset (system reset) the CM4
   - run CM4 to the breakpoint again
-  - attach to running target CM0PLUS 
+  - attach to running target CM0PLUS
          (CM0PLUS is in a while loop waiting CM4 to give green light to go further)
          (this is done to prevent CM0PLUS to execute too much code before attaching)
-  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exite the while loop
+  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exit the while loop
 
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/app_sfu.h
new file mode 100644
index 00000000..eaaefeaf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/app_sfu.h
@@ -0,0 +1,243 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_crypto_config.h"
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Use this define to choose the type of Firmware Image Programming you want to use.
+  * This version supports only 2 modes:
+  *
+  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
+  *       The image is received in encrypted format.
+  *       The image must be decrypted to be installed:
+  *         this is done according to the selected crypto scheme,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  * SFU_CLEAR_IMAGE: Clear Firmware Image
+  *       The image is received in clear format.
+  *       No decrypt operation is needed before installing the image:
+  *         the selected crypto scheme must be compatible with this choice,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  *
+  */
+#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
+#else
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
+#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
+
+#define SFU_DEBUG_MODE               /*!< Comment this define to optimize memory footprint (debug mode removed)
+                                          No more print on terminal during SBSFU execution */
+
+/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
+                                          this switch activates more debug prints in the console (FSM state info...) */
+
+
+/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
+                                                          When this switch is activated, the FWIMG part of SB_SFU will
+                                                          block when an abnormal error is encountered */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
+#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
+#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
+
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
+#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
+
+/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
+                                           Automatically executed @startup */
+#if defined(SFU_TEST_PROTECTION)
+#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
+#endif /* SFU_TEST_PROTECTION */
+
+/**
+  * SB_SFU status LED.
+  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
+  * This is useful when no log is enabled.
+  *
+  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
+  * \li For the other situations, please check the other defines below.
+  */
+#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
+#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
+                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
+#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
+
+
+/**
+  * Optional Features Software Configuration
+  */
+#if !defined(SFU_TEST_PROTECTION)
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+#else
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
+#endif /* SFU_TEST_PROTECTION */
+
+#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
+#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
+#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
+
+/* Uncomment the define below if you want to use minicom with Linux */
+/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
+
+#if defined(MINICOM_YMODEM)
+/* Minicom does not accept the debug prints during the YMODEM session */
+#undef SFU_VERBOSE_DEBUG_MODE
+#endif /* MINICOM_YMODEM */
+
+/* Uncomment the define below if you want to remove the swap area
+   ==> partial update is not supported in this configuration
+   ==> image validation is not supported in this configuration */
+/*#define SFU_NO_SWAP*/                              /*!< FW upgrade installation process without swap area */
+
+/* Multi-images configuration :
+   - Max : 3 Active images and 3 Download area
+   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
+   - Active slot identified with SFU magic (1,2,3) information from header
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+   - FW image valid all feature authorized from master slot
+*/
+#define SFU_NB_MAX_ACTIVE_IMAGE 1U                        /*!< 1 active image managed */
+#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 dwl area managed */
+#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
+
+
+/* The define below allows disabling all security IPs at once.
+ *
+ * Enabled: all security IPs (WRP, watchdog...) are disabled.
+ * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
+ *
+ */
+
+#define SECBOOT_DISABLE_SECURITY_IPS  /*!< Disable all security IPs at once when activated */
+
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_WRP_PROTECT_ENABLE
+#define SFU_RDP_PROTECT_ENABLE
+/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
+                                             neither connected to GND nor to 5V (floating level), there are too many
+                                             spurious tamper event detected */
+#define SFU_DAP_PROTECT_ENABLE     /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
+                                        It might be difficult to reconnect the Debugger.*/
+#define SFU_DMA_PROTECT_ENABLE
+/* #define SFU_IWDG_PROTECT_ENABLE */   /*!< WARNING:
+                                        1. Be Careful if enabling this protection. IWDG will be active also after
+                                           switching to UserApp: a refresh is needed.
+                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
+                                           platform (flash size...)*/
+#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
+                                        Enables/Disables the MPU protection.
+                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
+                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
+                                        addition to the overall MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
+                                        executable area */
+
+
+/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
+                                                 steps.
+                                                 When enabling this lock, Static protections cannot be modified any more
+                                                 and Debug is finally disabled. */
+
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
+                                                      completely disabled, OB update no more possible  */
+
+
+#else
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
+                                                      field should set it as Level2 */
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+/**
+  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
+  * This define is taken into account only if RDP level 2 is not set.
+  * If RDP level 2 is set no modification can be done anyway.
+  *
+  * Enabled: Option Bytes Development Mode enabled.
+  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
+  *          If an OB is not set though it should be then this setting is automatically corrected.
+  *          This applies only as long as RDP level 2 is not set.
+  *
+  * Disabled: Option Bytes Development Mode disabled.
+  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
+              the first time.
+  *           SB_SFU checks the Option Bytes configuration but does not correct it.
+  *           If a problem is detected an error message is reported and the execution stops.
+  */
+#define SECBOOT_OB_DEV_MODE
+
+
+#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
+                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
+
+
+/**
+  * Application Configuration
+  *
+  */
+#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
+                                              You can also define an upper bound here if you plan to use it */
+
+#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
+                                              no FW installed or due to an attack attempt). Could be different from
+                                              SFU_FW_VERSION_START_NUM */
+
+/**
+  * Features compatibility control
+  */
+#if defined(SFU_NO_SWAP) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_NO_SWAP process"
+#endif
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_SECURE_USER_PROTECT_ENABLE process"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_boot.c
new file mode 100644
index 00000000..e748ea93
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_boot.c
@@ -0,0 +1,1715 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.c
+  * @author  MCD Application Team
+  * @brief   SFU BOOT module
+  *          This file provides firmware functions to manage the following
+  *          functionalities of the Secure Boot:
+  *           + Initialization and de-initialization functions
+  *           + Secure Boot Control functions
+  *           + Secure Boot State functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_BOOT_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+#include "sfu_boot.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
+
+/*
+ * The sfu_com init is provided by the sfu_com_trace module by default.
+ * If not, then it is taken from the sfu_com_loader module.
+ */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_trace.h"
+#else
+#include "sfu_trace.h"      /* needed anyhow even if the defines will be empty */
+#include "sfu_com_loader.h" /* needed only for the COM init/de-init */
+#endif /* SFU_DEBUG_MODE  || SFU_TEST_PROTECTION */
+#include "se_def.h"
+#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
+#include "sfu_new_image.h"            /* the local loader is a kind of "application" running in SB_SFU so it needs the
+                                         services to install a FW image */
+#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
+#include "sfu_test.h"                 /* auto tests */
+#include "sfu_fwimg_internal.h"
+
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "sfu_kms.h"
+#endif /* KMS_ENABLED */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct
+{
+  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
+  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
+} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
+                                                     information using during the SM evolution. */
+
+/* Private defines -----------------------------------------------------------*/
+#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
+#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
+#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
+                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
+
+#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
+                                    maintained for future customization/expansion of the field itself */
+
+#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
+
+/* Private macros ------------------------------------------------------------*/
+#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    if (Status == SFU_SUCCESS){                                         \
+      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
+    }                                                                   \
+    else {                                                              \
+      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
+    }                                                                   \
+  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
+
+
+#define SFU_SET_SM_CURR_STATE(NewState)                                 \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    m_StateMachineContext.CurrState = NewState;                         \
+  }while(0) /*!< Set a State Machine state*/
+
+/* Private variables ---------------------------------------------------------*/
+/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
+static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
+                                                                         SFU_STATE_INITIAL
+                                                                        };
+
+/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
+static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToResume = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToRollback = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+uint8_t initialDeviceStatusCheck;
+
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_BOOT_Init(void);
+static SFU_ErrorStatus SFU_BOOT_DeInit(void);
+static void SFU_BOOT_BspConfiguration(void);
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
+static void SFU_BOOT_SM_CheckStatusOnReset(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static void SFU_BOOT_SM_CheckNewFwToDownload(void);
+static void SFU_BOOT_SM_DownloadNewUserFw(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
+static void SFU_BOOT_SM_InstallKMSBlob(void);
+#endif /* KMS_ENABLED */
+static void SFU_BOOT_SM_CheckUserFwStatus(void);
+static void SFU_BOOT_SM_VerifyUserFwSignature(void);
+static void SFU_BOOT_SM_ExecuteUserFw(void);
+static void SFU_BOOT_SM_HandleCriticalFailure(void);
+static void SFU_BOOT_SM_RebootStateMachine(void);
+static void SFU_BOOT_SM_InstallNewUserFw(void);
+static void SFU_BOOT_SM_ResumeInstallNewUserFw(void);
+static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
+static void SFU_BOOT_ManageResetSources(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
+  *        In the nominal case, the bootloader service runs until the user application is launched.
+  *        When no valid user application can be run (after installing a new image or not),
+  *        if the local loader feature is not enabled then the execution stops,
+  *        otherwise a local download will be awaited.
+  *        If the state machine encounters a major issue then a reboot is triggered.
+  * @param None.
+  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
+  * @note Constraints
+  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
+  *       2. This function also takes care of BSP initialization after enabling the secure mode.
+  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
+  *       3. No other entity should handle the initialization of the Secure Engine.
+  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
+  *          configurations will be overwritten).
+  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
+  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
+  *          error cause.
+  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
+  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
+  *          new image).
+  * @note Settings are handled at compilation time:
+  *       1. See compiler switches in main.h for secure IPs settings
+  *       2. The trace system is configured in the sfu_trace.h file
+  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
+  *          stage.
+  */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
+{
+  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
+
+  /*
+   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
+   * "automatically" managed by SBSFU compiler command
+   */
+  if (SE_Startup() == SE_SUCCESS)
+  {
+    /* Security Configuration */
+    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
+    {
+      /* Board BSP  Configuration */
+      SFU_BOOT_BspConfiguration();
+
+      /* Configure the Secure Boot and start the State machine */
+      if (SFU_BOOT_Init() == SFU_SUCCESS)
+      {
+        /* Start the Secure Boot State Machine */
+        (void) SFU_BOOT_SM_Run();
+      }
+      else
+      {
+        /* failure when initializing the secure boot service */
+        e_ret_code = SFU_BOOT_INIT_FAIL;
+      }
+    }
+    else
+    {
+      /* failure when configuring the security IPs  */
+      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
+    }
+  }
+  else
+  {
+    /* failure at secure engine initialization stage */
+    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
+  }
+
+  /*
+   * This point should not be reached unless a critical init failure occurred
+   * Return the error code
+   */
+  return (e_ret_code);
+}
+
+/**
+  * @brief  Force System Reboot
+  * @param  None
+  * @retval None
+  */
+void SFU_BOOT_ForceReboot(void)
+{
+  /*
+   * WARNING: The follow TRACEs are for debug only. This function could be called
+   * inside an IRQ so the below printf could not be executed or could generate a fault!
+   */
+  TRACE("\r\n========= End of Execution ==========");
+  TRACE("\r\n\r\n\r\n");
+
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/**
+  * @brief  Initialize the Secure Boot State machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_Init(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
+   * download)
+   */
+  initialDeviceStatusCheck = 1U;
+
+  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
+  if (SFU_LL_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Flash interface initialization */
+  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* The COM modules is required only if the trace or the local download is enabled */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
+  if (SFU_COM_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  /* Call the SFU_LOADER module Init */
+  if (SFU_LOADER_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+  /* Call the Exception module Init */
+  if (SFU_EXCPT_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Call the image handling Init  */
+  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
+  {
+    return SFU_ERROR;
+  } /* else continue */
+
+#ifdef SFU_TEST_PROTECTION
+  SFU_TEST_Init();
+#endif /* SFU_TEST_PROTECTION */
+
+  TRACE("\r\n\r\n");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  TRACE("\r\n=                                                                    =");
+  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n\r\n");
+
+  /* Initialize the Secure Engine that will be used for all the most critical operations */
+  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
+  }
+  else
+  {
+    e_ret_status = SFU_SUCCESS;
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize the Secure Boot State machine.
+  * @param  None
+  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
+  *         The bootloader can terminate:
+  *         1. with an init failure : no de-init needed
+  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
+  *            by this function.
+  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
+  *            required security mechanisms.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_DeInit(void)
+{
+  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  if (SFU_COM_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+  if (SFU_LL_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  BSP Initialization.
+  *         Called when the secure mode is enabled.
+  * @note   The BSP configuration should be handled only in this function.
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_BspConfiguration()
+{
+  /* LED Init*/
+  (void) BSP_LED_Init(SFU_STATUS_LED);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* User Button */
+  BUTTON_INIT();
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Execute the Secure Boot state machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
+  void (*fnStateMachineFunction)(void);
+  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+                                                 SFU_BOOT_SM_CheckNewFwToDownload,
+                                                 SFU_BOOT_SM_DownloadNewUserFw,
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
+                                                 SFU_BOOT_SM_InstallKMSBlob,
+#endif /* KMS_ENABLED */
+                                                 SFU_BOOT_SM_CheckUserFwStatus,
+                                                 SFU_BOOT_SM_InstallNewUserFw,
+                                                 SFU_BOOT_SM_VerifyUserFwSignature,
+                                                 SFU_BOOT_SM_ExecuteUserFw,
+                                                 SFU_BOOT_SM_ResumeInstallNewUserFw,
+                                                 SFU_BOOT_SM_RollbackInstallPrevUserFw,
+                                                 SFU_BOOT_SM_HandleCriticalFailure,
+                                                 SFU_BOOT_SM_RebootStateMachine
+                                                };
+
+  /* Start the State Machine loop/evolution */
+  while (e_ret_status == SFU_SUCCESS)
+  {
+    /* Always execute a security/safety check before moving to the next state */
+    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
+    {
+      /* Get the right StateMachine function according to the current state */
+      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
+
+      /* Call the State Machine function associated to the current state */
+      fnStateMachineFunction();
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* If the State Machine cannot evolve anymore, reboot is the only option */
+
+  /* Set the error before forcing a reboot */
+  SFU_EXCPT_SetError(SFU_EXCPT_UNKNOWN);
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+  return e_ret_status;
+}
+
+/** @brief  Check the Reset status in order to understand the last cause of Reset
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckStatusOnReset(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
+
+  /* Check the wakeup sources */
+  SFU_BOOT_ManageResetSources();
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* When the local loader feature is supported we need to check if a local download is requested */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+#ifdef KMS_ENABLED
+  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* When the local loader feature is disabled go directly to the check of the FW status */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Check if a new UserApp firmware is available for downloading.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckNewFwToDownload(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_DWL_REQ)
+  {
+    TRACE("\r\n= [SBOOT] STATE: execution standalone loader");
+    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+    /* This is unreachable code (dead code) in principle...
+    At this point we should not be able to reach the following instructions.
+    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
+    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
+    if (0U != BUTTON_PUSHED())
+    {
+      /* Download requested */
+      e_ret_status = SFU_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /*
+     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
+     * download to start
+     */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+#ifdef KMS_ENABLED
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
+
+#ifdef KMS_ENABLED
+/**
+  * @brief  Check if a KMSBlob is waiting for installation.
+  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
+  *         disabled.
+  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
+  *         enabled.
+  *         In this latter case,
+  *               if a new Firmware download is requested,
+  *               it has priority over the KMS blob installation,
+  *               and the KMS blob installation request will be lost.
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
+
+  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
+  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
+
+  /* Check if a Blob Installation is requested or on-going */
+  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
+
+  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
+  {
+    /* Blob installation requested */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+/**
+  * @brief  Check if a KMSBlob is waiting for install.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallKMSBlob(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  uint8_t         *pBlobHdr;
+  uint8_t         *pBlobInFlash;
+  CK_RV           e_status;
+
+  /* At boot-up, Managing ImportBlob through KMS services.  */
+  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
+
+  /* Here we will Launch SE service to take consume the Blob */
+  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
+  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
+  }
+  else
+  {
+    /* Initialize KMS in order to be able to import blob using internal algorithms */
+    e_status = C_Initialize(NULL);
+    if (e_status == CKR_OK)
+    {
+      /* we do not take the return value into account as we will not retry the import in case of issue */
+      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
+
+      if (e_status != CKR_OK)
+      {
+        (void)C_Finalize(NULL);
+      }
+      else
+      {
+        e_status = C_Finalize(NULL);
+      }
+    }
+
+    if (e_status != CKR_OK)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
+    }
+
+    /* In any case, we remove the Blob To Install (regardless of the result) */
+    e_ret_status = SFU_KMS_EraseBlob();
+
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
+    }
+
+    /* Display the KMS import result */
+    switch (e_status)
+    {
+      case CKR_OK:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
+        e_ret_status = SFU_SUCCESS;
+        break;
+
+      case CKR_SIGNATURE_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DATA_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DEVICE_ERROR:
+        /* At boot-up, NVM Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_OPERATION_ACTIVE:
+        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      default:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
+        e_ret_status = SFU_ERROR;
+        break;
+    }
+  }
+
+  /* Set the next State Machine regardless of the KMS import result */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+#endif /* KMS_ENABLED */
+
+
+/**
+  * @brief  Check the Status of the Fw Image to work on  in order to set the next
+  *         State Machine state accordingly
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckUserFwStatus(void)
+{
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  SFU_IMG_ImgInstallStateTypeDef e_PendingInstallStatus;
+  uint32_t i;
+
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_INSTALL_REQ)
+  {
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[SLOT_DWL_1],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * Notify the Secure Boot that a new image has been downloaded
+       */
+      e_ret_status = SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated);
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    if (e_ret_status == SFU_ERROR)
+    {
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* In all cases, standard SBSFU start-up at next reset */
+    STANDALONE_LOADER_STATE = STANDALONE_LOADER_NO_REQ;
+  }
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+  /* Check if there is a pending action related to a FW update procedure */
+  e_PendingInstallStatus = SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall, &m_ActiveSlotToResume,
+                                                            &m_ActiveSlotToRollback);
+
+  switch (e_PendingInstallStatus)
+  {
+    case SFU_IMG_FWIMAGE_ROLLBACK:
+      /*
+       * The new FW image has not been validated : rollback requested @ next reset
+       * Rollback is done assuming the previous image was backed-up in corresponding dwl slot
+       * As example : new image installed in SLOT_ACTIVE_2. Previous image was backed-up in SLOT_DWL_2
+       */
+      /* Identify corresponding backed-up slot */
+      m_DwlSlotToInstall = m_ActiveSlotToRollback - SLOT_ACTIVE_1 + SLOT_DWL_1;
+      TRACE("\r\n\t  Installation not validated: rollback procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
+            m_ActiveSlotToRollback, m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_ROLLBACK_PREV_USER_FW);
+      break;
+
+    case SFU_IMG_FWUPDATE_STOPPED:
+      /* The installation of a downloaded FW has been interrupted */
+      /* We perform a resume of the installation */
+      TRACE("\r\n\t  Installation Failed: resume installation procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
+            m_ActiveSlotToResume, m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_RESUME_INSTALL_NEW_USER_FW);
+      break;
+
+    case SFU_IMG_FWIMAGE_TO_INSTALL:
+      /*
+       * A new FW is detected in the dwl slot and ready to be installed
+       */
+      TRACE("\r\n\t  New Fw to be installed from slot SLOT_DWL_%d", m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_INSTALL_NEW_USER_FW);
+      break;
+
+    case SFU_IMG_NO_FWUPDATE:
+      /*
+       * No FW image installation pending :
+       *   1- Priority to MASTER_SLOT : check if a firmware is detected
+       *   2- No firmware identified : verify other slots and start execution on the last detected firmware
+       *   3- No active firmware candidate for execution ==> Local download
+       *
+       * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
+       */
+      m_ActiveSlotToExecute = 0U;
+
+      /* 1- Priority to MASTER_SLOT : check if a firmware is detected */
+      if (MASTER_SLOT != 0xFFU)
+      {
+        if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
+        {
+          m_ActiveSlotToExecute = MASTER_SLOT;
+          TRACE("\r\n\t  A FW is detected in the slot SLOT_ACTIVE_%d", m_ActiveSlotToExecute);
+          SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+        }
+      }
+
+      /* 2- No firmware identified : verify other slots and start execution on the last detected firmware */
+      if (m_ActiveSlotToExecute == 0U)
+      {
+        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+        {
+          if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
+          {
+            if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+            {
+              m_ActiveSlotToExecute = SLOT_ACTIVE_1 + i;
+              TRACE("\r\n\t  A FW is detected in the slot SLOT_ACTIVE_%d", m_ActiveSlotToExecute);
+              SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+            }
+          }
+        }
+      }
+
+      /* 3- No active firmware candidate for execution ==> Local download */
+      if (m_ActiveSlotToExecute == 0U)
+      {
+        /* Control if all active slot are empty */
+        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+        {
+          if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
+          {
+            if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+            {
+              /*
+               * We should never reach this code.
+               * Could come from an attack ==> as an example we invalidate current firmware.
+               */
+              TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+              (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+            }
+          }
+        }
+
+        /*
+         * No valid FW is present in the active slot
+         * and there is no FW to be installed in UserApp download area: local download (when possible)
+         */
+        if (1U == initialDeviceStatusCheck)
+        {
+          TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+          /* Waiting for a local download is automatic, no trigger required. */
+          TRACE("\r\n\t  Waiting for the local download to start... ");
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+          initialDeviceStatusCheck = 0U;
+#ifdef SFU_TEST_PROTECTION
+          SFU_TEST_Reset();
+#endif /* SFU_TEST_PROTECTION */
+        }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        else
+        {
+          /*
+           * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
+           *   If a FW is present in the active slot => it is checked then launched.
+           *   If there is a FW to install => the installation procedure starts.
+           *   If no FW is present and no installation is pending:
+           *      - if the local loader feature is enabled we enter the local download state
+           *      - if the local loader feature is disabled, the execution is stopped.
+           */
+          TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS should not be entered more than once per boot.");
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+        SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+        /*
+         * When the local loader feature is disabled it is not possible to enter the local download state.
+         * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
+         * So we end up waiting for the user to reboot (or the IWDG to expire).
+         */
+        TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
+        while (1 == 1)
+        {
+          (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+        }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+      }
+      break;
+
+    default:
+      TRACE("\r\n\t  Flash State Unknown, Critical failure");
+      /* If not in one of the previous state, something bad occurred */
+      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+      break;
+  }
+}
+
+
+#if SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   Reset is generated at by standalone loader when FW is downloaded.
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /* Jump into standalone loader */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+  e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /*
+   * Download area will be chosen as following. After header analysis :
+   *   - same DWL slot number as SFU magic number, if the slot is configured.
+   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
+   *   - by default : SLOT_DWL_1
+   */
+  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
+          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
+          fw_image_header_validated.PartialFwOffset, u_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * Notify the Secure Boot that a new image has been downloaded
+     * by calling the SE interface function to trigger the installation procedure at next reboot.
+     */
+    if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
+    {
+      /* Erase downloaded image */
+      (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
+
+      /* no specific error cause set */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    /* Erase downloaded image */
+    (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
+
+    /* Memorize the specific error cause if any before handling this critical failure */
+    switch (e_ret_status_app)
+    {
+      case SFU_LOADER_ERR_COM:
+        SFU_EXCPT_SetError(SFU_EXCPT_COM_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_VERSION:
+        SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_LENGTH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FW_TOO_BIG);
+        break;
+      case SFU_LOADER_ERR_AUTH_FAILED:
+        SFU_EXCPT_SetError(SFU_EXCPT_HEADER_AUTH_ERR);
+        break;
+      case SFU_LOADER_ERR_FLASH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FLASH_ERR);
+        break;
+      case SFU_LOADER_ERR_CRYPTO:
+        SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+        break;
+      default:
+        /* no specific error cause */
+        break;
+    }
+  } /* else error with no specific error cause */
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+/**
+  * @brief  Install the new UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: INSTALL NEW USER FIRMWARE ");
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_SECOND_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /* Check the candidate version vs current active version */
+  e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    /* Erase downloaded FW in case of authentication/integrity error */
+    (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
+  }
+  else
+  {
+    /* Secure coding : double check the candidate version vs current active version */
+    e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+  }
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* Launch the Firmware Installation procedure */
+    e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
+  }
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /*
+     * The FW installation succeeded: the previous FW is now backed up in the dwl slot.
+     * Nothing more to do, in the next FSM state we are going to verify the FW again and execute it if possible.
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FW installation succeeded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * The FW installation failed: we need to reboot and the resume procedure will be triggered at next boot.
+     * Nothing more to do, the next FSM state (HANDLE_CRITICAL_FAILURE) will deal with it.
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FW installation failed!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+}
+
+/**
+  * @brief  Execute a UserApp Fw installation resume
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ResumeInstallNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: RESUME INSTALLATION OF NEW USER FIRMWARE");
+
+  /*
+   * This resume installation procedure continue installation of new User FW in the active slot
+   */
+  e_ret_status = SFU_IMG_TriggerResumeInstallation(m_ActiveSlotToResume, m_DwlSlotToInstall);
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    /* No specific error cause managed here because the FSM state already provides the information. */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+}
+
+/**
+  * @brief  Execute a rollback to the previous UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void)
+{
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: ROLLBACK INSTALLATION TO PREVIOUS USER FIRMWARE");
+
+  /*
+   * Rollack installation to the previous User FW from Dwl_Slot
+   */
+  e_ret_status = SFU_IMG_TriggerRollbackInstallation(m_ActiveSlotToRollback, m_DwlSlotToInstall);
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    /* No specific error cause managed here because the FSM state already provides the information. */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+#else
+  TRACE("\r\n= [SBOOT] STATE: ROLLBACK NOT SUPPORTED");
+
+  /* No specific error cause managed here because the FSM state already provides the information. */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+#endif /* ENABLE_IMAGE_STATE_HANDLING && !(SFU_NO_SWAP) */
+}
+
+
+/**
+  * @brief  Verify the UserApp Fw signature before executing it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_VerifyUserFwSignature(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
+
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /*
+   * With the 2 images handling:
+   *       1. the header signature is verified  when installing a new firmware
+   *       2. the firmware signature is checked when installing a new firmware
+   *       3. remaining part of active slot is kept "clean" during installation procedure
+   * So following checks should never fail.
+   */
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
+        if (SFU_SUCCESS == e_ret_status)
+        {
+          /* Check the FW signature */
+          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
+          if (SFU_SUCCESS == e_ret_status)
+          {
+            /* Verify that there is no additional code beyond firmware image */
+            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
+            if (SFU_SUCCESS != e_ret_status)
+            {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+            }
+          }
+          else
+          {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          }
+        }
+        else
+        {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        }
+        /*
+         * One of the checks fails :
+         *  - Header signature
+         *  - FW signature
+         *  - No malicious code
+         *  ==> Active slot should be invalidated
+         */
+        if (SFU_SUCCESS != e_ret_status)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+        else
+        {
+          /* Verify if authentication and integrity controls performed */
+          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+        }
+      }
+      else
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ExecuteUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+
+  /* Double security check for all active slots :
+     - Control twice the Header signature will avoid basic hardware attack
+     - Control twice the FW signature will avoid basic hardware attack */
+
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+        /* Check the FW signature */
+        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+        /* Move the state to SELFTEST for the new images */
+        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Image state cannot be changed : What to do ?
+             ==> decision to continue execution */
+          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
+        }
+#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
+
+        /* Verify if authentication and integrity controls performed */
+        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+      }
+    }
+  }
+
+  /*
+   * You may decide to implement additional checks before running the Firmware.
+   * For the time being we launch the FW present in the active slot.
+   *
+   * The bootloader must also take care of the security aspects:
+   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
+   *   B.lock the SE services the UserApp is not allowed to call
+   *   C.leave secure boot mode
+   */
+
+  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
+  e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+    SFU_EXCPT_SetError(SFU_EXCPT_FLASH_CFG_ERR);
+
+    /* This is the last operation executed. Force a System Reset */
+    SFU_BOOT_ForceReboot();
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Double instruction to avoid basic fault injection */
+      if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+      {
+        /* De-initialize the SB_SFU bootloader before launching the UserApp */
+        (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
+
+        /* Last flow control : lock service */
+        FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
+
+        /* This function should not return */
+        e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
+
+        /* This point should not be reached */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        /* We do not memorize any specific error, the FSM state is already providing the info */
+        TRACE("\r\n\t  SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        while (1 == 1)
+        {
+          ;    /* wait for watchdog */
+        }
+      }
+      else
+      {
+        /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+        SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+        /* This is the last operation executed. Force a System Reset */
+        SFU_BOOT_ForceReboot();
+      }
+    }
+    else
+    {
+      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+      SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+      /* This is the last operation executed. Force a System Reset */
+      SFU_BOOT_ForceReboot();
+    }
+  }
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
+  * @param  None
+  * @note   After a Critical Failure a Reboot will be called.
+  * @retval None
+  */
+static void SFU_BOOT_SM_HandleCriticalFailure(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+     The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
+}
+
+/**
+  * @brief  The state machine is aborted and a Reset is triggered
+  * @param  None
+  * @note   You are in this condition because it's not possible to continue without
+            compromising the stability or the security of the solution.
+  * @retval None
+  */
+static void SFU_BOOT_SM_RebootStateMachine(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
+
+  /*
+   * In case some clean-up must be done before resetting.
+   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
+   */
+  (void)SFU_BOOT_DeInit();
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Jump into standalone loader
+  * @param  None
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+
+
+  /* Lock part of Secure Engine services */
+  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Give execution rights to standalone loader */
+      e_ret_status = SFU_LL_SECU_SetProtectionMPU_StandaloneLoader();
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Initialize address to jump */
+    jump_address = *(__IO uint32_t *)(((uint32_t)LOADER_REGION_ROM_START + 4));
+    p_jump_to_function = (Function_Pointer) jump_address;
+
+    /* Initialize loader's Stack Pointer */
+    __set_MSP(*(__IO uint32_t *)(LOADER_REGION_ROM_START));
+
+    /* Jump into loader */
+    p_jump_to_function();
+  }
+
+  /* The point below should NOT be reached */
+  return e_ret_status;
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply Static protections involving Option Bytes */
+  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  System security configuration
+  * @param  None
+  * @note   Check and apply the security protections. This has to be done as soon
+  *         as possible after a reset
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  /* WARNING: The following CheckApplySecurityProtection function must be called
+     as soon as possible after a Reset in order to be sure the system is secured
+     before starting any other operation. The drawback is that the ErrorManagement
+     is not initialized yet, so in case of failure of this function, there will not be
+     any error stored into the BootInfo or other visible effects.  */
+
+  /* Very few things are already initialized at this stage. Need additional initialization
+     to show a message that is added as below only in Debug/Test mode */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  (void) SFU_COM_Init();
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
+  {
+    /* WARNING: This might be generated by an attempted attack or a bug of your code!
+       Add your code here in order to implement a custom action for this event,
+       e.g. trigger a mass erase or take any other action in order to
+       protect your system, or simply discard it if this is expected.
+       ...
+       ...
+    */
+    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
+  }
+  else
+  {
+    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
+  *         a malicious code removing some of the applied security/integrity features.
+  *         The IWDG is also refreshed in this function.
+  * @param  None
+  * @note   This function must be called with a frequency greater than 0.25Hz!
+  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
+  *         So the User App should continue to refresh the IWDG counter.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Refresh the IWDG */
+  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
+
+
+  /* Add your code here for customization:
+     e.g. for additional security or safety periodic check.
+     ...
+     ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_ManageResetSources(void)
+{
+  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
+
+  /* Check the wakeup sources */
+  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
+  switch (e_wakeup_source_id)
+  {
+    /*
+     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
+     * RCC_CSR flags can be used to do so.
+     */
+
+    case SFU_RESET_WDG_RESET:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_LOW_POWER:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_HW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_BOR_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_SW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_OB_LOADER:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    default:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+  }
+
+  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
+  SFU_LL_SECU_ClearResetSources();
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Memory Fault.
+  * @note  After a Memory Fault could not be possible to execute additional code
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_MEMORYFAULT(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_MEMORY_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_boot.h
new file mode 100644
index 00000000..45d6ca7d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_boot.h
@@ -0,0 +1,205 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module, part of the SFU-En project (SB/SFU).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Init Error Type Definition
+  */
+typedef enum
+{
+  SFU_BOOT_SECENG_INIT_FAIL,   /*!< failure at secure engine initialization stage */
+  SFU_BOOT_SECIPS_CFG_FAIL,    /*!< failure when configuring the security IPs  */
+  SFU_BOOT_INIT_FAIL,          /*!< failure when initializing the secure boot service  */
+  SFU_BOOT_INIT_ERROR          /*!< Service cannot start: unspecified error */
+} SFU_BOOT_InitErrorTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Steps definition
+  */
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+#define FLOW_STEP_AUTHENTICATE 0x00007999U       /*!< Step AUTHENTICATE value */
+#define FLOW_STEP_INTEGRITY 0x0000aab5U          /*!< Step INTEGRITY value */
+#define FLOW_STEP_LOCK_SERVICE 0x0000b4abU       /*!< Step LOCK SERVICE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0000cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_PCROP_PROTECT_ENABLE
+#define FLOW_STEP_PCROP 0x0000d2d3U              /*!< Step PCROP value */
+#else
+#define FLOW_STEP_PCROP 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_UBE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_PCROP (FLOW_CTRL_WRP ^ FLOW_STEP_PCROP)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_PCROP ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
+#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values crypto operations
+  */
+#define FLOW_CTRL_AUTHENTICATE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_AUTHENTICATE)
+#define FLOW_CTRL_INTEGRITY (FLOW_CTRL_AUTHENTICATE ^ FLOW_STEP_INTEGRITY)
+#define FLOW_CTRL_LOCK_SERVICE (FLOW_CTRL_INTEGRITY ^ FLOW_STEP_LOCK_SERVICE)
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+
+/* Exported macros -----------------------------------------------------------*/
+/** Control with STEP operation :
+  * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+/** STEP update only :
+  * (uFlowValue XOR STEP_VALUE)
+  */
+#define FLOW_STEP(B,A) \
+  do{ \
+    (B) ^= (A);\
+  }while(0)
+
+
+/* Exported functions ------------------------------------------------------- */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService(void);
+void SFU_BOOT_ForceReboot(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_loader.c
new file mode 100644
index 00000000..f7599f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_loader.c
@@ -0,0 +1,544 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
+#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
+
+/* Private macros ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
+#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
+#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+/**
+  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
+  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
+  * @param  puSize: size of received file.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
+{
+  uint32_t i;
+  uint32_t packet_length = 0U;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t filesize = 0U;
+  uint32_t packets_received;
+  uint8_t *file_ptr;
+  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
+                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(8)));
+
+  /* Check the pointers allocation */
+  if ((peCOMStatus == NULL) || (puSize == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  *peCOMStatus = SFU_COM_YMODEM_OK;
+
+  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *peCOMStatus = SFU_COM_YMODEM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *puSize = filesize;
+              file_done = 1U;
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
+              {
+                /* No NACK sent for a better synchro with remote : packet will be repeated */
+              }
+              else
+              {
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name skipped */
+                    i = 0U;
+                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
+                    {
+                      i++;
+                      file_ptr++;
+                    }
+                    /* end of file name ('\0') skipped */
+                    file_ptr++;
+
+                    /* File size extraction */
+                    i = 0U;
+                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
+                    {
+                      file_size[i] = *file_ptr;
+                      i++;
+                      file_ptr++;
+                    }
+                    file_size[i] = (uint8_t) '\0';
+                    (void) Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call*/
+                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
+                    {
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                      (void) SFU_LL_UART_Flush();
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
+                    }
+                    else
+                    {
+                      /* End session */
+                      tmp = SFU_COM_YMODEM_CA;
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      return SFU_ERROR;
+                    }
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                    file_done = 1U;
+                    session_done = 1U;
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  /* Data packet received callback call*/
+                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX],
+                                                           packet_length) == SFU_SUCCESS)
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* End session */
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    *peCOMStatus = SFU_COM_YMODEM_DATA;
+                  }
+
+                }
+                packets_received ++;
+                session_begin = 1;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          break;
+        default:
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
+          {
+            /* Abort communication */
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          }
+          else
+          {
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            /* Minicom does not accept this extra character */
+            TRACE("\b.");                                 /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+            /*
+             * Toggling the LED in case no console is available: the toggling frequency depends on
+             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
+             */
+            (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          }
+          break;
+      }
+    }
+  }
+  /* Make sure the status LED is turned off */
+  (void) BSP_LED_Off(SFU_STATUS_LED);
+
+  if (*peCOMStatus == SFU_COM_YMODEM_OK)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+/**
+  * @brief  Transmit a byte to the COM Port.
+  * @param  uParam: The byte to be sent.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
+{
+  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
+}
+
+/**
+  * @brief  Convert a string to an integer.
+  * @param  pInputStr: The string to be converted.
+  * @param  pIntNum: The integer value.
+  * @retval 1: Correct
+  *         0: Error
+  */
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+  uint8_t  digit;
+
+  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        digit = CONVERTHEX(pInputStr[i]);
+        val = (val << 4U) + digit;
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == (uint8_t)'\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == (uint8_t)'\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        digit =  CONVERTDEC(pInputStr[i]);
+        val = (val * 10U) + digit;
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData: pointer to received data.
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeOut: receive timeout (ms).
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  SFU_ErrorStatus eRetStatus;
+
+  uint8_t char1;
+
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0; /* index indicating where to write in pData */
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
+
+  if (eRetStatus == SFU_SUCCESS)
+  {
+    status = HAL_OK;
+
+    switch (char1)
+    {
+      case SFU_COM_YMODEM_SOH:
+        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
+        break;
+      case SFU_COM_YMODEM_STX:
+        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+        break;
+      case SFU_COM_YMODEM_EOT:
+        break;
+      case SFU_COM_YMODEM_CA:
+        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
+        {
+          packet_size = 2U;
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      case SFU_COM_YMODEM_ABORT1:
+      case SFU_COM_YMODEM_ABORT2:
+        status = HAL_BUSY;
+        break;
+      case SFU_COM_YMODEM_RB:
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
+    {
+
+#ifndef MINICOM_YMODEM
+      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX],
+                                       (uint16_t)(packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
+#else
+      eRetStatus = SFU_SUCCESS;
+      /* Receive byte per byte until no data left or no space left in buffer */
+      while ((SFU_SUCCESS == eRetStatus) &&
+             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
+              SFU_COM_YMODEM_PACKET_DATA_INDEX +
+              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
+            )
+      {
+        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
+                                         1U, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        /* We received some bytes */
+        eRetStatus = SFU_SUCCESS;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (eRetStatus == SFU_SUCCESS)
+      {
+        status = HAL_OK;
+
+        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
+                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
+        {
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC*/
+          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
+          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
+
+          /*Configure CRC with 16-bit polynomial*/
+          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
+          {
+            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
+            {
+              packet_size = 0U;
+              status = HAL_ERROR;
+            }
+
+          }
+          else
+          {
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        status = HAL_ERROR;
+      }
+    }
+  }
+  else
+  {
+    status = HAL_ERROR;
+  }
+
+  *puLength = packet_size;
+  return status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(uFileSize);
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(pData);
+  UNUSED(uSize);
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_loader.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_loader.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_com_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_trace.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_com_trace.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_trace.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_com_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_trace.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_com_trace.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_com_trace.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_def.h
new file mode 100644
index 00000000..78458507
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_def.h
@@ -0,0 +1,83 @@
+/**
+  ******************************************************************************
+  * @file    sfu_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains the general definitions for SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_DEF_H
+#define SFU_DEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU Error Typedef
+  */
+typedef enum
+{
+  SFU_ERROR = 0x00001FE1U,
+  SFU_SUCCESS = 0x00122F11U
+} SFU_ErrorStatus;
+
+/* Exported constants --------------------------------------------------------*/
+
+#define SFU_RAM_BASE             ((uint32_t) SE_REGION_RAM_START)
+#define SFU_RAM_END              ((uint32_t) SB_REGION_RAM_END)
+#define SFU_SB_RAM_BASE          ((uint32_t) SB_REGION_RAM_START)
+#define SFU_SB_RAM_END           ((uint32_t) SB_REGION_RAM_END)
+
+
+#define SFU_BOOT_BASE_ADDR       ((uint32_t) INTVECT_START)           /* SFU Boot Address */
+#define SFU_ROM_ADDR_END         ((uint32_t) SB_REGION_ROM_END)       /* SBSFU end Address (covering all the SBSFU
+                                                                         executable code) */
+
+#define SFU_SENG_ROM_ADDR_START  ((uint32_t) SE_CODE_REGION_ROM_START)/* Secure Engine area address START */
+#define SFU_SENG_ROM_ADDR_END    ((uint32_t) SE_CODE_REGION_ROM_END)  /* Secure Engine area address END - SE includes
+                                                                         everything up to the License */
+#define SFU_SENG_ROM_SIZE        ((uint32_t) (SFU_SENG_ROM_ADDR_END - \
+                                              SFU_SENG_ROM_ADDR_START + 1U)) /* Secure Engine area size */
+
+#define SFU_KEYS_ROM_ADDR_START  ((uint32_t) SE_KEY_REGION_ROM_START) /* Keys Area (Keys + Keys Retrieve function)
+                                                                         START. This is the PCRoP Area */
+#define SFU_KEYS_ROM_ADDR_END    ((uint32_t) SE_KEY_REGION_ROM_END)   /* Keys Area (Keys + Keys Retrieve function) END.
+                                                                         This is the PCRoP Area */
+
+#define SFU_SENG_RAM_ADDR_START  ((uint32_t) SE_REGION_RAM_START)   /* Secure Engine reserved RAM1 area START
+                                                                       address */
+#define SFU_SENG_RAM_ADDR_END    ((uint32_t) SE_REGION_RAM_END)     /* Secure Engine reserved RAM1 area END address */
+#define SFU_SENG_RAM_SIZE        ((uint32_t) (SFU_SENG_RAM_ADDR_END - \
+                                              SFU_SENG_RAM_ADDR_START + 1U)) /* Secure Engine reserved RAM area SIZE */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_DEF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_error.c
new file mode 100644
index 00000000..69712062
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_error.c
@@ -0,0 +1,236 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.c
+  * @author  MCD Application Team
+  * @brief   SFU ERROR
+  *          This file provides set of firmware functions for SB_SFU errors handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "sfu_low_level_security.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_boot.h"
+#include "sfu_test.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+/**
+  *  The following strings associated to the exceptions/errors are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
+  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
+  */
+static char *m_aErrorStrings[] ={  "No error. Success",
+                                   "Memory fault",
+                                   "Hard fault",
+                                   "Tampering fault",
+                                   "SE lock cannot be set",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Fw too big",
+                                   "File not correctly received",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Fw header authentication error",
+                                   "Fw decryption error",
+                                   "Fw signature check error",
+                                   "Flash error",
+                                   "External flash configuration error.",
+                                   "Header erasing error",
+                                   "Header validation error",
+                                   "Additional code detected beyond FW",
+                                   "Error during swap process",
+                                   "Error during rollback process",
+                                   "Backed-up fw not identified",
+                                   "Backup copy error",
+                                   "Dwl slot erasing error",
+                                   "Trailer erasing error",
+                                   "Trailer update error",
+                                   "Magic tag update error",
+                                   "Fw version rejected (anti-rollback)",
+                                   "Unknown error"
+                                };
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Print relevant errpr message.
+  * @param  Error Error code.
+  * @retval None
+  */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  if (eExceptionId <= SFU_EXCPT_UNKNOWN)
+  {
+#ifdef SFU_DEBUG_MODE
+    TRACE("\r\n\t%s",m_aErrorStrings[(uint32_t) eExceptionId]);
+#endif /* SFU_DEBUG_MODE */
+  }
+}
+
+
+/**
+  * @brief  Manage the Exception generated by an IRQ
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   Because of the interruption of the State Machine execution,
+  *         it's not possible to continue without compromising the stability or
+  *         the security of the solution. A System Reset is forced at the end.
+  * @retval None
+  */
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+#ifdef SFU_DEBUG_MODE
+  uint8_t message[150];
+  uint32_t i = 0U;
+
+  /* Avoid warning with cast frombetween char* and uint8_t* */
+  while ((m_aErrorStrings[(uint32_t) eExceptionId][i] != 0u) && (i < 149U))
+  {
+    message[i] = m_aErrorStrings[(uint32_t) eExceptionId][i];
+    i++;
+  }
+  message[i] = 0U;
+
+  /* Print relevant error message */
+  TRACE_IRQ((uint8_t *)"\r\n\t  ");
+  TRACE_IRQ(message);
+#endif /* SFU_DEBUG_MODE */
+
+  /* Try to take an action */
+  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+  The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_BOOT_ForceReboot();
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+void SFU_EXCPT_Security_Error(void)
+{
+  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
+  HAL_Delay(1000);
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/**
+  * @brief  SFU Exception Initialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_Init(void)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU Exception DeInitialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status;
+  /* ADD SRC CODE HERE
+      ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   A System Reset is forced at the end by the caller of this function.
+  *         WARNING: Be aware that this function can be called by an IRQ while
+  *         using the printf, since the printf is not a reentrant function, and using
+  *         the printf inside this function as well, a fault will likely occur.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  switch (eExceptionId)
+  {
+    case SFU_EXCPT_TAMPERING_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_MEMORY_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_HARD_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+#ifdef SFU_TEST_PROTECTION
+      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
+         ==> this is not an error */
+#endif /* SFU_TEST_PROTECTION */
+      break;
+
+    default:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+  }
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_error.h
new file mode 100644
index 00000000..6506d102
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_error.h
@@ -0,0 +1,93 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.h
+  * @author  MCD Application Team
+  * @brief   This file contains the error handling elements for SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_ERROR_H
+#define SFU_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * This enum must start from 0.
+  * When adding a new error in the enum below please also:
+  *  1. update IS_SFU_EXCPT
+  *  2. update m_aErrorStrings
+  */
+typedef enum
+{
+  SFU_EXCPT_NONE = 0UL,
+  /* System errors */
+  SFU_EXCPT_MEMORY_FAULT,
+  SFU_EXCPT_HARD_FAULT,
+  SFU_EXCPT_TAMPERING_FAULT,
+  /* Specific errors */
+  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
+  SFU_EXCPT_COM_ERR,               /* COM error during the local download of the binary */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  SFU_EXCPT_HEADER_AUTH_ERR,       /* header authentication failure */
+  SFU_EXCPT_DECRYPT_ERR,           /* Decrypt failure */
+  SFU_EXCPT_SIGNATURE_ERR,         /* Signature check failure */
+  SFU_EXCPT_FLASH_ERR,             /* Problem with FLASH */
+  SFU_EXCPT_FLASH_CFG_ERR,         /* Flash configuration issue (external flash) */
+  SFU_EXCPT_HEADER_ERASING_ERR,    /* Header erasing failure */
+  SFU_EXCPT_HEADER_VALIDATION_ERR, /* Header validation failure */
+  SFU_EXCPT_ADDITIONAL_CODE_ERR,   /* Additional code detected beyond the firmware image (malicious SW) */
+  SFU_EXCPT_FWIMG_SWAP_ERR,        /* Problem while swapping the images */
+  SFU_EXCPT_FWIMG_ROLLBACK_ERR,    /* Problem during rollback process */
+  SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR,/* Backed-up firmware not identified */
+  SFU_EXCPT_BACKUP_COPY_FAILURE_ERR, /* Copy in the backup slot failure */
+  SFU_EXCPT_DWL_SLOT_ERASING_ERR,  /* Dwl slot erasing failure */
+  SFU_EXCPT_TRAILER_ERASING_ERR,   /* Trailer update failure */
+  SFU_EXCPT_TRAILER_UPDATE_ERR,    /* Trailer update failure */
+  SFU_EXCPT_FWIMG_MAGIC_ERR,       /* Problem with a FWIMG pattern */
+  SFU_EXCPT_VERSION_ERR,           /* Anti-rollback check rejected the version to be installed */
+  /* Unknown error */
+  SFU_EXCPT_UNKNOWN                /* To be kept as last error */
+} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
+
+/* External variables --------------------------------------------------------*/
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_Security_Error(void);
+
+SFU_ErrorStatus SFU_EXCPT_Init(void);
+SFU_ErrorStatus SFU_EXCPT_DeInit(void);
+
+void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_ERROR_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fsm_states.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fsm_states.h
new file mode 100644
index 00000000..5eed78d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fsm_states.h
@@ -0,0 +1,115 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fsm_states.h
+  * @author  MCD Application Team
+  * @brief   This file defines the SB_SFU Finite State Machine states.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FSM_STATES_H
+#define SFU_FSM_STATES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * FSM states: this enum must start from 0.
+  */
+typedef enum
+{
+  SFU_STATE_CHECK_STATUS_ON_RESET = 0U, /*!< checks the reset cause and decide how to proceed     */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD,   /*!< SFU checks if a local download must be handled       */
+  SFU_STATE_DOWNLOAD_NEW_USER_FW,       /*!< downloads the encrypted firmware to be installed     */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+  SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL, /*!< SFU checks if a kms blob download must be handled    */
+  SFU_STATE_INSTALL_KMS_BLOB,          /* !< download the new kms_blob */
+#endif /* KMS_ENABLED */
+  SFU_STATE_VERIFY_USER_FW_STATUS,      /*!< checks the internal FLASH state to derive a status   */
+  SFU_STATE_INSTALL_NEW_USER_FW,        /*!< decrypts and installs the firmware stored in dwl slot*/
+  SFU_STATE_VERIFY_USER_FW_SIGNATURE,   /*!< checks the validity of the active firmware           */
+  SFU_STATE_EXECUTE_USER_FW,            /*!< launch the user application                          */
+  SFU_STATE_RESUME_INSTALL_NEW_USER_FW, /*!< resume interrupted installation of firmware          */
+  SFU_STATE_ROLLBACK_PREV_USER_FW,      /*!< rollback with previous firmware                      */
+  SFU_STATE_HANDLE_CRITICAL_FAILURE,    /*!< deal with the critical failures                      */
+  SFU_STATE_REBOOT_STATE_MACHINE        /*!< a reboot is forced                                   */
+} SFU_BOOT_StateMachineTypeDef; /*!< SFU BOOT State Machine States */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  The following strings associated to the SM state are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the SFU_BOOT_StateMachineTypeDef defined above.
+  *           And the above enum must be a sequence starting from 0
+  */
+#ifdef SFU_DEBUG_MODE
+#if defined(SFU_VERBOSE_DEBUG_MODE) && defined (SFU_BOOT_C)
+char *m_aStateMachineStrings[] = { "Checking Status on Reset.",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Checking if new Fw Image available to download.",
+                                   "Downloading new Fw Image.",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Verifying Fw Image status.",
+                                   "Installing new Fw Image.",
+                                   "Verifying Fw Image signature.",
+                                   "Executing Fw Image.",
+                                   "Resuming installation of new Fw Image.",
+                                   "Rollback with previous Fw Image.",
+                                   "Handling a critical failure.",
+                                   "Rebooting the State Machine"
+                                 };
+#endif /* SFU_VERBOSE_DEBUG_MODE && SFU_BOOT_C */
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Exported macros -----------------------------------------------------------*/
+/************ SFU SM States****************************************************/
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_DOWNLOAD_NEW_USER_FW)     || \
+                                 ((STATE) == (uint8_t)SFU_STATE_INSTALL_NEW_USER_FW)      || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_RESUME_INSTALL_NEW_USER_FW)|| \
+                                 ((STATE) == (uint8_t)SFU_STATE_ROLLBACK_PREV_USER_FW)|| \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#else
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_INSTALL_NEW_USER_FW)      || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_RESUME_INSTALL_NEW_USER_FW)|| \
+                                 ((STATE) == (uint8_t)SFU_STATE_ROLLBACK_PREV_USER_FW)|| \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FSM_STATES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_common.c
new file mode 100644
index 00000000..b8b3f858
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_common.c
@@ -0,0 +1,1137 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_common.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the "common" functionalities of the image handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_COMMON_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+SFU_IMG_StatusTypeDef SFU_IMG_Status;
+uint32_t SFU_IMG_Line;
+
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+
+/**
+  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_to_test;
+
+/* Functions Definition : helper ---------------------------------------------*/
+/**
+  * @brief  Memory compare with constant time execution.
+  * @note   Objective is to avoid basic attacks based on time execution
+  * @param  pAdd1 Address of the first buffer to compare
+  * @param  pAdd2 Address of the second buffer to compare
+  * @param  Size Size of the comparison
+  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
+  */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
+{
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  for (i = 0U; i < Size; i++)
+  {
+    result |= pAdd1[i] ^ pAdd2[i];
+  }
+
+  if (result == 0x00U)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+
+/**
+  * @brief  Check header signature
+  * @param  pFwImageHeader: pointer to raw header.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef se_status;
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
+  {
+    /* Unused bytes should be set at 0x00 value
+       Comparison with constant time execution */
+    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
+    {
+      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
+    }
+
+    if (result == 0x00U)
+    {
+      /* Check signature of the FW header */
+      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
+      {
+        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
+  *        It handles Firmware TAG verification of a complete buffer by calling
+  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
+  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
+  *        and at the end compare the obtained TAG with the one provided as input
+  *        in pSE_GMCInit parameter.
+  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
+  * @param pSE_Status: Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param SlotNumber index of the slot in the list
+  * @param pSE_Metadata: Firmware metadata.
+  * @param pSE_Payload: pointer to Payload Buffer descriptor.
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_ret_status = SE_ERROR;
+  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
+  /* Loop variables */
+  uint32_t i;
+  uint32_t j;
+  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
+  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
+  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
+  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
+  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
+  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(8)));
+  /* FW chunk produced by the verification procedure if any   */
+  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* FW chunk provided as input to the verification procedure */
+  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* Variables to handle the FW image (this will be split in chunks) */
+  uint32_t payloadsize;
+  uint32_t ppayload;
+  uint32_t scatter_nb;
+  /* Variables to handle FW image size and tag */
+  uint32_t fw_size;
+  uint8_t *fw_tag;
+
+  /* Check the pointers allocation */
+  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
+  {
+    return SFU_ERROR;
+  }
+  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check the parameters value and set fw_size and fw_tag to check */
+  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
+  {
+    fw_size = pSE_Metadata->FwSize;
+    fw_tag = pSE_Metadata->FwTag;
+  }
+  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
+  {
+    fw_size = pSE_Metadata->PartialFwSize;
+    fw_tag = pSE_Metadata->PartialFwTag;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+
+  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
+  {
+    return SFU_ERROR;
+  }
+
+  /*  fix number of scatter block */
+  if (pSE_Payload->PayloadSize[1] != 0U)
+  {
+    scatter_nb = 2U;
+  }
+  else
+  {
+    scatter_nb = 1U;
+  }
+
+
+  /* Encryption process*/
+  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
+
+  /* check for initialization errors */
+  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    for (j = 0; j < scatter_nb; j++)
+    {
+      payloadsize = pSE_Payload->PayloadSize[j];
+      ppayload = pSE_Payload->pPayload[j];
+      i = 0;
+      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
+
+      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
+             (sfu_ret_status == SFU_SUCCESS))
+      {
+
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        ppayload += fw_chunk_size;
+        fw_verified_total_size += fw_chunk_size;
+        i++;
+      }
+      /* this the last path , size can be smaller */
+      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
+      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+      {
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
+                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)),
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        fw_verified_total_size += fw_chunk_size;
+      }
+    }
+  }
+
+  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    if (fw_verified_total_size <= fw_size)
+    {
+      /* Do the Finalization, check the authentication TAG*/
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
+
+      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
+        {
+          *pSeStatus = SE_SIGNATURE_ERR;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+
+          /* Save result for active slot :
+             to avoid single fault attack the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
+          }
+        }
+        else
+        {
+          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+
+          /* Save result for active slot :
+             to avoid single fault attacje the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag_output, SE_TAG_LEN);
+          }
+        }
+      }
+      else
+      {
+        sfu_ret_status = SFU_ERROR;
+      }
+    }
+    else
+    {
+      sfu_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    sfu_ret_status = SFU_ERROR;
+  }
+  return sfu_ret_status;
+}
+
+/**
+  * @brief Fill authenticated info in SE_FwImage.
+  * @param SFU_APP_Status
+  * @param pBuffer
+  * @param BufferSize
+  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
+{
+  /* Check the pointers allocation */
+  if ((pFwHeader == NULL) || (pBuffer == NULL))
+  {
+    return SFU_ERROR;
+  }
+  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Verify Image Header in the slot given as a parameter
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
+  * @note   Not used in Alpha version -
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* use api read to detect possible ECC error */
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                   sizeof(SE_FwRawHeaderTypeDef));
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify signature */
+    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify Fw signature of binary contiguous in flash
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  SlotNumber flash slot to check
+  * @param  pFwImageHeader pointer to fw header
+  * @param  SlotNumber flash slot to check
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
+                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType)
+{
+  SE_Ex_PayloadDescTypeDef  pse_payload;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*  put it OK, to discriminate error in SFU FWIMG parts */
+  *pSeStatus = SE_OK;
+
+  /* Check the parameters value */
+  if (pFwImageHeader == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check SE_FwType parameter, and fix size and offset accordingly */
+  switch (SE_FwType)
+  {
+    case SE_FW_IMAGE_COMPLETE :
+      fw_size = pFwImageHeader->FwSize;
+      fw_offset = 0U;
+      break;
+    case SE_FW_IMAGE_PARTIAL :
+      fw_size = pFwImageHeader->PartialFwSize;
+#if  !defined(SFU_NO_SWAP)
+      fw_offset = pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+#else
+      fw_offset = pFwImageHeader->PartialFwOffset;
+#endif /* !SFU_NO_SWAP */
+      break;
+    default :
+      /* error */
+      fw_size = 0U;
+      fw_offset = 0U;
+      break;
+  }
+
+  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
+  pse_payload.PayloadSize[0] = fw_size;
+  pse_payload.pPayload[1] = 0U;
+  pse_payload.PayloadSize[1] = 0U;
+
+  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
+}
+
+/**
+  * @brief Verifies the validity of a slot.
+  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
+  * @param pSlotBegin Start address of a slot.
+  * @param uSlotSize Size of a slot.
+  * @param uFwSize Size of the firmware image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
+{
+  uint8_t *pdata;
+  uint32_t length;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check is already clean */
+  pdata = pSlotBegin + SFU_IMG_IMAGE_OFFSET + uFwSize;
+  length = uSlotSize - SFU_IMG_IMAGE_OFFSET - uFwSize;
+  e_ret_status = SFU_LL_FLASH_Compare(pdata, 0x00000000U, 0xFFFFFFFFU, length);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function clean-up the flash
+  * @note   Not designed to clean-up area inside secure engine isolation.
+  * @note   To clean the slot without erasing the header we write "0x00" except if already written
+  * @param  pSlotBegin Start address of a slot.
+  * @param  uSlotSize Size of a slot.
+  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t pdata;
+  uint32_t slot_begin;
+  SFU_LL_FLASH_write_t pattern;
+  SFU_LL_FLASH_write_t value;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  /* Clean-up pattern initialization */
+  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
+
+  /* Cleaning operation */
+  slot_begin = (uint32_t) pSlotBegin;
+  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
+  {
+    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* If read succeed, then the pattern write is performed only if pattern is not already present */
+      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                          sizeof(SFU_LL_FLASH_write_t));
+      }
+    }
+    else
+    {
+      /* If read fail, then the write is performed unconditionally */
+      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                        sizeof(SFU_LL_FLASH_write_t));
+    }
+
+    /* Reload Watchdog every 4Kbytes */
+    if ((pdata % 0x1000U) == 0U)
+    {
+      (void) SFU_LL_SECU_IWDG_Refresh();
+    }
+  }
+  return e_ret_status;
+}
+
+/* Functions Definition : services ------------------------------------------- */
+
+/**
+  * @brief FW Image Handling (FWIMG) initialization function.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
+{
+  uint32_t i;
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+#if  !defined(SFU_NO_SWAP)
+  SFU_IMG_InitStatusTypeDef e_swap_ret_status;
+#endif /*(GENERATOR_2_FW_IMAGE) && !(SFU_NO_SWAP) */
+
+  /*
+   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
+   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
+   * starting with 0s.
+   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
+   * side-effects).
+   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
+   */
+  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
+
+  /*
+   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
+      } /* else active slot is properly aligned */
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_DWL_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_DWL_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_DWL_1 + 1U]);
+      } /* else dwl slot is properly aligned */
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
+   */
+  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
+  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
+   */
+  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the chunks used for decrypt match the FLASH constraints
+   */
+  if (0U != (uint32_t)(SFU_IMG_CHUNK_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The size of the chunks used to store the decrypted data must be a multiple of the FLASH write length */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] Decrypt chunk size (%d) is not matching the FLASH constraints\r\n", SFU_IMG_CHUNK_SIZE);
+  } /* else the decrypt chunk size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the chunk size used for decrypt is fine with regards to AES CBC constraints.
+   *               This block alignment constraint does not exist for AES GCM but we do not want to specialize the code
+   *               for a specific crypto scheme.
+   */
+  if (0U != (uint32_t)((uint32_t)SFU_IMG_CHUNK_SIZE % (uint32_t)AES_BLOCK_SIZE))
+  {
+    /* For AES CBC block encryption/decryption the chunks must be aligned on the AES block size */
+    e_ret_status = SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] Chunk size (%d) is not matching the AES CBC constraints\r\n", SFU_IMG_CHUNK_SIZE);
+  }
+
+  /*
+   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (((SlotStartAdd[SLOT_ACTIVE_1 + i] - FLASH_BASE) / FLASH_PAGE_SIZE) <= SFU_PROTECT_WRP_PAGE_END_1)
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the dwl slot does not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_DWL_1 + i];
+    if (start_add != 0U)
+#else /* (__GNUC__) */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (((SlotStartAdd[SLOT_DWL_1 + i] - FLASH_BASE) / FLASH_PAGE_SIZE) <= SFU_PROTECT_WRP_PAGE_END_1)
+      {
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
+   */
+  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
+        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap dwl slot area
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_DWL_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_DWL_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_DWL_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+#if  !defined(SFU_NO_SWAP)
+  /*
+   * Sanity check: specific swap process checks
+   */
+  e_swap_ret_status = SFU_IMG_CheckSwapImageHandling();
+  if (e_swap_ret_status != SFU_IMG_INIT_OK)
+  {
+    e_ret_status = e_swap_ret_status;
+  }
+#endif /* defined(SFU_NO_SWAP) */
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief This function makes sure the current active firmware will not be considered as valid any more.
+  *        This function alters the FLASH content.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
+  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image metadata.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  * @note This function populates the FWIMG module variable: fw_image_header_validated
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
+{
+  /*
+   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
+   */
+  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
+  *       fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (SFU_ERROR == e_ret_status)
+  {
+    /* We do not memorize any specific error, the FSM state is already providing the info */
+    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
+  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
+}
+
+/**
+  * @brief Verifies if no malicious code in active slot.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
+{
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
+}
+
+/**
+  * @brief  Control firmware signature
+  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
+                    SE_TAG_LEN) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  else
+  {
+    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+    return SFU_SUCCESS;
+  }
+
+}
+
+/**
+  * @brief Launches the user application.
+  *        The caller must be prepared to never get the hand back after calling this function.
+  *        If a problem occurs, it must be memorized in the bootinfo area.
+  *        If the caller gets the hand back then this situation must be handled as a critical error.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met
+  *       (typically: no security check performed before launching the firmware).
+  * @note This function only handles the "system" aspects.
+  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
+  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
+  *       function (as this needs to be done just before jumping into the user application).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Verify if authentication/integrity/lock SE service performed */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
+
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+
+#if defined(SFU_MPU_PROTECT_ENABLE)
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+  e_ret_status = SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+  HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+  /* Avoid systick interruption during UserApp start-up
+     systick will be re-initialized by HAL_Init() during execution of main() from UserApp */
+  HAL_SuspendTick();
+
+  /* Initialize address of user application to jump into */
+  jump_address = *(__IO uint32_t *)((SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET + 4));
+  p_jump_to_function = (Function_Pointer) jump_address;
+
+  /* Initialize user application's Stack Pointer */
+  __set_MSP(*(__IO uint32_t *)(SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET));
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* JUMP into User App */
+    p_jump_to_function();
+  }
+
+  /* The point below should NOT be reached */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Get the version of the active FW
+  * @note It is up to the caller to make sure the active slot contains a valid active FW.
+  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
+  *       fails.
+  * @param  SlotNumber index of the slot in the list
+  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
+  */
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
+{
+  SE_FwRawHeaderTypeDef fw_image_header;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint16_t version = 0;
+
+  /* check the header of the active FW */
+  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* retrieve the version from the header without any further check */
+    version = fw_image_header.FwVersion;
+  }
+
+  return (version);
+}
+
+/**
+  * @brief Detect if a FW is present in a slot.
+  * @note  Detection done based on MAGIC header + FW signature. Header verification
+  *        not done at this stage for timing optimization.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
+  SE_FwRawHeaderTypeDef *p_header;
+
+  /* Read header */
+  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
+  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
+  {
+    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
+    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
+    {
+      /*
+       * Control if the first 32 bytes (could be more but time consuming ...) are significants
+       * At this location we should find the vector table.
+       * Objective is to detect if the FW image has been erased
+       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
+       */
+      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Validate the active FW image in active slot by installing the header
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /* Header writing: encrypted part with signature */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
+                                    SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+  /* Header writing : Do not update image state part */
+
+  /* Header writing: previous FW image fingerprint */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
+                                                                    SE_FW_HEADER_FINGERPRINT_LEN),
+                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Get firmware image ID from header.
+  * @param  pFwImageHeader pointer to a structure to handle the header info
+  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
+  */
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  uint32_t active_slot;
+
+  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_1;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_2;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_3;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
+  else
+  {
+    active_slot = SLOT_INACTIVE;
+  }
+
+  return active_slot;
+}
+
+/**
+  * @brief  Check candidate image version is allowed.
+  * @param  ActiveSlot Slot identification used in case of secure counters usage
+  * @param  CurrentVersion Version of currently installed image if any
+  * @param  CandidateVersion Version of candidate image
+  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  UNUSED(ActiveSlot);
+
+  /* If the header of the active firmware is not valid, the CurrentVersion is 0 */
+  if (CurrentVersion == 0U)
+  {
+    /*
+     * If the header of the active firmware is not valid (could comes from an attak attempt, we authorize only the
+     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
+     */
+    if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * It is not allowed to install a Firmware with a lower version than the active firmware.
+     * But we authorize the re-installation of the current firmware version.
+     * We also check that the candidate version is at least the min. allowed version for this device.
+     */
+    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief Verifies the validity of the metadata associated to a candidate image.
+  *        The anti-rollback check is performed.
+  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure):
+  *       SFU_IMG_CheckPendingInstallation should be called first.
+  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
+  *       @ref SFU_APP_VerifyFwHeader.
+  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint32_t active_slot;
+  uint16_t cur_ver;
+  uint16_t verif_ver;
+
+  /*
+   * - Candidate FW Header Authentication
+   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
+   *       As a consequence: fw_image_header_to_test is already populated
+   *
+   * - Check version is allowed
+   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+   */
+
+  /* Header analysis to find slot based on number with magic tag */
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /* Get the version of active_slot */
+  cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+
+  if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
+  {
+    /* The installation is forbidden */
+    /* Memorize this error as this will be handled as a critical failure */
+    SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+
+    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /* leave now to handle the critical failure in the appropriate FSM state */
+    e_ret_status = SFU_ERROR;
+  }
+  else
+  {
+    /* the anti-rollback check succeeds: the version is fine */
+    /* double check to avoid basic hardware attack attack */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    e_ret_status = SFU_IMG_CheckFwVersion(active_slot, verif_ver, fw_image_header_to_test.FwVersion);
+  }
+
+  /* Return the result */
+  return (e_ret_status);
+}
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_internal.h
new file mode 100644
index 00000000..a2e0d18c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_internal.h
@@ -0,0 +1,134 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_internal.h
+  * @author  MCD Application Team
+  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
+  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
+  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
+  *          fw_image_header_to_test to install an KMS blob.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_INTERNAL_H
+#define SFU_FWIMG_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_fwimg_regions.h"
+#include "kms_blob_metadata.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Payload Buffer descriptor.
+  * This structure describes how a Firmware is split in Flash.
+  * In the nominal case a Firmware is stored in 1 contiguous area.
+  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
+  * decrypt operation).
+  */
+typedef struct
+{
+  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
+  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
+} SE_Ex_PayloadDescTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief SFU_IMG Flash Status Type Definition
+  * Status of a FLASH operation.
+  */
+typedef enum
+{
+  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
+  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
+  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
+  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
+} SFU_IMG_StatusTypeDef;
+
+/**
+  * @brief RAM chunk used for decryption / comparison / swap
+  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
+  * some function allocates 2 buffer of this size in stack.
+  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
+  */
+#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
+
+#define SFU_IMG_CHUNK_SIZE  (512UL)
+#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief  Status Macro
+  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
+  * activated) and the execution continues.
+  */
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                   while(1==1){;} \
+                                 } while(0==1){;}
+#else
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                 } while(0==1){;}
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
+extern uint32_t SFU_IMG_Line;
+
+extern SE_FwRawHeaderTypeDef fw_image_header_validated;
+extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
+
+/* Exported functions : helper ---------------------------------------------- */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
+SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
+                          uint8_t  *pPayload, uint32_t SE_FwType);
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType);
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_INTERNAL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_no_swap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_no_swap.c
new file mode 100644
index 00000000..f0fe88d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_no_swap.c
@@ -0,0 +1,919 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_no_swap.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the specific functionalities of the image handling for
+  *          the installation process without swap area.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_NO_SWAP_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+
+#if  defined(SFU_NO_SWAP)
+/* Private macros ------------------------------------------------------------*/
+#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH)
+
+/*             DWL_SLOT_REGION_SIZE             */
+/* <------------------------------------------> */
+/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH| */
+/* | header 1     | header 2     |SWAP magic  | */
+
+#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A] + SLOT_SIZE(A) - TRAILER_HEADER))
+#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
+#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
+
+#endif /* defined(SFU_NO_SWAP) */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#if  defined(SFU_NO_SWAP)
+
+/**
+  * @brief  Write Trailer Headers : TEST + VALID + SWAP
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  /* everything is in place , just compute from present data and write it */
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t  magic[MAGIC_LENGTH];
+  uint32_t buffer;
+
+  /* Write Headers VALID + TEST */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
+                                    SE_FW_HEADER_TOT_LEN);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
+                                      SE_FW_HEADER_TOT_LEN);
+  }
+
+  /* Write Magic */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    buffer = (uint32_t) pValidHeader;
+    (void) memcpy(&magic[0U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
+    buffer = (uint32_t) pTestHeader;
+    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                  MAGIC_LENGTH / 2U);
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check the magic from trailer or counter
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
+{
+  uint8_t  magic[MAGIC_LENGTH];
+  uint8_t  signature_valid[MAGIC_LENGTH / 2];
+  uint8_t  signature_test[MAGIC_LENGTH / 2];
+  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
+
+  /* Pattern initialization */
+  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
+
+  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
+  if (SFU_LL_FLASH_Read(signature_valid,
+                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_valid)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(signature_test,
+                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_test)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /*
+   * Check magic validity :
+   *  - last 16 bytes of validated header
+   *  - last 16 bytes of test header
+   *  - significant values (not an erased flash pattern)
+   */
+  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
+      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
+      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0))
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  check trailer validity to allow resume installation.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus  FirmwareToResume(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+
+  /*
+   *  Initial conditions to be fulfilled :
+   *   - Trailer magic is present
+   *   - Active slot number is correct
+   *   - test header from trailer is signed
+   *   - header from dwl slot is same as the one from trailer
+   */
+
+  /* check trailer Magic */
+  e_ret_status = CheckTrailerMagic(DwlSlot);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate the pTestHeader and verify it the active slot is correct */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate pTestHeader parameter */
+    e_ret_status = ParseFWInfo(pTestHeader, fw_header_trailer_test);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Active slot number correct ?
+       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
+    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
+    {
+      /* Check header test field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
+    }
+    else
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not valid!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Read header from dwl slot and verify this is the same as the test header from trailer */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
+                                     sizeof(fw_header_dwl_slot));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (memcmp(fw_header_dwl_slot, fw_header_trailer_test, SE_FW_AUTH_LEN) != 0U)
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not same as dwl slot header!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* First part KO : return error */
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Read header in active slot if any */
+  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                   sizeof(fw_header_active_slot));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify the header signature in active slot */
+    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
+
+    /* Populate pValidHeader parameter */
+    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header valid field in trailer */
+      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                       sizeof(fw_header_trailer_valid));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * 3 cases:
+       * - Header in active slot is identical to the header valid field
+       *   ==> installation interrupted very early. Resume install must be triggered.
+       * - Header in active slot is identical to the header test field
+       *   ==> installation interrupted after active header erasing. Resume install must be triggered.
+       * - Any other values
+       *   ==> Hack tentative, resume install must not be triggered.
+       */
+
+      /* Check if header in active slot is same as header valid in trailer */
+      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, SE_FW_AUTH_LEN) != 0)
+      {
+        /* Check candidate image version : should be OK */
+        e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+      }
+      /* Check if header in active slot is same as header test in trailer */
+      else if (memcmp(fw_header_active_slot, fw_header_trailer_test, SE_FW_AUTH_LEN) == 0U)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+      else
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  No resume required : Header in active slot is neither sames TRAILER_HDR_TEST as nor TRAILER_VALID_TEST!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        e_ret_status = SFU_ERROR;
+      }
+    }
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+  else
+  {
+    /*
+     * Header in active slot is not valid.
+     * It is considered this can not be hack attempt, because header in active slot is in
+     * protected area.
+     * Possible reasons:
+     * - Installation has been interrupted during very first image installation (active slot was empty)
+     * - Installation has been interrupted during reconstitution of first sector of active slot
+     * If header test field in trailer is signed and with proper version, we resume install.
+     */
+
+    /* Read header valid field in trailer */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                     sizeof(fw_header_trailer_valid));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check header valid field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* active slot was containing an active image */
+
+        /* Populate pValidHeader parameter */
+        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /* Check candidate image version */
+          e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+        }
+      }
+      else
+      {
+        /* active slot was empty : we authorize only the installation of a specific version identified by
+           SFU_FW_VERSION_INIT_NUM */
+        if (pTestHeader->FwVersion == SFU_FW_VERSION_INIT_NUM)
+        {
+          /* active slot was empty or was containing bricked Fw image */
+          e_ret_status = SFU_SUCCESS;
+        }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        else
+        {
+          TRACE("\r\n\t  Init version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, pTestHeader->FwVersion);
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+    }
+
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify signature on encrypted FW
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus VerifyFwSignatureBeforeDecrypt(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_decrypted_chunk_size;
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t fw_authenticated_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_authenticated_chunk_size;
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+  uint32_t fw_index;
+  uint32_t size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  /* Verify header presence */
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process initialization
+     ================================= */
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+  if (se_ret_status == SE_SUCCESS)
+  {
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+    se_ret_status = SE_AuthenticateFW_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+
+    /* Skip header : no decryption needed */
+    fw_index = SFU_IMG_IMAGE_OFFSET;
+
+    e_ret_status = SFU_SUCCESS;
+    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
+           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Set size of reading/decryption */
+      size = SFU_IMG_CHUNK_SIZE;
+
+      /* Last pass ? */
+      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
+      {
+        /* Default chunk size can be troncated at end of file */
+        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
+      }
+
+      /* read then decrypt phase
+       ======================= */
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        fw_decrypted_chunk_size = size;
+        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
+                                          (int32_t *)&fw_decrypted_chunk_size);
+
+        if (se_ret_status == SE_SUCCESS)
+        {
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+          fw_authenticated_chunk_size = sizeof(fw_authenticated_chunk);
+          se_ret_status = SE_AuthenticateFW_Append(&e_se_status, fw_decrypted_chunk, (int32_t)size,
+                                                   fw_authenticated_chunk, (int32_t *)&fw_authenticated_chunk_size);
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+          fw_index += size;
+        }
+      }
+    }
+  }
+
+  /* Do the Finalization, check the authentication TAG
+     ================================================= */
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
+  {
+    e_ret_status = SFU_ERROR;
+
+    /* Finalization stage */
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if (se_ret_status == SE_SUCCESS)
+    {
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+      e_ret_status = SFU_SUCCESS;
+#else
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status = SE_AuthenticateFW_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+      if ((se_ret_status == SE_SUCCESS) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, pFwImageHeader->FwTag, SE_TAG_LEN) == SFU_SUCCESS)
+        {
+          e_ret_status = SFU_SUCCESS;
+        }
+      }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Decrypt Image from dwl slot to active slot
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus DecryptImageFromDwlSlotToActiveSlot(uint32_t ActiveSlot, uint32_t DwlSlot,
+                                                           SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_index;
+  uint32_t size;
+  uint32_t fw_decrypted_chunk_size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  TRACE("\r\n\t  Image preparation done.\r\n\t  Installation started ...");
+
+  /* Verify header presence */
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Control the firwmare size vs slot size */
+  if ((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) > SLOT_SIZE(ActiveSlot))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process initialization
+     ================================= */
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+  if (se_ret_status == SE_SUCCESS)
+  {
+
+    /* Erasing operation
+     ================= */
+
+    /*
+     *  The header may not be contiguous with the FW image : 2 erasing operations needed
+     */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                           SFU_IMG_IMAGE_OFFSET);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                             (uint8_t *)(SlotStartAdd[ActiveSlot] + SFU_IMG_IMAGE_OFFSET),
+                                             SLOT_SIZE(ActiveSlot) - SFU_IMG_IMAGE_OFFSET);
+    }
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /*
+     * Save immediately the new active FW header
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_IMG_Validation(ActiveSlot, pFwImageHeader);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  Header writing failure!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+    }
+
+    /*
+     * Skip header : no decryption needed
+     */
+    fw_index = SFU_IMG_IMAGE_OFFSET;
+
+    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
+           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Refresh Watchdog every 10 iterations */
+      if ((fw_index % 10U) != 0U)
+      {
+        (void) SFU_LL_SECU_IWDG_Refresh();
+      }
+
+      /* Set size of reading/decryption */
+      size = SFU_IMG_CHUNK_SIZE;
+
+      /* Last pass ? */
+      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
+      {
+        /* Default chunk size can be troncated at end of file */
+        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
+      }
+
+      /* read then decrypt phase
+       ======================= */
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        fw_decrypted_chunk_size = size;
+        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
+                                          (int32_t *)&fw_decrypted_chunk_size);
+
+        /*
+        * writing phase
+        * =============== */
+        if (se_ret_status == SE_SUCCESS)
+        {
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotStartAdd[ActiveSlot] + fw_index),
+                                            fw_decrypted_chunk, size);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+          /* Update pointer */
+          fw_index += size;
+        }
+      }
+    }
+  }
+
+#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_index);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#endif /* SFU_ENCRYPTED_IMAGE */
+
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
+  {
+    /* Do the Finalization, check the authentication TAG*/
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if (se_ret_status != SE_SUCCESS)
+    {
+      e_ret_status = SFU_ERROR;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Install the new version
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                         SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+
+  /*
+   * Verify FW Image signature in dwl slot
+   */
+  e_ret_status = VerifyFwSignatureBeforeDecrypt(DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_SIGNATURE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Control if there is no additional code beyond the firmware image (malicious SW)
+   */
+  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot), pTestHeader->FwSize);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_ADDITIONAL_CODE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Write trailer : memorize installation process started
+   */
+  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_UPDATE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Decrypt the FW image : from dwl slot to active slot
+   */
+  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+    return e_ret_status;
+  }
+
+
+  /*
+   * erase downloaded FW after installation
+   */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    SFU_EXCPT_SetError(SFU_EXCPT_DWL_SLOT_ERASING_ERR);
+    return e_ret_status;
+  }
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to be populated
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+
+  /* Verify FW Image Header tag in dwl slot */
+  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
+                         SFU_IMG_IMAGE_OFFSET);
+
+    /* Check if there is enough room for the trailers */
+    if (trailer_begin < end_of_test_image)
+    {
+      /*
+       * This error causes is not memorized in the BootInfo area because there won't be any error handling
+       * procedure.
+       * If this function returns that no new firmware can be installed (as this may be a normal case).
+       */
+      e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+    else
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SFU_NO_SWAP) */
+
+
+
+/* Functions Definition : services ------------------------------------------- */
+
+#if  defined(SFU_NO_SWAP)
+/**
+  * @brief Checks if there is a pending firmware installation.
+  *        2 situations can occur:
+  *        A. Pending firmware installation: a firmware is ready to be installed.
+  *        B. No firmware installation pending
+  * @note  The anti-rollback check is not taken into account at this stage.
+  * @note  This function populates the FWIMG module variables: fw_image_header_to_test
+  * @param  pDwlSlotToInstall identification of the downloaded slot to install
+  * @param  pActiveSlotToResume identification of the active slot to resume
+  * @param  pActiveSlotToRollback identification of the active slot to rollback
+  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, no pending action)
+  */
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback)
+{
+  SFU_IMG_ImgInstallStateTypeDef e_ret_state = SFU_IMG_NO_FWUPDATE;
+  uint32_t i;
+  uint32_t j;
+
+  /* No rollback capability in "NO_SWAP" configuration */
+  *pActiveSlotToResume = SLOT_INACTIVE;
+  *pActiveSlotToRollback = SLOT_INACTIVE;
+  *pDwlSlotToInstall = SLOT_INACTIVE;
+
+  /* Check image installation stopped
+     ================================ */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+      {
+        /* Slot configured ? */
+        if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+        {
+          if (SFU_SUCCESS == FirmwareToResume(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
+                                               &fw_image_header_to_test))
+          {
+            /* A Firmware Update has been stopped
+             * fw_image_header_to_test & fw_image_header_validated have been populated
+             * Stop at first occurrence : next ones if any will be resumed after reset
+             */
+            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
+            *pDwlSlotToInstall = SLOT_DWL_1 + j;
+            return SFU_IMG_FWUPDATE_STOPPED;
+          }
+        }
+      }
+    }
+  }
+
+  /* Install new firmware if requested
+     ================================= */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + i, &fw_image_header_to_test))
+      {
+        /*
+         * A Firmware is available for installation:
+         * fw_image_header_to_test has been populated
+         * Stop at first occurrence : next ones if any will be installed after reset
+         */
+        *pDwlSlotToInstall = SLOT_DWL_1 + i;
+        return SFU_IMG_FWIMAGE_TO_INSTALL;
+      }
+    }
+  }
+
+  return e_ret_state;
+}
+
+/**
+  * @brief Resume installation : not required but present for compatibility with swap process
+  *        If installation procedure is interrupted (e.g.: switch off) it will be restarted from begin at next reboot.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS
+  */
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+
+  /*
+   * Decrypt the FW image : from dwl slot to active slot
+   */
+  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, &fw_image_header_to_test);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+  }
+
+  /*
+   * erase downloaded FW after installation
+   */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    SFU_EXCPT_SetError(SFU_EXCPT_DWL_SLOT_ERASING_ERR);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Resume procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Resume procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
+  *        valid if the checks are successful.
+  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
+  *        afterwards if the cryptographic scheme allows this (signature check for instance).
+  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
+  *        This function modifies the FLASH content.
+  *        If this procedure is interrupted (e.g.: switch off) installation will be restarted from begin at next reboot.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint32_t active_slot;
+
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /*
+   * Populate fw_image_header_validated
+   */
+  pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
+                                   sizeof(fw_image_header_validated));
+  
+  /*
+   * Installing the new firmware image consists in decrypting the candidate firmware image.
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
+  }
+
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    /* Erase downloaded FW in case of installation  error */
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Installation procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Installation procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  /* return the installation result */
+  return (e_ret_status);
+}
+#endif /* (SFU_NO_SWAP) */
+
+
+#if   defined(SFU_NO_SWAP)
+/**
+  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
+
+  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
+                                             SLOT_SIZE(DwlSlot));
+  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  return ((e_ret_status_dwl != SFU_SUCCESS) ?  SFU_ERROR : SFU_SUCCESS);
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SFU_NO_SWAP) */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_regions.h
new file mode 100644
index 00000000..0408a5ee
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_regions.h
@@ -0,0 +1,103 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_regions.h
+  * @author  MCD Application Team
+  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_REGIONS_H
+#define SFU_FWIMG_REGIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "se_crypto_config.h"
+
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  *  Slot list : 2 slots per image configuration + swap
+  */
+#define NB_SLOTS      4U
+#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
+#define SLOT_ACTIVE_1 1U
+#define SLOT_DWL_1    2U
+#define SLOT_SWAP     3U
+
+/* Calculation of the size of a slot */
+#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
+
+/*
+ * Design constraint: the image slot size must be a multiple of the swap area size.
+ * And of course both image slots must have the same size.
+ */
+#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
+
+/*
+ * Checking that the slot sizes are consistent with the .icf file
+ * Sizes expressed in bytes (+1 because the end address belongs to the slot)
+ * The checks are executed at runtime in the SFU_Img_Init() function.
+ */
+#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
+
+/**
+  * Image starting offset to add to the  address of 1st block
+  */
+#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
+
+
+/* External variables --------------------------------------------------------*/
+extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
+extern const uint32_t  SlotStartAdd[NB_SLOTS];
+extern const uint32_t  SlotEndAdd[NB_SLOTS];
+
+#if  (defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C))
+
+const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
+                                            SLOT_ACTIVE_1_HEADER,
+                                            SLOT_DWL_1_START,
+                                            SWAP_START,
+                                          };
+/* List of slot start address */
+const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
+                                            SLOT_ACTIVE_1_START,
+                                            SLOT_DWL_1_START,
+                                            SWAP_START,
+                                          };
+/* List of slot end address */
+const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
+                                            SLOT_ACTIVE_1_END,
+                                            SLOT_DWL_1_END,
+                                            SWAP_END,
+                                          };
+#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_REGIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_services.h
new file mode 100644
index 00000000..4d127d81
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_services.h
@@ -0,0 +1,95 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_services.h
+  * @author  MCD Application Team
+  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
+  *          API definitions.
+  *          These services can be called by the bootloader to deal with images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_SERVICES_H
+#define SFU_FWIMG_SERVICES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_IMG Initialization Status Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_IMG_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_IMG Image Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
+  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
+  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
+  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
+} SFU_IMG_ImgInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback);
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_SERVICES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_swap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_swap.c
new file mode 100644
index 00000000..80e0bde8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_fwimg_swap.c
@@ -0,0 +1,2317 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_swap.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the specific functionalities of the image handling for
+  *          the installation process with swap area.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_SWAP_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h" /* to have definitions like SFU_IMG_InitStatusTypeDef
+                                   (required by sfu_fwimg_internal.h) */
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+#if  !defined(SFU_NO_SWAP)
+
+/* Private macros ------------------------------------------------------------*/
+#define TRAILER_INDEX(A)  (SLOT_SIZE(A) / SLOT_SIZE(SLOT_SWAP))
+/*  position of image begin on 1st block */
+#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH + MAGIC_LENGTH)
+
+/*                                         DWL_SLOT_REGION_SIZE                                             */
+/* <----------------------------------------------------------------------------------------------------->  */
+/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH|N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t) */
+/* | header 1     | header 2     |SWAP magic  |CLEAN pat.  | N*CPY_TO_ACTIVE_SLOT  | N*CPY_TO_DWL_SLOT      */
+/*                                                                                                          */
+/* Please note that the size of the trailer area (N*CPY_TO_SLOTx) depends directly on SFU_LL_FLASH_write_t type, */
+/* so it can differ from one platform to another (this is FLASH-dependent)                                       */
+#define TRAILER_SIZE(A) ((sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A)))\
+                         + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) + (uint32_t)(TRAILER_HEADER))
+#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A]\
+                                        + SLOT_SIZE(A) - TRAILER_SIZE(A)))
+#define TRAILER_CPY_TO_DWL_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
+                                              + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) \
+                                              + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
+#define TRAILER_CPY_TO_ACTIVE_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
+                                                 + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
+
+#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
+#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_CLEAN_ADDR(A)((uint8_t *)(TRAILER_BEGIN(A)\
+                                          + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH))
+
+#define CHUNK_1_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
+                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+#define CHUNK_0_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
+                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+
+#define CHUNK_0_ADDR_HEADER(A,B,C) ((((B)==0) && ((C)==0))?\
+                                    (uint8_t *)(SlotHeaderAdd[(A)]) : \
+                                    (uint8_t *)(SlotStartAdd[(A)]\
+                                                +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+
+#define CHUNK_0_ADDR_MODIFIED(A,B,C) ((((B)==0) && ((C)==0))?\
+                                      ((uint8_t*)(SlotStartAdd[(A)] + SFU_IMG_IMAGE_OFFSET)) : \
+                                      ((uint8_t*)(SlotStartAdd[(A)] + (SLOT_SIZE(SLOT_SWAP)*(B)) \
+                                                  + (SFU_IMG_CHUNK_SIZE*(C)))))
+#define CHUNK_SWAP_ADDR(B) ((uint8_t *)(SlotStartAdd[SLOT_SWAP]+(SFU_IMG_CHUNK_SIZE*(B))))
+
+/* Private variables ----------------------------------------------------------*/
+/* Trailer pattern : sizeof of write access type */
+static const int8_t SWAPPED[sizeof(SFU_LL_FLASH_write_t)] __attribute__((aligned(8))) = {0, 0, 0, 0, 0, 0, 0, 0};
+static const int8_t NOT_SWAPPED[sizeof(SFU_LL_FLASH_write_t)]  __attribute__((aligned(8))) = {-1, -1, -1, -1, -1, -1,
+                                                                                              -1, -1
+                                                                                             };
+
+/* Functions Definition : helper ---------------------------------------------*/
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Checks if a rollback is required
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if Image should be rollbacked, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToRollback(uint32_t SlotNumber, SE_FwStateTypeDef MasterSlotState)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus e_ret_status_se;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+  SE_FwStateTypeDef e_next_image_state;
+
+
+  /* If an image is detected, read the image state :
+   * if image is new, nothing to do. Switch from NEW to SELFTEST will be done before when launching user application.
+   * if image is selftest, set to invalid. Rollback required.
+   * if image is valid, nothing to do.
+   * if image is invalid, Rollback is required.
+   */
+  if (SFU_SUCCESS == SFU_IMG_DetectFW(SlotNumber))
+  {
+    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
+    if (e_ret_status_se == SE_SUCCESS)
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  SLOT_ACTIVE_%d state = %d", SlotNumber, image_state);
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+      switch (image_state)
+      {
+        case FWIMG_STATE_NEW:
+        {
+          /* Multiple reset can occur during installation
+           * Switch from NEW to SELFTEST will be done before when launching user application
+           */
+          break;
+        }
+        case FWIMG_STATE_SELFTEST:
+        {
+          if (MasterSlotState == FWIMG_STATE_VALID_ALL)
+          {
+            /* Master slot is in VALID_ALL state, all other images should be validated
+             * Compare to successive validation operations VALID_ALL is a single request thus robust to reset
+             */
+            e_next_image_state = FWIMG_STATE_VALID;
+            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            if (e_ret_status_se != SE_SUCCESS)
+            {
+              TRACE("\r\n\t  SLOT_ACTIVE_%d state update error", SlotNumber);
+            }
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+            e_ret_status = SFU_ERROR;
+          }
+          else
+          {
+            /* Bootloader should never find an image in SELFTEST state - bootloader
+             * assumes self test was not able to complete and marks image as INVALID
+             */
+            e_next_image_state = FWIMG_STATE_INVALID;
+            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            if (e_ret_status_se != SE_SUCCESS)
+            {
+              TRACE("\r\n\t  SLOT_ACTIVE_%d state update error", SlotNumber);
+            }
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+            e_ret_status = SFU_SUCCESS;
+          }
+          break;
+        }
+        case FWIMG_STATE_VALID:
+        case FWIMG_STATE_VALID_ALL:
+        {
+          break;
+        }
+        default:
+        {
+          /* image may be in INVALID state
+           * Image marked as invalid failed selftest so we need to attempt a rollback to last good image
+           */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Updates the finger print of the new firmware the header signature of the previous firmware
+  * @param  pNewHeader: pointer in ram to header of new installed fw
+  * @param  pPrevHeader: pointer in ram to header of backed-up fw
+  * @retval none
+  */
+static void UpdateHeaderFingerPrint(SE_FwRawHeaderTypeDef *pNewHeader, SE_FwRawHeaderTypeDef *pPrevHeader)
+{
+  (void) memcpy(pNewHeader->PrevHeaderFingerprint, pPrevHeader->HeaderSignature,
+                sizeof(pNewHeader->PrevHeaderFingerprint));
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+/**
+  * @brief  Check the magic from trailer or counter
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
+{
+  uint8_t  magic[MAGIC_LENGTH];
+  uint8_t  clean[MAGIC_LENGTH];
+  uint8_t  signature_valid[MAGIC_LENGTH / 2];
+  uint8_t  signature_test[MAGIC_LENGTH / 2];
+  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
+
+  /* Pattern initialization */
+  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
+
+  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
+  if (SFU_LL_FLASH_Read(signature_valid,
+                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_valid)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(signature_test,
+                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_test)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(clean, TRAILER_CLEAN_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /*
+   * Check magic validity :
+   *  - last 16 bytes of validated header
+   *  - last 16 bytes of test header
+   *  - significant values (not an erased flash pattern)
+   *
+   *  Check clean tag not set :
+   *  - should be erased flash pattern but not clean-up paatern (0x55 0x55 ...)
+   */
+  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
+      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
+      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0)
+      || (memcmp(clean, erased_flash_pattern, MAGIC_LENGTH) != 0))
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Write the minimum value possible on the flash
+  * @param  pAddr: pointer to address to write .
+  * @param  pValue: pointer to the value to write
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  *
+  * @note This function should be FLASH dependent.
+  *       We abstract this dependency thanks to the type SFU_LL_FLASH_write_t.
+  *       See @ref SFU_LL_FLASH_write_t
+  */
+static SFU_ErrorStatus AtomicWrite(uint8_t *pAddr, SFU_LL_FLASH_write_t *pValue)
+{
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  return SFU_LL_FLASH_Write(&flash_if_info, pAddr, (uint8_t *)pValue, sizeof(SFU_LL_FLASH_write_t));
+}
+
+/**
+  * @brief  Clean Magic value
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CleanMagicValue(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t clean_tag[MAGIC_LENGTH];
+
+  /* set the clean tag into trailer */
+  (void) memset(clean_tag, 0x55, MAGIC_LENGTH);
+  return SFU_LL_FLASH_Write(&flash_if_info, TRAILER_CLEAN_ADDR(DwlSlot), clean_tag, MAGIC_LENGTH);
+}
+
+/**
+  * @brief  Write Trailer Headers : TEST + VALID + SWAP
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  /* everything is in place , just compute from present data and write it */
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t  magic[MAGIC_LENGTH];
+  uint32_t buffer;
+
+  /* Write Headers VALID + TEST */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
+                                    SE_FW_HEADER_TOT_LEN);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
+                                      SE_FW_HEADER_TOT_LEN);
+  }
+
+  /* Write Magic */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    buffer = (uint32_t) pValidHeader;
+    (void) memcpy(&magic[0U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
+    buffer = (uint32_t) pTestHeader;
+    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                  MAGIC_LENGTH / 2U);
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the size of the swap area in a given slot sector.
+  * @note   The erasure occurs at @: @slot + index*swap_area_size
+  * @param  SlotNumber index of the slot in the list
+  * @param  Index This is the number of "swap size" we jump from the slot start
+  * @retval SFU_ SUCCESS if valid, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus EraseSlotIndex(uint32_t SlotNumber, uint32_t index)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t buffer;
+
+  buffer = SlotStartAdd[SlotNumber];
+  buffer = buffer + (SLOT_SIZE(SLOT_SWAP) * index);
+
+  /* If this is an active slot and the index is 0 then header is concerned */
+  if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber <= (SLOT_ACTIVE_1 + SFU_NB_MAX_ACTIVE_IMAGE)) && (index == 0U))
+  {
+
+    /*
+     *  As the header may not be contiguous with FW, this action is split in 2 actions :
+     *    - HEADER : executed in secured environment
+     *    - remaining part : done by SBSFU
+     */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                           SFU_IMG_IMAGE_OFFSET) ;
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SlotNumber] +
+                                             SFU_IMG_IMAGE_OFFSET, SLOT_SIZE(SLOT_SWAP) - SFU_IMG_IMAGE_OFFSET);
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)buffer, SLOT_SIZE(SLOT_SWAP)) ;
+  }
+
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify image signature of binary after decryption
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus VerifyFwSignatureAfterDecrypt(SE_StatusTypeDef *pSeStatus, uint32_t DwlSlot,
+                                                     SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SE_Ex_PayloadDescTypeDef payload_desc;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*
+   * The values below are not necessarily matching the way the firmware
+   * has been spread in FLASH but this is adjusted later on in the this function.
+   */
+  payload_desc.pPayload[0] = SlotStartAdd[SLOT_SWAP];
+  payload_desc.PayloadSize[0] = SLOT_SIZE(SLOT_SWAP);
+  payload_desc.pPayload[1] = SlotStartAdd[DwlSlot];
+  payload_desc.PayloadSize[1] = SLOT_SIZE(DwlSlot);
+
+  fw_size = pFwImageHeader->PartialFwSize;
+  fw_offset = (SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
+              SLOT_SIZE(SLOT_SWAP);
+
+  /*
+   * Adjusting the description of the way the Firmware is written in FLASH.
+   */
+  payload_desc.pPayload[0] = payload_desc.pPayload[0] + fw_offset;
+
+  /* The first part contains the execution offset so the payload size must be adjusted accordingly */
+  payload_desc.PayloadSize[0] = payload_desc.PayloadSize[0] - fw_offset;
+
+  if (fw_size <= payload_desc.PayloadSize[0])
+  {
+    /* The firmware is written fully in a contiguous manner */
+    payload_desc.PayloadSize[0] = fw_size;
+    payload_desc.PayloadSize[1] = 0U;
+    payload_desc.pPayload[1] = 0U;
+  }
+  else
+  {
+    /*
+     * The firmware is too big to be contained in the first payload slot.
+     * So, the firmware is split in 2 non-contiguous parts
+     */
+
+    if ((payload_desc.pPayload[1] == 0U)
+        || (payload_desc.PayloadSize[1] < (fw_size - payload_desc.PayloadSize[0])))
+    {
+      return SFU_ERROR;
+    }
+
+    /* The second part contains the end of the firmware so the size is the total size - size already stored in the
+       first area */
+    payload_desc.PayloadSize[1] = fw_size - payload_desc.PayloadSize[0];
+
+  }
+
+  /* Signature Verification */
+  return VerifyFwSignatureScatter(pSeStatus, DwlSlot, pFwImageHeader, &payload_desc, SE_FW_IMAGE_PARTIAL);
+}
+
+
+/**
+  * @brief  Swap active slot with decrypted FW to install
+  *         With the 2 images implementation, installing a new Firmware Image means swapping active slot and dwl slot.
+  *         To perform this swap, the image to be installed is split in blocks of the swap size:
+  *         SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP) blocks to be swapped .
+  *         Each of these blocks is swapped using smaller chunks of SFU_IMG_CHUNK_SIZE size.
+  *         The swap starts from the tail of the image and ends with the beginning of the image ("swap from tail to
+  *         head").
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus SwapFirmwareImages(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_LL_FLASH_write_t trailer;
+  int32_t index_active_slot;
+  int32_t index_dwl_slot_write;
+  int32_t index_dwl_slot_read;
+  int32_t chunk;
+  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  int32_t index_active_slot_partial_begin;
+  int32_t index_active_slot_partial_end;
+  int32_t index_active_slot_final_end;
+  int32_t index_dwl_slot_partial_end;
+  int32_t index_active_slot_empty_begin;
+  /* number_of_index_active_slot is the number of blocks in active slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
+  uint32_t number_of_index_active_slot = SLOT_SIZE(ActiveSlot) / SLOT_SIZE(SLOT_SWAP);
+  /* number_of_index_dwl_slot is the number of blocks in dwl slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
+  uint32_t number_of_index_dwl_slot = SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP);
+  /* number_of_chunk is the number of chunks used to swap 1 block (moving a block of SLOT_SIZE(SLOT_SWAP) bytes
+     split in number_of_chunk chunks of SFU_IMG_CHUNK_SIZE bytes) */
+  uint32_t number_of_chunk = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  uint32_t write_len;
+  uint32_t offset_block_partial_begin;
+  uint32_t offset_block_partial_end;
+  uint32_t offset_block_final_end;
+
+  TRACE("\r\n\t  Image preparation done.\r\n\t  Swapping the firmware images");
+
+  /* index_active_slot_partial_begin is the index of first block (of SLOT_SIZE(SLOT_SWAP) bytes) in active slot
+     impacted by partial image */
+  index_active_slot_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) /
+                                    SLOT_SIZE(SLOT_SWAP);
+
+  /* offset_block_partial_begin is the offset of first byte of partial image inside index_active_slot_partial_begin
+     block */
+  offset_block_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) %
+                               SLOT_SIZE(SLOT_SWAP);
+
+  /* In case of COMPLETE update, the full slots are swapped
+     Assumption : DwlSlot is at least greater than ActiveSlot */
+  if ((pFwImageHeader->FwSize == pFwImageHeader->PartialFwSize) && (SLOT_SIZE(DwlSlot) >= SLOT_SIZE(ActiveSlot)))
+  {
+    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in active slot */
+    index_active_slot_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_partial_end is the offset of first byte following partial image, inside
+       index_active_slot_partial_end block */
+    offset_block_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
+
+    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in dwl slot or swap area */
+    index_dwl_slot_partial_end = ((SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP)) - 1U;
+
+    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following final
+       image in active slot */
+    index_active_slot_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
+       block */
+    offset_block_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
+
+    /* set index_dwl_slot_write: starting from the end */
+    index_dwl_slot_write = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+  }
+  else
+  {
+    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in active slot */
+    index_active_slot_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
+                                     pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_partial_end is the offset of first byte following partial image, inside
+       index_active_slot_partial_end block */
+    offset_block_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
+                                pFwImageHeader->PartialFwSize) % SLOT_SIZE(SLOT_SWAP);
+
+    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in dwl slot or swap area */
+    index_dwl_slot_partial_end = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
+                                                            SLOT_SIZE(SLOT_SWAP))) % SLOT_SIZE(SLOT_SWAP) +
+                                   pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP)) - 1U;
+
+    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       final image in active slot */
+    index_active_slot_final_end = ((SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) / SLOT_SIZE(SLOT_SWAP));
+
+    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
+       block */
+    offset_block_final_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) % SLOT_SIZE(SLOT_SWAP);
+
+    /* set index_dwl_slot_write: starting from the end, block index in dwl slot or swap area to receive block from
+       active slot */
+    if (index_active_slot_partial_end == (number_of_index_active_slot - 1))
+    {
+      /* last block of dwl slot can only receive last block of active slot, due to trailer presence */
+      index_dwl_slot_write = number_of_index_dwl_slot - 1;
+    }
+    else
+    {
+      index_dwl_slot_write = number_of_index_dwl_slot - 2;
+    }
+  }
+
+  /* set index_active_slot: starting from the end, block index from active slot to copy in dwl slot */
+  index_active_slot = index_active_slot_partial_end;
+
+  /* set index_dwl_slot_read: starting from the end, block index in dwl slot or swap area to copy updated image to
+     active slot */
+  index_dwl_slot_read = index_dwl_slot_partial_end;
+
+  /* Adjust indexes in case offset is 0: in this case, first block to swap is the previous one */
+  if (offset_block_partial_end == 0)
+  {
+    index_active_slot--;
+    index_dwl_slot_read--;
+  }
+
+  /*
+   * dwl slot read index should be lower than dwl slot write index.
+   * If not the case, the dwl slot is not big enough to manage this partial firmware image
+   * (depends on offset and size).
+   */
+  if (index_dwl_slot_read >= index_dwl_slot_write)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Swap one block at each loop, until all targeted blocks of active slot have been copied
+   * Concerned blocks are:
+   * 1- block impacted by partial image
+   * 2- first block containing the header
+   */
+  while (index_active_slot >= 0)
+  {
+    /* Reload watchdoag every SWAP size */
+    SFU_LL_SECU_IWDG_Refresh();
+
+    TRACE(".");
+
+    if ((index_dwl_slot_write < -1) || (index_dwl_slot_read < -1))
+    {
+      return SFU_ERROR;
+    }
+
+    /* If CPY_TO_DWL_SLOT(i) is still virgin, then swap the block from active slot to dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
+                                     TRAILER_CPY_TO_DWL_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 - index_active_slot),
+                                     sizeof(trailer));
+    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
+    {
+      /* Erase destination block in dwl slot or swap, if not the trailer block */
+      if (index_dwl_slot_write != (number_of_index_dwl_slot - 1))
+      {
+        if (index_dwl_slot_write == -1)
+        {
+          /* Erase the swap */
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
+                                                 SLOT_SIZE(SLOT_SWAP));
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
+        }
+        else /* index_dwl_slot_write >= 0 */
+        {
+          /* erase the size of "swap area" at @: Dwl slot + index_dwl_slot_write*swap_area_size */
+          e_ret_status = EraseSlotIndex(DwlSlot, index_dwl_slot_write);
+        }
+        if (e_ret_status !=  SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+
+      /* Copy the block from active slot to dwl slot or swap (using "number_of_chunk" chunks) */
+      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
+      {
+        /* ignore return value,  no double ecc error is expected, area already read before */
+        (void)SFU_LL_FLASH_Read(buffer, CHUNK_0_ADDR_HEADER(ActiveSlot, index_active_slot, chunk), sizeof(buffer));
+        write_len = sizeof(buffer);
+        if (index_dwl_slot_write == -1)
+        {
+          /* Destination block is the swap */
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_SWAP_ADDR(chunk), buffer, write_len);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+          if (e_ret_status != SFU_SUCCESS)
+          {
+            return SFU_ERROR;
+          }
+        }
+        else /* index_dwl_slot_write >= 0 */
+        {
+          /* Destination block is in dwl slot: Do not overwrite the trailer. */
+          if (((uint32_t)CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk)) < (uint32_t)TRAILER_BEGIN(DwlSlot))
+          {
+            /*  write is possible length can be modified  */
+            if ((uint32_t)(CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) + write_len) >
+                (uint32_t)TRAILER_BEGIN(DwlSlot))
+            {
+              write_len = TRAILER_BEGIN(DwlSlot) - CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk);
+            }
+            e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                              buffer, write_len);
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+      }
+
+      /*
+       * The block of the active firmware has been backed up.
+       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
+       */
+      e_ret_status  = AtomicWrite(TRAILER_CPY_TO_DWL_SLOT(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
+                                  (SFU_LL_FLASH_write_t *) SWAPPED);
+
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+        return SFU_ERROR;
+      }
+    }
+
+    /* If CPY_TO_ACTIVE_SLOT(i) is still virgin, then swap the block from dwl slot to active slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
+                                     TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 -
+                                                                index_active_slot),
+                                     sizeof(trailer));
+    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
+    {
+      /* erase the size of "swap area" at @: active slot + index_active_slot*swap_area_size*/
+      e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
+
+      if (e_ret_status !=  SFU_SUCCESS)
+      {
+        return SFU_ERROR;
+      }
+
+      /*
+       * Fill block in active slot:
+       * The appropriate update image block of dwl slot together with initial image block that has been backed up in
+       * dwl slot,
+       * are associated to constitute final block in active slot (installing the block of the new firmware image).
+       */
+      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
+      {
+        /* Read complete chunk of updated image */
+        if (index_dwl_slot_read == -1)
+        {
+          /* ignore return value, no double ecc error is expected, area already read before */
+          (void)SFU_LL_FLASH_Read(buffer, CHUNK_SWAP_ADDR(chunk), sizeof(buffer));
+        }
+        else /* index_dwl_slot_read >= 0 */
+        {
+          /* ignore return value, no double ecc error is expected, area already read before */
+          (void)SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_read, chunk), sizeof(buffer));
+        }
+
+        /* Last impacted block: end of block has to be updated with initial image */
+        if (index_active_slot == index_active_slot_partial_end)
+        {
+          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
+          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) >= (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
+                                                                                  0) + offset_block_partial_end))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             sizeof(buffer));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+
+          /* If chunk is partially impacted by updated image, end of chunk is updated with the initial image content */
+          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) < (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
+                                                                                  0) + offset_block_partial_end))
+              && ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1))) >
+                  (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_end)))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer + (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
+                                             CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) +
+                                             (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
+                                             sizeof(buffer) - (offset_block_partial_end % SFU_IMG_CHUNK_SIZE));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+
+        /* First impacted block: beginning of block has to be updated with initial image */
+        if (index_active_slot == index_active_slot_partial_begin)
+        {
+          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
+          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) <=
+              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             sizeof(buffer));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+
+          /* If chunk is partially impacted by updated image, beginning of chunk is updated with the initial image
+             content */
+          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) <
+               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)) &&
+              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) >
+               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             offset_block_partial_begin % SFU_IMG_CHUNK_SIZE);
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+        /* Header block not impacted by partial image: complete block, except header, is updated with initial image */
+        else if (index_active_slot == 0)
+        {
+          /* check return value, as this area has not been read before */
+          e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk), sizeof(buffer));
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+          if (e_ret_status != SFU_SUCCESS)
+          {
+            return SFU_ERROR;
+          }
+        }
+
+        /* Last block of final image: end of block has to be cleaned with empty data */
+        if (index_active_slot == index_active_slot_final_end)
+        {
+          /* If chunk is completely beyond the final image, then chunk takes empty data */
+          if (CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) >=
+              CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)
+          {
+            memset(buffer, 0xFF, sizeof(buffer));
+          }
+
+          /* If chunk is partially beyond the final image, then chunk is partially updated with empty data */
+          if ((CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) <
+               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)) &&
+              (CHUNK_0_ADDR(ActiveSlot, index_active_slot, (chunk + 1)) >
+               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)))
+          {
+            memset(buffer + (offset_block_final_end % SFU_IMG_CHUNK_SIZE), 0xFF,
+                   sizeof(buffer) - (offset_block_final_end % SFU_IMG_CHUNK_SIZE));
+          }
+        }
+
+        write_len = SFU_IMG_CHUNK_SIZE;
+        /*  don't copy header in active slot
+            this will be done at the end during validation step */
+        if ((index_active_slot == 0) && (chunk == 0))
+        {
+          write_len = write_len - SFU_IMG_IMAGE_OFFSET;
+        }
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_0_ADDR_MODIFIED(ActiveSlot, index_active_slot, chunk),
+                                          buffer, write_len);
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+        if (e_ret_status != SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+
+      /*
+       * The block of the active firmware has been backed up.
+       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
+       * Except for block 0, because block 0 is incomplete at this stage (final header installation not yet done)
+       */
+      if (index_active_slot != 0)
+      {
+        e_ret_status  = AtomicWrite(TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot,
+                                                               (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
+                                    (SFU_LL_FLASH_write_t *) SWAPPED);
+
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+        if (e_ret_status != SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+    }
+
+    /* Decrement all block indexes */
+    index_dwl_slot_write--;
+    index_dwl_slot_read--;
+    index_active_slot--;
+
+    /*
+     * After having copied the impacted image blocks from active slot, copy also the first block
+     * due to header, if not already copied among the impacted image blocks.
+     */
+    if ((index_active_slot < index_active_slot_partial_begin) && (index_active_slot >= 0))
+    {
+      index_active_slot = 0;
+      index_dwl_slot_read = -1;  /* force read from swap area, to avoid exiting dwl slot / swap index allowed range */
+    }
+  }
+
+  /*
+   * Now, erase the blocks in active slot, located after final image
+   */
+  if (offset_block_final_end == 0)
+  {
+    index_active_slot_empty_begin = index_active_slot_final_end;
+  }
+  else
+  {
+    index_active_slot_empty_begin = index_active_slot_final_end + 1;
+  }
+  index_active_slot = number_of_index_active_slot - 1;
+  while (index_active_slot >= index_active_slot_empty_begin)
+  {
+    e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
+    if (e_ret_status !=  SFU_SUCCESS)
+    {
+      return SFU_ERROR;
+    }
+
+    /* Decrement block index */
+    index_active_slot--;
+  }
+
+  return e_ret_status;
+}
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/**
+  * @brief  Executes a rollback to the original firmware if a firmware update fails
+  * @param  ActiveSlot identification of the new active image
+  * @param  DwlSlot identification of previous firmware image (backed-up slot)
+  * @param  pFwImageHeader pointer in ram to the header of the backed-up FW
+  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
+  */
+static SFU_ErrorStatus RollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot,
+                                            SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t number_chunk_per_sector = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  SE_FwRawHeaderTypeDef *p_header;
+  uint32_t size;
+  uint32_t pass_index;
+  uint32_t erase_index;
+  uint32_t fw_source_address;
+  uint32_t fw_dest_write_address;
+  uint32_t fw_dest_erase_address;
+
+  if (number_chunk_per_sector == 0U)
+  {
+    return SFU_ERROR;
+  }
+
+  size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET;
+  fw_source_address = SlotStartAdd[DwlSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
+  fw_dest_write_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
+  fw_dest_erase_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SLOT_SIZE(SLOT_SWAP)) * SLOT_SIZE(SLOT_SWAP));
+  pass_index = ((size - 1U) / SFU_IMG_CHUNK_SIZE) + 1U;
+  erase_index = (pass_index - 1U) / number_chunk_per_sector * number_chunk_per_sector;
+
+  /* Erase the part of the active slot that will not be updated
+     ========================================================== */
+  size = (SLOT_SIZE(ActiveSlot) - (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)) / SLOT_SIZE(SLOT_SWAP) *
+         SLOT_SIZE(SLOT_SWAP);
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)(fw_dest_erase_address + SLOT_SIZE(SLOT_SWAP)),
+                                         size);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  while ((e_ret_status == SFU_SUCCESS) && (pass_index > 0U))
+  {
+    /* Reading phase
+       =============== */
+    e_ret_status = SFU_LL_FLASH_Read(buffer, (uint8_t *) fw_source_address, SFU_IMG_CHUNK_SIZE);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+    /* Erasing operation when aligned on erase_index
+       ============================================= */
+
+    /*
+     *  The header may not be contiguous with the FW image : 2 erasing operations needed
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if ((((pass_index - 1U) / number_chunk_per_sector) * number_chunk_per_sector) == erase_index)
+      {
+        (void) SFU_LL_SECU_IWDG_Refresh();
+        size = 0U;
+        if (erase_index == 0U)
+        {
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                                 SFU_IMG_IMAGE_OFFSET);
+          size = SFU_IMG_IMAGE_OFFSET;
+        }
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) fw_dest_erase_address + size,
+                                                 SLOT_SIZE(SLOT_SWAP) - size);
+        }
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+        erase_index -= number_chunk_per_sector;
+        fw_dest_erase_address -= SLOT_SIZE(SLOT_SWAP);
+      }
+    }
+
+    /* Writing phase
+       ============= */
+    /*
+     * Header is under isolated environment protection
+     * Thus the writing operation is split in 2 actions (HEADER + remaining part)
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      size = 0U;
+      if (pass_index == 1U)
+      {
+        /* Ensure there is no Fingerprint in original firmware header
+         * This stops someone attempting multiple rollbacks by writing fake fingerprint in original header
+         */
+        p_header = (SE_FwRawHeaderTypeDef *) buffer;
+        (void) memset(p_header->PrevHeaderFingerprint, 0x00, sizeof(p_header->PrevHeaderFingerprint));
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],  buffer,
+                                          SFU_IMG_IMAGE_OFFSET);
+        size = SFU_IMG_IMAGE_OFFSET;
+      }
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) fw_dest_write_address + size,  buffer + size,
+                                          SFU_IMG_CHUNK_SIZE - size);
+      }
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+    }
+
+    /* Index update
+       ============ */
+    pass_index--;
+    fw_source_address -= SFU_IMG_CHUNK_SIZE;
+    fw_dest_write_address -= SFU_IMG_CHUNK_SIZE;
+  }
+
+  return e_ret_status;
+}
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+
+/**
+  * @brief Decrypt Image in dwl slot
+  * @ note Decrypt is done from dwl slot to dwl slot + swap with 2 images (swap contains 1st sector)
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer in ram to the header to decrypt
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus DecryptImageInDwlSlot(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  uint32_t NumberOfChunkPerSwap = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  /*  chunk size is the maximum , the 1st block can be smaller */
+  /*  the chunk is static to avoid  large stack */
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_source_address = 0U;
+  uint32_t fw_dest_address_write = 0U;
+  uint32_t fw_dest_erase_address = 0U;
+  uint32_t fw_decrypted_total_size = 0U;
+  uint32_t size;
+  uint32_t oldsize;
+  uint32_t fw_decrypted_chunk_size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+  uint32_t pass_index = 0U;
+  uint32_t erase_index = 0U;
+
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process*/
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_PARTIAL);
+  if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK))
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Decryption loop*/
+    while ((e_ret_status == SFU_SUCCESS) && (fw_decrypted_total_size < (pFwImageHeader->PartialFwSize)) &&
+           (e_se_status == SE_OK))
+    {
+      if (pass_index == NumberOfChunkPerSwap)
+      {
+        fw_dest_address_write = SlotStartAdd[DwlSlot];
+        fw_dest_erase_address =  fw_dest_address_write;
+        erase_index = NumberOfChunkPerSwap;
+      }
+      if (pass_index == 0U)
+      {
+        fw_source_address = SlotStartAdd[DwlSlot] + SFU_IMG_IMAGE_OFFSET +
+                            (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP));
+        fw_dest_erase_address = SlotStartAdd[SLOT_SWAP];
+        fw_dest_address_write = fw_dest_erase_address + ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
+                                                                                  SLOT_SIZE(SLOT_SWAP))) %
+                                                         SLOT_SIZE(SLOT_SWAP));
+        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk) -
+                                  ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
+                                   sizeof(fw_decrypted_chunk));
+        if (fw_decrypted_chunk_size > pFwImageHeader->PartialFwSize)
+        {
+          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize;
+        }
+        pass_index = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)))
+                       % SLOT_SIZE(SLOT_SWAP)) / sizeof(fw_decrypted_chunk));
+      }
+      else
+      {
+        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk);
+
+        /* For the last 2 pass, divide by 2 remaining buffer to ensure that :
+         *     - chunk size greater than 16 bytes : minimum size of a block to be decrypted
+         *     - except last one chunk size is 16 bytes aligned
+         *
+         * Pass n - 1 : remaining bytes / 2 with (16 bytes alignment for crypto AND sizeof(SFU_LL_FLASH_write_t) for
+         *              flash programming)
+         * Pass n : remaining bytes
+         */
+
+        /* Last pass : n */
+        if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < fw_decrypted_chunk_size)
+        {
+          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize - fw_decrypted_total_size;
+        }
+        /* Previous pass : n - 1 */
+        else if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < ((2U * fw_decrypted_chunk_size) - 16U))
+        {
+          fw_decrypted_chunk_size = ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) / 32U) * 16U;
+
+          /* Set dimension to the appropriate length for FLASH programming.
+           * Example: 64-bit length for L4.
+           */
+          if ((fw_decrypted_chunk_size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
+          {
+            fw_decrypted_chunk_size = fw_decrypted_chunk_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                                                                 (fw_decrypted_chunk_size %
+                                                                  (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+          }
+        }
+        /* All others pass */
+        else
+        {
+          /* nothing */
+        }
+      }
+
+      size = fw_decrypted_chunk_size;
+
+      /* Decrypt Append*/
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *) fw_source_address, size);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+        break;
+      }
+      if (size != 0U)
+      {
+        se_ret_status = SE_Decrypt_Append(&e_se_status, (uint8_t *)fw_encrypted_chunk, (int32_t)size,
+                                          fw_decrypted_chunk, (int32_t *)&fw_decrypted_chunk_size);
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+        fw_decrypted_chunk_size = 0U;
+      }
+      if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK) && (fw_decrypted_chunk_size == size))
+      {
+        /* Erase Page */
+        if ((pass_index == erase_index)
+            || (pass_index == ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) /
+                               sizeof(fw_decrypted_chunk))))
+        {
+          (void) SFU_LL_SECU_IWDG_Refresh();
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address,
+                                                 SLOT_SIZE(SLOT_SWAP)) ;
+          erase_index += NumberOfChunkPerSwap;
+          fw_dest_erase_address += SLOT_SIZE(SLOT_SWAP);
+        }
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /*
+           * For last pass with remaining size not aligned on 16 bytes : Set dimension AFTER decrypt to the appropriate
+           * length for FLASH programming.
+           * Example: 64-bit length for L4.
+           */
+          if ((size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
+          {
+            /*
+            * By construction, SFU_IMG_CHUNK_SIZE is a multiple of sizeof(SFU_LL_FLASH_write_t) so there is no risk to
+             * read out of the buffer
+             */
+            oldsize = size;
+            size = size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+            while (oldsize < size)
+            {
+              fw_decrypted_chunk[oldsize] = 0xFF;
+              oldsize++;
+            }
+          }
+
+          /* Write Decrypted Data in Flash - size has to be 32-bit aligned */
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)fw_dest_address_write,  fw_decrypted_chunk,
+                                            size);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+          if (e_ret_status == SFU_SUCCESS)
+          {
+            /* Update flash pointer */
+            fw_dest_address_write  += (size);
+
+            /* Update source pointer */
+            fw_source_address += size;
+            fw_decrypted_total_size += size;
+            (void) memset(fw_decrypted_chunk, 0xff, sizeof(fw_decrypted_chunk));
+            pass_index += 1U;
+
+          }
+        }
+      }
+    }
+  }
+
+#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_decrypted_total_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#endif /* SFU_ENCRYPTED_IMAGE */
+
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS) && (e_se_status == SE_OK))
+  {
+    /* Do the Finalization, check the authentication TAG*/
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if ((se_ret_status != SE_SUCCESS) || (e_se_status != SE_OK))
+    {
+      e_ret_status = SFU_ERROR;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+    else
+    {
+      /* erase the remaining part of the image after shifting inside dwl slot */
+      if (pass_index <= NumberOfChunkPerSwap)
+      {
+        fw_dest_erase_address = SlotStartAdd[DwlSlot];
+      }
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address, SLOT_SIZE(SLOT_SWAP));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  check trailer validity to allow resume installation.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus  FirmwareToResume(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN];
+
+  /*
+   *  Initial conditions to be fulfilled :
+   *   - Trailer magic is present
+   *   - Active slot number is correct
+   *   - test header from trailer is signed
+   */
+
+  /* check trailer Magic */
+  e_ret_status = CheckTrailerMagic(DwlSlot);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate the pTestHeader and verify it the active slot is correct */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate pTestHeader parameter */
+    e_ret_status = ParseFWInfo(pTestHeader, fw_header_trailer_test);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Active slot number correct ?
+       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
+    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
+    {
+      /* Check header test field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
+    }
+    else
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not valid!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Read header in active slot if any */
+  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                   sizeof(fw_header_active_slot));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify the header signature in active slot */
+    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
+
+    /* Populate pValidHeader parameter */
+    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header valid field in trailer */
+      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                       sizeof(fw_header_trailer_valid));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check if header in active slot is same as header valid in trailer */
+      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, SE_FW_AUTH_LEN) != 0)
+      {
+        /*
+         * Header in active slot is not identical to header valid field:
+         * Either install is already complete (if header in active slot is same as header test field in trailer),
+         * or there is hack tentative.
+         * In both cases, resume install must not be triggered.
+         */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  No resume required : TRAILER_HDR_VALID already stored in active slot!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /* Check candidate image version */
+        e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+      }
+    }
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+  else
+  {
+    /*
+     * Header in active slot is not valid.
+     * It is considered this can not be hack attempt, because header in active slot is in
+     * protected area.
+     * Possible reasons:
+     * - Swap has been interrupted during very first image installation (active slot was empty)
+     * - Swap has been interrupted during reconstitution of first sector of active slot
+     * If header test field in trailer is signed and with proper version, we resume install.
+     */
+
+    /* Read header valid field in trailer */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                     sizeof(fw_header_trailer_valid));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check header valid field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* active slot was containing an active image */
+
+        /* Populate pValidHeader parameter */
+        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /* Check candidate image version */
+          e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+        }
+      }
+      else
+      {
+        /* active slot was empty or was containing bricked Fw image */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+
+  return e_ret_status;
+}
+
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus e_ret_status_se;
+  SE_StatusTypeDef e_se_status;
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+
+  /*
+    * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
+    * to be able to handle a specific error cause.
+    */
+  /*  check swap header */
+  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, DwlSlot, &image_state);
+    if (e_ret_status_se == SE_SUCCESS)
+    {
+      /* Control the size of image to be installed taking into account trailers */
+      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET);
+
+      if ((image_state != FWIMG_STATE_NEW) || (trailer_begin < end_of_test_image))
+      {
+        /*
+          * These error causes are not memorized in the BootInfo area because there won't be any error handling
+          * procedure.
+          * If this function returns that no new firmware can be installed (as this may be a normal case).
+          */
+        e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        if (image_state != FWIMG_STATE_NEW)
+        {
+          TRACE("\r\n\t  The image state of SLOT_DWL_%d is not FWIMG_STATE_NEW!", DwlSlot);
+        }
+        if (trailer_begin < end_of_test_image)
+        {
+          TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  return e_ret_status;
+}
+
+#else
+
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *p_header_swap;
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+  int32_t ret;
+  /*
+     * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
+     * to be able to handle a specific error cause.
+     */
+
+  /*  check swap header */
+  e_ret_status = CheckAndGetFWHeader(SLOT_SWAP, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*  compare the header in dwl slot with the header in swap */
+    p_header_swap = (uint8_t *) pFwImageHeader;
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
+                                     sizeof(fw_header_dwl_slot));
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* image header in dwl slot not consistent with swap header */
+      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
+                           SFU_IMG_IMAGE_OFFSET);
+
+      /* the header in swap must be the same as the header in dwl slot */
+      ret = memcmp(fw_header_dwl_slot, p_header_swap, SE_FW_HEADER_TOT_LEN);
+
+      /* Check if there is enough room for the trailers */
+      if ((trailer_begin < end_of_test_image) || (ret != 0))
+      {
+        /*
+          * These error causes are not memorized in the BootInfo area because there won't be any error handling
+          * procedure.
+          * If this function returns that no new firmware can be installed (as this may be a normal case).
+          */
+        e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        if (trailer_begin < end_of_test_image)
+        {
+          TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+        } /* check next error cause */
+
+        if (ret != 0)
+        {
+          TRACE("\r\n\t  The headers in dwl slot and swap area do not match!");
+        } /* else do not print the message(s) again */
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+
+/**
+  * @brief Prepares the Candidate FW image for Installation.
+  *        This stage depends on the supported features: in this example this consists in decrypting the candidate
+  *        image.
+  * @note Even if the Firmware Image is in clear format the decrypt function is called.
+  *       But, in this case no decrypt is performed, it is only a set of copy operations
+  *       to organize the Firmware Image in FLASH as expected by the swap procedure.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus PrepareCandidateImageForInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+    * Control if there is no additional code beyond the firmware image (malicious SW)
+    */
+  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot),
+                            pFwImageHeader->PartialFwSize + (pFwImageHeader->PartialFwOffset %
+                                                             SLOT_SIZE(SLOT_SWAP)));
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_ADDITIONAL_CODE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * Pre-condition: all checks have been performed,
+    *                so all FWIMG module variables are populated.
+    * Now we can decrypt in FLASH.
+    *
+    * Initial FLASH state (focus on dwl slot and swap area):
+    *
+    * Depending on partial FW offset, we can have:
+    * <dwl slot>   : {Candidate Image Header + encrypted FW - page k}
+    *                {encrypted FW - page k+1}
+    *                .....
+    *                {encrypted FW - page k+N}
+    *                .....
+    * </dwl slot>
+    * or:
+    * <dwl slot>   : {Candidate Image Header }
+    *                {encrypted FW - page k}
+    *                .....
+    *                {encrypted FW - page k+N}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area>  : {Candidate Image Header}
+    * </Swap area>
+    */
+  e_ret_status =  DecryptImageInDwlSlot(DwlSlot, pFwImageHeader);
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page k}
+    * </Swap area>
+    *
+    * The Candidate FW image has been decrypted
+    * and a "hole" has been created in dwl slot to be able to swap.
+    */
+
+  e_ret_status = VerifyFwSignatureAfterDecrypt(&e_se_status, DwlSlot, pFwImageHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_SIGNATURE_ERR);
+  }
+
+  /* Return the result of this preparation */
+  return (e_ret_status);
+}
+
+
+/**
+  * @brief  Install the new version
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                         SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area> : {No Header (shift) + decrypted FW data from page k}
+    * </Swap area>
+    *
+    */
+
+  /* erase "swap area" size at the end of dwl slot */
+  e_ret_status = EraseSlotIndex(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1U));
+  if (e_ret_status !=  SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_ERASING_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    *                {at least the swap area size at the end of the last page of dwl slot is empty }
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
+    * </Swap area>
+    *
+    */
+
+
+  /*  write trailer  */
+  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_UPDATE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    *                {the last page of dwl slot ends with the trailer magic patterns and the free space for the trailer
+    *                 info}
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
+    * </Swap area>
+    *
+    * The trailer magic patterns is ActiveFwHeader|CandidateFwHeader|SWAPmagic.
+    * This is followed by a free space to store the trailer info (N*CPY_TO_ACTIVE_SLOT) and (N*CPY_TO_DWL_SLOT):
+    *
+    *<------------------------------------------ Last page of dwl slot --------------------------------------->
+    * |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH |N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t)
+    * | header 1     | header 2     |SWAP magic  |CLEAN pattern|N*CPY_TO_ACTIVE_SLOT   | N*CPY_TO_DWL_SLOT
+    *
+    */
+
+  /*  swap  */
+  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_SWAP_ERR);
+    return e_ret_status;
+  }
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /* Update fingerprint from previous FW image */
+  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Validate immediately the new active FW */
+  e_ret_status = SFU_IMG_Validation(ActiveSlot, pTestHeader);
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_HEADER_VALIDATION_ERR);
+    return e_ret_status;
+  }
+
+  /* clear swap pattern */
+  e_ret_status = CleanMagicValue(DwlSlot);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Memorize the error */
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_MAGIC_ERR);
+    return e_ret_status;
+  }
+
+  return e_ret_status;   /* Leave the function now */
+}
+
+/* Functions Definition : services ------------------------------------------- */
+/**
+  * @brief FW Image Handling (FWIMG) initialization function from swap process.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void)
+{
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+  uint32_t i;
+
+  /*
+   * Sanity check: let's make sure the slot sizes are correct
+   * to avoid discrepancies between linker definitions and constants in sfu_fwimg_regions.h
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP))))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d size (%d) must be a multiple of swap size (%d)\r\n",
+              SLOT_ACTIVE_1 + i, SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP));
+        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
+      }
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP))))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d size (%d) must be a multiple of swap size (%d)\r\n",
+              i + 1U, SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP));
+        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the slot size is correct with regards to the swap procedure constraints.
+   * The swap procedure cannot succeed if the trailer info size is bigger than what a chunk used for swapping can carry.
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (((int32_t)(SFU_IMG_CHUNK_SIZE - (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)))) < 0)
+      {
+        e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+        TRACE("\r\n= [FWIMG] %d bytes required for the swap metadata of SLOT_DWL_%d is too much\r\n",
+              (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)), i + 1U);
+      } /* else the swap settings are fine from a metadata size perspective */
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the swap size is correct with regards to the swap procedure constraints.
+   * The swap size must be a multiple of the chunks size used to do the swap.
+   */
+#if defined(__GNUC__)
+  __IO uint32_t swap_size = SLOT_SIZE(SLOT_SWAP), swap_chunk = SFU_IMG_CHUNK_SIZE;
+  if (0U != ((uint32_t)(swap_size % swap_chunk)))
+#else
+  if (0U != ((uint32_t)(SLOT_SIZE(SLOT_SWAP) % SFU_IMG_CHUNK_SIZE)))
+#endif /* __GNUC__ */
+  {
+    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the swap size (%d) is not a multiple\r\n",
+          SFU_IMG_CHUNK_SIZE, SLOT_SIZE(SLOT_SWAP));
+  } /* else the swap settings are fine from a chunk size perspective */
+
+  /*
+   * Sanity check: let's make sure the chunks used for the swap procedure are big enough with regards to the offset
+   * giving the start @ of the firmware
+   */
+  if (((int32_t)(SFU_IMG_CHUNK_SIZE - SFU_IMG_IMAGE_OFFSET)) < 0)
+  {
+    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the firmware start offset is %d bytes\r\n",
+          SFU_IMG_CHUNK_SIZE, SFU_IMG_IMAGE_OFFSET);
+  } /* else the swap settings are fine from a firmware start offset perspective */
+
+  /*
+   * Sanity check: let's make sure SWAP slot is properly aligned with regards to flash constraints
+   */
+
+  if (!IS_ALIGNED(SlotStartAdd[SLOT_SWAP]))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] swap (%x) is not properly aligned\r\n",
+          SlotStartAdd[SLOT_SWAP]);
+  } /* else swap is properly aligned */
+
+  /*
+   * Sanity check: let's make sure the swap area does not overlap SB code area protected by WRP)
+   */
+  if (((SlotStartAdd[SLOT_SWAP] - FLASH_BASE) / FLASH_PAGE_SIZE) <= SFU_PROTECT_WRP_PAGE_END_1)
+  {
+    TRACE("\r\n= [FWIMG] SWAP overlaps SBSFU code area protected by WRP\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap Swap area)
+   */
+  if (!(((SlotStartAdd[SLOT_SWAP]) > KMS_DATASTORAGE_END)
+        || ((SlotEndAdd[SLOT_SWAP]) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps Swap area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /* FWIMG core initialization completed */
+  return e_ret_status;
+}
+
+
+
+/**
+  * @brief Checks if there is a pending firmware installation.
+  *        3 situations can occur:
+  *        A. Pending firmware installation: a firmware is ready to be installed but the installation has never been
+  *           triggered so far.
+  *        B. Pending firmware installation resume: a firmware installation has been interrupted and a resume procedure
+  *           is required to finalize installation.
+  *        C. No firmware installation pending
+  * @note  The anti-rollback check is not taken into account at this stage.
+  *        But, if the firmware to be installed already carries some metadata (VALID tag) a newly downloaded firmware
+  *        should not have then the installation is not considered as pending.
+  * @note This function populates the FWIMG module variables:
+  *        - case SFU_IMG_FWUPDATE_STOPPED : fw_image_header_to_test & fw_image_header_validated
+  *        - case SFU_IMG_FWIMAGE_TO_INSTALL : fw_image_header_to_test
+  *        - case SFU_IMG_NO_FWUPDATE : none
+  * @param  pDwlSlotToInstall identification of the downloaded slot to install
+  * @param  pActiveSlotToResume identification of the active slot to resume
+  * @param  pActiveSlotToRollback identification of the active slot to rollback
+  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, pending resume install, no
+  *         pending action)
+  */
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback)
+{
+  uint32_t i;
+  uint32_t j;
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  SE_FwStateTypeDef master_slot_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /*
+   * The order of the checks is important:
+   *
+   * A. Check if a FW update has been interrupted first.
+   *    This check is based on the content of the trailer area and the validity of the update image.
+   *
+   * B. Check if a Firmware image is waiting to be installed.
+   */
+
+  /* Init values */
+  *pActiveSlotToResume = SLOT_INACTIVE;
+  *pActiveSlotToRollback = SLOT_INACTIVE;
+  *pDwlSlotToInstall = SLOT_INACTIVE;
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /*
+   * Read MASTER_SLOT state (if configured == (!= 255)) :
+   *   In case of VALID_ALL state, all other slots in SELF_TEST should be validated
+   *   Else all other slots in SELF_TEST are invalidated
+   */
+  if (MASTER_SLOT != 0xFFU)
+  {
+    if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
+    {
+      if (SE_SFU_IMG_GetActiveFwState(&e_se_status, MASTER_SLOT, &master_slot_state) != SE_SUCCESS)
+      {
+        master_slot_state = FWIMG_STATE_INVALID;
+      }
+    }
+  }
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Check image installation stopped or installation to be done
+     =========================================================== */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+      /* Rollback if seltftest not validated
+         =================================== */
+      if (SFU_SUCCESS == FirmwareToRollback(SLOT_ACTIVE_1 + i, master_slot_state))
+      {
+        /* The firmware state is either FWIMG_STATE_SELFTEST or FWIMG_STATE_INVALID
+         * Rollback is required
+         * Stop at first occurrence : next ones if any will be resumed after reset
+         */
+        *pActiveSlotToRollback = SLOT_ACTIVE_1 + i;
+        return SFU_IMG_FWIMAGE_ROLLBACK;
+      }
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+      /* Check trailer valid : installation stopped ?
+         ============================================= */
+      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+      {
+        /* Slot configured ? */
+        if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+        {
+          if (SFU_SUCCESS == FirmwareToResume(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
+                                               &fw_image_header_to_test))
+          {
+            /* A Firmware Update has been stopped
+             * fw_image_header_to_test & fw_image_header_validated have been populated
+             * Stop at first occurrence : next ones if any will be resumed after reset
+             */
+            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
+            *pDwlSlotToInstall = SLOT_DWL_1 + j;
+            return SFU_IMG_FWUPDATE_STOPPED;
+          }
+        }
+      }
+    }
+  }
+
+  /* Install new firmware if requested in the swap
+     ============================================= */
+  for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+    {
+      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + j, &fw_image_header_to_test))
+      {
+        /*
+         * A Firmware is available for installation:
+         * fw_image_header_to_test has been populated
+         * Stop at first occurrence : next ones if any will be installed after reset
+         */
+        *pDwlSlotToInstall = SLOT_DWL_1 + j;
+        return SFU_IMG_FWIMAGE_TO_INSTALL;
+      }
+    }
+  }
+
+  return SFU_IMG_NO_FWUPDATE;
+}
+
+/**
+  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
+  *        valid if the checks are successful.
+  *        The anti-rollback check is performed and errors are memorized in the bootinfo area, but no action is taken
+  *        in this procedure.
+  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
+  *        afterwards if the cryptographic scheme allows this (signature check for instance).
+  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
+  *        This function modifies the FLASH content.
+  *        If this procedure is interrupted during image preparation stage (e.g.: switch off) it cannot be resumed.
+  *        If it is interrupted during installation stage, it can be resumed.
+  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *        running the procedure): SFU_IMG_CheckPendingInstallation, SFU_IMG_CheckCandidateVersion should be called
+  *        first.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint32_t active_slot = 0U;
+
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /*
+   * The preparation stage consists in decrypting the candidate firmware image.
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
+   */
+  e_ret_status = PrepareCandidateImageForInstall(DwlSlot, &fw_image_header_to_test);
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    goto exit;
+  }
+
+  /*
+   * Populate fw_image_header_validated
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
+                                     sizeof(fw_image_header_validated));
+  }
+
+  /*
+   * Installing the new firmware image consists in swapping the 2 FW images.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
+  }
+
+exit:
+  /* Erase downloaded FW in case of authentication/integrity error
+     Erase downloaded FW also in case of installation issue to avoid any infinite loop */
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Installation procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Installation procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  /* return the installation result */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Resume installation of new valid firmware after installation failure.
+  *        If this procedure is interrupted before its completion (e.g.: switch off) it can be resumed.
+  *        This function is dedicated (only) to the resume of installation when a new firmware installation is stopped
+  *        before its completion.
+  *        This function does not handle explicitly the metadata tagging the firmware as valid: these metadata must
+  *        have been preserved during the installation procedure.
+  *        This function modifies the FLASH content.
+  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *        running the procedure): need to make sure an installation has been interrupted.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+   * resume swap process
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation()call.
+   */
+  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, &fw_image_header_to_test);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_SWAP_ERR);
+    goto exit;
+  }
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /* Update fingerprint from previous FW image */
+  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Validate immediately the new active FW */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_IMG_Validation(ActiveSlot, &fw_image_header_to_test);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_EXCPT_SetError(SFU_EXCPT_HEADER_VALIDATION_ERR);
+      goto exit;
+    }
+  }
+
+  /* clear swap pattern */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = CleanMagicValue(DwlSlot);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      /* Memorize the error */
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_MAGIC_ERR);
+      goto exit;
+    }
+  }
+
+exit:
+  /* Erase downloaded FW in case of installation issue to avoid any infinite loop */
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Resume procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Resume procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return e_ret_status;
+}
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/**
+  * @brief Executes a rollback to the original firmware if a firmware update fails
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t zero_buffer[32U] = {0U};
+  SE_FwRawHeaderTypeDef active_header;
+  SE_FwRawHeaderTypeDef dwl_header;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+
+  /* Verify slot 1 header is from fw that triggered the update */
+  /* Backed-up header is in flash Slot1 at pHdr address */
+  /* Load current header (start of Slot 0, normally behind the firewall) */
+  e_ret_status =  SFU_LL_FLASH_Read((uint8_t *)&active_header, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                    sizeof(dwl_header));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* if fingerprint is 0x00 we cannot do rollback */
+    if (0U == memcmp(active_header.PrevHeaderFingerprint, zero_buffer, sizeof(active_header.PrevHeaderFingerprint)))
+    {
+      e_ret_status = SFU_ERROR;
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR);
+      goto exit;
+    }
+  }
+
+  /* Get and check previous FW header saved in DWL slot
+     then compare header signature with active slot header finger print */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = CheckAndGetFWHeader(DwlSlot, &dwl_header);
+    if (SFU_SUCCESS == e_ret_status)
+    {
+      /* Fingerprint of active firmware should be the signature of previous firmware */
+      if (0 != memcmp(active_header.PrevHeaderFingerprint, dwl_header.HeaderSignature,
+                      sizeof(active_header.PrevHeaderFingerprint)))
+      {
+        e_ret_status = SFU_ERROR;
+        SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR);
+        goto exit;
+      }
+    }
+  }
+
+  /* Rollback execution */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = RollbackInstallation(ActiveSlot, DwlSlot, &dwl_header);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_ERR);
+      goto exit;
+    }
+  }
+
+exit:
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Rollback is complete, now erase downloaded image to prevent an attempt to
+     * reinstall
+     */
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+  else
+  {
+    /* Erase the header of active slot to avoid any infinite loop */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                           SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Rollback procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Rollback procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Updates the state of the current firmware
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SE_ErrorStatus e_ret_status_se;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+  SE_FwStateTypeDef e_next_image_state;
+
+  /* Read Image state : if image is new, set to self test
+   *
+   * An OTA image arrives on the device in the NEW state
+   * The bootloader switches the new image to SELFTEST state so
+   * that when the image boots it can detect that it should carry out the
+   * self test routine
+   */
+  e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
+  if (e_ret_status_se == SE_SUCCESS)
+  {
+    if (image_state == FWIMG_STATE_NEW)
+    {
+      e_next_image_state = FWIMG_STATE_SELFTEST;
+      e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+      if (e_ret_status_se == SE_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+      else
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  SLOT_ACTIVE_%d state = %d failed to switch in FWIMG_STATE_SELFTEST", SlotNumber,
+              image_state);
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+  return e_ret_status;
+}
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @brief  Get size of the trailer
+  * @note   This area mapped at the end of a dwl slot is not available for the firmware image
+  * @param  SlotNumber index of the slot in the list
+  * @retval Size of the trailer.
+  */
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber)
+{
+  return TRAILER_SIZE(SlotNumber);
+}
+
+/**
+  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
+  SFU_ErrorStatus e_ret_status_swap = SFU_ERROR;
+
+  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
+                                             SLOT_SIZE(DwlSlot));
+  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  e_ret_status_swap = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
+                                              SLOT_SIZE(SLOT_SWAP));
+  STATUS_FWIMG(e_ret_status_swap == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  return (((e_ret_status_swap != SFU_SUCCESS) || (e_ret_status_dwl != SFU_SUCCESS)) ?  SFU_ERROR : SFU_SUCCESS);
+}
+
+#endif /* !(SFU_NO_SWAP) */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c
new file mode 100644
index 00000000..9083965c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c
@@ -0,0 +1,747 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
+#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
+                               STM32 board specificities */
+#include "tkms.h"
+#include "sfu_interface_crypto_scheme.h"
+#include <string.h>
+#include "kms_platf_objects_interface.h"     /* To get keys handle definitions */
+
+/* Private defines -----------------------------------------------------------*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+#define GCM_TAGBITS_SIZE          128
+#define GCM_IVLEN_BITS            16
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+/* Private variables ---------------------------------------------------------*/
+CK_SESSION_HANDLE EncryptSession;
+CK_SESSION_HANDLE DecryptSession;
+CK_SESSION_HANDLE AuthenticateSession;
+CK_SESSION_HANDLE VerifySession;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static uint8_t *gcm_tag_header;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Get AES key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/**
+  * @brief  Get ECDSA key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
+
+
+/**
+  * @brief Secure Engine Decrypt Init function.
+  *        It is a wrapper of Decrypt_Init function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+  gcm_tag_header = pxSE_Metadata->FwTag;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_MECHANISM cktest_aes_cbc_mechanism =
+  {
+    CKM_AES_CBC,
+    iv_cbc,
+    SE_IV_LEN
+  };
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * In this crypto scheme the Firmware is not encrypted.
+   * The Decrypt operation is called anyhow before installing the firmware.
+   * Indeed, it allows moving the Firmware image blocks in FLASH.
+   * These moves are mandatory to create the appropriate mapping in FLASH
+   * allowing the swap procedure to run without using the swap area at each and every move.
+   *
+   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
+   */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the decryption session */
+  if (se_status == SE_SUCCESS)
+  {
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do as we won't decrypt anything */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Append function.
+  *        It is a wrapper of Decrypt_Append function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffe pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
+  if (0 == InputSize)
+  {
+    /* Nothing to do but we must return a success for the decrypt operation to continue */
+    return (SE_SUCCESS);
+  }
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  /* Buffer decryption */
+  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * The firmware is not encrypted.
+   * The only thing we need to do is to recopy the input buffer in the output buffer
+   */
+  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
+  *pOutputSize = InputSize;
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Finish function.
+  *        It is a wrapper of Decrypt_Finish function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  *peSE_Status = SE_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  memcpy(pOutputBuffer, gcm_tag_header, 16);
+
+  /* End-up decryption session */
+  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do */
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Close the session */
+  rv = C_CloseSession(DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Init function.
+  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  CK_MECHANISM cktest_sha_256_mechanism =
+  {
+    CKM_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize encryption session  */
+    rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest initialization */
+  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Append function.
+  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Buffer encryption */
+  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
+                       (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest calculation */
+  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Finish function.
+  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* End-up encryption session */
+  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* End-up Digest calculation */
+  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Close the session */
+  rv = C_CloseSession(AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Verify Raw Fw Header Tag.
+  *        It verifies the signature of a raw header file.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pFwRawHeader pointer to RawHeader Buffer.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  int32_t fw_raw_header_output_length = SE_TAG_LEN;
+  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
+  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    (CK_BYTE_PTR)gcm_header,
+    ((int32_t)SE_FW_AUTH_LEN),
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  const uint8_t *pPayload;                        /* Metadata payload */
+  int32_t payloadSize;                            /* Metadata length to be considered for hash */
+  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
+  CK_OBJECT_HANDLE hECDSAKey = 0UL;
+  CK_MECHANISM cktest_ecdsa_256_mechanism =
+  {
+    CKM_ECDSA_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointers allocation */
+  if (NULL == pxFwRawHeader)
+  {
+    *peSE_Status = SE_KO;
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  gcm_tag_header = pxFwRawHeader->HeaderSignature;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up decryption session  : control if the tag is correct */
+  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
+
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  pPayload = (const uint8_t *)pxFwRawHeader;
+  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up verification process : control if the signature is correct */
+  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Double Check to avoid basic fault injection */
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+
+    if (se_status == SE_SUCCESS)
+    {
+      /* End-up verification process : control if the signature is correct */
+      rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+      if (rv != CKR_OK)
+      {
+        se_status = SE_ERROR;
+        *peSE_Status = SE_KO;
+      }
+    }
+  }
+
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+  /* Close the session */
+  rv = C_CloseSession(VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_kms.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_kms.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_kms.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_kms.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_loader.c
new file mode 100644
index 00000000..30a80b45
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_loader.c
@@ -0,0 +1,785 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update LOADER module.
+  *          This file provides set of firmware functions to manage SFU local
+  *          loader functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include <stdlib.h>
+#include "main.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h" /* for metadata authentication */
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_services.h"      /* for version checking & to check if a valid FW is installed (the local
+                                        bootloader is a kind of "application" running in SB_SFU) */
+#include "app_sfu.h"
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef MINICOM_YMODEM
+/*
+ * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
+ * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
+ */
+/* With Minicom YMODEM each packet carries 128 bytes of data */
+static uint8_t alignedBuffer[SFU_COM_YMODEM_PACKET_SIZE] __attribute__((aligned(8)));
+#endif /* MINICOM_YMODEM */
+static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
+static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
+static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
+static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
+static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
+static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
+static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
+static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_Init(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  */
+
+  /*
+   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
+   * when doing a length alignment before writing in FLASH.
+   */
+#ifndef MINICOM_YMODEM
+  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_1K_SIZE bytes of payload */
+  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_1K_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints",
+          SFU_COM_YMODEM_PACKET_1K_SIZE);
+    return SFU_ERROR;
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+#else /* MINICOM_YMODEM */
+  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_SIZE bytes of payload */
+  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints", SFU_COM_YMODEM_PACKET_SIZE);
+    return SFU_ERROR;
+  }
+#endif /* MINICOM_YMODEM */
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  DeInitialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DeInit(void)
+{
+  /*
+   * ADD SRC CODE HERE
+   */
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Download a new User Fw.
+  *         Writes firmware received via Ymodem in FLASH.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  p_DwlSlot identification of the downloaded area
+  * @param  p_Size Size of the downloaded image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
+                                             uint32_t *pSize)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
+
+  /* Check the pointers allocation */
+  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Refresh Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Transfer FW Image via YMODEM protocol */
+  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
+
+  /* Initialize global variables to be used during the YMODEM process */
+  m_uDwlAreaAddress = 0U;
+  m_uDwlAreaStart = 0U;
+  m_uDwlAreaSize = 0U;
+  m_uFileSizeYmodem = 0U;
+  m_uNbrBlocksYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uDwlSlot = SLOT_DWL_1;
+  m_LoaderStatus = SFU_LOADER_ERR_COM;
+
+  /* Receive the FW in RAM and write it in the Flash*/
+  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
+  {
+    if (*pSize > 0U)
+    {
+      /* File download correct*/
+      m_LoaderStatus = SFU_LOADER_OK;
+    }
+  }
+  else
+  {
+    /* Nothing to do : m_LoaderStatus updated during during YModem process */
+  }
+
+  /* Provide slot information to the caller
+     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
+     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
+  *pDwlSlot = m_uDwlSlot;
+
+
+  *peSFU_LOADER_Status = m_LoaderStatus;
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+#if  !defined(SFU_NO_SWAP)
+  uint32_t uLength;
+#endif /* !SFU_NO_SWAP */
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet*/
+    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
+  if (m_uPacketsReceived == 1U)
+  {
+
+    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+#if   defined(SFU_NO_SWAP)
+
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+#else
+      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
+         Partial Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwSize +
+                      (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
+                      SFU_IMG_IMAGE_OFFSET;
+#endif /* (SFU_NO_SWAP) */
+    }
+
+    /* Clear Download application area (including TRAILERS area) */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+          SFU_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+  }
+
+#if  !defined(SFU_NO_SWAP)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* This packet : contains end of FW header */
+    if ((m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)) &&
+        ((m_uDwlAreaAddress + rx_size) >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE bytes length) */
+      uLength = SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE;
+      if (uLength == 0U)
+      {
+        uLength = SFU_COM_YMODEM_PACKET_1K_SIZE;
+      }
+      if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, uLength) == SFU_SUCCESS)
+      {
+        /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
+        m_uDwlAreaAddress += uLength + (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset %
+                                        SLOT_SIZE(SLOT_SWAP));
+
+        /* Update remaining packet size to write */
+        rx_size -= uLength;
+
+        /* Update p_data pointer to received packet data */
+        p_data += uLength;
+      }
+      else
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+#endif /* !SFU_NO_SWAP */
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL image size */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Set dimension to the appropriate length for FLASH programming.
+     * Example: 64-bit length for L4.
+     */
+    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
+    {
+      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+      uOldSize = rx_size;
+      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+      while (uOldSize < rx_size)
+      {
+        p_data[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL area */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Write Data in Flash */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, rx_size) == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress += (rx_size);
+    }
+    else
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#else /* MINICOM_YMODEM */
+/* Minicom variant of the YMODEM protocol: uses 128B packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
+    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_SIZE);
+    }
+  }
+
+
+  /*
+   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
+   */
+
+  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
+     not encrypted  */
+  if (1 == m_uPacketsReceived)
+  {
+    /* First packet: beginning of header */
+    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
+    {
+      /* Copy the beginning of the header */
+      memcpy(fw_header, p_data, rx_size);
+      rx_size = 0U; /* nothing more to do */
+    }
+    else
+    {
+      /* Unexpected case */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else if (2U == m_uPacketsReceived)
+  {
+    /* Second packet: end of header (64 bytes) */
+    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
+    rx_size -= 64U;
+    p_data += 64U;
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
+         Partial Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwSize +
+                      (((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
+                      SFU_IMG_IMAGE_OFFSET;
+
+      /* Clear Download application area (including TRAILERS area) */
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+              SFU_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
+            == SFU_SUCCESS)
+        {
+          /* Shift the DWL area pointer (still to be aligned image with (PartialFwOffset % sector size) in DWL area ) */
+          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+      /* The remaining 64 bytes of data must be handled : standard processing */
+    }
+  }
+  /*
+   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
+   */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * End of the second packet (64B) or full 128B packet
+     * Skip padding bytes then take partial FW offset into account
+     */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      /* Skip the padding bytes */
+      m_uDwlAreaAddress += rx_size;
+      rx_size = 0U;
+    }
+    else
+    {
+      /*
+       * m_uDwlAreaAddress >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)
+       */
+      if (((SFU_IMG_IMAGE_OFFSET / SFU_COM_YMODEM_PACKET_SIZE) + 1) == m_uPacketsReceived)
+      {
+        /* End of padding bytes : We must take the partial offset into account */
+        m_uDwlAreaAddress += ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+      }
+      /* else nothing more to do */
+
+      /* Check size to avoid writing beyond DWL image size */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /*
+       * Set dimension to the appropriate length for FLASH programming.
+       * Example: 64-bit length for L4.
+       */
+      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        /*
+         * By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         * sizeof(SFU_IMG_write_t) to avoid reading out of the buffer
+         */
+        uOldSize = rx_size;
+        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                             (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+        while (uOldSize < rx_size)
+        {
+          p_data[uOldSize] = 0xFF;
+          uOldSize++;
+        }
+      }
+
+      /* Check size to avoid writing beyond DWL area */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Write Data in Flash */
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /*
+         * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
+         * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
+         */
+        memcpy(alignedBuffer, p_data, rx_size);
+
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, alignedBuffer, rx_size) == SFU_SUCCESS)
+        {
+          m_uDwlAreaAddress += (rx_size);
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+
+
+/**
+  * @brief  Verifies the Raw Fw Header received. It checks if the header is
+  *         authentic and if the fields are ok with the device (e.g. size and version).
+  * @note   Please note that when the new image is installed, this metadata is checked
+  *         by @ref SFU_IMG_CheckCandidateVersion.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  pBuffer: pointer to header Buffer.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef              e_se_status;
+  SE_FwRawHeaderTypeDef         *p_x_fw_raw_header;
+  SFU_FwImageFlashTypeDef       fw_image_flash_data;
+  uint16_t                      cur_ver;
+  uint16_t                      verif_ver;
+  uint32_t                      active_slot;
+
+  /*Parse the received buffer*/
+  p_x_fw_raw_header = (SE_FwRawHeaderTypeDef *)(uint32_t)pBuffer;
+  /*Check if the received header packet is authentic*/
+  if (SE_VerifyHeaderSignature(&e_se_status, p_x_fw_raw_header) != SE_ERROR)
+  {
+    active_slot = SFU_IMG_GetFwImageSlot(p_x_fw_raw_header);
+    /*
+     * 2 slots per image configuration. Identify the download area.
+     *   It will be based on SFU magic :
+     *   - same number as active_slot if configured.
+     *   - else : SLOT_DWL_1
+     *    As example : Header magic is SFU2, active slot is SLOT_ACTIVE_2 and dwl slot will be SLOT_DWL2.
+     */
+    m_uDwlSlot = active_slot - SLOT_ACTIVE_1 + SLOT_DWL_1;
+    if (SLOT_SIZE(m_uDwlSlot) == 1U)
+    {
+      m_uDwlSlot = SLOT_DWL_1;
+    }
+    SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
+
+    /* Assign the download flash address to be used during the YMODEM process */
+    m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
+    m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
+
+    /*
+     * Check if the version is allowed
+     * ==> SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+     */
+    cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+#if  defined(SFU_NO_SWAP)
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+#else
+      /*
+       * Check length :
+       *      We do not check the length versus the trailer constraint because this check is already implemented in
+       *      FirmwareToInstall().
+       *      If the firmware is too big to have some room left for the trailer info then the installation will not be
+       *      triggered.
+       *      The interest is to avoid duplicating the checks (checking just in time).
+       *      This is also because in the case of a download handled by the UserApp we cannot rely on the checks done
+       *      by the UserApp before installing a FW.
+       *      The drawback is that the firmware can be downloaded in dwl slot though it is too big.
+       *
+       *      Nevertheless, we can still detect if the FW is too big to be downloaded (cannot be written in dwl slot).
+       *      This will avoid download issues (but the installation itself can still be rejected) or overflows.
+       *      The dwl slot must contain the HEADER and also the binary FW (encrypted).
+       *      But there is an offset of FW_OFFSET_IMAGE bytes to respect.
+       */
+      if ((p_x_fw_raw_header->PartialFwSize + (p_x_fw_raw_header->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) >
+          (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+#endif /* SFU_NO_SWAP */
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, cur_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+
+
+    /*
+     * Control of version and length is done twice to avoid basic hardware attack
+     * This more important for the 1 image configuration as the installation is done during the download procedure
+     * For the 2 images configuration anti-rollback will be checked again during installation process
+     */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, verif_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+#if  defined(SFU_NO_SWAP)
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+#else
+      /*
+       * Check length :
+       *      We do not check the length versus the trailer constraint because this check is already implemented in
+       *      FirmwareToInstall().
+       *      If the firmware is too big to have some room left for the trailer info then the installation will not be
+       *      triggered.
+       *      The interest is to avoid duplicating the checks (checking just in time).
+       *      This is also because in the case of a download handled by the UserApp we cannot rely on the checks done
+       *      by the UserApp before installing a FW.
+       *      The drawback is that the firmware can be downloaded in dwl slot though it is too big.
+       *
+       *      Nevertheless, we can still detect if the FW is too big to be downloaded (cannot be written in dwl slot).
+       *      This will avoid download issues (but the installation itself can still be rejected) or overflows.
+       *      The dwl slot must contain the HEADER and also the binary FW (encrypted).
+       *      But there is an offset of FW_OFFSET_IMAGE bytes to respect.
+       */
+      if ((p_x_fw_raw_header->PartialFwSize + (p_x_fw_raw_header->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) >
+          (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+#endif /* SFU_NO_SWAP */
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, verif_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+  }
+  else
+  {
+    /* Header authentication failure */
+    m_LoaderStatus = SFU_LOADER_ERR_AUTH_FAILED;
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_loader.h
new file mode 100644
index 00000000..7467d978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_loader.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update local
+  *          loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOADER_H
+#define SFU_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Local loader status Type Definition
+  */
+typedef enum
+{
+  SFU_LOADER_OK                            = 0x00U,
+  SFU_LOADER_ERR_COM                       = 0x01U,
+  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
+  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
+  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
+  SFU_LOADER_ERR_FLASH                     = 0x05U,
+  SFU_LOADER_ERR_CRYPTO                    = 0x06U
+} SFU_LOADER_StatusTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LOADER_Init(void);
+SFU_ErrorStatus SFU_LOADER_DeInit(void);
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
+                                             uint32_t *p_Size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_new_image.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_new_image.c
new file mode 100644
index 00000000..8588f3a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_new_image.c
@@ -0,0 +1,98 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar file integrated in the user
+  *          application.
+  * @note    This file is compiled in the scope of SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_new_image.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_regions.h"
+#include "se_def_metadata.h"
+#include <string.h> /* needed for memset (see WriteInstallHeader)*/
+
+#if  !defined(SFU_NO_SWAP)
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Write the header of the firmware to install
+  * @param  pfw_header pointer to header to write.
+  * @retval SFU_SUCCESS on success otherwise SFU_ERROR
+  */
+static SFU_ErrorStatus WriteInstallHeader(uint8_t *pfw_header)
+{
+  SFU_ErrorStatus ret = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  ret = SFU_LL_FLASH_Erase_Size(&flash_if_info, (uint8_t *) SlotStartAdd[SLOT_SWAP], SFU_IMG_IMAGE_OFFSET);
+  if (ret == SFU_SUCCESS)
+  {
+    ret = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *)SlotStartAdd[SLOT_SWAP], pfw_header, SE_FW_HEADER_TOT_LEN);
+  }
+  return ret;
+}
+#endif /* !SFU_NO_SWAP*/
+
+/**
+  * @brief  Write in Flash the next header image to install.
+  *         This function is used by the local loader to request a Firmware installation (at next reboot).
+  * @param  fw_header FW header of the FW to be installed
+  * @retval SFU_SUCCESS if successful, otherwise SFU_ERROR
+  */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header)
+{
+#if  !defined(SFU_NO_SWAP)
+  if (fw_header == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if (WriteInstallHeader(fw_header) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+#else
+  return SFU_SUCCESS;           /* Nothing to do */
+#endif /* !SFU_NO_SWAP*/
+}
+
+/**
+  * @brief  Provide the area descriptor to write a FW image in Flash.
+  *         This function is used by the local loader to know where to store a new Firmware Image before asking for its
+  *         installation.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pArea pointer to area descriptor
+  * @retval none
+  */
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea)
+{
+  pArea->DownloadAddr = SlotStartAdd[DwlSlot];
+#if  !defined(SFU_NO_SWAP)
+  pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(DwlSlot) - SFU_IMG_GetTrailerSize(DwlSlot);
+#else
+  pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(DwlSlot);
+#endif /* !(SFU_NO_SWAP) */
+  pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_new_image.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_new_image.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_new_image.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_new_image.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_test.c
new file mode 100644
index 00000000..948269d2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_test.c
@@ -0,0 +1,336 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_test.h"
+#include "main.h"
+#include "sfu_trace.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "string.h" /* required for strncmp */
+
+#if defined(SFU_TEST_PROTECTION)
+
+extern RTC_HandleTypeDef RtcHandle;
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Automatic tests : list of tests (Address, Message, Operation */
+/* Flash programming by 64 bits */
+#define SHIFT_FLASH_WRITE (8U-1U)
+
+/* Private variables ---------------------------------------------------------*/
+static ProtectionTest_t aProtectTests[] =
+{
+#ifdef SFU_MPU_PROTECT_ENABLE
+  {SFU_RAM_BASE, "MPU SRAM1 start add", TEST_EXECUTE},
+  {SFU_RAM_END - 3U, "MPU SRAM1 end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
+  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
+  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
+  /* READ_FLASH is possible as we are privileged when there is no MPU isolation but WRITE_FLASH must fail */
+  {INTVECT_START, "Init. Vector", TEST_WRITE_FLASH},
+  {SLOT_DWL_1_START, "MPU code dwl slot1 begin add", TEST_EXECUTE},
+  {SLOT_DWL_1_END - 3U, "MPU code dwl slot1 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SLOT_DWL_2_START, "MPU code dwl slot2 begin add", TEST_EXECUTE},
+  {SLOT_DWL_2_END - 3U, "MPU code dwl slot2 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SLOT_DWL_3_START, "MPU code dwl slot3 begin add", TEST_EXECUTE},
+  {SLOT_DWL_3_END - 3U, "MPU code dwl slot3 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SWAP_START, "MPU code swap begin add", TEST_EXECUTE},
+  {SWAP_END - 3U, "MPU code swap end add", TEST_EXECUTE},       /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_WRP_PROTECT_ENABLE
+  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
+  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
+  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
+#endif /* SFU_WRP_PROTECT_ENABLE */
+#ifdef SFU_PCROP_PROTECT_ENABLE
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
+  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
+                                                                                         writing test */
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
+  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+#if defined(TEST_ISOLATION)
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
+  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
+                                                                         64bits writing test + WRP protection applies */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
+  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
+  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
+                                                                    that initializes all the variables in the binary. */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
+  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+#endif /* TEST_ISOLATION  */
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Testing the MPU protection of the OBs */
+  /*
+   * WL55JC
+   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
+   * 0x1FFF 7818 Reserved Write protection 1A
+   * 0x1FFF 7820 Reserved Write protection 1B
+   */
+  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFF7800", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFF7818", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFF7820", TEST_WRITE_FLASH},
+#endif /* SFU_MPU_PROTECT_ENABLE  */
+  {0xAAAAAAAA, "Execution successful", TEST_END},
+};
+
+
+/* Automatic test : list of operation */
+uint8_t aTestOperation[][20] =
+{
+  "write 8 bytes",
+  "read 1 byte",
+  "erase 512 bytes",
+  "write 4 bytes",
+  "read 1 byte",
+  "execute",
+  "end"
+};
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_TEST_Protection(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
+  * @param  None.
+  * @retval None.
+  */
+static void SFU_TEST_Protection(void)
+{
+  uint32_t test_idx;
+  uint32_t flashErrCode = 0;
+  uint64_t pattern = 0U;
+  uint32_t page_error = 0U;
+  FLASH_EraseInitTypeDef p_erase_init;
+  TestStatus status = TEST_IN_PROGRESS;
+  __IO uint8_t tmp;
+  void (*func)(void);
+
+  /*
+    * Now checking the security
+    * We will try to access protected @ and run protected code.
+    * Each time a a flash error will be raised or a reset will be generated by IP protection.
+    * At next boot we read the backup register to check the next @ until all addresses have been verified.
+    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
+    * FWALL/Code Isolation
+    */
+
+  do
+  {
+    /* slow down execution */
+    HAL_Delay(100);
+
+    /* Increment test number for next execution */
+    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
+    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
+           aProtectTests[test_idx].address);
+
+    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
+    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
+        && (aProtectTests[test_idx].address > 0x00000FFFU))
+    {
+      switch (aProtectTests[test_idx].type)
+      {
+        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_FLASH :
+          HAL_FLASH_Unlock();
+          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
+          HAL_FLASH_Lock();
+          flashErrCode = HAL_FLASH_GetError();
+          printf("\r\nflash error code: %x", flashErrCode);
+          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+
+          /*
+           * OBs protection test: MPU generates a MEMORY FAULT and a RESET
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("OBs @", (const char *)aProtectTests[test_idx].msg, 5))
+          {
+            status = TEST_ERROR;
+          }
+          /* else not an OB protection test so probably not an error */
+          break;
+
+        /* Trying to read in FLASH : RDP set in case of PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_READ_FLASH :
+          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
+          HAL_Delay(1);                                                 /* ensure Flag is set */
+          /*
+           * When Isolation activated : RESET should be generated
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
+          {
+            status = TEST_ERROR;
+          }
+
+          break;
+
+        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_ERASE_FLASH :
+          HAL_FLASH_Unlock();
+          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
+          p_erase_init.NbPages     = 1;
+          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
+          HAL_FLASH_Lock();
+          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+          break;
+
+        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_RAM :
+          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
+          status = TEST_ERROR;
+          break;
+
+        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_READ_RAM :
+          tmp = *(uint8_t *)aProtectTests[test_idx].address;
+          printf(" value : %d ", tmp);
+          status = TEST_ERROR;
+          break;
+
+          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
+        case TEST_EXECUTE :
+          func = (void(*)(void))(aProtectTests[test_idx].address);
+          func();
+          status = TEST_ERROR;
+          break;
+
+        /* End of execution */
+        case TEST_END :
+          status = TEST_COMPLETED;
+          break;
+
+        default :
+          break;
+      }
+    }
+  } while (status == TEST_IN_PROGRESS) ;
+
+  if (status == TEST_ERROR)
+  {
+    SFU_TEST_Error();
+  }
+  else if (status == TEST_COMPLETED)
+  {
+    /* reset for next run (need a RESET of the platform to restart a session) */
+    printf("\b\b\b\b\b\b\b\b");
+    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
+  }
+}
+
+/**
+  * @brief  Initialization of backup register and start test
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Init(void)
+{
+  /* Use register DR0 to know which if the test sequence is in progress or done */
+  /* Use register DR1 to know which test to run after a reset */
+
+  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
+  {
+    return;
+  }
+  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
+                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
+                                                                  reset test index (DR1) */
+  {
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+  }
+
+  /* Start test */
+  SFU_TEST_Protection();
+}
+
+/**
+  * @brief  Reset backup register to be able to execute a new test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Reset(void)
+{
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+}
+
+/**
+  * @brief  Error detected during test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Error(void)
+{
+  printf(" ===> KO!!!!!");
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
+}
+
+#endif /* SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_test.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_test.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_trace.h
new file mode 100644
index 00000000..cf6d3387
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/App/sfu_trace.h
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SFU_TRACE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TRACE_H
+#define SFU_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_com_trace.h"
+#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+/* External variables --------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid
+                                                                        faults. printf is not rieentrant */
+#define TRACE   (void) printf
+#else
+#define TRACE(...)
+#define TRACE_IRQ(pbuffer)
+#endif /* SFU_DEBUG_MODE */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level.c
new file mode 100644
index 00000000..e637a536
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level.c
@@ -0,0 +1,530 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.c
+  * @author  MCD Application Team
+  * @brief   SFU Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+extern RTC_HandleTypeDef RtcHandle;
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+/* Private variables ---------------------------------------------------------*/
+static UART_HandleTypeDef   UartHandle;
+static CRC_HandleTypeDef    CrcHandle;
+
+/* Private function prototypes -----------------------------------------------*/
+static void     SFU_LL_Error_Handler(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Initialize CRC */
+  e_ret_status = SFU_LL_CRC_Init();
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF CRC Init.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure the peripheral clock */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+
+  /* Configure CRC with default polynomial - standard configuration */
+  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU  IF CRC Configuration.
+  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
+  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Check the parameters */
+  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
+
+  /* Switch to the selected configuration */
+  CrcHandle.Instance = CRC;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  switch (eCRCConfg)
+  {
+    case SFU_CRC_CONFIG_DEFAULT:
+      /* The Default polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+      /* The default init value is used */
+      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+      /* The input data are 32-bit long words */
+      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    case SFU_CRC_CONFIG_16BIT:
+      /* The CRC-16-CCIT polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+      /* The zero init value is used */
+      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+      CrcHandle.Init.InitValue               = 0U;
+      /* The input data are 8-bit long */
+      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    default:
+      /* Invalid parameter */
+      e_ret_status = SFU_ERROR;
+      break;
+  }
+
+  /* Proceed to CRC Init (Correct Parameters) */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  SFU IF CRC Calculate.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  BufferLength: buffer length in bytes.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
+}
+
+/**
+  * @brief SFU UART Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = SFU_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+  if (HAL_UART_Init(&UartHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief SFU IF UART DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  SFU IF Write data (send).
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  DataLength: pointer to the 128bit data to write.
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  Timeout: Timeout duration.
+  * @retval status of the write operation
+  *         SFU_ERROR : if the write operation is not performed
+  *         SFU_SUCCESS : if the write operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF Read data (receive).
+  * @param  pData: pointer to the 128bit data where to store the received data.
+  * @param  DataLength: the length of the data to be read in bytes.
+  * @param Timeout: Timeout duration.
+  * @retval status of the read operation
+  *         SFU_ERROR : if the read operation is not performed
+  *         SFU_SUCCESS : if the read operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU HAL IF Flush.
+  * @param  None.
+  * @retval status of the operation.
+  */
+SFU_ErrorStatus SFU_LL_UART_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+
+  return SFU_SUCCESS;
+}
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief SFU IF RTC Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief SFU IF RTC DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+/**
+  * @brief SFU IF RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer.
+  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  *        the RTC clock source; in this case the Backup domain will be reset in
+  *        order to modify the RTC Clock source, as consequence RTC registers (including
+  *        the backup registers) and RCC_BDCR register are set to their reset values.
+  * @retval None
+  */
+void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  RCC_OscInitTypeDef        RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+  UNUSED(hrtc);
+  /*-1- Enables access to the backup domain */
+  /* To enable access on RTC registers */
+
+  HAL_PWR_EnableBkUpAccess();
+
+  /*-2- Configure LSE/LSI as RTC clock source */
+#ifdef RTC_CLOCK_SOURCE_LSE
+
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#elif defined (RTC_CLOCK_SOURCE_LSI)
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
+  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#else
+#error Please select the RTC Clock source inside the main.h file
+#endif /*RTC_CLOCK_SOURCE_LSE*/
+
+  /*-3- Enable RTC peripheral Clocks */
+  /* Enable RTC Clock */
+  __HAL_RCC_RTC_ENABLE();
+
+  /* Enable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_ENABLE();
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  /*-4- Configure the NVIC for RTC Tamper */
+  HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_SSRU_IRQn, 0x0FU, 0U);
+  HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+
+  __HAL_RCC_RTC_DISABLE();
+
+  /* Disable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_DISABLE();
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in SFU application.
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral Clock Enable */
+    SFU_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    SFU_UART_TX_GPIO_CLK_ENABLE();
+    SFU_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : SFU_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
+    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : SFU_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
+    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral clock disable */
+    SFU_UART_CLK_DISABLE();
+
+    /* GPIO DeInit*/
+    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
+    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
+
+  }
+
+
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @param  None
+  * @retval None
+  */
+static void SFU_LL_Error_Handler(void)
+{
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  while (1 == 1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level.h
new file mode 100644
index 00000000..3532844d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level.h
@@ -0,0 +1,130 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef  SFU_LOW_LEVEL_H
+#define  SFU_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU CRC Configuration definition
+  */
+typedef enum
+{
+  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
+  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
+  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
+} SFU_CRC_ConfigTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Uncomment to enable the adequate Clock Source */
+#define RTC_CLOCK_SOURCE_LSI
+/*#define RTC_CLOCK_SOURCE_LSE*/
+
+#ifdef RTC_CLOCK_SOURCE_LSI
+#define RTC_ASYNCH_PREDIV    0x1FU
+#define RTC_SYNCH_PREDIV     0x3FF
+#endif /* RTC_CLOCK_SOURCE_LSI */
+
+#ifdef RTC_CLOCK_SOURCE_LSE
+#define RTC_ASYNCH_PREDIV  0x7FU
+#define RTC_SYNCH_PREDIV   0x00FFU
+#endif /* RTC_CLOCK_SOURCE_LSE */
+
+/* External variables --------------------------------------------------------*/
+extern __IO uint32_t  DummyMemAccess;
+#if defined(SFU_LOW_LEVEL_C)
+#if defined(IT_MANAGEMENT)
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+__IO uint32_t DummyMemAccess;
+#endif /* defined(IT_MANAGEMENT) */
+#endif /* defined(SFU_LOW_LEVEL_C) */
+
+
+/* Exported macros -----------------------------------------------------------*/
+#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
+                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
+                               ((CONF) == SFU_CRC_CONFIG_16BIT))
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+#define SFU_LL_DummyAccess() \
+  do{ \
+  }while(0)
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus    SFU_LL_Init(void);
+SFU_ErrorStatus    SFU_LL_DeInit(void);
+
+SFU_ErrorStatus    SFU_LL_CRC_Init(void);
+SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
+uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
+
+SFU_ErrorStatus    SFU_LL_UART_Init(void);
+SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
+SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Flush(void);
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus SFU_LL_RTC_Init(void);
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
+void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  SFU_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash.c
new file mode 100644
index 00000000..4cea3348
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash.c
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_fwimg_regions.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  e_ret_status = SFU_LL_FLASH_INT_Init();
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                   const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pFlash < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+}
+
+/**
+  * @brief  This function configure the flash to be able to execute code
+  * @param  Addr: flash address
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
+{
+  /*
+   * Internal flash : nothing to do
+   * External flash : configure memory mapped mode
+   */
+
+  /* Check Flash address */
+  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
+  }
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
+{
+  /* Check Flash address */
+  if (Addr < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_GetPage(Addr);
+  }
+  else
+  {
+    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
+  }
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash.h
new file mode 100644
index 00000000..726365d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_H
+#define SFU_LOW_LEVEL_FLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
+  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
+  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
+  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
+  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
+  SFU_FLASH_SUCCESS           /*!< Flash Success */
+} SFU_FLASH_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define INVALID_SECTOR 0xFFFFFFFFU
+#define INVALID_PAGE   0xFFFFFFFFU
+#define INVALID_BANK   0xFFFFFFFFU
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                   const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
+
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c
new file mode 100644
index 00000000..7b10b14d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU external
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_low_level_security.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+/* No external flash available on this product
+   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
+       systematically during startup phase */
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pStart);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  UNUSED(pFlash);
+  UNUSED(Pattern1);
+  UNUSED(Pattern2);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
+{
+  UNUSED(SlotNumber);
+  return SFU_SUCCESS;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h
new file mode 100644
index 00000000..08566d80
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for external flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
+#define SFU_LOW_LEVEL_FLASH_EXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+#define EXTERNAL_FLASH_ADDRESS  0x90000000U
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c
new file mode 100644
index 00000000..1e8db303
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c
@@ -0,0 +1,474 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU internal
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "string.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+
+/* Private variables ---------------------------------------------------------*/
+static __IO uint32_t DoubleECC_Error_Counter = 0U;
+
+
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t first_page;
+  uint32_t nb_pages;
+  uint32_t chunk_nb_pages;
+  uint32_t length = Length;
+
+  /* Check the pointers allocation */
+  if (pFlashStatus == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  *pFlashStatus = SFU_FLASH_SUCCESS;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = SFU_LL_FLASH_INT_GetPage(start);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
+      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        p_erase_init.Page = first_page;
+        p_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_ERASE;
+        }
+        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
+      } while (nb_pages > 0U);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      if (HAL_FLASH_Lock() != HAL_OK)
+      {
+        e_ret_status = SFU_ERROR;
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+      }
+    }
+    else
+    {
+      *pFlashStatus = SFU_FLASH_ERR_HAL;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Check the pointers allocation */
+  if ((pFlashStatus == NULL) || (pSource == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     writing operation should be executed inside secure environment */
+  if ((inside_header == 1U) && (Length != 0U))
+  {
+    /* SE Access */
+    SE_StatusTypeDef se_status;
+    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
+    if (se_ret_status == SE_SUCCESS)
+    {
+      e_ret_status = SFU_SUCCESS;
+      *pFlashStatus = SFU_FLASH_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+      *pFlashStatus = SFU_FLASH_ERROR;
+    }
+  }
+  /* Writing operation executed by SBSFU */
+  else
+  {
+    *pFlashStatus = SFU_FLASH_ERROR;
+
+    /* Clear error flags raised during previous operation */
+    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Unlock the Flash to enable the flash control register access *************/
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+
+      }
+      else
+      {
+        /* DataLength must be a multiple of 64 bit */
+        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
+        {
+          *pFlashStatus = SFU_FLASH_ERROR;
+
+          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+          be done by word */
+          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
+              == HAL_OK)
+          {
+            /* Check the written value */
+            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
+            {
+              /* Flash content doesn't match SRAM content */
+              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
+              e_ret_status = SFU_ERROR;
+            }
+            else
+            {
+              /* Increment FLASH Destination address */
+              destination = destination + sizeof(SFU_LL_FLASH_write_t);
+              e_ret_status = SFU_SUCCESS;
+              *pFlashStatus = SFU_FLASH_SUCCESS;
+            }
+          }
+          else
+          {
+            /* Error occurred while writing data in Flash memory */
+            *pFlashStatus = SFU_FLASH_ERR_WRITING;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+        /* Lock the Flash to disable the flash control register access (recommended
+        to protect the FLASH memory against possible unwanted operation) */
+        if (HAL_FLASH_Lock() != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_HAL;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus se_ret_status;
+  SE_StatusTypeDef se_status;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     reading operation should be executed inside secure environment */
+  if (inside_header == 1U)
+  {
+    /* SE Access */
+    DoubleECC_Error_Counter = 0U;
+    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
+    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  /* Reading operation executed by SBSFU */
+  else
+  {
+    DoubleECC_Error_Counter = 0U;
+    /* Do not use memcpy from lib : ECC error should be checked at each loop */
+    for (i = 0; (i < Length) && (DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+    {
+      *pDestination = *pSource;
+    }
+    if (DoubleECC_Error_Counter == 0U)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  uint32_t flash = (uint32_t) pFlash;
+  uint32_t i;
+
+  /* Comparison executed by SBSFU ==> flash area could not be located inside secured environment */
+  for ( i = 0U; i < Length; i += 4U)
+  {
+    if ((*(uint32_t *)(flash + i) != Pattern1) &&  (*(uint32_t *)(flash + i) != Pattern2))
+    {
+      return SFU_ERROR;
+    }
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+
+
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retvat void
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    while (1 == 1)
+    {
+      SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_UNKNOWN);
+    }
+  }
+}
+
+
+/**
+  * @brief  HardFault Handler
+  * @param  None.
+  * @retval None.
+  */
+void HardFault_Handler(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h
new file mode 100644
index 00000000..5ef51fc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for internal flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_INT_H
+#define SFU_LOW_LEVEL_FLASH_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash Write Access Constraints (size and alignment)
+  *
+  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
+  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
+  *
+  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
+  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
+  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
+  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_FirmwareToResume).
+  */
+
+/* double-word is the default setting for most platforms */
+typedef uint64_t SFU_LL_FLASH_write_t;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Length of a MAGIC tag (32 bytes).
+  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
+  */
+#define MAGIC_LENGTH ((uint32_t)32U)
+
+/* External variables --------------------------------------------------------*/
+#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
+void NMI_Handler(void);
+void HardFault_Handler(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_security.c
new file mode 100644
index 00000000..9cffd48d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_security.c
@@ -0,0 +1,1102 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SFU Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "stm32wlxx_it.h"
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#if     !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_RDP_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_RDP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+#ifndef  SFU_TAMPER_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+/* #warning "SFU_TAMPER_PROTECT_DISABLED" */
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+#if   !defined(SECBOOT_DISABLE_SECURITY_IPS)
+/* #warning "SFU_IWDG_PROTECT_DISABLED" */
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+
+  {
+    {
+      MPU_REGION_NUMBER0, SFU_PROTECT_MPU_AREA_USER_START,     SFU_PROTECT_MPU_AREA_USER_SIZE,
+      SFU_PROTECT_MPU_AREA_USER_PERM,     SFU_PROTECT_MPU_AREA_USER_EXEC,     SFU_PROTECT_MPU_AREA_USER_SREG
+    },
+{
+  MPU_REGION_NUMBER1, SFU_PROTECT_MPU_AREA_SFUEN_START_0,  SFU_PROTECT_MPU_AREA_SFUEN_SIZE_0,
+  SFU_PROTECT_MPU_AREA_SFUEN_PERM,    SFU_PROTECT_MPU_AREA_SFUEN_EXEC,    SFU_PROTECT_MPU_AREA_SFUEN_SREG_0
+},
+{
+  MPU_REGION_NUMBER2, SFU_PROTECT_MPU_AREA_SFUEN_START_1,  SFU_PROTECT_MPU_AREA_SFUEN_SIZE_1,
+  SFU_PROTECT_MPU_AREA_SFUEN_PERM,    SFU_PROTECT_MPU_AREA_SFUEN_EXEC,    SFU_PROTECT_MPU_AREA_SFUEN_SREG_1
+},
+{
+  MPU_REGION_NUMBER3, SFU_PROTECT_MPU_AREA_VECT_START,     SFU_PROTECT_MPU_AREA_VECT_SIZE,
+  SFU_PROTECT_MPU_AREA_VECT_PERM,     SFU_PROTECT_MPU_AREA_VECT_EXEC,     SFU_PROTECT_MPU_AREA_VECT_SREG
+},
+{
+  MPU_REGION_NUMBER4, SFU_PROTECT_MPU_AREA_OB_BANK1_START, SFU_PROTECT_MPU_AREA_OB_BANK1_SIZE,
+  SFU_PROTECT_MPU_AREA_OB_BANK1_PERM, SFU_PROTECT_MPU_AREA_OB_BANK1_EXEC, SFU_PROTECT_MPU_AREA_OB_BANK1_SREG
+},
+{
+  MPU_REGION_NUMBER5, SFU_PROTECT_MPU_AREA_PERIPH_START,   SFU_PROTECT_MPU_AREA_PERIPH_SIZE,
+  SFU_PROTECT_MPU_AREA_PERIPH_PERM,   SFU_PROTECT_MPU_AREA_PERIPH_EXEC,   SFU_PROTECT_MPU_AREA_PERIPH_SREG
+},
+  };
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+
+
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void) HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  (void) HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA_A  **********/
+  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
+  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set Flash configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply PCRoP ******************************************************/
+
+
+    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
+#ifdef SFU_RDP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_RDP_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        (void) HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Lock the Options Bytes ***************************************************/
+  (void) HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void) HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#else
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  /* Check/Apply  ANTI_TAMPER *************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#else
+#ifdef SFU_TEST_PROTECTION
+  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_TEST_PROTECTION */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+  /* Check/Apply  CLOCK_MONITOR **********************************************/
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
+
+  /* Check/Apply  TEMP_MONITOR **********************************************/
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Return the reset source  detected after a reboot. The related flag is reset
+  *         at the end of this function.
+  * @param  peResetpSourceId: to be filled with the detected source of reset
+  * @note   In case of multiple reset sources this function return only one of them.
+  *         It can be improved returning and managing a combination of them.
+  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
+{
+  /* Check if the last reset has been generated from a Watchdog exception */
+  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
+      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
+  {
+    *peResetpSourceId = SFU_RESET_WDG_RESET;
+
+  }
+
+
+  /* Check if the last reset has been generated from a Low Power reset */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_LOW_POWER;
+
+  }
+
+  /* Check if the last reset has been generated from a Software reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_SW_RESET;
+
+  }
+  /* Check if the last reset has been generated from an Option Byte Loader reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_OB_LOADER;
+  }
+  /* Check if the last reset has been generated from a Hw pin reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_HW_RESET;
+
+  }
+  /* Unknown */
+  else
+  {
+    *peResetpSourceId = SFU_RESET_UNKNOWN;
+  }
+}
+
+/**
+  * @brief  Clear the reset sources. This function should be called after the actions
+  *         on the reset sources has been already taken.
+  * @param  none
+  * @note   none
+  * @retval none
+  */
+void SFU_LL_SECU_ClearResetSources()
+{
+  /* Clear reset flags  */
+  __HAL_RCC_CLEAR_RESET_FLAGS();
+}
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply BOOT_LOCK ****************************************************/
+  if ((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Flash configuration */
+  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+/**
+  * @brief  Apply the RDP protection
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply RDP **********************************************************/
+  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
+  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
+#else
+    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
+    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+  return e_ret_status;
+}
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  if ((psFlashOptionBytes->WRPStartOffset == SFU_PROTECT_WRP_PAGE_START_1) &&
+      (psFlashOptionBytes->WRPEndOffset   == SFU_PROTECT_WRP_PAGE_END_1))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
+    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
+    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER6;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER7;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  return SFU_SUCCESS;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Apply MPU protection before executing Standalone loader
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_StandaloneLoader(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = MPU_REGION_NUMBER6;
+  MPU_InitStruct.BaseAddress          = LOADER_PROTECT_MPU_AREA_START;
+  MPU_InitStruct.Size                 = LOADER_PROTECT_MPU_AREA_SIZE;
+  MPU_InitStruct.SubRegionDisable     = LOADER_PROTECT_MPU_AREA_SREG;
+  MPU_InitStruct.AccessPermission     = LOADER_PROTECT_MPU_AREA_PERM;
+  MPU_InitStruct.DisableExec          = LOADER_PROTECT_MPU_AREA_EXEC;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+  MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+  MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  return SFU_SUCCESS;
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t mpu_region_num; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsBufferable         = MPU_ACCESS_BUFFERABLE;
+    MPU_InitStruct.IsCacheable          = MPU_ACCESS_CACHEABLE;
+    MPU_InitStruct.TypeExtField         = MPU_TEX_LEVEL0;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
+          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
+          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    /* Enables the MPU */
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    /* Enables memory fault exception */
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    if ((SCB->SHCSR & SCB_SHCSR_MEMFAULTENA_Msk) != SCB_SHCSR_MEMFAULTENA_Msk)
+    {
+      return SFU_ERROR;
+    }
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+
+  e_ret_status = SFU_SUCCESS;
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return SFU_SUCCESS;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#else
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  Apply ANTI TAMPER protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  RTC_TamperTypeDef  stamperstructure;
+
+  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
+  TAMPER_GPIO_CLK_ENABLE();
+
+  /* Configure Tamper Pin */
+  /* tamper is an additional function */
+  /* not an alternate Function : config not needed */
+  /* Configure the RTC peripheral */
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    /* Configure RTC Tamper */
+    stamperstructure.Tamper                       = RTC_TAMPER_ID;
+    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
+    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
+    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
+    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
+    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
+    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
+    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
+    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
+
+    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
+    {
+
+      /* Clear the Tamper interrupt pending bit */
+      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
+    }
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply CLOCK MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a clock monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Clock Monitoring */
+  /* Add your code here for customization
+     e.g. if HSE or LSE is used enable the CSS!
+   ...
+   ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply TEMP MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a temperature monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Temperature Monitoring */
+  /* Add your code here for customization
+     ...
+     ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_security.h
new file mode 100644
index 00000000..0a412500
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/BFU/Target/sfu_low_level_security.h
@@ -0,0 +1,273 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  */
+
+#define SFU_PROTECT_MPU_AREA_USER_START         ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE          MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_PERM          MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXEC          MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_SREG          0x00U      /*!< All subregions activated */
+
+/**
+  * @brief Region 1 and Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys). Inner region inside
+  *                                the Region 0
+  */
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)       /*!< 8 sub-regions is the maximum */
+#define SFU_PROTECT_MPU_AREA_SFUEN_START_0      FLASH_BASE
+#define SFU_PROTECT_MPU_AREA_SFUEN_START_1      0x08010000
+#define SFU_PROTECT_MPU_AREA_SFUEN_SIZE_0       MPU_REGION_SIZE_64KB
+#define SFU_PROTECT_MPU_AREA_SFUEN_SIZE_1       MPU_REGION_SIZE_16KB
+#define SFU_PROTECT_MPU_AREA_SFUEN_PERM         MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_SFUEN_EXEC         MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_0       0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_SFUEN_SREG_1       0xC0U      /*!< 16 bytes / 8 * 6 ==> 12 bytes */
+
+/**
+  * @brief Region 3 - Vector Table: Vector Table must be Read-Only under privileged access. Inner region inside the
+  *                   Region 1
+  */
+#define SFU_PROTECT_MPU_AREA_VECT_START         ((uint32_t) INTVECT_START) /*!< Vector table memory area */
+#define SFU_PROTECT_MPU_AREA_VECT_SIZE          MPU_REGION_SIZE_512B
+#define SFU_PROTECT_MPU_AREA_VECT_PERM          MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_AREA_VECT_EXEC          MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_AREA_VECT_SREG          0x00U                   /*!< All subregions activated */
+
+/**
+  * @brief Region 4 - Inner region inside the Region 0 . The Option Bytes. Once the Option Bytes have been set,
+  *                   only reading will be possible
+  */
+
+/*
+ * WLxx
+ * Single Bank
+ * [ 1FFF7800 1FFF7808 1FFF7810 1FFF7818 1FFF7820]: 40 bytes to be protected
+ * The MPU can be used to protect up to eight memory regions.
+ * These, in turn can have eight subregions, if the region is at least 256 bytes.
+ * Here, we define a 64B region so subregions cannot be used.
+ */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_START     ((uint32_t)0x1FFF7800U) /*!< Option Bytes in bank 1        */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_SIZE      MPU_REGION_SIZE_64B     /*!< Protecting more than required */
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_PERM      MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_EXEC      MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_OB_BANK1_SREG      0x00U                   /*!< Subregion mask to deactivate unexpected
+                                                                             MPU subregions: 0x1F should be set but it
+                                                                             would have no effect as we have a 64B
+                                                                             region */
+
+/**
+  * @brief  Region 5 - Peripherals Area
+  */
+#define SFU_PROTECT_MPU_AREA_PERIPH_START       PERIPH_BASE                  /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_AREA_PERIPH_SIZE        MPU_REGION_SIZE_512MB        /*!< To be coherent with the peripherals
+                                                                                  memory area */
+#define SFU_PROTECT_MPU_AREA_PERIPH_PERM        MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_PERIPH_EXEC        MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_PERIPH_SREG        0x00U                        /*!< All subregions activated */
+
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * @brief Region 6 & 7 - Enable the execution of the active slots
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+/**
+  * Region definition : from 0x0802 B000 ==> 0x0802 BFFF (4 kbytes)
+  */
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_START  SLOT_ACTIVE_1_START
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_4KB
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_AREA_ACTIVE_SLOT_SREG   0x00U                       /*!< All subregions activated */
+/**
+  * Additional Region definition : from 0x0802 C000 ==> 0x0803 FFFF (80 kbytes)
+  */
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_START  0x08020000
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SIZE   MPU_REGION_SIZE_128KB
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_PERM   MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_EXEC   MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_AREA_2_ACTIVE_SLOT_SREG   0x07U                    /*!< 128 Kbytes / 8 * 5 ==> 80 Kbytes */
+
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
+  * @{
+  */
+#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define RTC_TAMPER_ID                      RTC_TAMPER_1
+#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
+  * @{
+  */
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
+  * @{
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
+  * @{
+  */
+typedef enum
+{
+  SFU_RESET_UNKNOWN = 0x00U,
+  SFU_RESET_WDG_RESET,
+  SFU_RESET_LOW_POWER,
+  SFU_RESET_HW_RESET,
+  SFU_RESET_BOR_RESET,
+  SFU_RESET_SW_RESET,
+  SFU_RESET_OB_LOADER,
+} SFU_RESET_IdTypeDef;
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
+  * @{
+  */
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
+                                                                            separate section to support PCRoP */
+#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
+#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
+                                                                            Std Protections cannot be
+                                                                            added/removed/modified */
+#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
+                                                                            boot in bank1! */
+
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
+#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
+#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
+                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
+                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
+                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | SFU_RUNTIME_PROTECTION_TEMP_MONITOR)
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
+
+/* Exported functions ------------------------------------------------------- */
+#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
+/*!<SFU Redirect of RTC Tamper Event Callback*/
+#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
+
+SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
+void               SFU_LL_SECU_ClearResetSources(void);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+#ifdef SFU_DMA_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+#ifdef SFU_DAP_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#if defined(SFU_MPU_PROTECT_ENABLE)
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_StandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/app_hw.h
new file mode 100644
index 00000000..696d8368
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/app_hw.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    app_hw.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update hardware
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_HW_H
+#define APP_HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported macros -----------------------------------------------------------*/
+/* At power-on, the capacitor related to SW1 button needs to charge.
+ * The charging time must be waited to be sure that a low level is a real one. */
+#define BUTTON_INIT() \
+  BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);                               \
+  if ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET) \
+  {                                                                       \
+     HAL_Delay(6U);                                                       \
+  }
+
+#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_HW_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/main.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/main.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..df90b1f3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..209c9d61
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,54 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* External variables --------------------------------------------------------*/
+extern RTC_HandleTypeDef    RtcHandle;
+
+/* Exported functions ------------------------------------------------------- */
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler(void);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/main.c
new file mode 100644
index 00000000..d2bf7435
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/main.c
@@ -0,0 +1,154 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Secure Boot and Secure Firmware Update.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_boot.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  main function
+  * @param  None
+  * @retval int
+  */
+int main(void)
+{
+
+  /* MCU Configuration--------------------------------------------------------*/
+  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
+  (void) HAL_Init();
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+  /*
+   * As the secure mode has not been entered yet, we do not configure BSP right now .
+   * The BSP will be configured by the bootloader.
+   */
+
+
+  /* Launch the Bootloader----------------------------------------------------*/
+  /*
+   * This is the beginning of the secure part:
+   * security mechanisms will be enabled.
+   * The function below should not return (unless a critical failure is encountered).
+   */
+  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
+
+  /* Security or SecureBoot initialization failure. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+
+
+
+
+#ifdef USE_FULL_ASSERT
+
+/**
+  * @brief Reports the name of the source file and the source line number
+  * where the assert_param error has occurred.
+  * @param file: pointer to the source file name
+  * @param line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+
+}
+
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..fb0c4eda
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,92 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_msp.c
+  * @author  MCD Application Team
+  * @brief   This file provides code for the MSP Initialization
+  *          and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+
+  HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
+
+  /* System interrupt init*/
+  /* MemoryManagement_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(MemoryManagement_IRQn, 0U, 0U);
+  /* BusFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(BusFault_IRQn, 0U, 0U);
+  /* UsageFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(UsageFault_IRQn, 0U, 0U);
+  /* DebugMonitor_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DebugMonitor_IRQn, 0U, 0U);
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0U, 0U);
+
+}
+
+/**
+  * @brief RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspInit(hrtc);
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in this example.
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspDeInit(hrtc);
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspInit(huart);
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in this example:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspDeInit(huart);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..b68f7c5a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,123 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/* Global variables ----------------------------------------------------------*/
+/* RTC handler declaration */
+RTC_HandleTypeDef RtcHandle;
+
+/* Functions Definition ------------------------------------------------------*/
+/******************************************************************************/
+/*            Cortex-M4 Processor Interruption and Exception Handlers         */
+/******************************************************************************/
+
+/* Exception handlers are implemented in the various source files of sbsfu application */
+
+/* NMI exception handler is implemented in sfu_low_level_flash_int.c file */
+/* Hard Fault exception handler is implemented in sfu_boot.c file */
+/* Memory Manage exception handler is implemented in sfu_boot.c file */
+/**
+  * @brief  This function handles Bus Fault exception.
+  * @param  None
+  * @retval None
+  */
+void BusFault_Handler(void)
+{
+  /* Go to infinite loop when Bus Fault exception occurs */
+  while (1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Usage Fault exception.
+  * @param  None
+  * @retval None
+  */
+void UsageFault_Handler(void)
+{
+  /* Go to infinite loop when Usage Fault exception occurs */
+  while (1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles SVCall exception.
+  * @param  None
+  * @retval None
+  */
+void SVC_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles Debug Monitor exception.
+  * @param  None
+  * @retval None
+  */
+void DebugMon_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers                  */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                               */
+/******************************************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler()
+{
+  HAL_RTCEx_TamperIRQHandler(&RtcHandle);
+}
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/Project.ewd
new file mode 100644
index 00000000..a98ad64e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_BFU</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/Project.ewp
new file mode 100644
index 00000000..7404c080
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/Project.ewp
@@ -0,0 +1,1229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_BFU</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>KMS_ENABLED</state>
+          <state>DISABLE_IMAGE_STATE_HANDLING</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\Core\Inc</state>
+          <state>$PROJ_DIR$\..\BFU\App</state>
+          <state>$PROJ_DIR$\..\BFU\Target</state>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>Project.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$\se_interface_appli.o"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\EWARM\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state>SE_CORE_Bin</state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>Core</name>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+      </file>
+    </group>
+    <group>
+      <name>BFU</name>
+      <group>
+        <name>App</name>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_loader.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_boot.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_com_loader.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_com_trace.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_error.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_test.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_fwimg_common.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_fwimg_no_swap.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_fwimg_swap.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_new_image.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_kms.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\App\sfu_interface_crypto_scheme.c</name>
+        </file>
+      </group>
+      <group>
+        <name>Target</name>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash_int.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_flash_ext.c</name>
+        </file>
+        <file>
+          <name>$PROJ_DIR$\..\BFU\Target\sfu_low_level_security.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/steering_file.txt
new file mode 100644
index 00000000..8349caff
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/steering_file.txt
@@ -0,0 +1,37 @@
+show SE_APP_GetActiveFwInfo
+show SE_KMS_Initialize
+show SE_KMS_Finalize
+show SE_KMS_GetInfo
+show SE_KMS_GetFunctionList
+show SE_KMS_GetSlotList
+show SE_KMS_GetSlotInfo
+show SE_KMS_GetTokenInfo
+show SE_KMS_GetMechanismInfo
+show SE_KMS_OpenSession
+show SE_KMS_CloseSession
+show SE_KMS_CreateObject
+show SE_KMS_DestroyObject
+show SE_KMS_GetAttributeValue
+show SE_KMS_SetAttributeValue
+show SE_KMS_FindObjectsInit
+show SE_KMS_FindObjects
+show SE_KMS_FindObjectsFinal
+show SE_KMS_EncryptInit
+show SE_KMS_Encrypt
+show SE_KMS_EncryptUpdate
+show SE_KMS_EncryptFinal
+show SE_KMS_DecryptInit
+show SE_KMS_Decrypt
+show SE_KMS_DecryptUpdate
+show SE_KMS_DecryptFinal
+show SE_KMS_DigestInit
+show SE_KMS_Digest
+show SE_KMS_DigestUpdate
+show SE_KMS_DigestFinal
+show SE_KMS_SignInit
+show SE_KMS_Sign
+show SE_KMS_VerifyInit
+show SE_KMS_Verify
+show SE_KMS_DeriveKey
+show SE_KMS_GenerateKeyPair
+show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..3aa0929b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,30 @@
+/*###ICF### Set of symbols used in SE and BFU projects ****/
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x1A00;
+define symbol __ICFEDIT_size_heap__ = 0;
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section SE_CORE_Bin };
+place in SE_IF_ROM_region {section .SE_IF_Code};
+place in SB_ROM_region    { readonly };
+place in SB_RAM_region    { readwrite, block CSTACK, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/BFU.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/BFU.sct
new file mode 100644
index 00000000..d5e2d56c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/BFU.sct
@@ -0,0 +1,47 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+; *** regions needed by SBSFU project ***
+LR_ROM_Vector INTVECT_START VECTOR_SIZE {
+  vector_start INTVECT_START VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+}
+
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CODE_REGION_ROM_START FIXED {
+  *(SE_CORE_Bin)
+  }
+}
+
+LR_IF SE_IF_REGION_ROM_START {  
+  SE_IF_region_ROM SE_IF_REGION_ROM_START FIXED SE_IF_ROM_REGION_SIZE {
+  se_interface_application.o (+RO)
+  se_interface_bootloader.o (+RO)
+  se_interface_common.o (+RO)
+  se_interface_kms.o (+RO)
+  }
+}
+
+LR_SB SB_REGION_ROM_START {
+  SB_region_ROM SB_REGION_ROM_START FIXED SB_ROM_REGION_SIZE {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  
+  SB_RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  .ANY (STACK)
+  .ANY (HEAP)
+  }
+}
+
+LR_KMS_DataStorage KMS_DATASTORAGE_START KMS_DATASTORAGE_SIZE {
+  ER_KMS_DataStorage KMS_DATASTORAGE_START FILL 0X00000000 KMS_DATASTORAGE_SIZE {
+  }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..63eceab2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/Project.uvoptx
@@ -0,0 +1,916 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_BFU</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7  -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <WatchWindow1>
+        <Ww>
+          <count>0</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>e_ret_status</ItemText>
+        </Ww>
+      </WatchWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>0</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>se_core_bin.s</PathWithFileName>
+      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/BFU/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_boot.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\App\sfu_com_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\App\sfu_com_trace.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_error.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_fwimg_common.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_fwimg_no_swap.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_no_swap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_fwimg_swap.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_swap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_kms.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\App\sfu_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\App\sfu_new_image.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_new_image.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/App/sfu_test.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/BFU/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\Target\sfu_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\Target\sfu_low_level_flash.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\Target\sfu_low_level_flash_ext.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\BFU\Target\sfu_low_level_flash_int.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../BFU/Target/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..b7ba693d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/Project.uvprojx
@@ -0,0 +1,724 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_BFU</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>BFU</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-Wno-format</MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../Core/Inc;../BFU/App;../BFU/Target;../../1_Image_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>BFU.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--symdefs=se_interface_appli.txt
+--keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>se_core_bin.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>se_core_bin.s</FilePath>
+            </File>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/BFU/App</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_boot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_boot.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_com_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_error.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_error.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_fwimg_common.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_no_swap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_fwimg_no_swap.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_swap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_fwimg_swap.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_interface_crypto_scheme.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_interface_crypto_scheme.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_kms.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\App\sfu_new_image.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/App/sfu_test.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/BFU/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash_ext.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\BFU\Target\sfu_low_level_flash_int.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../BFU/Target/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_bootloader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_ll_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components/>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt
new file mode 100644
index 00000000..7996d449
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/STM32WL55JC_Nucleo/Exe/se_interface_appli.txt
@@ -0,0 +1,38 @@
+#<SYMDEFS># ARM Linker, 6140002: Last Updated: Fri May 14 11:42:51 2021
+0x08008801 T SE_APP_GetActiveFwInfo
+0x08008eb1 T SE_KMS_Initialize
+0x08008bed T SE_KMS_Finalize
+0x08008d7d T SE_KMS_GetInfo
+0x08008d79 T SE_KMS_GetFunctionList
+0x08008e15 T SE_KMS_GetSlotList
+0x08008de1 T SE_KMS_GetSlotInfo
+0x08008e4d T SE_KMS_GetTokenInfo
+0x08008da9 T SE_KMS_GetMechanismInfo
+0x08008f45 T SE_KMS_OpenSession
+0x08008885 T SE_KMS_CloseSession
+0x080088ad T SE_KMS_CreateObject
+0x08008a05 T SE_KMS_DestroyObject
+0x08008d3d T SE_KMS_GetAttributeValue
+0x08008f85 T SE_KMS_SetAttributeValue
+0x08008c81 T SE_KMS_FindObjectsInit
+0x08008c19 T SE_KMS_FindObjects
+0x08008c55 T SE_KMS_FindObjectsFinal
+0x08008b79 T SE_KMS_EncryptInit
+0x08008b09 T SE_KMS_Encrypt
+0x08008bb1 T SE_KMS_EncryptUpdate
+0x08008b45 T SE_KMS_EncryptFinal
+0x08008955 T SE_KMS_DecryptInit
+0x080088e5 T SE_KMS_Decrypt
+0x08008989 T SE_KMS_DecryptUpdate
+0x08008921 T SE_KMS_DecryptFinal
+0x08008aa5 T SE_KMS_DigestInit
+0x08008a35 T SE_KMS_Digest
+0x08008ad5 T SE_KMS_DigestUpdate
+0x08008a71 T SE_KMS_DigestFinal
+0x08009001 T SE_KMS_SignInit
+0x08008fc1 T SE_KMS_Sign
+0x08009079 T SE_KMS_VerifyInit
+0x08009039 T SE_KMS_Verify
+0x080089c5 T SE_KMS_DeriveKey
+0x08008cb9 T SE_KMS_GenerateKeyPair
+0x08008d05 T SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/se_core_bin.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/se_core_bin.s
new file mode 100644
index 00000000..0d96feed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/se_core_bin.s
@@ -0,0 +1,20 @@
+;/******************************************************************************
+;* File Name          : se_core_bin.s
+;* Author             : MCD Application Team
+;* Description        : Include SECoreBin binary.
+;********************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;******************************************************************************
+;
+;
+ AREA SE_CORE_Bin, CODE, READONLY
+ INCBIN .\..\..\1_Image_SECoreBin\MDK-ARM\STM32WL55JC_Nucleo\Exe\SECoreBin.bin
+ END
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..cd715899
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,365 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1A00
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x0
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..633cc6ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/.cproject
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="BFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../BFU/App | ../../../BFU/Target | ../../../../1_Image_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/BFU.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_BFU}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../BFU/App"/>
+									<listOptionValue builtIn="false" value="../../BFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/BFU.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/BFU.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+					<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.298519129" name="se_interface_application.c" rcbsApplicability="disable" resourcePath="Middlewares/STM32_Secure_Engine/se_interface_application.c" toolsToInvoke="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898.810348834">
+						<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898.810348834" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898">
+							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.310263369" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<listOptionValue builtIn="false" value="../../Core/Inc"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+								<listOptionValue builtIn="false" value="../../BFU/App"/>
+								<listOptionValue builtIn="false" value="../../BFU/Target"/>
+								<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+								<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+								<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+							</option>
+							<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1223368002" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+						</tool>
+					</fileInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_BFU.null.839446873" name="1_Image_BFU"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/.project
new file mode 100644
index 00000000..e1053b57
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/.project
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_BFU</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_LL_Driver/stm32wlxx_ll_utils.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/se_interface_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_application.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_bootloader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_boot.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_boot.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_com_loader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_com_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_error.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_error.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_fwimg_common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_fwimg_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_fwimg_swap.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_fwimg_swap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_fwimg_no_swap.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_fwimg_no_swap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_interface_crypto_scheme.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_interface_crypto_scheme.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_loader.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_new_image.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/App/sfu_test.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/App/sfu_test.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash_ext.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash_ext.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_flash_int.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_flash_int.c</locationURI>
+		</link>
+		<link>
+			<name>Application/BFU/Target/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/BFU/Target/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c
new file mode 100644
index 00000000..3c5470dc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Core/sfu_secorebin_inc.c
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    sfu_secorebin_inc.c
+  * @author  MCD Application Team
+  * @brief   Include SECoreBin binary.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+
+#if defined (__GNUC__)
+asm(".section SE_CORE_Bin,\"a\";"
+                             ".incbin \"../../1_Image_SECoreBin/STM32CubeIDE/Debug/SECoreBin.bin\";"
+);
+#endif 
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Core/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Core/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/BFU.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/BFU.ld
new file mode 100644
index 00000000..f6726648
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/BFU.ld
@@ -0,0 +1,162 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0;                /* required amount of heap  */
+_Min_Stack_Size = 0x2000;          /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >INTVECT_ROM_region
+  
+  SE_CORE_Bin :
+  {
+    KEEP(*(SE_CORE_Bin));
+  } > SE_ROM_region
+
+  .SE_IF_Code : { KEEP(*se_interface_application.o (.text .text*))
+                  KEEP(*se_interface_bootloader.o (.text .text*))
+                  KEEP(*se_interface_common.o (.text .text*))
+                  KEEP(*se_interface_kms.o (.text .text*))
+  } >SE_IF_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SB_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SB_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SB_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SB_RAM_region AT>SB_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/se_interface.txt
new file mode 100644
index 00000000..05aa5e0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/STM32CubeIDE/se_interface.txt
@@ -0,0 +1,40 @@
+SE_APP_GetActiveFwInfo
+SE_APP_SVC_Handler
+SE_SYS_SaveDisableIrq
+SE_SYS_RestoreEnableIrq
+SE_KMS_Initialize
+SE_KMS_Finalize
+SE_KMS_GetInfo
+SE_KMS_GetFunctionList
+SE_KMS_GetSlotList
+SE_KMS_GetSlotInfo
+SE_KMS_GetTokenInfo
+SE_KMS_GetMechanismInfo
+SE_KMS_OpenSession
+SE_KMS_CloseSession
+SE_KMS_CreateObject
+SE_KMS_DestroyObject
+SE_KMS_GetAttributeValue
+SE_KMS_SetAttributeValue
+SE_KMS_FindObjectsInit
+SE_KMS_FindObjects
+SE_KMS_FindObjectsFinal
+SE_KMS_EncryptInit
+SE_KMS_Encrypt
+SE_KMS_EncryptUpdate
+SE_KMS_EncryptFinal
+SE_KMS_DecryptInit
+SE_KMS_Decrypt
+SE_KMS_DecryptUpdate
+SE_KMS_DecryptFinal
+SE_KMS_DigestInit
+SE_KMS_Digest
+SE_KMS_DigestUpdate
+SE_KMS_DigestFinal
+SE_KMS_SignInit
+SE_KMS_Sign
+SE_KMS_VerifyInit
+SE_KMS_Verify
+SE_KMS_DeriveKey
+SE_KMS_GenerateKeyPair
+SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/readme.txt
new file mode 100644
index 00000000..82e264f5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_BFU/readme.txt
@@ -0,0 +1,166 @@
+/**
+  @page 1_Image_BFU / Boot and Firmware Update Demo Application
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows Boot and Firmware Update example.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+The Boot (B) and Firmware Update (FU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates.
+In addition, Secure Boot (Root of Trust services) checks and activates the STM32 security mechanisms (if any), and checks the
+authenticity and integrity of user application code before every execution to ensure that invalid or malicious code
+cannot be run. The Firmware Update application receives the encrypted firmware image, decrypts it, then checks
+the authenticity and integrity of the code before installing it.
+
+The key management services provide cryptographic services to the user application through the pkcs11 APIs
+(KEY ID based APIs). User application keys are stored and can be updated in a secure way (authenticity check, data decryption and
+data integrity check).
+This example handles 2 firmware images located in 1 active slot and 1 download area in FLASH allowing to demonstrate
+features like:
+   - download a new firmware image from the application
+   - resume firmware update procedure in case of power off during installation
+   - rollback on the previous firmware if the new active image is not validated (selft-tests KO) at first start-up.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from the
+STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, SBSFU, MPU
+
+@par Directory contents
+
+   - 1_Image_BFU/Core/Src/main.c                           Main application file
+   - 1_Image_BFU/Core/Src/stm32wlxx_hal_msp.c              HAL MSP module
+   - 1_Image_BFU/Core/Src/stm32wlxx_it.c                   STM32 interrupt handlers
+   - 1_Image_BFU/Core/Inc/app_hw.h                         Hardware definitions for application
+   - 1_Image_BFU/Core/Inc/main.h                           Header file for main.c
+   - 1_Image_BFU/Core/Inc/stm32wlxx_hal_conf.h             HAL configuration file
+   - 1_Image_BFU/Core/Inc/stm32wlxx_it.h                   Header file for stm32wlxx_it.c
+   - 1_Image_BFU/Core/Inc/stm32wlxx_nucleo_conf.h          BSP configuration file
+   - 1_Image_BFU/BFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
+   - 1_Image_BFU/BFU/App/sfu_com_loader.c                BFU communication module: local loader part
+   - 1_Image_BFU/BFU/App/sfu_com_trace.c                 BFU communication module: trace part
+   - 1_Image_BFU/BFU/App/sfu_error.c                     BFU errors management
+   - 1_Image_BFU/BFU/App/sfu_fwimg_common.c              BFU image handling: common functionalities/services
+   - 1_Image_BFU/BFU/App/sfu_fwimg_swap.c                BFU image handling: FW upgrade without swap area services
+   - 1_Image_BFU/BFU/App/sfu_fwimg_no_swap.c             BFU image handling: FW upgrade with swap area services
+   - 1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
+   - 1_Image_BFU/BFU/App/sfu_kms.c                       Key management service blob importation handling
+   - 1_Image_BFU/BFU/App/sfu_loader.c                    BFU Local Loader
+   - 1_Image_BFU/BFU/App/sfu_new_image.c                 BFU image handling: manage the new firmware image storage and installation
+   - 1_Image_BFU/BFU/App/sfu_test.c                      BFU security protection automatic test
+   - 1_Image_BFU/BFU/App/app_sfu.h                       Software configuration of BFU application
+   - 1_Image_BFU/BFU/App/sfu_boot.h                      Header file for sfu_boot.c
+   - 1_Image_BFU/BFU/App/sfu_com_loader.h                Header file for sfu_com_loader.c
+   - 1_Image_BFU/BFU/App/sfu_com_trace.h                 Header file for sfu_com_trace.c
+   - 1_Image_BFU/BFU/App/sfu_def.h                       General definition for BFU application
+   - 1_Image_BFU/BFU/App/sfu_error.h                     Header file for sfu_error.c file
+   - 1_Image_BFU/BFU/App/sfu_fsm_states.h                BFU FSM states definitions
+   - 1_Image_BFU/BFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling (sfu_fwimg_core.c and sfu_fwimg_services.c)
+   - 1_Image_BFU/BFU/App/sfu_fwimg_regions.h             FLASH regions definitions for image handling
+   - 1_Image_BFU/BFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
+   - 1_Image_BFU/BFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
+   - 1_Image_BFU/BFU/App/sfu_kms.h                       Header file for sfu_kms.c
+   - 1_Image_BFU/BFU/App/sfu_loader.h                    Header file for sfu_loader.c
+   - 1_Image_BFU/BFU/App/sfu_new_image.h                 Header file for sfu_new_image.c
+   - 1_Image_BFU/BFU/App/sfu_test.h                      Header file for sfu_test.c
+   - 1_Image_BFU/BFU/App/sfu_trace.h                     Header file for sfu_trace.c
+   - 1_Image_BFU/BFU/Target/sfu_low_level.c              BFU general low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash.c        BFU flash low level interface (wrapper)
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_int.c    BFU internal flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.c    BFU external flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_security.c     BFU security low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level.h              Header file for general low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash.h        Header file for flash low level interface (wrapper)
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_int.h    Header file for internal flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_flash_ext.h    Header file for external flash low level interface
+   - 1_Image_BFU/BFU/Target/sfu_low_level_security.h     Header file for security low level interface
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices.
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
+   - This example needs a terminal emulator.
+   - By default, SBSFU is configured in development mode. To switch in production mode, refer to AN5056 "Integration
+     guide - software expansion for STM32Cube" available from the STMicroelectronics microcontroller website
+     www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files.
+     As a workaround, it is advised to use the subst.exe command from within a command prompt to set up a local drive
+     out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par How to use it ?
+
+Several steps to run BFU application :
+
+1. Compile projects in the following order. This is mandatory as each project requests some objects generated by the
+   compilation of the previous one:
+   - 1_Image_SECoreBin (see also SECoreBin/readme.txt)
+   - 1_Image_BFU
+   - 1_Image_UserApp (see also UserApp/readme.txt)
+
+2. Before loading BFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that the
+   following are valid for the device:
+   - RDP Level 0
+   - Write Protection disabled on all FLASH pages
+   - Chip has been erased
+
+3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator that can be downloaded
+   from https://osdn.net/projects/ttssh2/) for UART connection with the board.
+   Support of YMODEM protocol is required. Serial port configuration should be :
+   - Baud rate = 115200
+   - Data = 8 bits
+   - Parity = none
+   - Stop = 1 bit
+   - Flow control = none
+
+4. Load BFU image into target memory with your preferred toolchain or STM32CubeProgammer.
+
+5. Once the BFU software is downloaded, power cycle the board (unplug/plug USB cable) : the BFU
+   application starts and configures the security mechanisms if some of them are enabled.
+
+6. [If RDP is enabled] Power cycle the board a second time (unplug/plug the USB cable): the BFU application starts with
+   the configured securities turned on and the Tera Term connection is possible.
+   Caution: Make sure to use an up-to-date version of ST-LINK firmware else BFU may not start.
+
+7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
+   Green LED blinks every 3 seconds when a local download is waited.
+   Green LED blinks every 250 ms in case of error in option bytes configuration.
+
+8. Send the user encrypted firmware file (\2_Slots\1_Image_UserApp\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
+Note2 : The following steps enable the protections disabled by default:
+        - Comment "SECBOOT_DISABLE_SECURITY_IPS" in app_sfu.h. This will enable RDP, WRP, DAP, DMA, IWDG protections
+          as well as attack surface reduction with MPU.
+        - As TAMPER detection can be very sensitive, the protection remains disabled by default.
+          Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
+        These features achieve an attack surface reduction but will not make it possible to protect secrets.
+Note3 : for Linux users Minicom can be used but to do so you need to compile the BFU project with the MINICOM_YMODEM
+        switch enabled (app_sfu.h)
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Binary/ECCKEY.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Binary/ECCKEY.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Binary/iv.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Binary/iv.bin
new file mode 100644
index 00000000..87418a0d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Binary/iv.bin
@@ -0,0 +1 @@
+�!Eˠ;P=����+�f
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/Project.ewd
new file mode 100644
index 00000000..62ef1fde
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/Project.ewp
new file mode 100644
index 00000000..e381814c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/Project.ewp
@@ -0,0 +1,1054 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\1_Image_SECoreBin\Inc</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\KMS_Blob.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/postbuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/postbuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/stm32wl55xx_flash_cm4.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/EWARM/stm32wl55xx_flash_cm4.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/KMS_Blob.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/KMS_Blob.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..4a478254
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/Project.uvoptx
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_KMS_Blob</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>1</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>0</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>BIN\UL2CM3.DLL</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_blob_example_keys.c</PathWithFileName>
+      <FilenameWithoutPath>kms_blob_example_keys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..76e41a0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/Project.uvprojx
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_KMS_Blob</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>KMS_blob</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../1_Image_SECoreBin/Inc</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>0</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>KMS_Blob.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--diag_suppress L6305W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>kms_blob_example_keys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_1_Image_KMS_Blob"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/postbuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/MDK-ARM/postbuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..2f5c5502
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/.cproject
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../1_Image_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/KMS_Blob.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_KMS_Blob.null.1082786794" name="1_Image_KMS_Blob"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/.project
new file mode 100644
index 00000000..ae535727
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_KMS_Blob</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_blob_example_keys.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_blob_example_keys.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
new file mode 100644
index 00000000..cf21882e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
@@ -0,0 +1,29 @@
+/*
+** LinkerScript
+*/
+
+APPLI_region_ROM_start    = 0x00000000;
+APPLI_region_ROM_length   = 0x8000;
+
+/* Specify the memory areas */
+MEMORY
+{
+ APPLI_region_ROM  : ORIGIN = APPLI_region_ROM_start, LENGTH = APPLI_region_ROM_length
+}
+
+/* Define output sections */
+SECTIONS
+{
+  .rodata :
+  {
+    . = ALIGN(16);
+    KEEP(*(.KMS_blob_Keys))
+    . = ALIGN(16);
+  } >APPLI_region_ROM
+  
+  /DISCARD/ :
+  {
+    *(.init)
+    *(.fini)
+  }
+}
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Src/kms_blob_example_keys.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/Src/kms_blob_example_keys.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/readme.txt
new file mode 100644
index 00000000..d7ddf143
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_KMS_Blob/readme.txt
@@ -0,0 +1,62 @@
+/**
+  @page 1_Image_KMS_Blob / Key Management Services / Blob generation project.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2019 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Key Management Services Blob generation.
+  *          Allows to generate Blob to be injected to a device supporting
+  *          KMS ImportBlob().
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description 
+
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+
+You can edit your own keys to generate your own Blob.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Cryptography, KMS, Provisioning
+
+@par Directory contents
+
+   - 1_Image_KMS_Blob/Src/kms_blob_example_keys.c             KMS blob objects definition
+   - 1_Image_KMS_Blob/Binary/ECCKEY.txt                       Private ECCDSA key for signature verification
+   - 1_Image_KMS_Blob/Binary/iv.bin                           Encryption/decryption initialization vector
+   - 1_Image_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - Python installation required. In addition, install the appropriate python modules as described in
+    Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages\readme.txt
+    
+    
+@par How to use it ? 
+
+In order to generate Secure Key Storage Blob file, you must do the following :
+ - Edit the .c source file, where examples of keys are provided. Update with your own keys.
+ - Open your preferred toolchain 
+ - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Binary/ECCKEY1.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Binary/ECCKEY1.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/nonce.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Binary/nonce.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/nonce.bin
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Binary/nonce.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.ewd
new file mode 100644
index 00000000..02776c9f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.ewp
new file mode 100644
index 00000000..7cfa5ac7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.ewp
@@ -0,0 +1,1183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_1_Image_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>KMS_ENABLED</state>
+          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
+          <state>IT_MANAGEMENT_DISABLED</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
+          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\App</state>
+          <state>$PROJ_DIR$\..\..\1_Image_BFU\BFU\Target</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$</state>
+          <state>$PROJ_DIR$\..\..\LoRaWAN_End_Node\LoRaWAN\App</state>
+          <state>$PROJ_DIR$\..\..\LoRaWAN_End_Node\LoRaWAN\Target</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
+        <postbuild></postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>SE_CallGate</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
+      </file>
+    </group>
+    <group>
+      <name>Third_Party</name>
+      <group>
+        <name>mbed-crypto</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
+        </file>
+      </group>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..9fa5f09e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,155 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+
+set "nonce=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% %headerbin%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %partialbin% %partialsfu%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..990a4eff
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,145 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% -o %offset% --pfw %partialbin% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..ab63a8a2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,154 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "iv=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\EWARM\\STM32WL55JC_Nucleo\\Exe\\Project.out"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -v 0  -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %partialbin% %partialsfu%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% -o %offset% --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/prebuild.bat
new file mode 100644
index 00000000..4e8662aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V7M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\1_Image_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\1_Image_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..ce349210
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,26 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit};
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
+place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
+place in SE_CODE_NOKEY_ROM_region {readonly};
+place in User_Key_ROM_region { section .USER_embedded_Keys };
+keep { section .USER_embedded_Keys };
+place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
+keep { section .SE_embedded_Keys };
+place in SE_RAM_region {readwrite};
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/ca_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/ca_conf.h
new file mode 100644
index 00000000..0dea918c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/ca_conf.h
@@ -0,0 +1,639 @@
+/**
+  ******************************************************************************
+  * @file    ca_conf.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Cryptographic API (CA)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_CONF_H
+#define CA_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Cryptographic_API Cryptographic API (CA)
+  * @{
+  */
+
+/** @defgroup CA_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup CA_Crypto_Libraries Cryptographic Libraries
+  * @{
+  */
+
+/**
+  * @brief Define CA_ST_CRYPTOLIB_SUPP to use services from ST Cryptographic firmware Library
+  * @note  More details on this library can be found here www.st.com/en/embedded-software/x-cube-cryptolib.html
+  */
+/*#define CA_ST_CRYPTOLIB_SUPP*/
+
+/**
+  * @brief Define CA_MBED_CRYPTOLIB_SUPP to use services from the Mbed Cryptography Library
+  * @note  More details on this library can be found here github.com/ARMmbed/mbed-crypto
+  */
+#define CA_MBED_CRYPTOLIB_SUPP
+
+/**
+  * @brief Define CA_HAL_CRYPTOLIB_SUPP to use services from the STM32Cube HAL drivers
+  * @note  HAL drivers can be used to access cryptographic services of specific IP peripherals
+  *        Supported IP peripherals are CRYP & PKA
+  */
+#define CA_HAL_CRYPTOLIB_SUPP
+
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Features_Config Supported Features
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RNG to support RNG cryptographic algorithm
+  */
+/* #define CA_FEAT_RNG */
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define the below line to support AES cryptographic algorithm
+  */
+#define CA_FEAT_AES
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_AES_Features_Config AES Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_AES_ENCRYPT to support AES cryptographic algorithm encryption
+  */
+#define CA_FEAT_AES_ENCRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_DECRYPT to support AES cryptographic algorithm decryption
+  */
+#define CA_FEAT_AES_DECRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_128BITS to support AES cryptographic algorithm on 128 bits length keys
+  */
+#define CA_FEAT_AES_128BITS
+
+/**
+  * @brief Define CA_FEAT_AES_192BITS to support AES cryptographic algorithm on 192 bits length keys
+  */
+/* #define CA_FEAT_AES_192BITS */
+
+/**
+  * @brief Define CA_FEAT_AES_256BITS to support AES cryptographic algorithm on 256 bits length keys
+  */
+#define CA_FEAT_AES_256BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+/**
+  * @brief Define CA_FEAT_HASH to support HASH cryptographic algorithm
+  */
+#define CA_FEAT_HASH
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC to support ECC cryptographic algorithm
+  */
+#define CA_FEAT_ECC
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC_VERIFY to support ECC cryptographic algorithm verification
+  */
+#define CA_FEAT_ECC_VERIFY
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+/**
+  * @brief Define CA_FEAT_RSA to support RSA cryptographic algorithm
+  */
+#define CA_FEAT_RSA
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RSA_SIGN to support RSA cryptographic algorithm signature
+  */
+#define CA_FEAT_RSA_SIGN
+
+/**
+  * @brief Define CA_FEAT_RSA_VERIFY to support RSA cryptographic algorithm verification
+  */
+#define CA_FEAT_RSA_VERIFY
+
+/**
+  * @brief Define CA_FEAT_RSA_1024BITS to support RSA cryptographic algorithm on 1024 bits length modulus
+  */
+#define CA_FEAT_RSA_1024BITS
+
+/**
+  * @brief Define CA_FEAT_RSA_2048BITS to support RSA cryptographic algorithm on 2048 bits length modulus
+  */
+#define CA_FEAT_RSA_2048BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/** @defgroup CA_Router_Config Algorithms Router & Configuration
+  * @{
+  */
+
+/** @defgroup CA_Router_Config_Def Router defines
+  * @note     Masks & Defines to use to configure algorithm routing options
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_MASK to extract configured route from algorithm configuration definition
+  */
+#define CA_ROUTE_MASK   (0xFUL)
+
+/**
+  * @brief Use CA_ROUTE_ST to make the configured algorithm using ST Cryptographic firmware Library
+  * @note  See @ref CA_ST_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_ST     (1UL)
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#define CA_ROUTE_ST     (0UL)
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_MBED to make the configured algorithm using Mbed Cryptography Library
+  * @note  See @ref CA_MBED_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_MBED   (2UL)
+#else /* CA_MBED_CRYPTOLIB_SUPP */
+#define CA_ROUTE_MBED   (0UL)
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_HAL to make the configured algorithm using STM32Cube HAL drivers
+  * @note  See @ref CA_HAL_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_HAL    (3UL)
+#else /* CA_HAL_CRYPTOLIB_SUPP */
+#define CA_ROUTE_HAL    (0UL)
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if !defined(CA_ROUTE_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_DEFAULT to choose default route for the configured algorithm
+  * @note  Default is chosen as below described:
+  *        - If CA_ST_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_ST
+  *        - else if CA_MBED_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_MBED
+  *        - else if CA_HAL_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_HAL
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_ST
+#elif defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_MBED
+#elif defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_HAL
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ROUTE_DEFAULT */
+
+/**
+  * @}
+  */
+#if defined(CA_FEAT_RNG)
+/** @defgroup CA_Router_Config_RNG_Def RNG Defines
+  * @note     Masks & Defines to use to configure RNG algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief RNG configuration
+  * @note  Define CA_ROUTE_RNG to enable RNG algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_RNG  (CA_ROUTE_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RNG */
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_Router_Config_AES_Def AES Defines
+  * @note     Masks & Defines to use to configure AES algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_ENCRYPT_ENABLE to enable encryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_ENCRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_ENCRYPT)
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (1UL << 8)
+#else /* CA_FEAT_AES_ENCRYPT */
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_ENCRYPT */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DECRYPT_ENABLE to enable decryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_DECRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_DECRYPT)
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (1UL << 9)
+#else /* CA_FEAT_AES_DECRYPT */
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_DECRYPT */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_128BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_128BITS to be defined
+  */
+#if defined(CA_FEAT_AES_128BITS)
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (1UL << 10)
+#else /* CA_FEAT_AES_128BITS */
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_128BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_192BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_192BITS to be defined
+  */
+#if defined(CA_FEAT_AES_192BITS)
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (1UL << 11)
+#else /* CA_FEAT_AES_192BITS */
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_192BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_256BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_256BITS to be defined
+  */
+#if defined(CA_FEAT_AES_256BITS)
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_AES_256BITS */
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_256BITS */
+
+#if !defined(CA_ROUTE_AES_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DEFAULT to choose default settings for the configured AES algorithm
+  * @note  Default is: encryption & decryption using 128, 192 & 256 bits lengths keys enabled
+  */
+#define CA_ROUTE_AES_CFG_DEFAULT  (CA_ROUTE_AES_CFG_ENCRYPT_ENABLE  \
+                                   | CA_ROUTE_AES_CFG_DECRYPT_ENABLE \
+                                   | CA_ROUTE_AES_CFG_128BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_192BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_256BITS_ENABLE)
+#endif /* CA_ROUTE_AES_CFG_DEFAULT */
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Router_Config_AES AES Algorithms configurations
+  * @{
+  */
+
+/**
+  * @brief AES CBC configuration
+  * @note  Define CA_ROUTE_AES_CBC to enable AES CBC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CBC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CCM configuration
+  * @note  Define CA_ROUTE_AES_CCM to enable AES CCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CMAC configuration
+  * @note  Define CA_ROUTE_AES_CMAC to enable AES CMAC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CMAC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES ECB configuration
+  * @note  Define CA_ROUTE_AES_ECB to enable AES ECB algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_ECB  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES GCM configuration
+  * @note  Define CA_ROUTE_AES_GCM to enable AES GCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_GCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+
+#if defined(CA_FEAT_HASH)
+/** @defgroup CA_Router_Config_HASH_Def HASH Defines
+  * @note     Masks & Defines to use to configure HASH algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief HASH SHA1 configuration
+  * @note  Define CA_ROUTE_HASH_SHA1 to enable HASH SHA1 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+/* #define CA_ROUTE_HASH_SHA1  (CA_ROUTE_DEFAULT) */
+
+/**
+  * @brief HASH SHA256 configuration
+  * @note  Define CA_ROUTE_HASH_SHA256 to enable HASH SHA256 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_HASH_SHA256  (CA_ROUTE_MBED)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_HASH */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_Router_Config_ECC_Def ECC Defines
+  * @note     Masks & Defines to use to configure ECC algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_VERIFY_ENABLE to enable verification for the configured ECC algorithm
+  * @note  Requires @ref CA_FEAT_ECC_VERIFY to be defined
+  */
+#if defined(CA_FEAT_ECC_VERIFY)
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_ECC_VERIFY */
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_ECC_VERIFY */
+
+
+#if !defined(CA_ROUTE_ECC_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_DEFAULT to choose default settings for the configured ECC algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_ECC_CFG_DEFAULT  (CA_ROUTE_ECC_CFG_VERIFY_ENABLE)
+#endif /* CA_ROUTE_ECC_CFG_DEFAULT */
+
+/**
+  * @brief ECC ECDSA configuration
+  * @note  Define CA_ROUTE_ECC_ECDSA to enable ECC ECDSA algorithm
+  * @note  Requires CA_ROUTE_RNG to be defined
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_ECC_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_ECC_CFG_DEFAULT to use default ECC algorithm configuration
+  */
+#define CA_ROUTE_ECC_ECDSA  (CA_ROUTE_HAL | CA_ROUTE_ECC_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_Router_Config_RSA_Def RSA Defines
+  * @note     Masks & Defines to use to configure RSA algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_SIGN_ENABLE to enable signature for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_SIGN to be defined
+  */
+#if defined(CA_FEAT_RSA_SIGN)
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (1UL << 8)
+#else /* CA_FEAT_RSA_SIGN */
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_SIGN */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_VERIFY_ENABLE to enable verification for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_VERIFY to be defined
+  */
+#if defined(CA_FEAT_RSA_VERIFY)
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_RSA_VERIFY */
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_VERIFY */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_1024BITS_ENABLE to enable support of 1024 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_1024BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_1024BITS)
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_RSA_1024BITS */
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_1024BITS */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_2048BITS_ENABLE to enable support of 2048 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_2048BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_2048BITS)
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (1UL << 13)
+#else /* CA_FEAT_RSA_2048BITS */
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_2048BITS */
+
+
+#if !defined(CA_ROUTE_RSA_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_DEFAULT to choose default settings for the configured RSA algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_RSA_CFG_DEFAULT  (CA_ROUTE_RSA_CFG_SIGN_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_VERIFY_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_1024BITS_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_2048BITS_ENABLE)
+#endif /* CA_ROUTE_RSA_CFG_DEFAULT */
+
+/**
+  * @brief RSA configuration
+  * @note  Define CA_ROUTE_RSA to enable RSA algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_RSA_CFG_SIGN_ENABLE      Signature is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_1024BITS_ENABLE  1024 bits length modulus is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_2048BITS_ENABLE  2048 bits length modulus is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_RSA_CFG_DEFAULT to use default RSA algorithm configuration
+  */
+#define CA_ROUTE_RSA  (CA_ROUTE_HAL | CA_ROUTE_RSA_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/ca_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/ca_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_config.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_mem_pool_def.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_mem_pool_def.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern
new file mode 100644
index 00000000..8ab87950
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern
@@ -0,0 +1,508 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_CONFIG_H
+#define KMS_PLATF_OBJECTS_CONFIG_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "kms_platf_objects_interface.h"
+#include "app_sfu.h"
+#include "Commissioning.h"
+#include "lorawan_conf.h" /* KEY_EXTRACTABLE */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RAW_TO_INT32A(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
+0x##a##b##c##d, 0x##e##f##g##h, 0x##i##j##k##l, 0x##m##n##o##p
+
+#define FORMAT_KEY_32(...) RAW_TO_INT32A(__VA_ARGS__)
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_PLATF Platform Objects
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_PLATF_Exported_Constants Exported Constants
+  * @note KMS support different type of objects, their respective ranges are
+  *       defined here
+  * @{
+  */
+
+/* We consider that the ORDER (static = lower ids) will be kept. */
+#define KMS_INDEX_MIN_EMBEDDED_OBJECTS       1UL   /*!< Embedded objects min ID. Must be > 0 as '0' is never a
+                                                        valid key index */
+#define KMS_INDEX_MAX_EMBEDDED_OBJECTS       (KMS_INDEX_MIN_EMBEDDED_OBJECTS+19UL)    /*!< Embedded objects max ID */
+#define KMS_INDEX_MIN_NVM_STATIC_OBJECTS     (KMS_INDEX_MAX_EMBEDDED_OBJECTS+1UL)     /*!< NVM static objects min ID */
+#define KMS_INDEX_MAX_NVM_STATIC_OBJECTS     (KMS_INDEX_MIN_NVM_STATIC_OBJECTS+19UL)  /*!< NVM static objects max ID */
+
+#define KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MAX_NVM_STATIC_OBJECTS+1UL)   /*!< NVM dynamic objects min ID */
+#define KMS_INDEX_MAX_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS+19UL) /*!< NVM dynamic objects max ID */
+
+/* Blob import key index */
+#define KMS_INDEX_BLOBIMPORT_VERIFY       (1U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob verification key is stored */
+#define KMS_INDEX_BLOBIMPORT_DECRYPT      (2U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob decryption key is stored */
+
+/**
+  * @}
+  */
+
+/*
+ * Embedded objects definition
+ *
+ */
+#ifdef KMS_PLATF_OBJECTS_C
+/** @addtogroup KMS_PLATF_Private_Variables Private Variables
+  * @{
+  */
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".SE_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".SE_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 24);
+KMS_DECLARE_BLOB_STRUCT(, 30);
+KMS_DECLARE_BLOB_STRUCT(, 256);
+
+/* This object is used for KMS blob header signature                 */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   KMS_Blob_ECDSA_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  1,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_BLOB_KEY@
+  }
+};
+
+/* This object is used for KMS blob encryption                    */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   KMS_Blob_AES_CBC128_Decrypt =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  2,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_BLOB_KEY@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_1_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  3,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_1@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_2_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_2@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /*(SFU_NB_MAX_ACTIVE_IMAGE > 1U)*/
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_3_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_3@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_1_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  6,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_1@
+  }
+};
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_2_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  7,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_2@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_3_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  8,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_3@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif
+
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".USER_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".USER_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 21);
+KMS_DECLARE_BLOB_STRUCT(, 27);
+
+/* These objects are used by user tKMS application                 */
+#if defined(__GNUC__)
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
+#endif
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_Zero_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  13,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    CKA_DERIVE,       sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_App_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  14,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_Nwk_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  15,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_21_t   Lorawan_Nwk_S_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  16,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_21_t   Lorawan_App_S_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  17,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#elif defined(__GNUC__)
+#pragma GCC pop_options
+#endif
+
+/**
+  * @brief  KMS embedded objects definition
+  * @note   Must contains KMS blob verification and decryption keys
+  */
+static const kms_obj_keyhead_t *const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBEDDED_OBJECTS -
+                                                                    KMS_INDEX_MIN_EMBEDDED_OBJECTS + 1] =
+{
+#if defined(KMS_IMPORT_BLOB)
+  /* KMS Blob import keys */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_ECDSA_Verify,       /* Index = 1 */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_AES_CBC128_Decrypt, /* Index = 2 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 1 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 2 */
+#endif /* KMS_IMPORT_BLOB */
+  /* SBSFU keys */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_1_128,             /* Index = 3 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_2_128,             /* Index = 4 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_3_128,             /* Index = 5 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 3 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_1_Verify,        /* Index = 6 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_2_Verify,        /* Index = 7 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_3_Verify,        /* Index = 8 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 12 */
+  /* UserApp example keys */
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+  (kms_obj_keyhead_t *) &Lorawan_Zero_Key,                      /* Index = 13 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 13 */
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+  (kms_obj_keyhead_t *) &Lorawan_App_Key,                       /* Index = 14 */
+  (kms_obj_keyhead_t *) &Lorawan_Nwk_Key,                       /* Index = 15 */
+  (kms_obj_keyhead_t *) &Lorawan_Nwk_S_Key,                     /* Index = 16 */
+  (kms_obj_keyhead_t *) &Lorawan_App_S_Key,                     /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 20 */
+};
+
+/**
+  * @}
+  */
+#endif /* KMS_PLATF_OBJECTS_C */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_platf_objects_interface.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/kms_platf_objects_interface.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/mbed_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/mbed_crypto_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_SECoreBin/Inc/mbed_crypto_config.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/mbed_crypto_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/nvms_low_level.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/nvms_low_level.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/se_crypto_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/se_crypto_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/se_def_metadata.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/se_def_metadata.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/se_low_level.h
new file mode 100644
index 00000000..bd8b79e1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/se_low_level.h
@@ -0,0 +1,184 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Engine low level interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_LOW_LEVEL_H
+#define SE_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+
+/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
+   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
+#include "sfu_fwimg_regions.h"
+
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup SE
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
+  * @{
+  */
+/**
+  * @brief flash handling constants: these constants are used in se_fwimg.c
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
+  * @{
+  */
+
+/**
+  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
+  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
+  * 32-bit word.
+  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
+  */
+#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
+  do{                                  \
+    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
+  }while(0)
+
+/**
+  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
+  */
+#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
+  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
+  * @{
+  */
+
+/**
+  * MPU : Enter/Exit secured area ==> nothing to do
+  */
+#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
+#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
+
+/** @addtogroup SE_LOW_LEVEL_Exported_Functions
+  * @{
+  */
+void SE_LL_CORE_Cleanup(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_Functions
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void);
+SE_ErrorStatus SE_LL_CRC_Init(void);
+SE_ErrorStatus SE_LL_CRC_DeInit(void);
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..790df77b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/Project.uvoptx
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_1_Image_SECoreBin</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM4 -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>0x20005AF8</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\data_init.c</PathWithFileName>
+      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
+      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
+      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
+      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
+      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
+      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..f4d95093
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/Project.uvprojx
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_1_Image_SECoreBin</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M4") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>SECoreBin</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name>prebuild.bat .</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> -MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM4,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../1_Image_BFU/BFU/App;../../1_Image_BFU/BFU/Target;../../Linker_Common/MDK-ARM;../../LoRaWAN_End_Node/LoRaWAN/App;../../LoRaWAN_End_Node/LoRaWAN/Target</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SECoreBin.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--entry=SE_CallGate
+--diag_suppress L6404W
+--diag_suppress L6314W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>data_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\data_init.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ca_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>nvms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/nvms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_low_level.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_callgate.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_exception.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_fwimg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_der_x962.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_digest.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_dyn_obj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_ecc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_enc_dec.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_key_mgt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_nvm_storage.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_platf_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+          <Files>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
+            <File>
+              <FileName>sha256.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_1_Image_SECoreBin"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..a898c437
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,122 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\MDK-ARM\\STM32WL55JC_Nucleo\\Exe\\BFU.axf"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..a04fe6cc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,119 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\MDK-ARM\\STM32WL55JC_Nucleo\\Exe\\BFU.axf"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..9af45b1a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,121 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\BFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+set "sbsfuelf=%SBSFUBootLoader%\\1_Image_BFU\\MDK-ARM\\STM32WL55JC_Nucleo\\Exe\\BFU.axf"
+set "oemkey=%SBSFUBootLoader%\\1_Image_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% merge -i %headerbin% -s %sbsfuelf% -u %elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct
new file mode 100644
index 00000000..a5aba32a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/SECoreBin.sct
@@ -0,0 +1,26 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+
+; *** regions needed by SE_CoreBin project ***
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
+  *(.SE_CallGate_Code)
+  }
+  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
+  *(.SE_embedded_Keys)
+  }
+  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
+  *(.SE_Startup_Code)
+  }
+  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_ROM_REGION_SIZE{
+  .ANY (+RO)
+  } 
+  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/data_init.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/data_init.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/prebuild.bat
new file mode 100644
index 00000000..4e8662aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/MDK-ARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V7M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\1_Image_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\1_Image_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..899c6777
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/.cproject
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../1_Image_BFU/CM4/BFU/App | ../../../1_Image_BFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SECoreBin.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/1_Image_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value=".."/>
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/App"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../LoRaWAN_End_Node/LoRaWAN/App"/>
+									<listOptionValue builtIn="false" value="../../../LoRaWAN_End_Node/LoRaWAN/Target"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="1_Image_SECoreBin.null.394363235" name="1_Image_SECoreBin"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/.project
new file mode 100644
index 00000000..e65aa4fa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/.project
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>1_Image_SECoreBin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ca_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
new file mode 100644
index 00000000..dcc46a55
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
@@ -0,0 +1,36 @@
+
+#include "stdint-gcc.h"
+
+#ifndef vu32
+#	define vu32 volatile uint32_t
+#endif
+
+void LoopCopyDataInit(void) {
+	extern char _sidata asm("_sidata");
+	extern char _sdata asm("_sdata");
+	extern char _edata asm("_edata");
+	
+	vu32* src = (vu32*) &_sidata;
+	vu32* dst = (vu32*) &_sdata;
+	
+	vu32 len = (&_edata - &_sdata) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = src[i];
+}
+
+void LoopFillZerobss(void) {
+	extern char _sbss asm("_sbss");
+	extern char _ebss asm("_ebss");
+	
+	vu32* dst = (vu32*) &_sbss;
+	vu32 len = (&_ebss - &_sbss) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = 0;
+}
+
+void __gcc_data_init(void) {
+	LoopFillZerobss();
+	LoopCopyDataInit();
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld
new file mode 100644
index 00000000..077941d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/STM32CubeIDE/SECoreBin.ld
@@ -0,0 +1,159 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(SE_CallGate)
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_CallGate_Code :
+  {
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    BYTE(0);           /* dummy byte to keep the callgate at 0x8000204 */
+    KEEP(*(.SE_CallGate_Code))
+  } > SE_CallGate_ROM_region
+
+  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
+
+  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SE_Code_NoKey_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .USER_embedded_Keys :
+  {
+  	. = ALIGN(8);
+    KEEP(*(.USER_embedded_Keys))
+	. = ALIGN(8);
+   } >User_Key_region_ROM
+  
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SE_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SE_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/ca_low_level.c
new file mode 100644
index 00000000..30759a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/ca_low_level.c
@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_C
+#define CA_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "CryptoApi/ca.h"
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#include "mbedtls/entropy_poll.h"
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#define COMPILER_BARRIER() __DMB();__DSB();
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static RNG_HandleTypeDef handle;
+static uint8_t users = 0;
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private function prototypes -----------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta);
+static void RNG_Init(void);
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length);
+static void RNG_DeInit(void);
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Exported functions implementation -----------------------------------------*/
+
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+
+/**
+  * @brief CRYP MSP Initialization
+  * This function configures the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Release AES/CRYP from reset state */
+    __HAL_RCC_AES_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_AES_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief CRYP MSP De-Initialization
+  * This function freeze the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_AES_CLK_DISABLE();
+    /* Force AES/CRYP into reset state */
+    __HAL_RCC_AES_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/**
+  * @brief      PKA MSP Initialization
+  *             This function configures the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Release PKA from reset state */
+    __HAL_RCC_PKA_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_PKA_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief      PKA MSP De-Initialization
+  *             This function freeze the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_PKA_CLK_DISABLE();
+    /* Force PKA into reset state */
+    __HAL_RCC_PKA_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta)
+{
+  COMPILER_BARRIER();
+  uint8_t newValue;
+  do
+  {
+    newValue = __LDREXB(valuePtr) + delta;
+  } while (__STREXB(newValue, valuePtr));
+  COMPILER_BARRIER();
+  return newValue;
+}
+
+static void RNG_Init(void)
+{
+  uint32_t dummy;
+
+  /*  We're only supporting a single user of RNG */
+  if (atomic_incr_u8(&users, 1) > 1)
+  {
+    while (1);
+  }
+
+  /* Select MSI as RNG clock source */
+  __HAL_RCC_RNG_CONFIG(RCC_RNGCLKSOURCE_MSI);
+
+  /* RNG Peripheral clock enable */
+  __HAL_RCC_RNG_CLK_ENABLE();
+
+  /* Initialize RNG instance */
+  handle.Instance = RNG;
+  handle.State = HAL_RNG_STATE_RESET;
+  handle.Lock = HAL_UNLOCKED;
+
+  HAL_RNG_Init(&handle);
+
+  /* first random number generated after setting the RNGEN bit should not be used */
+  HAL_RNG_GenerateRandomNumber(&handle, &dummy);
+}
+
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length)
+{
+  int32_t ret = 0;
+  __IO uint8_t random[4];
+  *output_length = 0;
+
+  /* Get Random byte */
+  while ((*output_length < length) && (ret == 0))
+  {
+    if (HAL_RNG_GenerateRandomNumber(&handle, (uint32_t *)random) != HAL_OK)
+    {
+      ret = -1;
+    }
+    else
+    {
+      for (uint8_t i = 0; (i < 4) && (*output_length < length) ; i++)
+      {
+        *output++ = random[i];
+        *output_length += 1;
+        random[i] = 0;
+      }
+    }
+  }
+  /* Just be extra sure that we didn't do it wrong */
+  if ((__HAL_RNG_GET_FLAG(&handle, (RNG_FLAG_CECS | RNG_FLAG_SECS))) != 0)
+  {
+    *output_length = 0;
+  }
+}
+
+static void RNG_DeInit(void)
+{
+  /*Disable the RNG peripheral */
+  HAL_RNG_DeInit(&handle);
+  /* RNG Peripheral clock disable - assume we're the only users of RNG  */
+  __HAL_RCC_RNG_CLK_DISABLE();
+
+  users = 0;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+  RNG_Init();
+  RNG_GetBytes(output, len, olen);
+  RNG_DeInit();
+  if (*olen != len)
+  {
+    return -1;
+  }
+  return 0;
+}
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+/**
+  * @brief      CRC initialization
+  *             This function release reset and clock CRC IP peripheral
+  * @retval None
+  */
+void CA_LL_CRC_Init(void)
+{
+  /* Force CRC into reset state */
+  __HAL_RCC_CRC_FORCE_RESET();
+  /* Release CRC from reset state */
+  __HAL_RCC_CRC_RELEASE_RESET();
+  /* Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+}
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#endif /* CA_LOW_LEVEL_C */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/kms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/kms_low_level.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/kms_low_level.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/nvms_low_level.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/nvms_low_level.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/se_low_level.c
new file mode 100644
index 00000000..cfec9ebf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/Src/se_low_level.c
@@ -0,0 +1,706 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SE_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#endif /* __CC_ARM */
+#include "se_exception.h"
+#include "string.h"
+
+#ifdef KMS_ENABLED
+#include "kms.h"
+#include "kms_objects.h"
+#include "kms_platf_objects_config.h"
+#endif /* KMS_ENABLED */
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+/** @defgroup  SE_HARDWARE SE Hardware Interface
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Private_Variables Private Variables
+  * @{
+  */
+static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
+
+static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Private_Functions Private Functions
+  * @{
+  */
+
+static uint32_t SE_LL_GetPage(uint32_t Address);
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  Set CRC configuration and call HAL CRC initialization function.
+  * @param  None.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  CrcHandle.Instance = CRC;
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The Default polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+  /* The default init value is used */
+  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+  /* CRC Init*/
+  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_Init(void)
+{
+  /* CRC Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  return SE_LL_CRC_Config();
+}
+
+/**
+  * @brief  Wrapper to HAL CRC de-initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_DeInit(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
+  {
+    /* Initialization OK */
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC Calculate function.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  uBufferLength: buffer length in 32-bits word.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  This function does an erase of nb pages in user flash area
+  * @param  pStart: pointer to  user flash area
+  * @param  Length: number of bytes.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SE_ErrorStatus e_ret_status = SE_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    /* Fill EraseInit structure*/
+    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
+    p_erase_init.Page          = SE_LL_GetPage(start);
+    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
+    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+    {
+      e_ret_status = SE_ERROR;
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Write in Flash  protected area
+  * @param  pDestination pointer to destination area in Flash
+  * @param  pSource pointer to input buffer
+  * @param  Length number of bytes to be written
+  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
+  */
+
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SE_ErrorStatus ret = SE_SUCCESS;
+  uint32_t i;
+  uint32_t verified = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  if (Length == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Area should be inside 1 of the firmware image headers */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    for (i = 0U; i < Length; i += 8U)
+    {
+      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
+      {
+        ret = SE_ERROR;
+        break;
+      }
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) */
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    ret = SE_ERROR;
+  }
+  return ret;
+}
+
+/**
+  * @brief  Read in Flash protected area
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to read
+  * @param  Length: Length in bytes of data buffer
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  uint32_t source = (uint32_t)pSource;
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+  uint32_t i;
+  uint32_t verified = 0U;
+
+  /* Area should be inside 1 of the firmware image headers
+     or inside 1 of the download areas */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
+        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
+    {
+      verified = 1U;
+    }
+  }
+
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  SE_DoubleECC_Error_Counter = 0U;
+  /* Do not use memcpy from lib : ECC error should be checked at each loop */
+  for (i = 0; (i < Length) && (SE_DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+  {
+    *pDestination = *pSource;
+  }
+  if (SE_DoubleECC_Error_Counter == 0U)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  SE_DoubleECC_Error_Counter = 0U;
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
+  * @param pxSE_Metadata: Firmware metadata.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(pxSE_Metadata);
+  return SE_SUCCESS;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= (SE_REGION_RAM_END + 1U))))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is in sbsfu ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
+                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
+                            || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
+                           )))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Lock the embedded keys used by SBSFU
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void)
+{
+#ifdef KMS_ENABLED
+  uint32_t i_key_locked = 0U;
+  uint32_t i_ctrl = 0U;
+
+#ifdef KMS_INDEX_BLOBIMPORT_VERIFY
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_VERIFY) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_VERIFY */
+#ifdef KMS_INDEX_BLOBIMPORT_DECRYPT
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_DECRYPT) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_DECRYPT */
+#ifdef KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE */
+  if(i_ctrl == i_key_locked)
+  {
+    return SE_SUCCESS;
+  }
+  else
+  {
+    return SE_ERROR;
+  }
+#else /* KMS_ENABLED */
+  return SE_SUCCESS;
+#endif /* KMS_ENABLED */
+}
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t SE_LL_GetPage(uint32_t Address)
+{
+  uint32_t page;
+
+  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
+  {
+    /* Bank 1 */
+    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
+  }
+  else
+  {
+    /* Bank 2 */
+    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
+  }
+  return page;
+}
+
+/**
+  * @brief  Gets the bank of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The bank of a given address
+  */
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retval None.
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    SE_DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    /* This exception occurs for another reason than flash double ECC errors */
+    SE_NMI_ExceptionHandler();
+  }
+}
+
+/**
+  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
+  * @param  None.
+  * @retvat void
+  */
+void HardFault_Handler(void)
+{
+  SE_NMI_ExceptionHandler();
+}
+
+/**
+  * @brief  Cleanup SE CORE
+  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
+  *
+  */
+void  SE_LL_CORE_Cleanup(void)
+{
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/readme.txt
new file mode 100644
index 00000000..205abd15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/1_Image_SECoreBin/readme.txt
@@ -0,0 +1,107 @@
+/**
+  @page 1_Image_SECoreBin / Secure Engine Core binary generation.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Secure Engine Core binary generation.
+  *          SE Core binary exports SE CallGate function entry point for
+  *          FU Application.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application is used to generate Secure Engine Core binary file to be linked
+with Boot & Firmware Update application (BFU).
+SE Core binary exports a single entry point to SE CallGate function and a startup method for data initialization.
+It is based on the Secure Engine Middleware.
+
+Generated SE Core Binary embeds Key Management Services accessible through this same single entry point using APIs
+defined by tKMS interface.
+
+It has to be compiled before BFU project.
+
+Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default
+cryptographic scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are
+provided and can be selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
+   - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
+   - SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+   - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 1_Image_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
+   - 1_Image_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
+   - 1_Image_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
+   - 1_Image_SECoreBin/Src/se_low_level.c                      Low level interface
+   - 1_Image_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
+   - 1_Image_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
+   - 1_Image_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
+   - 1_Image_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
+   - 1_Image_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
+   - 1_Image_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
+                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
+   - 1_Image_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
+                                                                Exported to KMS user to ease embedded object usage
+   - 1_Image_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
+   - 1_Image_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
+   - 1_Image_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
+   - 1_Image_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
+   - 1_Image_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
+   - 1_Image_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
+   - 1_Image_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
+   - 1_Image_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
+   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+   - 1_Image_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files. As a workaround, it is advised to use the subst.exe command from within a command prompt to set up
+     a local drive out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+   
+@par IDE prebuild script
+
+In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
+This preliminary processing is in charge of:
+   - determining the requested cryptographic scheme
+   - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of BFU & Blob importation
+     keys into the KMS embedded objects pattern file)
+   - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
+
+A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic
+key). The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+In order to generate Secure Engine Core binary file, you must do the following :
+   - Open your preferred toolchain
+   - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/Project.ewp
deleted file mode 100644
index 5fdcfbd5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/Project.ewp
+++ /dev/null
@@ -1,1056 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state>CORE_CM0PLUS</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Platform</state>
-          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>..\..\KMS_Blob.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
-      </file>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 2c0d74e1..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM0P</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.6</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>KMS_blob</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
-            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
-          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> </TargetDllArguments>
-          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>4</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Platform;../../2_Images_SECoreBin/Inc</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>0</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>KMS_Blob.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--diag_suppress L6305W</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>kms_blob_example_keys.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_2_Images_KMS_Blob"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
deleted file mode 100644
index 119621d7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_hw.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update hardware
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef APP_HW_H
-#define APP_HW_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Exported macros -----------------------------------------------------------*/
-#define BUTTON_INIT()         BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);
-#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APP_HW_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 6b8db4f7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/* COM usage define */
-#define USE_BSP_COM_FEATURE                 0U
-
-/* COM log define */
-#define USE_COM_LOG                         0U
-
-/* IRQ priorities */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
deleted file mode 100644
index a6c7ef42..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    main.c
-  * @author  MCD Application Team
-  * @brief   Main application file.
-  *          This application demonstrates Secure Boot and Secure Firmware Update.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_boot.h"
-
-
-/* Private variables ---------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  main function
-  * @param  None
-  * @retval int
-  */
-int main(void)
-{
-
-  /* MCU Configuration--------------------------------------------------------*/
-  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
-  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
-  (void) HAL_Init();
-
-  /* Workaround for the OPTVERR error  */
-  FLASH->SR = 0xFFFFFFFFu;
-
-  /* Board BSP  Configuration-------------------------------------------------*/
-  /*
-   * As the secure mode has not been entered yet, we do not configure BSP right now .
-   * The BSP will be configured by the bootloader.
-   */
-
-
-  /* Launch the Bootloader----------------------------------------------------*/
-  /*
-   * This is the beginning of the secure part:
-   * security mechanisms will be enabled.
-   * The function below should not return (unless a critical failure is encountered).
-   */
-  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
-
-  /* Security or SecureBoot initialization failure. Force a System Reset */
-  SFU_BOOT_ForceReboot();
-
-}
-
-
-
-
-
-
-#ifdef USE_FULL_ASSERT
-
-/**
-  * @brief Reports the name of the source file and the source line number
-  * where the assert_param error has occurred.
-  * @param file: pointer to the source file name
-  * @param line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t *file, uint32_t line)
-{
-  /* USER CODE BEGIN 6 */
-  /* User can add his own implementation to report the file name and line number,
-    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  /* USER CODE END 6 */
-
-}
-
-#endif /* USE_FULL_ASSERT */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
deleted file mode 100644
index 0b69c0bd..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_sfu.h
-  * @author  MCD Application Team
-  * @brief   This file contains the configuration of SBSFU application.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef APP_SFU_H
-#define APP_SFU_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_crypto_config.h"
-#include "app_sfu_common.h"
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * Use this define to choose the type of Firmware Image Programming you want to use.
-  * This version supports only 2 modes:
-  *
-  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
-  *       The image is received in encrypted format.
-  *       The image must be decrypted to be installed:
-  *         this is done according to the selected crypto scheme,
-  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
-  *
-  * SFU_CLEAR_IMAGE: Clear Firmware Image
-  *       The image is received in clear format.
-  *       No decrypt operation is needed before installing the image:
-  *         the selected crypto scheme must be compatible with this choice,
-  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
-  *
-  *
-  */
-#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
-#else
-#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
-#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
-
-/*#define SFU_DEBUG_MODE */              /*!< Comment this define to optimize memory footprint (debug mode removed)
-                                          No more print on terminal during SBSFU execution */
-
-/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
-                                          this switch activates more debug prints in the console (FSM state info...) */
-
-
-/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
-                                                          When this switch is activated, the FWIMG part of SB_SFU will
-                                                          block when an abnormal error is encountered */
-
-#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
-#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
-#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
-
-#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
-#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
-#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
-
-/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
-                                           Automatically executed @startup */
-#if defined(SFU_TEST_PROTECTION)
-#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
-#endif /* SFU_TEST_PROTECTION */
-
-/**
-  * SB_SFU status LED.
-  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
-  * This is useful when no log is enabled.
-  *
-  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
-  * \li For the other situations, please check the other defines below.
-  */
-#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
-#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
-                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
-#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
-
-
-/**
-  * Optional Features Software Configuration
-  */
-#if !defined(SFU_TEST_PROTECTION)
-#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
-#else
-#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
-#endif /* SFU_TEST_PROTECTION */
-
-/* Uncomment the define below if you want to remove the swap area
-   ==> partial update is not supported in this configuration */
-/*#define SFU_NO_SWAP*/                              /*!< FW upgrade installation process without swap area */
-
-/* Multi-images configuration :
-   - Max : 3 Active images and 3 Download area
-   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
-   - Active slot identified with SFU magic (1,2,3) information from header
-   - Do not forget to add keys for each image in SE_Corebin/Binary folder
-   - Master slot : image started in priority if valid
-   - FW image valide all feature authorized from master slot
-*/
-#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
-
-#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
-
-/* Uncomment the following defines when in Release mode.
-   In debug mode it can be better to disable some of the following protection
-   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
-
-#define SFU_RDP_PROTECT_ENABLE
-/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
-                                             neither connected to GND nor to 5V (floating level), there are too many
-                                             spurious tamper event detected */
-#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
-                                        Enables/Disables the MPU protection.
-                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
-                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
-                                        addition to the overall MPU protection. */
-#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
-                                        executable area */
-
-#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
-#define SFU_GTZC_PROTECT_ENABLE    /*!< GTZC protection (dependent on SFU_SECURE_USER_PROTECT_ENABLE):
-                                        Enables/Disables the GTZC protection. */
-#define SFU_C2SWDBG_PROTECT_ENABLE /*!< Dynamic disabling of the CPU2 debug:
-                                        not writable if ESE=0, no meaning if DDS=1. */
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
-#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
-                                                      completely disabled, OB update no more possible  */
-
-
-#else
-#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
-                                                      field should set it as Level2 */
-#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
-
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-
-
-/** 
-  * Application Configuration
-  *
-  */
-#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
-                                              You can also define an upper bound here if you plan to use it */
-
-#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
-                                              no FW installed or due to an attack attempt). Could be different from
-                                              SFU_FW_VERSION_START_NUM */
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APP_SFU_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
deleted file mode 100644
index b67b2523..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
+++ /dev/null
@@ -1,1954 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_boot.c
-  * @author  MCD Application Team
-  * @brief   SFU BOOT module
-  *          This file provides firmware functions to manage the following
-  *          functionalities of the Secure Boot:
-  *           + Initialization and de-initialization functions
-  *           + Secure Boot Control functions
-  *           + Secure Boot State functions
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_BOOT_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "string.h"
-#include "sfu_boot.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level.h"
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
-
-#include "sfu_trace.h"
-#include "se_def.h"
-#include "se_bootinfo.h"
-#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
-#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
-#include "sfu_test.h"                 /* auto tests */
-#include "sfu_fwimg_internal.h"
-#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
-
-#ifdef KMS_ENABLED
-#include "tkms.h"
-#include "sfu_kms.h"
-#endif /* KMS_ENABLED */
-
-/* Private typedef -----------------------------------------------------------*/
-typedef struct
-{
-  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
-  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
-} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
-                                                     information using during the SM evolution. */
-
-/* Private defines -----------------------------------------------------------*/
-#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
-#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
-#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
-                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
-
-#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
-                                    maintained for future customization/expansion of the field itself */
-
-#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
-
-/* Private macros ------------------------------------------------------------*/
-#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
-  do{                                                                   \
-    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
-    if (Status == SFU_SUCCESS){                                         \
-      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
-    }                                                                   \
-    else {                                                              \
-      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
-    }                                                                   \
-  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
-
-
-#define SFU_SET_SM_CURR_STATE(NewState)                                 \
-  do{                                                                   \
-    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
-    m_StateMachineContext.CurrState = NewState;                         \
-  }while(0) /*!< Set a State Machine state*/
-
-
-#define SFU_GET_LAST_EXEC_STATE(STATUS)         (((STATUS)>>8U) & 0xFFU)          /*!< Get last State Machine state*/
-#define SFU_GET_LAST_EXEC_IMAGE_ID(STATUS)      (((STATUS)>>16U) & 0xFFU)         /*!< Get image ID*/
-#define SFU_GET_LAST_EXEC_ID(STATUS)            (((STATUS)>>24U) & 0xFFU)         /*!< Get Execution ID*/
-
-/* Private variables ---------------------------------------------------------*/
-/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
-static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
-                                                                         SFU_STATE_INITIAL
-                                                                        };
-
-/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
-static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
-static uint32_t m_ActiveSlotToResume = SLOT_INACTIVE;
-static uint32_t m_ActiveSlotToRollback = SLOT_INACTIVE;
-static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
-static uint32_t m_C1ActiveSlot = SLOT_INACTIVE;
-static uint32_t m_C2ActiveSlot = SLOT_INACTIVE;
-
-/* Global variables ----------------------------------------------------------*/
-/**
-  * This variable indicates if at boot-up the FW presence check has already been performed or not:
-  * \li It is reset when the FW status has already been checked once and no FW is present
-  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
-  * \li It is used to display some messages only once in the teraterm console
-  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
-  * \li This is used at LocalDownload and CheckUserFwStatus stages.
-  */
-uint8_t initialDeviceStatusCheck;
-
-/**
-  *  Flow control initial values.
-  *   - Security protections flow (static + dynamic)
-  *   - Crypto operations flow (authentication, integrity)
-  */
-uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
-uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_BOOT_Init(void);
-static SFU_ErrorStatus SFU_BOOT_DeInit(void);
-static void SFU_BOOT_BspConfiguration(void);
-static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
-static void SFU_BOOT_SM_CheckStatusOnReset(void);
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-static void SFU_BOOT_SM_CheckNewFwToDownload(void);
-static void SFU_BOOT_SM_DownloadNewUserFw(void);
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-#ifdef KMS_ENABLED
-static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
-static void SFU_BOOT_SM_InstallKMSBlob(void);
-#endif /* KMS_ENABLED */
-static void SFU_BOOT_SM_CheckUserFwStatus(void);
-static void SFU_BOOT_SM_VerifyUserFwSignature(void);
-static void SFU_BOOT_SM_ExecuteUserFw(void);
-static void SFU_BOOT_SM_HandleCriticalFailure(void);
-static void SFU_BOOT_SM_RebootStateMachine(void);
-static void SFU_BOOT_SM_InstallNewUserFw(void);
-static void SFU_BOOT_SM_ResumeInstallNewUserFw(void);
-static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void);
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
-static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
-static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
-static SFU_ErrorStatus SFU_BOOT_SetLastExecStatus(uint8_t uExecID, uint8_t uLastExecState);
-static SFU_ErrorStatus SFU_BOOT_ManageLastExecStatus(uint32_t uLastExecStatus);
-static SFU_ErrorStatus SFU_BOOT_ManageResetSources(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
-  *        In the nominal case, the bootloader service runs until the user application is launched.
-  *        When no valid user application can be run (after installing a new image or not),
-  *        if the local loader feature is not enabled then the execution stops,
-  *        otherwise a local download will be awaited.
-  *        If the state machine encounters a major issue then a reboot is triggered.
-  * @param None.
-  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
-  * @note Constraints
-  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
-  *       2. This function also takes care of BSP initialization after enabling the secure mode.
-  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
-  *       3. No other entity should handle the initialization of the Secure Engine.
-  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
-  *          configurations will be overwritten).
-  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
-  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
-  *          error cause.
-  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
-  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
-  *          new image).
-  * @note Settings are handled at compilation time:
-  *       1. See compiler switches in main.h for secure IPs settings
-  *       2. The trace system is configured in the sfu_trace.h file
-  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
-  *          stage.
-  */
-SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
-{
-  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
-
-  /*
-   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
-   * "automatically" managed by SBSFU compiler command
-   */
-  if (SE_Startup() == SE_SUCCESS)
-  {
-    /* Security Configuration */
-    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
-    {
-      /* Board BSP  Configuration */
-      SFU_BOOT_BspConfiguration();
-
-      /* Configure the Secure Boot and start the State machine */
-      if (SFU_BOOT_Init() == SFU_SUCCESS)
-      {
-        /* Start the Secure Boot State Machine */
-        (void) SFU_BOOT_SM_Run();
-      }
-      else
-      {
-        /* failure when initializing the secure boot service */
-        e_ret_code = SFU_BOOT_INIT_FAIL;
-      }
-    }
-    else
-    {
-      /* failure when configuring the security IPs  */
-      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
-    }
-  }
-  else
-  {
-    /* failure at secure engine initialization stage */
-    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
-  }
-
-  /*
-   * This point should not be reached unless a critical init failure occurred
-   * Return the error code
-   */
-  return (e_ret_code);
-}
-
-/**
-  * @brief  Force System Reboot
-  * @param  None
-  * @retval None
-  */
-void SFU_BOOT_ForceReboot(void)
-{
-  /*
-   * WARNING: The follow TRACEs are for debug only. This function could be called
-   * inside an IRQ so the below printf could not be executed or could generate a fault!
-   */
-  TRACE("\r\n========= End of Execution ==========");
-  TRACE("\r\n\r\n\r\n");
-
-  /*
-   * This is the last operation executed. Force a System Reset.
-   * The check below is needed in case we reboot before setting the Unpriviledged mode.
-   * This can happen in a factory reset use-case typically.
-   */
-  if (0U != SFU_MPU_IsUnprivileged())
-  {
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
-  }
-  else
-  {
-    NVIC_SystemReset();
-  }
-}
-
-/**
-  * @brief  Initialize the Secure Boot State machine.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_Init(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-
-  /*
-   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
-   * download)
-   */
-  initialDeviceStatusCheck = 1U;
-
-  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
-  if (SFU_LL_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Flash interface initialization */
-  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* The COM modules is required only if the trace or the local download is enabled */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
-  if (SFU_COM_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  /* Call the SFU_LOADER module Init */
-  if (SFU_LOADER_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER */
-
-  /* Call the Exception module Init */
-  if (SFU_EXCPT_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Call the image handling Init  */
-  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
-  {
-    return SFU_ERROR;
-  } /* else continue */
-
-
-  TRACE("\r\n\r\n");
-  TRACE("\r\n======================================================================");
-  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
-  TRACE("\r\n=                                                                    =");
-  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
-  TRACE("\r\n======================================================================");
-  TRACE("\r\n\r\n");
-
-  /* Initialize the Secure Engine that will be used for all the most critical operations */
-  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
-  {
-    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
-  }
-  else
-  {
-    /* Check the Secure Engine Status in order to get more information */
-    if (e_se_status == SE_BOOT_INFO_ERR_FACTORY_RESET)
-    {
-      TRACE("\r\n= [SBOOT] STATE: WARNING: SECURE ENGINE INITIALIZATION WITH FACTORY DEFAULT VALUES!");
-      /* Please add your custom action here */
-      /* ... */
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-      TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
-    }
-    /*
-     * The BootInfo consecutive boot on error counter will be handled in SFU_BOOT_ManageResetSources() to decide if it
-     * is incremented or reset.
-     * This counter is used to count the number of consecutive resets triggered by an error (in the User Application or
-     * in SB_SFU when dealing with the user application management).
-     * So this counter is reset as soon as a normal power off/power on boot is performed.
-     */
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  DeInitialize the Secure Boot State machine.
-  * @param  None
-  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
-  *         The bootloader can terminate:
-  *         1. with an init failure : no de-init needed
-  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
-  *            by this function.
-  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
-  *            required security mechanisms.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_DeInit(void)
-{
-  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER */
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  if (SFU_COM_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
-
-  if (SFU_LL_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  BSP Initialization.
-  *         Called when the secure mode is enabled.
-  * @note   The BSP configuration should be handled only in this function.
-  * @param  None
-  * @retval None
-  */
-static void SFU_BOOT_BspConfiguration()
-{
-  /* LED Init*/
-  (void) BSP_LED_Init(SFU_STATUS_LED);
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-  /* User Button */
-  BUTTON_INIT();
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-}
-
-/**
-  * @brief  Execute the Secure Boot state machine.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
-  void (*fnStateMachineFunction)(void);
-  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-                                                 SFU_BOOT_SM_CheckNewFwToDownload,
-                                                 SFU_BOOT_SM_DownloadNewUserFw,
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-#ifdef KMS_ENABLED
-                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
-                                                 SFU_BOOT_SM_InstallKMSBlob,
-#endif /* KMS_ENABLED */
-                                                 SFU_BOOT_SM_CheckUserFwStatus,
-                                                 SFU_BOOT_SM_InstallNewUserFw,
-                                                 SFU_BOOT_SM_VerifyUserFwSignature,
-                                                 SFU_BOOT_SM_ExecuteUserFw,
-                                                 SFU_BOOT_SM_ResumeInstallNewUserFw,
-                                                 SFU_BOOT_SM_RollbackInstallPrevUserFw,
-                                                 SFU_BOOT_SM_HandleCriticalFailure,
-                                                 SFU_BOOT_SM_RebootStateMachine
-                                                };
-
-  /* Start the State Machine loop/evolution */
-  while (e_ret_status == SFU_SUCCESS)
-  {
-    /* Always execute a security/safety check before moving to the next state */
-    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
-    {
-      /*
-       * Except for the 1st state, used to check the last saved execution status,
-       * let's save the current Execution Status in order to be retrieved and analyzed
-       * in case a reboot will be triggered by an error, bug, power-off, Hw reset, etc.
-       */
-      if (m_StateMachineContext.CurrState != SFU_STATE_CHECK_STATUS_ON_RESET)
-      {
-        (void) SFU_BOOT_SetLastExecStatus(EXEC_ID_SECURE_BOOT, (uint8_t)m_StateMachineContext.CurrState);
-      }
-
-      /* Get the right StateMachine function according to the current state */
-      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
-
-      /* Call the State Machine function associated to the current state */
-      fnStateMachineFunction();
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  /* If the State Machine cannot evolve anymore, reboot is the only option */
-
-  /* Set the error before forcing a reboot */
-  (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_UNKNOWN);
-
-  /* This is the last operation executed. Force a System Reset */
-  SFU_BOOT_ForceReboot();
-
-  return e_ret_status;
-}
-
-/** @brief  Check the Reset status in order to understand the last cause of Reset
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckStatusOnReset(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef         e_se_status;
-  SE_BootInfoTypeDef       x_boot_info;
-  uint32_t                 u_last_exec_status;
-
-  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
-
-  /* First of all, locally get the last execution status we'll work on, before setting the new state */
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    u_last_exec_status = x_boot_info.LastExecStatus;
-    /*
-     * Try to save here the current Execution Status in order to be retrieved and analyzed in case a reboot will be
-     * triggered by an error, bug, power-off, Hw reset, etc.
-     */
-
-    if (SFU_BOOT_SetLastExecStatus(EXEC_ID_SECURE_BOOT, (uint8_t)m_StateMachineContext.CurrState) == SFU_SUCCESS)
-    {
-      /* Check the wakeup sources */
-      if (SFU_BOOT_ManageResetSources() == SFU_SUCCESS)
-      {
-        /* Check the last execution status and take the opportune actions */
-        if (SFU_BOOT_ManageLastExecStatus(u_last_exec_status) == SFU_SUCCESS)
-        {
-          if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-          {
-            e_ret_status = SFU_SUCCESS;
-          } /* else SE_INFO_ReadBootInfo fails: go forward as we end up with a critical failure anyway */
-        } /* else SFU_BOOT_ManageLastExecStatus fails: go forward as we end up with a critical failure anyway */
-      } /* else SFU_BOOT_ManageResetSources fails: go forward as we end up with a critical failure anyway */
-    } /* else SFU_BOOT_SetLastExecStatus fails: go forward as we end up with a critical failure anyway */
-  } /* else SE_INFO_ReadBootInfo fails: go forward as we end up with a critical failure anyway */
-
-  /* RCC access done to identify the wakeup sources, we can switch to unpriviledged */
-  SFU_MPU_EnterUnprivilegedMode();
-#ifdef SFU_TEST_PROTECTION
-  /*
-   * All protections are installed and the correct execution mode is set (unprivileged).
-   * This is the good time to run the auto-tests.
-   */
-  SFU_TEST_Init();
-#endif /* SFU_TEST_PROTECTION */
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-  /* When the local loader feature is supported we need to check if a local download is requested */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#else
-#ifdef KMS_ENABLED
-  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#else
-  /* When the local loader feature is disabled go directly to the check of the FW status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_VERIFY_USER_FW_STATUS, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#endif /* KMS_ENABLED */
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-}
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-/**
-  * @brief  Check if a new UserApp firmware is available for downloading.
-  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
-  *         to press the user button to force the local download.
-  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
-  *         (because there is no other action to do).
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckNewFwToDownload(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-#ifdef SECBOOT_BYPASS_MODE_ENABLED
-  if ((*(uint32_t *)LOADER_COM_REGION_RAM_START) == STANDALONE_LOADER_BYPASS_REQ)
-  {
-    TRACE("\r\n= [SBOOT] STATE: Bypass mode - execution standalone loader");
-    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
-
-    /* This is unreachable code (dead code) in principle...
-    At this point we should not be able to reach the following instructions.
-    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
-    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-#endif /* SECBOOT_BYPASS_MODE_ENABLED */
-#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
-
-  if (initialDeviceStatusCheck == 1U)
-  {
-    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
-    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
-    if (0U != BUTTON_PUSHED())
-    {
-      /* Download requested */
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-  else
-  {
-    /*
-     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
-     * download to start
-     */
-    e_ret_status = SFU_SUCCESS;
-  }
-
-#ifdef KMS_ENABLED
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
-#else
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
-#endif /* KMS_ENABLED */
-
-}
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
-
-#ifdef KMS_ENABLED
-/**
-  * @brief  Check if a KMSBlob is waiting for installation.
-  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
-  *         disabled.
-  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
-  *         enabled.
-  *         In this latter case,
-  *               if a new Firmware download is requested,
-  *               it has priority over the KMS blob installation,
-  *               and the KMS blob installation request will be lost.
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
-
-  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
-  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
-
-  /* Check if a Blob Installation is requested or on-going */
-  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
-
-  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
-  {
-    /* Blob installation requested */
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
-}
-
-/**
-  * @brief  Check if a KMSBlob is waiting for install.
-  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
-  *         to press the user button to force the local download.
-  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
-  *         (because there is no other action to do).
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_InstallKMSBlob(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  uint8_t         *pBlobHdr;
-  uint8_t         *pBlobInFlash;
-  CK_RV           e_status;
-
-  /* At boot-up, Managing ImportBlob through KMS services.  */
-  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
-
-  /* Here we will Launch SE service to take consume the Blob */
-  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
-  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
-  }
-  else
-  {
-    /* Initialize KMS in order to be able to import blob using internal algorithms */
-    e_status = C_Initialize(NULL);
-    if (e_status == CKR_OK)
-    {
-      /* we do not take the return value into account as we will not retry the import in case of issue */
-      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
-
-      if (e_status != CKR_OK)
-      {
-        (void)C_Finalize(NULL);
-      }
-      else
-      {
-        e_status = C_Finalize(NULL);
-      }
-    }
-
-    if (e_status != CKR_OK)
-    {
-      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
-    }
-
-    /* In any case, we remove the Blob To Install (regardless of the result) */
-    e_ret_status = SFU_KMS_EraseBlob();
-
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
-    }
-
-    /* Display the KMS import result */
-    switch (e_status)
-    {
-      case CKR_OK:
-        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
-        e_ret_status = SFU_SUCCESS;
-        break;
-
-      case CKR_SIGNATURE_INVALID:
-        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_DATA_INVALID:
-        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_DEVICE_ERROR:
-        /* At boot-up, NVM Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_OPERATION_ACTIVE:
-        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      default:
-        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
-        e_ret_status = SFU_ERROR;
-        break;
-    }
-  }
-
-  /* Set the next State Machine regardless of the KMS import result */
-  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
-}
-
-#endif /* KMS_ENABLED */
-
-
-/**
-  * @brief  Check the Status of the Fw Image to work on  in order to set the next
-  *         State Machine state accordingly
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckUserFwStatus(void)
-{
-  SFU_IMG_ImgInstallStateTypeDef e_PendingInstallStatus;
-  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
-  uint32_t i;
-
-
-  if (initialDeviceStatusCheck == 1U)
-  {
-    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
-  }
-
-  /* Check if there is a pending action related to a FW update procedure */
-  e_PendingInstallStatus = SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall, &m_ActiveSlotToResume,
-                                                            &m_ActiveSlotToRollback);
-
-  switch (e_PendingInstallStatus)
-  {
-    case SFU_IMG_FWIMAGE_ROLLBACK:
-      /*
-       * The new FW image has not been validated : rollback requested @ next reset
-       * Rollback is done assuming the previous image was backed-up in corresponding dwl slot
-       * As example : new image installed in SLOT_ACTIVE_2. Previous image was backed-up in SLOT_DWL_2
-       */
-      /* Identify corresponding backed-up slot */
-      m_DwlSlotToInstall = m_ActiveSlotToRollback - SLOT_ACTIVE_1 + SLOT_DWL_1;
-      TRACE("\r\n\t  Installation not validated: rollback procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
-            m_ActiveSlotToRollback, m_DwlSlotToInstall);
-      SFU_SET_SM_CURR_STATE(SFU_STATE_ROLLBACK_PREV_USER_FW);
-      break;
-
-    case SFU_IMG_FWUPDATE_STOPPED:
-      /* The installation of a downloaded FW has been interrupted */
-      /* We perform a resume of the installation */
-      TRACE("\r\n\t  Installation Failed: resume installation procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
-            m_ActiveSlotToResume, m_DwlSlotToInstall);
-      SFU_SET_SM_CURR_STATE(SFU_STATE_RESUME_INSTALL_NEW_USER_FW);
-      break;
-
-    case SFU_IMG_FWIMAGE_TO_INSTALL:
-      /*
-       * A new FW is detected in the dwl slot and ready to be installed
-       */
-      TRACE("\r\n\t  New Fw to be installed from slot SLOT_DWL_%d", m_DwlSlotToInstall);
-      SFU_SET_SM_CURR_STATE(SFU_STATE_INSTALL_NEW_USER_FW);
-      break;
-
-    case SFU_IMG_NO_FWUPDATE:
-      /*
-       * No FW image installation pending :
-       *   1- Check if firmwares are detected for C1 and C2 (MASTER_SLOT)
-       *   2- No active firmware candidate for execution ==> Local download
-       *
-       * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
-       */
-      m_C1ActiveSlot = 0U;
-      m_C2ActiveSlot = 0U;
-      m_ActiveSlotToExecute = 0U;
-
-      /* Check if firmwares are detected for C1 and C2 (MASTER_SLOT) */
-      if (MASTER_SLOT == 0xFFU)
-      {
-        TRACE("\r\n\t  No master slot has been defined for C2");
-      }
-      else
-      {
-        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-        {
-          if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
-          {
-            if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-            {
-              if ((SLOT_ACTIVE_1 + i) == MASTER_SLOT)
-              {
-                m_C2ActiveSlot = MASTER_SLOT;
-                TRACE("\r\n\t  A C2 FW is detected in the slot SLOT_ACTIVE_%d", m_C2ActiveSlot);
-              }
-              else
-              {
-                m_C1ActiveSlot = SLOT_ACTIVE_1 + i;
-                TRACE("\r\n\t  A C1 FW is detected in the slot SLOT_ACTIVE_%d", m_C1ActiveSlot);
-              }
-            }
-          }
-        }
-      }
-
-      /* 2- No active firmware candidates for execution ==> Local download */
-      if ((m_C1ActiveSlot != 0U) && (m_C2ActiveSlot != 0U))
-      {
-        m_ActiveSlotToExecute = m_C2ActiveSlot;
-        SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
-      }
-      else
-      {
-        /* Control if all active slot are empty */
-        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-        {
-          if ((m_C1ActiveSlot != (SLOT_ACTIVE_1 + i)) && (m_C2ActiveSlot != (SLOT_ACTIVE_1 + i)))
-          {
-            if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
-            {
-              if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-              {
-                /*
-                 * We should never reach this code.
-                 * Could come from an attack ==> as an example we invalidate current firmware.
-                 */
-                TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
-                (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-              }
-            }
-          }
-        }
-
-        /*
-         * No valid FW is present in the active slot
-         * and there is no FW to be installed in UserApp download area: local download (when possible)
-         */
-        if (1U == initialDeviceStatusCheck)
-        {
-          TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-          /* Waiting for a local download is automatic, no trigger required. */
-          TRACE("\r\n\t  Waiting for the local download to start... ");
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-          initialDeviceStatusCheck = 0U;
-#ifdef SFU_TEST_PROTECTION
-          SFU_TEST_Reset();
-#endif /* SFU_TEST_PROTECTION */
-        }
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        else
-        {
-          /*
-           * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
-           *   If a FW is present in the active slot => it is checked then launched.
-           *   If there is a FW to install => the installation procedure starts.
-           *   If no FW is present and no installation is pending:
-           *      - if the local loader feature is enabled we enter the local download state
-           *      - if the local loader feature is disabled, the execution is stopped.
-           */
-          TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS should not be entered more than once per boot.");
-        }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-        SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
-#else
-        /*
-         * When the local loader feature is disabled it is not possible to enter the local download state.
-         * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
-         * So we end up waiting for the user to reboot (or the IWDG to expire).
-         */
-        TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
-        /* Release CM4 (via SRAM) */
-        *pSbsfuFlag = SBSFU_FW_DOWNLOAD;
-        while (1 == 1)
-        {
-          (void) BSP_LED_Toggle(SFU_STATUS_LED);
-          HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
-        }
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-      }
-      break;
-
-    default:
-      TRACE("\r\n\t  Flash State Unknown, Critical failure");
-      /* If not in one of the previous state, something bad occurred */
-      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-      break;
-  }
-}
-
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-/**
-  * @brief  A new UserApp Fw was available. Start to download it
-  * @param  None
-  * @note   Reset is generated at by standalone loader when FW is downloaded.
-  * @retval None
-  */
-static void SFU_BOOT_SM_DownloadNewUserFw(void)
-{
-  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
-
-  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
-
-  *pSbsfuFlag = SBSFU_FW_DOWNLOAD;
-  while (1 == 1)
-  {
-    (void) BSP_LED_Toggle(SFU_STATUS_LED);
-    HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
-  }
-}
-#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-/**
-  * @brief  A new UserApp Fw was available. Start to download it
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_DownloadNewUserFw(void)
-{
-  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
-  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
-  uint32_t                  dwl_slot;
-  uint32_t                  u_size = 0;
-
-  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
-
-  /*
-   * Download area will be chosen as following. After header analysis :
-   *   - same DWL slot number as SFU magic number, if the slot is configured.
-   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
-   *   - by default : SLOT_DWL_1
-   */
-  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
-          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
-          fw_image_header_validated.PartialFwOffset, u_size);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-    /* Read header in dwl slot */
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
-                                     sizeof(SE_FwRawHeaderTypeDef));
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /*
-     * Notify the Secure Boot that a new image has been downloaded
-     * by calling the SE interface function to trigger the installation procedure at next reboot.
-     */
-    if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
-    {
-      /* Erase downloaded image */
-      (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
-
-      /* no specific error cause set */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-  else
-  {
-    /* Erase downloaded image */
-    (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
-
-    /* Memorize the specific error cause if any before handling this critical failure */
-    switch (e_ret_status_app)
-    {
-      case SFU_LOADER_ERR_COM:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_COM_ERROR);
-        break;
-      case SFU_LOADER_ERR_FW_VERSION:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_INCORRECT_VERSION);
-        break;
-      case SFU_LOADER_ERR_FW_LENGTH:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FW_TOO_BIG);
-        break;
-      case SFU_LOADER_ERR_AUTH_FAILED:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_HEADER_AUTH_FAILED);
-        break;
-      case SFU_LOADER_ERR_FLASH:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-        break;
-      case SFU_LOADER_ERR_CRYPTO:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-        break;
-      default:
-        /* no specific error cause */
-        break;
-    }
-  } /* else error with no specific error cause */
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
-
-/**
-  * @brief  Install the new UserApp Fw
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_InstallNewUserFw(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  TRACE("\r\n= [SBOOT] STATE: INSTALL NEW USER FIRMWARE ");
-  /* Double security check :
-     - testing "static protections" twice will avoid basic hardware attack
-     - flow control reached : dynamic protections checked
-     - re-execute static then dynamic check
-     - errors caught by FLOW_CONTROL ==> infinite loop */
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
-  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_SECOND_CONFIGURATION);
-  }
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    /*
-     * Due to previous flow control, we should never reach this code  :
-     * Critical failure management if installation failed
-     */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-    return;
-  }
-
-  /* Check the candidate version vs current active version */
-  e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
-
-  if (SFU_SUCCESS != e_ret_status)
-  {
-    /* Erase downloaded FW in case of authentication/integrity error */
-    (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
-  }
-
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    /* Launch the Firmware Installation procedure */
-    e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
-  }
-
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    /*
-     * The FW installation succeeded: the previous FW is now backed up in the dwl slot.
-     * Nothing more to do, in the next FSM state we are going to verify the FW again and execute it if possible.
-     */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] FW installation succeeded.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-  else
-  {
-    /*
-     * The FW installation failed: we need to reboot and the resume procedure will be triggered at next boot.
-     * Nothing more to do, the next FSM state (HANDLE_CRITICAL_FAILURE) will deal with it.
-     */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] FW installation failed!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-  /* Installation successful : reboot for next operations on other slots
-       - installation
-       - resume
-       - rollback */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    SFU_BOOT_ForceReboot();
-  }
-  else
-  {
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-}
-
-/**
-  * @brief  Execute a UserApp Fw installation resume
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_ResumeInstallNewUserFw(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  TRACE("\r\n= [SBOOT] STATE: RESUME INSTALLATION OF NEW USER FIRMWARE");
-
-  /*
-   * This resume installation procedure continue installation of new User FW in the active slot
-   */
-  e_ret_status = SFU_IMG_TriggerResumeInstallation(m_ActiveSlotToResume, m_DwlSlotToInstall);
-
-  /* Installation successful : reboot for next operations on other slots
-       - installation
-       - resume
-       - rollback */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    SFU_BOOT_ForceReboot();
-  }
-  else
-  {
-    /* No specific error cause managed here because the FSM state already provides the information. */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-}
-
-/**
-  * @brief  Execute a rollback to the previous UserApp Fw
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void)
-{
-#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  TRACE("\r\n= [SBOOT] STATE: ROLLBACK INSTALLATION TO PREVIOUS USER FIRMWARE");
-
-  /*
-   * Rollack installation to the previous User FW from Dwl_Slot
-   */
-  e_ret_status = SFU_IMG_TriggerRollbackInstallation(m_ActiveSlotToRollback, m_DwlSlotToInstall);
-
-  /* Installation successful : reboot for next operations on other slots
-       - installation
-       - resume
-       - rollback */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    SFU_BOOT_ForceReboot();
-  }
-  else
-  {
-    /* No specific error cause managed here because the FSM state already provides the information. */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-#else
-  TRACE("\r\n= [SBOOT] STATE: ROLLBACK NOT SUPPORTED");
-
-  /* No specific error cause managed here because the FSM state already provides the information. */
-  SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#endif /* ENABLE_IMAGE_STATE_HANDLING && !(SFU_NO_SWAP) */
-}
-
-
-/**
-  * @brief  Verify the UserApp Fw signature before executing it
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_VerifyUserFwSignature(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t u_configured_slot_nb = 0U;
-  uint32_t u_verified_slot_nb = 0U;
-  uint32_t i;
-
-  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
-
-  /* Double security check :
-     - testing "static protections" twice will avoid basic hardware attack
-     - flow control reached : dynamic protections checked
-     - re-execute static then dynamic check
-     - errors caught by FLOW_CONTROL ==> infinite loop */
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
-  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
-  }
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    /*
-     * Due to previous flow control, we should never reach this code  :
-     * Critical failure management if installation failed
-     */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-    return;
-  }
-
-  /*
-   * With the 2 images handling:
-   *       1. the header signature is verified  when installing a new firmware
-   *       2. the firmware signature is checked when installing a new firmware
-   *       3. remaining part of active slot is kept "clean" during installation procedure
-   * So following checks should never fail.
-   */
-  /* Check all active slots configured */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      u_configured_slot_nb ++;
-      /* FW installed ? */
-      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-      {
-        /* Initialize Flow control */
-        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
-
-        /* Check the header signature */
-        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
-        if (SFU_SUCCESS == e_ret_status)
-        {
-          /* Check the FW signature */
-          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
-          if (SFU_SUCCESS == e_ret_status)
-          {
-            /* Verify that there is no additional code beyond firmware image */
-            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
-            if (SFU_SUCCESS != e_ret_status)
-            {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-            }
-            else
-            {
-              u_verified_slot_nb ++;
-            }
-          }
-          else
-          {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          }
-        }
-        else
-        {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-        }
-        /*
-         * One of the checks fails :
-         *  - Header signature
-         *  - FW signature
-         *  - No malicious code
-         *  ==> Active slot should be invalidated
-         */
-        if (SFU_SUCCESS != e_ret_status)
-        {
-          /*
-           * We should never reach this code.
-           * Could come from an attack ==> as an example we invalidate current firmware.
-           */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-        }
-        else
-        {
-          /* Verify if authentication and integrity controls performed */
-          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-        }
-      }
-      else
-      {
-        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /*
-           * We should never reach this code.
-           * Could come from an attack ==> as an example we invalidate current firmware.
-           */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-        }
-      }
-    }
-  }
-
-  /* Check that C1 and C2 firmwares are present */
-  if ( u_configured_slot_nb != u_verified_slot_nb )
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-
-/**
-  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_ExecuteUserFw(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status = SE_KO;
-  uint32_t i;
-
-  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
-
-  /* Reload Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
-  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-
-  /* Double security check for all active slots :
-     - Control twice the Header signature will avoid basic hardware attack
-     - Control twice the FW signature will avoid basic hardware attack */
-
-  /* Check all active slots configured */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      /* FW installed ? */
-      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-      {
-        /* Initialize Flow control */
-        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
-
-        /* Check the header signature */
-        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Security issue : execution stopped ! */
-          SFU_EXCPT_Security_Error();
-        }
-
-        /* Check the FW signature */
-        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Security issue : execution stopped ! */
-          SFU_EXCPT_Security_Error();
-        }
-
-#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
-        /* Move the state to SELFTEST for the new images */
-        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Image state cannot be changed : What to do ?
-             ==> decision to continue execution */
-          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
-        }
-#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
-
-        /* Verify if authentication and integrity controls performed */
-        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-      }
-    }
-  }
-
-  /*
-   * Try to set the last execution status and continue: we assume the UserApp will start or a failure will be linked to
-   * the UserApp code so we can change the EXEC_ID now
-   */
-  e_ret_status = SFU_BOOT_SetLastExecStatus(EXEC_ID_USER_APP, (uint8_t)m_StateMachineContext.CurrState);
-
-  /*
-   * You may decide to implement additional checks before running the Firmware.
-   * For the time being we launch the FW present in the active slot.
-   *
-   * The bootloader must also take care of the security aspects:
-   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
-   *   B.lock the SE services the UserApp is not allowed to call
-   *   C.leave secure boot mode
-   */
-
-  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-
-    /* Lock part of Secure Engine services */
-    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
-    {
-      /* De-initialize the SB_SFU bootloader before launching the UserApp */
-      (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
-
-      /* Last flow control : lock service */
-      FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
-
-      /* This function should not return */
-      e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
-
-      /* This point should not be reached */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      /* We do not memorize any specific error, the FSM state is already providing the info */
-      TRACE("\r\n=         SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      while (1 == 1)
-      {
-        ;    /* wait for watchdog */
-      }
-    }
-    else
-    {
-      TRACE("\r\n= [FWIMG] SECURE ENGINE CRITICAL FAILURE!");
-
-      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_LOCK_SE_SERVICES_ERR);
-
-      /* This is the last operation executed. Force a System Reset */
-      SFU_BOOT_ForceReboot();
-    }
-  }
-  else
-  {
-    TRACE("\r\n= [FWIMG] EXTERNAL FLASH CONFIGURATION FAILURE!");
-
-    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-
-    /* This is the last operation executed. Force a System Reset */
-    SFU_BOOT_ForceReboot();
-  }
-
-  /* This is unreachable code (dead code) in principle...
-  At this point we should not be able to reach the following instructions.
-  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-
-/**
-  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
-  * @param  None
-  * @note   After a Critical Failure a Reboot will be called.
-  * @retval None
-  */
-static void SFU_BOOT_SM_HandleCriticalFailure(void)
-{
-  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
-
-  /* Any Critical Failure will be served and a SystemReset will be triggered */
-  SFU_BOOT_StateExceptionHandler(m_StateMachineContext.PrevState);
-
-  /* It's not possible to continue without compromising the stability or the security of the solution.
-     The State Machine needs to be aborted and a Reset must be triggered */
-  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
-}
-
-/**
-  * @brief  The state machine is aborted and a Reset is triggered
-  * @param  None
-  * @note   You are in this condition because it's not possible to continue without
-            compromising the stability or the security of the solution.
-  * @retval None
-  */
-static void SFU_BOOT_SM_RebootStateMachine(void)
-{
-  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
-
-  /*
-   * In case some clean-up must be done before resetting.
-   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
-   */
-  (void)SFU_BOOT_DeInit();
-
-  /* This is the last operation executed. Force a System Reset */
-  SFU_BOOT_ForceReboot();
-}
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-/**
-  * @brief  Jump into standalone loader
-  * @param  None
-  * @retval None
-  */
-static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
-{
-  /* this function does not return */
-  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, LOADER_REGION_ROM_START);
-
-  /* The point below should NOT be reached */
-  return SFU_SUCCESS;
-}
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-
-/**
-  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
-  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
-  * @param  None
-  * @note   This operation should be done as soon as possible after a reboot.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply Static protections involving Option Bytes */
-  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
-  {
-    /* Apply runtime protections needed to be enabled after each Reset */
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  System security configuration
-  * @param  None
-  * @note   Check and apply the security protections. This has to be done as soon
-  *         as possible after a reset
-  * @retval None
-  */
-static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  /* WARNING: The following CheckApplySecurityProtection function must be called
-     as soon as possible after a Reset in order to be sure the system is secured
-     before starting any other operation. The drawback is that the ErrorManagement
-     is not initialized yet, so in case of failure of this function, there will not be
-     any error stored into the BootInfo or other visible effects.  */
-
-  /* Very few things are already initialized at this stage. Need additional initialization
-     to show a message that is added as below only in Debug/Test mode */
-#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  (void) SFU_COM_Init();
-#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
-
-  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
-  {
-    /* WARNING: This might be generated by an attempted attack or a bug of your code!
-       Add your code here in order to implement a custom action for this event,
-       e.g. trigger a mass erase or take any other action in order to
-       protect your system, or simply discard it if this is expected.
-       ...
-       ...
-    */
-    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
-  }
-  else
-  {
-    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
-  *         a malicious code removing some of the applied security/integrity features.
-  *         The IWDG is also refreshed in this function.
-  * @param  None
-  * @note   This function must be called with a frequency greater than 0.25Hz!
-  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
-  *         So the User App should continue to refresh the IWDG counter.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Refresh the IWDG */
-  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
-
-
-  /* Add your code here for customization:
-     e.g. for additional security or safety periodic check.
-     ...
-     ...
-  */
-  return e_ret_status;
-}
-
-/**
-  * @brief  Set the last execution status. For future customization the parameter
-  *         list can be extended with an additional uint8_t, that at the moment is
-  *         stored with a reserved default value.
-  * @param  uExecID: This parameter can be a value of @ref SFU_BOOT_Private_Defines_Execution_Id
-  * @param  uLastExecState: the last SM state to store into the BootInfo structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SetLastExecStatus(uint8_t uExecID, uint8_t uLastExecState)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef        e_se_status;
-  SE_BootInfoTypeDef      x_boot_info;
-  uint8_t uFwImageIdx = 0U;
-
-  if ((IS_VALID_EXEC_ID(uExecID)) && (IS_SFU_SM_STATE(uLastExecState)))
-  {
-    if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      /* Set the last execution status as a 32-bit data */
-      x_boot_info.LastExecStatus = RESERVED_VALUE
-                                   | ((uint32_t)uLastExecState << 8U)
-                                   | ((uint32_t)uFwImageIdx << 16U)
-                                   | ((uint32_t)uExecID << 24U);
-
-      /* Update the BootInfo shared area according to the modifications above */
-      if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the  the last execution status, and take the right actions accordingly
-  * @param  uLastExecStatus: 32-bit representing the @ref SFU_BOOT_Private_Macros_Execution_Status
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus  SFU_BOOT_ManageLastExecStatus(uint32_t uLastExecStatus)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef         e_se_status;
-  SE_BootInfoTypeDef       x_boot_info;
-  SFU_EXCPT_IdTypeDef      u_last_error;
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    /* Show the last execution state */
-    TRACE("\r\n\t  INFO: Last execution status before Reboot was:");
-    if (IS_SFU_SM_STATE(SFU_GET_LAST_EXEC_STATE(uLastExecStatus)))
-    {
-      TRACE(m_aStateMachineStrings[SFU_GET_LAST_EXEC_STATE(uLastExecStatus)]);
-    }
-    else
-    {
-      TRACE("Unknown");
-    }
-#else
-    UNUSED(uLastExecStatus);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-    /* Show the last execution error */
-    u_last_error = (SFU_EXCPT_IdTypeDef) x_boot_info.LastExecError;
-    TRACE("\r\n\t  INFO: Last execution detected error was: ");
-    if (IS_SFU_EXCPT(u_last_error))
-    {
-      TRACE((char const *)m_aErrorStrings[u_last_error]);
-    }
-    else
-    {
-      TRACE("Unknown error.");
-      u_last_error = SFU_EXCPT_UNKNOWN;
-    }
-
-    /* Custom handler of the last error detected at reset */
-    if ((SFU_EXCPT_IdTypeDef)u_last_error != SFU_EXCPT_NONE)
-    {
-      SFU_EXCPT_ResetExceptionHandler((SFU_EXCPT_IdTypeDef)u_last_error);
-    }
-
-    /*
-     * It's possible to reset the error at this point (because we are in SFU_STATE_CHECK_STATUS_ON_RESET context so no
-     * need to memorize the exception further)
-     */
-    x_boot_info.LastExecError = (uint32_t) SFU_EXCPT_NONE;
-
-    /* Update the BootInfo shared area according to the modifications above */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus  SFU_BOOT_ManageResetSources(void)
-{
-  SFU_ErrorStatus     e_ret_status = SFU_ERROR;
-  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
-  SFU_EXCPT_IdTypeDef e_exception;
-  SE_BootInfoTypeDef  x_boot_info; /* to retrieve and  update the counter of consecutive errors */
-  SE_StatusTypeDef    e_se_status;
-
-  /* Check the wakeup sources */
-  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
-  switch (e_wakeup_source_id)
-  {
-    /*
-     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
-     * RCC_CSR flags can be used to do so.
-     * It is based on the behaviors we consider as normal and abnormal for the SB_SFU and UserApp example projects
-     * running on a Nucleo HW board.
-     * Hence this piece of code must systematically be revisited and tuned for the targeted system (software and
-     * hardware expected behaviors must be assessed to tune this code).
-     *
-     * One may use the "uExecID" parameter to determine if the last exec status was in the SB_SFU context or UserApp
-     * context to implement more clever checks in the reset cause handling below.
-     */
-
-    case SFU_RESET_WDG_RESET:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* This event has to be considered as an error to manage */
-      e_exception = SFU_EXCPT_WATCHDOG_RESET;
-      break;
-
-    case SFU_RESET_LOW_POWER:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_HW_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         This is because a Nucleo board offers a RESET button triggering the HW reset.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_BOR_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_SW_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage,
-         also because a sw reset is generated when the State Machine forces a Reboot.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_OB_LOADER:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage,
-         also because an OptionByte loader is called after applying some of the security protections
-         (see SFU_CheckApplyStaticProtections).
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line.
-         Typically we may implement a more clever check where we determine if this OB reset occurred only once because
-         SB_SFU had to tune the OB initially, or if it occurred again after these initial settings. If so, we could
-         consider it as an attack. */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    default:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-  }
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) != SE_SUCCESS)
-  {
-    /* This is not supposed to occur because ReadBootInfo is already called before SFU_BOOT_ManageResetSources() is
-       entered... */
-    TRACE("\r\n\t  BOOT INFO reading Error");
-    /* Do nothing more and return an error */
-  }
-  else
-  {
-    /* In case an error has been set above, set/overwrite it into the BootInfo */
-    if (e_exception != SFU_EXCPT_NONE)
-    {
-      /* increment number of consecutive boot errors */
-      x_boot_info.ConsecutiveBootOnErrorCounter++;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter ++ ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-    else
-    {
-      /*
-       * The reset cause is considered as normal so we reset the counter of consecutive errors
-       */
-      x_boot_info.ConsecutiveBootOnErrorCounter = 0;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter reset ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-
-    /* Log the consecutive init counter value in the console */
-    TRACE("\r\n\t  Consecutive Boot on error counter = %d ", x_boot_info.ConsecutiveBootOnErrorCounter);
-
-    /* Update BootInfo structure with  consecutive boot counter */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) != SE_SUCCESS)
-    {
-      TRACE("\r\n\t  BOOT INFO Consecutive Boot on error counter writing error ");
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter updated ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* Update the last exec error if needed */
-  if (e_exception != SFU_EXCPT_NONE)
-  {
-    if (SFU_BOOT_SetLastExecError((uint32_t)e_exception) != SFU_SUCCESS)
-    {
-      e_ret_status = SFU_ERROR;
-    } /* else keep the previous e_ret_status value */
-  } /* else: no need to update it */
-
-  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
-  SFU_LL_SECU_ClearResetSources();
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
-  * @param  None
-  * @retval None
-  */
-void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
-{
-  UNUSED(hrtc);
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
-}
-
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC Fault.
-  * @param  None
-  * @retval None
-  */
-void SFU_CALLBACK_GTZC_TZIC(void)
-{
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_GTZC_TZIC_FAULT);
-}
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
deleted file mode 100644
index 5d9f0b2f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_error.c
-  * @author  MCD Application Team
-  * @brief   SFU ERROR
-  *          This file provides set of firmware functions for SB_SFU errors handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-#include "sfu_low_level_security.h"
-#include "sfu_trace.h"
-#include "se_interface_bootloader.h"
-#include "sfu_fwimg_services.h"
-#include "sfu_boot.h"
-#include "sfu_test.h"
-#include "sfu_mpu_isolation.h"
-
-
-/* Private function prototypes -----------------------------------------------*/
-static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Set the last execution error. The state of the FSM that generated the error is stored
-  * @param  uLastExecError: the last error to store into the BootInfo structure.
-  * @note   for product with MPU isolation : e_se_status and x_boot_info parameters are defined as static to avoid to
-  *         be located into SE stack. This function can be called from IT and thus use the SE stack (privilege mode).
-  *         SE callgate will generate a reset if the parameters are not well located.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_BOOT_SetLastExecError(uint32_t uLastExecError)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  static SE_StatusTypeDef   e_se_status;
-  static SE_BootInfoTypeDef x_boot_info;
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    /* Set the last execution status as a 32-bit data */
-    x_boot_info.LastExecError = uLastExecError;
-
-    /* Update the BootInfo shared area according to the modifications above */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Manage the Exception generated by an IRQ
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   Because of the interruption of the State Machine execution,
-  *         it's not possible to continue without compromising the stability or
-  *         the security of the solution. A System Reset is forced at the end.
-  * @retval None
-  */
-void SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  SFU_EXCPT_IdTypeDef exception_id;
-  
-  /* Check the value */
-  exception_id = eExceptionId;
-  if (!IS_SFU_EXCPT(exception_id))
-  {
-    exception_id = SFU_EXCPT_UNKNOWN;
-  }
-
-  /* At this point and according to the detected critical exceptions, the execution
-     itself may be compromised and could not be possible to execute the following instructions.
-     It's worth trying anyway */
-
-  /* Try to take an action */
-  SFU_EXCPT_RuntimeExceptionHandler(exception_id);
-
-  /* Try to store the detected error */
-  (void)SFU_BOOT_SetLastExecError((uint32_t) exception_id);
-
-  /* It's not possible to continue without compromising the stability or the security of the solution.
-  The State Machine needs to be aborted and a Reset must be triggered */
-  SFU_BOOT_ForceReboot();
-}
-
-/**
-  * @brief  Manage the Error generated during the StateMachine execution
-  *
-  *         If a specific error has been logged in the BootInfo area it is used.
-  *         Otherwise, a generic exception is derived from the previous FSM state (minimal info).
-  *         Nevertheless, the max.consecutive boot on error counter has priority over all other errors.
-  * @note   This function is called when processing a critical failure
-  *         (called from @ref SFU_BOOT_SM_HandleCriticalFailure in state @ref SFU_STATE_HANDLE_CRITICAL_FAILURE)
-  * @param  eStateMachineState: This parameter can be a value of @ref SFU_BOOT_State_Machine_Structure_definition
-  * @retval None
-  */
-void SFU_BOOT_StateExceptionHandler(SFU_BOOT_StateMachineTypeDef eStateMachineState)
-{
-  SFU_EXCPT_IdTypeDef eExceptionId;
-  SE_BootInfoTypeDef  x_boot_info; /* to retrieve the counter of consecutive errors */
-  SE_StatusTypeDef    e_se_status;
-  SFU_EXCPT_IdTypeDef u_specific_LastExecError = SFU_EXCPT_NONE;
-
-  /* Check the parameters */
-  assert_param(IS_SFU_SM_STATE(eStateMachineState));
-
-  /*
-   * First we retrieve the specific error set when the error was detected if any.
-   * This gives a chance to set a specific error cause, more detailed than the exceptions computed from the FSM state.
-   */
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    u_specific_LastExecError = (SFU_EXCPT_IdTypeDef) x_boot_info.LastExecError;
-  } /* else keep u_specific_LastExecError as SFU_EXCPT_NONE */
-
-  switch (eStateMachineState)
-  {
-
-    case SFU_STATE_CHECK_STATUS_ON_RESET:
-      eExceptionId = SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR;
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD:
-      eExceptionId = SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR;
-      break;
-
-    case SFU_STATE_DOWNLOAD_NEW_USER_FW:
-      eExceptionId = SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR;
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_STATE_VERIFY_USER_FW_STATUS:
-      eExceptionId = SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR;
-      break;
-
-    case SFU_STATE_INSTALL_NEW_USER_FW:
-      eExceptionId = SFU_EXCPT_INSTALL_NEW_USER_FW_ERR;
-      break;
-
-    case SFU_STATE_VERIFY_USER_FW_SIGNATURE:
-      eExceptionId = SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR;
-      break;
-
-    case SFU_STATE_RESUME_INSTALL_NEW_USER_FW:
-      eExceptionId = SFU_EXCPT_RESUME_INSTALL_NEW_USER_FW_ERR;
-      break;
-
-    case SFU_STATE_EXECUTE_USER_FW:
-      eExceptionId = SFU_EXCPT_EXECUTE_USER_FW_ERR;
-      break;
-
-    default:
-      /* Set an unknown error */
-      eExceptionId = SFU_EXCPT_UNKNOWN;
-      break;
-  }
-
-  if (SFU_EXCPT_NONE != u_specific_LastExecError)
-  {
-    /* The specific error cause set at error detection stage has priority over the exception computed from the FSM
-       state */
-    eExceptionId = u_specific_LastExecError;
-  } /* else go ahead with the exception derived from the FSM state */
-
-  /* Take an immediate action */
-  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
-
-  /* Try to store the error inside the BootInfo structure */
-  (void)SFU_BOOT_SetLastExecError((uint32_t) eExceptionId);
-
-}
-
-/**
-  * @brief  Check exception code among the known list
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-SFU_ErrorStatus SFU_EXCPT_Check_Code(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  switch (eExceptionId)
-  {
-    case SFU_EXCPT_WATCHDOG_RESET :
-      break;
-    case SFU_EXCPT_MEMORY_FAULT :
-      break;
-    case SFU_EXCPT_HARD_FAULT :
-      break;
-    case SFU_EXCPT_TAMPERING_FAULT :
-      break;
-#ifdef SFU_GTZC_PROTECT_ENABLE
-    case SFU_EXCPT_GTZC_TZIC_FAULT :
-      break;
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-    case SFU_EXCPT_CHECK_PROTECTIONS_ERR :
-      break;
-    case SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR :
-      break;
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR :
-      break;
-    case SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR :
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-    case SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR :
-      break;
-    case SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_INSTALL_NEW_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR :
-      break;
-    case SFU_EXCPT_RESUME_INSTALL_NEW_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_EXECUTE_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_LOCK_SE_SERVICES_ERR :
-      break;
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_FW_TOO_BIG :
-      break;
-    case SFU_EXCPT_COM_ERROR :
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-    case SFU_EXCPT_HEADER_AUTH_FAILED :
-      break;
-    case SFU_EXCPT_DECRYPT_FAILURE :
-      break;
-    case SFU_EXCPT_SIGNATURE_FAILURE :
-      break;
-    case SFU_EXCPT_FLASH_ERROR :
-      break;
-    case SFU_EXCPT_FWIMG_MAGIC :
-      break;
-    case SFU_EXCPT_FWIMG_SWAP :
-      break;
-    case SFU_EXCPT_FWIMG_ROLLBACK :
-      break;
-    case SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID :
-      break;
-    case SFU_EXCPT_INCORRECT_VERSION :
-      break;
-    case SFU_EXCPT_UNKNOWN :
-      break;
-    default :
-      break;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Stop in case of security error
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-void SFU_EXCPT_Security_Error(void)
-{
-  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
-  HAL_Delay(1000);
-  /* While(1) by-passed by an fault injection attack ==> Reset */
-  if (0U != SFU_MPU_IsUnprivileged())
-  {
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
-  }
-  else
-  {
-    NVIC_SystemReset();
-  }
-}
-
-/**
-  * @brief  SFU Exception Initialization.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_EXCPT_Init(void)
-{
-  SFU_ErrorStatus e_ret_status;
-
-  /* ADD SRC CODE HERE
-       ...
-  */
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU Exception DeInitialization.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_EXCPT_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status;
-  /* ADD SRC CODE HERE
-      ...
-  */
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the Exception/Errors/Fault at reset,
-  *         after reading the stored values related to the last execution errors/status
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   this function is exported because the reset exceptions are also handled at boot time
-  *         when the last execution status is checked.
-  * @retval None
-  */
-void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-
-  switch (eExceptionId)
-  {
-
-    case SFU_EXCPT_WATCHDOG_RESET:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] WATCHDOG RESET FAULT!");
-      break;
-
-    default:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* As an example all the other errors/exceptions/fault retrieved at reset
-         and related to the previous execution can be managed at the same way of the
-         errors/exceptions/fault detected at runtime: See SFU_EXCPT_RuntimeExceptionHandler
-      */
-      break;
-  }
-}
-
-/**
-  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   A System Reset is forced at the end by the caller of this function.
-  *         WARNING: Be aware that this function can be called by an IRQ while
-  *         using the printf, since the printf is not a reentrant function, and using
-  *         the printf inside this function as well, a fault will likely occur.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  switch (eExceptionId)
-  {
-    case SFU_EXCPT_TAMPERING_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at runt-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TAMPERING FAULT!");
-      break;
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-  case SFU_EXCPT_GTZC_TZIC_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at runt-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TZIC FAULT!");
-      break;
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-    case SFU_EXCPT_MEMORY_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at run-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] MEMORY FAULT!");
-      break;
-
-    case SFU_EXCPT_HARD_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at run-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] HARD FAULT!");
-#ifdef SFU_TEST_PROTECTION
-      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
-         ==> this is not an error */
-#endif /* SFU_TEST_PROTECTION */
-      break;
-
-    case SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-        Add your code here in order to implement a custom action for this event,
-        e.g. trigger a mass erase or take any other action in order to
-        protect your system.
-        ...
-        ...
-      */
-      TRACE("\r\n= [EXCPT] CHECK ON-RESET FAILED!");
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] CHECK FOR NEW FW DOWNLOAD FAILED!");
-      break;
-
-    case SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FW DOWNLOAD FAILED!");
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO CHECK THE FW STATUS. FAILURE!");
-      break;
-
-    case SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] USER FW DECRYPTION FAILED!");
-      break;
-
-    case SFU_EXCPT_INSTALL_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] USER FW INSTALLATION FAILED!");
-      break;
-
-    case SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] USER FW CANNOT BE VERIFIED. FAILURE!");
-      break;
-
-    case SFU_EXCPT_RESUME_INSTALL_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] RESUME INSTALL NEW USER FW CANNOT BE EXECUTED. FAILURE!");
-      break;
-
-    case SFU_EXCPT_EXECUTE_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO EXECUTE THE NEW FW. FAILURE!");
-      break;
-
-    case SFU_EXCPT_UNKNOWN:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] UNKNOWN FAILURE!");
-      break;
-
-    case SFU_EXCPT_LOCK_SE_SERVICES_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] CANNOT CONFIGURE SECURE ENGINE TO RUN THE FIRMWARE!");
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_FW_TOO_BIG:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] BINARY IMAGE TOO BIG TO BE STORED IN DWL SLOT!");
-      break;
-
-    case SFU_EXCPT_COM_ERROR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] COM ERROR DURING DOWNLOAD !");
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_EXCPT_HEADER_AUTH_FAILED:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] HEADER AUTHENTICATION FAILURE!");
-      break;
-
-    case SFU_EXCPT_DECRYPT_FAILURE:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] DECRYPT FAILURE!");
-      break;
-
-    case SFU_EXCPT_SIGNATURE_FAILURE:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FIRMWARE SIGNATURE CHECK FAILED!");
-      break;
-
-    case SFU_EXCPT_FLASH_ERROR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FLASH ERROR!");
-      break;
-
-    case SFU_EXCPT_FWIMG_MAGIC:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] INTERNAL FWIMG ISSUE!");
-      break;
-
-    case SFU_EXCPT_FWIMG_SWAP:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO SWAP IMAGES!");
-      break;
-    case SFU_EXCPT_FWIMG_ROLLBACK:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO ROLLBACK IMAGES!");
-      break;
-    case SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] BACKED-UP IMAGE NOT IDENTIFIED FOR ROLLBACK!");
-      break;
-
-
-    case SFU_EXCPT_INCORRECT_VERSION:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] INSTALLATION CANCELLED: FORBIDDEN VERSION!");
-      break;
-
-    default:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] UNKNOWN FAILURE!");
-      break;
-  }
-
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
deleted file mode 100644
index ed45b79a..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_error.h
-  * @author  MCD Application Team
-  * @brief   This file contains the error handling elements for SB_SFU.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_ERROR_H
-#define SFU_ERROR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * This enum must start from 0.
-  * When adding a new error in the enum below please also:
-  *  1. update IS_SFU_EXCPT
-  *  2. update m_aErrorStrings
-  */
-typedef enum
-{
-  SFU_EXCPT_NONE = 0UL,
-  /* System errors */
-  SFU_EXCPT_WATCHDOG_RESET,
-  SFU_EXCPT_MEMORY_FAULT,
-  SFU_EXCPT_HARD_FAULT,
-  SFU_EXCPT_TAMPERING_FAULT,
-#ifdef SFU_GTZC_PROTECT_ENABLE
-  SFU_EXCPT_GTZC_TZIC_FAULT,
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-  SFU_EXCPT_CHECK_PROTECTIONS_ERR,
-  /* Generic errors derived from the FSM state */
-  SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR,
-  SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR,
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-  SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR,
-  SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR,
-  SFU_EXCPT_INSTALL_NEW_USER_FW_ERR,
-  SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR,
-  SFU_EXCPT_RESUME_INSTALL_NEW_USER_FW_ERR,
-  SFU_EXCPT_EXECUTE_USER_FW_ERR,
-  /* Specific errors */
-  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
-  SFU_EXCPT_COM_ERROR,             /* COM error during the local download of the binary */
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-  SFU_EXCPT_HEADER_AUTH_FAILED,    /* header authentication failure */
-  SFU_EXCPT_DECRYPT_FAILURE,       /* Decrypt failure */
-  SFU_EXCPT_SIGNATURE_FAILURE,     /* Signature check failure */
-  SFU_EXCPT_FLASH_ERROR,           /* Problem with FLASH */
-  SFU_EXCPT_FWIMG_MAGIC,           /* Problem with a FWIMG pattern */
-  SFU_EXCPT_FWIMG_SWAP,            /* Problem while swapping the images */
-  SFU_EXCPT_FWIMG_ROLLBACK,        /* Problem during rollback process */
-  SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID,/* Backed-up firmware not identified */
-  SFU_EXCPT_INCORRECT_VERSION,     /* Anti-rollback check rejected the version to be installed */
-  /* Unknown error */
-  SFU_EXCPT_UNKNOWN
-} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
-
-/* External variables --------------------------------------------------------*/
-#ifdef SFU_DEBUG_MODE
-#if defined (SFU_BOOT_C)
-
-/**
-  *  The following strings associated to the exceptions/errors are used for debugging purpose.
-  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
-  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
-  */
-char *m_aErrorStrings[] =       {  "No error. Success.",
-                                   "Watchdog error.",
-                                   "Memory fault.",
-                                   "Hard fault.",
-                                   "Tampering fault.",
-                                   "Check protections error.",
-                                   "Check status on reset error.",
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-                                   "Check new user fw to download error.",
-                                   "Download new user fw error.",
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-                                   "Verify user fw status error.",
-                                   "Decrypt user fw error.",
-                                   "Install user fw error.",
-                                   "Verify user fw signature.",
-                                   "Resume install new user fw error.",
-                                   "Execute user fw error.",
-                                   "Max. Consecutive Errors reached.",
-                                   "SE lock cannot be set.",
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-                                   "Inconsistent FW size.",
-                                   "FW too big.",
-                                   "YMODEM com failure.",
-                                   "File not correctly received.",
-                                   "Header authentication failed.",
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-                                   "Decrypt failure.",
-                                   "Signature check failure.",
-                                   "Incorrect binary format (not encrypted).",
-                                   "Flash error.",
-                                   "FWIMG pattern issue.",
-                                   "Error while swapping the images in slot #0 and slot #1.",
-                                   "Firmware version rejected by anti-rollback check.",
-                                   "Unknown error."
-                                };
-
-#endif /* SFU_BOOT_C */
-#endif /* SFU_DEBUG_MODE */
-
-/* Exported macros -----------------------------------------------------------*/
-#define IS_SFU_EXCPT(EXCPT)  (SFU_EXCPT_Check_Code((EXCPT)) == SFU_SUCCESS) /*!< Check validity of exception Id */
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_BOOT_SetLastExecError(uint32_t uLastExecError);
-void SFU_BOOT_StateExceptionHandler(SFU_BOOT_StateMachineTypeDef eStateMachineState);
-void SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-SFU_ErrorStatus SFU_EXCPT_Check_Code(SFU_EXCPT_IdTypeDef eExceptionId);
-void SFU_EXCPT_Security_Error(void);
-
-SFU_ErrorStatus SFU_EXCPT_Init(void);
-SFU_ErrorStatus SFU_EXCPT_DeInit(void);
-
-void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_ERROR_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
deleted file mode 100644
index 3c40b4e0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
+++ /dev/null
@@ -1,1184 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_common.c
-  * @author  MCD Application Team
-  * @brief   This file provides set of firmware functions to manage the Firmware Images.
-  *          This file contains the "common" functionalities of the image handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_FWIMG_COMMON_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "main.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "sfu_low_level.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "sfu_interface_crypto_scheme.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_fwimg_services.h"
-#include "sfu_fwimg_internal.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
-
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
-
-/* Global variables ----------------------------------------------------------*/
-/**
-  *  FWIMG status variables used to log errors and display debug messages.
-  *  This is related to FLASH operations.
-  *  This is handled with STATUS_FWIMG.
-  */
-SFU_IMG_StatusTypeDef SFU_IMG_Status;
-uint32_t SFU_IMG_Line;
-
-/**
-  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
-  */
-SE_FwRawHeaderTypeDef fw_image_header_validated;
-
-/**
-  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
-  */
-SE_FwRawHeaderTypeDef fw_image_header_to_test;
-
-/* Functions Definition : helper ---------------------------------------------*/
-/**
-  * @brief  Memory compare with constant time execution.
-  * @note   Objective is to avoid basic attacks based on time execution
-  * @param  pAdd1 Address of the first buffer to compare
-  * @param  pAdd2 Address of the second buffer to compare
-  * @param  Size Size of the comparison
-  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
-  */
-SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
-{
-  uint8_t result = 0x00U;
-  uint32_t i;
-
-  for (i = 0U; i < Size; i++)
-  {
-    result |= pAdd1[i] ^ pAdd2[i];
-  }
-
-  if (result == 0x00U)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-}
-
-
-/**
-  * @brief  Check header signature
-  * @param  pFwImageHeader: pointer to raw header.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef se_status;
-  uint8_t result = 0x00U;
-  uint32_t i;
-
-  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
-  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
-  {
-    /* Unused bytes should be set at 0x00 value
-       Comparison with constant time execution */
-    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
-    {
-      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
-    }
-
-    if (result == 0x00U)
-    {
-      /* Check signature of the FW header */
-      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
-      {
-        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
-  *        It handles Firmware TAG verification of a complete buffer by calling
-  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
-  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
-  *        and at the end compare the obtained TAG with the one provided as input
-  *        in pSE_GMCInit parameter.
-  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
-  * @param pSE_Status: Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param SlotNumber index of the slot in the list
-  * @param pSE_Metadata: Firmware metadata.
-  * @param pSE_Payload: pointer to Payload Buffer descriptor.
-  * @param SE_FwType: Type of Fw Image.
-  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
-                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
-                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
-{
-  SE_ErrorStatus se_ret_status = SE_ERROR;
-  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
-  /* Loop variables */
-  uint32_t i;
-  uint32_t j;
-  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
-  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
-  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
-  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
-  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
-  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(4)));
-  /* FW chunk produced by the verification procedure if any   */
-  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(4)));
-  /* FW chunk provided as input to the verification procedure */
-  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(4)));
-  /* Variables to handle the FW image (this will be split in chunks) */
-  uint32_t payloadsize;
-  uint32_t ppayload;
-  uint32_t scatter_nb;
-  /* Variables to handle FW image size and tag */
-  uint32_t fw_size;
-  uint8_t *fw_tag;
-
-  /* Check the pointers allocation */
-  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
-  {
-    return SFU_ERROR;
-  }
-  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Check the parameters value and set fw_size and fw_tag to check */
-  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
-  {
-    fw_size = pSE_Metadata->FwSize;
-    fw_tag = pSE_Metadata->FwTag;
-  }
-  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
-  {
-    fw_size = pSE_Metadata->PartialFwSize;
-    fw_tag = pSE_Metadata->PartialFwTag;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-   
-  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
-  {
-    return SFU_ERROR;
-  }
-
-  /*  fix number of scatter block */
-  if (pSE_Payload->PayloadSize[1] != 0U)
-  {
-    scatter_nb = 2U;
-  }
-  else
-  {
-    scatter_nb = 1U;
-  }
-
-
-  /* Encryption process*/
-  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
-
-  /* check for initialization errors */
-  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-  {
-    for (j = 0; j < scatter_nb; j++)
-    {
-      payloadsize = pSE_Payload->PayloadSize[j];
-      ppayload = pSE_Payload->pPayload[j];
-      i = 0;
-      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
-
-      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
-             (sfu_ret_status == SFU_SUCCESS))
-      {
-
-        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
-        if (sfu_ret_status == SFU_SUCCESS)
-        {
-          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
-                                                   fw_chunk, (int32_t *)&fw_chunk_size);
-        }
-        else
-        {
-          *pSeStatus = SE_ERR_FLASH_READ;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-        }
-        ppayload += fw_chunk_size;
-        fw_verified_total_size += fw_chunk_size;
-        i++;
-      }
-      /* this the last path , size can be smaller */
-      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
-      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-      {
-        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
-        if (sfu_ret_status == SFU_SUCCESS)
-        {
-
-          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
-                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)), 
-                                                   fw_chunk, (int32_t *)&fw_chunk_size);
-        }
-        else
-        {
-          *pSeStatus = SE_ERR_FLASH_READ;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-        }
-        fw_verified_total_size += fw_chunk_size;
-      }
-    }
-  }
-
-  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-  {
-    if (fw_verified_total_size <= fw_size)
-    {
-      /* Do the Finalization, check the authentication TAG*/
-      fw_tag_len = sizeof(fw_tag_output);
-      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
-
-      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
-      {
-        /* Firmware tag verification */
-        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
-        {
-          *pSeStatus = SE_SIGNATURE_ERR;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-
-          /* Save result for active slot :
-             to avoid single fault attack the signature will be double checked before UserApp execution */
-          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
-          {
-            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
-          }
-        }
-        else
-        {
-          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
-
-          /* Save result for active slot :
-             to avoid single fault attacje the signature will be doble checked before UserApp execution */
-          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
-          {
-            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag, SE_TAG_LEN);
-          }
-        }
-      }
-      else
-      {
-        sfu_ret_status = SFU_ERROR;
-      }
-    }
-    else
-    {
-      sfu_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    sfu_ret_status = SFU_ERROR;
-  }
-  return sfu_ret_status;
-}
-
-/**
-  * @brief Fill authenticated info in SE_FwImage.
-  * @param SFU_APP_Status
-  * @param pBuffer
-  * @param BufferSize
-  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
-{
-  /* Check the pointers allocation */
-  if ((pFwHeader == NULL) || (pBuffer == NULL))
-  {
-    return SFU_ERROR;
-  }
-  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Verify Image Header in the slot given as a parameter
-  * @param  SlotNumber index of the slot in the list
-  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
-  * @note   Not used in Alpha version -
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* use api read to detect possible ECC error */
-  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
-                                   sizeof(SE_FwRawHeaderTypeDef));
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Verify signature */
-    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Verify Fw signature of binary contiguous in flash
-  * @param  pSeStatus pointer giving the SE status result
-  * @param  SlotNumber flash slot to check
-  * @param  pFwImageHeader pointer to fw header
-  * @param  SlotNumber flash slot to check
-  * @param SE_FwType: Type of Fw Image.
-  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
-                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
-                                  uint32_t SE_FwType)
-{
-  SE_Ex_PayloadDescTypeDef  pse_payload;
-  uint32_t fw_size;
-  uint32_t fw_offset;
-
-  /*  put it OK, to discriminate error in SFU FWIMG parts */
-  *pSeStatus = SE_OK;
-
-  /* Check the parameters value */
-  if (pFwImageHeader == NULL)
-  {
-    return SFU_ERROR;
-  }
-  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Check SE_FwType parameter, and fix size and offset accordingly */
-  switch (SE_FwType)
-  {
-    case SE_FW_IMAGE_COMPLETE :
-      fw_size = pFwImageHeader->FwSize;
-      fw_offset = 0U;
-      break;
-    case SE_FW_IMAGE_PARTIAL :
-      fw_size = pFwImageHeader->PartialFwSize;
-#if  !defined(SFU_NO_SWAP)
-      fw_offset = pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
-#else
-      fw_offset = pFwImageHeader->PartialFwOffset;
-#endif /* !SFU_NO_SWAP */
-      break;
-    default :
-      /* error */
-      fw_size = 0U;
-      fw_offset = 0U;   
-      break;      
-  }
-
-  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
-  pse_payload.PayloadSize[0] = fw_size;
-  pse_payload.pPayload[1] = 0U;
-  pse_payload.PayloadSize[1] = 0U;
-
-  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
-}
-
-/**
-  * @brief Verifies the validity of a slot.
-  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
-  * @param pSlotBegin Start address of a slot.
-  * @param uSlotSize Size of a slot.
-  * @param uFwSize Size of the firmware image.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_LL_FLASH_write_t pattern1;
-  SFU_LL_FLASH_write_t pattern2;
-  SFU_LL_FLASH_write_t value;
-  uint32_t pdata;
-  uint32_t fw_size;
-  uint32_t slot_begin;
-
-  /* Set dimension to the appropriate length for FLASH programming.
-   * Example: 64-bit length for L4.
-   */
-  if ((uFwSize % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
-  {
-    fw_size = uFwSize + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (uFwSize % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-  }
-  else
-  {
-    fw_size = uFwSize;
-  }
-
-  /* Clean-up pattern initialization */
-  (void) memset((void *)&pattern1, 0xFF, sizeof(SFU_LL_FLASH_write_t));
-  (void) memset((void *)&pattern2, 0x00, sizeof(SFU_LL_FLASH_write_t));
-
-  /* Clean-up Check operation */
-  slot_begin = (uint32_t) pSlotBegin;
-  for (pdata = slot_begin + SFU_IMG_IMAGE_OFFSET + fw_size; 
-      (pdata < (slot_begin + uSlotSize)) && (e_ret_status == SFU_SUCCESS);
-       pdata += sizeof(SFU_LL_FLASH_write_t))
-  {
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check is already clean */
-      if ((memcmp((void *) &value, (void *) &pattern1, sizeof(SFU_LL_FLASH_write_t)) != 0) &&
-          (memcmp((void *) &value, (void *) &pattern2, sizeof(SFU_LL_FLASH_write_t)) != 0))
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    /* Reload watchdoag every 64Kbytes */
-    if ((pdata % 0x10000U) == 0U)
-    {
-      (void) SFU_LL_SECU_IWDG_Refresh();
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function clean-up the flash
-  * @note   Not designed to clean-up area inside secure engine isolation.
-  * @note   To clean the slot without erasing the header we write "0x00" except if already written
-  * @param  pSlotBegin Start address of a slot.
-  * @param  uSlotSize Size of a slot.
-  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t pdata;
-  uint32_t slot_begin;
-  SFU_LL_FLASH_write_t pattern;
-  SFU_LL_FLASH_write_t value;
-  SFU_FLASH_StatusTypeDef flash_if_info;
-
-  /* Clean-up pattern initialization */
-  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
-
-  /* Cleaning operation */
-  slot_begin = (uint32_t) pSlotBegin;
-  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
-  {
-    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* If read succeed, then the pattern write is performed only if pattern is not already present */
-      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
-      {
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
-                                          sizeof(SFU_LL_FLASH_write_t));
-      }
-    }
-    else
-    {
-      /* If read fail, then the write is performed unconditionally */
-      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
-                                        sizeof(SFU_LL_FLASH_write_t));
-    }
-
-    /* Reload Watchdog every 4Kbytes */
-    if ((pdata % 0x1000U) == 0U)
-    {
-      (void) SFU_LL_SECU_IWDG_Refresh();
-    }
-  }
-  return e_ret_status;
-}
-
-/* Functions Definition : services ------------------------------------------- */
-
-/**
-  * @brief FW Image Handling (FWIMG) initialization function.
-  *        Checks the validity of the settings related to image handling (slots size and alignments...).
-  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
-  *        used...etc...).
-  *        Must be called first (and once) before calling the other Image handling services.
-  * @param  None.
-  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
-  */
-SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
-{
-  uint32_t i;
-  uint32_t mpu_size;
-  uint32_t mpu_max_size;
-  uint32_t mpu_sub_size;
-  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
-#if  !defined(SFU_NO_SWAP)
-  SFU_IMG_InitStatusTypeDef e_swap_ret_status;
-#endif /*(GENERATOR_2_FW_IMAGE) && !(SFU_NO_SWAP) */
-
-  /*
-   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
-   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
-   * starting with 0s.
-   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
-   * side-effects).
-   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
-   */
-  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
-
-  /*
-   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
-      {
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
-              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
-      } /* else active slot is properly aligned */
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if (!IS_ALIGNED(SlotStartAdd[SLOT_DWL_1 + i]))
-      {
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-        TRACE("\r\n= [FWIMG] SLOT_DWL_%d (%x) is not properly aligned\r\n",
-              i + 1U, SlotStartAdd[SLOT_DWL_1 + 1U]);
-      } /* else dwl slot is properly aligned */
-    }
-  }
-
-
-  /*
-   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
-   */
-  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
-  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
-
-  /*
-   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
-   */
-  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
-  } /* else the FW Header Length is fine with regards to FLASH constraints */
-
-  /*
-   * Sanity check: let's make sure the chunks used for decrypt match the FLASH constraints
-   */
-  if (0U != (uint32_t)(SFU_IMG_CHUNK_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The size of the chunks used to store the decrypted data must be a multiple of the FLASH write length */
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] Decrypt chunk size (%d) is not matching the FLASH constraints\r\n", SFU_IMG_CHUNK_SIZE);
-  } /* else the decrypt chunk size is fine with regards to FLASH constraints */
-
-  /*
-   * Sanity check: let's make sure the chunk size used for decrypt is fine with regards to AES CBC constraints.
-   *               This block alignment constraint does not exist for AES GCM but we do not want to specialize the code
-   *               for a specific crypto scheme.
-   */
-  if (0U != (uint32_t)((uint32_t)SFU_IMG_CHUNK_SIZE % (uint32_t)AES_BLOCK_SIZE))
-  {
-    /* For AES CBC block encryption/decryption the chunks must be aligned on the AES block size */
-    e_ret_status = SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] Chunk size (%d) is not matching the AES CBC constraints\r\n", SFU_IMG_CHUNK_SIZE);
-  }
-
-  /*
-   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if(!((((SlotStartAdd[SLOT_ACTIVE_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
-        || (((SlotEndAdd[SLOT_ACTIVE_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
-      {
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-  /*
-   * Sanity check: let's make sure the dwl slot does not overlap SB code area protected by WRP
-   */
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else /* (__GNUC__) */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if(!((((SlotStartAdd[SLOT_DWL_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
-        || (((SlotEndAdd[SLOT_DWL_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
-      {
-        TRACE("\r\n= [FWIMG] SLOT_DWL_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-
-  /*
-   * Sanity check: let's make sure headers are under the MPU protection
-   */
-  /* Calculate size of image header MPU region */
-  mpu_max_size = 2U;
-  for (i = 0U; i < SFU_PROTECT_MPU_HEADER_SIZE; i++)
-  {
-    mpu_max_size = mpu_max_size * 2U;
-  }
-  /* Take into account 8 sub-regions (assuming they are continuous) */
-  mpu_sub_size = mpu_max_size / 8U;
-  mpu_size = 0U;
-  for (i = 0U; i < 8U; i++)
-  {
-    if (((~SFU_PROTECT_MPU_HEADER_SREG) & (0x1U << i)) != 0U)
-    {
-      mpu_size = mpu_size + mpu_sub_size;
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if (!((SlotHeaderAdd[SLOT_ACTIVE_1 + i] >= SFU_PROTECT_MPU_HEADER_START)
-            && ((SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SE_FW_HEADER_TOT_LEN) <=
-                (SFU_PROTECT_MPU_HEADER_START + mpu_size))))
-      {
-        TRACE("\r\n= [FWIMG] Header of SLOT_ACTIVE_%d is not under the MPU protection\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
-   */
-  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
-        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
-  {
-    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-  }
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
-            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
-      {
-        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap dwl slot area
-   */
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      if (!(((SlotStartAdd[SLOT_DWL_1 + i]) > KMS_DATASTORAGE_END)
-            || ((SlotEndAdd[SLOT_DWL_1 + i]) < (KMS_DATASTORAGE_START))))
-      {
-        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_DWL_%d area\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-#if  !defined(SFU_NO_SWAP)
-  /*
-   * Sanity check: specific swap process checks
-   */
-  e_swap_ret_status = SFU_IMG_CheckSwapImageHandling();
-  if (e_swap_ret_status != SFU_IMG_INIT_OK)
-  {
-    e_ret_status = e_swap_ret_status;
-  }
-#endif /* defined(SFU_NO_SWAP) */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief This function makes sure the current active firmware will not be considered as valid any more.
-  *        This function alters the FLASH content.
-  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *       running the procedure).
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Reload Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
-  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief Verifies the validity of the active firmware image metadata.
-  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
-  *       elements have been configured.
-  * @note This function populates the FWIMG module variable: fw_image_header_validated
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
-{
-  /*
-   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
-   */
-  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
-}
-
-/**
-  * @brief Verifies the validity of the active firmware image.
-  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
-  *       elements have been configured.
-  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
-  *       fw_image_header_validated.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status = SE_KO;
-
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (SFU_ERROR == e_ret_status)
-  {
-    /* We do not memorize any specific error, the FSM state is already providing the info */
-    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
-  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
-{
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
-}
-
-/**
-  * @brief Verifies if no malicious code in active slot.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
-{
-  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
-}
-
-/**
-  * @brief  Control firmware signature
-  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
-{
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
-                    SE_TAG_LEN) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  else
-  {
-    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
-    return SFU_SUCCESS;
-  }
-
-}
-
-/**
-  * @brief Launches the user application.
-  *        The caller must be prepared to never get the hand back after calling this function.
-  *        If a problem occurs, it must be memorized in the bootinfo area.
-  *        If the caller gets the hand back then this situation must be handled as a critical error.
-  * @note It is up to the caller to make sure the conditions to call this primitive are met
-  *       (typically: no security check performed before launching the firmware).
-  * @note This function only handles the "system" aspects.
-  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
-  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
-  *       function (as this needs to be done just before jumping into the user application).
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Verify if authentication/integrity/lock SE service performed */
-  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
-
-  /* this function does not return */
-  /* first image identified as master image */
-  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET);
-
-  /* The point below should NOT be reached */
-  return (e_ret_status);
-}
-
-/**
-  * @brief Get the version of the active FW
-  * @note It is up to the caller to make sure the active slot contains a valid active FW.
-  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
-  *       fails.
-  * @param  SlotNumber index of the slot in the list
-  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
-  */
-uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
-{
-  SE_FwRawHeaderTypeDef fw_image_header;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint16_t version = 0;
-
-  /* check the header of the active FW */
-  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* retrieve the version from the header without any further check */
-    version = fw_image_header.FwVersion;
-  }
-
-  return (version);
-}
-
-/**
-  * @brief Detect if a FW is present in a slot.
-  * @note  Detection done based on MAGIC header + FW signature. Header verification
-  *        not done at this stage for timing optimization.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *pbuffer;
-  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
-  SE_FwRawHeaderTypeDef *p_header;
-
-  /* Read header */
-  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
-  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
-  {
-    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
-    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
-    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
-    {
-      /*
-       * Control if the first 32 bytes (could be more but time consuming ...) are significants
-       * At this location we should find the vector table.
-       * Objective is to detect if the FW image has been erased
-       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
-       */
-      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Validate the active FW image in active slot by installing the header
-  * @param  SlotNumber index of the slot in the list
-  * @param  pFwImageHeader pointer in ram to the header to install
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-
-SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-
-  /* Header writing: encrypted part with signature */
-  e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
-                                    SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-
-  /* Header writing : Do not update image state part */
-
-  /* Header writing: previous FW image fingerprint */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
-                                                                 SE_FW_HEADER_FINGERPRINT_LEN),
-                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Get firmware image ID from header.
-  * @param  pFwImageHeader pointer to a structure to handle the header info
-  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
-  */
-uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  uint32_t active_slot;
-
-  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_1;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
-  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_2;
-  }
-#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
-  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_3;
-  }
-#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
-  else
-  {
-    active_slot = SLOT_INACTIVE;
-  }
-
-  return active_slot;
-}
-
-/**
-  * @brief  Check candidate image version is allowed.
-  * @param  CurrentVersion Version of currently installed image if any
-  * @param  CandidateVersion Version of candidate image
-  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint16_t CurrentVersion, uint16_t CandidateVersion)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-
-  /* If the headre of the active firmware is not valid, the CurrentVersion is 0 */
-  if (CurrentVersion == 0U)
-  {
-    /*
-     * If the header of the active firmware is not valide (could comes from an attak atempt, we authorize only the 
-     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
-     */
-     if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
-     {
-       /* Candidate version is allowed */
-       e_ret_status = SFU_SUCCESS;
-     }
-  }
-  else
-  {
-    /*
-     * It is not allowed to install a Firmware with a lower version than the active firmware.
-     * But we authorize the re-installation of the current firmware version.
-     * We also check that the candidate version is at least the min. allowed version for this device.
-     */
-    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
-    {
-      /* Candidate version is allowed */
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief Verifies the validity of the metadata associated to a candidate image.
-  *        The anti-rollback check is performed.
-  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
-  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *       running the procedure):
-  *       SFU_IMG_CheckPendingInstallation should be called first.
-  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
-  *       @ref SFU_APP_VerifyFwHeader.
-  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-
-/* anti-rollback mechanism is tested twice to avoid basic hardware attack
-   ==> compiler optimization is disabled for this reason */
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O0")))
-#endif /* __ICCARM__ */
-
-SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  uint32_t active_slot;
-  uint16_t curVer;
-
-  /*
-   * - Candidate FW Header Authentication
-   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
-   *       As a consequence: fw_image_header_to_test is already populated
-   *
-   * - Check version is allowed
-   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
-   */
-
-  /* Header analysis to find slot based on number with magic tag */
-  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
-
-  /* Get the version of active_slot */
-  curVer = SFU_IMG_GetActiveFwVersion(active_slot);
-
-  if (SFU_IMG_CheckFwVersion(curVer, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
-  {
-    /* The installation is forbidden */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    /* a FW with a lower version cannot be installed */
-    TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
-          fw_image_header_to_test.FwVersion, curVer, SFU_FW_VERSION_START_NUM);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-    /* Memorize this error as this will be handled as a critical failure */
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_INCORRECT_VERSION);
-
-    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-    /* leave now to handle the critical failure in the appropriate FSM state */
-    e_ret_status = SFU_ERROR;
-  }
-  else
-  {
-    /* the anti-rollback check succeeds: the version is fine */
-    /* double check to avoid basic hardware attack attack */
-    e_ret_status = SFU_IMG_CheckFwVersion(curVer, fw_image_header_to_test.FwVersion);
-  }
-
-  /* Return the result */
-  return (e_ret_status);
-}
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
deleted file mode 100644
index 8f731a2f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_internal.h
-  * @author  MCD Application Team
-  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
-  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
-  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
-  *          fw_image_header_to_test to install an KMS blob.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_INTERNAL_H
-#define SFU_FWIMG_INTERNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_fwimg_regions.h"
-#include "kms_blob_metadata.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Payload Buffer descriptor.
-  * This structure describes how a Firmware is split in Flash.
-  * In the nominal case a Firmware is stored in 1 contiguous area.
-  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
-  * decrypt operation).
-  */
-typedef struct
-{
-  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
-  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
-} SE_Ex_PayloadDescTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief SFU_IMG Flash Status Type Definition
-  * Status of a FLASH operation.
-  */
-typedef enum
-{
-  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
-  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
-  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
-  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
-} SFU_IMG_StatusTypeDef;
-
-/**
-  * @brief RAM chunk used for decryption / comparison / swap
-  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
-  * some function allocates 2 buffer of this size in stack.
-  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
-  */
-#define VALID_SIZE (3U*MAGIC_LENGTH)
-#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
-
-#define SFU_IMG_CHUNK_SIZE  (512UL)
-#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
-
-/* Exported macros -----------------------------------------------------------*/
-/**
-  * @brief  Status Macro
-  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
-  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
-  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
-  * activated) and the execution continues.
-  */
-#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
-#define STATUS_FWIMG(B,A) if (B) { \
-                                   SFU_IMG_Status=A; \
-                                   SFU_IMG_Line = __LINE__; \
-                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
-                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
-                                   while(1==1){;} \
-                                 } while(0==1){;}
-#else
-#define STATUS_FWIMG(B,A) if (B) { \
-                                   SFU_IMG_Status=A; \
-                                   SFU_IMG_Line = __LINE__; \
-                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
-                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
-                                 } while(0==1){;}
-#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
-
-/* External variables --------------------------------------------------------*/
-/**
-  *  FWIMG status variables used to log errors and display debug messages.
-  *  This is related to FLASH operations.
-  *  This is handled with STATUS_FWIMG.
-  */
-extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
-extern uint32_t SFU_IMG_Line;
-
-extern SE_FwRawHeaderTypeDef fw_image_header_validated;
-extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
-
-/* Exported functions : helper ---------------------------------------------- */
-SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
-SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
-                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
-                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
-SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
-                          uint8_t  *pPayload, uint32_t SE_FwType);
-SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
-SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
-                                  uint32_t SE_FwType);
-SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
-SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_INTERNAL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c
deleted file mode 100644
index 05b856c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c
+++ /dev/null
@@ -1,914 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_no_swap.c
-  * @author  MCD Application Team
-  * @brief   This file provides set of firmware functions to manage the Firmware Images.
-  *          This file contains the specific functionalities of the image handling for
-  *          the installation process without swap area.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_FWIMG_NO_SWAP_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "main.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "sfu_interface_crypto_scheme.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_fwimg_services.h"
-#include "sfu_fwimg_internal.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-
-
-#if  defined(SFU_NO_SWAP)
-/* Private macros ------------------------------------------------------------*/
-#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH)
-
-/*             DWL_SLOT_REGION_SIZE             */
-/* <------------------------------------------> */
-/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH| */
-/* | header 1     | header 2     |SWAP magic  | */
-
-#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A] + SLOT_SIZE(A) - TRAILER_HEADER))
-#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
-#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
-#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
-
-#endif /* defined(SFU_NO_SWAP) */
-
-/* Functions Definition : helper ---------------------------------------------*/
-#if  defined(SFU_NO_SWAP)
-
-/**
-  * @brief  Write Trailer Headers : TEST + VALID + SWAP
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                          SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  /* everything is in place , just compute from present data and write it */
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_info;
-  uint8_t  magic[MAGIC_LENGTH];
-  uint32_t buffer;
-
-  /* Write Headers VALID + TEST */
-  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
-                                    SE_FW_HEADER_TOT_LEN);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
-                                      SE_FW_HEADER_TOT_LEN);
-  }
-
-  /* Write Magic */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    buffer = (uint32_t) pValidHeader;
-    (void) memcpy(&magic[0U], (uint8_t *) (buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
-    buffer = (uint32_t) pTestHeader;
-    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *) (buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check the magic from trailer or counter
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
-{
-  uint8_t  magic[MAGIC_LENGTH];
-  uint8_t  signature_valid[MAGIC_LENGTH / 2];
-  uint8_t  signature_test[MAGIC_LENGTH / 2];
-  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
-
-  /* Pattern initialization */
-  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
-
-  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
-  if (SFU_LL_FLASH_Read(signature_valid,
-                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
-                        sizeof(signature_valid)) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(signature_test,
-                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
-                        sizeof(signature_test)) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /*
-   * Check magic validity :
-   *  - last 16 bytes of validated header
-   *  - last 16 bytes of test header
-   *  - significant values (not an erased flash pattern)
-   */
-  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
-      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
-      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0))
-  {
-    return SFU_ERROR;
-  }
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  check trailer validity to allow resume installation.
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus  CheckTrailerValid(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                          SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
-  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
-  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN + VALID_SIZE];
-
-  /*
-   *  Initial conditions to be fulfilled :
-   *   - Trailer magic is present
-   *   - Active slot number is correct
-   *   - test header from trailer is signed
-   */
-
-  /* check trailer Magic */
-  e_ret_status = CheckTrailerMagic(DwlSlot);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Populate the pTestHeader and verify it the active slot is correct */
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-  }  
-  
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Populate pTestHeader parameter */
-    e_ret_status= ParseFWInfo(pTestHeader, fw_header_trailer_test);
-  }
-  
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Active slot number correct ?
-       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
-    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
-    {
-      /* Check header test field in trailer is signed */
-      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Read header in active slot if any */
-  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                   sizeof(fw_header_active_slot));
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Verify the header signature in active slot */
-    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
-
-    /* Populate pValidHeader parameter */
-    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Read header valid field in trailer */
-      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
-                                     sizeof(fw_header_trailer_valid));
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-    }
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check if header in active slot is same as header valid in trailer */
-      if (memcmp(fw_header_active_slot, fw_header_trailer_test, sizeof(fw_header_trailer_test)) != 0)
-      {
-        /*
-         * Header in active slot is not identical to header valid field:
-         * Either install is already complete (if header in active slot is same as header test field in trailer),
-         * or there is hack tentative.
-         * In both cases, resume install must not be triggered.
-         */
-        e_ret_status = SFU_ERROR;
-      }
-      else
-      {
-        /* Check candidate image version */
-        e_ret_status = SFU_IMG_CheckFwVersion(pValidHeader->FwVersion, pTestHeader->FwVersion);
-      }
-    }
-    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
-  }
-  else
-  {
-    /*
-     * Header in active slot is not valid.
-     * It is considered this can not be hack attempt, because header in active slot is in
-     * protected area.
-     * Possible reasons:
-     * - Installation has been interrupted during very first image installation (active slot was empty)
-     * - Installation has been interrupted during reconstitution of first sector of active slot
-     * If header test field in trailer is signed and with proper version, we resume install.
-     */
-
-    /* Read header valid field in trailer */
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
-                                     sizeof(fw_header_trailer_valid));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check header valid field in trailer is signed */
-      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
-
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /* active slot was containing an active image */
-
-        /* Populate pValidHeader parameter */
-        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
-
-        if (e_ret_status == SFU_SUCCESS)
-        {
-          /* Check candidate image version */
-          e_ret_status = SFU_IMG_CheckFwVersion(pValidHeader->FwVersion, pTestHeader->FwVersion);
-        }
-      }
-      else
-      {
-        /* active slot was empty : we authorize only the installation of a specific version identified by 
-           SFU_FW_VERSION_INIT_NUM */
-        if (pTestHeader->FwVersion == SFU_FW_VERSION_INIT_NUM)
-        {
-          /* active slot was empty or was containing bricked Fw image */
-          e_ret_status = SFU_SUCCESS;
-        }
-      }
-    }
-
-    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Verify signature on encrypted FW
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus VerifyFwSignatureBeforeDecrypt(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-  SE_ErrorStatus   se_ret_status;
-  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint32_t fw_decrypted_chunk_size;
-#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  uint8_t fw_authenticated_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint32_t fw_authenticated_chunk_size;
-#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
-  uint32_t fw_index;
-  uint32_t size;
-  uint32_t fw_tag_len;
-  uint8_t fw_tag_output[SE_TAG_LEN];
-
-  /* Verify header presence */
-  if ((pFwImageHeader == NULL))
-  {
-    return e_ret_status;
-  }
-
-  /* Decryption process initialization
-     ================================= */
-  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
-  if (se_ret_status == SE_SUCCESS)
-  {
-#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-    se_ret_status = SE_AuthenticateFW_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
-#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
-
-    /* Skip header : no decryption needed */
-    fw_index = SFU_IMG_IMAGE_OFFSET;
-    
-    e_ret_status = SFU_SUCCESS;
-    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
-           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
-    {
-      /* Set size of reading/decryption */
-      size = SFU_IMG_CHUNK_SIZE;
-
-      /* Last pass ? */
-      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
-      {
-        /* Default chunk size can be troncated at end of file */
-        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
-      }
-
-      /* read then decrypt phase
-       ======================= */
-      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        fw_decrypted_chunk_size = size;
-        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
-                                          (int32_t *)&fw_decrypted_chunk_size);
-
-        if (se_ret_status == SE_SUCCESS)
-        {
-#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-          fw_authenticated_chunk_size = sizeof(fw_authenticated_chunk);
-          se_ret_status = SE_AuthenticateFW_Append(&e_se_status, fw_decrypted_chunk, (int32_t)size, fw_authenticated_chunk,
-                                                   (int32_t *)&fw_authenticated_chunk_size);
-#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
-          fw_index += size;
-        }
-      }
-    }
-  }
-
-  /* Do the Finalization, check the authentication TAG
-     ================================================= */
-  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
-  {
-    e_ret_status = SFU_ERROR;
-
-    /* Finalization stage */
-    fw_tag_len = sizeof(fw_tag_output);
-    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
-    if (se_ret_status == SE_SUCCESS)
-    {
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-      e_ret_status = SFU_SUCCESS;
-#else
-      fw_tag_len = sizeof(fw_tag_output);
-      se_ret_status = SE_AuthenticateFW_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
-      if ((se_ret_status == SE_SUCCESS) && (fw_tag_len == SE_TAG_LEN))
-      {
-        /* Firmware tag verification */
-        if (MemoryCompare(fw_tag_output, pFwImageHeader->FwTag, SE_TAG_LEN) == SFU_SUCCESS)
-        {
-          e_ret_status = SFU_SUCCESS;
-        }
-      }
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
-    }
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Decrypt Image from dwl slot to active slot
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus DecryptImageFromDwlSlotToActiveSlot(uint32_t ActiveSlot, uint32_t DwlSlot,
-                                                           SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-  SE_ErrorStatus   se_ret_status;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint32_t fw_index;
-  uint32_t size;
-  uint32_t fw_decrypted_chunk_size;
-  uint32_t fw_tag_len;
-  uint8_t fw_tag_output[SE_TAG_LEN];
-
-  TRACE("\r\n\t  Image preparation done.\r\n\t  Installation started ...");
-  
-  /* Verify header presence */
-  if ((pFwImageHeader == NULL))
-  {
-    return e_ret_status;
-  }
-  
-  /* Control the firwmare size vs slot size */ 
-  if ((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) > SLOT_SIZE(ActiveSlot))
-  {
-    return e_ret_status;
-  }
-  
-  /* Decryption process initialization
-     ================================= */
-  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
-  if (se_ret_status == SE_SUCCESS)
-  {
-
-    /* Erasing operation
-     ================= */
-
-    /*
-     *  The header may not be contiguous with the FW image : 2 erasing operations needed
-     */
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot], SFU_IMG_IMAGE_OFFSET);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
-                                             (uint8_t *)(SlotStartAdd[ActiveSlot] + SFU_IMG_IMAGE_OFFSET),
-                                             SLOT_SIZE(ActiveSlot) - SFU_IMG_IMAGE_OFFSET);
-    }
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-    /*
-     * Save immediately the new active FW header
-     */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_IMG_Validation(ActiveSlot, pFwImageHeader);
-      if (e_ret_status != SFU_SUCCESS)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [FWIMG] Header writing failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-    }
-
-    /* 
-     * Skip header : no decryption needed
-     */
-    fw_index = SFU_IMG_IMAGE_OFFSET;
-
-    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
-           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
-    {
-      /* Refresh Watchdog every 10 iterations */
-      if ((fw_index % 10U) != 0U)
-      {
-        (void) SFU_LL_SECU_IWDG_Refresh();
-      }
-
-      /* Set size of reading/decryption */
-      size = SFU_IMG_CHUNK_SIZE;
-
-      /* Last pass ? */
-      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
-      {
-        /* Default chunk size can be troncated at end of file */
-        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
-      }
-
-      /* read then decrypt phase
-       ======================= */
-      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        fw_decrypted_chunk_size = size;
-        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
-                                          (int32_t *)&fw_decrypted_chunk_size);
-
-        /*
-        * writing phase
-        * =============== */
-        if (se_ret_status == SE_SUCCESS)
-        {
-          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotStartAdd[ActiveSlot] + fw_index),
-                                            fw_decrypted_chunk, size);
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-
-          /* Update pointer */
-          fw_index += size;
-        }
-      }
-    }
-  }
-
-#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_index);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-#endif /* SFU_ENCRYPTED_IMAGE */
-
-  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
-  {
-    /* Do the Finalization, check the authentication TAG*/
-    fw_tag_len = sizeof(fw_tag_output);
-    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
-    if (se_ret_status != SE_SUCCESS)
-    {
-      e_ret_status = SFU_ERROR;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Install the new version
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                         SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef x_flash_info;
-
-  /* Verify FW Image signature in dwl slot */
-  e_ret_status = VerifyFwSignatureBeforeDecrypt(DwlSlot, pTestHeader);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_SIGNATURE_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] The decrypted image is incorrect!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-   * Control if there is no additional code beyond the firmware image (malicious SW)
-   */
-  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot), pTestHeader->FwSize);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Additional code detected beyond FW image!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-   * Write trailer : memorize installation process started
-   */
-  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t) SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Trailer update failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-    
-  /*
-   * Decrypt the FW image : from dwl slot to active slot
-   */
-  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, pTestHeader);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Decryption failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-   * erase downloaded FW after installation
-   */
-  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Dwl slot erasing failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief  Check that there is an Image to Install
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header to be populated
-  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
-  */
-static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
-  uint32_t end_of_test_image;
-
-  /* Verify FW Image Header tag in dwl slot */
-  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* image header in dwl slot not consistent with swap header */
-    end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
-                         SFU_IMG_IMAGE_OFFSET);
-
-    /* Check if there is enough room for the trailers */
-    if (trailer_begin < end_of_test_image)
-    {
-      /*
-       * This error causes is not memorized in the BootInfo area because there won't be any error handling
-       * procedure.
-       * If this function returns that no new firmware can be installed (as this may be a normal case).
-       */
-      e_ret_status = SFU_ERROR;
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      /* Display the debug message(s) only once */
-      if (1U == initialDeviceStatusCheck)
-      {
-        TRACE("\r\n= [FWIMG] The binary image to be installed overlap with the trailer area!");
-      }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-#endif /* (SFU_NO_SWAP) */
-
-
-
-/* Functions Definition : services ------------------------------------------- */
-
-#if  defined(SFU_NO_SWAP)
-/**
-  * @brief Checks if there is a pending firmware installation.
-  *        2 situations can occur:
-  *        A. Pending firmware installation: a firmware is ready to be installed.
-  *        B. No firmware installation pending
-  * @note  The anti-rollback check is not taken into account at this stage.
-  * @note  This function populates the FWIMG module variables: fw_image_header_to_test
-  * @param  pDwlSlotToInstall identification of the downloaded slot to install
-  * @param  pActiveSlotToResume identification of the active slot to resume
-  * @param  pActiveSlotToRollback identification of the active slot to rollback
-  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, no pending action)
-  */
-SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
-                                                                uint32_t *pActiveSlotToResume, \
-                                                                uint32_t *pActiveSlotToRollback)
-{
-  SFU_IMG_ImgInstallStateTypeDef e_ret_state = SFU_IMG_NO_FWUPDATE;
-  uint32_t i;
-  uint32_t j;
-
-  /* No rollback capability in "NO_SWAP" configuration */
-  *pActiveSlotToResume = SLOT_INACTIVE;
-  *pActiveSlotToRollback = SLOT_INACTIVE;
-  *pDwlSlotToInstall = SLOT_INACTIVE;
-
-  /* Check image installation stopped
-     ================================ */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      /* Check trailer valide : installation stopped ?
-         ============================================= */
-      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
-      {
-        /* Slot configured ? */
-        if (SlotStartAdd[SLOT_ACTIVE_1 + j] != 0U)
-        {
-          if (SFU_SUCCESS == CheckTrailerValid(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
-                                               &fw_image_header_to_test))
-          {
-            /* A Firmware Update has been stopped
-             * fw_image_header_to_test & fw_image_header_validated have been populated
-             * Stop at first occurrence : next ones if any will be resumed after reset
-             */
-            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
-            *pDwlSlotToInstall = SLOT_DWL_1 + j;
-            return SFU_IMG_FWUPDATE_STOPPED;
-          }
-        }
-      }
-    }
-  }
-
-  /* Install new firmware if requested
-     ================================= */
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + i, &fw_image_header_to_test))
-      {
-        /*
-         * A Firmware is available for installation:
-         * fw_image_header_to_test has been populated
-         * Stop at first occurrence : next ones if any will be installed after reset
-         */
-        e_ret_state = SFU_IMG_FWIMAGE_TO_INSTALL;
-        *pDwlSlotToInstall = SLOT_DWL_1 + i;
-        break;
-      }
-    }
-  }
-
-  return e_ret_state;
-}
-
-/**
-  * @brief Resume installation : not required but present for compatibility with swap process
-  *        If installation procedure is interrupted (e.g.: switch off) it will be restarted from begin at next reboot.
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS
-  */
-SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef x_flash_info;
- 
-  /*
-   * Decrypt the FW image : from dwl slot to active slot
-   */
-  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, &fw_image_header_to_test);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Decryption failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-  /*
-   * erase downloaded FW after installation
-   */
-  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Dwl slot erasing failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Resume procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Resume procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
-  *        valid if the checks are successful.
-  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
-  *        afterwards if the cryptographic scheme allows this (signature check for instance).
-  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
-  *        This function modifies the FLASH content.
-  *        If this procedure is interrupted (e.g.: switch off) installation will be restarted from begin at next reboot.
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *pbuffer;
-  uint32_t active_slot;
-
-  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
-
-  /*
-   * Check the active slot is big enough
-   */
-  if (fw_image_header_to_test.FwSize + SFU_IMG_IMAGE_OFFSET <= SLOT_SIZE(active_slot))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  /*
-   * Populate fw_image_header_validated
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
-                                     sizeof(fw_image_header_validated));
-  }
-  
-  /*
-   * Installing the new firmware image consists in decrypting the candidate firmware image.
-   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
-  }
-
-  if (SFU_SUCCESS != e_ret_status)
-  {
-    /* Erase downloaded FW in case of installation  error */
-    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Installation procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Installation procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  /* return the installation result */
-  return (e_ret_status);
-}
-#endif /* (SFU_NO_SWAP) */
-
-
-#if   defined(SFU_NO_SWAP)
-/**
-  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
-{
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
-
-  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
-                                             SLOT_SIZE(DwlSlot));
-  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-  return ((e_ret_status_dwl != SFU_SUCCESS) ?  SFU_ERROR : SFU_SUCCESS);
-}
-
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SFU_NO_SWAP) */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
deleted file mode 100644
index 4dff5f1f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_services.h
-  * @author  MCD Application Team
-  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
-  *          API definitions.
-  *          These services can be called by the bootloader to deal with images handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_SERVICES_H
-#define SFU_FWIMG_SERVICES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU_IMG Initialization Status Type Definition
-  */
-typedef enum
-{
-  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
-  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
-  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
-  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
-  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
-  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
-} SFU_IMG_InitStatusTypeDef;
-
-/**
-  * @brief  SFU_IMG Image Installation State Type Definition
-  */
-typedef enum
-{
-  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
-  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
-  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
-  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
-} SFU_IMG_ImgInstallStateTypeDef;
-
-/* Exported functions ------------------------------------------------------- */
-SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
-SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
-SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
-                                                                uint32_t *pActiveSlotToResume, \
-                                                                uint32_t *pActiveSlotToRollback);
-SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
-SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
-SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
-SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber);
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
-uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
-uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
-SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
-uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint16_t CurrentVersion, uint16_t CandidateVersion);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_SERVICES_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c
deleted file mode 100644
index 8cdf7bf2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c
+++ /dev/null
@@ -1,2354 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_swap.c
-  * @author  MCD Application Team
-  * @brief   This file provides set of firmware functions to manage the Firmware Images.
-  *          This file contains the specific functionalities of the image handling for
-  *          the installation process with swap area.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_FWIMG_SWAP_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "main.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "sfu_interface_crypto_scheme.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_fwimg_services.h" /* to have definitions like SFU_IMG_InitStatusTypeDef
-                                   (required by sfu_fwimg_internal.h) */
-#include "sfu_fwimg_internal.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-
-#if  !defined(SFU_NO_SWAP)
-
-/* Private macros ------------------------------------------------------------*/
-#define TRAILER_INDEX(A)  (SLOT_SIZE(A) / SLOT_SIZE(SLOT_SWAP))
-/*  position of image begin on 1st block */
-#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH + MAGIC_LENGTH)
-
-/*                                         DWL_SLOT_REGION_SIZE                                             */
-/* <----------------------------------------------------------------------------------------------------->  */
-/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH|N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t) */
-/* | header 1     | header 2     |SWAP magic  |CLEAN pat.  | N*CPY_TO_ACTIVE_SLOT  | N*CPY_TO_DWL_SLOT      */
-/*                                                                                                          */
-/* Please note that the size of the trailer area (N*CPY_TO_SLOTx) depends directly on SFU_LL_FLASH_write_t type, */
-/* so it can differ from one platform to another (this is FLASH-dependent)                                       */
-#define TRAILER_SIZE(A) ((sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A)))\
-                         + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) + (uint32_t)(TRAILER_HEADER))
-#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A]\
-                                        + SLOT_SIZE(A) - TRAILER_SIZE(A)))
-#define TRAILER_CPY_TO_DWL_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
-                                              + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) \
-                                              + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
-#define TRAILER_CPY_TO_ACTIVE_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
-                                                 + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
-
-#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
-#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
-#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
-#define TRAILER_CLEAN_ADDR(A)((uint8_t *)(TRAILER_BEGIN(A)\
-                                          + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH))
-
-#define CHUNK_1_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
-                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
-#define CHUNK_0_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
-                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
-
-#define CHUNK_0_ADDR_HEADER(A,B,C) ((((B)==0) && ((C)==0))?\
-                                    (uint8_t *)(SlotHeaderAdd[(A)]) : \
-                                    (uint8_t *)(SlotStartAdd[(A)]\
-                                                +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
-
-#define CHUNK_0_ADDR_MODIFIED(A,B,C) ((((B)==0) && ((C)==0))?\
-                                      ((uint8_t*)(SlotStartAdd[(A)] + SFU_IMG_IMAGE_OFFSET)) : \
-                                      ((uint8_t*)(SlotStartAdd[(A)] + (SLOT_SIZE(SLOT_SWAP)*(B)) \
-                                                  + (SFU_IMG_CHUNK_SIZE*(C)))))
-#define CHUNK_SWAP_ADDR(B) ((uint8_t *)(SlotStartAdd[SLOT_SWAP]+(SFU_IMG_CHUNK_SIZE*(B))))
-
-/* Private variables ----------------------------------------------------------*/
-/* Trailer pattern : sizeof of write access type */
-static const int8_t SWAPPED[sizeof(SFU_LL_FLASH_write_t)] __attribute__((aligned(4))) = {0, 0, 0, 0, 0, 0, 0, 0};
-static const int8_t NOT_SWAPPED[sizeof(SFU_LL_FLASH_write_t)] __attribute__((aligned(4))) = {-1, -1, -1, -1, -1, -1,
-                                                                                             -1, -1};
-
-/* Functions Definition : helper ---------------------------------------------*/
-#if defined(ENABLE_IMAGE_STATE_HANDLING)
-/**
-  * @brief  Checks if a rollback is required
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if Image should be rollbacked, a SFU_ERROR  otherwise.
-  */
-static SFU_ErrorStatus FirmwareToRollback(uint32_t SlotNumber, SE_FwStateTypeDef MasterSlotState)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_ErrorStatus e_ret_status_se;
-  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
-  SE_StatusTypeDef e_se_status;
-  SE_FwStateTypeDef e_next_image_state;
-
-
-  /* If an image is detected, read the image state :
-   * if image is new, nothing to do. Switch from NEW to SELFTEST will be done before when launching user application.
-   * if image is selftest, set to invalid. Rollback required.
-   * if image is valid, nothing to do.
-   * if image is invalid, Rollback is required.
-   */
-  if (SFU_SUCCESS == SFU_IMG_DetectFW(SlotNumber))
-  {
-    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
-    if (e_ret_status_se == SE_SUCCESS)
-    {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d state = %d", SlotNumber, image_state);
-#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
-      switch (image_state)
-      {
-        case FWIMG_STATE_NEW:
-        {
-          /* Multiple reset can occur during installation
-           * Switch from NEW to SELFTEST will be done before when launching user application
-           */
-          break;
-        }
-        case FWIMG_STATE_SELFTEST:
-        {
-          if (MasterSlotState == FWIMG_STATE_VALID_ALL)
-          {
-            /* Master slot is in VALID_ALL state, all other images should be validated
-             * Compare to successive validation operations VALID_ALL is a single request thus robust to reset
-             */
-            e_next_image_state = FWIMG_STATE_VALID;
-            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
-            e_ret_status = SFU_ERROR;
-          }
-          else
-          {
-            /* Bootloader should never find an image in SELFTEST state - bootloader
-             * assumes self test was not able to complete and marks image as INVALID
-             */
-            e_next_image_state = FWIMG_STATE_INVALID;
-            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
-            e_ret_status = SFU_SUCCESS;
-          }              
-          break;
-        }
-        case FWIMG_STATE_VALID:
-        case FWIMG_STATE_VALID_ALL:
-        {
-          break;
-        }
-        default:
-        {
-          /* image may be in INVALID state 
-           * Image marked as invalid failed selftest so we need to attempt a rollback to last good image
-           */
-          e_ret_status = SFU_SUCCESS;
-          break;
-        }
-      }
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Updates the finger print of the new firmware the header signature of the previous firmware
-  * @param  pNewHeader: pointer in ram to header of new installed fw
-  * @param  pPrevHeader: pointer in ram to header of backed-up fw
-  * @retval none
-  */
-static void UpdateHeaderFingerPrint(SE_FwRawHeaderTypeDef *pNewHeader, SE_FwRawHeaderTypeDef *pPrevHeader)
-{
-  (void) memcpy(pNewHeader->PrevHeaderFingerprint, pPrevHeader->HeaderSignature, sizeof(pNewHeader->PrevHeaderFingerprint));
-}
-#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
-
-/**
-  * @brief  Check the magic from trailer or counter
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
-{
-  uint8_t  magic[MAGIC_LENGTH];
-  uint8_t  clean[MAGIC_LENGTH];
-  uint8_t  signature_valid[MAGIC_LENGTH / 2];
-  uint8_t  signature_test[MAGIC_LENGTH / 2];
-  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
-
-  /* Pattern initialization */
-  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
-
-  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
-  if (SFU_LL_FLASH_Read(signature_valid,
-                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
-                        sizeof(signature_valid)) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(signature_test,
-                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
-                        sizeof(signature_test)) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(clean, TRAILER_CLEAN_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /*
-   * Check magic validity :
-   *  - last 16 bytes of validated header
-   *  - last 16 bytes of test header
-   *  - significant values (not an erased flash pattern)
-   *
-   *  Check clean tag not set :
-   *  - should be erased flash pattern but not clean-up paatern (0x55 0x55 ...)
-   */
-  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
-      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
-      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0)
-      || (memcmp(clean, erased_flash_pattern, MAGIC_LENGTH) != 0))
-  {
-    return SFU_ERROR;
-  }
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Write the minimum value possible on the flash
-  * @param  pAddr: pointer to address to write .
-  * @param  pValue: pointer to the value to write
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  *
-  * @note This function should be FLASH dependent.
-  *       We abstract this dependency thanks to the type SFU_LL_FLASH_write_t.
-  *       See @ref SFU_LL_FLASH_write_t
-  */
-static SFU_ErrorStatus AtomicWrite(uint8_t *pAddr, SFU_LL_FLASH_write_t *pValue)
-{
-  SFU_FLASH_StatusTypeDef flash_if_info;
-
-  return SFU_LL_FLASH_Write(&flash_if_info, pAddr, (uint8_t *)pValue, sizeof(SFU_LL_FLASH_write_t));
-}
-
-/**
-  * @brief  Clean Magic value
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus CleanMagicValue(uint32_t DwlSlot)
-{
-  SFU_FLASH_StatusTypeDef flash_if_info;
-  uint8_t clean_tag[MAGIC_LENGTH];
-
-  /* set the clean tag into trailer */
-  (void) memset(clean_tag, 0x55, MAGIC_LENGTH);
-  return SFU_LL_FLASH_Write(&flash_if_info, TRAILER_CLEAN_ADDR(DwlSlot), clean_tag, MAGIC_LENGTH);
-}
-
-/**
-  * @brief  Write Trailer Headers : TEST + VALID + SWAP
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                          SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  /* everything is in place , just compute from present data and write it */
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_info;
-  uint8_t  magic[MAGIC_LENGTH];
-  uint32_t buffer;
-
-  /* Write Headers VALID + TEST */
-  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
-                                    SE_FW_HEADER_TOT_LEN);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
-                                      SE_FW_HEADER_TOT_LEN);
-  }
-
-  /* Write Magic */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    buffer = (uint32_t) pValidHeader;
-    (void) memcpy(&magic[0U], (uint8_t *) (buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
-    buffer = (uint32_t) pTestHeader;
-    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *) (buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Erase the size of the swap area in a given slot sector.
-  * @note   The erasure occurs at @: @slot + index*swap_area_size
-  * @param  SlotNumber index of the slot in the list
-  * @param  Index This is the number of "swap size" we jump from the slot start
-  * @retval SFU_ SUCCESS if valid, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus EraseSlotIndex(uint32_t SlotNumber, uint32_t index)
-{
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t buffer;
-
-  buffer = SlotStartAdd[SlotNumber];
-  buffer = buffer + (SLOT_SIZE(SLOT_SWAP) * index);
-
-  /* If this is an active slot and the index is 0 then header is concerned */
-  if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber <= (SLOT_ACTIVE_1 + SFU_NB_MAX_ACTIVE_IMAGE)) && (index == 0U))
-  {
-
-    /*
-     *  As the header may not be contiguous with FW, this action is split in 2 actions :
-     *    - HEADER : executed in secured environment
-     *    - remaining part : done by SBSFU
-     */
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber],
-                                           SFU_IMG_IMAGE_OFFSET) ;
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SlotNumber] +
-                                             SFU_IMG_IMAGE_OFFSET, SLOT_SIZE(SLOT_SWAP) - SFU_IMG_IMAGE_OFFSET);
-    }
-  }
-  else
-  {
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)buffer, SLOT_SIZE(SLOT_SWAP)) ;
-  }
-
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
-  return e_ret_status;
-}
-
-/**
-  * @brief  Verify image signature of binary after decryption
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pSeStatus pointer giving the SE status result
-  * @param  pFwImageHeader pointer to fw header
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus VerifyFwSignatureAfterDecrypt(SE_StatusTypeDef *pSeStatus, uint32_t DwlSlot,
-                                                     SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SE_Ex_PayloadDescTypeDef payload_desc;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t fw_size;
-  uint32_t fw_offset;
-
-  /*
-   * The values below are not necessarily matching the way the firmware
-   * has been spread in FLASH but this is adjusted later on in the this function.
-   */
-  payload_desc.pPayload[0] = SlotStartAdd[SLOT_SWAP];
-  payload_desc.PayloadSize[0] = SLOT_SIZE(SLOT_SWAP);
-  payload_desc.pPayload[1] = SlotStartAdd[DwlSlot];
-  payload_desc.PayloadSize[1] = SLOT_SIZE(DwlSlot);
-
-  fw_size = pFwImageHeader->PartialFwSize;
-  fw_offset = (SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
-              SLOT_SIZE(SLOT_SWAP);
-
-  /*
-   * Adjusting the description of the way the Firmware is written in FLASH.
-   */
-  payload_desc.pPayload[0] = payload_desc.pPayload[0] + fw_offset;
-
-  /* The first part contains the execution offset so the payload size must be adjusted accordingly */
-  payload_desc.PayloadSize[0] = payload_desc.PayloadSize[0] - fw_offset;
-
-  if (fw_size <= payload_desc.PayloadSize[0])
-  {
-    /* The firmware is written fully in a contiguous manner */
-    payload_desc.PayloadSize[0] = fw_size;
-    payload_desc.PayloadSize[1] = 0U;
-    payload_desc.pPayload[1] = 0U;
-  }
-  else
-  {
-    /*
-     * The firmware is too big to be contained in the first payload slot.
-     * So, the firmware is split in 2 non-contiguous parts
-     */
-
-    if ((payload_desc.pPayload[1] == 0U)
-        || (payload_desc.PayloadSize[1] < (fw_size - payload_desc.PayloadSize[0])))
-    {
-      return  e_ret_status;
-    }
-
-    /* The second part contains the end of the firmware so the size is the total size - size already stored in the
-       first area */
-    payload_desc.PayloadSize[1] = fw_size - payload_desc.PayloadSize[0];
-
-  }
-
-  /* Signature Verification */
-  return VerifyFwSignatureScatter(pSeStatus, DwlSlot, pFwImageHeader, &payload_desc, SE_FW_IMAGE_PARTIAL);
-}
-
-
-/**
-  * @brief  Swap active slot with decrypted FW to install
-  *         With the 2 images implementation, installing a new Firmware Image means swapping active slot and dwl slot.
-  *         To perform this swap, the image to be installed is split in blocks of the swap size:
-  *         SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP) blocks to be swapped .
-  *         Each of these blocks is swapped using smaller chunks of SFU_IMG_CHUNK_SIZE size.
-  *         The swap starts from the tail of the image and ends with the beginning of the image ("swap from tail to
-  *         head").
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer in ram to the header to install
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus SwapFirmwareImages(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  SFU_LL_FLASH_write_t trailer;
-  int32_t index_active_slot;
-  int32_t index_dwl_slot_write;
-  int32_t index_dwl_slot_read;
-  int32_t chunk;
-  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  int32_t index_active_slot_partial_begin;
-  int32_t index_active_slot_partial_end;
-  int32_t index_active_slot_final_end;
-  int32_t index_dwl_slot_partial_end;
-  int32_t index_active_slot_empty_begin;
-  /* number_of_index_active_slot is the number of blocks in active slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
-  uint32_t number_of_index_active_slot = SLOT_SIZE(ActiveSlot) / SLOT_SIZE(SLOT_SWAP);
-  /* number_of_index_dwl_slot is the number of blocks in dwl slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
-  uint32_t number_of_index_dwl_slot = SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP);
-  /* number_of_chunk is the number of chunks used to swap 1 block (moving a block of SLOT_SIZE(SLOT_SWAP) bytes
-     split in number_of_chunk chunks of SFU_IMG_CHUNK_SIZE bytes) */
-  uint32_t number_of_chunk = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
-  uint32_t write_len;
-  uint32_t offset_block_partial_begin;
-  uint32_t offset_block_partial_end;
-  uint32_t offset_block_final_end;
-
-  TRACE("\r\n\t  Image preparation done.\r\n\t  Swapping the firmware images");
-
-  /* index_active_slot_partial_begin is the index of first block (of SLOT_SIZE(SLOT_SWAP) bytes) in active slot
-     impacted by partial image */
-  index_active_slot_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) /
-                                    SLOT_SIZE(SLOT_SWAP);
-
-  /* offset_block_partial_begin is the offset of first byte of partial image inside index_active_slot_partial_begin
-     block */
-  offset_block_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) %
-                               SLOT_SIZE(SLOT_SWAP);
-
-  /* In case of COMPLETE update, the full slots are swapped
-     Assumption : DwlSlot is at least greater than ActiveSlot */
-  if ((pFwImageHeader->FwSize == pFwImageHeader->PartialFwSize) && (SLOT_SIZE(DwlSlot) >= SLOT_SIZE(ActiveSlot)))
-  {
-    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       partial image in active slot */
-    index_active_slot_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
-
-    /* offset_block_partial_end is the offset of first byte following partial image, inside
-       index_active_slot_partial_end block */
-    offset_block_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
-
-    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       partial image in dwl slot or swap area */
-    index_dwl_slot_partial_end = ((SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP)) - 1U;
-
-    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following final
-       image in active slot */
-    index_active_slot_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
-
-    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
-       block */
-    offset_block_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
-
-    /* set index_dwl_slot_write: starting from the end */
-    index_dwl_slot_write = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
-
-  }
-  else
-  {
-    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       partial image in active slot */
-    index_active_slot_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
-                                     pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP);
-
-    /* offset_block_partial_end is the offset of first byte following partial image, inside
-       index_active_slot_partial_end block */
-    offset_block_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
-                                pFwImageHeader->PartialFwSize) % SLOT_SIZE(SLOT_SWAP);
-
-    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       partial image in dwl slot or swap area */
-    index_dwl_slot_partial_end = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
-                                                            SLOT_SIZE(SLOT_SWAP))) % SLOT_SIZE(SLOT_SWAP) +
-                                   pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP)) - 1U;
-
-    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       final image in active slot */
-    index_active_slot_final_end = ((SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) / SLOT_SIZE(SLOT_SWAP));
-
-    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
-       block */
-    offset_block_final_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) % SLOT_SIZE(SLOT_SWAP);
-
-    /* set index_dwl_slot_write: starting from the end, block index in dwl slot or swap area to receive block from
-       active slot */
-    if (index_active_slot_partial_end == (number_of_index_active_slot - 1))
-    {
-      /* last block of dwl slot can only receive last block of active slot, due to trailer presence */
-      index_dwl_slot_write = number_of_index_dwl_slot - 1;
-    }
-    else
-    {
-      index_dwl_slot_write = number_of_index_dwl_slot - 2;
-    }
-  }
-
-  /* set index_active_slot: starting from the end, block index from active slot to copy in dwl slot */
-  index_active_slot = index_active_slot_partial_end;
-
-  /* set index_dwl_slot_read: starting from the end, block index in dwl slot or swap area to copy updated image to
-     active slot */
-  index_dwl_slot_read = index_dwl_slot_partial_end;
-
-  /* Adjust indexes in case offset is 0: in this case, first block to swap is the previous one */
-  if (offset_block_partial_end == 0)
-  {
-    index_active_slot--;
-    index_dwl_slot_read--;
-  }
-
-  /*
-   * dwl slot read index should be lower than dwl slot write index.
-   * If not the case, the dwl slot is not big enough to manage this partial firmware image
-   * (depends on offset and size).
-   */
-  if (index_dwl_slot_read >= index_dwl_slot_write)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Swap one block at each loop, until all targeted blocks of active slot have been copied
-   * Concerned blocks are:
-   * 1- block impacted by partial image
-   * 2- first block containing the header
-   */
-  while (index_active_slot >= 0)
-  {
-    /* Reload watchdoag every SWAP size */
-    SFU_LL_SECU_IWDG_Refresh();
-
-    TRACE(".");
-
-    if ((index_dwl_slot_write < -1) || (index_dwl_slot_read < -1))
-    {
-      return SFU_ERROR;
-    }
-
-    /* If CPY_TO_DWL_SLOT(i) is still virgin, then swap the block from active slot to dwl slot */
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
-                                     TRAILER_CPY_TO_DWL_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 - index_active_slot),
-                                     sizeof(trailer));
-    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
-    {
-      /* Erase destination block in dwl slot or swap, if not the trailer block */
-      if (index_dwl_slot_write != (number_of_index_dwl_slot - 1))
-      {
-        if (index_dwl_slot_write == -1)
-        {
-          /* Erase the swap */
-          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
-                                                 SLOT_SIZE(SLOT_SWAP));
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
-        }
-        else /* index_dwl_slot_write >= 0 */
-        {
-          /* erase the size of "swap area" at @: Dwl slot + index_dwl_slot_write*swap_area_size */
-          e_ret_status = EraseSlotIndex(DwlSlot, index_dwl_slot_write);
-        }
-        if (e_ret_status !=  SFU_SUCCESS)
-        {
-          return SFU_ERROR;
-        }
-      }
-
-      /* Copy the block from active slot to dwl slot or swap (using "number_of_chunk" chunks) */
-      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
-      {
-        /* ignore return value,  no double ecc error is expected, area already read before */
-        (void)SFU_LL_FLASH_Read(buffer, CHUNK_0_ADDR_HEADER(ActiveSlot, index_active_slot, chunk), sizeof(buffer));
-        write_len = sizeof(buffer);
-        if (index_dwl_slot_write == -1)
-        {
-          /* Destination block is the swap */
-          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_SWAP_ADDR(chunk), buffer, write_len);
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-          if (e_ret_status != SFU_SUCCESS)
-          {
-            return SFU_ERROR;
-          }
-        }
-        else /* index_dwl_slot_write >= 0 */
-        {
-          /* Destination block is in dwl slot: Do not overwrite the trailer. */
-          if (((uint32_t)CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk)) < (uint32_t)TRAILER_BEGIN(DwlSlot))
-          {
-            /*  write is possible length can be modified  */
-            if ((uint32_t)(CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) + write_len) >
-                (uint32_t)TRAILER_BEGIN(DwlSlot))
-            {
-              write_len = TRAILER_BEGIN(DwlSlot) - CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk);
-            }
-            e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
-                                              buffer, write_len);
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-        }
-      }
-
-      /*
-       * The block of the active firmware has been backed up.
-       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
-       */
-      e_ret_status  = AtomicWrite(TRAILER_CPY_TO_DWL_SLOT(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
-                                  (SFU_LL_FLASH_write_t *) SWAPPED);
-
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-      if (e_ret_status != SFU_SUCCESS)
-      {
-        return e_ret_status;
-      }
-    }
-
-    /* If CPY_TO_ACTIVE_SLOT(i) is still virgin, then swap the block from dwl slot to active slot */
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t*) &trailer,
-                                     TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 -
-                                                                index_active_slot),
-                                     sizeof(trailer));
-    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
-    {
-      /* erase the size of "swap area" at @: active slot + index_active_slot*swap_area_size*/
-      e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
-
-      if (e_ret_status !=  SFU_SUCCESS)
-      {
-        return SFU_ERROR;
-      }
-
-      /*
-       * Fill block in active slot:
-       * The appropriate update image block of dwl slot together with initial image block that has been backed up in
-       * dwl slot,
-       * are associated to constitute final block in active slot (installing the block of the new firmware image).
-       */
-      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
-      {
-        /* Read complete chunk of updated image */
-        if (index_dwl_slot_read == -1)
-        {
-          /* ignore return value, no double ecc error is expected, area already read before */
-          (void)SFU_LL_FLASH_Read(buffer, CHUNK_SWAP_ADDR(chunk), sizeof(buffer));
-        }
-        else /* index_dwl_slot_read >= 0 */
-        {
-          /* ignore return value, no double ecc error is expected, area already read before */
-          (void)SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_read, chunk), sizeof(buffer));
-        }
-
-        /* Last impacted block: end of block has to be updated with initial image */
-        if (index_active_slot == index_active_slot_partial_end)
-        {
-          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
-          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) >= (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
-                                                                                  0) + offset_block_partial_end))
-          {
-            /* check return value, as this area has not been read before */
-            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
-                                             sizeof(buffer));
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-
-          /* If chunk is partially impacted by updated image, end of chunk is updated with the initial image content */
-          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) < (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
-                                                                                  0) + offset_block_partial_end))
-              && ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1))) >
-                  (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_end)))
-          {
-            /* check return value, as this area has not been read before */
-            e_ret_status = SFU_LL_FLASH_Read(buffer + (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
-                                             CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) +
-                                             (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
-                                             sizeof(buffer) - (offset_block_partial_end % SFU_IMG_CHUNK_SIZE));
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-        }
-
-        /* First impacted block: beginning of block has to be updated with initial image */
-        if (index_active_slot == index_active_slot_partial_begin)
-        {
-          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
-          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) <=
-              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin))
-          {
-            /* check return value, as this area has not been read before */
-            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
-                                             sizeof(buffer));
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-
-          /* If chunk is partially impacted by updated image, beginning of chunk is updated with the initial image
-             content */
-          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) <
-               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)) &&
-              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) >
-               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)))
-          {
-            /* check return value, as this area has not been read before */
-            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
-                                             offset_block_partial_begin % SFU_IMG_CHUNK_SIZE);
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-        }
-        /* Header block not impacted by partial image: complete block, except header, is updated with initial image */
-        else if (index_active_slot == 0)
-        {
-          /* check return value, as this area has not been read before */
-          e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk), sizeof(buffer));
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-          if (e_ret_status != SFU_SUCCESS)
-          {
-            return SFU_ERROR;
-          }
-        }
-
-        /* Last block of final image: end of block has to be cleaned with empty data */
-        if (index_active_slot == index_active_slot_final_end)
-        {
-          /* If chunk is completely beyond the final image, then chunk takes empty data */
-          if (CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) >=
-              CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)
-          {
-            memset(buffer, 0xFF, sizeof(buffer));
-          }
-
-          /* If chunk is partially beyond the final image, then chunk is partially updated with empty data */
-          if ((CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) <
-               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)) &&
-              (CHUNK_0_ADDR(ActiveSlot, index_active_slot, (chunk + 1)) >
-               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)))
-          {
-            memset(buffer + (offset_block_final_end % SFU_IMG_CHUNK_SIZE), 0xFF,
-                   sizeof(buffer) - (offset_block_final_end % SFU_IMG_CHUNK_SIZE));
-          }
-        }
-
-        write_len = SFU_IMG_CHUNK_SIZE;
-        /*  don't copy header in active slot
-            this will be done at the end during validation step */
-        if ((index_active_slot == 0) && (chunk == 0))
-        {
-          write_len = write_len - SFU_IMG_IMAGE_OFFSET;
-        }
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_0_ADDR_MODIFIED(ActiveSlot, index_active_slot, chunk),
-                                          buffer, write_len);
-        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-        if (e_ret_status != SFU_SUCCESS)
-        {
-          return SFU_ERROR;
-        }
-      }
-
-      /*
-       * The block of the active firmware has been backed up.
-       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
-       * Except for block 0, because block 0 is incomplete at this stage (final header installation not yet done)
-       */
-      if (index_active_slot != 0)
-      {
-        e_ret_status  = AtomicWrite(TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot,
-                                                               (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
-                                    (SFU_LL_FLASH_write_t *) SWAPPED);
-
-        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-        if (e_ret_status != SFU_SUCCESS)
-        {
-          return e_ret_status;
-        }
-      }
-    }
-
-    /* Decrement all block indexes */
-    index_dwl_slot_write--;
-    index_dwl_slot_read--;
-    index_active_slot--;
-
-    /*
-     * After having copied the impacted image blocks from active slot, copy also the first block
-     * due to header, if not already copied among the impacted image blocks.
-     */
-    if ((index_active_slot < index_active_slot_partial_begin) && (index_active_slot >= 0))
-    {
-      index_active_slot = 0;
-      index_dwl_slot_read = -1;  /* force read from swap area, to avoid exiting dwl slot / swap index allowed range */
-    }
-  }
-
-  /*
-   * Now, erase the blocks in active slot, located after final image
-   */
-  if (offset_block_final_end == 0)
-  {
-    index_active_slot_empty_begin = index_active_slot_final_end;
-  }
-  else
-  {
-    index_active_slot_empty_begin = index_active_slot_final_end + 1;
-  }
-  index_active_slot = number_of_index_active_slot - 1;
-  while (index_active_slot >= index_active_slot_empty_begin)
-  {
-    e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
-    if (e_ret_status !=  SFU_SUCCESS)
-    {
-      return SFU_ERROR;
-    }
-
-    /* Decrement block index */
-    index_active_slot--;
-  }
-
-  return e_ret_status;
-}
-
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-/**
-  * @brief  Executes a rollback to the original firmware if a firmware update fails
-  * @param  ActiveSlot identification of the new active image
-  * @param  DwlSlot identification of previous firmware image (backed-up slot)
-  * @param  pFwImageHeader pointer in ram to the header of the backed-up FW
-  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
-  */
-static SFU_ErrorStatus RollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot,
-                                            SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t number_chunk_per_sector = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  SE_FwRawHeaderTypeDef *p_header;
-  uint32_t size;
-  uint32_t pass_index;
-  uint32_t erase_index;
-  uint32_t fw_source_address;
-  uint32_t fw_dest_write_address;
-  uint32_t fw_dest_erase_address;
-
-  if (number_chunk_per_sector == 0U)
-  {
-    return SFU_ERROR;
-  }
-  
-  size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET;
-  fw_source_address = SlotStartAdd[DwlSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
-  fw_dest_write_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
-  fw_dest_erase_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SLOT_SIZE(SLOT_SWAP)) * SLOT_SIZE(SLOT_SWAP));
-  pass_index = ((size - 1U) / SFU_IMG_CHUNK_SIZE) + 1U;
-  erase_index = (pass_index - 1U) / number_chunk_per_sector * number_chunk_per_sector;
-
-  /* Erase the part of the active slot that will not be updated
-     ========================================================== */
-  size = (SLOT_SIZE(ActiveSlot) - (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)) / SLOT_SIZE(SLOT_SWAP) *
-         SLOT_SIZE(SLOT_SWAP);
-  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)(fw_dest_erase_address + SLOT_SIZE(SLOT_SWAP)),
-                                         size);
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-  while ((e_ret_status == SFU_SUCCESS) && (pass_index > 0U))
-  {
-    /* Reading phase
-       =============== */
-    e_ret_status = SFU_LL_FLASH_Read(buffer, (uint8_t *) fw_source_address, SFU_IMG_CHUNK_SIZE);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-    /* Erasing operation when aligned on erase_index
-       ============================================= */
-
-    /*
-     *  The header may not be contiguous with the FW image : 2 erasing operations needed
-     */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if ((((pass_index - 1U) / number_chunk_per_sector) * number_chunk_per_sector) == erase_index)
-      {
-        (void) SFU_LL_SECU_IWDG_Refresh();
-        size = 0U;
-        if (erase_index == 0U)
-        {
-          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                                 SFU_IMG_IMAGE_OFFSET);
-          size = SFU_IMG_IMAGE_OFFSET;
-        }
-        if (e_ret_status == SFU_SUCCESS)
-        {
-          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) fw_dest_erase_address + size,
-                                                 SLOT_SIZE(SLOT_SWAP) - size);
-        }
-        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-        erase_index -= number_chunk_per_sector;
-        fw_dest_erase_address -= SLOT_SIZE(SLOT_SWAP);
-      }
-    }
-
-    /* Writing phase
-       ============= */
-    /*
-     * Header is under isolated environment protection
-     * Thus the writing operation is split in 2 actions (HEADER + remaining part)
-     */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      size = 0U;
-      if (pass_index == 1U)
-      {
-        /* Ensure there is no Fingerprint in original firmware header
-         * This stops someone attempting multiple rollbacks by writing fake fingerprint in original header
-         */
-        p_header = (SE_FwRawHeaderTypeDef *) buffer;
-        (void) memset(p_header->PrevHeaderFingerprint, 0x00, sizeof(p_header->PrevHeaderFingerprint));
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],  buffer,
-                                          SFU_IMG_IMAGE_OFFSET);
-        size = SFU_IMG_IMAGE_OFFSET;
-      }
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) fw_dest_write_address + size,  buffer + size,
-                                          SFU_IMG_CHUNK_SIZE - size);
-      }
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-    }
-
-    /* Index update
-       ============ */
-    pass_index--;
-    fw_source_address -= SFU_IMG_CHUNK_SIZE;
-    fw_dest_write_address -= SFU_IMG_CHUNK_SIZE;
-  }
-
-  return e_ret_status;
-}
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-
-/**
-  * @brief Decrypt Image in dwl slot
-  * @ note Decrypt is done from dwl slot to dwl slot + swap with 2 images (swap contains 1st sector)
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer in ram to the header to decrypt
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus DecryptImageInDwlSlot(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-  SE_ErrorStatus   se_ret_status;
-  uint32_t NumberOfChunkPerSwap = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  /*  chunk size is the maximum , the 1st block can be smaller */
-  /*  the chunk is static to avoid  large stack */
-  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint32_t fw_source_address = 0U;
-  uint32_t fw_dest_address_write = 0U;
-  uint32_t fw_dest_erase_address = 0U;
-  uint32_t fw_decrypted_total_size = 0U;
-  uint32_t size;
-  uint32_t oldsize;
-  uint32_t fw_decrypted_chunk_size;
-  uint32_t fw_tag_len;
-  uint8_t fw_tag_output[SE_TAG_LEN];
-  uint32_t pass_index = 0U;
-  uint32_t erase_index = 0U;
-
-  if ((pFwImageHeader == NULL))
-  {
-    return e_ret_status;
-  }
-
-  /* Decryption process*/
-  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_PARTIAL);
-  if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK))
-  {
-    e_ret_status = SFU_SUCCESS;
-
-    /* Decryption loop*/
-    while ((e_ret_status == SFU_SUCCESS) && (fw_decrypted_total_size < (pFwImageHeader->PartialFwSize)) &&
-           (e_se_status == SE_OK))
-    {
-      if (pass_index == NumberOfChunkPerSwap)
-      {
-        fw_dest_address_write = SlotStartAdd[DwlSlot];
-        fw_dest_erase_address =  fw_dest_address_write;
-        erase_index = NumberOfChunkPerSwap;
-      }
-      if (pass_index == 0U)
-      {
-        fw_source_address = SlotStartAdd[DwlSlot] + SFU_IMG_IMAGE_OFFSET +
-                                         (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP));
-        fw_dest_erase_address = SlotStartAdd[SLOT_SWAP];
-        fw_dest_address_write = fw_dest_erase_address + ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
-                                                                                  SLOT_SIZE(SLOT_SWAP))) %
-                                                         SLOT_SIZE(SLOT_SWAP));
-        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk) -
-                                  ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
-                                   sizeof(fw_decrypted_chunk));
-        if (fw_decrypted_chunk_size > pFwImageHeader->PartialFwSize)
-        {
-          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize;
-        }
-        pass_index = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)))
-                       % SLOT_SIZE(SLOT_SWAP)) / sizeof(fw_decrypted_chunk));
-      }
-      else
-      {
-        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk);
-
-        /* For the last 2 pass, divide by 2 remaining buffer to ensure that :
-         *     - chunk size greater than 16 bytes : minimum size of a block to be decrypted
-         *     - except last one chunk size is 16 bytes aligned
-         *
-         * Pass n - 1 : remaining bytes / 2 with (16 bytes alignment for crypto AND sizeof(SFU_LL_FLASH_write_t) for
-         *              flash programming)
-         * Pass n : remaining bytes
-         */
-
-        /* Last pass : n */
-        if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < fw_decrypted_chunk_size)
-        {
-          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize - fw_decrypted_total_size;
-        }
-        /* Previous pass : n - 1 */
-        else if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < ((2U * fw_decrypted_chunk_size) - 16U))
-        {
-          fw_decrypted_chunk_size = ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) / 32U) * 16U;
-
-          /* Set dimension to the appropriate length for FLASH programming.
-           * Example: 64-bit length for L4.
-           */
-          if ((fw_decrypted_chunk_size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
-          {
-            fw_decrypted_chunk_size = fw_decrypted_chunk_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
-                                                                 (fw_decrypted_chunk_size %
-                                                                  (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-          }
-        }
-        /* All others pass */
-        else
-        {
-          /* nothing */
-        }
-      }
-
-      size = fw_decrypted_chunk_size;
-
-      /* Decrypt Append*/
-      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *) fw_source_address, size);
-      if (e_ret_status != SFU_SUCCESS)
-      {
-        break;
-      }
-      if (size != 0U)
-      {
-        se_ret_status = SE_Decrypt_Append(&e_se_status, (uint8_t *)fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
-                                          (int32_t *)&fw_decrypted_chunk_size);
-      }
-      else
-      {
-        e_ret_status = SFU_SUCCESS;
-        fw_decrypted_chunk_size = 0U;
-      }
-      if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK) && (fw_decrypted_chunk_size == size))
-      {
-        /* Erase Page */
-        if ((pass_index == erase_index)
-            || (pass_index == ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) /
-                               sizeof(fw_decrypted_chunk))))
-        {
-          (void) SFU_LL_SECU_IWDG_Refresh();
-          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address,
-                                                 SLOT_SIZE(SLOT_SWAP)) ;
-          erase_index += NumberOfChunkPerSwap;
-          fw_dest_erase_address += SLOT_SIZE(SLOT_SWAP);
-        }
-        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-        if (e_ret_status == SFU_SUCCESS)
-        {
-          /*
-           * For last pass with remaining size not aligned on 16 bytes : Set dimension AFTER decrypt to the appropriate
-           * length for FLASH programming.
-           * Example: 64-bit length for L4.
-           */
-          if ((size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
-          {
-            /*
-            * By construction, SFU_IMG_CHUNK_SIZE is a multiple of sizeof(SFU_LL_FLASH_write_t) so there is no risk to
-             * read out of the buffer
-             */
-            oldsize = size;
-            size = size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-            while (oldsize < size)
-            {
-              fw_decrypted_chunk[oldsize] = 0xFF;
-              oldsize++;
-            }
-          }
-
-          /* Write Decrypted Data in Flash - size has to be 32-bit aligned */
-          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)fw_dest_address_write,  fw_decrypted_chunk, size);
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-
-          if (e_ret_status == SFU_SUCCESS)
-          {
-            /* Update flash pointer */
-            fw_dest_address_write  += (size);
-
-            /* Update source pointer */
-            fw_source_address += size;
-            fw_decrypted_total_size += size;
-            (void) memset(fw_decrypted_chunk, 0xff, sizeof(fw_decrypted_chunk));
-            pass_index += 1U;
-
-          }
-        }
-      }
-    }
-  }
-
-#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_decrypted_total_size);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-#endif /* SFU_ENCRYPTED_IMAGE */
-
-  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS) && (e_se_status == SE_OK))
-  {
-    /* Do the Finalization, check the authentication TAG*/
-    fw_tag_len = sizeof(fw_tag_output);
-    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
-    if ((se_ret_status != SE_SUCCESS) || (e_se_status != SE_OK))
-    {
-      e_ret_status = SFU_ERROR;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-    else
-    {
-      /* erase the remaining part of the image after shifting inside dwl slot */
-      if (pass_index <= NumberOfChunkPerSwap)
-      {
-        fw_dest_erase_address = SlotStartAdd[DwlSlot];
-      }
-      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address, SLOT_SIZE(SLOT_SWAP));
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-    }
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  check trailer validity to allow resume installation.
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus  CheckTrailerValid(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                          SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
-  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
-  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN + VALID_SIZE];
-
-  /*
-   *  Initial conditions to be fulfilled :
-   *   - Trailer magic is present
-   *   - Active slot number is correct
-   *   - test header from trailer is signed
-   */
-
-  /* check trailer Magic */
-  e_ret_status = CheckTrailerMagic(DwlSlot);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Populate the pTestHeader and verify it the active slot is correct */
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-  }  
-  
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Populate pTestHeader parameter */
-    e_ret_status= ParseFWInfo(pTestHeader, fw_header_trailer_test);
-  }
-  
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Active slot number correct ?
-       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
-    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
-    {
-      /* Check header test field in trailer is signed */
-      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Read header in active slot if any */
-  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                   sizeof(fw_header_active_slot));
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Verify the header signature in active slot */
-    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
-
-    /* Populate pValidHeader parameter */
-    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Read header valid field in trailer */
-      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
-                                     sizeof(fw_header_trailer_valid));
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-    }
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check if header in active slot is same as header valid in trailer */
-      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, sizeof(fw_header_trailer_valid)) != 0)
-      {
-        /*
-         * Header in active slot is not identical to header valid field:
-         * Either install is already complete (if header in active slot is same as header test field in trailer),
-         * or there is hack tentative.
-         * In both cases, resume install must not be triggered.
-         */
-        e_ret_status = SFU_ERROR;
-      }
-      else
-      {
-        /* Check candidate image version */
-        e_ret_status = SFU_IMG_CheckFwVersion(pValidHeader->FwVersion, pTestHeader->FwVersion);
-      }
-    }
-    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
-  }
-  else
-  {
-    /*
-     * Header in active slot is not valid.
-     * It is considered this can not be hack attempt, because header in active slot is in
-     * protected area.
-     * Possible reasons:
-     * - Swap has been interrupted during very first image installation (active slot was empty)
-     * - Swap has been interrupted during reconstitution of first sector of active slot
-     * If header test field in trailer is signed and with proper version, we resume install.
-     */
-
-    /* Read header valid field in trailer */
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
-                                     sizeof(fw_header_trailer_valid));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check header valid field in trailer is signed */
-      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
-
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /* active slot was containing an active image */
-
-        /* Populate pValidHeader parameter */
-        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
-
-        if (e_ret_status == SFU_SUCCESS)
-        {
-          /* Check candidate image version */
-          e_ret_status = SFU_IMG_CheckFwVersion(pValidHeader->FwVersion, pTestHeader->FwVersion);
-        }
-      }
-      else
-      {
-        /* active slot was empty or was containing bricked Fw image */
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-
-    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
-  }
-
-  return e_ret_status;
-}
-
-
-#if defined(ENABLE_IMAGE_STATE_HANDLING)
-/**
-  * @brief  Check that there is an Image to Install
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header to install
-  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
-  */
-static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_ErrorStatus e_ret_status_se;
-  SE_StatusTypeDef e_se_status;
-  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
-  uint32_t end_of_test_image;
-  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
-
-  /*
-    * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
-    * to be able to handle a specific error cause.
-    */
-  /*  check swap header */
-  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, DwlSlot, &image_state);
-    if (e_ret_status_se == SE_SUCCESS)
-    {
-      /* Control the size of image to be installed taking into account trailers */
-      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET);
-
-      if ((image_state != FWIMG_STATE_NEW) || (trailer_begin < end_of_test_image))
-      {
-        /*
-          * These error causes are not memorized in the BootInfo area because there won't be any error handling
-          * procedure.
-          * If this function returns that no new firmware can be installed (as this may be a normal case).
-          */
-        e_ret_status = SFU_ERROR;
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        /* Display the debug message(s) only once */
-        if (1U == initialDeviceStatusCheck)
-        {
-          if (trailer_begin < end_of_test_image)
-          {
-            TRACE("\r\n= [FWIMG] The binary image to be installed overlap with the trailer area!");
-          }
-        }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-  return e_ret_status;
-}
-
-#else
-
-/**
-  * @brief  Check that there is an Image to Install
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header to install
-  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
-  */
-static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *p_header_swap;
-  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN + VALID_SIZE]; /* header + VALID tags */
-  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
-  uint32_t end_of_test_image;
-  int32_t ret;
-  /*
-     * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
-     * to be able to handle a specific error cause.
-     */
-
-  /*  check swap header */
-  e_ret_status = CheckAndGetFWHeader(SLOT_SWAP, pFwImageHeader);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /*  compare the header in dwl slot with the header in swap */
-    p_header_swap = (uint8_t *) pFwImageHeader;
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
-                                     sizeof(fw_header_dwl_slot));
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* image header in dwl slot not consistent with swap header */
-      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
-                           SFU_IMG_IMAGE_OFFSET);
-
-      /* the header in swap must be the same as the header in dwl slot */
-      ret = memcmp(fw_header_dwl_slot, p_header_swap, SE_FW_HEADER_TOT_LEN);
-
-      /* Check if there is enough room for the trailers */
-      if ((trailer_begin < end_of_test_image) || (ret != 0))
-      {
-        /*
-          * These error causes are not memorized in the BootInfo area because there won't be any error handling
-          * procedure.
-          * If this function returns that no new firmware can be installed (as this may be a normal case).
-          */
-        e_ret_status = SFU_ERROR;
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        /* Display the debug message(s) only once */
-        if (1U == initialDeviceStatusCheck)
-        {
-          if (trailer_begin < end_of_test_image)
-          {
-            TRACE("\r\n= [FWIMG] The binary image to be installed overlap with the trailer area!");
-          } /* check next error cause */
-
-          if (SFU_SUCCESS == e_ret_status)
-          {
-            TRACE("\r\n= [FWIMG] The binary image to be installed is already tagged as VALID!");
-          } /* check next error cause */
-
-          if (ret != 0)
-          {
-            TRACE("\r\n= [FWIMG] The headers in dwl slot and swap area do not match!");
-          } /* no more error cause to check */
-        } /* else do not print the message(s) again */
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-  }
-  return e_ret_status;
-}
-#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
-
-
-/**
-  * @brief Prepares the Candidate FW image for Installation.
-  *        This stage depends on the supported features: in this example this consists in decrypting the candidate
-  *        image.
-  * @note Even if the Firmware Image is in clear format the decrypt function is called.
-  *       But, in this case no decrypt is performed, it is only a set of copy operations
-  *       to organize the Firmware Image in FLASH as expected by the swap procedure.
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header to install
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-static SFU_ErrorStatus PrepareCandidateImageForInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-
-  /*
-    * Control if there is no additional code beyond the firmware image (malicious SW)
-    */
-  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot),
-                            pFwImageHeader->PartialFwSize + (pFwImageHeader->PartialFwOffset %
-                                                             SLOT_SIZE(SLOT_SWAP)));
-
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t) SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Additional code detected beyond FW image!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-    * Pre-condition: all checks have been performed,
-    *                so all FWIMG module variables are populated.
-    * Now we can decrypt in FLASH.
-    *
-    * Initial FLASH state (focus on dwl slot and swap area):
-    *
-    * Depending on partial FW offset, we can have:
-    * <dwl slot>   : {Candidate Image Header + encrypted FW - page k}
-    *                {encrypted FW - page k+1}
-    *                .....
-    *                {encrypted FW - page k+N}
-    *                .....
-    * </dwl slot>
-    * or:
-    * <dwl slot>   : {Candidate Image Header }
-    *                {encrypted FW - page k}
-    *                .....
-    *                {encrypted FW - page k+N}
-    *                .....
-    * </dwl slot>
-    *
-    * <Swap area>  : {Candidate Image Header}
-    * </Swap area>
-    */
-  e_ret_status =  DecryptImageInDwlSlot(DwlSlot, pFwImageHeader);
-
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Decryption failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-    * At this step, the FLASH content looks like this:
-    *
-    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
-    *                {decrypted FW - data from page k+2 in page 1}
-    *                .....
-    *                {decrypted FW - data from page k+N in page N-1}
-    *                {page N is now empty}
-    *                .....
-    * </dwl slot>
-    *
-    * <Swap area>  : {No Header (shift) + decrypted FW data from page k}
-    * </Swap area>
-    *
-    * The Candidate FW image has been decrypted
-    * and a "hole" has been created in dwl slot to be able to swap.
-    */
-
-  e_ret_status = VerifyFwSignatureAfterDecrypt(&e_se_status, DwlSlot, pFwImageHeader);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t) SFU_EXCPT_SIGNATURE_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] The decrypted image is incorrect!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /* Return the result of this preparation */
-  return (e_ret_status);
-}
-
-
-/**
-  * @brief  Install the new version
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                         SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-    * At this step, the FLASH content looks like this:
-    *
-    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
-    *                {decrypted FW - data from page k+2 in page 1}
-    *                .....
-    *                {decrypted FW - data from page k+N in page N-1}
-    *                {page N is now empty}
-    *                .....
-    * </dwl slot>
-    *
-    * <Swap area> : {No Header (shift) + decrypted FW data from page k}
-    * </Swap area>
-    *
-    */
-
-  /* erase "swap area" size at the end of dwl slot */
-  e_ret_status = EraseSlotIndex(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1U));
-  if (e_ret_status !=  SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Trailer erasing failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-  /*
-    * At this step, the FLASH content looks like this:
-    *
-    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
-    *                {decrypted FW - data from page k+2 in page 1}
-    *                .....
-    *                {decrypted FW - data from page k+N in page N-1}
-    *                {page N is now empty}
-    *                .....
-    *                {at least the swap area size at the end of the last page of dwl slot is empty }
-    * </dwl slot>
-    *
-    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
-    * </Swap area>
-    *
-    */
-
-
-  /*  write trailer  */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t) SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Trailer update failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /*
-    * At this step, the FLASH content looks like this:
-    *
-    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
-    *                {decrypted FW - data from page k+2 in page 1}
-    *                .....
-    *                {decrypted FW - data from page k+N in page N-1}
-    *                {page N is now empty}
-    *                .....
-    *                {the last page of dwl slot ends with the trailer magic patterns and the free space for the trailer
-    *                 info}
-    * </dwl slot>
-    *
-    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
-    * </Swap area>
-    *
-    * The trailer magic patterns is ActiveFwHeader|CandidateFwHeader|SWAPmagic.
-    * This is followed by a free space to store the trailer info (N*CPY_TO_ACTIVE_SLOT) and (N*CPY_TO_DWL_SLOT):
-    *
-    *<------------------------------------------ Last page of dwl slot --------------------------------------->
-    * |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH |N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t)
-    * | header 1     | header 2     |SWAP magic  |CLEAN pattern|N*CPY_TO_ACTIVE_SLOT   | N*CPY_TO_DWL_SLOT
-    *
-    */
-
-  /*  swap  */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, pTestHeader);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_SWAP);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Swap process failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-  /* Update fingerprint from previous FW image */
-  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-  /* Validate immediately the new active FW */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = SFU_IMG_Validation(ActiveSlot, pTestHeader);
-    if (SFU_SUCCESS != e_ret_status)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Header validation failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* clear swap pattern */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = CleanMagicValue(DwlSlot);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      /* Memorize the error */
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_MAGIC);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Clean magic tag update failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  return e_ret_status;   /* Leave the function now */
-}
-
-/* Functions Definition : services ------------------------------------------- */
-/**
-  * @brief FW Image Handling (FWIMG) initialization function from swap process.
-  *        Checks the validity of the settings related to image handling (slots size and alignments...).
-  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
-  *        used...etc...).
-  *        Must be called first (and once) before calling the other Image handling services.
-  * @param  None.
-  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
-  */
-SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void)
-{
-  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
-  uint32_t i;
-
-  /*
-   * Sanity check: let's make sure the slot sizes are correct
-   * to avoid discrepancies between linker definitions and constants in sfu_fwimg_regions.h
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP))))
-      {
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d size (%d) must be a multiple of swap size (%d)\r\n",
-              SLOT_ACTIVE_1 + i, SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP));
-        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
-      }
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP))))
-      {
-        TRACE("\r\n= [FWIMG] SLOT_DWL_%d size (%d) must be a multiple of swap size (%d)\r\n",
-              SLOT_DWL_1 + i, SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP));
-        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
-      }
-    }
-  }
-
-  /*
-   * Sanity check: let's make sure the slot size is correct with regards to the swap procedure constraints.
-   * The swap procedure cannot succeed if the trailer info size is bigger than what a chunk used for swapping can carry.
-   */
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      if (((int32_t)(SFU_IMG_CHUNK_SIZE - (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)))) < 0)
-      {
-        e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
-        TRACE("\r\n= [FWIMG] %d bytes required for the swap metadata of SLOT_DWL_%d is too much\r\n",
-              (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)), SLOT_DWL_1 + i);
-      } /* else the swap settings are fine from a metadata size perspective */
-    }
-  }
-
-  /*
-   * Sanity check: let's make sure the swap size is correct with regards to the swap procedure constraints.
-   * The swap size must be a multiple of the chunks size used to do the swap.
-   */
-#if defined(__GNUC__)
-  __IO uint32_t swap_size = SLOT_SIZE(SLOT_SWAP), swap_chunk = SFU_IMG_CHUNK_SIZE;
-  if (0U != ((uint32_t)(swap_size % swap_chunk)))
-#else
-  if (0U != ((uint32_t)(SLOT_SIZE(SLOT_SWAP) % SFU_IMG_CHUNK_SIZE)))
-#endif /* __GNUC__ */
-  {
-    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
-    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the swap size (%d) is not a multiple\r\n",
-          SFU_IMG_CHUNK_SIZE, SLOT_SIZE(SLOT_SWAP));
-  } /* else the swap settings are fine from a chunk size perspective */
-
-  /*
-   * Sanity check: let's make sure the chunks used for the swap procedure are big enough with regards to the offset
-   * giving the start @ of the firmware
-   */
-  if (((int32_t)(SFU_IMG_CHUNK_SIZE - SFU_IMG_IMAGE_OFFSET)) < 0)
-  {
-    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
-    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the firmware start offset is %d bytes\r\n",
-          SFU_IMG_CHUNK_SIZE, SFU_IMG_IMAGE_OFFSET);
-  } /* else the swap settings are fine from a firmware start offset perspective */
-
-  /*
-   * Sanity check: let's make sure SWAP slot is properly aligned with regards to flash constraints
-   */
-
-  if (!IS_ALIGNED(SlotStartAdd[SLOT_SWAP]))
-  {
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] swap (%x) is not properly aligned\r\n",
-          SlotStartAdd[SLOT_SWAP]);
-  } /* else swap is properly aligned */
-
-  /*
-   * Sanity check: let's make sure the swap area does not overlap SB code area protected by WRP)
-   */
-  if(!((((SlotStartAdd[SLOT_SWAP]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
-    || (((SlotEndAdd[SLOT_SWAP] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
-  {
-    TRACE("\r\n= [FWIMG] SWAP overlaps SBSFU code area protected by WRP\r\n");
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-  }
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap Swap area)
-   */
-  if (!(((SlotStartAdd[SLOT_SWAP]) > KMS_DATASTORAGE_END)
-        || ((SlotEndAdd[SLOT_SWAP]) < (KMS_DATASTORAGE_START))))
-  {
-    TRACE("\r\n= [FWIMG] KMS NVM area overlaps Swap area\r\n");
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-  }
-
-  /* FWIMG core initialization completed */
-  return e_ret_status;
-}
-
-
-
-/**
-  * @brief Checks if there is a pending firmware installation.
-  *        3 situations can occur:
-  *        A. Pending firmware installation: a firmware is ready to be installed but the installation has never been
-  *           triggered so far.
-  *        B. Pending firmware installation resume: a firmware installation has been interrupted and a resume procedure
-  *           is required to finalize installation.
-  *        C. No firmware installation pending
-  * @note  The anti-rollback check is not taken into account at this stage.
-  *        But, if the firmware to be installed already carries some metadata (VALID tag) a newly downloaded firmware
-  *        should not have then the installation is not considered as pending.
-  * @note This function populates the FWIMG module variables:
-  *        - case SFU_IMG_FWUPDATE_STOPPED : fw_image_header_to_test & fw_image_header_validated
-  *        - case SFU_IMG_FWIMAGE_TO_INSTALL : fw_image_header_to_test
-  *        - case SFU_IMG_NO_FWUPDATE : none
-  * @param  pDwlSlotToInstall identification of the downloaded slot to install
-  * @param  pActiveSlotToResume identification of the active slot to resume
-  * @param  pActiveSlotToRollback identification of the active slot to rollback
-  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, pending resume install, no
-  *         pending action)
-  */
-SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
-                                                                uint32_t *pActiveSlotToResume, \
-                                                                uint32_t *pActiveSlotToRollback)
-{
-  uint32_t i;
-  uint32_t j;
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-  SE_FwStateTypeDef master_slot_state = FWIMG_STATE_INVALID;
-  SE_StatusTypeDef e_se_status;
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-  /*
-   * The order of the checks is important:
-   *
-   * A. Check if a FW update has been interrupted first.
-   *    This check is based on the content of the trailer area and the validity of the update image.
-   *
-   * B. Check if a Firmware image is waiting to be installed.
-   */
-
-  /* Init values */
-  *pActiveSlotToResume = SLOT_INACTIVE;
-  *pActiveSlotToRollback = SLOT_INACTIVE;
-  *pDwlSlotToInstall = SLOT_INACTIVE;
-  
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-  /* 
-   * Read MASTER_SLOT state (if configured == (!= 255)) :
-   *   In case of VALID_ALL state, all other slots in SELF_TEST should be validated
-   *   Else all other slots in SELF_TEST are invalidated
-   */
-  if (MASTER_SLOT != 0xFFU)
-  {
-    if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
-    {        
-      if (SE_SFU_IMG_GetActiveFwState(&e_se_status, MASTER_SLOT, &master_slot_state) != SE_SUCCESS)
-      {
-        master_slot_state = FWIMG_STATE_INVALID;
-      }
-    }
-  }
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-  /* Check image installation stopped or installation to be done
-     =========================================================== */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-      /* Rollback if seltftest not validated
-         =================================== */
-      if (SFU_SUCCESS == FirmwareToRollback(SLOT_ACTIVE_1 + i, master_slot_state))
-      {
-        /* The firmware state is either FWIMG_STATE_SELFTEST or FWIMG_STATE_INVALID
-         * Rollback is required
-         * Stop at first occurrence : next ones if any will be resumed after reset
-         */
-        *pActiveSlotToRollback = SLOT_ACTIVE_1 + i;
-        return SFU_IMG_FWIMAGE_ROLLBACK;
-      }
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-      /* Check trailer valide : installation stopped ?
-         ============================================= */
-      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
-      {
-        /* Slot configured ? */
-        if (SlotStartAdd[SLOT_ACTIVE_1 + j] != 0U)
-        {
-          if (SFU_SUCCESS == CheckTrailerValid(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
-                                               &fw_image_header_to_test))
-          {
-            /* A Firmware Update has been stopped
-             * fw_image_header_to_test & fw_image_header_validated have been populated
-             * Stop at first occurrence : next ones if any will be resumed after reset
-             */
-            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
-            *pDwlSlotToInstall = SLOT_DWL_1 + j;
-            return SFU_IMG_FWUPDATE_STOPPED;
-          }
-        }
-      }
-    }
-  }
-
-  /* Install new firmware if requested in the swap
-     ============================================= */
-  for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + j] != 0U)
-    {
-      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + j, &fw_image_header_to_test))
-      {
-        /*
-         * A Firmware is available for installation:
-         * fw_image_header_to_test has been populated
-         * Stop at first occurrence : next ones if any will be installed after reset
-         */
-        *pDwlSlotToInstall = SLOT_DWL_1 + j;
-        return SFU_IMG_FWIMAGE_TO_INSTALL;
-      }
-    }
-  }
-
-  return SFU_IMG_NO_FWUPDATE;
-}
-
-/**
-  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
-  *        valid if the checks are successful.
-  *        The anti-rollback check is performed and errors are memorized in the bootinfo area, but no action is taken
-  *        in this procedure.
-  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
-  *        afterwards if the cryptographic scheme allows this (signature check for instance).
-  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
-  *        This function modifies the FLASH content.
-  *        If this procedure is interrupted during image preparation stage (e.g.: switch off) it cannot be resumed.
-  *        If it is interrupted during installation stage, it can be resumed.
-  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *        running the procedure): SFU_IMG_CheckPendingInstallation, SFU_IMG_CheckCandidateVersion should be called
-  *        first.
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *pbuffer;
-  uint32_t active_slot;
-
-  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
-
-  /*
-   * Check the active slot is big enough
-   */
-  if (fw_image_header_to_test.FwSize + SFU_IMG_IMAGE_OFFSET + TRAILER_SIZE(DwlSlot) <= SLOT_SIZE(active_slot))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  /*
-   * The preparation stage consists in decrypting the candidate firmware image.
-   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = PrepareCandidateImageForInstall(DwlSlot, &fw_image_header_to_test);
-  }
-
-  /*
-   * Populate fw_image_header_validated
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
-                                     sizeof(fw_image_header_validated));
-  }
-
-  /*
-   * Installing the new firmware image consists in swapping the 2 FW images.
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
-  }
-
-  /* Erase downloaded FW in case of authentication/integrity error
-     Erase downloaded FW also in case of installation issue to avoid any infinite loop */
-  if (SFU_SUCCESS != e_ret_status)
-  {
-    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Installation procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Installation procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  /* return the installation result */
-  return (e_ret_status);
-}
-
-/**
-  * @brief Resume installation of new valid firmware after installation failure.
-  *        If this procedure is interrupted before its completion (e.g.: switch off) it can be resumed.
-  *        This function is dedicated (only) to the resume of installation when a new firmware installation is stopped
-  *        before its completion.
-  *        This function does not handle explicitly the metadata tagging the firmware as valid: these metadata must
-  *        have been preserved during the installation procedure.
-  *        This function modifies the FLASH content.
-  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *        running the procedure): need to make sure an installation has been interrupted.
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-   * resume swap process
-   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation()call.
-   */
-  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, &fw_image_header_to_test);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_SWAP);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Swap process failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-  /* Update fingerprint from previous FW image */
-  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-  /* Validate immediately the new active FW */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_IMG_Validation(ActiveSlot, &fw_image_header_to_test);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Header validation failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* clear swap pattern */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = CleanMagicValue(DwlSlot);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      /* Memorize the error */
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_MAGIC);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Clean magic tag update failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* Erase downloaded FW in case of installation issue to avoid any infinite loop */
-  if (SFU_SUCCESS != e_ret_status)
-  {
-    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Resume procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Resume procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return e_ret_status;
-}
-
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-/**
-  * @brief Executes a rollback to the original firmware if a firmware update fails
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t zero_buffer[32U] = {0U};
-  SE_FwRawHeaderTypeDef active_header;
-  SE_FwRawHeaderTypeDef dwl_header;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-
-
-  /* Verify slot 1 header is from fw that triggered the update */
-  /* Backed-up header is in flash Slot1 at pHdr address */
-  /* Load current header (start of Slot 0, normally behind the firewall) */
-  e_ret_status =  SFU_LL_FLASH_Read((uint8_t *)&active_header, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                    sizeof(dwl_header));
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    /* if fingerprint is 0x00 we cannot do rollback */
-    if (0 == memcmp(active_header.PrevHeaderFingerprint, zero_buffer, sizeof(active_header.PrevHeaderFingerprint)))
-    {
-      e_ret_status = SFU_ERROR;
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Rollback failure : backed-up FW not identified!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* Get and check previous FW header saved in DWL slot
-     then compare header signature with active slot header finger print */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = CheckAndGetFWHeader(DwlSlot, &dwl_header);
-    if (SFU_SUCCESS == e_ret_status)
-    {
-      /* Fingerprint of active firmware should be the signature of previous firmware */
-      if (0 != memcmp(active_header.PrevHeaderFingerprint, dwl_header.HeaderSignature,
-                       sizeof(active_header.PrevHeaderFingerprint)))
-      {
-        e_ret_status = SFU_ERROR;
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [FWIMG] Rollback failure : backed-up FW not identified!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-    }
-  }
-
-  /* Rollback execution */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = RollbackInstallation(ActiveSlot, DwlSlot, &dwl_header);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_ROLLBACK);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Rollback process failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Rollback is complete, now erase downloaded image to prevent an attempt to
-     * reinstall
-     */
-    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
-  }
-  else
-  {
-    /* Erase the header of active slot to avoid any infinite loop */
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                           SFU_IMG_IMAGE_OFFSET);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Rollback procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Rollback procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Updates the state of the current firmware
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SE_ErrorStatus e_ret_status_se;
-  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
-  SE_StatusTypeDef e_se_status;
-  SE_FwStateTypeDef e_next_image_state;
-
-  /* Read Image state : if image is new, set to self test
-   *
-   * An OTA image arrives on the device in the NEW state
-   * The bootloader switches the new image to SELFTEST state so
-   * that when the image boots it can detect that it should carry out the
-   * self test routine
-   */
-  e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
-  if (e_ret_status_se == SE_SUCCESS)
-  {
-    if (image_state == FWIMG_STATE_NEW)
-    {
-      e_next_image_state = FWIMG_STATE_SELFTEST;
-      e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
-      if (e_ret_status_se == SE_SUCCESS)
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-      else
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d state = %d failed to switch in FWIMG_STATE_SELFTEST", SlotNumber,
-              image_state);
-#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
-        e_ret_status = SFU_ERROR;
-      }
-    }
-  }
-  return e_ret_status;
-}
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-/**
-  * @brief  Get size of the trailer
-  * @note   This area mapped at the end of a dwl slot is not available for the firmware image
-  * @param  SlotNumber index of the slot in the list
-  * @retval Size of the trailer.
-  */
-uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber)
-{
-  return TRAILER_SIZE(SlotNumber);
-}
-
-/**
-  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
-{
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
-  SFU_ErrorStatus e_ret_status_swap = SFU_ERROR;
-
-  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
-                                             SLOT_SIZE(DwlSlot));
-  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-  e_ret_status_swap = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
-                                              SLOT_SIZE(SLOT_SWAP));
-  STATUS_FWIMG(e_ret_status_swap == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-  return (((e_ret_status_swap != SFU_SUCCESS) || (e_ret_status_dwl != SFU_SUCCESS)) ?  SFU_ERROR : SFU_SUCCESS);
-}
-
-#endif /* !(SFU_NO_SWAP) */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
deleted file mode 100644
index 0b3acd0b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_interface_crypto_scheme.c
-  * @author  MCD Application Team
-  * @brief   Secure Engine Interface module.
-  *          This file provides set of firmware functions to manage SE Interface
-  *          functionalities. These services are used by the bootloader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
-#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
-                               STM32 board specificities */
-#include "tkms.h"
-#include "sfu_interface_crypto_scheme.h"
-#include <string.h>
-#include "kms_platf_objects_interface.h"
-
-/* Private defines -----------------------------------------------------------*/
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-#define GCM_TAGBITS_SIZE          128
-#define GCM_IVLEN_BITS            16
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-/* Private variables ---------------------------------------------------------*/
-CK_SESSION_HANDLE EncryptSession;
-CK_SESSION_HANDLE DecryptSession;
-CK_SESSION_HANDLE AuthenticateSession;
-CK_SESSION_HANDLE VerifySession;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-static uint8_t *gcm_tag_header;
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Get AES key handle.
-  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
-  * @param  phAESKey pointer on AES key object handle
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  /* Identify the slot number */
-  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 2) */
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-/**
-  * @brief  Get ECDSA key handle.
-  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
-  * @param  phAESKey pointer on AES key object handle
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  /* Identify the slot number */
-  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 2) */
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
-
-
-/**
-  * @brief Secure Engine Decrypt Init function.
-  *        It is a wrapper of Decrypt_Init function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  CK_RV rv = CKR_OK;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    NULL,
-    0,
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-  gcm_tag_header = pxSE_Metadata->FwTag;
-
-#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  CK_RV rv = CKR_OK;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_MECHANISM cktest_aes_cbc_mechanism =
-  {
-    CKM_AES_CBC,
-    iv_cbc,
-    SE_IV_LEN
-  };
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /*
-   * In this crypto scheme the Firmware is not encrypted.
-   * The Decrypt operation is called anyhow before installing the firmware.
-   * Indeed, it allows moving the Firmware image blocks in FLASH.
-   * These moves are mandatory to create the appropriate mapping in FLASH
-   * allowing the swap procedure to run without using the swap area at each and every move.
-   *
-   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
-   */
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointer allocation */
-  if (pxSE_Metadata == NULL)
-  {
-    return SE_ERROR;
-  }
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /* Nothing to do as we won't decrypt anything */
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Decrypt Append function.
-  *        It is a wrapper of Decrypt_Append function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pInputBuffer pointer to Input Buffer.
-  * @param uInputSize Input Size (bytes).
-  * @param pOutputBuffe pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
-                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  CK_RV rv = CKR_OK;
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
-  if (0 == InputSize)
-  {
-    /* Nothing to do but we must return a success for the decrypt operation to continue */
-    return (SE_SUCCESS);
-  }
-
-  /* Check the pointers allocation */
-  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  /* Buffer decryption */
-  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /*
-   * The firmware is not encrypted.
-   * The only thing we need to do is to recopy the input buffer in the output buffer
-   */
-  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
-  *pOutputSize = InputSize;
-  se_status = SE_SUCCESS;
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Decrypt Finish function.
-  *        It is a wrapper of Decrypt_Finish function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  *peSE_Status = SE_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  CK_RV rv = CKR_OK;
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  /* Check the pointers allocation */
-  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  memcpy(pOutputBuffer, gcm_tag_header, 16);
-
-  /* End-up decryption session */
-  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /* Nothing to do */
-  se_status = SE_SUCCESS;
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Close the session */
-  rv = C_CloseSession(DecryptSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Init function.
-  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
-                                       uint32_t SE_FwType)
-{
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  CK_RV rv = CKR_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
-  CK_OBJECT_HANDLE hAESKey;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    NULL,
-    0,
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  CK_MECHANISM cktest_sha_256_mechanism =
-  {
-    CKM_SHA256,
-    NULL,
-    0
-  };
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointer allocation */
-  if (pxSE_Metadata == NULL)
-  {
-    return SE_ERROR;
-  }
-
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize encryption session  */
-  rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* Digest initialization */
-  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Append function.
-  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pInputBuffer pointer to Input Buffer.
-  * @param uInputSize Input Size (bytes).
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
-                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  CK_RV rv = CKR_OK;
-
-  /* Check the pointers allocation */
-  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Buffer encryption */
-  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
-                       (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* Digest calculation */
-  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Finish function.
-  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  CK_RV rv = CKR_OK;
-
-  /* Check the pointers allocation */
-  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* End-up encryption session */
-  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* End-up Digest calculation */
-  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Close the session */
-  rv = C_CloseSession(AuthenticateSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Verify Raw Fw Header Tag.
-  *        It verifies the signature of a raw header file.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pFwRawHeader pointer to RawHeader Buffer.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
-{
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  CK_RV rv = CKR_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  int32_t fw_raw_header_output_length = SE_TAG_LEN;
-  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
-  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    (CK_BYTE_PTR)gcm_header,
-    ((int32_t)SE_FW_AUTH_LEN),
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
-       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-
-  const uint8_t *pPayload;                        /* Metadata payload */
-  int32_t payloadSize;                            /* Metadata length to be considered for hash */
-  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
-  CK_OBJECT_HANDLE hECDSAKey = 0UL;
-  CK_MECHANISM cktest_ecdsa_256_mechanism =
-  {
-    CKM_ECDSA_SHA256,
-    NULL,
-    0
-  };
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointers allocation */
-  if (NULL == pxFwRawHeader)
-  {
-    *peSE_Status = SE_KO;
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  gcm_tag_header = pxFwRawHeader->HeaderSignature;
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up decryption session  : control if the tag is correct */
-  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
-
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
-       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-
-  pPayload = (const uint8_t *)pxFwRawHeader;
-  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
-
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize the verification process */
-  rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up verification process : control if the signature is correct */
-  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-  /* Close the session */
-  rv = C_CloseSession(VerifySession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-
-  return se_status;
-
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
deleted file mode 100644
index 2fffde16..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_mpu_isolation.c
-  * @author  MCD Application Team
-  * @brief   SFU MPU isolation primitives
-  *          This file provides functions to manage the MPU isolation of the Secure Engine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_mpu_isolation.h"
-#include "sfu_low_level_security.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-
-/* Private function prototypes -----------------------------------------------*/
-static void SFU_SE_STACK_Clean(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief Clean SE Stack.
-  *
-  */
-static void SFU_SE_STACK_Clean(void)
-{
-  uint32_t sp_base = SE_REGION_RAM_START;
-  uint32_t sp_top = SE_REGION_RAM_STACK_TOP;
-  uint32_t sp = __get_MSP();
-  if ((sp > sp_base) && (sp <= sp_top))
-  {
-    while (sp_base < sp)
-    {
-      *(__IO uint32_t *)sp_base = 0U;
-      sp_base += 4U;
-    }
-  }
-  else
-  {
-    /*  error trigger a reset */
-    HAL_NVIC_SystemReset();
-  }
-}
-
-
-/**
-  * @brief This is the Supervisor calls handler.
-  * @param args SVC arguments
-  * @retval void
-  * @note Installed in startup_stm32xxxx.s
-  *
-  * This handler handles 2 requests:
-  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter
-  * \li (see @ref SE_FunctionIDTypeDef)
-  * \li Internal SB_SFU SVC: run a SB_SFU privileged operation provided as a parameter (see @ref SFU_MPU_PrivilegedOpId)
-  */
-void MPU_SVC_Handler(uint32_t *args)
-{
-  /* in PSP (args) contains caller context as follow *
-    * args[0] :R0
-    * args[1] :R1
-    * args[2] :R2
-    * args[3] :R3
-    * args[4] :R12
-    * args[5] :LR
-    * args[6] :PC to return after exception
-    * args[7] :xPSR
-  */
-  /*  read code OP of instruction that generate SVC interrupt
-   *  bottom 8-bits of the SVC instruction code OP are SVC value  */
-  uint8_t code = ((uint8_t *)args[6])[-2];
-
-  switch (code)
-  {
-    case 0:
-      /* A Secure Engine service is called */
-      SE_SVC_Handler(args);
-      break;
-    case 1:
-      /* Internal SB_SFU privileged service */
-      SFU_MPU_SVC_Handler(args);
-      break;
-    default:
-      /* Force a reset */
-      HAL_NVIC_SystemReset();
-      break;
-  }
-}
-
-/**
-  * @brief This function triggers a SB_SFU Privileged Operation requested with SB_SysCall
-  * @param args arguments
-  *             The first argument is the identifier of the requested operation.
-  * @retval void
-  */
-void SFU_MPU_SVC_Handler(uint32_t *args)
-{
-  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
-
-  switch (args[0])
-  {
-    case SB_SYSCALL_LAUNCH_APP:
-      /* Clean SE STACK RAM */
-      SFU_SE_STACK_Clean();
-      /* Release CM4 (via SRAM) */
-      *pSbsfuFlag = SBSFU_BOOTED;
-#if defined(SFU_MPU_PROTECT_ENABLE)
-#if defined(SFU_MPU_USERAPP_ACTIVATION)
-      SFU_LL_SECU_SetProtectionMPU_UserApp();
-#else
-      HAL_MPU_Disable();
-#endif /* SFU_MPU_USERAPP_ACTIVATION */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
-#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
-      /* Disable (Hide) Hide Protection Area */
-      SET_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS);
-#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-      /* make sure to return into application in privileged mode */
-      __set_CONTROL(__get_CONTROL() & ~0x3U); /* clear process stack & unprivileged bit */
-      launch_application(args[1], (uint32_t)jump_to_function);
-      break;
-    case SB_SYSCALL_RESET:
-      HAL_NVIC_SystemReset();
-      break;
-    case SB_SYSCALL_MPU_CONFIG:
-#if defined(SFU_MPU_PROTECT_ENABLE)
-      /* Privileged mode required for MPU re-configuration */
-      (void )SFU_LL_SECU_SetProtectionMPU();
-#endif /* SFU_MPU_PROTECT_ENABLE */
-      break;
-    case SB_SYSCALL_DMA_CONFIG:
-#if defined(SFU_DMA_PROTECT_ENABLE)
-      /* Privileged mode required for DMA re-configuration (clocks access required privilege mode) */
-      (void )SFU_LL_SECU_SetProtectionDMA();
-#endif /* SFU_DMA_PROTECT_ENABLE */
-      break;
-    case SB_SYSCALL_DAP_CONFIG:
-#if defined(SFU_DAP_PROTECT_ENABLE)
-      /* Privileged mode required for DAP re-configuration (clock access required privilege mode) */
-      (void )SFU_LL_SECU_SetProtectionDAP();
-#endif /* SFU_DAP_PROTECT_ENABLE */
-      break;
-    case SB_SYSCALL_TAMPER_CONFIG:
-#if defined(SFU_TAMPER_PROTECT_ENABLE)
-      /* Privileged mode required for TAMPER re-configuration (clock access required privilege mode) */
-      (void )SFU_LL_SECU_SetProtectionANTI_TAMPER();
-#endif /* SFU_DAP_PROTECT_ENABLE */
-      break;
-#ifdef SFU_GTZC_PROTECT_ENABLE
-    case SB_SYSCALL_GTZC_CONFIG:
-      /* Privileged mode required for GTZC re-configuration */
-      SFU_LL_SECU_SetProtectionGTZC();
-      break;
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-    default:
-      /* Force a reset */
-      HAL_NVIC_SystemReset();
-      break;
-  }
-}
-
-/**
-  * @brief This functions triggers a SB_SFU system call (supervisor call): request privileged operation
-  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
-  * @param arguments arguments of the privileged operation
-  * @retval void
-  */
-void SFU_MPU_SysCall(uint32_t syscall, ...)
-{
-  /*
-    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
-    * example an SVC.
-    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
-    */
-  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate a SB_SFU syscall */
-}
-
-/**
-  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
-  * @param void
-  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
-  */
-uint32_t SFU_MPU_IsUnprivileged(void)
-{
-  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
-}
-
-/**
-  * @brief This is a helper function to enter the unprivileged level for software execution
-  * @param void
-  * @retval void
-  */
-void SFU_MPU_EnterUnprivilegedMode(void)
-{
-  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
-  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
-  __set_CONTROL(__get_CONTROL() | 3U); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
-  __ISB();
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
deleted file mode 100644
index bf146433..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_test.c
-  * @author  MCD Application Team
-  * @brief   Test Protections module.
-  *          This file provides set of firmware functions to manage Test Protections
-  *          functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_test.h"
-#include "main.h"
-#include "sfu_trace.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level.h"
-#include "string.h" /* required for strncmp */
-
-#if defined(SFU_TEST_PROTECTION)
-
-extern RTC_HandleTypeDef RtcHandle;
-
-/* Private defines -----------------------------------------------------------*/
-#define TEST_ISOLATION 1
-
-/* Automatic tests : list of tests (Address, Message, Operation */
-/* Flash programming by 64 bits */
-#define SHIFT_FLASH_WRITE (8U-1U)
-
-/* Private variables ---------------------------------------------------------*/
-static ProtectionTest_t aProtectTests[] =
-{
-#ifdef SFU_MPU_PROTECT_ENABLE
-  {SFU_RAM_BASE, "MPU SRAM start add", TEST_EXECUTE},
-  {SFU_RAM_END - 3U, "MPU SRAM end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
-  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
-  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
-  /* READ_FLASH is possible only in privileged mode */
-  {INTVECT_START, "Init. Vector", TEST_READ_FLASH},
-  {SLOT_DWL_1_START, "MPU code dwl slot1 begin add", TEST_EXECUTE},
-  {SLOT_DWL_1_END - 3U, "MPU code dwl slot1 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
-  {SLOT_DWL_2_START, "MPU code dwl slot2 begin add", TEST_EXECUTE},
-  {SLOT_DWL_2_END - 3U, "MPU code dwl slot2 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
-  {SLOT_DWL_3_START, "MPU code dwl slot3 begin add", TEST_EXECUTE},
-  {SLOT_DWL_3_END - 3U, "MPU code dwl slot3 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
-  {SWAP_START, "MPU code swap begin add", TEST_EXECUTE},
-  {SWAP_END - 3U, "MPU code swap end add", TEST_EXECUTE},       /* -3 : alignment for 32bits execute test */
-  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-#ifdef SFU_WRP_PROTECT_ENABLE
-  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
-  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
-  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
-#endif /* SFU_WRP_PROTECT_ENABLE */
-#ifdef SFU_PCROP_PROTECT_ENABLE
-  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
-  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
-                                                                                         writing test */
-  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
-  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
-#endif /* SFU_PCROP_PROTECT_ENABLE */
-#if defined(TEST_ISOLATION)
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
-  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
-                                                                         64bits writing test + WRP protection applies */
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
-  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
-  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
-                                                                    that initializes all the variables in the binary. */
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
-  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
-  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
-  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
-  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-#endif /* TEST_ISOLATION  */
-#ifdef SFU_MPU_PROTECT_ENABLE
-  /* Testing the MPU protection of the OBs */
-  /*
-   * WL55JC
-   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
-   * 0x1FFF 7818 Reserved Write protection 1A
-   * 0x1FFF 7820 Reserved Write protection 1B
-   * 0x1FFF 7870 User option bytes (USER)
-   * 0x1FFF 7878 User option bytes (USER)
-   */
-  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFFC000", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7870, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7878, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-#endif /* SFU_MPU_PROTECT_ENABLE  */
-  {0xAAAAAAAA, "Execution successful", TEST_END},
-};
-
-
-/* Automatic test : list of operation */
-uint8_t aTestOperation[][20] =
-{
-  "write 8 bytes",
-  "read 1 byte",
-  "erase 512 bytes",
-  "write 4 bytes",
-  "read 1 byte",
-  "execute",
-  "end"
-};
-
-/* Private function prototypes -----------------------------------------------*/
-static void SFU_TEST_Protection(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
-  * @param  None.
-  * @retval None.
-  */
-static void SFU_TEST_Protection(void)
-{
-  uint32_t test_idx;
-  uint32_t flashErrCode = 0;
-  uint64_t pattern = 0U;
-  uint32_t page_error = 0U;
-  FLASH_EraseInitTypeDef p_erase_init;
-  TestStatus status = TEST_IN_PROGRESS;
-  __IO uint8_t tmp;
-  void (*func)(void);
-
-  /*
-    * Now checking the security
-    * We will try to access protected @ and run protected code.
-    * Each time a a flash error will be raised or a reset will be generated by IP protection.
-    * At next boot we read the backup register to check the next @ until all addresses have been verified.
-    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
-    * FWALL/Code Isolation
-    */
-
-  do
-  {
-    /* slow down execution */
-    HAL_Delay(100);
-
-    /* Increment test number for next execution */
-    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
-    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
-           aProtectTests[test_idx].address);
-
-    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
-    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
-        && (aProtectTests[test_idx].address > 0x00000FFFU))
-    {
-      switch (aProtectTests[test_idx].type)
-      {
-        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_WRITE_FLASH :
-          HAL_FLASH_Unlock();
-          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
-          HAL_FLASH_Lock();
-          flashErrCode = HAL_FLASH_GetError();
-          printf("\r\nflash error code: %x", flashErrCode);
-          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
-          {
-            status = TEST_ERROR;
-          }
-
-          /*
-           * OBs protection test: no MPU enabled because the OB cannot be written directly.
-           * A flash error should occur.
-           */
-          break;
-
-        /* Trying to read in FLASH : RDP set in case of PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_READ_FLASH :
-          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
-          HAL_Delay(1);                                                 /* ensure Flag is set */
-          /*
-           * When Isolation activated : RESET should be generated
-           * So the test is FAILED if we reach this line
-           */
-          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
-          {
-            status = TEST_ERROR;
-          }
-
-          break;
-
-        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_ERASE_FLASH :
-          HAL_FLASH_Unlock();
-          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
-          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
-          p_erase_init.NbPages     = 1;
-          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
-          HAL_FLASH_Lock();
-          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
-          {
-            status = TEST_ERROR;
-          }
-          break;
-
-        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
-        case TEST_WRITE_RAM :
-          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
-          status = TEST_ERROR;
-          break;
-
-        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
-        case TEST_READ_RAM :
-          tmp = *(uint8_t *)aProtectTests[test_idx].address;
-          printf(" value : %d ", tmp);
-          status = TEST_ERROR;
-          break;
-
-          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
-        case TEST_EXECUTE :
-          func = (void(*)(void))(aProtectTests[test_idx].address);
-          func();
-          status = TEST_ERROR;
-          break;
-
-        /* End of execution */
-        case TEST_END :
-          status = TEST_COMPLETED;
-          break;
-
-        default :
-          break;
-      }
-    }
-  } while (status == TEST_IN_PROGRESS) ;
-
-  if (status == TEST_ERROR)
-  {
-    SFU_TEST_Error();
-  }
-  else if (status == TEST_COMPLETED)
-  {
-    /* reset for next run (need a RESET of the platform to restart a session) */
-    printf("\b\b\b\b\b\b\b\b");
-    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
-  }
-}
-
-/**
-  * @brief  Initialization of backup register and start test
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Init(void)
-{
-  /* Use register DR0 to know which if the test sequence is in progress or done */
-  /* Use register DR1 to know which test to run after a reset */
-
-  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
-  {
-    return;
-  }
-  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
-                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
-                                                                  reset test index (DR1) */
-  {
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
-  }
-
-  /* Start test */
-  SFU_TEST_Protection();
-}
-
-/**
-  * @brief  Reset backup register to be able to execute a new test sequence
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Reset(void)
-{
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
-}
-
-/**
-  * @brief  Error detected during test sequence
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Error(void)
-{
-  printf(" ===> KO!!!!!");
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
-}
-
-#endif /* SFU_TEST_PROTECTION */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
deleted file mode 100644
index 2cb40aae..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
+++ /dev/null
@@ -1,1621 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.c
-  * @author  MCD Application Team
-  * @brief   SFU Security Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "stm32wlxx_it.h"
-#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
-
-#ifndef  SFU_WRP_PROTECT_ENABLE
-#warning "SFU_WRP_PROTECT_DISABLED"
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifndef  SFU_RDP_PROTECT_ENABLE
-#warning "SFU_RDP_PROTECT_DISABLED"
-#endif /* SFU_RDP_PROTECT_ENABLE */
-
-
-#ifndef  SFU_MPU_PROTECT_ENABLE
-#warning "SFU_MPU_PROTECT_DISABLED"
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#ifndef  SFU_GTZC_PROTECT_ENABLE
-#warning "SFU_GTZC_PROTECT_DISABLED"
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifndef  SFU_C2_DDS_PROTECT_ENABLE
-#warning "SFU_C2_DDS_PROTECT_DISABLED"
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifndef  SFU_C2SWDBG_PROTECT_ENABLE
-#warning "SFU_C2SWDBG_DISABLED"
-#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
-
-
-#ifndef  SFU_TAMPER_PROTECT_ENABLE
-/* #warning "SFU_TAMPER_PROTECT_DISABLED" */
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-#ifndef  SFU_DAP_PROTECT_ENABLE
-#warning "SFU_DAP_PROTECT_DISABLED"
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-#ifndef  SFU_DMA_PROTECT_ENABLE
-#warning "SFU_DMA_PROTECT_DISABLED"
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-#ifndef  SFU_IWDG_PROTECT_ENABLE
-/* #warning "SFU_IWDG_PROTECT_DISABLED" */
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
-#warning "SFU_SECURE_USER_PROTECT_DISABLED"
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-/* Private typedef -----------------------------------------------------------*/
-typedef enum
-{
-  SFU_FALSE = 0U,
-  SFU_TRUE = !SFU_FALSE
-} SFU_BoolTypeDef;
-
-typedef struct
-{
-  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Number */
-  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
-  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
-  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Permission_Attributes */
-  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
-                                                 of  CORTEX_MPU_Instruction_Access */
-  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
-                                                 is 1 region sub region is disabled */
-  uint8_t                Tex;               /*!< Specifies the tex value  */
-  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
-  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
-} SFU_MPU_InitTypeDef;
-
-typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
-
-/* Private variables ---------------------------------------------------------*/
-#ifdef  SFU_IWDG_PROTECT_ENABLE
-static IWDG_HandleTypeDef   IwdgHandle;
-
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-#ifdef  SFU_MPU_PROTECT_ENABLE
-static SFU_MPU_InitTypeDef MpuAreas[] =
-
-{
-  /* Aliases Region and all User Flash & internal RAM */
-  {
-    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
-    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
-    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
-  },
-
-  /* install header : read /write only for privileged */
-  {
-    SFU_PROTECT_MPU_HEADER_RGNV, SFU_PROTECT_MPU_HEADER_START, SFU_PROTECT_MPU_HEADER_SIZE,
-    SFU_PROTECT_MPU_HEADER_PERM, SFU_PROTECT_MPU_HEADER_EXECV, SFU_PROTECT_MPU_HEADER_SREG,
-    SFU_PROTECT_MPU_HEADER_TEXV, SFU_PROTECT_MPU_HEADER_C, SFU_PROTECT_MPU_HEADER_B
-  },
-
-  /*  Flash execution */
-  {
-    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
-    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
-    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
-  },
-
-  /* KMS_DataStorage: NVM storage */
-  {
-    SFU_PROTECT_MPU_KMS_RGNV, SFU_PROTECT_MPU_KMS_START, SFU_PROTECT_MPU_KMS_SIZE,
-    SFU_PROTECT_MPU_KMS_PERM, SFU_PROTECT_MPU_KMS_EXECV, SFU_PROTECT_MPU_KMS_SREG,
-    SFU_PROTECT_MPU_KMS_TEXV, SFU_PROTECT_MPU_KMS_C, SFU_PROTECT_MPU_KMS_B
-  },
-  /*  peripheral  */
-  {
-    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
-    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
-    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
-  }
-};
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#ifdef SFU_RDP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /*SFU_RDP_PROTECT_ENABLE*/
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-
-
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef SFU_C2SWDBG_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void);
-#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
-
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
-#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
-
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
-#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-#ifdef SFU_GTZC_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Check and if not applied apply the Static security  protections to
-  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
-  *         those protections not impacted by a Reset. They are set using the Option Bytes
-  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
-  * @param  None
-  * @note   By default, the best security protections are applied to the different
-  *         flash sections in order to maximize the security level for the specific MCU.
-  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
-  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
-{
-  FLASH_OBProgramInitTypeDef flash_option_bytes;
-  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  (void) HAL_FLASH_Unlock();
-
-  /* Clear OPTVERR bit set on virgin samples */
-  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
-
-  /* Unlock the Options Bytes *************************************************/
-  (void) HAL_FLASH_OB_Unlock();
-
-  /* Get Option Bytes status for WRP AREA_A  **********/
-  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
-  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
-
-  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
-  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
-  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
-  {
-    /* Sanity check of the (enabled) static protections */
-    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-
-#ifdef SFU_SECURE_USER_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
-#ifdef SFU_GTZC_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
-
-    /*RDP level 2 ==> Flow control by-passed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-  }
-  else
-  {
-    /* Check/Set Flash configuration *******************************************/
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-
-    /* Check/Apply WRP ********************************************************/
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-    /* Check/Apply PCRoP ******************************************************/
-
-    /* Check/Apply Secure User Memory *****************************************/
-#ifdef SFU_SECURE_USER_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionSUBGHZSPI(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
-
-    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
-#ifdef SFU_RDP_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_RDP_PROTECT_ENABLE */
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (is_protection_to_be_applied)
-      {
-        /* Generate System Reset to reload the new option byte values *************/
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        (void) HAL_FLASH_OB_Launch();
-      }
-    }
-  }
-
-
-  /* Lock the Options Bytes ***************************************************/
-  (void) HAL_FLASH_OB_Lock();
-
-  /* Lock the Flash to disable the flash control register access (recommended
-  to protect the FLASH memory against possible unwanted operation) *********/
-  (void) HAL_FLASH_Lock();
-
-  /* If it was not possible to apply one of the above mandatory protections, the
-  Option bytes have not been reloaded. Return the error status in order for the
-  caller function to take the right actions */
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  Apply Runtime security  protections.
-  *         Runtime security protections have to be re-configured at each Reset.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
-
-  /* Depending on compilation switches, prevent compilation warning */
-  UNUSED(runtime_protection);
-
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-  /* Check/Apply MPU ************************************************/
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionMPU() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for MPU second-configuration
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_MPU_CONFIG);
-  }
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-
-
-  /* Check/Apply disable DMAs  ************************************************/
-#ifdef SFU_DMA_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DMA_CONFIG);
-  }
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-  /* Check/Apply  IWDG **************************************************/
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-  /* Check/Apply  DAP *********************************************************/
-#ifdef SFU_DAP_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DAP_CONFIG);
-  }
-#else
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-  /* Check/Apply  ANTI_TAMPER *************************************************/
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for TAMPER second-configuration in order to activate the clock through RCC
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_TAMPER_CONFIG);
-  }
-#else
-#ifdef SFU_TEST_PROTECTION
-  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_TEST_PROTECTION */
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-  /* Check/Apply  C2SWDBG *****************************************************/
-#ifdef SFU_C2SWDBG_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionC2SWDBG() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    if (SFU_LL_SECU_CheckProtectionC2SWDBG() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
-
-  /* Check/Apply  GTZC ********************************************************/
-#ifdef SFU_GTZC_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionGTZC() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_GTZC;
-    }
-    else
-    {
-      /* When a protection cannot be set then SB_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for GTZC second-configuration
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_GTZC_CONFIG);
-  }
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-  /* Check/Apply  CLOCK_MONITOR **********************************************/
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
-
-  /* Check/Apply  TEMP_MONITOR **********************************************/
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Return the reset source  detected after a reboot. The related flag is reset
-  *         at the end of this function.
-  * @param  peResetpSourceId: to be filled with the detected source of reset
-  * @note   In case of multiple reset sources this function return only one of them.
-  *         It can be improved returning and managing a combination of them.
-  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
-  */
-void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
-{
-  /* Check if the last reset has been generated from a Watchdog exception */
-  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
-      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
-  {
-    *peResetpSourceId = SFU_RESET_WDG_RESET;
-
-  }
-
-
-  /* Check if the last reset has been generated from a Low Power reset */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_LOW_POWER;
-
-  }
-
-  /* Check if the last reset has been generated from a Software reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_SW_RESET;
-
-  }
-  /* Check if the last reset has been generated from an Option Byte Loader reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_OB_LOADER;
-  }
-  /* Check if the last reset has been generated from a Hw pin reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_HW_RESET;
-
-  }
-  /* Unknown */
-  else
-  {
-    *peResetpSourceId = SFU_RESET_UNKNOWN;
-  }
-}
-
-/**
-  * @brief  Clear the reset sources. This function should be called after the actions
-  *         on the reset sources has been already taken.
-  * @param  none
-  * @note   none
-  * @retval none
-  */
-void SFU_LL_SECU_ClearResetSources()
-{
-  /* Clear reset flags  */
-  __HAL_RCC_CLEAR_RESET_FLAGS();
-}
-
-/**
-  * @brief  Refresh Watchdog : reload counter
-  *         This function must be called just before jumping to the UserFirmware
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  /* Refresh IWDG: reload counter */
-  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-#else
-  e_ret_status = SFU_SUCCESS;
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check Flash configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
-  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
-      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-  }
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  Set Flash configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check Flash configuration */
-  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
-    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
-    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
-    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-    }
-#else
-    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-#ifdef SFU_RDP_PROTECT_ENABLE
-/**
-  * @brief  Apply the RDP protection
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply RDP **********************************************************/
-  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
-  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
-  {
-    e_ret_status = SFU_SUCCESS; /*Protection already applied */
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
-    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
-#else
-    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
-#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
-    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
-    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-  return e_ret_status;
-}
-#endif /*SFU_RDP_PROTECT_ENABLE*/
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-/**
-  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Check WRP ****************************************************************/
-  if ((psFlashOptionBytes->WRPStartOffset > SFU_PROTECT_WRP_PAGE_START_1) ||
-      (psFlashOptionBytes->WRPEndOffset   < SFU_PROTECT_WRP_PAGE_END_1))
-  {
-    e_ret_status = SFU_ERROR; /*Protection not applied */
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply WRP **********************************************************/
-  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS; /*Protection already applied */
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
-    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
-    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
-    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-/**
-  * @brief  Apply MPU protection before executing UserApp
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
-{
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  /* configure a new area for the currently executing code (SBSFU + active slots) */
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_2_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_2_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_2_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_2_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_2_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_2_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_2_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_2_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_2_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  /* remap the current area (SBSFU + active slots) */
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_1_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_1_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_1_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_1_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_1_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_1_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_1_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_1_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_1_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  /*  Remove the write rights for the SRAM synchronization flag */
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_SRAM_FLAG_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_SRAM_FLAG_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_SRAM_FLAG_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_SRAM_FLAG_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_SRAM_FLAG_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_SRAM_FLAG_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_SRAM_FLAG_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_SRAM_FLAG_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_SRAM_FLAG_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-
-  return SFU_SUCCESS;
-}
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-
-/**
-  * @brief  Apply MPU protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t mpu_region_num; /* id of the MPU region being configured */
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  HAL_MPU_Disable();
-
-  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
-  {
-    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
-    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
-    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
-    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
-    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
-    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
-    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
-    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
-    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
-          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
-          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    HAL_MPU_ConfigRegion(&MPU_InitStruct);
-  }
-  HAL_MPU_Enable(MPU_HARDFAULT_NMI);
-  e_ret_status = SFU_SUCCESS;
-
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
-  }
-  return e_ret_status;
-}
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-/**
-  * @brief  Apply GTZC protection: FLASH, RAM, PKA, RNG, AES.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionGTZC(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  MPCWM_ConfigTypeDef mpcwm_desc;
-
-  /* Handle the GTZC TZC lock *************************************************/
-
-  /* Configure FLASH memory ***************************************************/
-  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
-  mpcwm_desc.Length = SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE;
-  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
-  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Configure SRAM1 memory ***************************************************/
-  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
-  mpcwm_desc.Length = SRAM1_SIZE;
-  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Configure SRAM2 memory ***************************************************/
-  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
-  mpcwm_desc.Length = SE_REGION_RAM_START - SRAM2_BASE;
-  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Configure TZSC peripherals ***********************************************/
-  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_AES,
-                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_RNG,
-                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
-                                           (GTZC_TZSC_ATTRIBUTE_NPRIV)) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_PKA,
-                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Configure TZIC peripherals ***********************************************/
-
-  /* Configure FLASH_ACR2 */
-  MODIFY_REG(FLASH->ACR2, FLASH_ACR2_PRIVMODE, FLASH_ACR2_PRIVMODE);
-
-  /* Enable the IT for the concerned peripherals */
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZIC) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZSC) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_AES) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_RNG) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SUBGHZSPI) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PWR) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASHIF) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA1) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA2) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMAMUX) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASH) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM1) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PKA) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Enable IRQ */
-  NVIC_EnableIRQ(TZIC_ILA_IRQn);
-
-  /* Handle the GTZC TZC lock *************************************************/
-  HAL_GTZC_TZSC_Lock(GTZC_TZSC);
-
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-
-
-#ifdef SFU_DMA_PROTECT_ENABLE
-/**
-  * @brief  Apply DMA protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
-{
-  /*
-   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
-   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
-   * information in SRAM, FLASH
-   */
-  /* Disable  DMA1, DMA2 */
-  __HAL_RCC_DMA1_CLK_DISABLE();
-
-  __HAL_RCC_DMA2_CLK_DISABLE();
-
-  __HAL_RCC_DMAMUX1_CLK_DISABLE();
-
-
-
-
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
-  return SFU_SUCCESS;
-}
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-/**
-  *  @brief Apply IWDG protection
-  *         The IWDG timeout is set to 4 second.
-  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
-  *         to the measured LSI frequency after setting the prescaler value:
-  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
-  This is not used in this implementation because not necessary and in order
-  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
-
-  /* Configure & Start the IWDG peripheral */
-  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
-  IWDG counter clock Frequency = uwLsiFreq
-  Set Prescaler to 64 (IWDG_PRESCALER_64)
-  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
-  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
-  IwdgHandle.Instance = IWDG;
-  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
-  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
-  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
-
-  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef SFU_DAP_PROTECT_ENABLE
-/**
-  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-
-  /* Enable clock of DBG GPIO port */
-  SFU_DBG_CLK_ENABLE();
-
-  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
-  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
-  e_ret_status = SFU_SUCCESS;
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
-
-  return e_ret_status;
-}
-#else
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-/**
-  * @brief  Apply ANTI TAMPER protection
-  * @param None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  RTC_TamperTypeDef  stamperstructure;
-
-  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
-  TAMPER_GPIO_CLK_ENABLE();
-
-  /* Configure Tamper Pin */
-  /* tamper is an additional function */
-  /* not an alternate Function : config not needed */
-  /* Configure the RTC peripheral */
-  /* Configure RTC prescaler and RTC data registers */
-  /* RTC configured as follows:
-  - Hour Format    = Format 24
-  - Asynch Prediv  = Value according to source clock
-  - Synch Prediv   = Value according to source clock
-  - OutPut         = Output Disable
-  - OutPutPolarity = High Polarity
-  - OutPutType     = Open Drain */
-  RtcHandle.Instance            = RTC;
-  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
-  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
-  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
-  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
-  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
-  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
-
-  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
-  {
-    /* Configure RTC Tamper */
-    stamperstructure.Tamper                       = RTC_TAMPER_ID;
-    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
-    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
-    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
-    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
-    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
-    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
-    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
-    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
-
-    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
-    {
-
-      /* Clear the Tamper interrupt pending bit */
-      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
-    }
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-
-#ifdef SFU_C2SWDBG_PROTECT_ENABLE
-/**
-  * @brief  Check if C2SWDBG protection is enabled.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_C2SWDBGEN) == 0U)
-  {
-    /* C2SWDBG disabled */
-    e_ret_status = SFU_SUCCESS;
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply C2SWDBG protection
-  * @param None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void)
-{
-  HAL_FLASHEx_DisableC2Debug();
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
-  return SFU_SUCCESS;
-}
-#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
-
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-/**
-  * @brief  Apply CLOCK MONITOR protection
-  * @note   This function has been added just as template to be used/customized
-  *         if a clock monitor is requested.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply the Clock Monitoring */
-  /* Add your code here for customization
-     e.g. if HSE or LSE is used enable the CSS!
-   ...
-   ...
-  */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
-
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-/**
-  * @brief  Apply TEMP MONITOR protection
-  * @note   This function has been added just as template to be used/customized
-  *         if a temperature monitor is requested.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply the Temperature Monitoring */
-  /* Add your code here for customization
-     ...
-     ...
-  */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
-
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-/**
-  * @brief  Check Secure User Memory protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
-   */
-  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
-  {
-    /*
-     * In this example secure area covers:
-     * - the SB_SFU code
-     * - the header of the active slots
-     */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [SBOOT] Secure Mode: [%x]", psFlashOptionBytes->SecureMode);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    e_ret_status = SFU_SUCCESS;
-
-    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
-    {
-      if (psFlashOptionBytes->SecureFlashStartAddr == SFU_SECURE_FLASH_START)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [SBOOT] Secure Flash Start Address: [%x]", psFlashOptionBytes->SecureFlashStartAddr);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
-    {
-      if (psFlashOptionBytes->HideProtectionStartAddr == SFU_HIDE_PROTECTION_START)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [SBOOT] Hide Protection Start Address: [%x]", psFlashOptionBytes->HideProtectionStartAddr);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
-    {
-      if (psFlashOptionBytes->SecureSRAM1StartAddr == SFU_SECURE_SRAM1_START)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [SBOOT] Secure SRAM1 Start Address: [%x]", psFlashOptionBytes->SecureSRAM1StartAddr);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
-    {
-      if (psFlashOptionBytes->SecureSRAM2StartAddr == SFU_SECURE_SRAM2_START)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [SBOOT] Secure SRAM2 Start Address: [%x]", psFlashOptionBytes->SecureSRAM2StartAddr);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-  }
-
-  /* Execution stopped if flow control failed */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Apply Secure User Memory protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if Secure User Memory is already configured */
-  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
-
-    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
-    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
-    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
-    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
-    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: Secure User Memory is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-/**
-  * @brief  Activate Secure User Memory protection and jump into user application.
-  * @param  Address of the code to jump into
-  * @retval none.
-  */
-
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-/**
-  * @brief  Check Sub-GHz radio SPI protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply Sub-GHz radio SPI ********************************************/
-  /* Check if the protection is already applied */
-  if (psFlashOptionBytes->SUBGHZSPISecureAccess == OB_SUBGHZSPI_SECURE_ACCESS_ENABLE)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply Sub-GHz radio SPI protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if the protection is already applied */
-  if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_SUBGHZSPI_SECURE_ACCESS;
-
-    psFlashOptionBytes->SUBGHZSPISecureAccess = OB_SUBGHZSPI_SECURE_ACCESS_ENABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-/**
-  * @brief  Check DDS protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply DDS ********************************************/
-  /* Check if the protection is already applied */
-  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply DDS protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if the protection is already applied */
-  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
-
-    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
deleted file mode 100644
index c03fd59f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_SECURITY_H
-#define SFU_LOW_LEVEL_SECURITY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_fwimg_regions.h"
-#include "sfu_def.h"
-
-/* Exported constants --------------------------------------------------------*/
-/* Secure User Memory end : from FLASH_BASE to end of active slot header */
-#define SFU_SEC_MEM_AREA_ADDR_END ((uint32_t) (SlotHeaderAdd[SLOT_ACTIVE_1] + SFU_IMG_IMAGE_OFFSET - 1U))
-
-
-/*!< Bank 1, Area A  used to protect Vector Table */
-#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
-
-/*!< First page including the Vector Table: 0 based */
-#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Last page: (code_size-1)/page_size because the page
-     indexes start from 0 */
-#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-
-
-#define SFU_PROTECT_GTZC_EXEC_SE_START INTVECT_START /*!< GTZC Configuration */
-
-/**
-  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
-  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
-  *    The priorities are fixed, and cannot be changed.
-  */
-
-
-
-
-#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
-
-/**
-  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
-  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
-  *                   but used only to read and write the downloaded code RAM is also not executable.
-  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
-#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
-#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
-#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
-#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
-
-/**
-  * @brief Region 1 - Enable the read/write operations for full peripheral area in unprivileged mode.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
-#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
-#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
-#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
-#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys) in unprivileged mode.
-  *                   Read only capability configured
-  *                   Inner region inside the Region 0
-  *                   From 0x08030000 ==> 0x0803FFFF
-  */
-#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
-#define SFU_PROTECT_MPU_FLASHEXE_START 0x08030000UL
-#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_64KB
-#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x00U                /*!< All subregions activated */
-#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
-#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 3 - Enable the read/write operation in privileged mode for Header of active slots
-  *                   Execution capability disabled
-  *                   Inner region inside the Region 0
-  */
-#define SFU_PROTECT_MPU_HEADER_RGNV  MPU_REGION_NUMBER3
-#define SFU_PROTECT_MPU_HEADER_START SLOT_ACTIVE_2_HEADER
-#define SFU_PROTECT_MPU_HEADER_SREG  0x00U                 /*!< All subregions activated */
-#define SFU_PROTECT_MPU_HEADER_SIZE  MPU_REGION_SIZE_4KB
-#define SFU_PROTECT_MPU_HEADER_PERM  MPU_REGION_PRIV_RW
-#define SFU_PROTECT_MPU_HEADER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_HEADER_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_HEADER_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_HEADER_C     MPU_ACCESS_CACHEABLE
-
-/**
-  * @brief Region 4 - Enable the read/write operation in privileged mode for KMS_DataStorage
-  *                   Execution capability disabled
-  *                   Inner region inside the Region 0
-  */
-#define SFU_PROTECT_MPU_KMS_RGNV  MPU_REGION_NUMBER4
-#define SFU_PROTECT_MPU_KMS_START (uint32_t)KMS_DATASTORAGE_START
-#define SFU_PROTECT_MPU_KMS_SIZE  MPU_REGION_SIZE_4KB
-#define SFU_PROTECT_MPU_KMS_SREG  0x00U               /*!< All subregions activated */
-#define SFU_PROTECT_MPU_KMS_PERM  MPU_REGION_PRIV_RW
-#define SFU_PROTECT_MPU_KMS_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_KMS_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_KMS_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_KMS_C     MPU_ACCESS_CACHEABLE
-
-/**
-  */
-
-/**
-  * MPU configuration for UserApp execution
-  * =======================================
-  * Reconfiguration of existing regions (useless during UserApp execution)
-  * MPU constraint = Region base address should be aligned on Region size
-  */
-
-/**
-  * @brief Region 2 - Enable the execution for the SBSFU and active slots in unprivileged mode.
-  *                   Read only capability configured
-  *                   Execution capability enabled
-  *                   Execution capability restricted by other regions (MPU and secure)
-  *                   From 0x08012000 ==> 0x08017FFF (24 kbytes)
-  */
-#define APP_PROTECT_MPU_FLASHEXE_1_RGNV  MPU_REGION_NUMBER2
-#define APP_PROTECT_MPU_FLASHEXE_1_START 0x08010000UL
-#define APP_PROTECT_MPU_FLASHEXE_1_SIZE  MPU_REGION_SIZE_32KB
-#define APP_PROTECT_MPU_FLASHEXE_1_SREG  0x03U               /*!< 32 Kbytes / 8 * 6 ==> 24 Kbytes */
-#define APP_PROTECT_MPU_FLASHEXE_1_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_FLASHEXE_1_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_FLASHEXE_1_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_FLASHEXE_1_B     MPU_ACCESS_BUFFERABLE
-#define APP_PROTECT_MPU_FLASHEXE_1_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 3 - Enable the execution for the SBSFU and active slots in unprivileged mode.
-  *                   Read only capability configured
-  *                   Execution capability enabled
-  *                   Execution capability restricted by other regions (MPU and secure)
-  *                   From 0x08018000 ==> 0x0803FFFF (160 kbytes)
-  */
-#define APP_PROTECT_MPU_FLASHEXE_2_RGNV  MPU_REGION_NUMBER3
-#define APP_PROTECT_MPU_FLASHEXE_2_START FLASH_BASE          /*!< FLASH memory area */
-#define APP_PROTECT_MPU_FLASHEXE_2_SIZE  MPU_REGION_SIZE_256KB
-#define APP_PROTECT_MPU_FLASHEXE_2_SREG  0x07U               /*!< 256 Kbytes / 8 * 5 ==> 160 Kbytes */
-#define APP_PROTECT_MPU_FLASHEXE_2_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_FLASHEXE_2_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_FLASHEXE_2_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_FLASHEXE_2_B     MPU_ACCESS_BUFFERABLE
-#define APP_PROTECT_MPU_FLASHEXE_2_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
-  *                   Execution capability disabled
-  */
-#define APP_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
-#define APP_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
-#define APP_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
-#define APP_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
-#define APP_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define APP_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
-#define APP_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
-
-
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
-  * @{
-  */
-#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RTC_TAMPER_ID                      RTC_TAMPER_1
-#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
-  * @{
-  */
-#define SFU_DBG_PORT            GPIOA
-#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
-#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
-  * @{
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
-  * @{
-  */
-typedef enum
-{
-  SFU_RESET_UNKNOWN = 0x00U,
-  SFU_RESET_WDG_RESET,
-  SFU_RESET_LOW_POWER,
-  SFU_RESET_HW_RESET,
-  SFU_RESET_BOR_RESET,
-  SFU_RESET_SW_RESET,
-  SFU_RESET_OB_LOADER,
-} SFU_RESET_IdTypeDef;
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
-  * @{
-  */
-#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
-#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
-#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
-                                                                            separate section to support PCRoP */
-#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
-#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
-                                                                            Std Protections cannot be
-                                                                            added/removed/modified */
-#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
-                                                                            boot in bank1! */
-
-#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
-#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
-#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
-#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
-#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
-#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
-#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
-#define SFU_RUNTIME_PROTECTION_GTZC          ((uint32_t)0x00010000U)   /*!< GTZC protection */
-#define SFU_RUNTIME_PROTECTION_C2SWDBG       ((uint32_t)0x00020000U)   /*!< CPU2 Software Debug */
-
-#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
-                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
-/*!< All the static protections */
-
-#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
-                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
-                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
-                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | \
-                                             SFU_RUNTIME_PROTECTION_TEMP_MONITOR  | \
-                                             SFU_RUNTIME_PROTECTION_GTZC          | \
-                                             SFU_RUNTIME_PROTECTION_C2SWDBG)
-/*!< All the run-time protections */
-
-#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
-#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
-#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
-
-/* Exported functions ------------------------------------------------------- */
-#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
-/*!<SFU Redirect of RTC Tamper Event Callback*/
-#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
-#ifdef SFU_GTZC_PROTECT_ENABLE
-#define SFU_CALLBACK_GTZC_TZIC(void) HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
-void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
-void               SFU_LL_SECU_ClearResetSources(void);
-#ifdef SFU_MPU_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(void);
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-#ifdef SFU_DMA_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-#ifdef SFU_DAP_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-#if defined(SFU_MPU_PROTECT_ENABLE)
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
-#endif /* SFU_MPU_PROTECT_ENABLE */
-#ifdef SFU_GTZC_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionGTZC(void);
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_SECURITY_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/main.h
deleted file mode 100644
index 3ca5f4e4..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/main.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    main.h
-  * @author  MCD Application Team
-  * @brief   Header for main.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MAIN_H
-#define __MAIN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-
-#include "stm32wlxx_nucleo.h"
-#include "stm32wlxx_ll_utils.h"
-#include "sfu_def.h"
-#include "app_sfu.h"
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void Error_Handler(void);
-
-/* USER CODE BEGIN EFP */
-SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
-void SFU_EXCPT_Security_Error(void);
-/* USER CODE END EFP */
-
-/* Private defines -----------------------------------------------------------*/
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MAIN_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_boot.h
deleted file mode 100644
index e38cb702..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_boot.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_boot.h
-  * @author  MCD Application Team
-  * @brief   Header the Secure Boot module.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_BOOT_H
-#define SFU_BOOT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/**
-  * @brief  SB Flow Control : Initial value
-  */
-#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
-
-/**
-  * @brief  SB Flow Control : Steps definition
-  */
-
-#define FLOW_STEP_C2BOOT 0x00006787U             /*!< Step C2OPT and SBRV value */
-
-#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
-
-#ifdef  SFU_WRP_PROTECT_ENABLE
-#define FLOW_STEP_WRP 0x0002cccdU                /*!< Step WRP value */
-#else
-#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifdef  SFU_RDP_PROTECT_ENABLE
-#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
-#else
-#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_RDP_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-#define FLOW_STEP_C2_DDS 0x00003befU             /*!< Step DDS value */
-#else
-#define FLOW_STEP_C2_DDS 0x00000000U             /*!< No effect on control flow */
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
-#else
-#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-#ifdef  SFU_TAMPER_PROTECT_ENABLE
-#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
-#else
-#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-#ifdef  SFU_MPU_PROTECT_ENABLE
-#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
-#else
-#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#ifdef  SFU_FWALL_PROTECT_ENABLE
-#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
-#else
-#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
-#endif /* SFU_FWALL_PROTECT_ENABLE */
-
-#ifdef  SFU_DMA_PROTECT_ENABLE
-#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
-#else
-#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-#ifdef  SFU_IWDG_PROTECT_ENABLE
-#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
-#else
-#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-#ifdef  SFU_DAP_PROTECT_ENABLE
-#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
-#else
-#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-/**
-  * @brief  SB Flow Control : Control values static protections
-  */
-#define FLOW_CTRL_C2BOOT (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_C2BOOT)
-#define FLOW_CTRL_UBE (FLOW_CTRL_C2BOOT ^ FLOW_STEP_UBE)
-#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
-#define FLOW_CTRL_C2_DDS (FLOW_CTRL_WRP ^ FLOW_STEP_C2_DDS)
-#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_C2_DDS ^ FLOW_STEP_SEC_MEM)
-#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
-#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
-
-/**
-  * @brief  SB Flow Control : Control values runtime protections
-  */
-#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
-#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
-#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
-#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
-#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
-#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
-#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
-
-/**
-  * @brief  SB Flow Control : Exported macro
-  */
-#if defined(MAIN_C)
-uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
-uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
-#else
-extern uint32_t uFlowProtectValue;
-extern uint32_t uFlowCryptoValue;
-#endif /* MAIN_C */
-
-/* Control with STEP operation :
- * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
- */
-#define FLOW_CONTROL_STEP(C,B,A) \
-  do{ \
-    (C) ^= (B);\
-    if ((C) != (A))\
-      SFU_EXCPT_Security_Error();\
-  }while(0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_BOOT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_loader.h
deleted file mode 100644
index e74ce1d3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_loader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_loader.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update local
-  *          loader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOADER_H
-#define SFU_LOADER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_def.h"
-#include "sfu_new_image.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU_LOADER Status Type Definition
-  */
-typedef enum
-{
-  SFU_LOADER_OK                            = 0x00U,
-  SFU_LOADER_ERR_COM                       = 0x01U,
-  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
-  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
-  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
-  SFU_LOADER_ERR_FLASH                     = 0x05U,
-  SFU_LOADER_ERR_CRYPTO                    = 0x06U
-} SFU_LOADER_StatusTypeDef;
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LOADER_Init(void);
-SFU_ErrorStatus SFU_LOADER_DeInit(void);
-SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
-                                             uint32_t *p_Size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOADER_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
deleted file mode 100644
index b010e72d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_SECURITY_H
-#define SFU_LOW_LEVEL_SECURITY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_fwimg_regions.h"
-#include "se_def_core.h"
-
-
-/*!< Bank 1, Area A  used to protect Vector Table */
-#define SFU_C2_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAA)
-
-/*!< First page including the Vector Table: 0 based */
-#define SFU_C2_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_C2_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Last page: (code_size-1)/page_size because the page
-     indexes start from 0 */
-#define SFU_C2_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_C2_AREA_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Bank 1, Area B  used to protect Vector Table */
-#define SFU_C1_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAB)
-
-/*!< First page including the Vector Table: 0 based */
-#define SFU_C1_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_C1_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Last page: (code_size-1)/page_size because the page
-     indexes start from 0 */
-#define SFU_C1_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_C1_AREA_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/**
-  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
-  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
-  *    The priorities are fixed, and cannot be changed.
-  */
-
-
-
-
-#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
-
-/**
-  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
-  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
-  *                   but used only to read and write the downloaded code RAM is also not executable.
-  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
-#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
-#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
-#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
-#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
-
-/**
-  * @brief Region 1 - Enable the read/write operations for full peripheral area (without bit banding region) in
-  *                   unprivileged mode.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
-#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
-#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
-#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
-#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 2 - Enable the execution for SB Full area in unprivileged mode.
-  *                   Read only capability configured
-  *                   from 0x08000000 ==> 0x08001FFF (8 Kbytes)
-  */
-#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
-#define SFU_PROTECT_MPU_FLASHEXE_START M4_SB_REGION_ROM_START
-#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_8KB
-#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
-#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO
-#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 3 - Forbid all access to the active slot.
-  *                   From 0x08012000 ==> 0x0801FFFF (56 kbytes)
-  */
-#define SFU_PROTECT_MPU_APP_FLASHEXE_RGNV  MPU_REGION_NUMBER3
-#define SFU_PROTECT_MPU_APP_FLASHEXE_START 0x08012000UL
-#define SFU_PROTECT_MPU_APP_FLASHEXE_SIZE  MPU_REGION_SIZE_64KB
-#define SFU_PROTECT_MPU_APP_FLASHEXE_SREG  0x01U    /*!< 64 Kbytes / 8 * 7 ==> 56 Kbytes */
-#define SFU_PROTECT_MPU_APP_FLASHEXE_PERM  MPU_REGION_NO_ACCESS
-#define SFU_PROTECT_MPU_APP_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_APP_FLASHEXE_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_APP_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_APP_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 4 - Forbid all access to the active slot.
-  *                   In addition to region 3, from 0x08020000 ==> 0x08020FFF (4 kbytes)
-  */
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START 0x08020000UL
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_4KB
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG  0x00U                /*!< All subregions activated */
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM  MPU_REGION_NO_ACCESS
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
-#define SFU_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
-#define SFU_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
-#define SFU_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
-#define SFU_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
-#define SFU_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
-
-/**
-  * MPU configuration for UserApp execution
-  * =======================================
-  * Reconfiguration of existing regions (useless during UserApp execution)
-  * MPU constraint = Region base address should be aligned on Region size
-  */
-
-/**
-  * @brief Region 3 - Enable the execution for the active slot in unprivileged mode.
-  *                   Read only capability configured
-  *                   From 0x08012000 ==> 0x0801FFFF (56 kbytes)
-  */
-#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER3
-#define APP_PROTECT_MPU_FLASHEXE_START 0x08012000UL
-#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_64KB
-#define APP_PROTECT_MPU_FLASHEXE_SREG  0x01U    /*!< 64 Kbytes / 8 * 7 ==> 56 Kbytes */
-#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
-#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 4 - Enable the execution for active slot in unprivileged mode.
-  *                   Read only capability configured
-  *                   In addition to region 3, from 0x08020000 ==> 0x08020FFF (4 kbytes)
-  */
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_START 0x08020000UL
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_4KB
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x00U                /*!< All subregions activated */
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
-
-
-#define SFU_DBG_PORT            GPIOA
-#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
-#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
-
-#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
-#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. */
-#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
-#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
-#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
-#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
-
-#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_WRP)
-/*!< All the static protections */
-
-#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | \
-                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP  | \
-                                             SFU_RUNTIME_PROTECTION_DMA )
-/*!< All the run-time protections */
-
-#define SFU_INITIAL_CONFIGURATION           (0x00)     /*!< Initial configuration */
-
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
-#ifdef SFU_MPU_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(void);
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void);
-SE_ErrorStatus SE_SFU_IMG_Write(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SE_ErrorStatus SE_SFU_IMG_Read(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_SECURITY_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 6b8db4f7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/* COM usage define */
-#define USE_BSP_COM_FEATURE                 0U
-
-/* COM log define */
-#define USE_COM_LOG                         0U
-
-/* IRQ priorities */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/main.c
deleted file mode 100644
index c1281bc6..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/main.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    main.c
-  * @author  MCD Application Team
-  * @brief   Main program body
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-#define MAIN_C
-
-#include "sfu_fwimg_regions.h"
-#include "sfu_def.h"
-#include "sfu_loader.h"
-#include "sfu_com_loader.h"
-#include "sfu_low_level.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level_flash.h"
-#include "sfu_trace.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_new_image.h"
-#include "sfu_boot.h"
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-/**
-  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
-  */
-SE_FwRawHeaderTypeDef fw_image_header_validated;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-void SystemClock_Config(void);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/**
-  * @brief  The application entry point.
-  * @retval int
-  */
-int main(void)
-{
-  /* USER CODE BEGIN 1 */
-  uint32_t jump_address ;
-  typedef void (*Function_Pointer)(void);
-  Function_Pointer  p_jump_to_function;
-  __IO uint32_t *pSbsfuFlag = (__IO uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
-  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
-  uint32_t                  dwl_slot;
-  uint32_t                  u_size = 0;
-  SFU_FLASH_StatusTypeDef   flash_if_info;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-  /* Configure the system clock using LL functions */
-  SystemClock_Config();
-  /* USER CODE END 1 */
-
-  /* MCU Configuration--------------------------------------------------------*/
-
-  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-  HAL_Init();
-
-  /* USER CODE BEGIN Init */
-
-  /* USER CODE END Init */
-
-  /* USER CODE BEGIN SysInit */
-  /* LED Init*/
-  BSP_LED_Init(LED_RED);
-
-  /* Reset the SRAM1 flag */
-  *pSbsfuFlag = SBSFU_NOT_BOOTED;
-
-  /* Configure the security features */
-  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
-  {
-    SFU_EXCPT_Security_Error();
-  }
-
-  /* Boot CPU2 */
-  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-
-  /* Wait for the flag */
-  while (*pSbsfuFlag == SBSFU_NOT_BOOTED)
-  {
-    BSP_LED_Toggle(LED_RED);
-    HAL_Delay(500U);
-  }
-  BSP_LED_Off(LED_RED);
-  /* USER CODE END SysInit */
-
-  /* Initialize all configured peripherals */
-  /* USER CODE BEGIN 2 */
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  if (*pSbsfuFlag == SBSFU_FW_DOWNLOAD)
-  {
-    /* Initialize external flash interface (OSPI/QSPI) */
-    SFU_LL_FLASH_Init();
-
-    /* Configure Communication module */
-    SFU_LL_UART_Init();
-
-    TRACE("\r\n======================================================================");
-    TRACE("\r\n=                           Loader                                   =");
-    TRACE("\r\n======================================================================");
-    TRACE("\r\n");
-
-    /* Loader initialization */
-    e_ret_status = SFU_LOADER_Init();
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      TRACE("Initialization failure : reset !");
-      NVIC_SystemReset();
-    }
-
-    /* Download new firmware */
-    e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Read header in dwl slot */
-      e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
-                                       sizeof(SE_FwRawHeaderTypeDef));
-    }
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /*
-       * Notify the Secure Boot that a new image has been downloaded
-       * by calling the SE interface function to trigger the installation procedure at next reboot.
-       */
-       TRACE("\r\nDownload successful : %d bytes received\r\n", u_size);
-      if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
-      {
-        /* Erase downloaded image */
-        SFU_LL_FLASH_Erase_Size(&flash_if_info, (void *) SlotStartAdd[SLOT_DWL_1], SLOT_SIZE(SLOT_DWL_1));
-
-        /* no specific error cause set */
-      }
-    }
-    else
-    {
-      /* Erase downloaded image */
-      TRACE("\r\nDownload failed (%d)\r\n", e_ret_status);
-      SFU_LL_FLASH_Erase_Size(&flash_if_info, (void *) SlotStartAdd[SLOT_DWL_1], SLOT_SIZE(SLOT_DWL_1));
-    }
-
-    /* Reset to restart SBSFU */
-    NVIC_SystemReset();
-  }
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-  if (*pSbsfuFlag == SBSFU_BOOTED)
-  {
-#if defined(SFU_MPU_USERAPP_ACTIVATION)
-    SFU_LL_SECU_SetProtectionMPU_UserApp();
-#else
-    HAL_MPU_Disable();
-#endif /* SFU_MPU_USERAPP_ACTIVATION */
-
-    jump_address = *(__IO uint32_t *)((SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET + 4));
-    /* Jump to user application */
-    p_jump_to_function = (Function_Pointer) jump_address;
-    /* Initialize user application's Stack Pointer */
-    __set_MSP(*(__IO uint32_t *)(SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET));
-
-    /* JUMP into User App */
-    p_jump_to_function();
-  }
-
-  /* We shouldn't reach this point */
-  SFU_EXCPT_Security_Error();
-
-  /* USER CODE END 2 */
-
-  /* Infinite loop */
-  /* USER CODE BEGIN WHILE */
-  while (1)
-  {
-    /* USER CODE BEGIN 3 */
-
-    /* USER CODE END 3 */
-  }
-  /* USER CODE END WHILE */
-}
-
-/**
-  * @brief  System Clock Configuration
-  *         The system Clock is configured as follows :
-  *            System Clock source            = PLL (MSI)
-  *            SYSCLK(Hz)                     = 48000000
-  *            HCLK(Hz)                       = 48000000
-  *            AHB1 Prescaler                 = 1 
-  *            AHB3 Prescaler                 = 1
-  *            APB1 Prescaler                 = 1
-  *            APB2 Prescaler                 = 1
-  *            MSI Frequency(Hz)              = 4000000
-  *            PLL_M                          = 1
-  *            PLL_N                          = 24
-  *            PLL_R                          = 2
-  *            Flash Latency(WS)              = 2
-  *            Voltage range                  = 1
-  * @param  None
-  * @retval None
-  */
-void SystemClock_Config(void)
-{
-  LL_FLASH_SetLatency(LL_FLASH_LATENCY_2);
-
-  while(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_2)
-  {
-  };
-
-  LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
-  LL_RCC_MSI_Enable();
-
-   /* Wait till MSI is ready */
-  while(LL_RCC_MSI_IsReady() != 1)
-  {
-  };
-
-  LL_RCC_MSI_EnableRangeSelection();
-  LL_RCC_MSI_SetRange(LL_RCC_MSIRANGE_6);
-  LL_RCC_MSI_SetCalibTrimming(0);
-  LL_RCC_PLL_ConfigDomain_SYS(LL_RCC_PLLSOURCE_MSI, LL_RCC_PLLM_DIV_1, 24, LL_RCC_PLLR_DIV_2);
-  LL_RCC_PLL_EnableDomain_SYS();
-  LL_RCC_PLL_Enable();
-
-   /* Wait till PLL is ready */
-  while(LL_RCC_PLL_IsReady() != 1)
-  {
-  };
-
-  LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL);
-
-   /* Wait till System clock is ready */
-  while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL)
-  {
-  };
-
-  LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
-  LL_RCC_SetAHB3Prescaler(LL_RCC_SYSCLK_DIV_1);
-  LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
-  LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1);
-
-  LL_Init1msTick(48000000);
-
-  /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */
-  LL_SetSystemCoreClock(48000000);
-}
-
-/* USER CODE BEGIN 4 */
-
-/**
-  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
-  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
-  * @param  None
-  * @note   This operation should be done as soon as possible after a reboot.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply Static protections involving Option Bytes */
-  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
-  {
-    /* Apply runtime protections needed to be enabled after each Reset */
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Stop in case of security error
-  * @retval None
-  */
-void SFU_EXCPT_Security_Error(void)
-{
-  HAL_Delay(1000);
-  /* This is the last operation executed. Force a System Reset. */
-  NVIC_SystemReset();
-}
-
-/* USER CODE END 4 */
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @retval None
-  */
-void Error_Handler(void)
-{
-  /* USER CODE BEGIN Error_Handler_Debug */
-  /* User can add his own implementation to report the HAL error return state */
-  /* Security issue : execution stopped ! */
-  SFU_EXCPT_Security_Error();
-  /* USER CODE END Error_Handler_Debug */
-}
-
-#ifdef  USE_FULL_ASSERT
-/**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t *file, uint32_t line)
-{
-  /* USER CODE BEGIN 6 */
-  /* User can add his own implementation to report the file name and line number,
-    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  /* Security issue : execution stopped ! */
-  SFU_EXCPT_Security_Error();
-  /* USER CODE END 6 */
-}
-#endif /* USE_FULL_ASSERT */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_com_loader.c
deleted file mode 100644
index 23111c05..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_com_loader.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_com_loader.c
-  * @author  MCD Application Team
-  * @brief   Secure Firmware Update COM module.
-  *          This file provides set of firmware functions to manage SFU Com
-  *          functionalities for the local loader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level.h"
-#include "sfu_low_level_security.h"
-#include "sfu_com_loader.h"
-#include "sfu_trace.h"
-
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
-
-/* Private defines -----------------------------------------------------------*/
-#if defined(__ICCARM__)
-#define PUTCHAR_PROTOTYPE int putchar(int ch)
-#elif defined(__ARMCC_VERSION)
-#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
-#elif defined(__GNUC__)
-#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
-#endif /* __ICCARM__ */
-
-#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
-#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
-
-/* Private macros ------------------------------------------------------------*/
-#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
-#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
-#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
-#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
-#define ISVALIDDEC(c)       IS_09(c)
-#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
-
-#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
-#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
-
-/* Private function prototypes -----------------------------------------------*/
-static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
-static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
-
-/* Functions Definition ------------------------------------------------------*/
-
-#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
-/**
-  * @brief  SFU Com Init function.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_Init(void)
-{
-#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
-  setvbuf(stdout, NULL, _IONBF, 0);
-#endif /* __GNUC__ */
-  return SFU_LL_UART_Init();
-}
-
-/**
-  * @brief  SFU Com DeInit function.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_DeInit(void)
-{
-  return SFU_LL_UART_DeInit();
-}
-
-#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
-
-/**
-  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
-  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
-  * @param  puSize: size of received file.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
-  */
-SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
-{
-  uint32_t i;
-  uint32_t packet_length = 0U;
-  uint32_t session_done = 0U;
-  uint32_t file_done;
-  uint32_t errors = 0U;
-  uint32_t session_begin = 0U;
-  uint32_t filesize = 0U;
-  uint32_t packets_received;
-  uint8_t *file_ptr;
-  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
-  uint8_t tmp;
-  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
-                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(4)));
-
-  /* Check the pointers allocation */
-  if ((peCOMStatus == NULL) || (puSize == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  *peCOMStatus = SFU_COM_YMODEM_OK;
-
-  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
-  {
-    packets_received = 0U;
-    file_done = 0U;
-    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
-    {
-      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
-      {
-        case HAL_OK:
-          errors = 0U;
-          switch (packet_length)
-          {
-            case 3U:
-              /* Startup sequence */
-              break;
-            case 2U:
-              /* Abort by sender */
-              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-              *peCOMStatus = SFU_COM_YMODEM_ABORT;
-              break;
-            case 0U:
-              /* End of transmission */
-              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-              *puSize = filesize;
-              file_done = 1U;
-              break;
-            default:
-              /* Normal packet */
-              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
-              {
-                /* No NACK sent for a better synchro with remote : packet will be repeated */
-              }
-              else
-              {
-                if (packets_received == 0U)
-                {
-                  /* File name packet */
-                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
-                  {
-                    /* File name skipped */
-                    i = 0U;
-                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
-                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
-                    {
-                      i++;
-                      file_ptr++;
-                    }
-                    /* end of file name ('\0') skipped */
-                    file_ptr++;
-                    
-                    /* File size extraction */
-                    i = 0U;
-                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
-                    {
-                      file_size[i] = *file_ptr;
-                      i++;
-                      file_ptr++;
-                    }
-                    file_size[i] = (uint8_t) '\0';
-                    (void) Str2Int(file_size, &filesize);
-
-                    /* Header packet received callback call*/
-                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
-                    {
-                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-                      (void) SFU_LL_UART_Flush();
-                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
-                    }
-                    else
-                    {
-                      /* End session */
-                      tmp = SFU_COM_YMODEM_CA;
-                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
-                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
-                      return SFU_ERROR;
-                    }
-                  }
-                  /* File header packet is empty, end session */
-                  else
-                  {
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-                    file_done = 1U;
-                    session_done = 1U;
-                    break;
-                  }
-                }
-                else /* Data packet */
-                {
-                  /* Data packet received callback call*/
-                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX], 
-                                                           packet_length) == SFU_SUCCESS)
-                  {
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-
-                  }
-                  else /* An error occurred while writing to Flash memory */
-                  {
-                    /* End session */
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-                    *peCOMStatus = SFU_COM_YMODEM_DATA;
-                  }
-
-                }
-                packets_received ++;
-                session_begin = 1;
-              }
-              break;
-          }
-          break;
-        case HAL_BUSY: /* Abort actually */
-          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-          *peCOMStatus = SFU_COM_YMODEM_ABORT;
-          break;
-        default:
-          if (session_begin > 0U)
-          {
-            errors ++;
-          }
-          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
-          {
-            /* Abort communication */
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-            *peCOMStatus = SFU_COM_YMODEM_ABORT;
-          }
-          else
-          {
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
-#ifndef MINICOM_YMODEM
-            /* Minicom does not accept this extra character */
-            TRACE("\b.");                                 /* Replace C char by . on display console */
-#endif /* MINICOM_YMODEM */
-            /*
-             * Toggling the LED in case no console is available: the toggling frequency depends on
-             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
-             */
-            (void) BSP_LED_Toggle(SFU_STATUS_LED);
-          }
-          break;
-      }
-    }
-  }
-  /* Make sure the status LED is turned off */
-  (void) BSP_LED_Off(SFU_STATUS_LED);
-
-  if (*peCOMStatus == SFU_COM_YMODEM_OK)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-}
-
-/**
-  * @brief  Transmit a byte to the COM Port.
-  * @param  uParam: The byte to be sent.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
-{
-  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
-}
-
-/**
-  * @brief  Convert a string to an integer.
-  * @param  pInputStr: The string to be converted.
-  * @param  pIntNum: The integer value.
-  * @retval 1: Correct
-  *         0: Error
-  */
-static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
-{
-  uint32_t i = 0U;
-  uint32_t res = 0U;
-  uint32_t val = 0U;
-  uint8_t  x;
-
-  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
-  {
-    i = 2U;
-    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
-    {
-      if (ISVALIDHEX(pInputStr[i]))
-      {
-        x = CONVERTHEX(pInputStr[i]);
-        val = (val << 4U) + x;
-      }
-      else
-      {
-        /* Return 0, Invalid input */
-        res = 0U;
-        break;
-      }
-      i++;
-    }
-
-    /* valid result */
-    if (pInputStr[i] == (uint8_t)'\0')
-    {
-      *pIntNum = val;
-      res = 1U;
-    }
-  }
-  else /* max 10-digit decimal input */
-  {
-    while ((i < 11U) && (res != 1U))
-    {
-      if (pInputStr[i] == (uint8_t)'\0')
-      {
-        *pIntNum = val;
-        /* return 1 */
-        res = 1U;
-      }
-      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
-      {
-        val = val << 10U;
-        *pIntNum = val;
-        res = 1U;
-      }
-      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
-      {
-        val = val << 20U;
-        *pIntNum = val;
-        res = 1U;
-      }
-      else if (ISVALIDDEC(pInputStr[i]))
-      {
-        x =  CONVERTDEC(pInputStr[i]);
-        val = (val * 10U) + x;
-      }
-      else
-      {
-        /* return 0, Invalid input */
-        res = 0U;
-        break;
-      }
-      i++;
-    }
-  }
-
-  return res;
-}
-
-/**
-  * @brief  Receive a packet from sender
-  * @param  pData: pointer to received data.
-  * @param  puLength
-  *     0: end of transmission
-  *     2: abort by sender
-  *    >0: packet length
-  * @param  uTimeOut: receive timeout (ms).
-  * @retval HAL_OK: normally return
-  *         HAL_BUSY: abort by user
-  */
-static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
-{
-  uint32_t crc;
-  uint32_t packet_size = 0U;
-  HAL_StatusTypeDef status;
-  SFU_ErrorStatus eRetStatus;
-
-  uint8_t char1;
-
-#ifdef MINICOM_YMODEM
-  uint32_t myIdx = 0; /* index indicating where to write in pData */
-#endif /* MINICOM_YMODEM */
-
-  *puLength = 0U;
-
-  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
-
-  if (eRetStatus == SFU_SUCCESS)
-  {
-    status = HAL_OK;
-
-    switch (char1)
-    {
-      case SFU_COM_YMODEM_SOH:
-        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
-        break;
-      case SFU_COM_YMODEM_STX:
-        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
-        break;
-      case SFU_COM_YMODEM_EOT:
-        break;
-      case SFU_COM_YMODEM_CA:
-        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
-        {
-          packet_size = 2U;
-        }
-        else
-        {
-          status = HAL_ERROR;
-        }
-        break;
-      case SFU_COM_YMODEM_ABORT1:
-      case SFU_COM_YMODEM_ABORT2:
-        status = HAL_BUSY;
-        break;
-      case SFU_COM_YMODEM_RB:
-        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
-        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
-        packet_size = 3U;
-        break;
-      default:
-        status = HAL_ERROR;
-        break;
-    }
-    *pData = char1;
-
-    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
-    {
-
-#ifndef MINICOM_YMODEM
-      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX], 
-                                       (uint16_t) (packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
-#else
-      eRetStatus = SFU_SUCCESS;
-      /* Receive byte per byte until no data left or no space left in buffer */
-      while ((SFU_SUCCESS == eRetStatus) &&
-             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
-              SFU_COM_YMODEM_PACKET_DATA_INDEX +
-              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
-            )
-      {
-        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
-                                         1U, uTimeout);
-        myIdx++;
-      }
-
-      if (myIdx > 1)
-      {
-        /* We received some bytes */
-        eRetStatus = SFU_SUCCESS;
-      }
-#endif /* MINICOM_YMODEM */
-
-      /* Simple packet sanity check */
-      if (eRetStatus == SFU_SUCCESS)
-      {
-        status = HAL_OK;
-
-        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
-                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
-        {
-          packet_size = 0U;
-          status = HAL_ERROR;
-        }
-        else
-        {
-          /* Check packet CRC*/
-          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
-          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
-
-          /*Configure CRC with 16-bit polynomial*/
-          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
-          {
-            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
-            {
-              packet_size = 0U;
-              status = HAL_ERROR;
-            }
-
-          }
-          else
-          {
-            packet_size = 0U;
-            status = HAL_ERROR;
-          }
-        }
-      }
-      else
-      {
-        status = HAL_ERROR;
-      }
-    }
-  }
-  else
-  {
-    status = HAL_ERROR;
-  }
-
-  *puLength = packet_size;
-  return status;
-}
-
-/**
-  * @brief  Ymodem Header Packet Transfer completed callback.
-  * @param  uFileSize: Dimension of the file that will be received.
-  * @retval None
-  */
-__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
-{
-
-  /* NOTE : This function should not be modified, when the callback is needed,
-            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
-   */
-  UNUSED(uFileSize);
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Ymodem Data Packet Transfer completed callback.
-  * @param  pData: Pointer to the buffer.
-  * @param  uSize: Packet dimension.
-  * @retval None
-  */
-__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-
-  /* NOTE : This function should not be modified, when the callback is needed,
-            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
-   */
-  UNUSED(pData);
-  UNUSED(uSize);
-  return SFU_SUCCESS;
-}
-
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_loader.c
deleted file mode 100644
index 8cdf9097..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_loader.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_loader.c
-  * @author  MCD Application Team
-  * @brief   Secure Firmware Update LOADER module.
-  *          This file provides set of firmware functions to manage SFU local
-  *          loader functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_LOADER_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include "main.h"
-#include "sfu_loader.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "sfu_com_loader.h"
-#include "sfu_trace.h"
-#include "se_interface_bootloader.h" /* for metadata authentication */
-#include "app_sfu.h"
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-
-/* Private variables ---------------------------------------------------------*/
-#ifdef MINICOM_YMODEM
-/*
- * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
- * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
- */
-/* With Minicom YMODEM each packet carries 128 bytes of data */
-static uint8_t alignedBuffer[SFU_COM_YMODEM_PACKET_SIZE] __attribute__((aligned(4)));
-#endif /* MINICOM_YMODEM */
-static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
-static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
-static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
-static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
-static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
-static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
-static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
-static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize the SFU LOADER.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_Init(void)
-{
-  /*
-  * ADD SRC CODE HERE
-  */
-
-  /*
-   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
-   * when doing a length alignment before writing in FLASH.
-   */
-#ifndef MINICOM_YMODEM
-  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_1K_SIZE bytes of payload */
-  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_1K_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
-    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints",
-          SFU_COM_YMODEM_PACKET_1K_SIZE);
-    return SFU_ERROR;
-  } /* else the FW Header Length is fine with regards to FLASH constraints */
-#else /* MINICOM_YMODEM */
-  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_SIZE bytes of payload */
-  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
-    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints", SFU_COM_YMODEM_PACKET_SIZE);
-    return SFU_ERROR;
-  }
-#endif /* MINICOM_YMODEM */
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  DeInitialize the SFU LOADER.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_DeInit(void)
-{
-  /*
-   * ADD SRC CODE HERE
-   */
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Download a new User Fw.
-  *         Writes firmware received via Ymodem in FLASH.
-  * @param  peSFU_LOADER_Status: SFU LOADER Status.
-  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
-  * @param  p_DwlSlot identification of the downloaded area
-  * @param  p_Size Size of the downloaded image.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
-                                             uint32_t *pSize)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
-
-  /* Check the pointers allocation */
-  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Refresh Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* Transfer FW Image via YMODEM protocol */
-  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
-
-  /* Initialize global variables to be used during the YMODEM process */
-  m_uDwlAreaAddress = 0U;
-  m_uDwlAreaStart = 0U;
-  m_uDwlAreaSize = 0U;
-  m_uFileSizeYmodem = 0U;
-  m_uNbrBlocksYmodem = 0U;
-  m_uPacketsReceived = 0U;
-  m_uDwlSlot = SLOT_DWL_1;
-  m_LoaderStatus = SFU_LOADER_ERR_COM;
-
-  /* Receive the FW in RAM and write it in the Flash*/
-  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
-  {
-    if (*pSize > 0U)
-    {
-      /* File download correct*/
-      m_LoaderStatus = SFU_LOADER_OK;
-    }
-  }
-  else
-  {
-    /* Nothing to do : m_LoaderStatus updated during during YModem process */
-  }
-
-  /* Provide slot information to the caller
-     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
-     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
-  *pDwlSlot = m_uDwlSlot;
-
-
-  *peSFU_LOADER_Status = m_LoaderStatus;
-  if (m_LoaderStatus == SFU_LOADER_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Ymodem Header Packet Transfer completed callback.
-  * @param  uFileSize: Dimension of the file that will be received.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
-{
-  /*Reset of the ymodem variables */
-  m_uFileSizeYmodem = 0U;
-  m_uPacketsReceived = 0U;
-  m_uNbrBlocksYmodem = 0U;
-
-  /*Filesize information is stored*/
-  m_uFileSizeYmodem = uFileSize;
-
-  /*Compute the number of blocks */
-#ifndef MINICOM_YMODEM
-  /* Teraterm sends 1kB YMODEM packets */
-  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
-#else
-  /* Minicom sends 128 bytes YMODEM packets */
-  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
-#endif /* MINICOM_YMODEM */
-
-  /* NOTE : delay inserted for Ymodem protocol*/
-  HAL_Delay(1000U);
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Ymodem Data Packet Transfer completed callback.
-  * @param  pData: Pointer to the buffer.
-  * @param  uSize: Packet dimension.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-#ifndef MINICOM_YMODEM
-/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
-SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-  /* The local loader must make a copy of the Firmware metadata,
-   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
-   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
-  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(4)));
-  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
-  static uint32_t m_uDwlImgSize = 0U;
-
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_FLASH_StatusTypeDef x_flash_info;
-  uint32_t rx_size = uSize;
-  uint8_t *p_data = pData;
-  uint32_t uOldSize;
-#if  !defined(SFU_NO_SWAP)
-  uint32_t uLength;
-#endif /* !SFU_NO_SWAP */
-
-  /* Check the pointers allocation */
-  if (p_data == NULL)
-  {
-    return SFU_ERROR;
-  }
-    
-  /*Increase the number of received packets*/
-  m_uPacketsReceived++;
-
-  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    /*Extracting actual payload from last packet*/
-    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
-    {
-      /* The last packet must be fully considered */
-      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
-    }
-    else
-    {
-      /* The last packet is not full, drop the extra bytes */
-      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
-                                   SFU_COM_YMODEM_PACKET_1K_SIZE);
-    }
-  }
-
-  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
-  if (m_uPacketsReceived == 1U)
-  {
-
-    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
-
-    /* Verify header */
-    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress = m_uDwlAreaStart;
-#if   defined(SFU_NO_SWAP)
-
-      /* Downloaded Image size : Header size + Image size */
-      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
-#else
-      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
-         Partial Image size */
-      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwSize +
-                      (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
-                      SFU_IMG_IMAGE_OFFSET;
-#endif /* (SFU_NO_SWAP) */
-    }
-
-    /* Clear Download application area (including TRAILERS area) */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
-          SFU_SUCCESS)
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-  }
-
-#if  !defined(SFU_NO_SWAP)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* This packet : contains end of FW header */
-    if ((m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)) &&
-        ((m_uDwlAreaAddress + rx_size) >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)))
-    {
-      /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE bytes length) */
-      uLength = SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE;
-      if (uLength == 0U)
-      {
-        uLength = SFU_COM_YMODEM_PACKET_1K_SIZE;
-      }
-      if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, uLength) == SFU_SUCCESS)
-      {
-        /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
-        m_uDwlAreaAddress += uLength + (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP));
-
-        /* Update remaining packet size to write */
-        rx_size -= uLength;
-
-        /* Update p_data pointer to received packet data */
-        p_data += uLength;
-      }
-      else
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-        e_ret_status = SFU_ERROR;
-      }
-    }
-  }
-#endif /* !SFU_NO_SWAP */
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Check size to avoid writing beyond DWL image size */
-    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Set dimension to the appropriate length for FLASH programming.
-     * Example: 64-bit length for L4.
-     */
-    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
-    {
-      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
-         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
-      uOldSize = rx_size;
-      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-      while (uOldSize < rx_size)
-      {
-        p_data[uOldSize] = 0xFF;
-        uOldSize++;
-      }
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Check size to avoid writing beyond DWL area */
-    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  /* Write Data in Flash */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, rx_size) == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress += (rx_size);
-    }
-    else
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-
-  /* Last packet : reset m_uPacketsReceived */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    m_uPacketsReceived = 0U;
-  }
-
-  /* Reset data counters in case of error */
-  if (e_ret_status == SFU_ERROR)
-  {
-    /*Reset of the ymodem variables */
-    m_uFileSizeYmodem = 0U;
-    m_uPacketsReceived = 0U;
-    m_uNbrBlocksYmodem = 0U;
-  }
-
-  return e_ret_status;
-}
-#else /* MINICOM_YMODEM */
-/* Minicom variant of the YMODEM protocol: uses 128B packets */
-SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-  /* The local loader must make a copy of the Firmware metadata,
-   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
-   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
-  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(4)));
-  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
-  static uint32_t m_uDwlImgSize = 0U;
-
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_FLASH_StatusTypeDef x_flash_info;
-  uint32_t rx_size = uSize;  
-  uint8_t *p_data = pData;
-  uint32_t uOldSize;
-
-  /* Check the pointers allocation */
-  if (p_data == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  /*Increase the number of received packets*/
-  m_uPacketsReceived++;
-
-  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
-    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
-    {
-      /* The last packet must be fully considered */
-      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
-    }
-    else
-    {
-      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
-      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
-                                   SFU_COM_YMODEM_PACKET_SIZE);
-    }
-  }
-
-
-  /*
-   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
-   */
-
-  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
-     not encrypted  */
-  if (1 == m_uPacketsReceived)
-  {
-    /* First packet: beginning of header */
-    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
-    {
-      /* Copy the beginning of the header */
-      memcpy(fw_header, p_data, rx_size);
-      rx_size = 0U; /* nothing more to do */
-    }
-    else
-    {
-      /* Unexpected case */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else if (2U == m_uPacketsReceived)
-  {
-    /* Second packet: end of header (64 bytes) */
-    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
-    rx_size -= 64U;
-    p_data += 64U;
-
-    /* Verify header */
-    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress = m_uDwlAreaStart;
-      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
-         Partial Image size */
-      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwSize +
-                      (((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
-                      SFU_IMG_IMAGE_OFFSET;
-
-      /* Clear Download application area (including TRAILERS area) */
-      if ((e_ret_status == SFU_SUCCESS)
-          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
-              SFU_SUCCESS))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
-        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
-            == SFU_SUCCESS)
-        {
-          /* Shift the DWL area pointer (still to be aligned image with (PartialFwOffset % sector size) in DWL area ) */
-          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
-        }
-        else
-        {
-          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-          e_ret_status = SFU_ERROR;
-        }
-      }
-      /* The remaining 64 bytes of data must be handled : standard processing */
-    }
-  }
-  /*
-   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
-   */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /*
-     * End of the second packet (64B) or full 128B packet
-     * Skip padding bytes then take partial FW offset into account
-     */
-    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
-    {
-      /* Skip the padding bytes */
-      m_uDwlAreaAddress += rx_size;
-      rx_size = 0U;
-    }
-    else
-    {
-      /*
-       * m_uDwlAreaAddress >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)
-       */
-      if (((SFU_IMG_IMAGE_OFFSET / SFU_COM_YMODEM_PACKET_SIZE) + 1) == m_uPacketsReceived)
-      {
-        /* End of padding bytes : We must take the partial offset into account */
-        m_uDwlAreaAddress += ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
-      }
-      /* else nothing more to do */
-
-      /* Check size to avoid writing beyond DWL image size */
-      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      /* Set dimension to the appropriate length for FLASH programming.
-       * Example: 64-bit length for L4.
-       */
-      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
-      {
-        /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
-           sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
-        uOldSize = rx_size;
-        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-        while (uOldSize < rx_size)
-        {
-          p_data[uOldSize] = 0xFF;
-          uOldSize++;
-        }
-      }
-
-      /* Check size to avoid writing beyond DWL area */
-      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      /* Write Data in Flash */
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /*
-         * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
-         * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
-         */
-        memcpy(alignedBuffer, p_data, rx_size);
-
-        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, alignedBuffer, rx_size) == SFU_SUCCESS)
-        {
-          m_uDwlAreaAddress += (rx_size);
-        }
-        else
-        {
-          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-          e_ret_status = SFU_ERROR;
-        }
-      }
-    }
-  }
-
-
-  /* Last packet : reset m_uPacketsReceived */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    m_uPacketsReceived = 0U;
-  }
-
-  /* Reset data counters in case of error */
-  if (e_ret_status == SFU_ERROR)
-  {
-    /*Reset of the ymodem variables */
-    m_uFileSizeYmodem = 0U;
-    m_uPacketsReceived = 0U;
-    m_uNbrBlocksYmodem = 0U;
-  }
-
-  return e_ret_status;
-}
-#endif /* MINICOM_YMODEM */
-
-
-/**
-  * @brief  Verifies the Raw Fw Header received. It checks if the header is
-  *         authentic and if the fields are ok with the device (e.g. size and version).
-  * @note   Please note that when the new image is installed, this metadata is checked
-  *         by @ref SFU_IMG_CheckCandidateVersion.
-  * @param  peSFU_LOADER_Status: SFU LOADER Status.
-  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
-  * @param  pBuffer: pointer to header Buffer.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-/* anti-rollback mechanism is tested twice to avoid basic hardware attack
-   ==> compiler optimization is disabled for this reason */
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O0")))
-#endif /* __ICCARM__ */
-
-static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
-{
-  SFU_FwImageFlashTypeDef       fw_image_flash_data;
-
-  m_uDwlSlot = SLOT_DWL_1;
-
-  SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
-
-  /* Assign the download flash address to be used during the YMODEM process */
-  m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
-  m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
-
-  return SFU_SUCCESS;
-}
-
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
deleted file mode 100644
index b3a1363f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
+++ /dev/null
@@ -1,1043 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.c
-  * @author  MCD Application Team
-  * @brief   SB Security Low Level Interface module
-  *          This file provides set of firmware functions to manage SB security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_security.h"
-#include "sfu_boot.h"
-
-#ifndef  SFU_WRP_PROTECT_ENABLE
-#warning "SFU_WRP_PROTECT_DISABLED"
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifndef  SFU_MPU_PROTECT_ENABLE
-#warning "SFU_MPU_PROTECT_DISABLED"
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#ifndef  SFU_C2_DDS_PROTECT_ENABLE
-#warning "SFU_C2_DDS_PROTECT_DISABLED"
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifndef  SFU_DAP_PROTECT_ENABLE
-#warning "SFU_DAP_PROTECT_DISABLED"
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-#ifndef  SFU_DMA_PROTECT_ENABLE
-#warning "SFU_DMA_PROTECT_DISABLED"
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-#ifndef  SFU_IWDG_PROTECT_ENABLE
-/* #warning "SFU_IWDG_PROTECT_DISABLED" */
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
-#warning "SFU_SECURE_USER_PROTECT_DISABLED"
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-/* Private typedef -----------------------------------------------------------*/
-typedef enum
-{
-  SFU_FALSE = 0U,
-  SFU_TRUE = !SFU_FALSE
-} SFU_BoolTypeDef;
-
-typedef struct
-{
-  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Number */
-  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
-  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
-  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Permission_Attributes */
-  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
-                                                 of  CORTEX_MPU_Instruction_Access */
-  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
-                                                 is 1 region sub region is disabled */
-  uint8_t                Tex;               /*!< Specifies the tex value  */
-  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
-  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
-} SFU_MPU_InitTypeDef;
-
-typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
-
-/* Private variables ---------------------------------------------------------*/
-
-#ifdef  SFU_IWDG_PROTECT_ENABLE
-static IWDG_HandleTypeDef   IwdgHandle;
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-#ifdef  SFU_MPU_PROTECT_ENABLE
-static SFU_MPU_InitTypeDef MpuAreas[] =
-{
-  /* Aliases Region and all User Flash & internal RAM */
-  {
-    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
-    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
-    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
-  },
-  /* SRAM flag access */
-  {
-    SFU_PROTECT_MPU_SRAM_FLAG_RGNV, SFU_PROTECT_MPU_SRAM_FLAG_START, SFU_PROTECT_MPU_SRAM_FLAG_SIZE,
-    SFU_PROTECT_MPU_SRAM_FLAG_PERM, SFU_PROTECT_MPU_SRAM_FLAG_EXECV, SFU_PROTECT_MPU_SRAM_FLAG_SREG,
-    SFU_PROTECT_MPU_SRAM_FLAG_TEXV, SFU_PROTECT_MPU_SRAM_FLAG_C, SFU_PROTECT_MPU_SRAM_FLAG_B
-  },
-  /*  Flash execution */
-  {
-    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
-    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
-    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
-  },
-  /*  App Access */
-  {
-    SFU_PROTECT_MPU_APP_FLASHEXE_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_START, SFU_PROTECT_MPU_APP_FLASHEXE_SIZE,
-    SFU_PROTECT_MPU_APP_FLASHEXE_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_SREG,
-    SFU_PROTECT_MPU_APP_FLASHEXE_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_C, SFU_PROTECT_MPU_APP_FLASHEXE_B
-  },
-  /*  App Access */
-  {
-    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE,
-    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG,
-    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B
-  },
-  /*  peripheral  */
-  {
-    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
-    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
-    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
-  }
-};
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-static SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
-                                                      FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
-                                                    FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifdef SFU_DAP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void);
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-
-#ifdef SFU_DMA_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void);
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-
-/**
-  * @brief  Check and if not applied apply the Static security  protections to
-  *         all the SfuEn Sections in Flash: RDP, WRP. Static security protections
-  *         those protections not impacted by a Reset. They are set using the Option Bytes
-  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
-  * @param  None
-  * @note   By default, the best security protections are applied to the different
-  *         flash sections in order to maximize the security level for the specific MCU.
-  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
-  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
-{
-  FLASH_OBProgramInitTypeDef flash_option_bytes;
-  FLASH_OBProgramInitTypeDef sfu_flash_option_bytes;
-  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
-  SFU_BoolTypeDef is_current_protection_to_be_applied = SFU_FALSE;
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  HAL_FLASH_Unlock();
-
-  /* Clear OPTVERR bit set on virgin samples */
-  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
-
-  /* Unlock the Options Bytes *************************************************/
-  HAL_FLASH_OB_Unlock();
-
-  /* Get Option Bytes status for WRP AREA  **********/
-  flash_option_bytes.WRPArea     = SFU_C1_PROTECT_WRP_AREA;
-  HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
-  sfu_flash_option_bytes.WRPArea = SFU_C2_PROTECT_WRP_AREA;
-  HAL_FLASHEx_OBGetConfig(&sfu_flash_option_bytes);
-
-  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
-  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
-  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
-  {
-
-    /* Sanity check of the (enabled) static protections */
-    if (SFU_LL_SECU_CheckC2BootConfiguration(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-
-    if (SFU_LL_SECU_CheckProtectionBootLock(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifdef SFU_SECURE_USER_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-    /*RDP level 2 ==> Flow control by-passed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-  }
-  else
-  {
-    /* Check/Set C2 Boot configuration **********************************************/
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      is_current_protection_to_be_applied = SFU_FALSE;
-      e_ret_status = SFU_LL_SECU_SetC2BootConfiguration(&flash_option_bytes, &is_current_protection_to_be_applied);
-      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
-      {
-        /* Generate a first system Reset to reload the new option byte values *************/
-        /* C2OPT and SBRV cannot be written if C2BOOT_LOCK = 1 */
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        HAL_FLASH_OB_Launch();
-      }
-    }
-
-    /* Check/Set Boot Lock configuration *******************************************/
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionBootLock(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-
-    /* Check/Apply WRP ********************************************************/
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes,
-                                                  &is_protection_to_be_applied);
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-    /* Check/Apply C2 DDS *****************************************************/
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      is_current_protection_to_be_applied = SFU_FALSE;
-      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_current_protection_to_be_applied);
-      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
-      {
-        /* Generate a first system Reset to reload the new option byte values *************/
-        /* DDS cannot be written if ESE = 1 */
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        HAL_FLASH_OB_Launch();
-      }
-    }
-#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
-
-    /* Check/Apply Secure User Memory *****************************************/
-#ifdef SFU_SECURE_USER_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (is_protection_to_be_applied)
-      {
-        /* Generate System Reset to reload the new option byte values *************/
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        HAL_FLASH_OB_Launch();
-      }
-    }
-  }
-
-
-  /* Lock the Options Bytes ***************************************************/
-  HAL_FLASH_OB_Lock();
-
-  /* Lock the Flash to disable the flash control register access (recommended
-  to protect the FLASH memory against possible unwanted operation) *********/
-  HAL_FLASH_Lock();
-
-  /* If it was not possible to apply one of the above mandatory protections, the
-  Option bytes have not been reloaded. Return the error status in order for the
-  caller function to take the right actions */
-  return e_ret_status;
-
-}
-
-
-/**
-  * @brief  Apply Runtime security  protections.
-  *         Runtime security protections have to be re-configured at each Reset.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
-
-  /* Depending on compilation switches, prevent compilation warning */
-  UNUSED(runtime_protection);
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionMPU() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-
-  /* Check/Apply disable DMAs  ************************************************/
-#ifdef SFU_DMA_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-  /* Check/Apply  IWDG **************************************************/
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-  /* Check/Apply  DAP *********************************************************/
-#ifdef SFU_DAP_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check C2 boot configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply C2OPT and SBRV ***********************************************/
-  if ((psFlashOptionBytes->C2BootRegion == OB_C2_BOOT_FROM_FLASH)&&
-      (psFlashOptionBytes->C2SecureBootVectAddr == SFU_C2_BOOT_BASE_ADDR))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  /* Execution stopped if flow control failed */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Apply C2 boot configuration.
-  * @note   C2OPT and SBRV can only be accessed by software when C2BOOT_LOCK = 0.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if Secure User Memory is already configured */
-  if (SFU_LL_SECU_CheckC2BootConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_BOOT_VECT;
-    psFlashOptionBytes->C2BootRegion            = OB_C2_BOOT_FROM_FLASH;
-    psFlashOptionBytes->C2SecureBootVectAddr    = SFU_C2_BOOT_BASE_ADDR;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
-    }
-#else
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check Boot Lock configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
-  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
-      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-  }
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  Set Boot Lock configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check Boot Lock configuration */
-  if (SFU_LL_SECU_CheckProtectionBootLock(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
-    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
-    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
-    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-    }
-#else
-    /* Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed */
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-/**
-  * @brief  Check the WRP protection to the specified Area. It includes the SB Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
-                                               FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Check WRP ****************************************************************/
-  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
-  if ((psSbFlashOptionBytes->WRPStartOffset > SFU_C1_PROTECT_WRP_PAGE_START) ||
-      (psSbFlashOptionBytes->WRPEndOffset   < SFU_C1_PROTECT_WRP_PAGE_END))
-  {
-    e_ret_status = SFU_ERROR; /*Protection not applied */
-  }
-  if ((psSfuFlashOptionBytes->WRPStartOffset > SFU_C2_PROTECT_WRP_PAGE_START) ||
-      (psSfuFlashOptionBytes->WRPEndOffset   < SFU_C2_PROTECT_WRP_PAGE_END))
-  {
-    e_ret_status = SFU_ERROR; /*Protection not applied */
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply the WRP protection to the specified Area. It includes the SB Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
-                                             FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply WRP **********************************************************/
-  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
-  if (SFU_LL_SECU_CheckProtectionWRP(psSbFlashOptionBytes, psSfuFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS; /*Protection already applied */
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psSbFlashOptionBytes->OptionType      = OPTIONBYTE_WRP;
-    psSbFlashOptionBytes->WRPArea         = SFU_C1_PROTECT_WRP_AREA;
-    psSbFlashOptionBytes->WRPStartOffset  = SFU_C1_PROTECT_WRP_PAGE_START;
-    psSbFlashOptionBytes->WRPEndOffset    = SFU_C1_PROTECT_WRP_PAGE_END;
-
-    if (HAL_FLASHEx_OBProgram(psSbFlashOptionBytes) == HAL_OK)
-    {
-      psSfuFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
-      psSfuFlashOptionBytes->WRPArea        = SFU_C2_PROTECT_WRP_AREA;
-      psSfuFlashOptionBytes->WRPStartOffset = SFU_C2_PROTECT_WRP_PAGE_START;
-      psSfuFlashOptionBytes->WRPEndOffset   = SFU_C2_PROTECT_WRP_PAGE_END;
-
-      if (HAL_FLASHEx_OBProgram(psSfuFlashOptionBytes) == HAL_OK)
-      {
-        *pbIsProtectionToBeApplied |= 1U;
-        e_ret_status = SFU_SUCCESS;
-        /* Execution stopped if flow control failed */
-        FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-      }
-    }
-#else
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-/**
-  * @brief  Check DDS protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check WRP ****************************************************************/
-  /* Check if the protection is already applied */
-  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply DDS protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply DDS **********************************************************/
-  /* Check if the protection is already applied */
-  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
-
-    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
-    }
-#else
-    /* System Security Configuration failed: Sub-GHz radio SPI security access is incorrect */
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-/**
-  * @brief  Apply MPU protection before executing UserApp
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  /*  modify executable region for executing UserAPP*/
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  /*  modify executable region for executing UserAPP */
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_ADJUST_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_ADJUST_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_ADJUST_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  return e_ret_status;
-}
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-
-/**
-  * @brief  Apply MPU protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  uint8_t mpu_region_num = 0U; /* id of the MPU region being configured */
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  HAL_MPU_Disable();
-
-  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
-  {
-    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
-    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
-    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
-    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
-    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
-    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
-    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Bufferable;
-    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Cacheable;
-    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
-    HAL_MPU_ConfigRegion(&MPU_InitStruct);
-  }
-  HAL_MPU_Enable(MPU_HARDFAULT_NMI);
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
-  }
-  return e_ret_status;
-}
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-
-#ifdef SFU_DMA_PROTECT_ENABLE
-/**
-  * @brief  Apply DMA protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  /*
-   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
-   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
-   * information in SRAM, FLASH
-   */
-  /* Disable  DMA1, DMA2 */
-  __HAL_RCC_DMA1_CLK_DISABLE();
-
-  __HAL_RCC_DMA2_CLK_DISABLE();
-
-  __HAL_RCC_DMAMUX1_CLK_DISABLE();
-
-
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
-  return e_ret_status;
-}
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-/**
-  *  @brief Apply IWDG protection
-  *         The IWDG timeout is set to 4 second.
-  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
-  *         to the measured LSI frequency after setting the prescaler value:
-  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
-  This is not used in this implementation because not necessary and in order
-  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
-
-  /* Configure & Start the IWDG peripheral */
-  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
-  IWDG counter clock Frequency = uwLsiFreq
-  Set Prescaler to 64 (IWDG_PRESCALER_64)
-  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
-  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
-  IwdgHandle.Instance = IWDG;
-  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
-  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
-  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
-
-  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef SFU_DAP_PROTECT_ENABLE
-/**
-  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-
-  assert_param(SFU_IS_FUNCTIONAL_STATE(eState));
-
-  /* Enable clock of DBG GPIO port */
-  SFU_DBG_CLK_ENABLE();
-
-  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
-  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
-  e_ret_status = SFU_SUCCESS;
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
-
-  return e_ret_status;
-}
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-/**
-  * @brief  Check Secure User Memory protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
-   */
-  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
-  {
-    /*
-     * In this example secure area covers:
-     * - the SB_SFU code
-     * - the header of the slot #0
-     */
-    e_ret_status = SFU_SUCCESS;
-
-    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
-    {
-      if (psFlashOptionBytes->SecureFlashStartAddr != SFU_SECURE_FLASH_START)
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
-    {
-      if (psFlashOptionBytes->HideProtectionStartAddr != SFU_HIDE_PROTECTION_START)
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
-    {
-      if (psFlashOptionBytes->SecureSRAM1StartAddr != SFU_SECURE_SRAM1_START)
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
-    {
-      if (psFlashOptionBytes->SecureSRAM2StartAddr != SFU_SECURE_SRAM2_START)
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-  }
-
-  /* Execution stopped if flow control failed */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Apply Secure User Memory protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if Secure User Memory is already configured */
-  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
-
-    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
-    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
-    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
-    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
-    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
-    }
-#else
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-/**
-  * @brief  Refresh Watchdog : reload counter
-  *         This function must be called just before jumping to the UserFirmware
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  /* Refresh IWDG: reload counter */
-  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-#else
-  e_ret_status = SFU_SUCCESS;
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-  return e_ret_status;
-}
-
-/**
-  * @brief call by SFU to write a flash protected area
-  *         This SE function should never be called.
-  * @param  pSE_Status: Secure Engine Status.
-  * @param  pDestination: pointer to flash area to write.
-  * @param  pSource: pointer to input buffer.
-  * @param  Length: number of bytes to write to flash
-  * @retval SE_ErrorStatus SE_ERROR.
-  */
-SE_ErrorStatus SE_SFU_IMG_Write(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  /* Security issue : execution stopped ! */
-  SFU_EXCPT_Security_Error();
-
-  /* We shouldn't get there */
-  return SE_ERROR;
-}
-
-/**
-  * @brief call by SFU to read flash protected area
-  *         This SE function should never be called.
-  * @param  pSE_Status: Secure Engine Status.
-  * @param  pDestination: pointer to output buffer.
-  * @param  pSource: pointer to the flash area to read.
-  * @param  Length: number of bytes to read from flash
-  * @retval SE_ErrorStatus SE_ERROR.
-  */
-SE_ErrorStatus SE_SFU_IMG_Read(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  /* Security issue : execution stopped ! */
-  SFU_EXCPT_Security_Error();
-
-  /* We shouldn't get there */
-  return SE_ERROR;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
deleted file mode 100644
index eb9b8c4d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_it.c
-  * @author  MCD Application Team
-  * @brief   Main Interrupt Service Routines.
-  *          This file provides template for all exceptions handler and
-  *          peripherals interrupt service routine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "stm32wlxx_it.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN TD */
-
-/* USER CODE END TD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/* External variables --------------------------------------------------------*/
-
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/******************************************************************************/
-/*           Cortex Processor Interruption and Exception Handlers          */
-/******************************************************************************/
-/**
-  * @brief This function handles Hard fault interrupt.
-  */
-void HardFault_Handler(void)
-{
-  /* USER CODE BEGIN HardFault_IRQn 0 */
-
-  /* USER CODE END HardFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
-    /* USER CODE END W1_HardFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Memory management fault.
-  */
-void MemManage_Handler(void)
-{
-  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
-
-  /* USER CODE END MemoryManagement_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
-    /* USER CODE END W1_MemoryManagement_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Prefetch fault, memory access fault.
-  */
-void BusFault_Handler(void)
-{
-  /* USER CODE BEGIN BusFault_IRQn 0 */
-
-  /* USER CODE END BusFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
-    /* USER CODE END W1_BusFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Undefined instruction or illegal state.
-  */
-void UsageFault_Handler(void)
-{
-  /* USER CODE BEGIN UsageFault_IRQn 0 */
-
-  /* USER CODE END UsageFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
-    /* USER CODE END W1_UsageFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles System service call via SWI instruction.
-  */
-void SVC_Handler(void)
-{
-  /* USER CODE BEGIN SVCall_IRQn 0 */
-
-  /* USER CODE END SVCall_IRQn 0 */
-  /* USER CODE BEGIN SVCall_IRQn 1 */
-
-  /* USER CODE END SVCall_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Debug monitor.
-  */
-void DebugMon_Handler(void)
-{
-  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
-
-  /* USER CODE END DebugMonitor_IRQn 0 */
-  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
-
-  /* USER CODE END DebugMonitor_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Pendable request for system service.
-  */
-void PendSV_Handler(void)
-{
-  /* USER CODE BEGIN PendSV_IRQn 0 */
-
-  /* USER CODE END PendSV_IRQn 0 */
-  /* USER CODE BEGIN PendSV_IRQn 1 */
-
-  /* USER CODE END PendSV_IRQn 1 */
-}
-
-/**
-  * @brief This function handles System tick timer.
-  */
-void SysTick_Handler(void)
-{
-  /* USER CODE BEGIN SysTick_IRQn 0 */
-
-  /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
-  /* USER CODE BEGIN SysTick_IRQn 1 */
-
-  /* USER CODE END SysTick_IRQn 1 */
-}
-
-/******************************************************************************/
-/* STM32WLxx Peripheral Interrupt Handlers                                    */
-/* Add here the Interrupt Handlers for the used peripherals.                  */
-/* For the available peripheral interrupt handler names,                      */
-/* please refer to the startup file (startup_stm32wlxx.s).                    */
-/******************************************************************************/
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/app_sfu_common.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/app_sfu_common.h
deleted file mode 100644
index 9f31b2d0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/app_sfu_common.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_sfu_common.h
-  * @author  MCD Application Team
-  * @brief   This file contains the configuration of SBSFU application.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef APP_SFU_COMMON_H
-#define APP_SFU_COMMON_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-
-/**
-  * Optional Features Software Configuration
-  */
-#define CM4_SBFU_BOOT_FLAG_ADDRESS M4_M0PLUS_FLAG_RAM_START /*!< address of the M4/M0+ synchronization flag (unused RAM) */
-#define SBSFU_NOT_BOOTED           0xFFFF               /*!< M0+ SBSFU hasn't finished its boot */
-#define SBSFU_BOOTED               0xAAAA               /*!< M0+ SBSFU boot is over: the M4 UserApp can be started */
-#define SBSFU_FW_DOWNLOAD          0x5555               /*!< M0+ SBSFU boot is over: a firmware download is required */
-
-#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
-#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
-#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
-#define SECBOOT_DUAL_CORE_LOADER              (4U) /*!< dual core loader */
-
-/* Uncomment the define below if you want to use minicom with Linux */
-/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
-
-#if defined(MINICOM_YMODEM)
-/* Minicom does not accept the debug prints during the YMODEM session */
-#undef SFU_VERBOSE_DEBUG_MODE
-#endif /* MINICOM_YMODEM */
-
-/* Multi-images configuration :
-   - Max : 3 Active images and 3 Download area
-   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
-   - Active slot identified with SFU magic (1,2,3) information from header
-   - Do not forget to add keys for each image in SE_Corebin/Binary folder
-   - Master slot : image started in priority if valid
-   - FW image valide all feature authorized from master slot
-*/
-#define SFU_NB_MAX_ACTIVE_IMAGE 2U                        /*!< 2 active images managed */
-#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 dwl area managed */
-
-/* The define below allows disabling all security IPs at once.
- *
- * Enabled: all security IPs (WRP, watchdog...) are disabled.
- * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
- *
- */
-
-/*#define SECBOOT_DISABLE_SECURITY_IPS*/  /*!< Disable all security IPs at once when activated */
-
-#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
-
-/* Uncomment the following defines when in Release mode.
-   In debug mode it can be better to disable some of the following protection
-   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
-
-#define SFU_WRP_PROTECT_ENABLE
-#define SFU_DAP_PROTECT_ENABLE         /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
-                                            It might be difficult to reconnect the Debugger.*/
-#define SFU_DMA_PROTECT_ENABLE
-/*#define SFU_IWDG_PROTECT_ENABLE*/    /*!< WARNING:
-                                        1. Be Careful if enabling this protection. IWDG will be active also after
-                                           switching to UserApp: a refresh is needed.
-                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
-                                           platform (flash size...)*/
-#define SFU_C2_DDS_PROTECT_ENABLE      /*!< Static disabling of the CPU2 debug */
-#define SFU_SECURE_USER_PROTECT_ENABLE /*!< Only accessible in Secure access mode,
-                                          the Secure user software is stored in the secure user memory, a configurable
-                                          protected area which is part of the user main memory. */
-
-/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
-                                                 steps.
-                                                 When enabling this lock, Static protections cannot be modified any more
-                                                 and Debug is finally disabled. */
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-
-/**
-  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
-  * This define is taken into account only if RDP level 2 is not set.
-  * If RDP level 2 is set no modification can be done anyway.
-  *
-  * Enabled: Option Bytes Development Mode enabled.
-  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
-  *          If an OB is not set though it should be then this setting is automatically corrected.
-  *          This applies only as long as RDP level 2 is not set.
-  *
-  * Disabled: Option Bytes Development Mode disabled.
-  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
-              the first time.
-  *           SB_SFU checks the Option Bytes configuration but does not correct it.
-  *           If a problem is detected an error message is reported and the execution stops.
-  */
-#define SECBOOT_OB_DEV_MODE
-
-
-#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
-                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
-
-#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
-#define SFU_SECURE_FLASH_START    SLOT_ACTIVE_1_START              /*!< Secure Flash start address: SFSA[6:0] */
-#define SFU_SECURE_SRAM1_START    0x1F                             /*!< Secure non-Backup SRAM1 start address:
-                                                                        SNBRSA[4:0]. 0x1F configures an entirely
-                                                                        non-secure SRAM1. */
-#define SFU_SECURE_SRAM2_START    SB_REGION_RAM_START              /*!< Secure Backup SRAM2 start address: SBRSA[4:0] */
-#define SFU_HIDE_PROTECTION_START SE_KEY_REGION_ROM_START          /*!< Hide Protection area start address:
-                                                                        HDPSA[6:0] */
-#define SFU_HIDE_PROTECTION_CFG OB_SECURE_HIDE_PROTECTION_ENABLE   /*!< Hide Protection area start address:
-                                                                        HDPSA[6:0] */
-
-/*!< Secure mode activated or deactivated */
-#define SFU_SECURE_MODE           (OB_SECURE_SYSTEM_AND_FLASH_ENABLE | \
-                                   SFU_HIDE_PROTECTION_CFG           | \
-                                   OB_SECURE_SRAM1_DISABLE           | \
-                                   OB_SECURE_SRAM2_ENABLE)
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APP_SFU_COMMON_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_fwimg_regions.h
deleted file mode 100644
index d9e68443..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_fwimg_regions.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_regions.h
-  * @author  MCD Application Team
-  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_REGIONS_H
-#define SFU_FWIMG_REGIONS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_sfu.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_fwimg.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-#include "se_crypto_config.h"
-
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  *  Slot list : 2 slots per image configuration + swap
-  */
-#define NB_SLOTS      6U
-#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
-#define SLOT_ACTIVE_1 1U
-#define SLOT_ACTIVE_2 2U
-#define SLOT_DWL_1    3U
-#define SLOT_DWL_2    4U
-#define SLOT_SWAP     5U
-
-
-/* Calculation of the size of a slot */
-#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
-
-/*
- * Design constraint: the image slot size must be a multiple of the swap area size.
- * And of course both image slots must have the same size.
- */
-#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
-
-/*
- * Checking that the slot sizes are consistent with the .icf file
- * Sizes expressed in bytes (+1 because the end address belongs to the slot)
- * The checks are executed at runtime in the SFU_Img_Init() function.
- */
-#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
-
-/**
-  * Image starting offset to add to the  address of 1st block
-  */
-#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
-
-
-/* External variables --------------------------------------------------------*/
-extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
-extern const uint32_t  SlotStartAdd[NB_SLOTS];
-extern const uint32_t  SlotEndAdd[NB_SLOTS];
-
-#if defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C) || defined(SFU_LOADER_C)
-
-const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
-                                            SLOT_ACTIVE_1_HEADER,
-                                            SLOT_ACTIVE_2_HEADER,
-                                            SLOT_DWL_1_START,
-                                            0U,
-                                            SWAP_START,
-                                          };
-/* List of slot start address */
-const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
-                                            SLOT_ACTIVE_1_START,
-                                            SLOT_ACTIVE_2_START,
-                                            SLOT_DWL_1_START,
-                                            0U,
-                                            SWAP_START,
-                                          };
-/* List of slot end address */
-const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
-                                            SLOT_ACTIVE_1_END,
-                                            SLOT_ACTIVE_2_END,
-                                            SLOT_DWL_1_END,
-                                            0U,
-                                            SWAP_END,
-                                          };
-#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_REGIONS_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level.c
deleted file mode 100644
index 34b9a787..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level.c
+++ /dev/null
@@ -1,579 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level.c
-  * @author  MCD Application Team
-  * @brief   SFU Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU low level
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level.h"
-#include "sfu_trace.h"
-
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-extern RTC_HandleTypeDef RtcHandle;
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-/* Private variables ---------------------------------------------------------*/
-static UART_HandleTypeDef   UartHandle;
-static CRC_HandleTypeDef    CrcHandle;
-
-/* Private function prototypes -----------------------------------------------*/
-static void     SFU_LL_Error_Handler(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize SFU Interface.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Initialize CRC */
-  e_ret_status = SFU_LL_CRC_Init();
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  DeInitialize SFU Interface.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* ADD SRC CODE HERE
-       ...
-  */
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU IF CRC Init.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_CRC_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Configure the peripheral clock */
-  __HAL_RCC_CRC_CLK_ENABLE();
-
-
-  /* Configure CRC with default polynomial - standard configuration */
-  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU  IF CRC Configuration.
-  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
-  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Check the parameters */
-  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
-
-  /* Switch to the selected configuration */
-  CrcHandle.Instance = CRC;
-
-  /* The input data are not inverted */
-  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
-
-  /* The output data are not inverted */
-  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
-
-  switch (eCRCConfg)
-  {
-    case SFU_CRC_CONFIG_DEFAULT:
-      /* The Default polynomial is used */
-      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
-      /* The default init value is used */
-      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
-      /* The input data are 32-bit long words */
-      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
-      /* Valid parameter*/
-      e_ret_status = SFU_SUCCESS;
-      break;
-
-    case SFU_CRC_CONFIG_16BIT:
-      /* The CRC-16-CCIT polynomial is used */
-      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
-      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
-      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
-      /* The zero init value is used */
-      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
-      CrcHandle.Init.InitValue               = 0U;
-      /* The input data are 8-bit long */
-      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
-      /* Valid parameter*/
-      e_ret_status = SFU_SUCCESS;
-      break;
-
-    default:
-      /* Invalid parameter */
-      e_ret_status = SFU_ERROR;
-      break;
-  }
-
-  /* Proceed to CRC Init (Correct Parameters) */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  SFU IF CRC Calculate.
-  * @param  pBuffer: pointer to data buffer.
-  * @param  BufferLength: buffer length in bytes.
-  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
-  */
-uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
-{
-  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
-}
-
-/**
-  * @brief SFU UART Init.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_UART_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
-  /* USART configured as follow:
-  - BaudRate = 115200 baud
-  - Word Length = 8 Bits
-  - One Stop Bit
-  - No parity
-  - Hardware flow control disabled (RTS and CTS signals)
-  - Receive and transmit enabled
-  */
-  UartHandle.Instance = SFU_UART;
-  UartHandle.Init.BaudRate = 115200U;
-  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
-  UartHandle.Init.StopBits = UART_STOPBITS_1;
-  UartHandle.Init.Parity = UART_PARITY_NONE;
-  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
-  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
-  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
-  if (HAL_UART_Init(&UartHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-
-}
-
-/**
-  * @brief SFU IF UART DeInit.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_UART_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  SFU IF Write data (send).
-  * @param  pData: pointer to the 128bit data to write.
-  * @param  DataLength: pointer to the 128bit data to write.
-  * @param  pData: pointer to the 128bit data to write.
-  * @param  Timeout: Timeout duration.
-  * @retval status of the write operation
-  *         SFU_ERROR : if the write operation is not performed
-  *         SFU_SUCCESS : if the write operation is successfully performed
-  */
-SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check the pointers allocation */
-  if (pData == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU IF Read data (receive).
-  * @param  pData: pointer to the 128bit data where to store the received data.
-  * @param  DataLength: the length of the data to be read in bytes.
-  * @param Timeout: Timeout duration.
-  * @retval status of the read operation
-  *         SFU_ERROR : if the read operation is not performed
-  *         SFU_SUCCESS : if the read operation is successfully performed
-  */
-SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check the pointers allocation */
-  if (pData == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU HAL IF Flush.
-  * @param  None.
-  * @retval status of the operation.
-  */
-SFU_ErrorStatus SFU_LL_UART_Flush(void)
-{
-  /* Clean the input path */
-  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
-
-  return SFU_SUCCESS;
-}
-
-#if  defined(CORE_CM0PLUS)
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-/**
-  * @brief SFU IF RTC Init.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_RTC_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Configure RTC prescaler and RTC data registers */
-  /* RTC configured as follows:
-  - Hour Format    = Format 24
-  - Asynch Prediv  = Value according to source clock
-  - Synch Prediv   = Value according to source clock
-  - OutPut         = Output Disable
-  - OutPutPolarity = High Polarity
-  - OutPutType     = Open Drain */
-  RtcHandle.Instance            = RTC;
-  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
-  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
-  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
-  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
-  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
-  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
-
-  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief SFU IF RTC DeInit.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-
-}
-
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-#endif /* CORE_CM0PLUS */
-
-/**
-  * @brief SFU IF RTC MSP Initialization
-  *        This function configures the hardware resources used in this example
-  * @param hrtc: RTC handle pointer.
-  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
-  *        the RTC clock source; in this case the Backup domain will be reset in
-  *        order to modify the RTC Clock source, as consequence RTC registers (including
-  *        the backup registers) and RCC_BDCR register are set to their reset values.
-  * @retval None
-  */
-void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
-{
-  RCC_OscInitTypeDef        RCC_OscInitStruct;
-  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
-
-  UNUSED(hrtc);
-  /*-1- Enables access to the backup domain */
-  /* To enable access on RTC registers */
-
-  HAL_PWR_EnableBkUpAccess();
-
-  /*-2- Configure LSE/LSI as RTC clock source */
-#ifdef RTC_CLOCK_SOURCE_LSE
-
-  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
-  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-
-  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
-  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-#elif defined (RTC_CLOCK_SOURCE_LSI)
-  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
-  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-
-  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
-  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-#else
-#error Please select the RTC Clock source inside the main.h file
-#endif /*RTC_CLOCK_SOURCE_LSE*/
-
-  /*-3- Enable RTC peripheral Clocks */
-  /* Enable RTC Clock */
-  __HAL_RCC_RTC_ENABLE();
-
-  /* Enable RTC APB clock  */
-  __HAL_RCC_RTCAPB_CLK_ENABLE();
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-  /*-4- Configure the NVIC for RTC Tamper */
-  HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0x0FU, 0U);
-  HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-}
-
-/**
-  * @brief RTC MSP De-Initialization
-  *        This function frees the hardware resources used in in SFU application:
-  *          - Disable the Peripheral's clock
-  * @param hrtc: RTC handle pointer
-  * @retval None
-  */
-void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
-{
-  UNUSED(hrtc);
-
-  __HAL_RCC_RTC_DISABLE();
-
-  /* Disable RTC APB clock  */
-  __HAL_RCC_RTCAPB_CLK_DISABLE();
-}
-
-/**
-  * @brief UART MSP Initialization
-  *        This function configures the hardware resources used in SFU application.
-  * @param huart: UART handle pointer
-  * @retval None
-  */
-void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
-{
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-  if (huart->Instance == SFU_UART)
-  {
-    /* Peripheral Clock Enable */
-    SFU_UART_CLK_ENABLE();
-
-    /* GPIO Ports Clock Enable */
-    SFU_UART_TX_GPIO_CLK_ENABLE();
-    SFU_UART_RX_GPIO_CLK_ENABLE();
-
-    /*Configure GPIO pins : SFU_UART_TX_Pin  */
-    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
-    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
-
-    /*Configure GPIO pins : SFU_UART_RX_Pin  */
-    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
-    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
-
-  }
-
-}
-
-/**
-  * @brief UART MSP De-Initialization
-  *        This function frees the hardware resources used in SFU application:
-  *          - Disable the Peripheral's clock
-  * @param huart: UART handle pointer
-  * @retval None
-  */
-void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
-{
-
-  if (huart->Instance == SFU_UART)
-  {
-    /* Peripheral clock disable */
-    SFU_UART_CLK_DISABLE();
-
-    /* GPIO DeInit*/
-    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
-    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
-
-  }
-
-
-}
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @param  None
-  * @retval None
-  */
-static void SFU_LL_Error_Handler(void)
-{
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  while (1 == 1)
-  {
-    ;
-  }
-}
-
-
-/**
-  * @}
-  */
-/**
-  * @brief function checking if a buffer is in se ram.
-  * @param pBuff: Secure Engine protected function ID.
-  * @param length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in se ram, SE_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + length - 1U;
-
-  /* Check if length is positive with no overflow and included in the correct range */
-  if ((length != 0U) && (!((0xFFFFFFFFUL - addr_start) < length))
-      && ((addr_end  <= SE_REGION_RAM_END) && (addr_start >= SE_REGION_RAM_START)))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief Check if an array is inside the RAM of the product
-  * @param Addr : address  of array
-  * @param Length : length of array in byte
-  */
-SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow and included in the correct range */
-  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
-      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  return e_ret_status;
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level.h
deleted file mode 100644
index c22f96a6..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef  SFU_LOW_LEVEL_H
-#define  SFU_LOW_LEVEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU CRC Configuration definition
-  */
-typedef enum
-{
-  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
-  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
-  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
-} SFU_CRC_ConfigTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define SFU_UART                                USART2
-#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
-#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
-
-#define SFU_UART_TX_AF                          GPIO_AF7_USART2
-#define SFU_UART_TX_GPIO_PORT                   GPIOA
-#define SFU_UART_TX_PIN                         GPIO_PIN_2
-#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
-
-#define SFU_UART_RX_AF                          GPIO_AF7_USART2
-#define SFU_UART_RX_GPIO_PORT                   GPIOA
-#define SFU_UART_RX_PIN                         GPIO_PIN_3
-#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
-
-/* Uncomment to enable the adequate Clock Source */
-#define RTC_CLOCK_SOURCE_LSI
-/*#define RTC_CLOCK_SOURCE_LSE*/
-
-#ifdef RTC_CLOCK_SOURCE_LSI
-#define RTC_ASYNCH_PREDIV    0x1FU
-#define RTC_SYNCH_PREDIV     0x3FF
-#endif /* RTC_CLOCK_SOURCE_LSI */
-
-#ifdef RTC_CLOCK_SOURCE_LSE
-#define RTC_ASYNCH_PREDIV  0x7FU
-#define RTC_SYNCH_PREDIV   0x00FFU
-#endif /* RTC_CLOCK_SOURCE_LSE */
-
-
-/* Exported macros -----------------------------------------------------------*/
-#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
-                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
-                               ((CONF) == SFU_CRC_CONFIG_16BIT))
-
-/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
-   but not meaningful for this product */
-#define SFU_LL_DummyAccess() \
-  do{ \
-  }while(0)
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus    SFU_LL_Init(void);
-SFU_ErrorStatus    SFU_LL_DeInit(void);
-
-SFU_ErrorStatus    SFU_LL_CRC_Init(void);
-SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
-uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
-
-SFU_ErrorStatus    SFU_LL_UART_Init(void);
-SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
-SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
-SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
-SFU_ErrorStatus    SFU_LL_UART_Flush(void);
-
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-SFU_ErrorStatus SFU_LL_RTC_Init(void);
-SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-
-void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
-void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
-void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
-void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
-
-SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
-SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*  SFU_LOW_LEVEL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash.c
deleted file mode 100644
index 2dbc00c7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU flash
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_flash_ext.h"
-#include "sfu_fwimg_regions.h"
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
-  * @param  none
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  e_ret_status = SFU_LL_FLASH_INT_Init();
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_EXT_Init();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pFlashStatus: SFU_FLASH Status pointer
-  * @param  pStart: flash address to be erased
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-
-  /* Check Flash start address */
-  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
-  }
-}
-
-/**
-  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pFlashStatus: FLASH_StatusTypeDef
-  * @param  pDestination: flash address to write
-  * @param  pSource: pointer on buffer with data to write
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                   uint32_t Length)
-{
-  /* Check Flash destination address */
-  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
-  }
-}
-
-/**
-  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pDestination: pointer on buffer to store data
-  * @param  pSource: flash address to read
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  /* Check Flash source address */
-  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
-  }
-}
-
-/**
-  * @brief  This function configure the flash to be able to execute code
-  * @param  Addr: flash address
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
-{
-  /*
-   * Internal flash : nothing to do
-   * External flash : configure memory mapped mode
-   */
-
-  /* Check Flash address */
-  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
-  }
-}
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: flash address
-  * @retval The page of a given address
-  */
-uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
-{
-  /* Check Flash address */
-  if (Addr < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_GetPage(Addr);
-  }
-  else
-  {
-    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
-  }
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash.h
deleted file mode 100644
index a7b6aaca..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update flash
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_H
-#define SFU_LOW_LEVEL_FLASH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-typedef enum
-{
-  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
-  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
-  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
-  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
-  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
-  SFU_FLASH_SUCCESS           /*!< Flash Success */
-} SFU_FLASH_StatusTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define INVALID_SECTOR 0xFFFFFFFFU
-#define INVALID_PAGE   0xFFFFFFFFU
-#define INVALID_BANK   0xFFFFFFFFU
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                   uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
-
-uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c
deleted file mode 100644
index 2e4b5b65..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_ext.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU external
-  *          flash low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_flash_ext.h"
-#include "sfu_low_level_security.h"
-
-/* Private defines -----------------------------------------------------------*/
-#define BLOC_64_KBYTES 0x10000U
-
-/* Functions Definition ------------------------------------------------------*/
-
-/* No external flash available on this product
-   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
-       systematically during startup phase */
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
-{
-  return SFU_SUCCESS;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-  UNUSED(pFlashStatus);
-  UNUSED(pStart);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                       uint32_t Length)
-{
-  UNUSED(pFlashStatus);
-  UNUSED(pDestination);
-  UNUSED(pSource);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  UNUSED(pDestination);
-  UNUSED(pSource);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
-{
-  UNUSED(SlotNumber);
-  return SFU_SUCCESS;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h
deleted file mode 100644
index 2f900bb8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_ext.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface for external flash.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
-#define SFU_LOW_LEVEL_FLASH_EXT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash.h"
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported constants --------------------------------------------------------*/
-#define EXTERNAL_FLASH_ADDRESS  0x90000000U
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                       uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_int.c
deleted file mode 100644
index 1d62570d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_int.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_int.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU internal
-  *          flash low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "string.h"
-#ifdef CORE_CM0PLUS
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-#endif /* CORE_CM0PLUS */
-
-/* Private defines -----------------------------------------------------------*/
-#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
-
-/* Private variables ---------------------------------------------------------*/
-static __IO uint32_t DoubleECC_Error_Counter = 0U;
-
-
-static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  This function initialize the internal flash interface if required
-  * @param  none
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
-{
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  This function does an erase of n (depends on Length) pages in user flash area
-  * @param  pFlashStatus: SFU_FLASH Status pointer
-  * @param  pStart: flash address to be erased
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-  uint32_t page_error = 0U;
-  uint32_t start = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef p_erase_init;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t first_page;
-  uint32_t nb_pages;
-  uint32_t chunk_nb_pages;
-  uint32_t length = Length;
-
-  /* Check the pointers allocation */
-  if (pFlashStatus == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  *pFlashStatus = SFU_FLASH_SUCCESS;
-
-  /* Clear error flags raised during previous operation */
-  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() == HAL_OK)
-    {
-      first_page = SFU_LL_FLASH_INT_GetPage(start);
-      /* Get the number of pages to erase from 1st page */
-      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
-      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
-      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
-      do
-      {
-        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
-        p_erase_init.Page = first_page;
-        p_erase_init.NbPages = chunk_nb_pages;
-        first_page += chunk_nb_pages;
-        nb_pages -= chunk_nb_pages;
-        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
-        {
-          e_ret_status = SFU_ERROR;
-          *pFlashStatus = SFU_FLASH_ERR_ERASE;
-        }
-        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
-      } while (nb_pages > 0U);
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      if (HAL_FLASH_Lock() != HAL_OK)
-      {
-        e_ret_status = SFU_ERROR;
-        *pFlashStatus = SFU_FLASH_ERR_HAL;
-      }
-    }
-    else
-    {
-      *pFlashStatus = SFU_FLASH_ERR_HAL;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
-  * @note   After writing data buffer, the flash content is checked.
-  * @param  pFlashStatus: FLASH_StatusTypeDef
-  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
-  * @param  pSource: pointer on buffer with data to write
-  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                       uint32_t Length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t i;
-  uint32_t inside_header = 0U;
-  uint32_t destination = (uint32_t)pDestination;
-  uint32_t source = (uint32_t)pSource;
-
-  /* Check the pointers allocation */
-  if ((pFlashStatus == NULL) || (pSource == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Is destination area inside 1 of the firmware image headers ? */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      inside_header = 1U;
-    }
-  }
-
-  /* Destination area part of 1 of the firmware image headers :
-     writing operation should be executed inside secure environment */
-  if ((inside_header == 1U) && (Length != 0U))
-  {
-    /* SE Access */
-    SE_StatusTypeDef se_status;
-    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
-    if (se_ret_status == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-      *pFlashStatus = SFU_FLASH_SUCCESS;
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-      *pFlashStatus = SFU_FLASH_ERROR;
-    }
-  }
-  /* Writing operation executed by SBSFU */
-  else
-  {
-    *pFlashStatus = SFU_FLASH_ERROR;
-
-    /* Clear error flags raised during previous operation */
-    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Unlock the Flash to enable the flash control register access *************/
-      if (HAL_FLASH_Unlock() != HAL_OK)
-      {
-        *pFlashStatus = SFU_FLASH_ERR_HAL;
-
-      }
-      else
-      {
-        /* DataLength must be a multiple of 64 bit */
-        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
-        {
-          *pFlashStatus = SFU_FLASH_ERROR;
-
-          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
-          be done by word */
-          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
-              == HAL_OK)
-          {
-            /* Check the written value */
-            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
-            {
-              /* Flash content doesn't match SRAM content */
-              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
-              e_ret_status = SFU_ERROR;
-            }
-            else
-            {
-              /* Increment FLASH Destination address */
-              destination = destination + sizeof(SFU_LL_FLASH_write_t);
-              e_ret_status = SFU_SUCCESS;
-              *pFlashStatus = SFU_FLASH_SUCCESS;
-            }
-          }
-          else
-          {
-            /* Error occurred while writing data in Flash memory */
-            *pFlashStatus = SFU_FLASH_ERR_WRITING;
-            e_ret_status = SFU_ERROR;
-          }
-        }
-        /* Lock the Flash to disable the flash control register access (recommended
-        to protect the FLASH memory against possible unwanted operation) */
-        if (HAL_FLASH_Lock() != HAL_OK)
-        {
-          e_ret_status = SFU_ERROR;
-          *pFlashStatus = SFU_FLASH_ERR_HAL;
-        }
-      }
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function reads flash
-  * @param  pDestination: Start address for target location
-  * @param  pSource: flash address to read
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_ErrorStatus se_ret_status;
-  SE_StatusTypeDef se_status;
-  uint32_t i;
-  uint32_t inside_header = 0U;
-  uint32_t source = (uint32_t)pSource;
-
-  /* Is destination area inside 1 of the firmware image headers ? */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      inside_header = 1U;
-    }
-  }
-
-  /* Destination area part of 1 of the firmware image headers :
-     reading operation should be executed inside secure environment */
-  if (inside_header == 1U)
-  {
-    /* SE Access */
-    DoubleECC_Error_Counter = 0U;
-    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
-    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-    DoubleECC_Error_Counter = 0U;
-  }
-  /* Reading operation executed by SBSFU */
-  else
-  {
-    DoubleECC_Error_Counter = 0U;
-    (void) memcpy(pDestination, (uint8_t *)source, Length);
-    if (DoubleECC_Error_Counter == 0U)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-    DoubleECC_Error_Counter = 0U;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: flash address
-  * @retval The page of a given address
-  */
-uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
-{
-  uint32_t page;
-
-  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
-
-  return page;
-}
-
-
-
-
-/**
-  * @brief  Clear error flags raised during previous operation
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Unlock the Program memory */
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-
-    /* Clear all FLASH flags */
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-
-    /* Unlock the Program memory */
-    if (HAL_FLASH_Lock() == HAL_OK)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-
-}
-
-
-/**
-  * @brief  Get Link Register value (LR)
-  * @param  None.
-  * @retval LR Register value
-  */
-__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
-{
-  register uint32_t result;
-
-#if defined ( __ICCARM__ ) || ( __GNUC__ )
-  __ASM volatile("MOV %0, LR" : "=r"(result));
-#elif defined ( __CC_ARM )
-  __ASM volatile("MOV result, __return_address()");
-#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
-
-  return result;
-}
-
-/*
-   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
-   not to use extra registers (on top of scratch registers), because it would change the stack pointer
-   position. Then compiler optimizations are customized to ensure that.
-*/
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O1")))
-#endif /* __ICCARM__ */
-/**
-  * @brief  NMI Handler present for handling Double ECC NMI interrupt
-  * @param  None.
-  * @retvat void
-  */
-void NMI_Handler(void)
-{
-  uint32_t *p_sp;
-  uint32_t lr;
-  uint16_t opcode_msb;
-
-  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
-  {
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
-
-    /* Memorize error to ignore the read value */
-    DoubleECC_Error_Counter++;
-
-    lr = __get_LR();
-
-    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
-    if (((lr) & (0xFU)) == 0xDU)
-    {
-      /* interrupted code was using Process Stack Pointer */
-      p_sp = (uint32_t *)__get_PSP();
-    }
-    else
-    {
-      /* interrupted code was using Main Stack Pointer */
-      p_sp = (uint32_t *)__get_MSP();
-    }
-
-    /* Test caller mode T bit from CPSR in stack */
-    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
-    {
-      /* Thumb  mode.
-         Test PC in stack.
-         If bits [15:11] of the halfword being decoded take any of the following values,
-         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
-         Otherwise, the halfword is a 16-bit instruction.
-      */
-      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
-      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
-      {
-        /* execute next instruction PC +4  */
-        *(p_sp + 6U) += 4U;
-      }
-      else
-      {
-        /* execute next instruction PC +2  */
-        *(p_sp + 6U) += 2U;
-      }
-    }
-    else
-    {
-      /* ARM mode execute next instruction PC +4 */
-      *(p_sp + 6U) += 4U;
-    }
-  }
-  else
-  {
-    while (1 == 1)
-    {
-      ;
-    }
-  }
-}
-
-
-/**
-  * @brief  HardFault Handler
-  * @param  None.
-  * @retval None.
-  */
-#ifdef CORE_CM0PLUS
-void HardFault_Handler(void)
-{
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
-}
-#endif /* CORE_CM0PLUS */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_int.h
deleted file mode 100644
index 221c183f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_low_level_flash_int.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_int.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface for internal flash.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_INT_H
-#define SFU_LOW_LEVEL_FLASH_INT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash.h"
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Flash Write Access Constraints (size and alignment)
-  *
-  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
-  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
-  *
-  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
-  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
-  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
-  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_CheckTrailerValid).
-  */
-
-/* double-word is the default setting for most platforms */
-typedef uint64_t SFU_LL_FLASH_write_t;
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * Length of a MAGIC tag (32 bytes).
-  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
-  */
-#define MAGIC_LENGTH ((uint32_t)32U)
-
-/* External variables --------------------------------------------------------*/
-#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                       uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
-void NMI_Handler(void);
-void HardFault_Handler(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_trace.h
deleted file mode 100644
index 41b6e137..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_trace.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_trace.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for SFU_TRACE functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_TRACE_H
-#define SFU_TRACE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_sfu.h"
-#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-#include "sfu_com_trace.h"
-#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
-
-/* External variables --------------------------------------------------------*/
-/**
-  * This variable indicates if at boot-up the FW presence check has already been performed or not:
-  * \li It is reset when the FW status has already been checked once and no FW is present
-  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
-  * \li It is used to display some messages only once in the teraterm console
-  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
-  * \li This is used at LocalDownload and CheckUserFwStatus stages.
-  */
-extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
-
-/* Exported macros -----------------------------------------------------------*/
-#ifdef SFU_DEBUG_MODE
-#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid faults. 
-                                                                        printf is not rieentrant */
-#define TRACE   (void) printf
-#else
-#define TRACE(...)
-#define TRACE_IRQ(pbuffer)
-#endif /* SFU_DEBUG_MODE */
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_TRACE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm0plus.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm0plus.ewp
deleted file mode 100644
index 71ffbae3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm0plus.ewp
+++ /dev/null
@@ -1,1246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>3</fileVersion>
-    <configuration>
-        <name>CM0PLUS</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>General</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <version>31</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>ExePath</name>
-                    <state>CM0PLUS\Exe</state>
-                </option>
-                <option>
-                    <name>ObjPath</name>
-                    <state>CM0PLUS\Obj</state>
-                </option>
-                <option>
-                    <name>ListPath</name>
-                    <state>CM0PLUS\List</state>
-                </option>
-                <option>
-                    <name>GEndianMode</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>GOutputBinary</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGCoreOrChip</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelect</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelectSlave</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>RTDescription</name>
-                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-                </option>
-                <option>
-                    <name>OGProductVersion</name>
-                    <state>4.41A</state>
-                </option>
-                <option>
-                    <name>OGLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGChipSelectEditMenu</name>
-                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-                </option>
-                <option>
-                    <name>GenLowLevelInterface</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GEndianModeBE</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGBufferedTerminalOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GenStdoutInterface</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>RTConfigPath2</name>
-                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
-                </option>
-                <option>
-                    <name>GBECoreSlave</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>OGUseCmsis</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGUseCmsisDspLib</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibThreads</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CoreVariant</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>GFPUDeviceSlave</name>
-                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-                </option>
-                <option>
-                    <name>FPU2</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NrRegs</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NEON</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GFPUCoreSlave2</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>OGCMSISPackSelectDevice</name>
-                </option>
-                <option>
-                    <name>OgLibHeap</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGLibAdditionalLocale</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGPrintfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGPrintfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GenLocaleTags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>GenLocaleDisplayOnly</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DSPExtension</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZone</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZoneModes</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ICCARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>34</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDefines</name>
-                    <state>USE_HAL_DRIVER</state>
-                    <state>STM32WL55xx</state>
-                    <state>CORE_CM0PLUS</state>
-                    <state>KMS_ENABLED</state>
-                </option>
-                <option>
-                    <name>CCPreprocFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocComments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMnemonics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMessages</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDiagSuppress</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagRemark</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagWarning</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagError</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCAllowList</name>
-                    <version>1</version>
-                    <state>11111110</state>
-                </option>
-                <option>
-                    <name>CCDebugInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IEndianMode</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCLangConformance</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSignedPlainChar</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRequirePrototypes</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCDiagWarnAreErr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCompilerRuntimeInfo</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>CCLibConfigHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>PreInclude</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../Common</state>
-                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$\..\CM0PLUS\Core\Inc</state>
-                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\App</state>
-                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target</state>
-                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
-                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Cryptographic\Fw_Crypto\STM32L0\Inc</state>
-                    <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
-                </option>
-                <option>
-                    <name>CCStdIncCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCodeSection</name>
-                    <state>.text</state>
-                </option>
-                <option>
-                    <name>IProcessorMode2</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevel</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CCOptStrategy</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevelSlave</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
-                <option>
-                    <name>CCPosIndRopi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndRwpi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndNoDynInit</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccLang</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCDialect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccAllowVLA</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccStaticDestr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCppInlineSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccFloatSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCOptStrategySlave</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCGuardCalls</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccExceptions2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccRTTI2</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>AARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>10</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>AObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>ACaseSensitivity</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacroChars</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnWhat</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnOne</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>ADebug</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AltRegisterNames</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ADefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AList</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AListHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AListing</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Includes</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacDefs</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacExps</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacExec</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OnlyAssed</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MultiLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLengthCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLength</name>
-                    <state>80</state>
-                </option>
-                <option>
-                    <name>TabSpacing</name>
-                    <state>8</state>
-                </option>
-                <option>
-                    <name>AXRef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDefines</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefInternal</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDual</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AOutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsEdit</name>
-                    <state>100</state>
-                </option>
-                <option>
-                    <name>AIgnoreStdInclude</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AUserIncludes</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AExtraOptionsCheckV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AExtraOptionsV2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AsmNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>OBJCOPY</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OOCOutputFormat</name>
-                    <version>3</version>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>OCOutputOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCOutputFile</name>
-                    <state>Project.bin</state>
-                </option>
-                <option>
-                    <name>OOCCommandLineProducer</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCObjCopyEnable</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CUSTOM</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <extensions></extensions>
-                <cmdline></cmdline>
-                <hasPrio>0</hasPrio>
-            </data>
-        </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-        <settings>
-            <name>BUILDACTION</name>
-            <archiveVersion>1</archiveVersion>
-            <data>
-                <prebuild></prebuild>
-                <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$.\se_interface_appli.o"</postbuild>
-            </data>
-        </settings>
-        <settings>
-            <name>ILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>21</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IlinkLibIOConfig</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkInputFileSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOutputFile</name>
-                    <state>Project.out</state>
-                </option>
-                <option>
-                    <name>IlinkDebugInfoEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkKeepSymbols</name>
-                    <state>SE_CORE_Bin</state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryFile</name>
-                    <state>$PROJ_DIR$.\..\..\2_Images_SECoreBin\EWARM\SE_Core.bin</state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySymbol</name>
-                    <state>SE_CORE_Bin</state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySegment</name>
-                    <state>SE_CORE_Bin</state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkConfigDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkMapFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogInitialization</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogModule</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogSection</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogVeneer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFileSlave</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkSuppressDiags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsRem</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsWarn</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsErr</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkWarningsAreErrors</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkUseExtraOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkExtraOptions</name>
-                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-                </option>
-                <option>
-                    <name>IlinkLowLevelInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAutoLibEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAdditionalLibs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkOverrideProgramEntryLabel</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabelSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabel</name>
-                    <state>__iar_program_start</state>
-                </option>
-                <option>
-                    <name>DoFill</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>FillerByte</name>
-                    <state>0xFF</state>
-                </option>
-                <option>
-                    <name>FillerStart</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>FillerEnd</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>CrcSize</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcPoly</name>
-                    <state>0x11021</state>
-                </option>
-                <option>
-                    <name>CrcCompl</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcBitOrder</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcInitialValue</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>DoCrc</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkBufferedTerminalOutput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkStdoutInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcFullSize</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIElfToolPostProcess</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogAutoLibSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogRedirSymbols</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogUnusedFragments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcReverseByteOrder</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcUseAsInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptInline</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsAllow</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsForce</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptMergeDuplSections</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptUseVfe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptForceVfe</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackAnalysisEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackControlFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkStackCallGraphFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CrcAlgorithm</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcUnitSize</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkThreadsSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogCallGraph</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile_AltDefault</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkHeapSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLocaleSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>CM0PLUS_import_lib.o</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IARCHIVE</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IarchiveInputs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IarchiveOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IarchiveOutput</name>
-                    <state>###Uninitialized###</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-    </configuration>
-    <group>
-        <name>Doc</name>
-        <file>
-            <name>$PROJ_DIR$\..\readme.txt</name>
-        </file>
-    </group>
-    <group>
-        <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-        </group>
-        <group>
-            <name>SBSFU</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_boot.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_error.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_mpu_isolation.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_test.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_common.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_no_swap.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_swap.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_kms.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_interface_crypto_scheme.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Target</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_security.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Common</name>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_com_trace.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_low_level.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_int.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_ext.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>EWARM</name>
-            <file>
-                <name>$PROJ_DIR$\sfu_se_mpu.s</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Drivers</name>
-        <group>
-            <name>BSP</name>
-            <group>
-                <name>STM32WLxx_Nucleo</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>STM32WLxx_HAL_Driver</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-            </file>
-        </group>
-        <group>
-            <name>CMSIS</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
-            </file>
-        </group>
-    </group>
-        <group>
-          <name>Middlewares</name>
-          <group>
-            <name>STM32_Secure_Engine</name>
-            <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
-            </file>
-            <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
-            </file>
-            <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
-            </file>
-          </group>
-          <group>
-            <name>STM32_Key_Management_Services</name>
-            <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
-            </file>
-        </group>
-    </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm4.ewp
deleted file mode 100644
index a7fb2219..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm4.ewp
+++ /dev/null
@@ -1,1182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>3</fileVersion>
-    <configuration>
-        <name>CM4</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>General</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <version>31</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>ExePath</name>
-                    <state>CM4\Exe</state>
-                </option>
-                <option>
-                    <name>ObjPath</name>
-                    <state>CM4\Obj</state>
-                </option>
-                <option>
-                    <name>ListPath</name>
-                    <state>CM4\List</state>
-                </option>
-                <option>
-                    <name>GEndianMode</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>GOutputBinary</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGCoreOrChip</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelect</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelectSlave</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>RTDescription</name>
-                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-                </option>
-                <option>
-                    <name>OGProductVersion</name>
-                    <state>4.41A</state>
-                </option>
-                <option>
-                    <name>OGLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGChipSelectEditMenu</name>
-                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-                </option>
-                <option>
-                    <name>GenLowLevelInterface</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GEndianModeBE</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGBufferedTerminalOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GenStdoutInterface</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>RTConfigPath2</name>
-                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
-                </option>
-                <option>
-                    <name>GBECoreSlave</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>OGUseCmsis</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGUseCmsisDspLib</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibThreads</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CoreVariant</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>GFPUDeviceSlave</name>
-                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-                </option>
-                <option>
-                    <name>FPU2</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NrRegs</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NEON</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GFPUCoreSlave2</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>OGCMSISPackSelectDevice</name>
-                </option>
-                <option>
-                    <name>OgLibHeap</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGLibAdditionalLocale</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGPrintfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGPrintfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GenLocaleTags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>GenLocaleDisplayOnly</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DSPExtension</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>TrustZone</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZoneModes</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ICCARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>34</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDefines</name>
-                    <state>USE_HAL_DRIVER</state>
-                    <state>STM32WL55xx</state>
-                </option>
-                <option>
-                    <name>CCPreprocFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocComments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMnemonics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMessages</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDiagSuppress</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagRemark</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagWarning</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagError</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCAllowList</name>
-                    <version>1</version>
-                    <state>11111110</state>
-                </option>
-                <option>
-                    <name>CCDebugInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IEndianMode</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCLangConformance</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSignedPlainChar</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRequirePrototypes</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCDiagWarnAreErr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCompilerRuntimeInfo</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>CCLibConfigHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>PreInclude</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../Common</state>
-                    <state>$PROJ_DIR$/../CM4/Inc</state>
-                    <state>$PROJ_DIR$/../../2_Images_SECoreBin/Inc</state>
-                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</state>
-                </option>
-                <option>
-                    <name>CCStdIncCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCodeSection</name>
-                    <state>.text</state>
-                </option>
-                <option>
-                    <name>IProcessorMode2</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevel</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CCOptStrategy</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevelSlave</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
-                <option>
-                    <name>CCPosIndRopi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndRwpi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndNoDynInit</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccLang</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCDialect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccAllowVLA</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccStaticDestr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCppInlineSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccFloatSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCOptStrategySlave</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCGuardCalls</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccExceptions2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccRTTI2</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>AARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>10</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>AObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>ACaseSensitivity</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacroChars</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnWhat</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnOne</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>ADebug</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AltRegisterNames</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ADefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AList</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AListHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AListing</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Includes</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacDefs</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacExps</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacExec</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OnlyAssed</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MultiLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLengthCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLength</name>
-                    <state>80</state>
-                </option>
-                <option>
-                    <name>TabSpacing</name>
-                    <state>8</state>
-                </option>
-                <option>
-                    <name>AXRef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDefines</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefInternal</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDual</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AOutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsEdit</name>
-                    <state>100</state>
-                </option>
-                <option>
-                    <name>AIgnoreStdInclude</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AUserIncludes</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AExtraOptionsCheckV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AExtraOptionsV2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AsmNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>OBJCOPY</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OOCOutputFormat</name>
-                    <version>3</version>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>OCOutputOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCOutputFile</name>
-                    <state>Project.bin</state>
-                </option>
-                <option>
-                    <name>OOCCommandLineProducer</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCObjCopyEnable</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CUSTOM</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <extensions></extensions>
-                <cmdline></cmdline>
-                <hasPrio>0</hasPrio>
-            </data>
-        </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-        <settings>
-            <name>BUILDACTION</name>
-            <archiveVersion>1</archiveVersion>
-            <data>
-                <prebuild></prebuild>
-                <postbuild></postbuild>
-            </data>
-        </settings>
-        <settings>
-            <name>ILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>21</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IlinkLibIOConfig</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkInputFileSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOutputFile</name>
-                    <state>Project.out</state>
-                </option>
-                <option>
-                    <name>IlinkDebugInfoEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkKeepSymbols</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySymbol</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySegment</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryAlign</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkConfigDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkMapFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogInitialization</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogModule</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogSection</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogVeneer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFileSlave</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkSuppressDiags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsRem</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsWarn</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsErr</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkWarningsAreErrors</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkUseExtraOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkExtraOptions</name>
-                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-                </option>
-                <option>
-                    <name>IlinkLowLevelInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAutoLibEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAdditionalLibs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkOverrideProgramEntryLabel</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabelSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabel</name>
-                    <state>__iar_program_start</state>
-                </option>
-                <option>
-                    <name>DoFill</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>FillerByte</name>
-                    <state>0xFF</state>
-                </option>
-                <option>
-                    <name>FillerStart</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>FillerEnd</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>CrcSize</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcPoly</name>
-                    <state>0x11021</state>
-                </option>
-                <option>
-                    <name>CrcCompl</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcBitOrder</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcInitialValue</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>DoCrc</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkBufferedTerminalOutput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkStdoutInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcFullSize</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIElfToolPostProcess</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogAutoLibSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogRedirSymbols</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogUnusedFragments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcReverseByteOrder</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcUseAsInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptInline</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsAllow</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsForce</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptMergeDuplSections</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptUseVfe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptForceVfe</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackAnalysisEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackControlFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkStackCallGraphFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CrcAlgorithm</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcUnitSize</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkThreadsSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogCallGraph</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile_AltDefault</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkHeapSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLocaleSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>CM4_import_lib.o</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IARCHIVE</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IarchiveInputs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IarchiveOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IarchiveOutput</name>
-                    <state>###Uninitialized###</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-    </configuration>
-    <group>
-        <name>Application</name>
-        <group>
-            <name>EWARM</name>
-            <file>
-                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
-            </file>
-        </group>
-        <group>
-            <name>User</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\sfu_com_loader.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\sfu_loader.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\sfu_low_level_security.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\sfu_new_image.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Common</name>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_com_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_int.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_ext.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Doc</name>
-        <file>
-            <name>$PROJ_DIR$\..\readme.txt</name>
-        </file>
-    </group>
-    <group>
-        <name>Drivers</name>
-        <group>
-            <name>BSP</name>
-            <group>
-                <name>STM32WLxx_Nucleo</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-           <name>STM32WLxx_LL_Driver</name>
-           <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</name>
-           </file>
-        </group>
-        <group>
-            <name>CMSIS</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
-            </file>
-        </group>
-        <group>
-            <name>STM32WLxx_HAL_Driver</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-            </file>
-            <file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
-            </file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_hsem.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
-            </file>
-        </group>
-    </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
deleted file mode 100644
index a6cf0145..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
+++ /dev/null
@@ -1,316 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm0plus.s
-;* Author             : MCD Application Team
-;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M0+ processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
-        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
-        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
-        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
-        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
-        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
-        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
-        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
-        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
-
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-
-        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
-        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
-        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
-        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
-        DCD     RNG_IRQHandler                      ; RNG Interrupt
-        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
-        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
-        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
-        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
-        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                   ; USART1 Interrupt
-        DCD     USART2_IRQHandler                   ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
-        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK TZIC_ILA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TZIC_ILA_IRQHandler
-        B TZIC_ILA_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK RTC_LSECSS_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_LSECSS_IRQHandler
-        B RTC_LSECSS_IRQHandler
-
-        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_FLASH_C1SEV_IRQHandler
-        B RCC_FLASH_C1SEV_IRQHandler
-
-        PUBWEAK EXTI1_0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_0_IRQHandler
-        B EXTI1_0_IRQHandler
-
-        PUBWEAK EXTI3_2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_2_IRQHandler
-        B EXTI3_2_IRQHandler
-
-        PUBWEAK EXTI15_4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_4_IRQHandler
-        B EXTI15_4_IRQHandler
-
-        PUBWEAK ADC_COMP_DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_COMP_DAC_IRQHandler
-        B ADC_COMP_DAC_IRQHandler
-
-        PUBWEAK DMA1_Channel1_2_3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_2_3_IRQHandler
-        B DMA1_Channel1_2_3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_5_6_7_IRQHandler
-        B DMA1_Channel4_5_6_7_IRQHandler
-
-        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_DMAMUX1_OVR_IRQHandler
-        B DMA2_DMAMUX1_OVR_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK TIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_IRQHandler
-        B TIM1_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C2_RX_C2_TX_IRQHandler
-        B IPCC_C2_RX_C2_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK AES_PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_PKA_IRQHandler
-        B AES_PKA_IRQHandler
-
-        PUBWEAK LCD_802_1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LCD_802_1_IRQHandler
-        B LCD_802_1_IRQHandler
-
-        PUBWEAK I2C1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_IRQHandler
-        B I2C1_IRQHandler
-
-        PUBWEAK I2C2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_IRQHandler
-        B I2C2_IRQHandler
-
-        PUBWEAK I2C3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_IRQHandler
-        B I2C3_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
deleted file mode 100644
index 1431e7f3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
+++ /dev/null
@@ -1,509 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm4.s
-;* Author             : MCD Application Team
-;* Description        : M4 core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M4 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     MemManage_Handler                 ; MPU Fault Handler
-        DCD     BusFault_Handler                  ; Bus Fault Handler
-        DCD     UsageFault_Handler                ; Usage Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     DebugMon_Handler                  ; Debug Monitor Handler
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     WWDG_IRQHandler                   ; Window WatchDog
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
-        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
-        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
-        DCD     RCC_IRQHandler                    ; RCC Interrupt
-        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
-        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
-        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
-        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
-        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
-        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
-        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
-        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
-        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
-        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
-        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
-        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
-        DCD     ADC_IRQHandler                    ; ADC Interrupt
-        DCD     DAC_IRQHandler                    ; DAC Interrupt
-        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
-        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
-        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
-        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
-        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
-        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
-        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
-        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
-        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
-        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
-        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
-        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
-        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                 ; USART1 Interrupt
-        DCD     USART2_IRQHandler                 ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
-        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
-        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
-        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
-        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
-        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
-        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
-        DCD     AES_IRQHandler                    ; AES Interrupt
-        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
-        DCD     PKA_IRQHandler                    ; PKA Interrupt
-        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
-        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
-        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
-        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
-        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
-        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
-        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
-        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK MemManage_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-MemManage_Handler
-        B MemManage_Handler
-
-        PUBWEAK BusFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-BusFault_Handler
-        B BusFault_Handler
-
-        PUBWEAK UsageFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-UsageFault_Handler
-        B UsageFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK DebugMon_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DebugMon_Handler
-        B DebugMon_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK WWDG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-WWDG_IRQHandler
-        B WWDG_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
-
-        PUBWEAK RTC_WKUP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_WKUP_IRQHandler
-        B RTC_WKUP_IRQHandler
-
-        PUBWEAK FLASH_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-FLASH_IRQHandler
-        B FLASH_IRQHandler
-
-        PUBWEAK RCC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_IRQHandler
-        B RCC_IRQHandler
-
-        PUBWEAK EXTI0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI0_IRQHandler
-        B EXTI0_IRQHandler
-
-        PUBWEAK EXTI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_IRQHandler
-        B EXTI1_IRQHandler
-
-        PUBWEAK EXTI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI2_IRQHandler
-        B EXTI2_IRQHandler
-
-        PUBWEAK EXTI3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_IRQHandler
-        B EXTI3_IRQHandler
-
-        PUBWEAK EXTI4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI4_IRQHandler
-        B EXTI4_IRQHandler
-
-        PUBWEAK DMA1_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_IRQHandler
-        B DMA1_Channel1_IRQHandler
-
-        PUBWEAK DMA1_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel2_IRQHandler
-        B DMA1_Channel2_IRQHandler
-
-        PUBWEAK DMA1_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel3_IRQHandler
-        B DMA1_Channel3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_IRQHandler
-        B DMA1_Channel4_IRQHandler
-
-        PUBWEAK DMA1_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel5_IRQHandler
-        B DMA1_Channel5_IRQHandler
-
-        PUBWEAK DMA1_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel6_IRQHandler
-        B DMA1_Channel6_IRQHandler
-
-        PUBWEAK DMA1_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel7_IRQHandler
-        B DMA1_Channel7_IRQHandler
-
-        PUBWEAK ADC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_IRQHandler
-        B ADC_IRQHandler
-
-        PUBWEAK DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DAC_IRQHandler
-        B DAC_IRQHandler
-
-        PUBWEAK C2SEV_PWR_C2H_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-C2SEV_PWR_C2H_IRQHandler
-        B C2SEV_PWR_C2H_IRQHandler
-
-        PUBWEAK COMP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-COMP_IRQHandler
-        B COMP_IRQHandler
-
-        PUBWEAK EXTI9_5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI9_5_IRQHandler
-        B EXTI9_5_IRQHandler
-
-        PUBWEAK TIM1_BRK_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_BRK_IRQHandler
-        B TIM1_BRK_IRQHandler
-
-        PUBWEAK TIM1_UP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_UP_IRQHandler
-        B TIM1_UP_IRQHandler
-
-        PUBWEAK TIM1_TRG_COM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_TRG_COM_IRQHandler
-        B TIM1_TRG_COM_IRQHandler
-
-        PUBWEAK TIM1_CC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_CC_IRQHandler
-        B TIM1_CC_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK I2C1_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_EV_IRQHandler
-        B I2C1_EV_IRQHandler
-
-        PUBWEAK I2C1_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_ER_IRQHandler
-        B I2C1_ER_IRQHandler
-
-        PUBWEAK I2C2_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_EV_IRQHandler
-        B I2C2_EV_IRQHandler
-
-        PUBWEAK I2C2_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_ER_IRQHandler
-        B I2C2_ER_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK EXTI15_10_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_10_IRQHandler
-        B EXTI15_10_IRQHandler
-
-        PUBWEAK RTC_Alarm_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_Alarm_IRQHandler
-        B RTC_Alarm_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK IPCC_C1_RX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_RX_IRQHandler
-        B IPCC_C1_RX_IRQHandler
-
-        PUBWEAK IPCC_C1_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_TX_IRQHandler
-        B IPCC_C1_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK I2C3_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_EV_IRQHandler
-        B I2C3_EV_IRQHandler
-
-        PUBWEAK I2C3_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_ER_IRQHandler
-        B I2C3_ER_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        PUBWEAK AES_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_IRQHandler
-        B AES_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PKA_IRQHandler
-        B PKA_IRQHandler
-
-        PUBWEAK DMA2_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel1_IRQHandler
-        B DMA2_Channel1_IRQHandler
-
-        PUBWEAK DMA2_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel2_IRQHandler
-        B DMA2_Channel2_IRQHandler
-
-        PUBWEAK DMA2_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel3_IRQHandler
-        B DMA2_Channel3_IRQHandler
-
-        PUBWEAK DMA2_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel4_IRQHandler
-        B DMA2_Channel4_IRQHandler
-
-        PUBWEAK DMA2_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel5_IRQHandler
-        B DMA2_Channel5_IRQHandler
-
-        PUBWEAK DMA2_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel6_IRQHandler
-        B DMA2_Channel6_IRQHandler
-
-        PUBWEAK DMA2_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel7_IRQHandler
-        B DMA2_Channel7_IRQHandler
-
-        PUBWEAK DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMAMUX1_OVR_IRQHandler
-        B DMAMUX1_OVR_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/steering_file.txt
deleted file mode 100644
index f9c5ea74..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/steering_file.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-show SE_APP_GetActiveFwInfo
-show SE_APP_ValidateFw
-show SE_APP_SVC_Handler
-show SE_SYS_SaveDisableIrq
-show SE_SYS_RestoreEnableIrq
-show SE_KMS_Initialize
-show SE_KMS_Finalize
-show SE_KMS_GetInfo
-show SE_KMS_GetFunctionList
-show SE_KMS_GetSlotList
-show SE_KMS_GetSlotInfo
-show SE_KMS_GetTokenInfo
-show SE_KMS_GetMechanismInfo
-show SE_KMS_OpenSession
-show SE_KMS_CloseSession
-show SE_KMS_CreateObject
-show SE_KMS_DestroyObject
-show SE_KMS_GetAttributeValue
-show SE_KMS_SetAttributeValue
-show SE_KMS_FindObjectsInit
-show SE_KMS_FindObjects
-show SE_KMS_FindObjectsFinal
-show SE_KMS_EncryptInit
-show SE_KMS_Encrypt
-show SE_KMS_EncryptUpdate
-show SE_KMS_EncryptFinal
-show SE_KMS_DecryptInit
-show SE_KMS_Decrypt
-show SE_KMS_DecryptUpdate
-show SE_KMS_DecryptFinal
-show SE_KMS_DigestInit
-show SE_KMS_Digest
-show SE_KMS_DigestUpdate
-show SE_KMS_DigestFinal
-show SE_KMS_SignInit
-show SE_KMS_Sign
-show SE_KMS_VerifyInit
-show SE_KMS_Verify
-show SE_KMS_DeriveKey
-show SE_KMS_GenerateKeyPair
-show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
deleted file mode 100644
index bf962124..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
+++ /dev/null
@@ -1,914 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>0</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>1</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>0</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>42</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134423046</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>../CM0PLUS/Core/Src/main.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\SBSFU\../CM0PLUS/Core/Src/main.c\42</Expression>
-        </Bp>
-      </Breakpoint>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>0</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>0</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>sfu_se_mpu.s</PathWithFileName>
-      <FilenameWithoutPath>sfu_se_mpu.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>se_core_bin.s</PathWithFileName>
-      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/SBSFU/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_boot.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_error.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_fwimg_no_swap.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_fwimg_swap.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_kms.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_mpu_isolation.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_test.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/SBSFU/Common</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_com_trace.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash_ext.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash_int.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/SBSFU/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>38</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>39</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>40</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>41</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>42</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>43</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>44</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>45</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>46</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>47</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>10</GroupNumber>
-      <FileNumber>48</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
-      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>10</GroupNumber>
-      <FileNumber>49</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
-      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>10</GroupNumber>
-      <FileNumber>50</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
-      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>11</GroupNumber>
-      <FileNumber>51</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
-      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
deleted file mode 100644
index 0ee0d3a0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
+++ /dev/null
@@ -1,710 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM0P</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.6</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo_CM0PLUS\Exe\</OutputDirectory>
-          <OutputName>SBSFU</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
-          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments></TargetDllArguments>
-          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls>-Wno-format</MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Common;../CM0PLUS/Core/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../CM0PLUS/Core/Inc;../CM0PLUS/SBSFU/App;../CM0PLUS/SBSFU/Target;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Cryptographic/Fw_Crypto/STM32L0/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>SBSFU_cm0plus.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--symdefs=se_interface_appli.txt
---keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/Core</GroupName>
-          <Files>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_se_mpu.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>sfu_se_mpu.s</FilePath>
-            </File>
-            <File>
-              <FileName>se_core_bin.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>se_core_bin.s</FilePath>
-            </File>
-            <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/SBSFU/App</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_boot.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_boot.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_error.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_error.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_fwimg_common.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_fwimg_no_swap.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_fwimg_swap.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_interface_crypto_scheme.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_kms.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_mpu_isolation.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_test.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_test.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/SBSFU/Common</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_com_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_com_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_ext.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash_ext.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_int.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash_int.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/SBSFU/Target</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_low_level_security.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_nucleo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gtzc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_iwdg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_spi.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_application.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_interface_bootloader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_interface_common.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="CM0PLUS"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
deleted file mode 100644
index e2e3c610..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
+++ /dev/null
@@ -1,693 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>0</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>1</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>0</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint/>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>0</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>0</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/Common</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_com_trace.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash_int.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash_ext.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/User</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Src/sfu_com_loader.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_com_loader.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Src/sfu_loader.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_loader.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Src/sfu_low_level_security.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Src/sfu_new_image.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_new_image.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_hsem.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_ll_utils.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
deleted file mode 100644
index 50bbfad9..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
+++ /dev/null
@@ -1,619 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM4</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.6</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll></FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile></RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>STM32WL55JC_Nucleo_CM4\Exe\</OutputDirectory>
-          <OutputName>SB</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>1</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments>-REMAP -MPU</SimDllArguments>
-          <SimDlgDll>DCM.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments>-MPU</TargetDllArguments>
-          <TargetDlgDll>TCM.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>0</hadIROM>
-            <hadIRAM>0</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>0</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>4</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>0</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>0</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>4</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Common;../CM4/Inc;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>SB_cm4.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/Common</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_com_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_com_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_int.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash_int.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_ext.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash_ext.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/main.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/stm32wlxx_hal_msp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/stm32wlxx_it.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_com_loader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/sfu_com_loader.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_loader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/sfu_loader.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_security.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/sfu_low_level_security.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_new_image.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/sfu_new_image.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_nucleo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_hsem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_iwdg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_ll_utils.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
-        <targetInfos>
-          <targetInfo name="CM4"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
deleted file mode 100644
index 48f88142..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-#<SYMDEFS># ARM Linker, 6140002: Last Updated: Thu Oct 22 09:43:51 2020
-0x08031001 T SE_APP_GetActiveFwInfo
-0x08031045 T SE_APP_SVC_Handler
-0x08032289 T SE_SYS_SaveDisableIrq
-0x08032241 T SE_SYS_RestoreEnableIrq
-0x08031c8d T SE_KMS_Initialize
-0x080317ad T SE_KMS_Finalize
-0x08031a5d T SE_KMS_GetInfo
-0x08031a59 T SE_KMS_GetFunctionList
-0x08031b71 T SE_KMS_GetSlotList
-0x08031b15 T SE_KMS_GetSlotInfo
-0x08031bd5 T SE_KMS_GetTokenInfo
-0x08031ab1 T SE_KMS_GetMechanismInfo
-0x08031d99 T SE_KMS_OpenSession
-0x0803116d T SE_KMS_CloseSession
-0x080311bd T SE_KMS_CreateObject
-0x08031425 T SE_KMS_DestroyObject
-0x080319f9 T SE_KMS_GetAttributeValue
-0x08031e05 T SE_KMS_SetAttributeValue
-0x080318b5 T SE_KMS_FindObjectsInit
-0x08031801 T SE_KMS_FindObjects
-0x08031861 T SE_KMS_FindObjectsFinal
-0x080316e1 T SE_KMS_EncryptInit
-0x08031611 T SE_KMS_Encrypt
-0x08031745 T SE_KMS_EncryptUpdate
-0x0803167d T SE_KMS_EncryptFinal
-0x080312e5 T SE_KMS_DecryptInit
-0x0803121d T SE_KMS_Decrypt
-0x08031345 T SE_KMS_DecryptUpdate
-0x08031285 T SE_KMS_DecryptFinal
-0x08031551 T SE_KMS_DigestInit
-0x08031481 T SE_KMS_Digest
-0x080315ad T SE_KMS_DigestUpdate
-0x080314ed T SE_KMS_DigestFinal
-0x08031ed5 T SE_KMS_SignInit
-0x08031e69 T SE_KMS_Sign
-0x08031fa5 T SE_KMS_VerifyInit
-0x08031f39 T SE_KMS_Verify
-0x080313b1 T SE_KMS_DeriveKey
-0x08031919 T SE_KMS_GenerateKeyPair
-0x08031995 T SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/readme.txt
deleted file mode 100644
index 00a6e951..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/readme.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
-  @page 2_Images_SBSFU / Secure Boot and Secure Firmware Update Demo Application (Dual Core)
-
-  @verbatim
-  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
-  * @file    readme.txt
-  * @brief   This application shows Secure Boot and Secure Firmware Update example.
-  ******************************************************************************
-  *
-  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                               www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Application Description
-
-The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update
-of the STM32 microcontroller built-in program with new firmware versions, adding
-new features and correcting potential issues. The update process is performed in
-a secure way to prevent unauthorized updates and access to confidential on-device
-data such as secret code and firmware encryption key.
-In addition, Secure Boot (Root of Trust services) checks and activates the STM32
-security mechanisms, and checks the authenticity and integrity of user application
-code before every execution to ensure that invalid or malicious code cannot be run.
-The Secure Firmware Update application receives the encrypted firmware image, decrypts
-it, then checks the authenticity and integrity of the code before installing it.
-
-The secure key management services provide cryptographic services to the user
-application through the pkcs11 APIs (KEY ID based APIs) that are executed inside
-a protected and isolated environment. User application keys are stored in the
-protected and isolated environment. They can be updated in a secure way (authenticity
-check, data decryption and data integrity check).
-
-This example supports multiple images feature configured with 2 active images for
-execution from internal flash and 1 download area also located in internal flash.
-This example allows to demonstrate features like:
-* download a new firmware image from the application
-* resume firmware update procedure in case of power off during installation
-
-For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
-available from the STMicroelectronics microcontroller website www.st.com.
-
-@par Keywords
-
-Security, SBSFU, GTZC, Dual core, MPU
-
-@par Directory contents
-
-   - 2_Images_SBSFU/CM0PLUS/Core/Src/main.c                           Main M0+ application file
-   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              M0+ HAL MSP module
-   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c                   STM32 M0+ interrupt handlers
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h                         Hardware definition for application
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/main.h                           Header file for M0+ main.c
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h          M0+ BSP configuration file
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             M0+ HAL configuration file
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h                   Header file for M0+ stm32wlxx_it.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c                     SBSFU errors management
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c              SBSFU image handling: common functionalities/services
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c                SBSFU image handling: FW upgrade without swap area services
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c             SBSFU image handling: FW upgrade with swap area services
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c                       Key management service blob importation handling
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c             Secure Engine isolation with MPU (when no Firewall is available)
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c                      SBSFU security protection automatic test
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h                       Software configuration of M0+ SBSFU application
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h                      Header file for sfu_boot.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h                     Header file for sfu_error.c file
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h                SBSFU FSM states definitions
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h                       Header file for sfu_kms.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h             Header file for sfu_mpu_isolation.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h                      Header file for sfu_test.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c     SBSFU security low level interface
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h     Header file for security low level interface
-   - 2_Images_SBSFU/CM4/Src/main.c                                    Main M4 application file
-   - 2_Images_SBSFU/CM4/Src/sfu_com_loader.c                          SBSFU communication module: local loader part
-   - 2_Images_SBSFU/CM4/Src/sfu_loader.c                              SBSFU Local Loader
-   - 2_Images_SBSFU/CM4/Src/sfu_low_level_security.c                  M4 SB security low level interface
-   - 2_Images_SBSFU/CM4/Src/sfu_new_image.c                           SBSFU image handling: new image storage and installation request
-   - 2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c                       M4 HAL MSP module
-   - 2_Images_SBSFU/CM4/Src/stm32wlxx_it.c                            STM32 M4 interrupt handlers
-   - 2_Images_SBSFU/CM4/Inc/app_sfu.h                                 Software configuration of M4 SB application
-   - 2_Images_SBSFU/CM4/Inc/main.h                                    Header file for M4 main.c
-   - 2_Images_SBSFU/CM4/Inc/sfu_boot.h                                Definitions for Secure Boot (SB) flow control
-   - 2_Images_SBSFU/CM4/Inc/sfu_com_loader.h                          Header file for sfu_com_loader.c
-   - 2_Images_SBSFU/CM4/Inc/sfu_loader.h                              Header file for sfu_loader.c
-   - 2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h                  Header file for security low level interface
-   - 2_Images_SBSFU/CM4/Inc/sfu_new_image.h                           Header file for sfu_new_image.c
-   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h                      M4 HAL configuration file
-   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h                            Header file for M4 stm32wlxx_it.c
-   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h                   M4 BSP configuration file
-   - 2_Images_SBSFU/Common/sfu_com_trace.c                            SBSFU communication module: trace part
-   - 2_Images_SBSFU/Common/sfu_low_level.c                            SBSFU general low level interface
-   - 2_Images_SBSFU/Common/sfu_low_level_flash.c                      SBSFU flash low level interface (wrapper)
-   - 2_Images_SBSFU/Common/sfu_low_level_flash_ext.c                  SBSFU external flash low level interface
-   - 2_Images_SBSFU/Common/sfu_low_level_flash_int.c                  SBSFU internal flash low level interface
-   - 2_Images_SBSFU/Common/app_sfu_common.h                           Common software configuration of M4 SB and M0+ SBSFU applications
-   - 2_Images_SBSFU/Common/sfu_com_trace.h                            Header file for sfu_com_trace.c
-   - 2_Images_SBSFU/Common/sfu_def.h                                  General definition for SBSFU application
-   - 2_Images_SBSFU/Common/sfu_fwimg_regions.h                        FLASH regions definitions for image handling
-   - 2_Images_SBSFU/Common/sfu_low_level.h                            Header file for general low level interface
-   - 2_Images_SBSFU/Common/sfu_low_level_flash.h                      Header file for flash low level interface (wrapper)
-   - 2_Images_SBSFU/Common/sfu_low_level_flash_ext.h                  Header external file for flash low level interface
-   - 2_Images_SBSFU/Common/sfu_low_level_flash_int.h                  Header internal file for flash low level interface
-   - 2_Images_SBSFU/Common/sfu_trace.h                                Header file for sfu_trace.c
-
-@par Hardware and Software environment
-
-  - This example runs on STM32WL55xx devices.
-  - This example has been tested with NUCLEO-WL55JC RevC board and can be
-    easily tailored to any other supported device and development board.
-  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
-    is a feature provided by STM32Cube programmer available on www.st.com.
-  - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
-  - This example needs a terminal emulator.
-  - Microsoft Windows has a limitation whereby paths to files and directories cannot
-    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
-    shell scripts) to fail reading from or writing to such files.
-    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
-    up a local drive out of an existing directory on the hard drive, such as:
-    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
-
-@par How to use it ?
-
-Several steps to run SBSFU application :
-
-1. Compile projects in the following order. This is mandatory as each project requests some objects
-   generated by the compilation of the previous one:
-  - 2_Images_SECoreBin (see also SECoreBin/readme.txt)
-  - 2_Images_SBSFU (using both CM4 and CM0+ workspaces)
-  - 2_Images_UserApp_M0Plus (see also UserApp_M0Plus/readme.txt)
-  - 2_Images_UserApp_M4 (see also UserApp_M4/readme.txt)
-
-2. Before loading SBSFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that
-   the following are valid for the device:
- - RDP Level 0
- - Write Protection disabled on all FLASH pages
- - Chip has been erased
-
-3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator
-   that can be downloaded from https://osdn.net/projects/ttssh2/) for UART connection with the board.
-   Support of YMODEM protocol is required. Serial port configuration should be :
- - Baud rate = 115200
- - Data = 8 bits
- - Parity = none
- - Stop = 1 bit
- - Flow control = none
-
-4. Load CM4 SB image and CM0+ SBSFU image into target memory with your preferred toolchain or STM32CubeProgammer.
-
-5. Once the SB_SFU software is downloaded, power cycle the board (unplug/plug USB cable) : the SBSFU
-   application starts and configures the security mechanisms.
-
-6. Power cycle the board a second time (unplug/plug the USB cable): the SBSFU application starts with
-   the configured securities turned on and the Tera Term connection is possible.
-   Caution: Make sure to use an up-to-date version of ST-LINK firmware else SBSFU may not start.
-
-7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
-   Red LED blinks every 500 ms when waiting for the CM0+ SBSFU to boot.
-   Green LED blinks every 100 ms when CM0+ and/or CM4 firmware image(s) need(s) to be dowloaded.
-   Red LED blinks every 3 seconds when a local download is waited.
-   A reboot occurs in case of error in option bytes configuration.
-
-8. Send the first user encrypted firmware file (\2_Images\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
-   \2_Images\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term
-   by using menu "File > Transfer > YMODEM > Send..."
-
-9. Send the second user encrypted firmware file (\2_Images\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
-   \2_Images\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term
-   by using menu "File > Transfer > YMODEM > Send..."
-
-Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
-Note2 : As TAMPER detection can be very sensitive, the protection is disabled by default.
-        Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
-Note3 :  for Linux users Minicom can be used but to do so you need to compile the SBSFU project with the MINICOM_YMODEM switch enabled (app_sfu.h)
-
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/Project.ewp
deleted file mode 100644
index 96eb855a..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/Project.ewp
+++ /dev/null
@@ -1,1185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>2</fileVersion>
-    <configuration>
-        <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>General</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <version>31</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>ExePath</name>
-                    <state>STM32WL55JC_Nucleo/Exe</state>
-                </option>
-                <option>
-                    <name>ObjPath</name>
-                    <state>STM32WL55JC_Nucleo/Obj</state>
-                </option>
-                <option>
-                    <name>ListPath</name>
-                    <state>STM32WL55JC_Nucleo/List</state>
-                </option>
-                <option>
-                    <name>GEndianMode</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>GOutputBinary</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGCoreOrChip</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelect</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelectSlave</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>RTDescription</name>
-                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-                </option>
-                <option>
-                    <name>OGProductVersion</name>
-                    <state>4.41A</state>
-                </option>
-                <option>
-                    <name>OGLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGChipSelectEditMenu</name>
-                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-                </option>
-                <option>
-                    <name>GenLowLevelInterface</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GEndianModeBE</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGBufferedTerminalOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GenStdoutInterface</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>RTConfigPath2</name>
-                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
-                </option>
-                <option>
-                    <name>GBECoreSlave</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>OGUseCmsis</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGUseCmsisDspLib</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibThreads</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CoreVariant</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>GFPUDeviceSlave</name>
-                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-                </option>
-                <option>
-                    <name>FPU2</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NrRegs</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NEON</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GFPUCoreSlave2</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>OGCMSISPackSelectDevice</name>
-                </option>
-                <option>
-                    <name>OgLibHeap</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGLibAdditionalLocale</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGPrintfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGPrintfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GenLocaleTags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>GenLocaleDisplayOnly</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DSPExtension</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>TrustZone</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZoneModes</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ICCARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>34</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDefines</name>
-                    <state>USE_HAL_DRIVER</state>
-                    <state>STM32WL55xx</state>
-                    <state>CORE_CM0PLUS</state>
-                    <state>KMS_ENABLED</state>
-                    <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
-                    <state>IT_MANAGEMENT_DISABLED</state>
-                </option>
-                <option>
-                    <name>CCPreprocFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocComments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMnemonics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMessages</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDiagSuppress</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagRemark</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagWarning</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagError</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCAllowList</name>
-                    <version>1</version>
-                    <state>11111110</state>
-                </option>
-                <option>
-                    <name>CCDebugInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IEndianMode</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCLangConformance</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSignedPlainChar</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRequirePrototypes</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCDiagWarnAreErr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCompilerRuntimeInfo</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>CCLibConfigHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>PreInclude</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
-                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
-                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
-                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-                    <state>$PROJ_DIR$</state>
-                    <state>$PROJ_DIR$\..\..\LoRaWAN_End_Node_DualCore\CM0PLUS\LoRaWAN\App</state>
-                </option>
-                <option>
-                    <name>CCStdIncCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCodeSection</name>
-                    <state>.text</state>
-                </option>
-                <option>
-                    <name>IProcessorMode2</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevel</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CCOptStrategy</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevelSlave</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
-                <option>
-                    <name>CCPosIndRopi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndRwpi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndNoDynInit</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccLang</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCDialect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccAllowVLA</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccStaticDestr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCppInlineSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccFloatSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCOptStrategySlave</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCGuardCalls</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccExceptions2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccRTTI2</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>AARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>10</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>AObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>ACaseSensitivity</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacroChars</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnWhat</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnOne</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>ADebug</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AltRegisterNames</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ADefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AList</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AListHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AListing</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Includes</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacDefs</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacExps</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacExec</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OnlyAssed</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MultiLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLengthCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLength</name>
-                    <state>80</state>
-                </option>
-                <option>
-                    <name>TabSpacing</name>
-                    <state>8</state>
-                </option>
-                <option>
-                    <name>AXRef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDefines</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefInternal</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDual</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AOutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsEdit</name>
-                    <state>100</state>
-                </option>
-                <option>
-                    <name>AIgnoreStdInclude</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AUserIncludes</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AExtraOptionsCheckV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AExtraOptionsV2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AsmNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>OBJCOPY</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OOCOutputFormat</name>
-                    <version>3</version>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>OCOutputOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCOutputFile</name>
-                    <state>..\..\SE_Core.bin</state>
-                </option>
-                <option>
-                    <name>OOCCommandLineProducer</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCObjCopyEnable</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CUSTOM</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <extensions></extensions>
-                <cmdline></cmdline>
-                <hasPrio>0</hasPrio>
-            </data>
-        </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-        <settings>
-            <name>BUILDACTION</name>
-            <archiveVersion>1</archiveVersion>
-            <data>
-                <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
-                <postbuild></postbuild>
-            </data>
-        </settings>
-        <settings>
-            <name>ILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>21</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IlinkLibIOConfig</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkInputFileSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOutputFile</name>
-                    <state>Project.out</state>
-                </option>
-                <option>
-                    <name>IlinkDebugInfoEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkKeepSymbols</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySymbol</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySegment</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryAlign</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkConfigDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkMapFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogInitialization</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogModule</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogSection</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogVeneer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFileSlave</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkSuppressDiags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsRem</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsWarn</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsErr</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkWarningsAreErrors</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkUseExtraOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkExtraOptions</name>
-                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-                </option>
-                <option>
-                    <name>IlinkLowLevelInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAutoLibEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAdditionalLibs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkOverrideProgramEntryLabel</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabelSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabel</name>
-                    <state>SE_CallGate</state>
-                </option>
-                <option>
-                    <name>DoFill</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>FillerByte</name>
-                    <state>0xFF</state>
-                </option>
-                <option>
-                    <name>FillerStart</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>FillerEnd</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>CrcSize</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcPoly</name>
-                    <state>0x11021</state>
-                </option>
-                <option>
-                    <name>CrcCompl</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcBitOrder</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcInitialValue</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>DoCrc</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkBufferedTerminalOutput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkStdoutInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcFullSize</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIElfToolPostProcess</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogAutoLibSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogRedirSymbols</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogUnusedFragments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcReverseByteOrder</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcUseAsInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptInline</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsAllow</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsForce</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptMergeDuplSections</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptUseVfe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptForceVfe</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackAnalysisEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackControlFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkStackCallGraphFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CrcAlgorithm</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcUnitSize</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkThreadsSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogCallGraph</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile_AltDefault</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkHeapSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLocaleSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>###Uninitialized###</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IARCHIVE</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IarchiveInputs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IarchiveOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IarchiveOutput</name>
-                    <state>###Uninitialized###</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-    </configuration>
-    <group>
-        <name>Doc</name>
-        <file>
-            <name>$PROJ_DIR$\..\readme.txt</name>
-        </file>
-    </group>
-    <group>
-        <name>Application</name>
-        <group>
-            <name>User</name>
-            <file>
-                <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Drivers</name>
-        <group>
-            <name>STM32WLxx_HAL_Driver</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Middlewares</name>
-        <group>
-            <name>STM32_Secure_Engine</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_bootinfo.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
-            </file>
-        </group>
-        <group>
-            <name>STM32_Key_Management_Services</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Third_Party</name>
-            <group>
-                <name>mbed-crypto</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
-                </file>
-            </group>
-        </group>
-    </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
deleted file mode 100644
index 8962a7c7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
+++ /dev/null
@@ -1,178 +0,0 @@
-::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfu=%userAppBinary%\\%execname%.sfu"
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-
-set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\Binary\\SBSFU_UserApp_M0PLUS.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\project.out"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\project.out"
-:setkeys
-set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
-IF %ERRORLEVEL% NEQ 0 goto :error
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header_%fwid%.txt (
-  del %projectdir%\header_%fwid%.txt
-)
-set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header.txt >> %projectdir%\output_%fwid%.txt 2>>&1
-echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %partialbin% %partialsfu%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialsfu%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
deleted file mode 100644
index c4fadc03..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
+++ /dev/null
@@ -1,168 +0,0 @@
-::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-set "oemkey="
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\Binary\\SBSFU_UserApp_M0PLUS.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\project.out"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\project.out"
-:setkeys
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
-IF %ERRORLEVEL% NEQ 0 goto :error
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-:: no encryption
-set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:: no encryption so pack the binary file
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header_%fwid%.txt (
-  del %projectdir%\header_%fwid%.txt
-)
-set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
-echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% -o 512 --pfw %partialbin% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
deleted file mode 100644
index c2ef6f07..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
+++ /dev/null
@@ -1,177 +0,0 @@
-::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfu=%userAppBinary%\\%execname%.sfu"
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\Binary\\SBSFU_UserApp_M0PLUS.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\project.out"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\project.out"
-:setkeys
-set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
-IF %ERRORLEVEL% NEQ 0 goto :error
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header_%fwid%.txt (
-  del %projectdir%\header_%fwid%.txt
-)
-set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
-echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %partialbin% %partialsfu%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% -o 512 --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialsfu%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
deleted file mode 100644
index 07427053..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ /dev/null
@@ -1,30 +0,0 @@
-/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
-
-define memory mem with size = 4G;
-
-define symbol __ICFEDIT_size_heap__ = 0x200;
-
-/******************************************************************************/
-/*       Include of SE symbols file                                           */
-/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
-/*   specify the the directory to search for include files                    */
-/******************************************************************************/
-include "mapping_sbsfu.icf";
-include "mapping_fwimg.icf";
-
-initialize by copy { readwrite };
-do not initialize  { section .noinit, section BOOTINFO_DATA};
-
-define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
-
-/******************************************************************************/
-/*                          placement instructions                            */
-/******************************************************************************/
-place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
-place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
-place in SE_CODE_NOKEY_ROM_region {readonly};
-place in User_Key_ROM_region { section .USER_embedded_Keys };
-keep { section .USER_embedded_Keys };
-place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
-keep { section .SE_embedded_Keys };
-place in SE_RAM_region {readwrite, section BOOTINFO_DATA, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
deleted file mode 100644
index 4c98d733..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
+++ /dev/null
@@ -1,490 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    kms_platf_objects_config.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Key Management Services (KMS)
-  *          module platform objects management configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef KMS_PLATF_OBJECTS_CONFIG_H
-#define KMS_PLATF_OBJECTS_CONFIG_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "kms_platf_objects_interface.h"
-#include "app_sfu.h"
-#include "Commissioning.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define RAW_TO_INT32A(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
-0x##a##b##c##d, 0x##e##f##g##h, 0x##i##j##k##l, 0x##m##n##o##p
-
-#define FORMAT_KEY_32(...) RAW_TO_INT32A(__VA_ARGS__)
-
-/** @addtogroup Key_Management_Services Key Management Services (KMS)
-  * @{
-  */
-
-/** @addtogroup KMS_PLATF Platform Objects
-  * @{
-  */
-
-/* Exported constants --------------------------------------------------------*/
-
-/** @addtogroup KMS_PLATF_Exported_Constants Exported Constants
-  * @note KMS support different type of objects, their respective ranges are
-  *       defined here
-  * @{
-  */
-
-/* We consider that the ORDER (static = lower ids) will be kept. */
-#define KMS_INDEX_MIN_EMBEDDED_OBJECTS       1UL   /*!< Embedded objects min ID. Must be > 0 as '0' is never a
-                                                        valid key index */
-#define KMS_INDEX_MAX_EMBEDDED_OBJECTS       (KMS_INDEX_MIN_EMBEDDED_OBJECTS+19UL)    /*!< Embedded objects max ID */
-#define KMS_INDEX_MIN_NVM_STATIC_OBJECTS     (KMS_INDEX_MAX_EMBEDDED_OBJECTS+1UL)     /*!< NVM static objects min ID */
-#define KMS_INDEX_MAX_NVM_STATIC_OBJECTS     (KMS_INDEX_MIN_NVM_STATIC_OBJECTS+19UL)  /*!< NVM static objects max ID */
-
-#define KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MAX_NVM_STATIC_OBJECTS+1UL)   /*!< NVM dynamic objects min ID */
-#define KMS_INDEX_MAX_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS+19UL) /*!< NVM dynamic objects max ID */
-
-/* Blob import key index */
-#define KMS_INDEX_BLOBIMPORT_VERIFY       (1U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
-                                                         where the blob verification key is stored */
-#define KMS_INDEX_BLOBIMPORT_DECRYPT      (2U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
-                                                         where the blob decryption key is stored */
-
-/**
-  * @}
-  */
-
-/*
- * Embedded objects definition
- *
- */
-#ifdef KMS_PLATF_OBJECTS_C
-/** @addtogroup KMS_PLATF_Private_Variables Private Variables
-  * @{
-  */
-/* Place code in a specific section*/
-#if defined(__ICCARM__)
-#pragma default_variable_attributes = @ ".SE_embedded_Keys"
-#elif defined(__CC_ARM)
-#pragma arm section rodata = ".SE_embedded_Keys"
-#endif
-
-KMS_DECLARE_BLOB_STRUCT(, 24);
-KMS_DECLARE_BLOB_STRUCT(, 30);
-KMS_DECLARE_BLOB_STRUCT(, 256);
-
-/* This object is used for KMS blob header signature                 */
-#if defined(__GNUC__)
-__attribute__((section(".SE_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_30_t   KMS_Blob_ECDSA_Verify =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  120,                             /*  uint32_t blobs_size; */
-  4,                               /*  uint32_t blobs_count; */
-  1,                               /*  uint32_t object_id; */
-  {
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
-    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
-    CKA_EC_POINT,     @ECDSA_BLOB_KEY@
-  }
-};
-
-/* This object is used for KMS blob encryption                    */
-#if defined(__GNUC__)
-__attribute__((section(".SE_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_24_t   KMS_Blob_AES_CBC128_Decrypt =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  96,                              /*  uint32_t blobs_size; */
-  7,                               /*  uint32_t blobs_count; */
-  2,                               /*  uint32_t object_id; */
-  {
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
-    CKA_VALUE,        @AES_BLOB_KEY@
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
-    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
-  }
-};
-
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-#if defined(__GNUC__)
-__attribute__((section(".SE_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_24_t   SBSFU_AES_1_128 =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  96,                              /*  uint32_t blobs_size; */
-  7,                               /*  uint32_t blobs_count; */
-  3,                               /*  uint32_t object_id; */
-  {
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
-    CKA_VALUE,        @AES_SBSFU_KEY_1@
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
-    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
-  }
-};
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-#if defined(__GNUC__)
-__attribute__((section(".SE_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_24_t   SBSFU_AES_2_128 =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  96,                              /*  uint32_t blobs_size; */
-  7,                               /*  uint32_t blobs_count; */
-  4,                               /*  uint32_t object_id; */
-  {
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
-    CKA_VALUE,        @AES_SBSFU_KEY_2@
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
-    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
-  }
-};
-#endif /*(SFU_NB_MAX_ACTIVE_IMAGE > 1U)*/
-
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-#if defined(__GNUC__)
-__attribute__((section(".SE_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_24_t   SBSFU_AES_3_128 =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  96,                              /*  uint32_t blobs_size; */
-  7,                               /*  uint32_t blobs_count; */
-  5,                               /*  uint32_t object_id; */
-  {
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
-    CKA_VALUE,        @AES_SBSFU_KEY_3@
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
-    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
-  }
-};
-#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
-#if defined(__GNUC__)
-__attribute__((section(".SE_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_30_t   SBSFU_ECDSA_1_Verify =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  120,                             /*  uint32_t blobs_size; */
-  4,                               /*  uint32_t blobs_count; */
-  6,                               /*  uint32_t object_id; */
-  {
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
-    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
-    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_1@
-  }
-};
-
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-#if defined(__GNUC__)
-__attribute__((section(".SE_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_30_t   SBSFU_ECDSA_2_Verify =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  120,                             /*  uint32_t blobs_size; */
-  4,                               /*  uint32_t blobs_count; */
-  7,                               /*  uint32_t object_id; */
-  {
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
-    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
-    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_2@
-  }
-};
-#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
-
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-#if defined(__GNUC__)
-__attribute__((section(".SE_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_30_t   SBSFU_ECDSA_3_Verify =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  120,                             /*  uint32_t blobs_size; */
-  4,                               /*  uint32_t blobs_count; */
-  8,                               /*  uint32_t object_id; */
-  {
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
-    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
-    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_3@
-  }
-};
-#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
-
-
-
-
-/* Stop placing data in specified section*/
-#if defined(__ICCARM__)
-#pragma default_variable_attributes =
-#elif defined(__CC_ARM)
-#pragma arm section code
-#endif
-
-#if defined(__ICCARM__)
-#pragma default_variable_attributes = @ ".USER_embedded_Keys"
-#elif defined(__CC_ARM)
-#pragma arm section rodata = ".USER_embedded_Keys"
-#endif
-
-KMS_DECLARE_BLOB_STRUCT(, 32);
-
-/* These objects are used by user tKMS application                 */
-#if defined(__GNUC__)
-__attribute__((section(".USER_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_32_t   Lorawan_Zero_Key =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  13,                               /*  uint32_t object_id; */
-  {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES, 
-    CKA_VALUE,        16, 0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U, 
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
-  }
-};
-
-#if defined(__GNUC__)
-__attribute__((section(".USER_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_32_t   Lorawan_App_Key =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  14,                               /*  uint32_t object_id; */
-  {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES, 
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_APP_KEY), 
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
-  }
-};
-
-#if defined(__GNUC__)
-__attribute__((section(".USER_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_32_t   Lorawan_Nwk_Key =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  15,                               /*  uint32_t object_id; */
-  {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES, 
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_NWK_KEY), 
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
-  }
-};
-
-#if defined(__GNUC__)
-__attribute__((section(".USER_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_32_t   Lorawan_Nwk_S_Key =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  16,                               /*  uint32_t object_id; */
-  {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES, 
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_NWK_S_KEY),  
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
-  }
-};
-
-#if defined(__GNUC__)
-__attribute__((section(".USER_embedded_Keys")))
-#endif
-static const kms_obj_keyhead_32_t   Lorawan_App_S_Key =
-{
-  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
-  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
-  128,                             /*  uint32_t blobs_size; */
-  9,                               /*  uint32_t blobs_count; */
-  17,                              /*  uint32_t object_id; */
-  {
-    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),          CKK_AES,
-    CKA_VALUE,        16, FORMAT_KEY_32(LORAWAN_APP_S_KEY),   
-    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
-    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
-    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
-    CKA_LABEL,        12, 0x41524F4CU, 0x50595243U, 0x00383231U      /* 'LORA', 'CRYP', '128' */
-  }
-};
-#if defined(__ICCARM__)
-#pragma default_variable_attributes =
-#elif defined(__CC_ARM)
-#pragma arm section code
-#endif
-
-/**
-  * @brief  KMS embedded objects definition
-  * @note   Must contains KMS blob verification and decryption keys
-  */
-static const kms_obj_keyhead_t *const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBEDDED_OBJECTS -
-                                                                    KMS_INDEX_MIN_EMBEDDED_OBJECTS + 1] =
-{
-#if defined(KMS_IMPORT_BLOB)
-  /* KMS Blob import keys */
-  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_ECDSA_Verify,       /* Index = 1 */
-  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_AES_CBC128_Decrypt, /* Index = 2 */
-#else
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 1 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 2 */
-#endif /* KMS_IMPORT_BLOB */
-  /* SBSFU keys */
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_1_128,             /* Index = 3 */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_2_128,             /* Index = 4 */
-#else
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
-#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_3_128,             /* Index = 5 */
-#else
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
-#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
-#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 3 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
-  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_1_Verify,        /* Index = 6 */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_2_Verify,        /* Index = 7 */
-#else
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
-#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_3_Verify,        /* Index = 8 */
-#else
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
-#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
-#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 6 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 9 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 10 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 11 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 12 */
-  /* UserApp example keys */
-  (kms_obj_keyhead_t *) &Lorawan_Zero_Key,                      /* Index = 13 */
-  (kms_obj_keyhead_t *) &Lorawan_App_Key,                       /* Index = 14 */
-  (kms_obj_keyhead_t *) &Lorawan_Nwk_Key,                       /* Index = 15 */
-  (kms_obj_keyhead_t *) &Lorawan_Nwk_S_Key,                     /* Index = 16 */
-  (kms_obj_keyhead_t *) &Lorawan_App_S_Key,                     /* Index = 17 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 18 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 19 */
-  (kms_obj_keyhead_t *) NULL,                                   /* Index = 20 */
-};
-
-/**
-  * @}
-  */
-#endif /* KMS_PLATF_OBJECTS_C */
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* KMS_PLATF_OBJECTS_CONFIG_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/se_low_level.h
deleted file mode 100644
index a8adec58..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/se_low_level.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_low_level.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Engine low level interface
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SE_LOW_LEVEL_H
-#define SE_LOW_LEVEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_def.h"
-
-/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
-   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
-#include "sfu_fwimg_regions.h"
-
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup SE
-  * @{
-  */
-
-/** @addtogroup SE_HARDWARE
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
-  * @{
-  */
-/**
-  * @brief flash handling constants: these constants are used in se_fwimg.c
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
-  * @{
-  */
-
-/**
-  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
-  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
-  * 32-bit word.
-  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
-  */
-#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
-  do{                                  \
-    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
-  }while(0)
-
-/**
-  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
-  */
-#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
-  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
-  * @{
-  */
-
-/* == Code isolation : FIREWALL example ==*/
-#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
-#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
-
-/* == Code isolation : MPU example ==*/
-/**
-  * This switch enables the Secure Engine isolation based on the MPU usage.
-  * This switch must be enabled if the STM32 platform in use does not have a Firewall.
-  * This switch cannot be enabled if the example is provided with Firewall isolation.
-  */
-/* == MPU isolation ENABLED ==*/
-#define SFU_ISOLATE_SE_WITH_MPU
-
-/** @addtogroup SE_LOW_LEVEL_Exported_Functions
-  * @{
-  */
-void SE_LL_CORE_Cleanup(void);
-#if defined (__CC_ARM)
-void __arm_clean_data(void);
-#elif defined(__GNUC__)
-void __gcc_clean_data(void);
-#endif /* __CC_ARM */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_Functions
-  * @{
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_CRC_Config(void);
-SE_ErrorStatus SE_LL_CRC_Init(void);
-SE_ErrorStatus SE_LL_CRC_DeInit(void);
-uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
-SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-
-void NMI_Handler(void);
-void HardFault_Handler(void);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
-SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SE_LOW_LEVEL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
deleted file mode 100644
index 91439526..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
+++ /dev/null
@@ -1,705 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>0</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>1</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>1</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint/>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>1</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>1</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>.\data_init.c</PathWithFileName>
-      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/User</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_bootinfo.c</PathWithFileName>
-      <FilenameWithoutPath>se_bootinfo.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
-      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
-      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
-      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
-      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
-      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
-      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
-      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
-      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
-      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
-      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
-      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
-      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
-      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
-      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
-      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
-      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
-      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
-      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>::CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>1</RteFlg>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 1a83ea16..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM0P</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.6</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>SECoreBin</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name>prebuild.bat .</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
-          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> </TargetDllArguments>
-          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
-              <Undefine></Undefine>
-              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM;../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>SECoreBin.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--entry=SE_CallGate
---diag_suppress L6404W
---diag_suppress L6314W</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>data_init.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\data_init.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>ca_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/ca_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/kms_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>nvms_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/nvms_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/se_low_level.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pka.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_bootinfo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_bootinfo.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_callgate.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_exception.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_fwimg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_startup.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_user_application.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_utils.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-          <Files>
-            <File>
-              <FileName>ca_core.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_der_x962.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_digest.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_dyn_obj.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_ecc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_enc_dec.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_entry.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_init.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_key_mgt.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_mem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_nvm_storage.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_objects.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_platf_objects.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_sign_verify.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
-          <Files>
-            <File>
-              <FileName>platform_util.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
-            </File>
-            <File>
-              <FileName>sha256.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_2_Images_SECoreBin"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
deleted file mode 100644
index ab12caef..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
+++ /dev/null
@@ -1,178 +0,0 @@
-::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfu=%userAppBinary%\\%execname%.sfu"
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-
-set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\Binary\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
-:setkeys
-set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
-IF %ERRORLEVEL% NEQ 0 goto :error
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header_%fwid%.txt (
-  del %projectdir%\header_%fwid%.txt
-)
-set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header.txt >> %projectdir%\output_%fwid%.txt 2>>&1
-echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %partialbin% %partialsfu%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialsfu%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
deleted file mode 100644
index 5227a248..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
+++ /dev/null
@@ -1,168 +0,0 @@
-::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-set "oemkey="
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\Binary\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
-:setkeys
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
-IF %ERRORLEVEL% NEQ 0 goto :error
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-:: no encryption
-set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:: no encryption so pack the binary file
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header_%fwid%.txt (
-  del %projectdir%\header_%fwid%.txt
-)
-set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
-echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% -o 512 --pfw %partialbin% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
deleted file mode 100644
index b4b1d0d3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
+++ /dev/null
@@ -1,177 +0,0 @@
-::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfu=%userAppBinary%\\%execname%.sfu"
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\Binary\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
-:setkeys
-set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
-IF %ERRORLEVEL% NEQ 0 goto :error
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header_%fwid%.txt (
-  del %projectdir%\header_%fwid%.txt
-)
-set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
-echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %partialbin% %partialsfu%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% -o 512 --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialsfu%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
deleted file mode 100644
index 6b26b261..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
+++ /dev/null
@@ -1,32 +0,0 @@
-#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
-; *************************************************************
-; *** Scatter-Loading Description File generated by uVision ***
-; *************************************************************
-#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
-#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
-
-
-; *** regions needed by SE_CoreBin project ***
-LR_SE SE_CODE_REGION_ROM_START {
-  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
-  *(.SE_CallGate_Code)
-  }
-  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
-  *(.SE_Startup_Code)
-  }
-  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_CODE_NOKEY_REGION_ROM_SIZE{
-  .ANY (+RO)
-  }
-  User_Key_region_ROM USER_KEY_REGION_ROM_START FIXED USER_KEY_REGION_ROM_SIZE {
-  *(.User_embedded_Keys)
-  }
-  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
-  *(.SE_embedded_Keys)
-  }
-  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
-  .ANY (+RW +ZI)
-  }
-  SE_region_RAM_Boot +0  {
-   *(BOOTINFO_DATA) 
-  }
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/ca_low_level.c
deleted file mode 100644
index f641765f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/ca_low_level.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ca_low_level.c
-  * @author  MCD Application Team
-  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef CA_LOW_LEVEL_C
-#define CA_LOW_LEVEL_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "CryptoApi/ca.h"
-
-/* Private defines -----------------------------------------------------------*/
-/* Private typedef -----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-
-
-/* Exported functions implementation -----------------------------------------*/
-
-#if defined(CA_HAL_CRYPTOLIB_SUPP)
-
-#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
- || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
- || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
- || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
-     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
-
-/**
-  * @brief CRYP MSP Initialization
-  * This function configures the hardware resources
-  * @param hcryp: CRYP handle pointer
-  * @retval None
-  */
-void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
-{
-  if (hcryp->Instance == CA_AES_INSTANCE)
-  {
-    /* Release AES/CRYP from reset state */
-    __HAL_RCC_AES_RELEASE_RESET();
-    /* Peripheral clock enable */
-    __HAL_RCC_AES_CLK_ENABLE();
-  }
-}
-
-/**
-  * @brief CRYP MSP De-Initialization
-  * This function freeze the hardware resources
-  * @param hcryp: CRYP handle pointer
-  * @retval None
-  */
-void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
-{
-  if (hcryp->Instance == CA_AES_INSTANCE)
-  {
-    /* Peripheral clock disable */
-    __HAL_RCC_AES_CLK_DISABLE();
-    /* Force AES/CRYP into reset state */
-    __HAL_RCC_AES_FORCE_RESET();
-  }
-}
-#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
-       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
-
-
-#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
-/**
-  * @brief      PKA MSP Initialization
-  *             This function configures the hardware resources used in this example
-  * @param[in] hpka: PKA handle pointer
-  * @retval None
-  */
-void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
-{
-  if (hpka->Instance == CA_PKA_INSTANCE)
-  {
-    /* Release PKA from reset state */
-    __HAL_RCC_PKA_RELEASE_RESET();
-    /* Peripheral clock enable */
-    __HAL_RCC_PKA_CLK_ENABLE();
-  }
-}
-
-/**
-  * @brief      PKA MSP De-Initialization
-  *             This function freeze the hardware resources used in this example
-  * @param[in] hpka: PKA handle pointer
-  * @retval None
-  */
-void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
-{
-  if (hpka->Instance == CA_PKA_INSTANCE)
-  {
-    /* Peripheral clock disable */
-    __HAL_RCC_PKA_CLK_DISABLE();
-    /* Force PKA into reset state */
-    __HAL_RCC_PKA_FORCE_RESET();
-  }
-}
-#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
-
-#endif /* CA_HAL_CRYPTOLIB_SUPP */
-
-
-#if defined(CA_ST_CRYPTOLIB_SUPP)
-/**
-  * @brief      CRC initialization
-  *             This function release reset and clock CRC IP peripheral
-  * @retval None
-  */
-void CA_LL_CRC_Init(void)
-{
-  /* Force CRC into reset state */
-  __HAL_RCC_CRC_FORCE_RESET();
-  /* Release CRC from reset state */
-  __HAL_RCC_CRC_RELEASE_RESET();
-  /* Peripheral clock enable */
-  __HAL_RCC_CRC_CLK_ENABLE();
-}
-
-#endif /* CA_ST_CRYPTOLIB_SUPP */
-
-#endif /* CA_LOW_LEVEL_C */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/se_low_level.c
deleted file mode 100644
index 911fc3a2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Src/se_low_level.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_low_level.c
-  * @author  MCD Application Team
-  * @brief   Secure Engine Interface module.
-  *          This file provides set of firmware functions to manage SE low level
-  *          interface functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SE_LOW_LEVEL_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_low_level.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#endif /* __CC_ARM */
-#include "se_exception.h"
-#include "string.h"
-
-/** @addtogroup SE Secure Engine
-  * @{
-  */
-/** @defgroup  SE_HARDWARE SE Hardware Interface
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Private_Variables Private Variables
-  * @{
-  */
-static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
-
-static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Private_Functions Private Functions
-  * @{
-  */
-
-static uint32_t SE_LL_GetPage(uint32_t Address);
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
-  * @{
-  */
-
-/**
-  * @brief  Set CRC configuration and call HAL CRC initialization function.
-  * @param  None.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
-  */
-SE_ErrorStatus SE_LL_CRC_Config(void)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  CrcHandle.Instance = CRC;
-  /* The input data are not inverted */
-  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
-
-  /* The output data are not inverted */
-  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
-
-  /* The Default polynomial is used */
-  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
-  /* The default init value is used */
-  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
-  /* The input data are 32-bit long words */
-  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
-  /* CRC Init*/
-  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Wrapper to HAL CRC initialization function.
-  * @param  None
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_CRC_Init(void)
-{
-  /* CRC Peripheral clock enable */
-  __HAL_RCC_CRC_CLK_ENABLE();
-
-  return SE_LL_CRC_Config();
-}
-
-/**
-  * @brief  Wrapper to HAL CRC de-initialization function.
-  * @param  None
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_CRC_DeInit(void)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
-  {
-    /* Initialization OK */
-    e_ret_status = SE_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Wrapper to HAL CRC Calculate function.
-  * @param  pBuffer: pointer to data buffer.
-  * @param  uBufferLength: buffer length in 32-bits word.
-  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
-  */
-uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
-{
-  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
-}
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
-  * @{
-  */
-
-/**
-  * @brief  This function does an erase of nb pages in user flash area
-  * @param  pStart: pointer to  user flash area
-  * @param  Length: number of bytes.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
-{
-  uint32_t page_error = 0U;
-  uint32_t start = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef p_erase_init;
-  SE_ErrorStatus e_ret_status = SE_SUCCESS;
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-    /* Fill EraseInit structure*/
-    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
-    p_erase_init.Page          = SE_LL_GetPage(start);
-    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
-    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
-    {
-      e_ret_status = SE_ERROR;
-    }
-
-    /* Lock the Flash to disable the flash control register access (recommended
-    to protect the FLASH memory against possible unwanted operation) *********/
-    (void)HAL_FLASH_Lock();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Write in Flash  protected area
-  * @param  pDestination pointer to destination area in Flash
-  * @param  pSource pointer to input buffer
-  * @param  Length number of bytes to be written
-  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
-  */
-
-SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  SE_ErrorStatus ret = SE_SUCCESS;
-  uint32_t i;
-  uint32_t verified = 0U;
-  uint32_t destination = (uint32_t)pDestination;
-  uint32_t source = (uint32_t)pSource;
-
-  if (Length == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  /* Area should be inside 1 of the firmware image headers */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      verified = 1U;
-    }
-  }
-  if (verified == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-    for (i = 0U; i < Length; i += 8U)
-    {
-      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
-      {
-        ret = SE_ERROR;
-        break;
-      }
-    }
-
-    /* Lock the Flash to disable the flash control register access (recommended
-    to protect the FLASH memory against possible unwanted operation) */
-    (void)HAL_FLASH_Lock();
-  }
-  else
-  {
-    ret = SE_ERROR;
-  }
-  return ret;
-}
-
-/**
-  * @brief  Read in Flash protected area
-  * @param  pDestination: Start address for target location
-  * @param  pSource: pointer on buffer with data to read
-  * @param  Length: Length in bytes of data buffer
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  uint32_t source = (uint32_t)pSource;
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  uint32_t i;
-  uint32_t verified = 0U;
-
-
-  /* Area should be inside 1 of the firmware image headers
-     or inside 1 of the download areas */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      verified = 1U;
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
-        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
-    {
-      verified = 1U;
-    }
-  }
-
-  if (verified == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  SE_DoubleECC_Error_Counter = 0U;
-  (void)memcpy(pDestination, pSource, Length);
-  if (SE_DoubleECC_Error_Counter == 0U)
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  SE_DoubleECC_Error_Counter = 0U;
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
-  * @{
-  */
-
-/**
-  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
-  * @param pxSE_Metadata: Firmware metadata.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(pxSE_Metadata);
-  return SE_SUCCESS;
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @brief Check if an array is inside the RAM of the product
-  * @param Addr : address  of array
-  * @param Length : length of array in byte
-  */
-SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
-      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_ROM_START)))
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is in sbsfu ram.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
-      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se ram.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
-                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
-      || ((0xFFFFFFFFUL - addr_start) < Length))
-  {
-    e_ret_status = SE_SUCCESS;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se rom.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
-                         || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
-      )))
-      || ((0xFFFFFFFFUL - addr_start) < Length))
-  {
-    e_ret_status = SE_SUCCESS;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-/**
-  * @brief function to disable all IRQ, previously enabled ones are stored in parameter
-  * @param pIrqState: IRQ state buffer
-  * @param IrqStateNb: Number of IRQ state that can be stored
-  * @retval SE_ErrorStatus SE_SUCCESS when complete successfully, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
-  {
-    pIrqState[0] = NVIC->ICER[0];     /* Save currently enabled IRQ */
-    NVIC->ICER[0] = pIrqState[0];     /* Disable All IRQ */
-    if (NVIC->ICER[0] == 0UL)         /* Verify effectiveness of the operation */
-    {
-      e_ret_status = SE_SUCCESS;
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se rom.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
-  {
-    NVIC->ISER[0] = pIrqState[0];         /* Disable All enabled IRQ */
-    if (NVIC->ICER[0] == pIrqState[0])    /* Verify effectiveness of the operation */
-    {
-      e_ret_status = SE_SUCCESS;
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: Address of the FLASH Memory
-  * @retval The page of a given address
-  */
-static uint32_t SE_LL_GetPage(uint32_t Address)
-{
-  uint32_t page;
-
-  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
-  {
-    /* Bank 1 */
-    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
-  }
-  else
-  {
-    /* Bank 2 */
-    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
-  }
-  return page;
-}
-
-/**
-  * @brief  Gets the bank of a given address
-  * @param  Addr: Address of the FLASH Memory
-  * @retval The bank of a given address
-  */
-
-
-/**
-  * @brief  Get Link Register value (LR)
-  * @param  None.
-  * @retval LR Register value
-  */
-__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
-{
-  register uint32_t result;
-
-#if defined ( __ICCARM__ ) || ( __GNUC__ )
-  __ASM volatile("MOV %0, LR" : "=r"(result));
-#elif defined ( __CC_ARM )
-  __ASM volatile("MOV result, __return_address()");
-#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
-
-  return result;
-}
-
-/*
-   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
-   not to use extra registers (on top of scratch registers), because it would change the stack pointer
-   position. Then compiler optimizations are customized to ensure that.
-*/
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O1")))
-#endif /* __ICCARM__ */
-
-/**
-  * @brief  NMI Handler present for handling Double ECC NMI interrupt
-  * @param  None.
-  * @retval None.
-  */
-void NMI_Handler(void)
-{
-  uint32_t *p_sp;
-  uint32_t lr;
-  uint16_t opcode_msb;
-
-  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
-  {
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
-
-    /* Memorize error to ignore the read value */
-    SE_DoubleECC_Error_Counter++;
-
-    lr = __get_LR();
-
-    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
-    if (((lr) & (0xFU)) == 0xDU)
-    {
-      /* interrupted code was using Process Stack Pointer */
-      p_sp = (uint32_t *)__get_PSP();
-    }
-    else
-    {
-      /* interrupted code was using Main Stack Pointer */
-      p_sp = (uint32_t *)__get_MSP();
-    }
-
-    /* Test caller mode T bit from CPSR in stack */
-    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
-    {
-      /* Thumb  mode.
-         Test PC in stack.
-         If bits [15:11] of the halfword being decoded take any of the following values,
-         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
-         Otherwise, the halfword is a 16-bit instruction.
-      */
-      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
-      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
-      {
-        /* execute next instruction PC +4  */
-        *(p_sp + 6U) += 4U;
-      }
-      else
-      {
-        /* execute next instruction PC +2  */
-        *(p_sp + 6U) += 2U;
-      }
-    }
-    else
-    {
-      /* ARM mode execute next instruction PC +4 */
-      *(p_sp + 6U) += 4U;
-    }
-  }
-  else
-  {
-    /* This exception occurs for another reason than flash double ECC errors */
-    SE_NMI_ExceptionHandler();
-  }
-}
-
-/**
-  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
-  * @param  None.
-  * @retvat void
-  */
-void HardFault_Handler(void)
-{
-  SE_NMI_ExceptionHandler();
-}
-
-/**
-  * @brief  Cleanup SE CORE
-  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
-  *
-  */
-void  SE_LL_CORE_Cleanup(void)
-{
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/readme.txt
deleted file mode 100644
index 5bcc7828..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/readme.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
-  @page 2_Images_SECoreBin / Secure Engine Core binary generation.
-
-  @verbatim
-  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
-  * @file    readme.txt
-  * @brief   Secure Engine Core binary generation.
-  *          SE Core binary exports SE CallGate function entry point for
-  *          SFU Application.
-  ******************************************************************************
-  *
-  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                               www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Application Description
-
-This application is used to generate Secure Engine Core binary file to be linked
-with Secure Boot & Secure Firmware Update application (SBSFU).
-SE Core binary exports a single entry point to SE CallGate function and a startup
-method for data initialization. It is based on the Secure Engine Middleware.
-
-Generated SE Core Binary embeds Key Management Services accessible through this same
-single entry point using APIs defined by iKMS interface.
-
-It has to be compiled before SBSFU project.
-
-Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default cryptographic
-scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are provided and can be
-selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
-- SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
-- SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-- SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
-
-This example supports multiple images feature configured with 2 active images for execution from internal flash and 1
-download area also located in internal flash. Each image has its own keys for signature verification and firwmare encryption.
-
-For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
-available from the STMicroelectronics microcontroller website www.st.com.
-
-@par Keywords
-
-Security, KMS, SBSFU
-
-@par Directory contents
-
-   - 2_Images_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
-   - 2_Images_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
-   - 2_Images_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
-   - 2_Images_SECoreBin/Src/se_low_level.c                      Low level interface
-   - 2_Images_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
-   - 2_Images_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
-   - 2_Images_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
-   - 2_Images_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
-   - 2_Images_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
-   - 2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
-                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
-   - 2_Images_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
-                                                                Exported to KMS user to ease embedded object usage
-   - 2_Images_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
-   - 2_Images_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
-   - 2_Images_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
-   - 2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
-   - 2_Images_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
-   - 2_Images_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
-   - 2_Images_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
-   - 2_Images_SECoreBin/Binary/ECCKEY2.txt                      Private ECCDSA key for signature verification of 2nd active image
-   - 2_Images_SECoreBin/Binary/ECCKEY3.txt                      Private ECCDSA key for signature verification of a possible 3rd active image
-   - 2_Images_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin Public key for AES CBC encryption of 2nd active image
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin Public key for AES GCM encryption of 2nd active image
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY3_key_AES_CBC.bin Public key for AES CBC encryption of a possible 3rd active image
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY3_key_AES_GCM.bin Public key for AES GCM encryption of a possible 3rd active image
-
-@par Hardware and Software environment
-
-  - This example runs on STM32WL55xx devices
-  - This example has been tested with NUCLEO-WL55JC RevC board and can be
-    easily tailored to any other supported device and development board.
-  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
-    is a feature provided by STM32Cube programmer available on www.st.com.
-  - Microsoft Windows has a limitation whereby paths to files and directories cannot
-    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
-    shell scripts) to fail reading from or writing to such files.
-    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
-    up a local drive out of an existing directory on the hard drive, such as:
-    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
-
-   
-@par IDE prebuild script
-
-In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
-This preliminary processing is in charge of:
- - determining the requested cryptographic scheme
- - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of SBSFU & Blob importation keys into the KMS embedded objects pattern file)
- - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
-A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic key).
-The IDE does not track this update so you need to force the rebuild of the project manually.
-
-@par How to use it ?
-
-In order to generate Secure Engine Core binary file, you must do the following :
- - Open your preferred toolchain
- - Rebuild the project
-
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_export.h
index e0878585..66491c39 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_export.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_export.h
@@ -26,10 +26,6 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-extern uint32_t __ICFEDIT_M4_SB_region_ROM_start__;
-#define M4_SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_start__)
-extern uint32_t __ICFEDIT_M4_SB_region_ROM_end__;
-#define M4_SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_end__)
 extern uint32_t __ICFEDIT_intvec_start__;
 #define INTVECT_START ((uint32_t)& __ICFEDIT_intvec_start__)
 extern uint32_t __ICFEDIT_SE_Startup_region_ROM_start__;
@@ -38,6 +34,10 @@ extern uint32_t __ICFEDIT_SE_Code_region_ROM_start__;
 #define SE_CODE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_start__)
 extern uint32_t __ICFEDIT_SE_Code_region_ROM_end__;
 #define SE_CODE_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_end__)
+extern uint32_t __ICFEDIT_User_Key_region_ROM_start__;
+#define USER_KEY_REGION_ROM_START ((uint32_t)& __ICFEDIT_User_Key_region_ROM_start__)
+extern uint32_t __ICFEDIT_User_Key_region_ROM_end__;
+#define USER_KEY_REGION_ROM_END ((uint32_t)& __ICFEDIT_User_Key_region_ROM_end__)
 extern uint32_t __ICFEDIT_SE_IF_region_ROM_start__;
 #define SE_IF_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_start__)
 extern uint32_t __ICFEDIT_SE_IF_region_ROM_end__;
@@ -68,6 +68,7 @@ extern uint32_t __ICFEDIT_KMS_DataStorage_start__ ;
 extern uint32_t __ICFEDIT_KMS_DataStorage_end__ ;
 #define KMS_DATASTORAGE_END ((uint32_t)& __ICFEDIT_KMS_DataStorage_end__)
 
+
 #if defined (__ICCARM__) || defined(__GNUC__)
 extern uint32_t __ICFEDIT_SLOT_Active_1_header__;
 #define SLOT_ACTIVE_1_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_1_header__)
@@ -103,16 +104,6 @@ extern uint32_t __ICFEDIT_SWAP_start__;
 #define SWAP_START ((uint32_t)& __ICFEDIT_SWAP_start__)
 extern uint32_t __ICFEDIT_SWAP_end__;
 #define SWAP_END ((uint32_t)& __ICFEDIT_SWAP_end__)
-
-/* DualCore specificities */
-#if !defined(CORE_CM0PLUS)
-extern uint32_t __ICFEDIT_region_ROM_end__ ;
-#define C1_AREA_ADDR_END  ((uint32_t)& __ICFEDIT_region_ROM_end__)
-#define C2_BOOT_BASE_ADDR ((uint32_t)& __ICFEDIT_intvec_start__)
-#endif /* CORE_CM0PLUS */
-extern volatile uint32_t __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ ;
-#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__)
-
 #endif /* __ICCARM__ || __GNUC__ */
 
 #ifdef __cplusplus
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_fwimg.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_fwimg.icf
index 531339a3..3f9c5724 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_fwimg.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_fwimg.icf
@@ -1,26 +1,24 @@
-/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+/*###ICF### Set of symbols used in SE and BFU projects ****/
 
-/* Slots  must be aligned on 2048 bytes (0x800) */
+/* Slots must be aligned on sector size */
 
-/* swap (4 kbytes) */
-define exported symbol  __ICFEDIT_SWAP_start__  = 0x08002000;
-define exported symbol  __ICFEDIT_SWAP_end__    = 0x08002FFF;
+/* swap region (4 kbytes) */
+define exported symbol  __ICFEDIT_SWAP_start__  = 0x08015000;
+define exported symbol  __ICFEDIT_SWAP_end__    = 0x08015FFF;
 
-/* Active slot #1 (56 kbytes) */
-define exported symbol  __ICFEDIT_SLOT_Active_1_header__= 0x0803F800;
-define exported symbol  __ICFEDIT_SLOT_Active_1_start__ = 0x08022000;
-define exported symbol  __ICFEDIT_SLOT_Active_1_end__   = 0x0802FFFF;
+/* Active slot #1 (84 Kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_1_start__ = 0x0802B000;
+define exported symbol  __ICFEDIT_SLOT_Active_1_end__   = 0x0803FFFF;
+define exported symbol  __ICFEDIT_SLOT_Active_1_header__= __ICFEDIT_SLOT_Active_1_start__;
 
-/* Active slot #2 (60 kbytes) */
-define exported symbol  __ICFEDIT_SLOT_Active_2_header__= 0x0803F000;
-define exported symbol  __ICFEDIT_SLOT_Active_2_start__ = 0x08012000;
-define exported symbol  __ICFEDIT_SLOT_Active_2_end__   = 0x08020FFF;
-
-/* Dwl slot #1 (60 kbytes) */
-define exported symbol  __ICFEDIT_SLOT_Dwl_1_start__= 0x08003000;
-define exported symbol  __ICFEDIT_SLOT_Dwl_1_end__  = 0x08011FFF;
+/* Dwl slot #1 (84 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Dwl_1_start__    = 0x08016000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_1_end__      = 0x0802AFFF;
 
 /* Slots not configured */
+define exported symbol  __ICFEDIT_SLOT_Active_2_header__= 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_start__ = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_end__   = 0x00000000;
 define exported symbol  __ICFEDIT_SLOT_Active_3_header__= 0x00000000;
 define exported symbol  __ICFEDIT_SLOT_Active_3_start__ = 0x00000000;
 define exported symbol  __ICFEDIT_SLOT_Active_3_end__   = 0x00000000;
@@ -28,5 +26,3 @@ define exported symbol  __ICFEDIT_SLOT_Dwl_2_start__    = 0x00000000;
 define exported symbol  __ICFEDIT_SLOT_Dwl_2_end__      = 0x00000000;
 define exported symbol  __ICFEDIT_SLOT_Dwl_3_start__    = 0x00000000;
 define exported symbol  __ICFEDIT_SLOT_Dwl_3_end__      = 0x00000000;
-
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_sbsfu.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_sbsfu.icf
index 80f706bd..15a0e473 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_sbsfu.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/EWARM/mapping_sbsfu.icf
@@ -1,101 +1,68 @@
-/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+/*###ICF### Set of symbols used in SE and BFU projects ****/
 
 /******************************************************************************/
-/*                               M4 ROM section                               */
+/*                              ROM section                                   */
 /******************************************************************************/
 
-/* M4 SB Code region */
-define exported symbol __ICFEDIT_M4_SB_region_ROM_start__          = 0x08000000;
-define exported symbol __ICFEDIT_M4_SB_region_ROM_end__            = 0x08001FFF;
-
-/* ROM regions definition */
-define region M4_SB_ROM_region           = mem:[from __ICFEDIT_M4_SB_region_ROM_start__   to __ICFEDIT_M4_SB_region_ROM_end__];
-
-/******************************************************************************/
-/*                               M0+ ROM section                              */
-/******************************************************************************/
-
-/* KMS Data Storage (NVMS) region protected area */
-/* KMS Data Storage need for 2 images : 2 kbytes * 2 ==> 4 kbytes */
-define exported symbol __ICFEDIT_KMS_DataStorage_start__           = 0x08030000;
-define exported symbol __ICFEDIT_KMS_DataStorage_end__             = 0x08030FFF;
-
-/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation */
-define exported symbol __ICFEDIT_SE_IF_region_ROM_start__          = __ICFEDIT_KMS_DataStorage_end__ + 1;
-define exported symbol __ICFEDIT_SE_IF_region_ROM_end__            = __ICFEDIT_SE_IF_region_ROM_start__ + 0x12FF;
-
-/* SBSFU Code region */
-define exported symbol __ICFEDIT_SB_region_ROM_start__             = __ICFEDIT_SE_IF_region_ROM_end__ + 1;
-define exported symbol __ICFEDIT_SB_region_ROM_end__               = 0x08036FFF;
-
-/* M0 Vector table with alignment constraint on VECTOR_SIZE */
-define exported symbol __ICFEDIT_intvec_start__                    = __ICFEDIT_SB_region_ROM_end__ + 1;
+/* Vector table */
+define exported symbol __ICFEDIT_intvec_start__                    = 0x08000000;
 define exported symbol __ICFEDIT_Vector_size__                     = 0x200;
 
-/* SE Code region protected by MPU isolation */
-define exported symbol __ICFEDIT_SE_Code_region_ROM_start__        = __ICFEDIT_intvec_start__ + __ICFEDIT_Vector_size__;
-define exported symbol __ICFEDIT_SE_CallGate_region_ROM_start__    = __ICFEDIT_SE_Code_region_ROM_start__ + 4;
-define exported symbol __ICFEDIT_SE_CallGate_Region_ROM_End__      = __ICFEDIT_SE_Code_region_ROM_start__ + 0x1FF;
+/* SE Code region */
+define exported symbol __ICFEDIT_SE_Code_region_ROM_start__       = __ICFEDIT_intvec_start__ + __ICFEDIT_Vector_size__;
+define exported symbol __ICFEDIT_SE_CallGate_region_ROM_start__   = __ICFEDIT_SE_Code_region_ROM_start__+ 4;
+define exported symbol __ICFEDIT_SE_CallGate_Region_ROM_End__     = __ICFEDIT_SE_Code_region_ROM_start__ + 0x1FF;
+
+/* SE key region */
+define exported symbol __ICFEDIT_SE_Key_region_ROM_start__        = __ICFEDIT_SE_CallGate_Region_ROM_End__ + 1;
+define exported symbol __ICFEDIT_SE_Key_region_ROM_end__          = __ICFEDIT_SE_Key_region_ROM_start__ + 0x2FF;
 
 /* SE Startup */
-define exported symbol __ICFEDIT_SE_Startup_region_ROM_start__     = __ICFEDIT_SE_CallGate_Region_ROM_End__ + 1;
-define exported symbol __ICFEDIT_SE_Code_nokey_region_ROM_start__  = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x100;
+define exported symbol __ICFEDIT_SE_Startup_region_ROM_start__    = __ICFEDIT_SE_Key_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SE_Code_nokey_region_ROM_start__ = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x100;
+define exported symbol __ICFEDIT_SE_Code_region_ROM_end__         = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x80FF;
 
 /* User Embedded Keys */
-define exported symbol __ICFEDIT_User_Key_region_ROM_start__      = 0x0803E500;
-define exported symbol __ICFEDIT_User_Key_region_ROM_end__        = 0x0803E7FF;
+define exported symbol __ICFEDIT_User_Key_region_ROM_start__      = __ICFEDIT_SE_Code_region_ROM_end__ - 0x2FF;
+define exported symbol __ICFEDIT_User_Key_region_ROM_end__        = __ICFEDIT_SE_Code_region_ROM_end__;
 
-/* SE Embedded Keys */
-define exported symbol __ICFEDIT_SE_Key_region_ROM_start__         = 0x0803E800;
-define exported symbol __ICFEDIT_SE_Key_region_ROM_end__           = 0x0803EFFF;
-define exported symbol __ICFEDIT_SE_Code_region_ROM_end__          = __ICFEDIT_SE_Key_region_ROM_end__;
+/* SE IF ROM: used to locate Secure Engine interface code */
+define exported symbol __ICFEDIT_SE_IF_region_ROM_start__         = __ICFEDIT_SE_Code_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SE_IF_region_ROM_end__           = __ICFEDIT_SE_IF_region_ROM_start__ + 0x7FF;
 
-/* ROM regions definition */
-define region KMS_DataStorage            = mem:[from __ICFEDIT_KMS_DataStorage_start__ to __ICFEDIT_KMS_DataStorage_end__];
-define region SE_IF_ROM_region           = mem:[from __ICFEDIT_SE_IF_region_ROM_start__ to __ICFEDIT_SE_IF_region_ROM_end__];
-define region SB_ROM_region              = mem:[from __ICFEDIT_SB_region_ROM_start__ to __ICFEDIT_SB_region_ROM_end__];
-define region SE_CALLGATE_ROM_Region     = mem:[from __ICFEDIT_SE_CallGate_region_ROM_start__ to __ICFEDIT_SE_CallGate_Region_ROM_End__];
-define region SE_CODE_NOKEY_ROM_region   = mem:[from __ICFEDIT_SE_Code_nokey_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_start__ - 1];
-define region User_Key_ROM_region        = mem:[from __ICFEDIT_User_Key_region_ROM_start__ to __ICFEDIT_User_Key_region_ROM_end__];
+/* SBSFU Code region */
+define exported symbol __ICFEDIT_SB_region_ROM_start__            = __ICFEDIT_SE_IF_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_ROM_end__              = 0x08012FFF;
+
+/* KMS Data Storage (NVMS) region */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+define exported symbol __ICFEDIT_KMS_DataStorage_start__          = 0x08013000;
+define exported symbol __ICFEDIT_KMS_DataStorage_end__            = 0x08014FFF;
+
+/* ROM regions definition : ordered  */
+define region SE_CallGate_ROM_Region     = mem:[from __ICFEDIT_SE_CallGate_region_ROM_start__ to __ICFEDIT_SE_CallGate_Region_ROM_End__];
 define region SE_Key_ROM_region          = mem:[from __ICFEDIT_SE_Key_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_end__];
 define region SE_ROM_region              = mem:[from __ICFEDIT_SE_Code_region_ROM_start__ to __ICFEDIT_SE_Code_region_ROM_end__];
+define region SE_CODE_NOKEY_ROM_region   = mem:[from __ICFEDIT_SE_Code_nokey_region_ROM_start__ to __ICFEDIT_SE_Code_region_ROM_end__];
+define region User_Key_ROM_region        = mem:[from __ICFEDIT_User_Key_region_ROM_start__ to __ICFEDIT_User_Key_region_ROM_end__];
+define region SE_IF_ROM_region           = mem:[from __ICFEDIT_SE_IF_region_ROM_start__ to __ICFEDIT_SE_IF_region_ROM_end__];
+define region SB_ROM_region              = mem:[from __ICFEDIT_SB_region_ROM_start__ to __ICFEDIT_SB_region_ROM_end__];
+define region KMS_DataStorage            = mem:[from __ICFEDIT_KMS_DataStorage_start__ to __ICFEDIT_KMS_DataStorage_end__];
 
 /******************************************************************************/
 /*                              RAM section                                   */
 /*                                                                            */
 /******************************************************************************/
 
-/* M4 SB */
-define symbol __ICFEDIT_M4_SB_region_RAM_start__                   = 0x20000000;
-define symbol __ICFEDIT_M4_SB_region_RAM_end__                     = __ICFEDIT_M4_SB_region_RAM_start__ + 0xCDF;
-
-/* M0+/M4 Synchronization flag */
-define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ = __ICFEDIT_M4_SB_region_RAM_end__ + 1;
-define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__   = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ + 0x1F;
-
-/* M4 UserApp */
-define symbol __ICFEDIT_M4_APP_region_RAM_start__                  = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__ + 1;
-define symbol __ICFEDIT_M4_APP_region_RAM_end__                    = 0x20007FFF;
-
-/* M4 UserApp shared area */
-define exported symbol __ICFEDIT_M4_SHARED_region_SRAM_start__     = 0x20008000;
-define exported symbol __ICFEDIT_M4_SHARED_region_SRAM_end__       = 0x200083FF;
-
-/* M0PLUS UserApp shared area */
-define exported symbol __ICFEDIT_M0PLUS_SHARED_region_SRAM_start__ = 0x20008400;
-define exported symbol __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__   = 0x20008FFF;
+/* SE RAM region */
+define exported symbol __ICFEDIT_SE_region_RAM_start__     = 0x20000000;
+define exported symbol __ICFEDIT_SE_region_RAM_stack_top__ = 0x20000C00; /* Secure Engine's private stack */
+define exported symbol __ICFEDIT_SE_region_RAM_end__       = 0x200033FF;
 
 /* SBSFU RAM region */
-define exported symbol __ICFEDIT_SB_region_RAM_start__             = __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__ + 1;
-define exported symbol __ICFEDIT_SB_region_RAM_end__               = 0x2000D3FF;
-
-/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
-define exported symbol __ICFEDIT_SE_region_RAM_start__             = __ICFEDIT_SB_region_RAM_end__ + 1;
-define exported symbol __ICFEDIT_SE_region_RAM_stack_top__         = 0x2000DB00; /* Secure Engine's private stack */
-define exported symbol __ICFEDIT_SE_region_RAM_end__               = 0x2000FFFF;
+define exported symbol __ICFEDIT_SB_region_RAM_start__ = __ICFEDIT_SE_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_RAM_end__   = 0x20007FFF;
 
 /* RAM regions definition */
-define region M4_SB_RAM_region           = mem:[from __ICFEDIT_M4_SB_region_RAM_start__ to __ICFEDIT_M4_SB_region_RAM_end__];
-define region M4_APP_RAM_region          = mem:[from __ICFEDIT_M4_APP_region_RAM_start__ to __ICFEDIT_M4_APP_region_RAM_end__];
-define region SE_RAM_region              = mem:[from __ICFEDIT_SE_region_RAM_stack_top__ to __ICFEDIT_SE_region_RAM_end__];
-define region SB_RAM_region              = mem:[from __ICFEDIT_SB_region_RAM_start__ to __ICFEDIT_SB_region_RAM_end__];
+define region SE_RAM_region    = mem:[from __ICFEDIT_SE_region_RAM_stack_top__ to __ICFEDIT_SE_region_RAM_end__];
+define region SB_RAM_region    = mem:[from __ICFEDIT_SB_region_RAM_start__ to __ICFEDIT_SB_region_RAM_end__];
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/MDK-ARM/mapping_fwimg.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/MDK-ARM/mapping_fwimg.h
index 9f453825..71988d44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/MDK-ARM/mapping_fwimg.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/MDK-ARM/mapping_fwimg.h
@@ -24,24 +24,22 @@
 /* Slots  must be aligned on 2048 bytes (0x800) */
 
 /* swap  (4 kbytes) */
-#define SWAP_START                   0x08002000
-#define SWAP_END                     0x08002FFF
+#define SWAP_START                   0x08015000
+#define SWAP_END                     0x08015FFF
 
-/* Active slot #1  (56 kbytes) */
-#define SLOT_ACTIVE_1_HEADER         0x0803F800
-#define SLOT_ACTIVE_1_START          0x08022000
-#define SLOT_ACTIVE_1_END            0x0802FFFF
+/* Active slot #1  (84 kbytes) */
+#define SLOT_ACTIVE_1_START          0x0802B000
+#define SLOT_ACTIVE_1_END            0x0803FFFF
+#define SLOT_ACTIVE_1_HEADER         SLOT_ACTIVE_1_START
 
-/* Active slot #2  (60 kbytes) */
-#define SLOT_ACTIVE_2_HEADER         0x0803F000
-#define SLOT_ACTIVE_2_START          0x08012000
-#define SLOT_ACTIVE_2_END            0x08020FFF
-
-/* Dwl slot #1  (60 kbytes) */
-#define SLOT_DWL_1_START             0x08003000
-#define SLOT_DWL_1_END               0x08011FFF
+/* Dwl slot #1  (84 kbytes) */
+#define SLOT_DWL_1_START             0x08016000
+#define SLOT_DWL_1_END               0x0802AFFF
 
 /* Slots not configured */
+#define SLOT_ACTIVE_2_HEADER         0x00000000
+#define SLOT_ACTIVE_2_START          0x00000000
+#define SLOT_ACTIVE_2_END            0x00000000
 #define SLOT_ACTIVE_3_HEADER         0x00000000
 #define SLOT_ACTIVE_3_START          0x00000000
 #define SLOT_ACTIVE_3_END            0x00000000
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/MDK-ARM/mapping_sbsfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/MDK-ARM/mapping_sbsfu.h
index 2b86014b..6f7c8b47 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/MDK-ARM/mapping_sbsfu.h
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/MDK-ARM/mapping_sbsfu.h
@@ -21,107 +21,71 @@
 #ifndef MAPPING_SBSFU_H
 #define MAPPING_SBSFU_H
 
-/******************************************************************************/
-/*                               M4 ROM section                               */
-/******************************************************************************/
-
-/* M4 SB Code region */
-#define M4_SB_REGION_ROM_START          0x08000000
-#define M4_SB_REGION_ROM_END            0x08001FFF
-
-/* ROM regions definition */
-#define M4_SB_ROM_REGION_SIZE          (M4_SB_REGION_ROM_END - M4_SB_REGION_ROM_START + 0x1)
-
-/******************************************************************************/
-/*                               M0+ ROM section                              */
-/******************************************************************************/
-
-/* KMS Data Storage (NVMS) region protected area */
-/* KMS Data Storage need for 2 images : 2 kbytes * 2 ==> 4 kbytes */
-#define KMS_DATASTORAGE_START           0x08030000
-#define KMS_DATASTORAGE_END             0x08030FFF
+/*****************************************************************************/
+/*                                ROM section                                */
+/*****************************************************************************/
 
-/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation     */
-#define SE_IF_REGION_ROM_START          (KMS_DATASTORAGE_END + 0x1)
-#define SE_IF_REGION_ROM_END            (SE_IF_REGION_ROM_START + 0x15FF)
-
-/* SBSFU Code region */
-#define SB_REGION_ROM_START             (SE_IF_REGION_ROM_END + 1)
-#define SB_REGION_ROM_END               0x08036FFF
-
-/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+/* Vector table  */
 #define VECTOR_SIZE                     0x200
-#define INTVECT_START                   (SB_REGION_ROM_END + 0x1)
+#define INTVECT_START                   0x08000000
 
 /* SE Code region protected by MPU isolation */
 #define SE_CODE_REGION_ROM_START        (INTVECT_START + VECTOR_SIZE)
 #define SE_CALLGATE_REGION_ROM_START    (SE_CODE_REGION_ROM_START + 4)
-#define SE_CALLGATE_REGION_ROM_END      (SE_CODE_REGION_ROM_START + 0xFF)
+#define SE_CALLGATE_REGION_ROM_END      (SE_CODE_REGION_ROM_START + 0x1FF)
+
+/* SE Embedded Keys */
+#define SE_KEY_REGION_ROM_START         (SE_CALLGATE_REGION_ROM_END + 0x1)
+#define SE_KEY_REGION_ROM_END           (SE_KEY_REGION_ROM_START + 0x2FF)
 
 /* SE Startup                               */
-#define SE_STARTUP_REGION_ROM_START     (SE_CALLGATE_REGION_ROM_END + 1)
+#define SE_STARTUP_REGION_ROM_START     (SE_KEY_REGION_ROM_END + 1)
 #define SE_CODE_NOKEY_REGION_ROM_START  (SE_STARTUP_REGION_ROM_START + 0x100)
+#define SE_CODE_REGION_ROM_END          (SE_STARTUP_REGION_ROM_START + 0x7DFF)
 
 /* User Embedded Keys */
-#define USER_KEY_REGION_ROM_START       0x0803E500
-#define USER_KEY_REGION_ROM_END         0x0803E7FF
+#define USER_KEY_REGION_ROM_START       (SE_CODE_REGION_ROM_END + 1)
+#define USER_KEY_REGION_ROM_END         (USER_KEY_REGION_ROM_START + 0x2FF )
 
-/* SE Embedded Keys */
-#define SE_KEY_REGION_ROM_START         0x0803E800
-#define SE_KEY_REGION_ROM_END           0x0803EFFF
-#define SE_CODE_REGION_ROM_END          SE_KEY_REGION_ROM_END
+/* SE IF ROM: used to locate Secure Engine interface code */
+#define SE_IF_REGION_ROM_START          (USER_KEY_REGION_ROM_END + 0x1)
+#define SE_IF_REGION_ROM_END            (SE_IF_REGION_ROM_START + 0xAFF)
+
+/* SBSFU Code region */
+#define SB_REGION_ROM_START             (SE_IF_REGION_ROM_END + 1)
+#define SB_REGION_ROM_END               0x08012FFF
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+#define KMS_DATASTORAGE_START           0x08013000
+#define KMS_DATASTORAGE_END             0x08014FFF
 
 /* ROM regions size definition */
-#define KMS_DATASTORAGE_SIZE            (KMS_DATASTORAGE_END - KMS_DATASTORAGE_START + 0x1)
-#define SE_IF_ROM_REGION_SIZE           (SE_IF_REGION_ROM_END - SE_IF_REGION_ROM_START + 0x1)
-#define SB_ROM_REGION_SIZE              (SB_REGION_ROM_END - SB_REGION_ROM_START + 0x1)
 #define SE_CALLGATE_REGION_ROM_SIZE     (SE_CALLGATE_REGION_ROM_END - SE_CALLGATE_REGION_ROM_START + 0x1)
-#define SE_CODE_NOKEY_REGION_ROM_SIZE   (SE_KEY_REGION_ROM_START - SE_CODE_NOKEY_REGION_ROM_START)
-#define USER_KEY_REGION_ROM_SIZE        (USER_KEY_REGION_ROM_START - USER_KEY_REGION_ROM_END + 0x1)
 #define SE_KEY_REGION_ROM_SIZE          (SE_KEY_REGION_ROM_END - SE_KEY_REGION_ROM_START + 0x1)
-#define SE_ROM_REGION_SIZE              (SE_CODE_REGION_ROM_END - SE_CODE_REGION_ROM_START + 0x1)
+#define SE_ROM_REGION_SIZE              (SE_CODE_REGION_ROM_END - SE_CODE_NOKEY_REGION_ROM_START + 0x1)
+#define USER_KEY_REGION_ROM_SIZE        (USER_KEY_REGION_ROM_END - USER_KEY_REGION_ROM_START + 0x1)
+#define SE_IF_ROM_REGION_SIZE           (SE_IF_REGION_ROM_END - SE_IF_REGION_ROM_START + 0x1)
+#define SB_ROM_REGION_SIZE              (SB_REGION_ROM_END - SB_REGION_ROM_START + 0x1)
+#define KMS_DATASTORAGE_SIZE            (KMS_DATASTORAGE_END - KMS_DATASTORAGE_START + 0x1)
 
 /******************************************************************************/
 /*                              RAM section                                   */
 /*                                                                            */
 /******************************************************************************/
 
-/* M4 SB */
-#define M4_SB_REGION_RAM_START          0x20000000
-#define M4_SB_REGION_RAM_END            (M4_SB_REGION_RAM_START + 0xCDF)
-
-/* M0+/M4 Synchronization flag */
-#define M4_M0PLUS_FLAG_RAM_START        (M4_SB_REGION_RAM_END + 0x1)
-#define M4_M0PLUS_FLAG_RAM_END          (M4_M0PLUS_FLAG_RAM_START + 0x1F)
-
-/* M4 UserApp : allocation limited to half RAM size */
-#define M4_APP_REGION_RAM_START         (M4_M0PLUS_FLAG_RAM_END + 0x1)
-#define M4_APP_REGION_RAM_END           0x20007FFF
-
-/* M4 UserApp shared area */
-#define M4_SHARED_REGION_RAM_START      (M4_APP_REGION_RAM_END + 0x1)
-#define M4_SHARED_REGION_RAM_END        0x200083FF
-
-/* M0PLUS UserApp shared area */
-#define M0PLUS_SHARED_REGION_RAM_START  (M4_SHARED_REGION_RAM_END + 0x1)
-#define M0PLUS_SHARED_REGION_RAM_END    0x20008FFF
+/* SE RAM region */
+#define SE_REGION_RAM_START             0x20000000
+#define SE_REGION_RAM_STACK_TOP         0x20000C00                /* Secure Engine's private stack */
+#define SE_REGION_RAM_END               0x200033FF
 
 /* SBSFU RAM region */
-#define SB_REGION_RAM_START             (M0PLUS_SHARED_REGION_RAM_END + 0x1)
-#define SB_REGION_RAM_END               0x2000D3FF
-
-/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
-#define SE_REGION_RAM_START             (SB_REGION_RAM_END +0x1)
-#define SE_REGION_RAM_STACK_TOP         0x2000DB00                /* Secure Engine's private stack */
-#define SE_REGION_RAM_END               0x2000FFFF
+#define SB_REGION_RAM_START             (SE_REGION_RAM_END + 0x1)
+#define SB_REGION_RAM_END               0x20007FFF
 
 /* RAM regions definition */
-#define M4_SB_RAM_REGION_SIZE           (M4_SB_REGION_RAM_END - M4_SB_REGION_RAM_START + 0x1)
-#define M4_APP_RAM_REGION_SIZE          (M4_APP_REGION_RAM_END - M4_APP_REGION_RAM_START + 0x1)
-#define M4_SHARED_RAM_REGION_SIZE       (M4_SHARED_REGION_RAM_END - M4_SHARED_REGION_RAM_START + 0x1)
-#define M0PLUS_SHARED_RAM_REGION_SIZE   (M0PLUS_SHARED_REGION_RAM_END - M0PLUS_SHARED_REGION_RAM_START + 0x1)
-#define SB_RAM_REGION_SIZE              (SB_REGION_RAM_END - SB_REGION_RAM_START + 0x1)
 #define SE_RAM_REGION_SIZE              (SE_REGION_RAM_END - SE_REGION_RAM_STACK_TOP + 0x1)
+#define SB_RAM_REGION_SIZE              (SB_REGION_RAM_END - SB_REGION_RAM_START + 0x1)
 
 #endif
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_export.h
new file mode 100644
index 00000000..b7f862f6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_export.h
@@ -0,0 +1,110 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t INTVECT_start;
+#define INTVECT_START ((uint32_t)& INTVECT_start)
+extern uint32_t SE_Startup_region_ROM_start;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& SE_Startup_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_start;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& SE_Code_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_end;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& SE_Code_region_ROM_end)
+extern uint32_t SE_IF_region_ROM_start;
+#define SE_IF_REGION_ROM_START ((uint32_t)& SE_IF_region_ROM_start)
+extern uint32_t SE_IF_region_ROM_end;
+#define SE_IF_REGION_ROM_END ((uint32_t)& SE_IF_region_ROM_end)
+extern uint32_t SE_Key_region_ROM_start;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& SE_Key_region_ROM_start)
+extern uint32_t SE_Key_region_ROM_end;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& SE_Key_region_ROM_end)
+extern uint32_t SE_CallGate_region_ROM_start;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& SE_CallGate_region_ROM_start)
+extern uint32_t SB_region_ROM_start;
+#define SB_REGION_ROM_START ((uint32_t)& SB_region_ROM_start)
+extern uint32_t SB_region_ROM_end;
+#define SB_REGION_ROM_END ((uint32_t)& SB_region_ROM_end)
+extern uint32_t SE_region_RAM_start;
+#define SE_REGION_RAM_START ((uint32_t)& SE_region_RAM_start)
+extern uint32_t SE_region_RAM_end;
+#define SE_REGION_RAM_END ((uint32_t)& SE_region_RAM_end)
+extern uint32_t SB_region_RAM_start;
+#define SB_REGION_RAM_START ((uint32_t)& SB_region_RAM_start)
+extern uint32_t SB_region_RAM_end;
+#define SB_REGION_RAM_END ((uint32_t)& SB_region_RAM_end)
+extern uint32_t SE_region_RAM_stack_top;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& SE_region_RAM_stack_top)
+
+extern uint32_t KMS_DataStorage_start;
+#define KMS_DATASTORAGE_START ((uint32_t)& KMS_DataStorage_start)
+extern uint32_t KMS_DataStorage_end;
+#define KMS_DATASTORAGE_END ((uint32_t)& KMS_DataStorage_end)
+
+extern uint32_t SLOT_Active_1_header;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& SLOT_Active_1_header)
+extern uint32_t SLOT_Active_1_start;
+#define SLOT_ACTIVE_1_START ((uint32_t)& SLOT_Active_1_start)
+extern uint32_t SLOT_Active_1_end;
+#define SLOT_ACTIVE_1_END ((uint32_t)& SLOT_Active_1_end)
+extern uint32_t SLOT_Active_2_header;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& SLOT_Active_2_header)
+extern uint32_t SLOT_Active_2_start;
+#define SLOT_ACTIVE_2_START ((uint32_t)& SLOT_Active_2_start)
+extern uint32_t SLOT_Active_2_end;
+#define SLOT_ACTIVE_2_END ((uint32_t)& SLOT_Active_2_end)
+extern uint32_t SLOT_Active_3_header;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& SLOT_Active_3_header)
+extern uint32_t SLOT_Active_3_start;
+#define SLOT_ACTIVE_3_START ((uint32_t)& SLOT_Active_3_start)
+extern uint32_t SLOT_Active_3_end;
+#define SLOT_ACTIVE_3_END ((uint32_t)& SLOT_Active_3_end)
+extern uint32_t SLOT_Dwl_1_start;
+#define SLOT_DWL_1_START ((uint32_t)& SLOT_Dwl_1_start)
+extern uint32_t SLOT_Dwl_1_end;
+#define SLOT_DWL_1_END ((uint32_t)& SLOT_Dwl_1_end)
+extern uint32_t SLOT_Dwl_2_start;
+#define SLOT_DWL_2_START ((uint32_t)& SLOT_Dwl_2_start)
+extern uint32_t SLOT_Dwl_2_end;
+#define SLOT_DWL_2_END ((uint32_t)& SLOT_Dwl_2_end)
+extern uint32_t SLOT_Dwl_3_start;
+#define SLOT_DWL_3_START ((uint32_t)& SLOT_Dwl_3_start)
+extern uint32_t SLOT_Dwl_3_end;
+#define SLOT_DWL_3_END ((uint32_t)& SLOT_Dwl_3_end)
+extern uint32_t SWAP_start;
+#define SWAP_START ((uint32_t)& SWAP_start)
+extern uint32_t SWAP_end;
+#define SWAP_END ((uint32_t)& SWAP_end)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_fwimg.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
new file mode 100644
index 00000000..3c67bd5a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
@@ -0,0 +1,31 @@
+/*
+** LinkerScript
+*/
+
+/* Slots must be aligned on sector size */
+
+/* Swap sector : 4 kbytes */  
+SWAP_start           = 0x08015000;  
+SWAP_end             = 0x08015FFF;
+
+/* Active slot #1 (84 kbytes) */
+SLOT_Active_1_start  = 0x0802B000;  
+SLOT_Active_1_end    = 0x0803FFFF;
+SLOT_Active_1_header = SLOT_Active_1_start;
+
+/* Dwl slot #1 : (84 kbytes) */
+SLOT_Dwl_1_start     = 0x08016000;
+SLOT_Dwl_1_end       = 0x0802AFFF;
+
+/* Slots not configured */
+SLOT_Active_2_header = 0x00000000;
+SLOT_Active_2_start  = 0x00000000;  
+SLOT_Active_2_end    = 0x00000000;
+SLOT_Active_3_header = 0x00000000;
+SLOT_Active_3_start  = 0x00000000;
+SLOT_Active_3_end    = 0x00000000;
+SLOT_Dwl_2_start     = 0x00000000;
+SLOT_Dwl_2_end       = 0x00000000;
+SLOT_Dwl_3_start     = 0x00000000;
+SLOT_Dwl_3_end       = 0x00000000;
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
new file mode 100644
index 00000000..9b4c880e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
@@ -0,0 +1,92 @@
+/*
+** LinkerScript
+*/
+
+/******************************************************************************/
+/*                               ROM section                                  */
+/******************************************************************************/
+
+/* Vector table */
+INTVECT_start                  = 0x08000000;
+Vector_size                    = 0x200;
+
+/* SE Code region protected by MPU isolation */
+SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start; /* No need to do +4 as we have dummy bytes in SE_CoreBin .ld file */
+SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
+
+/* SE Embedded Keys */
+SE_Key_region_ROM_start        = SE_CallGate_region_ROM_end + 0x1;
+SE_Key_region_ROM_end          = SE_Key_region_ROM_start + 0x2FF;
+
+/* SE Startup */
+SE_Startup_region_ROM_start    = SE_Key_region_ROM_end + 0x1;
+SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
+SE_Code_region_ROM_end         = SE_Startup_region_ROM_start + 0x80FF;
+
+/* User Embedded Keys */
+User_Key_region_ROM_start      = SE_Code_region_ROM_end - 0x2FF; /* 0x08008400; */
+User_Key_region_ROM_end        = SE_Code_region_ROM_end;
+
+
+/* SE IF ROM */
+SE_IF_region_ROM_start         = SE_Code_region_ROM_end + 0x1; 
+SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0xEFF;
+
+/* SBSFU Code region */
+SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
+SB_region_ROM_end              = 0x08012FFF;
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+KMS_DataStorage_start          = 0x08013000;
+KMS_DataStorage_end            = 0x08014FFF;
+
+/* ROM regions size definition */
+SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
+SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
+SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
+SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
+SE_Code_NoKey_region_ROM_size  = SE_Code_region_ROM_end - SE_Code_NoKey_region_ROM_start + 0x1;
+User_Key_region_ROM_size       = User_Key_region_ROM_end - User_Key_region_ROM_start + 0x1;
+SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
+SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
+KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* SE RAM region */
+SE_region_RAM_start            = 0x20000000;
+SE_region_RAM_stack_top        = 0x20000C00;                /* Secure Engine's private stack */
+SE_region_RAM_end              = 0x200033FF;
+
+/* SBSFU RAM region */
+SB_region_RAM_start            = SE_region_RAM_end + 0x1;
+SB_region_RAM_end              = 0x20007FFF;
+
+/* RAM regions size definition */
+SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
+SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM/ROM regions                               */
+/*                                                                            */
+/******************************************************************************/
+
+MEMORY
+{
+ INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
+ SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
+ SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
+ SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
+ SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
+ SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
+ User_Key_region_ROM (rx)         : ORIGIN = User_Key_region_ROM_start, LENGTH = User_Key_region_ROM_size
+ SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
+ SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
+ SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
+ SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/adc.h
new file mode 100644
index 00000000..2e8c37f3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/adc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    adc.h
+  * @brief   This file contains all the function prototypes for
+  *          the adc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __ADC_H__
+#define __ADC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern ADC_HandleTypeDef hadc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_ADC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/adc_if.h
new file mode 100644
index 00000000..5c2a2568
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/adc_if.h
@@ -0,0 +1,104 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    adc_if.h
+  * @author  MCD Application Team
+  * @brief   Header for ADC interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __ADC_IF_H__
+#define __ADC_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Battery level in mV
+  */
+#define BAT_CR2032                  ((uint32_t) 3000)
+/**
+  * @brief Maximum battery level in mV
+  */
+#define VDD_BAT                     BAT_CR2032
+/**
+  * @brief Minimum battery level in mV
+  */
+#define VDD_MIN                     1800
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief  Initializes the ADC input
+  */
+void SYS_InitMeasurement(void);
+
+/**
+  * @brief DeInitializes the ADC
+  */
+void SYS_DeInitMeasurement(void);
+
+/**
+  * @brief  Get the current temperature
+  * @return value temperature in degree Celsius( q7.8 )
+  */
+int16_t SYS_GetTemperatureLevel(void);
+
+/**
+  * @brief Get the current battery level
+  * @return value battery level in linear scale
+  */
+uint16_t SYS_GetBatteryLevel(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/dma.h
new file mode 100644
index 00000000..59a26f2e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/dma.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    dma.h
+  * @brief   This file contains all the function prototypes for
+  *          the dma.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __DMA_H__
+#define __DMA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* DMA memory to memory transfer handles -------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_DMA_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DMA_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/flash_if.h
new file mode 100644
index 00000000..9cb596ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/flash_if.h
@@ -0,0 +1,123 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    flash_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __FLASH_IF_H__
+#define __FLASH_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash status enumeration
+  */
+enum
+{
+  FLASH_PARAM_ERROR = -5,
+  FLASH_LOCK_ERROR = -4,
+  FLASH_WRITE_ERROR = -3,
+  FLASH_ERASE_ERROR  = -2,
+  FLASH_ERROR  = -1,
+  FLASH_OK     = 0,
+  FLASH_BUSY   = 1
+};
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#define PAGE(__ADDRESS__) (uint32_t)((((__ADDRESS__) - FLASH_BASE) % FLASH_BANK_SIZE) / FLASH_PAGE_SIZE) /*!< Get page index from page address */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function writes a user flash area (read/modify/write)
+  * @param  address: ptr to user flash area
+  * @param  data: ptr to data to be written
+  * @param  size: number of 32b.
+  * @param  dataTempPage: ptr used to copy already written page in ram
+  * @return Flash status.
+  */
+int32_t FLASH_IF_Write(uint32_t  address, uint8_t *data, uint32_t size, uint8_t *dataTempPage);
+
+/**
+  * Writes a 64-bit word in flash at a specific address.
+  * @param address (in bytes) must be a multiple of 8.
+  * @param data data to write
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
+  */
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data);
+
+/**
+  * Erases 'n' flash pages from page number 'page' to page number
+  * 'page + n - 1'.
+  * - If 'interrupt' is set to 0, the erasing is performed in polling mode.
+  * - If 'interrupt' is set to 1, the erasing is performed under FLASH
+  *   interrupt: the function returns immediately and the user is informed of
+  *   the end of erasing procedure by a call to the following function that
+  *   must be implemented by the user: void HWCB_FLASH_EndOfCleanup( void );
+  *   this call-back function is called under FLASH IRQ handler.
+  * @param page memory start page number
+  * @param n number of page
+  * @param interrupt choice polling/interrupt
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
+  */
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt);
+
+/**
+  * Callback
+  */
+void HWCB_FLASH_EndOfCleanup(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __FLASH_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/kms_if.h
new file mode 100644
index 00000000..193e853a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/kms_if.h
@@ -0,0 +1,71 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    kms_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains kms interfaces with middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_IF_H
+#define KMS_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "kms.h"
+#include "tkms.h"
+#include "se_interface_kms.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/main.h
new file mode 100644
index 00000000..f171df25
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/main.h
@@ -0,0 +1,108 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.h
+  * @brief          : Header for main.c file.
+  *                   This file contains the common defines of the application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+#include "app_kms.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+#define RTC_N_PREDIV_S 10
+#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
+#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
+#define LED1_Pin GPIO_PIN_15
+#define LED1_GPIO_Port GPIOB
+#define LED2_Pin GPIO_PIN_9
+#define LED2_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define RF_CTRL3_Pin GPIO_PIN_3
+#define RF_CTRL3_GPIO_Port GPIOC
+#define BUT1_Pin GPIO_PIN_0
+#define BUT1_GPIO_Port GPIOA
+#define BUT1_EXTI_IRQn EXTI0_IRQn
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define RF_CTRL2_Pin GPIO_PIN_5
+#define RF_CTRL2_GPIO_Port GPIOC
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define RF_CTRL1_Pin GPIO_PIN_4
+#define RF_CTRL1_GPIO_Port GPIOC
+#define BUT3_Pin GPIO_PIN_6
+#define BUT3_GPIO_Port GPIOC
+#define BUT2_Pin GPIO_PIN_1
+#define BUT2_GPIO_Port GPIOA
+#define BUT2_EXTI_IRQn EXTI1_IRQn
+#define LED3_Pin GPIO_PIN_11
+#define LED3_GPIO_Port GPIOB
+#define USARTx_RX_Pin GPIO_PIN_3
+#define USARTx_RX_GPIO_Port GPIOA
+#define USARTx_TX_Pin GPIO_PIN_2
+#define USARTx_TX_GPIO_Port GPIOA
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/platform.h
new file mode 100644
index 00000000..2386cd7f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/platform.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    platform.h
+  * @author  MCD Application Team
+  * @brief   Header for General HW instances configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+
+#define USE_BSP_DRIVER
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdbool.h>
+#include "stm32wlxx.h"
+#include "main.h"
+#include "stm32wlxx_ll_gpio.h"
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP.  */
+/* In order to use BSP, users can add the BSP files in the IDE project space */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  */
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_nucleo_radio.h"
+#endif /* defined(USE_BSP_DRIVER) */
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PLATFORM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/rtc.h
new file mode 100644
index 00000000..6dd24df4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/rtc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    rtc.h
+  * @brief   This file contains all the function prototypes for
+  *          the rtc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RTC_H__
+#define __RTC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern RTC_HandleTypeDef hrtc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_RTC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RTC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32_lpm_if.h
new file mode 100644
index 00000000..cbe62fa1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32_lpm_if.h
@@ -0,0 +1,102 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Low Power Manager interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_LPM_IF_H__
+#define __STM32_LPM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_lpm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Enters Low Power Off Mode
+  */
+void PWR_EnterOffMode(void);
+
+/**
+  * @brief Exits Low Power Off Mode
+  */
+void PWR_ExitOffMode(void);
+
+/**
+  * @brief Enters Low Power Stop Mode
+  * @note ARM exists the function when waking up
+  */
+void PWR_EnterStopMode(void);
+
+/**
+  * @brief Exits Low Power Stop Mode
+  * @note Enable the pll at 32MHz
+  */
+void PWR_ExitStopMode(void);
+
+/**
+  * @brief Enters Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_EnterSleepMode(void);
+
+/**
+  * @brief Exits Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_ExitSleepMode(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_LPM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..f027e308
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,338 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+/*#define HAL_COMP_MODULE_ENABLED   */
+/*#define HAL_CRC_MODULE_ENABLED   */
+/*#define HAL_CRYP_MODULE_ENABLED   */
+/*#define HAL_DAC_MODULE_ENABLED   */
+/*#define HAL_GTZC_MODULE_ENABLED   */
+/*#define HAL_HSEM_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED   */
+/*#define HAL_I2S_MODULE_ENABLED   */
+/*#define HAL_IPCC_MODULE_ENABLED   */
+/*#define HAL_IRDA_MODULE_ENABLED   */
+/*#define HAL_IWDG_MODULE_ENABLED   */
+/*#define HAL_LPTIM_MODULE_ENABLED   */
+/*#define HAL_PKA_MODULE_ENABLED   */
+/*#define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+#define HAL_SUBGHZ_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..332f01b4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,76 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+ ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32WLxx_IT_H
+#define __STM32WLxx_IT_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler(void);
+void EXTI0_IRQHandler(void);
+void EXTI1_IRQHandler(void);
+void DMA1_Channel5_IRQHandler(void);
+void USART2_IRQHandler(void);
+void RTC_Alarm_IRQHandler(void);
+void SUBGHZ_Radio_IRQHandler(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..af8588aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/subghz.h
new file mode 100644
index 00000000..0926ffad
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/subghz.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    subghz.h
+  * @brief   This file contains all the function prototypes for
+  *          the subghz.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SUBGHZ_H__
+#define __SUBGHZ_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern SUBGHZ_HandleTypeDef hsubghz;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_SUBGHZ_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SUBGHZ_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_app.h
new file mode 100644
index 00000000..e5077a35
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_app.h
@@ -0,0 +1,116 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for sys_app.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_APP_H__
+#define __SYS_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "sys_conf.h"
+#include "stm32_adv_trace.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#define APP_PPRINTF(...)  do{ } while( UTIL_ADV_TRACE_OK \
+                              != UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__) ) /* Polling Mode */
+#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
+#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+
+#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
+#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
+#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
+#define APP_LOG(TS,VL,...)
+#else
+#error "APP_LOG_ENABLED not defined or out of range <0,1>"
+#endif /* APP_LOG_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
+  */
+void SystemApp_Init(void);
+
+/**
+  * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
+  * @retval battery level
+  */
+uint8_t GetBatteryLevel(void);
+
+/**
+  * @brief  callback to get the current temperature in the MCU
+  * @retval temperature level
+  */
+uint16_t GetTemperatureLevel(void);
+
+/**
+  * @brief  callback to get the board 64 bits unique ID
+  * @param  id unique ID
+  */
+void GetUniqueId(uint8_t *id);
+
+/**
+  * @brief  callback to get the board 32 bits unique ID (LSB)
+  * @retval devAddr Device Address
+  */
+uint32_t GetDevAddr(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_APP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_conf.h
new file mode 100644
index 00000000..cea8b074
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_conf.h
@@ -0,0 +1,99 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_conf.h
+  * @author  MCD Application Team
+  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_CONF_H__
+#define __SYS_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/**
+  * @brief Temperature and pressure values are retrieved from sensors shield
+  *        (instead of sending dummy values). It requires MEMS IKS shield
+  */
+#define SENSOR_ENABLED              0
+
+/**
+  * @brief  Verbose level for all trace logs
+  */
+#define VERBOSE_LEVEL               VLEVEL_M
+
+/**
+  * @brief Enable trace logs
+  */
+#define APP_LOG_ENABLED             1
+
+/**
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
+  */
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
+
+/**
+  * @brief Disable Low Power mode
+  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
+  */
+#define LOW_POWER_DISABLE           0
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_debug.h
new file mode 100644
index 00000000..710e8852
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_debug.h
@@ -0,0 +1,207 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.h
+  * @author  MCD Application Team
+  * @brief   Configuration of the debug.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_DEBUG_H__
+#define __SYS_DEBUG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sys_conf.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* Pin defines */
+
+/**  Definition for Probe Line 1   **/
+/**
+  * @brief Pin of Probe Line 1
+  */
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
+
+/**
+  * @brief Port of Probe Line 1
+  */
+#define PROBE_LINE1_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 2   **/
+/**
+  * @brief Pin of Probe Line 2
+  */
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
+
+/**
+  * @brief Port of Probe Line 2
+  */
+#define PROBE_LINE2_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 3   **/
+/**
+  * @brief Pin of Probe Line 3
+  */
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
+
+/**
+  * @brief Port of Probe Line 3
+  */
+#define PROBE_LINE3_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 4   **/
+/**
+  * @brief Pin of Probe Line 4
+  */
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
+
+/**
+  * @brief Port of Probe Line 4
+  */
+#define PROBE_LINE4_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
+
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+
+/**
+  * @brief Set pin to high level
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+
+/**
+  * @brief Set pin to low level
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )
+
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#else
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
+  */
+void DBG_ProbesInit(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_DEBUG_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_sensors.h
new file mode 100644
index 00000000..fc37f342
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/sys_sensors.h
@@ -0,0 +1,98 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_sensors.h
+  * @author  MCD Application Team
+  * @brief   Header for sensors application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SENSORS_H__
+#define __SENSORS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Sensor data parameters
+  */
+typedef struct
+{
+  float pressure;         /*!< in mbar */
+  float temperature;      /*!< in degC */
+  float humidity;         /*!< in % */
+  int32_t latitude;       /*!< latitude converted to binary */
+  int32_t longitude ;     /*!< longitude converted to binary */
+  int16_t altitudeGps;    /*!< in m */
+  int16_t altitudeBar ;   /*!< in m * 10 */
+  /**more may be added*/
+  /* USER CODE BEGIN sensor_t */
+
+  /* USER CODE END sensor_t */
+} sensor_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
+#define HTS221_0    0U
+#define LPS22HB_0   1U
+#endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  initialize the environmental sensor
+  */
+int32_t EnvSensors_Init(void);
+
+/**
+  * @brief  Environmental sensor  read.
+  * @param  sensor_data sensor data
+  */
+int32_t EnvSensors_Read(sensor_t *sensor_data);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SENSORS_H__ */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/timer_if.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/timer_if.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/usart.h
new file mode 100644
index 00000000..20bb5dfa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/usart.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    usart.h
+  * @brief   This file contains all the function prototypes for
+  *          the usart.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_H__
+#define __USART_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern UART_HandleTypeDef huart2;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_USART2_UART_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/usart_if.h
new file mode 100644
index 00000000..b1ed2355
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/usart_if.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.h
+  * @author  MCD Application Team
+  * @brief   Header for USART interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#include "stm32_adv_trace.h"
+#include "usart.h"
+#include "dma.h"
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_IF_H__
+#define __USART_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init the UART and associated DMA.
+  * @param  cb TxCpltCallback
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *));
+
+/**
+  * @brief  init receiver of vcom
+  * @param  RxCb callback when Rx char is received
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error));
+
+/**
+  * @brief  DeInit the UART and associated DMA.
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom in polling mode
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  */
+void vcom_Trace(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom using DMA
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  last byte has been sent on the uart line
+  */
+void vcom_IRQHandler(void);
+
+/**
+  * @brief  last byte has been sent from memory to uart data register
+  */
+void vcom_DMA_TX_IRQHandler(void);
+
+/**
+  * @brief  Resume the UART and associated DMA (used by LPM)
+  */
+void vcom_Resume(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/utilities_conf.h
new file mode 100644
index 00000000..3317d66e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/utilities_conf.h
@@ -0,0 +1,162 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for configuration file to utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_CONF_H__
+#define __UTILITIES_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "cmsis_compiler.h"
+
+/* definitions to be provided to "sequencer" utility */
+#include "stm32_mem.h"
+/* definition and callback for tiny_vsnprintf */
+#include "stm32_tiny_vsnprintf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
+#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
+                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
+#define VLEVEL_L 1       /*!< just essential traces */
+#define VLEVEL_M 2       /*!< functional traces */
+#define VLEVEL_H 3       /*!< all traces */
+
+#define TS_OFF 0         /*!< Log without TimeStamp */
+#define TS_ON 1          /*!< Log with TimeStamp */
+
+#define T_REG_OFF  0     /*!< Log without bitmask */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Memory placement macro
+  */
+#if defined(__CC_ARM)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
+#elif defined(__ICCARM__)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#else  /* __GNUC__ */
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+
+/**
+  * @brief Memory alignment macro
+  */
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* WIN32 */
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
+
+/**
+  * @brief Memset utilities interface to application
+  */
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTILS_ENTER_CRITICAL_SECTION() uint32_t primask_bit= __get_PRIMASK();\
+  __disable_irq()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTILS_EXIT_CRITICAL_SECTION()  __set_PRIMASK(primask_bit)
+
+/******************************************************************************
+  * trace\advanced
+  * the define option
+  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
+  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
+  *
+  ******************************************************************************/
+
+#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
+#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
+#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
+#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
+#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
+#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
+#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UTILITIES_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/utilities_def.h
new file mode 100644
index 00000000..cd95d70b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Inc/utilities_def.h
@@ -0,0 +1,116 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_def.h
+  * @author  MCD Application Team
+  * @brief   Definitions for modules requiring utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_DEF_H__
+#define __UTILITIES_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/******************************************************************************
+  * LOW POWER MANAGER
+  ******************************************************************************/
+/**
+  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+  * It lists a bit mapping of all user of the Low Power Manager
+  */
+typedef enum
+{
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
+  CFG_LPM_APPLI_Id,
+  CFG_LPM_UART_TX_Id,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/*---------------------------------------------------------------------------*/
+/*                             sequencer definitions                         */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * This is the list of priority required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Prio_0,
+  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
+
+  /* USER CODE END CFG_SEQ_Prio_Id_t */
+  CFG_SEQ_Prio_NBR,
+} CFG_SEQ_Prio_Id_t;
+
+/**
+  * This is the list of task id required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Task_LmHandlerProcess,
+  CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t */
+  CFG_SEQ_Task_NBR
+} CFG_SEQ_Task_Id_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UTILITIES_DEF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/adc.c
new file mode 100644
index 00000000..d6f3988c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/adc.c
@@ -0,0 +1,107 @@
+/**
+  ******************************************************************************
+  * @file    adc.c
+  * @brief   This file provides code for the configuration
+  *          of the ADC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+ADC_HandleTypeDef hadc;
+
+/* ADC init function */
+void MX_ADC_Init(void)
+{
+
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
+  /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
+  */
+  hadc.Instance = ADC;
+  hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
+  hadc.Init.Resolution = ADC_RESOLUTION_12B;
+  hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
+  hadc.Init.ScanConvMode = ADC_SCAN_DISABLE;
+  hadc.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
+  hadc.Init.LowPowerAutoWait = DISABLE;
+  hadc.Init.LowPowerAutoPowerOff = DISABLE;
+  hadc.Init.ContinuousConvMode = DISABLE;
+  hadc.Init.NbrOfConversion = 1;
+  hadc.Init.DiscontinuousConvMode = DISABLE;
+  hadc.Init.ExternalTrigConv = ADC_SOFTWARE_START;
+  hadc.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
+  hadc.Init.DMAContinuousRequests = DISABLE;
+  hadc.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
+  hadc.Init.SamplingTimeCommon1 = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.SamplingTimeCommon2 = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.OversamplingMode = DISABLE;
+  hadc.Init.TriggerFrequencyMode = ADC_TRIGGER_FREQ_HIGH;
+  if (HAL_ADC_Init(&hadc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
+
+}
+
+void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC)
+  {
+  /* USER CODE BEGIN ADC_MspInit 0 */
+
+  /* USER CODE END ADC_MspInit 0 */
+    /* ADC clock enable */
+    __HAL_RCC_ADC_CLK_ENABLE();
+  /* USER CODE BEGIN ADC_MspInit 1 */
+
+  /* USER CODE END ADC_MspInit 1 */
+  }
+}
+
+void HAL_ADC_MspDeInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC)
+  {
+  /* USER CODE BEGIN ADC_MspDeInit 0 */
+
+  /* USER CODE END ADC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_ADC_CLK_DISABLE();
+  /* USER CODE BEGIN ADC_MspDeInit 1 */
+
+  /* USER CODE END ADC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/adc_if.c
new file mode 100644
index 00000000..75af32ca
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/adc_if.c
@@ -0,0 +1,230 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    adc_if.c
+  * @author  MCD Application Team
+  * @brief   Read status related to the chip (battery level, VREF, chip temperature)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "adc_if.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief ADC handle
+  */
+extern ADC_HandleTypeDef hadc;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define TEMPSENSOR_TYP_CAL1_V          (( int32_t)  760)        /*!< Internal temperature sensor, parameter V30 (unit: mV). Refer to device datasheet for min/typ/max values. */
+#define TEMPSENSOR_TYP_AVGSLOPE        (( int32_t) 2500)        /*!< Internal temperature sensor, parameter Avg_Slope (unit: uV/DegCelsius). Refer to device datasheet for min/typ/max values. */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief This function reads the ADC channel
+  * @param channel channel number to read
+  * @return adc measured level value
+  */
+static uint32_t ADC_ReadChannels(uint32_t channel);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void SYS_InitMeasurement(void)
+{
+  /* USER CODE BEGIN SYS_InitMeasurement_1 */
+
+  /* USER CODE END SYS_InitMeasurement_1 */
+  hadc.Instance = ADC;
+  /* USER CODE BEGIN SYS_InitMeasurement_2 */
+
+  /* USER CODE END SYS_InitMeasurement_2 */
+}
+
+void SYS_DeInitMeasurement(void)
+{
+  /* USER CODE BEGIN SYS_DeInitMeasurement_1 */
+
+  /* USER CODE END SYS_DeInitMeasurement_1 */
+}
+
+int16_t SYS_GetTemperatureLevel(void)
+{
+  /* USER CODE BEGIN SYS_GetTemperatureLevel_1 */
+
+  /* USER CODE END SYS_GetTemperatureLevel_1 */
+  int16_t temperatureDegreeC = 0;
+  uint32_t measuredLevel = 0;
+  uint16_t batteryLevelmV = SYS_GetBatteryLevel();
+
+  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_TEMPSENSOR);
+
+  /* convert ADC level to temperature */
+  /* check whether device has temperature sensor calibrated in production */
+  if (((int32_t)*TEMPSENSOR_CAL2_ADDR - (int32_t)*TEMPSENSOR_CAL1_ADDR) != 0)
+  {
+    /* Device with temperature sensor calibrated in production:
+       use device optimized parameters */
+    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE(batteryLevelmV,
+                                                   measuredLevel,
+                                                   LL_ADC_RESOLUTION_12B);
+  }
+  else
+  {
+    /* Device with temperature sensor not calibrated in production:
+       use generic parameters */
+    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE_TYP_PARAMS(TEMPSENSOR_TYP_AVGSLOPE,
+                                                              TEMPSENSOR_TYP_CAL1_V,
+                                                              TEMPSENSOR_CAL1_TEMP,
+                                                              batteryLevelmV,
+                                                              measuredLevel,
+                                                              LL_ADC_RESOLUTION_12B);
+  }
+
+  APP_LOG(TS_ON, VLEVEL_L, "temp= %d\n\r", temperatureDegreeC);
+
+  /* from int16 to q8.7*/
+  temperatureDegreeC <<= 8;
+
+  return (int16_t) temperatureDegreeC;
+  /* USER CODE BEGIN SYS_GetTemperatureLevel_2 */
+
+  /* USER CODE END SYS_GetTemperatureLevel_2 */
+}
+
+uint16_t SYS_GetBatteryLevel(void)
+{
+  /* USER CODE BEGIN SYS_GetBatteryLevel_1 */
+
+  /* USER CODE END SYS_GetBatteryLevel_1 */
+  uint16_t batteryLevelmV = 0;
+  uint32_t measuredLevel = 0;
+
+  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_VREFINT);
+
+  if (measuredLevel == 0)
+  {
+    batteryLevelmV = 0;
+  }
+  else
+  {
+    if ((uint32_t)*VREFINT_CAL_ADDR != (uint32_t)0xFFFFU)
+    {
+      /* Device with Reference voltage calibrated in production:
+         use device optimized parameters */
+      batteryLevelmV = __LL_ADC_CALC_VREFANALOG_VOLTAGE(measuredLevel,
+                                                        ADC_RESOLUTION_12B);
+    }
+    else
+    {
+      /* Device with Reference voltage not calibrated in production:
+         use generic parameters */
+      batteryLevelmV = (VREFINT_CAL_VREF * 1510) / measuredLevel;
+    }
+  }
+
+  return batteryLevelmV;
+  /* USER CODE BEGIN SYS_GetBatteryLevel_2 */
+
+  /* USER CODE END SYS_GetBatteryLevel_2 */
+}
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+static uint32_t ADC_ReadChannels(uint32_t channel)
+{
+  /* USER CODE BEGIN ADC_ReadChannels_1 */
+
+  /* USER CODE END ADC_ReadChannels_1 */
+  uint32_t ADCxConvertedValues = 0;
+  ADC_ChannelConfTypeDef sConfig = {0};
+
+  MX_ADC_Init();
+
+  /* Start Calibration */
+  if (HAL_ADCEx_Calibration_Start(&hadc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* Configure Regular Channel */
+  sConfig.Channel = channel;
+  sConfig.Rank = ADC_REGULAR_RANK_1;
+  sConfig.SamplingTime = ADC_SAMPLINGTIME_COMMON_1;
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  if (HAL_ADC_Start(&hadc) != HAL_OK)
+  {
+    /* Start Error */
+    Error_Handler();
+  }
+  /** Wait for end of conversion */
+  HAL_ADC_PollForConversion(&hadc, HAL_MAX_DELAY);
+
+  /** Wait for end of conversion */
+  HAL_ADC_Stop(&hadc) ;   /* it calls also ADC_Disable() */
+
+  ADCxConvertedValues = HAL_ADC_GetValue(&hadc);
+
+  HAL_ADC_DeInit(&hadc);
+
+  return ADCxConvertedValues;
+  /* USER CODE BEGIN ADC_ReadChannels_2 */
+
+  /* USER CODE END ADC_ReadChannels_2 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/dma.c
new file mode 100644
index 00000000..b93bda5c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/dma.c
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    dma.c
+  * @brief   This file provides code for the configuration
+  *          of all the requested memory to memory DMA transfers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "dma.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/*----------------------------------------------------------------------------*/
+/* Configure DMA                                                              */
+/*----------------------------------------------------------------------------*/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/**
+  * Enable DMA controller clock
+  */
+void MX_DMA_Init(void)
+{
+
+  /* DMA controller clock enable */
+  __HAL_RCC_DMAMUX1_CLK_ENABLE();
+  __HAL_RCC_DMA1_CLK_ENABLE();
+
+  /* DMA interrupt init */
+  /* DMA1_Channel5_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+
+}
+
+/* USER CODE BEGIN 2 */
+
+/* USER CODE END 2 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/flash_if.c
new file mode 100644
index 00000000..a33a673d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/flash_if.c
@@ -0,0 +1,331 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    flash_if.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "flash_if.h"
+#include "stm32_mem.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Flash empty status enumeration
+  */
+enum
+{
+  FLASH_EMPTY      = 0,
+  FLASH_NOT_EMPTY  = 1
+};
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
+  * @retval HAL Status.
+  */
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength);
+
+/**
+  * @brief  This function checks if part of Flash is empty
+            It handles 32b unaligned address
+  * @param  addr: Start of user flash area
+  * @param  size: number of bytes.
+  * @retval FLASH_EMPTY or FLASH_NOT_EMPTY.
+  */
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t FLASH_IF_Write(uint32_t address, uint8_t *data, uint32_t size, uint8_t *dataTempPage)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_1 */
+
+  /* USER CODE END FLASH_IF_Write_1 */
+  int32_t status = FLASH_OK;
+  uint32_t page_start_index = PAGE(address);
+  uint32_t page_end_index = PAGE(address + size - 1);
+  uint32_t curr_size = size;
+  uint32_t curr_dest_addr = address;
+  uint32_t curr_src_addr = (uint32_t)data;
+
+  if ((data == NULL) || ((size % sizeof(uint64_t)) != 0) || ((address % sizeof(uint64_t)) != 0))
+  {
+    return FLASH_PARAM_ERROR;
+  }
+
+  if (READ_BIT(FLASH->CR, FLASH_CR_LOCK) != 0U)
+  {
+    return FLASH_LOCK_ERROR;
+  }
+
+  if (page_start_index != page_end_index)
+  {
+    curr_size = FLASH_PAGE_SIZE - (address % FLASH_PAGE_SIZE);
+  }
+
+  for (uint32_t idx = page_start_index; idx <= page_end_index; idx++)
+  {
+    if (FLASH_IF_IsEmpty((uint8_t *)curr_dest_addr, curr_size) != FLASH_EMPTY)
+    {
+      if (dataTempPage == NULL)
+      {
+        return FLASH_PARAM_ERROR;
+      }
+      /* backup initial Flash page data in RAM area */
+      UTIL_MEM_cpy_8(dataTempPage, (uint8_t *)(idx * FLASH_PAGE_SIZE + FLASH_BASE), FLASH_PAGE_SIZE);
+      /* copy fragment into RAM area */
+      UTIL_MEM_cpy_8(&dataTempPage[((uint32_t)curr_dest_addr) % FLASH_PAGE_SIZE], (uint8_t *)curr_src_addr, curr_size);
+
+      /*  erase the Flash sector, to avoid writing twice in RAM */
+      if (FLASH_IF_EraseByPages(idx, 1, 0) != FLASH_OK)
+      {
+        status = FLASH_ERASE_ERROR;
+        break; /* exit for loop */
+      }
+      else
+      {
+        /* copy the whole flash sector including fragment from RAM to Flash*/
+        if (FLASH_IF_Write_Buffer(idx * FLASH_PAGE_SIZE + FLASH_BASE, dataTempPage, FLASH_PAGE_SIZE) != FLASH_OK)
+        {
+          status = FLASH_WRITE_ERROR;
+          break; /* exit for loop */
+        }
+      }
+    }
+    else
+    {
+      if (FLASH_IF_Write_Buffer(curr_dest_addr, (uint8_t *)curr_src_addr, curr_size) != FLASH_OK)
+      {
+        status = FLASH_WRITE_ERROR;
+        break; /* exit for loop */
+      }
+    }
+
+    /* 2nd part of memory overlapped on 2nd flash sector */
+    curr_dest_addr += curr_size;
+    curr_src_addr += curr_size;
+    curr_size = size - curr_size;
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_2 */
+
+  /* USER CODE END FLASH_IF_Write_2 */
+}
+
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data)
+{
+  /* USER CODE BEGIN FLASH_IF_Write64_1 */
+
+  /* USER CODE END FLASH_IF_Write64_1 */
+  while (*(uint64_t *)address != data)
+  {
+    while (LL_FLASH_IsActiveFlag_OperationSuspended());
+    HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
+  }
+
+  return FLASH_OK;
+  /* USER CODE BEGIN HW_FLASH_Write_2 */
+
+  /* USER CODE END HW_FLASH_Write_2 */
+}
+
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt)
+{
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_1 */
+
+  /* USER CODE END FLASH_IF_EraseByPages_1 */
+  HAL_StatusTypeDef hal_status;
+  FLASH_EraseInitTypeDef erase_str;
+  uint32_t page_error;
+
+  erase_str.TypeErase = FLASH_TYPEERASE_PAGES;
+  erase_str.Page = page;
+  erase_str.NbPages = n;
+
+  /* Erase the Page */
+  if (interrupt)
+  {
+    hal_status = HAL_FLASHEx_Erase_IT(&erase_str);
+  }
+  else
+  {
+    hal_status = HAL_FLASHEx_Erase(&erase_str, &page_error);
+  }
+
+  return ((hal_status == HAL_OK) ? FLASH_OK : ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERASE_ERROR));
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_2 */
+
+  /* USER CODE END FLASH_IF_EraseByPages_2 */
+}
+
+void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_EndOfOperationCallback_1 */
+
+  /* USER CODE END HAL_FLASH_EndOfOperationCallback_1 */
+  /* Call CleanUp callback when all requested pages have been erased */
+  if (ReturnValue == 0xFFFFFFFFUL)
+  {
+    HWCB_FLASH_EndOfCleanup();
+  }
+  /* USER CODE BEGIN HAL_FLASH_EndOfOperationCallback_2 */
+
+  /* USER CODE END HAL_FLASH_EndOfOperationCallback_2 */
+}
+
+void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_OperationErrorCallback_1 */
+
+  /* USER CODE END HAL_FLASH_OperationErrorCallback_1 */
+}
+
+void HWCB_FLASH_EndOfCleanup(void)
+{
+  /* USER CODE BEGIN HWCB_FLASH_EndOfCleanup_1 */
+
+  /* USER CODE END HWCB_FLASH_EndOfCleanup_1 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_1 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_1 */
+  uint8_t *pSrc = pSource;
+  uint64_t src_value;
+  int32_t status = FLASH_OK;
+
+  for (uint32_t i = 0; i < (uLength / sizeof(uint64_t)); i++)
+  {
+    UTIL_MEM_cpy_8(&src_value, pSrc, sizeof(uint64_t));
+
+    /* Avoid writing 0xFFFFFFFFFFFFFFFFLL on erased Flash */
+    if (src_value != UINT64_MAX)
+    {
+      status = FLASH_IF_Write64(pDestination, src_value);
+    }
+
+    pDestination += sizeof(uint64_t);
+    pSrc += sizeof(uint64_t);
+
+    if (status != FLASH_OK)
+    {
+      /* exit the for loop*/
+      break;
+    }
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_2 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_2 */
+}
+
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size)
+{
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_1 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_1 */
+  uint64_t *addr64;
+  uint32_t i;
+
+  /* start memory NOT 64bits aligned */
+  while ((((uint32_t)addr) % sizeof(uint64_t)) != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+
+  /* addr64 is 64 bits aligned */
+  addr64 = (uint64_t *)addr;
+  for (i = 0; i < (size / sizeof(uint64_t)); i++)
+  {
+    if (*addr64++ != UINT64_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+  }
+  size -= sizeof(uint64_t) * i;
+
+  /* end memory NOT 64 bits aligned */
+  addr = (uint8_t *)addr64;
+  while (size != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+  return FLASH_EMPTY;
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_2 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/main.c
new file mode 100644
index 00000000..a8f921d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/main.c
@@ -0,0 +1,189 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "app_lorawan.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_KMS_Init();
+  MX_LoRaWAN_Init();
+  /* USER CODE BEGIN 2 */
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE END WHILE */
+    MX_LoRaWAN_Process();
+
+    /* USER CODE BEGIN 3 */
+  }
+  /* USER CODE END 3 */
+}
+
+/**
+  * @brief System Clock Configuration
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+
+  /** Configure LSE Drive Capability
+  */
+  HAL_PWR_EnableBkUpAccess();
+  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+  /** Configure the main internal regulator output voltage
+  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+  /** Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.MSIState = RCC_MSI_ON;
+  RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_11;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK3|RCC_CLOCKTYPE_HCLK
+                              |RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1
+                              |RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  while (1)
+  {
+  }
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/rtc.c
new file mode 100644
index 00000000..c616f129
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/rtc.c
@@ -0,0 +1,143 @@
+/**
+  ******************************************************************************
+  * @file    rtc.c
+  * @brief   This file provides code for the configuration
+  *          of the RTC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "rtc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+RTC_HandleTypeDef hrtc;
+
+/* RTC init function */
+void MX_RTC_Init(void)
+{
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
+  RTC_AlarmTypeDef sAlarm = {0};
+
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
+  /** Initialize RTC Only
+  */
+  hrtc.Instance = RTC;
+  hrtc.Init.AsynchPrediv = RTC_PREDIV_A;
+  hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
+  hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE;
+  hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
+  hrtc.Init.OutPutPullUp = RTC_OUTPUT_PULLUP_NONE;
+  hrtc.Init.BinMode = RTC_BINARY_ONLY;
+  if (HAL_RTC_Init(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN Check_RTC_BKUP */
+
+  /* USER CODE END Check_RTC_BKUP */
+
+  /** Initialize RTC and set the Time and Date
+  */
+  if (HAL_RTCEx_SetSSRU_IT(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Enable the Alarm A
+  */
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = 0x0;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
+
+}
+
+void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspInit 0 */
+
+  /* USER CODE END RTC_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+    PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* RTC clock enable */
+    __HAL_RCC_RTC_ENABLE();
+    __HAL_RCC_RTCAPB_CLK_ENABLE();
+
+    /* RTC interrupt Init */
+    HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_SSRU_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn);
+    HAL_NVIC_SetPriority(RTC_Alarm_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn);
+  /* USER CODE BEGIN RTC_MspInit 1 */
+
+  /* USER CODE END RTC_MspInit 1 */
+  }
+}
+
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspDeInit 0 */
+
+  /* USER CODE END RTC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_RTC_DISABLE();
+    __HAL_RCC_RTCAPB_CLK_DISABLE();
+
+    /* RTC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn);
+    HAL_NVIC_DisableIRQ(RTC_Alarm_IRQn);
+  /* USER CODE BEGIN RTC_MspDeInit 1 */
+
+  /* USER CODE END RTC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/stm32_lpm_if.c
new file mode 100644
index 00000000..99f840e9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/stm32_lpm_if.c
@@ -0,0 +1,168 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.c
+  * @author  MCD Application Team
+  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "stm32_lpm.h"
+#include "stm32_lpm_if.h"
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Power driver callbacks handler
+  */
+const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
+{
+  PWR_EnterSleepMode,
+  PWR_ExitSleepMode,
+
+  PWR_EnterStopMode,
+  PWR_ExitStopMode,
+
+  PWR_EnterOffMode,
+  PWR_ExitOffMode,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void PWR_EnterOffMode(void)
+{
+  /* USER CODE BEGIN EnterOffMode_1 */
+
+  /* USER CODE END EnterOffMode_1 */
+}
+
+void PWR_ExitOffMode(void)
+{
+  /* USER CODE BEGIN ExitOffMode_1 */
+
+  /* USER CODE END ExitOffMode_1 */
+}
+
+void PWR_EnterStopMode(void)
+{
+  /* USER CODE BEGIN EnterStopMode_1 */
+
+  /* USER CODE END EnterStopMode_1 */
+  HAL_SuspendTick();
+  /* Clear Status Flag before entering STOP/STANDBY Mode */
+  LL_PWR_ClearFlag_C1STOP_C1STB();
+
+  /* USER CODE BEGIN EnterStopMode_2 */
+
+  /* USER CODE END EnterStopMode_2 */
+  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
+  /* USER CODE BEGIN EnterStopMode_3 */
+
+  /* USER CODE END EnterStopMode_3 */
+}
+
+void PWR_ExitStopMode(void)
+{
+  /* USER CODE BEGIN ExitStopMode_1 */
+
+  /* USER CODE END ExitStopMode_1 */
+  /* Resume sysTick : work around for debugger problem in dual core */
+  HAL_ResumeTick();
+  /*Not retained periph:
+    ADC interface
+    DAC interface USARTx, TIMx, i2Cx, SPIx
+    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
+
+  /* Resume not retained USARTx and DMA */
+  vcom_Resume();
+  /* USER CODE BEGIN ExitStopMode_2 */
+
+  /* USER CODE END ExitStopMode_2 */
+}
+
+void PWR_EnterSleepMode(void)
+{
+  /* USER CODE BEGIN EnterSleepMode_1 */
+
+  /* USER CODE END EnterSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_SuspendTick();
+  /* USER CODE BEGIN EnterSleepMode_2 */
+
+  /* USER CODE END EnterSleepMode_2 */
+  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+  /* USER CODE BEGIN EnterSleepMode_3 */
+
+  /* USER CODE END EnterSleepMode_3 */
+}
+
+void PWR_ExitSleepMode(void)
+{
+  /* USER CODE BEGIN ExitSleepMode_1 */
+
+  /* USER CODE END ExitSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_ResumeTick();
+
+  /* USER CODE BEGIN ExitSleepMode_2 */
+
+  /* USER CODE END ExitSleepMode_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/stm32wlxx_hal_msp.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/stm32wlxx_hal_msp.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..f9f3f995
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,305 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+extern RTC_HandleTypeDef hrtc;
+extern SUBGHZ_HandleTypeDef hsubghz;
+extern DMA_HandleTypeDef hdma_usart2_tx;
+extern UART_HandleTypeDef huart2;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+  while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/**
+  * @brief This function handles RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts.
+  */
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler(void)
+{
+  /* USER CODE BEGIN TAMP_STAMP_LSECSS_SSRU_IRQn 0 */
+
+  /* USER CODE END TAMP_STAMP_LSECSS_SSRU_IRQn 0 */
+  HAL_RTCEx_SSRUIRQHandler(&hrtc);
+  /* USER CODE BEGIN TAMP_STAMP_LSECSS_SSRU_IRQn 1 */
+
+  /* USER CODE END TAMP_STAMP_LSECSS_SSRU_IRQn 1 */
+}
+
+/**
+  * @brief This function handles EXTI Line 0 Interrupt.
+  */
+void EXTI0_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI0_IRQn 0 */
+
+  /* USER CODE END EXTI0_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
+  /* USER CODE BEGIN EXTI0_IRQn 1 */
+
+  /* USER CODE END EXTI0_IRQn 1 */
+}
+
+/**
+  * @brief This function handles EXTI Line 1 Interrupt.
+  */
+void EXTI1_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI1_IRQn 0 */
+
+  /* USER CODE END EXTI1_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1);
+  /* USER CODE BEGIN EXTI1_IRQn 1 */
+
+  /* USER CODE END EXTI1_IRQn 1 */
+}
+
+/**
+  * @brief This function handles DMA1 Channel 5 Interrupt.
+  */
+void DMA1_Channel5_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart2_tx);
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 1 */
+}
+
+/**
+  * @brief This function handles USART2 Interrupt.
+  */
+void USART2_IRQHandler(void)
+{
+  /* USER CODE BEGIN USART2_IRQn 0 */
+
+  /* USER CODE END USART2_IRQn 0 */
+  HAL_UART_IRQHandler(&huart2);
+  /* USER CODE BEGIN USART2_IRQn 1 */
+
+  /* USER CODE END USART2_IRQn 1 */
+}
+
+/**
+  * @brief This function handles RTC Alarms (A and B) Interrupt.
+  */
+void RTC_Alarm_IRQHandler(void)
+{
+  /* USER CODE BEGIN RTC_Alarm_IRQn 0 */
+
+  /* USER CODE END RTC_Alarm_IRQn 0 */
+  HAL_RTC_AlarmIRQHandler(&hrtc);
+  /* USER CODE BEGIN RTC_Alarm_IRQn 1 */
+
+  /* USER CODE END RTC_Alarm_IRQn 1 */
+}
+
+/**
+  * @brief This function handles SUBGHZ Radio Interrupt.
+  */
+void SUBGHZ_Radio_IRQHandler(void)
+{
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 0 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 0 */
+  HAL_SUBGHZ_IRQHandler(&hsubghz);
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 1 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/subghz.c
new file mode 100644
index 00000000..7b7dba4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/subghz.c
@@ -0,0 +1,88 @@
+/**
+  ******************************************************************************
+  * @file    subghz.c
+  * @brief   This file provides code for the configuration
+  *          of the SUBGHZ instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "subghz.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+SUBGHZ_HandleTypeDef hsubghz;
+
+/* SUBGHZ init function */
+void MX_SUBGHZ_Init(void)
+{
+
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
+  hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
+  if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
+
+}
+
+void HAL_SUBGHZ_MspInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspInit 0 */
+
+  /* USER CODE END SUBGHZ_MspInit 0 */
+    /* SUBGHZ clock enable */
+    __HAL_RCC_SUBGHZSPI_CLK_ENABLE();
+
+    /* SUBGHZ interrupt Init */
+    HAL_NVIC_SetPriority(SUBGHZ_Radio_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspInit 1 */
+
+  /* USER CODE END SUBGHZ_MspInit 1 */
+}
+
+void HAL_SUBGHZ_MspDeInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 0 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_SUBGHZSPI_CLK_DISABLE();
+
+    /* SUBGHZ interrupt Deinit */
+    HAL_NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 1 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_app.c
new file mode 100644
index 00000000..b07330ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_app.c
@@ -0,0 +1,369 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.c
+  * @author  MCD Application Team
+  * @brief   Initializes HW and SW system entities (not related to the radio)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdio.h>
+#include "platform.h"
+#include "sys_app.h"
+#include "adc_if.h"
+#include "stm32_seq.h"
+#include "stm32_systime.h"
+#include "stm32_lpm.h"
+#include "timer_if.h"
+#include "utilities_def.h"
+#include "sys_debug.h"
+#include "sys_sensors.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MAX_TS_SIZE (int) 16
+
+/**
+  * Defines the maximum battery level
+  */
+#define LORAWAN_MAX_BAT   254
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
+static void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
+  */
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SystemApp_Init(void)
+{
+  /* USER CODE BEGIN SystemApp_Init_1 */
+
+  /* USER CODE END SystemApp_Init_1 */
+
+  /* Ensure that MSI is wake-up system clock */
+  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
+
+  /*Initialize timer and RTC*/
+  UTIL_TIMER_Init();
+
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
+
+  /*Initialize the terminal */
+  UTIL_ADV_TRACE_Init();
+  UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
+
+  /* #warning "should be removed when proper obl is done" */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /*Set verbose LEVEL*/
+  UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
+  /*Initialize the temperature and Battery measurement services */
+  SYS_InitMeasurement();
+
+  /*Initialize the Sensors */
+  EnvSensors_Init();
+
+  /*Init low power manager*/
+  UTIL_LPM_Init();
+  /* Disable Stand-by mode */
+  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+
+#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
+  /* Disable Stop Mode */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+#elif !defined (LOW_POWER_DISABLE)
+#error LOW_POWER_DISABLE not defined
+#endif /* LOW_POWER_DISABLE */
+
+  /* USER CODE BEGIN SystemApp_Init_2 */
+
+  /* USER CODE END SystemApp_Init_2 */
+}
+
+/**
+  * @brief redefines __weak function in stm32_seq.c such to enter low power
+  */
+void UTIL_SEQ_Idle(void)
+{
+  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
+
+  /* USER CODE END UTIL_SEQ_Idle_1 */
+  UTIL_LPM_EnterLowPower();
+  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
+
+  /* USER CODE END UTIL_SEQ_Idle_2 */
+}
+
+uint8_t GetBatteryLevel(void)
+{
+  uint8_t batteryLevel = 0;
+  uint16_t batteryLevelmV;
+
+  /* USER CODE BEGIN GetBatteryLevel_0 */
+
+  /* USER CODE END GetBatteryLevel_0 */
+
+  batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
+
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
+  if (batteryLevelmV > VDD_BAT)
+  {
+    batteryLevel = LORAWAN_MAX_BAT;
+  }
+  else if (batteryLevelmV < VDD_MIN)
+  {
+    batteryLevel = 0;
+  }
+  else
+  {
+    batteryLevel = (((uint32_t)(batteryLevelmV - VDD_MIN) * LORAWAN_MAX_BAT) / (VDD_BAT - VDD_MIN));
+  }
+
+  APP_LOG(TS_ON, VLEVEL_M, "VDDA= %d\r\n", batteryLevel);
+
+  /* USER CODE BEGIN GetBatteryLevel_2 */
+
+  /* USER CODE END GetBatteryLevel_2 */
+
+  return batteryLevel;  /* 1 (very low) to 254 (fully charged) */
+}
+
+uint16_t GetTemperatureLevel(void)
+{
+  uint16_t temperatureLevel = 0;
+
+  temperatureLevel = (uint16_t)(SYS_GetTemperatureLevel() / 256);
+  /* USER CODE BEGIN GetTemperatureLevel */
+
+  /* USER CODE END GetTemperatureLevel */
+  return temperatureLevel;
+}
+
+void GetUniqueId(uint8_t *id)
+{
+  /* USER CODE BEGIN GetUniqueId_1 */
+
+  /* USER CODE END GetUniqueId_1 */
+  uint32_t val = 0;
+  val = LL_FLASH_GetUDN();
+  if (val == 0xFFFFFFFF)  /* Normally this should not happen */
+  {
+    uint32_t ID_1_3_val = HAL_GetUIDw0() + HAL_GetUIDw2();
+    uint32_t ID_2_val = HAL_GetUIDw1();
+
+    id[7] = (ID_1_3_val) >> 24;
+    id[6] = (ID_1_3_val) >> 16;
+    id[5] = (ID_1_3_val) >> 8;
+    id[4] = (ID_1_3_val);
+    id[3] = (ID_2_val) >> 24;
+    id[2] = (ID_2_val) >> 16;
+    id[1] = (ID_2_val) >> 8;
+    id[0] = (ID_2_val);
+  }
+  else  /* Typical use case */
+  {
+    id[7] = val & 0xFF;
+    id[6] = (val >> 8) & 0xFF;
+    id[5] = (val >> 16) & 0xFF;
+    id[4] = (val >> 24) & 0xFF;
+    val = LL_FLASH_GetDeviceID();
+    id[3] = val & 0xFF;
+    val = LL_FLASH_GetSTCompanyID();
+    id[2] = val & 0xFF;
+    id[1] = (val >> 8) & 0xFF;
+    id[0] = (val >> 16) & 0xFF;
+  }
+
+  /* USER CODE BEGIN GetUniqueId_2 */
+
+  /* USER CODE END GetUniqueId_2 */
+}
+
+uint32_t GetDevAddr(void)
+{
+  uint32_t val = 0;
+  /* USER CODE BEGIN GetDevAddr_1 */
+
+  /* USER CODE END GetDevAddr_1 */
+
+  val = LL_FLASH_GetUDN();
+  if (val == 0xFFFFFFFF)
+  {
+    val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
+  }
+
+  /* USER CODE BEGIN GetDevAddr_2 */
+
+  /* USER CODE END GetDevAddr_2 */
+  return val;
+
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+
+static void TimestampNow(uint8_t *buff, uint16_t *size)
+{
+  /* USER CODE BEGIN TimestampNow_1 */
+
+  /* USER CODE END TimestampNow_1 */
+  SysTime_t curtime = SysTimeGet();
+  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
+  *size = strlen((char *)buff);
+  /* USER CODE BEGIN TimestampNow_2 */
+
+  /* USER CODE END TimestampNow_2 */
+}
+
+/* Disable StopMode when traces need to be printed */
+void UTIL_ADV_TRACE_PreSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
+}
+/* Re-enable StopMode when traces have been printed */
+void UTIL_ADV_TRACE_PostSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_2 */
+}
+
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
+{
+  /* USER CODE BEGIN tiny_snprintf_like_1 */
+
+  /* USER CODE END tiny_snprintf_like_1 */
+  va_list vaArgs;
+  va_start(vaArgs, strFormat);
+  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
+  va_end(vaArgs);
+  /* USER CODE BEGIN tiny_snprintf_like_2 */
+
+  /* USER CODE END tiny_snprintf_like_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/* HAL overload functions ---------------------------------------------------------*/
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
+{
+  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
+  /* USER CODE BEGIN HAL_InitTick_1 */
+
+  /* USER CODE END HAL_InitTick_1 */
+  return HAL_OK;
+  /* USER CODE BEGIN HAL_InitTick_2 */
+
+  /* USER CODE END HAL_InitTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+uint32_t HAL_GetTick(void)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_GetTick_1 */
+
+  /* USER CODE END HAL_GetTick_1 */
+  return TIMER_IF_GetTimerValue();
+  /* USER CODE BEGIN HAL_GetTick_2 */
+
+  /* USER CODE END HAL_GetTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+void HAL_Delay(__IO uint32_t Delay)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_Delay_1 */
+
+  /* USER CODE END HAL_Delay_1 */
+  TIMER_IF_DelayMs(Delay);
+  /* USER CODE BEGIN HAL_Delay_2 */
+
+  /* USER CODE END HAL_Delay_2 */
+}
+
+/* USER CODE BEGIN Overload_HAL_weaks */
+
+/* USER CODE END Overload_HAL_weaks */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_debug.c
new file mode 100644
index 00000000..f0395f5c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_debug.c
@@ -0,0 +1,234 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.c
+  * @author  MCD Application Team
+  * @brief   Enables 4 debug pins for internal signals RealTime debugging
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sys_debug.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
+{
+  /* USER CODE BEGIN DBG_Init_1 */
+
+  /* USER CODE END DBG_Init_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull   = GPIO_PULLUP;
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /*spi dbg*/
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_SUBGHZSPI;
+  __HAL_RCC_GPIOA_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* Busy */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_12);
+  GPIO_InitStruct.Alternate  = GPIO_AF6_RF_BUSY;
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
+
+  /* USER CODE END DBG_ProbesInit_3 */
+
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
+
+  /* USER CODE END DBG_ProbesInit_Last */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_sensors.c
new file mode 100644
index 00000000..3afffff8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/sys_sensors.c
@@ -0,0 +1,268 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_sensors.c
+  * @author  MCD Application Team
+  * @brief   Manages the sensors on the application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "sys_conf.h"
+#include "sys_sensors.h"
+
+/* USER CODE BEGIN Includes */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if defined (X_NUCLEO_IKS01A2)
+#warning "IKS drivers are today available for several families but not stm32WL"
+#warning "up to the user adapt IKS low layer to map it on WL board driver"
+#warning "this code would work only if user provide necessary IKS and BSP layers"
+#include "iks01a2_env_sensors.h"
+#elif defined (X_NUCLEO_IKS01A3)
+/*
+## How to add IKS01A3 to CubeWL
+
+ 1. Download STM32CubeExpansion_MEMS1_V8.0.0
+ 2. Copy Drivers From `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3` to CubeWL `Drivers\BSP\IKS01A3` and add to the IDE Project
+ 3. Copy `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3\iks01a3_conf_template.h` into `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target\iks01a3_conf.h`.
+ 4. Copy files nucleo_l476rg_bus.c/nucleo_l476rg_bus.h  from `STM32L476RG-Nucleo\Applications\IKS01A3\ActiveTime\Inc and \Src` to `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target` and rename to `nucleo_wl55jc_bus.c` and `nucleo_wl55jc_bus.h` respectively
+ 5. Update `nucleo_wl55jc_bus.c`  include files  to
+ ```bash
+#include "nucleo_wl55jc_bus.h"
+#include "stm32wlxx_nucleo_errno.h"
+#include "stm32wlxx_hal.h"
+```
+
+6. Update definitions in `nucleo_wl55jc_bus.h`(to be commented since already defined elsewhere)
+
+ ```bash
+//#define USE_HAL_SPI_REGISTER_CALLBACKS 0
+//#define USE_HAL_I2C_REGISTER_CALLBACKS 0
+```
+
+7. copy following components and add them (.c and .h) into IDE Project
+
+../../../../../../Drivers/BSP/Components/lsm6dso
+../../../../../../Drivers/BSP/Components/lis2dw12
+../../../../../../Drivers/BSP/Components/lis2mdl
+../../../../../../Drivers/BSP/Components/hts221
+../../../../../../Drivers/BSP/Components/lps22hh
+../../../../../../Drivers/BSP/Components/stts751
+../../../../../../Drivers/BSP/Components/Common
+
+8. Enable #define HAL_I2C_MODULE_ENABLED in stm32_hal_conf.h
+9. Add stm32wlxx_hal_i2c.c and stm32wlxx_hal_i2c_ex.c in the IDE Project
+10. Update hi2c->Instance in `nucleo_wl55jc_bus.c` to
+
+```bash
+  hi2c->Instance = I2C2;
+```
+
+11. Update msp function in `nucleo_wl55jc_bus.c`
+
+```bash
+static void I2C2_MspInit(I2C_HandleTypeDef *i2cHandle)
+{
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12;
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF4_I2C2;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  __HAL_RCC_I2C2_CLK_ENABLE();
+}
+
+static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
+{
+  __HAL_RCC_I2C2_CLK_DISABLE();
+
+  HAL_GPIO_DeInit(GPIOA, GPIO_PIN_11 | GPIO_PIN_12);
+
+}
+```
+12. Replace I2C1xx by MX_I2C2xx and i2c1 by i2c2 in `nucleo_wl55jc_bus.c`
+13. Replace I2C1xx by MX_I2C2xx in `nucleo_wl55jc_bus.h`
+*/
+#warning "IKS drivers are today available for several families but not stm32WL, follow steps defined in sys_sensors.c"
+#include "iks01a3_env_sensors.h"
+#else  /* not X_IKS01xx */
+#error "user to include its sensor drivers"
+#endif  /* X_NUCLEO_IKS01xx */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+#define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
+#define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
+#define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
+#define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
+#define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
+#define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if defined (X_NUCLEO_IKS01A2)
+#warning "IKS drivers are today available for several families but not stm32WL"
+#warning "up to the user adapt IKS low layer to map it on WL board driver"
+#warning "this code would work only if user provide necessary IKS and BSP layers"
+IKS01A2_ENV_SENSOR_Capabilities_t EnvCapabilities;
+#elif defined (X_NUCLEO_IKS01A3)
+IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
+#else  /* not X_IKS01Ax */
+#error "user to include its sensor drivers"
+#endif  /* X_NUCLEO_IKS01 */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
+{
+  /* USER CODE BEGIN EnvSensors_Read */
+  float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
+  float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
+  float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
+
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
+  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_PRESSURE, &PRESSURE_Value);
+  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_PRESSURE, &PRESSURE_Value);
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+
+  sensor_data->humidity    = HUMIDITY_Value;
+  sensor_data->temperature = TEMPERATURE_Value;
+  sensor_data->pressure    = PRESSURE_Value;
+
+  sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
+  sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
+
+  return 0;
+  /* USER CODE END EnvSensors_Read */
+}
+
+int32_t  EnvSensors_Init(void)
+{
+  /* USER CODE BEGIN EnvSensors_Init */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+  /* Init */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_Init(HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_Init(LPS22HB_0, ENV_TEMPERATURE | ENV_PRESSURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_Init(IKS01A3_HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_Init(IKS01A3_LPS22HH_0, ENV_TEMPERATURE | ENV_PRESSURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+  /* Enable */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_HUMIDITY);
+  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_PRESSURE);
+  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_HUMIDITY);
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_PRESSURE);
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+  /* Get capabilities */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_GetCapabilities(HTS221_0, &EnvCapabilities);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_GetCapabilities(LPS22HB_0, &EnvCapabilities);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_HTS221_0, &EnvCapabilities);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_LPS22HH_0, &EnvCapabilities);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif /* SENSOR_ENABLED  */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/system_stm32wlxx.c
new file mode 100644
index 00000000..0b613924
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/system_stm32wlxx.c
@@ -0,0 +1,387 @@
+/**
+  ******************************************************************************
+  * @file    system_stm32wlxx.c
+  * @author  MCD Application Team
+  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
+  *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  *   This file provides two functions and one global variable to be called from
+  *   user application:
+  *      - SystemInit(): This function is called at startup just after reset and
+  *                      before branch to main program. This call is made inside
+  *                      the "startup_stm32wlxx.s" file.
+  *
+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
+  *                                  by the user application to setup the SysTick
+  *                                  timer or configure other parameters.
+  *
+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
+  *                                 be called whenever the core clock is changed
+  *                                 during program execution.
+  *
+  *   After each device reset the MSI (4 MHz) is used as system clock source.
+  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
+  *   configure the system clock before to branch to main program.
+  *
+  *   This file configures the system clock as follows:
+  *=============================================================================
+  *-----------------------------------------------------------------------------
+  *        System Clock source                    | MSI
+  *-----------------------------------------------------------------------------
+  *        SYSCLK(Hz)                             | 4000000
+  *-----------------------------------------------------------------------------
+  *        HCLK(Hz)                               | 4000000
+  *-----------------------------------------------------------------------------
+  *        AHB Prescaler                          | 1
+  *-----------------------------------------------------------------------------
+  *        APB1 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        APB2 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_M                                  | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_N                                  | 8
+  *-----------------------------------------------------------------------------
+  *        PLL_P                                  | 7
+  *-----------------------------------------------------------------------------
+  *        PLL_Q                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLL_R                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_P                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_Q                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_R                              | NA
+  *-----------------------------------------------------------------------------
+  *        Require 48MHz for USB OTG FS,          | Disabled
+  *        SDIO and RNG clock                     |
+  *-----------------------------------------------------------------------------
+  *=============================================================================
+  */
+
+/** @addtogroup CMSIS
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_system
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_System_Private_Includes
+  * @{
+  */
+
+#include "stm32wlxx.h"
+
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (MSI_VALUE)
+   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
+#endif /* LSI_VALUE */
+
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Defines
+  * @{
+  */
+
+/* Note: Following vector table addresses must be defined in line with linker
+         configuration. */
+/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
+     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
+     at address 0x00 which correspond to automatic remap of boot address selected */
+/* #define USER_VECT_TAB_ADDRESS */
+#if defined(USER_VECT_TAB_ADDRESS)
+#ifdef CORE_CM0PLUS
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
+#else /* CORE_CM4 */
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+#endif
+#endif
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Variables
+  * @{
+  */
+  /* The SystemCoreClock variable is updated in three ways:
+      1) from within HAL_Init()
+      2) by calling CMSIS function SystemCoreClockUpdate()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
+  */
+  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
+
+  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
+
+  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
+
+  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
+    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Functions
+  * @{
+  */
+#if defined(__ARMCC_VERSION)
+extern void * __Vectors;
+#define INTVECT_START ((uint32_t) & __Vectors)
+#elif defined(__ICCARM__)
+extern uint32_t __vector_table;
+#define INTVECT_START ((uint32_t)& __vector_table)
+#elif defined(__GNUC__)
+extern void * g_pfnVectors;
+#define INTVECT_START ((uint32_t)& g_pfnVectors)
+#endif
+
+/**
+  * @brief  Setup the microcontroller system.
+  * @param  None
+  * @retval None
+  */
+void SystemInit(void)
+{
+  /* Configure the Vector Table location  ------------------*/
+  SCB->VTOR = INTVECT_START;
+
+  /* FPU settings ------------------------------------------------------------*/
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
+#endif
+
+  /* Reset the RCC clock configuration to the default reset state ------------*/
+  /* Set MSION bit */
+  RCC->CR |= RCC_CR_MSION;
+
+  /* Reset CFGR register */
+  RCC->CFGR = 0x00070000U;
+
+  /* Reset HSEON, CSSON , HSION, and PLLON bits */
+  /* RCC->CR &= 0xEAF6FFFFU; */
+  RCC->CR &= 0x2321EFF;
+
+  /* Reset PLLCFGR register */
+  RCC->PLLCFGR = 0x22040100;
+
+  /* Reset HSEBYP bit */
+  RCC->CR &= 0xFFDFFFFFFU;
+
+  /* Disable all interrupts */
+  RCC->CIER = 0x00000000U;
+}
+
+/**
+  * @brief  Update SystemCoreClock variable according to Clock Register Values.
+  *         The SystemCoreClock variable contains the core clock (HCLK), it can
+  *         be used by the user application to setup the SysTick timer or configure
+  *         other parameters.
+  *
+  * @note   Each time the core clock (HCLK) changes, this function must be called
+  *         to update SystemCoreClock variable value. Otherwise, any configuration
+  *         based on this variable will be incorrect.
+  *
+  * @note   - The system frequency computed by this function is not the real
+  *           frequency in the chip. It is calculated based on the predefined
+  *           constant and the selected clock source:
+  *
+  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
+  *
+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
+  *
+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
+  *
+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
+  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
+  *
+  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
+  *             4 MHz) but the real value may vary depending on the variations
+  *             in voltage and temperature.
+  *
+  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              16 MHz) but the real value may vary depending on the variations
+  *              in voltage and temperature.
+  *
+  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
+  *              frequency of the crystal used. Otherwise, this function may
+  *              have wrong result.
+  *
+  *         - The result of this function could be not correct when using fractional
+  *           value for HSE crystal.
+  *
+  * @param  None
+  * @retval None
+  */
+void SystemCoreClockUpdate(void)
+{
+  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
+
+ /* Get MSI Range frequency--------------------------------------------------*/
+
+   /* Get MSI Range frequency--------------------------------------------------*/
+   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
+   { /* MSISRANGE from RCC_CSR applies */
+     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
+   }
+   else
+   { /* MSIRANGE from RCC_CR applies */
+     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
+   }
+   /*MSI frequency range in HZ*/
+   msirange = MSIRangeTable[msirange];
+
+
+  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
+  /* Get SYSCLK source -------------------------------------------------------*/
+  switch (RCC->CFGR & RCC_CFGR_SWS)
+  {
+    case 0x00:   /* MSI used as system clock source */
+      SystemCoreClock = msirange;
+      break;
+
+    case 0x04:  /* HSI used as system clock source */
+      /* HSI used as system clock source */
+        SystemCoreClock = HSI_VALUE;
+      break;
+
+    case 0x08:  /* HSE used as system clock source */
+      SystemCoreClock = HSE_VALUE;
+      break;
+
+    case 0x0C: /* PLL used as system clock  source */
+      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
+         SYSCLK = PLL_VCO / PLLR
+         */
+      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
+      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
+
+      switch (pllsource)
+      {
+        case 0x02:  /* HSI used as PLL clock source */
+          pllvco = (HSI_VALUE / pllm);
+          break;
+
+        case 0x03:  /* HSE used as PLL clock source */
+          pllvco = (HSE_VALUE / pllm);
+          break;
+
+        default:    /* MSI used as PLL clock source */
+          pllvco = (msirange / pllm);
+          break;
+      }
+
+      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
+      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
+
+      SystemCoreClock = pllvco/pllr;
+      break;
+
+    default:
+      SystemCoreClock = msirange;
+      break;
+  }
+
+  /* Compute HCLK clock frequency --------------------------------------------*/
+#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
+  /* Get HCLK2 prescaler */
+  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
+#else
+  /* Get HCLK1 prescaler */
+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
+#endif
+
+  /* Core clock frequency */
+  SystemCoreClock = SystemCoreClock / tmp;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/timer_if.c
new file mode 100644
index 00000000..66e51602
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/timer_if.c
@@ -0,0 +1,519 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.c
+  * @author  MCD Application Team
+  * @brief   Configure RTC Alarm, Tick and Calendar manager
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
+#include "stm32_lpm.h"
+#include "utilities_def.h"
+#include "stm32wlxx_ll_rtc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief RTC handle
+  */
+extern RTC_HandleTypeDef hrtc;
+
+/**
+  * @brief Timer driver callbacks handler
+  */
+const UTIL_TIMER_Driver_s UTIL_TimerDriver =
+{
+  TIMER_IF_Init,
+  NULL,
+
+  TIMER_IF_StartTimer,
+  TIMER_IF_StopTimer,
+
+  TIMER_IF_SetTimerContext,
+  TIMER_IF_GetTimerContext,
+
+  TIMER_IF_GetTimerElapsedTime,
+  TIMER_IF_GetTimerValue,
+  TIMER_IF_GetMinimumTimeout,
+
+  TIMER_IF_Convert_ms2Tick,
+  TIMER_IF_Convert_Tick2ms,
+};
+
+/**
+  * @brief SysTime driver callbacks handler
+  */
+const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
+{
+  TIMER_IF_BkUp_Write_Seconds,
+  TIMER_IF_BkUp_Read_Seconds,
+  TIMER_IF_BkUp_Write_SubSeconds,
+  TIMER_IF_BkUp_Read_SubSeconds,
+  TIMER_IF_GetTime,
+};
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Minimum timeout delay of Alarm in ticks
+  */
+#define MIN_ALARM_DELAY    3
+
+/**
+  * @brief Backup seconds register
+  */
+#define RTC_BKP_SECONDS    RTC_BKP_DR0
+
+/**
+  * @brief Backup subseconds register
+  */
+#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
+
+/**
+  * @brief Backup msbticks register
+  */
+#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
+
+/* #define RTIF_DEBUG */
+
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifdef RTIF_DEBUG
+#include "sys_app.h" /*for app_log*/
+/**
+  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
+  */
+#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+#else
+/**
+  * @brief not used
+  */
+#define TIMER_IF_DBG_PRINTF(...)
+#endif /* RTIF_DEBUG */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Indicates if the RTC is already Initialized or not
+  */
+static bool RTC_Initialized = false;
+
+/**
+  * @brief RtcTimerContext
+  */
+static uint32_t RtcTimerContext = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Get rtc timer Value in rtc tick
+  * @return val the rtc timer value (upcounting)
+  */
+static inline uint32_t GetTimerTicks(void);
+
+/**
+  * @brief Writes MSBticks to backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @param[in] MSBticks
+  */
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
+
+/**
+  * @brief Reads MSBticks from backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @retval MSBticks
+  */
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+UTIL_TIMER_Status_t TIMER_IF_Init(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_Init */
+
+  /* USER CODE END TIMER_IF_Init */
+  if (RTC_Initialized == false)
+  {
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+    /*Init RTC*/
+    MX_RTC_Init();
+    /*Stop Timer */
+    TIMER_IF_StopTimer();
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
+    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+    /*overload RTC feature enable*/
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+
+    /*Enable Direct Read of the calendar registers (not through Shadow) */
+    HAL_RTCEx_EnableBypassShadow(&hrtc);
+    /*Initialize MSB ticks*/
+    TIMER_IF_BkUp_Write_MSBticks(0);
+
+    TIMER_IF_SetTimerContext();
+
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
+    RTC_Initialized = true;
+  }
+
+  /* USER CODE BEGIN TIMER_IF_Init_Last */
+
+  /* USER CODE END TIMER_IF_Init_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StartTimer */
+
+  /* USER CODE END TIMER_IF_StartTimer */
+  RTC_AlarmTypeDef sAlarm = {0};
+  /*Stop timer if one is already started*/
+  TIMER_IF_StopTimer();
+  timeout += RtcTimerContext;
+
+  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
+  /* starts timer*/
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
+
+  /* USER CODE END TIMER_IF_StartTimer_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StopTimer */
+
+  /* USER CODE END TIMER_IF_StopTimer */
+  /* Clear RTC Alarm Flag */
+  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRAF);
+  /* Disable the Alarm A interrupt */
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+  /*overload RTC feature enable*/
+  hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
+
+  /* USER CODE END TIMER_IF_StopTimer_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_SetTimerContext(void)
+{
+  /*store time context*/
+  RtcTimerContext = GetTimerTicks();
+
+  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
+
+  /* USER CODE END TIMER_IF_SetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerContext(void)
+{
+  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
+
+  /* USER CODE END TIMER_IF_GetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerElapsedTime(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetTimerValue(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
+
+  /* USER CODE END TIMER_IF_GetTimerValue */
+  if (RTC_Initialized == true)
+  {
+    ret = GetTimerTicks();
+  }
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetMinimumTimeout(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick */
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
+}
+
+void TIMER_IF_DelayMs(uint32_t delay)
+{
+  /* USER CODE BEGIN TIMER_IF_DelayMs */
+
+  /* USER CODE END TIMER_IF_DelayMs */
+  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
+  uint32_t timeout = GetTimerTicks();
+
+  /* Wait delay ms */
+  while (((GetTimerTicks() - timeout)) < delayTicks)
+  {
+    __NOP();
+  }
+  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
+
+  /* USER CODE END TIMER_IF_DelayMs_Last */
+}
+
+void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback */
+  UTIL_TIMER_IRQ_MAP_PROCESS();
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
+}
+
+void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback */
+  /*called every 48 days with 1024 ticks per seconds*/
+  TIMER_IF_DBG_PRINTF(">>Handler SSRUnderflow at %d\n\r", GetTimerTicks());
+  /*Increment MSBticks*/
+  uint32_t MSB_ticks = TIMER_IF_BkUp_Read_MSBticks();
+  TIMER_IF_BkUp_Write_MSBticks(MSB_ticks + 1);
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback_Last */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback_Last */
+}
+
+uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
+{
+  uint32_t seconds = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTime */
+
+  /* USER CODE END TIMER_IF_GetTime */
+  uint64_t ticks;
+  uint32_t timerValueLsb = GetTimerTicks();
+  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
+
+  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
+
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+
+  ticks = (uint32_t) ticks & RTC_PREDIV_S;
+
+  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
+
+  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
+}
+
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
+}
+
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
+}
+
+uint32_t TIMER_IF_BkUp_Read_Seconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_MSBTICKS, MSBticks);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks_Last */
+}
+
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
+  uint32_t MSBticks;
+  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
+  return MSBticks;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
+}
+
+static inline uint32_t GetTimerTicks(void)
+{
+  /* USER CODE BEGIN GetTimerTicks */
+
+  /* USER CODE END GetTimerTicks */
+  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
+  /* USER CODE BEGIN GetTimerTicks_Last */
+
+  /* USER CODE END GetTimerTicks_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/usart.c
new file mode 100644
index 00000000..be36fe23
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/usart.c
@@ -0,0 +1,173 @@
+/**
+  ******************************************************************************
+  * @file    usart.c
+  * @brief   This file provides code for the configuration
+  *          of the USART instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+UART_HandleTypeDef huart2;
+DMA_HandleTypeDef hdma_usart2_tx;
+
+/* USART2 init function */
+
+void MX_USART2_UART_Init(void)
+{
+
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
+  huart2.Instance = USART2;
+  huart2.Init.BaudRate = 115200;
+  huart2.Init.WordLength = UART_WORDLENGTH_8B;
+  huart2.Init.StopBits = UART_STOPBITS_1;
+  huart2.Init.Parity = UART_PARITY_NONE;
+  huart2.Init.Mode = UART_MODE_TX_RX;
+  huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  huart2.Init.OverSampling = UART_OVERSAMPLING_16;
+  huart2.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
+  huart2.Init.ClockPrescaler = UART_PRESCALER_DIV1;
+  huart2.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetTxFifoThreshold(&huart2, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetRxFifoThreshold(&huart2, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_EnableFifoMode(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
+
+}
+
+void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(uartHandle->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspInit 0 */
+
+  /* USER CODE END USART2_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART2;
+    PeriphClkInitStruct.Usart2ClockSelection = RCC_USART2CLKSOURCE_SYSCLK;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* USART2 clock enable */
+    __HAL_RCC_USART2_CLK_ENABLE();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**USART2 GPIO Configuration
+    PA3     ------> USART2_RX
+    PA2     ------> USART2_TX
+    */
+    GPIO_InitStruct.Pin = USARTx_RX_Pin|USARTx_TX_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF7_USART2;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    /* USART2 DMA Init */
+    /* USART2_TX Init */
+    hdma_usart2_tx.Instance = DMA1_Channel5;
+    hdma_usart2_tx.Init.Request = DMA_REQUEST_USART2_TX;
+    hdma_usart2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_usart2_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart2_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart2_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.Mode = DMA_NORMAL;
+    hdma_usart2_tx.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    if (HAL_DMA_ConfigChannelAttributes(&hdma_usart2_tx, DMA_CHANNEL_NPRIV) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
+
+    /* USART2 interrupt Init */
+    HAL_NVIC_SetPriority(USART2_IRQn, 2, 0);
+    HAL_NVIC_EnableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspInit 1 */
+
+  /* USER CODE END USART2_MspInit 1 */
+  }
+}
+
+void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
+{
+
+  if(uartHandle->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspDeInit 0 */
+
+  /* USER CODE END USART2_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_USART2_CLK_DISABLE();
+
+    /**USART2 GPIO Configuration
+    PA3     ------> USART2_RX
+    PA2     ------> USART2_TX
+    */
+    HAL_GPIO_DeInit(GPIOA, USARTx_RX_Pin|USARTx_TX_Pin);
+
+    /* USART2 DMA DeInit */
+    HAL_DMA_DeInit(uartHandle->hdmatx);
+
+    /* USART2 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspDeInit 1 */
+
+  /* USER CODE END USART2_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/usart_if.c
new file mode 100644
index 00000000..182f1990
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/Core/Src/usart_if.c
@@ -0,0 +1,257 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.c
+  * @author  MCD Application Team
+  * @brief   Configuration of UART driver interface for hyperterminal communication
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief DMA handle
+  */
+extern DMA_HandleTypeDef hdma_usart2_tx;
+
+/**
+  * @brief UART handle
+  */
+extern UART_HandleTypeDef huart2;
+
+/**
+  * @brief buffer to receive 1 character
+  */
+uint8_t charRx;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Trace driver callbacks handler
+  */
+const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
+{
+  vcom_Init,
+  vcom_DeInit,
+  vcom_ReceiveInit,
+  vcom_Trace_DMA,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief  TX complete callback
+  * @return none
+  */
+static void (*TxCpltCallback)(void *);
+/**
+  * @brief  RX complete callback
+  * @param  rxChar ptr of chars buffer sent by user
+  * @param  size buffer size
+  * @param  error errorcode
+  * @return none
+  */
+static void (*RxCpltCallback)(uint8_t *rxChar, uint16_t size, uint8_t error);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *))
+{
+  /* USER CODE BEGIN vcom_Init_1 */
+
+  /* USER CODE END vcom_Init_1 */
+  TxCpltCallback = cb;
+  MX_DMA_Init();
+  MX_USART2_UART_Init();
+  LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_27);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Init_2 */
+
+  /* USER CODE END vcom_Init_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
+{
+  /* USER CODE BEGIN vcom_DeInit_1 */
+
+  /* USER CODE END vcom_DeInit_1 */
+  /* ##-1- Reset peripherals ################################################## */
+  __HAL_RCC_USART2_FORCE_RESET();
+  __HAL_RCC_USART2_RELEASE_RESET();
+
+  /* ##-2- MspDeInit ################################################## */
+  HAL_UART_MspDeInit(&huart2);
+
+  /* ##-3- Disable the NVIC for DMA ########################################### */
+  /* USER CODE BEGIN 1 */
+  HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE END 1 */
+  /* USER CODE BEGIN vcom_DeInit_2 */
+
+  /* USER CODE END vcom_DeInit_2 */
+}
+
+void vcom_Trace(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_1 */
+
+  /* USER CODE END vcom_Trace_1 */
+  HAL_UART_Transmit(&huart2, p_data, size, 1000);
+  /* USER CODE BEGIN vcom_Trace_2 */
+
+  /* USER CODE END vcom_Trace_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_DMA_1 */
+
+  /* USER CODE END vcom_Trace_DMA_1 */
+  HAL_UART_Transmit_DMA(&huart2, p_data, size);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Trace_DMA_2 */
+
+  /* USER CODE END vcom_Trace_DMA_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error))
+{
+  /* USER CODE BEGIN vcom_ReceiveInit_1 */
+
+  /* USER CODE END vcom_ReceiveInit_1 */
+  UART_WakeUpTypeDef WakeUpSelection;
+
+  /*record call back*/
+  RxCpltCallback = RxCb;
+
+  /*Set wakeUp event on start bit*/
+  WakeUpSelection.WakeUpEvent = UART_WAKEUP_ON_STARTBIT;
+
+  HAL_UARTEx_StopModeWakeUpSourceConfig(&huart2, WakeUpSelection);
+
+  /* Make sure that no UART transfer is on-going */
+  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_BUSY) == SET);
+
+  /* Make sure that UART is ready to receive)   */
+  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_REACK) == RESET);
+
+  /* Enable USART interrupt */
+  __HAL_UART_ENABLE_IT(&huart2, UART_IT_WUF);
+
+  /*Enable wakeup from stop mode*/
+  HAL_UARTEx_EnableStopMode(&huart2);
+
+  /*Start LPUART receive on IT*/
+  HAL_UART_Receive_IT(&huart2, &charRx, 1);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_ReceiveInit_2 */
+
+  /* USER CODE END vcom_ReceiveInit_2 */
+}
+
+void vcom_Resume(void)
+{
+  /* USER CODE BEGIN vcom_Resume_1 */
+
+  /* USER CODE END vcom_Resume_1 */
+  /*to re-enable lost UART settings*/
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /*to re-enable lost DMA settings*/
+  if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN vcom_Resume_2 */
+
+  /* USER CODE END vcom_Resume_2 */
+}
+
+void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart2)
+{
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_1 */
+  /* buffer transmission complete*/
+  TxCpltCallback(NULL);
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_2 */
+}
+
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart2)
+{
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_1 */
+  if ((NULL != RxCpltCallback) && (HAL_UART_ERROR_NONE == huart2->ErrorCode))
+  {
+    RxCpltCallback(&charRx, 1, 0);
+  }
+  HAL_UART_Receive_IT(huart2, &charRx, 1);
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewd
new file mode 100644
index 00000000..5b211ffa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewp
new file mode 100644
index 00000000..657d2726
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/LoRaWAN_End_Node.ewp
@@ -0,0 +1,1412 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>LoRaWAN_End_Node/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>LoRaWAN_End_Node/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>LoRaWAN_End_Node/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>KMS_ENABLED</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Core/Inc</state>
+                    <state>$PROJ_DIR$/../LoRaWAN/App</state>
+                    <state>$PROJ_DIR$/../LoRaWAN/Target</state>
+                    <state>$PROJ_DIR$/../KMS/App</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+                    <state>$PROJ_DIR$/../../1_Image_SECoreBin/Inc</state>
+                    <state>$PROJ_DIR$/../../1_Image_BFU/BFU/App</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>..\..\LoRaWAN_End_Node.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\1_Image_SECoreBin\EWARM\PostBuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\LoRaWAN_End_Node.bin" 1 1"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>LoRaWAN_End_Node.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>LoRaWAN_End_Node_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <group>
+                <name>Core</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\flash_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_sensors.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
+                </file>
+            </group>
+            <group>
+                <name>KMS</name>
+                <group>
+                    <name>App</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\KMS\App\app_kms.c</name>
+                    </file>
+                </group>
+            </group>
+            <group>
+                <name>LoRaWAN</name>
+                <group>
+                    <name>App</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\app_lorawan.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\CayenneLpp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\fw_update_agent.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\lora_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\App\lora_info.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Target</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\Target\frag_decoder_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\LoRaWAN\Target\radio_board_if.c</name>
+                    </file>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Core\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Middlewares</name>
+        <group>
+            <name>LoRaWAN</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpPackagesRegistration.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\1_Image_BFU\EWARM\se_interface_appli.o</name>
+            </file>
+        </group>
+        <group>
+            <name>SubGHz_Phy</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Utilities</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
+        </file>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/Project.eww
new file mode 100644
index 00000000..aaef23f6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\LoRaWAN_End_Node.ewp</path>
+  </project>
+  <batchBuild />
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..b2c75fd5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,52 @@
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+
+/*-Memory Regions-*/
+/***** FLASH *****/
+define symbol __ICFEDIT_region_ROM_start__    = __ICFEDIT_SLOT_Active_1_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__      = __ICFEDIT_SLOT_Active_1_end__;
+/***** Non-backup SRAM1 *****/
+define symbol __ICFEDIT_region_RAM_start__    = __ICFEDIT_SB_region_RAM_start__;
+define symbol __ICFEDIT_region_RAM_end__      = __ICFEDIT_SB_region_RAM_end__;
+/***** Backup SRAM2 *****/
+define symbol __ICFEDIT_region_RAM2_start__   = 0x20008000;
+define symbol __ICFEDIT_region_RAM2_end__     = 0x2000FFFF;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+/**** End of ICF editor section. ###ICF###*/
+
+
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];
+define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__   to __ICFEDIT_region_RAM_end__];
+define region RAM2_region     = mem:[from __ICFEDIT_region_RAM2_start__  to __ICFEDIT_region_RAM2_end__];
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly, last section aes_block_padding  };
+place in RAM_region   { readwrite,
+                        block CSTACK, block HEAP };
+place in RAM2_region  { };
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/KMS/App/app_kms.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/KMS/App/app_kms.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/KMS/App/app_kms.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/KMS/App/app_kms.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/CayenneLpp.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/CayenneLpp.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/CayenneLpp.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/CayenneLpp.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/Commissioning.h
new file mode 100644
index 00000000..f827d8ed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/Commissioning.h
@@ -0,0 +1,82 @@
+/*!
+ * \file      Commissioning.h
+ *
+ * \brief     End-device commissioning parameters
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2020 Semtech
+ *
+ * \endcode
+ */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    Commissioning.h
+  * @author  MCD Application Team
+  * @brief   End-device commissioning parameters
+  ******************************************************************************
+ */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __COMMISSIONING_H__
+#define __COMMISSIONING_H__
+
+/*!
+ ******************************************************************************
+ ********************************** WARNING ***********************************
+ ******************************************************************************
+
+ The LoRaWAN AES128 keys are stored and provisioned on secure-elements.
+
+ This project provides a software emulated secure-element.
+ The LoRaWAN AES128 keys SHALL be updated under
+ src/peripherals/<secure-element name>-se\se-identity.h file.
+
+ ******************************************************************************
+ ******************************************************************************
+ ******************************************************************************
+ */
+#include "se-identity.h"
+
+/* USER CODE BEGIN EC1 */
+
+/* USER CODE END EC1 */
+
+/*!
+ * When using ABP activation the MAC layer must know in advance to which server
+ * version it will be connected.
+ */
+#define ABP_ACTIVATION_LRWAN_VERSION_V10x                  0x01000300 /* 1.0.3.0 */
+
+#define ABP_ACTIVATION_LRWAN_VERSION                       ABP_ACTIVATION_LRWAN_VERSION_V10x
+
+/*!
+ * Indicates if the end-device support the operation with repeaters
+ */
+#define LORAWAN_REPEATER_SUPPORT                           false
+
+/*!
+ * Indicates if the end-device is to be connected to a private or public network
+ */
+#define LORAWAN_PUBLIC_NETWORK                             true
+
+/*!
+ * Current network ID
+ */
+#define LORAWAN_NETWORK_ID                                 ( uint32_t )0
+
+/* USER CODE BEGIN EC2 */
+
+/* USER CODE END EC2 */
+
+#endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c
new file mode 100644
index 00000000..f7038db8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c
@@ -0,0 +1,100 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_lorawan.h"
+#include "lora_app.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void MX_LoRaWAN_Init(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Init_1 */
+
+  /* USER CODE END MX_LoRaWAN_Init_1 */
+  SystemApp_Init();
+  /* USER CODE BEGIN MX_LoRaWAN_Init_2 */
+
+  /* USER CODE END MX_LoRaWAN_Init_2 */
+  LoRaWAN_Init();
+  /* USER CODE BEGIN MX_LoRaWAN_Init_3 */
+
+  /* USER CODE END MX_LoRaWAN_Init_3 */
+}
+
+void MX_LoRaWAN_Process(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Process_1 */
+
+  /* USER CODE END MX_LoRaWAN_Process_1 */
+  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
+  /* USER CODE BEGIN MX_LoRaWAN_Process_2 */
+
+  /* USER CODE END MX_LoRaWAN_Process_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.h
new file mode 100644
index 00000000..fbe16b6d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.h
@@ -0,0 +1,76 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_LORAWAN_H__
+#define __APP_LORAWAN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported Functions Prototypes------------------------------------------------------- */
+/**
+  * @brief  Init Lora Application
+  */
+void MX_LoRaWAN_Init(void);
+
+/**
+  * @brief  Entry Lora Process or scheduling
+  */
+void MX_LoRaWAN_Process(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_LORAWAN_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/fw_update_agent.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/fw_update_agent.c
new file mode 100644
index 00000000..7cc3b146
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/fw_update_agent.c
@@ -0,0 +1,140 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    fw_update_agent.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage Firmware Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#define SFU_FWIMG_COMMON_C
+#include "sfu_fwimg_regions.h"
+
+#include "fw_update_agent.h"
+#include "sys_app.h"
+#include "utilities.h"
+
+#include "flash_if.h"
+#include "se_def_metadata.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * Structure containing values related to the management of multi-images in Flash
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+} FwImageFlashTypeDef;
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * Size of header to write in Swap sector to trigger installation
+  */
+#define INSTALLED_LENGTH                            ((uint32_t)512U)
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+#if (INTEROP_TEST_MODE == 0)
+void FwUpdateAgent_Run(void)
+{
+  /* USER CODE BEGIN FwUpdateAgent_Run_1 */
+
+  /* USER CODE END FwUpdateAgent_Run_1 */
+  int32_t status = FLASH_OK;
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+  uint32_t first_page = PAGE(FRAG_DECODER_SWAP_REGION_START);
+  uint32_t nb_pages = PAGE(FRAG_DECODER_SWAP_REGION_START + SFU_IMG_IMAGE_OFFSET - 1) - first_page + 1U;
+
+  /* Read header in slot 1 */
+  UTIL_MEM_cpy_8(fw_header_dwl_slot, (void *)FRAG_DECODER_DWL_REGION_START, SE_FW_HEADER_TOT_LEN);
+
+  /* Ask for installation at next reset */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    status = FLASH_IF_EraseByPages(first_page, nb_pages, 0U);
+
+    if (status == FLASH_OK)
+    {
+      status = FLASH_IF_Write(FRAG_DECODER_SWAP_REGION_START, fw_header_dwl_slot, SE_FW_HEADER_TOT_LEN, NULL);
+    }
+    HAL_FLASH_Lock();
+  }
+  else
+  {
+    status = FLASH_LOCK_ERROR;
+  }
+
+  if (status == FLASH_OK)
+  {
+    /* System Reboot*/
+    NVIC_SystemReset();
+  }
+  else
+  {
+    APP_LOG(TS_OFF, VLEVEL_M, "FW Update Agent Run Failed\r\n");
+  }
+  /* USER CODE BEGIN FwUpdateAgent_Run_2 */
+
+  /* USER CODE END FwUpdateAgent_Run_2 */
+}
+#endif /* INTEROP_TEST_MODE */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/fw_update_agent.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/fw_update_agent.h
new file mode 100644
index 00000000..88062f78
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/fw_update_agent.h
@@ -0,0 +1,74 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    fw_update_agent.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage Firmware Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __FW_UPDATE_AGENT_H__
+#define __FW_UPDATE_AGENT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "frag_decoder_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+#if (INTEROP_TEST_MODE == 0)
+/**
+  * @brief  Run FW Update process.
+  * @param  None
+  * @retval None
+  */
+void FwUpdateAgent_Run(void);
+#endif /* INTEROP_TEST_MODE == 0 */
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__FW_UPDATE_AGENT_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app.c
new file mode 100644
index 00000000..04e5d1f4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app.c
@@ -0,0 +1,611 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "Region.h" /* Needed for LORAWAN_DEFAULT_DATA_RATE */
+#include "sys_app.h"
+#include "lora_app.h"
+#include "stm32_seq.h"
+#include "stm32_timer.h"
+#include "utilities_def.h"
+#include "lora_app_version.h"
+#include "lorawan_version.h"
+#include "subghz_phy_version.h"
+#include "lora_info.h"
+#include "LmHandler.h"
+#include "stm32_lpm.h"
+#include "adc_if.h"
+#include "sys_conf.h"
+#include "CayenneLpp.h"
+#include "sys_sensors.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief LoRa State Machine states
+  */
+typedef enum TxEventType_e
+{
+  /**
+    * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
+    */
+  TX_ON_TIMER,
+  /**
+    * @brief Appdata Transmission external event plugged on OnSendEvent( )
+    */
+  TX_ON_EVENT
+  /* USER CODE BEGIN TxEventType_t */
+
+  /* USER CODE END TxEventType_t */
+} TxEventType_t;
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  LoRa End Node send request
+  */
+static void SendTxData(void);
+
+/**
+  * @brief  TX timer callback function
+  * @param  context ptr of timer context
+  */
+static void OnTxTimerEvent(void *context);
+
+/**
+  * @brief  join event callback function
+  * @param  joinParams status of join
+  */
+static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
+
+/**
+  * @brief  tx event callback function
+  * @param  params status of last Tx
+  */
+static void OnTxData(LmHandlerTxParams_t *params);
+
+/**
+  * @brief callback when LoRa application has received a frame
+  * @param appData data received in the last Rx
+  * @param params status of last Rx
+  */
+static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
+
+/**
+  * @brief callback when LoRa application Class is changed
+  * @param deviceClass new class
+  */
+static void OnClassChange(DeviceClass_t deviceClass );
+
+/*!
+ * Will be called each time a Radio IRQ is handled by the MAC layer
+ *
+ */
+static void OnMacProcessNotify(void);
+
+/* USER CODE BEGIN PFP */
+
+/**
+  * @brief  LED Tx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnTxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Rx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnRxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Join timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnJoinTimerLedEvent(void *context);
+
+/* USER CODE END PFP */
+
+/* Private variables ---------------------------------------------------------*/
+static ActivationType_t ActivationType = LORAWAN_DEFAULT_ACTIVATION_TYPE;
+
+/**
+  * @brief LoRaWAN handler Callbacks
+  */
+static LmHandlerCallbacks_t LmHandlerCallbacks =
+{
+  .GetBatteryLevel =           GetBatteryLevel,
+  .GetTemperature =            GetTemperatureLevel,
+  .GetUniqueId =               GetUniqueId,
+  .GetDevAddr =                GetDevAddr,
+  .OnMacProcess =              OnMacProcessNotify,
+  .OnJoinRequest =             OnJoinRequest,
+  .OnTxData =                  OnTxData,
+  .OnRxData =                  OnRxData,
+  .OnClassChange =             OnClassChange
+};
+
+/**
+  * @brief LoRaWAN handler parameters
+  */
+static LmHandlerParams_t LmHandlerParams =
+{
+  .ActiveRegion =             ACTIVE_REGION,
+  .DefaultClass =             LORAWAN_DEFAULT_CLASS,
+  .AdrEnable =                LORAWAN_ADR_STATE,
+  .TxDatarate =               LORAWAN_DEFAULT_DATA_RATE,
+  .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
+};
+
+/**
+  * @brief Type of Event to generate application Tx
+  */
+static TxEventType_t EventType = TX_ON_TIMER;
+
+/**
+  * @brief Timer to handle the application Tx
+  */
+static UTIL_TIMER_Object_t TxTimer;
+
+/* USER CODE BEGIN PV */
+/**
+  * @brief User application buffer
+  */
+static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+
+/**
+  * @brief User application data structure
+  */
+static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+
+/**
+  * @brief Specifies the state of the application LED
+  */
+static uint8_t AppLedStateOn = RESET;
+
+/**
+  * @brief Timer to handle the application Tx Led to toggle
+  */
+static UTIL_TIMER_Object_t TxLedTimer;
+
+/**
+  * @brief Timer to handle the application Rx Led to toggle
+  */
+static UTIL_TIMER_Object_t RxLedTimer;
+
+/**
+  * @brief Timer to handle the application Join Led to toggle
+  */
+static UTIL_TIMER_Object_t JoinLedTimer;
+
+/* USER CODE END PV */
+
+/* Exported functions ---------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void LoRaWAN_Init(void)
+{
+  /* USER CODE BEGIN LoRaWAN_Init_1 */
+
+  BSP_LED_Init(LED_BLUE);
+  BSP_LED_Init(LED_GREEN);
+  BSP_LED_Init(LED_RED);
+  BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
+
+  /* Get LoRa APP version*/
+  APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION:        V%X.%X.%X\r\n",
+          (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__LORA_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW LoraWAN info */
+  APP_LOG(TS_OFF, VLEVEL_M, "MW_LORAWAN_VERSION: V%X.%X.%X\r\n",
+          (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__LORAWAN_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW SubGhz_Phy info */
+  APP_LOG(TS_OFF, VLEVEL_M, "MW_RADIO_VERSION:   V%X.%X.%X\r\n",
+          (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  UTIL_TIMER_Create(&TxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerLedEvent, NULL);
+  UTIL_TIMER_Create(&RxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnRxTimerLedEvent, NULL);
+  UTIL_TIMER_Create(&JoinLedTimer, 0xFFFFFFFFU, UTIL_TIMER_PERIODIC, OnJoinTimerLedEvent, NULL);
+  UTIL_TIMER_SetPeriod(&TxLedTimer, 500);
+  UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
+  UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
+
+  /* USER CODE END LoRaWAN_Init_1 */
+
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_LmHandlerProcess), UTIL_SEQ_RFU, LmHandlerProcess);
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), UTIL_SEQ_RFU, SendTxData);
+  /* Init Info table used by LmHandler*/
+  LoraInfo_Init();
+
+  /* Init the Lora Stack*/
+  LmHandlerInit(&LmHandlerCallbacks);
+
+  LmHandlerConfigure(&LmHandlerParams);
+
+  /* USER CODE BEGIN LoRaWAN_Init_2 */
+  UTIL_TIMER_Start(&JoinLedTimer);
+
+  /* USER CODE END LoRaWAN_Init_2 */
+
+  LmHandlerJoin(ActivationType);
+
+  if (EventType == TX_ON_TIMER)
+  {
+    /* send every time timer elapses */
+    UTIL_TIMER_Create(&TxTimer,  0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerEvent, NULL);
+    UTIL_TIMER_SetPeriod(&TxTimer,  APP_TX_DUTYCYCLE);
+    UTIL_TIMER_Start(&TxTimer);
+  }
+  else
+  {
+    /* USER CODE BEGIN LoRaWAN_Init_3 */
+
+    /* send every time button is pushed */
+    BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
+    /* USER CODE END LoRaWAN_Init_3 */
+  }
+
+  /* USER CODE BEGIN LoRaWAN_Init_Last */
+
+  /* USER CODE END LoRaWAN_Init_Last */
+}
+
+/* USER CODE BEGIN PB_Callbacks */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
+/* In order to get a push button IRS by code automatically generated */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  switch (GPIO_Pin)
+  {
+    case  BUTTON_SW1_PIN:
+      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+      break;
+    case  BUTTON_SW2_PIN:
+      break;
+    case  BUTTON_SW3_PIN:
+      break;
+    default:
+      break;
+  }
+}
+
+/* USER CODE END PB_Callbacks */
+
+/* Private functions ---------------------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
+{
+  /* USER CODE BEGIN OnRxData_1 */
+  if ((appData != NULL) || (params != NULL))
+  {
+    BSP_LED_On(LED_BLUE) ;
+
+    UTIL_TIMER_Start(&RxLedTimer);
+
+    static const char *slotStrings[] = { "1", "2", "C", "C Multicast", "B Ping-Slot", "B Multicast Ping-Slot" };
+
+    APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Indication ==========\r\n");
+    APP_LOG(TS_OFF, VLEVEL_H, "###### D/L FRAME:%04d | SLOT:%s | PORT:%d | DR:%d | RSSI:%d | SNR:%d\r\n",
+            params->DownlinkCounter, slotStrings[params->RxSlot], appData->Port, params->Datarate, params->Rssi, params->Snr);
+    switch (appData->Port)
+    {
+      case LORAWAN_SWITCH_CLASS_PORT:
+        /*this port switches the class*/
+        if (appData->BufferSize == 1)
+        {
+          switch (appData->Buffer[0])
+          {
+            case 0:
+            {
+              LmHandlerRequestClass(CLASS_A);
+              break;
+            }
+            case 1:
+            {
+              LmHandlerRequestClass(CLASS_B);
+              break;
+            }
+            case 2:
+            {
+              LmHandlerRequestClass(CLASS_C);
+              break;
+            }
+            default:
+              break;
+          }
+        }
+        break;
+      case LORAWAN_USER_APP_PORT:
+        if (appData->BufferSize == 1)
+        {
+          AppLedStateOn = appData->Buffer[0] & 0x01;
+          if (AppLedStateOn == RESET)
+          {
+            APP_LOG(TS_OFF, VLEVEL_H,   "LED OFF\r\n");
+            BSP_LED_Off(LED_RED) ;
+          }
+          else
+          {
+            APP_LOG(TS_OFF, VLEVEL_H, "LED ON\r\n");
+            BSP_LED_On(LED_RED) ;
+          }
+        }
+        break;
+
+      default:
+
+        break;
+    }
+  }
+  /* USER CODE END OnRxData_1 */
+}
+
+static void SendTxData(void)
+{
+  /* USER CODE BEGIN SendTxData_1 */
+  uint16_t pressure = 0;
+  int16_t temperature = 0;
+  sensor_t sensor_data;
+  UTIL_TIMER_Time_t nextTxIn = 0;
+
+#ifdef CAYENNE_LPP
+  uint8_t channel = 0;
+#else
+  uint16_t humidity = 0;
+  uint32_t i = 0;
+  int32_t latitude = 0;
+  int32_t longitude = 0;
+  uint16_t altitudeGps = 0;
+#endif /* CAYENNE_LPP */
+
+  EnvSensors_Read(&sensor_data);
+  temperature = (SYS_GetTemperatureLevel() >> 8);
+  pressure    = (uint16_t)(sensor_data.pressure * 100 / 10);      /* in hPa / 10 */
+
+  AppData.Port = LORAWAN_USER_APP_PORT;
+
+#ifdef CAYENNE_LPP
+  CayenneLppReset();
+  CayenneLppAddBarometricPressure(channel++, pressure);
+  CayenneLppAddTemperature(channel++, temperature);
+  CayenneLppAddRelativeHumidity(channel++, (uint16_t)(sensor_data.humidity));
+
+  if ((LmHandlerParams.ActiveRegion != LORAMAC_REGION_US915) && (LmHandlerParams.ActiveRegion != LORAMAC_REGION_AU915)
+      && (LmHandlerParams.ActiveRegion != LORAMAC_REGION_AS923))
+  {
+    CayenneLppAddDigitalInput(channel++, GetBatteryLevel());
+    CayenneLppAddDigitalOutput(channel++, AppLedStateOn);
+  }
+
+  CayenneLppCopy(AppData.Buffer);
+  AppData.BufferSize = CayenneLppGetSize();
+#else  /* not CAYENNE_LPP */
+  humidity    = (uint16_t)(sensor_data.humidity * 10);            /* in %*10     */
+
+  AppData.Buffer[i++] = AppLedStateOn;
+  AppData.Buffer[i++] = (uint8_t)((pressure >> 8) & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(pressure & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(temperature & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)((humidity >> 8) & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(humidity & 0xFF);
+
+  if ((LmHandlerParams.ActiveRegion == LORAMAC_REGION_US915) || (LmHandlerParams.ActiveRegion == LORAMAC_REGION_AU915)
+      || (LmHandlerParams.ActiveRegion == LORAMAC_REGION_AS923))
+  {
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+  }
+  else
+  {
+    latitude = sensor_data.latitude;
+    longitude = sensor_data.longitude;
+
+    AppData.Buffer[i++] = GetBatteryLevel();        /* 1 (very low) to 254 (fully charged) */
+    AppData.Buffer[i++] = (uint8_t)((latitude >> 16) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((latitude >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(latitude & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((longitude >> 16) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((longitude >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(longitude & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((altitudeGps >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(altitudeGps & 0xFF);
+  }
+
+  AppData.BufferSize = i;
+#endif /* CAYENNE_LPP */
+
+  if (LORAMAC_HANDLER_SUCCESS == LmHandlerSend(&AppData, LORAWAN_DEFAULT_CONFIRMED_MSG_STATE, &nextTxIn, false))
+  {
+    APP_LOG(TS_ON, VLEVEL_L, "SEND REQUEST\r\n");
+  }
+  else if (nextTxIn > 0)
+  {
+    APP_LOG(TS_ON, VLEVEL_L, "Next Tx in  : ~%d second(s)\r\n", (nextTxIn / 1000));
+  }
+
+  /* USER CODE END SendTxData_1 */
+}
+
+static void OnClassChange(DeviceClass_t deviceClass )
+{
+  /*
+   * This implementation should be modified to adapt to the network configuration.
+   * This custom code allows to temporarily remove the Tx transactions from the device
+   * during the class C session, in order to avoid any conflict during
+   * the reception of frames in Multicast Class C.
+   */
+  if (deviceClass == CLASS_C)
+  {
+    UTIL_TIMER_Stop(&TxTimer);
+  }
+  else
+  {
+    UTIL_TIMER_Start(&TxTimer);
+  }
+}
+
+static void OnTxTimerEvent(void *context)
+{
+  /* USER CODE BEGIN OnTxTimerEvent_1 */
+
+  /* USER CODE END OnTxTimerEvent_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+
+  /*Wait for next tx slot*/
+  UTIL_TIMER_Start(&TxTimer);
+  /* USER CODE BEGIN OnTxTimerEvent_2 */
+
+  /* USER CODE END OnTxTimerEvent_2 */
+}
+
+/* USER CODE BEGIN PrFD_LedEvents */
+static void OnTxTimerLedEvent(void *context)
+{
+  BSP_LED_Off(LED_GREEN) ;
+}
+
+static void OnRxTimerLedEvent(void *context)
+{
+  BSP_LED_Off(LED_BLUE) ;
+}
+
+static void OnJoinTimerLedEvent(void *context)
+{
+  BSP_LED_Toggle(LED_RED) ;
+}
+
+/* USER CODE END PrFD_LedEvents */
+
+static void OnTxData(LmHandlerTxParams_t *params)
+{
+  /* USER CODE BEGIN OnTxData_1 */
+  if ((params != NULL))
+  {
+    /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
+    if (params->IsMcpsConfirm != 0)
+    {
+      BSP_LED_On(LED_GREEN) ;
+      UTIL_TIMER_Start(&TxLedTimer);
+
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
+      APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
+              params->AppData.Port, params->Datarate, params->TxPower);
+
+      APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
+      if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
+      }
+    }
+  }
+  /* USER CODE END OnTxData_1 */
+}
+
+static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
+{
+  /* USER CODE BEGIN OnJoinRequest_1 */
+  if (joinParams != NULL)
+  {
+    if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
+    {
+      UTIL_TIMER_Stop(&JoinLedTimer);
+      BSP_LED_Off(LED_RED) ;
+
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOINED = ");
+      if (joinParams->Mode == ACTIVATION_TYPE_ABP)
+      {
+        APP_LOG(TS_OFF, VLEVEL_M, "ABP ======================\r\n");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_M, "OTAA =====================\r\n");
+      }
+
+      /* Force a clock synchronization to be able to start a Multicast Session */
+      LmHandlerDeviceTimeReq();
+    }
+    else
+    {
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOIN FAILED\r\n");
+    }
+  }
+  /* USER CODE END OnJoinRequest_1 */
+}
+
+static void OnMacProcessNotify(void)
+{
+  /* USER CODE BEGIN OnMacProcessNotify_1 */
+
+  /* USER CODE END OnMacProcessNotify_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LmHandlerProcess), CFG_SEQ_Prio_0);
+
+  /* USER CODE BEGIN OnMacProcessNotify_2 */
+
+  /* USER CODE END OnMacProcessNotify_2 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app.h
new file mode 100644
index 00000000..b7ac7358
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app.h
@@ -0,0 +1,132 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORA_APP_H__
+#define __LORA_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* LoraWAN application configuration (Mw is configured by lorawan_conf.h) */
+#define ACTIVE_REGION                               LORAMAC_REGION_EU868
+
+/*!
+ * CAYENNE_LPP is myDevices Application server.
+ */
+/*#define CAYENNE_LPP*/
+
+/*!
+ * Defines the application data transmission duty cycle. 10s, value in [ms].
+ */
+#define APP_TX_DUTYCYCLE                            10000
+
+/*!
+ * LoRaWAN User application port
+ * @note do not use 224. It is reserved for certification
+ */
+#define LORAWAN_USER_APP_PORT                       2
+
+/*!
+ * LoRaWAN Switch class application port
+ * @note do not use 224. It is reserved for certification
+ */
+#define LORAWAN_SWITCH_CLASS_PORT                   3
+
+/*!
+ * LoRaWAN default endNode class port
+ */
+#define LORAWAN_DEFAULT_CLASS                       CLASS_A
+
+/*!
+ * LoRaWAN default confirm state
+ */
+#define LORAWAN_DEFAULT_CONFIRMED_MSG_STATE         LORAMAC_HANDLER_UNCONFIRMED_MSG
+
+/*!
+ * LoRaWAN Adaptive Data Rate
+ * @note Please note that when ADR is enabled the end-device should be static
+ */
+#define LORAWAN_ADR_STATE                           LORAMAC_HANDLER_ADR_ON
+
+/*!
+ * LoRaWAN Default data Rate Data Rate
+ * @note Please note that LORAWAN_DEFAULT_DATA_RATE is used only when LORAWAN_ADR_STATE is disabled
+ */
+#define LORAWAN_DEFAULT_DATA_RATE                   DR_0
+
+/*!
+ * LoRaWAN default activation type
+ */
+#define LORAWAN_DEFAULT_ACTIVATION_TYPE             ACTIVATION_TYPE_OTAA
+
+/*!
+ * User application data buffer size
+ */
+#define LORAWAN_APP_DATA_BUFFER_MAX_SIZE            242
+
+/*!
+ * Default Unicast ping slots periodicity
+ *
+ * \remark periodicity is equal to 2^LORAWAN_DEFAULT_PING_SLOT_PERIODICITY seconds
+ *         example: 2^3 = 8 seconds. The end-device will open an Rx slot every 8 seconds.
+ */
+#define LORAWAN_DEFAULT_PING_SLOT_PERIODICITY       4
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init Lora Application
+  */
+void LoRaWAN_Init(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LORA_APP_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app_version.h
new file mode 100644
index 00000000..2de4d3bf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_app_version.h
@@ -0,0 +1,90 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app_version.h
+  * @author  MCD Application Team
+  * @brief   Definition the version of the application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_VERSION_H__
+#define __APP_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
+#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
+
+#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
+#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
+#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
+#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Application version
+  */
+#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
+                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
+                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
+                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
+
+/**
+  * @brief LoRaWAN application version
+  */
+#define __LORA_APP_VERSION            __APP_VERSION
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_VERSION_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_info.c
new file mode 100644
index 00000000..3fd1204b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_info.c
@@ -0,0 +1,156 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_info.c
+  * @author  MCD Application Team
+  * @brief   To give info to the application about LoRaWAN configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "LoRaMac.h"
+#include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static LoraInfo_t loraInfo = {0, 0};
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported functions --------------------------------------------------------*/
+void LoraInfo_Init(void)
+{
+  loraInfo.ActivationMode = 0;
+  loraInfo.Region = 0;
+  loraInfo.ClassB = 0;
+  loraInfo.Kms = 0;
+  /* USER CODE BEGIN LoraInfo_Init_1 */
+
+  /* USER CODE END LoraInfo_Init_1 */
+
+#ifdef  REGION_AS923
+  loraInfo.Region |= (1 << LORAMAC_REGION_AS923) ;
+#endif /* REGION_AS923 */
+#ifdef  REGION_AU915
+  loraInfo.Region |= (1 << LORAMAC_REGION_AU915) ;
+#endif /* REGION_AU915 */
+#ifdef  REGION_CN470
+  loraInfo.Region |= (1 << LORAMAC_REGION_CN470) ;
+#endif /* REGION_CN470 */
+#ifdef  REGION_CN779
+  loraInfo.Region |= (1 << LORAMAC_REGION_CN779) ;
+#endif /* REGION_CN779 */
+#ifdef  REGION_EU433
+  loraInfo.Region |= (1 << LORAMAC_REGION_EU433) ;
+#endif /* REGION_EU433 */
+#ifdef  REGION_EU868
+  loraInfo.Region |= (1 << LORAMAC_REGION_EU868) ;
+#endif /* REGION_EU868 */
+#ifdef  REGION_KR920
+  loraInfo.Region |= (1 << LORAMAC_REGION_KR920) ;
+#endif /* REGION_KR920 */
+#ifdef  REGION_IN865
+  loraInfo.Region |= (1 << LORAMAC_REGION_IN865) ;
+#endif /* REGION_IN865 */
+#ifdef  REGION_US915
+  loraInfo.Region |= (1 << LORAMAC_REGION_US915) ;
+#endif /* REGION_US915 */
+#ifdef  REGION_RU864
+  loraInfo.Region |= (1 << LORAMAC_REGION_RU864) ;
+#endif /* REGION_RU864 */
+
+  if (loraInfo.Region == 0)
+  {
+    APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+    while (1) {} /* At least one region shall be defined */
+  }
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+  loraInfo.ClassB = 1;
+#elif !defined (LORAMAC_CLASSB_ENABLED)
+#error LORAMAC_CLASSB_ENABLED not defined ( shall be <0 or 1> )
+#endif /* LORAMAC_CLASSB_ENABLED */
+
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+  loraInfo.Kms = 0;
+  loraInfo.ActivationMode = 3;
+#else /* LORAWAN_KMS == 1 */
+  loraInfo.Kms = 1;
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
+#endif /* LORAWAN_KMS */
+  /* USER CODE BEGIN LoraInfo_Init_2 */
+
+  /* USER CODE END LoraInfo_Init_2 */
+}
+
+LoraInfo_t *LoraInfo_GetPtr(void)
+{
+  /* USER CODE BEGIN LoraInfo_GetPtr */
+
+  /* USER CODE END LoraInfo_GetPtr */
+  return &loraInfo;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions --------------------------------------------------------*/
+
+/* USER CODE BEGIN PF */
+
+/* USER CODE END PF */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_info.h
new file mode 100644
index 00000000..0608fd34
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/lora_info.h
@@ -0,0 +1,94 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_info.h
+  * @author  MCD Application Team
+  * @brief   To give info to the application about LoRaWAN configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#ifndef __LORA_INFO_H__
+#define __LORA_INFO_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported types ------------------------------------------------------------*/
+/*!
+ * To give info to the application about LoraWAN capability
+ * it can depend how it has been compiled (e.g. compiled regions ...)
+ * Params should be better uint32_t foe easier alignment with info_table concept
+ */
+typedef struct
+{
+  uint32_t ActivationMode;  /*!< 1: ABP, 2 : OTAA, 3: ABP & OTAA   */
+  uint32_t Region;   /*!< Combination of regions compiled on MW  */
+  uint32_t ClassB;   /*!< 0: not compiled in Mw, 1 : compiled in MW  */
+  uint32_t Kms;      /*!< 0: not compiled in Mw, 1 : compiled in MW  */
+} LoraInfo_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief initialize the LoraInfo table
+  */
+void LoraInfo_Init(void);
+
+/**
+  * @brief returns the pointer to the LoraInfo capabilities table
+  * @retval LoraInfo pointer
+  */
+LoraInfo_t *LoraInfo_GetPtr(void);
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LORA_INFO_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/se-identity.h
new file mode 100644
index 00000000..9b628efe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/App/se-identity.h
@@ -0,0 +1,398 @@
+/*!
+ * \file      se-identity.h
+ *
+ * \brief     Secure Element identity and keys
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2020 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    se-identity.h
+  * @author  MCD Application Team
+  * @brief   Secure Element identity and keys
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SOFT_SE_IDENTITY_H__
+#define __SOFT_SE_IDENTITY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported Includes --------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/*!
+ ******************************************************************************
+ ********************************** WARNING ***********************************
+ ******************************************************************************
+  The secure-element implementation supports both 1.0.x and 1.1.x LoRaWAN
+  versions of the specification.
+  Thus it has been decided to use the 1.1.x keys and EUI name definitions.
+  The below table shows the names equivalence between versions:
+               +---------------------+-------------------------+
+               |       1.0.x         |          1.1.x          |
+               +=====================+=========================+
+               | LORAWAN_DEVICE_EUI  | LORAWAN_DEVICE_EUI      |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_EUI     | LORAWAN_JOIN_EUI        |
+               +---------------------+-------------------------+
+               | LORAWAN_GEN_APP_KEY | LORAWAN_APP_KEY         |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_KEY     | LORAWAN_NWK_KEY         |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_F_NWK_S_INT_KEY |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_S_NWK_S_INT_KEY |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_NWK_S_ENC_KEY   |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_S_KEY   | LORAWAN_APP_S_KEY       |
+               +---------------------+-------------------------+
+ ******************************************************************************
+ ******************************************************************************
+ ******************************************************************************
+ */
+
+/*!
+ * When set to 1 DevEui is LORAWAN_DEVICE_EUI
+ * When set to 0 DevEui is automatically set with a value provided by MCU platform
+ */
+#define STATIC_DEVICE_EUI                                  0
+
+/*!
+ * end-device IEEE EUI (big endian)
+ */
+#define LORAWAN_DEVICE_EUI                                 { 0x00, 0x80, 0xE1, 0x01, 0x01, 0x01, 0x01, 0x01 }
+
+/*!
+ * App/Join server IEEE EUI (big endian)
+ */
+#define LORAWAN_JOIN_EUI                                   { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }
+
+/*!
+ * When set to 1 DevAddr is LORAWAN_DEVICE_ADDRESS
+ * When set to 0 DevAddr is automatically set with a value provided by a pseudo
+ *      random generator seeded with a value provided by the MCU platform
+ */
+#define STATIC_DEVICE_ADDRESS                              0
+
+/*!
+ * Device address on the network (big endian)
+ */
+#define LORAWAN_DEVICE_ADDRESS                             ( uint32_t )0x0100000A
+
+/*!
+ * Application root key
+ */
+#define LORAWAN_APP_KEY                                    2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Network root key
+ */
+#define LORAWAN_NWK_KEY                                    2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Forwarding Network session key
+ */
+#define LORAWAN_NWK_S_KEY                                  2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Application session key
+ */
+#define LORAWAN_APP_S_KEY                                  2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Format commissioning keys
+ */
+#define RAW_TO_INT8A(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) {0x##a,0x##b,0x##c,0x##d,\
+                                                        0x##e,0x##f,0x##g,0x##h,\
+                                                        0x##i,0x##j,0x##k,0x##l,\
+                                                        0x##m,0x##n,0x##o,0x##p}
+
+#define FORMAT_KEY(...) RAW_TO_INT8A(__VA_ARGS__)
+
+#if (USE_LRWAN_1_1_X_CRYPTO == 1)
+#define SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Join session integrity key (Dynamically updated)                                                     \
+             * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
+             */                                                                                                     \
+            .KeyID    = J_S_INT_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Join session encryption key (Dynamically updated)                                                    \
+             * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
+             */                                                                                                     \
+            .KeyID    = J_S_ENC_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Forwarding Network session integrity key                                                             \
+             * WARNING: NWK_S_KEY FOR 1.0.x DEVICES                                                                 \
+             */                                                                                                     \
+            .KeyID    = F_NWK_S_INT_KEY,                                                                            \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_S_KEY),                                                              \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Serving Network session integrity key                                                                \
+             * WARNING: NOT USED FOR 1.0.x DEVICES. MUST BE THE SAME AS \ref LORAWAN_F_NWK_S_INT_KEY                \
+             */                                                                                                     \
+            .KeyID    = S_NWK_S_INT_KEY,                                                                            \
+            .KeyValue = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, \
+                          0x3C },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network session encryption key                                                                       \
+             * WARNING: NOT USED FOR 1.0.x DEVICES. MUST BE THE SAME AS \ref LORAWAN_F_NWK_S_INT_KEY                \
+             */                                                                                                     \
+            .KeyID    = NWK_S_ENC_KEY,                                                                              \
+            .KeyValue = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, \
+                          0x3C },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application session key                                                                              \
+             */                                                                                                     \
+            .KeyID    = APP_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_S_KEY),                                                              \
+        },
+#else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
+#define SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network session key                                                                                  \
+             */                                                                                                     \
+            .KeyID    = NWK_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_S_KEY),                                                              \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application session key                                                                              \
+             */                                                                                                     \
+            .KeyID    = APP_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_S_KEY),                                                              \
+        },
+#endif /* USE_LRWAN_1_1_X_CRYPTO */
+
+#if (LORAMAC_MAX_MC_CTX == 1)
+#define SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_0,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },
+#else /* LORAMAC_MAX_MC_CTX > 1 */
+#define SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_0,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_1,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_1,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_1,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_2,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_2,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_2,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_3,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_3,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_3,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },
+#endif /* LORAMAC_MAX_MC_CTX */
+
+#define SOFT_SE_KEY_LIST                                                                                            \
+    {                                                                                                               \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application root key                                                                                 \
+             * WARNING: FOR 1.0.x DEVICES IT IS THE \ref LORAWAN_GEN_APP_KEY                                        \
+             */                                                                                                     \
+            .KeyID    = APP_KEY,                                                                                    \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_KEY),                                                                \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network root key                                                                                     \
+             * WARNING: FOR 1.0.x DEVICES IT IS THE \ref LORAWAN_APP_KEY                                            \
+             */                                                                                                     \
+            .KeyID    = NWK_KEY,                                                                                    \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_KEY),                                                                \
+        },                                                                                                          \
+        SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast root key (Dynamically updated)                                                             \
+             */                                                                                                     \
+            .KeyID    = MC_ROOT_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast key encryption key (Dynamically updated)                                                   \
+             */                                                                                                     \
+            .KeyID    = MC_KE_KEY,                                                                                  \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * All zeros key. (ClassB usage)(constant)                                                              \
+             */                                                                                                     \
+            .KeyID    = SLOT_RAND_ZERO_KEY,                                                                         \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+    }
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /*  __SOFT_SE_IDENTITY_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/frag_decoder_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/frag_decoder_if.c
new file mode 100644
index 00000000..1df01a30
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/frag_decoder_if.c
@@ -0,0 +1,297 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    frag_decoder_if.c
+  * @author  MCD Application Team
+  * @brief   Implements the Data Distribution Agent
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "frag_decoder_if.h"
+#include "sys_app.h"
+#include "utilities.h"
+#include "flash_if.h"
+#include "fw_update_agent.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/*!
+ * Defines the maximum size for the buffer receiving the fragmentation result.
+ *
+ * \remark By default frag_decoder_if.h defines:
+ *         \ref FRAG_MAX_NB   313
+ *         \ref FRAG_MAX_SIZE 216
+ *
+ *         In interop test mode will be
+ *         \ref FRAG_MAX_NB   20
+ *         \ref FRAG_MAX_SIZE 50
+ *
+ *         FileSize = FRAG_MAX_NB * FRAG_MAX_SIZE
+ *
+ *         If bigger file size is to be received or is fragmented differently
+ *         one must update those parameters.
+ *
+ * \remark  Memory allocation is done at compile time. Several options have to be foreseen
+ *          in order to optimize the memory. Will depend of the Memory management used
+ *          Could be Dynamic allocation --> malloc method
+ *          Variable Length Array --> VLA method
+ *          pseudo dynamic allocation --> memory pool method
+ *          Other option :
+ *          In place of using the caching memory method we can foreseen to have a direct
+ *          flash memory copy. This solution will depend of the SBSFU constraint
+ *
+ */
+#define UNFRAGMENTED_DATA_SIZE                      ( FRAG_MAX_NB * FRAG_MAX_SIZE )
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * Fragmentation package callbacks parameters
+  */
+const LmhpFragmentationParams_t FRAG_DECODER_IF_FragmentationParams =
+{
+  .DecoderCallbacks =
+  {
+    .FragDecoderErase = FRAG_DECODER_IF_Erase,
+    .FragDecoderWrite = FRAG_DECODER_IF_Write,
+    .FragDecoderRead = FRAG_DECODER_IF_Read,
+  },
+  .OnProgress = FRAG_DECODER_IF_OnProgress,
+  .OnDone = FRAG_DECODER_IF_OnDone
+};
+
+#if (INTEROP_TEST_MODE == 1)  /*write fragment in RAM - Caching mode*/
+/**
+  * Un-fragmented data storage.
+  */
+static uint8_t UnfragmentedData[UNFRAGMENTED_DATA_SIZE];
+#else
+/**
+  * Temp buffer to store fragment in RAM to avoid several Flash write
+  */
+static uint8_t FRAG_DECODER_IF_RAM_buffer[FLASH_PAGE_SIZE];
+#endif /* INTEROP_TEST_MODE */
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+#if (INTEROP_TEST_MODE == 1)
+/**
+  * \brief Computes a CCITT 32 bits CRC
+  *
+  * \param [IN] buffer   Data buffer used to compute the CRC
+  * \param [IN] length   Data buffer length
+  *
+  * \retval crc          The computed buffer of length CRC
+  */
+static uint32_t Crc32(uint8_t *buffer, uint16_t length);
+#endif /* INTEROP_TEST_MODE == 0 */
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t FRAG_DECODER_IF_Erase(void)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_Erase_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_Erase_1 */
+  int32_t status = FLASH_OK;
+#if (INTEROP_TEST_MODE == 1)
+  UTIL_MEM_set_8(UnfragmentedData, 0xFF, UNFRAGMENTED_DATA_SIZE);
+#else /* INTEROP_TEST_MODE == 0 */
+  uint32_t first_page = PAGE(FRAG_DECODER_DWL_REGION_START);
+  uint32_t nb_pages = PAGE(FRAG_DECODER_DWL_REGION_START + FRAG_DECODER_DWL_REGION_SIZE - 1) - first_page + 1U;
+
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    status = FLASH_IF_EraseByPages(first_page, nb_pages, 0U);
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    HAL_FLASH_Lock();
+  }
+  else
+  {
+    status = FLASH_LOCK_ERROR;
+  }
+
+#endif /* INTEROP_TEST_MODE */
+  if (status != FLASH_OK)
+  {
+    status = FLASH_ERROR;
+  }
+  return status;
+  /* USER CODE BEGIN FRAG_DECODER_IF_Erase_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_Erase_2 */
+}
+
+int32_t FRAG_DECODER_IF_Write(uint32_t addr, uint8_t *data, uint32_t size)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_Write_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_Write_1 */
+  int32_t status = FLASH_OK;
+
+#if (INTEROP_TEST_MODE == 1)  /*write fragment in RAM - Caching mode*/
+  UTIL_MEM_cpy_8(&UnfragmentedData[addr], data, size);
+#else /* INTEROP_TEST_MODE == 0 */
+
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    status = FLASH_IF_Write(FRAG_DECODER_DWL_REGION_START + addr, data, size, FRAG_DECODER_IF_RAM_buffer);
+    HAL_FLASH_Lock();
+  }
+  else
+  {
+    status = FLASH_LOCK_ERROR;
+  }
+
+  if (status != FLASH_OK)
+  {
+    APP_LOG(TS_OFF, VLEVEL_M, "\r\n....... !! FLASH_IF_WRITE_ERROR: %d !! .......\r\n", status);
+  }
+#endif /* INTEROP_TEST_MODE */
+  if (status != FLASH_OK)
+  {
+    status = FLASH_ERROR;
+  }
+  return status;
+  /* USER CODE BEGIN FRAG_DECODER_IF_Write_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_Write_2 */
+}
+
+int32_t FRAG_DECODER_IF_Read(uint32_t addr, uint8_t *data, uint32_t size)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_Read_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_Read_1 */
+#if (INTEROP_TEST_MODE == 1)   /*Read fragment in RAM - Caching mode*/
+  UTIL_MEM_cpy_8(data, &UnfragmentedData[addr], size);
+#else /* INTEROP_TEST_MODE == 0 */
+  UTIL_MEM_cpy_8(data, (void *)(FRAG_DECODER_DWL_REGION_START + addr), size);
+#endif /* INTEROP_TEST_MODE */
+
+  return FLASH_OK;
+  /* USER CODE BEGIN FRAG_DECODER_IF_Read_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_Read_2 */
+}
+
+void FRAG_DECODER_IF_OnProgress(uint16_t fragCounter, uint16_t fragNb, uint8_t fragSize, uint16_t fragNbLost)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_OnProgress_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_OnProgress_1 */
+  APP_LOG(TS_OFF, VLEVEL_M, "\r\n....... FRAG_DECODER in Progress .......\r\n");
+  APP_LOG(TS_OFF, VLEVEL_M, "RECEIVED    : %5d / %5d Fragments\r\n", fragCounter, fragNb);
+  APP_LOG(TS_OFF, VLEVEL_M, "              %5d / %5d Bytes\r\n", fragCounter * fragSize, fragNb * fragSize);
+  APP_LOG(TS_OFF, VLEVEL_M, "LOST        :       %7d Fragments\r\n\r\n", fragNbLost);
+
+#if (INTEROP_TEST_MODE == 1)
+  BSP_LED_Toggle(LED_BLUE);
+#endif /* INTEROP_TEST_MODE == 1 */
+  /* USER CODE BEGIN FRAG_DECODER_IF_OnProgress_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_OnProgress_2 */
+}
+
+void FRAG_DECODER_IF_OnDone(int32_t status, uint32_t size)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_OnDone_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_OnDone_1 */
+  APP_LOG(TS_OFF, VLEVEL_M, "\r\n....... FRAG_DECODER Finished .......\r\n");
+  APP_LOG(TS_OFF, VLEVEL_M, "STATUS      : %d\r\n", status);
+
+#if (INTEROP_TEST_MODE == 0)
+  /* Do a request to Run the Secure boot - The file is already in flash */
+  FwUpdateAgent_Run();
+#else
+  uint32_t FileRxCrc = Crc32(UnfragmentedData, size);
+  APP_LOG(TS_OFF, VLEVEL_M, "Size      : %d\r\n", size);
+  APP_LOG(TS_OFF, VLEVEL_M, "CRC         : %08X\r\n\r\n", FileRxCrc);
+
+  BSP_LED_Off(LED_BLUE);
+#endif /* INTEROP_TEST_MODE == 1 */
+  /* USER CODE BEGIN FRAG_DECODER_IF_OnDone_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_OnDone_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+#if (INTEROP_TEST_MODE == 1)
+static uint32_t Crc32(uint8_t *buffer, uint16_t length)
+{
+  /* USER CODE BEGIN Crc32_1 */
+
+  /* USER CODE END Crc32_1 */
+  const uint32_t reversedPolynom = 0xEDB88320;
+  uint32_t crc = 0xFFFFFFFF;
+  if (buffer == NULL)
+  {
+    return 0;
+  }
+  for (uint16_t i = 0; i < length; ++i)
+  {
+    crc ^= (uint32_t)buffer[i];
+    for (uint16_t i = 0; i < 8; i++)
+    {
+      crc = (crc >> 1) ^ (reversedPolynom & ~((crc & 0x01) - 1));
+    }
+  }
+  return ~crc;
+  /* USER CODE BEGIN Crc32_2 */
+
+  /* USER CODE END Crc32_2 */
+}
+#endif /* INTEROP_TEST_MODE */
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/frag_decoder_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/frag_decoder_if.h
new file mode 100644
index 00000000..5272e400
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/frag_decoder_if.h
@@ -0,0 +1,181 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    frag_decoder_if.h
+  * @author  MCD Application Team
+  * @brief   Applicative interfaces of LoRa-Alliance fragmentation decoder
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __FRAG_DECODER_IF_H__
+#define __FRAG_DECODER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "LmhpFragmentation.h"
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported defines ----------------------------------------------------------*/
+#define INTEROP_TEST_MODE                           0
+
+#if (INTEROP_TEST_MODE == 1)
+/*!
+  * Maximum number of fragment that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_NB                                 20
+
+/*!
+  * Maximum fragment size that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_SIZE                               50
+
+/*!
+  * Maximum number of extra frames that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_REDUNDANCY                         5
+
+#else /* INTEROP_TEST_MODE == 0 */
+/*!
+  * Maximum number of fragment that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  * \note FRAG_MAX_NB = (SLOT_DWL_1_END - SLOT_DWL_1_START) / FRAG_MAX_SIZE
+  */
+#define FRAG_MAX_NB                                 716
+
+/*!
+  * Maximum fragment size that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_SIZE                               120
+
+/*!
+  * Maximum number of extra frames that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  * \note FRAG_MAX_NB * 0.10 (with redundancy = 10 %)
+  */
+#define FRAG_MAX_REDUNDANCY                         72
+
+#endif /* INTEROP_TEST_MODE */
+
+#define FRAG_DECODER_SWAP_REGION_START              ((uint32_t)(SlotStartAdd[SLOT_SWAP]))
+
+#define FRAG_DECODER_SWAP_REGION_SIZE               ((uint32_t)(SlotEndAdd[SLOT_SWAP] - SlotStartAdd[SLOT_SWAP] + 1U))
+
+#define FRAG_DECODER_DWL_REGION_START               ((uint32_t)(SlotStartAdd[SLOT_DWL_1]))
+
+#define FRAG_DECODER_DWL_REGION_SIZE                ((uint32_t)(SlotEndAdd[SLOT_DWL_1] - SlotStartAdd[SLOT_DWL_1] + 1U))
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+extern const LmhpFragmentationParams_t FRAG_DECODER_IF_FragmentationParams;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+
+/**
+  * Initialize final uncoded data buffer
+  *
+  * \retval status Write operation status [0: Success, -1 Fail]
+  */
+int32_t FRAG_DECODER_IF_Erase(void);
+
+/**
+  * Writes `data` buffer of `size` starting at address `addr`
+  *
+  * \param [IN] addr Address start index to write to.
+  * \param [IN] data Data buffer to be written.
+  * \param [IN] size Size of data buffer to be written.
+  *
+  * \retval status Write operation status [0: Success, -1 Fail]
+  */
+int32_t FRAG_DECODER_IF_Write(uint32_t addr, uint8_t *data, uint32_t size);
+
+/**
+  * Reads `data` buffer of `size` starting at address `addr`
+  *
+  * \param [IN] addr Address start index to read from.
+  * \param [IN] data Data buffer to be read.
+  * \param [IN] size Size of data buffer to be read.
+  *
+  * \retval status Read operation status [0: Success, -1 Fail]
+  */
+int32_t FRAG_DECODER_IF_Read(uint32_t addr, uint8_t *data, uint32_t size);
+
+/**
+  * Notifies the progress of the current fragmentation session
+  *
+  * \param [IN] fragCounter Fragment counter
+  * \param [IN] fragNb      Number of fragments
+  * \param [IN] fragSize    Size of fragments
+  * \param [IN] fragNbLost  Number of lost fragments
+  */
+void FRAG_DECODER_IF_OnProgress(uint16_t fragCounter, uint16_t fragNb, uint8_t fragSize, uint16_t fragNbLost);
+
+/**
+  * Notifies that the fragmentation session is finished
+  *
+  * \param [IN] status Fragmentation session status [FRAG_SESSION_ONGOING,
+  *                                                  FRAG_SESSION_FINISHED or
+  *                                                  FragDecoder.Status.FragNbLost]
+  * \param [IN] size   Received file size
+  */
+void FRAG_DECODER_IF_OnDone(int32_t status, uint32_t size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __FRAG_DECODER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/lorawan_conf.h
new file mode 100644
index 00000000..ebe74ae3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/lorawan_conf.h
@@ -0,0 +1,143 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lorawan_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for LoRaWAN middleware instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORAWAN_CONF_H__
+#define __LORAWAN_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN LORAWAN_KMS */
+#define LORAWAN_KMS 1
+/* USER CODE END LORAWAN_KMS */
+
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+#else /* LORAWAN_KMS == 1 */
+#define OVER_THE_AIR_ACTIVATION 1
+#define ACTIVATION_BY_PERSONALIZATION 1
+#endif /* LORAWAN_KMS */
+
+#define LORAWAN_DATA_DISTRIB_MGT   1
+
+/* Region ------------------------------------*/
+/* the region listed here will be linked in the MW code */
+/* the application (on sys_conf.h) shall just configure one region at the time */
+/*#define REGION_AS923*/
+/*#define REGION_AU915*/
+/*#define REGION_CN470*/
+/*#define REGION_CN779*/
+/*#define REGION_EU433*/
+#define REGION_EU868
+/*#define REGION_KR920*/
+/*#define REGION_IN865*/
+#define REGION_US915
+/*#define REGION_RU864*/
+
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
+
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
+
+/* Class B ------------------------------------*/
+#define LORAMAC_CLASSB_ENABLED  0
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+/* CLASS B LSE crystal calibration*/
+/**
+  * \brief Temperature coefficient of the clock source
+  */
+#define RTC_TEMP_COEFFICIENT                            ( -0.035 )
+
+/**
+  * \brief Temperature coefficient deviation of the clock source
+  */
+#define RTC_TEMP_DEV_COEFFICIENT                        ( 0.0035 )
+
+/**
+  * \brief Turnover temperature of the clock source
+  */
+#define RTC_TEMP_TURNOVER                               ( 25.0 )
+
+/**
+  * \brief Turnover temperature deviation of the clock source
+  */
+#define RTC_TEMP_DEV_TURNOVER                           ( 5.0 )
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifndef CRITICAL_SECTION_BEGIN
+#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_BEGIN */
+#ifndef CRITICAL_SECTION_END
+#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_END */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LORAWAN_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/mw_log_conf.h
new file mode 100644
index 00000000..5bcdf818
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/mw_log_conf.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mw_log_conf.h
+  * @author  MCD Application Team
+  * @brief   Configure (enable/disable) traces for CM0
+  *******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MW_LOG_CONF_H__
+#define __MW_LOG_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_adv_trace.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MW_LOG_ENABLED
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef MW_LOG_ENABLED
+#define MW_LOG(TS,VL, ...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0)
+#else  /* MW_LOG_ENABLED */
+#define MW_LOG(TS,VL, ...)
+#endif /* MW_LOG_ENABLED */
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MW_LOG_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c
new file mode 100644
index 00000000..d4c34621
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c
@@ -0,0 +1,220 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.c
+  * @author  MCD Application Team
+  * @brief   This file provides an interface layer between MW and Radio Board
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "radio_board_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t RBI_Init(void)
+{
+  /* USER CODE BEGIN RBI_Init_1 */
+
+  /* USER CODE END RBI_Init_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_Init();
+#else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_Init_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_Init_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_DeInit(void)
+{
+  /* USER CODE BEGIN RBI_DeInit_1 */
+
+  /* USER CODE END RBI_DeInit_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_DeInit();
+#else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_DeInit_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_DeInit_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
+{
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_1 */
+
+  /* USER CODE END RBI_ConfigRFSwitch_1 */
+#if defined(USE_BSP_DRIVER)
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
+#else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_ConfigRFSwitch_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_GetTxConfig(void)
+{
+  /* USER CODE BEGIN RBI_GetTxConfig_1 */
+
+  /* USER CODE END RBI_GetTxConfig_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_GetTxConfig();
+#else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
+  /* USER CODE BEGIN RBI_GetTxConfig_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_GetTxConfig_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_IsTCXO(void)
+{
+  /* USER CODE BEGIN RBI_IsTCXO_1 */
+
+  /* USER CODE END RBI_IsTCXO_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsTCXO();
+#else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsTCXO_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsTCXO_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_IsDCDC(void)
+{
+  /* USER CODE BEGIN RBI_IsDCDC_1 */
+
+  /* USER CODE END RBI_IsDCDC_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsDCDC();
+#else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsDCDC_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsDCDC_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.h
new file mode 100644
index 00000000..9e505c68
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.h
@@ -0,0 +1,207 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Radio interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef RADIO_BOARD_IF_H
+#define RADIO_BOARD_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported defines ----------------------------------------------------------*/
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+#define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
+#define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
+#define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
+#else
+/* USER CODE BEGIN Board Definition */
+
+/* USER CODE END Board Definition */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported Parameters */
+
+/* USER CODE END Exported Parameters */
+/* Indicates the type of switch between the ones proposed by CONFIG Constants
+ */
+#define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
+
+/* Indicates whether or not TCXO is supported by the board
+ * 0: TCXO not supported
+ * 1: TCXO supported
+ */
+#define IS_TCXO_SUPPORTED                   1U
+
+/* Indicates whether or not DCDC is supported by the board
+ * 0: DCDC not supported
+ * 1: DCDC supported
+ */
+#define IS_DCDC_SUPPORTED                   1U
+
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported PinMapping */
+#warning user to provide its board definitions pins
+/* USER CODE END Exported PinMapping */
+#endif  /* USE_BSP_DRIVER  */
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+typedef enum
+{
+  RBI_SWITCH_OFF    = RADIO_SWITCH_OFF,
+  RBI_SWITCH_RX     = RADIO_SWITCH_RX,
+  RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
+  RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
+} RBI_Switch_TypeDef;
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
+typedef enum
+{
+  RBI_SWITCH_OFF    = 0,
+  RBI_SWITCH_RX     = 1,
+  RBI_SWITCH_RFO_LP = 2,
+  RBI_SWITCH_RFO_HP = 3,
+} RBI_Switch_TypeDef;
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief  Init Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_Init(void);
+
+/**
+  * @brief  DeInit Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_DeInit(void);
+
+/**
+  * @brief  Configure Radio Switch.
+  * @param  Config: Specifies the Radio RF switch path to be set.
+  *         This parameter can be one of following parameters:
+  *           @arg RADIO_SWITCH_OFF
+  *           @arg RADIO_SWITCH_RX
+  *           @arg RADIO_SWITCH_RFO_LP
+  *           @arg RADIO_SWITCH_RFO_HP
+  * @return BSP status
+  */
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
+
+/**
+  * @brief  Return Board Configuration
+  * @retval RBI_CONF_RFO_LP_HP
+  * @retval RBI_CONF_RFO_LP
+  * @retval RBI_CONF_RFO_HP
+  */
+int32_t RBI_GetTxConfig(void);
+
+/**
+  * @brief  Get If TCXO is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsTCXO(void);
+
+/**
+  * @brief  Get If DCDC is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsDCDC(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RADIO_BOARD_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_conf.h
new file mode 100644
index 00000000..375c9ddc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/radio_conf.h
@@ -0,0 +1,163 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_conf.h
+  * @author  MCD Application Team
+  * @brief   Header of Radio configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_CONF_H__
+#define __RADIO_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
+#include "mw_log_conf.h"     /* mw trace conf */
+#include "radio_board_if.h"  /* low layer api (bsp) */
+#include "utilities_def.h"  /* low layer api (bsp) */
+#include "sys_debug.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Set RX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
+
+/**
+  * @brief Set TX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
+
+/**
+  * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
+
+/**
+  * @brief drive value used anytime radio is in TX low power mode
+  *        TX low power mode is the worst case because the PA sinks from SMPS
+  *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
+
+/**
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_FREQ                   ( 32000000UL )
+
+/**
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
+
+/**
+  * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
+  */
+#define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
+
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifndef CRITICAL_SECTION_BEGIN
+/**
+  * @brief macro used to enter the critical section
+  */
+#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_BEGIN */
+#ifndef CRITICAL_SECTION_END
+/**
+  * @brief macro used to exit the critical section
+  */
+#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_END */
+
+/* Function mapping */
+/**
+  * @brief SUBGHZ interface init to radio Middleware
+  */
+#define RADIO_INIT                              MX_SUBGHZ_Init
+
+/**
+  * @brief Delay interface to radio Middleware
+  */
+#define RADIO_DELAY_MS                          HAL_Delay
+
+/**
+  * @brief Memset utilities interface to radio Middleware
+  */
+#define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RADIO_CONF_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/systime.h
new file mode 100644
index 00000000..1991b928
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/systime.h
@@ -0,0 +1,67 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    systime.h
+  * @author  MCD Application Team
+  * @brief   Map middleware systime
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTIME_H__
+#define __SYSTIME_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_systime.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SYSTIME_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/timer.h
new file mode 100644
index 00000000..e80cd6a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/LoRaWAN/Target/timer.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer.h
+  * @author  MCD Application Team
+  * @brief   Wrapper to timer server
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_H__
+#define __TIMER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Max timer mask
+  */
+#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/**
+  * @brief Timer value on 32 bits
+  */
+#define TimerTime_t UTIL_TIMER_Time_t
+
+/**
+  * @brief Timer object description
+  */
+#define TimerEvent_t UTIL_TIMER_Object_t
+
+/**
+  * @brief Create the timer object
+  */
+#define TimerInit(HANDLE, CB) do {\
+                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
+                                 } while(0)
+
+/**
+  * @brief update the period and start the timer
+  */
+#define TimerSetValue(HANDLE, TIMEOUT) do{ \
+                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
+                                         } while(0)
+
+/**
+  * @brief Start and adds the timer object to the list of timer events
+  */
+#define TimerStart(HANDLE)   do {\
+                                  UTIL_TIMER_Start(HANDLE);\
+                                } while(0)
+
+/**
+  * @brief Stop and removes the timer object from the list of timer events
+  */
+#define TimerStop(HANDLE)   do {\
+                                 UTIL_TIMER_Stop(HANDLE);\
+                               } while(0)
+
+/**
+  * @brief return the current time
+  */
+#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
+
+/**
+  * @brief return the elapsed time
+  */
+#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvoptx
new file mode 100644
index 00000000..99a12d19
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvoptx
@@ -0,0 +1,1473 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>LoRaWAN_End_Node</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/sys_sensors.c</PathWithFileName>
+      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Core\Src\flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/LoRaWAN/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../LoRaWAN/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\LoRaWAN\Target\frag_decoder_if.c</PathWithFileName>
+      <FilenameWithoutPath>frag_decoder_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../LoRaWAN/App/app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../LoRaWAN/App/CayenneLpp.c</PathWithFileName>
+      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../LoRaWAN/App/lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../LoRaWAN/App/lora_info.c</PathWithFileName>
+      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\LoRaWAN\App\fw_update_agent.c</PathWithFileName>
+      <FilenameWithoutPath>fw_update_agent.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/LoRaWAN</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</PathWithFileName>
+      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</PathWithFileName>
+      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>54</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</PathWithFileName>
+      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>55</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</PathWithFileName>
+      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>56</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>57</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>58</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</PathWithFileName>
+      <FilenameWithoutPath>RegionBaseUS.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>59</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>60</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>61</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>62</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>63</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>64</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</PathWithFileName>
+      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>65</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</PathWithFileName>
+      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>66</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</PathWithFileName>
+      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>67</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>68</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>69</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>70</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>71</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>72</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>73</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>74</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>75</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>76</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>77</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</PathWithFileName>
+      <FilenameWithoutPath>NvmDataMgmt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>78</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</PathWithFileName>
+      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>79</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</PathWithFileName>
+      <FilenameWithoutPath>FragDecoder.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>80</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpClockSync.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>81</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpFirmwareManagement.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>82</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpFragmentation.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>83</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpRemoteMcastSetup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>84</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpPackagesRegistration.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpPackagesRegistration.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/SubGHz_Phy</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>85</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>86</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>87</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>88</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>89</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>90</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>91</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>92</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>93</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>94</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>95</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>12</GroupNumber>
+      <FileNumber>96</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\KMS\App\app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>97</FileNumber>
+      <FileType>3</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\1_Image_BFU\MDK-ARM\STM32WL55JC_Nucleo\Exe\se_interface_appli.txt</PathWithFileName>
+      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvprojx
new file mode 100644
index 00000000..cf7a815d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/LoRaWAN_End_Node.uvprojx
@@ -0,0 +1,968 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>LoRaWAN_End_Node</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>LoRaWAN_End_Node\</OutputDirectory>
+          <OutputName>LoRaWAN_End_Node</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\1_Image_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>1</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x20008000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,STM32WL55xx,USE_HAL_DRIVER,KMS_ENABLED,DISABLE_IMAGE_STATE_HANDLING</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Core/Inc;../LoRaWAN/App;../LoRaWAN/Target;../KMS/App;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../1_Image_SECoreBin/Inc;../../1_Image_BFU/BFU/App;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>stm32wl55xx_flash_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/sys_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/sys_debug.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_sensors.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/sys_sensors.c</FilePath>
+            </File>
+            <File>
+              <FileName>timer_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/timer_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/adc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/usart_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/usart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>flash_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Core\Src\flash_if.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/LoRaWAN/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_board_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/Target/radio_board_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>frag_decoder_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\LoRaWAN\Target\frag_decoder_if.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/LoRaWAN/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_lorawan.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/App/app_lorawan.c</FilePath>
+            </File>
+            <File>
+              <FileName>CayenneLpp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/App/CayenneLpp.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/App/lora_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_info.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../LoRaWAN/App/lora_info.c</FilePath>
+            </File>
+            <File>
+              <FileName>fw_update_agent.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\LoRaWAN\App\fw_update_agent.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_adc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/LoRaWAN</GroupName>
+          <Files>
+            <File>
+              <FileName>LmhpCompliance.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</FilePath>
+            </File>
+            <File>
+              <FileName>cmac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</FilePath>
+            </File>
+            <File>
+              <FileName>lorawan_aes.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</FilePath>
+            </File>
+            <File>
+              <FileName>soft-se.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</FilePath>
+            </File>
+            <File>
+              <FileName>Region.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionAS923.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionAU915.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionBaseUS.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCN470.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCN779.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCommon.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionEU433.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionEU868.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionIN865.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionKR920.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionRU864.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionUS915.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacAdr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacClassB.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCommands.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCrypto.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacParser.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacSerializer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmHandler.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</FilePath>
+            </File>
+            <File>
+              <FileName>NvmDataMgmt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</FilePath>
+            </File>
+            <File>
+              <FileName>utilities.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</FilePath>
+            </File>
+            <File>
+              <FileName>FragDecoder.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpClockSync.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpFirmwareManagement.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpFragmentation.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpRemoteMcastSetup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpPackagesRegistration.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpPackagesRegistration.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/SubGHz_Phy</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_driver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32_adv_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_systime.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/KMS/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\KMS\App\app_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_appli.txt</FileName>
+              <FileType>3</FileType>
+              <FilePath>..\..\1_Image_BFU\MDK-ARM\STM32WL55JC_Nucleo\Exe\se_interface_appli.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="LoRaWAN_End_Node"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..6211ae07
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,371 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x800
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x200
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/stm32wl55xx_flash_cm4.sct
new file mode 100644
index 00000000..ae1c9d85
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -0,0 +1,31 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_IROM1 (SLOT_ACTIVE_1_START + 0x200)  {    ; load region size_region
+  ; FLASH
+  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
+   *.o (RESET, +First)
+     }
+  ROM_region +0 {
+   *(InRoot$$Sections)
+   .ANY (+RO)
+  }
+  ; Non-backup SRAM1
+  RW_IRAM1 SB_REGION_RAM_START SB_RAM_REGION_SIZE  {  ; RW data
+   .ANY (+RW +ZI)
+  }
+  ; Backup SRAM2
+  RW_IRAM2 0x20008000 EMPTY 0x00008000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+  }
+}
+  
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..560f223d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/.cproject
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../1_Image_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1245189394" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1668122417" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.377546145" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.653319510" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1155291299" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.2103610047" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/Target | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../LoRaWAN/App | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Drivers/CMSIS/Include ||  ||  || STM32WL55xx | CORE_CM4 | USE_HAL_DRIVER ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.611324519" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.216780214" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.288747390" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.344559782" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.414389759" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.185590387" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.996713053" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1022522097" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2089215826" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="DISABLE_IMAGE_STATE_HANDLING"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1934557908" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../LoRaWAN/App"/>
+									<listOptionValue builtIn="false" value="../../LoRaWAN/Target"/>
+									<listOptionValue builtIn="false" value="../../KMS/App"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/BFU/App"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata.1985855385" name="Place data in their own sections (-fdata-sections)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.328304571" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.2102620077" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1864097544" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.449860308" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1944207685" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1421055350" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.750279248" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.124436110" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs">
+									<listOptionValue builtIn="false" value="../../../1_Image_BFU/STM32CubeIDE/Debug/se_interface_app.o"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.796162615" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.761461515" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1642893864" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1053549156" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.833122807" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.536155632" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1555106420" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.91181407" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.16306751" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1950275040" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="LoRaWAN_End_Node.null.790240540" name="LoRaWAN_End_Node"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.548833444.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.185590387;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.328304571">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/.project
new file mode 100644
index 00000000..3ce509b4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/.project
@@ -0,0 +1,516 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LoRaWAN_End_Node</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/FragDecoder.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LmHandler.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LmhpClockSync.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LmhpCompliance.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LmhpFirmwareManagement.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFirmwareManagement.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LmhpFragmentation.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LmhpPackagesRegistration.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpPackagesRegistration.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LmhpRemoteMcastSetup.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LoRaMac.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LoRaMacAdr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LoRaMacClassB.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LoRaMacCommands.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LoRaMacConfirmQueue.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LoRaMacCrypto.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LoRaMacParser.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/LoRaMacSerializer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/NvmDataMgmt.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/Region.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionAS923.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionAU915.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionBaseUS.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionCN470.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionCN779.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionCommon.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionEU433.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionEU868.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionIN865.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionKR920.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionRU864.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/RegionUS915.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/cmac.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/lorawan_aes.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/soft-se.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/LoRaWAN/utilities.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/1_Image_BFU/STM32CubeIDE/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/adc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/adc_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/flash_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/flash_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_sensors.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_sensors.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/timer_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/KMS/App/app_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/KMS/App/app_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/CayenneLpp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/CayenneLpp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/app_lorawan.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/fw_update_agent.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/fw_update_agent.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/lora_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/lora_info.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/App/lora_info.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/Target/frag_decoder_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/Target/frag_decoder_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/Target/radio_board_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/LoRaWAN/Target/radio_board_if.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..4ba12151
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,209 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
+
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x800 ; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  ISR_VECTOR (rx)    : ORIGIN = (SLOT_Active_1_start + 0x200), LENGTH = Vector_size
+  FLASH  (xrw)   : ORIGIN = (SLOT_Active_1_start + Vector_size + 0x200), LENGTH = (SLOT_Active_1_end - SLOT_Active_1_start + 1 - 0x200 - Vector_size)
+  RAM1  (xrw)   : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    FILL(0);
+    . = ORIGIN(ISR_VECTOR) + LENGTH(ISR_VECTOR) - 1;
+    BYTE(0)
+    . = ALIGN(4);
+  } >ISR_VECTOR
+
+  .SE_IF_Code : {
+    KEEP(*se_interface_app.o (.text .text*))
+    KEEP(*se_interface_kms.o (.text .text*))
+  } >SE_IF_ROM_region
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM1 AT> FLASH
+  
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >FLASH
+  
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM1
+
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM1
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/readme.txt
new file mode 100644
index 00000000..0956b7d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/readme.txt
@@ -0,0 +1,165 @@
+/**
+  @page LoRaWAN_End_Node Readme file
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
+  * @file    Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node/readme.txt
+  * @author  MCD Application Team
+  * @brief   This application is a simple demo application software of a LoRa
+  *          modem connecting to Network server with firmware update over the air download capabilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Description
+
+This directory contains a set of source files that implements a LoRa application
+device with firmware update over the air download capabilities.
+
+For more details, refer to AN5554 "LoRaWAN firmware update over the air with STM32CubeWL" available from
+the STMicroelectronics microcontroller website www.st.com.
+
+This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
+  ******************************************************************************
+
+@par Keywords
+
+Applications, SubGHz_Phy, LoRaWAN, End_Node, SingleCore, FUOTA, BFU, KMS
+
+@par Directory contents
+
+
+  - LoRaWAN_End_Node/Core/Inc/adc.h                                             This file contains all the function prototypes for
+                                                                                the adc.c file
+  - LoRaWAN_End_Node/Core/Inc/adc_if.h                                          Header for ADC interface configuration
+  - LoRaWAN_End_Node/Core/Inc/dma.h                                             This file contains all the function prototypes for
+                                                                                the dma.c file
+  - LoRaWAN_End_Node/Core/Inc/flash_if.h                                        This file contains definitions for FLASH Interface functionalities.
+  - LoRaWAN_End_Node/Core/Inc/kms_if.h                                          This file contains kms interfaces with middleware
+  - LoRaWAN_End_Node/Core/Inc/main.h                                            : Header for main.c file.
+                                                                                This file contains the common defines of the application.
+  - LoRaWAN_End_Node/Core/Inc/platform.h                                        Header for General HW instances configuration
+  - LoRaWAN_End_Node/Core/Inc/rtc.h                                             This file contains all the function prototypes for
+                                                                                the rtc.c file
+  - LoRaWAN_End_Node/Core/Inc/stm32wlxx_hal_conf.h                              HAL configuration file.
+  - LoRaWAN_End_Node/Core/Inc/stm32wlxx_it.h                                    This file contains the headers of the interrupt handlers.
+  - LoRaWAN_End_Node/Core/Inc/stm32wlxx_nucleo_conf.h                           STM32WLxx_Nucleo board configuration file.
+  - LoRaWAN_End_Node/Core/Inc/stm32_lpm_if.h                                    Header for Low Power Manager interface configuration
+  - LoRaWAN_End_Node/Core/Inc/subghz.h                                          This file contains all the function prototypes for
+                                                                                the subghz.c file
+  - LoRaWAN_End_Node/Core/Inc/sys_app.h                                         Function prototypes for sys_app.c file
+  - LoRaWAN_End_Node/Core/Inc/sys_conf.h                                        Applicative configuration, e.g. : debug, trace, low power, sensors
+  - LoRaWAN_End_Node/Core/Inc/sys_debug.h                                       Configuration of the debug.c instances
+  - LoRaWAN_End_Node/Core/Inc/sys_sensors.h                                     Header for sensors application
+  - LoRaWAN_End_Node/Core/Inc/timer_if.h                                        configuration of the timer_if.c instances
+  - LoRaWAN_End_Node/Core/Inc/usart.h                                           This file contains all the function prototypes for
+                                                                                the usart.c file
+  - LoRaWAN_End_Node/Core/Inc/usart_if.h                                        Header for USART interface configuration
+  - LoRaWAN_End_Node/Core/Inc/utilities_conf.h                                  Header for configuration file to utilities
+  - LoRaWAN_End_Node/Core/Inc/utilities_def.h                                   Definitions for modules requiring utilities
+  - LoRaWAN_End_Node/KMS/App/app_kms.h                                          !!! No description found !!!
+  - LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.h                                  Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node/LoRaWAN/App/CayenneLpp.h                                   Implements the Cayenne Low Power Protocol
+  - LoRaWAN_End_Node/LoRaWAN/App/Commissioning.h                                End-device commissioning parameters
+  - LoRaWAN_End_Node/LoRaWAN/App/fw_update_agent.h                              This file provides set of functions to manage Firmware Update functionalities.
+  - LoRaWAN_End_Node/LoRaWAN/App/lora_app.h                                     Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node/LoRaWAN/App/lora_app_version.h                             Definition the version of the application
+  - LoRaWAN_End_Node/LoRaWAN/App/lora_info.h                                    To give info to the application about LoRaWAN configuration
+  - LoRaWAN_End_Node/LoRaWAN/App/se-identity.h                                  Secure Element identity and keys
+  - LoRaWAN_End_Node/LoRaWAN/Target/frag_decoder_if.h                           Applicative interfaces of LoRa-Alliance fragmentation decoder
+  - LoRaWAN_End_Node/LoRaWAN/Target/lorawan_conf.h                              Header for LoRaWAN middleware instances
+  - LoRaWAN_End_Node/LoRaWAN/Target/mw_log_conf.h                               Configure (enable/disable) traces for CM0
+  - LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.h                            Header for Radio interface configuration
+  - LoRaWAN_End_Node/LoRaWAN/Target/radio_conf.h                                Header of Radio configuration
+  - LoRaWAN_End_Node/LoRaWAN/Target/systime.h                                   Map middleware systime
+  - LoRaWAN_End_Node/LoRaWAN/Target/timer.h                                     Wrapper to timer server
+
+  - LoRaWAN_End_Node/Core/Src/adc.c                                             This file provides code for the configuration
+                                                                                of the ADC instances.
+  - LoRaWAN_End_Node/Core/Src/adc_if.c                                          Read status related to the chip (battery level, VREF, chip temperature)
+  - LoRaWAN_End_Node/Core/Src/dma.c                                             This file provides code for the configuration
+                                                                                of all the requested memory to memory DMA transfers.
+  - LoRaWAN_End_Node/Core/Src/flash_if.c                                        This file provides set of firmware functions to manage Flash
+                                                                                Interface functionalities.
+  - LoRaWAN_End_Node/Core/Src/main.c                                            : Main program body
+  - LoRaWAN_End_Node/Core/Src/rtc.c                                             This file provides code for the configuration
+                                                                                of the RTC instances.
+  - LoRaWAN_End_Node/Core/Src/stm32wlxx_hal_msp.c                               This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
+  - LoRaWAN_End_Node/Core/Src/stm32wlxx_it.c                                    Interrupt Service Routines.
+  - LoRaWAN_End_Node/Core/Src/stm32_lpm_if.c                                    Low layer function to enter/exit low power modes (stop, sleep)
+  - LoRaWAN_End_Node/Core/Src/subghz.c                                          This file provides code for the configuration
+                                                                                of the SUBGHZ instances.
+  - LoRaWAN_End_Node/Core/Src/system_stm32wlxx.c                                CMSIS Cortex Device Peripheral Access Layer System Source File
+  - LoRaWAN_End_Node/Core/Src/sys_app.c                                         Initializes HW and SW system entities (not related to the radio)
+  - LoRaWAN_End_Node/Core/Src/sys_debug.c                                       Enables 4 debug pins for internal signals RealTime debugging
+  - LoRaWAN_End_Node/Core/Src/sys_sensors.c                                     Manages the sensors on the application
+  - LoRaWAN_End_Node/Core/Src/timer_if.c                                        Configure RTC Alarm, Tick and Calendar manager
+  - LoRaWAN_End_Node/Core/Src/usart.c                                           This file provides code for the configuration
+                                                                                of the USART instances.
+  - LoRaWAN_End_Node/Core/Src/usart_if.c                                        Configuration of UART driver interface for hyperterminal communication
+  - LoRaWAN_End_Node/KMS/App/app_kms.c                                          !!! No description found !!!
+  - LoRaWAN_End_Node/LoRaWAN/App/app_lorawan.c                                  Application of the LRWAN Middleware
+  - LoRaWAN_End_Node/LoRaWAN/App/CayenneLpp.c                                   Implements the Cayenne Low Power Protocol
+  - LoRaWAN_End_Node/LoRaWAN/App/fw_update_agent.c                              This file provides set of functions to manage Firmware Update functionalities.
+  - LoRaWAN_End_Node/LoRaWAN/App/lora_app.c                                     Application of the LRWAN Middleware
+  - LoRaWAN_End_Node/LoRaWAN/App/lora_info.c                                    To give info to the application about LoRaWAN configuration
+  - LoRaWAN_End_Node/LoRaWAN/Target/frag_decoder_if.c                           Implements the Data Distribution Agent
+  - LoRaWAN_End_Node/LoRaWAN/Target/radio_board_if.c                            This file provides an interface layer between MW and Radio Board
+  - LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/syscalls.c              STM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node/STM32CubeIDE/Application/User/Core/sysmem.c                STM32CubeIDE System Memory calls file
+
+
+@par Hardware and Software environment
+
+  - This example runs on the STM32WLxx Nucleo board.
+
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
+      to ST-LINK connector.
+    - Please ensure that the ST-LINK connector jumpers are fitted.
+
+  - Configure the software via the configuration files:
+    - sys_conf.h, radio_conf.h, lorawan_conf.h, lora_app.h, Commissioning.h, se-identity.h, mw_log_conf.h, main.h, etc
+    - Careful:
+        - the region and class chosen on LoRaWAN/App/lora_app.h shall be compatible with LoRaWAN/Target/lorawan_conf.h list
+
+  -Set Up:
+
+             --------------------------  V    V  --------------------------
+             |      LoRa Object       |  |    |  |      LoRa Network      |
+             |                        |  |    |  |                        |
+   ComPort<--|                        |--|    |--|                        |-->Web Server
+             |                        |          |                        |
+             --------------------------          --------------------------
+
+@par How to use it ?
+In order to make the program work, you must do the following :
+  - use the script \Scripts\<MyPreferredToolchain>\build.bat to rebuild the SBSFU and the LoRaWAN projects
+  - use the script \Scripts\<MyPreferredToolchain>\program.bat to download the big binary on target device
+  - Reset the system
+  - Run the example
+  - Open a Terminal, connected the LoRa Object
+  - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
+
+@par How to debug ?
+  - change or undefine following definitions in above files:
+  -  in .\LoRaWAN_End_Node\Core\Inc\sys_conf.h
+       #define DEBUGGER_ENABLED 1
+       #define LOW_POWER_DISABLE 1 (optional)
+  - use the script \Scripts\<MyPreferredToolchain>\build.bat to rebuild the SBSFU and the LoRaWAN projects
+  - use the script \Scripts\<MyPreferredToolchain>\program.bat to download the big binary on target device
+  - SBSFU run first then LoRaWAN_End_Node starts
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h
deleted file mode 100644
index 438b21a0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    cmsis_nvic_virtual.h
-  * @brief   Maps the NVIC functions on _SVC for Unpriviledge usage
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __CMSIS_NVIC_VIRTUAL_H__
-#define __CMSIS_NVIC_VIRTUAL_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "sys_privileged_wrap.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-  #define NVIC_SetPriorityGrouping    __NVIC_SetPriorityGrouping
-  #define NVIC_GetPriorityGrouping    __NVIC_GetPriorityGrouping
-  #define NVIC_EnableIRQ              SYS_PRIVIL_NVIC_EnableIRQ
-  #define NVIC_GetEnableIRQ           SYS_PRIVIL_NVIC_GetEnableIRQ
-  #define NVIC_DisableIRQ             SYS_PRIVIL_NVIC_DisableIRQ
-  #define NVIC_GetPendingIRQ          SYS_PRIVIL_NVIC_GetPendingIRQ
-  #define NVIC_SetPendingIRQ          SYS_PRIVIL_NVIC_SetPendingIRQ
-  #define NVIC_ClearPendingIRQ        SYS_PRIVIL_NVIC_ClearPendingIRQ
-/*#define NVIC_GetActive              __NVIC_GetActive             not available for Cortex-M0+ */
-  #define NVIC_SetPriority            SYS_PRIVIL_NVIC_SetPriority
-  #define NVIC_GetPriority            SYS_PRIVIL_NVIC_GetPriority
-  #define NVIC_SystemReset            SYS_PRIVIL_NVIC_SystemReset
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CMSIS_NVIC_VIRTUAL_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/flash_if.h
deleted file mode 100644
index f9132c86..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/flash_if.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    flash_if.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for FLASH Interface functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __FLASH_IF_H__
-#define __FLASH_IF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* External variables --------------------------------------------------------*/
-/* Exported macros -----------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-/**
-  * @brief  This function does an erase of n (depends on Length) pages in user flash area
-  * @param  pStart: Start of user flash area
-  * @param  uLength: number of bytes.
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_Erase(void *pStart, uint32_t uLength);
-
-/**
-  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
-  * @note   After writing data buffer, the flash content is checked.
-  * @param  pDestination: Start address for target location
-  * @param  pSource: pointer on buffer with data to write
-  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_Write(uint32_t pDestination, uint8_t *pSource, uint32_t uLength);
-
-/**
-  * @brief  This function reads flash
-  * @param  pDestination: Start address for target location
-  * @param  pSource: pointer on buffer with data to write
-  * @param  Length: Length in bytes of data buffer
-  * @retval HAL_StatusTypeDef HAL_OK if successful, HAL_ERROR otherwise.
-  */
-HAL_StatusTypeDef FLASH_Read(void *pDestination, const void *pSource, uint32_t Length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __FLASH_IF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
deleted file mode 100644
index b784032b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ipcc.h
-  * @brief   This file contains all the function prototypes for
-  *          the ipcc.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __IPCC_H__
-#define __IPCC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-extern IPCC_HandleTypeDef hipcc;
-
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-void MX_IPCC_Init(void);
-
-/* USER CODE BEGIN Prototypes */
-
-/* USER CODE END Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __IPCC_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
deleted file mode 100644
index 45049335..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ipcc_if.h
-  * @author  MCD Application Team
-  * @brief   This file contains the interface of the ipcc driver on CM0PLUS.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __IPCC_IF_CM0PLUS_H__
-#define __IPCC_IF_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "ipcc.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief Initialise IPCC and register upper and downer callbacks
-  * @param  IPCC_IF_CommandRcv_cb     command callback
-  * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
-  */
-void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
-                  void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
-
-/**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
-  * @param channelIdx  ipcc channel
-  * @return ipcc channel status
-  * @retval IPCC_CHANNEL_STATUS_FREE 0
-  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
-  */
-uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
-
-/**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
-  * @param channelIdx  ipcc channel
-  * @return ipcc channel status
-  * @retval IPCC_CHANNEL_STATUS_FREE 0
-  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
-  */
-uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
-
-/**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
-  * @param channelIdx  ipcc channel
-  * @return ipcc status [OK: 0 , fail: -1]
-  */
-int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
-
-/**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
-  * @param channelIdx  ipcc channel
-  * @return ipcc status [OK: 0 , fail: -1]
-  */
-int32_t IPCC_IF_ResponseSnd(uint32_t channelIdx);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __IPCC_IF_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
deleted file mode 100644
index 887461f1..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    kms_if.h
-  * @author  MCD Application Team
-  * @brief   This file contains kms interfaces with middleware
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef KMS_IF_H
-#define KMS_IF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-
-#include "kms.h"
-#include "tkms.h"
-#include "se_interface_kms.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* KMS_IF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
deleted file mode 100644
index 19dd412d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file           : main.h
-  * @brief          : Header for main.c file.
-  *                   This file contains the common defines of the application.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MAIN_H
-#define __MAIN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-#include "app_kms.h"
-
-#include "board_resources.h"
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void Error_Handler(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-/* Private defines -----------------------------------------------------------*/
-#define RTC_N_PREDIV_S 10
-#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
-#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MAIN_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
deleted file mode 100644
index 58961ffb..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    platform.h
-  * @author  MCD Application Team
-  * @brief   Header for General HW instances configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __PLATFORM_H__
-#define __PLATFORM_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdbool.h>
-#include "stm32wlxx.h"
-#include "main.h"
-#include "stm32wlxx_ll_gpio.h"
-#if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
-/* In order to use BSP, users can add the BSP files in the IDE project space */
-/* and define USE_BSP_DRIVER in the preprocessor definitions  */
-#include "stm32wlxx_nucleo.h"
-#include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
-#endif /* defined(USE_BSP_DRIVER) */
-
-/* USER CODE BEGIN include */
-
-/* USER CODE END include */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __PLATFORM_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
deleted file mode 100644
index 632d0e57..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    rtc.h
-  * @brief   This file contains all the function prototypes for
-  *          the rtc.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __RTC_H__
-#define __RTC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-extern RTC_HandleTypeDef hrtc;
-
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-void MX_RTC_Init(void);
-
-/* USER CODE BEGIN Prototypes */
-
-/* USER CODE END Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __RTC_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
deleted file mode 100644
index b7c44f5d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32_lpm_if.h
-  * @author  MCD Application Team
-  * @brief   Header for Low Power Manager interface configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32_LPM_IF_H__
-#define __STM32_LPM_IF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_lpm.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief Enters Low Power Off Mode
-  */
-void PWR_EnterOffMode(void);
-
-/**
-  * @brief Exits Low Power Off Mode
-  */
-void PWR_ExitOffMode(void);
-
-/**
-  * @brief Enters Low Power Stop Mode
-  * @note ARM exists the function when waking up
-  */
-void PWR_EnterStopMode(void);
-
-/**
-  * @brief Exits Low Power Stop Mode
-  * @note Enable the pll at 32MHz
-  */
-void PWR_ExitStopMode(void);
-
-/**
-  * @brief Enters Low Power Sleep Mode
-  * @note ARM exits the function when waking up
-  */
-void PWR_EnterSleepMode(void);
-
-/**
-  * @brief Exits Low Power Sleep Mode
-  * @note ARM exits the function when waking up
-  */
-void PWR_ExitSleepMode(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__STM32_LPM_IF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
deleted file mode 100644
index fa9f299f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_hal_conf.h
-  * @author  MCD Application Team
-  * @brief   HAL configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLxx_HAL_CONF_H
-#define STM32WLxx_HAL_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-
-/* ########################## Module Selection ############################## */
-/**
-  * @brief This is the list of modules to be used in the HAL driver
-  */
-#define HAL_MODULE_ENABLED
-/*#define HAL_ADC_MODULE_ENABLED   */
-/*#define HAL_COMP_MODULE_ENABLED   */
-/*#define HAL_CRC_MODULE_ENABLED   */
-#define HAL_CRYP_MODULE_ENABLED
-/*#define HAL_DAC_MODULE_ENABLED   */
-#define HAL_GTZC_MODULE_ENABLED
-/*#define HAL_HSEM_MODULE_ENABLED   */
-/*#define HAL_I2C_MODULE_ENABLED   */
-/*#define HAL_I2S_MODULE_ENABLED   */
-#define HAL_IPCC_MODULE_ENABLED
-/*#define HAL_IRDA_MODULE_ENABLED   */
-/*#define HAL_IWDG_MODULE_ENABLED   */
-/*#define HAL_LPTIM_MODULE_ENABLED   */
-/*#define HAL_PKA_MODULE_ENABLED   */
-/*#define HAL_RNG_MODULE_ENABLED   */
-#define HAL_RTC_MODULE_ENABLED
-/*#define HAL_SMARTCARD_MODULE_ENABLED   */
-/*#define HAL_SMBUS_MODULE_ENABLED   */
-/*#define HAL_SPI_MODULE_ENABLED   */
-#define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
-/*#define HAL_UART_MODULE_ENABLED   */
-/*#define HAL_USART_MODULE_ENABLED   */
-/*#define HAL_WWDG_MODULE_ENABLED   */
-#define HAL_EXTI_MODULE_ENABLED
-#define HAL_CORTEX_MODULE_ENABLED
-#define HAL_DMA_MODULE_ENABLED
-#define HAL_FLASH_MODULE_ENABLED
-#define HAL_GPIO_MODULE_ENABLED
-#define HAL_PWR_MODULE_ENABLED
-#define HAL_RCC_MODULE_ENABLED
-
-/* ########################## Register Callbacks selection ############################## */
-/**
-  * @brief This is the list of modules where register callback can be used
-  */
-#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
-#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
-#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
-#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
-#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
-#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
-#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
-#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
-#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
-#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
-#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
-#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
-#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
-#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
-#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
-#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
-#define USE_HAL_UART_REGISTER_CALLBACKS        0u
-#define USE_HAL_USART_REGISTER_CALLBACKS       0u
-#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
-
-/* ########################## Oscillator Values adaptation ####################*/
-/**
-  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
-  *        This value is used by the RCC HAL module to compute the system frequency
-  *        (when HSE is used as system clock source, directly or through the PLL).
-  */
-
-#if !defined (HSE_VALUE)
-#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
-#endif /* HSE_VALUE */
-
-#if !defined (HSE_STARTUP_TIMEOUT)
-#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
-#endif /* HSE_STARTUP_TIMEOUT */
-
-/**
-  * @brief Internal Multiple Speed oscillator (MSI) default value.
-  *        This value is the default MSI range value after Reset.
-  */
-#if !defined  (MSI_VALUE)
-#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
-#endif /* MSI_VALUE */
-
-/**
-  * @brief Internal High Speed oscillator (HSI) value.
-  *        This value is used by the RCC HAL module to compute the system frequency
-  *        (when HSI is used as system clock source, directly or through the PLL).
-  */
-#if !defined  (HSI_VALUE)
-#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
-#endif /* HSI_VALUE */
-
-/**
-  * @brief Internal Low Speed oscillator (LSI) value.
-  */
-#if !defined (LSI_VALUE)
-#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
-#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
-                                                        The real value may vary depending on the variations
-                                                        in voltage and temperature. */
-
-/**
-  * @brief External Low Speed oscillator (LSE) value.
-  *        This value is used by the UART, RTC HAL module to compute the system frequency
-  */
-#if !defined (LSE_VALUE)
-#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
-#endif /* LSE_VALUE */
-
-/**
-  * @brief Internal Multiple Speed oscillator (HSI48) default value.
-  *        This value is the default HSI48 range value after Reset.
-  */
-#if !defined (HSI48_VALUE)
-#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
-#endif /* HSI48_VALUE */
-
-#if !defined (LSE_STARTUP_TIMEOUT)
-#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
-#endif /* LSE_STARTUP_TIMEOUT */
-
-/* Tip: To avoid modifying this file each time you need to use different HSE,
-   ===  you can define the HSE value in your toolchain compiler preprocessor. */
-
-/* ########################### System Configuration ######################### */
-/**
-  * @brief This is the HAL system configuration section
-  */
-#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
-#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
-#define  USE_RTOS                           0U
-#define  PREFETCH_ENABLE                    0U
-#define  INSTRUCTION_CACHE_ENABLE           1U
-#define  DATA_CACHE_ENABLE                  1U
-
-/* ########################## Assert Selection ############################## */
-/**
-  * @brief Uncomment the line below to expanse the "assert_param" macro in the
-  *        HAL drivers code
-  */
-/* #define USE_FULL_ASSERT    1 */
-
-/* ################## SPI peripheral configuration ########################## */
-
-/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
- * Activated: CRC code is present inside driver
- * Deactivated: CRC code cleaned from driver
- */
-
-#define USE_SPI_CRC                         1U
-
-/* ################## CRYP peripheral configuration ########################## */
-
-#define USE_HAL_CRYP_SUSPEND_RESUME         1U
-
-/* Includes ------------------------------------------------------------------*/
-/**
-  * @brief Include module's header file
-  */
-#ifdef HAL_DMA_MODULE_ENABLED
-  #include "stm32wlxx_hal_dma.h"
-#endif /* HAL_DMA_MODULE_ENABLED */
-
-#ifdef HAL_ADC_MODULE_ENABLED
-  #include "stm32wlxx_hal_adc.h"
-#endif /* HAL_ADC_MODULE_ENABLED */
-
-#ifdef HAL_COMP_MODULE_ENABLED
-  #include "stm32wlxx_hal_comp.h"
-#endif /* HAL_COMP_MODULE_ENABLED */
-
-#ifdef HAL_CORTEX_MODULE_ENABLED
-  #include "stm32wlxx_hal_cortex.h"
-#endif /* HAL_CORTEX_MODULE_ENABLED */
-
-#ifdef HAL_CRC_MODULE_ENABLED
-  #include "stm32wlxx_hal_crc.h"
-#endif /* HAL_CRC_MODULE_ENABLED */
-
-#ifdef HAL_CRYP_MODULE_ENABLED
-  #include "stm32wlxx_hal_cryp.h"
-#endif /* HAL_CRYP_MODULE_ENABLED */
-
-#ifdef HAL_DAC_MODULE_ENABLED
-  #include "stm32wlxx_hal_dac.h"
-#endif /* HAL_DAC_MODULE_ENABLED */
-
-#ifdef HAL_EXTI_MODULE_ENABLED
-  #include "stm32wlxx_hal_exti.h"
-#endif /* HAL_EXTI_MODULE_ENABLED */
-
-#ifdef HAL_FLASH_MODULE_ENABLED
-  #include "stm32wlxx_hal_flash.h"
-#endif /* HAL_FLASH_MODULE_ENABLED */
-
-#ifdef HAL_GPIO_MODULE_ENABLED
-  #include "stm32wlxx_hal_gpio.h"
-#endif /* HAL_GPIO_MODULE_ENABLED */
-
-#ifdef HAL_GTZC_MODULE_ENABLED
-  #include "stm32wlxx_hal_gtzc.h"
-#endif /* HAL_GTZC_MODULE_ENABLED */
-
-#ifdef HAL_HSEM_MODULE_ENABLED
-  #include "stm32wlxx_hal_hsem.h"
-#endif /* HAL_HSEM_MODULE_ENABLED */
-
-#ifdef HAL_I2C_MODULE_ENABLED
-  #include "stm32wlxx_hal_i2c.h"
-#endif /* HAL_I2C_MODULE_ENABLED */
-
-#ifdef HAL_I2S_MODULE_ENABLED
-  #include "stm32wlxx_hal_i2s.h"
-#endif /* HAL_I2S_MODULE_ENABLED */
-
-#ifdef HAL_IPCC_MODULE_ENABLED
-  #include "stm32wlxx_hal_ipcc.h"
-#endif /* HAL_IPCC_MODULE_ENABLED */
-
-#ifdef HAL_IRDA_MODULE_ENABLED
-  #include "stm32wlxx_hal_irda.h"
-#endif /* HAL_IRDA_MODULE_ENABLED */
-
-#ifdef HAL_IWDG_MODULE_ENABLED
-  #include "stm32wlxx_hal_iwdg.h"
-#endif /* HAL_IWDG_MODULE_ENABLED */
-
-#ifdef HAL_LPTIM_MODULE_ENABLED
-  #include "stm32wlxx_hal_lptim.h"
-#endif /* HAL_LPTIM_MODULE_ENABLED */
-
-#ifdef HAL_PKA_MODULE_ENABLED
-  #include "stm32wlxx_hal_pka.h"
-#endif /* HAL_PKA_MODULE_ENABLED */
-
-#ifdef HAL_PWR_MODULE_ENABLED
-  #include "stm32wlxx_hal_pwr.h"
-#endif /* HAL_PWR_MODULE_ENABLED */
-
-#ifdef HAL_RCC_MODULE_ENABLED
-  #include "stm32wlxx_hal_rcc.h"
-#endif /* HAL_RCC_MODULE_ENABLED */
-
-#ifdef HAL_RNG_MODULE_ENABLED
-  #include "stm32wlxx_hal_rng.h"
-#endif /* HAL_RNG_MODULE_ENABLED */
-
-#ifdef HAL_RTC_MODULE_ENABLED
-  #include "stm32wlxx_hal_rtc.h"
-#endif /* HAL_RTC_MODULE_ENABLED */
-
-#ifdef HAL_SMARTCARD_MODULE_ENABLED
-  #include "stm32wlxx_hal_smartcard.h"
-#endif /* HAL_SMARTCARD_MODULE_ENABLED */
-
-#ifdef HAL_SMBUS_MODULE_ENABLED
-  #include "stm32wlxx_hal_smbus.h"
-#endif /* HAL_SMBUS_MODULE_ENABLED */
-
-#ifdef HAL_SPI_MODULE_ENABLED
-  #include "stm32wlxx_hal_spi.h"
-#endif /* HAL_SPI_MODULE_ENABLED */
-
-#ifdef HAL_SUBGHZ_MODULE_ENABLED
-  #include "stm32wlxx_hal_subghz.h"
-#endif /* HAL_SUBGHZ_MODULE_ENABLED */
-
-#ifdef HAL_TIM_MODULE_ENABLED
-  #include "stm32wlxx_hal_tim.h"
-#endif /* HAL_TIM_MODULE_ENABLED */
-
-#ifdef HAL_UART_MODULE_ENABLED
-  #include "stm32wlxx_hal_uart.h"
-#endif /* HAL_UART_MODULE_ENABLED */
-
-#ifdef HAL_USART_MODULE_ENABLED
-  #include "stm32wlxx_hal_usart.h"
-#endif /* HAL_USART_MODULE_ENABLED */
-
-#ifdef HAL_WWDG_MODULE_ENABLED
-  #include "stm32wlxx_hal_wwdg.h"
-#endif /* HAL_WWDG_MODULE_ENABLED */
-
-/* Exported macro ------------------------------------------------------------*/
-#ifdef USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param expr If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
-/* Exported functions ------------------------------------------------------- */
-  void assert_failed(uint8_t* file, uint32_t line);
-#else
-  #define assert_param(expr) ((void)0U)
-#endif /* USE_FULL_ASSERT */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLxx_HAL_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
deleted file mode 100644
index f9a63224..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    subghz.h
-  * @brief   This file contains all the function prototypes for
-  *          the subghz.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SUBGHZ_H__
-#define __SUBGHZ_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-extern SUBGHZ_HandleTypeDef hsubghz;
-
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-void MX_SUBGHZ_Init(void);
-
-/* USER CODE BEGIN Prototypes */
-
-/* USER CODE END Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SUBGHZ_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
deleted file mode 100644
index 2ed00a30..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_app.h
-  * @author  MCD Application Team
-  * @brief   Function prototypes for sys_app.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SYS_APP_H__
-#define __SYS_APP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmux_table.h"
-#include "sys_conf.h"
-#include "stm32_adv_trace.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported defines ----------------------------------------------------------*/
-/* currently not supported */
-/* #define ALLOW_KMS_VIA_MBMUX */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macros -----------------------------------------------------------*/
-#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
-#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
-
-#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
-#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
-#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
-#define APP_LOG(TS,VL,...)
-#else
-#error "APP_LOG_ENABLED not defined or out of range <0,1>"
-#endif /* APP_LOG_ENABLED */
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
-void SystemApp_Init(void);
-
-/**
-  * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
-  */
-void GetUniqueId(uint8_t *id);
-
-/**
-  * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
-  * @retval devAddr Device Address
-  */
-uint32_t GetDevAddr(void);
-
-void TimestampNow(uint8_t *buff, uint16_t *size);
-void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
-#endif /* ALLOW_KMS_VIA_MBMUX */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SYS_APP_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
deleted file mode 100644
index 3f1bdd7c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_conf.h
-  * @author  MCD Application Team
-  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SYS_CONF_H__
-#define __SYS_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-
-/**
-  * @brief CM0PLUS Verbose level for all trace logs
-  */
-#define VERBOSE_LEVEL     VLEVEL_M
-
-/**
-  * @brief Enable trace logs
-  */
-#define APP_LOG_ENABLED   1
-
-/**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
-  */
-#define DEBUGGER_ON       0
-
-/**
-  * @brief Disable Low Power mode
-  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
-  */
-#define LOW_POWER_DISABLE 0
-
-/**
-  * @brief Enable unprivilege mode
-  * @note 1: execute the code in unprivileged mode, 0: execute the code fully in privileged mode
-  */
-#if (__ARMCC_VERSION)
-#define SECURE_UNPRIVILEGE_ENABLE       0
-#else
-#define SECURE_UNPRIVILEGE_ENABLE       1
-#endif /*__ARMCC_VERSION */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SYS_CONF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h
deleted file mode 100644
index 61334aec..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_privileged_services.h
-  * @brief   Maps sys_privileged_wrap functions on SVC and API to cortex services
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SYS_PRIVILEGED_SERVICES_H__
-#define __SYS_PRIVILEGED_SERVICES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "platform.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-#define SFU_ISOLATE_SE_WITH_MPU
-
-#define SVC_SE_APP_X_KMS                     0x0
-#define SVC_HAL_MPU_DISABLE                  0x1
-#define SVC_DISABLE_ALL_NVIC_IRQS            0x2
-#define SVC_RESTORE_NVIC_IRQS                0x3
-#define SVC_DISABLE_ALL_EXCEPTIONS           0x4
-#define SVC_SUBGHZ_INIT                      0x5
-
-#define SVC_NVIC_ENABLE_IRQ                 0x10
-#define SVC_NVIC_GET_ENABLE_IRQ             0x11
-#define SVC_NVIC_DISABLE_IRQ                0x12
-#define SVC_NVIC_GET_PENDING_IRQ            0x13
-#define SVC_NVIC_SET_PENDING_IRQ            0x14
-#define SVC_NVIC_CLEAR_PENDING_IRQ          0x15
-#define SVC_NVIC_SET_PRIORITY               0x16
-#define SVC_NVIC_GET_PRIORITY               0x17
-#define SVC_NVIC_SYSTEM_RESET               0x18
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-
-#if defined(__CC_ARM)
-void     __svc(SVC_HAL_MPU_DISABLE)         SVC_MPU_Disable(void);
-uint32_t __svc(SVC_DISABLE_ALL_NVIC_IRQS)   SVC_SYS_DisableAllNvicIrqs(void);
-void     __svc(SVC_RESTORE_NVIC_IRQS)       SVC_SYS_RestoreNvicIrqs(uint32_t nvic_iser_state);
-void     __svc(SVC_DISABLE_ALL_EXCEPTIONS)  SVC_SYS_DisableAllExceptions(void);
-void     __svc(SVC_SUBGHZ_INIT)             SVC_MX_SUBGHZ_Init(void);
-
-void     __svc(SVC_NVIC_ENABLE_IRQ)         SVC_NVIC_EnableIRQ(IRQn_Type IRQn);
-uint32_t __svc(SVC_NVIC_GET_ENABLE_IRQ)     SVC_NVIC_GetEnableIRQ(IRQn_Type IRQn);
-void     __svc(SVC_NVIC_DISABLE_IRQ)        SVC_NVIC_DisableIRQ(IRQn_Type IRQn);
-uint32_t __svc(SVC_NVIC_GET_PENDING_IRQ)    SVC_NVIC_GetPendingIRQ(IRQn_Type IRQn);
-void     __svc(SVC_NVIC_SET_PENDING_IRQ)    SVC_NVIC_SetPendingIRQ(IRQn_Type IRQn);
-void     __svc(SVC_NVIC_CLEAR_PENDING_IRQ)  SVC_NVIC_ClearPendingIRQ(IRQn_Type IRQn);
-void     __svc(SVC_NVIC_SET_PRIORITY)       SVC_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
-uint32_t __svc(SVC_NVIC_GET_PRIORITY)       SVC_NVIC_GetPriority(IRQn_Type IRQn);
-void     __svc(SVC_NVIC_SYSTEM_RESET)       SVC_NVIC_SystemReset(void);
-
-#elif defined(__ICCARM__)
-
-#pragma swi_number=SVC_HAL_MPU_DISABLE
- __swi void SVC_MPU_Disable(void);
-#pragma swi_number=SVC_DISABLE_ALL_NVIC_IRQS
- __swi uint32_t SVC_SYS_DisableAllNvicIrqs(void);
-#pragma swi_number=SVC_RESTORE_NVIC_IRQS
- __swi void  SVC_SYS_RestoreNvicIrqs(uint32_t nvic_iser_state);
-#pragma swi_number=SVC_DISABLE_ALL_EXCEPTIONS
- __swi void  SVC_SYS_DisableAllExceptions(void);
-#pragma swi_number=SVC_SUBGHZ_INIT
- __swi void  SVC_MX_SUBGHZ_Init(void);
-
-#pragma swi_number=SVC_NVIC_ENABLE_IRQ
- __swi void  SVC_NVIC_EnableIRQ(IRQn_Type IRQn);
-#pragma swi_number=SVC_NVIC_GET_ENABLE_IRQ
- __swi uint32_t  SVC_NVIC_GetEnableIRQ(IRQn_Type IRQn); 
-#pragma swi_number=SVC_NVIC_DISABLE_IRQ
- __swi void  SVC_NVIC_DisableIRQ(IRQn_Type IRQn);
-#pragma swi_number=SVC_NVIC_GET_PENDING_IRQ
- __swi uint32_t  SVC_NVIC_GetPendingIRQ(IRQn_Type IRQn);
-#pragma swi_number=SVC_NVIC_SET_PENDING_IRQ
- __swi void  SVC_NVIC_SetPendingIRQ(IRQn_Type IRQn); 
-#pragma swi_number=SVC_NVIC_CLEAR_PENDING_IRQ
- __swi void  SVC_NVIC_ClearPendingIRQ(IRQn_Type IRQn);
-#pragma swi_number=SVC_NVIC_SET_PRIORITY
- __swi void  SVC_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
-#pragma swi_number=SVC_NVIC_GET_PRIORITY
- __swi uint32_t  SVC_NVIC_GetPriority(IRQn_Type IRQn);
-#pragma swi_number=SVC_NVIC_SYSTEM_RESET
- __swi void  SVC_NVIC_SystemReset(void);
-
-#elif (__ARMCC_VERSION)
-void SVC_MPU_Disable(void);
-void SVC_SYS_DisableAllNvicIrqs(uint32_t *nvic_iser_state);
-void SVC_SYS_RestoreNvicIrqs(uint32_t nvic_iser_state);
-void SVC_SYS_DisableAllExceptions(void);
-void SVC_MX_SUBGHZ_Init(void);
-
-void SVC_NVIC_EnableIRQ(IRQn_Type IRQn);
-void SVC_NVIC_GetEnableIRQ(IRQn_Type IRQn, uint32_t *irqn_state);
-void SVC_NVIC_DisableIRQ(IRQn_Type IRQn);
-void SVC_NVIC_GetPendingIRQ(IRQn_Type IRQn, uint32_t *irqn_pending_state);
-void SVC_NVIC_SetPendingIRQ(IRQn_Type IRQn);
-void SVC_NVIC_ClearPendingIRQ(IRQn_Type IRQn);
-void SVC_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
-void SVC_NVIC_GetPriority(IRQn_Type IRQn, uint32_t *irqn_prio);
-void SVC_NVIC_SystemReset(void);
-#else 
-  /*GCC*/
-#endif
-
-/**
-  * @brief This is the SVC Handler of the CM0 application (the one downloaded via SBSFU).
-  * @param args SVC arguments
-  * @retval void
-  */
-void SVC_APP_Handler(uint32_t *args);
-/**
-  * @brief Maps MSP on Privileged region and set up PSP to current stack pointer 
-  * @param void
-  * @retval void
-  */
-void ThumbState_RemapMspAndSwitchToPspStack(void);
-/**
-  * @brief This is a helper function to enter the unprivileged level for software execution
-  * @param void
-  * @retval void
-  */
-void ThumbState_EnterUnprivilegedMode(void);
-/**
-  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
-  * @param void
-  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
-  */
-uint32_t ThumbState_IsUnprivileged(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SYS_PRIVILEGED_SERVICES_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h
deleted file mode 100644
index 7c6d2719..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_privileged_wrap.h
-  * @brief   This file contains all the function prototypes for
-  *          the sys_privileged_wrap.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SYS_PRIVILEGE_WRAP_H__
-#define __SYS_PRIVILEGE_WRAP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-
-/**
-  * @brief If execution in unprivil mode, calls SVC and Disable All Nvic Irqs
-  * @param void
-  * @retval uint32_t nvic_iser_state
-  */
-uint32_t SYS_PRIVIL_EnterCriticalSection( void);
-
-/**
-  * @brief If execution in unprivil mode, calls SVC and restore NVIC ISER register 
-  * @param uint32_t nvic_iser_state
-  * @retval void
-  */
-void SYS_PRIVIL_ExitCriticalSection( uint32_t nvic_iser_state);
-
-/**
-  * @brief disable all exceptions and after SVC keeps MODE Privileged! (stack goes back to PSP)
-  * @param  void
-  * @retval void
-  */
-void SYS_PRIVIL_DisableIrqsAndRemainPriv( void );
-
-/**
-  * @brief enable all exceptions and go to Unprivileged mode
-  * @param  void
-  * @retval void
-  */
-void SYS_PRIVIL_EnableIrqsAndGoUnpriv( void );
-
-/**
-  * @brief If execution in unprivil mode, calls SVC before calling MX_SUBGHZ_Init 
-  * @param void
-  * @retval void
-  * @note  this is necessary because RCC->CSR->RCC_CSR_RFRST requests Privil mode
-  */
-void SYS_PRIVIL_SUBGHZ_Init( void );
-
-/**
-  * @note All SYS_PRIVIL_NVIC_*** functions are a remapping such thatIf 
-  *       if execution in unprivil mode  call SVC before __NVIC_*** 
-  */
-void SYS_PRIVIL_NVIC_EnableIRQ(IRQn_Type IRQn);
-uint32_t SYS_PRIVIL_NVIC_GetEnableIRQ(IRQn_Type IRQn);
-void SYS_PRIVIL_NVIC_DisableIRQ(IRQn_Type IRQn);
-uint32_t SYS_PRIVIL_NVIC_GetPendingIRQ(IRQn_Type IRQn);
-void SYS_PRIVIL_NVIC_SetPendingIRQ(IRQn_Type IRQn);
-void SYS_PRIVIL_NVIC_ClearPendingIRQ(IRQn_Type IRQn);
-void SYS_PRIVIL_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
-uint32_t SYS_PRIVIL_NVIC_GetPriority(IRQn_Type IRQn);
-void SYS_PRIVIL_NVIC_SystemReset( void );
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SYS_PRIVILEGE_WRAP_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
deleted file mode 100644
index 7ec0afb0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    utilities_conf.h
-  * @author  MCD Application Team
-  * @brief   Header for configuration file to utilities
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
- */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __UTILITIES_CONF_H__
-#define __UTILITIES_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "cmsis_compiler.h"
-
-/* definitions to be provided to "sequencer" utility */
-#include "stm32_mem.h"
-/* definition and callback for tiny_vsnprintf */
-#include "stm32_tiny_vsnprintf.h"
-
-#include "mbmuxif_trace.h"
-#include "sys_privileged_wrap.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-/*                             sequencer configuration                       */
-/*---------------------------------------------------------------------------*/
-/**
-  * @brief Sequencer flag reserved for future use
-  */
-#define UTIL_SEQ_RFU 0
-
-/**
-  * @brief default number of tasks configured in sequencer
-  */
-#define SEQ_CONF_TASK_NBR    4
-
-/**
-  * @brief default value of priority task
-  */
-#define SEQ_CONF_PRIO_NBR    1
-
-#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
-#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
-                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
-#define VLEVEL_L 1       /*!< just essential traces */
-#define VLEVEL_M 2       /*!< functional traces */
-#define VLEVEL_H 3       /*!< all traces */
-
-#define TS_OFF 0         /*!< Log without TimeStamp */
-#define TS_ON 1          /*!< Log with TimeStamp */
-
-#define T_REG_OFF  0     /*!< Log without bitmask */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macros -----------------------------------------------------------*/
-/**
-  * @brief Memory placement macro
-  */
-#if defined(__CC_ARM)
-#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
-#elif defined(__ICCARM__)
-#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
-#else  /* __GNUC__ */
-#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
-#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
-
-/**
-  * @brief Memory alignment macro
-  */
-#undef ALIGN
-#ifdef WIN32
-#define ALIGN(n)
-#else
-#define ALIGN(n)             __attribute__((aligned(n)))
-#endif /* WIN32 */
-
-/**
-  * @brief macro used to initialize the critical section
-  */
-#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
-
-/**
-  * @brief macro used to enter the critical section
-  */
-#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
-
-/**
-  * @brief macro used to exit the critical section
-  */
-#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
-
-/**
-  * @brief macro to Enter CS used specifically by UTIL_SEQ_Run before going to Idle
-  */
-#define UTIL_SEQ_ENTER_CRITICAL_SECTION_IDLE( )   SYS_PRIVIL_DisableIrqsAndRemainPriv()
-
-/**
-  * @brief macro to Exit CS used specifically by UTIL_SEQ_Run exiting from Idle
-  */
-#define UTIL_SEQ_EXIT_CRITICAL_SECTION_IDLE( )    SYS_PRIVIL_EnableIrqsAndGoUnpriv()
-
-/**
-  * @brief Memset utilities interface to application
-  */
-#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
-
-/**
-  * @brief macro used to initialize the critical section
-  */
-#define UTILS_INIT_CRITICAL_SECTION()
-
-/**
-  * @brief macro used to enter the critical section
-  */
-#define UTILS_ENTER_CRITICAL_SECTION() uint32_t nvic_iser_state= SYS_PRIVIL_EnterCriticalSection()
-
-/**
-  * @brief macro used to exit the critical section
-  */
-#define UTILS_EXIT_CRITICAL_SECTION()  SYS_PRIVIL_ExitCriticalSection(nvic_iser_state)
-/**
-  * @brief macro used to Enter critical section specifically for UTIL_LPM_EnterLowPower()
-  */
-#define UTIL_LPM_ENTER_CRITICAL_SECTION_ELP()
-/**
-  * @brief macro used to Exit critical section specifically for UTIL_LPM_EnterLowPower()
-  */
-#define UTIL_LPM_EXIT_CRITICAL_SECTION_ELP()
-
-/******************************************************************************
-  * trace\advanced
-  * the define option
-  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
-  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
-  *
-  ******************************************************************************/
-
-#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
-#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
-#define UTIL_ADV_TRACE_MEMLOCATION                 UTIL_MEM_PLACE_IN_SECTION("MB_MEM2")  /*!< memory placement for trace buffer */
-#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
-#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
-#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
-#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
-#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
-#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
-#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
-#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
-#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__UTILITIES_CONF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
deleted file mode 100644
index cec8bb33..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    utilities_def.h
-  * @author  MCD Application Team
-  * @brief   Definitions for modules requiring utilities
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __UTILITIES_DEF_H__
-#define __UTILITIES_DEF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/******************************************************************************
-  * LOW POWER MANAGER
-  ******************************************************************************/
-/**
-  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
-  * It lists a bit mapping of all user of the Low Power Manager
-  */
-typedef enum
-{
-  CFG_LPM_APPLI_Id,
-  CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
-  /* USER CODE BEGIN CFG_LPM_Id_t */
-
-  /* USER CODE END CFG_LPM_Id_t */
-} CFG_LPM_Id_t;
-
-/*---------------------------------------------------------------------------*/
-/*                             sequencer definitions                         */
-/*---------------------------------------------------------------------------*/
-
-/**
-  * This is the list of priority required by the application
-  * Each Id shall be in the range 0..31
-  */
-typedef enum
-{
-  CFG_SEQ_Prio_0,
-  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
-
-  /* USER CODE END CFG_SEQ_Prio_Id_t */
-  CFG_SEQ_Prio_NBR,
-} CFG_SEQ_Prio_Id_t;
-
-/**
-  * This is the list of task id required by the application
-  * Each Id shall be in the range 0..31
-  */
-typedef enum
-{
-  /* CM0PLUS */
-  CFG_SEQ_Task_MbSystemCmdRcv,
-  CFG_SEQ_Task_MbTraceAckRcv,
-  CFG_SEQ_Task_MbLoRaCmdRcv,
-  CFG_SEQ_Task_MbRadioCmdRcv,
-  CFG_SEQ_Task_MbRadioNotifSnd,
-  CFG_SEQ_Task_MbKmsCmdRcv,
-  CFG_SEQ_Task_MbLmHandlerProcess,
-  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
-
-  /* USER CODE END CFG_SEQ_Task_Id_t */
-  CFG_SEQ_Task_NBR
-} CFG_SEQ_Task_Id_t;
-
-/**
-  * This is a bit mapping over 32bits listing all events id supported in the application
-  */
-typedef enum
-{
-  /* CM0PLUS */
-  CFG_SEQ_Evt_MbSystemAckRcv,
-  CFG_SEQ_Evt_MbTraceAckRcv,
-  CFG_SEQ_Evt_MbLoraAckRcv,
-  CFG_SEQ_Evt_MbRadioAckRcv,
-  /* USER CODE BEGIN CFG_SEQ_IdleEvt_Id_t */
-
-  /* USER CODE END CFG_SEQ_IdleEvt_Id_t */
-  CFG_SEQ_Evt_NBR
-} CFG_SEQ_IdleEvt_Id_t;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __UTILITIES_DEF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/flash_if.c
deleted file mode 100644
index 8e2d9304..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/flash_if.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    flash_if.c
-  * @author  MCD Application Team
-  * @brief   FLASH Interface module.
-  *          This file provides set of firmware functions to manage Flash
-  *          Interface functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright(c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "stm32wlxx.h"
-#include "flash_if.h"
-#include "sys_app.h" /* needed for APP_LOG */
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-static __IO uint32_t DoubleECC_Error_Counter = 0U;
-
-static __IO bool DoubleECC_Check;
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Gets the page of a given address
-  * @param  uAddr: Address of the FLASH Memory
-  * @retval The page of a given address
-  */
-static uint32_t GetPage(uint32_t uAddr);
-
-/**
-  * @brief  Unlocks Flash for write access
-  * @param  None
-  * @retval HAL Status.
-  */
-static HAL_StatusTypeDef FLASH_Init(void);
-
-/* Public functions ---------------------------------------------------------*/
-/**
-  * @brief  This function does an erase of n (depends on Length) pages in user flash area
-  * @param  pStart: Start of user flash area
-  * @param  uLength: number of bytes.
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_Erase(void *pStart, uint32_t uLength)
-{
-  uint32_t page_error = 0U;
-  uint32_t uStart = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef x_erase_init;
-  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
-  uint32_t first_page = 0U, nb_pages = 0U;
-  uint32_t chunk_nb_pages;
-  uint32_t erase_command = 0U;
-
-  /* Initialize Flash */
-  e_ret_status = FLASH_Init();
-
-  if (e_ret_status == HAL_OK)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() == HAL_OK)
-    {
-      do
-      {
-        /* Get the 1st page to erase */
-        first_page = GetPage(uStart);
-        /* Get the number of pages to erase from 1st page */
-        nb_pages = GetPage(uStart + uLength - 1U) - first_page + 1U;
-
-        /* Fill EraseInit structure*/
-        x_erase_init.TypeErase = FLASH_TYPEERASE_PAGES;
-
-        /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
-        do
-        {
-          chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
-          x_erase_init.Page = first_page;
-          x_erase_init.NbPages = chunk_nb_pages;
-          first_page += chunk_nb_pages;
-          nb_pages -= chunk_nb_pages;
-          if (HAL_FLASHEx_Erase(&x_erase_init, &page_error) != HAL_OK)
-          {
-            HAL_FLASH_GetError();
-            e_ret_status = HAL_ERROR;
-          }
-          /* Refresh Watchdog */
-          /* WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD); */
-        }
-        while (nb_pages > 0);
-        erase_command = 1U;
-      }
-      while (erase_command == 0);
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      HAL_FLASH_Lock();
-
-    }
-    else
-    {
-      e_ret_status = HAL_ERROR;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
-  * @note   After writing data buffer, the flash content is checked.
-  * @param  pDestination: Start address for target location
-  * @param  pSource: pointer on buffer with data to write
-  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_Write(uint32_t pDestination, uint8_t *pSource, uint32_t uLength)
-{
-  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
-  uint32_t i = 0U;
-  uint64_t data;
-
-  /* Initialize Flash */
-  e_ret_status = FLASH_Init();
-
-  if (e_ret_status == HAL_OK)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() != HAL_OK)
-    {
-      APP_LOG(TS_OFF, VLEVEL_H, "ERROR ==> Unlock not possible\n");
-      return HAL_ERROR;
-    }
-    else
-    {
-      APP_LOG(TS_OFF, VLEVEL_H, "Flash Write : Memory addr 0x%08x length%04d\r\n", pDestination, uLength);
-
-      /* DataLength must be a multiple of 64 bit */
-      for (i = 0U; i < uLength; i += 8U)
-      {
-        UTIL_MEM_cpy_8((void*)&data, (const void*)(pSource + i), 8);
-        /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
-        be done by word */
-        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, pDestination, data) == HAL_OK)
-        {
-          /* Check the written value */
-          if (*(uint64_t *)pDestination != data)
-          {
-            /* Flash content doesn't match SRAM content */
-            e_ret_status = HAL_ERROR;
-            APP_LOG(TS_OFF, VLEVEL_H, "ERROR ==> Memory check failure\n");
-            break;
-          }
-          /* Increment FLASH Destination address */
-          pDestination += 8U;
-        }
-        else
-        {
-          /* Error occurred while writing data in Flash memory */
-          e_ret_status = HAL_ERROR;
-          APP_LOG(TS_OFF, VLEVEL_H, "ERROR ==> Memory write failure\n");
-          break;
-        }
-      }
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      HAL_FLASH_Lock();
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function reads flash
-  * @param  pDestination: Start address for target location
-  * @param  pSource: pointer on buffer with data to write
-  * @param  Length: Length in bytes of data buffer
-  * @retval HAL_StatusTypeDef HAL_OK if successful, HAL_ERROR otherwise.
-  */
-HAL_StatusTypeDef FLASH_Read(void *pDestination, const void *pSource, uint32_t Length)
-{
-  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
-
-  DoubleECC_Error_Counter = 0U;
-  DoubleECC_Check = true;
-  memcpy(pDestination, pSource, Length);
-  DoubleECC_Check = false;
-  if (DoubleECC_Error_Counter == 0U)
-  {
-    e_ret_status = HAL_OK;
-  }
-  DoubleECC_Error_Counter = 0U;
-
-  return e_ret_status;
-}
-
-/* Private functions ---------------------------------------------------------*/
-static HAL_StatusTypeDef FLASH_Init(void)
-{
-  HAL_StatusTypeDef ret = HAL_ERROR;
-
-  /* Unlock the Program memory */
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-
-    /* Clear all FLASH flags */
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-    /* Unlock the Program memory */
-    if (HAL_FLASH_Lock() == HAL_OK)
-    {
-      ret = HAL_OK;
-    }
-  }
-  return ret;
-}
-
-static uint32_t GetPage(uint32_t uAddr)
-{
-  uint32_t page = 0U;
-
-  if (uAddr < (FLASH_BASE + FLASH_BANK_SIZE))
-  {
-    /* Bank 1 */
-    page = (uAddr - FLASH_BASE) / FLASH_PAGE_SIZE;
-  }
-  else
-  {
-    /* Bank 2 */
-    page = (uAddr - (FLASH_BASE + FLASH_BANK_SIZE)) / FLASH_PAGE_SIZE;
-  }
-
-  return page;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
deleted file mode 100644
index 617042e8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ipcc.c
-  * @brief   This file provides code for the configuration
-  *          of the IPCC instances.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "ipcc.h"
-
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-IPCC_HandleTypeDef hipcc;
-
-/* IPCC init function */
-void MX_IPCC_Init(void)
-{
-
-  hipcc.Instance = IPCC;
-  if (HAL_IPCC_Init(&hipcc) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-}
-
-void HAL_IPCC_MspInit(IPCC_HandleTypeDef* ipccHandle)
-{
-
-  if(ipccHandle->Instance==IPCC)
-  {
-  /* USER CODE BEGIN IPCC_MspInit 0 */
-
-  /* USER CODE END IPCC_MspInit 0 */
-    /* IPCC clock enable */
-    __HAL_RCC_IPCC_CLK_ENABLE();
-
-    /* IPCC interrupt Init */
-    HAL_NVIC_SetPriority(IPCC_C2_RX_C2_TX_IRQn, 1, 0);
-    HAL_NVIC_EnableIRQ(IPCC_C2_RX_C2_TX_IRQn);
-  /* USER CODE BEGIN IPCC_MspInit 1 */
-
-  /* USER CODE END IPCC_MspInit 1 */
-  }
-}
-
-void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* ipccHandle)
-{
-
-  if(ipccHandle->Instance==IPCC)
-  {
-  /* USER CODE BEGIN IPCC_MspDeInit 0 */
-
-  /* USER CODE END IPCC_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_IPCC_CLK_DISABLE();
-
-    /* IPCC interrupt Deinit */
-    HAL_NVIC_DisableIRQ(IPCC_C2_RX_C2_TX_IRQn);
-  /* USER CODE BEGIN IPCC_MspDeInit 1 */
-
-  /* USER CODE END IPCC_MspDeInit 1 */
-  }
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
deleted file mode 100644
index ad72640a..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ipcc_if.c
-  * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-
-/*ipcc interface for M4*/
-#include "assert.h"
-#include "stddef.h"
-#include "ipcc_if.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static void (*IpccCommandRcv)(uint32_t channelIdx);
-
-static void (*IpccAcknowledgeRcv)(uint32_t channelIdx);
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Interrupt service routine executed when Ipcc receive IRQ confirmation of a received message by remote CPU
-  */
-static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
-
-/**
-  * @brief Interrupt service routine executed when Ipcc receive IRQ notification request by remote CPU
-  */
-static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
-                  void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx))
-{
-  /* USER CODE BEGIN IPCC_IF_Init_1 */
-
-  /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
-  MX_IPCC_Init();
-
-  /* Enable C2AHB3 peripherals clock. */
-  LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC);
-  /* IPCC EXTI (AIEC) line for CPU2  */
-  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
-  LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
-
-  /* Initialises IPCC callback of all channels*/
-  for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
-  {
-    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
-    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
-  }
-
-  /* Registers upper level (applic) callback */
-  IpccCommandRcv = IPCC_IF_CommandRcv_cb;
-  IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
-  return;
-  /* USER CODE BEGIN IPCC_IF_Init_2 */
-
-  /* USER CODE END IPCC_IF_Init_2 */
-}
-
-uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_1 */
-
-  /* USER CODE END IPCC_IF_CmdRespStatus_1 */
-  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX);
-  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_2 */
-
-  /* USER CODE END IPCC_IF_CmdRespStatus_2 */
-}
-
-uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_1 */
-
-  /* USER CODE END IPCC_IF_NotifAckStatus_1 */
-  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX);
-  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_2 */
-
-  /* USER CODE END IPCC_IF_NotifAckStatus_2 */
-}
-
-int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN IPCC_IF_NotificationSnd_1 */
-
-  /* USER CODE END IPCC_IF_NotificationSnd_1 */
-  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX))
-  {
-    return -1;
-  }
-  else
-  {
-    return 0;
-  }
-  /* USER CODE BEGIN IPCC_IF_NotificationSnd_2 */
-
-  /* USER CODE END IPCC_IF_NotificationSnd_2 */
-}
-
-int32_t IPCC_IF_ResponseSnd(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN IPCC_IF_ResponseSnd_1 */
-
-  /* USER CODE END IPCC_IF_ResponseSnd_1 */
-  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX))
-  {
-    return -1;
-  }
-  else
-  {
-    return 0;
-  }
-  /* USER CODE BEGIN IPCC_IF_ResponseSnd_2 */
-
-  /* USER CODE END IPCC_IF_ResponseSnd_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-
-static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
-{
-  /* USER CODE BEGIN IpccIfIsrTxCb_1 */
-
-  /* USER CODE END IpccIfIsrTxCb_1 */
-  UNUSED(hIpcc);
-  UNUSED(ChannelDir);
-
-  IpccAcknowledgeRcv(ChannelIndex);
-  return;
-  /* USER CODE BEGIN IpccIfIsrTxCb_2 */
-
-  /* USER CODE END IpccIfIsrTxCb_2 */
-}
-
-static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
-{
-  /* USER CODE BEGIN IpccIfIsrRxCb_1 */
-
-  /* USER CODE END IpccIfIsrRxCb_1 */
-  UNUSED(hIpcc);
-  UNUSED(ChannelDir);
-
-  IpccCommandRcv(ChannelIndex);
-  return;
-  /* USER CODE BEGIN IpccIfIsrRxCb_2 */
-
-  /* USER CODE END IpccIfIsrRxCb_2 */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
deleted file mode 100644
index 2b99f28f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file           : main.c
-  * @brief          : Main program body
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "app_lorawan.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/**
-  * @brief  The application entry point.
-  * @retval int
-  */
-int main(void)
-{
-  /* USER CODE BEGIN 1 */
-
-  /* USER CODE END 1 */
-
-  /* MCU Configuration--------------------------------------------------------*/
-
-  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-  HAL_Init();
-
-  /* USER CODE BEGIN Init */
-
-  /* USER CODE END Init */
-
-  /* USER CODE BEGIN SysInit */
-
-  /* USER CODE END SysInit */
-
-  /* Initialize all configured peripherals */
-  MX_LoRaWAN_Init();
-  MX_KMS_Init();
-  /* USER CODE BEGIN 2 */
-
-  /* USER CODE END 2 */
-
-  /* Infinite loop */
-  /* USER CODE BEGIN WHILE */
-  while (1)
-  {
-    /* USER CODE END WHILE */
-    MX_LoRaWAN_Process();
-
-    /* USER CODE BEGIN 3 */
-  }
-  /* USER CODE END 3 */
-}
-
-/* USER CODE BEGIN 4 */
-
-/* USER CODE END 4 */
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @retval None
-  */
-void Error_Handler(void)
-{
-  /* USER CODE BEGIN Error_Handler_Debug */
-  /* User can add his own implementation to report the HAL error return state */
-  while (1)
-  {
-  }
-  /* USER CODE END Error_Handler_Debug */
-}
-
-#ifdef  USE_FULL_ASSERT
-/**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t *file, uint32_t line)
-{
-  /* USER CODE BEGIN 6 */
-  /* User can add his own implementation to report the file name and line number,
-     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  while (1)
-  {
-  }
-  /* USER CODE END 6 */
-}
-#endif /* USE_FULL_ASSERT */
-
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
-  * @param  None
-  * @retval None
-  */
-void HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
-{
-  while (1)
-  {
-  }
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
deleted file mode 100644
index f74cd49b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    rtc.c
-  * @brief   This file provides code for the configuration
-  *          of the RTC instances.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "rtc.h"
-
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-RTC_HandleTypeDef hrtc;
-
-/* RTC init function */
-void MX_RTC_Init(void)
-{
-  RTC_AlarmTypeDef sAlarm = {0};
-
-  /** Initialize RTC Only
-  */
-  hrtc.Instance = RTC;
-  hrtc.Init.AsynchPrediv = RTC_PREDIV_A;
-  hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
-  hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE;
-  hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
-  hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
-  hrtc.Init.OutPutPullUp = RTC_OUTPUT_PULLUP_NONE;
-  hrtc.Init.BinMode = RTC_BINARY_ONLY;
-  if (HAL_RTC_Init(&hrtc) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /* USER CODE BEGIN Check_RTC_BKUP */
-
-  /* USER CODE END Check_RTC_BKUP */
-
-  /** Initialize RTC and set the Time and Date
-  */
-  if (HAL_RTCEx_SetSSRU_IT(&hrtc) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /** Enable the Alarm A
-  */
-  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
-  sAlarm.AlarmTime.SubSeconds = 0x0;
-  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
-  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
-  sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /** Enable the Alarm B
-  */
-  sAlarm.Alarm = RTC_ALARM_B;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-}
-
-void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
-{
-
-  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
-  if(rtcHandle->Instance==RTC)
-  {
-  /* USER CODE BEGIN RTC_MspInit 0 */
-
-  /* USER CODE END RTC_MspInit 0 */
-  /** Initializes the peripherals clocks
-  */
-    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
-    PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
-
-    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
-    {
-      Error_Handler();
-    }
-
-    /* RTC clock enable */
-    __HAL_RCC_RTC_ENABLE();
-    __HAL_RCC_RTCAPB_CLK_ENABLE();
-
-    /* RTC interrupt Init */
-    HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0, 0);
-    HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
-  /* USER CODE BEGIN RTC_MspInit 1 */
-
-  /* USER CODE END RTC_MspInit 1 */
-  }
-}
-
-void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
-{
-
-  if(rtcHandle->Instance==RTC)
-  {
-  /* USER CODE BEGIN RTC_MspDeInit 0 */
-
-  /* USER CODE END RTC_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_RTC_DISABLE();
-    __HAL_RCC_RTCAPB_CLK_DISABLE();
-
-    /* RTC interrupt Deinit */
-    HAL_NVIC_DisableIRQ(RTC_LSECSS_IRQn);
-  /* USER CODE BEGIN RTC_MspDeInit 1 */
-
-  /* USER CODE END RTC_MspDeInit 1 */
-  }
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
deleted file mode 100644
index 3dfcda11..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32_lpm_if.c
-  * @author  MCD Application Team
-  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
-#include "stm32_lpm_if.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Power driver callbacks handler
-  */
-const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
-{
-  PWR_EnterSleepMode,
-  PWR_ExitSleepMode,
-
-  PWR_EnterStopMode,
-  PWR_ExitStopMode,
-
-  PWR_EnterOffMode,
-  PWR_ExitOffMode,
-};
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-void PWR_EnterOffMode(void)
-{
-  /* USER CODE BEGIN EnterOffMode_1 */
-
-  /* USER CODE END EnterOffMode_1 */
-}
-
-void PWR_ExitOffMode(void)
-{
-  /* USER CODE BEGIN ExitOffMode_1 */
-
-  /* USER CODE END ExitOffMode_1 */
-}
-
-void PWR_EnterStopMode(void)
-{
-  /* USER CODE BEGIN EnterStopMode_1 */
-
-  /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
-  HAL_SuspendTick();
-  /* Clear Status Flag before entering STOP/STANDBY Mode */
-  LL_PWR_ClearFlag_C2STOP_C2STB();
-
-  /* USER CODE BEGIN EnterStopMode_2 */
-
-  /* USER CODE END EnterStopMode_2 */
-  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
-  /* USER CODE BEGIN EnterStopMode_3 */
-
-  /* USER CODE END EnterStopMode_3 */
-}
-
-void PWR_ExitStopMode(void)
-{
-  /* USER CODE BEGIN ExitStopMode_1 */
-
-  /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
-  HAL_ResumeTick();
-  /*Not retained periph:
-    ADC interface
-    DAC interface USARTx, TIMx, i2Cx, SPIx
-    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
-
-  /* USER CODE BEGIN ExitStopMode_2 */
-
-  /* USER CODE END ExitStopMode_2 */
-}
-
-void PWR_EnterSleepMode(void)
-{
-  /* USER CODE BEGIN EnterSleepMode_1 */
-
-  /* USER CODE END EnterSleepMode_1 */
-  /* Suspend sysTick */
-  HAL_SuspendTick();
-  /* USER CODE BEGIN EnterSleepMode_2 */
-
-  /* USER CODE END EnterSleepMode_2 */
-  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
-  /* USER CODE BEGIN EnterSleepMode_3 */
-
-  /* USER CODE END EnterSleepMode_3 */
-}
-
-void PWR_ExitSleepMode(void)
-{
-  /* USER CODE BEGIN ExitSleepMode_1 */
-
-  /* USER CODE END ExitSleepMode_1 */
-  /* Suspend sysTick */
-  HAL_ResumeTick();
-
-  /* USER CODE BEGIN ExitSleepMode_2 */
-
-  /* USER CODE END ExitSleepMode_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
deleted file mode 100644
index 69daec6f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_it.c
-  * @brief   Interrupt Service Routines.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "stm32wlxx_it.h"
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN TD */
-
-/* USER CODE END TD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/* External variables --------------------------------------------------------*/
-extern IPCC_HandleTypeDef hipcc;
-extern RTC_HandleTypeDef hrtc;
-extern SUBGHZ_HandleTypeDef hsubghz;
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/******************************************************************************/
-/*           Cortex Processor Interruption and Exception Handlers          */
-/******************************************************************************/
-/**
-  * @brief This function handles Non maskable Interrupt.
-  */
-void NMI_Handler(void)
-{
-  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
-
-  /* USER CODE END NonMaskableInt_IRQn 0 */
-  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
-  /* USER CODE END NonMaskableInt_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Hard fault interrupt.
-  */
-void HardFault_Handler(void)
-{
-  /* USER CODE BEGIN HardFault_IRQn 0 */
-
-  /* USER CODE END HardFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
-    /* USER CODE END W1_HardFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief  This function handles TZIC interrupt request.
-  * @param  None
-  * @retval None
-  */
-void TZIC_ILA_IRQHandler(void)
-{
-  HAL_GTZC_IRQHandler();
-}
-
-/**
-  * @brief This function handles Pendable request for system service.
-  */
-void PendSV_Handler(void)
-{
-  /* USER CODE BEGIN PendSV_IRQn 0 */
-
-  /* USER CODE END PendSV_IRQn 0 */
-  /* USER CODE BEGIN PendSV_IRQn 1 */
-
-  /* USER CODE END PendSV_IRQn 1 */
-}
-
-/**
-  * @brief This function handles System tick timer.
-  */
-void SysTick_Handler(void)
-{
-  /* USER CODE BEGIN SysTick_IRQn 0 */
-
-  /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
-  /* USER CODE BEGIN SysTick_IRQn 1 */
-
-  /* USER CODE END SysTick_IRQn 1 */
-}
-
-/******************************************************************************/
-/* STM32WLxx Peripheral Interrupt Handlers                                    */
-/* Add here the Interrupt Handlers for the used peripherals.                  */
-/* For the available peripheral interrupt handler names,                      */
-/* please refer to the startup file (startup_stm32wlxx.s).                    */
-/******************************************************************************/
-
-/**
-  * @brief This function handles RTC Wakeup + RTC Tamper and RTC TimeStamp + RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts.
-  */
-void RTC_LSECSS_IRQHandler(void)
-{
-  /* USER CODE BEGIN RTC_LSECSS_IRQn 0 */
-
-  /* USER CODE END RTC_LSECSS_IRQn 0 */
-  HAL_RTC_AlarmIRQHandler(&hrtc);
-  HAL_RTCEx_SSRUIRQHandler(&hrtc);
-  /* USER CODE BEGIN RTC_LSECSS_IRQn 1 */
-
-  /* USER CODE END RTC_LSECSS_IRQn 1 */
-}
-
-/**
-  * @brief This function handles IPCC RX Occupied and TX Free Interrupt.
-  */
-void IPCC_C2_RX_C2_TX_IRQHandler(void)
-{
-  /* USER CODE BEGIN IPCC_C2_RX_C2_TX_IRQn 0 */
-
-  /* USER CODE END IPCC_C2_RX_C2_TX_IRQn 0 */
-  HAL_IPCC_RX_IRQHandler(&hipcc);
-  HAL_IPCC_TX_IRQHandler(&hipcc);
-  /* USER CODE BEGIN IPCC_C2_RX_C2_TX_IRQn 1 */
-
-  /* USER CODE END IPCC_C2_RX_C2_TX_IRQn 1 */
-}
-
-/**
-  * @brief This function handles SUBGHZ Radio Interrupt.
-  */
-void SUBGHZ_Radio_IRQHandler(void)
-{
-  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 0 */
-
-  /* USER CODE END SUBGHZ_Radio_IRQn 0 */
-  HAL_SUBGHZ_IRQHandler(&hsubghz);
-  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 1 */
-
-  /* USER CODE END SUBGHZ_Radio_IRQn 1 */
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
deleted file mode 100644
index ee7e45e8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    subghz.c
-  * @brief   This file provides code for the configuration
-  *          of the SUBGHZ instances.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "subghz.h"
-
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-SUBGHZ_HandleTypeDef hsubghz;
-
-/* SUBGHZ init function */
-void MX_SUBGHZ_Init(void)
-{
-
-  hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
-  if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-}
-
-void HAL_SUBGHZ_MspInit(SUBGHZ_HandleTypeDef* subghzHandle)
-{
-
-  /* USER CODE BEGIN SUBGHZ_MspInit 0 */
-
-  /* USER CODE END SUBGHZ_MspInit 0 */
-    /* SUBGHZ clock enable */
-    __HAL_RCC_SUBGHZSPI_CLK_ENABLE();
-
-    /* SUBGHZ interrupt Init */
-    HAL_NVIC_SetPriority(SUBGHZ_Radio_IRQn, 0, 0);
-    HAL_NVIC_EnableIRQ(SUBGHZ_Radio_IRQn);
-  /* USER CODE BEGIN SUBGHZ_MspInit 1 */
-
-  /* USER CODE END SUBGHZ_MspInit 1 */
-}
-
-void HAL_SUBGHZ_MspDeInit(SUBGHZ_HandleTypeDef* subghzHandle)
-{
-
-  /* USER CODE BEGIN SUBGHZ_MspDeInit 0 */
-
-  /* USER CODE END SUBGHZ_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_SUBGHZSPI_CLK_DISABLE();
-
-    /* SUBGHZ interrupt Deinit */
-    HAL_NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
-  /* USER CODE BEGIN SUBGHZ_MspDeInit 1 */
-
-  /* USER CODE END SUBGHZ_MspDeInit 1 */
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
deleted file mode 100644
index a81082ca..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_app.c
-  * @author  MCD Application Team
-  * @brief   Initializes HW and SW system entities (not related to the radio)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdio.h>
-#include "platform.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "stm32_systime.h"
-#include "stm32_lpm.h"
-#include "timer_if.h"
-#include "utilities_def.h"
-#include "sys_debug.h"
-#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
-#include "sys_privileged_services.h"
-#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
-#error SECURE_UNPRIVILEGE_ENABLE not defined
-#endif /* SECURE_UNPRIVILEGE_ENABLE */
-
-#include "msg_id.h"
-#include "features_info.h"
-#include "mbmuxif_sys.h"
-#include "mbmuxif_trace.h"
-#include "mbmuxif_radio.h"
-#include "mbmuxif_lora.h"
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-#include "mbmuxif_kms.h"
-#endif /* ALLOW_KMS_VIA_MBMUX */
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-#define MAX_TS_SIZE (int) 16
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static EXTI_HandleTypeDef Exti41;
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
-  * @param none
-  * @retval  none
-  */
-static void System_Init(void);
-
-/**
-  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
-  */
-static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-static void MX_EXTI_Init(void);
-/* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises MBMUXIF System and send a notification to Cm4 when ready
-  * @param none
-  * @retval  none
-  */
-void SystemApp_Init(void)
-{
-  int8_t init_status;
-  /* USER CODE BEGIN SystemApp_Init_1 */
-
-  /* USER CODE END SystemApp_Init_1 */
-
-  /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
-  UTIL_TIMER_Init();
-
-  /*Init low power manager*/
-  UTIL_LPM_Init();
-  /* Disable Stand-by mode */
-  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
-
-#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
-  /* Disable Stop Mode */
-  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
-#elif !defined (LOW_POWER_DISABLE)
-#error LOW_POWER_DISABLE not defined
-#endif /* LOW_POWER_DISABLE */
-
-  MX_EXTI_Init();
-
-#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
-  ThumbState_RemapMspAndSwitchToPspStack();
-  ThumbState_EnterUnprivilegedMode();
-#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
-#error SECURE_UNPRIVILEGE_ENABLE not defined
-#endif /* SECURE_UNPRIVILEGE_ENABLE */
-
-  /* Wait for CPU1 to be ready */
-  while(HAL_EXTI_GetPending(&Exti41, EXTI_TRIGGER_RISING_FALLING) != 0x01u)
-  {
-    /* Wait CPU1 Event */
-  }
-  /* Acknowledge CPU1 event */
-  HAL_EXTI_ClearPending(&Exti41, EXTI_TRIGGER_RISING_FALLING);
-
-  /* Init Feat_Info table */
-  FEAT_INFO_Init();
-
-  /* Note: the trace is initialised in the context of MBMUXIF because it uses the MB on Cm0 side */
-  init_status = MBMUXIF_SystemInit();
-  if (init_status < 0)
-  {
-    Error_Handler();
-  }
-
-  System_Init();
-
-  /* Configure the debug mode*/
-  DBG_Init();
-
-  /* USER CODE BEGIN SystemApp_Init_2 */
-
-  /* USER CODE END SystemApp_Init_2 */
-}
-
-/**
-  * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
-  */
-void TimestampNow(uint8_t *buff, uint16_t *size)
-{
-  /* USER CODE BEGIN TimestampNow_1 */
-
-  /* USER CODE END TimestampNow_1 */
-  SysTime_t curtime = SysTimeGet();
-  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
-  *size = strlen((char *)buff);
-  /* USER CODE BEGIN TimestampNow_2 */
-
-  /* USER CODE END TimestampNow_2 */
-}
-
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
-{
-  /* USER CODE BEGIN Process_Kms_Cmd_1 */
-
-  /* USER CODE END Process_Kms_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
-
-  APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
-
-  /* process Command */
-  switch (ComObj->MsgId)
-  {
-    case KMS_CRYPTO_HMAC_SHA256_MSG_ID:
-      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Cmd rcv : KMS_CRYPTO_HMAC_SHA256_MSG_ID\r\n");
-      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Crypto aKey length %d\r\n", com_buffer[1]);
-      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Crypto aKey string %s\r\n", (char *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0;
-      ComObj->ReturnVal = (uint32_t) -5; /* dummy value for test */
-      break;
-
-    default:
-      break;
-  }
-
-  /* send Response */
-  APP_LOG(TS_ON, VLEVEL_L, "<CM0PLUS(KMS)\r\n");
-  MBMUX_ResponseSnd(FEAT_INFO_KMS_ID);
-
-  /* USER CODE BEGIN Process_Kms_Cmd_2 */
-
-  /* USER CODE END Process_Kms_Cmd_2 */
-}
-#endif /* ALLOW_KMS_VIA_MBMUX */
-
-void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
-{
-  /* USER CODE BEGIN Process_Sys_Cmd_1 */
-
-  /* USER CODE END Process_Sys_Cmd_1 */
-  APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(System)\r\n");
-
-  /* process Command */
-  switch (ComObj->MsgId)
-  {
-    case SYS_OTHER_MSG_ID:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
-
-  /* USER CODE END Process_Sys_Cmd_switch_msg_id */
-      break;
-
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
-
-  /* USER CODE END Process_Sys_Cmd_switch_case */
-
-    default:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
-
-  /* USER CODE END Process_Sys_Cmd_switch_default */
-      break;
-  }
-
-  /* send Response */
-  APP_LOG(TS_ON, VLEVEL_M, "<CM0PLUS(System)\r\n");
-  MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-  /* USER CODE BEGIN Process_Sys_Cmd_2 */
-
-  /* USER CODE END Process_Sys_Cmd_2 */
-}
-
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
-{
-  /**
-    * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
-    */
-  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
-
-  /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
-  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
-
-  /* USER CODE END UTIL_SEQ_EvtIdle_2 */
-  return;
-}
-
-/**
-  * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
-  */
-void UTIL_SEQ_Idle(void)
-{
-  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
-
-  /* USER CODE END UTIL_SEQ_Idle_1 */
-  UTIL_LPM_EnterLowPower();
-  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
-
-  /* USER CODE END UTIL_SEQ_Idle_2 */
-}
-
-void GetUniqueId(uint8_t *id)
-{
-  /* USER CODE BEGIN GetUniqueId_1 */
-
-  /* USER CODE END GetUniqueId_1 */
-  uint32_t val = 0;
-  val = LL_FLASH_GetUDN();
-  if (val == 0xFFFFFFFF)  /* Normally this should not happen */
-  {
-    uint32_t ID_1_3_val = HAL_GetUIDw0() + HAL_GetUIDw2();
-    uint32_t ID_2_val = HAL_GetUIDw1();
-
-    id[7] = (ID_1_3_val) >> 24;
-    id[6] = (ID_1_3_val) >> 16;
-    id[5] = (ID_1_3_val) >> 8;
-    id[4] = (ID_1_3_val);
-    id[3] = (ID_2_val) >> 24;
-    id[2] = (ID_2_val) >> 16;
-    id[1] = (ID_2_val) >> 8;
-    id[0] = (ID_2_val);
-  }
-  else  /* Typical use case */
-  {
-    id[7] = val & 0xFF;
-    id[6] = (val >> 8) & 0xFF;
-    id[5] = (val >> 16) & 0xFF;
-    id[4] = (val >> 24) & 0xFF;
-    val = LL_FLASH_GetDeviceID();
-    id[3] = val & 0xFF;
-    val = LL_FLASH_GetSTCompanyID();
-    id[2] = val & 0xFF;
-    id[1] = (val >> 8) & 0xFF;
-    id[0] = (val >> 16) & 0xFF;
-  }
-
-  /* USER CODE BEGIN GetUniqueId_2 */
-
-  /* USER CODE END GetUniqueId_2 */
-}
-
-uint32_t GetDevAddr(void)
-{
-  uint32_t val = 0;
-  /* USER CODE BEGIN GetDevAddr_1 */
-
-  /* USER CODE END GetDevAddr_1 */
-  val = LL_FLASH_GetUDN();
-  if (val == 0xFFFFFFFF)
-  {
-    val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
-  }
-  /* USER CODE BEGIN GetDevAddr_2 */
-
-  /* USER CODE END GetDevAddr_2 */
-  return val;
-}
-
-/* USER CODE BEGIN ExF */
-
-/* USER CODE END ExF */
-
-/* Private functions ---------------------------------------------------------*/
-static void System_Init(void)
-{
-  /* USER CODE BEGIN System_Init_1 */
-
-  /* USER CODE END System_Init_1 */
-  /* No need of Enable Internal Wake-up line for CPU2 */
-  LL_C2_PWR_DisableInternWU();
-
-  /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
-  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach onlt Cm4 */
-  LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
-  LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
-
-  /* Enable Radio IRQ lines interrupt for CPU2 */
-  LL_C2_PWR_SetRadioIRQTrigger(LL_PWR_RADIO_IRQ_TRIGGER_WU_IT);
-  /* Enable Radio EXTI lines for CPU2 (Needed for low power STOP mode */
-  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_44);
-  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_45);
-
-  /* Ensure that MSI is wake-up system clock */
-  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-  /* USER CODE BEGIN System_Init_Last */
-
-  /* USER CODE END System_Init_Last */
-}
-
-/* Disable StopMode when traces need to be printed */
-void UTIL_ADV_TRACE_PreSendHook(void)
-{
-  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
-
-  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
-  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
-  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
-
-  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
-}
-/* Re-enable StopMode when traces have been printed */
-void UTIL_ADV_TRACE_PostSendHook(void)
-{
-  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
-
-  /* USER CODE END UTIL_LPM_SetStopMode_1 */
-  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
-  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
-
-  /* USER CODE END UTIL_LPM_SetStopMode_2 */
-}
-
-static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
-{
-  /* USER CODE BEGIN tiny_snprintf_like_1 */
-
-  /* USER CODE END tiny_snprintf_like_1 */
-  va_list vaArgs;
-  va_start(vaArgs, strFormat);
-  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
-  va_end(vaArgs);
-  /* USER CODE BEGIN tiny_snprintf_like_2 */
-
-  /* USER CODE END tiny_snprintf_like_2 */
-}
-
-/**
-  * Enable EXTI controller
-  * Configure line 41
-  */
-static void MX_EXTI_Init(void)
-{
-  EXTI_ConfigTypeDef exit41config;
-
-  exit41config.Line = EXTI_LINE_41;
-  exit41config.Mode = EXTI_MODE_INTERRUPT;
-  exit41config.Trigger = EXTI_TRIGGER_RISING;
-  HAL_EXTI_SetConfigLine(&Exti41, &exit41config);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/* HAL overload functions ---------------------------------------------------------*/
-
-/**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
-  */
-HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
-{
-  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
-  /* USER CODE BEGIN HAL_InitTick_1 */
-
-  /* USER CODE END HAL_InitTick_1 */
-  return HAL_OK;
-  /* USER CODE BEGIN HAL_InitTick_2 */
-
-  /* USER CODE END HAL_InitTick_2 */
-}
-
-/**
-  * @brief Provide a tick value in millisecond measured using RTC
-  * @note This function overwrites the __weak one from HAL
-  * @retval tick value
-  */
-uint32_t HAL_GetTick(void)
-{
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
-  /* USER CODE BEGIN HAL_GetTick_1 */
-
-  /* USER CODE END HAL_GetTick_1 */
-  return TIMER_IF_GetTimerValue();
-  /* USER CODE BEGIN HAL_GetTick_2 */
-
-  /* USER CODE END HAL_GetTick_2 */
-}
-
-/**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
-  */
-void HAL_Delay(__IO uint32_t Delay)
-{
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
-  /* USER CODE BEGIN HAL_Delay_1 */
-
-  /* USER CODE END HAL_Delay_1 */
-  TIMER_IF_DelayMs(Delay);
-  /* USER CODE BEGIN HAL_Delay_2 */
-
-  /* USER CODE END HAL_Delay_2 */
-}
-
-/* USER CODE BEGIN Overload_HAL_weaks */
-
-/* USER CODE END Overload_HAL_weaks */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c
deleted file mode 100644
index 8d1e8585..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_privileged_services.c
-  * @author  MCD Application Team
-  * @brief   gives access to COrtex services like ThumbState, SVC, MPU
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sys_privileged_services.h" /* shall be placed before se_interface_application.h */
-#include "se_interface_application.h"
-#include "stm32_seq.h"
-#include "subghz.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-
-#if defined(__ARMCC_VERSION)
-void SVC_MPU_Disable(void)
-{
-  __ASM volatile ("SVC #2");
-}
-
-void SVC_SYS_DisableAllNvicIrqs(uint32_t *nvic_iser_state)
-{
-  __ASM volatile ("SVC #2" : : "r" (nvic_iser_state));
-}
-
-void SVC_SYS_RestoreNvicIrqs(uint32_t nvic_iser_state)
-{
-  __ASM volatile ("SVC #3" : : "r" (nvic_iser_state));
-}
-
-void SVC_SYS_DisableAllExceptions(void)
-{
-  __ASM volatile ("SVC #4");
-}
-
-void SVC_MX_SUBGHZ_Init(void)
-{
-  __ASM volatile ("SVC #5");
-}
-
-void SVC_NVIC_EnableIRQ(IRQn_Type IRQn)
-{
-  __ASM volatile ("SVC #16" : : "r" (IRQn));
-}
-
-void SVC_NVIC_GetEnableIRQ(IRQn_Type IRQn, uint32_t *irqn_state)
-{
-  __ASM volatile ("SVC #17" : : "r" (IRQn), "r" (irqn_state));
-}
-
-void SVC_NVIC_DisableIRQ(IRQn_Type IRQn)
-{
-  __ASM volatile ("SVC #18" : : "r" (IRQn));
-}
-
-void SVC_NVIC_GetPendingIRQ(IRQn_Type IRQn, uint32_t *irqn_pending_state)
-{
-  __ASM volatile ("SVC #19" : : "r" (IRQn), "r" (irqn_pending_state));
-}
-
-void SVC_NVIC_SetPendingIRQ(IRQn_Type IRQn)
-{
-  __ASM volatile ("SVC #20" : : "r" (IRQn));
-}
-
-void SVC_NVIC_ClearPendingIRQ(IRQn_Type IRQn)
-{
-  __ASM volatile ("SVC #21" : : "r" (IRQn));
-}
-
-void SVC_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
-{
-  __ASM volatile ("SVC #22" : : "r" (IRQn), "r" (priority));
-}
-
-void SVC_NVIC_GetPriority(IRQn_Type IRQn, uint32_t *irqn_prio)
-{
-  __ASM volatile ("SVC #23" : : "r" (IRQn), "r" (irqn_prio));
-}
-
-void SVC_NVIC_SystemReset(void)
-{
-  __ASM volatile ("SVC #24");
-}
-#endif /* __ARMCC_VERSION */
-
-/**
-  * @brief This is the SVC Handler of the CM0 application (the one downloaded via SBSFU).
-  * @param args SVC arguments
-  * @retval void
-  */
-void SVC_APP_Handler(uint32_t *args)
-{
-  /* in PSP (args) contains caller context as follow *
-    * args[0] :R0
-    * args[1] :R1
-    * args[2] :R2
-    * args[3] :R3
-    * args[4] :R12
-    * args[5] :LR
-    * args[6] :PC to return after exception
-    * args[7] :xPSR
-  */
-  uint8_t svc_index = ((char *)args[6])[-2];  
-  uint32_t nvic_iser_state;
-#if (__ARMCC_VERSION)
-  uint32_t *ptr_args[2] = {(uint32_t *)args[0], (uint32_t *)args[1]};
-#endif /*__ARMCC_VERSION */
-
-  switch (svc_index)
-  {
-    case SVC_SE_APP_X_KMS: /* SE SVC CALL : called by SECoreBin*/
-    {
-      SE_APP_SVC_Handler(args);
-      break;
-    }
-    case SVC_HAL_MPU_DISABLE :        /* HAL Disable MPU */
-    {
-      HAL_MPU_Disable();
-      break;
-    }
-    case SVC_DISABLE_ALL_NVIC_IRQS:
-    {
-      /*all __NVIC_GetEnableIRQ*/
-      nvic_iser_state = NVIC->ISER[0];
-      /* clear all positive interrupt e.g. no see IRQn_Type in core_cm0plus.h*/
-      NVIC->ICER[0] = nvic_iser_state;
-#if (__ARMCC_VERSION)
-      *ptr_args[0] = nvic_iser_state;
-#else
-      args[0] = nvic_iser_state;
-#endif /*__ARMCC_VERSION */
-      break;
-    }
-    case SVC_RESTORE_NVIC_IRQS:
-    {
-      NVIC->ISER[0] = args[0] | NVIC->ISER[0];
-      break;
-    }
-    case SVC_DISABLE_ALL_EXCEPTIONS:
-    {
-      __disable_irq();
-      __set_CONTROL(__get_CONTROL() & 0xFFFE); /* bit 0 = 0: remain privileged   */
-      /* note: exiting the SVC will go back to PSP stack but remain priv mode */
-      break;
-    }
-    case SVC_SUBGHZ_INIT:
-    {
-      MX_SUBGHZ_Init();
-      break;
-    }
-    case SVC_NVIC_ENABLE_IRQ:
-    {
-      __NVIC_EnableIRQ((IRQn_Type) args[0]);
-      break;
-    }
-    case SVC_NVIC_GET_ENABLE_IRQ:
-    {
-#if __ARMCC_VERSION
-      *ptr_args[1] = __NVIC_GetEnableIRQ((IRQn_Type) args[0]);
-#else
-      __NVIC_GetEnableIRQ((IRQn_Type) args[0]);
-#endif
-      break;
-    }
-    case SVC_NVIC_GET_PENDING_IRQ:
-    {
-#if __ARMCC_VERSION
-      *ptr_args[1] = __NVIC_GetPendingIRQ((IRQn_Type) args[0]);
-#else
-      __NVIC_GetPendingIRQ((IRQn_Type) args[0]);
-#endif
-      break;
-    }
-    case SVC_NVIC_SET_PENDING_IRQ:
-    {
-      __NVIC_SetPendingIRQ((IRQn_Type) args[0]);
-      break;
-    }
-    case SVC_NVIC_CLEAR_PENDING_IRQ:
-    {
-      __NVIC_ClearPendingIRQ((IRQn_Type) args[0]);
-      break;
-    }
-    case SVC_NVIC_SET_PRIORITY:
-    {
-      __NVIC_SetPriority((IRQn_Type) args[0], args[1]);
-      break;
-    }
-    case SVC_NVIC_GET_PRIORITY:
-    {
-#if __ARMCC_VERSION
-      *ptr_args[1] = __NVIC_GetPriority((IRQn_Type) args[0]);
-#else
-      __NVIC_GetPriority((IRQn_Type) args[0]);
-#endif
-      break;
-    }
-    case SVC_NVIC_SYSTEM_RESET:
-    {
-      __NVIC_SystemReset();
-      break;
-    }
-    default:
-    {
-      break;
-    }
-  }
-}
-
-/**
-  * @brief Maps MSP on Privileged region and set up PSP to current stack pointer 
-  * @param void
-  * @retval void
-  */
-void ThumbState_RemapMspAndSwitchToPspStack(void)
-{
-  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
-  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change Main Stack to point on privileged stack */
-  __ISB();
-}
-
-/**
-  * @brief This is a helper function to enter the unprivileged level for software execution
-  * @param void
-  * @retval void
-  */
-void ThumbState_EnterUnprivilegedMode(void)
-{
-  __set_CONTROL(__get_CONTROL() | 3); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
-  __ISB();
-}
-
-
-/**
-  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
-  * @param void
-  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
-  */
-uint32_t ThumbState_IsUnprivileged(void)
-{
-  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c
deleted file mode 100644
index e9d1b173..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    sys_privileged_wrap.c
-  * @author  MCD Application Team
-  * @brief   Wrapper functions to call SVC when in Unprivilege mode
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sys_privileged_wrap.h"
-#include "sys_privileged_services.h"
-#include "stm32_seq.h"
-#include "subghz.h"
-#include "sys_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-uint32_t SYS_PRIVIL_EnterCriticalSection( void)
-{
-  uint32_t nvic_iser_state;
-
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    /* disable NVIC irqs, then back to PSP and Unpriv */
-#if (__ARMCC_VERSION)
-    SVC_SYS_DisableAllNvicIrqs(&nvic_iser_state);
-#else
-    nvic_iser_state = SVC_SYS_DisableAllNvicIrqs(); 
-#endif
-  }
-  else
-  {
-    nvic_iser_state= NVIC->ISER[0];
-    NVIC->ICER[0]=nvic_iser_state;
-  }
-  return nvic_iser_state;
-}
-
-void SYS_PRIVIL_ExitCriticalSection( uint32_t nvic_iser_state)
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_SYS_RestoreNvicIrqs(nvic_iser_state);  /* enable NVIC irqs, then back to PSP and Unpriv */
-  }
-  else
-  {
-    NVIC->ISER[0]=nvic_iser_state | NVIC->ISER[0];
-  }
-}
-
-void SYS_PRIVIL_DisableIrqsAndRemainPriv( void )
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_SYS_DisableAllExceptions(); /* disable exceptions and after SVC keeps MODE Privileged! (stack goes back to PSP)*/
-  }
-  else
-  {
-    __disable_irq();
-  }
-}
-
-void SYS_PRIVIL_EnableIrqsAndGoUnpriv( void )
-{
-  __enable_irq();
-#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
-  ThumbState_EnterUnprivilegedMode(); /* Goes always Unpriv */
-#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
-#error SECURE_UNPRIVILEGE_ENABLE not defined
-#endif /* SECURE_UNPRIVILEGE_ENABLE */
-}
-
-void SYS_PRIVIL_SUBGHZ_Init( void )
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_MX_SUBGHZ_Init();
-  }
-  else
-  {
-    MX_SUBGHZ_Init();
-  }
-}
-
-void SYS_PRIVIL_NVIC_EnableIRQ(IRQn_Type IRQn)
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_NVIC_EnableIRQ(IRQn);
-  }
-  else
-  {
-    __NVIC_EnableIRQ(IRQn);
-  }
-}
-
-
-uint32_t SYS_PRIVIL_NVIC_GetEnableIRQ(IRQn_Type IRQn)
-{
-  uint32_t irqn_state;
-
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-#if (__ARMCC_VERSION)
-    SVC_NVIC_GetEnableIRQ(IRQn, &irqn_state);
-#else
-    irqn_state = SVC_NVIC_GetEnableIRQ(IRQn);
-#endif
-  }
-  else
-  {
-    irqn_state = __NVIC_GetEnableIRQ(IRQn);
-  }
-  return irqn_state;
-}
-
-
-void SYS_PRIVIL_NVIC_DisableIRQ(IRQn_Type IRQn)
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_NVIC_DisableIRQ(IRQn);
-  }
-  else
-  {
-    __NVIC_DisableIRQ(IRQn);
-  }
-}
-
-
-uint32_t SYS_PRIVIL_NVIC_GetPendingIRQ(IRQn_Type IRQn)
-{
-  uint32_t irqn_pending_state;
-
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-#if (__ARMCC_VERSION)
-    SVC_NVIC_GetPendingIRQ(IRQn, &irqn_pending_state);
-#else
-    irqn_pending_state = SVC_NVIC_GetPendingIRQ(IRQn);
-#endif
-  }
-  else
-  {
-    irqn_pending_state = __NVIC_GetPendingIRQ(IRQn);
-  }
-  return irqn_pending_state;
-}
-
-void SYS_PRIVIL_NVIC_SetPendingIRQ(IRQn_Type IRQn)
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_NVIC_SetPendingIRQ(IRQn);
-  }
-  else
-  {
-    __NVIC_SetPendingIRQ(IRQn);
-  }
-}
-
-void SYS_PRIVIL_NVIC_ClearPendingIRQ(IRQn_Type IRQn)
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_NVIC_ClearPendingIRQ(IRQn);
-  }
-  else
-  {
-    __NVIC_ClearPendingIRQ(IRQn);
-  }
-}
-
-void SYS_PRIVIL_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_NVIC_SetPriority(IRQn, priority);
-  }
-  else
-  {
-    __NVIC_SetPriority(IRQn, priority);
-  }
-}
-
-uint32_t SYS_PRIVIL_NVIC_GetPriority(IRQn_Type IRQn)
-{
-  uint32_t irqn_prio;
-
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-#if (__ARMCC_VERSION)
-    SVC_NVIC_GetPriority(IRQn, &irqn_prio);
-#else
-    irqn_prio = SVC_NVIC_GetPriority(IRQn);
-#endif
-  }
-  else
-  {
-    irqn_prio = __NVIC_GetPriority(IRQn);
-  }
-  return irqn_prio;
-}
-
-void SYS_PRIVIL_NVIC_SystemReset( void )
-{
-  if (ThumbState_IsUnprivileged() != 0)
-  {
-    SVC_NVIC_SystemReset();
-  }
-  else
-  {
-    __NVIC_SystemReset();
-  }
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private functions ---------------------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
deleted file mode 100644
index 6133e380..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    timer_if.c
-  * @author  MCD Application Team
-  * @brief   Configure RTC Alarm, Tick and Calendar manager
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
-#include "timer_if.h"
-#include "stm32_lpm.h"
-#include "utilities_def.h"
-#include "stm32wlxx_ll_rtc.h"
-#include "msg_id.h"
-#include "mbmuxif_sys.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/**
-  * @brief RTC handle
-  */
-extern RTC_HandleTypeDef hrtc;
-
-/**
-  * @brief Timer driver callbacks handler
-  */
-const UTIL_TIMER_Driver_s UTIL_TimerDriver =
-{
-  TIMER_IF_Init,
-  NULL,
-
-  TIMER_IF_StartTimer,
-  TIMER_IF_StopTimer,
-
-  TIMER_IF_SetTimerContext,
-  TIMER_IF_GetTimerContext,
-
-  TIMER_IF_GetTimerElapsedTime,
-  TIMER_IF_GetTimerValue,
-  TIMER_IF_GetMinimumTimeout,
-
-  TIMER_IF_Convert_ms2Tick,
-  TIMER_IF_Convert_Tick2ms,
-};
-
-/**
-  * @brief SysTime driver callbacks handler
-  */
-const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
-{
-  TIMER_IF_BkUp_Write_Seconds,
-  TIMER_IF_BkUp_Read_Seconds,
-  TIMER_IF_BkUp_Write_SubSeconds,
-  TIMER_IF_BkUp_Read_SubSeconds,
-  TIMER_IF_GetTime,
-};
-
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/**
-  * @brief Minimum timeout delay of Alarm in ticks
-  */
-#define MIN_ALARM_DELAY    3
-
-/**
-  * @brief Backup seconds register
-  */
-#define RTC_BKP_SECONDS    RTC_BKP_DR0
-
-/**
-  * @brief Backup subseconds register
-  */
-#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
-
-/**
-  * @brief Backup msbticks register
-  */
-#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
-
-/* #define RTIF_DEBUG */
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-#ifdef RTIF_DEBUG
-#include "sys_app.h" /*for app_log*/
-/**
-  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
-  */
-#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
-#else
-/**
-  * @brief not used
-  */
-#define TIMER_IF_DBG_PRINTF(...)
-#endif /* RTIF_DEBUG */
-
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Indicates if the RTC is already Initialized or not
-  */
-static bool RTC_Initialized = false;
-
-/**
-  * @brief RtcTimerContext
-  */
-static uint32_t RtcTimerContext = 0;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Get rtc timer Value in rtc tick
-  * @return val the rtc timer value (upcounting)
-  */
-static inline uint32_t GetTimerTicks(void);
-
-/**
-  * @brief Writes MSBticks to backup register
-  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
-  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
-  * @param[in] MSBticks
-  * @return none
-  */
-static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
-
-/**
-  * @brief Reads MSBticks from backup register
-  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
-  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
-  * @retval MSBticks
-  */
-static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions ---------------------------------------------------------*/
-UTIL_TIMER_Status_t TIMER_IF_Init(void)
-{
-  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
-
-  /* USER CODE END TIMER_IF_Init_1 */
-  if (RTC_Initialized == false)
-  {
-    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
-    /*Init RTC*/
-    MX_RTC_Init();
-    /*Stop Timer */
-    TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A and Alarm B enabled by MX during MX_RTC_Init() */
-    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
-    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
-    /*overload RTC feature enable*/
-    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
-
-    /*Enable Direct Read of the calendar registers (not through Shadow) */
-    HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
-    TIMER_IF_BkUp_Write_MSBticks(0);
-
-    TIMER_IF_SetTimerContext();
-
-    RTC_Initialized = true;
-  }
-
-  /* USER CODE BEGIN TIMER_IF_Init_Last */
-
-  /* USER CODE END TIMER_IF_Init_Last */
-  return ret;
-}
-
-UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
-{
-  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_StartTimer */
-
-  /* USER CODE END TIMER_IF_StartTimer */
-  RTC_AlarmTypeDef sAlarm = {0};
-  /*Stop timer if one is already started*/
-  TIMER_IF_StopTimer();
-  timeout += RtcTimerContext;
-
-  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
-  /* starts timer*/
-  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
-  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
-  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
-  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
-  sAlarm.Alarm = RTC_ALARM_B;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
-
-  /* USER CODE END TIMER_IF_StartTimer_Last */
-  return ret;
-}
-
-UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
-{
-  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_StopTimer */
-
-  /* USER CODE END TIMER_IF_StopTimer */
-  /* Clear RTC Alarm Flag */
-  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRBF);
-  /* Disable the Alarm A interrupt */
-  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B);
-  /*overload RTC feature enable*/
-  hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
-  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
-
-  /* USER CODE END TIMER_IF_StopTimer_Last */
-  return ret;
-}
-
-uint32_t TIMER_IF_SetTimerContext(void)
-{
-  /*store time context*/
-  RtcTimerContext = GetTimerTicks();
-
-  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
-
-  /* USER CODE END TIMER_IF_SetTimerContext */
-
-  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
-  /*return time context*/
-  return RtcTimerContext;
-}
-
-uint32_t TIMER_IF_GetTimerContext(void)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
-
-  /* USER CODE END TIMER_IF_GetTimerContext */
-
-  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
-  /*return time context*/
-  return RtcTimerContext;
-}
-
-uint32_t TIMER_IF_GetTimerElapsedTime(void)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
-
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
-
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
-}
-
-uint32_t TIMER_IF_GetTimerValue(void)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
-
-  /* USER CODE END TIMER_IF_GetTimerValue */
-  if (RTC_Initialized == true)
-  {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
-  }
-  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
-
-  /* USER CODE END TIMER_IF_GetTimerValue_Last */
-}
-
-uint32_t TIMER_IF_GetMinimumTimeout(void)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
-
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
-
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
-}
-
-uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
-{
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
-
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
-
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
-}
-
-uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
-{
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
-
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
-
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
-}
-
-void TIMER_IF_DelayMs(uint32_t delay)
-{
-  /* USER CODE BEGIN TIMER_IF_DelayMs */
-
-  /* USER CODE END TIMER_IF_DelayMs */
-  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
-  uint32_t timeout = GetTimerTicks();
-
-  /* Wait delay ms */
-  while (((GetTimerTicks() - timeout)) < delayTicks)
-  {
-    __NOP();
-  }
-  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
-
-  /* USER CODE END TIMER_IF_DelayMs_Last */
-}
-
-void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
-{
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
-
-  /* USER CODE END HAL_RTC_AlarmAEventCallback */
-  MBMUX_ComParam_t *com_obj;
-
-  if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
-  {
-    /*Alarm A reserved for CM4: notify CM4 that Alarm A was raised */
-    com_obj = MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
-    if (com_obj != NULL)
-    {
-      com_obj->MsgId = SYS_RTC_ALARM_MSG_ID;
-      com_obj->ParamCnt = 0;
-      MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
-    }
-  }
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
-
-  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
-}
-
-void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
-{
-  /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
-
-  /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
-  UTIL_TIMER_IRQ_Handler();
-  /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
-
-  /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
-}
-
-void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
-{
-  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback */
-
-  /* USER CODE END HAL_RTCEx_SSRUEventCallback */
-  /*called every 48 days with 1024 ticks per seconds*/
-  TIMER_IF_DBG_PRINTF(">>Handler SSRUnderflow at %d\n\r", GetTimerTicks());
-  /*Increment MSBticks*/
-  uint32_t MSB_ticks = TIMER_IF_BkUp_Read_MSBticks();
-  TIMER_IF_BkUp_Write_MSBticks(MSB_ticks + 1);
-  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback_Last */
-
-  /* USER CODE END HAL_RTCEx_SSRUEventCallback_Last */
-}
-
-uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTime */
-
-  /* USER CODE END TIMER_IF_GetTime */
-  uint64_t ticks;
-  uint32_t timerValueLsb = GetTimerTicks();
-  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
-
-  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
-
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
-
-  ticks = (uint32_t) ticks & RTC_PREDIV_S;
-
-  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
-
-  return seconds;
-  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
-
-  /* USER CODE END TIMER_IF_GetTime_Last */
-}
-
-void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
-  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
-}
-
-void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
-  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
-}
-
-uint32_t TIMER_IF_BkUp_Read_Seconds(void)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
-}
-
-uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private functions ---------------------------------------------------------*/
-static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks */
-  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_MSBTICKS, MSBticks);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks_Last */
-}
-
-static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
-  uint32_t MSBticks;
-  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
-  return MSBticks;
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
-}
-
-static inline uint32_t GetTimerTicks(void)
-{
-  /* USER CODE BEGIN GetTimerTicks */
-
-  /* USER CODE END GetTimerTicks */
-  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
-  /* USER CODE BEGIN GetTimerTicks_Last */
-
-  /* USER CODE END GetTimerTicks_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
deleted file mode 100644
index bb1c4293..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * \file      Commissioning.h
- *
- * \brief     End-device commissioning parameters
- *
- * \copyright Revised BSD License, see section \ref LICENSE.
- *
- * \code
- *                ______                              _
- *               / _____)             _              | |
- *              ( (____  _____ ____ _| |_ _____  ____| |__
- *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- *               _____) ) ____| | | || |_| ____( (___| | | |
- *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
- *              (C)2013-2020 Semtech
- *
- * \endcode
- */
-/**
-  ******************************************************************************
-  *
-  *          Portions COPYRIGHT 2020 STMicroelectronics
-  *
-  * @file    Commissioning.h
-  * @author  MCD Application Team
-  * @brief   End-device commissioning parameters
-  ******************************************************************************
- */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __COMMISSIONING_H__
-#define __COMMISSIONING_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*!
- ******************************************************************************
- ********************************** WARNING ***********************************
- ******************************************************************************
-
- The LoRaWAN AES128 keys are stored and provisionned on secure-elements.
-
- This project providdes a software emulated secure-element.
- The LoRaWAN AES128 keys SHALL be updated under
- src/peripherals/<secure-element name>-se\se-identity.h file.
-
- ******************************************************************************
- ******************************************************************************
- ******************************************************************************
- */
-#include "se-identity.h"
-
-/* USER CODE BEGIN EC1 */
-
-/* USER CODE END EC1 */
-
-/*!
- * When using ABP activation the MAC layer must know in advance to which server
- * version it will be connected.
- */
-#define ABP_ACTIVATION_LRWAN_VERSION_V10x                  0x01000300 /* 1.0.3.0 */
-
-#define ABP_ACTIVATION_LRWAN_VERSION                       ABP_ACTIVATION_LRWAN_VERSION_V10x
-
-/*!
- * Indicates if the end-device support the operation with repeaters
- */
-#define LORAWAN_REPEATER_SUPPORT                           false
-
-/*!
- * Indicates if the end-device is to be connected to a private or public network
- */
-#define LORAWAN_PUBLIC_NETWORK                             true
-
-/*!
- * Current network ID
- */
-#define LORAWAN_NETWORK_ID                                 ( uint32_t )0
-
-/* USER CODE BEGIN EC2 */
-
-/* USER CODE END EC2 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
deleted file mode 100644
index bd1de5a0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_lorawan.c
-  * @author  MCD Application Team
-  * @brief   Application of the LRWAN Middleware
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_lorawan.h"
-#include "lora_app.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-void MX_LoRaWAN_Init(void)
-{
-  /* USER CODE BEGIN MX_LoRaWAN_Init_1 */
-
-  /* USER CODE END MX_LoRaWAN_Init_1 */
-  SystemApp_Init();
-  /* USER CODE BEGIN MX_LoRaWAN_Init_2 */
-
-  /* USER CODE END MX_LoRaWAN_Init_2 */
-}
-
-void MX_LoRaWAN_Process(void)
-{
-  /* USER CODE BEGIN MX_LoRaWAN_Process_1 */
-
-  /* USER CODE END MX_LoRaWAN_Process_1 */
-  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
-  /* USER CODE BEGIN MX_LoRaWAN_Process_2 */
-
-  /* USER CODE END MX_LoRaWAN_Process_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
deleted file mode 100644
index 2c49b393..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_lorawan.h
-  * @author  MCD Application Team
-  * @brief   Header of application of the LRWAN Middleware
-   ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __APP_LORAWAN_H__
-#define __APP_LORAWAN_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported Functions Prototypes------------------------------------------------------- */
-/**
-  * @brief  Init Lora Application
-  * @param None
-  * @retval None
-  */
-void MX_LoRaWAN_Init(void);
-
-/**
-  * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
-  */
-void MX_LoRaWAN_Process(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__APP_LORAWAN_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
deleted file mode 100644
index 804a2ea0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lora_app.c
-  * @author  MCD Application Team
-  * @brief   Application of the LRWAN Middleware
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sys_app.h"
-#include "lora_app.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-#include "LmHandler.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Exported functions ---------------------------------------------------------*/
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-void InitPackageProcess(void)
-{
-  /* USER CODE BEGIN InitPackageProcess_1 */
-
-  /* USER CODE END InitPackageProcess_1 */
-  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLmHandlerProcess), UTIL_SEQ_RFU, LmHandlerProcess);
-  /* USER CODE BEGIN InitPackageProcess_2 */
-
-  /* USER CODE END InitPackageProcess_2 */
-}
-
-void OnMacProcessNotify(void)
-{
-  /* USER CODE BEGIN OnMacProcessNotify_1 */
-
-  /* USER CODE END OnMacProcessNotify_1 */
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLmHandlerProcess), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnMacProcessNotify_2 */
-
-  /* USER CODE END OnMacProcessNotify_2 */
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
deleted file mode 100644
index 25340cb3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lora_app.h
-  * @author  MCD Application Team
-  * @brief   Header of application of the LRWAN Middleware
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __LORA_APP_H__
-#define __LORA_APP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-
-void InitPackageProcess(void);
-
-void OnMacProcessNotify(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__LORA_APP_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
deleted file mode 100644
index 55a1f921..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lora_app_version.h
-  * @author  MCD Application Team
-  * @brief   Definition the version of the CM0PLUS application
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __APP_VERSION_H__
-#define __APP_VERSION_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
-#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
-#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
-
-#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
-#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
-#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
-#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macros -----------------------------------------------------------*/
-/**
-  * @brief Application version
-  */
-#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
-                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
-                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
-                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
-
-/**
-  * @brief LoRaWAN CM0PLUS application version
-  */
-#define __CM0_APP_VERSION             __APP_VERSION
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__APP_VERSION_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
deleted file mode 100644
index 77f059d3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/*!
- * \file      se-identity_template.h
- *
- * \brief     Secure Element identity and keys
- *
- * \copyright Revised BSD License, see section \ref LICENSE.
- *
- * \code
- *                ______                              _
- *               / _____)             _              | |
- *              ( (____  _____ ____ _| |_ _____  ____| |__
- *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
- *               _____) ) ____| | | || |_| ____( (___| | | |
- *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
- *              (C)2020 Semtech
- *
- *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
- *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
- *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
- *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
- *              embedded.connectivity.solutions===============
- *
- * \endcode
- *
- */
-/**
-  ******************************************************************************
-  *
-  *          Portions COPYRIGHT 2020 STMicroelectronics
-  *
-  * @file    se-identity_template.c
-  * @author  MCD Application Team
-  * @brief   Secure Element identity and keys
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SOFT_SE_IDENTITY_H__
-#define __SOFT_SE_IDENTITY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Exported Includes --------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-
-/*!
- ******************************************************************************
- ********************************** WARNING ***********************************
- ******************************************************************************
-  The secure-element implementation supports both 1.0.x and 1.1.x LoRaWAN
-  versions of the specification.
-  Thus it has been decided to use the 1.1.x keys and EUI name definitions.
-  The below table shows the names equivalence between versions:
-               +---------------------+-------------------------+
-               |       1.0.x         |          1.1.x          |
-               +=====================+=========================+
-               | LORAWAN_DEVICE_EUI  | LORAWAN_DEVICE_EUI      |
-               +---------------------+-------------------------+
-               | LORAWAN_APP_EUI     | LORAWAN_JOIN_EUI        |
-               +---------------------+-------------------------+
-               | LORAWAN_GEN_APP_KEY | LORAWAN_APP_KEY         |
-               +---------------------+-------------------------+
-               | LORAWAN_APP_KEY     | LORAWAN_NWK_KEY         |
-               +---------------------+-------------------------+
-               | LORAWAN_NWK_S_KEY   | LORAWAN_F_NWK_S_INT_KEY |
-               +---------------------+-------------------------+
-               | LORAWAN_NWK_S_KEY   | LORAWAN_S_NWK_S_INT_KEY |
-               +---------------------+-------------------------+
-               | LORAWAN_NWK_S_KEY   | LORAWAN_NWK_S_ENC_KEY   |
-               +---------------------+-------------------------+
-               | LORAWAN_APP_S_KEY   | LORAWAN_APP_S_KEY       |
-               +---------------------+-------------------------+
- ******************************************************************************
- ******************************************************************************
- ******************************************************************************
- */
-
-/*!
- * When set to 1 DevEui is LORAWAN_DEVICE_EUI
- * When set to 0 DevEui is automatically set with a value provided by MCU platform
- */
-#define STATIC_DEVICE_EUI                                  0
-
-/*!
- * end-device IEEE EUI (big endian)
- */
-#define LORAWAN_DEVICE_EUI                                 { 0x00, 0x80, 0xE1, 0x01, 0x01, 0x01, 0x01, 0x01 }
-
-/*!
- * App/Join server IEEE EUI (big endian)
- */
-#define LORAWAN_JOIN_EUI                                   { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }
-
-/*!
- * When set to 1 DevAddr is LORAWAN_DEVICE_ADDRESS
- * When set to 0 DevAddr is automatically set with a value provided by a pseudo
- *      random generator seeded with a value provided by the MCU platform
- */
-#define STATIC_DEVICE_ADDRESS                              0
-
-/*!
- * Device address on the network (big endian)
- */
-#define LORAWAN_DEVICE_ADDRESS                             ( uint32_t )0x0100000A
-
-/*!
- * Application root key
- */
-#define LORAWAN_APP_KEY                                    2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
-
-/*!
- * Network root key
- */
-#define LORAWAN_NWK_KEY                                    2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
-
-/*!
- * Forwarding Network session key
- */
-#define LORAWAN_NWK_S_KEY                                  2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
-
-/*!
- * Application session key
- */
-#define LORAWAN_APP_S_KEY                                  2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
-
-/*!
- * Format commissioning keys
- */
-#define RAW_TO_INT8A(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) {0x##a,0x##b,0x##c,0x##d,\
-                                                        0x##e,0x##f,0x##g,0x##h,\
-                                                        0x##i,0x##j,0x##k,0x##l,\
-                                                        0x##m,0x##n,0x##o,0x##p}
-
-#define FORMAT_KEY(...) RAW_TO_INT8A(__VA_ARGS__)
-
-#if (USE_LRWAN_1_1_X_CRYPTO == 1)
-#define SESSION_KEYS_LIST                                                                                           \
-           {                                                                                                        \
-            /*!                                                                                                     \
-             * Join session integrity key (Dynamically updated)                                                     \
-             * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
-             */                                                                                                     \
-            .KeyID    = J_S_INT_KEY,                                                                                \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Join session encryption key (Dynamically updated)                                                    \
-             * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
-             */                                                                                                     \
-            .KeyID    = J_S_ENC_KEY,                                                                                \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Forwarding Network session integrity key                                                             \
-             * WARNING: NWK_S_KEY FOR 1.0.x DEVICES                                                                 \
-             */                                                                                                     \
-            .KeyID    = F_NWK_S_INT_KEY,                                                                            \
-            .KeyValue = FORMAT_KEY(LORAWAN_NWK_S_KEY),                                                              \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Serving Network session integrity key                                                                \
-             * WARNING: NOT USED FOR 1.0.x DEVICES. MUST BE THE SAME AS \ref LORAWAN_F_NWK_S_INT_KEY                \
-             */                                                                                                     \
-            .KeyID    = S_NWK_S_INT_KEY,                                                                            \
-            .KeyValue = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, \
-                          0x3C },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Network session encryption key                                                                       \
-             * WARNING: NOT USED FOR 1.0.x DEVICES. MUST BE THE SAME AS \ref LORAWAN_F_NWK_S_INT_KEY                \
-             */                                                                                                     \
-            .KeyID    = NWK_S_ENC_KEY,                                                                              \
-            .KeyValue = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, \
-                          0x3C },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Application session key                                                                              \
-             */                                                                                                     \
-            .KeyID    = APP_S_KEY,                                                                                  \
-            .KeyValue = FORMAT_KEY(LORAWAN_APP_S_KEY),                                                              \
-        },
-#else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
-#define SESSION_KEYS_LIST                                                                                           \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Network session key                                                                                  \
-             */                                                                                                     \
-            .KeyID    = NWK_S_KEY,                                                                                  \
-            .KeyValue = FORMAT_KEY(LORAWAN_NWK_S_KEY),                                                              \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Application session key                                                                              \
-             */                                                                                                     \
-            .KeyID    = APP_S_KEY,                                                                                  \
-            .KeyValue = FORMAT_KEY(LORAWAN_APP_S_KEY),                                                              \
-        },
-#endif /* USE_LRWAN_1_1_X_CRYPTO */
-
-#if (LORAMAC_MAX_MC_CTX == 1)
-#define SESSION_MC_KEYS_LIST                                                                                        \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #0 root key (Dynamically updated)                                                    \
-             */                                                                                                     \
-            .KeyID    = MC_KEY_0,                                                                                   \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #0 application session key (Dynamically updated)                                     \
-             */                                                                                                     \
-            .KeyID    = MC_APP_S_KEY_0,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #0 network session key (Dynamically updated)                                         \
-             */                                                                                                     \
-            .KeyID    = MC_NWK_S_KEY_0,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },
-#else /* LORAMAC_MAX_MC_CTX > 1 */
-#define SESSION_MC_KEYS_LIST                                                                                        \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #0 root key (Dynamically updated)                                                    \
-             */                                                                                                     \
-            .KeyID    = MC_KEY_0,                                                                                   \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #0 application session key (Dynamically updated)                                     \
-             */                                                                                                     \
-            .KeyID    = MC_APP_S_KEY_0,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #0 network session key (Dynamically updated)                                         \
-             */                                                                                                     \
-            .KeyID    = MC_NWK_S_KEY_0,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #1 root key (Dynamically updated)                                                    \
-             */                                                                                                     \
-            .KeyID    = MC_KEY_1,                                                                                   \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #1 application session key (Dynamically updated)                                     \
-             */                                                                                                     \
-            .KeyID    = MC_APP_S_KEY_1,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #1 network session key (Dynamically updated)                                         \
-             */                                                                                                     \
-            .KeyID    = MC_NWK_S_KEY_1,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #2 root key (Dynamically updated)                                                    \
-             */                                                                                                     \
-            .KeyID    = MC_KEY_2,                                                                                   \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #2 application session key (Dynamically updated)                                     \
-             */                                                                                                     \
-            .KeyID    = MC_APP_S_KEY_2,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #2 network session key (Dynamically updated)                                         \
-             */                                                                                                     \
-            .KeyID    = MC_NWK_S_KEY_2,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #3 root key (Dynamically updated)                                                    \
-             */                                                                                                     \
-            .KeyID    = MC_KEY_3,                                                                                   \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #3 application session key (Dynamically updated)                                     \
-             */                                                                                                     \
-            .KeyID    = MC_APP_S_KEY_3,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast group #3 network session key (Dynamically updated)                                         \
-             */                                                                                                     \
-            .KeyID    = MC_NWK_S_KEY_3,                                                                             \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },
-#endif /* LORAMAC_MAX_MC_CTX */
-
-#define SOFT_SE_KEY_LIST                                                                                            \
-    {                                                                                                               \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Application root key                                                                                 \
-             * WARNING: FOR 1.0.x DEVICES IT IS THE \ref LORAWAN_GEN_APP_KEY                                        \
-             */                                                                                                     \
-            .KeyID    = APP_KEY,                                                                                    \
-            .KeyValue = FORMAT_KEY(LORAWAN_APP_KEY),                                                                \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Network root key                                                                                     \
-             * WARNING: FOR 1.0.x DEVICES IT IS THE \ref LORAWAN_APP_KEY                                            \
-             */                                                                                                     \
-            .KeyID    = NWK_KEY,                                                                                    \
-            .KeyValue = FORMAT_KEY(LORAWAN_NWK_KEY),                                                                \
-        },                                                                                                          \
-        SESSION_KEYS_LIST                                                                                           \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast root key (Dynamically updated)                                                             \
-             */                                                                                                     \
-            .KeyID    = MC_ROOT_KEY,                                                                                \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * Multicast key encryption key (Dynamically updated)                                                   \
-             */                                                                                                     \
-            .KeyID    = MC_KE_KEY,                                                                                  \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-        SESSION_MC_KEYS_LIST                                                                                        \
-        {                                                                                                           \
-            /*!                                                                                                     \
-             * All zeros key. (ClassB usage)(constant)                                                              \
-             */                                                                                                     \
-            .KeyID    = SLOT_RAND_ZERO_KEY,                                                                         \
-            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-                          0x00 },                                                                                   \
-        },                                                                                                          \
-    }
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /*  __SOFT_SE_IDENTITY_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
deleted file mode 100644
index 40102900..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lorawan_conf.h
-  * @author  MCD Application Team
-  * @brief   Header for LoRaWAN middleware instances
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __LORAWAN_CONF_H__
-#define __LORAWAN_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-#include "sys_app.h"   /* needed for APP_PRINTF */
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-#define LORAWAN_KMS 1
-#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-#else /* LORAWAN_KMS == 1 */
-#define OVER_THE_AIR_ACTIVATION 1
-#define ACTIVATION_BY_PERSONALISATION 1
-#endif
-#define LORAWAN_DATA_DISTRIB_MGT   1
-
-/* Region ------------------------------------*/
-/* the region listed here will be linked in the CM0 MW code */
-/* the applic (on CM4/sys_conf.h) shall just configure one region at the time */
-/*#define REGION_AS923*/
-/*#define REGION_AU915*/
-/*#define REGION_CN470*/
-/*#define REGION_CN779*/
-/*#define REGION_EU433*/
-#define REGION_EU868
-/*#define REGION_KR920*/
-/*#define REGION_IN865*/
-/*#define REGION_US915*/
-/*#define REGION_RU864*/
-
-#define HYBRID_ENABLED          0
-
-#define KEY_LOG_ENABLED         0
-
-/* Class B ------------------------------------*/
-#define LORAMAC_CLASSB_ENABLED  0
-
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-/* CLASS B LSE crystall calibration*/
-/**
-  * \brief Temperature coefficient of the clock source
-  */
-#define RTC_TEMP_COEFFICIENT                            ( -0.035 )
-
-/**
-  * \brief Temperature coefficient deviation of the clock source
-  */
-#define RTC_TEMP_DEV_COEFFICIENT                        ( 0.0035 )
-
-/**
-  * \brief Turnover temperature of the clock source
-  */
-#define RTC_TEMP_TURNOVER                               ( 25.0 )
-
-/**
-  * \brief Turnover temperature deviation of the clock source
-  */
-#define RTC_TEMP_DEV_TURNOVER                           ( 5.0 )
-#endif /* LORAMAC_CLASSB_ENABLED == 1 */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-#ifndef CRITICAL_SECTION_BEGIN
-#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
-#endif /* !CRITICAL_SECTION_BEGIN */
-#ifndef CRITICAL_SECTION_END
-#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
-#endif /* !CRITICAL_SECTION_END */
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __LORAWAN_CONF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
deleted file mode 100644
index 30bb33de..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mw_log_conf.h
-  * @author  MCD Application Team
-  * @brief   Configure (enable/disable) traces for CM0
-  *******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MW_LOG_CONF_H__
-#define __MW_LOG_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_adv_trace.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-#define MW_LOG_ENABLED
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-#ifdef MW_LOG_ENABLED
-#define MW_LOG(TS,VL, ...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0)
-#else  /* MW_LOG_ENABLED */
-#define MW_LOG(TS,VL, ...)
-#endif /* MW_LOG_ENABLED */
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MW_LOG_CONF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
deleted file mode 100644
index 43ea55a8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    radio_board_if.c
-  * @author  MCD Application Team
-  * @brief   This file provides an interface layer between MW and Radio Board
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Includes ------------------------------------------------------------------*/
-#include "radio_board_if.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t RBI_Init(void)
-{
-  /* USER CODE BEGIN RBI_Init_1 */
-
-  /* USER CODE END RBI_Init_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
-#else
-  /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
-}
-
-int32_t RBI_DeInit(void)
-{
-  /* USER CODE BEGIN RBI_DeInit_1 */
-
-  /* USER CODE END RBI_DeInit_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
-#else
-  /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
-}
-
-int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
-{
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_1 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
-#else
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
-}
-
-int32_t RBI_GetTxConfig(void)
-{
-  /* USER CODE BEGIN RBI_GetTxConfig_1 */
-
-  /* USER CODE END RBI_GetTxConfig_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
-#else
-  /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
-}
-
-int32_t RBI_IsTCXO(void)
-{
-  /* USER CODE BEGIN RBI_IsTCXO_1 */
-
-  /* USER CODE END RBI_IsTCXO_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
-#else
-  /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
-}
-
-int32_t RBI_IsDCDC(void)
-{
-  /* USER CODE BEGIN RBI_IsDCDC_1 */
-
-  /* USER CODE END RBI_IsDCDC_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
-#else
-  /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
deleted file mode 100644
index 3e3c7abb..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    radio_board_if.h
-  * @author  MCD Application Team
-  * @brief   Header for Radio interface configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef RADIO_BOARD_IF_H
-#define RADIO_BOARD_IF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-/* USER CODE BEGIN include */
-
-/* USER CODE END include */
-
-/* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
-#if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
-/* In order to use BSP driver, add the correspondent files in the IDE workspace */
-/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-#define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
-#define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
-#define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
-#else
-/* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
-/* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-
-#if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
-/* In order to use BSP driver, add the correspondent files in the IDE workspace */
-/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-
-#elif defined(MX_NUCLEO_WL55JC1)
-
-/* Indicates the type of switch between the ones proposed by CONFIG Constants
- */
-#define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
-
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     10U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   1U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-
-#if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
-/* In order to use BSP driver, add the correspondent files in the IDE workspace */
-/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
-#else
-/* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
-/* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
-
-/* USER CODE BEGIN Exported_Defines */
-
-/* USER CODE END Exported_Defines */
-
-/* Exported types ------------------------------------------------------------*/
-
-#if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
-/* In order to use BSP driver, add the correspondent files in the IDE workspace */
-/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-typedef enum
-{
-  RBI_SWITCH_OFF    = RADIO_SWITCH_OFF,
-  RBI_SWITCH_RX     = RADIO_SWITCH_RX,
-  RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
-  RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
-} RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
-typedef enum
-{
-  RBI_SWITCH_OFF    = 0,
-  RBI_SWITCH_RX     = 1,
-  RBI_SWITCH_RFO_LP = 2,
-  RBI_SWITCH_RFO_HP = 3,
-} RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions ------------------------------------------------------- */
-/**
-  * @brief  Init Radio Switch
-  * @return BSP status
-  */
-int32_t RBI_Init(void);
-
-/**
-  * @brief  DeInit Radio Switch
-  * @return BSP status
-  */
-int32_t RBI_DeInit(void);
-
-/**
-  * @brief  Configure Radio Switch.
-  * @param  Config: Specifies the Radio RF switch path to be set.
-  *         This parameter can be one of following parameters:
-  *           @arg RADIO_SWITCH_OFF
-  *           @arg RADIO_SWITCH_RX
-  *           @arg RADIO_SWITCH_RFO_LP
-  *           @arg RADIO_SWITCH_RFO_HP
-  * @return BSP status
-  */
-int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
-
-/**
-  * @brief  Return Board Configuration
-  * @retval RBI_CONF_RFO_LP_HP
-  * @retval RBI_CONF_RFO_LP
-  * @retval RBI_CONF_RFO_HP
-  */
-int32_t RBI_GetTxConfig(void);
-
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
-/**
-  * @brief  Get If TCXO is to be present on board
-  * @note   never remove called by MW,
-  * @retval return 1 if present, 0 if not present
-  */
-int32_t RBI_IsTCXO(void);
-
-/**
-  * @brief  Get If DCDC is to be present on board
-  * @note   never remove called by MW,
-  * @retval return 1 if present, 0 if not present
-  */
-int32_t RBI_IsDCDC(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* RADIO_BOARD_IF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
deleted file mode 100644
index 45243517..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    radio_conf.h
-  * @author  MCD Application Team
-  * @brief   Header of Radio configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __RADIO_CONF_H__
-#define __RADIO_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "subghz.h"
-#include "mw_log_conf.h"     /* mw trace conf */
-#include "radio_board_if.h"  /* low layer api (bsp) */
-#include "utilities_def.h"  /* low layer api (bsp) */
-#include "mbmuxif_sys.h"
-#include "sys_debug.h"
-#include "sys_privileged_wrap.h"  /* for Secure_SUBGHZ_Init */
-/* USER CODE BEGIN include */
-
-/* USER CODE END include */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Set RX pin to high or low level
-  */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
-
-/**
-  * @brief Set TX pin to high or low level
-  */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-
-/**
-  * @brief Max payload buffer size
-  */
-#define RADIO_RX_BUF_SIZE          255
-
-/**
-  * @brief Get the chip revision ID from Mbmux table
-  */
-#define LL_DBGMCU_GetRevisionID() MBMUXIF_ChipRevId()
-
-/**
-  * @brief drive value used anytime radio is NOT in TX low power mode
-  */
-#define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
-
-/**
-  * @brief drive value used anytime radio is in TX low power mode
-  *        TX low power mode is the worst case because the PA sinks from SMPS
-  *        while in high power mode, current is sunk directly from the battery
-  */
-#define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
-
-/**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
-  */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
-
-/**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
-  */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
-
-/**
-  * @brief voltage of vdd tcxo.
-  */
-#define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macros -----------------------------------------------------------*/
-#ifndef CRITICAL_SECTION_BEGIN
-/**
-  * @brief macro used to enter the critical section
-  */
-#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
-#endif /* !CRITICAL_SECTION_BEGIN */
-#ifndef CRITICAL_SECTION_END
-/**
-  * @brief macro used to exit the critical section
-  */
-#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
-#endif /* !CRITICAL_SECTION_END */
-
-/* Function mapping */
-/**
-  * @brief SUBGHZ interface init to radio Middleware
-  */
-#define RADIO_INIT                              SYS_PRIVIL_SUBGHZ_Init
-
-/**
-  * @brief Delay interface to radio Middleware
-  */
-#define RADIO_DELAY_MS                          HAL_Delay
-
-/**
-  * @brief Memset utilities interface to radio Middleware
-  */
-#define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __RADIO_CONF_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
deleted file mode 100644
index f3ce93b2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    systime.h
-  * @author  MCD Application Team
-  * @brief   Map middleware systime
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-
-#ifndef __SYSTIME_H__
-#define __SYSTIME_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__SYSTIME_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
deleted file mode 100644
index 33389639..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    timer.h
-  * @author  MCD Application Team
-  * @brief   Wrapper to timer server
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __TIMER_H__
-#define __TIMER_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_timer.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Max timer mask
-  */
-#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Timer value on 32 bits
-  */
-#define TimerTime_t UTIL_TIMER_Time_t
-
-/**
-  * @brief Timer object description
-  */
-#define TimerEvent_t UTIL_TIMER_Object_t
-
-/**
-  * @brief Create the timer object
-  */
-#define TimerInit(HANDLE, CB) do {\
-                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
-                                 } while(0)
-
-/**
-  * @brief update the period and start the timer
-  */
-#define TimerSetValue(HANDLE, TIMEOUT) do{ \
-                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
-                                         } while(0)
-
-/**
-  * @brief Start and adds the timer object to the list of timer events
-  */
-#define TimerStart(HANDLE)   do {\
-                                  UTIL_TIMER_Start(HANDLE);\
-                                } while(0)
-
-/**
-  * @brief Stop and removes the timer object from the list of timer events
-  */
-#define TimerStop(HANDLE)   do {\
-                                 UTIL_TIMER_Stop(HANDLE);\
-                               } while(0)
-
-/**
-  * @brief return the current time
-  */
-#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
-
-/**
-  * @brief return the elapsed time
-  */
-#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TIMER_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
deleted file mode 100644
index 4d15f862..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    LmHandler_mbwrapper.c
-  * @author  MCD Application Team
-  * @brief   This file implements the CM0PLUS side wrapper of the LoraMac interface
-  *          shared between M0 and M4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_mem.h"
-#include "mbmux_table.h"
-#include "msg_id.h"
-#include "mbmux.h"
-#include "mbmuxif_lora.h"
-#include "sys_app.h"
-#include "lora_app.h"
-
-#include "LmHandler_mbwrapper.h"
-#include "LmHandler.h"
-#include "lora_info.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/*!
- * LoRa State Machine states
- */
-typedef enum TxEventType_e
-{
-  /*!
-   * @brief AppdataTransmition issue based on timer every TxDutyCycleTime
-   */
-  TX_ON_TIMER,
-  /*!
-   * @brief AppdataTransmition external event plugged on OnSendEvent( )
-   */
-  TX_ON_EVENT
-} TxEventType_t;
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-#ifndef MAX
-#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-#endif /* MAX */
-#define MCPS_SIZE MAX(sizeof(McpsConfirm_t), sizeof(McpsIndication_t))
-#define MLME_SIZE MAX(sizeof(MlmeConfirm_t), sizeof(MlmeIndication_t))
-#define LORA_MBWRAP_SHBUF_SIZE MAX(MCPS_SIZE, MLME_SIZE)
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private function prototypes -----------------------------------------------*/
-static uint8_t GetBatteryLevel_mbwrapper(void);
-
-static uint16_t GetTemperatureLevel_mbwrapper(void);
-
-static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams);
-
-static void OnTxData_mbwrapper(LmHandlerTxParams_t *params);
-
-static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private variables ---------------------------------------------------------*/
-static LmHandlerCallbacks_t callback_mbwrapper =
-{
-  .GetBatteryLevel =           GetBatteryLevel_mbwrapper,
-  .GetTemperature =            GetTemperatureLevel_mbwrapper,
-  .OnMacProcess =              OnMacProcessNotify,
-  .OnJoinRequest =             OnJoinRequest_mbwrapper,
-  .OnTxData =                  OnTxData_mbwrapper,
-  .OnRxData =                  OnRxData_mbwrapper,
-};
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Exported functions ---------------------------------------------------------*/
-void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
-{
-  /* USER CODE BEGIN Process_Lora_Cmd_1 */
-
-  /* USER CODE END Process_Lora_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;
-  LmHandlerErrorStatus_t errorStatus;
-  LmHandlerFlagStatus_t flagStatus;
-  int32_t ret_code;
-
-  APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(LoRa)\r\n");
-
-  /* process Command */
-  switch (ComObj->MsgId)
-  {
-    case LMHANDLER_INITIALIZATION_ID:
-      errorStatus = LmHandlerInit(&callback_mbwrapper);
-
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
-      InitPackageProcess();
-      break;
-
-    case   LMHANDLER_CONFIGURE_ID:
-      errorStatus = LmHandlerConfigure((LmHandlerParams_t *) com_buffer[0]);
-
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
-      break;
-
-    case LMHANDLER_JOIN_STATUS_ID:
-      flagStatus = LmHandlerJoinStatus();
-
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) flagStatus; /* */
-      break;
-
-    case   LMHANDLER_JOIN_ID:
-      LmHandlerJoin((ActivationType_t) com_buffer[0]);
-
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case   LMHANDLER_STOP_ID:
-      errorStatus = LmHandlerStop();
-
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
-      break;
-
-    case   LMHANDLER_SEND_ID:
-    {
-      LmHandlerAppData_t appData;
-      appData.Port = (uint8_t)com_buffer[0];
-      appData.BufferSize = (uint8_t)com_buffer[1];
-      appData.Buffer = (uint8_t *)com_buffer[2];
-
-      errorStatus = LmHandlerSend(&appData, (LmHandlerMsgTypes_t) com_buffer[3], (UTIL_TIMER_Time_t *)com_buffer[4], (bool)com_buffer[5]);
-
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
-    }
-    break;
-    case   LMHANDLER_PROCESS_ID:
-      LmHandlerProcess();
-
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-    case   LMHANDLER_REQUEST_CLASS_ID:
-      errorStatus = LmHandlerRequestClass((DeviceClass_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
-      break;
-    case   LMHANDLER_GET_CLASS_ID:
-      ret_code = LmHandlerGetCurrentClass((DeviceClass_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_DEVEUI_ID:
-      ret_code = LmHandlerGetDevEUI((uint8_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_DEVEUI_ID:
-      ret_code = LmHandlerSetDevEUI((uint8_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_APPEUI_ID:
-      ret_code = LmHandlerGetAppEUI((uint8_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_APPEUI_ID:
-      ret_code = LmHandlerSetAppEUI((uint8_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_NWKID_ID:
-      ret_code = LmHandlerGetNetworkID((uint32_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_NWKID_ID:
-      ret_code = LmHandlerSetNetworkID((uint32_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_DEVADDR_ID:
-      ret_code = LmHandlerGetDevAddr((uint32_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_DEVADDR_ID:
-      ret_code = LmHandlerSetDevAddr((uint32_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_ACTIVE_REGION_ID:
-      ret_code = LmHandlerGetActiveRegion((LoRaMacRegion_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_ACTIVE_REGION_ID:
-      ret_code = LmHandlerSetActiveRegion((LoRaMacRegion_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_ADR_ENABLE_ID:
-      ret_code = LmHandlerGetAdrEnable((bool *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_ADR_ENABLE_ID:
-      ret_code = LmHandlerSetAdrEnable((bool) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_TX_DATARATE_ID:
-      ret_code = LmHandlerGetTxDatarate((int8_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_TX_DATARATE_ID:
-      ret_code = LmHandlerSetTxDatarate((int8_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_DUTY_CYCLE_ID:
-      ret_code = LmHandlerGetDutyCycleEnable((bool *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_DUTY_CYCLE_ID:
-      ret_code = LmHandlerSetDutyCycleEnable((bool) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_RX2_PARAMS_ID:
-      ret_code = LmHandlerGetRX2Params((RxChannelParams_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_TX_PWR_ID:
-      ret_code = LmHandlerGetTxPower((int8_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_RX1_DELAY_ID:
-      ret_code = LmHandlerGetRx1Delay((uint32_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_RX2_DELAY_ID:
-      ret_code = LmHandlerGetRx2Delay((uint32_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_JOIN_RX1_DELAY_ID:
-      ret_code = LmHandlerGetJoinRx1Delay((uint32_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_JOIN_RX2_DELAY_ID:
-      ret_code = LmHandlerGetJoinRx2Delay((uint32_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_RX2_PARAMS_ID:
-      ret_code = LmHandlerSetRX2Params((RxChannelParams_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_TX_PWR_ID:
-      ret_code = LmHandlerSetTxPower((int8_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_RX1_DELAY_ID:
-      ret_code = LmHandlerSetRx1Delay((uint32_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_RX2_DELAY_ID:
-      ret_code = LmHandlerSetRx2Delay((uint32_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_JOIN_RX1_DELAY_ID:
-      ret_code = LmHandlerSetJoinRx1Delay((uint32_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_JOIN_RX2_DELAY_ID:
-      ret_code = LmHandlerSetJoinRx2Delay((uint32_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_PING_PERIODICITY_ID:
-      ret_code = LmHandlerGetPingPeriodicity((uint8_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_SET_PING_PERIODICITY_ID:
-      ret_code = LmHandlerSetPingPeriodicity((uint8_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_GET_BEACON_STATE_ID:
-      ret_code = LmHandlerGetBeaconState((BeaconState_t *) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_code; /* */
-      break;
-    case   LMHANDLER_INFO_INIT_ID:
-      LoraInfo_Init();
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    default:
-      break;
-  }
-
-  /* send Response */
-  APP_LOG(TS_ON, VLEVEL_H, "<CM0PLUS(LoRa)\r\n");
-  MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID);
-  /* USER CODE BEGIN Process_Lora_Cmd_2 */
-
-  /* USER CODE END Process_Lora_Cmd_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/*!
- * \brief   Measures the battery level
- *
- * \retval  Battery level [0: node is connected to an external
- *          power source, 1..254: battery level, where 1 is the minimum
- *          and 254 is the maximum value, 255: the node was not able
- *          to measure the battery level]
- */
-
-static uint8_t GetBatteryLevel_mbwrapper(void)
-{
-  /* USER CODE BEGIN GetBatteryLevel_mbwrapper_1 */
-
-  /* USER CODE END GetBatteryLevel_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
-  com_obj->MsgId = LMHANDLER_GET_BATTERY_LEVEL_CB_ID;
-  com_obj->ParamCnt = 0;
-
-  MBMUXIF_LoraSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return (uint8_t) com_obj->ReturnVal;
-  /* USER CODE BEGIN GetBatteryLevel_mbwrapper_2 */
-
-  /* USER CODE END GetBatteryLevel_mbwrapper_2 */
-}
-
-/*!
- * \brief   Measures the temperature level
- *
- * \retval  Temperature level
- */
-static uint16_t GetTemperatureLevel_mbwrapper(void)
-{
-  /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_1 */
-
-  /* USER CODE END GetTemperatureLevel_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
-  com_obj->MsgId = LMHANDLER_GET_TEMPERATURE_CB_ID;
-  com_obj->ParamCnt = 0;
-
-  MBMUXIF_LoraSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return (uint16_t) com_obj->ReturnVal;
-  /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_2 */
-
-  /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
-}
-
-static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams)
-{
-  /* USER CODE BEGIN OnJoinRequest_mbwrapper_1 */
-
-  /* USER CODE END OnJoinRequest_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
-  com_obj->MsgId = LMHANDLER_ON_JOIN_REQ_CB_ID;
-
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
-  com_obj->ParamCnt = 1;
-
-  MBMUXIF_LoraSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN OnJoinRequest_mbwrapper_2 */
-
-  /* USER CODE END OnJoinRequest_mbwrapper_2 */
-}
-
-static void OnTxData_mbwrapper(LmHandlerTxParams_t *params)
-{
-  /* USER CODE BEGIN OnTxData_mbwrapper_1 */
-
-  /* USER CODE END OnTxData_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
-  com_obj->MsgId = LMHANDLER_ON_TX_DATA_CB_ID;
-
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
-  com_obj->ParamCnt = 1;
-
-  MBMUXIF_LoraSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN OnTxData_mbwrapper_2 */
-
-  /* USER CODE END OnTxData_mbwrapper_2 */
-}
-
-static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
-{
-  /* USER CODE BEGIN OnRxData_mbwrapper_1 */
-
-  /* USER CODE END OnRxData_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-  /* need to 8-align the next address */
-  uint8_t next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
-
-  UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
-  UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
-  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
-  com_obj->MsgId = LMHANDLER_ON_RX_DATA_CB_ID;
-
-  com_obj->ParamBuf[0] = (uint32_t) aLoraMbWrapShare2Buffer;
-  com_obj->ParamBuf[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
-  com_obj->ParamCnt = 2;
-
-  MBMUXIF_LoraSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN OnRxData_mbwrapper_2 */
-
-  /* USER CODE END OnRxData_mbwrapper_2 */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
deleted file mode 100644
index a07ea737..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    LmHandler_mbwrapper.h
-  * @author  MCD Application Team
-  * @brief   This file implements the CM0PLUS side wrapper of the LmHandler
-  *          interface shared between M0 and M4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __LMHANDLER_MBWRAPPER_CM0PLUS_H__
-#define __LMHANDLER_MBWRAPPER_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux_table.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__LMHANDLER_MBWRAPPER_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
deleted file mode 100644
index 3ce58f07..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    features_info.c
-  * @author  MCD Application Team
-  * @brief   CM0PLUS supported features list
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include <stddef.h>
-#include <stdint.h>
-#include "features_info.h"
-#include "lora_info.h"
-#include "lorawan_version.h"
-#include "lora_app_version.h"
-#include "subghz_phy_version.h"
-#include "stm32_mem.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Feature info table
-  */
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") FEAT_INFO_Param_t Feat_Info_Table[] =
-{
-  {
-    .Feat_Info_Feature_Id =   FEAT_INFO_SYSTEM_ID,
-    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
-    .Feat_Info_Config_Size =  0,
-    .Feat_Info_Config_Ptr = (void *) NULL
-  },
-  {
-    .Feat_Info_Feature_Id =   FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID,
-    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
-    .Feat_Info_Config_Size = 0,
-    .Feat_Info_Config_Ptr = (void *) NULL
-  },
-  /* {
-    .Feat_Info_Feature_Id =   FEAT_INFO_KMS_ID,
-    .Feat_Info_Feature_Version = FEAT_INFO_KMS_VER,
-    .Feat_Info_Config_Size = 0,
-    .Feat_Info_Config_Ptr=  (void *) NULL
-  }, */
-  {
-    .Feat_Info_Feature_Id =   FEAT_INFO_LORAWAN_ID,
-    .Feat_Info_Feature_Version = __LORAWAN_VERSION,
-    .Feat_Info_Config_Size = 0,
-    .Feat_Info_Config_Ptr = (void *) NULL
-  },
-  {
-    .Feat_Info_Feature_Id =   FEAT_INFO_TRACE_ID,
-    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
-    .Feat_Info_Config_Size = 0,
-    .Feat_Info_Config_Ptr = (void *) NULL
-  },
-  {
-    .Feat_Info_Feature_Id =   FEAT_INFO_RADIO_ID,
-    .Feat_Info_Feature_Version = __SUBGHZ_PHY_VERSION,
-    .Feat_Info_Config_Size = 0,
-    .Feat_Info_Config_Ptr = (void *) NULL
-  },
-};
-
-/**
-  * @brief Feature info container
-  */
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") FEAT_INFO_List_t Feat_Info_List =
-{
-  .Feat_Info_Cnt =  sizeof(Feat_Info_Table) / sizeof(FEAT_INFO_Param_t),
-  .Feat_Info_TableAddress =  Feat_Info_Table,
-};
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-void FEAT_INFO_Init(void)
-{
-  /* USER CODE BEGIN FEAT_INFO_Init_1 */
-
-  /* USER CODE END FEAT_INFO_Init_1 */
-
-  /* Set LoRaWAN Info_Config */
-  LoraInfo_Init();
-  /* USER CODE BEGIN FEAT_INFO_Init_2 */
-
-  /* USER CODE END FEAT_INFO_Init_2 */
-}
-
-FEAT_INFO_List_t *FEAT_INFO_GetListPtr(void)
-{
-  /* USER CODE BEGIN FEAT_INFO_GetListPtr_1 */
-
-  /* USER CODE END FEAT_INFO_GetListPtr_1 */
-  return (FEAT_INFO_List_t *) &Feat_Info_List;
-  /* USER CODE BEGIN FEAT_INFO_GetListPtr_2 */
-
-  /* USER CODE END FEAT_INFO_GetListPtr_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
deleted file mode 100644
index 9d845793..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lora_info.c
-  * @author  MCD Application Team
-  * @brief   To give info to the application about LoRaWAN configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "LoRaMac.h"
-#include "lora_info.h"
-#include "platform.h" /* Needed for Error_Handler */
-#include "features_info.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief initialises the LoraMacInfo capabilities table
-  * @param none
-  * @retval  none
-  */
-void StoreValueInFeatureListTable(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported variables --------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2")  LoraInfo_t loraInfo;
-
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions --------------------------------------------------------*/
-void LoraInfo_Init(void)
-{
-  loraInfo.ActivationMode = 0;
-  loraInfo.Region = 0;
-  loraInfo.ClassB = 0;
-  loraInfo.Kms = 0;
-  /* USER CODE BEGIN LoraInfo_Init_1 */
-
-  /* USER CODE END LoraInfo_Init_1 */
-
-#ifdef  REGION_AS923
-  loraInfo.Region |= (1 << LORAMAC_REGION_AS923) ;
-#endif /* REGION_AS923 */
-#ifdef  REGION_AU915
-  loraInfo.Region |= (1 << LORAMAC_REGION_AU915) ;
-#endif /* REGION_AU915 */
-#ifdef  REGION_CN470
-  loraInfo.Region |= (1 << LORAMAC_REGION_CN470) ;
-#endif /* REGION_CN470 */
-#ifdef  REGION_CN779
-  loraInfo.Region |= (1 << LORAMAC_REGION_CN779) ;
-#endif /* REGION_CN779 */
-#ifdef  REGION_EU433
-  loraInfo.Region |= (1 << LORAMAC_REGION_EU433) ;
-#endif /* REGION_EU433 */
-#ifdef  REGION_EU868
-  loraInfo.Region |= (1 << LORAMAC_REGION_EU868) ;
-#endif /* REGION_EU868 */
-#ifdef  REGION_KR920
-  loraInfo.Region |= (1 << LORAMAC_REGION_KR920) ;
-#endif /* REGION_KR920 */
-#ifdef  REGION_IN865
-  loraInfo.Region |= (1 << LORAMAC_REGION_IN865) ;
-#endif /* REGION_IN865 */
-#ifdef  REGION_US915
-  loraInfo.Region |= (1 << LORAMAC_REGION_US915) ;
-#endif /* REGION_US915 */
-#ifdef  REGION_RU864
-  loraInfo.Region |= (1 << LORAMAC_REGION_RU864) ;
-#endif /* REGION_RU864 */
-
-  if (loraInfo.Region == 0)
-  {
-    APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
-    while (1) {} /* At least one region shall be defined */
-  }
-
-#if ( LORAMAC_CLASSB_ENABLED == 1 )
-  loraInfo.ClassB = 1;
-#elif !defined (LORAMAC_CLASSB_ENABLED)
-#error LORAMAC_CLASSB_ENABLED not defined ( shall be <0 or 1> )
-#endif /* LORAMAC_CLASSB_ENABLED */
-
-#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
-  loraInfo.Kms = 0;
-  loraInfo.ActivationMode = 3;
-#else /* LORAWAN_KMS == 1 */
-  loraInfo.Kms = 1;
-  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALISATION + (OVER_THE_AIR_ACTIVATION << 1);
-#endif /* LORAWAN_KMS */
-
-  /* For DualCore */
-  StoreValueInFeatureListTable();
-  /* USER CODE BEGIN LoraInfo_Init_2 */
-
-  /* USER CODE END LoraInfo_Init_2 */
-}
-
-LoraInfo_t *LoraInfo_GetPtr(void)
-{
-  /* USER CODE BEGIN LoraInfo_GetPtr */
-
-  /* USER CODE END LoraInfo_GetPtr */
-  return &loraInfo;
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private functions --------------------------------------------------------*/
-void StoreValueInFeatureListTable(void)
-{
-  FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
-  FEAT_INFO_Param_t  *p_feature;
-  uint8_t i;
-  uint8_t cm0plus_nr_of_supported_features;
-  uint8_t found = 0;
-
-  /* USER CODE BEGIN StoreValueInFeatureListTable_1 */
-
-  /* USER CODE END StoreValueInFeatureListTable_1 */
-
-  p_MBMUX_Cm0plusFeatureList = FEAT_INFO_GetListPtr();
-
-  if (p_MBMUX_Cm0plusFeatureList != NULL)
-  {
-    cm0plus_nr_of_supported_features = p_MBMUX_Cm0plusFeatureList->Feat_Info_Cnt;
-
-    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
-    {
-      p_feature = i + p_MBMUX_Cm0plusFeatureList->Feat_Info_TableAddress;
-      if (p_feature->Feat_Info_Feature_Id == FEAT_INFO_LORAWAN_ID)
-      {
-        found = 1;
-        break;
-      }
-    }
-  }
-
-  if (found)
-  {
-    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t)/sizeof(uint32_t);
-    p_feature->Feat_Info_Config_Ptr = &loraInfo;
-  }
-  else
-  {
-    Error_Handler();
-  }
-
-  /* USER CODE BEGIN StoreValueInFeatureListTable_2 */
-
-  /* USER CODE END StoreValueInFeatureListTable_2 */
-  return;
-}
-
-/* USER CODE BEGIN PF */
-
-/* USER CODE END PF */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
deleted file mode 100644
index 013f7100..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmux.c
-  * @author  MCD Application Team
-  * @brief   Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "stdint.h"
-#include "assert.h"
-#include "stddef.h"
-#include "ipcc_if.h"
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-#define MB_CHANNEL_NOT_REGISTERED 0xFF
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComTable_t *p_MBMUX_ComTable;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
-static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
-static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
-static void MBMUX_IsrNotRegistered(void *ComObj);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
-void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
-{
-  /* USER CODE BEGIN MBMUX_Init_1 */
-
-  /* USER CODE END MBMUX_Init_1 */
-  uint8_t i;
-  IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
-
-  p_MBMUX_ComTable = pMBMUX_ComTable;
-
-  for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
-  {
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-  }
-  /* USER CODE BEGIN MBMUX_Init_Last */
-
-  /* USER CODE END MBMUX_Init_Last */
-}
-
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval  return -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
-  */
-int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
-{
-  uint8_t channel_idx;
-  int8_t ret = -1;
-  uint8_t check_existing_feature_registration;
-  /* USER CODE BEGIN MBMUX_RegisterFeatureC_1 */
-
-  /* USER CODE END MBMUX_RegisterFeatureC_1 */
-
-  check_existing_feature_registration = MBMUX_GetFeatureChIdx(e_featID, ComType);
-
-  if (check_existing_feature_registration != MB_CHANNEL_NOT_REGISTERED)
-  {
-    /* channel has been registered by CM4 registered */
-    channel_idx = check_existing_feature_registration;
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm0plusCb = MsgCb;
-    }
-    else
-    {
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm0plusCb = MsgCb;
-    }
-    ret = channel_idx;
-  }
-  /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
-
-  /* USER CODE END MBMUX_RegisterFeatureC_Last */
-  return ret;
-}
-
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
-void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
-{
-  /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
-
-  /* USER CODE END MBMUX_UnregisterFeature_1 */
-  uint8_t mb_ch;
-
-  mb_ch = MBMUX_GetFeatureChIdx(e_featID, ComType);
-
-  if (mb_ch < IPCC_CHANNEL_NUMBER)
-  {
-    if (ComType == MBMUX_CMD_RESP)  /* TX */
-    {
-      /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
-      IPCC_IF_ResponseSnd(mb_ch);
-
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    }
-    else
-    {
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    }
-  }
-  /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
-
-  /* USER CODE END MBMUX_UnregisterFeature_Last */
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
-{
-  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
-
-  /* USER CODE END MBMUX_GetFeatureComPtr_1 */
-  uint32_t channel_idx;
-  MBMUX_ComParam_t *com_param_ptr = NULL;
-
-  channel_idx = MBMUX_GetFeatureChIdx(e_featID, ComType);
-  if (channel_idx < MBMUX_CHANNEL_NUMBER)
-  {
-    if (ComType == MBMUX_CMD_RESP)  /* TX */
-    {
-      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBCmdRespParam[channel_idx];
-    }
-    else
-    {
-      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBNotifAckParam[channel_idx];
-    }
-  }
-  return com_param_ptr;
-  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_Last */
-
-  /* USER CODE END MBMUX_GetFeatureComPtr_Last */
-}
-
-/**
-  * @brief Send Notif to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
-int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
-{
-  /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
-
-  /* USER CODE END MBMUX_NotificationSnd_1 */
-  uint32_t mb_ch;
-
-  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
-  if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
-  {
-    while (1) {}
-  }
-  return IPCC_IF_NotificationSnd(mb_ch);
-  /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
-
-  /* USER CODE END MBMUX_NotificationSnd_Last */
-}
-
-/**
-  * @brief Send response to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
-uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
-{
-  /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
-
-  /* USER CODE END MBMUX_ResponseSnd_1 */
-  uint32_t mb_ch;
-
-  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_CMD_RESP);
-  return IPCC_IF_ResponseSnd(mb_ch);
-  /* USER CODE BEGIN MBMUX_ResponseSnd_Last */
-
-  /* USER CODE END MBMUX_ResponseSnd_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
-static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
-
-  /* USER CODE END MBMUX_IsrCommandRcvCb_1 */
-  /* retrieve pointer to com params */
-  void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
-  /* call registered callback */
-  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm0plusCb(com_obj);
-  /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
-
-  /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
-  return;
-}
-
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
-static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
-
-  /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_1 */
-  /* retrieve pointer to com params */
-  void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
-  /* call registered callback */
-  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm0plusCb(com_obj);
-  /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
-
-  /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
-  return;
-}
-
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
-static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
-{
-  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
-
-  /* USER CODE END MBMUX_GetFeatureChIdx_1 */
-  return p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType];
-  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_Last */
-
-  /* USER CODE END MBMUX_GetFeatureChIdx_Last */
-}
-
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
-static void MBMUX_IsrNotRegistered(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
-
-  /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
-  /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
-
-  /* USER CODE END MBMUX_IsrNotRegistered_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
deleted file mode 100644
index e91b1547..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmux.h
-  * @author  MCD Application Team
-  * @brief   API which interfaces CM0PLUS to IPCC
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUX_CM0PLUS_H__
-#define __MBMUX_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux_table.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
-
-int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
-
-void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
-
-MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
-
-int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
-
-uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
-
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUX_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 0ec2ec5d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *KmsComObj;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskKmsCmdRcv(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers KMS feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsCmdRcvCb);
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskKmsCmdRcv);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Sends a Kms-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendResp(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_1 */
-  if (MBMUX_ResponseSnd(FEAT_INFO_KMS_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_1 */
-  KmsComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_Last */
-}
-
-/**
-  * @brief  KMS task to process the command
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskKmsCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_1 */
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-  Process_Kms_Cmd(KmsComObj);
-#endif /* ALLOW_KMS_VIA_MBMUX */
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
deleted file mode 100644
index 12b71c19..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM0PLUS_H__
-#define __MBMUXIF_KMS_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-void MBMUXIF_KmsSendResp(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
deleted file mode 100644
index d0cc04c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_lora.c
-  * @author  MCD Application Team
-  * @brief   allows CM0 applic to register and handle LoraWAN to MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_lora.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "LmHandler_mbwrapper.h"
-#include "utilities_def.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *LoraComObj;
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj);
-static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskLoraCmdRcv(void);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers LORA feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_LoraInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_LoraInit_1 */
-
-  /* USER CODE END MBMUXIF_LoraInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrLoraAckRcvCb);
-  if (ret >= 0)
-  {
-    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP, MBMUXIF_IsrLoraCmdRcvCb);
-  }
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskLoraCmdRcv);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_LoraInit_Last */
-
-  /* USER CODE END MBMUXIF_LoraInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Lora feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
-{
-  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_1 */
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK);
-  if (com_param_ptr == NULL)
-  {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
-  }
-  return com_param_ptr;
-  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_Last */
-}
-
-/**
-  * @brief Sends a Lora-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_LoraSendNotif(void)
-{
-  /* to check vs radio. radio call this on irq so it moves here on task */
-  /* for lora is already called from task .. */
-  /* USER CODE BEGIN MBMUXIF_LoraSendNotif_1 */
-
-  /* USER CODE END MBMUXIF_LoraSendNotif_1 */
-  if (MBMUX_NotificationSnd(FEAT_INFO_LORAWAN_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbLoraAckRcv);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_LoraSendNotif_Last */
-
-  /* USER CODE END MBMUXIF_LoraSendNotif_Last */
-}
-
-/**
-  * @brief Sends a Lora-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_LoraSendResp(void)
-{
-  /* USER CODE BEGIN MBMUXIF_LoraSendResp_1 */
-
-  /* USER CODE END MBMUXIF_LoraSendResp_1 */
-  if (MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_LoraSendResp_Last */
-
-  /* USER CODE END MBMUXIF_LoraSendResp_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  LORA acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbLoraAckRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_Last */
-}
-
-/**
-  * @brief  LORA command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_1 */
-  LoraComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaCmdRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_Last */
-}
-
-/**
-  * @brief  LORA task to process the command
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskLoraCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskLoraCmdRcv_1 */
-  Process_Lora_Cmd(LoraComObj);
-  /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskLoraCmdRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
deleted file mode 100644
index 75fda6ea..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_lora.h
-  * @author  MCD Application Team
-  * @brief   API provided to CM0PLUS applic to register and handle LoraWAN via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_LORA_CM0PLUS_H__
-#define __MBMUXIF_LORA_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_LoraInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void);
-void MBMUXIF_LoraSendNotif(void);
-void MBMUXIF_LoraSendResp(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_LORA_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
deleted file mode 100644
index 3ba64a2b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_radio.c
-  * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle RADIO driver via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_radio.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "radio_mbwrapper.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *RadioComObj;
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
-static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskRadioCmdRcv(void);
-static void MBMUXIF_TaskRadioNotifSnd(void);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers RADIO feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_RadioInit(void)
-{
-  int8_t ret;
-
-  /* USER CODE BEGIN MBMUXIF_RadioInit_1 */
-
-  /* USER CODE END MBMUXIF_RadioInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrRadioAckRcvCb);
-  if (ret >= 0)
-  {
-    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP, MBMUXIF_IsrRadioCmdRcvCb);
-  }
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskRadioCmdRcv);
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioNotifSnd), UTIL_SEQ_RFU, MBMUXIF_TaskRadioNotifSnd);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_RadioInit_Last */
-
-  /* USER CODE END MBMUXIF_RadioInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
-{
-  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_1 */
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
-  if (com_param_ptr == NULL)
-  {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
-  }
-  return com_param_ptr;
-  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
-}
-
-/**
-  * @brief Sends a Radio-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_RadioSendNotif(void)
-{
-  /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
-
-  /* USER CODE END MBMUXIF_RadioSendNotif_1 */
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioNotifSnd), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_RadioSendNotif_Last */
-
-  /* USER CODE END MBMUXIF_RadioSendNotif_Last */
-}
-
-/**
-  * @brief Sends a Radio-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_RadioSendResp(void)
-{
-  /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
-
-  /* USER CODE END MBMUXIF_RadioSendResp_1 */
-  if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
-
-  /* USER CODE END MBMUXIF_RadioSendResp_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbRadioAckRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
-}
-
-/**
-  * @brief  RADIO command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_1 */
-  RadioComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioCmdRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_Last*/
-
-  /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
-}
-
-/**
-  * @brief  RADIO task to process the command
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskRadioCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskRadioCmdRcv_1 */
-  Process_Radio_Cmd(RadioComObj);
-  /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
-}
-
-/**
-  * @brief  RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskRadioNotifSnd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
-
-  /* USER CODE END MBMUXIF_TaskRadioNotifSnd_1 */
-  if (MBMUX_NotificationSnd(FEAT_INFO_RADIO_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbRadioAckRcv);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
-
-  /* USER CODE END MBMUXIF_TaskRadioNotifSnd_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
deleted file mode 100644
index 44fab48f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_radio.h
-  * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle RADIO driver via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_RADIO_CM0PLUS_H__
-#define __MBMUXIF_RADIO_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_RadioInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
-void MBMUXIF_RadioSendNotif(void);
-void MBMUXIF_RadioSendResp(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_RADIO_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
deleted file mode 100644
index a3ce77e9..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_sys.c
-  * @author  MCD Application Team
-  * @brief   allows CM0 applic to handle the SYSTEM MBMUX channel
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_sys.h"
-#include "stm32_seq.h"
-#include "sys_app.h"
-#include "msg_id.h"
-#include "mbmux.h"
-#include "mbmuxif_trace.h"
-#include "mbmuxif_lora.h"
-#include "mbmuxif_radio.h"
-#include "features_info.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComTable_t *pMb_RefTable;  /* SRAM1_BASE + IPCCDBA<<4*/
-static MBMUX_ComParam_t *SystemComObj;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
-static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskSystemCmdRcv(void);
-static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
-static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
-static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
-static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
-
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_SystemInit(void)
-{
-  int8_t ret;
-
-  /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
-
-  /* USER CODE END MBMUXIF_SystemInit_1 */
-
-  /*Read FLASH IPCC data buffer base address based on (IPCCDBA << 4) + SRAM1_BASE*/
-  FLASH_OBProgramInitTypeDef OptionsBytesStruct;
-
-  /* Get the Dual boot configuration status */
-  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
-  pMb_RefTable = (MBMUX_ComTable_t *) OptionsBytesStruct.IPCCdataBufAddr;
-
-  /* prevents Cm0 to go further, during boot after PWR_CR4_C2BOOT is set by Cm4*/
-  /* it allows Cm0 debugging step by step the MBMUXIF_SystemInit */
-  while (pMb_RefTable->SynchronizeCpusAtBoot == CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
-
-  MBMUX_Init(pMb_RefTable);
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemAckRcvCb);
-  if (ret >= 0)
-  {
-    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemCmdRcvCb);
-  }
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemCmdRcv);
-    ret = 0;
-  }
-
-  if (ret >= 0)
-  {
-    /* Notify Cm4 that MBMUXIF_System and RTC are initialised on Cm0 side */
-    /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
-    while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-    pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
-
-  /* USER CODE END MBMUXIF_SystemInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Get synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
-uint16_t MBMUXIF_GetCpusSynchroFlag(void)
-{
-  /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
-
-  /* USER CODE END MBMUXIF_GetCpusSynchroFlag */
-  return pMb_RefTable->SynchronizeCpusAtBoot;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
-{
-  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetSystemFeatureNotifComPtr_1 */
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
-  if (com_param_ptr == NULL)
-  {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
-  }
-  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetSystemFeatureNotifComPtr_Last */
-  return com_param_ptr;
-}
-
-/**
-  * @brief Sends a System-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
-{
-  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
-
-  /* USER CODE END MBMUXIF_SystemSendNotif_1 */
-  if (MBMUX_NotificationSnd(SystemPrioFeat) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
-
-  /* USER CODE END MBMUXIF_SystemSendNotif_Last */
-}
-
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
-{
-  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
-
-  /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
-  if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
-
-  /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
-}
-
-/**
-  * @brief Sends a System-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
-{
-  /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
-
-  /* USER CODE END EFMBMUXIF_SystemSendResp_1 */
-  if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
-
-  /* USER CODE END MBMUXIF_SystemSendResp_Last */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Exported services --------------------------------------------------------*/
-int16_t MBMUXIF_ChipRevId(void)
-{
-  int16_t ret = pMb_RefTable->ChipRevId;
-  /* USER CODE BEGIN MBMUXIF_ChipRevId */
-
-  /* USER CODE BEGIN MBMUXIF_ChipRevId */
-  return ret ;
-}
-
-/* USER CODE BEGIN ExpoS */
-
-/* USER CODE END ExpoS */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
-}
-
-/**
-  * @brief  SYSTEM command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
-{
-  SystemComObj = (MBMUX_ComParam_t *) ComObj;
-  uint32_t *com_buffer = SystemComObj->ParamBuf;
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
-
-  /* process Command on Isr or schedule a task*/
-  switch (SystemComObj->MsgId)
-  {
-    case SYS_GET_INFO_LIST_MSG_ID:
-      SystemComObj->ReturnVal = (uint32_t) FEAT_INFO_GetListPtr();
-      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-      break;
-
-    case SYS_REGISTER_FEATURE_MSG_ID:
-      SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
-      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-      break;
-
-    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
-
-    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
-
-    default:
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
-      break;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
-
-}
-
-/**
-  * @brief  SYSTEM task to process the command
-  * @param  none
-  * @retval  none
-  */
-static void MBMUXIF_TaskSystemCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
-
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
-  Process_Sys_Cmd(SystemComObj);
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
-
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
-
-}
-
-/**
-  * @brief  SYSTEM PRIO_A acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
-}
-
-/**
-  * @brief  SYSTEM PRIO_A command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
-}
-
-/**
-  * @brief  SYSTEM PRIO_B acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
-}
-
-/**
-  * @brief  SYSTEM PRIO_B command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
-
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
-}
-
-/**
-  * @brief  Retrieve the feature that needs MbMux registration and call correspondent Init
-  * @param  pointer to parameter buffer of the command
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  */
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
-{
-  int8_t ret = -2; /* feature not supported */
-
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
-
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
-
-  switch (ParamBuf[0])
-  {
-    case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
-      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
-      break;
-
-    case FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID:
-      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioAAckRcvCb);
-      break;
-
-    case FEAT_INFO_SYSTEM_CMD_PRIO_B_ID:
-      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_B_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioBCmdRcvCb);
-      break;
-
-    case FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID:
-      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioBAckRcvCb);
-      break;
-
-    case FEAT_INFO_KMS_ID:
-      /* ret = MBMUXIF_KmsInit(); */
-      /* APP_LOG(TS_OFF, VLEVEL_L, " * CM0 : Kms registration done\r\n"); */
-      break;
-
-    case FEAT_INFO_TRACE_ID:
-      ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
-      break;
-
-    case FEAT_INFO_RADIO_ID:
-      ret = MBMUXIF_RadioInit();
-      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Radio registration done\r\n");
-      break;
-
-    case FEAT_INFO_LORAWAN_ID:
-      ret = MBMUXIF_LoraInit();
-      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora registration done\r\n");
-      break;
-
-    case FEAT_INFO_SIGFOX_ID:
-      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox not supported\r\n");
-      break;
-
-    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
-
-    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
-
-    default:
-      break;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
-
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
-
-  return ret;
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
deleted file mode 100644
index 01dff052..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_sys.h
-  * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to handle the SYSTEM MBMUX channel
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_SYS_CM0PLUS_H__
-#define __MBMUXIF_SYS_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions ------------------------------------------------------- */
-int8_t MBMUXIF_SystemInit(void);
-uint16_t MBMUXIF_GetCpusSynchroFlag(void);
-MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
-void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
-void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
-void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-/* Exported services --------------------------------------------------------*/
-int16_t MBMUXIF_ChipRevId(void);
-
-/* USER CODE BEGIN ExpoS */
-
-/* USER CODE END ExpoS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_SYS_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
deleted file mode 100644
index 04c9f7b6..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_trace.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_trace.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "msg_id.h"
-#include "stm32_seq.h"
-#include "stm32_adv_trace.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-
-static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
-static void (*TraceUtilCpltCallback)(void *);
-static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
-static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private typedef -----------------------------------------------------------*/
-const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
-{
-  MBMUXIF_TraceBufferInit,
-  NULL,
-  NULL,
-  MBMUXIF_TraceBufferSend,
-};
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
-{
-  int8_t ret;
-
-  /* USER CODE BEGIN MBMUXIF_TraceInit_1 */
-
-  /* USER CODE END MBMUXIF_TraceInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
-  if (ret >= 0)
-  {
-    /*Initialize the terminal */
-    UTIL_ADV_TRACE_Init();
-    UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
-
-    /*Set verbose LEVEL*/
-    UTIL_ADV_TRACE_SetVerboseLevel(verboseLevel);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_TraceInit_Last */
-
-  /* USER CODE END MBMUXIF_TraceInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Trace feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
-{
-  /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_1 */
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
-  if (com_param_ptr == NULL)
-  {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
-  }
-  return com_param_ptr;
-  /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
-}
-
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_TraceSendNotif_NoWait(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
-
-  /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
-  if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
-
-  /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief The trace utilities inform the mbmuxif which func to call
-  *        once the Mb transmission is completed
-  * @param:  "stm32_adv_trace.c callback"
-  * @retval: none
-  */
-
-static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
-{
-  /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
-
-  /* USER CODE END MBMUXIF_TraceBufferInit_1 */
-  TraceUtilCpltCallback = cb;
-  return UTIL_ADV_TRACE_OK;
-  /* USER CODE BEGIN MBMUXIF_TraceBufferInit_Last */
-
-  /* USER CODE END MBMUXIF_TraceBufferInit_Last */
-}
-
-/**
-  * @brief TraceBufferSend sends the formatted buffer to CM4 which
-  *        posts it to the circular queue for printing
-  * @param:  strFormat: string to be printed
-  * @retval: 0 when ok, -1 when circular queue is full
-  */
-static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
-{
-  /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
-
-  /* USER CODE END MBMUXIF_TraceBufferSend_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  /* notify CM4 that CM0PLUS is initialised */
-  com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
-  if (com_obj != NULL)
-  {
-    com_obj->MsgId = TRACE_SEND_MSG_ID;
-    com_obj->ParamBuf[0] = (uint32_t) buf;
-    com_obj->ParamBuf[1] = (uint32_t) bufSize;
-    com_obj->ParamCnt = 2;
-    MBMUXIF_TraceSendNotif_NoWait();
-  }
-  return UTIL_ADV_TRACE_OK;
-  /* USER CODE BEGIN MBMUXIF_TraceBufferSend_Last */
-
-  /* USER CODE END MBMUXIF_TraceBufferSend_Last */
-}
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TRACE acknowledge callbacks: set event to release waiting task
-  *             and use callback to check if other trace need to be sent to CM4
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
-  TraceUtilCpltCallback(NULL);
-  /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
deleted file mode 100644
index 490321d2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_trace.h
-  * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle TRACE via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_TRACE_CM0PLUS_H__
-#define __MBMUXIF_TRACE_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
-MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
-void MBMUXIF_TraceSendNotif_NoWait(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_TRACE_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
deleted file mode 100644
index c09f8d55..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    radio_mbwrapper.c
-  * @author  MCD Application Team
-  * @brief   This file implements the CM0 side wrapper of the Radio interface
-  *          shared between M0 and M4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "radio_mbwrapper.h"
-#include "main.h"
-#include "stm32_mem.h"
-#include "mbmux_table.h"
-#include "msg_id.h"
-#include "mbmux.h"
-#include "mbmuxif_radio.h"
-#include "sys_app.h"
-
-#include "radio.h"
-#include "radio_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static  RadioEvents_t    radioevents_mbwrapper;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/*!
- * \brief  Tx Done callback prototype.
- */
-static void RadioTxDone_mbwrapper(void);
-
-/*!
- * \brief  Tx Timeout callback prototype.
- */
-static void RadioTxTimeout_mbwrapper(void);
-
-/*!
- * \brief Rx Done callback prototype.
- *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
- *                     FSK : N/A ( set to 0 )
- *                     LoRa: SNR value in dB
- */
-static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
-
-/*!
- * \brief  Rx Timeout callback prototype.
- */
-static void RadioRxTimeout_mbwrapper(void);
-
-/*!
- * \brief Rx Error callback prototype.
- */
-static void RadioRxError_mbwrapper(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
-{
-  /* USER CODE BEGIN Process_Radio_Cmd_1 */
-
-  /* USER CODE END Process_Radio_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
-  uint32_t ret_uint;
-  int32_t ret_int;
-  RadioState_t status;
-
-  APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
-
-  /* process Command */
-  switch (ComObj->MsgId)
-  {
-    case RADIO_INIT_ID:
-      radioevents_mbwrapper.TxDone = &RadioTxDone_mbwrapper;
-      radioevents_mbwrapper.TxTimeout = &RadioTxTimeout_mbwrapper;
-      radioevents_mbwrapper.RxDone = &RadioRxDone_mbwrapper;
-      radioevents_mbwrapper.RxTimeout = &RadioRxTimeout_mbwrapper;
-      radioevents_mbwrapper.RxError = &RadioRxError_mbwrapper;
-
-      Radio.Init(&radioevents_mbwrapper);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_GET_STATUS_ID:
-      status = Radio.GetStatus();
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) status; /* */
-      break;
-
-    case RADIO_SET_MODEM_ID:
-      Radio.SetModem((RadioModems_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_SET_CHANNEL_ID:
-      Radio.SetChannel((uint32_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_IS_CHANNEL_FREE_ID:
-      ret_uint = Radio.IsChannelFree(com_buffer[0], com_buffer[1], (int16_t) com_buffer[2], com_buffer[3]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
-      break;
-
-    case RADIO_RANDOM_ID:
-      ret_uint = Radio.Random();
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
-      break;
-
-    case RADIO_SET_RX_CONFIG_ID:
-      Radio.SetRxConfig((RadioModems_t) com_buffer[0],  com_buffer[1],
-                        com_buffer[2], (uint8_t) com_buffer[3],
-                        com_buffer[4], (uint16_t) com_buffer[5],
-                        (uint16_t) com_buffer[6], (bool) com_buffer[7],
-                        (uint8_t) com_buffer[8],
-                        (bool) com_buffer[9], (bool) com_buffer[10], (uint8_t) com_buffer[11],
-                        (bool) com_buffer[12], (bool) com_buffer[13]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_SET_TX_CONFIG_ID:
-      Radio.SetTxConfig((RadioModems_t) com_buffer[0], (int8_t) com_buffer[1],
-                        com_buffer[2], com_buffer[3],  com_buffer[4],
-                        (uint8_t) com_buffer[5], (uint16_t) com_buffer[6],
-                        (bool) com_buffer[7], (bool) com_buffer[8], (bool) com_buffer[9],
-                        (uint8_t) com_buffer[10], (bool) com_buffer[11],  com_buffer[12]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_CHECK_RF_FREQUENCY_ID:
-      ret_uint = Radio.CheckRfFrequency(com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
-      break;
-
-    case RADIO_GET_TIME_ON_AIR_ID:
-      ret_uint = Radio.TimeOnAir((RadioModems_t) com_buffer[0], (uint32_t) com_buffer[1],
-                                 (uint32_t) com_buffer[2], (uint8_t) com_buffer[3],
-                                 (uint16_t) com_buffer[4], (bool) com_buffer[5],
-                                 (uint8_t) com_buffer[6], (bool) com_buffer[7]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
-      break;
-
-    case RADIO_SEND_ID:
-      Radio.Send((uint8_t *) com_buffer[0], (uint8_t) com_buffer[1]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_SLEEP_ID:
-      Radio.Sleep();
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_STANDBY_ID:
-      Radio.Standby();
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_RX_ID:
-      Radio.Rx(com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_START_CAD_ID:
-      Radio.StartCad();
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_SET_TX_CONTINOUS_WAVE_ID:
-      Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_RSSI_ID:
-      ret_int =  Radio.Rssi((RadioModems_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_int; /* */
-      break;
-
-    case RADIO_WRITE_ID:
-      Radio.Write((uint16_t) com_buffer[0], (uint8_t) com_buffer[1]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_READ_ID:
-      ret_uint = Radio.Read((uint16_t) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
-      break;
-
-    case RADIO_WRITE_BUFFER_ID:
-      Radio.WriteRegisters((uint16_t) com_buffer[0], (uint8_t *) com_buffer[1], (uint8_t) com_buffer[2]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_READ_BUFFER_ID:
-      Radio.ReadRegisters((uint16_t) com_buffer[0], (uint8_t *) com_buffer[1], (uint8_t) com_buffer[2]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_SET_MAX_PAYLOAD_LENGTH_ID:
-      Radio.SetMaxPayloadLength((RadioModems_t) com_buffer[0], (uint8_t) com_buffer[1]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_SET_PUBLIC_NETWORK_ID:
-      Radio.SetPublicNetwork((bool) com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_GET_WAKEUP_TIME_ID:
-      ret_uint = Radio.GetWakeupTime();
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
-      break;
-
-    case RADIO_IRQ_PROCESS_ID:
-      Radio.IrqProcess();
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_RX_BOOSTED_ID:
-      Radio.RxBoosted(com_buffer[0]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_SET_RX_DUTY_CYCLE_ID:
-      Radio.SetRxDutyCycle(com_buffer[0], com_buffer[1]);
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_TX_CW_ID:
-      Radio.TxCw((int8_t)com_buffer[0]);
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_TX_PRBS_ID:
-      Radio.TxPrbs();
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = 0; /* */
-      break;
-
-    case RADIO_SET_RX_GENERIC_CONFIG_ID:
-      ret_uint = Radio.RadioSetRxGenericConfig((GenericModems_t) com_buffer[0], (RxConfigGeneric_t *)com_buffer[1], com_buffer[2], com_buffer[3]);
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
-      break;
-
-    case RADIO_SET_TX_GENERIC_CONFIG_ID:
-      ret_uint = Radio.RadioSetTxGenericConfig((GenericModems_t) com_buffer[0], (TxConfigGeneric_t *)com_buffer[1], (int8_t) com_buffer[2], (uint32_t) com_buffer[3]);
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
-      break;
-
-    default:
-      break;
-  }
-
-  /* send Response */
-  APP_LOG(TS_ON, VLEVEL_H, "<CM0PLUS(Radio)\r\n");
-  MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID);
-  /* USER CODE BEGIN Process_Radio_Cmd_2 */
-
-  /* USER CODE END Process_Radio_Cmd_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void RadioTxDone_mbwrapper(void)
-{
-  /* USER CODE BEGIN RadioTxDone_mbwrapper_1 */
-
-  /* USER CODE END RadioTxDone_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
-  com_obj->MsgId = RADIO_TX_DONE_CB_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioTxDone_mbwrapper_2 */
-
-  /* USER CODE END RadioTxDone_mbwrapper_2 */
-}
-
-static void RadioTxTimeout_mbwrapper(void)
-{
-  /* USER CODE BEGIN RadioTxTimeout_mbwrapper_1 */
-
-  /* USER CODE END RadioTxTimeout_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
-  com_obj->MsgId = RADIO_TX_TIMEOUT_CB_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioTxTimeout_mbwrapper_2 */
-
-  /* USER CODE END RadioTxTimeout_mbwrapper_2 */
-}
-
-static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
-{
-  /* USER CODE BEGIN RadioRxDone_mbwrapper_1 */
-
-  /* USER CODE END RadioRxDone_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  /* copy data from Cm0 private memory to shared memory */
-  UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
-
-  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
-  com_obj->MsgId = RADIO_RX_DONE_CB_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
-  com_buffer[i++] = (uint32_t) size;
-  com_buffer[i++] = (uint32_t) rssi;
-  com_buffer[i++] = (uint32_t) snr;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-
-  MBMUXIF_RadioSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
-     this migh be requested just if the buffer should be processed by the applic and the stack */
-  /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
-  return;
-  /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
-
-  /* USER CODE END RadioRxDone_mbwrapper_2 */
-}
-
-static void RadioRxTimeout_mbwrapper(void)
-{
-  /* USER CODE BEGIN RadioRxTimeout_mbwrapper_1 */
-
-  /* USER CODE END RadioRxTimeout_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
-  com_obj->MsgId = RADIO_RX_TIMEOUT_CB_ID;
-  com_obj->ParamCnt = 0;
-
-  MBMUXIF_RadioSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioRxTimeout_mbwrapper_2 */
-
-  /* USER CODE END RadioRxTimeout_mbwrapper_2 */
-}
-
-static void RadioRxError_mbwrapper(void)
-{
-  /* USER CODE BEGIN RadioRxError_mbwrapper_1 */
-
-  /* USER CODE END RadioRxError_mbwrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
-  com_obj->MsgId = RADIO_RX_ERROR_CB_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioRxError_mbwrapper_2 */
-
-  /* USER CODE END RadioRxError_mbwrapper_2 */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
deleted file mode 100644
index 4b3da2cd..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    radio_mbwrapper.h
-  * @author  MCD Application Team
-  * @brief   This file implements the CM0PLUS side wrapper of the Radio interface
-  *          shared between M0 and M4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
-#define __RADIO_MBWRAPPER_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux_table.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__RADIO_MBWRAPPER_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
deleted file mode 100644
index 0a491dd2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    adc.h
-  * @brief   This file contains all the function prototypes for
-  *          the adc.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __ADC_H__
-#define __ADC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-extern ADC_HandleTypeDef hadc;
-
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-void MX_ADC_Init(void);
-
-/* USER CODE BEGIN Prototypes */
-
-/* USER CODE END Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __ADC_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
deleted file mode 100644
index 277fa58c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    adc_if.h
-  * @author  MCD Application Team
-  * @brief   Header for ADC interface configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __ADC_IF_H__
-#define __ADC_IF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Includes ------------------------------------------------------------------*/
-#include "adc.h"
-#include "platform.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Battery level in mV
-  */
-#define BAT_CR2032                  ((uint32_t) 3000)
-/**
-  * @brief Maximum battery level in mV
-  */
-#define VDD_BAT                     BAT_CR2032
-/**
-  * @brief Minimum battery level in mV
-  */
-#define VDD_MIN                     1800
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-
-/**
-  * @brief  Initializes the ADC input
-  */
-void SYS_InitMeasurement(void);
-
-/**
-  * @brief DeInitializes the ADC
-  */
-void SYS_DeInitMeasurement(void);
-
-/**
-  * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
-  */
-int16_t SYS_GetTemperatureLevel(void);
-
-/**
-  * @brief Get the current battery level
-  * @return value battery level in linear scale
-  */
-uint16_t SYS_GetBatteryLevel(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __ADC_IF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
deleted file mode 100644
index 24238c8c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    dma.h
-  * @brief   This file contains all the function prototypes for
-  *          the dma.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __DMA_H__
-#define __DMA_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* DMA memory to memory transfer handles -------------------------------------*/
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-void MX_DMA_Init(void);
-
-/* USER CODE BEGIN Prototypes */
-
-/* USER CODE END Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __DMA_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
deleted file mode 100644
index b784032b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ipcc.h
-  * @brief   This file contains all the function prototypes for
-  *          the ipcc.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __IPCC_H__
-#define __IPCC_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-extern IPCC_HandleTypeDef hipcc;
-
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-void MX_IPCC_Init(void);
-
-/* USER CODE BEGIN Prototypes */
-
-/* USER CODE END Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __IPCC_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
deleted file mode 100644
index 49ee1e48..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ipcc_if.h
-  * @author  MCD Application Team
-  * @brief   This file contains the interface of the ipcc driver on CM4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __IPCC_IF_CM4_H__
-#define __IPCC_IF_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "ipcc.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief Initialise IPCC and register upper and downer callbacks
-  * @param  IPCC_IF_ResponseRcv_cb     response callback
-  * @param  IPCC_IF_NotificationRcv_cb notification callback
-  */
-void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
-                  void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
-
-/**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
-  * @param channelIdx  ipcc channel
-  * @return ipcc channel status
-  * @retval IPCC_CHANNEL_STATUS_FREE 0
-  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
-  */
-uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
-
-/**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
-  * @param channelIdx  ipcc channel
-  * @return ipcc channel status
-  * @retval IPCC_CHANNEL_STATUS_FREE 0
-  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
-  */
-uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
-
-/**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
-  * @param channelIdx  ipcc channel
-  * @return ipcc status [OK: 0 , fail: -1]
-  */
-int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
-
-/**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
-  * @param channelIdx  ipcc channel
-  * @return ipcc status [OK: 0 , fail: -1]
-  */
-int32_t IPCC_IF_AcknowledgeSnd(uint32_t channelIdx);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __IPCC_IF_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
deleted file mode 100644
index 3447444b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file           : main.h
-  * @brief          : Header for main.c file.
-  *                   This file contains the common defines of the application.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MAIN_H
-#define __MAIN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-#include "board_resources.h"
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void Error_Handler(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-/* Private defines -----------------------------------------------------------*/
-#define RTC_N_PREDIV_S 10
-#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
-#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
-#define USARTx_RX_Pin GPIO_PIN_3
-#define USARTx_RX_GPIO_Port GPIOA
-#define USARTx_TX_Pin GPIO_PIN_2
-#define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MAIN_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
deleted file mode 100644
index 58961ffb..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    platform.h
-  * @author  MCD Application Team
-  * @brief   Header for General HW instances configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __PLATFORM_H__
-#define __PLATFORM_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdbool.h>
-#include "stm32wlxx.h"
-#include "main.h"
-#include "stm32wlxx_ll_gpio.h"
-#if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
-/* In order to use BSP, users can add the BSP files in the IDE project space */
-/* and define USE_BSP_DRIVER in the preprocessor definitions  */
-#include "stm32wlxx_nucleo.h"
-#include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
-#endif /* defined(USE_BSP_DRIVER) */
-
-/* USER CODE BEGIN include */
-
-/* USER CODE END include */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __PLATFORM_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
deleted file mode 100644
index b7c44f5d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32_lpm_if.h
-  * @author  MCD Application Team
-  * @brief   Header for Low Power Manager interface configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32_LPM_IF_H__
-#define __STM32_LPM_IF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_lpm.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief Enters Low Power Off Mode
-  */
-void PWR_EnterOffMode(void);
-
-/**
-  * @brief Exits Low Power Off Mode
-  */
-void PWR_ExitOffMode(void);
-
-/**
-  * @brief Enters Low Power Stop Mode
-  * @note ARM exists the function when waking up
-  */
-void PWR_EnterStopMode(void);
-
-/**
-  * @brief Exits Low Power Stop Mode
-  * @note Enable the pll at 32MHz
-  */
-void PWR_ExitStopMode(void);
-
-/**
-  * @brief Enters Low Power Sleep Mode
-  * @note ARM exits the function when waking up
-  */
-void PWR_EnterSleepMode(void);
-
-/**
-  * @brief Exits Low Power Sleep Mode
-  * @note ARM exits the function when waking up
-  */
-void PWR_ExitSleepMode(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__STM32_LPM_IF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
deleted file mode 100644
index 75f1386d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_hal_conf.h
-  * @author  MCD Application Team
-  * @brief   HAL configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLxx_HAL_CONF_H
-#define STM32WLxx_HAL_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-
-/* ########################## Module Selection ############################## */
-/**
-  * @brief This is the list of modules to be used in the HAL driver
-  */
-#define HAL_MODULE_ENABLED
-#define HAL_ADC_MODULE_ENABLED
-/*#define HAL_COMP_MODULE_ENABLED   */
-/*#define HAL_CRC_MODULE_ENABLED   */
-/*#define HAL_CRYP_MODULE_ENABLED   */
-/*#define HAL_DAC_MODULE_ENABLED   */
-/*#define HAL_GTZC_MODULE_ENABLED   */
-/*#define HAL_HSEM_MODULE_ENABLED   */
-/*#define HAL_I2C_MODULE_ENABLED   */
-/*#define HAL_I2S_MODULE_ENABLED   */
-#define HAL_IPCC_MODULE_ENABLED
-/*#define HAL_IRDA_MODULE_ENABLED   */
-/*#define HAL_IWDG_MODULE_ENABLED   */
-/*#define HAL_LPTIM_MODULE_ENABLED   */
-/*#define HAL_PKA_MODULE_ENABLED   */
-/*#define HAL_RNG_MODULE_ENABLED   */
-#define HAL_RTC_MODULE_ENABLED
-/*#define HAL_SMARTCARD_MODULE_ENABLED   */
-/*#define HAL_SMBUS_MODULE_ENABLED   */
-/*#define HAL_SPI_MODULE_ENABLED   */
-/*#define HAL_SUBGHZ_MODULE_ENABLED   */
-#define HAL_TIM_MODULE_ENABLED
-#define HAL_UART_MODULE_ENABLED
-/*#define HAL_USART_MODULE_ENABLED   */
-/*#define HAL_WWDG_MODULE_ENABLED   */
-#define HAL_EXTI_MODULE_ENABLED
-#define HAL_CORTEX_MODULE_ENABLED
-#define HAL_DMA_MODULE_ENABLED
-#define HAL_FLASH_MODULE_ENABLED
-#define HAL_GPIO_MODULE_ENABLED
-#define HAL_PWR_MODULE_ENABLED
-#define HAL_RCC_MODULE_ENABLED
-
-/* ########################## Register Callbacks selection ############################## */
-/**
-  * @brief This is the list of modules where register callback can be used
-  */
-#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
-#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
-#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
-#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
-#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
-#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
-#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
-#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
-#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
-#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
-#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
-#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
-#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
-#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
-#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
-#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
-#define USE_HAL_UART_REGISTER_CALLBACKS        0u
-#define USE_HAL_USART_REGISTER_CALLBACKS       0u
-#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
-
-/* ########################## Oscillator Values adaptation ####################*/
-/**
-  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
-  *        This value is used by the RCC HAL module to compute the system frequency
-  *        (when HSE is used as system clock source, directly or through the PLL).
-  */
-
-#if !defined (HSE_VALUE)
-#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
-#endif /* HSE_VALUE */
-
-#if !defined (HSE_STARTUP_TIMEOUT)
-#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
-#endif /* HSE_STARTUP_TIMEOUT */
-
-/**
-  * @brief Internal Multiple Speed oscillator (MSI) default value.
-  *        This value is the default MSI range value after Reset.
-  */
-#if !defined  (MSI_VALUE)
-#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
-#endif /* MSI_VALUE */
-
-/**
-  * @brief Internal High Speed oscillator (HSI) value.
-  *        This value is used by the RCC HAL module to compute the system frequency
-  *        (when HSI is used as system clock source, directly or through the PLL).
-  */
-#if !defined  (HSI_VALUE)
-#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
-#endif /* HSI_VALUE */
-
-/**
-  * @brief Internal Low Speed oscillator (LSI) value.
-  */
-#if !defined (LSI_VALUE)
-#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
-#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
-                                                        The real value may vary depending on the variations
-                                                        in voltage and temperature. */
-
-/**
-  * @brief External Low Speed oscillator (LSE) value.
-  *        This value is used by the UART, RTC HAL module to compute the system frequency
-  */
-#if !defined (LSE_VALUE)
-#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
-#endif /* LSE_VALUE */
-
-/**
-  * @brief Internal Multiple Speed oscillator (HSI48) default value.
-  *        This value is the default HSI48 range value after Reset.
-  */
-#if !defined (HSI48_VALUE)
-#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
-#endif /* HSI48_VALUE */
-
-#if !defined (LSE_STARTUP_TIMEOUT)
-#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
-#endif /* LSE_STARTUP_TIMEOUT */
-
-/* Tip: To avoid modifying this file each time you need to use different HSE,
-   ===  you can define the HSE value in your toolchain compiler preprocessor. */
-
-/* ########################### System Configuration ######################### */
-/**
-  * @brief This is the HAL system configuration section
-  */
-#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
-#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
-#define  USE_RTOS                           0U
-#define  PREFETCH_ENABLE                    0U
-#define  INSTRUCTION_CACHE_ENABLE           1U
-#define  DATA_CACHE_ENABLE                  1U
-
-/* ########################## Assert Selection ############################## */
-/**
-  * @brief Uncomment the line below to expanse the "assert_param" macro in the
-  *        HAL drivers code
-  */
-/* #define USE_FULL_ASSERT    1 */
-
-/* ################## SPI peripheral configuration ########################## */
-
-/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
- * Activated: CRC code is present inside driver
- * Deactivated: CRC code cleaned from driver
- */
-
-#define USE_SPI_CRC                         1U
-
-/* ################## CRYP peripheral configuration ########################## */
-
-#define USE_HAL_CRYP_SUSPEND_RESUME         1U
-
-/* Includes ------------------------------------------------------------------*/
-/**
-  * @brief Include module's header file
-  */
-#ifdef HAL_DMA_MODULE_ENABLED
-  #include "stm32wlxx_hal_dma.h"
-#endif /* HAL_DMA_MODULE_ENABLED */
-
-#ifdef HAL_ADC_MODULE_ENABLED
-  #include "stm32wlxx_hal_adc.h"
-#endif /* HAL_ADC_MODULE_ENABLED */
-
-#ifdef HAL_COMP_MODULE_ENABLED
-  #include "stm32wlxx_hal_comp.h"
-#endif /* HAL_COMP_MODULE_ENABLED */
-
-#ifdef HAL_CORTEX_MODULE_ENABLED
-  #include "stm32wlxx_hal_cortex.h"
-#endif /* HAL_CORTEX_MODULE_ENABLED */
-
-#ifdef HAL_CRC_MODULE_ENABLED
-  #include "stm32wlxx_hal_crc.h"
-#endif /* HAL_CRC_MODULE_ENABLED */
-
-#ifdef HAL_CRYP_MODULE_ENABLED
-  #include "stm32wlxx_hal_cryp.h"
-#endif /* HAL_CRYP_MODULE_ENABLED */
-
-#ifdef HAL_DAC_MODULE_ENABLED
-  #include "stm32wlxx_hal_dac.h"
-#endif /* HAL_DAC_MODULE_ENABLED */
-
-#ifdef HAL_EXTI_MODULE_ENABLED
-  #include "stm32wlxx_hal_exti.h"
-#endif /* HAL_EXTI_MODULE_ENABLED */
-
-#ifdef HAL_FLASH_MODULE_ENABLED
-  #include "stm32wlxx_hal_flash.h"
-#endif /* HAL_FLASH_MODULE_ENABLED */
-
-#ifdef HAL_GPIO_MODULE_ENABLED
-  #include "stm32wlxx_hal_gpio.h"
-#endif /* HAL_GPIO_MODULE_ENABLED */
-
-#ifdef HAL_GTZC_MODULE_ENABLED
-  #include "stm32wlxx_hal_gtzc.h"
-#endif /* HAL_GTZC_MODULE_ENABLED */
-
-#ifdef HAL_HSEM_MODULE_ENABLED
-  #include "stm32wlxx_hal_hsem.h"
-#endif /* HAL_HSEM_MODULE_ENABLED */
-
-#ifdef HAL_I2C_MODULE_ENABLED
-  #include "stm32wlxx_hal_i2c.h"
-#endif /* HAL_I2C_MODULE_ENABLED */
-
-#ifdef HAL_I2S_MODULE_ENABLED
-  #include "stm32wlxx_hal_i2s.h"
-#endif /* HAL_I2S_MODULE_ENABLED */
-
-#ifdef HAL_IPCC_MODULE_ENABLED
-  #include "stm32wlxx_hal_ipcc.h"
-#endif /* HAL_IPCC_MODULE_ENABLED */
-
-#ifdef HAL_IRDA_MODULE_ENABLED
-  #include "stm32wlxx_hal_irda.h"
-#endif /* HAL_IRDA_MODULE_ENABLED */
-
-#ifdef HAL_IWDG_MODULE_ENABLED
-  #include "stm32wlxx_hal_iwdg.h"
-#endif /* HAL_IWDG_MODULE_ENABLED */
-
-#ifdef HAL_LPTIM_MODULE_ENABLED
-  #include "stm32wlxx_hal_lptim.h"
-#endif /* HAL_LPTIM_MODULE_ENABLED */
-
-#ifdef HAL_PKA_MODULE_ENABLED
-  #include "stm32wlxx_hal_pka.h"
-#endif /* HAL_PKA_MODULE_ENABLED */
-
-#ifdef HAL_PWR_MODULE_ENABLED
-  #include "stm32wlxx_hal_pwr.h"
-#endif /* HAL_PWR_MODULE_ENABLED */
-
-#ifdef HAL_RCC_MODULE_ENABLED
-  #include "stm32wlxx_hal_rcc.h"
-#endif /* HAL_RCC_MODULE_ENABLED */
-
-#ifdef HAL_RNG_MODULE_ENABLED
-  #include "stm32wlxx_hal_rng.h"
-#endif /* HAL_RNG_MODULE_ENABLED */
-
-#ifdef HAL_RTC_MODULE_ENABLED
-  #include "stm32wlxx_hal_rtc.h"
-#endif /* HAL_RTC_MODULE_ENABLED */
-
-#ifdef HAL_SMARTCARD_MODULE_ENABLED
-  #include "stm32wlxx_hal_smartcard.h"
-#endif /* HAL_SMARTCARD_MODULE_ENABLED */
-
-#ifdef HAL_SMBUS_MODULE_ENABLED
-  #include "stm32wlxx_hal_smbus.h"
-#endif /* HAL_SMBUS_MODULE_ENABLED */
-
-#ifdef HAL_SPI_MODULE_ENABLED
-  #include "stm32wlxx_hal_spi.h"
-#endif /* HAL_SPI_MODULE_ENABLED */
-
-#ifdef HAL_SUBGHZ_MODULE_ENABLED
-  #include "stm32wlxx_hal_subghz.h"
-#endif /* HAL_SUBGHZ_MODULE_ENABLED */
-
-#ifdef HAL_TIM_MODULE_ENABLED
-  #include "stm32wlxx_hal_tim.h"
-#endif /* HAL_TIM_MODULE_ENABLED */
-
-#ifdef HAL_UART_MODULE_ENABLED
-  #include "stm32wlxx_hal_uart.h"
-#endif /* HAL_UART_MODULE_ENABLED */
-
-#ifdef HAL_USART_MODULE_ENABLED
-  #include "stm32wlxx_hal_usart.h"
-#endif /* HAL_USART_MODULE_ENABLED */
-
-#ifdef HAL_WWDG_MODULE_ENABLED
-  #include "stm32wlxx_hal_wwdg.h"
-#endif /* HAL_WWDG_MODULE_ENABLED */
-
-/* Exported macro ------------------------------------------------------------*/
-#ifdef USE_FULL_ASSERT
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param expr If expr is false, it calls assert_failed function
-  *         which reports the name of the source file and the source
-  *         line number of the call that failed.
-  *         If expr is true, it returns no value.
-  * @retval None
-  */
-  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
-/* Exported functions ------------------------------------------------------- */
-  void assert_failed(uint8_t* file, uint32_t line);
-#else
-  #define assert_param(expr) ((void)0U)
-#endif /* USE_FULL_ASSERT */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLxx_HAL_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
deleted file mode 100644
index ab592978..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_app.h
-  * @author  MCD Application Team
-  * @brief   Function prototypes for sys_app.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SYS_APP_H__
-#define __SYS_APP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmux_table.h"
-#include "sys_conf.h"
-#include "stm32_adv_trace.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported defines ----------------------------------------------------------*/
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macros -----------------------------------------------------------*/
-#define APP_PPRINTF(...)  do{ } while( UTIL_ADV_TRACE_OK \
-                              != UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__) ) /* Polling Mode */
-#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
-#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
-
-#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
-#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
-#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
-#define APP_LOG(TS,VL,...)
-#else
-#error "APP_LOG_ENABLED not defined or out of range <0,1>"
-#endif /* APP_LOG_ENABLED */
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
-void SystemApp_Init(void);
-
-void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
-
-/**
-  * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
-  * @param  none
-  * @retval battery level
-  */
-uint8_t GetBatteryLevel(void);
-
-/**
-  * @brief  callback to get the current temperature in the MCU
-  * @param  none
-  * @retval temperature level
-  */
-uint16_t GetTemperatureLevel(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SYS_APP_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
deleted file mode 100644
index 74840d89..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_conf.h
-  * @author  MCD Application Team
-  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SYS_CONF_H__
-#define __SYS_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-
-/**
-  * @brief Temperature and pressure values are retrieved from sensors shield
-  *        (instead of sending dummy values). It requires MEMS IKS shield
-  */
-#define SENSOR_ENABLED  0
-
-/**
-  * @brief CM4 Verbose level for all trace logs
-  */
-#define VERBOSE_LEVEL     VLEVEL_M
-
-/**
-  * @brief Enable trace logs
-  */
-#define APP_LOG_ENABLED   1
-
-/**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
-  */
-#define DEBUGGER_ON       0
-
-/**
-  * @brief Disable Low Power mode
-  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
-  */
-#define LOW_POWER_DISABLE 0
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SYS_CONF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
deleted file mode 100644
index 27c3485c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_sensors.h
-  * @author  MCD Application Team
-  * @brief   Header for sensors application
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SENSORS_H__
-#define __SENSORS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Includes ------------------------------------------------------------------*/
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * Sensor data parameters
-  */
-typedef struct
-{
-  float pressure;         /*!< in mbar */
-  float temperature;      /*!< in degC */
-  float humidity;         /*!< in % */
-  int32_t latitude;       /*!< latitude converted to binary */
-  int32_t longitude ;     /*!< longitude converted to binary */
-  int16_t altitudeGps;    /*!< in m */
-  int16_t altitudeBar ;   /*!< in m * 10 */
-  /**more may be added*/
-  /* USER CODE BEGIN sensor_t */
-
-  /* USER CODE END sensor_t */
-} sensor_t;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
-#define HTS221_0    0U
-#define LPS22HB_0   1U
-#endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief  initialises the environmental sensor
-  */
-void  EnvSensors_Init(void);
-
-/**
-  * @brief  Environmental sensor  read.
-  * @param  sensor_data sensor data
-  */
-void EnvSensors_Read(sensor_t *sensor_data);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SENSORS_H__ */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
deleted file mode 100644
index 1315adaf..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usart.h
-  * @brief   This file contains all the function prototypes for
-  *          the usart.c file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USART_H__
-#define __USART_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-extern UART_HandleTypeDef huart2;
-
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-void MX_USART2_UART_Init(void);
-
-/* USER CODE BEGIN Prototypes */
-
-/* USER CODE END Prototypes */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USART_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
deleted file mode 100644
index 87adf426..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usart_if.h
-  * @author  MCD Application Team
-  * @brief   Header for USART interface configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-#include "stm32_adv_trace.h"
-#include "usart.h"
-#include "dma.h"
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __USART_IF_H__
-#define __USART_IF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief  Init the UART and associated DMA.
-  * @param  cb TxCpltCallback
-  * @return @ref UTIL_ADV_TRACE_Status_t
-  */
-UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *));
-
-/**
-  * @brief  init receiver of vcom
-  * @param  RxCb callback when Rx char is received
-  * @return @ref UTIL_ADV_TRACE_Status_t
-  */
-UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error));
-
-/**
-  * @brief  DeInit the UART and associated DMA.
-  * @return @ref UTIL_ADV_TRACE_Status_t
-  */
-UTIL_ADV_TRACE_Status_t vcom_DeInit(void);
-
-/**
-  * @brief  send buffer \p p_data of size \p size to vcom in polling mode
-  * @param  p_data data to be sent
-  * @param  size of buffer p_data to be sent
-  */
-void vcom_Trace(uint8_t *p_data, uint16_t size);
-
-/**
-  * @brief  send buffer \p p_data of size \p size to vcom using DMA
-  * @param  p_data data to be sent
-  * @param  size of buffer p_data to be sent
-  * @return @ref UTIL_ADV_TRACE_Status_t
-  */
-UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size);
-
-/**
-  * @brief  last byte has been sent on the uart line
-  */
-void vcom_IRQHandler(void);
-
-/**
-  * @brief  last byte has been sent from memory to uart data register
-  */
-void vcom_DMA_TX_IRQHandler(void);
-
-/**
-  * @brief  Resume the UART and associated DMA (used by LPM)
-  */
-void vcom_Resume(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USART_IF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
deleted file mode 100644
index 43a2ee92..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    utilities_conf.h
-  * @author  MCD Application Team
-  * @brief   Header for configuration file to utilities
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
- */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __UTILITIES_CONF_H__
-#define __UTILITIES_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "cmsis_compiler.h"
-
-/* definitions to be provided to "sequencer" utility */
-#include "stm32_mem.h"
-/* definition and callback for tiny_vsnprintf */
-#include "stm32_tiny_vsnprintf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/*---------------------------------------------------------------------------*/
-/*                             sequencer configuration                       */
-/*---------------------------------------------------------------------------*/
-/**
-  * @brief Sequencer flag reserved for future use
-  */
-#define UTIL_SEQ_RFU 0
-
-/**
-  * @brief default number of tasks configured in sequencer
-  */
-#define SEQ_CONF_TASK_NBR    3
-
-/**
-  * @brief default value of priority task
-  */
-#define SEQ_CONF_PRIO_NBR    1
-
-#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
-#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
-                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
-#define VLEVEL_L 1       /*!< just essential traces */
-#define VLEVEL_M 2       /*!< functional traces */
-#define VLEVEL_H 3       /*!< all traces */
-
-#define TS_OFF 0         /*!< Log without TimeStamp */
-#define TS_ON 1          /*!< Log with TimeStamp */
-
-#define T_REG_OFF  0     /*!< Log without bitmask */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macros -----------------------------------------------------------*/
-/**
-  * @brief Memory placement macro
-  */
-#if defined(__CC_ARM)
-#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
-#elif defined(__ICCARM__)
-#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
-#else  /* __GNUC__ */
-#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
-#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
-
-/**
-  * @brief Memory alignment macro
-  */
-#undef ALIGN
-#ifdef WIN32
-#define ALIGN(n)
-#else
-#define ALIGN(n)             __attribute__((aligned(n)))
-#endif /* WIN32 */
-
-/**
-  * @brief macro used to initialize the critical section
-  */
-#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
-
-/**
-  * @brief macro used to enter the critical section
-  */
-#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
-
-/**
-  * @brief macro used to exit the critical section
-  */
-#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
-
-/**
-  * @brief Memset utilities interface to application
-  */
-#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
-
-/**
-  * @brief macro used to initialize the critical section
-  */
-#define UTILS_INIT_CRITICAL_SECTION()
-
-/**
-  * @brief macro used to enter the critical section
-  */
-#define UTILS_ENTER_CRITICAL_SECTION() uint32_t primask_bit= __get_PRIMASK();\
-  __disable_irq()
-
-/**
-  * @brief macro used to exit the critical section
-  */
-#define UTILS_EXIT_CRITICAL_SECTION()  __set_PRIMASK(primask_bit)
-
-/******************************************************************************
-  * trace\advanced
-  * the define option
-  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
-  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
-  *
-  ******************************************************************************/
-
-#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
-#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
-#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
-#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
-#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
-#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
-#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
-#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
-#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
-#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
-#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__UTILITIES_CONF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
deleted file mode 100644
index 27dfedb5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    utilities_def.h
-  * @author  MCD Application Team
-  * @brief   Definitions for modules requiring utilities
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __UTILITIES_DEF_H__
-#define __UTILITIES_DEF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/******************************************************************************
-  * LOW POWER MANAGER
-  ******************************************************************************/
-/**
-  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
-  * It lists a bit mapping of all user of the Low Power Manager
-  */
-typedef enum
-{
-  CFG_LPM_APPLI_Id,
-  CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
-  /* USER CODE BEGIN CFG_LPM_Id_t */
-
-  /* USER CODE END CFG_LPM_Id_t */
-} CFG_LPM_Id_t;
-
-/*---------------------------------------------------------------------------*/
-/*                             sequencer definitions                         */
-/*---------------------------------------------------------------------------*/
-
-/**
-  * This is the list of priority required by the application
-  * Each Id shall be in the range 0..31
-  */
-typedef enum
-{
-  CFG_SEQ_Prio_0,
-  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
-
-  /* USER CODE END CFG_SEQ_Prio_Id_t */
-  CFG_SEQ_Prio_NBR,
-} CFG_SEQ_Prio_Id_t;
-
-/**
-  * This is the list of task id required by the application
-  * Each Id shall be in the range 0..31
-  */
-typedef enum
-{
-  /* CM4 */
-  CFG_SEQ_Task_MbSystemNotifRcv,
-  CFG_SEQ_Task_MbLoRaNotifRcv,
-  CFG_SEQ_Task_MbRadioNotifRcv,
-  CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent,
-  CFG_SEQ_Task_MbLmHandlerProcess,
-  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
-
-  /* USER CODE END CFG_SEQ_Task_Id_t */
-  CFG_SEQ_Task_NBR
-} CFG_SEQ_Task_Id_t;
-
-/**
-  * This is a bit mapping over 32bits listing all events id supported in the application
-  */
-typedef enum
-{
-  /* CM4 */
-  CFG_SEQ_Evt_MbSystemRespRcv,
-  CFG_SEQ_Evt_MbKmsRespRcv,
-  CFG_SEQ_Evt_MbLoRaRespRcv,
-  CFG_SEQ_Evt_MbRadioRespRcv,
-  /* USER CODE BEGIN CFG_SEQ_IdleEvt_Id_t */
-
-  /* USER CODE END CFG_SEQ_IdleEvt_Id_t */
-  CFG_SEQ_Evt_NBR
-} CFG_SEQ_IdleEvt_Id_t;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __UTILITIES_DEF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
deleted file mode 100644
index 4e783b96..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    adc.c
-  * @brief   This file provides code for the configuration
-  *          of the ADC instances.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "adc.h"
-
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-ADC_HandleTypeDef hadc;
-
-/* ADC init function */
-void MX_ADC_Init(void)
-{
-
-  /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
-  */
-  hadc.Instance = ADC;
-  hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
-  hadc.Init.Resolution = ADC_RESOLUTION_12B;
-  hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
-  hadc.Init.ScanConvMode = ADC_SCAN_DISABLE;
-  hadc.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
-  hadc.Init.LowPowerAutoWait = DISABLE;
-  hadc.Init.LowPowerAutoPowerOff = DISABLE;
-  hadc.Init.ContinuousConvMode = DISABLE;
-  hadc.Init.NbrOfConversion = 1;
-  hadc.Init.DiscontinuousConvMode = DISABLE;
-  hadc.Init.ExternalTrigConv = ADC_SOFTWARE_START;
-  hadc.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
-  hadc.Init.DMAContinuousRequests = DISABLE;
-  hadc.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
-  hadc.Init.SamplingTimeCommon1 = ADC_SAMPLETIME_160CYCLES_5;
-  hadc.Init.SamplingTimeCommon2 = ADC_SAMPLETIME_160CYCLES_5;
-  hadc.Init.OversamplingMode = DISABLE;
-  hadc.Init.TriggerFrequencyMode = ADC_TRIGGER_FREQ_HIGH;
-  if (HAL_ADC_Init(&hadc) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-}
-
-void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
-{
-
-  if(adcHandle->Instance==ADC)
-  {
-  /* USER CODE BEGIN ADC_MspInit 0 */
-
-  /* USER CODE END ADC_MspInit 0 */
-    /* ADC clock enable */
-    __HAL_RCC_ADC_CLK_ENABLE();
-  /* USER CODE BEGIN ADC_MspInit 1 */
-
-  /* USER CODE END ADC_MspInit 1 */
-  }
-}
-
-void HAL_ADC_MspDeInit(ADC_HandleTypeDef* adcHandle)
-{
-
-  if(adcHandle->Instance==ADC)
-  {
-  /* USER CODE BEGIN ADC_MspDeInit 0 */
-
-  /* USER CODE END ADC_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_ADC_CLK_DISABLE();
-  /* USER CODE BEGIN ADC_MspDeInit 1 */
-
-  /* USER CODE END ADC_MspDeInit 1 */
-  }
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
deleted file mode 100644
index 4e61c91c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    adc_if.c
-  * @author  MCD Application Team
-  * @brief   Read status related to the chip (battery level, VREF, chip temperature)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "adc_if.h"
-#include "sys_app.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/**
-  * @brief ADC handle
-  */
-extern ADC_HandleTypeDef hadc;
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-#define TEMPSENSOR_TYP_CAL1_V          (( int32_t)  760)        /*!< Internal temperature sensor, parameter V30 (unit: mV). Refer to device datasheet for min/typ/max values. */
-#define TEMPSENSOR_TYP_AVGSLOPE        (( int32_t) 2500)        /*!< Internal temperature sensor, parameter Avg_Slope (unit: uV/DegCelsius). Refer to device datasheet for min/typ/max values. */
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief This function reads the ADC channel
-  * @param channel channel number to read
-  * @return adc measured level value
-  */
-static uint32_t ADC_ReadChannels(uint32_t channel);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-void SYS_InitMeasurement(void)
-{
-  /* USER CODE BEGIN SYS_InitMeasurement_1 */
-
-  /* USER CODE END SYS_InitMeasurement_1 */
-  hadc.Instance = ADC;
-  /* USER CODE BEGIN SYS_InitMeasurement_2 */
-
-  /* USER CODE END SYS_InitMeasurement_2 */
-}
-
-void SYS_DeInitMeasurement(void)
-{
-  /* USER CODE BEGIN SYS_DeInitMeasurement_1 */
-
-  /* USER CODE END SYS_DeInitMeasurement_1 */
-}
-
-int16_t SYS_GetTemperatureLevel(void)
-{
-  /* USER CODE BEGIN SYS_GetTemperatureLevel_1 */
-
-  /* USER CODE END SYS_GetTemperatureLevel_1 */
-  int16_t temperatureDegreeC = 0;
-  uint32_t measuredLevel = 0;
-  uint16_t batteryLevelmV = SYS_GetBatteryLevel();
-
-  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_TEMPSENSOR);
-
-  /* convert ADC level to temperature */
-  /* check whether device has temperature sensor calibrated in production */
-  if (((int32_t)*TEMPSENSOR_CAL2_ADDR - (int32_t)*TEMPSENSOR_CAL1_ADDR) != 0)
-  {
-    /* Device with temperature sensor calibrated in production:
-       use device optimized parameters */
-    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE(batteryLevelmV,
-                                                   measuredLevel,
-                                                   LL_ADC_RESOLUTION_12B);
-  }
-  else
-  {
-    /* Device with temperature sensor not calibrated in production:
-       use generic parameters */
-    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE_TYP_PARAMS(TEMPSENSOR_TYP_AVGSLOPE,
-                                                              TEMPSENSOR_TYP_CAL1_V,
-                                                              TEMPSENSOR_CAL1_TEMP,
-                                                              batteryLevelmV,
-                                                              measuredLevel,
-                                                              LL_ADC_RESOLUTION_12B);
-  }
-
-  APP_LOG(TS_ON, VLEVEL_L, "temp= %d\n\r", temperatureDegreeC);
-
-  /* from int16 to q8.7*/
-  temperatureDegreeC <<= 8;
-
-  return (int16_t) temperatureDegreeC;
-  /* USER CODE BEGIN SYS_GetTemperatureLevel_2 */
-
-  /* USER CODE END SYS_GetTemperatureLevel_2 */
-}
-
-uint16_t SYS_GetBatteryLevel(void)
-{
-  /* USER CODE BEGIN SYS_GetBatteryLevel_1 */
-
-  /* USER CODE END SYS_GetBatteryLevel_1 */
-  uint16_t batteryLevelmV = 0;
-  uint32_t measuredLevel = 0;
-
-  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_VREFINT);
-
-  if (measuredLevel == 0)
-  {
-    batteryLevelmV = 0;
-  }
-  else
-  {
-    if ((uint32_t)*VREFINT_CAL_ADDR != (uint32_t)0xFFFFU)
-    {
-      /* Device with Reference voltage calibrated in production:
-         use device optimized parameters */
-      batteryLevelmV = __LL_ADC_CALC_VREFANALOG_VOLTAGE(measuredLevel,
-                                                        ADC_RESOLUTION_12B);
-    }
-    else
-    {
-      /* Device with Reference voltage not calibrated in production:
-         use generic parameters */
-      batteryLevelmV = (VREFINT_CAL_VREF * 1510) / measuredLevel;
-    }
-  }
-
-  return batteryLevelmV;
-  /* USER CODE BEGIN SYS_GetBatteryLevel_2 */
-
-  /* USER CODE END SYS_GetBatteryLevel_2 */
-}
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-static uint32_t ADC_ReadChannels(uint32_t channel)
-{
-  /* USER CODE BEGIN ADC_ReadChannels_1 */
-
-  /* USER CODE END ADC_ReadChannels_1 */
-  uint32_t ADCxConvertedValues = 0;
-  ADC_ChannelConfTypeDef sConfig = {0};
-
-  MX_ADC_Init();
-
-  /* Start Calibration */
-  if (HAL_ADCEx_Calibration_Start(&hadc) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /* Configure Regular Channel */
-  sConfig.Channel = channel;
-  sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLINGTIME_COMMON_1;
-  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  if (HAL_ADC_Start(&hadc) != HAL_OK)
-  {
-    /* Start Error */
-    Error_Handler();
-  }
-  /** Wait for end of conversion */
-  HAL_ADC_PollForConversion(&hadc, HAL_MAX_DELAY);
-
-  /** Wait for end of conversion */
-  HAL_ADC_Stop(&hadc) ;   /* it calls also ADC_Disable() */
-
-  ADCxConvertedValues = HAL_ADC_GetValue(&hadc);
-
-  HAL_ADC_DeInit(&hadc);
-
-  return ADCxConvertedValues;
-  /* USER CODE BEGIN ADC_ReadChannels_2 */
-
-  /* USER CODE END ADC_ReadChannels_2 */
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
deleted file mode 100644
index 4f10df5f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    dma.c
-  * @brief   This file provides code for the configuration
-  *          of all the requested memory to memory DMA transfers.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "dma.h"
-
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/*----------------------------------------------------------------------------*/
-/* Configure DMA                                                              */
-/*----------------------------------------------------------------------------*/
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-
-/**
-  * Enable DMA controller clock
-  */
-void MX_DMA_Init(void)
-{
-
-  /* DMA controller clock enable */
-  __HAL_RCC_DMAMUX1_CLK_ENABLE();
-  __HAL_RCC_DMA1_CLK_ENABLE();
-
-  /* DMA interrupt init */
-  /* DMA1_Channel5_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
-
-}
-
-/* USER CODE BEGIN 2 */
-
-/* USER CODE END 2 */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
deleted file mode 100644
index ad6e2e7c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ipcc.c
-  * @brief   This file provides code for the configuration
-  *          of the IPCC instances.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "ipcc.h"
-
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-IPCC_HandleTypeDef hipcc;
-
-/* IPCC init function */
-void MX_IPCC_Init(void)
-{
-
-  hipcc.Instance = IPCC;
-  if (HAL_IPCC_Init(&hipcc) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-}
-
-void HAL_IPCC_MspInit(IPCC_HandleTypeDef* ipccHandle)
-{
-
-  if(ipccHandle->Instance==IPCC)
-  {
-  /* USER CODE BEGIN IPCC_MspInit 0 */
-
-  /* USER CODE END IPCC_MspInit 0 */
-    /* IPCC clock enable */
-    __HAL_RCC_IPCC_CLK_ENABLE();
-
-    /* IPCC interrupt Init */
-    HAL_NVIC_SetPriority(IPCC_C1_RX_IRQn, 1, 0);
-    HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn);
-    HAL_NVIC_SetPriority(IPCC_C1_TX_IRQn, 1, 0);
-    HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn);
-  /* USER CODE BEGIN IPCC_MspInit 1 */
-
-  /* USER CODE END IPCC_MspInit 1 */
-  }
-}
-
-void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* ipccHandle)
-{
-
-  if(ipccHandle->Instance==IPCC)
-  {
-  /* USER CODE BEGIN IPCC_MspDeInit 0 */
-
-  /* USER CODE END IPCC_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_IPCC_CLK_DISABLE();
-
-    /* IPCC interrupt Deinit */
-    HAL_NVIC_DisableIRQ(IPCC_C1_RX_IRQn);
-    HAL_NVIC_DisableIRQ(IPCC_C1_TX_IRQn);
-  /* USER CODE BEGIN IPCC_MspDeInit 1 */
-
-  /* USER CODE END IPCC_MspDeInit 1 */
-  }
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
deleted file mode 100644
index abfae080..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ipcc_if.c
-  * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-
-/*ipcc interface for M4*/
-#include "assert.h"
-#include "stddef.h"
-#include "ipcc_if.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static void (*IpccResponseRcv)(uint32_t channelIdx);
-
-static void (*IpccNotificationRcv)(uint32_t channelIdx);
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Interrupt service routine executed when Ipcc receive IRQ confirmation of a received message by remote CPU
-  */
-static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
-
-/**
-  * @brief Interrupt service routine executed when Ipcc receive IRQ notification request by remote CPU
-  */
-static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
-                  void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx))
-{
-  /* USER CODE BEGIN IPCC_IF_Init_1 */
-
-  /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
-  MX_IPCC_Init();
-
-  /* IPCC EXTI (AIEC) line for CPU1  */
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
-  LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
-
-  /* Initialises IPCC callback of all channels*/
-  for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
-  {
-    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
-    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
-  }
-
-  /* Registers upper level (applic) callback */
-  IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
-  IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
-  return;
-  /* USER CODE BEGIN IPCC_IF_Init_2 */
-
-  /* USER CODE END IPCC_IF_Init_2 */
-}
-
-uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_1 */
-
-  /* USER CODE END IPCC_IF_CmdRespStatus_1 */
-  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX);
-  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_2 */
-
-  /* USER CODE END IPCC_IF_CmdRespStatus_2 */
-}
-
-uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_1 */
-
-  /* USER CODE END IPCC_IF_NotifAckStatus_1 */
-  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX);
-  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_2 */
-
-  /* USER CODE END IPCC_IF_NotifAckStatus_2 */
-}
-
-int32_t IPCC_IF_CommandSnd(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN IPCC_IF_CommandSnd_1 */
-
-  /* USER CODE END IPCC_IF_CommandSnd_1 */
-  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX))
-  {
-    return -1;
-  }
-  else
-  {
-    return 0;
-  }
-  /* USER CODE BEGIN IPCC_IF_CommandSnd_2 */
-
-  /* USER CODE END IPCC_IF_CommandSnd_2 */
-}
-
-int32_t IPCC_IF_AcknowledgeSnd(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN IPCC_IF_AcknowledgeSnd_1 */
-
-  /* USER CODE END IPCC_IF_AcknowledgeSnd_1 */
-  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX))
-  {
-    return -1;
-  }
-  else
-  {
-    return 0;
-  }
-  /* USER CODE BEGIN IPCC_IF_AcknowledgeSnd_2 */
-
-  /* USER CODE END IPCC_IF_AcknowledgeSnd_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-
-static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
-{
-  /* USER CODE BEGIN IpccIfIsrTxCb_1 */
-
-  /* USER CODE END IpccIfIsrTxCb_1 */
-  UNUSED(hIpcc);
-  UNUSED(ChannelDir);
-
-  IpccResponseRcv(ChannelIndex);
-  return;
-  /* USER CODE BEGIN IpccIfIsrTxCb_2 */
-
-  /* USER CODE END IpccIfIsrTxCb_2 */
-}
-
-static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
-{
-  /* USER CODE BEGIN IpccIfIsrRxCb_1 */
-
-  /* USER CODE END IpccIfIsrRxCb_1 */
-  UNUSED(hIpcc);
-  UNUSED(ChannelDir);
-
-  IpccNotificationRcv(ChannelIndex);
-  return;
-  /* USER CODE BEGIN IpccIfIsrRxCb_2 */
-
-  /* USER CODE END IpccIfIsrRxCb_2 */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
deleted file mode 100644
index 25a3f790..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file           : main.c
-  * @brief          : Main program body
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "app_lorawan.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-void SystemClock_Config(void);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/**
-  * @brief  The application entry point.
-  * @retval int
-  */
-int main(void)
-{
-  /* USER CODE BEGIN 1 */
-
-  /* USER CODE END 1 */
-
-  /* MCU Configuration--------------------------------------------------------*/
-
-  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-  HAL_Init();
-
-  /* USER CODE BEGIN Init */
-
-  /* USER CODE END Init */
-
-  /* Configure the system clock */
-  SystemClock_Config();
-
-  /* USER CODE BEGIN SysInit */
-
-  /* USER CODE END SysInit */
-
-  /* Initialize all configured peripherals */
-  MX_LoRaWAN_Init();
-  /* USER CODE BEGIN 2 */
-
-  /* USER CODE END 2 */
-
-  /* Infinite loop */
-  /* USER CODE BEGIN WHILE */
-  while (1)
-  {
-    /* USER CODE END WHILE */
-    MX_LoRaWAN_Process();
-
-    /* USER CODE BEGIN 3 */
-  }
-  /* USER CODE END 3 */
-}
-
-/**
-  * @brief System Clock Configuration
-  * @retval None
-  */
-void SystemClock_Config(void)
-{
-  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
-  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
-
-  /** Configure LSE Drive Capability
-  */
-  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
-  /** Configure the main internal regulator output voltage
-  */
-  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
-  /** Initializes the CPU, AHB and APB busses clocks
-  */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
-  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
-  RCC_OscInitStruct.MSIState = RCC_MSI_ON;
-  RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT;
-  RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_11;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers
-  */
-  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK3|RCC_CLOCKTYPE_HCLK2
-                              |RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
-                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
-  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI;
-  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
-
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-}
-
-/* USER CODE BEGIN 4 */
-
-/* USER CODE END 4 */
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @retval None
-  */
-void Error_Handler(void)
-{
-  /* USER CODE BEGIN Error_Handler_Debug */
-  /* User can add his own implementation to report the HAL error return state */
-  while (1)
-  {
-  }
-  /* USER CODE END Error_Handler_Debug */
-}
-
-#ifdef  USE_FULL_ASSERT
-/**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t *file, uint32_t line)
-{
-  /* USER CODE BEGIN 6 */
-  /* User can add his own implementation to report the file name and line number,
-     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  while (1)
-  {
-  }
-  /* USER CODE END 6 */
-}
-#endif /* USE_FULL_ASSERT */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
deleted file mode 100644
index 04efdb6d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32_lpm_if.c
-  * @author  MCD Application Team
-  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
-#include "stm32_lpm.h"
-#include "stm32_lpm_if.h"
-#include "usart_if.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Power driver callbacks handler
-  */
-const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
-{
-  PWR_EnterSleepMode,
-  PWR_ExitSleepMode,
-
-  PWR_EnterStopMode,
-  PWR_ExitStopMode,
-
-  PWR_EnterOffMode,
-  PWR_ExitOffMode,
-};
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-void PWR_EnterOffMode(void)
-{
-  /* USER CODE BEGIN EnterOffMode_1 */
-
-  /* USER CODE END EnterOffMode_1 */
-}
-
-void PWR_ExitOffMode(void)
-{
-  /* USER CODE BEGIN ExitOffMode_1 */
-
-  /* USER CODE END ExitOffMode_1 */
-}
-
-void PWR_EnterStopMode(void)
-{
-  /* USER CODE BEGIN EnterStopMode_1 */
-
-  /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
-  HAL_SuspendTick();
-  /* Clear Status Flag before entering STOP/STANDBY Mode */
-  LL_PWR_ClearFlag_C1STOP_C1STB();
-
-  /* USER CODE BEGIN EnterStopMode_2 */
-
-  /* USER CODE END EnterStopMode_2 */
-  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
-  /* USER CODE BEGIN EnterStopMode_3 */
-
-  /* USER CODE END EnterStopMode_3 */
-}
-
-void PWR_ExitStopMode(void)
-{
-  /* USER CODE BEGIN ExitStopMode_1 */
-
-  /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
-  HAL_ResumeTick();
-  /*Not retained periph:
-    ADC interface
-    DAC interface USARTx, TIMx, i2Cx, SPIx
-    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
-
-  /* Resume not retained USARTx and DMA */
-  vcom_Resume();
-  /* USER CODE BEGIN ExitStopMode_2 */
-
-  /* USER CODE END ExitStopMode_2 */
-}
-
-void PWR_EnterSleepMode(void)
-{
-  /* USER CODE BEGIN EnterSleepMode_1 */
-
-  /* USER CODE END EnterSleepMode_1 */
-  /* Suspend sysTick */
-  HAL_SuspendTick();
-  /* USER CODE BEGIN EnterSleepMode_2 */
-
-  /* USER CODE END EnterSleepMode_2 */
-  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
-  /* USER CODE BEGIN EnterSleepMode_3 */
-
-  /* USER CODE END EnterSleepMode_3 */
-}
-
-void PWR_ExitSleepMode(void)
-{
-  /* USER CODE BEGIN ExitSleepMode_1 */
-
-  /* USER CODE END ExitSleepMode_1 */
-  /* Suspend sysTick */
-  HAL_ResumeTick();
-
-  /* USER CODE BEGIN ExitSleepMode_2 */
-
-  /* USER CODE END ExitSleepMode_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
deleted file mode 100644
index 208d8cff..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_it.c
-  * @brief   Interrupt Service Routines.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "stm32wlxx_it.h"
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN TD */
-
-/* USER CODE END TD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/* External variables --------------------------------------------------------*/
-extern IPCC_HandleTypeDef hipcc;
-extern DMA_HandleTypeDef hdma_usart2_tx;
-extern UART_HandleTypeDef huart2;
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/******************************************************************************/
-/*           Cortex Processor Interruption and Exception Handlers          */
-/******************************************************************************/
-/**
-  * @brief This function handles Non maskable interrupt.
-  */
-void NMI_Handler(void)
-{
-  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
-
-  /* USER CODE END NonMaskableInt_IRQn 0 */
-  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
-  /* USER CODE END NonMaskableInt_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Hard fault interrupt.
-  */
-void HardFault_Handler(void)
-{
-  /* USER CODE BEGIN HardFault_IRQn 0 */
-
-  /* USER CODE END HardFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
-    /* USER CODE END W1_HardFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Memory management fault.
-  */
-void MemManage_Handler(void)
-{
-  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
-
-  /* USER CODE END MemoryManagement_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
-    /* USER CODE END W1_MemoryManagement_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Prefetch fault, memory access fault.
-  */
-void BusFault_Handler(void)
-{
-  /* USER CODE BEGIN BusFault_IRQn 0 */
-
-  /* USER CODE END BusFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
-    /* USER CODE END W1_BusFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Undefined instruction or illegal state.
-  */
-void UsageFault_Handler(void)
-{
-  /* USER CODE BEGIN UsageFault_IRQn 0 */
-
-  /* USER CODE END UsageFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
-    /* USER CODE END W1_UsageFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles System service call via SWI instruction.
-  */
-void SVC_Handler(void)
-{
-  /* USER CODE BEGIN SVCall_IRQn 0 */
-
-  /* USER CODE END SVCall_IRQn 0 */
-  /* USER CODE BEGIN SVCall_IRQn 1 */
-
-  /* USER CODE END SVCall_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Debug monitor.
-  */
-void DebugMon_Handler(void)
-{
-  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
-
-  /* USER CODE END DebugMonitor_IRQn 0 */
-  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
-
-  /* USER CODE END DebugMonitor_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Pendable request for system service.
-  */
-void PendSV_Handler(void)
-{
-  /* USER CODE BEGIN PendSV_IRQn 0 */
-
-  /* USER CODE END PendSV_IRQn 0 */
-  /* USER CODE BEGIN PendSV_IRQn 1 */
-
-  /* USER CODE END PendSV_IRQn 1 */
-}
-
-/**
-  * @brief This function handles System tick timer.
-  */
-void SysTick_Handler(void)
-{
-  /* USER CODE BEGIN SysTick_IRQn 0 */
-
-  /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
-  /* USER CODE BEGIN SysTick_IRQn 1 */
-
-  /* USER CODE END SysTick_IRQn 1 */
-}
-
-/******************************************************************************/
-/* STM32WLxx Peripheral Interrupt Handlers                                    */
-/* Add here the Interrupt Handlers for the used peripherals.                  */
-/* For the available peripheral interrupt handler names,                      */
-/* please refer to the startup file (startup_stm32wlxx.s).                    */
-/******************************************************************************/
-
-/**
-  * @brief This function handles EXTI Line 0 Interrupt.
-  */
-void EXTI0_IRQHandler(void)
-{
-  /* USER CODE BEGIN EXTI0_IRQn 0 */
-
-  /* USER CODE END EXTI0_IRQn 0 */
-  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
-  /* USER CODE BEGIN EXTI0_IRQn 1 */
-
-  /* USER CODE END EXTI0_IRQn 1 */
-}
-
-/**
-  * @brief This function handles EXTI Line 1 Interrupt.
-  */
-void EXTI1_IRQHandler(void)
-{
-  /* USER CODE BEGIN EXTI1_IRQn 0 */
-
-  /* USER CODE END EXTI1_IRQn 0 */
-  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1);
-  /* USER CODE BEGIN EXTI1_IRQn 1 */
-
-  /* USER CODE END EXTI1_IRQn 1 */
-}
-
-/**
-  * @brief This function handles DMA1 Channel 5 Interrupt.
-  */
-void DMA1_Channel5_IRQHandler(void)
-{
-  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
-
-  /* USER CODE END DMA1_Channel5_IRQn 0 */
-  HAL_DMA_IRQHandler(&hdma_usart2_tx);
-  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
-
-  /* USER CODE END DMA1_Channel5_IRQn 1 */
-}
-
-/**
-  * @brief This function handles USART2 Interrupt.
-  */
-void USART2_IRQHandler(void)
-{
-  /* USER CODE BEGIN USART2_IRQn 0 */
-
-  /* USER CODE END USART2_IRQn 0 */
-  HAL_UART_IRQHandler(&huart2);
-  /* USER CODE BEGIN USART2_IRQn 1 */
-
-  /* USER CODE END USART2_IRQn 1 */
-}
-
-/**
-  * @brief This function handles IPCC RX Occupied Interrupt.
-  */
-void IPCC_C1_RX_IRQHandler(void)
-{
-  /* USER CODE BEGIN IPCC_C1_RX_IRQn 0 */
-
-  /* USER CODE END IPCC_C1_RX_IRQn 0 */
-  HAL_IPCC_RX_IRQHandler(&hipcc);
-  /* USER CODE BEGIN IPCC_C1_RX_IRQn 1 */
-
-  /* USER CODE END IPCC_C1_RX_IRQn 1 */
-}
-
-/**
-  * @brief This function handles IPCC TX Free Interrupt.
-  */
-void IPCC_C1_TX_IRQHandler(void)
-{
-  /* USER CODE BEGIN IPCC_C1_TX_IRQn 0 */
-
-  /* USER CODE END IPCC_C1_TX_IRQn 0 */
-  HAL_IPCC_TX_IRQHandler(&hipcc);
-  /* USER CODE BEGIN IPCC_C1_TX_IRQn 1 */
-
-  /* USER CODE END IPCC_C1_TX_IRQn 1 */
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
deleted file mode 100644
index 77973e2c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
+++ /dev/null
@@ -1,493 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_app.c
-  * @author  MCD Application Team
-  * @brief   Initializes HW and SW system entities (not related to the radio)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdio.h>
-#include "platform.h"
-#include "sys_app.h"
-#include "adc_if.h"
-#include "stm32_seq.h"
-#include "stm32_systime.h"
-#include "stm32_lpm.h"
-#include "utilities_def.h"
-#include "sys_debug.h"
-#include "timer_if.h"
-#include "sys_sensors.h"
-#include "msg_id.h"
-#include "mbmuxif_sys.h"
-#include "mbmuxif_trace.h"
-#include "mbmuxif_lora.h"
-#include "mbmuxif_radio.h"
-/*#include "mbmuxif_kms.h"*/
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-#define MAX_TS_SIZE (int) 16
-
-/**
-  * Defines the maximum battery level
-  */
-#define LORAWAN_MAX_BAT   254
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-uint32_t InstanceIndex;
-uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_Init(void);
-
-/**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
-  */
-static void Gpio_PreInit(void);
-/**
-  * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
-  */
-static void TimestampNow(uint8_t *buff, uint16_t *size);
-
-/**
-  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
-  */
-static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-/* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
-void SystemApp_Init(void)
-{
-  /* USER CODE BEGIN SystemApp_Init_1 */
-
-  /* USER CODE END SystemApp_Init_1 */
-
-  /* Ensure that MSI is wake-up system clock */
-  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-
-  Gpio_PreInit();
-
-  /* Configure the debug mode*/
-  DBG_Init();
-
-  /*Initialize the terminal */
-  UTIL_ADV_TRACE_Init();
-  UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
-
-  /*Set verbose LEVEL*/
-  UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
-  /*Initialize the temperature and Battery measurement services */
-  SYS_InitMeasurement();
-
-  /*Initialize the Sensors */
-  EnvSensors_Init();
-
-  /*Init low power manager*/
-  UTIL_LPM_Init();
-  /* Disable Stand-by mode */
-  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
-
-#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
-  /* Disable Stop Mode */
-  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
-#elif !defined (LOW_POWER_DISABLE)
-#error LOW_POWER_DISABLE not defined
-#endif /* LOW_POWER_DISABLE */
-
-  /*Initialize MBMux (to be done after LPM because MBMux uses the sequencer) */
-  MBMUXIF_Init();
-
-  UTIL_TIMER_Init();
-
-  /* USER CODE BEGIN SystemApp_Init_2 */
-
-  /* USER CODE END SystemApp_Init_2 */
-}
-
-/**
-  * @brief  Process System Notifications
-  */
-void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
-{
-  /* USER CODE BEGIN Process_Sys_Notif_1 */
-
-  /* USER CODE END Process_Sys_Notif_1 */
-  uint32_t  notif_ack_id;
-
-  notif_ack_id = ComObj->MsgId;
-
-  switch (notif_ack_id)
-  {
-    case SYS_OTHER_MSG_ID:
-      APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
-      /* prepare ack buffer*/
-      ComObj->ParamCnt = 0;
-      ComObj->ReturnVal = 7; /* dummy value for test */
-      break;
-
-    default:
-      break;
-  }
-
-  /* Send ack*/
-  APP_LOG(TS_ON, VLEVEL_H, "CM4>(System)\r\n");
-  MBMUXIF_SystemSendAck(FEAT_INFO_SYSTEM_ID);
-  /* USER CODE BEGIN Process_Sys_Notif_2 */
-
-  /* USER CODE END Process_Sys_Notif_2 */
-}
-
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
-{
-  /**
-    * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
-    */
-  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
-
-  /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
-  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
-
-  /* USER CODE END UTIL_SEQ_EvtIdle_2 */
-  return;
-}
-
-/**
-  * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
-  */
-void UTIL_SEQ_Idle(void)
-{
-  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
-
-  /* USER CODE END UTIL_SEQ_Idle_1 */
-  UTIL_LPM_EnterLowPower();
-  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
-
-  /* USER CODE END UTIL_SEQ_Idle_2 */
-}
-
-uint8_t GetBatteryLevel(void)
-{
-  uint8_t batteryLevel = 0;
-  uint16_t batteryLevelmV;
-
-  /* USER CODE BEGIN GetBatteryLevel_0 */
-
-  /* USER CODE END GetBatteryLevel_0 */
-
-  batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
-
-  /* Convert batterey level from mV to linea scale: 1 (very low) to 254 (fully charged) */
-  if (batteryLevelmV > VDD_BAT)
-  {
-    batteryLevel = LORAWAN_MAX_BAT;
-  }
-  else if (batteryLevelmV < VDD_MIN)
-  {
-    batteryLevel = 0;
-  }
-  else
-  {
-    batteryLevel = (((uint32_t)(batteryLevelmV - VDD_MIN) * LORAWAN_MAX_BAT) / (VDD_BAT - VDD_MIN));
-  }
-
-  APP_LOG(TS_ON, VLEVEL_M, "VDDA= %d\r\n", batteryLevel);
-
-  /* USER CODE BEGIN GetBatteryLevel_2 */
-
-  /* USER CODE END GetBatteryLevel_2 */
-
-  return batteryLevel;  /* 1 (very low) to 254 (fully charged) */
-}
-
-uint16_t GetTemperatureLevel(void)
-{
-  uint16_t temperatureLevel = 0;
-
-  temperatureLevel = (uint16_t)(SYS_GetTemperatureLevel() / 256);
-  /* USER CODE BEGIN GetTemperatureLevel */
-
-  /* USER CODE END GetTemperatureLevel */
-  return temperatureLevel;
-}
-
-/* USER CODE BEGIN ExF */
-
-/* USER CODE END ExF */
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Test: Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialises other features
-  * @param none
-  * @retval none
-  */
-static void MBMUXIF_Init(void)
-{
-  /* USER CODE BEGIN MBMUXIF_Init_1 */
-
-  /* USER CODE END MBMUXIF_Init_1 */
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list;
-  int8_t init_status;
-
-  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialisation started \r\n");
-
-  init_status = MBMUXIF_SystemInit();
-  if (init_status < 0)
-  {
-    while (1) {}
-  }
-
-  /* start CM0PLUS */
-  /* Note: when debugging in order to connect with the deggugger CPUU2 shall be start using workspace CM4 starts CM0PLUS */
-  /* On the other hand is up to the devepoper make sure the CM0PLUS debugger is run after CM4 debugger */
-  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-
-  /* Warn CPU2 that CPU1 is ready */
-  /* Set Cpu Event then consume it to allow next low power entry */
-  __SEV();
-  __WFE();
-
-  /* CM4 has started and it has reset the mailbox and initialised the MbMux; */
-  /* once CM0PLUS is also initialised it send a SYS notification */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-
-  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialisation done: Wait for CM0PLUS \r\n");
-
-  MBMUXIF_WaitCm0MbmuxIsInitialised();
-
-  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialisation started \r\n");
-
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
-  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supprted_features_list);
-
-  APP_LOG(TS_ON, VLEVEL_H, "System Initialisation CM4-CM0PLUS completed \r\n");
-
-  init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
-  if (init_status < 0)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_RTC_REGISTERED);
-  APP_LOG(TS_ON, VLEVEL_H, "System_Priority_A Registration for RTC Alarm handling completed \r\n");
-
-  init_status = MBMUXIF_TraceInit();
-  if (init_status < 0)
-  {
-    Error_Handler();
-  }
-  APP_LOG(TS_ON, VLEVEL_H, "Trace registration CM4-CM0PLUS completed \r\n");
-
-  init_status = MBMUXIF_LoraInit();
-  if (init_status < 0)
-  {
-    Error_Handler();
-  }
-  APP_LOG(TS_ON, VLEVEL_H, "Radio registration CM4-CM0PLUS completed \r\n");
-
-  /* USER CODE BEGIN MBMUXIF_Init_Last */
-
-  /* USER CODE END MBMUXIF_Init_Last */
-}
-
-static void TimestampNow(uint8_t *buff, uint16_t *size)
-{
-  /* USER CODE BEGIN TimestampNow_1 */
-
-  /* USER CODE END TimestampNow_1 */
-  SysTime_t curtime = SysTimeGet();
-  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
-  *size = strlen((char *)buff);
-  /* USER CODE BEGIN TimestampNow_2 */
-
-  /* USER CODE END TimestampNow_2 */
-}
-
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
-/* Disable StopMode when traces need to be printed */
-void UTIL_ADV_TRACE_PreSendHook(void)
-{
-  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
-
-  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
-  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
-  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
-
-  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
-}
-/* Re-enable StopMode when traces have been printed */
-void UTIL_ADV_TRACE_PostSendHook(void)
-{
-  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
-
-  /* USER CODE END UTIL_LPM_SetStopMode_1 */
-  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
-  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
-
-  /* USER CODE END UTIL_LPM_SetStopMode_2 */
-}
-
-static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
-{
-  /* USER CODE BEGIN tiny_snprintf_like_1 */
-
-  /* USER CODE END tiny_snprintf_like_1 */
-  va_list vaArgs;
-  va_start(vaArgs, strFormat);
-  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
-  va_end(vaArgs);
-  /* USER CODE BEGIN tiny_snprintf_like_2 */
-
-  /* USER CODE END tiny_snprintf_like_2 */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-/* HAL overload functions ---------------------------------------------------------*/
-
-/**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
-  */
-HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
-{
-  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
-  /* USER CODE BEGIN HAL_InitTick_1 */
-
-  /* USER CODE END HAL_InitTick_1 */
-  return HAL_OK;
-  /* USER CODE BEGIN HAL_InitTick_2 */
-
-  /* USER CODE END HAL_InitTick_2 */
-}
-
-/**
-  * @brief Provide a tick value in millisecond measured using RTC
-  * @note This function overwrites the __weak one from HAL
-  * @retval tick value
-  */
-uint32_t HAL_GetTick(void)
-{
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
-  /* USER CODE BEGIN HAL_GetTick_1 */
-
-  /* USER CODE END HAL_GetTick_1 */
-  return TIMER_IF_GetTimerValue();
-  /* USER CODE BEGIN HAL_GetTick_2 */
-
-  /* USER CODE END HAL_GetTick_2 */
-}
-
-/**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
-  */
-void HAL_Delay(__IO uint32_t Delay)
-{
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
-  /* USER CODE BEGIN HAL_Delay_1 */
-
-  /* USER CODE END HAL_Delay_1 */
-  TIMER_IF_DelayMs(Delay);
-  /* USER CODE BEGIN HAL_Delay_2 */
-
-  /* USER CODE END HAL_Delay_2 */
-}
-
-/* USER CODE BEGIN Overload_HAL_weaks */
-
-/* USER CODE END Overload_HAL_weaks */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
deleted file mode 100644
index e2c80e45..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sys_sensors.c
-  * @author  MCD Application Team
-  * @brief   Manages the sensors on the application
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "stdint.h"
-#include "sys_conf.h"
-#include "sys_sensors.h"
-
-#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
-#if defined (X_NUCLEO_IKS01A2)
-#warning "IKS drivers are today available for several families but not stm32WL"
-#warning "up to the user adapt IKS low layer to map it on WL board driver"
-#warning "this code would work only if user provide necessary IKS and BSP layers"
-#include "iks01a2_env_sensors.h"
-#elif defined (X_NUCLEO_IKS01A3)
-/*
-## How to add IKS01A3 to CubeWL
-
- 1. Download STM32CubeExpansion_MEMS1_V8.0.0
- 2. Copy Drivers From `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3` to CubeWL `Drivers\BSP\IKS01A3` and add to the IDE Project
- 3. Copy `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3\iks01a3_conf_template.h` into `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target\iks01a3_conf.h`.
- 4. Copy files nucleo_l476rg_bus.c/nucleo_l476rg_bus.h  from `STM32L476RG-Nucleo\Applications\IKS01A3\ActiveTime\Inc and \Src` to `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target` and rename to `nucleo_wl55jc_bus.c` and `nucleo_wl55jc_bus.h` respectively
- 5. Update `nucleo_wl55jc_bus.c`  include files  to
- ```bash
-#include "nucleo_wl55jc_bus.h"
-#include "stm32wlxx_nucleo_errno.h"
-#include "stm32wlxx_hal.h"
-```
-
-6. Update definitions in `nucleo_wl55jc_bus.h`(to be commented since already defined elsewhere)
-
- ```bash
-//#define USE_HAL_SPI_REGISTER_CALLBACKS 0
-//#define USE_HAL_I2C_REGISTER_CALLBACKS 0
-```
-
-7. copy following components and add them (.c and .h) into IDE Project
-
-../../../../../../Drivers/BSP/Components/lsm6dso
-../../../../../../Drivers/BSP/Components/lis2dw12
-../../../../../../Drivers/BSP/Components/lis2mdl
-../../../../../../Drivers/BSP/Components/hts221
-../../../../../../Drivers/BSP/Components/lps22hh
-../../../../../../Drivers/BSP/Components/stts751
-../../../../../../Drivers/BSP/Components/Common
-
-8. Enable #define HAL_I2C_MODULE_ENABLED in stm32_hal_conf.h
-9. Add stm32wlxx_hal_i2c.c and stm32wlxx_hal_i2c_ex.c in the IDE Project
-10. Update hi2c->Instance in `nucleo_wl55jc_bus.c` to
-
-```bash
-  hi2c->Instance = I2C2;
-```
-
-11. Update msp function in `nucleo_wl55jc_bus.c`
-
-```bash
-static void I2C2_MspInit(I2C_HandleTypeDef *i2cHandle)
-{
-  GPIO_InitTypeDef GPIO_InitStruct;
-
-  GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12;
-  GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
-  GPIO_InitStruct.Pull = GPIO_PULLUP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-  GPIO_InitStruct.Alternate = GPIO_AF4_I2C2;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  __HAL_RCC_I2C2_CLK_ENABLE();
-}
-
-static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
-{
-  __HAL_RCC_I2C2_CLK_DISABLE();
-
-  HAL_GPIO_DeInit(GPIOA, GPIO_PIN_11 | GPIO_PIN_12);
-
-}
-```
-12. Replace I2C1xx by MX_I2C2xx and i2c1 by i2c2 in `nucleo_wl55jc_bus.c`
-13. Replace I2C1xx by MX_I2C2xx in `nucleo_wl55jc_bus.h`
-*/
-#warning "IKS drivers are today available for several families but not stm32WL, follow steps defined in sys_sensors.c"
-#include "iks01a3_env_sensors.h"
-#else  /* not X_IKS01xx */
-#error "user to include its sensor drivers"
-#endif  /* X_NUCLEO_IKS01xx */
-#elif !defined (SENSOR_ENABLED)
-#error SENSOR_ENABLED not defined
-#endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-#define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
-#define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
-#define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
-#define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
-#define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
-#define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
-#if defined (X_NUCLEO_IKS01A2)
-#warning "IKS drivers are today available for several families but not stm32WL"
-#warning "up to the user adapt IKS low layer to map it on WL board driver"
-#warning "this code would work only if user provide necessary IKS and BSP layers"
-IKS01A2_ENV_SENSOR_Capabilities_t EnvCapabilities;
-#elif defined (X_NUCLEO_IKS01A3)
-IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
-#else  /* not X_IKS01Ax */
-#error "user to include its sensor drivers"
-#endif  /* X_NUCLEO_IKS01 */
-#elif !defined (SENSOR_ENABLED)
-#error SENSOR_ENABLED not defined
-#endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-void EnvSensors_Read(sensor_t *sensor_data)
-{
-  /* USER CODE BEGIN EnvSensors_Read_1 */
-
-  /* USER CODE END EnvSensors_Read_1 */
-  float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
-  float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
-  float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
-
-#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
-#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
-  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
-  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
-#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
-#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
-  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_PRESSURE, &PRESSURE_Value);
-  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
-#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
-#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
-  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
-  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
-#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
-#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
-  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_PRESSURE, &PRESSURE_Value);
-  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
-#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
-#elif !defined (SENSOR_ENABLED)
-#error SENSOR_ENABLED not defined
-#endif  /* SENSOR_ENABLED */
-
-  sensor_data->humidity    = HUMIDITY_Value;
-  sensor_data->temperature = TEMPERATURE_Value;
-  sensor_data->pressure    = PRESSURE_Value;
-
-  sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
-  sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
-  /* USER CODE BEGIN EnvSensors_Read_Last */
-
-  /* USER CODE END EnvSensors_Read_Last */
-}
-
-void  EnvSensors_Init(void)
-{
-  /* USER CODE BEGIN EnvSensors_Init_1 */
-
-  /* USER CODE END EnvSensors_Init_1 */
-
-#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
-  /* Init */
-#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
-  IKS01A2_ENV_SENSOR_Init(HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
-#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
-#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
-  IKS01A2_ENV_SENSOR_Init(LPS22HB_0, ENV_TEMPERATURE | ENV_PRESSURE);
-#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
-#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
-  IKS01A3_ENV_SENSOR_Init(IKS01A3_HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
-#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
-#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
-  IKS01A3_ENV_SENSOR_Init(IKS01A3_LPS22HH_0, ENV_TEMPERATURE | ENV_PRESSURE);
-#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
-
-  /* Enable */
-#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
-  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_HUMIDITY);
-  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_TEMPERATURE);
-#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
-#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
-  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_PRESSURE);
-  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_TEMPERATURE);
-#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
-#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
-  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_HUMIDITY);
-  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_TEMPERATURE);
-#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
-#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
-  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_PRESSURE);
-  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_TEMPERATURE);
-#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
-
-  /* Get capabilities */
-#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
-  IKS01A2_ENV_SENSOR_GetCapabilities(HTS221_0, &EnvCapabilities);
-#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
-#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
-  IKS01A2_ENV_SENSOR_GetCapabilities(LPS22HB_0, &EnvCapabilities);
-#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
-#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
-  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_HTS221_0, &EnvCapabilities);
-#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
-#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
-  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_LPS22HH_0, &EnvCapabilities);
-#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
-
-#elif !defined (SENSOR_ENABLED)
-#error SENSOR_ENABLED not defined
-#endif /* SENSOR_ENABLED  */
-  /* USER CODE BEGIN EnvSensors_Init_Last */
-
-  /* USER CODE END EnvSensors_Init_Last */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
deleted file mode 100644
index e04bdfc6..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
+++ /dev/null
@@ -1,426 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    timer_if.c
-  * @author  MCD Application Team
-  * @brief   Configure RTC Alarm, Tick and Calendar manager
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "timer_if.h"
-#include "stm32_lpm.h"
-#include "utilities_def.h"
-#include "stm32wlxx_ll_rtc.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/**
-  * @brief RTC handle
-  */
-RTC_HandleTypeDef hrtc;
-
-/**
-  * @brief Timer driver callbacks handler
-  */
-const UTIL_TIMER_Driver_s UTIL_TimerDriver =
-{
-  TIMER_IF_Init,
-  NULL,
-
-  TIMER_IF_StartTimer,
-  TIMER_IF_StopTimer,
-
-  TIMER_IF_SetTimerContext,
-  TIMER_IF_GetTimerContext,
-
-  TIMER_IF_GetTimerElapsedTime,
-  TIMER_IF_GetTimerValue,
-  TIMER_IF_GetMinimumTimeout,
-
-  TIMER_IF_Convert_ms2Tick,
-  TIMER_IF_Convert_Tick2ms,
-};
-
-/**
-  * @brief SysTime driver callbacks handler
-  */
-const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
-{
-  TIMER_IF_BkUp_Write_Seconds,
-  TIMER_IF_BkUp_Read_Seconds,
-  TIMER_IF_BkUp_Write_SubSeconds,
-  TIMER_IF_BkUp_Read_SubSeconds,
-  TIMER_IF_GetTime,
-};
-
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/**
-  * @brief Minimum timeout delay of Alarm in ticks
-  */
-#define MIN_ALARM_DELAY    3
-
-/**
-  * @brief Backup seconds register
-  */
-#define RTC_BKP_SECONDS    RTC_BKP_DR0
-
-/**
-  * @brief Backup subseconds register
-  */
-#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
-
-/**
-  * @brief Backup msbticks register
-  */
-#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
-
-/* #define RTIF_DEBUG */
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-#ifdef RTIF_DEBUG
-#include "sys_app.h" /*for app_log*/
-/**
-  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
-  */
-#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
-#else
-/**
-  * @brief not used
-  */
-#define TIMER_IF_DBG_PRINTF(...)
-#endif /* RTIF_DEBUG */
-
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Indicates if the RTC is already Initialized or not
-  */
-static bool RTC_Initialized = false;
-
-/**
-  * @brief RtcTimerContext
-  */
-static uint32_t RtcTimerContext = 0;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Get rtc timer Value in rtc tick
-  * @return val the rtc timer value (upcounting)
-  */
-static inline uint32_t GetTimerTicks(void);
-
-/**
-  * @brief Reads MSBticks from backup register
-  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
-  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
-  * @retval MSBticks
-  */
-static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions ---------------------------------------------------------*/
-UTIL_TIMER_Status_t TIMER_IF_Init(void)
-{
-  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
-
-  /* USER CODE END TIMER_IF_Init_1 */
-  /** Configure the Instance */
-  hrtc.Instance = RTC;
-  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
-  TIMER_IF_SetTimerContext();
-  RTC_Initialized = true;
-  return ret;
-}
-
-UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
-{
-  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_StartTimer */
-
-  /* USER CODE END TIMER_IF_StartTimer */
-  RTC_AlarmTypeDef sAlarm = {0};
-  /*Stop timer if one is already started*/
-  TIMER_IF_StopTimer();
-  timeout += RtcTimerContext;
-
-  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
-  /* starts timer*/
-  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
-  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
-  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
-  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
-  sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
-
-  /* USER CODE END TIMER_IF_StartTimer_Last */
-  return ret;
-}
-
-UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
-{
-  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_StopTimer */
-
-  /* USER CODE END TIMER_IF_StopTimer */
-  /* Clear RTC Alarm Flag */
-  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRAF);
-  /* Disable the Alarm A interrupt */
-  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
-  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
-
-  /* USER CODE END TIMER_IF_StopTimer_Last */
-  return ret;
-}
-
-uint32_t TIMER_IF_SetTimerContext(void)
-{
-  /*store time context*/
-  RtcTimerContext = GetTimerTicks();
-
-  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
-
-  /* USER CODE END TIMER_IF_SetTimerContext */
-
-  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
-  /*return time context*/
-  return RtcTimerContext;
-}
-
-uint32_t TIMER_IF_GetTimerContext(void)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
-
-  /* USER CODE END TIMER_IF_GetTimerContext */
-
-  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
-  /*return time context*/
-  return RtcTimerContext;
-}
-
-uint32_t TIMER_IF_GetTimerElapsedTime(void)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
-
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
-
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
-}
-
-uint32_t TIMER_IF_GetTimerValue(void)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
-
-  /* USER CODE END TIMER_IF_GetTimerValue */
-  if (RTC_Initialized == true)
-  {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
-  }
-  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
-
-  /* USER CODE END TIMER_IF_GetTimerValue_Last */
-}
-
-uint32_t TIMER_IF_GetMinimumTimeout(void)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
-
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
-
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
-}
-
-uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
-{
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
-
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
-
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
-}
-
-uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
-{
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
-
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
-
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
-}
-
-void TIMER_IF_DelayMs(uint32_t delay)
-{
-  /* USER CODE BEGIN TIMER_IF_DelayMs */
-
-  /* USER CODE END TIMER_IF_DelayMs */
-  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
-  uint32_t timeout = GetTimerTicks();
-
-  /* Wait delay ms */
-  while (((GetTimerTicks() - timeout)) < delayTicks)
-  {
-    __NOP();
-  }
-  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
-
-  /* USER CODE END TIMER_IF_DelayMs_Last */
-}
-
-uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
-{
-  /* USER CODE BEGIN TIMER_IF_GetTime */
-
-  /* USER CODE END TIMER_IF_GetTime */
-  uint64_t ticks;
-  uint32_t timerValueLsb = GetTimerTicks();
-  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
-
-  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
-
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
-
-  ticks = (uint32_t) ticks & RTC_PREDIV_S;
-
-  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
-
-  return seconds;
-  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
-
-  /* USER CODE END TIMER_IF_GetTime_Last */
-}
-
-void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
-  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
-}
-
-void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
-  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
-}
-
-uint32_t TIMER_IF_BkUp_Read_Seconds(void)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
-}
-
-uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private functions ---------------------------------------------------------*/
-static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
-{
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
-  uint32_t MSBticks;
-  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
-  return MSBticks;
-  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
-
-  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
-}
-
-static inline uint32_t GetTimerTicks(void)
-{
-  /* USER CODE BEGIN GetTimerTicks */
-
-  /* USER CODE END GetTimerTicks */
-  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
-  /* USER CODE BEGIN GetTimerTicks_Last */
-
-  /* USER CODE END GetTimerTicks_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
deleted file mode 100644
index 49d236d5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usart.c
-  * @brief   This file provides code for the configuration
-  *          of the USART instances.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "usart.h"
-
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-UART_HandleTypeDef huart2;
-DMA_HandleTypeDef hdma_usart2_tx;
-
-/* USART2 init function */
-
-void MX_USART2_UART_Init(void)
-{
-
-  huart2.Instance = USART2;
-  huart2.Init.BaudRate = USART_BAUDRATE;
-  huart2.Init.WordLength = UART_WORDLENGTH_8B;
-  huart2.Init.StopBits = UART_STOPBITS_1;
-  huart2.Init.Parity = UART_PARITY_NONE;
-  huart2.Init.Mode = UART_MODE_TX_RX;
-  huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-  huart2.Init.OverSampling = UART_OVERSAMPLING_16;
-  huart2.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
-  huart2.Init.ClockPrescaler = UART_PRESCALER_DIV1;
-  huart2.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
-  if (HAL_UART_Init(&huart2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  if (HAL_UARTEx_SetTxFifoThreshold(&huart2, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  if (HAL_UARTEx_SetRxFifoThreshold(&huart2, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  if (HAL_UARTEx_EnableFifoMode(&huart2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-}
-
-void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
-{
-
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
-  if(uartHandle->Instance==USART2)
-  {
-  /* USER CODE BEGIN USART2_MspInit 0 */
-
-  /* USER CODE END USART2_MspInit 0 */
-  /** Initializes the peripherals clocks
-  */
-    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART2;
-    PeriphClkInitStruct.Usart2ClockSelection = RCC_USART2CLKSOURCE_SYSCLK;
-    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
-    {
-      Error_Handler();
-    }
-
-    /* USART2 clock enable */
-    __HAL_RCC_USART2_CLK_ENABLE();
-
-    __HAL_RCC_GPIOA_CLK_ENABLE();
-    /**USART2 GPIO Configuration
-    PA3     ------> USART2_RX
-    PA2     ------> USART2_TX
-    */
-    GPIO_InitStruct.Pin = USARTx_RX_Pin|USARTx_TX_Pin;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-    GPIO_InitStruct.Alternate = GPIO_AF7_USART2;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-    /* USART2 DMA Init */
-    /* USART2_TX Init */
-    hdma_usart2_tx.Instance = DMA1_Channel5;
-    hdma_usart2_tx.Init.Request = DMA_REQUEST_USART2_TX;
-    hdma_usart2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
-    hdma_usart2_tx.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_usart2_tx.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_usart2_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-    hdma_usart2_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
-    hdma_usart2_tx.Init.Mode = DMA_NORMAL;
-    hdma_usart2_tx.Init.Priority = DMA_PRIORITY_LOW;
-    if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
-    {
-      Error_Handler();
-    }
-
-    if (HAL_DMA_ConfigChannelAttributes(&hdma_usart2_tx, DMA_CHANNEL_NPRIV) != HAL_OK)
-    {
-      Error_Handler();
-    }
-
-    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
-
-    /* USART2 interrupt Init */
-    HAL_NVIC_SetPriority(USART2_IRQn, 2, 0);
-    HAL_NVIC_EnableIRQ(USART2_IRQn);
-  /* USER CODE BEGIN USART2_MspInit 1 */
-
-  /* USER CODE END USART2_MspInit 1 */
-  }
-}
-
-void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
-{
-
-  if(uartHandle->Instance==USART2)
-  {
-  /* USER CODE BEGIN USART2_MspDeInit 0 */
-
-  /* USER CODE END USART2_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_USART2_CLK_DISABLE();
-
-    /**USART2 GPIO Configuration
-    PA3     ------> USART2_RX
-    PA2     ------> USART2_TX
-    */
-    HAL_GPIO_DeInit(GPIOA, USARTx_RX_Pin|USARTx_TX_Pin);
-
-    /* USART2 DMA DeInit */
-    HAL_DMA_DeInit(uartHandle->hdmatx);
-
-    /* USART2 interrupt Deinit */
-    HAL_NVIC_DisableIRQ(USART2_IRQn);
-  /* USER CODE BEGIN USART2_MspDeInit 1 */
-
-  /* USER CODE END USART2_MspDeInit 1 */
-  }
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
deleted file mode 100644
index f91e9839..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    usart_if.c
-  * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Includes ------------------------------------------------------------------*/
-#include "usart_if.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/**
-  * @brief DMA handle
-  */
-extern DMA_HandleTypeDef hdma_usart2_tx;
-
-/**
-  * @brief UART handle
-  */
-extern UART_HandleTypeDef huart2;
-
-/**
-  * @brief buffer to receive 1 character
-  */
-uint8_t charRx;
-
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Trace driver callbacks handler
-  */
-const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
-{
-  vcom_Init,
-  vcom_DeInit,
-  vcom_ReceiveInit,
-  vcom_Trace_DMA,
-};
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief  TX complete callback
-  * @return none
-  */
-static void (*TxCpltCallback)(void *);
-/**
-  * @brief  RX complete callback
-  * @param  rxChar ptr of chars buffer sent by user
-  * @param  size buffer size
-  * @param  error errorcode
-  * @return none
-  */
-static void (*RxCpltCallback)(uint8_t *rxChar, uint16_t size, uint8_t error);
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *))
-{
-  /* USER CODE BEGIN vcom_Init_1 */
-
-  /* USER CODE END vcom_Init_1 */
-  TxCpltCallback = cb;
-  MX_DMA_Init();
-  MX_USART2_UART_Init();
-  LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_27);
-  return UTIL_ADV_TRACE_OK;
-  /* USER CODE BEGIN vcom_Init_2 */
-
-  /* USER CODE END vcom_Init_2 */
-}
-
-UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
-{
-  /* USER CODE BEGIN vcom_DeInit_1 */
-
-  /* USER CODE END vcom_DeInit_1 */
-  /* ##-1- Reset peripherals ################################################## */
-  __HAL_RCC_USART2_FORCE_RESET();
-  __HAL_RCC_USART2_RELEASE_RESET();
-
-  /* ##-2- MspDeInit ################################################## */
-  HAL_UART_MspDeInit(&huart2);
-
-  /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
-  /* USER CODE BEGIN 1 */
-  HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
-
-  return UTIL_ADV_TRACE_OK;
-  /* USER CODE END 1 */
-  /* USER CODE BEGIN vcom_DeInit_2 */
-
-  /* USER CODE END vcom_DeInit_2 */
-}
-
-void vcom_Trace(uint8_t *p_data, uint16_t size)
-{
-  /* USER CODE BEGIN vcom_Trace_1 */
-
-  /* USER CODE END vcom_Trace_1 */
-  HAL_UART_Transmit(&huart2, p_data, size, 1000);
-  /* USER CODE BEGIN vcom_Trace_2 */
-
-  /* USER CODE END vcom_Trace_2 */
-}
-
-UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size)
-{
-  /* USER CODE BEGIN vcom_Trace_DMA_1 */
-
-  /* USER CODE END vcom_Trace_DMA_1 */
-  HAL_UART_Transmit_DMA(&huart2, p_data, size);
-  return UTIL_ADV_TRACE_OK;
-  /* USER CODE BEGIN vcom_Trace_DMA_2 */
-
-  /* USER CODE END vcom_Trace_DMA_2 */
-}
-
-UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error))
-{
-  /* USER CODE BEGIN vcom_ReceiveInit_1 */
-
-  /* USER CODE END vcom_ReceiveInit_1 */
-  UART_WakeUpTypeDef WakeUpSelection;
-
-  /*record call back*/
-  RxCpltCallback = RxCb;
-
-  /*Set wakeUp event on start bit*/
-  WakeUpSelection.WakeUpEvent = UART_WAKEUP_ON_STARTBIT;
-
-  HAL_UARTEx_StopModeWakeUpSourceConfig(&huart2, WakeUpSelection);
-
-  /* Make sure that no UART transfer is on-going */
-  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_BUSY) == SET);
-
-  /* Make sure that UART is ready to receive)   */
-  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_REACK) == RESET);
-
-  /* Enable USART interrupt */
-  __HAL_UART_ENABLE_IT(&huart2, UART_IT_WUF);
-
-  /*Enable wakeup from stop mode*/
-  HAL_UARTEx_EnableStopMode(&huart2);
-
-  /*Start LPUART receive on IT*/
-  HAL_UART_Receive_IT(&huart2, &charRx, 1);
-
-  return UTIL_ADV_TRACE_OK;
-  /* USER CODE BEGIN vcom_ReceiveInit_2 */
-
-  /* USER CODE END vcom_ReceiveInit_2 */
-}
-
-void vcom_Resume(void)
-{
-  /* USER CODE BEGIN vcom_Resume_1 */
-
-  /* USER CODE END vcom_Resume_1 */
-  /*to re-enable lost UART settings*/
-  if (HAL_UART_Init(&huart2) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /*to re-enable lost DMA settings*/
-  if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN vcom_Resume_2 */
-
-  /* USER CODE END vcom_Resume_2 */
-}
-
-void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart2)
-{
-  /* USER CODE BEGIN HAL_UART_TxCpltCallback_1 */
-
-  /* USER CODE END HAL_UART_TxCpltCallback_1 */
-  /* buffer transmission complete*/
-  TxCpltCallback(NULL);
-  /* USER CODE BEGIN HAL_UART_TxCpltCallback_2 */
-
-  /* USER CODE END HAL_UART_TxCpltCallback_2 */
-}
-
-void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart2)
-{
-  /* USER CODE BEGIN HAL_UART_RxCpltCallback_1 */
-
-  /* USER CODE END HAL_UART_RxCpltCallback_1 */
-  if ((NULL != RxCpltCallback) && (HAL_UART_ERROR_NONE == huart2->ErrorCode))
-  {
-    RxCpltCallback(&charRx, 1, 0);
-  }
-  HAL_UART_Receive_IT(huart2, &charRx, 1);
-  /* USER CODE BEGIN HAL_UART_RxCpltCallback_2 */
-
-  /* USER CODE END HAL_UART_RxCpltCallback_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
deleted file mode 100644
index ba6f23a9..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_lorawan.c
-  * @author  MCD Application Team
-  * @brief   Application of the LRWAN Middleware
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_lorawan.h"
-#include "lora_app.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-void MX_LoRaWAN_Init(void)
-{
-  /* USER CODE BEGIN MX_LoRaWAN_Init_1 */
-
-  /* USER CODE END MX_LoRaWAN_Init_1 */
-  SystemApp_Init();
-  /* USER CODE BEGIN MX_LoRaWAN_Init_2 */
-
-  /* USER CODE END MX_LoRaWAN_Init_2 */
-  LoRaWAN_Init();
-  /* USER CODE BEGIN MX_LoRaWAN_Init_3 */
-
-  /* USER CODE END MX_LoRaWAN_Init_3 */
-}
-
-void MX_LoRaWAN_Process(void)
-{
-  /* USER CODE BEGIN MX_LoRaWAN_Process_1 */
-
-  /* USER CODE END MX_LoRaWAN_Process_1 */
-  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
-  /* USER CODE BEGIN MX_LoRaWAN_Process_2 */
-
-  /* USER CODE END MX_LoRaWAN_Process_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
deleted file mode 100644
index 2c49b393..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_lorawan.h
-  * @author  MCD Application Team
-  * @brief   Header of application of the LRWAN Middleware
-   ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __APP_LORAWAN_H__
-#define __APP_LORAWAN_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported Functions Prototypes------------------------------------------------------- */
-/**
-  * @brief  Init Lora Application
-  * @param None
-  * @retval None
-  */
-void MX_LoRaWAN_Init(void);
-
-/**
-  * @brief  Entry Lora Process or scheduling
-  * @param None
-  * @retval None
-  */
-void MX_LoRaWAN_Process(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__APP_LORAWAN_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
deleted file mode 100644
index 6531ebc5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
+++ /dev/null
@@ -1,713 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lora_app.c
-  * @author  MCD Application Team
-  * @brief   Application of the LRWAN Middleware
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "Region.h" /* Needed for LORAWAN_DEFAULT_DATA_RATE */
-#include "sys_app.h"
-#include "lora_app.h"
-#include "stm32_seq.h"
-#include "stm32_timer.h"
-#include "utilities_def.h"
-#include "lora_app_version.h"
-#include "LmHandler.h"
-#include "stm32_lpm.h"
-#include "adc_if.h"
-#include "sys_conf.h"
-#include "CayenneLpp.h"
-#include "sys_sensors.h"
-#include "mbmuxif_sys.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief LoRa State Machine states
-  */
-typedef enum TxEventType_e
-{
-  /**
-    * @brief AppdataTransmition issue based on timer every TxDutyCycleTime
-    */
-  TX_ON_TIMER,
-  /**
-    * @brief AppdataTransmition external event plugged on OnSendEvent( )
-    */
-  TX_ON_EVENT
-  /* USER CODE BEGIN TxEventType_t */
-
-  /* USER CODE END TxEventType_t */
-} TxEventType_t;
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  LoRa endNode send request
-  * @param  none
-  * @retval none
-  */
-static void SendTxData(void);
-
-/**
-  * @brief  TX timer callback function
-  * @param  timer context
-  * @retval none
-  */
-static void OnTxTimerEvent(void *context);
-
-/**
-  * @brief  LED Tx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnTxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Rx timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnRxTimerLedEvent(void *context);
-
-/**
-  * @brief  LED Join timer callback function
-  * @param  LED context
-  * @retval none
-  */
-static void OnJoinTimerLedEvent(void *context);
-
-/**
-  * @brief  join event callback function
-  * @param  params
-  * @retval none
-  */
-static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
-
-/**
-  * @brief  tx event callback function
-  * @param  params
-  * @retval none
-  */
-static void OnTxData(LmHandlerTxParams_t *params);
-
-/**
-  * @brief callback when LoRa endNode has received a frame
-  * @param appData
-  * @param params
-  * @retval None
-  */
-static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
-
-/*!
- * Will be called each time a Radio IRQ is handled by the MAC layer
- *
- * \remark OnMacProcessNotify not needed on dual Core as OnMacProcessNotify is processed on M0+
- */
-static void OnMacProcessNotify(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief User application buffer
-  */
-static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
-
-/**
-  * @brief User application data structure
-  */
-static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
-
-static ActivationType_t ActivationType = LORAWAN_DEFAULT_ACTIVATION_TYPE;
-
-/**
-  * @brief LoRaWAN handler Callbacks
-  */
-static LmHandlerCallbacks_t LmHandlerCallbacks =
-{
-  .GetBatteryLevel =           GetBatteryLevel,
-  .GetTemperature =            GetTemperatureLevel,
-  .OnMacProcess =              OnMacProcessNotify,
-  .OnJoinRequest =             OnJoinRequest,
-  .OnTxData =                  OnTxData,
-  .OnRxData =                  OnRxData
-};
-
-/**
-  * @brief LoRaWAN handler parameters
-  */
-static LmHandlerParams_t LmHandlerParams =
-{
-  .ActiveRegion =             ACTIVE_REGION,
-  .DefaultClass =             LORAWAN_DEFAULT_CLASS,
-  .AdrEnable =                LORAWAN_ADR_STATE,
-  .TxDatarate =               LORAWAN_DEFAULT_DATA_RATE,
-  .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
-};
-
-/**
-  * @brief Specifies the state of the application LED
-  */
-static uint8_t AppLedStateOn = RESET;
-
-/**
-  * @brief Type of Event to generate application Tx
-  */
-static TxEventType_t EventType = TX_ON_TIMER;
-
-/**
-  * @brief Timer to handle the application Tx
-  */
-static UTIL_TIMER_Object_t TxTimer;
-
-/**
-  * @brief Timer to handle the application Tx Led to toggle
-  */
-static UTIL_TIMER_Object_t TxLedTimer;
-
-/**
-  * @brief Timer to handle the application Rx Led to toggle
-  */
-static UTIL_TIMER_Object_t RxLedTimer;
-
-/**
-  * @brief Timer to handle the application Join Led to toggle
-  */
-static UTIL_TIMER_Object_t JoinLedTimer;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Exported functions ---------------------------------------------------------*/
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-void LoRaWAN_Init(void)
-{
-  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
-  uint32_t lora_cm0plus_app;
-
-  /* USER CODE BEGIN LoRaWAN_Init_1 */
-
-  /* USER CODE END LoRaWAN_Init_1 */
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Init(LED_BLUE);
-  BSP_LED_Init(LED_GREEN);
-  BSP_LED_Init(LED_RED);
-  BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-  SYS_LED_Init(SYS_LED_RED);
-  SYS_PB_Init(SYS_BUTTON2, SYS_BUTTON_MODE_EXTI);
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-
-  /* Get CM4 LoRa APP version*/
-  APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
-          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
-          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
-          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
-
-  /* Get CM0 LoRa APP version*/
-  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
-  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
-  APP_LOG(TS_OFF, VLEVEL_M, "M0PLUS_APP_VERSION: V%X.%X.%X\r\n",
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
-
-  /* Get MW LoraWAN info */
-  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_LORAWAN_ID);
-  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
-  APP_LOG(TS_OFF, VLEVEL_M, "MW_LORAWAN_VERSION: V%X.%X.%X\r\n",
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
-
-  /* Get MW SubGhz_Phy info */
-  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
-  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
-  APP_LOG(TS_OFF, VLEVEL_M, "MW_RADIO_VERSION:   V%X.%X.%X\r\n",
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
-          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
-
-  UTIL_TIMER_Create(&TxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerLedEvent, NULL);
-  UTIL_TIMER_Create(&RxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnRxTimerLedEvent, NULL);
-  UTIL_TIMER_Create(&JoinLedTimer, 0xFFFFFFFFU, UTIL_TIMER_PERIODIC, OnJoinTimerLedEvent, NULL);
-  UTIL_TIMER_SetPeriod(&TxLedTimer, 500);
-  UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
-  UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
-
-  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), UTIL_SEQ_RFU, SendTxData);
-  /* Init the Lora Stack*/
-  LmHandlerInit(&LmHandlerCallbacks);
-
-  LmHandlerConfigure(&LmHandlerParams);
-
-  UTIL_TIMER_Start(&JoinLedTimer);
-
-  LmHandlerJoin(ActivationType);
-
-  if (EventType == TX_ON_TIMER)
-  {
-    /* send every time timer elapses */
-    UTIL_TIMER_Create(&TxTimer,  0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerEvent, NULL);
-    UTIL_TIMER_SetPeriod(&TxTimer,  APP_TX_DUTYCYCLE);
-    UTIL_TIMER_Start(&TxTimer);
-  }
-  else
-  {
-    /* send every time button is pushed */
-#if defined(USE_BSP_DRIVER)
-    BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_PB_Init(SYS_BUTTON1, SYS_BUTTON_MODE_EXTI);
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  }
-
-  /* USER CODE BEGIN LoRaWAN_Init_Last */
-
-  /* USER CODE END LoRaWAN_Init_Last */
-}
-
-#if defined(USE_BSP_DRIVER)
-void BSP_PB_Callback(Button_TypeDef Button)
-{
-#warning: adapt stm32wlxx_it.c to call BSP_PB_IRQHandler if you want to use BSP
-  /* USER CODE BEGIN BSP_PB_Callback_1 */
-
-  /* USER CODE END BSP_PB_Callback_1 */
-  switch (Button)
-  {
-    case  BUTTON_SW1:
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
-      /* USER CODE BEGIN PB_Callback 1 */
-      /* USER CODE END PB_Callback 1 */
-      break;
-    case  BUTTON_SW2:
-      /* USER CODE BEGIN PB_Callback 2 */
-      /* USER CODE END PB_Callback 2 */
-      break;
-    case  BUTTON_SW3:
-      /* USER CODE BEGIN PB_Callback 3 */
-      /* USER CODE END PB_Callback 3 */
-      break;
-    default:
-      break;
-  }
-  /* USER CODE BEGIN BSP_PB_Callback_Last */
-
-  /* USER CODE END BSP_PB_Callback_Last */
-}
-
-#elif defined(MX_BOARD_PSEUDODRIVER)
-
-/* Note: Current MX does not support EXTI IP neither BSP. */
-/* In order to get a push button IRS by code automatically generated */
-/* this function is today the only available possibility. */
-/* Calling BSP_PB_Callback() from here it shortcuts the BSP. */
-/* If users wants to go through the BSP, it can remove BSP_PB_Callback() from here */
-/* and add a call to BSP_PB_IRQHandler() in the USER CODE SESSION of the */
-/* correspondent EXTIn_IRQHandler() in the stm32wlxx_it.c */
-void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
-{
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_1 */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_1 */
-  switch (GPIO_Pin)
-  {
-    case  SYS_BUTTON1_PIN:
-      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialised */
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
-      /* USER CODE BEGIN EXTI_Callback_Switch_B1 */
-      /* USER CODE END EXTI_Callback_Switch_B1 */
-      break;
-    case  SYS_BUTTON2_PIN:
-      /* USER CODE BEGIN EXTI_Callback_Switch_B2 */
-      /* USER CODE END EXTI_Callback_Switch_B2 */
-      break;
-    /* USER CODE BEGIN EXTI_Callback_Switch_case */
-
-    /* USER CODE END EXTI_Callback_Switch_case */
-    default:
-    /* USER CODE BEGIN EXTI_Callback_Switch_default */
-    /* USER CODE END EXTI_Callback_Switch_default */
-      break;
-  }
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_Last */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_Last */
-}
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER*/
-
-/* Private functions ---------------------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
-{
-  /* USER CODE BEGIN OnRxData_1 */
-
-  /* USER CODE END OnRxData_1 */
-  if ((appData != NULL) && (params != NULL))
-  {
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_BLUE) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-    UTIL_TIMER_Start(&RxLedTimer);
-
-    static const char *slotStrings[] = { "1", "2", "C", "C Multicast", "B Ping-Slot", "B Multicast Ping-Slot" };
-
-    APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Indication ==========\r\n");
-    APP_LOG(TS_OFF, VLEVEL_H, "###### D/L FRAME:%04d | SLOT:%s | PORT:%d | DR:%d | RSSI:%d | SNR:%d\r\n",
-            params->DownlinkCounter, slotStrings[params->RxSlot], appData->Port, params->Datarate, params->Rssi, params->Snr);
-    switch (appData->Port)
-    {
-      case LORAWAN_SWITCH_CLASS_PORT:
-        /*this port switches the class*/
-        if (appData->BufferSize == 1)
-        {
-          switch (appData->Buffer[0])
-          {
-            case 0:
-            {
-              LmHandlerRequestClass(CLASS_A);
-              break;
-            }
-            case 1:
-            {
-              LmHandlerRequestClass(CLASS_B);
-              break;
-            }
-            case 2:
-            {
-              LmHandlerRequestClass(CLASS_C);
-              break;
-            }
-            default:
-              break;
-          }
-        }
-        break;
-      case LORAWAN_USER_APP_PORT:
-        if (appData->BufferSize == 1)
-        {
-          AppLedStateOn = appData->Buffer[0] & 0x01;
-          if (AppLedStateOn == RESET)
-          {
-            APP_LOG(TS_OFF, VLEVEL_H,   "LED OFF\r\n");
-
-#if defined(USE_BSP_DRIVER)
-            BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-          }
-          else
-          {
-            APP_LOG(TS_OFF, VLEVEL_H, "LED ON\r\n");
-#if defined(USE_BSP_DRIVER)
-            BSP_LED_On(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_On(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-          }
-        }
-        break;
-    /* USER CODE BEGIN OnRxData_Switch_case */
-
-    /* USER CODE END OnRxData_Switch_case */
-      default:
-    /* USER CODE BEGIN OnRxData_Switch_default */
-
-    /* USER CODE END OnRxData_Switch_default */
-        break;
-    }
-  }
-
-  /* USER CODE BEGIN OnRxData_2 */
-
-  /* USER CODE END OnRxData_2 */
-}
-
-static void SendTxData(void)
-{
-  uint16_t pressure = 0;
-  int16_t temperature = 0;
-  sensor_t sensor_data;
-  UTIL_TIMER_Time_t nextTxIn = 0;
-
-#ifdef CAYENNE_LPP
-  uint8_t channel = 0;
-#else
-  uint16_t humidity = 0;
-  uint32_t i = 0;
-  int32_t latitude = 0;
-  int32_t longitude = 0;
-  uint16_t altitudeGps = 0;
-#endif /* CAYENNE_LPP */
-  /* USER CODE BEGIN SendTxData_1 */
-
-  /* USER CODE END SendTxData_1 */
-
-  EnvSensors_Read(&sensor_data);
-  temperature = (SYS_GetTemperatureLevel() >> 8);
-  pressure    = (uint16_t)(sensor_data.pressure * 100 / 10);      /* in hPa / 10 */
-
-  AppData.Port = LORAWAN_USER_APP_PORT;
-
-#ifdef CAYENNE_LPP
-  CayenneLppReset();
-  CayenneLppAddBarometricPressure(channel++, pressure);
-  CayenneLppAddTemperature(channel++, temperature);
-  CayenneLppAddRelativeHumidity(channel++, (uint16_t)(sensor_data.humidity));
-
-  if ((LmHandlerParams.ActiveRegion != LORAMAC_REGION_US915) && (LmHandlerParams.ActiveRegion != LORAMAC_REGION_AU915)
-      && (LmHandlerParams.ActiveRegion != LORAMAC_REGION_AS923))
-  {
-    CayenneLppAddDigitalInput(channel++, GetBatteryLevel());
-    CayenneLppAddDigitalOutput(channel++, AppLedStateOn);
-  }
-
-  CayenneLppCopy(AppData.Buffer);
-  AppData.BufferSize = CayenneLppGetSize();
-#else  /* not CAYENNE_LPP */
-  humidity    = (uint16_t)(sensor_data.humidity * 10);            /* in %*10     */
-
-  AppData.Buffer[i++] = AppLedStateOn;
-  AppData.Buffer[i++] = (uint8_t)((pressure >> 8) & 0xFF);
-  AppData.Buffer[i++] = (uint8_t)(pressure & 0xFF);
-  AppData.Buffer[i++] = (uint8_t)(temperature & 0xFF);
-  AppData.Buffer[i++] = (uint8_t)((humidity >> 8) & 0xFF);
-  AppData.Buffer[i++] = (uint8_t)(humidity & 0xFF);
-
-  if ((LmHandlerParams.ActiveRegion == LORAMAC_REGION_US915) || (LmHandlerParams.ActiveRegion == LORAMAC_REGION_AU915)
-      || (LmHandlerParams.ActiveRegion == LORAMAC_REGION_AS923))
-  {
-    AppData.Buffer[i++] = 0;
-    AppData.Buffer[i++] = 0;
-    AppData.Buffer[i++] = 0;
-    AppData.Buffer[i++] = 0;
-  }
-  else
-  {
-    latitude = sensor_data.latitude;
-    longitude = sensor_data.longitude;
-
-    AppData.Buffer[i++] = GetBatteryLevel();        /* 1 (very low) to 254 (fully charged) */
-    AppData.Buffer[i++] = (uint8_t)((latitude >> 16) & 0xFF);
-    AppData.Buffer[i++] = (uint8_t)((latitude >> 8) & 0xFF);
-    AppData.Buffer[i++] = (uint8_t)(latitude & 0xFF);
-    AppData.Buffer[i++] = (uint8_t)((longitude >> 16) & 0xFF);
-    AppData.Buffer[i++] = (uint8_t)((longitude >> 8) & 0xFF);
-    AppData.Buffer[i++] = (uint8_t)(longitude & 0xFF);
-    AppData.Buffer[i++] = (uint8_t)((altitudeGps >> 8) & 0xFF);
-    AppData.Buffer[i++] = (uint8_t)(altitudeGps & 0xFF);
-  }
-
-  AppData.BufferSize = i;
-#endif /* CAYENNE_LPP */
-
-  if (LORAMAC_HANDLER_SUCCESS == LmHandlerSend(&AppData, LORAWAN_DEFAULT_CONFIRMED_MSG_STATE, &nextTxIn, false))
-  {
-    APP_LOG(TS_ON, VLEVEL_L, "SEND REQUEST\r\n");
-  }
-  else if (nextTxIn > 0)
-  {
-    APP_LOG(TS_ON, VLEVEL_L, "Next Tx in  : ~%d second(s)\r\n", (nextTxIn / 1000));
-  }
-  /* USER CODE BEGIN SendTxData_2 */
-
-  /* USER CODE END SendTxData_2 */
-}
-
-static void OnTxTimerEvent(void *context)
-{
-  /* USER CODE BEGIN OnTxTimerEvent_1 */
-
-  /* USER CODE END OnTxTimerEvent_1 */
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
-
-  /*Wait for next tx slot*/
-  UTIL_TIMER_Start(&TxTimer);
-  /* USER CODE BEGIN OnTxTimerEvent_2 */
-
-  /* USER CODE END OnTxTimerEvent_2 */
-}
-
-static void OnTxTimerLedEvent(void *context)
-{
-  /* USER CODE BEGIN OnTxTimerLedEvent_1 */
-
-  /* USER CODE END OnTxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Off(LED_GREEN) ;
-#else
-  SYS_LED_Off(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnTxTimerLedEvent_2 */
-
-  /* USER CODE END OnTxTimerLedEvent_2 */
-}
-
-static void OnRxTimerLedEvent(void *context)
-{
-  /* USER CODE BEGIN OnRxTimerLedEvent_1 */
-
-  /* USER CODE END OnRxTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Off(LED_BLUE) ;
-#else
-  SYS_LED_Off(SYS_LED_BLUE) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnRxTimerLedEvent_2 */
-
-  /* USER CODE END OnRxTimerLedEvent_2 */
-}
-
-static void OnJoinTimerLedEvent(void *context)
-{
-  /* USER CODE BEGIN OnJoinTimerLedEvent_1 */
-
-  /* USER CODE END OnJoinTimerLedEvent_1 */
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Toggle(LED_RED) ;
-#else
-  SYS_LED_Toggle(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-  /* USER CODE BEGIN OnJoinTimerLedEvent_2 */
-
-  /* USER CODE END OnJoinTimerLedEvent_2 */
-}
-
-static void OnTxData(LmHandlerTxParams_t *params)
-{
-  /* USER CODE BEGIN OnTxData_1 */
-
-  /* USER CODE END OnTxData_1 */
-  if ((params != NULL) && (params->IsMcpsConfirm != 0))
-  {
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_GREEN) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-    UTIL_TIMER_Start(&TxLedTimer);
-
-    APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
-    APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
-            params->AppData.Port, params->Datarate, params->TxPower);
-
-    APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
-    if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
-    {
-      APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
-    }
-    else
-    {
-      APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
-    }
-  }
-
-  /* USER CODE BEGIN OnTxData_2 */
-
-  /* USER CODE END OnTxData_2 */
-}
-
-static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
-{
-  /* USER CODE BEGIN OnJoinRequest_1 */
-
-  /* USER CODE END OnJoinRequest_1 */
-  if (joinParams != NULL)
-  {
-    if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
-    {
-      UTIL_TIMER_Stop(&JoinLedTimer);
-
-#if defined(USE_BSP_DRIVER)
-      BSP_LED_Off(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-      SYS_LED_Off(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-
-      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOINED = ");
-      if (joinParams->Mode == ACTIVATION_TYPE_ABP)
-      {
-        APP_LOG(TS_OFF, VLEVEL_M, "ABP ======================\r\n");
-      }
-      else
-      {
-        APP_LOG(TS_OFF, VLEVEL_M, "OTAA =====================\r\n");
-      }
-    }
-    else
-    {
-      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOIN FAILED\r\n");
-    }
-  }
-
-  /* USER CODE BEGIN OnJoinRequest_2 */
-
-  /* USER CODE END OnJoinRequest_2 */
-}
-
-static void OnMacProcessNotify(void)
-{
-  /* USER CODE BEGIN OnMacProcessNotify_1 */
-
-  /* USER CODE END OnMacProcessNotify_1 */
-  /* USER CODE BEGIN OnMacProcessNotify_2 */
-
-  /* USER CODE END OnMacProcessNotify_2 */
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
deleted file mode 100644
index a48306a2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lora_app.h
-  * @author  MCD Application Team
-  * @brief   Header of application of the LRWAN Middleware
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __LORA_APP_H__
-#define __LORA_APP_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-
-/* LoraWAN application configuration (Mw is configured by lorawan_conf.h) */
-#define ACTIVE_REGION                               LORAMAC_REGION_EU868
-
-/*!
- * CAYENNE_LPP is myDevices Application server.
- */
-/*#define CAYENNE_LPP*/
-
-/*!
- * Defines the application data transmission duty cycle. 10s, value in [ms].
- */
-#define APP_TX_DUTYCYCLE                            10000
-
-/*!
- * LoRaWAN User application port
- * @note do not use 224. It is reserved for certification
- */
-#define LORAWAN_USER_APP_PORT                       2
-
-/*!
- * LoRaWAN Switch class application port
- * @note do not use 224. It is reserved for certification
- */
-#define LORAWAN_SWITCH_CLASS_PORT                   3
-
-/*!
- * LoRaWAN default endNode class port
- */
-#define LORAWAN_DEFAULT_CLASS                       CLASS_A
-
-/*!
- * LoRaWAN default confirm state
- */
-#define LORAWAN_DEFAULT_CONFIRMED_MSG_STATE         LORAMAC_HANDLER_UNCONFIRMED_MSG
-
-/*!
- * LoRaWAN Adaptive Data Rate
- * @note Please note that when ADR is enabled the end-device should be static
- */
-#define LORAWAN_ADR_STATE                           LORAMAC_HANDLER_ADR_ON
-
-/*!
- * LoRaWAN Default data Rate Data Rate
- * @note Please note that LORAWAN_DEFAULT_DATA_RATE is used only when LORAWAN_ADR_STATE is disabled
- */
-#define LORAWAN_DEFAULT_DATA_RATE                   DR_0
-
-/*!
- * LoRaWAN default activation type
- */
-#define LORAWAN_DEFAULT_ACTIVATION_TYPE             ACTIVATION_TYPE_OTAA
-
-/*!
- * User application data buffer size
- */
-#define LORAWAN_APP_DATA_BUFFER_MAX_SIZE            242
-
-/*!
- * Default Unicast ping slots periodicity
- *
- * \remark periodicity is equal to 2^LORAWAN_DEFAULT_PING_SLOT_PERIODICITY seconds
- *         example: 2^3 = 8 seconds. The end-device will open an Rx slot every 8 seconds.
- */
-#define LORAWAN_DEFAULT_PING_SLOT_PERIODICITY       4
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief  Init Lora Application
-  * @param None
-  * @retval None
-  */
-void LoRaWAN_Init(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__LORA_APP_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
deleted file mode 100644
index b11647cf..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lora_app_version.h
-  * @author  MCD Application Team
-  * @brief   Definition the version of the CM4 application
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __APP_VERSION_H__
-#define __APP_VERSION_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
-#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
-#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
-
-#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
-#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
-#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
-#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macros -----------------------------------------------------------*/
-/**
-  * @brief Application version
-  */
-#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
-                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
-                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
-                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
-
-/**
-  * @brief LoRaWAN CM4 application version
-  */
-#define __CM4_APP_VERSION             __APP_VERSION
-
-/**
-  * @brief LoRaWAN CM0PLUS minimum required version
-  */
-#define __LAST_COMPATIBLE_CM0_RELEASE __APP_VERSION
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__APP_VERSION_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
deleted file mode 100644
index 1f6f2c02..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lorawan_conf.h
-  * @author  MCD Application Team
-  * @brief   Header for LoRaWAN middleware instances
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __LORAWAN_CONF_H__
-#define __LORAWAN_CONF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __LORAWAN_CONF_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
deleted file mode 100644
index f3ce93b2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    systime.h
-  * @author  MCD Application Team
-  * @brief   Map middleware systime
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-
-#ifndef __SYSTIME_H__
-#define __SYSTIME_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_systime.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__SYSTIME_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
deleted file mode 100644
index 33389639..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    timer.h
-  * @author  MCD Application Team
-  * @brief   Wrapper to timer server
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __TIMER_H__
-#define __TIMER_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_timer.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Max timer mask
-  */
-#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Timer value on 32 bits
-  */
-#define TimerTime_t UTIL_TIMER_Time_t
-
-/**
-  * @brief Timer object description
-  */
-#define TimerEvent_t UTIL_TIMER_Object_t
-
-/**
-  * @brief Create the timer object
-  */
-#define TimerInit(HANDLE, CB) do {\
-                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
-                                 } while(0)
-
-/**
-  * @brief update the period and start the timer
-  */
-#define TimerSetValue(HANDLE, TIMEOUT) do{ \
-                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
-                                         } while(0)
-
-/**
-  * @brief Start and adds the timer object to the list of timer events
-  */
-#define TimerStart(HANDLE)   do {\
-                                  UTIL_TIMER_Start(HANDLE);\
-                                } while(0)
-
-/**
-  * @brief Stop and removes the timer object from the list of timer events
-  */
-#define TimerStop(HANDLE)   do {\
-                                 UTIL_TIMER_Stop(HANDLE);\
-                               } while(0)
-
-/**
-  * @brief return the current time
-  */
-#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
-
-/**
-  * @brief return the elapsed time
-  */
-#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TIMER_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
deleted file mode 100644
index 65512b2d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
+++ /dev/null
@@ -1,1494 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    LmHandler_mbwrapper.c
-  * @author  MCD Application Team
-  * @brief   This file implements the CM4 side wrapper of the LoraMac interface
-  *          shared between M0 and M4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "LmHandler_mbwrapper.h"
-#include "lora_info.h"
-#include "LmHandler.h"
-#include "mbmuxif_sys.h"
-#include "mbmux.h"
-#include "msg_id.h"
-#include "mbmuxif_lora.h"
-#include "stm32_mem.h"
-#include "sys_app.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-#ifndef MAX
-#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-#endif /* MAX */
-#define MCPS_MLME_SIZE MAX(sizeof(McpsReq_t), sizeof(MlmeReq_t))
-#define MCPS_MLME_2_SIZE MAX(MCPS_MLME_SIZE, sizeof(MibRequestConfirm_t))
-#define LORA_MBWRAP_SHBUF_SIZE MAX(MCPS_MLME_2_SIZE, sizeof(McChannelParams_t))
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static LmHandlerCallbacks_t callback_mbwrapper;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-/**
-  * @addtogroup LoRaWan  LoRaWan Interface
-  *
-  * @{
-  *
-  */
-LmHandlerErrorStatus_t LmHandlerInit(LmHandlerCallbacks_t *handlerCallbacks)
-{
-  /* USER CODE BEGIN LmHandlerInit_1 */
-
-  /* USER CODE END LmHandlerInit_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (handlerCallbacks == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  callback_mbwrapper.GetBatteryLevel = handlerCallbacks->GetBatteryLevel;
-  callback_mbwrapper.GetTemperature = handlerCallbacks->GetTemperature;
-  callback_mbwrapper.OnJoinRequest = handlerCallbacks->OnJoinRequest;
-  callback_mbwrapper.OnTxData = handlerCallbacks->OnTxData;
-  callback_mbwrapper.OnRxData = handlerCallbacks->OnRxData;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_INITIALIZATION_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (LmHandlerErrorStatus_t) ret;
-  /* USER CODE BEGIN LmHandlerInit_2 */
-
-  /* USER CODE END LmHandlerInit_2 */
-}
-
-LmHandlerErrorStatus_t LmHandlerConfigure(LmHandlerParams_t *handlerParams)
-{
-  /* USER CODE BEGIN LmHandlerConfigure_1 */
-
-  /* USER CODE END LmHandlerConfigure_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (handlerParams == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, handlerParams, sizeof(LmHandlerParams_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_CONFIGURE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (LmHandlerErrorStatus_t) ret;
-  /* USER CODE BEGIN LmHandlerConfigure_2 */
-
-  /* USER CODE END LmHandlerConfigure_2 */
-}
-
-LmHandlerFlagStatus_t LmHandlerJoinStatus(void)
-{
-  /* USER CODE BEGIN LmHandlerJoinStatus_1 */
-
-  /* USER CODE END LmHandlerJoinStatus_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_JOIN_STATUS_ID;
-  com_obj->ParamCnt = 0;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (LmHandlerFlagStatus_t) ret;
-  /* USER CODE BEGIN LmHandlerJoinStatus_2 */
-
-  /* USER CODE END LmHandlerJoinStatus_2 */
-}
-
-void LmHandlerJoin(ActivationType_t mode)
-{
-  /* USER CODE BEGIN LmHandlerJoin_1 */
-
-  /* USER CODE END LmHandlerJoin_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_JOIN_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) mode;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN LmHandlerJoin_2 */
-
-  /* USER CODE END LmHandlerJoin_2 */
-}
-
-LmHandlerErrorStatus_t LmHandlerStop(void)
-{
-  /* USER CODE BEGIN LmHandlerStop_1 */
-
-  /* USER CODE END LmHandlerStop_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_STOP_ID;
-  com_obj->ParamCnt = 0;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (LmHandlerErrorStatus_t) ret;
-  /* USER CODE BEGIN LmHandlerStop_2 */
-
-  /* USER CODE END LmHandlerStop_2 */
-}
-
-LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed,
-                                     UTIL_TIMER_Time_t *nextTxIn, bool allowDelayedTx)
-{
-  /* USER CODE BEGIN LmHandlerSend_1 */
-
-  /* USER CODE END LmHandlerSend_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if ((appData == NULL) || (appData->Buffer == NULL))
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  /* need to 8-align the next address */
-  uint8_t next_addr = (appData->BufferSize + 7) & ~7;
-
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
-  UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SEND_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) appData->Port;
-  com_buffer[i++] = (uint32_t) appData->BufferSize;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_buffer[i++] = (uint32_t) isTxConfirmed;
-  com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
-  com_buffer[i++] = (uint32_t) allowDelayedTx;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
-
-  ret = com_obj->ReturnVal;
-  return (LmHandlerErrorStatus_t) ret;
-  /* USER CODE BEGIN LmHandlerSend_2 */
-
-  /* USER CODE END LmHandlerSend_2 */
-}
-
-void LmHandlerProcess(void)
-{
-  /* USER CODE BEGIN LmHandlerProcess_1 */
-
-  /* USER CODE END LmHandlerProcess_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_PROCESS_ID;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN LmHandlerProcess_2 */
-
-  /* USER CODE END LmHandlerProcess_2 */
-}
-
-LmHandlerErrorStatus_t LmHandlerRequestClass(DeviceClass_t newClass)
-{
-  /* USER CODE BEGIN LmHandlerRequestClass_1 */
-
-  /* USER CODE END LmHandlerRequestClass_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_REQUEST_CLASS_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) newClass;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (LmHandlerErrorStatus_t) ret;
-  /* USER CODE BEGIN LmHandlerRequestClass_2 */
-
-  /* USER CODE END LmHandlerRequestClass_2 */
-}
-
-int32_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
-{
-  /* USER CODE BEGIN LmHandlerGetCurrentClass_1 */
-
-  /* USER CODE END LmHandlerGetCurrentClass_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (deviceClass == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, deviceClass, sizeof(DeviceClass_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_CLASS_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(deviceClass, aLoraMbWrapShareBuffer, sizeof(DeviceClass_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetCurrentClass_2 */
-
-  /* USER CODE END LmHandlerGetCurrentClass_2 */
-}
-
-int32_t LmHandlerGetDevEUI(uint8_t *devEUI)
-{
-  /* USER CODE BEGIN LmHandlerGetDevEUI_1 */
-
-  /* USER CODE END LmHandlerGetDevEUI_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (devEUI == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, 8);
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_DEVEUI_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, 8);
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetDevEUI_2 */
-
-  /* USER CODE END LmHandlerGetDevEUI_2 */
-}
-
-int32_t LmHandlerSetDevEUI(uint8_t *devEUI)
-{
-  /* USER CODE BEGIN LmHandlerSetDevEUI_1 */
-
-  /* USER CODE END LmHandlerSetDevEUI_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (devEUI == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, 8);
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_DEVEUI_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, 8);
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetDevEUI_2 */
-
-  /* USER CODE END LmHandlerSetDevEUI_2 */
-}
-
-int32_t LmHandlerGetAppEUI(uint8_t *appEUI)
-{
-  /* USER CODE BEGIN LmHandlerGetAppEUI_1 */
-
-  /* USER CODE END LmHandlerGetAppEUI_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (appEUI == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, 8);
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_APPEUI_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, 8);
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetAppEUI_2 */
-
-  /* USER CODE END LmHandlerGetAppEUI_2 */
-}
-
-int32_t LmHandlerSetAppEUI(uint8_t *appEUI)
-{
-  /* USER CODE BEGIN LmHandlerSetAppEUI_1 */
-
-  /* USER CODE END LmHandlerSetAppEUI_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (appEUI == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, 8);
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_APPEUI_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, 8);
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetAppEUI_2 */
-
-  /* USER CODE END LmHandlerSetAppEUI_2 */
-}
-
-int32_t LmHandlerGetNetworkID(uint32_t *networkId)
-{
-  /* USER CODE BEGIN LmHandlerGetNetworkID_1 */
-
-  /* USER CODE END LmHandlerGetNetworkID_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (networkId == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_NWKID_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  *networkId = (aLoraMbWrapShareBuffer[3] << 24) | (aLoraMbWrapShareBuffer[2] << 16) | (aLoraMbWrapShareBuffer[1] << 8) | aLoraMbWrapShareBuffer[0];
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetNetworkID_2 */
-
-  /* USER CODE END LmHandlerGetNetworkID_2 */
-}
-
-int32_t LmHandlerSetNetworkID(uint32_t networkId)
-{
-  /* USER CODE BEGIN LmHandlerSetNetworkID_1 */
-
-  /* USER CODE END LmHandlerSetNetworkID_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_NWKID_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = networkId;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetNetworkID_2 */
-
-  /* USER CODE END LmHandlerSetNetworkID_2 */
-}
-
-int32_t LmHandlerGetDevAddr(uint32_t *devAddr)
-{
-  /* USER CODE BEGIN LmHandlerGetDevAddr_1 */
-
-  /* USER CODE END LmHandlerGetDevAddr_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (devAddr == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devAddr, sizeof(uint32_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_DEVADDR_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(devAddr, aLoraMbWrapShareBuffer, sizeof(uint32_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetDevAddr_2 */
-
-  /* USER CODE END LmHandlerGetDevAddr_2 */
-}
-
-int32_t LmHandlerSetDevAddr(uint32_t devAddr)
-{
-  /* USER CODE BEGIN LmHandlerSetDevAddr_1 */
-
-  /* USER CODE END LmHandlerSetDevAddr_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_DEVADDR_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = devAddr;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetDevAddr_2 */
-
-  /* USER CODE END LmHandlerSetDevAddr_2 */
-}
-
-int32_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
-{
-  /* USER CODE BEGIN LmHandlerGetActiveRegion_1 */
-
-  /* USER CODE END LmHandlerGetActiveRegion_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (region == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, region, sizeof(LoRaMacRegion_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_ACTIVE_REGION_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(region, aLoraMbWrapShareBuffer, sizeof(LoRaMacRegion_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetActiveRegion_2 */
-
-  /* USER CODE END LmHandlerGetActiveRegion_2 */
-}
-
-int32_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
-{
-  /* USER CODE BEGIN LmHandlerSetActiveRegion_1 */
-
-  /* USER CODE END LmHandlerSetActiveRegion_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, &region, sizeof(LoRaMacRegion_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_ACTIVE_REGION_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetActiveRegion_2 */
-
-  /* USER CODE END LmHandlerSetActiveRegion_2 */
-}
-
-int32_t LmHandlerGetAdrEnable(bool *adrEnable)
-{
-  /* USER CODE BEGIN LmHandlerGetAdrEnable_1 */
-
-  /* USER CODE END LmHandlerGetAdrEnable_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (adrEnable == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, adrEnable, sizeof(bool));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_ADR_ENABLE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(adrEnable, aLoraMbWrapShareBuffer, sizeof(bool));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetAdrEnable_2 */
-
-  /* USER CODE END LmHandlerGetAdrEnable_2 */
-}
-
-int32_t LmHandlerSetAdrEnable(bool adrEnable)
-{
-  /* USER CODE BEGIN LmHandlerSetAdrEnable_1 */
-
-  /* USER CODE END LmHandlerSetAdrEnable_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_ADR_ENABLE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) adrEnable;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetAdrEnable_2 */
-
-  /* USER CODE END LmHandlerSetAdrEnable_2 */
-}
-
-int32_t LmHandlerGetTxDatarate(int8_t *txDatarate)
-{
-  /* USER CODE BEGIN LmHandlerGetTxDatarate_1 */
-
-  /* USER CODE END LmHandlerGetTxDatarate_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (txDatarate == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, txDatarate, sizeof(int8_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_TX_DATARATE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(txDatarate, aLoraMbWrapShareBuffer, sizeof(int8_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetTxDatarate_2 */
-
-  /* USER CODE END LmHandlerGetTxDatarate_2 */
-}
-
-int32_t LmHandlerSetTxDatarate(int8_t txDatarate)
-{
-  /* USER CODE BEGIN LmHandlerSetTxDatarate_1 */
-
-  /* USER CODE END LmHandlerSetTxDatarate_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_TX_DATARATE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) txDatarate;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetTxDatarate_2 */
-
-  /* USER CODE END LmHandlerSetTxDatarate_2 */
-}
-
-int32_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
-{
-  /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_1 */
-
-  /* USER CODE END LmHandlerGetDutyCycleEnable_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (dutyCycleEnable == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, dutyCycleEnable, sizeof(bool));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_DUTY_CYCLE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(dutyCycleEnable, aLoraMbWrapShareBuffer, sizeof(bool));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_2 */
-
-  /* USER CODE END LmHandlerGetDutyCycleEnable_2 */
-}
-
-int32_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
-{
-  /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_1 */
-
-  /* USER CODE END LmHandlerSetDutyCycleEnable_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_DUTY_CYCLE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) dutyCycleEnable;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_2 */
-
-  /* USER CODE END LmHandlerSetDutyCycleEnable_2 */
-}
-
-int32_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
-{
-  /* USER CODE BEGIN LmHandlerGetRX2Params_1 */
-
-  /* USER CODE END LmHandlerGetRX2Params_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (rxParams == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxParams, sizeof(RxChannelParams_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_RX2_PARAMS_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetRX2Params_2 */
-
-  /* USER CODE END LmHandlerGetRX2Params_2 */
-}
-
-int32_t LmHandlerGetTxPower(int8_t *txPower)
-{
-  /* USER CODE BEGIN LmHandlerGetTxPower_1 */
-
-  /* USER CODE END LmHandlerGetTxPower_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (txPower == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, txPower, sizeof(int8_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_TX_PWR_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(txPower, aLoraMbWrapShareBuffer, sizeof(int8_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetTxPower_2 */
-
-  /* USER CODE END LmHandlerGetTxPower_2 */
-}
-
-int32_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
-{
-  /* USER CODE BEGIN LmHandlerGetRx1Delay_1 */
-
-  /* USER CODE END LmHandlerGetRx1Delay_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (rxDelay == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxDelay, sizeof(uint32_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_RX1_DELAY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetRx1Delay_2 */
-
-  /* USER CODE END LmHandlerGetRx1Delay_2 */
-}
-
-int32_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
-{
-  /* USER CODE BEGIN LmHandlerGetRx2Delay_1 */
-
-  /* USER CODE END LmHandlerGetRx2Delay_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (rxDelay == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxDelay, sizeof(uint32_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_RX2_DELAY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetRx2Delay_2 */
-
-  /* USER CODE END LmHandlerGetRx2Delay_2 */
-}
-
-int32_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
-{
-  /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_1 */
-
-  /* USER CODE END LmHandlerGetJoinRx1Delay_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (rxDelay == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxDelay, sizeof(uint32_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_JOIN_RX1_DELAY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_2 */
-
-  /* USER CODE END LmHandlerGetJoinRx1Delay_2 */
-}
-
-int32_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
-{
-  /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_1 */
-
-  /* USER CODE END LmHandlerGetJoinRx2Delay_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (rxDelay == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxDelay, sizeof(uint32_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_JOIN_RX2_DELAY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_2 */
-
-  /* USER CODE END LmHandlerGetJoinRx2Delay_2 */
-}
-
-int32_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
-{
-  /* USER CODE BEGIN LmHandlerSetRX2Params_1 */
-
-  /* USER CODE END LmHandlerSetRX2Params_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (rxParams == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxParams, sizeof(RxChannelParams_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_RX2_PARAMS_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetRX2Params_2 */
-
-  /* USER CODE END LmHandlerSetRX2Params_2 */
-}
-
-int32_t LmHandlerSetTxPower(int8_t txPower)
-{
-  /* USER CODE BEGIN LmHandlerSetTxPower_1 */
-
-  /* USER CODE END LmHandlerSetTxPower_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_TX_PWR_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) txPower;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetTxPower_2 */
-
-  /* USER CODE END LmHandlerSetTxPower_2 */
-}
-
-int32_t LmHandlerSetRx1Delay(uint32_t rxDelay)
-{
-  /* USER CODE BEGIN LmHandlerSetRx1Delay_1 */
-
-  /* USER CODE END LmHandlerSetRx1Delay_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_RX1_DELAY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) rxDelay;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetRx1Delay_2 */
-
-  /* USER CODE END LmHandlerSetRx1Delay_2 */
-}
-
-int32_t LmHandlerSetRx2Delay(uint32_t rxDelay)
-{
-  /* USER CODE BEGIN LmHandlerSetRx2Delay_1 */
-
-  /* USER CODE END LmHandlerSetRx2Delay_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_RX2_DELAY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) rxDelay;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetRx2Delay_2 */
-
-  /* USER CODE END LmHandlerSetRx2Delay_2 */
-}
-
-int32_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
-{
-  /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_1 */
-
-  /* USER CODE END LmHandlerSetJoinRx1Delay_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_JOIN_RX1_DELAY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) rxDelay;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_2 */
-
-  /* USER CODE END LmHandlerSetJoinRx1Delay_2 */
-}
-
-int32_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
-{
-  /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_1 */
-
-  /* USER CODE END LmHandlerSetJoinRx2Delay_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_JOIN_RX2_DELAY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) rxDelay;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_2 */
-
-  /* USER CODE END LmHandlerSetJoinRx2Delay_2 */
-}
-
-int32_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
-{
-  /* USER CODE BEGIN LmHandlerGetPingPeriodicity_1 */
-
-  /* USER CODE END LmHandlerGetPingPeriodicity_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (pingPeriodicity == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, pingPeriodicity, sizeof(uint8_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_PING_PERIODICITY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(pingPeriodicity, aLoraMbWrapShareBuffer, sizeof(uint8_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetPingPeriodicity_2 */
-
-  /* USER CODE END LmHandlerGetPingPeriodicity_2 */
-}
-
-int32_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
-{
-  /* USER CODE BEGIN LmHandlerSetPingPeriodicity_1 */
-
-  /* USER CODE END LmHandlerSetPingPeriodicity_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_SET_PING_PERIODICITY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) pingPeriodicity;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerSetPingPeriodicity_2 */
-
-  /* USER CODE END LmHandlerSetPingPeriodicity_2 */
-}
-
-int32_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
-{
-  /* USER CODE BEGIN LmHandlerGetBeaconState_1 */
-
-  /* USER CODE END LmHandlerGetBeaconState_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  if (beaconState == NULL)
-  {
-    return LORAMAC_HANDLER_ERROR;
-  }
-
-  /* copy data from Cm4 stack memory to shared memory */
-  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, beaconState, sizeof(BeaconState_t));
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_GET_BEACON_STATE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
-  com_obj->ParamCnt = i;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  UTIL_MEM_cpy_8(beaconState, aLoraMbWrapShareBuffer, sizeof(BeaconState_t));
-
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN LmHandlerGetBeaconState_2 */
-
-  /* USER CODE END LmHandlerGetBeaconState_2 */
-}
-
-void LoraInfo_Init(void)
-{
-  /* USER CODE BEGIN LoraInfo_Init_1 */
-
-  /* USER CODE END LoraInfo_Init_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
-  com_obj->MsgId = LMHANDLER_INFO_INIT_ID;
-  com_obj->ParamCnt = 0;
-
-  MBMUXIF_LoraSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN LoraInfo_Init_2 */
-
-  /* USER CODE END LoraInfo_Init_2 */
-}
-
-LoraInfo_t *LoraInfo_GetPtr(void)
-{
-  /* USER CODE BEGIN LoraInfo_GetPtr_1 */
-
-  /* USER CODE END LoraInfo_GetPtr_1 */
-  FEAT_INFO_Param_t *p_feature;
-
-  p_feature = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_LORAWAN_ID);
-  return (LoraInfo_t *) p_feature->Feat_Info_Config_Ptr;
-  /* USER CODE BEGIN LoraInfo_GetPtr_2 */
-
-  /* USER CODE END LoraInfo_GetPtr_2 */
-}
-
-/**
-  * @brief This function processes the callbacks and primitives from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
-void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
-{
-  /* USER CODE BEGIN Process_Lora_Notif_1 */
-
-  /* USER CODE END Process_Lora_Notif_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;
-  uint32_t    cb_ret;
-
-  /* Lora Notif received */
-  APP_LOG(TS_ON, VLEVEL_H, "CM4<(LoRa)\r\n");
-
-  /* process Command */
-  switch (ComObj->MsgId)
-  {
-    /* callbacks */
-    case LMHANDLER_GET_BATTERY_LEVEL_CB_ID:
-      if (callback_mbwrapper.GetBatteryLevel != NULL)
-      {
-        cb_ret = (uint32_t) callback_mbwrapper.GetBatteryLevel();
-      }
-      else
-      {
-        while (1) {}
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  cb_ret; /* */
-      break;
-
-    case LMHANDLER_GET_TEMPERATURE_CB_ID:
-      if (callback_mbwrapper.GetTemperature != NULL)
-      {
-        cb_ret = (uint32_t) callback_mbwrapper.GetTemperature();
-      }
-      else
-      {
-        while (1) {}
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  cb_ret; /* */
-      break;
-
-    case LMHANDLER_ON_JOIN_REQ_CB_ID:
-      if (callback_mbwrapper.OnJoinRequest != NULL)
-      {
-        callback_mbwrapper.OnJoinRequest((LmHandlerJoinParams_t *) com_buffer[0]);
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  0; /* */
-      break;
-
-    case LMHANDLER_ON_TX_DATA_CB_ID:
-      if (callback_mbwrapper.OnTxData != NULL)
-      {
-        callback_mbwrapper.OnTxData((LmHandlerTxParams_t *) com_buffer[0]);
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  0; /* */
-      break;
-
-    case LMHANDLER_ON_RX_DATA_CB_ID:
-      if (callback_mbwrapper.OnRxData != NULL)
-      {
-        callback_mbwrapper.OnRxData((LmHandlerAppData_t *) com_buffer[0], (LmHandlerRxParams_t *) com_buffer[1]);
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  0; /* */
-      break;
-    default:
-      break;
-  }
-
-  /* Lora sending ack */
-  APP_LOG(TS_ON, VLEVEL_H, "CM4>(LoRa)\r\n");
-  MBMUX_AcknowledgeSnd(FEAT_INFO_LORAWAN_ID);
-  /* USER CODE BEGIN Process_Lora_Notif_2 */
-
-  /* USER CODE END Process_Lora_Notif_2 */
-}
-
-/**
-  * @}
-  *
-  */
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
deleted file mode 100644
index 82ac862c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    LmHandler_mbwrapper.h
-  * @author  MCD Application Team
-  * @brief   This file implements the CM4 side wrapper of the LmHandler
-  *          interface shared between M0 and M4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __LMHANDLER_MBWRAPPER_CM4_H__
-#define __LMHANDLER_MBWRAPPER_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux_table.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void Process_Lora_Notif(MBMUX_ComParam_t *ComObj);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__LMHANDLER_MBWRAPPER_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
deleted file mode 100644
index 76152897..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmux.c
-  * @author  MCD Application Team
-  * @brief   CM4 side multiplexer to map features to IPCC channels
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "stdint.h"
-#include "assert.h"
-#include "stddef.h"
-#include "ipcc_if.h"
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-#define MB_CHANNEL_NOT_REGISTERED 0xFF
-
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComTable_t *p_MBMUX_ComTable;
-static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
-static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
-static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
-static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
-static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
-static void MBMUX_IsrNotRegistered(void *ComObj);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
-void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
-{
-  /* USER CODE BEGIN MBMUX_Init_1 */
-
-  /* USER CODE END MBMUX_Init_1 */
-  uint8_t i;
-  IPCC_IF_Init(MBMUX_IsrResponseRcvCb, MBMUX_IsrNotificationRcvCb);
-
-  p_MBMUX_ComTable = pMBMUX_ComTable;
-
-  for (i = 0; i < FEAT_INFO_CNT; i++)
-  {
-    p_MBMUX_ComTable->MBMUXMapping[i][MBMUX_CMD_RESP] = MB_CHANNEL_NOT_REGISTERED;
-    p_MBMUX_ComTable->MBMUXMapping[i][MBMUX_NOTIF_ACK] = MB_CHANNEL_NOT_REGISTERED;
-  }
-
-  for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
-  {
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgId = 0;
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm4Cb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBCmdRespParam[i].ParamCnt = 0;
-    p_MBMUX_ComTable->MBCmdRespParam[i].ParamBuf = NULL;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgId = 0;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm4Cb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBNotifAckParam[i].ParamCnt = 0;
-    p_MBMUX_ComTable->MBNotifAckParam[i].ParamBuf = NULL;
-  }
-  /* USER CODE BEGIN MBMUX_Init_Last */
-
-  /* USER CODE END MBMUX_Init_Last */
-}
-
-/**
-  * @brief The application informs MBMUX about the CM0PLUS supported feature list
-  * @param p_CM0PLUS_FeatureList  pointer to the list of CM0PLUS features
-  * @retval  none
-  */
-void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
-{
-  /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
-
-  /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_1 */
-  p_MBMUX_Cm0plusFeatureList = pCM0PLUS_FeatureList;
-  /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_Last */
-
-  /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
-}
-
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval   channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
-{
-  int8_t check_if_feature_provided_by_cm0plus = 0;
-  uint8_t channel_idx = MB_CHANNEL_NOT_REGISTERED;
-  int8_t ret = -1; /* no more ipcc channels available */
-  uint8_t check_existing_feature_registration;
-  /* USER CODE BEGIN MBMUX_RegisterFeatureC_1 */
-
-  /* USER CODE END MBMUX_RegisterFeatureC_1 */
-
-  if (e_featID == FEAT_INFO_SYSTEM_ID)
-  {
-    check_if_feature_provided_by_cm0plus = 1;
-  }
-  else
-  {
-    check_if_feature_provided_by_cm0plus = MBMUX_CheckIfFeatureSupportedByCm0plus(e_featID);
-  }
-
-  if (check_if_feature_provided_by_cm0plus == 1)
-  {
-    check_existing_feature_registration = MBMUX_GetFeatureChIdx(e_featID, ComType);
-
-    if (check_existing_feature_registration == MB_CHANNEL_NOT_REGISTERED)
-    {
-      if (e_featID == FEAT_INFO_SYSTEM_ID)
-      {
-        channel_idx = 0;
-      }
-      else
-      {
-        channel_idx = MBMUX_FindChStillUnregistered(ComType);
-      }
-    }
-    else
-    {
-      /* previous registration will be replaced by the given buffers */
-      channel_idx = check_existing_feature_registration;
-    }
-  }
-  else
-  {
-    ret = -2; /* feature not provided by CM0PLUS */
-  }
-
-  if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
-  {
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      p_MBMUX_ComTable->MBMUXMapping[e_featID][MBMUX_CMD_RESP] = channel_idx;
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm4Cb = MsgCb;
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].BufSize = ComBufSize;
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].ParamBuf = ComBuffer;
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].ReturnVal = 0;
-    }
-    else
-    {
-      p_MBMUX_ComTable->MBMUXMapping[e_featID][MBMUX_NOTIF_ACK] = channel_idx;
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm4Cb = MsgCb;
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].BufSize = ComBufSize;
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].ParamBuf = ComBuffer;
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].ReturnVal = 0;
-    }
-    ret = channel_idx;
-  }
-  /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
-
-  /* USER CODE END MBMUX_RegisterFeatureC_Last */
-  return ret;
-}
-
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
-void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
-{
-  /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
-
-  /* USER CODE END MBMUX_UnregisterFeature_1 */
-  uint8_t mb_ch;
-
-  mb_ch = MBMUX_GetFeatureChIdx(e_featID, ComType);
-
-  /* Function not completely implemented:
-     Missing code that sends via Mbmux a SysCmd to tell CM0PLUS to unregister it's callback */
-  /* ... */
-
-  if (mb_ch < MBMUX_CHANNEL_NUMBER)
-  {
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      /* Channel should have been unregistered first on CM0PLUS to avoid getting Irq with no cb */
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].BufSize = 0;
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ParamBuf = NULL;
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ReturnVal = 0;
-    }
-    else
-    {
-      /* Make sure to clear pending IRQ Notification before unregistering the callback */
-      /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
-      /* if the mask is removed by anyone, the unwhished IRQ is generated if SR isn't cleaned */
-      IPCC_IF_AcknowledgeSnd(mb_ch);
-
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize = 0;
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamBuf = NULL;
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ReturnVal = 0;
-    }
-  }
-
-  p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType] = MB_CHANNEL_NOT_REGISTERED;
-
-  /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
-
-  /* USER CODE END MBMUX_UnregisterFeature_Last */
-}
-
-/**
-  * @brief gives back the pointer to the MailBox com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
-{
-  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
-
-  /* USER CODE END MBMUX_GetFeatureComPtr_1 */
-  uint32_t channel_idx;
-  MBMUX_ComParam_t *com_param_ptr = NULL;
-
-  channel_idx = MBMUX_GetFeatureChIdx(e_featID, ComType);
-  if (channel_idx < MBMUX_CHANNEL_NUMBER)
-  {
-    if (ComType == MBMUX_CMD_RESP)  /* TX */
-    {
-      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBCmdRespParam[channel_idx];
-    }
-    else
-    {
-      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBNotifAckParam[channel_idx];
-    }
-  }
-  return com_param_ptr;
-  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_Last */
-
-  /* USER CODE END MBMUX_GetFeatureComPtr_Last */
-}
-
-/**
-  * @brief Send Cmd to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
-int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
-{
-  /* USER CODE BEGIN MBMUX_CommandSnd_1 */
-
-  /* USER CODE END MBMUX_CommandSnd_1 */
-  uint32_t mb_ch;
-
-  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_CMD_RESP);
-  if (p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBCmdRespParam[mb_ch].BufSize)
-  {
-    Error_Handler();
-  }
-  return IPCC_IF_CommandSnd(mb_ch);
-  /* USER CODE BEGIN MBMUX_CommandSnd_Last */
-
-  /* USER CODE END MBMUX_CommandSnd_Last */
-}
-
-/**
-  * @brief Send ack to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
-uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
-{
-  /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
-
-  /* USER CODE END MBMUX_AcknowledgeSnd_1 */
-  uint32_t mb_ch;
-
-  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
-  return IPCC_IF_AcknowledgeSnd(mb_ch);
-  /* USER CODE BEGIN MBMUX_AcknowledgeSnd_Last */
-
-  /* USER CODE END MBMUX_AcknowledgeSnd_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Check if the FEATURE is in the CM0 table and return it's position
-  * @param e_featID  identifier of the feature
-  * @retval 0 not present, 1 present
-  */
-static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
-{
-  int8_t ret = 0;
-  uint8_t i;
-  uint8_t cm0plus_nr_of_supported_features;
-  FEAT_INFO_Param_t  i_feature;
-  /* USER CODE BEGIN MBMUX_CheckIfFeatureSupportedByCm0plus_1 */
-
-  /* USER CODE END MBMUX_CheckIfFeatureSupportedByCm0plus_1 */
-
-  if (p_MBMUX_Cm0plusFeatureList != NULL)
-  {
-    cm0plus_nr_of_supported_features = p_MBMUX_Cm0plusFeatureList->Feat_Info_Cnt;
-
-    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
-    {
-      i_feature = *(i + p_MBMUX_Cm0plusFeatureList->Feat_Info_TableAddress);
-      if (i_feature.Feat_Info_Feature_Id == e_featID)
-      {
-        ret = 1;
-        break;
-      }
-
-    }
-  }
-  /* USER CODE BEGIN MBMUX_CheckIfFeatureSupportedByCm0plus_Last */
-
-  /* USER CODE END MBMUX_CheckIfFeatureSupportedByCm0plus_Last */
-  return ret;
-}
-
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
-static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
-
-  /* USER CODE END MBMUX_IsrResponseRcvCb_1 */
-  /* retrieve pointer to com params */
-  void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
-  /* call registered callback */
-  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm4Cb(com_obj);
-  /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_Last */
-
-  /* USER CODE END MBMUX_IsrResponseRcvCb_Last */
-  return;
-}
-
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
-static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
-{
-  /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
-
-  /* USER CODE END MBMUX_IsrNotificationRcvCb_1 */
-  /* retrieve pointer to com params */
-  void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
-  /* call registered callback */
-  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm4Cb(com_obj);
-  /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_Last */
-
-  /* USER CODE END MBMUX_IsrNotificationRcvCb_Last */
-  return;
-}
-
-/**
-  * @brief Find the first channel not yet associated to a feature (available)
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means no channel available
-  */
-static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
-{
-  /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
-
-  /* USER CODE END MBMUX_FindChStillUnregistered_1 */
-  uint8_t feat_id;
-  uint8_t ch;
-  uint8_t already_used;
-
-  /* First two channels are reserved to SYSTEM, TRACE and SKS */
-  if (ComType == MBMUX_CMD_RESP)
-  {
-    for (ch = 1; ch < MBMUX_CHANNEL_NUMBER; ch++)
-    {
-      already_used = 0;
-      for (feat_id = 0; feat_id < FEAT_INFO_CNT; feat_id++)
-      {
-        if (p_MBMUX_ComTable->MBMUXMapping[feat_id][MBMUX_CMD_RESP] == ch)
-        {
-          already_used = 1;
-        }
-      }
-      if (already_used == 0)
-      {
-        break;
-      }
-    }
-  }
-  else  /* RX */
-  {
-    for (ch = 1; ch < MBMUX_CHANNEL_NUMBER; ch++)
-    {
-      already_used = 0;
-      for (feat_id = 0; feat_id < FEAT_INFO_CNT; feat_id++)
-      {
-        if (p_MBMUX_ComTable->MBMUXMapping[feat_id][MBMUX_NOTIF_ACK] == ch)
-        {
-          already_used = 1;
-        }
-      }
-      if (already_used == 0)
-      {
-        break;
-      }
-    }
-  }
-
-  if (ch == MBMUX_CHANNEL_NUMBER)
-  {
-    return MB_CHANNEL_NOT_REGISTERED;
-  }
-  else
-  {
-    return (ch);
-  }
-  /* USER CODE BEGIN MBMUX_FindChStillUnregistered_Last */
-
-  /* USER CODE END MBMUX_FindChStillUnregistered_Last */
-}
-
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
-static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
-{
-  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
-
-  /* USER CODE END MBMUX_GetFeatureChIdx_1 */
-  return p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType];
-  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_Last */
-
-  /* USER CODE END MBMUX_GetFeatureChIdx_Last */
-}
-
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
-static void MBMUX_IsrNotRegistered(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
-
-  /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
-  /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
-
-  /* USER CODE END MBMUX_IsrNotRegistered_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
deleted file mode 100644
index fd31da65..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmux.h
-  * @author  MCD Application Team
-  * @brief   API which interfaces CM4 to IPCC
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUX_CM4_H__
-#define __MBMUX_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux_table.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
-
-void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
-
-int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
-                             void (*MsgCm4Cb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
-
-void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
-
-MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
-
-int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
-
-uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
-
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUX_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 1b866fbe..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmuxif_sys.h"
-#include "stm32_mem.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aKmsCmdRespBuff[MAX_PARAM_OF_KMS_CMD_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers KMS feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeature(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsRespRcvCb, aKmsCmdRespBuff, sizeof(aKmsCmdRespBuff));
-  if (ret >= 0)
-  {
-    /* Note: Kms uses only NOTIF_ACK channel, the SEQ_TASK only on CM0PLUS */
-
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_KMS_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Kms feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void)
-{
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP);
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  if (com_param_ptr == NULL)
-  {
-    Error_Handler(); /* ErrorHandler() : feature isn't registered */
-  }
-
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-  return com_param_ptr;
-}
-
-/**
-  * @brief Sends a Kms-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendCmd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_1 */
-  if (MBMUX_CommandSnd(FEAT_INFO_KMS_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS response callbacks: set event to release waiting task
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.h
deleted file mode 100644
index cfc715c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM4_H__
-#define __MBMUXIF_KMS_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void);
-void MBMUXIF_KmsSendCmd(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
deleted file mode 100644
index 7d490cb2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_lora.c
-  * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle LoraWAN via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_lora.h"
-#include "mbmuxif_sys.h"
-#include "sys_app.h"
-#include "stm32_mem.h"
-#include "stm32_seq.h"
-#include "LoRaMac.h"
-#include "LmHandler_mbwrapper.h"
-#include "utilities_def.h"
-#include "lora_app_version.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *LoraComObj;
-
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraCmdRespBuff[MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj);
-static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj);
-static void MBMUXIF_TaskLoraNotifRcv(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers LORA feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
-int8_t MBMUXIF_LoraInit(void)
-{
-  FEAT_INFO_Param_t *p_cm0plus_system_info;
-  int32_t cm0_vers = 0;
-  int8_t ret = 0;
-
-  /* USER CODE BEGIN MBMUXIF_LoraInit_1 */
-
-  /* USER CODE END MBMUXIF_LoraInit_1 */
-
-  p_cm0plus_system_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
-  /* abstract CM0 release version from RC (release candidate) and compare */
-  cm0_vers = p_cm0plus_system_info->Feat_Info_Feature_Version >> __APP_VERSION_SUB2_SHIFT;
-  if (cm0_vers < (__LAST_COMPATIBLE_CM0_RELEASE >> __APP_VERSION_SUB2_SHIFT))
-  {
-    ret = -4; /* version incompatibility */
-  }
-  if (ret >= 0)
-  {
-    ret = MBMUX_RegisterFeature(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP, MBMUXIF_IsrLoraRespRcvCb, aLoraCmdRespBuff, sizeof(aLoraCmdRespBuff));
-  }
-  if (ret >= 0)
-  {
-    ret = MBMUX_RegisterFeature(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrLoraNotifRcvCb, aLoraNotifAckBuff, sizeof(aLoraNotifAckBuff));
-  }
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskLoraNotifRcv);
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_LORAWAN_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  if (ret >= 0)
-  {
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_LoraInit_Last */
-
-  /* USER CODE END MBMUXIF_LoraInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Lora feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
-{
-  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_1 */
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP);
-  if (com_param_ptr == NULL)
-  {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
-  }
-  return com_param_ptr;
-  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_Last */
-}
-
-/**
-  * @brief Sends a Lora-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_LoraSendCmd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_LoraSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_LoraSendCmd_1 */
-  if (MBMUX_CommandSnd(FEAT_INFO_LORAWAN_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbLoRaRespRcv);
-  }
-  else
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN MBMUXIF_LoraSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_LoraSendCmd_Last */
-}
-
-/**
-  * @brief Sends a Lora-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_LoraSendAck(void)
-{
-  /* USER CODE BEGIN MBMUXIF_LoraSendAck_1 */
-
-  /* USER CODE END MBMUXIF_LoraSendAck_1 */
-  if (MBMUX_AcknowledgeSnd(FEAT_INFO_LORAWAN_ID) != 0)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN MBMUXIF_LoraSendAck_Last */
-
-  /* USER CODE END MBMUXIF_LoraSendAck_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  LORA response callbacks: set event to release waiting task
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbLoRaRespRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_Last */
-}
-
-/**
-  * @brief  LORA notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_1 */
-  LoraComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaNotifRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_Last */
-}
-
-/**
-  * @brief  LORA task to process the notification
-  * @param  pointer to the LORA com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskLoraNotifRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskLoraNotifRcv_1 */
-  Process_Lora_Notif(LoraComObj);
-  /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskLoraNotifRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
deleted file mode 100644
index c7911ad1..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_lora.h
-  * @author  MCD Application Team
-  * @brief   API provided to CM4 applic to register and handle LoraWAN via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_LORA_CM4_H__
-#define __MBMUXIF_LORA_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_LoraInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void);
-void MBMUXIF_LoraSendCmd(void);
-void MBMUXIF_LoraSendAck(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_LORA_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
deleted file mode 100644
index 26d69db0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_radio.c
-  * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle RADIO driver via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_radio.h"
-#include "mbmuxif_sys.h"
-#include "sys_app.h"
-#include "stm32_mem.h"
-#include "stm32_seq.h"
-#include "radio_mbwrapper.h"
-#include "subghz_phy_version.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *RadioComObj;
-
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
-static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
-static void MBMUXIF_TaskRadioNotifRcv(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers RADIO feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
-int8_t MBMUXIF_RadioInit(void)
-{
-  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
-  int8_t ret = 0;
-
-  /* USER CODE BEGIN MBMUXIF_RadioInit_1 */
-
-  /* USER CODE END MBMUXIF_RadioInit_1 */
-
-  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
-  if (p_cm0plus_specific_features_info->Feat_Info_Feature_Version != __SUBGHZ_PHY_VERSION)
-  {
-    ret = -4; /* version mismatch */
-  }
-  if (ret >= 0)
-  {
-    ret = MBMUX_RegisterFeature(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP, MBMUXIF_IsrRadioRespRcvCb, aRadioCmdRespBuff, sizeof(aRadioCmdRespBuff));
-  }
-  if (ret >= 0)
-  {
-    ret = MBMUX_RegisterFeature(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrRadioNotifRcvCb, aRadioNotifAckBuff, sizeof(aRadioNotifAckBuff));
-  }
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskRadioNotifRcv);
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_RADIO_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  if (ret >= 0)
-  {
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_RadioInit_Last */
-
-  /* USER CODE END MBMUXIF_RadioInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
-{
-  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_1 */
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
-  if (com_param_ptr == NULL)
-  {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
-  }
-  return com_param_ptr;
-  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
-}
-
-/**
-  * @brief Sends a Radio-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_RadioSendCmd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_RadioSendCmd_1 */
-  if (MBMUX_CommandSnd(FEAT_INFO_RADIO_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbRadioRespRcv);
-  }
-  else
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN MBMUXIF_RadioSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_RadioSendCmd_Last */
-}
-
-/**
-  * @brief Sends a Radio-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_RadioSendAck(void)
-{
-  /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
-
-  /* USER CODE END MBMUXIF_RadioSendAck_1 */
-  if (MBMUX_AcknowledgeSnd(FEAT_INFO_RADIO_ID) != 0)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN MBMUXIF_RadioSendAck_Last */
-
-  /* USER CODE END MBMUXIF_RadioSendAck_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO response callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbRadioRespRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
-}
-
-/**
-  * @brief  RADIO notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_1 */
-  RadioComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioNotifRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
-}
-
-/**
-  * @brief  RADIO task to process the notification
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskRadioNotifRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskRadioNotifRcv_1 */
-  Process_Radio_Notif(RadioComObj);
-  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskRadioNotifRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
deleted file mode 100644
index 1f4c2454..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_radio.h
-  * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle RADIO driver via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_RADIO_CM4_H__
-#define __MBMUXIF_RADIO_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_RadioInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
-void MBMUXIF_RadioSendCmd(void);
-void MBMUXIF_RadioSendAck(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_RADIO_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
deleted file mode 100644
index c937c14c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
+++ /dev/null
@@ -1,622 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_sys.c
-  * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_sys.h"
-#include "stm32_mem.h"
-#include "stm32_seq.h"
-#include "stm32_timer.h"
-#include "sys_app.h"
-#include "msg_id.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
-static __IO uint8_t AllowSeqencerForSysCmd = 0;
-static __IO uint8_t MbSystemRespRcvFlag;
-
-UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(4) ;
-
-MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
-MBMUX_ComParam_t *SystemComObj;
-
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
-static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
-static void MBMUXIF_TaskSystemNotifRcv(void);
-static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
-static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
-static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
-static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_SystemInit(void)
-{
-  int8_t ret;
-
-  /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
-
-  /* USER CODE END MBMUXIF_SystemInit_1 */
-
-  /* Get the Dual boot configuration status */
-  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
-
-  if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
-  {
-    APP_PPRINTF("\r\n WARNING: There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n",  (uint32_t) pMb_RefTable);
-    APP_PPRINTF(" and the address calculated according to the IPCCDBA option byte: 0x%X \r\n", OptionsBytesStruct.IPCCdataBufAddr);
-    APP_PPRINTF(" The execution enters now in a while(1){}  \r\n");
-    APP_PPRINTF(" please check the CM4\\MbMux\\mbmuxif_sys.c or update the scatter file \r\n\r\n");
-
-    /* USER CODE BEGIN MBMUXIF_SystemInit_Prevent_OB_Programming */
-      /* If you are sure you need to reprogram the IPCCDBA set #if to 0 (to avoid while(1){}) */
-      /* Please first check the  CM4 scatter file.*/
-      /* Make sure that the MAPPING_TABLE is placed in SRAM2 (memory with retention) */
-      /* Examples of scatter files available in the LoraWAN and Sigfox DualCore Applications pack*/
-      /* */
-      /* After HAL_FLASH_OB_Launch you will have to unplug and plug the board from power after this operation.*/
-      /* Additionally possible Issue under investigation, i.e.: */
-      /* In some cases happen that unplugging the chip power is not sufficient */
-      /* if so you need to reboot from RAM putting the BOOT0 pin to 3v3 */
-      /* attach with Cube Programmer and full erase the chip memory. */
-      /* */
-      /* PS: of course if you are attached with the debugger, it will not respond anymore after HAL_FLASH_OB_Launch*/
-#if 1
-    /* USER CODE END MBMUXIF_SystemInit_Prevent_OB_Programming */
-    while(1){}
-#else
-
-    /* write FLASH->IPCCBR option byte */
-    /* Unlock the Flash to enable the flash control register access *************/
-    HAL_FLASH_Unlock();
-    /* Clear OPTVERR bit set on virgin samples */
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
-
-    /* Unlock the Options Bytes *************************************************/
-    HAL_FLASH_OB_Unlock();
-
-    /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
-    OptionsBytesStruct.OptionType  = OPTIONBYTE_IPCC_BUF_ADDR;
-    OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
-
-    if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
-    {
-      /*
-      Error occurred while setting option bytes configuration.
-      User can add here some code to deal with this error.
-      To know the code error, user can call function 'HAL_FLASH_GetError()'
-      */
-      Error_Handler();
-    }
-
-    /* Start the Option Bytes programming process */
-    if (HAL_FLASH_OB_Launch() != HAL_OK)
-    {
-      /*
-      Error occurred while reloading option bytes configuration.
-      User can add here some code to deal with this error.
-      To know the code error, user can call function 'HAL_FLASH_GetError()'
-      */
-      Error_Handler();
-    }
-
-    /* Notice: After HAL_FLASH_OB_Launch() the chip is reset so next code is not executed */
-    /* Implemented anyway to be aligned with other projects (SBSFU, etc) */
-    /* Lock the Options Bytes ***************************************************/
-    (void) HAL_FLASH_OB_Lock();
-    /* Lock the Flash to disable the flash control register access  *********/
-    (void) HAL_FLASH_Lock();
-#endif
-  }
-  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
-
-  MBMUX_Init(pMb_RefTable);
-
-  ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
-  if (ret >= 0)
-  {
-    ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemNotifRcvCb, aSystemNotifAckBuff, sizeof(aSystemNotifAckBuff));
-  }
-  if (ret >= 0)
-  {
-    ret = 0;
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
-  }
-
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
-  /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
-  /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-#else
-#warning "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_ON */
-
-  /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
-
-  /* USER CODE END MBMUXIF_SystemInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
-{
-  int8_t ret=0;
-
-  /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
-
-  /* USER CODE END MBMUXIF_SystemPrio_Add_1 */
-
-  switch (SystemPrioFeat)
-  {
-    case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
-    {
-      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioARespRcvCb, aSystemPrioACmdRespBuff, sizeof(aSystemPrioACmdRespBuff));
-      break;
-    }
-    case FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID:
-    {
-      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioANotifRcvCb, aSystemPrioANotifAckBuff, sizeof(aSystemPrioANotifAckBuff));
-      break;
-    }
-    case FEAT_INFO_SYSTEM_CMD_PRIO_B_ID:
-    {
-      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioBRespRcvCb, aSystemPrioBCmdRespBuff, sizeof(aSystemPrioBCmdRespBuff));
-      break;
-    }
-    case FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID:
-    {
-      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioBNotifRcvCb, aSystemPrioBNotifAckBuff, sizeof(aSystemPrioBNotifAckBuff));
-      break;
-    }
-    default:
-      break;
-  }
-
-  if (ret >= 0)
-  {
-    /* Note: trace works on ISR, no need to associate a SEQ_TASK */
-
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(SystemPrioFeat);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_Last */
-
-  /* USER CODE END MBMUXIF_SystemPrio_Add_Last */
-  return ret;
-}
-
-/**
-  * @brief Set synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
-void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
-{
-  pMb_RefTable->SynchronizeCpusAtBoot = flag;
-  /* USER CODE BEGIN MBMUXIF_SetCpusSynchroFlag */
-
-  /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
-}
-
-/**
-  * @brief gives green light to Cm0 to Initialised MBMUX on its side
-  * @param none
-  * @retval  none
-  */
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void)
-{
-  while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
-  {
-  }
-  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialised */
-
-  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialised */
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
-{
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
-  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureCmdComPtr */
-
-  /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
-  if (com_param_ptr == NULL)
-  {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
-  }
-  return com_param_ptr;
-}
-
-/**
-  * @brief To allow SystemCmd to use the sequencer (hence entering in low power)
-  * @note  For compatib with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The applic can call this API at the end of the Init
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_SystemAllowSequencerForSysCmd(void)
-{
-  AllowSeqencerForSysCmd = 1;
-  /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
-
-  /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
-}
-
-/**
-  * @brief Sends a System-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
-{
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_SystemSendCmd_1 */
-
-  if (SystemPrioFeat == FEAT_INFO_SYSTEM_ID)
-  {
-
-    MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
-    if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
-    {
-      if (AllowSeqencerForSysCmd)
-      {
-        UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
-      }
-      else
-      {
-        /* To avoid using Sequencer (& LowPower) during Init sequence for SysCmd  */
-        while (!MbSystemRespRcvFlag) {}
-      }
-    }
-    else
-    {
-      Error_Handler();
-    }
-  }
-  else
-  {
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
-
-  /* USER CODE END MBMUXIF_SystemSendCmd_2 */
-  }
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_SystemSendCmd_Last */
-}
-
-/**
-  * @brief Sends a System-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
-{
-  /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
-
-  /* USER CODE END MBMUXIF_SystemSendAck_1 */
-  if (MBMUX_AcknowledgeSnd(SystemPrioFeat) != 0)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN MBMUXIF_SystemSendAck_Last */
-
-  /* USER CODE END MBMUXIF_SystemSendAck_Last */
-}
-
-/* USER CODE BEGIN ExpoF */
-
-/* USER CODE END ExpoF */
-
-/* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief   Gets the pointer to CM0PLUS capabilities info table
-  * @param   none
-  * @retval  pointer to CM0PLUS capabilities info table
-  */
-FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
-{
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret = 0;
-  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusInfoListReq_1 */
-
-  /* USER CODE END MBMUXIF_SystemSendCm0plusInfoListReq_1 */
-
-  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
-  if (com_obj != NULL)
-  {
-    com_obj->MsgId = SYS_GET_INFO_LIST_MSG_ID;
-    com_obj->ParamCnt = 0;
-    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
-    /* waiting for ack event */
-
-    /* once event is received and semaphore released: */
-    ret = com_obj->ReturnVal;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusInfoListReq_Last */
-
-  /* USER CODE END MBMUXIF_SystemSendCm0plusInfoListReq_Last */
-  return (FEAT_INFO_List_t *) ret;   /* need to verify */
-}
-
-/**
-  * @brief returns the pointer to the Capability Info table of a given feature
-  * @param e_featID ID of the feature from which retrieve the ptr
-  * @retval  LoRaMacInfoTable pointer
-  */
-FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
-{
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list = NULL;
-  FEAT_INFO_Param_t  *p_feature = NULL;
-  uint8_t i;
-  uint8_t cm0plus_nr_of_supported_features;
-  uint8_t found = 0;
-
-  /* USER CODE BEGIN MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
-
-  /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
-
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
-
-  if (p_cm0plus_supprted_features_list != NULL)
-  {
-    cm0plus_nr_of_supported_features = p_cm0plus_supprted_features_list->Feat_Info_Cnt;
-
-    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
-    {
-      p_feature = i + p_cm0plus_supprted_features_list->Feat_Info_TableAddress;
-      if (p_feature->Feat_Info_Feature_Id == e_featID)
-      {
-        found = 1;
-        break;
-      }
-    }
-  }
-
-  if (!found)
-  {
-    Error_Handler();
-  }
-
-  /* USER CODE BEGIN MBMUXIF_SystemGetFeatCapabInfoPtr_Last */
-
-  /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_Last */
-  return  p_feature;
-}
-
-/**
-  * @brief Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @retval   0 ok, else error code
-  */
-int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
-{
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret = 0;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusRegistrationCmd_1 */
-
-  /* USER CODE END MBMUXIF_SystemSendCm0plusRegistrationCmd_1 */
-
-  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
-  if (com_obj != NULL)
-  {
-    com_obj->MsgId = SYS_REGISTER_FEATURE_MSG_ID;
-    com_buffer = com_obj->ParamBuf;
-    com_buffer[i++] = (uint32_t) e_featID;
-    com_obj->ParamCnt = i;
-    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
-    /* waiting for event */
-    /* once event is received and semaphore released: */
-    ret = com_obj->ReturnVal;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusRegistrationCmd_Last */
-
-  /* USER CODE END MBMUXIF_SystemSendCm0plusRegistrationCmd_Last */
-  return (int8_t) ret;
-}
-
-/* USER CODE BEGIN ExpoS */
-
-/* USER CODE END ExpoS */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM response callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_1 */
-
-  /* During "SystemInit sequence" Flag is used instead of Sequencer */
-  MbSystemRespRcvFlag = 1;
-  if (AllowSeqencerForSysCmd) /* To avoid using Sequencer during Init sequence */
-  {
-    UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
-  }
-  /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
-}
-
-/**
-  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_1 */
-  SystemComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
-}
-
-/**
-  * @brief  SYSTEM task to process the notification
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskSystemNotifRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskSystemNotifRcv_1 */
-  Process_Sys_Notif(SystemComObj);
-  /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
-}
-
-/**
-  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
-
-  /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
-}
-
-/**
-  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
-  UTIL_TIMER_IRQ_Handler();
-  /* clear the IPCC flag (necessary even if this Notif is not blocking */
-  MBMUXIF_SystemSendAck(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
-}
-
-/**
-  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
-
-  /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
-}
-
-/**
-  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
-
-  /* USER CODE END MBMUXIF_IsrSystemPrioBNotifRcvCb */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
deleted file mode 100644
index d6f9cc5c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_sys.h
-  * @author  MCD Application Team
-  * @brief   API for CM4 applic to handle the SYSTEM MBMUX channel
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_SYS_CM4_H__
-#define __MBMUXIF_SYS_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "mbmux.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions ------------------------------------------------------- */
-int8_t MBMUXIF_SystemInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
-int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
-void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void);
-void MBMUXIF_SystemAllowSequencerForSysCmd(void);
-void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
-void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-/* Exported services --------------------------------------------------------*/
-FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
-FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
-int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
-
-/* USER CODE BEGIN ExpoS */
-
-/* USER CODE END ExpoS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_SYS_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
deleted file mode 100644
index b42f9402..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_trace.c
-  * @author  MCD Application Team
-  * @brief   allows CM4 applic to receive by CM0 TRACE via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_trace.h"
-#include "mbmuxif_sys.h"
-#include "sys_app.h"
-#include "msg_id.h"
-#include "stm32_mem.h"
-#include "stm32_adv_trace.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_TraceInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_TraceInit_1 */
-
-  /* USER CODE END MBMUXIF_TraceInit_1 */
-
-  ret = MBMUX_RegisterFeature(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceNotifRcvCb, aTraceNotifAckBuff, sizeof(aTraceNotifAckBuff));
-  if (ret >= 0)
-  {
-    /* Note: trace works on ISR, no need to associate a SEQ_TASK */
-
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_TRACE_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  /* USER CODE BEGIN MBMUXIF_TraceInit_Last */
-
-  /* USER CODE END MBMUXIF_TraceInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Sends a Trace-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_TraceSendAck(void)
-{
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
-
-/* USER CODE END MBMUXIF_TraceSendAck_1 */
-  if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
-  {
-    Error_Handler();
-  }
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
-
-/* USER CODE END MBMUXIF_TraceSendAck_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
-{
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
-
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
-  MBMUX_ComParam_t *TraceComObj;
-  uint32_t  notif_ack_id;
-  uint8_t *buffer;
-  uint16_t bufsize;
-  UTIL_ADV_TRACE_Status_t ret;
-
-  TraceComObj = (MBMUX_ComParam_t *) ComObj;
-
-  notif_ack_id = TraceComObj->MsgId;
-
-  switch (notif_ack_id)
-  {
-    case TRACE_SEND_MSG_ID:
-      buffer = (uint8_t *) TraceComObj->ParamBuf[0];
-      bufsize = (uint16_t) TraceComObj->ParamBuf[1];
-      ret = UTIL_ADV_TRACE_Send(buffer, bufsize);
-      /* prepare ack buffer */
-      TraceComObj->ParamCnt = 0;
-      TraceComObj->ReturnVal = (uint32_t)ret;
-      break;
-
-    default:
-      break;
-  }
-
-  /* Send ack */
-  MBMUXIF_TraceSendAck();
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
-
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
deleted file mode 100644
index 7a8d3fa7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_trace.h
-  * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle TRACE via MBMUX
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_TRACE_CM4_H__
-#define __MBMUXIF_TRACE_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_TraceInit(void);
-void MBMUXIF_TraceSendAck(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_TRACE_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
deleted file mode 100644
index 1326f87b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
+++ /dev/null
@@ -1,1433 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    radio_mbwrapper.c
-  * @author  MCD Application Team
-  * @brief   This file implements the CM4 side wrapper of the Radio interface
-  *          shared between M0 and M4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "radio_mbwrapper.h"
-#include "radio.h"
-#include "mbmux.h"
-#include "msg_id.h"
-#include "mbmuxif_radio.h"
-#include "sys_app.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static RadioEvents_t   radioevents_wrap;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* **********************************************************************
- * Interrupts functions prototypes
- ************************************************************************/
-/*!
- * @brief Process radio irq
- */
-static void RadioIrqProcess(void);
-
-/* **********************************************************************
- * Middleware Interface functions prototypes
- ************************************************************************/
-/*!
- * \brief Initializes the radio
- *
- * \param [IN] events Structure containing the driver callback functions
- */
-static void RadioInit(RadioEvents_t *events);
-
-/*!
- * Return current radio status
- *
- * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
- */
-static RadioState_t RadioGetStatus(void);
-
-/*!
- * \brief Configures the radio with the given modem
- *
- * \param [IN] modem Modem to be used [0: FSK, 1: LoRa]
- */
-static void RadioSetModem(RadioModems_t modem);
-
-/*!
- * \brief Sets the channel frequency
- *
- * \param [IN] freq         Channel RF frequency
- */
-static void RadioSetChannel(uint32_t freq);
-
-/*!
-  * \brief Checks if the channel is free for the given time
-  *
-  * \param [IN] freq                Channel RF frequency in Hertz
-  * \param [IN] rxBandwidth         Rx bandwidth in Hertz
-  * \param [IN] rssiThresh          RSSI threshold in dBm
-  * \param [IN] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
-  *
-  * \retval isFree         [true: Channel is free, false: Channel is not free]
-  */
-static bool RadioIsChannelFree(uint32_t freq, uint32_t rxBandwidth,
-                               int16_t rssiThresh, uint32_t maxCarrierSenseTime);
-
-/*!
- * \brief Generates a 32 bits random value based on the RSSI readings
- *
- * \remark This function sets the radio in LoRa modem mode and disables
- *         all interrupts.
- *         After calling this function either Radio.SetRxConfig or
- *         Radio.SetTxConfig functions must be called.
- *
- * \retval randomValue    32 bits random value
- */
-static uint32_t RadioRandom(void);
-
-/*!
- * \brief Sets the reception parameters
- *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
- *                          FSK : >= 2600 and <= 250000 Hz
- *                          LoRa: [0: 125 kHz, 1: 250 kHz,
- *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
- *                          FSK : 600..300000 bits/s
- *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
- *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only)
- *                          FSK : >= 2600 and <= 250000 Hz
- *                          LoRa: N/A ( set to 0 )
- * \param [IN] preambleLen  Sets the Preamble length
- *                          FSK : Number of bytes
- *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
- *                          FSK : timeout in number of bytes
- *                          LoRa: timeout in symbols
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] rxContinuous Sets the reception in continuous mode
- *                          [false: single mode, true: continuous mode]
- */
-static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
-                             uint32_t datarate, uint8_t coderate,
-                             uint32_t bandwidthAfc, uint16_t preambleLen,
-                             uint16_t symbTimeout, bool fixLen,
-                             uint8_t payloadLen,
-                             bool crcOn, bool FreqHopOn, uint8_t HopPeriod,
-                             bool iqInverted, bool rxContinuous);
-
-/*!
- * \brief Sets the transmission parameters
- *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] fdev         Sets the frequency deviation (FSK only)
- *                          FSK : [Hz]
- *                          LoRa: 0
- * \param [IN] bandwidth    Sets the bandwidth (LoRa only)
- *                          FSK : 0
- *                          LoRa: [0: 125 kHz, 1: 250 kHz,
- *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
- *                          FSK : 600..300000 bits/s
- *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
- *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the preamble length
- *                          FSK : Number of bytes
- *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] crcOn        Enables disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] timeout      Transmission timeout [ms]
- */
-static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
-                             uint32_t bandwidth, uint32_t datarate,
-                             uint8_t coderate, uint16_t preambleLen,
-                             bool fixLen, bool crcOn, bool FreqHopOn,
-                             uint8_t HopPeriod, bool iqInverted, uint32_t timeout);
-
-/*!
- * \brief Checks if the given RF frequency is supported by the hardware
- *
- * \param [IN] frequency RF frequency to be checked
- * \retval isSupported [true: supported, false: unsupported]
- */
-static bool RadioCheckRfFrequency(uint32_t frequency);
-
-/*!
- * \brief Computes the packet time on air in ms for the given payload
- *
- * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
- *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
- *                          FSK : >= 2600 and <= 250000 Hz
- *                          LoRa: [0: 125 kHz, 1: 250 kHz,
- *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] spreadingFactor  Sets the Spreading Factor
- *                          FSK : 600..300000 bits/s
- *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
- *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
- *                          FSK : N/A ( set to 0 )
- *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
- *                          FSK : Number of bytes
- *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- *
- * \retval airTime        Computed airTime (ms) for the given packet payload length
- */
-static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
-                                  uint32_t spreadingFactor, uint8_t coderate,
-                                  uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
-                                  bool crcOn);
-
-/*!
- * \brief Sends the buffer of size. Prepares the packet to be sent and sets
- *        the radio in transmission
- *
- * \param [IN]: buffer     Buffer pointer
- * \param [IN]: size       Buffer size
- */
-static void RadioSend(uint8_t *buffer, uint8_t size);
-
-/*!
- * \brief Sets the radio in sleep mode
- */
-static void RadioSleep(void);
-
-/*!
- * \brief Sets the radio in standby mode
- */
-static void RadioStandby(void);
-
-/*!
- * \brief Sets the radio in reception mode for the given time
- * \param [IN] timeout Reception timeout [ms]
- *                     [0: continuous, others timeout]
- */
-static void RadioRx(uint32_t timeout);
-
-/*!
- * \brief Start a Channel Activity Detection
- */
-static void RadioStartCad(void);
-
-/*!
- * \brief Sets the radio in continuous wave transmission mode
- *
- * \param [IN]: freq       Channel RF frequency
- * \param [IN]: power      Sets the output power [dBm]
- * \param [IN]: time       Transmission mode timeout [s]
- */
-static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
-
-/*!
- * \brief Reads the current RSSI value
- *
- * \retval rssiValue Current RSSI value in [dBm]
- */
-static int16_t RadioRssi(RadioModems_t modem);
-
-/*!
- * \brief Writes the radio register at the specified address
- *
- * \param [IN]: addr Register address
- * \param [IN]: data New register value
- */
-static void RadioWrite(uint16_t addr, uint8_t data);
-
-/*!
- * \brief Reads the radio register at the specified address
- *
- * \param [IN]: addr Register address
- * \retval data Register value
- */
-static uint8_t RadioRead(uint16_t addr);
-
-/*!
- * \brief Writes multiple radio registers starting at address
- *
- * \param [IN] addr   First Radio register address
- * \param [IN] buffer Buffer containing the new register's values
- * \param [IN] size   Number of registers to be written
- */
-static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
-
-/*!
- * \brief Reads multiple radio registers starting at address
- *
- * \param [IN] addr First Radio register address
- * \param [OUT] buffer Buffer where to copy the registers data
- * \param [IN] size Number of registers to be read
- */
-static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
-
-/*!
- * \brief Sets the maximum payload length.
- *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] max        Maximum payload length in bytes
- */
-static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
-
-/*!
- * \brief Sets the network to public or private. Updates the sync byte.
- *
- * \remark Applies to LoRa modem only
- *
- * \param [IN] enable if true, it enables a public network
- */
-static void RadioSetPublicNetwork(bool enable);
-
-/*!
- * \brief Gets the time required for the board plus radio to get out of sleep.[ms]
- *
- * \retval time Radio plus board wakeup time in ms.
- */
-static uint32_t RadioGetWakeUpTime(void);
-
-/*!
- * \brief Sets the radio in reception mode with Max LNA gain for the given time
- * \param [IN] timeout Reception timeout [ms]
- *                     [0: continuous, others timeout]
- */
-static void RadioRxBoosted(uint32_t timeout);
-
-/*!
- * \brief Sets the Rx duty cycle management parameters
- *
- * \param [in]  rxTime        Structure describing reception timeout value
- * \param [in]  sleepTime     Structure describing sleep timeout value
- */
-static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
-
-/*!
- * \brief Set Tx PRBS modulated wave
- * \retval none
- */
-static void RadioTxPrbs(void);
-
-/*!
- * \brief Set Tx continuous wave
- * \param [in]  power  Tx power level [0..15]
- * \retval none
- */
-static void RadioTxCw(int8_t power);
-
-/*!
- * \brief Sets the reception parameters
- *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
- * \param [IN] config       configuration of receiver
- *                          fsk field to be used if modem =GENERIC_FSK
-*                           lora field to be used if modem =GENERIC_LORA
- * \param [IN] rxContinuous Sets the reception in continuous mode
- *                          [0: single mode, otherwise continuous mode]
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
- *                          FSK : timeout in number of bytes
- *                          LoRa: timeout in symbols
- * \return 0 when no parameters error, -1 otherwise
- */
-static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t* config,
-                                       uint32_t rxContinuous, uint32_t symbTimeout);
-
-/*!
- * \brief Sets the transmission parameters
- *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
- * \param [IN] config       configuration of receiver
- *                          fsk field to be used if modem =GENERIC_FSK
-*                           lora field to be used if modem =GENERIC_LORA
-                            bpsk field to be used if modem =GENERIC_BPSK
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] timeout      Transmission timeout [ms]
- * \return 0 when no parameters error, -1 otherwise
- */
-static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
-                                       int8_t power, uint32_t timeout);
-
-/*
-* Private global constants
-*/
-
-/*!
- * Radio driver structure initialization
- */
-const struct Radio_s Radio =
-{
-  RadioInit,
-  RadioGetStatus,
-  RadioSetModem,
-  RadioSetChannel,
-  RadioIsChannelFree,
-  RadioRandom,
-  RadioSetRxConfig,
-  RadioSetTxConfig,
-  RadioCheckRfFrequency,
-  RadioGetTimeOnAir,
-  RadioSend,
-  RadioSleep,
-  RadioStandby,
-  RadioRx,
-  RadioStartCad,
-  RadioSetTxContinuousWave,
-  RadioRssi,
-  RadioWrite,
-  RadioRead,
-  RadioWriteRegisters,
-  RadioReadRegisters,
-  RadioSetMaxPayloadLength,
-  RadioSetPublicNetwork,
-  RadioGetWakeUpTime,
-  RadioIrqProcess,
-  RadioRxBoosted,
-  RadioSetRxDutyCycle,
-  RadioTxPrbs,
-  RadioTxCw,
-  RadioSetRxGenericConfig,
-  RadioSetTxGenericConfig,
-};
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-/**
-  * @brief This function processes the radio events callbacks  from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
-void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
-{
-  /* USER CODE BEGIN Process_Radio_Notif_1 */
-
-  /* USER CODE END Process_Radio_Notif_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;
-  /* Radio Notif received */
-  APP_LOG(TS_ON, VLEVEL_H, "CM4<(Radio)\r\n");
-
-  /* process Command */
-  switch (ComObj->MsgId)
-  {
-    /* callbacks */
-    case RADIO_TX_DONE_CB_ID:
-      if (radioevents_wrap.TxDone != NULL)
-      {
-        radioevents_wrap.TxDone();
-      }
-      else
-      {
-        while (1) {}
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  0; /* */
-      break;
-
-    case RADIO_TX_TIMEOUT_CB_ID:
-      if (radioevents_wrap.TxTimeout != NULL)
-      {
-        radioevents_wrap.TxTimeout();
-      }
-      else
-      {
-        while (1) {}
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  0; /* */
-      break;
-
-    case RADIO_RX_DONE_CB_ID:
-      if (radioevents_wrap.RxDone != NULL)
-      {
-        radioevents_wrap.RxDone((uint8_t *) com_buffer[0], (uint16_t) com_buffer[1], (int16_t) com_buffer[2],
-                                (int8_t) com_buffer[3]);
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  0; /* */
-      break;
-
-    case RADIO_RX_TIMEOUT_CB_ID:
-      if (radioevents_wrap.RxTimeout != NULL)
-      {
-        radioevents_wrap.RxTimeout();
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  0; /* */
-      break;
-
-    case RADIO_RX_ERROR_CB_ID:
-      if (radioevents_wrap.RxError != NULL)
-      {
-        radioevents_wrap.RxError();
-      }
-      /* prepare response buffer */
-      ComObj->ParamCnt = 0; /* reset ParamCnt */
-      ComObj->ReturnVal =  0; /* */
-      break;
-
-    default:
-      break;
-  }
-
-  /* Radio sending ack */
-  APP_LOG(TS_ON, VLEVEL_H, "CM4>(Radio)\r\n");
-  MBMUX_AcknowledgeSnd(FEAT_INFO_RADIO_ID);
-  /* USER CODE BEGIN Process_Radio_Notif_2 */
-
-  /* USER CODE END Process_Radio_Notif_2 */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void RadioInit(RadioEvents_t *events)
-{
-  /* USER CODE BEGIN RadioInit_1 */
-
-  /* USER CODE END RadioInit_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  if (events == NULL)
-  {
-    while (1) {}
-  }
-
-  radioevents_wrap.TxDone = events->TxDone;
-  radioevents_wrap.TxTimeout = events->TxTimeout;
-  radioevents_wrap.RxDone = events->RxDone;
-  radioevents_wrap.RxTimeout = events->RxTimeout;
-  radioevents_wrap.RxError = events->RxError;
-  radioevents_wrap.FhssChangeChannel = events->FhssChangeChannel;
-  radioevents_wrap.CadDone = events->CadDone;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_INIT_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioInit_2 */
-
-  /* USER CODE END RadioInit_2 */
-}
-
-/*!
-  * Return current radio status
-  *
-  * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
-  */
-static RadioState_t RadioGetStatus(void)
-{
-  /* USER CODE BEGIN RadioGetStatus_1 */
-
-  /* USER CODE END RadioGetStatus_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_GET_STATUS_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (RadioState_t) ret;
-  /* USER CODE BEGIN RadioGetStatus_2 */
-
-  /* USER CODE END RadioGetStatus_2 */
-}
-
-static void RadioSetModem(RadioModems_t modem)
-{
-  /* USER CODE BEGIN RadioSetModem_1 */
-
-  /* USER CODE END RadioSetModem_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_MODEM_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) modem;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioSetModem_2 */
-
-  /* USER CODE END RadioSetModem_2 */
-}
-
-static void RadioSetChannel(uint32_t freq)
-{
-  /* USER CODE BEGIN RadioSetChannel_1 */
-
-  /* USER CODE END RadioSetChannel_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_CHANNEL_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) freq;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioSetChannel_2 */
-
-  /* USER CODE END RadioSetChannel_2 */
-}
-
-static bool RadioIsChannelFree(uint32_t freq, uint32_t rxBandwidth, int16_t rssiThresh, uint32_t maxCarrierSenseTime)
-{
-  /* USER CODE BEGIN RadioIsChannelFree_1 */
-
-  /* USER CODE END RadioIsChannelFree_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_IS_CHANNEL_FREE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) freq;
-  com_buffer[i++] = (uint32_t) rxBandwidth;
-  com_buffer[i++] = (uint32_t) rssiThresh;
-  com_buffer[i++] = (uint32_t) maxCarrierSenseTime;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (bool) ret;
-  /* USER CODE BEGIN RadioIsChannelFree_2 */
-
-  /* USER CODE END RadioIsChannelFree_2 */
-}
-
-static uint32_t RadioRandom(void)
-{
-  /* USER CODE BEGIN RadioRandom_1 */
-
-  /* USER CODE END RadioRandom_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_RANDOM_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (uint32_t) ret;
-  /* USER CODE BEGIN RadioRandom_2 */
-
-  /* USER CODE END RadioRandom_2 */
-}
-
-static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
-                             uint32_t datarate, uint8_t coderate,
-                             uint32_t bandwidthAfc, uint16_t preambleLen,
-                             uint16_t symbTimeout, bool fixLen,
-                             uint8_t payloadLen,
-                             bool crcOn, bool freqHopOn, uint8_t hopPeriod,
-                             bool iqInverted, bool rxContinuous)
-{
-  /* USER CODE BEGIN RadioSetRxConfig_1 */
-
-  /* USER CODE END RadioSetRxConfig_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_RX_CONFIG_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) modem;
-  com_buffer[i++] = (uint32_t) bandwidth;
-  com_buffer[i++] = (uint32_t) datarate;
-  com_buffer[i++] = (uint32_t) coderate;
-  com_buffer[i++] = (uint32_t) bandwidthAfc;
-  com_buffer[i++] = (uint32_t) preambleLen;
-  com_buffer[i++] = (uint32_t) symbTimeout;
-  com_buffer[i++] = (uint32_t) fixLen;
-  com_buffer[i++] = (uint32_t) payloadLen;
-  com_buffer[i++] = (uint32_t) crcOn;
-  com_buffer[i++] = (uint32_t) freqHopOn;
-  com_buffer[i++] = (uint32_t) hopPeriod;
-  com_buffer[i++] = (uint32_t) iqInverted;
-  com_buffer[i++] = (uint32_t) rxContinuous;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioSetRxConfig_2 */
-
-  /* USER CODE END RadioSetRxConfig_2 */
-}
-
-static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
-                             uint32_t bandwidth, uint32_t datarate,
-                             uint8_t coderate, uint16_t preambleLen,
-                             bool fixLen, bool crcOn, bool freqHopOn,
-                             uint8_t hopPeriod, bool iqInverted, uint32_t timeout)
-{
-  /* USER CODE BEGIN RadioSetTxConfig_1 */
-
-  /* USER CODE END RadioSetTxConfig_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_CONFIG_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) modem;
-  com_buffer[i++] = (uint32_t) power;
-  com_buffer[i++] = (uint32_t) fdev;
-  com_buffer[i++] = (uint32_t) bandwidth;
-  com_buffer[i++] = (uint32_t) datarate;
-  com_buffer[i++] = (uint32_t) coderate;
-  com_buffer[i++] = (uint32_t) preambleLen;
-  com_buffer[i++] = (uint32_t) fixLen;
-  com_buffer[i++] = (uint32_t) crcOn;
-  com_buffer[i++] = (uint32_t) freqHopOn;
-  com_buffer[i++] = (uint32_t) hopPeriod;
-  com_buffer[i++] = (uint32_t) iqInverted;
-  com_buffer[i++] = (uint32_t) timeout;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioSetTxConfig_2 */
-
-  /* USER CODE END RadioSetTxConfig_2 */
-}
-
-static bool RadioCheckRfFrequency(uint32_t frequency)
-{
-  /* USER CODE BEGIN RadioCheckRfFrequency_1 */
-
-  /* USER CODE END RadioCheckRfFrequency_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_CHECK_RF_FREQUENCY_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) frequency;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (bool) ret;
-  /* USER CODE BEGIN RadioCheckRfFrequency_2 */
-
-  /* USER CODE END RadioCheckRfFrequency_2 */
-}
-
-static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
-                                  uint32_t spreadingFactor, uint8_t coderate,
-                                  uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
-                                  bool crcOn)
-{
-  /* USER CODE BEGIN RadioGetTimeOnAir_1 */
-
-  /* USER CODE END RadioGetTimeOnAir_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_GET_TIME_ON_AIR_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) modem;
-  com_buffer[i++] = (uint32_t) bandwidth;
-  com_buffer[i++] = (uint32_t) spreadingFactor;
-  com_buffer[i++] = (uint32_t) coderate;
-  com_buffer[i++] = (uint32_t) preambleLen;
-  com_buffer[i++] = (uint32_t) fixLen;
-  com_buffer[i++] = (uint32_t) payloadLen;
-  com_buffer[i++] = (uint32_t) crcOn;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (uint32_t) ret;
-  /* USER CODE BEGIN RadioGetTimeOnAir_2 */
-
-  /* USER CODE END RadioGetTimeOnAir_2 */
-}
-
-static void RadioSend(uint8_t *buffer, uint8_t size)
-{
-  /* USER CODE BEGIN RadioSend_1 */
-
-  /* USER CODE END RadioSend_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SEND_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) buffer;
-  com_buffer[i++] = (uint32_t) size;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioSend_2 */
-
-  /* USER CODE END RadioSend_2 */
-}
-
-static void RadioSleep(void)
-{
-  /* USER CODE BEGIN RadioSleep_1 */
-
-  /* USER CODE END RadioSleep_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SLEEP_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioSleep_2 */
-
-  /* USER CODE END RadioSleep_2 */
-}
-
-static void RadioStandby(void)
-{
-  /* USER CODE BEGIN RadioStandby_1 */
-
-  /* USER CODE END RadioStandby_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_STANDBY_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioStandby_2 */
-
-  /* USER CODE END RadioStandby_2 */
-}
-
-static void RadioRx(uint32_t timeout)
-{
-  /* USER CODE BEGIN RadioRx_1 */
-
-  /* USER CODE END RadioRx_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_RX_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) timeout;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioRx_2 */
-
-  /* USER CODE END RadioRx_2 */
-}
-
-static void RadioStartCad(void)
-{
-  /* USER CODE BEGIN RadioStartCad_1 */
-
-  /* USER CODE END RadioStartCad_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_START_CAD_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioStartCad_2 */
-
-  /* USER CODE END RadioStartCad_2 */
-}
-
-static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
-{
-  /* USER CODE BEGIN RadioSetTxContinuousWave_1 */
-
-  /* USER CODE END RadioSetTxContinuousWave_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_CONTINOUS_WAVE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) freq;
-  com_buffer[i++] = (uint32_t) power;
-  com_buffer[i++] = (uint32_t) time;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioSetTxContinuousWave_2 */
-
-  /* USER CODE END RadioSetTxContinuousWave_2 */
-}
-
-static int16_t RadioRssi(RadioModems_t modem)
-{
-  /* USER CODE BEGIN RadioRssi_1 */
-
-  /* USER CODE END RadioRssi_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_RSSI_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) modem;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (int16_t) ret;
-  /* USER CODE BEGIN RadioRssi_2 */
-
-  /* USER CODE END RadioRssi_2 */
-}
-
-static void RadioWrite(uint16_t addr, uint8_t data)
-{
-  /* USER CODE BEGIN RadioWrite_1 */
-
-  /* USER CODE END RadioWrite_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_WRITE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) addr;
-  com_buffer[i++] = (uint32_t) data;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioWrite_2 */
-
-  /* USER CODE END RadioWrite_2 */
-}
-
-static uint8_t RadioRead(uint16_t addr)
-{
-  /* USER CODE BEGIN RadioRead_1 */
-
-  /* USER CODE END RadioRead_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_READ_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) addr;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (uint8_t) ret;
-  /* USER CODE BEGIN RadioRead_2 */
-
-  /* USER CODE END RadioRead_2 */
-}
-
-static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size)
-{
-  /* USER CODE BEGIN RadioWriteRegisters_1 */
-
-  /* USER CODE END RadioWriteRegisters_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_WRITE_BUFFER_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) addr;
-  com_buffer[i++] = (uint32_t) buffer;
-  com_buffer[i++] = (uint32_t) size;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioWriteRegisters_2 */
-
-  /* USER CODE END RadioWriteRegisters_2 */
-}
-
-static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size)
-{
-  /* USER CODE BEGIN RadioReadRegisters_1 */
-
-  /* USER CODE END RadioReadRegisters_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_READ_BUFFER_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) addr;
-  com_buffer[i++] = (uint32_t) buffer;
-  com_buffer[i++] = (uint32_t) size;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioReadRegisters_2 */
-
-  /* USER CODE END RadioReadRegisters_2 */
-}
-
-static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max)
-{
-  /* USER CODE BEGIN RadioSetMaxPayloadLength_1 */
-
-  /* USER CODE END RadioSetMaxPayloadLength_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_MAX_PAYLOAD_LENGTH_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) modem;
-  com_buffer[i++] = (uint32_t) max;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioSetMaxPayloadLength_2 */
-
-  /* USER CODE END RadioSetMaxPayloadLength_2 */
-}
-
-static void RadioSetPublicNetwork(bool enable)
-{
-  /* USER CODE BEGIN RadioSetPublicNetwork_1 */
-
-  /* USER CODE END RadioSetPublicNetwork_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_PUBLIC_NETWORK_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) enable;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioSetPublicNetwork_2 */
-
-  /* USER CODE END RadioSetPublicNetwork_2 */
-}
-
-static uint32_t RadioGetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RadioGetWakeUpTime_1 */
-
-  /* USER CODE END RadioGetWakeUpTime_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_GET_WAKEUP_TIME_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (uint32_t) ret;
-  /* USER CODE BEGIN RadioGetWakeUpTime_2 */
-
-  /* USER CODE END RadioGetWakeUpTime_2 */
-}
-
-static void RadioIrqProcess(void)
-{
-  /* USER CODE BEGIN RadioIrqProcess_1 */
-
-  /* USER CODE END RadioIrqProcess_1 */
-  MBMUX_ComParam_t *com_obj;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_IRQ_PROCESS_ID;
-  com_obj->ParamCnt = 0;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return;
-  /* USER CODE BEGIN RadioIrqProcess_2 */
-
-  /* USER CODE END RadioIrqProcess_2 */
-}
-
-static void RadioRxBoosted(uint32_t timeout)
-{
-  /* USER CODE BEGIN RadioRxBoosted_1 */
-
-  /* USER CODE END RadioRxBoosted_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_RX_BOOSTED_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) timeout;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioRxBoosted_2 */
-
-  /* USER CODE END RadioRxBoosted_2 */
-}
-
-static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime)
-{
-  /* USER CODE BEGIN RadioSetRxDutyCycle_1 */
-
-  /* USER CODE END RadioSetRxDutyCycle_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_RX_DUTY_CYCLE_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) rxTime;
-  com_buffer[i++] = (uint32_t) sleepTime;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioSetRxDutyCycle_2 */
-
-  /* USER CODE END RadioSetRxDutyCycle_2 */
-}
-
-static void RadioTxPrbs(void)
-{
-  /* USER CODE BEGIN RadioTxPrbs_1 */
-
-  /* USER CODE END RadioTxPrbs_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_TX_PRBS_ID;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioTxPrbs_2 */
-
-  /* USER CODE END RadioTxPrbs_2 */
-}
-
-static void RadioTxCw(int8_t power)
-{
-  /* USER CODE BEGIN RadioTxCw_1 */
-
-  /* USER CODE END RadioTxCw_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_TX_CW_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) power;
-  com_obj->ParamCnt = i;
-  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
-  {
-    Error_Handler();
-  }
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  return ;
-  /* USER CODE BEGIN RadioTxCw_2 */
-
-  /* USER CODE END RadioTxCw_2 */
-}
-
-static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config, uint32_t rxContinuous,
-                                       uint32_t symbTimeout)
-{
-  /* USER CODE BEGIN RadioSetRxGenericConfig_1 */
-
-  /* USER CODE END RadioSetRxGenericConfig_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer;
-  uint32_t ret;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_RX_GENERIC_CONFIG_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) modem;
-  com_buffer[i++] = (uint32_t) config;
-  com_buffer[i++] = (uint32_t) rxContinuous;
-  com_buffer[i++] = (uint32_t) symbTimeout;
-  com_obj->ParamCnt = i;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN RadioSetRxGenericConfig_2 */
-
-  /* USER CODE END RadioSetRxGenericConfig_2 */
-}
-
-static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config, int8_t power, uint32_t timeout)
-{
-  /* USER CODE BEGIN RadioSetTxGenericConfig_1 */
-
-  /* USER CODE END RadioSetTxGenericConfig_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
-  uint32_t ret;
-  uint16_t i = 0;
-
-  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_GENERIC_CONFIG_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) modem;
-  com_buffer[i++] = (uint32_t) config;
-  com_buffer[i++] = (uint32_t) power;
-  com_buffer[i++] = (uint32_t) timeout;
-  com_obj->ParamCnt = i;
-  MBMUXIF_RadioSendCmd();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (int32_t) ret;
-  /* USER CODE BEGIN RadioSetTxGenericConfig_2 */
-
-  /* USER CODE END RadioSetTxGenericConfig_2 */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/**
-  * @}
-  *
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
deleted file mode 100644
index f73a1283..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    radio_mbwrapper.h
-  * @author  MCD Application Team
-  * @brief   This file implements the CM4 side wrapper of the Radio interface
-  *          shared between M0 and M4.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __RADIO_MBWRAPPER_CM4_H__
-#define __RADIO_MBWRAPPER_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux_table.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__RADIO_MBWRAPPER_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.h
deleted file mode 100644
index 8cf7f3ed..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/board_resources.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON1_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON3_EXTI_IRQn              EXTI15_4_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 0390fb82..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/**
-  * COM usage define
-  */
-#define USE_BSP_COM_FEATURE                 0U
-
-/**
-  * COM log define
-  */
-#define USE_COM_LOG                         0U
-
-/**
-  * IRQ priorities
-  */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     10U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
deleted file mode 100644
index f03a3e85..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    features_info.h
-  * @author  MCD Application Team
-  * @brief   Feature list and parameters TypeDefinitions
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SYSTEM_INFO_H
-#define __SYSTEM_INFO_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-
-/**
-  * @brief Feature enumeration
-  * @note This is the list of all available feature so far,
-          the one available in a fiven build are listed in the Feat_Info_Table[]
-          to keep compatibility, in order to add a feature
-          use a new value to the bottom without changing the existing order
-  */
-typedef enum
-{
-  FEAT_INFO_SYSTEM_ID = 0,
-  FEAT_INFO_SYSTEM_CMD_PRIO_A_ID,    /* = 1 : position should not change between revisions */
-  FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID, /* = 2 : position should not change between revisions */
-  FEAT_INFO_SYSTEM_CMD_PRIO_B_ID,  /* = 3 : position should not change between revisions */
-  FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID,  /* = 4 : position should not change between revisions */
-  FEAT_INFO_KMS_ID,  /* = 5 : position should not change between revisions */
-  FEAT_INFO_TRACE_ID,  /* = 6 : position should not change between revisions */
-  FEAT_INFO_RADIO_ID,  /* = 7 : position should not change between revisions */
-  FEAT_INFO_LORAWAN_ID,  /* = 8 : position should not change between revisions */
-  FEAT_INFO_SIGFOX_ID,  /* = 9 : position should not change between revisions */
-  FEAT_INFO_WMBUS_ID,  /* = 10 : position should not change between revisions */
-  /* USER CODE BEGIN FEAT_INFO_IdTypeDef */
-
-  /* USER CODE END FEAT_INFO_IdTypeDef */
-  FEAT_INFO_CNT
-} FEAT_INFO_IdTypeDef;
-
-/**
-  * @brief Feature parameters
-  */
-typedef struct
-{
-  FEAT_INFO_IdTypeDef Feat_Info_Feature_Id;
-  uint32_t Feat_Info_Feature_Version;
-  uint32_t Feat_Info_Config_Size;
-  void *Feat_Info_Config_Ptr;
-} FEAT_INFO_Param_t;
-
-/**
-  * @brief Feature List
-  */
-typedef struct
-{
-  uint32_t Feat_Info_Cnt;
-  FEAT_INFO_Param_t *Feat_Info_TableAddress;
-} FEAT_INFO_List_t;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-#define MAX_PARAM_OF_SYS_CMD_FUNCTIONS           7 /*!< Max number of parameters that the sys_cmd can use */
-#define MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS         5 /*!< Max number of parameters that the sys_notif can use */
-#define MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS     1 /*!< Max number of parameters that the sysA_cmd can use */
-#define MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS   1 /*!< Max number of parameters that the sysA_notif can use */
-#define MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS     1 /*!< Max number of parameters that the sysB_cmd can use */
-#define MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS   1 /*!< Max number of parameters that the sysB_notif can use */
-
-#define MAX_PARAM_OF_KMS_CMD_FUNCTIONS          12 /*!< Max number of parameters that the kms can use */
-#define MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS      11 /*!< Max number of parameters that the trace can use */
-#define MAX_PARAM_OF_RADIO_CMD_FUNCTIONS        15 /*!< Max number of parameters that the radio_cmd can use */
-#define MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS       4 /*!< Max number of parameters that the radio_notif can use */
-#define MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS      15 /*!< Max number of parameters that the lorawan_cmd can use */
-#define MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS     5 /*!< Max number of parameters that the lorawan_notif can use */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions ------------------------------------------------------- */
-/**
-  * @brief  Init configuration params by calling specific feature xxx_info.c
-  * @return void
-  */
-void FEAT_INFO_Init(void);
-/**
-  * @brief  Get the feature list ptr
-  * @return address of Feat_Info_List available in shared memory
-  */
-FEAT_INFO_List_t *FEAT_INFO_GetListPtr(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SYSTEM_INFO_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
deleted file mode 100644
index 92abccde..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    lora_info.h
-  * @author  MCD Application Team
-  * @brief   To give info to the application about LoRaWAN configuration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-#ifndef __LORA_INFO_H__
-#define __LORA_INFO_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported constants --------------------------------------------------------*/
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported types ------------------------------------------------------------*/
-/*!
- * To give info to the application about LoraWAN capability
- * it can depend how it has been compiled (e.g. compiled regions ...)
- * Params should be better uint32_t foe easier alignment with info_table concept
- */
-typedef struct
-{
-  uint32_t ActivationMode;  /*!< 1: ABP, 2 : OTAA, 3: ABP & OTAA   */
-  uint32_t Region;   /*!< Combination of regions compiled on MW  */
-  uint32_t ClassB;   /*!< 0: not compiled in Mw, 1 : compiled in MW  */
-  uint32_t Kms;      /*!< 0: not compiled in Mw, 1 : compiled in MW  */
-} LoraInfo_t;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* External variables --------------------------------------------------------*/
-
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macros -----------------------------------------------------------*/
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions ------------------------------------------------------- */
-/**
-  * @brief initialises the LoraInfo table
-  * @param none
-  * @retval  none
-  */
-void LoraInfo_Init(void);
-
-/**
-  * @brief returns the pointer to the LoraInfo capabilities table
-  * @param none
-  * @retval LoraInfo pointer
-  */
-LoraInfo_t *LoraInfo_GetPtr(void);
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __LORA_INFO_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
deleted file mode 100644
index 2874d9de..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmux_table.h
-  * @author  MCD Application Team
-  * @brief   Maps the IPCC channels to memory buffers
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUX_TABLE_H__
-#define __MBMUX_TABLE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal_ipcc.h"
-#include "features_info.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported constants --------------------------------------------------------*/
-#define  MBMUX_CHANNEL_NUMBER  IPCC_CHANNEL_NUMBER
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported types ------------------------------------------------------------*/
-
-typedef enum
-{
-  MBMUX_CMD_RESP  = 0x00U,  /*!< Channel direction Tx is used by an MCU to transmit */
-  MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
-} MBMUX_ComType_t;
-
-typedef struct
-{
-  uint32_t MsgId;
-  void (*MsgCm4Cb)(void *ComObj);
-  void (*MsgCm0plusCb)(void *ComObj);
-  uint16_t BufSize;      /*!<  size of the array given by the applic */
-  uint16_t ParamCnt;     /*!<  nr of words composing the message */
-  uint32_t *ParamBuf;
-  uint32_t ReturnVal;    /*!<  only used in RX */
-} MBMUX_ComParam_t;
-
-typedef struct
-{
-  MBMUX_ComParam_t        MBCmdRespParam[MBMUX_CHANNEL_NUMBER];
-  MBMUX_ComParam_t        MBNotifAckParam[MBMUX_CHANNEL_NUMBER];
-  uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
-  __IO uint16_t           SynchronizeCpusAtBoot;
-  uint16_t                ChipRevId;
-} MBMUX_ComTable_t;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MBMUX_TABLE_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
deleted file mode 100644
index 74a0a3cc..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    msg_id.h
-  * @author  MCD Application Team
-  * @brief   MBMUX message ID enumeration
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MSG_ID_H__
-#define __MSG_ID_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-
-typedef enum
-{
-  /* CmdResp */
-  SYS_GET_INFO_LIST_MSG_ID = 0,
-  SYS_REGISTER_FEATURE_MSG_ID,
-  /* NotifAck */
-  SYS_RTC_ALARM_MSG_ID,
-  SYS_OTHER_MSG_ID,
-  /* USER CODE BEGIN SYSTEM_MsgIdTypeDef */
-
-  /* USER CODE END SYSTEM_MsgIdTypeDef */
-  SYS_MSGID_LAST
-} SYSTEM_MsgIdTypeDef;
-
-typedef enum
-{
-  /* CmdResp */
-  LMHANDLER_INITIALIZATION_ID = 0,
-  LMHANDLER_CONFIGURE_ID,
-  LMHANDLER_JOIN_STATUS_ID,
-  LMHANDLER_JOIN_ID,
-  LMHANDLER_STOP_ID,
-  LMHANDLER_SEND_ID,
-  LMHANDLER_PROCESS_ID,
-  LMHANDLER_REQUEST_CLASS_ID,
-  LMHANDLER_GET_CLASS_ID,
-  LMHANDLER_GET_DEVEUI_ID,
-  LMHANDLER_SET_DEVEUI_ID,
-  LMHANDLER_GET_APPEUI_ID,
-  LMHANDLER_SET_APPEUI_ID,
-  LMHANDLER_GET_NWKID_ID,
-  LMHANDLER_SET_NWKID_ID,
-  LMHANDLER_GET_DEVADDR_ID,
-  LMHANDLER_SET_DEVADDR_ID,
-  LMHANDLER_GET_ACTIVE_REGION_ID,
-  LMHANDLER_SET_ACTIVE_REGION_ID,
-  LMHANDLER_GET_ADR_ENABLE_ID,
-  LMHANDLER_SET_ADR_ENABLE_ID,
-  LMHANDLER_GET_TX_DATARATE_ID,
-  LMHANDLER_SET_TX_DATARATE_ID,
-  LMHANDLER_GET_DUTY_CYCLE_ID,
-  LMHANDLER_SET_DUTY_CYCLE_ID,
-  LMHANDLER_GET_RX2_PARAMS_ID,
-  LMHANDLER_GET_TX_PWR_ID,
-  LMHANDLER_GET_RX1_DELAY_ID,
-  LMHANDLER_GET_RX2_DELAY_ID,
-  LMHANDLER_GET_JOIN_RX1_DELAY_ID,
-  LMHANDLER_GET_JOIN_RX2_DELAY_ID,
-  LMHANDLER_SET_TX_PWR_ID,
-  LMHANDLER_SET_RX2_PARAMS_ID,
-  LMHANDLER_SET_RX1_DELAY_ID,
-  LMHANDLER_SET_RX2_DELAY_ID,
-  LMHANDLER_SET_JOIN_RX1_DELAY_ID,
-  LMHANDLER_SET_JOIN_RX2_DELAY_ID,
-  LMHANDLER_GET_PING_PERIODICITY_ID,
-  LMHANDLER_SET_PING_PERIODICITY_ID,
-  LMHANDLER_GET_BEACON_STATE_ID,
-
-  LMHANDLER_INFO_INIT_ID,
-  /* NotifAck */
-  LMHANDLER_GET_BATTERY_LEVEL_CB_ID,
-  LMHANDLER_GET_TEMPERATURE_CB_ID,
-  LMHANDLER_ON_JOIN_REQ_CB_ID,
-  LMHANDLER_ON_TX_DATA_CB_ID,
-  LMHANDLER_ON_RX_DATA_CB_ID,
-  LMHANDLER_ON_MAC_PROCESS_CB_ID,
-  /* USER CODE BEGIN LORA_MsgIdTypeDef */
-
-  /* USER CODE END LORA_MsgIdTypeDef */
-  LORA_MSGID_LAST
-} LORA_MsgIdTypeDef;
-
-typedef enum
-{
-  /* CmdResp */
-  RADIO_INIT_ID = 0,
-  RADIO_GET_STATUS_ID,
-  RADIO_SET_MODEM_ID,
-  RADIO_SET_CHANNEL_ID,
-  RADIO_IS_CHANNEL_FREE_ID,
-  RADIO_RANDOM_ID,
-  RADIO_SET_RX_CONFIG_ID,
-  RADIO_SET_TX_CONFIG_ID,
-  RADIO_CHECK_RF_FREQUENCY_ID,
-  RADIO_GET_TIME_ON_AIR_ID,
-  RADIO_SEND_ID,
-  RADIO_SLEEP_ID,
-  RADIO_STANDBY_ID,
-  RADIO_RX_ID,
-  RADIO_START_CAD_ID,
-  RADIO_SET_TX_CONTINOUS_WAVE_ID,
-  RADIO_RSSI_ID,
-  RADIO_WRITE_ID,
-  RADIO_READ_ID,
-  RADIO_WRITE_BUFFER_ID,
-  RADIO_READ_BUFFER_ID,
-  RADIO_SET_MAX_PAYLOAD_LENGTH_ID,
-  RADIO_SET_PUBLIC_NETWORK_ID,
-  RADIO_GET_WAKEUP_TIME_ID,
-  RADIO_IRQ_PROCESS_ID,
-  RADIO_RX_BOOSTED_ID,
-  RADIO_SET_RX_DUTY_CYCLE_ID,
-  RADIO_TX_PRBS_ID,
-  RADIO_TX_CW_ID,
-  RADIO_SET_RX_GENERIC_CONFIG_ID,
-  RADIO_SET_TX_GENERIC_CONFIG_ID,
-  /* NotifAck */
-  RADIO_TX_DONE_CB_ID,
-  RADIO_TX_TIMEOUT_CB_ID,
-  RADIO_RX_DONE_CB_ID,
-  RADIO_RX_TIMEOUT_CB_ID,
-  RADIO_RX_ERROR_CB_ID,
-  RADIO_FHSS_CHANGE_CHANNEL_CB_ID,
-  RADIO_CAD_DONE_CB_ID,
-  /* USER CODE BEGIN RADIO_MsgIdTypeDef */
-
-  /* USER CODE END RADIO_MsgIdTypeDef */
-  RADIO_MSGID_LAST
-} RADIO_MsgIdTypeDef;
-
-typedef enum
-{
-  /* CmdResp */
-  KMS_INIT_ID = 0,
-  KMS_OPEN_SESSION_ID,
-  KMS_CLOSE_SESSION_ID,
-  KMS_ENCRYPT_ID,
-  KMS_DECRYPT_ID,
-  KMS_DERIVE_KEY_ID,
-  KMS_CRYPTO_HMAC_SHA256_MSG_ID,
-  /* NotifAck */
-  /* USER CODE BEGIN KMS_MsgIdTypeDef */
-
-  /* USER CODE END KMS_MsgIdTypeDef */
-  KMS_MSGID_LAST
-} KMS_MsgIdTypeDef;
-
-typedef enum
-{
-  /* CmdResp */
-  TRACE_SEND_MSG_ID = 0,
-  /* NotifAck */
-  /* USER CODE BEGIN Trace_MsgIdTypeDef */
-
-  /* USER CODE END Trace_MsgIdTypeDef */
-  TRACE_MSGID_LAST
-} Trace_MsgIdTypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-
-/* Dual core Init sequence */
-#define CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START  0xFFFF
-#define CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START    0x5555
-#define CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED    0xAAAA
-#define CPUS_BOOT_SYNC_RTC_REGISTERED         0x9999
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions ------------------------------------------------------- */
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MSG_ID_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
deleted file mode 100644
index 807e1bb4..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    sys_debug.c
-  * @author  MCD Application Team
-  * @brief   Enables 4 debug pins for internal signals RealTime debugging
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "sys_debug.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-#define DBGMCU_LPM   0   /* if 1 enables/disables the Debug Module during LowPower modes */
-                         /* if 0 it does not modify the DBGMCU_CR_DBG registers */
-                         /* in DualCore few issues are under investigation when 1 */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-void DBG_Init(void)
-{
-  /* USER CODE BEGIN DBG_Init_1 */
-
-  /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
-  GPIO_InitTypeDef  GPIO_InitStruct = {0};
-
-  /* Configure the GPIO pin */
-  GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
-  GPIO_InitStruct.Pull   = GPIO_PULLUP;
-  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  /* make sure a pin is not used simultaneusly by the two cores */
-  /* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
-#if defined(CORE_CM4)
-
-  /* Enable the GPIO_LINES Clock */
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
-
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
-
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
-
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
-
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-#if defined (DBGMCU_LPM) && ( DBGMCU_LPM == 1 )
-  /* careful does not work correctly in dual core: Bugzilla 71087 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
-#elif defined (DBGMCU_LPM) && ( DBGMCU_LPM == 0 )
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
-#elif !defined (DBGMCU_LPM)
-#error "DBGMCU_LPM not defined or out of range <0,1>"
-#endif /* DBGMCU_LPM */
-
-#else /* CORE_CM0PLUS */
-
-  /* Enable the GPIO_LINES Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
-
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN ;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
-
-  /*spi dbg*/
-  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7);
-  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_SUBGHZSPI;
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* Busy */
-  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_12);
-  GPIO_InitStruct.Alternate  = GPIO_AF6_RF_BUSY;
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* LDO_rdy & BUCK_rdy */
-  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
-  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-
-  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
-  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-
-#endif /* CORE_CM4 */
-
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-
-#if defined(CORE_CM4)
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
-
-#endif /* CORE_CM4 */
-
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
-
-  /* USER CODE END DBG_Init_Last */
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
deleted file mode 100644
index 162d992f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    sys_debug.h
-  * @author  MCD Application Team
-  * @brief   Configuration of the debug.c instances
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __SYS_DEBUG_H__
-#define __SYS_DEBUG_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sys_conf.h"
-#include "platform.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* Pin defines */
-
-/* make sure a pin is not used simultaneusly by the two cores */
-/* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
-#if defined(CORE_CM0PLUS)
-/**  Definition for Debug Line 1   **/
-/**
-  * @brief Pin of Debug Line 1
-  */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
-
-/**
-  * @brief Port of Debug Line 1
-  */
-#define DGB_LINE1_PORT                          GPIOB
-
-/**
-  * @brief Enable GPIOs clock of Debug Line 1
-  */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Disable GPIOs clock of Debug Line 1
-  */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-
-/**  Definition for Debug Line 2   **/
-/**
-  * @brief Pin of Debug Line 2
-  */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
-
-/**
-  * @brief Port of Debug Line 2
-  */
-#define DGB_LINE2_PORT                          GPIOB
-
-/**
-  * @brief Enable GPIOs clock of Debug Line 2
-  */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Disable GPIOs clock of Debug Line 2
-  */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-
-#else
-/**  Definition for Debug Line 3   **/
-/**
-  * @brief Pin of Debug Line 3
-  */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
-
-/**
-  * @brief Port of Debug Line 3
-  */
-#define DGB_LINE3_PORT                          GPIOB
-
-/**
-  * @brief Enable GPIOs clock of Debug Line 3
-  */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Disable GPIOs clock of Debug Line 3
-  */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-
-/**  Definition for Debug Line 4   **/
-/**
-  * @brief Pin of Debug Line 4
-  */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
-
-/**
-  * @brief Port of Debug Line 4
-  */
-#define DGB_LINE4_PORT                          GPIOB
-
-/**
-  * @brief Enable GPIOs clock of Debug Line 4
-  */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Disable GPIOs clock of Debug Line 4
-  */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-#endif /* CORE_CM4 */
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
-
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
-
-/**
-  * @brief Set pin to high level
-  */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
-
-/**
-  * @brief Set pin to low level
-  */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
-
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
-
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-
-/**
-  * @brief not usable
-  */
-#define DBG_GPIO_SET_LINE( gpio, n )
-
-/**
-  * @brief not usable
-  */
-#define DBG_GPIO_RST_LINE( gpio, n )
-
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
-
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/**
-  * @brief Initializes the debug
-  */
-void DBG_Init(void);
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SYS_DEBUG_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
deleted file mode 100644
index 2396c82a..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    system_stm32wlxx.c
-  * @author  MCD Application Team
-  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
-  *
-  *   This file provides two functions and one global variable to be called from
-  *   user application:
-  *      - SystemInit(): This function is called at startup just after reset and
-  *                      before branch to main program. This call is made inside
-  *                      the "startup_stm32wlxx.s" file.
-  *
-  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
-  *                                  by the user application to setup the SysTick
-  *                                  timer or configure other parameters.
-  *
-  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
-  *                                 be called whenever the core clock is changed
-  *                                 during program execution.
-  *
-  *   After each device reset the MSI (4 MHz) is used as system clock source.
-  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
-  *   configure the system clock before to branch to main program.
-  *
-  *   This file configures the system clock as follows:
-  *=============================================================================
-  *-----------------------------------------------------------------------------
-  *        System Clock source                    | MSI
-  *-----------------------------------------------------------------------------
-  *        SYSCLK(Hz)                             | 4000000
-  *-----------------------------------------------------------------------------
-  *        HCLK(Hz)                               | 4000000
-  *-----------------------------------------------------------------------------
-  *        AHB Prescaler                          | 1
-  *-----------------------------------------------------------------------------
-  *        APB1 Prescaler                         | 1
-  *-----------------------------------------------------------------------------
-  *        APB2 Prescaler                         | 1
-  *-----------------------------------------------------------------------------
-  *        PLL_M                                  | 1
-  *-----------------------------------------------------------------------------
-  *        PLL_N                                  | 8
-  *-----------------------------------------------------------------------------
-  *        PLL_P                                  | 7
-  *-----------------------------------------------------------------------------
-  *        PLL_Q                                  | 2
-  *-----------------------------------------------------------------------------
-  *        PLL_R                                  | 2
-  *-----------------------------------------------------------------------------
-  *        PLLSAI1_P                              | NA
-  *-----------------------------------------------------------------------------
-  *        PLLSAI1_Q                              | NA
-  *-----------------------------------------------------------------------------
-  *        PLLSAI1_R                              | NA
-  *-----------------------------------------------------------------------------
-  *        Require 48MHz for USB OTG FS,          | Disabled
-  *        SDIO and RNG clock                     |
-  *-----------------------------------------------------------------------------
-  *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
-  */
-
-/** @addtogroup CMSIS
-  * @{
-  */
-
-/** @addtogroup stm32WLxx_system
-  * @{
-  */
-
-/** @addtogroup stm32WLxx_System_Private_Includes
-  * @{
-  */
-
-#include "stm32wlxx.h"
-
-#if !defined  (HSE_VALUE)
-  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
-#endif /* HSE_VALUE */
-
-#if !defined  (MSI_VALUE)
-   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
-#endif /* MSI_VALUE */
-
-#if !defined  (HSI_VALUE)
-  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
-#endif /* HSI_VALUE */
-
-#if !defined  (LSI_VALUE)
- #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
-#endif /* LSI_VALUE */
-
-#if !defined  (LSE_VALUE)
-  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
-#endif /* LSE_VALUE */
-
-/**
-  * @}
-  */
-
-/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup STM32WLxx_System_Private_Defines
-  * @{
-  */
-
-/* Note: Following vector table addresses must be defined in line with linker
-         configuration. */
-/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
-     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
-     at address 0x00 which correspond to automatic remap of boot address selected */
-/* #define USER_VECT_TAB_ADDRESS */
-#if defined(USER_VECT_TAB_ADDRESS)
-#ifdef CORE_CM0PLUS
- /*!< Uncomment this line for user vector table remap in Sram else user remap
-      will be done in Flash. */
-/* #define VECT_TAB_SRAM */
-#if defined(VECT_TAB_SRAM)
-#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
-                                                     This value must be a multiple of 0x100. */
-#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
-                                                     This value must be a multiple of 0x100. */
-#else
-#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
-                                                     This value must be a multiple of 0x100. */
-#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
-                                                     This value must be a multiple of 0x100. */
-#endif
-#else /* CORE_CM4 */
- /*!< Uncomment this line for user vector table remap in Sram else user remap
-      will be done in Flash. */
-/* #define VECT_TAB_SRAM */
-#if defined(VECT_TAB_SRAM)
-#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
-                                                     This value must be a multiple of 0x200. */
-#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
-                                                     This value must be a multiple of 0x200. */
-#else
-#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
-                                                     This value must be a multiple of 0x200. */
-#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
-                                                     This value must be a multiple of 0x200. */
-#endif
-#endif
-#endif
-
-/**
-  * @}
-  */
-
-/** @addtogroup STM32WLxx_System_Private_Macros
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup STM32WLxx_System_Private_Variables
-  * @{
-  */
-  /* The SystemCoreClock variable is updated in three ways:
-      1) from within HAL_Init()
-      2) by calling CMSIS function SystemCoreClockUpdate()
-      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
-  */
-  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
-
-  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
-
-  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
-
-  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
-    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
-/**
-  * @}
-  */
-
-/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
-  * @{
-  */
-/**
-  * @}
-  */
-
-/** @addtogroup STM32WLxx_System_Private_Functions
-  * @{
-  */
-#if defined(__ARMCC_VERSION)
-extern void * __Vectors;
-#define INTVECT_START ((uint32_t) & __Vectors)
-#elif defined(__ICCARM__)
-extern uint32_t __vector_table;
-#define INTVECT_START ((uint32_t)& __vector_table)
-#elif defined(__GNUC__)
-extern void * g_pfnVectors;
-#define INTVECT_START ((uint32_t)& g_pfnVectors)
-#endif
-
-/**
-  * @brief  Setup the microcontroller system.
-  * @param  None
-  * @retval None
-  */
-void SystemInit(void)
-{
-  /* Configure the Vector Table location  ------------------*/
-  SCB->VTOR = INTVECT_START;
-
-  /* FPU settings ------------------------------------------------------------*/
-#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
-  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
-#endif
-
-  /* Reset the RCC clock configuration to the default reset state ------------*/
-  /* Set MSION bit */
-  RCC->CR |= RCC_CR_MSION;
-
-  /* Reset CFGR register */
-  RCC->CFGR = 0x00070000U;
-
-  /* Reset HSEON, CSSON , HSION, and PLLON bits */
-  /* RCC->CR &= 0xEAF6FFFFU; */
-  RCC->CR &= 0x2321EFF;
-
-  /* Reset PLLCFGR register */
-  RCC->PLLCFGR = 0x22040100;
-
-  /* Reset HSEBYP bit */
-  RCC->CR &= 0xFFDFFFFFFU;
-
-  /* Disable all interrupts */
-  RCC->CIER = 0x00000000U;
-}
-
-/**
-  * @brief  Update SystemCoreClock variable according to Clock Register Values.
-  *         The SystemCoreClock variable contains the core clock (HCLK), it can
-  *         be used by the user application to setup the SysTick timer or configure
-  *         other parameters.
-  *
-  * @note   Each time the core clock (HCLK) changes, this function must be called
-  *         to update SystemCoreClock variable value. Otherwise, any configuration
-  *         based on this variable will be incorrect.
-  *
-  * @note   - The system frequency computed by this function is not the real
-  *           frequency in the chip. It is calculated based on the predefined
-  *           constant and the selected clock source:
-  *
-  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
-  *
-  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
-  *
-  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
-  *
-  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
-  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
-  *
-  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
-  *             4 MHz) but the real value may vary depending on the variations
-  *             in voltage and temperature.
-  *
-  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
-  *              16 MHz) but the real value may vary depending on the variations
-  *              in voltage and temperature.
-  *
-  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
-  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
-  *              frequency of the crystal used. Otherwise, this function may
-  *              have wrong result.
-  *
-  *         - The result of this function could be not correct when using fractional
-  *           value for HSE crystal.
-  *
-  * @param  None
-  * @retval None
-  */
-void SystemCoreClockUpdate(void)
-{
-  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
-
- /* Get MSI Range frequency--------------------------------------------------*/
-
-   /* Get MSI Range frequency--------------------------------------------------*/
-   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
-   { /* MSISRANGE from RCC_CSR applies */
-     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
-   }
-   else
-   { /* MSIRANGE from RCC_CR applies */
-     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
-   }
-   /*MSI frequency range in HZ*/
-   msirange = MSIRangeTable[msirange];
-
-
-  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
-  /* Get SYSCLK source -------------------------------------------------------*/
-  switch (RCC->CFGR & RCC_CFGR_SWS)
-  {
-    case 0x00:   /* MSI used as system clock source */
-      SystemCoreClock = msirange;
-      break;
-
-    case 0x04:  /* HSI used as system clock source */
-      /* HSI used as system clock source */
-        SystemCoreClock = HSI_VALUE;
-      break;
-
-    case 0x08:  /* HSE used as system clock source */
-      SystemCoreClock = HSE_VALUE;
-      break;
-
-    case 0x0C: /* PLL used as system clock  source */
-      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
-         SYSCLK = PLL_VCO / PLLR
-         */
-      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
-      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
-
-      switch (pllsource)
-      {
-        case 0x02:  /* HSI used as PLL clock source */
-          pllvco = (HSI_VALUE / pllm);
-          break;
-
-        case 0x03:  /* HSE used as PLL clock source */
-          pllvco = (HSE_VALUE / pllm);
-          break;
-
-        default:    /* MSI used as PLL clock source */
-          pllvco = (msirange / pllm);
-          break;
-      }
-
-      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
-      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
-
-      SystemCoreClock = pllvco/pllr;
-      break;
-
-    default:
-      SystemCoreClock = msirange;
-      break;
-  }
-
-  /* Compute HCLK clock frequency --------------------------------------------*/
-#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
-  /* Get HCLK2 prescaler */
-  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
-#else
-  /* Get HCLK1 prescaler */
-  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
-#endif
-
-  /* Core clock frequency */
-  SystemCoreClock = SystemCoreClock / tmp;
-}
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
deleted file mode 100644
index 96d91056..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
+++ /dev/null
@@ -1,1476 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>3</fileVersion>
-    <configuration>
-        <name>LoRaWAN_End_Node_DualCore_CM0PLUS</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>C-SPY</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>30</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCVariant</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>MemOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
-                </option>
-                <option>
-                    <name>RunToEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RunToName</name>
-                    <state>main</state>
-                </option>
-                <option>
-                    <name>CExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCDDFArgumentProducer</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCDownloadSuppressDownload</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCDownloadVerifyAll</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>OCDynDriverList</name>
-                    <state>STLINK_ID</state>
-                </option>
-                <option>
-                    <name>OCLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>UseFlashLoader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CLowLevel</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacFile2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CDevice</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>FlashLoadersV3</name>
-                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
-                </option>
-                <option>
-                    <name>OCImagesSuppressCheck1</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesPath1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesSuppressCheck2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesPath2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesSuppressCheck3</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesPath3</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OverrideDefFlashBoard</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesOffset1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesOffset2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesOffset3</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesUse1</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesUse2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesUse3</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCDeviceConfigMacroFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCDebuggerExtraOption</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCAllMTBOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCMulticoreNrOfCores</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCMulticoreMaster</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCMulticorePort</name>
-                    <state>53461</state>
-                </option>
-                <option>
-                    <name>OCMulticoreWorkspace</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCMulticoreSlaveProject</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCMulticoreSlaveConfiguration</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCDownloadExtraImage</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCAttachSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MassEraseBeforeFlashing</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCMulticoreNrOfCoresSlave</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ARMSIM_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCSimDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCSimEnablePSP</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCSimPspOverrideConfig</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCSimPspConfigFile</name>
-                    <state></state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CADI_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCadiMemory</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Fast Model</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCADILogFileCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCADILogFileEditB</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CMSISDAP_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>4</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCIarProbeScriptFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CMSISDAPResetList</name>
-                    <version>1</version>
-                    <state>10</state>
-                </option>
-                <option>
-                    <name>CMSISDAPHWResetDuration</name>
-                    <state>300</state>
-                </option>
-                <option>
-                    <name>CMSISDAPHWResetDelay</name>
-                    <state>200</state>
-                </option>
-                <option>
-                    <name>CMSISDAPDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CMSISDAPInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPMultiTargetEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPMultiTarget</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPJtagSpeedList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPBreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPRestoreBreakpointsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPUpdateBreakpointsEdit</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>RDICatchReset</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchUndef</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchSWI</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchData</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchPrefetch</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchIRQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchFIQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CatchMMERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchNOCPERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchCHKERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchSTATERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchBUSERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchINTERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchHARDERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPMultiCPUEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPMultiCPUNumber</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCProbeCfgOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCProbeConfig</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CMSISDAPProbeConfigRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPSelectedCPUBehaviour</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ICpuName</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCJetEmuParams</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCCMSISDAPUsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCCMSISDAPUsbSerialNoSelect</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>GDBSERVER_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>TCPIP</name>
-                    <state>aaa.bbb.ccc.ddd</state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCJTagBreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJTagDoUpdateBreakpoints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJTagUpdateBreakpoints</name>
-                    <state>_call_main</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IJET_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>8</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCIarProbeScriptFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IjetResetList</name>
-                    <version>1</version>
-                    <state>9</state>
-                </option>
-                <option>
-                    <name>IjetHWResetDuration</name>
-                    <state>300</state>
-                </option>
-                <option>
-                    <name>IjetHWResetDelay</name>
-                    <state>200</state>
-                </option>
-                <option>
-                    <name>IjetPowerFromProbe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IjetPowerRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>IjetInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetMultiTargetEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetMultiTarget</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetScanChainNonARMDevices</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetIRLength</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetJtagSpeedList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetProtocolRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetSwoPin</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetCpuClockEdit</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IjetSwoPrescalerList</name>
-                    <version>1</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetBreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetRestoreBreakpointsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetUpdateBreakpointsEdit</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>RDICatchReset</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchUndef</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchSWI</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchData</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchPrefetch</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchIRQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchFIQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CatchMMERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchNOCPERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchCHKERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchSTATERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchBUSERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchINTERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchHARDERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCProbeCfgOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCProbeConfig</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IjetProbeConfigRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetMultiCPUEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetMultiCPUNumber</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>ICpuName</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCJetEmuParams</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IjetPreferETB</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IjetTraceSettingsList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetTraceSizeList</name>
-                    <version>0</version>
-                    <state>4</state>
-                </option>
-                <option>
-                    <name>FlashBoardPathSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIjetUsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCIjetUsbSerialNoSelect</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>JLINK_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>16</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>JLinkSpeed</name>
-                    <state>1000</state>
-                </option>
-                <option>
-                    <name>CCJLinkDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCJLinkHWResetDelay</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>JLinkInitialSpeed</name>
-                    <state>1000</state>
-                </option>
-                <option>
-                    <name>CCDoJlinkMultiTarget</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCScanChainNonARMDevices</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkMultiTarget</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkIRLength</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkCommRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkTCPIP</name>
-                    <state>aaa.bbb.ccc.ddd</state>
-                </option>
-                <option>
-                    <name>CCJLinkSpeedRadioV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCUSBDevice</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRDICatchReset</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchUndef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchSWI</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchData</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchPrefetch</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchIRQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchFIQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkBreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkDoUpdateBreakpoints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkUpdateBreakpoints</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>CCJLinkInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkResetList</name>
-                    <version>6</version>
-                    <state>5</state>
-                </option>
-                <option>
-                    <name>CCJLinkInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchMMERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchNOCPERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchCHRERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchSTATERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchBUSERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchINTERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchHARDERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCJLinkScriptFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCJLinkUsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCTcpIpAlt</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkTcpIpSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCCpuClockEdit</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCSwoClockAuto</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSwoClockEdit</name>
-                    <state>2000</state>
-                </option>
-                <option>
-                    <name>OCJLinkTraceSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCJLinkTraceSourceDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCJLinkDeviceName</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>LMIFTDI_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>2</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>LmiftdiSpeed</name>
-                    <state>500</state>
-                </option>
-                <option>
-                    <name>CCLmiftdiDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCLmiftdiLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCLmiFtdiInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCLmiFtdiInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>NULINK_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>PEMICRO_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>3</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCJPEMicroShowSettings</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>STLINK_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>5</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCSTLinkInterfaceRadio</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCSTLinkInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkResetList</name>
-                    <version>3</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>CCCpuClockEdit</name>
-                    <state>48.0</state>
-                </option>
-                <option>
-                    <name>CCSwoClockAuto</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSwoClockEdit</name>
-                    <state>2000</state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCSTLinkDoUpdateBreakpoints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkUpdateBreakpoints</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchMMERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchNOCPERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchCHRERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchSTATERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchBUSERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchINTERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchSFERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchHARDERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkUsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCSTLinkUsbSerialNoSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkJtagSpeedList</name>
-                    <version>1</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkDAPNumber</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCSTLinkUseServerSelect</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>THIRDPARTY_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CThirdPartyDriverDll</name>
-                    <state>###Uninitialized###</state>
-                </option>
-                <option>
-                    <name>CThirdPartyLogFileCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CThirdPartyLogFileEditB</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>TIFET_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCMSPFetResetList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetTargetVccTypeDefault</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetTargetVoltage</name>
-                    <state>###Uninitialized###</state>
-                </option>
-                <option>
-                    <name>CCMSPFetVCCDefault</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCMSPFetTargetSettlingtime</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetRadioJtagSpeedType</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCMSPFetConnection</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetUsbComPort</name>
-                    <state>Automatic</state>
-                </option>
-                <option>
-                    <name>CCMSPFetAllowAccessToBSL</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCMSPFetRadioEraseFlash</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>XDS100_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>8</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>TIPackageOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TIPackage</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>BoardFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCXds100BreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100DoUpdateBreakpoints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100UpdateBreakpoints</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchReset</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchUndef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchSWI</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchData</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchPrefetch</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchIRQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchFIQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchMMERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchNOCPERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchCHRERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchSTATERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchBUSERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchINTERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchSFERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchHARDERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CpuClockEdit</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCXds100SwoClockAuto</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100SwoClockEdit</name>
-                    <state>1000</state>
-                </option>
-                <option>
-                    <name>CCXds100HWResetDelay</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100ResetList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100UsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCXds100UsbSerialNoSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100JtagSpeedList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>CCXds100InterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100ProbeList</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>CCXds100SWOPortRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100SWOPort</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCXDSTargetVccEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXDSTargetVoltage</name>
-                    <state>###Uninitialized###</state>
-                </option>
-                <option>
-                    <name>OCXDSDigitalStatesConfigFile</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <debuggerPlugins>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
-                <loadFlag>1</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-        </debuggerPlugins>
-    </configuration>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
deleted file mode 100644
index 9a402c0f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
+++ /dev/null
@@ -1,1440 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>3</fileVersion>
-    <configuration>
-        <name>LoRaWAN_End_Node_DualCore_CM0PLUS</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>General</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <version>31</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>ExePath</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/Exe</state>
-                </option>
-                <option>
-                    <name>ObjPath</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/Obj</state>
-                </option>
-                <option>
-                    <name>ListPath</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/List</state>
-                </option>
-                <option>
-                    <name>GEndianMode</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>GOutputBinary</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGCoreOrChip</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelect</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelectSlave</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>RTDescription</name>
-                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-                </option>
-                <option>
-                    <name>OGProductVersion</name>
-                    <state>4.41A</state>
-                </option>
-                <option>
-                    <name>OGLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGChipSelectEditMenu</name>
-                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-                </option>
-                <option>
-                    <name>GenLowLevelInterface</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GEndianModeBE</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGBufferedTerminalOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GenStdoutInterface</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>RTConfigPath2</name>
-                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
-                </option>
-                <option>
-                    <name>GBECoreSlave</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>OGUseCmsis</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGUseCmsisDspLib</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibThreads</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CoreVariant</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>GFPUDeviceSlave</name>
-                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-                </option>
-                <option>
-                    <name>FPU2</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NrRegs</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NEON</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GFPUCoreSlave2</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>OGCMSISPackSelectDevice</name>
-                </option>
-                <option>
-                    <name>OgLibHeap</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGLibAdditionalLocale</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGPrintfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGPrintfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GenLocaleTags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>GenLocaleDisplayOnly</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DSPExtension</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZone</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZoneModes</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ICCARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>34</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDefines</name>
-                    <state>CORE_CM0PLUS</state>
-                    <state>KMS_ENABLED</state>
-                    <state>STM32WL55xx</state>
-                    <state>CMSIS_NVIC_VIRTUAL</state>
-                </option>
-                <option>
-                    <name>CCPreprocFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocComments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMnemonics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMessages</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDiagSuppress</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagRemark</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagWarning</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagError</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCAllowList</name>
-                    <version>1</version>
-                    <state>11111110</state>
-                </option>
-                <option>
-                    <name>CCDebugInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IEndianMode</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCLangConformance</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSignedPlainChar</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRequirePrototypes</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCDiagWarnAreErr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCompilerRuntimeInfo</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>CCLibConfigHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>PreInclude</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
-                    <state>$PROJ_DIR$/../CM0PLUS/KMS/App</state>
-                    <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/App</state>
-                    <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/Target</state>
-                    <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
-                    <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
-                    <state>$PROJ_DIR$/../Common/System</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
-                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
-                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
-                </option>
-                <option>
-                    <name>CCStdIncCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCodeSection</name>
-                    <state>.text</state>
-                </option>
-                <option>
-                    <name>IProcessorMode2</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevel</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CCOptStrategy</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevelSlave</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
-                <option>
-                    <name>CCPosIndRopi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndRwpi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndNoDynInit</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccLang</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCDialect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccAllowVLA</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccStaticDestr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCppInlineSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccFloatSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCOptStrategySlave</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCGuardCalls</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccExceptions2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccRTTI2</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>AARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>10</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>AObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>ACaseSensitivity</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacroChars</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnWhat</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnOne</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>ADebug</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AltRegisterNames</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ADefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AList</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AListHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AListing</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Includes</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacDefs</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacExps</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacExec</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OnlyAssed</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MultiLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLengthCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLength</name>
-                    <state>80</state>
-                </option>
-                <option>
-                    <name>TabSpacing</name>
-                    <state>8</state>
-                </option>
-                <option>
-                    <name>AXRef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDefines</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefInternal</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDual</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AOutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsEdit</name>
-                    <state>100</state>
-                </option>
-                <option>
-                    <name>AIgnoreStdInclude</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AUserIncludes</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AExtraOptionsCheckV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AExtraOptionsV2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AsmNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>OBJCOPY</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OOCOutputFormat</name>
-                    <version>3</version>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>OCOutputOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCOutputFile</name>
-                    <state>..\..\UserApp_M0PLUS.bin</state>
-                </option>
-                <option>
-                    <name>OOCCommandLineProducer</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCObjCopyEnable</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CUSTOM</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <extensions></extensions>
-                <cmdline></cmdline>
-                <hasPrio>0</hasPrio>
-            </data>
-        </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-        <settings>
-            <name>BUILDACTION</name>
-            <archiveVersion>1</archiveVersion>
-            <data>
-                <prebuild></prebuild>
-                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\PostBuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp_M0PLUS.bin" 1 1"</postbuild>
-            </data>
-        </settings>
-        <settings>
-            <name>ILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>21</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IlinkLibIOConfig</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkInputFileSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOutputFile</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS.out</state>
-                </option>
-                <option>
-                    <name>IlinkDebugInfoEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkKeepSymbols</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySymbol</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySegment</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryAlign</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkConfigDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkMapFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogInitialization</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogModule</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogSection</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogVeneer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFileSlave</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkSuppressDiags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsRem</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsWarn</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsErr</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkWarningsAreErrors</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkUseExtraOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkExtraOptions</name>
-                    <state>--config_search $PROJ_DIR$/../../Linker_Common/EWARM/</state>
-                </option>
-                <option>
-                    <name>IlinkLowLevelInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAutoLibEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAdditionalLibs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkOverrideProgramEntryLabel</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabelSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabel</name>
-                    <state>__iar_program_start</state>
-                </option>
-                <option>
-                    <name>DoFill</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>FillerByte</name>
-                    <state>0xFF</state>
-                </option>
-                <option>
-                    <name>FillerStart</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>FillerEnd</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>CrcSize</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcPoly</name>
-                    <state>0x11021</state>
-                </option>
-                <option>
-                    <name>CrcCompl</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcBitOrder</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcInitialValue</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>DoCrc</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkBufferedTerminalOutput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkStdoutInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcFullSize</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIElfToolPostProcess</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogAutoLibSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogRedirSymbols</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogUnusedFragments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcReverseByteOrder</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcUseAsInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptInline</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsAllow</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsForce</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptMergeDuplSections</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptUseVfe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptForceVfe</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackAnalysisEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackControlFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkStackCallGraphFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CrcAlgorithm</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcUnitSize</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkThreadsSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogCallGraph</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile_AltDefault</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkHeapSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLocaleSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS_import_lib.o</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IARCHIVE</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IarchiveInputs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IarchiveOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IarchiveOutput</name>
-                    <state>###Unitialized###</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-    </configuration>
-    <group>
-        <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\flash_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_privileged_services.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_privileged_wrap.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
-            </file>
-        </group>
-        <group>
-            <name>EWARM</name>
-            <file>
-                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\svc_handler.s</name>
-            </file>
-        </group>
-        <group>
-            <name>KMS</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>LoRaWAN</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Target</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>LoRaWAN_End_Node_DualCore_CM0PLUS</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Doc</name>
-        <file>
-            <name>$PROJ_DIR$\..\readme.txt</name>
-        </file>
-    </group>
-    <group>
-        <name>Drivers</name>
-        <group>
-            <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_End_Node_DualCore_CM0PLUS</configuration>
-            </excluded>
-            <group>
-                <name>STM32WLxx_Nucleo</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>CMSIS</name>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\system_stm32wlxx.c</name>
-            </file>
-        </group>
-        <group>
-            <name>STM32WLxx_HAL_Driver</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Middlewares</name>
-        <group>
-            <name>KMS</name>
-            <group>
-                <name>STM32_Secure_Engine</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\2_Images_SBSFU\EWARM\se_interface_appli.o</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>LoRaWAN</name>
-            <group>
-                <name>Crypto</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
-                </file>
-            </group>
-            <group>
-                <name>LmHandler</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpDataDistribution.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmCtxMgmt.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Mac</name>
-                <group>
-                    <name>Region</name>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
-                    </file>
-                    <file>
-                        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
-                    </file>
-                </group>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Utilities</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>SubGHz_Phy</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Utilities</name>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
-        </file>
-    </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
deleted file mode 100644
index d79b2e13..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
+++ /dev/null
@@ -1,1476 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>3</fileVersion>
-    <configuration>
-        <name>LoRaWAN_End_Node_DualCore_CM4</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>C-SPY</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>30</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCVariant</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>MemOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
-                </option>
-                <option>
-                    <name>RunToEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RunToName</name>
-                    <state>main</state>
-                </option>
-                <option>
-                    <name>CExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCDDFArgumentProducer</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCDownloadSuppressDownload</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCDownloadVerifyAll</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>OCDynDriverList</name>
-                    <state>STLINK_ID</state>
-                </option>
-                <option>
-                    <name>OCLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>UseFlashLoader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CLowLevel</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacFile2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CDevice</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>FlashLoadersV3</name>
-                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
-                </option>
-                <option>
-                    <name>OCImagesSuppressCheck1</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesPath1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesSuppressCheck2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesPath2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesSuppressCheck3</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesPath3</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OverrideDefFlashBoard</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesOffset1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesOffset2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesOffset3</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCImagesUse1</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesUse2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCImagesUse3</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCDeviceConfigMacroFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCDebuggerExtraOption</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCAllMTBOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCMulticoreNrOfCores</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCMulticoreMaster</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCMulticorePort</name>
-                    <state>53461</state>
-                </option>
-                <option>
-                    <name>OCMulticoreWorkspace</name>
-                    <state>$PROJ_DIR$\Project.eww</state>
-                </option>
-                <option>
-                    <name>OCMulticoreSlaveProject</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS</state>
-                </option>
-                <option>
-                    <name>OCMulticoreSlaveConfiguration</name>
-                    <state>MBMUX_STM32WL_M0_FLASH</state>
-                </option>
-                <option>
-                    <name>OCDownloadExtraImage</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCAttachSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MassEraseBeforeFlashing</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCMulticoreNrOfCoresSlave</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ARMSIM_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCSimDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCSimEnablePSP</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCSimPspOverrideConfig</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCSimPspConfigFile</name>
-                    <state></state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CADI_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCadiMemory</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Fast Model</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCADILogFileCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCADILogFileEditB</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CMSISDAP_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>4</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCIarProbeScriptFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CMSISDAPResetList</name>
-                    <version>1</version>
-                    <state>10</state>
-                </option>
-                <option>
-                    <name>CMSISDAPHWResetDuration</name>
-                    <state>300</state>
-                </option>
-                <option>
-                    <name>CMSISDAPHWResetDelay</name>
-                    <state>200</state>
-                </option>
-                <option>
-                    <name>CMSISDAPDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CMSISDAPInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPMultiTargetEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPMultiTarget</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPJtagSpeedList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPBreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPRestoreBreakpointsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPUpdateBreakpointsEdit</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>RDICatchReset</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchUndef</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchSWI</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchData</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchPrefetch</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchIRQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchFIQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CatchMMERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchNOCPERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchCHKERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchSTATERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchBUSERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchINTERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchHARDERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPMultiCPUEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPMultiCPUNumber</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCProbeCfgOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCProbeConfig</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CMSISDAPProbeConfigRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CMSISDAPSelectedCPUBehaviour</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ICpuName</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCJetEmuParams</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCCMSISDAPUsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCCMSISDAPUsbSerialNoSelect</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>GDBSERVER_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>TCPIP</name>
-                    <state>aaa.bbb.ccc.ddd</state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCJTagBreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJTagDoUpdateBreakpoints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJTagUpdateBreakpoints</name>
-                    <state>_call_main</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IJET_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>8</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OCIarProbeScriptFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IjetResetList</name>
-                    <version>1</version>
-                    <state>10</state>
-                </option>
-                <option>
-                    <name>IjetHWResetDuration</name>
-                    <state>300</state>
-                </option>
-                <option>
-                    <name>IjetHWResetDelay</name>
-                    <state>200</state>
-                </option>
-                <option>
-                    <name>IjetPowerFromProbe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IjetPowerRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>IjetInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetMultiTargetEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetMultiTarget</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetScanChainNonARMDevices</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetIRLength</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetJtagSpeedList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetProtocolRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetSwoPin</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetCpuClockEdit</name>
-                    <state>72.0</state>
-                </option>
-                <option>
-                    <name>IjetSwoPrescalerList</name>
-                    <version>1</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetBreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetRestoreBreakpointsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetUpdateBreakpointsEdit</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>RDICatchReset</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchUndef</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchSWI</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchData</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchPrefetch</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>RDICatchIRQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>RDICatchFIQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CatchMMERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchNOCPERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchCHKERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchSTATERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchBUSERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchINTERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchHARDERR</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCProbeCfgOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCProbeConfig</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IjetProbeConfigRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetMultiCPUEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetMultiCPUNumber</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetSelectedCPUBehaviour</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ICpuName</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>OCJetEmuParams</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IjetPreferETB</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IjetTraceSettingsList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IjetTraceSizeList</name>
-                    <version>0</version>
-                    <state>4</state>
-                </option>
-                <option>
-                    <name>FlashBoardPathSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIjetUsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCIjetUsbSerialNoSelect</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>JLINK_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>16</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>JLinkSpeed</name>
-                    <state>1000</state>
-                </option>
-                <option>
-                    <name>CCJLinkDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCJLinkHWResetDelay</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>JLinkInitialSpeed</name>
-                    <state>1000</state>
-                </option>
-                <option>
-                    <name>CCDoJlinkMultiTarget</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCScanChainNonARMDevices</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkMultiTarget</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkIRLength</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkCommRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkTCPIP</name>
-                    <state>aaa.bbb.ccc.ddd</state>
-                </option>
-                <option>
-                    <name>CCJLinkSpeedRadioV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCUSBDevice</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRDICatchReset</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchUndef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchSWI</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchData</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchPrefetch</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchIRQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCRDICatchFIQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkBreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkDoUpdateBreakpoints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkUpdateBreakpoints</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>CCJLinkInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkResetList</name>
-                    <version>6</version>
-                    <state>7</state>
-                </option>
-                <option>
-                    <name>CCJLinkInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchMMERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchNOCPERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchCHRERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchSTATERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchBUSERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchINTERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchHARDERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCJLinkScriptFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCJLinkUsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCTcpIpAlt</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCJLinkTcpIpSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCCpuClockEdit</name>
-                    <state>72.0</state>
-                </option>
-                <option>
-                    <name>CCSwoClockAuto</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSwoClockEdit</name>
-                    <state>2000</state>
-                </option>
-                <option>
-                    <name>OCJLinkTraceSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCJLinkTraceSourceDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OCJLinkDeviceName</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>LMIFTDI_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>2</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>LmiftdiSpeed</name>
-                    <state>500</state>
-                </option>
-                <option>
-                    <name>CCLmiftdiDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCLmiftdiLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCLmiFtdiInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCLmiFtdiInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>NULINK_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>PEMICRO_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>3</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCJPEMicroShowSettings</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>STLINK_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>5</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCSTLinkInterfaceRadio</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCSTLinkInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkResetList</name>
-                    <version>3</version>
-                    <state>4</state>
-                </option>
-                <option>
-                    <name>CCCpuClockEdit</name>
-                    <state>48.0</state>
-                </option>
-                <option>
-                    <name>CCSwoClockAuto</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSwoClockEdit</name>
-                    <state>2000</state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCSTLinkDoUpdateBreakpoints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkUpdateBreakpoints</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchMMERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchNOCPERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchCHRERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchSTATERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchBUSERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchINTERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchSFERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchHARDERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkCatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkUsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCSTLinkUsbSerialNoSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkJtagSpeedList</name>
-                    <version>1</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkDAPNumber</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCSTLinkUseServerSelect</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>THIRDPARTY_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CThirdPartyDriverDll</name>
-                    <state>###Uninitialized###</state>
-                </option>
-                <option>
-                    <name>CThirdPartyLogFileCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CThirdPartyLogFileEditB</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>TIFET_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCMSPFetResetList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetInterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetInterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetTargetVccTypeDefault</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetTargetVoltage</name>
-                    <state>###Uninitialized###</state>
-                </option>
-                <option>
-                    <name>CCMSPFetVCCDefault</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCMSPFetTargetSettlingtime</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetRadioJtagSpeedType</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCMSPFetConnection</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetUsbComPort</name>
-                    <state>Automatic</state>
-                </option>
-                <option>
-                    <name>CCMSPFetAllowAccessToBSL</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetDoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCMSPFetLogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCMSPFetRadioEraseFlash</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>XDS100_ID</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>8</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OCDriverInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>TIPackageOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TIPackage</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>BoardFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DoLogfile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>LogFile</name>
-                    <state>$PROJ_DIR$\cspycomm.log</state>
-                </option>
-                <option>
-                    <name>CCXds100BreakpointRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100DoUpdateBreakpoints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100UpdateBreakpoints</name>
-                    <state>_call_main</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchReset</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchUndef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchSWI</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchData</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchPrefetch</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchIRQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchFIQ</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchCORERESET</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchMMERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchNOCPERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchCHRERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchSTATERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchBUSERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchINTERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchSFERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchHARDERR</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CatchDummy</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100CpuClockEdit</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCXds100SwoClockAuto</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100SwoClockEdit</name>
-                    <state>1000</state>
-                </option>
-                <option>
-                    <name>CCXds100HWResetDelay</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100ResetList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100UsbSerialNo</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCXds100UsbSerialNoSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100JtagSpeedList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100InterfaceRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100InterfaceCmdLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100ProbeList</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100SWOPortRadio</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXds100SWOPort</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCXDSTargetVccEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCXDSTargetVoltage</name>
-                    <state>###Uninitialized###</state>
-                </option>
-                <option>
-                    <name>OCXDSDigitalStatesConfigFile</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <debuggerPlugins>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
-                <loadFlag>1</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-            <plugin>
-                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
-                <loadFlag>0</loadFlag>
-            </plugin>
-        </debuggerPlugins>
-    </configuration>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
deleted file mode 100644
index bbed8b5c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
+++ /dev/null
@@ -1,1276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>3</fileVersion>
-    <configuration>
-        <name>LoRaWAN_End_Node_DualCore_CM4</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>General</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <version>31</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>ExePath</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM4/Exe</state>
-                </option>
-                <option>
-                    <name>ObjPath</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM4/Obj</state>
-                </option>
-                <option>
-                    <name>ListPath</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM4/List</state>
-                </option>
-                <option>
-                    <name>GEndianMode</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>Input description</name>
-                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>Output description</name>
-                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>GOutputBinary</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGCoreOrChip</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelect</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelectSlave</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>RTDescription</name>
-                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-                </option>
-                <option>
-                    <name>OGProductVersion</name>
-                    <state>4.41A</state>
-                </option>
-                <option>
-                    <name>OGLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGChipSelectEditMenu</name>
-                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-                </option>
-                <option>
-                    <name>GenLowLevelInterface</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GEndianModeBE</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGBufferedTerminalOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GenStdoutInterface</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>RTConfigPath2</name>
-                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
-                </option>
-                <option>
-                    <name>GBECoreSlave</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>OGUseCmsis</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGUseCmsisDspLib</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibThreads</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CoreVariant</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>GFPUDeviceSlave</name>
-                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-                </option>
-                <option>
-                    <name>FPU2</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NrRegs</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NEON</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GFPUCoreSlave2</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>OGCMSISPackSelectDevice</name>
-                </option>
-                <option>
-                    <name>OgLibHeap</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGLibAdditionalLocale</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGPrintfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGPrintfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GenLocaleTags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>GenLocaleDisplayOnly</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DSPExtension</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>TrustZone</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZoneModes</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ICCARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>34</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDefines</name>
-                    <state>CORE_CM4</state>
-                    <state>STM32WL55xx</state>
-                </option>
-                <option>
-                    <name>CCPreprocFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocComments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMnemonics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMessages</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDiagSuppress</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagRemark</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagWarning</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagError</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCAllowList</name>
-                    <version>1</version>
-                    <state>11111110</state>
-                </option>
-                <option>
-                    <name>CCDebugInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IEndianMode</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCLangConformance</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSignedPlainChar</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRequirePrototypes</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCDiagWarnAreErr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCompilerRuntimeInfo</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>CCLibConfigHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>PreInclude</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../CM4/Core/Inc</state>
-                    <state>$PROJ_DIR$/../CM4/LoRaWAN/App</state>
-                    <state>$PROJ_DIR$/../CM4/LoRaWAN/Target</state>
-                    <state>$PROJ_DIR$/../CM4/MbMux</state>
-                    <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
-                    <state>$PROJ_DIR$/../Common/System</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
-                </option>
-                <option>
-                    <name>CCStdIncCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCodeSection</name>
-                    <state>.text</state>
-                </option>
-                <option>
-                    <name>IProcessorMode2</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevel</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CCOptStrategy</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevelSlave</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
-                <option>
-                    <name>CCPosIndRopi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndRwpi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndNoDynInit</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccLang</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCDialect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccAllowVLA</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccStaticDestr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCppInlineSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccFloatSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCOptStrategySlave</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCGuardCalls</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccExceptions2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccRTTI2</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>AARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>10</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>AObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>ACaseSensitivity</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacroChars</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnWhat</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnOne</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>ADebug</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AltRegisterNames</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ADefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AList</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AListHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AListing</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Includes</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacDefs</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacExps</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacExec</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OnlyAssed</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MultiLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLengthCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLength</name>
-                    <state>80</state>
-                </option>
-                <option>
-                    <name>TabSpacing</name>
-                    <state>8</state>
-                </option>
-                <option>
-                    <name>AXRef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDefines</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefInternal</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDual</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AOutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsEdit</name>
-                    <state>100</state>
-                </option>
-                <option>
-                    <name>AIgnoreStdInclude</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AUserIncludes</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AExtraOptionsCheckV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AExtraOptionsV2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AsmNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>OBJCOPY</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OOCOutputFormat</name>
-                    <version>3</version>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>OCOutputOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCOutputFile</name>
-                    <state>..\..\UserApp_M4.bin</state>
-                </option>
-                <option>
-                    <name>OOCCommandLineProducer</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCObjCopyEnable</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CUSTOM</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <extensions></extensions>
-                <cmdline></cmdline>
-                <hasPrio>0</hasPrio>
-            </data>
-        </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-        <settings>
-            <name>BUILDACTION</name>
-            <archiveVersion>1</archiveVersion>
-            <data>
-                <prebuild></prebuild>
-                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp_M4.bin" 2 1"</postbuild>
-            </data>
-        </settings>
-        <settings>
-            <name>ILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>21</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IlinkLibIOConfig</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkInputFileSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOutputFile</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM4.out</state>
-                </option>
-                <option>
-                    <name>IlinkDebugInfoEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkKeepSymbols</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySymbol</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySegment</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryAlign</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkConfigDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkMapFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogInitialization</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogModule</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogSection</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogVeneer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFileSlave</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkSuppressDiags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsRem</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsWarn</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsErr</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkWarningsAreErrors</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkUseExtraOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkExtraOptions</name>
-                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-                </option>
-                <option>
-                    <name>IlinkLowLevelInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAutoLibEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAdditionalLibs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkOverrideProgramEntryLabel</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabelSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabel</name>
-                    <state>__iar_program_start</state>
-                </option>
-                <option>
-                    <name>DoFill</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>FillerByte</name>
-                    <state>0xFF</state>
-                </option>
-                <option>
-                    <name>FillerStart</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>FillerEnd</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>CrcSize</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcPoly</name>
-                    <state>0x11021</state>
-                </option>
-                <option>
-                    <name>CrcCompl</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcBitOrder</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcInitialValue</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>DoCrc</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkBufferedTerminalOutput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkStdoutInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcFullSize</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIElfToolPostProcess</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogAutoLibSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogRedirSymbols</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogUnusedFragments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcReverseByteOrder</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcUseAsInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptInline</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsAllow</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsForce</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptMergeDuplSections</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptUseVfe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptForceVfe</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackAnalysisEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackControlFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkStackCallGraphFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CrcAlgorithm</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcUnitSize</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkThreadsSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogCallGraph</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile_AltDefault</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkHeapSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLocaleSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>LoRaWAN_End_Node_DualCore_CM4_import_lib.o</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IARCHIVE</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IarchiveInputs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IarchiveOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IarchiveOutput</name>
-                    <state>###Unitialized###</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-    </configuration>
-    <group>
-        <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
-            </file>
-        </group>
-        <group>
-            <name>EWARM</name>
-            <file>
-                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
-            </file>
-        </group>
-        <group>
-            <name>LoRaWAN</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\CayenneLpp.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>LoRaWAN_End_Node_DualCore_CM4</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Doc</name>
-        <file>
-            <name>$PROJ_DIR$\..\readme.txt</name>
-        </file>
-    </group>
-    <group>
-        <name>Drivers</name>
-        <group>
-            <name>BSP</name>
-            <excluded>
-                <configuration>LoRaWAN_End_Node_DualCore_CM4</configuration>
-            </excluded>
-            <group>
-                <name>STM32WLxx_Nucleo</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>CMSIS</name>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\system_stm32wlxx.c</name>
-            </file>
-        </group>
-        <group>
-            <name>STM32WLxx_HAL_Driver</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Utilities</name>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
-        </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
-        </file>
-    </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
deleted file mode 100644
index a6cf0145..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
+++ /dev/null
@@ -1,316 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm0plus.s
-;* Author             : MCD Application Team
-;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M0+ processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
-        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
-        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
-        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
-        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
-        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
-        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
-        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
-        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
-
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-
-        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
-        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
-        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
-        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
-        DCD     RNG_IRQHandler                      ; RNG Interrupt
-        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
-        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
-        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
-        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
-        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                   ; USART1 Interrupt
-        DCD     USART2_IRQHandler                   ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
-        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK TZIC_ILA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TZIC_ILA_IRQHandler
-        B TZIC_ILA_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK RTC_LSECSS_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_LSECSS_IRQHandler
-        B RTC_LSECSS_IRQHandler
-
-        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_FLASH_C1SEV_IRQHandler
-        B RCC_FLASH_C1SEV_IRQHandler
-
-        PUBWEAK EXTI1_0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_0_IRQHandler
-        B EXTI1_0_IRQHandler
-
-        PUBWEAK EXTI3_2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_2_IRQHandler
-        B EXTI3_2_IRQHandler
-
-        PUBWEAK EXTI15_4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_4_IRQHandler
-        B EXTI15_4_IRQHandler
-
-        PUBWEAK ADC_COMP_DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_COMP_DAC_IRQHandler
-        B ADC_COMP_DAC_IRQHandler
-
-        PUBWEAK DMA1_Channel1_2_3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_2_3_IRQHandler
-        B DMA1_Channel1_2_3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_5_6_7_IRQHandler
-        B DMA1_Channel4_5_6_7_IRQHandler
-
-        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_DMAMUX1_OVR_IRQHandler
-        B DMA2_DMAMUX1_OVR_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK TIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_IRQHandler
-        B TIM1_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C2_RX_C2_TX_IRQHandler
-        B IPCC_C2_RX_C2_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK AES_PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_PKA_IRQHandler
-        B AES_PKA_IRQHandler
-
-        PUBWEAK LCD_802_1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LCD_802_1_IRQHandler
-        B LCD_802_1_IRQHandler
-
-        PUBWEAK I2C1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_IRQHandler
-        B I2C1_IRQHandler
-
-        PUBWEAK I2C2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_IRQHandler
-        B I2C2_IRQHandler
-
-        PUBWEAK I2C3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_IRQHandler
-        B I2C3_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
deleted file mode 100644
index 1431e7f3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
+++ /dev/null
@@ -1,509 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm4.s
-;* Author             : MCD Application Team
-;* Description        : M4 core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M4 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     MemManage_Handler                 ; MPU Fault Handler
-        DCD     BusFault_Handler                  ; Bus Fault Handler
-        DCD     UsageFault_Handler                ; Usage Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     DebugMon_Handler                  ; Debug Monitor Handler
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     WWDG_IRQHandler                   ; Window WatchDog
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
-        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
-        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
-        DCD     RCC_IRQHandler                    ; RCC Interrupt
-        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
-        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
-        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
-        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
-        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
-        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
-        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
-        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
-        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
-        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
-        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
-        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
-        DCD     ADC_IRQHandler                    ; ADC Interrupt
-        DCD     DAC_IRQHandler                    ; DAC Interrupt
-        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
-        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
-        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
-        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
-        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
-        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
-        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
-        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
-        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
-        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
-        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
-        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
-        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                 ; USART1 Interrupt
-        DCD     USART2_IRQHandler                 ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
-        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
-        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
-        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
-        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
-        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
-        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
-        DCD     AES_IRQHandler                    ; AES Interrupt
-        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
-        DCD     PKA_IRQHandler                    ; PKA Interrupt
-        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
-        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
-        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
-        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
-        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
-        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
-        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
-        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK MemManage_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-MemManage_Handler
-        B MemManage_Handler
-
-        PUBWEAK BusFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-BusFault_Handler
-        B BusFault_Handler
-
-        PUBWEAK UsageFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-UsageFault_Handler
-        B UsageFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK DebugMon_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DebugMon_Handler
-        B DebugMon_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK WWDG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-WWDG_IRQHandler
-        B WWDG_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
-
-        PUBWEAK RTC_WKUP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_WKUP_IRQHandler
-        B RTC_WKUP_IRQHandler
-
-        PUBWEAK FLASH_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-FLASH_IRQHandler
-        B FLASH_IRQHandler
-
-        PUBWEAK RCC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_IRQHandler
-        B RCC_IRQHandler
-
-        PUBWEAK EXTI0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI0_IRQHandler
-        B EXTI0_IRQHandler
-
-        PUBWEAK EXTI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_IRQHandler
-        B EXTI1_IRQHandler
-
-        PUBWEAK EXTI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI2_IRQHandler
-        B EXTI2_IRQHandler
-
-        PUBWEAK EXTI3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_IRQHandler
-        B EXTI3_IRQHandler
-
-        PUBWEAK EXTI4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI4_IRQHandler
-        B EXTI4_IRQHandler
-
-        PUBWEAK DMA1_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_IRQHandler
-        B DMA1_Channel1_IRQHandler
-
-        PUBWEAK DMA1_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel2_IRQHandler
-        B DMA1_Channel2_IRQHandler
-
-        PUBWEAK DMA1_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel3_IRQHandler
-        B DMA1_Channel3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_IRQHandler
-        B DMA1_Channel4_IRQHandler
-
-        PUBWEAK DMA1_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel5_IRQHandler
-        B DMA1_Channel5_IRQHandler
-
-        PUBWEAK DMA1_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel6_IRQHandler
-        B DMA1_Channel6_IRQHandler
-
-        PUBWEAK DMA1_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel7_IRQHandler
-        B DMA1_Channel7_IRQHandler
-
-        PUBWEAK ADC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_IRQHandler
-        B ADC_IRQHandler
-
-        PUBWEAK DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DAC_IRQHandler
-        B DAC_IRQHandler
-
-        PUBWEAK C2SEV_PWR_C2H_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-C2SEV_PWR_C2H_IRQHandler
-        B C2SEV_PWR_C2H_IRQHandler
-
-        PUBWEAK COMP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-COMP_IRQHandler
-        B COMP_IRQHandler
-
-        PUBWEAK EXTI9_5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI9_5_IRQHandler
-        B EXTI9_5_IRQHandler
-
-        PUBWEAK TIM1_BRK_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_BRK_IRQHandler
-        B TIM1_BRK_IRQHandler
-
-        PUBWEAK TIM1_UP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_UP_IRQHandler
-        B TIM1_UP_IRQHandler
-
-        PUBWEAK TIM1_TRG_COM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_TRG_COM_IRQHandler
-        B TIM1_TRG_COM_IRQHandler
-
-        PUBWEAK TIM1_CC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_CC_IRQHandler
-        B TIM1_CC_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK I2C1_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_EV_IRQHandler
-        B I2C1_EV_IRQHandler
-
-        PUBWEAK I2C1_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_ER_IRQHandler
-        B I2C1_ER_IRQHandler
-
-        PUBWEAK I2C2_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_EV_IRQHandler
-        B I2C2_EV_IRQHandler
-
-        PUBWEAK I2C2_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_ER_IRQHandler
-        B I2C2_ER_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK EXTI15_10_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_10_IRQHandler
-        B EXTI15_10_IRQHandler
-
-        PUBWEAK RTC_Alarm_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_Alarm_IRQHandler
-        B RTC_Alarm_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK IPCC_C1_RX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_RX_IRQHandler
-        B IPCC_C1_RX_IRQHandler
-
-        PUBWEAK IPCC_C1_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_TX_IRQHandler
-        B IPCC_C1_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK I2C3_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_EV_IRQHandler
-        B I2C3_EV_IRQHandler
-
-        PUBWEAK I2C3_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_ER_IRQHandler
-        B I2C3_ER_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        PUBWEAK AES_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_IRQHandler
-        B AES_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PKA_IRQHandler
-        B PKA_IRQHandler
-
-        PUBWEAK DMA2_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel1_IRQHandler
-        B DMA2_Channel1_IRQHandler
-
-        PUBWEAK DMA2_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel2_IRQHandler
-        B DMA2_Channel2_IRQHandler
-
-        PUBWEAK DMA2_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel3_IRQHandler
-        B DMA2_Channel3_IRQHandler
-
-        PUBWEAK DMA2_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel4_IRQHandler
-        B DMA2_Channel4_IRQHandler
-
-        PUBWEAK DMA2_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel5_IRQHandler
-        B DMA2_Channel5_IRQHandler
-
-        PUBWEAK DMA2_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel6_IRQHandler
-        B DMA2_Channel6_IRQHandler
-
-        PUBWEAK DMA2_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel7_IRQHandler
-        B DMA2_Channel7_IRQHandler
-
-        PUBWEAK DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMAMUX1_OVR_IRQHandler
-        B DMAMUX1_OVR_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
deleted file mode 100644
index 44f93359..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
+++ /dev/null
@@ -1,1444 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>LoRaWAN_End_Node_DualCore_CM0PLUS</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>0</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>0</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>0</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint/>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>0</periodic>
-        <aLwin>0</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>0</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>0</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>.\svc_handler.s</PathWithFileName>
-      <FilenameWithoutPath>svc_handler.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\flash_if.c</PathWithFileName>
-      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\sys_privileged_services.c</PathWithFileName>
-      <FilenameWithoutPath>sys_privileged_services.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\sys_privileged_wrap.c</PathWithFileName>
-      <FilenameWithoutPath>sys_privileged_wrap.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\Core\Src\timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Common\Board\board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Common\System\sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/KMS/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\KMS\App\app_kms.c</PathWithFileName>
-      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\LoRaWAN\App\app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\LoRaWAN\App\lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\features_info.c</PathWithFileName>
-      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\lora_info.c</PathWithFileName>
-      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\mbmux.c</PathWithFileName>
-      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_lora.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM0PLUS\MbMux\radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>38</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>39</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>40</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>41</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>42</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>43</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>44</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>45</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>46</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>47</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>48</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>49</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>50</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>10</GroupNumber>
-      <FileNumber>51</FileNumber>
-      <FileType>3</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\2_Images_SECoreBin\MDK-ARM\..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</PathWithFileName>
-      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>11</GroupNumber>
-      <FileNumber>52</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</PathWithFileName>
-      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>11</GroupNumber>
-      <FileNumber>53</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</PathWithFileName>
-      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>11</GroupNumber>
-      <FileNumber>54</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</PathWithFileName>
-      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>55</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>56</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmCtxMgmt.c</PathWithFileName>
-      <FilenameWithoutPath>NvmCtxMgmt.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>57</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</PathWithFileName>
-      <FilenameWithoutPath>FragDecoder.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>58</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpClockSync.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>59</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>60</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpDataDistribution.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpDataDistribution.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>61</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpFirmwareManagement.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>62</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpFragmentation.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>63</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</PathWithFileName>
-      <FilenameWithoutPath>LmhpRemoteMcastSetup.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>64</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>65</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>66</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>67</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>68</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>69</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>70</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>71</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</PathWithFileName>
-      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>72</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</PathWithFileName>
-      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>73</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>74</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>75</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>76</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>77</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</PathWithFileName>
-      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>78</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</PathWithFileName>
-      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>79</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</PathWithFileName>
-      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>80</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</PathWithFileName>
-      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>81</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</PathWithFileName>
-      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>82</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</PathWithFileName>
-      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>83</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</PathWithFileName>
-      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>84</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</PathWithFileName>
-      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/SubGHz_Phy</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>16</GroupNumber>
-      <FileNumber>85</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>16</GroupNumber>
-      <FileNumber>86</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>17</GroupNumber>
-      <FileNumber>87</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>17</GroupNumber>
-      <FileNumber>88</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>17</GroupNumber>
-      <FileNumber>89</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>17</GroupNumber>
-      <FileNumber>90</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>17</GroupNumber>
-      <FileNumber>91</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>17</GroupNumber>
-      <FileNumber>92</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>17</GroupNumber>
-      <FileNumber>93</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>17</GroupNumber>
-      <FileNumber>94</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>::CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>1</RteFlg>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
deleted file mode 100644
index 2887a9a0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
+++ /dev/null
@@ -1,957 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>LoRaWAN_End_Node_DualCore_CM0PLUS</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM0P</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.6</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM0PLUS\Exe\</OutputDirectory>
-          <OutputName>LoRaWAN_End_Node_DualCore_CM0PLUS</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>1</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
-            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
-          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> </TargetDllArguments>
-          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>1</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8020000</StartAddress>
-                <Size>0x20000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20004000</StartAddress>
-                <Size>0x4000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x2000c000</StartAddress>
-                <Size>0x4000</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,DISABLE_IMAGE_STATE_HANDLING</Define>
-              <Undefine></Undefine>
-              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include;../../Linker_Common/MDK-ARM;../../2_Images_SECoreBin/Inc;../../2_Images_SBSFU/Common;../../2_Images_SBSFU/CM0PLUS/SBSFU/App</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange>0x08020000</TextAddressRange>
-            <DataAddressRange>0x20004000</DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>stm32wl55xx_flash_cm0plus.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
-            </File>
-            <File>
-              <FileName>svc_handler.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>.\svc_handler.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Core</GroupName>
-          <Files>
-            <File>
-              <FileName>flash_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\flash_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>ipcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\ipcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>ipcc_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\ipcc_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\main.c</FilePath>
-            </File>
-            <File>
-              <FileName>rtc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\rtc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_lpm_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\stm32_lpm_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\stm32wlxx_it.c</FilePath>
-            </File>
-            <File>
-              <FileName>subghz.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\subghz.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\sys_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_privileged_services.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\sys_privileged_services.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_privileged_wrap.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\sys_privileged_wrap.c</FilePath>
-            </File>
-            <File>
-              <FileName>timer_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\Core\Src\timer_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>board_resources.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Common\Board\board_resources.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_debug.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Common\System\sys_debug.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/KMS/App</GroupName>
-          <Files>
-            <File>
-              <FileName>app_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\KMS\App\app_kms.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/App</GroupName>
-          <Files>
-            <File>
-              <FileName>app_lorawan.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\LoRaWAN\App\app_lorawan.c</FilePath>
-            </File>
-            <File>
-              <FileName>lora_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\LoRaWAN\App\lora_app.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/Target</GroupName>
-          <Files>
-            <File>
-              <FileName>radio_board_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MbMux</GroupName>
-          <Files>
-            <File>
-              <FileName>features_info.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\features_info.c</FilePath>
-            </File>
-            <File>
-              <FileName>LmHandler_mbwrapper.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</FilePath>
-            </File>
-            <File>
-              <FileName>lora_info.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\lora_info.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmux.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\mbmux.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmuxif_lora.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\mbmuxif_lora.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmuxif_radio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\mbmuxif_radio.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmuxif_sys.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\mbmuxif_sys.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmuxif_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\mbmuxif_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>radio_mbwrapper.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM0PLUS\MbMux\radio_mbwrapper.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gtzc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_subghz.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_appli.txt</FileName>
-              <FileType>3</FileType>
-              <FilePath>..\..\2_Images_SECoreBin\MDK-ARM\..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Crypto</GroupName>
-          <Files>
-            <File>
-              <FileName>cmac.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</FilePath>
-            </File>
-            <File>
-              <FileName>lorawan_aes.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</FilePath>
-            </File>
-            <File>
-              <FileName>soft-se.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/LmHandler</GroupName>
-          <Files>
-            <File>
-              <FileName>LmHandler.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</FilePath>
-            </File>
-            <File>
-              <FileName>NvmCtxMgmt.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmCtxMgmt.c</FilePath>
-            </File>
-            <File>
-              <FileName>FragDecoder.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</FilePath>
-            </File>
-            <File>
-              <FileName>LmhpClockSync.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</FilePath>
-            </File>
-            <File>
-              <FileName>LmhpCompliance.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</FilePath>
-            </File>
-            <File>
-              <FileName>LmhpDataDistribution.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpDataDistribution.c</FilePath>
-            </File>
-            <File>
-              <FileName>LmhpFirmwareManagement.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</FilePath>
-            </File>
-            <File>
-              <FileName>LmhpFragmentation.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</FilePath>
-            </File>
-            <File>
-              <FileName>LmhpRemoteMcastSetup.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac</GroupName>
-          <Files>
-            <File>
-              <FileName>LoRaMac.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacAdr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacClassB.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacCommands.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacConfirmQueue.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacCrypto.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacParser.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</FilePath>
-            </File>
-            <File>
-              <FileName>LoRaMacSerializer.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Mac/Region</GroupName>
-          <Files>
-            <File>
-              <FileName>Region.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionAS923.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionAU915.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionCN470.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionCN779.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionCommon.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionEU433.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionEU868.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionIN865.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionKR920.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionRU864.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</FilePath>
-            </File>
-            <File>
-              <FileName>RegionUS915.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/LoRaWAN/Utilities</GroupName>
-          <Files>
-            <File>
-              <FileName>utilities.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/SubGHz_Phy</GroupName>
-          <Files>
-            <File>
-              <FileName>radio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</FilePath>
-            </File>
-            <File>
-              <FileName>radio_driver.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Utilities</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32_adv_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_lpm.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_mem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_seq.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_systime.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_timer.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
-        <targetInfos>
-          <targetInfo name="LoRaWAN_End_Node_DualCore_CM0PLUS"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
deleted file mode 100644
index 7831c0ea..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
+++ /dev/null
@@ -1,953 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>LoRaWAN_End_Node_DualCore_CM4</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>0</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>1</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>1</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0036004F3137510533333639 -O2254 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint/>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>1</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>1</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\sys_sensors.c</PathWithFileName>
-      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\Core\Src\usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Common\System\sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Common\Board\board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/LoRaWAN/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\LoRaWAN\App\app_lorawan.c</PathWithFileName>
-      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\LoRaWAN\App\CayenneLpp.c</PathWithFileName>
-      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\LoRaWAN\App\lora_app.c</PathWithFileName>
-      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\MbMux\LmHandler_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\MbMux\mbmux.c</PathWithFileName>
-      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\MbMux\mbmuxif_lora.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\MbMux\mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\MbMux\mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\MbMux\mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\CM4\MbMux\radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>38</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>39</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>40</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>41</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>42</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>43</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>44</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>45</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>46</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>47</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>48</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>49</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>50</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>51</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>52</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>53</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>54</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>55</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>56</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>57</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>::CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>1</RteFlg>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
deleted file mode 100644
index 464f3fb4..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
+++ /dev/null
@@ -1,727 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>LoRaWAN_End_Node_DualCore_CM4</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM4</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.6</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll></FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile></RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM4\Exe\</OutputDirectory>
-          <OutputName>LoRaWAN_End_Node_DualCore_CM4</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>1</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
-            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 2 1</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments>-REMAP -MPU</SimDllArguments>
-          <SimDlgDll>DCM.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments>-MPU</TargetDllArguments>
-          <TargetDlgDll>TCM.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>1</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>4</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>1</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x4000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x20000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x20000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x4000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x20008000</StartAddress>
-                <Size>0x4000</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM4,STM32WL55xx</Define>
-              <Undefine></Undefine>
-              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../Linker_Common/MDK-ARM</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange>0x08000000</TextAddressRange>
-            <DataAddressRange>0x20000000</DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>stm32wl55xx_flash_cm4.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Core</GroupName>
-          <Files>
-            <File>
-              <FileName>adc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\adc.c</FilePath>
-            </File>
-            <File>
-              <FileName>adc_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\adc_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>ipcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\ipcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>ipcc_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\ipcc_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\main.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_lpm_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\stm32_lpm_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\stm32wlxx_hal_msp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\stm32wlxx_it.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\sys_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_sensors.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\sys_sensors.c</FilePath>
-            </File>
-            <File>
-              <FileName>timer_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\timer_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>usart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\usart.c</FilePath>
-            </File>
-            <File>
-              <FileName>usart_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\Core\Src\usart_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>sys_debug.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Common\System\sys_debug.c</FilePath>
-            </File>
-            <File>
-              <FileName>board_resources.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Common\Board\board_resources.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/LoRaWAN/App</GroupName>
-          <Files>
-            <File>
-              <FileName>app_lorawan.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\LoRaWAN\App\app_lorawan.c</FilePath>
-            </File>
-            <File>
-              <FileName>CayenneLpp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\LoRaWAN\App\CayenneLpp.c</FilePath>
-            </File>
-            <File>
-              <FileName>lora_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\LoRaWAN\App\lora_app.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MbMux</GroupName>
-          <Files>
-            <File>
-              <FileName>LmHandler_mbwrapper.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\MbMux\LmHandler_mbwrapper.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmux.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\MbMux\mbmux.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmuxif_lora.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\MbMux\mbmuxif_lora.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmuxif_radio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\MbMux\mbmuxif_radio.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmuxif_sys.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\MbMux\mbmuxif_sys.c</FilePath>
-            </File>
-            <File>
-              <FileName>mbmuxif_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\MbMux\mbmuxif_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>radio_mbwrapper.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\CM4\MbMux\radio_mbwrapper.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_adc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_adc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_ll_adc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Utilities</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32_adv_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_lpm.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_mem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_seq.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_systime.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_timer.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
-        <targetInfos>
-          <targetInfo name="LoRaWAN_End_Node_DualCore_CM4"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw
deleted file mode 100644
index 50c5ce91..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectWorkspace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_mpw.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <WorkspaceName></WorkspaceName>
-
-  <project>
-    <PathAndName>.\LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx</PathAndName>
-    <NodeIsExpanded>1</NodeIsExpanded>
-    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
-  </project>
-
-  <project>
-    <PathAndName>.\LoRaWAN_End_Node_DualCore_CM4.uvprojx</PathAndName>
-    <NodeIsActive>1</NodeIsActive>
-    <NodeIsExpanded>1</NodeIsExpanded>
-    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
-  </project>
-
-</ProjectWorkspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_cm0plus.ini b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_cm0plus.ini
deleted file mode 100644
index fe7fb629..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_cm0plus.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-/******************************************************************************/
-/* STM32WL_cm0plus.INI: CM0 CPU Initialization File                                           
-/******************************************************************************/
-/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
-/* * All rights reserved.</center>*/
-/*  *
-/*  * This software component is licensed by ST under BSD 3-Clause license,*/
-/*  * the "License"; You may not use this file except in compliance with the */
-/*  * License. You may obtain a copy of the License at:*/
-/*  *                        opensource.org/licenses/BSD-3-Clause*/
-/*  *
-/*  ****************************************************************************/
-/******************************************************************************/
-
-FUNC void Setup (void) {
-  SP = _RDWORD(0x08022200);          // Setup Stack Pointer
-  PC = _RDWORD(0x08022204);          // Setup Program Counter
-   
-}
-
-Setup();                             // Setup for Running
-
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
deleted file mode 100644
index 34b17744..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
+++ /dev/null
@@ -1,259 +0,0 @@
-;******************************************************************************
-;* File Name          : startup_stm32wl55xx_cm0plus.s
-;* Author             : MCD Application Team
-;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == Reset_Handler
-;*                      - Set the vector table entries with the exceptions ISR address
-;*                      - Branches to __main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M0+ processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;* <<< Use Configuration Wizard in Context Menu >>>   
-;******************************************************************************
-;* @attention
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;*
-;******************************************************************************
-
-; Amount of memory (in bytes) allocated for Stack
-; Tailor this value to your application needs
-; <h> Stack Configuration
-;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
-; </h>
-
-Stack_Size		EQU     0x1000
-
-                AREA    STACK, NOINIT, READWRITE, ALIGN=3
-Stack_Mem       SPACE   Stack_Size
-__initial_sp
-
-
-; <h> Heap Configuration
-;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
-; </h>
-
-Heap_Size      EQU     0x400
-
-                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
-__heap_base
-Heap_Mem        SPACE   Heap_Size
-__heap_limit
-
-                PRESERVE8
-                THUMB
-
-
-; Vector Table Mapped to Address 0 at Reset
-                AREA    RESET, DATA, READONLY
-                EXPORT  __Vectors
-                EXPORT  __Vectors_End
-                EXPORT  __Vectors_Size
-
-__Vectors       DCD     __initial_sp                     ; Top of Stack
-                DCD     Reset_Handler                    ; Reset Handler
-                DCD     NMI_Handler                      ; NMI Handler
-                DCD     HardFault_Handler                ; Hard Fault Handler
-                DCD     0                                ; Reserved
-                DCD     0                                ; Reserved
-                DCD     0                                ; Reserved
-                DCD     0                                ; Reserved
-                DCD     0                                ; Reserved
-                DCD     0                                ; Reserved
-                DCD     0                                ; Reserved
-                DCD     SVC_Handler                      ; SVCall Handler
-                DCD     0                                ; Reserved
-                DCD     0                                ; Reserved
-                DCD     PendSV_Handler                   ; PendSV Handler
-                DCD     SysTick_Handler                  ; SysTick Handler
-
-                ; External Interrupts                    
-                DCD     TZIC_ILA_IRQHandler              ; Security Interrupt controller illegal access Interrupts
-                DCD     PVD_PVM_IRQHandler               ; PVD and PVM detector
-                DCD     RTC_LSECSS_IRQHandler            ; RTC Wakeup + RTC Tamper and TimeStamp + RTC Alarms (A & B) + SSR Underflow and LSECSS Interrupts
-                DCD     RCC_FLASH_C1SEV_IRQHandler       ; RCC1 and FLASH and CPU1 M4 SEV Interrupts
-                DCD     EXTI1_0_IRQHandler               ; EXTI Line 1:0 Interrupts
-                DCD     EXTI3_2_IRQHandler               ; XTI Line 3:2 Interrupts
-                DCD     EXTI15_4_IRQHandler              ; EXTI Line 15:4 interrupts
-                DCD     ADC_COMP_DAC_IRQHandler          ; ADC, COMP1, COMP2, DAC Interrupts
-                DCD     DMA1_Channel1_2_3_IRQHandler     ; DMA1 Channel 1 to 3 Interrupts
-                DCD     DMA1_Channel4_5_6_7_IRQHandler   ; DMA1 Channels 4, 5, 6, 7 Interrupts
-                DCD     DMA2_DMAMUX1_OVR_IRQHandler      ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
-                DCD     LPTIM1_IRQHandler                ; LPTIM1 global Interrupt
-                DCD     LPTIM2_IRQHandler                ; LPTIM2 global Interrupt
-                DCD     LPTIM3_IRQHandler                ; LPTIM3 global Interrupt
-                DCD     TIM1_IRQHandler                  ; TIM1 Interrupt
-                DCD     TIM2_IRQHandler                  ; TIM2 Interrupt
-                DCD     TIM16_IRQHandler                 ; TIM16 Interrupt
-                DCD     TIM17_IRQHandler                 ; TIM17 Interrupt
-                DCD     IPCC_C2_RX_C2_TX_IRQHandler      ; IPCC RX Occupied and TX Free Interrupt Interrupts
-                DCD     HSEM_IRQHandler                  ; Semaphore Interrupt
-                DCD     RNG_IRQHandler                   ; RNG Interrupt
-                DCD     AES_PKA_IRQHandler               ; AES and PKA Interrupts
-                DCD     I2C1_IRQHandler                  ; I2C1 Event and Error Interrupt
-                DCD     I2C2_IRQHandler                  ; I2C2 Event and Error Interrupt
-                DCD     I2C3_IRQHandler                  ; I2C3 Event and Error Interrupt
-                DCD     SPI1_IRQHandler                  ; SPI1 Interrupts
-                DCD     SPI2_IRQHandler                  ; SPI2 Interrupt
-                DCD     USART1_IRQHandler                ; USART1 Interrupt
-                DCD     USART2_IRQHandler                ; USART2 Interrupt
-                DCD     LPUART1_IRQHandler               ; LPUART1 Interrupt
-                DCD     SUBGHZSPI_IRQHandler             ; SUBGHZSPI Interrupt
-                DCD     SUBGHZ_Radio_IRQHandler          ; SUBGHZ Radio Interrupt
-__Vectors_End
-
-__Vectors_Size  EQU  __Vectors_End - __Vectors
-
-                AREA    |.text|, CODE, READONLY
-
-; Reset handler
-Reset_Handler    PROC
-                 EXPORT  Reset_Handler                 [WEAK]
-        IMPORT  SystemInit
-        IMPORT  __main
-
-                 LDR     R0, =SystemInit
-                 BLX     R0
-                 LDR     R0, =__main
-                 BX      R0
-                 ENDP
-
-; Dummy Exception Handlers (infinite loops which can be modified)
-
-NMI_Handler     PROC
-                EXPORT  NMI_Handler                    [WEAK]
-                B       .
-                ENDP
-HardFault_Handler\
-                PROC
-                EXPORT  HardFault_Handler              [WEAK]
-                B       .
-                ENDP
-SVC_Handler     PROC
-                EXPORT  SVC_Handler                    [WEAK]
-                B       .
-                ENDP
-PendSV_Handler  PROC
-                EXPORT  PendSV_Handler                 [WEAK]
-                B       .
-                ENDP
-SysTick_Handler PROC
-                EXPORT  SysTick_Handler                [WEAK]
-                B       .
-                ENDP
-
-Default_Handler PROC
-                EXPORT  TZIC_ILA_IRQHandler            [WEAK]
-                EXPORT  PVD_PVM_IRQHandler             [WEAK]
-                EXPORT  RTC_LSECSS_IRQHandler          [WEAK]
-                EXPORT  RCC_FLASH_C1SEV_IRQHandler     [WEAK]
-                EXPORT  EXTI1_0_IRQHandler             [WEAK]
-                EXPORT  EXTI3_2_IRQHandler             [WEAK]
-                EXPORT  EXTI15_4_IRQHandler            [WEAK]
-                EXPORT  ADC_COMP_DAC_IRQHandler        [WEAK]
-                EXPORT  DMA1_Channel1_2_3_IRQHandler   [WEAK]
-                EXPORT  DMA1_Channel4_5_6_7_IRQHandler [WEAK]
-                EXPORT  DMA2_DMAMUX1_OVR_IRQHandler    [WEAK]
-                EXPORT  LPTIM1_IRQHandler              [WEAK]
-                EXPORT  LPTIM2_IRQHandler              [WEAK]
-                EXPORT  LPTIM3_IRQHandler              [WEAK]
-                EXPORT  TIM1_IRQHandler                [WEAK]
-                EXPORT  TIM2_IRQHandler                [WEAK]
-                EXPORT  TIM16_IRQHandler               [WEAK]
-                EXPORT  TIM17_IRQHandler               [WEAK]
-                EXPORT  IPCC_C2_RX_C2_TX_IRQHandler    [WEAK]
-                EXPORT  HSEM_IRQHandler                [WEAK]
-                EXPORT  RNG_IRQHandler                 [WEAK]
-                EXPORT  AES_PKA_IRQHandler             [WEAK]
-                EXPORT  I2C1_IRQHandler                [WEAK]
-                EXPORT  I2C2_IRQHandler                [WEAK]
-                EXPORT  I2C3_IRQHandler                [WEAK]
-                EXPORT  SPI1_IRQHandler                [WEAK]
-                EXPORT  SPI2_IRQHandler                [WEAK]
-                EXPORT  USART1_IRQHandler              [WEAK]
-                EXPORT  USART2_IRQHandler              [WEAK]
-                EXPORT  LPUART1_IRQHandler             [WEAK]
-                EXPORT  SUBGHZSPI_IRQHandler           [WEAK]
-                EXPORT  SUBGHZ_Radio_IRQHandler        [WEAK]
-
-TZIC_ILA_IRQHandler
-PVD_PVM_IRQHandler
-RTC_LSECSS_IRQHandler
-RCC_FLASH_C1SEV_IRQHandler
-EXTI1_0_IRQHandler
-EXTI3_2_IRQHandler
-EXTI15_4_IRQHandler
-ADC_COMP_DAC_IRQHandler
-DMA1_Channel1_2_3_IRQHandler
-DMA1_Channel4_5_6_7_IRQHandler
-DMA2_DMAMUX1_OVR_IRQHandler   
-LPTIM1_IRQHandler
-LPTIM2_IRQHandler
-LPTIM3_IRQHandler
-TIM1_IRQHandler
-TIM2_IRQHandler
-TIM16_IRQHandler
-TIM17_IRQHandler
-IPCC_C2_RX_C2_TX_IRQHandler
-HSEM_IRQHandler
-RNG_IRQHandler
-AES_PKA_IRQHandler
-I2C1_IRQHandler
-I2C2_IRQHandler
-I2C3_IRQHandler
-SPI1_IRQHandler
-SPI2_IRQHandler
-USART1_IRQHandler
-USART2_IRQHandler
-LPUART1_IRQHandler
-SUBGHZSPI_IRQHandler
-SUBGHZ_Radio_IRQHandler
-
-                B       .
-
-                ENDP
-
-                ALIGN
-
-;*******************************************************************************
-; User Stack and Heap initialization
-;*******************************************************************************
-                 IF      :DEF:__MICROLIB
-
-                 EXPORT  __initial_sp
-                 EXPORT  __heap_base
-                 EXPORT  __heap_limit
-
-                 ELSE
-
-                 IMPORT  __use_two_region_memory
-                 EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap
-
-                 LDR     R0, =  Heap_Mem
-                 LDR     R1, =(Stack_Mem + Stack_Size)
-                 LDR     R2, = (Heap_Mem +  Heap_Size)
-                 LDR     R3, = Stack_Mem
-                 BX      LR
-
-                 ALIGN
-
-                 ENDIF
-
-;*******************************************************************************
-; Element for aligning the Firmware binary size on the AES block size (16 bytes)
-;*******************************************************************************
-  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
-				 DCB	"0123456789ABCDE",0
-
-                 END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
deleted file mode 100644
index 6e59e3c7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ /dev/null
@@ -1,371 +0,0 @@
-;******************************************************************************
-;* File Name          : startup_stm32wl55xx_cm4.s
-;* Author             : MCD Application Team
-;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == Reset_Handler
-;*                      - Set the vector table entries with the exceptions ISR address
-;*                      - Branches to __main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the CortexM4 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;* <<< Use Configuration Wizard in Context Menu >>>   
-;******************************************************************************
-;* @attention
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;*
-;******************************************************************************
-
-; Amount of memory (in bytes) allocated for Stack
-; Tailor this value to your application needs
-; <h> Stack Configuration
-;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
-; </h>
-
-Stack_Size		EQU     0x1000
-
-                AREA    STACK, NOINIT, READWRITE, ALIGN=3
-Stack_Mem       SPACE   Stack_Size
-__initial_sp
-
-
-; <h> Heap Configuration
-;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
-; </h>
-
-Heap_Size      EQU     0x400
-
-                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
-__heap_base
-Heap_Mem        SPACE   Heap_Size
-__heap_limit
-
-                PRESERVE8
-                THUMB
-
-
-; Vector Table Mapped to Address 0 at Reset
-                AREA    RESET, DATA, READONLY
-                EXPORT  __Vectors
-                EXPORT  __Vectors_End
-                EXPORT  __Vectors_Size
-
-__Vectors       DCD     __initial_sp                      ; Top of Stack
-                DCD     Reset_Handler                     ; Reset Handler
-                DCD     NMI_Handler                       ; NMI Handler
-                DCD     HardFault_Handler                 ; Hard Fault Handler
-                DCD     MemManage_Handler                 ; MPU Fault Handler
-                DCD     BusFault_Handler                  ; Bus Fault Handler
-                DCD     UsageFault_Handler                ; Usage Fault Handler
-                DCD     0                                 ; Reserved
-                DCD     0                                 ; Reserved
-                DCD     0                                 ; Reserved
-                DCD     0                                 ; Reserved
-                DCD     SVC_Handler                       ; SVCall Handler
-                DCD     DebugMon_Handler                  ; Debug Monitor Handler
-                DCD     0                                 ; Reserved
-                DCD     PendSV_Handler                    ; PendSV Handler
-                DCD     SysTick_Handler                   ; SysTick Handler
-
-                ; External Interrupts
-                DCD     WWDG_IRQHandler                   ; Window WatchDog
-                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
-                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
-                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
-                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
-                DCD     RCC_IRQHandler                    ; RCC Interrupt
-                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
-                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
-                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
-                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
-                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
-                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
-                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
-                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
-                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
-                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
-                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
-                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
-                DCD     ADC_IRQHandler                    ; ADC Interrupt
-                DCD     DAC_IRQHandler                    ; DAC Interrupt
-                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
-                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
-                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
-                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
-                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
-                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
-                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
-                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
-                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
-                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
-                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
-                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
-                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
-                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
-                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
-                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
-                DCD     USART1_IRQHandler                 ; USART1 Interrupt
-                DCD     USART2_IRQHandler                 ; USART2 Interrupt
-                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
-                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
-                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
-                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
-                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
-                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
-                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
-                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
-                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
-                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
-                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
-                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
-                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
-                DCD     AES_IRQHandler                    ; AES Interrupt
-                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
-                DCD     PKA_IRQHandler                    ; PKA Interrupt
-                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
-                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
-                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
-                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
-                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
-                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
-                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
-                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
-
-__Vectors_End
-
-__Vectors_Size  EQU  __Vectors_End - __Vectors
-
-                AREA    |.text|, CODE, READONLY
-
-; Reset handler
-Reset_Handler    PROC
-                 EXPORT  Reset_Handler                 [WEAK]
-        IMPORT  SystemInit
-        IMPORT  __main
-
-                 LDR     R0, =SystemInit
-                 BLX     R0
-                 LDR     R0, =__main
-                 BX      R0
-                 ENDP
-
-; Dummy Exception Handlers (infinite loops which can be modified)
-
-NMI_Handler     PROC
-                EXPORT  NMI_Handler                    [WEAK]
-                B       .
-                ENDP
-HardFault_Handler\
-                PROC
-                EXPORT  HardFault_Handler              [WEAK]
-                B       .
-                ENDP
-MemManage_Handler\
-                PROC
-                EXPORT  MemManage_Handler              [WEAK]
-                B       .
-                ENDP
-BusFault_Handler\
-                PROC
-                EXPORT  BusFault_Handler               [WEAK]
-                B       .
-                ENDP
-UsageFault_Handler\
-                PROC
-                EXPORT  UsageFault_Handler             [WEAK]
-                B       .
-                ENDP
-SVC_Handler     PROC
-                EXPORT  SVC_Handler                    [WEAK]
-                B       .
-                ENDP
-DebugMon_Handler\
-                PROC
-                EXPORT  DebugMon_Handler               [WEAK]
-                B       .
-                ENDP
-PendSV_Handler  PROC
-                EXPORT  PendSV_Handler                 [WEAK]
-                B       .
-                ENDP
-SysTick_Handler PROC
-                EXPORT  SysTick_Handler                [WEAK]
-                B       .
-                ENDP
-
-Default_Handler PROC
-
-                EXPORT  WWDG_IRQHandler                   [WEAK]
-                EXPORT  PVD_PVM_IRQHandler                [WEAK]
-                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
-                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
-                EXPORT  FLASH_IRQHandler                  [WEAK]
-                EXPORT  RCC_IRQHandler                    [WEAK]
-                EXPORT  EXTI0_IRQHandler                  [WEAK]
-                EXPORT  EXTI1_IRQHandler                  [WEAK]
-                EXPORT  EXTI2_IRQHandler                  [WEAK]
-                EXPORT  EXTI3_IRQHandler                  [WEAK]
-                EXPORT  EXTI4_IRQHandler                  [WEAK]
-                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
-                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
-                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
-                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
-                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
-                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
-                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
-                EXPORT  ADC_IRQHandler                    [WEAK]
-                EXPORT  DAC_IRQHandler                    [WEAK]
-                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
-                EXPORT  COMP_IRQHandler                   [WEAK]
-                EXPORT  EXTI9_5_IRQHandler                [WEAK]
-                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
-                EXPORT  TIM1_UP_IRQHandler                [WEAK]
-                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
-                EXPORT  TIM1_CC_IRQHandler                [WEAK]
-                EXPORT  TIM2_IRQHandler                   [WEAK]
-                EXPORT  TIM16_IRQHandler                  [WEAK]
-                EXPORT  TIM17_IRQHandler                  [WEAK]
-                EXPORT  I2C1_EV_IRQHandler                [WEAK]
-                EXPORT  I2C1_ER_IRQHandler                [WEAK]
-                EXPORT  I2C2_EV_IRQHandler                [WEAK]
-                EXPORT  I2C2_ER_IRQHandler                [WEAK]
-                EXPORT  SPI1_IRQHandler                   [WEAK]
-                EXPORT  SPI2_IRQHandler                   [WEAK]
-                EXPORT  USART1_IRQHandler                 [WEAK]
-                EXPORT  USART2_IRQHandler                 [WEAK]
-                EXPORT  LPUART1_IRQHandler                [WEAK]
-                EXPORT  LPTIM1_IRQHandler                 [WEAK]
-                EXPORT  LPTIM2_IRQHandler                 [WEAK]
-                EXPORT  EXTI15_10_IRQHandler              [WEAK]
-                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
-                EXPORT  LPTIM3_IRQHandler                 [WEAK]
-                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
-                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
-                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
-                EXPORT  HSEM_IRQHandler                   [WEAK]
-                EXPORT  I2C3_EV_IRQHandler                [WEAK]
-                EXPORT  I2C3_ER_IRQHandler                [WEAK]
-                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
-                EXPORT  AES_IRQHandler                    [WEAK]
-                EXPORT  RNG_IRQHandler                    [WEAK]
-                EXPORT  PKA_IRQHandler                    [WEAK]
-                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
-                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
-                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
-                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
-                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
-                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
-                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
-                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
-
-WWDG_IRQHandler
-PVD_PVM_IRQHandler
-TAMP_STAMP_LSECSS_SSRU_IRQHandler
-RTC_WKUP_IRQHandler
-FLASH_IRQHandler
-RCC_IRQHandler
-EXTI0_IRQHandler
-EXTI1_IRQHandler
-EXTI2_IRQHandler
-EXTI3_IRQHandler
-EXTI4_IRQHandler
-DMA1_Channel1_IRQHandler
-DMA1_Channel2_IRQHandler
-DMA1_Channel3_IRQHandler
-DMA1_Channel4_IRQHandler
-DMA1_Channel5_IRQHandler
-DMA1_Channel6_IRQHandler
-DMA1_Channel7_IRQHandler
-ADC_IRQHandler
-DAC_IRQHandler
-C2SEV_PWR_C2H_IRQHandler
-COMP_IRQHandler
-EXTI9_5_IRQHandler
-TIM1_BRK_IRQHandler
-TIM1_UP_IRQHandler
-TIM1_TRG_COM_IRQHandler
-TIM1_CC_IRQHandler
-TIM2_IRQHandler
-TIM16_IRQHandler
-TIM17_IRQHandler
-I2C1_EV_IRQHandler
-I2C1_ER_IRQHandler
-I2C2_EV_IRQHandler
-I2C2_ER_IRQHandler
-SPI1_IRQHandler
-SPI2_IRQHandler
-USART1_IRQHandler                
-USART2_IRQHandler
-LPUART1_IRQHandler
-LPTIM1_IRQHandler
-LPTIM2_IRQHandler
-EXTI15_10_IRQHandler
-RTC_Alarm_IRQHandler
-LPTIM3_IRQHandler
-SUBGHZSPI_IRQHandler
-IPCC_C1_RX_IRQHandler
-IPCC_C1_TX_IRQHandler
-HSEM_IRQHandler
-I2C3_EV_IRQHandler
-I2C3_ER_IRQHandler
-SUBGHZ_Radio_IRQHandler
-AES_IRQHandler
-RNG_IRQHandler
-PKA_IRQHandler
-DMA2_Channel1_IRQHandler
-DMA2_Channel2_IRQHandler
-DMA2_Channel3_IRQHandler
-DMA2_Channel4_IRQHandler
-DMA2_Channel5_IRQHandler
-DMA2_Channel6_IRQHandler
-DMA2_Channel7_IRQHandler
-DMAMUX1_OVR_IRQHandler
-
-                B       .
-
-                ENDP
-
-                ALIGN
-
-;*******************************************************************************
-; User Stack and Heap initialization
-;*******************************************************************************
-                 IF      :DEF:__MICROLIB
-
-                 EXPORT  __initial_sp
-                 EXPORT  __heap_base
-                 EXPORT  __heap_limit
-
-                 ELSE
-
-                 IMPORT  __use_two_region_memory
-                 EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap
-
-                 LDR     R0, =  Heap_Mem
-                 LDR     R1, =(Stack_Mem + Stack_Size)
-                 LDR     R2, = (Heap_Mem +  Heap_Size)
-                 LDR     R3, = Stack_Mem
-                 BX      LR
-
-                 ALIGN
-
-                 ENDIF
-
-;*******************************************************************************
-; Element for aligning the Firmware binary size on the AES block size (16 bytes)
-;*******************************************************************************
-  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
-				 DCB	"0123456789ABCDE",0
-
-                 END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/readme.txt
deleted file mode 100644
index cd659a53..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/readme.txt
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
-  @page LoRaWAN_End_Node_DualCore Readme file
- 
-  @verbatim
-  ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/readme.txt 
-  * @author  MCD Application Team
-  * @brief   This application is a simple demo application software of a LoRa
-  *          modem connecting to Network server. Data sent can be checked on 
-  *          Network server for eg Loriot. Traces are displayed over UART
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Description
-
-This directory contains a set of source files that implements a Dual Core (CM4 / CM0) LoRa application
-device sending sensors data to LoRa Network server.
-
-This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
-  ******************************************************************************
-
-@par Keywords
-
-Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FUOTA, SBSFU, KMS
-
-@par Directory contents 
-
-
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h             Maps the NVIC functions on _SVC for Unpriviledge usage
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/flash_if.h                       This file contains definitions for FLASH Interface functionalities.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h                           This file contains all the function prototypes for
-                                                                                the ipcc.c file
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h                        This file contains the interface of the ipcc driver on CM0PLUS.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h                         This file contains kms interfaces with middleware
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h                           : Header for main.c file.
-                                                                                This file contains the common defines of the application.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h                       Header for General HW instances configuration
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h                            This file contains all the function prototypes for
-                                                                                the rtc.c file
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             HAL configuration file.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h                   This file contains the headers of the interrupt handlers.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h                   Header for Low Power Manager interface configuration
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h                         This file contains all the function prototypes for
-                                                                                the subghz.c file
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h                        Function prototypes for sys_app.c file
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h                       Applicative configuration, e.g. : debug, trace, low power, sensors
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h        Maps sys_privileged_wrap functions on SVC and API to cortex services
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h            This file contains all the function prototypes for
-                                                                                the sys_privileged_wrap.c file
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h                       configuration of the timer_if.c instances
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h                 Header for configuration file to utilities
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h                  Definitions for modules requiring utilities
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h                         !!! No description found !!!
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h                 Header of application of the LRWAN Middleware
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h               End-device commissioning parameters
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h                    Header of application of the LRWAN Middleware
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h            Definition the version of the CM0PLUS application
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h                 Secure Element identity and keys
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h             Header for LoRaWAN middleware instances
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h              Configure (enable/disable) traces for CM0
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h           Header for Radio interface configuration
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h               Header of Radio configuration
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h                  Map middleware systime
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h                    Wrapper to timer server
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h               This file implements the CM0PLUS side wrapper of the LmHandler
-                                                                                interface shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h                             API which interfaces CM0PLUS to IPCC
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h                       Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h                      API provided to CM0PLUS applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                     API for CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                       API for CM0PLUS applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                     API for CM0PLUS applic to register and handle TRACE via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                   This file implements the CM0PLUS side wrapper of the Radio interface
-                                                                                shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h                                This file contains all the function prototypes for
-                                                                                the adc.c file
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h                             Header for ADC interface configuration
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h                                This file contains all the function prototypes for
-                                                                                the dma.c file
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h                               This file contains all the function prototypes for
-                                                                                the ipcc.c file
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h                            This file contains the interface of the ipcc driver on CM4.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h                               : Header for main.c file.
-                                                                                This file contains the common defines of the application.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h                           Header for General HW instances configuration
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h                 HAL configuration file.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h                       This file contains the headers of the interrupt handlers.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h                       Header for Low Power Manager interface configuration
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h                            Function prototypes for sys_app.c file
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h                           Applicative configuration, e.g. : debug, trace, low power, sensors
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h                        Header for sensors application
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h                           configuration of the timer_if.c instances
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h                              This file contains all the function prototypes for
-                                                                                the usart.c file
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h                           Header for USART interface configuration
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h                     Header for configuration file to utilities
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h                      Definitions for modules requiring utilities
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h                     Header of application of the LRWAN Middleware
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h                      Implements the Cayenne Low Power Protocol
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h                        Header of application of the LRWAN Middleware
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h                Definition the version of the CM4 application
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h                 Header for LoRaWAN middleware instances
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h                      Map middleware systime
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h                        Wrapper to timer server
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h                   This file implements the CM4 side wrapper of the LmHandler
-                                                                                interface shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h                                 API which interfaces CM4 to IPCC
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.h                           Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h                          API provided to CM4 applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h                         API for CM4 applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h                           API for CM4 applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h                         API for CM4 applic to register and handle TRACE via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h                       This file implements the CM4 side wrapper of the Radio interface
-                                                                                shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/Common/Board/board_resources.h                    Header for driver at.c module
-  - LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h              STM32WLxx_Nucleo board configuration file.
-  - LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h                      Feature list and parameters TypeDefinitions
-  - LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h                          To give info to the application about LoRaWAN configuration
-  - LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h                        Maps the IPCC channels to memory buffers
-  - LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h                             MBMUX message ID enumeration
-  - LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h                         Configuration of the debug.c instances
-
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/flash_if.c                       FLASH Interface module.
-                                                                                This file provides set of firmware functions to manage Flash
-                                                                                Interface functionalities.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c                           This file provides code for the configuration
-                                                                                of the IPCC instances.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c                        Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c                           : Main program body
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c                            This file provides code for the configuration
-                                                                                of the RTC instances.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                   Interrupt Service Routines.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                   Low layer function to enter/exit low power modes (stop, sleep)
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c                         This file provides code for the configuration
-                                                                                of the SUBGHZ instances.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c                        Initializes HW and SW system entities (not related to the radio)
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c        gives access to COrtex services like ThumbState, SVC, MPU
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c            Wrapper functions to call SVC when in Unprivilege mode
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c                       Configure RTC Alarm, Tick and Calendar manager
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c                         !!! No description found !!!
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c                 Application of the LRWAN Middleware
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c                    Application of the LRWAN Middleware
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c           This file provides an interface layer between MW and Radio Board
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c                     CM0PLUS supported features list
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c               This file implements the CM0PLUS side wrapper of the LoraMac interface
-                                                                                shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c                         To give info to the application about LoRaWAN configuration
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c                             Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c                       Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c                      allows CM0 applic to register and handle LoraWAN to MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                     allows CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                       allows CM0 applic to handle the SYSTEM MBMUX channel
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                     Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                   This file implements the CM0 side wrapper of the Radio interface
-                                                                                shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c                                This file provides code for the configuration
-                                                                                of the ADC instances.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c                             Read status related to the chip (battery level, VREF, chip temperature)
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c                                This file provides code for the configuration
-                                                                                of all the requested memory to memory DMA transfers.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c                               This file provides code for the configuration
-                                                                                of the IPCC instances.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c                            Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c                               : Main program body
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c                  This file provides code for the MSP Initialization
-                                                                                and de-Initialization codes.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c                       Interrupt Service Routines.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c                       Low layer function to enter/exit low power modes (stop, sleep)
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c                            Initializes HW and SW system entities (not related to the radio)
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c                        Manages the sensors on the application
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c                           Configure RTC Alarm, Tick and Calendar manager
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c                              This file provides code for the configuration
-                                                                                of the USART instances.
-  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c                           Configuration of UART MX driver interface for hyperterminal communication
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c                     Application of the LRWAN Middleware
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c                      Implements the Cayenne Low Power Protocol
-  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c                        Application of the LRWAN Middleware
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c                   This file implements the CM4 side wrapper of the LoraMac interface
-                                                                                shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c                                 CM4 side multiplexer to map features to IPCC channels
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_kms.c                           Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c                          allows CM4 applic to register and handle LoraWAN via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c                         allows CM4 applic to register and handle RADIO driver via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c                           allows CM4 applic to handle the SYSTEM MBMUX channel.
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c                         allows CM4 applic to receive by CM0 TRACE via MBMUX
-  - LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c                       This file implements the CM4 side wrapper of the Radio interface
-                                                                                shared between M0 and M4.
-  - LoRaWAN_End_Node_DualCore/Common/Board/board_resources.c                    Source file
-  - LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c                  CMSIS Cortex Device Peripheral Access Layer System Source File
-  - LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c                         Enables 4 debug pins for internal signals RealTime debugging
-
-
-@par Hardware and Software environment 
-
-  - This example runs on the STM32WLxx Nucleo board.
-
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
-      to ST-LINK connector.
-    - Please ensure that the ST-LINK connector jumpers are fitted.
-
-  - Configure the software via the configuration files:
-    - CM0PLUS (Mw and radio drivers config) 
-        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, radio_board_if.h, main.h, etc
-    - CM4 (Lora appli)
-        - sys_conf.h, lora_app.h, nucleo_conf.h, main.h, etc
-    - Careful: 
-        - the region and class chosen on CM4/LoRaWAN/App/lora_app.h shall be compatible with CM0PLUS/LoRaWAN/Target/lorawan_conf.h list
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
-
-  -Set Up:
-
-             --------------------------  V    V  --------------------------
-             |      LoRa Object       |  |    |  |      LoRa Network      |
-             |                        |  |    |  |                        |
-   ComPort<--|                        |--|    |--|                        |-->Web Server
-             |                        |          |                        |
-             --------------------------          --------------------------
-
-@par How to use it ? 
-In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
-  - Rebuild all CM4 files and load your image into CM4 target memory
-  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory 
-  - Reset the system (two cores)
-  - Run the example
-  - Open a Terminal, connected the LoRa Object
-  - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
-
-@par How to use IAR to debug ? 
-  - open project.eww and select CM4 project
-  - make sure the flag DEBUGGER_ON =1 in app_conf.h
-  - better to define the flag LOW_POWER_DISABLE = 1 at least on one MCU (currently debugger has problem in dual core STOP mode)
-  - compile and download (Ctrl + D)
-  - put a breakpoint in sys_app.c one line after HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-  - run CM4 (the above functions sets PWR_CR4_C2BOOT flag)
-  - open a second instance of project.eww and select CM0PLUS project
-  - compile and download using "Download active application" 
-  - once CM0PLUS code is downloaded reset (system reset) the CM4
-  - run CM4 to the breakpoint again
-  - attach to running target CM0PLUS 
-         (CM0PLUS is in a while loop waiting CM4 to give green light to go further)
-         (this is done to prevent CM0PLUS to execute too much code before attaching)
-  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exite the while loop
-
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/EWARM/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/EWARM/build.bat
index df4348a7..5d0ff371 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/EWARM/build.bat
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/EWARM/build.bat
@@ -2,10 +2,12 @@
 setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 cls
 
+set "current_dir=%~dp0"
+
 echo ###########################################
 echo # 0- Set all global variables
 echo ###########################################
-call ..\setenv.bat
+call %current_dir%..\setenv.bat
 set compile_all_projects=1
 set rebuild=1
 
@@ -25,29 +27,27 @@ if not "%1"=="" (
 
 if %compile_all_projects% equ 1 (
   echo ###########################################
-  echo # 1- Compile all SBSFU projects
+  echo # 1- Compile all BFU projects
   echo ###########################################
-  call :compile_func ..\..\2_Images_KMS_Blob\EWARM\Project.ewp || goto :eof
-  call :compile_func ..\..\2_Images_SECoreBin\EWARM\Project.ewp || goto :eof
-  call :compile_func ..\..\2_Images_SBSFU\EWARM\cm0plus.ewp || goto :eof
-  call :compile_func ..\..\2_Images_SBSFU\EWARM\cm4.ewp || goto :eof
+  call :compile_func %current_dir%..\..\1_Image_KMS_Blob\EWARM\Project.ewp || goto :eof
+  call :compile_func %current_dir%..\..\1_Image_SECoreBin\EWARM\Project.ewp || goto :eof
+  call :compile_func %current_dir%..\..\1_Image_BFU\EWARM\Project.ewp || goto :eof
 )
 
 echo ###########################################
-echo # 2- Compile Application projects
+echo # 2- Compile Application project
 echo ###########################################
-call :compile_func ..\..\LoRaWAN_End_Node_DualCore\EWARM\LoRaWAN_End_Node_DualCore_CM0PLUS.ewp || goto :eof
-call :compile_func ..\..\LoRaWAN_End_Node_DualCore\EWARM\LoRaWAN_End_Node_DualCore_CM4.ewp || goto :eof
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node\EWARM\LoRaWAN_End_Node.ewp || goto :eof
 
 exit /B 0
 
 :--------------------------------------
 :compile_func
   if %rebuild% equ 1 (
-    %EWARM_EXE% "%~dp0%~1" -clean * -parallel 10
-    %EWARM_EXE% "%~dp0%~1" -make * -parallel 10
+    %EWARM_EXE% "%~1" -clean * -parallel 10
+    %EWARM_EXE% "%~1" -make * -parallel 10
   ) else (
-    %EWARM_EXE% "%~dp0%~1" * -parallel 10
+    %EWARM_EXE% "%~1" * -parallel 10
   )
   if %errorlevel% neq 0 (
     echo Error: Compilation of %~1 Failed. Abort of compile batch ...
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/EWARM/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/EWARM/program.bat
index 13dc4292..225cb73a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/EWARM/program.bat
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/EWARM/program.bat
@@ -2,15 +2,17 @@
 setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 cls
 
+set "current_dir=%~dp0"
+
 echo ###########################################
 echo # 0- Set all global variables
 echo ###########################################
-call ..\setenv.bat
+call %current_dir%..\setenv.bat
 
 echo ###########################################
 echo # 1- Disable security
 echo ###########################################
-call ..\disable_security.bat || goto :eof
+call %current_dir%..\disable_security.bat || goto :eof
 if %errorlevel% neq 0 goto :eof
 
 echo ###########################################
@@ -25,8 +27,9 @@ if %errorlevel% neq 0 (
 echo ###########################################
 echo # 3- Download binaries
 echo ###########################################
-call :download_file ..\..\LoRaWAN_End_Node_DualCore\Binary\SBSFU_UserApp_M4.bin Big_Binary 0x08000000 || goto :eof
+call :download_file %current_dir%..\..\LoRaWAN_End_Node\EWARM\Binary\BFU_LoRaWAN_End_Node.bin Big_Binary 0x08000000 || goto :eof
 
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
 exit /B 0
 
 :--------------------------------------
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/MDK-ARM/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/MDK-ARM/build.bat
index 0120cfff..6dd32893 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/MDK-ARM/build.bat
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/MDK-ARM/build.bat
@@ -2,10 +2,12 @@
 setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 cls
 
+set "current_dir=%~dp0"
+
 echo ###########################################
 echo # 0- Set all global variables
 echo ###########################################
-call ..\setenv.bat
+call %current_dir%..\setenv.bat
 set compile_all_projects=1
 
 REM Get Arguments
@@ -21,31 +23,27 @@ if not "%1"=="" (
 
 if %compile_all_projects% equ 1 (
   echo ###########################################
-  echo # 1- Compile all SBSFU projects
+  echo # 1- Compile all BFU projects
   echo ###########################################
-  echo Build 2_Images_KMS_Blob
-  call :compile_func ..\..\2_Images_KMS_Blob\MDK-ARM\Project.uvprojx || goto :eof
-  echo Build 2_Images_SECoreBin
-  call :compile_func ..\..\2_Images_SECoreBin\MDK-ARM\Project.uvprojx || goto :eof
-  echo Build 2_Images_SBSFU\CM0PLUS
-  call :compile_func ..\..\2_Images_SBSFU\MDK-ARM\CM0PLUS.uvprojx || goto :eof
-  echo Build 2_Images_SBSFU\CM4
-  call :compile_func ..\..\2_Images_SBSFU\MDK-ARM\CM4.uvprojx || goto :eof
+  echo Build 1_Image_KMS_Blob
+  call :compile_func %current_dir%..\..\1_Image_KMS_Blob\MDK-ARM\Project.uvprojx || goto :eof
+  echo Build 1_Image_SECoreBin
+  call :compile_func %current_dir%..\..\1_Image_SECoreBin\MDK-ARM\Project.uvprojx || goto :eof
+  echo Build 1_Image_BFU
+  call :compile_func %current_dir%..\..\1_Image_BFU\MDK-ARM\Project.uvprojx || goto :eof
 )
 
 echo ###########################################
 echo # 2- Compile Application projects
 echo ###########################################
-echo Build LoRaWAN_End_Node_DualCore\CM0PLUS
-call :compile_func ..\..\LoRaWAN_End_Node_DualCore\MDK-ARM\LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx || goto :eof
-echo Build LoRaWAN_End_Node_DualCore\CM4
-call :compile_func ..\..\LoRaWAN_End_Node_DualCore\MDK-ARM\LoRaWAN_End_Node_DualCore_CM4.uvprojx || goto :eof
+echo Build LoRaWAN_End_Node
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node\MDK-ARM\LoRaWAN_End_Node.uvprojx || goto :eof
 
 exit /B 0
 
 :--------------------------------------
 :compile_func
-  %MDK_EXE% -r "%~dp0%~1" -o "%~dp0\temp.log" -j0
+  %MDK_EXE% -r "%~1" -o "%~dp0\temp.log" -j0
   REM return 0 if OK, 1 if warning, 2 if error
   if %errorlevel% equ 2 (
     type "%~dp0\temp.log"
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/MDK-ARM/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/MDK-ARM/program.bat
new file mode 100644
index 00000000..529afb66
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/MDK-ARM/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\LoRaWAN_End_Node\MDK-ARM\Binary\BFU_LoRaWAN_End_Node.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the BFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/STM32CubeIDE/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/STM32CubeIDE/build.bat
new file mode 100644
index 00000000..9e027fed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/STM32CubeIDE/build.bat
@@ -0,0 +1,72 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+set rebuild=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if "%1"=="-norebuild" (
+    set rebuild=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+set "workspacedir=%current_dir%..\..\LoRaWAN_End_Node\ws"
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all BFU projects
+  echo ###########################################
+  call :compile_func %current_dir%..\..\1_Image_KMS_Blob\STM32CubeIDE || goto :eof
+  call :compile_func %current_dir%..\..\1_Image_SECoreBin\STM32CubeIDE || goto :eof
+  call :compile_func %current_dir%..\..\1_Image_BFU\STM32CubeIDE || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node\STM32CubeIDE || goto :eof
+
+rmdir %workspacedir% /s /q
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  if not exist %workspacedir% (
+    mkdir %workspacedir% 2>NUL
+    if %ERRORLEVEL% NEQ 0 exit /B 1
+  ) else (
+    del /q "%workspacedir%\*"
+    for /D %%p in ("%workspacedir%\*.*") do rmdir "%%p" /s /q
+  )
+  %CUBEIDE_EXE% --launcher.suppressErrors -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data "%workspacedir%" -import "%~1" -build all
+  if %errorlevel% neq 0 (
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| -norebuild ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude BFU projects)
+  echo -norebuild  Partial compilation
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/STM32CubeIDE/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/STM32CubeIDE/program.bat
new file mode 100644
index 00000000..92845551
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/STM32CubeIDE/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\LoRaWAN_End_Node\STM32CubeIDE\Binary\BFU_LoRaWAN_End_Node.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the BFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/setenv.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/setenv.bat
index d2180225..c8c00c32 100644
--- a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/setenv.bat
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/Scripts/setenv.bat
@@ -1,4 +1,4 @@
 set CUBEPROG_EXE="C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin\STM32_Programmer_CLI.exe"
 set EWARM_EXE="C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.1\common\bin\IarBuild.exe"
 set MDK_EXE="C:\Keil_v5\UV4\UV4.exe"
-set CUBEIDE_EXE="C:\ST\STM32CubeIDE_1.5.0.20w40\STM32CubeIDE\stm32cubeidec.exe"
\ No newline at end of file
+set CUBEIDE_EXE="C:\ST\STM32CubeIDE_1.6.0\STM32CubeIDE\stm32cubeidec.exe"
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/iv.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/iv.bin
new file mode 100644
index 00000000..87418a0d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Binary/iv.bin
@@ -0,0 +1 @@
+�!Eˠ;P=����+�f
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
new file mode 100644
index 00000000..6f66889b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
@@ -0,0 +1,1054 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\KMS_Blob.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..e6140477
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,21 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+
+define region ROM_region   = mem:[from 0 to 0x8000];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+
+place in ROM_region   { section .KMS_blob_Keys, last section aes_block_padding };
+keep { section .KMS_blob_Keys };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
new file mode 100644
index 00000000..ec939c17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
@@ -0,0 +1,14 @@
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+
+; *** regions needed by KMS_Blob project ***
+LR_ROM (0x00000000) ALIGN(16) {
+  ROM_region +0 {
+  *(.KMS_blob_Keys)
+  .ANY (+RO)
+  }
+  ALIGN_region +0 ALIGN(16) EMPTY(16) {
+  }
+} 
+ 
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..4c05c195
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>KMS_blob</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../2_Images_SECoreBin/Inc</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>0</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>KMS_Blob.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--diag_suppress L6305W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>kms_blob_example_keys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_KMS_Blob"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..a4620af6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../2_Images_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/KMS_Blob.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_KMS_Blob.null.1082786794" name="2_Images_KMS_Blob"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
new file mode 100644
index 00000000..cf21882e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
@@ -0,0 +1,29 @@
+/*
+** LinkerScript
+*/
+
+APPLI_region_ROM_start    = 0x00000000;
+APPLI_region_ROM_length   = 0x8000;
+
+/* Specify the memory areas */
+MEMORY
+{
+ APPLI_region_ROM  : ORIGIN = APPLI_region_ROM_start, LENGTH = APPLI_region_ROM_length
+}
+
+/* Define output sections */
+SECTIONS
+{
+  .rodata :
+  {
+    . = ALIGN(16);
+    KEEP(*(.KMS_blob_Keys))
+    . = ALIGN(16);
+  } >APPLI_region_ROM
+  
+  /DISCARD/ :
+  {
+    *(.init)
+    *(.fini)
+  }
+}
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
new file mode 100644
index 00000000..64af9746
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
@@ -0,0 +1,153 @@
+/**
+  ******************************************************************************
+  * @file    kms_blob_example_key.c
+  * @author  MCD Application Team
+  * @brief   Key Management Services module.
+  *          This file provides examples of data to be loaded as a blob
+  *          (provisioning).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#if !defined(KMS_ENABLED)
+#define KMS_ENABLED
+#endif /* KMS_ENABLED */
+
+#include "kms.h"
+#include "kms_platf_objects_interface.h"
+
+/* Custom Structures declaration */
+KMS_DECLARE_BLOB_STRUCT(, 225)
+KMS_DECLARE_BLOB_STRUCT(, 36)
+
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".KMS_blob_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".KMS_blob_Keys"
+#else
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* __ICCARM__ */
+
+const kms_obj_keyhead_225_t   Test_Key_RSA_2048 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,          /*   uint32_t configuration;     */
+  900,                             /*   uint32_t blobs_size;        */
+  11,                              /*   uint32_t blobs_count;       */
+  KMS_KEY_RSA2048_OBJECT_HANDLE,   /*   uint32_t object_id;         */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PRIVATE_KEY,               /* CLASS = PRIVATE KEY */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_RSA,                           /* TYPE = RSA KEY */
+    CKA_TOKEN,        4, CK_TRUE,
+    CKA_LABEL,        16, 0x52455355U, 0x424F4C42U, 0x20415352U, 0x38343032U, /* 'USER', 'BLOB', 'RSA ', '2048' */
+    CKA_ID,           4, 123,
+    CKA_SENSITIVE,    4, CK_TRUE,                                             /* SENSITIVE KEY */
+    CKA_VERIFY,       4, CK_TRUE,                                             /* CAN BE USED FOR VERIFICATION */
+    CKA_SIGN,         4, CK_TRUE,                                             /* CAN BE USED FOR SIGNATURE */
+
+    CKA_MODULUS,      256,                                                    /* RSA KEY MODULUS */
+    0xcea80475U, 0x324c1dc8U, 0x34782781U, 0x8da58bacU,
+    0x069d3419U, 0xc614a6eaU, 0x1ac6a3b5U, 0x10dcd72cU,
+    0xc5169549U, 0x05e9fef9U, 0x08d45e13U, 0x006adf27U,
+    0xd467a7d8U, 0x3c111d1aU, 0x5df15ef2U, 0x93771aefU,
+    0xb920032aU, 0x5bb989f8U, 0xe4f5e1b0U, 0x5093d3f1U,
+    0x30f984c0U, 0x7a772a36U, 0x83f4dc6fU, 0xb28a9681U,
+    0x5b32123cU, 0xcdd13954U, 0xf19d5b8bU, 0x24a103e7U,
+    0x71a34c32U, 0x8755c65eU, 0xd64e1924U, 0xffd04d30U,
+    0xb2142cc2U, 0x62f6e004U, 0x8fef6dbcU, 0x652f2147U,
+    0x9ea1c4b1U, 0xd66d28f4U, 0xd46ef718U, 0x5e390cbfU,
+    0xa2e02380U, 0x582f3188U, 0xbb94ebbfU, 0x05d31487U,
+    0xa09aff01U, 0xfcbb4cd4U, 0xbfd1f0a8U, 0x33b38c11U,
+    0x813c8436U, 0x0bb53c7dU, 0x4481031cU, 0x40bad871U,
+    0x3bb6b835U, 0xcb08098eU, 0xd15ba31eU, 0xe4ba728aU,
+    0x8c8e10f7U, 0x294e1b41U, 0x63b7aee5U, 0x7277bfd8U,
+    0x81a6f9d4U, 0x3e02c692U, 0x5aa3a043U, 0xfb7fb78dU,
+
+    CKA_PUBLIC_EXPONENT, 256,                                                  /* RSA PUBLIC EXPONENT */
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00260445U,
+
+
+    CKA_PRIVATE_EXPONENT, 256,                                                  /* RSA PRIVATE EXPONENT */
+    0x0997634cU, 0x477c1a03U, 0x9d44c810U, 0xb2aaa3c7U,
+    0x862b0b88U, 0xd3708272U, 0xe1e15f66U, 0xfc938970U,
+    0x9f8a11f3U, 0xea6a5af7U, 0xeffa2d01U, 0xc189c50fU,
+    0x0d5bcbe3U, 0xfa272e56U, 0xcfc4a4e1U, 0xd388a9dcU,
+    0xd65df862U, 0x8902556cU, 0x8b6bb6a6U, 0x41709b5aU,
+    0x35dd2622U, 0xc73d4640U, 0xbfa1359dU, 0x0e76e1f2U,
+    0x19f8e33eU, 0xb9bd0b59U, 0xec198eb2U, 0xfccaae03U,
+    0x46bd8b40U, 0x1e12e3c6U, 0x7cb62956U, 0x9c185a2eU,
+    0x0f35a2f7U, 0x41644c1cU, 0xca5ebb13U, 0x9d77a89aU,
+    0x2953fc5eU, 0x30048c0eU, 0x619f07c8U, 0xd21d1e56U,
+    0xb8af0719U, 0x3d0fdf3fU, 0x49cd49f2U, 0xef3138b5U,
+    0x138862f1U, 0x470bd2d1U, 0x6e34a2b9U, 0xe7777a6cU,
+    0x8c8d4cb9U, 0x4b4e8b5dU, 0x616cd539U, 0x3753e7b0U,
+    0xf31cc7daU, 0x559ba8e9U, 0x8d888914U, 0xe334773bU,
+    0xaf498ad8U, 0x8d9631ebU, 0x5fe32e53U, 0xa4145bf0U,
+    0xba548bf2U, 0xb0a50c63U, 0xf67b14e3U, 0x98a34b0dU,
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* (__GNUC__) */
+
+const kms_obj_keyhead_36_t   Test_Key_AES256_Derivable =
+{
+  KMS_ABI_VERSION_CK_2_40,                /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,                 /*   uint32_t configuration;     */
+  144,                                    /*   uint32_t blobs_size;        */
+  8,                                      /*   uint32_t blobs_count;       */
+  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE, /*   uint32_t object_id;         */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_AES,                          /* TYPE = AES KEY */
+    CKA_VALUE,        32, 0x603deb10U, 0x15ca71beU, 0x2b73aef0U, 0x857d7781U,
+    0x1f352c07U, 0x3b6108d7U, 0x2d9810a3U, 0x0914dff4U,
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO ENCRYPT */
+    CKA_DECRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO DECRYPT */
+    CKA_TOKEN,        sizeof(CK_BBOOL), CK_TRUE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,               /* CLASS = SECRET KEY */
+    CKA_DERIVE,       sizeof(CK_BBOOL), (uint8_t)CK_TRUE,                    /* CAN BE USED TO DERIVE A NEW KEY */
+    CKA_LABEL,        24, 0x52455355U, 0x424F4C42U, 0x50595243U, 0x49524544U, 0x4C424156U, 0x00000045U,
+    /* 'USER', 'BLOB', 'CRYP', 'DERI', 'VABL', 'E' */
+  }
+};
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_function_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif /* (__ICCARM__) */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/readme.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_KMS_Blob/readme.txt
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_KMS_Blob/readme.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
new file mode 100644
index 00000000..696d8368
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    app_hw.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update hardware
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_HW_H
+#define APP_HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported macros -----------------------------------------------------------*/
+/* At power-on, the capacitor related to SW1 button needs to charge.
+ * The charging time must be waited to be sure that a low level is a real one. */
+#define BUTTON_INIT() \
+  BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);                               \
+  if ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET) \
+  {                                                                       \
+     HAL_Delay(6U);                                                       \
+  }
+
+#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_HW_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
new file mode 100644
index 00000000..5ac7113c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
@@ -0,0 +1,32 @@
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAIN_H
+#define MAIN_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "app_sfu.h"
+#include "app_hw.h"
+
+#endif /* MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
new file mode 100644
index 00000000..17a1c763
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
@@ -0,0 +1,190 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_crypto_config.h"
+#include "app_sfu_common.h"
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Use this define to choose the type of Firmware Image Programming you want to use.
+  * This version supports only 2 modes:
+  *
+  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
+  *       The image is received in encrypted format.
+  *       The image must be decrypted to be installed:
+  *         this is done according to the selected crypto scheme,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  * SFU_CLEAR_IMAGE: Clear Firmware Image
+  *       The image is received in clear format.
+  *       No decrypt operation is needed before installing the image:
+  *         the selected crypto scheme must be compatible with this choice,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  *
+  */
+#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
+#else
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
+#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
+
+/*#define SFU_DEBUG_MODE */              /*!< Comment this define to optimize memory footprint (debug mode removed)
+                                          No more print on terminal during SBSFU execution */
+
+/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
+                                          this switch activates more debug prints in the console (FSM state info...) */
+
+
+/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
+                                                          When this switch is activated, the FWIMG part of SB_SFU will
+                                                          block when an abnormal error is encountered */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
+#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
+#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
+
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
+#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
+
+/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
+                                           Automatically executed @startup */
+#if defined(SFU_TEST_PROTECTION)
+#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
+#endif /* SFU_TEST_PROTECTION */
+
+/**
+  * SB_SFU status LED.
+  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
+  * This is useful when no log is enabled.
+  *
+  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
+  * \li For the other situations, please check the other defines below.
+  */
+#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
+#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
+                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
+#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
+
+
+/**
+  * Optional Features Software Configuration
+  */
+#if !defined(SFU_TEST_PROTECTION)
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+#else
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
+#endif /* SFU_TEST_PROTECTION */
+
+/* Uncomment the define below if you want to remove the swap area
+   ==> partial update is not supported in this configuration
+   ==> image validation is not supported in this configuration */
+/*#define SFU_NO_SWAP*/                              /*!< FW upgrade installation process without swap area */
+
+/* Multi-images configuration :
+   - Max : 3 Active images and 3 Download area
+   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
+   - Active slot identified with SFU magic (1,2,3) information from header
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+   - FW image valid all feature authorized from master slot
+*/
+#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
+
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_RDP_PROTECT_ENABLE
+/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
+                                             neither connected to GND nor to 5V (floating level), there are too many
+                                             spurious tamper event detected */
+#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
+                                        Enables/Disables the MPU protection.
+                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
+                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
+                                        addition to the overall MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
+                                        executable area */
+
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_GTZC_PROTECT_ENABLE    /*!< GTZC protection (dependent on SFU_SECURE_USER_PROTECT_ENABLE):
+                                        Enables/Disables the GTZC protection. */
+#define SFU_C2SWDBG_PROTECT_ENABLE /*!< Dynamic disabling of the CPU2 debug:
+                                        not writable if ESE=0, no meaning if DDS=1. */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
+                                                      completely disabled, OB update no more possible  */
+
+
+#else
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
+                                                      field should set it as Level2 */
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+
+/**
+  * Application Configuration
+  *
+  */
+#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
+                                              You can also define an upper bound here if you plan to use it */
+
+#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
+                                              no FW installed or due to an attack attempt). Could be different from
+                                              SFU_FW_VERSION_START_NUM */
+
+/**
+  * Features compatibility control
+  */
+#if defined(SFU_NO_SWAP) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_NO_SWAP process"
+#endif
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_SECURE_USER_PROTECT_ENABLE process"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
new file mode 100644
index 00000000..269aed78
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
@@ -0,0 +1,1739 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.c
+  * @author  MCD Application Team
+  * @brief   SFU BOOT module
+  *          This file provides firmware functions to manage the following
+  *          functionalities of the Secure Boot:
+  *           + Initialization and de-initialization functions
+  *           + Secure Boot Control functions
+  *           + Secure Boot State functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_BOOT_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+#include "sfu_boot.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
+
+#include "sfu_trace.h"
+#include "se_def.h"
+#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
+#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
+#include "sfu_test.h"                 /* auto tests */
+#include "sfu_fwimg_internal.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "sfu_kms.h"
+#endif /* KMS_ENABLED */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct
+{
+  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
+  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
+} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
+                                                     information using during the SM evolution. */
+
+/* Private defines -----------------------------------------------------------*/
+#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
+#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
+#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
+                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
+
+#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
+                                    maintained for future customization/expansion of the field itself */
+
+#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
+
+/* Private macros ------------------------------------------------------------*/
+#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    if (Status == SFU_SUCCESS){                                         \
+      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
+    }                                                                   \
+    else {                                                              \
+      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
+    }                                                                   \
+  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
+
+
+#define SFU_SET_SM_CURR_STATE(NewState)                                 \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    m_StateMachineContext.CurrState = NewState;                         \
+  }while(0) /*!< Set a State Machine state*/
+
+/* Private variables ---------------------------------------------------------*/
+/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
+static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
+                                                                         SFU_STATE_INITIAL
+                                                                        };
+
+/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
+static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToResume = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToRollback = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
+static uint32_t m_C1ActiveSlot = SLOT_INACTIVE;
+static uint32_t m_C2ActiveSlot = SLOT_INACTIVE;
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+uint8_t initialDeviceStatusCheck;
+
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_BOOT_Init(void);
+static SFU_ErrorStatus SFU_BOOT_DeInit(void);
+static void SFU_BOOT_BspConfiguration(void);
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
+static void SFU_BOOT_SM_CheckStatusOnReset(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+static void SFU_BOOT_SM_CheckNewFwToDownload(void);
+static void SFU_BOOT_SM_DownloadNewUserFw(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
+static void SFU_BOOT_SM_InstallKMSBlob(void);
+#endif /* KMS_ENABLED */
+static void SFU_BOOT_SM_CheckUserFwStatus(void);
+static void SFU_BOOT_SM_VerifyUserFwSignature(void);
+static void SFU_BOOT_SM_ExecuteUserFw(void);
+static void SFU_BOOT_SM_HandleCriticalFailure(void);
+static void SFU_BOOT_SM_RebootStateMachine(void);
+static void SFU_BOOT_SM_InstallNewUserFw(void);
+static void SFU_BOOT_SM_ResumeInstallNewUserFw(void);
+static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
+static void SFU_BOOT_ManageResetSources(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
+  *        In the nominal case, the bootloader service runs until the user application is launched.
+  *        When no valid user application can be run (after installing a new image or not),
+  *        if the local loader feature is not enabled then the execution stops,
+  *        otherwise a local download will be awaited.
+  *        If the state machine encounters a major issue then a reboot is triggered.
+  * @param None.
+  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
+  * @note Constraints
+  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
+  *       2. This function also takes care of BSP initialization after enabling the secure mode.
+  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
+  *       3. No other entity should handle the initialization of the Secure Engine.
+  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
+  *          configurations will be overwritten).
+  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
+  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
+  *          error cause.
+  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
+  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
+  *          new image).
+  * @note Settings are handled at compilation time:
+  *       1. See compiler switches in main.h for secure IPs settings
+  *       2. The trace system is configured in the sfu_trace.h file
+  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
+  *          stage.
+  */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
+{
+  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
+
+  /*
+   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
+   * "automatically" managed by SBSFU compiler command
+   */
+  if (SE_Startup() == SE_SUCCESS)
+  {
+    /* Security Configuration */
+    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
+    {
+      /* Board BSP  Configuration */
+      SFU_BOOT_BspConfiguration();
+
+      /* Configure the Secure Boot and start the State machine */
+      if (SFU_BOOT_Init() == SFU_SUCCESS)
+      {
+        /* Start the Secure Boot State Machine */
+        (void) SFU_BOOT_SM_Run();
+      }
+      else
+      {
+        /* failure when initializing the secure boot service */
+        e_ret_code = SFU_BOOT_INIT_FAIL;
+      }
+    }
+    else
+    {
+      /* failure when configuring the security IPs  */
+      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
+    }
+  }
+  else
+  {
+    /* failure at secure engine initialization stage */
+    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
+  }
+
+  /*
+   * This point should not be reached unless a critical init failure occurred
+   * Return the error code
+   */
+  return (e_ret_code);
+}
+
+/**
+  * @brief  Force System Reboot
+  * @param  None
+  * @retval None
+  */
+void SFU_BOOT_ForceReboot(void)
+{
+  /*
+   * WARNING: The follow TRACEs are for debug only. This function could be called
+   * inside an IRQ so the below printf could not be executed or could generate a fault!
+   */
+  TRACE("\r\n========= End of Execution ==========");
+  TRACE("\r\n\r\n\r\n");
+
+  /*
+   * This is the last operation executed. Force a System Reset.
+   * The check below is needed in case we reboot before setting the Unpriviledged mode.
+   * This can happen in a factory reset use-case typically.
+   */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  Initialize the Secure Boot State machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_Init(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
+   * download)
+   */
+  initialDeviceStatusCheck = 1U;
+
+  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
+  if (SFU_LL_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Flash interface initialization */
+  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* The COM modules is required only if the trace or the local download is enabled */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
+  if (SFU_COM_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  /* Call the SFU_LOADER module Init */
+  if (SFU_LOADER_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+  /* Call the Exception module Init */
+  if (SFU_EXCPT_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Call the image handling Init  */
+  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
+  {
+    return SFU_ERROR;
+  } /* else continue */
+
+
+  TRACE("\r\n\r\n");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  TRACE("\r\n=                                                                    =");
+  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n\r\n");
+
+  /* Initialize the Secure Engine that will be used for all the most critical operations */
+  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
+  }
+  else
+  {
+    e_ret_status = SFU_SUCCESS;
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize the Secure Boot State machine.
+  * @param  None
+  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
+  *         The bootloader can terminate:
+  *         1. with an init failure : no de-init needed
+  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
+  *            by this function.
+  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
+  *            required security mechanisms.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_DeInit(void)
+{
+  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  if (SFU_COM_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+  if (SFU_LL_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  BSP Initialization.
+  *         Called when the secure mode is enabled.
+  * @note   The BSP configuration should be handled only in this function.
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_BspConfiguration()
+{
+  /* LED Init*/
+  (void) BSP_LED_Init(SFU_STATUS_LED);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+  /* User Button */
+  BUTTON_INIT();
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Execute the Secure Boot state machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
+  void (*fnStateMachineFunction)(void);
+  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+                                                 SFU_BOOT_SM_CheckNewFwToDownload,
+                                                 SFU_BOOT_SM_DownloadNewUserFw,
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
+                                                 SFU_BOOT_SM_InstallKMSBlob,
+#endif /* KMS_ENABLED */
+                                                 SFU_BOOT_SM_CheckUserFwStatus,
+                                                 SFU_BOOT_SM_InstallNewUserFw,
+                                                 SFU_BOOT_SM_VerifyUserFwSignature,
+                                                 SFU_BOOT_SM_ExecuteUserFw,
+                                                 SFU_BOOT_SM_ResumeInstallNewUserFw,
+                                                 SFU_BOOT_SM_RollbackInstallPrevUserFw,
+                                                 SFU_BOOT_SM_HandleCriticalFailure,
+                                                 SFU_BOOT_SM_RebootStateMachine
+                                                };
+
+  /* Start the State Machine loop/evolution */
+  while (e_ret_status == SFU_SUCCESS)
+  {
+    /* Always execute a security/safety check before moving to the next state */
+    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
+    {
+      /* Get the right StateMachine function according to the current state */
+      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
+
+      /* Call the State Machine function associated to the current state */
+      fnStateMachineFunction();
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* If the State Machine cannot evolve anymore, reboot is the only option */
+
+  /* Set the error before forcing a reboot */
+  SFU_EXCPT_SetError(SFU_EXCPT_UNKNOWN);
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+  return e_ret_status;
+}
+
+/** @brief  Check the Reset status in order to understand the last cause of Reset
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckStatusOnReset(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
+
+  /* Check the wakeup sources */
+  SFU_BOOT_ManageResetSources();
+
+  /* RCC access done to identify the wakeup sources, we can switch to unpriviledged */
+  SFU_MPU_EnterUnprivilegedMode();
+#ifdef SFU_TEST_PROTECTION
+  /*
+   * All protections are installed and the correct execution mode is set (unprivileged).
+   * This is the good time to run the auto-tests.
+   */
+  SFU_TEST_Init();
+#endif /* SFU_TEST_PROTECTION */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+  /* When the local loader feature is supported we need to check if a local download is requested */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+#ifdef KMS_ENABLED
+  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* When the local loader feature is disabled go directly to the check of the FW status */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+/**
+  * @brief  Check if a new UserApp firmware is available for downloading.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckNewFwToDownload(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_DWL_REQ)
+  {
+    TRACE("\r\n= [SBOOT] STATE: execution standalone loader");
+    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+    /* This is unreachable code (dead code) in principle...
+    At this point we should not be able to reach the following instructions.
+    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
+    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
+    if (0U != BUTTON_PUSHED())
+    {
+      /* Download requested */
+      e_ret_status = SFU_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /*
+     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
+     * download to start
+     */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+#ifdef KMS_ENABLED
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
+
+#ifdef KMS_ENABLED
+/**
+  * @brief  Check if a KMSBlob is waiting for installation.
+  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
+  *         disabled.
+  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
+  *         enabled.
+  *         In this latter case,
+  *               if a new Firmware download is requested,
+  *               it has priority over the KMS blob installation,
+  *               and the KMS blob installation request will be lost.
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
+
+  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
+  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
+
+  /* Check if a Blob Installation is requested or on-going */
+  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
+
+  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
+  {
+    /* Blob installation requested */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+/**
+  * @brief  Check if a KMSBlob is waiting for install.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallKMSBlob(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  uint8_t         *pBlobHdr;
+  uint8_t         *pBlobInFlash;
+  CK_RV           e_status;
+
+  /* At boot-up, Managing ImportBlob through KMS services.  */
+  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
+
+  /* Here we will Launch SE service to take consume the Blob */
+  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
+  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
+  }
+  else
+  {
+    /* Initialize KMS in order to be able to import blob using internal algorithms */
+    e_status = C_Initialize(NULL);
+    if (e_status == CKR_OK)
+    {
+      /* we do not take the return value into account as we will not retry the import in case of issue */
+      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
+
+      if (e_status != CKR_OK)
+      {
+        (void)C_Finalize(NULL);
+      }
+      else
+      {
+        e_status = C_Finalize(NULL);
+      }
+    }
+
+    if (e_status != CKR_OK)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
+    }
+
+    /* In any case, we remove the Blob To Install (regardless of the result) */
+    e_ret_status = SFU_KMS_EraseBlob();
+
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
+    }
+
+    /* Display the KMS import result */
+    switch (e_status)
+    {
+      case CKR_OK:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
+        e_ret_status = SFU_SUCCESS;
+        break;
+
+      case CKR_SIGNATURE_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DATA_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DEVICE_ERROR:
+        /* At boot-up, NVM Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_OPERATION_ACTIVE:
+        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      default:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
+        e_ret_status = SFU_ERROR;
+        break;
+    }
+  }
+
+  /* Set the next State Machine regardless of the KMS import result */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+#endif /* KMS_ENABLED */
+
+
+/**
+  * @brief  Check the Status of the Fw Image to work on  in order to set the next
+  *         State Machine state accordingly
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckUserFwStatus(void)
+{
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  SFU_IMG_ImgInstallStateTypeDef e_PendingInstallStatus;
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+  uint32_t i;
+
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_INSTALL_REQ)
+  {
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[SLOT_DWL_1],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * Notify the Secure Boot that a new image has been downloaded
+       */
+      e_ret_status = SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated);
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    if (e_ret_status == SFU_ERROR)
+    {
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* In all cases, standard SBSFU start-up at next reset */
+    STANDALONE_LOADER_STATE = STANDALONE_LOADER_NO_REQ;
+  }
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+  /* Check if there is a pending action related to a FW update procedure */
+  e_PendingInstallStatus = SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall, &m_ActiveSlotToResume,
+                                                            &m_ActiveSlotToRollback);
+
+  switch (e_PendingInstallStatus)
+  {
+    case SFU_IMG_FWIMAGE_ROLLBACK:
+      /*
+       * The new FW image has not been validated : rollback requested @ next reset
+       * Rollback is done assuming the previous image was backed-up in corresponding dwl slot
+       * As example : new image installed in SLOT_ACTIVE_2. Previous image was backed-up in SLOT_DWL_2
+       */
+      /* Identify corresponding backed-up slot */
+      m_DwlSlotToInstall = m_ActiveSlotToRollback - SLOT_ACTIVE_1 + SLOT_DWL_1;
+      TRACE("\r\n\t  Installation not validated: rollback procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
+            m_ActiveSlotToRollback, m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_ROLLBACK_PREV_USER_FW);
+      break;
+
+    case SFU_IMG_FWUPDATE_STOPPED:
+      /* The installation of a downloaded FW has been interrupted */
+      /* We perform a resume of the installation */
+      TRACE("\r\n\t  Installation Failed: resume installation procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
+            m_ActiveSlotToResume, m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_RESUME_INSTALL_NEW_USER_FW);
+      break;
+
+    case SFU_IMG_FWIMAGE_TO_INSTALL:
+      /*
+       * A new FW is detected in the dwl slot and ready to be installed
+       */
+      TRACE("\r\n\t  New Fw to be installed from slot SLOT_DWL_%d", m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_INSTALL_NEW_USER_FW);
+      break;
+
+    case SFU_IMG_NO_FWUPDATE:
+      /*
+       * No FW image installation pending :
+       *   1- Check if firmwares are detected for C1 and C2 (MASTER_SLOT)
+       *   2- No active firmware candidate for execution ==> Local download
+       *
+       * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
+       */
+      m_C1ActiveSlot = 0U;
+      m_C2ActiveSlot = 0U;
+      m_ActiveSlotToExecute = 0U;
+
+      /* Check if firmwares are detected for C1 and C2 (MASTER_SLOT) */
+      if (MASTER_SLOT == 0xFFU)
+      {
+        TRACE("\r\n\t  No master slot has been defined for C2");
+      }
+      else
+      {
+        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+        {
+          if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
+          {
+            if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+            {
+              if ((SLOT_ACTIVE_1 + i) == MASTER_SLOT)
+              {
+                m_C2ActiveSlot = MASTER_SLOT;
+                TRACE("\r\n\t  A C2 FW is detected in the slot SLOT_ACTIVE_%d", m_C2ActiveSlot);
+              }
+              else
+              {
+                m_C1ActiveSlot = SLOT_ACTIVE_1 + i;
+                TRACE("\r\n\t  A C1 FW is detected in the slot SLOT_ACTIVE_%d", m_C1ActiveSlot);
+              }
+            }
+          }
+        }
+      }
+
+      /* 2- No active firmware candidates for execution ==> Local download */
+      if ((m_C1ActiveSlot != 0U) && (m_C2ActiveSlot != 0U))
+      {
+        m_ActiveSlotToExecute = m_C2ActiveSlot;
+        SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+      }
+      else
+      {
+        /* Control if all active slot are empty */
+        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+        {
+          if ((m_C1ActiveSlot != (SLOT_ACTIVE_1 + i)) && (m_C2ActiveSlot != (SLOT_ACTIVE_1 + i)))
+          {
+            if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
+            {
+              if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+              {
+                /*
+                 * We should never reach this code.
+                 * Could come from an attack ==> as an example we invalidate current firmware.
+                 */
+                TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+                (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+              }
+            }
+          }
+        }
+
+        /*
+         * No valid FW is present in the active slot
+         * and there is no FW to be installed in UserApp download area: local download (when possible)
+         */
+        if (1U == initialDeviceStatusCheck)
+        {
+          TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+          /* Waiting for a local download is automatic, no trigger required. */
+          TRACE("\r\n\t  Waiting for the local download to start... ");
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+          initialDeviceStatusCheck = 0U;
+#ifdef SFU_TEST_PROTECTION
+          SFU_TEST_Reset();
+#endif /* SFU_TEST_PROTECTION */
+        }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        else
+        {
+          /*
+           * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
+           *   If a FW is present in the active slot => it is checked then launched.
+           *   If there is a FW to install => the installation procedure starts.
+           *   If no FW is present and no installation is pending:
+           *      - if the local loader feature is enabled we enter the local download state
+           *      - if the local loader feature is disabled, the execution is stopped.
+           */
+          TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS should not be entered more than once per boot.");
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+        SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+        /*
+         * When the local loader feature is disabled it is not possible to enter the local download state.
+         * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
+         * So we end up waiting for the user to reboot (or the IWDG to expire).
+         */
+        TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
+        /* Release CM4 (via SRAM) */
+        *pSbsfuFlag = SBSFU_FW_DOWNLOAD;
+        while (1 == 1)
+        {
+          (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+        }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+      }
+      break;
+
+    default:
+      TRACE("\r\n\t  Flash State Unknown, Critical failure");
+      /* If not in one of the previous state, something bad occurred */
+      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+      break;
+  }
+}
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   Reset is generated at by standalone loader when FW is downloaded.
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  *pSbsfuFlag = SBSFU_FW_DOWNLOAD;
+  while (1 == 1)
+  {
+    (void) BSP_LED_Toggle(SFU_STATUS_LED);
+    HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+  }
+}
+#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /*
+   * Download area will be chosen as following. After header analysis :
+   *   - same DWL slot number as SFU magic number, if the slot is configured.
+   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
+   *   - by default : SLOT_DWL_1
+   */
+  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
+          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
+          fw_image_header_validated.PartialFwOffset, u_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * Notify the Secure Boot that a new image has been downloaded
+     * by calling the SE interface function to trigger the installation procedure at next reboot.
+     */
+    if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
+    {
+      /* Erase downloaded image */
+      (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
+
+      /* no specific error cause set */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    /* Erase downloaded image */
+    (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
+
+    /* Memorize the specific error cause if any before handling this critical failure */
+    switch (e_ret_status_app)
+    {
+      case SFU_LOADER_ERR_COM:
+        SFU_EXCPT_SetError(SFU_EXCPT_COM_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_VERSION:
+        SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_LENGTH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FW_TOO_BIG);
+        break;
+      case SFU_LOADER_ERR_AUTH_FAILED:
+        SFU_EXCPT_SetError(SFU_EXCPT_HEADER_AUTH_ERR);
+        break;
+      case SFU_LOADER_ERR_FLASH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FLASH_ERR);
+        break;
+      case SFU_LOADER_ERR_CRYPTO:
+        SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+        break;
+      default:
+        /* no specific error cause */
+        break;
+    }
+  } /* else error with no specific error cause */
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+/**
+  * @brief  Install the new UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: INSTALL NEW USER FIRMWARE ");
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_SECOND_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /* Check the candidate version vs current active version */
+  e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    /* Erase downloaded FW in case of authentication/integrity error */
+    (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
+  }
+  else
+  {
+    /* Secure coding : double check the candidate version vs current active version */
+    e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+  }
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* Launch the Firmware Installation procedure */
+    e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
+  }
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /*
+     * The FW installation succeeded: the previous FW is now backed up in the dwl slot.
+     * Nothing more to do, in the next FSM state we are going to verify the FW again and execute it if possible.
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FW installation succeeded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * The FW installation failed: we need to reboot and the resume procedure will be triggered at next boot.
+     * Nothing more to do, the next FSM state (HANDLE_CRITICAL_FAILURE) will deal with it.
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FW installation failed!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+}
+
+/**
+  * @brief  Execute a UserApp Fw installation resume
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ResumeInstallNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: RESUME INSTALLATION OF NEW USER FIRMWARE");
+
+  /*
+   * This resume installation procedure continue installation of new User FW in the active slot
+   */
+  e_ret_status = SFU_IMG_TriggerResumeInstallation(m_ActiveSlotToResume, m_DwlSlotToInstall);
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    /* No specific error cause managed here because the FSM state already provides the information. */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+}
+
+/**
+  * @brief  Execute a rollback to the previous UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void)
+{
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: ROLLBACK INSTALLATION TO PREVIOUS USER FIRMWARE");
+
+  /*
+   * Rollack installation to the previous User FW from Dwl_Slot
+   */
+  e_ret_status = SFU_IMG_TriggerRollbackInstallation(m_ActiveSlotToRollback, m_DwlSlotToInstall);
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    /* No specific error cause managed here because the FSM state already provides the information. */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+#else
+  TRACE("\r\n= [SBOOT] STATE: ROLLBACK NOT SUPPORTED");
+
+  /* No specific error cause managed here because the FSM state already provides the information. */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+#endif /* ENABLE_IMAGE_STATE_HANDLING && !(SFU_NO_SWAP) */
+}
+
+
+/**
+  * @brief  Verify the UserApp Fw signature before executing it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_VerifyUserFwSignature(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t u_configured_slot_nb = 0U;
+  uint32_t u_verified_slot_nb = 0U;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
+
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /*
+   * With the 2 images handling:
+   *       1. the header signature is verified  when installing a new firmware
+   *       2. the firmware signature is checked when installing a new firmware
+   *       3. remaining part of active slot is kept "clean" during installation procedure
+   * So following checks should never fail.
+   */
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      u_configured_slot_nb ++;
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
+        if (SFU_SUCCESS == e_ret_status)
+        {
+          /* Check the FW signature */
+          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
+          if (SFU_SUCCESS == e_ret_status)
+          {
+            /* Verify that there is no additional code beyond firmware image */
+            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
+            if (SFU_SUCCESS != e_ret_status)
+            {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+            }
+            else
+            {
+              u_verified_slot_nb ++;
+            }
+          }
+          else
+          {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          }
+        }
+        else
+        {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        }
+        /*
+         * One of the checks fails :
+         *  - Header signature
+         *  - FW signature
+         *  - No malicious code
+         *  ==> Active slot should be invalidated
+         */
+        if (SFU_SUCCESS != e_ret_status)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+        else
+        {
+          /* Verify if authentication and integrity controls performed */
+          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+        }
+      }
+      else
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+  }
+
+  /* Check that C1 and C2 firmwares are present */
+  if ( u_configured_slot_nb != u_verified_slot_nb )
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ExecuteUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+
+  /* Double security check for all active slots :
+     - Control twice the Header signature will avoid basic hardware attack
+     - Control twice the FW signature will avoid basic hardware attack */
+
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+        /* Check the FW signature */
+        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+        /* Move the state to SELFTEST for the new images */
+        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Image state cannot be changed : What to do ?
+             ==> decision to continue execution */
+          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
+        }
+#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
+
+        /* Verify if authentication and integrity controls performed */
+        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+      }
+    }
+  }
+
+  /*
+   * You may decide to implement additional checks before running the Firmware.
+   * For the time being we launch the FW present in the active slot.
+   *
+   * The bootloader must also take care of the security aspects:
+   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
+   *   B.lock the SE services the UserApp is not allowed to call
+   *   C.leave secure boot mode
+   */
+
+  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
+  e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+    SFU_EXCPT_SetError(SFU_EXCPT_FLASH_CFG_ERR);
+
+    /* This is the last operation executed. Force a System Reset */
+    SFU_BOOT_ForceReboot();
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Double instruction to avoid basic fault injection */
+      if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+      {
+        /* De-initialize the SB_SFU bootloader before launching the UserApp */
+        (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
+
+        /* Last flow control : lock service */
+        FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
+
+        /* This function should not return */
+        e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
+
+        /* This point should not be reached */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        /* We do not memorize any specific error, the FSM state is already providing the info */
+        TRACE("\r\n\t  SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        while (1 == 1)
+        {
+          ;    /* wait for watchdog */
+        }
+      }
+      else
+      {
+        /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+        SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+        /* This is the last operation executed. Force a System Reset */
+        SFU_BOOT_ForceReboot();
+      }
+    }
+    else
+    {
+      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+      SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+      /* This is the last operation executed. Force a System Reset */
+      SFU_BOOT_ForceReboot();
+    }
+  }
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
+  * @param  None
+  * @note   After a Critical Failure a Reboot will be called.
+  * @retval None
+  */
+static void SFU_BOOT_SM_HandleCriticalFailure(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+     The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
+}
+
+/**
+  * @brief  The state machine is aborted and a Reset is triggered
+  * @param  None
+  * @note   You are in this condition because it's not possible to continue without
+            compromising the stability or the security of the solution.
+  * @retval None
+  */
+static void SFU_BOOT_SM_RebootStateMachine(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
+
+  /*
+   * In case some clean-up must be done before resetting.
+   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
+   */
+  (void)SFU_BOOT_DeInit();
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Jump into standalone loader
+  * @param  None
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
+{
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+
+  /* Lock part of Secure Engine services */
+  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+  {
+    /* Double instruction to avoid basic fault injection */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* this function does not return */
+      SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, LOADER_REGION_ROM_START);
+
+      /* The point below should NOT be reached */
+      return SFU_SUCCESS;
+    }
+    else
+    {
+      return SFU_ERROR;
+    }
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply Static protections involving Option Bytes */
+  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  System security configuration
+  * @param  None
+  * @note   Check and apply the security protections. This has to be done as soon
+  *         as possible after a reset
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  /* WARNING: The following CheckApplySecurityProtection function must be called
+     as soon as possible after a Reset in order to be sure the system is secured
+     before starting any other operation. The drawback is that the ErrorManagement
+     is not initialized yet, so in case of failure of this function, there will not be
+     any error stored into the BootInfo or other visible effects.  */
+
+  /* Very few things are already initialized at this stage. Need additional initialization
+     to show a message that is added as below only in Debug/Test mode */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  (void) SFU_COM_Init();
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
+  {
+    /* WARNING: This might be generated by an attempted attack or a bug of your code!
+       Add your code here in order to implement a custom action for this event,
+       e.g. trigger a mass erase or take any other action in order to
+       protect your system, or simply discard it if this is expected.
+       ...
+       ...
+    */
+    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
+  }
+  else
+  {
+    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
+  *         a malicious code removing some of the applied security/integrity features.
+  *         The IWDG is also refreshed in this function.
+  * @param  None
+  * @note   This function must be called with a frequency greater than 0.25Hz!
+  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
+  *         So the User App should continue to refresh the IWDG counter.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Refresh the IWDG */
+  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
+
+
+  /* Add your code here for customization:
+     e.g. for additional security or safety periodic check.
+     ...
+     ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_ManageResetSources(void)
+{
+  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
+
+  /* Check the wakeup sources */
+  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
+  switch (e_wakeup_source_id)
+  {
+    /*
+     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
+     * RCC_CSR flags can be used to do so.
+     */
+
+    case SFU_RESET_WDG_RESET:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_LOW_POWER:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_HW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_BOR_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_SW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_OB_LOADER:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    default:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+  }
+
+  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
+  SFU_LL_SECU_ClearResetSources();
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
+}
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC Fault.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_GTZC_TZIC(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_GTZC_TZIC_FAULT);
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
new file mode 100644
index 00000000..c3a1ff95
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
@@ -0,0 +1,262 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.c
+  * @author  MCD Application Team
+  * @brief   SFU ERROR
+  *          This file provides set of firmware functions for SB_SFU errors handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "sfu_low_level_security.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_boot.h"
+#include "sfu_test.h"
+#include "sfu_mpu_isolation.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+/**
+  *  The following strings associated to the exceptions/errors are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
+  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
+  */
+static char *m_aErrorStrings[] ={  "No error. Success",
+                                   "Memory fault",
+                                   "Hard fault",
+                                   "Tampering fault",
+#ifdef SFU_GTZC_PROTECT_ENABLE
+                                   "GTZC TZIC fault",
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+                                   "SE lock cannot be set",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Fw too big",
+                                   "File not correctly received",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Fw header authentication error",
+                                   "Fw decryption error",
+                                   "Fw signature check error",
+                                   "Flash error",
+                                   "External flash configuration error.",
+                                   "Header erasing error",
+                                   "Header validation error",
+                                   "Additional code detected beyond FW",
+                                   "Error during swap process",
+                                   "Error during rollback process",
+                                   "Backed-up fw not identified",
+                                   "Backup copy error",
+                                   "Dwl slot erasing error",
+                                   "Trailer erasing error",
+                                   "Trailer update error",
+                                   "Magic tag update error",
+                                   "Fw version rejected (anti-rollback)",
+                                   "Unknown error"
+                                };
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Print relevant errpr message.
+  * @param  Error Error code.
+  * @retval None
+  */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  if (eExceptionId <= SFU_EXCPT_UNKNOWN)
+  {
+#ifdef SFU_DEBUG_MODE
+    TRACE("\r\n\t%s",m_aErrorStrings[(uint32_t) eExceptionId]);
+#endif /* SFU_DEBUG_MODE */
+  }
+}
+
+
+/**
+  * @brief  Manage the Exception generated by an IRQ
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   Because of the interruption of the State Machine execution,
+  *         it's not possible to continue without compromising the stability or
+  *         the security of the solution. A System Reset is forced at the end.
+  * @retval None
+  */
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+#ifdef SFU_DEBUG_MODE
+  uint8_t message[150];
+  uint32_t i = 0U;
+
+  /* Avoid warning with cast frombetween char* and uint8_t* */
+  while ((m_aErrorStrings[(uint32_t) eExceptionId][i] != 0u) && (i < 149U))
+  {
+    message[i] = m_aErrorStrings[(uint32_t) eExceptionId][i];
+    i++;
+  }
+  message[i] = 0U;
+
+  /* Print relevant error message */
+  TRACE_IRQ((uint8_t *)"\r\n\t  ");
+  TRACE_IRQ(message);
+#endif /* SFU_DEBUG_MODE */
+
+  /* Try to take an action */
+  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+  The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_BOOT_ForceReboot();
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+void SFU_EXCPT_Security_Error(void)
+{
+  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
+  HAL_Delay(1000);
+  /* While(1) by-passed by an fault injection attack ==> Reset */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  SFU Exception Initialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_Init(void)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU Exception DeInitialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status;
+  /* ADD SRC CODE HERE
+      ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   A System Reset is forced at the end by the caller of this function.
+  *         WARNING: Be aware that this function can be called by an IRQ while
+  *         using the printf, since the printf is not a reentrant function, and using
+  *         the printf inside this function as well, a fault will likely occur.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  switch (eExceptionId)
+  {
+    case SFU_EXCPT_TAMPERING_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  case SFU_EXCPT_GTZC_TZIC_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      /* WARNING: Please consider that at runt-time,  this "case" execution is
+      inside an ISR */
+      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TZIC FAULT!");
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+    case SFU_EXCPT_MEMORY_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_HARD_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+#ifdef SFU_TEST_PROTECTION
+      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
+         ==> this is not an error */
+#endif /* SFU_TEST_PROTECTION */
+      break;
+
+    default:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+  }
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
new file mode 100644
index 00000000..7f3631f6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
@@ -0,0 +1,96 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.h
+  * @author  MCD Application Team
+  * @brief   This file contains the error handling elements for SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_ERROR_H
+#define SFU_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * This enum must start from 0.
+  * When adding a new error in the enum below please also:
+  *  1. update IS_SFU_EXCPT
+  *  2. update m_aErrorStrings
+  */
+typedef enum
+{
+  SFU_EXCPT_NONE = 0UL,
+  /* System errors */
+  SFU_EXCPT_MEMORY_FAULT,
+  SFU_EXCPT_HARD_FAULT,
+  SFU_EXCPT_TAMPERING_FAULT,
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  SFU_EXCPT_GTZC_TZIC_FAULT,
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+  /* Specific errors */
+  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
+  SFU_EXCPT_COM_ERR,               /* COM error during the local download of the binary */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  SFU_EXCPT_HEADER_AUTH_ERR,       /* header authentication failure */
+  SFU_EXCPT_DECRYPT_ERR,           /* Decrypt failure */
+  SFU_EXCPT_SIGNATURE_ERR,         /* Signature check failure */
+  SFU_EXCPT_FLASH_ERR,             /* Problem with FLASH */
+  SFU_EXCPT_FLASH_CFG_ERR,         /* Flash configuration issue (external flash) */
+  SFU_EXCPT_HEADER_ERASING_ERR,    /* Header erasing failure */
+  SFU_EXCPT_HEADER_VALIDATION_ERR, /* Header validation failure */
+  SFU_EXCPT_ADDITIONAL_CODE_ERR,   /* Additional code detected beyond the firmware image (malicious SW) */
+  SFU_EXCPT_FWIMG_SWAP_ERR,        /* Problem while swapping the images */
+  SFU_EXCPT_FWIMG_ROLLBACK_ERR,    /* Problem during rollback process */
+  SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR,/* Backed-up firmware not identified */
+  SFU_EXCPT_BACKUP_COPY_FAILURE_ERR, /* Copy in the backup slot failure */
+  SFU_EXCPT_DWL_SLOT_ERASING_ERR,  /* Dwl slot erasing failure */
+  SFU_EXCPT_TRAILER_ERASING_ERR,   /* Trailer update failure */
+  SFU_EXCPT_TRAILER_UPDATE_ERR,    /* Trailer update failure */
+  SFU_EXCPT_FWIMG_MAGIC_ERR,       /* Problem with a FWIMG pattern */
+  SFU_EXCPT_VERSION_ERR,           /* Anti-rollback check rejected the version to be installed */
+  /* Unknown error */
+  SFU_EXCPT_UNKNOWN                /* To be kept as last error */
+} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
+
+/* External variables --------------------------------------------------------*/
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_Security_Error(void);
+
+SFU_ErrorStatus SFU_EXCPT_Init(void);
+SFU_ErrorStatus SFU_EXCPT_DeInit(void);
+
+void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_ERROR_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
new file mode 100644
index 00000000..06ca1157
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
@@ -0,0 +1,1157 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_common.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the "common" functionalities of the image handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_COMMON_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+SFU_IMG_StatusTypeDef SFU_IMG_Status;
+uint32_t SFU_IMG_Line;
+
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+
+/**
+  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_to_test;
+
+/* Functions Definition : helper ---------------------------------------------*/
+/**
+  * @brief  Memory compare with constant time execution.
+  * @note   Objective is to avoid basic attacks based on time execution
+  * @param  pAdd1 Address of the first buffer to compare
+  * @param  pAdd2 Address of the second buffer to compare
+  * @param  Size Size of the comparison
+  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
+  */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
+{
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  for (i = 0U; i < Size; i++)
+  {
+    result |= pAdd1[i] ^ pAdd2[i];
+  }
+
+  if (result == 0x00U)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+
+/**
+  * @brief  Check header signature
+  * @param  pFwImageHeader: pointer to raw header.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef se_status;
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
+  {
+    /* Unused bytes should be set at 0x00 value
+       Comparison with constant time execution */
+    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
+    {
+      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
+    }
+
+    if (result == 0x00U)
+    {
+      /* Check signature of the FW header */
+      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
+      {
+        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
+  *        It handles Firmware TAG verification of a complete buffer by calling
+  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
+  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
+  *        and at the end compare the obtained TAG with the one provided as input
+  *        in pSE_GMCInit parameter.
+  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
+  * @param pSE_Status: Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param SlotNumber index of the slot in the list
+  * @param pSE_Metadata: Firmware metadata.
+  * @param pSE_Payload: pointer to Payload Buffer descriptor.
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_ret_status = SE_ERROR;
+  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
+  /* Loop variables */
+  uint32_t i;
+  uint32_t j;
+  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
+  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
+  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
+  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
+  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
+  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(8)));
+  /* FW chunk produced by the verification procedure if any   */
+  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* FW chunk provided as input to the verification procedure */
+  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* Variables to handle the FW image (this will be split in chunks) */
+  uint32_t payloadsize;
+  uint32_t ppayload;
+  uint32_t scatter_nb;
+  /* Variables to handle FW image size and tag */
+  uint32_t fw_size;
+  uint8_t *fw_tag;
+
+  /* Check the pointers allocation */
+  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
+  {
+    return SFU_ERROR;
+  }
+  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check the parameters value and set fw_size and fw_tag to check */
+  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
+  {
+    fw_size = pSE_Metadata->FwSize;
+    fw_tag = pSE_Metadata->FwTag;
+  }
+  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
+  {
+    fw_size = pSE_Metadata->PartialFwSize;
+    fw_tag = pSE_Metadata->PartialFwTag;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+
+  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
+  {
+    return SFU_ERROR;
+  }
+
+  /*  fix number of scatter block */
+  if (pSE_Payload->PayloadSize[1] != 0U)
+  {
+    scatter_nb = 2U;
+  }
+  else
+  {
+    scatter_nb = 1U;
+  }
+
+
+  /* Encryption process*/
+  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
+
+  /* check for initialization errors */
+  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    for (j = 0; j < scatter_nb; j++)
+    {
+      payloadsize = pSE_Payload->PayloadSize[j];
+      ppayload = pSE_Payload->pPayload[j];
+      i = 0;
+      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
+
+      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
+             (sfu_ret_status == SFU_SUCCESS))
+      {
+
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        ppayload += fw_chunk_size;
+        fw_verified_total_size += fw_chunk_size;
+        i++;
+      }
+      /* this the last path , size can be smaller */
+      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
+      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+      {
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
+                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)),
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        fw_verified_total_size += fw_chunk_size;
+      }
+    }
+  }
+
+  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    if (fw_verified_total_size <= fw_size)
+    {
+      /* Do the Finalization, check the authentication TAG*/
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
+
+      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
+        {
+          *pSeStatus = SE_SIGNATURE_ERR;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+
+          /* Save result for active slot :
+             to avoid single fault attack the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
+          }
+        }
+        else
+        {
+          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+
+          /* Save result for active slot :
+             to avoid single fault attacje the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag_output, SE_TAG_LEN);
+          }
+        }
+      }
+      else
+      {
+        sfu_ret_status = SFU_ERROR;
+      }
+    }
+    else
+    {
+      sfu_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    sfu_ret_status = SFU_ERROR;
+  }
+  return sfu_ret_status;
+}
+
+/**
+  * @brief Fill authenticated info in SE_FwImage.
+  * @param SFU_APP_Status
+  * @param pBuffer
+  * @param BufferSize
+  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
+{
+  /* Check the pointers allocation */
+  if ((pFwHeader == NULL) || (pBuffer == NULL))
+  {
+    return SFU_ERROR;
+  }
+  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Verify Image Header in the slot given as a parameter
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
+  * @note   Not used in Alpha version -
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* use api read to detect possible ECC error */
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                   sizeof(SE_FwRawHeaderTypeDef));
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify signature */
+    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify Fw signature of binary contiguous in flash
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  SlotNumber flash slot to check
+  * @param  pFwImageHeader pointer to fw header
+  * @param  SlotNumber flash slot to check
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
+                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType)
+{
+  SE_Ex_PayloadDescTypeDef  pse_payload;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*  put it OK, to discriminate error in SFU FWIMG parts */
+  *pSeStatus = SE_OK;
+
+  /* Check the parameters value */
+  if (pFwImageHeader == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check SE_FwType parameter, and fix size and offset accordingly */
+  switch (SE_FwType)
+  {
+    case SE_FW_IMAGE_COMPLETE :
+      fw_size = pFwImageHeader->FwSize;
+      fw_offset = 0U;
+      break;
+    case SE_FW_IMAGE_PARTIAL :
+      fw_size = pFwImageHeader->PartialFwSize;
+#if  !defined(SFU_NO_SWAP)
+      fw_offset = pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+#else
+      fw_offset = pFwImageHeader->PartialFwOffset;
+#endif /* !SFU_NO_SWAP */
+      break;
+    default :
+      /* error */
+      fw_size = 0U;
+      fw_offset = 0U;
+      break;
+  }
+
+  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
+  pse_payload.PayloadSize[0] = fw_size;
+  pse_payload.pPayload[1] = 0U;
+  pse_payload.PayloadSize[1] = 0U;
+
+  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
+}
+
+/**
+  * @brief Verifies the validity of a slot.
+  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
+  * @param pSlotBegin Start address of a slot.
+  * @param uSlotSize Size of a slot.
+  * @param uFwSize Size of the firmware image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
+{
+  uint8_t *pdata;
+  uint32_t length;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check is already clean */
+  pdata = pSlotBegin + SFU_IMG_IMAGE_OFFSET + uFwSize;
+  length = uSlotSize - SFU_IMG_IMAGE_OFFSET - uFwSize;
+  e_ret_status = SFU_LL_FLASH_Compare(pdata, 0x00000000U, 0xFFFFFFFFU, length);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function clean-up the flash
+  * @note   Not designed to clean-up area inside secure engine isolation.
+  * @note   To clean the slot without erasing the header we write "0x00" except if already written
+  * @param  pSlotBegin Start address of a slot.
+  * @param  uSlotSize Size of a slot.
+  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t pdata;
+  uint32_t slot_begin;
+  SFU_LL_FLASH_write_t pattern;
+  SFU_LL_FLASH_write_t value;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  /* Clean-up pattern initialization */
+  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
+
+  /* Cleaning operation */
+  slot_begin = (uint32_t) pSlotBegin;
+  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
+  {
+    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* If read succeed, then the pattern write is performed only if pattern is not already present */
+      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                          sizeof(SFU_LL_FLASH_write_t));
+      }
+    }
+    else
+    {
+      /* If read fail, then the write is performed unconditionally */
+      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                        sizeof(SFU_LL_FLASH_write_t));
+    }
+
+    /* Reload Watchdog every 4Kbytes */
+    if ((pdata % 0x1000U) == 0U)
+    {
+      (void) SFU_LL_SECU_IWDG_Refresh();
+    }
+  }
+  return e_ret_status;
+}
+
+/* Functions Definition : services ------------------------------------------- */
+
+/**
+  * @brief FW Image Handling (FWIMG) initialization function.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
+{
+  uint32_t i;
+  uint32_t mpu_size;
+  uint32_t mpu_max_size;
+  uint32_t mpu_sub_size;
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+#if  !defined(SFU_NO_SWAP)
+  SFU_IMG_InitStatusTypeDef e_swap_ret_status;
+#endif /*(GENERATOR_2_FW_IMAGE) && !(SFU_NO_SWAP) */
+
+  /*
+   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
+   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
+   * starting with 0s.
+   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
+   * side-effects).
+   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
+   */
+  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
+
+  /*
+   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
+      } /* else active slot is properly aligned */
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_DWL_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_DWL_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_DWL_1 + 1U]);
+      } /* else dwl slot is properly aligned */
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
+   */
+  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
+  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
+   */
+  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the chunks used for decrypt match the FLASH constraints
+   */
+  if (0U != (uint32_t)(SFU_IMG_CHUNK_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The size of the chunks used to store the decrypted data must be a multiple of the FLASH write length */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] Decrypt chunk size (%d) is not matching the FLASH constraints\r\n", SFU_IMG_CHUNK_SIZE);
+  } /* else the decrypt chunk size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the chunk size used for decrypt is fine with regards to AES CBC constraints.
+   *               This block alignment constraint does not exist for AES GCM but we do not want to specialize the code
+   *               for a specific crypto scheme.
+   */
+  if (0U != (uint32_t)((uint32_t)SFU_IMG_CHUNK_SIZE % (uint32_t)AES_BLOCK_SIZE))
+  {
+    /* For AES CBC block encryption/decryption the chunks must be aligned on the AES block size */
+    e_ret_status = SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] Chunk size (%d) is not matching the AES CBC constraints\r\n", SFU_IMG_CHUNK_SIZE);
+  }
+
+  /*
+   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if(!((((SlotStartAdd[SLOT_ACTIVE_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+        || (((SlotEndAdd[SLOT_ACTIVE_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the dwl slot does not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_DWL_1 + i];
+    if (start_add != 0U)
+#else /* (__GNUC__) */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if(!((((SlotStartAdd[SLOT_DWL_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+        || (((SlotEndAdd[SLOT_DWL_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure headers are under the MPU protection
+   */
+  /* Calculate size of image header MPU region */
+  mpu_max_size = 2U;
+  for (i = 0U; i < SFU_PROTECT_MPU_HEADER_SIZE; i++)
+  {
+    mpu_max_size = mpu_max_size * 2U;
+  }
+  /* Take into account 8 sub-regions (assuming they are continuous) */
+  mpu_sub_size = mpu_max_size / 8U;
+  mpu_size = 0U;
+  for (i = 0U; i < 8U; i++)
+  {
+    if (((~SFU_PROTECT_MPU_HEADER_SREG) & (0x1U << i)) != 0U)
+    {
+      mpu_size = mpu_size + mpu_sub_size;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!((SlotHeaderAdd[SLOT_ACTIVE_1 + i] >= SFU_PROTECT_MPU_HEADER_START)
+            && ((SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SE_FW_HEADER_TOT_LEN) <=
+                (SFU_PROTECT_MPU_HEADER_START + mpu_size))))
+      {
+        TRACE("\r\n= [FWIMG] Header of SLOT_ACTIVE_%d is not under the MPU protection\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
+   */
+  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
+        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap dwl slot area
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_DWL_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_DWL_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_DWL_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+#if  !defined(SFU_NO_SWAP)
+  /*
+   * Sanity check: specific swap process checks
+   */
+  e_swap_ret_status = SFU_IMG_CheckSwapImageHandling();
+  if (e_swap_ret_status != SFU_IMG_INIT_OK)
+  {
+    e_ret_status = e_swap_ret_status;
+  }
+#endif /* defined(SFU_NO_SWAP) */
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief This function makes sure the current active firmware will not be considered as valid any more.
+  *        This function alters the FLASH content.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
+  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image metadata.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  * @note This function populates the FWIMG module variable: fw_image_header_validated
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
+{
+  /*
+   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
+   */
+  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
+  *       fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (SFU_ERROR == e_ret_status)
+  {
+    /* We do not memorize any specific error, the FSM state is already providing the info */
+    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
+  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
+}
+
+/**
+  * @brief Verifies if no malicious code in active slot.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
+{
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
+}
+
+/**
+  * @brief  Control firmware signature
+  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
+                    SE_TAG_LEN) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  else
+  {
+    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+    return SFU_SUCCESS;
+  }
+
+}
+
+/**
+  * @brief Launches the user application.
+  *        The caller must be prepared to never get the hand back after calling this function.
+  *        If a problem occurs, it must be memorized in the bootinfo area.
+  *        If the caller gets the hand back then this situation must be handled as a critical error.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met
+  *       (typically: no security check performed before launching the firmware).
+  * @note This function only handles the "system" aspects.
+  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
+  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
+  *       function (as this needs to be done just before jumping into the user application).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Verify if authentication/integrity/lock SE service performed */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
+
+  /* this function does not return */
+  /* first image identified as master image */
+  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET);
+
+  /* The point below should NOT be reached */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Get the version of the active FW
+  * @note It is up to the caller to make sure the active slot contains a valid active FW.
+  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
+  *       fails.
+  * @param  SlotNumber index of the slot in the list
+  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
+  */
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
+{
+  SE_FwRawHeaderTypeDef fw_image_header;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint16_t version = 0;
+
+  /* check the header of the active FW */
+  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* retrieve the version from the header without any further check */
+    version = fw_image_header.FwVersion;
+  }
+
+  return (version);
+}
+
+/**
+  * @brief Detect if a FW is present in a slot.
+  * @note  Detection done based on MAGIC header + FW signature. Header verification
+  *        not done at this stage for timing optimization.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
+  SE_FwRawHeaderTypeDef *p_header;
+
+  /* Read header */
+  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
+  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
+  {
+    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
+    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
+    {
+      /*
+       * Control if the first 32 bytes (could be more but time consuming ...) are significants
+       * At this location we should find the vector table.
+       * Objective is to detect if the FW image has been erased
+       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
+       */
+      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Validate the active FW image in active slot by installing the header
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /* Header writing: encrypted part with signature */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
+                                    SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+  /* Header writing : Do not update image state part */
+
+  /* Header writing: previous FW image fingerprint */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
+                                                                    SE_FW_HEADER_FINGERPRINT_LEN),
+                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Get firmware image ID from header.
+  * @param  pFwImageHeader pointer to a structure to handle the header info
+  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
+  */
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  uint32_t active_slot;
+
+  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_1;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_2;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_3;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
+  else
+  {
+    active_slot = SLOT_INACTIVE;
+  }
+
+  return active_slot;
+}
+
+/**
+  * @brief  Check candidate image version is allowed.
+  * @param  ActiveSlot Slot identification used in case of secure counters usage
+  * @param  CurrentVersion Version of currently installed image if any
+  * @param  CandidateVersion Version of candidate image
+  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  UNUSED(ActiveSlot);
+
+  /* If the header of the active firmware is not valid, the CurrentVersion is 0 */
+  if (CurrentVersion == 0U)
+  {
+    /*
+     * If the header of the active firmware is not valid (could comes from an attack attempt, we authorize only the
+     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
+     */
+    if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * It is not allowed to install a Firmware with a lower version than the active firmware.
+     * But we authorize the re-installation of the current firmware version.
+     * We also check that the candidate version is at least the min. allowed version for this device.
+     */
+    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief Verifies the validity of the metadata associated to a candidate image.
+  *        The anti-rollback check is performed.
+  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure):
+  *       SFU_IMG_CheckPendingInstallation should be called first.
+  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
+  *       @ref SFU_APP_VerifyFwHeader.
+  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint32_t active_slot;
+  uint16_t cur_ver;
+  uint16_t verif_ver;
+
+  /*
+   * - Candidate FW Header Authentication
+   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
+   *       As a consequence: fw_image_header_to_test is already populated
+   *
+   * - Check version is allowed
+   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+   */
+
+  /* Header analysis to find slot based on number with magic tag */
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /* Get the version of active_slot */
+  cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+
+  if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
+  {
+    /* The installation is forbidden */
+    /* Memorize this error as this will be handled as a critical failure */
+    SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+
+    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /* leave now to handle the critical failure in the appropriate FSM state */
+    e_ret_status = SFU_ERROR;
+  }
+  else
+  {
+    /* the anti-rollback check succeeds: the version is fine */
+    /* double check to avoid basic hardware attack attack */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    e_ret_status = SFU_IMG_CheckFwVersion(active_slot, verif_ver, fw_image_header_to_test.FwVersion);
+  }
+
+  /* Return the result */
+  return (e_ret_status);
+}
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
new file mode 100644
index 00000000..a2e0d18c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
@@ -0,0 +1,134 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_internal.h
+  * @author  MCD Application Team
+  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
+  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
+  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
+  *          fw_image_header_to_test to install an KMS blob.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_INTERNAL_H
+#define SFU_FWIMG_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_fwimg_regions.h"
+#include "kms_blob_metadata.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Payload Buffer descriptor.
+  * This structure describes how a Firmware is split in Flash.
+  * In the nominal case a Firmware is stored in 1 contiguous area.
+  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
+  * decrypt operation).
+  */
+typedef struct
+{
+  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
+  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
+} SE_Ex_PayloadDescTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief SFU_IMG Flash Status Type Definition
+  * Status of a FLASH operation.
+  */
+typedef enum
+{
+  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
+  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
+  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
+  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
+} SFU_IMG_StatusTypeDef;
+
+/**
+  * @brief RAM chunk used for decryption / comparison / swap
+  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
+  * some function allocates 2 buffer of this size in stack.
+  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
+  */
+#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
+
+#define SFU_IMG_CHUNK_SIZE  (512UL)
+#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief  Status Macro
+  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
+  * activated) and the execution continues.
+  */
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                   while(1==1){;} \
+                                 } while(0==1){;}
+#else
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                 } while(0==1){;}
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
+extern uint32_t SFU_IMG_Line;
+
+extern SE_FwRawHeaderTypeDef fw_image_header_validated;
+extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
+
+/* Exported functions : helper ---------------------------------------------- */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
+SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
+                          uint8_t  *pPayload, uint32_t SE_FwType);
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType);
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_INTERNAL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c
new file mode 100644
index 00000000..071227d3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c
@@ -0,0 +1,930 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_no_swap.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the specific functionalities of the image handling for
+  *          the installation process without swap area.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_NO_SWAP_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+
+#if  defined(SFU_NO_SWAP)
+/* Private macros ------------------------------------------------------------*/
+#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH)
+
+/*             DWL_SLOT_REGION_SIZE             */
+/* <------------------------------------------> */
+/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH| */
+/* | header 1     | header 2     |SWAP magic  | */
+
+#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A] + SLOT_SIZE(A) - TRAILER_HEADER))
+#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
+#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
+
+#endif /* defined(SFU_NO_SWAP) */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#if  defined(SFU_NO_SWAP)
+
+/**
+  * @brief  Write Trailer Headers : TEST + VALID + SWAP
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  /* everything is in place , just compute from present data and write it */
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t  magic[MAGIC_LENGTH];
+  uint32_t buffer;
+
+  /* Write Headers VALID + TEST */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
+                                    SE_FW_HEADER_TOT_LEN);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
+                                      SE_FW_HEADER_TOT_LEN);
+  }
+
+  /* Write Magic */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    buffer = (uint32_t) pValidHeader;
+    (void) memcpy(&magic[0U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
+    buffer = (uint32_t) pTestHeader;
+    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                  MAGIC_LENGTH / 2U);
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check the magic from trailer or counter
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
+{
+  uint8_t  magic[MAGIC_LENGTH];
+  uint8_t  signature_valid[MAGIC_LENGTH / 2];
+  uint8_t  signature_test[MAGIC_LENGTH / 2];
+  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
+
+  /* Pattern initialization */
+  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
+
+  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
+  if (SFU_LL_FLASH_Read(signature_valid,
+                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_valid)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(signature_test,
+                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_test)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /*
+   * Check magic validity :
+   *  - last 16 bytes of validated header
+   *  - last 16 bytes of test header
+   *  - significant values (not an erased flash pattern)
+   */
+  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
+      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
+      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0))
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  check trailer validity to allow resume installation.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus  FirmwareToResume(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+
+  /*
+   *  Initial conditions to be fulfilled :
+   *   - Trailer magic is present
+   *   - Active slot number is correct
+   *   - test header from trailer is signed
+   *   - header from dwl slot is same as the one from trailer
+   */
+
+  /* check trailer Magic */
+  e_ret_status = CheckTrailerMagic(DwlSlot);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate the pTestHeader and verify it the active slot is correct */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate pTestHeader parameter */
+    e_ret_status = ParseFWInfo(pTestHeader, fw_header_trailer_test);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Active slot number correct ?
+       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
+    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
+    {
+      /* Check header test field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
+    }
+    else
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not valid!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Read header from dwl slot and verify this is the same as the test header from trailer */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
+                                     sizeof(fw_header_dwl_slot));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (memcmp(fw_header_dwl_slot, fw_header_trailer_test, SE_FW_AUTH_LEN) != 0U)
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not same as dwl slot header!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* First part KO : return error */
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Read header in active slot if any */
+  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                   sizeof(fw_header_active_slot));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify the header signature in active slot */
+    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
+
+    /* Populate pValidHeader parameter */
+    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header valid field in trailer */
+      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                       sizeof(fw_header_trailer_valid));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * 3 cases:
+       * - Header in active slot is identical to the header valid field
+       *   ==> installation interrupted very early. Resume install must be triggered.
+       * - Header in active slot is identical to the header test field
+       *   ==> installation interrupted after active header erasing. Resume install must be triggered.
+       * - Any other values
+       *   ==> Hack tentative, resume install must not be triggered.
+       */
+
+      /* Check if header in active slot is same as header valid in trailer */
+      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, SE_FW_AUTH_LEN) != 0)
+      {
+        /* Check candidate image version : should be OK */
+        e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+      }
+      /* Check if header in active slot is same as header test in trailer */
+      else if (memcmp(fw_header_active_slot, fw_header_trailer_test, SE_FW_AUTH_LEN) == 0U)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+      else
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  No resume required : Header in active slot is neither sames TRAILER_HDR_TEST as nor TRAILER_VALID_TEST!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        e_ret_status = SFU_ERROR;
+      }
+    }
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+  else
+  {
+    /*
+     * Header in active slot is not valid.
+     * It is considered this can not be hack attempt, because header in active slot is in
+     * protected area.
+     * Possible reasons:
+     * - Installation has been interrupted during very first image installation (active slot was empty)
+     * - Installation has been interrupted during reconstitution of first sector of active slot
+     * If header test field in trailer is signed and with proper version, we resume install.
+     */
+
+    /* Read header valid field in trailer */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                     sizeof(fw_header_trailer_valid));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check header valid field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* active slot was containing an active image */
+
+        /* Populate pValidHeader parameter */
+        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /* Check candidate image version */
+          e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+        }
+      }
+      else
+      {
+        /* active slot was empty : we authorize only the installation of a specific version identified by
+           SFU_FW_VERSION_INIT_NUM */
+        if (pTestHeader->FwVersion == SFU_FW_VERSION_INIT_NUM)
+        {
+          /* active slot was empty or was containing bricked Fw image */
+          e_ret_status = SFU_SUCCESS;
+        }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        else
+        {
+          TRACE("\r\n\t  Init version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, pTestHeader->FwVersion);
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+    }
+
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify signature on encrypted FW
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus VerifyFwSignatureBeforeDecrypt(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_decrypted_chunk_size;
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t fw_authenticated_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_authenticated_chunk_size;
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+  uint32_t fw_index;
+  uint32_t size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  /* Verify header presence */
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process initialization
+     ================================= */
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+  if (se_ret_status == SE_SUCCESS)
+  {
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+    se_ret_status = SE_AuthenticateFW_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+
+    /* Skip header : no decryption needed */
+    fw_index = SFU_IMG_IMAGE_OFFSET;
+
+    e_ret_status = SFU_SUCCESS;
+    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
+           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Set size of reading/decryption */
+      size = SFU_IMG_CHUNK_SIZE;
+
+      /* Last pass ? */
+      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
+      {
+        /* Default chunk size can be troncated at end of file */
+        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
+      }
+
+      /* read then decrypt phase
+       ======================= */
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        fw_decrypted_chunk_size = size;
+        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
+                                          (int32_t *)&fw_decrypted_chunk_size);
+
+        if (se_ret_status == SE_SUCCESS)
+        {
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+          fw_authenticated_chunk_size = sizeof(fw_authenticated_chunk);
+          se_ret_status = SE_AuthenticateFW_Append(&e_se_status, fw_decrypted_chunk, (int32_t)size,
+                                                   fw_authenticated_chunk, (int32_t *)&fw_authenticated_chunk_size);
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+          fw_index += size;
+        }
+      }
+    }
+  }
+
+  /* Do the Finalization, check the authentication TAG
+     ================================================= */
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
+  {
+    e_ret_status = SFU_ERROR;
+
+    /* Finalization stage */
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if (se_ret_status == SE_SUCCESS)
+    {
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+      e_ret_status = SFU_SUCCESS;
+#else
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status = SE_AuthenticateFW_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+      if ((se_ret_status == SE_SUCCESS) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, pFwImageHeader->FwTag, SE_TAG_LEN) == SFU_SUCCESS)
+        {
+          e_ret_status = SFU_SUCCESS;
+        }
+      }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Decrypt Image from dwl slot to active slot
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus DecryptImageFromDwlSlotToActiveSlot(uint32_t ActiveSlot, uint32_t DwlSlot,
+                                                           SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_index;
+  uint32_t size;
+  uint32_t fw_decrypted_chunk_size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  TRACE("\r\n\t  Image preparation done.\r\n\t  Installation started ...");
+
+  /* Verify header presence */
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Control the firwmare size vs slot size */
+  if ((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) > SLOT_SIZE(ActiveSlot))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process initialization
+     ================================= */
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+  if (se_ret_status == SE_SUCCESS)
+  {
+
+    /* Erasing operation
+     ================= */
+
+    /*
+     *  The header may not be contiguous with the FW image : 2 erasing operations needed
+     */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                           SFU_IMG_IMAGE_OFFSET);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                             (uint8_t *)(SlotStartAdd[ActiveSlot] + SFU_IMG_IMAGE_OFFSET),
+                                             SLOT_SIZE(ActiveSlot) - SFU_IMG_IMAGE_OFFSET);
+    }
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /*
+     * Save immediately the new active FW header
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_IMG_Validation(ActiveSlot, pFwImageHeader);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  Header writing failure!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+    }
+
+    /*
+     * Skip header : no decryption needed
+     */
+    fw_index = SFU_IMG_IMAGE_OFFSET;
+
+    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
+           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Refresh Watchdog every 10 iterations */
+      if ((fw_index % 10U) != 0U)
+      {
+        (void) SFU_LL_SECU_IWDG_Refresh();
+      }
+
+      /* Set size of reading/decryption */
+      size = SFU_IMG_CHUNK_SIZE;
+
+      /* Last pass ? */
+      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
+      {
+        /* Default chunk size can be troncated at end of file */
+        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
+      }
+
+      /* read then decrypt phase
+       ======================= */
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        fw_decrypted_chunk_size = size;
+        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
+                                          (int32_t *)&fw_decrypted_chunk_size);
+
+        /*
+        * writing phase
+        * =============== */
+        if (se_ret_status == SE_SUCCESS)
+        {
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotStartAdd[ActiveSlot] + fw_index),
+                                            fw_decrypted_chunk, size);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+          /* Update pointer */
+          fw_index += size;
+        }
+      }
+    }
+  }
+
+#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_index);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#endif /* SFU_ENCRYPTED_IMAGE */
+
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
+  {
+    /* Do the Finalization, check the authentication TAG*/
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if (se_ret_status != SE_SUCCESS)
+    {
+      e_ret_status = SFU_ERROR;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Install the new version
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                         SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+
+  /*
+   * Verify FW Image signature in dwl slot
+   */
+  e_ret_status = VerifyFwSignatureBeforeDecrypt(DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_SIGNATURE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Control if there is no additional code beyond the firmware image (malicious SW)
+   */
+  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot), pTestHeader->FwSize);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_ADDITIONAL_CODE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Write trailer : memorize installation process started
+   */
+  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_UPDATE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Decrypt the FW image : from dwl slot to active slot
+   */
+  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+    return e_ret_status;
+  }
+
+
+  /*
+   * erase downloaded FW after installation
+   */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    SFU_EXCPT_SetError(SFU_EXCPT_DWL_SLOT_ERASING_ERR);
+    return e_ret_status;
+  }
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to be populated
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+
+  /* Verify FW Image Header tag in dwl slot */
+  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
+                         SFU_IMG_IMAGE_OFFSET);
+
+    /* Check if there is enough room for the trailers */
+    if (trailer_begin < end_of_test_image)
+    {
+      /*
+       * This error causes is not memorized in the BootInfo area because there won't be any error handling
+       * procedure.
+       * If this function returns that no new firmware can be installed (as this may be a normal case).
+       */
+      e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+    else
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SFU_NO_SWAP) */
+
+
+
+/* Functions Definition : services ------------------------------------------- */
+
+#if  defined(SFU_NO_SWAP)
+/**
+  * @brief Checks if there is a pending firmware installation.
+  *        2 situations can occur:
+  *        A. Pending firmware installation: a firmware is ready to be installed.
+  *        B. No firmware installation pending
+  * @note  The anti-rollback check is not taken into account at this stage.
+  * @note  This function populates the FWIMG module variables: fw_image_header_to_test
+  * @param  pDwlSlotToInstall identification of the downloaded slot to install
+  * @param  pActiveSlotToResume identification of the active slot to resume
+  * @param  pActiveSlotToRollback identification of the active slot to rollback
+  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, no pending action)
+  */
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback)
+{
+  SFU_IMG_ImgInstallStateTypeDef e_ret_state = SFU_IMG_NO_FWUPDATE;
+  uint32_t i;
+  uint32_t j;
+
+  /* No rollback capability in "NO_SWAP" configuration */
+  *pActiveSlotToResume = SLOT_INACTIVE;
+  *pActiveSlotToRollback = SLOT_INACTIVE;
+  *pDwlSlotToInstall = SLOT_INACTIVE;
+
+  /* Check image installation stopped
+     ================================ */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+      {
+        /* Slot configured ? */
+        if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+        {
+          if (SFU_SUCCESS == FirmwareToResume(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
+                                               &fw_image_header_to_test))
+          {
+            /* A Firmware Update has been stopped
+             * fw_image_header_to_test & fw_image_header_validated have been populated
+             * Stop at first occurrence : next ones if any will be resumed after reset
+             */
+            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
+            *pDwlSlotToInstall = SLOT_DWL_1 + j;
+            return SFU_IMG_FWUPDATE_STOPPED;
+          }
+        }
+      }
+    }
+  }
+
+  /* Install new firmware if requested
+     ================================= */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + i, &fw_image_header_to_test))
+      {
+        /*
+         * A Firmware is available for installation:
+         * fw_image_header_to_test has been populated
+         * Stop at first occurrence : next ones if any will be installed after reset
+         */
+        *pDwlSlotToInstall = SLOT_DWL_1 + i;
+        return SFU_IMG_FWIMAGE_TO_INSTALL;
+      }
+    }
+  }
+
+  return e_ret_state;
+}
+
+/**
+  * @brief Resume installation : not required but present for compatibility with swap process
+  *        If installation procedure is interrupted (e.g.: switch off) it will be restarted from begin at next reboot.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS
+  */
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+
+  /*
+   * Decrypt the FW image : from dwl slot to active slot
+   */
+  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, &fw_image_header_to_test);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+  }
+
+  /*
+   * erase downloaded FW after installation
+   */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    SFU_EXCPT_SetError(SFU_EXCPT_DWL_SLOT_ERASING_ERR);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Resume procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Resume procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
+  *        valid if the checks are successful.
+  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
+  *        afterwards if the cryptographic scheme allows this (signature check for instance).
+  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
+  *        This function modifies the FLASH content.
+  *        If this procedure is interrupted (e.g.: switch off) installation will be restarted from begin at next reboot.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint32_t active_slot;
+
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /*
+   * Check the active slot is big enough
+   */
+  if (fw_image_header_to_test.FwSize + SFU_IMG_IMAGE_OFFSET <= SLOT_SIZE(active_slot))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /*
+   * Populate fw_image_header_validated
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
+                                     sizeof(fw_image_header_validated));
+  }
+  
+  /*
+   * Installing the new firmware image consists in decrypting the candidate firmware image.
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
+  }
+
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    /* Erase downloaded FW in case of installation  error */
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Installation procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Installation procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  /* return the installation result */
+  return (e_ret_status);
+}
+#endif /* (SFU_NO_SWAP) */
+
+
+#if   defined(SFU_NO_SWAP)
+/**
+  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
+
+  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
+                                             SLOT_SIZE(DwlSlot));
+  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  return ((e_ret_status_dwl != SFU_SUCCESS) ?  SFU_ERROR : SFU_SUCCESS);
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SFU_NO_SWAP) */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
new file mode 100644
index 00000000..4d127d81
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
@@ -0,0 +1,95 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_services.h
+  * @author  MCD Application Team
+  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
+  *          API definitions.
+  *          These services can be called by the bootloader to deal with images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_SERVICES_H
+#define SFU_FWIMG_SERVICES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_IMG Initialization Status Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_IMG_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_IMG Image Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
+  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
+  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
+  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
+} SFU_IMG_ImgInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback);
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_SERVICES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c
new file mode 100644
index 00000000..d132a276
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c
@@ -0,0 +1,2329 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_swap.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the specific functionalities of the image handling for
+  *          the installation process with swap area.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_SWAP_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h" /* to have definitions like SFU_IMG_InitStatusTypeDef
+                                   (required by sfu_fwimg_internal.h) */
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+#if  !defined(SFU_NO_SWAP)
+
+/* Private macros ------------------------------------------------------------*/
+#define TRAILER_INDEX(A)  (SLOT_SIZE(A) / SLOT_SIZE(SLOT_SWAP))
+/*  position of image begin on 1st block */
+#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH + MAGIC_LENGTH)
+
+/*                                         DWL_SLOT_REGION_SIZE                                             */
+/* <----------------------------------------------------------------------------------------------------->  */
+/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH|N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t) */
+/* | header 1     | header 2     |SWAP magic  |CLEAN pat.  | N*CPY_TO_ACTIVE_SLOT  | N*CPY_TO_DWL_SLOT      */
+/*                                                                                                          */
+/* Please note that the size of the trailer area (N*CPY_TO_SLOTx) depends directly on SFU_LL_FLASH_write_t type, */
+/* so it can differ from one platform to another (this is FLASH-dependent)                                       */
+#define TRAILER_SIZE(A) ((sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A)))\
+                         + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) + (uint32_t)(TRAILER_HEADER))
+#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A]\
+                                        + SLOT_SIZE(A) - TRAILER_SIZE(A)))
+#define TRAILER_CPY_TO_DWL_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
+                                              + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) \
+                                              + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
+#define TRAILER_CPY_TO_ACTIVE_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
+                                                 + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
+
+#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
+#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_CLEAN_ADDR(A)((uint8_t *)(TRAILER_BEGIN(A)\
+                                          + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH))
+
+#define CHUNK_1_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
+                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+#define CHUNK_0_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
+                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+
+#define CHUNK_0_ADDR_HEADER(A,B,C) ((((B)==0) && ((C)==0))?\
+                                    (uint8_t *)(SlotHeaderAdd[(A)]) : \
+                                    (uint8_t *)(SlotStartAdd[(A)]\
+                                                +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+
+#define CHUNK_0_ADDR_MODIFIED(A,B,C) ((((B)==0) && ((C)==0))?\
+                                      ((uint8_t*)(SlotStartAdd[(A)] + SFU_IMG_IMAGE_OFFSET)) : \
+                                      ((uint8_t*)(SlotStartAdd[(A)] + (SLOT_SIZE(SLOT_SWAP)*(B)) \
+                                                  + (SFU_IMG_CHUNK_SIZE*(C)))))
+#define CHUNK_SWAP_ADDR(B) ((uint8_t *)(SlotStartAdd[SLOT_SWAP]+(SFU_IMG_CHUNK_SIZE*(B))))
+
+/* Private variables ----------------------------------------------------------*/
+/* Trailer pattern : sizeof of write access type */
+static const int8_t SWAPPED[sizeof(SFU_LL_FLASH_write_t)] __attribute__((aligned(8))) = {0, 0, 0, 0, 0, 0, 0, 0};
+static const int8_t NOT_SWAPPED[sizeof(SFU_LL_FLASH_write_t)]  __attribute__((aligned(8))) = {-1, -1, -1, -1, -1, -1,
+                                                                                              -1, -1
+                                                                                             };
+
+/* Functions Definition : helper ---------------------------------------------*/
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Checks if a rollback is required
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if Image should be rollbacked, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToRollback(uint32_t SlotNumber, SE_FwStateTypeDef MasterSlotState)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus e_ret_status_se;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+  SE_FwStateTypeDef e_next_image_state;
+
+
+  /* If an image is detected, read the image state :
+   * if image is new, nothing to do. Switch from NEW to SELFTEST will be done before when launching user application.
+   * if image is selftest, set to invalid. Rollback required.
+   * if image is valid, nothing to do.
+   * if image is invalid, Rollback is required.
+   */
+  if (SFU_SUCCESS == SFU_IMG_DetectFW(SlotNumber))
+  {
+    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
+    if (e_ret_status_se == SE_SUCCESS)
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  SLOT_ACTIVE_%d state = %d", SlotNumber, image_state);
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+      switch (image_state)
+      {
+        case FWIMG_STATE_NEW:
+        {
+          /* Multiple reset can occur during installation
+           * Switch from NEW to SELFTEST will be done before when launching user application
+           */
+          break;
+        }
+        case FWIMG_STATE_SELFTEST:
+        {
+          if (MasterSlotState == FWIMG_STATE_VALID_ALL)
+          {
+            /* Master slot is in VALID_ALL state, all other images should be validated
+             * Compare to successive validation operations VALID_ALL is a single request thus robust to reset
+             */
+            e_next_image_state = FWIMG_STATE_VALID;
+            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            if (e_ret_status_se != SE_SUCCESS)
+            {
+              TRACE("\r\n\t  SLOT_ACTIVE_%d state update error", SlotNumber);
+            }
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+            e_ret_status = SFU_ERROR;
+          }
+          else
+          {
+            /* Bootloader should never find an image in SELFTEST state - bootloader
+             * assumes self test was not able to complete and marks image as INVALID
+             */
+            e_next_image_state = FWIMG_STATE_INVALID;
+            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            if (e_ret_status_se != SE_SUCCESS)
+            {
+              TRACE("\r\n\t  SLOT_ACTIVE_%d state update error", SlotNumber);
+            }
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+            e_ret_status = SFU_SUCCESS;
+          }
+          break;
+        }
+        case FWIMG_STATE_VALID:
+        case FWIMG_STATE_VALID_ALL:
+        {
+          break;
+        }
+        default:
+        {
+          /* image may be in INVALID state
+           * Image marked as invalid failed selftest so we need to attempt a rollback to last good image
+           */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Updates the finger print of the new firmware the header signature of the previous firmware
+  * @param  pNewHeader: pointer in ram to header of new installed fw
+  * @param  pPrevHeader: pointer in ram to header of backed-up fw
+  * @retval none
+  */
+static void UpdateHeaderFingerPrint(SE_FwRawHeaderTypeDef *pNewHeader, SE_FwRawHeaderTypeDef *pPrevHeader)
+{
+  (void) memcpy(pNewHeader->PrevHeaderFingerprint, pPrevHeader->HeaderSignature,
+                sizeof(pNewHeader->PrevHeaderFingerprint));
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+/**
+  * @brief  Check the magic from trailer or counter
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
+{
+  uint8_t  magic[MAGIC_LENGTH];
+  uint8_t  clean[MAGIC_LENGTH];
+  uint8_t  signature_valid[MAGIC_LENGTH / 2];
+  uint8_t  signature_test[MAGIC_LENGTH / 2];
+  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
+
+  /* Pattern initialization */
+  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
+
+  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
+  if (SFU_LL_FLASH_Read(signature_valid,
+                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_valid)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(signature_test,
+                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_test)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(clean, TRAILER_CLEAN_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /*
+   * Check magic validity :
+   *  - last 16 bytes of validated header
+   *  - last 16 bytes of test header
+   *  - significant values (not an erased flash pattern)
+   *
+   *  Check clean tag not set :
+   *  - should be erased flash pattern but not clean-up paatern (0x55 0x55 ...)
+   */
+  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
+      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
+      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0)
+      || (memcmp(clean, erased_flash_pattern, MAGIC_LENGTH) != 0))
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Write the minimum value possible on the flash
+  * @param  pAddr: pointer to address to write .
+  * @param  pValue: pointer to the value to write
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  *
+  * @note This function should be FLASH dependent.
+  *       We abstract this dependency thanks to the type SFU_LL_FLASH_write_t.
+  *       See @ref SFU_LL_FLASH_write_t
+  */
+static SFU_ErrorStatus AtomicWrite(uint8_t *pAddr, SFU_LL_FLASH_write_t *pValue)
+{
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  return SFU_LL_FLASH_Write(&flash_if_info, pAddr, (uint8_t *)pValue, sizeof(SFU_LL_FLASH_write_t));
+}
+
+/**
+  * @brief  Clean Magic value
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CleanMagicValue(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t clean_tag[MAGIC_LENGTH];
+
+  /* set the clean tag into trailer */
+  (void) memset(clean_tag, 0x55, MAGIC_LENGTH);
+  return SFU_LL_FLASH_Write(&flash_if_info, TRAILER_CLEAN_ADDR(DwlSlot), clean_tag, MAGIC_LENGTH);
+}
+
+/**
+  * @brief  Write Trailer Headers : TEST + VALID + SWAP
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  /* everything is in place , just compute from present data and write it */
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t  magic[MAGIC_LENGTH];
+  uint32_t buffer;
+
+  /* Write Headers VALID + TEST */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
+                                    SE_FW_HEADER_TOT_LEN);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
+                                      SE_FW_HEADER_TOT_LEN);
+  }
+
+  /* Write Magic */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    buffer = (uint32_t) pValidHeader;
+    (void) memcpy(&magic[0U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
+    buffer = (uint32_t) pTestHeader;
+    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                  MAGIC_LENGTH / 2U);
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the size of the swap area in a given slot sector.
+  * @note   The erasure occurs at @: @slot + index*swap_area_size
+  * @param  SlotNumber index of the slot in the list
+  * @param  Index This is the number of "swap size" we jump from the slot start
+  * @retval SFU_ SUCCESS if valid, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus EraseSlotIndex(uint32_t SlotNumber, uint32_t index)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t buffer;
+
+  buffer = SlotStartAdd[SlotNumber];
+  buffer = buffer + (SLOT_SIZE(SLOT_SWAP) * index);
+
+  /* If this is an active slot and the index is 0 then header is concerned */
+  if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber <= (SLOT_ACTIVE_1 + SFU_NB_MAX_ACTIVE_IMAGE)) && (index == 0U))
+  {
+
+    /*
+     *  As the header may not be contiguous with FW, this action is split in 2 actions :
+     *    - HEADER : executed in secured environment
+     *    - remaining part : done by SBSFU
+     */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                           SFU_IMG_IMAGE_OFFSET) ;
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SlotNumber] +
+                                             SFU_IMG_IMAGE_OFFSET, SLOT_SIZE(SLOT_SWAP) - SFU_IMG_IMAGE_OFFSET);
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)buffer, SLOT_SIZE(SLOT_SWAP)) ;
+  }
+
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify image signature of binary after decryption
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus VerifyFwSignatureAfterDecrypt(SE_StatusTypeDef *pSeStatus, uint32_t DwlSlot,
+                                                     SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SE_Ex_PayloadDescTypeDef payload_desc;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*
+   * The values below are not necessarily matching the way the firmware
+   * has been spread in FLASH but this is adjusted later on in the this function.
+   */
+  payload_desc.pPayload[0] = SlotStartAdd[SLOT_SWAP];
+  payload_desc.PayloadSize[0] = SLOT_SIZE(SLOT_SWAP);
+  payload_desc.pPayload[1] = SlotStartAdd[DwlSlot];
+  payload_desc.PayloadSize[1] = SLOT_SIZE(DwlSlot);
+
+  fw_size = pFwImageHeader->PartialFwSize;
+  fw_offset = (SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
+              SLOT_SIZE(SLOT_SWAP);
+
+  /*
+   * Adjusting the description of the way the Firmware is written in FLASH.
+   */
+  payload_desc.pPayload[0] = payload_desc.pPayload[0] + fw_offset;
+
+  /* The first part contains the execution offset so the payload size must be adjusted accordingly */
+  payload_desc.PayloadSize[0] = payload_desc.PayloadSize[0] - fw_offset;
+
+  if (fw_size <= payload_desc.PayloadSize[0])
+  {
+    /* The firmware is written fully in a contiguous manner */
+    payload_desc.PayloadSize[0] = fw_size;
+    payload_desc.PayloadSize[1] = 0U;
+    payload_desc.pPayload[1] = 0U;
+  }
+  else
+  {
+    /*
+     * The firmware is too big to be contained in the first payload slot.
+     * So, the firmware is split in 2 non-contiguous parts
+     */
+
+    if ((payload_desc.pPayload[1] == 0U)
+        || (payload_desc.PayloadSize[1] < (fw_size - payload_desc.PayloadSize[0])))
+    {
+      return SFU_ERROR;
+    }
+
+    /* The second part contains the end of the firmware so the size is the total size - size already stored in the
+       first area */
+    payload_desc.PayloadSize[1] = fw_size - payload_desc.PayloadSize[0];
+
+  }
+
+  /* Signature Verification */
+  return VerifyFwSignatureScatter(pSeStatus, DwlSlot, pFwImageHeader, &payload_desc, SE_FW_IMAGE_PARTIAL);
+}
+
+
+/**
+  * @brief  Swap active slot with decrypted FW to install
+  *         With the 2 images implementation, installing a new Firmware Image means swapping active slot and dwl slot.
+  *         To perform this swap, the image to be installed is split in blocks of the swap size:
+  *         SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP) blocks to be swapped .
+  *         Each of these blocks is swapped using smaller chunks of SFU_IMG_CHUNK_SIZE size.
+  *         The swap starts from the tail of the image and ends with the beginning of the image ("swap from tail to
+  *         head").
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus SwapFirmwareImages(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_LL_FLASH_write_t trailer;
+  int32_t index_active_slot;
+  int32_t index_dwl_slot_write;
+  int32_t index_dwl_slot_read;
+  int32_t chunk;
+  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  int32_t index_active_slot_partial_begin;
+  int32_t index_active_slot_partial_end;
+  int32_t index_active_slot_final_end;
+  int32_t index_dwl_slot_partial_end;
+  int32_t index_active_slot_empty_begin;
+  /* number_of_index_active_slot is the number of blocks in active slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
+  uint32_t number_of_index_active_slot = SLOT_SIZE(ActiveSlot) / SLOT_SIZE(SLOT_SWAP);
+  /* number_of_index_dwl_slot is the number of blocks in dwl slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
+  uint32_t number_of_index_dwl_slot = SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP);
+  /* number_of_chunk is the number of chunks used to swap 1 block (moving a block of SLOT_SIZE(SLOT_SWAP) bytes
+     split in number_of_chunk chunks of SFU_IMG_CHUNK_SIZE bytes) */
+  uint32_t number_of_chunk = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  uint32_t write_len;
+  uint32_t offset_block_partial_begin;
+  uint32_t offset_block_partial_end;
+  uint32_t offset_block_final_end;
+
+  TRACE("\r\n\t  Image preparation done.\r\n\t  Swapping the firmware images");
+
+  /* index_active_slot_partial_begin is the index of first block (of SLOT_SIZE(SLOT_SWAP) bytes) in active slot
+     impacted by partial image */
+  index_active_slot_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) /
+                                    SLOT_SIZE(SLOT_SWAP);
+
+  /* offset_block_partial_begin is the offset of first byte of partial image inside index_active_slot_partial_begin
+     block */
+  offset_block_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) %
+                               SLOT_SIZE(SLOT_SWAP);
+
+  /* In case of COMPLETE update, the full slots are swapped
+     Assumption : DwlSlot is at least greater than ActiveSlot */
+  if ((pFwImageHeader->FwSize == pFwImageHeader->PartialFwSize) && (SLOT_SIZE(DwlSlot) >= SLOT_SIZE(ActiveSlot)))
+  {
+    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in active slot */
+    index_active_slot_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_partial_end is the offset of first byte following partial image, inside
+       index_active_slot_partial_end block */
+    offset_block_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
+
+    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in dwl slot or swap area */
+    index_dwl_slot_partial_end = ((SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP)) - 1U;
+
+    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following final
+       image in active slot */
+    index_active_slot_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
+       block */
+    offset_block_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
+
+    /* set index_dwl_slot_write: starting from the end */
+    index_dwl_slot_write = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+  }
+  else
+  {
+    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in active slot */
+    index_active_slot_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
+                                     pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_partial_end is the offset of first byte following partial image, inside
+       index_active_slot_partial_end block */
+    offset_block_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
+                                pFwImageHeader->PartialFwSize) % SLOT_SIZE(SLOT_SWAP);
+
+    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in dwl slot or swap area */
+    index_dwl_slot_partial_end = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
+                                                            SLOT_SIZE(SLOT_SWAP))) % SLOT_SIZE(SLOT_SWAP) +
+                                   pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP)) - 1U;
+
+    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       final image in active slot */
+    index_active_slot_final_end = ((SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) / SLOT_SIZE(SLOT_SWAP));
+
+    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
+       block */
+    offset_block_final_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) % SLOT_SIZE(SLOT_SWAP);
+
+    /* set index_dwl_slot_write: starting from the end, block index in dwl slot or swap area to receive block from
+       active slot */
+    if (index_active_slot_partial_end == (number_of_index_active_slot - 1))
+    {
+      /* last block of dwl slot can only receive last block of active slot, due to trailer presence */
+      index_dwl_slot_write = number_of_index_dwl_slot - 1;
+    }
+    else
+    {
+      index_dwl_slot_write = number_of_index_dwl_slot - 2;
+    }
+  }
+
+  /* set index_active_slot: starting from the end, block index from active slot to copy in dwl slot */
+  index_active_slot = index_active_slot_partial_end;
+
+  /* set index_dwl_slot_read: starting from the end, block index in dwl slot or swap area to copy updated image to
+     active slot */
+  index_dwl_slot_read = index_dwl_slot_partial_end;
+
+  /* Adjust indexes in case offset is 0: in this case, first block to swap is the previous one */
+  if (offset_block_partial_end == 0)
+  {
+    index_active_slot--;
+    index_dwl_slot_read--;
+  }
+
+  /*
+   * dwl slot read index should be lower than dwl slot write index.
+   * If not the case, the dwl slot is not big enough to manage this partial firmware image
+   * (depends on offset and size).
+   */
+  if (index_dwl_slot_read >= index_dwl_slot_write)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Swap one block at each loop, until all targeted blocks of active slot have been copied
+   * Concerned blocks are:
+   * 1- block impacted by partial image
+   * 2- first block containing the header
+   */
+  while (index_active_slot >= 0)
+  {
+    /* Reload watchdoag every SWAP size */
+    SFU_LL_SECU_IWDG_Refresh();
+
+    TRACE(".");
+
+    if ((index_dwl_slot_write < -1) || (index_dwl_slot_read < -1))
+    {
+      return SFU_ERROR;
+    }
+
+    /* If CPY_TO_DWL_SLOT(i) is still virgin, then swap the block from active slot to dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
+                                     TRAILER_CPY_TO_DWL_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 - index_active_slot),
+                                     sizeof(trailer));
+    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
+    {
+      /* Erase destination block in dwl slot or swap, if not the trailer block */
+      if (index_dwl_slot_write != (number_of_index_dwl_slot - 1))
+      {
+        if (index_dwl_slot_write == -1)
+        {
+          /* Erase the swap */
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
+                                                 SLOT_SIZE(SLOT_SWAP));
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
+        }
+        else /* index_dwl_slot_write >= 0 */
+        {
+          /* erase the size of "swap area" at @: Dwl slot + index_dwl_slot_write*swap_area_size */
+          e_ret_status = EraseSlotIndex(DwlSlot, index_dwl_slot_write);
+        }
+        if (e_ret_status !=  SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+
+      /* Copy the block from active slot to dwl slot or swap (using "number_of_chunk" chunks) */
+      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
+      {
+        /* ignore return value,  no double ecc error is expected, area already read before */
+        (void)SFU_LL_FLASH_Read(buffer, CHUNK_0_ADDR_HEADER(ActiveSlot, index_active_slot, chunk), sizeof(buffer));
+        write_len = sizeof(buffer);
+        if (index_dwl_slot_write == -1)
+        {
+          /* Destination block is the swap */
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_SWAP_ADDR(chunk), buffer, write_len);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+          if (e_ret_status != SFU_SUCCESS)
+          {
+            return SFU_ERROR;
+          }
+        }
+        else /* index_dwl_slot_write >= 0 */
+        {
+          /* Destination block is in dwl slot: Do not overwrite the trailer. */
+          if (((uint32_t)CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk)) < (uint32_t)TRAILER_BEGIN(DwlSlot))
+          {
+            /*  write is possible length can be modified  */
+            if ((uint32_t)(CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) + write_len) >
+                (uint32_t)TRAILER_BEGIN(DwlSlot))
+            {
+              write_len = TRAILER_BEGIN(DwlSlot) - CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk);
+            }
+            e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                              buffer, write_len);
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+      }
+
+      /*
+       * The block of the active firmware has been backed up.
+       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
+       */
+      e_ret_status  = AtomicWrite(TRAILER_CPY_TO_DWL_SLOT(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
+                                  (SFU_LL_FLASH_write_t *) SWAPPED);
+
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+        return SFU_ERROR;
+      }
+    }
+
+    /* If CPY_TO_ACTIVE_SLOT(i) is still virgin, then swap the block from dwl slot to active slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
+                                     TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 -
+                                                                index_active_slot),
+                                     sizeof(trailer));
+    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
+    {
+      /* erase the size of "swap area" at @: active slot + index_active_slot*swap_area_size*/
+      e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
+
+      if (e_ret_status !=  SFU_SUCCESS)
+      {
+        return SFU_ERROR;
+      }
+
+      /*
+       * Fill block in active slot:
+       * The appropriate update image block of dwl slot together with initial image block that has been backed up in
+       * dwl slot,
+       * are associated to constitute final block in active slot (installing the block of the new firmware image).
+       */
+      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
+      {
+        /* Read complete chunk of updated image */
+        if (index_dwl_slot_read == -1)
+        {
+          /* ignore return value, no double ecc error is expected, area already read before */
+          (void)SFU_LL_FLASH_Read(buffer, CHUNK_SWAP_ADDR(chunk), sizeof(buffer));
+        }
+        else /* index_dwl_slot_read >= 0 */
+        {
+          /* ignore return value, no double ecc error is expected, area already read before */
+          (void)SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_read, chunk), sizeof(buffer));
+        }
+
+        /* Last impacted block: end of block has to be updated with initial image */
+        if (index_active_slot == index_active_slot_partial_end)
+        {
+          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
+          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) >= (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
+                                                                                  0) + offset_block_partial_end))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             sizeof(buffer));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+
+          /* If chunk is partially impacted by updated image, end of chunk is updated with the initial image content */
+          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) < (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
+                                                                                  0) + offset_block_partial_end))
+              && ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1))) >
+                  (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_end)))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer + (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
+                                             CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) +
+                                             (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
+                                             sizeof(buffer) - (offset_block_partial_end % SFU_IMG_CHUNK_SIZE));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+
+        /* First impacted block: beginning of block has to be updated with initial image */
+        if (index_active_slot == index_active_slot_partial_begin)
+        {
+          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
+          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) <=
+              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             sizeof(buffer));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+
+          /* If chunk is partially impacted by updated image, beginning of chunk is updated with the initial image
+             content */
+          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) <
+               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)) &&
+              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) >
+               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             offset_block_partial_begin % SFU_IMG_CHUNK_SIZE);
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+        /* Header block not impacted by partial image: complete block, except header, is updated with initial image */
+        else if (index_active_slot == 0)
+        {
+          /* check return value, as this area has not been read before */
+          e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk), sizeof(buffer));
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+          if (e_ret_status != SFU_SUCCESS)
+          {
+            return SFU_ERROR;
+          }
+        }
+
+        /* Last block of final image: end of block has to be cleaned with empty data */
+        if (index_active_slot == index_active_slot_final_end)
+        {
+          /* If chunk is completely beyond the final image, then chunk takes empty data */
+          if (CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) >=
+              CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)
+          {
+            memset(buffer, 0xFF, sizeof(buffer));
+          }
+
+          /* If chunk is partially beyond the final image, then chunk is partially updated with empty data */
+          if ((CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) <
+               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)) &&
+              (CHUNK_0_ADDR(ActiveSlot, index_active_slot, (chunk + 1)) >
+               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)))
+          {
+            memset(buffer + (offset_block_final_end % SFU_IMG_CHUNK_SIZE), 0xFF,
+                   sizeof(buffer) - (offset_block_final_end % SFU_IMG_CHUNK_SIZE));
+          }
+        }
+
+        write_len = SFU_IMG_CHUNK_SIZE;
+        /*  don't copy header in active slot
+            this will be done at the end during validation step */
+        if ((index_active_slot == 0) && (chunk == 0))
+        {
+          write_len = write_len - SFU_IMG_IMAGE_OFFSET;
+        }
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_0_ADDR_MODIFIED(ActiveSlot, index_active_slot, chunk),
+                                          buffer, write_len);
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+        if (e_ret_status != SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+
+      /*
+       * The block of the active firmware has been backed up.
+       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
+       * Except for block 0, because block 0 is incomplete at this stage (final header installation not yet done)
+       */
+      if (index_active_slot != 0)
+      {
+        e_ret_status  = AtomicWrite(TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot,
+                                                               (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
+                                    (SFU_LL_FLASH_write_t *) SWAPPED);
+
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+        if (e_ret_status != SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+    }
+
+    /* Decrement all block indexes */
+    index_dwl_slot_write--;
+    index_dwl_slot_read--;
+    index_active_slot--;
+
+    /*
+     * After having copied the impacted image blocks from active slot, copy also the first block
+     * due to header, if not already copied among the impacted image blocks.
+     */
+    if ((index_active_slot < index_active_slot_partial_begin) && (index_active_slot >= 0))
+    {
+      index_active_slot = 0;
+      index_dwl_slot_read = -1;  /* force read from swap area, to avoid exiting dwl slot / swap index allowed range */
+    }
+  }
+
+  /*
+   * Now, erase the blocks in active slot, located after final image
+   */
+  if (offset_block_final_end == 0)
+  {
+    index_active_slot_empty_begin = index_active_slot_final_end;
+  }
+  else
+  {
+    index_active_slot_empty_begin = index_active_slot_final_end + 1;
+  }
+  index_active_slot = number_of_index_active_slot - 1;
+  while (index_active_slot >= index_active_slot_empty_begin)
+  {
+    e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
+    if (e_ret_status !=  SFU_SUCCESS)
+    {
+      return SFU_ERROR;
+    }
+
+    /* Decrement block index */
+    index_active_slot--;
+  }
+
+  return e_ret_status;
+}
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/**
+  * @brief  Executes a rollback to the original firmware if a firmware update fails
+  * @param  ActiveSlot identification of the new active image
+  * @param  DwlSlot identification of previous firmware image (backed-up slot)
+  * @param  pFwImageHeader pointer in ram to the header of the backed-up FW
+  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
+  */
+static SFU_ErrorStatus RollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot,
+                                            SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t number_chunk_per_sector = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  SE_FwRawHeaderTypeDef *p_header;
+  uint32_t size;
+  uint32_t pass_index;
+  uint32_t erase_index;
+  uint32_t fw_source_address;
+  uint32_t fw_dest_write_address;
+  uint32_t fw_dest_erase_address;
+
+  if (number_chunk_per_sector == 0U)
+  {
+    return SFU_ERROR;
+  }
+
+  size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET;
+  fw_source_address = SlotStartAdd[DwlSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
+  fw_dest_write_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
+  fw_dest_erase_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SLOT_SIZE(SLOT_SWAP)) * SLOT_SIZE(SLOT_SWAP));
+  pass_index = ((size - 1U) / SFU_IMG_CHUNK_SIZE) + 1U;
+  erase_index = (pass_index - 1U) / number_chunk_per_sector * number_chunk_per_sector;
+
+  /* Erase the part of the active slot that will not be updated
+     ========================================================== */
+  size = (SLOT_SIZE(ActiveSlot) - (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)) / SLOT_SIZE(SLOT_SWAP) *
+         SLOT_SIZE(SLOT_SWAP);
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)(fw_dest_erase_address + SLOT_SIZE(SLOT_SWAP)),
+                                         size);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  while ((e_ret_status == SFU_SUCCESS) && (pass_index > 0U))
+  {
+    /* Reading phase
+       =============== */
+    e_ret_status = SFU_LL_FLASH_Read(buffer, (uint8_t *) fw_source_address, SFU_IMG_CHUNK_SIZE);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+    /* Erasing operation when aligned on erase_index
+       ============================================= */
+
+    /*
+     *  The header may not be contiguous with the FW image : 2 erasing operations needed
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if ((((pass_index - 1U) / number_chunk_per_sector) * number_chunk_per_sector) == erase_index)
+      {
+        (void) SFU_LL_SECU_IWDG_Refresh();
+        size = 0U;
+        if (erase_index == 0U)
+        {
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                                 SFU_IMG_IMAGE_OFFSET);
+          size = SFU_IMG_IMAGE_OFFSET;
+        }
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) fw_dest_erase_address + size,
+                                                 SLOT_SIZE(SLOT_SWAP) - size);
+        }
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+        erase_index -= number_chunk_per_sector;
+        fw_dest_erase_address -= SLOT_SIZE(SLOT_SWAP);
+      }
+    }
+
+    /* Writing phase
+       ============= */
+    /*
+     * Header is under isolated environment protection
+     * Thus the writing operation is split in 2 actions (HEADER + remaining part)
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      size = 0U;
+      if (pass_index == 1U)
+      {
+        /* Ensure there is no Fingerprint in original firmware header
+         * This stops someone attempting multiple rollbacks by writing fake fingerprint in original header
+         */
+        p_header = (SE_FwRawHeaderTypeDef *) buffer;
+        (void) memset(p_header->PrevHeaderFingerprint, 0x00, sizeof(p_header->PrevHeaderFingerprint));
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],  buffer,
+                                          SFU_IMG_IMAGE_OFFSET);
+        size = SFU_IMG_IMAGE_OFFSET;
+      }
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) fw_dest_write_address + size,  buffer + size,
+                                          SFU_IMG_CHUNK_SIZE - size);
+      }
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+    }
+
+    /* Index update
+       ============ */
+    pass_index--;
+    fw_source_address -= SFU_IMG_CHUNK_SIZE;
+    fw_dest_write_address -= SFU_IMG_CHUNK_SIZE;
+  }
+
+  return e_ret_status;
+}
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+
+/**
+  * @brief Decrypt Image in dwl slot
+  * @ note Decrypt is done from dwl slot to dwl slot + swap with 2 images (swap contains 1st sector)
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer in ram to the header to decrypt
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus DecryptImageInDwlSlot(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  uint32_t NumberOfChunkPerSwap = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  /*  chunk size is the maximum , the 1st block can be smaller */
+  /*  the chunk is static to avoid  large stack */
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_source_address = 0U;
+  uint32_t fw_dest_address_write = 0U;
+  uint32_t fw_dest_erase_address = 0U;
+  uint32_t fw_decrypted_total_size = 0U;
+  uint32_t size;
+  uint32_t oldsize;
+  uint32_t fw_decrypted_chunk_size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+  uint32_t pass_index = 0U;
+  uint32_t erase_index = 0U;
+
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process*/
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_PARTIAL);
+  if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK))
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Decryption loop*/
+    while ((e_ret_status == SFU_SUCCESS) && (fw_decrypted_total_size < (pFwImageHeader->PartialFwSize)) &&
+           (e_se_status == SE_OK))
+    {
+      if (pass_index == NumberOfChunkPerSwap)
+      {
+        fw_dest_address_write = SlotStartAdd[DwlSlot];
+        fw_dest_erase_address =  fw_dest_address_write;
+        erase_index = NumberOfChunkPerSwap;
+      }
+      if (pass_index == 0U)
+      {
+        fw_source_address = SlotStartAdd[DwlSlot] + SFU_IMG_IMAGE_OFFSET +
+                            (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP));
+        fw_dest_erase_address = SlotStartAdd[SLOT_SWAP];
+        fw_dest_address_write = fw_dest_erase_address + ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
+                                                                                  SLOT_SIZE(SLOT_SWAP))) %
+                                                         SLOT_SIZE(SLOT_SWAP));
+        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk) -
+                                  ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
+                                   sizeof(fw_decrypted_chunk));
+        if (fw_decrypted_chunk_size > pFwImageHeader->PartialFwSize)
+        {
+          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize;
+        }
+        pass_index = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)))
+                       % SLOT_SIZE(SLOT_SWAP)) / sizeof(fw_decrypted_chunk));
+      }
+      else
+      {
+        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk);
+
+        /* For the last 2 pass, divide by 2 remaining buffer to ensure that :
+         *     - chunk size greater than 16 bytes : minimum size of a block to be decrypted
+         *     - except last one chunk size is 16 bytes aligned
+         *
+         * Pass n - 1 : remaining bytes / 2 with (16 bytes alignment for crypto AND sizeof(SFU_LL_FLASH_write_t) for
+         *              flash programming)
+         * Pass n : remaining bytes
+         */
+
+        /* Last pass : n */
+        if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < fw_decrypted_chunk_size)
+        {
+          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize - fw_decrypted_total_size;
+        }
+        /* Previous pass : n - 1 */
+        else if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < ((2U * fw_decrypted_chunk_size) - 16U))
+        {
+          fw_decrypted_chunk_size = ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) / 32U) * 16U;
+
+          /* Set dimension to the appropriate length for FLASH programming.
+           * Example: 64-bit length for L4.
+           */
+          if ((fw_decrypted_chunk_size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
+          {
+            fw_decrypted_chunk_size = fw_decrypted_chunk_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                                                                 (fw_decrypted_chunk_size %
+                                                                  (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+          }
+        }
+        /* All others pass */
+        else
+        {
+          /* nothing */
+        }
+      }
+
+      size = fw_decrypted_chunk_size;
+
+      /* Decrypt Append*/
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *) fw_source_address, size);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+        break;
+      }
+      if (size != 0U)
+      {
+        se_ret_status = SE_Decrypt_Append(&e_se_status, (uint8_t *)fw_encrypted_chunk, (int32_t)size,
+                                          fw_decrypted_chunk, (int32_t *)&fw_decrypted_chunk_size);
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+        fw_decrypted_chunk_size = 0U;
+      }
+      if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK) && (fw_decrypted_chunk_size == size))
+      {
+        /* Erase Page */
+        if ((pass_index == erase_index)
+            || (pass_index == ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) /
+                               sizeof(fw_decrypted_chunk))))
+        {
+          (void) SFU_LL_SECU_IWDG_Refresh();
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address,
+                                                 SLOT_SIZE(SLOT_SWAP)) ;
+          erase_index += NumberOfChunkPerSwap;
+          fw_dest_erase_address += SLOT_SIZE(SLOT_SWAP);
+        }
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /*
+           * For last pass with remaining size not aligned on 16 bytes : Set dimension AFTER decrypt to the appropriate
+           * length for FLASH programming.
+           * Example: 64-bit length for L4.
+           */
+          if ((size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
+          {
+            /*
+            * By construction, SFU_IMG_CHUNK_SIZE is a multiple of sizeof(SFU_LL_FLASH_write_t) so there is no risk to
+             * read out of the buffer
+             */
+            oldsize = size;
+            size = size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+            while (oldsize < size)
+            {
+              fw_decrypted_chunk[oldsize] = 0xFF;
+              oldsize++;
+            }
+          }
+
+          /* Write Decrypted Data in Flash - size has to be 32-bit aligned */
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)fw_dest_address_write,  fw_decrypted_chunk,
+                                            size);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+          if (e_ret_status == SFU_SUCCESS)
+          {
+            /* Update flash pointer */
+            fw_dest_address_write  += (size);
+
+            /* Update source pointer */
+            fw_source_address += size;
+            fw_decrypted_total_size += size;
+            (void) memset(fw_decrypted_chunk, 0xff, sizeof(fw_decrypted_chunk));
+            pass_index += 1U;
+
+          }
+        }
+      }
+    }
+  }
+
+#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_decrypted_total_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#endif /* SFU_ENCRYPTED_IMAGE */
+
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS) && (e_se_status == SE_OK))
+  {
+    /* Do the Finalization, check the authentication TAG*/
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if ((se_ret_status != SE_SUCCESS) || (e_se_status != SE_OK))
+    {
+      e_ret_status = SFU_ERROR;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+    else
+    {
+      /* erase the remaining part of the image after shifting inside dwl slot */
+      if (pass_index <= NumberOfChunkPerSwap)
+      {
+        fw_dest_erase_address = SlotStartAdd[DwlSlot];
+      }
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address, SLOT_SIZE(SLOT_SWAP));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  check trailer validity to allow resume installation.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus  FirmwareToResume(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN];
+
+  /*
+   *  Initial conditions to be fulfilled :
+   *   - Trailer magic is present
+   *   - Active slot number is correct
+   *   - test header from trailer is signed
+   */
+
+  /* check trailer Magic */
+  e_ret_status = CheckTrailerMagic(DwlSlot);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate the pTestHeader and verify it the active slot is correct */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate pTestHeader parameter */
+    e_ret_status = ParseFWInfo(pTestHeader, fw_header_trailer_test);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Active slot number correct ?
+       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
+    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
+    {
+      /* Check header test field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
+    }
+    else
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not valid!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Read header in active slot if any */
+  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                   sizeof(fw_header_active_slot));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify the header signature in active slot */
+    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
+
+    /* Populate pValidHeader parameter */
+    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header valid field in trailer */
+      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                       sizeof(fw_header_trailer_valid));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check if header in active slot is same as header valid in trailer */
+      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, SE_FW_AUTH_LEN) != 0)
+      {
+        /*
+         * Header in active slot is not identical to header valid field:
+         * Either install is already complete (if header in active slot is same as header test field in trailer),
+         * or there is hack tentative.
+         * In both cases, resume install must not be triggered.
+         */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  No resume required : TRAILER_HDR_VALID already stored in active slot!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /* Check candidate image version */
+        e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+      }
+    }
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+  else
+  {
+    /*
+     * Header in active slot is not valid.
+     * It is considered this can not be hack attempt, because header in active slot is in
+     * protected area.
+     * Possible reasons:
+     * - Swap has been interrupted during very first image installation (active slot was empty)
+     * - Swap has been interrupted during reconstitution of first sector of active slot
+     * If header test field in trailer is signed and with proper version, we resume install.
+     */
+
+    /* Read header valid field in trailer */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                     sizeof(fw_header_trailer_valid));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check header valid field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* active slot was containing an active image */
+
+        /* Populate pValidHeader parameter */
+        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /* Check candidate image version */
+          e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+        }
+      }
+      else
+      {
+        /* active slot was empty or was containing bricked Fw image */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+
+  return e_ret_status;
+}
+
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus e_ret_status_se;
+  SE_StatusTypeDef e_se_status;
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+
+  /*
+    * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
+    * to be able to handle a specific error cause.
+    */
+  /*  check swap header */
+  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, DwlSlot, &image_state);
+    if (e_ret_status_se == SE_SUCCESS)
+    {
+      /* Control the size of image to be installed taking into account trailers */
+      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET);
+
+      if ((image_state != FWIMG_STATE_NEW) || (trailer_begin < end_of_test_image))
+      {
+        /*
+          * These error causes are not memorized in the BootInfo area because there won't be any error handling
+          * procedure.
+          * If this function returns that no new firmware can be installed (as this may be a normal case).
+          */
+        e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        if (image_state != FWIMG_STATE_NEW)
+        {
+          TRACE("\r\n\t  The image state of SLOT_DWL_%d is not FWIMG_STATE_NEW!", DwlSlot);
+        }
+        if (trailer_begin < end_of_test_image)
+        {
+          TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  return e_ret_status;
+}
+
+#else
+
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *p_header_swap;
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+  int32_t ret;
+  /*
+     * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
+     * to be able to handle a specific error cause.
+     */
+
+  /*  check swap header */
+  e_ret_status = CheckAndGetFWHeader(SLOT_SWAP, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*  compare the header in dwl slot with the header in swap */
+    p_header_swap = (uint8_t *) pFwImageHeader;
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
+                                     sizeof(fw_header_dwl_slot));
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* image header in dwl slot not consistent with swap header */
+      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
+                           SFU_IMG_IMAGE_OFFSET);
+
+      /* the header in swap must be the same as the header in dwl slot */
+      ret = memcmp(fw_header_dwl_slot, p_header_swap, SE_FW_HEADER_TOT_LEN);
+
+      /* Check if there is enough room for the trailers */
+      if ((trailer_begin < end_of_test_image) || (ret != 0))
+      {
+        /*
+          * These error causes are not memorized in the BootInfo area because there won't be any error handling
+          * procedure.
+          * If this function returns that no new firmware can be installed (as this may be a normal case).
+          */
+        e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        if (trailer_begin < end_of_test_image)
+        {
+          TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+        } /* check next error cause */
+
+        if (ret != 0)
+        {
+          TRACE("\r\n\t  The headers in dwl slot and swap area do not match!");
+        } /* else do not print the message(s) again */
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+
+/**
+  * @brief Prepares the Candidate FW image for Installation.
+  *        This stage depends on the supported features: in this example this consists in decrypting the candidate
+  *        image.
+  * @note Even if the Firmware Image is in clear format the decrypt function is called.
+  *       But, in this case no decrypt is performed, it is only a set of copy operations
+  *       to organize the Firmware Image in FLASH as expected by the swap procedure.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus PrepareCandidateImageForInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+    * Control if there is no additional code beyond the firmware image (malicious SW)
+    */
+  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot),
+                            pFwImageHeader->PartialFwSize + (pFwImageHeader->PartialFwOffset %
+                                                             SLOT_SIZE(SLOT_SWAP)));
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_ADDITIONAL_CODE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * Pre-condition: all checks have been performed,
+    *                so all FWIMG module variables are populated.
+    * Now we can decrypt in FLASH.
+    *
+    * Initial FLASH state (focus on dwl slot and swap area):
+    *
+    * Depending on partial FW offset, we can have:
+    * <dwl slot>   : {Candidate Image Header + encrypted FW - page k}
+    *                {encrypted FW - page k+1}
+    *                .....
+    *                {encrypted FW - page k+N}
+    *                .....
+    * </dwl slot>
+    * or:
+    * <dwl slot>   : {Candidate Image Header }
+    *                {encrypted FW - page k}
+    *                .....
+    *                {encrypted FW - page k+N}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area>  : {Candidate Image Header}
+    * </Swap area>
+    */
+  e_ret_status =  DecryptImageInDwlSlot(DwlSlot, pFwImageHeader);
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page k}
+    * </Swap area>
+    *
+    * The Candidate FW image has been decrypted
+    * and a "hole" has been created in dwl slot to be able to swap.
+    */
+
+  e_ret_status = VerifyFwSignatureAfterDecrypt(&e_se_status, DwlSlot, pFwImageHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_SIGNATURE_ERR);
+  }
+
+  /* Return the result of this preparation */
+  return (e_ret_status);
+}
+
+
+/**
+  * @brief  Install the new version
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                         SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area> : {No Header (shift) + decrypted FW data from page k}
+    * </Swap area>
+    *
+    */
+
+  /* erase "swap area" size at the end of dwl slot */
+  e_ret_status = EraseSlotIndex(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1U));
+  if (e_ret_status !=  SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_ERASING_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    *                {at least the swap area size at the end of the last page of dwl slot is empty }
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
+    * </Swap area>
+    *
+    */
+
+
+  /*  write trailer  */
+  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_UPDATE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    *                {the last page of dwl slot ends with the trailer magic patterns and the free space for the trailer
+    *                 info}
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
+    * </Swap area>
+    *
+    * The trailer magic patterns is ActiveFwHeader|CandidateFwHeader|SWAPmagic.
+    * This is followed by a free space to store the trailer info (N*CPY_TO_ACTIVE_SLOT) and (N*CPY_TO_DWL_SLOT):
+    *
+    *<------------------------------------------ Last page of dwl slot --------------------------------------->
+    * |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH |N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t)
+    * | header 1     | header 2     |SWAP magic  |CLEAN pattern|N*CPY_TO_ACTIVE_SLOT   | N*CPY_TO_DWL_SLOT
+    *
+    */
+
+  /*  swap  */
+  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_SWAP_ERR);
+    return e_ret_status;
+  }
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /* Update fingerprint from previous FW image */
+  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Validate immediately the new active FW */
+  e_ret_status = SFU_IMG_Validation(ActiveSlot, pTestHeader);
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_HEADER_VALIDATION_ERR);
+    return e_ret_status;
+  }
+
+  /* clear swap pattern */
+  e_ret_status = CleanMagicValue(DwlSlot);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Memorize the error */
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_MAGIC_ERR);
+    return e_ret_status;
+  }
+
+  return e_ret_status;   /* Leave the function now */
+}
+
+/* Functions Definition : services ------------------------------------------- */
+/**
+  * @brief FW Image Handling (FWIMG) initialization function from swap process.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void)
+{
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+  uint32_t i;
+
+  /*
+   * Sanity check: let's make sure the slot sizes are correct
+   * to avoid discrepancies between linker definitions and constants in sfu_fwimg_regions.h
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP))))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d size (%d) must be a multiple of swap size (%d)\r\n",
+              SLOT_ACTIVE_1 + i, SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP));
+        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
+      }
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP))))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d size (%d) must be a multiple of swap size (%d)\r\n",
+              i + 1U, SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP));
+        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the slot size is correct with regards to the swap procedure constraints.
+   * The swap procedure cannot succeed if the trailer info size is bigger than what a chunk used for swapping can carry.
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (((int32_t)(SFU_IMG_CHUNK_SIZE - (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)))) < 0)
+      {
+        e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+        TRACE("\r\n= [FWIMG] %d bytes required for the swap metadata of SLOT_DWL_%d is too much\r\n",
+              (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)), i + 1U);
+      } /* else the swap settings are fine from a metadata size perspective */
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the swap size is correct with regards to the swap procedure constraints.
+   * The swap size must be a multiple of the chunks size used to do the swap.
+   */
+#if defined(__GNUC__)
+  __IO uint32_t swap_size = SLOT_SIZE(SLOT_SWAP), swap_chunk = SFU_IMG_CHUNK_SIZE;
+  if (0U != ((uint32_t)(swap_size % swap_chunk)))
+#else
+  if (0U != ((uint32_t)(SLOT_SIZE(SLOT_SWAP) % SFU_IMG_CHUNK_SIZE)))
+#endif /* __GNUC__ */
+  {
+    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the swap size (%d) is not a multiple\r\n",
+          SFU_IMG_CHUNK_SIZE, SLOT_SIZE(SLOT_SWAP));
+  } /* else the swap settings are fine from a chunk size perspective */
+
+  /*
+   * Sanity check: let's make sure the chunks used for the swap procedure are big enough with regards to the offset
+   * giving the start @ of the firmware
+   */
+  if (((int32_t)(SFU_IMG_CHUNK_SIZE - SFU_IMG_IMAGE_OFFSET)) < 0)
+  {
+    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the firmware start offset is %d bytes\r\n",
+          SFU_IMG_CHUNK_SIZE, SFU_IMG_IMAGE_OFFSET);
+  } /* else the swap settings are fine from a firmware start offset perspective */
+
+  /*
+   * Sanity check: let's make sure SWAP slot is properly aligned with regards to flash constraints
+   */
+
+  if (!IS_ALIGNED(SlotStartAdd[SLOT_SWAP]))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] swap (%x) is not properly aligned\r\n",
+          SlotStartAdd[SLOT_SWAP]);
+  } /* else swap is properly aligned */
+
+  /*
+   * Sanity check: let's make sure the swap area does not overlap SB code area protected by WRP)
+   */
+  if(!((((SlotStartAdd[SLOT_SWAP]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+    || (((SlotEndAdd[SLOT_SWAP] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+  {
+    TRACE("\r\n= [FWIMG] SWAP overlaps SBSFU code area protected by WRP\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap Swap area)
+   */
+  if (!(((SlotStartAdd[SLOT_SWAP]) > KMS_DATASTORAGE_END)
+        || ((SlotEndAdd[SLOT_SWAP]) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps Swap area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /* FWIMG core initialization completed */
+  return e_ret_status;
+}
+
+
+
+/**
+  * @brief Checks if there is a pending firmware installation.
+  *        3 situations can occur:
+  *        A. Pending firmware installation: a firmware is ready to be installed but the installation has never been
+  *           triggered so far.
+  *        B. Pending firmware installation resume: a firmware installation has been interrupted and a resume procedure
+  *           is required to finalize installation.
+  *        C. No firmware installation pending
+  * @note  The anti-rollback check is not taken into account at this stage.
+  *        But, if the firmware to be installed already carries some metadata (VALID tag) a newly downloaded firmware
+  *        should not have then the installation is not considered as pending.
+  * @note This function populates the FWIMG module variables:
+  *        - case SFU_IMG_FWUPDATE_STOPPED : fw_image_header_to_test & fw_image_header_validated
+  *        - case SFU_IMG_FWIMAGE_TO_INSTALL : fw_image_header_to_test
+  *        - case SFU_IMG_NO_FWUPDATE : none
+  * @param  pDwlSlotToInstall identification of the downloaded slot to install
+  * @param  pActiveSlotToResume identification of the active slot to resume
+  * @param  pActiveSlotToRollback identification of the active slot to rollback
+  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, pending resume install, no
+  *         pending action)
+  */
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback)
+{
+  uint32_t i;
+  uint32_t j;
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  SE_FwStateTypeDef master_slot_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /*
+   * The order of the checks is important:
+   *
+   * A. Check if a FW update has been interrupted first.
+   *    This check is based on the content of the trailer area and the validity of the update image.
+   *
+   * B. Check if a Firmware image is waiting to be installed.
+   */
+
+  /* Init values */
+  *pActiveSlotToResume = SLOT_INACTIVE;
+  *pActiveSlotToRollback = SLOT_INACTIVE;
+  *pDwlSlotToInstall = SLOT_INACTIVE;
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /*
+   * Read MASTER_SLOT state (if configured == (!= 255)) :
+   *   In case of VALID_ALL state, all other slots in SELF_TEST should be validated
+   *   Else all other slots in SELF_TEST are invalidated
+   */
+  if (MASTER_SLOT != 0xFFU)
+  {
+    if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
+    {
+      if (SE_SFU_IMG_GetActiveFwState(&e_se_status, MASTER_SLOT, &master_slot_state) != SE_SUCCESS)
+      {
+        master_slot_state = FWIMG_STATE_INVALID;
+      }
+    }
+  }
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Check image installation stopped or installation to be done
+     =========================================================== */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+      /* Rollback if seltftest not validated
+         =================================== */
+      if (SFU_SUCCESS == FirmwareToRollback(SLOT_ACTIVE_1 + i, master_slot_state))
+      {
+        /* The firmware state is either FWIMG_STATE_SELFTEST or FWIMG_STATE_INVALID
+         * Rollback is required
+         * Stop at first occurrence : next ones if any will be resumed after reset
+         */
+        *pActiveSlotToRollback = SLOT_ACTIVE_1 + i;
+        return SFU_IMG_FWIMAGE_ROLLBACK;
+      }
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+      /* Check trailer valid : installation stopped ?
+         ============================================= */
+      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+      {
+        /* Slot configured ? */
+        if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+        {
+          if (SFU_SUCCESS == FirmwareToResume(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
+                                               &fw_image_header_to_test))
+          {
+            /* A Firmware Update has been stopped
+             * fw_image_header_to_test & fw_image_header_validated have been populated
+             * Stop at first occurrence : next ones if any will be resumed after reset
+             */
+            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
+            *pDwlSlotToInstall = SLOT_DWL_1 + j;
+            return SFU_IMG_FWUPDATE_STOPPED;
+          }
+        }
+      }
+    }
+  }
+
+  /* Install new firmware if requested in the swap
+     ============================================= */
+  for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+    {
+      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + j, &fw_image_header_to_test))
+      {
+        /*
+         * A Firmware is available for installation:
+         * fw_image_header_to_test has been populated
+         * Stop at first occurrence : next ones if any will be installed after reset
+         */
+        *pDwlSlotToInstall = SLOT_DWL_1 + j;
+        return SFU_IMG_FWIMAGE_TO_INSTALL;
+      }
+    }
+  }
+
+  return SFU_IMG_NO_FWUPDATE;
+}
+
+/**
+  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
+  *        valid if the checks are successful.
+  *        The anti-rollback check is performed and errors are memorized in the bootinfo area, but no action is taken
+  *        in this procedure.
+  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
+  *        afterwards if the cryptographic scheme allows this (signature check for instance).
+  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
+  *        This function modifies the FLASH content.
+  *        If this procedure is interrupted during image preparation stage (e.g.: switch off) it cannot be resumed.
+  *        If it is interrupted during installation stage, it can be resumed.
+  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *        running the procedure): SFU_IMG_CheckPendingInstallation, SFU_IMG_CheckCandidateVersion should be called
+  *        first.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint32_t active_slot = 0U;
+
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /*
+   * Check the active slot is big enough
+   */
+  if (fw_image_header_to_test.FwSize + SFU_IMG_IMAGE_OFFSET + TRAILER_SIZE(DwlSlot) <= SLOT_SIZE(active_slot))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /*
+   * The preparation stage consists in decrypting the candidate firmware image.
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = PrepareCandidateImageForInstall(DwlSlot, &fw_image_header_to_test);
+  }
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    goto exit;
+  }
+
+  /*
+   * Populate fw_image_header_validated
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
+                                     sizeof(fw_image_header_validated));
+  }
+
+  /*
+   * Installing the new firmware image consists in swapping the 2 FW images.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
+  }
+
+exit:
+  /* Erase downloaded FW in case of authentication/integrity error
+     Erase downloaded FW also in case of installation issue to avoid any infinite loop */
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Installation procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Installation procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  /* return the installation result */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Resume installation of new valid firmware after installation failure.
+  *        If this procedure is interrupted before its completion (e.g.: switch off) it can be resumed.
+  *        This function is dedicated (only) to the resume of installation when a new firmware installation is stopped
+  *        before its completion.
+  *        This function does not handle explicitly the metadata tagging the firmware as valid: these metadata must
+  *        have been preserved during the installation procedure.
+  *        This function modifies the FLASH content.
+  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *        running the procedure): need to make sure an installation has been interrupted.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+   * resume swap process
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation()call.
+   */
+  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, &fw_image_header_to_test);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_SWAP_ERR);
+    goto exit;
+  }
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /* Update fingerprint from previous FW image */
+  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Validate immediately the new active FW */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_IMG_Validation(ActiveSlot, &fw_image_header_to_test);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_EXCPT_SetError(SFU_EXCPT_HEADER_VALIDATION_ERR);
+      goto exit;
+    }
+  }
+
+  /* clear swap pattern */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = CleanMagicValue(DwlSlot);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      /* Memorize the error */
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_MAGIC_ERR);
+      goto exit;
+    }
+  }
+
+exit:
+  /* Erase downloaded FW in case of installation issue to avoid any infinite loop */
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Resume procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Resume procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return e_ret_status;
+}
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/**
+  * @brief Executes a rollback to the original firmware if a firmware update fails
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t zero_buffer[32U] = {0U};
+  SE_FwRawHeaderTypeDef active_header;
+  SE_FwRawHeaderTypeDef dwl_header;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+
+  /* Verify slot 1 header is from fw that triggered the update */
+  /* Backed-up header is in flash Slot1 at pHdr address */
+  /* Load current header (start of Slot 0, normally behind the firewall) */
+  e_ret_status =  SFU_LL_FLASH_Read((uint8_t *)&active_header, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                    sizeof(dwl_header));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* if fingerprint is 0x00 we cannot do rollback */
+    if (0U == memcmp(active_header.PrevHeaderFingerprint, zero_buffer, sizeof(active_header.PrevHeaderFingerprint)))
+    {
+      e_ret_status = SFU_ERROR;
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR);
+      goto exit;
+    }
+  }
+
+  /* Get and check previous FW header saved in DWL slot
+     then compare header signature with active slot header finger print */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = CheckAndGetFWHeader(DwlSlot, &dwl_header);
+    if (SFU_SUCCESS == e_ret_status)
+    {
+      /* Fingerprint of active firmware should be the signature of previous firmware */
+      if (0 != memcmp(active_header.PrevHeaderFingerprint, dwl_header.HeaderSignature,
+                      sizeof(active_header.PrevHeaderFingerprint)))
+      {
+        e_ret_status = SFU_ERROR;
+        SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR);
+        goto exit;
+      }
+    }
+  }
+
+  /* Rollback execution */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = RollbackInstallation(ActiveSlot, DwlSlot, &dwl_header);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_ERR);
+      goto exit;
+    }
+  }
+
+exit:
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Rollback is complete, now erase downloaded image to prevent an attempt to
+     * reinstall
+     */
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+  else
+  {
+    /* Erase the header of active slot to avoid any infinite loop */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                           SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Rollback procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Rollback procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Updates the state of the current firmware
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SE_ErrorStatus e_ret_status_se;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+  SE_FwStateTypeDef e_next_image_state;
+
+  /* Read Image state : if image is new, set to self test
+   *
+   * An OTA image arrives on the device in the NEW state
+   * The bootloader switches the new image to SELFTEST state so
+   * that when the image boots it can detect that it should carry out the
+   * self test routine
+   */
+  e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
+  if (e_ret_status_se == SE_SUCCESS)
+  {
+    if (image_state == FWIMG_STATE_NEW)
+    {
+      e_next_image_state = FWIMG_STATE_SELFTEST;
+      e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+      if (e_ret_status_se == SE_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+      else
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  SLOT_ACTIVE_%d state = %d failed to switch in FWIMG_STATE_SELFTEST", SlotNumber,
+              image_state);
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+  return e_ret_status;
+}
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @brief  Get size of the trailer
+  * @note   This area mapped at the end of a dwl slot is not available for the firmware image
+  * @param  SlotNumber index of the slot in the list
+  * @retval Size of the trailer.
+  */
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber)
+{
+  return TRAILER_SIZE(SlotNumber);
+}
+
+/**
+  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
+  SFU_ErrorStatus e_ret_status_swap = SFU_ERROR;
+
+  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
+                                             SLOT_SIZE(DwlSlot));
+  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  e_ret_status_swap = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
+                                              SLOT_SIZE(SLOT_SWAP));
+  STATUS_FWIMG(e_ret_status_swap == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  return (((e_ret_status_swap != SFU_SUCCESS) || (e_ret_status_dwl != SFU_SUCCESS)) ?  SFU_ERROR : SFU_SUCCESS);
+}
+
+#endif /* !(SFU_NO_SWAP) */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
new file mode 100644
index 00000000..9083965c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
@@ -0,0 +1,747 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
+#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
+                               STM32 board specificities */
+#include "tkms.h"
+#include "sfu_interface_crypto_scheme.h"
+#include <string.h>
+#include "kms_platf_objects_interface.h"     /* To get keys handle definitions */
+
+/* Private defines -----------------------------------------------------------*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+#define GCM_TAGBITS_SIZE          128
+#define GCM_IVLEN_BITS            16
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+/* Private variables ---------------------------------------------------------*/
+CK_SESSION_HANDLE EncryptSession;
+CK_SESSION_HANDLE DecryptSession;
+CK_SESSION_HANDLE AuthenticateSession;
+CK_SESSION_HANDLE VerifySession;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static uint8_t *gcm_tag_header;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Get AES key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/**
+  * @brief  Get ECDSA key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
+
+
+/**
+  * @brief Secure Engine Decrypt Init function.
+  *        It is a wrapper of Decrypt_Init function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+  gcm_tag_header = pxSE_Metadata->FwTag;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_MECHANISM cktest_aes_cbc_mechanism =
+  {
+    CKM_AES_CBC,
+    iv_cbc,
+    SE_IV_LEN
+  };
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * In this crypto scheme the Firmware is not encrypted.
+   * The Decrypt operation is called anyhow before installing the firmware.
+   * Indeed, it allows moving the Firmware image blocks in FLASH.
+   * These moves are mandatory to create the appropriate mapping in FLASH
+   * allowing the swap procedure to run without using the swap area at each and every move.
+   *
+   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
+   */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the decryption session */
+  if (se_status == SE_SUCCESS)
+  {
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do as we won't decrypt anything */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Append function.
+  *        It is a wrapper of Decrypt_Append function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffe pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
+  if (0 == InputSize)
+  {
+    /* Nothing to do but we must return a success for the decrypt operation to continue */
+    return (SE_SUCCESS);
+  }
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  /* Buffer decryption */
+  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * The firmware is not encrypted.
+   * The only thing we need to do is to recopy the input buffer in the output buffer
+   */
+  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
+  *pOutputSize = InputSize;
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Finish function.
+  *        It is a wrapper of Decrypt_Finish function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  *peSE_Status = SE_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  memcpy(pOutputBuffer, gcm_tag_header, 16);
+
+  /* End-up decryption session */
+  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do */
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Close the session */
+  rv = C_CloseSession(DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Init function.
+  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  CK_MECHANISM cktest_sha_256_mechanism =
+  {
+    CKM_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize encryption session  */
+    rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest initialization */
+  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Append function.
+  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Buffer encryption */
+  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
+                       (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest calculation */
+  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Finish function.
+  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* End-up encryption session */
+  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* End-up Digest calculation */
+  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Close the session */
+  rv = C_CloseSession(AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Verify Raw Fw Header Tag.
+  *        It verifies the signature of a raw header file.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pFwRawHeader pointer to RawHeader Buffer.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  int32_t fw_raw_header_output_length = SE_TAG_LEN;
+  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
+  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    (CK_BYTE_PTR)gcm_header,
+    ((int32_t)SE_FW_AUTH_LEN),
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  const uint8_t *pPayload;                        /* Metadata payload */
+  int32_t payloadSize;                            /* Metadata length to be considered for hash */
+  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
+  CK_OBJECT_HANDLE hECDSAKey = 0UL;
+  CK_MECHANISM cktest_ecdsa_256_mechanism =
+  {
+    CKM_ECDSA_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointers allocation */
+  if (NULL == pxFwRawHeader)
+  {
+    *peSE_Status = SE_KO;
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  gcm_tag_header = pxFwRawHeader->HeaderSignature;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up decryption session  : control if the tag is correct */
+  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
+
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  pPayload = (const uint8_t *)pxFwRawHeader;
+  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up verification process : control if the signature is correct */
+  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Double Check to avoid basic fault injection */
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+
+    if (se_status == SE_SUCCESS)
+    {
+      /* End-up verification process : control if the signature is correct */
+      rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+      if (rv != CKR_OK)
+      {
+        se_status = SE_ERROR;
+        *peSE_Status = SE_KO;
+      }
+    }
+  }
+
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+  /* Close the session */
+  rv = C_CloseSession(VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
new file mode 100644
index 00000000..992941e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
@@ -0,0 +1,73 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported functions ------------------------------------------------------- */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                uint32_t SE_FwType);
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType);
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader);
+
+#define SE_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType ) \
+  SFU_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType )
+
+#define SE_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+
+#define SE_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType ) \
+  SFU_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType )
+
+#define SE_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+#define SE_VerifyHeaderSignature( peSE_Status, pxFwRawHeader ) \
+  SFU_VerifyHeaderSignature( peSE_Status, pxFwRawHeader )
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* SFU_KMS_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
new file mode 100644
index 00000000..d7bb34fa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
@@ -0,0 +1,187 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage the KMS Images.
+  *          This file contains the kms services the bootloader (sfu_boot) can
+  *             use to deal with the KMS Blob images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_KMS_C
+
+
+#ifdef KMS_ENABLED
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_kms.h"
+#include "sfu_fwimg_internal.h" /* required to re-use kmsblob_image_header_to_test (and SWAP_HDR) in the KMS blob 
+                                   installation procedure */
+#include "sfu_fwimg_regions.h"  /* required because KMS re-uses the SBSFU SWAP area */
+
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * Magic pattern identifying the beginning of a KMS blob.
+  */
+static uint8_t     kms_magic[4] = {"KMSB"};
+
+/**
+  * KMS Blob header (metadata) of the candidate Blob in SWAP: structured format (access by fields)
+  */
+static KMS_BlobRawHeaderTypeDef kmsblob_image_header_to_test;
+static uint32_t                 kmsblob_slot;
+
+/* Private macros ------------------------------------------------------------*/
+/**
+  * The KMS blob header has the same structure as the SBSFU Firmware Header.
+  * Therefore, authenticating a KMS blob header can be done by re-using the SBSFU FWIMG service authenticating a FW
+  * Header.
+  * The authentication of the KMS blob itself is not in the scope of sfu_kms, this is handled by the KMS middleware.
+  */
+#define SFU_KMS_AUTHENTICATE_BLOB_HEADER SFU_IMG_CheckAndGetFWHeader
+
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Check that there is a Blob to Install ==> KMSB MAGIC present at the beginning of a DWN slot ?
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+
+  /*
+   * The KMS blob header uses a structure dedicated Header.
+   * In this function we focus only on the KMS blob header, not the entire KMS blob.
+   */
+
+  for (uint32_t i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      /*  Loading the KMS blob header contained in the SWAP area to verify if it can be a valid KMS blob */
+      if (SFU_LL_FLASH_Read((uint8_t *)(uint32_t)(&kmsblob_image_header_to_test),
+                            (uint8_t *)SlotStartAdd[SLOT_DWL_1 + i],
+                            sizeof(KMS_BlobRawHeaderTypeDef)) == SFU_SUCCESS)
+      {
+        /* Is there any KMSBlob present in the SWAP ? */
+        if (memcmp((uint8_t *)&kmsblob_image_header_to_test.KMSMagic, kms_magic, sizeof(kms_magic)) == 0)
+        {
+          /*
+           * Check the authenticity of the KMS Blob stored in the DWN slot.
+           * This check is restricted to the authentication of the KMS blob header.
+           * Authenticating the KMS blob itself is the role of the KMS module (KMS middleware).
+           */
+          kmsblob_slot = SLOT_DWL_1 + i; /* Save also DWN slot for later use */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Retrieve information about the KMS blob hdr and location in flash
+  * @param  pHdr is the pointer to the encrypted blob header
+  * @param  pFlash is the pointer to the blob location in flash
+  * @retval none
+  */
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  if ((ppHdr != NULL) && (ppFlash != NULL))
+  {
+    *ppHdr = (uint8_t *)(uint32_t)&kmsblob_image_header_to_test;
+    *ppFlash = (uint8_t *)(((uint32_t)SlotStartAdd[kmsblob_slot]) + sizeof(kmsblob_image_header_to_test));
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the Blob
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_EraseBlob(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /*  Erase in flash  */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                         (uint8_t *) SlotStartAdd[kmsblob_slot],
+                                         SLOT_SIZE(kmsblob_slot));
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Checks if there is a pending Blob installation.
+  *        3 situations can occur:
+  *        A. First installation request for a blob: a blob is ready to be installed but the installation has never
+  *           been triggered so far.
+  *        B. Blob installation to be retried: a blob installation has been interrupted (switch off) and we can restart
+  *           its installation.
+  *        C. No blob installation pending.
+    * @note This function populates the FWIMG module variable: kmsblob_image_header_to_test.
+  *         If a KMS blob is present then it is copied in kmsblob_image_header_to_test.
+  * @param  None.
+  * @retval SFU_KMS_BlobInstallStateTypeDef Pending Installation status (installation requested or not)
+  */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void)
+{
+  SFU_KMS_BlobInstallStateTypeDef e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+
+  /*
+   * While the SWAP AREA contains a KMSB Magic, it means the KMSBlob installation is not finalized.
+   *
+   */
+  if (SFU_SUCCESS == SFU_KMS_BlobToInstall())
+  {
+    /*
+     * A KMS blob is available for installation:
+     * kmsblob_image_header_to_test has been populated with this blob.
+     */
+    e_ret_state = SFU_KMS_BLOBIMAGE_TO_INSTALL;
+  }
+  else
+  {
+    /* No pending update */
+    e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+  }
+
+  return e_ret_state;
+}
+
+#endif /* KMS_ENABLED */
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
new file mode 100644
index 00000000..8a47b5e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
@@ -0,0 +1,78 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.h
+  * @author  MCD Application Team
+  * @brief   This file contains the KMS Blob service (SFU_KMS_ENABLED) API definitions.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_KMS Installation Status Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_KMS_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_KMS_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_KMS_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_KMS_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_KMS_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_KMS_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_KMS Blob Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_BLOBIMAGE_TO_INSTALL = 0x0U,   /*!< There is a KMS blob to be installed */
+  SFU_KMS_NO_BLOBUPDATE,                 /*!< No KMS blob installation pending */
+} SFU_KMS_BlobInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void);
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash);
+
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void);
+SFU_ErrorStatus SFU_KMS_EraseBlob(void);
+
+SFU_ErrorStatus SFU_KMS_InvalidateCurrentFirmware(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImgMetadata(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImg(void);
+SFU_ErrorStatus SFU_KMS_LaunchActiveImg(void);
+int32_t SFU_KMS_GetActiveFwVersion(void);
+SFU_ErrorStatus SFU_KMS_HasValidActiveFirmware(void);
+SFU_ErrorStatus SFU_KMS_Validation(uint8_t *pHeader);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_KMS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
new file mode 100644
index 00000000..8164c740
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
@@ -0,0 +1,229 @@
+/**
+  ******************************************************************************
+  * @file    sfu_mpu_isolation.c
+  * @author  MCD Application Team
+  * @brief   SFU MPU isolation primitives
+  *          This file provides functions to manage the MPU isolation of the Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_mpu_isolation.h"
+#include "sfu_low_level_security.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_SE_STACK_Clean(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief Clean SE Stack.
+  *
+  */
+static void SFU_SE_STACK_Clean(void)
+{
+  uint32_t sp_base = SE_REGION_RAM_START;
+  uint32_t sp_top = SE_REGION_RAM_STACK_TOP;
+  uint32_t sp = __get_MSP();
+  if ((sp > sp_base) && (sp <= sp_top))
+  {
+    while (sp_base < sp)
+    {
+      *(__IO uint32_t *)sp_base = 0U;
+      sp_base += 4U;
+    }
+  }
+  else
+  {
+    /*  error trigger a reset */
+    HAL_NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @brief This is the Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  * @note Installed in startup_stm32xxxx.s
+  *
+  * This handler handles 2 requests:
+  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter
+  * \li (see @ref SE_FunctionIDTypeDef)
+  * \li Internal SB_SFU SVC: run a SB_SFU privileged operation provided as a parameter (see @ref SFU_MPU_PrivilegedOpId)
+  */
+void MPU_SVC_Handler(uint32_t *args)
+{
+  /* in PSP (args) contains caller context as follow *
+    * args[0] :R0
+    * args[1] :R1
+    * args[2] :R2
+    * args[3] :R3
+    * args[4] :R12
+    * args[5] :LR
+    * args[6] :PC to return after exception
+    * args[7] :xPSR
+  */
+  /*  read code OP of instruction that generate SVC interrupt
+   *  bottom 8-bits of the SVC instruction code OP are SVC value  */
+  uint8_t code = ((uint8_t *)args[6])[-2];
+
+  switch (code)
+  {
+    case 0:
+      /* A Secure Engine service is called */
+      SE_SVC_Handler(args);
+      break;
+    case 1:
+      /* Internal SB_SFU privileged service */
+      SFU_MPU_SVC_Handler(args);
+      break;
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This function triggers a SB_SFU Privileged Operation requested with SB_SysCall
+  * @param args arguments
+  *             The first argument is the identifier of the requested operation.
+  * @retval void
+  */
+void SFU_MPU_SVC_Handler(uint32_t *args)
+{
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+
+  switch (args[0])
+  {
+    case SB_SYSCALL_LAUNCH_APP:
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Disable (Hide) Hide Protection Area */
+      SET_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS);
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* Clean SE STACK RAM */
+      SFU_SE_STACK_Clean();
+      /* Release CM4 (via SRAM) */
+      *pSbsfuFlag = SBSFU_BOOTED;
+#if defined(SFU_MPU_PROTECT_ENABLE)
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+      SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+      HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Check Hide Protection Area */
+      if (READ_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS) != FLASH_ACR2_HDPADIS)
+      {
+        /* Security issue : execution stopped ! */
+        HAL_NVIC_SystemReset();
+      }
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* make sure to return into application in privileged mode */
+      __set_CONTROL(__get_CONTROL() & ~0x3U); /* clear process stack & unprivileged bit */
+      launch_application(args[1], (uint32_t)jump_to_function);
+      break;
+    case SB_SYSCALL_RESET:
+      HAL_NVIC_SystemReset();
+      break;
+    case SB_SYSCALL_MPU_CONFIG:
+#if defined(SFU_MPU_PROTECT_ENABLE)
+      /* Privileged mode required for MPU re-configuration */
+      (void)SFU_LL_SECU_SetProtectionMPU(SFU_SECOND_CONFIGURATION);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DMA_CONFIG:
+#if defined(SFU_DMA_PROTECT_ENABLE)
+      /* Privileged mode required for DMA re-configuration (clocks access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDMA();
+#endif /* SFU_DMA_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DAP_CONFIG:
+#if defined(SFU_DAP_PROTECT_ENABLE)
+      /* Privileged mode required for DAP re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDAP();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_TAMPER_CONFIG:
+#if defined(SFU_TAMPER_PROTECT_ENABLE)
+      /* Privileged mode required for TAMPER re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionANTI_TAMPER();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    case SB_SYSCALL_GTZC_CONFIG:
+      /* Privileged mode required for GTZC checks */
+      SFU_LL_SECU_CheckProtectionGTZC();
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This functions triggers a SB_SFU system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SFU_MPU_SysCall(uint32_t syscall, ...)
+{
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+    */
+  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate a SB_SFU syscall */
+}
+
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t SFU_MPU_IsUnprivileged(void)
+{
+  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
+}
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void SFU_MPU_EnterUnprivilegedMode(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
+  __set_CONTROL(__get_CONTROL() | 3U); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
new file mode 100644
index 00000000..4c3720e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
@@ -0,0 +1,332 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_test.h"
+#include "main.h"
+#include "sfu_trace.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "string.h" /* required for strncmp */
+
+#if defined(SFU_TEST_PROTECTION)
+
+extern RTC_HandleTypeDef RtcHandle;
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_ISOLATION 1
+
+/* Automatic tests : list of tests (Address, Message, Operation */
+/* Flash programming by 64 bits */
+#define SHIFT_FLASH_WRITE (8U-1U)
+
+/* Private variables ---------------------------------------------------------*/
+static ProtectionTest_t aProtectTests[] =
+{
+#ifdef SFU_MPU_PROTECT_ENABLE
+  {SFU_RAM_BASE, "MPU SRAM start add", TEST_EXECUTE},
+  {SFU_RAM_END - 3U, "MPU SRAM end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
+  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
+  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
+  /* READ_FLASH is possible only in privileged mode */
+  {INTVECT_START, "Init. Vector", TEST_READ_FLASH},
+  {SLOT_DWL_1_START, "MPU code dwl slot1 begin add", TEST_EXECUTE},
+  {SLOT_DWL_1_END - 3U, "MPU code dwl slot1 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SLOT_DWL_2_START, "MPU code dwl slot2 begin add", TEST_EXECUTE},
+  {SLOT_DWL_2_END - 3U, "MPU code dwl slot2 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SLOT_DWL_3_START, "MPU code dwl slot3 begin add", TEST_EXECUTE},
+  {SLOT_DWL_3_END - 3U, "MPU code dwl slot3 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SWAP_START, "MPU code swap begin add", TEST_EXECUTE},
+  {SWAP_END - 3U, "MPU code swap end add", TEST_EXECUTE},       /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_WRP_PROTECT_ENABLE
+  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
+  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
+  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
+#endif /* SFU_WRP_PROTECT_ENABLE */
+#ifdef SFU_PCROP_PROTECT_ENABLE
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
+  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
+                                                                                         writing test */
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
+  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+#if defined(TEST_ISOLATION)
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
+  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
+                                                                         64bits writing test + WRP protection applies */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
+  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
+  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
+                                                                    that initializes all the variables in the binary. */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
+  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+#endif /* TEST_ISOLATION  */
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Testing the MPU protection of the OBs */
+  /*
+   * WL55JC
+   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
+   * 0x1FFF 7818 Reserved Write protection 1A
+   * 0x1FFF 7820 Reserved Write protection 1B
+   */
+  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFF7800", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFF7818", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFF7820", TEST_WRITE_FLASH},
+#endif /* SFU_MPU_PROTECT_ENABLE  */
+  {0xAAAAAAAA, "Execution successful", TEST_END},
+};
+
+
+/* Automatic test : list of operation */
+uint8_t aTestOperation[][20] =
+{
+  "write 8 bytes",
+  "read 1 byte",
+  "erase 512 bytes",
+  "write 4 bytes",
+  "read 1 byte",
+  "execute",
+  "end"
+};
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_TEST_Protection(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
+  * @param  None.
+  * @retval None.
+  */
+static void SFU_TEST_Protection(void)
+{
+  uint32_t test_idx;
+  uint32_t flashErrCode = 0;
+  uint64_t pattern = 0U;
+  uint32_t page_error = 0U;
+  FLASH_EraseInitTypeDef p_erase_init;
+  TestStatus status = TEST_IN_PROGRESS;
+  __IO uint8_t tmp;
+  void (*func)(void);
+
+  /*
+    * Now checking the security
+    * We will try to access protected @ and run protected code.
+    * Each time a a flash error will be raised or a reset will be generated by IP protection.
+    * At next boot we read the backup register to check the next @ until all addresses have been verified.
+    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
+    * FWALL/Code Isolation
+    */
+
+  do
+  {
+    /* slow down execution */
+    HAL_Delay(100);
+
+    /* Increment test number for next execution */
+    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
+    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
+           aProtectTests[test_idx].address);
+
+    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
+    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
+        && (aProtectTests[test_idx].address > 0x00000FFFU))
+    {
+      switch (aProtectTests[test_idx].type)
+      {
+        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_FLASH :
+          HAL_FLASH_Unlock();
+          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
+          HAL_FLASH_Lock();
+          flashErrCode = HAL_FLASH_GetError();
+          printf("\r\nflash error code: %x", flashErrCode);
+          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+
+          /*
+           * OBs protection test: no MPU enabled because the OB cannot be written directly.
+           * A flash error should occur.
+           */
+          break;
+
+        /* Trying to read in FLASH : RDP set in case of PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_READ_FLASH :
+          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
+          HAL_Delay(1);                                                 /* ensure Flag is set */
+          /*
+           * When Isolation activated : RESET should be generated
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
+          {
+            status = TEST_ERROR;
+          }
+
+          break;
+
+        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_ERASE_FLASH :
+          HAL_FLASH_Unlock();
+          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
+          p_erase_init.NbPages     = 1;
+          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
+          HAL_FLASH_Lock();
+          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+          break;
+
+        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_RAM :
+          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
+          status = TEST_ERROR;
+          break;
+
+        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_READ_RAM :
+          tmp = *(uint8_t *)aProtectTests[test_idx].address;
+          printf(" value : %d ", tmp);
+          status = TEST_ERROR;
+          break;
+
+          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
+        case TEST_EXECUTE :
+          func = (void(*)(void))(aProtectTests[test_idx].address);
+          func();
+          status = TEST_ERROR;
+          break;
+
+        /* End of execution */
+        case TEST_END :
+          status = TEST_COMPLETED;
+          break;
+
+        default :
+          break;
+      }
+    }
+  } while (status == TEST_IN_PROGRESS) ;
+
+  if (status == TEST_ERROR)
+  {
+    SFU_TEST_Error();
+  }
+  else if (status == TEST_COMPLETED)
+  {
+    /* reset for next run (need a RESET of the platform to restart a session) */
+    printf("\b\b\b\b\b\b\b\b");
+    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
+  }
+}
+
+/**
+  * @brief  Initialization of backup register and start test
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Init(void)
+{
+  /* Use register DR0 to know which if the test sequence is in progress or done */
+  /* Use register DR1 to know which test to run after a reset */
+
+  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
+  {
+    return;
+  }
+  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
+                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
+                                                                  reset test index (DR1) */
+  {
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+  }
+
+  /* Start test */
+  SFU_TEST_Protection();
+}
+
+/**
+  * @brief  Reset backup register to be able to execute a new test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Reset(void)
+{
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+}
+
+/**
+  * @brief  Error detected during test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Error(void)
+{
+  printf(" ===> KO!!!!!");
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
+}
+
+#endif /* SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
new file mode 100644
index 00000000..375e610f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
@@ -0,0 +1,81 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Test Protections functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TEST_H
+#define SFU_TEST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "app_sfu.h"
+
+#if defined(SFU_TEST_PROTECTION)
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  TEST_WRITE_FLASH = 0U,                /* Writing test in FLASH */
+  TEST_READ_FLASH,                      /* Reading test in FLASH */
+  TEST_ERASE_FLASH,                     /* Erasing test in FLASH */
+  TEST_WRITE_RAM,                       /* Writing test in RAM */
+  TEST_READ_RAM,                        /* Reading test in RAM */
+  TEST_EXECUTE,                         /* Execution function test */
+  TEST_END,                             /* Last test : Success ! */
+} TestType;
+
+typedef enum
+{
+  TEST_IN_PROGRESS = 0U,                /* Test in progress */
+  TEST_COMPLETED,                       /* Test ended : success */
+  TEST_ERROR,                           /* Test aborted : error */
+} TestStatus;
+
+
+#define PROTECT_MSG_LEN (35U)           /* message to be displayed length           */
+typedef struct
+{
+  uint32_t address;                     /* address to be tested */
+  uint8_t msg[PROTECT_MSG_LEN];         /* message to be displayed when testing */
+  TestType type;                        /* type of test */
+} ProtectionTest_t;
+
+/* Exported constants --------------------------------------------------------*/
+/* Magic number saved in DR0 backup register */
+#define MAGIC_TEST_DONE          0xAAA2
+#define MAGIC_TEST_INIT          0xAAA3
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_TEST_Init(void);
+void SFU_TEST_Reset(void);
+void SFU_TEST_Error(void);
+
+#endif /* SFU_TEST_PROTECTION */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TEST_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
new file mode 100644
index 00000000..92e7cda2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
@@ -0,0 +1,2020 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SFU Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "stm32wlxx_it.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_RDP_PROTECT_ENABLE
+#warning "SFU_RDP_PROTECT_DISABLED"
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_GTZC_PROTECT_ENABLE
+#warning "SFU_GTZC_PROTECT_DISABLED"
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_C2SWDBG_PROTECT_ENABLE
+#warning "SFU_C2SWDBG_DISABLED"
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+
+
+#ifndef  SFU_TAMPER_PROTECT_ENABLE
+/* #warning "SFU_TAMPER_PROTECT_DISABLED" */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+/* #warning "SFU_IWDG_PROTECT_DISABLED" */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+
+  /* install header : read /write only for privileged */
+  {
+    SFU_PROTECT_MPU_HEADER_RGNV, SFU_PROTECT_MPU_HEADER_START, SFU_PROTECT_MPU_HEADER_SIZE,
+    SFU_PROTECT_MPU_HEADER_PERM, SFU_PROTECT_MPU_HEADER_EXECV, SFU_PROTECT_MPU_HEADER_SREG,
+    SFU_PROTECT_MPU_HEADER_TEXV, SFU_PROTECT_MPU_HEADER_C, SFU_PROTECT_MPU_HEADER_B
+  },
+
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+
+  /* KMS_DataStorage: NVM storage */
+  {
+    SFU_PROTECT_MPU_KMS_RGNV, SFU_PROTECT_MPU_KMS_START, SFU_PROTECT_MPU_KMS_SIZE,
+    SFU_PROTECT_MPU_KMS_PERM, SFU_PROTECT_MPU_KMS_EXECV, SFU_PROTECT_MPU_KMS_SREG,
+    SFU_PROTECT_MPU_KMS_TEXV, SFU_PROTECT_MPU_KMS_C, SFU_PROTECT_MPU_KMS_B
+  },
+#ifdef SFU_DMA_PROTECT_ENABLE
+  /* DMA */
+  {
+    SFU_PROTECT_MPU_DMA_RGNV, SFU_PROTECT_MPU_DMA_START, SFU_PROTECT_MPU_DMA_SIZE,
+    SFU_PROTECT_MPU_DMA_PERM, SFU_PROTECT_MPU_DMA_EXECV, SFU_PROTECT_MPU_DMA_SREG,
+    SFU_PROTECT_MPU_DMA_TEXV, SFU_PROTECT_MPU_DMA_C, SFU_PROTECT_MPU_DMA_B
+  },
+#endif /* SFU_DMA_PROTECT_ENABLE */
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+
+
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus    SFU_LL_SECU_SetProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void);
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check that a GTZC interrupt is enabled
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if enabled, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus GTZC_CheckITEnabled(uint32_t PeriphId)
+{
+  uint32_t register_address;
+  uint32_t bit_pos;
+
+  register_address = (uint32_t)&(GTZC_TZIC->IER1) + (4U * GTZC_GET_REG_INDEX(PeriphId));
+  bit_pos = (uint32_t)(1UL << GTZC_GET_PERIPH_POS(PeriphId));
+  if (READ_BIT(*(uint32_t *)register_address, bit_pos) == bit_pos)
+  {
+    return SFU_SUCCESS;
+  }
+  return SFU_ERROR;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void) HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  (void) HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA_A  **********/
+  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
+  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set Flash configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply PCRoP ******************************************************/
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSUBGHZSPI(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
+#ifdef SFU_RDP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_RDP_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        (void) HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Lock the Options Bytes ***************************************************/
+  (void) HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void) HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Check/Apply MPU ************************************************/
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for MPU second-configuration
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_MPU_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DMA_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DAP_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  /* Check/Apply  ANTI_TAMPER *************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for TAMPER second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_TAMPER_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#ifdef SFU_TEST_PROTECTION
+  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_TEST_PROTECTION */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+  /* Check/Apply  C2SWDBG *****************************************************/
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    if (SFU_LL_SECU_CheckProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  i_ctrl++;
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+  /* Check/Apply  GTZC ********************************************************/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionGTZC() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_GTZC;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for GTZC checks
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_GTZC_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+  /* Check/Apply  CLOCK_MONITOR **********************************************/
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
+
+  /* Check/Apply  TEMP_MONITOR **********************************************/
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Return the reset source  detected after a reboot. The related flag is reset
+  *         at the end of this function.
+  * @param  peResetpSourceId: to be filled with the detected source of reset
+  * @note   In case of multiple reset sources this function return only one of them.
+  *         It can be improved returning and managing a combination of them.
+  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
+{
+  /* Check if the last reset has been generated from a Watchdog exception */
+  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
+      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
+  {
+    *peResetpSourceId = SFU_RESET_WDG_RESET;
+
+  }
+
+
+  /* Check if the last reset has been generated from a Low Power reset */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_LOW_POWER;
+
+  }
+
+  /* Check if the last reset has been generated from a Software reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_SW_RESET;
+
+  }
+  /* Check if the last reset has been generated from an Option Byte Loader reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_OB_LOADER;
+  }
+  /* Check if the last reset has been generated from a Hw pin reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_HW_RESET;
+
+  }
+  /* Unknown */
+  else
+  {
+    *peResetpSourceId = SFU_RESET_UNKNOWN;
+  }
+}
+
+/**
+  * @brief  Clear the reset sources. This function should be called after the actions
+  *         on the reset sources has been already taken.
+  * @param  none
+  * @note   none
+  * @retval none
+  */
+void SFU_LL_SECU_ClearResetSources()
+{
+  /* Clear reset flags  */
+  __HAL_RCC_CLEAR_RESET_FLAGS();
+}
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Flash configuration */
+  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+/**
+  * @brief  Apply the RDP protection
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply RDP **********************************************************/
+  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
+  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
+#else
+    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
+    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+  return e_ret_status;
+}
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  if ((psFlashOptionBytes->WRPStartOffset == SFU_PROTECT_WRP_PAGE_START_1) &&
+      (psFlashOptionBytes->WRPEndOffset   == SFU_PROTECT_WRP_PAGE_END_1))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
+    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
+    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /* configure a new area for the currently executing code (SBSFU + active slots) */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_2_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_2_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_2_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_2_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_2_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_2_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_2_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_2_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_2_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* remap the current area (SBSFU + active slots) */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_1_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_1_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_1_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_1_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_1_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_1_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_1_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_1_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_1_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  Remove the write rights for the SRAM synchronization flag */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_SRAM_FLAG_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_SRAM_FLAG_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_SRAM_FLAG_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_SRAM_FLAG_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_SRAM_FLAG_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_SRAM_FLAG_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_SRAM_FLAG_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_SRAM_FLAG_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_SRAM_FLAG_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  return SFU_SUCCESS;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t mpu_region_num; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
+          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
+          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    /* Enables the MPU */
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    /* Enables memory fault exception */
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    if ((SCB->SHCSR & SCB_SHCSR_MEMFAULTENA_Msk) != SCB_SHCSR_MEMFAULTENA_Msk)
+    {
+      return SFU_ERROR;
+    }
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+
+  e_ret_status = SFU_SUCCESS;
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check if GTZC protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionGTZC(void)
+{
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t periph_attributes;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Check FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SRAM1_SIZE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SE_REGION_RAM_START - SRAM2_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_NPRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZIC peripherals ***********************************************/
+
+  /* Check FLASH_ACR2 */
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the IT for the concerned peripherals */
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZIC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZSC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_AES) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_RNG) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SUBGHZSPI) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PWR) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASHIF) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMAMUX) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASH) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PKA) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the GTZC TZC lock *************************************************/
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+
+    return SFU_SUCCESS;
+  }
+
+  return SFU_ERROR;
+}
+
+/**
+  * @brief  Apply GTZC protection: FLASH, RAM, PKA, RNG, AES.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionGTZC(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Handle the GTZC TZC lock *************************************************/
+
+  /* Configure FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SRAM1_SIZE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SE_REGION_RAM_START - SRAM2_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                           (GTZC_TZSC_ATTRIBUTE_NPRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZIC peripherals ***********************************************/
+
+  /* Configure FLASH_ACR2 */
+  MODIFY_REG(FLASH->ACR2, FLASH_ACR2_PRIVMODE, FLASH_ACR2_PRIVMODE);
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable the IT for the concerned peripherals */
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZIC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZSC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_AES) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_RNG) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SUBGHZSPI) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PWR) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASHIF) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMAMUX) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASH) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PKA) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  NVIC_EnableIRQ(TZIC_ILA_IRQn);
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Handle the GTZC TZC lock *************************************************/
+  HAL_GTZC_TZSC_Lock(GTZC_TZSC);
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return SFU_SUCCESS;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#else
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  Apply ANTI TAMPER protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  RTC_TamperTypeDef  stamperstructure;
+
+  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
+  TAMPER_GPIO_CLK_ENABLE();
+
+  /* Configure Tamper Pin */
+  /* tamper is an additional function */
+  /* not an alternate Function : config not needed */
+  /* Configure the RTC peripheral */
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    /* Configure RTC Tamper */
+    stamperstructure.Tamper                       = RTC_TAMPER_ID;
+    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
+    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
+    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
+    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
+    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
+    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
+    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
+    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
+
+    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
+    {
+
+      /* Clear the Tamper interrupt pending bit */
+      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
+    }
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+/**
+  * @brief  Check if C2SWDBG protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_C2SWDBGEN) == 0U)
+  {
+    /* C2SWDBG disabled */
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply C2SWDBG protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void)
+{
+  HAL_FLASHEx_DisableC2Debug();
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  return SFU_SUCCESS;
+}
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply CLOCK MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a clock monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Clock Monitoring */
+  /* Add your code here for customization
+     e.g. if HSE or LSE is used enable the CSS!
+   ...
+   ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply TEMP MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a temperature monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Temperature Monitoring */
+  /* Add your code here for customization
+     ...
+     ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the active slots
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n= [SBOOT] Secure Mode: [%x]", psFlashOptionBytes->SecureMode);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr == SFU_SECURE_FLASH_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure Flash Start Address: [%x]", psFlashOptionBytes->SecureFlashStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr == SFU_HIDE_PROTECTION_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Hide Protection Start Address: [%x]", psFlashOptionBytes->HideProtectionStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr == SFU_SECURE_SRAM1_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM1 Start Address: [%x]", psFlashOptionBytes->SecureSRAM1StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr == SFU_SECURE_SRAM2_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM2 Start Address: [%x]", psFlashOptionBytes->SecureSRAM2StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START;
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Secure User Memory is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/**
+  * @brief  Activate Secure User Memory protection and jump into user application.
+  * @param  Address of the code to jump into
+  * @retval none.
+  */
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check Sub-GHz radio SPI protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply Sub-GHz radio SPI ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->SUBGHZSPISecureAccess == OB_SUBGHZSPI_SECURE_ACCESS_ENABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply Sub-GHz radio SPI protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SUBGHZSPI_SECURE_ACCESS;
+
+    psFlashOptionBytes->SUBGHZSPISecureAccess = OB_SUBGHZSPI_SECURE_ACCESS_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
new file mode 100644
index 00000000..a2231e42
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
@@ -0,0 +1,348 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+/* Secure User Memory end : from FLASH_BASE to end of active slot header */
+#define SFU_SEC_MEM_AREA_ADDR_END SFU_ROM_ADDR_END
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+
+
+#define SFU_PROTECT_GTZC_EXEC_SE_START INTVECT_START /*!< GTZC Configuration */
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area in unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys) in unprivileged mode.
+  *                   Read only capability configured
+  *                   Inner region inside the Region 0
+  *                   From 0x08030000 ==> 0x0803FFFF
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START 0x08030000UL
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_64KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x00U                /*!< All subregions activated */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the read/write operation in privileged mode for Header of active slots
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_HEADER_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_HEADER_START SLOT_ACTIVE_2_HEADER
+#define SFU_PROTECT_MPU_HEADER_SREG  0x00U                 /*!< All subregions activated */
+#define SFU_PROTECT_MPU_HEADER_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_HEADER_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_HEADER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_HEADER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_HEADER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_HEADER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the read/write operation in privileged mode for KMS_DataStorage
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_KMS_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_KMS_START (uint32_t)KMS_DATASTORAGE_START
+#define SFU_PROTECT_MPU_KMS_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_KMS_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_KMS_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_KMS_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_KMS_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_KMS_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_KMS_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 6 - Forbid all access to the DMA IPs
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_DMA_RGNV  MPU_REGION_NUMBER6
+#define SFU_PROTECT_MPU_DMA_START 0x40020000UL
+#define SFU_PROTECT_MPU_DMA_SREG  0xC0U               /*!< 4 Kbytes / 8 * 6 ==> 3 Kbytes */
+#define SFU_PROTECT_MPU_DMA_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_DMA_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_DMA_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_DMA_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_DMA_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_DMA_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+/**
+  */
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 2 - Enable the execution for the SBSFU and active slots in unprivileged mode.
+  *                   Read only capability configured
+  *                   Execution capability enabled
+  *                   Execution capability restricted by other regions (MPU and secure)
+  *                   From 0x08013000 ==> 0x08017FFF (20 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_1_RGNV  MPU_REGION_NUMBER2
+#define APP_PROTECT_MPU_FLASHEXE_1_START 0x08010000UL
+#define APP_PROTECT_MPU_FLASHEXE_1_SIZE  MPU_REGION_SIZE_32KB
+#define APP_PROTECT_MPU_FLASHEXE_1_SREG  0x07U               /*!< 32 Kbytes / 8 * 5 ==> 20 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_1_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_1_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_1_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_1_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the execution for the SBSFU and active slots in unprivileged mode.
+  *                   Read only capability configured
+  *                   Execution capability enabled
+  *                   Execution capability restricted by other regions (MPU and secure)
+  *                   From 0x08018000 ==> 0x0803FFFF (160 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_2_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_FLASHEXE_2_START FLASH_BASE          /*!< FLASH memory area */
+#define APP_PROTECT_MPU_FLASHEXE_2_SIZE  MPU_REGION_SIZE_256KB
+#define APP_PROTECT_MPU_FLASHEXE_2_SREG  0x07U               /*!< 256 Kbytes / 8 * 5 ==> 160 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_2_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_2_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_2_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_2_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_2_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define APP_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define APP_PROTECT_MPU_SRAM_FLAG_START 0x20000C00UL
+#define APP_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_256B
+#define APP_PROTECT_MPU_SRAM_FLAG_SREG  0x7FU                /*!< 256 bytes / 8 * 1 ==> 32 bytes */
+#define APP_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
+  * @{
+  */
+#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOC_CLK_ENABLE()
+#define RTC_TAMPER_ID                      RTC_TAMPER_1
+#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
+  * @{
+  */
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
+  * @{
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
+  * @{
+  */
+typedef enum
+{
+  SFU_RESET_UNKNOWN = 0x00U,
+  SFU_RESET_WDG_RESET,
+  SFU_RESET_LOW_POWER,
+  SFU_RESET_HW_RESET,
+  SFU_RESET_BOR_RESET,
+  SFU_RESET_SW_RESET,
+  SFU_RESET_OB_LOADER,
+} SFU_RESET_IdTypeDef;
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
+  * @{
+  */
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
+                                                                            separate section to support PCRoP */
+#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
+#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
+                                                                            Std Protections cannot be
+                                                                            added/removed/modified */
+#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
+                                                                            boot in bank1! */
+
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
+#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
+#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
+#define SFU_RUNTIME_PROTECTION_GTZC          ((uint32_t)0x00010000U)   /*!< GTZC protection */
+#define SFU_RUNTIME_PROTECTION_C2SWDBG       ((uint32_t)0x00020000U)   /*!< CPU2 Software Debug */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
+                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
+                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
+                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | \
+                                             SFU_RUNTIME_PROTECTION_TEMP_MONITOR  | \
+                                             SFU_RUNTIME_PROTECTION_GTZC          | \
+                                             SFU_RUNTIME_PROTECTION_C2SWDBG)
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
+
+/* Exported functions ------------------------------------------------------- */
+#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
+/*!<SFU Redirect of RTC Tamper Event Callback*/
+#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+#define SFU_CALLBACK_GTZC_TZIC(void) HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
+void               SFU_LL_SECU_ClearResetSources(void);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+#ifdef SFU_DMA_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+#ifdef SFU_DAP_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#if defined(SFU_MPU_PROTECT_ENABLE)
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_CheckProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/app_sfu.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/main.h
new file mode 100644
index 00000000..55291f12
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/main.h
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_ll_utils.h"
+#include "sfu_def.h"
+#include "app_sfu.h"
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep);
+void SFU_EXCPT_Security_Error(void);
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
new file mode 100644
index 00000000..b9458efe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/**
+  * @brief  SB Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SB Flow Control : Steps definition
+  */
+
+#define FLOW_STEP_C2BOOT 0x00006787U             /*!< Step C2OPT and SBRV value */
+
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0002cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+#define FLOW_STEP_C2_DDS 0x00003befU             /*!< Step DDS value */
+#else
+#define FLOW_STEP_C2_DDS 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+/**
+  * @brief  SB Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_C2BOOT (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_C2BOOT)
+#define FLOW_CTRL_UBE (FLOW_CTRL_C2BOOT ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_C2_DDS (FLOW_CTRL_WRP ^ FLOW_STEP_C2_DDS)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_C2_DDS ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SB Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
+#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
+
+/**
+  * @brief  SB Flow Control : Exported macro
+  */
+#if defined(MAIN_C)
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+#else
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+#endif /* MAIN_C */
+
+/* Control with STEP operation :
+ * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+ */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+      SFU_EXCPT_Security_Error();\
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h
new file mode 100644
index 00000000..755199fd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h
@@ -0,0 +1,121 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_LOADER_H
+#define SFU_COM_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include <stdint.h>
+#include <stdio.h>
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_COM_LOADER_YMODEM Status structure definition
+  */
+typedef enum
+{
+  SFU_COM_YMODEM_OK       = 0x00U,  /*!< OK */
+  SFU_COM_YMODEM_ERROR    = 0x01U,  /*!< Error */
+  SFU_COM_YMODEM_ABORT    = 0x02U,  /*!< Abort */
+  SFU_COM_YMODEM_TIMEOUT  = 0x03U,  /*!< Timeout */
+  SFU_COM_YMODEM_DATA     = 0x04U,  /*!< Data */
+  SFU_COM_YMODEM_LIMIT    = 0x05U   /*!< Limit*/
+} SFU_COM_YMODEM_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)3U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)4U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)1U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)2U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)3U)    /*!<Cnumber Index*/
+#else
+/* Minicom YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)6U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)7U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)4U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)5U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)6U)    /*!<Cnumber Index*/
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_PACKET_TRAILER_SIZE     ((uint32_t)2U)    /*!<Trailer Size*/
+#define SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE    (SFU_COM_YMODEM_PACKET_HEADER_SIZE + SFU_COM_YMODEM_PACKET_TRAILER_SIZE \
+                                                - 1U)           /*!<Overhead Size*/
+#define SFU_COM_YMODEM_PACKET_SIZE             ((uint32_t)128U)  /*!<Packet Size*/
+#define SFU_COM_YMODEM_PACKET_1K_SIZE          ((uint32_t)1024U) /*!<Packet 1K Size*/
+
+#define SFU_COM_YMODEM_FILE_NAME_LENGTH        ((uint32_t)64U)   /*!< File name length*/
+#define SFU_COM_YMODEM_FILE_SIZE_LENGTH        ((uint32_t)16U)   /*!< File size length*/
+
+#define SFU_COM_YMODEM_SOH                     ((uint8_t)0x01U)  /*!< Start of 128-byte data packet */
+#define SFU_COM_YMODEM_STX                     ((uint8_t)0x02U)  /*!< Start of 1024-byte data packet */
+#define SFU_COM_YMODEM_EOT                     ((uint8_t)0x04U)  /*!< End of transmission */
+#define SFU_COM_YMODEM_ACK                     ((uint8_t)0x06U)  /*!< Acknowledge */
+#define SFU_COM_YMODEM_NAK                     ((uint8_t)0x15U)  /*!< Negative acknowledge */
+#define SFU_COM_YMODEM_CA                      ((uint8_t)0x18U)  /*!< Two of these in succession aborts transfer */
+#define SFU_COM_YMODEM_CRC16                   ((uint8_t)0x43U)  /*!< 'C' == 0x43, request 16-bit CRC */
+#define SFU_COM_YMODEM_RB                      ((uint8_t)0x72U)  /*!< Startup sequence */
+#define SFU_COM_YMODEM_NEGATIVE_BYTE           ((uint8_t)0xFFU)  /*!< Negative Byte*/
+
+#define SFU_COM_YMODEM_ABORT1                  ((uint8_t)0x41U)  /*!< 'A' == 0x41, abort by user */
+#define SFU_COM_YMODEM_ABORT2                  ((uint8_t)0x61U)  /*!< 'a' == 0x61, abort by user */
+
+#define SFU_COM_YMODEM_NAK_TIMEOUT             ((uint32_t)0x100000U)  /*!< NAK Timeout*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)3000U) /*!< Retry delay, has to be smaller than IWDG */
+#else
+/* Minicom YMODEM : reduce the download timeout to speed-up the download operation */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)1000U) /*!< Retry delay, has to be smaller than IWDG */
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_MAX_ERRORS              ((uint32_t)3U)    /*!< Maximum number of retry*/
+
+/* Exported functions ------------------------------------------------------- */
+/*
+ * If the debug mode is not enabled then the local loader must also provide the COM init functions
+ */
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+SFU_ErrorStatus SFU_COM_Transmit(uint8_t *pData, uint16_t uDataLength, uint32_t uTimeOut);
+SFU_ErrorStatus SFU_COM_Receive(uint8_t *pData, uint16_t uDataLength);
+SFU_ErrorStatus SFU_COM_Flush(void);
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize);
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam);
+
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize);
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h
new file mode 100644
index 00000000..7467d978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update local
+  *          loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOADER_H
+#define SFU_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Local loader status Type Definition
+  */
+typedef enum
+{
+  SFU_LOADER_OK                            = 0x00U,
+  SFU_LOADER_ERR_COM                       = 0x01U,
+  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
+  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
+  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
+  SFU_LOADER_ERR_FLASH                     = 0x05U,
+  SFU_LOADER_ERR_CRYPTO                    = 0x06U
+} SFU_LOADER_StatusTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LOADER_Init(void);
+SFU_ErrorStatus SFU_LOADER_DeInit(void);
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
+                                             uint32_t *p_Size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
new file mode 100644
index 00000000..d57e2b2d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
@@ -0,0 +1,232 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fwimg_regions.h"
+#include "se_def_core.h"
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_C2_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C2_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C2_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Bank 1, Area B  used to protect Vector Table */
+#define SFU_C1_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAB)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C1_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_C1_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C1_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_C1_AREA_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area (without bit banding region) in
+  *                   unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB Full area in unprivileged mode.
+  *                   Read only capability configured
+  *                   from 0x08000000 ==> 0x08001FFF (8 Kbytes)
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START M4_SB_REGION_ROM_START
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_8KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Forbid all access to the active slot.
+  *                   From 0x08013000 ==> 0x08017FFF (20 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_APP_FLASHEXE_START 0x08010000UL
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SIZE  MPU_REGION_SIZE_32KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SREG  0x07U    /*!< 32 Kbytes / 8 * 5 ==> 20 Kbytes */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Forbid all access to the active slot.
+  *                   In addition to region 3, From 0x08018000 ==> 0x0801EFFF (28 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START 0x08018000UL
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_32KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG  0x80U    /*!< 32 Kbytes / 8 * 7 ==> 28 Kbytes */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define SFU_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
+#define SFU_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
+#define SFU_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
+#define SFU_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 3 - Enable the execution for the active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   From 0x08013000 ==> 0x08017FFF (20 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_FLASHEXE_START 0x08010000UL
+#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_32KB
+#define APP_PROTECT_MPU_FLASHEXE_SREG  0x07U    /*!< 32 Kbytes / 8 * 5 ==> 20 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Forbid all access to the active slot.
+  *                   In addition to region 3, From 0x08018000 ==> 0x0801EFFF (28 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_START 0x08018000UL
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_32KB
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x80U    /*!< 32 Kbytes / 8 * 7 ==> 28 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. */
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_WRP)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP  | \
+                                             SFU_RUNTIME_PROTECTION_DMA )
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02)     /*!< Third configuration */
+
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void);
+SE_ErrorStatus SE_SFU_IMG_Write(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_SFU_IMG_Read(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_new_image.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_new_image.h
new file mode 100644
index 00000000..c234da77
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/sfu_new_image.h
@@ -0,0 +1,58 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware
+  *          Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar
+  *          file integrated in the user application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_NEW_IMAGE_H
+#define SFU_NEW_IMAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Specifies a structure containing values related to the management of multi-images in Flash.
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+  uint32_t  ExecutionAddr;         /*!< The execution address for the FwImage in UserFlash */
+} SFU_FwImageFlashTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header);
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_NEW_IMAGE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/main.c
new file mode 100644
index 00000000..e663918e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/main.c
@@ -0,0 +1,388 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+#define MAIN_C
+
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+#include "sfu_loader.h"
+#include "sfu_com_loader.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash.h"
+#include "sfu_trace.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_new_image.h"
+#include "sfu_boot.h"
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+  __IO uint32_t *pSbsfuFlag = (__IO uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+  SFU_FLASH_StatusTypeDef   flash_if_info;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+  /* Configure the system clock using LL functions */
+  SystemClock_Config();
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* USER CODE BEGIN SysInit */
+  /* LED Init*/
+  BSP_LED_Init(LED_RED);
+
+  /* Reset the SRAM1 flag */
+  *pSbsfuFlag = SBSFU_NOT_BOOTED;
+
+  /* Configure the security features */
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_INITIAL_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  /* Boot CPU2 */
+  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
+
+  /* Wait for the flag */
+  while (*pSbsfuFlag == SBSFU_NOT_BOOTED)
+  {
+    BSP_LED_Toggle(LED_RED);
+    HAL_Delay(500U);
+  }
+  BSP_LED_Off(LED_RED);
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  /* USER CODE BEGIN 2 */
+
+  /* Check the security features once CPU2 has booted */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_SECOND_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (*pSbsfuFlag == SBSFU_FW_DOWNLOAD)
+  {
+    /* Initialize external flash interface (OSPI/QSPI) */
+    SFU_LL_FLASH_Init();
+
+    /* Configure Communication module */
+    SFU_LL_UART_Init();
+
+    TRACE("\r\n======================================================================");
+    TRACE("\r\n=                           Loader                                   =");
+    TRACE("\r\n======================================================================");
+    TRACE("\r\n");
+
+    /* Loader initialization */
+    e_ret_status = SFU_LOADER_Init();
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("Initialization failure : reset !");
+      NVIC_SystemReset();
+    }
+
+    /* Download new firmware */
+    e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header in dwl slot */
+      e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                       sizeof(SE_FwRawHeaderTypeDef));
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * Notify the Secure Boot that a new image has been downloaded
+       * by calling the SE interface function to trigger the installation procedure at next reboot.
+       */
+       TRACE("\r\nDownload successful : %d bytes received\r\n", u_size);
+      if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
+      {
+        /* Erase downloaded image */
+        SFU_LL_FLASH_Erase_Size(&flash_if_info, (void *) SlotStartAdd[SLOT_DWL_1], SLOT_SIZE(SLOT_DWL_1));
+
+        /* no specific error cause set */
+      }
+    }
+    else
+    {
+      /* Erase downloaded image */
+      TRACE("\r\nDownload failed (%d)\r\n", e_ret_status);
+      SFU_LL_FLASH_Erase_Size(&flash_if_info, (void *) SlotStartAdd[SLOT_DWL_1], SLOT_SIZE(SLOT_DWL_1));
+    }
+
+    /* Reset to restart SBSFU */
+    NVIC_SystemReset();
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+  if (*pSbsfuFlag == SBSFU_BOOTED)
+  {
+
+    /* Check the security features before jumping in the user application CPU2 */
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+    FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+    if (SFU_BOOT_CheckApplySecurityProtections(SFU_THIRD_CONFIGURATION) != SFU_SUCCESS)
+    {
+      SFU_EXCPT_Security_Error();
+    }
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+    SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+    HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+
+    jump_address = *(__IO uint32_t *)((SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET + 4));
+    /* Jump to user application */
+    p_jump_to_function = (Function_Pointer) jump_address;
+    /* Initialize user application's Stack Pointer */
+    __set_MSP(*(__IO uint32_t *)(SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET));
+
+    /* JUMP into User App */
+    p_jump_to_function();
+  }
+
+  /* We shouldn't reach this point */
+  SFU_EXCPT_Security_Error();
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE BEGIN 3 */
+
+    /* USER CODE END 3 */
+  }
+  /* USER CODE END WHILE */
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follows :
+  *            System Clock source            = PLL (MSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            AHB1 Prescaler                 = 1 
+  *            AHB3 Prescaler                 = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            MSI Frequency(Hz)              = 4000000
+  *            PLL_M                          = 1
+  *            PLL_N                          = 24
+  *            PLL_R                          = 2
+  *            Flash Latency(WS)              = 2
+  *            Voltage range                  = 1
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  LL_FLASH_SetLatency(LL_FLASH_LATENCY_2);
+
+  while(LL_FLASH_GetLatency() != LL_FLASH_LATENCY_2)
+  {
+  };
+
+  LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
+  LL_RCC_MSI_Enable();
+
+   /* Wait till MSI is ready */
+  while(LL_RCC_MSI_IsReady() != 1)
+  {
+  };
+
+  LL_RCC_MSI_EnableRangeSelection();
+  LL_RCC_MSI_SetRange(LL_RCC_MSIRANGE_6);
+  LL_RCC_MSI_SetCalibTrimming(0);
+  LL_RCC_PLL_ConfigDomain_SYS(LL_RCC_PLLSOURCE_MSI, LL_RCC_PLLM_DIV_1, 24, LL_RCC_PLLR_DIV_2);
+  LL_RCC_PLL_EnableDomain_SYS();
+  LL_RCC_PLL_Enable();
+
+   /* Wait till PLL is ready */
+  while(LL_RCC_PLL_IsReady() != 1)
+  {
+  };
+
+  LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL);
+
+   /* Wait till System clock is ready */
+  while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL)
+  {
+  };
+
+  LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
+  LL_RCC_SetAHB3Prescaler(LL_RCC_SYSCLK_DIV_1);
+  LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
+  LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1);
+
+  LL_Init1msTick(48000000);
+
+  /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */
+  LL_SetSystemCoreClock(48000000);
+}
+
+/* USER CODE BEGIN 4 */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* Apply Static protections involving Option Bytes */
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(uStep);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @retval None
+  */
+void SFU_EXCPT_Security_Error(void)
+{
+  HAL_Delay(1000);
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c
new file mode 100644
index 00000000..f7599f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c
@@ -0,0 +1,544 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
+#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
+
+/* Private macros ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
+#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
+#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+/**
+  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
+  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
+  * @param  puSize: size of received file.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
+{
+  uint32_t i;
+  uint32_t packet_length = 0U;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t filesize = 0U;
+  uint32_t packets_received;
+  uint8_t *file_ptr;
+  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
+                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(8)));
+
+  /* Check the pointers allocation */
+  if ((peCOMStatus == NULL) || (puSize == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  *peCOMStatus = SFU_COM_YMODEM_OK;
+
+  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *peCOMStatus = SFU_COM_YMODEM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *puSize = filesize;
+              file_done = 1U;
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
+              {
+                /* No NACK sent for a better synchro with remote : packet will be repeated */
+              }
+              else
+              {
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name skipped */
+                    i = 0U;
+                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
+                    {
+                      i++;
+                      file_ptr++;
+                    }
+                    /* end of file name ('\0') skipped */
+                    file_ptr++;
+
+                    /* File size extraction */
+                    i = 0U;
+                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
+                    {
+                      file_size[i] = *file_ptr;
+                      i++;
+                      file_ptr++;
+                    }
+                    file_size[i] = (uint8_t) '\0';
+                    (void) Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call*/
+                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
+                    {
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                      (void) SFU_LL_UART_Flush();
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
+                    }
+                    else
+                    {
+                      /* End session */
+                      tmp = SFU_COM_YMODEM_CA;
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      return SFU_ERROR;
+                    }
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                    file_done = 1U;
+                    session_done = 1U;
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  /* Data packet received callback call*/
+                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX],
+                                                           packet_length) == SFU_SUCCESS)
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* End session */
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    *peCOMStatus = SFU_COM_YMODEM_DATA;
+                  }
+
+                }
+                packets_received ++;
+                session_begin = 1;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          break;
+        default:
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
+          {
+            /* Abort communication */
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          }
+          else
+          {
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            /* Minicom does not accept this extra character */
+            TRACE("\b.");                                 /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+            /*
+             * Toggling the LED in case no console is available: the toggling frequency depends on
+             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
+             */
+            (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          }
+          break;
+      }
+    }
+  }
+  /* Make sure the status LED is turned off */
+  (void) BSP_LED_Off(SFU_STATUS_LED);
+
+  if (*peCOMStatus == SFU_COM_YMODEM_OK)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+/**
+  * @brief  Transmit a byte to the COM Port.
+  * @param  uParam: The byte to be sent.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
+{
+  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
+}
+
+/**
+  * @brief  Convert a string to an integer.
+  * @param  pInputStr: The string to be converted.
+  * @param  pIntNum: The integer value.
+  * @retval 1: Correct
+  *         0: Error
+  */
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+  uint8_t  digit;
+
+  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        digit = CONVERTHEX(pInputStr[i]);
+        val = (val << 4U) + digit;
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == (uint8_t)'\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == (uint8_t)'\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        digit =  CONVERTDEC(pInputStr[i]);
+        val = (val * 10U) + digit;
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData: pointer to received data.
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeOut: receive timeout (ms).
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  SFU_ErrorStatus eRetStatus;
+
+  uint8_t char1;
+
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0; /* index indicating where to write in pData */
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
+
+  if (eRetStatus == SFU_SUCCESS)
+  {
+    status = HAL_OK;
+
+    switch (char1)
+    {
+      case SFU_COM_YMODEM_SOH:
+        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
+        break;
+      case SFU_COM_YMODEM_STX:
+        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+        break;
+      case SFU_COM_YMODEM_EOT:
+        break;
+      case SFU_COM_YMODEM_CA:
+        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
+        {
+          packet_size = 2U;
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      case SFU_COM_YMODEM_ABORT1:
+      case SFU_COM_YMODEM_ABORT2:
+        status = HAL_BUSY;
+        break;
+      case SFU_COM_YMODEM_RB:
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
+    {
+
+#ifndef MINICOM_YMODEM
+      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX],
+                                       (uint16_t)(packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
+#else
+      eRetStatus = SFU_SUCCESS;
+      /* Receive byte per byte until no data left or no space left in buffer */
+      while ((SFU_SUCCESS == eRetStatus) &&
+             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
+              SFU_COM_YMODEM_PACKET_DATA_INDEX +
+              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
+            )
+      {
+        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
+                                         1U, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        /* We received some bytes */
+        eRetStatus = SFU_SUCCESS;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (eRetStatus == SFU_SUCCESS)
+      {
+        status = HAL_OK;
+
+        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
+                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
+        {
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC*/
+          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
+          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
+
+          /*Configure CRC with 16-bit polynomial*/
+          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
+          {
+            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
+            {
+              packet_size = 0U;
+              status = HAL_ERROR;
+            }
+
+          }
+          else
+          {
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        status = HAL_ERROR;
+      }
+    }
+  }
+  else
+  {
+    status = HAL_ERROR;
+  }
+
+  *puLength = packet_size;
+  return status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(uFileSize);
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(pData);
+  UNUSED(uSize);
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c
new file mode 100644
index 00000000..1aeb2646
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c
@@ -0,0 +1,654 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update LOADER module.
+  *          This file provides set of firmware functions to manage SFU local
+  *          loader functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOADER_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include <stdlib.h>
+#include "main.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h" /* for metadata authentication */
+#include "app_sfu.h"
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef MINICOM_YMODEM
+/*
+ * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
+ * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
+ */
+/* With Minicom YMODEM each packet carries 128 bytes of data */
+static uint8_t alignedBuffer[SFU_COM_YMODEM_PACKET_SIZE] __attribute__((aligned(8)));
+#endif /* MINICOM_YMODEM */
+static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
+static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
+static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
+static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
+static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
+static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
+static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
+static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_Init(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  */
+
+  /*
+   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
+   * when doing a length alignment before writing in FLASH.
+   */
+#ifndef MINICOM_YMODEM
+  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_1K_SIZE bytes of payload */
+  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_1K_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints",
+          SFU_COM_YMODEM_PACKET_1K_SIZE);
+    return SFU_ERROR;
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+#else /* MINICOM_YMODEM */
+  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_SIZE bytes of payload */
+  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints", SFU_COM_YMODEM_PACKET_SIZE);
+    return SFU_ERROR;
+  }
+#endif /* MINICOM_YMODEM */
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  DeInitialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DeInit(void)
+{
+  /*
+   * ADD SRC CODE HERE
+   */
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Download a new User Fw.
+  *         Writes firmware received via Ymodem in FLASH.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  p_DwlSlot identification of the downloaded area
+  * @param  p_Size Size of the downloaded image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
+                                             uint32_t *pSize)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
+
+  /* Check the pointers allocation */
+  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Refresh Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Transfer FW Image via YMODEM protocol */
+  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
+
+  /* Initialize global variables to be used during the YMODEM process */
+  m_uDwlAreaAddress = 0U;
+  m_uDwlAreaStart = 0U;
+  m_uDwlAreaSize = 0U;
+  m_uFileSizeYmodem = 0U;
+  m_uNbrBlocksYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uDwlSlot = SLOT_DWL_1;
+  m_LoaderStatus = SFU_LOADER_ERR_COM;
+
+  /* Receive the FW in RAM and write it in the Flash*/
+  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
+  {
+    if (*pSize > 0U)
+    {
+      /* File download correct*/
+      m_LoaderStatus = SFU_LOADER_OK;
+    }
+  }
+  else
+  {
+    /* Nothing to do : m_LoaderStatus updated during during YModem process */
+  }
+
+  /* Provide slot information to the caller
+     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
+     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
+  *pDwlSlot = m_uDwlSlot;
+
+
+  *peSFU_LOADER_Status = m_LoaderStatus;
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+#if  !defined(SFU_NO_SWAP)
+  uint32_t uLength;
+#endif /* !SFU_NO_SWAP */
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet*/
+    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
+  if (m_uPacketsReceived == 1U)
+  {
+
+    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+#if   defined(SFU_NO_SWAP)
+
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+#else
+      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
+         Partial Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwSize +
+                      (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
+                      SFU_IMG_IMAGE_OFFSET;
+#endif /* (SFU_NO_SWAP) */
+    }
+
+    /* Clear Download application area (including TRAILERS area) */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+          SFU_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+  }
+
+#if  !defined(SFU_NO_SWAP)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* This packet : contains end of FW header */
+    if ((m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)) &&
+        ((m_uDwlAreaAddress + rx_size) >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE bytes length) */
+      uLength = SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE;
+      if (uLength == 0U)
+      {
+        uLength = SFU_COM_YMODEM_PACKET_1K_SIZE;
+      }
+      if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, uLength) == SFU_SUCCESS)
+      {
+        /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
+        m_uDwlAreaAddress += uLength + (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset %
+                                        SLOT_SIZE(SLOT_SWAP));
+
+        /* Update remaining packet size to write */
+        rx_size -= uLength;
+
+        /* Update p_data pointer to received packet data */
+        p_data += uLength;
+      }
+      else
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+#endif /* !SFU_NO_SWAP */
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL image size */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Set dimension to the appropriate length for FLASH programming.
+     * Example: 64-bit length for L4.
+     */
+    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
+    {
+      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+      uOldSize = rx_size;
+      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+      while (uOldSize < rx_size)
+      {
+        p_data[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL area */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Write Data in Flash */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, rx_size) == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress += (rx_size);
+    }
+    else
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#else /* MINICOM_YMODEM */
+/* Minicom variant of the YMODEM protocol: uses 128B packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
+    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_SIZE);
+    }
+  }
+
+
+  /*
+   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
+   */
+
+  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
+     not encrypted  */
+  if (1 == m_uPacketsReceived)
+  {
+    /* First packet: beginning of header */
+    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
+    {
+      /* Copy the beginning of the header */
+      memcpy(fw_header, p_data, rx_size);
+      rx_size = 0U; /* nothing more to do */
+    }
+    else
+    {
+      /* Unexpected case */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else if (2U == m_uPacketsReceived)
+  {
+    /* Second packet: end of header (64 bytes) */
+    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
+    rx_size -= 64U;
+    p_data += 64U;
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
+         Partial Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwSize +
+                      (((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
+                      SFU_IMG_IMAGE_OFFSET;
+
+      /* Clear Download application area (including TRAILERS area) */
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+              SFU_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
+            == SFU_SUCCESS)
+        {
+          /* Shift the DWL area pointer (still to be aligned image with (PartialFwOffset % sector size) in DWL area ) */
+          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+      /* The remaining 64 bytes of data must be handled : standard processing */
+    }
+  }
+  /*
+   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
+   */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * End of the second packet (64B) or full 128B packet
+     * Skip padding bytes then take partial FW offset into account
+     */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      /* Skip the padding bytes */
+      m_uDwlAreaAddress += rx_size;
+      rx_size = 0U;
+    }
+    else
+    {
+      /*
+       * m_uDwlAreaAddress >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)
+       */
+      if (((SFU_IMG_IMAGE_OFFSET / SFU_COM_YMODEM_PACKET_SIZE) + 1) == m_uPacketsReceived)
+      {
+        /* End of padding bytes : We must take the partial offset into account */
+        m_uDwlAreaAddress += ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+      }
+      /* else nothing more to do */
+
+      /* Check size to avoid writing beyond DWL image size */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /*
+       * Set dimension to the appropriate length for FLASH programming.
+       * Example: 64-bit length for L4.
+       */
+      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        /*
+         * By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         * sizeof(SFU_IMG_write_t) to avoid reading out of the buffer
+         */
+        uOldSize = rx_size;
+        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                             (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+        while (uOldSize < rx_size)
+        {
+          p_data[uOldSize] = 0xFF;
+          uOldSize++;
+        }
+      }
+
+      /* Check size to avoid writing beyond DWL area */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Write Data in Flash */
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /*
+         * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
+         * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
+         */
+        memcpy(alignedBuffer, p_data, rx_size);
+
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, alignedBuffer, rx_size) == SFU_SUCCESS)
+        {
+          m_uDwlAreaAddress += (rx_size);
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+
+
+/**
+  * @brief  Verifies the Raw Fw Header received. It checks if the header is
+  *         authentic and if the fields are ok with the device (e.g. size and version).
+  * @note   Please note that when the new image is installed, this metadata is checked
+  *         by @ref SFU_IMG_CheckCandidateVersion.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  pBuffer: pointer to header Buffer.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
+{
+  SFU_FwImageFlashTypeDef       fw_image_flash_data;
+
+  m_uDwlSlot = SLOT_DWL_1;
+
+  SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
+
+  /* Assign the download flash address to be used during the YMODEM process */
+  m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
+  m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
+
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
new file mode 100644
index 00000000..b068b2e0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
@@ -0,0 +1,1109 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SB Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SB security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_boot.h"
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+/* #warning "SFU_IWDG_PROTECT_DISABLED" */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+  /* SRAM flag access */
+  {
+    SFU_PROTECT_MPU_SRAM_FLAG_RGNV, SFU_PROTECT_MPU_SRAM_FLAG_START, SFU_PROTECT_MPU_SRAM_FLAG_SIZE,
+    SFU_PROTECT_MPU_SRAM_FLAG_PERM, SFU_PROTECT_MPU_SRAM_FLAG_EXECV, SFU_PROTECT_MPU_SRAM_FLAG_SREG,
+    SFU_PROTECT_MPU_SRAM_FLAG_TEXV, SFU_PROTECT_MPU_SRAM_FLAG_C, SFU_PROTECT_MPU_SRAM_FLAG_B
+  },
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_START, SFU_PROTECT_MPU_APP_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_C, SFU_PROTECT_MPU_APP_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B
+  },
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                      FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                    FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  FLASH_OBProgramInitTypeDef sfu_flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_BoolTypeDef is_current_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA  **********/
+  flash_option_bytes.WRPArea     = SFU_C1_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+  sfu_flash_option_bytes.WRPArea = SFU_C2_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&sfu_flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckC2BootConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+    if (SFU_LL_SECU_CheckProtectionBootLock(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set C2 Boot configuration **********************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetC2BootConfiguration(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* C2OPT and SBRV cannot be written if C2BOOT_LOCK = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+
+    /* Check/Set Boot Lock configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionBootLock(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes,
+                                                  &is_protection_to_be_applied);
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply C2 DDS *****************************************************/
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* DDS cannot be written if ESE = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+
+  /* Lock the Options Bytes ***************************************************/
+  HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  SFU_ProtectionTypeDef expected_runtime_protection = SFU_PROTECTIONS_NONE;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  if (runtime_protection != expected_runtime_protection)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check C2 boot configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2OPT and SBRV ***********************************************/
+  if ((psFlashOptionBytes->C2BootRegion == OB_C2_BOOT_FROM_FLASH)&&
+      (psFlashOptionBytes->C2SecureBootVectAddr == SFU_C2_BOOT_BASE_ADDR))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply C2 boot configuration.
+  * @note   C2OPT and SBRV can only be accessed by software when C2BOOT_LOCK = 0.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckC2BootConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_BOOT_VECT;
+    psFlashOptionBytes->C2BootRegion            = OB_C2_BOOT_FROM_FLASH;
+    psFlashOptionBytes->C2SecureBootVectAddr    = SFU_C2_BOOT_BASE_ADDR;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Boot Lock configuration */
+  if (SFU_LL_SECU_CheckProtectionBootLock(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    /* Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                               FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if ((psSbFlashOptionBytes->WRPStartOffset == SFU_C1_PROTECT_WRP_PAGE_START) ||
+      (psSbFlashOptionBytes->WRPEndOffset   == SFU_C1_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if ((psSfuFlashOptionBytes->WRPStartOffset == SFU_C2_PROTECT_WRP_PAGE_START) ||
+      (psSfuFlashOptionBytes->WRPEndOffset   == SFU_C2_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                             FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if (SFU_LL_SECU_CheckProtectionWRP(psSbFlashOptionBytes, psSfuFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psSbFlashOptionBytes->OptionType      = OPTIONBYTE_WRP;
+    psSbFlashOptionBytes->WRPArea         = SFU_C1_PROTECT_WRP_AREA;
+    psSbFlashOptionBytes->WRPStartOffset  = SFU_C1_PROTECT_WRP_PAGE_START;
+    psSbFlashOptionBytes->WRPEndOffset    = SFU_C1_PROTECT_WRP_PAGE_END;
+
+    if (HAL_FLASHEx_OBProgram(psSbFlashOptionBytes) == HAL_OK)
+    {
+      psSfuFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+      psSfuFlashOptionBytes->WRPArea        = SFU_C2_PROTECT_WRP_AREA;
+      psSfuFlashOptionBytes->WRPStartOffset = SFU_C2_PROTECT_WRP_PAGE_START;
+      psSfuFlashOptionBytes->WRPEndOffset   = SFU_C2_PROTECT_WRP_PAGE_END;
+
+      if (HAL_FLASHEx_OBProgram(psSfuFlashOptionBytes) == HAL_OK)
+      {
+        *pbIsProtectionToBeApplied |= 1U;
+        e_ret_status = SFU_SUCCESS;
+        /* Execution stopped if flow control failed */
+        FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+      }
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS **********************************************************/
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    /* System Security Configuration failed: Sub-GHz radio SPI security access is incorrect */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /*  modify executable region for executing UserAPP*/
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  modify executable region for executing UserAPP */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_ADJUST_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_ADJUST_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_ADJUST_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  return e_ret_status;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint8_t mpu_region_num = 0U; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return e_ret_status;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  assert_param(SFU_IS_FUNCTIONAL_STATE(eState));
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the slot #0
+     */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr != SFU_SECURE_FLASH_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr != SFU_HIDE_PROTECTION_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr != SFU_SECURE_SRAM1_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr != SFU_SECURE_SRAM2_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief call by SFU to write a flash protected area
+  *         This SE function should never be called.
+  * @param  pSE_Status: Secure Engine Status.
+  * @param  pDestination: pointer to flash area to write.
+  * @param  pSource: pointer to input buffer.
+  * @param  Length: number of bytes to write to flash
+  * @retval SE_ErrorStatus SE_ERROR.
+  */
+SE_ErrorStatus SE_SFU_IMG_Write(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+
+  /* We shouldn't get there */
+  return SE_ERROR;
+}
+
+/**
+  * @brief call by SFU to read flash protected area
+  *         This SE function should never be called.
+  * @param  pSE_Status: Secure Engine Status.
+  * @param  pDestination: pointer to output buffer.
+  * @param  pSource: pointer to the flash area to read.
+  * @param  Length: number of bytes to read from flash
+  * @retval SE_ErrorStatus SE_ERROR.
+  */
+SE_ErrorStatus SE_SFU_IMG_Read(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+
+  /* We shouldn't get there */
+  return SE_ERROR;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_new_image.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_new_image.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/sfu_new_image.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/sfu_new_image.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..7a3565e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
@@ -0,0 +1,198 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  HAL_IncTick();
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/app_sfu_common.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
new file mode 100644
index 00000000..a2fcc40b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
@@ -0,0 +1,145 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu_common.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_COMMON_H
+#define APP_SFU_COMMON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/**
+  * Optional Features Software Configuration
+  */
+#define CM4_SBFU_BOOT_FLAG_ADDRESS M4_M0PLUS_FLAG_RAM_START /*!< address of the M4/M0+ synchronization flag (unused RAM) */
+#define SBSFU_NOT_BOOTED           0xFFFF               /*!< M0+ SBSFU hasn't finished its boot */
+#define SBSFU_BOOTED               0xAAAA               /*!< M0+ SBSFU boot is over: the M4 UserApp can be started */
+#define SBSFU_FW_DOWNLOAD          0x5555               /*!< M0+ SBSFU boot is over: a firmware download is required */
+
+#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
+#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
+#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
+#define SECBOOT_DUAL_CORE_LOADER              (4U) /*!< dual core loader */
+
+/* Uncomment the define below if you want to use minicom with Linux */
+/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
+
+#if defined(MINICOM_YMODEM)
+/* Minicom does not accept the debug prints during the YMODEM session */
+#undef SFU_VERBOSE_DEBUG_MODE
+#endif /* MINICOM_YMODEM */
+
+/* Multi-images configuration :
+   - Max : 3 Active images and 3 Download area
+   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
+   - Active slot identified with SFU magic (1,2,3) information from header
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+   - FW image valid all feature authorized from master slot
+*/
+#define SFU_NB_MAX_ACTIVE_IMAGE 2U                        /*!< 2 active images managed */
+#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 dwl area managed */
+
+/* The define below allows disabling all security IPs at once.
+ *
+ * Enabled: all security IPs (WRP, watchdog...) are disabled.
+ * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
+ *
+ */
+
+/*#define SECBOOT_DISABLE_SECURITY_IPS*/  /*!< Disable all security IPs at once when activated */
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_WRP_PROTECT_ENABLE
+#define SFU_DAP_PROTECT_ENABLE         /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
+                                            It might be difficult to reconnect the Debugger.*/
+#define SFU_DMA_PROTECT_ENABLE
+/*#define SFU_IWDG_PROTECT_ENABLE*/    /*!< WARNING:
+                                        1. Be Careful if enabling this protection. IWDG will be active also after
+                                           switching to UserApp: a refresh is needed.
+                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
+                                           platform (flash size...)*/
+#define SFU_C2_DDS_PROTECT_ENABLE      /*!< Static disabling of the CPU2 debug */
+#define SFU_SECURE_USER_PROTECT_ENABLE /*!< Only accessible in Secure access mode,
+                                          the Secure user software is stored in the secure user memory, a configurable
+                                          protected area which is part of the user main memory. */
+
+/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
+                                                 steps.
+                                                 When enabling this lock, Static protections cannot be modified any more
+                                                 and Debug is finally disabled. */
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+/**
+  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
+  * This define is taken into account only if RDP level 2 is not set.
+  * If RDP level 2 is set no modification can be done anyway.
+  *
+  * Enabled: Option Bytes Development Mode enabled.
+  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
+  *          If an OB is not set though it should be then this setting is automatically corrected.
+  *          This applies only as long as RDP level 2 is not set.
+  *
+  * Disabled: Option Bytes Development Mode disabled.
+  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
+              the first time.
+  *           SB_SFU checks the Option Bytes configuration but does not correct it.
+  *           If a problem is detected an error message is reported and the execution stops.
+  */
+#define SECBOOT_OB_DEV_MODE
+
+
+#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
+                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
+
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_SECURE_FLASH_START    SLOT_ACTIVE_1_START              /*!< Secure Flash start address: SFSA[6:0] */
+#define SFU_SECURE_SRAM1_START    0x1F                             /*!< Secure non-Backup SRAM1 start address:
+                                                                        SNBRSA[4:0]. 0x1F configures an entirely
+                                                                        non-secure SRAM1. */
+#define SFU_SECURE_SRAM2_START    SB_REGION_RAM_START              /*!< Secure Backup SRAM2 start address: SBRSA[4:0] */
+#define SFU_HIDE_PROTECTION_START SE_KEY_REGION_ROM_START          /*!< Hide Protection area start address:
+                                                                        HDPSA[6:0] */
+#define SFU_HIDE_PROTECTION_CFG OB_SECURE_HIDE_PROTECTION_ENABLE   /*!< Hide Protection area start address:
+                                                                        HDPSA[6:0] */
+
+/*!< Secure mode activated or deactivated */
+#define SFU_SECURE_MODE           (OB_SECURE_SYSTEM_AND_FLASH_ENABLE | \
+                                   SFU_HIDE_PROTECTION_CFG           | \
+                                   OB_SECURE_SRAM1_DISABLE           | \
+                                   OB_SECURE_SRAM2_ENABLE)
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_COMMON_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_com_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_com_trace.c
new file mode 100644
index 00000000..38dbfe17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_com_trace.c
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_com_trace.h"
+
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_TRACE_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutString Timeout*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+/**
+  * @}
+  */
+
+/** @defgroup SFU_COM_TRACE_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Print a string on the COM Port.
+  * @param  pString: The string to be printed
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString)
+{
+  uint16_t length = 0U;
+
+  /* Check the pointers allocation */
+  if (pString == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  while (pString[length] != (uint8_t)'\0')
+  {
+    length++;
+  }
+
+  return SFU_LL_UART_Transmit(pString, length, SFU_COM_TRACE_SERIAL_TIME_OUT);
+
+}
+
+/**
+  * @brief  Retargets the C library printf function to SFU UART.
+  * @param  None
+  * @retval ch
+  */
+PUTCHAR_PROTOTYPE
+{
+  /* Place your implementation of fputc here */
+  /* e.g. write a character to the USART1 and Loop until the end of transmission */
+  (void) SFU_LL_UART_Transmit((uint8_t *)&ch, 1U, 0xFFFFU);
+
+  return ch;
+}
+
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_com_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_com_trace.h
new file mode 100644
index 00000000..d5981e4d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_com_trace.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities  for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_TRACE_H
+#define SFU_COM_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include <stdio.h>
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_def.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/Common/sfu_def.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_def.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
new file mode 100644
index 00000000..2947403a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
@@ -0,0 +1,111 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_regions.h
+  * @author  MCD Application Team
+  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_REGIONS_H
+#define SFU_FWIMG_REGIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "se_crypto_config.h"
+
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  *  Slot list : 2 slots per image configuration + swap
+  */
+#define NB_SLOTS      6U
+#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
+#define SLOT_ACTIVE_1 1U
+#define SLOT_ACTIVE_2 2U
+#define SLOT_DWL_1    3U
+#define SLOT_DWL_2    4U
+#define SLOT_SWAP     5U
+
+/* Calculation of the size of a slot */
+#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
+
+/*
+ * Design constraint: the image slot size must be a multiple of the swap area size.
+ * And of course both image slots must have the same size.
+ */
+#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
+
+/*
+ * Checking that the slot sizes are consistent with the .icf file
+ * Sizes expressed in bytes (+1 because the end address belongs to the slot)
+ * The checks are executed at runtime in the SFU_Img_Init() function.
+ */
+#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
+
+/**
+  * Image starting offset to add to the  address of 1st block
+  */
+#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
+
+
+/* External variables --------------------------------------------------------*/
+extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
+extern const uint32_t  SlotStartAdd[NB_SLOTS];
+extern const uint32_t  SlotEndAdd[NB_SLOTS];
+
+#if defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C) || defined(SFU_LOADER_C)
+
+const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
+                                            SLOT_ACTIVE_1_HEADER,
+                                            SLOT_ACTIVE_2_HEADER,
+                                            SLOT_DWL_1_START,
+                                            0U,
+                                            SWAP_START,
+                                          };
+/* List of slot start address */
+const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
+                                            SLOT_ACTIVE_1_START,
+                                            SLOT_ACTIVE_2_START,
+                                            SLOT_DWL_1_START,
+                                            0U,
+                                            SWAP_START,
+                                          };
+/* List of slot end address */
+const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
+                                            SLOT_ACTIVE_1_END,
+                                            SLOT_ACTIVE_2_END,
+                                            SLOT_DWL_1_END,
+                                            0U,
+                                            SWAP_END,
+                                          };
+#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_REGIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level.c
new file mode 100644
index 00000000..a502fa43
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level.c
@@ -0,0 +1,581 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.c
+  * @author  MCD Application Team
+  * @brief   SFU Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+extern RTC_HandleTypeDef RtcHandle;
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+/* Private variables ---------------------------------------------------------*/
+static UART_HandleTypeDef   UartHandle;
+static CRC_HandleTypeDef    CrcHandle;
+
+/* Private function prototypes -----------------------------------------------*/
+static void     SFU_LL_Error_Handler(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Initialize CRC */
+  e_ret_status = SFU_LL_CRC_Init();
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF CRC Init.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure the peripheral clock */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+
+  /* Configure CRC with default polynomial - standard configuration */
+  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU  IF CRC Configuration.
+  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
+  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Check the parameters */
+  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
+
+  /* Switch to the selected configuration */
+  CrcHandle.Instance = CRC;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  switch (eCRCConfg)
+  {
+    case SFU_CRC_CONFIG_DEFAULT:
+      /* The Default polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+      /* The default init value is used */
+      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+      /* The input data are 32-bit long words */
+      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    case SFU_CRC_CONFIG_16BIT:
+      /* The CRC-16-CCIT polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+      /* The zero init value is used */
+      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+      CrcHandle.Init.InitValue               = 0U;
+      /* The input data are 8-bit long */
+      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    default:
+      /* Invalid parameter */
+      e_ret_status = SFU_ERROR;
+      break;
+  }
+
+  /* Proceed to CRC Init (Correct Parameters) */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  SFU IF CRC Calculate.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  BufferLength: buffer length in bytes.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
+}
+
+/**
+  * @brief SFU UART Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = SFU_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+  if (HAL_UART_Init(&UartHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief SFU IF UART DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  SFU IF Write data (send).
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  DataLength: pointer to the 128bit data to write.
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  Timeout: Timeout duration.
+  * @retval status of the write operation
+  *         SFU_ERROR : if the write operation is not performed
+  *         SFU_SUCCESS : if the write operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF Read data (receive).
+  * @param  pData: pointer to the 128bit data where to store the received data.
+  * @param  DataLength: the length of the data to be read in bytes.
+  * @param Timeout: Timeout duration.
+  * @retval status of the read operation
+  *         SFU_ERROR : if the read operation is not performed
+  *         SFU_SUCCESS : if the read operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU HAL IF Flush.
+  * @param  None.
+  * @retval status of the operation.
+  */
+SFU_ErrorStatus SFU_LL_UART_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+
+  return SFU_SUCCESS;
+}
+
+#if  defined(CORE_CM0PLUS)
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief SFU IF RTC Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief SFU IF RTC DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+#endif /* CORE_CM0PLUS */
+
+/**
+  * @brief SFU IF RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer.
+  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  *        the RTC clock source; in this case the Backup domain will be reset in
+  *        order to modify the RTC Clock source, as consequence RTC registers (including
+  *        the backup registers) and RCC_BDCR register are set to their reset values.
+  * @retval None
+  */
+void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  RCC_OscInitTypeDef        RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+  UNUSED(hrtc);
+  /*-1- Enables access to the backup domain */
+  /* To enable access on RTC registers */
+
+  HAL_PWR_EnableBkUpAccess();
+
+  /*-2- Configure LSE/LSI as RTC clock source */
+#ifdef RTC_CLOCK_SOURCE_LSE
+
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#elif defined (RTC_CLOCK_SOURCE_LSI)
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
+  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#else
+#error Please select the RTC Clock source inside the main.h file
+#endif /*RTC_CLOCK_SOURCE_LSE*/
+
+  /*-3- Enable RTC peripheral Clocks */
+  /* Enable RTC Clock */
+  __HAL_RCC_RTC_ENABLE();
+
+  /* Enable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_ENABLE();
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  /*-4- Configure the NVIC for RTC Tamper */
+  HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0x0FU, 0U);
+  HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+
+  __HAL_RCC_RTC_DISABLE();
+
+  /* Disable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_DISABLE();
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in SFU application.
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral Clock Enable */
+    SFU_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    SFU_UART_TX_GPIO_CLK_ENABLE();
+    SFU_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : SFU_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
+    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : SFU_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
+    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral clock disable */
+    SFU_UART_CLK_DISABLE();
+
+    /* GPIO DeInit*/
+    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
+    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
+
+  }
+
+
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @param  None
+  * @retval None
+  */
+static void SFU_LL_Error_Handler(void)
+{
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  while (1 == 1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @}
+  */
+/**
+  * @brief function checking if a buffer is in se ram.
+  * @param pBuff: Secure Engine protected function ID.
+  * @param length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in se ram, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((length != 0U) && (!((0xFFFFFFFFUL - addr_start) < length))
+      && ((addr_end  <= SE_REGION_RAM_END) && (addr_start >= SE_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level.h
new file mode 100644
index 00000000..da4792af
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level.h
@@ -0,0 +1,132 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef  SFU_LOW_LEVEL_H
+#define  SFU_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU CRC Configuration definition
+  */
+typedef enum
+{
+  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
+  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
+  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
+} SFU_CRC_ConfigTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Uncomment to enable the adequate Clock Source */
+#define RTC_CLOCK_SOURCE_LSI
+/*#define RTC_CLOCK_SOURCE_LSE*/
+
+#ifdef RTC_CLOCK_SOURCE_LSI
+#define RTC_ASYNCH_PREDIV    0x1FU
+#define RTC_SYNCH_PREDIV     0x3FF
+#endif /* RTC_CLOCK_SOURCE_LSI */
+
+#ifdef RTC_CLOCK_SOURCE_LSE
+#define RTC_ASYNCH_PREDIV  0x7FU
+#define RTC_SYNCH_PREDIV   0x00FFU
+#endif /* RTC_CLOCK_SOURCE_LSE */
+
+/* External variables --------------------------------------------------------*/
+extern __IO uint32_t  DummyMemAccess;
+#if defined(SFU_LOW_LEVEL_C)
+#if defined(IT_MANAGEMENT)
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+__IO uint32_t DummyMemAccess;
+#endif /* defined(IT_MANAGEMENT) */
+#endif /* defined(SFU_LOW_LEVEL_C) */
+
+
+/* Exported macros -----------------------------------------------------------*/
+#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
+                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
+                               ((CONF) == SFU_CRC_CONFIG_16BIT))
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+#define SFU_LL_DummyAccess() \
+  do{ \
+  }while(0)
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus    SFU_LL_Init(void);
+SFU_ErrorStatus    SFU_LL_DeInit(void);
+
+SFU_ErrorStatus    SFU_LL_CRC_Init(void);
+SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
+uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
+
+SFU_ErrorStatus    SFU_LL_UART_Init(void);
+SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
+SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Flush(void);
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus SFU_LL_RTC_Init(void);
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
+void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
+
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  SFU_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c
new file mode 100644
index 00000000..4cea3348
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_fwimg_regions.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  e_ret_status = SFU_LL_FLASH_INT_Init();
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                   const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pFlash < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+}
+
+/**
+  * @brief  This function configure the flash to be able to execute code
+  * @param  Addr: flash address
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
+{
+  /*
+   * Internal flash : nothing to do
+   * External flash : configure memory mapped mode
+   */
+
+  /* Check Flash address */
+  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
+  }
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
+{
+  /* Check Flash address */
+  if (Addr < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_GetPage(Addr);
+  }
+  else
+  {
+    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
+  }
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h
new file mode 100644
index 00000000..726365d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_H
+#define SFU_LOW_LEVEL_FLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
+  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
+  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
+  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
+  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
+  SFU_FLASH_SUCCESS           /*!< Flash Success */
+} SFU_FLASH_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define INVALID_SECTOR 0xFFFFFFFFU
+#define INVALID_PAGE   0xFFFFFFFFU
+#define INVALID_BANK   0xFFFFFFFFU
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                   const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
+
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c
new file mode 100644
index 00000000..7b10b14d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU external
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_low_level_security.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+/* No external flash available on this product
+   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
+       systematically during startup phase */
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pStart);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  UNUSED(pFlash);
+  UNUSED(Pattern1);
+  UNUSED(Pattern2);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
+{
+  UNUSED(SlotNumber);
+  return SFU_SUCCESS;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h
new file mode 100644
index 00000000..08566d80
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for external flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
+#define SFU_LOW_LEVEL_FLASH_EXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+#define EXTERNAL_FLASH_ADDRESS  0x90000000U
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c
new file mode 100644
index 00000000..77082978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c
@@ -0,0 +1,482 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU internal
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "string.h"
+#ifdef CORE_CM0PLUS
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#endif /* CORE_CM0PLUS */
+
+/* Private defines -----------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+
+/* Private variables ---------------------------------------------------------*/
+static __IO uint32_t DoubleECC_Error_Counter = 0U;
+
+
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t first_page;
+  uint32_t nb_pages;
+  uint32_t chunk_nb_pages;
+  uint32_t length = Length;
+
+  /* Check the pointers allocation */
+  if (pFlashStatus == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  *pFlashStatus = SFU_FLASH_SUCCESS;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = SFU_LL_FLASH_INT_GetPage(start);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
+      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        p_erase_init.Page = first_page;
+        p_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_ERASE;
+        }
+        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
+      } while (nb_pages > 0U);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      if (HAL_FLASH_Lock() != HAL_OK)
+      {
+        e_ret_status = SFU_ERROR;
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+      }
+    }
+    else
+    {
+      *pFlashStatus = SFU_FLASH_ERR_HAL;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Check the pointers allocation */
+  if ((pFlashStatus == NULL) || (pSource == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     writing operation should be executed inside secure environment */
+  if ((inside_header == 1U) && (Length != 0U))
+  {
+    /* SE Access */
+    SE_StatusTypeDef se_status;
+    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
+    if (se_ret_status == SE_SUCCESS)
+    {
+      e_ret_status = SFU_SUCCESS;
+      *pFlashStatus = SFU_FLASH_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+      *pFlashStatus = SFU_FLASH_ERROR;
+    }
+  }
+  /* Writing operation executed by SBSFU */
+  else
+  {
+    *pFlashStatus = SFU_FLASH_ERROR;
+
+    /* Clear error flags raised during previous operation */
+    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Unlock the Flash to enable the flash control register access *************/
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+
+      }
+      else
+      {
+        /* DataLength must be a multiple of 64 bit */
+        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
+        {
+          *pFlashStatus = SFU_FLASH_ERROR;
+
+          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+          be done by word */
+          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
+              == HAL_OK)
+          {
+            /* Check the written value */
+            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
+            {
+              /* Flash content doesn't match SRAM content */
+              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
+              e_ret_status = SFU_ERROR;
+            }
+            else
+            {
+              /* Increment FLASH Destination address */
+              destination = destination + sizeof(SFU_LL_FLASH_write_t);
+              e_ret_status = SFU_SUCCESS;
+              *pFlashStatus = SFU_FLASH_SUCCESS;
+            }
+          }
+          else
+          {
+            /* Error occurred while writing data in Flash memory */
+            *pFlashStatus = SFU_FLASH_ERR_WRITING;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+        /* Lock the Flash to disable the flash control register access (recommended
+        to protect the FLASH memory against possible unwanted operation) */
+        if (HAL_FLASH_Lock() != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_HAL;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus se_ret_status;
+  SE_StatusTypeDef se_status;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     reading operation should be executed inside secure environment */
+  if (inside_header == 1U)
+  {
+    /* SE Access */
+    DoubleECC_Error_Counter = 0U;
+    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
+    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  /* Reading operation executed by SBSFU */
+  else
+  {
+    DoubleECC_Error_Counter = 0U;
+    /* Do not use memcpy from lib : ECC error should be checked at each loop */
+    for (i = 0; (i < Length) && (DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+    {
+      *pDestination = *pSource;
+    }
+    if (DoubleECC_Error_Counter == 0U)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  uint32_t flash = (uint32_t) pFlash;
+  uint32_t i;
+
+  /* Comparison executed by SBSFU ==> flash area could not be located inside secured environment */
+  for ( i = 0U; i < Length; i += 4U)
+  {
+    if ((*(uint32_t *)(flash + i) != Pattern1) &&  (*(uint32_t *)(flash + i) != Pattern2))
+    {
+      return SFU_ERROR;
+    }
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+
+
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retvat void
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    while (1 == 1)
+    {
+#ifdef CORE_CM0PLUS
+      SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_UNKNOWN);
+#else /* CORE_CM0PLUS */
+      NVIC_SystemReset();
+#endif /* CORE_CM0PLUS */
+    }
+  }
+}
+
+
+/**
+  * @brief  HardFault Handler
+  * @param  None.
+  * @retval None.
+  */
+#ifdef CORE_CM0PLUS
+void HardFault_Handler(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
+}
+#endif /* CORE_CM0PLUS */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h
new file mode 100644
index 00000000..5ef51fc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for internal flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_INT_H
+#define SFU_LOW_LEVEL_FLASH_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash Write Access Constraints (size and alignment)
+  *
+  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
+  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
+  *
+  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
+  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
+  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
+  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_FirmwareToResume).
+  */
+
+/* double-word is the default setting for most platforms */
+typedef uint64_t SFU_LL_FLASH_write_t;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Length of a MAGIC tag (32 bytes).
+  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
+  */
+#define MAGIC_LENGTH ((uint32_t)32U)
+
+/* External variables --------------------------------------------------------*/
+#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
+void NMI_Handler(void);
+void HardFault_Handler(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_trace.h
new file mode 100644
index 00000000..cf6d3387
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/Common/sfu_trace.h
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SFU_TRACE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TRACE_H
+#define SFU_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_com_trace.h"
+#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+/* External variables --------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid
+                                                                        faults. printf is not rieentrant */
+#define TRACE   (void) printf
+#else
+#define TRACE(...)
+#define TRACE_IRQ(pbuffer)
+#endif /* SFU_DEBUG_MODE */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
new file mode 100644
index 00000000..19ebe1d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM0PLUS\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM0PLUS\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM0PLUS\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>CORE_CM0PLUS</state>
+                    <state>KMS_ENABLED</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\Core\Inc</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\App</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+                    <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$\se_interface_appli.o"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\SE_Core.bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM0PLUS_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>Core</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
+        <group>
+            <name>SBSFU</name>
+            <group>
+                <name>App</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_boot.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_error.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_mpu_isolation.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_test.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_common.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_no_swap.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_swap.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_kms.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_interface_crypto_scheme.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Target</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_security.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Common</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_com_trace.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_low_level.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_int.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_ext.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\sfu_se_mpu.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+    </group>
+        <group>
+          <name>Middlewares</name>
+          <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
+            </file>
+          </group>
+          <group>
+            <name>STM32_Key_Management_Services</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
new file mode 100644
index 00000000..455613cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>7.10.3.6927</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
new file mode 100644
index 00000000..1a98afc0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
@@ -0,0 +1,1182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM4\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM4\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM4\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM4/Inc</state>
+                    <state>$PROJ_DIR$/../../2_Images_SECoreBin/Inc</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM4_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_it.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_com_loader.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_loader.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_low_level_security.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_new_image.c</name>
+            </file>
+        </group>
+        <group>
+            <name>Common</name>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_com_trace.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_low_level.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_int.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_ext.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+           <name>STM32WLxx_LL_Driver</name>
+           <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</name>
+           </file>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_hsem.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/Project_SBSFU.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/Project_SBSFU.eww
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/sfu_se_mpu.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
new file mode 100644
index 00000000..b8446db6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
@@ -0,0 +1,40 @@
+show SE_APP_GetActiveFwInfo
+show SE_APP_SVC_Handler
+show SE_SYS_SaveDisableIrq
+show SE_SYS_RestoreEnableIrq
+show SE_KMS_Initialize
+show SE_KMS_Finalize
+show SE_KMS_GetInfo
+show SE_KMS_GetFunctionList
+show SE_KMS_GetSlotList
+show SE_KMS_GetSlotInfo
+show SE_KMS_GetTokenInfo
+show SE_KMS_GetMechanismInfo
+show SE_KMS_OpenSession
+show SE_KMS_CloseSession
+show SE_KMS_CreateObject
+show SE_KMS_DestroyObject
+show SE_KMS_GetAttributeValue
+show SE_KMS_SetAttributeValue
+show SE_KMS_FindObjectsInit
+show SE_KMS_FindObjects
+show SE_KMS_FindObjectsFinal
+show SE_KMS_EncryptInit
+show SE_KMS_Encrypt
+show SE_KMS_EncryptUpdate
+show SE_KMS_EncryptFinal
+show SE_KMS_DecryptInit
+show SE_KMS_Decrypt
+show SE_KMS_DecryptUpdate
+show SE_KMS_DecryptFinal
+show SE_KMS_DigestInit
+show SE_KMS_Digest
+show SE_KMS_DigestUpdate
+show SE_KMS_DigestFinal
+show SE_KMS_SignInit
+show SE_KMS_Sign
+show SE_KMS_VerifyInit
+show SE_KMS_Verify
+show SE_KMS_DeriveKey
+show SE_KMS_GenerateKeyPair
+show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
new file mode 100644
index 00000000..edc50db9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
@@ -0,0 +1,897 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>sfu_se_mpu.s</PathWithFileName>
+      <FilenameWithoutPath>sfu_se_mpu.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>se_core_bin.s</PathWithFileName>
+      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_boot.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_error.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_no_swap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_swap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_kms.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_mpu_isolation.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_test.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/Common</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_com_trace.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash_ext.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash_int.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
new file mode 100644
index 00000000..9303ffaf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
@@ -0,0 +1,726 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo_CM0PLUS\Exe\</OutputDirectory>
+          <OutputName>SBSFU</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments></TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-Wno-format</MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM0PLUS/Core/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../CM0PLUS/Core/Inc;../CM0PLUS/SBSFU/App;../CM0PLUS/SBSFU/Target;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SBSFU_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--symdefs=se_interface_appli.txt
+--keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_se_mpu.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>sfu_se_mpu.s</FilePath>
+            </File>
+            <File>
+              <FileName>se_core_bin.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>se_core_bin.s</FilePath>
+            </File>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/App</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_boot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_boot.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_error.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_error.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_no_swap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_swap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_interface_crypto_scheme.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_kms.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_mpu_isolation.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_test.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/Common</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash_ext.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash_int.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_bootloader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="CM0PLUS"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
new file mode 100644
index 00000000..b6d95e3e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
@@ -0,0 +1,693 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/Common</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_com_trace.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash_int.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash_ext.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/sfu_com_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/sfu_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/sfu_new_image.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_new_image.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_hsem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
new file mode 100644
index 00000000..ba789307
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>STM32WL55JC_Nucleo_CM4\Exe\</OutputDirectory>
+          <OutputName>SB</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>0</hadIROM>
+            <hadIRAM>0</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>1</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>0</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>0</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>0</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM4/Inc;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SB_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Common</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash_int.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash_ext.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_com_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_low_level_security.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_new_image.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_hsem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_LL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_ll_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="CM4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/Project.uvmpw
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/SB_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
new file mode 100644
index 00000000..14c98f97
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
@@ -0,0 +1,41 @@
+#<SYMDEFS># ARM Linker, 6140002: Last Updated: Fri May 14 11:47:35 2021
+0x08030001 T SE_APP_GetActiveFwInfo
+0x08030045 T SE_APP_SVC_Handler
+0x080311d1 T SE_SYS_SaveDisableIrq
+0x08031189 T SE_SYS_RestoreEnableIrq
+0x08030bdd T SE_KMS_Initialize
+0x080306fd T SE_KMS_Finalize
+0x080309ad T SE_KMS_GetInfo
+0x080309a9 T SE_KMS_GetFunctionList
+0x08030ac1 T SE_KMS_GetSlotList
+0x08030a65 T SE_KMS_GetSlotInfo
+0x08030b25 T SE_KMS_GetTokenInfo
+0x08030a01 T SE_KMS_GetMechanismInfo
+0x08030ce9 T SE_KMS_OpenSession
+0x080300c5 T SE_KMS_CloseSession
+0x08030115 T SE_KMS_CreateObject
+0x08030375 T SE_KMS_DestroyObject
+0x08030949 T SE_KMS_GetAttributeValue
+0x08030d55 T SE_KMS_SetAttributeValue
+0x08030805 T SE_KMS_FindObjectsInit
+0x08030751 T SE_KMS_FindObjects
+0x080307b1 T SE_KMS_FindObjectsFinal
+0x08030631 T SE_KMS_EncryptInit
+0x08030561 T SE_KMS_Encrypt
+0x08030695 T SE_KMS_EncryptUpdate
+0x080305cd T SE_KMS_EncryptFinal
+0x0803023d T SE_KMS_DecryptInit
+0x08030175 T SE_KMS_Decrypt
+0x0803029d T SE_KMS_DecryptUpdate
+0x080301dd T SE_KMS_DecryptFinal
+0x080304a1 T SE_KMS_DigestInit
+0x080303d1 T SE_KMS_Digest
+0x080304fd T SE_KMS_DigestUpdate
+0x0803043d T SE_KMS_DigestFinal
+0x08030e25 T SE_KMS_SignInit
+0x08030db9 T SE_KMS_Sign
+0x08030ef5 T SE_KMS_VerifyInit
+0x08030e89 T SE_KMS_Verify
+0x08030305 T SE_KMS_DeriveKey
+0x08030869 T SE_KMS_GenerateKeyPair
+0x080308e5 T SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/se_core_bin.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/se_core_bin.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..36c63d7a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,253 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1A00
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                     ; Top of Stack
+                DCD     Reset_Handler                    ; Reset Handler
+                DCD     NMI_Handler                      ; NMI Handler
+                DCD     HardFault_Handler                ; Hard Fault Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     SVC_Handler                      ; SVCall Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     PendSV_Handler                   ; PendSV Handler
+                DCD     SysTick_Handler                  ; SysTick Handler
+
+                ; External Interrupts                    
+                DCD     TZIC_ILA_IRQHandler              ; Security Interrupt controller illegal access Interrupts
+                DCD     PVD_PVM_IRQHandler               ; PVD and PVM detector
+                DCD     RTC_LSECSS_IRQHandler            ; RTC Wakeup + RTC Tamper and TimeStamp + RTC Alarms (A & B) + SSR Underflow and LSECSS Interrupts
+                DCD     RCC_FLASH_C1SEV_IRQHandler       ; RCC1 and FLASH and CPU1 M4 SEV Interrupts
+                DCD     EXTI1_0_IRQHandler               ; EXTI Line 1:0 Interrupts
+                DCD     EXTI3_2_IRQHandler               ; XTI Line 3:2 Interrupts
+                DCD     EXTI15_4_IRQHandler              ; EXTI Line 15:4 interrupts
+                DCD     ADC_COMP_DAC_IRQHandler          ; ADC, COMP1, COMP2, DAC Interrupts
+                DCD     DMA1_Channel1_2_3_IRQHandler     ; DMA1 Channel 1 to 3 Interrupts
+                DCD     DMA1_Channel4_5_6_7_IRQHandler   ; DMA1 Channels 4, 5, 6, 7 Interrupts
+                DCD     DMA2_DMAMUX1_OVR_IRQHandler      ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+                DCD     LPTIM1_IRQHandler                ; LPTIM1 global Interrupt
+                DCD     LPTIM2_IRQHandler                ; LPTIM2 global Interrupt
+                DCD     LPTIM3_IRQHandler                ; LPTIM3 global Interrupt
+                DCD     TIM1_IRQHandler                  ; TIM1 Interrupt
+                DCD     TIM2_IRQHandler                  ; TIM2 Interrupt
+                DCD     TIM16_IRQHandler                 ; TIM16 Interrupt
+                DCD     TIM17_IRQHandler                 ; TIM17 Interrupt
+                DCD     IPCC_C2_RX_C2_TX_IRQHandler      ; IPCC RX Occupied and TX Free Interrupt Interrupts
+                DCD     HSEM_IRQHandler                  ; Semaphore Interrupt
+                DCD     RNG_IRQHandler                   ; RNG Interrupt
+                DCD     AES_PKA_IRQHandler               ; AES and PKA Interrupts
+                DCD     I2C1_IRQHandler                  ; I2C1 Event and Error Interrupt
+                DCD     I2C2_IRQHandler                  ; I2C2 Event and Error Interrupt
+                DCD     I2C3_IRQHandler                  ; I2C3 Event and Error Interrupt
+                DCD     SPI1_IRQHandler                  ; SPI1 Interrupts
+                DCD     SPI2_IRQHandler                  ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                ; USART1 Interrupt
+                DCD     USART2_IRQHandler                ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler               ; LPUART1 Interrupt
+                DCD     SUBGHZSPI_IRQHandler             ; SUBGHZSPI Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler          ; SUBGHZ Radio Interrupt
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+                EXPORT  TZIC_ILA_IRQHandler            [WEAK]
+                EXPORT  PVD_PVM_IRQHandler             [WEAK]
+                EXPORT  RTC_LSECSS_IRQHandler          [WEAK]
+                EXPORT  RCC_FLASH_C1SEV_IRQHandler     [WEAK]
+                EXPORT  EXTI1_0_IRQHandler             [WEAK]
+                EXPORT  EXTI3_2_IRQHandler             [WEAK]
+                EXPORT  EXTI15_4_IRQHandler            [WEAK]
+                EXPORT  ADC_COMP_DAC_IRQHandler        [WEAK]
+                EXPORT  DMA1_Channel1_2_3_IRQHandler   [WEAK]
+                EXPORT  DMA1_Channel4_5_6_7_IRQHandler [WEAK]
+                EXPORT  DMA2_DMAMUX1_OVR_IRQHandler    [WEAK]
+                EXPORT  LPTIM1_IRQHandler              [WEAK]
+                EXPORT  LPTIM2_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler              [WEAK]
+                EXPORT  TIM1_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                [WEAK]
+                EXPORT  TIM16_IRQHandler               [WEAK]
+                EXPORT  TIM17_IRQHandler               [WEAK]
+                EXPORT  IPCC_C2_RX_C2_TX_IRQHandler    [WEAK]
+                EXPORT  HSEM_IRQHandler                [WEAK]
+                EXPORT  RNG_IRQHandler                 [WEAK]
+                EXPORT  AES_PKA_IRQHandler             [WEAK]
+                EXPORT  I2C1_IRQHandler                [WEAK]
+                EXPORT  I2C2_IRQHandler                [WEAK]
+                EXPORT  I2C3_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                [WEAK]
+                EXPORT  SPI2_IRQHandler                [WEAK]
+                EXPORT  USART1_IRQHandler              [WEAK]
+                EXPORT  USART2_IRQHandler              [WEAK]
+                EXPORT  LPUART1_IRQHandler             [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler           [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler        [WEAK]
+
+TZIC_ILA_IRQHandler
+PVD_PVM_IRQHandler
+RTC_LSECSS_IRQHandler
+RCC_FLASH_C1SEV_IRQHandler
+EXTI1_0_IRQHandler
+EXTI3_2_IRQHandler
+EXTI15_4_IRQHandler
+ADC_COMP_DAC_IRQHandler
+DMA1_Channel1_2_3_IRQHandler
+DMA1_Channel4_5_6_7_IRQHandler
+DMA2_DMAMUX1_OVR_IRQHandler   
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+LPTIM3_IRQHandler
+TIM1_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+IPCC_C2_RX_C2_TX_IRQHandler
+HSEM_IRQHandler
+RNG_IRQHandler
+AES_PKA_IRQHandler
+I2C1_IRQHandler
+I2C2_IRQHandler
+I2C3_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler
+USART2_IRQHandler
+LPUART1_IRQHandler
+SUBGHZSPI_IRQHandler
+SUBGHZ_Radio_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..5c25b669
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,365 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x200
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x100
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
new file mode 100644
index 00000000..58e587de
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SBSFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../CM0PLUS/SBSFU/App | ../../../CM0PLUS/SBSFU/Target | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM0PLUS.null.839446873" name="2_Images_SBSFU_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..55cfe378
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,303 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm0plus.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M0+ vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M0+ processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m0plus
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M0+ vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	0
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	TZIC_ILA_IRQHandler                  			/* TZIC ILA Interrupt                                 */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	RTC_LSECSS_IRQHandler                			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RCC_FLASH_C1SEV_IRQHandler           			/* RCC and FLASH and CPU1 M4 SEV Interrupt            */
+  .word	EXTI1_0_IRQHandler                   			/* EXTI Line 1:0 Interrupt                            */
+  .word	EXTI3_2_IRQHandler                   			/* EXTI Line 3:2 Interrupt                            */
+  .word	EXTI15_4_IRQHandler                  			/* EXTI Line 15:4 interrupt                           */
+  .word	ADC_COMP_DAC_IRQHandler              			/* ADC, COMP1, COMP2, DAC Interrupt                   */
+  .word	DMA1_Channel1_2_3_IRQHandler         			/* DMA1 Channel 1 to 3 Interrupt                      */
+  .word	DMA1_Channel4_5_6_7_IRQHandler       			/* DMA1 Channels 4,5,6,7 Interrupt                    */
+  .word	DMA2_DMAMUX1_OVR_IRQHandler          			/* DMA2 Channels[1..7] and DMAMUX Overrun Interrupts  */
+  .word	LPTIM1_IRQHandler                    			/* LPTIM1 Global Interrupt                            */
+  .word	LPTIM2_IRQHandler                    			/* LPTIM2 Global Interrupt                            */
+  .word	LPTIM3_IRQHandler                    			/* LPTIM3 Global Interrupt                            */
+  .word	TIM1_IRQHandler                      			/* TIM1 Global Interrupt                              */
+  .word	TIM2_IRQHandler                      			/* TIM2 Global Interrupt                              */
+  .word	TIM16_IRQHandler                     			/* TIM16 Global Interrupt                             */
+  .word	TIM17_IRQHandler                     			/* TIM17 Global Interrupt                             */
+  .word	IPCC_C2_RX_C2_TX_IRQHandler          			/* IPCC RX Occupied and TX Free Interrupt Interrupt   */
+  .word	HSEM_IRQHandler                      			/* Semaphore Interrupt                                */
+  .word	RNG_IRQHandler                       			/* RNG Interrupt                                      */
+  .word	AES_PKA_IRQHandler                   			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	I2C1_IRQHandler                      			/* I2C1 Event and Error Interrupt                     */
+  .word	I2C2_IRQHandler                      			/* I2C2 Event and Error Interrupt                     */
+  .word	I2C3_IRQHandler                      			/* I2C3 Event and Error Interrupt                     */
+  .word	SPI1_IRQHandler                      			/* SPI1 Interrupt                                     */
+  .word	SPI2_IRQHandler                      			/* SPI2 Interrupt                                     */
+  .word	USART1_IRQHandler                    			/* USART1 Interrupt                                   */
+  .word	USART2_IRQHandler                    			/* USART2 Interrupt                                   */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 Interrupt                                  */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI Interrupt                                */
+  .word	SUBGHZ_Radio_IRQHandler              			/* SUBGHZ Radio Interrupt                             */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	TZIC_ILA_IRQHandler
+	.thumb_set TZIC_ILA_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	RTC_LSECSS_IRQHandler
+	.thumb_set RTC_LSECSS_IRQHandler,Default_Handler
+
+	.weak	RCC_FLASH_C1SEV_IRQHandler
+	.thumb_set RCC_FLASH_C1SEV_IRQHandler,Default_Handler
+
+	.weak	EXTI1_0_IRQHandler
+	.thumb_set EXTI1_0_IRQHandler,Default_Handler
+
+	.weak	EXTI3_2_IRQHandler
+	.thumb_set EXTI3_2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_4_IRQHandler
+	.thumb_set EXTI15_4_IRQHandler,Default_Handler
+
+	.weak	ADC_COMP_DAC_IRQHandler
+	.thumb_set ADC_COMP_DAC_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_2_3_IRQHandler
+	.thumb_set DMA1_Channel1_2_3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_5_6_7_IRQHandler
+	.thumb_set DMA1_Channel4_5_6_7_IRQHandler,Default_Handler
+
+	.weak	DMA2_DMAMUX1_OVR_IRQHandler
+	.thumb_set DMA2_DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	TIM1_IRQHandler
+	.thumb_set TIM1_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	IPCC_C2_RX_C2_TX_IRQHandler
+	.thumb_set IPCC_C2_RX_C2_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	AES_PKA_IRQHandler
+	.thumb_set AES_PKA_IRQHandler,Default_Handler
+
+	.weak	I2C1_IRQHandler
+	.thumb_set I2C1_IRQHandler,Default_Handler
+
+	.weak	I2C2_IRQHandler
+	.thumb_set I2C2_IRQHandler,Default_Handler
+
+	.weak	I2C3_IRQHandler
+	.thumb_set I2C3_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
new file mode 100644
index 00000000..164c4ed1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SECoreBin.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SECoreBin&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161&quot;,&quot;fPerformBuild&quot;:false,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="8000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SBSFU.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM0PLUS"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM0PLUS"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
new file mode 100644
index 00000000..05aa5e0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
@@ -0,0 +1,40 @@
+SE_APP_GetActiveFwInfo
+SE_APP_SVC_Handler
+SE_SYS_SaveDisableIrq
+SE_SYS_RestoreEnableIrq
+SE_KMS_Initialize
+SE_KMS_Finalize
+SE_KMS_GetInfo
+SE_KMS_GetFunctionList
+SE_KMS_GetSlotList
+SE_KMS_GetSlotInfo
+SE_KMS_GetTokenInfo
+SE_KMS_GetMechanismInfo
+SE_KMS_OpenSession
+SE_KMS_CloseSession
+SE_KMS_CreateObject
+SE_KMS_DestroyObject
+SE_KMS_GetAttributeValue
+SE_KMS_SetAttributeValue
+SE_KMS_FindObjectsInit
+SE_KMS_FindObjects
+SE_KMS_FindObjectsFinal
+SE_KMS_EncryptInit
+SE_KMS_Encrypt
+SE_KMS_EncryptUpdate
+SE_KMS_EncryptFinal
+SE_KMS_DecryptInit
+SE_KMS_Decrypt
+SE_KMS_DecryptUpdate
+SE_KMS_DecryptFinal
+SE_KMS_DigestInit
+SE_KMS_Digest
+SE_KMS_DigestUpdate
+SE_KMS_DigestFinal
+SE_KMS_SignInit
+SE_KMS_Sign
+SE_KMS_VerifyInit
+SE_KMS_Verify
+SE_KMS_DeriveKey
+SE_KMS_GenerateKeyPair
+SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
new file mode 100644
index 00000000..38cca5bb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SB" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2015646735" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1427517226" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.219198562" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.717379913" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1323484811" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.358650252" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.437904655" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1049432240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM4/Inc | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core ||  ||  || USE_HAL_DRIVER | STM32WL55xx ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SB_cm4.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.857176010" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1383605403" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.758517685" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.92741657" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.261244217" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1809731028" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1152988115" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1052358781" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.209012098" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM4/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1008796121" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.189316865" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.85880463" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.964611899" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.360401545" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.974389923" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.94946969" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2140178522" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1240986986" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2113270654" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1941785021" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.483477110" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1843769445" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1745519627" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1919967923" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1803902265" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.854144635" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.438689590" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM4.null.2010752311" name="2_Images_SBSFU_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
new file mode 100644
index 00000000..88b95568
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU_CM4</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/Common/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Common/sfu_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Common/sfu_low_level_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_low_level_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Common/sfu_low_level_flash_ext.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_low_level_flash_ext.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Common/sfu_low_level_flash_int.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_low_level_flash_int.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_com_loader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/sfu_com_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_loader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/sfu_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_new_image.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/sfu_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_hsem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
new file mode 100644
index 00000000..8d27486b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SB.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SB.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM4"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/readme.txt
new file mode 100644
index 00000000..bd7bd4f9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SBSFU/readme.txt
@@ -0,0 +1,187 @@
+/**
+  @page 2_Images_SBSFU / Secure Boot and Secure Firmware Update Demo Application (Dual Core)
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows Secure Boot and Secure Firmware Update example.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
+In addition, Secure Boot (Root of Trust services) checks and activates the STM32 security mechanisms, and checks the
+authenticity and integrity of user application code before every execution to ensure that invalid or malicious code
+cannot be run. The Secure Firmware Update application receives the encrypted firmware image, decrypts it, then checks
+the authenticity and integrity of the code before installing it.
+
+The secure key management services provide cryptographic services to the user application through the pkcs11 APIs
+(KEY ID based APIs) that are executed inside a protected and isolated environment. User application keys are stored in
+the protected and isolated environment. They can be updated in a secure way (authenticity check, data decryption and
+data integrity check).
+
+This example supports multiple images feature configured with 2 active images for
+execution from internal flash and 1 download area also located in internal flash.
+This example allows to demonstrate features like:
+   - download a new firmware image from the application
+   - resume firmware update procedure in case of power off during installation
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from the
+STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, SBSFU, GTZC, Dual core, MPU
+
+@par Directory contents
+
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/main.c                           Main M0+ application file
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              M0+ HAL MSP module
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c                   STM32 M0+ interrupt handlers
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h                         Hardware definition for application
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/main.h                           Header file for M0+ main.c
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h          M0+ BSP configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             M0+ HAL configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h                   Header file for M0+ stm32wlxx_it.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c                     SBSFU errors management
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c              SBSFU image handling: common functionalities/services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c                SBSFU image handling: FW upgrade without swap area services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c             SBSFU image handling: FW upgrade with swap area services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c                       Key management service blob importation handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c             Secure Engine isolation with MPU (when no Firewall is available)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c                      SBSFU security protection automatic test
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h                       Software configuration of M0+ SBSFU application
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h                      Header file for sfu_boot.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h                     Header file for sfu_error.c file
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h                SBSFU FSM states definitions
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h                       Header file for sfu_kms.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h             Header file for sfu_mpu_isolation.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h                      Header file for sfu_test.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c     SBSFU security low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h     Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Src/main.c                                    Main M4 application file
+   - 2_Images_SBSFU/CM4/Src/sfu_com_loader.c                          SBSFU communication module: local loader part
+   - 2_Images_SBSFU/CM4/Src/sfu_loader.c                              SBSFU Local Loader
+   - 2_Images_SBSFU/CM4/Src/sfu_low_level_security.c                  M4 SB security low level interface
+   - 2_Images_SBSFU/CM4/Src/sfu_new_image.c                           SBSFU image handling: new image storage and installation request
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c                       M4 HAL MSP module
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_it.c                            STM32 M4 interrupt handlers
+   - 2_Images_SBSFU/CM4/Inc/app_sfu.h                                 Software configuration of M4 SB application
+   - 2_Images_SBSFU/CM4/Inc/main.h                                    Header file for M4 main.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_boot.h                                Definitions for Secure Boot (SB) flow control
+   - 2_Images_SBSFU/CM4/Inc/sfu_com_loader.h                          Header file for sfu_com_loader.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_loader.h                              Header file for sfu_loader.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h                  Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Inc/sfu_new_image.h                           Header file for sfu_new_image.c
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h                      M4 HAL configuration file
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h                            Header file for M4 stm32wlxx_it.c
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h                   M4 BSP configuration file
+   - 2_Images_SBSFU/Common/sfu_com_trace.c                            SBSFU communication module: trace part
+   - 2_Images_SBSFU/Common/sfu_low_level.c                            SBSFU general low level interface
+   - 2_Images_SBSFU/Common/sfu_low_level_flash.c                      SBSFU flash low level interface (wrapper)
+   - 2_Images_SBSFU/Common/sfu_low_level_flash_ext.c                  SBSFU external flash low level interface
+   - 2_Images_SBSFU/Common/sfu_low_level_flash_int.c                  SBSFU internal flash low level interface
+   - 2_Images_SBSFU/Common/app_sfu_common.h                           Common software configuration of M4 SB and M0+ SBSFU applications
+   - 2_Images_SBSFU/Common/sfu_com_trace.h                            Header file for sfu_com_trace.c
+   - 2_Images_SBSFU/Common/sfu_def.h                                  General definition for SBSFU application
+   - 2_Images_SBSFU/Common/sfu_fwimg_regions.h                        FLASH regions definitions for image handling
+   - 2_Images_SBSFU/Common/sfu_low_level.h                            Header file for general low level interface
+   - 2_Images_SBSFU/Common/sfu_low_level_flash.h                      Header file for flash low level interface (wrapper)
+   - 2_Images_SBSFU/Common/sfu_low_level_flash_ext.h                  Header external file for flash low level interface
+   - 2_Images_SBSFU/Common/sfu_low_level_flash_int.h                  Header internal file for flash low level interface
+   - 2_Images_SBSFU/Common/sfu_trace.h                                Header file for sfu_trace.c
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices.
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
+   - This example needs a terminal emulator.
+   - By default, SBSFU is configured in development mode. To switch in production mode, refer to AN5056 "Integration
+     guide - software expansion for STM32Cube" available from the STMicroelectronics microcontroller website
+     www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files.
+     As a workaround, it is advised to use the subst.exe command from within a command prompt to set up a local drive
+     out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par How to use it ?
+
+Several steps to run SBSFU application :
+
+1. Compile projects in the following order. This is mandatory as each project requests some objects generated by the
+   compilation of the previous one:
+   - 2_Images_SECoreBin (see also SECoreBin/readme.txt)
+   - 2_Images_SBSFU (using both CM4 and CM0+ workspaces)
+   - 2_Images_UserApp_M0Plus (see also UserApp_M0Plus/readme.txt)
+   - 2_Images_UserApp_M4 (see also UserApp_M4/readme.txt)
+
+2. Before loading SBSFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that the
+   following are valid for the device:
+   - RDP Level 0
+   - Write Protection disabled on all FLASH pages
+   - Chip has been erased
+
+3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator that can be downloaded
+   from https://osdn.net/projects/ttssh2/) for UART connection with the board.
+   Support of YMODEM protocol is required. Serial port configuration should be :
+   - Baud rate = 115200
+   - Data = 8 bits
+   - Parity = none
+   - Stop = 1 bit
+   - Flow control = none
+
+4. Load CM4 SB image and CM0+ SBSFU image into target memory with your preferred toolchain or STM32CubeProgammer.
+
+5. Once the SB_SFU software is downloaded, power cycle the board (unplug/plug USB cable) : the SBSFU application starts
+   and configures the security mechanisms.
+
+6. Power cycle the board a second time (unplug/plug the USB cable): the SBSFU application starts with the configured
+   securities turned on and the Tera Term connection is possible.
+   Caution: Make sure to use an up-to-date version of ST-LINK firmware else SBSFU may not start.
+
+7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
+   Red LED blinks every 500 ms when waiting for the CM0+ SBSFU to boot.
+   Green LED blinks every 100 ms when CM0+ and/or CM4 firmware image(s) need(s) to be downloaded.
+   Red LED blinks every 3 seconds when a local download is waited.
+   A reboot occurs in case of error in option bytes configuration.
+
+8. Send the first user encrypted firmware file (\2_Images\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \2_Images\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+9. Send the second user encrypted firmware file (\2_Images\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \2_Images\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
+Note2 : As TAMPER detection can be very sensitive, the protection is disabled by default.
+        Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
+Note3 : for Linux users Minicom can be used but to do so you need to compile the SBSFU project with the MINICOM_YMODEM
+        switch enabled (app_sfu.h)
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/ECCKEY2.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/ECCKEY2.txt
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/nonce.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/nonce.bin
new file mode 100644
index 00000000..020162be
Binary files /dev/null and b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Binary/nonce.bin differ
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
new file mode 100644
index 00000000..2f7e96cc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
@@ -0,0 +1,1183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+          <state>KMS_ENABLED</state>
+          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
+          <state>IT_MANAGEMENT_DISABLED</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$</state>
+          <state>$PROJ_DIR$\..\..\LoRaWAN_End_Node_DualCore\CM0PLUS\LoRaWAN\App</state>
+          <state>$PROJ_DIR$\..\..\LoRaWAN_End_Node_DualCore\CM0PLUS\LoRaWAN\Target</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
+        <postbuild></postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>SE_CallGate</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
+      </file>
+    </group>
+    <group>
+      <name>Third_Party</name>
+      <group>
+        <name>mbed-crypto</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
+        </file>
+      </group>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..26b413e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,180 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% %headerbin%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %partialbin% %partialsfu%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..a3771bf0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,169 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o %offset% %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% -o %offset% --pfw %partialbin% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..e4cd0fb1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,179 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o %offset% %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %partialbin% %partialsfu%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% -o %offset% --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/EWARM/prebuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..1672cb97
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,30 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit};
+
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
+place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
+place in SE_CODE_NOKEY_ROM_region {readonly};
+place in User_Key_ROM_region { section .USER_embedded_Keys };
+keep { section .USER_embedded_Keys };
+place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
+keep { section .SE_embedded_Keys };
+place in SE_RAM_region {readwrite, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/ca_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/ca_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
new file mode 100644
index 00000000..64ef96b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains the low level definitions of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_H
+#define CA_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+/*
+ * STM32 target HAL driver include
+ * ex: stm32l4xx_hal.h
+ */
+#include "stm32wlxx_hal.h"
+
+/* Exported constants --------------------------------------------------------*/
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * AES/CRYP instance to use
+ * ex: AES1
+ */
+#define CA_AES_INSTANCE     (AES)
+
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * PKA instance to use
+ * ex: PKA
+ */
+#define CA_PKA_INSTANCE     (PKA)
+
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+
+/* Exported function ---------------------------------------------------------*/
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+void CA_LL_CRC_Init(void);
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_config.h
new file mode 100644
index 00000000..20ad4cb3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_config.h
@@ -0,0 +1,530 @@
+/**
+  ******************************************************************************
+  * @file    kms_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Key Management Services (KMS)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_CONFIG_H
+#define KMS_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @defgroup KMS_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup KMS_HW_Config Hardware
+  * @{
+  */
+
+/**
+  * @brief KMS_EXT_TOKEN_ENABLED Uncomment the below line to support External Token
+  */
+/*#define KMS_EXT_TOKEN_ENABLED*/
+
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Storage_Config Storage
+  * @{
+  */
+
+/**
+  * @brief KMS_NVM_ENABLED Uncomment the below line to support Non Volatile
+  *        Memory storage
+  * @note  Mandatory to handle runtime objects addition through blob import or
+  *        creation through specific KMS services
+  */
+#define KMS_NVM_ENABLED
+
+/**
+  * @brief KMS_NVM_DYNAMIC_ENABLED Uncomment the below line to support Non
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  * @note  Requires @ref KMS_NVM_ENABLED to be defined
+  */
+#define KMS_NVM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_NVM_SLOT_NUMBERS Specify here the number of slots to use in the Non Volatile Memory storage
+  * @note  NVM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into NVM. But if you intend to manipulate objects (create, destroy, derivate...) better use a greater
+  *        number to avoid too much erase of the flash sectors containing the NVM storage.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in NVM.
+  * @note  Mandatory to set if @ref KMS_NVM_ENABLED is defined
+  */
+#define KMS_NVM_SLOT_NUMBERS                    (40UL)
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Config Services
+  * @{
+  */
+/**
+  * @brief KMS_NB_SESSIONS_MAX Defines the number of sessions KMS will be able
+  *        to handle in parallel
+  * @note  This value has an impact on memory footprint
+  */
+#define KMS_NB_SESSIONS_MAX                     (10UL)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_PKCS_Config PKCS#11 services
+  * @{
+  */
+
+/**
+  * @brief KMS_ENCRYPT Uncomment the below line to support encryption services
+  * @note  Requires a supported encryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_ENCRYPT
+
+/**
+  * @brief KMS_DECRYPT Uncomment the below line to support decryption services
+  * @note  Requires a supported decryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_DECRYPT
+
+/**
+  * @brief KMS_DIGEST Uncomment the below line to support digest services
+  * @note  Requires a supported digest algorithm to be enabled too:
+  *        @ref KMS_SHA1
+  *        @ref KMS_SHA256
+  */
+#define KMS_DIGEST
+
+/**
+  * @brief KMS_SIGN Uncomment the below line to support signature services
+  * @note  Requires a supported signature algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_SIGN
+
+/**
+  * @brief KMS_VERIFY Uncomment the below line to support verification services
+  * @note  Requires a supported verification algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_ECDSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_VERIFY
+
+/**
+  * @brief KMS_DERIVE_KEY Uncomment the below line to support key derivation services
+  * @note  Requires a supported derivation algorithm to be enabled too:
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  */
+#define KMS_DERIVE_KEY
+
+/**
+  * @brief KMS_SEARCH Uncomment the below line to support key search or mechanism search services
+  */
+#define KMS_SEARCH
+
+/**
+  * @brief KMS_GENERATE_KEYS Uncomment the below line to support key generation services
+  * @note  Requires a supported key generation algorithm to be enabled too:
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  */
+/*#define KMS_GENERATE_KEYS*/
+
+/**
+  * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  */
+#define KMS_ATTRIBUTES
+
+/**
+  * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  */
+#define KMS_OBJECTS
+
+/**
+  * @brief KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT Uncomment the below line to support C_GetFunctionList API
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT*/
+
+/**
+  * @brief KMS_PKCS11_COMPLIANCE Uncomment the below line to support PKCS11 APIs and implementation that are required
+  *        to be compliant with PKCS11 standard
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_COMPLIANCE*/
+
+/**
+  * @brief KMS_NIKMS_ROUTER_BYPASS Uncomment the below line to bypass KMS router and perform direct KMS API calls
+  * @note  Only applicable when using 'niKMS' access
+  * @note  Enabling this feature allows to save some code footprint, but forbid any use of the external token services
+  */
+/*#define KMS_NIKMS_ROUTER_BYPASS*/
+
+/**
+  * @brief KMS_IMPORT_BLOB Uncomment the below line to use vendor defined blob import features
+  * @note  Requires @ref KMS_NVM_ENABLED to store imported keys
+  * @note  Requires the following services and algorithm to Authenticate, Verify and decrypt the imported blobs:
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_DIGEST
+  *        @ref KMS_SHA256
+  *        @ref KMS_VERIFY
+  *        @ref KMS_ECDSA
+  *        @ref KMS_EC_SECP256
+  */
+#define KMS_IMPORT_BLOB
+
+/**
+  * @brief KMS_IMPORT_BLOB_CHUNK_SIZE Configure the blob importation chunk size
+  * @note  This size must be a multiple of 4
+  * @note  This size must be greater to at least the blob import header size
+  * @note  Requires @ref KMS_IMPORT_BLOB to be enabled
+  */
+#define KMS_IMPORT_BLOB_CHUNK_SIZE      (512U)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Memory_Config Memory management
+  * @{
+  */
+
+/**
+  * @brief KMS_MEM_USE_HEAP_ALLOCATOR Uncomment the below line to perform dynamic allocation in HEAP
+  * @note  KMS will use standard malloc and free APIs
+  * @note  Requires a dynamic allocator provided by the toolchain like dlmalloc
+  * @note  KMS_MEM_USE_HEAP_ALLOCATOR and KMS_MEM_USE_POOL_ALLOCATOR are mutually exclusive
+  */
+/*#define KMS_MEM_USE_HEAP_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_USE_POOL_ALLOCATOR Uncomment the below line to perform dynamic allocation using internal pool
+  *        allocator
+  * @note  Requires a pool definition in a file called kms_mem_pool_def.h (see kms_mem_pool_def_template.h for example)
+  */
+#define KMS_MEM_USE_POOL_ALLOCATOR
+
+/**
+  * @brief KMS_MEM_USE_CUSTOM_ALLOCATOR Uncomment the below line to perform dynamic
+  *        allocation using a custom allocator
+  * @note  To use this custom allocator, implement the kms_mem_low_level.c
+  *        - void KMS_MemInit(void)
+  *        - CK_VOID_PTR KMS_Alloc(CK_SESSION_HANDLE session, size_t size)
+  *        - void KMS_Free(CK_SESSION_HANDLE session, CK_VOID_PTR ptr)
+  */
+/*#define KMS_MEM_USE_CUSTOM_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_DEBUGGING Uncomment the below line to keep memory profiling information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_DEBUGGING
+
+/**
+  * @brief KMS_MEM_CLEANING Uncomment the below line to clean dynamically freed memory
+  * @note  The freed memory will be reset to 0
+  * @note  If using @ref KMS_MEM_USE_HEAP_ALLOCATOR, @ref KMS_MEM_DEBUGGING required
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_CLEANING
+
+/**
+  * @brief KMS_MEM_LOGGING Uncomment the below line to log memory allocation information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  * @note  Information about allocations will be transmitted to @ref KMS_LL_ReportMemAlloc and @ref KMS_LL_ReportMemFree
+  */
+/*#define KMS_MEM_LOGGING*/
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Security_Config Security Enforcement
+  * @{
+  */
+
+/**
+  * @brief KMS_SE_CHECK_PARAMS Uncomment the below line to check input & output parameters location vs secure enclave
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_CHECK_PARAMS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS Uncomment the below line to use key locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_KEYS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS_MAXIMUM Specify here the number of keys that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_KEYS is defined
+  */
+#define KMS_SE_LOCK_KEYS_MAX                 (10UL)
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES Uncomment the below line to use services locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_SERVICES
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES_MAX Specify here the number of services that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_SERVICES is defined
+  */
+#define KMS_SE_LOCK_SERVICES_MAX             (2UL)
+
+/**
+  * @}
+  */
+
+/** Function flag definition to be used to qualify algorithm usage **/
+
+#if defined(KMS_ENCRYPT)
+#define KMS_FCT_ENCRYPT         (1UL << 0)
+#else /* KMS_ENCRYPT */
+#define KMS_FCT_ENCRYPT         (0UL << 0)
+#endif /* KMS_ENCRYPT */
+#if defined(KMS_DECRYPT)
+#define KMS_FCT_DECRYPT         (1UL << 1)
+#else /* KMS_DECRYPT */
+#define KMS_FCT_DECRYPT         (0UL << 1)
+#endif /* KMS_DECRYPT */
+#if defined(KMS_SIGN)
+#define KMS_FCT_SIGN            (1UL << 2)
+#else /* KMS_SIGN */
+#define KMS_FCT_SIGN            (0UL << 2)
+#endif /* KMS_SIGN */
+#if defined(KMS_VERIFY)
+#define KMS_FCT_VERIFY          (1UL << 3)
+#else /* KMS_VERIFY */
+#define KMS_FCT_VERIFY          (0UL << 3)
+#endif /* KMS_VERIFY */
+#if defined(KMS_DERIVE_KEY)
+#define KMS_FCT_DERIVE_KEY      (1UL << 4)
+#else /* KMS_DERIVE_KEY */
+#define KMS_FCT_DERIVE_KEY      (0UL << 4)
+#endif /* KMS_DERIVE_KEY */
+#if defined(KMS_GENERATE_KEYS)
+#define KMS_FCT_GENERATE_KEYS   (1UL << 5)
+#else /* KMS_GENERATE_KEYS */
+#define KMS_FCT_GENERATE_KEYS   (0UL << 5)
+#endif /* KMS_GENERATE_KEYS */
+#if defined(KMS_DIGEST)
+#define KMS_FCT_DIGEST          (1UL << 6)
+#else /* KMS_DIGEST */
+#define KMS_FCT_DIGEST          (0UL << 6)
+#endif /* KMS_DIGEST */
+
+/** @defgroup KMS_Features_Config Features
+  * @{
+  */
+
+/**
+  * @brief KMS_AES_CBC Uncomment the below line to support AES CBC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_CBC           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CCM Uncomment the below line to support AES CCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+/*#define KMS_AES_CCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)*/
+
+/**
+  * @brief KMS_AES_ECB Uncomment the below line to support AES ECB algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_DERIVE_KEY
+  */
+#define KMS_AES_ECB           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY)
+
+/**
+  * @brief KMS_AES_GCM Uncomment the below line to support AES GCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_GCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CMAC Uncomment the below line to support AES CMAC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  */
+#define KMS_AES_CMAC          (KMS_FCT_SIGN|KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_RSA Uncomment the below line to support RSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  * @note  Requires at least one of the following RSA modulus length to be enabled:
+  *        @ref KMS_RSA_1024
+  *        @ref KMS_RSA_2048
+  */
+/* #define KMS_RSA               (KMS_FCT_SIGN|KMS_FCT_VERIFY) */
+
+/**
+  * @brief KMS_RSA_1024 Uncomment the below line to support RSA 1024 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+/* #define KMS_RSA_1024 */
+
+/**
+  * @brief KMS_RSA_2048 Uncomment the below line to support RSA 2048 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+/* #define KMS_RSA_2048 */
+
+/**
+  * @brief KMS_ECDSA Uncomment the below line to support ECDSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  *        - KMS_FCT_GENERATE_KEYS    This algorithm can be used to perform key generation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_VERIFY
+  *        @ref KMS_DERIVE_KEY
+  *        @ref KMS_GENERATE_KEYS
+  * @note  Requires at least one of the following elliptic curve to be enabled:
+  *        @ref KMS_EC_SECP192
+  *        @ref KMS_EC_SECP256
+  *        @ref KMS_EC_SECP384
+  */
+#define KMS_ECDSA             (KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_EC_SECP192 Uncomment the below line to support elliptic curve SECP-192
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP192*/
+
+/**
+  * @brief KMS_EC_SECP256 Uncomment the below line to support elliptic curve SECP-256
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+#define KMS_EC_SECP256
+
+/**
+  * @brief KMS_EC_SECP384 Uncomment the below line to support elliptic curve SECP-384
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP384*/
+
+/**
+  * @brief KMS_SHA1 Uncomment the below line to support SHA1 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+/*#define KMS_SHA1              (KMS_FCT_DIGEST)*/
+
+/**
+  * @brief KMS_SHA256 Uncomment the below line to support SHA256 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+#define KMS_SHA256            (KMS_FCT_DIGEST)
+
+
+
+/** @defgroup KMS_Debug_Config Debug
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
new file mode 100644
index 00000000..ae3e8d6b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef KMS_LOW_LEVEL_H
+#define KMS_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup KMS_LL_Exported_Constants Exported Constants
+  * @{
+  */
+
+#define KMS_LL_ERROR_MEM_ALLOC_FAILURE    (0x00000001UL)    /*!< Memory allocation failure error */
+#define KMS_LL_ERROR_MEM_FREE_CANARY      (0x00000002UL)    /*!< Memory free detected altered canaries error */
+#define KMS_LL_ERROR_MEM_FREE_NULL_PTR    (0x00000003UL)    /*!< Memory free detected a NULL pointer error */
+#define KMS_LL_ERROR_MEM_FREE_UNKNOWN     (0x00000004UL)    /*!< Memory free detected an unknown pointer error */
+
+/**
+  * @}
+  */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_LL_Exported_Functions Exported Functions
+  * @{
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length);
+uint32_t KMS_LL_FLASH_GetBlobDownloadAddress(void);
+
+#ifdef KMS_SE_CHECK_PARAMS
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize);
+#endif /* KMS_SE_CHECK_PARAMS */
+
+void KMS_LL_ReportError(uint32_t error);
+
+void KMS_LL_ReportMemInit(void);
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem);
+void KMS_LL_ReportMemFree(void *pmem);
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t KMS_LL_GetLR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif /* KMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
new file mode 100644
index 00000000..a5f54fbf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
@@ -0,0 +1,54 @@
+/**
+  ******************************************************************************
+  * @file    kms_mem_pool_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          memory pool definition
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Recursive inclusion autorised ---------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * POOL DESCRIPTION
+ */
+
+/*
+ * Memory pools definition:
+ * 2 pools of 256
+ * 1 pool of 512
+ * 2 pools of 1K
+ * 1 pool of 5K
+ */
+
+KMS_MEM_DECLARE_POOL_START()
+KMS_MEM_DECLARE_POOL_ENTRY(1, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(2, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(3, 512)
+KMS_MEM_DECLARE_POOL_ENTRY(4, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(5, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(6, 5 * 1024)
+KMS_MEM_DECLARE_POOL_END()
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
new file mode 100644
index 00000000..8ab87950
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
@@ -0,0 +1,508 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_CONFIG_H
+#define KMS_PLATF_OBJECTS_CONFIG_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "kms_platf_objects_interface.h"
+#include "app_sfu.h"
+#include "Commissioning.h"
+#include "lorawan_conf.h" /* KEY_EXTRACTABLE */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RAW_TO_INT32A(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
+0x##a##b##c##d, 0x##e##f##g##h, 0x##i##j##k##l, 0x##m##n##o##p
+
+#define FORMAT_KEY_32(...) RAW_TO_INT32A(__VA_ARGS__)
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_PLATF Platform Objects
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_PLATF_Exported_Constants Exported Constants
+  * @note KMS support different type of objects, their respective ranges are
+  *       defined here
+  * @{
+  */
+
+/* We consider that the ORDER (static = lower ids) will be kept. */
+#define KMS_INDEX_MIN_EMBEDDED_OBJECTS       1UL   /*!< Embedded objects min ID. Must be > 0 as '0' is never a
+                                                        valid key index */
+#define KMS_INDEX_MAX_EMBEDDED_OBJECTS       (KMS_INDEX_MIN_EMBEDDED_OBJECTS+19UL)    /*!< Embedded objects max ID */
+#define KMS_INDEX_MIN_NVM_STATIC_OBJECTS     (KMS_INDEX_MAX_EMBEDDED_OBJECTS+1UL)     /*!< NVM static objects min ID */
+#define KMS_INDEX_MAX_NVM_STATIC_OBJECTS     (KMS_INDEX_MIN_NVM_STATIC_OBJECTS+19UL)  /*!< NVM static objects max ID */
+
+#define KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MAX_NVM_STATIC_OBJECTS+1UL)   /*!< NVM dynamic objects min ID */
+#define KMS_INDEX_MAX_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS+19UL) /*!< NVM dynamic objects max ID */
+
+/* Blob import key index */
+#define KMS_INDEX_BLOBIMPORT_VERIFY       (1U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob verification key is stored */
+#define KMS_INDEX_BLOBIMPORT_DECRYPT      (2U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob decryption key is stored */
+
+/**
+  * @}
+  */
+
+/*
+ * Embedded objects definition
+ *
+ */
+#ifdef KMS_PLATF_OBJECTS_C
+/** @addtogroup KMS_PLATF_Private_Variables Private Variables
+  * @{
+  */
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".SE_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".SE_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 24);
+KMS_DECLARE_BLOB_STRUCT(, 30);
+KMS_DECLARE_BLOB_STRUCT(, 256);
+
+/* This object is used for KMS blob header signature                 */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   KMS_Blob_ECDSA_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  1,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_BLOB_KEY@
+  }
+};
+
+/* This object is used for KMS blob encryption                    */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   KMS_Blob_AES_CBC128_Decrypt =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  2,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_BLOB_KEY@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_1_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  3,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_1@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_2_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_2@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /*(SFU_NB_MAX_ACTIVE_IMAGE > 1U)*/
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_3_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_3@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_1_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  6,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_1@
+  }
+};
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_2_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  7,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_2@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_3_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  8,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_3@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif
+
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".USER_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".USER_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 21);
+KMS_DECLARE_BLOB_STRUCT(, 27);
+
+/* These objects are used by user tKMS application                 */
+#if defined(__GNUC__)
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
+#endif
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_Zero_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  13,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    CKA_DERIVE,       sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_App_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  14,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_Nwk_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  15,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_21_t   Lorawan_Nwk_S_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  16,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_21_t   Lorawan_App_S_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  17,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#elif defined(__GNUC__)
+#pragma GCC pop_options
+#endif
+
+/**
+  * @brief  KMS embedded objects definition
+  * @note   Must contains KMS blob verification and decryption keys
+  */
+static const kms_obj_keyhead_t *const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBEDDED_OBJECTS -
+                                                                    KMS_INDEX_MIN_EMBEDDED_OBJECTS + 1] =
+{
+#if defined(KMS_IMPORT_BLOB)
+  /* KMS Blob import keys */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_ECDSA_Verify,       /* Index = 1 */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_AES_CBC128_Decrypt, /* Index = 2 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 1 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 2 */
+#endif /* KMS_IMPORT_BLOB */
+  /* SBSFU keys */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_1_128,             /* Index = 3 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_2_128,             /* Index = 4 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_3_128,             /* Index = 5 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 3 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_1_Verify,        /* Index = 6 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_2_Verify,        /* Index = 7 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_3_Verify,        /* Index = 8 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 12 */
+  /* UserApp example keys */
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+  (kms_obj_keyhead_t *) &Lorawan_Zero_Key,                      /* Index = 13 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 13 */
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+  (kms_obj_keyhead_t *) &Lorawan_App_Key,                       /* Index = 14 */
+  (kms_obj_keyhead_t *) &Lorawan_Nwk_Key,                       /* Index = 15 */
+  (kms_obj_keyhead_t *) &Lorawan_Nwk_S_Key,                     /* Index = 16 */
+  (kms_obj_keyhead_t *) &Lorawan_App_S_Key,                     /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 20 */
+};
+
+/**
+  * @}
+  */
+#endif /* KMS_PLATF_OBJECTS_C */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
new file mode 100644
index 00000000..884019aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
@@ -0,0 +1,70 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_interface.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_INTERFACE_H
+#define KMS_PLATF_OBJECTS_INTERFACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* KMS exported Object handles for Secure Boot */
+
+/* SBSFU Root CA Certificate */
+#define KMS_SBSFU_ROOT_CA_CRT_LABEL           "SBSFURootCACertificate"  /*!< SBSFU Root CA Certificate Label */
+#define KMS_SBSFU_ROOT_CA_CRT_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)9)  /*!< SBSFU Root CA Certificate object handle */
+
+/* OEM Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_LABEL           "OEMIntermCACertificate_1"  /*!< OEM 1 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_LABEL           "OEMIntermCACertificate_2"  /*!< OEM 2 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_LABEL           "OEMIntermCACertificate_3"  /*!< OEM 3 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)10)  /*!< OEM 1 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)11)  /*!< OEM 2 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)12)  /*!< OEM 3 Interm CA Certificate object handle */
+
+
+#define KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)3)
+#define KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)4)
+#define KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)5)
+#define KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)6)
+#define KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)7)
+#define KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)8)
+
+/* KMS exported Object handles for tKMS test application */
+#define KMS_KEY_RSA2048_OBJECT_HANDLE                 ((CK_OBJECT_HANDLE)21)
+#define KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE        ((CK_OBJECT_HANDLE)22)
+
+/*  Object handles for user application */
+#define KMS_ZERO_KEY_OBJECT_HANDLE                    ((CK_OBJECT_HANDLE)13)
+#define KMS_APP_KEY_OBJECT_HANDLE                     ((CK_OBJECT_HANDLE)14)
+#define KMS_NWK_KEY_OBJECT_HANDLE                     ((CK_OBJECT_HANDLE)15)
+#define KMS_NWK_S_KEY_OBJECT_HANDLE                   ((CK_OBJECT_HANDLE)16)
+#define KMS_APP_S_KEY_OBJECT_HANDLE                   ((CK_OBJECT_HANDLE)17)
+#define LAST_KMS_KEY_OBJECT_HANDLE                    ((CK_OBJECT_HANDLE)18)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_INTERFACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/mbed_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/Inc/mbed_crypto_config.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
new file mode 100644
index 00000000..8ebb6f6f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
@@ -0,0 +1,142 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef NVMS_LOW_LEVEL_H
+#define NVMS_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Constants Exported Constants
+  * @{
+  */
+#define NVMS_LL_BLOCK0_ADDRESS   KMS_DATASTORAGE_START
+#define NVMS_LL_BLOCK1_ADDRESS   (KMS_DATASTORAGE_START + NVMS_LL_BLOCK_SIZE)
+
+#define NVMS_LL_NB_PAGE_PER_BLOCK  (NVMS_LL_BLOCK_SIZE / FLASH_PAGE_SIZE)
+#define NVMS_LL_BLOCK_SIZE         ((KMS_DATASTORAGE_END- KMS_DATASTORAGE_START + 1U) / 2U)
+
+#define NVMS_LL_ERASED           0xFFFFFFFFU
+
+/* not physical flash page size, but writing granularity size -> 8 bytes */
+#define NVMS_LL_PAGE_SIZE    8UL
+
+/**
+  * @}
+  */
+
+/* Exported types ------------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief   Block identifiers.
+  */
+typedef enum
+{
+  NVMS_BLOCK0 = 0,
+  NVMS_BLOCK1 = 1,
+} nvms_block_t;
+
+
+/**
+  * @}
+  */
+
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+void NVMS_LL_Init(void);
+bool NVMS_LL_IsBlockErased(nvms_block_t block);
+bool NVMS_LL_BlockErase(nvms_block_t block);
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size);
+
+/* Exported in line functions ------------------------------------------------*/
+
+/**
+  * @brief   Returns the base address of the specified flash block
+  * @param   block block identifier
+  * @retval  pointer to the block base
+  */
+static inline uint32_t NVMS_LL_GetBlockAddress(nvms_block_t block)
+{
+
+  if (block == NVMS_BLOCK0)
+  {
+    return (uint32_t)NVMS_LL_BLOCK0_ADDRESS;
+  }
+  return (uint32_t)NVMS_LL_BLOCK1_ADDRESS;
+}
+
+
+/**
+  * @brief   Returns the size of the flash blocks
+  * @note    Blocks are required to be of equal size
+  * @retval  Block size
+  */
+static inline size_t NVMS_LL_GetBlockSize(void)
+{
+
+  return NVMS_LL_BLOCK_SIZE;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NVMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
new file mode 100644
index 00000000..8a159341
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    se_crypto_config.h
+  * @author  MCD Application Team
+  *          This file provides a template to configure the crypto scheme used
+  *          for the services used by the bootloader (crypto operations for the
+  *          Firmware and Metadata).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_CRYPTO_CONFIG_H
+#define SE_CRYPTO_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup SE_CRYPTO SE Crypto
+  * @{
+  */
+
+/** @defgroup SE_CRYPTO_CONFIG SE Crypto scheme configuration
+  * @brief Choose the cryptographic scheme you want the bootloader to use.
+  *        These settings apply to the services used by the bootloader only, not to the services called by the User
+  *        Application.
+  * @{
+  */
+
+/**
+  * SE_CoreBin instantiates the crypto scheme selected thanks to "SECBOOT_CRYPTO_SCHEME".
+  * "SECBOOT_CRYPTO_SCHEME" is composed as indicated below:
+  *        SECBOOT_authenticationalgo_encryptionalgo_MACalgo
+  *
+  * Set "SECBOOT_CRYPTO_SCHEME" to one of the values listed below:
+  *
+  * SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256: no FW encryption, only Authentication and Integrity are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           No Firmware encryption.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           Decrypt Firmware Image with AES128-CBC.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using AES128-GCM tag.
+  *                           Decrypt Firmware image using AES128-GCM algo.
+  *                           Firmware Image Integrity using AES128-GCM tag.
+  */
+#define SECBOOT_CRYPTO_SCHEME SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256     /*!< Selected Crypto Scheme */
+
+#define SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256        (1U) /*!< asymmetric crypto, no FW encryption           */
+#define SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256        (2U) /*!< asymmetric crypto with encrypted Firmware     */
+#define SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM     (3U) /*!< symmetric crypto                              */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_CRYPTO_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
new file mode 100644
index 00000000..85f027a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
@@ -0,0 +1,215 @@
+/**
+  ******************************************************************************
+  * @file    se_def_metadata.h
+  * @author  MCD Application Team
+  * @brief   This file contains metadata definitions for SE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_DEF_METADATA_H
+#define SE_DEF_METADATA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "se_crypto_config.h"
+
+/** @addtogroup  SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup  SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup  SE_CORE_DEF SE Definitions
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA SE Metadata Definitions
+  *  @brief definitions related to FW metadata (header).
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Constants Exported Constants
+  * @brief  Firmware Image Header (FW metadata) constants
+  * @{
+  */
+
+#define SE_FW_HEADER_TOT_LEN    (sizeof(SE_FwRawHeaderTypeDef))   /*!< FW INFO header Total Length */
+#define SE_FW_HEADER_SIGN_LEN   SE_HEADER_SIGN_LEN                /*!< FW Header signature Len */
+#define SE_FW_HEADER_STATE_LEN  (3U * 32U)                        /*!< FW Header state Len */
+#define SE_FW_HEADER_FINGERPRINT_LEN  (32U)                       /*!< FW Header finger print Len */
+#define SE_FW_AUTH_LEN          (SE_FW_HEADER_TOT_LEN - SE_FW_HEADER_SIGN_LEN  \
+                                 - SE_FW_HEADER_STATE_LEN - SE_FW_HEADER_FINGERPRINT_LEN) /*!< Authenticated part of the header */
+
+#define SE_SYMKEY_LEN           (16U)  /*!< SE Symmetric Key length (bytes)*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+/* AES-GCM encryption and FW Tag */
+#define SE_NONCE_LEN            (12U)  /*!< Secure Engine Nonce Length (Bytes)*/
+#define SE_TAG_LEN              (16U)  /*!< Secure Engine Tag Length (Bytes): AES-GCM for the FW tag */
+#define SE_HEADER_SIGN_LEN      (16U)  /*!< Firmware Header signature LEN : AES-GCM for header signature */
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/* AES-CBC encryption (or no encryption) and SHA256 for FW tag */
+#define SE_IV_LEN               (16U)  /*!< Secure Engine IV Length (Bytes): same size as an AES block*/
+#define SE_TAG_LEN              (32U)  /*!< Secure Engine Tag Length (Bytes): SHA-256 for the FW tag */
+#define SE_HEADER_SIGN_LEN      (64U)  /*!< Firmware Header signarure LEN*/
+#define SE_ASYM_PUBKEY_LEN      (64U)  /*!< SE Asymmetric Public Key length (bytes)*/
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Image type: complete or partial image */
+#define SE_FW_IMAGE_COMPLETE    (0U) /*!< Complete Fw Image */
+#define SE_FW_IMAGE_PARTIAL     (1U) /*!< Partial Fw Image */
+
+/*!< FW Magic IDs */
+#define SFUM_1 "SFU1"      /*!< Active Slot #1 : first active also referred as master */
+#define SFUM_2 "SFU2"      /*!< Active Slot #2 : second active slot */
+#define SFUM_3 "SFU3"      /*!< Active Slot #3 : third active slot */
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/* SE_FwStateTypeDef - firmware image state type representing the state of the firmware image
+ * In the header (SE_FwRawHeaderTypeDef.FwImageState), these states are encoded as follows:
+   * FWIMG_STATE_INVALID  : 32 * 0x00, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID    : 32 * 0xFF, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID_ALL: 32 * 0xFF, 32 * 0x55, 32 * 0x00
+   * FWIMG_STATE_SELFTEST : 32 * 0xFF, 32 * 0xFF, 32 * 0x00
+   * FWIMG_STATE_NEW      : 32 * 0xFF, 32 * 0xFF, 32 * 0xFF
+ */
+typedef enum
+{
+  FWIMG_STATE_INVALID   = 0U, /* image is not valid (typically selftest has failed) and should not boot */
+  FWIMG_STATE_VALID     = 1U, /* image is valid (selftest passed), image OK to boot if signature checks pass */
+  FWIMG_STATE_VALID_ALL = 2U, /* master image is valid (selftest passed), all other images are automatically validated */
+  FWIMG_STATE_SELFTEST  = 3U, /* self tests to be executed. Image OK to boot one time if signature checks pass */
+  FWIMG_STATE_NEW       = 4U, /* new image, has never run on the device */
+} SE_FwStateTypeDef;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief  Firmware Header structure definition
+  * @note This structure MUST be called SE_FwRawHeaderTypeDef
+  * @note This structure MUST contain a field named 'FwVersion'
+  * @note This structure MUST contain a field named 'FwSize'
+  * @note This structure MUST contain a field named 'FwTag' (to control intergrity of full FW)
+  * @note This structure MUST contain a field named 'PartialFwOffset'
+  * @note This structure MUST contain a field named 'PartialFwSize'
+  * @note This structure MUST contain a field named 'PartialFwTag' (to control intergrity of partial FW)
+  * @note This structure MUST contain a field named 'HeaderSignature' (to control authentication of the header)
+  * @note This structure MUST contain a field named 'FwImageState' (not part of the authentified header)
+  * @note This structure MUST contain a field named 'PrevHeaderFingerprint' (not part of the authentified header)
+  * @note In this example, the header size is always a multiple of 32 to match the FLASH constraint on STM32H7.
+  *       We keep this alignment for all platforms (even when the FLASH alignment constraint is another value) to have
+  *       one unique header size per crypto scheme.
+  * @note In this example, the authentified header size + the header signature is always 192 bytes (for all crypto
+  *       schemes).
+  */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Nonce[SE_NONCE_LEN];    /*!< Nonce used to encrypt firmware*/
+  uint8_t  Reserved[112U];         /*!< Reserved for future use: 112 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN]; /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  InitVector[SE_IV_LEN];  /*!< IV used to encrypt firmware */
+  uint8_t  Reserved[28U];          /*!< Reserved for future use: 28 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Reserved[44U];          /*!< Reserved for future use: 44 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#else
+
+#error "The current example does not support the selected crypto scheme."
+
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_DEF_METADATA_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
new file mode 100644
index 00000000..3d7e71b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Engine low level interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_LOW_LEVEL_H
+#define SE_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+
+/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
+   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
+#include "sfu_fwimg_regions.h"
+
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup SE
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
+  * @{
+  */
+/**
+  * @brief flash handling constants: these constants are used in se_fwimg.c
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
+  * @{
+  */
+
+/**
+  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
+  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
+  * 32-bit word.
+  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
+  */
+#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
+  do{                                  \
+    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
+  }while(0)
+
+/**
+  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
+  */
+#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
+  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
+  * @{
+  */
+
+/**
+  * Code isolation based on Firewall
+  */
+#define SFU_ISOLATE_SE_WITH_MPU
+
+/**
+  * MPU : Enter/Exit secured area ==> nothing to do
+  */
+#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
+#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
+
+/**
+  * Service to enable/disable interrupts
+  */
+#define UPDATE_IRQ_SERVICE
+
+
+/** @addtogroup SE_LOW_LEVEL_Exported_Functions
+  * @{
+  */
+void SE_LL_CORE_Cleanup(void);
+#if defined (__CC_ARM)
+void __arm_clean_data(void);
+#elif defined(__GNUC__)
+void __gcc_clean_data(void);
+#endif /* __CC_ARM */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_Functions
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void);
+SE_ErrorStatus SE_LL_CRC_Init(void);
+SE_ErrorStatus SE_LL_CRC_DeInit(void);
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..99ddd88d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+/* #define HAL_IWDG_MODULE_ENABLED */
+/* #define HAL_LPTIM_MODULE_ENABLED */
+#define HAL_PKA_MODULE_ENABLED
+/* #define HAL_RNG_MODULE_ENABLED */
+/* #define HAL_RTC_MODULE_ENABLED */
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+/* #define HAL_TIM_MODULE_ENABLED */
+/* #define HAL_UART_MODULE_ENABLED */
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+/* #define HAL_EXTI_MODULE_ENABLED */
+/* #define HAL_CORTEX_MODULE_ENABLED */
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..15b64f1c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
@@ -0,0 +1,693 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>0</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\data_init.c</PathWithFileName>
+      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
+      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
+      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
+      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
+      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
+      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..37a3c26b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>SECoreBin</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name>prebuild.bat .</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>2</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM;../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App;../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SECoreBin.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--entry=SE_CallGate
+--diag_suppress L6404W
+--diag_suppress L6314W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>data_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\data_init.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ca_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>nvms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/nvms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_low_level.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_callgate.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_exception.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_fwimg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_der_x962.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_digest.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_dyn_obj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_ecc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_enc_dec.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_key_mgt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_nvm_storage.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_platf_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+          <Files>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
+            <File>
+              <FileName>sha256.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_SECoreBin"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..0b9eec5a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,178 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %partialbin% %partialsfu%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..90bfee4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,168 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% -o 512 --pfw %partialbin% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..cb4c369d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,177 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %partialbin% %partialsfu%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% -o 512 --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
new file mode 100644
index 00000000..7b2822b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
@@ -0,0 +1,29 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+
+; *** regions needed by SE_CoreBin project ***
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
+  *(.SE_CallGate_Code)
+  }
+  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
+  *(.SE_Startup_Code)
+  }
+  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_CODE_NOKEY_REGION_ROM_SIZE{
+  .ANY (+RO)
+  }
+  User_Key_region_ROM USER_KEY_REGION_ROM_START FIXED USER_KEY_REGION_ROM_SIZE {
+  *(.User_embedded_Keys)
+  }
+  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
+  *(.SE_embedded_Keys)
+  }
+  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
new file mode 100644
index 00000000..67246f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
@@ -0,0 +1,84 @@
+/**
+  ******************************************************************************
+  * @file    data_init.c
+  * @author  MCD Application Team
+  * @brief   Data section (RW + ZI) initialization.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+******************************************************************************
+*/
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+
+extern uint32_t Image$$SE_region_RAM$$RW$$Base;
+extern uint32_t Load$$SE_region_RAM$$RW$$Base;
+extern uint32_t Image$$SE_region_RAM$$RW$$Length;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Base;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Length;
+
+
+#define data_ram Image$$SE_region_RAM$$RW$$Base
+#define data_rom Load$$SE_region_RAM$$RW$$Base
+#define data_rom_length Image$$SE_region_RAM$$RW$$Length
+#define bss Image$$SE_region_RAM$$ZI$$Base
+#define bss_length Image$$SE_region_RAM$$ZI$$Length;
+
+
+/**
+  * @brief  Copy initialized data from ROM to RAM.
+  * @param  None.
+  * @retval None.
+  */
+void LoopCopyDataInit(void) 
+{
+  uint32_t i;
+	uint8_t* src = (uint8_t*)&data_rom;
+	uint8_t* dst = (uint8_t*)&data_ram;
+	uint32_t len = (uint32_t)&data_rom_length;
+
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = src[i];
+  }
+}
+  
+/**
+  * @brief  Clear the zero-initialized data section.
+  * @param  None.
+  * @retval None.
+  */
+void LoopFillZerobss(void) 
+{
+  uint32_t i;
+	uint8_t* dst = (uint8_t*)&bss;
+	uint32_t len = (uint32_t)&bss_length;
+	
+	/* Clear the zero-initialized data section */
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = 0;
+  }
+}
+	
+/**
+  * @brief  Data section initialization.
+  * @param  None.
+  * @retval None.
+  */
+ void __arm_data_init(void) {
+	 	LoopFillZerobss();
+	  LoopCopyDataInit();
+} 
+ 
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SECoreBin/MDK-ARM/prebuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..ea001733
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/STM32CubeIDE | ../../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App | ../../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SECoreBin.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value=".."/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App"/>
+									<listOptionValue builtIn="false" value="../../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SECoreBin.null.394363235" name="2_Images_SECoreBin"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
new file mode 100644
index 00000000..4a09bf52
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SECoreBin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ca_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
new file mode 100644
index 00000000..dcc46a55
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
@@ -0,0 +1,36 @@
+
+#include "stdint-gcc.h"
+
+#ifndef vu32
+#	define vu32 volatile uint32_t
+#endif
+
+void LoopCopyDataInit(void) {
+	extern char _sidata asm("_sidata");
+	extern char _sdata asm("_sdata");
+	extern char _edata asm("_edata");
+	
+	vu32* src = (vu32*) &_sidata;
+	vu32* dst = (vu32*) &_sdata;
+	
+	vu32 len = (&_edata - &_sdata) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = src[i];
+}
+
+void LoopFillZerobss(void) {
+	extern char _sbss asm("_sbss");
+	extern char _ebss asm("_ebss");
+	
+	vu32* dst = (vu32*) &_sbss;
+	vu32 len = (&_ebss - &_sbss) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = 0;
+}
+
+void __gcc_data_init(void) {
+	LoopFillZerobss();
+	LoopCopyDataInit();
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/Core/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
new file mode 100644
index 00000000..6539f13b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
@@ -0,0 +1,153 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(SE_CallGate)
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_CallGate_Code :
+  {
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    KEEP(*(.SE_CallGate_Code))
+  } > SE_CallGate_ROM_region
+
+  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SE_Code_NoKey_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .USER_embedded_Keys : { KEEP(*(.USER_embedded_Keys)) } > User_Key_region_ROM
+  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
+  
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SE_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SE_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
new file mode 100644
index 00000000..30759a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_C
+#define CA_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "CryptoApi/ca.h"
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#include "mbedtls/entropy_poll.h"
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#define COMPILER_BARRIER() __DMB();__DSB();
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static RNG_HandleTypeDef handle;
+static uint8_t users = 0;
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private function prototypes -----------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta);
+static void RNG_Init(void);
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length);
+static void RNG_DeInit(void);
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Exported functions implementation -----------------------------------------*/
+
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+
+/**
+  * @brief CRYP MSP Initialization
+  * This function configures the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Release AES/CRYP from reset state */
+    __HAL_RCC_AES_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_AES_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief CRYP MSP De-Initialization
+  * This function freeze the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_AES_CLK_DISABLE();
+    /* Force AES/CRYP into reset state */
+    __HAL_RCC_AES_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/**
+  * @brief      PKA MSP Initialization
+  *             This function configures the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Release PKA from reset state */
+    __HAL_RCC_PKA_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_PKA_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief      PKA MSP De-Initialization
+  *             This function freeze the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_PKA_CLK_DISABLE();
+    /* Force PKA into reset state */
+    __HAL_RCC_PKA_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta)
+{
+  COMPILER_BARRIER();
+  uint8_t newValue;
+  do
+  {
+    newValue = __LDREXB(valuePtr) + delta;
+  } while (__STREXB(newValue, valuePtr));
+  COMPILER_BARRIER();
+  return newValue;
+}
+
+static void RNG_Init(void)
+{
+  uint32_t dummy;
+
+  /*  We're only supporting a single user of RNG */
+  if (atomic_incr_u8(&users, 1) > 1)
+  {
+    while (1);
+  }
+
+  /* Select MSI as RNG clock source */
+  __HAL_RCC_RNG_CONFIG(RCC_RNGCLKSOURCE_MSI);
+
+  /* RNG Peripheral clock enable */
+  __HAL_RCC_RNG_CLK_ENABLE();
+
+  /* Initialize RNG instance */
+  handle.Instance = RNG;
+  handle.State = HAL_RNG_STATE_RESET;
+  handle.Lock = HAL_UNLOCKED;
+
+  HAL_RNG_Init(&handle);
+
+  /* first random number generated after setting the RNGEN bit should not be used */
+  HAL_RNG_GenerateRandomNumber(&handle, &dummy);
+}
+
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length)
+{
+  int32_t ret = 0;
+  __IO uint8_t random[4];
+  *output_length = 0;
+
+  /* Get Random byte */
+  while ((*output_length < length) && (ret == 0))
+  {
+    if (HAL_RNG_GenerateRandomNumber(&handle, (uint32_t *)random) != HAL_OK)
+    {
+      ret = -1;
+    }
+    else
+    {
+      for (uint8_t i = 0; (i < 4) && (*output_length < length) ; i++)
+      {
+        *output++ = random[i];
+        *output_length += 1;
+        random[i] = 0;
+      }
+    }
+  }
+  /* Just be extra sure that we didn't do it wrong */
+  if ((__HAL_RNG_GET_FLAG(&handle, (RNG_FLAG_CECS | RNG_FLAG_SECS))) != 0)
+  {
+    *output_length = 0;
+  }
+}
+
+static void RNG_DeInit(void)
+{
+  /*Disable the RNG peripheral */
+  HAL_RNG_DeInit(&handle);
+  /* RNG Peripheral clock disable - assume we're the only users of RNG  */
+  __HAL_RCC_RNG_CLK_DISABLE();
+
+  users = 0;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+  RNG_Init();
+  RNG_GetBytes(output, len, olen);
+  RNG_DeInit();
+  if (*olen != len)
+  {
+    return -1;
+  }
+  return 0;
+}
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+/**
+  * @brief      CRC initialization
+  *             This function release reset and clock CRC IP peripheral
+  * @retval None
+  */
+void CA_LL_CRC_Init(void)
+{
+  /* Force CRC into reset state */
+  __HAL_RCC_CRC_FORCE_RESET();
+  /* Release CRC from reset state */
+  __HAL_RCC_CRC_RELEASE_RESET();
+  /* Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+}
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#endif /* CA_LOW_LEVEL_C */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/kms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
new file mode 100644
index 00000000..3db7b5e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
@@ -0,0 +1,188 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains implementations for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include "kms.h"
+#include "kms_low_level.h"
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+typedef enum
+{
+  KMS_MEM_NONE    = 0,
+  KMS_MEM_ALLOC,
+  KMS_MEM_FREE
+} kms_ll_mem_optype;
+typedef struct
+{
+  kms_ll_mem_optype   optype;
+  uint32_t            size;
+  void               *ptr;
+} kms_ll_mem_operation_t;
+#endif /* KMS_MEM_LOGGING */
+/* Private define ------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+#define KMS_LL_MEM_LOGGING_MAX    (100UL)
+#endif /* KMS_MEM_LOGGING */
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+kms_ll_mem_operation_t kms_ll_mem_logging[KMS_LL_MEM_LOGGING_MAX];
+uint32_t kms_ll_mem_logging_idx;
+#endif /* KMS_MEM_LOGGING */
+/* Private function prototypes -----------------------------------------------*/
+/* Private function ----------------------------------------------------------*/
+/* Exported functions --------------------------------------------------------*/
+
+/**
+  * @brief  Read data from flash and store into buffer
+  * @note   Used to access encrypted blob in flash.
+  * @param  pDestination buffer to store red data
+  * @param  pSource flash aread to read from
+  * @param  Length amount of data to read from flash
+  * @retval Operation status
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length)
+{
+  SE_ErrorStatus seStatus;
+  seStatus = SE_LL_FLASH_Read(pDestination, pSource, Length);
+  return (seStatus == SE_SUCCESS) ? CKR_OK : CKR_GENERAL_ERROR;
+}
+
+#ifdef KMS_SE_CHECK_PARAMS
+
+/* Remove compilation optimization */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  Check if given buffer in inside secure enclave (RAM or Flash, NVM_Storgae)
+  *              If it is in Enclave area, then generate a RESET.
+  * @param  pBuffer Buffer address
+  * @param  ulSize  Buffer size
+  * @retval void
+  */
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize)
+{
+  /* If pBuffer is NULL, simply return FALSE */
+  if ((pBuffer == NULL) || (ulSize == 0UL))
+  {
+    return;
+  }
+  /* Check if address range is within secure enclave                           */
+  /* Called APIs will generate exception in case buffer is in forbidden area   */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  /* Double Check to avoid basic fault injection */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  return;
+}
+#endif /* KMS_SE_CHECK_PARAMS */
+
+/**
+  * @brief  An error occurred
+  * @note   Used to debug or reset in case of important issue
+  * @param  error Error reported by KMS
+  */
+void KMS_LL_ReportError(uint32_t error)
+{
+  (void)error;
+  while (1 == 1) {;}
+}
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory initialization occurred
+  */
+void KMS_LL_ReportMemInit(void)
+{
+  for (uint32_t i = 0; i < KMS_LL_MEM_LOGGING_MAX; i++)
+  {
+    kms_ll_mem_logging[i].optype = KMS_MEM_NONE;
+    kms_ll_mem_logging[i].size = 0;
+    kms_ll_mem_logging[i].ptr = NULL_PTR;
+  }
+  kms_ll_mem_logging_idx = 0;
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory allocation occurred
+  * @param  size    Size allocated
+  * @param  pmem    Allocated pointer
+  */
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_ALLOC;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = size;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory free occurred
+  * @param  pmem    Freed pointer
+  */
+void KMS_LL_ReportMemFree(void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_FREE;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = 0;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
new file mode 100644
index 00000000..f9ca9236
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
@@ -0,0 +1,236 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_hal_flash.h"
+#include "nvms_low_level.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep);
+static uint32_t get_page(uint32_t Addr);
+/* Private function ----------------------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep)
+{
+  uint8_t *p;
+  uint32_t maxsize;
+  HAL_StatusTypeDef ret = HAL_OK;
+
+  /* Calculating the maximum writable chunk size.*/
+  maxsize = (size_t)(NVMS_LL_PAGE_SIZE -
+                     ((uint32_t) * destinationp & (NVMS_LL_PAGE_SIZE - 1UL)));
+  if (maxsize > *sizep)
+  {
+    maxsize = *sizep;
+  }
+
+  p = *destinationp;
+
+  /* Updating size and pointers.*/
+  *sizep        -= maxsize;
+  *destinationp += maxsize;
+
+  /* Programming, 64 bits granularity  */
+  (void)HAL_FLASH_Unlock();
+  while ((maxsize >= 8UL) && (ret == HAL_OK))
+  {
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+    p = &p[8];
+    *sourcep = &((*sourcep)[8]);
+    maxsize -= 8UL;
+  }
+
+  if (maxsize != 0UL)
+  {
+    uint8_t block[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    /* Problem, there are remaining bytes to write, but not a full 64bit word --> we can't handle it */
+    /* Let's write a full 64bit word */
+    (void)memcpy(block, *sourcep, maxsize);
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+  }
+  (void)HAL_FLASH_Lock();
+
+  if (ret == HAL_OK)
+  {
+    return false;
+  }
+  return true;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t get_page(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+/* Exported functions --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+
+/**
+  * @brief   Flash low level driver initialization.
+  */
+void NVMS_LL_Init(void)
+{
+
+}
+
+/**
+  * @brief   Determines if a flash block is in erased state.
+  *
+  * @param   block         the block identifier
+  * @return                  The block state.
+  * @retval false            if the block is not in erased state.
+  * @retval true             if the block is in erased state.
+  */
+bool NVMS_LL_IsBlockErased(nvms_block_t block)
+{
+  uint32_t i;
+  uint32_t *p = (uint32_t *)((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS :
+                             NVMS_LL_BLOCK1_ADDRESS);
+
+  for (i = 0; i < (NVMS_LL_BLOCK_SIZE / sizeof(uint32_t)); i++)
+  {
+    if (*p != NVMS_LL_ERASED)
+    {
+      return false;
+    }
+    p++;
+  }
+  return true;
+}
+
+
+
+/**
+  * @brief   Erases a block.
+  * @note    The erase operation is verified internally.
+  *
+  * @param   block         the block identifier
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the erase operation failed.
+  */
+bool NVMS_LL_BlockErase(nvms_block_t block)
+{
+  /* Erase First Flash sector */
+  FLASH_EraseInitTypeDef EraseInitStruct;
+  uint32_t SectorError = 0;
+
+  EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+  EraseInitStruct.Page        = get_page((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS : NVMS_LL_BLOCK1_ADDRESS);
+  EraseInitStruct.NbPages     = NVMS_LL_NB_PAGE_PER_BLOCK;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void)HAL_FLASH_Unlock();
+
+  if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK)
+  {
+    /* Error occurred while sector erase.
+      User can add here some code to deal with this error.
+      SectorError will contain the faulty sector and then to know the code error on this sector,
+      user can call function 'HAL_FLASH_GetError()'
+      FLASH_ErrorTypeDef errorcode = HAL_FLASH_GetError(); */
+  }
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void)HAL_FLASH_Lock();
+
+  /* Operation verification.*/
+  return !NVMS_LL_IsBlockErased(block);
+}
+
+/**
+  * @brief   Writes data.
+  * @note    The write operation is verified internally.
+  * @note    If the write operation partially writes flash pages then the
+  *          unwritten bytes are left to the filler value.
+  *
+  * @param   source        pointer to the data to be written
+  * @param   destination   pointer to the flash position
+  * @param   size          size of data
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the write operation failed.
+  */
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size)
+{
+  const uint8_t *s = source;
+  uint8_t *d = destination;
+  size_t sz = size;
+
+  while (sz > 0UL)
+  {
+    /* Writes as much as a single operation allows.*/
+    if (page_write(&s, &d, &sz))
+    {
+      return true;
+    }
+  }
+
+  /* Operation verification.*/
+  return (bool)(memcmp(source, destination, size) != 0);
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/se_low_level.c
new file mode 100644
index 00000000..576319a2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/Src/se_low_level.c
@@ -0,0 +1,757 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SE_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#endif /* __CC_ARM */
+#include "se_exception.h"
+#include "string.h"
+
+#ifdef KMS_ENABLED
+#include "kms.h"
+#include "kms_objects.h"
+#include "kms_platf_objects_config.h"
+#endif /* KMS_ENABLED */
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+/** @defgroup  SE_HARDWARE SE Hardware Interface
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Private_Variables Private Variables
+  * @{
+  */
+static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
+
+static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Private_Functions Private Functions
+  * @{
+  */
+
+static uint32_t SE_LL_GetPage(uint32_t Address);
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  Set CRC configuration and call HAL CRC initialization function.
+  * @param  None.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  CrcHandle.Instance = CRC;
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The Default polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+  /* The default init value is used */
+  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+  /* CRC Init*/
+  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_Init(void)
+{
+  /* CRC Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  return SE_LL_CRC_Config();
+}
+
+/**
+  * @brief  Wrapper to HAL CRC de-initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_DeInit(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
+  {
+    /* Initialization OK */
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC Calculate function.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  uBufferLength: buffer length in 32-bits word.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  This function does an erase of nb pages in user flash area
+  * @param  pStart: pointer to  user flash area
+  * @param  Length: number of bytes.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SE_ErrorStatus e_ret_status = SE_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    /* Fill EraseInit structure*/
+    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
+    p_erase_init.Page          = SE_LL_GetPage(start);
+    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
+    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+    {
+      e_ret_status = SE_ERROR;
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Write in Flash  protected area
+  * @param  pDestination pointer to destination area in Flash
+  * @param  pSource pointer to input buffer
+  * @param  Length number of bytes to be written
+  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
+  */
+
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SE_ErrorStatus ret = SE_SUCCESS;
+  uint32_t i;
+  uint32_t verified = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  if (Length == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Area should be inside 1 of the firmware image headers */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    for (i = 0U; i < Length; i += 8U)
+    {
+      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
+      {
+        ret = SE_ERROR;
+        break;
+      }
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) */
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    ret = SE_ERROR;
+  }
+  return ret;
+}
+
+/**
+  * @brief  Read in Flash protected area
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to read
+  * @param  Length: Length in bytes of data buffer
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  uint32_t source = (uint32_t)pSource;
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+  uint32_t i;
+  uint32_t verified = 0U;
+
+  /* Area should be inside 1 of the firmware image headers
+     or inside 1 of the download areas */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
+        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
+    {
+      verified = 1U;
+    }
+  }
+
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  SE_DoubleECC_Error_Counter = 0U;
+  /* Do not use memcpy from lib : ECC error should be checked at each loop */
+  for (i = 0; (i < Length) && (SE_DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+  {
+    *pDestination = *pSource;
+  }
+  if (SE_DoubleECC_Error_Counter == 0U)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  SE_DoubleECC_Error_Counter = 0U;
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
+  * @param pxSE_Metadata: Firmware metadata.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(pxSE_Metadata);
+  return SE_SUCCESS;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_ROM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is in sbsfu ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
+                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
+                            || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
+                           )))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+/**
+  * @brief function to disable all IRQ, previously enabled ones are stored in parameter
+  * @param pIrqState: IRQ state buffer
+  * @param IrqStateNb: Number of IRQ state that can be stored
+  * @retval SE_ErrorStatus SE_SUCCESS when complete successfully, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    pIrqState[0] = NVIC->ICER[0];     /* Save currently enabled IRQ */
+    NVIC->ICER[0] = pIrqState[0];     /* Disable All IRQ */
+    if (NVIC->ICER[0] == 0UL)         /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    NVIC->ISER[0] = pIrqState[0];         /* Disable All enabled IRQ */
+    if (NVIC->ICER[0] == pIrqState[0])    /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Lock the embedded keys used by SBSFU
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void)
+{
+#ifdef KMS_ENABLED
+  uint32_t i_key_locked = 0U;
+  uint32_t i_ctrl = 0U;
+
+#ifdef KMS_INDEX_BLOBIMPORT_VERIFY
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_VERIFY) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_VERIFY */
+#ifdef KMS_INDEX_BLOBIMPORT_DECRYPT
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_DECRYPT) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_DECRYPT */
+#ifdef KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE */
+  if(i_ctrl == i_key_locked)
+  {
+    return SE_SUCCESS;
+  }
+  else
+  {
+    return SE_ERROR;
+  }
+#else /* KMS_ENABLED */
+  return SE_SUCCESS;
+#endif /* KMS_ENABLED */
+}
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t SE_LL_GetPage(uint32_t Address)
+{
+  uint32_t page;
+
+  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
+  {
+    /* Bank 1 */
+    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
+  }
+  else
+  {
+    /* Bank 2 */
+    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
+  }
+  return page;
+}
+
+/**
+  * @brief  Gets the bank of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The bank of a given address
+  */
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retval None.
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    SE_DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    /* This exception occurs for another reason than flash double ECC errors */
+    SE_NMI_ExceptionHandler();
+  }
+}
+
+/**
+  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
+  * @param  None.
+  * @retvat void
+  */
+void HardFault_Handler(void)
+{
+  SE_NMI_ExceptionHandler();
+}
+
+/**
+  * @brief  Cleanup SE CORE
+  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
+  *
+  */
+void  SE_LL_CORE_Cleanup(void)
+{
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/readme.txt
new file mode 100644
index 00000000..174ef3dd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/2_Images_SECoreBin/readme.txt
@@ -0,0 +1,113 @@
+/**
+  @page 2_Images_SECoreBin / Secure Engine Core binary generation.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Secure Engine Core binary generation.
+  *          SE Core binary exports SE CallGate function entry point for
+  *          SFU Application.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application is used to generate Secure Engine Core binary file to be linked
+with Secure Boot & Secure Firmware Update application (SBSFU).
+SE Core binary exports a single entry point to SE CallGate function and a startup method for data initialization.
+It is based on the Secure Engine Middleware.
+
+Generated SE Core Binary embeds Key Management Services accessible through this same single entry point using APIs
+defined by tKMS interface.
+
+It has to be compiled before SBSFU project.
+
+Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default
+cryptographic scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are
+provided and can be selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
+   - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
+   - SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+   - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+
+This example supports multiple images feature configured with 2 active images for execution from internal flash and 1
+download area also located in internal flash. Each image has its own keys for signature verification and firwmare encryption.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 2_Images_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
+   - 2_Images_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
+   - 2_Images_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
+   - 2_Images_SECoreBin/Src/se_low_level.c                      Low level interface
+   - 2_Images_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
+   - 2_Images_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
+   - 2_Images_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
+                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
+                                                                Exported to KMS user to ease embedded object usage
+   - 2_Images_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
+   - 2_Images_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
+   - 2_Images_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
+   - 2_Images_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
+   - 2_Images_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
+   - 2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
+   - 2_Images_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
+   - 2_Images_SECoreBin/Binary/ECCKEY2.txt                      Private ECCDSA key for signature verification of 2nd active image
+   - 2_Images_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin Public key for AES CBC encryption of 2nd active image
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin Public key for AES GCM encryption of 2nd active image
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files. As a workaround, it is advised to use the subst.exe command from within a command prompt to set up
+     a local drive out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+   
+@par IDE prebuild script
+
+In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
+This preliminary processing is in charge of:
+   - determining the requested cryptographic scheme
+   - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of SBSFU & Blob
+     importation keys into the KMS embedded objects pattern file)
+   - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
+
+A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic
+key). The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+In order to generate Secure Engine Core binary file, you must do the following :
+   - Open your preferred toolchain
+   - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/EWARM/mapping_export.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/EWARM/mapping_export.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/EWARM/mapping_export.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/EWARM/mapping_fwimg.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
new file mode 100644
index 00000000..18581266
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
@@ -0,0 +1,32 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* swap (4 kbytes) */
+define exported symbol  __ICFEDIT_SWAP_start__  = 0x08002000;
+define exported symbol  __ICFEDIT_SWAP_end__    = 0x08002FFF;
+
+/* Active slot #1 (64 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_1_header__= 0x0803F800;
+define exported symbol  __ICFEDIT_SLOT_Active_1_start__ = 0x0801F000;
+define exported symbol  __ICFEDIT_SLOT_Active_1_end__   = 0x0802EFFF;
+
+/* Active slot #2 (48 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_2_header__= 0x0803F000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_start__ = 0x08013000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_end__   = 0x0801EFFF;
+
+/* Dwl slot #1 (64 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Dwl_1_start__= 0x08003000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_1_end__  = 0x08012FFF;
+
+/* Slots not configured */
+define exported symbol  __ICFEDIT_SLOT_Active_3_header__= 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_start__ = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_end__   = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_2_start__    = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_2_end__      = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_3_start__    = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Dwl_3_end__      = 0x00000000;
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
new file mode 100644
index 00000000..a2ae8ef3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
@@ -0,0 +1,101 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 SB Code region */
+define exported symbol __ICFEDIT_M4_SB_region_ROM_start__          = 0x08000000;
+define exported symbol __ICFEDIT_M4_SB_region_ROM_end__            = 0x08001FFF;
+
+/* ROM regions definition */
+define region M4_SB_ROM_region           = mem:[from __ICFEDIT_M4_SB_region_ROM_start__   to __ICFEDIT_M4_SB_region_ROM_end__];
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 2 kbytes * 2 ==> 4 kbytes */
+define exported symbol __ICFEDIT_KMS_DataStorage_start__           = 0x0802F000;
+define exported symbol __ICFEDIT_KMS_DataStorage_end__             = 0x0802FFFF;
+
+/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation */
+define exported symbol __ICFEDIT_SE_IF_region_ROM_start__          = __ICFEDIT_KMS_DataStorage_end__ + 1;
+define exported symbol __ICFEDIT_SE_IF_region_ROM_end__            = __ICFEDIT_SE_IF_region_ROM_start__ + 0x12FF;
+
+/* SBSFU Code region */
+define exported symbol __ICFEDIT_SB_region_ROM_start__             = __ICFEDIT_SE_IF_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_ROM_end__               = 0x08036FFF;
+
+/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+define exported symbol __ICFEDIT_intvec_start__                    = __ICFEDIT_SB_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_Vector_size__                     = 0x200;
+
+/* SE Code region protected by MPU isolation */
+define exported symbol __ICFEDIT_SE_Code_region_ROM_start__        = __ICFEDIT_intvec_start__ + __ICFEDIT_Vector_size__;
+define exported symbol __ICFEDIT_SE_CallGate_region_ROM_start__    = __ICFEDIT_SE_Code_region_ROM_start__ + 4;
+define exported symbol __ICFEDIT_SE_CallGate_Region_ROM_End__      = __ICFEDIT_SE_Code_region_ROM_start__ + 0x1FF;
+
+/* SE Startup */
+define exported symbol __ICFEDIT_SE_Startup_region_ROM_start__     = __ICFEDIT_SE_CallGate_Region_ROM_End__ + 1;
+define exported symbol __ICFEDIT_SE_Code_nokey_region_ROM_start__  = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x100;
+
+/* User Embedded Keys */
+define exported symbol __ICFEDIT_User_Key_region_ROM_start__      = 0x0803E500;
+define exported symbol __ICFEDIT_User_Key_region_ROM_end__        = 0x0803E7FF;
+
+/* SE Embedded Keys */
+define exported symbol __ICFEDIT_SE_Key_region_ROM_start__         = 0x0803E800;
+define exported symbol __ICFEDIT_SE_Key_region_ROM_end__           = 0x0803EFFF;
+define exported symbol __ICFEDIT_SE_Code_region_ROM_end__          = __ICFEDIT_SE_Key_region_ROM_end__;
+
+/* ROM regions definition */
+define region KMS_DataStorage            = mem:[from __ICFEDIT_KMS_DataStorage_start__ to __ICFEDIT_KMS_DataStorage_end__];
+define region SE_IF_ROM_region           = mem:[from __ICFEDIT_SE_IF_region_ROM_start__ to __ICFEDIT_SE_IF_region_ROM_end__];
+define region SB_ROM_region              = mem:[from __ICFEDIT_SB_region_ROM_start__ to __ICFEDIT_SB_region_ROM_end__];
+define region SE_CALLGATE_ROM_Region     = mem:[from __ICFEDIT_SE_CallGate_region_ROM_start__ to __ICFEDIT_SE_CallGate_Region_ROM_End__];
+define region SE_CODE_NOKEY_ROM_region   = mem:[from __ICFEDIT_SE_Code_nokey_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_start__ - 1];
+define region User_Key_ROM_region        = mem:[from __ICFEDIT_User_Key_region_ROM_start__ to __ICFEDIT_User_Key_region_ROM_end__];
+define region SE_Key_ROM_region          = mem:[from __ICFEDIT_SE_Key_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_end__];
+define region SE_ROM_region              = mem:[from __ICFEDIT_SE_Code_region_ROM_start__ to __ICFEDIT_SE_Code_region_ROM_end__];
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+define symbol __ICFEDIT_M4_SB_region_RAM_start__                   = 0x20000000;
+define symbol __ICFEDIT_M4_SB_region_RAM_end__                     = __ICFEDIT_M4_SB_region_RAM_start__ + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ = __ICFEDIT_M4_SB_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__   = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ + 0x1F;
+
+/* M4 UserApp */
+define symbol __ICFEDIT_M4_APP_region_RAM_start__                  = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__ + 1;
+define symbol __ICFEDIT_M4_APP_region_RAM_end__                    = 0x20007FFF;
+
+/* M4 UserApp shared area */
+define exported symbol __ICFEDIT_M4_SHARED_region_SRAM_start__     = 0x20008000;
+define exported symbol __ICFEDIT_M4_SHARED_region_SRAM_end__       = 0x200083FF;
+
+/* M0PLUS UserApp shared area */
+define exported symbol __ICFEDIT_M0PLUS_SHARED_region_SRAM_start__ = 0x20008400;
+define exported symbol __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__   = 0x20008FFF;
+
+/* SBSFU RAM region */
+define exported symbol __ICFEDIT_SB_region_RAM_start__             = __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_RAM_end__               = 0x2000D3FF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
+define exported symbol __ICFEDIT_SE_region_RAM_start__             = __ICFEDIT_SB_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_SE_region_RAM_stack_top__         = 0x2000DB00; /* Secure Engine's private stack */
+define exported symbol __ICFEDIT_SE_region_RAM_end__               = 0x2000FFFF;
+
+/* RAM regions definition */
+define region M4_SB_RAM_region           = mem:[from __ICFEDIT_M4_SB_region_RAM_start__ to __ICFEDIT_M4_SB_region_RAM_end__];
+define region M4_APP_RAM_region          = mem:[from __ICFEDIT_M4_APP_region_RAM_start__ to __ICFEDIT_M4_APP_region_RAM_end__];
+define region SE_RAM_region              = mem:[from __ICFEDIT_SE_region_RAM_stack_top__ to __ICFEDIT_SE_region_RAM_end__];
+define region SB_RAM_region              = mem:[from __ICFEDIT_SB_region_RAM_start__ to __ICFEDIT_SB_region_RAM_end__];
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
new file mode 100644
index 00000000..2a99b0ed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
@@ -0,0 +1,53 @@
+/**
+  ******************************************************************************
+  * @file    mapping_fwimg.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for firmware images mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_FWIMG_H
+#define MAPPING_FWIMG_H
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* swap  (4 kbytes) */
+#define SWAP_START                   0x08002000
+#define SWAP_END                     0x08002FFF
+
+/* Active slot #1  (64 kbytes) */
+#define SLOT_ACTIVE_1_HEADER         0x0803F800
+#define SLOT_ACTIVE_1_START          0x0801F000
+#define SLOT_ACTIVE_1_END            0x0802EFFF
+
+/* Active slot #2  (48 kbytes) */
+#define SLOT_ACTIVE_2_HEADER         0x0803F000
+#define SLOT_ACTIVE_2_START          0x08013000
+#define SLOT_ACTIVE_2_END            0x0801EFFF
+
+/* Dwl slot #1  (64 kbytes) */
+#define SLOT_DWL_1_START             0x08003000
+#define SLOT_DWL_1_END               0x08012FFF
+
+/* Slots not configured */
+#define SLOT_ACTIVE_3_HEADER         0x00000000
+#define SLOT_ACTIVE_3_START          0x00000000
+#define SLOT_ACTIVE_3_END            0x00000000
+#define SLOT_DWL_2_START             0x00000000
+#define SLOT_DWL_2_END               0x00000000
+#define SLOT_DWL_3_START             0x00000000
+#define SLOT_DWL_3_END               0x00000000
+
+#endif
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
new file mode 100644
index 00000000..a8019e98
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
@@ -0,0 +1,127 @@
+/**
+  ******************************************************************************
+  * @file    mapping_sbsfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SBSFU mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_SBSFU_H
+#define MAPPING_SBSFU_H
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 SB Code region */
+#define M4_SB_REGION_ROM_START          0x08000000
+#define M4_SB_REGION_ROM_END            0x08001FFF
+
+/* ROM regions definition */
+#define M4_SB_ROM_REGION_SIZE          (M4_SB_REGION_ROM_END - M4_SB_REGION_ROM_START + 0x1)
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 2 kbytes * 2 ==> 4 kbytes */
+#define KMS_DATASTORAGE_START           0x0802F000
+#define KMS_DATASTORAGE_END             0x0802FFFF
+
+/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation     */
+#define SE_IF_REGION_ROM_START          (KMS_DATASTORAGE_END + 0x1)
+#define SE_IF_REGION_ROM_END            (SE_IF_REGION_ROM_START + 0x15FF)
+
+/* SBSFU Code region */
+#define SB_REGION_ROM_START             (SE_IF_REGION_ROM_END + 1)
+#define SB_REGION_ROM_END               0x08036FFF
+
+/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+#define VECTOR_SIZE                     0x200
+#define INTVECT_START                   (SB_REGION_ROM_END + 0x1)
+
+/* SE Code region protected by MPU isolation */
+#define SE_CODE_REGION_ROM_START        (INTVECT_START + VECTOR_SIZE)
+#define SE_CALLGATE_REGION_ROM_START    (SE_CODE_REGION_ROM_START + 4)
+#define SE_CALLGATE_REGION_ROM_END      (SE_CODE_REGION_ROM_START + 0xFF)
+
+/* SE Startup                               */
+#define SE_STARTUP_REGION_ROM_START     (SE_CALLGATE_REGION_ROM_END + 1)
+#define SE_CODE_NOKEY_REGION_ROM_START  (SE_STARTUP_REGION_ROM_START + 0x100)
+
+/* User Embedded Keys */
+#define USER_KEY_REGION_ROM_START       0x0803E500
+#define USER_KEY_REGION_ROM_END         0x0803E7FF
+
+/* SE Embedded Keys */
+#define SE_KEY_REGION_ROM_START         0x0803E800
+#define SE_KEY_REGION_ROM_END           0x0803EFFF
+#define SE_CODE_REGION_ROM_END          SE_KEY_REGION_ROM_END
+
+/* ROM regions size definition */
+#define KMS_DATASTORAGE_SIZE            (KMS_DATASTORAGE_END - KMS_DATASTORAGE_START + 0x1)
+#define SE_IF_ROM_REGION_SIZE           (SE_IF_REGION_ROM_END - SE_IF_REGION_ROM_START + 0x1)
+#define SB_ROM_REGION_SIZE              (SB_REGION_ROM_END - SB_REGION_ROM_START + 0x1)
+#define SE_CALLGATE_REGION_ROM_SIZE     (SE_CALLGATE_REGION_ROM_END - SE_CALLGATE_REGION_ROM_START + 0x1)
+#define SE_CODE_NOKEY_REGION_ROM_SIZE   (SE_KEY_REGION_ROM_START - SE_CODE_NOKEY_REGION_ROM_START)
+#define USER_KEY_REGION_ROM_SIZE        (USER_KEY_REGION_ROM_START - USER_KEY_REGION_ROM_END + 0x1)
+#define SE_KEY_REGION_ROM_SIZE          (SE_KEY_REGION_ROM_END - SE_KEY_REGION_ROM_START + 0x1)
+#define SE_ROM_REGION_SIZE              (SE_CODE_REGION_ROM_END - SE_CODE_REGION_ROM_START + 0x1)
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+#define M4_SB_REGION_RAM_START          0x20000000
+#define M4_SB_REGION_RAM_END            (M4_SB_REGION_RAM_START + 0xCDF)
+
+/* M0+/M4 Synchronization flag */
+#define M4_M0PLUS_FLAG_RAM_START        (M4_SB_REGION_RAM_END + 0x1)
+#define M4_M0PLUS_FLAG_RAM_END          (M4_M0PLUS_FLAG_RAM_START + 0x1F)
+
+/* M4 UserApp : allocation limited to half RAM size */
+#define M4_APP_REGION_RAM_START         (M4_M0PLUS_FLAG_RAM_END + 0x1)
+#define M4_APP_REGION_RAM_END           0x20007FFF
+
+/* M4 UserApp shared area */
+#define M4_SHARED_REGION_RAM_START      (M4_APP_REGION_RAM_END + 0x1)
+#define M4_SHARED_REGION_RAM_END        0x200083FF
+
+/* M0PLUS UserApp shared area */
+#define M0PLUS_SHARED_REGION_RAM_START  (M4_SHARED_REGION_RAM_END + 0x1)
+#define M0PLUS_SHARED_REGION_RAM_END    0x20008FFF
+
+/* SBSFU RAM region */
+#define SB_REGION_RAM_START             (M0PLUS_SHARED_REGION_RAM_END + 0x1)
+#define SB_REGION_RAM_END               0x2000D3FF
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
+#define SE_REGION_RAM_START             (SB_REGION_RAM_END +0x1)
+#define SE_REGION_RAM_STACK_TOP         0x2000DB00                /* Secure Engine's private stack */
+#define SE_REGION_RAM_END               0x2000FFFF
+
+/* RAM regions definition */
+#define M4_SB_RAM_REGION_SIZE           (M4_SB_REGION_RAM_END - M4_SB_REGION_RAM_START + 0x1)
+#define M4_APP_RAM_REGION_SIZE          (M4_APP_REGION_RAM_END - M4_APP_REGION_RAM_START + 0x1)
+#define M4_SHARED_RAM_REGION_SIZE       (M4_SHARED_REGION_RAM_END - M4_SHARED_REGION_RAM_START + 0x1)
+#define M0PLUS_SHARED_RAM_REGION_SIZE   (M0PLUS_SHARED_REGION_RAM_END - M0PLUS_SHARED_REGION_RAM_START + 0x1)
+#define SB_RAM_REGION_SIZE              (SB_REGION_RAM_END - SB_REGION_RAM_START + 0x1)
+#define SE_RAM_REGION_SIZE              (SE_REGION_RAM_END - SE_REGION_RAM_STACK_TOP + 0x1)
+
+#endif
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
new file mode 100644
index 00000000..a0fb2f36
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
@@ -0,0 +1,33 @@
+/*
+** LinkerScript
+*/
+
+/* Slots must be aligned on sector size */
+
+/* Swap sector : 4 kbytes */  
+SWAP_start           = 0x08002000;
+SWAP_end             = 0x08002FFF;
+
+/* Active slot #1 (64 kbytes) */
+SLOT_Active_1_header = 0x0803F800;
+SLOT_Active_1_start  = 0x0801F000;
+SLOT_Active_1_end    = 0x0802EFFF;
+
+/* Active slot #2 (48 kbytes) */
+SLOT_Active_2_header = 0x0803F000;
+SLOT_Active_2_start  = 0x08013000;
+SLOT_Active_2_end    = 0x0801EFFF;
+
+/* Dwl slot #1 : (64 kbytes) */
+SLOT_Dwl_1_start     = 0x08003000;
+SLOT_Dwl_1_end       = 0x08012FFF;
+
+/* Slots not configured */
+SLOT_Active_3_header = 0x00000000;
+SLOT_Active_3_start  = 0x00000000;
+SLOT_Active_3_end    = 0x00000000;
+SLOT_Dwl_2_start     = 0x00000000;
+SLOT_Dwl_2_end       = 0x00000000;
+SLOT_Dwl_3_start     = 0x00000000;
+SLOT_Dwl_3_end       = 0x00000000;
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
new file mode 100644
index 00000000..a21521e8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
@@ -0,0 +1,136 @@
+/*
+** LinkerScript
+*/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 Vector table */
+M4_INTVECT_start               = 0x08000000;
+M4_SB_region_ROM_start         = M4_INTVECT_start;
+M4_Vector_size                 = 0x200;
+
+/* M4 SB Code region */
+M4_SB_Code_region_ROM_start    = M4_INTVECT_start + M4_Vector_size;
+M4_SB_Code_region_ROM_end      = 0x08001FFF;
+M4_SB_region_ROM_end           = M4_SB_Code_region_ROM_end;
+
+/* ROM regions size definition */
+M4_SB_Code_region_ROM_size     = M4_SB_Code_region_ROM_end - M4_SB_Code_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 2 kbytes * 2 ==> 4 kbytes */
+KMS_DataStorage_start          = 0x0802F000;
+KMS_DataStorage_end            = KMS_DataStorage_start + 0xFFF;
+
+/* SE IF ROM: used to locate Secure Engine interface Code out of MPU isolation     */
+SE_IF_region_ROM_start         = KMS_DataStorage_end + 0x1; 
+SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0x17FF;
+
+/* SBSFU Code region */
+SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
+SB_region_ROM_end              = 0x080367FF;
+
+/* M0 Vector table with alignment constraint on Vector_size */
+INTVECT_start                  = 0x08036800;
+Vector_size                    = 0x200;
+C2_BOOT_BASE_ADDR              = INTVECT_start;
+
+/* SE Code region protected by MPU isolation */
+SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start + 0x4;
+SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
+
+/* SE Startup */
+SE_Startup_region_ROM_start    = SE_CallGate_region_ROM_end + 0x1;
+SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
+
+/* User Embedded Keys */
+User_Key_region_ROM_start      = 0x0803E500;
+User_Key_region_ROM_end        = 0x0803E7FF;
+
+/* SE Embedded Keys */
+SE_Key_region_ROM_start        = 0x0803E800;
+SE_Key_region_ROM_end          = 0x0803EFFF;
+SE_Code_region_ROM_end         = SE_Key_region_ROM_end;
+
+/* ROM regions size definition */
+KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
+SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
+SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
+SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
+SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
+SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
+SE_Code_NoKey_region_ROM_size  = User_Key_region_ROM_start - SE_Code_NoKey_region_ROM_start;
+User_Key_region_ROM_size       = User_Key_region_ROM_end - User_Key_region_ROM_start + 0x1;
+SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+M4_SB_region_RAM_start         = 0x20000000;
+M4_SB_region_RAM_end           = M4_SB_region_RAM_start + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+M4_M0PLUS_flag_RAM_start       = M4_SB_region_RAM_end + 0x1;
+M4_M0PLUS_flag_RAM_end         = M4_M0PLUS_flag_RAM_start + 0x1F;
+
+/* M4 UserApp : allocation limited to half RAM size */
+M4_APP_region_RAM_start        = M4_M0PLUS_flag_RAM_end + 0x1;
+M4_APP_region_RAM_end          = 0x20007FFF;
+
+/* M4 UserApp shared area */
+M4_SHARED_region_RAM_start     = M4_APP_region_RAM_end + 0x1;
+M4_SHARED_region_RAM_end       = 0x200083FF;
+
+/* M0PLUS UserApp shared area */
+M0PLUS_SHARED_region_RAM_start = M4_SHARED_region_RAM_end + 0x1;
+M0PLUS_SHARED_region_RAM_end   = 0x20008FFF;
+
+/* SBSFU RAM region */
+SB_region_RAM_start            = M0PLUS_SHARED_region_RAM_end + 0x1;
+SB_region_RAM_end              = 0x2000CBFF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000CC00 */
+SE_region_RAM_start            = SB_region_RAM_end + 0x1;
+SE_region_RAM_stack_top        = SE_region_RAM_start + 0xC00;                /* Secure Engine's private stack */
+SE_region_RAM_end              = 0x2000FFFF;
+
+/* RAM regions size definition */
+M4_SB_region_RAM_size          = M4_SB_region_RAM_end - M4_SB_region_RAM_start + 0x1;
+M4_APP_region_RAM_size         = M4_APP_region_RAM_end - M4_APP_region_RAM_start + 0x1;
+M4_SHARED_region_RAM_size      = M4_SHARED_region_RAM_end - M4_SHARED_region_RAM_start + 0x1;
+M0PLUS_SHARED_region_RAM_size  = M0PLUS_SHARED_region_RAM_end - M0PLUS_SHARED_region_RAM_start + 0x1;
+SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
+SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
+
+/******************************************************************************/
+/*                              RAM/ROM regions                               */
+/*                                                                            */
+/******************************************************************************/
+
+MEMORY
+{
+ M4_INTVECT_ROM_region (rx)       : ORIGIN = M4_INTVECT_start, LENGTH = M4_Vector_size
+ M4_SB_Code_ROM_region (rx)       : ORIGIN = M4_SB_Code_region_ROM_start, LENGTH = M4_SB_Code_region_ROM_size
+ SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
+ SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
+ INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
+ SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
+ SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
+ SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
+ SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
+ User_Key_region_ROM (rx)         : ORIGIN = User_Key_region_ROM_start, LENGTH = User_Key_region_ROM_size
+ SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
+ M4_SB_RAM_region (xrw)           : ORIGIN = M4_SB_region_RAM_start, LENGTH = M4_SB_region_RAM_size
+ SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+ SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h
new file mode 100644
index 00000000..60836e7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h
@@ -0,0 +1,78 @@
+/**
+  ******************************************************************************
+  * @file    cmsis_nvic_virtual.h
+  * @brief   Maps the NVIC functions on _SVC for Unpriviledge usage
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __CMSIS_NVIC_VIRTUAL_H__
+#define __CMSIS_NVIC_VIRTUAL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "sys_privileged_wrap.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+#define NVIC_SetPriorityGrouping    __NVIC_SetPriorityGrouping
+#define NVIC_GetPriorityGrouping    __NVIC_GetPriorityGrouping
+#define NVIC_EnableIRQ              SYS_PRIVIL_NVIC_EnableIRQ
+#define NVIC_GetEnableIRQ           SYS_PRIVIL_NVIC_GetEnableIRQ
+#define NVIC_DisableIRQ             SYS_PRIVIL_NVIC_DisableIRQ
+#define NVIC_GetPendingIRQ          SYS_PRIVIL_NVIC_GetPendingIRQ
+#define NVIC_SetPendingIRQ          SYS_PRIVIL_NVIC_SetPendingIRQ
+#define NVIC_ClearPendingIRQ        SYS_PRIVIL_NVIC_ClearPendingIRQ
+/* #define NVIC_GetActive              __NVIC_GetActive             not available for Cortex-M0+ */
+#define NVIC_SetPriority            SYS_PRIVIL_NVIC_SetPriority
+#define NVIC_GetPriority            SYS_PRIVIL_NVIC_GetPriority
+#define NVIC_SystemReset            SYS_PRIVIL_NVIC_SystemReset
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CMSIS_NVIC_VIRTUAL_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/flash_if.h
new file mode 100644
index 00000000..9cb596ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/flash_if.h
@@ -0,0 +1,123 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    flash_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __FLASH_IF_H__
+#define __FLASH_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash status enumeration
+  */
+enum
+{
+  FLASH_PARAM_ERROR = -5,
+  FLASH_LOCK_ERROR = -4,
+  FLASH_WRITE_ERROR = -3,
+  FLASH_ERASE_ERROR  = -2,
+  FLASH_ERROR  = -1,
+  FLASH_OK     = 0,
+  FLASH_BUSY   = 1
+};
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#define PAGE(__ADDRESS__) (uint32_t)((((__ADDRESS__) - FLASH_BASE) % FLASH_BANK_SIZE) / FLASH_PAGE_SIZE) /*!< Get page index from page address */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function writes a user flash area (read/modify/write)
+  * @param  address: ptr to user flash area
+  * @param  data: ptr to data to be written
+  * @param  size: number of 32b.
+  * @param  dataTempPage: ptr used to copy already written page in ram
+  * @return Flash status.
+  */
+int32_t FLASH_IF_Write(uint32_t  address, uint8_t *data, uint32_t size, uint8_t *dataTempPage);
+
+/**
+  * Writes a 64-bit word in flash at a specific address.
+  * @param address (in bytes) must be a multiple of 8.
+  * @param data data to write
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
+  */
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data);
+
+/**
+  * Erases 'n' flash pages from page number 'page' to page number
+  * 'page + n - 1'.
+  * - If 'interrupt' is set to 0, the erasing is performed in polling mode.
+  * - If 'interrupt' is set to 1, the erasing is performed under FLASH
+  *   interrupt: the function returns immediately and the user is informed of
+  *   the end of erasing procedure by a call to the following function that
+  *   must be implemented by the user: void HWCB_FLASH_EndOfCleanup( void );
+  *   this call-back function is called under FLASH IRQ handler.
+  * @param page memory start page number
+  * @param n number of page
+  * @param interrupt choice polling/interrupt
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
+  */
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt);
+
+/**
+  * Callback
+  */
+void HWCB_FLASH_EndOfCleanup(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __FLASH_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
new file mode 100644
index 00000000..3dbeb3d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.h
+  * @brief   This file contains all the function prototypes for
+  *          the ipcc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_H__
+#define __IPCC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern IPCC_HandleTypeDef hipcc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_IPCC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
new file mode 100644
index 00000000..40330641
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
@@ -0,0 +1,109 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains the interface of the ipcc driver on CM0PLUS.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_IF_CM0PLUS_H__
+#define __IPCC_IF_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "ipcc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Initialize IPCC and register upper and downer callbacks
+  * @param  IPCC_IF_CommandRcv_cb     command callback
+  * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
+  */
+void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
+
+/**
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
+
+/**
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
+
+/**
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
+
+/**
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_ResponseSnd(uint32_t channelIdx);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_IF_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
new file mode 100644
index 00000000..193e853a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
@@ -0,0 +1,71 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    kms_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains kms interfaces with middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_IF_H
+#define KMS_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "kms.h"
+#include "tkms.h"
+#include "se_interface_kms.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
new file mode 100644
index 00000000..d6e56436
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
@@ -0,0 +1,84 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.h
+  * @brief          : Header for main.c file.
+  *                   This file contains the common defines of the application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+#include "app_kms.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+#define RTC_N_PREDIV_S 10
+#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
+#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
new file mode 100644
index 00000000..2386cd7f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    platform.h
+  * @author  MCD Application Team
+  * @brief   Header for General HW instances configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+
+#define USE_BSP_DRIVER
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdbool.h>
+#include "stm32wlxx.h"
+#include "main.h"
+#include "stm32wlxx_ll_gpio.h"
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP.  */
+/* In order to use BSP, users can add the BSP files in the IDE project space */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  */
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_nucleo_radio.h"
+#endif /* defined(USE_BSP_DRIVER) */
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PLATFORM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
new file mode 100644
index 00000000..6dd24df4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    rtc.h
+  * @brief   This file contains all the function prototypes for
+  *          the rtc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RTC_H__
+#define __RTC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern RTC_HandleTypeDef hrtc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_RTC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RTC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
new file mode 100644
index 00000000..cbe62fa1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -0,0 +1,102 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Low Power Manager interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_LPM_IF_H__
+#define __STM32_LPM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_lpm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Enters Low Power Off Mode
+  */
+void PWR_EnterOffMode(void);
+
+/**
+  * @brief Exits Low Power Off Mode
+  */
+void PWR_ExitOffMode(void);
+
+/**
+  * @brief Enters Low Power Stop Mode
+  * @note ARM exists the function when waking up
+  */
+void PWR_EnterStopMode(void);
+
+/**
+  * @brief Exits Low Power Stop Mode
+  * @note Enable the pll at 32MHz
+  */
+void PWR_ExitStopMode(void);
+
+/**
+  * @brief Enters Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_EnterSleepMode(void);
+
+/**
+  * @brief Exits Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_ExitSleepMode(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_LPM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..e1e3f673
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,338 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/*#define HAL_ADC_MODULE_ENABLED   */
+/*#define HAL_COMP_MODULE_ENABLED   */
+/*#define HAL_CRC_MODULE_ENABLED   */
+#define HAL_CRYP_MODULE_ENABLED
+/*#define HAL_DAC_MODULE_ENABLED   */
+#define HAL_GTZC_MODULE_ENABLED
+/*#define HAL_HSEM_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED   */
+/*#define HAL_I2S_MODULE_ENABLED   */
+#define HAL_IPCC_MODULE_ENABLED
+/*#define HAL_IRDA_MODULE_ENABLED   */
+/*#define HAL_IWDG_MODULE_ENABLED   */
+/*#define HAL_LPTIM_MODULE_ENABLED   */
+/*#define HAL_PKA_MODULE_ENABLED   */
+/*#define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+#define HAL_SUBGHZ_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
+/*#define HAL_UART_MODULE_ENABLED   */
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
new file mode 100644
index 00000000..0926ffad
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    subghz.h
+  * @brief   This file contains all the function prototypes for
+  *          the subghz.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SUBGHZ_H__
+#define __SUBGHZ_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern SUBGHZ_HandleTypeDef hsubghz;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_SUBGHZ_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SUBGHZ_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
new file mode 100644
index 00000000..52839726
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
@@ -0,0 +1,126 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for sys_app.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_APP_H__
+#define __SYS_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmux_table.h"
+#include "sys_conf.h"
+#include "stm32_adv_trace.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported defines ----------------------------------------------------------*/
+/* currently not supported */
+/* #define ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
+#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+
+#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
+#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
+#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
+#define APP_LOG(TS,VL,...)
+#else
+#error "APP_LOG_ENABLED not defined or out of range <0,1>"
+#endif /* APP_LOG_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
+  */
+void SystemApp_Init(void);
+
+/**
+  * @brief  callback to get the board 64 bits unique ID
+  * @param  id unique ID
+  */
+void GetUniqueId(uint8_t *id);
+
+/**
+  * @brief  callback to get the board 32 bits unique ID (LSB)
+  * @retval devAddr Device Address
+  */
+uint32_t GetDevAddr(void);
+
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
+void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_APP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
new file mode 100644
index 00000000..5a2931cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
@@ -0,0 +1,99 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_conf.h
+  * @author  MCD Application Team
+  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_CONF_H__
+#define __SYS_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/**
+  * @brief CM0PLUS Verbose level for all trace logs
+  */
+#define VERBOSE_LEVEL               VLEVEL_M
+
+/**
+  * @brief Enable trace logs
+  */
+#define APP_LOG_ENABLED             1
+
+/**
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
+  */
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
+
+/**
+  * @brief Disable Low Power mode
+  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
+  */
+#define LOW_POWER_DISABLE           0
+
+/**
+  * @brief Enable unprivilege mode
+  * @note 1: execute the code in unprivileged mode, 0: execute the code fully in privileged mode
+  */
+#define SECURE_UNPRIVILEGE_ENABLE   1
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h
new file mode 100644
index 00000000..d0bfd820
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h
@@ -0,0 +1,126 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_services.h
+  * @brief   Maps sys_privileged_wrap functions on SVC and API to cortex services
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_PRIVILEGED_SERVICES_H__
+#define __SYS_PRIVILEGED_SERVICES_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_ISOLATE_SE_WITH_MPU
+/* Critical section functions group */
+#define SVC_DISABLE_ALL_NVIC_IRQS           0x10
+#define SVC_RESTORE_NVIC_IRQS               0x11
+#define SVC_DISABLE_ALL_EXCEPTIONS          0x12
+/* Native NVIC functions group */
+#define SVC_NVIC_ENABLE_IRQ                 0x10
+#define SVC_NVIC_GET_ENABLE_IRQ             0x11
+#define SVC_NVIC_DISABLE_IRQ                0x12
+#define SVC_NVIC_GET_PENDING_IRQ            0x13
+#define SVC_NVIC_SET_PENDING_IRQ            0x14
+#define SVC_NVIC_CLEAR_PENDING_IRQ          0x15
+#define SVC_NVIC_SET_PRIORITY               0x16
+#define SVC_NVIC_GET_PRIORITY               0x17
+#define SVC_NVIC_SYSTEM_RESET               0x18
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief This is the main SVC Handler of the CM0 application (the one from vector table).
+  * @param args SVC arguments
+  * @retval void
+  */
+void SVC_APP_Handler(uint32_t *args);
+
+/**
+  * @brief This functions triggers a CRITICAL_SECTION system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...);
+
+/**
+  * @brief This functions triggers a NVIC system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...);
+
+
+
+/**
+  * @brief Maps MSP on Privileged region and set up PSP to current stack pointer
+  * @param void
+  * @retval void
+  */
+void ThumbState_RemapMspAndSwitchToPspStack(void);
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void ThumbState_EnterUnprivilegedMode(void);
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t ThumbState_IsUnprivileged(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_PRIVILEGED_SERVICES_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h
new file mode 100644
index 00000000..d58fbba7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h
@@ -0,0 +1,109 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_wrap.h
+  * @brief   This file contains all the function prototypes for
+  *          the sys_privileged_wrap.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_PRIVILEGE_WRAP_H__
+#define __SYS_PRIVILEGE_WRAP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief If execution in unprivil mode, calls SVC and Disable All Nvic Irqs
+  * @param void
+  * @retval uint32_t nvic_iser_state
+  */
+uint32_t SYS_PRIVIL_EnterCriticalSection(void);
+
+/**
+  * @brief If execution in unprivil mode, calls SVC and restore NVIC ISER register
+  * @param uint32_t nvic_iser_state
+  * @retval void
+  */
+void SYS_PRIVIL_ExitCriticalSection(uint32_t nvic_iser_state);
+
+/**
+  * @brief disable all exceptions and after SVC keeps MODE Privileged! (stack goes back to PSP)
+  * @param  void
+  * @retval void
+  */
+void SYS_PRIVIL_DisableIrqsAndRemainPriv(void);
+
+/**
+  * @brief enable all exceptions and go to Unprivileged mode
+  * @param  void
+  * @retval void
+  */
+void SYS_PRIVIL_EnableIrqsAndGoUnpriv(void);
+
+
+/**
+  * @note All SYS_PRIVIL_NVIC_*** functions are a remapping such thatIf
+  *       if execution in unprivil mode  call SVC before __NVIC_***
+  */
+void SYS_PRIVIL_NVIC_EnableIRQ(IRQn_Type IRQn);
+uint32_t SYS_PRIVIL_NVIC_GetEnableIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_DisableIRQ(IRQn_Type IRQn);
+uint32_t SYS_PRIVIL_NVIC_GetPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SetPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_ClearPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
+uint32_t SYS_PRIVIL_NVIC_GetPriority(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SystemReset(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_PRIVILEGE_WRAP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
new file mode 100644
index 00000000..1ccff983
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
@@ -0,0 +1,209 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for configuration file to utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_CONF_H__
+#define __UTILITIES_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "cmsis_compiler.h"
+
+/* definitions to be provided to "sequencer" utility */
+#include "stm32_mem.h"
+/* definition and callback for tiny_vsnprintf */
+#include "stm32_tiny_vsnprintf.h"
+
+#include "mbmuxif_trace.h"
+#include "sys_privileged_wrap.h"
+#include "stm32_seq.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*                             sequencer configuration                       */
+/*---------------------------------------------------------------------------*/
+/**
+  * @brief Sequencer flag reserved for future use
+  */
+#define UTIL_SEQ_RFU 0
+
+/**
+  * @brief default number of tasks configured in sequencer
+  */
+#define SEQ_CONF_TASK_NBR    4
+
+/**
+  * @brief default value of priority task
+  */
+#define SEQ_CONF_PRIO_NBR    1
+
+#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
+#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
+                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
+#define VLEVEL_L 1       /*!< just essential traces */
+#define VLEVEL_M 2       /*!< functional traces */
+#define VLEVEL_H 3       /*!< all traces */
+
+#define TS_OFF 0         /*!< Log without TimeStamp */
+#define TS_ON 1          /*!< Log with TimeStamp */
+
+#define T_REG_OFF  0     /*!< Log without bitmask */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Memory placement macro
+  */
+#if defined(__CC_ARM)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
+#elif defined(__ICCARM__)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#else  /* __GNUC__ */
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+
+/**
+  * @brief Memory alignment macro
+  */
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* WIN32 */
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro to Enter CS used specifically by UTIL_SEQ_Run before going to Idle
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION_IDLE( )   SYS_PRIVIL_DisableIrqsAndRemainPriv()
+
+/**
+  * @brief macro to Exit CS used specifically by UTIL_SEQ_Run exiting from Idle
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION_IDLE( )    SYS_PRIVIL_EnableIrqsAndGoUnpriv()
+
+/**
+  * @brief Security: Map UTIL_TIMER_IRQ on Sequencer Task (rather then Isr) such to run Unprivileged
+  */
+#define UTIL_TIMER_IRQ_MAP_INIT()     do{ UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_UtilTimer_Process), UTIL_SEQ_RFU, UTIL_TIMER_IRQ_Handler);} while(0)
+
+#define UTIL_TIMER_IRQ_MAP_PROCESS()  do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_UtilTimer_Process, CFG_SEQ_Prio_0); } while(0)
+
+/**
+  * @brief Memset utilities interface to application
+  */
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTILS_ENTER_CRITICAL_SECTION() uint32_t nvic_iser_state= SYS_PRIVIL_EnterCriticalSection()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTILS_EXIT_CRITICAL_SECTION()  SYS_PRIVIL_ExitCriticalSection(nvic_iser_state)
+/**
+  * @brief macro used to Enter critical section specifically for UTIL_LPM_EnterLowPower()
+  */
+#define UTIL_LPM_ENTER_CRITICAL_SECTION_ELP()
+/**
+  * @brief macro used to Exit critical section specifically for UTIL_LPM_EnterLowPower()
+  */
+#define UTIL_LPM_EXIT_CRITICAL_SECTION_ELP()
+
+/******************************************************************************
+  * trace\advanced
+  * the define option
+  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
+  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
+  *
+  ******************************************************************************/
+
+#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
+#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
+#define UTIL_ADV_TRACE_MEMLOCATION                 UTIL_MEM_PLACE_IN_SECTION("MB_MEM2")  /*!< memory placement for trace buffer */
+#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
+#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
+#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
+#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
+#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UTILITIES_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
new file mode 100644
index 00000000..b62aa15c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
@@ -0,0 +1,142 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_def.h
+  * @author  MCD Application Team
+  * @brief   Definitions for modules requiring utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_DEF_H__
+#define __UTILITIES_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/******************************************************************************
+  * LOW POWER MANAGER
+  ******************************************************************************/
+/**
+  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+  * It lists a bit mapping of all user of the Low Power Manager
+  */
+typedef enum
+{
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
+  CFG_LPM_APPLI_Id,
+  CFG_LPM_UART_TX_Id,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/*---------------------------------------------------------------------------*/
+/*                             sequencer definitions                         */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * This is the list of priority required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Prio_0,
+  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
+
+  /* USER CODE END CFG_SEQ_Prio_Id_t */
+  CFG_SEQ_Prio_NBR,
+} CFG_SEQ_Prio_Id_t;
+
+/**
+  * This is the list of task id required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  /* CM0PLUS */
+  CFG_SEQ_Task_MbSystemCmdRcv,
+  CFG_SEQ_Task_MbTraceAckRcv,
+  CFG_SEQ_Task_MbLoRaCmdRcv,
+  CFG_SEQ_Task_MbRadioCmdRcv,
+  CFG_SEQ_Task_MbRadioNotifSnd,
+  CFG_SEQ_Task_MbKmsCmdRcv,
+  CFG_SEQ_Task_MbLmHandlerProcess,
+  CFG_SEQ_Task_RadioIrq_Process,
+  CFG_SEQ_Task_RadioRxTimeout_Process,
+  CFG_SEQ_Task_RadioTxTimeout_Process,
+  CFG_SEQ_Task_UtilTimer_Process,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t */
+  CFG_SEQ_Task_NBR
+} CFG_SEQ_Task_Id_t;
+
+/**
+  * This is a bit mapping over 32bits listing all events id supported in the application
+  */
+typedef enum
+{
+  /* CM0PLUS */
+  CFG_SEQ_Evt_MbSystemAckRcv,
+  CFG_SEQ_Evt_MbTraceAckRcv,
+  CFG_SEQ_Evt_MbLoraAckRcv,
+  CFG_SEQ_Evt_MbRadioAckRcv,
+  /* USER CODE BEGIN CFG_SEQ_IdleEvt_Id_t */
+
+  /* USER CODE END CFG_SEQ_IdleEvt_Id_t */
+  CFG_SEQ_Evt_NBR
+} CFG_SEQ_IdleEvt_Id_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UTILITIES_DEF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/flash_if.c
new file mode 100644
index 00000000..a33a673d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/flash_if.c
@@ -0,0 +1,331 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    flash_if.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "flash_if.h"
+#include "stm32_mem.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Flash empty status enumeration
+  */
+enum
+{
+  FLASH_EMPTY      = 0,
+  FLASH_NOT_EMPTY  = 1
+};
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
+  * @retval HAL Status.
+  */
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength);
+
+/**
+  * @brief  This function checks if part of Flash is empty
+            It handles 32b unaligned address
+  * @param  addr: Start of user flash area
+  * @param  size: number of bytes.
+  * @retval FLASH_EMPTY or FLASH_NOT_EMPTY.
+  */
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t FLASH_IF_Write(uint32_t address, uint8_t *data, uint32_t size, uint8_t *dataTempPage)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_1 */
+
+  /* USER CODE END FLASH_IF_Write_1 */
+  int32_t status = FLASH_OK;
+  uint32_t page_start_index = PAGE(address);
+  uint32_t page_end_index = PAGE(address + size - 1);
+  uint32_t curr_size = size;
+  uint32_t curr_dest_addr = address;
+  uint32_t curr_src_addr = (uint32_t)data;
+
+  if ((data == NULL) || ((size % sizeof(uint64_t)) != 0) || ((address % sizeof(uint64_t)) != 0))
+  {
+    return FLASH_PARAM_ERROR;
+  }
+
+  if (READ_BIT(FLASH->CR, FLASH_CR_LOCK) != 0U)
+  {
+    return FLASH_LOCK_ERROR;
+  }
+
+  if (page_start_index != page_end_index)
+  {
+    curr_size = FLASH_PAGE_SIZE - (address % FLASH_PAGE_SIZE);
+  }
+
+  for (uint32_t idx = page_start_index; idx <= page_end_index; idx++)
+  {
+    if (FLASH_IF_IsEmpty((uint8_t *)curr_dest_addr, curr_size) != FLASH_EMPTY)
+    {
+      if (dataTempPage == NULL)
+      {
+        return FLASH_PARAM_ERROR;
+      }
+      /* backup initial Flash page data in RAM area */
+      UTIL_MEM_cpy_8(dataTempPage, (uint8_t *)(idx * FLASH_PAGE_SIZE + FLASH_BASE), FLASH_PAGE_SIZE);
+      /* copy fragment into RAM area */
+      UTIL_MEM_cpy_8(&dataTempPage[((uint32_t)curr_dest_addr) % FLASH_PAGE_SIZE], (uint8_t *)curr_src_addr, curr_size);
+
+      /*  erase the Flash sector, to avoid writing twice in RAM */
+      if (FLASH_IF_EraseByPages(idx, 1, 0) != FLASH_OK)
+      {
+        status = FLASH_ERASE_ERROR;
+        break; /* exit for loop */
+      }
+      else
+      {
+        /* copy the whole flash sector including fragment from RAM to Flash*/
+        if (FLASH_IF_Write_Buffer(idx * FLASH_PAGE_SIZE + FLASH_BASE, dataTempPage, FLASH_PAGE_SIZE) != FLASH_OK)
+        {
+          status = FLASH_WRITE_ERROR;
+          break; /* exit for loop */
+        }
+      }
+    }
+    else
+    {
+      if (FLASH_IF_Write_Buffer(curr_dest_addr, (uint8_t *)curr_src_addr, curr_size) != FLASH_OK)
+      {
+        status = FLASH_WRITE_ERROR;
+        break; /* exit for loop */
+      }
+    }
+
+    /* 2nd part of memory overlapped on 2nd flash sector */
+    curr_dest_addr += curr_size;
+    curr_src_addr += curr_size;
+    curr_size = size - curr_size;
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_2 */
+
+  /* USER CODE END FLASH_IF_Write_2 */
+}
+
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data)
+{
+  /* USER CODE BEGIN FLASH_IF_Write64_1 */
+
+  /* USER CODE END FLASH_IF_Write64_1 */
+  while (*(uint64_t *)address != data)
+  {
+    while (LL_FLASH_IsActiveFlag_OperationSuspended());
+    HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
+  }
+
+  return FLASH_OK;
+  /* USER CODE BEGIN HW_FLASH_Write_2 */
+
+  /* USER CODE END HW_FLASH_Write_2 */
+}
+
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt)
+{
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_1 */
+
+  /* USER CODE END FLASH_IF_EraseByPages_1 */
+  HAL_StatusTypeDef hal_status;
+  FLASH_EraseInitTypeDef erase_str;
+  uint32_t page_error;
+
+  erase_str.TypeErase = FLASH_TYPEERASE_PAGES;
+  erase_str.Page = page;
+  erase_str.NbPages = n;
+
+  /* Erase the Page */
+  if (interrupt)
+  {
+    hal_status = HAL_FLASHEx_Erase_IT(&erase_str);
+  }
+  else
+  {
+    hal_status = HAL_FLASHEx_Erase(&erase_str, &page_error);
+  }
+
+  return ((hal_status == HAL_OK) ? FLASH_OK : ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERASE_ERROR));
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_2 */
+
+  /* USER CODE END FLASH_IF_EraseByPages_2 */
+}
+
+void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_EndOfOperationCallback_1 */
+
+  /* USER CODE END HAL_FLASH_EndOfOperationCallback_1 */
+  /* Call CleanUp callback when all requested pages have been erased */
+  if (ReturnValue == 0xFFFFFFFFUL)
+  {
+    HWCB_FLASH_EndOfCleanup();
+  }
+  /* USER CODE BEGIN HAL_FLASH_EndOfOperationCallback_2 */
+
+  /* USER CODE END HAL_FLASH_EndOfOperationCallback_2 */
+}
+
+void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_OperationErrorCallback_1 */
+
+  /* USER CODE END HAL_FLASH_OperationErrorCallback_1 */
+}
+
+void HWCB_FLASH_EndOfCleanup(void)
+{
+  /* USER CODE BEGIN HWCB_FLASH_EndOfCleanup_1 */
+
+  /* USER CODE END HWCB_FLASH_EndOfCleanup_1 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_1 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_1 */
+  uint8_t *pSrc = pSource;
+  uint64_t src_value;
+  int32_t status = FLASH_OK;
+
+  for (uint32_t i = 0; i < (uLength / sizeof(uint64_t)); i++)
+  {
+    UTIL_MEM_cpy_8(&src_value, pSrc, sizeof(uint64_t));
+
+    /* Avoid writing 0xFFFFFFFFFFFFFFFFLL on erased Flash */
+    if (src_value != UINT64_MAX)
+    {
+      status = FLASH_IF_Write64(pDestination, src_value);
+    }
+
+    pDestination += sizeof(uint64_t);
+    pSrc += sizeof(uint64_t);
+
+    if (status != FLASH_OK)
+    {
+      /* exit the for loop*/
+      break;
+    }
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_2 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_2 */
+}
+
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size)
+{
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_1 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_1 */
+  uint64_t *addr64;
+  uint32_t i;
+
+  /* start memory NOT 64bits aligned */
+  while ((((uint32_t)addr) % sizeof(uint64_t)) != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+
+  /* addr64 is 64 bits aligned */
+  addr64 = (uint64_t *)addr;
+  for (i = 0; i < (size / sizeof(uint64_t)); i++)
+  {
+    if (*addr64++ != UINT64_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+  }
+  size -= sizeof(uint64_t) * i;
+
+  /* end memory NOT 64 bits aligned */
+  addr = (uint8_t *)addr64;
+  while (size != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+  return FLASH_EMPTY;
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_2 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
new file mode 100644
index 00000000..1d49b00f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
@@ -0,0 +1,94 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.c
+  * @brief   This file provides code for the configuration
+  *          of the IPCC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "ipcc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+IPCC_HandleTypeDef hipcc;
+
+/* IPCC init function */
+void MX_IPCC_Init(void)
+{
+
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
+  hipcc.Instance = IPCC;
+  if (HAL_IPCC_Init(&hipcc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
+
+}
+
+void HAL_IPCC_MspInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspInit 0 */
+
+  /* USER CODE END IPCC_MspInit 0 */
+    /* IPCC clock enable */
+    __HAL_RCC_IPCC_CLK_ENABLE();
+
+    /* IPCC interrupt Init */
+    HAL_NVIC_SetPriority(IPCC_C2_RX_C2_TX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C2_RX_C2_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspInit 1 */
+
+  /* USER CODE END IPCC_MspInit 1 */
+  }
+}
+
+void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspDeInit 0 */
+
+  /* USER CODE END IPCC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_IPCC_CLK_DISABLE();
+
+    /* IPCC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(IPCC_C2_RX_C2_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspDeInit 1 */
+
+  /* USER CODE END IPCC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
new file mode 100644
index 00000000..d8ea5d9a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
@@ -0,0 +1,208 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.c
+  * @author  MCD Application Team
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+
+/*ipcc interface for M4*/
+#include "assert.h"
+#include "stddef.h"
+#include "ipcc_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static void (*IpccCommandRcv)(uint32_t channelIdx);
+
+static void (*IpccAcknowledgeRcv)(uint32_t channelIdx);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ confirmation of a received message by remote CPU
+  */
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ notification request by remote CPU
+  */
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx))
+{
+  /* USER CODE BEGIN IPCC_IF_Init_1 */
+
+  /* USER CODE END IPCC_IF_Init_1 */
+  /*Initialize the ipcc, initialize MSP*/
+  MX_IPCC_Init();
+
+  /* Enable C2AHB3 peripherals clock. */
+  LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC);
+  /* IPCC EXTI (AIEC) line for CPU2  */
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
+  LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
+
+  /* Initialize IPCC callback of all channels*/
+  for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
+  {
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
+  }
+
+  /* Registers upper level (application) callback */
+  IpccCommandRcv = IPCC_IF_CommandRcv_cb;
+  IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
+  return;
+  /* USER CODE BEGIN IPCC_IF_Init_2 */
+
+  /* USER CODE END IPCC_IF_Init_2 */
+}
+
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_1 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX);
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_2 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_2 */
+}
+
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_1 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX);
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_2 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_2 */
+}
+
+int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotificationSnd_1 */
+
+  /* USER CODE END IPCC_IF_NotificationSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_NotificationSnd_2 */
+
+  /* USER CODE END IPCC_IF_NotificationSnd_2 */
+}
+
+int32_t IPCC_IF_ResponseSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_ResponseSnd_1 */
+
+  /* USER CODE END IPCC_IF_ResponseSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_ResponseSnd_2 */
+
+  /* USER CODE END IPCC_IF_ResponseSnd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrTxCb_1 */
+
+  /* USER CODE END IpccIfIsrTxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccAcknowledgeRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrTxCb_2 */
+
+  /* USER CODE END IpccIfIsrTxCb_2 */
+}
+
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrRxCb_1 */
+
+  /* USER CODE END IpccIfIsrRxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccCommandRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrRxCb_2 */
+
+  /* USER CODE END IpccIfIsrRxCb_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
new file mode 100644
index 00000000..f6480afc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
@@ -0,0 +1,152 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "app_lorawan.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* USER CODE BEGIN SysInit */
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_KMS_Init();
+  MX_LoRaWAN_Init();
+  /* USER CODE BEGIN 2 */
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE END WHILE */
+    MX_LoRaWAN_Process();
+
+    /* USER CODE BEGIN 3 */
+  }
+  /* USER CODE END 3 */
+}
+
+/* USER CODE BEGIN 4 */
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  while (1)
+  {
+  }
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+{
+  while (1)
+  {
+  }
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
new file mode 100644
index 00000000..ab828d03
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
@@ -0,0 +1,147 @@
+/**
+  ******************************************************************************
+  * @file    rtc.c
+  * @brief   This file provides code for the configuration
+  *          of the RTC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "rtc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+RTC_HandleTypeDef hrtc;
+
+/* RTC init function */
+void MX_RTC_Init(void)
+{
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
+  RTC_AlarmTypeDef sAlarm = {0};
+
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
+  /** Initialize RTC Only
+  */
+  hrtc.Instance = RTC;
+  hrtc.Init.AsynchPrediv = RTC_PREDIV_A;
+  hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
+  hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE;
+  hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
+  hrtc.Init.OutPutPullUp = RTC_OUTPUT_PULLUP_NONE;
+  hrtc.Init.BinMode = RTC_BINARY_ONLY;
+  if (HAL_RTC_Init(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN Check_RTC_BKUP */
+
+  /* USER CODE END Check_RTC_BKUP */
+
+  /** Initialize RTC and set the Time and Date
+  */
+  if (HAL_RTCEx_SetSSRU_IT(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Enable the Alarm A
+  */
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = 0x0;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Enable the Alarm B
+  */
+  sAlarm.Alarm = RTC_ALARM_B;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
+
+}
+
+void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspInit 0 */
+
+  /* USER CODE END RTC_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+    PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* RTC clock enable */
+    __HAL_RCC_RTC_ENABLE();
+    __HAL_RCC_RTCAPB_CLK_ENABLE();
+
+    /* RTC interrupt Init */
+    HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
+  /* USER CODE BEGIN RTC_MspInit 1 */
+
+  /* USER CODE END RTC_MspInit 1 */
+  }
+}
+
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspDeInit 0 */
+
+  /* USER CODE END RTC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_RTC_DISABLE();
+    __HAL_RCC_RTCAPB_CLK_DISABLE();
+
+    /* RTC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(RTC_LSECSS_IRQn);
+  /* USER CODE BEGIN RTC_MspDeInit 1 */
+
+  /* USER CODE END RTC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
new file mode 100644
index 00000000..eb2e798d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -0,0 +1,164 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.c
+  * @author  MCD Application Team
+  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "stm32_lpm_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Power driver callbacks handler
+  */
+const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
+{
+  PWR_EnterSleepMode,
+  PWR_ExitSleepMode,
+
+  PWR_EnterStopMode,
+  PWR_ExitStopMode,
+
+  PWR_EnterOffMode,
+  PWR_ExitOffMode,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void PWR_EnterOffMode(void)
+{
+  /* USER CODE BEGIN EnterOffMode_1 */
+
+  /* USER CODE END EnterOffMode_1 */
+}
+
+void PWR_ExitOffMode(void)
+{
+  /* USER CODE BEGIN ExitOffMode_1 */
+
+  /* USER CODE END ExitOffMode_1 */
+}
+
+void PWR_EnterStopMode(void)
+{
+  /* USER CODE BEGIN EnterStopMode_1 */
+
+  /* USER CODE END EnterStopMode_1 */
+  HAL_SuspendTick();
+  /* Clear Status Flag before entering STOP/STANDBY Mode */
+  LL_PWR_ClearFlag_C2STOP_C2STB();
+
+  /* USER CODE BEGIN EnterStopMode_2 */
+
+  /* USER CODE END EnterStopMode_2 */
+  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
+  /* USER CODE BEGIN EnterStopMode_3 */
+
+  /* USER CODE END EnterStopMode_3 */
+}
+
+void PWR_ExitStopMode(void)
+{
+  /* USER CODE BEGIN ExitStopMode_1 */
+
+  /* USER CODE END ExitStopMode_1 */
+  /* Resume sysTick : work around for debugger problem in dual core */
+  HAL_ResumeTick();
+  /*Not retained periph:
+    ADC interface
+    DAC interface USARTx, TIMx, i2Cx, SPIx
+    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
+
+  /* USER CODE BEGIN ExitStopMode_2 */
+
+  /* USER CODE END ExitStopMode_2 */
+}
+
+void PWR_EnterSleepMode(void)
+{
+  /* USER CODE BEGIN EnterSleepMode_1 */
+
+  /* USER CODE END EnterSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_SuspendTick();
+  /* USER CODE BEGIN EnterSleepMode_2 */
+
+  /* USER CODE END EnterSleepMode_2 */
+  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+  /* USER CODE BEGIN EnterSleepMode_3 */
+
+  /* USER CODE END EnterSleepMode_3 */
+}
+
+void PWR_ExitSleepMode(void)
+{
+  /* USER CODE BEGIN ExitSleepMode_1 */
+
+  /* USER CODE END ExitSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_ResumeTick();
+
+  /* USER CODE BEGIN ExitSleepMode_2 */
+
+  /* USER CODE END ExitSleepMode_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..ea7dc033
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file         stm32wlxx_hal_msp.c
+  * @brief        This file provides code for the MSP Initialization
+  *               and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..1770f39f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,189 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+extern IPCC_HandleTypeDef hipcc;
+extern RTC_HandleTypeDef hrtc;
+extern SUBGHZ_HandleTypeDef hsubghz;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable Interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+  while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief  This function handles TZIC interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TZIC_ILA_IRQHandler(void)
+{
+  HAL_GTZC_IRQHandler();
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/**
+  * @brief This function handles RTC Wakeup + RTC Tamper and RTC TimeStamp + RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts.
+  */
+void RTC_LSECSS_IRQHandler(void)
+{
+  /* USER CODE BEGIN RTC_LSECSS_IRQn 0 */
+
+  /* USER CODE END RTC_LSECSS_IRQn 0 */
+  HAL_RTC_AlarmIRQHandler(&hrtc);
+  HAL_RTCEx_SSRUIRQHandler(&hrtc);
+  /* USER CODE BEGIN RTC_LSECSS_IRQn 1 */
+
+  /* USER CODE END RTC_LSECSS_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC RX Occupied and TX Free Interrupt.
+  */
+void IPCC_C2_RX_C2_TX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C2_RX_C2_TX_IRQn 0 */
+
+  /* USER CODE END IPCC_C2_RX_C2_TX_IRQn 0 */
+  HAL_IPCC_RX_IRQHandler(&hipcc);
+  HAL_IPCC_TX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C2_RX_C2_TX_IRQn 1 */
+
+  /* USER CODE END IPCC_C2_RX_C2_TX_IRQn 1 */
+}
+
+/**
+  * @brief This function handles SUBGHZ Radio Interrupt.
+  */
+void SUBGHZ_Radio_IRQHandler(void)
+{
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 0 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 0 */
+  HAL_SUBGHZ_IRQHandler(&hsubghz);
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 1 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
new file mode 100644
index 00000000..7b7dba4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
@@ -0,0 +1,88 @@
+/**
+  ******************************************************************************
+  * @file    subghz.c
+  * @brief   This file provides code for the configuration
+  *          of the SUBGHZ instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "subghz.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+SUBGHZ_HandleTypeDef hsubghz;
+
+/* SUBGHZ init function */
+void MX_SUBGHZ_Init(void)
+{
+
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
+  hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
+  if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
+
+}
+
+void HAL_SUBGHZ_MspInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspInit 0 */
+
+  /* USER CODE END SUBGHZ_MspInit 0 */
+    /* SUBGHZ clock enable */
+    __HAL_RCC_SUBGHZSPI_CLK_ENABLE();
+
+    /* SUBGHZ interrupt Init */
+    HAL_NVIC_SetPriority(SUBGHZ_Radio_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspInit 1 */
+
+  /* USER CODE END SUBGHZ_MspInit 1 */
+}
+
+void HAL_SUBGHZ_MspDeInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 0 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_SUBGHZSPI_CLK_DISABLE();
+
+    /* SUBGHZ interrupt Deinit */
+    HAL_NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 1 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
new file mode 100644
index 00000000..a0d7728d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
@@ -0,0 +1,475 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.c
+  * @author  MCD Application Team
+  * @brief   Initializes HW and SW system entities (not related to the radio)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdio.h>
+#include "platform.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "stm32_systime.h"
+#include "stm32_lpm.h"
+#include "timer_if.h"
+#include "utilities_def.h"
+#include "sys_debug.h"
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+#include "sys_privileged_services.h"
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_radio.h"
+#include "features_info.h"
+#include "mbmuxif_lora.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MAX_TS_SIZE (int) 16
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static EXTI_HandleTypeDef Exti41;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
+  */
+static void System_Init(void);
+
+/**
+  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
+  */
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
+/**
+  * @brief  Init the Exti used for sync the two CPU after SBSFU download
+  */
+static void MX_EXTI_Init(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SystemApp_Init(void)
+{
+  int8_t init_status;
+  /* USER CODE BEGIN SystemApp_Init_1 */
+
+  /* USER CODE END SystemApp_Init_1 */
+
+  /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
+  UTIL_TIMER_Init();
+
+  /* #warning "should be removed when proper obl is done" */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /*Init low power manager*/
+  UTIL_LPM_Init();
+  /* Disable Stand-by mode */
+  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+
+#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
+  /* Disable Stop Mode */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+#elif !defined (LOW_POWER_DISABLE)
+#error LOW_POWER_DISABLE not defined
+#endif /* LOW_POWER_DISABLE */
+
+  /* Init the Exti used for sync the two CPU after SBSFU download */
+  MX_EXTI_Init();
+
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+  ThumbState_RemapMspAndSwitchToPspStack();
+  ThumbState_EnterUnprivilegedMode();
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+
+  /* Wait for CPU1 to be ready */
+  while (HAL_EXTI_GetPending(&Exti41, EXTI_TRIGGER_RISING_FALLING) != 0x01u)
+  {
+    /* Wait CPU1 Event */
+  }
+  /* Acknowledge CPU1 event */
+  HAL_EXTI_ClearPending(&Exti41, EXTI_TRIGGER_RISING_FALLING);
+
+  /* Init Feat_Info table */
+  FEAT_INFO_Init();
+
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
+  init_status = MBMUXIF_SystemInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+
+  System_Init();
+
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
+
+  /* USER CODE BEGIN SystemApp_Init_2 */
+
+  /* USER CODE END SystemApp_Init_2 */
+}
+
+void TimestampNow(uint8_t *buff, uint16_t *size)
+{
+  /* USER CODE BEGIN TimestampNow_1 */
+
+  /* USER CODE END TimestampNow_1 */
+  SysTime_t curtime = SysTimeGet();
+  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
+  *size = strlen((char *)buff);
+  /* USER CODE BEGIN TimestampNow_2 */
+
+  /* USER CODE END TimestampNow_2 */
+}
+
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Kms_Cmd_1 */
+
+  /* USER CODE END Process_Kms_Cmd_1 */
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
+  APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case KMS_CRYPTO_HMAC_SHA256_MSG_ID:
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Cmd rcv : KMS_CRYPTO_HMAC_SHA256_MSG_ID\r\n");
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Crypto aKey length %d\r\n", com_buffer[1]);
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Crypto aKey string %s\r\n", (char *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0;
+      ComObj->ReturnVal = (uint32_t) -5; /* dummy value for test */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_L, "<CM0PLUS(KMS)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_KMS_ID);
+
+  /* USER CODE BEGIN Process_Kms_Cmd_2 */
+
+  /* USER CODE END Process_Kms_Cmd_2 */
+}
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Sys_Cmd_1 */
+
+  /* USER CODE END Process_Sys_Cmd_1 */
+  APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(System)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case SYS_OTHER_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      break;
+
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+
+    /* USER CODE END Process_Sys_Cmd_switch_case */
+
+    default:
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+
+      /* USER CODE END Process_Sys_Cmd_switch_default */
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_M, "<CM0PLUS(System)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  /* USER CODE BEGIN Process_Sys_Cmd_2 */
+
+  /* USER CODE END Process_Sys_Cmd_2 */
+}
+
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
+{
+  /**
+    * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
+    * all to process all tack except TaskId_bm
+    */
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_1 */
+  UTIL_SEQ_Run(~TaskId_bm);
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_2 */
+  return;
+}
+
+/**
+  * @brief redefines __weak function in stm32_seq.c such to enter low power
+  */
+void UTIL_SEQ_Idle(void)
+{
+  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
+
+  /* USER CODE END UTIL_SEQ_Idle_1 */
+  UTIL_LPM_EnterLowPower();
+  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
+
+  /* USER CODE END UTIL_SEQ_Idle_2 */
+}
+
+void GetUniqueId(uint8_t *id)
+{
+  /* USER CODE BEGIN GetUniqueId_1 */
+
+  /* USER CODE END GetUniqueId_1 */
+  uint32_t val = 0;
+  val = LL_FLASH_GetUDN();
+  if (val == 0xFFFFFFFF)  /* Normally this should not happen */
+  {
+    uint32_t ID_1_3_val = HAL_GetUIDw0() + HAL_GetUIDw2();
+    uint32_t ID_2_val = HAL_GetUIDw1();
+
+    id[7] = (ID_1_3_val) >> 24;
+    id[6] = (ID_1_3_val) >> 16;
+    id[5] = (ID_1_3_val) >> 8;
+    id[4] = (ID_1_3_val);
+    id[3] = (ID_2_val) >> 24;
+    id[2] = (ID_2_val) >> 16;
+    id[1] = (ID_2_val) >> 8;
+    id[0] = (ID_2_val);
+  }
+  else  /* Typical use case */
+  {
+    id[7] = val & 0xFF;
+    id[6] = (val >> 8) & 0xFF;
+    id[5] = (val >> 16) & 0xFF;
+    id[4] = (val >> 24) & 0xFF;
+    val = LL_FLASH_GetDeviceID();
+    id[3] = val & 0xFF;
+    val = LL_FLASH_GetSTCompanyID();
+    id[2] = val & 0xFF;
+    id[1] = (val >> 8) & 0xFF;
+    id[0] = (val >> 16) & 0xFF;
+  }
+
+  /* USER CODE BEGIN GetUniqueId_2 */
+
+  /* USER CODE END GetUniqueId_2 */
+}
+
+uint32_t GetDevAddr(void)
+{
+  uint32_t val = 0;
+  /* USER CODE BEGIN GetDevAddr_1 */
+
+  /* USER CODE END GetDevAddr_1 */
+
+  val = LL_FLASH_GetUDN();
+  if (val == 0xFFFFFFFF)
+  {
+    val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
+  }
+
+  /* USER CODE BEGIN GetDevAddr_2 */
+
+  /* USER CODE END GetDevAddr_2 */
+  return val;
+
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void System_Init(void)
+{
+  /* USER CODE BEGIN System_Init_1 */
+
+  /* USER CODE END System_Init_1 */
+  /* No need of Enable Internal Wake-up line for CPU2 */
+  LL_C2_PWR_DisableInternWU();
+
+  /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
+  LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
+  LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
+
+  /* Enable Radio IRQ lines interrupt for CPU2 */
+  LL_C2_PWR_SetRadioIRQTrigger(LL_PWR_RADIO_IRQ_TRIGGER_WU_IT);
+  /* Enable Radio EXTI lines for CPU2 (Needed for low power STOP mode */
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_44);
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_45);
+
+  /* Ensure that MSI is wake-up system clock */
+  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
+  /* USER CODE BEGIN System_Init_Last */
+
+  /* USER CODE END System_Init_Last */
+}
+
+/* Disable StopMode when traces need to be printed */
+void UTIL_ADV_TRACE_PreSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
+}
+/* Re-enable StopMode when traces have been printed */
+void UTIL_ADV_TRACE_PostSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_2 */
+}
+
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
+{
+  /* USER CODE BEGIN tiny_snprintf_like_1 */
+
+  /* USER CODE END tiny_snprintf_like_1 */
+  va_list vaArgs;
+  va_start(vaArgs, strFormat);
+  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
+  va_end(vaArgs);
+  /* USER CODE BEGIN tiny_snprintf_like_2 */
+
+  /* USER CODE END tiny_snprintf_like_2 */
+}
+
+/**
+  * Enable EXTI controller
+  * Configure line 41
+  */
+static void MX_EXTI_Init(void)
+{
+  EXTI_ConfigTypeDef exit41config;
+
+  exit41config.Line = EXTI_LINE_41;
+  exit41config.Mode = EXTI_MODE_INTERRUPT;
+  exit41config.Trigger = EXTI_TRIGGER_RISING;
+  HAL_EXTI_SetConfigLine(&Exti41, &exit41config);
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/* HAL overload functions ---------------------------------------------------------*/
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
+{
+  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
+  /* USER CODE BEGIN HAL_InitTick_1 */
+
+  /* USER CODE END HAL_InitTick_1 */
+  return HAL_OK;
+  /* USER CODE BEGIN HAL_InitTick_2 */
+
+  /* USER CODE END HAL_InitTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+uint32_t HAL_GetTick(void)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_GetTick_1 */
+
+  /* USER CODE END HAL_GetTick_1 */
+  return TIMER_IF_GetTimerValue();
+  /* USER CODE BEGIN HAL_GetTick_2 */
+
+  /* USER CODE END HAL_GetTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+void HAL_Delay(__IO uint32_t Delay)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_Delay_1 */
+
+  /* USER CODE END HAL_Delay_1 */
+  TIMER_IF_DelayMs(Delay);
+  /* USER CODE BEGIN HAL_Delay_2 */
+
+  /* USER CODE END HAL_Delay_2 */
+}
+
+/* USER CODE BEGIN Overload_HAL_weaks */
+
+/* USER CODE END Overload_HAL_weaks */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c
new file mode 100644
index 00000000..c598f589
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c
@@ -0,0 +1,336 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_services.c
+  * @author  MCD Application Team
+  * @brief   gives access to COrtex services like ThumbState, SVC, MPU
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sys_privileged_services.h" /* shall be placed before se_interface_application.h */
+#include "se_interface_application.h"
+#include "stm32_seq.h"
+#include "subghz.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#elif defined(__CC_ARM)
+#include "mapping_fwimg.h"
+#include "mapping_sbsfu.h"
+#endif /* __ARMCC_VERSION */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void APP_NVIC_SVC_Handler(uint32_t *args);
+void APP_CRITICALSECTION_SVC_Handler(uint32_t *args);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+
+/**
+  * @brief This functions triggers a CRITICAL_SECTION system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+#if defined (__ICCARM__) || defined(__GNUC__)
+void SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+#if defined ( __GNUC__ )
+  /*
+    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
+    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
+    */
+  __ASM volatile("MOV r1, %0" : : "r"(syscall));
+#endif /* __GNUC__ */
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+    */
+  __ASM volatile("SVC #1");  /* 1 is the hard-coded value to indicate NVIC syscall */
+}
+#elif defined(__CC_ARM)
+/*
+  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
+  * caller is in same file. Defining the function as ASM avoids the issue.
+  */
+void __ASM SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+  /*
+   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+   * example an SVC.
+   * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+   */
+  SVC #1
+  BX LR
+}
+#endif /* (__ICCARM__) || defined(__GNUC__) */
+
+
+/**
+  * @brief This functions triggers a NVIC system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+#if defined (__ICCARM__) || defined(__GNUC__)
+void SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+#if defined ( __GNUC__ )
+  /*
+    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
+    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
+    */
+  __ASM volatile("MOV r1, %0" : : "r"(syscall));
+#endif /* __GNUC__ */
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+    */
+  __ASM volatile("SVC #2");   /* 2 is the hard-coded value to indicate NVIC syscall */
+}
+#elif defined(__CC_ARM)
+/*
+  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
+  * caller is in same file. Defining the function as ASM avoids the issue.
+  */
+void __ASM SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+  /*
+   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+   * example an SVC.
+   * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+   */
+  SVC #2
+  BX LR
+}
+#endif /* (__ICCARM__) || defined(__GNUC__) */
+
+/**
+  * @brief This is the SVC Handler of the CM0 application (the one from vector table).
+  * @param args SVC arguments
+  * @retval void
+  */
+void SVC_APP_Handler(uint32_t *args)
+{
+  /* in PSP (args) contains caller context as follow *
+    * args[0] :R0
+    * args[1] :R1
+    * args[2] :R2
+    * args[3] :R3
+    * args[4] :R12
+    * args[5] :LR
+    * args[6] :PC to return after exception
+    * args[7] :xPSR
+  */
+  uint8_t svc_index = ((char *)args[6])[-2];
+
+  switch (svc_index)
+  {
+    case 0x0: /* SE SVC CALL : called by SECoreBin*/
+    {
+      SE_APP_SVC_Handler(args);
+      break;
+    }
+    case 0x1:
+    {
+      APP_CRITICALSECTION_SVC_Handler(args);
+      break;
+    }
+    case 0x2:
+    {
+      APP_NVIC_SVC_Handler(args);
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+}
+
+/**
+  * @brief This is the handler that groups CRITICAL_SESSION functions via SVC calls.
+  * @param args SVC arguments
+  * @retval void
+  */
+void APP_CRITICALSECTION_SVC_Handler(uint32_t *args)
+{
+  uint32_t nvic_iser_state = 0;
+  uint32_t *pRet = (uint32_t *)(args[0]);
+
+  switch (args[1])
+  {
+    case SVC_DISABLE_ALL_NVIC_IRQS:
+    {
+      /*all __NVIC_GetEnableIRQ*/
+      nvic_iser_state = NVIC->ISER[0];
+      /* clear all positive interrupt e.g. no see IRQn_Type in core_cm0plus.h*/
+      NVIC->ICER[0] = nvic_iser_state;
+      break;
+    }
+    case SVC_RESTORE_NVIC_IRQS:
+    {
+      NVIC->ISER[0] = args[2] | NVIC->ISER[0];
+      break;
+    }
+    case SVC_DISABLE_ALL_EXCEPTIONS:
+    {
+      __disable_irq();
+      __set_CONTROL(__get_CONTROL() & 0xFFFE); /* bit 0 = 0: remain privileged   */
+      /* note: exiting the SVC will go back to PSP stack but remain priv mode */
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+  *pRet = nvic_iser_state;
+}
+
+/**
+  * @brief This is the handler that groups NVIC functions via SVC calls.
+  * @param args SVC arguments
+  * @retval void
+  */
+void APP_NVIC_SVC_Handler(uint32_t *args)
+{
+  uint32_t ret = 0;
+  uint32_t *pRet = (uint32_t *)(args[0]);
+
+  switch (args[1])
+  {
+    case SVC_NVIC_ENABLE_IRQ:
+    {
+      __NVIC_EnableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_GET_ENABLE_IRQ:
+    {
+      ret = __NVIC_GetEnableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_DISABLE_IRQ:
+    {
+      __NVIC_DisableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_GET_PENDING_IRQ:
+    {
+      ret = __NVIC_GetPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SET_PENDING_IRQ:
+    {
+      __NVIC_SetPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_CLEAR_PENDING_IRQ:
+    {
+      __NVIC_ClearPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SET_PRIORITY:
+    {
+      __NVIC_SetPriority((IRQn_Type) args[2], args[3]);
+      break;
+    }
+    case SVC_NVIC_GET_PRIORITY:
+    {
+      ret = __NVIC_GetPriority((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SYSTEM_RESET:
+    {
+      __NVIC_SystemReset();
+      break;
+    }
+    default:
+    {
+      HAL_NVIC_SystemReset();
+      break;
+    }
+  }
+  *pRet = ret;
+}
+
+
+/**
+  * @brief Maps MSP on Privileged region and set up PSP to current stack pointer
+  * @param void
+  * @retval void
+  */
+void ThumbState_RemapMspAndSwitchToPspStack(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change Main Stack to point on privileged stack */
+  __ISB();
+}
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void ThumbState_EnterUnprivilegedMode(void)
+{
+  __set_CONTROL(__get_CONTROL() | 3); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t ThumbState_IsUnprivileged(void)
+{
+  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c
new file mode 100644
index 00000000..c1dcf9be
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c
@@ -0,0 +1,255 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_privileged_wrap.c
+  * @author  MCD Application Team
+  * @brief   Wrapper functions to call SVC when in Unprivilege mode
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sys_privileged_wrap.h"
+#include "sys_privileged_services.h"
+#include "stm32_seq.h"
+#include "subghz.h"
+#include "sys_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+uint32_t SYS_PRIVIL_EnterCriticalSection(void)
+{
+  uint32_t nvic_iser_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* disable NVIC irqs, then back to PSP and Unpriv */
+    SYS_CRITICALSECTION_SvcCall(&nvic_iser_state, SVC_DISABLE_ALL_NVIC_IRQS);
+  }
+  else
+  {
+    nvic_iser_state = NVIC->ISER[0];
+    NVIC->ICER[0] = nvic_iser_state;
+  }
+  return nvic_iser_state;
+}
+
+void SYS_PRIVIL_ExitCriticalSection(uint32_t nvic_iser_state)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* enable NVIC irqs, then back to PSP and Unpriv */
+    uint32_t dummy_ret = 0;
+    SYS_CRITICALSECTION_SvcCall(&dummy_ret, SVC_RESTORE_NVIC_IRQS, nvic_iser_state);
+  }
+  else
+  {
+    NVIC->ISER[0] = nvic_iser_state | NVIC->ISER[0];
+  }
+}
+
+void SYS_PRIVIL_DisableIrqsAndRemainPriv(void)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* disable exceptions and after SVC keeps MODE Privileged! (stack goes back to PSP)*/
+    uint32_t dummy_ret = 0;
+    SYS_CRITICALSECTION_SvcCall(&dummy_ret, SVC_DISABLE_ALL_EXCEPTIONS);
+  }
+  else
+  {
+    __disable_irq();
+  }
+}
+
+void SYS_PRIVIL_EnableIrqsAndGoUnpriv(void)
+{
+  __enable_irq();
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+  ThumbState_EnterUnprivilegedMode(); /* Goes always Unpriv */
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+}
+
+void SYS_PRIVIL_NVIC_EnableIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_ENABLE_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_EnableIRQ(IRQn);
+  }
+}
+
+
+uint32_t SYS_PRIVIL_NVIC_GetEnableIRQ(IRQn_Type IRQn)
+{
+  uint32_t irqn_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_state, SVC_NVIC_GET_ENABLE_IRQ, IRQn);
+  }
+  else
+  {
+    irqn_state = __NVIC_GetEnableIRQ(IRQn);
+  }
+  return irqn_state;
+}
+
+
+void SYS_PRIVIL_NVIC_DisableIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_DISABLE_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_DisableIRQ(IRQn);
+  }
+}
+
+uint32_t SYS_PRIVIL_NVIC_GetPendingIRQ(IRQn_Type IRQn)
+{
+  uint32_t irqn_pending_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_pending_state, SVC_NVIC_GET_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    irqn_pending_state = __NVIC_GetPendingIRQ(IRQn);
+  }
+  return irqn_pending_state;
+}
+
+void SYS_PRIVIL_NVIC_SetPendingIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SET_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_SetPendingIRQ(IRQn);
+  }
+}
+
+void SYS_PRIVIL_NVIC_ClearPendingIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_CLEAR_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_ClearPendingIRQ(IRQn);
+  }
+}
+
+void SYS_PRIVIL_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SET_PRIORITY, IRQn, priority);
+  }
+  else
+  {
+    __NVIC_SetPriority(IRQn, priority);
+  }
+}
+
+uint32_t SYS_PRIVIL_NVIC_GetPriority(IRQn_Type IRQn)
+{
+  uint32_t irqn_prio;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_prio, SVC_NVIC_GET_PRIORITY, IRQn);
+  }
+  else
+  {
+    irqn_prio = __NVIC_GetPriority(IRQn);
+  }
+  return irqn_prio;
+}
+
+void SYS_PRIVIL_NVIC_SystemReset(void)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SYSTEM_RESET);
+  }
+  else
+  {
+    __NVIC_SystemReset();
+  }
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
new file mode 100644
index 00000000..6405002c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
@@ -0,0 +1,545 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.c
+  * @author  MCD Application Team
+  * @brief   Configure RTC Alarm, Tick and Calendar manager
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
+#include "stm32_lpm.h"
+#include "utilities_def.h"
+#include "stm32wlxx_ll_rtc.h"
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief RTC handle
+  */
+extern RTC_HandleTypeDef hrtc;
+
+/**
+  * @brief Timer driver callbacks handler
+  */
+const UTIL_TIMER_Driver_s UTIL_TimerDriver =
+{
+  TIMER_IF_Init,
+  NULL,
+
+  TIMER_IF_StartTimer,
+  TIMER_IF_StopTimer,
+
+  TIMER_IF_SetTimerContext,
+  TIMER_IF_GetTimerContext,
+
+  TIMER_IF_GetTimerElapsedTime,
+  TIMER_IF_GetTimerValue,
+  TIMER_IF_GetMinimumTimeout,
+
+  TIMER_IF_Convert_ms2Tick,
+  TIMER_IF_Convert_Tick2ms,
+};
+
+/**
+  * @brief SysTime driver callbacks handler
+  */
+const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
+{
+  TIMER_IF_BkUp_Write_Seconds,
+  TIMER_IF_BkUp_Read_Seconds,
+  TIMER_IF_BkUp_Write_SubSeconds,
+  TIMER_IF_BkUp_Read_SubSeconds,
+  TIMER_IF_GetTime,
+};
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Minimum timeout delay of Alarm in ticks
+  */
+#define MIN_ALARM_DELAY    3
+
+/**
+  * @brief Backup seconds register
+  */
+#define RTC_BKP_SECONDS    RTC_BKP_DR0
+
+/**
+  * @brief Backup subseconds register
+  */
+#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
+
+/**
+  * @brief Backup msbticks register
+  */
+#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
+
+/* #define RTIF_DEBUG */
+
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifdef RTIF_DEBUG
+#include "sys_app.h" /*for app_log*/
+/**
+  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
+  */
+#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+#else
+/**
+  * @brief not used
+  */
+#define TIMER_IF_DBG_PRINTF(...)
+#endif /* RTIF_DEBUG */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Indicates if the RTC is already Initialized or not
+  */
+static bool RTC_Initialized = false;
+
+/**
+  * @brief RtcTimerContext
+  */
+static uint32_t RtcTimerContext = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Get rtc timer Value in rtc tick
+  * @return val the rtc timer value (upcounting)
+  */
+static inline uint32_t GetTimerTicks(void);
+
+/**
+  * @brief Writes MSBticks to backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @param[in] MSBticks
+  */
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
+
+/**
+  * @brief Reads MSBticks from backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @retval MSBticks
+  */
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+UTIL_TIMER_Status_t TIMER_IF_Init(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_Init */
+
+  /* USER CODE END TIMER_IF_Init */
+  if (RTC_Initialized == false)
+  {
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+    /*Init RTC*/
+    MX_RTC_Init();
+    /*Stop Timer */
+    TIMER_IF_StopTimer();
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
+    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
+    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
+    /*overload RTC feature enable*/
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+
+    /*Enable Direct Read of the calendar registers (not through Shadow) */
+    HAL_RTCEx_EnableBypassShadow(&hrtc);
+    /*Initialize MSB ticks*/
+    TIMER_IF_BkUp_Write_MSBticks(0);
+
+    TIMER_IF_SetTimerContext();
+
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
+    RTC_Initialized = true;
+  }
+
+  /* USER CODE BEGIN TIMER_IF_Init_Last */
+
+  /* USER CODE END TIMER_IF_Init_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StartTimer */
+
+  /* USER CODE END TIMER_IF_StartTimer */
+  RTC_AlarmTypeDef sAlarm = {0};
+  /*Stop timer if one is already started*/
+  TIMER_IF_StopTimer();
+  timeout += RtcTimerContext;
+
+  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
+  /* starts timer*/
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_B;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
+
+  /* USER CODE END TIMER_IF_StartTimer_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StopTimer */
+
+  /* USER CODE END TIMER_IF_StopTimer */
+  /* Clear RTC Alarm Flag */
+  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRBF);
+  /* Disable the Alarm A interrupt */
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B);
+  /*overload RTC feature enable*/
+  hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
+
+  /* USER CODE END TIMER_IF_StopTimer_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_SetTimerContext(void)
+{
+  /*store time context*/
+  RtcTimerContext = GetTimerTicks();
+
+  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
+
+  /* USER CODE END TIMER_IF_SetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerContext(void)
+{
+  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
+
+  /* USER CODE END TIMER_IF_GetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerElapsedTime(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetTimerValue(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
+
+  /* USER CODE END TIMER_IF_GetTimerValue */
+  if (RTC_Initialized == true)
+  {
+    ret = GetTimerTicks();
+  }
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetMinimumTimeout(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick */
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
+}
+
+void TIMER_IF_DelayMs(uint32_t delay)
+{
+  /* USER CODE BEGIN TIMER_IF_DelayMs */
+
+  /* USER CODE END TIMER_IF_DelayMs */
+  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
+  uint32_t timeout = GetTimerTicks();
+
+  /* Wait delay ms */
+  while (((GetTimerTicks() - timeout)) < delayTicks)
+  {
+    __NOP();
+  }
+  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
+
+  /* USER CODE END TIMER_IF_DelayMs_Last */
+}
+
+void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
+  {
+    /*Alarm A reserved for CM4: notify CM4 that Alarm A was raised */
+    com_obj = MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+    if (com_obj != NULL)
+    {
+      com_obj->MsgId = SYS_RTC_ALARM_MSG_ID;
+      com_obj->ParamCnt = 0;
+      MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+    }
+  }
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
+}
+
+void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
+
+  /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
+  UTIL_TIMER_IRQ_MAP_PROCESS();
+  /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
+
+  /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
+}
+
+void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback */
+  /*called every 48 days with 1024 ticks per seconds*/
+  TIMER_IF_DBG_PRINTF(">>Handler SSRUnderflow at %d\n\r", GetTimerTicks());
+  /*Increment MSBticks*/
+  uint32_t MSB_ticks = TIMER_IF_BkUp_Read_MSBticks();
+  TIMER_IF_BkUp_Write_MSBticks(MSB_ticks + 1);
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback_Last */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback_Last */
+}
+
+uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
+{
+  uint32_t seconds = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTime */
+
+  /* USER CODE END TIMER_IF_GetTime */
+  uint64_t ticks;
+  uint32_t timerValueLsb = GetTimerTicks();
+  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
+
+  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
+
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+
+  ticks = (uint32_t) ticks & RTC_PREDIV_S;
+
+  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
+
+  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
+}
+
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
+}
+
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
+}
+
+uint32_t TIMER_IF_BkUp_Read_Seconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_MSBTICKS, MSBticks);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks_Last */
+}
+
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
+  uint32_t MSBticks;
+  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
+  return MSBticks;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
+}
+
+static inline uint32_t GetTimerTicks(void)
+{
+  /* USER CODE BEGIN GetTimerTicks */
+
+  /* USER CODE END GetTimerTicks */
+  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
+  /* USER CODE BEGIN GetTimerTicks_Last */
+
+  /* USER CODE END GetTimerTicks_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c
new file mode 100644
index 00000000..b2d71dce
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c
@@ -0,0 +1,62 @@
+/* USER CODE BEGIN Header */
+/**
+ ******************************************************************************
+  * File Name          : app_kms.c
+  * Description        : This file provides code for the configuration
+  *                      of the kms instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_kms.h"
+#include "tkms.h"
+
+/* USER CODE BEGIN 0 */
+/* USER CODE END 0 */
+
+/* USER CODE BEGIN 1 */
+/* USER CODE END 1 */
+
+/* Global variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN 2 */
+/* USER CODE END 2 */
+
+/* KMS init function */
+void MX_KMS_Init(void)
+{
+/***************************************/
+   /**
+  */
+
+  C_Initialize(NULL);
+
+  /* USER CODE BEGIN 3 */
+  /* USER CODE END 3 */
+
+}
+
+/* USER CODE BEGIN 4 */
+/* USER CODE END 4 */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h
new file mode 100644
index 00000000..8ca7171b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h
@@ -0,0 +1,57 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * File Name          : app_kms.h
+  * Description        : This file provides code for the configuration
+  *                      of the kms instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __app_kms_H
+#define __app_kms_H
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN 0 */
+/* USER CODE END 0 */
+
+/* Global variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN 1 */
+/* USER CODE END 1 */
+
+/* KMS init function */
+void MX_KMS_Init(void);
+
+/* USER CODE BEGIN 2 */
+/* USER CODE END 2 */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*__kms_H */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
new file mode 100644
index 00000000..f827d8ed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
@@ -0,0 +1,82 @@
+/*!
+ * \file      Commissioning.h
+ *
+ * \brief     End-device commissioning parameters
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2020 Semtech
+ *
+ * \endcode
+ */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    Commissioning.h
+  * @author  MCD Application Team
+  * @brief   End-device commissioning parameters
+  ******************************************************************************
+ */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __COMMISSIONING_H__
+#define __COMMISSIONING_H__
+
+/*!
+ ******************************************************************************
+ ********************************** WARNING ***********************************
+ ******************************************************************************
+
+ The LoRaWAN AES128 keys are stored and provisioned on secure-elements.
+
+ This project provides a software emulated secure-element.
+ The LoRaWAN AES128 keys SHALL be updated under
+ src/peripherals/<secure-element name>-se\se-identity.h file.
+
+ ******************************************************************************
+ ******************************************************************************
+ ******************************************************************************
+ */
+#include "se-identity.h"
+
+/* USER CODE BEGIN EC1 */
+
+/* USER CODE END EC1 */
+
+/*!
+ * When using ABP activation the MAC layer must know in advance to which server
+ * version it will be connected.
+ */
+#define ABP_ACTIVATION_LRWAN_VERSION_V10x                  0x01000300 /* 1.0.3.0 */
+
+#define ABP_ACTIVATION_LRWAN_VERSION                       ABP_ACTIVATION_LRWAN_VERSION_V10x
+
+/*!
+ * Indicates if the end-device support the operation with repeaters
+ */
+#define LORAWAN_REPEATER_SUPPORT                           false
+
+/*!
+ * Indicates if the end-device is to be connected to a private or public network
+ */
+#define LORAWAN_PUBLIC_NETWORK                             true
+
+/*!
+ * Current network ID
+ */
+#define LORAWAN_NETWORK_ID                                 ( uint32_t )0
+
+/* USER CODE BEGIN EC2 */
+
+/* USER CODE END EC2 */
+
+#endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
new file mode 100644
index 00000000..bcd8821e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
@@ -0,0 +1,96 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_lorawan.h"
+#include "lora_app.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void MX_LoRaWAN_Init(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Init_1 */
+
+  /* USER CODE END MX_LoRaWAN_Init_1 */
+  SystemApp_Init();
+  /* USER CODE BEGIN MX_LoRaWAN_Init_2 */
+
+  /* USER CODE END MX_LoRaWAN_Init_2 */
+}
+
+void MX_LoRaWAN_Process(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Process_1 */
+
+  /* USER CODE END MX_LoRaWAN_Process_1 */
+  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
+  /* USER CODE BEGIN MX_LoRaWAN_Process_2 */
+
+  /* USER CODE END MX_LoRaWAN_Process_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
new file mode 100644
index 00000000..fbe16b6d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
@@ -0,0 +1,76 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_LORAWAN_H__
+#define __APP_LORAWAN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported Functions Prototypes------------------------------------------------------- */
+/**
+  * @brief  Init Lora Application
+  */
+void MX_LoRaWAN_Init(void);
+
+/**
+  * @brief  Entry Lora Process or scheduling
+  */
+void MX_LoRaWAN_Process(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_LORAWAN_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/fw_update_agent.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/fw_update_agent.c
new file mode 100644
index 00000000..7cc3b146
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/fw_update_agent.c
@@ -0,0 +1,140 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    fw_update_agent.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage Firmware Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#define SFU_FWIMG_COMMON_C
+#include "sfu_fwimg_regions.h"
+
+#include "fw_update_agent.h"
+#include "sys_app.h"
+#include "utilities.h"
+
+#include "flash_if.h"
+#include "se_def_metadata.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * Structure containing values related to the management of multi-images in Flash
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+} FwImageFlashTypeDef;
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * Size of header to write in Swap sector to trigger installation
+  */
+#define INSTALLED_LENGTH                            ((uint32_t)512U)
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+#if (INTEROP_TEST_MODE == 0)
+void FwUpdateAgent_Run(void)
+{
+  /* USER CODE BEGIN FwUpdateAgent_Run_1 */
+
+  /* USER CODE END FwUpdateAgent_Run_1 */
+  int32_t status = FLASH_OK;
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+  uint32_t first_page = PAGE(FRAG_DECODER_SWAP_REGION_START);
+  uint32_t nb_pages = PAGE(FRAG_DECODER_SWAP_REGION_START + SFU_IMG_IMAGE_OFFSET - 1) - first_page + 1U;
+
+  /* Read header in slot 1 */
+  UTIL_MEM_cpy_8(fw_header_dwl_slot, (void *)FRAG_DECODER_DWL_REGION_START, SE_FW_HEADER_TOT_LEN);
+
+  /* Ask for installation at next reset */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    status = FLASH_IF_EraseByPages(first_page, nb_pages, 0U);
+
+    if (status == FLASH_OK)
+    {
+      status = FLASH_IF_Write(FRAG_DECODER_SWAP_REGION_START, fw_header_dwl_slot, SE_FW_HEADER_TOT_LEN, NULL);
+    }
+    HAL_FLASH_Lock();
+  }
+  else
+  {
+    status = FLASH_LOCK_ERROR;
+  }
+
+  if (status == FLASH_OK)
+  {
+    /* System Reboot*/
+    NVIC_SystemReset();
+  }
+  else
+  {
+    APP_LOG(TS_OFF, VLEVEL_M, "FW Update Agent Run Failed\r\n");
+  }
+  /* USER CODE BEGIN FwUpdateAgent_Run_2 */
+
+  /* USER CODE END FwUpdateAgent_Run_2 */
+}
+#endif /* INTEROP_TEST_MODE */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/fw_update_agent.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/fw_update_agent.h
new file mode 100644
index 00000000..88062f78
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/fw_update_agent.h
@@ -0,0 +1,74 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    fw_update_agent.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage Firmware Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __FW_UPDATE_AGENT_H__
+#define __FW_UPDATE_AGENT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "frag_decoder_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+#if (INTEROP_TEST_MODE == 0)
+/**
+  * @brief  Run FW Update process.
+  * @param  None
+  * @retval None
+  */
+void FwUpdateAgent_Run(void);
+#endif /* INTEROP_TEST_MODE == 0 */
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__FW_UPDATE_AGENT_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
new file mode 100644
index 00000000..2c3ddcdf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
@@ -0,0 +1,90 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sys_app.h"
+#include "lora_app.h"
+#include "stm32_seq.h"
+#include "utilities_def.h"
+#include "LmHandler.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Exported functions ---------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void InitPackageProcess(void)
+{
+  /* USER CODE BEGIN InitPackageProcess_1 */
+
+  /* USER CODE END InitPackageProcess_1 */
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLmHandlerProcess), UTIL_SEQ_RFU, LmHandlerProcess);
+  /* USER CODE BEGIN InitPackageProcess_2 */
+
+  /* USER CODE END InitPackageProcess_2 */
+}
+
+void OnMacProcessNotify(void)
+{
+  /* USER CODE BEGIN OnMacProcessNotify_1 */
+
+  /* USER CODE END OnMacProcessNotify_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLmHandlerProcess), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN OnMacProcessNotify_2 */
+
+  /* USER CODE END OnMacProcessNotify_2 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
new file mode 100644
index 00000000..8bf1f9f1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
@@ -0,0 +1,66 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORA_APP_H__
+#define __LORA_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+void InitPackageProcess(void);
+
+void OnMacProcessNotify(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LORA_APP_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
new file mode 100644
index 00000000..dc745797
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
@@ -0,0 +1,90 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app_version.h
+  * @author  MCD Application Team
+  * @brief   Definition the version of the CM0PLUS application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_VERSION_H__
+#define __APP_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
+#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
+
+#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
+#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
+#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
+#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Application version
+  */
+#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
+                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
+                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
+                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
+
+/**
+  * @brief LoRaWAN CM0PLUS application version
+  */
+#define __CM0_APP_VERSION             __APP_VERSION
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_VERSION_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
new file mode 100644
index 00000000..9b628efe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
@@ -0,0 +1,398 @@
+/*!
+ * \file      se-identity.h
+ *
+ * \brief     Secure Element identity and keys
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2020 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    se-identity.h
+  * @author  MCD Application Team
+  * @brief   Secure Element identity and keys
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SOFT_SE_IDENTITY_H__
+#define __SOFT_SE_IDENTITY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported Includes --------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/*!
+ ******************************************************************************
+ ********************************** WARNING ***********************************
+ ******************************************************************************
+  The secure-element implementation supports both 1.0.x and 1.1.x LoRaWAN
+  versions of the specification.
+  Thus it has been decided to use the 1.1.x keys and EUI name definitions.
+  The below table shows the names equivalence between versions:
+               +---------------------+-------------------------+
+               |       1.0.x         |          1.1.x          |
+               +=====================+=========================+
+               | LORAWAN_DEVICE_EUI  | LORAWAN_DEVICE_EUI      |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_EUI     | LORAWAN_JOIN_EUI        |
+               +---------------------+-------------------------+
+               | LORAWAN_GEN_APP_KEY | LORAWAN_APP_KEY         |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_KEY     | LORAWAN_NWK_KEY         |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_F_NWK_S_INT_KEY |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_S_NWK_S_INT_KEY |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_NWK_S_ENC_KEY   |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_S_KEY   | LORAWAN_APP_S_KEY       |
+               +---------------------+-------------------------+
+ ******************************************************************************
+ ******************************************************************************
+ ******************************************************************************
+ */
+
+/*!
+ * When set to 1 DevEui is LORAWAN_DEVICE_EUI
+ * When set to 0 DevEui is automatically set with a value provided by MCU platform
+ */
+#define STATIC_DEVICE_EUI                                  0
+
+/*!
+ * end-device IEEE EUI (big endian)
+ */
+#define LORAWAN_DEVICE_EUI                                 { 0x00, 0x80, 0xE1, 0x01, 0x01, 0x01, 0x01, 0x01 }
+
+/*!
+ * App/Join server IEEE EUI (big endian)
+ */
+#define LORAWAN_JOIN_EUI                                   { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }
+
+/*!
+ * When set to 1 DevAddr is LORAWAN_DEVICE_ADDRESS
+ * When set to 0 DevAddr is automatically set with a value provided by a pseudo
+ *      random generator seeded with a value provided by the MCU platform
+ */
+#define STATIC_DEVICE_ADDRESS                              0
+
+/*!
+ * Device address on the network (big endian)
+ */
+#define LORAWAN_DEVICE_ADDRESS                             ( uint32_t )0x0100000A
+
+/*!
+ * Application root key
+ */
+#define LORAWAN_APP_KEY                                    2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Network root key
+ */
+#define LORAWAN_NWK_KEY                                    2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Forwarding Network session key
+ */
+#define LORAWAN_NWK_S_KEY                                  2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Application session key
+ */
+#define LORAWAN_APP_S_KEY                                  2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Format commissioning keys
+ */
+#define RAW_TO_INT8A(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) {0x##a,0x##b,0x##c,0x##d,\
+                                                        0x##e,0x##f,0x##g,0x##h,\
+                                                        0x##i,0x##j,0x##k,0x##l,\
+                                                        0x##m,0x##n,0x##o,0x##p}
+
+#define FORMAT_KEY(...) RAW_TO_INT8A(__VA_ARGS__)
+
+#if (USE_LRWAN_1_1_X_CRYPTO == 1)
+#define SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Join session integrity key (Dynamically updated)                                                     \
+             * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
+             */                                                                                                     \
+            .KeyID    = J_S_INT_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Join session encryption key (Dynamically updated)                                                    \
+             * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
+             */                                                                                                     \
+            .KeyID    = J_S_ENC_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Forwarding Network session integrity key                                                             \
+             * WARNING: NWK_S_KEY FOR 1.0.x DEVICES                                                                 \
+             */                                                                                                     \
+            .KeyID    = F_NWK_S_INT_KEY,                                                                            \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_S_KEY),                                                              \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Serving Network session integrity key                                                                \
+             * WARNING: NOT USED FOR 1.0.x DEVICES. MUST BE THE SAME AS \ref LORAWAN_F_NWK_S_INT_KEY                \
+             */                                                                                                     \
+            .KeyID    = S_NWK_S_INT_KEY,                                                                            \
+            .KeyValue = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, \
+                          0x3C },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network session encryption key                                                                       \
+             * WARNING: NOT USED FOR 1.0.x DEVICES. MUST BE THE SAME AS \ref LORAWAN_F_NWK_S_INT_KEY                \
+             */                                                                                                     \
+            .KeyID    = NWK_S_ENC_KEY,                                                                              \
+            .KeyValue = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, \
+                          0x3C },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application session key                                                                              \
+             */                                                                                                     \
+            .KeyID    = APP_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_S_KEY),                                                              \
+        },
+#else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
+#define SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network session key                                                                                  \
+             */                                                                                                     \
+            .KeyID    = NWK_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_S_KEY),                                                              \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application session key                                                                              \
+             */                                                                                                     \
+            .KeyID    = APP_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_S_KEY),                                                              \
+        },
+#endif /* USE_LRWAN_1_1_X_CRYPTO */
+
+#if (LORAMAC_MAX_MC_CTX == 1)
+#define SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_0,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },
+#else /* LORAMAC_MAX_MC_CTX > 1 */
+#define SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_0,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_1,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_1,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_1,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_2,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_2,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_2,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_3,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_3,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_3,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },
+#endif /* LORAMAC_MAX_MC_CTX */
+
+#define SOFT_SE_KEY_LIST                                                                                            \
+    {                                                                                                               \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application root key                                                                                 \
+             * WARNING: FOR 1.0.x DEVICES IT IS THE \ref LORAWAN_GEN_APP_KEY                                        \
+             */                                                                                                     \
+            .KeyID    = APP_KEY,                                                                                    \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_KEY),                                                                \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network root key                                                                                     \
+             * WARNING: FOR 1.0.x DEVICES IT IS THE \ref LORAWAN_APP_KEY                                            \
+             */                                                                                                     \
+            .KeyID    = NWK_KEY,                                                                                    \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_KEY),                                                                \
+        },                                                                                                          \
+        SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast root key (Dynamically updated)                                                             \
+             */                                                                                                     \
+            .KeyID    = MC_ROOT_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast key encryption key (Dynamically updated)                                                   \
+             */                                                                                                     \
+            .KeyID    = MC_KE_KEY,                                                                                  \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * All zeros key. (ClassB usage)(constant)                                                              \
+             */                                                                                                     \
+            .KeyID    = SLOT_RAND_ZERO_KEY,                                                                         \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+    }
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /*  __SOFT_SE_IDENTITY_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/frag_decoder_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/frag_decoder_if.c
new file mode 100644
index 00000000..1df01a30
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/frag_decoder_if.c
@@ -0,0 +1,297 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    frag_decoder_if.c
+  * @author  MCD Application Team
+  * @brief   Implements the Data Distribution Agent
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "frag_decoder_if.h"
+#include "sys_app.h"
+#include "utilities.h"
+#include "flash_if.h"
+#include "fw_update_agent.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/*!
+ * Defines the maximum size for the buffer receiving the fragmentation result.
+ *
+ * \remark By default frag_decoder_if.h defines:
+ *         \ref FRAG_MAX_NB   313
+ *         \ref FRAG_MAX_SIZE 216
+ *
+ *         In interop test mode will be
+ *         \ref FRAG_MAX_NB   20
+ *         \ref FRAG_MAX_SIZE 50
+ *
+ *         FileSize = FRAG_MAX_NB * FRAG_MAX_SIZE
+ *
+ *         If bigger file size is to be received or is fragmented differently
+ *         one must update those parameters.
+ *
+ * \remark  Memory allocation is done at compile time. Several options have to be foreseen
+ *          in order to optimize the memory. Will depend of the Memory management used
+ *          Could be Dynamic allocation --> malloc method
+ *          Variable Length Array --> VLA method
+ *          pseudo dynamic allocation --> memory pool method
+ *          Other option :
+ *          In place of using the caching memory method we can foreseen to have a direct
+ *          flash memory copy. This solution will depend of the SBSFU constraint
+ *
+ */
+#define UNFRAGMENTED_DATA_SIZE                      ( FRAG_MAX_NB * FRAG_MAX_SIZE )
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * Fragmentation package callbacks parameters
+  */
+const LmhpFragmentationParams_t FRAG_DECODER_IF_FragmentationParams =
+{
+  .DecoderCallbacks =
+  {
+    .FragDecoderErase = FRAG_DECODER_IF_Erase,
+    .FragDecoderWrite = FRAG_DECODER_IF_Write,
+    .FragDecoderRead = FRAG_DECODER_IF_Read,
+  },
+  .OnProgress = FRAG_DECODER_IF_OnProgress,
+  .OnDone = FRAG_DECODER_IF_OnDone
+};
+
+#if (INTEROP_TEST_MODE == 1)  /*write fragment in RAM - Caching mode*/
+/**
+  * Un-fragmented data storage.
+  */
+static uint8_t UnfragmentedData[UNFRAGMENTED_DATA_SIZE];
+#else
+/**
+  * Temp buffer to store fragment in RAM to avoid several Flash write
+  */
+static uint8_t FRAG_DECODER_IF_RAM_buffer[FLASH_PAGE_SIZE];
+#endif /* INTEROP_TEST_MODE */
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+#if (INTEROP_TEST_MODE == 1)
+/**
+  * \brief Computes a CCITT 32 bits CRC
+  *
+  * \param [IN] buffer   Data buffer used to compute the CRC
+  * \param [IN] length   Data buffer length
+  *
+  * \retval crc          The computed buffer of length CRC
+  */
+static uint32_t Crc32(uint8_t *buffer, uint16_t length);
+#endif /* INTEROP_TEST_MODE == 0 */
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t FRAG_DECODER_IF_Erase(void)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_Erase_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_Erase_1 */
+  int32_t status = FLASH_OK;
+#if (INTEROP_TEST_MODE == 1)
+  UTIL_MEM_set_8(UnfragmentedData, 0xFF, UNFRAGMENTED_DATA_SIZE);
+#else /* INTEROP_TEST_MODE == 0 */
+  uint32_t first_page = PAGE(FRAG_DECODER_DWL_REGION_START);
+  uint32_t nb_pages = PAGE(FRAG_DECODER_DWL_REGION_START + FRAG_DECODER_DWL_REGION_SIZE - 1) - first_page + 1U;
+
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    status = FLASH_IF_EraseByPages(first_page, nb_pages, 0U);
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    HAL_FLASH_Lock();
+  }
+  else
+  {
+    status = FLASH_LOCK_ERROR;
+  }
+
+#endif /* INTEROP_TEST_MODE */
+  if (status != FLASH_OK)
+  {
+    status = FLASH_ERROR;
+  }
+  return status;
+  /* USER CODE BEGIN FRAG_DECODER_IF_Erase_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_Erase_2 */
+}
+
+int32_t FRAG_DECODER_IF_Write(uint32_t addr, uint8_t *data, uint32_t size)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_Write_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_Write_1 */
+  int32_t status = FLASH_OK;
+
+#if (INTEROP_TEST_MODE == 1)  /*write fragment in RAM - Caching mode*/
+  UTIL_MEM_cpy_8(&UnfragmentedData[addr], data, size);
+#else /* INTEROP_TEST_MODE == 0 */
+
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    status = FLASH_IF_Write(FRAG_DECODER_DWL_REGION_START + addr, data, size, FRAG_DECODER_IF_RAM_buffer);
+    HAL_FLASH_Lock();
+  }
+  else
+  {
+    status = FLASH_LOCK_ERROR;
+  }
+
+  if (status != FLASH_OK)
+  {
+    APP_LOG(TS_OFF, VLEVEL_M, "\r\n....... !! FLASH_IF_WRITE_ERROR: %d !! .......\r\n", status);
+  }
+#endif /* INTEROP_TEST_MODE */
+  if (status != FLASH_OK)
+  {
+    status = FLASH_ERROR;
+  }
+  return status;
+  /* USER CODE BEGIN FRAG_DECODER_IF_Write_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_Write_2 */
+}
+
+int32_t FRAG_DECODER_IF_Read(uint32_t addr, uint8_t *data, uint32_t size)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_Read_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_Read_1 */
+#if (INTEROP_TEST_MODE == 1)   /*Read fragment in RAM - Caching mode*/
+  UTIL_MEM_cpy_8(data, &UnfragmentedData[addr], size);
+#else /* INTEROP_TEST_MODE == 0 */
+  UTIL_MEM_cpy_8(data, (void *)(FRAG_DECODER_DWL_REGION_START + addr), size);
+#endif /* INTEROP_TEST_MODE */
+
+  return FLASH_OK;
+  /* USER CODE BEGIN FRAG_DECODER_IF_Read_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_Read_2 */
+}
+
+void FRAG_DECODER_IF_OnProgress(uint16_t fragCounter, uint16_t fragNb, uint8_t fragSize, uint16_t fragNbLost)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_OnProgress_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_OnProgress_1 */
+  APP_LOG(TS_OFF, VLEVEL_M, "\r\n....... FRAG_DECODER in Progress .......\r\n");
+  APP_LOG(TS_OFF, VLEVEL_M, "RECEIVED    : %5d / %5d Fragments\r\n", fragCounter, fragNb);
+  APP_LOG(TS_OFF, VLEVEL_M, "              %5d / %5d Bytes\r\n", fragCounter * fragSize, fragNb * fragSize);
+  APP_LOG(TS_OFF, VLEVEL_M, "LOST        :       %7d Fragments\r\n\r\n", fragNbLost);
+
+#if (INTEROP_TEST_MODE == 1)
+  BSP_LED_Toggle(LED_BLUE);
+#endif /* INTEROP_TEST_MODE == 1 */
+  /* USER CODE BEGIN FRAG_DECODER_IF_OnProgress_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_OnProgress_2 */
+}
+
+void FRAG_DECODER_IF_OnDone(int32_t status, uint32_t size)
+{
+  /* USER CODE BEGIN FRAG_DECODER_IF_OnDone_1 */
+
+  /* USER CODE END FRAG_DECODER_IF_OnDone_1 */
+  APP_LOG(TS_OFF, VLEVEL_M, "\r\n....... FRAG_DECODER Finished .......\r\n");
+  APP_LOG(TS_OFF, VLEVEL_M, "STATUS      : %d\r\n", status);
+
+#if (INTEROP_TEST_MODE == 0)
+  /* Do a request to Run the Secure boot - The file is already in flash */
+  FwUpdateAgent_Run();
+#else
+  uint32_t FileRxCrc = Crc32(UnfragmentedData, size);
+  APP_LOG(TS_OFF, VLEVEL_M, "Size      : %d\r\n", size);
+  APP_LOG(TS_OFF, VLEVEL_M, "CRC         : %08X\r\n\r\n", FileRxCrc);
+
+  BSP_LED_Off(LED_BLUE);
+#endif /* INTEROP_TEST_MODE == 1 */
+  /* USER CODE BEGIN FRAG_DECODER_IF_OnDone_2 */
+
+  /* USER CODE END FRAG_DECODER_IF_OnDone_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+#if (INTEROP_TEST_MODE == 1)
+static uint32_t Crc32(uint8_t *buffer, uint16_t length)
+{
+  /* USER CODE BEGIN Crc32_1 */
+
+  /* USER CODE END Crc32_1 */
+  const uint32_t reversedPolynom = 0xEDB88320;
+  uint32_t crc = 0xFFFFFFFF;
+  if (buffer == NULL)
+  {
+    return 0;
+  }
+  for (uint16_t i = 0; i < length; ++i)
+  {
+    crc ^= (uint32_t)buffer[i];
+    for (uint16_t i = 0; i < 8; i++)
+    {
+      crc = (crc >> 1) ^ (reversedPolynom & ~((crc & 0x01) - 1));
+    }
+  }
+  return ~crc;
+  /* USER CODE BEGIN Crc32_2 */
+
+  /* USER CODE END Crc32_2 */
+}
+#endif /* INTEROP_TEST_MODE */
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/frag_decoder_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/frag_decoder_if.h
new file mode 100644
index 00000000..5a4820fd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/frag_decoder_if.h
@@ -0,0 +1,181 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    frag_decoder_if.h
+  * @author  MCD Application Team
+  * @brief   Applicative interfaces of LoRa-Alliance fragmentation decoder
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __FRAG_DECODER_IF_H__
+#define __FRAG_DECODER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "LmhpFragmentation.h"
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported defines ----------------------------------------------------------*/
+#define INTEROP_TEST_MODE                           0
+
+#if (INTEROP_TEST_MODE == 1)
+/*!
+  * Maximum number of fragment that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_NB                                 20
+
+/*!
+  * Maximum fragment size that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_SIZE                               50
+
+/*!
+  * Maximum number of extra frames that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_REDUNDANCY                         5
+
+#else /* INTEROP_TEST_MODE == 0 */
+/*!
+  * Maximum number of fragment that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  * \note FRAG_MAX_NB = (SLOT_DWL_1_END - SLOT_DWL_1_START) / FRAG_MAX_SIZE
+  */
+#define FRAG_MAX_NB                                 600
+
+/*!
+  * Maximum fragment size that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  */
+#define FRAG_MAX_SIZE                               120
+
+/*!
+  * Maximum number of extra frames that can be handled.
+  *
+  * \remark This parameter has an impact on the memory footprint.
+  * \note FRAG_MAX_NB * 0.10 (with redundancy = 10 %)
+  */
+#define FRAG_MAX_REDUNDANCY                         55
+
+#endif /* INTEROP_TEST_MODE */
+
+#define FRAG_DECODER_SWAP_REGION_START              ((uint32_t)(SlotStartAdd[SLOT_SWAP]))
+
+#define FRAG_DECODER_SWAP_REGION_SIZE               ((uint32_t)(SlotEndAdd[SLOT_SWAP] - SlotStartAdd[SLOT_SWAP] + 1U))
+
+#define FRAG_DECODER_DWL_REGION_START               ((uint32_t)(SlotStartAdd[SLOT_DWL_1]))
+
+#define FRAG_DECODER_DWL_REGION_SIZE                ((uint32_t)(SlotEndAdd[SLOT_DWL_1] - SlotStartAdd[SLOT_DWL_1] + 1U))
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+extern const LmhpFragmentationParams_t FRAG_DECODER_IF_FragmentationParams;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+
+/**
+  * Initialize final uncoded data buffer
+  *
+  * \retval status Write operation status [0: Success, -1 Fail]
+  */
+int32_t FRAG_DECODER_IF_Erase(void);
+
+/**
+  * Writes `data` buffer of `size` starting at address `addr`
+  *
+  * \param [IN] addr Address start index to write to.
+  * \param [IN] data Data buffer to be written.
+  * \param [IN] size Size of data buffer to be written.
+  *
+  * \retval status Write operation status [0: Success, -1 Fail]
+  */
+int32_t FRAG_DECODER_IF_Write(uint32_t addr, uint8_t *data, uint32_t size);
+
+/**
+  * Reads `data` buffer of `size` starting at address `addr`
+  *
+  * \param [IN] addr Address start index to read from.
+  * \param [IN] data Data buffer to be read.
+  * \param [IN] size Size of data buffer to be read.
+  *
+  * \retval status Read operation status [0: Success, -1 Fail]
+  */
+int32_t FRAG_DECODER_IF_Read(uint32_t addr, uint8_t *data, uint32_t size);
+
+/**
+  * Notifies the progress of the current fragmentation session
+  *
+  * \param [IN] fragCounter Fragment counter
+  * \param [IN] fragNb      Number of fragments
+  * \param [IN] fragSize    Size of fragments
+  * \param [IN] fragNbLost  Number of lost fragments
+  */
+void FRAG_DECODER_IF_OnProgress(uint16_t fragCounter, uint16_t fragNb, uint8_t fragSize, uint16_t fragNbLost);
+
+/**
+  * Notifies that the fragmentation session is finished
+  *
+  * \param [IN] status Fragmentation session status [FRAG_SESSION_ONGOING,
+  *                                                  FRAG_SESSION_FINISHED or
+  *                                                  FragDecoder.Status.FragNbLost]
+  * \param [IN] size   Received file size
+  */
+void FRAG_DECODER_IF_OnDone(int32_t status, uint32_t size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __FRAG_DECODER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
new file mode 100644
index 00000000..51b3e45f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
@@ -0,0 +1,143 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lorawan_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for LoRaWAN middleware instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORAWAN_CONF_H__
+#define __LORAWAN_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN LORAWAN_KMS */
+#define LORAWAN_KMS 1
+/* USER CODE END LORAWAN_KMS */
+
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+#else /* LORAWAN_KMS == 1 */
+#define OVER_THE_AIR_ACTIVATION 1
+#define ACTIVATION_BY_PERSONALIZATION 1
+#endif /* LORAWAN_KMS */
+
+#define LORAWAN_DATA_DISTRIB_MGT   1
+
+/* Region ------------------------------------*/
+/* the region listed here will be linked in the CM0 MW code */
+/* the application (on CM4/sys_conf.h) shall just configure one region at the time */
+/*#define REGION_AS923*/
+/*#define REGION_AU915*/
+/*#define REGION_CN470*/
+/*#define REGION_CN779*/
+/*#define REGION_EU433*/
+#define REGION_EU868
+/*#define REGION_KR920*/
+/*#define REGION_IN865*/
+/*#define REGION_US915*/
+/*#define REGION_RU864*/
+
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
+
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
+
+/* Class B ------------------------------------*/
+#define LORAMAC_CLASSB_ENABLED  0
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+/* CLASS B LSE crystal calibration*/
+/**
+  * \brief Temperature coefficient of the clock source
+  */
+#define RTC_TEMP_COEFFICIENT                            ( -0.035 )
+
+/**
+  * \brief Temperature coefficient deviation of the clock source
+  */
+#define RTC_TEMP_DEV_COEFFICIENT                        ( 0.0035 )
+
+/**
+  * \brief Turnover temperature of the clock source
+  */
+#define RTC_TEMP_TURNOVER                               ( 25.0 )
+
+/**
+  * \brief Turnover temperature deviation of the clock source
+  */
+#define RTC_TEMP_DEV_TURNOVER                           ( 5.0 )
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifndef CRITICAL_SECTION_BEGIN
+#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_BEGIN */
+#ifndef CRITICAL_SECTION_END
+#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_END */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LORAWAN_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
new file mode 100644
index 00000000..5bcdf818
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mw_log_conf.h
+  * @author  MCD Application Team
+  * @brief   Configure (enable/disable) traces for CM0
+  *******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MW_LOG_CONF_H__
+#define __MW_LOG_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_adv_trace.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MW_LOG_ENABLED
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef MW_LOG_ENABLED
+#define MW_LOG(TS,VL, ...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0)
+#else  /* MW_LOG_ENABLED */
+#define MW_LOG(TS,VL, ...)
+#endif /* MW_LOG_ENABLED */
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MW_LOG_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
new file mode 100644
index 00000000..d4c34621
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
@@ -0,0 +1,220 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.c
+  * @author  MCD Application Team
+  * @brief   This file provides an interface layer between MW and Radio Board
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "radio_board_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t RBI_Init(void)
+{
+  /* USER CODE BEGIN RBI_Init_1 */
+
+  /* USER CODE END RBI_Init_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_Init();
+#else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_Init_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_Init_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_DeInit(void)
+{
+  /* USER CODE BEGIN RBI_DeInit_1 */
+
+  /* USER CODE END RBI_DeInit_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_DeInit();
+#else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_DeInit_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_DeInit_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
+{
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_1 */
+
+  /* USER CODE END RBI_ConfigRFSwitch_1 */
+#if defined(USE_BSP_DRIVER)
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
+#else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_ConfigRFSwitch_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_GetTxConfig(void)
+{
+  /* USER CODE BEGIN RBI_GetTxConfig_1 */
+
+  /* USER CODE END RBI_GetTxConfig_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_GetTxConfig();
+#else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
+  /* USER CODE BEGIN RBI_GetTxConfig_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_GetTxConfig_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_IsTCXO(void)
+{
+  /* USER CODE BEGIN RBI_IsTCXO_1 */
+
+  /* USER CODE END RBI_IsTCXO_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsTCXO();
+#else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsTCXO_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsTCXO_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_IsDCDC(void)
+{
+  /* USER CODE BEGIN RBI_IsDCDC_1 */
+
+  /* USER CODE END RBI_IsDCDC_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsDCDC();
+#else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsDCDC_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsDCDC_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
new file mode 100644
index 00000000..9e505c68
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
@@ -0,0 +1,207 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Radio interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef RADIO_BOARD_IF_H
+#define RADIO_BOARD_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported defines ----------------------------------------------------------*/
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+#define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
+#define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
+#define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
+#else
+/* USER CODE BEGIN Board Definition */
+
+/* USER CODE END Board Definition */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported Parameters */
+
+/* USER CODE END Exported Parameters */
+/* Indicates the type of switch between the ones proposed by CONFIG Constants
+ */
+#define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
+
+/* Indicates whether or not TCXO is supported by the board
+ * 0: TCXO not supported
+ * 1: TCXO supported
+ */
+#define IS_TCXO_SUPPORTED                   1U
+
+/* Indicates whether or not DCDC is supported by the board
+ * 0: DCDC not supported
+ * 1: DCDC supported
+ */
+#define IS_DCDC_SUPPORTED                   1U
+
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported PinMapping */
+#warning user to provide its board definitions pins
+/* USER CODE END Exported PinMapping */
+#endif  /* USE_BSP_DRIVER  */
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+typedef enum
+{
+  RBI_SWITCH_OFF    = RADIO_SWITCH_OFF,
+  RBI_SWITCH_RX     = RADIO_SWITCH_RX,
+  RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
+  RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
+} RBI_Switch_TypeDef;
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
+typedef enum
+{
+  RBI_SWITCH_OFF    = 0,
+  RBI_SWITCH_RX     = 1,
+  RBI_SWITCH_RFO_LP = 2,
+  RBI_SWITCH_RFO_HP = 3,
+} RBI_Switch_TypeDef;
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief  Init Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_Init(void);
+
+/**
+  * @brief  DeInit Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_DeInit(void);
+
+/**
+  * @brief  Configure Radio Switch.
+  * @param  Config: Specifies the Radio RF switch path to be set.
+  *         This parameter can be one of following parameters:
+  *           @arg RADIO_SWITCH_OFF
+  *           @arg RADIO_SWITCH_RX
+  *           @arg RADIO_SWITCH_RFO_LP
+  *           @arg RADIO_SWITCH_RFO_HP
+  * @return BSP status
+  */
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
+
+/**
+  * @brief  Return Board Configuration
+  * @retval RBI_CONF_RFO_LP_HP
+  * @retval RBI_CONF_RFO_LP
+  * @retval RBI_CONF_RFO_HP
+  */
+int32_t RBI_GetTxConfig(void);
+
+/**
+  * @brief  Get If TCXO is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsTCXO(void);
+
+/**
+  * @brief  Get If DCDC is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsDCDC(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RADIO_BOARD_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
new file mode 100644
index 00000000..471fd3bd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
@@ -0,0 +1,183 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_conf.h
+  * @author  MCD Application Team
+  * @brief   Header of Radio configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_CONF_H__
+#define __RADIO_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
+#include "stm32_seq.h"
+#include "mw_log_conf.h"     /* mw trace conf */
+#include "radio_board_if.h"  /* low layer api (bsp) */
+#include "utilities_def.h"  /* low layer api (bsp) */
+#include "mbmuxif_sys.h"
+#include "sys_debug.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Set RX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
+
+/**
+  * @brief Set TX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
+
+/**
+  * @brief Max payload buffer size
+  */
+#define RADIO_RX_BUF_SIZE          255
+
+/**
+  * @brief Get the chip revision ID from Mbmux table
+  */
+#define LL_DBGMCU_GetRevisionID() MBMUXIF_ChipRevId()
+
+/**
+  * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
+
+/**
+  * @brief drive value used anytime radio is in TX low power mode
+  *        TX low power mode is the worst case because the PA sinks from SMPS
+  *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
+
+/**
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_FREQ                   ( 32000000UL )
+
+/**
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
+
+/**
+  * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
+  */
+#define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
+
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
+#define RADIO_IRQ_PROCESS_INIT()   do{ UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioIrq_Process), UTIL_SEQ_RFU, RadioIrqProcess); \
+                                       UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioRxTimeout_Process), UTIL_SEQ_RFU, RadioOnRxTimeoutProcess);\
+                                       UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioTxTimeout_Process), UTIL_SEQ_RFU, RadioOnTxTimeoutProcess);} while(0)
+
+#define RADIO_IRQ_PROCESS()        do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioIrq_Process, CFG_SEQ_Prio_0); } while(0)
+#define RADIO_RX_TIMEOUT_PROCESS() do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioRxTimeout_Process, CFG_SEQ_Prio_0); } while(0)
+#define RADIO_TX_TIMEOUT_PROCESS() do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioTxTimeout_Process, CFG_SEQ_Prio_0); } while(0)
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifndef CRITICAL_SECTION_BEGIN
+/**
+  * @brief macro used to enter the critical section
+  */
+#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_BEGIN */
+#ifndef CRITICAL_SECTION_END
+/**
+  * @brief macro used to exit the critical section
+  */
+#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_END */
+
+/* Function mapping */
+/**
+  * @brief SUBGHZ interface init to radio Middleware
+  */
+#define RADIO_INIT                              MX_SUBGHZ_Init
+
+/**
+  * @brief Delay interface to radio Middleware
+  */
+#define RADIO_DELAY_MS                          HAL_Delay
+
+/**
+  * @brief Memset utilities interface to radio Middleware
+  */
+#define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RADIO_CONF_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
new file mode 100644
index 00000000..1991b928
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
@@ -0,0 +1,67 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    systime.h
+  * @author  MCD Application Team
+  * @brief   Map middleware systime
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTIME_H__
+#define __SYSTIME_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_systime.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SYSTIME_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
new file mode 100644
index 00000000..e80cd6a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer.h
+  * @author  MCD Application Team
+  * @brief   Wrapper to timer server
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_H__
+#define __TIMER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Max timer mask
+  */
+#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/**
+  * @brief Timer value on 32 bits
+  */
+#define TimerTime_t UTIL_TIMER_Time_t
+
+/**
+  * @brief Timer object description
+  */
+#define TimerEvent_t UTIL_TIMER_Object_t
+
+/**
+  * @brief Create the timer object
+  */
+#define TimerInit(HANDLE, CB) do {\
+                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
+                                 } while(0)
+
+/**
+  * @brief update the period and start the timer
+  */
+#define TimerSetValue(HANDLE, TIMEOUT) do{ \
+                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
+                                         } while(0)
+
+/**
+  * @brief Start and adds the timer object to the list of timer events
+  */
+#define TimerStart(HANDLE)   do {\
+                                  UTIL_TIMER_Start(HANDLE);\
+                                } while(0)
+
+/**
+  * @brief Stop and removes the timer object from the list of timer events
+  */
+#define TimerStop(HANDLE)   do {\
+                                 UTIL_TIMER_Stop(HANDLE);\
+                               } while(0)
+
+/**
+  * @brief return the current time
+  */
+#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
+
+/**
+  * @brief return the elapsed time
+  */
+#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
new file mode 100644
index 00000000..d25cc7b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
@@ -0,0 +1,582 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    LmHandler_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0PLUS side wrapper of the LoraMac interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_mem.h"
+#include "mbmux_table.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_lora.h"
+#include "sys_app.h"
+#include "lora_app.h"
+
+#include "LmHandler_mbwrapper.h"
+#include "LmHandler.h"
+#include "lora_info.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/*!
+ * LoRa State Machine states
+ */
+typedef enum TxEventType_e
+{
+  /*!
+   * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
+   */
+  TX_ON_TIMER,
+  /*!
+   * @brief Appdata Transmission external event plugged on OnSendEvent( )
+   */
+  TX_ON_EVENT
+} TxEventType_t;
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#ifndef MAX
+#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
+#endif /* MAX */
+#define LMH_ON_JOIN_SIZE (sizeof(LmHandlerJoinParams_t))
+#define LMH_ON_TX_SIZE   (sizeof(LmHandlerTxParams_t))
+#define LMH_ON_RX_SIZE   (((sizeof(LmHandlerAppData_t) + 7) & ~7) + 256 + (sizeof(LmHandlerRxParams_t)))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(LMH_ON_JOIN_SIZE, MAX(LMH_ON_TX_SIZE, LMH_ON_RX_SIZE))
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+static uint8_t GetBatteryLevel_mbwrapper(void);
+
+static uint16_t GetTemperatureLevel_mbwrapper(void);
+
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size);
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params);
+
+static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams);
+
+static void OnTxData_mbwrapper(LmHandlerTxParams_t *params);
+
+static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
+
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass);
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params);
+
+static void OnSysTimeUpdate_mbwrapper(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM0+ to CM4
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
+static LmHandlerCallbacks_t callback_mbwrapper =
+{
+  .GetBatteryLevel =           GetBatteryLevel_mbwrapper,
+  .GetTemperature =            GetTemperatureLevel_mbwrapper,
+  .GetUniqueId =               GetUniqueId,
+  .GetDevAddr =                GetDevAddr,
+  .OnMacProcess =              OnMacProcessNotify,
+  .OnNvmDataChange =           OnNvmDataChange_mbwrapper,
+  .OnNetworkParametersChange = OnNetworkParametersChange_mbwrapper,
+  .OnJoinRequest =             OnJoinRequest_mbwrapper,
+  .OnTxData =                  OnTxData_mbwrapper,
+  .OnRxData =                  OnRxData_mbwrapper,
+  .OnClassChange =             OnClassChange_mbwrapper,
+  .OnBeaconStatusChange =      OnBeaconStatusChange_mbwrapper,
+  .OnSysTimeUpdate =           OnSysTimeUpdate_mbwrapper
+};
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Exported functions ---------------------------------------------------------*/
+void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Lora_Cmd_1 */
+
+  /* USER CODE END Process_Lora_Cmd_1 */
+  uint32_t *com_buffer = NULL;
+  LmHandlerErrorStatus_t errorStatus;
+  LmHandlerFlagStatus_t flagStatus;
+  int32_t ret_code;
+
+  APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(LoRa)\r\n");
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case   LMHANDLER_INITIALIZATION_ID:
+      errorStatus = LmHandlerInit(&callback_mbwrapper);
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+      InitPackageProcess();
+      break;
+
+    case   LMHANDLER_CONFIGURE_ID:
+      errorStatus = LmHandlerConfigure((LmHandlerParams_t *) com_buffer[0]);
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+      break;
+
+    case   LMHANDLER_JOIN_STATUS_ID:
+      flagStatus = LmHandlerJoinStatus();
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) flagStatus; /* */
+      break;
+
+    case   LMHANDLER_JOIN_ID:
+      LmHandlerJoin((ActivationType_t) com_buffer[0]);
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case   LMHANDLER_STOP_ID:
+      errorStatus = LmHandlerStop();
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+      break;
+
+    case   LMHANDLER_SEND_ID:
+    {
+      LmHandlerAppData_t appData;
+      appData.Port = (uint8_t)com_buffer[0];
+      appData.BufferSize = (uint8_t)com_buffer[1];
+      appData.Buffer = (uint8_t *)com_buffer[2];
+
+      errorStatus = LmHandlerSend(&appData, (LmHandlerMsgTypes_t) com_buffer[3], (UTIL_TIMER_Time_t *)com_buffer[4], (bool)com_buffer[5]);
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+    }
+    break;
+    case   LMHANDLER_PROCESS_ID:
+      LmHandlerProcess();
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+    case LMHANDLER_DEVICE_TIME_REQ_ID:
+      ret_code = LmHandlerDeviceTimeReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_INFO_INIT_ID:
+      LoraInfo_Init();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_H, "<CM0PLUS(LoRa)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID);
+  /* USER CODE BEGIN Process_Lora_Cmd_2 */
+
+  /* USER CODE END Process_Lora_Cmd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/*!
+ * \brief   Measures the battery level
+ *
+ * \retval  Battery level [0: node is connected to an external
+ *          power source, 1..254: battery level, where 1 is the minimum
+ *          and 254 is the maximum value, 255: the node was not able
+ *          to measure the battery level]
+ */
+
+static uint8_t GetBatteryLevel_mbwrapper(void)
+{
+  /* USER CODE BEGIN GetBatteryLevel_mbwrapper_1 */
+
+  /* USER CODE END GetBatteryLevel_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_GET_BATTERY_LEVEL_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return (uint8_t) com_obj->ReturnVal;
+  /* USER CODE BEGIN GetBatteryLevel_mbwrapper_2 */
+
+  /* USER CODE END GetBatteryLevel_mbwrapper_2 */
+}
+
+/*!
+ * \brief   Measures the temperature level
+ *
+ * \retval  Temperature level
+ */
+static uint16_t GetTemperatureLevel_mbwrapper(void)
+{
+  /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_1 */
+
+  /* USER CODE END GetTemperatureLevel_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_GET_TEMPERATURE_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return (uint16_t) com_obj->ReturnVal;
+  /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_2 */
+
+  /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
+}
+
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size)
+{
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_1 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)state;
+  com_buffer[1] = (uint32_t)size;
+  com_obj->ParamCnt = 2;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_2 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_2 */
+}
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params)
+{
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_1 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(CommissioningParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_2 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_2 */
+}
+
+static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams)
+{
+  /* USER CODE BEGIN OnJoinRequest_mbwrapper_1 */
+
+  /* USER CODE END OnJoinRequest_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (joinParams != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_JOIN_REQ_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (joinParams == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnJoinRequest_mbwrapper_2 */
+
+  /* USER CODE END OnJoinRequest_mbwrapper_2 */
+}
+
+static void OnTxData_mbwrapper(LmHandlerTxParams_t *params)
+{
+  /* USER CODE BEGIN OnTxData_mbwrapper_1 */
+
+  /* USER CODE END OnTxData_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_TX_DATA_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnTxData_mbwrapper_2 */
+
+  /* USER CODE END OnTxData_mbwrapper_2 */
+}
+
+static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
+{
+  /* USER CODE BEGIN OnRxData_mbwrapper_1 */
+
+  /* USER CODE END OnRxData_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+  uint8_t next_addr = 0;
+
+  if (appData != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
+    /* need to 8-align the next address */
+    next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
+
+    if (appData->BufferSize > 0)
+    {
+      UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], appData->Buffer, appData->BufferSize);
+      ((LmHandlerAppData_t *)aLoraMbWrapShare2Buffer)->Buffer = &aLoraMbWrapShare2Buffer[next_addr];
+      next_addr = (appData->BufferSize + 7) & ~7;
+    }
+  }
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_RX_DATA_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (appData == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
+  if (params == NULL)
+  {
+    com_buffer[1] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
+  }
+
+  com_obj->ParamCnt = 2;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnRxData_mbwrapper_2 */
+
+  /* USER CODE END OnRxData_mbwrapper_2 */
+}
+
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass)
+{
+  /* USER CODE BEGIN OnClassChange_mbwrapper_1 */
+
+  /* USER CODE END OnClassChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_CLASS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)deviceClass;
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnClassChange_mbwrapper_2 */
+
+  /* USER CODE END OnClassChange_mbwrapper_2 */
+}
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerBeaconParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
+static void OnSysTimeUpdate_mbwrapper(void)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
new file mode 100644
index 00000000..bc600e5f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    LmHandler_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0PLUS side wrapper of the LmHandler
+  *          interface shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LMHANDLER_MBWRAPPER_CM0PLUS_H__
+#define __LMHANDLER_MBWRAPPER_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LMHANDLER_MBWRAPPER_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
new file mode 100644
index 00000000..61a6eb3d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
@@ -0,0 +1,153 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    features_info.c
+  * @author  MCD Application Team
+  * @brief   CM0PLUS supported features list
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stddef.h>
+#include <stdint.h>
+#include "features_info.h"
+#include "lora_info.h"
+#include "lorawan_version.h"
+#include "lora_app_version.h"
+#include "subghz_phy_version.h"
+#include "stm32_mem.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Feature info table
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") FEAT_INFO_Param_t Feat_Info_Table[] =
+{
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_SYSTEM_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size =  0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  /* {
+    .Feat_Info_Feature_Id =   FEAT_INFO_KMS_ID,
+    .Feat_Info_Feature_Version = FEAT_INFO_KMS_VER,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr=  (void *) NULL
+  }, */
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_LORAWAN_ID,
+    .Feat_Info_Feature_Version = __LORAWAN_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_TRACE_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_RADIO_ID,
+    .Feat_Info_Feature_Version = __SUBGHZ_PHY_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+};
+
+/**
+  * @brief Feature info container
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") FEAT_INFO_List_t Feat_Info_List =
+{
+  .Feat_Info_Cnt =  sizeof(Feat_Info_Table) / sizeof(FEAT_INFO_Param_t),
+  .Feat_Info_TableAddress =  Feat_Info_Table,
+};
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void FEAT_INFO_Init(void)
+{
+  /* USER CODE BEGIN FEAT_INFO_Init_1 */
+
+  /* USER CODE END FEAT_INFO_Init_1 */
+
+  /* Set LoRaWAN Info_Config */
+  LoraInfo_Init();
+  /* USER CODE BEGIN FEAT_INFO_Init_2 */
+
+  /* USER CODE END FEAT_INFO_Init_2 */
+}
+
+FEAT_INFO_List_t *FEAT_INFO_GetListPtr(void)
+{
+  /* USER CODE BEGIN FEAT_INFO_GetListPtr_1 */
+
+  /* USER CODE END FEAT_INFO_GetListPtr_1 */
+  return (FEAT_INFO_List_t *) &Feat_Info_List;
+  /* USER CODE BEGIN FEAT_INFO_GetListPtr_2 */
+
+  /* USER CODE END FEAT_INFO_GetListPtr_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
new file mode 100644
index 00000000..e95e07d9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
@@ -0,0 +1,209 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_info.c
+  * @author  MCD Application Team
+  * @brief   To give info to the application about LoRaWAN configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "LoRaMac.h"
+#include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
+#include "platform.h" /* Needed for Error_Handler */
+#include "features_info.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief initialize the LoraMacInfo capabilities table
+  */
+void StoreValueInFeatureListTable(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported variables --------------------------------------------------------*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2")  LoraInfo_t loraInfo;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported functions --------------------------------------------------------*/
+void LoraInfo_Init(void)
+{
+  loraInfo.ActivationMode = 0;
+  loraInfo.Region = 0;
+  loraInfo.ClassB = 0;
+  loraInfo.Kms = 0;
+  /* USER CODE BEGIN LoraInfo_Init_1 */
+
+  /* USER CODE END LoraInfo_Init_1 */
+
+#ifdef  REGION_AS923
+  loraInfo.Region |= (1 << LORAMAC_REGION_AS923) ;
+#endif /* REGION_AS923 */
+#ifdef  REGION_AU915
+  loraInfo.Region |= (1 << LORAMAC_REGION_AU915) ;
+#endif /* REGION_AU915 */
+#ifdef  REGION_CN470
+  loraInfo.Region |= (1 << LORAMAC_REGION_CN470) ;
+#endif /* REGION_CN470 */
+#ifdef  REGION_CN779
+  loraInfo.Region |= (1 << LORAMAC_REGION_CN779) ;
+#endif /* REGION_CN779 */
+#ifdef  REGION_EU433
+  loraInfo.Region |= (1 << LORAMAC_REGION_EU433) ;
+#endif /* REGION_EU433 */
+#ifdef  REGION_EU868
+  loraInfo.Region |= (1 << LORAMAC_REGION_EU868) ;
+#endif /* REGION_EU868 */
+#ifdef  REGION_KR920
+  loraInfo.Region |= (1 << LORAMAC_REGION_KR920) ;
+#endif /* REGION_KR920 */
+#ifdef  REGION_IN865
+  loraInfo.Region |= (1 << LORAMAC_REGION_IN865) ;
+#endif /* REGION_IN865 */
+#ifdef  REGION_US915
+  loraInfo.Region |= (1 << LORAMAC_REGION_US915) ;
+#endif /* REGION_US915 */
+#ifdef  REGION_RU864
+  loraInfo.Region |= (1 << LORAMAC_REGION_RU864) ;
+#endif /* REGION_RU864 */
+
+  if (loraInfo.Region == 0)
+  {
+    APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+    while (1) {} /* At least one region shall be defined */
+  }
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+  loraInfo.ClassB = 1;
+#elif !defined (LORAMAC_CLASSB_ENABLED)
+#error LORAMAC_CLASSB_ENABLED not defined ( shall be <0 or 1> )
+#endif /* LORAMAC_CLASSB_ENABLED */
+
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+  loraInfo.Kms = 0;
+  loraInfo.ActivationMode = 3;
+#else /* LORAWAN_KMS == 1 */
+  loraInfo.Kms = 1;
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
+#endif /* LORAWAN_KMS */
+
+  /* For DualCore */
+  StoreValueInFeatureListTable();
+  /* USER CODE BEGIN LoraInfo_Init_2 */
+
+  /* USER CODE END LoraInfo_Init_2 */
+}
+
+LoraInfo_t *LoraInfo_GetPtr(void)
+{
+  /* USER CODE BEGIN LoraInfo_GetPtr */
+
+  /* USER CODE END LoraInfo_GetPtr */
+  return &loraInfo;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions --------------------------------------------------------*/
+void StoreValueInFeatureListTable(void)
+{
+  FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
+  FEAT_INFO_Param_t  *p_feature;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  uint8_t found = 0;
+
+  /* USER CODE BEGIN StoreValueInFeatureListTable_1 */
+
+  /* USER CODE END StoreValueInFeatureListTable_1 */
+
+  p_MBMUX_Cm0plusFeatureList = FEAT_INFO_GetListPtr();
+
+  if (p_MBMUX_Cm0plusFeatureList != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_MBMUX_Cm0plusFeatureList->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      p_feature = i + p_MBMUX_Cm0plusFeatureList->Feat_Info_TableAddress;
+      if (p_feature->Feat_Info_Feature_Id == FEAT_INFO_LORAWAN_ID)
+      {
+        found = 1;
+        break;
+      }
+    }
+  }
+
+  if (found)
+  {
+    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t) / sizeof(uint32_t);
+    p_feature->Feat_Info_Config_Ptr = &loraInfo;
+  }
+  else
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN StoreValueInFeatureListTable_2 */
+
+  /* USER CODE END StoreValueInFeatureListTable_2 */
+  return;
+}
+
+/* USER CODE BEGIN PF */
+
+/* USER CODE END PF */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
new file mode 100644
index 00000000..70087950
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
@@ -0,0 +1,439 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.c
+  * @author  MCD Application Team
+  * @brief   Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "assert.h"
+#include "stddef.h"
+#include "stm32_mem.h"
+#include "ipcc_if.h"
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MB_CHANNEL_NOT_REGISTERED 0xFF
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
+static void MBMUX_IsrNotRegistered(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
+{
+  /* USER CODE BEGIN MBMUX_Init_1 */
+
+  /* USER CODE END MBMUX_Init_1 */
+  uint8_t i;
+  IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
+
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
+
+  for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
+  {
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+  }
+  /* USER CODE BEGIN MBMUX_Init_Last */
+
+  /* USER CODE END MBMUX_Init_Last */
+}
+
+int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
+{
+  uint8_t channel_idx;
+  int8_t ret = -1;
+  uint8_t check_existing_feature_registration;
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_1 */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_1 */
+
+  check_existing_feature_registration = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  if (check_existing_feature_registration != MB_CHANNEL_NOT_REGISTERED)
+  {
+    /* channel has been registered by CM4 registered */
+    channel_idx = check_existing_feature_registration;
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
+    {
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
+    }
+  }
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_Last */
+  return ret;
+}
+
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
+
+  /* USER CODE END MBMUX_UnregisterFeature_1 */
+  uint8_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  if (mb_ch < IPCC_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
+      IPCC_IF_ResponseSnd(mb_ch);
+
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    }
+    else
+    {
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    }
+  }
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
+
+  /* USER CODE END MBMUX_UnregisterFeature_Last */
+}
+
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_1 */
+  uint32_t channel_idx;
+  MBMUX_ComParam_t *com_param_ptr = NULL;
+
+  channel_idx = MBMUX_GetFeatureChIdx(e_featID, ComType);
+  if (channel_idx < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBCmdRespParam[channel_idx];
+    }
+    else
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBNotifAckParam[channel_idx];
+    }
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_Last */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_Last */
+}
+
+int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
+
+  /* USER CODE END MBMUX_NotificationSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
+  if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
+  {
+    Error_Handler();
+  }
+  return IPCC_IF_NotificationSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
+
+  /* USER CODE END MBMUX_NotificationSnd_Last */
+}
+
+uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
+
+  /* USER CODE END MBMUX_ResponseSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_CMD_RESP);
+  return IPCC_IF_ResponseSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_ResponseSnd_Last */
+
+  /* USER CODE END MBMUX_ResponseSnd_Last */
+}
+
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* First check is only sufficient to avoid SW attacks (pBufferAddress out of range) */
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_2 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_2 */
+
+  /* Double Check to avoid basic fault injection by "HW" (e.g. power glitched) */
+  /* fault injection might lead to "jump" the check inside the MBMUX_SEC_VerifySramBuffer function */
+  /* which would validate an out-of-range buffer pointer */
+  /* note: below "if statement" is dummy: it is used to avoid the compiler to remove the second call*/
+  if ((pbuf_validated == pBufferAddress) || (pbuf_validated == NULL))
+  {
+    /* Calling twice the function reduce exponentially the HW fault injection attacks */
+    pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
+
+static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrCommandRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
+  /* call registered callback */
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
+  return;
+}
+
+static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
+  /* call registered callback */
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
+  return;
+}
+
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_1 */
+  return p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType];
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_Last */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_Last */
+}
+
+static void MBMUX_IsrNotRegistered(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_1 */
+  Error_Handler();
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
new file mode 100644
index 00000000..a938e544
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.h
+  * @author  MCD Application Team
+  * @brief   API which interfaces CM0PLUS to IPCC
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_CM0PLUS_H__
+#define __MBMUX_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
+int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
+
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUX_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
new file mode 100644
index 00000000..26630e54
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
@@ -0,0 +1,198 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_lora.c
+  * @author  MCD Application Team
+  * @brief   allows CM0 application to register and handle LoraWAN to MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_lora.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "LmHandler_mbwrapper.h"
+#include "utilities_def.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *LoraComObj;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
+static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
+static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the command
+  */
+static void MBMUXIF_TaskLoraCmdRcv(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_LoraInit(void)
+{
+  int8_t ret;
+  /* USER CODE BEGIN MBMUXIF_LoraInit_1 */
+
+  /* USER CODE END MBMUXIF_LoraInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrLoraAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP, MBMUXIF_IsrLoraCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskLoraCmdRcv);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_LoraInit_Last */
+
+  /* USER CODE END MBMUXIF_LoraInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_LoraSendNotif(void)
+{
+  /* to check vs radio. radio call this on irq so it moves here on task */
+  /* for lora is already called from task .. */
+  /* USER CODE BEGIN MBMUXIF_LoraSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_LoraSendNotif_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_LORAWAN_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbLoraAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_LoraSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_LoraSendNotif_Last */
+}
+
+void MBMUXIF_LoraSendResp(void)
+{
+  /* USER CODE BEGIN MBMUXIF_LoraSendResp_1 */
+
+  /* USER CODE END MBMUXIF_LoraSendResp_1 */
+  if (MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_LoraSendResp_Last */
+
+  /* USER CODE END MBMUXIF_LoraSendResp_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbLoraAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_1 */
+  LoraComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaCmdRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_Last */
+}
+
+static void MBMUXIF_TaskLoraCmdRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskLoraCmdRcv_1 */
+  Process_Lora_Cmd(LoraComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskLoraCmdRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
new file mode 100644
index 00000000..558f081f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
@@ -0,0 +1,92 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_lora.h
+  * @author  MCD Application Team
+  * @brief   API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_LORA_CM0PLUS_H__
+#define __MBMUXIF_LORA_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Notif
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Notif via Ipcc and Wait for the ack
+  */
+void MBMUXIF_LoraSendNotif(void);
+
+/**
+  * @brief   Sends a Lora-Resp  via Ipcc without waiting for the response
+  */
+void MBMUXIF_LoraSendResp(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_LORA_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
new file mode 100644
index 00000000..fe5fd070
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -0,0 +1,217 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.c
+  * @author  MCD Application Team
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_radio.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "radio_mbwrapper.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *RadioComObj;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
+static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
+static void MBMUXIF_TaskRadioNotifSnd(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_RadioInit(void)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_1 */
+
+  /* USER CODE END MBMUXIF_RadioInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrRadioAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP, MBMUXIF_IsrRadioCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskRadioCmdRcv);
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioNotifSnd), UTIL_SEQ_RFU, MBMUXIF_TaskRadioNotifSnd);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_Last */
+
+  /* USER CODE END MBMUXIF_RadioInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_RadioSendNotif(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendNotif_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioNotifSnd), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_RadioSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendNotif_Last */
+}
+
+void MBMUXIF_RadioSendResp(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendResp_1 */
+  if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendResp_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbRadioAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_1 */
+  RadioComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioCmdRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_Last*/
+
+  /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
+}
+
+static void MBMUXIF_TaskRadioCmdRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioCmdRcv_1 */
+  Process_Radio_Cmd(RadioComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
+}
+
+static void MBMUXIF_TaskRadioNotifSnd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifSnd_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_RADIO_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbRadioAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifSnd_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
new file mode 100644
index 00000000..7e226c6c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -0,0 +1,93 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_RADIO_CM0PLUS_H__
+#define __MBMUXIF_RADIO_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
+void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
+void MBMUXIF_RadioSendResp(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_RADIO_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
new file mode 100644
index 00000000..161fb2cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -0,0 +1,425 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.c
+  * @author  MCD Application Team
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_sys.h"
+#include "stm32_seq.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_lora.h"
+#include "mbmuxif_radio.h"
+#include "features_info.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *pMb_RefTable;  /* SRAM1_BASE + IPCCDBA<<4*/
+static MBMUX_ComParam_t *SystemComObj;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
+static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_SystemInit(void)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
+
+  /* USER CODE END MBMUXIF_SystemInit_1 */
+
+  /*Read FLASH IPCC data buffer base address based on (IPCCDBA << 4) + SRAM1_BASE*/
+  FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+  pMb_RefTable = (MBMUX_ComTable_t *) OptionsBytesStruct.IPCCdataBufAddr;
+
+  /* prevents Cm0 to go further, during boot after PWR_CR4_C2BOOT is set by Cm4*/
+  /* it allows Cm0 debugging step by step the MBMUXIF_SystemInit */
+  while (pMb_RefTable->SynchronizeCpusAtBoot == CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
+
+  MBMUX_Init(pMb_RefTable);
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemCmdRcv);
+    ret = 0;
+  }
+
+  if (ret >= 0)
+  {
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
+    /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
+    while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
+    pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
+
+  /* USER CODE END MBMUXIF_SystemInit_Last */
+  return ret;
+}
+
+uint16_t MBMUXIF_GetCpusSynchroFlag(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
+
+  /* USER CODE END MBMUXIF_GetCpusSynchroFlag */
+  return pMb_RefTable->SynchronizeCpusAtBoot;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureNotifComPtr_Last */
+  return com_param_ptr;
+}
+
+void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_1 */
+  if (MBMUX_NotificationSnd(SystemPrioFeat) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_Last */
+}
+
+void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
+  if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
+}
+
+void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
+  if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendResp_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Exported services --------------------------------------------------------*/
+int16_t MBMUXIF_ChipRevId(void)
+{
+  int16_t ret = pMb_RefTable->ChipRevId;
+  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+
+  /* USER CODE END MBMUXIF_ChipRevId */
+  return ret ;
+}
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
+{
+  SystemComObj = (MBMUX_ComParam_t *) ComObj;
+
+  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
+
+  /* process Command on Isr or schedule a task*/
+  switch (SystemComObj->MsgId)
+  {
+    case SYS_GET_INFO_LIST_MSG_ID:
+      SystemComObj->ReturnVal = (uint32_t) FEAT_INFO_GetListPtr();
+      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+      break;
+
+    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
+
+    default:
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
+      break;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
+
+}
+
+static void MBMUXIF_TaskSystemCmdRcv(void)
+{
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
+  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
+  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
+
+}
+
+static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
+}
+
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
+{
+  int8_t ret = -2; /* feature not supported */
+
+  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  APP_LOG(TS_OFF, VLEVEL_L, "\r\n");
+
+  switch (pBuf[0])
+  {
+    case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioAAckRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_CMD_PRIO_B_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_B_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioBCmdRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioBAckRcvCb);
+      break;
+
+    case FEAT_INFO_KMS_ID:
+      /* ret = MBMUXIF_KmsInit(); */
+      /* APP_LOG(TS_OFF, VLEVEL_L, " * CM0 : Kms registration done\r\n"); */
+      break;
+
+    case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
+      ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
+      break;
+
+    case FEAT_INFO_RADIO_ID:
+      ret = MBMUXIF_RadioInit();
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Radio registration done\r\n");
+      break;
+
+    case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
+      ret = MBMUXIF_LoraInit();
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora registration done\r\n");
+      break;
+
+    case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox not supported\r\n");
+      break;
+
+    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+
+    default:
+      break;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+
+  return ret;
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
new file mode 100644
index 00000000..f780cdde
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_SYS_CM0PLUS_H__
+#define __MBMUXIF_SYS_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
+uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
+int16_t MBMUXIF_ChipRevId(void);
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_SYS_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
new file mode 100644
index 00000000..05704d23
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -0,0 +1,237 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.c
+  * @author  MCD Application Team
+  * @brief   Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_trace.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "stm32_seq.h"
+#include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
+static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private typedef -----------------------------------------------------------*/
+const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
+{
+  MBMUXIF_TraceBufferInit,
+  NULL,
+  NULL,
+  MBMUXIF_TraceBufferSend,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
+    /*Initialize the terminal */
+    UTIL_ADV_TRACE_Init();
+    UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
+
+    /*Set verbose LEVEL*/
+    UTIL_ADV_TRACE_SetVerboseLevel(verboseLevel);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_TraceSendNotif_NoWait(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
+
+  /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
+
+  /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Exported services --------------------------------------------------------*/
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
+{
+  /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceBufferInit_1 */
+  TraceUtilCpltCallback = cb;
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN MBMUXIF_TraceBufferInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceBufferInit_Last */
+}
+
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
+
+  /* USER CODE END MBMUXIF_TraceBufferSend_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
+
+  /* notify CM4 that CM0PLUS is initialized */
+  com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
+  if (com_obj != NULL)
+  {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
+    com_obj->MsgId = TRACE_SEND_MSG_ID;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
+    com_obj->ParamCnt = 2;
+    MBMUXIF_TraceSendNotif_NoWait();
+  }
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN MBMUXIF_TraceBufferSend_Last */
+
+  /* USER CODE END MBMUXIF_TraceBufferSend_Last */
+}
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
+}
+
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
new file mode 100644
index 00000000..8aad9276
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -0,0 +1,85 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_TRACE_CM0PLUS_H__
+#define __MBMUXIF_TRACE_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
+int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
+void MBMUXIF_TraceSendNotif_NoWait(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_TRACE_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
new file mode 100644
index 00000000..8d822bfb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -0,0 +1,110 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "radio_mbwrapper.h"
+#include "main.h"
+#include "stm32_mem.h"
+#include "mbmux_table.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_radio.h"
+#include "sys_app.h"
+
+#include "radio.h"
+#include "radio_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Radio_Cmd_1 */
+
+  /* USER CODE END Process_Radio_Cmd_1 */
+
+  APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_H, "<CM0PLUS(Radio)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID);
+  /* USER CODE BEGIN Process_Radio_Cmd_2 */
+
+  /* USER CODE END Process_Radio_Cmd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
new file mode 100644
index 00000000..ac6a70d3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0PLUS side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
+#define __RADIO_MBWRAPPER_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__RADIO_MBWRAPPER_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
new file mode 100644
index 00000000..2e8c37f3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    adc.h
+  * @brief   This file contains all the function prototypes for
+  *          the adc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __ADC_H__
+#define __ADC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern ADC_HandleTypeDef hadc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_ADC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
new file mode 100644
index 00000000..5c2a2568
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
@@ -0,0 +1,104 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    adc_if.h
+  * @author  MCD Application Team
+  * @brief   Header for ADC interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __ADC_IF_H__
+#define __ADC_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Battery level in mV
+  */
+#define BAT_CR2032                  ((uint32_t) 3000)
+/**
+  * @brief Maximum battery level in mV
+  */
+#define VDD_BAT                     BAT_CR2032
+/**
+  * @brief Minimum battery level in mV
+  */
+#define VDD_MIN                     1800
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief  Initializes the ADC input
+  */
+void SYS_InitMeasurement(void);
+
+/**
+  * @brief DeInitializes the ADC
+  */
+void SYS_DeInitMeasurement(void);
+
+/**
+  * @brief  Get the current temperature
+  * @return value temperature in degree Celsius( q7.8 )
+  */
+int16_t SYS_GetTemperatureLevel(void);
+
+/**
+  * @brief Get the current battery level
+  * @return value battery level in linear scale
+  */
+uint16_t SYS_GetBatteryLevel(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
new file mode 100644
index 00000000..59a26f2e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    dma.h
+  * @brief   This file contains all the function prototypes for
+  *          the dma.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __DMA_H__
+#define __DMA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* DMA memory to memory transfer handles -------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_DMA_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DMA_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
new file mode 100644
index 00000000..3dbeb3d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.h
+  * @brief   This file contains all the function prototypes for
+  *          the ipcc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_H__
+#define __IPCC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern IPCC_HandleTypeDef hipcc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_IPCC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
new file mode 100644
index 00000000..e891e529
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
@@ -0,0 +1,109 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains the interface of the ipcc driver on CM4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_IF_CM4_H__
+#define __IPCC_IF_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "ipcc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Initialize IPCC and register upper and downer callbacks
+  * @param  IPCC_IF_ResponseRcv_cb     response callback
+  * @param  IPCC_IF_NotificationRcv_cb notification callback
+  */
+void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
+
+/**
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
+
+/**
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
+
+/**
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
+
+/**
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_AcknowledgeSnd(uint32_t channelIdx);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_IF_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
new file mode 100644
index 00000000..14990858
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
@@ -0,0 +1,91 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.h
+  * @brief          : Header for main.c file.
+  *                   This file contains the common defines of the application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+#define RTC_N_PREDIV_S 10
+#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define BUT1_Pin GPIO_PIN_0
+#define BUT1_GPIO_Port GPIOA
+#define BUT1_EXTI_IRQn EXTI0_IRQn
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define BUT2_Pin GPIO_PIN_1
+#define BUT2_GPIO_Port GPIOA
+#define BUT2_EXTI_IRQn EXTI1_IRQn
+#define USARTx_RX_Pin GPIO_PIN_3
+#define USARTx_RX_GPIO_Port GPIOA
+#define USARTx_TX_Pin GPIO_PIN_2
+#define USARTx_TX_GPIO_Port GPIOA
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
new file mode 100644
index 00000000..2386cd7f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    platform.h
+  * @author  MCD Application Team
+  * @brief   Header for General HW instances configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+
+#define USE_BSP_DRIVER
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdbool.h>
+#include "stm32wlxx.h"
+#include "main.h"
+#include "stm32wlxx_ll_gpio.h"
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP.  */
+/* In order to use BSP, users can add the BSP files in the IDE project space */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  */
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_nucleo_radio.h"
+#endif /* defined(USE_BSP_DRIVER) */
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PLATFORM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
new file mode 100644
index 00000000..cbe62fa1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
@@ -0,0 +1,102 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Low Power Manager interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_LPM_IF_H__
+#define __STM32_LPM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_lpm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Enters Low Power Off Mode
+  */
+void PWR_EnterOffMode(void);
+
+/**
+  * @brief Exits Low Power Off Mode
+  */
+void PWR_ExitOffMode(void);
+
+/**
+  * @brief Enters Low Power Stop Mode
+  * @note ARM exists the function when waking up
+  */
+void PWR_EnterStopMode(void);
+
+/**
+  * @brief Exits Low Power Stop Mode
+  * @note Enable the pll at 32MHz
+  */
+void PWR_ExitStopMode(void);
+
+/**
+  * @brief Enters Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_EnterSleepMode(void);
+
+/**
+  * @brief Exits Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_ExitSleepMode(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_LPM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..2fffde50
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,338 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+/*#define HAL_COMP_MODULE_ENABLED   */
+/*#define HAL_CRC_MODULE_ENABLED   */
+/*#define HAL_CRYP_MODULE_ENABLED   */
+/*#define HAL_DAC_MODULE_ENABLED   */
+/*#define HAL_GTZC_MODULE_ENABLED   */
+/*#define HAL_HSEM_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED   */
+/*#define HAL_I2S_MODULE_ENABLED   */
+#define HAL_IPCC_MODULE_ENABLED
+/*#define HAL_IRDA_MODULE_ENABLED   */
+/*#define HAL_IWDG_MODULE_ENABLED   */
+/*#define HAL_LPTIM_MODULE_ENABLED   */
+/*#define HAL_PKA_MODULE_ENABLED   */
+/*#define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+/*#define HAL_SUBGHZ_MODULE_ENABLED   */
+/*#define HAL_TIM_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
new file mode 100644
index 00000000..59d790a6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
@@ -0,0 +1,111 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for sys_app.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_APP_H__
+#define __SYS_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmux_table.h"
+#include "sys_conf.h"
+#include "stm32_adv_trace.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#define APP_PPRINTF(...)  do{ } while( UTIL_ADV_TRACE_OK \
+                              != UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__) ) /* Polling Mode */
+#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
+#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+
+#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
+#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
+#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
+#define APP_LOG(TS,VL,...)
+#else
+#error "APP_LOG_ENABLED not defined or out of range <0,1>"
+#endif /* APP_LOG_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
+  */
+void SystemApp_Init(void);
+
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
+void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
+
+/**
+  * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
+  * @retval battery level
+  */
+uint8_t GetBatteryLevel(void);
+
+/**
+  * @brief  callback to get the current temperature in the MCU
+  * @retval temperature level
+  */
+uint16_t GetTemperatureLevel(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_APP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
new file mode 100644
index 00000000..a2f39fa4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
@@ -0,0 +1,99 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_conf.h
+  * @author  MCD Application Team
+  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_CONF_H__
+#define __SYS_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/**
+  * @brief Temperature and pressure values are retrieved from sensors shield
+  *        (instead of sending dummy values). It requires MEMS IKS shield
+  */
+#define SENSOR_ENABLED              0
+
+/**
+  * @brief CM4 Verbose level for all trace logs
+  */
+#define VERBOSE_LEVEL               VLEVEL_M
+
+/**
+  * @brief Enable trace logs
+  */
+#define APP_LOG_ENABLED             1
+
+/**
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
+  */
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
+
+/**
+  * @brief Disable Low Power mode
+  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
+  */
+#define LOW_POWER_DISABLE           0
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
new file mode 100644
index 00000000..fc37f342
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
@@ -0,0 +1,98 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_sensors.h
+  * @author  MCD Application Team
+  * @brief   Header for sensors application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SENSORS_H__
+#define __SENSORS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Sensor data parameters
+  */
+typedef struct
+{
+  float pressure;         /*!< in mbar */
+  float temperature;      /*!< in degC */
+  float humidity;         /*!< in % */
+  int32_t latitude;       /*!< latitude converted to binary */
+  int32_t longitude ;     /*!< longitude converted to binary */
+  int16_t altitudeGps;    /*!< in m */
+  int16_t altitudeBar ;   /*!< in m * 10 */
+  /**more may be added*/
+  /* USER CODE BEGIN sensor_t */
+
+  /* USER CODE END sensor_t */
+} sensor_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
+#define HTS221_0    0U
+#define LPS22HB_0   1U
+#endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  initialize the environmental sensor
+  */
+int32_t EnvSensors_Init(void);
+
+/**
+  * @brief  Environmental sensor  read.
+  * @param  sensor_data sensor data
+  */
+int32_t EnvSensors_Read(sensor_t *sensor_data);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SENSORS_H__ */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h
new file mode 100644
index 00000000..3bbde030
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h
@@ -0,0 +1,174 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.h
+  * @author  MCD Application Team
+  * @brief  configuration of the timer_if.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_IF_H__
+#define __TIMER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+#include "stm32_systime.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Init RTC hardware
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_Init(void);
+
+/**
+  * @brief Set the alarm
+  * @note The alarm is set at timeout from timer Reference (TimerContext)
+  * @param timeout Duration of the Timer in ticks
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout);
+
+/**
+  * @brief Stop the Alarm
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void);
+
+/**
+  * @brief set timer Reference (TimerContext)
+  * @return  Timer Reference Value in  Ticks
+  */
+uint32_t TIMER_IF_SetTimerContext(void);
+
+/**
+  * @brief Get the RTC timer Reference
+  * @return Timer Value in  Ticks
+  */
+uint32_t TIMER_IF_GetTimerContext(void);
+
+/**
+  * @brief Get the timer elapsed time since timer Reference (TimerContext) was set
+  * @return RTC Elapsed time in ticks
+  */
+uint32_t TIMER_IF_GetTimerElapsedTime(void);
+
+/**
+  * @brief Get the timer value
+  * @return RTC Timer value in ticks
+  */
+uint32_t TIMER_IF_GetTimerValue(void);
+
+/**
+  * @brief Return the minimum timeout in ticks the RTC is able to handle
+  * @return minimum value for a timeout in ticks
+  */
+uint32_t TIMER_IF_GetMinimumTimeout(void);
+
+/**
+  * @brief a delay of delay ms by polling RTC
+  * @param delay in ms
+  */
+void TIMER_IF_DelayMs(uint32_t delay);
+
+/**
+  * @brief converts time in ms to time in ticks
+  * @param[in] timeMilliSec time in milliseconds
+  * @return time in timer ticks
+  */
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec);
+
+/**
+  * @brief converts time in ticks to time in ms
+  * @param[in] tick time in timer ticks
+  * @return time in timer milliseconds
+  */
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick);
+
+/**
+  * @brief Get rtc time
+  * @param[out] subSeconds in ticks
+  * @return time seconds
+  */
+uint32_t TIMER_IF_GetTime(uint16_t *subSeconds);
+
+/**
+  * @brief write seconds in backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @param[in] Seconds time in seconds
+  */
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds);
+
+/**
+  * @brief reads seconds from backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @return Time in seconds
+  */
+uint32_t TIMER_IF_BkUp_Read_Seconds(void);
+
+/**
+  * @brief writes SubSeconds in backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @param[in] SubSeconds time in SubSeconds
+  */
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds);
+
+/**
+  * @brief reads SubSeconds from backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @return Time in SubSeconds
+  */
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
new file mode 100644
index 00000000..20bb5dfa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    usart.h
+  * @brief   This file contains all the function prototypes for
+  *          the usart.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_H__
+#define __USART_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern UART_HandleTypeDef huart2;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_USART2_UART_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
new file mode 100644
index 00000000..b1ed2355
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.h
+  * @author  MCD Application Team
+  * @brief   Header for USART interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#include "stm32_adv_trace.h"
+#include "usart.h"
+#include "dma.h"
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_IF_H__
+#define __USART_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init the UART and associated DMA.
+  * @param  cb TxCpltCallback
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *));
+
+/**
+  * @brief  init receiver of vcom
+  * @param  RxCb callback when Rx char is received
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error));
+
+/**
+  * @brief  DeInit the UART and associated DMA.
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom in polling mode
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  */
+void vcom_Trace(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom using DMA
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  last byte has been sent on the uart line
+  */
+void vcom_IRQHandler(void);
+
+/**
+  * @brief  last byte has been sent from memory to uart data register
+  */
+void vcom_DMA_TX_IRQHandler(void);
+
+/**
+  * @brief  Resume the UART and associated DMA (used by LPM)
+  */
+void vcom_Resume(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
new file mode 100644
index 00000000..ebd9cc7a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
@@ -0,0 +1,179 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for configuration file to utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_CONF_H__
+#define __UTILITIES_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "cmsis_compiler.h"
+
+/* definitions to be provided to "sequencer" utility */
+#include "stm32_mem.h"
+/* definition and callback for tiny_vsnprintf */
+#include "stm32_tiny_vsnprintf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*                             sequencer configuration                       */
+/*---------------------------------------------------------------------------*/
+/**
+  * @brief Sequencer flag reserved for future use
+  */
+#define UTIL_SEQ_RFU 0
+
+/**
+  * @brief default number of tasks configured in sequencer
+  */
+#define SEQ_CONF_TASK_NBR    3
+
+/**
+  * @brief default value of priority task
+  */
+#define SEQ_CONF_PRIO_NBR    1
+
+#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
+#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
+                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
+#define VLEVEL_L 1       /*!< just essential traces */
+#define VLEVEL_M 2       /*!< functional traces */
+#define VLEVEL_H 3       /*!< all traces */
+
+#define TS_OFF 0         /*!< Log without TimeStamp */
+#define TS_ON 1          /*!< Log with TimeStamp */
+
+#define T_REG_OFF  0     /*!< Log without bitmask */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Memory placement macro
+  */
+#if defined(__CC_ARM)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
+#elif defined(__ICCARM__)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#else  /* __GNUC__ */
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+
+/**
+  * @brief Memory alignment macro
+  */
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* WIN32 */
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
+
+/**
+  * @brief Memset utilities interface to application
+  */
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTILS_ENTER_CRITICAL_SECTION() uint32_t primask_bit= __get_PRIMASK();\
+  __disable_irq()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTILS_EXIT_CRITICAL_SECTION()  __set_PRIMASK(primask_bit)
+
+/******************************************************************************
+  * trace\advanced
+  * the define option
+  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
+  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
+  *
+  ******************************************************************************/
+
+#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
+#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
+#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
+#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
+#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
+#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
+#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UTILITIES_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
new file mode 100644
index 00000000..f79689ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
@@ -0,0 +1,139 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_def.h
+  * @author  MCD Application Team
+  * @brief   Definitions for modules requiring utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_DEF_H__
+#define __UTILITIES_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/******************************************************************************
+  * LOW POWER MANAGER
+  ******************************************************************************/
+/**
+  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+  * It lists a bit mapping of all user of the Low Power Manager
+  */
+typedef enum
+{
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
+  CFG_LPM_APPLI_Id,
+  CFG_LPM_UART_TX_Id,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/*---------------------------------------------------------------------------*/
+/*                             sequencer definitions                         */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * This is the list of priority required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Prio_0,
+  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
+
+  /* USER CODE END CFG_SEQ_Prio_Id_t */
+  CFG_SEQ_Prio_NBR,
+} CFG_SEQ_Prio_Id_t;
+
+/**
+  * This is the list of task id required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  /* CM4 */
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t_0 */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t_0 */
+  CFG_SEQ_Task_MbSystemNotifRcv,
+  CFG_SEQ_Task_MbLoRaNotifRcv,
+  CFG_SEQ_Task_MbRadioNotifRcv,
+  CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent,
+  CFG_SEQ_Task_MbLmHandlerProcess,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t */
+  CFG_SEQ_Task_NBR
+} CFG_SEQ_Task_Id_t;
+
+/**
+  * This is a bit mapping over 32bits listing all events id supported in the application
+  */
+typedef enum
+{
+  /* CM4 */
+  CFG_SEQ_Evt_MbSystemRespRcv,
+  CFG_SEQ_Evt_MbKmsRespRcv,
+  CFG_SEQ_Evt_MbLoRaRespRcv,
+  CFG_SEQ_Evt_MbRadioRespRcv,
+  /* USER CODE BEGIN CFG_SEQ_IdleEvt_Id_t */
+
+  /* USER CODE END CFG_SEQ_IdleEvt_Id_t */
+  CFG_SEQ_Evt_NBR
+} CFG_SEQ_IdleEvt_Id_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UTILITIES_DEF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
new file mode 100644
index 00000000..d6f3988c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
@@ -0,0 +1,107 @@
+/**
+  ******************************************************************************
+  * @file    adc.c
+  * @brief   This file provides code for the configuration
+  *          of the ADC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+ADC_HandleTypeDef hadc;
+
+/* ADC init function */
+void MX_ADC_Init(void)
+{
+
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
+  /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
+  */
+  hadc.Instance = ADC;
+  hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
+  hadc.Init.Resolution = ADC_RESOLUTION_12B;
+  hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
+  hadc.Init.ScanConvMode = ADC_SCAN_DISABLE;
+  hadc.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
+  hadc.Init.LowPowerAutoWait = DISABLE;
+  hadc.Init.LowPowerAutoPowerOff = DISABLE;
+  hadc.Init.ContinuousConvMode = DISABLE;
+  hadc.Init.NbrOfConversion = 1;
+  hadc.Init.DiscontinuousConvMode = DISABLE;
+  hadc.Init.ExternalTrigConv = ADC_SOFTWARE_START;
+  hadc.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
+  hadc.Init.DMAContinuousRequests = DISABLE;
+  hadc.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
+  hadc.Init.SamplingTimeCommon1 = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.SamplingTimeCommon2 = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.OversamplingMode = DISABLE;
+  hadc.Init.TriggerFrequencyMode = ADC_TRIGGER_FREQ_HIGH;
+  if (HAL_ADC_Init(&hadc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
+
+}
+
+void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC)
+  {
+  /* USER CODE BEGIN ADC_MspInit 0 */
+
+  /* USER CODE END ADC_MspInit 0 */
+    /* ADC clock enable */
+    __HAL_RCC_ADC_CLK_ENABLE();
+  /* USER CODE BEGIN ADC_MspInit 1 */
+
+  /* USER CODE END ADC_MspInit 1 */
+  }
+}
+
+void HAL_ADC_MspDeInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC)
+  {
+  /* USER CODE BEGIN ADC_MspDeInit 0 */
+
+  /* USER CODE END ADC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_ADC_CLK_DISABLE();
+  /* USER CODE BEGIN ADC_MspDeInit 1 */
+
+  /* USER CODE END ADC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
new file mode 100644
index 00000000..75af32ca
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
@@ -0,0 +1,230 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    adc_if.c
+  * @author  MCD Application Team
+  * @brief   Read status related to the chip (battery level, VREF, chip temperature)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "adc_if.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief ADC handle
+  */
+extern ADC_HandleTypeDef hadc;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define TEMPSENSOR_TYP_CAL1_V          (( int32_t)  760)        /*!< Internal temperature sensor, parameter V30 (unit: mV). Refer to device datasheet for min/typ/max values. */
+#define TEMPSENSOR_TYP_AVGSLOPE        (( int32_t) 2500)        /*!< Internal temperature sensor, parameter Avg_Slope (unit: uV/DegCelsius). Refer to device datasheet for min/typ/max values. */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief This function reads the ADC channel
+  * @param channel channel number to read
+  * @return adc measured level value
+  */
+static uint32_t ADC_ReadChannels(uint32_t channel);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void SYS_InitMeasurement(void)
+{
+  /* USER CODE BEGIN SYS_InitMeasurement_1 */
+
+  /* USER CODE END SYS_InitMeasurement_1 */
+  hadc.Instance = ADC;
+  /* USER CODE BEGIN SYS_InitMeasurement_2 */
+
+  /* USER CODE END SYS_InitMeasurement_2 */
+}
+
+void SYS_DeInitMeasurement(void)
+{
+  /* USER CODE BEGIN SYS_DeInitMeasurement_1 */
+
+  /* USER CODE END SYS_DeInitMeasurement_1 */
+}
+
+int16_t SYS_GetTemperatureLevel(void)
+{
+  /* USER CODE BEGIN SYS_GetTemperatureLevel_1 */
+
+  /* USER CODE END SYS_GetTemperatureLevel_1 */
+  int16_t temperatureDegreeC = 0;
+  uint32_t measuredLevel = 0;
+  uint16_t batteryLevelmV = SYS_GetBatteryLevel();
+
+  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_TEMPSENSOR);
+
+  /* convert ADC level to temperature */
+  /* check whether device has temperature sensor calibrated in production */
+  if (((int32_t)*TEMPSENSOR_CAL2_ADDR - (int32_t)*TEMPSENSOR_CAL1_ADDR) != 0)
+  {
+    /* Device with temperature sensor calibrated in production:
+       use device optimized parameters */
+    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE(batteryLevelmV,
+                                                   measuredLevel,
+                                                   LL_ADC_RESOLUTION_12B);
+  }
+  else
+  {
+    /* Device with temperature sensor not calibrated in production:
+       use generic parameters */
+    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE_TYP_PARAMS(TEMPSENSOR_TYP_AVGSLOPE,
+                                                              TEMPSENSOR_TYP_CAL1_V,
+                                                              TEMPSENSOR_CAL1_TEMP,
+                                                              batteryLevelmV,
+                                                              measuredLevel,
+                                                              LL_ADC_RESOLUTION_12B);
+  }
+
+  APP_LOG(TS_ON, VLEVEL_L, "temp= %d\n\r", temperatureDegreeC);
+
+  /* from int16 to q8.7*/
+  temperatureDegreeC <<= 8;
+
+  return (int16_t) temperatureDegreeC;
+  /* USER CODE BEGIN SYS_GetTemperatureLevel_2 */
+
+  /* USER CODE END SYS_GetTemperatureLevel_2 */
+}
+
+uint16_t SYS_GetBatteryLevel(void)
+{
+  /* USER CODE BEGIN SYS_GetBatteryLevel_1 */
+
+  /* USER CODE END SYS_GetBatteryLevel_1 */
+  uint16_t batteryLevelmV = 0;
+  uint32_t measuredLevel = 0;
+
+  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_VREFINT);
+
+  if (measuredLevel == 0)
+  {
+    batteryLevelmV = 0;
+  }
+  else
+  {
+    if ((uint32_t)*VREFINT_CAL_ADDR != (uint32_t)0xFFFFU)
+    {
+      /* Device with Reference voltage calibrated in production:
+         use device optimized parameters */
+      batteryLevelmV = __LL_ADC_CALC_VREFANALOG_VOLTAGE(measuredLevel,
+                                                        ADC_RESOLUTION_12B);
+    }
+    else
+    {
+      /* Device with Reference voltage not calibrated in production:
+         use generic parameters */
+      batteryLevelmV = (VREFINT_CAL_VREF * 1510) / measuredLevel;
+    }
+  }
+
+  return batteryLevelmV;
+  /* USER CODE BEGIN SYS_GetBatteryLevel_2 */
+
+  /* USER CODE END SYS_GetBatteryLevel_2 */
+}
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+static uint32_t ADC_ReadChannels(uint32_t channel)
+{
+  /* USER CODE BEGIN ADC_ReadChannels_1 */
+
+  /* USER CODE END ADC_ReadChannels_1 */
+  uint32_t ADCxConvertedValues = 0;
+  ADC_ChannelConfTypeDef sConfig = {0};
+
+  MX_ADC_Init();
+
+  /* Start Calibration */
+  if (HAL_ADCEx_Calibration_Start(&hadc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* Configure Regular Channel */
+  sConfig.Channel = channel;
+  sConfig.Rank = ADC_REGULAR_RANK_1;
+  sConfig.SamplingTime = ADC_SAMPLINGTIME_COMMON_1;
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  if (HAL_ADC_Start(&hadc) != HAL_OK)
+  {
+    /* Start Error */
+    Error_Handler();
+  }
+  /** Wait for end of conversion */
+  HAL_ADC_PollForConversion(&hadc, HAL_MAX_DELAY);
+
+  /** Wait for end of conversion */
+  HAL_ADC_Stop(&hadc) ;   /* it calls also ADC_Disable() */
+
+  ADCxConvertedValues = HAL_ADC_GetValue(&hadc);
+
+  HAL_ADC_DeInit(&hadc);
+
+  return ADCxConvertedValues;
+  /* USER CODE BEGIN ADC_ReadChannels_2 */
+
+  /* USER CODE END ADC_ReadChannels_2 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
new file mode 100644
index 00000000..b93bda5c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    dma.c
+  * @brief   This file provides code for the configuration
+  *          of all the requested memory to memory DMA transfers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "dma.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/*----------------------------------------------------------------------------*/
+/* Configure DMA                                                              */
+/*----------------------------------------------------------------------------*/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/**
+  * Enable DMA controller clock
+  */
+void MX_DMA_Init(void)
+{
+
+  /* DMA controller clock enable */
+  __HAL_RCC_DMAMUX1_CLK_ENABLE();
+  __HAL_RCC_DMA1_CLK_ENABLE();
+
+  /* DMA interrupt init */
+  /* DMA1_Channel5_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+
+}
+
+/* USER CODE BEGIN 2 */
+
+/* USER CODE END 2 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
new file mode 100644
index 00000000..fdcbc616
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
@@ -0,0 +1,97 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.c
+  * @brief   This file provides code for the configuration
+  *          of the IPCC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "ipcc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+IPCC_HandleTypeDef hipcc;
+
+/* IPCC init function */
+void MX_IPCC_Init(void)
+{
+
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
+  hipcc.Instance = IPCC;
+  if (HAL_IPCC_Init(&hipcc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
+
+}
+
+void HAL_IPCC_MspInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspInit 0 */
+
+  /* USER CODE END IPCC_MspInit 0 */
+    /* IPCC clock enable */
+    __HAL_RCC_IPCC_CLK_ENABLE();
+
+    /* IPCC interrupt Init */
+    HAL_NVIC_SetPriority(IPCC_C1_RX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn);
+    HAL_NVIC_SetPriority(IPCC_C1_TX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspInit 1 */
+
+  /* USER CODE END IPCC_MspInit 1 */
+  }
+}
+
+void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspDeInit 0 */
+
+  /* USER CODE END IPCC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_IPCC_CLK_DISABLE();
+
+    /* IPCC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(IPCC_C1_RX_IRQn);
+    HAL_NVIC_DisableIRQ(IPCC_C1_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspDeInit 1 */
+
+  /* USER CODE END IPCC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
new file mode 100644
index 00000000..672a366f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
@@ -0,0 +1,206 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.c
+  * @author  MCD Application Team
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+
+/*ipcc interface for M4*/
+#include "assert.h"
+#include "stddef.h"
+#include "ipcc_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static void (*IpccResponseRcv)(uint32_t channelIdx);
+
+static void (*IpccNotificationRcv)(uint32_t channelIdx);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ confirmation of a received message by remote CPU
+  */
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ notification request by remote CPU
+  */
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx))
+{
+  /* USER CODE BEGIN IPCC_IF_Init_1 */
+
+  /* USER CODE END IPCC_IF_Init_1 */
+  /*Initialize the ipcc, initialize MSP*/
+  MX_IPCC_Init();
+
+  /* IPCC EXTI (AIEC) line for CPU1  */
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
+  LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
+
+  /* Initialize IPCC callback of all channels*/
+  for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
+  {
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
+  }
+
+  /* Registers upper level (application) callback */
+  IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
+  IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
+  return;
+  /* USER CODE BEGIN IPCC_IF_Init_2 */
+
+  /* USER CODE END IPCC_IF_Init_2 */
+}
+
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_1 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX);
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_2 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_2 */
+}
+
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_1 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX);
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_2 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_2 */
+}
+
+int32_t IPCC_IF_CommandSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CommandSnd_1 */
+
+  /* USER CODE END IPCC_IF_CommandSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_CommandSnd_2 */
+
+  /* USER CODE END IPCC_IF_CommandSnd_2 */
+}
+
+int32_t IPCC_IF_AcknowledgeSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_AcknowledgeSnd_1 */
+
+  /* USER CODE END IPCC_IF_AcknowledgeSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_AcknowledgeSnd_2 */
+
+  /* USER CODE END IPCC_IF_AcknowledgeSnd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrTxCb_1 */
+
+  /* USER CODE END IpccIfIsrTxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccResponseRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrTxCb_2 */
+
+  /* USER CODE END IpccIfIsrTxCb_2 */
+}
+
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrRxCb_1 */
+
+  /* USER CODE END IpccIfIsrRxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccNotificationRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrRxCb_2 */
+
+  /* USER CODE END IpccIfIsrRxCb_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
new file mode 100644
index 00000000..39c26a02
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
@@ -0,0 +1,189 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "app_lorawan.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_LoRaWAN_Init();
+  /* USER CODE BEGIN 2 */
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE END WHILE */
+    MX_LoRaWAN_Process();
+
+    /* USER CODE BEGIN 3 */
+  }
+  /* USER CODE END 3 */
+}
+
+/**
+  * @brief System Clock Configuration
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+
+  /** Configure LSE Drive Capability
+  */
+  HAL_PWR_EnableBkUpAccess();
+  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+  /** Configure the main internal regulator output voltage
+  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+  /** Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.MSIState = RCC_MSI_ON;
+  RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_11;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK3|RCC_CLOCKTYPE_HCLK2
+                              |RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  while (1)
+  {
+  }
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
new file mode 100644
index 00000000..99f840e9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
@@ -0,0 +1,168 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.c
+  * @author  MCD Application Team
+  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "stm32_lpm.h"
+#include "stm32_lpm_if.h"
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Power driver callbacks handler
+  */
+const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
+{
+  PWR_EnterSleepMode,
+  PWR_ExitSleepMode,
+
+  PWR_EnterStopMode,
+  PWR_ExitStopMode,
+
+  PWR_EnterOffMode,
+  PWR_ExitOffMode,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void PWR_EnterOffMode(void)
+{
+  /* USER CODE BEGIN EnterOffMode_1 */
+
+  /* USER CODE END EnterOffMode_1 */
+}
+
+void PWR_ExitOffMode(void)
+{
+  /* USER CODE BEGIN ExitOffMode_1 */
+
+  /* USER CODE END ExitOffMode_1 */
+}
+
+void PWR_EnterStopMode(void)
+{
+  /* USER CODE BEGIN EnterStopMode_1 */
+
+  /* USER CODE END EnterStopMode_1 */
+  HAL_SuspendTick();
+  /* Clear Status Flag before entering STOP/STANDBY Mode */
+  LL_PWR_ClearFlag_C1STOP_C1STB();
+
+  /* USER CODE BEGIN EnterStopMode_2 */
+
+  /* USER CODE END EnterStopMode_2 */
+  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
+  /* USER CODE BEGIN EnterStopMode_3 */
+
+  /* USER CODE END EnterStopMode_3 */
+}
+
+void PWR_ExitStopMode(void)
+{
+  /* USER CODE BEGIN ExitStopMode_1 */
+
+  /* USER CODE END ExitStopMode_1 */
+  /* Resume sysTick : work around for debugger problem in dual core */
+  HAL_ResumeTick();
+  /*Not retained periph:
+    ADC interface
+    DAC interface USARTx, TIMx, i2Cx, SPIx
+    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
+
+  /* Resume not retained USARTx and DMA */
+  vcom_Resume();
+  /* USER CODE BEGIN ExitStopMode_2 */
+
+  /* USER CODE END ExitStopMode_2 */
+}
+
+void PWR_EnterSleepMode(void)
+{
+  /* USER CODE BEGIN EnterSleepMode_1 */
+
+  /* USER CODE END EnterSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_SuspendTick();
+  /* USER CODE BEGIN EnterSleepMode_2 */
+
+  /* USER CODE END EnterSleepMode_2 */
+  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+  /* USER CODE BEGIN EnterSleepMode_3 */
+
+  /* USER CODE END EnterSleepMode_3 */
+}
+
+void PWR_ExitSleepMode(void)
+{
+  /* USER CODE BEGIN ExitSleepMode_1 */
+
+  /* USER CODE END ExitSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_ResumeTick();
+
+  /* USER CODE BEGIN ExitSleepMode_2 */
+
+  /* USER CODE END ExitSleepMode_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..ea7dc033
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file         stm32wlxx_hal_msp.c
+  * @brief        This file provides code for the MSP Initialization
+  *               and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..f1215b41
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,290 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+extern IPCC_HandleTypeDef hipcc;
+extern DMA_HandleTypeDef hdma_usart2_tx;
+extern UART_HandleTypeDef huart2;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+  while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/**
+  * @brief This function handles EXTI Line 0 Interrupt.
+  */
+void EXTI0_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI0_IRQn 0 */
+
+  /* USER CODE END EXTI0_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
+  /* USER CODE BEGIN EXTI0_IRQn 1 */
+
+  /* USER CODE END EXTI0_IRQn 1 */
+}
+
+/**
+  * @brief This function handles EXTI Line 1 Interrupt.
+  */
+void EXTI1_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI1_IRQn 0 */
+
+  /* USER CODE END EXTI1_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1);
+  /* USER CODE BEGIN EXTI1_IRQn 1 */
+
+  /* USER CODE END EXTI1_IRQn 1 */
+}
+
+/**
+  * @brief This function handles DMA1 Channel 5 Interrupt.
+  */
+void DMA1_Channel5_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart2_tx);
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 1 */
+}
+
+/**
+  * @brief This function handles USART2 Interrupt.
+  */
+void USART2_IRQHandler(void)
+{
+  /* USER CODE BEGIN USART2_IRQn 0 */
+
+  /* USER CODE END USART2_IRQn 0 */
+  HAL_UART_IRQHandler(&huart2);
+  /* USER CODE BEGIN USART2_IRQn 1 */
+
+  /* USER CODE END USART2_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC RX Occupied Interrupt.
+  */
+void IPCC_C1_RX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C1_RX_IRQn 0 */
+
+  /* USER CODE END IPCC_C1_RX_IRQn 0 */
+  HAL_IPCC_RX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C1_RX_IRQn 1 */
+
+  /* USER CODE END IPCC_C1_RX_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC TX Free Interrupt.
+  */
+void IPCC_C1_TX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C1_TX_IRQn 0 */
+
+  /* USER CODE END IPCC_C1_TX_IRQn 0 */
+  HAL_IPCC_TX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C1_TX_IRQn 1 */
+
+  /* USER CODE END IPCC_C1_TX_IRQn 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
new file mode 100644
index 00000000..edf2a190
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
@@ -0,0 +1,461 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.c
+  * @author  MCD Application Team
+  * @brief   Initializes HW and SW system entities (not related to the radio)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdio.h>
+#include "platform.h"
+#include "sys_app.h"
+#include "adc_if.h"
+#include "stm32_seq.h"
+#include "stm32_systime.h"
+#include "stm32_lpm.h"
+#include "timer_if.h"
+#include "utilities_def.h"
+#include "sys_debug.h"
+#include "sys_sensors.h"
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_radio.h"
+#include "mbmuxif_lora.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+#if ( DEBUGGER_ENABLED == 1 )
+__IO uint32_t lets_go_on = 0;
+#endif /* DEBUGGER_ENABLED */
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MAX_TS_SIZE (int) 16
+
+/**
+  * Defines the maximum battery level
+  */
+#define LORAWAN_MAX_BAT   254
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+uint32_t InstanceIndex;
+uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
+  */
+static void MBMUXIF_Init(void);
+
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
+static void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
+  */
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SystemApp_Init(void)
+{
+  /* USER CODE BEGIN SystemApp_Init_1 */
+
+  /* USER CODE END SystemApp_Init_1 */
+
+  /* Ensure that MSI is wake-up system clock */
+  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
+
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
+
+#if ( DEBUGGER_ENABLED == 1 )
+  BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
+#endif /* DEBUGGER_ENABLED */
+
+  /*Initialize the terminal */
+  UTIL_ADV_TRACE_Init();
+  UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
+
+  /*Set verbose LEVEL*/
+  UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
+  /*Initialize the temperature and Battery measurement services */
+  SYS_InitMeasurement();
+
+  /*Initialize the Sensors */
+  EnvSensors_Init();
+
+  /*Init low power manager*/
+  UTIL_LPM_Init();
+  /* Disable Stand-by mode */
+  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+
+#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
+  /* Disable Stop Mode */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+#elif !defined (LOW_POWER_DISABLE)
+#error LOW_POWER_DISABLE not defined
+#endif /* LOW_POWER_DISABLE */
+
+  /*Initialize MBMux (to be done after LPM because MBMux uses the sequencer) */
+  MBMUXIF_Init();
+
+  UTIL_TIMER_Init();
+
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
+  /* USER CODE BEGIN SystemApp_Init_2 */
+
+  /* USER CODE END SystemApp_Init_2 */
+}
+
+void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Sys_Notif_1 */
+
+  /* USER CODE END Process_Sys_Notif_1 */
+  uint32_t  notif_ack_id;
+
+  notif_ack_id = ComObj->MsgId;
+
+  switch (notif_ack_id)
+  {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
+    case SYS_OTHER_MSG_ID:
+      APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
+      /* prepare ack buffer*/
+      ComObj->ParamCnt = 0;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
+
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
+    default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
+      break;
+  }
+
+  /* Send ack*/
+  APP_LOG(TS_ON, VLEVEL_H, "CM4>(System)\r\n");
+  MBMUXIF_SystemSendAck(FEAT_INFO_SYSTEM_ID);
+  /* USER CODE BEGIN Process_Sys_Notif_2 */
+
+  /* USER CODE END Process_Sys_Notif_2 */
+}
+
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
+{
+  /**
+    * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
+    * all to process all tack except TaskId_bm
+    */
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_1 */
+  UTIL_SEQ_Run(~TaskId_bm);
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_2 */
+  return;
+}
+
+/**
+  * @brief redefines __weak function in stm32_seq.c such to enter low power
+  */
+void UTIL_SEQ_Idle(void)
+{
+  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
+
+  /* USER CODE END UTIL_SEQ_Idle_1 */
+  UTIL_LPM_EnterLowPower();
+  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
+
+  /* USER CODE END UTIL_SEQ_Idle_2 */
+}
+
+uint8_t GetBatteryLevel(void)
+{
+  uint8_t batteryLevel = 0;
+  uint16_t batteryLevelmV;
+
+  /* USER CODE BEGIN GetBatteryLevel_0 */
+
+  /* USER CODE END GetBatteryLevel_0 */
+
+  batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
+
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
+  if (batteryLevelmV > VDD_BAT)
+  {
+    batteryLevel = LORAWAN_MAX_BAT;
+  }
+  else if (batteryLevelmV < VDD_MIN)
+  {
+    batteryLevel = 0;
+  }
+  else
+  {
+    batteryLevel = (((uint32_t)(batteryLevelmV - VDD_MIN) * LORAWAN_MAX_BAT) / (VDD_BAT - VDD_MIN));
+  }
+
+  APP_LOG(TS_ON, VLEVEL_M, "VDDA= %d\r\n", batteryLevel);
+
+  /* USER CODE BEGIN GetBatteryLevel_2 */
+
+  /* USER CODE END GetBatteryLevel_2 */
+
+  return batteryLevel;  /* 1 (very low) to 254 (fully charged) */
+}
+
+uint16_t GetTemperatureLevel(void)
+{
+  uint16_t temperatureLevel = 0;
+
+  temperatureLevel = (uint16_t)(SYS_GetTemperatureLevel() / 256);
+  /* USER CODE BEGIN GetTemperatureLevel */
+
+  /* USER CODE END GetTemperatureLevel */
+  return temperatureLevel;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_Init(void)
+{
+  /* USER CODE BEGIN MBMUXIF_Init_1 */
+
+  /* USER CODE END MBMUXIF_Init_1 */
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
+  int8_t init_status;
+
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
+
+  init_status = MBMUXIF_SystemInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+
+  /* start CM0PLUS */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
+  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
+
+  /* Warn CPU2 that CPU1 is ready */
+  /* Set Cpu Event then consume it to allow next low power entry */
+  __SEV();
+  __WFE();
+
+  /* Push Button for stop the core in other to attach debugger */
+#if ( DEBUGGER_ENABLED == 1 )
+  APP_LOG(TS_ON, VLEVEL_L, "\r\nPress PushButton2 to continue \r\n");
+  while (lets_go_on == 0);
+  lets_go_on = 0;
+#endif /* DEBUGGER_ENABLED */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
+
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
+
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
+
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
+
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
+
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
+
+  init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_RTC_REGISTERED);
+  APP_LOG(TS_ON, VLEVEL_H, "System_Priority_A Registration for RTC Alarm handling completed \r\n");
+
+  init_status = MBMUXIF_TraceInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  APP_LOG(TS_ON, VLEVEL_H, "Trace registration CM4-CM0PLUS completed \r\n");
+
+  init_status = MBMUXIF_LoraInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  APP_LOG(TS_ON, VLEVEL_H, "Radio registration CM4-CM0PLUS completed \r\n");
+
+  /* USER CODE BEGIN MBMUXIF_Init_Last */
+
+  /* USER CODE END MBMUXIF_Init_Last */
+}
+
+static void TimestampNow(uint8_t *buff, uint16_t *size)
+{
+  /* USER CODE BEGIN TimestampNow_1 */
+
+  /* USER CODE END TimestampNow_1 */
+  SysTime_t curtime = SysTimeGet();
+  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
+  *size = strlen((char *)buff);
+  /* USER CODE BEGIN TimestampNow_2 */
+
+  /* USER CODE END TimestampNow_2 */
+}
+
+/* Disable StopMode when traces need to be printed */
+void UTIL_ADV_TRACE_PreSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
+}
+/* Re-enable StopMode when traces have been printed */
+void UTIL_ADV_TRACE_PostSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_2 */
+}
+
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
+{
+  /* USER CODE BEGIN tiny_snprintf_like_1 */
+
+  /* USER CODE END tiny_snprintf_like_1 */
+  va_list vaArgs;
+  va_start(vaArgs, strFormat);
+  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
+  va_end(vaArgs);
+  /* USER CODE BEGIN tiny_snprintf_like_2 */
+
+  /* USER CODE END tiny_snprintf_like_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/* HAL overload functions ---------------------------------------------------------*/
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
+{
+  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
+  /* USER CODE BEGIN HAL_InitTick_1 */
+
+  /* USER CODE END HAL_InitTick_1 */
+  return HAL_OK;
+  /* USER CODE BEGIN HAL_InitTick_2 */
+
+  /* USER CODE END HAL_InitTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+uint32_t HAL_GetTick(void)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_GetTick_1 */
+
+  /* USER CODE END HAL_GetTick_1 */
+  return TIMER_IF_GetTimerValue();
+  /* USER CODE BEGIN HAL_GetTick_2 */
+
+  /* USER CODE END HAL_GetTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+void HAL_Delay(__IO uint32_t Delay)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_Delay_1 */
+
+  /* USER CODE END HAL_Delay_1 */
+  TIMER_IF_DelayMs(Delay);
+  /* USER CODE BEGIN HAL_Delay_2 */
+
+  /* USER CODE END HAL_Delay_2 */
+}
+
+/* USER CODE BEGIN Overload_HAL_weaks */
+
+/* USER CODE END Overload_HAL_weaks */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
new file mode 100644
index 00000000..3afffff8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
@@ -0,0 +1,268 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_sensors.c
+  * @author  MCD Application Team
+  * @brief   Manages the sensors on the application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "sys_conf.h"
+#include "sys_sensors.h"
+
+/* USER CODE BEGIN Includes */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if defined (X_NUCLEO_IKS01A2)
+#warning "IKS drivers are today available for several families but not stm32WL"
+#warning "up to the user adapt IKS low layer to map it on WL board driver"
+#warning "this code would work only if user provide necessary IKS and BSP layers"
+#include "iks01a2_env_sensors.h"
+#elif defined (X_NUCLEO_IKS01A3)
+/*
+## How to add IKS01A3 to CubeWL
+
+ 1. Download STM32CubeExpansion_MEMS1_V8.0.0
+ 2. Copy Drivers From `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3` to CubeWL `Drivers\BSP\IKS01A3` and add to the IDE Project
+ 3. Copy `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3\iks01a3_conf_template.h` into `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target\iks01a3_conf.h`.
+ 4. Copy files nucleo_l476rg_bus.c/nucleo_l476rg_bus.h  from `STM32L476RG-Nucleo\Applications\IKS01A3\ActiveTime\Inc and \Src` to `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target` and rename to `nucleo_wl55jc_bus.c` and `nucleo_wl55jc_bus.h` respectively
+ 5. Update `nucleo_wl55jc_bus.c`  include files  to
+ ```bash
+#include "nucleo_wl55jc_bus.h"
+#include "stm32wlxx_nucleo_errno.h"
+#include "stm32wlxx_hal.h"
+```
+
+6. Update definitions in `nucleo_wl55jc_bus.h`(to be commented since already defined elsewhere)
+
+ ```bash
+//#define USE_HAL_SPI_REGISTER_CALLBACKS 0
+//#define USE_HAL_I2C_REGISTER_CALLBACKS 0
+```
+
+7. copy following components and add them (.c and .h) into IDE Project
+
+../../../../../../Drivers/BSP/Components/lsm6dso
+../../../../../../Drivers/BSP/Components/lis2dw12
+../../../../../../Drivers/BSP/Components/lis2mdl
+../../../../../../Drivers/BSP/Components/hts221
+../../../../../../Drivers/BSP/Components/lps22hh
+../../../../../../Drivers/BSP/Components/stts751
+../../../../../../Drivers/BSP/Components/Common
+
+8. Enable #define HAL_I2C_MODULE_ENABLED in stm32_hal_conf.h
+9. Add stm32wlxx_hal_i2c.c and stm32wlxx_hal_i2c_ex.c in the IDE Project
+10. Update hi2c->Instance in `nucleo_wl55jc_bus.c` to
+
+```bash
+  hi2c->Instance = I2C2;
+```
+
+11. Update msp function in `nucleo_wl55jc_bus.c`
+
+```bash
+static void I2C2_MspInit(I2C_HandleTypeDef *i2cHandle)
+{
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12;
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF4_I2C2;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  __HAL_RCC_I2C2_CLK_ENABLE();
+}
+
+static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
+{
+  __HAL_RCC_I2C2_CLK_DISABLE();
+
+  HAL_GPIO_DeInit(GPIOA, GPIO_PIN_11 | GPIO_PIN_12);
+
+}
+```
+12. Replace I2C1xx by MX_I2C2xx and i2c1 by i2c2 in `nucleo_wl55jc_bus.c`
+13. Replace I2C1xx by MX_I2C2xx in `nucleo_wl55jc_bus.h`
+*/
+#warning "IKS drivers are today available for several families but not stm32WL, follow steps defined in sys_sensors.c"
+#include "iks01a3_env_sensors.h"
+#else  /* not X_IKS01xx */
+#error "user to include its sensor drivers"
+#endif  /* X_NUCLEO_IKS01xx */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+#define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
+#define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
+#define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
+#define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
+#define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
+#define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if defined (X_NUCLEO_IKS01A2)
+#warning "IKS drivers are today available for several families but not stm32WL"
+#warning "up to the user adapt IKS low layer to map it on WL board driver"
+#warning "this code would work only if user provide necessary IKS and BSP layers"
+IKS01A2_ENV_SENSOR_Capabilities_t EnvCapabilities;
+#elif defined (X_NUCLEO_IKS01A3)
+IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
+#else  /* not X_IKS01Ax */
+#error "user to include its sensor drivers"
+#endif  /* X_NUCLEO_IKS01 */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
+{
+  /* USER CODE BEGIN EnvSensors_Read */
+  float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
+  float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
+  float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
+
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
+  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_PRESSURE, &PRESSURE_Value);
+  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_PRESSURE, &PRESSURE_Value);
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+
+  sensor_data->humidity    = HUMIDITY_Value;
+  sensor_data->temperature = TEMPERATURE_Value;
+  sensor_data->pressure    = PRESSURE_Value;
+
+  sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
+  sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
+
+  return 0;
+  /* USER CODE END EnvSensors_Read */
+}
+
+int32_t  EnvSensors_Init(void)
+{
+  /* USER CODE BEGIN EnvSensors_Init */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+  /* Init */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_Init(HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_Init(LPS22HB_0, ENV_TEMPERATURE | ENV_PRESSURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_Init(IKS01A3_HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_Init(IKS01A3_LPS22HH_0, ENV_TEMPERATURE | ENV_PRESSURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+  /* Enable */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_HUMIDITY);
+  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_PRESSURE);
+  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_HUMIDITY);
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_PRESSURE);
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+  /* Get capabilities */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_GetCapabilities(HTS221_0, &EnvCapabilities);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_GetCapabilities(LPS22HB_0, &EnvCapabilities);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_HTS221_0, &EnvCapabilities);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_LPS22HH_0, &EnvCapabilities);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif /* SENSOR_ENABLED  */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
new file mode 100644
index 00000000..f02a544d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
@@ -0,0 +1,437 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.c
+  * @author  MCD Application Team
+  * @brief   Configure RTC Alarm, Tick and Calendar manager
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "stm32_lpm.h"
+#include "utilities_def.h"
+#include "stm32wlxx_ll_rtc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief RTC handle
+  */
+RTC_HandleTypeDef hrtc;
+
+/**
+  * @brief Timer driver callbacks handler
+  */
+const UTIL_TIMER_Driver_s UTIL_TimerDriver =
+{
+  TIMER_IF_Init,
+  NULL,
+
+  TIMER_IF_StartTimer,
+  TIMER_IF_StopTimer,
+
+  TIMER_IF_SetTimerContext,
+  TIMER_IF_GetTimerContext,
+
+  TIMER_IF_GetTimerElapsedTime,
+  TIMER_IF_GetTimerValue,
+  TIMER_IF_GetMinimumTimeout,
+
+  TIMER_IF_Convert_ms2Tick,
+  TIMER_IF_Convert_Tick2ms,
+};
+
+/**
+  * @brief SysTime driver callbacks handler
+  */
+const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
+{
+  TIMER_IF_BkUp_Write_Seconds,
+  TIMER_IF_BkUp_Read_Seconds,
+  TIMER_IF_BkUp_Write_SubSeconds,
+  TIMER_IF_BkUp_Read_SubSeconds,
+  TIMER_IF_GetTime,
+};
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Minimum timeout delay of Alarm in ticks
+  */
+#define MIN_ALARM_DELAY    3
+
+/**
+  * @brief Backup seconds register
+  */
+#define RTC_BKP_SECONDS    RTC_BKP_DR0
+
+/**
+  * @brief Backup subseconds register
+  */
+#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
+
+/**
+  * @brief Backup msbticks register
+  */
+#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
+
+/* #define RTIF_DEBUG */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifdef RTIF_DEBUG
+#include "sys_app.h" /*for app_log*/
+/**
+  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
+  */
+#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+#else
+/**
+  * @brief not used
+  */
+#define TIMER_IF_DBG_PRINTF(...)
+#endif /* RTIF_DEBUG */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Indicates if the RTC is already Initialized or not
+  */
+static bool RTC_Initialized = false;
+
+/**
+  * @brief RtcTimerContext
+  */
+static uint32_t RtcTimerContext = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Get rtc timer Value in rtc tick
+  * @return val the rtc timer value (upcounting)
+  */
+static inline uint32_t GetTimerTicks(void);
+
+/**
+  * @brief Reads MSBticks from backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @retval MSBticks
+  */
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+UTIL_TIMER_Status_t TIMER_IF_Init(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_Init */
+
+  /* USER CODE END TIMER_IF_Init */
+  /** Configure the Instance */
+  hrtc.Instance = RTC;
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+  TIMER_IF_SetTimerContext();
+  RTC_Initialized = true;
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StartTimer */
+
+  /* USER CODE END TIMER_IF_StartTimer */
+  RTC_AlarmTypeDef sAlarm = {0};
+  /*Stop timer if one is already started*/
+  TIMER_IF_StopTimer();
+  timeout += RtcTimerContext;
+
+  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
+  /* starts timer*/
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
+
+  /* USER CODE END TIMER_IF_StartTimer_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StopTimer */
+
+  /* USER CODE END TIMER_IF_StopTimer */
+  /* Clear RTC Alarm Flag */
+  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRAF);
+  /* Disable the Alarm A interrupt */
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
+
+  /* USER CODE END TIMER_IF_StopTimer_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_SetTimerContext(void)
+{
+  /*store time context*/
+  RtcTimerContext = GetTimerTicks();
+
+  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
+
+  /* USER CODE END TIMER_IF_SetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerContext(void)
+{
+  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
+
+  /* USER CODE END TIMER_IF_GetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerElapsedTime(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetTimerValue(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
+
+  /* USER CODE END TIMER_IF_GetTimerValue */
+  if (RTC_Initialized == true)
+  {
+    ret = GetTimerTicks();
+  }
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetMinimumTimeout(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick */
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
+}
+
+void TIMER_IF_DelayMs(uint32_t delay)
+{
+  /* USER CODE BEGIN TIMER_IF_DelayMs */
+
+  /* USER CODE END TIMER_IF_DelayMs */
+  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
+  uint32_t timeout = GetTimerTicks();
+
+  /* Wait delay ms */
+  while (((GetTimerTicks() - timeout)) < delayTicks)
+  {
+    __NOP();
+  }
+  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
+
+  /* USER CODE END TIMER_IF_DelayMs_Last */
+}
+
+uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
+{
+  uint32_t seconds = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTime */
+
+  /* USER CODE END TIMER_IF_GetTime */
+  uint64_t ticks;
+  uint32_t timerValueLsb = GetTimerTicks();
+  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
+
+  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
+
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+
+  ticks = (uint32_t) ticks & RTC_PREDIV_S;
+
+  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
+
+  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
+}
+
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
+}
+
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
+}
+
+uint32_t TIMER_IF_BkUp_Read_Seconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
+  uint32_t MSBticks;
+  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
+  return MSBticks;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
+}
+
+static inline uint32_t GetTimerTicks(void)
+{
+  /* USER CODE BEGIN GetTimerTicks */
+
+  /* USER CODE END GetTimerTicks */
+  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
+  /* USER CODE BEGIN GetTimerTicks_Last */
+
+  /* USER CODE END GetTimerTicks_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
new file mode 100644
index 00000000..be36fe23
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
@@ -0,0 +1,173 @@
+/**
+  ******************************************************************************
+  * @file    usart.c
+  * @brief   This file provides code for the configuration
+  *          of the USART instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+UART_HandleTypeDef huart2;
+DMA_HandleTypeDef hdma_usart2_tx;
+
+/* USART2 init function */
+
+void MX_USART2_UART_Init(void)
+{
+
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
+  huart2.Instance = USART2;
+  huart2.Init.BaudRate = 115200;
+  huart2.Init.WordLength = UART_WORDLENGTH_8B;
+  huart2.Init.StopBits = UART_STOPBITS_1;
+  huart2.Init.Parity = UART_PARITY_NONE;
+  huart2.Init.Mode = UART_MODE_TX_RX;
+  huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  huart2.Init.OverSampling = UART_OVERSAMPLING_16;
+  huart2.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
+  huart2.Init.ClockPrescaler = UART_PRESCALER_DIV1;
+  huart2.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetTxFifoThreshold(&huart2, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetRxFifoThreshold(&huart2, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_EnableFifoMode(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
+
+}
+
+void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(uartHandle->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspInit 0 */
+
+  /* USER CODE END USART2_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART2;
+    PeriphClkInitStruct.Usart2ClockSelection = RCC_USART2CLKSOURCE_SYSCLK;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* USART2 clock enable */
+    __HAL_RCC_USART2_CLK_ENABLE();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**USART2 GPIO Configuration
+    PA3     ------> USART2_RX
+    PA2     ------> USART2_TX
+    */
+    GPIO_InitStruct.Pin = USARTx_RX_Pin|USARTx_TX_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF7_USART2;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    /* USART2 DMA Init */
+    /* USART2_TX Init */
+    hdma_usart2_tx.Instance = DMA1_Channel5;
+    hdma_usart2_tx.Init.Request = DMA_REQUEST_USART2_TX;
+    hdma_usart2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_usart2_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart2_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart2_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.Mode = DMA_NORMAL;
+    hdma_usart2_tx.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    if (HAL_DMA_ConfigChannelAttributes(&hdma_usart2_tx, DMA_CHANNEL_NPRIV) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
+
+    /* USART2 interrupt Init */
+    HAL_NVIC_SetPriority(USART2_IRQn, 2, 0);
+    HAL_NVIC_EnableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspInit 1 */
+
+  /* USER CODE END USART2_MspInit 1 */
+  }
+}
+
+void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
+{
+
+  if(uartHandle->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspDeInit 0 */
+
+  /* USER CODE END USART2_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_USART2_CLK_DISABLE();
+
+    /**USART2 GPIO Configuration
+    PA3     ------> USART2_RX
+    PA2     ------> USART2_TX
+    */
+    HAL_GPIO_DeInit(GPIOA, USARTx_RX_Pin|USARTx_TX_Pin);
+
+    /* USART2 DMA DeInit */
+    HAL_DMA_DeInit(uartHandle->hdmatx);
+
+    /* USART2 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspDeInit 1 */
+
+  /* USER CODE END USART2_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
new file mode 100644
index 00000000..182f1990
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
@@ -0,0 +1,257 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.c
+  * @author  MCD Application Team
+  * @brief   Configuration of UART driver interface for hyperterminal communication
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief DMA handle
+  */
+extern DMA_HandleTypeDef hdma_usart2_tx;
+
+/**
+  * @brief UART handle
+  */
+extern UART_HandleTypeDef huart2;
+
+/**
+  * @brief buffer to receive 1 character
+  */
+uint8_t charRx;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Trace driver callbacks handler
+  */
+const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
+{
+  vcom_Init,
+  vcom_DeInit,
+  vcom_ReceiveInit,
+  vcom_Trace_DMA,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief  TX complete callback
+  * @return none
+  */
+static void (*TxCpltCallback)(void *);
+/**
+  * @brief  RX complete callback
+  * @param  rxChar ptr of chars buffer sent by user
+  * @param  size buffer size
+  * @param  error errorcode
+  * @return none
+  */
+static void (*RxCpltCallback)(uint8_t *rxChar, uint16_t size, uint8_t error);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *))
+{
+  /* USER CODE BEGIN vcom_Init_1 */
+
+  /* USER CODE END vcom_Init_1 */
+  TxCpltCallback = cb;
+  MX_DMA_Init();
+  MX_USART2_UART_Init();
+  LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_27);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Init_2 */
+
+  /* USER CODE END vcom_Init_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
+{
+  /* USER CODE BEGIN vcom_DeInit_1 */
+
+  /* USER CODE END vcom_DeInit_1 */
+  /* ##-1- Reset peripherals ################################################## */
+  __HAL_RCC_USART2_FORCE_RESET();
+  __HAL_RCC_USART2_RELEASE_RESET();
+
+  /* ##-2- MspDeInit ################################################## */
+  HAL_UART_MspDeInit(&huart2);
+
+  /* ##-3- Disable the NVIC for DMA ########################################### */
+  /* USER CODE BEGIN 1 */
+  HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE END 1 */
+  /* USER CODE BEGIN vcom_DeInit_2 */
+
+  /* USER CODE END vcom_DeInit_2 */
+}
+
+void vcom_Trace(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_1 */
+
+  /* USER CODE END vcom_Trace_1 */
+  HAL_UART_Transmit(&huart2, p_data, size, 1000);
+  /* USER CODE BEGIN vcom_Trace_2 */
+
+  /* USER CODE END vcom_Trace_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_DMA_1 */
+
+  /* USER CODE END vcom_Trace_DMA_1 */
+  HAL_UART_Transmit_DMA(&huart2, p_data, size);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Trace_DMA_2 */
+
+  /* USER CODE END vcom_Trace_DMA_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error))
+{
+  /* USER CODE BEGIN vcom_ReceiveInit_1 */
+
+  /* USER CODE END vcom_ReceiveInit_1 */
+  UART_WakeUpTypeDef WakeUpSelection;
+
+  /*record call back*/
+  RxCpltCallback = RxCb;
+
+  /*Set wakeUp event on start bit*/
+  WakeUpSelection.WakeUpEvent = UART_WAKEUP_ON_STARTBIT;
+
+  HAL_UARTEx_StopModeWakeUpSourceConfig(&huart2, WakeUpSelection);
+
+  /* Make sure that no UART transfer is on-going */
+  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_BUSY) == SET);
+
+  /* Make sure that UART is ready to receive)   */
+  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_REACK) == RESET);
+
+  /* Enable USART interrupt */
+  __HAL_UART_ENABLE_IT(&huart2, UART_IT_WUF);
+
+  /*Enable wakeup from stop mode*/
+  HAL_UARTEx_EnableStopMode(&huart2);
+
+  /*Start LPUART receive on IT*/
+  HAL_UART_Receive_IT(&huart2, &charRx, 1);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_ReceiveInit_2 */
+
+  /* USER CODE END vcom_ReceiveInit_2 */
+}
+
+void vcom_Resume(void)
+{
+  /* USER CODE BEGIN vcom_Resume_1 */
+
+  /* USER CODE END vcom_Resume_1 */
+  /*to re-enable lost UART settings*/
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /*to re-enable lost DMA settings*/
+  if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN vcom_Resume_2 */
+
+  /* USER CODE END vcom_Resume_2 */
+}
+
+void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart2)
+{
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_1 */
+  /* buffer transmission complete*/
+  TxCpltCallback(NULL);
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_2 */
+}
+
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart2)
+{
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_1 */
+  if ((NULL != RxCpltCallback) && (HAL_UART_ERROR_NONE == huart2->ErrorCode))
+  {
+    RxCpltCallback(&charRx, 1, 0);
+  }
+  HAL_UART_Receive_IT(huart2, &charRx, 1);
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c
new file mode 100644
index 00000000..8f72197e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c
@@ -0,0 +1,399 @@
+/*!
+  * @file      CayenneLpp.c
+  *
+  * @brief     Implements the Cayenne Low Power Protocol
+  *
+  * \copyright Revised BSD License, see section \ref LICENSE.
+  *
+  * \code
+  *                ______                              _
+  *               / _____)             _              | |
+  *              ( (____  _____ ____ _| |_ _____  ____| |__
+  *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+  *               _____) ) ____| | | || |_| ____( (___| | | |
+  *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+  *              (C)2013-2018 Semtech
+  *
+  * \endcode
+  *
+  * \author    Miguel Luis ( Semtech )
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_mem.h"
+#include "CayenneLpp.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define CAYENNE_LPP_MAXBUFFER_SIZE                  242
+#define LPP_DIGITAL_INPUT       0       /* 1 byte */
+#define LPP_DIGITAL_OUTPUT      1       /* 1 byte */
+#define LPP_ANALOG_INPUT        2       /* 2 bytes, 0.01 signed */
+#define LPP_ANALOG_OUTPUT       3       /* 2 bytes, 0.01 signed */
+#define LPP_LUMINOSITY          101     /* 2 bytes, 1 lux unsigned */
+#define LPP_PRESENCE            102     /* 1 byte, 1 */
+#define LPP_TEMPERATURE         103     /* 2 bytes, 0.1 Celsius degrees signed */
+#define LPP_RELATIVE_HUMIDITY   104     /* 1 byte, 0.5% unsigned */
+#define LPP_ACCELEROMETER       113     /* 2 bytes per axis, 0.001G */
+#define LPP_BAROMETRIC_PRESSURE 115     /* 2 bytes 0.1 hPa Unsigned */
+#define LPP_GYROMETER           134     /* 2 bytes per axis, 0.01 degrees/s */
+#define LPP_GPS                 136     /* 3 byte lon/lat 0.0001 degrees, 3 bytes alt 0.01m */
+
+/* Data ID + Data Type + Data Size */
+#define LPP_DIGITAL_INPUT_SIZE       3
+#define LPP_DIGITAL_OUTPUT_SIZE      3
+#define LPP_ANALOG_INPUT_SIZE        4
+#define LPP_ANALOG_OUTPUT_SIZE       4
+#define LPP_LUMINOSITY_SIZE          4
+#define LPP_PRESENCE_SIZE            3
+#define LPP_TEMPERATURE_SIZE         4
+#define LPP_RELATIVE_HUMIDITY_SIZE   3
+#define LPP_ACCELEROMETER_SIZE       8
+#define LPP_BAROMETRIC_PRESSURE_SIZE 4
+#define LPP_GYROMETER_SIZE           8
+#define LPP_GPS_SIZE                 11
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t CayenneLppBuffer[CAYENNE_LPP_MAXBUFFER_SIZE];
+static uint8_t CayenneLppCursor = 0;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void CayenneLppInit(void)
+{
+  CayenneLppCursor = 0;
+  /* USER CODE BEGIN CayenneLppCursor */
+
+  /* USER CODE END CayenneLppCursor */
+}
+
+void CayenneLppReset(void)
+{
+  CayenneLppCursor = 0;
+  /* USER CODE BEGIN CayenneLppReset */
+
+  /* USER CODE END CayenneLppReset */
+}
+
+uint8_t CayenneLppGetSize(void)
+{
+  /* USER CODE BEGIN CayenneLppGetSize */
+
+  /* USER CODE END CayenneLppGetSize */
+  return CayenneLppCursor;
+}
+
+uint8_t *CayenneLppGetBuffer(void)
+{
+  /* USER CODE BEGIN CayenneLppGetBuffer */
+
+  /* USER CODE END CayenneLppGetBuffer */
+  return CayenneLppBuffer;
+}
+
+uint8_t CayenneLppCopy(uint8_t *dst)
+{
+  /* USER CODE BEGIN CayenneLppCopy_1 */
+
+  /* USER CODE END CayenneLppCopy_1 */
+  UTIL_MEM_cpy_8(dst, CayenneLppBuffer, CayenneLppCursor);
+  /* USER CODE BEGIN CayenneLppCopy_2 */
+
+  /* USER CODE END CayenneLppCopy_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddDigitalInput(uint8_t channel, uint8_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddDigitalInput_1 */
+
+  /* USER CODE END CayenneLppAddDigitalInput_1 */
+  if ((CayenneLppCursor + LPP_DIGITAL_INPUT_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_DIGITAL_INPUT;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddDigitalInput_2 */
+
+  /* USER CODE END CayenneLppAddDigitalInput_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddDigitalOutput(uint8_t channel, uint8_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddDigitalOutput_1 */
+
+  /* USER CODE END CayenneLppAddDigitalOutput_1 */
+  if ((CayenneLppCursor + LPP_DIGITAL_OUTPUT_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_DIGITAL_OUTPUT;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddDigitalOutput_2 */
+
+  /* USER CODE END CayenneLppAddDigitalOutput_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddAnalogInput(uint8_t channel, uint16_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddAnalogInput_1 */
+
+  /* USER CODE END CayenneLppAddAnalogInput_1 */
+  if ((CayenneLppCursor + LPP_ANALOG_INPUT_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+
+  value *= 100;
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_ANALOG_INPUT;
+  CayenneLppBuffer[CayenneLppCursor++] = value >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddAnalogInput_2 */
+
+  /* USER CODE END CayenneLppAddAnalogInput_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddAnalogOutput(uint8_t channel, uint16_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddAnalogOutput_1 */
+
+  /* USER CODE END CayenneLppAddAnalogOutput_1 */
+  if ((CayenneLppCursor + LPP_ANALOG_OUTPUT_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  value *= 100;
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_ANALOG_OUTPUT;
+  CayenneLppBuffer[CayenneLppCursor++] = value >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddAnalogOutput_2 */
+
+  /* USER CODE END CayenneLppAddAnalogOutput_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddLuminosity(uint8_t channel, uint16_t lux)
+{
+  /* USER CODE BEGIN CayenneLppAddLuminosity_1 */
+
+  /* USER CODE END CayenneLppAddLuminosity_1 */
+  if ((CayenneLppCursor + LPP_LUMINOSITY_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_LUMINOSITY;
+  CayenneLppBuffer[CayenneLppCursor++] = lux >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = lux;
+  /* USER CODE BEGIN CayenneLppAddLuminosity_2 */
+
+  /* USER CODE END CayenneLppAddLuminosity_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddPresence(uint8_t channel, uint8_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddPresence_1 */
+
+  /* USER CODE END CayenneLppAddPresence_1 */
+  if ((CayenneLppCursor + LPP_PRESENCE_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_PRESENCE;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddPresence_2 */
+
+  /* USER CODE END CayenneLppAddPresence_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddTemperature(uint8_t channel, int16_t celsius)
+{
+  /* USER CODE BEGIN CayenneLppAddTemperature_1 */
+
+  /* USER CODE END CayenneLppAddTemperature_1 */
+  if ((CayenneLppCursor + LPP_TEMPERATURE_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  int16_t val = celsius * 10;
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_TEMPERATURE;
+  CayenneLppBuffer[CayenneLppCursor++] = val >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = val;
+  /* USER CODE BEGIN CayenneLppAddTemperature_2 */
+
+  /* USER CODE END CayenneLppAddTemperature_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddRelativeHumidity(uint8_t channel, uint16_t rh)
+{
+  /* USER CODE BEGIN CayenneLppAddRelativeHumidity_1 */
+
+  /* USER CODE END CayenneLppAddRelativeHumidity_1 */
+  if ((CayenneLppCursor + LPP_RELATIVE_HUMIDITY_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_RELATIVE_HUMIDITY;
+  CayenneLppBuffer[CayenneLppCursor++] = rh * 2;
+  /* USER CODE BEGIN CayenneLppAddRelativeHumidity_2 */
+
+  /* USER CODE END CayenneLppAddRelativeHumidity_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddAccelerometer(uint8_t channel, int16_t x, int16_t y, int16_t z)
+{
+  /* USER CODE BEGIN CayenneLppAddAccelerometer_1 */
+
+  /* USER CODE END CayenneLppAddAccelerometer_1 */
+  if ((CayenneLppCursor + LPP_ACCELEROMETER_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  int16_t vx = x * 1000;
+  int16_t vy = y * 1000;
+  int16_t vz = z * 1000;
+
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_ACCELEROMETER;
+  CayenneLppBuffer[CayenneLppCursor++] = vx >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vx;
+  CayenneLppBuffer[CayenneLppCursor++] = vy >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vy;
+  CayenneLppBuffer[CayenneLppCursor++] = vz >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vz;
+  /* USER CODE BEGIN CayenneLppAddAccelerometer_2 */
+
+  /* USER CODE END CayenneLppAddAccelerometer_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddBarometricPressure(uint8_t channel, uint16_t hpa)
+{
+  /* USER CODE BEGIN CayenneLppAddBarometricPressure_1 */
+
+  /* USER CODE END CayenneLppAddBarometricPressure_1 */
+  if ((CayenneLppCursor + LPP_BAROMETRIC_PRESSURE_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  hpa *= 10;
+
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_BAROMETRIC_PRESSURE;
+  CayenneLppBuffer[CayenneLppCursor++] = hpa >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = hpa;
+  /* USER CODE BEGIN CayenneLppAddBarometricPressure_2 */
+
+  /* USER CODE END CayenneLppAddBarometricPressure_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddGyrometer(uint8_t channel, int16_t x, int16_t y, int16_t z)
+{
+  /* USER CODE BEGIN CayenneLppAddGyrometer_1 */
+
+  /* USER CODE END CayenneLppAddGyrometer_1 */
+  if ((CayenneLppCursor + LPP_GYROMETER_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  int16_t vx = x * 100;
+  int16_t vy = y * 100;
+  int16_t vz = z * 100;
+
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_GYROMETER;
+  CayenneLppBuffer[CayenneLppCursor++] = vx >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vx;
+  CayenneLppBuffer[CayenneLppCursor++] = vy >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vy;
+  CayenneLppBuffer[CayenneLppCursor++] = vz >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vz;
+  /* USER CODE BEGIN CayenneLppAddGyrometer_2 */
+
+  /* USER CODE END CayenneLppAddGyrometer_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddGps(uint8_t channel, int32_t latitude, int32_t longitude, int32_t meters)
+{
+  /* USER CODE BEGIN CayenneLppAddGps_1 */
+
+  /* USER CODE END CayenneLppAddGps_1 */
+  if ((CayenneLppCursor + LPP_GPS_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  int32_t lat = latitude * 10000;
+  int32_t lon = longitude * 10000;
+  int32_t alt = meters * 100;
+
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_GPS;
+
+  CayenneLppBuffer[CayenneLppCursor++] = lat >> 16;
+  CayenneLppBuffer[CayenneLppCursor++] = lat >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = lat;
+  CayenneLppBuffer[CayenneLppCursor++] = lon >> 16;
+  CayenneLppBuffer[CayenneLppCursor++] = lon >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = lon;
+  CayenneLppBuffer[CayenneLppCursor++] = alt >> 16;
+  CayenneLppBuffer[CayenneLppCursor++] = alt >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = alt;
+  /* USER CODE BEGIN CayenneLppAddGps_2 */
+
+  /* USER CODE END CayenneLppAddGps_2 */
+  return CayenneLppCursor;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h
new file mode 100644
index 00000000..67ca6ac6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h
@@ -0,0 +1,98 @@
+/*!
+  * @file      CayenneLpp.h
+  *
+  * @brief     Implements the Cayenne Low Power Protocol
+  *
+  * @copyright Revised BSD License, see section \ref LICENSE.
+  *
+  * @code
+  *                ______                              _
+  *               / _____)             _              | |
+  *              ( (____  _____ ____ _| |_ _____  ____| |__
+  *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+  *               _____) ) ____| | | || |_| ____( (___| | | |
+  *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+  *              (C)2013-2018 Semtech
+  *
+  * @endcode
+  *
+  * @author    Miguel Luis ( Semtech )
+  */
+#ifndef __CAYENNE_LPP_H__
+#define __CAYENNE_LPP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void CayenneLppInit(void);
+
+void CayenneLppReset(void);
+
+uint8_t CayenneLppGetSize(void);
+
+uint8_t *CayenneLppGetBuffer(void);
+
+uint8_t CayenneLppCopy(uint8_t *buffer);
+
+uint8_t CayenneLppAddDigitalInput(uint8_t channel, uint8_t value);
+
+uint8_t CayenneLppAddDigitalOutput(uint8_t channel, uint8_t value);
+
+uint8_t CayenneLppAddAnalogInput(uint8_t channel, uint16_t value);
+
+uint8_t CayenneLppAddAnalogOutput(uint8_t channel, uint16_t value);
+
+uint8_t CayenneLppAddLuminosity(uint8_t channel, uint16_t lux);
+
+uint8_t CayenneLppAddPresence(uint8_t channel, uint8_t value);
+
+uint8_t CayenneLppAddTemperature(uint8_t channel, int16_t celsius);
+
+uint8_t CayenneLppAddRelativeHumidity(uint8_t channel, uint16_t rh);
+
+uint8_t CayenneLppAddAccelerometer(uint8_t channel, int16_t x, int16_t y, int16_t z);
+
+uint8_t CayenneLppAddBarometricPressure(uint8_t channel, uint16_t hpa);
+
+uint8_t CayenneLppAddGyrometer(uint8_t channel, int16_t x, int16_t y, int16_t z);
+
+uint8_t CayenneLppAddGps(uint8_t channel, int32_t latitude, int32_t longitude, int32_t meters);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CAYENNE_LPP_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
new file mode 100644
index 00000000..f7038db8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
@@ -0,0 +1,100 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_lorawan.h"
+#include "lora_app.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void MX_LoRaWAN_Init(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Init_1 */
+
+  /* USER CODE END MX_LoRaWAN_Init_1 */
+  SystemApp_Init();
+  /* USER CODE BEGIN MX_LoRaWAN_Init_2 */
+
+  /* USER CODE END MX_LoRaWAN_Init_2 */
+  LoRaWAN_Init();
+  /* USER CODE BEGIN MX_LoRaWAN_Init_3 */
+
+  /* USER CODE END MX_LoRaWAN_Init_3 */
+}
+
+void MX_LoRaWAN_Process(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Process_1 */
+
+  /* USER CODE END MX_LoRaWAN_Process_1 */
+  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
+  /* USER CODE BEGIN MX_LoRaWAN_Process_2 */
+
+  /* USER CODE END MX_LoRaWAN_Process_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
new file mode 100644
index 00000000..fbe16b6d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
@@ -0,0 +1,76 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_LORAWAN_H__
+#define __APP_LORAWAN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported Functions Prototypes------------------------------------------------------- */
+/**
+  * @brief  Init Lora Application
+  */
+void MX_LoRaWAN_Init(void);
+
+/**
+  * @brief  Entry Lora Process or scheduling
+  */
+void MX_LoRaWAN_Process(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_LORAWAN_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
new file mode 100644
index 00000000..89752941
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
@@ -0,0 +1,623 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "Region.h" /* Needed for LORAWAN_DEFAULT_DATA_RATE */
+#include "sys_app.h"
+#include "lora_app.h"
+#include "stm32_seq.h"
+#include "stm32_timer.h"
+#include "utilities_def.h"
+#include "lora_app_version.h"
+#include "LmHandler.h"
+#include "stm32_lpm.h"
+#include "adc_if.h"
+#include "sys_conf.h"
+#include "CayenneLpp.h"
+#include "sys_sensors.h"
+#include "mbmuxif_sys.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+extern __IO uint32_t lets_go_on;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_ENABLED */
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief LoRa State Machine states
+  */
+typedef enum TxEventType_e
+{
+  /**
+    * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
+    */
+  TX_ON_TIMER,
+  /**
+    * @brief Appdata Transmission external event plugged on OnSendEvent( )
+    */
+  TX_ON_EVENT
+  /* USER CODE BEGIN TxEventType_t */
+
+  /* USER CODE END TxEventType_t */
+} TxEventType_t;
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  LoRa End Node send request
+  */
+static void SendTxData(void);
+
+/**
+  * @brief  TX timer callback function
+  * @param  context ptr of timer context
+  */
+static void OnTxTimerEvent(void *context);
+
+/**
+  * @brief  join event callback function
+  * @param  joinParams status of join
+  */
+static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
+
+/**
+  * @brief  tx event callback function
+  * @param  params status of last Tx
+  */
+static void OnTxData(LmHandlerTxParams_t *params);
+
+/**
+  * @brief callback when LoRa application has received a frame
+  * @param appData data received in the last Rx
+  * @param params status of last Rx
+  */
+static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
+
+/**
+  * @brief callback when LoRa application Class is changed
+  * @param deviceClass new class
+  */
+static void OnClassChange(DeviceClass_t deviceClass );
+
+/*!
+ * Will be called each time a Radio IRQ is handled by the MAC layer
+ *
+ * \remark OnMacProcessNotify not needed on dual Core as OnMacProcessNotify is processed on M0+
+ */
+static void OnMacProcessNotify(void);
+
+/* USER CODE BEGIN PFP */
+
+/**
+  * @brief  LED Tx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnTxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Rx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnRxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Join timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnJoinTimerLedEvent(void *context);
+
+/* USER CODE END PFP */
+
+/* Private variables ---------------------------------------------------------*/
+static ActivationType_t ActivationType = LORAWAN_DEFAULT_ACTIVATION_TYPE;
+
+/**
+  * @brief LoRaWAN handler Callbacks
+  */
+static LmHandlerCallbacks_t LmHandlerCallbacks =
+{
+  .GetBatteryLevel =           GetBatteryLevel,
+  .GetTemperature =            GetTemperatureLevel,
+  .OnMacProcess =              OnMacProcessNotify,
+  .OnJoinRequest =             OnJoinRequest,
+  .OnTxData =                  OnTxData,
+  .OnRxData =                  OnRxData,
+  .OnClassChange =             OnClassChange
+};
+
+/**
+  * @brief LoRaWAN handler parameters
+  */
+static LmHandlerParams_t LmHandlerParams =
+{
+  .ActiveRegion =             ACTIVE_REGION,
+  .DefaultClass =             LORAWAN_DEFAULT_CLASS,
+  .AdrEnable =                LORAWAN_ADR_STATE,
+  .TxDatarate =               LORAWAN_DEFAULT_DATA_RATE,
+  .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
+};
+
+/**
+  * @brief Type of Event to generate application Tx
+  */
+static TxEventType_t EventType = TX_ON_TIMER;
+
+/**
+  * @brief Timer to handle the application Tx
+  */
+static UTIL_TIMER_Object_t TxTimer;
+
+/* USER CODE BEGIN PV */
+/**
+  * @brief User application buffer
+  */
+static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+
+/**
+  * @brief User application data structure
+  */
+static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+
+/**
+  * @brief Specifies the state of the application LED
+  */
+static uint8_t AppLedStateOn = RESET;
+
+/**
+  * @brief Timer to handle the application Tx Led to toggle
+  */
+static UTIL_TIMER_Object_t TxLedTimer;
+
+/**
+  * @brief Timer to handle the application Rx Led to toggle
+  */
+static UTIL_TIMER_Object_t RxLedTimer;
+
+/**
+  * @brief Timer to handle the application Join Led to toggle
+  */
+static UTIL_TIMER_Object_t JoinLedTimer;
+
+/* USER CODE END PV */
+
+/* Exported functions ---------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void LoRaWAN_Init(void)
+{
+  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
+  uint32_t lora_cm0plus_app;
+
+  /* USER CODE BEGIN LoRaWAN_Init_1 */
+
+  BSP_LED_Init(LED_BLUE);
+  BSP_LED_Init(LED_GREEN);
+  BSP_LED_Init(LED_RED);
+  BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
+
+  /* Get CM4 LoRa APP version*/
+  APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get CM0 LoRa APP version*/
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "M0PLUS_APP_VERSION: V%X.%X.%X\r\n",
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW LoraWAN info */
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_LORAWAN_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "MW_LORAWAN_VERSION: V%X.%X.%X\r\n",
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW SubGhz_Phy info */
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "MW_RADIO_VERSION:   V%X.%X.%X\r\n",
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+  UTIL_TIMER_Create(&TxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerLedEvent, NULL);
+  UTIL_TIMER_Create(&RxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnRxTimerLedEvent, NULL);
+  UTIL_TIMER_Create(&JoinLedTimer, 0xFFFFFFFFU, UTIL_TIMER_PERIODIC, OnJoinTimerLedEvent, NULL);
+  UTIL_TIMER_SetPeriod(&TxLedTimer, 500);
+  UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
+  UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
+
+  /* USER CODE END LoRaWAN_Init_1 */
+
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), UTIL_SEQ_RFU, SendTxData);
+  /* Init the Lora Stack*/
+  LmHandlerInit(&LmHandlerCallbacks);
+
+  LmHandlerConfigure(&LmHandlerParams);
+
+  /* USER CODE BEGIN LoRaWAN_Init_2 */
+  UTIL_TIMER_Start(&JoinLedTimer);
+
+  /* USER CODE END LoRaWAN_Init_2 */
+
+  LmHandlerJoin(ActivationType);
+
+  if (EventType == TX_ON_TIMER)
+  {
+    /* send every time timer elapses */
+    UTIL_TIMER_Create(&TxTimer,  0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerEvent, NULL);
+    UTIL_TIMER_SetPeriod(&TxTimer,  APP_TX_DUTYCYCLE);
+    UTIL_TIMER_Start(&TxTimer);
+  }
+  else
+  {
+    /* USER CODE BEGIN LoRaWAN_Init_3 */
+
+    /* send every time button is pushed */
+    BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
+    /* USER CODE END LoRaWAN_Init_3 */
+  }
+
+  /* USER CODE BEGIN LoRaWAN_Init_Last */
+
+  /* USER CODE END LoRaWAN_Init_Last */
+}
+
+/* USER CODE BEGIN PB_Callbacks */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
+/* In order to get a push button IRS by code automatically generated */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  switch (GPIO_Pin)
+  {
+    case  BUTTON_SW1_PIN:
+      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+      break;
+    case  BUTTON_SW2_PIN:
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+      lets_go_on = 1;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_ENABLED */
+      break;
+    case  BUTTON_SW3_PIN:
+      break;
+    default:
+      break;
+  }
+}
+
+/* USER CODE END PB_Callbacks */
+
+/* Private functions ---------------------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
+{
+  /* USER CODE BEGIN OnRxData_1 */
+  if ((appData != NULL) || (params != NULL))
+  {
+    BSP_LED_On(LED_BLUE) ;
+
+    UTIL_TIMER_Start(&RxLedTimer);
+
+    static const char *slotStrings[] = { "1", "2", "C", "C Multicast", "B Ping-Slot", "B Multicast Ping-Slot" };
+
+    APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Indication ==========\r\n");
+    APP_LOG(TS_OFF, VLEVEL_H, "###### D/L FRAME:%04d | SLOT:%s | PORT:%d | DR:%d | RSSI:%d | SNR:%d\r\n",
+            params->DownlinkCounter, slotStrings[params->RxSlot], appData->Port, params->Datarate, params->Rssi, params->Snr);
+    switch (appData->Port)
+    {
+      case LORAWAN_SWITCH_CLASS_PORT:
+        /*this port switches the class*/
+        if (appData->BufferSize == 1)
+        {
+          switch (appData->Buffer[0])
+          {
+            case 0:
+            {
+              LmHandlerRequestClass(CLASS_A);
+              break;
+            }
+            case 1:
+            {
+              LmHandlerRequestClass(CLASS_B);
+              break;
+            }
+            case 2:
+            {
+              LmHandlerRequestClass(CLASS_C);
+              break;
+            }
+            default:
+              break;
+          }
+        }
+        break;
+      case LORAWAN_USER_APP_PORT:
+        if (appData->BufferSize == 1)
+        {
+          AppLedStateOn = appData->Buffer[0] & 0x01;
+          if (AppLedStateOn == RESET)
+          {
+            APP_LOG(TS_OFF, VLEVEL_H,   "LED OFF\r\n");
+            BSP_LED_Off(LED_RED) ;
+          }
+          else
+          {
+            APP_LOG(TS_OFF, VLEVEL_H, "LED ON\r\n");
+            BSP_LED_On(LED_RED) ;
+          }
+        }
+        break;
+
+      default:
+
+        break;
+    }
+  }
+  /* USER CODE END OnRxData_1 */
+}
+
+static void SendTxData(void)
+{
+  /* USER CODE BEGIN SendTxData_1 */
+  uint16_t pressure = 0;
+  int16_t temperature = 0;
+  sensor_t sensor_data;
+  UTIL_TIMER_Time_t nextTxIn = 0;
+
+#ifdef CAYENNE_LPP
+  uint8_t channel = 0;
+#else
+  uint16_t humidity = 0;
+  uint32_t i = 0;
+  int32_t latitude = 0;
+  int32_t longitude = 0;
+  uint16_t altitudeGps = 0;
+#endif /* CAYENNE_LPP */
+
+  EnvSensors_Read(&sensor_data);
+  temperature = (SYS_GetTemperatureLevel() >> 8);
+  pressure    = (uint16_t)(sensor_data.pressure * 100 / 10);      /* in hPa / 10 */
+
+  AppData.Port = LORAWAN_USER_APP_PORT;
+
+#ifdef CAYENNE_LPP
+  CayenneLppReset();
+  CayenneLppAddBarometricPressure(channel++, pressure);
+  CayenneLppAddTemperature(channel++, temperature);
+  CayenneLppAddRelativeHumidity(channel++, (uint16_t)(sensor_data.humidity));
+
+  if ((LmHandlerParams.ActiveRegion != LORAMAC_REGION_US915) && (LmHandlerParams.ActiveRegion != LORAMAC_REGION_AU915)
+      && (LmHandlerParams.ActiveRegion != LORAMAC_REGION_AS923))
+  {
+    CayenneLppAddDigitalInput(channel++, GetBatteryLevel());
+    CayenneLppAddDigitalOutput(channel++, AppLedStateOn);
+  }
+
+  CayenneLppCopy(AppData.Buffer);
+  AppData.BufferSize = CayenneLppGetSize();
+#else  /* not CAYENNE_LPP */
+  humidity    = (uint16_t)(sensor_data.humidity * 10);            /* in %*10     */
+
+  AppData.Buffer[i++] = AppLedStateOn;
+  AppData.Buffer[i++] = (uint8_t)((pressure >> 8) & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(pressure & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(temperature & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)((humidity >> 8) & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(humidity & 0xFF);
+
+  if ((LmHandlerParams.ActiveRegion == LORAMAC_REGION_US915) || (LmHandlerParams.ActiveRegion == LORAMAC_REGION_AU915)
+      || (LmHandlerParams.ActiveRegion == LORAMAC_REGION_AS923))
+  {
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+  }
+  else
+  {
+    latitude = sensor_data.latitude;
+    longitude = sensor_data.longitude;
+
+    AppData.Buffer[i++] = GetBatteryLevel();        /* 1 (very low) to 254 (fully charged) */
+    AppData.Buffer[i++] = (uint8_t)((latitude >> 16) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((latitude >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(latitude & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((longitude >> 16) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((longitude >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(longitude & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((altitudeGps >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(altitudeGps & 0xFF);
+  }
+
+  AppData.BufferSize = i;
+#endif /* CAYENNE_LPP */
+
+  if (LORAMAC_HANDLER_SUCCESS == LmHandlerSend(&AppData, LORAWAN_DEFAULT_CONFIRMED_MSG_STATE, &nextTxIn, false))
+  {
+    APP_LOG(TS_ON, VLEVEL_L, "SEND REQUEST\r\n");
+  }
+  else if (nextTxIn > 0)
+  {
+    APP_LOG(TS_ON, VLEVEL_L, "Next Tx in  : ~%d second(s)\r\n", (nextTxIn / 1000));
+  }
+
+  /* USER CODE END SendTxData_1 */
+}
+
+static void OnClassChange(DeviceClass_t deviceClass )
+{
+  /*
+   * This implementation should be modified to adapt to the network configuration.
+   * This custom code allows to temporarily remove the Tx transactions from the device
+   * during the class C session, in order to avoid any conflict during
+   * the reception of frames in Multicast Class C.
+   */
+  if (deviceClass == CLASS_C)
+  {
+    UTIL_TIMER_Stop(&TxTimer);
+  }
+  else
+  {
+    UTIL_TIMER_Start(&TxTimer);
+  }
+}
+
+static void OnTxTimerEvent(void *context)
+{
+  /* USER CODE BEGIN OnTxTimerEvent_1 */
+
+  /* USER CODE END OnTxTimerEvent_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+
+  /*Wait for next tx slot*/
+  UTIL_TIMER_Start(&TxTimer);
+  /* USER CODE BEGIN OnTxTimerEvent_2 */
+
+  /* USER CODE END OnTxTimerEvent_2 */
+}
+
+/* USER CODE BEGIN PrFD_LedEvents */
+static void OnTxTimerLedEvent(void *context)
+{
+  BSP_LED_Off(LED_GREEN) ;
+}
+
+static void OnRxTimerLedEvent(void *context)
+{
+  BSP_LED_Off(LED_BLUE) ;
+}
+
+static void OnJoinTimerLedEvent(void *context)
+{
+  BSP_LED_Toggle(LED_RED) ;
+}
+
+/* USER CODE END PrFD_LedEvents */
+
+static void OnTxData(LmHandlerTxParams_t *params)
+{
+  /* USER CODE BEGIN OnTxData_1 */
+  if ((params != NULL))
+  {
+    /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
+    if (params->IsMcpsConfirm != 0)
+    {
+      BSP_LED_On(LED_GREEN) ;
+      UTIL_TIMER_Start(&TxLedTimer);
+
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
+      APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
+              params->AppData.Port, params->Datarate, params->TxPower);
+
+      APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
+      if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
+      }
+    }
+  }
+  /* USER CODE END OnTxData_1 */
+}
+
+static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
+{
+  /* USER CODE BEGIN OnJoinRequest_1 */
+  if (joinParams != NULL)
+  {
+    if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
+    {
+      UTIL_TIMER_Stop(&JoinLedTimer);
+      BSP_LED_Off(LED_RED) ;
+
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOINED = ");
+      if (joinParams->Mode == ACTIVATION_TYPE_ABP)
+      {
+        APP_LOG(TS_OFF, VLEVEL_M, "ABP ======================\r\n");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_M, "OTAA =====================\r\n");
+      }
+
+      /* Force a clock synchronization to be able to start a Multicast Session */
+      LmHandlerDeviceTimeReq();
+    }
+    else
+    {
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOIN FAILED\r\n");
+    }
+  }
+  /* USER CODE END OnJoinRequest_1 */
+}
+
+static void OnMacProcessNotify(void)
+{
+  /* USER CODE BEGIN OnMacProcessNotify_1 */
+
+  /* USER CODE END OnMacProcessNotify_1 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
new file mode 100644
index 00000000..b7ac7358
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
@@ -0,0 +1,132 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORA_APP_H__
+#define __LORA_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* LoraWAN application configuration (Mw is configured by lorawan_conf.h) */
+#define ACTIVE_REGION                               LORAMAC_REGION_EU868
+
+/*!
+ * CAYENNE_LPP is myDevices Application server.
+ */
+/*#define CAYENNE_LPP*/
+
+/*!
+ * Defines the application data transmission duty cycle. 10s, value in [ms].
+ */
+#define APP_TX_DUTYCYCLE                            10000
+
+/*!
+ * LoRaWAN User application port
+ * @note do not use 224. It is reserved for certification
+ */
+#define LORAWAN_USER_APP_PORT                       2
+
+/*!
+ * LoRaWAN Switch class application port
+ * @note do not use 224. It is reserved for certification
+ */
+#define LORAWAN_SWITCH_CLASS_PORT                   3
+
+/*!
+ * LoRaWAN default endNode class port
+ */
+#define LORAWAN_DEFAULT_CLASS                       CLASS_A
+
+/*!
+ * LoRaWAN default confirm state
+ */
+#define LORAWAN_DEFAULT_CONFIRMED_MSG_STATE         LORAMAC_HANDLER_UNCONFIRMED_MSG
+
+/*!
+ * LoRaWAN Adaptive Data Rate
+ * @note Please note that when ADR is enabled the end-device should be static
+ */
+#define LORAWAN_ADR_STATE                           LORAMAC_HANDLER_ADR_ON
+
+/*!
+ * LoRaWAN Default data Rate Data Rate
+ * @note Please note that LORAWAN_DEFAULT_DATA_RATE is used only when LORAWAN_ADR_STATE is disabled
+ */
+#define LORAWAN_DEFAULT_DATA_RATE                   DR_0
+
+/*!
+ * LoRaWAN default activation type
+ */
+#define LORAWAN_DEFAULT_ACTIVATION_TYPE             ACTIVATION_TYPE_OTAA
+
+/*!
+ * User application data buffer size
+ */
+#define LORAWAN_APP_DATA_BUFFER_MAX_SIZE            242
+
+/*!
+ * Default Unicast ping slots periodicity
+ *
+ * \remark periodicity is equal to 2^LORAWAN_DEFAULT_PING_SLOT_PERIODICITY seconds
+ *         example: 2^3 = 8 seconds. The end-device will open an Rx slot every 8 seconds.
+ */
+#define LORAWAN_DEFAULT_PING_SLOT_PERIODICITY       4
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init Lora Application
+  */
+void LoRaWAN_Init(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LORA_APP_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
new file mode 100644
index 00000000..a25c35b9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
@@ -0,0 +1,95 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app_version.h
+  * @author  MCD Application Team
+  * @brief   Definition the version of the CM4 application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_VERSION_H__
+#define __APP_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
+#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
+
+#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
+#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
+#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
+#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Application version
+  */
+#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
+                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
+                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
+                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
+
+/**
+  * @brief LoRaWAN CM4 application version
+  */
+#define __CM4_APP_VERSION             __APP_VERSION
+
+/**
+  * @brief LoRaWAN CM0PLUS minimum required version
+  */
+#define __LAST_COMPATIBLE_CM0_RELEASE __APP_VERSION
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_VERSION_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
new file mode 100644
index 00000000..b97a4240
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
@@ -0,0 +1,65 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lorawan_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for LoRaWAN middleware instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORAWAN_CONF_H__
+#define __LORAWAN_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LORAWAN_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
new file mode 100644
index 00000000..1991b928
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
@@ -0,0 +1,67 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    systime.h
+  * @author  MCD Application Team
+  * @brief   Map middleware systime
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTIME_H__
+#define __SYSTIME_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_systime.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SYSTIME_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
new file mode 100644
index 00000000..e80cd6a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer.h
+  * @author  MCD Application Team
+  * @brief   Wrapper to timer server
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_H__
+#define __TIMER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Max timer mask
+  */
+#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/**
+  * @brief Timer value on 32 bits
+  */
+#define TimerTime_t UTIL_TIMER_Time_t
+
+/**
+  * @brief Timer object description
+  */
+#define TimerEvent_t UTIL_TIMER_Object_t
+
+/**
+  * @brief Create the timer object
+  */
+#define TimerInit(HANDLE, CB) do {\
+                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
+                                 } while(0)
+
+/**
+  * @brief update the period and start the timer
+  */
+#define TimerSetValue(HANDLE, TIMEOUT) do{ \
+                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
+                                         } while(0)
+
+/**
+  * @brief Start and adds the timer object to the list of timer events
+  */
+#define TimerStart(HANDLE)   do {\
+                                  UTIL_TIMER_Start(HANDLE);\
+                                } while(0)
+
+/**
+  * @brief Stop and removes the timer object from the list of timer events
+  */
+#define TimerStop(HANDLE)   do {\
+                                 UTIL_TIMER_Stop(HANDLE);\
+                               } while(0)
+
+/**
+  * @brief return the current time
+  */
+#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
+
+/**
+  * @brief return the elapsed time
+  */
+#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
new file mode 100644
index 00000000..ad72cc3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
@@ -0,0 +1,990 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    LmHandler_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the LoraMac interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "LmHandler_mbwrapper.h"
+#include "lora_info.h"
+#include "LmHandler.h"
+#include "mbmuxif_sys.h"
+#include "mbmux.h"
+#include "msg_id.h"
+#include "mbmuxif_lora.h"
+#include "stm32_mem.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#ifndef MAX
+#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
+#endif /* MAX */
+#define LMH_CONFIG_SIZE     (sizeof(LmHandlerParams_t))
+#define LMH_SEND_SIZE       (256 + sizeof(UTIL_TIMER_Time_t))
+#define LMH_GET_CLASS_SIZE  (sizeof(DeviceClass_t))
+#define LMH_EUI_SIZE        (SE_EUI_SIZE)
+#define LMH_KEY_SIZE        (SE_KEY_SIZE)
+#define LMH_REGION_SIZE     (sizeof(LoRaMacRegion_t))
+#define LMH_RX_PARAM_SIZE   (sizeof(RxChannelParams_t))
+#define LMH_BEACON_SIZE     (sizeof(BeaconState_t))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(MAX(MAX(LMH_CONFIG_SIZE, LMH_SEND_SIZE), MAX(LMH_GET_CLASS_SIZE, LMH_EUI_SIZE)), MAX(MAX(LMH_KEY_SIZE, LMH_REGION_SIZE), MAX(LMH_RX_PARAM_SIZE, LMH_BEACON_SIZE)))
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM4 to CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
+static LmHandlerCallbacks_t callback_mbwrapper;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+/**
+  * @addtogroup LoRaWan  LoRaWan Interface
+  *
+  * @{
+  *
+  */
+LmHandlerErrorStatus_t LmHandlerInit(LmHandlerCallbacks_t *handlerCallbacks)
+{
+  /* USER CODE BEGIN LmHandlerInit_1 */
+
+  /* USER CODE END LmHandlerInit_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (handlerCallbacks == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  callback_mbwrapper.GetBatteryLevel = handlerCallbacks->GetBatteryLevel;
+  callback_mbwrapper.GetTemperature = handlerCallbacks->GetTemperature;
+  callback_mbwrapper.OnNvmDataChange = handlerCallbacks->OnNvmDataChange;
+  callback_mbwrapper.OnNetworkParametersChange = handlerCallbacks->OnNetworkParametersChange;
+  callback_mbwrapper.OnJoinRequest = handlerCallbacks->OnJoinRequest;
+  callback_mbwrapper.OnTxData = handlerCallbacks->OnTxData;
+  callback_mbwrapper.OnRxData = handlerCallbacks->OnRxData;
+  callback_mbwrapper.OnClassChange = handlerCallbacks->OnClassChange;
+  callback_mbwrapper.OnBeaconStatusChange = handlerCallbacks->OnBeaconStatusChange;
+  callback_mbwrapper.OnSysTimeUpdate = handlerCallbacks->OnSysTimeUpdate;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_INITIALIZATION_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerInit_2 */
+
+  /* USER CODE END LmHandlerInit_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerConfigure(LmHandlerParams_t *handlerParams)
+{
+  /* USER CODE BEGIN LmHandlerConfigure_1 */
+
+  /* USER CODE END LmHandlerConfigure_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (handlerParams == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, handlerParams, sizeof(LmHandlerParams_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_CONFIGURE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerConfigure_2 */
+
+  /* USER CODE END LmHandlerConfigure_2 */
+}
+
+LmHandlerFlagStatus_t LmHandlerJoinStatus(void)
+{
+  /* USER CODE BEGIN LmHandlerJoinStatus_1 */
+
+  /* USER CODE END LmHandlerJoinStatus_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_JOIN_STATUS_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerFlagStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerJoinStatus_2 */
+
+  /* USER CODE END LmHandlerJoinStatus_2 */
+}
+
+void LmHandlerJoin(ActivationType_t mode)
+{
+  /* USER CODE BEGIN LmHandlerJoin_1 */
+
+  /* USER CODE END LmHandlerJoin_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_JOIN_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) mode;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN LmHandlerJoin_2 */
+
+  /* USER CODE END LmHandlerJoin_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerStop(void)
+{
+  /* USER CODE BEGIN LmHandlerStop_1 */
+
+  /* USER CODE END LmHandlerStop_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_STOP_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerStop_2 */
+
+  /* USER CODE END LmHandlerStop_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed,
+                                     UTIL_TIMER_Time_t *nextTxIn, bool allowDelayedTx)
+{
+  /* USER CODE BEGIN LmHandlerSend_1 */
+
+  /* USER CODE END LmHandlerSend_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+  uint8_t next_addr = 0;
+
+  if ((appData == NULL) || (appData->Buffer == NULL))
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  if (appData->BufferSize > 0)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
+    /* need to 8-align the next address */
+    next_addr = (appData->BufferSize + 7) & ~7;
+  }
+
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SEND_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) appData->Port;
+  com_buffer[i++] = (uint32_t) appData->BufferSize;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_buffer[i++] = (uint32_t) isTxConfirmed;
+  if (nextTxIn == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
+  }
+  com_buffer[i++] = (uint32_t) allowDelayedTx;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
+  }
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSend_2 */
+
+  /* USER CODE END LmHandlerSend_2 */
+}
+
+void LmHandlerProcess(void)
+{
+  /* USER CODE BEGIN LmHandlerProcess_1 */
+
+  /* USER CODE END LmHandlerProcess_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_PROCESS_ID;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN LmHandlerProcess_2 */
+
+  /* USER CODE END LmHandlerProcess_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerRequestClass(DeviceClass_t newClass)
+{
+  /* USER CODE BEGIN LmHandlerRequestClass_1 */
+
+  /* USER CODE END LmHandlerRequestClass_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerRequestClass_2 */
+
+  /* USER CODE END LmHandlerRequestClass_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
+{
+  /* USER CODE BEGIN LmHandlerGetCurrentClass_1 */
+
+  /* USER CODE END LmHandlerGetCurrentClass_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetCurrentClass_2 */
+
+  /* USER CODE END LmHandlerGetCurrentClass_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetDevEUI(uint8_t *devEUI)
+{
+  /* USER CODE BEGIN LmHandlerGetDevEUI_1 */
+
+  /* USER CODE END LmHandlerGetDevEUI_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetDevEUI_2 */
+
+  /* USER CODE END LmHandlerGetDevEUI_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetDevEUI(uint8_t *devEUI)
+{
+  /* USER CODE BEGIN LmHandlerSetDevEUI_1 */
+
+  /* USER CODE END LmHandlerSetDevEUI_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetDevEUI_2 */
+
+  /* USER CODE END LmHandlerSetDevEUI_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppEUI(uint8_t *appEUI)
+{
+  /* USER CODE BEGIN LmHandlerGetAppEUI_1 */
+
+  /* USER CODE END LmHandlerGetAppEUI_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetAppEUI_2 */
+
+  /* USER CODE END LmHandlerGetAppEUI_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppEUI(uint8_t *appEUI)
+{
+  /* USER CODE BEGIN LmHandlerSetAppEUI_1 */
+
+  /* USER CODE END LmHandlerSetAppEUI_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetAppEUI_2 */
+
+  /* USER CODE END LmHandlerSetAppEUI_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkKey_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetNwkKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkKey_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetNwkKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppKey_1 */
+
+  /* USER CODE END LmHandlerGetAppKey_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetAppKey_2 */
+
+  /* USER CODE END LmHandlerGetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppKey_1 */
+
+  /* USER CODE END LmHandlerSetAppKey_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetAppKey_2 */
+
+  /* USER CODE END LmHandlerSetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppSKey_1 */
+
+  /* USER CODE END LmHandlerGetAppSKey_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetAppSKey_2 */
+
+  /* USER CODE END LmHandlerGetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppSKey_1 */
+
+  /* USER CODE END LmHandlerSetAppSKey_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetAppSKey_2 */
+
+  /* USER CODE END LmHandlerSetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNetworkID(uint32_t *networkId)
+{
+  /* USER CODE BEGIN LmHandlerGetNetworkID_1 */
+
+  /* USER CODE END LmHandlerGetNetworkID_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetNetworkID_2 */
+
+  /* USER CODE END LmHandlerGetNetworkID_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNetworkID(uint32_t networkId)
+{
+  /* USER CODE BEGIN LmHandlerSetNetworkID_1 */
+
+  /* USER CODE END LmHandlerSetNetworkID_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetNetworkID_2 */
+
+  /* USER CODE END LmHandlerSetNetworkID_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetDevAddr(uint32_t *devAddr)
+{
+  /* USER CODE BEGIN LmHandlerGetDevAddr_1 */
+
+  /* USER CODE END LmHandlerGetDevAddr_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetDevAddr_2 */
+
+  /* USER CODE END LmHandlerGetDevAddr_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetDevAddr(uint32_t devAddr)
+{
+  /* USER CODE BEGIN LmHandlerSetDevAddr_1 */
+
+  /* USER CODE END LmHandlerSetDevAddr_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetDevAddr_2 */
+
+  /* USER CODE END LmHandlerSetDevAddr_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
+{
+  /* USER CODE BEGIN LmHandlerGetActiveRegion_1 */
+
+  /* USER CODE END LmHandlerGetActiveRegion_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetActiveRegion_2 */
+
+  /* USER CODE END LmHandlerGetActiveRegion_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
+{
+  /* USER CODE BEGIN LmHandlerSetActiveRegion_1 */
+
+  /* USER CODE END LmHandlerSetActiveRegion_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetActiveRegion_2 */
+
+  /* USER CODE END LmHandlerSetActiveRegion_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAdrEnable(bool *adrEnable)
+{
+  /* USER CODE BEGIN LmHandlerGetAdrEnable_1 */
+
+  /* USER CODE END LmHandlerGetAdrEnable_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetAdrEnable_2 */
+
+  /* USER CODE END LmHandlerGetAdrEnable_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAdrEnable(bool adrEnable)
+{
+  /* USER CODE BEGIN LmHandlerSetAdrEnable_1 */
+
+  /* USER CODE END LmHandlerSetAdrEnable_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetAdrEnable_2 */
+
+  /* USER CODE END LmHandlerSetAdrEnable_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetTxDatarate(int8_t *txDatarate)
+{
+  /* USER CODE BEGIN LmHandlerGetTxDatarate_1 */
+
+  /* USER CODE END LmHandlerGetTxDatarate_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetTxDatarate_2 */
+
+  /* USER CODE END LmHandlerGetTxDatarate_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetTxDatarate(int8_t txDatarate)
+{
+  /* USER CODE BEGIN LmHandlerSetTxDatarate_1 */
+
+  /* USER CODE END LmHandlerSetTxDatarate_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetTxDatarate_2 */
+
+  /* USER CODE END LmHandlerSetTxDatarate_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
+{
+  /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_1 */
+
+  /* USER CODE END LmHandlerGetDutyCycleEnable_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_2 */
+
+  /* USER CODE END LmHandlerGetDutyCycleEnable_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
+{
+  /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_1 */
+
+  /* USER CODE END LmHandlerSetDutyCycleEnable_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_2 */
+
+  /* USER CODE END LmHandlerSetDutyCycleEnable_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
+{
+  /* USER CODE BEGIN LmHandlerGetRX2Params_1 */
+
+  /* USER CODE END LmHandlerGetRX2Params_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetRX2Params_2 */
+
+  /* USER CODE END LmHandlerGetRX2Params_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetTxPower(int8_t *txPower)
+{
+  /* USER CODE BEGIN LmHandlerGetTxPower_1 */
+
+  /* USER CODE END LmHandlerGetTxPower_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetTxPower_2 */
+
+  /* USER CODE END LmHandlerGetTxPower_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerGetRx1Delay_1 */
+
+  /* USER CODE END LmHandlerGetRx1Delay_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetRx1Delay_2 */
+
+  /* USER CODE END LmHandlerGetRx1Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerGetRx2Delay_1 */
+
+  /* USER CODE END LmHandlerGetRx2Delay_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetRx2Delay_2 */
+
+  /* USER CODE END LmHandlerGetRx2Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_1 */
+
+  /* USER CODE END LmHandlerGetJoinRx1Delay_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_2 */
+
+  /* USER CODE END LmHandlerGetJoinRx1Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_1 */
+
+  /* USER CODE END LmHandlerGetJoinRx2Delay_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_2 */
+
+  /* USER CODE END LmHandlerGetJoinRx2Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
+{
+  /* USER CODE BEGIN LmHandlerSetRX2Params_1 */
+
+  /* USER CODE END LmHandlerSetRX2Params_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetRX2Params_2 */
+
+  /* USER CODE END LmHandlerSetRX2Params_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetTxPower(int8_t txPower)
+{
+  /* USER CODE BEGIN LmHandlerSetTxPower_1 */
+
+  /* USER CODE END LmHandlerSetTxPower_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetTxPower_2 */
+
+  /* USER CODE END LmHandlerSetTxPower_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetRx1Delay(uint32_t rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerSetRx1Delay_1 */
+
+  /* USER CODE END LmHandlerSetRx1Delay_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetRx1Delay_2 */
+
+  /* USER CODE END LmHandlerSetRx1Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetRx2Delay(uint32_t rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerSetRx2Delay_1 */
+
+  /* USER CODE END LmHandlerSetRx2Delay_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetRx2Delay_2 */
+
+  /* USER CODE END LmHandlerSetRx2Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_1 */
+
+  /* USER CODE END LmHandlerSetJoinRx1Delay_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_2 */
+
+  /* USER CODE END LmHandlerSetJoinRx1Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_1 */
+
+  /* USER CODE END LmHandlerSetJoinRx2Delay_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_2 */
+
+  /* USER CODE END LmHandlerSetJoinRx2Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
+{
+  /* USER CODE BEGIN LmHandlerGetPingPeriodicity_1 */
+
+  /* USER CODE END LmHandlerGetPingPeriodicity_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetPingPeriodicity_2 */
+
+  /* USER CODE END LmHandlerGetPingPeriodicity_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
+{
+  /* USER CODE BEGIN LmHandlerSetPingPeriodicity_1 */
+
+  /* USER CODE END LmHandlerSetPingPeriodicity_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerSetPingPeriodicity_2 */
+
+  /* USER CODE END LmHandlerSetPingPeriodicity_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
+{
+  /* USER CODE BEGIN LmHandlerGetBeaconState_1 */
+
+  /* USER CODE END LmHandlerGetBeaconState_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerGetBeaconState_2 */
+
+  /* USER CODE END LmHandlerGetBeaconState_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerLinkCheckReq(void)
+{
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_1 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_1 */
+  return (LmHandlerErrorStatus_t) 0UL;
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_2 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerDeviceTimeReq(void)
+{
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_1 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_DEVICE_TIME_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_2 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_2 */
+}
+
+void LoraInfo_Init(void)
+{
+  /* USER CODE BEGIN LoraInfo_Init_1 */
+
+  /* USER CODE END LoraInfo_Init_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_INFO_INIT_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN LoraInfo_Init_2 */
+
+  /* USER CODE END LoraInfo_Init_2 */
+}
+
+LoraInfo_t *LoraInfo_GetPtr(void)
+{
+  /* USER CODE BEGIN LoraInfo_GetPtr_1 */
+
+  /* USER CODE END LoraInfo_GetPtr_1 */
+  FEAT_INFO_Param_t *p_feature;
+
+  p_feature = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_LORAWAN_ID);
+  return (LoraInfo_t *) p_feature->Feat_Info_Config_Ptr;
+  /* USER CODE BEGIN LoraInfo_GetPtr_2 */
+
+  /* USER CODE END LoraInfo_GetPtr_2 */
+}
+
+void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Lora_Notif_1 */
+
+  /* USER CODE END Process_Lora_Notif_1 */
+  uint32_t *com_buffer = ComObj->ParamBuf;
+  uint32_t cb_ret = 0;
+
+  /* Lora Notif received */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4<(LoRa)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    /* callbacks */
+    case LMHANDLER_GET_BATTERY_LEVEL_CB_ID:
+      if (callback_mbwrapper.GetBatteryLevel != NULL)
+      {
+        cb_ret = (uint32_t) callback_mbwrapper.GetBatteryLevel();
+      }
+      else
+      {
+        Error_Handler();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  cb_ret; /* */
+      break;
+
+    case LMHANDLER_GET_TEMPERATURE_CB_ID:
+      if (callback_mbwrapper.GetTemperature != NULL)
+      {
+        cb_ret = (uint32_t) callback_mbwrapper.GetTemperature();
+      }
+      else
+      {
+        Error_Handler();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  cb_ret; /* */
+      break;
+
+    case LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNvmDataChange != NULL)
+      {
+        callback_mbwrapper.OnNvmDataChange((LmHandlerNvmContextStates_t) com_buffer[0], (uint16_t) com_buffer[1]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNetworkParametersChange != NULL)
+      {
+        callback_mbwrapper.OnNetworkParametersChange((CommissioningParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_JOIN_REQ_CB_ID:
+      if (callback_mbwrapper.OnJoinRequest != NULL)
+      {
+        callback_mbwrapper.OnJoinRequest((LmHandlerJoinParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_TX_DATA_CB_ID:
+      if (callback_mbwrapper.OnTxData != NULL)
+      {
+        callback_mbwrapper.OnTxData((LmHandlerTxParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_RX_DATA_CB_ID:
+      if (callback_mbwrapper.OnRxData != NULL)
+      {
+        callback_mbwrapper.OnRxData((LmHandlerAppData_t *) com_buffer[0], (LmHandlerRxParams_t *) com_buffer[1]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_CLASS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnClassChange != NULL)
+      {
+        callback_mbwrapper.OnClassChange((DeviceClass_t) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnBeaconStatusChange != NULL)
+      {
+        callback_mbwrapper.OnBeaconStatusChange((LmHandlerBeaconParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID:
+      if (callback_mbwrapper.OnSysTimeUpdate != NULL)
+      {
+        callback_mbwrapper.OnSysTimeUpdate();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+    default:
+      break;
+  }
+
+  /* Lora sending ack */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4>(LoRa)\r\n");
+  MBMUX_AcknowledgeSnd(FEAT_INFO_LORAWAN_ID);
+  /* USER CODE BEGIN Process_Lora_Notif_2 */
+
+  /* USER CODE END Process_Lora_Notif_2 */
+}
+
+/**
+  * @}
+  *
+  */
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
new file mode 100644
index 00000000..1218ce87
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    LmHandler_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the LmHandler
+  *          interface shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LMHANDLER_MBWRAPPER_CM4_H__
+#define __LMHANDLER_MBWRAPPER_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM0+
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Lora_Notif(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LMHANDLER_MBWRAPPER_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
new file mode 100644
index 00000000..8328a537
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
@@ -0,0 +1,476 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.c
+  * @author  MCD Application Team
+  * @brief   CM4 side multiplexer to map features to IPCC channels
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "assert.h"
+#include "stddef.h"
+#include "stm32_mem.h"
+#include "ipcc_if.h"
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MB_CHANNEL_NOT_REGISTERED 0xFF
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
+static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
+static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
+static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
+static void MBMUX_IsrNotRegistered(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
+{
+  /* USER CODE BEGIN MBMUX_Init_1 */
+
+  /* USER CODE END MBMUX_Init_1 */
+  uint8_t i;
+  IPCC_IF_Init(MBMUX_IsrResponseRcvCb, MBMUX_IsrNotificationRcvCb);
+
+  p_MBMUX_ComTable = pMBMUX_ComTable;
+
+  for (i = 0; i < FEAT_INFO_CNT; i++)
+  {
+    p_MBMUX_ComTable->MBMUXMapping[i][MBMUX_CMD_RESP] = MB_CHANNEL_NOT_REGISTERED;
+    p_MBMUX_ComTable->MBMUXMapping[i][MBMUX_NOTIF_ACK] = MB_CHANNEL_NOT_REGISTERED;
+  }
+
+  for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
+  {
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgId = 0;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm4Cb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].ParamCnt = 0;
+    p_MBMUX_ComTable->MBCmdRespParam[i].ParamBuf = NULL;
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgId = 0;
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm4Cb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBNotifAckParam[i].ParamCnt = 0;
+    p_MBMUX_ComTable->MBNotifAckParam[i].ParamBuf = NULL;
+  }
+  /* USER CODE BEGIN MBMUX_Init_Last */
+
+  /* USER CODE END MBMUX_Init_Last */
+}
+
+void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
+{
+  /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
+
+  /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_1 */
+  p_MBMUX_Cm0plusFeatureList = pCM0PLUS_FeatureList;
+  /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_Last */
+
+  /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
+}
+
+int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
+{
+  int8_t check_if_feature_provided_by_cm0plus = 0;
+  uint8_t channel_idx = MB_CHANNEL_NOT_REGISTERED;
+  int8_t ret = -1; /* no more ipcc channels available */
+  uint8_t check_existing_feature_registration;
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_1 */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_1 */
+
+  if (e_featID == FEAT_INFO_SYSTEM_ID)
+  {
+    check_if_feature_provided_by_cm0plus = 1;
+  }
+  else
+  {
+    check_if_feature_provided_by_cm0plus = MBMUX_CheckIfFeatureSupportedByCm0plus(e_featID);
+  }
+
+  if (check_if_feature_provided_by_cm0plus == 1)
+  {
+    check_existing_feature_registration = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+    if (check_existing_feature_registration == MB_CHANNEL_NOT_REGISTERED)
+    {
+      if (e_featID == FEAT_INFO_SYSTEM_ID)
+      {
+        channel_idx = 0;
+      }
+      else
+      {
+        channel_idx = MBMUX_FindChStillUnregistered(ComType);
+      }
+    }
+    else
+    {
+      /* previous registration will be replaced by the given buffers */
+      channel_idx = check_existing_feature_registration;
+    }
+  }
+  else
+  {
+    ret = -2; /* feature not provided by CM0PLUS */
+  }
+
+  if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
+  {
+    if (ComType == MBMUX_CMD_RESP)
+    {
+      p_MBMUX_ComTable->MBMUXMapping[e_featID][MBMUX_CMD_RESP] = channel_idx;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm4Cb = MsgCb;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].BufSize = ComBufSize;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].ParamBuf = ComBuffer;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].ReturnVal = 0;
+    }
+    else
+    {
+      p_MBMUX_ComTable->MBMUXMapping[e_featID][MBMUX_NOTIF_ACK] = channel_idx;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm4Cb = MsgCb;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].BufSize = ComBufSize;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].ParamBuf = ComBuffer;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].ReturnVal = 0;
+    }
+    ret = channel_idx;
+  }
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_Last */
+  return ret;
+}
+
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
+
+  /* USER CODE END MBMUX_UnregisterFeature_1 */
+  uint8_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  /* Function not completely implemented:
+     Missing code that sends via Mbmux a SysCmd to tell CM0PLUS to unregister it's callback */
+  /* ... */
+
+  if (mb_ch < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)
+    {
+      /* Channel should have been unregistered first on CM0PLUS to avoid getting Irq with no cb */
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].BufSize = 0;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ParamBuf = NULL;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ReturnVal = 0;
+    }
+    else
+    {
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
+      /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
+      IPCC_IF_AcknowledgeSnd(mb_ch);
+
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize = 0;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamBuf = NULL;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ReturnVal = 0;
+    }
+  }
+
+  p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType] = MB_CHANNEL_NOT_REGISTERED;
+
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
+
+  /* USER CODE END MBMUX_UnregisterFeature_Last */
+}
+
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_1 */
+  uint32_t channel_idx;
+  MBMUX_ComParam_t *com_param_ptr = NULL;
+
+  channel_idx = MBMUX_GetFeatureChIdx(e_featID, ComType);
+  if (channel_idx < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBCmdRespParam[channel_idx];
+    }
+    else
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBNotifAckParam[channel_idx];
+    }
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_Last */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_Last */
+}
+
+int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_CommandSnd_1 */
+
+  /* USER CODE END MBMUX_CommandSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_CMD_RESP);
+  if (p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBCmdRespParam[mb_ch].BufSize)
+  {
+    Error_Handler();
+  }
+  return IPCC_IF_CommandSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_CommandSnd_Last */
+
+  /* USER CODE END MBMUX_CommandSnd_Last */
+}
+
+uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
+
+  /* USER CODE END MBMUX_AcknowledgeSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
+  return IPCC_IF_AcknowledgeSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_AcknowledgeSnd_Last */
+
+  /* USER CODE END MBMUX_AcknowledgeSnd_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
+{
+  int8_t ret = 0;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  FEAT_INFO_Param_t  i_feature;
+  /* USER CODE BEGIN MBMUX_CheckIfFeatureSupportedByCm0plus_1 */
+
+  /* USER CODE END MBMUX_CheckIfFeatureSupportedByCm0plus_1 */
+
+  if (p_MBMUX_Cm0plusFeatureList != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_MBMUX_Cm0plusFeatureList->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      i_feature = *(i + p_MBMUX_Cm0plusFeatureList->Feat_Info_TableAddress);
+      if (i_feature.Feat_Info_Feature_Id == e_featID)
+      {
+        ret = 1;
+        break;
+      }
+
+    }
+  }
+  /* USER CODE BEGIN MBMUX_CheckIfFeatureSupportedByCm0plus_Last */
+
+  /* USER CODE END MBMUX_CheckIfFeatureSupportedByCm0plus_Last */
+  return ret;
+}
+
+static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrResponseRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
+  /* call registered callback */
+  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm4Cb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrResponseRcvCb_Last */
+  return;
+}
+
+static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrNotificationRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
+  /* call registered callback */
+  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm4Cb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrNotificationRcvCb_Last */
+  return;
+}
+
+static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
+
+  /* USER CODE END MBMUX_FindChStillUnregistered_1 */
+  uint8_t feat_id;
+  uint8_t ch;
+  uint8_t already_used;
+
+  /* First two channels are reserved to SYSTEM, TRACE and SKS */
+  if (ComType == MBMUX_CMD_RESP)
+  {
+    for (ch = 1; ch < MBMUX_CHANNEL_NUMBER; ch++)
+    {
+      already_used = 0;
+      for (feat_id = 0; feat_id < FEAT_INFO_CNT; feat_id++)
+      {
+        if (p_MBMUX_ComTable->MBMUXMapping[feat_id][MBMUX_CMD_RESP] == ch)
+        {
+          already_used = 1;
+        }
+      }
+      if (already_used == 0)
+      {
+        break;
+      }
+    }
+  }
+  else  /* RX */
+  {
+    for (ch = 1; ch < MBMUX_CHANNEL_NUMBER; ch++)
+    {
+      already_used = 0;
+      for (feat_id = 0; feat_id < FEAT_INFO_CNT; feat_id++)
+      {
+        if (p_MBMUX_ComTable->MBMUXMapping[feat_id][MBMUX_NOTIF_ACK] == ch)
+        {
+          already_used = 1;
+        }
+      }
+      if (already_used == 0)
+      {
+        break;
+      }
+    }
+  }
+
+  if (ch == MBMUX_CHANNEL_NUMBER)
+  {
+    return MB_CHANNEL_NOT_REGISTERED;
+  }
+  else
+  {
+    return (ch);
+  }
+  /* USER CODE BEGIN MBMUX_FindChStillUnregistered_Last */
+
+  /* USER CODE END MBMUX_FindChStillUnregistered_Last */
+}
+
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_1 */
+  return p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType];
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_Last */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_Last */
+}
+
+static void MBMUX_IsrNotRegistered(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_1 */
+  Error_Handler();
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
new file mode 100644
index 00000000..a15773f5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
@@ -0,0 +1,121 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.h
+  * @author  MCD Application Team
+  * @brief   API which interfaces CM4 to IPCC
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_CM4_H__
+#define __MBMUX_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
+void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
+
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUX_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
new file mode 100644
index 00000000..85c7237c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
@@ -0,0 +1,235 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_lora.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to register and handle LoraWAN via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_lora.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "LoRaMac.h"
+#include "LmHandler_mbwrapper.h"
+#include "utilities_def.h"
+#include "lora_app_version.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *LoraComObj;
+
+/**
+  * @brief LoRa cmd buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraCmdRespBuff[MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief LoRa notif buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
+static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
+static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the notification
+  */
+static void MBMUXIF_TaskLoraNotifRcv(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_LoraInit(void)
+{
+  FEAT_INFO_Param_t *p_cm0plus_system_info;
+  int32_t cm0_vers = 0;
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_LoraInit_1 */
+
+  /* USER CODE END MBMUXIF_LoraInit_1 */
+
+  p_cm0plus_system_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
+  /* abstract CM0 release version from RC (release candidate) and compare */
+  cm0_vers = p_cm0plus_system_info->Feat_Info_Feature_Version >> __APP_VERSION_SUB2_SHIFT;
+  if (cm0_vers < (__LAST_COMPATIBLE_CM0_RELEASE >> __APP_VERSION_SUB2_SHIFT))
+  {
+    ret = -4; /* version incompatibility */
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP, MBMUXIF_IsrLoraRespRcvCb, aLoraCmdRespBuff, sizeof(aLoraCmdRespBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrLoraNotifRcvCb, aLoraNotifAckBuff, sizeof(aLoraNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskLoraNotifRcv);
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_LORAWAN_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  if (ret >= 0)
+  {
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_LoraInit_Last */
+
+  /* USER CODE END MBMUXIF_LoraInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_Last */
+}
+
+void MBMUXIF_LoraSendCmd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_LoraSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_LoraSendCmd_1 */
+  if (MBMUX_CommandSnd(FEAT_INFO_LORAWAN_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbLoRaRespRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_LoraSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_LoraSendCmd_Last */
+}
+
+void MBMUXIF_LoraSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_LoraSendAck_1 */
+
+  /* USER CODE END MBMUXIF_LoraSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_LORAWAN_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_LoraSendAck_Last */
+
+  /* USER CODE END MBMUXIF_LoraSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbLoRaRespRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_1 */
+  LoraComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskLoraNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskLoraNotifRcv_1 */
+  Process_Lora_Notif(LoraComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskLoraNotifRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
new file mode 100644
index 00000000..ff6c5791
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
@@ -0,0 +1,92 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_lora.h
+  * @author  MCD Application Team
+  * @brief   API provided to CM4 application to register and handle LoraWAN via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_LORA_CM4_H__
+#define __MBMUXIF_LORA_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Cmd via Ipcc and Wait for the response
+  */
+void MBMUXIF_LoraSendCmd(void);
+
+/**
+  * @brief   Sends a Lora-Ack via Ipcc without waiting for the ack
+  */
+void MBMUXIF_LoraSendAck(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_LORA_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
new file mode 100644
index 00000000..81fc561a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
@@ -0,0 +1,231 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_radio.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "radio_mbwrapper.h"
+#include "subghz_phy_version.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *RadioComObj;
+
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
+static void MBMUXIF_TaskRadioNotifRcv(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_RadioInit(void)
+{
+  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_1 */
+
+  /* USER CODE END MBMUXIF_RadioInit_1 */
+
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
+  if (p_cm0plus_specific_features_info->Feat_Info_Feature_Version != __SUBGHZ_PHY_VERSION)
+  {
+    ret = -4; /* version mismatch */
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP, MBMUXIF_IsrRadioRespRcvCb, aRadioCmdRespBuff, sizeof(aRadioCmdRespBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrRadioNotifRcvCb, aRadioNotifAckBuff, sizeof(aRadioNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskRadioNotifRcv);
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_RADIO_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  if (ret >= 0)
+  {
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_Last */
+
+  /* USER CODE END MBMUXIF_RadioInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
+}
+
+void MBMUXIF_RadioSendCmd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendCmd_1 */
+  if (MBMUX_CommandSnd(FEAT_INFO_RADIO_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbRadioRespRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendCmd_Last */
+}
+
+void MBMUXIF_RadioSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_RADIO_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendAck_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbRadioRespRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_1 */
+  RadioComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskRadioNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifRcv_1 */
+  Process_Radio_Notif(RadioComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
new file mode 100644
index 00000000..3d565fcd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
@@ -0,0 +1,93 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_RADIO_CM4_H__
+#define __MBMUXIF_RADIO_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
+void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
+void MBMUXIF_RadioSendAck(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_RADIO_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
new file mode 100644
index 00000000..1884bb44
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
@@ -0,0 +1,566 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_sys.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "stm32_timer.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
+static __IO uint8_t MbSystemRespRcvFlag;
+
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
+
+MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
+MBMUX_ComParam_t *SystemComObj;
+
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
+static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_SystemInit(void)
+{
+  int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
+
+  /* USER CODE END MBMUXIF_SystemInit_1 */
+
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
+  {
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
+
+    /* write FLASH->IPCCBR option byte */
+    /* Unlock the Flash to enable the flash control register access *************/
+    HAL_FLASH_Unlock();
+    /* Clear OPTVERR bit set on virgin samples */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+    /* Unlock the Options Bytes *************************************************/
+    HAL_FLASH_OB_Unlock();
+
+    /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
+
+    if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
+    {
+      /*
+      Error occurred while setting option bytes configuration.
+      User can add here some code to deal with this error.
+      To know the code error, user can call function 'HAL_FLASH_GetError()'
+      */
+      Error_Handler();
+    }
+
+    /* Start the Option Bytes programming process */
+    if (HAL_FLASH_OB_Launch() != HAL_OK)
+    {
+      /*
+      Error occurred while reloading option bytes configuration.
+      User can add here some code to deal with this error.
+      To know the code error, user can call function 'HAL_FLASH_GetError()'
+      */
+      Error_Handler();
+    }
+
+    /* Notice: After HAL_FLASH_OB_Launch() the chip is reset so next code is not executed */
+    /* Implemented anyway to be aligned with other projects (SBSFU, etc) */
+    /* Lock the Options Bytes ***************************************************/
+    (void) HAL_FLASH_OB_Lock();
+    /* Lock the Flash to disable the flash control register access  *********/
+    (void) HAL_FLASH_Lock();
+  }
+  /* Init MailBoxMultiplexer */
+  MBMUX_Init(pMb_RefTable);
+
+  ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemNotifRcvCb, aSystemNotifAckBuff, sizeof(aSystemNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = 0;
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
+
+  /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
+  /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
+
+  /* USER CODE END MBMUXIF_SystemInit_Last */
+  return ret;
+}
+
+int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
+
+  /* USER CODE END MBMUXIF_SystemPrio_Add_1 */
+
+  switch (SystemPrioFeat)
+  {
+    case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioARespRcvCb, aSystemPrioACmdRespBuff, sizeof(aSystemPrioACmdRespBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioANotifRcvCb, aSystemPrioANotifAckBuff, sizeof(aSystemPrioANotifAckBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_CMD_PRIO_B_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioBRespRcvCb, aSystemPrioBCmdRespBuff, sizeof(aSystemPrioBCmdRespBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioBNotifRcvCb, aSystemPrioBNotifAckBuff, sizeof(aSystemPrioBNotifAckBuff));
+      break;
+    }
+    default:
+      break;
+  }
+
+  if (ret >= 0)
+  {
+    /* Note: trace works on ISR, no need to associate a SEQ_TASK */
+
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(SystemPrioFeat);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_Last */
+
+  /* USER CODE END MBMUXIF_SystemPrio_Add_Last */
+  return ret;
+}
+
+void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
+{
+  pMb_RefTable->SynchronizeCpusAtBoot = flag;
+  /* USER CODE BEGIN MBMUXIF_SetCpusSynchroFlag */
+
+  /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
+}
+
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
+{
+  while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
+  {
+  }
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
+
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureCmdComPtr */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+}
+
+void MBMUXIF_SystemAllowSequencerForSysCmd(void)
+{
+  AllowSequencerForSysCmd = 1;
+  /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
+
+  /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
+}
+
+void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCmd_1 */
+
+  if (SystemPrioFeat == FEAT_INFO_SYSTEM_ID)
+  {
+
+    MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
+    if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
+    {
+      if (AllowSequencerForSysCmd)
+      {
+        UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
+      }
+      else
+      {
+        /* To avoid using Sequencer (& LowPower) during Init sequence for SysCmd  */
+        while (!MbSystemRespRcvFlag) {}
+      }
+    }
+    else
+    {
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCmd_Last */
+}
+
+void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendAck_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendAck_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Exported services --------------------------------------------------------*/
+FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
+{
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret = 0;
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusInfoListReq_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusInfoListReq_1 */
+
+  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
+  if (com_obj != NULL)
+  {
+    com_obj->MsgId = SYS_GET_INFO_LIST_MSG_ID;
+    com_obj->ParamCnt = 0;
+    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
+    /* waiting for ack event */
+
+    /* once event is received and semaphore released: */
+    ret = com_obj->ReturnVal;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusInfoListReq_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusInfoListReq_Last */
+  return (FEAT_INFO_List_t *) ret;   /* need to verify */
+}
+
+FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
+{
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
+  FEAT_INFO_Param_t  *p_feature = NULL;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  uint8_t found = 0;
+
+  /* USER CODE BEGIN MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
+
+  /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
+
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+
+  if (p_cm0plus_supported_features_list != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
+      if (p_feature->Feat_Info_Feature_Id == e_featID)
+      {
+        found = 1;
+        break;
+      }
+    }
+  }
+
+  if (!found)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemGetFeatCapabInfoPtr_Last */
+
+  /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_Last */
+  return  p_feature;
+}
+
+int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
+{
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret = 0;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusRegistrationCmd_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusRegistrationCmd_1 */
+
+  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
+  if (com_obj != NULL)
+  {
+    com_obj->MsgId = SYS_REGISTER_FEATURE_MSG_ID;
+    com_buffer = com_obj->ParamBuf;
+    com_buffer[i++] = (uint32_t) e_featID;
+    com_obj->ParamCnt = i;
+    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
+    /* waiting for event */
+    /* once event is received and semaphore released: */
+    ret = com_obj->ReturnVal;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusRegistrationCmd_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusRegistrationCmd_Last */
+  return (int8_t) ret;
+}
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_1 */
+
+  /* During "SystemInit sequence" Flag is used instead of Sequencer */
+  MbSystemRespRcvFlag = 1;
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  {
+    UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
+  }
+  /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_1 */
+  SystemComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskSystemNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskSystemNotifRcv_1 */
+  Process_Sys_Notif(SystemComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
+}
+
+static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
+  UTIL_TIMER_IRQ_Handler();
+  /* clear the IPCC flag (necessary even if this Notif is not blocking */
+  MBMUXIF_SystemSendAck(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBNotifRcvCb */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
new file mode 100644
index 00000000..61f37d9a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
@@ -0,0 +1,147 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_SYS_CM4_H__
+#define __MBMUXIF_SYS_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "mbmux.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
+void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
+void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
+FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
+FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
+int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_SYS_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
new file mode 100644
index 00000000..c91551a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
@@ -0,0 +1,156 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "stm32_mem.h"
+#include "stm32_adv_trace.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
+static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_TraceInit(void)
+{
+  int8_t ret;
+  /* USER CODE BEGIN MBMUXIF_TraceInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceInit_1 */
+
+  ret = MBMUX_RegisterFeature(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceNotifRcvCb, aTraceNotifAckBuff, sizeof(aTraceNotifAckBuff));
+  if (ret >= 0)
+  {
+    /* Note: trace works on ISR, no need to associate a SEQ_TASK */
+
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_TRACE_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceInit_Last */
+  return ret;
+}
+
+void MBMUXIF_TraceSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  MBMUX_ComParam_t *TraceComObj;
+  uint32_t  notif_ack_id;
+  uint8_t *buffer;
+  uint16_t bufsize;
+  UTIL_ADV_TRACE_Status_t ret;
+
+  TraceComObj = (MBMUX_ComParam_t *) ComObj;
+
+  notif_ack_id = TraceComObj->MsgId;
+
+  switch (notif_ack_id)
+  {
+    case TRACE_SEND_MSG_ID:
+      buffer = (uint8_t *) TraceComObj->ParamBuf[0];
+      bufsize = (uint16_t) TraceComObj->ParamBuf[1];
+      ret = UTIL_ADV_TRACE_Send(buffer, bufsize);
+      /* prepare ack buffer */
+      TraceComObj->ParamCnt = 0;
+      TraceComObj->ReturnVal = (uint32_t)ret;
+      break;
+
+    default:
+      break;
+  }
+
+  /* Send ack */
+  MBMUXIF_TraceSendAck();
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
new file mode 100644
index 00000000..f98a156d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
@@ -0,0 +1,77 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_TRACE_CM4_H__
+#define __MBMUXIF_TRACE_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
+void MBMUXIF_TraceSendAck(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_TRACE_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
new file mode 100644
index 00000000..9d1ad5a4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
@@ -0,0 +1,857 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "radio_mbwrapper.h"
+#include "radio.h"
+#include "mbmux.h"
+#include "msg_id.h"
+#include "mbmuxif_radio.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* **********************************************************************
+ * Interrupts functions prototypes
+ ************************************************************************/
+/*!
+ * @brief Process radio irq
+ */
+static void RadioIrqProcess(void);
+
+/* **********************************************************************
+ * Middleware Interface functions prototypes
+ ************************************************************************/
+/*!
+ * \brief Initializes the radio
+ *
+ * \param[in] events Structure containing the driver callback functions
+ */
+static void RadioInit(RadioEvents_t *events);
+
+/*!
+ * Return current radio status
+ *
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ */
+static RadioState_t RadioGetStatus(void);
+
+/*!
+ * \brief Configures the radio with the given modem
+ *
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
+ */
+static void RadioSetModem(RadioModems_t modem);
+
+/*!
+ * \brief Sets the channel frequency
+ *
+ * \param[in] freq Channel RF frequency
+ */
+static void RadioSetChannel(uint32_t freq);
+
+/*!
+  * \brief Checks if the channel is free for the given time
+  *
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  *
+  * \retval isFree         [true: Channel is free, false: Channel is not free]
+  */
+static bool RadioIsChannelFree(uint32_t freq, uint32_t rxBandwidth,
+                               int16_t rssiThresh, uint32_t maxCarrierSenseTime);
+
+/*!
+ * \brief Generates a 32 bits random value based on the RSSI readings
+ *
+ * \remark This function sets the radio in LoRa modem mode and disables
+ *         all interrupts.
+ *         After calling this function either Radio.SetRxConfig or
+ *         Radio.SetTxConfig functions must be called.
+ *
+ * \retval randomValue    32 bits random value
+ */
+static uint32_t RadioRandom(void);
+
+/*!
+ * \brief Sets the reception parameters
+ *
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] datarate     Sets the Datarate
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: N/A ( set to 0 )
+ * \param[in] preambleLen  Sets the Preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
+ *                          FSK : timeout in number of bytes
+ *                          LoRa: timeout in symbols
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: OFF, 1: ON]
+ * \param[in] HopPeriod    Number of symbols between each hop
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: Number of symbols
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: not inverted, 1: inverted]
+ * \param[in] rxContinuous Sets the reception in continuous mode
+ *                          [false: single mode, true: continuous mode]
+ */
+static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
+                             uint32_t datarate, uint8_t coderate,
+                             uint32_t bandwidthAfc, uint16_t preambleLen,
+                             uint16_t symbTimeout, bool fixLen,
+                             uint8_t payloadLen,
+                             bool crcOn, bool FreqHopOn, uint8_t HopPeriod,
+                             bool iqInverted, bool rxContinuous);
+
+/*!
+ * \brief Sets the transmission parameters
+ *
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
+ *                          FSK : [Hz]
+ *                          LoRa: 0
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
+ *                          FSK : 0
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] datarate     Sets the Datarate
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] preambleLen  Sets the preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: OFF, 1: ON]
+ * \param[in] HopPeriod    Number of symbols between each hop
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: Number of symbols
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: not inverted, 1: inverted]
+ * \param[in] timeout      Transmission timeout [ms]
+ */
+static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
+                             uint32_t bandwidth, uint32_t datarate,
+                             uint8_t coderate, uint16_t preambleLen,
+                             bool fixLen, bool crcOn, bool FreqHopOn,
+                             uint8_t HopPeriod, bool iqInverted, uint32_t timeout);
+
+/*!
+ * \brief Checks if the given RF frequency is supported by the hardware
+ *
+ * \param[in] frequency RF frequency to be checked
+ * \retval isSupported [true: supported, false: unsupported]
+ */
+static bool RadioCheckRfFrequency(uint32_t frequency);
+
+/*!
+ * \brief Computes the packet time on air in ms for the given payload
+ *
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] spreadingFactor  Sets the Spreading Factor
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] preambleLen  Sets the Preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ *
+ * \retval airTime        Computed airTime (ms) for the given packet payload length
+ */
+static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
+                                  uint32_t spreadingFactor, uint8_t coderate,
+                                  uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                                  bool crcOn);
+
+/*!
+ * \brief Sends the buffer of size. Prepares the packet to be sent and sets
+ *        the radio in transmission
+ *
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
+ */
+static void RadioSend(uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Sets the radio in sleep mode
+ */
+static void RadioSleep(void);
+
+/*!
+ * \brief Sets the radio in standby mode
+ */
+static void RadioStandby(void);
+
+/*!
+ * \brief Sets the radio in reception mode for the given time
+ * \param[in] timeout Reception timeout [ms]
+ *                     [0: continuous, others timeout]
+ */
+static void RadioRx(uint32_t timeout);
+
+/*!
+ * \brief Start a Channel Activity Detection
+ */
+static void RadioStartCad(void);
+
+/*!
+ * \brief Sets the radio in continuous wave transmission mode
+ *
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
+ */
+static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
+
+/*!
+ * \brief Reads the current RSSI value
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
+ * \retval rssiValue Current RSSI value in [dBm]
+ */
+static int16_t RadioRssi(RadioModems_t modem);
+
+/*!
+ * \brief Writes the radio register at the specified address
+ *
+ * \param[in] addr Register address
+ * \param[in] data New register value
+ */
+static void RadioWrite(uint16_t addr, uint8_t data);
+
+/*!
+ * \brief Reads the radio register at the specified address
+ *
+ * \param[in] addr Register address
+ * \retval data Register value
+ */
+static uint8_t RadioRead(uint16_t addr);
+
+/*!
+ * \brief Writes multiple radio registers starting at address
+ *
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
+ */
+static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Reads multiple radio registers starting at address
+ *
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
+ */
+static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Sets the maximum payload length.
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
+ */
+static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
+
+/*!
+ * \brief Sets the network to public or private. Updates the sync byte.
+ *
+ * \remark Applies to LoRa modem only
+ *
+ * \param[in] enable if true, it enables a public network
+ */
+static void RadioSetPublicNetwork(bool enable);
+
+/*!
+ * \brief Gets the time required for the board plus radio to get out of sleep.[ms]
+ *
+ * \retval time Radio plus board wakeup time in ms.
+ */
+static uint32_t RadioGetWakeUpTime(void);
+
+/*!
+ * \brief Sets the radio in reception mode with Max LNA gain for the given time
+ * \param[in] timeout Reception timeout [ms]
+ *                     [0: continuous, others timeout]
+ */
+static void RadioRxBoosted(uint32_t timeout);
+
+/*!
+ * \brief Sets the Rx duty cycle management parameters
+ *
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
+ */
+static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
+
+/*!
+ * \brief Set Tx PRBS modulated wave
+ */
+static void RadioTxPrbs(void);
+
+/*!
+ * \brief Set Tx continuous wave
+ * \param[in]  power  Tx power level [0..15]
+ */
+static void RadioTxCw(int8_t power);
+
+/*!
+ * \brief Sets the reception parameters
+ *
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
+ *                          fsk field to be used if modem =GENERIC_FSK
+*                           lora field to be used if modem =GENERIC_LORA
+ * \param[in] rxContinuous Sets the reception in continuous mode
+ *                          [0: single mode, otherwise continuous mode]
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
+ *                          FSK : timeout in number of bytes
+ *                          LoRa: timeout in symbols
+ * \return 0 when no parameters error, -1 otherwise
+ */
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
+                                       uint32_t rxContinuous, uint32_t symbTimeout);
+
+/*!
+ * \brief Sets the transmission parameters
+ *
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
+ *                          fsk field to be used if modem =GENERIC_FSK
+*                           lora field to be used if modem =GENERIC_LORA
+                            bpsk field to be used if modem =GENERIC_BPSK
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
+ * \return 0 when no parameters error, -1 otherwise
+ */
+static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
+                                       int8_t power, uint32_t timeout);
+
+/*
+* Private global constants
+*/
+
+/*!
+ * Radio driver structure initialization
+ */
+const struct Radio_s Radio =
+{
+  RadioInit,
+  RadioGetStatus,
+  RadioSetModem,
+  RadioSetChannel,
+  RadioIsChannelFree,
+  RadioRandom,
+  RadioSetRxConfig,
+  RadioSetTxConfig,
+  RadioCheckRfFrequency,
+  RadioGetTimeOnAir,
+  RadioSend,
+  RadioSleep,
+  RadioStandby,
+  RadioRx,
+  RadioStartCad,
+  RadioSetTxContinuousWave,
+  RadioRssi,
+  RadioWrite,
+  RadioRead,
+  RadioWriteRegisters,
+  RadioReadRegisters,
+  RadioSetMaxPayloadLength,
+  RadioSetPublicNetwork,
+  RadioGetWakeUpTime,
+  RadioIrqProcess,
+  RadioRxBoosted,
+  RadioSetRxDutyCycle,
+  RadioTxPrbs,
+  RadioTxCw,
+  RadioSetRxGenericConfig,
+  RadioSetTxGenericConfig,
+};
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Radio_Notif_1 */
+
+  /* USER CODE END Process_Radio_Notif_1 */
+  /* Radio Notif received */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4<(Radio)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    default:
+      break;
+  }
+
+  /* Radio sending ack */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4>(Radio)\r\n");
+  MBMUX_AcknowledgeSnd(FEAT_INFO_RADIO_ID);
+  /* USER CODE BEGIN Process_Radio_Notif_2 */
+
+  /* USER CODE END Process_Radio_Notif_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void RadioInit(RadioEvents_t *events)
+{
+  /* USER CODE BEGIN RadioInit_1 */
+
+  /* USER CODE END RadioInit_1 */
+  return;
+  /* USER CODE BEGIN RadioInit_2 */
+
+  /* USER CODE END RadioInit_2 */
+}
+
+/*!
+  * Return current radio status
+  *
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  */
+static RadioState_t RadioGetStatus(void)
+{
+  /* USER CODE BEGIN RadioGetStatus_1 */
+
+  /* USER CODE END RadioGetStatus_1 */
+  return (RadioState_t) 0UL;
+  /* USER CODE BEGIN RadioGetStatus_2 */
+
+  /* USER CODE END RadioGetStatus_2 */
+}
+
+static void RadioSetModem(RadioModems_t modem)
+{
+  /* USER CODE BEGIN RadioSetModem_1 */
+
+  /* USER CODE END RadioSetModem_1 */
+  return;
+  /* USER CODE BEGIN RadioSetModem_2 */
+
+  /* USER CODE END RadioSetModem_2 */
+}
+
+static void RadioSetChannel(uint32_t freq)
+{
+  /* USER CODE BEGIN RadioSetChannel_1 */
+
+  /* USER CODE END RadioSetChannel_1 */
+  return;
+  /* USER CODE BEGIN RadioSetChannel_2 */
+
+  /* USER CODE END RadioSetChannel_2 */
+}
+
+static bool RadioIsChannelFree(uint32_t freq, uint32_t rxBandwidth, int16_t rssiThresh, uint32_t maxCarrierSenseTime)
+{
+  /* USER CODE BEGIN RadioIsChannelFree_1 */
+
+  /* USER CODE END RadioIsChannelFree_1 */
+  return (bool) 0UL;
+  /* USER CODE BEGIN RadioIsChannelFree_2 */
+
+  /* USER CODE END RadioIsChannelFree_2 */
+}
+
+static uint32_t RadioRandom(void)
+{
+  /* USER CODE BEGIN RadioRandom_1 */
+
+  /* USER CODE END RadioRandom_1 */
+  return 0UL;
+  /* USER CODE BEGIN RadioRandom_2 */
+
+  /* USER CODE END RadioRandom_2 */
+}
+
+static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
+                             uint32_t datarate, uint8_t coderate,
+                             uint32_t bandwidthAfc, uint16_t preambleLen,
+                             uint16_t symbTimeout, bool fixLen,
+                             uint8_t payloadLen,
+                             bool crcOn, bool freqHopOn, uint8_t hopPeriod,
+                             bool iqInverted, bool rxContinuous)
+{
+  /* USER CODE BEGIN RadioSetRxConfig_1 */
+
+  /* USER CODE END RadioSetRxConfig_1 */
+  return;
+  /* USER CODE BEGIN RadioSetRxConfig_2 */
+
+  /* USER CODE END RadioSetRxConfig_2 */
+}
+
+static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
+                             uint32_t bandwidth, uint32_t datarate,
+                             uint8_t coderate, uint16_t preambleLen,
+                             bool fixLen, bool crcOn, bool freqHopOn,
+                             uint8_t hopPeriod, bool iqInverted, uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioSetTxConfig_1 */
+
+  /* USER CODE END RadioSetTxConfig_1 */
+  return;
+  /* USER CODE BEGIN RadioSetTxConfig_2 */
+
+  /* USER CODE END RadioSetTxConfig_2 */
+}
+
+static bool RadioCheckRfFrequency(uint32_t frequency)
+{
+  /* USER CODE BEGIN RadioCheckRfFrequency_1 */
+
+  /* USER CODE END RadioCheckRfFrequency_1 */
+  return (bool) 0UL;
+  /* USER CODE BEGIN RadioCheckRfFrequency_2 */
+
+  /* USER CODE END RadioCheckRfFrequency_2 */
+}
+
+static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
+                                  uint32_t spreadingFactor, uint8_t coderate,
+                                  uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                                  bool crcOn)
+{
+  /* USER CODE BEGIN RadioGetTimeOnAir_1 */
+
+  /* USER CODE END RadioGetTimeOnAir_1 */
+  return 0UL;
+  /* USER CODE BEGIN RadioGetTimeOnAir_2 */
+
+  /* USER CODE END RadioGetTimeOnAir_2 */
+}
+
+static void RadioSend(uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioSend_1 */
+
+  /* USER CODE END RadioSend_1 */
+  return;
+  /* USER CODE BEGIN RadioSend_2 */
+
+  /* USER CODE END RadioSend_2 */
+}
+
+static void RadioSleep(void)
+{
+  /* USER CODE BEGIN RadioSleep_1 */
+
+  /* USER CODE END RadioSleep_1 */
+  return;
+  /* USER CODE BEGIN RadioSleep_2 */
+
+  /* USER CODE END RadioSleep_2 */
+}
+
+static void RadioStandby(void)
+{
+  /* USER CODE BEGIN RadioStandby_1 */
+
+  /* USER CODE END RadioStandby_1 */
+  return;
+  /* USER CODE BEGIN RadioStandby_2 */
+
+  /* USER CODE END RadioStandby_2 */
+}
+
+static void RadioRx(uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioRx_1 */
+
+  /* USER CODE END RadioRx_1 */
+  return;
+  /* USER CODE BEGIN RadioRx_2 */
+
+  /* USER CODE END RadioRx_2 */
+}
+
+static void RadioStartCad(void)
+{
+  /* USER CODE BEGIN RadioStartCad_1 */
+
+  /* USER CODE END RadioStartCad_1 */
+  return;
+  /* USER CODE BEGIN RadioStartCad_2 */
+
+  /* USER CODE END RadioStartCad_2 */
+}
+
+static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
+{
+  /* USER CODE BEGIN RadioSetTxContinuousWave_1 */
+
+  /* USER CODE END RadioSetTxContinuousWave_1 */
+  return;
+  /* USER CODE BEGIN RadioSetTxContinuousWave_2 */
+
+  /* USER CODE END RadioSetTxContinuousWave_2 */
+}
+
+static int16_t RadioRssi(RadioModems_t modem)
+{
+  /* USER CODE BEGIN RadioRssi_1 */
+
+  /* USER CODE END RadioRssi_1 */
+  return (int16_t) 0UL;
+  /* USER CODE BEGIN RadioRssi_2 */
+
+  /* USER CODE END RadioRssi_2 */
+}
+
+static void RadioWrite(uint16_t addr, uint8_t data)
+{
+  /* USER CODE BEGIN RadioWrite_1 */
+
+  /* USER CODE END RadioWrite_1 */
+  return ;
+  /* USER CODE BEGIN RadioWrite_2 */
+
+  /* USER CODE END RadioWrite_2 */
+}
+
+static uint8_t RadioRead(uint16_t addr)
+{
+  /* USER CODE BEGIN RadioRead_1 */
+
+  /* USER CODE END RadioRead_1 */
+  return (uint8_t) 0UL;
+  /* USER CODE BEGIN RadioRead_2 */
+
+  /* USER CODE END RadioRead_2 */
+}
+
+static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioWriteRegisters_1 */
+
+  /* USER CODE END RadioWriteRegisters_1 */
+  return ;
+  /* USER CODE BEGIN RadioWriteRegisters_2 */
+
+  /* USER CODE END RadioWriteRegisters_2 */
+}
+
+static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioReadRegisters_1 */
+
+  /* USER CODE END RadioReadRegisters_1 */
+  return ;
+  /* USER CODE BEGIN RadioReadRegisters_2 */
+
+  /* USER CODE END RadioReadRegisters_2 */
+}
+
+static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max)
+{
+  /* USER CODE BEGIN RadioSetMaxPayloadLength_1 */
+
+  /* USER CODE END RadioSetMaxPayloadLength_1 */
+  return ;
+  /* USER CODE BEGIN RadioSetMaxPayloadLength_2 */
+
+  /* USER CODE END RadioSetMaxPayloadLength_2 */
+}
+
+static void RadioSetPublicNetwork(bool enable)
+{
+  /* USER CODE BEGIN RadioSetPublicNetwork_1 */
+
+  /* USER CODE END RadioSetPublicNetwork_1 */
+  return ;
+  /* USER CODE BEGIN RadioSetPublicNetwork_2 */
+
+  /* USER CODE END RadioSetPublicNetwork_2 */
+}
+
+static uint32_t RadioGetWakeUpTime(void)
+{
+  /* USER CODE BEGIN RadioGetWakeUpTime_1 */
+
+  /* USER CODE END RadioGetWakeUpTime_1 */
+  return 0UL;
+  /* USER CODE BEGIN RadioGetWakeUpTime_2 */
+
+  /* USER CODE END RadioGetWakeUpTime_2 */
+}
+
+static void RadioIrqProcess(void)
+{
+  /* USER CODE BEGIN RadioIrqProcess_1 */
+
+  /* USER CODE END RadioIrqProcess_1 */
+  return;
+  /* USER CODE BEGIN RadioIrqProcess_2 */
+
+  /* USER CODE END RadioIrqProcess_2 */
+}
+
+static void RadioRxBoosted(uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioRxBoosted_1 */
+
+  /* USER CODE END RadioRxBoosted_1 */
+  return ;
+  /* USER CODE BEGIN RadioRxBoosted_2 */
+
+  /* USER CODE END RadioRxBoosted_2 */
+}
+
+static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime)
+{
+  /* USER CODE BEGIN RadioSetRxDutyCycle_1 */
+
+  /* USER CODE END RadioSetRxDutyCycle_1 */
+  return ;
+  /* USER CODE BEGIN RadioSetRxDutyCycle_2 */
+
+  /* USER CODE END RadioSetRxDutyCycle_2 */
+}
+
+static void RadioTxPrbs(void)
+{
+  /* USER CODE BEGIN RadioTxPrbs_1 */
+
+  /* USER CODE END RadioTxPrbs_1 */
+  return ;
+  /* USER CODE BEGIN RadioTxPrbs_2 */
+
+  /* USER CODE END RadioTxPrbs_2 */
+}
+
+static void RadioTxCw(int8_t power)
+{
+  /* USER CODE BEGIN RadioTxCw_1 */
+
+  /* USER CODE END RadioTxCw_1 */
+  return ;
+  /* USER CODE BEGIN RadioTxCw_2 */
+
+  /* USER CODE END RadioTxCw_2 */
+}
+
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config, uint32_t rxContinuous,
+                                       uint32_t symbTimeout)
+{
+  /* USER CODE BEGIN RadioSetRxGenericConfig_1 */
+
+  /* USER CODE END RadioSetRxGenericConfig_1 */
+  return 0UL;
+  /* USER CODE BEGIN RadioSetRxGenericConfig_2 */
+
+  /* USER CODE END RadioSetRxGenericConfig_2 */
+}
+
+static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config, int8_t power, uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioSetTxGenericConfig_1 */
+
+  /* USER CODE END RadioSetTxGenericConfig_1 */
+  return 0UL;
+  /* USER CODE BEGIN RadioSetTxGenericConfig_2 */
+
+  /* USER CODE END RadioSetTxGenericConfig_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
new file mode 100644
index 00000000..e7eebe2c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_MBWRAPPER_CM4_H__
+#define __RADIO_MBWRAPPER_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
+void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__RADIO_MBWRAPPER_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..af8588aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
new file mode 100644
index 00000000..692c3088
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
@@ -0,0 +1,138 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    features_info.h
+  * @author  MCD Application Team
+  * @brief   Feature list and parameters TypeDefinitions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTEM_INFO_H
+#define __SYSTEM_INFO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+/**
+  * @brief Feature enumeration
+  * @note This is the list of all available feature so far,
+          the one available in a given build are listed in the Feat_Info_Table[]
+          to keep compatibility, in order to add a feature
+          use a new value to the bottom without changing the existing order
+  */
+typedef enum
+{
+  FEAT_INFO_SYSTEM_ID = 0,
+  FEAT_INFO_SYSTEM_CMD_PRIO_A_ID,    /* = 1 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID, /* = 2 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_CMD_PRIO_B_ID,  /* = 3 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID,  /* = 4 : position should not change between revisions */
+  FEAT_INFO_KMS_ID,  /* = 5 : position should not change between revisions */
+  FEAT_INFO_TRACE_ID,  /* = 6 : position should not change between revisions */
+  FEAT_INFO_RADIO_ID,  /* = 7 : position should not change between revisions */
+  FEAT_INFO_LORAWAN_ID,  /* = 8 : position should not change between revisions */
+  FEAT_INFO_SIGFOX_ID,  /* = 9 : position should not change between revisions */
+  FEAT_INFO_WMBUS_ID,  /* = 10 : position should not change between revisions */
+  /* USER CODE BEGIN FEAT_INFO_IdTypeDef */
+
+  /* USER CODE END FEAT_INFO_IdTypeDef */
+  FEAT_INFO_CNT
+} FEAT_INFO_IdTypeDef;
+
+/**
+  * @brief Feature parameters
+  */
+typedef struct
+{
+  FEAT_INFO_IdTypeDef Feat_Info_Feature_Id;
+  uint32_t Feat_Info_Feature_Version;
+  uint32_t Feat_Info_Config_Size;
+  void *Feat_Info_Config_Ptr;
+} FEAT_INFO_Param_t;
+
+/**
+  * @brief Feature List
+  */
+typedef struct
+{
+  uint32_t Feat_Info_Cnt;
+  FEAT_INFO_Param_t *Feat_Info_TableAddress;
+} FEAT_INFO_List_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MAX_PARAM_OF_SYS_CMD_FUNCTIONS           7 /*!< Max number of parameters that the sys_cmd can use */
+#define MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS         5 /*!< Max number of parameters that the sys_notif can use */
+#define MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS     1 /*!< Max number of parameters that the sysA_cmd can use */
+#define MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS   1 /*!< Max number of parameters that the sysA_notif can use */
+#define MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS     1 /*!< Max number of parameters that the sysB_cmd can use */
+#define MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS   1 /*!< Max number of parameters that the sysB_notif can use */
+
+#define MAX_PARAM_OF_KMS_CMD_FUNCTIONS          12 /*!< Max number of parameters that the kms can use */
+#define MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS      11 /*!< Max number of parameters that the trace can use */
+#define MAX_PARAM_OF_RADIO_CMD_FUNCTIONS        15 /*!< Max number of parameters that the radio_cmd can use */
+#define MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS       4 /*!< Max number of parameters that the radio_notif can use */
+#define MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS      15 /*!< Max number of parameters that the lorawan_cmd can use */
+#define MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS     5 /*!< Max number of parameters that the lorawan_notif can use */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief  Init configuration params by calling specific feature xxx_info.c
+  */
+void FEAT_INFO_Init(void);
+/**
+  * @brief  Get the feature list ptr
+  * @return address of Feat_Info_List available in shared memory
+  */
+FEAT_INFO_List_t *FEAT_INFO_GetListPtr(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYSTEM_INFO_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
new file mode 100644
index 00000000..0608fd34
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
@@ -0,0 +1,94 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_info.h
+  * @author  MCD Application Team
+  * @brief   To give info to the application about LoRaWAN configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#ifndef __LORA_INFO_H__
+#define __LORA_INFO_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported types ------------------------------------------------------------*/
+/*!
+ * To give info to the application about LoraWAN capability
+ * it can depend how it has been compiled (e.g. compiled regions ...)
+ * Params should be better uint32_t foe easier alignment with info_table concept
+ */
+typedef struct
+{
+  uint32_t ActivationMode;  /*!< 1: ABP, 2 : OTAA, 3: ABP & OTAA   */
+  uint32_t Region;   /*!< Combination of regions compiled on MW  */
+  uint32_t ClassB;   /*!< 0: not compiled in Mw, 1 : compiled in MW  */
+  uint32_t Kms;      /*!< 0: not compiled in Mw, 1 : compiled in MW  */
+} LoraInfo_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief initialize the LoraInfo table
+  */
+void LoraInfo_Init(void);
+
+/**
+  * @brief returns the pointer to the LoraInfo capabilities table
+  * @retval LoraInfo pointer
+  */
+LoraInfo_t *LoraInfo_GetPtr(void);
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LORA_INFO_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
new file mode 100644
index 00000000..84cb7539
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux_table.h
+  * @author  MCD Application Team
+  * @brief   Maps the IPCC channels to memory buffers
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_TABLE_H__
+#define __MBMUX_TABLE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal_ipcc.h"
+#include "features_info.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported constants --------------------------------------------------------*/
+#define  MBMUX_CHANNEL_NUMBER  IPCC_CHANNEL_NUMBER
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported types ------------------------------------------------------------*/
+
+typedef enum
+{
+  MBMUX_CMD_RESP  = 0x00U,  /*!< Channel direction Tx is used by an MCU to transmit */
+  MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
+} MBMUX_ComType_t;
+
+/* Shared memory tables */
+
+typedef struct
+{
+  uint32_t MsgId;
+  void (*MsgCm4Cb)(void *ComObj);
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
+  uint16_t ParamCnt;     /*!<  nr of words composing the message */
+  uint32_t *ParamBuf;
+  uint32_t ReturnVal;    /*!<  only used in RX */
+} MBMUX_ComParam_t;
+
+typedef struct
+{
+  MBMUX_ComParam_t        MBCmdRespParam[MBMUX_CHANNEL_NUMBER];
+  MBMUX_ComParam_t        MBNotifAckParam[MBMUX_CHANNEL_NUMBER];
+  uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
+  __IO uint16_t           SynchronizeCpusAtBoot;
+  uint16_t                ChipRevId;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
new file mode 100644
index 00000000..b1050113
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
@@ -0,0 +1,237 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    msg_id.h
+  * @author  MCD Application Team
+  * @brief   MBMUX message ID enumeration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MSG_ID_H__
+#define __MSG_ID_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+typedef enum
+{
+  /* CmdResp */
+  SYS_GET_INFO_LIST_MSG_ID = 0,
+  SYS_REGISTER_FEATURE_MSG_ID,
+  /* NotifAck */
+  SYS_RTC_ALARM_MSG_ID,
+  SYS_OTHER_MSG_ID,
+  /* USER CODE BEGIN SYSTEM_MsgIdTypeDef */
+
+  /* USER CODE END SYSTEM_MsgIdTypeDef */
+  SYS_MSGID_LAST
+} SYSTEM_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  LMHANDLER_INITIALIZATION_ID = 0,
+  LMHANDLER_CONFIGURE_ID,
+  LMHANDLER_JOIN_STATUS_ID,
+  LMHANDLER_JOIN_ID,
+  LMHANDLER_STOP_ID,
+  LMHANDLER_SEND_ID,
+  LMHANDLER_PROCESS_ID,
+  LMHANDLER_REQUEST_CLASS_ID,
+  LMHANDLER_GET_CLASS_ID,
+  LMHANDLER_GET_DEVEUI_ID,
+  LMHANDLER_SET_DEVEUI_ID,
+  LMHANDLER_GET_APPEUI_ID,
+  LMHANDLER_SET_APPEUI_ID,
+  LMHANDLER_GET_NWKKEY_ID,
+  LMHANDLER_SET_NWKKEY_ID,
+  LMHANDLER_GET_APPKEY_ID,
+  LMHANDLER_SET_APPKEY_ID,
+  LMHANDLER_GET_NWKSKEY_ID,
+  LMHANDLER_SET_NWKSKEY_ID,
+  LMHANDLER_GET_APPSKEY_ID,
+  LMHANDLER_SET_APPSKEY_ID,
+  LMHANDLER_GET_NWKID_ID,
+  LMHANDLER_SET_NWKID_ID,
+  LMHANDLER_GET_DEVADDR_ID,
+  LMHANDLER_SET_DEVADDR_ID,
+  LMHANDLER_GET_ACTIVE_REGION_ID,
+  LMHANDLER_SET_ACTIVE_REGION_ID,
+  LMHANDLER_GET_ADR_ENABLE_ID,
+  LMHANDLER_SET_ADR_ENABLE_ID,
+  LMHANDLER_GET_TX_DATARATE_ID,
+  LMHANDLER_SET_TX_DATARATE_ID,
+  LMHANDLER_GET_DUTY_CYCLE_ID,
+  LMHANDLER_SET_DUTY_CYCLE_ID,
+  LMHANDLER_GET_RX2_PARAMS_ID,
+  LMHANDLER_GET_TX_PWR_ID,
+  LMHANDLER_GET_RX1_DELAY_ID,
+  LMHANDLER_GET_RX2_DELAY_ID,
+  LMHANDLER_GET_JOIN_RX1_DELAY_ID,
+  LMHANDLER_GET_JOIN_RX2_DELAY_ID,
+  LMHANDLER_SET_TX_PWR_ID,
+  LMHANDLER_SET_RX2_PARAMS_ID,
+  LMHANDLER_SET_RX1_DELAY_ID,
+  LMHANDLER_SET_RX2_DELAY_ID,
+  LMHANDLER_SET_JOIN_RX1_DELAY_ID,
+  LMHANDLER_SET_JOIN_RX2_DELAY_ID,
+  LMHANDLER_GET_PING_PERIODICITY_ID,
+  LMHANDLER_SET_PING_PERIODICITY_ID,
+  LMHANDLER_GET_BEACON_STATE_ID,
+  LMHANDLER_LINK_CHECK_REQ_ID,
+  LMHANDLER_DEVICE_TIME_REQ_ID,
+
+  LMHANDLER_INFO_INIT_ID,
+  /* NotifAck */
+  LMHANDLER_GET_BATTERY_LEVEL_CB_ID,
+  LMHANDLER_GET_TEMPERATURE_CB_ID,
+  LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID,
+  LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID,
+  LMHANDLER_ON_JOIN_REQ_CB_ID,
+  LMHANDLER_ON_TX_DATA_CB_ID,
+  LMHANDLER_ON_RX_DATA_CB_ID,
+  LMHANDLER_ON_CLASS_CHANGE_CB_ID,
+  LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID,
+  LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID,
+  LMHANDLER_ON_MAC_PROCESS_CB_ID,
+  /* USER CODE BEGIN LORA_MsgIdTypeDef */
+
+  /* USER CODE END LORA_MsgIdTypeDef */
+  LORA_MSGID_LAST
+} LORA_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  RADIO_INIT_ID = 0,
+  RADIO_GET_STATUS_ID,
+  RADIO_SET_MODEM_ID,
+  RADIO_SET_CHANNEL_ID,
+  RADIO_IS_CHANNEL_FREE_ID,
+  RADIO_RANDOM_ID,
+  RADIO_SET_RX_CONFIG_ID,
+  RADIO_SET_TX_CONFIG_ID,
+  RADIO_CHECK_RF_FREQUENCY_ID,
+  RADIO_GET_TIME_ON_AIR_ID,
+  RADIO_SEND_ID,
+  RADIO_SLEEP_ID,
+  RADIO_STANDBY_ID,
+  RADIO_RX_ID,
+  RADIO_START_CAD_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
+  RADIO_RSSI_ID,
+  RADIO_WRITE_ID,
+  RADIO_READ_ID,
+  RADIO_WRITE_BUFFER_ID,
+  RADIO_READ_BUFFER_ID,
+  RADIO_SET_MAX_PAYLOAD_LENGTH_ID,
+  RADIO_SET_PUBLIC_NETWORK_ID,
+  RADIO_GET_WAKEUP_TIME_ID,
+  RADIO_IRQ_PROCESS_ID,
+  RADIO_RX_BOOSTED_ID,
+  RADIO_SET_RX_DUTY_CYCLE_ID,
+  RADIO_TX_PRBS_ID,
+  RADIO_TX_CW_ID,
+  RADIO_SET_RX_GENERIC_CONFIG_ID,
+  RADIO_SET_TX_GENERIC_CONFIG_ID,
+  /* NotifAck */
+  RADIO_TX_DONE_CB_ID,
+  RADIO_TX_TIMEOUT_CB_ID,
+  RADIO_RX_DONE_CB_ID,
+  RADIO_RX_TIMEOUT_CB_ID,
+  RADIO_RX_ERROR_CB_ID,
+  RADIO_FHSS_CHANGE_CHANNEL_CB_ID,
+  RADIO_CAD_DONE_CB_ID,
+  /* USER CODE BEGIN RADIO_MsgIdTypeDef */
+
+  /* USER CODE END RADIO_MsgIdTypeDef */
+  RADIO_MSGID_LAST
+} RADIO_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  KMS_INIT_ID = 0,
+  KMS_OPEN_SESSION_ID,
+  KMS_CLOSE_SESSION_ID,
+  KMS_ENCRYPT_ID,
+  KMS_DECRYPT_ID,
+  KMS_DERIVE_KEY_ID,
+  KMS_CRYPTO_HMAC_SHA256_MSG_ID,
+  /* NotifAck */
+  /* USER CODE BEGIN KMS_MsgIdTypeDef */
+
+  /* USER CODE END KMS_MsgIdTypeDef */
+  KMS_MSGID_LAST
+} KMS_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  TRACE_SEND_MSG_ID = 0,
+  /* NotifAck */
+  /* USER CODE BEGIN Trace_MsgIdTypeDef */
+
+  /* USER CODE END Trace_MsgIdTypeDef */
+  TRACE_MSGID_LAST
+} Trace_MsgIdTypeDef;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* Dual core Init sequence */
+#define CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START  0xFFFF
+#define CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START    0x5555
+#define CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED    0xAAAA
+#define CPUS_BOOT_SYNC_RTC_REGISTERED         0x9999
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
new file mode 100644
index 00000000..d01a65d9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
@@ -0,0 +1,255 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.c
+  * @author  MCD Application Team
+  * @brief   Enables 4 debug pins for internal signals RealTime debugging
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sys_debug.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
+{
+  /* USER CODE BEGIN DBG_Init_1 */
+
+  /* USER CODE END DBG_Init_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull   = GPIO_PULLUP;
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
+#if defined(CORE_CM4)
+
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+#else /* CORE_CM0PLUS */
+
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
+
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /*spi dbg*/
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_SUBGHZSPI;
+  __HAL_RCC_GPIOA_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* Busy */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_12);
+  GPIO_InitStruct.Alternate  = GPIO_AF6_RF_BUSY;
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+#endif /* CORE_CM0PLUS */
+
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
+
+  /* USER CODE END DBG_ProbesInit_3 */
+
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
+
+  /* USER CODE END DBG_ProbesInit_Last */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
new file mode 100644
index 00000000..28890d05
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
@@ -0,0 +1,218 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.h
+  * @author  MCD Application Team
+  * @brief   Configuration of the debug.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_DEBUG_H__
+#define __SYS_DEBUG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sys_conf.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* Pin defines */
+
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
+#if defined(CORE_CM0PLUS)
+
+/**  Definition for Probe Line 1   **/
+/**
+  * @brief Pin of Probe Line 1
+  */
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
+
+/**
+  * @brief Port of Probe Line 1
+  */
+#define PROBE_LINE1_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 2   **/
+/**
+  * @brief Pin of Probe Line 2
+  */
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
+
+/**
+  * @brief Port of Probe Line 2
+  */
+#define PROBE_LINE2_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#else
+/**  Definition for Probe Line 3   **/
+/**
+  * @brief Pin of Probe Line 3
+  */
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
+
+/**
+  * @brief Port of Probe Line 3
+  */
+#define PROBE_LINE3_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 4   **/
+/**
+  * @brief Pin of Probe Line 4
+  */
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
+
+/**
+  * @brief Port of Probe Line 4
+  */
+#define PROBE_LINE4_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
+
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+
+/**
+  * @brief Set pin to high level
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+
+/**
+  * @brief Set pin to low level
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )
+
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#else
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
+  */
+void DBG_ProbesInit(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_DEBUG_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
new file mode 100644
index 00000000..0b613924
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
@@ -0,0 +1,387 @@
+/**
+  ******************************************************************************
+  * @file    system_stm32wlxx.c
+  * @author  MCD Application Team
+  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
+  *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  *   This file provides two functions and one global variable to be called from
+  *   user application:
+  *      - SystemInit(): This function is called at startup just after reset and
+  *                      before branch to main program. This call is made inside
+  *                      the "startup_stm32wlxx.s" file.
+  *
+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
+  *                                  by the user application to setup the SysTick
+  *                                  timer or configure other parameters.
+  *
+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
+  *                                 be called whenever the core clock is changed
+  *                                 during program execution.
+  *
+  *   After each device reset the MSI (4 MHz) is used as system clock source.
+  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
+  *   configure the system clock before to branch to main program.
+  *
+  *   This file configures the system clock as follows:
+  *=============================================================================
+  *-----------------------------------------------------------------------------
+  *        System Clock source                    | MSI
+  *-----------------------------------------------------------------------------
+  *        SYSCLK(Hz)                             | 4000000
+  *-----------------------------------------------------------------------------
+  *        HCLK(Hz)                               | 4000000
+  *-----------------------------------------------------------------------------
+  *        AHB Prescaler                          | 1
+  *-----------------------------------------------------------------------------
+  *        APB1 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        APB2 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_M                                  | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_N                                  | 8
+  *-----------------------------------------------------------------------------
+  *        PLL_P                                  | 7
+  *-----------------------------------------------------------------------------
+  *        PLL_Q                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLL_R                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_P                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_Q                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_R                              | NA
+  *-----------------------------------------------------------------------------
+  *        Require 48MHz for USB OTG FS,          | Disabled
+  *        SDIO and RNG clock                     |
+  *-----------------------------------------------------------------------------
+  *=============================================================================
+  */
+
+/** @addtogroup CMSIS
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_system
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_System_Private_Includes
+  * @{
+  */
+
+#include "stm32wlxx.h"
+
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (MSI_VALUE)
+   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
+#endif /* LSI_VALUE */
+
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Defines
+  * @{
+  */
+
+/* Note: Following vector table addresses must be defined in line with linker
+         configuration. */
+/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
+     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
+     at address 0x00 which correspond to automatic remap of boot address selected */
+/* #define USER_VECT_TAB_ADDRESS */
+#if defined(USER_VECT_TAB_ADDRESS)
+#ifdef CORE_CM0PLUS
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
+#else /* CORE_CM4 */
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+#endif
+#endif
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Variables
+  * @{
+  */
+  /* The SystemCoreClock variable is updated in three ways:
+      1) from within HAL_Init()
+      2) by calling CMSIS function SystemCoreClockUpdate()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
+  */
+  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
+
+  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
+
+  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
+
+  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
+    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Functions
+  * @{
+  */
+#if defined(__ARMCC_VERSION)
+extern void * __Vectors;
+#define INTVECT_START ((uint32_t) & __Vectors)
+#elif defined(__ICCARM__)
+extern uint32_t __vector_table;
+#define INTVECT_START ((uint32_t)& __vector_table)
+#elif defined(__GNUC__)
+extern void * g_pfnVectors;
+#define INTVECT_START ((uint32_t)& g_pfnVectors)
+#endif
+
+/**
+  * @brief  Setup the microcontroller system.
+  * @param  None
+  * @retval None
+  */
+void SystemInit(void)
+{
+  /* Configure the Vector Table location  ------------------*/
+  SCB->VTOR = INTVECT_START;
+
+  /* FPU settings ------------------------------------------------------------*/
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
+#endif
+
+  /* Reset the RCC clock configuration to the default reset state ------------*/
+  /* Set MSION bit */
+  RCC->CR |= RCC_CR_MSION;
+
+  /* Reset CFGR register */
+  RCC->CFGR = 0x00070000U;
+
+  /* Reset HSEON, CSSON , HSION, and PLLON bits */
+  /* RCC->CR &= 0xEAF6FFFFU; */
+  RCC->CR &= 0x2321EFF;
+
+  /* Reset PLLCFGR register */
+  RCC->PLLCFGR = 0x22040100;
+
+  /* Reset HSEBYP bit */
+  RCC->CR &= 0xFFDFFFFFFU;
+
+  /* Disable all interrupts */
+  RCC->CIER = 0x00000000U;
+}
+
+/**
+  * @brief  Update SystemCoreClock variable according to Clock Register Values.
+  *         The SystemCoreClock variable contains the core clock (HCLK), it can
+  *         be used by the user application to setup the SysTick timer or configure
+  *         other parameters.
+  *
+  * @note   Each time the core clock (HCLK) changes, this function must be called
+  *         to update SystemCoreClock variable value. Otherwise, any configuration
+  *         based on this variable will be incorrect.
+  *
+  * @note   - The system frequency computed by this function is not the real
+  *           frequency in the chip. It is calculated based on the predefined
+  *           constant and the selected clock source:
+  *
+  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
+  *
+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
+  *
+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
+  *
+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
+  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
+  *
+  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
+  *             4 MHz) but the real value may vary depending on the variations
+  *             in voltage and temperature.
+  *
+  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              16 MHz) but the real value may vary depending on the variations
+  *              in voltage and temperature.
+  *
+  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
+  *              frequency of the crystal used. Otherwise, this function may
+  *              have wrong result.
+  *
+  *         - The result of this function could be not correct when using fractional
+  *           value for HSE crystal.
+  *
+  * @param  None
+  * @retval None
+  */
+void SystemCoreClockUpdate(void)
+{
+  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
+
+ /* Get MSI Range frequency--------------------------------------------------*/
+
+   /* Get MSI Range frequency--------------------------------------------------*/
+   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
+   { /* MSISRANGE from RCC_CSR applies */
+     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
+   }
+   else
+   { /* MSIRANGE from RCC_CR applies */
+     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
+   }
+   /*MSI frequency range in HZ*/
+   msirange = MSIRangeTable[msirange];
+
+
+  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
+  /* Get SYSCLK source -------------------------------------------------------*/
+  switch (RCC->CFGR & RCC_CFGR_SWS)
+  {
+    case 0x00:   /* MSI used as system clock source */
+      SystemCoreClock = msirange;
+      break;
+
+    case 0x04:  /* HSI used as system clock source */
+      /* HSI used as system clock source */
+        SystemCoreClock = HSI_VALUE;
+      break;
+
+    case 0x08:  /* HSE used as system clock source */
+      SystemCoreClock = HSE_VALUE;
+      break;
+
+    case 0x0C: /* PLL used as system clock  source */
+      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
+         SYSCLK = PLL_VCO / PLLR
+         */
+      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
+      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
+
+      switch (pllsource)
+      {
+        case 0x02:  /* HSI used as PLL clock source */
+          pllvco = (HSI_VALUE / pllm);
+          break;
+
+        case 0x03:  /* HSE used as PLL clock source */
+          pllvco = (HSE_VALUE / pllm);
+          break;
+
+        default:    /* MSI used as PLL clock source */
+          pllvco = (msirange / pllm);
+          break;
+      }
+
+      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
+      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
+
+      SystemCoreClock = pllvco/pllr;
+      break;
+
+    default:
+      SystemCoreClock = msirange;
+      break;
+  }
+
+  /* Compute HCLK clock frequency --------------------------------------------*/
+#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
+  /* Get HCLK2 prescaler */
+  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
+#else
+  /* Get HCLK1 prescaler */
+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
+#endif
+
+  /* Core clock frequency */
+  SystemCoreClock = SystemCoreClock / tmp;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
new file mode 100644
index 00000000..8de99d5f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node_DualCore_CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
new file mode 100644
index 00000000..795a7e7a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
@@ -0,0 +1,1445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node_DualCore_CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM0PLUS</state>
+                    <state>KMS_ENABLED</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>CMSIS_NVIC_VIRTUAL</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/KMS/App</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/App</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/Target</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
+                    <state>$PROJ_DIR$/../Common/Board</state>
+                    <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>..\..\LoRaWAN_End_Node_DualCore_CM0Plus.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\LoRaWAN_End_Node_DualCore_CM0Plus.bin" 1 1"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\svc_handler.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <group>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\flash_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_privileged_services.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_privileged_wrap.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>KMS</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\fw_update_agent.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\frag_decoder_if.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Common\System\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Middlewares</name>
+        <group>
+            <name>LoRaWAN</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpPackagesRegistration.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\2_Images_SBSFU\EWARM\se_interface_appli.o</name>
+            </file>
+        </group>
+        <group>
+            <name>SubGHz_Phy</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Utilities</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
+        </file>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
new file mode 100644
index 00000000..4b1f218f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node_DualCore_CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
new file mode 100644
index 00000000..ceec3592
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
@@ -0,0 +1,1287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node_DualCore_CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM4/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM4/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM4/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../CM4/Core/Inc</state>
+                    <state>$PROJ_DIR$/../CM4/LoRaWAN/App</state>
+                    <state>$PROJ_DIR$/../CM4/LoRaWAN/Target</state>
+                    <state>$PROJ_DIR$/../CM4/MbMux</state>
+                    <state>$PROJ_DIR$/../Common/Board</state>
+                    <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>..\..\LoRaWAN_End_Node_DualCore_CM4.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\LoRaWAN_End_Node_DualCore_CM4.bin" 2 1"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM4.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <group>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\CayenneLpp.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Common\System\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Utilities</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
+        </file>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/Project.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/Project.eww
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/Project.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/svc_handler.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/EWARM/svc_handler.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/EWARM/svc_handler.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
new file mode 100644
index 00000000..79a52e0d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
@@ -0,0 +1,1525 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>LoRaWAN_End_Node_DualCore_CM0PLUS</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_CM0+.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U002F003A3038510534333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\svc_handler.s</PathWithFileName>
+      <FilenameWithoutPath>svc_handler.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\LoRaWAN\App\app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\LoRaWAN\App\lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\LoRaWAN\App\fw_update_agent.c</PathWithFileName>
+      <FilenameWithoutPath>fw_update_agent.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\LoRaWAN\Target\frag_decoder_if.c</PathWithFileName>
+      <FilenameWithoutPath>frag_decoder_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\KMS\App\app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\sys_privileged_services.c</PathWithFileName>
+      <FilenameWithoutPath>sys_privileged_services.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\sys_privileged_wrap.c</PathWithFileName>
+      <FilenameWithoutPath>sys_privileged_wrap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\features_info.c</PathWithFileName>
+      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\lora_info.c</PathWithFileName>
+      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_lora.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Common\System\sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>54</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>12</GroupNumber>
+      <FileNumber>55</FileNumber>
+      <FileType>3</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</PathWithFileName>
+      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/LoRaWAN</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>56</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>57</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</PathWithFileName>
+      <FilenameWithoutPath>NvmDataMgmt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>58</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>59</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</PathWithFileName>
+      <FilenameWithoutPath>FragDecoder.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>60</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpPackagesRegistration.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpPackagesRegistration.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>61</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpClockSync.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>62</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpFirmwareManagement.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>63</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpFragmentation.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>64</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpRemoteMcastSetup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>65</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</PathWithFileName>
+      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>66</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</PathWithFileName>
+      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>67</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</PathWithFileName>
+      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>68</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</PathWithFileName>
+      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>69</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>70</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>71</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>72</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>73</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>74</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>75</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>76</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</PathWithFileName>
+      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>77</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</PathWithFileName>
+      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>78</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</PathWithFileName>
+      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>79</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>80</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>81</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>82</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>83</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>84</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>85</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>86</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>87</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>88</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</PathWithFileName>
+      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>89</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</PathWithFileName>
+      <FilenameWithoutPath>RegionBaseUS.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/SubGHz_Phy</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>90</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>91</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>92</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>93</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>94</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>95</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>96</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>97</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>98</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>99</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>100</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
new file mode 100644
index 00000000..a2d5d6b4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
@@ -0,0 +1,993 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>LoRaWAN_End_Node_DualCore_CM0PLUS</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM0PLUS\</OutputDirectory>
+          <OutputName>LoRaWAN_End_Node_DualCore_CM0PLUS</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP</SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>1</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x2000c000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM0PLUS,KMS_ENABLED,USE_HAL_DRIVER,STM32WL55xx,DISABLE_IMAGE_STATE_HANDLING,CMSIS_NVIC_VIRTUAL</Define>
+              <Undefine></Undefine>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../Linker_Common/MDK-ARM;../../2_Images_SECoreBin/Inc;../../2_Images_SBSFU/Common;../../2_Images_SBSFU/CM0PLUS/SBSFU/App</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>stm32wl55xx_flash_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+            <File>
+              <FileName>svc_handler.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\svc_handler.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_lorawan.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\LoRaWAN\App\app_lorawan.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\LoRaWAN\App\lora_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>fw_update_agent.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\LoRaWAN\App\fw_update_agent.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_board_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>frag_decoder_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\LoRaWAN\Target\frag_decoder_if.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\KMS\App\app_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\main.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\ipcc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\sys_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>timer_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\timer_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>flash_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\flash_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_privileged_services.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\sys_privileged_services.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_privileged_wrap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\sys_privileged_wrap.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
+          <Files>
+            <File>
+              <FileName>features_info.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\features_info.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_info.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\lora_info.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmHandler_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmux.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmux.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_lora.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmuxif_lora.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmuxif_radio.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_sys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmuxif_sys.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmuxif_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\radio_mbwrapper.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Common\System\sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_appli.txt</FileName>
+              <FileType>3</FileType>
+              <FilePath>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/LoRaWAN</GroupName>
+          <Files>
+            <File>
+              <FileName>LmHandler.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</FilePath>
+            </File>
+            <File>
+              <FileName>NvmDataMgmt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpCompliance.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</FilePath>
+            </File>
+            <File>
+              <FileName>FragDecoder.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\FragDecoder.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpPackagesRegistration.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpPackagesRegistration.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpClockSync.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpClockSync.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpFirmwareManagement.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFirmwareManagement.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpFragmentation.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpFragmentation.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpRemoteMcastSetup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpRemoteMcastSetup.c</FilePath>
+            </File>
+            <File>
+              <FileName>cmac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</FilePath>
+            </File>
+            <File>
+              <FileName>lorawan_aes.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</FilePath>
+            </File>
+            <File>
+              <FileName>soft-se.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</FilePath>
+            </File>
+            <File>
+              <FileName>Region.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionAS923.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionAU915.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCN470.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCN779.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCommon.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionEU433.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionEU868.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionIN865.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionKR920.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionRU864.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionUS915.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacAdr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacClassB.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCommands.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCrypto.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacParser.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacSerializer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</FilePath>
+            </File>
+            <File>
+              <FileName>utilities.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionBaseUS.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/SubGHz_Phy</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_driver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32_adv_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_systime.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="LoRaWAN_End_Node_DualCore_CM0PLUS"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
new file mode 100644
index 00000000..ff60514f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
@@ -0,0 +1,969 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>LoRaWAN_End_Node_DualCore_CM4</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U-O142 -O2766 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Common\System\sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\LoRaWAN\App\app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\LoRaWAN\App\CayenneLpp.c</PathWithFileName>
+      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\LoRaWAN\App\lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\sys_sensors.c</PathWithFileName>
+      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\LmHandler_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmuxif_lora.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>54</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>55</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>56</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>57</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
new file mode 100644
index 00000000..e2c18723
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
@@ -0,0 +1,753 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>LoRaWAN_End_Node_DualCore_CM4</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM4\</OutputDirectory>
+          <OutputName>LoRaWAN_End_Node_DualCore_CM4</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 2 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>1</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x20008000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>stm32wl55xx_flash_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Common\System\sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_lorawan.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\LoRaWAN\App\app_lorawan.c</FilePath>
+            </File>
+            <File>
+              <FileName>CayenneLpp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\LoRaWAN\App\CayenneLpp.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\LoRaWAN\App\lora_app.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\main.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\ipcc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\sys_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_sensors.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\sys_sensors.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\adc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>timer_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\timer_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\usart_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\usart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\stm32wlxx_hal_msp.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
+          <Files>
+            <File>
+              <FileName>LmHandler_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\LmHandler_mbwrapper.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmux.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmux.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_lora.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmuxif_lora.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmuxif_radio.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_sys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmuxif_sys.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmuxif_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\radio_mbwrapper.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_adc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32_adv_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_systime.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="LoRaWAN_End_Node_DualCore_CM4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw
new file mode 100644
index 00000000..7b19045d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectWorkspace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_mpw.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <WorkspaceName></WorkspaceName>
+
+  <project>
+    <PathAndName>.\LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx</PathAndName>
+    <NodeIsActive>1</NodeIsActive>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+  <project>
+    <PathAndName>.\LoRaWAN_End_Node_DualCore_CM4.uvprojx</PathAndName>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+</ProjectWorkspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_CM0+.ini b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_CM0+.ini
new file mode 100644
index 00000000..d3f0855b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_CM0+.ini
@@ -0,0 +1,23 @@
+/******************************************************************************/
+/* STM32WL_CM0+.INI: CM0 CPU Initialization File                                           
+/******************************************************************************/
+/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
+/* * All rights reserved.</center>*/
+/*  *
+/*  * This software component is licensed by ST under BSD 3-Clause license,*/
+/*  * the "License"; You may not use this file except in compliance with the */
+/*  * License. You may obtain a copy of the License at:*/
+/*  *                        opensource.org/licenses/BSD-3-Clause*/
+/*  *
+/*  ****************************************************************************/
+/******************************************************************************/
+
+FUNC void Setup (void) {
+  SP = _RDWORD(0x08022200);          // Setup Stack Pointer
+  PC = _RDWORD(0x08022204);          // Setup Program Counter
+   
+}
+
+Setup();                             // Setup for Running
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..41780b4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,259 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1000
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x400
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                     ; Top of Stack
+                DCD     Reset_Handler                    ; Reset Handler
+                DCD     NMI_Handler                      ; NMI Handler
+                DCD     HardFault_Handler                ; Hard Fault Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     SVC_Handler                      ; SVCall Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     PendSV_Handler                   ; PendSV Handler
+                DCD     SysTick_Handler                  ; SysTick Handler
+
+                ; External Interrupts                    
+                DCD     TZIC_ILA_IRQHandler              ; Security Interrupt controller illegal access Interrupts
+                DCD     PVD_PVM_IRQHandler               ; PVD and PVM detector
+                DCD     RTC_LSECSS_IRQHandler            ; RTC Wakeup + RTC Tamper and TimeStamp + RTC Alarms (A & B) + SSR Underflow and LSECSS Interrupts
+                DCD     RCC_FLASH_C1SEV_IRQHandler       ; RCC1 and FLASH and CPU1 M4 SEV Interrupts
+                DCD     EXTI1_0_IRQHandler               ; EXTI Line 1:0 Interrupts
+                DCD     EXTI3_2_IRQHandler               ; XTI Line 3:2 Interrupts
+                DCD     EXTI15_4_IRQHandler              ; EXTI Line 15:4 interrupts
+                DCD     ADC_COMP_DAC_IRQHandler          ; ADC, COMP1, COMP2, DAC Interrupts
+                DCD     DMA1_Channel1_2_3_IRQHandler     ; DMA1 Channel 1 to 3 Interrupts
+                DCD     DMA1_Channel4_5_6_7_IRQHandler   ; DMA1 Channels 4, 5, 6, 7 Interrupts
+                DCD     DMA2_DMAMUX1_OVR_IRQHandler      ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+                DCD     LPTIM1_IRQHandler                ; LPTIM1 global Interrupt
+                DCD     LPTIM2_IRQHandler                ; LPTIM2 global Interrupt
+                DCD     LPTIM3_IRQHandler                ; LPTIM3 global Interrupt
+                DCD     TIM1_IRQHandler                  ; TIM1 Interrupt
+                DCD     TIM2_IRQHandler                  ; TIM2 Interrupt
+                DCD     TIM16_IRQHandler                 ; TIM16 Interrupt
+                DCD     TIM17_IRQHandler                 ; TIM17 Interrupt
+                DCD     IPCC_C2_RX_C2_TX_IRQHandler      ; IPCC RX Occupied and TX Free Interrupt Interrupts
+                DCD     HSEM_IRQHandler                  ; Semaphore Interrupt
+                DCD     RNG_IRQHandler                   ; RNG Interrupt
+                DCD     AES_PKA_IRQHandler               ; AES and PKA Interrupts
+                DCD     I2C1_IRQHandler                  ; I2C1 Event and Error Interrupt
+                DCD     I2C2_IRQHandler                  ; I2C2 Event and Error Interrupt
+                DCD     I2C3_IRQHandler                  ; I2C3 Event and Error Interrupt
+                DCD     SPI1_IRQHandler                  ; SPI1 Interrupts
+                DCD     SPI2_IRQHandler                  ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                ; USART1 Interrupt
+                DCD     USART2_IRQHandler                ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler               ; LPUART1 Interrupt
+                DCD     SUBGHZSPI_IRQHandler             ; SUBGHZSPI Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler          ; SUBGHZ Radio Interrupt
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+                EXPORT  TZIC_ILA_IRQHandler            [WEAK]
+                EXPORT  PVD_PVM_IRQHandler             [WEAK]
+                EXPORT  RTC_LSECSS_IRQHandler          [WEAK]
+                EXPORT  RCC_FLASH_C1SEV_IRQHandler     [WEAK]
+                EXPORT  EXTI1_0_IRQHandler             [WEAK]
+                EXPORT  EXTI3_2_IRQHandler             [WEAK]
+                EXPORT  EXTI15_4_IRQHandler            [WEAK]
+                EXPORT  ADC_COMP_DAC_IRQHandler        [WEAK]
+                EXPORT  DMA1_Channel1_2_3_IRQHandler   [WEAK]
+                EXPORT  DMA1_Channel4_5_6_7_IRQHandler [WEAK]
+                EXPORT  DMA2_DMAMUX1_OVR_IRQHandler    [WEAK]
+                EXPORT  LPTIM1_IRQHandler              [WEAK]
+                EXPORT  LPTIM2_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler              [WEAK]
+                EXPORT  TIM1_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                [WEAK]
+                EXPORT  TIM16_IRQHandler               [WEAK]
+                EXPORT  TIM17_IRQHandler               [WEAK]
+                EXPORT  IPCC_C2_RX_C2_TX_IRQHandler    [WEAK]
+                EXPORT  HSEM_IRQHandler                [WEAK]
+                EXPORT  RNG_IRQHandler                 [WEAK]
+                EXPORT  AES_PKA_IRQHandler             [WEAK]
+                EXPORT  I2C1_IRQHandler                [WEAK]
+                EXPORT  I2C2_IRQHandler                [WEAK]
+                EXPORT  I2C3_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                [WEAK]
+                EXPORT  SPI2_IRQHandler                [WEAK]
+                EXPORT  USART1_IRQHandler              [WEAK]
+                EXPORT  USART2_IRQHandler              [WEAK]
+                EXPORT  LPUART1_IRQHandler             [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler           [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler        [WEAK]
+
+TZIC_ILA_IRQHandler
+PVD_PVM_IRQHandler
+RTC_LSECSS_IRQHandler
+RCC_FLASH_C1SEV_IRQHandler
+EXTI1_0_IRQHandler
+EXTI3_2_IRQHandler
+EXTI15_4_IRQHandler
+ADC_COMP_DAC_IRQHandler
+DMA1_Channel1_2_3_IRQHandler
+DMA1_Channel4_5_6_7_IRQHandler
+DMA2_DMAMUX1_OVR_IRQHandler   
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+LPTIM3_IRQHandler
+TIM1_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+IPCC_C2_RX_C2_TX_IRQHandler
+HSEM_IRQHandler
+RNG_IRQHandler
+AES_PKA_IRQHandler
+I2C1_IRQHandler
+I2C2_IRQHandler
+I2C3_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler
+USART2_IRQHandler
+LPUART1_IRQHandler
+SUBGHZSPI_IRQHandler
+SUBGHZ_Radio_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..efa16135
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,371 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1000
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x400
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/svc_handler.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/LoRaWAN_End_Node_DualCore/MDK-ARM/svc_handler.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/svc_handler.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project
new file mode 100644
index 00000000..5e46a3b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LoRaWAN_End_Node_DualCore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
+		</link>
+	</linkedResources>
+	<filteredResources>
+		<filter>
+			<id>1602235241059</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.launch</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject
new file mode 100644
index 00000000..836eb05c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.418944704" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.654776557" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1874734359" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1576074843" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1690314232" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1876101242" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1222976036" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.536306606" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/LoRaWAN/App | ../../../CM0PLUS/LoRaWAN/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1888072462" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.724313685" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1913635198" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.192075519" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1692640247" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1440672287" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.893305291" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1496750499" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1110902416" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1948481739" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CMSIS_NVIC_VIRTUAL"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.618696617" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/Target"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/Board"/>
+									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.666846704" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.953216962" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1637192753" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1135192748" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1111776382" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1687592588" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1317420169" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.486355893" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.2119440973" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.487093524" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs">
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1632142608" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1921454185" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1163404519" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1466554349" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.784128254" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.458897427" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.972068633" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.517495896" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.746122958" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1212314533" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2044476129" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="LoRaWAN_End_Node_DualCore_CM0PLUS.null.1142642603" name="LoRaWAN_End_Node_DualCore_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.893305291;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.666846704">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project
new file mode 100644
index 00000000..feace794
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project
@@ -0,0 +1,519 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LoRaWAN_End_Node_DualCore_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/flash_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/flash_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_privileged_services.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_privileged_services.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_privileged_wrap.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_privileged_wrap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/timer_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/LmHandler_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/features_info.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/lora_info.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/lora_info.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmux.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_lora.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_lora.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/FragDecoder.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/FragDecoder.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmHandler.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpClockSync.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpClockSync.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpCompliance.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpFirmwareManagement.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFirmwareManagement.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpFragmentation.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpFragmentation.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpPackagesRegistration.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpPackagesRegistration.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpRemoteMcastSetup.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpRemoteMcastSetup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMac.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacAdr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacClassB.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCommands.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacConfirmQueue.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCrypto.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacParser.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacSerializer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/NvmDataMgmt.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/Region.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAS923.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAU915.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionBaseUS.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN470.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN779.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCommon.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU433.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU868.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionIN865.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionKR920.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionRU864.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionUS915.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/cmac.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/lorawan_aes.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/soft-se.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/utilities.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_fw.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/KMS/App/app_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/KMS/App/app_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/app_lorawan.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/fw_update_agent.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/fw_update_agent.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/lora_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/lora_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/Target/frag_decoder_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/Target/frag_decoder_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/Target/radio_board_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/Target/radio_board_if.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..f98fb740
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,328 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm0plus.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M0+ vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M0+ processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m0plus
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
+
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
+
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
+
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M0+ vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	0
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	TZIC_ILA_IRQHandler                  			/* TZIC ILA Interrupt                                 */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	RTC_LSECSS_IRQHandler                			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RCC_FLASH_C1SEV_IRQHandler           			/* RCC and FLASH and CPU1 M4 SEV Interrupt            */
+  .word	EXTI1_0_IRQHandler                   			/* EXTI Line 1:0 Interrupt                            */
+  .word	EXTI3_2_IRQHandler                   			/* EXTI Line 3:2 Interrupt                            */
+  .word	EXTI15_4_IRQHandler                  			/* EXTI Line 15:4 interrupt                           */
+  .word	ADC_COMP_DAC_IRQHandler              			/* ADC, COMP1, COMP2, DAC Interrupt                   */
+  .word	DMA1_Channel1_2_3_IRQHandler         			/* DMA1 Channel 1 to 3 Interrupt                      */
+  .word	DMA1_Channel4_5_6_7_IRQHandler       			/* DMA1 Channels 4,5,6,7 Interrupt                    */
+  .word	DMA2_DMAMUX1_OVR_IRQHandler          			/* DMA2 Channels[1..7] and DMAMUX Overrun Interrupts  */
+  .word	LPTIM1_IRQHandler                    			/* LPTIM1 Global Interrupt                            */
+  .word	LPTIM2_IRQHandler                    			/* LPTIM2 Global Interrupt                            */
+  .word	LPTIM3_IRQHandler                    			/* LPTIM3 Global Interrupt                            */
+  .word	TIM1_IRQHandler                      			/* TIM1 Global Interrupt                              */
+  .word	TIM2_IRQHandler                      			/* TIM2 Global Interrupt                              */
+  .word	TIM16_IRQHandler                     			/* TIM16 Global Interrupt                             */
+  .word	TIM17_IRQHandler                     			/* TIM17 Global Interrupt                             */
+  .word	IPCC_C2_RX_C2_TX_IRQHandler          			/* IPCC RX Occupied and TX Free Interrupt Interrupt   */
+  .word	HSEM_IRQHandler                      			/* Semaphore Interrupt                                */
+  .word	RNG_IRQHandler                       			/* RNG Interrupt                                      */
+  .word	AES_PKA_IRQHandler                   			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	I2C1_IRQHandler                      			/* I2C1 Event and Error Interrupt                     */
+  .word	I2C2_IRQHandler                      			/* I2C2 Event and Error Interrupt                     */
+  .word	I2C3_IRQHandler                      			/* I2C3 Event and Error Interrupt                     */
+  .word	SPI1_IRQHandler                      			/* SPI1 Interrupt                                     */
+  .word	SPI2_IRQHandler                      			/* SPI2 Interrupt                                     */
+  .word	USART1_IRQHandler                    			/* USART1 Interrupt                                   */
+  .word	USART2_IRQHandler                    			/* USART2 Interrupt                                   */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 Interrupt                                  */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI Interrupt                                */
+  .word	SUBGHZ_Radio_IRQHandler              			/* SUBGHZ Radio Interrupt                             */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	TZIC_ILA_IRQHandler
+	.thumb_set TZIC_ILA_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	RTC_LSECSS_IRQHandler
+	.thumb_set RTC_LSECSS_IRQHandler,Default_Handler
+
+	.weak	RCC_FLASH_C1SEV_IRQHandler
+	.thumb_set RCC_FLASH_C1SEV_IRQHandler,Default_Handler
+
+	.weak	EXTI1_0_IRQHandler
+	.thumb_set EXTI1_0_IRQHandler,Default_Handler
+
+	.weak	EXTI3_2_IRQHandler
+	.thumb_set EXTI3_2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_4_IRQHandler
+	.thumb_set EXTI15_4_IRQHandler,Default_Handler
+
+	.weak	ADC_COMP_DAC_IRQHandler
+	.thumb_set ADC_COMP_DAC_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_2_3_IRQHandler
+	.thumb_set DMA1_Channel1_2_3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_5_6_7_IRQHandler
+	.thumb_set DMA1_Channel4_5_6_7_IRQHandler,Default_Handler
+
+	.weak	DMA2_DMAMUX1_OVR_IRQHandler
+	.thumb_set DMA2_DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	TIM1_IRQHandler
+	.thumb_set TIM1_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	IPCC_C2_RX_C2_TX_IRQHandler
+	.thumb_set IPCC_C2_RX_C2_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	AES_PKA_IRQHandler
+	.thumb_set AES_PKA_IRQHandler,Default_Handler
+
+	.weak	I2C1_IRQHandler
+	.thumb_set I2C1_IRQHandler,Default_Handler
+
+	.weak	I2C2_IRQHandler
+	.thumb_set I2C2_IRQHandler,Default_Handler
+
+	.weak	I2C3_IRQHandler
+	.thumb_set I2C3_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s
new file mode 100644
index 00000000..282425f8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s
@@ -0,0 +1,29 @@
+/**
+  ******************************************************************************
+  * @file      svc_handler.s
+  * @author    MCD Application Team
+  * @brief     Wrapper for SE isolation with MPU.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+        .section  .text,"ax",%progbits
+        .syntax unified
+        .weak  SVC_APP_Handler
+        .global SVC_Handler
+        .type  SVC_Handler, %function
+SVC_Handler:
+        MRS r0, PSP
+        PUSH {LR}
+        BL SVC_APP_Handler
+        POP {PC}
+.end
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..ac7c7d9f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,222 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes ROM
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x400 ; /* required amount of heap  */
+_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_1_start + 0x200), LENGTH = (SLOT_Active_1_end - SLOT_Active_1_start + 1 - 0x200)
+  APPLI_RAM  (xrw)   : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+  RAM_SHARED (xrw)   : ORIGIN = M0PLUS_SHARED_region_RAM_start, LENGTH = M0PLUS_SHARED_region_RAM_size
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .SE_IF_Code : {
+    . = ALIGN(4);
+    KEEP(*se_interface_app.o (.text .text*))
+    KEEP(*se_interface_kms.o (.text .text*))
+    . = ALIGN(4);
+  } >SE_IF_ROM_region
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(4);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(4);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> APPLI_ROM
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject
new file mode 100644
index 00000000..cef317b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;2&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.517486696" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1356036104" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1268685116" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1248418525" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1808427656" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.382555478" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1703274790" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1521328444" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/LoRaWAN/App | ../../../CM4/LoRaWAN/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.250785634" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1250379993" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.139407144" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1004201975" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1591281622" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1311170738" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.496130607" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1215135408" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.113915788" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2108990883" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/App"/>
+									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/Target"/>
+									<listOptionValue builtIn="false" value="../../../CM4/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/Board"/>
+									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.626620308" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.951856085" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1502513653" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1711642259" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1109291067" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1942134771" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.642285922" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1036786702" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2114345391" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.329733135" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.879204678" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.850746118" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1010421103" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.137229566" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1379722875" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.775419959" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1300891610" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.238350608" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="LoRaWAN_End_Node_DualCore_CM4.null.1358162801" name="LoRaWAN_End_Node_DualCore_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1311170738;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.626620308">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project
new file mode 100644
index 00000000..0c71cd69
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LoRaWAN_End_Node_DualCore_CM4</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/adc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/adc_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/dma.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/dma.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_app.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_sensors.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_sensors.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/timer_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/timer_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/LmHandler_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmux.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmux.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_lora.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_lora.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sys.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/CayenneLpp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/CayenneLpp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/app_lorawan.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/lora_app.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/lora_app.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..af218d28
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,461 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
+
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
+
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
+
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..682e3abc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,223 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes ROM
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x400 ; /* required amount of heap  */
+_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_2_start + 0x200), LENGTH = (SLOT_Active_2_end - SLOT_Active_2_start + 1 - 0x200)
+  APPLI_RAM  (xrw)   : ORIGIN = M4_APP_region_RAM_start, LENGTH = M4_APP_region_RAM_size
+  RAM_SHARED (xrw)   : ORIGIN = M4_SHARED_region_RAM_start, LENGTH = M4_SHARED_region_RAM_size
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+    
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/readme.txt
new file mode 100644
index 00000000..50b04347
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/readme.txt
@@ -0,0 +1,273 @@
+/**
+  @page LoRaWAN_End_Node_DualCore Readme file
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
+  * @file    Applications/LoRaWAN_FUOTA_DualCore/LoRaWAN_End_Node_DualCore/readme.txt
+  * @author  MCD Application Team
+  * @brief   This application is a simple demo application software of a LoRa
+  *          modem connecting to Network server. with firmware update over the air download capabilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Description
+
+This directory contains a set of source files that implements a Dual Core (CM4 / CM0) LoRa application
+device with firmware update over the air download capabilities.
+
+For more details, refer to AN5554 "LoRaWAN firmware update over the air with STM32CubeWL" available from
+the STMicroelectronics microcontroller website www.st.com.
+
+This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
+  ******************************************************************************
+
+@par Keywords
+
+Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, FUOTA, SBSFU, KMS
+
+@par Directory contents
+
+
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h             Maps the NVIC functions on _SVC for Unpriviledge usage
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/flash_if.h                       This file contains definitions for FLASH Interface functionalities.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h                           This file contains all the function prototypes for
+                                                                                the ipcc.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h                        This file contains the interface of the ipcc driver on CM0PLUS.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h                         This file contains kms interfaces with middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h                           : Header for main.c file.
+                                                                                This file contains the common defines of the application.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h                       Header for General HW instances configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h                            This file contains all the function prototypes for
+                                                                                the rtc.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             HAL configuration file.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h                   This file contains the headers of the interrupt handlers.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h                   Header for Low Power Manager interface configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h                         This file contains all the function prototypes for
+                                                                                the subghz.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h                        Function prototypes for sys_app.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h                       Applicative configuration, e.g. : debug, trace, low power, sensors
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h        Maps sys_privileged_wrap functions on SVC and API to cortex services
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h            This file contains all the function prototypes for
+                                                                                the sys_privileged_wrap.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h                       configuration of the timer_if.c instances
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h                 Header for configuration file to utilities
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h                  Definitions for modules requiring utilities
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h                         !!! No description found !!!
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h                 Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h               End-device commissioning parameters
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/fw_update_agent.h             This file provides set of functions to manage Firmware Update functionalities.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h                    Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h            Definition the version of the CM0PLUS application
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h                 Secure Element identity and keys
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/frag_decoder_if.h          Applicative interfaces of LoRa-Alliance fragmentation decoder
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h             Header for LoRaWAN middleware instances
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h              Configure (enable/disable) traces for CM0
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h           Header for Radio interface configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h               Header of Radio configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h                  Map middleware systime
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h                    Wrapper to timer server
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h               This file implements the CM0PLUS side wrapper of the LmHandler
+                                                                                interface shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h                             API which interfaces CM0PLUS to IPCC
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h                      API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                     API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                       API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                     API for CM0PLUS application to register and handle TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                   This file implements the CM0PLUS side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h                                This file contains all the function prototypes for
+                                                                                the adc.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h                             Header for ADC interface configuration
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h                                This file contains all the function prototypes for
+                                                                                the dma.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h                               This file contains all the function prototypes for
+                                                                                the ipcc.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h                            This file contains the interface of the ipcc driver on CM4.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h                               : Header for main.c file.
+                                                                                This file contains the common defines of the application.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h                           Header for General HW instances configuration
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h                 HAL configuration file.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h                       This file contains the headers of the interrupt handlers.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h                       Header for Low Power Manager interface configuration
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h                            Function prototypes for sys_app.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h                           Applicative configuration, e.g. : debug, trace, low power, sensors
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h                        Header for sensors application
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h                           configuration of the timer_if.c instances
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h                              This file contains all the function prototypes for
+                                                                                the usart.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h                           Header for USART interface configuration
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h                     Header for configuration file to utilities
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h                      Definitions for modules requiring utilities
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h                     Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h                      Implements the Cayenne Low Power Protocol
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h                        Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h                Definition the version of the CM4 application
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h                 Header for LoRaWAN middleware instances
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h                      Map middleware systime
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h                        Wrapper to timer server
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h                   This file implements the CM4 side wrapper of the LmHandler
+                                                                                interface shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h                                 API which interfaces CM4 to IPCC
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h                          API provided to CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h                         API for CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h                           API for CM4 application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h                         API for CM4 application to register and handle TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h                       This file implements the CM4 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h              STM32WLxx_Nucleo board configuration file.
+  - LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h                      Feature list and parameters TypeDefinitions
+  - LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h                          To give info to the application about LoRaWAN configuration
+  - LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h                        Maps the IPCC channels to memory buffers
+  - LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h                             MBMUX message ID enumeration
+  - LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h                         Configuration of the debug.c instances
+
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/flash_if.c                       This file provides set of firmware functions to manage Flash
+                                                                                Interface functionalities.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c                           This file provides code for the configuration
+                                                                                of the IPCC instances.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c                        Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c                           : Main program body
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c                            This file provides code for the configuration
+                                                                                of the RTC instances.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                   Interrupt Service Routines.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                   Low layer function to enter/exit low power modes (stop, sleep)
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c                         This file provides code for the configuration
+                                                                                of the SUBGHZ instances.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c                        Initializes HW and SW system entities (not related to the radio)
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c        gives access to COrtex services like ThumbState, SVC, MPU
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c            Wrapper functions to call SVC when in Unprivilege mode
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c                       Configure RTC Alarm, Tick and Calendar manager
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c                         !!! No description found !!!
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c                 Application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/fw_update_agent.c             This file provides set of functions to manage Firmware Update functionalities.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c                    Application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/frag_decoder_if.c          Implements the Data Distribution Agent
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c           This file provides an interface layer between MW and Radio Board
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c                     CM0PLUS supported features list
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c               This file implements the CM0PLUS side wrapper of the LoraMac interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c                         To give info to the application about LoRaWAN configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c                             Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c                      allows CM0 application to register and handle LoraWAN to MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                     allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                       allows CM0 application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                     Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                   This file implements the CM0 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c                                This file provides code for the configuration
+                                                                                of the ADC instances.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c                             Read status related to the chip (battery level, VREF, chip temperature)
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c                                This file provides code for the configuration
+                                                                                of all the requested memory to memory DMA transfers.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c                               This file provides code for the configuration
+                                                                                of the IPCC instances.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c                            Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c                               : Main program body
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c                  This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c                       Interrupt Service Routines.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c                       Low layer function to enter/exit low power modes (stop, sleep)
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c                            Initializes HW and SW system entities (not related to the radio)
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c                        Manages the sensors on the application
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c                           Configure RTC Alarm, Tick and Calendar manager
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c                              This file provides code for the configuration
+                                                                                of the USART instances.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c                           Configuration of UART driver interface for hyperterminal communication
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c                     Application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c                      Implements the Cayenne Low Power Protocol
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c                        Application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c                   This file implements the CM4 side wrapper of the LoraMac interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c                                 CM4 side multiplexer to map features to IPCC channels
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c                          allows CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c                         allows CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c                           allows CM4 application to handle the SYSTEM MBMUX channel.
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c                         allows CM4 application to receive by CM0 TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c                       This file implements the CM4 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c                  CMSIS Cortex Device Peripheral Access Layer System Source File
+  - LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c                         Enables 4 debug pins for internal signals RealTime debugging
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c STM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c   STM32CubeIDE System Memory calls file
+
+
+@par Hardware and Software environment
+
+  - This example runs on the STM32WLxx Nucleo board.
+
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
+      to ST-LINK connector.
+    - Please ensure that the ST-LINK connector jumpers are fitted.
+
+  - Configure the software via the configuration files:
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, main.h, etc
+    - CM4 (Lora application)
+        - sys_conf.h, lora_app.h, nucleo_conf.h, main.h, etc
+    - Careful:
+        - the region and class chosen on CM4/LoRaWAN/App/lora_app.h shall be compatible with CM0PLUS/LoRaWAN/Target/lorawan_conf.h list
+
+  -Set Up:
+
+             --------------------------  V    V  --------------------------
+             |      LoRa Object       |  |    |  |      LoRa Network      |
+             |                        |  |    |  |                        |
+   ComPort<--|                        |--|    |--|                        |-->Web Server
+             |                        |          |                        |
+             --------------------------          --------------------------
+
+@par How to use it ?
+In order to make the program work, you must do the following :
+  - use the script \Scripts\<MyPreferredToolchain>\build.bat to rebuild the SBSFU and the LoRaWAN projects
+  - use the script \Scripts\<MyPreferredToolchain>\program.bat to download the big binary on target device
+  - Reset the system (two cores)
+  - Run the example
+  - Open a Terminal, connected the LoRa Object
+  - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
+
+@par How to debug ?
+  - change or undefine following definitions in above files:
+    - in ..\2_Images_SBSFU\CM0PLUS\app_sfu.h
+      /*#define SFU_RDP_PROTECT_ENABLE*/
+      /*#define SFU_C2SWDBG_PROTECT_ENABLE*/
+    - in ..\2_Images_SBSFU\Common\app_sfu_common.h
+      /*#define SFU_DAP_PROTECT_ENABLE*/
+      /*#define SFU_C2_DDS_PROTECT_ENABLE*/
+      #define SFU_HIDE_PROTECTION_CFG OB_SECURE_HIDE_PROTECTION_DISABLE
+    - in .\LoRaWAN_End_Node_DualCore\CM4\Core\Inc\sys_conf.h
+      #define DEBUGGER_ENABLED   1   to debug CM4
+      #define LOW_POWER_DISABLE   1  at least on one MCU (CM4 or CM0PUS)
+    - in .\LoRaWAN_End_Node_DualCore\CM0PLUS\Core\Inc\sys_conf.h
+      #define DEBUGGER_ENABLED   1   to debug CM0PLUS
+      #define LOW_POWER_DISABLE   1  at least on one MCU (CM4 or CM0PUS)
+  - use the script \Scripts\<MyPreferredToolchain>\build.bat to rebuild the SBSFU and the LoRaWAN projects
+  - use the script \Scripts\<MyPreferredToolchain>\program.bat to download the big binary on target device
+  - unplug the USB and plug it back to reconnect the board to the PC
+  - SBSFU run first then LoRaWAN_End_Node starts
+  - LoRaWAN_End_Node CM4 code enters in while(1) loop waiting the push button BUTTON_SW2 to be pressed
+  - the CM0PLUS code is in while(1) loop waiting the CM4 to set CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START
+  - if you need to debug CM4 open your preferred toolchain and select CM4 project and attach to running target
+  - if you need to debug CM0PLUS open your preferred toolchain and select CM0PLUS project and attach to running target
+  - set the breakpoints either in CM4 or CM0PLUS or both debugger instances
+  - press the push button BUTTON_SW2:
+     - CM4 exits its while(1) loop and executes MBMUXIF_SetCpusSynchroFlag(1) and reaches the CM4 breakpoint
+     - this allows CM0PLUS to exit its while(1) loop and to reach the CM0PLUS breakpoint
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/EWARM/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/EWARM/build.bat
new file mode 100644
index 00000000..14842991
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/EWARM/build.bat
@@ -0,0 +1,69 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+set rebuild=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if "%1"=="-norebuild" (
+    set rebuild=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\EWARM\Project.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\EWARM\Project.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\EWARM\CM0PLUS.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\EWARM\CM4.ewp || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\EWARM\LoRaWAN_End_Node_DualCore_CM0PLUS.ewp || goto :eof
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\EWARM\LoRaWAN_End_Node_DualCore_CM4.ewp || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  if %rebuild% equ 1 (
+    %EWARM_EXE% "%~1" -clean * -parallel 10
+    %EWARM_EXE% "%~1" -make * -parallel 10
+  ) else (
+    %EWARM_EXE% "%~1" * -parallel 10
+  )
+  if %errorlevel% neq 0 (
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| -norebuild ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo -norebuild  Partial compilation
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/EWARM/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/EWARM/program.bat
new file mode 100644
index 00000000..6e41505f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/EWARM/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\LoRaWAN_End_Node_DualCore\EWARM\Binary\SBSFU_LoRaWAN_End_Node_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/MDK-ARM/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/MDK-ARM/build.bat
new file mode 100644
index 00000000..43ea97b2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/MDK-ARM/build.bat
@@ -0,0 +1,70 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  echo Build 2_Images_KMS_Blob
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\MDK-ARM\Project.uvprojx || goto :eof
+  echo Build 2_Images_SECoreBin
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\MDK-ARM\Project.uvprojx || goto :eof
+  echo Build 2_Images_SBSFU\CM0PLUS
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\MDK-ARM\CM0PLUS.uvprojx || goto :eof
+  echo Build 2_Images_SBSFU\CM4
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\MDK-ARM\CM4.uvprojx || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+echo Build LoRaWAN_End_Node_DualCore\CM0PLUS
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\MDK-ARM\LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx || goto :eof
+echo Build LoRaWAN_End_Node_DualCore\CM4
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\MDK-ARM\LoRaWAN_End_Node_DualCore_CM4.uvprojx || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  %MDK_EXE% -r "%~1" -o "%~dp0\temp.log" -j0
+  REM return 0 if OK, 1 if warning, 2 if error
+  if %errorlevel% equ 2 (
+    type "%~dp0\temp.log"
+    del "%~dp0\temp.log"
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  type "%~dp0\temp.log"
+  del "%~dp0\temp.log"
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/MDK-ARM/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/MDK-ARM/program.bat
new file mode 100644
index 00000000..b9e948ac
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/MDK-ARM/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\LoRaWAN_End_Node_DualCore\MDK-ARM\Binary\SBSFU_LoRaWAN_End_Node_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/STM32CubeIDE/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/STM32CubeIDE/build.bat
new file mode 100644
index 00000000..88dbe677
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/STM32CubeIDE/build.bat
@@ -0,0 +1,73 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+set rebuild=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if "%1"=="-norebuild" (
+    set rebuild=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+set "workspacedir=%current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\Binary\ws"
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\STM32CubeIDE || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\STM32CubeIDE || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\STM32CubeIDE\CM0PLUS || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\STM32CubeIDE\CM4 || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\CM0PLUS || goto :eof
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\CM4 || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  if not exist %workspacedir% (
+    mkdir %workspacedir% 2>NUL
+    if %ERRORLEVEL% NEQ 0 exit /B 1
+  ) else (
+    del /q "%workspacedir%\*"
+    for /D %%p in ("%workspacedir%\*.*") do rmdir "%%p" /s /q
+  )
+  %CUBEIDE_EXE% --launcher.suppressErrors -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data "%workspacedir%" -import "%~1" -build all
+  if %errorlevel% neq 0 (
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| -norebuild ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo -norebuild  Partial compilation
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/STM32CubeIDE/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/STM32CubeIDE/program.bat
new file mode 100644
index 00000000..966a4fa4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/STM32CubeIDE/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\Binary\SBSFU_LoRaWAN_End_Node_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/disable_security.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/disable_security.bat
new file mode 100644
index 00000000..02dbfc56
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/disable_security.bat
@@ -0,0 +1,87 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+
+REM ###########################################
+REM # 0- Set all global variables
+REM ###########################################
+if not defined CUBEPROG_EXE (
+  call setenv.bat
+)
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+echo RDP: Read Out protection Level 1
+call :write_ob RDP 0xBB || goto :eof
+
+echo RDP+ESE: Read Out protection Level 0 + Security disabled
+call :write_ob RDP 0xAA ESE 0x0 || goto :eof
+
+echo WRP: Write Protection disabled
+call :write_ob WRP1A_STRT 0x7F WRP1A_END 0x0 WRP1B_STRT 0x7F WRP1B_END 0x0 || goto :eof
+
+echo ------ User Configuration ------
+echo nRST: No reset generated when entering the Stop/Standby/Shutdown modes
+call :write_ob nRST_STOP 0x1 nRST_STDBY 0x1 nRST_SHDW 0x1 || goto :eof
+
+echo WDG_SW: Software window/independent watchdogs
+call :write_ob WWDG_SW 0x1 IWDG_SW 0x1 || goto :eof
+
+echo IWDG: Independent watchdog counter frozen in Stop/Standby modes
+call :write_ob IWGD_STDBY 0x0 IWDG_STOP 0x0 || goto :eof
+
+echo BOOT: CPU1+CPU2 CM0+ Boot lock disabled
+call :write_ob BOOT_LOCK 0x0 C2BOOT_LOCK 0x0 || goto :eof
+
+echo ------ Security Configuration ------
+echo HDPAD: User Flash hide protection area access disabled
+call :write_ob HDPAD 0x1 || goto :eof
+
+echo SPISD: SPI3 security disabled
+call :write_ob SUBGHSPISD 0x1 || goto :eof
+
+echo SBRSA: Reset default value of SRAM Start address secure
+call :write_ob SNBRSA 0x1F SBRSA 0x1F || goto :eof
+
+echo SBRV: Reset default value of CPU2 Boot start address
+call :write_ob SBRV 0x8000 || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:write_ob
+  set len_ob=0
+  :next
+  if not "%~1" == "" if not "%~2" == "" (
+    set option_byte_name[!len_ob!]=%~1
+    set option_byte_val[!len_ob!]=%~2
+    set /a len_ob+=1
+    shift
+    shift
+    goto next
+  )
+  set /a len_ob-=1
+  set obj_str=
+  for /L %%i in (0,1,%len_ob%) do (
+    set obj_str=!option_byte_name[%%i]!=!option_byte_val[%%i]! !obj_str! 
+  )
+
+  %CUBEPROG_EXE% -c port=SWD mode=UR -q -ob !obj_str! >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Command write -ob !obj_str! Failed
+    exit /B 1
+  )
+  %CUBEPROG_EXE% -c port=SWD mode=UR -q -ob displ > temp.txt
+  
+  REM Get line containing %~1 Option Byte
+  for /L %%i in (0,1,%len_ob%) do (
+    for /f "tokens=3" %%h in ('findstr /c:"     !option_byte_name[%%i]!" temp.txt') do set "read_ob=%%h"
+    if "!read_ob!" neq "!option_byte_val[%%i]!" (
+      echo Error: Option Byte !option_byte_name[%%i]! not modified as expected: read=!read_ob! expected=!option_byte_val[%%i]!
+      del /Q temp.txt >nul
+      exit /B 1
+    )
+  )
+  
+  del /Q temp.txt >nul
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/setenv.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/setenv.bat
new file mode 100644
index 00000000..c8c00c32
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA_DualCore/Scripts/setenv.bat
@@ -0,0 +1,4 @@
+set CUBEPROG_EXE="C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin\STM32_Programmer_CLI.exe"
+set EWARM_EXE="C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.1\common\bin\IarBuild.exe"
+set MDK_EXE="C:\Keil_v5\UV4\UV4.exe"
+set CUBEIDE_EXE="C:\ST\STM32CubeIDE_1.6.0\STM32CubeIDE\stm32cubeidec.exe"
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin
new file mode 100644
index 00000000..87418a0d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin
@@ -0,0 +1 @@
+�!Eˠ;P=����+�f
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
new file mode 100644
index 00000000..6f66889b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
@@ -0,0 +1,1054 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\KMS_Blob.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..e6140477
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,21 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+
+define region ROM_region   = mem:[from 0 to 0x8000];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+
+place in ROM_region   { section .KMS_blob_Keys, last section aes_block_padding };
+keep { section .KMS_blob_Keys };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
new file mode 100644
index 00000000..ec939c17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
@@ -0,0 +1,14 @@
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+
+; *** regions needed by KMS_Blob project ***
+LR_ROM (0x00000000) ALIGN(16) {
+  ROM_region +0 {
+  *(.KMS_blob_Keys)
+  .ANY (+RO)
+  }
+  ALIGN_region +0 ALIGN(16) EMPTY(16) {
+  }
+} 
+ 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..4c05c195
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>KMS_blob</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../2_Images_SECoreBin/Inc</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>0</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>KMS_Blob.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--diag_suppress L6305W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>kms_blob_example_keys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_KMS_Blob"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..a4620af6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../2_Images_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/KMS_Blob.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_KMS_Blob.null.1082786794" name="2_Images_KMS_Blob"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
new file mode 100644
index 00000000..364b1864
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_KMS_Blob</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_blob_example_keys.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_blob_example_keys.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
new file mode 100644
index 00000000..cf21882e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
@@ -0,0 +1,29 @@
+/*
+** LinkerScript
+*/
+
+APPLI_region_ROM_start    = 0x00000000;
+APPLI_region_ROM_length   = 0x8000;
+
+/* Specify the memory areas */
+MEMORY
+{
+ APPLI_region_ROM  : ORIGIN = APPLI_region_ROM_start, LENGTH = APPLI_region_ROM_length
+}
+
+/* Define output sections */
+SECTIONS
+{
+  .rodata :
+  {
+    . = ALIGN(16);
+    KEEP(*(.KMS_blob_Keys))
+    . = ALIGN(16);
+  } >APPLI_region_ROM
+  
+  /DISCARD/ :
+  {
+    *(.init)
+    *(.fini)
+  }
+}
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
new file mode 100644
index 00000000..64af9746
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
@@ -0,0 +1,153 @@
+/**
+  ******************************************************************************
+  * @file    kms_blob_example_key.c
+  * @author  MCD Application Team
+  * @brief   Key Management Services module.
+  *          This file provides examples of data to be loaded as a blob
+  *          (provisioning).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#if !defined(KMS_ENABLED)
+#define KMS_ENABLED
+#endif /* KMS_ENABLED */
+
+#include "kms.h"
+#include "kms_platf_objects_interface.h"
+
+/* Custom Structures declaration */
+KMS_DECLARE_BLOB_STRUCT(, 225)
+KMS_DECLARE_BLOB_STRUCT(, 36)
+
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".KMS_blob_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".KMS_blob_Keys"
+#else
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* __ICCARM__ */
+
+const kms_obj_keyhead_225_t   Test_Key_RSA_2048 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,          /*   uint32_t configuration;     */
+  900,                             /*   uint32_t blobs_size;        */
+  11,                              /*   uint32_t blobs_count;       */
+  KMS_KEY_RSA2048_OBJECT_HANDLE,   /*   uint32_t object_id;         */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PRIVATE_KEY,               /* CLASS = PRIVATE KEY */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_RSA,                           /* TYPE = RSA KEY */
+    CKA_TOKEN,        4, CK_TRUE,
+    CKA_LABEL,        16, 0x52455355U, 0x424F4C42U, 0x20415352U, 0x38343032U, /* 'USER', 'BLOB', 'RSA ', '2048' */
+    CKA_ID,           4, 123,
+    CKA_SENSITIVE,    4, CK_TRUE,                                             /* SENSITIVE KEY */
+    CKA_VERIFY,       4, CK_TRUE,                                             /* CAN BE USED FOR VERIFICATION */
+    CKA_SIGN,         4, CK_TRUE,                                             /* CAN BE USED FOR SIGNATURE */
+
+    CKA_MODULUS,      256,                                                    /* RSA KEY MODULUS */
+    0xcea80475U, 0x324c1dc8U, 0x34782781U, 0x8da58bacU,
+    0x069d3419U, 0xc614a6eaU, 0x1ac6a3b5U, 0x10dcd72cU,
+    0xc5169549U, 0x05e9fef9U, 0x08d45e13U, 0x006adf27U,
+    0xd467a7d8U, 0x3c111d1aU, 0x5df15ef2U, 0x93771aefU,
+    0xb920032aU, 0x5bb989f8U, 0xe4f5e1b0U, 0x5093d3f1U,
+    0x30f984c0U, 0x7a772a36U, 0x83f4dc6fU, 0xb28a9681U,
+    0x5b32123cU, 0xcdd13954U, 0xf19d5b8bU, 0x24a103e7U,
+    0x71a34c32U, 0x8755c65eU, 0xd64e1924U, 0xffd04d30U,
+    0xb2142cc2U, 0x62f6e004U, 0x8fef6dbcU, 0x652f2147U,
+    0x9ea1c4b1U, 0xd66d28f4U, 0xd46ef718U, 0x5e390cbfU,
+    0xa2e02380U, 0x582f3188U, 0xbb94ebbfU, 0x05d31487U,
+    0xa09aff01U, 0xfcbb4cd4U, 0xbfd1f0a8U, 0x33b38c11U,
+    0x813c8436U, 0x0bb53c7dU, 0x4481031cU, 0x40bad871U,
+    0x3bb6b835U, 0xcb08098eU, 0xd15ba31eU, 0xe4ba728aU,
+    0x8c8e10f7U, 0x294e1b41U, 0x63b7aee5U, 0x7277bfd8U,
+    0x81a6f9d4U, 0x3e02c692U, 0x5aa3a043U, 0xfb7fb78dU,
+
+    CKA_PUBLIC_EXPONENT, 256,                                                  /* RSA PUBLIC EXPONENT */
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00260445U,
+
+
+    CKA_PRIVATE_EXPONENT, 256,                                                  /* RSA PRIVATE EXPONENT */
+    0x0997634cU, 0x477c1a03U, 0x9d44c810U, 0xb2aaa3c7U,
+    0x862b0b88U, 0xd3708272U, 0xe1e15f66U, 0xfc938970U,
+    0x9f8a11f3U, 0xea6a5af7U, 0xeffa2d01U, 0xc189c50fU,
+    0x0d5bcbe3U, 0xfa272e56U, 0xcfc4a4e1U, 0xd388a9dcU,
+    0xd65df862U, 0x8902556cU, 0x8b6bb6a6U, 0x41709b5aU,
+    0x35dd2622U, 0xc73d4640U, 0xbfa1359dU, 0x0e76e1f2U,
+    0x19f8e33eU, 0xb9bd0b59U, 0xec198eb2U, 0xfccaae03U,
+    0x46bd8b40U, 0x1e12e3c6U, 0x7cb62956U, 0x9c185a2eU,
+    0x0f35a2f7U, 0x41644c1cU, 0xca5ebb13U, 0x9d77a89aU,
+    0x2953fc5eU, 0x30048c0eU, 0x619f07c8U, 0xd21d1e56U,
+    0xb8af0719U, 0x3d0fdf3fU, 0x49cd49f2U, 0xef3138b5U,
+    0x138862f1U, 0x470bd2d1U, 0x6e34a2b9U, 0xe7777a6cU,
+    0x8c8d4cb9U, 0x4b4e8b5dU, 0x616cd539U, 0x3753e7b0U,
+    0xf31cc7daU, 0x559ba8e9U, 0x8d888914U, 0xe334773bU,
+    0xaf498ad8U, 0x8d9631ebU, 0x5fe32e53U, 0xa4145bf0U,
+    0xba548bf2U, 0xb0a50c63U, 0xf67b14e3U, 0x98a34b0dU,
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* (__GNUC__) */
+
+const kms_obj_keyhead_36_t   Test_Key_AES256_Derivable =
+{
+  KMS_ABI_VERSION_CK_2_40,                /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,                 /*   uint32_t configuration;     */
+  144,                                    /*   uint32_t blobs_size;        */
+  8,                                      /*   uint32_t blobs_count;       */
+  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE, /*   uint32_t object_id;         */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_AES,                          /* TYPE = AES KEY */
+    CKA_VALUE,        32, 0x603deb10U, 0x15ca71beU, 0x2b73aef0U, 0x857d7781U,
+    0x1f352c07U, 0x3b6108d7U, 0x2d9810a3U, 0x0914dff4U,
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO ENCRYPT */
+    CKA_DECRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO DECRYPT */
+    CKA_TOKEN,        sizeof(CK_BBOOL), CK_TRUE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,               /* CLASS = SECRET KEY */
+    CKA_DERIVE,       sizeof(CK_BBOOL), (uint8_t)CK_TRUE,                    /* CAN BE USED TO DERIVE A NEW KEY */
+    CKA_LABEL,        24, 0x52455355U, 0x424F4C42U, 0x50595243U, 0x49524544U, 0x4C424156U, 0x00000045U,
+    /* 'USER', 'BLOB', 'CRYP', 'DERI', 'VABL', 'E' */
+  }
+};
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_function_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif /* (__ICCARM__) */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/readme.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/readme.txt
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/readme.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
new file mode 100644
index 00000000..696d8368
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    app_hw.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update hardware
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_HW_H
+#define APP_HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported macros -----------------------------------------------------------*/
+/* At power-on, the capacitor related to SW1 button needs to charge.
+ * The charging time must be waited to be sure that a low level is a real one. */
+#define BUTTON_INIT() \
+  BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);                               \
+  if ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET) \
+  {                                                                       \
+     HAL_Delay(6U);                                                       \
+  }
+
+#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_HW_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
new file mode 100644
index 00000000..5ac7113c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
@@ -0,0 +1,32 @@
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAIN_H
+#define MAIN_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "app_sfu.h"
+#include "app_hw.h"
+
+#endif /* MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
new file mode 100644
index 00000000..df18911f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
@@ -0,0 +1,89 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Secure Boot and Secure Firmware Update.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_boot.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  main function
+  * @param  None
+  * @retval int
+  */
+int main(void)
+{
+
+  /* MCU Configuration--------------------------------------------------------*/
+  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
+  (void) HAL_Init();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+  /*
+   * As the secure mode has not been entered yet, we do not configure BSP right now .
+   * The BSP will be configured by the bootloader.
+   */
+
+
+  /* Launch the Bootloader----------------------------------------------------*/
+  /*
+   * This is the beginning of the secure part:
+   * security mechanisms will be enabled.
+   * The function below should not return (unless a critical failure is encountered).
+   */
+  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
+
+  /* Security or SecureBoot initialization failure. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+}
+
+
+
+
+
+
+#ifdef USE_FULL_ASSERT
+
+/**
+  * @brief Reports the name of the source file and the source line number
+  * where the assert_param error has occurred.
+  * @param file: pointer to the source file name
+  * @param line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+
+}
+
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
new file mode 100644
index 00000000..2adf5e24
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
@@ -0,0 +1,206 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_crypto_config.h"
+#include "app_sfu_common.h"
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Use this define to choose the type of Firmware Image Programming you want to use.
+  * This version supports only 2 modes:
+  *
+  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
+  *       The image is received in encrypted format.
+  *       The image must be decrypted to be installed:
+  *         this is done according to the selected crypto scheme,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  * SFU_CLEAR_IMAGE: Clear Firmware Image
+  *       The image is received in clear format.
+  *       No decrypt operation is needed before installing the image:
+  *         the selected crypto scheme must be compatible with this choice,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  *
+  */
+#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
+#else
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
+#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
+
+#define SFU_DEBUG_MODE               /*!< Comment this define to optimize memory footprint (debug mode removed)
+                                          No more print on terminal during SBSFU execution */
+
+/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
+                                          this switch activates more debug prints in the console (FSM state info...) */
+
+
+/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
+                                                          When this switch is activated, the FWIMG part of SB_SFU will
+                                                          block when an abnormal error is encountered */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
+#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
+#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
+
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
+#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
+
+/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
+                                           Automatically executed @startup */
+#if defined(SFU_TEST_PROTECTION)
+#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
+#endif /* SFU_TEST_PROTECTION */
+
+/**
+  * SB_SFU status LED.
+  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
+  * This is useful when no log is enabled.
+  *
+  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
+  * \li For the other situations, please check the other defines below.
+  */
+#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
+#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
+                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
+#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
+
+
+/**
+  * Optional Features Software Configuration
+  */
+#if !defined(SFU_TEST_PROTECTION)
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+#else
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
+#endif /* SFU_TEST_PROTECTION */
+
+#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
+#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
+#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
+
+/* Uncomment the define below if you want to use minicom with Linux */
+/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
+
+#if defined(MINICOM_YMODEM)
+/* Minicom does not accept the debug prints during the YMODEM session */
+#undef SFU_VERBOSE_DEBUG_MODE
+#endif /* MINICOM_YMODEM */
+
+
+/* Multi-images configuration :
+   - Max : 3 Active images
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+*/
+#define SFU_NB_MAX_ACTIVE_IMAGE 2U                        /*!< 2 active images managed */
+#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 blob dwl area managed */
+#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
+
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_RDP_PROTECT_ENABLE
+/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
+                                             neither connected to GND nor to 5V (floating level), there are too many
+                                             spurious tamper event detected */
+/* #define SFU_IWDG_PROTECT_ENABLE  */  /*!< WARNING:
+                                        1. Be Careful if enabling this protection. IWDG will be active also after
+                                           switching to UserApp: a refresh is needed.
+                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
+                                           platform (flash size...)*/
+#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
+                                        Enables/Disables the MPU protection.
+                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
+                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
+                                        addition to the overall MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
+                                        executable area */
+
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_GTZC_PROTECT_ENABLE    /*!< GTZC protection (dependent on SFU_SECURE_USER_PROTECT_ENABLE):
+                                        Enables/Disables the GTZC protection. */
+#define SFU_C2SWDBG_PROTECT_ENABLE /*!< Dynamic disabling of the CPU2 debug:
+                                        not writable if ESE=0, no meaning if DDS=1. */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
+                                                      completely disabled, OB update no more possible  */
+
+
+#else
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
+                                                      field should set it as Level2 */
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+
+#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
+                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
+
+
+/**
+  * Application Configuration
+  *
+  */
+#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
+                                              You can also define an upper bound here if you plan to use it */
+
+#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
+                                              no FW installed or due to an attack attempt). Could be different from
+                                              SFU_FW_VERSION_START_NUM */
+
+/**
+  * Features compatibility control
+  */
+#if defined(SFU_NO_SWAP) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_NO_SWAP process"
+#endif
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_SECURE_USER_PROTECT_ENABLE process"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
new file mode 100644
index 00000000..b04ef4cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
@@ -0,0 +1,1552 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.c
+  * @author  MCD Application Team
+  * @brief   SFU BOOT module
+  *          This file provides firmware functions to manage the following
+  *          functionalities of the Secure Boot:
+  *           + Initialization and de-initialization functions
+  *           + Secure Boot Control functions
+  *           + Secure Boot State functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_BOOT_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+#include "sfu_boot.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
+
+/*
+ * The sfu_com init is provided by the sfu_com_trace module by default.
+ * If not, then it is taken from the sfu_com_loader module.
+ */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_trace.h"
+#else
+#include "sfu_trace.h"      /* needed anyhow even if the defines will be empty */
+#include "sfu_com_loader.h" /* needed only for the COM init/de-init */
+#endif /* SFU_DEBUG_MODE  || SFU_TEST_PROTECTION */
+#include "se_def.h"
+#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
+#include "sfu_new_image.h"            /* the local loader is a kind of "application" running in SB_SFU so it needs the
+                                         services to install a FW image */
+#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
+#include "sfu_test.h"                 /* auto tests */
+#include "sfu_fwimg_internal.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "sfu_kms.h"
+#endif /* KMS_ENABLED */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct
+{
+  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
+  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
+} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
+                                                     information using during the SM evolution. */
+
+/* Private defines -----------------------------------------------------------*/
+#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
+#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
+#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
+                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
+
+#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
+                                    maintained for future customization/expansion of the field itself */
+
+#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
+
+/* Private macros ------------------------------------------------------------*/
+#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    if (Status == SFU_SUCCESS){                                         \
+      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
+    }                                                                   \
+    else {                                                              \
+      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
+    }                                                                   \
+  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
+
+
+#define SFU_SET_SM_CURR_STATE(NewState)                                 \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    m_StateMachineContext.CurrState = NewState;                         \
+  }while(0) /*!< Set a State Machine state*/
+
+/* Private variables ---------------------------------------------------------*/
+/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
+static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
+                                                                         SFU_STATE_INITIAL
+                                                                        };
+
+/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
+static uint32_t m_C1ActiveSlot = SLOT_INACTIVE;
+static uint32_t m_C2ActiveSlot = SLOT_INACTIVE;
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+uint8_t initialDeviceStatusCheck;
+
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_BOOT_Init(void);
+static SFU_ErrorStatus SFU_BOOT_DeInit(void);
+static void SFU_BOOT_BspConfiguration(void);
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
+static void SFU_BOOT_SM_CheckStatusOnReset(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static void SFU_BOOT_SM_CheckNewFwToDownload(void);
+static void SFU_BOOT_SM_DownloadNewUserFw(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
+static void SFU_BOOT_SM_InstallKMSBlob(void);
+#endif /* KMS_ENABLED */
+static void SFU_BOOT_SM_CheckUserFwStatus(void);
+static void SFU_BOOT_SM_VerifyUserFwSignature(void);
+static void SFU_BOOT_SM_ExecuteUserFw(void);
+static void SFU_BOOT_SM_HandleCriticalFailure(void);
+static void SFU_BOOT_SM_RebootStateMachine(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
+static void SFU_BOOT_ManageResetSources(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
+  *        In the nominal case, the bootloader service runs until the user application is launched.
+  *        When no valid user application can be run (after installing a new image or not),
+  *        if the local loader feature is not enabled then the execution stops,
+  *        otherwise a local download will be awaited.
+  *        If the state machine encounters a major issue then a reboot is triggered.
+  * @param None.
+  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
+  * @note Constraints
+  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
+  *       2. This function also takes care of BSP initialization after enabling the secure mode.
+  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
+  *       3. No other entity should handle the initialization of the Secure Engine.
+  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
+  *          configurations will be overwritten).
+  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
+  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
+  *          error cause.
+  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
+  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
+  *          new image).
+  * @note Settings are handled at compilation time:
+  *       1. See compiler switches in main.h for secure IPs settings
+  *       2. The trace system is configured in the sfu_trace.h file
+  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
+  *          stage.
+  */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
+{
+  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
+
+  /*
+   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
+   * "automatically" managed by SBSFU compiler command
+   */
+  if (SE_Startup() == SE_SUCCESS)
+  {
+    /* Security Configuration */
+    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
+    {
+      /* Board BSP  Configuration */
+      SFU_BOOT_BspConfiguration();
+
+      /* Configure the Secure Boot and start the State machine */
+      if (SFU_BOOT_Init() == SFU_SUCCESS)
+      {
+        /* Start the Secure Boot State Machine */
+        (void) SFU_BOOT_SM_Run();
+      }
+      else
+      {
+        /* failure when initializing the secure boot service */
+        e_ret_code = SFU_BOOT_INIT_FAIL;
+      }
+    }
+    else
+    {
+      /* failure when configuring the security IPs  */
+      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
+    }
+  }
+  else
+  {
+    /* failure at secure engine initialization stage */
+    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
+  }
+
+  /*
+   * This point should not be reached unless a critical init failure occurred
+   * Return the error code
+   */
+  return (e_ret_code);
+}
+
+/**
+  * @brief  Force System Reboot
+  * @param  None
+  * @retval None
+  */
+void SFU_BOOT_ForceReboot(void)
+{
+  /*
+   * WARNING: The follow TRACEs are for debug only. This function could be called
+   * inside an IRQ so the below printf could not be executed or could generate a fault!
+   */
+  TRACE("\r\n========= End of Execution ==========");
+  TRACE("\r\n\r\n\r\n");
+
+  /*
+   * This is the last operation executed. Force a System Reset.
+   * The check below is needed in case we reboot before setting the Unpriviledged mode.
+   * This can happen in a factory reset use-case typically.
+   */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  Initialize the Secure Boot State machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_Init(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
+   * download)
+   */
+  initialDeviceStatusCheck = 1U;
+
+  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
+  if (SFU_LL_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Flash interface initialization */
+  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* The COM modules is required only if the trace or the local download is enabled */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
+  if (SFU_COM_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  /* Call the SFU_LOADER module Init */
+  if (SFU_LOADER_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+  /* Call the Exception module Init */
+  if (SFU_EXCPT_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Call the image handling Init  */
+  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
+  {
+    return SFU_ERROR;
+  } /* else continue */
+
+
+  TRACE("\r\n\r\n");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  TRACE("\r\n=                                                                    =");
+  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n\r\n");
+
+  /* Initialize the Secure Engine that will be used for all the most critical operations */
+  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
+  }
+  else
+  {
+    e_ret_status = SFU_SUCCESS;
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize the Secure Boot State machine.
+  * @param  None
+  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
+  *         The bootloader can terminate:
+  *         1. with an init failure : no de-init needed
+  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
+  *            by this function.
+  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
+  *            required security mechanisms.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_DeInit(void)
+{
+  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  if (SFU_COM_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+  if (SFU_LL_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  BSP Initialization.
+  *         Called when the secure mode is enabled.
+  * @note   The BSP configuration should be handled only in this function.
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_BspConfiguration()
+{
+  /* LED Init*/
+  (void) BSP_LED_Init(SFU_STATUS_LED);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* User Button */
+  BUTTON_INIT();
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Execute the Secure Boot state machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
+  void (*fnStateMachineFunction)(void);
+  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+                                                 SFU_BOOT_SM_CheckNewFwToDownload,
+                                                 SFU_BOOT_SM_DownloadNewUserFw,
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
+                                                 SFU_BOOT_SM_InstallKMSBlob,
+#endif /* KMS_ENABLED */
+                                                 SFU_BOOT_SM_CheckUserFwStatus,
+                                                 SFU_BOOT_SM_VerifyUserFwSignature,
+                                                 SFU_BOOT_SM_ExecuteUserFw,
+                                                 SFU_BOOT_SM_HandleCriticalFailure,
+                                                 SFU_BOOT_SM_RebootStateMachine
+                                                };
+
+  /* Start the State Machine loop/evolution */
+  while (e_ret_status == SFU_SUCCESS)
+  {
+    /* Always execute a security/safety check before moving to the next state */
+    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
+    {
+      /* Get the right StateMachine function according to the current state */
+      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
+
+      /* Call the State Machine function associated to the current state */
+      fnStateMachineFunction();
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* If the State Machine cannot evolve anymore, reboot is the only option */
+
+  /* Set the error before forcing a reboot */
+  SFU_EXCPT_SetError(SFU_EXCPT_UNKNOWN);
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+  return e_ret_status;
+}
+
+/** @brief  Check the Reset status in order to understand the last cause of Reset
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckStatusOnReset(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
+
+  /* Check the wakeup sources */
+  SFU_BOOT_ManageResetSources();
+
+  /* RCC access done to identify the wakeup sources, we can switch to unpriviledged */
+  SFU_MPU_EnterUnprivilegedMode();
+#ifdef SFU_TEST_PROTECTION
+  /*
+   * All protections are installed and the correct execution mode is set (unprivileged).
+   * This is the good time to run the auto-tests.
+   */
+  SFU_TEST_Init();
+#endif /* SFU_TEST_PROTECTION */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+  /* When the local loader feature is supported we need to check if a local download is requested */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+#ifdef KMS_ENABLED
+  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* When the local loader feature is disabled go directly to the check of the FW status */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+/**
+  * @brief  Check if a new UserApp firmware is available for downloading.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckNewFwToDownload(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_DWL_REQ)
+  {
+    TRACE("\r\n= [SBOOT] STATE: execution standalone loader");
+    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+    /* This is unreachable code (dead code) in principle...
+    At this point we should not be able to reach the following instructions.
+    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
+    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
+    if (0U != BUTTON_PUSHED())
+    {
+      /* Download requested */
+      e_ret_status = SFU_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /*
+     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
+     * download to start
+     */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+#ifdef KMS_ENABLED
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
+
+#ifdef KMS_ENABLED
+/**
+  * @brief  Check if a KMSBlob is waiting for installation.
+  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
+  *         disabled.
+  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
+  *         enabled.
+  *         In this latter case,
+  *               if a new Firmware download is requested,
+  *               it has priority over the KMS blob installation,
+  *               and the KMS blob installation request will be lost.
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
+
+  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
+  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
+
+  /* Check if a Blob Installation is requested or on-going */
+  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
+
+  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
+  {
+    /* Blob installation requested */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+/**
+  * @brief  Check if a KMSBlob is waiting for install.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallKMSBlob(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  uint8_t         *pBlobHdr;
+  uint8_t         *pBlobInFlash;
+  CK_RV           e_status;
+
+  /* At boot-up, Managing ImportBlob through KMS services.  */
+  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
+
+  /* Here we will Launch SE service to take consume the Blob */
+  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
+  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
+  }
+  else
+  {
+    /* Initialize KMS in order to be able to import blob using internal algorithms */
+    e_status = C_Initialize(NULL);
+    if (e_status == CKR_OK)
+    {
+      /* we do not take the return value into account as we will not retry the import in case of issue */
+      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
+
+      if (e_status != CKR_OK)
+      {
+        (void)C_Finalize(NULL);
+      }
+      else
+      {
+        e_status = C_Finalize(NULL);
+      }
+    }
+
+    if (e_status != CKR_OK)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
+    }
+
+    /* In any case, we remove the Blob To Install (regardless of the result) */
+    e_ret_status = SFU_KMS_EraseBlob();
+
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
+    }
+
+    /* Display the KMS import result */
+    switch (e_status)
+    {
+      case CKR_OK:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
+        e_ret_status = SFU_SUCCESS;
+        break;
+
+      case CKR_SIGNATURE_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DATA_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DEVICE_ERROR:
+        /* At boot-up, NVM Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_OPERATION_ACTIVE:
+        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      default:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
+        e_ret_status = SFU_ERROR;
+        break;
+    }
+  }
+
+  /* Set the next State Machine regardless of the KMS import result */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+#endif /* KMS_ENABLED */
+
+
+/**
+  * @brief  Check the Status of the Fw Image to work on  in order to set the next
+  *         State Machine state accordingly
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckUserFwStatus(void)
+{
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  uint32_t i;
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_INSTALL_REQ)
+  {
+    /* Whatever the status the decryption can be done only once ==> no interruption allowed */
+    STANDALONE_LOADER_STATE = STANDALONE_LOADER_NO_REQ;
+
+    TRACE("\r\n\t  New Fw Encrypted, to be decrypted");
+
+    /* Check if there is a pending action related to a FW update procedure */
+    if (SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall) == SFU_IMG_FWIMAGE_TO_INSTALL)
+    {
+      /* Check the candidate version vs current active version */
+      e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+
+      if (SFU_SUCCESS != e_ret_status)
+      {
+        /* Erase downloaded FW in case of authentication/integrity error */
+        (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
+      }
+      else
+      {
+        /* Secure coding : double check the candidate version vs current active version */
+        e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+      }
+
+      if (SFU_SUCCESS == e_ret_status)
+      {
+        /* Start installation */
+        e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
+      }
+    }
+
+    /* Critical failure management if installation failed */
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+      return;
+    }
+  }
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+  /*
+   * No FW image installation pending :
+   *   1- Check if firmwares are detected for C1 and C2 (MASTER_SLOT)
+   *   2- No active firmware candidate for execution ==> Local download
+   *
+   * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
+   */
+  m_C1ActiveSlot = 0U;
+  m_C2ActiveSlot = 0U;
+  m_ActiveSlotToExecute = 0U;
+
+  /* Check if firmwares are detected for C1 and C2 (MASTER_SLOT) */
+  if (MASTER_SLOT == 0xFFU)
+  {
+    TRACE("\r\n\t  No master slot has been defined for C2");
+  }
+  else
+  {
+    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+    {
+      if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
+      {
+        if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+        {
+          if ((SLOT_ACTIVE_1 + i) == MASTER_SLOT)
+          {
+            m_C2ActiveSlot = MASTER_SLOT;
+            TRACE("\r\n\t  A C2 FW is detected in the slot SLOT_ACTIVE_%d", m_C2ActiveSlot);
+          }
+          else
+          {
+            m_C1ActiveSlot = SLOT_ACTIVE_1 + i;
+            TRACE("\r\n\t  A C1 FW is detected in the slot SLOT_ACTIVE_%d", m_C1ActiveSlot);
+          }
+        }
+      }
+    }
+  }
+
+  /* 2- No active firmware candidates for execution ==> Local download */
+  if ((m_C1ActiveSlot != 0U) && (m_C2ActiveSlot != 0U))
+  {
+    m_ActiveSlotToExecute = m_C2ActiveSlot;
+    SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+  }
+  else
+  {
+    /* Control if all active slot are empty */
+    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+    {
+      if ((m_C1ActiveSlot != (SLOT_ACTIVE_1 + i)) && (m_C2ActiveSlot != (SLOT_ACTIVE_1 + i)))
+      {
+        if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
+        {
+          if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+          {
+            /*
+             * We should never reach this code.
+             * Could come from an attack ==> as an example we invalidate current firmware.
+             */
+            TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+            (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+          }
+        }
+      }
+    }
+
+    /*
+     * No valid FW is present in the active slot
+     * and there is no FW to be installed in UserApp download area: local download (when possible)
+     */
+    if (initialDeviceStatusCheck == 1U)
+    {
+      TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+      /* Waiting for a local download is automatic, no trigger required. */
+      TRACE("\r\n\t  Waiting for the local download to start... ");
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+      initialDeviceStatusCheck = 0U;
+#ifdef SFU_TEST_PROTECTION
+      SFU_TEST_Reset();
+#endif /* SFU_TEST_PROTECTION */
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      /*
+       * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
+       *   If a FW is present in the active slot => it is checked then launched.
+       *   If there is a FW to install => the installation procedure starts.
+       *   If no FW is present and no installation is pending:
+       *      - if the local loader feature is enabled we enter the local download state
+       *      - if the local loader feature is disabled, the execution is stopped.
+       */
+      TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS is not supposed to be entered more than once per boot.");
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+    SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+    /*
+     * When the local loader feature is disabled it is not possible to enter the "check new fw download" state.
+     * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
+     * So we end up waiting for the user to reboot (or the IWDG to expire).
+     */
+    TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
+    while (1 == 1)
+    {
+      (void) BSP_LED_Toggle(SFU_STATUS_LED);
+      HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+    }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  }
+}
+
+
+#if SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   Reset is generated at by standalone loader when FW is downloaded.
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /* Jump into standalone loader */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+  e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /*
+   * Download area will be chosen as following. After header analysis :
+   *   - same DWL slot number as SFU magic number, if the slot is configured.
+   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
+   *   - by default : SLOT_DWL_1
+   */
+  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
+          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
+          fw_image_header_validated.PartialFwOffset, u_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * In 1_Image example : dwl_slot == active_slot
+     */
+    if (SFU_IMG_Validation(dwl_slot, &fw_image_header_validated) != SFU_SUCCESS)
+    {
+      /* CleanUp downloaded image (header preserved, for anti-rollback) */
+      (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
+
+      /* no specific error cause set */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    /* CleanUp downloaded image (header preserved, for anti-rollback) */
+    (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
+
+    /* Memorize the specific error cause if any before handling this critical failure */
+    switch (e_ret_status_app)
+    {
+      case SFU_LOADER_ERR_COM:
+        SFU_EXCPT_SetError(SFU_EXCPT_COM_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_VERSION:
+        SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_LENGTH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FW_TOO_BIG);
+        break;
+      case SFU_LOADER_ERR_AUTH_FAILED:
+        SFU_EXCPT_SetError(SFU_EXCPT_HEADER_AUTH_ERR);
+        break;
+      case SFU_LOADER_ERR_FLASH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FLASH_ERR);
+        break;
+      case SFU_LOADER_ERR_CRYPTO:
+        SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+        break;
+      default:
+        /* no specific error cause */
+        break;
+    }
+  } /* else error with no specific error cause */
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+
+/**
+  * @brief  Verify the UserApp Fw signature before executing it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_VerifyUserFwSignature(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t u_configured_slot_nb = 0U;
+  uint32_t u_verified_slot_nb = 0U;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
+
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /*
+   * With the 2 images handling:
+   *       1. the header signature is verified  when installing a new firmware
+   *       2. the firmware signature is checked when installing a new firmware
+   *       3. remaining part of active slot is kept "clean" during installation procedure
+   * So following checks should never fail.
+   */
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      u_configured_slot_nb ++;
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
+        if (SFU_SUCCESS == e_ret_status)
+        {
+          /* Check the FW signature */
+          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
+          if (SFU_SUCCESS == e_ret_status)
+          {
+            /* Verify that there is no additional code beyond firmware image */
+            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
+            if (SFU_SUCCESS != e_ret_status)
+            {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+            }
+            else
+            {
+              u_verified_slot_nb ++;
+            }
+          }
+          else
+          {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          }
+        }
+        else
+        {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        }
+        /*
+         * One of the checks fails :
+         *  - Header signature
+         *  - FW signature
+         *  - No malicious code
+         *  ==> Active slot should be invalidated
+         */
+        if (SFU_SUCCESS != e_ret_status)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+        else
+        {
+          /* Verify if authentication and integrity controls performed */
+          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+        }
+      }
+      else
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+  }
+
+  /* Check that C1 and C2 firmwares are present */
+  if ( u_configured_slot_nb != u_verified_slot_nb )
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ExecuteUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+
+  /* Double security check for all active slots :
+     - Control twice the Header signature will avoid basic hardware attack
+     - Control twice the FW signature will avoid basic hardware attack */
+
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+        /* Check the FW signature */
+        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+        /* Move the state to SELFTEST for the new images */
+        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Image state cannot be changed : What to do ?
+             ==> decision to continue execution */
+          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
+        }
+#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
+
+        /* Verify if authentication and integrity controls performed */
+        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+      }
+    }
+  }
+
+  /*
+   * You may decide to implement additional checks before running the Firmware.
+   * For the time being we launch the FW present in the active slot.
+   *
+   * The bootloader must also take care of the security aspects:
+   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
+   *   B.lock the SE services the UserApp is not allowed to call
+   *   C.leave secure boot mode
+   */
+
+  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
+  e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+    SFU_EXCPT_SetError(SFU_EXCPT_FLASH_CFG_ERR);
+
+    /* This is the last operation executed. Force a System Reset */
+    SFU_BOOT_ForceReboot();
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Double instruction to avoid basic fault injection */
+      if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+      {
+        /* De-initialize the SB_SFU bootloader before launching the UserApp */
+        (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
+
+        /* Last flow control : lock service */
+        FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
+
+        /* This function should not return */
+        e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
+
+        /* This point should not be reached */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        /* We do not memorize any specific error, the FSM state is already providing the info */
+        TRACE("\r\n\t  SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        while (1 == 1)
+        {
+          ;    /* wait for watchdog */
+        }
+      }
+      else
+      {
+        /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+        SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+        /* This is the last operation executed. Force a System Reset */
+        SFU_BOOT_ForceReboot();
+      }
+    }
+    else
+    {
+      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+      SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+      /* This is the last operation executed. Force a System Reset */
+      SFU_BOOT_ForceReboot();
+    }
+  }
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
+  * @param  None
+  * @note   After a Critical Failure a Reboot will be called.
+  * @retval None
+  */
+static void SFU_BOOT_SM_HandleCriticalFailure(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+     The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
+}
+
+/**
+  * @brief  The state machine is aborted and a Reset is triggered
+  * @param  None
+  * @note   You are in this condition because it's not possible to continue without
+            compromising the stability or the security of the solution.
+  * @retval None
+  */
+static void SFU_BOOT_SM_RebootStateMachine(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
+
+  /*
+   * In case some clean-up must be done before resetting.
+   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
+   */
+  (void)SFU_BOOT_DeInit();
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Jump into standalone loader
+  * @param  None
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
+{
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+
+  /* Lock part of Secure Engine services */
+  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+  {
+    /* Double instruction to avoid basic fault injection */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* this function does not return */
+      SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, LOADER_REGION_ROM_START);
+
+      /* The point below should NOT be reached */
+      return SFU_SUCCESS;
+    }
+    else
+    {
+      return SFU_ERROR;
+    }
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply Static protections involving Option Bytes */
+  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  System security configuration
+  * @param  None
+  * @note   Check and apply the security protections. This has to be done as soon
+  *         as possible after a reset
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  /* WARNING: The following CheckApplySecurityProtection function must be called
+     as soon as possible after a Reset in order to be sure the system is secured
+     before starting any other operation. The drawback is that the ErrorManagement
+     is not initialized yet, so in case of failure of this function, there will not be
+     any error stored into the BootInfo or other visible effects.  */
+
+  /* Very few things are already initialized at this stage. Need additional initialization
+     to show a message that is added as below only in Debug/Test mode */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  (void) SFU_COM_Init();
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
+  {
+    /* WARNING: This might be generated by an attempted attack or a bug of your code!
+       Add your code here in order to implement a custom action for this event,
+       e.g. trigger a mass erase or take any other action in order to
+       protect your system, or simply discard it if this is expected.
+       ...
+       ...
+    */
+    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
+  }
+  else
+  {
+    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
+  *         a malicious code removing some of the applied security/integrity features.
+  *         The IWDG is also refreshed in this function.
+  * @param  None
+  * @note   This function must be called with a frequency greater than 0.25Hz!
+  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
+  *         So the User App should continue to refresh the IWDG counter.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Refresh the IWDG */
+  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
+
+
+  /* Add your code here for customization:
+     e.g. for additional security or safety periodic check.
+     ...
+     ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_ManageResetSources(void)
+{
+  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
+
+  /* Check the wakeup sources */
+  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
+  switch (e_wakeup_source_id)
+  {
+    /*
+     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
+     * RCC_CSR flags can be used to do so.
+     */
+
+    case SFU_RESET_WDG_RESET:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_LOW_POWER:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_HW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_BOR_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_SW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_OB_LOADER:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    default:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+  }
+
+  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
+  SFU_LL_SECU_ClearResetSources();
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
+}
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC Fault.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_GTZC_TZIC(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_GTZC_TZIC_FAULT);
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c
new file mode 100644
index 00000000..f7599f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c
@@ -0,0 +1,544 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
+#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
+
+/* Private macros ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
+#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
+#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+/**
+  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
+  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
+  * @param  puSize: size of received file.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
+{
+  uint32_t i;
+  uint32_t packet_length = 0U;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t filesize = 0U;
+  uint32_t packets_received;
+  uint8_t *file_ptr;
+  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
+                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(8)));
+
+  /* Check the pointers allocation */
+  if ((peCOMStatus == NULL) || (puSize == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  *peCOMStatus = SFU_COM_YMODEM_OK;
+
+  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *peCOMStatus = SFU_COM_YMODEM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *puSize = filesize;
+              file_done = 1U;
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
+              {
+                /* No NACK sent for a better synchro with remote : packet will be repeated */
+              }
+              else
+              {
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name skipped */
+                    i = 0U;
+                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
+                    {
+                      i++;
+                      file_ptr++;
+                    }
+                    /* end of file name ('\0') skipped */
+                    file_ptr++;
+
+                    /* File size extraction */
+                    i = 0U;
+                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
+                    {
+                      file_size[i] = *file_ptr;
+                      i++;
+                      file_ptr++;
+                    }
+                    file_size[i] = (uint8_t) '\0';
+                    (void) Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call*/
+                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
+                    {
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                      (void) SFU_LL_UART_Flush();
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
+                    }
+                    else
+                    {
+                      /* End session */
+                      tmp = SFU_COM_YMODEM_CA;
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      return SFU_ERROR;
+                    }
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                    file_done = 1U;
+                    session_done = 1U;
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  /* Data packet received callback call*/
+                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX],
+                                                           packet_length) == SFU_SUCCESS)
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* End session */
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    *peCOMStatus = SFU_COM_YMODEM_DATA;
+                  }
+
+                }
+                packets_received ++;
+                session_begin = 1;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          break;
+        default:
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
+          {
+            /* Abort communication */
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          }
+          else
+          {
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            /* Minicom does not accept this extra character */
+            TRACE("\b.");                                 /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+            /*
+             * Toggling the LED in case no console is available: the toggling frequency depends on
+             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
+             */
+            (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          }
+          break;
+      }
+    }
+  }
+  /* Make sure the status LED is turned off */
+  (void) BSP_LED_Off(SFU_STATUS_LED);
+
+  if (*peCOMStatus == SFU_COM_YMODEM_OK)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+/**
+  * @brief  Transmit a byte to the COM Port.
+  * @param  uParam: The byte to be sent.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
+{
+  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
+}
+
+/**
+  * @brief  Convert a string to an integer.
+  * @param  pInputStr: The string to be converted.
+  * @param  pIntNum: The integer value.
+  * @retval 1: Correct
+  *         0: Error
+  */
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+  uint8_t  digit;
+
+  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        digit = CONVERTHEX(pInputStr[i]);
+        val = (val << 4U) + digit;
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == (uint8_t)'\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == (uint8_t)'\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        digit =  CONVERTDEC(pInputStr[i]);
+        val = (val * 10U) + digit;
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData: pointer to received data.
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeOut: receive timeout (ms).
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  SFU_ErrorStatus eRetStatus;
+
+  uint8_t char1;
+
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0; /* index indicating where to write in pData */
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
+
+  if (eRetStatus == SFU_SUCCESS)
+  {
+    status = HAL_OK;
+
+    switch (char1)
+    {
+      case SFU_COM_YMODEM_SOH:
+        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
+        break;
+      case SFU_COM_YMODEM_STX:
+        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+        break;
+      case SFU_COM_YMODEM_EOT:
+        break;
+      case SFU_COM_YMODEM_CA:
+        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
+        {
+          packet_size = 2U;
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      case SFU_COM_YMODEM_ABORT1:
+      case SFU_COM_YMODEM_ABORT2:
+        status = HAL_BUSY;
+        break;
+      case SFU_COM_YMODEM_RB:
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
+    {
+
+#ifndef MINICOM_YMODEM
+      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX],
+                                       (uint16_t)(packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
+#else
+      eRetStatus = SFU_SUCCESS;
+      /* Receive byte per byte until no data left or no space left in buffer */
+      while ((SFU_SUCCESS == eRetStatus) &&
+             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
+              SFU_COM_YMODEM_PACKET_DATA_INDEX +
+              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
+            )
+      {
+        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
+                                         1U, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        /* We received some bytes */
+        eRetStatus = SFU_SUCCESS;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (eRetStatus == SFU_SUCCESS)
+      {
+        status = HAL_OK;
+
+        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
+                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
+        {
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC*/
+          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
+          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
+
+          /*Configure CRC with 16-bit polynomial*/
+          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
+          {
+            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
+            {
+              packet_size = 0U;
+              status = HAL_ERROR;
+            }
+
+          }
+          else
+          {
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        status = HAL_ERROR;
+      }
+    }
+  }
+  else
+  {
+    status = HAL_ERROR;
+  }
+
+  *puLength = packet_size;
+  return status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(uFileSize);
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(pData);
+  UNUSED(uSize);
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h
new file mode 100644
index 00000000..755199fd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h
@@ -0,0 +1,121 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_LOADER_H
+#define SFU_COM_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include <stdint.h>
+#include <stdio.h>
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_COM_LOADER_YMODEM Status structure definition
+  */
+typedef enum
+{
+  SFU_COM_YMODEM_OK       = 0x00U,  /*!< OK */
+  SFU_COM_YMODEM_ERROR    = 0x01U,  /*!< Error */
+  SFU_COM_YMODEM_ABORT    = 0x02U,  /*!< Abort */
+  SFU_COM_YMODEM_TIMEOUT  = 0x03U,  /*!< Timeout */
+  SFU_COM_YMODEM_DATA     = 0x04U,  /*!< Data */
+  SFU_COM_YMODEM_LIMIT    = 0x05U   /*!< Limit*/
+} SFU_COM_YMODEM_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)3U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)4U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)1U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)2U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)3U)    /*!<Cnumber Index*/
+#else
+/* Minicom YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)6U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)7U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)4U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)5U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)6U)    /*!<Cnumber Index*/
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_PACKET_TRAILER_SIZE     ((uint32_t)2U)    /*!<Trailer Size*/
+#define SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE    (SFU_COM_YMODEM_PACKET_HEADER_SIZE + SFU_COM_YMODEM_PACKET_TRAILER_SIZE \
+                                                - 1U)           /*!<Overhead Size*/
+#define SFU_COM_YMODEM_PACKET_SIZE             ((uint32_t)128U)  /*!<Packet Size*/
+#define SFU_COM_YMODEM_PACKET_1K_SIZE          ((uint32_t)1024U) /*!<Packet 1K Size*/
+
+#define SFU_COM_YMODEM_FILE_NAME_LENGTH        ((uint32_t)64U)   /*!< File name length*/
+#define SFU_COM_YMODEM_FILE_SIZE_LENGTH        ((uint32_t)16U)   /*!< File size length*/
+
+#define SFU_COM_YMODEM_SOH                     ((uint8_t)0x01U)  /*!< Start of 128-byte data packet */
+#define SFU_COM_YMODEM_STX                     ((uint8_t)0x02U)  /*!< Start of 1024-byte data packet */
+#define SFU_COM_YMODEM_EOT                     ((uint8_t)0x04U)  /*!< End of transmission */
+#define SFU_COM_YMODEM_ACK                     ((uint8_t)0x06U)  /*!< Acknowledge */
+#define SFU_COM_YMODEM_NAK                     ((uint8_t)0x15U)  /*!< Negative acknowledge */
+#define SFU_COM_YMODEM_CA                      ((uint8_t)0x18U)  /*!< Two of these in succession aborts transfer */
+#define SFU_COM_YMODEM_CRC16                   ((uint8_t)0x43U)  /*!< 'C' == 0x43, request 16-bit CRC */
+#define SFU_COM_YMODEM_RB                      ((uint8_t)0x72U)  /*!< Startup sequence */
+#define SFU_COM_YMODEM_NEGATIVE_BYTE           ((uint8_t)0xFFU)  /*!< Negative Byte*/
+
+#define SFU_COM_YMODEM_ABORT1                  ((uint8_t)0x41U)  /*!< 'A' == 0x41, abort by user */
+#define SFU_COM_YMODEM_ABORT2                  ((uint8_t)0x61U)  /*!< 'a' == 0x61, abort by user */
+
+#define SFU_COM_YMODEM_NAK_TIMEOUT             ((uint32_t)0x100000U)  /*!< NAK Timeout*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)3000U) /*!< Retry delay, has to be smaller than IWDG */
+#else
+/* Minicom YMODEM : reduce the download timeout to speed-up the download operation */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)1000U) /*!< Retry delay, has to be smaller than IWDG */
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_MAX_ERRORS              ((uint32_t)3U)    /*!< Maximum number of retry*/
+
+/* Exported functions ------------------------------------------------------- */
+/*
+ * If the debug mode is not enabled then the local loader must also provide the COM init functions
+ */
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+SFU_ErrorStatus SFU_COM_Transmit(uint8_t *pData, uint16_t uDataLength, uint32_t uTimeOut);
+SFU_ErrorStatus SFU_COM_Receive(uint8_t *pData, uint16_t uDataLength);
+SFU_ErrorStatus SFU_COM_Flush(void);
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize);
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam);
+
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize);
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c
new file mode 100644
index 00000000..38dbfe17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_com_trace.h"
+
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_TRACE_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutString Timeout*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+/**
+  * @}
+  */
+
+/** @defgroup SFU_COM_TRACE_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Print a string on the COM Port.
+  * @param  pString: The string to be printed
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString)
+{
+  uint16_t length = 0U;
+
+  /* Check the pointers allocation */
+  if (pString == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  while (pString[length] != (uint8_t)'\0')
+  {
+    length++;
+  }
+
+  return SFU_LL_UART_Transmit(pString, length, SFU_COM_TRACE_SERIAL_TIME_OUT);
+
+}
+
+/**
+  * @brief  Retargets the C library printf function to SFU UART.
+  * @param  None
+  * @retval ch
+  */
+PUTCHAR_PROTOTYPE
+{
+  /* Place your implementation of fputc here */
+  /* e.g. write a character to the USART1 and Loop until the end of transmission */
+  (void) SFU_LL_UART_Transmit((uint8_t *)&ch, 1U, 0xFFFFU);
+
+  return ch;
+}
+
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h
new file mode 100644
index 00000000..d5981e4d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities  for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_TRACE_H
+#define SFU_COM_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include <stdio.h>
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
new file mode 100644
index 00000000..f68bdf63
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
@@ -0,0 +1,254 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.c
+  * @author  MCD Application Team
+  * @brief   SFU ERROR
+  *          This file provides set of firmware functions for SB_SFU errors handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "sfu_low_level_security.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_boot.h"
+#include "sfu_test.h"
+#include "sfu_mpu_isolation.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+/**
+  *  The following strings associated to the exceptions/errors are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
+  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
+  */
+static char *m_aErrorStrings[] ={  "No error. Success",
+                                   "Memory fault",
+                                   "Hard fault",
+                                   "Tampering fault",
+#ifdef SFU_GTZC_PROTECT_ENABLE
+                                   "GTZC TZIC fault",
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+                                   "SE lock cannot be set",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Fw too big",
+                                   "File not correctly received",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Fw header authentication error",
+                                   "Fw decryption error",
+                                   "Fw signature check error",
+                                   "Flash error",
+                                   "External flash configuration error.",
+                                   "Header erasing error",
+                                   "Header validation error",
+                                   "Additional code detected beyond FW",
+                                   "Fw version rejected (anti-rollback)",
+                                   "Unknown error"
+                                };
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Print relevant errpr message.
+  * @param  Error Error code.
+  * @retval None
+  */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  if (eExceptionId <= SFU_EXCPT_UNKNOWN)
+  {
+#ifdef SFU_DEBUG_MODE
+    TRACE("\r\n\t%s",m_aErrorStrings[(uint32_t) eExceptionId]);
+#endif /* SFU_DEBUG_MODE */
+  }
+}
+
+
+/**
+  * @brief  Manage the Exception generated by an IRQ
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   Because of the interruption of the State Machine execution,
+  *         it's not possible to continue without compromising the stability or
+  *         the security of the solution. A System Reset is forced at the end.
+  * @retval None
+  */
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+#ifdef SFU_DEBUG_MODE
+  uint8_t message[150];
+  uint32_t i = 0U;
+
+  /* Avoid warning with cast frombetween char* and uint8_t* */
+  while ((m_aErrorStrings[(uint32_t) eExceptionId][i] != 0u) && (i < 149U))
+  {
+    message[i] = m_aErrorStrings[(uint32_t) eExceptionId][i];
+    i++;
+  }
+  message[i] = 0U;
+
+  /* Print relevant error message */
+  TRACE_IRQ((uint8_t *)"\r\n\t  ");
+  TRACE_IRQ(message);
+#endif /* SFU_DEBUG_MODE */
+
+  /* Try to take an action */
+  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+  The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_BOOT_ForceReboot();
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+void SFU_EXCPT_Security_Error(void)
+{
+  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
+  HAL_Delay(1000);
+  /* While(1) by-passed by an fault injection attack ==> Reset */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  SFU Exception Initialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_Init(void)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU Exception DeInitialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status;
+  /* ADD SRC CODE HERE
+      ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   A System Reset is forced at the end by the caller of this function.
+  *         WARNING: Be aware that this function can be called by an IRQ while
+  *         using the printf, since the printf is not a reentrant function, and using
+  *         the printf inside this function as well, a fault will likely occur.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  switch (eExceptionId)
+  {
+    case SFU_EXCPT_TAMPERING_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  case SFU_EXCPT_GTZC_TZIC_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      /* WARNING: Please consider that at runt-time,  this "case" execution is
+      inside an ISR */
+      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TZIC FAULT!");
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+    case SFU_EXCPT_MEMORY_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_HARD_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+#ifdef SFU_TEST_PROTECTION
+      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
+         ==> this is not an error */
+#endif /* SFU_TEST_PROTECTION */
+      break;
+
+    default:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+  }
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
new file mode 100644
index 00000000..41d53daf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
@@ -0,0 +1,88 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.h
+  * @author  MCD Application Team
+  * @brief   This file contains the error handling elements for SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_ERROR_H
+#define SFU_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * This enum must start from 0.
+  * When adding a new error in the enum below please also:
+  *  1. update IS_SFU_EXCPT
+  *  2. update m_aErrorStrings
+  */
+typedef enum
+{
+  SFU_EXCPT_NONE = 0UL,
+  /* System errors */
+  SFU_EXCPT_MEMORY_FAULT,
+  SFU_EXCPT_HARD_FAULT,
+  SFU_EXCPT_TAMPERING_FAULT,
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  SFU_EXCPT_GTZC_TZIC_FAULT,
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+  /* Specific errors */
+  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
+  SFU_EXCPT_COM_ERR,               /* COM error during the local download of the binary */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  SFU_EXCPT_HEADER_AUTH_ERR,       /* header authentication failure */
+  SFU_EXCPT_DECRYPT_ERR,           /* Decrypt failure */
+  SFU_EXCPT_SIGNATURE_ERR,         /* Signature check failure */
+  SFU_EXCPT_FLASH_ERR,             /* Problem with FLASH */
+  SFU_EXCPT_FLASH_CFG_ERR,         /* Flash configuration issue (external flash) */
+  SFU_EXCPT_HEADER_ERASING_ERR,    /* Header erasing failure */
+  SFU_EXCPT_HEADER_VALIDATION_ERR, /* Header validation failure */
+  SFU_EXCPT_ADDITIONAL_CODE_ERR,   /* Additional code detected beyond the firmware image (malicious SW) */
+  SFU_EXCPT_VERSION_ERR,           /* Anti-rollback check rejected the version to be installed */
+  /* Unknown error */
+  SFU_EXCPT_UNKNOWN                /* To be kept as last error */
+} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
+
+/* External variables --------------------------------------------------------*/
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_Security_Error(void);
+
+SFU_ErrorStatus SFU_EXCPT_Init(void);
+SFU_ErrorStatus SFU_EXCPT_DeInit(void);
+
+void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_ERROR_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
new file mode 100644
index 00000000..a95da12f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
@@ -0,0 +1,103 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fsm_states.h
+  * @author  MCD Application Team
+  * @brief   This file defines the SB_SFU Finite State Machine states.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FSM_STATES_H
+#define SFU_FSM_STATES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * FSM states: this enum must start from 0.
+  */
+typedef enum
+{
+  SFU_STATE_CHECK_STATUS_ON_RESET = 0U, /*!< checks the reset cause and decide how to proceed     */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD,   /*!< SFU checks if a local download must be handled       */
+  SFU_STATE_DOWNLOAD_NEW_USER_FW,       /*!< downloads the encrypted firmware to be installed     */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+  SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL, /*!< SFU checks if a kms blob download must be handled    */
+  SFU_STATE_INSTALL_KMS_BLOB,          /* !< download the new kms_blob */
+#endif /* KMS_ENABLED */
+  SFU_STATE_VERIFY_USER_FW_STATUS,      /*!< checks the internal FLASH state to derive a status   */
+  SFU_STATE_VERIFY_USER_FW_SIGNATURE,   /*!< checks the validity of the active firmware           */
+  SFU_STATE_EXECUTE_USER_FW,            /*!< launch the user application                          */
+  SFU_STATE_HANDLE_CRITICAL_FAILURE,    /*!< deal with the critical failures                      */
+  SFU_STATE_REBOOT_STATE_MACHINE        /*!< a reboot is forced                                   */
+} SFU_BOOT_StateMachineTypeDef; /*!< SFU BOOT State Machine States */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  The following strings associated to the SM state are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the SFU_BOOT_StateMachineTypeDef defined above.
+  *           And the above enum must be a sequence starting from 0
+  */
+#ifdef SFU_DEBUG_MODE
+#if defined(SFU_VERBOSE_DEBUG_MODE) && defined (SFU_BOOT_C)
+char *m_aStateMachineStrings[] = { "Checking Status on Reset.",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Checking if new Fw Image available to download.",
+                                   "Downloading new Fw Image.",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Verifying Fw Image status.",
+                                   "Verifying Fw Image signature.",
+                                   "Executing Fw Image.",
+                                   "Handling a critical failure.",
+                                   "Rebooting the State Machine"
+                                 };
+#endif /* SFU_VERBOSE_DEBUG_MODE && SFU_BOOT_C */
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Exported macros -----------------------------------------------------------*/
+/************ SFU SM States****************************************************/
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_DOWNLOAD_NEW_USER_FW)     || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#else
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FSM_STATES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
new file mode 100644
index 00000000..d7b72718
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
@@ -0,0 +1,1075 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_common.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the "common" functionalities of the image handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_COMMON_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+SFU_IMG_StatusTypeDef SFU_IMG_Status;
+uint32_t SFU_IMG_Line;
+
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_to_test;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/* Functions Definition : helper ---------------------------------------------*/
+/**
+  * @brief  Memory compare with constant time execution.
+  * @note   Objective is to avoid basic attacks based on time execution
+  * @param  pAdd1 Address of the first buffer to compare
+  * @param  pAdd2 Address of the second buffer to compare
+  * @param  Size Size of the comparison
+  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
+  */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
+{
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  for (i = 0U; i < Size; i++)
+  {
+    result |= pAdd1[i] ^ pAdd2[i];
+  }
+
+  if (result == 0x00U)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+
+/**
+  * @brief  Check header signature
+  * @param  pFwImageHeader: pointer to raw header.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef se_status;
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
+  {
+    /* Unused bytes should be set at 0x00 value
+       Comparison with constant time execution */
+    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
+    {
+      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
+    }
+
+    if (result == 0x00U)
+    {
+      /* Check signature of the FW header */
+      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
+      {
+        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
+  *        It handles Firmware TAG verification of a complete buffer by calling
+  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
+  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
+  *        and at the end compare the obtained TAG with the one provided as input
+  *        in pSE_GMCInit parameter.
+  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
+  * @param pSE_Status: Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param SlotNumber index of the slot in the list
+  * @param pSE_Metadata: Firmware metadata.
+  * @param pSE_Payload: pointer to Payload Buffer descriptor.
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_ret_status = SE_ERROR;
+  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
+  /* Loop variables */
+  uint32_t i;
+  uint32_t j;
+  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
+  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
+  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
+  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
+  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
+  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(8)));
+  /* FW chunk produced by the verification procedure if any   */
+  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* FW chunk provided as input to the verification procedure */
+  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* Variables to handle the FW image (this will be split in chunks) */
+  uint32_t payloadsize;
+  uint32_t ppayload;
+  uint32_t scatter_nb;
+  /* Variables to handle FW image size and tag */
+  uint32_t fw_size;
+  uint8_t *fw_tag;
+
+  /* Check the pointers allocation */
+  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
+  {
+    return SFU_ERROR;
+  }
+  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check the parameters value and set fw_size and fw_tag to check */
+  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
+  {
+    fw_size = pSE_Metadata->FwSize;
+    fw_tag = pSE_Metadata->FwTag;
+  }
+  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
+  {
+    fw_size = pSE_Metadata->PartialFwSize;
+    fw_tag = pSE_Metadata->PartialFwTag;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+
+  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
+  {
+    return SFU_ERROR;
+  }
+
+  /*  fix number of scatter block */
+  if (pSE_Payload->PayloadSize[1] != 0U)
+  {
+    scatter_nb = 2U;
+  }
+  else
+  {
+    scatter_nb = 1U;
+  }
+
+
+  /* Encryption process*/
+  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
+
+  /* check for initialization errors */
+  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    for (j = 0; j < scatter_nb; j++)
+    {
+      payloadsize = pSE_Payload->PayloadSize[j];
+      ppayload = pSE_Payload->pPayload[j];
+      i = 0;
+      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
+
+      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
+             (sfu_ret_status == SFU_SUCCESS))
+      {
+
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        ppayload += fw_chunk_size;
+        fw_verified_total_size += fw_chunk_size;
+        i++;
+      }
+      /* this the last path , size can be smaller */
+      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
+      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+      {
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
+                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)),
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        fw_verified_total_size += fw_chunk_size;
+      }
+    }
+  }
+
+  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    if (fw_verified_total_size <= fw_size)
+    {
+      /* Do the Finalization, check the authentication TAG*/
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
+
+      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
+        {
+          *pSeStatus = SE_SIGNATURE_ERR;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+
+          /* Save result for active slot :
+             to avoid single fault attack the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
+          }
+        }
+        else
+        {
+          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+
+          /* Save result for active slot :
+             to avoid single fault attacje the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag_output, SE_TAG_LEN);
+          }
+        }
+      }
+      else
+      {
+        sfu_ret_status = SFU_ERROR;
+      }
+    }
+    else
+    {
+      sfu_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    sfu_ret_status = SFU_ERROR;
+  }
+  return sfu_ret_status;
+}
+
+/**
+  * @brief Fill authenticated info in SE_FwImage.
+  * @param SFU_APP_Status
+  * @param pBuffer
+  * @param BufferSize
+  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
+{
+  /* Check the pointers allocation */
+  if ((pFwHeader == NULL) || (pBuffer == NULL))
+  {
+    return SFU_ERROR;
+  }
+  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Verify Image Header in the slot given as a parameter
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
+  * @note   Not used in Alpha version -
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* use api read to detect possible ECC error */
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                   sizeof(SE_FwRawHeaderTypeDef));
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify signature */
+    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify Fw signature of binary contiguous in flash
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  SlotNumber flash slot to check
+  * @param  pFwImageHeader pointer to fw header
+  * @param  SlotNumber flash slot to check
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
+                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType)
+{
+  SE_Ex_PayloadDescTypeDef  pse_payload;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*  put it OK, to discriminate error in SFU FWIMG parts */
+  *pSeStatus = SE_OK;
+
+  /* Check the parameters value */
+  if (pFwImageHeader == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check SE_FwType parameter, and fix size and offset accordingly */
+  switch (SE_FwType)
+  {
+    case SE_FW_IMAGE_COMPLETE :
+      fw_size = pFwImageHeader->FwSize;
+      fw_offset = 0U;
+      break;
+    case SE_FW_IMAGE_PARTIAL :
+      fw_size = pFwImageHeader->PartialFwSize;
+      fw_offset = pFwImageHeader->PartialFwOffset;
+      break;
+    default :
+      /* error */
+      fw_size = 0U;
+      fw_offset = 0U;
+      break;
+  }
+
+  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
+  pse_payload.PayloadSize[0] = fw_size;
+  pse_payload.pPayload[1] = 0U;
+  pse_payload.PayloadSize[1] = 0U;
+
+  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
+}
+
+/**
+  * @brief Verifies the validity of a slot.
+  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
+  * @param pSlotBegin Start address of a slot.
+  * @param uSlotSize Size of a slot.
+  * @param uFwSize Size of the firmware image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
+{
+  uint8_t *pdata;
+  uint32_t length;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check is already clean */
+  pdata = pSlotBegin + SFU_IMG_IMAGE_OFFSET + uFwSize;
+  length = uSlotSize - SFU_IMG_IMAGE_OFFSET - uFwSize;
+  e_ret_status = SFU_LL_FLASH_Compare(pdata, 0x00000000U, 0xFFFFFFFFU, length);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function clean-up the flash
+  * @note   Not designed to clean-up area inside secure engine isolation.
+  * @note   To clean the slot without erasing the header we write "0x00" except if already written
+  * @param  pSlotBegin Start address of a slot.
+  * @param  uSlotSize Size of a slot.
+  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t pdata;
+  uint32_t slot_begin;
+  SFU_LL_FLASH_write_t pattern;
+  SFU_LL_FLASH_write_t value;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  /* Clean-up pattern initialization */
+  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
+
+  /* Cleaning operation */
+  slot_begin = (uint32_t) pSlotBegin;
+  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
+  {
+    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* If read succeed, then the pattern write is performed only if pattern is not already present */
+      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                          sizeof(SFU_LL_FLASH_write_t));
+      }
+    }
+    else
+    {
+      /* If read fail, then the write is performed unconditionally */
+      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                        sizeof(SFU_LL_FLASH_write_t));
+    }
+
+    /* Reload Watchdog every 4Kbytes */
+    if ((pdata % 0x1000U) == 0U)
+    {
+      (void) SFU_LL_SECU_IWDG_Refresh();
+    }
+  }
+  return e_ret_status;
+}
+
+/* Functions Definition : services ------------------------------------------- */
+
+/**
+  * @brief FW Image Handling (FWIMG) initialization function.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
+{
+  uint32_t i;
+  uint32_t mpu_size;
+  uint32_t mpu_max_size;
+  uint32_t mpu_sub_size;
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+
+  /*
+   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
+   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
+   * starting with 0s.
+   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
+   * side-effects).
+   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
+   */
+  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
+
+  /*
+   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
+      } /* else active slot is properly aligned */
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
+   */
+  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
+  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
+   */
+  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+
+  /*
+   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if(!((((SlotStartAdd[SLOT_ACTIVE_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+        || (((SlotEndAdd[SLOT_ACTIVE_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+  /*
+   * Sanity check: let's make sure headers are under the MPU protection
+   */
+  /* Calculate size of image header MPU region */
+  mpu_max_size = 2U;
+  for (i = 0U; i < SFU_PROTECT_MPU_HEADER_SIZE; i++)
+  {
+    mpu_max_size = mpu_max_size * 2U;
+  }
+  /* Take into account 8 sub-regions (assuming they are continuous) */
+  mpu_sub_size = mpu_max_size / 8U;
+  mpu_size = 0U;
+  for (i = 0U; i < 8U; i++)
+  {
+    if (((~SFU_PROTECT_MPU_HEADER_SREG) & (0x1U << i)) != 0U)
+    {
+      mpu_size = mpu_size + mpu_sub_size;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!((SlotHeaderAdd[SLOT_ACTIVE_1 + i] >= SFU_PROTECT_MPU_HEADER_START)
+            && ((SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SE_FW_HEADER_TOT_LEN) <=
+                (SFU_PROTECT_MPU_HEADER_START + mpu_size))))
+      {
+        TRACE("\r\n= [FWIMG] Header of SLOT_ACTIVE_%d is not under the MPU protection\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
+   */
+  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
+        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief This function makes sure the current active firmware will not be considered as valid any more.
+  *        This function alters the FLASH content.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
+  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image metadata.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  * @note This function populates the FWIMG module variable: fw_image_header_validated
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
+{
+  /*
+   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
+   */
+  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
+  *       fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (SFU_ERROR == e_ret_status)
+  {
+    /* We do not memorize any specific error, the FSM state is already providing the info */
+    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
+  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
+}
+
+/**
+  * @brief Verifies if no malicious code in active slot.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
+{
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
+}
+
+/**
+  * @brief  Control firmware signature
+  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
+                    SE_TAG_LEN) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  else
+  {
+    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+    return SFU_SUCCESS;
+  }
+
+}
+
+/**
+  * @brief Launches the user application.
+  *        The caller must be prepared to never get the hand back after calling this function.
+  *        If a problem occurs, it must be memorized in the bootinfo area.
+  *        If the caller gets the hand back then this situation must be handled as a critical error.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met
+  *       (typically: no security check performed before launching the firmware).
+  * @note This function only handles the "system" aspects.
+  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
+  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
+  *       function (as this needs to be done just before jumping into the user application).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Verify if authentication/integrity/lock SE service performed */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
+
+  /* this function does not return */
+  /* first image identified as master image */
+  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET);
+
+  /* The point below should NOT be reached */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Get the version of the active FW
+  * @note It is up to the caller to make sure the active slot contains a valid active FW.
+  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
+  *       fails.
+  * @param  SlotNumber index of the slot in the list
+  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
+  */
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
+{
+  SE_FwRawHeaderTypeDef fw_image_header;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint16_t version = 0;
+
+  /* check the header of the active FW */
+  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* retrieve the version from the header without any further check */
+    version = fw_image_header.FwVersion;
+  }
+
+  return (version);
+}
+
+/**
+  * @brief Detect if a FW is present in a slot.
+  * @note  Detection done based on MAGIC header + FW signature. Header verification
+  *        not done at this stage for timing optimization.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
+  SE_FwRawHeaderTypeDef *p_header;
+
+  /* Read header */
+  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
+  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
+  {
+    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
+    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
+    {
+      /*
+       * Control if the first 32 bytes (could be more but time consuming ...) are significants
+       * At this location we should find the vector table.
+       * Objective is to detect if the FW image has been erased
+       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
+       */
+      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Validate the active FW image in active slot by installing the header
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /* Header erasing */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  /* Header writing: encrypted part with signature */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
+                                      SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+  /* Header writing : Do not update image state part */
+
+  /* Header writing: previous FW image fingerprint */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
+                                                                    SE_FW_HEADER_FINGERPRINT_LEN),
+                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Get firmware image ID from header.
+  * @param  pFwImageHeader pointer to a structure to handle the header info
+  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
+  */
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  uint32_t active_slot;
+
+  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_1;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_2;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_3;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
+  else
+  {
+    active_slot = SLOT_INACTIVE;
+  }
+
+  return active_slot;
+}
+
+/**
+  * @brief  Check candidate image version is allowed.
+  * @param  ActiveSlot Slot identification used in case of secure counters usage
+  * @param  CurrentVersion Version of currently installed image if any
+  * @param  CandidateVersion Version of candidate image
+  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  UNUSED(ActiveSlot);
+
+  /* If the header of the active firmware is not valid, the CurrentVersion is 0 */
+  if (CurrentVersion == 0U)
+  {
+    /*
+     * If the header of the active firmware is not valid (could comes from an attack attempt, we authorize only the
+     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
+     */
+    if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * It is not allowed to install a Firmware with a lower version than the active firmware.
+     * But we authorize the re-installation of the current firmware version.
+     * We also check that the candidate version is at least the min. allowed version for this device.
+     */
+    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  }
+
+  return e_ret_status;
+}
+
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief Verifies the validity of the metadata associated to a candidate image.
+  *        The anti-rollback check is performed.
+  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure):
+  *       SFU_IMG_CheckPendingInstallation should be called first.
+  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
+  *       @ref SFU_APP_VerifyFwHeader.
+  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint32_t active_slot;
+  uint16_t cur_ver;
+  uint16_t verif_ver;
+
+  /*
+   * - Candidate FW Header Authentication
+   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
+   *       As a consequence: fw_image_header_to_test is already populated
+   *
+   * - Check version is allowed
+   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+   */
+
+  /* Header analysis to find slot based on number with magic tag */
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /* Get the version of active_slot */
+  cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+
+  if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
+  {
+    /* The installation is forbidden */
+    /* Memorize this error as this will be handled as a critical failure */
+    SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+
+    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /* leave now to handle the critical failure in the appropriate FSM state */
+    e_ret_status = SFU_ERROR;
+  }
+  else
+  {
+    /* the anti-rollback check succeeds: the version is fine */
+    /* double check to avoid basic hardware attack attack */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    e_ret_status = SFU_IMG_CheckFwVersion(active_slot, verif_ver, fw_image_header_to_test.FwVersion);
+  }
+
+  /* Return the result */
+  return (e_ret_status);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
new file mode 100644
index 00000000..469b89ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
@@ -0,0 +1,136 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_internal.h
+  * @author  MCD Application Team
+  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
+  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
+  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
+  *          fw_image_header_to_test to install an KMS blob.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_INTERNAL_H
+#define SFU_FWIMG_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_fwimg_regions.h"
+#include "kms_blob_metadata.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Payload Buffer descriptor.
+  * This structure describes how a Firmware is split in Flash.
+  * In the nominal case a Firmware is stored in 1 contiguous area.
+  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
+  * decrypt operation).
+  */
+typedef struct
+{
+  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
+  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
+} SE_Ex_PayloadDescTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief SFU_IMG Flash Status Type Definition
+  * Status of a FLASH operation.
+  */
+typedef enum
+{
+  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
+  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
+  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
+  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
+} SFU_IMG_StatusTypeDef;
+
+/**
+  * @brief RAM chunk used for decryption / comparison / swap
+  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
+  * some function allocates 2 buffer of this size in stack.
+  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
+  */
+#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
+
+#define SFU_IMG_CHUNK_SIZE  (512UL)
+#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief  Status Macro
+  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
+  * activated) and the execution continues.
+  */
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                   while(1==1){;} \
+                                 } while(0==1){;}
+#else
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                 } while(0==1){;}
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
+extern uint32_t SFU_IMG_Line;
+
+extern SE_FwRawHeaderTypeDef fw_image_header_validated;
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/* Exported functions : helper ---------------------------------------------- */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
+SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
+                          uint8_t  *pPayload, uint32_t SE_FwType);
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType);
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_INTERNAL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
new file mode 100644
index 00000000..08724f4a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
@@ -0,0 +1,97 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_services.h
+  * @author  MCD Application Team
+  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
+  *          API definitions.
+  *          These services can be called by the bootloader to deal with images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_SERVICES_H
+#define SFU_FWIMG_SERVICES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_IMG Initialization Status Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_IMG_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_IMG Image Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
+  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
+  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
+  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
+} SFU_IMG_ImgInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall);
+#else
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_SERVICES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
new file mode 100644
index 00000000..9083965c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
@@ -0,0 +1,747 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
+#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
+                               STM32 board specificities */
+#include "tkms.h"
+#include "sfu_interface_crypto_scheme.h"
+#include <string.h>
+#include "kms_platf_objects_interface.h"     /* To get keys handle definitions */
+
+/* Private defines -----------------------------------------------------------*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+#define GCM_TAGBITS_SIZE          128
+#define GCM_IVLEN_BITS            16
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+/* Private variables ---------------------------------------------------------*/
+CK_SESSION_HANDLE EncryptSession;
+CK_SESSION_HANDLE DecryptSession;
+CK_SESSION_HANDLE AuthenticateSession;
+CK_SESSION_HANDLE VerifySession;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static uint8_t *gcm_tag_header;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Get AES key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/**
+  * @brief  Get ECDSA key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
+
+
+/**
+  * @brief Secure Engine Decrypt Init function.
+  *        It is a wrapper of Decrypt_Init function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+  gcm_tag_header = pxSE_Metadata->FwTag;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_MECHANISM cktest_aes_cbc_mechanism =
+  {
+    CKM_AES_CBC,
+    iv_cbc,
+    SE_IV_LEN
+  };
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * In this crypto scheme the Firmware is not encrypted.
+   * The Decrypt operation is called anyhow before installing the firmware.
+   * Indeed, it allows moving the Firmware image blocks in FLASH.
+   * These moves are mandatory to create the appropriate mapping in FLASH
+   * allowing the swap procedure to run without using the swap area at each and every move.
+   *
+   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
+   */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the decryption session */
+  if (se_status == SE_SUCCESS)
+  {
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do as we won't decrypt anything */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Append function.
+  *        It is a wrapper of Decrypt_Append function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffe pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
+  if (0 == InputSize)
+  {
+    /* Nothing to do but we must return a success for the decrypt operation to continue */
+    return (SE_SUCCESS);
+  }
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  /* Buffer decryption */
+  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * The firmware is not encrypted.
+   * The only thing we need to do is to recopy the input buffer in the output buffer
+   */
+  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
+  *pOutputSize = InputSize;
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Finish function.
+  *        It is a wrapper of Decrypt_Finish function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  *peSE_Status = SE_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  memcpy(pOutputBuffer, gcm_tag_header, 16);
+
+  /* End-up decryption session */
+  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do */
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Close the session */
+  rv = C_CloseSession(DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Init function.
+  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  CK_MECHANISM cktest_sha_256_mechanism =
+  {
+    CKM_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize encryption session  */
+    rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest initialization */
+  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Append function.
+  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Buffer encryption */
+  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
+                       (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest calculation */
+  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Finish function.
+  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* End-up encryption session */
+  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* End-up Digest calculation */
+  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Close the session */
+  rv = C_CloseSession(AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Verify Raw Fw Header Tag.
+  *        It verifies the signature of a raw header file.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pFwRawHeader pointer to RawHeader Buffer.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  int32_t fw_raw_header_output_length = SE_TAG_LEN;
+  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
+  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    (CK_BYTE_PTR)gcm_header,
+    ((int32_t)SE_FW_AUTH_LEN),
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  const uint8_t *pPayload;                        /* Metadata payload */
+  int32_t payloadSize;                            /* Metadata length to be considered for hash */
+  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
+  CK_OBJECT_HANDLE hECDSAKey = 0UL;
+  CK_MECHANISM cktest_ecdsa_256_mechanism =
+  {
+    CKM_ECDSA_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointers allocation */
+  if (NULL == pxFwRawHeader)
+  {
+    *peSE_Status = SE_KO;
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  gcm_tag_header = pxFwRawHeader->HeaderSignature;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up decryption session  : control if the tag is correct */
+  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
+
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  pPayload = (const uint8_t *)pxFwRawHeader;
+  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up verification process : control if the signature is correct */
+  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Double Check to avoid basic fault injection */
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+
+    if (se_status == SE_SUCCESS)
+    {
+      /* End-up verification process : control if the signature is correct */
+      rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+      if (rv != CKR_OK)
+      {
+        se_status = SE_ERROR;
+        *peSE_Status = SE_KO;
+      }
+    }
+  }
+
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+  /* Close the session */
+  rv = C_CloseSession(VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
new file mode 100644
index 00000000..992941e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
@@ -0,0 +1,73 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported functions ------------------------------------------------------- */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                uint32_t SE_FwType);
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType);
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader);
+
+#define SE_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType ) \
+  SFU_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType )
+
+#define SE_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+
+#define SE_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType ) \
+  SFU_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType )
+
+#define SE_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+#define SE_VerifyHeaderSignature( peSE_Status, pxFwRawHeader ) \
+  SFU_VerifyHeaderSignature( peSE_Status, pxFwRawHeader )
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* SFU_KMS_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
new file mode 100644
index 00000000..d7bb34fa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
@@ -0,0 +1,187 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage the KMS Images.
+  *          This file contains the kms services the bootloader (sfu_boot) can
+  *             use to deal with the KMS Blob images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_KMS_C
+
+
+#ifdef KMS_ENABLED
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_kms.h"
+#include "sfu_fwimg_internal.h" /* required to re-use kmsblob_image_header_to_test (and SWAP_HDR) in the KMS blob 
+                                   installation procedure */
+#include "sfu_fwimg_regions.h"  /* required because KMS re-uses the SBSFU SWAP area */
+
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * Magic pattern identifying the beginning of a KMS blob.
+  */
+static uint8_t     kms_magic[4] = {"KMSB"};
+
+/**
+  * KMS Blob header (metadata) of the candidate Blob in SWAP: structured format (access by fields)
+  */
+static KMS_BlobRawHeaderTypeDef kmsblob_image_header_to_test;
+static uint32_t                 kmsblob_slot;
+
+/* Private macros ------------------------------------------------------------*/
+/**
+  * The KMS blob header has the same structure as the SBSFU Firmware Header.
+  * Therefore, authenticating a KMS blob header can be done by re-using the SBSFU FWIMG service authenticating a FW
+  * Header.
+  * The authentication of the KMS blob itself is not in the scope of sfu_kms, this is handled by the KMS middleware.
+  */
+#define SFU_KMS_AUTHENTICATE_BLOB_HEADER SFU_IMG_CheckAndGetFWHeader
+
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Check that there is a Blob to Install ==> KMSB MAGIC present at the beginning of a DWN slot ?
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+
+  /*
+   * The KMS blob header uses a structure dedicated Header.
+   * In this function we focus only on the KMS blob header, not the entire KMS blob.
+   */
+
+  for (uint32_t i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      /*  Loading the KMS blob header contained in the SWAP area to verify if it can be a valid KMS blob */
+      if (SFU_LL_FLASH_Read((uint8_t *)(uint32_t)(&kmsblob_image_header_to_test),
+                            (uint8_t *)SlotStartAdd[SLOT_DWL_1 + i],
+                            sizeof(KMS_BlobRawHeaderTypeDef)) == SFU_SUCCESS)
+      {
+        /* Is there any KMSBlob present in the SWAP ? */
+        if (memcmp((uint8_t *)&kmsblob_image_header_to_test.KMSMagic, kms_magic, sizeof(kms_magic)) == 0)
+        {
+          /*
+           * Check the authenticity of the KMS Blob stored in the DWN slot.
+           * This check is restricted to the authentication of the KMS blob header.
+           * Authenticating the KMS blob itself is the role of the KMS module (KMS middleware).
+           */
+          kmsblob_slot = SLOT_DWL_1 + i; /* Save also DWN slot for later use */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Retrieve information about the KMS blob hdr and location in flash
+  * @param  pHdr is the pointer to the encrypted blob header
+  * @param  pFlash is the pointer to the blob location in flash
+  * @retval none
+  */
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  if ((ppHdr != NULL) && (ppFlash != NULL))
+  {
+    *ppHdr = (uint8_t *)(uint32_t)&kmsblob_image_header_to_test;
+    *ppFlash = (uint8_t *)(((uint32_t)SlotStartAdd[kmsblob_slot]) + sizeof(kmsblob_image_header_to_test));
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the Blob
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_EraseBlob(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /*  Erase in flash  */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                         (uint8_t *) SlotStartAdd[kmsblob_slot],
+                                         SLOT_SIZE(kmsblob_slot));
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Checks if there is a pending Blob installation.
+  *        3 situations can occur:
+  *        A. First installation request for a blob: a blob is ready to be installed but the installation has never
+  *           been triggered so far.
+  *        B. Blob installation to be retried: a blob installation has been interrupted (switch off) and we can restart
+  *           its installation.
+  *        C. No blob installation pending.
+    * @note This function populates the FWIMG module variable: kmsblob_image_header_to_test.
+  *         If a KMS blob is present then it is copied in kmsblob_image_header_to_test.
+  * @param  None.
+  * @retval SFU_KMS_BlobInstallStateTypeDef Pending Installation status (installation requested or not)
+  */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void)
+{
+  SFU_KMS_BlobInstallStateTypeDef e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+
+  /*
+   * While the SWAP AREA contains a KMSB Magic, it means the KMSBlob installation is not finalized.
+   *
+   */
+  if (SFU_SUCCESS == SFU_KMS_BlobToInstall())
+  {
+    /*
+     * A KMS blob is available for installation:
+     * kmsblob_image_header_to_test has been populated with this blob.
+     */
+    e_ret_state = SFU_KMS_BLOBIMAGE_TO_INSTALL;
+  }
+  else
+  {
+    /* No pending update */
+    e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+  }
+
+  return e_ret_state;
+}
+
+#endif /* KMS_ENABLED */
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
new file mode 100644
index 00000000..8a47b5e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
@@ -0,0 +1,78 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.h
+  * @author  MCD Application Team
+  * @brief   This file contains the KMS Blob service (SFU_KMS_ENABLED) API definitions.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_KMS Installation Status Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_KMS_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_KMS_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_KMS_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_KMS_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_KMS_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_KMS_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_KMS Blob Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_BLOBIMAGE_TO_INSTALL = 0x0U,   /*!< There is a KMS blob to be installed */
+  SFU_KMS_NO_BLOBUPDATE,                 /*!< No KMS blob installation pending */
+} SFU_KMS_BlobInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void);
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash);
+
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void);
+SFU_ErrorStatus SFU_KMS_EraseBlob(void);
+
+SFU_ErrorStatus SFU_KMS_InvalidateCurrentFirmware(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImgMetadata(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImg(void);
+SFU_ErrorStatus SFU_KMS_LaunchActiveImg(void);
+int32_t SFU_KMS_GetActiveFwVersion(void);
+SFU_ErrorStatus SFU_KMS_HasValidActiveFirmware(void);
+SFU_ErrorStatus SFU_KMS_Validation(uint8_t *pHeader);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_KMS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c
new file mode 100644
index 00000000..fb5936c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c
@@ -0,0 +1,803 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update LOADER module.
+  *          This file provides set of firmware functions to manage SFU local
+  *          loader functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include <stdlib.h>
+#include "main.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h" /* for metadata authentication */
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_services.h"      /* for version checking & to check if a valid FW is installed (the local
+                                        bootloader is a kind of "application" running in SB_SFU) */
+#include "app_sfu.h"
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t
+fw_decrypted_chunk[SFU_COM_YMODEM_PACKET_1K_SIZE];/*!< Buffer used for decryption during reception process */
+static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
+static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
+static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
+static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
+static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
+static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
+static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
+static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_Init(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  */
+
+  /*
+   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
+   * when doing a length alignment before writing in FLASH.
+   */
+  if (0U != (uint32_t)(sizeof(fw_decrypted_chunk) % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The decrypt buffer must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Decrypt buffer size (%d) is not matching the FLASH constraints", sizeof(fw_decrypted_chunk));
+    return SFU_ERROR;
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  DeInitialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DeInit(void)
+{
+  /*
+   * ADD SRC CODE HERE
+   */
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Download a new User Fw.
+  *         Writes firmware received via Ymodem in FLASH.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  p_DwlSlot identification of the downloaded area
+  * @param  p_Size Size of the downloaded image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
+                                             uint32_t *pSize)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
+  SE_StatusTypeDef e_se_status;
+  int32_t fw_tag_len = 0;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  /* Check the pointers allocation */
+  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Refresh Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Transfer FW Image via YMODEM protocol */
+  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
+
+  /* Initialize global variables to be used during the YMODEM process */
+  m_uDwlAreaAddress = 0U;
+  m_uDwlAreaStart = 0U;
+  m_uDwlAreaSize = 0U;
+  m_uFileSizeYmodem = 0U;
+  m_uNbrBlocksYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uDwlSlot = SLOT_ACTIVE_1;
+  m_LoaderStatus = SFU_LOADER_ERR_COM;
+
+  /* Receive the FW in RAM and write it in the Flash*/
+  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
+  {
+    if (*pSize > 0U)
+    {
+      /* File download correct*/
+      m_LoaderStatus = SFU_LOADER_OK;
+    }
+  }
+  else
+  {
+    /* Nothing to do : m_LoaderStatus updated during during YModem process */
+  }
+
+  /* Provide slot information to the caller
+     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
+     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
+  *pDwlSlot = m_uDwlSlot;
+
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    /* End of decryption process */
+    fw_tag_len = sizeof(fw_tag_output);
+    if (SE_Decrypt_Finish(&e_se_status, fw_tag_output, &fw_tag_len) != SE_SUCCESS)
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+
+    }
+    else if (e_se_status != SE_OK)
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+    }
+    else
+    {
+      /* Nothing */
+    }
+  }
+
+  *peSFU_LOADER_Status = m_LoaderStatus;
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+  int32_t fw_decrypted_chunk_size;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet*/
+    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
+  if (m_uPacketsReceived == 1U)
+  {
+
+    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+    }
+
+    /* Clear Download application area (including TRAILERS area) */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+          SFU_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    /* Initialize decryption process */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if (e_se_status != SE_OK)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /* Store FW image header in Flash */
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, SE_FW_HEADER_TOT_LEN) ==
+            SFU_SUCCESS)
+        {
+          /* Shift the DWL area pointer */
+          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+          rx_size -= SE_FW_HEADER_TOT_LEN;
+          p_data += SE_FW_HEADER_TOT_LEN;
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
+      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+      {
+        m_uDwlAreaAddress += rx_size;
+        p_data += rx_size;
+        rx_size = 0U;
+      }
+      /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be deccrypted */
+      else
+      {
+        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+      }
+    }
+
+    /* remaining bytes to decrypt ? */
+    if (rx_size != 0U)
+    {
+      fw_decrypted_chunk_size = rx_size;
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
+              != SE_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /*Nothing */
+      }
+    }
+  }
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL image size */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Set dimension to the appropriate length for FLASH programming.
+     * Example: 64-bit length for L4.
+     */
+    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
+    {
+      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+      uOldSize = rx_size;
+      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+      while (uOldSize < rx_size)
+      {
+        fw_decrypted_chunk[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL area */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Write Data in Flash */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress += (rx_size);
+    }
+    else
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#else /* MINICOM_YMODEM */
+/* Minicom variant of the YMODEM protocol: uses 128B packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+  int32_t fw_decrypted_chunk_size;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
+    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_SIZE);
+    }
+  }
+
+
+  /*
+   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
+   */
+
+  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
+     not encrypted  */
+  if (1 == m_uPacketsReceived)
+  {
+    /* First packet: beginning of header */
+    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
+    {
+      /* Copy the beginning of the header */
+      memcpy(fw_header, p_data, rx_size);
+      rx_size = 0U; /* nothing more to do */
+    }
+    else
+    {
+      /* Unexpected case */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else if (2U == m_uPacketsReceived)
+  {
+    /* Second packet: end of header (64 bytes) */
+    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
+    rx_size -= 64U;
+    p_data += 64U;
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+
+      /* Clear Download application area (including TRAILERS area) */
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+              SFU_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* Initialize decryption process */
+        if ((e_ret_status == SFU_SUCCESS)
+            && (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS))
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+          e_ret_status = SFU_ERROR;
+        }
+        else if (e_se_status != SE_OK)
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+          e_ret_status = SFU_ERROR;
+        }
+        else
+        {
+          /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
+          if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
+              == SFU_SUCCESS)
+          {
+            /* Shift the DWL area pointer */
+            m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+          }
+          else
+          {
+            m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+      }
+      /* The remaining 64 bytes of data must be handled : standard processing */
+    }
+  }
+  /*
+   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
+   */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding
+     */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+      {
+        /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
+        m_uDwlAreaAddress += rx_size;
+        p_data += rx_size;
+        rx_size = 0U;
+      }
+      else
+      {
+        /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be decrypted */
+        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+      }
+    }
+
+    /* remaining bytes to decrypt ? */
+    if (rx_size != 0)
+    {
+      fw_decrypted_chunk_size = rx_size;
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
+              != SE_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /*Nothing */
+      }
+
+      /* Check size to avoid writing beyond DWL image size */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Set dimension to the appropriate length for FLASH programming.
+       * Example: 64-bit length for L4.
+       */
+      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+           sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+        uOldSize = rx_size;
+        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                             (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+        while (uOldSize < rx_size)
+        {
+          p_data[uOldSize] = 0xFF;
+          uOldSize++;
+        }
+      }
+
+      /* Check size to avoid writing beyond DWL area */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Write Data in Flash */
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
+        {
+          m_uDwlAreaAddress += (rx_size);
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+
+
+/**
+  * @brief  Verifies the Raw Fw Header received. It checks if the header is
+  *         authentic and if the fields are ok with the device (e.g. size and version).
+  * @note   Please note that when the new image is installed, this metadata is checked
+  *         by @ref SFU_IMG_CheckCandidateVersion.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  pBuffer: pointer to header Buffer.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef              e_se_status;
+  SE_FwRawHeaderTypeDef         *p_x_fw_raw_header;
+  SFU_FwImageFlashTypeDef       fw_image_flash_data;
+  uint16_t                      cur_ver;
+  uint16_t                      verif_ver;
+  uint32_t                      active_slot;
+
+  /*Parse the received buffer*/
+  p_x_fw_raw_header = (SE_FwRawHeaderTypeDef *)(uint32_t)pBuffer;
+  /*Check if the received header packet is authentic*/
+  if (SE_VerifyHeaderSignature(&e_se_status, p_x_fw_raw_header) != SE_ERROR)
+  {
+    active_slot = SFU_IMG_GetFwImageSlot(p_x_fw_raw_header);
+    /*
+     * 1 slot per image configuration. Identify the download area.
+     *   It will be based on SFU magic :
+     *   - dwl slot is the active_slot if configured.
+     *   - else : SLOT_ACTIVE_1
+     */
+    m_uDwlSlot = active_slot;
+    if (SLOT_SIZE(m_uDwlSlot) == 1U)
+    {
+      m_uDwlSlot = SLOT_ACTIVE_1;
+    }
+    SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
+
+    /* Assign the download flash address to be used during the YMODEM process */
+    m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
+    m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
+
+    /*
+     * Check if the version is allowed
+     * ==> SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+     */
+    cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, cur_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+
+
+    /*
+     * Control of version and length is done twice to avoid basic hardware attack
+     * This more important for the 1 image configuration as the installation is done during the download procedure
+     * For the 2 images configuration anti-rollback will be checked again during installation process
+     */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, verif_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, verif_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+  }
+  else
+  {
+    /* Header authentication failure */
+    m_LoaderStatus = SFU_LOADER_ERR_AUTH_FAILED;
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h
new file mode 100644
index 00000000..7467d978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update local
+  *          loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOADER_H
+#define SFU_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Local loader status Type Definition
+  */
+typedef enum
+{
+  SFU_LOADER_OK                            = 0x00U,
+  SFU_LOADER_ERR_COM                       = 0x01U,
+  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
+  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
+  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
+  SFU_LOADER_ERR_FLASH                     = 0x05U,
+  SFU_LOADER_ERR_CRYPTO                    = 0x06U
+} SFU_LOADER_StatusTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LOADER_Init(void);
+SFU_ErrorStatus SFU_LOADER_DeInit(void);
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
+                                             uint32_t *p_Size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
new file mode 100644
index 00000000..8164c740
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
@@ -0,0 +1,229 @@
+/**
+  ******************************************************************************
+  * @file    sfu_mpu_isolation.c
+  * @author  MCD Application Team
+  * @brief   SFU MPU isolation primitives
+  *          This file provides functions to manage the MPU isolation of the Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_mpu_isolation.h"
+#include "sfu_low_level_security.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_SE_STACK_Clean(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief Clean SE Stack.
+  *
+  */
+static void SFU_SE_STACK_Clean(void)
+{
+  uint32_t sp_base = SE_REGION_RAM_START;
+  uint32_t sp_top = SE_REGION_RAM_STACK_TOP;
+  uint32_t sp = __get_MSP();
+  if ((sp > sp_base) && (sp <= sp_top))
+  {
+    while (sp_base < sp)
+    {
+      *(__IO uint32_t *)sp_base = 0U;
+      sp_base += 4U;
+    }
+  }
+  else
+  {
+    /*  error trigger a reset */
+    HAL_NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @brief This is the Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  * @note Installed in startup_stm32xxxx.s
+  *
+  * This handler handles 2 requests:
+  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter
+  * \li (see @ref SE_FunctionIDTypeDef)
+  * \li Internal SB_SFU SVC: run a SB_SFU privileged operation provided as a parameter (see @ref SFU_MPU_PrivilegedOpId)
+  */
+void MPU_SVC_Handler(uint32_t *args)
+{
+  /* in PSP (args) contains caller context as follow *
+    * args[0] :R0
+    * args[1] :R1
+    * args[2] :R2
+    * args[3] :R3
+    * args[4] :R12
+    * args[5] :LR
+    * args[6] :PC to return after exception
+    * args[7] :xPSR
+  */
+  /*  read code OP of instruction that generate SVC interrupt
+   *  bottom 8-bits of the SVC instruction code OP are SVC value  */
+  uint8_t code = ((uint8_t *)args[6])[-2];
+
+  switch (code)
+  {
+    case 0:
+      /* A Secure Engine service is called */
+      SE_SVC_Handler(args);
+      break;
+    case 1:
+      /* Internal SB_SFU privileged service */
+      SFU_MPU_SVC_Handler(args);
+      break;
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This function triggers a SB_SFU Privileged Operation requested with SB_SysCall
+  * @param args arguments
+  *             The first argument is the identifier of the requested operation.
+  * @retval void
+  */
+void SFU_MPU_SVC_Handler(uint32_t *args)
+{
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+
+  switch (args[0])
+  {
+    case SB_SYSCALL_LAUNCH_APP:
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Disable (Hide) Hide Protection Area */
+      SET_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS);
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* Clean SE STACK RAM */
+      SFU_SE_STACK_Clean();
+      /* Release CM4 (via SRAM) */
+      *pSbsfuFlag = SBSFU_BOOTED;
+#if defined(SFU_MPU_PROTECT_ENABLE)
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+      SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+      HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Check Hide Protection Area */
+      if (READ_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS) != FLASH_ACR2_HDPADIS)
+      {
+        /* Security issue : execution stopped ! */
+        HAL_NVIC_SystemReset();
+      }
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* make sure to return into application in privileged mode */
+      __set_CONTROL(__get_CONTROL() & ~0x3U); /* clear process stack & unprivileged bit */
+      launch_application(args[1], (uint32_t)jump_to_function);
+      break;
+    case SB_SYSCALL_RESET:
+      HAL_NVIC_SystemReset();
+      break;
+    case SB_SYSCALL_MPU_CONFIG:
+#if defined(SFU_MPU_PROTECT_ENABLE)
+      /* Privileged mode required for MPU re-configuration */
+      (void)SFU_LL_SECU_SetProtectionMPU(SFU_SECOND_CONFIGURATION);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DMA_CONFIG:
+#if defined(SFU_DMA_PROTECT_ENABLE)
+      /* Privileged mode required for DMA re-configuration (clocks access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDMA();
+#endif /* SFU_DMA_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DAP_CONFIG:
+#if defined(SFU_DAP_PROTECT_ENABLE)
+      /* Privileged mode required for DAP re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDAP();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_TAMPER_CONFIG:
+#if defined(SFU_TAMPER_PROTECT_ENABLE)
+      /* Privileged mode required for TAMPER re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionANTI_TAMPER();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    case SB_SYSCALL_GTZC_CONFIG:
+      /* Privileged mode required for GTZC checks */
+      SFU_LL_SECU_CheckProtectionGTZC();
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This functions triggers a SB_SFU system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SFU_MPU_SysCall(uint32_t syscall, ...)
+{
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+    */
+  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate a SB_SFU syscall */
+}
+
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t SFU_MPU_IsUnprivileged(void)
+{
+  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
+}
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void SFU_MPU_EnterUnprivilegedMode(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
+  __set_CONTROL(__get_CONTROL() | 3U); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c
new file mode 100644
index 00000000..c2740714
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c
@@ -0,0 +1,61 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar file integrated in the user
+  *          application.
+  * @note    This file is compiled in the scope of SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_regions.h"
+#include "se_def_metadata.h"
+#include <string.h> /* needed for memset (see WriteInstallHeader)*/
+
+
+/**
+  * @brief  Write in Flash the next header image to install.
+  *         This function is used by the local loader to request a Firmware installation (at next reboot).
+  * @param  fw_header FW header of the FW to be installed
+  * @retval SFU_SUCCESS if successful, otherwise SFU_ERROR
+  */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header)
+{
+  return SFU_SUCCESS;           /* Nothing to do */
+}
+
+/**
+  * @brief  Provide the area descriptor to write a FW image in Flash.
+  *         This function is used by the local loader to know where to store a new Firmware Image before asking for its
+  *         installation.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pArea pointer to area descriptor
+  * @retval none
+  */
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea)
+{
+  pArea->DownloadAddr = SlotStartAdd[DwlSlot];
+  pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(DwlSlot);
+  pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h
new file mode 100644
index 00000000..c234da77
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h
@@ -0,0 +1,58 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware
+  *          Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar
+  *          file integrated in the user application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_NEW_IMAGE_H
+#define SFU_NEW_IMAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Specifies a structure containing values related to the management of multi-images in Flash.
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+  uint32_t  ExecutionAddr;         /*!< The execution address for the FwImage in UserFlash */
+} SFU_FwImageFlashTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header);
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_NEW_IMAGE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
new file mode 100644
index 00000000..d167b5ab
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
@@ -0,0 +1,324 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_test.h"
+#include "main.h"
+#include "sfu_trace.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "string.h" /* required for strncmp */
+
+#if defined(SFU_TEST_PROTECTION)
+
+extern RTC_HandleTypeDef RtcHandle;
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_ISOLATION 1
+
+/* Automatic tests : list of tests (Address, Message, Operation */
+/* Flash programming by 64 bits */
+#define SHIFT_FLASH_WRITE (8U-1U)
+
+/* Private variables ---------------------------------------------------------*/
+static ProtectionTest_t aProtectTests[] =
+{
+#ifdef SFU_MPU_PROTECT_ENABLE
+  {SFU_RAM_BASE, "MPU SRAM start add", TEST_EXECUTE},
+  {SFU_RAM_END - 3U, "MPU SRAM end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
+  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
+  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
+  /* READ_FLASH is possible only in privileged mode */
+  {INTVECT_START, "Init. Vector", TEST_READ_FLASH},
+  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_WRP_PROTECT_ENABLE
+  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
+  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
+  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
+#endif /* SFU_WRP_PROTECT_ENABLE */
+#ifdef SFU_PCROP_PROTECT_ENABLE
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
+  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
+                                                                                         writing test */
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
+  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+#if defined(TEST_ISOLATION)
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
+  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
+                                                                         64bits writing test + WRP protection applies */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
+  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
+  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
+                                                                    that initializes all the variables in the binary. */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
+  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+#endif /* TEST_ISOLATION  */
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Testing the MPU protection of the OBs */
+  /*
+   * WL55JC
+   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
+   * 0x1FFF 7818 Reserved Write protection 1A
+   * 0x1FFF 7820 Reserved Write protection 1B
+   */
+  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFF7800", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFF7818", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFF7820", TEST_WRITE_FLASH},
+#endif /* SFU_MPU_PROTECT_ENABLE  */
+  {0xAAAAAAAA, "Execution successful", TEST_END},
+};
+
+
+/* Automatic test : list of operation */
+uint8_t aTestOperation[][20] =
+{
+  "write 8 bytes",
+  "read 1 byte",
+  "erase 512 bytes",
+  "write 4 bytes",
+  "read 1 byte",
+  "execute",
+  "end"
+};
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_TEST_Protection(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
+  * @param  None.
+  * @retval None.
+  */
+static void SFU_TEST_Protection(void)
+{
+  uint32_t test_idx;
+  uint32_t flashErrCode = 0;
+  uint64_t pattern = 0U;
+  uint32_t page_error = 0U;
+  FLASH_EraseInitTypeDef p_erase_init;
+  TestStatus status = TEST_IN_PROGRESS;
+  __IO uint8_t tmp;
+  void (*func)(void);
+
+  /*
+    * Now checking the security
+    * We will try to access protected @ and run protected code.
+    * Each time a a flash error will be raised or a reset will be generated by IP protection.
+    * At next boot we read the backup register to check the next @ until all addresses have been verified.
+    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
+    * FWALL/Code Isolation
+    */
+
+  do
+  {
+    /* slow down execution */
+    HAL_Delay(100);
+
+    /* Increment test number for next execution */
+    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
+    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
+           aProtectTests[test_idx].address);
+
+    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
+    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
+        && (aProtectTests[test_idx].address > 0x00000FFFU))
+    {
+      switch (aProtectTests[test_idx].type)
+      {
+        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_FLASH :
+          HAL_FLASH_Unlock();
+          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
+          HAL_FLASH_Lock();
+          flashErrCode = HAL_FLASH_GetError();
+          printf("\r\nflash error code: %x", flashErrCode);
+          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+
+          /*
+           * OBs protection test: no MPU enabled because the OB cannot be written directly.
+           * A flash error should occur.
+           */
+          break;
+
+        /* Trying to read in FLASH : RDP set in case of PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_READ_FLASH :
+          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
+          HAL_Delay(1);                                                 /* ensure Flag is set */
+          /*
+           * When Isolation activated : RESET should be generated
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
+          {
+            status = TEST_ERROR;
+          }
+
+          break;
+
+        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_ERASE_FLASH :
+          HAL_FLASH_Unlock();
+          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
+          p_erase_init.NbPages     = 1;
+          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
+          HAL_FLASH_Lock();
+          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+          break;
+
+        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_RAM :
+          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
+          status = TEST_ERROR;
+          break;
+
+        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_READ_RAM :
+          tmp = *(uint8_t *)aProtectTests[test_idx].address;
+          printf(" value : %d ", tmp);
+          status = TEST_ERROR;
+          break;
+
+          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
+        case TEST_EXECUTE :
+          func = (void(*)(void))(aProtectTests[test_idx].address);
+          func();
+          status = TEST_ERROR;
+          break;
+
+        /* End of execution */
+        case TEST_END :
+          status = TEST_COMPLETED;
+          break;
+
+        default :
+          break;
+      }
+    }
+  } while (status == TEST_IN_PROGRESS) ;
+
+  if (status == TEST_ERROR)
+  {
+    SFU_TEST_Error();
+  }
+  else if (status == TEST_COMPLETED)
+  {
+    /* reset for next run (need a RESET of the platform to restart a session) */
+    printf("\b\b\b\b\b\b\b\b");
+    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
+  }
+}
+
+/**
+  * @brief  Initialization of backup register and start test
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Init(void)
+{
+  /* Use register DR0 to know which if the test sequence is in progress or done */
+  /* Use register DR1 to know which test to run after a reset */
+
+  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
+  {
+    return;
+  }
+  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
+                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
+                                                                  reset test index (DR1) */
+  {
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+  }
+
+  /* Start test */
+  SFU_TEST_Protection();
+}
+
+/**
+  * @brief  Reset backup register to be able to execute a new test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Reset(void)
+{
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+}
+
+/**
+  * @brief  Error detected during test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Error(void)
+{
+  printf(" ===> KO!!!!!");
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
+}
+
+#endif /* SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
new file mode 100644
index 00000000..375e610f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
@@ -0,0 +1,81 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Test Protections functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TEST_H
+#define SFU_TEST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "app_sfu.h"
+
+#if defined(SFU_TEST_PROTECTION)
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  TEST_WRITE_FLASH = 0U,                /* Writing test in FLASH */
+  TEST_READ_FLASH,                      /* Reading test in FLASH */
+  TEST_ERASE_FLASH,                     /* Erasing test in FLASH */
+  TEST_WRITE_RAM,                       /* Writing test in RAM */
+  TEST_READ_RAM,                        /* Reading test in RAM */
+  TEST_EXECUTE,                         /* Execution function test */
+  TEST_END,                             /* Last test : Success ! */
+} TestType;
+
+typedef enum
+{
+  TEST_IN_PROGRESS = 0U,                /* Test in progress */
+  TEST_COMPLETED,                       /* Test ended : success */
+  TEST_ERROR,                           /* Test aborted : error */
+} TestStatus;
+
+
+#define PROTECT_MSG_LEN (35U)           /* message to be displayed length           */
+typedef struct
+{
+  uint32_t address;                     /* address to be tested */
+  uint8_t msg[PROTECT_MSG_LEN];         /* message to be displayed when testing */
+  TestType type;                        /* type of test */
+} ProtectionTest_t;
+
+/* Exported constants --------------------------------------------------------*/
+/* Magic number saved in DR0 backup register */
+#define MAGIC_TEST_DONE          0xAAA2
+#define MAGIC_TEST_INIT          0xAAA3
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_TEST_Init(void);
+void SFU_TEST_Reset(void);
+void SFU_TEST_Error(void);
+
+#endif /* SFU_TEST_PROTECTION */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TEST_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h
new file mode 100644
index 00000000..cf6d3387
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SFU_TRACE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TRACE_H
+#define SFU_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_com_trace.h"
+#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+/* External variables --------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid
+                                                                        faults. printf is not rieentrant */
+#define TRACE   (void) printf
+#else
+#define TRACE(...)
+#define TRACE_IRQ(pbuffer)
+#endif /* SFU_DEBUG_MODE */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c
new file mode 100644
index 00000000..a502fa43
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c
@@ -0,0 +1,581 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.c
+  * @author  MCD Application Team
+  * @brief   SFU Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+extern RTC_HandleTypeDef RtcHandle;
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+/* Private variables ---------------------------------------------------------*/
+static UART_HandleTypeDef   UartHandle;
+static CRC_HandleTypeDef    CrcHandle;
+
+/* Private function prototypes -----------------------------------------------*/
+static void     SFU_LL_Error_Handler(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Initialize CRC */
+  e_ret_status = SFU_LL_CRC_Init();
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF CRC Init.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure the peripheral clock */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+
+  /* Configure CRC with default polynomial - standard configuration */
+  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU  IF CRC Configuration.
+  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
+  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Check the parameters */
+  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
+
+  /* Switch to the selected configuration */
+  CrcHandle.Instance = CRC;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  switch (eCRCConfg)
+  {
+    case SFU_CRC_CONFIG_DEFAULT:
+      /* The Default polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+      /* The default init value is used */
+      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+      /* The input data are 32-bit long words */
+      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    case SFU_CRC_CONFIG_16BIT:
+      /* The CRC-16-CCIT polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+      /* The zero init value is used */
+      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+      CrcHandle.Init.InitValue               = 0U;
+      /* The input data are 8-bit long */
+      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    default:
+      /* Invalid parameter */
+      e_ret_status = SFU_ERROR;
+      break;
+  }
+
+  /* Proceed to CRC Init (Correct Parameters) */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  SFU IF CRC Calculate.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  BufferLength: buffer length in bytes.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
+}
+
+/**
+  * @brief SFU UART Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = SFU_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+  if (HAL_UART_Init(&UartHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief SFU IF UART DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  SFU IF Write data (send).
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  DataLength: pointer to the 128bit data to write.
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  Timeout: Timeout duration.
+  * @retval status of the write operation
+  *         SFU_ERROR : if the write operation is not performed
+  *         SFU_SUCCESS : if the write operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF Read data (receive).
+  * @param  pData: pointer to the 128bit data where to store the received data.
+  * @param  DataLength: the length of the data to be read in bytes.
+  * @param Timeout: Timeout duration.
+  * @retval status of the read operation
+  *         SFU_ERROR : if the read operation is not performed
+  *         SFU_SUCCESS : if the read operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU HAL IF Flush.
+  * @param  None.
+  * @retval status of the operation.
+  */
+SFU_ErrorStatus SFU_LL_UART_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+
+  return SFU_SUCCESS;
+}
+
+#if  defined(CORE_CM0PLUS)
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief SFU IF RTC Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief SFU IF RTC DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+#endif /* CORE_CM0PLUS */
+
+/**
+  * @brief SFU IF RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer.
+  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  *        the RTC clock source; in this case the Backup domain will be reset in
+  *        order to modify the RTC Clock source, as consequence RTC registers (including
+  *        the backup registers) and RCC_BDCR register are set to their reset values.
+  * @retval None
+  */
+void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  RCC_OscInitTypeDef        RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+  UNUSED(hrtc);
+  /*-1- Enables access to the backup domain */
+  /* To enable access on RTC registers */
+
+  HAL_PWR_EnableBkUpAccess();
+
+  /*-2- Configure LSE/LSI as RTC clock source */
+#ifdef RTC_CLOCK_SOURCE_LSE
+
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#elif defined (RTC_CLOCK_SOURCE_LSI)
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
+  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#else
+#error Please select the RTC Clock source inside the main.h file
+#endif /*RTC_CLOCK_SOURCE_LSE*/
+
+  /*-3- Enable RTC peripheral Clocks */
+  /* Enable RTC Clock */
+  __HAL_RCC_RTC_ENABLE();
+
+  /* Enable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_ENABLE();
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  /*-4- Configure the NVIC for RTC Tamper */
+  HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0x0FU, 0U);
+  HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+
+  __HAL_RCC_RTC_DISABLE();
+
+  /* Disable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_DISABLE();
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in SFU application.
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral Clock Enable */
+    SFU_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    SFU_UART_TX_GPIO_CLK_ENABLE();
+    SFU_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : SFU_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
+    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : SFU_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
+    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral clock disable */
+    SFU_UART_CLK_DISABLE();
+
+    /* GPIO DeInit*/
+    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
+    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
+
+  }
+
+
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @param  None
+  * @retval None
+  */
+static void SFU_LL_Error_Handler(void)
+{
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  while (1 == 1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @}
+  */
+/**
+  * @brief function checking if a buffer is in se ram.
+  * @param pBuff: Secure Engine protected function ID.
+  * @param length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in se ram, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((length != 0U) && (!((0xFFFFFFFFUL - addr_start) < length))
+      && ((addr_end  <= SE_REGION_RAM_END) && (addr_start >= SE_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h
new file mode 100644
index 00000000..da4792af
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h
@@ -0,0 +1,132 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef  SFU_LOW_LEVEL_H
+#define  SFU_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU CRC Configuration definition
+  */
+typedef enum
+{
+  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
+  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
+  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
+} SFU_CRC_ConfigTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Uncomment to enable the adequate Clock Source */
+#define RTC_CLOCK_SOURCE_LSI
+/*#define RTC_CLOCK_SOURCE_LSE*/
+
+#ifdef RTC_CLOCK_SOURCE_LSI
+#define RTC_ASYNCH_PREDIV    0x1FU
+#define RTC_SYNCH_PREDIV     0x3FF
+#endif /* RTC_CLOCK_SOURCE_LSI */
+
+#ifdef RTC_CLOCK_SOURCE_LSE
+#define RTC_ASYNCH_PREDIV  0x7FU
+#define RTC_SYNCH_PREDIV   0x00FFU
+#endif /* RTC_CLOCK_SOURCE_LSE */
+
+/* External variables --------------------------------------------------------*/
+extern __IO uint32_t  DummyMemAccess;
+#if defined(SFU_LOW_LEVEL_C)
+#if defined(IT_MANAGEMENT)
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+__IO uint32_t DummyMemAccess;
+#endif /* defined(IT_MANAGEMENT) */
+#endif /* defined(SFU_LOW_LEVEL_C) */
+
+
+/* Exported macros -----------------------------------------------------------*/
+#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
+                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
+                               ((CONF) == SFU_CRC_CONFIG_16BIT))
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+#define SFU_LL_DummyAccess() \
+  do{ \
+  }while(0)
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus    SFU_LL_Init(void);
+SFU_ErrorStatus    SFU_LL_DeInit(void);
+
+SFU_ErrorStatus    SFU_LL_CRC_Init(void);
+SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
+uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
+
+SFU_ErrorStatus    SFU_LL_UART_Init(void);
+SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
+SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Flush(void);
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus SFU_LL_RTC_Init(void);
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
+void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
+
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  SFU_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c
new file mode 100644
index 00000000..4cea3348
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_fwimg_regions.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  e_ret_status = SFU_LL_FLASH_INT_Init();
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                   const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pFlash < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+}
+
+/**
+  * @brief  This function configure the flash to be able to execute code
+  * @param  Addr: flash address
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
+{
+  /*
+   * Internal flash : nothing to do
+   * External flash : configure memory mapped mode
+   */
+
+  /* Check Flash address */
+  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
+  }
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
+{
+  /* Check Flash address */
+  if (Addr < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_GetPage(Addr);
+  }
+  else
+  {
+    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
+  }
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h
new file mode 100644
index 00000000..726365d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_H
+#define SFU_LOW_LEVEL_FLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
+  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
+  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
+  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
+  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
+  SFU_FLASH_SUCCESS           /*!< Flash Success */
+} SFU_FLASH_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define INVALID_SECTOR 0xFFFFFFFFU
+#define INVALID_PAGE   0xFFFFFFFFU
+#define INVALID_BANK   0xFFFFFFFFU
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                   const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
+
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c
new file mode 100644
index 00000000..7b10b14d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU external
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_low_level_security.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+/* No external flash available on this product
+   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
+       systematically during startup phase */
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pStart);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  UNUSED(pFlash);
+  UNUSED(Pattern1);
+  UNUSED(Pattern2);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
+{
+  UNUSED(SlotNumber);
+  return SFU_SUCCESS;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h
new file mode 100644
index 00000000..08566d80
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for external flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
+#define SFU_LOW_LEVEL_FLASH_EXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+#define EXTERNAL_FLASH_ADDRESS  0x90000000U
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c
new file mode 100644
index 00000000..1e8db303
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c
@@ -0,0 +1,474 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU internal
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "string.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+
+/* Private variables ---------------------------------------------------------*/
+static __IO uint32_t DoubleECC_Error_Counter = 0U;
+
+
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t first_page;
+  uint32_t nb_pages;
+  uint32_t chunk_nb_pages;
+  uint32_t length = Length;
+
+  /* Check the pointers allocation */
+  if (pFlashStatus == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  *pFlashStatus = SFU_FLASH_SUCCESS;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = SFU_LL_FLASH_INT_GetPage(start);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
+      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        p_erase_init.Page = first_page;
+        p_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_ERASE;
+        }
+        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
+      } while (nb_pages > 0U);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      if (HAL_FLASH_Lock() != HAL_OK)
+      {
+        e_ret_status = SFU_ERROR;
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+      }
+    }
+    else
+    {
+      *pFlashStatus = SFU_FLASH_ERR_HAL;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Check the pointers allocation */
+  if ((pFlashStatus == NULL) || (pSource == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     writing operation should be executed inside secure environment */
+  if ((inside_header == 1U) && (Length != 0U))
+  {
+    /* SE Access */
+    SE_StatusTypeDef se_status;
+    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
+    if (se_ret_status == SE_SUCCESS)
+    {
+      e_ret_status = SFU_SUCCESS;
+      *pFlashStatus = SFU_FLASH_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+      *pFlashStatus = SFU_FLASH_ERROR;
+    }
+  }
+  /* Writing operation executed by SBSFU */
+  else
+  {
+    *pFlashStatus = SFU_FLASH_ERROR;
+
+    /* Clear error flags raised during previous operation */
+    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Unlock the Flash to enable the flash control register access *************/
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+
+      }
+      else
+      {
+        /* DataLength must be a multiple of 64 bit */
+        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
+        {
+          *pFlashStatus = SFU_FLASH_ERROR;
+
+          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+          be done by word */
+          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
+              == HAL_OK)
+          {
+            /* Check the written value */
+            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
+            {
+              /* Flash content doesn't match SRAM content */
+              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
+              e_ret_status = SFU_ERROR;
+            }
+            else
+            {
+              /* Increment FLASH Destination address */
+              destination = destination + sizeof(SFU_LL_FLASH_write_t);
+              e_ret_status = SFU_SUCCESS;
+              *pFlashStatus = SFU_FLASH_SUCCESS;
+            }
+          }
+          else
+          {
+            /* Error occurred while writing data in Flash memory */
+            *pFlashStatus = SFU_FLASH_ERR_WRITING;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+        /* Lock the Flash to disable the flash control register access (recommended
+        to protect the FLASH memory against possible unwanted operation) */
+        if (HAL_FLASH_Lock() != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_HAL;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus se_ret_status;
+  SE_StatusTypeDef se_status;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     reading operation should be executed inside secure environment */
+  if (inside_header == 1U)
+  {
+    /* SE Access */
+    DoubleECC_Error_Counter = 0U;
+    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
+    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  /* Reading operation executed by SBSFU */
+  else
+  {
+    DoubleECC_Error_Counter = 0U;
+    /* Do not use memcpy from lib : ECC error should be checked at each loop */
+    for (i = 0; (i < Length) && (DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+    {
+      *pDestination = *pSource;
+    }
+    if (DoubleECC_Error_Counter == 0U)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  uint32_t flash = (uint32_t) pFlash;
+  uint32_t i;
+
+  /* Comparison executed by SBSFU ==> flash area could not be located inside secured environment */
+  for ( i = 0U; i < Length; i += 4U)
+  {
+    if ((*(uint32_t *)(flash + i) != Pattern1) &&  (*(uint32_t *)(flash + i) != Pattern2))
+    {
+      return SFU_ERROR;
+    }
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+
+
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retvat void
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    while (1 == 1)
+    {
+      SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_UNKNOWN);
+    }
+  }
+}
+
+
+/**
+  * @brief  HardFault Handler
+  * @param  None.
+  * @retval None.
+  */
+void HardFault_Handler(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h
new file mode 100644
index 00000000..5ef51fc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for internal flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_INT_H
+#define SFU_LOW_LEVEL_FLASH_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash Write Access Constraints (size and alignment)
+  *
+  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
+  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
+  *
+  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
+  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
+  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
+  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_FirmwareToResume).
+  */
+
+/* double-word is the default setting for most platforms */
+typedef uint64_t SFU_LL_FLASH_write_t;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Length of a MAGIC tag (32 bytes).
+  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
+  */
+#define MAGIC_LENGTH ((uint32_t)32U)
+
+/* External variables --------------------------------------------------------*/
+#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
+void NMI_Handler(void);
+void HardFault_Handler(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
new file mode 100644
index 00000000..ad5f7015
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
@@ -0,0 +1,2026 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SFU Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "stm32wlxx_it.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_RDP_PROTECT_ENABLE
+#warning "SFU_RDP_PROTECT_DISABLED"
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_GTZC_PROTECT_ENABLE
+#warning "SFU_GTZC_PROTECT_DISABLED"
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_C2SWDBG_PROTECT_ENABLE
+#warning "SFU_C2SWDBG_DISABLED"
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+
+
+#ifndef  SFU_TAMPER_PROTECT_ENABLE
+/* #warning "SFU_TAMPER_PROTECT_DISABLED" */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+/* #warning "SFU_IWDG_PROTECT_DISABLED" */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+
+  /* install header : read /write only for privileged */
+  {
+    SFU_PROTECT_MPU_HEADER_RGNV, SFU_PROTECT_MPU_HEADER_START, SFU_PROTECT_MPU_HEADER_SIZE,
+    SFU_PROTECT_MPU_HEADER_PERM, SFU_PROTECT_MPU_HEADER_EXECV, SFU_PROTECT_MPU_HEADER_SREG,
+    SFU_PROTECT_MPU_HEADER_TEXV, SFU_PROTECT_MPU_HEADER_C, SFU_PROTECT_MPU_HEADER_B
+  },
+
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+
+  /* KMS_DataStorage: NVM storage */
+  {
+    SFU_PROTECT_MPU_KMS_RGNV, SFU_PROTECT_MPU_KMS_START, SFU_PROTECT_MPU_KMS_SIZE,
+    SFU_PROTECT_MPU_KMS_PERM, SFU_PROTECT_MPU_KMS_EXECV, SFU_PROTECT_MPU_KMS_SREG,
+    SFU_PROTECT_MPU_KMS_TEXV, SFU_PROTECT_MPU_KMS_C, SFU_PROTECT_MPU_KMS_B
+  },
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+  /* DMA */
+  {
+    SFU_PROTECT_MPU_DMA_RGNV, SFU_PROTECT_MPU_DMA_START, SFU_PROTECT_MPU_DMA_SIZE,
+    SFU_PROTECT_MPU_DMA_PERM, SFU_PROTECT_MPU_DMA_EXECV, SFU_PROTECT_MPU_DMA_SREG,
+    SFU_PROTECT_MPU_DMA_TEXV, SFU_PROTECT_MPU_DMA_C, SFU_PROTECT_MPU_DMA_B
+  },
+#endif /* SFU_DMA_PROTECT_ENABLE */
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+
+
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus    SFU_LL_SECU_SetProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void);
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check that a GTZC interrupt is enabled
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if enabled, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus GTZC_CheckITEnabled(uint32_t PeriphId)
+{
+  uint32_t register_address;
+  uint32_t bit_pos;
+
+  register_address = (uint32_t)&(GTZC_TZIC->IER1) + (4U * GTZC_GET_REG_INDEX(PeriphId));
+  bit_pos = (uint32_t)(1UL << GTZC_GET_PERIPH_POS(PeriphId));
+  if (READ_BIT(*(uint32_t *)register_address, bit_pos) == bit_pos)
+  {
+    return SFU_SUCCESS;
+  }
+  return SFU_ERROR;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void) HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  (void) HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA_A  **********/
+  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
+  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set Flash configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply PCRoP ******************************************************/
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSUBGHZSPI(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
+#ifdef SFU_RDP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_RDP_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        (void) HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Lock the Options Bytes ***************************************************/
+  (void) HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void) HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Check/Apply MPU ************************************************/
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for MPU second-configuration
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_MPU_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DMA_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DAP_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  /* Check/Apply  ANTI_TAMPER *************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for TAMPER second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_TAMPER_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#ifdef SFU_TEST_PROTECTION
+  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_TEST_PROTECTION */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+  /* Check/Apply  C2SWDBG *****************************************************/
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    if (SFU_LL_SECU_CheckProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  i_ctrl++;
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+  /* Check/Apply  GTZC ********************************************************/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionGTZC() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_GTZC;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for GTZC checks
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_GTZC_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+  /* Check/Apply  CLOCK_MONITOR **********************************************/
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
+
+  /* Check/Apply  TEMP_MONITOR **********************************************/
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Return the reset source  detected after a reboot. The related flag is reset
+  *         at the end of this function.
+  * @param  peResetpSourceId: to be filled with the detected source of reset
+  * @note   In case of multiple reset sources this function return only one of them.
+  *         It can be improved returning and managing a combination of them.
+  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
+{
+  /* Check if the last reset has been generated from a Watchdog exception */
+  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
+      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
+  {
+    *peResetpSourceId = SFU_RESET_WDG_RESET;
+
+  }
+
+
+  /* Check if the last reset has been generated from a Low Power reset */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_LOW_POWER;
+
+  }
+
+  /* Check if the last reset has been generated from a Software reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_SW_RESET;
+
+  }
+  /* Check if the last reset has been generated from an Option Byte Loader reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_OB_LOADER;
+  }
+  /* Check if the last reset has been generated from a Hw pin reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_HW_RESET;
+
+  }
+  /* Unknown */
+  else
+  {
+    *peResetpSourceId = SFU_RESET_UNKNOWN;
+  }
+}
+
+/**
+  * @brief  Clear the reset sources. This function should be called after the actions
+  *         on the reset sources has been already taken.
+  * @param  none
+  * @note   none
+  * @retval none
+  */
+void SFU_LL_SECU_ClearResetSources()
+{
+  /* Clear reset flags  */
+  __HAL_RCC_CLEAR_RESET_FLAGS();
+}
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Flash configuration */
+  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+/**
+  * @brief  Apply the RDP protection
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply RDP **********************************************************/
+  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
+  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
+#else
+    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
+    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+  return e_ret_status;
+}
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  if ((psFlashOptionBytes->WRPStartOffset == SFU_PROTECT_WRP_PAGE_START_1) &&
+      (psFlashOptionBytes->WRPEndOffset   == SFU_PROTECT_WRP_PAGE_END_1))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
+    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
+    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /* configure a temporary area for the currently executing code (SBSFU + active slots) */
+  /* This area of higher rank will keep the execution rights when reconfiguring the current area */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_BLOB_DWL_RGNV; /* temporary area */
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* configure a new area for the currently executing code (SBSFU + active slots) */
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* remap the current area (SBSFU + active slots) */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_BLOB_DWL_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_BLOB_DWL_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_BLOB_DWL_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_BLOB_DWL_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_BLOB_DWL_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_BLOB_DWL_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_BLOB_DWL_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_BLOB_DWL_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_BLOB_DWL_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  Remove the write rights for the SRAM synchronization flag */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_SRAM_FLAG_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_SRAM_FLAG_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_SRAM_FLAG_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_SRAM_FLAG_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_SRAM_FLAG_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_SRAM_FLAG_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_SRAM_FLAG_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_SRAM_FLAG_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_SRAM_FLAG_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  return SFU_SUCCESS;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t mpu_region_num; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
+          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
+          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    /* Enables the MPU */
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    /* Enables memory fault exception */
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    if ((SCB->SHCSR & SCB_SHCSR_MEMFAULTENA_Msk) != SCB_SHCSR_MEMFAULTENA_Msk)
+    {
+      return SFU_ERROR;
+    }
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+
+  e_ret_status = SFU_SUCCESS;
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check if GTZC protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionGTZC(void)
+{
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t periph_attributes;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Check FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SRAM1_SIZE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SE_REGION_RAM_START - SRAM2_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_NPRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZIC peripherals ***********************************************/
+
+  /* Check FLASH_ACR2 */
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the IT for the concerned peripherals */
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZIC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZSC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_AES) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_RNG) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SUBGHZSPI) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PWR) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASHIF) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMAMUX) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASH) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PKA) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the GTZC TZC lock *************************************************/
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+
+    return SFU_SUCCESS;
+  }
+
+  return SFU_ERROR;
+}
+
+/**
+  * @brief  Apply GTZC protection: FLASH, RAM, PKA, RNG, AES.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionGTZC(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Handle the GTZC TZC lock *************************************************/
+
+  /* Configure FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SRAM1_SIZE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SE_REGION_RAM_START - SRAM2_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                           (GTZC_TZSC_ATTRIBUTE_NPRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZIC peripherals ***********************************************/
+
+  /* Configure FLASH_ACR2 */
+  MODIFY_REG(FLASH->ACR2, FLASH_ACR2_PRIVMODE, FLASH_ACR2_PRIVMODE);
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable the IT for the concerned peripherals */
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZIC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZSC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_AES) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_RNG) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SUBGHZSPI) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PWR) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASHIF) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMAMUX) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASH) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PKA) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  NVIC_EnableIRQ(TZIC_ILA_IRQn);
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Handle the GTZC TZC lock *************************************************/
+  HAL_GTZC_TZSC_Lock(GTZC_TZSC);
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return SFU_SUCCESS;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#else
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  Apply ANTI TAMPER protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  RTC_TamperTypeDef  stamperstructure;
+
+  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
+  TAMPER_GPIO_CLK_ENABLE();
+
+  /* Configure Tamper Pin */
+  /* tamper is an additional function */
+  /* not an alternate Function : config not needed */
+  /* Configure the RTC peripheral */
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    /* Configure RTC Tamper */
+    stamperstructure.Tamper                       = RTC_TAMPER_ID;
+    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
+    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
+    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
+    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
+    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
+    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
+    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
+    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
+
+    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
+    {
+
+      /* Clear the Tamper interrupt pending bit */
+      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
+    }
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+/**
+  * @brief  Check if C2SWDBG protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_C2SWDBGEN) == 0U)
+  {
+    /* C2SWDBG disabled */
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply C2SWDBG protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void)
+{
+  HAL_FLASHEx_DisableC2Debug();
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  return SFU_SUCCESS;
+}
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply CLOCK MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a clock monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Clock Monitoring */
+  /* Add your code here for customization
+     e.g. if HSE or LSE is used enable the CSS!
+   ...
+   ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply TEMP MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a temperature monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Temperature Monitoring */
+  /* Add your code here for customization
+     ...
+     ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the active slots
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n= [SBOOT] Secure Mode: [%x]", psFlashOptionBytes->SecureMode);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr == SFU_SECURE_FLASH_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure Flash Start Address: [%x]", psFlashOptionBytes->SecureFlashStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr == SFU_HIDE_PROTECTION_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Hide Protection Start Address: [%x]", psFlashOptionBytes->HideProtectionStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr == SFU_SECURE_SRAM1_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM1 Start Address: [%x]", psFlashOptionBytes->SecureSRAM1StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr == SFU_SECURE_SRAM2_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM2 Start Address: [%x]", psFlashOptionBytes->SecureSRAM2StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START;
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Secure User Memory is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/**
+  * @brief  Activate Secure User Memory protection and jump into user application.
+  * @param  Address of the code to jump into
+  * @retval none.
+  */
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check Sub-GHz radio SPI protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply Sub-GHz radio SPI ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->SUBGHZSPISecureAccess == OB_SUBGHZSPI_SECURE_ACCESS_ENABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply Sub-GHz radio SPI protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SUBGHZSPI_SECURE_ACCESS;
+
+    psFlashOptionBytes->SUBGHZSPISecureAccess = OB_SUBGHZSPI_SECURE_ACCESS_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
new file mode 100644
index 00000000..efdb8c94
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
@@ -0,0 +1,347 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+/* Secure User Memory end : from FLASH_BASE to end of active slot header */
+#define SFU_SEC_MEM_AREA_ADDR_END SFU_ROM_ADDR_END
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+
+
+#define SFU_PROTECT_GTZC_EXEC_SE_START INTVECT_START /*!< GTZC Configuration */
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area in unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys) in unprivileged mode.
+  *                   Read only capability configured
+  *                   Inner region inside the Region 0
+  *                   From 0x0802C000 ==> 0x0803FFFF
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START 0x08020000UL
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_128KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x07U               /*!< 128 Kbytes / 8 * 5 ==> 80 Kbytes */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the read/write operation in privileged mode for Header of active slots
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_HEADER_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_HEADER_START SLOT_ACTIVE_2_HEADER
+#define SFU_PROTECT_MPU_HEADER_SREG  0x00U                 /*!< All subregions activated */
+#define SFU_PROTECT_MPU_HEADER_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_HEADER_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_HEADER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_HEADER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_HEADER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_HEADER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the read/write operation in privileged mode for KMS_DataStorage
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_KMS_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_KMS_START 0x08028000UL
+#define SFU_PROTECT_MPU_KMS_SREG  0xE7U               /*!< 32 Kbytes / 8 * 2 ==> 8 Kbytes */
+#define SFU_PROTECT_MPU_KMS_SIZE  MPU_REGION_SIZE_32KB
+#define SFU_PROTECT_MPU_KMS_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_KMS_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_KMS_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_KMS_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_KMS_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 6 - Forbid all access to the DMA IPs
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_DMA_RGNV  MPU_REGION_NUMBER6
+#define SFU_PROTECT_MPU_DMA_START 0x40020000UL
+#define SFU_PROTECT_MPU_DMA_SREG  0xC0U               /*!< 4 Kbytes / 8 * 6 ==> 3 Kbytes */
+#define SFU_PROTECT_MPU_DMA_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_DMA_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_DMA_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_DMA_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_DMA_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_DMA_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+/**
+  */
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 2 - Enable the execution for the SBSFU and active slots in unprivileged mode.
+  *                   Read only capability configured
+  *                   Execution capability enabled
+  *                   Execution capability restricted by other regions (secure)
+  *                   From 0x08000000 ==> 0x0803FFFF (256 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define APP_PROTECT_MPU_FLASHEXE_START FLASH_BASE
+#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_256KB
+#define APP_PROTECT_MPU_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the read/write operations for the blob download slots in unprivileged mode.
+  *                   Read/write capability configured
+  *                   Execution capability disabled
+  *                   From 0x08002800U ==>  0x08002FFF (2 kbytes)
+  */
+#define APP_PROTECT_MPU_BLOB_DWL_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_BLOB_DWL_START SLOT_BLOB_DWL_1_START
+#define APP_PROTECT_MPU_BLOB_DWL_SIZE  MPU_REGION_SIZE_2KB
+#define APP_PROTECT_MPU_BLOB_DWL_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_BLOB_DWL_PERM  MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_BLOB_DWL_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_BLOB_DWL_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_BLOB_DWL_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_BLOB_DWL_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define APP_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define APP_PROTECT_MPU_SRAM_FLAG_START 0x20000C00UL
+#define APP_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_256B
+#define APP_PROTECT_MPU_SRAM_FLAG_SREG  0x7FU                /*!< 256 bytes / 8 * 1 ==> 32 bytes */
+#define APP_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
+  * @{
+  */
+#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOC_CLK_ENABLE()
+#define RTC_TAMPER_ID                      RTC_TAMPER_1
+#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
+  * @{
+  */
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
+  * @{
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
+  * @{
+  */
+typedef enum
+{
+  SFU_RESET_UNKNOWN = 0x00U,
+  SFU_RESET_WDG_RESET,
+  SFU_RESET_LOW_POWER,
+  SFU_RESET_HW_RESET,
+  SFU_RESET_BOR_RESET,
+  SFU_RESET_SW_RESET,
+  SFU_RESET_OB_LOADER,
+} SFU_RESET_IdTypeDef;
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
+  * @{
+  */
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
+                                                                            separate section to support PCRoP */
+#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
+#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
+                                                                            Std Protections cannot be
+                                                                            added/removed/modified */
+#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
+                                                                            boot in bank1! */
+
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
+#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
+#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
+#define SFU_RUNTIME_PROTECTION_GTZC          ((uint32_t)0x00010000U)   /*!< GTZC protection */
+#define SFU_RUNTIME_PROTECTION_C2SWDBG       ((uint32_t)0x00020000U)   /*!< CPU2 Software Debug */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
+                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
+                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
+                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | \
+                                             SFU_RUNTIME_PROTECTION_TEMP_MONITOR  | \
+                                             SFU_RUNTIME_PROTECTION_GTZC          | \
+                                             SFU_RUNTIME_PROTECTION_C2SWDBG)
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
+
+/* Exported functions ------------------------------------------------------- */
+#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
+/*!<SFU Redirect of RTC Tamper Event Callback*/
+#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+#define SFU_CALLBACK_GTZC_TZIC(void) HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
+void               SFU_LL_SECU_ClearResetSources(void);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+#ifdef SFU_DMA_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+#ifdef SFU_DAP_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#if defined(SFU_MPU_PROTECT_ENABLE)
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_CheckProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
new file mode 100644
index 00000000..71bd8e65
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SB application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu_common.h"
+
+/**
+  * Optional Features Software Configuration
+  */
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_MPU_PROTECT_ENABLE         /*!< MPU protection:
+                                            Enables/Disables the MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION     /*!< MPU protection during UserApp execution : Only Active Slot 2 considered as
+                                            an executable area */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h
new file mode 100644
index 00000000..7a49bd99
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+#include "stm32wlxx_nucleo.h"
+#include "sfu_def.h"
+#include "app_sfu.h"
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep);
+void SFU_EXCPT_Security_Error(void);
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
new file mode 100644
index 00000000..b9458efe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/**
+  * @brief  SB Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SB Flow Control : Steps definition
+  */
+
+#define FLOW_STEP_C2BOOT 0x00006787U             /*!< Step C2OPT and SBRV value */
+
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0002cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+#define FLOW_STEP_C2_DDS 0x00003befU             /*!< Step DDS value */
+#else
+#define FLOW_STEP_C2_DDS 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+/**
+  * @brief  SB Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_C2BOOT (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_C2BOOT)
+#define FLOW_CTRL_UBE (FLOW_CTRL_C2BOOT ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_C2_DDS (FLOW_CTRL_WRP ^ FLOW_STEP_C2_DDS)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_C2_DDS ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SB Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
+#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
+
+/**
+  * @brief  SB Flow Control : Exported macro
+  */
+#if defined(MAIN_C)
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+#else
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+#endif /* MAIN_C */
+
+/* Control with STEP operation :
+ * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+ */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+      SFU_EXCPT_Security_Error();\
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
new file mode 100644
index 00000000..e738ec01
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
@@ -0,0 +1,227 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_C2_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C2_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C2_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Bank 1, Area B  used to protect Vector Table */
+#define SFU_C1_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAB)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C1_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_C1_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C1_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_C1_AREA_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area (without bit banding region) in
+  *                   unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB Full area in unprivileged mode.
+  *                   Read only capability configured
+  *                   from 0x08000000 ==> 0x080027FF (10 Kbytes)
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START M4_SB_REGION_ROM_START
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_16KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0xE0U    /*!< 16 Kbytes / 8 * 5 ==> 10 Kbytes */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Forbid all access to the active slot.
+  *                   From 0x08003000 ==> 0x08003FFF (4 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_APP_FLASHEXE_START SLOT_ACTIVE_2_START
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Forbid all access to the active slot.
+  *                   In addition to region 3, from 0x08004000 ==> 0x0801BFFF (96 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START FLASH_BASE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_128KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG  0x81U    /*!< 128 Kbytes / 8 * 6 ==> 96 Kbytes */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define SFU_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
+#define SFU_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
+#define SFU_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
+#define SFU_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 3 - Enable the execution for the active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   from 0x08003000 ==> 0x08003FFF (4 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_FLASHEXE_START SLOT_ACTIVE_2_START
+#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_4KB
+#define APP_PROTECT_MPU_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the execution for active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   In addition to region 3, from 0x08004000 ==> 0x0801BFFF (96 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_START FLASH_BASE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_128KB
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x81U    /*!< 128 Kbytes / 8 * 6 ==> 80 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. */
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_WRP)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP  | \
+                                             SFU_RUNTIME_PROTECTION_DMA )
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02)     /*!< Third configuration */
+
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c
new file mode 100644
index 00000000..8c7bdaaf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c
@@ -0,0 +1,307 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+#define MAIN_C
+
+#include "sfu_fwimg_regions.h"
+#include "sfu_low_level_security.h"
+#include "sfu_boot.h"
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+  __IO uint32_t *pSbsfuFlag = (__IO uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+  /* LED Init*/
+  BSP_LED_Init(LED_RED);
+
+  /* Reset the SRAM1 flag */
+  *pSbsfuFlag = SBSFU_NOT_BOOTED;
+
+  /* Configure the security features */
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_INITIAL_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  /* Boot CPU2 */
+  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
+
+  /* Wait for the flag */
+  while (*pSbsfuFlag == SBSFU_NOT_BOOTED)
+  {
+    BSP_LED_Toggle(LED_RED);
+    HAL_Delay(500U);
+  }
+  BSP_LED_Off(LED_RED);
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  /* USER CODE BEGIN 2 */
+
+  /* Check the security features once CPU2 has booted */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_SECOND_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+
+  if (*pSbsfuFlag == SBSFU_BOOTED)
+  {
+
+    /* Check the security features before jumping in the user application CPU2 */
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+    FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+    if (SFU_BOOT_CheckApplySecurityProtections(SFU_THIRD_CONFIGURATION) != SFU_SUCCESS)
+    {
+      SFU_EXCPT_Security_Error();
+    }
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+    SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+    HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+
+    jump_address = *(__IO uint32_t *)((SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET + 4));
+    /* Jump to user application */
+    p_jump_to_function = (Function_Pointer) jump_address;
+    /* Initialize user application's Stack Pointer */
+    __set_MSP(*(__IO uint32_t *)(SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET));
+
+    /* JUMP into User App */
+    p_jump_to_function();
+  }
+
+  /* We shouldn't reach this point */
+  SFU_EXCPT_Security_Error();
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE BEGIN 3 */
+
+    /* USER CODE END 3 */
+  }
+  /* USER CODE END WHILE */
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* Apply Static protections involving Option Bytes */
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(uStep);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @retval None
+  */
+void SFU_EXCPT_Security_Error(void)
+{
+  HAL_Delay(1000);
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
new file mode 100644
index 00000000..af5949de
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
@@ -0,0 +1,987 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SB Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SB security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_boot.h"
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+  /* SRAM flag access */
+  {
+    SFU_PROTECT_MPU_SRAM_FLAG_RGNV, SFU_PROTECT_MPU_SRAM_FLAG_START, SFU_PROTECT_MPU_SRAM_FLAG_SIZE,
+    SFU_PROTECT_MPU_SRAM_FLAG_PERM, SFU_PROTECT_MPU_SRAM_FLAG_EXECV, SFU_PROTECT_MPU_SRAM_FLAG_SREG,
+    SFU_PROTECT_MPU_SRAM_FLAG_TEXV, SFU_PROTECT_MPU_SRAM_FLAG_C, SFU_PROTECT_MPU_SRAM_FLAG_B
+  },
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_START, SFU_PROTECT_MPU_APP_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_C, SFU_PROTECT_MPU_APP_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B
+  },
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                      FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                    FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  FLASH_OBProgramInitTypeDef sfu_flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_BoolTypeDef is_current_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA  **********/
+  flash_option_bytes.WRPArea     = SFU_C1_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+  sfu_flash_option_bytes.WRPArea = SFU_C2_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&sfu_flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckC2BootConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+    if (SFU_LL_SECU_CheckProtectionBootLock(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set C2 Boot configuration **********************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetC2BootConfiguration(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* C2OPT and SBRV cannot be written if C2BOOT_LOCK = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+
+    /* Check/Set Boot Lock configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionBootLock(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes,
+                                                  &is_protection_to_be_applied);
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply C2 DDS *****************************************************/
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* DDS cannot be written if ESE = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+
+  /* Lock the Options Bytes ***************************************************/
+  HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  SFU_ProtectionTypeDef expected_runtime_protection = SFU_PROTECTIONS_NONE;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  if (runtime_protection != expected_runtime_protection)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check C2 boot configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2OPT and SBRV ***********************************************/
+  if ((psFlashOptionBytes->C2BootRegion == OB_C2_BOOT_FROM_FLASH)&&
+      (psFlashOptionBytes->C2SecureBootVectAddr == SFU_C2_BOOT_BASE_ADDR))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply C2 boot configuration.
+  * @note   C2OPT and SBRV can only be accessed by software when C2BOOT_LOCK = 0.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckC2BootConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_BOOT_VECT;
+    psFlashOptionBytes->C2BootRegion            = OB_C2_BOOT_FROM_FLASH;
+    psFlashOptionBytes->C2SecureBootVectAddr    = SFU_C2_BOOT_BASE_ADDR;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Boot Lock configuration */
+  if (SFU_LL_SECU_CheckProtectionBootLock(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    /* Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                               FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if ((psSbFlashOptionBytes->WRPStartOffset == SFU_C1_PROTECT_WRP_PAGE_START) ||
+      (psSbFlashOptionBytes->WRPEndOffset   == SFU_C1_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if ((psSfuFlashOptionBytes->WRPStartOffset == SFU_C2_PROTECT_WRP_PAGE_START) ||
+      (psSfuFlashOptionBytes->WRPEndOffset   == SFU_C2_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                             FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if (SFU_LL_SECU_CheckProtectionWRP(psSbFlashOptionBytes, psSfuFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psSbFlashOptionBytes->OptionType      = OPTIONBYTE_WRP;
+    psSbFlashOptionBytes->WRPArea         = SFU_C1_PROTECT_WRP_AREA;
+    psSbFlashOptionBytes->WRPStartOffset  = SFU_C1_PROTECT_WRP_PAGE_START;
+    psSbFlashOptionBytes->WRPEndOffset    = SFU_C1_PROTECT_WRP_PAGE_END;
+
+    if (HAL_FLASHEx_OBProgram(psSbFlashOptionBytes) == HAL_OK)
+    {
+      psSfuFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+      psSfuFlashOptionBytes->WRPArea        = SFU_C2_PROTECT_WRP_AREA;
+      psSfuFlashOptionBytes->WRPStartOffset = SFU_C2_PROTECT_WRP_PAGE_START;
+      psSfuFlashOptionBytes->WRPEndOffset   = SFU_C2_PROTECT_WRP_PAGE_END;
+
+      if (HAL_FLASHEx_OBProgram(psSfuFlashOptionBytes) == HAL_OK)
+      {
+        *pbIsProtectionToBeApplied |= 1U;
+        e_ret_status = SFU_SUCCESS;
+        /* Execution stopped if flow control failed */
+        FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+      }
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS **********************************************************/
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    /* System Security Configuration failed: Sub-GHz radio SPI security access is incorrect */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /*  modify executable region for executing UserAPP*/
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  modify executable region for executing UserAPP */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_ADJUST_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_ADJUST_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_ADJUST_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  return e_ret_status;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint8_t mpu_region_num = 0U; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return e_ret_status;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  assert_param(SFU_IS_FUNCTIONAL_STATE(eState));
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the slot #0
+     */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr != SFU_SECURE_FLASH_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr != SFU_HIDE_PROTECTION_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr != SFU_SECURE_SRAM1_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr != SFU_SECURE_SRAM2_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..0b9986c2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,94 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_msp.c
+  * @author  MCD Application Team
+  * @brief   This file provides code for the MSP Initialization
+  *          and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+  /* CM4 only: Set Interrupt Group Priority */
+  HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
+
+  /* System interrupt init*/
+  /* CM4 only: MemoryManagement_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(MemoryManagement_IRQn, 0U, 0U);
+  /* CM4 only: BusFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(BusFault_IRQn, 0U, 0U);
+  /* CM4 only: UsageFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(UsageFault_IRQn, 0U, 0U);
+  /* CM4 only: DebugMonitor_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DebugMonitor_IRQn, 0U, 0U);
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0U, 0U);
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..7a3565e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
@@ -0,0 +1,198 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  HAL_IncTick();
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
new file mode 100644
index 00000000..eb92c618
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
@@ -0,0 +1,109 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu_common.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_COMMON_H
+#define APP_SFU_COMMON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/**
+  * Optional Features Software Configuration
+  */
+#define CM4_SBFU_BOOT_FLAG_ADDRESS M4_M0PLUS_FLAG_RAM_START /*!< address of the M4/M0+ synchronization flag (unused RAM) */
+#define SBSFU_NOT_BOOTED           0xFFFF               /*!< M0+ SBSFU hasn't finished its boot */
+#define SBSFU_BOOTED               0xAAAA               /*!< M0+ SBSFU boot is over: the M4 UserApp can be started */
+/* The define below allows disabling all security IPs at once.
+ *
+ * Enabled: all security IPs (WRP, watchdog...) are disabled.
+ * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
+ *
+ */
+
+/*#define SECBOOT_DISABLE_SECURITY_IPS*/  /*!< Disable all security IPs at once when activated */
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_WRP_PROTECT_ENABLE
+#define SFU_DAP_PROTECT_ENABLE         /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
+                                            It might be difficult to reconnect the Debugger.*/
+#define SFU_DMA_PROTECT_ENABLE
+#define SFU_C2_DDS_PROTECT_ENABLE      /*!< Static disabling of the CPU2 debug */
+#define SFU_SECURE_USER_PROTECT_ENABLE /*!< Only accessible in Secure access mode,
+                                          the Secure user software is stored in the secure user memory, a configurable
+                                          protected area which is part of the user main memory. */
+
+/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
+                                                 steps.
+                                                 When enabling this lock, Static protections cannot be modified any more
+                                                 and Debug is finally disabled. */
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+/**
+  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
+  * This define is taken into account only if RDP level 2 is not set.
+  * If RDP level 2 is set no modification can be done anyway.
+  *
+  * Enabled: Option Bytes Development Mode enabled.
+  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
+  *          If an OB is not set though it should be then this setting is automatically corrected.
+  *          This applies only as long as RDP level 2 is not set.
+  *
+  * Disabled: Option Bytes Development Mode disabled.
+  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
+              the first time.
+  *           SB_SFU checks the Option Bytes configuration but does not correct it.
+  *           If a problem is detected an error message is reported and the execution stops.
+  */
+#define SECBOOT_OB_DEV_MODE
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_SECURE_FLASH_START    SLOT_ACTIVE_1_START              /*!< Secure Flash start address: SFSA[6:0] */
+#define SFU_SECURE_SRAM1_START    0x1F                             /*!< Secure non-Backup SRAM1 start address:
+                                                                        SNBRSA[4:0]. 0x1F configures an entirely
+                                                                        non-secure SRAM1. */
+#define SFU_SECURE_SRAM2_START    SB_REGION_RAM_START              /*!< Secure Backup SRAM2 start address: SBRSA[4:0] */
+#define SFU_HIDE_PROTECTION_START SE_KEY_REGION_ROM_START          /*!< Hide Protection area start address:
+                                                                        HDPSA[6:0] */
+#define SFU_HIDE_PROTECTION_CFG OB_SECURE_HIDE_PROTECTION_ENABLE   /*!< Hide Protection area start address:
+                                                                        HDPSA[6:0] */
+
+/*!< Secure mode activated or deactivated */
+#define SFU_SECURE_MODE           (OB_SECURE_SYSTEM_AND_FLASH_ENABLE | \
+                                   SFU_HIDE_PROTECTION_CFG           | \
+                                   OB_SECURE_SRAM1_DISABLE           | \
+                                   OB_SECURE_SRAM2_ENABLE)
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_COMMON_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_def.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_def.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_def.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
new file mode 100644
index 00000000..6ec983e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
@@ -0,0 +1,111 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_regions.h
+  * @author  MCD Application Team
+  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_REGIONS_H
+#define SFU_FWIMG_REGIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "se_crypto_config.h"
+
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  *  Slot list : 2 slots per image configuration + swap
+  */
+#define NB_SLOTS      6U
+#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
+#define SLOT_ACTIVE_1 1U
+#define SLOT_ACTIVE_2 2U
+#define SLOT_DWL_1    3U
+#define SLOT_DWL_2    4U
+#define SLOT_SWAP     5U
+
+/* Calculation of the size of a slot */
+#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
+
+/*
+ * Design constraint: the image slot size must be a multiple of the swap area size.
+ * And of course both image slots must have the same size.
+ */
+#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
+
+/*
+ * Checking that the slot sizes are consistent with the .icf file
+ * Sizes expressed in bytes (+1 because the end address belongs to the slot)
+ * The checks are executed at runtime in the SFU_Img_Init() function.
+ */
+#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
+
+/**
+  * Image starting offset to add to the  address of 1st block
+  */
+#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
+
+
+/* External variables --------------------------------------------------------*/
+extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
+extern const uint32_t  SlotStartAdd[NB_SLOTS];
+extern const uint32_t  SlotEndAdd[NB_SLOTS];
+
+#if  (defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C))
+
+const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
+                                            SLOT_ACTIVE_1_HEADER,
+                                            SLOT_ACTIVE_2_HEADER,
+                                            SLOT_BLOB_DWL_1_START,
+                                            0U,
+                                            0U,
+                                          };
+/* List of slot start address */
+const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
+                                            SLOT_ACTIVE_1_START,
+                                            SLOT_ACTIVE_2_START,
+                                            SLOT_BLOB_DWL_1_START,
+                                            0U,
+                                            0U,
+                                          };
+/* List of slot end address */
+const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
+                                            SLOT_ACTIVE_1_END,
+                                            SLOT_ACTIVE_2_END,
+                                            SLOT_BLOB_DWL_1_END,
+                                            0U,
+                                            0U,
+                                          };
+#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_REGIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm0plus.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm0plus.ewd
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
new file mode 100644
index 00000000..2615a977
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM0PLUS\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM0PLUS\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM0PLUS\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>CORE_CM0PLUS</state>
+                    <state>KMS_ENABLED</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\Core\Inc</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\App</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+                    <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$\se_interface_appli.o"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\SE_Core.bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM0PLUS_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>Core</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
+        <group>
+            <name>SBSFU</name>
+            <group>
+                <name>App</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_loader.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_boot.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_com_loader.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_com_trace.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_error.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_mpu_isolation.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_test.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_common.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_new_image.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_kms.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_interface_crypto_scheme.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Target</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash_int.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash_ext.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_security.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\sfu_se_mpu.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+    </group>
+        <group>
+          <name>Middlewares</name>
+          <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
+            </file>
+          </group>
+          <group>
+            <name>STM32_Key_Management_Services</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
new file mode 100644
index 00000000..455613cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>7.10.3.6927</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
new file mode 100644
index 00000000..0f2e43e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
@@ -0,0 +1,1136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM4\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM4\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM4\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM4/Inc</state>
+                    <state>$PROJ_DIR$/../../2_Images_SECoreBin/Inc</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM4_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_it.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_low_level_security.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_hsem.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
new file mode 100644
index 00000000..b8446db6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
@@ -0,0 +1,40 @@
+show SE_APP_GetActiveFwInfo
+show SE_APP_SVC_Handler
+show SE_SYS_SaveDisableIrq
+show SE_SYS_RestoreEnableIrq
+show SE_KMS_Initialize
+show SE_KMS_Finalize
+show SE_KMS_GetInfo
+show SE_KMS_GetFunctionList
+show SE_KMS_GetSlotList
+show SE_KMS_GetSlotInfo
+show SE_KMS_GetTokenInfo
+show SE_KMS_GetMechanismInfo
+show SE_KMS_OpenSession
+show SE_KMS_CloseSession
+show SE_KMS_CreateObject
+show SE_KMS_DestroyObject
+show SE_KMS_GetAttributeValue
+show SE_KMS_SetAttributeValue
+show SE_KMS_FindObjectsInit
+show SE_KMS_FindObjects
+show SE_KMS_FindObjectsFinal
+show SE_KMS_EncryptInit
+show SE_KMS_Encrypt
+show SE_KMS_EncryptUpdate
+show SE_KMS_EncryptFinal
+show SE_KMS_DecryptInit
+show SE_KMS_Decrypt
+show SE_KMS_DecryptUpdate
+show SE_KMS_DecryptFinal
+show SE_KMS_DigestInit
+show SE_KMS_Digest
+show SE_KMS_DigestUpdate
+show SE_KMS_DigestFinal
+show SE_KMS_SignInit
+show SE_KMS_Sign
+show SE_KMS_VerifyInit
+show SE_KMS_Verify
+show SE_KMS_DeriveKey
+show SE_KMS_GenerateKeyPair
+show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
new file mode 100644
index 00000000..93fe9354
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
@@ -0,0 +1,901 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>sfu_se_mpu.s</PathWithFileName>
+      <FilenameWithoutPath>sfu_se_mpu.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>se_core_bin.s</PathWithFileName>
+      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_boot.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_com_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_com_trace.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_error.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_kms.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_mpu_isolation.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_new_image.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_new_image.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_test.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
new file mode 100644
index 00000000..c2d5b07b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
@@ -0,0 +1,726 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo_CM0PLUS\Exe\</OutputDirectory>
+          <OutputName>SBSFU</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments></TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-Wno-format</MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM0PLUS/Core/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../CM0PLUS/Core/Inc;../CM0PLUS/SBSFU/App;../CM0PLUS/SBSFU/Target;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SBSFU_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--symdefs=se_interface_appli.txt
+--keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_se_mpu.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>sfu_se_mpu.s</FilePath>
+            </File>
+            <File>
+              <FileName>se_core_bin.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>se_core_bin.s</FilePath>
+            </File>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/App</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_boot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_boot.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_com_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_error.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_error.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_interface_crypto_scheme.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_kms.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_mpu_isolation.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_new_image.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_test.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_bootloader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="CM0PLUS"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
new file mode 100644
index 00000000..28c068d4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_hsem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
new file mode 100644
index 00000000..17e61bd3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
@@ -0,0 +1,580 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>STM32WL55JC_Nucleo_CM4\Exe\</OutputDirectory>
+          <OutputName>SB</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>0</hadIROM>
+            <hadIRAM>0</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>1</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>0</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>0</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>0</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM4/Inc;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SB_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_hsem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="CM4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
new file mode 100644
index 00000000..c1cff314
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
@@ -0,0 +1,41 @@
+#<SYMDEFS># ARM Linker, 6140002: Last Updated: Fri May 14 11:52:53 2021
+0x0802d001 T SE_APP_GetActiveFwInfo
+0x0802d045 T SE_APP_SVC_Handler
+0x0802e1d1 T SE_SYS_SaveDisableIrq
+0x0802e189 T SE_SYS_RestoreEnableIrq
+0x0802dbdd T SE_KMS_Initialize
+0x0802d6fd T SE_KMS_Finalize
+0x0802d9ad T SE_KMS_GetInfo
+0x0802d9a9 T SE_KMS_GetFunctionList
+0x0802dac1 T SE_KMS_GetSlotList
+0x0802da65 T SE_KMS_GetSlotInfo
+0x0802db25 T SE_KMS_GetTokenInfo
+0x0802da01 T SE_KMS_GetMechanismInfo
+0x0802dce9 T SE_KMS_OpenSession
+0x0802d0c5 T SE_KMS_CloseSession
+0x0802d115 T SE_KMS_CreateObject
+0x0802d375 T SE_KMS_DestroyObject
+0x0802d949 T SE_KMS_GetAttributeValue
+0x0802dd55 T SE_KMS_SetAttributeValue
+0x0802d805 T SE_KMS_FindObjectsInit
+0x0802d751 T SE_KMS_FindObjects
+0x0802d7b1 T SE_KMS_FindObjectsFinal
+0x0802d631 T SE_KMS_EncryptInit
+0x0802d561 T SE_KMS_Encrypt
+0x0802d695 T SE_KMS_EncryptUpdate
+0x0802d5cd T SE_KMS_EncryptFinal
+0x0802d23d T SE_KMS_DecryptInit
+0x0802d175 T SE_KMS_Decrypt
+0x0802d29d T SE_KMS_DecryptUpdate
+0x0802d1dd T SE_KMS_DecryptFinal
+0x0802d4a1 T SE_KMS_DigestInit
+0x0802d3d1 T SE_KMS_Digest
+0x0802d4fd T SE_KMS_DigestUpdate
+0x0802d43d T SE_KMS_DigestFinal
+0x0802de25 T SE_KMS_SignInit
+0x0802ddb9 T SE_KMS_Sign
+0x0802def5 T SE_KMS_VerifyInit
+0x0802de89 T SE_KMS_Verify
+0x0802d305 T SE_KMS_DeriveKey
+0x0802d869 T SE_KMS_GenerateKeyPair
+0x0802d8e5 T SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..36c63d7a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,253 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1A00
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                     ; Top of Stack
+                DCD     Reset_Handler                    ; Reset Handler
+                DCD     NMI_Handler                      ; NMI Handler
+                DCD     HardFault_Handler                ; Hard Fault Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     SVC_Handler                      ; SVCall Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     PendSV_Handler                   ; PendSV Handler
+                DCD     SysTick_Handler                  ; SysTick Handler
+
+                ; External Interrupts                    
+                DCD     TZIC_ILA_IRQHandler              ; Security Interrupt controller illegal access Interrupts
+                DCD     PVD_PVM_IRQHandler               ; PVD and PVM detector
+                DCD     RTC_LSECSS_IRQHandler            ; RTC Wakeup + RTC Tamper and TimeStamp + RTC Alarms (A & B) + SSR Underflow and LSECSS Interrupts
+                DCD     RCC_FLASH_C1SEV_IRQHandler       ; RCC1 and FLASH and CPU1 M4 SEV Interrupts
+                DCD     EXTI1_0_IRQHandler               ; EXTI Line 1:0 Interrupts
+                DCD     EXTI3_2_IRQHandler               ; XTI Line 3:2 Interrupts
+                DCD     EXTI15_4_IRQHandler              ; EXTI Line 15:4 interrupts
+                DCD     ADC_COMP_DAC_IRQHandler          ; ADC, COMP1, COMP2, DAC Interrupts
+                DCD     DMA1_Channel1_2_3_IRQHandler     ; DMA1 Channel 1 to 3 Interrupts
+                DCD     DMA1_Channel4_5_6_7_IRQHandler   ; DMA1 Channels 4, 5, 6, 7 Interrupts
+                DCD     DMA2_DMAMUX1_OVR_IRQHandler      ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+                DCD     LPTIM1_IRQHandler                ; LPTIM1 global Interrupt
+                DCD     LPTIM2_IRQHandler                ; LPTIM2 global Interrupt
+                DCD     LPTIM3_IRQHandler                ; LPTIM3 global Interrupt
+                DCD     TIM1_IRQHandler                  ; TIM1 Interrupt
+                DCD     TIM2_IRQHandler                  ; TIM2 Interrupt
+                DCD     TIM16_IRQHandler                 ; TIM16 Interrupt
+                DCD     TIM17_IRQHandler                 ; TIM17 Interrupt
+                DCD     IPCC_C2_RX_C2_TX_IRQHandler      ; IPCC RX Occupied and TX Free Interrupt Interrupts
+                DCD     HSEM_IRQHandler                  ; Semaphore Interrupt
+                DCD     RNG_IRQHandler                   ; RNG Interrupt
+                DCD     AES_PKA_IRQHandler               ; AES and PKA Interrupts
+                DCD     I2C1_IRQHandler                  ; I2C1 Event and Error Interrupt
+                DCD     I2C2_IRQHandler                  ; I2C2 Event and Error Interrupt
+                DCD     I2C3_IRQHandler                  ; I2C3 Event and Error Interrupt
+                DCD     SPI1_IRQHandler                  ; SPI1 Interrupts
+                DCD     SPI2_IRQHandler                  ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                ; USART1 Interrupt
+                DCD     USART2_IRQHandler                ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler               ; LPUART1 Interrupt
+                DCD     SUBGHZSPI_IRQHandler             ; SUBGHZSPI Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler          ; SUBGHZ Radio Interrupt
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+                EXPORT  TZIC_ILA_IRQHandler            [WEAK]
+                EXPORT  PVD_PVM_IRQHandler             [WEAK]
+                EXPORT  RTC_LSECSS_IRQHandler          [WEAK]
+                EXPORT  RCC_FLASH_C1SEV_IRQHandler     [WEAK]
+                EXPORT  EXTI1_0_IRQHandler             [WEAK]
+                EXPORT  EXTI3_2_IRQHandler             [WEAK]
+                EXPORT  EXTI15_4_IRQHandler            [WEAK]
+                EXPORT  ADC_COMP_DAC_IRQHandler        [WEAK]
+                EXPORT  DMA1_Channel1_2_3_IRQHandler   [WEAK]
+                EXPORT  DMA1_Channel4_5_6_7_IRQHandler [WEAK]
+                EXPORT  DMA2_DMAMUX1_OVR_IRQHandler    [WEAK]
+                EXPORT  LPTIM1_IRQHandler              [WEAK]
+                EXPORT  LPTIM2_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler              [WEAK]
+                EXPORT  TIM1_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                [WEAK]
+                EXPORT  TIM16_IRQHandler               [WEAK]
+                EXPORT  TIM17_IRQHandler               [WEAK]
+                EXPORT  IPCC_C2_RX_C2_TX_IRQHandler    [WEAK]
+                EXPORT  HSEM_IRQHandler                [WEAK]
+                EXPORT  RNG_IRQHandler                 [WEAK]
+                EXPORT  AES_PKA_IRQHandler             [WEAK]
+                EXPORT  I2C1_IRQHandler                [WEAK]
+                EXPORT  I2C2_IRQHandler                [WEAK]
+                EXPORT  I2C3_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                [WEAK]
+                EXPORT  SPI2_IRQHandler                [WEAK]
+                EXPORT  USART1_IRQHandler              [WEAK]
+                EXPORT  USART2_IRQHandler              [WEAK]
+                EXPORT  LPUART1_IRQHandler             [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler           [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler        [WEAK]
+
+TZIC_ILA_IRQHandler
+PVD_PVM_IRQHandler
+RTC_LSECSS_IRQHandler
+RCC_FLASH_C1SEV_IRQHandler
+EXTI1_0_IRQHandler
+EXTI3_2_IRQHandler
+EXTI15_4_IRQHandler
+ADC_COMP_DAC_IRQHandler
+DMA1_Channel1_2_3_IRQHandler
+DMA1_Channel4_5_6_7_IRQHandler
+DMA2_DMAMUX1_OVR_IRQHandler   
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+LPTIM3_IRQHandler
+TIM1_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+IPCC_C2_RX_C2_TX_IRQHandler
+HSEM_IRQHandler
+RNG_IRQHandler
+AES_PKA_IRQHandler
+I2C1_IRQHandler
+I2C2_IRQHandler
+I2C3_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler
+USART2_IRQHandler
+LPUART1_IRQHandler
+SUBGHZSPI_IRQHandler
+SUBGHZ_Radio_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..5c25b669
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,365 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x200
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x100
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
new file mode 100644
index 00000000..c30ae114
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1597224213341</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.launch</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
new file mode 100644
index 00000000..58e587de
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SBSFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../CM0PLUS/SBSFU/App | ../../../CM0PLUS/SBSFU/Target | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM0PLUS.null.839446873" name="2_Images_SBSFU_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
new file mode 100644
index 00000000..53dc73d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/se_interface_kms.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_bootloader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_common.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_boot.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_boot.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_loader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_error.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_error.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_fwimg_common.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_fwimg_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_interface_crypto_scheme.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_kms.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_loader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_mpu_isolation.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_new_image.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_test.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_test.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash_ext.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash_int.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
new file mode 100644
index 00000000..1f567ea5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file      sfu_se_mpu.s
+  * @author    MCD Application Team
+  * @brief     Wrapper for SE isolation with MPU.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+        .section  .text,"ax",%progbits
+        .syntax unified
+        .weak  MPU_SVC_Handler
+        .global SVC_Handler
+        .type  SVC_Handler, %function
+SVC_Handler:
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+        .section  .RamFunc,"ax",%progbits       
+        .global jump_to_function
+jump_to_function:
+        /* assume R1 R2 are useless */
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+        .global launch_application
+launch_application:
+        /* return from exception to application launch function */
+        /* R0: application vector address */
+        /* R1: exit function address */
+        /* push interrupt context R0 R1 R2 R3 R12 LR PC xPSR */
+        /* MOV R2, #0x01000000 ; xPSR activate Thumb bit */
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} /* FLAGS=0 */
+        MOVS R2, #1
+        BICS R1, R1, R2  /* clear least significant bit of exit function */
+        PUSH {R1}  /* return address = application entry point */
+        MOVS R1, #0 /* clear other context registers */
+        PUSH {R1} /* LR =0 */
+        PUSH {R1} /* R12 =0 */
+        PUSH {R1} /* R3 = 0 */
+        PUSH {R1} /* R2 = 0 */
+        PUSH {R1} /* R1 = 0 */
+        /* set R0 to application entry point */
+        PUSH {R0} /* R0 = application entry point */
+        /* set LR to return to thread mode with main stack */
+        /* MOV LR, #0xFFFFFFF9 */
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        /* return from interrupt */
+        BX LR
+.end
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
new file mode 100644
index 00000000..3a556990
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    sfu_secorebin_inc.c
+  * @author  MCD Application Team
+  * @brief   Include SECoreBin binary.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+
+#if defined (__GNUC__)
+asm(".section SE_CORE_Bin,\"a\";"
+                             ".incbin \"../../2_Images_SECoreBin/STM32CubeIDE/Debug/SECoreBin.bin\";"
+);
+#endif 
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/Core/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..55cfe378
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,303 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm0plus.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M0+ vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M0+ processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m0plus
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M0+ vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	0
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	TZIC_ILA_IRQHandler                  			/* TZIC ILA Interrupt                                 */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	RTC_LSECSS_IRQHandler                			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RCC_FLASH_C1SEV_IRQHandler           			/* RCC and FLASH and CPU1 M4 SEV Interrupt            */
+  .word	EXTI1_0_IRQHandler                   			/* EXTI Line 1:0 Interrupt                            */
+  .word	EXTI3_2_IRQHandler                   			/* EXTI Line 3:2 Interrupt                            */
+  .word	EXTI15_4_IRQHandler                  			/* EXTI Line 15:4 interrupt                           */
+  .word	ADC_COMP_DAC_IRQHandler              			/* ADC, COMP1, COMP2, DAC Interrupt                   */
+  .word	DMA1_Channel1_2_3_IRQHandler         			/* DMA1 Channel 1 to 3 Interrupt                      */
+  .word	DMA1_Channel4_5_6_7_IRQHandler       			/* DMA1 Channels 4,5,6,7 Interrupt                    */
+  .word	DMA2_DMAMUX1_OVR_IRQHandler          			/* DMA2 Channels[1..7] and DMAMUX Overrun Interrupts  */
+  .word	LPTIM1_IRQHandler                    			/* LPTIM1 Global Interrupt                            */
+  .word	LPTIM2_IRQHandler                    			/* LPTIM2 Global Interrupt                            */
+  .word	LPTIM3_IRQHandler                    			/* LPTIM3 Global Interrupt                            */
+  .word	TIM1_IRQHandler                      			/* TIM1 Global Interrupt                              */
+  .word	TIM2_IRQHandler                      			/* TIM2 Global Interrupt                              */
+  .word	TIM16_IRQHandler                     			/* TIM16 Global Interrupt                             */
+  .word	TIM17_IRQHandler                     			/* TIM17 Global Interrupt                             */
+  .word	IPCC_C2_RX_C2_TX_IRQHandler          			/* IPCC RX Occupied and TX Free Interrupt Interrupt   */
+  .word	HSEM_IRQHandler                      			/* Semaphore Interrupt                                */
+  .word	RNG_IRQHandler                       			/* RNG Interrupt                                      */
+  .word	AES_PKA_IRQHandler                   			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	I2C1_IRQHandler                      			/* I2C1 Event and Error Interrupt                     */
+  .word	I2C2_IRQHandler                      			/* I2C2 Event and Error Interrupt                     */
+  .word	I2C3_IRQHandler                      			/* I2C3 Event and Error Interrupt                     */
+  .word	SPI1_IRQHandler                      			/* SPI1 Interrupt                                     */
+  .word	SPI2_IRQHandler                      			/* SPI2 Interrupt                                     */
+  .word	USART1_IRQHandler                    			/* USART1 Interrupt                                   */
+  .word	USART2_IRQHandler                    			/* USART2 Interrupt                                   */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 Interrupt                                  */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI Interrupt                                */
+  .word	SUBGHZ_Radio_IRQHandler              			/* SUBGHZ Radio Interrupt                             */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	TZIC_ILA_IRQHandler
+	.thumb_set TZIC_ILA_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	RTC_LSECSS_IRQHandler
+	.thumb_set RTC_LSECSS_IRQHandler,Default_Handler
+
+	.weak	RCC_FLASH_C1SEV_IRQHandler
+	.thumb_set RCC_FLASH_C1SEV_IRQHandler,Default_Handler
+
+	.weak	EXTI1_0_IRQHandler
+	.thumb_set EXTI1_0_IRQHandler,Default_Handler
+
+	.weak	EXTI3_2_IRQHandler
+	.thumb_set EXTI3_2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_4_IRQHandler
+	.thumb_set EXTI15_4_IRQHandler,Default_Handler
+
+	.weak	ADC_COMP_DAC_IRQHandler
+	.thumb_set ADC_COMP_DAC_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_2_3_IRQHandler
+	.thumb_set DMA1_Channel1_2_3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_5_6_7_IRQHandler
+	.thumb_set DMA1_Channel4_5_6_7_IRQHandler,Default_Handler
+
+	.weak	DMA2_DMAMUX1_OVR_IRQHandler
+	.thumb_set DMA2_DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	TIM1_IRQHandler
+	.thumb_set TIM1_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	IPCC_C2_RX_C2_TX_IRQHandler
+	.thumb_set IPCC_C2_RX_C2_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	AES_PKA_IRQHandler
+	.thumb_set AES_PKA_IRQHandler,Default_Handler
+
+	.weak	I2C1_IRQHandler
+	.thumb_set I2C1_IRQHandler,Default_Handler
+
+	.weak	I2C2_IRQHandler
+	.thumb_set I2C2_IRQHandler,Default_Handler
+
+	.weak	I2C3_IRQHandler
+	.thumb_set I2C3_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
new file mode 100644
index 00000000..164c4ed1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SECoreBin.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SECoreBin&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161&quot;,&quot;fPerformBuild&quot;:false,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="8000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SBSFU.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM0PLUS"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM0PLUS"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
new file mode 100644
index 00000000..51b33c92
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
@@ -0,0 +1,163 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0;                /* required amount of heap  */
+_Min_Stack_Size = 0x1A00;          /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_IF_Code : { KEEP(*se_interface_application.o (.text .text*))
+                  KEEP(*se_interface_bootloader.o (.text .text*))
+                  KEEP(*se_interface_common.o (.text .text*))
+                  KEEP(*se_interface_kms.o (.text .text*))
+  } >SE_IF_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SB_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SB_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SB_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >INTVECT_ROM_region
+  
+  SE_CORE_Bin :
+  {
+    KEEP(*(SE_CORE_Bin));
+  } > SE_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SB_RAM_region AT>SB_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
new file mode 100644
index 00000000..05aa5e0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
@@ -0,0 +1,40 @@
+SE_APP_GetActiveFwInfo
+SE_APP_SVC_Handler
+SE_SYS_SaveDisableIrq
+SE_SYS_RestoreEnableIrq
+SE_KMS_Initialize
+SE_KMS_Finalize
+SE_KMS_GetInfo
+SE_KMS_GetFunctionList
+SE_KMS_GetSlotList
+SE_KMS_GetSlotInfo
+SE_KMS_GetTokenInfo
+SE_KMS_GetMechanismInfo
+SE_KMS_OpenSession
+SE_KMS_CloseSession
+SE_KMS_CreateObject
+SE_KMS_DestroyObject
+SE_KMS_GetAttributeValue
+SE_KMS_SetAttributeValue
+SE_KMS_FindObjectsInit
+SE_KMS_FindObjects
+SE_KMS_FindObjectsFinal
+SE_KMS_EncryptInit
+SE_KMS_Encrypt
+SE_KMS_EncryptUpdate
+SE_KMS_EncryptFinal
+SE_KMS_DecryptInit
+SE_KMS_Decrypt
+SE_KMS_DecryptUpdate
+SE_KMS_DecryptFinal
+SE_KMS_DigestInit
+SE_KMS_Digest
+SE_KMS_DigestUpdate
+SE_KMS_DigestFinal
+SE_KMS_SignInit
+SE_KMS_Sign
+SE_KMS_VerifyInit
+SE_KMS_Verify
+SE_KMS_DeriveKey
+SE_KMS_GenerateKeyPair
+SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
new file mode 100644
index 00000000..38cca5bb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SB" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2015646735" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1427517226" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.219198562" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.717379913" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1323484811" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.358650252" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.437904655" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1049432240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM4/Inc | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core ||  ||  || USE_HAL_DRIVER | STM32WL55xx ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SB_cm4.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.857176010" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1383605403" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.758517685" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.92741657" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.261244217" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1809731028" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1152988115" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1052358781" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.209012098" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM4/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1008796121" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.189316865" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.85880463" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.964611899" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.360401545" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.974389923" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.94946969" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2140178522" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1240986986" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2113270654" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1941785021" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.483477110" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1843769445" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1745519627" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1919967923" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1803902265" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.854144635" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.438689590" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM4.null.2010752311" name="2_Images_SBSFU_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
new file mode 100644
index 00000000..dec3fb36
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU_CM4</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_hsem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/Core/syscalls.c
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
new file mode 100644
index 00000000..8d27486b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SB.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SB.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM4"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
new file mode 100644
index 00000000..92d8b68b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
@@ -0,0 +1,152 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = M4_SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;       /* required amount of heap  */
+_Min_Stack_Size = 0x200;      /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >M4_INTVECT_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >M4_SB_Code_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >M4_SB_RAM_region AT>M4_SB_Code_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >M4_SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >M4_SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt
new file mode 100644
index 00000000..8b576979
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt
@@ -0,0 +1,185 @@
+/**
+  @page 2_Images_SBSFU / Secure Boot and Secure Firmware Update Demo Application (Dual Core)
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows Secure Boot and Secure Firmware Update example.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
+In addition, Secure Boot (Root of Trust services) checks and activates the STM32 security mechanisms, and checks the
+authenticity and integrity of user application code before every execution to ensure that invalid or malicious code
+cannot be run. The Secure Firmware Update application receives the encrypted firmware image, decrypts it, then checks
+the authenticity and integrity of the code before installing it.
+
+The secure key management services provide cryptographic services to the user application through the pkcs11 APIs
+(KEY ID based APIs) that are executed inside a protected and isolated environment. User application keys are stored in
+the protected and isolated environment. They can be updated in a secure way (authenticity check, data decryption and
+data integrity check).
+
+This example supports multiple images feature configured with 2 active images for
+execution from internal flash and a 1-slot configuration allowing to
+maximize the user application size.
+As a consequence, some features are not available:
+* download a new firmware image from the application
+* resume firmware update procedure in case of power off during installation
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from the
+STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, SBSFU, GTZC, Dual core, MPU
+
+@par Directory contents
+
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/main.c                           Main M0+ application file
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              M0+ HAL MSP module
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c                   STM32 M0+ interrupt handlers
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h                         Hardware definition for application
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/main.h                           Header file for M0+ main.c
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h          M0+ BSP configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             M0+ HAL configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h                   Header file for M0+ stm32wlxx_it.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/Src/sfu_com_loader.c            SBSFU communication module: local loader part
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/Src/sfu_com_trace.c             SBSFU communication module: trace part
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c                     SBSFU errors management
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c              SBSFU image handling: common functionalities/services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c                       Key management service blob importation handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c                    SBSFU Local Loader
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c             Secure Engine isolation with MPU (when no Firewall is available)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c                 SBSFU image handling: new image storage and installation request
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c                      SBSFU security protection automatic test
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h                       Software configuration of M0+ SBSFU application
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h                      Header file for sfu_boot.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h                Header file for sfu_com_loader.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h                 Header file for sfu_com_trace.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h                     Header file for sfu_error.c file
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h                SBSFU FSM states definitions
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h                       Header file for sfu_kms.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h                    Header file for sfu_loader.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h             Header file for sfu_mpu_isolation.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h                 Header file for sfu_new_image.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h                      Header file for sfu_test.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h                     Header file for sfu_trace.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c              SBSFU general low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c        SBSFU flash low level interface (wrapper)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c    SBSFU external flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c    SBSFU internal flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c     SBSFU security low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h              Header file for general low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h        Header file for flash low level interface (wrapper)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h    Header external file for flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h    Header internal file for flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h     Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Src/main.c                                    Main M4 application file
+   - 2_Images_SBSFU/CM4/Src/sfu_low_level_security.c                  M4 SB security low level interface
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c                       M4 HAL MSP module
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_it.c                            STM32 M4 interrupt handlers
+   - 2_Images_SBSFU/CM4/Inc/app_sfu.h                                 Software configuration of M4 SB application
+   - 2_Images_SBSFU/CM4/Inc/main.h                                    Header file for M4 main.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_boot.h                                Definitions for Secure Boot (SB) flow control
+   - 2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h                  Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h                      M4 HAL configuration file
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h                            Header file for M4 stm32wlxx_it.c
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h                   M4 BSP configuration file
+   - 2_Images_SBSFU/Common/app_sfu_common.h                           Common software configuration of M4 SB and M0+ SBSFU applications
+   - 2_Images_SBSFU/Common/sfu_def.h                                  General definition for SBSFU application
+   - 2_Images_SBSFU/Common/sfu_fwimg_regions.h                        FLASH regions definitions for image handling
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices.
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
+   - This example needs a terminal emulator.
+   - By default, SBSFU is configured in development mode. To switch in production mode, refer to AN5056 "Integration
+     guide - software expansion for STM32Cube" available from the STMicroelectronics microcontroller website
+     www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files.
+     As a workaround, it is advised to use the subst.exe command from within a command prompt to set up a local drive
+     out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par How to use it ?
+
+Several steps to run SBSFU application :
+
+1. Compile projects in the following order. This is mandatory as each project requests some objects generated by the
+   compilation of the previous one:
+   - 2_Images_SECoreBin (see also SECoreBin/readme.txt)
+   - 2_Images_SBSFU (using both CM4 and CM0+ workspaces)
+   - 2_Images_UserApp_M0Plus (see also UserApp_M0Plus/readme.txt)
+   - 2_Images_UserApp_M4 (see also UserApp_M4/readme.txt)
+
+2. Before loading SBSFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that the
+   following are valid for the device:
+   - RDP Level 0
+   - Write Protection disabled on all FLASH pages
+   - Chip has been erased
+
+3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator that can be downloaded
+   from https://osdn.net/projects/ttssh2/) for UART connection with the board.
+   Support of YMODEM protocol is required. Serial port configuration should be :
+   - Baud rate = 115200
+   - Data = 8 bits
+   - Parity = none
+   - Stop = 1 bit
+   - Flow control = none
+
+4. Load CM4 SB image and CM0+ SBSFU image into target memory with your preferred toolchain or STM32CubeProgammer.
+
+5. Once the SB_SFU software is downloaded, power cycle the board (unplug/plug USB cable) : the SBSFU application starts
+   and configures the security mechanisms.
+
+6. Power cycle the board a second time (unplug/plug the USB cable): the SBSFU application starts with the configured
+   securities turned on and the Tera Term connection is possible.
+   Caution: Make sure to use an up-to-date version of ST-LINK firmware else SBSFU may not start.
+
+7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
+   Red LED blinks every 500 ms when waiting for the CM0+ SBSFU to boot.
+   Green LED blinks every 100 ms when CM0+ and/or CM4 firmware image(s) need(s) to be downloaded.
+   Red LED blinks every 3 seconds when a local download is waited.
+   A reboot occurs in case of error in option bytes configuration.
+
+8. Send the first user encrypted firmware file (\1_Slot\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \1_Slot\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+9. Send the second user encrypted firmware file (\1_Slot\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \1_Slot\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
+Note2 : As TAMPER detection can be very sensitive, the protection is disabled by default.
+        Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
+Note3 : for Linux users Minicom can be used but to do so you need to compile the SBSFU project with the MINICOM_YMODEM
+        switch enabled (app_sfu.h)
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin
new file mode 100644
index 00000000..020162be
Binary files /dev/null and b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin differ
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
new file mode 100644
index 00000000..2f7e96cc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
@@ -0,0 +1,1183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+          <state>KMS_ENABLED</state>
+          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
+          <state>IT_MANAGEMENT_DISABLED</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$</state>
+          <state>$PROJ_DIR$\..\..\LoRaWAN_End_Node_DualCore\CM0PLUS\LoRaWAN\App</state>
+          <state>$PROJ_DIR$\..\..\LoRaWAN_End_Node_DualCore\CM0PLUS\LoRaWAN\Target</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
+        <postbuild></postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>SE_CallGate</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
+      </file>
+    </group>
+    <group>
+      <name>Third_Party</name>
+      <group>
+        <name>mbed-crypto</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
+        </file>
+      </group>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..b740a463
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,148 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% %headerbin%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..3c021d7d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,143 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o %offset% %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..5d597069
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,147 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o %offset% %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..1672cb97
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,30 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit};
+
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
+place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
+place in SE_CODE_NOKEY_ROM_region {readonly};
+place in User_Key_ROM_region { section .USER_embedded_Keys };
+keep { section .USER_embedded_Keys };
+place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
+keep { section .SE_embedded_Keys };
+place in SE_RAM_region {readwrite, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
new file mode 100644
index 00000000..7847dbb0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
@@ -0,0 +1,639 @@
+/**
+  ******************************************************************************
+  * @file    ca_conf.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Cryptographic API (CA)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_CONF_H
+#define CA_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Cryptographic_API Cryptographic API (CA)
+  * @{
+  */
+
+/** @defgroup CA_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup CA_Crypto_Libraries Cryptographic Libraries
+  * @{
+  */
+
+/**
+  * @brief Define CA_ST_CRYPTOLIB_SUPP to use services from ST Cryptographic firmware Library
+  * @note  More details on this library can be found here www.st.com/en/embedded-software/x-cube-cryptolib.html
+  */
+/*#define CA_ST_CRYPTOLIB_SUPP*/
+
+/**
+  * @brief Define CA_MBED_CRYPTOLIB_SUPP to use services from the Mbed Cryptography Library
+  * @note  More details on this library can be found here github.com/ARMmbed/mbed-crypto
+  */
+#define CA_MBED_CRYPTOLIB_SUPP
+
+/**
+  * @brief Define CA_HAL_CRYPTOLIB_SUPP to use services from the STM32Cube HAL drivers
+  * @note  HAL drivers can be used to access cryptographic services of specific IP peripherals
+  *        Supported IP peripherals are CRYP & PKA
+  */
+#define CA_HAL_CRYPTOLIB_SUPP
+
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Features_Config Supported Features
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RNG to support RNG cryptographic algorithm
+  */
+/* #define CA_FEAT_RNG */
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define the below line to support AES cryptographic algorithm
+  */
+#define CA_FEAT_AES
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_AES_Features_Config AES Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_AES_ENCRYPT to support AES cryptographic algorithm encryption
+  */
+#define CA_FEAT_AES_ENCRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_DECRYPT to support AES cryptographic algorithm decryption
+  */
+#define CA_FEAT_AES_DECRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_128BITS to support AES cryptographic algorithm on 128 bits length keys
+  */
+#define CA_FEAT_AES_128BITS
+
+/**
+  * @brief Define CA_FEAT_AES_192BITS to support AES cryptographic algorithm on 192 bits length keys
+  */
+/* #define CA_FEAT_AES_192BITS */
+
+/**
+  * @brief Define CA_FEAT_AES_256BITS to support AES cryptographic algorithm on 256 bits length keys
+  */
+#define CA_FEAT_AES_256BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+/**
+  * @brief Define CA_FEAT_HASH to support HASH cryptographic algorithm
+  */
+#define CA_FEAT_HASH
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC to support ECC cryptographic algorithm
+  */
+#define CA_FEAT_ECC
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC_VERIFY to support ECC cryptographic algorithm verification
+  */
+#define CA_FEAT_ECC_VERIFY
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+/**
+  * @brief Define CA_FEAT_RSA to support RSA cryptographic algorithm
+  */
+/* #define CA_FEAT_RSA */
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RSA_SIGN to support RSA cryptographic algorithm signature
+  */
+#define CA_FEAT_RSA_SIGN
+
+/**
+  * @brief Define CA_FEAT_RSA_VERIFY to support RSA cryptographic algorithm verification
+  */
+#define CA_FEAT_RSA_VERIFY
+
+/**
+  * @brief Define CA_FEAT_RSA_1024BITS to support RSA cryptographic algorithm on 1024 bits length modulus
+  */
+#define CA_FEAT_RSA_1024BITS
+
+/**
+  * @brief Define CA_FEAT_RSA_2048BITS to support RSA cryptographic algorithm on 2048 bits length modulus
+  */
+#define CA_FEAT_RSA_2048BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/** @defgroup CA_Router_Config Algorithms Router & Configuration
+  * @{
+  */
+
+/** @defgroup CA_Router_Config_Def Router defines
+  * @note     Masks & Defines to use to configure algorithm routing options
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_MASK to extract configured route from algorithm configuration definition
+  */
+#define CA_ROUTE_MASK   (0xFUL)
+
+/**
+  * @brief Use CA_ROUTE_ST to make the configured algorithm using ST Cryptographic firmware Library
+  * @note  See @ref CA_ST_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_ST     (1UL)
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#define CA_ROUTE_ST     (0UL)
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_MBED to make the configured algorithm using Mbed Cryptography Library
+  * @note  See @ref CA_MBED_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_MBED   (2UL)
+#else /* CA_MBED_CRYPTOLIB_SUPP */
+#define CA_ROUTE_MBED   (0UL)
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_HAL to make the configured algorithm using STM32Cube HAL drivers
+  * @note  See @ref CA_HAL_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_HAL    (3UL)
+#else /* CA_HAL_CRYPTOLIB_SUPP */
+#define CA_ROUTE_HAL    (0UL)
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if !defined(CA_ROUTE_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_DEFAULT to choose default route for the configured algorithm
+  * @note  Default is chosen as below described:
+  *        - If CA_ST_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_ST
+  *        - else if CA_MBED_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_MBED
+  *        - else if CA_HAL_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_HAL
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_ST
+#elif defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_MBED
+#elif defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_HAL
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ROUTE_DEFAULT */
+
+/**
+  * @}
+  */
+#if defined(CA_FEAT_RNG)
+/** @defgroup CA_Router_Config_RNG_Def RNG Defines
+  * @note     Masks & Defines to use to configure RNG algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief RNG configuration
+  * @note  Define CA_ROUTE_RNG to enable RNG algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_RNG  (CA_ROUTE_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RNG */
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_Router_Config_AES_Def AES Defines
+  * @note     Masks & Defines to use to configure AES algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_ENCRYPT_ENABLE to enable encryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_ENCRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_ENCRYPT)
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (1UL << 8)
+#else /* CA_FEAT_AES_ENCRYPT */
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_ENCRYPT */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DECRYPT_ENABLE to enable decryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_DECRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_DECRYPT)
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (1UL << 9)
+#else /* CA_FEAT_AES_DECRYPT */
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_DECRYPT */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_128BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_128BITS to be defined
+  */
+#if defined(CA_FEAT_AES_128BITS)
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (1UL << 10)
+#else /* CA_FEAT_AES_128BITS */
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_128BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_192BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_192BITS to be defined
+  */
+#if defined(CA_FEAT_AES_192BITS)
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (1UL << 11)
+#else /* CA_FEAT_AES_192BITS */
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_192BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_256BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_256BITS to be defined
+  */
+#if defined(CA_FEAT_AES_256BITS)
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_AES_256BITS */
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_256BITS */
+
+#if !defined(CA_ROUTE_AES_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DEFAULT to choose default settings for the configured AES algorithm
+  * @note  Default is: encryption & decryption using 128, 192 & 256 bits lengths keys enabled
+  */
+#define CA_ROUTE_AES_CFG_DEFAULT  (CA_ROUTE_AES_CFG_ENCRYPT_ENABLE  \
+                                   | CA_ROUTE_AES_CFG_DECRYPT_ENABLE \
+                                   | CA_ROUTE_AES_CFG_128BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_192BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_256BITS_ENABLE)
+#endif /* CA_ROUTE_AES_CFG_DEFAULT */
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Router_Config_AES AES Algorithms configurations
+  * @{
+  */
+
+/**
+  * @brief AES CBC configuration
+  * @note  Define CA_ROUTE_AES_CBC to enable AES CBC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CBC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CCM configuration
+  * @note  Define CA_ROUTE_AES_CCM to enable AES CCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CMAC configuration
+  * @note  Define CA_ROUTE_AES_CMAC to enable AES CMAC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CMAC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES ECB configuration
+  * @note  Define CA_ROUTE_AES_ECB to enable AES ECB algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_ECB  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES GCM configuration
+  * @note  Define CA_ROUTE_AES_GCM to enable AES GCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_GCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+
+#if defined(CA_FEAT_HASH)
+/** @defgroup CA_Router_Config_HASH_Def HASH Defines
+  * @note     Masks & Defines to use to configure HASH algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief HASH SHA1 configuration
+  * @note  Define CA_ROUTE_HASH_SHA1 to enable HASH SHA1 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+/* #define CA_ROUTE_HASH_SHA1  (CA_ROUTE_DEFAULT) */
+
+/**
+  * @brief HASH SHA256 configuration
+  * @note  Define CA_ROUTE_HASH_SHA256 to enable HASH SHA256 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_HASH_SHA256  (CA_ROUTE_MBED)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_HASH */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_Router_Config_ECC_Def ECC Defines
+  * @note     Masks & Defines to use to configure ECC algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_VERIFY_ENABLE to enable verification for the configured ECC algorithm
+  * @note  Requires @ref CA_FEAT_ECC_VERIFY to be defined
+  */
+#if defined(CA_FEAT_ECC_VERIFY)
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_ECC_VERIFY */
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_ECC_VERIFY */
+
+
+#if !defined(CA_ROUTE_ECC_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_DEFAULT to choose default settings for the configured ECC algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_ECC_CFG_DEFAULT  (CA_ROUTE_ECC_CFG_VERIFY_ENABLE)
+#endif /* CA_ROUTE_ECC_CFG_DEFAULT */
+
+/**
+  * @brief ECC ECDSA configuration
+  * @note  Define CA_ROUTE_ECC_ECDSA to enable ECC ECDSA algorithm
+  * @note  Requires CA_ROUTE_RNG to be defined
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_ECC_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_ECC_CFG_DEFAULT to use default ECC algorithm configuration
+  */
+#define CA_ROUTE_ECC_ECDSA  (CA_ROUTE_HAL | CA_ROUTE_ECC_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_Router_Config_RSA_Def RSA Defines
+  * @note     Masks & Defines to use to configure RSA algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_SIGN_ENABLE to enable signature for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_SIGN to be defined
+  */
+#if defined(CA_FEAT_RSA_SIGN)
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (1UL << 8)
+#else /* CA_FEAT_RSA_SIGN */
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_SIGN */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_VERIFY_ENABLE to enable verification for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_VERIFY to be defined
+  */
+#if defined(CA_FEAT_RSA_VERIFY)
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_RSA_VERIFY */
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_VERIFY */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_1024BITS_ENABLE to enable support of 1024 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_1024BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_1024BITS)
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_RSA_1024BITS */
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_1024BITS */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_2048BITS_ENABLE to enable support of 2048 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_2048BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_2048BITS)
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (1UL << 13)
+#else /* CA_FEAT_RSA_2048BITS */
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_2048BITS */
+
+
+#if !defined(CA_ROUTE_RSA_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_DEFAULT to choose default settings for the configured RSA algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_RSA_CFG_DEFAULT  (CA_ROUTE_RSA_CFG_SIGN_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_VERIFY_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_1024BITS_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_2048BITS_ENABLE)
+#endif /* CA_ROUTE_RSA_CFG_DEFAULT */
+
+/**
+  * @brief RSA configuration
+  * @note  Define CA_ROUTE_RSA to enable RSA algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_RSA_CFG_SIGN_ENABLE      Signature is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_1024BITS_ENABLE  1024 bits length modulus is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_2048BITS_ENABLE  2048 bits length modulus is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_RSA_CFG_DEFAULT to use default RSA algorithm configuration
+  */
+#define CA_ROUTE_RSA  (CA_ROUTE_HAL | CA_ROUTE_RSA_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
new file mode 100644
index 00000000..64ef96b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains the low level definitions of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_H
+#define CA_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+/*
+ * STM32 target HAL driver include
+ * ex: stm32l4xx_hal.h
+ */
+#include "stm32wlxx_hal.h"
+
+/* Exported constants --------------------------------------------------------*/
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * AES/CRYP instance to use
+ * ex: AES1
+ */
+#define CA_AES_INSTANCE     (AES)
+
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * PKA instance to use
+ * ex: PKA
+ */
+#define CA_PKA_INSTANCE     (PKA)
+
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+
+/* Exported function ---------------------------------------------------------*/
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+void CA_LL_CRC_Init(void);
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h
new file mode 100644
index 00000000..20ad4cb3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h
@@ -0,0 +1,530 @@
+/**
+  ******************************************************************************
+  * @file    kms_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Key Management Services (KMS)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_CONFIG_H
+#define KMS_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @defgroup KMS_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup KMS_HW_Config Hardware
+  * @{
+  */
+
+/**
+  * @brief KMS_EXT_TOKEN_ENABLED Uncomment the below line to support External Token
+  */
+/*#define KMS_EXT_TOKEN_ENABLED*/
+
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Storage_Config Storage
+  * @{
+  */
+
+/**
+  * @brief KMS_NVM_ENABLED Uncomment the below line to support Non Volatile
+  *        Memory storage
+  * @note  Mandatory to handle runtime objects addition through blob import or
+  *        creation through specific KMS services
+  */
+#define KMS_NVM_ENABLED
+
+/**
+  * @brief KMS_NVM_DYNAMIC_ENABLED Uncomment the below line to support Non
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  * @note  Requires @ref KMS_NVM_ENABLED to be defined
+  */
+#define KMS_NVM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_NVM_SLOT_NUMBERS Specify here the number of slots to use in the Non Volatile Memory storage
+  * @note  NVM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into NVM. But if you intend to manipulate objects (create, destroy, derivate...) better use a greater
+  *        number to avoid too much erase of the flash sectors containing the NVM storage.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in NVM.
+  * @note  Mandatory to set if @ref KMS_NVM_ENABLED is defined
+  */
+#define KMS_NVM_SLOT_NUMBERS                    (40UL)
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Config Services
+  * @{
+  */
+/**
+  * @brief KMS_NB_SESSIONS_MAX Defines the number of sessions KMS will be able
+  *        to handle in parallel
+  * @note  This value has an impact on memory footprint
+  */
+#define KMS_NB_SESSIONS_MAX                     (10UL)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_PKCS_Config PKCS#11 services
+  * @{
+  */
+
+/**
+  * @brief KMS_ENCRYPT Uncomment the below line to support encryption services
+  * @note  Requires a supported encryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_ENCRYPT
+
+/**
+  * @brief KMS_DECRYPT Uncomment the below line to support decryption services
+  * @note  Requires a supported decryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_DECRYPT
+
+/**
+  * @brief KMS_DIGEST Uncomment the below line to support digest services
+  * @note  Requires a supported digest algorithm to be enabled too:
+  *        @ref KMS_SHA1
+  *        @ref KMS_SHA256
+  */
+#define KMS_DIGEST
+
+/**
+  * @brief KMS_SIGN Uncomment the below line to support signature services
+  * @note  Requires a supported signature algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_SIGN
+
+/**
+  * @brief KMS_VERIFY Uncomment the below line to support verification services
+  * @note  Requires a supported verification algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_ECDSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_VERIFY
+
+/**
+  * @brief KMS_DERIVE_KEY Uncomment the below line to support key derivation services
+  * @note  Requires a supported derivation algorithm to be enabled too:
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  */
+#define KMS_DERIVE_KEY
+
+/**
+  * @brief KMS_SEARCH Uncomment the below line to support key search or mechanism search services
+  */
+#define KMS_SEARCH
+
+/**
+  * @brief KMS_GENERATE_KEYS Uncomment the below line to support key generation services
+  * @note  Requires a supported key generation algorithm to be enabled too:
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  */
+/*#define KMS_GENERATE_KEYS*/
+
+/**
+  * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  */
+#define KMS_ATTRIBUTES
+
+/**
+  * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  */
+#define KMS_OBJECTS
+
+/**
+  * @brief KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT Uncomment the below line to support C_GetFunctionList API
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT*/
+
+/**
+  * @brief KMS_PKCS11_COMPLIANCE Uncomment the below line to support PKCS11 APIs and implementation that are required
+  *        to be compliant with PKCS11 standard
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_COMPLIANCE*/
+
+/**
+  * @brief KMS_NIKMS_ROUTER_BYPASS Uncomment the below line to bypass KMS router and perform direct KMS API calls
+  * @note  Only applicable when using 'niKMS' access
+  * @note  Enabling this feature allows to save some code footprint, but forbid any use of the external token services
+  */
+/*#define KMS_NIKMS_ROUTER_BYPASS*/
+
+/**
+  * @brief KMS_IMPORT_BLOB Uncomment the below line to use vendor defined blob import features
+  * @note  Requires @ref KMS_NVM_ENABLED to store imported keys
+  * @note  Requires the following services and algorithm to Authenticate, Verify and decrypt the imported blobs:
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_DIGEST
+  *        @ref KMS_SHA256
+  *        @ref KMS_VERIFY
+  *        @ref KMS_ECDSA
+  *        @ref KMS_EC_SECP256
+  */
+#define KMS_IMPORT_BLOB
+
+/**
+  * @brief KMS_IMPORT_BLOB_CHUNK_SIZE Configure the blob importation chunk size
+  * @note  This size must be a multiple of 4
+  * @note  This size must be greater to at least the blob import header size
+  * @note  Requires @ref KMS_IMPORT_BLOB to be enabled
+  */
+#define KMS_IMPORT_BLOB_CHUNK_SIZE      (512U)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Memory_Config Memory management
+  * @{
+  */
+
+/**
+  * @brief KMS_MEM_USE_HEAP_ALLOCATOR Uncomment the below line to perform dynamic allocation in HEAP
+  * @note  KMS will use standard malloc and free APIs
+  * @note  Requires a dynamic allocator provided by the toolchain like dlmalloc
+  * @note  KMS_MEM_USE_HEAP_ALLOCATOR and KMS_MEM_USE_POOL_ALLOCATOR are mutually exclusive
+  */
+/*#define KMS_MEM_USE_HEAP_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_USE_POOL_ALLOCATOR Uncomment the below line to perform dynamic allocation using internal pool
+  *        allocator
+  * @note  Requires a pool definition in a file called kms_mem_pool_def.h (see kms_mem_pool_def_template.h for example)
+  */
+#define KMS_MEM_USE_POOL_ALLOCATOR
+
+/**
+  * @brief KMS_MEM_USE_CUSTOM_ALLOCATOR Uncomment the below line to perform dynamic
+  *        allocation using a custom allocator
+  * @note  To use this custom allocator, implement the kms_mem_low_level.c
+  *        - void KMS_MemInit(void)
+  *        - CK_VOID_PTR KMS_Alloc(CK_SESSION_HANDLE session, size_t size)
+  *        - void KMS_Free(CK_SESSION_HANDLE session, CK_VOID_PTR ptr)
+  */
+/*#define KMS_MEM_USE_CUSTOM_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_DEBUGGING Uncomment the below line to keep memory profiling information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_DEBUGGING
+
+/**
+  * @brief KMS_MEM_CLEANING Uncomment the below line to clean dynamically freed memory
+  * @note  The freed memory will be reset to 0
+  * @note  If using @ref KMS_MEM_USE_HEAP_ALLOCATOR, @ref KMS_MEM_DEBUGGING required
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_CLEANING
+
+/**
+  * @brief KMS_MEM_LOGGING Uncomment the below line to log memory allocation information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  * @note  Information about allocations will be transmitted to @ref KMS_LL_ReportMemAlloc and @ref KMS_LL_ReportMemFree
+  */
+/*#define KMS_MEM_LOGGING*/
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Security_Config Security Enforcement
+  * @{
+  */
+
+/**
+  * @brief KMS_SE_CHECK_PARAMS Uncomment the below line to check input & output parameters location vs secure enclave
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_CHECK_PARAMS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS Uncomment the below line to use key locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_KEYS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS_MAXIMUM Specify here the number of keys that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_KEYS is defined
+  */
+#define KMS_SE_LOCK_KEYS_MAX                 (10UL)
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES Uncomment the below line to use services locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_SERVICES
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES_MAX Specify here the number of services that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_SERVICES is defined
+  */
+#define KMS_SE_LOCK_SERVICES_MAX             (2UL)
+
+/**
+  * @}
+  */
+
+/** Function flag definition to be used to qualify algorithm usage **/
+
+#if defined(KMS_ENCRYPT)
+#define KMS_FCT_ENCRYPT         (1UL << 0)
+#else /* KMS_ENCRYPT */
+#define KMS_FCT_ENCRYPT         (0UL << 0)
+#endif /* KMS_ENCRYPT */
+#if defined(KMS_DECRYPT)
+#define KMS_FCT_DECRYPT         (1UL << 1)
+#else /* KMS_DECRYPT */
+#define KMS_FCT_DECRYPT         (0UL << 1)
+#endif /* KMS_DECRYPT */
+#if defined(KMS_SIGN)
+#define KMS_FCT_SIGN            (1UL << 2)
+#else /* KMS_SIGN */
+#define KMS_FCT_SIGN            (0UL << 2)
+#endif /* KMS_SIGN */
+#if defined(KMS_VERIFY)
+#define KMS_FCT_VERIFY          (1UL << 3)
+#else /* KMS_VERIFY */
+#define KMS_FCT_VERIFY          (0UL << 3)
+#endif /* KMS_VERIFY */
+#if defined(KMS_DERIVE_KEY)
+#define KMS_FCT_DERIVE_KEY      (1UL << 4)
+#else /* KMS_DERIVE_KEY */
+#define KMS_FCT_DERIVE_KEY      (0UL << 4)
+#endif /* KMS_DERIVE_KEY */
+#if defined(KMS_GENERATE_KEYS)
+#define KMS_FCT_GENERATE_KEYS   (1UL << 5)
+#else /* KMS_GENERATE_KEYS */
+#define KMS_FCT_GENERATE_KEYS   (0UL << 5)
+#endif /* KMS_GENERATE_KEYS */
+#if defined(KMS_DIGEST)
+#define KMS_FCT_DIGEST          (1UL << 6)
+#else /* KMS_DIGEST */
+#define KMS_FCT_DIGEST          (0UL << 6)
+#endif /* KMS_DIGEST */
+
+/** @defgroup KMS_Features_Config Features
+  * @{
+  */
+
+/**
+  * @brief KMS_AES_CBC Uncomment the below line to support AES CBC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_CBC           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CCM Uncomment the below line to support AES CCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+/*#define KMS_AES_CCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)*/
+
+/**
+  * @brief KMS_AES_ECB Uncomment the below line to support AES ECB algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_DERIVE_KEY
+  */
+#define KMS_AES_ECB           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY)
+
+/**
+  * @brief KMS_AES_GCM Uncomment the below line to support AES GCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_GCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CMAC Uncomment the below line to support AES CMAC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  */
+#define KMS_AES_CMAC          (KMS_FCT_SIGN|KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_RSA Uncomment the below line to support RSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  * @note  Requires at least one of the following RSA modulus length to be enabled:
+  *        @ref KMS_RSA_1024
+  *        @ref KMS_RSA_2048
+  */
+/* #define KMS_RSA               (KMS_FCT_SIGN|KMS_FCT_VERIFY) */
+
+/**
+  * @brief KMS_RSA_1024 Uncomment the below line to support RSA 1024 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+/* #define KMS_RSA_1024 */
+
+/**
+  * @brief KMS_RSA_2048 Uncomment the below line to support RSA 2048 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+/* #define KMS_RSA_2048 */
+
+/**
+  * @brief KMS_ECDSA Uncomment the below line to support ECDSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  *        - KMS_FCT_GENERATE_KEYS    This algorithm can be used to perform key generation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_VERIFY
+  *        @ref KMS_DERIVE_KEY
+  *        @ref KMS_GENERATE_KEYS
+  * @note  Requires at least one of the following elliptic curve to be enabled:
+  *        @ref KMS_EC_SECP192
+  *        @ref KMS_EC_SECP256
+  *        @ref KMS_EC_SECP384
+  */
+#define KMS_ECDSA             (KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_EC_SECP192 Uncomment the below line to support elliptic curve SECP-192
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP192*/
+
+/**
+  * @brief KMS_EC_SECP256 Uncomment the below line to support elliptic curve SECP-256
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+#define KMS_EC_SECP256
+
+/**
+  * @brief KMS_EC_SECP384 Uncomment the below line to support elliptic curve SECP-384
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP384*/
+
+/**
+  * @brief KMS_SHA1 Uncomment the below line to support SHA1 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+/*#define KMS_SHA1              (KMS_FCT_DIGEST)*/
+
+/**
+  * @brief KMS_SHA256 Uncomment the below line to support SHA256 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+#define KMS_SHA256            (KMS_FCT_DIGEST)
+
+
+
+/** @defgroup KMS_Debug_Config Debug
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
new file mode 100644
index 00000000..ae3e8d6b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef KMS_LOW_LEVEL_H
+#define KMS_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup KMS_LL_Exported_Constants Exported Constants
+  * @{
+  */
+
+#define KMS_LL_ERROR_MEM_ALLOC_FAILURE    (0x00000001UL)    /*!< Memory allocation failure error */
+#define KMS_LL_ERROR_MEM_FREE_CANARY      (0x00000002UL)    /*!< Memory free detected altered canaries error */
+#define KMS_LL_ERROR_MEM_FREE_NULL_PTR    (0x00000003UL)    /*!< Memory free detected a NULL pointer error */
+#define KMS_LL_ERROR_MEM_FREE_UNKNOWN     (0x00000004UL)    /*!< Memory free detected an unknown pointer error */
+
+/**
+  * @}
+  */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_LL_Exported_Functions Exported Functions
+  * @{
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length);
+uint32_t KMS_LL_FLASH_GetBlobDownloadAddress(void);
+
+#ifdef KMS_SE_CHECK_PARAMS
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize);
+#endif /* KMS_SE_CHECK_PARAMS */
+
+void KMS_LL_ReportError(uint32_t error);
+
+void KMS_LL_ReportMemInit(void);
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem);
+void KMS_LL_ReportMemFree(void *pmem);
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t KMS_LL_GetLR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif /* KMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
new file mode 100644
index 00000000..a5f54fbf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
@@ -0,0 +1,54 @@
+/**
+  ******************************************************************************
+  * @file    kms_mem_pool_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          memory pool definition
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Recursive inclusion autorised ---------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * POOL DESCRIPTION
+ */
+
+/*
+ * Memory pools definition:
+ * 2 pools of 256
+ * 1 pool of 512
+ * 2 pools of 1K
+ * 1 pool of 5K
+ */
+
+KMS_MEM_DECLARE_POOL_START()
+KMS_MEM_DECLARE_POOL_ENTRY(1, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(2, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(3, 512)
+KMS_MEM_DECLARE_POOL_ENTRY(4, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(5, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(6, 5 * 1024)
+KMS_MEM_DECLARE_POOL_END()
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
new file mode 100644
index 00000000..8ab87950
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
@@ -0,0 +1,508 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_CONFIG_H
+#define KMS_PLATF_OBJECTS_CONFIG_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "kms_platf_objects_interface.h"
+#include "app_sfu.h"
+#include "Commissioning.h"
+#include "lorawan_conf.h" /* KEY_EXTRACTABLE */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define RAW_TO_INT32A(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
+0x##a##b##c##d, 0x##e##f##g##h, 0x##i##j##k##l, 0x##m##n##o##p
+
+#define FORMAT_KEY_32(...) RAW_TO_INT32A(__VA_ARGS__)
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_PLATF Platform Objects
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_PLATF_Exported_Constants Exported Constants
+  * @note KMS support different type of objects, their respective ranges are
+  *       defined here
+  * @{
+  */
+
+/* We consider that the ORDER (static = lower ids) will be kept. */
+#define KMS_INDEX_MIN_EMBEDDED_OBJECTS       1UL   /*!< Embedded objects min ID. Must be > 0 as '0' is never a
+                                                        valid key index */
+#define KMS_INDEX_MAX_EMBEDDED_OBJECTS       (KMS_INDEX_MIN_EMBEDDED_OBJECTS+19UL)    /*!< Embedded objects max ID */
+#define KMS_INDEX_MIN_NVM_STATIC_OBJECTS     (KMS_INDEX_MAX_EMBEDDED_OBJECTS+1UL)     /*!< NVM static objects min ID */
+#define KMS_INDEX_MAX_NVM_STATIC_OBJECTS     (KMS_INDEX_MIN_NVM_STATIC_OBJECTS+19UL)  /*!< NVM static objects max ID */
+
+#define KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MAX_NVM_STATIC_OBJECTS+1UL)   /*!< NVM dynamic objects min ID */
+#define KMS_INDEX_MAX_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS+19UL) /*!< NVM dynamic objects max ID */
+
+/* Blob import key index */
+#define KMS_INDEX_BLOBIMPORT_VERIFY       (1U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob verification key is stored */
+#define KMS_INDEX_BLOBIMPORT_DECRYPT      (2U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob decryption key is stored */
+
+/**
+  * @}
+  */
+
+/*
+ * Embedded objects definition
+ *
+ */
+#ifdef KMS_PLATF_OBJECTS_C
+/** @addtogroup KMS_PLATF_Private_Variables Private Variables
+  * @{
+  */
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".SE_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".SE_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 24);
+KMS_DECLARE_BLOB_STRUCT(, 30);
+KMS_DECLARE_BLOB_STRUCT(, 256);
+
+/* This object is used for KMS blob header signature                 */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   KMS_Blob_ECDSA_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  1,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_BLOB_KEY@
+  }
+};
+
+/* This object is used for KMS blob encryption                    */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   KMS_Blob_AES_CBC128_Decrypt =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  2,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_BLOB_KEY@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_1_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  3,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_1@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_2_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_2@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /*(SFU_NB_MAX_ACTIVE_IMAGE > 1U)*/
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_3_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_3@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_1_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  6,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_1@
+  }
+};
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_2_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  7,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_2@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_3_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  8,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_3@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif
+
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".USER_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".USER_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 21);
+KMS_DECLARE_BLOB_STRUCT(, 27);
+
+/* These objects are used by user tKMS application                 */
+#if defined(__GNUC__)
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
+#endif
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_Zero_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  13,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    CKA_DERIVE,       sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_App_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  14,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_27_t   Lorawan_Nwk_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  108,                             /*  uint32_t blobs_size; */
+  8,                               /*  uint32_t blobs_count; */
+  15,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_21_t   Lorawan_Nwk_S_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  16,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_NWK_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_21_t   Lorawan_App_S_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  84,                              /*  uint32_t blobs_size; */
+  6,                               /*  uint32_t blobs_count; */
+  17,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16UL,                    FORMAT_KEY_32(LORAWAN_APP_S_KEY),
+    CKA_COPYABLE,     sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#if (!defined (KEY_EXTRACTABLE) || (KEY_EXTRACTABLE == 0))
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_FALSE,
+#else
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL),        (uint8_t)CK_TRUE,
+#endif /* KEY_EXTRACTABLE */
+    CKA_LABEL,        4UL,                     0x5F45524CU /* 'LRE_' */
+  }
+};
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#elif defined(__GNUC__)
+#pragma GCC pop_options
+#endif
+
+/**
+  * @brief  KMS embedded objects definition
+  * @note   Must contains KMS blob verification and decryption keys
+  */
+static const kms_obj_keyhead_t *const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBEDDED_OBJECTS -
+                                                                    KMS_INDEX_MIN_EMBEDDED_OBJECTS + 1] =
+{
+#if defined(KMS_IMPORT_BLOB)
+  /* KMS Blob import keys */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_ECDSA_Verify,       /* Index = 1 */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_AES_CBC128_Decrypt, /* Index = 2 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 1 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 2 */
+#endif /* KMS_IMPORT_BLOB */
+  /* SBSFU keys */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_1_128,             /* Index = 3 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_2_128,             /* Index = 4 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_3_128,             /* Index = 5 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 3 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_1_Verify,        /* Index = 6 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_2_Verify,        /* Index = 7 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_3_Verify,        /* Index = 8 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 12 */
+  /* UserApp example keys */
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+  (kms_obj_keyhead_t *) &Lorawan_Zero_Key,                      /* Index = 13 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 13 */
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+  (kms_obj_keyhead_t *) &Lorawan_App_Key,                       /* Index = 14 */
+  (kms_obj_keyhead_t *) &Lorawan_Nwk_Key,                       /* Index = 15 */
+  (kms_obj_keyhead_t *) &Lorawan_Nwk_S_Key,                     /* Index = 16 */
+  (kms_obj_keyhead_t *) &Lorawan_App_S_Key,                     /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 20 */
+};
+
+/**
+  * @}
+  */
+#endif /* KMS_PLATF_OBJECTS_C */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
new file mode 100644
index 00000000..884019aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
@@ -0,0 +1,70 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_interface.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_INTERFACE_H
+#define KMS_PLATF_OBJECTS_INTERFACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* KMS exported Object handles for Secure Boot */
+
+/* SBSFU Root CA Certificate */
+#define KMS_SBSFU_ROOT_CA_CRT_LABEL           "SBSFURootCACertificate"  /*!< SBSFU Root CA Certificate Label */
+#define KMS_SBSFU_ROOT_CA_CRT_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)9)  /*!< SBSFU Root CA Certificate object handle */
+
+/* OEM Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_LABEL           "OEMIntermCACertificate_1"  /*!< OEM 1 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_LABEL           "OEMIntermCACertificate_2"  /*!< OEM 2 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_LABEL           "OEMIntermCACertificate_3"  /*!< OEM 3 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)10)  /*!< OEM 1 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)11)  /*!< OEM 2 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)12)  /*!< OEM 3 Interm CA Certificate object handle */
+
+
+#define KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)3)
+#define KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)4)
+#define KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)5)
+#define KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)6)
+#define KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)7)
+#define KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)8)
+
+/* KMS exported Object handles for tKMS test application */
+#define KMS_KEY_RSA2048_OBJECT_HANDLE                 ((CK_OBJECT_HANDLE)21)
+#define KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE        ((CK_OBJECT_HANDLE)22)
+
+/*  Object handles for user application */
+#define KMS_ZERO_KEY_OBJECT_HANDLE                    ((CK_OBJECT_HANDLE)13)
+#define KMS_APP_KEY_OBJECT_HANDLE                     ((CK_OBJECT_HANDLE)14)
+#define KMS_NWK_KEY_OBJECT_HANDLE                     ((CK_OBJECT_HANDLE)15)
+#define KMS_NWK_S_KEY_OBJECT_HANDLE                   ((CK_OBJECT_HANDLE)16)
+#define KMS_APP_S_KEY_OBJECT_HANDLE                   ((CK_OBJECT_HANDLE)17)
+#define LAST_KMS_KEY_OBJECT_HANDLE                    ((CK_OBJECT_HANDLE)18)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_INTERFACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
new file mode 100644
index 00000000..8ebb6f6f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
@@ -0,0 +1,142 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef NVMS_LOW_LEVEL_H
+#define NVMS_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Constants Exported Constants
+  * @{
+  */
+#define NVMS_LL_BLOCK0_ADDRESS   KMS_DATASTORAGE_START
+#define NVMS_LL_BLOCK1_ADDRESS   (KMS_DATASTORAGE_START + NVMS_LL_BLOCK_SIZE)
+
+#define NVMS_LL_NB_PAGE_PER_BLOCK  (NVMS_LL_BLOCK_SIZE / FLASH_PAGE_SIZE)
+#define NVMS_LL_BLOCK_SIZE         ((KMS_DATASTORAGE_END- KMS_DATASTORAGE_START + 1U) / 2U)
+
+#define NVMS_LL_ERASED           0xFFFFFFFFU
+
+/* not physical flash page size, but writing granularity size -> 8 bytes */
+#define NVMS_LL_PAGE_SIZE    8UL
+
+/**
+  * @}
+  */
+
+/* Exported types ------------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief   Block identifiers.
+  */
+typedef enum
+{
+  NVMS_BLOCK0 = 0,
+  NVMS_BLOCK1 = 1,
+} nvms_block_t;
+
+
+/**
+  * @}
+  */
+
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+void NVMS_LL_Init(void);
+bool NVMS_LL_IsBlockErased(nvms_block_t block);
+bool NVMS_LL_BlockErase(nvms_block_t block);
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size);
+
+/* Exported in line functions ------------------------------------------------*/
+
+/**
+  * @brief   Returns the base address of the specified flash block
+  * @param   block block identifier
+  * @retval  pointer to the block base
+  */
+static inline uint32_t NVMS_LL_GetBlockAddress(nvms_block_t block)
+{
+
+  if (block == NVMS_BLOCK0)
+  {
+    return (uint32_t)NVMS_LL_BLOCK0_ADDRESS;
+  }
+  return (uint32_t)NVMS_LL_BLOCK1_ADDRESS;
+}
+
+
+/**
+  * @brief   Returns the size of the flash blocks
+  * @note    Blocks are required to be of equal size
+  * @retval  Block size
+  */
+static inline size_t NVMS_LL_GetBlockSize(void)
+{
+
+  return NVMS_LL_BLOCK_SIZE;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NVMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
new file mode 100644
index 00000000..8a159341
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    se_crypto_config.h
+  * @author  MCD Application Team
+  *          This file provides a template to configure the crypto scheme used
+  *          for the services used by the bootloader (crypto operations for the
+  *          Firmware and Metadata).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_CRYPTO_CONFIG_H
+#define SE_CRYPTO_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup SE_CRYPTO SE Crypto
+  * @{
+  */
+
+/** @defgroup SE_CRYPTO_CONFIG SE Crypto scheme configuration
+  * @brief Choose the cryptographic scheme you want the bootloader to use.
+  *        These settings apply to the services used by the bootloader only, not to the services called by the User
+  *        Application.
+  * @{
+  */
+
+/**
+  * SE_CoreBin instantiates the crypto scheme selected thanks to "SECBOOT_CRYPTO_SCHEME".
+  * "SECBOOT_CRYPTO_SCHEME" is composed as indicated below:
+  *        SECBOOT_authenticationalgo_encryptionalgo_MACalgo
+  *
+  * Set "SECBOOT_CRYPTO_SCHEME" to one of the values listed below:
+  *
+  * SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256: no FW encryption, only Authentication and Integrity are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           No Firmware encryption.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           Decrypt Firmware Image with AES128-CBC.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using AES128-GCM tag.
+  *                           Decrypt Firmware image using AES128-GCM algo.
+  *                           Firmware Image Integrity using AES128-GCM tag.
+  */
+#define SECBOOT_CRYPTO_SCHEME SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256     /*!< Selected Crypto Scheme */
+
+#define SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256        (1U) /*!< asymmetric crypto, no FW encryption           */
+#define SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256        (2U) /*!< asymmetric crypto with encrypted Firmware     */
+#define SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM     (3U) /*!< symmetric crypto                              */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_CRYPTO_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
new file mode 100644
index 00000000..85f027a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
@@ -0,0 +1,215 @@
+/**
+  ******************************************************************************
+  * @file    se_def_metadata.h
+  * @author  MCD Application Team
+  * @brief   This file contains metadata definitions for SE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_DEF_METADATA_H
+#define SE_DEF_METADATA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "se_crypto_config.h"
+
+/** @addtogroup  SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup  SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup  SE_CORE_DEF SE Definitions
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA SE Metadata Definitions
+  *  @brief definitions related to FW metadata (header).
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Constants Exported Constants
+  * @brief  Firmware Image Header (FW metadata) constants
+  * @{
+  */
+
+#define SE_FW_HEADER_TOT_LEN    (sizeof(SE_FwRawHeaderTypeDef))   /*!< FW INFO header Total Length */
+#define SE_FW_HEADER_SIGN_LEN   SE_HEADER_SIGN_LEN                /*!< FW Header signature Len */
+#define SE_FW_HEADER_STATE_LEN  (3U * 32U)                        /*!< FW Header state Len */
+#define SE_FW_HEADER_FINGERPRINT_LEN  (32U)                       /*!< FW Header finger print Len */
+#define SE_FW_AUTH_LEN          (SE_FW_HEADER_TOT_LEN - SE_FW_HEADER_SIGN_LEN  \
+                                 - SE_FW_HEADER_STATE_LEN - SE_FW_HEADER_FINGERPRINT_LEN) /*!< Authenticated part of the header */
+
+#define SE_SYMKEY_LEN           (16U)  /*!< SE Symmetric Key length (bytes)*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+/* AES-GCM encryption and FW Tag */
+#define SE_NONCE_LEN            (12U)  /*!< Secure Engine Nonce Length (Bytes)*/
+#define SE_TAG_LEN              (16U)  /*!< Secure Engine Tag Length (Bytes): AES-GCM for the FW tag */
+#define SE_HEADER_SIGN_LEN      (16U)  /*!< Firmware Header signature LEN : AES-GCM for header signature */
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/* AES-CBC encryption (or no encryption) and SHA256 for FW tag */
+#define SE_IV_LEN               (16U)  /*!< Secure Engine IV Length (Bytes): same size as an AES block*/
+#define SE_TAG_LEN              (32U)  /*!< Secure Engine Tag Length (Bytes): SHA-256 for the FW tag */
+#define SE_HEADER_SIGN_LEN      (64U)  /*!< Firmware Header signarure LEN*/
+#define SE_ASYM_PUBKEY_LEN      (64U)  /*!< SE Asymmetric Public Key length (bytes)*/
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Image type: complete or partial image */
+#define SE_FW_IMAGE_COMPLETE    (0U) /*!< Complete Fw Image */
+#define SE_FW_IMAGE_PARTIAL     (1U) /*!< Partial Fw Image */
+
+/*!< FW Magic IDs */
+#define SFUM_1 "SFU1"      /*!< Active Slot #1 : first active also referred as master */
+#define SFUM_2 "SFU2"      /*!< Active Slot #2 : second active slot */
+#define SFUM_3 "SFU3"      /*!< Active Slot #3 : third active slot */
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/* SE_FwStateTypeDef - firmware image state type representing the state of the firmware image
+ * In the header (SE_FwRawHeaderTypeDef.FwImageState), these states are encoded as follows:
+   * FWIMG_STATE_INVALID  : 32 * 0x00, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID    : 32 * 0xFF, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID_ALL: 32 * 0xFF, 32 * 0x55, 32 * 0x00
+   * FWIMG_STATE_SELFTEST : 32 * 0xFF, 32 * 0xFF, 32 * 0x00
+   * FWIMG_STATE_NEW      : 32 * 0xFF, 32 * 0xFF, 32 * 0xFF
+ */
+typedef enum
+{
+  FWIMG_STATE_INVALID   = 0U, /* image is not valid (typically selftest has failed) and should not boot */
+  FWIMG_STATE_VALID     = 1U, /* image is valid (selftest passed), image OK to boot if signature checks pass */
+  FWIMG_STATE_VALID_ALL = 2U, /* master image is valid (selftest passed), all other images are automatically validated */
+  FWIMG_STATE_SELFTEST  = 3U, /* self tests to be executed. Image OK to boot one time if signature checks pass */
+  FWIMG_STATE_NEW       = 4U, /* new image, has never run on the device */
+} SE_FwStateTypeDef;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief  Firmware Header structure definition
+  * @note This structure MUST be called SE_FwRawHeaderTypeDef
+  * @note This structure MUST contain a field named 'FwVersion'
+  * @note This structure MUST contain a field named 'FwSize'
+  * @note This structure MUST contain a field named 'FwTag' (to control intergrity of full FW)
+  * @note This structure MUST contain a field named 'PartialFwOffset'
+  * @note This structure MUST contain a field named 'PartialFwSize'
+  * @note This structure MUST contain a field named 'PartialFwTag' (to control intergrity of partial FW)
+  * @note This structure MUST contain a field named 'HeaderSignature' (to control authentication of the header)
+  * @note This structure MUST contain a field named 'FwImageState' (not part of the authentified header)
+  * @note This structure MUST contain a field named 'PrevHeaderFingerprint' (not part of the authentified header)
+  * @note In this example, the header size is always a multiple of 32 to match the FLASH constraint on STM32H7.
+  *       We keep this alignment for all platforms (even when the FLASH alignment constraint is another value) to have
+  *       one unique header size per crypto scheme.
+  * @note In this example, the authentified header size + the header signature is always 192 bytes (for all crypto
+  *       schemes).
+  */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Nonce[SE_NONCE_LEN];    /*!< Nonce used to encrypt firmware*/
+  uint8_t  Reserved[112U];         /*!< Reserved for future use: 112 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN]; /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  InitVector[SE_IV_LEN];  /*!< IV used to encrypt firmware */
+  uint8_t  Reserved[28U];          /*!< Reserved for future use: 28 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Reserved[44U];          /*!< Reserved for future use: 44 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#else
+
+#error "The current example does not support the selected crypto scheme."
+
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_DEF_METADATA_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
new file mode 100644
index 00000000..3d7e71b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Engine low level interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_LOW_LEVEL_H
+#define SE_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+
+/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
+   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
+#include "sfu_fwimg_regions.h"
+
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup SE
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
+  * @{
+  */
+/**
+  * @brief flash handling constants: these constants are used in se_fwimg.c
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
+  * @{
+  */
+
+/**
+  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
+  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
+  * 32-bit word.
+  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
+  */
+#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
+  do{                                  \
+    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
+  }while(0)
+
+/**
+  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
+  */
+#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
+  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
+  * @{
+  */
+
+/**
+  * Code isolation based on Firewall
+  */
+#define SFU_ISOLATE_SE_WITH_MPU
+
+/**
+  * MPU : Enter/Exit secured area ==> nothing to do
+  */
+#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
+#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
+
+/**
+  * Service to enable/disable interrupts
+  */
+#define UPDATE_IRQ_SERVICE
+
+
+/** @addtogroup SE_LOW_LEVEL_Exported_Functions
+  * @{
+  */
+void SE_LL_CORE_Cleanup(void);
+#if defined (__CC_ARM)
+void __arm_clean_data(void);
+#elif defined(__GNUC__)
+void __gcc_clean_data(void);
+#endif /* __CC_ARM */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_Functions
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void);
+SE_ErrorStatus SE_LL_CRC_Init(void);
+SE_ErrorStatus SE_LL_CRC_DeInit(void);
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..99ddd88d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+/* #define HAL_IWDG_MODULE_ENABLED */
+/* #define HAL_LPTIM_MODULE_ENABLED */
+#define HAL_PKA_MODULE_ENABLED
+/* #define HAL_RNG_MODULE_ENABLED */
+/* #define HAL_RTC_MODULE_ENABLED */
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+/* #define HAL_TIM_MODULE_ENABLED */
+/* #define HAL_UART_MODULE_ENABLED */
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+/* #define HAL_EXTI_MODULE_ENABLED */
+/* #define HAL_CORTEX_MODULE_ENABLED */
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..15b64f1c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
@@ -0,0 +1,693 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>0</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\data_init.c</PathWithFileName>
+      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
+      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
+      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
+      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
+      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
+      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..37a3c26b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>SECoreBin</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name>prebuild.bat .</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>2</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM;../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App;../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SECoreBin.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--entry=SE_CallGate
+--diag_suppress L6404W
+--diag_suppress L6314W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>data_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\data_init.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ca_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>nvms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/nvms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_low_level.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_callgate.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_exception.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_fwimg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_der_x962.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_digest.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_dyn_obj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_ecc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_enc_dec.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_key_mgt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_nvm_storage.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_platf_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+          <Files>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
+            <File>
+              <FileName>sha256.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_SECoreBin"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..8e2c99e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,146 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..ddd683d3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,142 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..781a4599
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,145 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_LoRaWAN_End_Node_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
new file mode 100644
index 00000000..7b2822b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
@@ -0,0 +1,29 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+
+; *** regions needed by SE_CoreBin project ***
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
+  *(.SE_CallGate_Code)
+  }
+  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
+  *(.SE_Startup_Code)
+  }
+  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_CODE_NOKEY_REGION_ROM_SIZE{
+  .ANY (+RO)
+  }
+  User_Key_region_ROM USER_KEY_REGION_ROM_START FIXED USER_KEY_REGION_ROM_SIZE {
+  *(.User_embedded_Keys)
+  }
+  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
+  *(.SE_embedded_Keys)
+  }
+  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
new file mode 100644
index 00000000..67246f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
@@ -0,0 +1,84 @@
+/**
+  ******************************************************************************
+  * @file    data_init.c
+  * @author  MCD Application Team
+  * @brief   Data section (RW + ZI) initialization.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+******************************************************************************
+*/
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+
+extern uint32_t Image$$SE_region_RAM$$RW$$Base;
+extern uint32_t Load$$SE_region_RAM$$RW$$Base;
+extern uint32_t Image$$SE_region_RAM$$RW$$Length;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Base;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Length;
+
+
+#define data_ram Image$$SE_region_RAM$$RW$$Base
+#define data_rom Load$$SE_region_RAM$$RW$$Base
+#define data_rom_length Image$$SE_region_RAM$$RW$$Length
+#define bss Image$$SE_region_RAM$$ZI$$Base
+#define bss_length Image$$SE_region_RAM$$ZI$$Length;
+
+
+/**
+  * @brief  Copy initialized data from ROM to RAM.
+  * @param  None.
+  * @retval None.
+  */
+void LoopCopyDataInit(void) 
+{
+  uint32_t i;
+	uint8_t* src = (uint8_t*)&data_rom;
+	uint8_t* dst = (uint8_t*)&data_ram;
+	uint32_t len = (uint32_t)&data_rom_length;
+
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = src[i];
+  }
+}
+  
+/**
+  * @brief  Clear the zero-initialized data section.
+  * @param  None.
+  * @retval None.
+  */
+void LoopFillZerobss(void) 
+{
+  uint32_t i;
+	uint8_t* dst = (uint8_t*)&bss;
+	uint32_t len = (uint32_t)&bss_length;
+	
+	/* Clear the zero-initialized data section */
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = 0;
+  }
+}
+	
+/**
+  * @brief  Data section initialization.
+  * @param  None.
+  * @retval None.
+  */
+ void __arm_data_init(void) {
+	 	LoopFillZerobss();
+	  LoopCopyDataInit();
+} 
+ 
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
rename to Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..ea001733
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/STM32CubeIDE | ../../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App | ../../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SECoreBin.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value=".."/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App"/>
+									<listOptionValue builtIn="false" value="../../../LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SECoreBin.null.394363235" name="2_Images_SECoreBin"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
new file mode 100644
index 00000000..4a09bf52
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SECoreBin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ca_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
new file mode 100644
index 00000000..dcc46a55
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
@@ -0,0 +1,36 @@
+
+#include "stdint-gcc.h"
+
+#ifndef vu32
+#	define vu32 volatile uint32_t
+#endif
+
+void LoopCopyDataInit(void) {
+	extern char _sidata asm("_sidata");
+	extern char _sdata asm("_sdata");
+	extern char _edata asm("_edata");
+	
+	vu32* src = (vu32*) &_sidata;
+	vu32* dst = (vu32*) &_sdata;
+	
+	vu32 len = (&_edata - &_sdata) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = src[i];
+}
+
+void LoopFillZerobss(void) {
+	extern char _sbss asm("_sbss");
+	extern char _ebss asm("_ebss");
+	
+	vu32* dst = (vu32*) &_sbss;
+	vu32 len = (&_ebss - &_sbss) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = 0;
+}
+
+void __gcc_data_init(void) {
+	LoopFillZerobss();
+	LoopCopyDataInit();
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
new file mode 100644
index 00000000..6539f13b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
@@ -0,0 +1,153 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(SE_CallGate)
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_CallGate_Code :
+  {
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    KEEP(*(.SE_CallGate_Code))
+  } > SE_CallGate_ROM_region
+
+  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SE_Code_NoKey_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .USER_embedded_Keys : { KEEP(*(.USER_embedded_Keys)) } > User_Key_region_ROM
+  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
+  
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SE_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SE_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
new file mode 100644
index 00000000..30759a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_C
+#define CA_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "CryptoApi/ca.h"
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#include "mbedtls/entropy_poll.h"
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#define COMPILER_BARRIER() __DMB();__DSB();
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static RNG_HandleTypeDef handle;
+static uint8_t users = 0;
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private function prototypes -----------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta);
+static void RNG_Init(void);
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length);
+static void RNG_DeInit(void);
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Exported functions implementation -----------------------------------------*/
+
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+
+/**
+  * @brief CRYP MSP Initialization
+  * This function configures the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Release AES/CRYP from reset state */
+    __HAL_RCC_AES_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_AES_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief CRYP MSP De-Initialization
+  * This function freeze the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_AES_CLK_DISABLE();
+    /* Force AES/CRYP into reset state */
+    __HAL_RCC_AES_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/**
+  * @brief      PKA MSP Initialization
+  *             This function configures the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Release PKA from reset state */
+    __HAL_RCC_PKA_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_PKA_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief      PKA MSP De-Initialization
+  *             This function freeze the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_PKA_CLK_DISABLE();
+    /* Force PKA into reset state */
+    __HAL_RCC_PKA_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta)
+{
+  COMPILER_BARRIER();
+  uint8_t newValue;
+  do
+  {
+    newValue = __LDREXB(valuePtr) + delta;
+  } while (__STREXB(newValue, valuePtr));
+  COMPILER_BARRIER();
+  return newValue;
+}
+
+static void RNG_Init(void)
+{
+  uint32_t dummy;
+
+  /*  We're only supporting a single user of RNG */
+  if (atomic_incr_u8(&users, 1) > 1)
+  {
+    while (1);
+  }
+
+  /* Select MSI as RNG clock source */
+  __HAL_RCC_RNG_CONFIG(RCC_RNGCLKSOURCE_MSI);
+
+  /* RNG Peripheral clock enable */
+  __HAL_RCC_RNG_CLK_ENABLE();
+
+  /* Initialize RNG instance */
+  handle.Instance = RNG;
+  handle.State = HAL_RNG_STATE_RESET;
+  handle.Lock = HAL_UNLOCKED;
+
+  HAL_RNG_Init(&handle);
+
+  /* first random number generated after setting the RNGEN bit should not be used */
+  HAL_RNG_GenerateRandomNumber(&handle, &dummy);
+}
+
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length)
+{
+  int32_t ret = 0;
+  __IO uint8_t random[4];
+  *output_length = 0;
+
+  /* Get Random byte */
+  while ((*output_length < length) && (ret == 0))
+  {
+    if (HAL_RNG_GenerateRandomNumber(&handle, (uint32_t *)random) != HAL_OK)
+    {
+      ret = -1;
+    }
+    else
+    {
+      for (uint8_t i = 0; (i < 4) && (*output_length < length) ; i++)
+      {
+        *output++ = random[i];
+        *output_length += 1;
+        random[i] = 0;
+      }
+    }
+  }
+  /* Just be extra sure that we didn't do it wrong */
+  if ((__HAL_RNG_GET_FLAG(&handle, (RNG_FLAG_CECS | RNG_FLAG_SECS))) != 0)
+  {
+    *output_length = 0;
+  }
+}
+
+static void RNG_DeInit(void)
+{
+  /*Disable the RNG peripheral */
+  HAL_RNG_DeInit(&handle);
+  /* RNG Peripheral clock disable - assume we're the only users of RNG  */
+  __HAL_RCC_RNG_CLK_DISABLE();
+
+  users = 0;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+  RNG_Init();
+  RNG_GetBytes(output, len, olen);
+  RNG_DeInit();
+  if (*olen != len)
+  {
+    return -1;
+  }
+  return 0;
+}
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+/**
+  * @brief      CRC initialization
+  *             This function release reset and clock CRC IP peripheral
+  * @retval None
+  */
+void CA_LL_CRC_Init(void)
+{
+  /* Force CRC into reset state */
+  __HAL_RCC_CRC_FORCE_RESET();
+  /* Release CRC from reset state */
+  __HAL_RCC_CRC_RELEASE_RESET();
+  /* Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+}
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#endif /* CA_LOW_LEVEL_C */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
new file mode 100644
index 00000000..3db7b5e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
@@ -0,0 +1,188 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains implementations for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include "kms.h"
+#include "kms_low_level.h"
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+typedef enum
+{
+  KMS_MEM_NONE    = 0,
+  KMS_MEM_ALLOC,
+  KMS_MEM_FREE
+} kms_ll_mem_optype;
+typedef struct
+{
+  kms_ll_mem_optype   optype;
+  uint32_t            size;
+  void               *ptr;
+} kms_ll_mem_operation_t;
+#endif /* KMS_MEM_LOGGING */
+/* Private define ------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+#define KMS_LL_MEM_LOGGING_MAX    (100UL)
+#endif /* KMS_MEM_LOGGING */
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+kms_ll_mem_operation_t kms_ll_mem_logging[KMS_LL_MEM_LOGGING_MAX];
+uint32_t kms_ll_mem_logging_idx;
+#endif /* KMS_MEM_LOGGING */
+/* Private function prototypes -----------------------------------------------*/
+/* Private function ----------------------------------------------------------*/
+/* Exported functions --------------------------------------------------------*/
+
+/**
+  * @brief  Read data from flash and store into buffer
+  * @note   Used to access encrypted blob in flash.
+  * @param  pDestination buffer to store red data
+  * @param  pSource flash aread to read from
+  * @param  Length amount of data to read from flash
+  * @retval Operation status
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length)
+{
+  SE_ErrorStatus seStatus;
+  seStatus = SE_LL_FLASH_Read(pDestination, pSource, Length);
+  return (seStatus == SE_SUCCESS) ? CKR_OK : CKR_GENERAL_ERROR;
+}
+
+#ifdef KMS_SE_CHECK_PARAMS
+
+/* Remove compilation optimization */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  Check if given buffer in inside secure enclave (RAM or Flash, NVM_Storgae)
+  *              If it is in Enclave area, then generate a RESET.
+  * @param  pBuffer Buffer address
+  * @param  ulSize  Buffer size
+  * @retval void
+  */
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize)
+{
+  /* If pBuffer is NULL, simply return FALSE */
+  if ((pBuffer == NULL) || (ulSize == 0UL))
+  {
+    return;
+  }
+  /* Check if address range is within secure enclave                           */
+  /* Called APIs will generate exception in case buffer is in forbidden area   */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  /* Double Check to avoid basic fault injection */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  return;
+}
+#endif /* KMS_SE_CHECK_PARAMS */
+
+/**
+  * @brief  An error occurred
+  * @note   Used to debug or reset in case of important issue
+  * @param  error Error reported by KMS
+  */
+void KMS_LL_ReportError(uint32_t error)
+{
+  (void)error;
+  while (1 == 1) {;}
+}
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory initialization occurred
+  */
+void KMS_LL_ReportMemInit(void)
+{
+  for (uint32_t i = 0; i < KMS_LL_MEM_LOGGING_MAX; i++)
+  {
+    kms_ll_mem_logging[i].optype = KMS_MEM_NONE;
+    kms_ll_mem_logging[i].size = 0;
+    kms_ll_mem_logging[i].ptr = NULL_PTR;
+  }
+  kms_ll_mem_logging_idx = 0;
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory allocation occurred
+  * @param  size    Size allocated
+  * @param  pmem    Allocated pointer
+  */
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_ALLOC;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = size;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory free occurred
+  * @param  pmem    Freed pointer
+  */
+void KMS_LL_ReportMemFree(void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_FREE;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = 0;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
new file mode 100644
index 00000000..f9ca9236
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
@@ -0,0 +1,236 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_hal_flash.h"
+#include "nvms_low_level.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep);
+static uint32_t get_page(uint32_t Addr);
+/* Private function ----------------------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep)
+{
+  uint8_t *p;
+  uint32_t maxsize;
+  HAL_StatusTypeDef ret = HAL_OK;
+
+  /* Calculating the maximum writable chunk size.*/
+  maxsize = (size_t)(NVMS_LL_PAGE_SIZE -
+                     ((uint32_t) * destinationp & (NVMS_LL_PAGE_SIZE - 1UL)));
+  if (maxsize > *sizep)
+  {
+    maxsize = *sizep;
+  }
+
+  p = *destinationp;
+
+  /* Updating size and pointers.*/
+  *sizep        -= maxsize;
+  *destinationp += maxsize;
+
+  /* Programming, 64 bits granularity  */
+  (void)HAL_FLASH_Unlock();
+  while ((maxsize >= 8UL) && (ret == HAL_OK))
+  {
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+    p = &p[8];
+    *sourcep = &((*sourcep)[8]);
+    maxsize -= 8UL;
+  }
+
+  if (maxsize != 0UL)
+  {
+    uint8_t block[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    /* Problem, there are remaining bytes to write, but not a full 64bit word --> we can't handle it */
+    /* Let's write a full 64bit word */
+    (void)memcpy(block, *sourcep, maxsize);
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+  }
+  (void)HAL_FLASH_Lock();
+
+  if (ret == HAL_OK)
+  {
+    return false;
+  }
+  return true;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t get_page(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+/* Exported functions --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+
+/**
+  * @brief   Flash low level driver initialization.
+  */
+void NVMS_LL_Init(void)
+{
+
+}
+
+/**
+  * @brief   Determines if a flash block is in erased state.
+  *
+  * @param   block         the block identifier
+  * @return                  The block state.
+  * @retval false            if the block is not in erased state.
+  * @retval true             if the block is in erased state.
+  */
+bool NVMS_LL_IsBlockErased(nvms_block_t block)
+{
+  uint32_t i;
+  uint32_t *p = (uint32_t *)((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS :
+                             NVMS_LL_BLOCK1_ADDRESS);
+
+  for (i = 0; i < (NVMS_LL_BLOCK_SIZE / sizeof(uint32_t)); i++)
+  {
+    if (*p != NVMS_LL_ERASED)
+    {
+      return false;
+    }
+    p++;
+  }
+  return true;
+}
+
+
+
+/**
+  * @brief   Erases a block.
+  * @note    The erase operation is verified internally.
+  *
+  * @param   block         the block identifier
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the erase operation failed.
+  */
+bool NVMS_LL_BlockErase(nvms_block_t block)
+{
+  /* Erase First Flash sector */
+  FLASH_EraseInitTypeDef EraseInitStruct;
+  uint32_t SectorError = 0;
+
+  EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+  EraseInitStruct.Page        = get_page((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS : NVMS_LL_BLOCK1_ADDRESS);
+  EraseInitStruct.NbPages     = NVMS_LL_NB_PAGE_PER_BLOCK;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void)HAL_FLASH_Unlock();
+
+  if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK)
+  {
+    /* Error occurred while sector erase.
+      User can add here some code to deal with this error.
+      SectorError will contain the faulty sector and then to know the code error on this sector,
+      user can call function 'HAL_FLASH_GetError()'
+      FLASH_ErrorTypeDef errorcode = HAL_FLASH_GetError(); */
+  }
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void)HAL_FLASH_Lock();
+
+  /* Operation verification.*/
+  return !NVMS_LL_IsBlockErased(block);
+}
+
+/**
+  * @brief   Writes data.
+  * @note    The write operation is verified internally.
+  * @note    If the write operation partially writes flash pages then the
+  *          unwritten bytes are left to the filler value.
+  *
+  * @param   source        pointer to the data to be written
+  * @param   destination   pointer to the flash position
+  * @param   size          size of data
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the write operation failed.
+  */
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size)
+{
+  const uint8_t *s = source;
+  uint8_t *d = destination;
+  size_t sz = size;
+
+  while (sz > 0UL)
+  {
+    /* Writes as much as a single operation allows.*/
+    if (page_write(&s, &d, &sz))
+    {
+      return true;
+    }
+  }
+
+  /* Operation verification.*/
+  return (bool)(memcmp(source, destination, size) != 0);
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c
new file mode 100644
index 00000000..576319a2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c
@@ -0,0 +1,757 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SE_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#endif /* __CC_ARM */
+#include "se_exception.h"
+#include "string.h"
+
+#ifdef KMS_ENABLED
+#include "kms.h"
+#include "kms_objects.h"
+#include "kms_platf_objects_config.h"
+#endif /* KMS_ENABLED */
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+/** @defgroup  SE_HARDWARE SE Hardware Interface
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Private_Variables Private Variables
+  * @{
+  */
+static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
+
+static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Private_Functions Private Functions
+  * @{
+  */
+
+static uint32_t SE_LL_GetPage(uint32_t Address);
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  Set CRC configuration and call HAL CRC initialization function.
+  * @param  None.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  CrcHandle.Instance = CRC;
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The Default polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+  /* The default init value is used */
+  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+  /* CRC Init*/
+  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_Init(void)
+{
+  /* CRC Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  return SE_LL_CRC_Config();
+}
+
+/**
+  * @brief  Wrapper to HAL CRC de-initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_DeInit(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
+  {
+    /* Initialization OK */
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC Calculate function.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  uBufferLength: buffer length in 32-bits word.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  This function does an erase of nb pages in user flash area
+  * @param  pStart: pointer to  user flash area
+  * @param  Length: number of bytes.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SE_ErrorStatus e_ret_status = SE_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    /* Fill EraseInit structure*/
+    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
+    p_erase_init.Page          = SE_LL_GetPage(start);
+    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
+    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+    {
+      e_ret_status = SE_ERROR;
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Write in Flash  protected area
+  * @param  pDestination pointer to destination area in Flash
+  * @param  pSource pointer to input buffer
+  * @param  Length number of bytes to be written
+  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
+  */
+
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SE_ErrorStatus ret = SE_SUCCESS;
+  uint32_t i;
+  uint32_t verified = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  if (Length == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Area should be inside 1 of the firmware image headers */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    for (i = 0U; i < Length; i += 8U)
+    {
+      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
+      {
+        ret = SE_ERROR;
+        break;
+      }
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) */
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    ret = SE_ERROR;
+  }
+  return ret;
+}
+
+/**
+  * @brief  Read in Flash protected area
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to read
+  * @param  Length: Length in bytes of data buffer
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  uint32_t source = (uint32_t)pSource;
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+  uint32_t i;
+  uint32_t verified = 0U;
+
+  /* Area should be inside 1 of the firmware image headers
+     or inside 1 of the download areas */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
+        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
+    {
+      verified = 1U;
+    }
+  }
+
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  SE_DoubleECC_Error_Counter = 0U;
+  /* Do not use memcpy from lib : ECC error should be checked at each loop */
+  for (i = 0; (i < Length) && (SE_DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+  {
+    *pDestination = *pSource;
+  }
+  if (SE_DoubleECC_Error_Counter == 0U)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  SE_DoubleECC_Error_Counter = 0U;
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
+  * @param pxSE_Metadata: Firmware metadata.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(pxSE_Metadata);
+  return SE_SUCCESS;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_ROM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is in sbsfu ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
+                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
+                            || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
+                           )))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+/**
+  * @brief function to disable all IRQ, previously enabled ones are stored in parameter
+  * @param pIrqState: IRQ state buffer
+  * @param IrqStateNb: Number of IRQ state that can be stored
+  * @retval SE_ErrorStatus SE_SUCCESS when complete successfully, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    pIrqState[0] = NVIC->ICER[0];     /* Save currently enabled IRQ */
+    NVIC->ICER[0] = pIrqState[0];     /* Disable All IRQ */
+    if (NVIC->ICER[0] == 0UL)         /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    NVIC->ISER[0] = pIrqState[0];         /* Disable All enabled IRQ */
+    if (NVIC->ICER[0] == pIrqState[0])    /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Lock the embedded keys used by SBSFU
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void)
+{
+#ifdef KMS_ENABLED
+  uint32_t i_key_locked = 0U;
+  uint32_t i_ctrl = 0U;
+
+#ifdef KMS_INDEX_BLOBIMPORT_VERIFY
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_VERIFY) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_VERIFY */
+#ifdef KMS_INDEX_BLOBIMPORT_DECRYPT
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_DECRYPT) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_DECRYPT */
+#ifdef KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE */
+  if(i_ctrl == i_key_locked)
+  {
+    return SE_SUCCESS;
+  }
+  else
+  {
+    return SE_ERROR;
+  }
+#else /* KMS_ENABLED */
+  return SE_SUCCESS;
+#endif /* KMS_ENABLED */
+}
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t SE_LL_GetPage(uint32_t Address)
+{
+  uint32_t page;
+
+  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
+  {
+    /* Bank 1 */
+    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
+  }
+  else
+  {
+    /* Bank 2 */
+    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
+  }
+  return page;
+}
+
+/**
+  * @brief  Gets the bank of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The bank of a given address
+  */
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retval None.
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    SE_DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    /* This exception occurs for another reason than flash double ECC errors */
+    SE_NMI_ExceptionHandler();
+  }
+}
+
+/**
+  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
+  * @param  None.
+  * @retvat void
+  */
+void HardFault_Handler(void)
+{
+  SE_NMI_ExceptionHandler();
+}
+
+/**
+  * @brief  Cleanup SE CORE
+  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
+  *
+  */
+void  SE_LL_CORE_Cleanup(void)
+{
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt
new file mode 100644
index 00000000..f996f365
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt
@@ -0,0 +1,113 @@
+/**
+  @page 2_Images_SECoreBin / Secure Engine Core binary generation.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Secure Engine Core binary generation.
+  *          SE Core binary exports SE CallGate function entry point for
+  *          SFU Application.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application is used to generate Secure Engine Core binary file to be linked
+with Secure Boot & Secure Firmware Update application (SBSFU).
+SE Core binary exports a single entry point to SE CallGate function and a startup method for data initialization.
+It is based on the Secure Engine Middleware.
+
+Generated SE Core Binary embeds Key Management Services accessible through this same single entry point using APIs
+defined by tKMS interface.
+
+It has to be compiled before SBSFU project.
+
+Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default
+cryptographic scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are
+provided and can be selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
+   - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
+   - SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+   - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+
+This example supports multiple images feature configured with 2 active images for execution from internal flash.
+Each image has its own keys for signature verification and firwmare encryption.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 2_Images_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
+   - 2_Images_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
+   - 2_Images_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
+   - 2_Images_SECoreBin/Src/se_low_level.c                      Low level interface
+   - 2_Images_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
+   - 2_Images_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
+   - 2_Images_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
+                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
+                                                                Exported to KMS user to ease embedded object usage
+   - 2_Images_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
+   - 2_Images_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
+   - 2_Images_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
+   - 2_Images_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
+   - 2_Images_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
+   - 2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
+   - 2_Images_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
+   - 2_Images_SECoreBin/Binary/ECCKEY2.txt                      Private ECCDSA key for signature verification of 2nd active image
+   - 2_Images_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin Public key for AES CBC encryption of 2nd active image
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin Public key for AES GCM encryption of 2nd active image
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files. As a workaround, it is advised to use the subst.exe command from within a command prompt to set up
+     a local drive out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+   
+@par IDE prebuild script
+
+In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
+This preliminary processing is in charge of:
+   - determining the requested cryptographic scheme
+   - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of SBSFU & Blob
+     importation keys into the KMS embedded objects pattern file)
+   - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
+
+A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic
+key). The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+In order to generate Secure Engine Core binary file, you must do the following :
+   - Open your preferred toolchain
+   - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h
new file mode 100644
index 00000000..8b9f956b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h
@@ -0,0 +1,114 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t __ICFEDIT_M4_SB_region_ROM_start__;
+#define M4_SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_M4_SB_region_ROM_end__;
+#define M4_SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_intvec_start__;
+#define INTVECT_START ((uint32_t)& __ICFEDIT_intvec_start__)
+extern uint32_t __ICFEDIT_SE_Startup_region_ROM_start__;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Startup_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_start__;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_end__;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_start__;
+#define SE_IF_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_end__;
+#define SE_IF_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_start__;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_end__;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_CallGate_region_ROM_start__;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_CallGate_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_start__;
+#define SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_end__;
+#define SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_start__;
+#define SE_REGION_RAM_START ((uint32_t)& __ICFEDIT_SE_region_RAM_start__)
+extern uint32_t __ICFEDIT_SE_region_RAM_end__ ;
+#define SE_REGION_RAM_END ((uint32_t)& __ICFEDIT_SE_region_RAM_end__)
+extern uint32_t __ICFEDIT_SB_region_RAM_start__ ;
+#define SB_REGION_RAM_START ((uint32_t)& __ICFEDIT_SB_region_RAM_start__)
+extern uint32_t __ICFEDIT_SB_region_RAM_end__ ;
+#define SB_REGION_RAM_END ((uint32_t)& __ICFEDIT_SB_region_RAM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_stack_top__;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& __ICFEDIT_SE_region_RAM_stack_top__)
+
+extern uint32_t __ICFEDIT_KMS_DataStorage_start__ ;
+#define KMS_DATASTORAGE_START ((uint32_t)& __ICFEDIT_KMS_DataStorage_start__)
+extern uint32_t __ICFEDIT_KMS_DataStorage_end__ ;
+#define KMS_DATASTORAGE_END ((uint32_t)& __ICFEDIT_KMS_DataStorage_end__)
+
+
+#if defined (__ICCARM__) || defined(__GNUC__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_header__;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_1_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_start__;
+#define SLOT_ACTIVE_1_START ((uint32_t)& __ICFEDIT_SLOT_Active_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_end__;
+#define SLOT_ACTIVE_1_END ((uint32_t)& __ICFEDIT_SLOT_Active_1_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_header__;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_2_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_start__;
+#define SLOT_ACTIVE_2_START ((uint32_t)& __ICFEDIT_SLOT_Active_2_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_end__;
+#define SLOT_ACTIVE_2_END ((uint32_t)& __ICFEDIT_SLOT_Active_2_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_header__;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_3_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_start__;
+#define SLOT_ACTIVE_3_START ((uint32_t)& __ICFEDIT_SLOT_Active_3_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_end__;
+#define SLOT_ACTIVE_3_END ((uint32_t)& __ICFEDIT_SLOT_Active_3_end__)
+extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_start__;
+#define SLOT_BLOB_DWL_1_START ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_end__;
+#define SLOT_BLOB_DWL_1_END ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_end__)
+
+/* DualCore specificities */
+#if !defined(CORE_CM0PLUS)
+extern uint32_t __ICFEDIT_region_ROM_end__ ;
+#define C1_AREA_ADDR_END  ((uint32_t)& __ICFEDIT_region_ROM_end__)
+#define C2_BOOT_BASE_ADDR ((uint32_t)& __ICFEDIT_intvec_start__)
+#endif /* CORE_CM0PLUS */
+extern volatile uint32_t __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ ;
+#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__)
+
+#endif /* __ICCARM__ || __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
new file mode 100644
index 00000000..999a67d1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
@@ -0,0 +1,24 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* Active slot #1 (60 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_1_header__= 0x0803F800;
+define exported symbol  __ICFEDIT_SLOT_Active_1_start__ = 0x0801C000;
+define exported symbol  __ICFEDIT_SLOT_Active_1_end__   = 0x0802AFFF;
+
+/* Active slot #2 (100 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_2_header__= 0x0803F000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_start__ = 0x08003000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_end__   = 0x0801BFFF;
+
+/* Slot download 1 region (2 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Blob_Dwl_1_start__= 0x08002800;
+define exported symbol  __ICFEDIT_SLOT_Blob_Dwl_1_end__  = 0x08002FFF;
+
+/* Slots not configured */
+define exported symbol  __ICFEDIT_SLOT_Active_3_header__= 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_start__ = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_end__   = 0x00000000;
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
new file mode 100644
index 00000000..af6c40d4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
@@ -0,0 +1,101 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 SB Code region */
+define exported symbol __ICFEDIT_M4_SB_region_ROM_start__          = 0x08000000;
+define exported symbol __ICFEDIT_M4_SB_region_ROM_end__            = 0x080027FF;
+
+/* ROM regions definition */
+define region M4_SB_ROM_region           = mem:[from __ICFEDIT_M4_SB_region_ROM_start__   to __ICFEDIT_M4_SB_region_ROM_end__];
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+define exported symbol __ICFEDIT_KMS_DataStorage_start__           = 0x0802B000;
+define exported symbol __ICFEDIT_KMS_DataStorage_end__             = 0x0802CFFF;
+
+/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation */
+define exported symbol __ICFEDIT_SE_IF_region_ROM_start__          = __ICFEDIT_KMS_DataStorage_end__ + 1;
+define exported symbol __ICFEDIT_SE_IF_region_ROM_end__            = __ICFEDIT_SE_IF_region_ROM_start__ + 0x13FF;
+
+/* SBSFU Code region */
+define exported symbol __ICFEDIT_SB_region_ROM_start__             = __ICFEDIT_SE_IF_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_ROM_end__               = 0x080367FF;
+
+/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+define exported symbol __ICFEDIT_intvec_start__                    = __ICFEDIT_SB_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_Vector_size__                     = 0x200;
+
+/* SE Code region protected by MPU isolation */
+define exported symbol __ICFEDIT_SE_Code_region_ROM_start__        = __ICFEDIT_intvec_start__ + __ICFEDIT_Vector_size__;
+define exported symbol __ICFEDIT_SE_CallGate_region_ROM_start__    = __ICFEDIT_SE_Code_region_ROM_start__ + 4;
+define exported symbol __ICFEDIT_SE_CallGate_Region_ROM_End__      = __ICFEDIT_SE_Code_region_ROM_start__ + 0x1FF;
+
+/* SE Startup */
+define exported symbol __ICFEDIT_SE_Startup_region_ROM_start__     = __ICFEDIT_SE_CallGate_Region_ROM_End__ + 1;
+define exported symbol __ICFEDIT_SE_Code_nokey_region_ROM_start__  = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x100;
+
+/* User Embedded Keys */
+define exported symbol __ICFEDIT_User_Key_region_ROM_start__      = 0x0803E500;
+define exported symbol __ICFEDIT_User_Key_region_ROM_end__        = 0x0803E7FF;
+
+/* SE Embedded Keys */
+define exported symbol __ICFEDIT_SE_Key_region_ROM_start__         = 0x0803E800;
+define exported symbol __ICFEDIT_SE_Key_region_ROM_end__           = 0x0803EFFF;
+define exported symbol __ICFEDIT_SE_Code_region_ROM_end__          = __ICFEDIT_SE_Key_region_ROM_end__;
+
+/* ROM regions definition */
+define region KMS_DataStorage            = mem:[from __ICFEDIT_KMS_DataStorage_start__ to __ICFEDIT_KMS_DataStorage_end__];
+define region SE_IF_ROM_region           = mem:[from __ICFEDIT_SE_IF_region_ROM_start__ to __ICFEDIT_SE_IF_region_ROM_end__];
+define region SB_ROM_region              = mem:[from __ICFEDIT_SB_region_ROM_start__ to __ICFEDIT_SB_region_ROM_end__];
+define region SE_CALLGATE_ROM_Region     = mem:[from __ICFEDIT_SE_CallGate_region_ROM_start__ to __ICFEDIT_SE_CallGate_Region_ROM_End__];
+define region SE_CODE_NOKEY_ROM_region   = mem:[from __ICFEDIT_SE_Code_nokey_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_start__ - 1];
+define region User_Key_ROM_region        = mem:[from __ICFEDIT_User_Key_region_ROM_start__ to __ICFEDIT_User_Key_region_ROM_end__];
+define region SE_Key_ROM_region          = mem:[from __ICFEDIT_SE_Key_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_end__];
+define region SE_ROM_region              = mem:[from __ICFEDIT_SE_Code_region_ROM_start__ to __ICFEDIT_SE_Code_region_ROM_end__];
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+define symbol __ICFEDIT_M4_SB_region_RAM_start__                   = 0x20000000;
+define symbol __ICFEDIT_M4_SB_region_RAM_end__                     = __ICFEDIT_M4_SB_region_RAM_start__ + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ = __ICFEDIT_M4_SB_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__   = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ + 0x1F;
+
+/* M4 UserApp */
+define symbol __ICFEDIT_M4_APP_region_RAM_start__                  = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__ + 1;
+define symbol __ICFEDIT_M4_APP_region_RAM_end__                    = 0x20007FFF;
+
+/* M4 UserApp shared area */
+define exported symbol __ICFEDIT_M4_SHARED_region_SRAM_start__     = 0x20008000;
+define exported symbol __ICFEDIT_M4_SHARED_region_SRAM_end__       = 0x200083FF;
+
+/* M0PLUS UserApp shared area */
+define exported symbol __ICFEDIT_M0PLUS_SHARED_region_SRAM_start__ = 0x20008400;
+define exported symbol __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__   = 0x20008FFF;
+
+/* SBSFU RAM region */
+define exported symbol __ICFEDIT_SB_region_RAM_start__             = __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_RAM_end__               = 0x2000D3FF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
+define exported symbol __ICFEDIT_SE_region_RAM_start__             = __ICFEDIT_SB_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_SE_region_RAM_stack_top__         = 0x2000DB00; /* Secure Engine's private stack */
+define exported symbol __ICFEDIT_SE_region_RAM_end__               = 0x2000FFFF;
+
+/* RAM regions definition */
+define region M4_SB_RAM_region           = mem:[from __ICFEDIT_M4_SB_region_RAM_start__ to __ICFEDIT_M4_SB_region_RAM_end__];
+define region M4_APP_RAM_region          = mem:[from __ICFEDIT_M4_APP_region_RAM_start__ to __ICFEDIT_M4_APP_region_RAM_end__];
+define region SE_RAM_region              = mem:[from __ICFEDIT_SE_region_RAM_stack_top__ to __ICFEDIT_SE_region_RAM_end__];
+define region SB_RAM_region              = mem:[from __ICFEDIT_SB_region_RAM_start__ to __ICFEDIT_SB_region_RAM_end__];
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
new file mode 100644
index 00000000..c5322b08
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    mapping_fwimg.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for firmware images mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_FWIMG_H
+#define MAPPING_FWIMG_H
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* Active slot #1  (60 kbytes) */
+#define SLOT_ACTIVE_1_HEADER         0x0803F800
+#define SLOT_ACTIVE_1_START          0x0801C000
+#define SLOT_ACTIVE_1_END            0x0802AFFF
+
+/* Active slot #2  (100 kbytes) */
+#define SLOT_ACTIVE_2_HEADER         0x0803F000
+#define SLOT_ACTIVE_2_START          0x08003000
+#define SLOT_ACTIVE_2_END            0x0801BFFF
+
+/* Dwl slot #1  (2 kbytes) */
+#define SLOT_BLOB_DWL_1_START        0x08002800
+#define SLOT_BLOB_DWL_1_END          0x08002FFF
+
+/* Slots not configured */
+#define SLOT_ACTIVE_3_HEADER         0x00000000
+#define SLOT_ACTIVE_3_START          0x00000000
+#define SLOT_ACTIVE_3_END            0x00000000
+
+#endif
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
new file mode 100644
index 00000000..f2172ad9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
@@ -0,0 +1,127 @@
+/**
+  ******************************************************************************
+  * @file    mapping_sbsfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SBSFU mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_SBSFU_H
+#define MAPPING_SBSFU_H
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 SB Code region */
+#define M4_SB_REGION_ROM_START          0x08000000
+#define M4_SB_REGION_ROM_END            0x080027FF
+
+/* ROM regions definition */
+#define M4_SB_ROM_REGION_SIZE          (M4_SB_REGION_ROM_END - M4_SB_REGION_ROM_START + 0x1)
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+#define KMS_DATASTORAGE_START           0x0802B000
+#define KMS_DATASTORAGE_END             0x0802CFFF
+
+/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation     */
+#define SE_IF_REGION_ROM_START          (KMS_DATASTORAGE_END + 0x1)
+#define SE_IF_REGION_ROM_END            (SE_IF_REGION_ROM_START + 0x15FF)
+
+/* SBSFU Code region */
+#define SB_REGION_ROM_START             (SE_IF_REGION_ROM_END + 1)
+#define SB_REGION_ROM_END               0x080367FF
+
+/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+#define VECTOR_SIZE                     0x200
+#define INTVECT_START                   (SB_REGION_ROM_END + 0x1)
+
+/* SE Code region protected by MPU isolation */
+#define SE_CODE_REGION_ROM_START        (INTVECT_START + VECTOR_SIZE)
+#define SE_CALLGATE_REGION_ROM_START    (SE_CODE_REGION_ROM_START + 4)
+#define SE_CALLGATE_REGION_ROM_END      (SE_CODE_REGION_ROM_START + 0xFF)
+
+/* SE Startup                               */
+#define SE_STARTUP_REGION_ROM_START     (SE_CALLGATE_REGION_ROM_END + 1)
+#define SE_CODE_NOKEY_REGION_ROM_START  (SE_STARTUP_REGION_ROM_START + 0x100)
+
+/* User Embedded Keys */
+#define USER_KEY_REGION_ROM_START       0x0803E500
+#define USER_KEY_REGION_ROM_END         0x0803E7FF
+
+/* SE Embedded Keys */
+#define SE_KEY_REGION_ROM_START         0x0803E800
+#define SE_KEY_REGION_ROM_END           0x0803EFFF
+#define SE_CODE_REGION_ROM_END          SE_KEY_REGION_ROM_END
+
+/* ROM regions size definition */
+#define KMS_DATASTORAGE_SIZE            (KMS_DATASTORAGE_END - KMS_DATASTORAGE_START + 0x1)
+#define SE_IF_ROM_REGION_SIZE           (SE_IF_REGION_ROM_END - SE_IF_REGION_ROM_START + 0x1)
+#define SB_ROM_REGION_SIZE              (SB_REGION_ROM_END - SB_REGION_ROM_START + 0x1)
+#define SE_CALLGATE_REGION_ROM_SIZE     (SE_CALLGATE_REGION_ROM_END - SE_CALLGATE_REGION_ROM_START + 0x1)
+#define SE_CODE_NOKEY_REGION_ROM_SIZE   (SE_KEY_REGION_ROM_START - SE_CODE_NOKEY_REGION_ROM_START)
+#define USER_KEY_REGION_ROM_SIZE        (USER_KEY_REGION_ROM_START - USER_KEY_REGION_ROM_END + 0x1)
+#define SE_KEY_REGION_ROM_SIZE          (SE_KEY_REGION_ROM_END - SE_KEY_REGION_ROM_START + 0x1)
+#define SE_ROM_REGION_SIZE              (SE_CODE_REGION_ROM_END - SE_CODE_REGION_ROM_START + 0x1)
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+#define M4_SB_REGION_RAM_START          0x20000000
+#define M4_SB_REGION_RAM_END            (M4_SB_REGION_RAM_START + 0xCDF)
+
+/* M0+/M4 Synchronization flag */
+#define M4_M0PLUS_FLAG_RAM_START        (M4_SB_REGION_RAM_END + 0x1)
+#define M4_M0PLUS_FLAG_RAM_END          (M4_M0PLUS_FLAG_RAM_START + 0x1F)
+
+/* M4 UserApp : allocation limited to half RAM size */
+#define M4_APP_REGION_RAM_START         (M4_M0PLUS_FLAG_RAM_END + 0x1)
+#define M4_APP_REGION_RAM_END           0x20007FFF
+
+/* M4 UserApp shared area */
+#define M4_SHARED_REGION_RAM_START      (M4_APP_REGION_RAM_END + 0x1)
+#define M4_SHARED_REGION_RAM_END        0x200083FF
+
+/* M0PLUS UserApp shared area */
+#define M0PLUS_SHARED_REGION_RAM_START  (M4_SHARED_REGION_RAM_END + 0x1)
+#define M0PLUS_SHARED_REGION_RAM_END    0x20008FFF
+
+/* SBSFU RAM region */
+#define SB_REGION_RAM_START             (M0PLUS_SHARED_REGION_RAM_END + 0x1)
+#define SB_REGION_RAM_END               0x2000D3FF
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
+#define SE_REGION_RAM_START             (SB_REGION_RAM_END +0x1)
+#define SE_REGION_RAM_STACK_TOP         0x2000DB00                /* Secure Engine's private stack */
+#define SE_REGION_RAM_END               0x2000FFFF
+
+/* RAM regions definition */
+#define M4_SB_RAM_REGION_SIZE           (M4_SB_REGION_RAM_END - M4_SB_REGION_RAM_START + 0x1)
+#define M4_APP_RAM_REGION_SIZE          (M4_APP_REGION_RAM_END - M4_APP_REGION_RAM_START + 0x1)
+#define M4_SHARED_RAM_REGION_SIZE       (M4_SHARED_REGION_RAM_END - M4_SHARED_REGION_RAM_START + 0x1)
+#define M0PLUS_SHARED_RAM_REGION_SIZE   (M0PLUS_SHARED_REGION_RAM_END - M0PLUS_SHARED_REGION_RAM_START + 0x1)
+#define SB_RAM_REGION_SIZE              (SB_REGION_RAM_END - SB_REGION_RAM_START + 0x1)
+#define SE_RAM_REGION_SIZE              (SE_REGION_RAM_END - SE_REGION_RAM_STACK_TOP + 0x1)
+
+#endif
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
new file mode 100644
index 00000000..a2a79be4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t M4_SB_region_ROM_start;
+#define M4_SB_REGION_ROM_START ((uint32_t)& M4_SB_region_ROM_start)
+extern uint32_t M4_SB_region_ROM_end;
+#define M4_SB_REGION_ROM_END ((uint32_t)& M4_SB_region_ROM_end)
+extern uint32_t INTVECT_start;
+#define INTVECT_START ((uint32_t)& INTVECT_start)
+extern uint32_t SE_Startup_region_ROM_start;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& SE_Startup_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_start;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& SE_Code_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_end;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& SE_Code_region_ROM_end)
+extern uint32_t SE_IF_region_ROM_start;
+#define SE_IF_REGION_ROM_START ((uint32_t)& SE_IF_region_ROM_start)
+extern uint32_t SE_IF_region_ROM_end;
+#define SE_IF_REGION_ROM_END ((uint32_t)& SE_IF_region_ROM_end)
+extern uint32_t SE_Key_region_ROM_start;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& SE_Key_region_ROM_start)
+extern uint32_t SE_Key_region_ROM_end;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& SE_Key_region_ROM_end)
+extern uint32_t SE_CallGate_region_ROM_start;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& SE_CallGate_region_ROM_start)
+extern uint32_t SB_region_ROM_start;
+#define SB_REGION_ROM_START ((uint32_t)& SB_region_ROM_start)
+extern uint32_t SB_region_ROM_end;
+#define SB_REGION_ROM_END ((uint32_t)& SB_region_ROM_end)
+extern uint32_t SE_region_RAM_start;
+#define SE_REGION_RAM_START ((uint32_t)& SE_region_RAM_start)
+extern uint32_t SE_region_RAM_end ;
+#define SE_REGION_RAM_END ((uint32_t)& SE_region_RAM_end)
+extern uint32_t SB_region_RAM_start ;
+#define SB_REGION_RAM_START ((uint32_t)& SB_region_RAM_start)
+extern uint32_t SB_region_RAM_end ;
+#define SB_REGION_RAM_END ((uint32_t)& SB_region_RAM_end)
+extern uint32_t SE_region_RAM_stack_top;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& SE_region_RAM_stack_top)
+
+extern uint32_t KMS_DataStorage_start ;
+#define KMS_DATASTORAGE_START ((uint32_t)& KMS_DataStorage_start)
+extern uint32_t KMS_DataStorage_end ;
+#define KMS_DATASTORAGE_END ((uint32_t)& KMS_DataStorage_end)
+
+extern uint32_t SLOT_Active_1_header;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& SLOT_Active_1_header)
+extern uint32_t SLOT_Active_1_start;
+#define SLOT_ACTIVE_1_START ((uint32_t)& SLOT_Active_1_start)
+extern uint32_t SLOT_Active_1_end;
+#define SLOT_ACTIVE_1_END ((uint32_t)& SLOT_Active_1_end)
+extern uint32_t SLOT_Active_2_header;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& SLOT_Active_2_header)
+extern uint32_t SLOT_Active_2_start;
+#define SLOT_ACTIVE_2_START ((uint32_t)& SLOT_Active_2_start)
+extern uint32_t SLOT_Active_2_end;
+#define SLOT_ACTIVE_2_END ((uint32_t)& SLOT_Active_2_end)
+extern uint32_t SLOT_Active_3_header;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& SLOT_Active_3_header)
+extern uint32_t SLOT_Active_3_start;
+#define SLOT_ACTIVE_3_START ((uint32_t)& SLOT_Active_3_start)
+extern uint32_t SLOT_Active_3_end;
+#define SLOT_ACTIVE_3_END ((uint32_t)& SLOT_Active_3_end)
+extern uint32_t SLOT_Blob_Dwl_1_start;
+#define SLOT_BLOB_DWL_1_START ((uint32_t)& SLOT_Blob_Dwl_1_start)
+extern uint32_t SLOT_Blob_Dwl_1_end;
+#define SLOT_BLOB_DWL_1_END ((uint32_t)& SLOT_Blob_Dwl_1_end)
+
+/* DualCore specificities */
+#if !defined(CORE_CM0PLUS)
+extern uint32_t region_ROM_end ;
+#define C2_AREA_ADDR_END  ((uint32_t)& region_ROM_end)
+extern uint32_t INTVEC_start;
+#define C2_BOOT_BASE_ADDR    ((uint32_t)& INTVEC_start)
+#endif /* CORE_CM0PLUS */
+extern volatile uint32_t M4_M0PLUS_flag_RAM_start ;
+#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& M4_M0PLUS_flag_RAM_start)
+
+
+#ifdef cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
new file mode 100644
index 00000000..d44d1d62
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
@@ -0,0 +1,25 @@
+/*
+** LinkerScript
+*/
+
+/* Slots must be aligned on sector size */
+
+/* Active slot #1 (60 kbytes) */
+SLOT_Active_1_header  = 0x0803F800;
+SLOT_Active_1_start   = 0x0801C000;
+SLOT_Active_1_end     = 0x0802AFFF;
+
+/* Active slot #2 (100 kbytes) */
+SLOT_Active_2_header  = 0x0803F000;
+SLOT_Active_2_start   = 0x08003000;
+SLOT_Active_2_end     = 0x0801BFFF;
+
+/* Dwl slot #1 : (2 kbytes) */
+SLOT_Blob_Dwl_1_start = 0x08002800;
+SLOT_Blob_Dwl_1_end   = 0x08002FFF;
+
+/* Slots not configured */
+SLOT_Active_3_header  = 0x00000000;
+SLOT_Active_3_start   = 0x00000000;
+SLOT_Active_3_end     = 0x00000000;
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
new file mode 100644
index 00000000..651f75a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
@@ -0,0 +1,136 @@
+/*
+** LinkerScript
+*/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 Vector table */
+M4_INTVECT_start               = 0x08000000;
+M4_SB_region_ROM_start         = M4_INTVECT_start;
+M4_Vector_size                 = 0x200;
+
+/* M4 SB Code region */
+M4_SB_Code_region_ROM_start    = M4_INTVECT_start + M4_Vector_size;
+M4_SB_Code_region_ROM_end      = 0x080027FF;
+M4_SB_region_ROM_end           = M4_SB_Code_region_ROM_end;
+
+/* ROM regions size definition */
+M4_SB_Code_region_ROM_size     = M4_SB_Code_region_ROM_end - M4_SB_Code_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+KMS_DataStorage_start          = 0x0802B000;
+KMS_DataStorage_end            = KMS_DataStorage_start + 0x1FFF;
+
+/* SE IF ROM: used to locate Secure Engine interface Code out of MPU isolation     */
+SE_IF_region_ROM_start         = KMS_DataStorage_end + 0x1; 
+SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0x17FF;
+
+/* SBSFU Code region */
+SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
+SB_region_ROM_end              = 0x080367FF;
+
+/* M0 Vector table with alignment constraint on Vector_size */
+INTVECT_start                  = 0x08036800;
+Vector_size                    = 0x200;
+C2_BOOT_BASE_ADDR              = INTVECT_start;
+
+/* SE Code region protected by MPU isolation */
+SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start; /* No need to do +4 as we have dummy bytes in SE_CoreBin .ld file */
+SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
+
+/* SE Startup */
+SE_Startup_region_ROM_start    = SE_CallGate_region_ROM_end + 0x1;
+SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
+
+/* User Embedded Keys */
+User_Key_region_ROM_start      = 0x0803E500;
+User_Key_region_ROM_end        = 0x0803E7FF;
+
+/* SE Embedded Keys */
+SE_Key_region_ROM_start        = 0x0803E800;
+SE_Key_region_ROM_end          = 0x0803EFFF;
+SE_Code_region_ROM_end         = SE_Key_region_ROM_end;
+
+/* ROM regions size definition */
+KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
+SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
+SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
+SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
+SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
+SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
+SE_Code_NoKey_region_ROM_size  = User_Key_region_ROM_start - SE_Code_NoKey_region_ROM_start;
+User_Key_region_ROM_size       = User_Key_region_ROM_end - User_Key_region_ROM_start + 0x1;
+SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+M4_SB_region_RAM_start         = 0x20000000;
+M4_SB_region_RAM_end           = M4_SB_region_RAM_start + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+M4_M0PLUS_flag_RAM_start       = M4_SB_region_RAM_end + 0x1;
+M4_M0PLUS_flag_RAM_end         = M4_M0PLUS_flag_RAM_start + 0x1F;
+
+/* M4 UserApp : allocation limited to half RAM size */
+M4_APP_region_RAM_start        = M4_M0PLUS_flag_RAM_end + 0x1;
+M4_APP_region_RAM_end          = 0x20007FFF;
+
+/* M4 UserApp shared area */
+M4_SHARED_region_RAM_start     = M4_APP_region_RAM_end + 0x1;
+M4_SHARED_region_RAM_end       = 0x200083FF;
+
+/* M0PLUS UserApp shared area */
+M0PLUS_SHARED_region_RAM_start = M4_SHARED_region_RAM_end + 0x1;
+M0PLUS_SHARED_region_RAM_end   = 0x20008FFF;
+
+/* SBSFU RAM region */
+SB_region_RAM_start            = M0PLUS_SHARED_region_RAM_end + 0x1;
+SB_region_RAM_end              = 0x2000CBFF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000CC00 */
+SE_region_RAM_start            = SB_region_RAM_end + 0x1;
+SE_region_RAM_stack_top        = SE_region_RAM_start + 0xC00;                /* Secure Engine's private stack */
+SE_region_RAM_end              = 0x2000FFFF;
+
+/* RAM regions size definition */
+M4_SB_region_RAM_size          = M4_SB_region_RAM_end - M4_SB_region_RAM_start + 0x1;
+M4_APP_region_RAM_size         = M4_APP_region_RAM_end - M4_APP_region_RAM_start + 0x1;
+M4_SHARED_region_RAM_size      = M4_SHARED_region_RAM_end - M4_SHARED_region_RAM_start + 0x1;
+M0PLUS_SHARED_region_RAM_size  = M0PLUS_SHARED_region_RAM_end - M0PLUS_SHARED_region_RAM_start + 0x1;
+SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
+SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
+
+/******************************************************************************/
+/*                              RAM/ROM regions                               */
+/*                                                                            */
+/******************************************************************************/
+
+MEMORY
+{
+ M4_INTVECT_ROM_region (rx)       : ORIGIN = M4_INTVECT_start, LENGTH = M4_Vector_size
+ M4_SB_Code_ROM_region (rx)       : ORIGIN = M4_SB_Code_region_ROM_start, LENGTH = M4_SB_Code_region_ROM_size
+ SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
+ SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
+ INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
+ SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
+ SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
+ SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
+ SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
+ User_Key_region_ROM (rx)         : ORIGIN = User_Key_region_ROM_start, LENGTH = User_Key_region_ROM_size
+ SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
+ M4_SB_RAM_region (xrw)           : ORIGIN = M4_SB_region_RAM_start, LENGTH = M4_SB_region_RAM_size
+ SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+ SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h
new file mode 100644
index 00000000..60836e7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h
@@ -0,0 +1,78 @@
+/**
+  ******************************************************************************
+  * @file    cmsis_nvic_virtual.h
+  * @brief   Maps the NVIC functions on _SVC for Unpriviledge usage
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __CMSIS_NVIC_VIRTUAL_H__
+#define __CMSIS_NVIC_VIRTUAL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "sys_privileged_wrap.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+#define NVIC_SetPriorityGrouping    __NVIC_SetPriorityGrouping
+#define NVIC_GetPriorityGrouping    __NVIC_GetPriorityGrouping
+#define NVIC_EnableIRQ              SYS_PRIVIL_NVIC_EnableIRQ
+#define NVIC_GetEnableIRQ           SYS_PRIVIL_NVIC_GetEnableIRQ
+#define NVIC_DisableIRQ             SYS_PRIVIL_NVIC_DisableIRQ
+#define NVIC_GetPendingIRQ          SYS_PRIVIL_NVIC_GetPendingIRQ
+#define NVIC_SetPendingIRQ          SYS_PRIVIL_NVIC_SetPendingIRQ
+#define NVIC_ClearPendingIRQ        SYS_PRIVIL_NVIC_ClearPendingIRQ
+/* #define NVIC_GetActive              __NVIC_GetActive             not available for Cortex-M0+ */
+#define NVIC_SetPriority            SYS_PRIVIL_NVIC_SetPriority
+#define NVIC_GetPriority            SYS_PRIVIL_NVIC_GetPriority
+#define NVIC_SystemReset            SYS_PRIVIL_NVIC_SystemReset
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CMSIS_NVIC_VIRTUAL_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
new file mode 100644
index 00000000..3dbeb3d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.h
+  * @brief   This file contains all the function prototypes for
+  *          the ipcc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_H__
+#define __IPCC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern IPCC_HandleTypeDef hipcc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_IPCC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
new file mode 100644
index 00000000..40330641
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
@@ -0,0 +1,109 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains the interface of the ipcc driver on CM0PLUS.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_IF_CM0PLUS_H__
+#define __IPCC_IF_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "ipcc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Initialize IPCC and register upper and downer callbacks
+  * @param  IPCC_IF_CommandRcv_cb     command callback
+  * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
+  */
+void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
+
+/**
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
+
+/**
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
+
+/**
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
+
+/**
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_ResponseSnd(uint32_t channelIdx);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_IF_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
new file mode 100644
index 00000000..193e853a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h
@@ -0,0 +1,71 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    kms_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains kms interfaces with middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_IF_H
+#define KMS_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "kms.h"
+#include "tkms.h"
+#include "se_interface_kms.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
new file mode 100644
index 00000000..d6e56436
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h
@@ -0,0 +1,84 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.h
+  * @brief          : Header for main.c file.
+  *                   This file contains the common defines of the application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+#include "app_kms.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+#define RTC_N_PREDIV_S 10
+#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
+#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
new file mode 100644
index 00000000..2386cd7f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    platform.h
+  * @author  MCD Application Team
+  * @brief   Header for General HW instances configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+
+#define USE_BSP_DRIVER
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdbool.h>
+#include "stm32wlxx.h"
+#include "main.h"
+#include "stm32wlxx_ll_gpio.h"
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP.  */
+/* In order to use BSP, users can add the BSP files in the IDE project space */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  */
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_nucleo_radio.h"
+#endif /* defined(USE_BSP_DRIVER) */
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PLATFORM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
new file mode 100644
index 00000000..6dd24df4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    rtc.h
+  * @brief   This file contains all the function prototypes for
+  *          the rtc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RTC_H__
+#define __RTC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern RTC_HandleTypeDef hrtc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_RTC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RTC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
new file mode 100644
index 00000000..cbe62fa1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -0,0 +1,102 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Low Power Manager interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_LPM_IF_H__
+#define __STM32_LPM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_lpm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Enters Low Power Off Mode
+  */
+void PWR_EnterOffMode(void);
+
+/**
+  * @brief Exits Low Power Off Mode
+  */
+void PWR_ExitOffMode(void);
+
+/**
+  * @brief Enters Low Power Stop Mode
+  * @note ARM exists the function when waking up
+  */
+void PWR_EnterStopMode(void);
+
+/**
+  * @brief Exits Low Power Stop Mode
+  * @note Enable the pll at 32MHz
+  */
+void PWR_ExitStopMode(void);
+
+/**
+  * @brief Enters Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_EnterSleepMode(void);
+
+/**
+  * @brief Exits Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_ExitSleepMode(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_LPM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..e1e3f673
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,338 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/*#define HAL_ADC_MODULE_ENABLED   */
+/*#define HAL_COMP_MODULE_ENABLED   */
+/*#define HAL_CRC_MODULE_ENABLED   */
+#define HAL_CRYP_MODULE_ENABLED
+/*#define HAL_DAC_MODULE_ENABLED   */
+#define HAL_GTZC_MODULE_ENABLED
+/*#define HAL_HSEM_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED   */
+/*#define HAL_I2S_MODULE_ENABLED   */
+#define HAL_IPCC_MODULE_ENABLED
+/*#define HAL_IRDA_MODULE_ENABLED   */
+/*#define HAL_IWDG_MODULE_ENABLED   */
+/*#define HAL_LPTIM_MODULE_ENABLED   */
+/*#define HAL_PKA_MODULE_ENABLED   */
+/*#define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+#define HAL_SUBGHZ_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
+/*#define HAL_UART_MODULE_ENABLED   */
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..8d3bf130
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,68 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+ ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32WLxx_IT_H
+#define __STM32WLxx_IT_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void TZIC_ILA_IRQHandler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+void RTC_LSECSS_IRQHandler(void);
+void IPCC_C2_RX_C2_TX_IRQHandler(void);
+void SUBGHZ_Radio_IRQHandler(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
new file mode 100644
index 00000000..0926ffad
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    subghz.h
+  * @brief   This file contains all the function prototypes for
+  *          the subghz.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SUBGHZ_H__
+#define __SUBGHZ_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern SUBGHZ_HandleTypeDef hsubghz;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_SUBGHZ_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SUBGHZ_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
new file mode 100644
index 00000000..52839726
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h
@@ -0,0 +1,126 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for sys_app.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_APP_H__
+#define __SYS_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmux_table.h"
+#include "sys_conf.h"
+#include "stm32_adv_trace.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported defines ----------------------------------------------------------*/
+/* currently not supported */
+/* #define ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
+#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+
+#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
+#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
+#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
+#define APP_LOG(TS,VL,...)
+#else
+#error "APP_LOG_ENABLED not defined or out of range <0,1>"
+#endif /* APP_LOG_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
+  */
+void SystemApp_Init(void);
+
+/**
+  * @brief  callback to get the board 64 bits unique ID
+  * @param  id unique ID
+  */
+void GetUniqueId(uint8_t *id);
+
+/**
+  * @brief  callback to get the board 32 bits unique ID (LSB)
+  * @retval devAddr Device Address
+  */
+uint32_t GetDevAddr(void);
+
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
+void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_APP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
new file mode 100644
index 00000000..5a2931cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h
@@ -0,0 +1,99 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_conf.h
+  * @author  MCD Application Team
+  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_CONF_H__
+#define __SYS_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/**
+  * @brief CM0PLUS Verbose level for all trace logs
+  */
+#define VERBOSE_LEVEL               VLEVEL_M
+
+/**
+  * @brief Enable trace logs
+  */
+#define APP_LOG_ENABLED             1
+
+/**
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
+  */
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
+
+/**
+  * @brief Disable Low Power mode
+  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
+  */
+#define LOW_POWER_DISABLE           0
+
+/**
+  * @brief Enable unprivilege mode
+  * @note 1: execute the code in unprivileged mode, 0: execute the code fully in privileged mode
+  */
+#define SECURE_UNPRIVILEGE_ENABLE   1
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h
new file mode 100644
index 00000000..d0bfd820
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h
@@ -0,0 +1,126 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_services.h
+  * @brief   Maps sys_privileged_wrap functions on SVC and API to cortex services
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_PRIVILEGED_SERVICES_H__
+#define __SYS_PRIVILEGED_SERVICES_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_ISOLATE_SE_WITH_MPU
+/* Critical section functions group */
+#define SVC_DISABLE_ALL_NVIC_IRQS           0x10
+#define SVC_RESTORE_NVIC_IRQS               0x11
+#define SVC_DISABLE_ALL_EXCEPTIONS          0x12
+/* Native NVIC functions group */
+#define SVC_NVIC_ENABLE_IRQ                 0x10
+#define SVC_NVIC_GET_ENABLE_IRQ             0x11
+#define SVC_NVIC_DISABLE_IRQ                0x12
+#define SVC_NVIC_GET_PENDING_IRQ            0x13
+#define SVC_NVIC_SET_PENDING_IRQ            0x14
+#define SVC_NVIC_CLEAR_PENDING_IRQ          0x15
+#define SVC_NVIC_SET_PRIORITY               0x16
+#define SVC_NVIC_GET_PRIORITY               0x17
+#define SVC_NVIC_SYSTEM_RESET               0x18
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief This is the main SVC Handler of the CM0 application (the one from vector table).
+  * @param args SVC arguments
+  * @retval void
+  */
+void SVC_APP_Handler(uint32_t *args);
+
+/**
+  * @brief This functions triggers a CRITICAL_SECTION system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...);
+
+/**
+  * @brief This functions triggers a NVIC system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...);
+
+
+
+/**
+  * @brief Maps MSP on Privileged region and set up PSP to current stack pointer
+  * @param void
+  * @retval void
+  */
+void ThumbState_RemapMspAndSwitchToPspStack(void);
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void ThumbState_EnterUnprivilegedMode(void);
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t ThumbState_IsUnprivileged(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_PRIVILEGED_SERVICES_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h
new file mode 100644
index 00000000..d58fbba7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h
@@ -0,0 +1,109 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_wrap.h
+  * @brief   This file contains all the function prototypes for
+  *          the sys_privileged_wrap.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_PRIVILEGE_WRAP_H__
+#define __SYS_PRIVILEGE_WRAP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief If execution in unprivil mode, calls SVC and Disable All Nvic Irqs
+  * @param void
+  * @retval uint32_t nvic_iser_state
+  */
+uint32_t SYS_PRIVIL_EnterCriticalSection(void);
+
+/**
+  * @brief If execution in unprivil mode, calls SVC and restore NVIC ISER register
+  * @param uint32_t nvic_iser_state
+  * @retval void
+  */
+void SYS_PRIVIL_ExitCriticalSection(uint32_t nvic_iser_state);
+
+/**
+  * @brief disable all exceptions and after SVC keeps MODE Privileged! (stack goes back to PSP)
+  * @param  void
+  * @retval void
+  */
+void SYS_PRIVIL_DisableIrqsAndRemainPriv(void);
+
+/**
+  * @brief enable all exceptions and go to Unprivileged mode
+  * @param  void
+  * @retval void
+  */
+void SYS_PRIVIL_EnableIrqsAndGoUnpriv(void);
+
+
+/**
+  * @note All SYS_PRIVIL_NVIC_*** functions are a remapping such thatIf
+  *       if execution in unprivil mode  call SVC before __NVIC_***
+  */
+void SYS_PRIVIL_NVIC_EnableIRQ(IRQn_Type IRQn);
+uint32_t SYS_PRIVIL_NVIC_GetEnableIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_DisableIRQ(IRQn_Type IRQn);
+uint32_t SYS_PRIVIL_NVIC_GetPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SetPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_ClearPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
+uint32_t SYS_PRIVIL_NVIC_GetPriority(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SystemReset(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_PRIVILEGE_WRAP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h
new file mode 100644
index 00000000..3bbde030
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h
@@ -0,0 +1,174 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.h
+  * @author  MCD Application Team
+  * @brief  configuration of the timer_if.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_IF_H__
+#define __TIMER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+#include "stm32_systime.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Init RTC hardware
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_Init(void);
+
+/**
+  * @brief Set the alarm
+  * @note The alarm is set at timeout from timer Reference (TimerContext)
+  * @param timeout Duration of the Timer in ticks
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout);
+
+/**
+  * @brief Stop the Alarm
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void);
+
+/**
+  * @brief set timer Reference (TimerContext)
+  * @return  Timer Reference Value in  Ticks
+  */
+uint32_t TIMER_IF_SetTimerContext(void);
+
+/**
+  * @brief Get the RTC timer Reference
+  * @return Timer Value in  Ticks
+  */
+uint32_t TIMER_IF_GetTimerContext(void);
+
+/**
+  * @brief Get the timer elapsed time since timer Reference (TimerContext) was set
+  * @return RTC Elapsed time in ticks
+  */
+uint32_t TIMER_IF_GetTimerElapsedTime(void);
+
+/**
+  * @brief Get the timer value
+  * @return RTC Timer value in ticks
+  */
+uint32_t TIMER_IF_GetTimerValue(void);
+
+/**
+  * @brief Return the minimum timeout in ticks the RTC is able to handle
+  * @return minimum value for a timeout in ticks
+  */
+uint32_t TIMER_IF_GetMinimumTimeout(void);
+
+/**
+  * @brief a delay of delay ms by polling RTC
+  * @param delay in ms
+  */
+void TIMER_IF_DelayMs(uint32_t delay);
+
+/**
+  * @brief converts time in ms to time in ticks
+  * @param[in] timeMilliSec time in milliseconds
+  * @return time in timer ticks
+  */
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec);
+
+/**
+  * @brief converts time in ticks to time in ms
+  * @param[in] tick time in timer ticks
+  * @return time in timer milliseconds
+  */
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick);
+
+/**
+  * @brief Get rtc time
+  * @param[out] subSeconds in ticks
+  * @return time seconds
+  */
+uint32_t TIMER_IF_GetTime(uint16_t *subSeconds);
+
+/**
+  * @brief write seconds in backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @param[in] Seconds time in seconds
+  */
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds);
+
+/**
+  * @brief reads seconds from backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @return Time in seconds
+  */
+uint32_t TIMER_IF_BkUp_Read_Seconds(void);
+
+/**
+  * @brief writes SubSeconds in backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @param[in] SubSeconds time in SubSeconds
+  */
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds);
+
+/**
+  * @brief reads SubSeconds from backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @return Time in SubSeconds
+  */
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
new file mode 100644
index 00000000..1ccff983
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
@@ -0,0 +1,209 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for configuration file to utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_CONF_H__
+#define __UTILITIES_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "cmsis_compiler.h"
+
+/* definitions to be provided to "sequencer" utility */
+#include "stm32_mem.h"
+/* definition and callback for tiny_vsnprintf */
+#include "stm32_tiny_vsnprintf.h"
+
+#include "mbmuxif_trace.h"
+#include "sys_privileged_wrap.h"
+#include "stm32_seq.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*                             sequencer configuration                       */
+/*---------------------------------------------------------------------------*/
+/**
+  * @brief Sequencer flag reserved for future use
+  */
+#define UTIL_SEQ_RFU 0
+
+/**
+  * @brief default number of tasks configured in sequencer
+  */
+#define SEQ_CONF_TASK_NBR    4
+
+/**
+  * @brief default value of priority task
+  */
+#define SEQ_CONF_PRIO_NBR    1
+
+#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
+#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
+                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
+#define VLEVEL_L 1       /*!< just essential traces */
+#define VLEVEL_M 2       /*!< functional traces */
+#define VLEVEL_H 3       /*!< all traces */
+
+#define TS_OFF 0         /*!< Log without TimeStamp */
+#define TS_ON 1          /*!< Log with TimeStamp */
+
+#define T_REG_OFF  0     /*!< Log without bitmask */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Memory placement macro
+  */
+#if defined(__CC_ARM)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
+#elif defined(__ICCARM__)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#else  /* __GNUC__ */
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+
+/**
+  * @brief Memory alignment macro
+  */
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* WIN32 */
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro to Enter CS used specifically by UTIL_SEQ_Run before going to Idle
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION_IDLE( )   SYS_PRIVIL_DisableIrqsAndRemainPriv()
+
+/**
+  * @brief macro to Exit CS used specifically by UTIL_SEQ_Run exiting from Idle
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION_IDLE( )    SYS_PRIVIL_EnableIrqsAndGoUnpriv()
+
+/**
+  * @brief Security: Map UTIL_TIMER_IRQ on Sequencer Task (rather then Isr) such to run Unprivileged
+  */
+#define UTIL_TIMER_IRQ_MAP_INIT()     do{ UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_UtilTimer_Process), UTIL_SEQ_RFU, UTIL_TIMER_IRQ_Handler);} while(0)
+
+#define UTIL_TIMER_IRQ_MAP_PROCESS()  do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_UtilTimer_Process, CFG_SEQ_Prio_0); } while(0)
+
+/**
+  * @brief Memset utilities interface to application
+  */
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTILS_ENTER_CRITICAL_SECTION() uint32_t nvic_iser_state= SYS_PRIVIL_EnterCriticalSection()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTILS_EXIT_CRITICAL_SECTION()  SYS_PRIVIL_ExitCriticalSection(nvic_iser_state)
+/**
+  * @brief macro used to Enter critical section specifically for UTIL_LPM_EnterLowPower()
+  */
+#define UTIL_LPM_ENTER_CRITICAL_SECTION_ELP()
+/**
+  * @brief macro used to Exit critical section specifically for UTIL_LPM_EnterLowPower()
+  */
+#define UTIL_LPM_EXIT_CRITICAL_SECTION_ELP()
+
+/******************************************************************************
+  * trace\advanced
+  * the define option
+  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
+  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
+  *
+  ******************************************************************************/
+
+#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
+#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
+#define UTIL_ADV_TRACE_MEMLOCATION                 UTIL_MEM_PLACE_IN_SECTION("MB_MEM2")  /*!< memory placement for trace buffer */
+#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
+#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
+#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
+#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
+#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UTILITIES_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
new file mode 100644
index 00000000..b62aa15c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h
@@ -0,0 +1,142 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_def.h
+  * @author  MCD Application Team
+  * @brief   Definitions for modules requiring utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_DEF_H__
+#define __UTILITIES_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/******************************************************************************
+  * LOW POWER MANAGER
+  ******************************************************************************/
+/**
+  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+  * It lists a bit mapping of all user of the Low Power Manager
+  */
+typedef enum
+{
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
+  CFG_LPM_APPLI_Id,
+  CFG_LPM_UART_TX_Id,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/*---------------------------------------------------------------------------*/
+/*                             sequencer definitions                         */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * This is the list of priority required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Prio_0,
+  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
+
+  /* USER CODE END CFG_SEQ_Prio_Id_t */
+  CFG_SEQ_Prio_NBR,
+} CFG_SEQ_Prio_Id_t;
+
+/**
+  * This is the list of task id required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  /* CM0PLUS */
+  CFG_SEQ_Task_MbSystemCmdRcv,
+  CFG_SEQ_Task_MbTraceAckRcv,
+  CFG_SEQ_Task_MbLoRaCmdRcv,
+  CFG_SEQ_Task_MbRadioCmdRcv,
+  CFG_SEQ_Task_MbRadioNotifSnd,
+  CFG_SEQ_Task_MbKmsCmdRcv,
+  CFG_SEQ_Task_MbLmHandlerProcess,
+  CFG_SEQ_Task_RadioIrq_Process,
+  CFG_SEQ_Task_RadioRxTimeout_Process,
+  CFG_SEQ_Task_RadioTxTimeout_Process,
+  CFG_SEQ_Task_UtilTimer_Process,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t */
+  CFG_SEQ_Task_NBR
+} CFG_SEQ_Task_Id_t;
+
+/**
+  * This is a bit mapping over 32bits listing all events id supported in the application
+  */
+typedef enum
+{
+  /* CM0PLUS */
+  CFG_SEQ_Evt_MbSystemAckRcv,
+  CFG_SEQ_Evt_MbTraceAckRcv,
+  CFG_SEQ_Evt_MbLoraAckRcv,
+  CFG_SEQ_Evt_MbRadioAckRcv,
+  /* USER CODE BEGIN CFG_SEQ_IdleEvt_Id_t */
+
+  /* USER CODE END CFG_SEQ_IdleEvt_Id_t */
+  CFG_SEQ_Evt_NBR
+} CFG_SEQ_IdleEvt_Id_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UTILITIES_DEF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
new file mode 100644
index 00000000..1d49b00f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c
@@ -0,0 +1,94 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.c
+  * @brief   This file provides code for the configuration
+  *          of the IPCC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "ipcc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+IPCC_HandleTypeDef hipcc;
+
+/* IPCC init function */
+void MX_IPCC_Init(void)
+{
+
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
+  hipcc.Instance = IPCC;
+  if (HAL_IPCC_Init(&hipcc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
+
+}
+
+void HAL_IPCC_MspInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspInit 0 */
+
+  /* USER CODE END IPCC_MspInit 0 */
+    /* IPCC clock enable */
+    __HAL_RCC_IPCC_CLK_ENABLE();
+
+    /* IPCC interrupt Init */
+    HAL_NVIC_SetPriority(IPCC_C2_RX_C2_TX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C2_RX_C2_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspInit 1 */
+
+  /* USER CODE END IPCC_MspInit 1 */
+  }
+}
+
+void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspDeInit 0 */
+
+  /* USER CODE END IPCC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_IPCC_CLK_DISABLE();
+
+    /* IPCC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(IPCC_C2_RX_C2_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspDeInit 1 */
+
+  /* USER CODE END IPCC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
new file mode 100644
index 00000000..d8ea5d9a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c
@@ -0,0 +1,208 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.c
+  * @author  MCD Application Team
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+
+/*ipcc interface for M4*/
+#include "assert.h"
+#include "stddef.h"
+#include "ipcc_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static void (*IpccCommandRcv)(uint32_t channelIdx);
+
+static void (*IpccAcknowledgeRcv)(uint32_t channelIdx);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ confirmation of a received message by remote CPU
+  */
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ notification request by remote CPU
+  */
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx))
+{
+  /* USER CODE BEGIN IPCC_IF_Init_1 */
+
+  /* USER CODE END IPCC_IF_Init_1 */
+  /*Initialize the ipcc, initialize MSP*/
+  MX_IPCC_Init();
+
+  /* Enable C2AHB3 peripherals clock. */
+  LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC);
+  /* IPCC EXTI (AIEC) line for CPU2  */
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
+  LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
+
+  /* Initialize IPCC callback of all channels*/
+  for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
+  {
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
+  }
+
+  /* Registers upper level (application) callback */
+  IpccCommandRcv = IPCC_IF_CommandRcv_cb;
+  IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
+  return;
+  /* USER CODE BEGIN IPCC_IF_Init_2 */
+
+  /* USER CODE END IPCC_IF_Init_2 */
+}
+
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_1 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX);
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_2 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_2 */
+}
+
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_1 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX);
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_2 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_2 */
+}
+
+int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotificationSnd_1 */
+
+  /* USER CODE END IPCC_IF_NotificationSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_NotificationSnd_2 */
+
+  /* USER CODE END IPCC_IF_NotificationSnd_2 */
+}
+
+int32_t IPCC_IF_ResponseSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_ResponseSnd_1 */
+
+  /* USER CODE END IPCC_IF_ResponseSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_ResponseSnd_2 */
+
+  /* USER CODE END IPCC_IF_ResponseSnd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrTxCb_1 */
+
+  /* USER CODE END IpccIfIsrTxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccAcknowledgeRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrTxCb_2 */
+
+  /* USER CODE END IpccIfIsrTxCb_2 */
+}
+
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrRxCb_1 */
+
+  /* USER CODE END IpccIfIsrRxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccCommandRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrRxCb_2 */
+
+  /* USER CODE END IpccIfIsrRxCb_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
new file mode 100644
index 00000000..f6480afc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c
@@ -0,0 +1,152 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "app_lorawan.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* USER CODE BEGIN SysInit */
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_KMS_Init();
+  MX_LoRaWAN_Init();
+  /* USER CODE BEGIN 2 */
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE END WHILE */
+    MX_LoRaWAN_Process();
+
+    /* USER CODE BEGIN 3 */
+  }
+  /* USER CODE END 3 */
+}
+
+/* USER CODE BEGIN 4 */
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  while (1)
+  {
+  }
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+{
+  while (1)
+  {
+  }
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
new file mode 100644
index 00000000..ab828d03
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c
@@ -0,0 +1,147 @@
+/**
+  ******************************************************************************
+  * @file    rtc.c
+  * @brief   This file provides code for the configuration
+  *          of the RTC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "rtc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+RTC_HandleTypeDef hrtc;
+
+/* RTC init function */
+void MX_RTC_Init(void)
+{
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
+  RTC_AlarmTypeDef sAlarm = {0};
+
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
+  /** Initialize RTC Only
+  */
+  hrtc.Instance = RTC;
+  hrtc.Init.AsynchPrediv = RTC_PREDIV_A;
+  hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
+  hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE;
+  hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
+  hrtc.Init.OutPutPullUp = RTC_OUTPUT_PULLUP_NONE;
+  hrtc.Init.BinMode = RTC_BINARY_ONLY;
+  if (HAL_RTC_Init(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN Check_RTC_BKUP */
+
+  /* USER CODE END Check_RTC_BKUP */
+
+  /** Initialize RTC and set the Time and Date
+  */
+  if (HAL_RTCEx_SetSSRU_IT(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Enable the Alarm A
+  */
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = 0x0;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Enable the Alarm B
+  */
+  sAlarm.Alarm = RTC_ALARM_B;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
+
+}
+
+void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspInit 0 */
+
+  /* USER CODE END RTC_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+    PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* RTC clock enable */
+    __HAL_RCC_RTC_ENABLE();
+    __HAL_RCC_RTCAPB_CLK_ENABLE();
+
+    /* RTC interrupt Init */
+    HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
+  /* USER CODE BEGIN RTC_MspInit 1 */
+
+  /* USER CODE END RTC_MspInit 1 */
+  }
+}
+
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspDeInit 0 */
+
+  /* USER CODE END RTC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_RTC_DISABLE();
+    __HAL_RCC_RTCAPB_CLK_DISABLE();
+
+    /* RTC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(RTC_LSECSS_IRQn);
+  /* USER CODE BEGIN RTC_MspDeInit 1 */
+
+  /* USER CODE END RTC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
new file mode 100644
index 00000000..eb2e798d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -0,0 +1,164 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.c
+  * @author  MCD Application Team
+  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "stm32_lpm_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Power driver callbacks handler
+  */
+const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
+{
+  PWR_EnterSleepMode,
+  PWR_ExitSleepMode,
+
+  PWR_EnterStopMode,
+  PWR_ExitStopMode,
+
+  PWR_EnterOffMode,
+  PWR_ExitOffMode,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void PWR_EnterOffMode(void)
+{
+  /* USER CODE BEGIN EnterOffMode_1 */
+
+  /* USER CODE END EnterOffMode_1 */
+}
+
+void PWR_ExitOffMode(void)
+{
+  /* USER CODE BEGIN ExitOffMode_1 */
+
+  /* USER CODE END ExitOffMode_1 */
+}
+
+void PWR_EnterStopMode(void)
+{
+  /* USER CODE BEGIN EnterStopMode_1 */
+
+  /* USER CODE END EnterStopMode_1 */
+  HAL_SuspendTick();
+  /* Clear Status Flag before entering STOP/STANDBY Mode */
+  LL_PWR_ClearFlag_C2STOP_C2STB();
+
+  /* USER CODE BEGIN EnterStopMode_2 */
+
+  /* USER CODE END EnterStopMode_2 */
+  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
+  /* USER CODE BEGIN EnterStopMode_3 */
+
+  /* USER CODE END EnterStopMode_3 */
+}
+
+void PWR_ExitStopMode(void)
+{
+  /* USER CODE BEGIN ExitStopMode_1 */
+
+  /* USER CODE END ExitStopMode_1 */
+  /* Resume sysTick : work around for debugger problem in dual core */
+  HAL_ResumeTick();
+  /*Not retained periph:
+    ADC interface
+    DAC interface USARTx, TIMx, i2Cx, SPIx
+    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
+
+  /* USER CODE BEGIN ExitStopMode_2 */
+
+  /* USER CODE END ExitStopMode_2 */
+}
+
+void PWR_EnterSleepMode(void)
+{
+  /* USER CODE BEGIN EnterSleepMode_1 */
+
+  /* USER CODE END EnterSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_SuspendTick();
+  /* USER CODE BEGIN EnterSleepMode_2 */
+
+  /* USER CODE END EnterSleepMode_2 */
+  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+  /* USER CODE BEGIN EnterSleepMode_3 */
+
+  /* USER CODE END EnterSleepMode_3 */
+}
+
+void PWR_ExitSleepMode(void)
+{
+  /* USER CODE BEGIN ExitSleepMode_1 */
+
+  /* USER CODE END ExitSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_ResumeTick();
+
+  /* USER CODE BEGIN ExitSleepMode_2 */
+
+  /* USER CODE END ExitSleepMode_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..ea7dc033
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file         stm32wlxx_hal_msp.c
+  * @brief        This file provides code for the MSP Initialization
+  *               and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..1770f39f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,189 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+extern IPCC_HandleTypeDef hipcc;
+extern RTC_HandleTypeDef hrtc;
+extern SUBGHZ_HandleTypeDef hsubghz;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable Interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+  while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief  This function handles TZIC interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TZIC_ILA_IRQHandler(void)
+{
+  HAL_GTZC_IRQHandler();
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/**
+  * @brief This function handles RTC Wakeup + RTC Tamper and RTC TimeStamp + RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts.
+  */
+void RTC_LSECSS_IRQHandler(void)
+{
+  /* USER CODE BEGIN RTC_LSECSS_IRQn 0 */
+
+  /* USER CODE END RTC_LSECSS_IRQn 0 */
+  HAL_RTC_AlarmIRQHandler(&hrtc);
+  HAL_RTCEx_SSRUIRQHandler(&hrtc);
+  /* USER CODE BEGIN RTC_LSECSS_IRQn 1 */
+
+  /* USER CODE END RTC_LSECSS_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC RX Occupied and TX Free Interrupt.
+  */
+void IPCC_C2_RX_C2_TX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C2_RX_C2_TX_IRQn 0 */
+
+  /* USER CODE END IPCC_C2_RX_C2_TX_IRQn 0 */
+  HAL_IPCC_RX_IRQHandler(&hipcc);
+  HAL_IPCC_TX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C2_RX_C2_TX_IRQn 1 */
+
+  /* USER CODE END IPCC_C2_RX_C2_TX_IRQn 1 */
+}
+
+/**
+  * @brief This function handles SUBGHZ Radio Interrupt.
+  */
+void SUBGHZ_Radio_IRQHandler(void)
+{
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 0 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 0 */
+  HAL_SUBGHZ_IRQHandler(&hsubghz);
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 1 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
new file mode 100644
index 00000000..7b7dba4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c
@@ -0,0 +1,88 @@
+/**
+  ******************************************************************************
+  * @file    subghz.c
+  * @brief   This file provides code for the configuration
+  *          of the SUBGHZ instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "subghz.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+SUBGHZ_HandleTypeDef hsubghz;
+
+/* SUBGHZ init function */
+void MX_SUBGHZ_Init(void)
+{
+
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
+  hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
+  if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
+
+}
+
+void HAL_SUBGHZ_MspInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspInit 0 */
+
+  /* USER CODE END SUBGHZ_MspInit 0 */
+    /* SUBGHZ clock enable */
+    __HAL_RCC_SUBGHZSPI_CLK_ENABLE();
+
+    /* SUBGHZ interrupt Init */
+    HAL_NVIC_SetPriority(SUBGHZ_Radio_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspInit 1 */
+
+  /* USER CODE END SUBGHZ_MspInit 1 */
+}
+
+void HAL_SUBGHZ_MspDeInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 0 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_SUBGHZSPI_CLK_DISABLE();
+
+    /* SUBGHZ interrupt Deinit */
+    HAL_NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 1 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
new file mode 100644
index 00000000..2e5ea0c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c
@@ -0,0 +1,472 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.c
+  * @author  MCD Application Team
+  * @brief   Initializes HW and SW system entities (not related to the radio)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdio.h>
+#include "platform.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "stm32_systime.h"
+#include "stm32_lpm.h"
+#include "timer_if.h"
+#include "utilities_def.h"
+#include "sys_debug.h"
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+#include "sys_privileged_services.h"
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_radio.h"
+#include "features_info.h"
+#include "mbmuxif_lora.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MAX_TS_SIZE (int) 16
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static EXTI_HandleTypeDef Exti41;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
+  */
+static void System_Init(void);
+
+/**
+  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
+  */
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
+/**
+  * @brief  Init the Exti used for sync the two CPU after SBSFU download
+  */
+static void MX_EXTI_Init(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SystemApp_Init(void)
+{
+  int8_t init_status;
+  /* USER CODE BEGIN SystemApp_Init_1 */
+
+  /* USER CODE END SystemApp_Init_1 */
+
+  /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
+  UTIL_TIMER_Init();
+
+  /*Init low power manager*/
+  UTIL_LPM_Init();
+  /* Disable Stand-by mode */
+  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+
+#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
+  /* Disable Stop Mode */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+#elif !defined (LOW_POWER_DISABLE)
+#error LOW_POWER_DISABLE not defined
+#endif /* LOW_POWER_DISABLE */
+
+  /* Init the Exti used for sync the two CPU after SBSFU download */
+  MX_EXTI_Init();
+
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+  ThumbState_RemapMspAndSwitchToPspStack();
+  ThumbState_EnterUnprivilegedMode();
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+
+  /* Wait for CPU1 to be ready */
+  while (HAL_EXTI_GetPending(&Exti41, EXTI_TRIGGER_RISING_FALLING) != 0x01u)
+  {
+    /* Wait CPU1 Event */
+  }
+  /* Acknowledge CPU1 event */
+  HAL_EXTI_ClearPending(&Exti41, EXTI_TRIGGER_RISING_FALLING);
+
+  /* Init Feat_Info table */
+  FEAT_INFO_Init();
+
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
+  init_status = MBMUXIF_SystemInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+
+  System_Init();
+
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
+
+  /* USER CODE BEGIN SystemApp_Init_2 */
+
+  /* USER CODE END SystemApp_Init_2 */
+}
+
+void TimestampNow(uint8_t *buff, uint16_t *size)
+{
+  /* USER CODE BEGIN TimestampNow_1 */
+
+  /* USER CODE END TimestampNow_1 */
+  SysTime_t curtime = SysTimeGet();
+  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
+  *size = strlen((char *)buff);
+  /* USER CODE BEGIN TimestampNow_2 */
+
+  /* USER CODE END TimestampNow_2 */
+}
+
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Kms_Cmd_1 */
+
+  /* USER CODE END Process_Kms_Cmd_1 */
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
+  APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case KMS_CRYPTO_HMAC_SHA256_MSG_ID:
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Cmd rcv : KMS_CRYPTO_HMAC_SHA256_MSG_ID\r\n");
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Crypto aKey length %d\r\n", com_buffer[1]);
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Crypto aKey string %s\r\n", (char *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0;
+      ComObj->ReturnVal = (uint32_t) -5; /* dummy value for test */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_L, "<CM0PLUS(KMS)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_KMS_ID);
+
+  /* USER CODE BEGIN Process_Kms_Cmd_2 */
+
+  /* USER CODE END Process_Kms_Cmd_2 */
+}
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Sys_Cmd_1 */
+
+  /* USER CODE END Process_Sys_Cmd_1 */
+  APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(System)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case SYS_OTHER_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      break;
+
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+
+    /* USER CODE END Process_Sys_Cmd_switch_case */
+
+    default:
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+
+      /* USER CODE END Process_Sys_Cmd_switch_default */
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_M, "<CM0PLUS(System)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  /* USER CODE BEGIN Process_Sys_Cmd_2 */
+
+  /* USER CODE END Process_Sys_Cmd_2 */
+}
+
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
+{
+  /**
+    * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
+    * all to process all tack except TaskId_bm
+    */
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_1 */
+  UTIL_SEQ_Run(~TaskId_bm);
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_2 */
+  return;
+}
+
+/**
+  * @brief redefines __weak function in stm32_seq.c such to enter low power
+  */
+void UTIL_SEQ_Idle(void)
+{
+  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
+
+  /* USER CODE END UTIL_SEQ_Idle_1 */
+  UTIL_LPM_EnterLowPower();
+  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
+
+  /* USER CODE END UTIL_SEQ_Idle_2 */
+}
+
+void GetUniqueId(uint8_t *id)
+{
+  /* USER CODE BEGIN GetUniqueId_1 */
+
+  /* USER CODE END GetUniqueId_1 */
+  uint32_t val = 0;
+  val = LL_FLASH_GetUDN();
+  if (val == 0xFFFFFFFF)  /* Normally this should not happen */
+  {
+    uint32_t ID_1_3_val = HAL_GetUIDw0() + HAL_GetUIDw2();
+    uint32_t ID_2_val = HAL_GetUIDw1();
+
+    id[7] = (ID_1_3_val) >> 24;
+    id[6] = (ID_1_3_val) >> 16;
+    id[5] = (ID_1_3_val) >> 8;
+    id[4] = (ID_1_3_val);
+    id[3] = (ID_2_val) >> 24;
+    id[2] = (ID_2_val) >> 16;
+    id[1] = (ID_2_val) >> 8;
+    id[0] = (ID_2_val);
+  }
+  else  /* Typical use case */
+  {
+    id[7] = val & 0xFF;
+    id[6] = (val >> 8) & 0xFF;
+    id[5] = (val >> 16) & 0xFF;
+    id[4] = (val >> 24) & 0xFF;
+    val = LL_FLASH_GetDeviceID();
+    id[3] = val & 0xFF;
+    val = LL_FLASH_GetSTCompanyID();
+    id[2] = val & 0xFF;
+    id[1] = (val >> 8) & 0xFF;
+    id[0] = (val >> 16) & 0xFF;
+  }
+
+  /* USER CODE BEGIN GetUniqueId_2 */
+
+  /* USER CODE END GetUniqueId_2 */
+}
+
+uint32_t GetDevAddr(void)
+{
+  uint32_t val = 0;
+  /* USER CODE BEGIN GetDevAddr_1 */
+
+  /* USER CODE END GetDevAddr_1 */
+
+  val = LL_FLASH_GetUDN();
+  if (val == 0xFFFFFFFF)
+  {
+    val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
+  }
+
+  /* USER CODE BEGIN GetDevAddr_2 */
+
+  /* USER CODE END GetDevAddr_2 */
+  return val;
+
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void System_Init(void)
+{
+  /* USER CODE BEGIN System_Init_1 */
+
+  /* USER CODE END System_Init_1 */
+  /* No need of Enable Internal Wake-up line for CPU2 */
+  LL_C2_PWR_DisableInternWU();
+
+  /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
+  LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
+  LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
+
+  /* Enable Radio IRQ lines interrupt for CPU2 */
+  LL_C2_PWR_SetRadioIRQTrigger(LL_PWR_RADIO_IRQ_TRIGGER_WU_IT);
+  /* Enable Radio EXTI lines for CPU2 (Needed for low power STOP mode */
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_44);
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_45);
+
+  /* Ensure that MSI is wake-up system clock */
+  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
+  /* USER CODE BEGIN System_Init_Last */
+
+  /* USER CODE END System_Init_Last */
+}
+
+/* Disable StopMode when traces need to be printed */
+void UTIL_ADV_TRACE_PreSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
+}
+/* Re-enable StopMode when traces have been printed */
+void UTIL_ADV_TRACE_PostSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_2 */
+}
+
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
+{
+  /* USER CODE BEGIN tiny_snprintf_like_1 */
+
+  /* USER CODE END tiny_snprintf_like_1 */
+  va_list vaArgs;
+  va_start(vaArgs, strFormat);
+  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
+  va_end(vaArgs);
+  /* USER CODE BEGIN tiny_snprintf_like_2 */
+
+  /* USER CODE END tiny_snprintf_like_2 */
+}
+
+/**
+  * Enable EXTI controller
+  * Configure line 41
+  */
+static void MX_EXTI_Init(void)
+{
+  EXTI_ConfigTypeDef exit41config;
+
+  exit41config.Line = EXTI_LINE_41;
+  exit41config.Mode = EXTI_MODE_INTERRUPT;
+  exit41config.Trigger = EXTI_TRIGGER_RISING;
+  HAL_EXTI_SetConfigLine(&Exti41, &exit41config);
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/* HAL overload functions ---------------------------------------------------------*/
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
+{
+  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
+  /* USER CODE BEGIN HAL_InitTick_1 */
+
+  /* USER CODE END HAL_InitTick_1 */
+  return HAL_OK;
+  /* USER CODE BEGIN HAL_InitTick_2 */
+
+  /* USER CODE END HAL_InitTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+uint32_t HAL_GetTick(void)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_GetTick_1 */
+
+  /* USER CODE END HAL_GetTick_1 */
+  return TIMER_IF_GetTimerValue();
+  /* USER CODE BEGIN HAL_GetTick_2 */
+
+  /* USER CODE END HAL_GetTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+void HAL_Delay(__IO uint32_t Delay)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_Delay_1 */
+
+  /* USER CODE END HAL_Delay_1 */
+  TIMER_IF_DelayMs(Delay);
+  /* USER CODE BEGIN HAL_Delay_2 */
+
+  /* USER CODE END HAL_Delay_2 */
+}
+
+/* USER CODE BEGIN Overload_HAL_weaks */
+
+/* USER CODE END Overload_HAL_weaks */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c
new file mode 100644
index 00000000..c598f589
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c
@@ -0,0 +1,336 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_services.c
+  * @author  MCD Application Team
+  * @brief   gives access to COrtex services like ThumbState, SVC, MPU
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sys_privileged_services.h" /* shall be placed before se_interface_application.h */
+#include "se_interface_application.h"
+#include "stm32_seq.h"
+#include "subghz.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#elif defined(__CC_ARM)
+#include "mapping_fwimg.h"
+#include "mapping_sbsfu.h"
+#endif /* __ARMCC_VERSION */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void APP_NVIC_SVC_Handler(uint32_t *args);
+void APP_CRITICALSECTION_SVC_Handler(uint32_t *args);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+
+/**
+  * @brief This functions triggers a CRITICAL_SECTION system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+#if defined (__ICCARM__) || defined(__GNUC__)
+void SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+#if defined ( __GNUC__ )
+  /*
+    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
+    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
+    */
+  __ASM volatile("MOV r1, %0" : : "r"(syscall));
+#endif /* __GNUC__ */
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+    */
+  __ASM volatile("SVC #1");  /* 1 is the hard-coded value to indicate NVIC syscall */
+}
+#elif defined(__CC_ARM)
+/*
+  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
+  * caller is in same file. Defining the function as ASM avoids the issue.
+  */
+void __ASM SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+  /*
+   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+   * example an SVC.
+   * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+   */
+  SVC #1
+  BX LR
+}
+#endif /* (__ICCARM__) || defined(__GNUC__) */
+
+
+/**
+  * @brief This functions triggers a NVIC system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+#if defined (__ICCARM__) || defined(__GNUC__)
+void SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+#if defined ( __GNUC__ )
+  /*
+    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
+    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
+    */
+  __ASM volatile("MOV r1, %0" : : "r"(syscall));
+#endif /* __GNUC__ */
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+    */
+  __ASM volatile("SVC #2");   /* 2 is the hard-coded value to indicate NVIC syscall */
+}
+#elif defined(__CC_ARM)
+/*
+  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
+  * caller is in same file. Defining the function as ASM avoids the issue.
+  */
+void __ASM SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+  /*
+   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+   * example an SVC.
+   * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+   */
+  SVC #2
+  BX LR
+}
+#endif /* (__ICCARM__) || defined(__GNUC__) */
+
+/**
+  * @brief This is the SVC Handler of the CM0 application (the one from vector table).
+  * @param args SVC arguments
+  * @retval void
+  */
+void SVC_APP_Handler(uint32_t *args)
+{
+  /* in PSP (args) contains caller context as follow *
+    * args[0] :R0
+    * args[1] :R1
+    * args[2] :R2
+    * args[3] :R3
+    * args[4] :R12
+    * args[5] :LR
+    * args[6] :PC to return after exception
+    * args[7] :xPSR
+  */
+  uint8_t svc_index = ((char *)args[6])[-2];
+
+  switch (svc_index)
+  {
+    case 0x0: /* SE SVC CALL : called by SECoreBin*/
+    {
+      SE_APP_SVC_Handler(args);
+      break;
+    }
+    case 0x1:
+    {
+      APP_CRITICALSECTION_SVC_Handler(args);
+      break;
+    }
+    case 0x2:
+    {
+      APP_NVIC_SVC_Handler(args);
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+}
+
+/**
+  * @brief This is the handler that groups CRITICAL_SESSION functions via SVC calls.
+  * @param args SVC arguments
+  * @retval void
+  */
+void APP_CRITICALSECTION_SVC_Handler(uint32_t *args)
+{
+  uint32_t nvic_iser_state = 0;
+  uint32_t *pRet = (uint32_t *)(args[0]);
+
+  switch (args[1])
+  {
+    case SVC_DISABLE_ALL_NVIC_IRQS:
+    {
+      /*all __NVIC_GetEnableIRQ*/
+      nvic_iser_state = NVIC->ISER[0];
+      /* clear all positive interrupt e.g. no see IRQn_Type in core_cm0plus.h*/
+      NVIC->ICER[0] = nvic_iser_state;
+      break;
+    }
+    case SVC_RESTORE_NVIC_IRQS:
+    {
+      NVIC->ISER[0] = args[2] | NVIC->ISER[0];
+      break;
+    }
+    case SVC_DISABLE_ALL_EXCEPTIONS:
+    {
+      __disable_irq();
+      __set_CONTROL(__get_CONTROL() & 0xFFFE); /* bit 0 = 0: remain privileged   */
+      /* note: exiting the SVC will go back to PSP stack but remain priv mode */
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+  *pRet = nvic_iser_state;
+}
+
+/**
+  * @brief This is the handler that groups NVIC functions via SVC calls.
+  * @param args SVC arguments
+  * @retval void
+  */
+void APP_NVIC_SVC_Handler(uint32_t *args)
+{
+  uint32_t ret = 0;
+  uint32_t *pRet = (uint32_t *)(args[0]);
+
+  switch (args[1])
+  {
+    case SVC_NVIC_ENABLE_IRQ:
+    {
+      __NVIC_EnableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_GET_ENABLE_IRQ:
+    {
+      ret = __NVIC_GetEnableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_DISABLE_IRQ:
+    {
+      __NVIC_DisableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_GET_PENDING_IRQ:
+    {
+      ret = __NVIC_GetPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SET_PENDING_IRQ:
+    {
+      __NVIC_SetPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_CLEAR_PENDING_IRQ:
+    {
+      __NVIC_ClearPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SET_PRIORITY:
+    {
+      __NVIC_SetPriority((IRQn_Type) args[2], args[3]);
+      break;
+    }
+    case SVC_NVIC_GET_PRIORITY:
+    {
+      ret = __NVIC_GetPriority((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SYSTEM_RESET:
+    {
+      __NVIC_SystemReset();
+      break;
+    }
+    default:
+    {
+      HAL_NVIC_SystemReset();
+      break;
+    }
+  }
+  *pRet = ret;
+}
+
+
+/**
+  * @brief Maps MSP on Privileged region and set up PSP to current stack pointer
+  * @param void
+  * @retval void
+  */
+void ThumbState_RemapMspAndSwitchToPspStack(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change Main Stack to point on privileged stack */
+  __ISB();
+}
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void ThumbState_EnterUnprivilegedMode(void)
+{
+  __set_CONTROL(__get_CONTROL() | 3); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t ThumbState_IsUnprivileged(void)
+{
+  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c
new file mode 100644
index 00000000..c1dcf9be
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c
@@ -0,0 +1,255 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_privileged_wrap.c
+  * @author  MCD Application Team
+  * @brief   Wrapper functions to call SVC when in Unprivilege mode
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sys_privileged_wrap.h"
+#include "sys_privileged_services.h"
+#include "stm32_seq.h"
+#include "subghz.h"
+#include "sys_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+uint32_t SYS_PRIVIL_EnterCriticalSection(void)
+{
+  uint32_t nvic_iser_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* disable NVIC irqs, then back to PSP and Unpriv */
+    SYS_CRITICALSECTION_SvcCall(&nvic_iser_state, SVC_DISABLE_ALL_NVIC_IRQS);
+  }
+  else
+  {
+    nvic_iser_state = NVIC->ISER[0];
+    NVIC->ICER[0] = nvic_iser_state;
+  }
+  return nvic_iser_state;
+}
+
+void SYS_PRIVIL_ExitCriticalSection(uint32_t nvic_iser_state)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* enable NVIC irqs, then back to PSP and Unpriv */
+    uint32_t dummy_ret = 0;
+    SYS_CRITICALSECTION_SvcCall(&dummy_ret, SVC_RESTORE_NVIC_IRQS, nvic_iser_state);
+  }
+  else
+  {
+    NVIC->ISER[0] = nvic_iser_state | NVIC->ISER[0];
+  }
+}
+
+void SYS_PRIVIL_DisableIrqsAndRemainPriv(void)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* disable exceptions and after SVC keeps MODE Privileged! (stack goes back to PSP)*/
+    uint32_t dummy_ret = 0;
+    SYS_CRITICALSECTION_SvcCall(&dummy_ret, SVC_DISABLE_ALL_EXCEPTIONS);
+  }
+  else
+  {
+    __disable_irq();
+  }
+}
+
+void SYS_PRIVIL_EnableIrqsAndGoUnpriv(void)
+{
+  __enable_irq();
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+  ThumbState_EnterUnprivilegedMode(); /* Goes always Unpriv */
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+}
+
+void SYS_PRIVIL_NVIC_EnableIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_ENABLE_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_EnableIRQ(IRQn);
+  }
+}
+
+
+uint32_t SYS_PRIVIL_NVIC_GetEnableIRQ(IRQn_Type IRQn)
+{
+  uint32_t irqn_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_state, SVC_NVIC_GET_ENABLE_IRQ, IRQn);
+  }
+  else
+  {
+    irqn_state = __NVIC_GetEnableIRQ(IRQn);
+  }
+  return irqn_state;
+}
+
+
+void SYS_PRIVIL_NVIC_DisableIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_DISABLE_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_DisableIRQ(IRQn);
+  }
+}
+
+uint32_t SYS_PRIVIL_NVIC_GetPendingIRQ(IRQn_Type IRQn)
+{
+  uint32_t irqn_pending_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_pending_state, SVC_NVIC_GET_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    irqn_pending_state = __NVIC_GetPendingIRQ(IRQn);
+  }
+  return irqn_pending_state;
+}
+
+void SYS_PRIVIL_NVIC_SetPendingIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SET_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_SetPendingIRQ(IRQn);
+  }
+}
+
+void SYS_PRIVIL_NVIC_ClearPendingIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_CLEAR_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_ClearPendingIRQ(IRQn);
+  }
+}
+
+void SYS_PRIVIL_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SET_PRIORITY, IRQn, priority);
+  }
+  else
+  {
+    __NVIC_SetPriority(IRQn, priority);
+  }
+}
+
+uint32_t SYS_PRIVIL_NVIC_GetPriority(IRQn_Type IRQn)
+{
+  uint32_t irqn_prio;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_prio, SVC_NVIC_GET_PRIORITY, IRQn);
+  }
+  else
+  {
+    irqn_prio = __NVIC_GetPriority(IRQn);
+  }
+  return irqn_prio;
+}
+
+void SYS_PRIVIL_NVIC_SystemReset(void)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SYSTEM_RESET);
+  }
+  else
+  {
+    __NVIC_SystemReset();
+  }
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
new file mode 100644
index 00000000..6405002c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c
@@ -0,0 +1,545 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.c
+  * @author  MCD Application Team
+  * @brief   Configure RTC Alarm, Tick and Calendar manager
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
+#include "stm32_lpm.h"
+#include "utilities_def.h"
+#include "stm32wlxx_ll_rtc.h"
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief RTC handle
+  */
+extern RTC_HandleTypeDef hrtc;
+
+/**
+  * @brief Timer driver callbacks handler
+  */
+const UTIL_TIMER_Driver_s UTIL_TimerDriver =
+{
+  TIMER_IF_Init,
+  NULL,
+
+  TIMER_IF_StartTimer,
+  TIMER_IF_StopTimer,
+
+  TIMER_IF_SetTimerContext,
+  TIMER_IF_GetTimerContext,
+
+  TIMER_IF_GetTimerElapsedTime,
+  TIMER_IF_GetTimerValue,
+  TIMER_IF_GetMinimumTimeout,
+
+  TIMER_IF_Convert_ms2Tick,
+  TIMER_IF_Convert_Tick2ms,
+};
+
+/**
+  * @brief SysTime driver callbacks handler
+  */
+const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
+{
+  TIMER_IF_BkUp_Write_Seconds,
+  TIMER_IF_BkUp_Read_Seconds,
+  TIMER_IF_BkUp_Write_SubSeconds,
+  TIMER_IF_BkUp_Read_SubSeconds,
+  TIMER_IF_GetTime,
+};
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Minimum timeout delay of Alarm in ticks
+  */
+#define MIN_ALARM_DELAY    3
+
+/**
+  * @brief Backup seconds register
+  */
+#define RTC_BKP_SECONDS    RTC_BKP_DR0
+
+/**
+  * @brief Backup subseconds register
+  */
+#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
+
+/**
+  * @brief Backup msbticks register
+  */
+#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
+
+/* #define RTIF_DEBUG */
+
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifdef RTIF_DEBUG
+#include "sys_app.h" /*for app_log*/
+/**
+  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
+  */
+#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+#else
+/**
+  * @brief not used
+  */
+#define TIMER_IF_DBG_PRINTF(...)
+#endif /* RTIF_DEBUG */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Indicates if the RTC is already Initialized or not
+  */
+static bool RTC_Initialized = false;
+
+/**
+  * @brief RtcTimerContext
+  */
+static uint32_t RtcTimerContext = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Get rtc timer Value in rtc tick
+  * @return val the rtc timer value (upcounting)
+  */
+static inline uint32_t GetTimerTicks(void);
+
+/**
+  * @brief Writes MSBticks to backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @param[in] MSBticks
+  */
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
+
+/**
+  * @brief Reads MSBticks from backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @retval MSBticks
+  */
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+UTIL_TIMER_Status_t TIMER_IF_Init(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_Init */
+
+  /* USER CODE END TIMER_IF_Init */
+  if (RTC_Initialized == false)
+  {
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+    /*Init RTC*/
+    MX_RTC_Init();
+    /*Stop Timer */
+    TIMER_IF_StopTimer();
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
+    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
+    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
+    /*overload RTC feature enable*/
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+
+    /*Enable Direct Read of the calendar registers (not through Shadow) */
+    HAL_RTCEx_EnableBypassShadow(&hrtc);
+    /*Initialize MSB ticks*/
+    TIMER_IF_BkUp_Write_MSBticks(0);
+
+    TIMER_IF_SetTimerContext();
+
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
+    RTC_Initialized = true;
+  }
+
+  /* USER CODE BEGIN TIMER_IF_Init_Last */
+
+  /* USER CODE END TIMER_IF_Init_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StartTimer */
+
+  /* USER CODE END TIMER_IF_StartTimer */
+  RTC_AlarmTypeDef sAlarm = {0};
+  /*Stop timer if one is already started*/
+  TIMER_IF_StopTimer();
+  timeout += RtcTimerContext;
+
+  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
+  /* starts timer*/
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_B;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
+
+  /* USER CODE END TIMER_IF_StartTimer_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StopTimer */
+
+  /* USER CODE END TIMER_IF_StopTimer */
+  /* Clear RTC Alarm Flag */
+  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRBF);
+  /* Disable the Alarm A interrupt */
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B);
+  /*overload RTC feature enable*/
+  hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
+
+  /* USER CODE END TIMER_IF_StopTimer_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_SetTimerContext(void)
+{
+  /*store time context*/
+  RtcTimerContext = GetTimerTicks();
+
+  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
+
+  /* USER CODE END TIMER_IF_SetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerContext(void)
+{
+  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
+
+  /* USER CODE END TIMER_IF_GetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerElapsedTime(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetTimerValue(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
+
+  /* USER CODE END TIMER_IF_GetTimerValue */
+  if (RTC_Initialized == true)
+  {
+    ret = GetTimerTicks();
+  }
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetMinimumTimeout(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick */
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
+}
+
+void TIMER_IF_DelayMs(uint32_t delay)
+{
+  /* USER CODE BEGIN TIMER_IF_DelayMs */
+
+  /* USER CODE END TIMER_IF_DelayMs */
+  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
+  uint32_t timeout = GetTimerTicks();
+
+  /* Wait delay ms */
+  while (((GetTimerTicks() - timeout)) < delayTicks)
+  {
+    __NOP();
+  }
+  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
+
+  /* USER CODE END TIMER_IF_DelayMs_Last */
+}
+
+void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
+  {
+    /*Alarm A reserved for CM4: notify CM4 that Alarm A was raised */
+    com_obj = MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+    if (com_obj != NULL)
+    {
+      com_obj->MsgId = SYS_RTC_ALARM_MSG_ID;
+      com_obj->ParamCnt = 0;
+      MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+    }
+  }
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
+}
+
+void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
+
+  /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
+  UTIL_TIMER_IRQ_MAP_PROCESS();
+  /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
+
+  /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
+}
+
+void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback */
+  /*called every 48 days with 1024 ticks per seconds*/
+  TIMER_IF_DBG_PRINTF(">>Handler SSRUnderflow at %d\n\r", GetTimerTicks());
+  /*Increment MSBticks*/
+  uint32_t MSB_ticks = TIMER_IF_BkUp_Read_MSBticks();
+  TIMER_IF_BkUp_Write_MSBticks(MSB_ticks + 1);
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback_Last */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback_Last */
+}
+
+uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
+{
+  uint32_t seconds = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTime */
+
+  /* USER CODE END TIMER_IF_GetTime */
+  uint64_t ticks;
+  uint32_t timerValueLsb = GetTimerTicks();
+  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
+
+  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
+
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+
+  ticks = (uint32_t) ticks & RTC_PREDIV_S;
+
+  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
+
+  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
+}
+
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
+}
+
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
+}
+
+uint32_t TIMER_IF_BkUp_Read_Seconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_MSBTICKS, MSBticks);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks_Last */
+}
+
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
+  uint32_t MSBticks;
+  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
+  return MSBticks;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
+}
+
+static inline uint32_t GetTimerTicks(void)
+{
+  /* USER CODE BEGIN GetTimerTicks */
+
+  /* USER CODE END GetTimerTicks */
+  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
+  /* USER CODE BEGIN GetTimerTicks_Last */
+
+  /* USER CODE END GetTimerTicks_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c
new file mode 100644
index 00000000..b2d71dce
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c
@@ -0,0 +1,62 @@
+/* USER CODE BEGIN Header */
+/**
+ ******************************************************************************
+  * File Name          : app_kms.c
+  * Description        : This file provides code for the configuration
+  *                      of the kms instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_kms.h"
+#include "tkms.h"
+
+/* USER CODE BEGIN 0 */
+/* USER CODE END 0 */
+
+/* USER CODE BEGIN 1 */
+/* USER CODE END 1 */
+
+/* Global variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN 2 */
+/* USER CODE END 2 */
+
+/* KMS init function */
+void MX_KMS_Init(void)
+{
+/***************************************/
+   /**
+  */
+
+  C_Initialize(NULL);
+
+  /* USER CODE BEGIN 3 */
+  /* USER CODE END 3 */
+
+}
+
+/* USER CODE BEGIN 4 */
+/* USER CODE END 4 */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h
new file mode 100644
index 00000000..8ca7171b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h
@@ -0,0 +1,57 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * File Name          : app_kms.h
+  * Description        : This file provides code for the configuration
+  *                      of the kms instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __app_kms_H
+#define __app_kms_H
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN 0 */
+/* USER CODE END 0 */
+
+/* Global variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN 1 */
+/* USER CODE END 1 */
+
+/* KMS init function */
+void MX_KMS_Init(void);
+
+/* USER CODE BEGIN 2 */
+/* USER CODE END 2 */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*__kms_H */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
new file mode 100644
index 00000000..f827d8ed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h
@@ -0,0 +1,82 @@
+/*!
+ * \file      Commissioning.h
+ *
+ * \brief     End-device commissioning parameters
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2013-2020 Semtech
+ *
+ * \endcode
+ */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    Commissioning.h
+  * @author  MCD Application Team
+  * @brief   End-device commissioning parameters
+  ******************************************************************************
+ */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __COMMISSIONING_H__
+#define __COMMISSIONING_H__
+
+/*!
+ ******************************************************************************
+ ********************************** WARNING ***********************************
+ ******************************************************************************
+
+ The LoRaWAN AES128 keys are stored and provisioned on secure-elements.
+
+ This project provides a software emulated secure-element.
+ The LoRaWAN AES128 keys SHALL be updated under
+ src/peripherals/<secure-element name>-se\se-identity.h file.
+
+ ******************************************************************************
+ ******************************************************************************
+ ******************************************************************************
+ */
+#include "se-identity.h"
+
+/* USER CODE BEGIN EC1 */
+
+/* USER CODE END EC1 */
+
+/*!
+ * When using ABP activation the MAC layer must know in advance to which server
+ * version it will be connected.
+ */
+#define ABP_ACTIVATION_LRWAN_VERSION_V10x                  0x01000300 /* 1.0.3.0 */
+
+#define ABP_ACTIVATION_LRWAN_VERSION                       ABP_ACTIVATION_LRWAN_VERSION_V10x
+
+/*!
+ * Indicates if the end-device support the operation with repeaters
+ */
+#define LORAWAN_REPEATER_SUPPORT                           false
+
+/*!
+ * Indicates if the end-device is to be connected to a private or public network
+ */
+#define LORAWAN_PUBLIC_NETWORK                             true
+
+/*!
+ * Current network ID
+ */
+#define LORAWAN_NETWORK_ID                                 ( uint32_t )0
+
+/* USER CODE BEGIN EC2 */
+
+/* USER CODE END EC2 */
+
+#endif /* __COMMISSIONING_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
new file mode 100644
index 00000000..bcd8821e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c
@@ -0,0 +1,96 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_lorawan.h"
+#include "lora_app.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void MX_LoRaWAN_Init(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Init_1 */
+
+  /* USER CODE END MX_LoRaWAN_Init_1 */
+  SystemApp_Init();
+  /* USER CODE BEGIN MX_LoRaWAN_Init_2 */
+
+  /* USER CODE END MX_LoRaWAN_Init_2 */
+}
+
+void MX_LoRaWAN_Process(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Process_1 */
+
+  /* USER CODE END MX_LoRaWAN_Process_1 */
+  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
+  /* USER CODE BEGIN MX_LoRaWAN_Process_2 */
+
+  /* USER CODE END MX_LoRaWAN_Process_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
new file mode 100644
index 00000000..fbe16b6d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h
@@ -0,0 +1,76 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_LORAWAN_H__
+#define __APP_LORAWAN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported Functions Prototypes------------------------------------------------------- */
+/**
+  * @brief  Init Lora Application
+  */
+void MX_LoRaWAN_Init(void);
+
+/**
+  * @brief  Entry Lora Process or scheduling
+  */
+void MX_LoRaWAN_Process(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_LORAWAN_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
new file mode 100644
index 00000000..2c3ddcdf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c
@@ -0,0 +1,90 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sys_app.h"
+#include "lora_app.h"
+#include "stm32_seq.h"
+#include "utilities_def.h"
+#include "LmHandler.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Exported functions ---------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void InitPackageProcess(void)
+{
+  /* USER CODE BEGIN InitPackageProcess_1 */
+
+  /* USER CODE END InitPackageProcess_1 */
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLmHandlerProcess), UTIL_SEQ_RFU, LmHandlerProcess);
+  /* USER CODE BEGIN InitPackageProcess_2 */
+
+  /* USER CODE END InitPackageProcess_2 */
+}
+
+void OnMacProcessNotify(void)
+{
+  /* USER CODE BEGIN OnMacProcessNotify_1 */
+
+  /* USER CODE END OnMacProcessNotify_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLmHandlerProcess), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN OnMacProcessNotify_2 */
+
+  /* USER CODE END OnMacProcessNotify_2 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
new file mode 100644
index 00000000..8bf1f9f1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h
@@ -0,0 +1,66 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORA_APP_H__
+#define __LORA_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+void InitPackageProcess(void);
+
+void OnMacProcessNotify(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LORA_APP_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
new file mode 100644
index 00000000..dc745797
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h
@@ -0,0 +1,90 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app_version.h
+  * @author  MCD Application Team
+  * @brief   Definition the version of the CM0PLUS application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_VERSION_H__
+#define __APP_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
+#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
+
+#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
+#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
+#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
+#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Application version
+  */
+#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
+                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
+                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
+                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
+
+/**
+  * @brief LoRaWAN CM0PLUS application version
+  */
+#define __CM0_APP_VERSION             __APP_VERSION
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_VERSION_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
new file mode 100644
index 00000000..9b628efe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h
@@ -0,0 +1,398 @@
+/*!
+ * \file      se-identity.h
+ *
+ * \brief     Secure Element identity and keys
+ *
+ * \copyright Revised BSD License, see section \ref LICENSE.
+ *
+ * \code
+ *                ______                              _
+ *               / _____)             _              | |
+ *              ( (____  _____ ____ _| |_ _____  ____| |__
+ *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+ *               _____) ) ____| | | || |_| ____( (___| | | |
+ *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+ *              (C)2020 Semtech
+ *
+ *               ___ _____ _   ___ _  _____ ___  ___  ___ ___
+ *              / __|_   _/_\ / __| |/ / __/ _ \| _ \/ __| __|
+ *              \__ \ | |/ _ \ (__| ' <| _| (_) |   / (__| _|
+ *              |___/ |_/_/ \_\___|_|\_\_| \___/|_|_\\___|___|
+ *              embedded.connectivity.solutions===============
+ *
+ * \endcode
+ *
+ */
+/**
+  ******************************************************************************
+  *
+  *          Portions COPYRIGHT 2020 STMicroelectronics
+  *
+  * @file    se-identity.h
+  * @author  MCD Application Team
+  * @brief   Secure Element identity and keys
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SOFT_SE_IDENTITY_H__
+#define __SOFT_SE_IDENTITY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported Includes --------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/*!
+ ******************************************************************************
+ ********************************** WARNING ***********************************
+ ******************************************************************************
+  The secure-element implementation supports both 1.0.x and 1.1.x LoRaWAN
+  versions of the specification.
+  Thus it has been decided to use the 1.1.x keys and EUI name definitions.
+  The below table shows the names equivalence between versions:
+               +---------------------+-------------------------+
+               |       1.0.x         |          1.1.x          |
+               +=====================+=========================+
+               | LORAWAN_DEVICE_EUI  | LORAWAN_DEVICE_EUI      |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_EUI     | LORAWAN_JOIN_EUI        |
+               +---------------------+-------------------------+
+               | LORAWAN_GEN_APP_KEY | LORAWAN_APP_KEY         |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_KEY     | LORAWAN_NWK_KEY         |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_F_NWK_S_INT_KEY |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_S_NWK_S_INT_KEY |
+               +---------------------+-------------------------+
+               | LORAWAN_NWK_S_KEY   | LORAWAN_NWK_S_ENC_KEY   |
+               +---------------------+-------------------------+
+               | LORAWAN_APP_S_KEY   | LORAWAN_APP_S_KEY       |
+               +---------------------+-------------------------+
+ ******************************************************************************
+ ******************************************************************************
+ ******************************************************************************
+ */
+
+/*!
+ * When set to 1 DevEui is LORAWAN_DEVICE_EUI
+ * When set to 0 DevEui is automatically set with a value provided by MCU platform
+ */
+#define STATIC_DEVICE_EUI                                  0
+
+/*!
+ * end-device IEEE EUI (big endian)
+ */
+#define LORAWAN_DEVICE_EUI                                 { 0x00, 0x80, 0xE1, 0x01, 0x01, 0x01, 0x01, 0x01 }
+
+/*!
+ * App/Join server IEEE EUI (big endian)
+ */
+#define LORAWAN_JOIN_EUI                                   { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }
+
+/*!
+ * When set to 1 DevAddr is LORAWAN_DEVICE_ADDRESS
+ * When set to 0 DevAddr is automatically set with a value provided by a pseudo
+ *      random generator seeded with a value provided by the MCU platform
+ */
+#define STATIC_DEVICE_ADDRESS                              0
+
+/*!
+ * Device address on the network (big endian)
+ */
+#define LORAWAN_DEVICE_ADDRESS                             ( uint32_t )0x0100000A
+
+/*!
+ * Application root key
+ */
+#define LORAWAN_APP_KEY                                    2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Network root key
+ */
+#define LORAWAN_NWK_KEY                                    2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Forwarding Network session key
+ */
+#define LORAWAN_NWK_S_KEY                                  2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Application session key
+ */
+#define LORAWAN_APP_S_KEY                                  2B,7E,15,16,28,AE,D2,A6,AB,F7,15,88,09,CF,4F,3C
+
+/*!
+ * Format commissioning keys
+ */
+#define RAW_TO_INT8A(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) {0x##a,0x##b,0x##c,0x##d,\
+                                                        0x##e,0x##f,0x##g,0x##h,\
+                                                        0x##i,0x##j,0x##k,0x##l,\
+                                                        0x##m,0x##n,0x##o,0x##p}
+
+#define FORMAT_KEY(...) RAW_TO_INT8A(__VA_ARGS__)
+
+#if (USE_LRWAN_1_1_X_CRYPTO == 1)
+#define SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Join session integrity key (Dynamically updated)                                                     \
+             * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
+             */                                                                                                     \
+            .KeyID    = J_S_INT_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Join session encryption key (Dynamically updated)                                                    \
+             * WARNING: NOT USED FOR 1.0.x DEVICES                                                                  \
+             */                                                                                                     \
+            .KeyID    = J_S_ENC_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Forwarding Network session integrity key                                                             \
+             * WARNING: NWK_S_KEY FOR 1.0.x DEVICES                                                                 \
+             */                                                                                                     \
+            .KeyID    = F_NWK_S_INT_KEY,                                                                            \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_S_KEY),                                                              \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Serving Network session integrity key                                                                \
+             * WARNING: NOT USED FOR 1.0.x DEVICES. MUST BE THE SAME AS \ref LORAWAN_F_NWK_S_INT_KEY                \
+             */                                                                                                     \
+            .KeyID    = S_NWK_S_INT_KEY,                                                                            \
+            .KeyValue = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, \
+                          0x3C },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network session encryption key                                                                       \
+             * WARNING: NOT USED FOR 1.0.x DEVICES. MUST BE THE SAME AS \ref LORAWAN_F_NWK_S_INT_KEY                \
+             */                                                                                                     \
+            .KeyID    = NWK_S_ENC_KEY,                                                                              \
+            .KeyValue = { 0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, \
+                          0x3C },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application session key                                                                              \
+             */                                                                                                     \
+            .KeyID    = APP_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_S_KEY),                                                              \
+        },
+#else /* USE_LRWAN_1_1_X_CRYPTO == 0 */
+#define SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network session key                                                                                  \
+             */                                                                                                     \
+            .KeyID    = NWK_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_S_KEY),                                                              \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application session key                                                                              \
+             */                                                                                                     \
+            .KeyID    = APP_S_KEY,                                                                                  \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_S_KEY),                                                              \
+        },
+#endif /* USE_LRWAN_1_1_X_CRYPTO */
+
+#if (LORAMAC_MAX_MC_CTX == 1)
+#define SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_0,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },
+#else /* LORAMAC_MAX_MC_CTX > 1 */
+#define SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_0,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #0 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_0,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_1,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_1,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #1 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_1,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_2,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_2,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #2 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_2,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 root key (Dynamically updated)                                                    \
+             */                                                                                                     \
+            .KeyID    = MC_KEY_3,                                                                                   \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 application session key (Dynamically updated)                                     \
+             */                                                                                                     \
+            .KeyID    = MC_APP_S_KEY_3,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast group #3 network session key (Dynamically updated)                                         \
+             */                                                                                                     \
+            .KeyID    = MC_NWK_S_KEY_3,                                                                             \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },
+#endif /* LORAMAC_MAX_MC_CTX */
+
+#define SOFT_SE_KEY_LIST                                                                                            \
+    {                                                                                                               \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Application root key                                                                                 \
+             * WARNING: FOR 1.0.x DEVICES IT IS THE \ref LORAWAN_GEN_APP_KEY                                        \
+             */                                                                                                     \
+            .KeyID    = APP_KEY,                                                                                    \
+            .KeyValue = FORMAT_KEY(LORAWAN_APP_KEY),                                                                \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Network root key                                                                                     \
+             * WARNING: FOR 1.0.x DEVICES IT IS THE \ref LORAWAN_APP_KEY                                            \
+             */                                                                                                     \
+            .KeyID    = NWK_KEY,                                                                                    \
+            .KeyValue = FORMAT_KEY(LORAWAN_NWK_KEY),                                                                \
+        },                                                                                                          \
+        SESSION_KEYS_LIST                                                                                           \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast root key (Dynamically updated)                                                             \
+             */                                                                                                     \
+            .KeyID    = MC_ROOT_KEY,                                                                                \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * Multicast key encryption key (Dynamically updated)                                                   \
+             */                                                                                                     \
+            .KeyID    = MC_KE_KEY,                                                                                  \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+        SESSION_MC_KEYS_LIST                                                                                        \
+        {                                                                                                           \
+            /*!                                                                                                     \
+             * All zeros key. (ClassB usage)(constant)                                                              \
+             */                                                                                                     \
+            .KeyID    = SLOT_RAND_ZERO_KEY,                                                                         \
+            .KeyValue = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                          0x00 },                                                                                   \
+        },                                                                                                          \
+    }
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /*  __SOFT_SE_IDENTITY_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
new file mode 100644
index 00000000..b2430e65
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h
@@ -0,0 +1,148 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lorawan_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for LoRaWAN middleware instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORAWAN_CONF_H__
+#define __LORAWAN_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* To enable the KMS Middleware with LoRaWAN, you must update these files from the DualCore example project:
+   - CM0PLUS/Core/Inc/kms_platf_objects_config.h : Add all LoRaWAN keys as kms_object_keyhead_32_t structures.
+   - CM0PLUS/Core/Inc/kms_platf_objects_interface.h : Add all LoRaWAN key indexes
+   - CM0PLUS/Core/Inc/nvms_low_level.h : Enable the NVMS (Non Volatile Memory) to store the session keys
+   - CM0PLUS/Core/Src/nvms_low_level.c : Implement the Flash read/write functions to manage the NVMS items
+   And finally, change the LORAWAN_KMS define to 1
+*/
+/* USER CODE BEGIN LORAWAN_KMS */
+#define LORAWAN_KMS 1
+/* USER CODE END LORAWAN_KMS */
+
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+#else /* LORAWAN_KMS == 1 */
+#define OVER_THE_AIR_ACTIVATION 1
+#define ACTIVATION_BY_PERSONALIZATION 1
+#endif /* LORAWAN_KMS */
+
+/* Region ------------------------------------*/
+/* the region listed here will be linked in the CM0 MW code */
+/* the application (on CM4/sys_conf.h) shall just configure one region at the time */
+/*#define REGION_AS923*/
+/*#define REGION_AU915*/
+/*#define REGION_CN470*/
+/*#define REGION_CN779*/
+/*#define REGION_EU433*/
+#define REGION_EU868
+/*#define REGION_KR920*/
+/*#define REGION_IN865*/
+/*#define REGION_US915*/
+/*#define REGION_RU864*/
+
+/**
+  * \brief Limits the number usable channels by default for AU915, CN470 and US915 regions
+  * \note the default channel mask with this option activates the first 8 channels. \
+  *       this default mask can be modified in the RegionXXXXXInitDefaults function associated with the active region.
+  */
+#define HYBRID_ENABLED                                  0
+
+/**
+  * \brief Define the read access of the keys in memory
+  * \note this value should be disabled after the development process
+  */
+#define KEY_EXTRACTABLE                                 1
+
+/*!
+ * Enables/Disables the context storage management storage.
+ * Must be enabled for LoRaWAN 1.0.4 or later.
+ */
+#define CONTEXT_MANAGEMENT_ENABLED                      0
+
+/* Class B ------------------------------------*/
+#define LORAMAC_CLASSB_ENABLED  0
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+/* CLASS B LSE crystal calibration*/
+/**
+  * \brief Temperature coefficient of the clock source
+  */
+#define RTC_TEMP_COEFFICIENT                            ( -0.035 )
+
+/**
+  * \brief Temperature coefficient deviation of the clock source
+  */
+#define RTC_TEMP_DEV_COEFFICIENT                        ( 0.0035 )
+
+/**
+  * \brief Turnover temperature of the clock source
+  */
+#define RTC_TEMP_TURNOVER                               ( 25.0 )
+
+/**
+  * \brief Turnover temperature deviation of the clock source
+  */
+#define RTC_TEMP_DEV_TURNOVER                           ( 5.0 )
+#endif /* LORAMAC_CLASSB_ENABLED == 1 */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifndef CRITICAL_SECTION_BEGIN
+#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_BEGIN */
+#ifndef CRITICAL_SECTION_END
+#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_END */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LORAWAN_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
new file mode 100644
index 00000000..5bcdf818
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mw_log_conf.h
+  * @author  MCD Application Team
+  * @brief   Configure (enable/disable) traces for CM0
+  *******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MW_LOG_CONF_H__
+#define __MW_LOG_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_adv_trace.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MW_LOG_ENABLED
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef MW_LOG_ENABLED
+#define MW_LOG(TS,VL, ...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0)
+#else  /* MW_LOG_ENABLED */
+#define MW_LOG(TS,VL, ...)
+#endif /* MW_LOG_ENABLED */
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MW_LOG_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
new file mode 100644
index 00000000..d4c34621
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c
@@ -0,0 +1,220 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.c
+  * @author  MCD Application Team
+  * @brief   This file provides an interface layer between MW and Radio Board
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "radio_board_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t RBI_Init(void)
+{
+  /* USER CODE BEGIN RBI_Init_1 */
+
+  /* USER CODE END RBI_Init_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_Init();
+#else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_Init_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_Init_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_DeInit(void)
+{
+  /* USER CODE BEGIN RBI_DeInit_1 */
+
+  /* USER CODE END RBI_DeInit_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_DeInit();
+#else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_DeInit_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_DeInit_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
+{
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_1 */
+
+  /* USER CODE END RBI_ConfigRFSwitch_1 */
+#if defined(USE_BSP_DRIVER)
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
+#else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_ConfigRFSwitch_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_GetTxConfig(void)
+{
+  /* USER CODE BEGIN RBI_GetTxConfig_1 */
+
+  /* USER CODE END RBI_GetTxConfig_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_GetTxConfig();
+#else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
+  /* USER CODE BEGIN RBI_GetTxConfig_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_GetTxConfig_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_IsTCXO(void)
+{
+  /* USER CODE BEGIN RBI_IsTCXO_1 */
+
+  /* USER CODE END RBI_IsTCXO_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsTCXO();
+#else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsTCXO_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsTCXO_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_IsDCDC(void)
+{
+  /* USER CODE BEGIN RBI_IsDCDC_1 */
+
+  /* USER CODE END RBI_IsDCDC_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsDCDC();
+#else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsDCDC_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsDCDC_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
new file mode 100644
index 00000000..9e505c68
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h
@@ -0,0 +1,207 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Radio interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef RADIO_BOARD_IF_H
+#define RADIO_BOARD_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported defines ----------------------------------------------------------*/
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+#define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
+#define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
+#define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
+#else
+/* USER CODE BEGIN Board Definition */
+
+/* USER CODE END Board Definition */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported Parameters */
+
+/* USER CODE END Exported Parameters */
+/* Indicates the type of switch between the ones proposed by CONFIG Constants
+ */
+#define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
+
+/* Indicates whether or not TCXO is supported by the board
+ * 0: TCXO not supported
+ * 1: TCXO supported
+ */
+#define IS_TCXO_SUPPORTED                   1U
+
+/* Indicates whether or not DCDC is supported by the board
+ * 0: DCDC not supported
+ * 1: DCDC supported
+ */
+#define IS_DCDC_SUPPORTED                   1U
+
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported PinMapping */
+#warning user to provide its board definitions pins
+/* USER CODE END Exported PinMapping */
+#endif  /* USE_BSP_DRIVER  */
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+typedef enum
+{
+  RBI_SWITCH_OFF    = RADIO_SWITCH_OFF,
+  RBI_SWITCH_RX     = RADIO_SWITCH_RX,
+  RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
+  RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
+} RBI_Switch_TypeDef;
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
+typedef enum
+{
+  RBI_SWITCH_OFF    = 0,
+  RBI_SWITCH_RX     = 1,
+  RBI_SWITCH_RFO_LP = 2,
+  RBI_SWITCH_RFO_HP = 3,
+} RBI_Switch_TypeDef;
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief  Init Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_Init(void);
+
+/**
+  * @brief  DeInit Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_DeInit(void);
+
+/**
+  * @brief  Configure Radio Switch.
+  * @param  Config: Specifies the Radio RF switch path to be set.
+  *         This parameter can be one of following parameters:
+  *           @arg RADIO_SWITCH_OFF
+  *           @arg RADIO_SWITCH_RX
+  *           @arg RADIO_SWITCH_RFO_LP
+  *           @arg RADIO_SWITCH_RFO_HP
+  * @return BSP status
+  */
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
+
+/**
+  * @brief  Return Board Configuration
+  * @retval RBI_CONF_RFO_LP_HP
+  * @retval RBI_CONF_RFO_LP
+  * @retval RBI_CONF_RFO_HP
+  */
+int32_t RBI_GetTxConfig(void);
+
+/**
+  * @brief  Get If TCXO is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsTCXO(void);
+
+/**
+  * @brief  Get If DCDC is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsDCDC(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RADIO_BOARD_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
new file mode 100644
index 00000000..471fd3bd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h
@@ -0,0 +1,183 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_conf.h
+  * @author  MCD Application Team
+  * @brief   Header of Radio configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_CONF_H__
+#define __RADIO_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
+#include "stm32_seq.h"
+#include "mw_log_conf.h"     /* mw trace conf */
+#include "radio_board_if.h"  /* low layer api (bsp) */
+#include "utilities_def.h"  /* low layer api (bsp) */
+#include "mbmuxif_sys.h"
+#include "sys_debug.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Set RX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
+
+/**
+  * @brief Set TX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
+
+/**
+  * @brief Max payload buffer size
+  */
+#define RADIO_RX_BUF_SIZE          255
+
+/**
+  * @brief Get the chip revision ID from Mbmux table
+  */
+#define LL_DBGMCU_GetRevisionID() MBMUXIF_ChipRevId()
+
+/**
+  * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
+
+/**
+  * @brief drive value used anytime radio is in TX low power mode
+  *        TX low power mode is the worst case because the PA sinks from SMPS
+  *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
+
+/**
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_FREQ                   ( 32000000UL )
+
+/**
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
+
+/**
+  * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
+  */
+#define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
+
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
+#define RADIO_IRQ_PROCESS_INIT()   do{ UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioIrq_Process), UTIL_SEQ_RFU, RadioIrqProcess); \
+                                       UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioRxTimeout_Process), UTIL_SEQ_RFU, RadioOnRxTimeoutProcess);\
+                                       UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioTxTimeout_Process), UTIL_SEQ_RFU, RadioOnTxTimeoutProcess);} while(0)
+
+#define RADIO_IRQ_PROCESS()        do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioIrq_Process, CFG_SEQ_Prio_0); } while(0)
+#define RADIO_RX_TIMEOUT_PROCESS() do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioRxTimeout_Process, CFG_SEQ_Prio_0); } while(0)
+#define RADIO_TX_TIMEOUT_PROCESS() do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioTxTimeout_Process, CFG_SEQ_Prio_0); } while(0)
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifndef CRITICAL_SECTION_BEGIN
+/**
+  * @brief macro used to enter the critical section
+  */
+#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_BEGIN */
+#ifndef CRITICAL_SECTION_END
+/**
+  * @brief macro used to exit the critical section
+  */
+#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_END */
+
+/* Function mapping */
+/**
+  * @brief SUBGHZ interface init to radio Middleware
+  */
+#define RADIO_INIT                              MX_SUBGHZ_Init
+
+/**
+  * @brief Delay interface to radio Middleware
+  */
+#define RADIO_DELAY_MS                          HAL_Delay
+
+/**
+  * @brief Memset utilities interface to radio Middleware
+  */
+#define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RADIO_CONF_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
new file mode 100644
index 00000000..1991b928
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h
@@ -0,0 +1,67 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    systime.h
+  * @author  MCD Application Team
+  * @brief   Map middleware systime
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTIME_H__
+#define __SYSTIME_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_systime.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SYSTIME_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
new file mode 100644
index 00000000..e80cd6a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer.h
+  * @author  MCD Application Team
+  * @brief   Wrapper to timer server
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_H__
+#define __TIMER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Max timer mask
+  */
+#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/**
+  * @brief Timer value on 32 bits
+  */
+#define TimerTime_t UTIL_TIMER_Time_t
+
+/**
+  * @brief Timer object description
+  */
+#define TimerEvent_t UTIL_TIMER_Object_t
+
+/**
+  * @brief Create the timer object
+  */
+#define TimerInit(HANDLE, CB) do {\
+                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
+                                 } while(0)
+
+/**
+  * @brief update the period and start the timer
+  */
+#define TimerSetValue(HANDLE, TIMEOUT) do{ \
+                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
+                                         } while(0)
+
+/**
+  * @brief Start and adds the timer object to the list of timer events
+  */
+#define TimerStart(HANDLE)   do {\
+                                  UTIL_TIMER_Start(HANDLE);\
+                                } while(0)
+
+/**
+  * @brief Stop and removes the timer object from the list of timer events
+  */
+#define TimerStop(HANDLE)   do {\
+                                 UTIL_TIMER_Stop(HANDLE);\
+                               } while(0)
+
+/**
+  * @brief return the current time
+  */
+#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
+
+/**
+  * @brief return the elapsed time
+  */
+#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
new file mode 100644
index 00000000..39228252
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c
@@ -0,0 +1,834 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    LmHandler_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0PLUS side wrapper of the LoraMac interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_mem.h"
+#include "mbmux_table.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_lora.h"
+#include "sys_app.h"
+#include "lora_app.h"
+
+#include "LmHandler_mbwrapper.h"
+#include "LmHandler.h"
+#include "lora_info.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/*!
+ * LoRa State Machine states
+ */
+typedef enum TxEventType_e
+{
+  /*!
+   * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
+   */
+  TX_ON_TIMER,
+  /*!
+   * @brief Appdata Transmission external event plugged on OnSendEvent( )
+   */
+  TX_ON_EVENT
+} TxEventType_t;
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#ifndef MAX
+#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
+#endif /* MAX */
+#define LMH_ON_JOIN_SIZE (sizeof(LmHandlerJoinParams_t))
+#define LMH_ON_TX_SIZE   (sizeof(LmHandlerTxParams_t))
+#define LMH_ON_RX_SIZE   (((sizeof(LmHandlerAppData_t) + 7) & ~7) + 256 + (sizeof(LmHandlerRxParams_t)))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(LMH_ON_JOIN_SIZE, MAX(LMH_ON_TX_SIZE, LMH_ON_RX_SIZE))
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+static uint8_t GetBatteryLevel_mbwrapper(void);
+
+static uint16_t GetTemperatureLevel_mbwrapper(void);
+
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size);
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params);
+
+static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams);
+
+static void OnTxData_mbwrapper(LmHandlerTxParams_t *params);
+
+static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
+
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass);
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params);
+
+static void OnSysTimeUpdate_mbwrapper(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM0+ to CM4
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aLoraMbWrapShare2Buffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
+static LmHandlerCallbacks_t callback_mbwrapper =
+{
+  .GetBatteryLevel =           GetBatteryLevel_mbwrapper,
+  .GetTemperature =            GetTemperatureLevel_mbwrapper,
+  .GetUniqueId =               GetUniqueId,
+  .GetDevAddr =                GetDevAddr,
+  .OnMacProcess =              OnMacProcessNotify,
+  .OnNvmDataChange =           OnNvmDataChange_mbwrapper,
+  .OnNetworkParametersChange = OnNetworkParametersChange_mbwrapper,
+  .OnJoinRequest =             OnJoinRequest_mbwrapper,
+  .OnTxData =                  OnTxData_mbwrapper,
+  .OnRxData =                  OnRxData_mbwrapper,
+  .OnClassChange =             OnClassChange_mbwrapper,
+  .OnBeaconStatusChange =      OnBeaconStatusChange_mbwrapper,
+  .OnSysTimeUpdate =           OnSysTimeUpdate_mbwrapper
+};
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Exported functions ---------------------------------------------------------*/
+void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Lora_Cmd_1 */
+
+  /* USER CODE END Process_Lora_Cmd_1 */
+  uint32_t *com_buffer = NULL;
+  LmHandlerErrorStatus_t errorStatus;
+  LmHandlerFlagStatus_t flagStatus;
+  int32_t ret_code;
+
+  APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(LoRa)\r\n");
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case   LMHANDLER_INITIALIZATION_ID:
+      errorStatus = LmHandlerInit(&callback_mbwrapper);
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+      InitPackageProcess();
+      break;
+
+    case   LMHANDLER_CONFIGURE_ID:
+      errorStatus = LmHandlerConfigure((LmHandlerParams_t *) com_buffer[0]);
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+      break;
+
+    case   LMHANDLER_JOIN_STATUS_ID:
+      flagStatus = LmHandlerJoinStatus();
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) flagStatus; /* */
+      break;
+
+    case   LMHANDLER_JOIN_ID:
+      LmHandlerJoin((ActivationType_t) com_buffer[0]);
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case   LMHANDLER_STOP_ID:
+      errorStatus = LmHandlerStop();
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+      break;
+
+    case   LMHANDLER_SEND_ID:
+    {
+      LmHandlerAppData_t appData;
+      appData.Port = (uint8_t)com_buffer[0];
+      appData.BufferSize = (uint8_t)com_buffer[1];
+      appData.Buffer = (uint8_t *)com_buffer[2];
+
+      errorStatus = LmHandlerSend(&appData, (LmHandlerMsgTypes_t) com_buffer[3], (UTIL_TIMER_Time_t *)com_buffer[4], (bool)com_buffer[5]);
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+    }
+    break;
+    case   LMHANDLER_PROCESS_ID:
+      LmHandlerProcess();
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+    case   LMHANDLER_REQUEST_CLASS_ID:
+      errorStatus = LmHandlerRequestClass((DeviceClass_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) errorStatus; /* */
+      break;
+    case   LMHANDLER_GET_CLASS_ID:
+      ret_code = LmHandlerGetCurrentClass((DeviceClass_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_DEVEUI_ID:
+      ret_code = LmHandlerGetDevEUI((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_DEVEUI_ID:
+      ret_code = LmHandlerSetDevEUI((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPEUI_ID:
+      ret_code = LmHandlerGetAppEUI((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPEUI_ID:
+      ret_code = LmHandlerSetAppEUI((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_NWKKEY_ID:
+      ret_code = LmHandlerGetNwkKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKKEY_ID:
+      ret_code = LmHandlerSetNwkKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPKEY_ID:
+      ret_code = LmHandlerGetAppKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPKEY_ID:
+      ret_code = LmHandlerSetAppKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_NWKSKEY_ID:
+      ret_code = LmHandlerGetNwkSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKSKEY_ID:
+      ret_code = LmHandlerSetNwkSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_APPSKEY_ID:
+      ret_code = LmHandlerGetAppSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_APPSKEY_ID:
+      ret_code = LmHandlerSetAppSKey((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_NWKID_ID:
+      ret_code = LmHandlerGetNetworkID((uint32_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_NWKID_ID:
+      ret_code = LmHandlerSetNetworkID((uint32_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_DEVADDR_ID:
+      ret_code = LmHandlerGetDevAddr((uint32_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_DEVADDR_ID:
+      ret_code = LmHandlerSetDevAddr((uint32_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_ACTIVE_REGION_ID:
+      ret_code = LmHandlerGetActiveRegion((LoRaMacRegion_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_ACTIVE_REGION_ID:
+      ret_code = LmHandlerSetActiveRegion((LoRaMacRegion_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_ADR_ENABLE_ID:
+      ret_code = LmHandlerGetAdrEnable((bool *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_ADR_ENABLE_ID:
+      ret_code = LmHandlerSetAdrEnable((bool) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_TX_DATARATE_ID:
+      ret_code = LmHandlerGetTxDatarate((int8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_TX_DATARATE_ID:
+      ret_code = LmHandlerSetTxDatarate((int8_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_DUTY_CYCLE_ID:
+      ret_code = LmHandlerGetDutyCycleEnable((bool *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_DUTY_CYCLE_ID:
+      ret_code = LmHandlerSetDutyCycleEnable((bool) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_RX2_PARAMS_ID:
+      ret_code = LmHandlerGetRX2Params((RxChannelParams_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_TX_PWR_ID:
+      ret_code = LmHandlerGetTxPower((int8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_RX1_DELAY_ID:
+      ret_code = LmHandlerGetRx1Delay((uint32_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_RX2_DELAY_ID:
+      ret_code = LmHandlerGetRx2Delay((uint32_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_JOIN_RX1_DELAY_ID:
+      ret_code = LmHandlerGetJoinRx1Delay((uint32_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_JOIN_RX2_DELAY_ID:
+      ret_code = LmHandlerGetJoinRx2Delay((uint32_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_RX2_PARAMS_ID:
+      ret_code = LmHandlerSetRX2Params((RxChannelParams_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_TX_PWR_ID:
+      ret_code = LmHandlerSetTxPower((int8_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_RX1_DELAY_ID:
+      ret_code = LmHandlerSetRx1Delay((uint32_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_RX2_DELAY_ID:
+      ret_code = LmHandlerSetRx2Delay((uint32_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_JOIN_RX1_DELAY_ID:
+      ret_code = LmHandlerSetJoinRx1Delay((uint32_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_JOIN_RX2_DELAY_ID:
+      ret_code = LmHandlerSetJoinRx2Delay((uint32_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_PING_PERIODICITY_ID:
+      ret_code = LmHandlerGetPingPeriodicity((uint8_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_SET_PING_PERIODICITY_ID:
+      ret_code = LmHandlerSetPingPeriodicity((uint8_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_GET_BEACON_STATE_ID:
+      ret_code = LmHandlerGetBeaconState((BeaconState_t *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case LMHANDLER_LINK_CHECK_REQ_ID:
+      ret_code = LmHandlerLinkCheckReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case LMHANDLER_DEVICE_TIME_REQ_ID:
+      ret_code = LmHandlerDeviceTimeReq();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_code; /* */
+      break;
+    case   LMHANDLER_INFO_INIT_ID:
+      LoraInfo_Init();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_H, "<CM0PLUS(LoRa)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID);
+  /* USER CODE BEGIN Process_Lora_Cmd_2 */
+
+  /* USER CODE END Process_Lora_Cmd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/*!
+ * \brief   Measures the battery level
+ *
+ * \retval  Battery level [0: node is connected to an external
+ *          power source, 1..254: battery level, where 1 is the minimum
+ *          and 254 is the maximum value, 255: the node was not able
+ *          to measure the battery level]
+ */
+
+static uint8_t GetBatteryLevel_mbwrapper(void)
+{
+  /* USER CODE BEGIN GetBatteryLevel_mbwrapper_1 */
+
+  /* USER CODE END GetBatteryLevel_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_GET_BATTERY_LEVEL_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return (uint8_t) com_obj->ReturnVal;
+  /* USER CODE BEGIN GetBatteryLevel_mbwrapper_2 */
+
+  /* USER CODE END GetBatteryLevel_mbwrapper_2 */
+}
+
+/*!
+ * \brief   Measures the temperature level
+ *
+ * \retval  Temperature level
+ */
+static uint16_t GetTemperatureLevel_mbwrapper(void)
+{
+  /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_1 */
+
+  /* USER CODE END GetTemperatureLevel_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_GET_TEMPERATURE_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return (uint16_t) com_obj->ReturnVal;
+  /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_2 */
+
+  /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
+}
+
+static void OnNvmDataChange_mbwrapper(LmHandlerNvmContextStates_t state, uint16_t size)
+{
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_1 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)state;
+  com_buffer[1] = (uint32_t)size;
+  com_obj->ParamCnt = 2;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNvmDataChange_mbwrapper_2 */
+
+  /* USER CODE END OnNvmDataChange_mbwrapper_2 */
+}
+
+static void OnNetworkParametersChange_mbwrapper(CommissioningParams_t *params)
+{
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_1 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(CommissioningParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnNetworkParametersChange_mbwrapper_2 */
+
+  /* USER CODE END OnNetworkParametersChange_mbwrapper_2 */
+}
+
+static void OnJoinRequest_mbwrapper(LmHandlerJoinParams_t *joinParams)
+{
+  /* USER CODE BEGIN OnJoinRequest_mbwrapper_1 */
+
+  /* USER CODE END OnJoinRequest_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (joinParams != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, joinParams, sizeof(LmHandlerJoinParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_JOIN_REQ_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (joinParams == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnJoinRequest_mbwrapper_2 */
+
+  /* USER CODE END OnJoinRequest_mbwrapper_2 */
+}
+
+static void OnTxData_mbwrapper(LmHandlerTxParams_t *params)
+{
+  /* USER CODE BEGIN OnTxData_mbwrapper_1 */
+
+  /* USER CODE END OnTxData_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerTxParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_TX_DATA_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnTxData_mbwrapper_2 */
+
+  /* USER CODE END OnTxData_mbwrapper_2 */
+}
+
+static void OnRxData_mbwrapper(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
+{
+  /* USER CODE BEGIN OnRxData_mbwrapper_1 */
+
+  /* USER CODE END OnRxData_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+  uint8_t next_addr = 0;
+
+  if (appData != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, appData, sizeof(LmHandlerAppData_t));
+    /* need to 8-align the next address */
+    next_addr = (sizeof(LmHandlerAppData_t) + 7) & ~7;
+
+    if (appData->BufferSize > 0)
+    {
+      UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], appData->Buffer, appData->BufferSize);
+      ((LmHandlerAppData_t *)aLoraMbWrapShare2Buffer)->Buffer = &aLoraMbWrapShare2Buffer[next_addr];
+      next_addr = (appData->BufferSize + 7) & ~7;
+    }
+  }
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShare2Buffer[next_addr], params, sizeof(LmHandlerRxParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_RX_DATA_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (appData == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+
+  if (params == NULL)
+  {
+    com_buffer[1] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[1] = (uint32_t) &aLoraMbWrapShare2Buffer[next_addr];
+  }
+
+  com_obj->ParamCnt = 2;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnRxData_mbwrapper_2 */
+
+  /* USER CODE END OnRxData_mbwrapper_2 */
+}
+
+static void OnClassChange_mbwrapper(DeviceClass_t deviceClass)
+{
+  /* USER CODE BEGIN OnClassChange_mbwrapper_1 */
+
+  /* USER CODE END OnClassChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_CLASS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t)deviceClass;
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnClassChange_mbwrapper_2 */
+
+  /* USER CODE END OnClassChange_mbwrapper_2 */
+}
+
+static void OnBeaconStatusChange_mbwrapper(LmHandlerBeaconParams_t *params)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+
+  if (params != NULL)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShare2Buffer, params, sizeof(LmHandlerBeaconParams_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (params == NULL)
+  {
+    com_buffer[0] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[0] = (uint32_t) aLoraMbWrapShare2Buffer;
+  }
+  com_obj->ParamCnt = 1;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
+static void OnSysTimeUpdate_mbwrapper(void)
+{
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_1 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureNotifComPtr();
+  com_obj->MsgId = LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN OnBeaconStatusChange_mbwrapper_2 */
+
+  /* USER CODE END OnBeaconStatusChange_mbwrapper_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
new file mode 100644
index 00000000..bc600e5f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    LmHandler_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0PLUS side wrapper of the LmHandler
+  *          interface shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LMHANDLER_MBWRAPPER_CM0PLUS_H__
+#define __LMHANDLER_MBWRAPPER_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Lora_Cmd(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LMHANDLER_MBWRAPPER_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
new file mode 100644
index 00000000..61a6eb3d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c
@@ -0,0 +1,153 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    features_info.c
+  * @author  MCD Application Team
+  * @brief   CM0PLUS supported features list
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stddef.h>
+#include <stdint.h>
+#include "features_info.h"
+#include "lora_info.h"
+#include "lorawan_version.h"
+#include "lora_app_version.h"
+#include "subghz_phy_version.h"
+#include "stm32_mem.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Feature info table
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") FEAT_INFO_Param_t Feat_Info_Table[] =
+{
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_SYSTEM_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size =  0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  /* {
+    .Feat_Info_Feature_Id =   FEAT_INFO_KMS_ID,
+    .Feat_Info_Feature_Version = FEAT_INFO_KMS_VER,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr=  (void *) NULL
+  }, */
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_LORAWAN_ID,
+    .Feat_Info_Feature_Version = __LORAWAN_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_TRACE_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_RADIO_ID,
+    .Feat_Info_Feature_Version = __SUBGHZ_PHY_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+};
+
+/**
+  * @brief Feature info container
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") FEAT_INFO_List_t Feat_Info_List =
+{
+  .Feat_Info_Cnt =  sizeof(Feat_Info_Table) / sizeof(FEAT_INFO_Param_t),
+  .Feat_Info_TableAddress =  Feat_Info_Table,
+};
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void FEAT_INFO_Init(void)
+{
+  /* USER CODE BEGIN FEAT_INFO_Init_1 */
+
+  /* USER CODE END FEAT_INFO_Init_1 */
+
+  /* Set LoRaWAN Info_Config */
+  LoraInfo_Init();
+  /* USER CODE BEGIN FEAT_INFO_Init_2 */
+
+  /* USER CODE END FEAT_INFO_Init_2 */
+}
+
+FEAT_INFO_List_t *FEAT_INFO_GetListPtr(void)
+{
+  /* USER CODE BEGIN FEAT_INFO_GetListPtr_1 */
+
+  /* USER CODE END FEAT_INFO_GetListPtr_1 */
+  return (FEAT_INFO_List_t *) &Feat_Info_List;
+  /* USER CODE BEGIN FEAT_INFO_GetListPtr_2 */
+
+  /* USER CODE END FEAT_INFO_GetListPtr_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
new file mode 100644
index 00000000..e95e07d9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c
@@ -0,0 +1,209 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_info.c
+  * @author  MCD Application Team
+  * @brief   To give info to the application about LoRaWAN configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "LoRaMac.h"
+#include "lora_info.h"
+#include "sys_app.h" /* APP_PRINTF */
+#include "platform.h" /* Needed for Error_Handler */
+#include "features_info.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief initialize the LoraMacInfo capabilities table
+  */
+void StoreValueInFeatureListTable(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported variables --------------------------------------------------------*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2")  LoraInfo_t loraInfo;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported functions --------------------------------------------------------*/
+void LoraInfo_Init(void)
+{
+  loraInfo.ActivationMode = 0;
+  loraInfo.Region = 0;
+  loraInfo.ClassB = 0;
+  loraInfo.Kms = 0;
+  /* USER CODE BEGIN LoraInfo_Init_1 */
+
+  /* USER CODE END LoraInfo_Init_1 */
+
+#ifdef  REGION_AS923
+  loraInfo.Region |= (1 << LORAMAC_REGION_AS923) ;
+#endif /* REGION_AS923 */
+#ifdef  REGION_AU915
+  loraInfo.Region |= (1 << LORAMAC_REGION_AU915) ;
+#endif /* REGION_AU915 */
+#ifdef  REGION_CN470
+  loraInfo.Region |= (1 << LORAMAC_REGION_CN470) ;
+#endif /* REGION_CN470 */
+#ifdef  REGION_CN779
+  loraInfo.Region |= (1 << LORAMAC_REGION_CN779) ;
+#endif /* REGION_CN779 */
+#ifdef  REGION_EU433
+  loraInfo.Region |= (1 << LORAMAC_REGION_EU433) ;
+#endif /* REGION_EU433 */
+#ifdef  REGION_EU868
+  loraInfo.Region |= (1 << LORAMAC_REGION_EU868) ;
+#endif /* REGION_EU868 */
+#ifdef  REGION_KR920
+  loraInfo.Region |= (1 << LORAMAC_REGION_KR920) ;
+#endif /* REGION_KR920 */
+#ifdef  REGION_IN865
+  loraInfo.Region |= (1 << LORAMAC_REGION_IN865) ;
+#endif /* REGION_IN865 */
+#ifdef  REGION_US915
+  loraInfo.Region |= (1 << LORAMAC_REGION_US915) ;
+#endif /* REGION_US915 */
+#ifdef  REGION_RU864
+  loraInfo.Region |= (1 << LORAMAC_REGION_RU864) ;
+#endif /* REGION_RU864 */
+
+  if (loraInfo.Region == 0)
+  {
+    APP_PRINTF("error: At least one region shall be defined in the MW: check lorawan_conf.h \r\n");
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+    while (1) {} /* At least one region shall be defined */
+  }
+
+#if ( LORAMAC_CLASSB_ENABLED == 1 )
+  loraInfo.ClassB = 1;
+#elif !defined (LORAMAC_CLASSB_ENABLED)
+#error LORAMAC_CLASSB_ENABLED not defined ( shall be <0 or 1> )
+#endif /* LORAMAC_CLASSB_ENABLED */
+
+#if (!defined (LORAWAN_KMS) || (LORAWAN_KMS == 0))
+  loraInfo.Kms = 0;
+  loraInfo.ActivationMode = 3;
+#else /* LORAWAN_KMS == 1 */
+  loraInfo.Kms = 1;
+  loraInfo.ActivationMode = ACTIVATION_BY_PERSONALIZATION + (OVER_THE_AIR_ACTIVATION << 1);
+#endif /* LORAWAN_KMS */
+
+  /* For DualCore */
+  StoreValueInFeatureListTable();
+  /* USER CODE BEGIN LoraInfo_Init_2 */
+
+  /* USER CODE END LoraInfo_Init_2 */
+}
+
+LoraInfo_t *LoraInfo_GetPtr(void)
+{
+  /* USER CODE BEGIN LoraInfo_GetPtr */
+
+  /* USER CODE END LoraInfo_GetPtr */
+  return &loraInfo;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions --------------------------------------------------------*/
+void StoreValueInFeatureListTable(void)
+{
+  FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
+  FEAT_INFO_Param_t  *p_feature;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  uint8_t found = 0;
+
+  /* USER CODE BEGIN StoreValueInFeatureListTable_1 */
+
+  /* USER CODE END StoreValueInFeatureListTable_1 */
+
+  p_MBMUX_Cm0plusFeatureList = FEAT_INFO_GetListPtr();
+
+  if (p_MBMUX_Cm0plusFeatureList != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_MBMUX_Cm0plusFeatureList->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      p_feature = i + p_MBMUX_Cm0plusFeatureList->Feat_Info_TableAddress;
+      if (p_feature->Feat_Info_Feature_Id == FEAT_INFO_LORAWAN_ID)
+      {
+        found = 1;
+        break;
+      }
+    }
+  }
+
+  if (found)
+  {
+    p_feature->Feat_Info_Config_Size = sizeof(LoraInfo_t) / sizeof(uint32_t);
+    p_feature->Feat_Info_Config_Ptr = &loraInfo;
+  }
+  else
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN StoreValueInFeatureListTable_2 */
+
+  /* USER CODE END StoreValueInFeatureListTable_2 */
+  return;
+}
+
+/* USER CODE BEGIN PF */
+
+/* USER CODE END PF */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
new file mode 100644
index 00000000..70087950
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c
@@ -0,0 +1,439 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.c
+  * @author  MCD Application Team
+  * @brief   Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "assert.h"
+#include "stddef.h"
+#include "stm32_mem.h"
+#include "ipcc_if.h"
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MB_CHANNEL_NOT_REGISTERED 0xFF
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
+static void MBMUX_IsrNotRegistered(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
+{
+  /* USER CODE BEGIN MBMUX_Init_1 */
+
+  /* USER CODE END MBMUX_Init_1 */
+  uint8_t i;
+  IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
+
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
+
+  for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
+  {
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+  }
+  /* USER CODE BEGIN MBMUX_Init_Last */
+
+  /* USER CODE END MBMUX_Init_Last */
+}
+
+int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
+{
+  uint8_t channel_idx;
+  int8_t ret = -1;
+  uint8_t check_existing_feature_registration;
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_1 */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_1 */
+
+  check_existing_feature_registration = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  if (check_existing_feature_registration != MB_CHANNEL_NOT_REGISTERED)
+  {
+    /* channel has been registered by CM4 registered */
+    channel_idx = check_existing_feature_registration;
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
+    {
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
+    }
+  }
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_Last */
+  return ret;
+}
+
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
+
+  /* USER CODE END MBMUX_UnregisterFeature_1 */
+  uint8_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  if (mb_ch < IPCC_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
+      IPCC_IF_ResponseSnd(mb_ch);
+
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    }
+    else
+    {
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    }
+  }
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
+
+  /* USER CODE END MBMUX_UnregisterFeature_Last */
+}
+
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_1 */
+  uint32_t channel_idx;
+  MBMUX_ComParam_t *com_param_ptr = NULL;
+
+  channel_idx = MBMUX_GetFeatureChIdx(e_featID, ComType);
+  if (channel_idx < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBCmdRespParam[channel_idx];
+    }
+    else
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBNotifAckParam[channel_idx];
+    }
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_Last */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_Last */
+}
+
+int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
+
+  /* USER CODE END MBMUX_NotificationSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
+  if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
+  {
+    Error_Handler();
+  }
+  return IPCC_IF_NotificationSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
+
+  /* USER CODE END MBMUX_NotificationSnd_Last */
+}
+
+uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
+
+  /* USER CODE END MBMUX_ResponseSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_CMD_RESP);
+  return IPCC_IF_ResponseSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_ResponseSnd_Last */
+
+  /* USER CODE END MBMUX_ResponseSnd_Last */
+}
+
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* First check is only sufficient to avoid SW attacks (pBufferAddress out of range) */
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_2 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_2 */
+
+  /* Double Check to avoid basic fault injection by "HW" (e.g. power glitched) */
+  /* fault injection might lead to "jump" the check inside the MBMUX_SEC_VerifySramBuffer function */
+  /* which would validate an out-of-range buffer pointer */
+  /* note: below "if statement" is dummy: it is used to avoid the compiler to remove the second call*/
+  if ((pbuf_validated == pBufferAddress) || (pbuf_validated == NULL))
+  {
+    /* Calling twice the function reduce exponentially the HW fault injection attacks */
+    pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
+
+static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrCommandRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
+  /* call registered callback */
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
+  return;
+}
+
+static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
+  /* call registered callback */
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
+  return;
+}
+
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_1 */
+  return p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType];
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_Last */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_Last */
+}
+
+static void MBMUX_IsrNotRegistered(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_1 */
+  Error_Handler();
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
new file mode 100644
index 00000000..a938e544
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.h
+  * @author  MCD Application Team
+  * @brief   API which interfaces CM0PLUS to IPCC
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_CM0PLUS_H__
+#define __MBMUX_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
+int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
+
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUX_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
new file mode 100644
index 00000000..26630e54
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c
@@ -0,0 +1,198 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_lora.c
+  * @author  MCD Application Team
+  * @brief   allows CM0 application to register and handle LoraWAN to MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_lora.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "LmHandler_mbwrapper.h"
+#include "utilities_def.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *LoraComObj;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
+static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
+static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the command
+  */
+static void MBMUXIF_TaskLoraCmdRcv(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_LoraInit(void)
+{
+  int8_t ret;
+  /* USER CODE BEGIN MBMUXIF_LoraInit_1 */
+
+  /* USER CODE END MBMUXIF_LoraInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrLoraAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP, MBMUXIF_IsrLoraCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskLoraCmdRcv);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_LoraInit_Last */
+
+  /* USER CODE END MBMUXIF_LoraInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetLoraFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_LoraSendNotif(void)
+{
+  /* to check vs radio. radio call this on irq so it moves here on task */
+  /* for lora is already called from task .. */
+  /* USER CODE BEGIN MBMUXIF_LoraSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_LoraSendNotif_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_LORAWAN_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbLoraAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_LoraSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_LoraSendNotif_Last */
+}
+
+void MBMUXIF_LoraSendResp(void)
+{
+  /* USER CODE BEGIN MBMUXIF_LoraSendResp_1 */
+
+  /* USER CODE END MBMUXIF_LoraSendResp_1 */
+  if (MBMUX_ResponseSnd(FEAT_INFO_LORAWAN_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_LoraSendResp_Last */
+
+  /* USER CODE END MBMUXIF_LoraSendResp_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrLoraAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbLoraAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrLoraAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrLoraAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrLoraCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_1 */
+  LoraComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaCmdRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrLoraCmdRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrLoraCmdRcvCb_Last */
+}
+
+static void MBMUXIF_TaskLoraCmdRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskLoraCmdRcv_1 */
+  Process_Lora_Cmd(LoraComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskLoraCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskLoraCmdRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
new file mode 100644
index 00000000..558f081f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h
@@ -0,0 +1,92 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_lora.h
+  * @author  MCD Application Team
+  * @brief   API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_LORA_CM0PLUS_H__
+#define __MBMUXIF_LORA_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Notif
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Notif via Ipcc and Wait for the ack
+  */
+void MBMUXIF_LoraSendNotif(void);
+
+/**
+  * @brief   Sends a Lora-Resp  via Ipcc without waiting for the response
+  */
+void MBMUXIF_LoraSendResp(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_LORA_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
new file mode 100644
index 00000000..fe5fd070
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -0,0 +1,217 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.c
+  * @author  MCD Application Team
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_radio.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "radio_mbwrapper.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *RadioComObj;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
+static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
+static void MBMUXIF_TaskRadioNotifSnd(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_RadioInit(void)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_1 */
+
+  /* USER CODE END MBMUXIF_RadioInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrRadioAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP, MBMUXIF_IsrRadioCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskRadioCmdRcv);
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioNotifSnd), UTIL_SEQ_RFU, MBMUXIF_TaskRadioNotifSnd);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_Last */
+
+  /* USER CODE END MBMUXIF_RadioInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_RadioSendNotif(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendNotif_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioNotifSnd), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_RadioSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendNotif_Last */
+}
+
+void MBMUXIF_RadioSendResp(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendResp_1 */
+  if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendResp_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbRadioAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_1 */
+  RadioComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioCmdRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_Last*/
+
+  /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
+}
+
+static void MBMUXIF_TaskRadioCmdRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioCmdRcv_1 */
+  Process_Radio_Cmd(RadioComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
+}
+
+static void MBMUXIF_TaskRadioNotifSnd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifSnd_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_RADIO_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbRadioAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifSnd_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
new file mode 100644
index 00000000..7e226c6c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -0,0 +1,93 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_RADIO_CM0PLUS_H__
+#define __MBMUXIF_RADIO_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
+void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
+void MBMUXIF_RadioSendResp(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_RADIO_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
new file mode 100644
index 00000000..161fb2cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -0,0 +1,425 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.c
+  * @author  MCD Application Team
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_sys.h"
+#include "stm32_seq.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_lora.h"
+#include "mbmuxif_radio.h"
+#include "features_info.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *pMb_RefTable;  /* SRAM1_BASE + IPCCDBA<<4*/
+static MBMUX_ComParam_t *SystemComObj;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
+static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_SystemInit(void)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
+
+  /* USER CODE END MBMUXIF_SystemInit_1 */
+
+  /*Read FLASH IPCC data buffer base address based on (IPCCDBA << 4) + SRAM1_BASE*/
+  FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+  pMb_RefTable = (MBMUX_ComTable_t *) OptionsBytesStruct.IPCCdataBufAddr;
+
+  /* prevents Cm0 to go further, during boot after PWR_CR4_C2BOOT is set by Cm4*/
+  /* it allows Cm0 debugging step by step the MBMUXIF_SystemInit */
+  while (pMb_RefTable->SynchronizeCpusAtBoot == CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
+
+  MBMUX_Init(pMb_RefTable);
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemCmdRcv);
+    ret = 0;
+  }
+
+  if (ret >= 0)
+  {
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
+    /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
+    while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
+    pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
+
+  /* USER CODE END MBMUXIF_SystemInit_Last */
+  return ret;
+}
+
+uint16_t MBMUXIF_GetCpusSynchroFlag(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
+
+  /* USER CODE END MBMUXIF_GetCpusSynchroFlag */
+  return pMb_RefTable->SynchronizeCpusAtBoot;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureNotifComPtr_Last */
+  return com_param_ptr;
+}
+
+void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_1 */
+  if (MBMUX_NotificationSnd(SystemPrioFeat) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_Last */
+}
+
+void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
+  if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
+}
+
+void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
+  if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendResp_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Exported services --------------------------------------------------------*/
+int16_t MBMUXIF_ChipRevId(void)
+{
+  int16_t ret = pMb_RefTable->ChipRevId;
+  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+
+  /* USER CODE END MBMUXIF_ChipRevId */
+  return ret ;
+}
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
+{
+  SystemComObj = (MBMUX_ComParam_t *) ComObj;
+
+  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
+
+  /* process Command on Isr or schedule a task*/
+  switch (SystemComObj->MsgId)
+  {
+    case SYS_GET_INFO_LIST_MSG_ID:
+      SystemComObj->ReturnVal = (uint32_t) FEAT_INFO_GetListPtr();
+      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+      break;
+
+    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
+
+    default:
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
+      break;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
+
+}
+
+static void MBMUXIF_TaskSystemCmdRcv(void)
+{
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
+  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
+  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
+
+}
+
+static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
+}
+
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
+{
+  int8_t ret = -2; /* feature not supported */
+
+  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  APP_LOG(TS_OFF, VLEVEL_L, "\r\n");
+
+  switch (pBuf[0])
+  {
+    case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioAAckRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_CMD_PRIO_B_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_B_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioBCmdRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioBAckRcvCb);
+      break;
+
+    case FEAT_INFO_KMS_ID:
+      /* ret = MBMUXIF_KmsInit(); */
+      /* APP_LOG(TS_OFF, VLEVEL_L, " * CM0 : Kms registration done\r\n"); */
+      break;
+
+    case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
+      ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
+      break;
+
+    case FEAT_INFO_RADIO_ID:
+      ret = MBMUXIF_RadioInit();
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Radio registration done\r\n");
+      break;
+
+    case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
+      ret = MBMUXIF_LoraInit();
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora registration done\r\n");
+      break;
+
+    case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox not supported\r\n");
+      break;
+
+    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+
+    default:
+      break;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+
+  return ret;
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
new file mode 100644
index 00000000..f780cdde
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_SYS_CM0PLUS_H__
+#define __MBMUXIF_SYS_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
+uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
+int16_t MBMUXIF_ChipRevId(void);
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_SYS_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
new file mode 100644
index 00000000..05704d23
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -0,0 +1,237 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.c
+  * @author  MCD Application Team
+  * @brief   Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_trace.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "stm32_seq.h"
+#include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
+static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private typedef -----------------------------------------------------------*/
+const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
+{
+  MBMUXIF_TraceBufferInit,
+  NULL,
+  NULL,
+  MBMUXIF_TraceBufferSend,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
+    /*Initialize the terminal */
+    UTIL_ADV_TRACE_Init();
+    UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
+
+    /*Set verbose LEVEL*/
+    UTIL_ADV_TRACE_SetVerboseLevel(verboseLevel);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_TraceSendNotif_NoWait(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
+
+  /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
+
+  /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Exported services --------------------------------------------------------*/
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
+{
+  /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceBufferInit_1 */
+  TraceUtilCpltCallback = cb;
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN MBMUXIF_TraceBufferInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceBufferInit_Last */
+}
+
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
+
+  /* USER CODE END MBMUXIF_TraceBufferSend_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
+
+  /* notify CM4 that CM0PLUS is initialized */
+  com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
+  if (com_obj != NULL)
+  {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
+    com_obj->MsgId = TRACE_SEND_MSG_ID;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
+    com_obj->ParamCnt = 2;
+    MBMUXIF_TraceSendNotif_NoWait();
+  }
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN MBMUXIF_TraceBufferSend_Last */
+
+  /* USER CODE END MBMUXIF_TraceBufferSend_Last */
+}
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
+}
+
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
new file mode 100644
index 00000000..8aad9276
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -0,0 +1,85 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_TRACE_CM0PLUS_H__
+#define __MBMUXIF_TRACE_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
+int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
+void MBMUXIF_TraceSendNotif_NoWait(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_TRACE_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
new file mode 100644
index 00000000..063d379e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -0,0 +1,510 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "radio_mbwrapper.h"
+#include "main.h"
+#include "stm32_mem.h"
+#include "mbmux_table.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_radio.h"
+#include "sys_app.h"
+
+#include "radio.h"
+#include "radio_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/**
+  * @brief local structure of radio callbacks for command processes
+  */
+static  RadioEvents_t radioevents_mbwrapper;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/*!
+ * \brief  Tx Done callback prototype.
+ */
+static void RadioTxDone_mbwrapper(void);
+
+/*!
+ * \brief  Tx Timeout callback prototype.
+ */
+static void RadioTxTimeout_mbwrapper(void);
+
+/*!
+ * \brief Rx Done callback prototype.
+ *
+ * \param[in] payload Received buffer pointer
+ * \param[in] size    Received buffer size
+ * \param[in] rssi    RSSI value computed while receiving the frame [dBm]
+ * \param[in] snr     Raw SNR value given by the radio hardware
+ *                     FSK : N/A ( set to 0 )
+ *                     LoRa: SNR value in dB
+ */
+static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
+
+/*!
+ * \brief  Rx Timeout callback prototype.
+ */
+static void RadioRxTimeout_mbwrapper(void);
+
+/*!
+ * \brief Rx Error callback prototype.
+ */
+static void RadioRxError_mbwrapper(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Radio_Cmd_1 */
+
+  /* USER CODE END Process_Radio_Cmd_1 */
+  uint32_t *com_buffer = NULL;
+  uint32_t ret_uint;
+  int32_t ret_int;
+  RadioState_t status;
+
+  APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case RADIO_INIT_ID:
+      radioevents_mbwrapper.TxDone = &RadioTxDone_mbwrapper;
+      radioevents_mbwrapper.TxTimeout = &RadioTxTimeout_mbwrapper;
+      radioevents_mbwrapper.RxDone = &RadioRxDone_mbwrapper;
+      radioevents_mbwrapper.RxTimeout = &RadioRxTimeout_mbwrapper;
+      radioevents_mbwrapper.RxError = &RadioRxError_mbwrapper;
+
+      Radio.Init(&radioevents_mbwrapper);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_GET_STATUS_ID:
+      status = Radio.GetStatus();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status; /* */
+      break;
+
+    case RADIO_SET_MODEM_ID:
+      Radio.SetModem((RadioModems_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_CHANNEL_ID:
+      Radio.SetChannel((uint32_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_IS_CHANNEL_FREE_ID:
+      ret_uint = Radio.IsChannelFree(com_buffer[0], com_buffer[1], (int16_t) com_buffer[2], com_buffer[3]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_RANDOM_ID:
+      ret_uint = Radio.Random();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_SET_RX_CONFIG_ID:
+      Radio.SetRxConfig((RadioModems_t) com_buffer[0],  com_buffer[1],
+                        com_buffer[2], (uint8_t) com_buffer[3],
+                        com_buffer[4], (uint16_t) com_buffer[5],
+                        (uint16_t) com_buffer[6], (bool) com_buffer[7],
+                        (uint8_t) com_buffer[8],
+                        (bool) com_buffer[9], (bool) com_buffer[10], (uint8_t) com_buffer[11],
+                        (bool) com_buffer[12], (bool) com_buffer[13]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_TX_CONFIG_ID:
+      Radio.SetTxConfig((RadioModems_t) com_buffer[0], (int8_t) com_buffer[1],
+                        com_buffer[2], com_buffer[3],  com_buffer[4],
+                        (uint8_t) com_buffer[5], (uint16_t) com_buffer[6],
+                        (bool) com_buffer[7], (bool) com_buffer[8], (bool) com_buffer[9],
+                        (uint8_t) com_buffer[10], (bool) com_buffer[11],  com_buffer[12]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_CHECK_RF_FREQUENCY_ID:
+      ret_uint = Radio.CheckRfFrequency(com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_GET_TIME_ON_AIR_ID:
+      ret_uint = Radio.TimeOnAir((RadioModems_t) com_buffer[0], (uint32_t) com_buffer[1],
+                                 (uint32_t) com_buffer[2], (uint8_t) com_buffer[3],
+                                 (uint16_t) com_buffer[4], (bool) com_buffer[5],
+                                 (uint8_t) com_buffer[6], (bool) com_buffer[7]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_SEND_ID:
+      Radio.Send((uint8_t *) com_buffer[0], (uint8_t) com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SLEEP_ID:
+      Radio.Sleep();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_STANDBY_ID:
+      Radio.Standby();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_RX_ID:
+      Radio.Rx(com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_START_CAD_ID:
+      Radio.StartCad();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_TX_CONTINUOUS_WAVE_ID:
+      Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_RSSI_ID:
+      ret_int =  Radio.Rssi((RadioModems_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_int; /* */
+      break;
+
+    case RADIO_WRITE_ID:
+      Radio.Write((uint16_t) com_buffer[0], (uint8_t) com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_READ_ID:
+      ret_uint = Radio.Read((uint16_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_WRITE_BUFFER_ID:
+      Radio.WriteRegisters((uint16_t) com_buffer[0], (uint8_t *) com_buffer[1], (uint8_t) com_buffer[2]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_READ_BUFFER_ID:
+      Radio.ReadRegisters((uint16_t) com_buffer[0], (uint8_t *) com_buffer[1], (uint8_t) com_buffer[2]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_MAX_PAYLOAD_LENGTH_ID:
+      Radio.SetMaxPayloadLength((RadioModems_t) com_buffer[0], (uint8_t) com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_PUBLIC_NETWORK_ID:
+      Radio.SetPublicNetwork((bool) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_GET_WAKEUP_TIME_ID:
+      ret_uint = Radio.GetWakeupTime();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_IRQ_PROCESS_ID:
+      Radio.IrqProcess();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_RX_BOOSTED_ID:
+      Radio.RxBoosted(com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_RX_DUTY_CYCLE_ID:
+      Radio.SetRxDutyCycle(com_buffer[0], com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_TX_CW_ID:
+      Radio.TxCw((int8_t)com_buffer[0]);
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_TX_PRBS_ID:
+      Radio.TxPrbs();
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_RX_GENERIC_CONFIG_ID:
+      ret_uint = Radio.RadioSetRxGenericConfig((GenericModems_t) com_buffer[0], (RxConfigGeneric_t *)com_buffer[1], com_buffer[2], com_buffer[3]);
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_SET_TX_GENERIC_CONFIG_ID:
+      ret_uint = Radio.RadioSetTxGenericConfig((GenericModems_t) com_buffer[0], (TxConfigGeneric_t *)com_buffer[1], (int8_t) com_buffer[2], (uint32_t) com_buffer[3]);
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_H, "<CM0PLUS(Radio)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID);
+  /* USER CODE BEGIN Process_Radio_Cmd_2 */
+
+  /* USER CODE END Process_Radio_Cmd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void RadioTxDone_mbwrapper(void)
+{
+  /* USER CODE BEGIN RadioTxDone_mbwrapper_1 */
+
+  /* USER CODE END RadioTxDone_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_TX_DONE_CB_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioTxDone_mbwrapper_2 */
+
+  /* USER CODE END RadioTxDone_mbwrapper_2 */
+}
+
+static void RadioTxTimeout_mbwrapper(void)
+{
+  /* USER CODE BEGIN RadioTxTimeout_mbwrapper_1 */
+
+  /* USER CODE END RadioTxTimeout_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_TX_TIMEOUT_CB_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioTxTimeout_mbwrapper_2 */
+
+  /* USER CODE END RadioTxTimeout_mbwrapper_2 */
+}
+
+static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
+{
+  /* USER CODE BEGIN RadioRxDone_mbwrapper_1 */
+
+  /* USER CODE END RadioRxDone_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL ;
+  uint16_t i = 0;
+
+  /* copy data from Cm0 private memory to shared memory */
+  if (payload != NULL)
+  {
+    UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  }
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_RX_DONE_CB_ID;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (payload == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  }
+  com_buffer[i++] = (uint32_t) size;
+  com_buffer[i++] = (uint32_t) rssi;
+  com_buffer[i++] = (uint32_t) snr;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
+     this might be requested just if the buffer should be processed by the application and the stack */
+  /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
+  return;
+  /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
+
+  /* USER CODE END RadioRxDone_mbwrapper_2 */
+}
+
+static void RadioRxTimeout_mbwrapper(void)
+{
+  /* USER CODE BEGIN RadioRxTimeout_mbwrapper_1 */
+
+  /* USER CODE END RadioRxTimeout_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_RX_TIMEOUT_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioRxTimeout_mbwrapper_2 */
+
+  /* USER CODE END RadioRxTimeout_mbwrapper_2 */
+}
+
+static void RadioRxError_mbwrapper(void)
+{
+  /* USER CODE BEGIN RadioRxError_mbwrapper_1 */
+
+  /* USER CODE END RadioRxError_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_RX_ERROR_CB_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioRxError_mbwrapper_2 */
+
+  /* USER CODE END RadioRxError_mbwrapper_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
new file mode 100644
index 00000000..ac6a70d3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0PLUS side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
+#define __RADIO_MBWRAPPER_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__RADIO_MBWRAPPER_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
new file mode 100644
index 00000000..2e8c37f3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    adc.h
+  * @brief   This file contains all the function prototypes for
+  *          the adc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __ADC_H__
+#define __ADC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern ADC_HandleTypeDef hadc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_ADC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
new file mode 100644
index 00000000..5c2a2568
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h
@@ -0,0 +1,104 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    adc_if.h
+  * @author  MCD Application Team
+  * @brief   Header for ADC interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __ADC_IF_H__
+#define __ADC_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Battery level in mV
+  */
+#define BAT_CR2032                  ((uint32_t) 3000)
+/**
+  * @brief Maximum battery level in mV
+  */
+#define VDD_BAT                     BAT_CR2032
+/**
+  * @brief Minimum battery level in mV
+  */
+#define VDD_MIN                     1800
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief  Initializes the ADC input
+  */
+void SYS_InitMeasurement(void);
+
+/**
+  * @brief DeInitializes the ADC
+  */
+void SYS_DeInitMeasurement(void);
+
+/**
+  * @brief  Get the current temperature
+  * @return value temperature in degree Celsius( q7.8 )
+  */
+int16_t SYS_GetTemperatureLevel(void);
+
+/**
+  * @brief Get the current battery level
+  * @return value battery level in linear scale
+  */
+uint16_t SYS_GetBatteryLevel(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
new file mode 100644
index 00000000..59a26f2e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    dma.h
+  * @brief   This file contains all the function prototypes for
+  *          the dma.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __DMA_H__
+#define __DMA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* DMA memory to memory transfer handles -------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_DMA_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DMA_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
new file mode 100644
index 00000000..3dbeb3d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.h
+  * @brief   This file contains all the function prototypes for
+  *          the ipcc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_H__
+#define __IPCC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern IPCC_HandleTypeDef hipcc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_IPCC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
new file mode 100644
index 00000000..e891e529
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h
@@ -0,0 +1,109 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains the interface of the ipcc driver on CM4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_IF_CM4_H__
+#define __IPCC_IF_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "ipcc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Initialize IPCC and register upper and downer callbacks
+  * @param  IPCC_IF_ResponseRcv_cb     response callback
+  * @param  IPCC_IF_NotificationRcv_cb notification callback
+  */
+void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
+
+/**
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
+
+/**
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
+
+/**
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
+
+/**
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_AcknowledgeSnd(uint32_t channelIdx);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_IF_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
new file mode 100644
index 00000000..14990858
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h
@@ -0,0 +1,91 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.h
+  * @brief          : Header for main.c file.
+  *                   This file contains the common defines of the application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+#define RTC_N_PREDIV_S 10
+#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define BUT1_Pin GPIO_PIN_0
+#define BUT1_GPIO_Port GPIOA
+#define BUT1_EXTI_IRQn EXTI0_IRQn
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define BUT2_Pin GPIO_PIN_1
+#define BUT2_GPIO_Port GPIOA
+#define BUT2_EXTI_IRQn EXTI1_IRQn
+#define USARTx_RX_Pin GPIO_PIN_3
+#define USARTx_RX_GPIO_Port GPIOA
+#define USARTx_TX_Pin GPIO_PIN_2
+#define USARTx_TX_GPIO_Port GPIOA
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
new file mode 100644
index 00000000..2386cd7f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    platform.h
+  * @author  MCD Application Team
+  * @brief   Header for General HW instances configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+
+#define USE_BSP_DRIVER
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdbool.h>
+#include "stm32wlxx.h"
+#include "main.h"
+#include "stm32wlxx_ll_gpio.h"
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP.  */
+/* In order to use BSP, users can add the BSP files in the IDE project space */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  */
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_nucleo_radio.h"
+#endif /* defined(USE_BSP_DRIVER) */
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PLATFORM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
new file mode 100644
index 00000000..cbe62fa1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h
@@ -0,0 +1,102 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Low Power Manager interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_LPM_IF_H__
+#define __STM32_LPM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_lpm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Enters Low Power Off Mode
+  */
+void PWR_EnterOffMode(void);
+
+/**
+  * @brief Exits Low Power Off Mode
+  */
+void PWR_ExitOffMode(void);
+
+/**
+  * @brief Enters Low Power Stop Mode
+  * @note ARM exists the function when waking up
+  */
+void PWR_EnterStopMode(void);
+
+/**
+  * @brief Exits Low Power Stop Mode
+  * @note Enable the pll at 32MHz
+  */
+void PWR_ExitStopMode(void);
+
+/**
+  * @brief Enters Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_EnterSleepMode(void);
+
+/**
+  * @brief Exits Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_ExitSleepMode(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_LPM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..2fffde50
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,338 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+/*#define HAL_COMP_MODULE_ENABLED   */
+/*#define HAL_CRC_MODULE_ENABLED   */
+/*#define HAL_CRYP_MODULE_ENABLED   */
+/*#define HAL_DAC_MODULE_ENABLED   */
+/*#define HAL_GTZC_MODULE_ENABLED   */
+/*#define HAL_HSEM_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED   */
+/*#define HAL_I2S_MODULE_ENABLED   */
+#define HAL_IPCC_MODULE_ENABLED
+/*#define HAL_IRDA_MODULE_ENABLED   */
+/*#define HAL_IWDG_MODULE_ENABLED   */
+/*#define HAL_LPTIM_MODULE_ENABLED   */
+/*#define HAL_PKA_MODULE_ENABLED   */
+/*#define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+/*#define HAL_SUBGHZ_MODULE_ENABLED   */
+/*#define HAL_TIM_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..85471606
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+ ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32WLxx_IT_H
+#define __STM32WLxx_IT_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+void EXTI0_IRQHandler(void);
+void EXTI1_IRQHandler(void);
+void DMA1_Channel5_IRQHandler(void);
+void USART2_IRQHandler(void);
+void IPCC_C1_RX_IRQHandler(void);
+void IPCC_C1_TX_IRQHandler(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
new file mode 100644
index 00000000..59d790a6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h
@@ -0,0 +1,111 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for sys_app.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_APP_H__
+#define __SYS_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmux_table.h"
+#include "sys_conf.h"
+#include "stm32_adv_trace.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#define APP_PPRINTF(...)  do{ } while( UTIL_ADV_TRACE_OK \
+                              != UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__) ) /* Polling Mode */
+#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
+#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+
+#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
+#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
+#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
+#define APP_LOG(TS,VL,...)
+#else
+#error "APP_LOG_ENABLED not defined or out of range <0,1>"
+#endif /* APP_LOG_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
+  */
+void SystemApp_Init(void);
+
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
+void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
+
+/**
+  * @brief  callback to get the battery level in % of full charge (254 full charge, 0 no charge)
+  * @retval battery level
+  */
+uint8_t GetBatteryLevel(void);
+
+/**
+  * @brief  callback to get the current temperature in the MCU
+  * @retval temperature level
+  */
+uint16_t GetTemperatureLevel(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_APP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
new file mode 100644
index 00000000..a2f39fa4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h
@@ -0,0 +1,99 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_conf.h
+  * @author  MCD Application Team
+  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_CONF_H__
+#define __SYS_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/**
+  * @brief Temperature and pressure values are retrieved from sensors shield
+  *        (instead of sending dummy values). It requires MEMS IKS shield
+  */
+#define SENSOR_ENABLED              0
+
+/**
+  * @brief CM4 Verbose level for all trace logs
+  */
+#define VERBOSE_LEVEL               VLEVEL_M
+
+/**
+  * @brief Enable trace logs
+  */
+#define APP_LOG_ENABLED             1
+
+/**
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
+  */
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
+
+/**
+  * @brief Disable Low Power mode
+  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
+  */
+#define LOW_POWER_DISABLE           0
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
new file mode 100644
index 00000000..fc37f342
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h
@@ -0,0 +1,98 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_sensors.h
+  * @author  MCD Application Team
+  * @brief   Header for sensors application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SENSORS_H__
+#define __SENSORS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Sensor data parameters
+  */
+typedef struct
+{
+  float pressure;         /*!< in mbar */
+  float temperature;      /*!< in degC */
+  float humidity;         /*!< in % */
+  int32_t latitude;       /*!< latitude converted to binary */
+  int32_t longitude ;     /*!< longitude converted to binary */
+  int16_t altitudeGps;    /*!< in m */
+  int16_t altitudeBar ;   /*!< in m * 10 */
+  /**more may be added*/
+  /* USER CODE BEGIN sensor_t */
+
+  /* USER CODE END sensor_t */
+} sensor_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
+#define HTS221_0    0U
+#define LPS22HB_0   1U
+#endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  initialize the environmental sensor
+  */
+int32_t EnvSensors_Init(void);
+
+/**
+  * @brief  Environmental sensor  read.
+  * @param  sensor_data sensor data
+  */
+int32_t EnvSensors_Read(sensor_t *sensor_data);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SENSORS_H__ */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h
new file mode 100644
index 00000000..3bbde030
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h
@@ -0,0 +1,174 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.h
+  * @author  MCD Application Team
+  * @brief  configuration of the timer_if.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_IF_H__
+#define __TIMER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+#include "stm32_systime.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Init RTC hardware
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_Init(void);
+
+/**
+  * @brief Set the alarm
+  * @note The alarm is set at timeout from timer Reference (TimerContext)
+  * @param timeout Duration of the Timer in ticks
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout);
+
+/**
+  * @brief Stop the Alarm
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void);
+
+/**
+  * @brief set timer Reference (TimerContext)
+  * @return  Timer Reference Value in  Ticks
+  */
+uint32_t TIMER_IF_SetTimerContext(void);
+
+/**
+  * @brief Get the RTC timer Reference
+  * @return Timer Value in  Ticks
+  */
+uint32_t TIMER_IF_GetTimerContext(void);
+
+/**
+  * @brief Get the timer elapsed time since timer Reference (TimerContext) was set
+  * @return RTC Elapsed time in ticks
+  */
+uint32_t TIMER_IF_GetTimerElapsedTime(void);
+
+/**
+  * @brief Get the timer value
+  * @return RTC Timer value in ticks
+  */
+uint32_t TIMER_IF_GetTimerValue(void);
+
+/**
+  * @brief Return the minimum timeout in ticks the RTC is able to handle
+  * @return minimum value for a timeout in ticks
+  */
+uint32_t TIMER_IF_GetMinimumTimeout(void);
+
+/**
+  * @brief a delay of delay ms by polling RTC
+  * @param delay in ms
+  */
+void TIMER_IF_DelayMs(uint32_t delay);
+
+/**
+  * @brief converts time in ms to time in ticks
+  * @param[in] timeMilliSec time in milliseconds
+  * @return time in timer ticks
+  */
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec);
+
+/**
+  * @brief converts time in ticks to time in ms
+  * @param[in] tick time in timer ticks
+  * @return time in timer milliseconds
+  */
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick);
+
+/**
+  * @brief Get rtc time
+  * @param[out] subSeconds in ticks
+  * @return time seconds
+  */
+uint32_t TIMER_IF_GetTime(uint16_t *subSeconds);
+
+/**
+  * @brief write seconds in backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @param[in] Seconds time in seconds
+  */
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds);
+
+/**
+  * @brief reads seconds from backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @return Time in seconds
+  */
+uint32_t TIMER_IF_BkUp_Read_Seconds(void);
+
+/**
+  * @brief writes SubSeconds in backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @param[in] SubSeconds time in SubSeconds
+  */
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds);
+
+/**
+  * @brief reads SubSeconds from backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @return Time in SubSeconds
+  */
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
new file mode 100644
index 00000000..20bb5dfa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    usart.h
+  * @brief   This file contains all the function prototypes for
+  *          the usart.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_H__
+#define __USART_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern UART_HandleTypeDef huart2;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_USART2_UART_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
new file mode 100644
index 00000000..b1ed2355
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.h
+  * @author  MCD Application Team
+  * @brief   Header for USART interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#include "stm32_adv_trace.h"
+#include "usart.h"
+#include "dma.h"
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_IF_H__
+#define __USART_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init the UART and associated DMA.
+  * @param  cb TxCpltCallback
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *));
+
+/**
+  * @brief  init receiver of vcom
+  * @param  RxCb callback when Rx char is received
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error));
+
+/**
+  * @brief  DeInit the UART and associated DMA.
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom in polling mode
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  */
+void vcom_Trace(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom using DMA
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  last byte has been sent on the uart line
+  */
+void vcom_IRQHandler(void);
+
+/**
+  * @brief  last byte has been sent from memory to uart data register
+  */
+void vcom_DMA_TX_IRQHandler(void);
+
+/**
+  * @brief  Resume the UART and associated DMA (used by LPM)
+  */
+void vcom_Resume(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
new file mode 100644
index 00000000..ebd9cc7a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h
@@ -0,0 +1,179 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for configuration file to utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_CONF_H__
+#define __UTILITIES_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "cmsis_compiler.h"
+
+/* definitions to be provided to "sequencer" utility */
+#include "stm32_mem.h"
+/* definition and callback for tiny_vsnprintf */
+#include "stm32_tiny_vsnprintf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*                             sequencer configuration                       */
+/*---------------------------------------------------------------------------*/
+/**
+  * @brief Sequencer flag reserved for future use
+  */
+#define UTIL_SEQ_RFU 0
+
+/**
+  * @brief default number of tasks configured in sequencer
+  */
+#define SEQ_CONF_TASK_NBR    3
+
+/**
+  * @brief default value of priority task
+  */
+#define SEQ_CONF_PRIO_NBR    1
+
+#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
+#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
+                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
+#define VLEVEL_L 1       /*!< just essential traces */
+#define VLEVEL_M 2       /*!< functional traces */
+#define VLEVEL_H 3       /*!< all traces */
+
+#define TS_OFF 0         /*!< Log without TimeStamp */
+#define TS_ON 1          /*!< Log with TimeStamp */
+
+#define T_REG_OFF  0     /*!< Log without bitmask */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Memory placement macro
+  */
+#if defined(__CC_ARM)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
+#elif defined(__ICCARM__)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#else  /* __GNUC__ */
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+
+/**
+  * @brief Memory alignment macro
+  */
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* WIN32 */
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
+
+/**
+  * @brief Memset utilities interface to application
+  */
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTILS_ENTER_CRITICAL_SECTION() uint32_t primask_bit= __get_PRIMASK();\
+  __disable_irq()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTILS_EXIT_CRITICAL_SECTION()  __set_PRIMASK(primask_bit)
+
+/******************************************************************************
+  * trace\advanced
+  * the define option
+  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
+  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
+  *
+  ******************************************************************************/
+
+#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
+#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
+#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
+#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
+#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
+#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (512U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (1024U)                               /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
+#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UTILITIES_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
new file mode 100644
index 00000000..f79689ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h
@@ -0,0 +1,139 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_def.h
+  * @author  MCD Application Team
+  * @brief   Definitions for modules requiring utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_DEF_H__
+#define __UTILITIES_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/******************************************************************************
+  * LOW POWER MANAGER
+  ******************************************************************************/
+/**
+  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+  * It lists a bit mapping of all user of the Low Power Manager
+  */
+typedef enum
+{
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
+  CFG_LPM_APPLI_Id,
+  CFG_LPM_UART_TX_Id,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/*---------------------------------------------------------------------------*/
+/*                             sequencer definitions                         */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * This is the list of priority required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Prio_0,
+  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
+
+  /* USER CODE END CFG_SEQ_Prio_Id_t */
+  CFG_SEQ_Prio_NBR,
+} CFG_SEQ_Prio_Id_t;
+
+/**
+  * This is the list of task id required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  /* CM4 */
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t_0 */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t_0 */
+  CFG_SEQ_Task_MbSystemNotifRcv,
+  CFG_SEQ_Task_MbLoRaNotifRcv,
+  CFG_SEQ_Task_MbRadioNotifRcv,
+  CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent,
+  CFG_SEQ_Task_MbLmHandlerProcess,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t */
+  CFG_SEQ_Task_NBR
+} CFG_SEQ_Task_Id_t;
+
+/**
+  * This is a bit mapping over 32bits listing all events id supported in the application
+  */
+typedef enum
+{
+  /* CM4 */
+  CFG_SEQ_Evt_MbSystemRespRcv,
+  CFG_SEQ_Evt_MbKmsRespRcv,
+  CFG_SEQ_Evt_MbLoRaRespRcv,
+  CFG_SEQ_Evt_MbRadioRespRcv,
+  /* USER CODE BEGIN CFG_SEQ_IdleEvt_Id_t */
+
+  /* USER CODE END CFG_SEQ_IdleEvt_Id_t */
+  CFG_SEQ_Evt_NBR
+} CFG_SEQ_IdleEvt_Id_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UTILITIES_DEF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
new file mode 100644
index 00000000..d6f3988c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c
@@ -0,0 +1,107 @@
+/**
+  ******************************************************************************
+  * @file    adc.c
+  * @brief   This file provides code for the configuration
+  *          of the ADC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+ADC_HandleTypeDef hadc;
+
+/* ADC init function */
+void MX_ADC_Init(void)
+{
+
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
+  /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
+  */
+  hadc.Instance = ADC;
+  hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
+  hadc.Init.Resolution = ADC_RESOLUTION_12B;
+  hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
+  hadc.Init.ScanConvMode = ADC_SCAN_DISABLE;
+  hadc.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
+  hadc.Init.LowPowerAutoWait = DISABLE;
+  hadc.Init.LowPowerAutoPowerOff = DISABLE;
+  hadc.Init.ContinuousConvMode = DISABLE;
+  hadc.Init.NbrOfConversion = 1;
+  hadc.Init.DiscontinuousConvMode = DISABLE;
+  hadc.Init.ExternalTrigConv = ADC_SOFTWARE_START;
+  hadc.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
+  hadc.Init.DMAContinuousRequests = DISABLE;
+  hadc.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
+  hadc.Init.SamplingTimeCommon1 = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.SamplingTimeCommon2 = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.OversamplingMode = DISABLE;
+  hadc.Init.TriggerFrequencyMode = ADC_TRIGGER_FREQ_HIGH;
+  if (HAL_ADC_Init(&hadc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
+
+}
+
+void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC)
+  {
+  /* USER CODE BEGIN ADC_MspInit 0 */
+
+  /* USER CODE END ADC_MspInit 0 */
+    /* ADC clock enable */
+    __HAL_RCC_ADC_CLK_ENABLE();
+  /* USER CODE BEGIN ADC_MspInit 1 */
+
+  /* USER CODE END ADC_MspInit 1 */
+  }
+}
+
+void HAL_ADC_MspDeInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC)
+  {
+  /* USER CODE BEGIN ADC_MspDeInit 0 */
+
+  /* USER CODE END ADC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_ADC_CLK_DISABLE();
+  /* USER CODE BEGIN ADC_MspDeInit 1 */
+
+  /* USER CODE END ADC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
new file mode 100644
index 00000000..75af32ca
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c
@@ -0,0 +1,230 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    adc_if.c
+  * @author  MCD Application Team
+  * @brief   Read status related to the chip (battery level, VREF, chip temperature)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "adc_if.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief ADC handle
+  */
+extern ADC_HandleTypeDef hadc;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define TEMPSENSOR_TYP_CAL1_V          (( int32_t)  760)        /*!< Internal temperature sensor, parameter V30 (unit: mV). Refer to device datasheet for min/typ/max values. */
+#define TEMPSENSOR_TYP_AVGSLOPE        (( int32_t) 2500)        /*!< Internal temperature sensor, parameter Avg_Slope (unit: uV/DegCelsius). Refer to device datasheet for min/typ/max values. */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief This function reads the ADC channel
+  * @param channel channel number to read
+  * @return adc measured level value
+  */
+static uint32_t ADC_ReadChannels(uint32_t channel);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void SYS_InitMeasurement(void)
+{
+  /* USER CODE BEGIN SYS_InitMeasurement_1 */
+
+  /* USER CODE END SYS_InitMeasurement_1 */
+  hadc.Instance = ADC;
+  /* USER CODE BEGIN SYS_InitMeasurement_2 */
+
+  /* USER CODE END SYS_InitMeasurement_2 */
+}
+
+void SYS_DeInitMeasurement(void)
+{
+  /* USER CODE BEGIN SYS_DeInitMeasurement_1 */
+
+  /* USER CODE END SYS_DeInitMeasurement_1 */
+}
+
+int16_t SYS_GetTemperatureLevel(void)
+{
+  /* USER CODE BEGIN SYS_GetTemperatureLevel_1 */
+
+  /* USER CODE END SYS_GetTemperatureLevel_1 */
+  int16_t temperatureDegreeC = 0;
+  uint32_t measuredLevel = 0;
+  uint16_t batteryLevelmV = SYS_GetBatteryLevel();
+
+  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_TEMPSENSOR);
+
+  /* convert ADC level to temperature */
+  /* check whether device has temperature sensor calibrated in production */
+  if (((int32_t)*TEMPSENSOR_CAL2_ADDR - (int32_t)*TEMPSENSOR_CAL1_ADDR) != 0)
+  {
+    /* Device with temperature sensor calibrated in production:
+       use device optimized parameters */
+    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE(batteryLevelmV,
+                                                   measuredLevel,
+                                                   LL_ADC_RESOLUTION_12B);
+  }
+  else
+  {
+    /* Device with temperature sensor not calibrated in production:
+       use generic parameters */
+    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE_TYP_PARAMS(TEMPSENSOR_TYP_AVGSLOPE,
+                                                              TEMPSENSOR_TYP_CAL1_V,
+                                                              TEMPSENSOR_CAL1_TEMP,
+                                                              batteryLevelmV,
+                                                              measuredLevel,
+                                                              LL_ADC_RESOLUTION_12B);
+  }
+
+  APP_LOG(TS_ON, VLEVEL_L, "temp= %d\n\r", temperatureDegreeC);
+
+  /* from int16 to q8.7*/
+  temperatureDegreeC <<= 8;
+
+  return (int16_t) temperatureDegreeC;
+  /* USER CODE BEGIN SYS_GetTemperatureLevel_2 */
+
+  /* USER CODE END SYS_GetTemperatureLevel_2 */
+}
+
+uint16_t SYS_GetBatteryLevel(void)
+{
+  /* USER CODE BEGIN SYS_GetBatteryLevel_1 */
+
+  /* USER CODE END SYS_GetBatteryLevel_1 */
+  uint16_t batteryLevelmV = 0;
+  uint32_t measuredLevel = 0;
+
+  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_VREFINT);
+
+  if (measuredLevel == 0)
+  {
+    batteryLevelmV = 0;
+  }
+  else
+  {
+    if ((uint32_t)*VREFINT_CAL_ADDR != (uint32_t)0xFFFFU)
+    {
+      /* Device with Reference voltage calibrated in production:
+         use device optimized parameters */
+      batteryLevelmV = __LL_ADC_CALC_VREFANALOG_VOLTAGE(measuredLevel,
+                                                        ADC_RESOLUTION_12B);
+    }
+    else
+    {
+      /* Device with Reference voltage not calibrated in production:
+         use generic parameters */
+      batteryLevelmV = (VREFINT_CAL_VREF * 1510) / measuredLevel;
+    }
+  }
+
+  return batteryLevelmV;
+  /* USER CODE BEGIN SYS_GetBatteryLevel_2 */
+
+  /* USER CODE END SYS_GetBatteryLevel_2 */
+}
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+static uint32_t ADC_ReadChannels(uint32_t channel)
+{
+  /* USER CODE BEGIN ADC_ReadChannels_1 */
+
+  /* USER CODE END ADC_ReadChannels_1 */
+  uint32_t ADCxConvertedValues = 0;
+  ADC_ChannelConfTypeDef sConfig = {0};
+
+  MX_ADC_Init();
+
+  /* Start Calibration */
+  if (HAL_ADCEx_Calibration_Start(&hadc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* Configure Regular Channel */
+  sConfig.Channel = channel;
+  sConfig.Rank = ADC_REGULAR_RANK_1;
+  sConfig.SamplingTime = ADC_SAMPLINGTIME_COMMON_1;
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  if (HAL_ADC_Start(&hadc) != HAL_OK)
+  {
+    /* Start Error */
+    Error_Handler();
+  }
+  /** Wait for end of conversion */
+  HAL_ADC_PollForConversion(&hadc, HAL_MAX_DELAY);
+
+  /** Wait for end of conversion */
+  HAL_ADC_Stop(&hadc) ;   /* it calls also ADC_Disable() */
+
+  ADCxConvertedValues = HAL_ADC_GetValue(&hadc);
+
+  HAL_ADC_DeInit(&hadc);
+
+  return ADCxConvertedValues;
+  /* USER CODE BEGIN ADC_ReadChannels_2 */
+
+  /* USER CODE END ADC_ReadChannels_2 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
new file mode 100644
index 00000000..b93bda5c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    dma.c
+  * @brief   This file provides code for the configuration
+  *          of all the requested memory to memory DMA transfers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "dma.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/*----------------------------------------------------------------------------*/
+/* Configure DMA                                                              */
+/*----------------------------------------------------------------------------*/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/**
+  * Enable DMA controller clock
+  */
+void MX_DMA_Init(void)
+{
+
+  /* DMA controller clock enable */
+  __HAL_RCC_DMAMUX1_CLK_ENABLE();
+  __HAL_RCC_DMA1_CLK_ENABLE();
+
+  /* DMA interrupt init */
+  /* DMA1_Channel5_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+
+}
+
+/* USER CODE BEGIN 2 */
+
+/* USER CODE END 2 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
new file mode 100644
index 00000000..fdcbc616
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c
@@ -0,0 +1,97 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.c
+  * @brief   This file provides code for the configuration
+  *          of the IPCC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "ipcc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+IPCC_HandleTypeDef hipcc;
+
+/* IPCC init function */
+void MX_IPCC_Init(void)
+{
+
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
+  hipcc.Instance = IPCC;
+  if (HAL_IPCC_Init(&hipcc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
+
+}
+
+void HAL_IPCC_MspInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspInit 0 */
+
+  /* USER CODE END IPCC_MspInit 0 */
+    /* IPCC clock enable */
+    __HAL_RCC_IPCC_CLK_ENABLE();
+
+    /* IPCC interrupt Init */
+    HAL_NVIC_SetPriority(IPCC_C1_RX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn);
+    HAL_NVIC_SetPriority(IPCC_C1_TX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspInit 1 */
+
+  /* USER CODE END IPCC_MspInit 1 */
+  }
+}
+
+void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspDeInit 0 */
+
+  /* USER CODE END IPCC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_IPCC_CLK_DISABLE();
+
+    /* IPCC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(IPCC_C1_RX_IRQn);
+    HAL_NVIC_DisableIRQ(IPCC_C1_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspDeInit 1 */
+
+  /* USER CODE END IPCC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
new file mode 100644
index 00000000..672a366f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c
@@ -0,0 +1,206 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.c
+  * @author  MCD Application Team
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+
+/*ipcc interface for M4*/
+#include "assert.h"
+#include "stddef.h"
+#include "ipcc_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static void (*IpccResponseRcv)(uint32_t channelIdx);
+
+static void (*IpccNotificationRcv)(uint32_t channelIdx);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ confirmation of a received message by remote CPU
+  */
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ notification request by remote CPU
+  */
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx))
+{
+  /* USER CODE BEGIN IPCC_IF_Init_1 */
+
+  /* USER CODE END IPCC_IF_Init_1 */
+  /*Initialize the ipcc, initialize MSP*/
+  MX_IPCC_Init();
+
+  /* IPCC EXTI (AIEC) line for CPU1  */
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
+  LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
+
+  /* Initialize IPCC callback of all channels*/
+  for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
+  {
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
+  }
+
+  /* Registers upper level (application) callback */
+  IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
+  IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
+  return;
+  /* USER CODE BEGIN IPCC_IF_Init_2 */
+
+  /* USER CODE END IPCC_IF_Init_2 */
+}
+
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_1 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX);
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_2 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_2 */
+}
+
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_1 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX);
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_2 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_2 */
+}
+
+int32_t IPCC_IF_CommandSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CommandSnd_1 */
+
+  /* USER CODE END IPCC_IF_CommandSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_CommandSnd_2 */
+
+  /* USER CODE END IPCC_IF_CommandSnd_2 */
+}
+
+int32_t IPCC_IF_AcknowledgeSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_AcknowledgeSnd_1 */
+
+  /* USER CODE END IPCC_IF_AcknowledgeSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_AcknowledgeSnd_2 */
+
+  /* USER CODE END IPCC_IF_AcknowledgeSnd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrTxCb_1 */
+
+  /* USER CODE END IpccIfIsrTxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccResponseRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrTxCb_2 */
+
+  /* USER CODE END IpccIfIsrTxCb_2 */
+}
+
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrRxCb_1 */
+
+  /* USER CODE END IpccIfIsrRxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccNotificationRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrRxCb_2 */
+
+  /* USER CODE END IpccIfIsrRxCb_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
new file mode 100644
index 00000000..39c26a02
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c
@@ -0,0 +1,189 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "app_lorawan.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_LoRaWAN_Init();
+  /* USER CODE BEGIN 2 */
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE END WHILE */
+    MX_LoRaWAN_Process();
+
+    /* USER CODE BEGIN 3 */
+  }
+  /* USER CODE END 3 */
+}
+
+/**
+  * @brief System Clock Configuration
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+
+  /** Configure LSE Drive Capability
+  */
+  HAL_PWR_EnableBkUpAccess();
+  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+  /** Configure the main internal regulator output voltage
+  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+  /** Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.MSIState = RCC_MSI_ON;
+  RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_11;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK3|RCC_CLOCKTYPE_HCLK2
+                              |RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  while (1)
+  {
+  }
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
new file mode 100644
index 00000000..99f840e9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c
@@ -0,0 +1,168 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.c
+  * @author  MCD Application Team
+  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "stm32_lpm.h"
+#include "stm32_lpm_if.h"
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Power driver callbacks handler
+  */
+const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
+{
+  PWR_EnterSleepMode,
+  PWR_ExitSleepMode,
+
+  PWR_EnterStopMode,
+  PWR_ExitStopMode,
+
+  PWR_EnterOffMode,
+  PWR_ExitOffMode,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void PWR_EnterOffMode(void)
+{
+  /* USER CODE BEGIN EnterOffMode_1 */
+
+  /* USER CODE END EnterOffMode_1 */
+}
+
+void PWR_ExitOffMode(void)
+{
+  /* USER CODE BEGIN ExitOffMode_1 */
+
+  /* USER CODE END ExitOffMode_1 */
+}
+
+void PWR_EnterStopMode(void)
+{
+  /* USER CODE BEGIN EnterStopMode_1 */
+
+  /* USER CODE END EnterStopMode_1 */
+  HAL_SuspendTick();
+  /* Clear Status Flag before entering STOP/STANDBY Mode */
+  LL_PWR_ClearFlag_C1STOP_C1STB();
+
+  /* USER CODE BEGIN EnterStopMode_2 */
+
+  /* USER CODE END EnterStopMode_2 */
+  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
+  /* USER CODE BEGIN EnterStopMode_3 */
+
+  /* USER CODE END EnterStopMode_3 */
+}
+
+void PWR_ExitStopMode(void)
+{
+  /* USER CODE BEGIN ExitStopMode_1 */
+
+  /* USER CODE END ExitStopMode_1 */
+  /* Resume sysTick : work around for debugger problem in dual core */
+  HAL_ResumeTick();
+  /*Not retained periph:
+    ADC interface
+    DAC interface USARTx, TIMx, i2Cx, SPIx
+    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
+
+  /* Resume not retained USARTx and DMA */
+  vcom_Resume();
+  /* USER CODE BEGIN ExitStopMode_2 */
+
+  /* USER CODE END ExitStopMode_2 */
+}
+
+void PWR_EnterSleepMode(void)
+{
+  /* USER CODE BEGIN EnterSleepMode_1 */
+
+  /* USER CODE END EnterSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_SuspendTick();
+  /* USER CODE BEGIN EnterSleepMode_2 */
+
+  /* USER CODE END EnterSleepMode_2 */
+  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+  /* USER CODE BEGIN EnterSleepMode_3 */
+
+  /* USER CODE END EnterSleepMode_3 */
+}
+
+void PWR_ExitSleepMode(void)
+{
+  /* USER CODE BEGIN ExitSleepMode_1 */
+
+  /* USER CODE END ExitSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_ResumeTick();
+
+  /* USER CODE BEGIN ExitSleepMode_2 */
+
+  /* USER CODE END ExitSleepMode_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..ea7dc033
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file         stm32wlxx_hal_msp.c
+  * @brief        This file provides code for the MSP Initialization
+  *               and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..f1215b41
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,290 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+extern IPCC_HandleTypeDef hipcc;
+extern DMA_HandleTypeDef hdma_usart2_tx;
+extern UART_HandleTypeDef huart2;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+  while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/**
+  * @brief This function handles EXTI Line 0 Interrupt.
+  */
+void EXTI0_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI0_IRQn 0 */
+
+  /* USER CODE END EXTI0_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
+  /* USER CODE BEGIN EXTI0_IRQn 1 */
+
+  /* USER CODE END EXTI0_IRQn 1 */
+}
+
+/**
+  * @brief This function handles EXTI Line 1 Interrupt.
+  */
+void EXTI1_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI1_IRQn 0 */
+
+  /* USER CODE END EXTI1_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1);
+  /* USER CODE BEGIN EXTI1_IRQn 1 */
+
+  /* USER CODE END EXTI1_IRQn 1 */
+}
+
+/**
+  * @brief This function handles DMA1 Channel 5 Interrupt.
+  */
+void DMA1_Channel5_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart2_tx);
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 1 */
+}
+
+/**
+  * @brief This function handles USART2 Interrupt.
+  */
+void USART2_IRQHandler(void)
+{
+  /* USER CODE BEGIN USART2_IRQn 0 */
+
+  /* USER CODE END USART2_IRQn 0 */
+  HAL_UART_IRQHandler(&huart2);
+  /* USER CODE BEGIN USART2_IRQn 1 */
+
+  /* USER CODE END USART2_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC RX Occupied Interrupt.
+  */
+void IPCC_C1_RX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C1_RX_IRQn 0 */
+
+  /* USER CODE END IPCC_C1_RX_IRQn 0 */
+  HAL_IPCC_RX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C1_RX_IRQn 1 */
+
+  /* USER CODE END IPCC_C1_RX_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC TX Free Interrupt.
+  */
+void IPCC_C1_TX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C1_TX_IRQn 0 */
+
+  /* USER CODE END IPCC_C1_TX_IRQn 0 */
+  HAL_IPCC_TX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C1_TX_IRQn 1 */
+
+  /* USER CODE END IPCC_C1_TX_IRQn 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
new file mode 100644
index 00000000..edf2a190
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c
@@ -0,0 +1,461 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.c
+  * @author  MCD Application Team
+  * @brief   Initializes HW and SW system entities (not related to the radio)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdio.h>
+#include "platform.h"
+#include "sys_app.h"
+#include "adc_if.h"
+#include "stm32_seq.h"
+#include "stm32_systime.h"
+#include "stm32_lpm.h"
+#include "timer_if.h"
+#include "utilities_def.h"
+#include "sys_debug.h"
+#include "sys_sensors.h"
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_radio.h"
+#include "mbmuxif_lora.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+#if ( DEBUGGER_ENABLED == 1 )
+__IO uint32_t lets_go_on = 0;
+#endif /* DEBUGGER_ENABLED */
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MAX_TS_SIZE (int) 16
+
+/**
+  * Defines the maximum battery level
+  */
+#define LORAWAN_MAX_BAT   254
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+uint32_t InstanceIndex;
+uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
+  */
+static void MBMUXIF_Init(void);
+
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
+static void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
+  */
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SystemApp_Init(void)
+{
+  /* USER CODE BEGIN SystemApp_Init_1 */
+
+  /* USER CODE END SystemApp_Init_1 */
+
+  /* Ensure that MSI is wake-up system clock */
+  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
+
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
+
+#if ( DEBUGGER_ENABLED == 1 )
+  BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
+#endif /* DEBUGGER_ENABLED */
+
+  /*Initialize the terminal */
+  UTIL_ADV_TRACE_Init();
+  UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
+
+  /*Set verbose LEVEL*/
+  UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
+  /*Initialize the temperature and Battery measurement services */
+  SYS_InitMeasurement();
+
+  /*Initialize the Sensors */
+  EnvSensors_Init();
+
+  /*Init low power manager*/
+  UTIL_LPM_Init();
+  /* Disable Stand-by mode */
+  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+
+#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
+  /* Disable Stop Mode */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+#elif !defined (LOW_POWER_DISABLE)
+#error LOW_POWER_DISABLE not defined
+#endif /* LOW_POWER_DISABLE */
+
+  /*Initialize MBMux (to be done after LPM because MBMux uses the sequencer) */
+  MBMUXIF_Init();
+
+  UTIL_TIMER_Init();
+
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
+  /* USER CODE BEGIN SystemApp_Init_2 */
+
+  /* USER CODE END SystemApp_Init_2 */
+}
+
+void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Sys_Notif_1 */
+
+  /* USER CODE END Process_Sys_Notif_1 */
+  uint32_t  notif_ack_id;
+
+  notif_ack_id = ComObj->MsgId;
+
+  switch (notif_ack_id)
+  {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
+    case SYS_OTHER_MSG_ID:
+      APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
+      /* prepare ack buffer*/
+      ComObj->ParamCnt = 0;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
+
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
+    default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
+      break;
+  }
+
+  /* Send ack*/
+  APP_LOG(TS_ON, VLEVEL_H, "CM4>(System)\r\n");
+  MBMUXIF_SystemSendAck(FEAT_INFO_SYSTEM_ID);
+  /* USER CODE BEGIN Process_Sys_Notif_2 */
+
+  /* USER CODE END Process_Sys_Notif_2 */
+}
+
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
+{
+  /**
+    * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
+    * all to process all tack except TaskId_bm
+    */
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_1 */
+  UTIL_SEQ_Run(~TaskId_bm);
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_2 */
+  return;
+}
+
+/**
+  * @brief redefines __weak function in stm32_seq.c such to enter low power
+  */
+void UTIL_SEQ_Idle(void)
+{
+  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
+
+  /* USER CODE END UTIL_SEQ_Idle_1 */
+  UTIL_LPM_EnterLowPower();
+  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
+
+  /* USER CODE END UTIL_SEQ_Idle_2 */
+}
+
+uint8_t GetBatteryLevel(void)
+{
+  uint8_t batteryLevel = 0;
+  uint16_t batteryLevelmV;
+
+  /* USER CODE BEGIN GetBatteryLevel_0 */
+
+  /* USER CODE END GetBatteryLevel_0 */
+
+  batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
+
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
+  if (batteryLevelmV > VDD_BAT)
+  {
+    batteryLevel = LORAWAN_MAX_BAT;
+  }
+  else if (batteryLevelmV < VDD_MIN)
+  {
+    batteryLevel = 0;
+  }
+  else
+  {
+    batteryLevel = (((uint32_t)(batteryLevelmV - VDD_MIN) * LORAWAN_MAX_BAT) / (VDD_BAT - VDD_MIN));
+  }
+
+  APP_LOG(TS_ON, VLEVEL_M, "VDDA= %d\r\n", batteryLevel);
+
+  /* USER CODE BEGIN GetBatteryLevel_2 */
+
+  /* USER CODE END GetBatteryLevel_2 */
+
+  return batteryLevel;  /* 1 (very low) to 254 (fully charged) */
+}
+
+uint16_t GetTemperatureLevel(void)
+{
+  uint16_t temperatureLevel = 0;
+
+  temperatureLevel = (uint16_t)(SYS_GetTemperatureLevel() / 256);
+  /* USER CODE BEGIN GetTemperatureLevel */
+
+  /* USER CODE END GetTemperatureLevel */
+  return temperatureLevel;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_Init(void)
+{
+  /* USER CODE BEGIN MBMUXIF_Init_1 */
+
+  /* USER CODE END MBMUXIF_Init_1 */
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
+  int8_t init_status;
+
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
+
+  init_status = MBMUXIF_SystemInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+
+  /* start CM0PLUS */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
+  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
+
+  /* Warn CPU2 that CPU1 is ready */
+  /* Set Cpu Event then consume it to allow next low power entry */
+  __SEV();
+  __WFE();
+
+  /* Push Button for stop the core in other to attach debugger */
+#if ( DEBUGGER_ENABLED == 1 )
+  APP_LOG(TS_ON, VLEVEL_L, "\r\nPress PushButton2 to continue \r\n");
+  while (lets_go_on == 0);
+  lets_go_on = 0;
+#endif /* DEBUGGER_ENABLED */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
+
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
+
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
+
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
+
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
+
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
+
+  init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_RTC_REGISTERED);
+  APP_LOG(TS_ON, VLEVEL_H, "System_Priority_A Registration for RTC Alarm handling completed \r\n");
+
+  init_status = MBMUXIF_TraceInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  APP_LOG(TS_ON, VLEVEL_H, "Trace registration CM4-CM0PLUS completed \r\n");
+
+  init_status = MBMUXIF_LoraInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  APP_LOG(TS_ON, VLEVEL_H, "Radio registration CM4-CM0PLUS completed \r\n");
+
+  /* USER CODE BEGIN MBMUXIF_Init_Last */
+
+  /* USER CODE END MBMUXIF_Init_Last */
+}
+
+static void TimestampNow(uint8_t *buff, uint16_t *size)
+{
+  /* USER CODE BEGIN TimestampNow_1 */
+
+  /* USER CODE END TimestampNow_1 */
+  SysTime_t curtime = SysTimeGet();
+  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
+  *size = strlen((char *)buff);
+  /* USER CODE BEGIN TimestampNow_2 */
+
+  /* USER CODE END TimestampNow_2 */
+}
+
+/* Disable StopMode when traces need to be printed */
+void UTIL_ADV_TRACE_PreSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
+}
+/* Re-enable StopMode when traces have been printed */
+void UTIL_ADV_TRACE_PostSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_2 */
+}
+
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
+{
+  /* USER CODE BEGIN tiny_snprintf_like_1 */
+
+  /* USER CODE END tiny_snprintf_like_1 */
+  va_list vaArgs;
+  va_start(vaArgs, strFormat);
+  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
+  va_end(vaArgs);
+  /* USER CODE BEGIN tiny_snprintf_like_2 */
+
+  /* USER CODE END tiny_snprintf_like_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/* HAL overload functions ---------------------------------------------------------*/
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
+{
+  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
+  /* USER CODE BEGIN HAL_InitTick_1 */
+
+  /* USER CODE END HAL_InitTick_1 */
+  return HAL_OK;
+  /* USER CODE BEGIN HAL_InitTick_2 */
+
+  /* USER CODE END HAL_InitTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+uint32_t HAL_GetTick(void)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_GetTick_1 */
+
+  /* USER CODE END HAL_GetTick_1 */
+  return TIMER_IF_GetTimerValue();
+  /* USER CODE BEGIN HAL_GetTick_2 */
+
+  /* USER CODE END HAL_GetTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+void HAL_Delay(__IO uint32_t Delay)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_Delay_1 */
+
+  /* USER CODE END HAL_Delay_1 */
+  TIMER_IF_DelayMs(Delay);
+  /* USER CODE BEGIN HAL_Delay_2 */
+
+  /* USER CODE END HAL_Delay_2 */
+}
+
+/* USER CODE BEGIN Overload_HAL_weaks */
+
+/* USER CODE END Overload_HAL_weaks */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
new file mode 100644
index 00000000..3afffff8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c
@@ -0,0 +1,268 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_sensors.c
+  * @author  MCD Application Team
+  * @brief   Manages the sensors on the application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "sys_conf.h"
+#include "sys_sensors.h"
+
+/* USER CODE BEGIN Includes */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if defined (X_NUCLEO_IKS01A2)
+#warning "IKS drivers are today available for several families but not stm32WL"
+#warning "up to the user adapt IKS low layer to map it on WL board driver"
+#warning "this code would work only if user provide necessary IKS and BSP layers"
+#include "iks01a2_env_sensors.h"
+#elif defined (X_NUCLEO_IKS01A3)
+/*
+## How to add IKS01A3 to CubeWL
+
+ 1. Download STM32CubeExpansion_MEMS1_V8.0.0
+ 2. Copy Drivers From `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3` to CubeWL `Drivers\BSP\IKS01A3` and add to the IDE Project
+ 3. Copy `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3\iks01a3_conf_template.h` into `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target\iks01a3_conf.h`.
+ 4. Copy files nucleo_l476rg_bus.c/nucleo_l476rg_bus.h  from `STM32L476RG-Nucleo\Applications\IKS01A3\ActiveTime\Inc and \Src` to `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target` and rename to `nucleo_wl55jc_bus.c` and `nucleo_wl55jc_bus.h` respectively
+ 5. Update `nucleo_wl55jc_bus.c`  include files  to
+ ```bash
+#include "nucleo_wl55jc_bus.h"
+#include "stm32wlxx_nucleo_errno.h"
+#include "stm32wlxx_hal.h"
+```
+
+6. Update definitions in `nucleo_wl55jc_bus.h`(to be commented since already defined elsewhere)
+
+ ```bash
+//#define USE_HAL_SPI_REGISTER_CALLBACKS 0
+//#define USE_HAL_I2C_REGISTER_CALLBACKS 0
+```
+
+7. copy following components and add them (.c and .h) into IDE Project
+
+../../../../../../Drivers/BSP/Components/lsm6dso
+../../../../../../Drivers/BSP/Components/lis2dw12
+../../../../../../Drivers/BSP/Components/lis2mdl
+../../../../../../Drivers/BSP/Components/hts221
+../../../../../../Drivers/BSP/Components/lps22hh
+../../../../../../Drivers/BSP/Components/stts751
+../../../../../../Drivers/BSP/Components/Common
+
+8. Enable #define HAL_I2C_MODULE_ENABLED in stm32_hal_conf.h
+9. Add stm32wlxx_hal_i2c.c and stm32wlxx_hal_i2c_ex.c in the IDE Project
+10. Update hi2c->Instance in `nucleo_wl55jc_bus.c` to
+
+```bash
+  hi2c->Instance = I2C2;
+```
+
+11. Update msp function in `nucleo_wl55jc_bus.c`
+
+```bash
+static void I2C2_MspInit(I2C_HandleTypeDef *i2cHandle)
+{
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12;
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF4_I2C2;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  __HAL_RCC_I2C2_CLK_ENABLE();
+}
+
+static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
+{
+  __HAL_RCC_I2C2_CLK_DISABLE();
+
+  HAL_GPIO_DeInit(GPIOA, GPIO_PIN_11 | GPIO_PIN_12);
+
+}
+```
+12. Replace I2C1xx by MX_I2C2xx and i2c1 by i2c2 in `nucleo_wl55jc_bus.c`
+13. Replace I2C1xx by MX_I2C2xx in `nucleo_wl55jc_bus.h`
+*/
+#warning "IKS drivers are today available for several families but not stm32WL, follow steps defined in sys_sensors.c"
+#include "iks01a3_env_sensors.h"
+#else  /* not X_IKS01xx */
+#error "user to include its sensor drivers"
+#endif  /* X_NUCLEO_IKS01xx */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+#define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
+#define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
+#define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
+#define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
+#define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
+#define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if defined (X_NUCLEO_IKS01A2)
+#warning "IKS drivers are today available for several families but not stm32WL"
+#warning "up to the user adapt IKS low layer to map it on WL board driver"
+#warning "this code would work only if user provide necessary IKS and BSP layers"
+IKS01A2_ENV_SENSOR_Capabilities_t EnvCapabilities;
+#elif defined (X_NUCLEO_IKS01A3)
+IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
+#else  /* not X_IKS01Ax */
+#error "user to include its sensor drivers"
+#endif  /* X_NUCLEO_IKS01 */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
+{
+  /* USER CODE BEGIN EnvSensors_Read */
+  float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
+  float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
+  float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
+
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
+  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_PRESSURE, &PRESSURE_Value);
+  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_PRESSURE, &PRESSURE_Value);
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+
+  sensor_data->humidity    = HUMIDITY_Value;
+  sensor_data->temperature = TEMPERATURE_Value;
+  sensor_data->pressure    = PRESSURE_Value;
+
+  sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
+  sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
+
+  return 0;
+  /* USER CODE END EnvSensors_Read */
+}
+
+int32_t  EnvSensors_Init(void)
+{
+  /* USER CODE BEGIN EnvSensors_Init */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+  /* Init */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_Init(HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_Init(LPS22HB_0, ENV_TEMPERATURE | ENV_PRESSURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_Init(IKS01A3_HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_Init(IKS01A3_LPS22HH_0, ENV_TEMPERATURE | ENV_PRESSURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+  /* Enable */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_HUMIDITY);
+  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_PRESSURE);
+  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_HUMIDITY);
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_PRESSURE);
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+  /* Get capabilities */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_GetCapabilities(HTS221_0, &EnvCapabilities);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_GetCapabilities(LPS22HB_0, &EnvCapabilities);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_HTS221_0, &EnvCapabilities);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_LPS22HH_0, &EnvCapabilities);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif /* SENSOR_ENABLED  */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
new file mode 100644
index 00000000..f02a544d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c
@@ -0,0 +1,437 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.c
+  * @author  MCD Application Team
+  * @brief   Configure RTC Alarm, Tick and Calendar manager
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "stm32_lpm.h"
+#include "utilities_def.h"
+#include "stm32wlxx_ll_rtc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief RTC handle
+  */
+RTC_HandleTypeDef hrtc;
+
+/**
+  * @brief Timer driver callbacks handler
+  */
+const UTIL_TIMER_Driver_s UTIL_TimerDriver =
+{
+  TIMER_IF_Init,
+  NULL,
+
+  TIMER_IF_StartTimer,
+  TIMER_IF_StopTimer,
+
+  TIMER_IF_SetTimerContext,
+  TIMER_IF_GetTimerContext,
+
+  TIMER_IF_GetTimerElapsedTime,
+  TIMER_IF_GetTimerValue,
+  TIMER_IF_GetMinimumTimeout,
+
+  TIMER_IF_Convert_ms2Tick,
+  TIMER_IF_Convert_Tick2ms,
+};
+
+/**
+  * @brief SysTime driver callbacks handler
+  */
+const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
+{
+  TIMER_IF_BkUp_Write_Seconds,
+  TIMER_IF_BkUp_Read_Seconds,
+  TIMER_IF_BkUp_Write_SubSeconds,
+  TIMER_IF_BkUp_Read_SubSeconds,
+  TIMER_IF_GetTime,
+};
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Minimum timeout delay of Alarm in ticks
+  */
+#define MIN_ALARM_DELAY    3
+
+/**
+  * @brief Backup seconds register
+  */
+#define RTC_BKP_SECONDS    RTC_BKP_DR0
+
+/**
+  * @brief Backup subseconds register
+  */
+#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
+
+/**
+  * @brief Backup msbticks register
+  */
+#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
+
+/* #define RTIF_DEBUG */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifdef RTIF_DEBUG
+#include "sys_app.h" /*for app_log*/
+/**
+  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
+  */
+#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+#else
+/**
+  * @brief not used
+  */
+#define TIMER_IF_DBG_PRINTF(...)
+#endif /* RTIF_DEBUG */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Indicates if the RTC is already Initialized or not
+  */
+static bool RTC_Initialized = false;
+
+/**
+  * @brief RtcTimerContext
+  */
+static uint32_t RtcTimerContext = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Get rtc timer Value in rtc tick
+  * @return val the rtc timer value (upcounting)
+  */
+static inline uint32_t GetTimerTicks(void);
+
+/**
+  * @brief Reads MSBticks from backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @retval MSBticks
+  */
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+UTIL_TIMER_Status_t TIMER_IF_Init(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_Init */
+
+  /* USER CODE END TIMER_IF_Init */
+  /** Configure the Instance */
+  hrtc.Instance = RTC;
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+  TIMER_IF_SetTimerContext();
+  RTC_Initialized = true;
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StartTimer */
+
+  /* USER CODE END TIMER_IF_StartTimer */
+  RTC_AlarmTypeDef sAlarm = {0};
+  /*Stop timer if one is already started*/
+  TIMER_IF_StopTimer();
+  timeout += RtcTimerContext;
+
+  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
+  /* starts timer*/
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
+
+  /* USER CODE END TIMER_IF_StartTimer_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StopTimer */
+
+  /* USER CODE END TIMER_IF_StopTimer */
+  /* Clear RTC Alarm Flag */
+  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRAF);
+  /* Disable the Alarm A interrupt */
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
+
+  /* USER CODE END TIMER_IF_StopTimer_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_SetTimerContext(void)
+{
+  /*store time context*/
+  RtcTimerContext = GetTimerTicks();
+
+  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
+
+  /* USER CODE END TIMER_IF_SetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerContext(void)
+{
+  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
+
+  /* USER CODE END TIMER_IF_GetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerElapsedTime(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetTimerValue(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
+
+  /* USER CODE END TIMER_IF_GetTimerValue */
+  if (RTC_Initialized == true)
+  {
+    ret = GetTimerTicks();
+  }
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetMinimumTimeout(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick */
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
+}
+
+void TIMER_IF_DelayMs(uint32_t delay)
+{
+  /* USER CODE BEGIN TIMER_IF_DelayMs */
+
+  /* USER CODE END TIMER_IF_DelayMs */
+  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
+  uint32_t timeout = GetTimerTicks();
+
+  /* Wait delay ms */
+  while (((GetTimerTicks() - timeout)) < delayTicks)
+  {
+    __NOP();
+  }
+  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
+
+  /* USER CODE END TIMER_IF_DelayMs_Last */
+}
+
+uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
+{
+  uint32_t seconds = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTime */
+
+  /* USER CODE END TIMER_IF_GetTime */
+  uint64_t ticks;
+  uint32_t timerValueLsb = GetTimerTicks();
+  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
+
+  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
+
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+
+  ticks = (uint32_t) ticks & RTC_PREDIV_S;
+
+  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
+
+  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
+}
+
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
+}
+
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
+}
+
+uint32_t TIMER_IF_BkUp_Read_Seconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
+  uint32_t MSBticks;
+  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
+  return MSBticks;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
+}
+
+static inline uint32_t GetTimerTicks(void)
+{
+  /* USER CODE BEGIN GetTimerTicks */
+
+  /* USER CODE END GetTimerTicks */
+  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
+  /* USER CODE BEGIN GetTimerTicks_Last */
+
+  /* USER CODE END GetTimerTicks_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
new file mode 100644
index 00000000..be36fe23
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c
@@ -0,0 +1,173 @@
+/**
+  ******************************************************************************
+  * @file    usart.c
+  * @brief   This file provides code for the configuration
+  *          of the USART instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+UART_HandleTypeDef huart2;
+DMA_HandleTypeDef hdma_usart2_tx;
+
+/* USART2 init function */
+
+void MX_USART2_UART_Init(void)
+{
+
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
+  huart2.Instance = USART2;
+  huart2.Init.BaudRate = 115200;
+  huart2.Init.WordLength = UART_WORDLENGTH_8B;
+  huart2.Init.StopBits = UART_STOPBITS_1;
+  huart2.Init.Parity = UART_PARITY_NONE;
+  huart2.Init.Mode = UART_MODE_TX_RX;
+  huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  huart2.Init.OverSampling = UART_OVERSAMPLING_16;
+  huart2.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
+  huart2.Init.ClockPrescaler = UART_PRESCALER_DIV1;
+  huart2.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetTxFifoThreshold(&huart2, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetRxFifoThreshold(&huart2, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_EnableFifoMode(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
+
+}
+
+void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(uartHandle->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspInit 0 */
+
+  /* USER CODE END USART2_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART2;
+    PeriphClkInitStruct.Usart2ClockSelection = RCC_USART2CLKSOURCE_SYSCLK;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* USART2 clock enable */
+    __HAL_RCC_USART2_CLK_ENABLE();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**USART2 GPIO Configuration
+    PA3     ------> USART2_RX
+    PA2     ------> USART2_TX
+    */
+    GPIO_InitStruct.Pin = USARTx_RX_Pin|USARTx_TX_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF7_USART2;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    /* USART2 DMA Init */
+    /* USART2_TX Init */
+    hdma_usart2_tx.Instance = DMA1_Channel5;
+    hdma_usart2_tx.Init.Request = DMA_REQUEST_USART2_TX;
+    hdma_usart2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_usart2_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart2_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart2_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.Mode = DMA_NORMAL;
+    hdma_usart2_tx.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    if (HAL_DMA_ConfigChannelAttributes(&hdma_usart2_tx, DMA_CHANNEL_NPRIV) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
+
+    /* USART2 interrupt Init */
+    HAL_NVIC_SetPriority(USART2_IRQn, 2, 0);
+    HAL_NVIC_EnableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspInit 1 */
+
+  /* USER CODE END USART2_MspInit 1 */
+  }
+}
+
+void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
+{
+
+  if(uartHandle->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspDeInit 0 */
+
+  /* USER CODE END USART2_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_USART2_CLK_DISABLE();
+
+    /**USART2 GPIO Configuration
+    PA3     ------> USART2_RX
+    PA2     ------> USART2_TX
+    */
+    HAL_GPIO_DeInit(GPIOA, USARTx_RX_Pin|USARTx_TX_Pin);
+
+    /* USART2 DMA DeInit */
+    HAL_DMA_DeInit(uartHandle->hdmatx);
+
+    /* USART2 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspDeInit 1 */
+
+  /* USER CODE END USART2_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
new file mode 100644
index 00000000..182f1990
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c
@@ -0,0 +1,257 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.c
+  * @author  MCD Application Team
+  * @brief   Configuration of UART driver interface for hyperterminal communication
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief DMA handle
+  */
+extern DMA_HandleTypeDef hdma_usart2_tx;
+
+/**
+  * @brief UART handle
+  */
+extern UART_HandleTypeDef huart2;
+
+/**
+  * @brief buffer to receive 1 character
+  */
+uint8_t charRx;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Trace driver callbacks handler
+  */
+const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
+{
+  vcom_Init,
+  vcom_DeInit,
+  vcom_ReceiveInit,
+  vcom_Trace_DMA,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief  TX complete callback
+  * @return none
+  */
+static void (*TxCpltCallback)(void *);
+/**
+  * @brief  RX complete callback
+  * @param  rxChar ptr of chars buffer sent by user
+  * @param  size buffer size
+  * @param  error errorcode
+  * @return none
+  */
+static void (*RxCpltCallback)(uint8_t *rxChar, uint16_t size, uint8_t error);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *))
+{
+  /* USER CODE BEGIN vcom_Init_1 */
+
+  /* USER CODE END vcom_Init_1 */
+  TxCpltCallback = cb;
+  MX_DMA_Init();
+  MX_USART2_UART_Init();
+  LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_27);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Init_2 */
+
+  /* USER CODE END vcom_Init_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
+{
+  /* USER CODE BEGIN vcom_DeInit_1 */
+
+  /* USER CODE END vcom_DeInit_1 */
+  /* ##-1- Reset peripherals ################################################## */
+  __HAL_RCC_USART2_FORCE_RESET();
+  __HAL_RCC_USART2_RELEASE_RESET();
+
+  /* ##-2- MspDeInit ################################################## */
+  HAL_UART_MspDeInit(&huart2);
+
+  /* ##-3- Disable the NVIC for DMA ########################################### */
+  /* USER CODE BEGIN 1 */
+  HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE END 1 */
+  /* USER CODE BEGIN vcom_DeInit_2 */
+
+  /* USER CODE END vcom_DeInit_2 */
+}
+
+void vcom_Trace(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_1 */
+
+  /* USER CODE END vcom_Trace_1 */
+  HAL_UART_Transmit(&huart2, p_data, size, 1000);
+  /* USER CODE BEGIN vcom_Trace_2 */
+
+  /* USER CODE END vcom_Trace_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_DMA_1 */
+
+  /* USER CODE END vcom_Trace_DMA_1 */
+  HAL_UART_Transmit_DMA(&huart2, p_data, size);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Trace_DMA_2 */
+
+  /* USER CODE END vcom_Trace_DMA_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error))
+{
+  /* USER CODE BEGIN vcom_ReceiveInit_1 */
+
+  /* USER CODE END vcom_ReceiveInit_1 */
+  UART_WakeUpTypeDef WakeUpSelection;
+
+  /*record call back*/
+  RxCpltCallback = RxCb;
+
+  /*Set wakeUp event on start bit*/
+  WakeUpSelection.WakeUpEvent = UART_WAKEUP_ON_STARTBIT;
+
+  HAL_UARTEx_StopModeWakeUpSourceConfig(&huart2, WakeUpSelection);
+
+  /* Make sure that no UART transfer is on-going */
+  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_BUSY) == SET);
+
+  /* Make sure that UART is ready to receive)   */
+  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_REACK) == RESET);
+
+  /* Enable USART interrupt */
+  __HAL_UART_ENABLE_IT(&huart2, UART_IT_WUF);
+
+  /*Enable wakeup from stop mode*/
+  HAL_UARTEx_EnableStopMode(&huart2);
+
+  /*Start LPUART receive on IT*/
+  HAL_UART_Receive_IT(&huart2, &charRx, 1);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_ReceiveInit_2 */
+
+  /* USER CODE END vcom_ReceiveInit_2 */
+}
+
+void vcom_Resume(void)
+{
+  /* USER CODE BEGIN vcom_Resume_1 */
+
+  /* USER CODE END vcom_Resume_1 */
+  /*to re-enable lost UART settings*/
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /*to re-enable lost DMA settings*/
+  if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN vcom_Resume_2 */
+
+  /* USER CODE END vcom_Resume_2 */
+}
+
+void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart2)
+{
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_1 */
+  /* buffer transmission complete*/
+  TxCpltCallback(NULL);
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_2 */
+}
+
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart2)
+{
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_1 */
+  if ((NULL != RxCpltCallback) && (HAL_UART_ERROR_NONE == huart2->ErrorCode))
+  {
+    RxCpltCallback(&charRx, 1, 0);
+  }
+  HAL_UART_Receive_IT(huart2, &charRx, 1);
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c
new file mode 100644
index 00000000..8f72197e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c
@@ -0,0 +1,399 @@
+/*!
+  * @file      CayenneLpp.c
+  *
+  * @brief     Implements the Cayenne Low Power Protocol
+  *
+  * \copyright Revised BSD License, see section \ref LICENSE.
+  *
+  * \code
+  *                ______                              _
+  *               / _____)             _              | |
+  *              ( (____  _____ ____ _| |_ _____  ____| |__
+  *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+  *               _____) ) ____| | | || |_| ____( (___| | | |
+  *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+  *              (C)2013-2018 Semtech
+  *
+  * \endcode
+  *
+  * \author    Miguel Luis ( Semtech )
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_mem.h"
+#include "CayenneLpp.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define CAYENNE_LPP_MAXBUFFER_SIZE                  242
+#define LPP_DIGITAL_INPUT       0       /* 1 byte */
+#define LPP_DIGITAL_OUTPUT      1       /* 1 byte */
+#define LPP_ANALOG_INPUT        2       /* 2 bytes, 0.01 signed */
+#define LPP_ANALOG_OUTPUT       3       /* 2 bytes, 0.01 signed */
+#define LPP_LUMINOSITY          101     /* 2 bytes, 1 lux unsigned */
+#define LPP_PRESENCE            102     /* 1 byte, 1 */
+#define LPP_TEMPERATURE         103     /* 2 bytes, 0.1 Celsius degrees signed */
+#define LPP_RELATIVE_HUMIDITY   104     /* 1 byte, 0.5% unsigned */
+#define LPP_ACCELEROMETER       113     /* 2 bytes per axis, 0.001G */
+#define LPP_BAROMETRIC_PRESSURE 115     /* 2 bytes 0.1 hPa Unsigned */
+#define LPP_GYROMETER           134     /* 2 bytes per axis, 0.01 degrees/s */
+#define LPP_GPS                 136     /* 3 byte lon/lat 0.0001 degrees, 3 bytes alt 0.01m */
+
+/* Data ID + Data Type + Data Size */
+#define LPP_DIGITAL_INPUT_SIZE       3
+#define LPP_DIGITAL_OUTPUT_SIZE      3
+#define LPP_ANALOG_INPUT_SIZE        4
+#define LPP_ANALOG_OUTPUT_SIZE       4
+#define LPP_LUMINOSITY_SIZE          4
+#define LPP_PRESENCE_SIZE            3
+#define LPP_TEMPERATURE_SIZE         4
+#define LPP_RELATIVE_HUMIDITY_SIZE   3
+#define LPP_ACCELEROMETER_SIZE       8
+#define LPP_BAROMETRIC_PRESSURE_SIZE 4
+#define LPP_GYROMETER_SIZE           8
+#define LPP_GPS_SIZE                 11
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t CayenneLppBuffer[CAYENNE_LPP_MAXBUFFER_SIZE];
+static uint8_t CayenneLppCursor = 0;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void CayenneLppInit(void)
+{
+  CayenneLppCursor = 0;
+  /* USER CODE BEGIN CayenneLppCursor */
+
+  /* USER CODE END CayenneLppCursor */
+}
+
+void CayenneLppReset(void)
+{
+  CayenneLppCursor = 0;
+  /* USER CODE BEGIN CayenneLppReset */
+
+  /* USER CODE END CayenneLppReset */
+}
+
+uint8_t CayenneLppGetSize(void)
+{
+  /* USER CODE BEGIN CayenneLppGetSize */
+
+  /* USER CODE END CayenneLppGetSize */
+  return CayenneLppCursor;
+}
+
+uint8_t *CayenneLppGetBuffer(void)
+{
+  /* USER CODE BEGIN CayenneLppGetBuffer */
+
+  /* USER CODE END CayenneLppGetBuffer */
+  return CayenneLppBuffer;
+}
+
+uint8_t CayenneLppCopy(uint8_t *dst)
+{
+  /* USER CODE BEGIN CayenneLppCopy_1 */
+
+  /* USER CODE END CayenneLppCopy_1 */
+  UTIL_MEM_cpy_8(dst, CayenneLppBuffer, CayenneLppCursor);
+  /* USER CODE BEGIN CayenneLppCopy_2 */
+
+  /* USER CODE END CayenneLppCopy_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddDigitalInput(uint8_t channel, uint8_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddDigitalInput_1 */
+
+  /* USER CODE END CayenneLppAddDigitalInput_1 */
+  if ((CayenneLppCursor + LPP_DIGITAL_INPUT_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_DIGITAL_INPUT;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddDigitalInput_2 */
+
+  /* USER CODE END CayenneLppAddDigitalInput_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddDigitalOutput(uint8_t channel, uint8_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddDigitalOutput_1 */
+
+  /* USER CODE END CayenneLppAddDigitalOutput_1 */
+  if ((CayenneLppCursor + LPP_DIGITAL_OUTPUT_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_DIGITAL_OUTPUT;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddDigitalOutput_2 */
+
+  /* USER CODE END CayenneLppAddDigitalOutput_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddAnalogInput(uint8_t channel, uint16_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddAnalogInput_1 */
+
+  /* USER CODE END CayenneLppAddAnalogInput_1 */
+  if ((CayenneLppCursor + LPP_ANALOG_INPUT_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+
+  value *= 100;
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_ANALOG_INPUT;
+  CayenneLppBuffer[CayenneLppCursor++] = value >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddAnalogInput_2 */
+
+  /* USER CODE END CayenneLppAddAnalogInput_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddAnalogOutput(uint8_t channel, uint16_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddAnalogOutput_1 */
+
+  /* USER CODE END CayenneLppAddAnalogOutput_1 */
+  if ((CayenneLppCursor + LPP_ANALOG_OUTPUT_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  value *= 100;
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_ANALOG_OUTPUT;
+  CayenneLppBuffer[CayenneLppCursor++] = value >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddAnalogOutput_2 */
+
+  /* USER CODE END CayenneLppAddAnalogOutput_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddLuminosity(uint8_t channel, uint16_t lux)
+{
+  /* USER CODE BEGIN CayenneLppAddLuminosity_1 */
+
+  /* USER CODE END CayenneLppAddLuminosity_1 */
+  if ((CayenneLppCursor + LPP_LUMINOSITY_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_LUMINOSITY;
+  CayenneLppBuffer[CayenneLppCursor++] = lux >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = lux;
+  /* USER CODE BEGIN CayenneLppAddLuminosity_2 */
+
+  /* USER CODE END CayenneLppAddLuminosity_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddPresence(uint8_t channel, uint8_t value)
+{
+  /* USER CODE BEGIN CayenneLppAddPresence_1 */
+
+  /* USER CODE END CayenneLppAddPresence_1 */
+  if ((CayenneLppCursor + LPP_PRESENCE_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_PRESENCE;
+  CayenneLppBuffer[CayenneLppCursor++] = value;
+  /* USER CODE BEGIN CayenneLppAddPresence_2 */
+
+  /* USER CODE END CayenneLppAddPresence_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddTemperature(uint8_t channel, int16_t celsius)
+{
+  /* USER CODE BEGIN CayenneLppAddTemperature_1 */
+
+  /* USER CODE END CayenneLppAddTemperature_1 */
+  if ((CayenneLppCursor + LPP_TEMPERATURE_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  int16_t val = celsius * 10;
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_TEMPERATURE;
+  CayenneLppBuffer[CayenneLppCursor++] = val >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = val;
+  /* USER CODE BEGIN CayenneLppAddTemperature_2 */
+
+  /* USER CODE END CayenneLppAddTemperature_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddRelativeHumidity(uint8_t channel, uint16_t rh)
+{
+  /* USER CODE BEGIN CayenneLppAddRelativeHumidity_1 */
+
+  /* USER CODE END CayenneLppAddRelativeHumidity_1 */
+  if ((CayenneLppCursor + LPP_RELATIVE_HUMIDITY_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_RELATIVE_HUMIDITY;
+  CayenneLppBuffer[CayenneLppCursor++] = rh * 2;
+  /* USER CODE BEGIN CayenneLppAddRelativeHumidity_2 */
+
+  /* USER CODE END CayenneLppAddRelativeHumidity_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddAccelerometer(uint8_t channel, int16_t x, int16_t y, int16_t z)
+{
+  /* USER CODE BEGIN CayenneLppAddAccelerometer_1 */
+
+  /* USER CODE END CayenneLppAddAccelerometer_1 */
+  if ((CayenneLppCursor + LPP_ACCELEROMETER_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  int16_t vx = x * 1000;
+  int16_t vy = y * 1000;
+  int16_t vz = z * 1000;
+
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_ACCELEROMETER;
+  CayenneLppBuffer[CayenneLppCursor++] = vx >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vx;
+  CayenneLppBuffer[CayenneLppCursor++] = vy >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vy;
+  CayenneLppBuffer[CayenneLppCursor++] = vz >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vz;
+  /* USER CODE BEGIN CayenneLppAddAccelerometer_2 */
+
+  /* USER CODE END CayenneLppAddAccelerometer_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddBarometricPressure(uint8_t channel, uint16_t hpa)
+{
+  /* USER CODE BEGIN CayenneLppAddBarometricPressure_1 */
+
+  /* USER CODE END CayenneLppAddBarometricPressure_1 */
+  if ((CayenneLppCursor + LPP_BAROMETRIC_PRESSURE_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  hpa *= 10;
+
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_BAROMETRIC_PRESSURE;
+  CayenneLppBuffer[CayenneLppCursor++] = hpa >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = hpa;
+  /* USER CODE BEGIN CayenneLppAddBarometricPressure_2 */
+
+  /* USER CODE END CayenneLppAddBarometricPressure_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddGyrometer(uint8_t channel, int16_t x, int16_t y, int16_t z)
+{
+  /* USER CODE BEGIN CayenneLppAddGyrometer_1 */
+
+  /* USER CODE END CayenneLppAddGyrometer_1 */
+  if ((CayenneLppCursor + LPP_GYROMETER_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  int16_t vx = x * 100;
+  int16_t vy = y * 100;
+  int16_t vz = z * 100;
+
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_GYROMETER;
+  CayenneLppBuffer[CayenneLppCursor++] = vx >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vx;
+  CayenneLppBuffer[CayenneLppCursor++] = vy >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vy;
+  CayenneLppBuffer[CayenneLppCursor++] = vz >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = vz;
+  /* USER CODE BEGIN CayenneLppAddGyrometer_2 */
+
+  /* USER CODE END CayenneLppAddGyrometer_2 */
+  return CayenneLppCursor;
+}
+
+uint8_t CayenneLppAddGps(uint8_t channel, int32_t latitude, int32_t longitude, int32_t meters)
+{
+  /* USER CODE BEGIN CayenneLppAddGps_1 */
+
+  /* USER CODE END CayenneLppAddGps_1 */
+  if ((CayenneLppCursor + LPP_GPS_SIZE) > CAYENNE_LPP_MAXBUFFER_SIZE)
+  {
+    return 0;
+  }
+  int32_t lat = latitude * 10000;
+  int32_t lon = longitude * 10000;
+  int32_t alt = meters * 100;
+
+  CayenneLppBuffer[CayenneLppCursor++] = channel;
+  CayenneLppBuffer[CayenneLppCursor++] = LPP_GPS;
+
+  CayenneLppBuffer[CayenneLppCursor++] = lat >> 16;
+  CayenneLppBuffer[CayenneLppCursor++] = lat >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = lat;
+  CayenneLppBuffer[CayenneLppCursor++] = lon >> 16;
+  CayenneLppBuffer[CayenneLppCursor++] = lon >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = lon;
+  CayenneLppBuffer[CayenneLppCursor++] = alt >> 16;
+  CayenneLppBuffer[CayenneLppCursor++] = alt >> 8;
+  CayenneLppBuffer[CayenneLppCursor++] = alt;
+  /* USER CODE BEGIN CayenneLppAddGps_2 */
+
+  /* USER CODE END CayenneLppAddGps_2 */
+  return CayenneLppCursor;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h
new file mode 100644
index 00000000..67ca6ac6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h
@@ -0,0 +1,98 @@
+/*!
+  * @file      CayenneLpp.h
+  *
+  * @brief     Implements the Cayenne Low Power Protocol
+  *
+  * @copyright Revised BSD License, see section \ref LICENSE.
+  *
+  * @code
+  *                ______                              _
+  *               / _____)             _              | |
+  *              ( (____  _____ ____ _| |_ _____  ____| |__
+  *               \____ \| ___ |    (_   _) ___ |/ ___)  _ \
+  *               _____) ) ____| | | || |_| ____( (___| | | |
+  *              (______/|_____)_|_|_| \__)_____)\____)_| |_|
+  *              (C)2013-2018 Semtech
+  *
+  * @endcode
+  *
+  * @author    Miguel Luis ( Semtech )
+  */
+#ifndef __CAYENNE_LPP_H__
+#define __CAYENNE_LPP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void CayenneLppInit(void);
+
+void CayenneLppReset(void);
+
+uint8_t CayenneLppGetSize(void);
+
+uint8_t *CayenneLppGetBuffer(void);
+
+uint8_t CayenneLppCopy(uint8_t *buffer);
+
+uint8_t CayenneLppAddDigitalInput(uint8_t channel, uint8_t value);
+
+uint8_t CayenneLppAddDigitalOutput(uint8_t channel, uint8_t value);
+
+uint8_t CayenneLppAddAnalogInput(uint8_t channel, uint16_t value);
+
+uint8_t CayenneLppAddAnalogOutput(uint8_t channel, uint16_t value);
+
+uint8_t CayenneLppAddLuminosity(uint8_t channel, uint16_t lux);
+
+uint8_t CayenneLppAddPresence(uint8_t channel, uint8_t value);
+
+uint8_t CayenneLppAddTemperature(uint8_t channel, int16_t celsius);
+
+uint8_t CayenneLppAddRelativeHumidity(uint8_t channel, uint16_t rh);
+
+uint8_t CayenneLppAddAccelerometer(uint8_t channel, int16_t x, int16_t y, int16_t z);
+
+uint8_t CayenneLppAddBarometricPressure(uint8_t channel, uint16_t hpa);
+
+uint8_t CayenneLppAddGyrometer(uint8_t channel, int16_t x, int16_t y, int16_t z);
+
+uint8_t CayenneLppAddGps(uint8_t channel, int32_t latitude, int32_t longitude, int32_t meters);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CAYENNE_LPP_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
new file mode 100644
index 00000000..f7038db8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c
@@ -0,0 +1,100 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_lorawan.h"
+#include "lora_app.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void MX_LoRaWAN_Init(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Init_1 */
+
+  /* USER CODE END MX_LoRaWAN_Init_1 */
+  SystemApp_Init();
+  /* USER CODE BEGIN MX_LoRaWAN_Init_2 */
+
+  /* USER CODE END MX_LoRaWAN_Init_2 */
+  LoRaWAN_Init();
+  /* USER CODE BEGIN MX_LoRaWAN_Init_3 */
+
+  /* USER CODE END MX_LoRaWAN_Init_3 */
+}
+
+void MX_LoRaWAN_Process(void)
+{
+  /* USER CODE BEGIN MX_LoRaWAN_Process_1 */
+
+  /* USER CODE END MX_LoRaWAN_Process_1 */
+  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
+  /* USER CODE BEGIN MX_LoRaWAN_Process_2 */
+
+  /* USER CODE END MX_LoRaWAN_Process_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
new file mode 100644
index 00000000..fbe16b6d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h
@@ -0,0 +1,76 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_lorawan.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_LORAWAN_H__
+#define __APP_LORAWAN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported Functions Prototypes------------------------------------------------------- */
+/**
+  * @brief  Init Lora Application
+  */
+void MX_LoRaWAN_Init(void);
+
+/**
+  * @brief  Entry Lora Process or scheduling
+  */
+void MX_LoRaWAN_Process(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_LORAWAN_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
new file mode 100644
index 00000000..b725453c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c
@@ -0,0 +1,595 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.c
+  * @author  MCD Application Team
+  * @brief   Application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "Region.h" /* Needed for LORAWAN_DEFAULT_DATA_RATE */
+#include "sys_app.h"
+#include "lora_app.h"
+#include "stm32_seq.h"
+#include "stm32_timer.h"
+#include "utilities_def.h"
+#include "lora_app_version.h"
+#include "LmHandler.h"
+#include "stm32_lpm.h"
+#include "adc_if.h"
+#include "sys_conf.h"
+#include "CayenneLpp.h"
+#include "sys_sensors.h"
+#include "mbmuxif_sys.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+extern __IO uint32_t lets_go_on;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_ENABLED */
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief LoRa State Machine states
+  */
+typedef enum TxEventType_e
+{
+  /**
+    * @brief Appdata Transmission issue based on timer every TxDutyCycleTime
+    */
+  TX_ON_TIMER,
+  /**
+    * @brief Appdata Transmission external event plugged on OnSendEvent( )
+    */
+  TX_ON_EVENT
+  /* USER CODE BEGIN TxEventType_t */
+
+  /* USER CODE END TxEventType_t */
+} TxEventType_t;
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  LoRa End Node send request
+  */
+static void SendTxData(void);
+
+/**
+  * @brief  TX timer callback function
+  * @param  context ptr of timer context
+  */
+static void OnTxTimerEvent(void *context);
+
+/**
+  * @brief  join event callback function
+  * @param  joinParams status of join
+  */
+static void OnJoinRequest(LmHandlerJoinParams_t *joinParams);
+
+/**
+  * @brief  tx event callback function
+  * @param  params status of last Tx
+  */
+static void OnTxData(LmHandlerTxParams_t *params);
+
+/**
+  * @brief callback when LoRa application has received a frame
+  * @param appData data received in the last Rx
+  * @param params status of last Rx
+  */
+static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params);
+
+/*!
+ * Will be called each time a Radio IRQ is handled by the MAC layer
+ *
+ * \remark OnMacProcessNotify not needed on dual Core as OnMacProcessNotify is processed on M0+
+ */
+static void OnMacProcessNotify(void);
+
+/* USER CODE BEGIN PFP */
+
+/**
+  * @brief  LED Tx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnTxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Rx timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnRxTimerLedEvent(void *context);
+
+/**
+  * @brief  LED Join timer callback function
+  * @param  context ptr of LED context
+  */
+static void OnJoinTimerLedEvent(void *context);
+
+/* USER CODE END PFP */
+
+/* Private variables ---------------------------------------------------------*/
+static ActivationType_t ActivationType = LORAWAN_DEFAULT_ACTIVATION_TYPE;
+
+/**
+  * @brief LoRaWAN handler Callbacks
+  */
+static LmHandlerCallbacks_t LmHandlerCallbacks =
+{
+  .GetBatteryLevel =           GetBatteryLevel,
+  .GetTemperature =            GetTemperatureLevel,
+  .OnMacProcess =              OnMacProcessNotify,
+  .OnJoinRequest =             OnJoinRequest,
+  .OnTxData =                  OnTxData,
+  .OnRxData =                  OnRxData
+};
+
+/**
+  * @brief LoRaWAN handler parameters
+  */
+static LmHandlerParams_t LmHandlerParams =
+{
+  .ActiveRegion =             ACTIVE_REGION,
+  .DefaultClass =             LORAWAN_DEFAULT_CLASS,
+  .AdrEnable =                LORAWAN_ADR_STATE,
+  .TxDatarate =               LORAWAN_DEFAULT_DATA_RATE,
+  .PingPeriodicity =          LORAWAN_DEFAULT_PING_SLOT_PERIODICITY
+};
+
+/**
+  * @brief Type of Event to generate application Tx
+  */
+static TxEventType_t EventType = TX_ON_TIMER;
+
+/**
+  * @brief Timer to handle the application Tx
+  */
+static UTIL_TIMER_Object_t TxTimer;
+
+/* USER CODE BEGIN PV */
+/**
+  * @brief User application buffer
+  */
+static uint8_t AppDataBuffer[LORAWAN_APP_DATA_BUFFER_MAX_SIZE];
+
+/**
+  * @brief User application data structure
+  */
+static LmHandlerAppData_t AppData = { 0, 0, AppDataBuffer };
+
+/**
+  * @brief Specifies the state of the application LED
+  */
+static uint8_t AppLedStateOn = RESET;
+
+/**
+  * @brief Timer to handle the application Tx Led to toggle
+  */
+static UTIL_TIMER_Object_t TxLedTimer;
+
+/**
+  * @brief Timer to handle the application Rx Led to toggle
+  */
+static UTIL_TIMER_Object_t RxLedTimer;
+
+/**
+  * @brief Timer to handle the application Join Led to toggle
+  */
+static UTIL_TIMER_Object_t JoinLedTimer;
+
+/* USER CODE END PV */
+
+/* Exported functions ---------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void LoRaWAN_Init(void)
+{
+  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
+  uint32_t lora_cm0plus_app;
+
+  /* USER CODE BEGIN LoRaWAN_Init_1 */
+
+  BSP_LED_Init(LED_BLUE);
+  BSP_LED_Init(LED_GREEN);
+  BSP_LED_Init(LED_RED);
+  BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
+
+  /* Get CM4 LoRa APP version*/
+  APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get CM0 LoRa APP version*/
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "M0PLUS_APP_VERSION: V%X.%X.%X\r\n",
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW LoraWAN info */
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_LORAWAN_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "MW_LORAWAN_VERSION: V%X.%X.%X\r\n",
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW SubGhz_Phy info */
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
+  lora_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "MW_RADIO_VERSION:   V%X.%X.%X\r\n",
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(lora_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+  UTIL_TIMER_Create(&TxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerLedEvent, NULL);
+  UTIL_TIMER_Create(&RxLedTimer, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnRxTimerLedEvent, NULL);
+  UTIL_TIMER_Create(&JoinLedTimer, 0xFFFFFFFFU, UTIL_TIMER_PERIODIC, OnJoinTimerLedEvent, NULL);
+  UTIL_TIMER_SetPeriod(&TxLedTimer, 500);
+  UTIL_TIMER_SetPeriod(&RxLedTimer, 500);
+  UTIL_TIMER_SetPeriod(&JoinLedTimer, 500);
+
+  /* USER CODE END LoRaWAN_Init_1 */
+
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), UTIL_SEQ_RFU, SendTxData);
+  /* Init the Lora Stack*/
+  LmHandlerInit(&LmHandlerCallbacks);
+
+  LmHandlerConfigure(&LmHandlerParams);
+
+  /* USER CODE BEGIN LoRaWAN_Init_2 */
+  UTIL_TIMER_Start(&JoinLedTimer);
+
+  /* USER CODE END LoRaWAN_Init_2 */
+
+  LmHandlerJoin(ActivationType);
+
+  if (EventType == TX_ON_TIMER)
+  {
+    /* send every time timer elapses */
+    UTIL_TIMER_Create(&TxTimer,  0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTxTimerEvent, NULL);
+    UTIL_TIMER_SetPeriod(&TxTimer,  APP_TX_DUTYCYCLE);
+    UTIL_TIMER_Start(&TxTimer);
+  }
+  else
+  {
+    /* USER CODE BEGIN LoRaWAN_Init_3 */
+
+    /* send every time button is pushed */
+    BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
+    /* USER CODE END LoRaWAN_Init_3 */
+  }
+
+  /* USER CODE BEGIN LoRaWAN_Init_Last */
+
+  /* USER CODE END LoRaWAN_Init_Last */
+}
+
+/* USER CODE BEGIN PB_Callbacks */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
+/* In order to get a push button IRS by code automatically generated */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  switch (GPIO_Pin)
+  {
+    case  BUTTON_SW1_PIN:
+      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+      break;
+    case  BUTTON_SW2_PIN:
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+      lets_go_on = 1;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_ENABLED */
+      break;
+    case  BUTTON_SW3_PIN:
+      break;
+    default:
+      break;
+  }
+}
+
+/* USER CODE END PB_Callbacks */
+
+/* Private functions ---------------------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
+{
+  /* USER CODE BEGIN OnRxData_1 */
+  if ((appData != NULL) || (params != NULL))
+  {
+    BSP_LED_On(LED_BLUE) ;
+
+    UTIL_TIMER_Start(&RxLedTimer);
+
+    static const char *slotStrings[] = { "1", "2", "C", "C Multicast", "B Ping-Slot", "B Multicast Ping-Slot" };
+
+    APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Indication ==========\r\n");
+    APP_LOG(TS_OFF, VLEVEL_H, "###### D/L FRAME:%04d | SLOT:%s | PORT:%d | DR:%d | RSSI:%d | SNR:%d\r\n",
+            params->DownlinkCounter, slotStrings[params->RxSlot], appData->Port, params->Datarate, params->Rssi, params->Snr);
+    switch (appData->Port)
+    {
+      case LORAWAN_SWITCH_CLASS_PORT:
+        /*this port switches the class*/
+        if (appData->BufferSize == 1)
+        {
+          switch (appData->Buffer[0])
+          {
+            case 0:
+            {
+              LmHandlerRequestClass(CLASS_A);
+              break;
+            }
+            case 1:
+            {
+              LmHandlerRequestClass(CLASS_B);
+              break;
+            }
+            case 2:
+            {
+              LmHandlerRequestClass(CLASS_C);
+              break;
+            }
+            default:
+              break;
+          }
+        }
+        break;
+      case LORAWAN_USER_APP_PORT:
+        if (appData->BufferSize == 1)
+        {
+          AppLedStateOn = appData->Buffer[0] & 0x01;
+          if (AppLedStateOn == RESET)
+          {
+            APP_LOG(TS_OFF, VLEVEL_H,   "LED OFF\r\n");
+            BSP_LED_Off(LED_RED) ;
+          }
+          else
+          {
+            APP_LOG(TS_OFF, VLEVEL_H, "LED ON\r\n");
+            BSP_LED_On(LED_RED) ;
+          }
+        }
+        break;
+
+      default:
+
+        break;
+    }
+  }
+  /* USER CODE END OnRxData_1 */
+}
+
+static void SendTxData(void)
+{
+  /* USER CODE BEGIN SendTxData_1 */
+  uint16_t pressure = 0;
+  int16_t temperature = 0;
+  sensor_t sensor_data;
+  UTIL_TIMER_Time_t nextTxIn = 0;
+
+#ifdef CAYENNE_LPP
+  uint8_t channel = 0;
+#else
+  uint16_t humidity = 0;
+  uint32_t i = 0;
+  int32_t latitude = 0;
+  int32_t longitude = 0;
+  uint16_t altitudeGps = 0;
+#endif /* CAYENNE_LPP */
+
+  EnvSensors_Read(&sensor_data);
+  temperature = (SYS_GetTemperatureLevel() >> 8);
+  pressure    = (uint16_t)(sensor_data.pressure * 100 / 10);      /* in hPa / 10 */
+
+  AppData.Port = LORAWAN_USER_APP_PORT;
+
+#ifdef CAYENNE_LPP
+  CayenneLppReset();
+  CayenneLppAddBarometricPressure(channel++, pressure);
+  CayenneLppAddTemperature(channel++, temperature);
+  CayenneLppAddRelativeHumidity(channel++, (uint16_t)(sensor_data.humidity));
+
+  if ((LmHandlerParams.ActiveRegion != LORAMAC_REGION_US915) && (LmHandlerParams.ActiveRegion != LORAMAC_REGION_AU915)
+      && (LmHandlerParams.ActiveRegion != LORAMAC_REGION_AS923))
+  {
+    CayenneLppAddDigitalInput(channel++, GetBatteryLevel());
+    CayenneLppAddDigitalOutput(channel++, AppLedStateOn);
+  }
+
+  CayenneLppCopy(AppData.Buffer);
+  AppData.BufferSize = CayenneLppGetSize();
+#else  /* not CAYENNE_LPP */
+  humidity    = (uint16_t)(sensor_data.humidity * 10);            /* in %*10     */
+
+  AppData.Buffer[i++] = AppLedStateOn;
+  AppData.Buffer[i++] = (uint8_t)((pressure >> 8) & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(pressure & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(temperature & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)((humidity >> 8) & 0xFF);
+  AppData.Buffer[i++] = (uint8_t)(humidity & 0xFF);
+
+  if ((LmHandlerParams.ActiveRegion == LORAMAC_REGION_US915) || (LmHandlerParams.ActiveRegion == LORAMAC_REGION_AU915)
+      || (LmHandlerParams.ActiveRegion == LORAMAC_REGION_AS923))
+  {
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+    AppData.Buffer[i++] = 0;
+  }
+  else
+  {
+    latitude = sensor_data.latitude;
+    longitude = sensor_data.longitude;
+
+    AppData.Buffer[i++] = GetBatteryLevel();        /* 1 (very low) to 254 (fully charged) */
+    AppData.Buffer[i++] = (uint8_t)((latitude >> 16) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((latitude >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(latitude & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((longitude >> 16) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((longitude >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(longitude & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)((altitudeGps >> 8) & 0xFF);
+    AppData.Buffer[i++] = (uint8_t)(altitudeGps & 0xFF);
+  }
+
+  AppData.BufferSize = i;
+#endif /* CAYENNE_LPP */
+
+  if (LORAMAC_HANDLER_SUCCESS == LmHandlerSend(&AppData, LORAWAN_DEFAULT_CONFIRMED_MSG_STATE, &nextTxIn, false))
+  {
+    APP_LOG(TS_ON, VLEVEL_L, "SEND REQUEST\r\n");
+  }
+  else if (nextTxIn > 0)
+  {
+    APP_LOG(TS_ON, VLEVEL_L, "Next Tx in  : ~%d second(s)\r\n", (nextTxIn / 1000));
+  }
+
+  /* USER CODE END SendTxData_1 */
+}
+
+static void OnTxTimerEvent(void *context)
+{
+  /* USER CODE BEGIN OnTxTimerEvent_1 */
+
+  /* USER CODE END OnTxTimerEvent_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
+
+  /*Wait for next tx slot*/
+  UTIL_TIMER_Start(&TxTimer);
+  /* USER CODE BEGIN OnTxTimerEvent_2 */
+
+  /* USER CODE END OnTxTimerEvent_2 */
+}
+
+/* USER CODE BEGIN PrFD_LedEvents */
+static void OnTxTimerLedEvent(void *context)
+{
+  BSP_LED_Off(LED_GREEN) ;
+}
+
+static void OnRxTimerLedEvent(void *context)
+{
+  BSP_LED_Off(LED_BLUE) ;
+}
+
+static void OnJoinTimerLedEvent(void *context)
+{
+  BSP_LED_Toggle(LED_RED) ;
+}
+
+/* USER CODE END PrFD_LedEvents */
+
+static void OnTxData(LmHandlerTxParams_t *params)
+{
+  /* USER CODE BEGIN OnTxData_1 */
+  if ((params != NULL))
+  {
+    /* Process Tx event only if its a mcps response to prevent some internal events (mlme) */
+    if (params->IsMcpsConfirm != 0)
+    {
+      BSP_LED_On(LED_GREEN) ;
+      UTIL_TIMER_Start(&TxLedTimer);
+
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### ========== MCPS-Confirm =============\r\n");
+      APP_LOG(TS_OFF, VLEVEL_H, "###### U/L FRAME:%04d | PORT:%d | DR:%d | PWR:%d", params->UplinkCounter,
+              params->AppData.Port, params->Datarate, params->TxPower);
+
+      APP_LOG(TS_OFF, VLEVEL_H, " | MSG TYPE:");
+      if (params->MsgType == LORAMAC_HANDLER_CONFIRMED_MSG)
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "CONFIRMED [%s]\r\n", (params->AckReceived != 0) ? "ACK" : "NACK");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_H, "UNCONFIRMED\r\n");
+      }
+    }
+  }
+  /* USER CODE END OnTxData_1 */
+}
+
+static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
+{
+  /* USER CODE BEGIN OnJoinRequest_1 */
+  if (joinParams != NULL)
+  {
+    if (joinParams->Status == LORAMAC_HANDLER_SUCCESS)
+    {
+      UTIL_TIMER_Stop(&JoinLedTimer);
+      BSP_LED_Off(LED_RED) ;
+
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOINED = ");
+      if (joinParams->Mode == ACTIVATION_TYPE_ABP)
+      {
+        APP_LOG(TS_OFF, VLEVEL_M, "ABP ======================\r\n");
+      }
+      else
+      {
+        APP_LOG(TS_OFF, VLEVEL_M, "OTAA =====================\r\n");
+      }
+    }
+    else
+    {
+      APP_LOG(TS_OFF, VLEVEL_M, "\r\n###### = JOIN FAILED\r\n");
+    }
+  }
+  /* USER CODE END OnJoinRequest_1 */
+}
+
+static void OnMacProcessNotify(void)
+{
+  /* USER CODE BEGIN OnMacProcessNotify_1 */
+
+  /* USER CODE END OnMacProcessNotify_1 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
new file mode 100644
index 00000000..b7ac7358
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h
@@ -0,0 +1,132 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the LRWAN Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORA_APP_H__
+#define __LORA_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* LoraWAN application configuration (Mw is configured by lorawan_conf.h) */
+#define ACTIVE_REGION                               LORAMAC_REGION_EU868
+
+/*!
+ * CAYENNE_LPP is myDevices Application server.
+ */
+/*#define CAYENNE_LPP*/
+
+/*!
+ * Defines the application data transmission duty cycle. 10s, value in [ms].
+ */
+#define APP_TX_DUTYCYCLE                            10000
+
+/*!
+ * LoRaWAN User application port
+ * @note do not use 224. It is reserved for certification
+ */
+#define LORAWAN_USER_APP_PORT                       2
+
+/*!
+ * LoRaWAN Switch class application port
+ * @note do not use 224. It is reserved for certification
+ */
+#define LORAWAN_SWITCH_CLASS_PORT                   3
+
+/*!
+ * LoRaWAN default endNode class port
+ */
+#define LORAWAN_DEFAULT_CLASS                       CLASS_A
+
+/*!
+ * LoRaWAN default confirm state
+ */
+#define LORAWAN_DEFAULT_CONFIRMED_MSG_STATE         LORAMAC_HANDLER_UNCONFIRMED_MSG
+
+/*!
+ * LoRaWAN Adaptive Data Rate
+ * @note Please note that when ADR is enabled the end-device should be static
+ */
+#define LORAWAN_ADR_STATE                           LORAMAC_HANDLER_ADR_ON
+
+/*!
+ * LoRaWAN Default data Rate Data Rate
+ * @note Please note that LORAWAN_DEFAULT_DATA_RATE is used only when LORAWAN_ADR_STATE is disabled
+ */
+#define LORAWAN_DEFAULT_DATA_RATE                   DR_0
+
+/*!
+ * LoRaWAN default activation type
+ */
+#define LORAWAN_DEFAULT_ACTIVATION_TYPE             ACTIVATION_TYPE_OTAA
+
+/*!
+ * User application data buffer size
+ */
+#define LORAWAN_APP_DATA_BUFFER_MAX_SIZE            242
+
+/*!
+ * Default Unicast ping slots periodicity
+ *
+ * \remark periodicity is equal to 2^LORAWAN_DEFAULT_PING_SLOT_PERIODICITY seconds
+ *         example: 2^3 = 8 seconds. The end-device will open an Rx slot every 8 seconds.
+ */
+#define LORAWAN_DEFAULT_PING_SLOT_PERIODICITY       4
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init Lora Application
+  */
+void LoRaWAN_Init(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LORA_APP_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
new file mode 100644
index 00000000..a25c35b9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h
@@ -0,0 +1,95 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_app_version.h
+  * @author  MCD Application Team
+  * @brief   Definition the version of the CM4 application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_VERSION_H__
+#define __APP_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
+#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
+
+#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
+#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
+#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
+#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Application version
+  */
+#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
+                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
+                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
+                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
+
+/**
+  * @brief LoRaWAN CM4 application version
+  */
+#define __CM4_APP_VERSION             __APP_VERSION
+
+/**
+  * @brief LoRaWAN CM0PLUS minimum required version
+  */
+#define __LAST_COMPATIBLE_CM0_RELEASE __APP_VERSION
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_VERSION_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
new file mode 100644
index 00000000..b97a4240
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h
@@ -0,0 +1,65 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lorawan_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for LoRaWAN middleware instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LORAWAN_CONF_H__
+#define __LORAWAN_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LORAWAN_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
new file mode 100644
index 00000000..1991b928
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h
@@ -0,0 +1,67 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    systime.h
+  * @author  MCD Application Team
+  * @brief   Map middleware systime
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTIME_H__
+#define __SYSTIME_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_systime.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SYSTIME_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
new file mode 100644
index 00000000..e80cd6a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer.h
+  * @author  MCD Application Team
+  * @brief   Wrapper to timer server
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_H__
+#define __TIMER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Max timer mask
+  */
+#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/**
+  * @brief Timer value on 32 bits
+  */
+#define TimerTime_t UTIL_TIMER_Time_t
+
+/**
+  * @brief Timer object description
+  */
+#define TimerEvent_t UTIL_TIMER_Object_t
+
+/**
+  * @brief Create the timer object
+  */
+#define TimerInit(HANDLE, CB) do {\
+                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
+                                 } while(0)
+
+/**
+  * @brief update the period and start the timer
+  */
+#define TimerSetValue(HANDLE, TIMEOUT) do{ \
+                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
+                                         } while(0)
+
+/**
+  * @brief Start and adds the timer object to the list of timer events
+  */
+#define TimerStart(HANDLE)   do {\
+                                  UTIL_TIMER_Start(HANDLE);\
+                                } while(0)
+
+/**
+  * @brief Stop and removes the timer object from the list of timer events
+  */
+#define TimerStop(HANDLE)   do {\
+                                 UTIL_TIMER_Stop(HANDLE);\
+                               } while(0)
+
+/**
+  * @brief return the current time
+  */
+#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
+
+/**
+  * @brief return the elapsed time
+  */
+#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
new file mode 100644
index 00000000..f8a2aa5b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c
@@ -0,0 +1,1908 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    LmHandler_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the LoraMac interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "LmHandler_mbwrapper.h"
+#include "lora_info.h"
+#include "LmHandler.h"
+#include "mbmuxif_sys.h"
+#include "mbmux.h"
+#include "msg_id.h"
+#include "mbmuxif_lora.h"
+#include "stm32_mem.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#ifndef MAX
+#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
+#endif /* MAX */
+#define LMH_CONFIG_SIZE     (sizeof(LmHandlerParams_t))
+#define LMH_SEND_SIZE       (256 + sizeof(UTIL_TIMER_Time_t))
+#define LMH_GET_CLASS_SIZE  (sizeof(DeviceClass_t))
+#define LMH_EUI_SIZE        (SE_EUI_SIZE)
+#define LMH_KEY_SIZE        (SE_KEY_SIZE)
+#define LMH_REGION_SIZE     (sizeof(LoRaMacRegion_t))
+#define LMH_RX_PARAM_SIZE   (sizeof(RxChannelParams_t))
+#define LMH_BEACON_SIZE     (sizeof(BeaconState_t))
+#define LORA_MBWRAP_SHBUF_SIZE MAX(MAX(MAX(LMH_CONFIG_SIZE, LMH_SEND_SIZE), MAX(LMH_GET_CLASS_SIZE, LMH_EUI_SIZE)), MAX(MAX(LMH_KEY_SIZE, LMH_REGION_SIZE), MAX(LMH_RX_PARAM_SIZE, LMH_BEACON_SIZE)))
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief LmHandler buffer to exchange data between from CM4 to CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aLoraMbWrapShareBuffer[LORA_MBWRAP_SHBUF_SIZE];
+
+/**
+  * @brief local structure of LmHandler callbacks for notification processes
+  */
+static LmHandlerCallbacks_t callback_mbwrapper;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+/**
+  * @addtogroup LoRaWan  LoRaWan Interface
+  *
+  * @{
+  *
+  */
+LmHandlerErrorStatus_t LmHandlerInit(LmHandlerCallbacks_t *handlerCallbacks)
+{
+  /* USER CODE BEGIN LmHandlerInit_1 */
+
+  /* USER CODE END LmHandlerInit_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (handlerCallbacks == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  callback_mbwrapper.GetBatteryLevel = handlerCallbacks->GetBatteryLevel;
+  callback_mbwrapper.GetTemperature = handlerCallbacks->GetTemperature;
+  callback_mbwrapper.OnNvmDataChange = handlerCallbacks->OnNvmDataChange;
+  callback_mbwrapper.OnNetworkParametersChange = handlerCallbacks->OnNetworkParametersChange;
+  callback_mbwrapper.OnJoinRequest = handlerCallbacks->OnJoinRequest;
+  callback_mbwrapper.OnTxData = handlerCallbacks->OnTxData;
+  callback_mbwrapper.OnRxData = handlerCallbacks->OnRxData;
+  callback_mbwrapper.OnClassChange = handlerCallbacks->OnClassChange;
+  callback_mbwrapper.OnBeaconStatusChange = handlerCallbacks->OnBeaconStatusChange;
+  callback_mbwrapper.OnSysTimeUpdate = handlerCallbacks->OnSysTimeUpdate;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_INITIALIZATION_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerInit_2 */
+
+  /* USER CODE END LmHandlerInit_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerConfigure(LmHandlerParams_t *handlerParams)
+{
+  /* USER CODE BEGIN LmHandlerConfigure_1 */
+
+  /* USER CODE END LmHandlerConfigure_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (handlerParams == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, handlerParams, sizeof(LmHandlerParams_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_CONFIGURE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerConfigure_2 */
+
+  /* USER CODE END LmHandlerConfigure_2 */
+}
+
+LmHandlerFlagStatus_t LmHandlerJoinStatus(void)
+{
+  /* USER CODE BEGIN LmHandlerJoinStatus_1 */
+
+  /* USER CODE END LmHandlerJoinStatus_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_JOIN_STATUS_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerFlagStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerJoinStatus_2 */
+
+  /* USER CODE END LmHandlerJoinStatus_2 */
+}
+
+void LmHandlerJoin(ActivationType_t mode)
+{
+  /* USER CODE BEGIN LmHandlerJoin_1 */
+
+  /* USER CODE END LmHandlerJoin_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_JOIN_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) mode;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN LmHandlerJoin_2 */
+
+  /* USER CODE END LmHandlerJoin_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerStop(void)
+{
+  /* USER CODE BEGIN LmHandlerStop_1 */
+
+  /* USER CODE END LmHandlerStop_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_STOP_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerStop_2 */
+
+  /* USER CODE END LmHandlerStop_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSend(LmHandlerAppData_t *appData, LmHandlerMsgTypes_t isTxConfirmed,
+                                     UTIL_TIMER_Time_t *nextTxIn, bool allowDelayedTx)
+{
+  /* USER CODE BEGIN LmHandlerSend_1 */
+
+  /* USER CODE END LmHandlerSend_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+  uint8_t next_addr = 0;
+
+  if ((appData == NULL) || (appData->Buffer == NULL))
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  if (appData->BufferSize > 0)
+  {
+    UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appData->Buffer, appData->BufferSize);
+    /* need to 8-align the next address */
+    next_addr = (appData->BufferSize + 7) & ~7;
+  }
+
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(&aLoraMbWrapShareBuffer[next_addr], nextTxIn, sizeof(UTIL_TIMER_Time_t));
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SEND_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) appData->Port;
+  com_buffer[i++] = (uint32_t) appData->BufferSize;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_buffer[i++] = (uint32_t) isTxConfirmed;
+  if (nextTxIn == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) &aLoraMbWrapShareBuffer[next_addr];
+  }
+  com_buffer[i++] = (uint32_t) allowDelayedTx;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  if (nextTxIn != NULL)
+  {
+    UTIL_MEM_cpy_8(nextTxIn, &aLoraMbWrapShareBuffer[next_addr], sizeof(UTIL_TIMER_Time_t));
+  }
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSend_2 */
+
+  /* USER CODE END LmHandlerSend_2 */
+}
+
+void LmHandlerProcess(void)
+{
+  /* USER CODE BEGIN LmHandlerProcess_1 */
+
+  /* USER CODE END LmHandlerProcess_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_PROCESS_ID;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN LmHandlerProcess_2 */
+
+  /* USER CODE END LmHandlerProcess_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerRequestClass(DeviceClass_t newClass)
+{
+  /* USER CODE BEGIN LmHandlerRequestClass_1 */
+
+  /* USER CODE END LmHandlerRequestClass_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_REQUEST_CLASS_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) newClass;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerRequestClass_2 */
+
+  /* USER CODE END LmHandlerRequestClass_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetCurrentClass(DeviceClass_t *deviceClass)
+{
+  /* USER CODE BEGIN LmHandlerGetCurrentClass_1 */
+
+  /* USER CODE END LmHandlerGetCurrentClass_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (deviceClass == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, deviceClass, sizeof(DeviceClass_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_CLASS_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(deviceClass, aLoraMbWrapShareBuffer, sizeof(DeviceClass_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetCurrentClass_2 */
+
+  /* USER CODE END LmHandlerGetCurrentClass_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetDevEUI(uint8_t *devEUI)
+{
+  /* USER CODE BEGIN LmHandlerGetDevEUI_1 */
+
+  /* USER CODE END LmHandlerGetDevEUI_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (devEUI == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, SE_EUI_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_DEVEUI_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetDevEUI_2 */
+
+  /* USER CODE END LmHandlerGetDevEUI_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetDevEUI(uint8_t *devEUI)
+{
+  /* USER CODE BEGIN LmHandlerSetDevEUI_1 */
+
+  /* USER CODE END LmHandlerSetDevEUI_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (devEUI == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devEUI, SE_EUI_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_DEVEUI_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(devEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetDevEUI_2 */
+
+  /* USER CODE END LmHandlerSetDevEUI_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppEUI(uint8_t *appEUI)
+{
+  /* USER CODE BEGIN LmHandlerGetAppEUI_1 */
+
+  /* USER CODE END LmHandlerGetAppEUI_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appEUI == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, SE_EUI_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPEUI_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppEUI_2 */
+
+  /* USER CODE END LmHandlerGetAppEUI_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppEUI(uint8_t *appEUI)
+{
+  /* USER CODE BEGIN LmHandlerSetAppEUI_1 */
+
+  /* USER CODE END LmHandlerSetAppEUI_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appEUI == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appEUI, SE_EUI_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPEUI_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appEUI, aLoraMbWrapShareBuffer, SE_EUI_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppEUI_2 */
+
+  /* USER CODE END LmHandlerSetAppEUI_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNwkKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkKey(uint8_t *nwkKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNwkKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppKey_1 */
+
+  /* USER CODE END LmHandlerGetAppKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppKey_2 */
+
+  /* USER CODE END LmHandlerGetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppKey(uint8_t *appKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppKey_1 */
+
+  /* USER CODE END LmHandlerSetAppKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppKey_2 */
+
+  /* USER CODE END LmHandlerSetAppKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerGetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNwkSKey(uint8_t *nwkSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_1 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (nwkSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, nwkSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(nwkSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNwkSKey_2 */
+
+  /* USER CODE END LmHandlerSetNwkSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerGetAppSKey_1 */
+
+  /* USER CODE END LmHandlerGetAppSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_APPSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAppSKey_2 */
+
+  /* USER CODE END LmHandlerGetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAppSKey(uint8_t *appSKey)
+{
+  /* USER CODE BEGIN LmHandlerSetAppSKey_1 */
+
+  /* USER CODE END LmHandlerSetAppSKey_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (appSKey == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, appSKey, SE_KEY_SIZE);
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_APPSKEY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(appSKey, aLoraMbWrapShareBuffer, SE_KEY_SIZE);
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAppSKey_2 */
+
+  /* USER CODE END LmHandlerSetAppSKey_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetNetworkID(uint32_t *networkId)
+{
+  /* USER CODE BEGIN LmHandlerGetNetworkID_1 */
+
+  /* USER CODE END LmHandlerGetNetworkID_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (networkId == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_NWKID_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  *networkId = (aLoraMbWrapShareBuffer[3] << 24) | (aLoraMbWrapShareBuffer[2] << 16) | (aLoraMbWrapShareBuffer[1] << 8) | aLoraMbWrapShareBuffer[0];
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetNetworkID_2 */
+
+  /* USER CODE END LmHandlerGetNetworkID_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetNetworkID(uint32_t networkId)
+{
+  /* USER CODE BEGIN LmHandlerSetNetworkID_1 */
+
+  /* USER CODE END LmHandlerSetNetworkID_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_NWKID_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = networkId;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetNetworkID_2 */
+
+  /* USER CODE END LmHandlerSetNetworkID_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetDevAddr(uint32_t *devAddr)
+{
+  /* USER CODE BEGIN LmHandlerGetDevAddr_1 */
+
+  /* USER CODE END LmHandlerGetDevAddr_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (devAddr == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, devAddr, sizeof(uint32_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_DEVADDR_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(devAddr, aLoraMbWrapShareBuffer, sizeof(uint32_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetDevAddr_2 */
+
+  /* USER CODE END LmHandlerGetDevAddr_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetDevAddr(uint32_t devAddr)
+{
+  /* USER CODE BEGIN LmHandlerSetDevAddr_1 */
+
+  /* USER CODE END LmHandlerSetDevAddr_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_DEVADDR_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = devAddr;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetDevAddr_2 */
+
+  /* USER CODE END LmHandlerSetDevAddr_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetActiveRegion(LoRaMacRegion_t *region)
+{
+  /* USER CODE BEGIN LmHandlerGetActiveRegion_1 */
+
+  /* USER CODE END LmHandlerGetActiveRegion_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (region == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, region, sizeof(LoRaMacRegion_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_ACTIVE_REGION_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(region, aLoraMbWrapShareBuffer, sizeof(LoRaMacRegion_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetActiveRegion_2 */
+
+  /* USER CODE END LmHandlerGetActiveRegion_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetActiveRegion(LoRaMacRegion_t region)
+{
+  /* USER CODE BEGIN LmHandlerSetActiveRegion_1 */
+
+  /* USER CODE END LmHandlerSetActiveRegion_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, &region, sizeof(LoRaMacRegion_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_ACTIVE_REGION_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetActiveRegion_2 */
+
+  /* USER CODE END LmHandlerSetActiveRegion_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetAdrEnable(bool *adrEnable)
+{
+  /* USER CODE BEGIN LmHandlerGetAdrEnable_1 */
+
+  /* USER CODE END LmHandlerGetAdrEnable_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (adrEnable == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, adrEnable, sizeof(bool));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_ADR_ENABLE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(adrEnable, aLoraMbWrapShareBuffer, sizeof(bool));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetAdrEnable_2 */
+
+  /* USER CODE END LmHandlerGetAdrEnable_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetAdrEnable(bool adrEnable)
+{
+  /* USER CODE BEGIN LmHandlerSetAdrEnable_1 */
+
+  /* USER CODE END LmHandlerSetAdrEnable_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_ADR_ENABLE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) adrEnable;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetAdrEnable_2 */
+
+  /* USER CODE END LmHandlerSetAdrEnable_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetTxDatarate(int8_t *txDatarate)
+{
+  /* USER CODE BEGIN LmHandlerGetTxDatarate_1 */
+
+  /* USER CODE END LmHandlerGetTxDatarate_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (txDatarate == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, txDatarate, sizeof(int8_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_TX_DATARATE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(txDatarate, aLoraMbWrapShareBuffer, sizeof(int8_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetTxDatarate_2 */
+
+  /* USER CODE END LmHandlerGetTxDatarate_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetTxDatarate(int8_t txDatarate)
+{
+  /* USER CODE BEGIN LmHandlerSetTxDatarate_1 */
+
+  /* USER CODE END LmHandlerSetTxDatarate_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_TX_DATARATE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) txDatarate;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetTxDatarate_2 */
+
+  /* USER CODE END LmHandlerSetTxDatarate_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetDutyCycleEnable(bool *dutyCycleEnable)
+{
+  /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_1 */
+
+  /* USER CODE END LmHandlerGetDutyCycleEnable_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (dutyCycleEnable == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, dutyCycleEnable, sizeof(bool));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_DUTY_CYCLE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(dutyCycleEnable, aLoraMbWrapShareBuffer, sizeof(bool));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetDutyCycleEnable_2 */
+
+  /* USER CODE END LmHandlerGetDutyCycleEnable_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetDutyCycleEnable(bool dutyCycleEnable)
+{
+  /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_1 */
+
+  /* USER CODE END LmHandlerSetDutyCycleEnable_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_DUTY_CYCLE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) dutyCycleEnable;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetDutyCycleEnable_2 */
+
+  /* USER CODE END LmHandlerSetDutyCycleEnable_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetRX2Params(RxChannelParams_t *rxParams)
+{
+  /* USER CODE BEGIN LmHandlerGetRX2Params_1 */
+
+  /* USER CODE END LmHandlerGetRX2Params_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (rxParams == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxParams, sizeof(RxChannelParams_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_RX2_PARAMS_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetRX2Params_2 */
+
+  /* USER CODE END LmHandlerGetRX2Params_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetTxPower(int8_t *txPower)
+{
+  /* USER CODE BEGIN LmHandlerGetTxPower_1 */
+
+  /* USER CODE END LmHandlerGetTxPower_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (txPower == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, txPower, sizeof(int8_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_TX_PWR_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(txPower, aLoraMbWrapShareBuffer, sizeof(int8_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetTxPower_2 */
+
+  /* USER CODE END LmHandlerGetTxPower_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetRx1Delay(uint32_t *rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerGetRx1Delay_1 */
+
+  /* USER CODE END LmHandlerGetRx1Delay_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (rxDelay == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxDelay, sizeof(uint32_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_RX1_DELAY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetRx1Delay_2 */
+
+  /* USER CODE END LmHandlerGetRx1Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetRx2Delay(uint32_t *rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerGetRx2Delay_1 */
+
+  /* USER CODE END LmHandlerGetRx2Delay_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (rxDelay == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxDelay, sizeof(uint32_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_RX2_DELAY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetRx2Delay_2 */
+
+  /* USER CODE END LmHandlerGetRx2Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetJoinRx1Delay(uint32_t *rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_1 */
+
+  /* USER CODE END LmHandlerGetJoinRx1Delay_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (rxDelay == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxDelay, sizeof(uint32_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_JOIN_RX1_DELAY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetJoinRx1Delay_2 */
+
+  /* USER CODE END LmHandlerGetJoinRx1Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetJoinRx2Delay(uint32_t *rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_1 */
+
+  /* USER CODE END LmHandlerGetJoinRx2Delay_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (rxDelay == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxDelay, sizeof(uint32_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_JOIN_RX2_DELAY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(rxDelay, aLoraMbWrapShareBuffer, sizeof(uint32_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetJoinRx2Delay_2 */
+
+  /* USER CODE END LmHandlerGetJoinRx2Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetRX2Params(RxChannelParams_t *rxParams)
+{
+  /* USER CODE BEGIN LmHandlerSetRX2Params_1 */
+
+  /* USER CODE END LmHandlerSetRX2Params_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (rxParams == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, rxParams, sizeof(RxChannelParams_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_RX2_PARAMS_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(rxParams, aLoraMbWrapShareBuffer, sizeof(RxChannelParams_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetRX2Params_2 */
+
+  /* USER CODE END LmHandlerSetRX2Params_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetTxPower(int8_t txPower)
+{
+  /* USER CODE BEGIN LmHandlerSetTxPower_1 */
+
+  /* USER CODE END LmHandlerSetTxPower_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_TX_PWR_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) txPower;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetTxPower_2 */
+
+  /* USER CODE END LmHandlerSetTxPower_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetRx1Delay(uint32_t rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerSetRx1Delay_1 */
+
+  /* USER CODE END LmHandlerSetRx1Delay_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_RX1_DELAY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rxDelay;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetRx1Delay_2 */
+
+  /* USER CODE END LmHandlerSetRx1Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetRx2Delay(uint32_t rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerSetRx2Delay_1 */
+
+  /* USER CODE END LmHandlerSetRx2Delay_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_RX2_DELAY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rxDelay;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetRx2Delay_2 */
+
+  /* USER CODE END LmHandlerSetRx2Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetJoinRx1Delay(uint32_t rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_1 */
+
+  /* USER CODE END LmHandlerSetJoinRx1Delay_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_JOIN_RX1_DELAY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rxDelay;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetJoinRx1Delay_2 */
+
+  /* USER CODE END LmHandlerSetJoinRx1Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetJoinRx2Delay(uint32_t rxDelay)
+{
+  /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_1 */
+
+  /* USER CODE END LmHandlerSetJoinRx2Delay_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_JOIN_RX2_DELAY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rxDelay;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetJoinRx2Delay_2 */
+
+  /* USER CODE END LmHandlerSetJoinRx2Delay_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetPingPeriodicity(uint8_t *pingPeriodicity)
+{
+  /* USER CODE BEGIN LmHandlerGetPingPeriodicity_1 */
+
+  /* USER CODE END LmHandlerGetPingPeriodicity_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (pingPeriodicity == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, pingPeriodicity, sizeof(uint8_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_PING_PERIODICITY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(pingPeriodicity, aLoraMbWrapShareBuffer, sizeof(uint8_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetPingPeriodicity_2 */
+
+  /* USER CODE END LmHandlerGetPingPeriodicity_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerSetPingPeriodicity(uint8_t pingPeriodicity)
+{
+  /* USER CODE BEGIN LmHandlerSetPingPeriodicity_1 */
+
+  /* USER CODE END LmHandlerSetPingPeriodicity_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_SET_PING_PERIODICITY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) pingPeriodicity;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerSetPingPeriodicity_2 */
+
+  /* USER CODE END LmHandlerSetPingPeriodicity_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerGetBeaconState(BeaconState_t *beaconState)
+{
+  /* USER CODE BEGIN LmHandlerGetBeaconState_1 */
+
+  /* USER CODE END LmHandlerGetBeaconState_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (beaconState == NULL)
+  {
+    return LORAMAC_HANDLER_ERROR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8(aLoraMbWrapShareBuffer, beaconState, sizeof(BeaconState_t));
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_GET_BEACON_STATE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aLoraMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  UTIL_MEM_cpy_8(beaconState, aLoraMbWrapShareBuffer, sizeof(BeaconState_t));
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerGetBeaconState_2 */
+
+  /* USER CODE END LmHandlerGetBeaconState_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerLinkCheckReq(void)
+{
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_1 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_LINK_CHECK_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerLinkCheckReq_2 */
+
+  /* USER CODE END LmHandlerLinkCheckReq_2 */
+}
+
+LmHandlerErrorStatus_t LmHandlerDeviceTimeReq(void)
+{
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_1 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_DEVICE_TIME_REQ_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+
+  ret = com_obj->ReturnVal;
+  return (LmHandlerErrorStatus_t) ret;
+  /* USER CODE BEGIN LmHandlerDeviceTimeReq_2 */
+
+  /* USER CODE END LmHandlerDeviceTimeReq_2 */
+}
+
+void LoraInfo_Init(void)
+{
+  /* USER CODE BEGIN LoraInfo_Init_1 */
+
+  /* USER CODE END LoraInfo_Init_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetLoraFeatureCmdComPtr();
+  com_obj->MsgId = LMHANDLER_INFO_INIT_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_LoraSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN LoraInfo_Init_2 */
+
+  /* USER CODE END LoraInfo_Init_2 */
+}
+
+LoraInfo_t *LoraInfo_GetPtr(void)
+{
+  /* USER CODE BEGIN LoraInfo_GetPtr_1 */
+
+  /* USER CODE END LoraInfo_GetPtr_1 */
+  FEAT_INFO_Param_t *p_feature;
+
+  p_feature = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_LORAWAN_ID);
+  return (LoraInfo_t *) p_feature->Feat_Info_Config_Ptr;
+  /* USER CODE BEGIN LoraInfo_GetPtr_2 */
+
+  /* USER CODE END LoraInfo_GetPtr_2 */
+}
+
+void Process_Lora_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Lora_Notif_1 */
+
+  /* USER CODE END Process_Lora_Notif_1 */
+  uint32_t *com_buffer = ComObj->ParamBuf;
+  uint32_t cb_ret = 0;
+
+  /* Lora Notif received */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4<(LoRa)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    /* callbacks */
+    case LMHANDLER_GET_BATTERY_LEVEL_CB_ID:
+      if (callback_mbwrapper.GetBatteryLevel != NULL)
+      {
+        cb_ret = (uint32_t) callback_mbwrapper.GetBatteryLevel();
+      }
+      else
+      {
+        Error_Handler();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  cb_ret; /* */
+      break;
+
+    case LMHANDLER_GET_TEMPERATURE_CB_ID:
+      if (callback_mbwrapper.GetTemperature != NULL)
+      {
+        cb_ret = (uint32_t) callback_mbwrapper.GetTemperature();
+      }
+      else
+      {
+        Error_Handler();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  cb_ret; /* */
+      break;
+
+    case LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNvmDataChange != NULL)
+      {
+        callback_mbwrapper.OnNvmDataChange((LmHandlerNvmContextStates_t) com_buffer[0], (uint16_t) com_buffer[1]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnNetworkParametersChange != NULL)
+      {
+        callback_mbwrapper.OnNetworkParametersChange((CommissioningParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_JOIN_REQ_CB_ID:
+      if (callback_mbwrapper.OnJoinRequest != NULL)
+      {
+        callback_mbwrapper.OnJoinRequest((LmHandlerJoinParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_TX_DATA_CB_ID:
+      if (callback_mbwrapper.OnTxData != NULL)
+      {
+        callback_mbwrapper.OnTxData((LmHandlerTxParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_RX_DATA_CB_ID:
+      if (callback_mbwrapper.OnRxData != NULL)
+      {
+        callback_mbwrapper.OnRxData((LmHandlerAppData_t *) com_buffer[0], (LmHandlerRxParams_t *) com_buffer[1]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_CLASS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnClassChange != NULL)
+      {
+        callback_mbwrapper.OnClassChange((DeviceClass_t) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID:
+      if (callback_mbwrapper.OnBeaconStatusChange != NULL)
+      {
+        callback_mbwrapper.OnBeaconStatusChange((LmHandlerBeaconParams_t *) com_buffer[0]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID:
+      if (callback_mbwrapper.OnSysTimeUpdate != NULL)
+      {
+        callback_mbwrapper.OnSysTimeUpdate();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+    default:
+      break;
+  }
+
+  /* Lora sending ack */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4>(LoRa)\r\n");
+  MBMUX_AcknowledgeSnd(FEAT_INFO_LORAWAN_ID);
+  /* USER CODE BEGIN Process_Lora_Notif_2 */
+
+  /* USER CODE END Process_Lora_Notif_2 */
+}
+
+/**
+  * @}
+  *
+  */
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
new file mode 100644
index 00000000..1218ce87
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    LmHandler_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the LmHandler
+  *          interface shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LMHANDLER_MBWRAPPER_CM4_H__
+#define __LMHANDLER_MBWRAPPER_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the LmHandler events callbacks from CM0+
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Lora_Notif(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__LMHANDLER_MBWRAPPER_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
new file mode 100644
index 00000000..8328a537
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c
@@ -0,0 +1,476 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.c
+  * @author  MCD Application Team
+  * @brief   CM4 side multiplexer to map features to IPCC channels
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "assert.h"
+#include "stddef.h"
+#include "stm32_mem.h"
+#include "ipcc_if.h"
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MB_CHANNEL_NOT_REGISTERED 0xFF
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
+static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
+static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
+static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
+static void MBMUX_IsrNotRegistered(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
+{
+  /* USER CODE BEGIN MBMUX_Init_1 */
+
+  /* USER CODE END MBMUX_Init_1 */
+  uint8_t i;
+  IPCC_IF_Init(MBMUX_IsrResponseRcvCb, MBMUX_IsrNotificationRcvCb);
+
+  p_MBMUX_ComTable = pMBMUX_ComTable;
+
+  for (i = 0; i < FEAT_INFO_CNT; i++)
+  {
+    p_MBMUX_ComTable->MBMUXMapping[i][MBMUX_CMD_RESP] = MB_CHANNEL_NOT_REGISTERED;
+    p_MBMUX_ComTable->MBMUXMapping[i][MBMUX_NOTIF_ACK] = MB_CHANNEL_NOT_REGISTERED;
+  }
+
+  for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
+  {
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgId = 0;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm4Cb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].ParamCnt = 0;
+    p_MBMUX_ComTable->MBCmdRespParam[i].ParamBuf = NULL;
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgId = 0;
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm4Cb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBNotifAckParam[i].ParamCnt = 0;
+    p_MBMUX_ComTable->MBNotifAckParam[i].ParamBuf = NULL;
+  }
+  /* USER CODE BEGIN MBMUX_Init_Last */
+
+  /* USER CODE END MBMUX_Init_Last */
+}
+
+void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
+{
+  /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
+
+  /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_1 */
+  p_MBMUX_Cm0plusFeatureList = pCM0PLUS_FeatureList;
+  /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_Last */
+
+  /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
+}
+
+int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
+{
+  int8_t check_if_feature_provided_by_cm0plus = 0;
+  uint8_t channel_idx = MB_CHANNEL_NOT_REGISTERED;
+  int8_t ret = -1; /* no more ipcc channels available */
+  uint8_t check_existing_feature_registration;
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_1 */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_1 */
+
+  if (e_featID == FEAT_INFO_SYSTEM_ID)
+  {
+    check_if_feature_provided_by_cm0plus = 1;
+  }
+  else
+  {
+    check_if_feature_provided_by_cm0plus = MBMUX_CheckIfFeatureSupportedByCm0plus(e_featID);
+  }
+
+  if (check_if_feature_provided_by_cm0plus == 1)
+  {
+    check_existing_feature_registration = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+    if (check_existing_feature_registration == MB_CHANNEL_NOT_REGISTERED)
+    {
+      if (e_featID == FEAT_INFO_SYSTEM_ID)
+      {
+        channel_idx = 0;
+      }
+      else
+      {
+        channel_idx = MBMUX_FindChStillUnregistered(ComType);
+      }
+    }
+    else
+    {
+      /* previous registration will be replaced by the given buffers */
+      channel_idx = check_existing_feature_registration;
+    }
+  }
+  else
+  {
+    ret = -2; /* feature not provided by CM0PLUS */
+  }
+
+  if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
+  {
+    if (ComType == MBMUX_CMD_RESP)
+    {
+      p_MBMUX_ComTable->MBMUXMapping[e_featID][MBMUX_CMD_RESP] = channel_idx;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm4Cb = MsgCb;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].BufSize = ComBufSize;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].ParamBuf = ComBuffer;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].ReturnVal = 0;
+    }
+    else
+    {
+      p_MBMUX_ComTable->MBMUXMapping[e_featID][MBMUX_NOTIF_ACK] = channel_idx;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm4Cb = MsgCb;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].BufSize = ComBufSize;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].ParamBuf = ComBuffer;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].ReturnVal = 0;
+    }
+    ret = channel_idx;
+  }
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_Last */
+  return ret;
+}
+
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
+
+  /* USER CODE END MBMUX_UnregisterFeature_1 */
+  uint8_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  /* Function not completely implemented:
+     Missing code that sends via Mbmux a SysCmd to tell CM0PLUS to unregister it's callback */
+  /* ... */
+
+  if (mb_ch < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)
+    {
+      /* Channel should have been unregistered first on CM0PLUS to avoid getting Irq with no cb */
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].BufSize = 0;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ParamBuf = NULL;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ReturnVal = 0;
+    }
+    else
+    {
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
+      /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
+      IPCC_IF_AcknowledgeSnd(mb_ch);
+
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize = 0;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamBuf = NULL;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ReturnVal = 0;
+    }
+  }
+
+  p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType] = MB_CHANNEL_NOT_REGISTERED;
+
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
+
+  /* USER CODE END MBMUX_UnregisterFeature_Last */
+}
+
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_1 */
+  uint32_t channel_idx;
+  MBMUX_ComParam_t *com_param_ptr = NULL;
+
+  channel_idx = MBMUX_GetFeatureChIdx(e_featID, ComType);
+  if (channel_idx < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBCmdRespParam[channel_idx];
+    }
+    else
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBNotifAckParam[channel_idx];
+    }
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_Last */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_Last */
+}
+
+int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_CommandSnd_1 */
+
+  /* USER CODE END MBMUX_CommandSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_CMD_RESP);
+  if (p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBCmdRespParam[mb_ch].BufSize)
+  {
+    Error_Handler();
+  }
+  return IPCC_IF_CommandSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_CommandSnd_Last */
+
+  /* USER CODE END MBMUX_CommandSnd_Last */
+}
+
+uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
+
+  /* USER CODE END MBMUX_AcknowledgeSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
+  return IPCC_IF_AcknowledgeSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_AcknowledgeSnd_Last */
+
+  /* USER CODE END MBMUX_AcknowledgeSnd_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
+{
+  int8_t ret = 0;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  FEAT_INFO_Param_t  i_feature;
+  /* USER CODE BEGIN MBMUX_CheckIfFeatureSupportedByCm0plus_1 */
+
+  /* USER CODE END MBMUX_CheckIfFeatureSupportedByCm0plus_1 */
+
+  if (p_MBMUX_Cm0plusFeatureList != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_MBMUX_Cm0plusFeatureList->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      i_feature = *(i + p_MBMUX_Cm0plusFeatureList->Feat_Info_TableAddress);
+      if (i_feature.Feat_Info_Feature_Id == e_featID)
+      {
+        ret = 1;
+        break;
+      }
+
+    }
+  }
+  /* USER CODE BEGIN MBMUX_CheckIfFeatureSupportedByCm0plus_Last */
+
+  /* USER CODE END MBMUX_CheckIfFeatureSupportedByCm0plus_Last */
+  return ret;
+}
+
+static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrResponseRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
+  /* call registered callback */
+  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm4Cb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrResponseRcvCb_Last */
+  return;
+}
+
+static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrNotificationRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
+  /* call registered callback */
+  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm4Cb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrNotificationRcvCb_Last */
+  return;
+}
+
+static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
+
+  /* USER CODE END MBMUX_FindChStillUnregistered_1 */
+  uint8_t feat_id;
+  uint8_t ch;
+  uint8_t already_used;
+
+  /* First two channels are reserved to SYSTEM, TRACE and SKS */
+  if (ComType == MBMUX_CMD_RESP)
+  {
+    for (ch = 1; ch < MBMUX_CHANNEL_NUMBER; ch++)
+    {
+      already_used = 0;
+      for (feat_id = 0; feat_id < FEAT_INFO_CNT; feat_id++)
+      {
+        if (p_MBMUX_ComTable->MBMUXMapping[feat_id][MBMUX_CMD_RESP] == ch)
+        {
+          already_used = 1;
+        }
+      }
+      if (already_used == 0)
+      {
+        break;
+      }
+    }
+  }
+  else  /* RX */
+  {
+    for (ch = 1; ch < MBMUX_CHANNEL_NUMBER; ch++)
+    {
+      already_used = 0;
+      for (feat_id = 0; feat_id < FEAT_INFO_CNT; feat_id++)
+      {
+        if (p_MBMUX_ComTable->MBMUXMapping[feat_id][MBMUX_NOTIF_ACK] == ch)
+        {
+          already_used = 1;
+        }
+      }
+      if (already_used == 0)
+      {
+        break;
+      }
+    }
+  }
+
+  if (ch == MBMUX_CHANNEL_NUMBER)
+  {
+    return MB_CHANNEL_NOT_REGISTERED;
+  }
+  else
+  {
+    return (ch);
+  }
+  /* USER CODE BEGIN MBMUX_FindChStillUnregistered_Last */
+
+  /* USER CODE END MBMUX_FindChStillUnregistered_Last */
+}
+
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_1 */
+  return p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType];
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_Last */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_Last */
+}
+
+static void MBMUX_IsrNotRegistered(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_1 */
+  Error_Handler();
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
new file mode 100644
index 00000000..a15773f5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h
@@ -0,0 +1,121 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.h
+  * @author  MCD Application Team
+  * @brief   API which interfaces CM4 to IPCC
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_CM4_H__
+#define __MBMUX_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
+void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
+
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUX_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
new file mode 100644
index 00000000..85c7237c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c
@@ -0,0 +1,235 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_lora.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to register and handle LoraWAN via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_lora.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "LoRaMac.h"
+#include "LmHandler_mbwrapper.h"
+#include "utilities_def.h"
+#include "lora_app_version.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *LoraComObj;
+
+/**
+  * @brief LoRa cmd buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraCmdRespBuff[MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief LoRa notif buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aLoraNotifAckBuff[MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   LORA response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the LORA com param buffer
+  */
+static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the LORA com param buffer
+  */
+static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj);
+
+/**
+  * @brief   LORA task to process the notification
+  */
+static void MBMUXIF_TaskLoraNotifRcv(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_LoraInit(void)
+{
+  FEAT_INFO_Param_t *p_cm0plus_system_info;
+  int32_t cm0_vers = 0;
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_LoraInit_1 */
+
+  /* USER CODE END MBMUXIF_LoraInit_1 */
+
+  p_cm0plus_system_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
+  /* abstract CM0 release version from RC (release candidate) and compare */
+  cm0_vers = p_cm0plus_system_info->Feat_Info_Feature_Version >> __APP_VERSION_SUB2_SHIFT;
+  if (cm0_vers < (__LAST_COMPATIBLE_CM0_RELEASE >> __APP_VERSION_SUB2_SHIFT))
+  {
+    ret = -4; /* version incompatibility */
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP, MBMUXIF_IsrLoraRespRcvCb, aLoraCmdRespBuff, sizeof(aLoraCmdRespBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_LORAWAN_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrLoraNotifRcvCb, aLoraNotifAckBuff, sizeof(aLoraNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbLoRaNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskLoraNotifRcv);
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_LORAWAN_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  if (ret >= 0)
+  {
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_LoraInit_Last */
+
+  /* USER CODE END MBMUXIF_LoraInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_LORAWAN_ID, MBMUX_CMD_RESP);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetLoraFeatureCmdComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetLoraFeatureCmdComPtr_Last */
+}
+
+void MBMUXIF_LoraSendCmd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_LoraSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_LoraSendCmd_1 */
+  if (MBMUX_CommandSnd(FEAT_INFO_LORAWAN_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbLoRaRespRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_LoraSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_LoraSendCmd_Last */
+}
+
+void MBMUXIF_LoraSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_LoraSendAck_1 */
+
+  /* USER CODE END MBMUXIF_LoraSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_LORAWAN_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_LoraSendAck_Last */
+
+  /* USER CODE END MBMUXIF_LoraSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrLoraRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbLoRaRespRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrLoraRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrLoraRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrLoraNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_1 */
+  LoraComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbLoRaNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrLoraNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrLoraNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskLoraNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskLoraNotifRcv_1 */
+  Process_Lora_Notif(LoraComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskLoraNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskLoraNotifRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
new file mode 100644
index 00000000..ff6c5791
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h
@@ -0,0 +1,92 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_lora.h
+  * @author  MCD Application Team
+  * @brief   API provided to CM4 application to register and handle LoraWAN via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_LORA_CM4_H__
+#define __MBMUXIF_LORA_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers LORA feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_LoraInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Lora feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetLoraFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Lora-Cmd via Ipcc and Wait for the response
+  */
+void MBMUXIF_LoraSendCmd(void);
+
+/**
+  * @brief   Sends a Lora-Ack via Ipcc without waiting for the ack
+  */
+void MBMUXIF_LoraSendAck(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_LORA_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
new file mode 100644
index 00000000..81fc561a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c
@@ -0,0 +1,231 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_radio.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "radio_mbwrapper.h"
+#include "subghz_phy_version.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *RadioComObj;
+
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
+static void MBMUXIF_TaskRadioNotifRcv(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_RadioInit(void)
+{
+  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_1 */
+
+  /* USER CODE END MBMUXIF_RadioInit_1 */
+
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
+  if (p_cm0plus_specific_features_info->Feat_Info_Feature_Version != __SUBGHZ_PHY_VERSION)
+  {
+    ret = -4; /* version mismatch */
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP, MBMUXIF_IsrRadioRespRcvCb, aRadioCmdRespBuff, sizeof(aRadioCmdRespBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrRadioNotifRcvCb, aRadioNotifAckBuff, sizeof(aRadioNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskRadioNotifRcv);
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_RADIO_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  if (ret >= 0)
+  {
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_Last */
+
+  /* USER CODE END MBMUXIF_RadioInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
+}
+
+void MBMUXIF_RadioSendCmd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendCmd_1 */
+  if (MBMUX_CommandSnd(FEAT_INFO_RADIO_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbRadioRespRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendCmd_Last */
+}
+
+void MBMUXIF_RadioSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_RADIO_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendAck_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbRadioRespRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_1 */
+  RadioComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskRadioNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifRcv_1 */
+  Process_Radio_Notif(RadioComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
new file mode 100644
index 00000000..3d565fcd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h
@@ -0,0 +1,93 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_RADIO_CM4_H__
+#define __MBMUXIF_RADIO_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
+void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
+void MBMUXIF_RadioSendAck(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_RADIO_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
new file mode 100644
index 00000000..1884bb44
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c
@@ -0,0 +1,566 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_sys.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "stm32_timer.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
+static __IO uint8_t MbSystemRespRcvFlag;
+
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
+
+MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
+MBMUX_ComParam_t *SystemComObj;
+
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
+static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_SystemInit(void)
+{
+  int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
+
+  /* USER CODE END MBMUXIF_SystemInit_1 */
+
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
+  {
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
+
+    /* write FLASH->IPCCBR option byte */
+    /* Unlock the Flash to enable the flash control register access *************/
+    HAL_FLASH_Unlock();
+    /* Clear OPTVERR bit set on virgin samples */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+    /* Unlock the Options Bytes *************************************************/
+    HAL_FLASH_OB_Unlock();
+
+    /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
+
+    if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
+    {
+      /*
+      Error occurred while setting option bytes configuration.
+      User can add here some code to deal with this error.
+      To know the code error, user can call function 'HAL_FLASH_GetError()'
+      */
+      Error_Handler();
+    }
+
+    /* Start the Option Bytes programming process */
+    if (HAL_FLASH_OB_Launch() != HAL_OK)
+    {
+      /*
+      Error occurred while reloading option bytes configuration.
+      User can add here some code to deal with this error.
+      To know the code error, user can call function 'HAL_FLASH_GetError()'
+      */
+      Error_Handler();
+    }
+
+    /* Notice: After HAL_FLASH_OB_Launch() the chip is reset so next code is not executed */
+    /* Implemented anyway to be aligned with other projects (SBSFU, etc) */
+    /* Lock the Options Bytes ***************************************************/
+    (void) HAL_FLASH_OB_Lock();
+    /* Lock the Flash to disable the flash control register access  *********/
+    (void) HAL_FLASH_Lock();
+  }
+  /* Init MailBoxMultiplexer */
+  MBMUX_Init(pMb_RefTable);
+
+  ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemNotifRcvCb, aSystemNotifAckBuff, sizeof(aSystemNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = 0;
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
+
+  /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
+  /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
+
+  /* USER CODE END MBMUXIF_SystemInit_Last */
+  return ret;
+}
+
+int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
+
+  /* USER CODE END MBMUXIF_SystemPrio_Add_1 */
+
+  switch (SystemPrioFeat)
+  {
+    case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioARespRcvCb, aSystemPrioACmdRespBuff, sizeof(aSystemPrioACmdRespBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioANotifRcvCb, aSystemPrioANotifAckBuff, sizeof(aSystemPrioANotifAckBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_CMD_PRIO_B_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioBRespRcvCb, aSystemPrioBCmdRespBuff, sizeof(aSystemPrioBCmdRespBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioBNotifRcvCb, aSystemPrioBNotifAckBuff, sizeof(aSystemPrioBNotifAckBuff));
+      break;
+    }
+    default:
+      break;
+  }
+
+  if (ret >= 0)
+  {
+    /* Note: trace works on ISR, no need to associate a SEQ_TASK */
+
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(SystemPrioFeat);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_Last */
+
+  /* USER CODE END MBMUXIF_SystemPrio_Add_Last */
+  return ret;
+}
+
+void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
+{
+  pMb_RefTable->SynchronizeCpusAtBoot = flag;
+  /* USER CODE BEGIN MBMUXIF_SetCpusSynchroFlag */
+
+  /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
+}
+
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
+{
+  while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
+  {
+  }
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
+
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureCmdComPtr */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+}
+
+void MBMUXIF_SystemAllowSequencerForSysCmd(void)
+{
+  AllowSequencerForSysCmd = 1;
+  /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
+
+  /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
+}
+
+void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCmd_1 */
+
+  if (SystemPrioFeat == FEAT_INFO_SYSTEM_ID)
+  {
+
+    MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
+    if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
+    {
+      if (AllowSequencerForSysCmd)
+      {
+        UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
+      }
+      else
+      {
+        /* To avoid using Sequencer (& LowPower) during Init sequence for SysCmd  */
+        while (!MbSystemRespRcvFlag) {}
+      }
+    }
+    else
+    {
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCmd_Last */
+}
+
+void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendAck_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendAck_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Exported services --------------------------------------------------------*/
+FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
+{
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret = 0;
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusInfoListReq_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusInfoListReq_1 */
+
+  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
+  if (com_obj != NULL)
+  {
+    com_obj->MsgId = SYS_GET_INFO_LIST_MSG_ID;
+    com_obj->ParamCnt = 0;
+    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
+    /* waiting for ack event */
+
+    /* once event is received and semaphore released: */
+    ret = com_obj->ReturnVal;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusInfoListReq_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusInfoListReq_Last */
+  return (FEAT_INFO_List_t *) ret;   /* need to verify */
+}
+
+FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
+{
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
+  FEAT_INFO_Param_t  *p_feature = NULL;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  uint8_t found = 0;
+
+  /* USER CODE BEGIN MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
+
+  /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
+
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+
+  if (p_cm0plus_supported_features_list != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
+      if (p_feature->Feat_Info_Feature_Id == e_featID)
+      {
+        found = 1;
+        break;
+      }
+    }
+  }
+
+  if (!found)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemGetFeatCapabInfoPtr_Last */
+
+  /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_Last */
+  return  p_feature;
+}
+
+int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
+{
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret = 0;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusRegistrationCmd_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusRegistrationCmd_1 */
+
+  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
+  if (com_obj != NULL)
+  {
+    com_obj->MsgId = SYS_REGISTER_FEATURE_MSG_ID;
+    com_buffer = com_obj->ParamBuf;
+    com_buffer[i++] = (uint32_t) e_featID;
+    com_obj->ParamCnt = i;
+    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
+    /* waiting for event */
+    /* once event is received and semaphore released: */
+    ret = com_obj->ReturnVal;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusRegistrationCmd_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusRegistrationCmd_Last */
+  return (int8_t) ret;
+}
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_1 */
+
+  /* During "SystemInit sequence" Flag is used instead of Sequencer */
+  MbSystemRespRcvFlag = 1;
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  {
+    UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
+  }
+  /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_1 */
+  SystemComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskSystemNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskSystemNotifRcv_1 */
+  Process_Sys_Notif(SystemComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
+}
+
+static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
+  UTIL_TIMER_IRQ_Handler();
+  /* clear the IPCC flag (necessary even if this Notif is not blocking */
+  MBMUXIF_SystemSendAck(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBNotifRcvCb */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
new file mode 100644
index 00000000..61f37d9a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h
@@ -0,0 +1,147 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_SYS_CM4_H__
+#define __MBMUXIF_SYS_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "mbmux.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
+void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
+void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
+FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
+FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
+int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_SYS_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
new file mode 100644
index 00000000..c91551a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c
@@ -0,0 +1,156 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "stm32_mem.h"
+#include "stm32_adv_trace.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
+static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_TraceInit(void)
+{
+  int8_t ret;
+  /* USER CODE BEGIN MBMUXIF_TraceInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceInit_1 */
+
+  ret = MBMUX_RegisterFeature(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceNotifRcvCb, aTraceNotifAckBuff, sizeof(aTraceNotifAckBuff));
+  if (ret >= 0)
+  {
+    /* Note: trace works on ISR, no need to associate a SEQ_TASK */
+
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_TRACE_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceInit_Last */
+  return ret;
+}
+
+void MBMUXIF_TraceSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  MBMUX_ComParam_t *TraceComObj;
+  uint32_t  notif_ack_id;
+  uint8_t *buffer;
+  uint16_t bufsize;
+  UTIL_ADV_TRACE_Status_t ret;
+
+  TraceComObj = (MBMUX_ComParam_t *) ComObj;
+
+  notif_ack_id = TraceComObj->MsgId;
+
+  switch (notif_ack_id)
+  {
+    case TRACE_SEND_MSG_ID:
+      buffer = (uint8_t *) TraceComObj->ParamBuf[0];
+      bufsize = (uint16_t) TraceComObj->ParamBuf[1];
+      ret = UTIL_ADV_TRACE_Send(buffer, bufsize);
+      /* prepare ack buffer */
+      TraceComObj->ParamCnt = 0;
+      TraceComObj->ReturnVal = (uint32_t)ret;
+      break;
+
+    default:
+      break;
+  }
+
+  /* Send ack */
+  MBMUXIF_TraceSendAck();
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
new file mode 100644
index 00000000..f98a156d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h
@@ -0,0 +1,77 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_TRACE_CM4_H__
+#define __MBMUXIF_TRACE_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
+void MBMUXIF_TraceSendAck(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_TRACE_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
new file mode 100644
index 00000000..fd0e305e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c
@@ -0,0 +1,1425 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "radio_mbwrapper.h"
+#include "radio.h"
+#include "mbmux.h"
+#include "msg_id.h"
+#include "mbmuxif_radio.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static RadioEvents_t   radioevents_wrap;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* **********************************************************************
+ * Interrupts functions prototypes
+ ************************************************************************/
+/*!
+ * @brief Process radio irq
+ */
+static void RadioIrqProcess(void);
+
+/* **********************************************************************
+ * Middleware Interface functions prototypes
+ ************************************************************************/
+/*!
+ * \brief Initializes the radio
+ *
+ * \param[in] events Structure containing the driver callback functions
+ */
+static void RadioInit(RadioEvents_t *events);
+
+/*!
+ * Return current radio status
+ *
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ */
+static RadioState_t RadioGetStatus(void);
+
+/*!
+ * \brief Configures the radio with the given modem
+ *
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
+ */
+static void RadioSetModem(RadioModems_t modem);
+
+/*!
+ * \brief Sets the channel frequency
+ *
+ * \param[in] freq Channel RF frequency
+ */
+static void RadioSetChannel(uint32_t freq);
+
+/*!
+  * \brief Checks if the channel is free for the given time
+  *
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  *
+  * \retval isFree         [true: Channel is free, false: Channel is not free]
+  */
+static bool RadioIsChannelFree(uint32_t freq, uint32_t rxBandwidth,
+                               int16_t rssiThresh, uint32_t maxCarrierSenseTime);
+
+/*!
+ * \brief Generates a 32 bits random value based on the RSSI readings
+ *
+ * \remark This function sets the radio in LoRa modem mode and disables
+ *         all interrupts.
+ *         After calling this function either Radio.SetRxConfig or
+ *         Radio.SetTxConfig functions must be called.
+ *
+ * \retval randomValue    32 bits random value
+ */
+static uint32_t RadioRandom(void);
+
+/*!
+ * \brief Sets the reception parameters
+ *
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] datarate     Sets the Datarate
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: N/A ( set to 0 )
+ * \param[in] preambleLen  Sets the Preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
+ *                          FSK : timeout in number of bytes
+ *                          LoRa: timeout in symbols
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: OFF, 1: ON]
+ * \param[in] HopPeriod    Number of symbols between each hop
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: Number of symbols
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: not inverted, 1: inverted]
+ * \param[in] rxContinuous Sets the reception in continuous mode
+ *                          [false: single mode, true: continuous mode]
+ */
+static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
+                             uint32_t datarate, uint8_t coderate,
+                             uint32_t bandwidthAfc, uint16_t preambleLen,
+                             uint16_t symbTimeout, bool fixLen,
+                             uint8_t payloadLen,
+                             bool crcOn, bool FreqHopOn, uint8_t HopPeriod,
+                             bool iqInverted, bool rxContinuous);
+
+/*!
+ * \brief Sets the transmission parameters
+ *
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
+ *                          FSK : [Hz]
+ *                          LoRa: 0
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
+ *                          FSK : 0
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] datarate     Sets the Datarate
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] preambleLen  Sets the preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: OFF, 1: ON]
+ * \param[in] HopPeriod    Number of symbols between each hop
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: Number of symbols
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: not inverted, 1: inverted]
+ * \param[in] timeout      Transmission timeout [ms]
+ */
+static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
+                             uint32_t bandwidth, uint32_t datarate,
+                             uint8_t coderate, uint16_t preambleLen,
+                             bool fixLen, bool crcOn, bool FreqHopOn,
+                             uint8_t HopPeriod, bool iqInverted, uint32_t timeout);
+
+/*!
+ * \brief Checks if the given RF frequency is supported by the hardware
+ *
+ * \param[in] frequency RF frequency to be checked
+ * \retval isSupported [true: supported, false: unsupported]
+ */
+static bool RadioCheckRfFrequency(uint32_t frequency);
+
+/*!
+ * \brief Computes the packet time on air in ms for the given payload
+ *
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] spreadingFactor  Sets the Spreading Factor
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] preambleLen  Sets the Preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ *
+ * \retval airTime        Computed airTime (ms) for the given packet payload length
+ */
+static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
+                                  uint32_t spreadingFactor, uint8_t coderate,
+                                  uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                                  bool crcOn);
+
+/*!
+ * \brief Sends the buffer of size. Prepares the packet to be sent and sets
+ *        the radio in transmission
+ *
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
+ */
+static void RadioSend(uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Sets the radio in sleep mode
+ */
+static void RadioSleep(void);
+
+/*!
+ * \brief Sets the radio in standby mode
+ */
+static void RadioStandby(void);
+
+/*!
+ * \brief Sets the radio in reception mode for the given time
+ * \param[in] timeout Reception timeout [ms]
+ *                     [0: continuous, others timeout]
+ */
+static void RadioRx(uint32_t timeout);
+
+/*!
+ * \brief Start a Channel Activity Detection
+ */
+static void RadioStartCad(void);
+
+/*!
+ * \brief Sets the radio in continuous wave transmission mode
+ *
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
+ */
+static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
+
+/*!
+ * \brief Reads the current RSSI value
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
+ * \retval rssiValue Current RSSI value in [dBm]
+ */
+static int16_t RadioRssi(RadioModems_t modem);
+
+/*!
+ * \brief Writes the radio register at the specified address
+ *
+ * \param[in] addr Register address
+ * \param[in] data New register value
+ */
+static void RadioWrite(uint16_t addr, uint8_t data);
+
+/*!
+ * \brief Reads the radio register at the specified address
+ *
+ * \param[in] addr Register address
+ * \retval data Register value
+ */
+static uint8_t RadioRead(uint16_t addr);
+
+/*!
+ * \brief Writes multiple radio registers starting at address
+ *
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
+ */
+static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Reads multiple radio registers starting at address
+ *
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
+ */
+static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Sets the maximum payload length.
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
+ */
+static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
+
+/*!
+ * \brief Sets the network to public or private. Updates the sync byte.
+ *
+ * \remark Applies to LoRa modem only
+ *
+ * \param[in] enable if true, it enables a public network
+ */
+static void RadioSetPublicNetwork(bool enable);
+
+/*!
+ * \brief Gets the time required for the board plus radio to get out of sleep.[ms]
+ *
+ * \retval time Radio plus board wakeup time in ms.
+ */
+static uint32_t RadioGetWakeUpTime(void);
+
+/*!
+ * \brief Sets the radio in reception mode with Max LNA gain for the given time
+ * \param[in] timeout Reception timeout [ms]
+ *                     [0: continuous, others timeout]
+ */
+static void RadioRxBoosted(uint32_t timeout);
+
+/*!
+ * \brief Sets the Rx duty cycle management parameters
+ *
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
+ */
+static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
+
+/*!
+ * \brief Set Tx PRBS modulated wave
+ */
+static void RadioTxPrbs(void);
+
+/*!
+ * \brief Set Tx continuous wave
+ * \param[in]  power  Tx power level [0..15]
+ */
+static void RadioTxCw(int8_t power);
+
+/*!
+ * \brief Sets the reception parameters
+ *
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
+ *                          fsk field to be used if modem =GENERIC_FSK
+*                           lora field to be used if modem =GENERIC_LORA
+ * \param[in] rxContinuous Sets the reception in continuous mode
+ *                          [0: single mode, otherwise continuous mode]
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
+ *                          FSK : timeout in number of bytes
+ *                          LoRa: timeout in symbols
+ * \return 0 when no parameters error, -1 otherwise
+ */
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
+                                       uint32_t rxContinuous, uint32_t symbTimeout);
+
+/*!
+ * \brief Sets the transmission parameters
+ *
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
+ *                          fsk field to be used if modem =GENERIC_FSK
+*                           lora field to be used if modem =GENERIC_LORA
+                            bpsk field to be used if modem =GENERIC_BPSK
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
+ * \return 0 when no parameters error, -1 otherwise
+ */
+static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
+                                       int8_t power, uint32_t timeout);
+
+/*
+* Private global constants
+*/
+
+/*!
+ * Radio driver structure initialization
+ */
+const struct Radio_s Radio =
+{
+  RadioInit,
+  RadioGetStatus,
+  RadioSetModem,
+  RadioSetChannel,
+  RadioIsChannelFree,
+  RadioRandom,
+  RadioSetRxConfig,
+  RadioSetTxConfig,
+  RadioCheckRfFrequency,
+  RadioGetTimeOnAir,
+  RadioSend,
+  RadioSleep,
+  RadioStandby,
+  RadioRx,
+  RadioStartCad,
+  RadioSetTxContinuousWave,
+  RadioRssi,
+  RadioWrite,
+  RadioRead,
+  RadioWriteRegisters,
+  RadioReadRegisters,
+  RadioSetMaxPayloadLength,
+  RadioSetPublicNetwork,
+  RadioGetWakeUpTime,
+  RadioIrqProcess,
+  RadioRxBoosted,
+  RadioSetRxDutyCycle,
+  RadioTxPrbs,
+  RadioTxCw,
+  RadioSetRxGenericConfig,
+  RadioSetTxGenericConfig,
+};
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Radio_Notif_1 */
+
+  /* USER CODE END Process_Radio_Notif_1 */
+  uint32_t *com_buffer = ComObj->ParamBuf;
+  /* Radio Notif received */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4<(Radio)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    /* callbacks */
+    case RADIO_TX_DONE_CB_ID:
+      if (radioevents_wrap.TxDone != NULL)
+      {
+        radioevents_wrap.TxDone();
+      }
+      else
+      {
+        Error_Handler();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case RADIO_TX_TIMEOUT_CB_ID:
+      if (radioevents_wrap.TxTimeout != NULL)
+      {
+        radioevents_wrap.TxTimeout();
+      }
+      else
+      {
+        Error_Handler();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case RADIO_RX_DONE_CB_ID:
+      if (radioevents_wrap.RxDone != NULL)
+      {
+        radioevents_wrap.RxDone((uint8_t *) com_buffer[0], (uint16_t) com_buffer[1], (int16_t) com_buffer[2],
+                                (int8_t) com_buffer[3]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case RADIO_RX_TIMEOUT_CB_ID:
+      if (radioevents_wrap.RxTimeout != NULL)
+      {
+        radioevents_wrap.RxTimeout();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case RADIO_RX_ERROR_CB_ID:
+      if (radioevents_wrap.RxError != NULL)
+      {
+        radioevents_wrap.RxError();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    default:
+      break;
+  }
+
+  /* Radio sending ack */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4>(Radio)\r\n");
+  MBMUX_AcknowledgeSnd(FEAT_INFO_RADIO_ID);
+  /* USER CODE BEGIN Process_Radio_Notif_2 */
+
+  /* USER CODE END Process_Radio_Notif_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void RadioInit(RadioEvents_t *events)
+{
+  /* USER CODE BEGIN RadioInit_1 */
+
+  /* USER CODE END RadioInit_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  if (events == NULL)
+  {
+    Error_Handler();
+  }
+
+  radioevents_wrap.TxDone = events->TxDone;
+  radioevents_wrap.TxTimeout = events->TxTimeout;
+  radioevents_wrap.RxDone = events->RxDone;
+  radioevents_wrap.RxTimeout = events->RxTimeout;
+  radioevents_wrap.RxError = events->RxError;
+  radioevents_wrap.FhssChangeChannel = events->FhssChangeChannel;
+  radioevents_wrap.CadDone = events->CadDone;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_INIT_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioInit_2 */
+
+  /* USER CODE END RadioInit_2 */
+}
+
+/*!
+  * Return current radio status
+  *
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  */
+static RadioState_t RadioGetStatus(void)
+{
+  /* USER CODE BEGIN RadioGetStatus_1 */
+
+  /* USER CODE END RadioGetStatus_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_GET_STATUS_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (RadioState_t) ret;
+  /* USER CODE BEGIN RadioGetStatus_2 */
+
+  /* USER CODE END RadioGetStatus_2 */
+}
+
+static void RadioSetModem(RadioModems_t modem)
+{
+  /* USER CODE BEGIN RadioSetModem_1 */
+
+  /* USER CODE END RadioSetModem_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_MODEM_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetModem_2 */
+
+  /* USER CODE END RadioSetModem_2 */
+}
+
+static void RadioSetChannel(uint32_t freq)
+{
+  /* USER CODE BEGIN RadioSetChannel_1 */
+
+  /* USER CODE END RadioSetChannel_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_CHANNEL_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) freq;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetChannel_2 */
+
+  /* USER CODE END RadioSetChannel_2 */
+}
+
+static bool RadioIsChannelFree(uint32_t freq, uint32_t rxBandwidth, int16_t rssiThresh, uint32_t maxCarrierSenseTime)
+{
+  /* USER CODE BEGIN RadioIsChannelFree_1 */
+
+  /* USER CODE END RadioIsChannelFree_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_IS_CHANNEL_FREE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) freq;
+  com_buffer[i++] = (uint32_t) rxBandwidth;
+  com_buffer[i++] = (uint32_t) rssiThresh;
+  com_buffer[i++] = (uint32_t) maxCarrierSenseTime;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (bool) ret;
+  /* USER CODE BEGIN RadioIsChannelFree_2 */
+
+  /* USER CODE END RadioIsChannelFree_2 */
+}
+
+static uint32_t RadioRandom(void)
+{
+  /* USER CODE BEGIN RadioRandom_1 */
+
+  /* USER CODE END RadioRandom_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_RANDOM_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint32_t) ret;
+  /* USER CODE BEGIN RadioRandom_2 */
+
+  /* USER CODE END RadioRandom_2 */
+}
+
+static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
+                             uint32_t datarate, uint8_t coderate,
+                             uint32_t bandwidthAfc, uint16_t preambleLen,
+                             uint16_t symbTimeout, bool fixLen,
+                             uint8_t payloadLen,
+                             bool crcOn, bool freqHopOn, uint8_t hopPeriod,
+                             bool iqInverted, bool rxContinuous)
+{
+  /* USER CODE BEGIN RadioSetRxConfig_1 */
+
+  /* USER CODE END RadioSetRxConfig_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_RX_CONFIG_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) bandwidth;
+  com_buffer[i++] = (uint32_t) datarate;
+  com_buffer[i++] = (uint32_t) coderate;
+  com_buffer[i++] = (uint32_t) bandwidthAfc;
+  com_buffer[i++] = (uint32_t) preambleLen;
+  com_buffer[i++] = (uint32_t) symbTimeout;
+  com_buffer[i++] = (uint32_t) fixLen;
+  com_buffer[i++] = (uint32_t) payloadLen;
+  com_buffer[i++] = (uint32_t) crcOn;
+  com_buffer[i++] = (uint32_t) freqHopOn;
+  com_buffer[i++] = (uint32_t) hopPeriod;
+  com_buffer[i++] = (uint32_t) iqInverted;
+  com_buffer[i++] = (uint32_t) rxContinuous;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetRxConfig_2 */
+
+  /* USER CODE END RadioSetRxConfig_2 */
+}
+
+static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
+                             uint32_t bandwidth, uint32_t datarate,
+                             uint8_t coderate, uint16_t preambleLen,
+                             bool fixLen, bool crcOn, bool freqHopOn,
+                             uint8_t hopPeriod, bool iqInverted, uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioSetTxConfig_1 */
+
+  /* USER CODE END RadioSetTxConfig_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_TX_CONFIG_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) power;
+  com_buffer[i++] = (uint32_t) fdev;
+  com_buffer[i++] = (uint32_t) bandwidth;
+  com_buffer[i++] = (uint32_t) datarate;
+  com_buffer[i++] = (uint32_t) coderate;
+  com_buffer[i++] = (uint32_t) preambleLen;
+  com_buffer[i++] = (uint32_t) fixLen;
+  com_buffer[i++] = (uint32_t) crcOn;
+  com_buffer[i++] = (uint32_t) freqHopOn;
+  com_buffer[i++] = (uint32_t) hopPeriod;
+  com_buffer[i++] = (uint32_t) iqInverted;
+  com_buffer[i++] = (uint32_t) timeout;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetTxConfig_2 */
+
+  /* USER CODE END RadioSetTxConfig_2 */
+}
+
+static bool RadioCheckRfFrequency(uint32_t frequency)
+{
+  /* USER CODE BEGIN RadioCheckRfFrequency_1 */
+
+  /* USER CODE END RadioCheckRfFrequency_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_CHECK_RF_FREQUENCY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) frequency;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (bool) ret;
+  /* USER CODE BEGIN RadioCheckRfFrequency_2 */
+
+  /* USER CODE END RadioCheckRfFrequency_2 */
+}
+
+static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
+                                  uint32_t spreadingFactor, uint8_t coderate,
+                                  uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                                  bool crcOn)
+{
+  /* USER CODE BEGIN RadioGetTimeOnAir_1 */
+
+  /* USER CODE END RadioGetTimeOnAir_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_GET_TIME_ON_AIR_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) bandwidth;
+  com_buffer[i++] = (uint32_t) spreadingFactor;
+  com_buffer[i++] = (uint32_t) coderate;
+  com_buffer[i++] = (uint32_t) preambleLen;
+  com_buffer[i++] = (uint32_t) fixLen;
+  com_buffer[i++] = (uint32_t) payloadLen;
+  com_buffer[i++] = (uint32_t) crcOn;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint32_t) ret;
+  /* USER CODE BEGIN RadioGetTimeOnAir_2 */
+
+  /* USER CODE END RadioGetTimeOnAir_2 */
+}
+
+static void RadioSend(uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioSend_1 */
+
+  /* USER CODE END RadioSend_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SEND_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) buffer;
+  com_buffer[i++] = (uint32_t) size;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSend_2 */
+
+  /* USER CODE END RadioSend_2 */
+}
+
+static void RadioSleep(void)
+{
+  /* USER CODE BEGIN RadioSleep_1 */
+
+  /* USER CODE END RadioSleep_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SLEEP_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSleep_2 */
+
+  /* USER CODE END RadioSleep_2 */
+}
+
+static void RadioStandby(void)
+{
+  /* USER CODE BEGIN RadioStandby_1 */
+
+  /* USER CODE END RadioStandby_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_STANDBY_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioStandby_2 */
+
+  /* USER CODE END RadioStandby_2 */
+}
+
+static void RadioRx(uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioRx_1 */
+
+  /* USER CODE END RadioRx_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_RX_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) timeout;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioRx_2 */
+
+  /* USER CODE END RadioRx_2 */
+}
+
+static void RadioStartCad(void)
+{
+  /* USER CODE BEGIN RadioStartCad_1 */
+
+  /* USER CODE END RadioStartCad_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_START_CAD_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioStartCad_2 */
+
+  /* USER CODE END RadioStartCad_2 */
+}
+
+static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
+{
+  /* USER CODE BEGIN RadioSetTxContinuousWave_1 */
+
+  /* USER CODE END RadioSetTxContinuousWave_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_TX_CONTINUOUS_WAVE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) freq;
+  com_buffer[i++] = (uint32_t) power;
+  com_buffer[i++] = (uint32_t) time;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetTxContinuousWave_2 */
+
+  /* USER CODE END RadioSetTxContinuousWave_2 */
+}
+
+static int16_t RadioRssi(RadioModems_t modem)
+{
+  /* USER CODE BEGIN RadioRssi_1 */
+
+  /* USER CODE END RadioRssi_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_RSSI_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (int16_t) ret;
+  /* USER CODE BEGIN RadioRssi_2 */
+
+  /* USER CODE END RadioRssi_2 */
+}
+
+static void RadioWrite(uint16_t addr, uint8_t data)
+{
+  /* USER CODE BEGIN RadioWrite_1 */
+
+  /* USER CODE END RadioWrite_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_WRITE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) addr;
+  com_buffer[i++] = (uint32_t) data;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioWrite_2 */
+
+  /* USER CODE END RadioWrite_2 */
+}
+
+static uint8_t RadioRead(uint16_t addr)
+{
+  /* USER CODE BEGIN RadioRead_1 */
+
+  /* USER CODE END RadioRead_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_READ_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) addr;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint8_t) ret;
+  /* USER CODE BEGIN RadioRead_2 */
+
+  /* USER CODE END RadioRead_2 */
+}
+
+static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioWriteRegisters_1 */
+
+  /* USER CODE END RadioWriteRegisters_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_WRITE_BUFFER_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) addr;
+  com_buffer[i++] = (uint32_t) buffer;
+  com_buffer[i++] = (uint32_t) size;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioWriteRegisters_2 */
+
+  /* USER CODE END RadioWriteRegisters_2 */
+}
+
+static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioReadRegisters_1 */
+
+  /* USER CODE END RadioReadRegisters_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_READ_BUFFER_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) addr;
+  com_buffer[i++] = (uint32_t) buffer;
+  com_buffer[i++] = (uint32_t) size;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioReadRegisters_2 */
+
+  /* USER CODE END RadioReadRegisters_2 */
+}
+
+static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max)
+{
+  /* USER CODE BEGIN RadioSetMaxPayloadLength_1 */
+
+  /* USER CODE END RadioSetMaxPayloadLength_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_MAX_PAYLOAD_LENGTH_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) max;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioSetMaxPayloadLength_2 */
+
+  /* USER CODE END RadioSetMaxPayloadLength_2 */
+}
+
+static void RadioSetPublicNetwork(bool enable)
+{
+  /* USER CODE BEGIN RadioSetPublicNetwork_1 */
+
+  /* USER CODE END RadioSetPublicNetwork_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_PUBLIC_NETWORK_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) enable;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioSetPublicNetwork_2 */
+
+  /* USER CODE END RadioSetPublicNetwork_2 */
+}
+
+static uint32_t RadioGetWakeUpTime(void)
+{
+  /* USER CODE BEGIN RadioGetWakeUpTime_1 */
+
+  /* USER CODE END RadioGetWakeUpTime_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_GET_WAKEUP_TIME_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint32_t) ret;
+  /* USER CODE BEGIN RadioGetWakeUpTime_2 */
+
+  /* USER CODE END RadioGetWakeUpTime_2 */
+}
+
+static void RadioIrqProcess(void)
+{
+  /* USER CODE BEGIN RadioIrqProcess_1 */
+
+  /* USER CODE END RadioIrqProcess_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_IRQ_PROCESS_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioIrqProcess_2 */
+
+  /* USER CODE END RadioIrqProcess_2 */
+}
+
+static void RadioRxBoosted(uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioRxBoosted_1 */
+
+  /* USER CODE END RadioRxBoosted_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_RX_BOOSTED_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) timeout;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioRxBoosted_2 */
+
+  /* USER CODE END RadioRxBoosted_2 */
+}
+
+static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime)
+{
+  /* USER CODE BEGIN RadioSetRxDutyCycle_1 */
+
+  /* USER CODE END RadioSetRxDutyCycle_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_RX_DUTY_CYCLE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rxTime;
+  com_buffer[i++] = (uint32_t) sleepTime;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioSetRxDutyCycle_2 */
+
+  /* USER CODE END RadioSetRxDutyCycle_2 */
+}
+
+static void RadioTxPrbs(void)
+{
+  /* USER CODE BEGIN RadioTxPrbs_1 */
+
+  /* USER CODE END RadioTxPrbs_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_TX_PRBS_ID;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioTxPrbs_2 */
+
+  /* USER CODE END RadioTxPrbs_2 */
+}
+
+static void RadioTxCw(int8_t power)
+{
+  /* USER CODE BEGIN RadioTxCw_1 */
+
+  /* USER CODE END RadioTxCw_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_TX_CW_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) power;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioTxCw_2 */
+
+  /* USER CODE END RadioTxCw_2 */
+}
+
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config, uint32_t rxContinuous,
+                                       uint32_t symbTimeout)
+{
+  /* USER CODE BEGIN RadioSetRxGenericConfig_1 */
+
+  /* USER CODE END RadioSetRxGenericConfig_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer;
+  uint32_t ret;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_RX_GENERIC_CONFIG_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) config;
+  com_buffer[i++] = (uint32_t) rxContinuous;
+  com_buffer[i++] = (uint32_t) symbTimeout;
+  com_obj->ParamCnt = i;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (int32_t) ret;
+  /* USER CODE BEGIN RadioSetRxGenericConfig_2 */
+
+  /* USER CODE END RadioSetRxGenericConfig_2 */
+}
+
+static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config, int8_t power, uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioSetTxGenericConfig_1 */
+
+  /* USER CODE END RadioSetTxGenericConfig_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint32_t ret;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_TX_GENERIC_CONFIG_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) config;
+  com_buffer[i++] = (uint32_t) power;
+  com_buffer[i++] = (uint32_t) timeout;
+  com_obj->ParamCnt = i;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (int32_t) ret;
+  /* USER CODE BEGIN RadioSetTxGenericConfig_2 */
+
+  /* USER CODE END RadioSetTxGenericConfig_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
new file mode 100644
index 00000000..e7eebe2c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_MBWRAPPER_CM4_H__
+#define __RADIO_MBWRAPPER_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
+void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__RADIO_MBWRAPPER_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..af8588aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
new file mode 100644
index 00000000..692c3088
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h
@@ -0,0 +1,138 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    features_info.h
+  * @author  MCD Application Team
+  * @brief   Feature list and parameters TypeDefinitions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTEM_INFO_H
+#define __SYSTEM_INFO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+/**
+  * @brief Feature enumeration
+  * @note This is the list of all available feature so far,
+          the one available in a given build are listed in the Feat_Info_Table[]
+          to keep compatibility, in order to add a feature
+          use a new value to the bottom without changing the existing order
+  */
+typedef enum
+{
+  FEAT_INFO_SYSTEM_ID = 0,
+  FEAT_INFO_SYSTEM_CMD_PRIO_A_ID,    /* = 1 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID, /* = 2 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_CMD_PRIO_B_ID,  /* = 3 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID,  /* = 4 : position should not change between revisions */
+  FEAT_INFO_KMS_ID,  /* = 5 : position should not change between revisions */
+  FEAT_INFO_TRACE_ID,  /* = 6 : position should not change between revisions */
+  FEAT_INFO_RADIO_ID,  /* = 7 : position should not change between revisions */
+  FEAT_INFO_LORAWAN_ID,  /* = 8 : position should not change between revisions */
+  FEAT_INFO_SIGFOX_ID,  /* = 9 : position should not change between revisions */
+  FEAT_INFO_WMBUS_ID,  /* = 10 : position should not change between revisions */
+  /* USER CODE BEGIN FEAT_INFO_IdTypeDef */
+
+  /* USER CODE END FEAT_INFO_IdTypeDef */
+  FEAT_INFO_CNT
+} FEAT_INFO_IdTypeDef;
+
+/**
+  * @brief Feature parameters
+  */
+typedef struct
+{
+  FEAT_INFO_IdTypeDef Feat_Info_Feature_Id;
+  uint32_t Feat_Info_Feature_Version;
+  uint32_t Feat_Info_Config_Size;
+  void *Feat_Info_Config_Ptr;
+} FEAT_INFO_Param_t;
+
+/**
+  * @brief Feature List
+  */
+typedef struct
+{
+  uint32_t Feat_Info_Cnt;
+  FEAT_INFO_Param_t *Feat_Info_TableAddress;
+} FEAT_INFO_List_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MAX_PARAM_OF_SYS_CMD_FUNCTIONS           7 /*!< Max number of parameters that the sys_cmd can use */
+#define MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS         5 /*!< Max number of parameters that the sys_notif can use */
+#define MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS     1 /*!< Max number of parameters that the sysA_cmd can use */
+#define MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS   1 /*!< Max number of parameters that the sysA_notif can use */
+#define MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS     1 /*!< Max number of parameters that the sysB_cmd can use */
+#define MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS   1 /*!< Max number of parameters that the sysB_notif can use */
+
+#define MAX_PARAM_OF_KMS_CMD_FUNCTIONS          12 /*!< Max number of parameters that the kms can use */
+#define MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS      11 /*!< Max number of parameters that the trace can use */
+#define MAX_PARAM_OF_RADIO_CMD_FUNCTIONS        15 /*!< Max number of parameters that the radio_cmd can use */
+#define MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS       4 /*!< Max number of parameters that the radio_notif can use */
+#define MAX_PARAM_OF_LORAWAN_CMD_FUNCTIONS      15 /*!< Max number of parameters that the lorawan_cmd can use */
+#define MAX_PARAM_OF_LORAWAN_NOTIF_FUNCTIONS     5 /*!< Max number of parameters that the lorawan_notif can use */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief  Init configuration params by calling specific feature xxx_info.c
+  */
+void FEAT_INFO_Init(void);
+/**
+  * @brief  Get the feature list ptr
+  * @return address of Feat_Info_List available in shared memory
+  */
+FEAT_INFO_List_t *FEAT_INFO_GetListPtr(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYSTEM_INFO_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
new file mode 100644
index 00000000..0608fd34
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h
@@ -0,0 +1,94 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    lora_info.h
+  * @author  MCD Application Team
+  * @brief   To give info to the application about LoRaWAN configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#ifndef __LORA_INFO_H__
+#define __LORA_INFO_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported types ------------------------------------------------------------*/
+/*!
+ * To give info to the application about LoraWAN capability
+ * it can depend how it has been compiled (e.g. compiled regions ...)
+ * Params should be better uint32_t foe easier alignment with info_table concept
+ */
+typedef struct
+{
+  uint32_t ActivationMode;  /*!< 1: ABP, 2 : OTAA, 3: ABP & OTAA   */
+  uint32_t Region;   /*!< Combination of regions compiled on MW  */
+  uint32_t ClassB;   /*!< 0: not compiled in Mw, 1 : compiled in MW  */
+  uint32_t Kms;      /*!< 0: not compiled in Mw, 1 : compiled in MW  */
+} LoraInfo_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief initialize the LoraInfo table
+  */
+void LoraInfo_Init(void);
+
+/**
+  * @brief returns the pointer to the LoraInfo capabilities table
+  * @retval LoraInfo pointer
+  */
+LoraInfo_t *LoraInfo_GetPtr(void);
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LORA_INFO_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
new file mode 100644
index 00000000..84cb7539
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux_table.h
+  * @author  MCD Application Team
+  * @brief   Maps the IPCC channels to memory buffers
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_TABLE_H__
+#define __MBMUX_TABLE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal_ipcc.h"
+#include "features_info.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported constants --------------------------------------------------------*/
+#define  MBMUX_CHANNEL_NUMBER  IPCC_CHANNEL_NUMBER
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported types ------------------------------------------------------------*/
+
+typedef enum
+{
+  MBMUX_CMD_RESP  = 0x00U,  /*!< Channel direction Tx is used by an MCU to transmit */
+  MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
+} MBMUX_ComType_t;
+
+/* Shared memory tables */
+
+typedef struct
+{
+  uint32_t MsgId;
+  void (*MsgCm4Cb)(void *ComObj);
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
+  uint16_t ParamCnt;     /*!<  nr of words composing the message */
+  uint32_t *ParamBuf;
+  uint32_t ReturnVal;    /*!<  only used in RX */
+} MBMUX_ComParam_t;
+
+typedef struct
+{
+  MBMUX_ComParam_t        MBCmdRespParam[MBMUX_CHANNEL_NUMBER];
+  MBMUX_ComParam_t        MBNotifAckParam[MBMUX_CHANNEL_NUMBER];
+  uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
+  __IO uint16_t           SynchronizeCpusAtBoot;
+  uint16_t                ChipRevId;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
new file mode 100644
index 00000000..b1050113
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h
@@ -0,0 +1,237 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    msg_id.h
+  * @author  MCD Application Team
+  * @brief   MBMUX message ID enumeration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MSG_ID_H__
+#define __MSG_ID_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+typedef enum
+{
+  /* CmdResp */
+  SYS_GET_INFO_LIST_MSG_ID = 0,
+  SYS_REGISTER_FEATURE_MSG_ID,
+  /* NotifAck */
+  SYS_RTC_ALARM_MSG_ID,
+  SYS_OTHER_MSG_ID,
+  /* USER CODE BEGIN SYSTEM_MsgIdTypeDef */
+
+  /* USER CODE END SYSTEM_MsgIdTypeDef */
+  SYS_MSGID_LAST
+} SYSTEM_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  LMHANDLER_INITIALIZATION_ID = 0,
+  LMHANDLER_CONFIGURE_ID,
+  LMHANDLER_JOIN_STATUS_ID,
+  LMHANDLER_JOIN_ID,
+  LMHANDLER_STOP_ID,
+  LMHANDLER_SEND_ID,
+  LMHANDLER_PROCESS_ID,
+  LMHANDLER_REQUEST_CLASS_ID,
+  LMHANDLER_GET_CLASS_ID,
+  LMHANDLER_GET_DEVEUI_ID,
+  LMHANDLER_SET_DEVEUI_ID,
+  LMHANDLER_GET_APPEUI_ID,
+  LMHANDLER_SET_APPEUI_ID,
+  LMHANDLER_GET_NWKKEY_ID,
+  LMHANDLER_SET_NWKKEY_ID,
+  LMHANDLER_GET_APPKEY_ID,
+  LMHANDLER_SET_APPKEY_ID,
+  LMHANDLER_GET_NWKSKEY_ID,
+  LMHANDLER_SET_NWKSKEY_ID,
+  LMHANDLER_GET_APPSKEY_ID,
+  LMHANDLER_SET_APPSKEY_ID,
+  LMHANDLER_GET_NWKID_ID,
+  LMHANDLER_SET_NWKID_ID,
+  LMHANDLER_GET_DEVADDR_ID,
+  LMHANDLER_SET_DEVADDR_ID,
+  LMHANDLER_GET_ACTIVE_REGION_ID,
+  LMHANDLER_SET_ACTIVE_REGION_ID,
+  LMHANDLER_GET_ADR_ENABLE_ID,
+  LMHANDLER_SET_ADR_ENABLE_ID,
+  LMHANDLER_GET_TX_DATARATE_ID,
+  LMHANDLER_SET_TX_DATARATE_ID,
+  LMHANDLER_GET_DUTY_CYCLE_ID,
+  LMHANDLER_SET_DUTY_CYCLE_ID,
+  LMHANDLER_GET_RX2_PARAMS_ID,
+  LMHANDLER_GET_TX_PWR_ID,
+  LMHANDLER_GET_RX1_DELAY_ID,
+  LMHANDLER_GET_RX2_DELAY_ID,
+  LMHANDLER_GET_JOIN_RX1_DELAY_ID,
+  LMHANDLER_GET_JOIN_RX2_DELAY_ID,
+  LMHANDLER_SET_TX_PWR_ID,
+  LMHANDLER_SET_RX2_PARAMS_ID,
+  LMHANDLER_SET_RX1_DELAY_ID,
+  LMHANDLER_SET_RX2_DELAY_ID,
+  LMHANDLER_SET_JOIN_RX1_DELAY_ID,
+  LMHANDLER_SET_JOIN_RX2_DELAY_ID,
+  LMHANDLER_GET_PING_PERIODICITY_ID,
+  LMHANDLER_SET_PING_PERIODICITY_ID,
+  LMHANDLER_GET_BEACON_STATE_ID,
+  LMHANDLER_LINK_CHECK_REQ_ID,
+  LMHANDLER_DEVICE_TIME_REQ_ID,
+
+  LMHANDLER_INFO_INIT_ID,
+  /* NotifAck */
+  LMHANDLER_GET_BATTERY_LEVEL_CB_ID,
+  LMHANDLER_GET_TEMPERATURE_CB_ID,
+  LMHANDLER_ON_NVM_DATA_CHANGE_CB_ID,
+  LMHANDLER_ON_NETWORK_PARAMS_CHANGE_CB_ID,
+  LMHANDLER_ON_JOIN_REQ_CB_ID,
+  LMHANDLER_ON_TX_DATA_CB_ID,
+  LMHANDLER_ON_RX_DATA_CB_ID,
+  LMHANDLER_ON_CLASS_CHANGE_CB_ID,
+  LMHANDLER_ON_BEACON_STATUS_CHANGE_CB_ID,
+  LMHANDLER_ON_ON_SYS_TIME_UPDATE_CB_ID,
+  LMHANDLER_ON_MAC_PROCESS_CB_ID,
+  /* USER CODE BEGIN LORA_MsgIdTypeDef */
+
+  /* USER CODE END LORA_MsgIdTypeDef */
+  LORA_MSGID_LAST
+} LORA_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  RADIO_INIT_ID = 0,
+  RADIO_GET_STATUS_ID,
+  RADIO_SET_MODEM_ID,
+  RADIO_SET_CHANNEL_ID,
+  RADIO_IS_CHANNEL_FREE_ID,
+  RADIO_RANDOM_ID,
+  RADIO_SET_RX_CONFIG_ID,
+  RADIO_SET_TX_CONFIG_ID,
+  RADIO_CHECK_RF_FREQUENCY_ID,
+  RADIO_GET_TIME_ON_AIR_ID,
+  RADIO_SEND_ID,
+  RADIO_SLEEP_ID,
+  RADIO_STANDBY_ID,
+  RADIO_RX_ID,
+  RADIO_START_CAD_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
+  RADIO_RSSI_ID,
+  RADIO_WRITE_ID,
+  RADIO_READ_ID,
+  RADIO_WRITE_BUFFER_ID,
+  RADIO_READ_BUFFER_ID,
+  RADIO_SET_MAX_PAYLOAD_LENGTH_ID,
+  RADIO_SET_PUBLIC_NETWORK_ID,
+  RADIO_GET_WAKEUP_TIME_ID,
+  RADIO_IRQ_PROCESS_ID,
+  RADIO_RX_BOOSTED_ID,
+  RADIO_SET_RX_DUTY_CYCLE_ID,
+  RADIO_TX_PRBS_ID,
+  RADIO_TX_CW_ID,
+  RADIO_SET_RX_GENERIC_CONFIG_ID,
+  RADIO_SET_TX_GENERIC_CONFIG_ID,
+  /* NotifAck */
+  RADIO_TX_DONE_CB_ID,
+  RADIO_TX_TIMEOUT_CB_ID,
+  RADIO_RX_DONE_CB_ID,
+  RADIO_RX_TIMEOUT_CB_ID,
+  RADIO_RX_ERROR_CB_ID,
+  RADIO_FHSS_CHANGE_CHANNEL_CB_ID,
+  RADIO_CAD_DONE_CB_ID,
+  /* USER CODE BEGIN RADIO_MsgIdTypeDef */
+
+  /* USER CODE END RADIO_MsgIdTypeDef */
+  RADIO_MSGID_LAST
+} RADIO_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  KMS_INIT_ID = 0,
+  KMS_OPEN_SESSION_ID,
+  KMS_CLOSE_SESSION_ID,
+  KMS_ENCRYPT_ID,
+  KMS_DECRYPT_ID,
+  KMS_DERIVE_KEY_ID,
+  KMS_CRYPTO_HMAC_SHA256_MSG_ID,
+  /* NotifAck */
+  /* USER CODE BEGIN KMS_MsgIdTypeDef */
+
+  /* USER CODE END KMS_MsgIdTypeDef */
+  KMS_MSGID_LAST
+} KMS_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  TRACE_SEND_MSG_ID = 0,
+  /* NotifAck */
+  /* USER CODE BEGIN Trace_MsgIdTypeDef */
+
+  /* USER CODE END Trace_MsgIdTypeDef */
+  TRACE_MSGID_LAST
+} Trace_MsgIdTypeDef;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* Dual core Init sequence */
+#define CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START  0xFFFF
+#define CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START    0x5555
+#define CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED    0xAAAA
+#define CPUS_BOOT_SYNC_RTC_REGISTERED         0x9999
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
new file mode 100644
index 00000000..d01a65d9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c
@@ -0,0 +1,255 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.c
+  * @author  MCD Application Team
+  * @brief   Enables 4 debug pins for internal signals RealTime debugging
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sys_debug.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
+{
+  /* USER CODE BEGIN DBG_Init_1 */
+
+  /* USER CODE END DBG_Init_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull   = GPIO_PULLUP;
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
+#if defined(CORE_CM4)
+
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+#else /* CORE_CM0PLUS */
+
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
+
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /*spi dbg*/
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_SUBGHZSPI;
+  __HAL_RCC_GPIOA_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* Busy */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_12);
+  GPIO_InitStruct.Alternate  = GPIO_AF6_RF_BUSY;
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+#endif /* CORE_CM0PLUS */
+
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
+
+  /* USER CODE END DBG_ProbesInit_3 */
+
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
+
+  /* USER CODE END DBG_ProbesInit_Last */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
new file mode 100644
index 00000000..28890d05
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h
@@ -0,0 +1,218 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.h
+  * @author  MCD Application Team
+  * @brief   Configuration of the debug.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_DEBUG_H__
+#define __SYS_DEBUG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sys_conf.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* Pin defines */
+
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
+#if defined(CORE_CM0PLUS)
+
+/**  Definition for Probe Line 1   **/
+/**
+  * @brief Pin of Probe Line 1
+  */
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
+
+/**
+  * @brief Port of Probe Line 1
+  */
+#define PROBE_LINE1_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 2   **/
+/**
+  * @brief Pin of Probe Line 2
+  */
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
+
+/**
+  * @brief Port of Probe Line 2
+  */
+#define PROBE_LINE2_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#else
+/**  Definition for Probe Line 3   **/
+/**
+  * @brief Pin of Probe Line 3
+  */
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
+
+/**
+  * @brief Port of Probe Line 3
+  */
+#define PROBE_LINE3_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 4   **/
+/**
+  * @brief Pin of Probe Line 4
+  */
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
+
+/**
+  * @brief Port of Probe Line 4
+  */
+#define PROBE_LINE4_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
+
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+
+/**
+  * @brief Set pin to high level
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+
+/**
+  * @brief Set pin to low level
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )
+
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#else
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
+  */
+void DBG_ProbesInit(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_DEBUG_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
new file mode 100644
index 00000000..0b613924
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c
@@ -0,0 +1,387 @@
+/**
+  ******************************************************************************
+  * @file    system_stm32wlxx.c
+  * @author  MCD Application Team
+  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
+  *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  *   This file provides two functions and one global variable to be called from
+  *   user application:
+  *      - SystemInit(): This function is called at startup just after reset and
+  *                      before branch to main program. This call is made inside
+  *                      the "startup_stm32wlxx.s" file.
+  *
+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
+  *                                  by the user application to setup the SysTick
+  *                                  timer or configure other parameters.
+  *
+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
+  *                                 be called whenever the core clock is changed
+  *                                 during program execution.
+  *
+  *   After each device reset the MSI (4 MHz) is used as system clock source.
+  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
+  *   configure the system clock before to branch to main program.
+  *
+  *   This file configures the system clock as follows:
+  *=============================================================================
+  *-----------------------------------------------------------------------------
+  *        System Clock source                    | MSI
+  *-----------------------------------------------------------------------------
+  *        SYSCLK(Hz)                             | 4000000
+  *-----------------------------------------------------------------------------
+  *        HCLK(Hz)                               | 4000000
+  *-----------------------------------------------------------------------------
+  *        AHB Prescaler                          | 1
+  *-----------------------------------------------------------------------------
+  *        APB1 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        APB2 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_M                                  | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_N                                  | 8
+  *-----------------------------------------------------------------------------
+  *        PLL_P                                  | 7
+  *-----------------------------------------------------------------------------
+  *        PLL_Q                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLL_R                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_P                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_Q                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_R                              | NA
+  *-----------------------------------------------------------------------------
+  *        Require 48MHz for USB OTG FS,          | Disabled
+  *        SDIO and RNG clock                     |
+  *-----------------------------------------------------------------------------
+  *=============================================================================
+  */
+
+/** @addtogroup CMSIS
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_system
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_System_Private_Includes
+  * @{
+  */
+
+#include "stm32wlxx.h"
+
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (MSI_VALUE)
+   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
+#endif /* LSI_VALUE */
+
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Defines
+  * @{
+  */
+
+/* Note: Following vector table addresses must be defined in line with linker
+         configuration. */
+/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
+     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
+     at address 0x00 which correspond to automatic remap of boot address selected */
+/* #define USER_VECT_TAB_ADDRESS */
+#if defined(USER_VECT_TAB_ADDRESS)
+#ifdef CORE_CM0PLUS
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
+#else /* CORE_CM4 */
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+#endif
+#endif
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Variables
+  * @{
+  */
+  /* The SystemCoreClock variable is updated in three ways:
+      1) from within HAL_Init()
+      2) by calling CMSIS function SystemCoreClockUpdate()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
+  */
+  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
+
+  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
+
+  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
+
+  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
+    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Functions
+  * @{
+  */
+#if defined(__ARMCC_VERSION)
+extern void * __Vectors;
+#define INTVECT_START ((uint32_t) & __Vectors)
+#elif defined(__ICCARM__)
+extern uint32_t __vector_table;
+#define INTVECT_START ((uint32_t)& __vector_table)
+#elif defined(__GNUC__)
+extern void * g_pfnVectors;
+#define INTVECT_START ((uint32_t)& g_pfnVectors)
+#endif
+
+/**
+  * @brief  Setup the microcontroller system.
+  * @param  None
+  * @retval None
+  */
+void SystemInit(void)
+{
+  /* Configure the Vector Table location  ------------------*/
+  SCB->VTOR = INTVECT_START;
+
+  /* FPU settings ------------------------------------------------------------*/
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
+#endif
+
+  /* Reset the RCC clock configuration to the default reset state ------------*/
+  /* Set MSION bit */
+  RCC->CR |= RCC_CR_MSION;
+
+  /* Reset CFGR register */
+  RCC->CFGR = 0x00070000U;
+
+  /* Reset HSEON, CSSON , HSION, and PLLON bits */
+  /* RCC->CR &= 0xEAF6FFFFU; */
+  RCC->CR &= 0x2321EFF;
+
+  /* Reset PLLCFGR register */
+  RCC->PLLCFGR = 0x22040100;
+
+  /* Reset HSEBYP bit */
+  RCC->CR &= 0xFFDFFFFFFU;
+
+  /* Disable all interrupts */
+  RCC->CIER = 0x00000000U;
+}
+
+/**
+  * @brief  Update SystemCoreClock variable according to Clock Register Values.
+  *         The SystemCoreClock variable contains the core clock (HCLK), it can
+  *         be used by the user application to setup the SysTick timer or configure
+  *         other parameters.
+  *
+  * @note   Each time the core clock (HCLK) changes, this function must be called
+  *         to update SystemCoreClock variable value. Otherwise, any configuration
+  *         based on this variable will be incorrect.
+  *
+  * @note   - The system frequency computed by this function is not the real
+  *           frequency in the chip. It is calculated based on the predefined
+  *           constant and the selected clock source:
+  *
+  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
+  *
+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
+  *
+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
+  *
+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
+  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
+  *
+  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
+  *             4 MHz) but the real value may vary depending on the variations
+  *             in voltage and temperature.
+  *
+  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              16 MHz) but the real value may vary depending on the variations
+  *              in voltage and temperature.
+  *
+  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
+  *              frequency of the crystal used. Otherwise, this function may
+  *              have wrong result.
+  *
+  *         - The result of this function could be not correct when using fractional
+  *           value for HSE crystal.
+  *
+  * @param  None
+  * @retval None
+  */
+void SystemCoreClockUpdate(void)
+{
+  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
+
+ /* Get MSI Range frequency--------------------------------------------------*/
+
+   /* Get MSI Range frequency--------------------------------------------------*/
+   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
+   { /* MSISRANGE from RCC_CSR applies */
+     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
+   }
+   else
+   { /* MSIRANGE from RCC_CR applies */
+     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
+   }
+   /*MSI frequency range in HZ*/
+   msirange = MSIRangeTable[msirange];
+
+
+  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
+  /* Get SYSCLK source -------------------------------------------------------*/
+  switch (RCC->CFGR & RCC_CFGR_SWS)
+  {
+    case 0x00:   /* MSI used as system clock source */
+      SystemCoreClock = msirange;
+      break;
+
+    case 0x04:  /* HSI used as system clock source */
+      /* HSI used as system clock source */
+        SystemCoreClock = HSI_VALUE;
+      break;
+
+    case 0x08:  /* HSE used as system clock source */
+      SystemCoreClock = HSE_VALUE;
+      break;
+
+    case 0x0C: /* PLL used as system clock  source */
+      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
+         SYSCLK = PLL_VCO / PLLR
+         */
+      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
+      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
+
+      switch (pllsource)
+      {
+        case 0x02:  /* HSI used as PLL clock source */
+          pllvco = (HSI_VALUE / pllm);
+          break;
+
+        case 0x03:  /* HSE used as PLL clock source */
+          pllvco = (HSE_VALUE / pllm);
+          break;
+
+        default:    /* MSI used as PLL clock source */
+          pllvco = (msirange / pllm);
+          break;
+      }
+
+      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
+      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
+
+      SystemCoreClock = pllvco/pllr;
+      break;
+
+    default:
+      SystemCoreClock = msirange;
+      break;
+  }
+
+  /* Compute HCLK clock frequency --------------------------------------------*/
+#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
+  /* Get HCLK2 prescaler */
+  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
+#else
+  /* Get HCLK1 prescaler */
+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
+#endif
+
+  /* Core clock frequency */
+  SystemCoreClock = SystemCoreClock / tmp;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
new file mode 100644
index 00000000..8de99d5f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node_DualCore_CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
new file mode 100644
index 00000000..a9a54772
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM0PLUS.ewp
@@ -0,0 +1,1418 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node_DualCore_CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM0PLUS</state>
+                    <state>KMS_ENABLED</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>CMSIS_NVIC_VIRTUAL</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/KMS/App</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/App</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/LoRaWAN/Target</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
+                    <state>$PROJ_DIR$/../Common/Board</state>
+                    <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>..\..\LoRaWAN_End_Node_DualCore_CM0PLUS.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\LoRaWAN_End_Node_DualCore_CM0PLUS.bin" 1 1"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM0PLUS.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\svc_handler.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <group>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_privileged_services.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_privileged_wrap.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>KMS</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\lora_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Common\System\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Middlewares</name>
+        <group>
+            <name>LoRaWAN</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\2_Images_SBSFU\EWARM\se_interface_appli.o</name>
+            </file>
+        </group>
+        <group>
+            <name>SubGHz_Phy</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Utilities</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
+        </file>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
new file mode 100644
index 00000000..4b1f218f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node_DualCore_CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
new file mode 100644
index 00000000..ceec3592
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/LoRaWAN_End_Node_DualCore_CM4.ewp
@@ -0,0 +1,1287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>LoRaWAN_End_Node_DualCore_CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM4/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM4/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM4/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../CM4/Core/Inc</state>
+                    <state>$PROJ_DIR$/../CM4/LoRaWAN/App</state>
+                    <state>$PROJ_DIR$/../CM4/LoRaWAN/Target</state>
+                    <state>$PROJ_DIR$/../CM4/MbMux</state>
+                    <state>$PROJ_DIR$/../Common/Board</state>
+                    <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Mac</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>..\..\LoRaWAN_End_Node_DualCore_CM4.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\LoRaWAN_End_Node_DualCore_CM4.bin" 2 1"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>LoRaWAN_End_Node_DualCore_CM4.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <group>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>LoRaWAN</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\app_lorawan.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\CayenneLpp.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\LoRaWAN\App\lora_app.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\LmHandler_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_lora.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Common\System\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Utilities</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
+        </file>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/Project.eww
new file mode 100644
index 00000000..92aa0755
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/Project.eww
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\LoRaWAN_End_Node_DualCore_CM0PLUS.ewp</path>
+  </project><project>
+    <path>$WS_DIR$\LoRaWAN_End_Node_DualCore_CM4.ewp</path>
+  </project>
+  <batchBuild />
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..2a6cd77e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,51 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+/***** FLASH part dedicated to M0+ *****/
+define symbol __ICFEDIT_region_ROM_start__               = __ICFEDIT_SLOT_Active_1_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__                 = __ICFEDIT_SLOT_Active_1_end__;
+/***** SRAM2 shared allocated by M0+ *****/
+define symbol __ICFEDIT_region_RAM2_SHARED_start__       = __ICFEDIT_M0PLUS_SHARED_region_SRAM_start__;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__         = __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__;
+/***** SRAM2 dedicated to M0+ *****/
+define symbol __ICFEDIT_region_RAM2_start__              = __ICFEDIT_SB_region_RAM_start__;
+define symbol __ICFEDIT_region_RAM2_end__                = __ICFEDIT_SB_region_RAM_end__;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x1000;
+define symbol __ICFEDIT_size_heap__ = 0x400;
+
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];
+define region RAM2_SHARED_region = mem:[from __ICFEDIT_region_RAM2_SHARED_start__  to __ICFEDIT_region_RAM2_SHARED_end__];
+define region RAM2_region     = mem:[from __ICFEDIT_region_RAM2_start__  to __ICFEDIT_region_RAM2_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit,
+                     section MB_MEM2 };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly, last section aes_block_padding };
+place in RAM2_region  { readwrite,
+                        block CSTACK, block HEAP };
+place in RAM2_SHARED_region  { section MB_MEM2 };
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..c1fa4e1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,53 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+/***** FLASH part dedicated to M4 *****/
+define symbol __ICFEDIT_region_ROM_start__               = __ICFEDIT_SLOT_Active_2_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__                 = __ICFEDIT_SLOT_Active_2_end__;
+/***** SRAM1 dedicated to M4 *****/
+define symbol __ICFEDIT_region_RAM_start__               = __ICFEDIT_M4_APP_region_RAM_start__;
+define symbol __ICFEDIT_region_RAM_end__                 = __ICFEDIT_M4_APP_region_RAM_end__;
+/***** SRAM2 shared allocated by M4 *****/
+define symbol __ICFEDIT_region_RAM2_SHARED_start__       = __ICFEDIT_M4_SHARED_region_SRAM_start__;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__         = __ICFEDIT_M4_SHARED_region_SRAM_end__;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];
+define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__   to __ICFEDIT_region_RAM_end__];
+define region RAM2_SHARED_region = mem:[from __ICFEDIT_region_RAM2_SHARED_start__  to __ICFEDIT_region_RAM2_SHARED_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit,
+                     section MAPPING_TABLE,
+                     section MB_MEM1 };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly, last section aes_block_padding };
+place in RAM_region   { readwrite,
+                        block CSTACK, block HEAP };
+place in RAM2_SHARED_region   { first section MAPPING_TABLE};
+place in RAM2_SHARED_region   { section MB_MEM1};
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/svc_handler.s
new file mode 100644
index 00000000..a3881e7c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/EWARM/svc_handler.s
@@ -0,0 +1,30 @@
+;/******************** (C) COPYRIGHT 2020 STMicroelectronics ********************
+;* File Name          : svc_handler.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;*  @attention
+;* 
+;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* 
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;* 
+;*******************************************************************************
+;
+;
+;
+; Cortex-M version
+;
+      SECTION .text:CODE:NOROOT:REORDER(2)
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT SVC_APP_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL SVC_APP_Handler
+        POP {PC}
+        END
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
new file mode 100644
index 00000000..025b1f3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvoptx
@@ -0,0 +1,1417 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>LoRaWAN_End_Node_DualCore_CM0PLUS</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_CM0+.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U002F003A3038510534333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\svc_handler.s</PathWithFileName>
+      <FilenameWithoutPath>svc_handler.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\LoRaWAN\App\app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\LoRaWAN\App\lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\KMS\App\app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\sys_privileged_services.c</PathWithFileName>
+      <FilenameWithoutPath>sys_privileged_services.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\sys_privileged_wrap.c</PathWithFileName>
+      <FilenameWithoutPath>sys_privileged_wrap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\features_info.c</PathWithFileName>
+      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\lora_info.c</PathWithFileName>
+      <FilenameWithoutPath>lora_info.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_lora.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\MbMux\radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Common\System\sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>12</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>3</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</PathWithFileName>
+      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/LoRaWAN</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>54</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</PathWithFileName>
+      <FilenameWithoutPath>NvmDataMgmt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>55</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</PathWithFileName>
+      <FilenameWithoutPath>LmhpCompliance.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>56</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</PathWithFileName>
+      <FilenameWithoutPath>cmac.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>57</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</PathWithFileName>
+      <FilenameWithoutPath>lorawan_aes.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>58</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</PathWithFileName>
+      <FilenameWithoutPath>soft-se.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>59</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</PathWithFileName>
+      <FilenameWithoutPath>Region.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>60</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAS923.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>61</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionAU915.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>62</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN470.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>63</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCN779.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>64</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</PathWithFileName>
+      <FilenameWithoutPath>RegionCommon.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>65</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU433.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>66</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</PathWithFileName>
+      <FilenameWithoutPath>RegionEU868.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>67</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</PathWithFileName>
+      <FilenameWithoutPath>RegionIN865.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>68</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</PathWithFileName>
+      <FilenameWithoutPath>RegionKR920.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>69</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</PathWithFileName>
+      <FilenameWithoutPath>RegionRU864.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>70</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</PathWithFileName>
+      <FilenameWithoutPath>RegionUS915.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>71</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMac.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>72</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacAdr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>73</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacClassB.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>74</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCommands.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>75</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacConfirmQueue.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>76</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacCrypto.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>77</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacParser.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>78</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</PathWithFileName>
+      <FilenameWithoutPath>LoRaMacSerializer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>79</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</PathWithFileName>
+      <FilenameWithoutPath>utilities.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>80</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</PathWithFileName>
+      <FilenameWithoutPath>RegionBaseUS.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/SubGHz_Phy</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>81</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>82</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>83</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>84</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>85</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>86</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>87</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>88</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>89</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>90</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>91</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
new file mode 100644
index 00000000..2fc0d902
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx
@@ -0,0 +1,948 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>LoRaWAN_End_Node_DualCore_CM0PLUS</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM0PLUS\</OutputDirectory>
+          <OutputName>LoRaWAN_End_Node_DualCore_CM0PLUS</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP</SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>1</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x2000c000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM0PLUS,KMS_ENABLED,USE_HAL_DRIVER,STM32WL55xx,DISABLE_IMAGE_STATE_HANDLING,CMSIS_NVIC_VIRTUAL</Define>
+              <Undefine></Undefine>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/LoRaWAN/App;../CM0PLUS/LoRaWAN/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../Linker_Common/MDK-ARM;../../2_Images_SECoreBin/Inc;../../2_Images_SBSFU/Common;../../2_Images_SBSFU/CM0PLUS/SBSFU/App</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>stm32wl55xx_flash_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+            <File>
+              <FileName>svc_handler.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\svc_handler.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_lorawan.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\LoRaWAN\App\app_lorawan.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\LoRaWAN\App\lora_app.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/LoRaWAN/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_board_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\LoRaWAN\Target\radio_board_if.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\KMS\App\app_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\main.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\ipcc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\sys_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>timer_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\timer_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_privileged_services.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\sys_privileged_services.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_privileged_wrap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\sys_privileged_wrap.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
+          <Files>
+            <File>
+              <FileName>features_info.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\features_info.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_info.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\lora_info.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmHandler_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\LmHandler_mbwrapper.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmux.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmux.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_lora.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmuxif_lora.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmuxif_radio.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_sys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmuxif_sys.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\mbmuxif_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\MbMux\radio_mbwrapper.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Common\System\sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_appli.txt</FileName>
+              <FileType>3</FileType>
+              <FilePath>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/LoRaWAN</GroupName>
+          <Files>
+            <File>
+              <FileName>LmHandler.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\LmHandler.c</FilePath>
+            </File>
+            <File>
+              <FileName>NvmDataMgmt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\NvmDataMgmt.c</FilePath>
+            </File>
+            <File>
+              <FileName>LmhpCompliance.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\LmHandler\Packages\LmhpCompliance.c</FilePath>
+            </File>
+            <File>
+              <FileName>cmac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\cmac.c</FilePath>
+            </File>
+            <File>
+              <FileName>lorawan_aes.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\lorawan_aes.c</FilePath>
+            </File>
+            <File>
+              <FileName>soft-se.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Crypto\soft-se.c</FilePath>
+            </File>
+            <File>
+              <FileName>Region.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\Region.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionAS923.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAS923.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionAU915.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionAU915.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCN470.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN470.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCN779.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCN779.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionCommon.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionCommon.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionEU433.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU433.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionEU868.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionEU868.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionIN865.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionIN865.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionKR920.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionKR920.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionRU864.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionRU864.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionUS915.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionUS915.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMac.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacAdr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacAdr.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacClassB.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacClassB.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCommands.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCommands.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacConfirmQueue.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacConfirmQueue.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacCrypto.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacCrypto.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacParser.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacParser.c</FilePath>
+            </File>
+            <File>
+              <FileName>LoRaMacSerializer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\LoRaMacSerializer.c</FilePath>
+            </File>
+            <File>
+              <FileName>utilities.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Utilities\utilities.c</FilePath>
+            </File>
+            <File>
+              <FileName>RegionBaseUS.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\LoRaWAN\Mac\Region\RegionBaseUS.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/SubGHz_Phy</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_driver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32_adv_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_systime.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="LoRaWAN_End_Node_DualCore_CM0PLUS"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
new file mode 100644
index 00000000..ff60514f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvoptx
@@ -0,0 +1,969 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>LoRaWAN_End_Node_DualCore_CM4</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U-O142 -O2766 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Common\System\sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\LoRaWAN\App\app_lorawan.c</PathWithFileName>
+      <FilenameWithoutPath>app_lorawan.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\LoRaWAN\App\CayenneLpp.c</PathWithFileName>
+      <FilenameWithoutPath>CayenneLpp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\LoRaWAN\App\lora_app.c</PathWithFileName>
+      <FilenameWithoutPath>lora_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\sys_sensors.c</PathWithFileName>
+      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\Core\Src\stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\LmHandler_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>LmHandler_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmuxif_lora.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_lora.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM4\MbMux\radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>54</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>55</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>56</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>57</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
new file mode 100644
index 00000000..e2c18723
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/LoRaWAN_End_Node_DualCore_CM4.uvprojx
@@ -0,0 +1,753 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>LoRaWAN_End_Node_DualCore_CM4</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>LoRaWAN_End_Node_DualCore_CM4\</OutputDirectory>
+          <OutputName>LoRaWAN_End_Node_DualCore_CM4</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 2 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>1</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x20008000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../CM4/Core/Inc;../CM4/LoRaWAN/App;../CM4/LoRaWAN/Target;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region;../../../../../../Middlewares/Third_Party/LoRaWAN/Mac;../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler;../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities;../../../../../../Drivers/CMSIS/Include</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>stm32wl55xx_flash_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Common\System\sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/LoRaWAN/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_lorawan.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\LoRaWAN\App\app_lorawan.c</FilePath>
+            </File>
+            <File>
+              <FileName>CayenneLpp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\LoRaWAN\App\CayenneLpp.c</FilePath>
+            </File>
+            <File>
+              <FileName>lora_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\LoRaWAN\App\lora_app.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\main.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\ipcc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\sys_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_sensors.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\sys_sensors.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\adc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>timer_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\timer_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\usart_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\usart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\Core\Src\stm32wlxx_hal_msp.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
+          <Files>
+            <File>
+              <FileName>LmHandler_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\LmHandler_mbwrapper.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmux.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmux.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_lora.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmuxif_lora.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmuxif_radio.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_sys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmuxif_sys.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\mbmuxif_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM4\MbMux\radio_mbwrapper.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_adc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32_adv_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_systime.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_systime.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\timer\stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="LoRaWAN_End_Node_DualCore_CM4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw
new file mode 100644
index 00000000..7b19045d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/Project.uvmpw
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectWorkspace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_mpw.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <WorkspaceName></WorkspaceName>
+
+  <project>
+    <PathAndName>.\LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx</PathAndName>
+    <NodeIsActive>1</NodeIsActive>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+  <project>
+    <PathAndName>.\LoRaWAN_End_Node_DualCore_CM4.uvprojx</PathAndName>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+</ProjectWorkspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_CM0+.ini b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_CM0+.ini
new file mode 100644
index 00000000..d3f0855b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/STM32WL_CM0+.ini
@@ -0,0 +1,23 @@
+/******************************************************************************/
+/* STM32WL_CM0+.INI: CM0 CPU Initialization File                                           
+/******************************************************************************/
+/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
+/* * All rights reserved.</center>*/
+/*  *
+/*  * This software component is licensed by ST under BSD 3-Clause license,*/
+/*  * the "License"; You may not use this file except in compliance with the */
+/*  * License. You may obtain a copy of the License at:*/
+/*  *                        opensource.org/licenses/BSD-3-Clause*/
+/*  *
+/*  ****************************************************************************/
+/******************************************************************************/
+
+FUNC void Setup (void) {
+  SP = _RDWORD(0x08022200);          // Setup Stack Pointer
+  PC = _RDWORD(0x08022204);          // Setup Program Counter
+   
+}
+
+Setup();                             // Setup for Running
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..41780b4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,259 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1000
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x400
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                     ; Top of Stack
+                DCD     Reset_Handler                    ; Reset Handler
+                DCD     NMI_Handler                      ; NMI Handler
+                DCD     HardFault_Handler                ; Hard Fault Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     SVC_Handler                      ; SVCall Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     PendSV_Handler                   ; PendSV Handler
+                DCD     SysTick_Handler                  ; SysTick Handler
+
+                ; External Interrupts                    
+                DCD     TZIC_ILA_IRQHandler              ; Security Interrupt controller illegal access Interrupts
+                DCD     PVD_PVM_IRQHandler               ; PVD and PVM detector
+                DCD     RTC_LSECSS_IRQHandler            ; RTC Wakeup + RTC Tamper and TimeStamp + RTC Alarms (A & B) + SSR Underflow and LSECSS Interrupts
+                DCD     RCC_FLASH_C1SEV_IRQHandler       ; RCC1 and FLASH and CPU1 M4 SEV Interrupts
+                DCD     EXTI1_0_IRQHandler               ; EXTI Line 1:0 Interrupts
+                DCD     EXTI3_2_IRQHandler               ; XTI Line 3:2 Interrupts
+                DCD     EXTI15_4_IRQHandler              ; EXTI Line 15:4 interrupts
+                DCD     ADC_COMP_DAC_IRQHandler          ; ADC, COMP1, COMP2, DAC Interrupts
+                DCD     DMA1_Channel1_2_3_IRQHandler     ; DMA1 Channel 1 to 3 Interrupts
+                DCD     DMA1_Channel4_5_6_7_IRQHandler   ; DMA1 Channels 4, 5, 6, 7 Interrupts
+                DCD     DMA2_DMAMUX1_OVR_IRQHandler      ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+                DCD     LPTIM1_IRQHandler                ; LPTIM1 global Interrupt
+                DCD     LPTIM2_IRQHandler                ; LPTIM2 global Interrupt
+                DCD     LPTIM3_IRQHandler                ; LPTIM3 global Interrupt
+                DCD     TIM1_IRQHandler                  ; TIM1 Interrupt
+                DCD     TIM2_IRQHandler                  ; TIM2 Interrupt
+                DCD     TIM16_IRQHandler                 ; TIM16 Interrupt
+                DCD     TIM17_IRQHandler                 ; TIM17 Interrupt
+                DCD     IPCC_C2_RX_C2_TX_IRQHandler      ; IPCC RX Occupied and TX Free Interrupt Interrupts
+                DCD     HSEM_IRQHandler                  ; Semaphore Interrupt
+                DCD     RNG_IRQHandler                   ; RNG Interrupt
+                DCD     AES_PKA_IRQHandler               ; AES and PKA Interrupts
+                DCD     I2C1_IRQHandler                  ; I2C1 Event and Error Interrupt
+                DCD     I2C2_IRQHandler                  ; I2C2 Event and Error Interrupt
+                DCD     I2C3_IRQHandler                  ; I2C3 Event and Error Interrupt
+                DCD     SPI1_IRQHandler                  ; SPI1 Interrupts
+                DCD     SPI2_IRQHandler                  ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                ; USART1 Interrupt
+                DCD     USART2_IRQHandler                ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler               ; LPUART1 Interrupt
+                DCD     SUBGHZSPI_IRQHandler             ; SUBGHZSPI Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler          ; SUBGHZ Radio Interrupt
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+                EXPORT  TZIC_ILA_IRQHandler            [WEAK]
+                EXPORT  PVD_PVM_IRQHandler             [WEAK]
+                EXPORT  RTC_LSECSS_IRQHandler          [WEAK]
+                EXPORT  RCC_FLASH_C1SEV_IRQHandler     [WEAK]
+                EXPORT  EXTI1_0_IRQHandler             [WEAK]
+                EXPORT  EXTI3_2_IRQHandler             [WEAK]
+                EXPORT  EXTI15_4_IRQHandler            [WEAK]
+                EXPORT  ADC_COMP_DAC_IRQHandler        [WEAK]
+                EXPORT  DMA1_Channel1_2_3_IRQHandler   [WEAK]
+                EXPORT  DMA1_Channel4_5_6_7_IRQHandler [WEAK]
+                EXPORT  DMA2_DMAMUX1_OVR_IRQHandler    [WEAK]
+                EXPORT  LPTIM1_IRQHandler              [WEAK]
+                EXPORT  LPTIM2_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler              [WEAK]
+                EXPORT  TIM1_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                [WEAK]
+                EXPORT  TIM16_IRQHandler               [WEAK]
+                EXPORT  TIM17_IRQHandler               [WEAK]
+                EXPORT  IPCC_C2_RX_C2_TX_IRQHandler    [WEAK]
+                EXPORT  HSEM_IRQHandler                [WEAK]
+                EXPORT  RNG_IRQHandler                 [WEAK]
+                EXPORT  AES_PKA_IRQHandler             [WEAK]
+                EXPORT  I2C1_IRQHandler                [WEAK]
+                EXPORT  I2C2_IRQHandler                [WEAK]
+                EXPORT  I2C3_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                [WEAK]
+                EXPORT  SPI2_IRQHandler                [WEAK]
+                EXPORT  USART1_IRQHandler              [WEAK]
+                EXPORT  USART2_IRQHandler              [WEAK]
+                EXPORT  LPUART1_IRQHandler             [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler           [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler        [WEAK]
+
+TZIC_ILA_IRQHandler
+PVD_PVM_IRQHandler
+RTC_LSECSS_IRQHandler
+RCC_FLASH_C1SEV_IRQHandler
+EXTI1_0_IRQHandler
+EXTI3_2_IRQHandler
+EXTI15_4_IRQHandler
+ADC_COMP_DAC_IRQHandler
+DMA1_Channel1_2_3_IRQHandler
+DMA1_Channel4_5_6_7_IRQHandler
+DMA2_DMAMUX1_OVR_IRQHandler   
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+LPTIM3_IRQHandler
+TIM1_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+IPCC_C2_RX_C2_TX_IRQHandler
+HSEM_IRQHandler
+RNG_IRQHandler
+AES_PKA_IRQHandler
+I2C1_IRQHandler
+I2C2_IRQHandler
+I2C3_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler
+USART2_IRQHandler
+LPUART1_IRQHandler
+SUBGHZSPI_IRQHandler
+SUBGHZ_Radio_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..efa16135
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,371 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1000
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x400
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
new file mode 100644
index 00000000..ffebf4a2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
@@ -0,0 +1,33 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_1_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
+    *.o (RESET, +First)
+  }
+  ROM_region +0 {
+    *(InRoot$$Sections)
+    .ANY (+RO)
+  }
+  ; SBSFU RAM area is reused for UserApp_M0  
+  RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE {
+    .ANY (STACK)
+    .ANY (HEAP)
+    .ANY (+RW +ZI)
+  }
+  ; Backup SRAM2 dedicated to M0PLUS
+  RW_IRAM2 M0PLUS_SHARED_REGION_RAM_START M0PLUS_SHARED_RAM_REGION_SIZE  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+    *(MB_MEM2)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm0plus.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
new file mode 100644
index 00000000..532edbad
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -0,0 +1,33 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_2_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_2_START + 0x200) FIXED VECTOR_SIZE {
+    *.o (RESET, +First)
+  }
+  ROM_region +0 {
+    *(InRoot$$Sections)
+    .ANY (+RO)
+  }
+  RAM_region M4_APP_REGION_RAM_START M4_APP_RAM_REGION_SIZE {
+    .ANY (STACK)
+    .ANY (HEAP)
+    .ANY (+RW +ZI)
+  }
+  ; Backup SRAM2 dedicated to M4
+  RW_IRAM2 M4_SHARED_REGION_RAM_START M4_SHARED_RAM_REGION_SIZE  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+    *(MAPPING_TABLE)
+    *(MB_MEM1)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/svc_handler.s
new file mode 100644
index 00000000..b6ad9525
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/MDK-ARM/svc_handler.s
@@ -0,0 +1,34 @@
+;*******************************************************************************
+;* File Name          : svc_handler.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;*  @attention
+;*
+;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;*******************************************************************************
+;
+;
+;
+; Cortex-M version
+;
+      PRESERVE8
+      THUMB
+      AREA    |.text|, CODE, READONLY
+ 
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT SVC_APP_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL SVC_APP_Handler
+        POP {PC}
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project
new file mode 100644
index 00000000..5e46a3b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/.project
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LoRaWAN_End_Node_DualCore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
+		</link>
+	</linkedResources>
+	<filteredResources>
+		<filter>
+			<id>1602235241059</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.launch</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject
new file mode 100644
index 00000000..06042fdc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.cproject
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.418944704" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.654776557" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1874734359" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1576074843" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1690314232" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1876101242" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1222976036" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.536306606" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/LoRaWAN/App | ../../../CM0PLUS/LoRaWAN/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1888072462" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.724313685" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1913635198" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.192075519" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1692640247" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1440672287" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.893305291" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1496750499" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1110902416" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1948481739" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CMSIS_NVIC_VIRTUAL"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.618696617" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/LoRaWAN/Target"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/Board"/>
+									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.666846704" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.953216962" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1637192753" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1135192748" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1111776382" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1687592588" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1317420169" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.486355893" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.2119440973" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.487093524" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs">
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1632142608" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1921454185" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1163404519" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1466554349" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.784128254" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.458897427" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.972068633" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.517495896" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.746122958" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1212314533" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2044476129" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="LoRaWAN_End_Node_DualCore_CM0PLUS.null.1142642603" name="LoRaWAN_End_Node_DualCore_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1348823063.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.893305291;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.666846704">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project
new file mode 100644
index 00000000..7d2a583c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/.project
@@ -0,0 +1,474 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LoRaWAN_End_Node_DualCore_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_privileged_services.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_privileged_services.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_privileged_wrap.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_privileged_wrap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/timer_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/LmHandler_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/features_info.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/lora_info.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/lora_info.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmux.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_lora.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_lora.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmHandler.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LmhpCompliance.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/Packages/LmhpCompliance.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMac.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacAdr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacAdr.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacClassB.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacClassB.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCommands.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCommands.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacConfirmQueue.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacConfirmQueue.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacCrypto.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacCrypto.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacParser.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacParser.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/LoRaMacSerializer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/LoRaMacSerializer.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/NvmDataMgmt.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/LmHandler/NvmDataMgmt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/Region.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/Region.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAS923.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAS923.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionAU915.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionAU915.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionBaseUS.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionBaseUS.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN470.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN470.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCN779.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCN779.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionCommon.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionCommon.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU433.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU433.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionEU868.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionEU868.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionIN865.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionIN865.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionKR920.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionKR920.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionRU864.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionRU864.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/RegionUS915.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Mac/Region/RegionUS915.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/cmac.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/cmac.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/lorawan_aes.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/lorawan_aes.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/soft-se.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Crypto/soft-se.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/LoRaWAN/utilities.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/LoRaWAN/Utilities/utilities.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_fw.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/KMS/App/app_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/KMS/App/app_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/app_lorawan.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/lora_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/App/lora_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/Target/radio_board_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/LoRaWAN/Target/radio_board_if.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..f98fb740
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,328 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm0plus.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M0+ vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M0+ processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m0plus
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
+
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
+
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
+
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M0+ vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	0
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	TZIC_ILA_IRQHandler                  			/* TZIC ILA Interrupt                                 */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	RTC_LSECSS_IRQHandler                			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RCC_FLASH_C1SEV_IRQHandler           			/* RCC and FLASH and CPU1 M4 SEV Interrupt            */
+  .word	EXTI1_0_IRQHandler                   			/* EXTI Line 1:0 Interrupt                            */
+  .word	EXTI3_2_IRQHandler                   			/* EXTI Line 3:2 Interrupt                            */
+  .word	EXTI15_4_IRQHandler                  			/* EXTI Line 15:4 interrupt                           */
+  .word	ADC_COMP_DAC_IRQHandler              			/* ADC, COMP1, COMP2, DAC Interrupt                   */
+  .word	DMA1_Channel1_2_3_IRQHandler         			/* DMA1 Channel 1 to 3 Interrupt                      */
+  .word	DMA1_Channel4_5_6_7_IRQHandler       			/* DMA1 Channels 4,5,6,7 Interrupt                    */
+  .word	DMA2_DMAMUX1_OVR_IRQHandler          			/* DMA2 Channels[1..7] and DMAMUX Overrun Interrupts  */
+  .word	LPTIM1_IRQHandler                    			/* LPTIM1 Global Interrupt                            */
+  .word	LPTIM2_IRQHandler                    			/* LPTIM2 Global Interrupt                            */
+  .word	LPTIM3_IRQHandler                    			/* LPTIM3 Global Interrupt                            */
+  .word	TIM1_IRQHandler                      			/* TIM1 Global Interrupt                              */
+  .word	TIM2_IRQHandler                      			/* TIM2 Global Interrupt                              */
+  .word	TIM16_IRQHandler                     			/* TIM16 Global Interrupt                             */
+  .word	TIM17_IRQHandler                     			/* TIM17 Global Interrupt                             */
+  .word	IPCC_C2_RX_C2_TX_IRQHandler          			/* IPCC RX Occupied and TX Free Interrupt Interrupt   */
+  .word	HSEM_IRQHandler                      			/* Semaphore Interrupt                                */
+  .word	RNG_IRQHandler                       			/* RNG Interrupt                                      */
+  .word	AES_PKA_IRQHandler                   			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	I2C1_IRQHandler                      			/* I2C1 Event and Error Interrupt                     */
+  .word	I2C2_IRQHandler                      			/* I2C2 Event and Error Interrupt                     */
+  .word	I2C3_IRQHandler                      			/* I2C3 Event and Error Interrupt                     */
+  .word	SPI1_IRQHandler                      			/* SPI1 Interrupt                                     */
+  .word	SPI2_IRQHandler                      			/* SPI2 Interrupt                                     */
+  .word	USART1_IRQHandler                    			/* USART1 Interrupt                                   */
+  .word	USART2_IRQHandler                    			/* USART2 Interrupt                                   */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 Interrupt                                  */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI Interrupt                                */
+  .word	SUBGHZ_Radio_IRQHandler              			/* SUBGHZ Radio Interrupt                             */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	TZIC_ILA_IRQHandler
+	.thumb_set TZIC_ILA_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	RTC_LSECSS_IRQHandler
+	.thumb_set RTC_LSECSS_IRQHandler,Default_Handler
+
+	.weak	RCC_FLASH_C1SEV_IRQHandler
+	.thumb_set RCC_FLASH_C1SEV_IRQHandler,Default_Handler
+
+	.weak	EXTI1_0_IRQHandler
+	.thumb_set EXTI1_0_IRQHandler,Default_Handler
+
+	.weak	EXTI3_2_IRQHandler
+	.thumb_set EXTI3_2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_4_IRQHandler
+	.thumb_set EXTI15_4_IRQHandler,Default_Handler
+
+	.weak	ADC_COMP_DAC_IRQHandler
+	.thumb_set ADC_COMP_DAC_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_2_3_IRQHandler
+	.thumb_set DMA1_Channel1_2_3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_5_6_7_IRQHandler
+	.thumb_set DMA1_Channel4_5_6_7_IRQHandler,Default_Handler
+
+	.weak	DMA2_DMAMUX1_OVR_IRQHandler
+	.thumb_set DMA2_DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	TIM1_IRQHandler
+	.thumb_set TIM1_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	IPCC_C2_RX_C2_TX_IRQHandler
+	.thumb_set IPCC_C2_RX_C2_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	AES_PKA_IRQHandler
+	.thumb_set AES_PKA_IRQHandler,Default_Handler
+
+	.weak	I2C1_IRQHandler
+	.thumb_set I2C1_IRQHandler,Default_Handler
+
+	.weak	I2C2_IRQHandler
+	.thumb_set I2C2_IRQHandler,Default_Handler
+
+	.weak	I2C3_IRQHandler
+	.thumb_set I2C3_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s
new file mode 100644
index 00000000..282425f8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s
@@ -0,0 +1,29 @@
+/**
+  ******************************************************************************
+  * @file      svc_handler.s
+  * @author    MCD Application Team
+  * @brief     Wrapper for SE isolation with MPU.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+        .section  .text,"ax",%progbits
+        .syntax unified
+        .weak  SVC_APP_Handler
+        .global SVC_Handler
+        .type  SVC_Handler, %function
+SVC_Handler:
+        MRS r0, PSP
+        PUSH {LR}
+        BL SVC_APP_Handler
+        POP {PC}
+.end
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..11e9ea25
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,223 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes ROM
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x400 ; /* required amount of heap  */
+_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  ISR_VECTOR (rx)    : ORIGIN = (SLOT_Active_1_start + 0x200), LENGTH = Vector_size
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_1_start + Vector_size + 0x200), LENGTH = (SLOT_Active_1_end - SLOT_Active_1_start + 1 - 0x200 - Vector_size)
+  APPLI_RAM  (xrw)   : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+  RAM_SHARED (xrw)   : ORIGIN = M0PLUS_SHARED_region_RAM_start, LENGTH = M0PLUS_SHARED_region_RAM_size
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >ISR_VECTOR
+
+  .SE_IF_Code : {
+    . = ALIGN(8);
+    KEEP(*se_interface_app.o (.text .text*))
+    KEEP(*se_interface_kms.o (.text .text*))
+    . = ALIGN(8);
+  } >SE_IF_ROM_region
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .ARM.extab   : {
+    . = ALIGN(8);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .ARM : {
+    . = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .init_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .fini_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(8);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(8);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> APPLI_ROM
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject
new file mode 100644
index 00000000..cef317b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.cproject
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;2&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.517486696" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1356036104" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1268685116" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1248418525" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1808427656" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.382555478" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1703274790" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1521328444" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/LoRaWAN/App | ../../../CM4/LoRaWAN/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.250785634" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/LoRaWAN_End_Node_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1250379993" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.139407144" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1004201975" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1591281622" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1311170738" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.496130607" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1215135408" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.113915788" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2108990883" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/App"/>
+									<listOptionValue builtIn="false" value="../../../CM4/LoRaWAN/Target"/>
+									<listOptionValue builtIn="false" value="../../../CM4/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/Board"/>
+									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.626620308" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.951856085" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1502513653" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1711642259" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1109291067" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1942134771" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.642285922" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1036786702" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2114345391" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.329733135" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.879204678" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.850746118" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1010421103" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.137229566" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1379722875" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.775419959" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1300891610" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.238350608" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="LoRaWAN_End_Node_DualCore_CM4.null.1358162801" name="LoRaWAN_End_Node_DualCore_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1270325056.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1311170738;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.626620308">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project
new file mode 100644
index 00000000..0c71cd69
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/.project
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>LoRaWAN_End_Node_DualCore_CM4</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/adc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/adc_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/dma.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/dma.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_app.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_sensors.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_sensors.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/timer_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/timer_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart_if.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/LmHandler_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/LmHandler_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmux.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmux.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_lora.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_lora.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sys.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/CayenneLpp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/CayenneLpp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/app_lorawan.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/app_lorawan.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/LoRaWAN/App/lora_app.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/LoRaWAN/App/lora_app.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..af218d28
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,461 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
+
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
+
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
+
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..c5d44e54
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,224 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes ROM
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x400 ; /* required amount of heap  */
+_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  ISR_VECTOR (rx)    : ORIGIN = (SLOT_Active_2_start + 0x200), LENGTH = Vector_size
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_2_start + Vector_size + 0x200), LENGTH = (SLOT_Active_2_end - SLOT_Active_2_start + 1 - 0x200 - Vector_size)
+  APPLI_RAM  (xrw)   : ORIGIN = M4_APP_region_RAM_start, LENGTH = M4_APP_region_RAM_size
+  RAM_SHARED (xrw)   : ORIGIN = M4_SHARED_region_RAM_start, LENGTH = M4_SHARED_region_RAM_size
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >ISR_VECTOR
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+    
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/readme.txt
new file mode 100644
index 00000000..fe05246d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/readme.txt
@@ -0,0 +1,265 @@
+/**
+  @page LoRaWAN_End_Node_DualCore Readme file
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
+  * @file    Applications/LoRaWAN_SBSFU_1_Slot_DualCore/LoRaWAN_End_Node_DualCore/readme.txt
+  * @author  MCD Application Team
+  * @brief   This application is a simple demo application software of a LoRa
+  *          modem connecting to Network server and provides protections offered by Secure Boot and Secure Engine.
+  *          The application keys are managed by key management services.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Description
+
+This directory contains a set of source files that implements a Dual Core (CM4 / CM0) LoRa application
+device with security environment offered by Secure Boot and Secure Engine.
+
+This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
+  ******************************************************************************
+
+@par Keywords
+
+Applications, SubGHz_Phy, LoRaWAN, End_Node, DualCore, SBSFU, KMS
+
+@par Directory contents
+
+
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h             Maps the NVIC functions on _SVC for Unpriviledge usage
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc.h                           This file contains all the function prototypes for
+                                                                                the ipcc.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/ipcc_if.h                        This file contains the interface of the ipcc driver on CM0PLUS.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/kms_if.h                         This file contains kms interfaces with middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/main.h                           : Header for main.c file.
+                                                                                This file contains the common defines of the application.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/platform.h                       Header for General HW instances configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/rtc.h                            This file contains all the function prototypes for
+                                                                                the rtc.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             HAL configuration file.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h                   This file contains the headers of the interrupt handlers.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h                   Header for Low Power Manager interface configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/subghz.h                         This file contains all the function prototypes for
+                                                                                the subghz.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_app.h                        Function prototypes for sys_app.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_conf.h                       Applicative configuration, e.g. : debug, trace, low power, sensors
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h        Maps sys_privileged_wrap functions on SVC and API to cortex services
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h            This file contains all the function prototypes for
+                                                                                the sys_privileged_wrap.c file
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/timer_if.h                       configuration of the timer_if.c instances
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_conf.h                 Header for configuration file to utilities
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Inc/utilities_def.h                  Definitions for modules requiring utilities
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.h                         !!! No description found !!!
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.h                 Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/Commissioning.h               End-device commissioning parameters
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.h                    Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app_version.h            Definition the version of the CM0PLUS application
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/se-identity.h                 Secure Element identity and keys
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/lorawan_conf.h             Header for LoRaWAN middleware instances
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/mw_log_conf.h              Configure (enable/disable) traces for CM0
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.h           Header for Radio interface configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_conf.h               Header of Radio configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/systime.h                  Map middleware systime
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/timer.h                    Wrapper to timer server
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.h               This file implements the CM0PLUS side wrapper of the LmHandler
+                                                                                interface shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.h                             API which interfaces CM0PLUS to IPCC
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.h                      API provided to CM0PLUS application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                     API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                       API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                     API for CM0PLUS application to register and handle TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                   This file implements the CM0PLUS side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc.h                                This file contains all the function prototypes for
+                                                                                the adc.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/adc_if.h                             Header for ADC interface configuration
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/dma.h                                This file contains all the function prototypes for
+                                                                                the dma.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc.h                               This file contains all the function prototypes for
+                                                                                the ipcc.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/ipcc_if.h                            This file contains the interface of the ipcc driver on CM4.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/main.h                               : Header for main.c file.
+                                                                                This file contains the common defines of the application.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/platform.h                           Header for General HW instances configuration
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h                 HAL configuration file.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32wlxx_it.h                       This file contains the headers of the interrupt handlers.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/stm32_lpm_if.h                       Header for Low Power Manager interface configuration
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_app.h                            Function prototypes for sys_app.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_conf.h                           Applicative configuration, e.g. : debug, trace, low power, sensors
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/sys_sensors.h                        Header for sensors application
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/timer_if.h                           configuration of the timer_if.c instances
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart.h                              This file contains all the function prototypes for
+                                                                                the usart.c file
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/usart_if.h                           Header for USART interface configuration
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_conf.h                     Header for configuration file to utilities
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Inc/utilities_def.h                      Definitions for modules requiring utilities
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.h                     Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.h                      Implements the Cayenne Low Power Protocol
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.h                        Header of application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app_version.h                Definition the version of the CM4 application
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/lorawan_conf.h                 Header for LoRaWAN middleware instances
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/systime.h                      Map middleware systime
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/Target/timer.h                        Wrapper to timer server
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.h                   This file implements the CM4 side wrapper of the LmHandler
+                                                                                interface shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.h                                 API which interfaces CM4 to IPCC
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.h                          API provided to CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.h                         API for CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.h                           API for CM4 application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.h                         API for CM4 application to register and handle TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.h                       This file implements the CM4 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/Common/Board/stm32wlxx_nucleo_conf.h              STM32WLxx_Nucleo board configuration file.
+  - LoRaWAN_End_Node_DualCore/Common/MbMux/features_info.h                      Feature list and parameters TypeDefinitions
+  - LoRaWAN_End_Node_DualCore/Common/MbMux/lora_info.h                          To give info to the application about LoRaWAN configuration
+  - LoRaWAN_End_Node_DualCore/Common/MbMux/mbmux_table.h                        Maps the IPCC channels to memory buffers
+  - LoRaWAN_End_Node_DualCore/Common/MbMux/msg_id.h                             MBMUX message ID enumeration
+  - LoRaWAN_End_Node_DualCore/Common/System/sys_debug.h                         Configuration of the debug.c instances
+
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc.c                           This file provides code for the configuration
+                                                                                of the IPCC instances.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/ipcc_if.c                        Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/main.c                           : Main program body
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/rtc.c                            This file provides code for the configuration
+                                                                                of the RTC instances.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                   Interrupt Service Routines.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                   Low layer function to enter/exit low power modes (stop, sleep)
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/subghz.c                         This file provides code for the configuration
+                                                                                of the SUBGHZ instances.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_app.c                        Initializes HW and SW system entities (not related to the radio)
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c        gives access to COrtex services like ThumbState, SVC, MPU
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c            Wrapper functions to call SVC when in Unprivilege mode
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/Core/Src/timer_if.c                       Configure RTC Alarm, Tick and Calendar manager
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/KMS/App/app_kms.c                         !!! No description found !!!
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/app_lorawan.c                 Application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/App/lora_app.c                    Application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/LoRaWAN/Target/radio_board_if.c           This file provides an interface layer between MW and Radio Board
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/features_info.c                     CM0PLUS supported features list
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/LmHandler_mbwrapper.c               This file implements the CM0PLUS side wrapper of the LoraMac interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/lora_info.c                         To give info to the application about LoRaWAN configuration
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmux.c                             Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_lora.c                      allows CM0 application to register and handle LoraWAN to MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                     allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                       allows CM0 application to handle the SYSTEM MBMUX channel
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                     Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
+  - LoRaWAN_End_Node_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                   This file implements the CM0 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc.c                                This file provides code for the configuration
+                                                                                of the ADC instances.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/adc_if.c                             Read status related to the chip (battery level, VREF, chip temperature)
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/dma.c                                This file provides code for the configuration
+                                                                                of all the requested memory to memory DMA transfers.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc.c                               This file provides code for the configuration
+                                                                                of the IPCC instances.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/ipcc_if.c                            Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/main.c                               : Main program body
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c                  This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32wlxx_it.c                       Interrupt Service Routines.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/stm32_lpm_if.c                       Low layer function to enter/exit low power modes (stop, sleep)
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_app.c                            Initializes HW and SW system entities (not related to the radio)
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/sys_sensors.c                        Manages the sensors on the application
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/timer_if.c                           Configure RTC Alarm, Tick and Calendar manager
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart.c                              This file provides code for the configuration
+                                                                                of the USART instances.
+  - LoRaWAN_End_Node_DualCore/CM4/Core/Src/usart_if.c                           Configuration of UART driver interface for hyperterminal communication
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/app_lorawan.c                     Application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/CayenneLpp.c                      Implements the Cayenne Low Power Protocol
+  - LoRaWAN_End_Node_DualCore/CM4/LoRaWAN/App/lora_app.c                        Application of the LRWAN Middleware
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/LmHandler_mbwrapper.c                   This file implements the CM4 side wrapper of the LoraMac interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmux.c                                 CM4 side multiplexer to map features to IPCC channels
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_lora.c                          allows CM4 application to register and handle LoraWAN via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_radio.c                         allows CM4 application to register and handle RADIO driver via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_sys.c                           allows CM4 application to handle the SYSTEM MBMUX channel.
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/mbmuxif_trace.c                         allows CM4 application to receive by CM0 TRACE via MBMUX
+  - LoRaWAN_End_Node_DualCore/CM4/MbMux/radio_mbwrapper.c                       This file implements the CM4 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - LoRaWAN_End_Node_DualCore/Common/System/system_stm32wlxx.c                  CMSIS Cortex Device Peripheral Access Layer System Source File
+  - LoRaWAN_End_Node_DualCore/Common/System/sys_debug.c                         Enables 4 debug pins for internal signals RealTime debugging
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c STM32CubeIDE Minimal System calls file
+  - LoRaWAN_End_Node_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c   STM32CubeIDE System Memory calls file
+
+
+@par Hardware and Software environment
+
+  - This example runs on the STM32WLxx Nucleo board.
+
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
+      to ST-LINK connector.
+    - Please ensure that the ST-LINK connector jumpers are fitted.
+
+  - Configure the software via the configuration files:
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, lorawan_conf.h, Commissioning.h, se-identity.h, mw_log_conf.h, main.h, etc
+    - CM4 (Lora application)
+        - sys_conf.h, lora_app.h, nucleo_conf.h, main.h, etc
+    - Careful:
+        - the region and class chosen on CM4/LoRaWAN/App/lora_app.h shall be compatible with CM0PLUS/LoRaWAN/Target/lorawan_conf.h list
+
+  -Set Up:
+
+             --------------------------  V    V  --------------------------
+             |      LoRa Object       |  |    |  |      LoRa Network      |
+             |                        |  |    |  |                        |
+   ComPort<--|                        |--|    |--|                        |-->Web Server
+             |                        |          |                        |
+             --------------------------          --------------------------
+
+@par How to use it ?
+In order to make the program work, you must do the following :
+  - use the script \Scripts\<MyPreferredToolchain>\build.bat to rebuild the SBSFU and the LoRaWAN projects
+  - use the script \Scripts\<MyPreferredToolchain>\program.bat to download the big binary on target device
+  - Open a Terminal, connected the LoRa Object
+  - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
+  - Reset the system (two cores)
+  - SBSFU check if new fw to be downloaded otherwise verifies the user LoraWAN fw signature and execute it
+  - SBSFU first and then LoraWAN logs are displayed on the Terminal
+
+@par How to debug ?
+  - change or undefine following definitions in above files:
+    - in ..\2_Images_SBSFU\CM0PLUS\app_sfu.h
+      /*#define SFU_RDP_PROTECT_ENABLE*/
+      /*#define SFU_C2SWDBG_PROTECT_ENABLE*/
+    - in ..\2_Images_SBSFU\Common\app_sfu_common.h
+      /*#define SFU_DAP_PROTECT_ENABLE*/
+      /*#define SFU_C2_DDS_PROTECT_ENABLE*/
+      #define SFU_HIDE_PROTECTION_CFG OB_SECURE_HIDE_PROTECTION_DISABLE
+    - in .\LoRaWAN_End_Node_DualCore\CM4\Core\Inc\sys_conf.h
+      #define DEBUGGER_ENABLED   1   to debug CM4
+      #define LOW_POWER_DISABLE   1  at least on one MCU (CM4 or CM0PUS)
+    - in .\LoRaWAN_End_Node_DualCore\CM0PLUS\Core\Inc\sys_conf.h
+      #define DEBUGGER_ENABLED   1   to debug CM0PLUS
+      #define LOW_POWER_DISABLE   1  at least on one MCU (CM4 or CM0PUS)
+  - use the script \Scripts\<MyPreferredToolchain>\build.bat to rebuild the SBSFU and the LoRaWAN projects
+  - use the script \Scripts\<MyPreferredToolchain>\program.bat to download the big binary on target device
+  - unplug the USB and plug it back to reconnect the board to the PC
+  - SBSFU run first then LoRaWAN_End_Node starts
+  - LoRaWAN_End_Node CM4 code enters in while(1) loop waiting the push button BUTTON_SW2 to be pressed
+  - the CM0PLUS code is in while(1) loop waiting the CM4 to set CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START
+  - if you need to debug CM4 open your preferred toolchain and select CM4 project and attach to running target
+  - if you need to debug CM0PLUS open your preferred toolchain and select CM0PLUS project and attach to running target
+  - set the breakpoints either in CM4 or CM0PLUS or both debugger instances
+  - press the push button BUTTON_SW2:
+     - CM4 exits its while(1) loop and executes MBMUXIF_SetCpusSynchroFlag(1) and reaches the CM4 breakpoint
+     - this allows CM0PLUS to exit its while(1) loop and to reach the CM0PLUS breakpoint
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/EWARM/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/EWARM/build.bat
new file mode 100644
index 00000000..14842991
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/EWARM/build.bat
@@ -0,0 +1,69 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+set rebuild=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if "%1"=="-norebuild" (
+    set rebuild=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\EWARM\Project.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\EWARM\Project.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\EWARM\CM0PLUS.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\EWARM\CM4.ewp || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\EWARM\LoRaWAN_End_Node_DualCore_CM0PLUS.ewp || goto :eof
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\EWARM\LoRaWAN_End_Node_DualCore_CM4.ewp || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  if %rebuild% equ 1 (
+    %EWARM_EXE% "%~1" -clean * -parallel 10
+    %EWARM_EXE% "%~1" -make * -parallel 10
+  ) else (
+    %EWARM_EXE% "%~1" * -parallel 10
+  )
+  if %errorlevel% neq 0 (
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| -norebuild ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo -norebuild  Partial compilation
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/EWARM/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/EWARM/program.bat
new file mode 100644
index 00000000..6e41505f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/EWARM/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\LoRaWAN_End_Node_DualCore\EWARM\Binary\SBSFU_LoRaWAN_End_Node_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/build.bat
new file mode 100644
index 00000000..43ea97b2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/build.bat
@@ -0,0 +1,70 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  echo Build 2_Images_KMS_Blob
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\MDK-ARM\Project.uvprojx || goto :eof
+  echo Build 2_Images_SECoreBin
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\MDK-ARM\Project.uvprojx || goto :eof
+  echo Build 2_Images_SBSFU\CM0PLUS
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\MDK-ARM\CM0PLUS.uvprojx || goto :eof
+  echo Build 2_Images_SBSFU\CM4
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\MDK-ARM\CM4.uvprojx || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+echo Build LoRaWAN_End_Node_DualCore\CM0PLUS
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\MDK-ARM\LoRaWAN_End_Node_DualCore_CM0PLUS.uvprojx || goto :eof
+echo Build LoRaWAN_End_Node_DualCore\CM4
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\MDK-ARM\LoRaWAN_End_Node_DualCore_CM4.uvprojx || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  %MDK_EXE% -r "%~1" -o "%~dp0\temp.log" -j0
+  REM return 0 if OK, 1 if warning, 2 if error
+  if %errorlevel% equ 2 (
+    type "%~dp0\temp.log"
+    del "%~dp0\temp.log"
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  type "%~dp0\temp.log"
+  del "%~dp0\temp.log"
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/program.bat
new file mode 100644
index 00000000..b9e948ac
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\LoRaWAN_End_Node_DualCore\MDK-ARM\Binary\SBSFU_LoRaWAN_End_Node_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/build.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/build.bat
new file mode 100644
index 00000000..88dbe677
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/build.bat
@@ -0,0 +1,73 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+set rebuild=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if "%1"=="-norebuild" (
+    set rebuild=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+set "workspacedir=%current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\Binary\ws"
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\STM32CubeIDE || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\STM32CubeIDE || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\STM32CubeIDE\CM0PLUS || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\STM32CubeIDE\CM4 || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\CM0PLUS || goto :eof
+call :compile_func %current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\CM4 || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  if not exist %workspacedir% (
+    mkdir %workspacedir% 2>NUL
+    if %ERRORLEVEL% NEQ 0 exit /B 1
+  ) else (
+    del /q "%workspacedir%\*"
+    for /D %%p in ("%workspacedir%\*.*") do rmdir "%%p" /s /q
+  )
+  %CUBEIDE_EXE% --launcher.suppressErrors -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data "%workspacedir%" -import "%~1" -build all
+  if %errorlevel% neq 0 (
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| -norebuild ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo -norebuild  Partial compilation
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/program.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/program.bat
new file mode 100644
index 00000000..966a4fa4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\Binary\SBSFU_LoRaWAN_End_Node_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/disable_security.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/disable_security.bat
new file mode 100644
index 00000000..02dbfc56
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/disable_security.bat
@@ -0,0 +1,87 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+
+REM ###########################################
+REM # 0- Set all global variables
+REM ###########################################
+if not defined CUBEPROG_EXE (
+  call setenv.bat
+)
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+echo RDP: Read Out protection Level 1
+call :write_ob RDP 0xBB || goto :eof
+
+echo RDP+ESE: Read Out protection Level 0 + Security disabled
+call :write_ob RDP 0xAA ESE 0x0 || goto :eof
+
+echo WRP: Write Protection disabled
+call :write_ob WRP1A_STRT 0x7F WRP1A_END 0x0 WRP1B_STRT 0x7F WRP1B_END 0x0 || goto :eof
+
+echo ------ User Configuration ------
+echo nRST: No reset generated when entering the Stop/Standby/Shutdown modes
+call :write_ob nRST_STOP 0x1 nRST_STDBY 0x1 nRST_SHDW 0x1 || goto :eof
+
+echo WDG_SW: Software window/independent watchdogs
+call :write_ob WWDG_SW 0x1 IWDG_SW 0x1 || goto :eof
+
+echo IWDG: Independent watchdog counter frozen in Stop/Standby modes
+call :write_ob IWGD_STDBY 0x0 IWDG_STOP 0x0 || goto :eof
+
+echo BOOT: CPU1+CPU2 CM0+ Boot lock disabled
+call :write_ob BOOT_LOCK 0x0 C2BOOT_LOCK 0x0 || goto :eof
+
+echo ------ Security Configuration ------
+echo HDPAD: User Flash hide protection area access disabled
+call :write_ob HDPAD 0x1 || goto :eof
+
+echo SPISD: SPI3 security disabled
+call :write_ob SUBGHSPISD 0x1 || goto :eof
+
+echo SBRSA: Reset default value of SRAM Start address secure
+call :write_ob SNBRSA 0x1F SBRSA 0x1F || goto :eof
+
+echo SBRV: Reset default value of CPU2 Boot start address
+call :write_ob SBRV 0x8000 || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:write_ob
+  set len_ob=0
+  :next
+  if not "%~1" == "" if not "%~2" == "" (
+    set option_byte_name[!len_ob!]=%~1
+    set option_byte_val[!len_ob!]=%~2
+    set /a len_ob+=1
+    shift
+    shift
+    goto next
+  )
+  set /a len_ob-=1
+  set obj_str=
+  for /L %%i in (0,1,%len_ob%) do (
+    set obj_str=!option_byte_name[%%i]!=!option_byte_val[%%i]! !obj_str! 
+  )
+
+  %CUBEPROG_EXE% -c port=SWD mode=UR -q -ob !obj_str! >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Command write -ob !obj_str! Failed
+    exit /B 1
+  )
+  %CUBEPROG_EXE% -c port=SWD mode=UR -q -ob displ > temp.txt
+  
+  REM Get line containing %~1 Option Byte
+  for /L %%i in (0,1,%len_ob%) do (
+    for /f "tokens=3" %%h in ('findstr /c:"     !option_byte_name[%%i]!" temp.txt') do set "read_ob=%%h"
+    if "!read_ob!" neq "!option_byte_val[%%i]!" (
+      echo Error: Option Byte !option_byte_name[%%i]! not modified as expected: read=!read_ob! expected=!option_byte_val[%%i]!
+      del /Q temp.txt >nul
+      exit /B 1
+    )
+  )
+  
+  del /Q temp.txt >nul
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/setenv.bat b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/setenv.bat
new file mode 100644
index 00000000..c8c00c32
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_SBSFU_1_Slot_DualCore/Scripts/setenv.bat
@@ -0,0 +1,4 @@
+set CUBEPROG_EXE="C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin\STM32_Programmer_CLI.exe"
+set EWARM_EXE="C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.1\common\bin\IarBuild.exe"
+set MDK_EXE="C:\Keil_v5\UV4\UV4.exe"
+set CUBEIDE_EXE="C:\ST\STM32CubeIDE_1.6.0\STM32CubeIDE\stm32cubeidec.exe"
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin
new file mode 100644
index 00000000..87418a0d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin
@@ -0,0 +1 @@
+�!Eˠ;P=����+�f
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
new file mode 100644
index 00000000..b0959594
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
new file mode 100644
index 00000000..6f66889b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
@@ -0,0 +1,1054 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\KMS_Blob.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..e6140477
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,21 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+
+define region ROM_region   = mem:[from 0 to 0x8000];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+
+place in ROM_region   { section .KMS_blob_Keys, last section aes_block_padding };
+keep { section .KMS_blob_Keys };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
new file mode 100644
index 00000000..ec939c17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
@@ -0,0 +1,14 @@
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+
+; *** regions needed by KMS_Blob project ***
+LR_ROM (0x00000000) ALIGN(16) {
+  ROM_region +0 {
+  *(.KMS_blob_Keys)
+  .ANY (+RO)
+  }
+  ALIGN_region +0 ALIGN(16) EMPTY(16) {
+  }
+} 
+ 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..35a88778
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>1</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>0</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>BIN\UL2CM3.DLL</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_blob_example_keys.c</PathWithFileName>
+      <FilenameWithoutPath>kms_blob_example_keys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..efc3799c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>KMS_blob</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../2_Images_SECoreBin/Inc</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>0</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>KMS_Blob.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--diag_suppress L6305W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>kms_blob_example_keys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_KMS_Blob"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..4056ed95
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../2_Images_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/KMS_Blob.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_KMS_Blob.null.1082786794" name="2_Images_KMS_Blob"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1003497030;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1841871715">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
new file mode 100644
index 00000000..364b1864
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_KMS_Blob</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_blob_example_keys.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_blob_example_keys.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
new file mode 100644
index 00000000..cf21882e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
@@ -0,0 +1,29 @@
+/*
+** LinkerScript
+*/
+
+APPLI_region_ROM_start    = 0x00000000;
+APPLI_region_ROM_length   = 0x8000;
+
+/* Specify the memory areas */
+MEMORY
+{
+ APPLI_region_ROM  : ORIGIN = APPLI_region_ROM_start, LENGTH = APPLI_region_ROM_length
+}
+
+/* Define output sections */
+SECTIONS
+{
+  .rodata :
+  {
+    . = ALIGN(16);
+    KEEP(*(.KMS_blob_Keys))
+    . = ALIGN(16);
+  } >APPLI_region_ROM
+  
+  /DISCARD/ :
+  {
+    *(.init)
+    *(.fini)
+  }
+}
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
new file mode 100644
index 00000000..64af9746
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
@@ -0,0 +1,153 @@
+/**
+  ******************************************************************************
+  * @file    kms_blob_example_key.c
+  * @author  MCD Application Team
+  * @brief   Key Management Services module.
+  *          This file provides examples of data to be loaded as a blob
+  *          (provisioning).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#if !defined(KMS_ENABLED)
+#define KMS_ENABLED
+#endif /* KMS_ENABLED */
+
+#include "kms.h"
+#include "kms_platf_objects_interface.h"
+
+/* Custom Structures declaration */
+KMS_DECLARE_BLOB_STRUCT(, 225)
+KMS_DECLARE_BLOB_STRUCT(, 36)
+
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".KMS_blob_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".KMS_blob_Keys"
+#else
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* __ICCARM__ */
+
+const kms_obj_keyhead_225_t   Test_Key_RSA_2048 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,          /*   uint32_t configuration;     */
+  900,                             /*   uint32_t blobs_size;        */
+  11,                              /*   uint32_t blobs_count;       */
+  KMS_KEY_RSA2048_OBJECT_HANDLE,   /*   uint32_t object_id;         */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PRIVATE_KEY,               /* CLASS = PRIVATE KEY */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_RSA,                           /* TYPE = RSA KEY */
+    CKA_TOKEN,        4, CK_TRUE,
+    CKA_LABEL,        16, 0x52455355U, 0x424F4C42U, 0x20415352U, 0x38343032U, /* 'USER', 'BLOB', 'RSA ', '2048' */
+    CKA_ID,           4, 123,
+    CKA_SENSITIVE,    4, CK_TRUE,                                             /* SENSITIVE KEY */
+    CKA_VERIFY,       4, CK_TRUE,                                             /* CAN BE USED FOR VERIFICATION */
+    CKA_SIGN,         4, CK_TRUE,                                             /* CAN BE USED FOR SIGNATURE */
+
+    CKA_MODULUS,      256,                                                    /* RSA KEY MODULUS */
+    0xcea80475U, 0x324c1dc8U, 0x34782781U, 0x8da58bacU,
+    0x069d3419U, 0xc614a6eaU, 0x1ac6a3b5U, 0x10dcd72cU,
+    0xc5169549U, 0x05e9fef9U, 0x08d45e13U, 0x006adf27U,
+    0xd467a7d8U, 0x3c111d1aU, 0x5df15ef2U, 0x93771aefU,
+    0xb920032aU, 0x5bb989f8U, 0xe4f5e1b0U, 0x5093d3f1U,
+    0x30f984c0U, 0x7a772a36U, 0x83f4dc6fU, 0xb28a9681U,
+    0x5b32123cU, 0xcdd13954U, 0xf19d5b8bU, 0x24a103e7U,
+    0x71a34c32U, 0x8755c65eU, 0xd64e1924U, 0xffd04d30U,
+    0xb2142cc2U, 0x62f6e004U, 0x8fef6dbcU, 0x652f2147U,
+    0x9ea1c4b1U, 0xd66d28f4U, 0xd46ef718U, 0x5e390cbfU,
+    0xa2e02380U, 0x582f3188U, 0xbb94ebbfU, 0x05d31487U,
+    0xa09aff01U, 0xfcbb4cd4U, 0xbfd1f0a8U, 0x33b38c11U,
+    0x813c8436U, 0x0bb53c7dU, 0x4481031cU, 0x40bad871U,
+    0x3bb6b835U, 0xcb08098eU, 0xd15ba31eU, 0xe4ba728aU,
+    0x8c8e10f7U, 0x294e1b41U, 0x63b7aee5U, 0x7277bfd8U,
+    0x81a6f9d4U, 0x3e02c692U, 0x5aa3a043U, 0xfb7fb78dU,
+
+    CKA_PUBLIC_EXPONENT, 256,                                                  /* RSA PUBLIC EXPONENT */
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00260445U,
+
+
+    CKA_PRIVATE_EXPONENT, 256,                                                  /* RSA PRIVATE EXPONENT */
+    0x0997634cU, 0x477c1a03U, 0x9d44c810U, 0xb2aaa3c7U,
+    0x862b0b88U, 0xd3708272U, 0xe1e15f66U, 0xfc938970U,
+    0x9f8a11f3U, 0xea6a5af7U, 0xeffa2d01U, 0xc189c50fU,
+    0x0d5bcbe3U, 0xfa272e56U, 0xcfc4a4e1U, 0xd388a9dcU,
+    0xd65df862U, 0x8902556cU, 0x8b6bb6a6U, 0x41709b5aU,
+    0x35dd2622U, 0xc73d4640U, 0xbfa1359dU, 0x0e76e1f2U,
+    0x19f8e33eU, 0xb9bd0b59U, 0xec198eb2U, 0xfccaae03U,
+    0x46bd8b40U, 0x1e12e3c6U, 0x7cb62956U, 0x9c185a2eU,
+    0x0f35a2f7U, 0x41644c1cU, 0xca5ebb13U, 0x9d77a89aU,
+    0x2953fc5eU, 0x30048c0eU, 0x619f07c8U, 0xd21d1e56U,
+    0xb8af0719U, 0x3d0fdf3fU, 0x49cd49f2U, 0xef3138b5U,
+    0x138862f1U, 0x470bd2d1U, 0x6e34a2b9U, 0xe7777a6cU,
+    0x8c8d4cb9U, 0x4b4e8b5dU, 0x616cd539U, 0x3753e7b0U,
+    0xf31cc7daU, 0x559ba8e9U, 0x8d888914U, 0xe334773bU,
+    0xaf498ad8U, 0x8d9631ebU, 0x5fe32e53U, 0xa4145bf0U,
+    0xba548bf2U, 0xb0a50c63U, 0xf67b14e3U, 0x98a34b0dU,
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* (__GNUC__) */
+
+const kms_obj_keyhead_36_t   Test_Key_AES256_Derivable =
+{
+  KMS_ABI_VERSION_CK_2_40,                /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,                 /*   uint32_t configuration;     */
+  144,                                    /*   uint32_t blobs_size;        */
+  8,                                      /*   uint32_t blobs_count;       */
+  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE, /*   uint32_t object_id;         */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_AES,                          /* TYPE = AES KEY */
+    CKA_VALUE,        32, 0x603deb10U, 0x15ca71beU, 0x2b73aef0U, 0x857d7781U,
+    0x1f352c07U, 0x3b6108d7U, 0x2d9810a3U, 0x0914dff4U,
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO ENCRYPT */
+    CKA_DECRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO DECRYPT */
+    CKA_TOKEN,        sizeof(CK_BBOOL), CK_TRUE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,               /* CLASS = SECRET KEY */
+    CKA_DERIVE,       sizeof(CK_BBOOL), (uint8_t)CK_TRUE,                    /* CAN BE USED TO DERIVE A NEW KEY */
+    CKA_LABEL,        24, 0x52455355U, 0x424F4C42U, 0x50595243U, 0x49524544U, 0x4C424156U, 0x00000045U,
+    /* 'USER', 'BLOB', 'CRYP', 'DERI', 'VABL', 'E' */
+  }
+};
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_function_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif /* (__ICCARM__) */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/readme.txt
new file mode 100644
index 00000000..2bbeb396
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/readme.txt
@@ -0,0 +1,62 @@
+/**
+  @page 2_Images_KMS_Blob / Key Management Services / Blob generation project.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2019 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Key Management Services Blob generation.
+  *          Allows to generate Blob to be injected to a device supporting
+  *          KMS ImportBlob().
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description 
+
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+
+You can edit your own keys to generate your own Blob.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Cryptography, KMS, Provisioning
+
+@par Directory contents
+
+   - 2_Images_KMS_Blob/Src/kms_blob_example_keys.c             KMS blob objects definition
+   - 2_Images_KMS_Blob/Binary/ECCKEY.txt                       Private ECCDSA key for signature verification
+   - 2_Images_KMS_Blob/Binary/iv.bin                           Encryption/decryption initialization vector
+   - 2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - Python installation required. In addition, install the appropriate python modules as described in
+    Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages\readme.txt
+    
+    
+@par How to use it ? 
+
+In order to generate Secure Key Storage Blob file, you must do the following :
+ - Edit the .c source file, where examples of keys are provided. Update with your own keys.
+ - Open your preferred toolchain 
+ - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
new file mode 100644
index 00000000..696d8368
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    app_hw.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update hardware
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_HW_H
+#define APP_HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported macros -----------------------------------------------------------*/
+/* At power-on, the capacitor related to SW1 button needs to charge.
+ * The charging time must be waited to be sure that a low level is a real one. */
+#define BUTTON_INIT() \
+  BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);                               \
+  if ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET) \
+  {                                                                       \
+     HAL_Delay(6U);                                                       \
+  }
+
+#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_HW_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
new file mode 100644
index 00000000..5ac7113c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
@@ -0,0 +1,32 @@
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAIN_H
+#define MAIN_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "app_sfu.h"
+#include "app_hw.h"
+
+#endif /* MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..8fff5bd0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+#define HAL_GTZC_MODULE_ENABLED
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..f6b5e516
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,53 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* External variables --------------------------------------------------------*/
+extern RTC_HandleTypeDef    RtcHandle;
+
+/* Exported functions ------------------------------------------------------- */
+void SVC_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+void RTC_LSECSS_IRQHandler(void);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+void TZIC_ILA_IRQHandler(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
new file mode 100644
index 00000000..df18911f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
@@ -0,0 +1,89 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Secure Boot and Secure Firmware Update.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_boot.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  main function
+  * @param  None
+  * @retval int
+  */
+int main(void)
+{
+
+  /* MCU Configuration--------------------------------------------------------*/
+  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
+  (void) HAL_Init();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+  /*
+   * As the secure mode has not been entered yet, we do not configure BSP right now .
+   * The BSP will be configured by the bootloader.
+   */
+
+
+  /* Launch the Bootloader----------------------------------------------------*/
+  /*
+   * This is the beginning of the secure part:
+   * security mechanisms will be enabled.
+   * The function below should not return (unless a critical failure is encountered).
+   */
+  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
+
+  /* Security or SecureBoot initialization failure. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+}
+
+
+
+
+
+
+#ifdef USE_FULL_ASSERT
+
+/**
+  * @brief Reports the name of the source file and the source line number
+  * where the assert_param error has occurred.
+  * @param file: pointer to the source file name
+  * @param line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+
+}
+
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..1c509696
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_msp.c
+  * @author  MCD Application Team
+  * @brief   This file provides code for the MSP Initialization
+  *          and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0U, 0U);
+
+}
+
+/**
+  * @brief RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspInit(hrtc);
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in this example.
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspDeInit(hrtc);
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspInit(huart);
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in this example:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspDeInit(huart);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..47e5904e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,100 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+#include "sfu_low_level_security.h"
+
+/* Global variables ----------------------------------------------------------*/
+/* RTC handler declaration */
+RTC_HandleTypeDef RtcHandle;
+
+/* Functions Definition ------------------------------------------------------*/
+/******************************************************************************/
+/*            Cortex-M0+ Processor Interruption and Exception Handlers         */
+/******************************************************************************/
+
+/* Exception handlers are implemented in the various source files of sbsfu application */
+
+/* NMI exception handler is implemented in sfu_low_level_flash_int.c file */
+/* Hard Fault exception handler is implemented in sfu_boot.c file */
+
+/* SVC call handler is implemented in se_sfu_mpu.s */
+
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers                  */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                               */
+/******************************************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void RTC_LSECSS_IRQHandler()
+{
+  /* Handle only the tamper enabled by SBSFU */
+  uint32_t tmp = READ_REG(TAMP->MISR) & RTC_TAMPER_ID;
+
+  /* Immediately clear flags to avoid eternal resets */
+  WRITE_REG(TAMP->SCR, tmp);
+
+  /* SRAM2 is erased and RtcHandle is corrupted: no specific handling is possible. */
+  NVIC_SystemReset();
+}
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  This function handles TZIC interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TZIC_ILA_IRQHandler(void)
+{
+  HAL_GTZC_IRQHandler();
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
new file mode 100644
index 00000000..8560fd8b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
@@ -0,0 +1,206 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_crypto_config.h"
+#include "app_sfu_common.h"
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Use this define to choose the type of Firmware Image Programming you want to use.
+  * This version supports only 2 modes:
+  *
+  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
+  *       The image is received in encrypted format.
+  *       The image must be decrypted to be installed:
+  *         this is done according to the selected crypto scheme,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  * SFU_CLEAR_IMAGE: Clear Firmware Image
+  *       The image is received in clear format.
+  *       No decrypt operation is needed before installing the image:
+  *         the selected crypto scheme must be compatible with this choice,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  *
+  */
+#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
+#else
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
+#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
+
+#define SFU_DEBUG_MODE               /*!< Comment this define to optimize memory footprint (debug mode removed)
+                                          No more print on terminal during SBSFU execution */
+
+/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
+                                          this switch activates more debug prints in the console (FSM state info...) */
+
+
+/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
+                                                          When this switch is activated, the FWIMG part of SB_SFU will
+                                                          block when an abnormal error is encountered */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
+#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
+#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
+
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
+#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
+
+/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
+                                           Automatically executed @startup */
+#if defined(SFU_TEST_PROTECTION)
+#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
+#endif /* SFU_TEST_PROTECTION */
+
+/**
+  * SB_SFU status LED.
+  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
+  * This is useful when no log is enabled.
+  *
+  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
+  * \li For the other situations, please check the other defines below.
+  */
+#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
+#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
+                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
+#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
+
+
+/**
+  * Optional Features Software Configuration
+  */
+#if !defined(SFU_TEST_PROTECTION)
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+#else
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
+#endif /* SFU_TEST_PROTECTION */
+
+#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
+#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
+#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
+
+/* Uncomment the define below if you want to use minicom with Linux */
+/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
+
+#if defined(MINICOM_YMODEM)
+/* Minicom does not accept the debug prints during the YMODEM session */
+#undef SFU_VERBOSE_DEBUG_MODE
+#endif /* MINICOM_YMODEM */
+
+
+/* Multi-images configuration :
+   - Max : 3 Active images
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+*/
+#define SFU_NB_MAX_ACTIVE_IMAGE 2U                        /*!< 2 active images managed */
+#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 blob dwl area managed */
+#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
+
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_RDP_PROTECT_ENABLE
+/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
+                                             neither connected to GND nor to 5V (floating level), there are too many
+                                             spurious tamper event detected */
+#define SFU_IWDG_PROTECT_ENABLE    /*!< WARNING:
+                                        1. Be Careful if enabling this protection. IWDG will be active also after
+                                           switching to UserApp: a refresh is needed.
+                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
+                                           platform (flash size...)*/
+#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
+                                        Enables/Disables the MPU protection.
+                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
+                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
+                                        addition to the overall MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
+                                        executable area */
+
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_GTZC_PROTECT_ENABLE    /*!< GTZC protection (dependent on SFU_SECURE_USER_PROTECT_ENABLE):
+                                        Enables/Disables the GTZC protection. */
+#define SFU_C2SWDBG_PROTECT_ENABLE /*!< Dynamic disabling of the CPU2 debug:
+                                        not writable if ESE=0, no meaning if DDS=1. */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
+                                                      completely disabled, OB update no more possible  */
+
+
+#else
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
+                                                      field should set it as Level2 */
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+
+#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
+                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
+
+
+/**
+  * Application Configuration
+  *
+  */
+#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
+                                              You can also define an upper bound here if you plan to use it */
+
+#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
+                                              no FW installed or due to an attack attempt). Could be different from
+                                              SFU_FW_VERSION_START_NUM */
+
+/**
+  * Features compatibility control
+  */
+#if defined(SFU_NO_SWAP) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_NO_SWAP process"
+#endif
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_SECURE_USER_PROTECT_ENABLE process"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
new file mode 100644
index 00000000..b04ef4cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
@@ -0,0 +1,1552 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.c
+  * @author  MCD Application Team
+  * @brief   SFU BOOT module
+  *          This file provides firmware functions to manage the following
+  *          functionalities of the Secure Boot:
+  *           + Initialization and de-initialization functions
+  *           + Secure Boot Control functions
+  *           + Secure Boot State functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_BOOT_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+#include "sfu_boot.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
+
+/*
+ * The sfu_com init is provided by the sfu_com_trace module by default.
+ * If not, then it is taken from the sfu_com_loader module.
+ */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_trace.h"
+#else
+#include "sfu_trace.h"      /* needed anyhow even if the defines will be empty */
+#include "sfu_com_loader.h" /* needed only for the COM init/de-init */
+#endif /* SFU_DEBUG_MODE  || SFU_TEST_PROTECTION */
+#include "se_def.h"
+#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
+#include "sfu_new_image.h"            /* the local loader is a kind of "application" running in SB_SFU so it needs the
+                                         services to install a FW image */
+#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
+#include "sfu_test.h"                 /* auto tests */
+#include "sfu_fwimg_internal.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "sfu_kms.h"
+#endif /* KMS_ENABLED */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct
+{
+  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
+  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
+} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
+                                                     information using during the SM evolution. */
+
+/* Private defines -----------------------------------------------------------*/
+#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
+#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
+#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
+                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
+
+#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
+                                    maintained for future customization/expansion of the field itself */
+
+#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
+
+/* Private macros ------------------------------------------------------------*/
+#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    if (Status == SFU_SUCCESS){                                         \
+      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
+    }                                                                   \
+    else {                                                              \
+      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
+    }                                                                   \
+  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
+
+
+#define SFU_SET_SM_CURR_STATE(NewState)                                 \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    m_StateMachineContext.CurrState = NewState;                         \
+  }while(0) /*!< Set a State Machine state*/
+
+/* Private variables ---------------------------------------------------------*/
+/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
+static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
+                                                                         SFU_STATE_INITIAL
+                                                                        };
+
+/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
+static uint32_t m_C1ActiveSlot = SLOT_INACTIVE;
+static uint32_t m_C2ActiveSlot = SLOT_INACTIVE;
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+uint8_t initialDeviceStatusCheck;
+
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_BOOT_Init(void);
+static SFU_ErrorStatus SFU_BOOT_DeInit(void);
+static void SFU_BOOT_BspConfiguration(void);
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
+static void SFU_BOOT_SM_CheckStatusOnReset(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static void SFU_BOOT_SM_CheckNewFwToDownload(void);
+static void SFU_BOOT_SM_DownloadNewUserFw(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
+static void SFU_BOOT_SM_InstallKMSBlob(void);
+#endif /* KMS_ENABLED */
+static void SFU_BOOT_SM_CheckUserFwStatus(void);
+static void SFU_BOOT_SM_VerifyUserFwSignature(void);
+static void SFU_BOOT_SM_ExecuteUserFw(void);
+static void SFU_BOOT_SM_HandleCriticalFailure(void);
+static void SFU_BOOT_SM_RebootStateMachine(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
+static void SFU_BOOT_ManageResetSources(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
+  *        In the nominal case, the bootloader service runs until the user application is launched.
+  *        When no valid user application can be run (after installing a new image or not),
+  *        if the local loader feature is not enabled then the execution stops,
+  *        otherwise a local download will be awaited.
+  *        If the state machine encounters a major issue then a reboot is triggered.
+  * @param None.
+  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
+  * @note Constraints
+  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
+  *       2. This function also takes care of BSP initialization after enabling the secure mode.
+  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
+  *       3. No other entity should handle the initialization of the Secure Engine.
+  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
+  *          configurations will be overwritten).
+  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
+  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
+  *          error cause.
+  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
+  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
+  *          new image).
+  * @note Settings are handled at compilation time:
+  *       1. See compiler switches in main.h for secure IPs settings
+  *       2. The trace system is configured in the sfu_trace.h file
+  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
+  *          stage.
+  */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
+{
+  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
+
+  /*
+   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
+   * "automatically" managed by SBSFU compiler command
+   */
+  if (SE_Startup() == SE_SUCCESS)
+  {
+    /* Security Configuration */
+    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
+    {
+      /* Board BSP  Configuration */
+      SFU_BOOT_BspConfiguration();
+
+      /* Configure the Secure Boot and start the State machine */
+      if (SFU_BOOT_Init() == SFU_SUCCESS)
+      {
+        /* Start the Secure Boot State Machine */
+        (void) SFU_BOOT_SM_Run();
+      }
+      else
+      {
+        /* failure when initializing the secure boot service */
+        e_ret_code = SFU_BOOT_INIT_FAIL;
+      }
+    }
+    else
+    {
+      /* failure when configuring the security IPs  */
+      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
+    }
+  }
+  else
+  {
+    /* failure at secure engine initialization stage */
+    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
+  }
+
+  /*
+   * This point should not be reached unless a critical init failure occurred
+   * Return the error code
+   */
+  return (e_ret_code);
+}
+
+/**
+  * @brief  Force System Reboot
+  * @param  None
+  * @retval None
+  */
+void SFU_BOOT_ForceReboot(void)
+{
+  /*
+   * WARNING: The follow TRACEs are for debug only. This function could be called
+   * inside an IRQ so the below printf could not be executed or could generate a fault!
+   */
+  TRACE("\r\n========= End of Execution ==========");
+  TRACE("\r\n\r\n\r\n");
+
+  /*
+   * This is the last operation executed. Force a System Reset.
+   * The check below is needed in case we reboot before setting the Unpriviledged mode.
+   * This can happen in a factory reset use-case typically.
+   */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  Initialize the Secure Boot State machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_Init(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
+   * download)
+   */
+  initialDeviceStatusCheck = 1U;
+
+  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
+  if (SFU_LL_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Flash interface initialization */
+  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* The COM modules is required only if the trace or the local download is enabled */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
+  if (SFU_COM_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  /* Call the SFU_LOADER module Init */
+  if (SFU_LOADER_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+  /* Call the Exception module Init */
+  if (SFU_EXCPT_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Call the image handling Init  */
+  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
+  {
+    return SFU_ERROR;
+  } /* else continue */
+
+
+  TRACE("\r\n\r\n");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  TRACE("\r\n=                                                                    =");
+  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n\r\n");
+
+  /* Initialize the Secure Engine that will be used for all the most critical operations */
+  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
+  }
+  else
+  {
+    e_ret_status = SFU_SUCCESS;
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize the Secure Boot State machine.
+  * @param  None
+  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
+  *         The bootloader can terminate:
+  *         1. with an init failure : no de-init needed
+  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
+  *            by this function.
+  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
+  *            required security mechanisms.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_DeInit(void)
+{
+  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  if (SFU_COM_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+  if (SFU_LL_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  BSP Initialization.
+  *         Called when the secure mode is enabled.
+  * @note   The BSP configuration should be handled only in this function.
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_BspConfiguration()
+{
+  /* LED Init*/
+  (void) BSP_LED_Init(SFU_STATUS_LED);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* User Button */
+  BUTTON_INIT();
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Execute the Secure Boot state machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
+  void (*fnStateMachineFunction)(void);
+  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+                                                 SFU_BOOT_SM_CheckNewFwToDownload,
+                                                 SFU_BOOT_SM_DownloadNewUserFw,
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
+                                                 SFU_BOOT_SM_InstallKMSBlob,
+#endif /* KMS_ENABLED */
+                                                 SFU_BOOT_SM_CheckUserFwStatus,
+                                                 SFU_BOOT_SM_VerifyUserFwSignature,
+                                                 SFU_BOOT_SM_ExecuteUserFw,
+                                                 SFU_BOOT_SM_HandleCriticalFailure,
+                                                 SFU_BOOT_SM_RebootStateMachine
+                                                };
+
+  /* Start the State Machine loop/evolution */
+  while (e_ret_status == SFU_SUCCESS)
+  {
+    /* Always execute a security/safety check before moving to the next state */
+    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
+    {
+      /* Get the right StateMachine function according to the current state */
+      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
+
+      /* Call the State Machine function associated to the current state */
+      fnStateMachineFunction();
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* If the State Machine cannot evolve anymore, reboot is the only option */
+
+  /* Set the error before forcing a reboot */
+  SFU_EXCPT_SetError(SFU_EXCPT_UNKNOWN);
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+  return e_ret_status;
+}
+
+/** @brief  Check the Reset status in order to understand the last cause of Reset
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckStatusOnReset(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
+
+  /* Check the wakeup sources */
+  SFU_BOOT_ManageResetSources();
+
+  /* RCC access done to identify the wakeup sources, we can switch to unpriviledged */
+  SFU_MPU_EnterUnprivilegedMode();
+#ifdef SFU_TEST_PROTECTION
+  /*
+   * All protections are installed and the correct execution mode is set (unprivileged).
+   * This is the good time to run the auto-tests.
+   */
+  SFU_TEST_Init();
+#endif /* SFU_TEST_PROTECTION */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+  /* When the local loader feature is supported we need to check if a local download is requested */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+#ifdef KMS_ENABLED
+  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* When the local loader feature is disabled go directly to the check of the FW status */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+/**
+  * @brief  Check if a new UserApp firmware is available for downloading.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckNewFwToDownload(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_DWL_REQ)
+  {
+    TRACE("\r\n= [SBOOT] STATE: execution standalone loader");
+    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+    /* This is unreachable code (dead code) in principle...
+    At this point we should not be able to reach the following instructions.
+    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
+    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
+    if (0U != BUTTON_PUSHED())
+    {
+      /* Download requested */
+      e_ret_status = SFU_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /*
+     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
+     * download to start
+     */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+#ifdef KMS_ENABLED
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
+
+#ifdef KMS_ENABLED
+/**
+  * @brief  Check if a KMSBlob is waiting for installation.
+  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
+  *         disabled.
+  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
+  *         enabled.
+  *         In this latter case,
+  *               if a new Firmware download is requested,
+  *               it has priority over the KMS blob installation,
+  *               and the KMS blob installation request will be lost.
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
+
+  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
+  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
+
+  /* Check if a Blob Installation is requested or on-going */
+  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
+
+  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
+  {
+    /* Blob installation requested */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+/**
+  * @brief  Check if a KMSBlob is waiting for install.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallKMSBlob(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  uint8_t         *pBlobHdr;
+  uint8_t         *pBlobInFlash;
+  CK_RV           e_status;
+
+  /* At boot-up, Managing ImportBlob through KMS services.  */
+  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
+
+  /* Here we will Launch SE service to take consume the Blob */
+  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
+  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
+  }
+  else
+  {
+    /* Initialize KMS in order to be able to import blob using internal algorithms */
+    e_status = C_Initialize(NULL);
+    if (e_status == CKR_OK)
+    {
+      /* we do not take the return value into account as we will not retry the import in case of issue */
+      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
+
+      if (e_status != CKR_OK)
+      {
+        (void)C_Finalize(NULL);
+      }
+      else
+      {
+        e_status = C_Finalize(NULL);
+      }
+    }
+
+    if (e_status != CKR_OK)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
+    }
+
+    /* In any case, we remove the Blob To Install (regardless of the result) */
+    e_ret_status = SFU_KMS_EraseBlob();
+
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
+    }
+
+    /* Display the KMS import result */
+    switch (e_status)
+    {
+      case CKR_OK:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
+        e_ret_status = SFU_SUCCESS;
+        break;
+
+      case CKR_SIGNATURE_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DATA_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DEVICE_ERROR:
+        /* At boot-up, NVM Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_OPERATION_ACTIVE:
+        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      default:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
+        e_ret_status = SFU_ERROR;
+        break;
+    }
+  }
+
+  /* Set the next State Machine regardless of the KMS import result */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+#endif /* KMS_ENABLED */
+
+
+/**
+  * @brief  Check the Status of the Fw Image to work on  in order to set the next
+  *         State Machine state accordingly
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckUserFwStatus(void)
+{
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  uint32_t i;
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_INSTALL_REQ)
+  {
+    /* Whatever the status the decryption can be done only once ==> no interruption allowed */
+    STANDALONE_LOADER_STATE = STANDALONE_LOADER_NO_REQ;
+
+    TRACE("\r\n\t  New Fw Encrypted, to be decrypted");
+
+    /* Check if there is a pending action related to a FW update procedure */
+    if (SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall) == SFU_IMG_FWIMAGE_TO_INSTALL)
+    {
+      /* Check the candidate version vs current active version */
+      e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+
+      if (SFU_SUCCESS != e_ret_status)
+      {
+        /* Erase downloaded FW in case of authentication/integrity error */
+        (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
+      }
+      else
+      {
+        /* Secure coding : double check the candidate version vs current active version */
+        e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+      }
+
+      if (SFU_SUCCESS == e_ret_status)
+      {
+        /* Start installation */
+        e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
+      }
+    }
+
+    /* Critical failure management if installation failed */
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+      return;
+    }
+  }
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+  /*
+   * No FW image installation pending :
+   *   1- Check if firmwares are detected for C1 and C2 (MASTER_SLOT)
+   *   2- No active firmware candidate for execution ==> Local download
+   *
+   * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
+   */
+  m_C1ActiveSlot = 0U;
+  m_C2ActiveSlot = 0U;
+  m_ActiveSlotToExecute = 0U;
+
+  /* Check if firmwares are detected for C1 and C2 (MASTER_SLOT) */
+  if (MASTER_SLOT == 0xFFU)
+  {
+    TRACE("\r\n\t  No master slot has been defined for C2");
+  }
+  else
+  {
+    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+    {
+      if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
+      {
+        if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+        {
+          if ((SLOT_ACTIVE_1 + i) == MASTER_SLOT)
+          {
+            m_C2ActiveSlot = MASTER_SLOT;
+            TRACE("\r\n\t  A C2 FW is detected in the slot SLOT_ACTIVE_%d", m_C2ActiveSlot);
+          }
+          else
+          {
+            m_C1ActiveSlot = SLOT_ACTIVE_1 + i;
+            TRACE("\r\n\t  A C1 FW is detected in the slot SLOT_ACTIVE_%d", m_C1ActiveSlot);
+          }
+        }
+      }
+    }
+  }
+
+  /* 2- No active firmware candidates for execution ==> Local download */
+  if ((m_C1ActiveSlot != 0U) && (m_C2ActiveSlot != 0U))
+  {
+    m_ActiveSlotToExecute = m_C2ActiveSlot;
+    SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+  }
+  else
+  {
+    /* Control if all active slot are empty */
+    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+    {
+      if ((m_C1ActiveSlot != (SLOT_ACTIVE_1 + i)) && (m_C2ActiveSlot != (SLOT_ACTIVE_1 + i)))
+      {
+        if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
+        {
+          if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+          {
+            /*
+             * We should never reach this code.
+             * Could come from an attack ==> as an example we invalidate current firmware.
+             */
+            TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+            (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+          }
+        }
+      }
+    }
+
+    /*
+     * No valid FW is present in the active slot
+     * and there is no FW to be installed in UserApp download area: local download (when possible)
+     */
+    if (initialDeviceStatusCheck == 1U)
+    {
+      TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+      /* Waiting for a local download is automatic, no trigger required. */
+      TRACE("\r\n\t  Waiting for the local download to start... ");
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+      initialDeviceStatusCheck = 0U;
+#ifdef SFU_TEST_PROTECTION
+      SFU_TEST_Reset();
+#endif /* SFU_TEST_PROTECTION */
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      /*
+       * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
+       *   If a FW is present in the active slot => it is checked then launched.
+       *   If there is a FW to install => the installation procedure starts.
+       *   If no FW is present and no installation is pending:
+       *      - if the local loader feature is enabled we enter the local download state
+       *      - if the local loader feature is disabled, the execution is stopped.
+       */
+      TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS is not supposed to be entered more than once per boot.");
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+    SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+    /*
+     * When the local loader feature is disabled it is not possible to enter the "check new fw download" state.
+     * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
+     * So we end up waiting for the user to reboot (or the IWDG to expire).
+     */
+    TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
+    while (1 == 1)
+    {
+      (void) BSP_LED_Toggle(SFU_STATUS_LED);
+      HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+    }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  }
+}
+
+
+#if SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   Reset is generated at by standalone loader when FW is downloaded.
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /* Jump into standalone loader */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+  e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /*
+   * Download area will be chosen as following. After header analysis :
+   *   - same DWL slot number as SFU magic number, if the slot is configured.
+   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
+   *   - by default : SLOT_DWL_1
+   */
+  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
+          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
+          fw_image_header_validated.PartialFwOffset, u_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * In 1_Image example : dwl_slot == active_slot
+     */
+    if (SFU_IMG_Validation(dwl_slot, &fw_image_header_validated) != SFU_SUCCESS)
+    {
+      /* CleanUp downloaded image (header preserved, for anti-rollback) */
+      (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
+
+      /* no specific error cause set */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    /* CleanUp downloaded image (header preserved, for anti-rollback) */
+    (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
+
+    /* Memorize the specific error cause if any before handling this critical failure */
+    switch (e_ret_status_app)
+    {
+      case SFU_LOADER_ERR_COM:
+        SFU_EXCPT_SetError(SFU_EXCPT_COM_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_VERSION:
+        SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_LENGTH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FW_TOO_BIG);
+        break;
+      case SFU_LOADER_ERR_AUTH_FAILED:
+        SFU_EXCPT_SetError(SFU_EXCPT_HEADER_AUTH_ERR);
+        break;
+      case SFU_LOADER_ERR_FLASH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FLASH_ERR);
+        break;
+      case SFU_LOADER_ERR_CRYPTO:
+        SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+        break;
+      default:
+        /* no specific error cause */
+        break;
+    }
+  } /* else error with no specific error cause */
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+
+/**
+  * @brief  Verify the UserApp Fw signature before executing it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_VerifyUserFwSignature(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t u_configured_slot_nb = 0U;
+  uint32_t u_verified_slot_nb = 0U;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
+
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /*
+   * With the 2 images handling:
+   *       1. the header signature is verified  when installing a new firmware
+   *       2. the firmware signature is checked when installing a new firmware
+   *       3. remaining part of active slot is kept "clean" during installation procedure
+   * So following checks should never fail.
+   */
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      u_configured_slot_nb ++;
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
+        if (SFU_SUCCESS == e_ret_status)
+        {
+          /* Check the FW signature */
+          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
+          if (SFU_SUCCESS == e_ret_status)
+          {
+            /* Verify that there is no additional code beyond firmware image */
+            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
+            if (SFU_SUCCESS != e_ret_status)
+            {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+            }
+            else
+            {
+              u_verified_slot_nb ++;
+            }
+          }
+          else
+          {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          }
+        }
+        else
+        {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        }
+        /*
+         * One of the checks fails :
+         *  - Header signature
+         *  - FW signature
+         *  - No malicious code
+         *  ==> Active slot should be invalidated
+         */
+        if (SFU_SUCCESS != e_ret_status)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+        else
+        {
+          /* Verify if authentication and integrity controls performed */
+          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+        }
+      }
+      else
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+  }
+
+  /* Check that C1 and C2 firmwares are present */
+  if ( u_configured_slot_nb != u_verified_slot_nb )
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ExecuteUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+
+  /* Double security check for all active slots :
+     - Control twice the Header signature will avoid basic hardware attack
+     - Control twice the FW signature will avoid basic hardware attack */
+
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+        /* Check the FW signature */
+        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+        /* Move the state to SELFTEST for the new images */
+        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Image state cannot be changed : What to do ?
+             ==> decision to continue execution */
+          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
+        }
+#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
+
+        /* Verify if authentication and integrity controls performed */
+        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+      }
+    }
+  }
+
+  /*
+   * You may decide to implement additional checks before running the Firmware.
+   * For the time being we launch the FW present in the active slot.
+   *
+   * The bootloader must also take care of the security aspects:
+   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
+   *   B.lock the SE services the UserApp is not allowed to call
+   *   C.leave secure boot mode
+   */
+
+  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
+  e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+    SFU_EXCPT_SetError(SFU_EXCPT_FLASH_CFG_ERR);
+
+    /* This is the last operation executed. Force a System Reset */
+    SFU_BOOT_ForceReboot();
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Double instruction to avoid basic fault injection */
+      if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+      {
+        /* De-initialize the SB_SFU bootloader before launching the UserApp */
+        (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
+
+        /* Last flow control : lock service */
+        FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
+
+        /* This function should not return */
+        e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
+
+        /* This point should not be reached */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        /* We do not memorize any specific error, the FSM state is already providing the info */
+        TRACE("\r\n\t  SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        while (1 == 1)
+        {
+          ;    /* wait for watchdog */
+        }
+      }
+      else
+      {
+        /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+        SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+        /* This is the last operation executed. Force a System Reset */
+        SFU_BOOT_ForceReboot();
+      }
+    }
+    else
+    {
+      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+      SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+      /* This is the last operation executed. Force a System Reset */
+      SFU_BOOT_ForceReboot();
+    }
+  }
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
+  * @param  None
+  * @note   After a Critical Failure a Reboot will be called.
+  * @retval None
+  */
+static void SFU_BOOT_SM_HandleCriticalFailure(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+     The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
+}
+
+/**
+  * @brief  The state machine is aborted and a Reset is triggered
+  * @param  None
+  * @note   You are in this condition because it's not possible to continue without
+            compromising the stability or the security of the solution.
+  * @retval None
+  */
+static void SFU_BOOT_SM_RebootStateMachine(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
+
+  /*
+   * In case some clean-up must be done before resetting.
+   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
+   */
+  (void)SFU_BOOT_DeInit();
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Jump into standalone loader
+  * @param  None
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
+{
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+
+  /* Lock part of Secure Engine services */
+  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+  {
+    /* Double instruction to avoid basic fault injection */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* this function does not return */
+      SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, LOADER_REGION_ROM_START);
+
+      /* The point below should NOT be reached */
+      return SFU_SUCCESS;
+    }
+    else
+    {
+      return SFU_ERROR;
+    }
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply Static protections involving Option Bytes */
+  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  System security configuration
+  * @param  None
+  * @note   Check and apply the security protections. This has to be done as soon
+  *         as possible after a reset
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  /* WARNING: The following CheckApplySecurityProtection function must be called
+     as soon as possible after a Reset in order to be sure the system is secured
+     before starting any other operation. The drawback is that the ErrorManagement
+     is not initialized yet, so in case of failure of this function, there will not be
+     any error stored into the BootInfo or other visible effects.  */
+
+  /* Very few things are already initialized at this stage. Need additional initialization
+     to show a message that is added as below only in Debug/Test mode */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  (void) SFU_COM_Init();
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
+  {
+    /* WARNING: This might be generated by an attempted attack or a bug of your code!
+       Add your code here in order to implement a custom action for this event,
+       e.g. trigger a mass erase or take any other action in order to
+       protect your system, or simply discard it if this is expected.
+       ...
+       ...
+    */
+    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
+  }
+  else
+  {
+    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
+  *         a malicious code removing some of the applied security/integrity features.
+  *         The IWDG is also refreshed in this function.
+  * @param  None
+  * @note   This function must be called with a frequency greater than 0.25Hz!
+  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
+  *         So the User App should continue to refresh the IWDG counter.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Refresh the IWDG */
+  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
+
+
+  /* Add your code here for customization:
+     e.g. for additional security or safety periodic check.
+     ...
+     ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_ManageResetSources(void)
+{
+  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
+
+  /* Check the wakeup sources */
+  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
+  switch (e_wakeup_source_id)
+  {
+    /*
+     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
+     * RCC_CSR flags can be used to do so.
+     */
+
+    case SFU_RESET_WDG_RESET:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_LOW_POWER:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_HW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_BOR_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_SW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_OB_LOADER:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    default:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+  }
+
+  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
+  SFU_LL_SECU_ClearResetSources();
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
+}
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC Fault.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_GTZC_TZIC(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_GTZC_TZIC_FAULT);
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
new file mode 100644
index 00000000..03ad46cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
@@ -0,0 +1,232 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module, part of the SFU-En project (SB/SFU).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Init Error Type Definition
+  */
+typedef enum
+{
+  SFU_BOOT_SECENG_INIT_FAIL,   /*!< failure at secure engine initialization stage */
+  SFU_BOOT_SECIPS_CFG_FAIL,    /*!< failure when configuring the security IPs  */
+  SFU_BOOT_INIT_FAIL,          /*!< failure when initializing the secure boot service  */
+  SFU_BOOT_INIT_ERROR          /*!< Service cannot start: unspecified error */
+} SFU_BOOT_InitErrorTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Steps definition
+  */
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+#define FLOW_STEP_AUTHENTICATE 0x00007999U       /*!< Step AUTHENTICATE value */
+#define FLOW_STEP_INTEGRITY 0x0000aab5U          /*!< Step INTEGRITY value */
+#define FLOW_STEP_LOCK_SERVICE 0x0000b4abU       /*!< Step LOCK SERVICE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0000cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_PCROP_PROTECT_ENABLE
+#define FLOW_STEP_PCROP 0x0000d2d3U              /*!< Step PCROP value */
+#else
+#define FLOW_STEP_PCROP 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef  SFU_SUBGHZSPI_PROTECT_ENABLE
+#define FLOW_STEP_SUBGHZSPI 0x0003befU           /*!< Step SUBGHZSPI value */
+#else
+#define FLOW_STEP_SUBGHZSPI 0x00000000U          /*!< No effect on control flow */
+#endif /* SFU_SUBGHZSPI_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+#define FLOW_STEP_C2_DDS 0x000096bdU             /*!< Step DDS value */
+#else
+#define FLOW_STEP_C2_DDS 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+#define FLOW_STEP_C2SWDBG 0x00024e87U            /*!< Step C2SWDBG value */
+#else
+#define FLOW_STEP_C2SWDBG 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef  SFU_GTZC_PROTECT_ENABLE
+#define FLOW_STEP_GTZC 0x0000dbaeU               /*!< Step GTZC value */
+#else
+#define FLOW_STEP_GTZC 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_UBE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_PCROP (FLOW_CTRL_WRP ^ FLOW_STEP_PCROP)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_PCROP ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_SUBGHZSPI (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_SUBGHZSPI)
+#define FLOW_CTRL_C2_DDS (FLOW_CTRL_SUBGHZSPI ^ FLOW_STEP_C2_DDS)
+#define FLOW_CTRL_RDP (FLOW_CTRL_C2_DDS ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_DMA (FLOW_CTRL_MPU ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_C2SWDBG (FLOW_CTRL_TAMPER ^ FLOW_STEP_C2SWDBG)
+#define FLOW_CTRL_GTZC (FLOW_CTRL_C2SWDBG ^ FLOW_STEP_GTZC)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_GTZC
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values crypto operations
+  */
+#define FLOW_CTRL_AUTHENTICATE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_AUTHENTICATE)
+#define FLOW_CTRL_INTEGRITY (FLOW_CTRL_AUTHENTICATE ^ FLOW_STEP_INTEGRITY)
+#define FLOW_CTRL_LOCK_SERVICE (FLOW_CTRL_INTEGRITY ^ FLOW_STEP_LOCK_SERVICE)
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+
+/* Exported macros -----------------------------------------------------------*/
+/** Control with STEP operation :
+  * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+/** STEP update only :
+  * (uFlowValue XOR STEP_VALUE)
+  */
+#define FLOW_STEP(B,A) \
+  do{ \
+    (B) ^= (A);\
+  }while(0)
+
+
+/* Exported functions ------------------------------------------------------- */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService(void);
+void SFU_BOOT_ForceReboot(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c
new file mode 100644
index 00000000..f7599f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c
@@ -0,0 +1,544 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
+#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
+
+/* Private macros ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
+#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
+#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+/**
+  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
+  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
+  * @param  puSize: size of received file.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
+{
+  uint32_t i;
+  uint32_t packet_length = 0U;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t filesize = 0U;
+  uint32_t packets_received;
+  uint8_t *file_ptr;
+  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
+                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(8)));
+
+  /* Check the pointers allocation */
+  if ((peCOMStatus == NULL) || (puSize == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  *peCOMStatus = SFU_COM_YMODEM_OK;
+
+  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *peCOMStatus = SFU_COM_YMODEM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *puSize = filesize;
+              file_done = 1U;
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
+              {
+                /* No NACK sent for a better synchro with remote : packet will be repeated */
+              }
+              else
+              {
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name skipped */
+                    i = 0U;
+                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
+                    {
+                      i++;
+                      file_ptr++;
+                    }
+                    /* end of file name ('\0') skipped */
+                    file_ptr++;
+
+                    /* File size extraction */
+                    i = 0U;
+                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
+                    {
+                      file_size[i] = *file_ptr;
+                      i++;
+                      file_ptr++;
+                    }
+                    file_size[i] = (uint8_t) '\0';
+                    (void) Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call*/
+                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
+                    {
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                      (void) SFU_LL_UART_Flush();
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
+                    }
+                    else
+                    {
+                      /* End session */
+                      tmp = SFU_COM_YMODEM_CA;
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      return SFU_ERROR;
+                    }
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                    file_done = 1U;
+                    session_done = 1U;
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  /* Data packet received callback call*/
+                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX],
+                                                           packet_length) == SFU_SUCCESS)
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* End session */
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    *peCOMStatus = SFU_COM_YMODEM_DATA;
+                  }
+
+                }
+                packets_received ++;
+                session_begin = 1;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          break;
+        default:
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
+          {
+            /* Abort communication */
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          }
+          else
+          {
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            /* Minicom does not accept this extra character */
+            TRACE("\b.");                                 /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+            /*
+             * Toggling the LED in case no console is available: the toggling frequency depends on
+             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
+             */
+            (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          }
+          break;
+      }
+    }
+  }
+  /* Make sure the status LED is turned off */
+  (void) BSP_LED_Off(SFU_STATUS_LED);
+
+  if (*peCOMStatus == SFU_COM_YMODEM_OK)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+/**
+  * @brief  Transmit a byte to the COM Port.
+  * @param  uParam: The byte to be sent.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
+{
+  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
+}
+
+/**
+  * @brief  Convert a string to an integer.
+  * @param  pInputStr: The string to be converted.
+  * @param  pIntNum: The integer value.
+  * @retval 1: Correct
+  *         0: Error
+  */
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+  uint8_t  digit;
+
+  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        digit = CONVERTHEX(pInputStr[i]);
+        val = (val << 4U) + digit;
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == (uint8_t)'\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == (uint8_t)'\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        digit =  CONVERTDEC(pInputStr[i]);
+        val = (val * 10U) + digit;
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData: pointer to received data.
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeOut: receive timeout (ms).
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  SFU_ErrorStatus eRetStatus;
+
+  uint8_t char1;
+
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0; /* index indicating where to write in pData */
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
+
+  if (eRetStatus == SFU_SUCCESS)
+  {
+    status = HAL_OK;
+
+    switch (char1)
+    {
+      case SFU_COM_YMODEM_SOH:
+        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
+        break;
+      case SFU_COM_YMODEM_STX:
+        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+        break;
+      case SFU_COM_YMODEM_EOT:
+        break;
+      case SFU_COM_YMODEM_CA:
+        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
+        {
+          packet_size = 2U;
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      case SFU_COM_YMODEM_ABORT1:
+      case SFU_COM_YMODEM_ABORT2:
+        status = HAL_BUSY;
+        break;
+      case SFU_COM_YMODEM_RB:
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
+    {
+
+#ifndef MINICOM_YMODEM
+      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX],
+                                       (uint16_t)(packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
+#else
+      eRetStatus = SFU_SUCCESS;
+      /* Receive byte per byte until no data left or no space left in buffer */
+      while ((SFU_SUCCESS == eRetStatus) &&
+             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
+              SFU_COM_YMODEM_PACKET_DATA_INDEX +
+              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
+            )
+      {
+        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
+                                         1U, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        /* We received some bytes */
+        eRetStatus = SFU_SUCCESS;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (eRetStatus == SFU_SUCCESS)
+      {
+        status = HAL_OK;
+
+        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
+                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
+        {
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC*/
+          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
+          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
+
+          /*Configure CRC with 16-bit polynomial*/
+          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
+          {
+            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
+            {
+              packet_size = 0U;
+              status = HAL_ERROR;
+            }
+
+          }
+          else
+          {
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        status = HAL_ERROR;
+      }
+    }
+  }
+  else
+  {
+    status = HAL_ERROR;
+  }
+
+  *puLength = packet_size;
+  return status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(uFileSize);
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(pData);
+  UNUSED(uSize);
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h
new file mode 100644
index 00000000..755199fd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h
@@ -0,0 +1,121 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_LOADER_H
+#define SFU_COM_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include <stdint.h>
+#include <stdio.h>
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_COM_LOADER_YMODEM Status structure definition
+  */
+typedef enum
+{
+  SFU_COM_YMODEM_OK       = 0x00U,  /*!< OK */
+  SFU_COM_YMODEM_ERROR    = 0x01U,  /*!< Error */
+  SFU_COM_YMODEM_ABORT    = 0x02U,  /*!< Abort */
+  SFU_COM_YMODEM_TIMEOUT  = 0x03U,  /*!< Timeout */
+  SFU_COM_YMODEM_DATA     = 0x04U,  /*!< Data */
+  SFU_COM_YMODEM_LIMIT    = 0x05U   /*!< Limit*/
+} SFU_COM_YMODEM_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)3U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)4U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)1U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)2U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)3U)    /*!<Cnumber Index*/
+#else
+/* Minicom YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)6U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)7U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)4U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)5U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)6U)    /*!<Cnumber Index*/
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_PACKET_TRAILER_SIZE     ((uint32_t)2U)    /*!<Trailer Size*/
+#define SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE    (SFU_COM_YMODEM_PACKET_HEADER_SIZE + SFU_COM_YMODEM_PACKET_TRAILER_SIZE \
+                                                - 1U)           /*!<Overhead Size*/
+#define SFU_COM_YMODEM_PACKET_SIZE             ((uint32_t)128U)  /*!<Packet Size*/
+#define SFU_COM_YMODEM_PACKET_1K_SIZE          ((uint32_t)1024U) /*!<Packet 1K Size*/
+
+#define SFU_COM_YMODEM_FILE_NAME_LENGTH        ((uint32_t)64U)   /*!< File name length*/
+#define SFU_COM_YMODEM_FILE_SIZE_LENGTH        ((uint32_t)16U)   /*!< File size length*/
+
+#define SFU_COM_YMODEM_SOH                     ((uint8_t)0x01U)  /*!< Start of 128-byte data packet */
+#define SFU_COM_YMODEM_STX                     ((uint8_t)0x02U)  /*!< Start of 1024-byte data packet */
+#define SFU_COM_YMODEM_EOT                     ((uint8_t)0x04U)  /*!< End of transmission */
+#define SFU_COM_YMODEM_ACK                     ((uint8_t)0x06U)  /*!< Acknowledge */
+#define SFU_COM_YMODEM_NAK                     ((uint8_t)0x15U)  /*!< Negative acknowledge */
+#define SFU_COM_YMODEM_CA                      ((uint8_t)0x18U)  /*!< Two of these in succession aborts transfer */
+#define SFU_COM_YMODEM_CRC16                   ((uint8_t)0x43U)  /*!< 'C' == 0x43, request 16-bit CRC */
+#define SFU_COM_YMODEM_RB                      ((uint8_t)0x72U)  /*!< Startup sequence */
+#define SFU_COM_YMODEM_NEGATIVE_BYTE           ((uint8_t)0xFFU)  /*!< Negative Byte*/
+
+#define SFU_COM_YMODEM_ABORT1                  ((uint8_t)0x41U)  /*!< 'A' == 0x41, abort by user */
+#define SFU_COM_YMODEM_ABORT2                  ((uint8_t)0x61U)  /*!< 'a' == 0x61, abort by user */
+
+#define SFU_COM_YMODEM_NAK_TIMEOUT             ((uint32_t)0x100000U)  /*!< NAK Timeout*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)3000U) /*!< Retry delay, has to be smaller than IWDG */
+#else
+/* Minicom YMODEM : reduce the download timeout to speed-up the download operation */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)1000U) /*!< Retry delay, has to be smaller than IWDG */
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_MAX_ERRORS              ((uint32_t)3U)    /*!< Maximum number of retry*/
+
+/* Exported functions ------------------------------------------------------- */
+/*
+ * If the debug mode is not enabled then the local loader must also provide the COM init functions
+ */
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+SFU_ErrorStatus SFU_COM_Transmit(uint8_t *pData, uint16_t uDataLength, uint32_t uTimeOut);
+SFU_ErrorStatus SFU_COM_Receive(uint8_t *pData, uint16_t uDataLength);
+SFU_ErrorStatus SFU_COM_Flush(void);
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize);
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam);
+
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize);
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c
new file mode 100644
index 00000000..38dbfe17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_com_trace.h"
+
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_TRACE_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutString Timeout*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+/**
+  * @}
+  */
+
+/** @defgroup SFU_COM_TRACE_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Print a string on the COM Port.
+  * @param  pString: The string to be printed
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString)
+{
+  uint16_t length = 0U;
+
+  /* Check the pointers allocation */
+  if (pString == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  while (pString[length] != (uint8_t)'\0')
+  {
+    length++;
+  }
+
+  return SFU_LL_UART_Transmit(pString, length, SFU_COM_TRACE_SERIAL_TIME_OUT);
+
+}
+
+/**
+  * @brief  Retargets the C library printf function to SFU UART.
+  * @param  None
+  * @retval ch
+  */
+PUTCHAR_PROTOTYPE
+{
+  /* Place your implementation of fputc here */
+  /* e.g. write a character to the USART1 and Loop until the end of transmission */
+  (void) SFU_LL_UART_Transmit((uint8_t *)&ch, 1U, 0xFFFFU);
+
+  return ch;
+}
+
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h
new file mode 100644
index 00000000..d5981e4d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities  for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_TRACE_H
+#define SFU_COM_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include <stdio.h>
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
new file mode 100644
index 00000000..f68bdf63
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
@@ -0,0 +1,254 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.c
+  * @author  MCD Application Team
+  * @brief   SFU ERROR
+  *          This file provides set of firmware functions for SB_SFU errors handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "sfu_low_level_security.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_boot.h"
+#include "sfu_test.h"
+#include "sfu_mpu_isolation.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+/**
+  *  The following strings associated to the exceptions/errors are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
+  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
+  */
+static char *m_aErrorStrings[] ={  "No error. Success",
+                                   "Memory fault",
+                                   "Hard fault",
+                                   "Tampering fault",
+#ifdef SFU_GTZC_PROTECT_ENABLE
+                                   "GTZC TZIC fault",
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+                                   "SE lock cannot be set",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Fw too big",
+                                   "File not correctly received",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Fw header authentication error",
+                                   "Fw decryption error",
+                                   "Fw signature check error",
+                                   "Flash error",
+                                   "External flash configuration error.",
+                                   "Header erasing error",
+                                   "Header validation error",
+                                   "Additional code detected beyond FW",
+                                   "Fw version rejected (anti-rollback)",
+                                   "Unknown error"
+                                };
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Print relevant errpr message.
+  * @param  Error Error code.
+  * @retval None
+  */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  if (eExceptionId <= SFU_EXCPT_UNKNOWN)
+  {
+#ifdef SFU_DEBUG_MODE
+    TRACE("\r\n\t%s",m_aErrorStrings[(uint32_t) eExceptionId]);
+#endif /* SFU_DEBUG_MODE */
+  }
+}
+
+
+/**
+  * @brief  Manage the Exception generated by an IRQ
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   Because of the interruption of the State Machine execution,
+  *         it's not possible to continue without compromising the stability or
+  *         the security of the solution. A System Reset is forced at the end.
+  * @retval None
+  */
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+#ifdef SFU_DEBUG_MODE
+  uint8_t message[150];
+  uint32_t i = 0U;
+
+  /* Avoid warning with cast frombetween char* and uint8_t* */
+  while ((m_aErrorStrings[(uint32_t) eExceptionId][i] != 0u) && (i < 149U))
+  {
+    message[i] = m_aErrorStrings[(uint32_t) eExceptionId][i];
+    i++;
+  }
+  message[i] = 0U;
+
+  /* Print relevant error message */
+  TRACE_IRQ((uint8_t *)"\r\n\t  ");
+  TRACE_IRQ(message);
+#endif /* SFU_DEBUG_MODE */
+
+  /* Try to take an action */
+  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+  The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_BOOT_ForceReboot();
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+void SFU_EXCPT_Security_Error(void)
+{
+  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
+  HAL_Delay(1000);
+  /* While(1) by-passed by an fault injection attack ==> Reset */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  SFU Exception Initialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_Init(void)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU Exception DeInitialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status;
+  /* ADD SRC CODE HERE
+      ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   A System Reset is forced at the end by the caller of this function.
+  *         WARNING: Be aware that this function can be called by an IRQ while
+  *         using the printf, since the printf is not a reentrant function, and using
+  *         the printf inside this function as well, a fault will likely occur.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  switch (eExceptionId)
+  {
+    case SFU_EXCPT_TAMPERING_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  case SFU_EXCPT_GTZC_TZIC_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      /* WARNING: Please consider that at runt-time,  this "case" execution is
+      inside an ISR */
+      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TZIC FAULT!");
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+    case SFU_EXCPT_MEMORY_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_HARD_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+#ifdef SFU_TEST_PROTECTION
+      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
+         ==> this is not an error */
+#endif /* SFU_TEST_PROTECTION */
+      break;
+
+    default:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+  }
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
new file mode 100644
index 00000000..41d53daf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
@@ -0,0 +1,88 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.h
+  * @author  MCD Application Team
+  * @brief   This file contains the error handling elements for SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_ERROR_H
+#define SFU_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * This enum must start from 0.
+  * When adding a new error in the enum below please also:
+  *  1. update IS_SFU_EXCPT
+  *  2. update m_aErrorStrings
+  */
+typedef enum
+{
+  SFU_EXCPT_NONE = 0UL,
+  /* System errors */
+  SFU_EXCPT_MEMORY_FAULT,
+  SFU_EXCPT_HARD_FAULT,
+  SFU_EXCPT_TAMPERING_FAULT,
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  SFU_EXCPT_GTZC_TZIC_FAULT,
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+  /* Specific errors */
+  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
+  SFU_EXCPT_COM_ERR,               /* COM error during the local download of the binary */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  SFU_EXCPT_HEADER_AUTH_ERR,       /* header authentication failure */
+  SFU_EXCPT_DECRYPT_ERR,           /* Decrypt failure */
+  SFU_EXCPT_SIGNATURE_ERR,         /* Signature check failure */
+  SFU_EXCPT_FLASH_ERR,             /* Problem with FLASH */
+  SFU_EXCPT_FLASH_CFG_ERR,         /* Flash configuration issue (external flash) */
+  SFU_EXCPT_HEADER_ERASING_ERR,    /* Header erasing failure */
+  SFU_EXCPT_HEADER_VALIDATION_ERR, /* Header validation failure */
+  SFU_EXCPT_ADDITIONAL_CODE_ERR,   /* Additional code detected beyond the firmware image (malicious SW) */
+  SFU_EXCPT_VERSION_ERR,           /* Anti-rollback check rejected the version to be installed */
+  /* Unknown error */
+  SFU_EXCPT_UNKNOWN                /* To be kept as last error */
+} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
+
+/* External variables --------------------------------------------------------*/
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_Security_Error(void);
+
+SFU_ErrorStatus SFU_EXCPT_Init(void);
+SFU_ErrorStatus SFU_EXCPT_DeInit(void);
+
+void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_ERROR_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
new file mode 100644
index 00000000..a95da12f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
@@ -0,0 +1,103 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fsm_states.h
+  * @author  MCD Application Team
+  * @brief   This file defines the SB_SFU Finite State Machine states.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FSM_STATES_H
+#define SFU_FSM_STATES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * FSM states: this enum must start from 0.
+  */
+typedef enum
+{
+  SFU_STATE_CHECK_STATUS_ON_RESET = 0U, /*!< checks the reset cause and decide how to proceed     */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD,   /*!< SFU checks if a local download must be handled       */
+  SFU_STATE_DOWNLOAD_NEW_USER_FW,       /*!< downloads the encrypted firmware to be installed     */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+  SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL, /*!< SFU checks if a kms blob download must be handled    */
+  SFU_STATE_INSTALL_KMS_BLOB,          /* !< download the new kms_blob */
+#endif /* KMS_ENABLED */
+  SFU_STATE_VERIFY_USER_FW_STATUS,      /*!< checks the internal FLASH state to derive a status   */
+  SFU_STATE_VERIFY_USER_FW_SIGNATURE,   /*!< checks the validity of the active firmware           */
+  SFU_STATE_EXECUTE_USER_FW,            /*!< launch the user application                          */
+  SFU_STATE_HANDLE_CRITICAL_FAILURE,    /*!< deal with the critical failures                      */
+  SFU_STATE_REBOOT_STATE_MACHINE        /*!< a reboot is forced                                   */
+} SFU_BOOT_StateMachineTypeDef; /*!< SFU BOOT State Machine States */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  The following strings associated to the SM state are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the SFU_BOOT_StateMachineTypeDef defined above.
+  *           And the above enum must be a sequence starting from 0
+  */
+#ifdef SFU_DEBUG_MODE
+#if defined(SFU_VERBOSE_DEBUG_MODE) && defined (SFU_BOOT_C)
+char *m_aStateMachineStrings[] = { "Checking Status on Reset.",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Checking if new Fw Image available to download.",
+                                   "Downloading new Fw Image.",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Verifying Fw Image status.",
+                                   "Verifying Fw Image signature.",
+                                   "Executing Fw Image.",
+                                   "Handling a critical failure.",
+                                   "Rebooting the State Machine"
+                                 };
+#endif /* SFU_VERBOSE_DEBUG_MODE && SFU_BOOT_C */
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Exported macros -----------------------------------------------------------*/
+/************ SFU SM States****************************************************/
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_DOWNLOAD_NEW_USER_FW)     || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#else
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FSM_STATES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
new file mode 100644
index 00000000..cf3383c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
@@ -0,0 +1,1075 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_common.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the "common" functionalities of the image handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_COMMON_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+SFU_IMG_StatusTypeDef SFU_IMG_Status;
+uint32_t SFU_IMG_Line;
+
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_to_test;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/* Functions Definition : helper ---------------------------------------------*/
+/**
+  * @brief  Memory compare with constant time execution.
+  * @note   Objective is to avoid basic attacks based on time execution
+  * @param  pAdd1 Address of the first buffer to compare
+  * @param  pAdd2 Address of the second buffer to compare
+  * @param  Size Size of the comparison
+  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
+  */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
+{
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  for (i = 0U; i < Size; i++)
+  {
+    result |= pAdd1[i] ^ pAdd2[i];
+  }
+
+  if (result == 0x00U)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+
+/**
+  * @brief  Check header signature
+  * @param  pFwImageHeader: pointer to raw header.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef se_status;
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
+  {
+    /* Unused bytes should be set at 0x00 value
+       Comparison with constant time execution */
+    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
+    {
+      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
+    }
+
+    if (result == 0x00U)
+    {
+      /* Check signature of the FW header */
+      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
+      {
+        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
+  *        It handles Firmware TAG verification of a complete buffer by calling
+  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
+  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
+  *        and at the end compare the obtained TAG with the one provided as input
+  *        in pSE_GMCInit parameter.
+  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
+  * @param pSE_Status: Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param SlotNumber index of the slot in the list
+  * @param pSE_Metadata: Firmware metadata.
+  * @param pSE_Payload: pointer to Payload Buffer descriptor.
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_ret_status = SE_ERROR;
+  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
+  /* Loop variables */
+  uint32_t i;
+  uint32_t j;
+  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
+  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
+  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
+  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
+  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
+  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(8)));
+  /* FW chunk produced by the verification procedure if any   */
+  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* FW chunk provided as input to the verification procedure */
+  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* Variables to handle the FW image (this will be split in chunks) */
+  uint32_t payloadsize;
+  uint32_t ppayload;
+  uint32_t scatter_nb;
+  /* Variables to handle FW image size and tag */
+  uint32_t fw_size;
+  uint8_t *fw_tag;
+
+  /* Check the pointers allocation */
+  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
+  {
+    return SFU_ERROR;
+  }
+  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check the parameters value and set fw_size and fw_tag to check */
+  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
+  {
+    fw_size = pSE_Metadata->FwSize;
+    fw_tag = pSE_Metadata->FwTag;
+  }
+  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
+  {
+    fw_size = pSE_Metadata->PartialFwSize;
+    fw_tag = pSE_Metadata->PartialFwTag;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+
+  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
+  {
+    return SFU_ERROR;
+  }
+
+  /*  fix number of scatter block */
+  if (pSE_Payload->PayloadSize[1] != 0U)
+  {
+    scatter_nb = 2U;
+  }
+  else
+  {
+    scatter_nb = 1U;
+  }
+
+
+  /* Encryption process*/
+  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
+
+  /* check for initialization errors */
+  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    for (j = 0; j < scatter_nb; j++)
+    {
+      payloadsize = pSE_Payload->PayloadSize[j];
+      ppayload = pSE_Payload->pPayload[j];
+      i = 0;
+      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
+
+      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
+             (sfu_ret_status == SFU_SUCCESS))
+      {
+
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        ppayload += fw_chunk_size;
+        fw_verified_total_size += fw_chunk_size;
+        i++;
+      }
+      /* this the last path , size can be smaller */
+      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
+      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+      {
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
+                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)),
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        fw_verified_total_size += fw_chunk_size;
+      }
+    }
+  }
+
+  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    if (fw_verified_total_size <= fw_size)
+    {
+      /* Do the Finalization, check the authentication TAG*/
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
+
+      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
+        {
+          *pSeStatus = SE_SIGNATURE_ERR;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+
+          /* Save result for active slot :
+             to avoid single fault attack the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
+          }
+        }
+        else
+        {
+          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+
+          /* Save result for active slot :
+             to avoid single fault attacje the signature will be doble checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag_output, SE_TAG_LEN);
+          }
+        }
+      }
+      else
+      {
+        sfu_ret_status = SFU_ERROR;
+      }
+    }
+    else
+    {
+      sfu_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    sfu_ret_status = SFU_ERROR;
+  }
+  return sfu_ret_status;
+}
+
+/**
+  * @brief Fill authenticated info in SE_FwImage.
+  * @param SFU_APP_Status
+  * @param pBuffer
+  * @param BufferSize
+  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
+{
+  /* Check the pointers allocation */
+  if ((pFwHeader == NULL) || (pBuffer == NULL))
+  {
+    return SFU_ERROR;
+  }
+  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Verify Image Header in the slot given as a parameter
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
+  * @note   Not used in Alpha version -
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* use api read to detect possible ECC error */
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                   sizeof(SE_FwRawHeaderTypeDef));
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify signature */
+    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify Fw signature of binary contiguous in flash
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  SlotNumber flash slot to check
+  * @param  pFwImageHeader pointer to fw header
+  * @param  SlotNumber flash slot to check
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
+                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType)
+{
+  SE_Ex_PayloadDescTypeDef  pse_payload;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*  put it OK, to discriminate error in SFU FWIMG parts */
+  *pSeStatus = SE_OK;
+
+  /* Check the parameters value */
+  if (pFwImageHeader == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check SE_FwType parameter, and fix size and offset accordingly */
+  switch (SE_FwType)
+  {
+    case SE_FW_IMAGE_COMPLETE :
+      fw_size = pFwImageHeader->FwSize;
+      fw_offset = 0U;
+      break;
+    case SE_FW_IMAGE_PARTIAL :
+      fw_size = pFwImageHeader->PartialFwSize;
+      fw_offset = pFwImageHeader->PartialFwOffset;
+      break;
+    default :
+      /* error */
+      fw_size = 0U;
+      fw_offset = 0U;
+      break;
+  }
+
+  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
+  pse_payload.PayloadSize[0] = fw_size;
+  pse_payload.pPayload[1] = 0U;
+  pse_payload.PayloadSize[1] = 0U;
+
+  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
+}
+
+/**
+  * @brief Verifies the validity of a slot.
+  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
+  * @param pSlotBegin Start address of a slot.
+  * @param uSlotSize Size of a slot.
+  * @param uFwSize Size of the firmware image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
+{
+  uint8_t *pdata;
+  uint32_t length;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check is already clean */
+  pdata = pSlotBegin + SFU_IMG_IMAGE_OFFSET + uFwSize;
+  length = uSlotSize - SFU_IMG_IMAGE_OFFSET - uFwSize;
+  e_ret_status = SFU_LL_FLASH_Compare(pdata, 0x00000000U, 0xFFFFFFFFU, length);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function clean-up the flash
+  * @note   Not designed to clean-up area inside secure engine isolation.
+  * @note   To clean the slot without erasing the header we write "0x00" except if already written
+  * @param  pSlotBegin Start address of a slot.
+  * @param  uSlotSize Size of a slot.
+  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t pdata;
+  uint32_t slot_begin;
+  SFU_LL_FLASH_write_t pattern;
+  SFU_LL_FLASH_write_t value;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  /* Clean-up pattern initialization */
+  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
+
+  /* Cleaning operation */
+  slot_begin = (uint32_t) pSlotBegin;
+  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
+  {
+    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* If read succeed, then the pattern write is performed only if pattern is not already present */
+      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                          sizeof(SFU_LL_FLASH_write_t));
+      }
+    }
+    else
+    {
+      /* If read fail, then the write is performed unconditionally */
+      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                        sizeof(SFU_LL_FLASH_write_t));
+    }
+
+    /* Reload Watchdog every 4Kbytes */
+    if ((pdata % 0x1000U) == 0U)
+    {
+      (void) SFU_LL_SECU_IWDG_Refresh();
+    }
+  }
+  return e_ret_status;
+}
+
+/* Functions Definition : services ------------------------------------------- */
+
+/**
+  * @brief FW Image Handling (FWIMG) initialization function.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
+{
+  uint32_t i;
+  uint32_t mpu_size;
+  uint32_t mpu_max_size;
+  uint32_t mpu_sub_size;
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+
+  /*
+   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
+   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
+   * starting with 0s.
+   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
+   * side-effects).
+   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
+   */
+  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
+
+  /*
+   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
+      } /* else active slot is properly aligned */
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
+   */
+  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
+  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
+   */
+  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+
+  /*
+   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if(!((((SlotStartAdd[SLOT_ACTIVE_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+        || (((SlotEndAdd[SLOT_ACTIVE_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+  /*
+   * Sanity check: let's make sure headers are under the MPU protection
+   */
+  /* Calculate size of image header MPU region */
+  mpu_max_size = 2U;
+  for (i = 0U; i < SFU_PROTECT_MPU_HEADER_SIZE; i++)
+  {
+    mpu_max_size = mpu_max_size * 2U;
+  }
+  /* Take into account 8 sub-regions (assuming they are continuous) */
+  mpu_sub_size = mpu_max_size / 8U;
+  mpu_size = 0U;
+  for (i = 0U; i < 8U; i++)
+  {
+    if (((~SFU_PROTECT_MPU_HEADER_SREG) & (0x1U << i)) != 0U)
+    {
+      mpu_size = mpu_size + mpu_sub_size;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!((SlotHeaderAdd[SLOT_ACTIVE_1 + i] >= SFU_PROTECT_MPU_HEADER_START)
+            && ((SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SE_FW_HEADER_TOT_LEN) <=
+                (SFU_PROTECT_MPU_HEADER_START + mpu_size))))
+      {
+        TRACE("\r\n= [FWIMG] Header of SLOT_ACTIVE_%d is not under the MPU protection\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
+   */
+  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
+        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief This function makes sure the current active firmware will not be considered as valid any more.
+  *        This function alters the FLASH content.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
+  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image metadata.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  * @note This function populates the FWIMG module variable: fw_image_header_validated
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
+{
+  /*
+   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
+   */
+  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
+  *       fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (SFU_ERROR == e_ret_status)
+  {
+    /* We do not memorize any specific error, the FSM state is already providing the info */
+    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
+  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
+}
+
+/**
+  * @brief Verifies if no malicious code in active slot.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
+{
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
+}
+
+/**
+  * @brief  Control firmware signature
+  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
+                    SE_TAG_LEN) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  else
+  {
+    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+    return SFU_SUCCESS;
+  }
+
+}
+
+/**
+  * @brief Launches the user application.
+  *        The caller must be prepared to never get the hand back after calling this function.
+  *        If a problem occurs, it must be memorized in the bootinfo area.
+  *        If the caller gets the hand back then this situation must be handled as a critical error.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met
+  *       (typically: no security check performed before launching the firmware).
+  * @note This function only handles the "system" aspects.
+  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
+  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
+  *       function (as this needs to be done just before jumping into the user application).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Verify if authentication/integrity/lock SE service performed */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
+
+  /* this function does not return */
+  /* first image identified as master image */
+  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET);
+
+  /* The point below should NOT be reached */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Get the version of the active FW
+  * @note It is up to the caller to make sure the active slot contains a valid active FW.
+  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
+  *       fails.
+  * @param  SlotNumber index of the slot in the list
+  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
+  */
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
+{
+  SE_FwRawHeaderTypeDef fw_image_header;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint16_t version = 0;
+
+  /* check the header of the active FW */
+  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* retrieve the version from the header without any further check */
+    version = fw_image_header.FwVersion;
+  }
+
+  return (version);
+}
+
+/**
+  * @brief Detect if a FW is present in a slot.
+  * @note  Detection done based on MAGIC header + FW signature. Header verification
+  *        not done at this stage for timing optimization.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
+  SE_FwRawHeaderTypeDef *p_header;
+
+  /* Read header */
+  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
+  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
+  {
+    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
+    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
+    {
+      /*
+       * Control if the first 32 bytes (could be more but time consuming ...) are significants
+       * At this location we should find the vector table.
+       * Objective is to detect if the FW image has been erased
+       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
+       */
+      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Validate the active FW image in active slot by installing the header
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /* Header erasing */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  /* Header writing: encrypted part with signature */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
+                                      SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+  /* Header writing : Do not update image state part */
+
+  /* Header writing: previous FW image fingerprint */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
+                                                                    SE_FW_HEADER_FINGERPRINT_LEN),
+                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Get firmware image ID from header.
+  * @param  pFwImageHeader pointer to a structure to handle the header info
+  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
+  */
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  uint32_t active_slot;
+
+  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_1;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_2;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_3;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
+  else
+  {
+    active_slot = SLOT_INACTIVE;
+  }
+
+  return active_slot;
+}
+
+/**
+  * @brief  Check candidate image version is allowed.
+  * @param  ActiveSlot Slot identification used in case of secure counters usage
+  * @param  CurrentVersion Version of currently installed image if any
+  * @param  CandidateVersion Version of candidate image
+  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  UNUSED(ActiveSlot);
+
+  /* If the header of the active firmware is not valid, the CurrentVersion is 0 */
+  if (CurrentVersion == 0U)
+  {
+    /*
+     * If the header of the active firmware is not valide (could comes from an attak atempt, we authorize only the
+     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
+     */
+    if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * It is not allowed to install a Firmware with a lower version than the active firmware.
+     * But we authorize the re-installation of the current firmware version.
+     * We also check that the candidate version is at least the min. allowed version for this device.
+     */
+    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  }
+
+  return e_ret_status;
+}
+
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief Verifies the validity of the metadata associated to a candidate image.
+  *        The anti-rollback check is performed.
+  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure):
+  *       SFU_IMG_CheckPendingInstallation should be called first.
+  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
+  *       @ref SFU_APP_VerifyFwHeader.
+  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint32_t active_slot;
+  uint16_t cur_ver;
+  uint16_t verif_ver;
+
+  /*
+   * - Candidate FW Header Authentication
+   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
+   *       As a consequence: fw_image_header_to_test is already populated
+   *
+   * - Check version is allowed
+   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+   */
+
+  /* Header analysis to find slot based on number with magic tag */
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /* Get the version of active_slot */
+  cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+
+  if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
+  {
+    /* The installation is forbidden */
+    /* Memorize this error as this will be handled as a critical failure */
+    SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+
+    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /* leave now to handle the critical failure in the appropriate FSM state */
+    e_ret_status = SFU_ERROR;
+  }
+  else
+  {
+    /* the anti-rollback check succeeds: the version is fine */
+    /* double check to avoid basic hardware attack attack */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    e_ret_status = SFU_IMG_CheckFwVersion(active_slot, verif_ver, fw_image_header_to_test.FwVersion);
+  }
+
+  /* Return the result */
+  return (e_ret_status);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
new file mode 100644
index 00000000..469b89ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
@@ -0,0 +1,136 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_internal.h
+  * @author  MCD Application Team
+  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
+  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
+  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
+  *          fw_image_header_to_test to install an KMS blob.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_INTERNAL_H
+#define SFU_FWIMG_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_fwimg_regions.h"
+#include "kms_blob_metadata.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Payload Buffer descriptor.
+  * This structure describes how a Firmware is split in Flash.
+  * In the nominal case a Firmware is stored in 1 contiguous area.
+  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
+  * decrypt operation).
+  */
+typedef struct
+{
+  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
+  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
+} SE_Ex_PayloadDescTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief SFU_IMG Flash Status Type Definition
+  * Status of a FLASH operation.
+  */
+typedef enum
+{
+  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
+  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
+  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
+  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
+} SFU_IMG_StatusTypeDef;
+
+/**
+  * @brief RAM chunk used for decryption / comparison / swap
+  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
+  * some function allocates 2 buffer of this size in stack.
+  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
+  */
+#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
+
+#define SFU_IMG_CHUNK_SIZE  (512UL)
+#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief  Status Macro
+  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
+  * activated) and the execution continues.
+  */
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                   while(1==1){;} \
+                                 } while(0==1){;}
+#else
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                 } while(0==1){;}
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
+extern uint32_t SFU_IMG_Line;
+
+extern SE_FwRawHeaderTypeDef fw_image_header_validated;
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/* Exported functions : helper ---------------------------------------------- */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
+SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
+                          uint8_t  *pPayload, uint32_t SE_FwType);
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType);
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_INTERNAL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
new file mode 100644
index 00000000..08724f4a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
@@ -0,0 +1,97 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_services.h
+  * @author  MCD Application Team
+  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
+  *          API definitions.
+  *          These services can be called by the bootloader to deal with images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_SERVICES_H
+#define SFU_FWIMG_SERVICES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_IMG Initialization Status Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_IMG_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_IMG Image Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
+  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
+  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
+  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
+} SFU_IMG_ImgInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall);
+#else
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_SERVICES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
new file mode 100644
index 00000000..9083965c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
@@ -0,0 +1,747 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
+#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
+                               STM32 board specificities */
+#include "tkms.h"
+#include "sfu_interface_crypto_scheme.h"
+#include <string.h>
+#include "kms_platf_objects_interface.h"     /* To get keys handle definitions */
+
+/* Private defines -----------------------------------------------------------*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+#define GCM_TAGBITS_SIZE          128
+#define GCM_IVLEN_BITS            16
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+/* Private variables ---------------------------------------------------------*/
+CK_SESSION_HANDLE EncryptSession;
+CK_SESSION_HANDLE DecryptSession;
+CK_SESSION_HANDLE AuthenticateSession;
+CK_SESSION_HANDLE VerifySession;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static uint8_t *gcm_tag_header;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Get AES key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/**
+  * @brief  Get ECDSA key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
+
+
+/**
+  * @brief Secure Engine Decrypt Init function.
+  *        It is a wrapper of Decrypt_Init function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+  gcm_tag_header = pxSE_Metadata->FwTag;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_MECHANISM cktest_aes_cbc_mechanism =
+  {
+    CKM_AES_CBC,
+    iv_cbc,
+    SE_IV_LEN
+  };
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * In this crypto scheme the Firmware is not encrypted.
+   * The Decrypt operation is called anyhow before installing the firmware.
+   * Indeed, it allows moving the Firmware image blocks in FLASH.
+   * These moves are mandatory to create the appropriate mapping in FLASH
+   * allowing the swap procedure to run without using the swap area at each and every move.
+   *
+   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
+   */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the decryption session */
+  if (se_status == SE_SUCCESS)
+  {
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do as we won't decrypt anything */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Append function.
+  *        It is a wrapper of Decrypt_Append function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffe pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
+  if (0 == InputSize)
+  {
+    /* Nothing to do but we must return a success for the decrypt operation to continue */
+    return (SE_SUCCESS);
+  }
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  /* Buffer decryption */
+  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * The firmware is not encrypted.
+   * The only thing we need to do is to recopy the input buffer in the output buffer
+   */
+  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
+  *pOutputSize = InputSize;
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Finish function.
+  *        It is a wrapper of Decrypt_Finish function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  *peSE_Status = SE_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  memcpy(pOutputBuffer, gcm_tag_header, 16);
+
+  /* End-up decryption session */
+  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do */
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Close the session */
+  rv = C_CloseSession(DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Init function.
+  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  CK_MECHANISM cktest_sha_256_mechanism =
+  {
+    CKM_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize encryption session  */
+    rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest initialization */
+  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Append function.
+  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Buffer encryption */
+  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
+                       (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest calculation */
+  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Finish function.
+  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* End-up encryption session */
+  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* End-up Digest calculation */
+  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Close the session */
+  rv = C_CloseSession(AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Verify Raw Fw Header Tag.
+  *        It verifies the signature of a raw header file.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pFwRawHeader pointer to RawHeader Buffer.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  int32_t fw_raw_header_output_length = SE_TAG_LEN;
+  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
+  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    (CK_BYTE_PTR)gcm_header,
+    ((int32_t)SE_FW_AUTH_LEN),
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  const uint8_t *pPayload;                        /* Metadata payload */
+  int32_t payloadSize;                            /* Metadata length to be considered for hash */
+  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
+  CK_OBJECT_HANDLE hECDSAKey = 0UL;
+  CK_MECHANISM cktest_ecdsa_256_mechanism =
+  {
+    CKM_ECDSA_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointers allocation */
+  if (NULL == pxFwRawHeader)
+  {
+    *peSE_Status = SE_KO;
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  gcm_tag_header = pxFwRawHeader->HeaderSignature;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up decryption session  : control if the tag is correct */
+  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
+
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  pPayload = (const uint8_t *)pxFwRawHeader;
+  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up verification process : control if the signature is correct */
+  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Double Check to avoid basic fault injection */
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+
+    if (se_status == SE_SUCCESS)
+    {
+      /* End-up verification process : control if the signature is correct */
+      rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+      if (rv != CKR_OK)
+      {
+        se_status = SE_ERROR;
+        *peSE_Status = SE_KO;
+      }
+    }
+  }
+
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+  /* Close the session */
+  rv = C_CloseSession(VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
new file mode 100644
index 00000000..992941e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
@@ -0,0 +1,73 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported functions ------------------------------------------------------- */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                uint32_t SE_FwType);
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType);
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader);
+
+#define SE_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType ) \
+  SFU_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType )
+
+#define SE_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+
+#define SE_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType ) \
+  SFU_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType )
+
+#define SE_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+#define SE_VerifyHeaderSignature( peSE_Status, pxFwRawHeader ) \
+  SFU_VerifyHeaderSignature( peSE_Status, pxFwRawHeader )
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* SFU_KMS_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
new file mode 100644
index 00000000..d7bb34fa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
@@ -0,0 +1,187 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage the KMS Images.
+  *          This file contains the kms services the bootloader (sfu_boot) can
+  *             use to deal with the KMS Blob images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_KMS_C
+
+
+#ifdef KMS_ENABLED
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_kms.h"
+#include "sfu_fwimg_internal.h" /* required to re-use kmsblob_image_header_to_test (and SWAP_HDR) in the KMS blob 
+                                   installation procedure */
+#include "sfu_fwimg_regions.h"  /* required because KMS re-uses the SBSFU SWAP area */
+
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * Magic pattern identifying the beginning of a KMS blob.
+  */
+static uint8_t     kms_magic[4] = {"KMSB"};
+
+/**
+  * KMS Blob header (metadata) of the candidate Blob in SWAP: structured format (access by fields)
+  */
+static KMS_BlobRawHeaderTypeDef kmsblob_image_header_to_test;
+static uint32_t                 kmsblob_slot;
+
+/* Private macros ------------------------------------------------------------*/
+/**
+  * The KMS blob header has the same structure as the SBSFU Firmware Header.
+  * Therefore, authenticating a KMS blob header can be done by re-using the SBSFU FWIMG service authenticating a FW
+  * Header.
+  * The authentication of the KMS blob itself is not in the scope of sfu_kms, this is handled by the KMS middleware.
+  */
+#define SFU_KMS_AUTHENTICATE_BLOB_HEADER SFU_IMG_CheckAndGetFWHeader
+
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Check that there is a Blob to Install ==> KMSB MAGIC present at the beginning of a DWN slot ?
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+
+  /*
+   * The KMS blob header uses a structure dedicated Header.
+   * In this function we focus only on the KMS blob header, not the entire KMS blob.
+   */
+
+  for (uint32_t i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      /*  Loading the KMS blob header contained in the SWAP area to verify if it can be a valid KMS blob */
+      if (SFU_LL_FLASH_Read((uint8_t *)(uint32_t)(&kmsblob_image_header_to_test),
+                            (uint8_t *)SlotStartAdd[SLOT_DWL_1 + i],
+                            sizeof(KMS_BlobRawHeaderTypeDef)) == SFU_SUCCESS)
+      {
+        /* Is there any KMSBlob present in the SWAP ? */
+        if (memcmp((uint8_t *)&kmsblob_image_header_to_test.KMSMagic, kms_magic, sizeof(kms_magic)) == 0)
+        {
+          /*
+           * Check the authenticity of the KMS Blob stored in the DWN slot.
+           * This check is restricted to the authentication of the KMS blob header.
+           * Authenticating the KMS blob itself is the role of the KMS module (KMS middleware).
+           */
+          kmsblob_slot = SLOT_DWL_1 + i; /* Save also DWN slot for later use */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Retrieve information about the KMS blob hdr and location in flash
+  * @param  pHdr is the pointer to the encrypted blob header
+  * @param  pFlash is the pointer to the blob location in flash
+  * @retval none
+  */
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  if ((ppHdr != NULL) && (ppFlash != NULL))
+  {
+    *ppHdr = (uint8_t *)(uint32_t)&kmsblob_image_header_to_test;
+    *ppFlash = (uint8_t *)(((uint32_t)SlotStartAdd[kmsblob_slot]) + sizeof(kmsblob_image_header_to_test));
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the Blob
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_EraseBlob(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /*  Erase in flash  */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                         (uint8_t *) SlotStartAdd[kmsblob_slot],
+                                         SLOT_SIZE(kmsblob_slot));
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Checks if there is a pending Blob installation.
+  *        3 situations can occur:
+  *        A. First installation request for a blob: a blob is ready to be installed but the installation has never
+  *           been triggered so far.
+  *        B. Blob installation to be retried: a blob installation has been interrupted (switch off) and we can restart
+  *           its installation.
+  *        C. No blob installation pending.
+    * @note This function populates the FWIMG module variable: kmsblob_image_header_to_test.
+  *         If a KMS blob is present then it is copied in kmsblob_image_header_to_test.
+  * @param  None.
+  * @retval SFU_KMS_BlobInstallStateTypeDef Pending Installation status (installation requested or not)
+  */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void)
+{
+  SFU_KMS_BlobInstallStateTypeDef e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+
+  /*
+   * While the SWAP AREA contains a KMSB Magic, it means the KMSBlob installation is not finalized.
+   *
+   */
+  if (SFU_SUCCESS == SFU_KMS_BlobToInstall())
+  {
+    /*
+     * A KMS blob is available for installation:
+     * kmsblob_image_header_to_test has been populated with this blob.
+     */
+    e_ret_state = SFU_KMS_BLOBIMAGE_TO_INSTALL;
+  }
+  else
+  {
+    /* No pending update */
+    e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+  }
+
+  return e_ret_state;
+}
+
+#endif /* KMS_ENABLED */
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
new file mode 100644
index 00000000..8a47b5e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
@@ -0,0 +1,78 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.h
+  * @author  MCD Application Team
+  * @brief   This file contains the KMS Blob service (SFU_KMS_ENABLED) API definitions.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_KMS Installation Status Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_KMS_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_KMS_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_KMS_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_KMS_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_KMS_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_KMS_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_KMS Blob Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_BLOBIMAGE_TO_INSTALL = 0x0U,   /*!< There is a KMS blob to be installed */
+  SFU_KMS_NO_BLOBUPDATE,                 /*!< No KMS blob installation pending */
+} SFU_KMS_BlobInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void);
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash);
+
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void);
+SFU_ErrorStatus SFU_KMS_EraseBlob(void);
+
+SFU_ErrorStatus SFU_KMS_InvalidateCurrentFirmware(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImgMetadata(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImg(void);
+SFU_ErrorStatus SFU_KMS_LaunchActiveImg(void);
+int32_t SFU_KMS_GetActiveFwVersion(void);
+SFU_ErrorStatus SFU_KMS_HasValidActiveFirmware(void);
+SFU_ErrorStatus SFU_KMS_Validation(uint8_t *pHeader);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_KMS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c
new file mode 100644
index 00000000..fb5936c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c
@@ -0,0 +1,803 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update LOADER module.
+  *          This file provides set of firmware functions to manage SFU local
+  *          loader functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include <stdlib.h>
+#include "main.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h" /* for metadata authentication */
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_services.h"      /* for version checking & to check if a valid FW is installed (the local
+                                        bootloader is a kind of "application" running in SB_SFU) */
+#include "app_sfu.h"
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t
+fw_decrypted_chunk[SFU_COM_YMODEM_PACKET_1K_SIZE];/*!< Buffer used for decryption during reception process */
+static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
+static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
+static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
+static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
+static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
+static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
+static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
+static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_Init(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  */
+
+  /*
+   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
+   * when doing a length alignment before writing in FLASH.
+   */
+  if (0U != (uint32_t)(sizeof(fw_decrypted_chunk) % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The decrypt buffer must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Decrypt buffer size (%d) is not matching the FLASH constraints", sizeof(fw_decrypted_chunk));
+    return SFU_ERROR;
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  DeInitialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DeInit(void)
+{
+  /*
+   * ADD SRC CODE HERE
+   */
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Download a new User Fw.
+  *         Writes firmware received via Ymodem in FLASH.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  p_DwlSlot identification of the downloaded area
+  * @param  p_Size Size of the downloaded image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
+                                             uint32_t *pSize)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
+  SE_StatusTypeDef e_se_status;
+  int32_t fw_tag_len = 0;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  /* Check the pointers allocation */
+  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Refresh Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Transfer FW Image via YMODEM protocol */
+  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
+
+  /* Initialize global variables to be used during the YMODEM process */
+  m_uDwlAreaAddress = 0U;
+  m_uDwlAreaStart = 0U;
+  m_uDwlAreaSize = 0U;
+  m_uFileSizeYmodem = 0U;
+  m_uNbrBlocksYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uDwlSlot = SLOT_ACTIVE_1;
+  m_LoaderStatus = SFU_LOADER_ERR_COM;
+
+  /* Receive the FW in RAM and write it in the Flash*/
+  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
+  {
+    if (*pSize > 0U)
+    {
+      /* File download correct*/
+      m_LoaderStatus = SFU_LOADER_OK;
+    }
+  }
+  else
+  {
+    /* Nothing to do : m_LoaderStatus updated during during YModem process */
+  }
+
+  /* Provide slot information to the caller
+     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
+     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
+  *pDwlSlot = m_uDwlSlot;
+
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    /* End of decryption process */
+    fw_tag_len = sizeof(fw_tag_output);
+    if (SE_Decrypt_Finish(&e_se_status, fw_tag_output, &fw_tag_len) != SE_SUCCESS)
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+
+    }
+    else if (e_se_status != SE_OK)
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+    }
+    else
+    {
+      /* Nothing */
+    }
+  }
+
+  *peSFU_LOADER_Status = m_LoaderStatus;
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+  int32_t fw_decrypted_chunk_size;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet*/
+    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
+  if (m_uPacketsReceived == 1U)
+  {
+
+    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+    }
+
+    /* Clear Download application area (including TRAILERS area) */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+          SFU_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    /* Initialize decryption process */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if (e_se_status != SE_OK)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /* Store FW image header in Flash */
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, SE_FW_HEADER_TOT_LEN) ==
+            SFU_SUCCESS)
+        {
+          /* Shift the DWL area pointer */
+          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+          rx_size -= SE_FW_HEADER_TOT_LEN;
+          p_data += SE_FW_HEADER_TOT_LEN;
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
+      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+      {
+        m_uDwlAreaAddress += rx_size;
+        p_data += rx_size;
+        rx_size = 0U;
+      }
+      /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be deccrypted */
+      else
+      {
+        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+      }
+    }
+
+    /* remaining bytes to decrypt ? */
+    if (rx_size != 0U)
+    {
+      fw_decrypted_chunk_size = rx_size;
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
+              != SE_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /*Nothing */
+      }
+    }
+  }
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL image size */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Set dimension to the appropriate length for FLASH programming.
+     * Example: 64-bit length for L4.
+     */
+    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
+    {
+      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+      uOldSize = rx_size;
+      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+      while (uOldSize < rx_size)
+      {
+        fw_decrypted_chunk[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL area */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Write Data in Flash */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress += (rx_size);
+    }
+    else
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#else /* MINICOM_YMODEM */
+/* Minicom variant of the YMODEM protocol: uses 128B packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+  int32_t fw_decrypted_chunk_size;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
+    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_SIZE);
+    }
+  }
+
+
+  /*
+   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
+   */
+
+  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
+     not encrypted  */
+  if (1 == m_uPacketsReceived)
+  {
+    /* First packet: beginning of header */
+    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
+    {
+      /* Copy the beginning of the header */
+      memcpy(fw_header, p_data, rx_size);
+      rx_size = 0U; /* nothing more to do */
+    }
+    else
+    {
+      /* Unexpected case */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else if (2U == m_uPacketsReceived)
+  {
+    /* Second packet: end of header (64 bytes) */
+    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
+    rx_size -= 64U;
+    p_data += 64U;
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+
+      /* Clear Download application area (including TRAILERS area) */
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+              SFU_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* Initialize decryption process */
+        if ((e_ret_status == SFU_SUCCESS)
+            && (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS))
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+          e_ret_status = SFU_ERROR;
+        }
+        else if (e_se_status != SE_OK)
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+          e_ret_status = SFU_ERROR;
+        }
+        else
+        {
+          /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
+          if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
+              == SFU_SUCCESS)
+          {
+            /* Shift the DWL area pointer */
+            m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+          }
+          else
+          {
+            m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+      }
+      /* The remaining 64 bytes of data must be handled : standard processing */
+    }
+  }
+  /*
+   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
+   */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding
+     */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+      {
+        /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
+        m_uDwlAreaAddress += rx_size;
+        p_data += rx_size;
+        rx_size = 0U;
+      }
+      else
+      {
+        /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be decrypted */
+        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+      }
+    }
+
+    /* remaining bytes to decrypt ? */
+    if (rx_size != 0)
+    {
+      fw_decrypted_chunk_size = rx_size;
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
+              != SE_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /*Nothing */
+      }
+
+      /* Check size to avoid writing beyond DWL image size */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Set dimension to the appropriate length for FLASH programming.
+       * Example: 64-bit length for L4.
+       */
+      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+           sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+        uOldSize = rx_size;
+        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                             (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+        while (uOldSize < rx_size)
+        {
+          p_data[uOldSize] = 0xFF;
+          uOldSize++;
+        }
+      }
+
+      /* Check size to avoid writing beyond DWL area */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Write Data in Flash */
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
+        {
+          m_uDwlAreaAddress += (rx_size);
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+
+
+/**
+  * @brief  Verifies the Raw Fw Header received. It checks if the header is
+  *         authentic and if the fields are ok with the device (e.g. size and version).
+  * @note   Please note that when the new image is installed, this metadata is checked
+  *         by @ref SFU_IMG_CheckCandidateVersion.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  pBuffer: pointer to header Buffer.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef              e_se_status;
+  SE_FwRawHeaderTypeDef         *p_x_fw_raw_header;
+  SFU_FwImageFlashTypeDef       fw_image_flash_data;
+  uint16_t                      cur_ver;
+  uint16_t                      verif_ver;
+  uint32_t                      active_slot;
+
+  /*Parse the received buffer*/
+  p_x_fw_raw_header = (SE_FwRawHeaderTypeDef *)(uint32_t)pBuffer;
+  /*Check if the received header packet is authentic*/
+  if (SE_VerifyHeaderSignature(&e_se_status, p_x_fw_raw_header) != SE_ERROR)
+  {
+    active_slot = SFU_IMG_GetFwImageSlot(p_x_fw_raw_header);
+    /*
+     * 1 slot per image configuration. Identify the download area.
+     *   It will be based on SFU magic :
+     *   - dwl slot is the active_slot if configured.
+     *   - else : SLOT_ACTIVE_1
+     */
+    m_uDwlSlot = active_slot;
+    if (SLOT_SIZE(m_uDwlSlot) == 1U)
+    {
+      m_uDwlSlot = SLOT_ACTIVE_1;
+    }
+    SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
+
+    /* Assign the download flash address to be used during the YMODEM process */
+    m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
+    m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
+
+    /*
+     * Check if the version is allowed
+     * ==> SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+     */
+    cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, cur_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+
+
+    /*
+     * Control of version and length is done twice to avoid basic hardware attack
+     * This more important for the 1 image configuration as the installation is done during the download procedure
+     * For the 2 images configuration anti-rollback will be checked again during installation process
+     */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, verif_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, verif_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+  }
+  else
+  {
+    /* Header authentication failure */
+    m_LoaderStatus = SFU_LOADER_ERR_AUTH_FAILED;
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h
new file mode 100644
index 00000000..7467d978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update local
+  *          loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOADER_H
+#define SFU_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Local loader status Type Definition
+  */
+typedef enum
+{
+  SFU_LOADER_OK                            = 0x00U,
+  SFU_LOADER_ERR_COM                       = 0x01U,
+  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
+  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
+  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
+  SFU_LOADER_ERR_FLASH                     = 0x05U,
+  SFU_LOADER_ERR_CRYPTO                    = 0x06U
+} SFU_LOADER_StatusTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LOADER_Init(void);
+SFU_ErrorStatus SFU_LOADER_DeInit(void);
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
+                                             uint32_t *p_Size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
new file mode 100644
index 00000000..8164c740
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
@@ -0,0 +1,229 @@
+/**
+  ******************************************************************************
+  * @file    sfu_mpu_isolation.c
+  * @author  MCD Application Team
+  * @brief   SFU MPU isolation primitives
+  *          This file provides functions to manage the MPU isolation of the Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_mpu_isolation.h"
+#include "sfu_low_level_security.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_SE_STACK_Clean(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief Clean SE Stack.
+  *
+  */
+static void SFU_SE_STACK_Clean(void)
+{
+  uint32_t sp_base = SE_REGION_RAM_START;
+  uint32_t sp_top = SE_REGION_RAM_STACK_TOP;
+  uint32_t sp = __get_MSP();
+  if ((sp > sp_base) && (sp <= sp_top))
+  {
+    while (sp_base < sp)
+    {
+      *(__IO uint32_t *)sp_base = 0U;
+      sp_base += 4U;
+    }
+  }
+  else
+  {
+    /*  error trigger a reset */
+    HAL_NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @brief This is the Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  * @note Installed in startup_stm32xxxx.s
+  *
+  * This handler handles 2 requests:
+  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter
+  * \li (see @ref SE_FunctionIDTypeDef)
+  * \li Internal SB_SFU SVC: run a SB_SFU privileged operation provided as a parameter (see @ref SFU_MPU_PrivilegedOpId)
+  */
+void MPU_SVC_Handler(uint32_t *args)
+{
+  /* in PSP (args) contains caller context as follow *
+    * args[0] :R0
+    * args[1] :R1
+    * args[2] :R2
+    * args[3] :R3
+    * args[4] :R12
+    * args[5] :LR
+    * args[6] :PC to return after exception
+    * args[7] :xPSR
+  */
+  /*  read code OP of instruction that generate SVC interrupt
+   *  bottom 8-bits of the SVC instruction code OP are SVC value  */
+  uint8_t code = ((uint8_t *)args[6])[-2];
+
+  switch (code)
+  {
+    case 0:
+      /* A Secure Engine service is called */
+      SE_SVC_Handler(args);
+      break;
+    case 1:
+      /* Internal SB_SFU privileged service */
+      SFU_MPU_SVC_Handler(args);
+      break;
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This function triggers a SB_SFU Privileged Operation requested with SB_SysCall
+  * @param args arguments
+  *             The first argument is the identifier of the requested operation.
+  * @retval void
+  */
+void SFU_MPU_SVC_Handler(uint32_t *args)
+{
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+
+  switch (args[0])
+  {
+    case SB_SYSCALL_LAUNCH_APP:
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Disable (Hide) Hide Protection Area */
+      SET_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS);
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* Clean SE STACK RAM */
+      SFU_SE_STACK_Clean();
+      /* Release CM4 (via SRAM) */
+      *pSbsfuFlag = SBSFU_BOOTED;
+#if defined(SFU_MPU_PROTECT_ENABLE)
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+      SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+      HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Check Hide Protection Area */
+      if (READ_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS) != FLASH_ACR2_HDPADIS)
+      {
+        /* Security issue : execution stopped ! */
+        HAL_NVIC_SystemReset();
+      }
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* make sure to return into application in privileged mode */
+      __set_CONTROL(__get_CONTROL() & ~0x3U); /* clear process stack & unprivileged bit */
+      launch_application(args[1], (uint32_t)jump_to_function);
+      break;
+    case SB_SYSCALL_RESET:
+      HAL_NVIC_SystemReset();
+      break;
+    case SB_SYSCALL_MPU_CONFIG:
+#if defined(SFU_MPU_PROTECT_ENABLE)
+      /* Privileged mode required for MPU re-configuration */
+      (void)SFU_LL_SECU_SetProtectionMPU(SFU_SECOND_CONFIGURATION);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DMA_CONFIG:
+#if defined(SFU_DMA_PROTECT_ENABLE)
+      /* Privileged mode required for DMA re-configuration (clocks access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDMA();
+#endif /* SFU_DMA_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DAP_CONFIG:
+#if defined(SFU_DAP_PROTECT_ENABLE)
+      /* Privileged mode required for DAP re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDAP();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_TAMPER_CONFIG:
+#if defined(SFU_TAMPER_PROTECT_ENABLE)
+      /* Privileged mode required for TAMPER re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionANTI_TAMPER();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    case SB_SYSCALL_GTZC_CONFIG:
+      /* Privileged mode required for GTZC checks */
+      SFU_LL_SECU_CheckProtectionGTZC();
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This functions triggers a SB_SFU system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SFU_MPU_SysCall(uint32_t syscall, ...)
+{
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+    */
+  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate a SB_SFU syscall */
+}
+
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t SFU_MPU_IsUnprivileged(void)
+{
+  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
+}
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void SFU_MPU_EnterUnprivilegedMode(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
+  __set_CONTROL(__get_CONTROL() | 3U); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
new file mode 100644
index 00000000..56ac7d87
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
@@ -0,0 +1,92 @@
+/**
+  ******************************************************************************
+  * @file    sfu_mpu_isolation.h
+  * @author  MCD Application Team
+  * @brief   SFU MPU isolation primitives
+  *          This file provides functions to manage the MPU isolation of the Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+
+
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_MPU_ISOLATION_H
+#define SFU_MPU_ISOLATION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  *  @brief SFU BOOT Privileged operation identifier.
+  *         SB_SFU can trigger a SB_SFU privileged operation by calling a syscall (@ref SFU_MPU_SysCall) with one of
+  *         the values of this enum.
+  */
+typedef enum
+{
+  SB_SYSCALL_LAUNCH_APP = 1, /*!< SB_SFU service call identifier: launch the user application */
+  SB_SYSCALL_RESET,          /*!< SB_SFU service call identifier: system reset */
+  SB_SYSCALL_MPU_CONFIG,     /*!< SB_SFU service call identifier: MPU re-configuration */
+  SB_SYSCALL_DMA_CONFIG,     /*!< SB_SFU service call identifier: DMA re-configuration */
+  SB_SYSCALL_DAP_CONFIG,     /*!< SB_SFU service call identifier: DAP re-configuration */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  SB_SYSCALL_GTZC_CONFIG,    /*!< SB_SFU service call identifier: GTZC re-configuration */
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+  SB_SYSCALL_TAMPER_CONFIG   /*!< SB_SFU service call identifier: TAMPER re-configuration */
+} SFU_MPU_PrivilegedOpId;
+
+/* Exported functions ------------------------------------------------------- */
+/* SVC call handler for Secure Engine: this function is defined in se_interface_common.c */
+extern void SE_SVC_Handler(uint32_t *args);
+
+/* SB_SFU SVC handling */
+void MPU_SVC_Handler(uint32_t *args);
+void SFU_MPU_SVC_Handler(uint32_t *args);
+void SFU_MPU_SysCall(uint32_t syscall, ...);
+
+/* Helpers for unprivileged mode handling */
+void SFU_MPU_EnterUnprivilegedMode(void);
+uint32_t SFU_MPU_IsUnprivileged(void);
+
+/**
+  * @brief This function sets the Stack Pointer and Program Counter to jump into a function
+  * @param  vector_address Start Address (where to jump)
+  * @retval void
+  */
+void jump_to_function(uint8_t *vector_address);
+
+/**
+  * @brief This function returns from an interrupt and launches the user application code
+  * @param  applicationVectorAddress Start address of the user application (active slot+offset: vectors)
+  * @param  exitFunctionAddress Function to jump into the user application code
+  * @param  address Function to jump into the BL code in case of exit_sticky usage
+  * @param  magic number used by BL code in case of exit_sticky usage
+  * @retval void
+  */
+void launch_application(uint32_t applicationVectorAddress, uint32_t exitFunctionAddress);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_MPU_ISOLATION_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c
new file mode 100644
index 00000000..c2740714
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c
@@ -0,0 +1,61 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar file integrated in the user
+  *          application.
+  * @note    This file is compiled in the scope of SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_regions.h"
+#include "se_def_metadata.h"
+#include <string.h> /* needed for memset (see WriteInstallHeader)*/
+
+
+/**
+  * @brief  Write in Flash the next header image to install.
+  *         This function is used by the local loader to request a Firmware installation (at next reboot).
+  * @param  fw_header FW header of the FW to be installed
+  * @retval SFU_SUCCESS if successful, otherwise SFU_ERROR
+  */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header)
+{
+  return SFU_SUCCESS;           /* Nothing to do */
+}
+
+/**
+  * @brief  Provide the area descriptor to write a FW image in Flash.
+  *         This function is used by the local loader to know where to store a new Firmware Image before asking for its
+  *         installation.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pArea pointer to area descriptor
+  * @retval none
+  */
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea)
+{
+  pArea->DownloadAddr = SlotStartAdd[DwlSlot];
+  pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(DwlSlot);
+  pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h
new file mode 100644
index 00000000..c234da77
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h
@@ -0,0 +1,58 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware
+  *          Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar
+  *          file integrated in the user application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_NEW_IMAGE_H
+#define SFU_NEW_IMAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Specifies a structure containing values related to the management of multi-images in Flash.
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+  uint32_t  ExecutionAddr;         /*!< The execution address for the FwImage in UserFlash */
+} SFU_FwImageFlashTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header);
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_NEW_IMAGE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
new file mode 100644
index 00000000..d167b5ab
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
@@ -0,0 +1,324 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_test.h"
+#include "main.h"
+#include "sfu_trace.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "string.h" /* required for strncmp */
+
+#if defined(SFU_TEST_PROTECTION)
+
+extern RTC_HandleTypeDef RtcHandle;
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_ISOLATION 1
+
+/* Automatic tests : list of tests (Address, Message, Operation */
+/* Flash programming by 64 bits */
+#define SHIFT_FLASH_WRITE (8U-1U)
+
+/* Private variables ---------------------------------------------------------*/
+static ProtectionTest_t aProtectTests[] =
+{
+#ifdef SFU_MPU_PROTECT_ENABLE
+  {SFU_RAM_BASE, "MPU SRAM start add", TEST_EXECUTE},
+  {SFU_RAM_END - 3U, "MPU SRAM end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
+  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
+  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
+  /* READ_FLASH is possible only in privileged mode */
+  {INTVECT_START, "Init. Vector", TEST_READ_FLASH},
+  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_WRP_PROTECT_ENABLE
+  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
+  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
+  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
+#endif /* SFU_WRP_PROTECT_ENABLE */
+#ifdef SFU_PCROP_PROTECT_ENABLE
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
+  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
+                                                                                         writing test */
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
+  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+#if defined(TEST_ISOLATION)
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
+  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
+                                                                         64bits writing test + WRP protection applies */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
+  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
+  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
+                                                                    that initializes all the variables in the binary. */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
+  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+#endif /* TEST_ISOLATION  */
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Testing the MPU protection of the OBs */
+  /*
+   * WL55JC
+   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
+   * 0x1FFF 7818 Reserved Write protection 1A
+   * 0x1FFF 7820 Reserved Write protection 1B
+   */
+  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFF7800", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFF7818", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFF7820", TEST_WRITE_FLASH},
+#endif /* SFU_MPU_PROTECT_ENABLE  */
+  {0xAAAAAAAA, "Execution successful", TEST_END},
+};
+
+
+/* Automatic test : list of operation */
+uint8_t aTestOperation[][20] =
+{
+  "write 8 bytes",
+  "read 1 byte",
+  "erase 512 bytes",
+  "write 4 bytes",
+  "read 1 byte",
+  "execute",
+  "end"
+};
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_TEST_Protection(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
+  * @param  None.
+  * @retval None.
+  */
+static void SFU_TEST_Protection(void)
+{
+  uint32_t test_idx;
+  uint32_t flashErrCode = 0;
+  uint64_t pattern = 0U;
+  uint32_t page_error = 0U;
+  FLASH_EraseInitTypeDef p_erase_init;
+  TestStatus status = TEST_IN_PROGRESS;
+  __IO uint8_t tmp;
+  void (*func)(void);
+
+  /*
+    * Now checking the security
+    * We will try to access protected @ and run protected code.
+    * Each time a a flash error will be raised or a reset will be generated by IP protection.
+    * At next boot we read the backup register to check the next @ until all addresses have been verified.
+    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
+    * FWALL/Code Isolation
+    */
+
+  do
+  {
+    /* slow down execution */
+    HAL_Delay(100);
+
+    /* Increment test number for next execution */
+    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
+    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
+           aProtectTests[test_idx].address);
+
+    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
+    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
+        && (aProtectTests[test_idx].address > 0x00000FFFU))
+    {
+      switch (aProtectTests[test_idx].type)
+      {
+        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_FLASH :
+          HAL_FLASH_Unlock();
+          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
+          HAL_FLASH_Lock();
+          flashErrCode = HAL_FLASH_GetError();
+          printf("\r\nflash error code: %x", flashErrCode);
+          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+
+          /*
+           * OBs protection test: no MPU enabled because the OB cannot be written directly.
+           * A flash error should occur.
+           */
+          break;
+
+        /* Trying to read in FLASH : RDP set in case of PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_READ_FLASH :
+          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
+          HAL_Delay(1);                                                 /* ensure Flag is set */
+          /*
+           * When Isolation activated : RESET should be generated
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
+          {
+            status = TEST_ERROR;
+          }
+
+          break;
+
+        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_ERASE_FLASH :
+          HAL_FLASH_Unlock();
+          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
+          p_erase_init.NbPages     = 1;
+          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
+          HAL_FLASH_Lock();
+          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+          break;
+
+        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_RAM :
+          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
+          status = TEST_ERROR;
+          break;
+
+        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_READ_RAM :
+          tmp = *(uint8_t *)aProtectTests[test_idx].address;
+          printf(" value : %d ", tmp);
+          status = TEST_ERROR;
+          break;
+
+          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
+        case TEST_EXECUTE :
+          func = (void(*)(void))(aProtectTests[test_idx].address);
+          func();
+          status = TEST_ERROR;
+          break;
+
+        /* End of execution */
+        case TEST_END :
+          status = TEST_COMPLETED;
+          break;
+
+        default :
+          break;
+      }
+    }
+  } while (status == TEST_IN_PROGRESS) ;
+
+  if (status == TEST_ERROR)
+  {
+    SFU_TEST_Error();
+  }
+  else if (status == TEST_COMPLETED)
+  {
+    /* reset for next run (need a RESET of the platform to restart a session) */
+    printf("\b\b\b\b\b\b\b\b");
+    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
+  }
+}
+
+/**
+  * @brief  Initialization of backup register and start test
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Init(void)
+{
+  /* Use register DR0 to know which if the test sequence is in progress or done */
+  /* Use register DR1 to know which test to run after a reset */
+
+  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
+  {
+    return;
+  }
+  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
+                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
+                                                                  reset test index (DR1) */
+  {
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+  }
+
+  /* Start test */
+  SFU_TEST_Protection();
+}
+
+/**
+  * @brief  Reset backup register to be able to execute a new test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Reset(void)
+{
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+}
+
+/**
+  * @brief  Error detected during test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Error(void)
+{
+  printf(" ===> KO!!!!!");
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
+}
+
+#endif /* SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
new file mode 100644
index 00000000..375e610f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
@@ -0,0 +1,81 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Test Protections functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TEST_H
+#define SFU_TEST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "app_sfu.h"
+
+#if defined(SFU_TEST_PROTECTION)
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  TEST_WRITE_FLASH = 0U,                /* Writing test in FLASH */
+  TEST_READ_FLASH,                      /* Reading test in FLASH */
+  TEST_ERASE_FLASH,                     /* Erasing test in FLASH */
+  TEST_WRITE_RAM,                       /* Writing test in RAM */
+  TEST_READ_RAM,                        /* Reading test in RAM */
+  TEST_EXECUTE,                         /* Execution function test */
+  TEST_END,                             /* Last test : Success ! */
+} TestType;
+
+typedef enum
+{
+  TEST_IN_PROGRESS = 0U,                /* Test in progress */
+  TEST_COMPLETED,                       /* Test ended : success */
+  TEST_ERROR,                           /* Test aborted : error */
+} TestStatus;
+
+
+#define PROTECT_MSG_LEN (35U)           /* message to be displayed length           */
+typedef struct
+{
+  uint32_t address;                     /* address to be tested */
+  uint8_t msg[PROTECT_MSG_LEN];         /* message to be displayed when testing */
+  TestType type;                        /* type of test */
+} ProtectionTest_t;
+
+/* Exported constants --------------------------------------------------------*/
+/* Magic number saved in DR0 backup register */
+#define MAGIC_TEST_DONE          0xAAA2
+#define MAGIC_TEST_INIT          0xAAA3
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_TEST_Init(void);
+void SFU_TEST_Reset(void);
+void SFU_TEST_Error(void);
+
+#endif /* SFU_TEST_PROTECTION */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TEST_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h
new file mode 100644
index 00000000..cf6d3387
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SFU_TRACE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TRACE_H
+#define SFU_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_com_trace.h"
+#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+/* External variables --------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid
+                                                                        faults. printf is not rieentrant */
+#define TRACE   (void) printf
+#else
+#define TRACE(...)
+#define TRACE_IRQ(pbuffer)
+#endif /* SFU_DEBUG_MODE */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c
new file mode 100644
index 00000000..a502fa43
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c
@@ -0,0 +1,581 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.c
+  * @author  MCD Application Team
+  * @brief   SFU Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+extern RTC_HandleTypeDef RtcHandle;
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+/* Private variables ---------------------------------------------------------*/
+static UART_HandleTypeDef   UartHandle;
+static CRC_HandleTypeDef    CrcHandle;
+
+/* Private function prototypes -----------------------------------------------*/
+static void     SFU_LL_Error_Handler(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Initialize CRC */
+  e_ret_status = SFU_LL_CRC_Init();
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF CRC Init.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure the peripheral clock */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+
+  /* Configure CRC with default polynomial - standard configuration */
+  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU  IF CRC Configuration.
+  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
+  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Check the parameters */
+  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
+
+  /* Switch to the selected configuration */
+  CrcHandle.Instance = CRC;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  switch (eCRCConfg)
+  {
+    case SFU_CRC_CONFIG_DEFAULT:
+      /* The Default polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+      /* The default init value is used */
+      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+      /* The input data are 32-bit long words */
+      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    case SFU_CRC_CONFIG_16BIT:
+      /* The CRC-16-CCIT polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+      /* The zero init value is used */
+      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+      CrcHandle.Init.InitValue               = 0U;
+      /* The input data are 8-bit long */
+      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    default:
+      /* Invalid parameter */
+      e_ret_status = SFU_ERROR;
+      break;
+  }
+
+  /* Proceed to CRC Init (Correct Parameters) */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  SFU IF CRC Calculate.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  BufferLength: buffer length in bytes.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
+}
+
+/**
+  * @brief SFU UART Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = SFU_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+  if (HAL_UART_Init(&UartHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief SFU IF UART DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  SFU IF Write data (send).
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  DataLength: pointer to the 128bit data to write.
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  Timeout: Timeout duration.
+  * @retval status of the write operation
+  *         SFU_ERROR : if the write operation is not performed
+  *         SFU_SUCCESS : if the write operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF Read data (receive).
+  * @param  pData: pointer to the 128bit data where to store the received data.
+  * @param  DataLength: the length of the data to be read in bytes.
+  * @param Timeout: Timeout duration.
+  * @retval status of the read operation
+  *         SFU_ERROR : if the read operation is not performed
+  *         SFU_SUCCESS : if the read operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU HAL IF Flush.
+  * @param  None.
+  * @retval status of the operation.
+  */
+SFU_ErrorStatus SFU_LL_UART_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+
+  return SFU_SUCCESS;
+}
+
+#if  defined(CORE_CM0PLUS)
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief SFU IF RTC Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief SFU IF RTC DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+#endif /* CORE_CM0PLUS */
+
+/**
+  * @brief SFU IF RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer.
+  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  *        the RTC clock source; in this case the Backup domain will be reset in
+  *        order to modify the RTC Clock source, as consequence RTC registers (including
+  *        the backup registers) and RCC_BDCR register are set to their reset values.
+  * @retval None
+  */
+void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  RCC_OscInitTypeDef        RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+  UNUSED(hrtc);
+  /*-1- Enables access to the backup domain */
+  /* To enable access on RTC registers */
+
+  HAL_PWR_EnableBkUpAccess();
+
+  /*-2- Configure LSE/LSI as RTC clock source */
+#ifdef RTC_CLOCK_SOURCE_LSE
+
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#elif defined (RTC_CLOCK_SOURCE_LSI)
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
+  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#else
+#error Please select the RTC Clock source inside the main.h file
+#endif /*RTC_CLOCK_SOURCE_LSE*/
+
+  /*-3- Enable RTC peripheral Clocks */
+  /* Enable RTC Clock */
+  __HAL_RCC_RTC_ENABLE();
+
+  /* Enable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_ENABLE();
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  /*-4- Configure the NVIC for RTC Tamper */
+  HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0x0FU, 0U);
+  HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+
+  __HAL_RCC_RTC_DISABLE();
+
+  /* Disable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_DISABLE();
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in SFU application.
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral Clock Enable */
+    SFU_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    SFU_UART_TX_GPIO_CLK_ENABLE();
+    SFU_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : SFU_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
+    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : SFU_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
+    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral clock disable */
+    SFU_UART_CLK_DISABLE();
+
+    /* GPIO DeInit*/
+    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
+    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
+
+  }
+
+
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @param  None
+  * @retval None
+  */
+static void SFU_LL_Error_Handler(void)
+{
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  while (1 == 1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @}
+  */
+/**
+  * @brief function checking if a buffer is in se ram.
+  * @param pBuff: Secure Engine protected function ID.
+  * @param length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in se ram, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((length != 0U) && (!((0xFFFFFFFFUL - addr_start) < length))
+      && ((addr_end  <= SE_REGION_RAM_END) && (addr_start >= SE_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h
new file mode 100644
index 00000000..da4792af
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h
@@ -0,0 +1,132 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef  SFU_LOW_LEVEL_H
+#define  SFU_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU CRC Configuration definition
+  */
+typedef enum
+{
+  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
+  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
+  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
+} SFU_CRC_ConfigTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Uncomment to enable the adequate Clock Source */
+#define RTC_CLOCK_SOURCE_LSI
+/*#define RTC_CLOCK_SOURCE_LSE*/
+
+#ifdef RTC_CLOCK_SOURCE_LSI
+#define RTC_ASYNCH_PREDIV    0x1FU
+#define RTC_SYNCH_PREDIV     0x3FF
+#endif /* RTC_CLOCK_SOURCE_LSI */
+
+#ifdef RTC_CLOCK_SOURCE_LSE
+#define RTC_ASYNCH_PREDIV  0x7FU
+#define RTC_SYNCH_PREDIV   0x00FFU
+#endif /* RTC_CLOCK_SOURCE_LSE */
+
+/* External variables --------------------------------------------------------*/
+extern __IO uint32_t  DummyMemAccess;
+#if defined(SFU_LOW_LEVEL_C)
+#if defined(IT_MANAGEMENT)
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+__IO uint32_t DummyMemAccess;
+#endif /* defined(IT_MANAGEMENT) */
+#endif /* defined(SFU_LOW_LEVEL_C) */
+
+
+/* Exported macros -----------------------------------------------------------*/
+#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
+                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
+                               ((CONF) == SFU_CRC_CONFIG_16BIT))
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+#define SFU_LL_DummyAccess() \
+  do{ \
+  }while(0)
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus    SFU_LL_Init(void);
+SFU_ErrorStatus    SFU_LL_DeInit(void);
+
+SFU_ErrorStatus    SFU_LL_CRC_Init(void);
+SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
+uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
+
+SFU_ErrorStatus    SFU_LL_UART_Init(void);
+SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
+SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Flush(void);
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus SFU_LL_RTC_Init(void);
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
+void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
+
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  SFU_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c
new file mode 100644
index 00000000..4cea3348
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_fwimg_regions.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  e_ret_status = SFU_LL_FLASH_INT_Init();
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                   const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pFlash < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+}
+
+/**
+  * @brief  This function configure the flash to be able to execute code
+  * @param  Addr: flash address
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
+{
+  /*
+   * Internal flash : nothing to do
+   * External flash : configure memory mapped mode
+   */
+
+  /* Check Flash address */
+  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
+  }
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
+{
+  /* Check Flash address */
+  if (Addr < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_GetPage(Addr);
+  }
+  else
+  {
+    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
+  }
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h
new file mode 100644
index 00000000..726365d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_H
+#define SFU_LOW_LEVEL_FLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
+  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
+  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
+  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
+  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
+  SFU_FLASH_SUCCESS           /*!< Flash Success */
+} SFU_FLASH_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define INVALID_SECTOR 0xFFFFFFFFU
+#define INVALID_PAGE   0xFFFFFFFFU
+#define INVALID_BANK   0xFFFFFFFFU
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                   const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
+
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c
new file mode 100644
index 00000000..7b10b14d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU external
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_low_level_security.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+/* No external flash available on this product
+   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
+       systematically during startup phase */
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pStart);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  UNUSED(pFlash);
+  UNUSED(Pattern1);
+  UNUSED(Pattern2);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
+{
+  UNUSED(SlotNumber);
+  return SFU_SUCCESS;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h
new file mode 100644
index 00000000..08566d80
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for external flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
+#define SFU_LOW_LEVEL_FLASH_EXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+#define EXTERNAL_FLASH_ADDRESS  0x90000000U
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c
new file mode 100644
index 00000000..1e8db303
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c
@@ -0,0 +1,474 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU internal
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "string.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+
+/* Private variables ---------------------------------------------------------*/
+static __IO uint32_t DoubleECC_Error_Counter = 0U;
+
+
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t first_page;
+  uint32_t nb_pages;
+  uint32_t chunk_nb_pages;
+  uint32_t length = Length;
+
+  /* Check the pointers allocation */
+  if (pFlashStatus == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  *pFlashStatus = SFU_FLASH_SUCCESS;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = SFU_LL_FLASH_INT_GetPage(start);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
+      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        p_erase_init.Page = first_page;
+        p_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_ERASE;
+        }
+        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
+      } while (nb_pages > 0U);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      if (HAL_FLASH_Lock() != HAL_OK)
+      {
+        e_ret_status = SFU_ERROR;
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+      }
+    }
+    else
+    {
+      *pFlashStatus = SFU_FLASH_ERR_HAL;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Check the pointers allocation */
+  if ((pFlashStatus == NULL) || (pSource == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     writing operation should be executed inside secure environment */
+  if ((inside_header == 1U) && (Length != 0U))
+  {
+    /* SE Access */
+    SE_StatusTypeDef se_status;
+    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
+    if (se_ret_status == SE_SUCCESS)
+    {
+      e_ret_status = SFU_SUCCESS;
+      *pFlashStatus = SFU_FLASH_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+      *pFlashStatus = SFU_FLASH_ERROR;
+    }
+  }
+  /* Writing operation executed by SBSFU */
+  else
+  {
+    *pFlashStatus = SFU_FLASH_ERROR;
+
+    /* Clear error flags raised during previous operation */
+    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Unlock the Flash to enable the flash control register access *************/
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+
+      }
+      else
+      {
+        /* DataLength must be a multiple of 64 bit */
+        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
+        {
+          *pFlashStatus = SFU_FLASH_ERROR;
+
+          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+          be done by word */
+          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
+              == HAL_OK)
+          {
+            /* Check the written value */
+            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
+            {
+              /* Flash content doesn't match SRAM content */
+              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
+              e_ret_status = SFU_ERROR;
+            }
+            else
+            {
+              /* Increment FLASH Destination address */
+              destination = destination + sizeof(SFU_LL_FLASH_write_t);
+              e_ret_status = SFU_SUCCESS;
+              *pFlashStatus = SFU_FLASH_SUCCESS;
+            }
+          }
+          else
+          {
+            /* Error occurred while writing data in Flash memory */
+            *pFlashStatus = SFU_FLASH_ERR_WRITING;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+        /* Lock the Flash to disable the flash control register access (recommended
+        to protect the FLASH memory against possible unwanted operation) */
+        if (HAL_FLASH_Lock() != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_HAL;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus se_ret_status;
+  SE_StatusTypeDef se_status;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     reading operation should be executed inside secure environment */
+  if (inside_header == 1U)
+  {
+    /* SE Access */
+    DoubleECC_Error_Counter = 0U;
+    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
+    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  /* Reading operation executed by SBSFU */
+  else
+  {
+    DoubleECC_Error_Counter = 0U;
+    /* Do not use memcpy from lib : ECC error should be checked at each loop */
+    for (i = 0; (i < Length) && (DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+    {
+      *pDestination = *pSource;
+    }
+    if (DoubleECC_Error_Counter == 0U)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  uint32_t flash = (uint32_t) pFlash;
+  uint32_t i;
+
+  /* Comparison executed by SBSFU ==> flash area could not be located inside secured environment */
+  for ( i = 0U; i < Length; i += 4U)
+  {
+    if ((*(uint32_t *)(flash + i) != Pattern1) &&  (*(uint32_t *)(flash + i) != Pattern2))
+    {
+      return SFU_ERROR;
+    }
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+
+
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retvat void
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    while (1 == 1)
+    {
+      SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_UNKNOWN);
+    }
+  }
+}
+
+
+/**
+  * @brief  HardFault Handler
+  * @param  None.
+  * @retval None.
+  */
+void HardFault_Handler(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h
new file mode 100644
index 00000000..5ef51fc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for internal flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_INT_H
+#define SFU_LOW_LEVEL_FLASH_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash Write Access Constraints (size and alignment)
+  *
+  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
+  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
+  *
+  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
+  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
+  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
+  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_FirmwareToResume).
+  */
+
+/* double-word is the default setting for most platforms */
+typedef uint64_t SFU_LL_FLASH_write_t;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Length of a MAGIC tag (32 bytes).
+  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
+  */
+#define MAGIC_LENGTH ((uint32_t)32U)
+
+/* External variables --------------------------------------------------------*/
+#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
+void NMI_Handler(void);
+void HardFault_Handler(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
new file mode 100644
index 00000000..edb263c7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
@@ -0,0 +1,2026 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SFU Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "stm32wlxx_it.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_RDP_PROTECT_ENABLE
+#warning "SFU_RDP_PROTECT_DISABLED"
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_GTZC_PROTECT_ENABLE
+#warning "SFU_GTZC_PROTECT_DISABLED"
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_C2SWDBG_PROTECT_ENABLE
+#warning "SFU_C2SWDBG_DISABLED"
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+
+
+#ifndef  SFU_TAMPER_PROTECT_ENABLE
+/* #warning "SFU_TAMPER_PROTECT_DISABLED" */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+#warning "SFU_IWDG_PROTECT_DISABLED"
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+
+  /* install header : read /write only for privileged */
+  {
+    SFU_PROTECT_MPU_HEADER_RGNV, SFU_PROTECT_MPU_HEADER_START, SFU_PROTECT_MPU_HEADER_SIZE,
+    SFU_PROTECT_MPU_HEADER_PERM, SFU_PROTECT_MPU_HEADER_EXECV, SFU_PROTECT_MPU_HEADER_SREG,
+    SFU_PROTECT_MPU_HEADER_TEXV, SFU_PROTECT_MPU_HEADER_C, SFU_PROTECT_MPU_HEADER_B
+  },
+
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+
+  /* KMS_DataStorage: NVM storage */
+  {
+    SFU_PROTECT_MPU_KMS_RGNV, SFU_PROTECT_MPU_KMS_START, SFU_PROTECT_MPU_KMS_SIZE,
+    SFU_PROTECT_MPU_KMS_PERM, SFU_PROTECT_MPU_KMS_EXECV, SFU_PROTECT_MPU_KMS_SREG,
+    SFU_PROTECT_MPU_KMS_TEXV, SFU_PROTECT_MPU_KMS_C, SFU_PROTECT_MPU_KMS_B
+  },
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+  /* DMA */
+  {
+    SFU_PROTECT_MPU_DMA_RGNV, SFU_PROTECT_MPU_DMA_START, SFU_PROTECT_MPU_DMA_SIZE,
+    SFU_PROTECT_MPU_DMA_PERM, SFU_PROTECT_MPU_DMA_EXECV, SFU_PROTECT_MPU_DMA_SREG,
+    SFU_PROTECT_MPU_DMA_TEXV, SFU_PROTECT_MPU_DMA_C, SFU_PROTECT_MPU_DMA_B
+  },
+#endif /* SFU_DMA_PROTECT_ENABLE */
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+
+
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus    SFU_LL_SECU_SetProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void);
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check that a GTZC interrupt is enabled
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if enabled, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus GTZC_CheckITEnabled(uint32_t PeriphId)
+{
+  uint32_t register_address;
+  uint32_t bit_pos;
+
+  register_address = (uint32_t)&(GTZC_TZIC->IER1) + (4U * GTZC_GET_REG_INDEX(PeriphId));
+  bit_pos = (uint32_t)(1UL << GTZC_GET_PERIPH_POS(PeriphId));
+  if (READ_BIT(*(uint32_t *)register_address, bit_pos) == bit_pos)
+  {
+    return SFU_SUCCESS;
+  }
+  return SFU_ERROR;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void) HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  (void) HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA_A  **********/
+  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
+  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set Flash configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply PCRoP ******************************************************/
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSUBGHZSPI(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
+#ifdef SFU_RDP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_RDP_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        (void) HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Lock the Options Bytes ***************************************************/
+  (void) HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void) HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Check/Apply MPU ************************************************/
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for MPU second-configuration
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_MPU_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DMA_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DAP_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  /* Check/Apply  ANTI_TAMPER *************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for TAMPER second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_TAMPER_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#ifdef SFU_TEST_PROTECTION
+  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_TEST_PROTECTION */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+  /* Check/Apply  C2SWDBG *****************************************************/
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    if (SFU_LL_SECU_CheckProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  i_ctrl++;
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+  /* Check/Apply  GTZC ********************************************************/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionGTZC() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_GTZC;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for GTZC checks
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_GTZC_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+  /* Check/Apply  CLOCK_MONITOR **********************************************/
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
+
+  /* Check/Apply  TEMP_MONITOR **********************************************/
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Return the reset source  detected after a reboot. The related flag is reset
+  *         at the end of this function.
+  * @param  peResetpSourceId: to be filled with the detected source of reset
+  * @note   In case of multiple reset sources this function return only one of them.
+  *         It can be improved returning and managing a combination of them.
+  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
+{
+  /* Check if the last reset has been generated from a Watchdog exception */
+  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
+      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
+  {
+    *peResetpSourceId = SFU_RESET_WDG_RESET;
+
+  }
+
+
+  /* Check if the last reset has been generated from a Low Power reset */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_LOW_POWER;
+
+  }
+
+  /* Check if the last reset has been generated from a Software reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_SW_RESET;
+
+  }
+  /* Check if the last reset has been generated from an Option Byte Loader reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_OB_LOADER;
+  }
+  /* Check if the last reset has been generated from a Hw pin reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_HW_RESET;
+
+  }
+  /* Unknown */
+  else
+  {
+    *peResetpSourceId = SFU_RESET_UNKNOWN;
+  }
+}
+
+/**
+  * @brief  Clear the reset sources. This function should be called after the actions
+  *         on the reset sources has been already taken.
+  * @param  none
+  * @note   none
+  * @retval none
+  */
+void SFU_LL_SECU_ClearResetSources()
+{
+  /* Clear reset flags  */
+  __HAL_RCC_CLEAR_RESET_FLAGS();
+}
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Flash configuration */
+  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+/**
+  * @brief  Apply the RDP protection
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply RDP **********************************************************/
+  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
+  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
+#else
+    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
+    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+  return e_ret_status;
+}
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  if ((psFlashOptionBytes->WRPStartOffset == SFU_PROTECT_WRP_PAGE_START_1) &&
+      (psFlashOptionBytes->WRPEndOffset   == SFU_PROTECT_WRP_PAGE_END_1))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
+    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
+    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /* configure a temporary area for the currently executing code (SBSFU + active slots) */
+  /* This area of higher rank will keep the execution rights when reconfiguring the current area */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_BLOB_DWL_RGNV; /* temporary area */
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* configure a new area for the currently executing code (SBSFU + active slots) */
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* remap the current area (SBSFU + active slots) */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_BLOB_DWL_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_BLOB_DWL_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_BLOB_DWL_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_BLOB_DWL_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_BLOB_DWL_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_BLOB_DWL_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_BLOB_DWL_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_BLOB_DWL_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_BLOB_DWL_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  Remove the write rights for the SRAM synchronization flag */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_SRAM_FLAG_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_SRAM_FLAG_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_SRAM_FLAG_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_SRAM_FLAG_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_SRAM_FLAG_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_SRAM_FLAG_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_SRAM_FLAG_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_SRAM_FLAG_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_SRAM_FLAG_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  return SFU_SUCCESS;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t mpu_region_num; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
+          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
+          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    /* Enables the MPU */
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    /* Enables memory fault exception */
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    if ((SCB->SHCSR & SCB_SHCSR_MEMFAULTENA_Msk) != SCB_SHCSR_MEMFAULTENA_Msk)
+    {
+      return SFU_ERROR;
+    }
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+
+  e_ret_status = SFU_SUCCESS;
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check if GTZC protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionGTZC(void)
+{
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t periph_attributes;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Check FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SRAM1_SIZE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SE_REGION_RAM_START - SRAM2_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_NPRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZIC peripherals ***********************************************/
+
+  /* Check FLASH_ACR2 */
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the IT for the concerned peripherals */
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZIC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZSC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_AES) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_RNG) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SUBGHZSPI) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PWR) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASHIF) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMAMUX) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASH) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PKA) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the GTZC TZC lock *************************************************/
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+
+    return SFU_SUCCESS;
+  }
+
+  return SFU_ERROR;
+}
+
+/**
+  * @brief  Apply GTZC protection: FLASH, RAM, PKA, RNG, AES.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionGTZC(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Handle the GTZC TZC lock *************************************************/
+
+  /* Configure FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SRAM1_SIZE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SE_REGION_RAM_START - SRAM2_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                           (GTZC_TZSC_ATTRIBUTE_NPRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZIC peripherals ***********************************************/
+
+  /* Configure FLASH_ACR2 */
+  MODIFY_REG(FLASH->ACR2, FLASH_ACR2_PRIVMODE, FLASH_ACR2_PRIVMODE);
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable the IT for the concerned peripherals */
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZIC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZSC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_AES) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_RNG) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SUBGHZSPI) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PWR) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASHIF) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMAMUX) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASH) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PKA) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  NVIC_EnableIRQ(TZIC_ILA_IRQn);
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Handle the GTZC TZC lock *************************************************/
+  HAL_GTZC_TZSC_Lock(GTZC_TZSC);
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return SFU_SUCCESS;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#else
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  Apply ANTI TAMPER protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  RTC_TamperTypeDef  stamperstructure;
+
+  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
+  TAMPER_GPIO_CLK_ENABLE();
+
+  /* Configure Tamper Pin */
+  /* tamper is an additional function */
+  /* not an alternate Function : config not needed */
+  /* Configure the RTC peripheral */
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    /* Configure RTC Tamper */
+    stamperstructure.Tamper                       = RTC_TAMPER_ID;
+    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
+    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
+    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
+    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
+    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
+    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
+    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
+    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
+
+    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
+    {
+
+      /* Clear the Tamper interrupt pending bit */
+      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
+    }
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+/**
+  * @brief  Check if C2SWDBG protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_C2SWDBGEN) == 0U)
+  {
+    /* C2SWDBG disabled */
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply C2SWDBG protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void)
+{
+  HAL_FLASHEx_DisableC2Debug();
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  return SFU_SUCCESS;
+}
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply CLOCK MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a clock monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Clock Monitoring */
+  /* Add your code here for customization
+     e.g. if HSE or LSE is used enable the CSS!
+   ...
+   ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply TEMP MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a temperature monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Temperature Monitoring */
+  /* Add your code here for customization
+     ...
+     ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the active slots
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n= [SBOOT] Secure Mode: [%x]", psFlashOptionBytes->SecureMode);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr == SFU_SECURE_FLASH_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure Flash Start Address: [%x]", psFlashOptionBytes->SecureFlashStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr == SFU_HIDE_PROTECTION_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Hide Protection Start Address: [%x]", psFlashOptionBytes->HideProtectionStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr == SFU_SECURE_SRAM1_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM1 Start Address: [%x]", psFlashOptionBytes->SecureSRAM1StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr == SFU_SECURE_SRAM2_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM2 Start Address: [%x]", psFlashOptionBytes->SecureSRAM2StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START;
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Secure User Memory is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/**
+  * @brief  Activate Secure User Memory protection and jump into user application.
+  * @param  Address of the code to jump into
+  * @retval none.
+  */
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check Sub-GHz radio SPI protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply Sub-GHz radio SPI ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->SUBGHZSPISecureAccess == OB_SUBGHZSPI_SECURE_ACCESS_ENABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply Sub-GHz radio SPI protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SUBGHZSPI_SECURE_ACCESS;
+
+    psFlashOptionBytes->SUBGHZSPISecureAccess = OB_SUBGHZSPI_SECURE_ACCESS_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
new file mode 100644
index 00000000..efdb8c94
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
@@ -0,0 +1,347 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+/* Secure User Memory end : from FLASH_BASE to end of active slot header */
+#define SFU_SEC_MEM_AREA_ADDR_END SFU_ROM_ADDR_END
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+
+
+#define SFU_PROTECT_GTZC_EXEC_SE_START INTVECT_START /*!< GTZC Configuration */
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area in unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys) in unprivileged mode.
+  *                   Read only capability configured
+  *                   Inner region inside the Region 0
+  *                   From 0x0802C000 ==> 0x0803FFFF
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START 0x08020000UL
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_128KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x07U               /*!< 128 Kbytes / 8 * 5 ==> 80 Kbytes */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the read/write operation in privileged mode for Header of active slots
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_HEADER_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_HEADER_START SLOT_ACTIVE_2_HEADER
+#define SFU_PROTECT_MPU_HEADER_SREG  0x00U                 /*!< All subregions activated */
+#define SFU_PROTECT_MPU_HEADER_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_HEADER_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_HEADER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_HEADER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_HEADER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_HEADER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the read/write operation in privileged mode for KMS_DataStorage
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_KMS_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_KMS_START 0x08028000UL
+#define SFU_PROTECT_MPU_KMS_SREG  0xE7U               /*!< 32 Kbytes / 8 * 2 ==> 8 Kbytes */
+#define SFU_PROTECT_MPU_KMS_SIZE  MPU_REGION_SIZE_32KB
+#define SFU_PROTECT_MPU_KMS_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_KMS_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_KMS_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_KMS_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_KMS_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 6 - Forbid all access to the DMA IPs
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_DMA_RGNV  MPU_REGION_NUMBER6
+#define SFU_PROTECT_MPU_DMA_START 0x40020000UL
+#define SFU_PROTECT_MPU_DMA_SREG  0xC0U               /*!< 4 Kbytes / 8 * 6 ==> 3 Kbytes */
+#define SFU_PROTECT_MPU_DMA_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_DMA_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_DMA_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_DMA_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_DMA_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_DMA_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+/**
+  */
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 2 - Enable the execution for the SBSFU and active slots in unprivileged mode.
+  *                   Read only capability configured
+  *                   Execution capability enabled
+  *                   Execution capability restricted by other regions (secure)
+  *                   From 0x08000000 ==> 0x0803FFFF (256 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define APP_PROTECT_MPU_FLASHEXE_START FLASH_BASE
+#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_256KB
+#define APP_PROTECT_MPU_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the read/write operations for the blob download slots in unprivileged mode.
+  *                   Read/write capability configured
+  *                   Execution capability disabled
+  *                   From 0x08002800U ==>  0x08002FFF (2 kbytes)
+  */
+#define APP_PROTECT_MPU_BLOB_DWL_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_BLOB_DWL_START SLOT_BLOB_DWL_1_START
+#define APP_PROTECT_MPU_BLOB_DWL_SIZE  MPU_REGION_SIZE_2KB
+#define APP_PROTECT_MPU_BLOB_DWL_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_BLOB_DWL_PERM  MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_BLOB_DWL_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_BLOB_DWL_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_BLOB_DWL_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_BLOB_DWL_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define APP_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define APP_PROTECT_MPU_SRAM_FLAG_START 0x20000C00UL
+#define APP_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_256B
+#define APP_PROTECT_MPU_SRAM_FLAG_SREG  0x7FU                /*!< 256 bytes / 8 * 1 ==> 32 bytes */
+#define APP_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
+  * @{
+  */
+#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOC_CLK_ENABLE()
+#define RTC_TAMPER_ID                      RTC_TAMPER_1
+#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
+  * @{
+  */
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
+  * @{
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
+  * @{
+  */
+typedef enum
+{
+  SFU_RESET_UNKNOWN = 0x00U,
+  SFU_RESET_WDG_RESET,
+  SFU_RESET_LOW_POWER,
+  SFU_RESET_HW_RESET,
+  SFU_RESET_BOR_RESET,
+  SFU_RESET_SW_RESET,
+  SFU_RESET_OB_LOADER,
+} SFU_RESET_IdTypeDef;
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
+  * @{
+  */
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
+                                                                            separate section to support PCRoP */
+#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
+#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
+                                                                            Std Protections cannot be
+                                                                            added/removed/modified */
+#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
+                                                                            boot in bank1! */
+
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
+#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
+#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
+#define SFU_RUNTIME_PROTECTION_GTZC          ((uint32_t)0x00010000U)   /*!< GTZC protection */
+#define SFU_RUNTIME_PROTECTION_C2SWDBG       ((uint32_t)0x00020000U)   /*!< CPU2 Software Debug */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
+                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
+                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
+                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | \
+                                             SFU_RUNTIME_PROTECTION_TEMP_MONITOR  | \
+                                             SFU_RUNTIME_PROTECTION_GTZC          | \
+                                             SFU_RUNTIME_PROTECTION_C2SWDBG)
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
+
+/* Exported functions ------------------------------------------------------- */
+#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
+/*!<SFU Redirect of RTC Tamper Event Callback*/
+#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+#define SFU_CALLBACK_GTZC_TZIC(void) HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
+void               SFU_LL_SECU_ClearResetSources(void);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+#ifdef SFU_DMA_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+#ifdef SFU_DAP_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#if defined(SFU_MPU_PROTECT_ENABLE)
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_CheckProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
new file mode 100644
index 00000000..71bd8e65
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SB application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu_common.h"
+
+/**
+  * Optional Features Software Configuration
+  */
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_MPU_PROTECT_ENABLE         /*!< MPU protection:
+                                            Enables/Disables the MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION     /*!< MPU protection during UserApp execution : Only Active Slot 2 considered as
+                                            an executable area */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h
new file mode 100644
index 00000000..7a49bd99
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+#include "stm32wlxx_nucleo.h"
+#include "sfu_def.h"
+#include "app_sfu.h"
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep);
+void SFU_EXCPT_Security_Error(void);
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
new file mode 100644
index 00000000..b9458efe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/**
+  * @brief  SB Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SB Flow Control : Steps definition
+  */
+
+#define FLOW_STEP_C2BOOT 0x00006787U             /*!< Step C2OPT and SBRV value */
+
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0002cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+#define FLOW_STEP_C2_DDS 0x00003befU             /*!< Step DDS value */
+#else
+#define FLOW_STEP_C2_DDS 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+/**
+  * @brief  SB Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_C2BOOT (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_C2BOOT)
+#define FLOW_CTRL_UBE (FLOW_CTRL_C2BOOT ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_C2_DDS (FLOW_CTRL_WRP ^ FLOW_STEP_C2_DDS)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_C2_DDS ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SB Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
+#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
+
+/**
+  * @brief  SB Flow Control : Exported macro
+  */
+#if defined(MAIN_C)
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+#else
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+#endif /* MAIN_C */
+
+/* Control with STEP operation :
+ * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+ */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+      SFU_EXCPT_Security_Error();\
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
new file mode 100644
index 00000000..e738ec01
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
@@ -0,0 +1,227 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_C2_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C2_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C2_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Bank 1, Area B  used to protect Vector Table */
+#define SFU_C1_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAB)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C1_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_C1_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C1_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_C1_AREA_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area (without bit banding region) in
+  *                   unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB Full area in unprivileged mode.
+  *                   Read only capability configured
+  *                   from 0x08000000 ==> 0x080027FF (10 Kbytes)
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START M4_SB_REGION_ROM_START
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_16KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0xE0U    /*!< 16 Kbytes / 8 * 5 ==> 10 Kbytes */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Forbid all access to the active slot.
+  *                   From 0x08003000 ==> 0x08003FFF (4 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_APP_FLASHEXE_START SLOT_ACTIVE_2_START
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Forbid all access to the active slot.
+  *                   In addition to region 3, from 0x08004000 ==> 0x0801BFFF (96 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START FLASH_BASE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_128KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG  0x81U    /*!< 128 Kbytes / 8 * 6 ==> 96 Kbytes */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define SFU_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
+#define SFU_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
+#define SFU_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
+#define SFU_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 3 - Enable the execution for the active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   from 0x08003000 ==> 0x08003FFF (4 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_FLASHEXE_START SLOT_ACTIVE_2_START
+#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_4KB
+#define APP_PROTECT_MPU_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the execution for active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   In addition to region 3, from 0x08004000 ==> 0x0801BFFF (96 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_START FLASH_BASE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_128KB
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x81U    /*!< 128 Kbytes / 8 * 6 ==> 80 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. */
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_WRP)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP  | \
+                                             SFU_RUNTIME_PROTECTION_DMA )
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02)     /*!< Third configuration */
+
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..8fff5bd0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+#define HAL_GTZC_MODULE_ENABLED
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..4a4b906b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
@@ -0,0 +1,70 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c
new file mode 100644
index 00000000..8c7bdaaf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c
@@ -0,0 +1,307 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+#define MAIN_C
+
+#include "sfu_fwimg_regions.h"
+#include "sfu_low_level_security.h"
+#include "sfu_boot.h"
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+  __IO uint32_t *pSbsfuFlag = (__IO uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+  /* LED Init*/
+  BSP_LED_Init(LED_RED);
+
+  /* Reset the SRAM1 flag */
+  *pSbsfuFlag = SBSFU_NOT_BOOTED;
+
+  /* Configure the security features */
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_INITIAL_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  /* Boot CPU2 */
+  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
+
+  /* Wait for the flag */
+  while (*pSbsfuFlag == SBSFU_NOT_BOOTED)
+  {
+    BSP_LED_Toggle(LED_RED);
+    HAL_Delay(500U);
+  }
+  BSP_LED_Off(LED_RED);
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  /* USER CODE BEGIN 2 */
+
+  /* Check the security features once CPU2 has booted */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_SECOND_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+
+  if (*pSbsfuFlag == SBSFU_BOOTED)
+  {
+
+    /* Check the security features before jumping in the user application CPU2 */
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+    FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+    if (SFU_BOOT_CheckApplySecurityProtections(SFU_THIRD_CONFIGURATION) != SFU_SUCCESS)
+    {
+      SFU_EXCPT_Security_Error();
+    }
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+    SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+    HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+
+    jump_address = *(__IO uint32_t *)((SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET + 4));
+    /* Jump to user application */
+    p_jump_to_function = (Function_Pointer) jump_address;
+    /* Initialize user application's Stack Pointer */
+    __set_MSP(*(__IO uint32_t *)(SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET));
+
+    /* JUMP into User App */
+    p_jump_to_function();
+  }
+
+  /* We shouldn't reach this point */
+  SFU_EXCPT_Security_Error();
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE BEGIN 3 */
+
+    /* USER CODE END 3 */
+  }
+  /* USER CODE END WHILE */
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* Apply Static protections involving Option Bytes */
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(uStep);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @retval None
+  */
+void SFU_EXCPT_Security_Error(void)
+{
+  HAL_Delay(1000);
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
new file mode 100644
index 00000000..af5949de
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
@@ -0,0 +1,987 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SB Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SB security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_boot.h"
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+  /* SRAM flag access */
+  {
+    SFU_PROTECT_MPU_SRAM_FLAG_RGNV, SFU_PROTECT_MPU_SRAM_FLAG_START, SFU_PROTECT_MPU_SRAM_FLAG_SIZE,
+    SFU_PROTECT_MPU_SRAM_FLAG_PERM, SFU_PROTECT_MPU_SRAM_FLAG_EXECV, SFU_PROTECT_MPU_SRAM_FLAG_SREG,
+    SFU_PROTECT_MPU_SRAM_FLAG_TEXV, SFU_PROTECT_MPU_SRAM_FLAG_C, SFU_PROTECT_MPU_SRAM_FLAG_B
+  },
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_START, SFU_PROTECT_MPU_APP_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_C, SFU_PROTECT_MPU_APP_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B
+  },
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                      FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                    FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  FLASH_OBProgramInitTypeDef sfu_flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_BoolTypeDef is_current_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA  **********/
+  flash_option_bytes.WRPArea     = SFU_C1_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+  sfu_flash_option_bytes.WRPArea = SFU_C2_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&sfu_flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckC2BootConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+    if (SFU_LL_SECU_CheckProtectionBootLock(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set C2 Boot configuration **********************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetC2BootConfiguration(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* C2OPT and SBRV cannot be written if C2BOOT_LOCK = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+
+    /* Check/Set Boot Lock configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionBootLock(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes,
+                                                  &is_protection_to_be_applied);
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply C2 DDS *****************************************************/
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* DDS cannot be written if ESE = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+
+  /* Lock the Options Bytes ***************************************************/
+  HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  SFU_ProtectionTypeDef expected_runtime_protection = SFU_PROTECTIONS_NONE;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  if (runtime_protection != expected_runtime_protection)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check C2 boot configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2OPT and SBRV ***********************************************/
+  if ((psFlashOptionBytes->C2BootRegion == OB_C2_BOOT_FROM_FLASH)&&
+      (psFlashOptionBytes->C2SecureBootVectAddr == SFU_C2_BOOT_BASE_ADDR))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply C2 boot configuration.
+  * @note   C2OPT and SBRV can only be accessed by software when C2BOOT_LOCK = 0.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckC2BootConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_BOOT_VECT;
+    psFlashOptionBytes->C2BootRegion            = OB_C2_BOOT_FROM_FLASH;
+    psFlashOptionBytes->C2SecureBootVectAddr    = SFU_C2_BOOT_BASE_ADDR;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Boot Lock configuration */
+  if (SFU_LL_SECU_CheckProtectionBootLock(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    /* Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                               FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if ((psSbFlashOptionBytes->WRPStartOffset == SFU_C1_PROTECT_WRP_PAGE_START) ||
+      (psSbFlashOptionBytes->WRPEndOffset   == SFU_C1_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if ((psSfuFlashOptionBytes->WRPStartOffset == SFU_C2_PROTECT_WRP_PAGE_START) ||
+      (psSfuFlashOptionBytes->WRPEndOffset   == SFU_C2_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                             FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if (SFU_LL_SECU_CheckProtectionWRP(psSbFlashOptionBytes, psSfuFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psSbFlashOptionBytes->OptionType      = OPTIONBYTE_WRP;
+    psSbFlashOptionBytes->WRPArea         = SFU_C1_PROTECT_WRP_AREA;
+    psSbFlashOptionBytes->WRPStartOffset  = SFU_C1_PROTECT_WRP_PAGE_START;
+    psSbFlashOptionBytes->WRPEndOffset    = SFU_C1_PROTECT_WRP_PAGE_END;
+
+    if (HAL_FLASHEx_OBProgram(psSbFlashOptionBytes) == HAL_OK)
+    {
+      psSfuFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+      psSfuFlashOptionBytes->WRPArea        = SFU_C2_PROTECT_WRP_AREA;
+      psSfuFlashOptionBytes->WRPStartOffset = SFU_C2_PROTECT_WRP_PAGE_START;
+      psSfuFlashOptionBytes->WRPEndOffset   = SFU_C2_PROTECT_WRP_PAGE_END;
+
+      if (HAL_FLASHEx_OBProgram(psSfuFlashOptionBytes) == HAL_OK)
+      {
+        *pbIsProtectionToBeApplied |= 1U;
+        e_ret_status = SFU_SUCCESS;
+        /* Execution stopped if flow control failed */
+        FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+      }
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS **********************************************************/
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    /* System Security Configuration failed: Sub-GHz radio SPI security access is incorrect */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /*  modify executable region for executing UserAPP*/
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  modify executable region for executing UserAPP */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_ADJUST_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_ADJUST_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_ADJUST_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  return e_ret_status;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint8_t mpu_region_num = 0U; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return e_ret_status;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  assert_param(SFU_IS_FUNCTIONAL_STATE(eState));
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the slot #0
+     */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr != SFU_SECURE_FLASH_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr != SFU_HIDE_PROTECTION_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr != SFU_SECURE_SRAM1_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr != SFU_SECURE_SRAM2_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..0b9986c2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,94 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_msp.c
+  * @author  MCD Application Team
+  * @brief   This file provides code for the MSP Initialization
+  *          and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+  /* CM4 only: Set Interrupt Group Priority */
+  HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
+
+  /* System interrupt init*/
+  /* CM4 only: MemoryManagement_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(MemoryManagement_IRQn, 0U, 0U);
+  /* CM4 only: BusFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(BusFault_IRQn, 0U, 0U);
+  /* CM4 only: UsageFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(UsageFault_IRQn, 0U, 0U);
+  /* CM4 only: DebugMonitor_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DebugMonitor_IRQn, 0U, 0U);
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0U, 0U);
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..7a3565e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
@@ -0,0 +1,198 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  HAL_IncTick();
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
new file mode 100644
index 00000000..2419351c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
@@ -0,0 +1,109 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu_common.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_COMMON_H
+#define APP_SFU_COMMON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/**
+  * Optional Features Software Configuration
+  */
+#define CM4_SBFU_BOOT_FLAG_ADDRESS M4_M0PLUS_FLAG_RAM_START /*!< address of the M4/M0+ synchronization flag (unused RAM) */
+#define SBSFU_NOT_BOOTED           0xFFFF               /*!< M0+ SBSFU hasn't finished its boot */
+#define SBSFU_BOOTED               0xAAAA               /*!< M0+ SBSFU boot is over: the M4 UserApp can be started */
+/* The define below allows disabling all security IPs at once.
+ *
+ * Enabled: all security IPs (WRP, watchdog...) are disabled.
+ * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
+ *
+ */
+
+/*#define SECBOOT_DISABLE_SECURITY_IPS*/  /*!< Disable all security IPs at once when activated */
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_WRP_PROTECT_ENABLE
+#define SFU_DAP_PROTECT_ENABLE         /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
+                                            It might be difficult to reconnect the Debugger.*/
+#define SFU_DMA_PROTECT_ENABLE
+#define SFU_C2_DDS_PROTECT_ENABLE      /*!< Static disabling of the CPU2 debug */
+#define SFU_SECURE_USER_PROTECT_ENABLE /*!< Only accessible in Secure access mode,
+                                          the Secure user software is stored in the secure user memory, a configurable
+                                          protected area which is part of the user main memory. */
+
+/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
+                                                 steps.
+                                                 When enabling this lock, Static protections cannot be modified any more
+                                                 and Debug is finally disabled. */
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+/**
+  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
+  * This define is taken into account only if RDP level 2 is not set.
+  * If RDP level 2 is set no modification can be done anyway.
+  *
+  * Enabled: Option Bytes Development Mode enabled.
+  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
+  *          If an OB is not set though it should be then this setting is automatically corrected.
+  *          This applies only as long as RDP level 2 is not set.
+  *
+  * Disabled: Option Bytes Development Mode disabled.
+  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
+              the first time.
+  *           SB_SFU checks the Option Bytes configuration but does not correct it.
+  *           If a problem is detected an error message is reported and the execution stops.
+  */
+#define SECBOOT_OB_DEV_MODE
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_SECURE_FLASH_START    SLOT_ACTIVE_1_START              /*!< Secure Flash start address: SFSA[6:0] */
+#define SFU_SECURE_SRAM1_START    0x1F                             /*!< Secure non-Backup SRAM1 start address:
+                                                                        SNBRSA[4:0]. 0x1F configures an entirely
+                                                                        non-secure SRAM1. */
+#define SFU_SECURE_SRAM2_START    SRAM2_BASE                       /*!< Secure Backup SRAM2 start address: SBRSA[4:0] */
+#define SFU_HIDE_PROTECTION_START SE_KEY_REGION_ROM_START          /*!< Hide Protection area start address:
+                                                                        HDPSA[6:0] */
+#define SFU_HIDE_PROTECTION_CFG OB_SECURE_HIDE_PROTECTION_ENABLE   /*!< Hide Protection area start address:
+                                                                        HDPSA[6:0] */
+
+/*!< Secure mode activated or deactivated */
+#define SFU_SECURE_MODE           (OB_SECURE_SYSTEM_AND_FLASH_ENABLE | \
+                                   SFU_HIDE_PROTECTION_CFG           | \
+                                   OB_SECURE_SRAM1_DISABLE           | \
+                                   OB_SECURE_SRAM2_ENABLE)
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_COMMON_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_def.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_def.h
new file mode 100644
index 00000000..3dc4df82
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_def.h
@@ -0,0 +1,94 @@
+/**
+  ******************************************************************************
+  * @file    sfu_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains the general definitions for SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_DEF_H
+#define SFU_DEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU Error Typedef
+  */
+typedef enum
+{
+  SFU_ERROR = 0x00001FE1U,
+  SFU_SUCCESS = 0x00122F11U
+} SFU_ErrorStatus;
+
+/* Exported constants --------------------------------------------------------*/
+
+#define SFU_RAM_BASE             ((uint32_t) SE_REGION_RAM_START)
+#define SFU_RAM_END              ((uint32_t) SB_REGION_RAM_END)
+#define SFU_SB_RAM_BASE          ((uint32_t) SB_REGION_RAM_START)
+#define SFU_SB_RAM_END           ((uint32_t) SB_REGION_RAM_END)
+
+
+#ifdef CORE_CM0PLUS
+#define SFU_BOOT_BASE_ADDR       ((uint32_t) INTVECT_START)           /* SFU Boot Address */
+#else /* CORE_CM0PLUS */
+#define SFU_C2_BOOT_BASE_ADDR    ((uint32_t) INTVECT_START)           /* SFU Boot Address */
+#define SFU_C2_AREA_ADDR_END     ((uint32_t) SE_KEY_REGION_ROM_END)   /* SBSFU end Address (covering all the SBSFU
+                                                                         executable code and the related keys) */
+#define SFU_C1_BOOT_BASE_ADDR    ((uint32_t) M4_SB_REGION_ROM_START)  /* SB Boot Address */
+#define SFU_C1_AREA_ADDR_END     ((uint32_t) M4_SB_REGION_ROM_END)    /* SB end Address (covering all the SB
+                                                                         executable code */
+#endif /* CORE_CM0PLUS */
+#define SFU_ROM_ADDR_START       ((uint32_t) SE_IF_REGION_ROM_START)  /* SBSFU base Address */
+
+#define SFU_ROM_ADDR_END         ((uint32_t) SE_KEY_REGION_ROM_END)   /* SBSFU end Address (covering all the SBSFU
+                                                                         executable code and the related keys) */
+
+#define SFU_SENG_ROM_ADDR_START  ((uint32_t) SE_CODE_REGION_ROM_START)/* Secure Engine area address START */
+#define SFU_SENG_ROM_ADDR_END    ((uint32_t) SE_CODE_REGION_ROM_END)  /* Secure Engine area address END - SE includes
+                                                                         everything up to the License */
+#define SFU_SENG_ROM_SIZE        ((uint32_t) (SFU_SENG_ROM_ADDR_END - \
+                                              SFU_SENG_ROM_ADDR_START + 1U)) /* Secure Engine area size */
+
+#define SFU_KEYS_ROM_ADDR_START  ((uint32_t) SE_KEY_REGION_ROM_START) /* Keys Area (Keys + Keys Retrieve function)
+                                                                         START. This is the PCRoP Area */
+#define SFU_KEYS_ROM_ADDR_END    ((uint32_t) SE_KEY_REGION_ROM_END)   /* Keys Area (Keys + Keys Retrieve function) END.
+                                                                         This is the PCRoP Area */
+
+#define SFU_SENG_RAM_ADDR_START  ((uint32_t) SE_REGION_RAM_START)   /* Secure Engine reserved RAM2 area START
+                                                                       address */
+#define SFU_SENG_RAM_ADDR_END    ((uint32_t) SE_REGION_RAM_END)     /* Secure Engine reserved RAM2 area END address */
+#define SFU_SENG_RAM_SIZE        ((uint32_t) (SFU_SENG_RAM_ADDR_END - \
+                                              SFU_SENG_RAM_ADDR_START + 1U)) /* Secure Engine reserved RAM area SIZE */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_DEF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
new file mode 100644
index 00000000..6ec983e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
@@ -0,0 +1,111 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_regions.h
+  * @author  MCD Application Team
+  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_REGIONS_H
+#define SFU_FWIMG_REGIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "se_crypto_config.h"
+
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  *  Slot list : 2 slots per image configuration + swap
+  */
+#define NB_SLOTS      6U
+#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
+#define SLOT_ACTIVE_1 1U
+#define SLOT_ACTIVE_2 2U
+#define SLOT_DWL_1    3U
+#define SLOT_DWL_2    4U
+#define SLOT_SWAP     5U
+
+/* Calculation of the size of a slot */
+#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
+
+/*
+ * Design constraint: the image slot size must be a multiple of the swap area size.
+ * And of course both image slots must have the same size.
+ */
+#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
+
+/*
+ * Checking that the slot sizes are consistent with the .icf file
+ * Sizes expressed in bytes (+1 because the end address belongs to the slot)
+ * The checks are executed at runtime in the SFU_Img_Init() function.
+ */
+#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
+
+/**
+  * Image starting offset to add to the  address of 1st block
+  */
+#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
+
+
+/* External variables --------------------------------------------------------*/
+extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
+extern const uint32_t  SlotStartAdd[NB_SLOTS];
+extern const uint32_t  SlotEndAdd[NB_SLOTS];
+
+#if  (defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C))
+
+const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
+                                            SLOT_ACTIVE_1_HEADER,
+                                            SLOT_ACTIVE_2_HEADER,
+                                            SLOT_BLOB_DWL_1_START,
+                                            0U,
+                                            0U,
+                                          };
+/* List of slot start address */
+const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
+                                            SLOT_ACTIVE_1_START,
+                                            SLOT_ACTIVE_2_START,
+                                            SLOT_BLOB_DWL_1_START,
+                                            0U,
+                                            0U,
+                                          };
+/* List of slot end address */
+const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
+                                            SLOT_ACTIVE_1_END,
+                                            SLOT_ACTIVE_2_END,
+                                            SLOT_BLOB_DWL_1_END,
+                                            0U,
+                                            0U,
+                                          };
+#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_REGIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
new file mode 100644
index 00000000..783cd4b0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>7.10.3.6927</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
new file mode 100644
index 00000000..acdc2a33
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM0PLUS\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM0PLUS\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM0PLUS\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>CORE_CM0PLUS</state>
+                    <state>KMS_ENABLED</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\Core\Inc</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\App</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+                    <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$\se_interface_appli.o"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state>$PROJ_DIR$.\..\..\2_Images_SECoreBin\EWARM\SE_Core.bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM0PLUS_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>Core</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
+        <group>
+            <name>SBSFU</name>
+            <group>
+                <name>App</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_loader.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_boot.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_com_loader.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_com_trace.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_error.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_mpu_isolation.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_test.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_common.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_new_image.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_kms.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_interface_crypto_scheme.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Target</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash_int.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash_ext.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_security.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\sfu_se_mpu.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+    </group>
+        <group>
+          <name>Middlewares</name>
+          <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
+            </file>
+          </group>
+          <group>
+            <name>STM32_Key_Management_Services</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
new file mode 100644
index 00000000..7ae4eb3c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
@@ -0,0 +1,1136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM4\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM4\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM4\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM4/Inc</state>
+                    <state>$PROJ_DIR$/../../2_Images_SECoreBin/Inc</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM4_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_it.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_low_level_security.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_hsem.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
new file mode 100644
index 00000000..3d66e556
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\CM4.ewp</path>
+  </project>
+  <project>
+    <path>$WS_DIR$\CM0PLUS.ewp</path>
+  </project>
+  <batchBuild />
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
new file mode 100644
index 00000000..08e10787
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
@@ -0,0 +1,65 @@
+;/******************************************************************************
+;* File Name          : sfu_se_mpu.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;*  @attention
+;* 
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;* 
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;* 
+;*******************************************************************************
+;
+;
+; Cortex-M version
+;
+        SECTION .text:CODE:NOROOT:REORDER(2)
+        EXPORT SVC_Handler, jump_to_function, launch_application
+SVC_Handler
+        IMPORT MPU_SVC_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+jump_to_function
+        ; assume R1 R2 are useless
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+launch_application
+        ; return from exception to application launch function
+        ; R0: application vector address
+        ; R1: exit function address
+        ; push interrupt context R0 R1 R2 R3 R12 LR PC xPSR
+        ;MOV R2, #0x01000000 ; xPSR activate Thumb bit
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} ; FLAGS=0
+        MOVS R2, #1
+        BICS R1, R1, R2  ; clear least significant bit of exit function
+        PUSH {R1}  ; return address = application entry point
+        MOVS R1, #0 ; clear other context registers
+        PUSH {R1} ; LR =0
+        PUSH {R1} ; R12 =0
+        PUSH {R1} ; R3 = 0
+        PUSH {R1} ; R2 = 0
+        PUSH {R1} ; R1 = 0
+        ; set R0 to application entry point
+        PUSH {R0} ; R0 = application entry point
+        ; set LR to return to thread mode with main stack
+        ;MOV LR, #0xFFFFFFF9
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        ; return from interrupt
+        BX LR
+      
+        END
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
new file mode 100644
index 00000000..b8446db6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
@@ -0,0 +1,40 @@
+show SE_APP_GetActiveFwInfo
+show SE_APP_SVC_Handler
+show SE_SYS_SaveDisableIrq
+show SE_SYS_RestoreEnableIrq
+show SE_KMS_Initialize
+show SE_KMS_Finalize
+show SE_KMS_GetInfo
+show SE_KMS_GetFunctionList
+show SE_KMS_GetSlotList
+show SE_KMS_GetSlotInfo
+show SE_KMS_GetTokenInfo
+show SE_KMS_GetMechanismInfo
+show SE_KMS_OpenSession
+show SE_KMS_CloseSession
+show SE_KMS_CreateObject
+show SE_KMS_DestroyObject
+show SE_KMS_GetAttributeValue
+show SE_KMS_SetAttributeValue
+show SE_KMS_FindObjectsInit
+show SE_KMS_FindObjects
+show SE_KMS_FindObjectsFinal
+show SE_KMS_EncryptInit
+show SE_KMS_Encrypt
+show SE_KMS_EncryptUpdate
+show SE_KMS_EncryptFinal
+show SE_KMS_DecryptInit
+show SE_KMS_Decrypt
+show SE_KMS_DecryptUpdate
+show SE_KMS_DecryptFinal
+show SE_KMS_DigestInit
+show SE_KMS_Digest
+show SE_KMS_DigestUpdate
+show SE_KMS_DigestFinal
+show SE_KMS_SignInit
+show SE_KMS_Sign
+show SE_KMS_VerifyInit
+show SE_KMS_Verify
+show SE_KMS_DeriveKey
+show SE_KMS_GenerateKeyPair
+show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..5a0e4ad5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,30 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x1A00;
+define symbol __ICFEDIT_size_heap__ = 0;
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section SE_CORE_Bin };
+place in SE_IF_ROM_region {section .SE_IF_Code};
+place in SB_ROM_region    { readonly };
+place in SB_RAM_region    { readwrite, block CSTACK, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..16046813
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,29 @@
+/*###ICF### Set of symbols used in M4 SB ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x200;
+define symbol __ICFEDIT_size_heap__ = 0x100;
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_M4_SB_region_ROM_start__ { readonly section .intvec };
+place in M4_SB_ROM_region   { readonly };
+place in M4_SB_RAM_region   { readwrite,
+                              block CSTACK, block HEAP };
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
new file mode 100644
index 00000000..93fe9354
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
@@ -0,0 +1,901 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>sfu_se_mpu.s</PathWithFileName>
+      <FilenameWithoutPath>sfu_se_mpu.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>se_core_bin.s</PathWithFileName>
+      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_boot.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_com_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_com_trace.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_error.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_kms.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_mpu_isolation.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_new_image.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_new_image.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_test.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
new file mode 100644
index 00000000..394b8357
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
@@ -0,0 +1,710 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo_CM0PLUS\Exe\</OutputDirectory>
+          <OutputName>SBSFU</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments></TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-Wno-format</MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM0PLUS/Core/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../CM0PLUS/Core/Inc;../CM0PLUS/SBSFU/App;../CM0PLUS/SBSFU/Target;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SBSFU_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--symdefs=se_interface_appli.txt
+--keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_se_mpu.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>sfu_se_mpu.s</FilePath>
+            </File>
+            <File>
+              <FileName>se_core_bin.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>se_core_bin.s</FilePath>
+            </File>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/App</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_boot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_boot.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_com_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_error.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_error.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_interface_crypto_scheme.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_kms.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_mpu_isolation.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_new_image.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_test.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_bootloader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="CM0PLUS"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
new file mode 100644
index 00000000..28c068d4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_hsem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
new file mode 100644
index 00000000..ae7d4aed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
@@ -0,0 +1,564 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>STM32WL55JC_Nucleo_CM4\Exe\</OutputDirectory>
+          <OutputName>SB</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>0</hadIROM>
+            <hadIRAM>0</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>1</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>0</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>0</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>0</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM4/Inc;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SB_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_hsem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="CM4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
new file mode 100644
index 00000000..0dc4693b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectWorkspace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_mpw.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <WorkspaceName></WorkspaceName>
+
+  <project>
+    <PathAndName>.\CM4.uvprojx</PathAndName>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+  <project>
+    <PathAndName>.\CM0PLUS.uvprojx</PathAndName>
+    <NodeIsActive>1</NodeIsActive>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+</ProjectWorkspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
new file mode 100644
index 00000000..49d5b3cf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
@@ -0,0 +1,48 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+; *** regions needed by SBSFU project ***
+
+LR_KMS_DataStorage KMS_DATASTORAGE_START KMS_DATASTORAGE_SIZE {
+  ER_KMS_DataStorage KMS_DATASTORAGE_START FILL 0X00000000 KMS_DATASTORAGE_SIZE {
+  }
+}
+
+LR_IF SE_IF_REGION_ROM_START SE_IF_ROM_REGION_SIZE {
+  ER_IF SE_IF_REGION_ROM_START SE_IF_ROM_REGION_SIZE {
+  se_interface_application.o (+RO)
+  se_interface_bootloader.o (+RO)
+  se_interface_common.o (+RO)
+  se_interface_kms.o (+RO)
+  }
+}
+
+LR_SB SB_REGION_ROM_START SB_ROM_REGION_SIZE {  
+  ER_SB SB_REGION_ROM_START SB_ROM_REGION_SIZE {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  SB_RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  .ANY (STACK)
+  .ANY (HEAP)
+  }
+}
+
+LR_ROM_Vector INTVECT_START VECTOR_SIZE {
+  vector_start INTVECT_START VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+}
+
+LR_SE SE_CODE_REGION_ROM_START SE_ROM_REGION_SIZE {
+  ER_SE SE_CODE_REGION_ROM_START SE_ROM_REGION_SIZE {
+  *(SE_CORE_Bin)
+  }
+}
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
new file mode 100644
index 00000000..253a0369
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
@@ -0,0 +1,21 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+; *** regions needed by SBSFU project ***
+LR_SB M4_SB_REGION_ROM_START M4_SB_ROM_REGION_SIZE {  
+  ER_SB M4_SB_REGION_ROM_START M4_SB_ROM_REGION_SIZE {
+   *.o (RESET, +First)
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  SB_RAM_region M4_SB_REGION_RAM_START M4_SB_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  .ANY (STACK)
+  .ANY (HEAP)
+  }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
new file mode 100644
index 00000000..c4321d77
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
@@ -0,0 +1,23 @@
+/******************************************************************************/
+/* STM32WL_cm0plus.INI: CM0 CPU Initialization File                                           
+/******************************************************************************/
+/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
+/* * All rights reserved.</center>*/
+/*  *
+/*  * This software component is licensed by ST under BSD 3-Clause license,*/
+/*  * the "License"; You may not use this file except in compliance with the */
+/*  * License. You may obtain a copy of the License at:*/
+/*  *                        opensource.org/licenses/BSD-3-Clause*/
+/*  *
+/*  ****************************************************************************/
+/******************************************************************************/
+
+FUNC void Setup (void) {
+  SP = _RDWORD(0x8036800);          // Setup Stack Pointer
+  PC = _RDWORD(0x8036804);          // Setup Program Counter
+   
+}
+
+Setup();                             // Setup for Running
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
new file mode 100644
index 00000000..ca5958f1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
@@ -0,0 +1,20 @@
+;/******************************************************************************
+;* File Name          : se_core_bin.s
+;* Author             : MCD Application Team
+;* Description        : Include SECoreBin binary.
+;********************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;******************************************************************************
+;
+;
+ AREA SE_CORE_Bin, CODE, READONLY
+ INCBIN .\..\..\2_Images_SECoreBin\MDK-ARM\STM32WL55JC_Nucleo\Exe\SECoreBin.bin
+ END
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
new file mode 100644
index 00000000..7355fbb5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
@@ -0,0 +1,71 @@
+;*******************************************************************************
+;* File Name          : sfu_se_mpu.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;*******************************************************************************
+;
+;
+; Cortex-M version
+;
+      PRESERVE8
+      THUMB
+      AREA    |.text|, CODE, READONLY
+ 
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT MPU_SVC_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+      AREA    |.SB_HDP_Code|, CODE, READONLY
+      EXPORT jump_to_function
+jump_to_function
+        ; assume R1 R2 are useless
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+      EXPORT launch_application
+launch_application
+        ; return from exception to application launch function
+        ; R0: application vector address
+        ; R1: exit function address
+        ; push interrupt context R0 R1 R2 R3 R12 LR PC xPSR
+        ;MOV R2, #0x01000000 ; xPSR activate Thumb bit
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} ; FLAGS=0
+        MOVS R2, #1
+        BICS R1, R1, R2  ; clear least significant bit of exit function
+        PUSH {R1}  ; return address = application entry point
+        MOVS R1, #0 ; clear other context registers
+        PUSH {R1} ; LR =0
+        PUSH {R1} ; R12 =0
+        PUSH {R1} ; R3 = 0
+        PUSH {R1} ; R2 = 0
+        PUSH {R1} ; R1 = 0
+        ; set R0 to application entry point
+        PUSH {R0} ; R0 = application entry point
+        ; set LR to return to thread mode with main stack
+        ;MOV LR, #0xFFFFFFF9
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        ; return from interrupt
+        BX LR
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
new file mode 100644
index 00000000..c30ae114
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1597224213341</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.launch</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
new file mode 100644
index 00000000..e80af641
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SBSFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../CM0PLUS/SBSFU/App | ../../../CM0PLUS/SBSFU/Target | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM0PLUS.null.839446873" name="2_Images_SBSFU_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1415671833;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1687290193">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
new file mode 100644
index 00000000..53dc73d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/se_interface_kms.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_bootloader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_common.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_boot.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_boot.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_loader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_error.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_error.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_fwimg_common.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_fwimg_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_interface_crypto_scheme.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_kms.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_loader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_mpu_isolation.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_new_image.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_test.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_test.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash_ext.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash_int.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
new file mode 100644
index 00000000..1f567ea5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file      sfu_se_mpu.s
+  * @author    MCD Application Team
+  * @brief     Wrapper for SE isolation with MPU.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+        .section  .text,"ax",%progbits
+        .syntax unified
+        .weak  MPU_SVC_Handler
+        .global SVC_Handler
+        .type  SVC_Handler, %function
+SVC_Handler:
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+        .section  .RamFunc,"ax",%progbits       
+        .global jump_to_function
+jump_to_function:
+        /* assume R1 R2 are useless */
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+        .global launch_application
+launch_application:
+        /* return from exception to application launch function */
+        /* R0: application vector address */
+        /* R1: exit function address */
+        /* push interrupt context R0 R1 R2 R3 R12 LR PC xPSR */
+        /* MOV R2, #0x01000000 ; xPSR activate Thumb bit */
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} /* FLAGS=0 */
+        MOVS R2, #1
+        BICS R1, R1, R2  /* clear least significant bit of exit function */
+        PUSH {R1}  /* return address = application entry point */
+        MOVS R1, #0 /* clear other context registers */
+        PUSH {R1} /* LR =0 */
+        PUSH {R1} /* R12 =0 */
+        PUSH {R1} /* R3 = 0 */
+        PUSH {R1} /* R2 = 0 */
+        PUSH {R1} /* R1 = 0 */
+        /* set R0 to application entry point */
+        PUSH {R0} /* R0 = application entry point */
+        /* set LR to return to thread mode with main stack */
+        /* MOV LR, #0xFFFFFFF9 */
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        /* return from interrupt */
+        BX LR
+.end
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
new file mode 100644
index 00000000..3a556990
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    sfu_secorebin_inc.c
+  * @author  MCD Application Team
+  * @brief   Include SECoreBin binary.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+
+#if defined (__GNUC__)
+asm(".section SE_CORE_Bin,\"a\";"
+                             ".incbin \"../../2_Images_SECoreBin/STM32CubeIDE/Debug/SECoreBin.bin\";"
+);
+#endif 
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_BFU/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
new file mode 100644
index 00000000..164c4ed1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SECoreBin.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SECoreBin&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161&quot;,&quot;fPerformBuild&quot;:false,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="8000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SBSFU.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM0PLUS"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM0PLUS"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
new file mode 100644
index 00000000..51b33c92
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
@@ -0,0 +1,163 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0;                /* required amount of heap  */
+_Min_Stack_Size = 0x1A00;          /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_IF_Code : { KEEP(*se_interface_application.o (.text .text*))
+                  KEEP(*se_interface_bootloader.o (.text .text*))
+                  KEEP(*se_interface_common.o (.text .text*))
+                  KEEP(*se_interface_kms.o (.text .text*))
+  } >SE_IF_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SB_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SB_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SB_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >INTVECT_ROM_region
+  
+  SE_CORE_Bin :
+  {
+    KEEP(*(SE_CORE_Bin));
+  } > SE_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SB_RAM_region AT>SB_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
new file mode 100644
index 00000000..05aa5e0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
@@ -0,0 +1,40 @@
+SE_APP_GetActiveFwInfo
+SE_APP_SVC_Handler
+SE_SYS_SaveDisableIrq
+SE_SYS_RestoreEnableIrq
+SE_KMS_Initialize
+SE_KMS_Finalize
+SE_KMS_GetInfo
+SE_KMS_GetFunctionList
+SE_KMS_GetSlotList
+SE_KMS_GetSlotInfo
+SE_KMS_GetTokenInfo
+SE_KMS_GetMechanismInfo
+SE_KMS_OpenSession
+SE_KMS_CloseSession
+SE_KMS_CreateObject
+SE_KMS_DestroyObject
+SE_KMS_GetAttributeValue
+SE_KMS_SetAttributeValue
+SE_KMS_FindObjectsInit
+SE_KMS_FindObjects
+SE_KMS_FindObjectsFinal
+SE_KMS_EncryptInit
+SE_KMS_Encrypt
+SE_KMS_EncryptUpdate
+SE_KMS_EncryptFinal
+SE_KMS_DecryptInit
+SE_KMS_Decrypt
+SE_KMS_DecryptUpdate
+SE_KMS_DecryptFinal
+SE_KMS_DigestInit
+SE_KMS_Digest
+SE_KMS_DigestUpdate
+SE_KMS_DigestFinal
+SE_KMS_SignInit
+SE_KMS_Sign
+SE_KMS_VerifyInit
+SE_KMS_Verify
+SE_KMS_DeriveKey
+SE_KMS_GenerateKeyPair
+SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
new file mode 100644
index 00000000..759832cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SB" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2015646735" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1427517226" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.219198562" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.717379913" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1323484811" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.358650252" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.437904655" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1049432240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM4/Inc | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core ||  ||  || USE_HAL_DRIVER | STM32WL55xx ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SB_cm4.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.857176010" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1383605403" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.758517685" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.92741657" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.261244217" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1809731028" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1152988115" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1052358781" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.209012098" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM4/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1008796121" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.189316865" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.85880463" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.964611899" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.360401545" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.974389923" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.94946969" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2140178522" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1240986986" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2113270654" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1941785021" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.483477110" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1843769445" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1745519627" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1919967923" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1803902265" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.854144635" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.438689590" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM4.null.2010752311" name="2_Images_SBSFU_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.583077904;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.583077904.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1197799154;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1116976384">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
new file mode 100644
index 00000000..dec3fb36
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU_CM4</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_hsem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
new file mode 100644
index 00000000..8d27486b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SB.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SB.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM4"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
new file mode 100644
index 00000000..92d8b68b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
@@ -0,0 +1,152 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = M4_SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;       /* required amount of heap  */
+_Min_Stack_Size = 0x200;      /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >M4_INTVECT_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >M4_SB_Code_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >M4_SB_RAM_region AT>M4_SB_Code_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >M4_SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >M4_SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt
new file mode 100644
index 00000000..9c39bcd0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt
@@ -0,0 +1,185 @@
+/**
+  @page 2_Images_SBSFU / Secure Boot and Secure Firmware Update Demo Application (Dual Core)
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows Secure Boot and Secure Firmware Update example.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
+In addition, Secure Boot (Root of Trust services) checks and activates the STM32 security mechanisms, and checks the
+authenticity and integrity of user application code before every execution to ensure that invalid or malicious code
+cannot be run. The Secure Firmware Update application receives the encrypted firmware image, decrypts it, then checks
+the authenticity and integrity of the code before installing it.
+
+The secure key management services provide cryptographic services to the user application through the pkcs11 APIs
+(KEY ID based APIs) that are executed inside a protected and isolated environment. User application keys are stored in
+the protected and isolated environment. They can be updated in a secure way (authenticity check, data decryption and
+data integrity check).
+
+This example supports multiple images feature configured with 2 active images for
+execution from internal flash and a 1-slot configuration allowing to
+maximize the user application size.
+As a consequence, some features are not available:
+* download a new firmware image from the application
+* resume firmware update procedure in case of power off during installation
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from the
+STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, SBSFU, GTZC, Dual core, MPU
+
+@par Directory contents
+
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/main.c                           Main M0+ application file
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              M0+ HAL MSP module
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c                   STM32 M0+ interrupt handlers
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h                         Hardware definition for application
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/main.h                           Header file for M0+ main.c
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h          M0+ BSP configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             M0+ HAL configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h                   Header file for M0+ stm32wlxx_it.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/Src/sfu_com_loader.c            SBSFU communication module: local loader part
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/Src/sfu_com_trace.c             SBSFU communication module: trace part
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c                     SBSFU errors management
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c              SBSFU image handling: common functionalities/services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c                       Key management service blob importation handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c                    SBSFU Local Loader
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c             Secure Engine isolation with MPU (when no Firewall is available)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c                 SBSFU image handling: new image storage and installation request
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c                      SBSFU security protection automatic test
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h                       Software configuration of M0+ SBSFU application
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h                      Header file for sfu_boot.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h                Header file for sfu_com_loader.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h                 Header file for sfu_com_trace.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h                     Header file for sfu_error.c file
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h                SBSFU FSM states definitions
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h                       Header file for sfu_kms.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h                    Header file for sfu_loader.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h             Header file for sfu_mpu_isolation.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h                 Header file for sfu_new_image.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h                      Header file for sfu_test.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h                     Header file for sfu_trace.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c              SBSFU general low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c        SBSFU flash low level interface (wrapper)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c    SBSFU external flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c    SBSFU internal flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c     SBSFU security low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h              Header file for general low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h        Header file for flash low level interface (wrapper)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h    Header external file for flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h    Header internal file for flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h     Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Src/main.c                                    Main M4 application file
+   - 2_Images_SBSFU/CM4/Src/sfu_low_level_security.c                  M4 SB security low level interface
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c                       M4 HAL MSP module
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_it.c                            STM32 M4 interrupt handlers
+   - 2_Images_SBSFU/CM4/Inc/app_sfu.h                                 Software configuration of M4 SB application
+   - 2_Images_SBSFU/CM4/Inc/main.h                                    Header file for M4 main.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_boot.h                                Definitions for Secure Boot (SB) flow control
+   - 2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h                  Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h                      M4 HAL configuration file
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h                            Header file for M4 stm32wlxx_it.c
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h                   M4 BSP configuration file
+   - 2_Images_SBSFU/Common/app_sfu_common.h                           Common software configuration of M4 SB and M0+ SBSFU applications
+   - 2_Images_SBSFU/Common/sfu_def.h                                  General definition for SBSFU application
+   - 2_Images_SBSFU/Common/sfu_fwimg_regions.h                        FLASH regions definitions for image handling
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices.
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
+   - This example needs a terminal emulator.
+   - By default, SBSFU is configured in development mode. To switch in production mode, refer to AN5056 "Integration
+     guide - software expansion for STM32Cube" available from the STMicroelectronics microcontroller website
+     www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files.
+     As a workaround, it is advised to use the subst.exe command from within a command prompt to set up a local drive
+     out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par How to use it ?
+
+Several steps to run SBSFU application :
+
+1. Compile projects in the following order. This is mandatory as each project requests some objects generated by the
+   compilation of the previous one:
+   - 2_Images_SECoreBin (see also SECoreBin/readme.txt)
+   - 2_Images_SBSFU (using both CM4 and CM0+ workspaces)
+   - 2_Images_UserApp_M0Plus (see also UserApp_M0Plus/readme.txt)
+   - 2_Images_UserApp_M4 (see also UserApp_M4/readme.txt)
+
+2. Before loading SBSFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that the
+   following are valid for the device:
+   - RDP Level 0
+   - Write Protection disabled on all FLASH pages
+   - Chip has been erased
+
+3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator that can be downloaded
+   from https://osdn.net/projects/ttssh2/) for UART connection with the board.
+   Support of YMODEM protocol is required. Serial port configuration should be :
+   - Baud rate = 115200
+   - Data = 8 bits
+   - Parity = none
+   - Stop = 1 bit
+   - Flow control = none
+
+4. Load CM4 SB image and CM0+ SBSFU image into target memory with your preferred toolchain or STM32CubeProgammer.
+
+5. Once the SB_SFU software is downloaded, power cycle the board (unplug/plug USB cable) : the SBSFU application starts
+   and configures the security mechanisms.
+
+6. Power cycle the board a second time (unplug/plug the USB cable): the SBSFU application starts with the configured
+   securities turned on and the Tera Term connection is possible.
+   Caution: Make sure to use an up-to-date version of ST-LINK firmware else SBSFU may not start.
+
+7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
+   Red LED blinks every 500 ms when waiting for the CM0+ SBSFU to boot.
+   Green LED blinks every 100 ms when CM0+ and/or CM4 firmware image(s) need(s) to be dowloaded.
+   Red LED blinks every 3 seconds when a local download is waited.
+   A reboot occurs in case of error in option bytes configuration.
+
+8. Send the first user encrypted firmware file (\1_Slot\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \1_Slot\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+9. Send the second user encrypted firmware file (\1_Slot\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \1_Slot\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
+Note2 : As TAMPER detection can be very sensitive, the protection is disabled by default.
+        Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
+Note3 : for Linux users Minicom can be used but to do so you need to compile the SBSFU project with the MINICOM_YMODEM
+        switch enabled (app_sfu.h)
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
new file mode 100644
index 00000000..1cdd8ce9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIEbzXMiF8fTUDKWWppKCHkKgLVqrhvGd96DNs11+aAyEoAoGCCqGSM49
+AwEHoUQDQgAEx1uaYDL95LOLizohUs9LXQ1Np/3uq3SX35H5rxB5KRURLRUzQ9Rm
+iYDexMr3mmUqR3QsRQmL4LJbbkCxFLq1dw==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
new file mode 100644
index 00000000..0e687f3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY2
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
new file mode 100644
index 00000000..0e687f3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY2
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin
new file mode 100644
index 00000000..020162be
Binary files /dev/null and b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin differ
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
new file mode 100644
index 00000000..91e39b0a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
new file mode 100644
index 00000000..8beac3b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
@@ -0,0 +1,1181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+          <state>KMS_ENABLED</state>
+          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
+          <state>IT_MANAGEMENT_DISABLED</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
+        <postbuild></postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>SE_CallGate</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
+      </file>
+    </group>
+    <group>
+      <name>Third_Party</name>
+      <group>
+        <name>mbed-crypto</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
+        </file>
+      </group>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..6469ea2b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,147 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% %headerbin%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..aa3ebaa2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,143 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..13b61655
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,146 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
new file mode 100644
index 00000000..83291a72
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V6M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..68937ca8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,28 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit};
+
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
+place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
+place in SE_CODE_NOKEY_ROM_region {readonly};
+place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
+keep { section .SE_embedded_Keys };
+place in SE_RAM_region {readwrite, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
new file mode 100644
index 00000000..0dea918c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
@@ -0,0 +1,639 @@
+/**
+  ******************************************************************************
+  * @file    ca_conf.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Cryptographic API (CA)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_CONF_H
+#define CA_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Cryptographic_API Cryptographic API (CA)
+  * @{
+  */
+
+/** @defgroup CA_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup CA_Crypto_Libraries Cryptographic Libraries
+  * @{
+  */
+
+/**
+  * @brief Define CA_ST_CRYPTOLIB_SUPP to use services from ST Cryptographic firmware Library
+  * @note  More details on this library can be found here www.st.com/en/embedded-software/x-cube-cryptolib.html
+  */
+/*#define CA_ST_CRYPTOLIB_SUPP*/
+
+/**
+  * @brief Define CA_MBED_CRYPTOLIB_SUPP to use services from the Mbed Cryptography Library
+  * @note  More details on this library can be found here github.com/ARMmbed/mbed-crypto
+  */
+#define CA_MBED_CRYPTOLIB_SUPP
+
+/**
+  * @brief Define CA_HAL_CRYPTOLIB_SUPP to use services from the STM32Cube HAL drivers
+  * @note  HAL drivers can be used to access cryptographic services of specific IP peripherals
+  *        Supported IP peripherals are CRYP & PKA
+  */
+#define CA_HAL_CRYPTOLIB_SUPP
+
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Features_Config Supported Features
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RNG to support RNG cryptographic algorithm
+  */
+/* #define CA_FEAT_RNG */
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define the below line to support AES cryptographic algorithm
+  */
+#define CA_FEAT_AES
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_AES_Features_Config AES Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_AES_ENCRYPT to support AES cryptographic algorithm encryption
+  */
+#define CA_FEAT_AES_ENCRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_DECRYPT to support AES cryptographic algorithm decryption
+  */
+#define CA_FEAT_AES_DECRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_128BITS to support AES cryptographic algorithm on 128 bits length keys
+  */
+#define CA_FEAT_AES_128BITS
+
+/**
+  * @brief Define CA_FEAT_AES_192BITS to support AES cryptographic algorithm on 192 bits length keys
+  */
+/* #define CA_FEAT_AES_192BITS */
+
+/**
+  * @brief Define CA_FEAT_AES_256BITS to support AES cryptographic algorithm on 256 bits length keys
+  */
+#define CA_FEAT_AES_256BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+/**
+  * @brief Define CA_FEAT_HASH to support HASH cryptographic algorithm
+  */
+#define CA_FEAT_HASH
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC to support ECC cryptographic algorithm
+  */
+#define CA_FEAT_ECC
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC_VERIFY to support ECC cryptographic algorithm verification
+  */
+#define CA_FEAT_ECC_VERIFY
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+/**
+  * @brief Define CA_FEAT_RSA to support RSA cryptographic algorithm
+  */
+#define CA_FEAT_RSA
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RSA_SIGN to support RSA cryptographic algorithm signature
+  */
+#define CA_FEAT_RSA_SIGN
+
+/**
+  * @brief Define CA_FEAT_RSA_VERIFY to support RSA cryptographic algorithm verification
+  */
+#define CA_FEAT_RSA_VERIFY
+
+/**
+  * @brief Define CA_FEAT_RSA_1024BITS to support RSA cryptographic algorithm on 1024 bits length modulus
+  */
+#define CA_FEAT_RSA_1024BITS
+
+/**
+  * @brief Define CA_FEAT_RSA_2048BITS to support RSA cryptographic algorithm on 2048 bits length modulus
+  */
+#define CA_FEAT_RSA_2048BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/** @defgroup CA_Router_Config Algorithms Router & Configuration
+  * @{
+  */
+
+/** @defgroup CA_Router_Config_Def Router defines
+  * @note     Masks & Defines to use to configure algorithm routing options
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_MASK to extract configured route from algorithm configuration definition
+  */
+#define CA_ROUTE_MASK   (0xFUL)
+
+/**
+  * @brief Use CA_ROUTE_ST to make the configured algorithm using ST Cryptographic firmware Library
+  * @note  See @ref CA_ST_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_ST     (1UL)
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#define CA_ROUTE_ST     (0UL)
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_MBED to make the configured algorithm using Mbed Cryptography Library
+  * @note  See @ref CA_MBED_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_MBED   (2UL)
+#else /* CA_MBED_CRYPTOLIB_SUPP */
+#define CA_ROUTE_MBED   (0UL)
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_HAL to make the configured algorithm using STM32Cube HAL drivers
+  * @note  See @ref CA_HAL_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_HAL    (3UL)
+#else /* CA_HAL_CRYPTOLIB_SUPP */
+#define CA_ROUTE_HAL    (0UL)
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if !defined(CA_ROUTE_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_DEFAULT to choose default route for the configured algorithm
+  * @note  Default is chosen as below described:
+  *        - If CA_ST_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_ST
+  *        - else if CA_MBED_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_MBED
+  *        - else if CA_HAL_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_HAL
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_ST
+#elif defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_MBED
+#elif defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_HAL
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ROUTE_DEFAULT */
+
+/**
+  * @}
+  */
+#if defined(CA_FEAT_RNG)
+/** @defgroup CA_Router_Config_RNG_Def RNG Defines
+  * @note     Masks & Defines to use to configure RNG algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief RNG configuration
+  * @note  Define CA_ROUTE_RNG to enable RNG algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_RNG  (CA_ROUTE_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RNG */
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_Router_Config_AES_Def AES Defines
+  * @note     Masks & Defines to use to configure AES algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_ENCRYPT_ENABLE to enable encryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_ENCRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_ENCRYPT)
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (1UL << 8)
+#else /* CA_FEAT_AES_ENCRYPT */
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_ENCRYPT */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DECRYPT_ENABLE to enable decryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_DECRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_DECRYPT)
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (1UL << 9)
+#else /* CA_FEAT_AES_DECRYPT */
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_DECRYPT */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_128BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_128BITS to be defined
+  */
+#if defined(CA_FEAT_AES_128BITS)
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (1UL << 10)
+#else /* CA_FEAT_AES_128BITS */
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_128BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_192BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_192BITS to be defined
+  */
+#if defined(CA_FEAT_AES_192BITS)
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (1UL << 11)
+#else /* CA_FEAT_AES_192BITS */
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_192BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_256BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_256BITS to be defined
+  */
+#if defined(CA_FEAT_AES_256BITS)
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_AES_256BITS */
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_256BITS */
+
+#if !defined(CA_ROUTE_AES_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DEFAULT to choose default settings for the configured AES algorithm
+  * @note  Default is: encryption & decryption using 128, 192 & 256 bits lengths keys enabled
+  */
+#define CA_ROUTE_AES_CFG_DEFAULT  (CA_ROUTE_AES_CFG_ENCRYPT_ENABLE  \
+                                   | CA_ROUTE_AES_CFG_DECRYPT_ENABLE \
+                                   | CA_ROUTE_AES_CFG_128BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_192BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_256BITS_ENABLE)
+#endif /* CA_ROUTE_AES_CFG_DEFAULT */
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Router_Config_AES AES Algorithms configurations
+  * @{
+  */
+
+/**
+  * @brief AES CBC configuration
+  * @note  Define CA_ROUTE_AES_CBC to enable AES CBC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CBC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CCM configuration
+  * @note  Define CA_ROUTE_AES_CCM to enable AES CCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CMAC configuration
+  * @note  Define CA_ROUTE_AES_CMAC to enable AES CMAC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CMAC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES ECB configuration
+  * @note  Define CA_ROUTE_AES_ECB to enable AES ECB algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_ECB  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES GCM configuration
+  * @note  Define CA_ROUTE_AES_GCM to enable AES GCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_GCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+
+#if defined(CA_FEAT_HASH)
+/** @defgroup CA_Router_Config_HASH_Def HASH Defines
+  * @note     Masks & Defines to use to configure HASH algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief HASH SHA1 configuration
+  * @note  Define CA_ROUTE_HASH_SHA1 to enable HASH SHA1 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+/* #define CA_ROUTE_HASH_SHA1  (CA_ROUTE_DEFAULT) */
+
+/**
+  * @brief HASH SHA256 configuration
+  * @note  Define CA_ROUTE_HASH_SHA256 to enable HASH SHA256 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_HASH_SHA256  (CA_ROUTE_MBED)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_HASH */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_Router_Config_ECC_Def ECC Defines
+  * @note     Masks & Defines to use to configure ECC algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_VERIFY_ENABLE to enable verification for the configured ECC algorithm
+  * @note  Requires @ref CA_FEAT_ECC_VERIFY to be defined
+  */
+#if defined(CA_FEAT_ECC_VERIFY)
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_ECC_VERIFY */
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_ECC_VERIFY */
+
+
+#if !defined(CA_ROUTE_ECC_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_DEFAULT to choose default settings for the configured ECC algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_ECC_CFG_DEFAULT  (CA_ROUTE_ECC_CFG_VERIFY_ENABLE)
+#endif /* CA_ROUTE_ECC_CFG_DEFAULT */
+
+/**
+  * @brief ECC ECDSA configuration
+  * @note  Define CA_ROUTE_ECC_ECDSA to enable ECC ECDSA algorithm
+  * @note  Requires CA_ROUTE_RNG to be defined
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_ECC_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_ECC_CFG_DEFAULT to use default ECC algorithm configuration
+  */
+#define CA_ROUTE_ECC_ECDSA  (CA_ROUTE_HAL | CA_ROUTE_ECC_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_Router_Config_RSA_Def RSA Defines
+  * @note     Masks & Defines to use to configure RSA algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_SIGN_ENABLE to enable signature for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_SIGN to be defined
+  */
+#if defined(CA_FEAT_RSA_SIGN)
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (1UL << 8)
+#else /* CA_FEAT_RSA_SIGN */
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_SIGN */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_VERIFY_ENABLE to enable verification for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_VERIFY to be defined
+  */
+#if defined(CA_FEAT_RSA_VERIFY)
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_RSA_VERIFY */
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_VERIFY */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_1024BITS_ENABLE to enable support of 1024 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_1024BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_1024BITS)
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_RSA_1024BITS */
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_1024BITS */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_2048BITS_ENABLE to enable support of 2048 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_2048BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_2048BITS)
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (1UL << 13)
+#else /* CA_FEAT_RSA_2048BITS */
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_2048BITS */
+
+
+#if !defined(CA_ROUTE_RSA_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_DEFAULT to choose default settings for the configured RSA algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_RSA_CFG_DEFAULT  (CA_ROUTE_RSA_CFG_SIGN_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_VERIFY_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_1024BITS_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_2048BITS_ENABLE)
+#endif /* CA_ROUTE_RSA_CFG_DEFAULT */
+
+/**
+  * @brief RSA configuration
+  * @note  Define CA_ROUTE_RSA to enable RSA algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_RSA_CFG_SIGN_ENABLE      Signature is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_1024BITS_ENABLE  1024 bits length modulus is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_2048BITS_ENABLE  2048 bits length modulus is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_RSA_CFG_DEFAULT to use default RSA algorithm configuration
+  */
+#define CA_ROUTE_RSA  (CA_ROUTE_HAL | CA_ROUTE_RSA_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
new file mode 100644
index 00000000..64ef96b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains the low level definitions of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_H
+#define CA_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+/*
+ * STM32 target HAL driver include
+ * ex: stm32l4xx_hal.h
+ */
+#include "stm32wlxx_hal.h"
+
+/* Exported constants --------------------------------------------------------*/
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * AES/CRYP instance to use
+ * ex: AES1
+ */
+#define CA_AES_INSTANCE     (AES)
+
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * PKA instance to use
+ * ex: PKA
+ */
+#define CA_PKA_INSTANCE     (PKA)
+
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+
+/* Exported function ---------------------------------------------------------*/
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+void CA_LL_CRC_Init(void);
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h
new file mode 100644
index 00000000..a73094e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h
@@ -0,0 +1,530 @@
+/**
+  ******************************************************************************
+  * @file    kms_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Key Management Services (KMS)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_CONFIG_H
+#define KMS_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @defgroup KMS_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup KMS_HW_Config Hardware
+  * @{
+  */
+
+/**
+  * @brief KMS_EXT_TOKEN_ENABLED Uncomment the below line to support External Token
+  */
+/*#define KMS_EXT_TOKEN_ENABLED*/
+
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Storage_Config Storage
+  * @{
+  */
+
+/**
+  * @brief KMS_NVM_ENABLED Uncomment the below line to support Non Volatile
+  *        Memory storage
+  * @note  Mandatory to handle runtime objects addition through blob import or
+  *        creation through specific KMS services
+  */
+#define KMS_NVM_ENABLED
+
+/**
+  * @brief KMS_NVM_DYNAMIC_ENABLED Uncomment the below line to support Non
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  * @note  Requires @ref KMS_NVM_ENABLED to be defined
+  */
+#define KMS_NVM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_NVM_SLOT_NUMBERS Specify here the number of slots to use in the Non Volatile Memory storage
+  * @note  NVM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into NVM. But if you intend to manipulate objects (create, destroy, derivate...) better use a greater
+  *        number to avoid too much erase of the flash sectors containing the NVM storage.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in NVM.
+  * @note  Mandatory to set if @ref KMS_NVM_ENABLED is defined
+  */
+#define KMS_NVM_SLOT_NUMBERS                    (40UL)
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Config Services
+  * @{
+  */
+/**
+  * @brief KMS_NB_SESSIONS_MAX Defines the number of sessions KMS will be able
+  *        to handle in parallel
+  * @note  This value has an impact on memory footprint
+  */
+#define KMS_NB_SESSIONS_MAX                     (10UL)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_PKCS_Config PKCS#11 services
+  * @{
+  */
+
+/**
+  * @brief KMS_ENCRYPT Uncomment the below line to support encryption services
+  * @note  Requires a supported encryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_ENCRYPT
+
+/**
+  * @brief KMS_DECRYPT Uncomment the below line to support decryption services
+  * @note  Requires a supported decryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_DECRYPT
+
+/**
+  * @brief KMS_DIGEST Uncomment the below line to support digest services
+  * @note  Requires a supported digest algorithm to be enabled too:
+  *        @ref KMS_SHA1
+  *        @ref KMS_SHA256
+  */
+#define KMS_DIGEST
+
+/**
+  * @brief KMS_SIGN Uncomment the below line to support signature services
+  * @note  Requires a supported signature algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_SIGN
+
+/**
+  * @brief KMS_VERIFY Uncomment the below line to support verification services
+  * @note  Requires a supported verification algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_ECDSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_VERIFY
+
+/**
+  * @brief KMS_DERIVE_KEY Uncomment the below line to support key derivation services
+  * @note  Requires a supported derivation algorithm to be enabled too:
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  */
+#define KMS_DERIVE_KEY
+
+/**
+  * @brief KMS_SEARCH Uncomment the below line to support key search or mechanism search services
+  */
+#define KMS_SEARCH
+
+/**
+  * @brief KMS_GENERATE_KEYS Uncomment the below line to support key generation services
+  * @note  Requires a supported key generation algorithm to be enabled too:
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  */
+/*#define KMS_GENERATE_KEYS*/
+
+/**
+  * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  */
+#define KMS_ATTRIBUTES
+
+/**
+  * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  */
+#define KMS_OBJECTS
+
+/**
+  * @brief KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT Uncomment the below line to support C_GetFunctionList API
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT*/
+
+/**
+  * @brief KMS_PKCS11_COMPLIANCE Uncomment the below line to support PKCS11 APIs and implementation that are required
+  *        to be compliant with PKCS11 standard
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_COMPLIANCE*/
+
+/**
+  * @brief KMS_NIKMS_ROUTER_BYPASS Uncomment the below line to bypass KMS router and perform direct KMS API calls
+  * @note  Only applicable when using 'niKMS' access
+  * @note  Enabling this feature allows to save some code footprint, but forbid any use of the external token services
+  */
+/*#define KMS_NIKMS_ROUTER_BYPASS*/
+
+/**
+  * @brief KMS_IMPORT_BLOB Uncomment the below line to use vendor defined blob import features
+  * @note  Requires @ref KMS_NVM_ENABLED to store imported keys
+  * @note  Requires the following services and algorithm to Authenticate, Verify and decrypt the imported blobs:
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_DIGEST
+  *        @ref KMS_SHA256
+  *        @ref KMS_VERIFY
+  *        @ref KMS_ECDSA
+  *        @ref KMS_EC_SECP256
+  */
+#define KMS_IMPORT_BLOB
+
+/**
+  * @brief KMS_IMPORT_BLOB_CHUNK_SIZE Configure the blob importation chunk size
+  * @note  This size must be a multiple of 4
+  * @note  This size must be greater to at least the blob import header size
+  * @note  Requires @ref KMS_IMPORT_BLOB to be enabled
+  */
+#define KMS_IMPORT_BLOB_CHUNK_SIZE      (512U)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Memory_Config Memory management
+  * @{
+  */
+
+/**
+  * @brief KMS_MEM_USE_HEAP_ALLOCATOR Uncomment the below line to perform dynamic allocation in HEAP
+  * @note  KMS will use standard malloc and free APIs
+  * @note  Requires a dynamic allocator provided by the toolchain like dlmalloc
+  * @note  KMS_MEM_USE_HEAP_ALLOCATOR and KMS_MEM_USE_POOL_ALLOCATOR are mutually exclusive
+  */
+/*#define KMS_MEM_USE_HEAP_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_USE_POOL_ALLOCATOR Uncomment the below line to perform dynamic allocation using internal pool
+  *        allocator
+  * @note  Requires a pool definition in a file called kms_mem_pool_def.h (see kms_mem_pool_def_template.h for example)
+  */
+#define KMS_MEM_USE_POOL_ALLOCATOR
+
+/**
+  * @brief KMS_MEM_USE_CUSTOM_ALLOCATOR Uncomment the below line to perform dynamic
+  *        allocation using a custom allocator
+  * @note  To use this custom allocator, implement the kms_mem_low_level.c
+  *        - void KMS_MemInit(void)
+  *        - CK_VOID_PTR KMS_Alloc(CK_SESSION_HANDLE session, size_t size)
+  *        - void KMS_Free(CK_SESSION_HANDLE session, CK_VOID_PTR ptr)
+  */
+/*#define KMS_MEM_USE_CUSTOM_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_DEBUGGING Uncomment the below line to keep memory profiling information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_DEBUGGING
+
+/**
+  * @brief KMS_MEM_CLEANING Uncomment the below line to clean dynamically freed memory
+  * @note  The freed memory will be reset to 0
+  * @note  If using @ref KMS_MEM_USE_HEAP_ALLOCATOR, @ref KMS_MEM_DEBUGGING required
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_CLEANING
+
+/**
+  * @brief KMS_MEM_LOGGING Uncomment the below line to log memory allocation information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  * @note  Information about allocations will be transmitted to @ref KMS_LL_ReportMemAlloc and @ref KMS_LL_ReportMemFree
+  */
+/*#define KMS_MEM_LOGGING*/
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Security_Config Security Enforcement
+  * @{
+  */
+
+/**
+  * @brief KMS_SE_CHECK_PARAMS Uncomment the below line to check input & output parameters location vs secure enclave
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_CHECK_PARAMS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS Uncomment the below line to use key locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_KEYS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS_MAXIMUM Specify here the number of keys that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_KEYS is defined
+  */
+#define KMS_SE_LOCK_KEYS_MAX                 (10UL)
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES Uncomment the below line to use services locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_SERVICES
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES_MAX Specify here the number of services that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_SERVICES is defined
+  */
+#define KMS_SE_LOCK_SERVICES_MAX             (2UL)
+
+/**
+  * @}
+  */
+
+/** Function flag definition to be used to qualify algorithm usage **/
+
+#if defined(KMS_ENCRYPT)
+#define KMS_FCT_ENCRYPT         (1UL << 0)
+#else /* KMS_ENCRYPT */
+#define KMS_FCT_ENCRYPT         (0UL << 0)
+#endif /* KMS_ENCRYPT */
+#if defined(KMS_DECRYPT)
+#define KMS_FCT_DECRYPT         (1UL << 1)
+#else /* KMS_DECRYPT */
+#define KMS_FCT_DECRYPT         (0UL << 1)
+#endif /* KMS_DECRYPT */
+#if defined(KMS_SIGN)
+#define KMS_FCT_SIGN            (1UL << 2)
+#else /* KMS_SIGN */
+#define KMS_FCT_SIGN            (0UL << 2)
+#endif /* KMS_SIGN */
+#if defined(KMS_VERIFY)
+#define KMS_FCT_VERIFY          (1UL << 3)
+#else /* KMS_VERIFY */
+#define KMS_FCT_VERIFY          (0UL << 3)
+#endif /* KMS_VERIFY */
+#if defined(KMS_DERIVE_KEY)
+#define KMS_FCT_DERIVE_KEY      (1UL << 4)
+#else /* KMS_DERIVE_KEY */
+#define KMS_FCT_DERIVE_KEY      (0UL << 4)
+#endif /* KMS_DERIVE_KEY */
+#if defined(KMS_GENERATE_KEYS)
+#define KMS_FCT_GENERATE_KEYS   (1UL << 5)
+#else /* KMS_GENERATE_KEYS */
+#define KMS_FCT_GENERATE_KEYS   (0UL << 5)
+#endif /* KMS_GENERATE_KEYS */
+#if defined(KMS_DIGEST)
+#define KMS_FCT_DIGEST          (1UL << 6)
+#else /* KMS_DIGEST */
+#define KMS_FCT_DIGEST          (0UL << 6)
+#endif /* KMS_DIGEST */
+
+/** @defgroup KMS_Features_Config Features
+  * @{
+  */
+
+/**
+  * @brief KMS_AES_CBC Uncomment the below line to support AES CBC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_CBC           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CCM Uncomment the below line to support AES CCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+/*#define KMS_AES_CCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)*/
+
+/**
+  * @brief KMS_AES_ECB Uncomment the below line to support AES ECB algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_DERIVE_KEY
+  */
+#define KMS_AES_ECB           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY)
+
+/**
+  * @brief KMS_AES_GCM Uncomment the below line to support AES GCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_GCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CMAC Uncomment the below line to support AES CMAC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  */
+#define KMS_AES_CMAC          (KMS_FCT_SIGN|KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_RSA Uncomment the below line to support RSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  * @note  Requires at least one of the following RSA modulus length to be enabled:
+  *        @ref KMS_RSA_1024
+  *        @ref KMS_RSA_2048
+  */
+#define KMS_RSA               (KMS_FCT_SIGN|KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_RSA_1024 Uncomment the below line to support RSA 1024 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+#define KMS_RSA_1024
+
+/**
+  * @brief KMS_RSA_2048 Uncomment the below line to support RSA 2048 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+#define KMS_RSA_2048
+
+/**
+  * @brief KMS_ECDSA Uncomment the below line to support ECDSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  *        - KMS_FCT_GENERATE_KEYS    This algorithm can be used to perform key generation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_VERIFY
+  *        @ref KMS_DERIVE_KEY
+  *        @ref KMS_GENERATE_KEYS
+  * @note  Requires at least one of the following elliptic curve to be enabled:
+  *        @ref KMS_EC_SECP192
+  *        @ref KMS_EC_SECP256
+  *        @ref KMS_EC_SECP384
+  */
+#define KMS_ECDSA             (KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_EC_SECP192 Uncomment the below line to support elliptic curve SECP-192
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP192*/
+
+/**
+  * @brief KMS_EC_SECP256 Uncomment the below line to support elliptic curve SECP-256
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+#define KMS_EC_SECP256
+
+/**
+  * @brief KMS_EC_SECP384 Uncomment the below line to support elliptic curve SECP-384
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP384*/
+
+/**
+  * @brief KMS_SHA1 Uncomment the below line to support SHA1 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+/*#define KMS_SHA1              (KMS_FCT_DIGEST)*/
+
+/**
+  * @brief KMS_SHA256 Uncomment the below line to support SHA256 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+#define KMS_SHA256            (KMS_FCT_DIGEST)
+
+
+
+/** @defgroup KMS_Debug_Config Debug
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
new file mode 100644
index 00000000..ae3e8d6b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef KMS_LOW_LEVEL_H
+#define KMS_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup KMS_LL_Exported_Constants Exported Constants
+  * @{
+  */
+
+#define KMS_LL_ERROR_MEM_ALLOC_FAILURE    (0x00000001UL)    /*!< Memory allocation failure error */
+#define KMS_LL_ERROR_MEM_FREE_CANARY      (0x00000002UL)    /*!< Memory free detected altered canaries error */
+#define KMS_LL_ERROR_MEM_FREE_NULL_PTR    (0x00000003UL)    /*!< Memory free detected a NULL pointer error */
+#define KMS_LL_ERROR_MEM_FREE_UNKNOWN     (0x00000004UL)    /*!< Memory free detected an unknown pointer error */
+
+/**
+  * @}
+  */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_LL_Exported_Functions Exported Functions
+  * @{
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length);
+uint32_t KMS_LL_FLASH_GetBlobDownloadAddress(void);
+
+#ifdef KMS_SE_CHECK_PARAMS
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize);
+#endif /* KMS_SE_CHECK_PARAMS */
+
+void KMS_LL_ReportError(uint32_t error);
+
+void KMS_LL_ReportMemInit(void);
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem);
+void KMS_LL_ReportMemFree(void *pmem);
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t KMS_LL_GetLR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif /* KMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
new file mode 100644
index 00000000..a5f54fbf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
@@ -0,0 +1,54 @@
+/**
+  ******************************************************************************
+  * @file    kms_mem_pool_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          memory pool definition
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Recursive inclusion autorised ---------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * POOL DESCRIPTION
+ */
+
+/*
+ * Memory pools definition:
+ * 2 pools of 256
+ * 1 pool of 512
+ * 2 pools of 1K
+ * 1 pool of 5K
+ */
+
+KMS_MEM_DECLARE_POOL_START()
+KMS_MEM_DECLARE_POOL_ENTRY(1, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(2, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(3, 512)
+KMS_MEM_DECLARE_POOL_ENTRY(4, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(5, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(6, 5 * 1024)
+KMS_MEM_DECLARE_POOL_END()
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
new file mode 100644
index 00000000..31ce1225
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
@@ -0,0 +1,390 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_CONFIG_H
+#define KMS_PLATF_OBJECTS_CONFIG_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "kms_platf_objects_interface.h"
+#include "app_sfu.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_PLATF Platform Objects
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_PLATF_Exported_Constants Exported Constants
+  * @note KMS support different type of objects, their respective ranges are
+  *       defined here
+  * @{
+  */
+
+/* We consider that the ORDER (static = lower ids) will be kept. */
+#define KMS_INDEX_MIN_EMBEDDED_OBJECTS       1UL   /*!< Embedded objects min ID. Must be > 0 as '0' is never a
+                                                        valid key index */
+#define KMS_INDEX_MAX_EMBEDDED_OBJECTS       (KMS_INDEX_MIN_EMBEDDED_OBJECTS+19UL)    /*!< Embedded objects max ID */
+#define KMS_INDEX_MIN_NVM_STATIC_OBJECTS     (KMS_INDEX_MAX_EMBEDDED_OBJECTS+1UL)     /*!< NVM static objects min ID */
+#define KMS_INDEX_MAX_NVM_STATIC_OBJECTS     (KMS_INDEX_MIN_NVM_STATIC_OBJECTS+19UL)  /*!< NVM static objects max ID */
+
+#define KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MAX_NVM_STATIC_OBJECTS+1UL)   /*!< NVM dynamic objects min ID */
+#define KMS_INDEX_MAX_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS+19UL) /*!< NVM dynamic objects max ID */
+
+/* When EXTERNAL TOKEN is not supported the below values can be commented */
+#define KMS_INDEX_MIN_EXT_TOKEN_STATIC_OBJECTS        70UL  /*!< External token static objects min ID */
+#define KMS_INDEX_MAX_EXT_TOKEN_STATIC_OBJECTS        89UL  /*!< External token static objects max ID */
+#define KMS_INDEX_MIN_EXT_TOKEN_DYNAMIC_OBJECTS       90UL  /*!< External token dynamic objects min ID */
+#define KMS_INDEX_MAX_EXT_TOKEN_DYNAMIC_OBJECTS      110UL  /*!< External token dynamic objects max ID */
+
+/* Blob import key index */
+#define KMS_INDEX_BLOBIMPORT_VERIFY       (1U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob verification key is stored */
+#define KMS_INDEX_BLOBIMPORT_DECRYPT      (2U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob decryption key is stored */
+
+/**
+  * @}
+  */
+
+/*
+ * Embedded objects definition
+ *
+ */
+#ifdef KMS_PLATF_OBJECTS_C
+/** @addtogroup KMS_PLATF_Private_Variables Private Variables
+  * @{
+  */
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".SE_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".SE_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 24);
+KMS_DECLARE_BLOB_STRUCT(, 30);
+KMS_DECLARE_BLOB_STRUCT(, 256);
+
+/* This object is used for KMS blob header signature                 */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   KMS_Blob_ECDSA_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  1,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_BLOB_KEY@
+  }
+};
+
+/* This object is used for KMS blob encryption                    */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   KMS_Blob_AES_CBC128_Decrypt =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  2,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_BLOB_KEY@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_1_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  3,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_1@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_2_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_2@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /*(SFU_NB_MAX_ACTIVE_IMAGE > 1U)*/
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_3_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_3@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_1_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  6,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_1@
+  }
+};
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_2_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  7,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_2@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_3_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  8,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_3@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+
+
+
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif
+
+/* These objects are used by user tKMS application                 */
+static const kms_obj_keyhead_24_t   Test_Key_AES128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  68,                              /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  13,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16, 0xfeffe992U, 0x8665731cU, 0x6d6a8f94U, 0x67308308U,
+    CKA_LABEL,        12, 0x52455355U, 0x50595243U, 0x00383231U,      /* 'USER', 'CRYP', '128' */
+    0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL /* Fill end of structure */
+  }
+};
+
+static const kms_obj_keyhead_24_t   Test_Key_AES256 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /* uint32_t version;  */
+  KMS_ABI_CONFIG_KEYHEAD,          /* uint32_t configuration; */
+  84,                              /* uint32_t blobs_size; */
+  9,                               /* uint32_t blobs_count; */
+  14,                              /* uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        32, 0x03030303U, 0x03030303U, 0x03030303U, 0x03030303U,
+    0x03030303U, 0x03030303U, 0x03030303U, 0x03030303U,
+    CKA_LABEL,        12, 0x52455355U, 0x50595243U, 0x00363532U,      /* 'USER', 'CRYP', '256' */
+    0UL, 0UL, 0UL                 /* Fill end of structure */
+  }
+};
+
+/**
+  * @brief  KMS embedded objects definition
+  * @note   Must contains KMS blob verification and decryption keys
+  */
+static const kms_obj_keyhead_t *const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBEDDED_OBJECTS -
+                                                                    KMS_INDEX_MIN_EMBEDDED_OBJECTS + 1] =
+{
+  /* KMS Blob import keys */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_ECDSA_Verify,       /* Index = 1 */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_AES_CBC128_Decrypt, /* Index = 2 */
+  /* SBSFU keys */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_1_128,             /* Index = 3 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_2_128,             /* Index = 4 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_3_128,             /* Index = 5 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 3 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_1_Verify,        /* Index = 6 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_2_Verify,        /* Index = 7 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_3_Verify,        /* Index = 8 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 12 */
+  /* UserApp example keys */
+  (kms_obj_keyhead_t *)(uint32_t) &Test_Key_AES128,             /* Index = 13 */
+  (kms_obj_keyhead_t *)(uint32_t) &Test_Key_AES256,             /* Index = 14 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 15 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 16 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 20 */
+};
+
+/**
+  * @}
+  */
+#endif /* KMS_PLATF_OBJECTS_C */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
new file mode 100644
index 00000000..d2a45750
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
@@ -0,0 +1,64 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_interface.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_INTERFACE_H
+#define KMS_PLATF_OBJECTS_INTERFACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* KMS exported Object handles for Secure Boot */
+
+/* SBSFU Root CA Certificate */
+#define KMS_SBSFU_ROOT_CA_CRT_LABEL           "SBSFURootCACertificate"  /*!< SBSFU Root CA Certificate Label */
+#define KMS_SBSFU_ROOT_CA_CRT_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)9)  /*!< SBSFU Root CA Certificate object handle */
+
+/* OEM Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_LABEL           "OEMIntermCACertificate_1"  /*!< OEM 1 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_LABEL           "OEMIntermCACertificate_2"  /*!< OEM 2 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_LABEL           "OEMIntermCACertificate_3"  /*!< OEM 3 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)10)  /*!< OEM 1 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)11)  /*!< OEM 2 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)12)  /*!< OEM 3 Interm CA Certificate object handle */
+
+
+#define KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)3)
+#define KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)4)
+#define KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)5)
+#define KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)6)
+#define KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)7)
+#define KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)8)
+
+/* KMS exported Object handles for tKMS test application */
+#define KMS_KEY_RSA2048_OBJECT_HANDLE                 ((CK_OBJECT_HANDLE)21)
+#define KMS_KEY_AES128_OBJECT_HANDLE                  ((CK_OBJECT_HANDLE)13)
+#define KMS_KEY_AES256_OBJECT_HANDLE                  ((CK_OBJECT_HANDLE)14)
+#define KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE        ((CK_OBJECT_HANDLE)22)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_INTERFACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
new file mode 100644
index 00000000..5ea26e4f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
@@ -0,0 +1,1976 @@
+/**
+ * \file config.h
+ *
+ * \brief Configuration options (set of defines)
+ *
+ *  This set of compile-time options may be used to enable
+ *  or disable features selectively, and reduce the global
+ *  memory footprint.
+ */
+/*
+ *  Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  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.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+/**
+ * \name SECTION: System support
+ *
+ * This section sets system specific settings.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_HAVE_ASM
+ *
+ * The compiler has support for asm().
+ *
+ * Requires support for asm() in compiler.
+ *
+ * Used in:
+ *      library/aria.c
+ *      library/timing.c
+ *      include/mbedtls/bn_mul.h
+ *
+ * Required by:
+ *      MBEDTLS_AESNI_C
+ *      MBEDTLS_PADLOCK_C
+ *
+ * Comment to disable the use of assembly code.
+ */
+//#define MBEDTLS_HAVE_ASM
+
+/**
+ * \def MBEDTLS_NO_UDBL_DIVISION
+ *
+ * The platform lacks support for double-width integer division (64-bit
+ * division on a 32-bit platform, 128-bit division on a 64-bit platform).
+ *
+ * Used in:
+ *      include/mbedtls/bignum.h
+ *      library/bignum.c
+ *
+ * The bignum code uses double-width division to speed up some operations.
+ * Double-width division is often implemented in software that needs to
+ * be linked with the program. The presence of a double-width integer
+ * type is usually detected automatically through preprocessor macros,
+ * but the automatic detection cannot know whether the code needs to
+ * and can be linked with an implementation of division for that type.
+ * By default division is assumed to be usable if the type is present.
+ * Uncomment this option to prevent the use of double-width division.
+ *
+ * Note that division for the native integer type is always required.
+ * Furthermore, a 64-bit type is always required even on a 32-bit
+ * platform, but it need not support multiplication or division. In some
+ * cases it is also desirable to disable some double-width operations. For
+ * example, if double-width division is implemented in software, disabling
+ * it can reduce code size in some embedded targets.
+ */
+//#define MBEDTLS_NO_UDBL_DIVISION
+
+/**
+ * \def MBEDTLS_NO_64BIT_MULTIPLICATION
+ *
+ * The platform lacks support for 32x32 -> 64-bit multiplication.
+ *
+ * Used in:
+ *      library/poly1305.c
+ *
+ * Some parts of the library may use multiplication of two unsigned 32-bit
+ * operands with a 64-bit result in order to speed up computations. On some
+ * platforms, this is not available in hardware and has to be implemented in
+ * software, usually in a library provided by the toolchain.
+ *
+ * Sometimes it is not desirable to have to link to that library. This option
+ * removes the dependency of that library on platforms that lack a hardware
+ * 64-bit multiplier by embedding a software implementation in Mbed TLS.
+ *
+ * Note that depending on the compiler, this may decrease performance compared
+ * to using the library function provided by the toolchain.
+ */
+//#define MBEDTLS_NO_64BIT_MULTIPLICATION
+
+/**
+ * \def MBEDTLS_HAVE_SSE2
+ *
+ * CPU supports SSE2 instruction set.
+ *
+ * Uncomment if the CPU supports SSE2 (IA-32 specific).
+ */
+//#define MBEDTLS_HAVE_SSE2
+
+/**
+ * \def MBEDTLS_HAVE_TIME
+ *
+ * System has time.h and time().
+ * The time does not need to be correct, only time differences are used,
+ * by contrast with MBEDTLS_HAVE_TIME_DATE
+ *
+ * Defining MBEDTLS_HAVE_TIME allows you to specify MBEDTLS_PLATFORM_TIME_ALT,
+ * MBEDTLS_PLATFORM_TIME_MACRO, MBEDTLS_PLATFORM_TIME_TYPE_MACRO and
+ * MBEDTLS_PLATFORM_STD_TIME.
+ *
+ * Comment if your system does not support time functions
+ */
+//#define MBEDTLS_HAVE_TIME
+
+/**
+ * \def MBEDTLS_HAVE_TIME_DATE
+ *
+ * System has time.h, time(), and an implementation for
+ * mbedtls_platform_gmtime_r() (see below).
+ * The time needs to be correct (not necessarily very accurate, but at least
+ * the date should be correct). This is used to verify the validity period of
+ * X.509 certificates.
+ *
+ * Comment if your system does not have a correct clock.
+ *
+ * \note mbedtls_platform_gmtime_r() is an abstraction in platform_util.h that
+ * behaves similarly to the gmtime_r() function from the C standard. Refer to
+ * the documentation for mbedtls_platform_gmtime_r() for more information.
+ *
+ * \note It is possible to configure an implementation for
+ * mbedtls_platform_gmtime_r() at compile-time by using the macro
+ * MBEDTLS_PLATFORM_GMTIME_R_ALT.
+ */
+//#define MBEDTLS_HAVE_TIME_DATE
+
+/**
+ * \def MBEDTLS_PLATFORM_MEMORY
+ *
+ * Enable the memory allocation layer.
+ *
+ * By default mbed TLS uses the system-provided calloc() and free().
+ * This allows different allocators (self-implemented or provided) to be
+ * provided to the platform abstraction layer.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY without the
+ * MBEDTLS_PLATFORM_{FREE,CALLOC}_MACROs will provide
+ * "mbedtls_platform_set_calloc_free()" allowing you to set an alternative calloc() and
+ * free() function pointer at runtime.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY and specifying
+ * MBEDTLS_PLATFORM_{CALLOC,FREE}_MACROs will allow you to specify the
+ * alternate function at compile time.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Enable this layer to allow use of alternative memory allocators.
+ */
+//#define MBEDTLS_PLATFORM_MEMORY
+
+/**
+ * \def MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+ *
+ * Do not assign standard functions in the platform layer (e.g. calloc() to
+ * MBEDTLS_PLATFORM_STD_CALLOC and printf() to MBEDTLS_PLATFORM_STD_PRINTF)
+ *
+ * This makes sure there are no linking errors on platforms that do not support
+ * these functions. You will HAVE to provide alternatives, either at runtime
+ * via the platform_set_xxx() functions or at compile time by setting
+ * the MBEDTLS_PLATFORM_STD_XXX defines, or enabling a
+ * MBEDTLS_PLATFORM_XXX_MACRO.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Uncomment to prevent default assignment of standard functions in the
+ * platform layer.
+ */
+//#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+/**
+ * \def MBEDTLS_PLATFORM_EXIT_ALT
+ *
+ * MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let mbed TLS support the
+ * function in the platform abstraction layer.
+ *
+ * Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, mbed TLS will
+ * provide a function "mbedtls_platform_set_printf()" that allows you to set an
+ * alternative printf function pointer.
+ *
+ * All these define require MBEDTLS_PLATFORM_C to be defined!
+ *
+ * \note MBEDTLS_PLATFORM_SNPRINTF_ALT is required on Windows;
+ * it will be enabled automatically by check_config.h
+ *
+ * \warning MBEDTLS_PLATFORM_XXX_ALT cannot be defined at the same time as
+ * MBEDTLS_PLATFORM_XXX_MACRO!
+ *
+ * Requires: MBEDTLS_PLATFORM_TIME_ALT requires MBEDTLS_HAVE_TIME
+ *
+ * Uncomment a macro to enable alternate implementation of specific base
+ * platform function
+ */
+//#define MBEDTLS_PLATFORM_EXIT_ALT
+//#define MBEDTLS_PLATFORM_TIME_ALT
+//#define MBEDTLS_PLATFORM_FPRINTF_ALT
+//#define MBEDTLS_PLATFORM_PRINTF_ALT
+//#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_VSNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_NV_SEED_ALT
+//#define MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
+
+/**
+ * \def MBEDTLS_DEPRECATED_WARNING
+ *
+ * Mark deprecated functions so that they generate a warning if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * This only works with GCC and Clang. With other compilers, you may want to
+ * use MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Uncomment to get warnings on using deprecated functions.
+ */
+//#define MBEDTLS_DEPRECATED_WARNING
+
+/**
+ * \def MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Remove deprecated functions so that they generate an error if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * Uncomment to get errors on using deprecated functions.
+ */
+#define MBEDTLS_DEPRECATED_REMOVED
+
+/**
+ * \def MBEDTLS_CHECK_PARAMS
+ *
+ * This configuration option controls whether the library validates more of
+ * the parameters passed to it.
+ *
+ * When this flag is not defined, the library only attempts to validate an
+ * input parameter if: (1) they may come from the outside world (such as the
+ * network, the filesystem, etc.) or (2) not validating them could result in
+ * internal memory errors such as overflowing a buffer controlled by the
+ * library. On the other hand, it doesn't attempt to validate parameters whose
+ * values are fully controlled by the application (such as pointers).
+ *
+ * When this flag is defined, the library additionally attempts to validate
+ * parameters that are fully controlled by the application, and should always
+ * be valid if the application code is fully correct and trusted.
+ *
+ * For example, when a function accepts as input a pointer to a buffer that may
+ * contain untrusted data, and its documentation mentions that this pointer
+ * must not be NULL:
+ * - the pointer is checked to be non-NULL only if this option is enabled
+ * - the content of the buffer is always validated
+ *
+ * When this flag is defined, if a library function receives a parameter that
+ * is invalid, it will:
+ * - invoke the macro MBEDTLS_PARAM_FAILED() which by default expands to a
+ *   call to the function mbedtls_param_failed()
+ * - immediately return (with a specific error code unless the function
+ *   returns void and can't communicate an error).
+ *
+ * When defining this flag, you also need to:
+ * - either provide a definition of the function mbedtls_param_failed() in
+ *   your application (see platform_util.h for its prototype) as the library
+ *   calls that function, but does not provide a default definition for it,
+ * - or provide a different definition of the macro MBEDTLS_PARAM_FAILED()
+ *   below if the above mechanism is not flexible enough to suit your needs.
+ *   See the documentation of this macro later in this file.
+ *
+ * Uncomment to enable validation of application-controlled parameters.
+ */
+//#define MBEDTLS_CHECK_PARAMS
+
+/* \} name SECTION: System support */
+
+/**
+ * \name SECTION: mbed TLS feature support
+ *
+ * This section sets support for features that are or are not needed
+ * within the modules that are enabled.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_TIMING_ALT
+ *
+ * Uncomment to provide your own alternate implementation for mbedtls_timing_hardclock(),
+ * mbedtls_timing_get_timer(), mbedtls_set_alarm(), mbedtls_set/get_delay()
+ *
+ * Only works if you have MBEDTLS_TIMING_C enabled.
+ *
+ * You will need to provide a header "timing_alt.h" and an implementation at
+ * compile time.
+ */
+//#define MBEDTLS_TIMING_ALT
+
+/**
+ * \def MBEDTLS_AES_ALT
+ *
+ * MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternate core implementation of a symmetric crypto, an arithmetic or hash
+ * module (e.g. platform specific assembly optimized implementations). Keep
+ * in mind that the function prototypes should remain the same.
+ *
+ * This replaces the whole module. If you only want to replace one of the
+ * functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_AES_ALT, mbed TLS will no longer
+ * provide the "struct mbedtls_aes_context" definition and omit the base
+ * function declarations and implementations. "aes_alt.h" will be included from
+ * "aes.h" to include the new function definitions.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * module.
+ *
+ * \warning   MD2, MD4, MD5, ARC4, DES and SHA-1 are considered weak and their
+ *            use constitutes a security risk. If possible, we recommend
+ *            avoiding dependencies on them, and considering stronger message
+ *            digests and ciphers instead.
+ *
+ */
+//#define MBEDTLS_AES_ALT
+//#define MBEDTLS_ARC4_ALT
+//#define MBEDTLS_ARIA_ALT
+//#define MBEDTLS_BLOWFISH_ALT
+//#define MBEDTLS_CAMELLIA_ALT
+//#define MBEDTLS_CCM_ALT
+//#define MBEDTLS_CHACHA20_ALT
+//#define MBEDTLS_CHACHAPOLY_ALT
+//#define MBEDTLS_CMAC_ALT
+//#define MBEDTLS_DES_ALT
+//#define MBEDTLS_DHM_ALT
+//#define MBEDTLS_ECJPAKE_ALT
+//#define MBEDTLS_GCM_ALT
+//#define MBEDTLS_NIST_KW_ALT
+//#define MBEDTLS_MD2_ALT
+//#define MBEDTLS_MD4_ALT
+//#define MBEDTLS_MD5_ALT
+//#define MBEDTLS_POLY1305_ALT
+//#define MBEDTLS_RIPEMD160_ALT
+//#define MBEDTLS_RSA_ALT
+//#define MBEDTLS_SHA1_ALT
+//#define MBEDTLS_SHA256_ALT
+//#define MBEDTLS_SHA512_ALT
+//#define MBEDTLS_XTEA_ALT
+
+/*
+ * When replacing the elliptic curve module, pleace consider, that it is
+ * implemented with two .c files:
+ *      - ecp.c
+ *      - ecp_curves.c
+ * You can replace them very much like all the other MBEDTLS__MODULE_NAME__ALT
+ * macros as described above. The only difference is that you have to make sure
+ * that you provide functionality for both .c files.
+ */
+//#define MBEDTLS_ECP_ALT
+
+/**
+ * \def MBEDTLS_MD2_PROCESS_ALT
+ *
+ * MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use you
+ * alternate core implementation of symmetric crypto or hash function. Keep in
+ * mind that function prototypes should remain the same.
+ *
+ * This replaces only one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, mbed TLS will
+ * no longer provide the mbedtls_sha1_process() function, but it will still provide
+ * the other function (using your mbedtls_sha1_process() function) and the definition
+ * of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible
+ * with this definition.
+ *
+ * \note Because of a signature change, the core AES encryption and decryption routines are
+ *       currently named mbedtls_aes_internal_encrypt and mbedtls_aes_internal_decrypt,
+ *       respectively. When setting up alternative implementations, these functions should
+ *       be overridden, but the wrapper functions mbedtls_aes_decrypt and mbedtls_aes_encrypt
+ *       must stay untouched.
+ *
+ * \note If you use the AES_xxx_ALT macros, then is is recommended to also set
+ *       MBEDTLS_AES_ROM_TABLES in order to help the linker garbage-collect the AES
+ *       tables.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ *
+ * \warning   MD2, MD4, MD5, DES and SHA-1 are considered weak and their use
+ *            constitutes a security risk. If possible, we recommend avoiding
+ *            dependencies on them, and considering stronger message digests
+ *            and ciphers instead.
+ *
+ */
+//#define MBEDTLS_MD2_PROCESS_ALT
+//#define MBEDTLS_MD4_PROCESS_ALT
+//#define MBEDTLS_MD5_PROCESS_ALT
+//#define MBEDTLS_RIPEMD160_PROCESS_ALT
+//#define MBEDTLS_SHA1_PROCESS_ALT
+//#define MBEDTLS_SHA256_PROCESS_ALT
+//#define MBEDTLS_SHA512_PROCESS_ALT
+//#define MBEDTLS_DES_SETKEY_ALT
+//#define MBEDTLS_DES_CRYPT_ECB_ALT
+//#define MBEDTLS_DES3_CRYPT_ECB_ALT
+//#define MBEDTLS_AES_SETKEY_ENC_ALT
+//#define MBEDTLS_AES_SETKEY_DEC_ALT
+//#define MBEDTLS_AES_ENCRYPT_ALT
+//#define MBEDTLS_AES_DECRYPT_ALT
+//#define MBEDTLS_ECDH_GEN_PUBLIC_ALT
+//#define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
+//#define MBEDTLS_ECDSA_VERIFY_ALT
+//#define MBEDTLS_ECDSA_SIGN_ALT
+//#define MBEDTLS_ECDSA_GENKEY_ALT
+
+/**
+ * \def MBEDTLS_ECP_INTERNAL_ALT
+ *
+ * Expose a part of the internal interface of the Elliptic Curve Point module.
+ *
+ * MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternative core implementation of elliptic curve arithmetic. Keep in mind
+ * that function prototypes should remain the same.
+ *
+ * This partially replaces one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation
+ * is still present and it is used for group structures not supported by the
+ * alternative.
+ *
+ * Any of these options become available by defining MBEDTLS_ECP_INTERNAL_ALT
+ * and implementing the following functions:
+ *      unsigned char mbedtls_internal_ecp_grp_capable(
+ *          const mbedtls_ecp_group *grp )
+ *      int  mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp )
+ *      void mbedtls_internal_ecp_free( const mbedtls_ecp_group *grp )
+ * The mbedtls_internal_ecp_grp_capable function should return 1 if the
+ * replacement functions implement arithmetic for the given group and 0
+ * otherwise.
+ * The functions mbedtls_internal_ecp_init and mbedtls_internal_ecp_free are
+ * called before and after each point operation and provide an opportunity to
+ * implement optimized set up and tear down instructions.
+ *
+ * Example: In case you uncomment MBEDTLS_ECP_INTERNAL_ALT and
+ * MBEDTLS_ECP_DOUBLE_JAC_ALT, mbed TLS will still provide the ecp_double_jac
+ * function, but will use your mbedtls_internal_ecp_double_jac if the group is
+ * supported (your mbedtls_internal_ecp_grp_capable function returns 1 when
+ * receives it as an argument). If the group is not supported then the original
+ * implementation is used. The other functions and the definition of
+ * mbedtls_ecp_group and mbedtls_ecp_point will not change, so your
+ * implementation of mbedtls_internal_ecp_double_jac and
+ * mbedtls_internal_ecp_grp_capable must be compatible with this definition.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ */
+/* Required for all the functions in this section */
+//#define MBEDTLS_ECP_INTERNAL_ALT
+/* Support for Weierstrass curves with Jacobi representation */
+//#define MBEDTLS_ECP_RANDOMIZE_JAC_ALT
+//#define MBEDTLS_ECP_ADD_MIXED_ALT
+//#define MBEDTLS_ECP_DOUBLE_JAC_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_ALT
+/* Support for curves with Montgomery arithmetic */
+//#define MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT
+//#define MBEDTLS_ECP_RANDOMIZE_MXZ_ALT
+//#define MBEDTLS_ECP_NORMALIZE_MXZ_ALT
+
+/**
+ * \def MBEDTLS_TEST_NULL_ENTROPY
+ *
+ * Enables testing and use of mbed TLS without any configured entropy sources.
+ * This permits use of the library on platforms before an entropy source has
+ * been integrated (see for example the MBEDTLS_ENTROPY_HARDWARE_ALT or the
+ * MBEDTLS_ENTROPY_NV_SEED switches).
+ *
+ * WARNING! This switch MUST be disabled in production builds, and is suitable
+ * only for development.
+ * Enabling the switch negates any security provided by the library.
+ *
+ * Requires MBEDTLS_ENTROPY_C, MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ */
+//#define MBEDTLS_TEST_NULL_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_HARDWARE_ALT
+ *
+ * Uncomment this macro to let mbed TLS use your own implementation of a
+ * hardware entropy collector.
+ *
+ * Your function must be called \c mbedtls_hardware_poll(), have the same
+ * prototype as declared in entropy_poll.h, and accept NULL as first argument.
+ *
+ * Uncomment to use your own hardware entropy collector.
+ */
+//#define MBEDTLS_ENTROPY_HARDWARE_ALT
+
+/**
+ * \def MBEDTLS_AES_ROM_TABLES
+ *
+ * Use precomputed AES tables stored in ROM.
+ *
+ * Uncomment this macro to use precomputed AES tables stored in ROM.
+ * Comment this macro to generate AES tables in RAM at runtime.
+ *
+ * Tradeoff: Using precomputed ROM tables reduces RAM usage by ~8kb
+ * (or ~2kb if \c MBEDTLS_AES_FEWER_TABLES is used) and reduces the
+ * initialization time before the first AES operation can be performed.
+ * It comes at the cost of additional ~8kb ROM use (resp. ~2kb if \c
+ * MBEDTLS_AES_FEWER_TABLES below is used), and potentially degraded
+ * performance if ROM access is slower than RAM access.
+ *
+ * This option is independent of \c MBEDTLS_AES_FEWER_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_ROM_TABLES
+
+/**
+ * \def MBEDTLS_AES_FEWER_TABLES
+ *
+ * Use less ROM/RAM for AES tables.
+ *
+ * Uncommenting this macro omits 75% of the AES tables from
+ * ROM / RAM (depending on the value of \c MBEDTLS_AES_ROM_TABLES)
+ * by computing their values on the fly during operations
+ * (the tables are entry-wise rotations of one another).
+ *
+ * Tradeoff: Uncommenting this reduces the RAM / ROM footprint
+ * by ~6kb but at the cost of more arithmetic operations during
+ * runtime. Specifically, one has to compare 4 accesses within
+ * different tables to 4 accesses with additional arithmetic
+ * operations within the same table. The performance gain/loss
+ * depends on the system and memory details.
+ *
+ * This option is independent of \c MBEDTLS_AES_ROM_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_FEWER_TABLES
+
+/**
+ * \def MBEDTLS_CAMELLIA_SMALL_MEMORY
+ *
+ * Use less ROM for the Camellia implementation (saves about 768 bytes).
+ *
+ * Uncomment this macro to use less memory for Camellia.
+ */
+//#define MBEDTLS_CAMELLIA_SMALL_MEMORY
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CBC
+ *
+ * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CBC
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CFB
+ *
+ * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CTR
+ *
+ * Enable Counter Block Cipher mode (CTR) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CTR
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_OFB
+ *
+ * Enable Output Feedback mode (OFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_OFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_XTS
+ *
+ * Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
+ */
+//#define MBEDTLS_CIPHER_MODE_XTS
+
+/**
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+ *
+ * Enable NULL cipher.
+ * Warning: Only do so when you know what you are doing. This allows for
+ * encryption or channels without any security!
+ *
+ * This module is required to support the TLS ciphersuites that use the NULL
+ * cipher.
+ *
+ * Uncomment this macro to enable the NULL cipher
+ */
+//#define MBEDTLS_CIPHER_NULL_CIPHER
+
+/**
+ * \def MBEDTLS_CIPHER_PADDING_PKCS7
+ *
+ * MBEDTLS_CIPHER_PADDING_XXX: Uncomment or comment macros to add support for
+ * specific padding modes in the cipher layer with cipher modes that support
+ * padding (e.g. CBC)
+ *
+ * If you disable all padding modes, only full blocks can be used with CBC.
+ *
+ * Enable padding modes in the cipher layer.
+ */
+//#define MBEDTLS_CIPHER_PADDING_PKCS7
+//#define MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS
+//#define MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN
+//#define MBEDTLS_CIPHER_PADDING_ZEROS
+
+/**
+ * \def MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ *
+ * MBEDTLS_ECP_XXXX_ENABLED: Enables specific curves within the Elliptic Curve
+ * module.  By default all supported curves are enabled.
+ *
+ * Comment macros to disable the curve and functions for it
+ */
+//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE448_ENABLED
+
+/**
+ * \def MBEDTLS_ECP_NIST_OPTIM
+ *
+ * Enable specific 'modulo p' routines for each NIST prime.
+ * Depending on the prime and architecture, makes operations 4 to 8 times
+ * faster on the corresponding curve.
+ *
+ * Comment this macro to disable NIST curves optimisation.
+ */
+//#define MBEDTLS_ECP_NIST_OPTIM
+
+/**
+ * \def MBEDTLS_ECP_RESTARTABLE
+ *
+ * Enable "non-blocking" ECC operations that can return early and be resumed.
+ *
+ * This allows various functions to pause by returning
+ * #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in Mbed TLS's SSL module,
+ * MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in order
+ * to further progress and eventually complete their operation. This is
+ * controlled through mbedtls_ecp_set_max_ops() which limits the maximum number
+ * of ECC operations a function may perform before pausing; see
+ * mbedtls_ecp_set_max_ops() for more information.
+ *
+ * This is useful in non-threaded environments if you want to avoid blocking
+ * for too long on ECC (and, hence, X.509 or SSL/TLS) operations.
+ *
+ * Uncomment this macro to enable restartable ECC computations.
+ *
+ * \note  This option only works with the default software implementation of
+ *        elliptic curve functionality. It is incompatible with
+ *        MBEDTLS_ECP_ALT, MBEDTLS_ECDH_XXX_ALT and MBEDTLS_ECDSA_XXX_ALT.
+ */
+//#define MBEDTLS_ECP_RESTARTABLE
+
+/**
+ * \def MBEDTLS_ECDSA_DETERMINISTIC
+ *
+ * Enable deterministic ECDSA (RFC 6979).
+ * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
+ * may result in a compromise of the long-term signing key. This is avoided by
+ * the deterministic variant.
+ *
+ * Requires: MBEDTLS_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+ */
+//#define MBEDTLS_ECDSA_DETERMINISTIC
+
+/**
+ * \def MBEDTLS_PK_PARSE_EC_EXTENDED
+ *
+ * Enhance support for reading EC keys using variants of SEC1 not allowed by
+ * RFC 5915 and RFC 5480.
+ *
+ * Currently this means parsing the SpecifiedECDomain choice of EC
+ * parameters (only known groups are supported, not arbitrary domains, to
+ * avoid validation issues).
+ *
+ * Disable if you only need to support RFC 5915 + 5480 key formats.
+ */
+//#define MBEDTLS_PK_PARSE_EC_EXTENDED
+
+/**
+ * \def MBEDTLS_ERROR_STRERROR_DUMMY
+ *
+ * Enable a dummy error function to make use of mbedtls_strerror() in
+ * third party libraries easier when MBEDTLS_ERROR_C is disabled
+ * (no effect when MBEDTLS_ERROR_C is enabled).
+ *
+ * You can safely disable this if MBEDTLS_ERROR_C is enabled, or if you're
+ * not using mbedtls_strerror() or error_strerror() in your application.
+ *
+ * Disable if you run into name conflicts and want to really remove the
+ * mbedtls_strerror()
+ */
+//#define MBEDTLS_ERROR_STRERROR_DUMMY
+
+/**
+ * \def MBEDTLS_GENPRIME
+ *
+ * Enable the prime-number generation code.
+ *
+ * Requires: MBEDTLS_BIGNUM_C
+ */
+//#define MBEDTLS_GENPRIME
+
+/**
+ * \def MBEDTLS_FS_IO
+ *
+ * Enable functions that use the filesystem.
+ */
+//#define MBEDTLS_FS_IO
+
+/**
+ * \def MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ * Do not add default entropy sources. These are the platform specific,
+ * mbedtls_timing_hardclock and HAVEGE based poll functions.
+ *
+ * This is useful to have more control over the added entropy sources in an
+ * application.
+ *
+ * Uncomment this macro to prevent loading of default entropy functions.
+ */
+//#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+
+/**
+ * \def MBEDTLS_NO_PLATFORM_ENTROPY
+ *
+ * Do not use built-in platform entropy functions.
+ * This is useful if your platform does not support
+ * standards like the /dev/urandom or Windows CryptoAPI.
+ *
+ * Uncomment this macro to disable the built-in platform entropy functions.
+ */
+//#define MBEDTLS_NO_PLATFORM_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_FORCE_SHA256
+ *
+ * Force the entropy accumulator to use a SHA-256 accumulator instead of the
+ * default SHA-512 based one (if both are available).
+ *
+ * Requires: MBEDTLS_SHA256_C
+ *
+ * On 32-bit systems SHA-256 can be much faster than SHA-512. Use this option
+ * if you have performance concerns.
+ *
+ * This option is only useful if both MBEDTLS_SHA256_C and
+ * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
+ */
+//#define MBEDTLS_ENTROPY_FORCE_SHA256
+
+/**
+ * \def MBEDTLS_ENTROPY_NV_SEED
+ *
+ * Enable the non-volatile (NV) seed file-based entropy source.
+ * (Also enables the NV seed read/write functions in the platform layer)
+ *
+ * This is crucial (if not required) on systems that do not have a
+ * cryptographic entropy source (in hardware or kernel) available.
+ *
+ * Requires: MBEDTLS_ENTROPY_C, MBEDTLS_PLATFORM_C
+ *
+ * \note The read/write functions that are used by the entropy source are
+ *       determined in the platform layer, and can be modified at runtime and/or
+ *       compile-time depending on the flags (MBEDTLS_PLATFORM_NV_SEED_*) used.
+ *
+ * \note If you use the default implementation functions that read a seedfile
+ *       with regular fopen(), please make sure you make a seedfile with the
+ *       proper name (defined in MBEDTLS_PLATFORM_STD_NV_SEED_FILE) and at
+ *       least MBEDTLS_ENTROPY_BLOCK_SIZE bytes in size that can be read from
+ *       and written to or you will get an entropy source error! The default
+ *       implementation will only use the first MBEDTLS_ENTROPY_BLOCK_SIZE
+ *       bytes from the file.
+ *
+ * \note The entropy collector will write to the seed file before entropy is
+ *       given to an external source, to update it.
+ */
+//#define MBEDTLS_ENTROPY_NV_SEED
+
+/* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+ *
+ * In PSA key storage, encode the owner of the key.
+ *
+ * This is only meaningful when building the library as part of a
+ * multi-client service. When you activate this option, you must provide
+ * an implementation of the type psa_key_owner_id_t and a translation
+ * from psa_key_file_id_t to file name in all the storage backends that
+ * you wish to support.
+ *
+ * Note that this option is meant for internal use only and may be removed
+ * without notice.
+ */
+//#define MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+
+/**
+ * \def MBEDTLS_MEMORY_DEBUG
+ *
+ * Enable debugging of buffer allocator memory issues. Automatically prints
+ * (to stderr) all (fatal) messages on memory allocation issues. Enables
+ * function for 'debug output' of allocated memory.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Uncomment this macro to let the buffer allocator print out error messages.
+ */
+//#define MBEDTLS_MEMORY_DEBUG
+
+/**
+ * \def MBEDTLS_MEMORY_BACKTRACE
+ *
+ * Include backtrace information with each allocated block.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *           GLIBC-compatible backtrace() an backtrace_symbols() support
+ *
+ * Uncomment this macro to include backtrace information
+ */
+//#define MBEDTLS_MEMORY_BACKTRACE
+
+/**
+ * \def MBEDTLS_PK_RSA_ALT_SUPPORT
+ *
+ * Support external private RSA keys (eg from a HSM) in the PK layer.
+ *
+ * Comment this macro to disable support for external private RSA keys.
+ */
+//#define MBEDTLS_PK_RSA_ALT_SUPPORT
+
+/**
+ * \def MBEDTLS_PKCS1_V15
+ *
+ * Enable support for PKCS#1 v1.5 encoding.
+ *
+ * Requires: MBEDTLS_RSA_C
+ *
+ * This enables support for PKCS#1 v1.5 operations.
+ */
+//#define MBEDTLS_PKCS1_V15
+
+/**
+ * \def MBEDTLS_PKCS1_V21
+ *
+ * Enable support for PKCS#1 v2.1 encoding.
+ *
+ * Requires: MBEDTLS_MD_C, MBEDTLS_RSA_C
+ *
+ * This enables support for RSAES-OAEP and RSASSA-PSS operations.
+ */
+//#define MBEDTLS_PKCS1_V21
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_SPM
+ *
+ * When MBEDTLS_PSA_CRYPTO_SPM is defined, the code is built for SPM (Secure
+ * Partition Manager) integration which separates the code into two parts: a
+ * NSPE (Non-Secure Process Environment) and an SPE (Secure Process
+ * Environment).
+ *
+ * Module:  library/psa_crypto.c
+ * Requires: MBEDTLS_PSA_CRYPTO_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_SPM
+
+/**
+ * \def MBEDTLS_PSA_INJECT_ENTROPY
+ *
+ * Enable support for entropy injection at first boot. This feature is
+ * required on systems that do not have a built-in entropy source (TRNG).
+ * This feature is currently not supported on systems that have a built-in
+ * entropy source.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_STORAGE_C, MBEDTLS_ENTROPY_NV_SEED
+ *
+ */
+//#define MBEDTLS_PSA_INJECT_ENTROPY
+
+/**
+ * \def MBEDTLS_RSA_NO_CRT
+ *
+ * Do not use the Chinese Remainder Theorem
+ * for the RSA private operation.
+ *
+ * Uncomment this macro to disable the use of CRT in RSA.
+ *
+ */
+//#define MBEDTLS_RSA_NO_CRT
+
+/**
+ * \def MBEDTLS_SELF_TEST
+ *
+ * Enable the checkup functions (*_self_test).
+ */
+//#define MBEDTLS_SELF_TEST
+
+/**
+ * \def MBEDTLS_SHA256_SMALLER
+ *
+ * Enable an implementation of SHA-256 that has lower ROM footprint but also
+ * lower performance.
+ *
+ * The default implementation is meant to be a reasonable compromise between
+ * performance and size. This version optimizes more aggressively for size at
+ * the expense of performance. Eg on Cortex-M4 it reduces the size of
+ * mbedtls_sha256_process() from ~2KB to ~0.5KB for a performance hit of about
+ * 30%.
+ *
+ * Uncomment to enable the smaller implementation of SHA256.
+ */
+#define MBEDTLS_SHA256_SMALLER
+
+/**
+ * \def MBEDTLS_THREADING_ALT
+ *
+ * Provide your own alternate threading implementation.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to allow your own alternate threading implementation.
+ */
+//#define MBEDTLS_THREADING_ALT
+
+/**
+ * \def MBEDTLS_THREADING_PTHREAD
+ *
+ * Enable the pthread wrapper layer for the threading layer.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to enable pthread mutexes.
+ */
+//#define MBEDTLS_THREADING_PTHREAD
+
+/**
+ * \def MBEDTLS_USE_PSA_CRYPTO
+ *
+ * Make the X.509 and TLS library use PSA for cryptographic operations, see
+ * #MBEDTLS_PSA_CRYPTO_C.
+ *
+ * Note: this option is still in progress, the full X.509 and TLS modules are
+ * not covered yet, but parts that are not ported to PSA yet will still work
+ * as usual, so enabling this option should not break backwards compatibility.
+ *
+ * \warning  Support for PSA is still an experimental feature.
+ *           Any public API that depends on this option may change
+ *           at any time until this warning is removed.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C.
+ */
+//#define MBEDTLS_USE_PSA_CRYPTO
+
+/**
+ * \def MBEDTLS_VERSION_FEATURES
+ *
+ * Allow run-time checking of compile-time enabled features. Thus allowing users
+ * to check at run-time if the library is for instance compiled with threading
+ * support via mbedtls_version_check_feature().
+ *
+ * Requires: MBEDTLS_VERSION_C
+ *
+ * Comment this to disable run-time checking and save ROM space
+ */
+//#define MBEDTLS_VERSION_FEATURES
+
+/* \} name SECTION: mbed TLS feature support */
+
+/**
+ * \name SECTION: mbed TLS modules
+ *
+ * This section enables or disables entire modules in mbed TLS
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_AESNI_C
+ *
+ * Enable AES-NI support on x86-64.
+ *
+ * Module:  library/aesni.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the AES-NI instructions on x86-64
+ */
+//#define MBEDTLS_AESNI_C
+
+/**
+ * \def MBEDTLS_AES_C
+ *
+ * Enable the AES block cipher.
+ *
+ * Module:  library/aes.c
+ * Caller:  library/cipher.c
+ *          library/pem.c
+ *          library/ctr_drbg.c
+ *
+ * This module is required to support the TLS ciphersuites that use the AES
+ * cipher.
+ *
+ * PEM_PARSE uses AES for decrypting encrypted keys.
+ */
+//#define MBEDTLS_AES_C
+
+/**
+ * \def MBEDTLS_ARC4_C
+ *
+ * Enable the ARCFOUR stream cipher.
+ *
+ * Module:  library/arc4.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the ARC4
+ * cipher.
+ *
+ * \warning   ARC4 is considered a weak cipher and its use constitutes a
+ *            security risk. If possible, we recommend avoidng dependencies on
+ *            it, and considering stronger ciphers instead.
+ *
+ */
+//#define MBEDTLS_ARC4_C
+
+/**
+ * \def MBEDTLS_ASN1_PARSE_C
+ *
+ * Enable the generic ASN1 parser.
+ *
+ * Module:  library/asn1.c
+ * Caller:  library/dhm.c
+ *          library/pkcs12.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ */
+//#define MBEDTLS_ASN1_PARSE_C
+
+/**
+ * \def MBEDTLS_ASN1_WRITE_C
+ *
+ * Enable the generic ASN1 writer.
+ *
+ * Module:  library/asn1write.c
+ * Caller:  library/ecdsa.c
+ *          library/pkwrite.c
+ */
+//#define MBEDTLS_ASN1_WRITE_C
+
+/**
+ * \def MBEDTLS_BASE64_C
+ *
+ * Enable the Base64 module.
+ *
+ * Module:  library/base64.c
+ * Caller:  library/pem.c
+ *
+ * This module is required for PEM support (required by X.509).
+ */
+//#define MBEDTLS_BASE64_C
+
+/**
+ * \def MBEDTLS_BIGNUM_C
+ *
+ * Enable the multi-precision integer library.
+ *
+ * Module:  library/bignum.c
+ * Caller:  library/dhm.c
+ *          library/ecp.c
+ *          library/ecdsa.c
+ *          library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is required for RSA, DHM and ECC (ECDH, ECDSA) support.
+ */
+//#define MBEDTLS_BIGNUM_C
+
+/**
+ * \def MBEDTLS_BLOWFISH_C
+ *
+ * Enable the Blowfish block cipher.
+ *
+ * Module:  library/blowfish.c
+ */
+//#define MBEDTLS_BLOWFISH_C
+
+/**
+ * \def MBEDTLS_CAMELLIA_C
+ *
+ * Enable the Camellia block cipher.
+ *
+ * Module:  library/camellia.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * Camellia cipher.
+ */
+//#define MBEDTLS_CAMELLIA_C
+
+/**
+ * \def MBEDTLS_ARIA_C
+ *
+ * Enable the ARIA block cipher.
+ *
+ * Module:  library/aria.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * ARIA cipher.
+ */
+//#define MBEDTLS_ARIA_C
+
+/**
+ * \def MBEDTLS_CCM_C
+ *
+ * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
+ *
+ * Module:  library/ccm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support AES-CCM ciphersuites in TLS.
+ */
+//#define MBEDTLS_CCM_C
+
+/**
+ * \def MBEDTLS_CHACHA20_C
+ *
+ * Enable the ChaCha20 stream cipher.
+ *
+ * Module:  library/chacha20.c
+ */
+//#define MBEDTLS_CHACHA20_C
+
+/**
+ * \def MBEDTLS_CHACHAPOLY_C
+ *
+ * Enable the ChaCha20-Poly1305 AEAD algorithm.
+ *
+ * Module:  library/chachapoly.c
+ *
+ * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
+ */
+//#define MBEDTLS_CHACHAPOLY_C
+
+/**
+ * \def MBEDTLS_CIPHER_C
+ *
+ * Enable the generic cipher layer.
+ *
+ * Module:  library/cipher.c
+ *
+ * Uncomment to enable generic cipher wrappers.
+ */
+//#define MBEDTLS_CIPHER_C
+
+/**
+ * \def MBEDTLS_CMAC_C
+ *
+ * Enable the CMAC (Cipher-based Message Authentication Code) mode for block
+ * ciphers.
+ *
+ * Module:  library/cmac.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
+ *
+ */
+//#define MBEDTLS_CMAC_C
+
+/**
+ * \def MBEDTLS_CTR_DRBG_C
+ *
+ * Enable the CTR_DRBG AES-based random generator.
+ * The CTR_DRBG generator uses AES-256 by default.
+ * To use AES-128 instead, enable MBEDTLS_CTR_DRBG_USE_128_BIT_KEY below.
+ *
+ * Module:  library/ctr_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_AES_C
+ *
+ * This module provides the CTR_DRBG AES random number generator.
+ */
+//#define MBEDTLS_CTR_DRBG_C
+
+/**
+ * \def MBEDTLS_DES_C
+ *
+ * Enable the DES block cipher.
+ *
+ * Module:  library/des.c
+ * Caller:  library/pem.c
+ *          library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the DES
+ * cipher.
+ *
+ * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
+ *
+ * \warning   DES is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ */
+//#define MBEDTLS_DES_C
+
+/**
+ * \def MBEDTLS_DHM_C
+ *
+ * Enable the Diffie-Hellman-Merkle module.
+ *
+ * Module:  library/dhm.c
+ *
+ * This module is used by the following key exchanges:
+ *      DHE-RSA, DHE-PSK
+ *
+ * \warning    Using DHE constitutes a security risk as it
+ *             is not possible to validate custom DH parameters.
+ *             If possible, it is recommended users should consider
+ *             preferring other methods of key exchange.
+ *             See dhm.h for more details.
+ *
+ */
+//#define MBEDTLS_DHM_C
+
+/**
+ * \def MBEDTLS_ECDH_C
+ *
+ * Enable the elliptic curve Diffie-Hellman library.
+ *
+ * Module:  library/ecdh.c
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
+ *
+ * Requires: MBEDTLS_ECP_C
+ */
+//#define MBEDTLS_ECDH_C
+
+/**
+ * \def MBEDTLS_ECDSA_C
+ *
+ * Enable the elliptic curve DSA library.
+ *
+ * Module:  library/ecdsa.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_ASN1_WRITE_C, MBEDTLS_ASN1_PARSE_C
+ */
+//#define MBEDTLS_ECDSA_C
+
+/**
+ * \def MBEDTLS_ECJPAKE_C
+ *
+ * Enable the elliptic curve J-PAKE library.
+ *
+ * \warning This is currently experimental. EC J-PAKE support is based on the
+ * Thread v1.0.0 specification; incompatible changes to the specification
+ * might still happen. For this reason, this is disabled by default.
+ *
+ * Module:  library/ecjpake.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECJPAKE
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_MD_C
+ */
+//#define MBEDTLS_ECJPAKE_C
+
+/**
+ * \def MBEDTLS_ECP_C
+ *
+ * Enable the elliptic curve over GF(p) library.
+ *
+ * Module:  library/ecp.c
+ * Caller:  library/ecdh.c
+ *          library/ecdsa.c
+ *          library/ecjpake.c
+ *
+ * Requires: MBEDTLS_BIGNUM_C and at least one MBEDTLS_ECP_DP_XXX_ENABLED
+ */
+//#define MBEDTLS_ECP_C
+
+/**
+ * \def MBEDTLS_ENTROPY_C
+ *
+ * Enable the platform-specific entropy code.
+ *
+ * Module:  library/entropy.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SHA512_C or MBEDTLS_SHA256_C
+ *
+ * This module provides a generic entropy pool
+ */
+//#define MBEDTLS_ENTROPY_C
+
+/**
+ * \def MBEDTLS_ERROR_C
+ *
+ * Enable error code to error string conversion.
+ *
+ * Module:  library/error.c
+ * Caller:
+ *
+ * This module enables mbedtls_strerror().
+ */
+//#define MBEDTLS_ERROR_C
+
+/**
+ * \def MBEDTLS_GCM_C
+ *
+ * Enable the Galois/Counter Mode (GCM) for AES.
+ *
+ * Module:  library/gcm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support the TLS ciphersuites that use GCM.
+ */
+//#define MBEDTLS_GCM_C
+
+/**
+ * \def MBEDTLS_HAVEGE_C
+ *
+ * Enable the HAVEGE random generator.
+ *
+ * Warning: the HAVEGE random generator is not suitable for virtualized
+ *          environments
+ *
+ * Warning: the HAVEGE random generator is dependent on timing and specific
+ *          processor traits. It is therefore not advised to use HAVEGE as
+ *          your applications primary random generator or primary entropy pool
+ *          input. As a secondary input to your entropy pool, it IS able add
+ *          the (limited) extra entropy it provides.
+ *
+ * Module:  library/havege.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_TIMING_C
+ *
+ * Uncomment to enable the HAVEGE random generator.
+ */
+//#define MBEDTLS_HAVEGE_C
+
+/**
+ * \def MBEDTLS_HKDF_C
+ *
+ * Enable the HKDF algorithm (RFC 5869).
+ *
+ * Module:  library/hkdf.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the Hashed Message Authentication Code
+ * (HMAC)-based key derivation function (HKDF).
+ */
+//#define MBEDTLS_HKDF_C
+
+/**
+ * \def MBEDTLS_HMAC_DRBG_C
+ *
+ * Enable the HMAC_DRBG random generator.
+ *
+ * Module:  library/hmac_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+ */
+//#define MBEDTLS_HMAC_DRBG_C
+
+/**
+ * \def MBEDTLS_NIST_KW_C
+ *
+ * Enable the Key Wrapping mode for 128-bit block ciphers,
+ * as defined in NIST SP 800-38F. Only KW and KWP modes
+ * are supported. At the moment, only AES is approved by NIST.
+ *
+ * Module:  library/nist_kw.c
+ *
+ * Requires: MBEDTLS_AES_C and MBEDTLS_CIPHER_C
+ */
+//#define MBEDTLS_NIST_KW_C
+
+/**
+ * \def MBEDTLS_MD_C
+ *
+ * Enable the generic message digest layer.
+ *
+ * Module:  library/md.c
+ * Caller:
+ *
+ * Uncomment to enable generic message digest wrappers.
+ */
+//#define MBEDTLS_MD_C
+
+/**
+ * \def MBEDTLS_MD2_C
+ *
+ * Enable the MD2 hash algorithm.
+ *
+ * Module:  library/md2.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD2-signed X.509 certs.
+ *
+ * \warning   MD2 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD2_C
+
+/**
+ * \def MBEDTLS_MD4_C
+ *
+ * Enable the MD4 hash algorithm.
+ *
+ * Module:  library/md4.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD4-signed X.509 certs.
+ *
+ * \warning   MD4 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD4_C
+
+/**
+ * \def MBEDTLS_MD5_C
+ *
+ * Enable the MD5 hash algorithm.
+ *
+ * Module:  library/md5.c
+ * Caller:  library/md.c
+ *          library/pem.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, and for TLS 1.2
+ * depending on the handshake parameters. Further, it is used for checking
+ * MD5-signed certificates, and for PBKDF1 when decrypting PEM-encoded
+ * encrypted keys.
+ *
+ * \warning   MD5 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD5_C
+
+/**
+ * \def MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Enable the buffer allocator implementation that makes use of a (stack)
+ * based buffer to 'allocate' dynamic memory. (replaces calloc() and free()
+ * calls)
+ *
+ * Module:  library/memory_buffer_alloc.c
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *           MBEDTLS_PLATFORM_MEMORY (to use it within mbed TLS)
+ *
+ * Enable this module to enable the buffer memory allocator.
+ */
+//#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+
+/**
+ * \def MBEDTLS_OID_C
+ *
+ * Enable the OID database.
+ *
+ * Module:  library/oid.c
+ * Caller:  library/asn1write.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ *          library/pkwrite.c
+ *          library/rsa.c
+ *
+ * This modules translates between OIDs and internal values.
+ */
+//#define MBEDTLS_OID_C
+
+/**
+ * \def MBEDTLS_PADLOCK_C
+ *
+ * Enable VIA Padlock support on x86.
+ *
+ * Module:  library/padlock.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the VIA PadLock on x86.
+ */
+//#define MBEDTLS_PADLOCK_C
+
+/**
+ * \def MBEDTLS_PEM_PARSE_C
+ *
+ * Enable PEM decoding / parsing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/dhm.c
+ *          library/pkparse.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for decoding / parsing PEM files.
+ */
+//#define MBEDTLS_PEM_PARSE_C
+
+/**
+ * \def MBEDTLS_PEM_WRITE_C
+ *
+ * Enable PEM encoding / writing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for encoding / writing PEM files.
+ */
+//#define MBEDTLS_PEM_WRITE_C
+
+/**
+ * \def MBEDTLS_PK_C
+ *
+ * Enable the generic public (asymmetric) key layer.
+ *
+ * Module:  library/pk.c
+ *
+ * Requires: MBEDTLS_RSA_C or MBEDTLS_ECP_C
+ *
+ * Uncomment to enable generic public key wrappers.
+ */
+//#define MBEDTLS_PK_C
+
+/**
+ * \def MBEDTLS_PK_PARSE_C
+ *
+ * Enable the generic public (asymmetric) key parser.
+ *
+ * Module:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key parse functions.
+ */
+//#define MBEDTLS_PK_PARSE_C
+
+/**
+ * \def MBEDTLS_PK_WRITE_C
+ *
+ * Enable the generic public (asymmetric) key writer.
+ *
+ * Module:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key write functions.
+ */
+//#define MBEDTLS_PK_WRITE_C
+
+/**
+ * \def MBEDTLS_PKCS5_C
+ *
+ * Enable PKCS#5 functions.
+ *
+ * Module:  library/pkcs5.c
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the PKCS#5 functions.
+ */
+//#define MBEDTLS_PKCS5_C
+
+/**
+ * \def MBEDTLS_PKCS12_C
+ *
+ * Enable PKCS#12 PBE functions.
+ * Adds algorithms for parsing PKCS#8 encrypted private keys
+ *
+ * Module:  library/pkcs12.c
+ * Caller:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_CIPHER_C, MBEDTLS_MD_C
+ * Can use:  MBEDTLS_ARC4_C
+ *
+ * This module enables PKCS#12 functions.
+ */
+//#define MBEDTLS_PKCS12_C
+
+/**
+ * \def MBEDTLS_PLATFORM_C
+ *
+ * Enable the platform abstraction layer that allows you to re-assign
+ * functions like calloc(), free(), snprintf(), printf(), fprintf(), exit().
+ *
+ * Enabling MBEDTLS_PLATFORM_C enables to use of MBEDTLS_PLATFORM_XXX_ALT
+ * or MBEDTLS_PLATFORM_XXX_MACRO directives, allowing the functions mentioned
+ * above to be specified at runtime or compile time respectively.
+ *
+ * \note This abstraction layer must be enabled on Windows (including MSYS2)
+ * as other module rely on it for a fixed snprintf implementation.
+ *
+ * Module:  library/platform.c
+ * Caller:  Most other .c files
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+//#define MBEDTLS_PLATFORM_C
+
+/**
+ * \def MBEDTLS_POLY1305_C
+ *
+ * Enable the Poly1305 MAC algorithm.
+ *
+ * Module:  library/poly1305.c
+ * Caller:  library/chachapoly.c
+ */
+//#define MBEDTLS_POLY1305_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_C
+ *
+ * Enable the Platform Security Architecture cryptography API.
+ *
+ * Module:  library/psa_crypto.c
+ *
+ * Requires: MBEDTLS_CTR_DRBG_C, MBEDTLS_ENTROPY_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_STORAGE_C
+ *
+ * Enable the Platform Security Architecture persistent key storage.
+ *
+ * Module:  library/psa_crypto_storage.c
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C,
+ *           either MBEDTLS_PSA_ITS_FILE_C or a native implementation of
+ *           the PSA ITS interface
+ */
+//#define MBEDTLS_PSA_CRYPTO_STORAGE_C
+
+/**
+ * \def MBEDTLS_PSA_ITS_FILE_C
+ *
+ * Enable the emulation of the Platform Security Architecture
+ * Internal Trusted Storage (PSA ITS) over files.
+ *
+ * Module:  library/psa_its_file.c
+ *
+ * Requires: MBEDTLS_FS_IO
+ */
+//#define MBEDTLS_PSA_ITS_FILE_C
+
+/**
+ * \def MBEDTLS_RIPEMD160_C
+ *
+ * Enable the RIPEMD-160 hash algorithm.
+ *
+ * Module:  library/ripemd160.c
+ * Caller:  library/md.c
+ *
+ */
+//#define MBEDTLS_RIPEMD160_C
+
+/**
+ * \def MBEDTLS_RSA_C
+ *
+ * Enable the RSA public-key cryptosystem.
+ *
+ * Module:  library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is used by the following key exchanges:
+ *      RSA, DHE-RSA, ECDHE-RSA, RSA-PSK
+ *
+ * Requires: MBEDTLS_BIGNUM_C, MBEDTLS_OID_C
+ */
+/* #define MBEDTLS_RSA_C */
+
+/**
+ * \def MBEDTLS_SHA1_C
+ *
+ * Enable the SHA1 cryptographic hash algorithm.
+ *
+ * Module:  library/sha1.c
+ * Caller:  library/md.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, for TLS 1.2
+ * depending on the handshake parameters, and for SHA1-signed certificates.
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. If possible, we recommend avoiding dependencies
+ *            on it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_SHA1_C
+
+/**
+ * \def MBEDTLS_SHA256_C
+ *
+ * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
+ *
+ * Module:  library/sha256.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-224 and SHA-256.
+ * This module is required for the SSL/TLS 1.2 PRF function.
+ */
+#define MBEDTLS_SHA256_C
+
+/**
+ * \def MBEDTLS_SHA512_C
+ *
+ * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
+ *
+ * Module:  library/sha512.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-384 and SHA-512.
+ */
+//#define MBEDTLS_SHA512_C
+
+/**
+ * \def MBEDTLS_THREADING_C
+ *
+ * Enable the threading abstraction layer.
+ * By default mbed TLS assumes it is used in a non-threaded environment or that
+ * contexts are not shared between threads. If you do intend to use contexts
+ * between threads, you will need to enable this layer to prevent race
+ * conditions. See also our Knowledge Base article about threading:
+ * https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
+ *
+ * Module:  library/threading.c
+ *
+ * This allows different threading implementations (self-implemented or
+ * provided).
+ *
+ * You will have to enable either MBEDTLS_THREADING_ALT or
+ * MBEDTLS_THREADING_PTHREAD.
+ *
+ * Enable this layer to allow use of mutexes within mbed TLS
+ */
+//#define MBEDTLS_THREADING_C
+
+/**
+ * \def MBEDTLS_TIMING_C
+ *
+ * Enable the semi-portable timing interface.
+ *
+ * \note The provided implementation only works on POSIX/Unix (including Linux,
+ * BSD and OS X) and Windows. On other platforms, you can either disable that
+ * module and provide your own implementations of the callbacks needed by Mbed
+ * TLS's \c mbedtls_ssl_set_timer_cb() for DTLS, or leave it enabled and
+ * provide your own implementation of the whole module by setting
+ * \c MBEDTLS_TIMING_ALT in the current file.
+ *
+ * \note See also our Knowledge Base article about porting to a new
+ * environment:
+ * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS
+ *
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+//#define MBEDTLS_TIMING_C
+
+/**
+ * \def MBEDTLS_VERSION_C
+ *
+ * Enable run-time version information.
+ *
+ * Module:  library/version.c
+ *
+ * This module provides run-time version information.
+ */
+//#define MBEDTLS_VERSION_C
+
+/**
+ * \def MBEDTLS_XTEA_C
+ *
+ * Enable the XTEA block cipher.
+ *
+ * Module:  library/xtea.c
+ * Caller:
+ */
+//#define MBEDTLS_XTEA_C
+
+/* \} name SECTION: mbed TLS modules */
+
+/**
+ * \name SECTION: Module configuration options
+ *
+ * This section allows for the setting of module specific sizes and
+ * configuration options. The default values are already present in the
+ * relevant header files and should suffice for the regular use cases.
+ *
+ * Our advice is to enable options and change their values here
+ * only if you have a good reason and know the consequences.
+ *
+ * Please check the respective header file for documentation on these
+ * parameters (to prevent duplicate documentation).
+ * \{
+ */
+
+/* MPI / BIGNUM options */
+//#define MBEDTLS_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
+//#define MBEDTLS_MPI_MAX_SIZE            1024 /**< Maximum number of bytes for usable MPIs. */
+
+/* CTR_DRBG options */
+//#define MBEDTLS_CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+//#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
+//#define MBEDTLS_CTR_DRBG_USE_128_BIT_KEY              /**< Use 128-bit key for CTR_DRBG - may reduce security (see ctr_drbg.h) */
+
+/* HMAC_DRBG options */
+//#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_HMAC_DRBG_MAX_INPUT           256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_HMAC_DRBG_MAX_REQUEST        1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT      384 /**< Maximum size of (re)seed buffer */
+
+/* ECP options */
+//#define MBEDTLS_ECP_MAX_BITS             521 /**< Maximum bit size of groups */
+//#define MBEDTLS_ECP_WINDOW_SIZE            6 /**< Maximum window size used */
+//#define MBEDTLS_ECP_FIXED_POINT_OPTIM      1 /**< Enable fixed-point speed-up */
+
+/* Entropy options */
+//#define MBEDTLS_ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
+//#define MBEDTLS_ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
+//#define MBEDTLS_ENTROPY_MIN_HARDWARE               32 /**< Default minimum number of bytes required for the hardware entropy source mbedtls_hardware_poll() before entropy is released */
+
+/* Memory buffer allocator options */
+//#define MBEDTLS_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
+
+/* Platform options */
+//#define MBEDTLS_PLATFORM_STD_MEM_HDR   <stdlib.h> /**< Header to include if MBEDTLS_PLATFORM_NO_STD_FUNCTIONS is defined. Don't define if no header is needed. */
+//#define MBEDTLS_PLATFORM_STD_CALLOC        calloc /**< Default allocator to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_FREE            free /**< Default free to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT            exit /**< Default exit to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_TIME            time /**< Default time to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_STD_FPRINTF      fprintf /**< Default fprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_PRINTF        printf /**< Default printf to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_STD_SNPRINTF    snprintf /**< Default snprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS       0 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE       1 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_READ   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_FILE  "seedfile" /**< Seed file to read/write with default implementation */
+
+/* To Use Function Macros MBEDTLS_PLATFORM_C must be enabled */
+/* MBEDTLS_PLATFORM_XXX_MACRO and MBEDTLS_PLATFORM_XXX_ALT cannot both be defined */
+//#define MBEDTLS_PLATFORM_CALLOC_MACRO        calloc /**< Default allocator macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_FREE_MACRO            free /**< Default free macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_EXIT_MACRO            exit /**< Default exit macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_TIME_MACRO            time /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO       time_t /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_FPRINTF_MACRO      fprintf /**< Default fprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_PRINTF_MACRO        printf /**< Default printf macro to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_SNPRINTF_MACRO    snprintf /**< Default snprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_VSNPRINTF_MACRO    vsnprintf /**< Default vsnprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+
+/**
+ * Uncomment the macro to let mbed TLS use your alternate implementation of
+ * mbedtls_platform_zeroize(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * mbedtls_platform_zeroize() is a widely used function across the library to
+ * zero a block of memory. The implementation is expected to be secure in the
+ * sense that it has been written to prevent the compiler from removing calls
+ * to mbedtls_platform_zeroize() as part of redundant code elimination
+ * optimizations. However, it is difficult to guarantee that calls to
+ * mbedtls_platform_zeroize() will not be optimized by the compiler as older
+ * versions of the C language standards do not provide a secure implementation
+ * of memset(). Therefore, MBEDTLS_PLATFORM_ZEROIZE_ALT enables users to
+ * configure their own implementation of mbedtls_platform_zeroize(), for
+ * example by using directives specific to their compiler, features from newer
+ * C standards (e.g using memset_s() in C11) or calling a secure memset() from
+ * their system (e.g explicit_bzero() in BSD).
+ */
+//#define MBEDTLS_PLATFORM_ZEROIZE_ALT
+
+/**
+ * Uncomment the macro to let Mbed TLS use your alternate implementation of
+ * mbedtls_platform_gmtime_r(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * gmtime() is not a thread-safe function as defined in the C standard. The
+ * library will try to use safer implementations of this function, such as
+ * gmtime_r() when available. However, if Mbed TLS cannot identify the target
+ * system, the implementation of mbedtls_platform_gmtime_r() will default to
+ * using the standard gmtime(). In this case, calls from the library to
+ * gmtime() will be guarded by the global mutex mbedtls_threading_gmtime_mutex
+ * if MBEDTLS_THREADING_C is enabled. We recommend that calls from outside the
+ * library are also guarded with this mutex to avoid race conditions. However,
+ * if the macro MBEDTLS_PLATFORM_GMTIME_R_ALT is defined, Mbed TLS will
+ * unconditionally use the implementation for mbedtls_platform_gmtime_r()
+ * supplied at compile time.
+ */
+//#define MBEDTLS_PLATFORM_GMTIME_R_ALT
+
+/* \} name SECTION: Customisation configuration options */
+
+/* Target and application specific configurations
+ *
+ * Allow user to override any previous default.
+ *
+ */
+#if defined(MBEDTLS_USER_CONFIG_FILE)
+#include MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#include "mbedtls/check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
new file mode 100644
index 00000000..8ebb6f6f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
@@ -0,0 +1,142 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef NVMS_LOW_LEVEL_H
+#define NVMS_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Constants Exported Constants
+  * @{
+  */
+#define NVMS_LL_BLOCK0_ADDRESS   KMS_DATASTORAGE_START
+#define NVMS_LL_BLOCK1_ADDRESS   (KMS_DATASTORAGE_START + NVMS_LL_BLOCK_SIZE)
+
+#define NVMS_LL_NB_PAGE_PER_BLOCK  (NVMS_LL_BLOCK_SIZE / FLASH_PAGE_SIZE)
+#define NVMS_LL_BLOCK_SIZE         ((KMS_DATASTORAGE_END- KMS_DATASTORAGE_START + 1U) / 2U)
+
+#define NVMS_LL_ERASED           0xFFFFFFFFU
+
+/* not physical flash page size, but writing granularity size -> 8 bytes */
+#define NVMS_LL_PAGE_SIZE    8UL
+
+/**
+  * @}
+  */
+
+/* Exported types ------------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief   Block identifiers.
+  */
+typedef enum
+{
+  NVMS_BLOCK0 = 0,
+  NVMS_BLOCK1 = 1,
+} nvms_block_t;
+
+
+/**
+  * @}
+  */
+
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+void NVMS_LL_Init(void);
+bool NVMS_LL_IsBlockErased(nvms_block_t block);
+bool NVMS_LL_BlockErase(nvms_block_t block);
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size);
+
+/* Exported in line functions ------------------------------------------------*/
+
+/**
+  * @brief   Returns the base address of the specified flash block
+  * @param   block block identifier
+  * @retval  pointer to the block base
+  */
+static inline uint32_t NVMS_LL_GetBlockAddress(nvms_block_t block)
+{
+
+  if (block == NVMS_BLOCK0)
+  {
+    return (uint32_t)NVMS_LL_BLOCK0_ADDRESS;
+  }
+  return (uint32_t)NVMS_LL_BLOCK1_ADDRESS;
+}
+
+
+/**
+  * @brief   Returns the size of the flash blocks
+  * @note    Blocks are required to be of equal size
+  * @retval  Block size
+  */
+static inline size_t NVMS_LL_GetBlockSize(void)
+{
+
+  return NVMS_LL_BLOCK_SIZE;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NVMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
new file mode 100644
index 00000000..8a159341
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    se_crypto_config.h
+  * @author  MCD Application Team
+  *          This file provides a template to configure the crypto scheme used
+  *          for the services used by the bootloader (crypto operations for the
+  *          Firmware and Metadata).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_CRYPTO_CONFIG_H
+#define SE_CRYPTO_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup SE_CRYPTO SE Crypto
+  * @{
+  */
+
+/** @defgroup SE_CRYPTO_CONFIG SE Crypto scheme configuration
+  * @brief Choose the cryptographic scheme you want the bootloader to use.
+  *        These settings apply to the services used by the bootloader only, not to the services called by the User
+  *        Application.
+  * @{
+  */
+
+/**
+  * SE_CoreBin instantiates the crypto scheme selected thanks to "SECBOOT_CRYPTO_SCHEME".
+  * "SECBOOT_CRYPTO_SCHEME" is composed as indicated below:
+  *        SECBOOT_authenticationalgo_encryptionalgo_MACalgo
+  *
+  * Set "SECBOOT_CRYPTO_SCHEME" to one of the values listed below:
+  *
+  * SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256: no FW encryption, only Authentication and Integrity are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           No Firmware encryption.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           Decrypt Firmware Image with AES128-CBC.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using AES128-GCM tag.
+  *                           Decrypt Firmware image using AES128-GCM algo.
+  *                           Firmware Image Integrity using AES128-GCM tag.
+  */
+#define SECBOOT_CRYPTO_SCHEME SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256     /*!< Selected Crypto Scheme */
+
+#define SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256        (1U) /*!< asymmetric crypto, no FW encryption           */
+#define SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256        (2U) /*!< asymmetric crypto with encrypted Firmware     */
+#define SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM     (3U) /*!< symmetric crypto                              */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_CRYPTO_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
new file mode 100644
index 00000000..85f027a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
@@ -0,0 +1,215 @@
+/**
+  ******************************************************************************
+  * @file    se_def_metadata.h
+  * @author  MCD Application Team
+  * @brief   This file contains metadata definitions for SE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_DEF_METADATA_H
+#define SE_DEF_METADATA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "se_crypto_config.h"
+
+/** @addtogroup  SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup  SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup  SE_CORE_DEF SE Definitions
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA SE Metadata Definitions
+  *  @brief definitions related to FW metadata (header).
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Constants Exported Constants
+  * @brief  Firmware Image Header (FW metadata) constants
+  * @{
+  */
+
+#define SE_FW_HEADER_TOT_LEN    (sizeof(SE_FwRawHeaderTypeDef))   /*!< FW INFO header Total Length */
+#define SE_FW_HEADER_SIGN_LEN   SE_HEADER_SIGN_LEN                /*!< FW Header signature Len */
+#define SE_FW_HEADER_STATE_LEN  (3U * 32U)                        /*!< FW Header state Len */
+#define SE_FW_HEADER_FINGERPRINT_LEN  (32U)                       /*!< FW Header finger print Len */
+#define SE_FW_AUTH_LEN          (SE_FW_HEADER_TOT_LEN - SE_FW_HEADER_SIGN_LEN  \
+                                 - SE_FW_HEADER_STATE_LEN - SE_FW_HEADER_FINGERPRINT_LEN) /*!< Authenticated part of the header */
+
+#define SE_SYMKEY_LEN           (16U)  /*!< SE Symmetric Key length (bytes)*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+/* AES-GCM encryption and FW Tag */
+#define SE_NONCE_LEN            (12U)  /*!< Secure Engine Nonce Length (Bytes)*/
+#define SE_TAG_LEN              (16U)  /*!< Secure Engine Tag Length (Bytes): AES-GCM for the FW tag */
+#define SE_HEADER_SIGN_LEN      (16U)  /*!< Firmware Header signature LEN : AES-GCM for header signature */
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/* AES-CBC encryption (or no encryption) and SHA256 for FW tag */
+#define SE_IV_LEN               (16U)  /*!< Secure Engine IV Length (Bytes): same size as an AES block*/
+#define SE_TAG_LEN              (32U)  /*!< Secure Engine Tag Length (Bytes): SHA-256 for the FW tag */
+#define SE_HEADER_SIGN_LEN      (64U)  /*!< Firmware Header signarure LEN*/
+#define SE_ASYM_PUBKEY_LEN      (64U)  /*!< SE Asymmetric Public Key length (bytes)*/
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Image type: complete or partial image */
+#define SE_FW_IMAGE_COMPLETE    (0U) /*!< Complete Fw Image */
+#define SE_FW_IMAGE_PARTIAL     (1U) /*!< Partial Fw Image */
+
+/*!< FW Magic IDs */
+#define SFUM_1 "SFU1"      /*!< Active Slot #1 : first active also referred as master */
+#define SFUM_2 "SFU2"      /*!< Active Slot #2 : second active slot */
+#define SFUM_3 "SFU3"      /*!< Active Slot #3 : third active slot */
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/* SE_FwStateTypeDef - firmware image state type representing the state of the firmware image
+ * In the header (SE_FwRawHeaderTypeDef.FwImageState), these states are encoded as follows:
+   * FWIMG_STATE_INVALID  : 32 * 0x00, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID    : 32 * 0xFF, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID_ALL: 32 * 0xFF, 32 * 0x55, 32 * 0x00
+   * FWIMG_STATE_SELFTEST : 32 * 0xFF, 32 * 0xFF, 32 * 0x00
+   * FWIMG_STATE_NEW      : 32 * 0xFF, 32 * 0xFF, 32 * 0xFF
+ */
+typedef enum
+{
+  FWIMG_STATE_INVALID   = 0U, /* image is not valid (typically selftest has failed) and should not boot */
+  FWIMG_STATE_VALID     = 1U, /* image is valid (selftest passed), image OK to boot if signature checks pass */
+  FWIMG_STATE_VALID_ALL = 2U, /* master image is valid (selftest passed), all other images are automatically validated */
+  FWIMG_STATE_SELFTEST  = 3U, /* self tests to be executed. Image OK to boot one time if signature checks pass */
+  FWIMG_STATE_NEW       = 4U, /* new image, has never run on the device */
+} SE_FwStateTypeDef;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief  Firmware Header structure definition
+  * @note This structure MUST be called SE_FwRawHeaderTypeDef
+  * @note This structure MUST contain a field named 'FwVersion'
+  * @note This structure MUST contain a field named 'FwSize'
+  * @note This structure MUST contain a field named 'FwTag' (to control intergrity of full FW)
+  * @note This structure MUST contain a field named 'PartialFwOffset'
+  * @note This structure MUST contain a field named 'PartialFwSize'
+  * @note This structure MUST contain a field named 'PartialFwTag' (to control intergrity of partial FW)
+  * @note This structure MUST contain a field named 'HeaderSignature' (to control authentication of the header)
+  * @note This structure MUST contain a field named 'FwImageState' (not part of the authentified header)
+  * @note This structure MUST contain a field named 'PrevHeaderFingerprint' (not part of the authentified header)
+  * @note In this example, the header size is always a multiple of 32 to match the FLASH constraint on STM32H7.
+  *       We keep this alignment for all platforms (even when the FLASH alignment constraint is another value) to have
+  *       one unique header size per crypto scheme.
+  * @note In this example, the authentified header size + the header signature is always 192 bytes (for all crypto
+  *       schemes).
+  */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Nonce[SE_NONCE_LEN];    /*!< Nonce used to encrypt firmware*/
+  uint8_t  Reserved[112U];         /*!< Reserved for future use: 112 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN]; /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  InitVector[SE_IV_LEN];  /*!< IV used to encrypt firmware */
+  uint8_t  Reserved[28U];          /*!< Reserved for future use: 28 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Reserved[44U];          /*!< Reserved for future use: 44 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#else
+
+#error "The current example does not support the selected crypto scheme."
+
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_DEF_METADATA_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
new file mode 100644
index 00000000..3d7e71b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Engine low level interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_LOW_LEVEL_H
+#define SE_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+
+/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
+   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
+#include "sfu_fwimg_regions.h"
+
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup SE
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
+  * @{
+  */
+/**
+  * @brief flash handling constants: these constants are used in se_fwimg.c
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
+  * @{
+  */
+
+/**
+  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
+  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
+  * 32-bit word.
+  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
+  */
+#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
+  do{                                  \
+    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
+  }while(0)
+
+/**
+  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
+  */
+#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
+  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
+  * @{
+  */
+
+/**
+  * Code isolation based on Firewall
+  */
+#define SFU_ISOLATE_SE_WITH_MPU
+
+/**
+  * MPU : Enter/Exit secured area ==> nothing to do
+  */
+#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
+#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
+
+/**
+  * Service to enable/disable interrupts
+  */
+#define UPDATE_IRQ_SERVICE
+
+
+/** @addtogroup SE_LOW_LEVEL_Exported_Functions
+  * @{
+  */
+void SE_LL_CORE_Cleanup(void);
+#if defined (__CC_ARM)
+void __arm_clean_data(void);
+#elif defined(__GNUC__)
+void __gcc_clean_data(void);
+#endif /* __CC_ARM */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_Functions
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void);
+SE_ErrorStatus SE_LL_CRC_Init(void);
+SE_ErrorStatus SE_LL_CRC_DeInit(void);
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..99ddd88d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+/* #define HAL_IWDG_MODULE_ENABLED */
+/* #define HAL_LPTIM_MODULE_ENABLED */
+#define HAL_PKA_MODULE_ENABLED
+/* #define HAL_RNG_MODULE_ENABLED */
+/* #define HAL_RTC_MODULE_ENABLED */
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+/* #define HAL_TIM_MODULE_ENABLED */
+/* #define HAL_UART_MODULE_ENABLED */
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+/* #define HAL_EXTI_MODULE_ENABLED */
+/* #define HAL_CORTEX_MODULE_ENABLED */
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..15b64f1c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
@@ -0,0 +1,693 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>0</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\data_init.c</PathWithFileName>
+      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
+      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
+      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
+      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
+      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
+      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..aff0e063
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>SECoreBin</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name>prebuild.bat .</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SECoreBin.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--entry=SE_CallGate
+--diag_suppress L6404W
+--diag_suppress L6314W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>data_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\data_init.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ca_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>nvms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/nvms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_low_level.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_callgate.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_exception.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_fwimg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_der_x962.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_digest.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_dyn_obj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_ecc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_enc_dec.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_key_mgt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_nvm_storage.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_platf_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+          <Files>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
+            <File>
+              <FileName>sha256.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_SECoreBin"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..040b3b1a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,145 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_UserApp_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..12d0d796
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,142 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_UserApp_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..007d3907
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,144 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_UserApp_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
new file mode 100644
index 00000000..8f3619cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
@@ -0,0 +1,26 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+
+; *** regions needed by SE_CoreBin project ***
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
+  *(.SE_CallGate_Code)
+  }
+  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
+  *(.SE_Startup_Code)
+  }
+  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_CODE_NOKEY_REGION_ROM_SIZE{
+  .ANY (+RO)
+  } 
+  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
+  *(.SE_embedded_Keys)
+  }
+  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
new file mode 100644
index 00000000..67246f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
@@ -0,0 +1,84 @@
+/**
+  ******************************************************************************
+  * @file    data_init.c
+  * @author  MCD Application Team
+  * @brief   Data section (RW + ZI) initialization.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+******************************************************************************
+*/
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+
+extern uint32_t Image$$SE_region_RAM$$RW$$Base;
+extern uint32_t Load$$SE_region_RAM$$RW$$Base;
+extern uint32_t Image$$SE_region_RAM$$RW$$Length;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Base;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Length;
+
+
+#define data_ram Image$$SE_region_RAM$$RW$$Base
+#define data_rom Load$$SE_region_RAM$$RW$$Base
+#define data_rom_length Image$$SE_region_RAM$$RW$$Length
+#define bss Image$$SE_region_RAM$$ZI$$Base
+#define bss_length Image$$SE_region_RAM$$ZI$$Length;
+
+
+/**
+  * @brief  Copy initialized data from ROM to RAM.
+  * @param  None.
+  * @retval None.
+  */
+void LoopCopyDataInit(void) 
+{
+  uint32_t i;
+	uint8_t* src = (uint8_t*)&data_rom;
+	uint8_t* dst = (uint8_t*)&data_ram;
+	uint32_t len = (uint32_t)&data_rom_length;
+
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = src[i];
+  }
+}
+  
+/**
+  * @brief  Clear the zero-initialized data section.
+  * @param  None.
+  * @retval None.
+  */
+void LoopFillZerobss(void) 
+{
+  uint32_t i;
+	uint8_t* dst = (uint8_t*)&bss;
+	uint32_t len = (uint32_t)&bss_length;
+	
+	/* Clear the zero-initialized data section */
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = 0;
+  }
+}
+	
+/**
+  * @brief  Data section initialization.
+  * @param  None.
+  * @retval None.
+  */
+ void __arm_data_init(void) {
+	 	LoopFillZerobss();
+	  LoopCopyDataInit();
+} 
+ 
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
new file mode 100644
index 00000000..83291a72
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V6M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..a369fd4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SECoreBin.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value=".."/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SECoreBin.null.394363235" name="2_Images_SECoreBin"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
new file mode 100644
index 00000000..4a09bf52
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SECoreBin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ca_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
new file mode 100644
index 00000000..dcc46a55
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
@@ -0,0 +1,36 @@
+
+#include "stdint-gcc.h"
+
+#ifndef vu32
+#	define vu32 volatile uint32_t
+#endif
+
+void LoopCopyDataInit(void) {
+	extern char _sidata asm("_sidata");
+	extern char _sdata asm("_sdata");
+	extern char _edata asm("_edata");
+	
+	vu32* src = (vu32*) &_sidata;
+	vu32* dst = (vu32*) &_sdata;
+	
+	vu32 len = (&_edata - &_sdata) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = src[i];
+}
+
+void LoopFillZerobss(void) {
+	extern char _sbss asm("_sbss");
+	extern char _ebss asm("_ebss");
+	
+	vu32* dst = (vu32*) &_sbss;
+	vu32 len = (&_ebss - &_sbss) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = 0;
+}
+
+void __gcc_data_init(void) {
+	LoopFillZerobss();
+	LoopCopyDataInit();
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
new file mode 100644
index 00000000..8b684fc9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
@@ -0,0 +1,152 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(SE_CallGate)
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_CallGate_Code :
+  {
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    KEEP(*(.SE_CallGate_Code))
+  } > SE_CallGate_ROM_region
+
+  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SE_Code_NoKey_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
+  
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SE_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SE_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
new file mode 100644
index 00000000..30759a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_C
+#define CA_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "CryptoApi/ca.h"
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#include "mbedtls/entropy_poll.h"
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#define COMPILER_BARRIER() __DMB();__DSB();
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static RNG_HandleTypeDef handle;
+static uint8_t users = 0;
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private function prototypes -----------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta);
+static void RNG_Init(void);
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length);
+static void RNG_DeInit(void);
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Exported functions implementation -----------------------------------------*/
+
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+
+/**
+  * @brief CRYP MSP Initialization
+  * This function configures the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Release AES/CRYP from reset state */
+    __HAL_RCC_AES_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_AES_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief CRYP MSP De-Initialization
+  * This function freeze the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_AES_CLK_DISABLE();
+    /* Force AES/CRYP into reset state */
+    __HAL_RCC_AES_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/**
+  * @brief      PKA MSP Initialization
+  *             This function configures the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Release PKA from reset state */
+    __HAL_RCC_PKA_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_PKA_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief      PKA MSP De-Initialization
+  *             This function freeze the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_PKA_CLK_DISABLE();
+    /* Force PKA into reset state */
+    __HAL_RCC_PKA_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta)
+{
+  COMPILER_BARRIER();
+  uint8_t newValue;
+  do
+  {
+    newValue = __LDREXB(valuePtr) + delta;
+  } while (__STREXB(newValue, valuePtr));
+  COMPILER_BARRIER();
+  return newValue;
+}
+
+static void RNG_Init(void)
+{
+  uint32_t dummy;
+
+  /*  We're only supporting a single user of RNG */
+  if (atomic_incr_u8(&users, 1) > 1)
+  {
+    while (1);
+  }
+
+  /* Select MSI as RNG clock source */
+  __HAL_RCC_RNG_CONFIG(RCC_RNGCLKSOURCE_MSI);
+
+  /* RNG Peripheral clock enable */
+  __HAL_RCC_RNG_CLK_ENABLE();
+
+  /* Initialize RNG instance */
+  handle.Instance = RNG;
+  handle.State = HAL_RNG_STATE_RESET;
+  handle.Lock = HAL_UNLOCKED;
+
+  HAL_RNG_Init(&handle);
+
+  /* first random number generated after setting the RNGEN bit should not be used */
+  HAL_RNG_GenerateRandomNumber(&handle, &dummy);
+}
+
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length)
+{
+  int32_t ret = 0;
+  __IO uint8_t random[4];
+  *output_length = 0;
+
+  /* Get Random byte */
+  while ((*output_length < length) && (ret == 0))
+  {
+    if (HAL_RNG_GenerateRandomNumber(&handle, (uint32_t *)random) != HAL_OK)
+    {
+      ret = -1;
+    }
+    else
+    {
+      for (uint8_t i = 0; (i < 4) && (*output_length < length) ; i++)
+      {
+        *output++ = random[i];
+        *output_length += 1;
+        random[i] = 0;
+      }
+    }
+  }
+  /* Just be extra sure that we didn't do it wrong */
+  if ((__HAL_RNG_GET_FLAG(&handle, (RNG_FLAG_CECS | RNG_FLAG_SECS))) != 0)
+  {
+    *output_length = 0;
+  }
+}
+
+static void RNG_DeInit(void)
+{
+  /*Disable the RNG peripheral */
+  HAL_RNG_DeInit(&handle);
+  /* RNG Peripheral clock disable - assume we're the only users of RNG  */
+  __HAL_RCC_RNG_CLK_DISABLE();
+
+  users = 0;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+  RNG_Init();
+  RNG_GetBytes(output, len, olen);
+  RNG_DeInit();
+  if (*olen != len)
+  {
+    return -1;
+  }
+  return 0;
+}
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+/**
+  * @brief      CRC initialization
+  *             This function release reset and clock CRC IP peripheral
+  * @retval None
+  */
+void CA_LL_CRC_Init(void)
+{
+  /* Force CRC into reset state */
+  __HAL_RCC_CRC_FORCE_RESET();
+  /* Release CRC from reset state */
+  __HAL_RCC_CRC_RELEASE_RESET();
+  /* Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+}
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#endif /* CA_LOW_LEVEL_C */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
new file mode 100644
index 00000000..3db7b5e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
@@ -0,0 +1,188 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains implementations for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include "kms.h"
+#include "kms_low_level.h"
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+typedef enum
+{
+  KMS_MEM_NONE    = 0,
+  KMS_MEM_ALLOC,
+  KMS_MEM_FREE
+} kms_ll_mem_optype;
+typedef struct
+{
+  kms_ll_mem_optype   optype;
+  uint32_t            size;
+  void               *ptr;
+} kms_ll_mem_operation_t;
+#endif /* KMS_MEM_LOGGING */
+/* Private define ------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+#define KMS_LL_MEM_LOGGING_MAX    (100UL)
+#endif /* KMS_MEM_LOGGING */
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+kms_ll_mem_operation_t kms_ll_mem_logging[KMS_LL_MEM_LOGGING_MAX];
+uint32_t kms_ll_mem_logging_idx;
+#endif /* KMS_MEM_LOGGING */
+/* Private function prototypes -----------------------------------------------*/
+/* Private function ----------------------------------------------------------*/
+/* Exported functions --------------------------------------------------------*/
+
+/**
+  * @brief  Read data from flash and store into buffer
+  * @note   Used to access encrypted blob in flash.
+  * @param  pDestination buffer to store red data
+  * @param  pSource flash aread to read from
+  * @param  Length amount of data to read from flash
+  * @retval Operation status
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length)
+{
+  SE_ErrorStatus seStatus;
+  seStatus = SE_LL_FLASH_Read(pDestination, pSource, Length);
+  return (seStatus == SE_SUCCESS) ? CKR_OK : CKR_GENERAL_ERROR;
+}
+
+#ifdef KMS_SE_CHECK_PARAMS
+
+/* Remove compilation optimization */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  Check if given buffer in inside secure enclave (RAM or Flash, NVM_Storgae)
+  *              If it is in Enclave area, then generate a RESET.
+  * @param  pBuffer Buffer address
+  * @param  ulSize  Buffer size
+  * @retval void
+  */
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize)
+{
+  /* If pBuffer is NULL, simply return FALSE */
+  if ((pBuffer == NULL) || (ulSize == 0UL))
+  {
+    return;
+  }
+  /* Check if address range is within secure enclave                           */
+  /* Called APIs will generate exception in case buffer is in forbidden area   */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  /* Double Check to avoid basic fault injection */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  return;
+}
+#endif /* KMS_SE_CHECK_PARAMS */
+
+/**
+  * @brief  An error occurred
+  * @note   Used to debug or reset in case of important issue
+  * @param  error Error reported by KMS
+  */
+void KMS_LL_ReportError(uint32_t error)
+{
+  (void)error;
+  while (1 == 1) {;}
+}
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory initialization occurred
+  */
+void KMS_LL_ReportMemInit(void)
+{
+  for (uint32_t i = 0; i < KMS_LL_MEM_LOGGING_MAX; i++)
+  {
+    kms_ll_mem_logging[i].optype = KMS_MEM_NONE;
+    kms_ll_mem_logging[i].size = 0;
+    kms_ll_mem_logging[i].ptr = NULL_PTR;
+  }
+  kms_ll_mem_logging_idx = 0;
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory allocation occurred
+  * @param  size    Size allocated
+  * @param  pmem    Allocated pointer
+  */
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_ALLOC;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = size;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory free occurred
+  * @param  pmem    Freed pointer
+  */
+void KMS_LL_ReportMemFree(void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_FREE;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = 0;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
new file mode 100644
index 00000000..f9ca9236
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
@@ -0,0 +1,236 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_hal_flash.h"
+#include "nvms_low_level.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep);
+static uint32_t get_page(uint32_t Addr);
+/* Private function ----------------------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep)
+{
+  uint8_t *p;
+  uint32_t maxsize;
+  HAL_StatusTypeDef ret = HAL_OK;
+
+  /* Calculating the maximum writable chunk size.*/
+  maxsize = (size_t)(NVMS_LL_PAGE_SIZE -
+                     ((uint32_t) * destinationp & (NVMS_LL_PAGE_SIZE - 1UL)));
+  if (maxsize > *sizep)
+  {
+    maxsize = *sizep;
+  }
+
+  p = *destinationp;
+
+  /* Updating size and pointers.*/
+  *sizep        -= maxsize;
+  *destinationp += maxsize;
+
+  /* Programming, 64 bits granularity  */
+  (void)HAL_FLASH_Unlock();
+  while ((maxsize >= 8UL) && (ret == HAL_OK))
+  {
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+    p = &p[8];
+    *sourcep = &((*sourcep)[8]);
+    maxsize -= 8UL;
+  }
+
+  if (maxsize != 0UL)
+  {
+    uint8_t block[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    /* Problem, there are remaining bytes to write, but not a full 64bit word --> we can't handle it */
+    /* Let's write a full 64bit word */
+    (void)memcpy(block, *sourcep, maxsize);
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+  }
+  (void)HAL_FLASH_Lock();
+
+  if (ret == HAL_OK)
+  {
+    return false;
+  }
+  return true;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t get_page(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+/* Exported functions --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+
+/**
+  * @brief   Flash low level driver initialization.
+  */
+void NVMS_LL_Init(void)
+{
+
+}
+
+/**
+  * @brief   Determines if a flash block is in erased state.
+  *
+  * @param   block         the block identifier
+  * @return                  The block state.
+  * @retval false            if the block is not in erased state.
+  * @retval true             if the block is in erased state.
+  */
+bool NVMS_LL_IsBlockErased(nvms_block_t block)
+{
+  uint32_t i;
+  uint32_t *p = (uint32_t *)((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS :
+                             NVMS_LL_BLOCK1_ADDRESS);
+
+  for (i = 0; i < (NVMS_LL_BLOCK_SIZE / sizeof(uint32_t)); i++)
+  {
+    if (*p != NVMS_LL_ERASED)
+    {
+      return false;
+    }
+    p++;
+  }
+  return true;
+}
+
+
+
+/**
+  * @brief   Erases a block.
+  * @note    The erase operation is verified internally.
+  *
+  * @param   block         the block identifier
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the erase operation failed.
+  */
+bool NVMS_LL_BlockErase(nvms_block_t block)
+{
+  /* Erase First Flash sector */
+  FLASH_EraseInitTypeDef EraseInitStruct;
+  uint32_t SectorError = 0;
+
+  EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+  EraseInitStruct.Page        = get_page((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS : NVMS_LL_BLOCK1_ADDRESS);
+  EraseInitStruct.NbPages     = NVMS_LL_NB_PAGE_PER_BLOCK;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void)HAL_FLASH_Unlock();
+
+  if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK)
+  {
+    /* Error occurred while sector erase.
+      User can add here some code to deal with this error.
+      SectorError will contain the faulty sector and then to know the code error on this sector,
+      user can call function 'HAL_FLASH_GetError()'
+      FLASH_ErrorTypeDef errorcode = HAL_FLASH_GetError(); */
+  }
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void)HAL_FLASH_Lock();
+
+  /* Operation verification.*/
+  return !NVMS_LL_IsBlockErased(block);
+}
+
+/**
+  * @brief   Writes data.
+  * @note    The write operation is verified internally.
+  * @note    If the write operation partially writes flash pages then the
+  *          unwritten bytes are left to the filler value.
+  *
+  * @param   source        pointer to the data to be written
+  * @param   destination   pointer to the flash position
+  * @param   size          size of data
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the write operation failed.
+  */
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size)
+{
+  const uint8_t *s = source;
+  uint8_t *d = destination;
+  size_t sz = size;
+
+  while (sz > 0UL)
+  {
+    /* Writes as much as a single operation allows.*/
+    if (page_write(&s, &d, &sz))
+    {
+      return true;
+    }
+  }
+
+  /* Operation verification.*/
+  return (bool)(memcmp(source, destination, size) != 0);
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c
new file mode 100644
index 00000000..576319a2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c
@@ -0,0 +1,757 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SE_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#endif /* __CC_ARM */
+#include "se_exception.h"
+#include "string.h"
+
+#ifdef KMS_ENABLED
+#include "kms.h"
+#include "kms_objects.h"
+#include "kms_platf_objects_config.h"
+#endif /* KMS_ENABLED */
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+/** @defgroup  SE_HARDWARE SE Hardware Interface
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Private_Variables Private Variables
+  * @{
+  */
+static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
+
+static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Private_Functions Private Functions
+  * @{
+  */
+
+static uint32_t SE_LL_GetPage(uint32_t Address);
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  Set CRC configuration and call HAL CRC initialization function.
+  * @param  None.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  CrcHandle.Instance = CRC;
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The Default polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+  /* The default init value is used */
+  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+  /* CRC Init*/
+  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_Init(void)
+{
+  /* CRC Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  return SE_LL_CRC_Config();
+}
+
+/**
+  * @brief  Wrapper to HAL CRC de-initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_DeInit(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
+  {
+    /* Initialization OK */
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC Calculate function.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  uBufferLength: buffer length in 32-bits word.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  This function does an erase of nb pages in user flash area
+  * @param  pStart: pointer to  user flash area
+  * @param  Length: number of bytes.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SE_ErrorStatus e_ret_status = SE_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    /* Fill EraseInit structure*/
+    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
+    p_erase_init.Page          = SE_LL_GetPage(start);
+    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
+    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+    {
+      e_ret_status = SE_ERROR;
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Write in Flash  protected area
+  * @param  pDestination pointer to destination area in Flash
+  * @param  pSource pointer to input buffer
+  * @param  Length number of bytes to be written
+  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
+  */
+
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SE_ErrorStatus ret = SE_SUCCESS;
+  uint32_t i;
+  uint32_t verified = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  if (Length == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Area should be inside 1 of the firmware image headers */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    for (i = 0U; i < Length; i += 8U)
+    {
+      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
+      {
+        ret = SE_ERROR;
+        break;
+      }
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) */
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    ret = SE_ERROR;
+  }
+  return ret;
+}
+
+/**
+  * @brief  Read in Flash protected area
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to read
+  * @param  Length: Length in bytes of data buffer
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  uint32_t source = (uint32_t)pSource;
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+  uint32_t i;
+  uint32_t verified = 0U;
+
+  /* Area should be inside 1 of the firmware image headers
+     or inside 1 of the download areas */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
+        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
+    {
+      verified = 1U;
+    }
+  }
+
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  SE_DoubleECC_Error_Counter = 0U;
+  /* Do not use memcpy from lib : ECC error should be checked at each loop */
+  for (i = 0; (i < Length) && (SE_DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+  {
+    *pDestination = *pSource;
+  }
+  if (SE_DoubleECC_Error_Counter == 0U)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  SE_DoubleECC_Error_Counter = 0U;
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
+  * @param pxSE_Metadata: Firmware metadata.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(pxSE_Metadata);
+  return SE_SUCCESS;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_ROM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is in sbsfu ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
+                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
+                            || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
+                           )))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+/**
+  * @brief function to disable all IRQ, previously enabled ones are stored in parameter
+  * @param pIrqState: IRQ state buffer
+  * @param IrqStateNb: Number of IRQ state that can be stored
+  * @retval SE_ErrorStatus SE_SUCCESS when complete successfully, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    pIrqState[0] = NVIC->ICER[0];     /* Save currently enabled IRQ */
+    NVIC->ICER[0] = pIrqState[0];     /* Disable All IRQ */
+    if (NVIC->ICER[0] == 0UL)         /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    NVIC->ISER[0] = pIrqState[0];         /* Disable All enabled IRQ */
+    if (NVIC->ICER[0] == pIrqState[0])    /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Lock the embedded keys used by SBSFU
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void)
+{
+#ifdef KMS_ENABLED
+  uint32_t i_key_locked = 0U;
+  uint32_t i_ctrl = 0U;
+
+#ifdef KMS_INDEX_BLOBIMPORT_VERIFY
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_VERIFY) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_VERIFY */
+#ifdef KMS_INDEX_BLOBIMPORT_DECRYPT
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_DECRYPT) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_DECRYPT */
+#ifdef KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE */
+  if(i_ctrl == i_key_locked)
+  {
+    return SE_SUCCESS;
+  }
+  else
+  {
+    return SE_ERROR;
+  }
+#else /* KMS_ENABLED */
+  return SE_SUCCESS;
+#endif /* KMS_ENABLED */
+}
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t SE_LL_GetPage(uint32_t Address)
+{
+  uint32_t page;
+
+  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
+  {
+    /* Bank 1 */
+    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
+  }
+  else
+  {
+    /* Bank 2 */
+    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
+  }
+  return page;
+}
+
+/**
+  * @brief  Gets the bank of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The bank of a given address
+  */
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retval None.
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    SE_DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    /* This exception occurs for another reason than flash double ECC errors */
+    SE_NMI_ExceptionHandler();
+  }
+}
+
+/**
+  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
+  * @param  None.
+  * @retvat void
+  */
+void HardFault_Handler(void)
+{
+  SE_NMI_ExceptionHandler();
+}
+
+/**
+  * @brief  Cleanup SE CORE
+  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
+  *
+  */
+void  SE_LL_CORE_Cleanup(void)
+{
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt
new file mode 100644
index 00000000..f996f365
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt
@@ -0,0 +1,113 @@
+/**
+  @page 2_Images_SECoreBin / Secure Engine Core binary generation.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Secure Engine Core binary generation.
+  *          SE Core binary exports SE CallGate function entry point for
+  *          SFU Application.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application is used to generate Secure Engine Core binary file to be linked
+with Secure Boot & Secure Firmware Update application (SBSFU).
+SE Core binary exports a single entry point to SE CallGate function and a startup method for data initialization.
+It is based on the Secure Engine Middleware.
+
+Generated SE Core Binary embeds Key Management Services accessible through this same single entry point using APIs
+defined by tKMS interface.
+
+It has to be compiled before SBSFU project.
+
+Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default
+cryptographic scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are
+provided and can be selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
+   - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
+   - SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+   - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+
+This example supports multiple images feature configured with 2 active images for execution from internal flash.
+Each image has its own keys for signature verification and firwmare encryption.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 2_Images_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
+   - 2_Images_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
+   - 2_Images_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
+   - 2_Images_SECoreBin/Src/se_low_level.c                      Low level interface
+   - 2_Images_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
+   - 2_Images_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
+   - 2_Images_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
+                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
+                                                                Exported to KMS user to ease embedded object usage
+   - 2_Images_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
+   - 2_Images_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
+   - 2_Images_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
+   - 2_Images_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
+   - 2_Images_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
+   - 2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
+   - 2_Images_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
+   - 2_Images_SECoreBin/Binary/ECCKEY2.txt                      Private ECCDSA key for signature verification of 2nd active image
+   - 2_Images_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin Public key for AES CBC encryption of 2nd active image
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin Public key for AES GCM encryption of 2nd active image
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files. As a workaround, it is advised to use the subst.exe command from within a command prompt to set up
+     a local drive out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+   
+@par IDE prebuild script
+
+In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
+This preliminary processing is in charge of:
+   - determining the requested cryptographic scheme
+   - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of SBSFU & Blob
+     importation keys into the KMS embedded objects pattern file)
+   - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
+
+A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic
+key). The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+In order to generate Secure Engine Core binary file, you must do the following :
+   - Open your preferred toolchain
+   - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp
new file mode 100644
index 00000000..2aabc934
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp
@@ -0,0 +1,1202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+          <state>KMS_ENABLED</state>
+          <state>DISABLE_IMAGE_STATE_HANDLING</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\UserApp.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 1 1"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\com.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\common.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\fw_update_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_user_code.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\test_protections.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ymodem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\flash_if.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_object_update_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_derive_key.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_encrypt_decrypt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_find.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\mpu.c</name>
+      </file>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\svc_handler.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\2_Images_SBSFU\EWARM\se_interface_appli.o</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..0b291e36
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,48 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_M4_start__       = __ICFEDIT_SLOT_Active_2_start__ + 512;
+define symbol __ICFEDIT_region_M4_end__         = __ICFEDIT_SLOT_Active_2_end__;
+define symbol __ICFEDIT_region_ROM_start__      = __ICFEDIT_SLOT_Active_1_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__        = __ICFEDIT_SLOT_Active_1_end__ ;
+define symbol __ICFEDIT_region_RAM_start__      = __ICFEDIT_SB_region_RAM_start__;
+define symbol __ICFEDIT_region_RAM_end__        = __ICFEDIT_SB_region_RAM_end__;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+define region M4_region       = mem:[from __ICFEDIT_region_M4_start__  to __ICFEDIT_region_M4_end__];
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];
+define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in M4_region    { readonly section M4_UserApp_Bin };
+place in ROM_region   { readonly, last section aes_block_padding };
+place in RAM_region   { readwrite, block CSTACK, block HEAP };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/svc_handler.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/svc_handler.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/EWARM/svc_handler.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/com.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/com.h
new file mode 100644
index 00000000..e5ae5467
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/com.h
@@ -0,0 +1,108 @@
+/**
+  ******************************************************************************
+  * @file    com.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for COM module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef COM_H
+#define COM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include <stdio.h>
+#include "stm32wlxx.h"
+
+/** @defgroup  COM_Exported_Constants Exported Constants
+  * @{
+  */
+/** @defgroup COM_UART  UART Configuration
+  * @{
+  */
+
+#define COM_UART                                USART2
+#define COM_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define COM_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define COM_UART_TX_AF                          GPIO_AF7_USART2
+#define COM_UART_TX_GPIO_PORT                   GPIOA
+#define COM_UART_TX_PIN                         GPIO_PIN_2
+#define COM_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define COM_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define COM_UART_RX_AF                          GPIO_AF7_USART2
+#define COM_UART_RX_GPIO_PORT                   GPIOA
+#define COM_UART_RX_PIN                         GPIO_PIN_3
+#define COM_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define COM_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Maximum Timeout values for flags waiting loops.
+   You may modify these timeout values depending on CPU frequency and application
+   conditions (interrupts routines ...). */
+#define COM_UART_TIMEOUT_MAX                   1000U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup  COM_Exported_Functions
+  * @{
+  */
+
+HAL_StatusTypeDef  COM_Init(void);
+HAL_StatusTypeDef  COM_DeInit(void);
+HAL_StatusTypeDef  COM_Transmit(uint8_t *Data, uint16_t uDataLength, uint32_t uTimeout);
+HAL_StatusTypeDef  COM_Receive(uint8_t *Data, uint16_t uDataLength, uint32_t uTimeout);
+HAL_StatusTypeDef  COM_Flush(void);
+
+HAL_StatusTypeDef Ymodem_HeaderPktRxCpltCallback(uint32_t uFileSize);
+HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* COM_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/common.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/common.h
new file mode 100644
index 00000000..ffe54146
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/common.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    common.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for COMMON module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef COMMON_H
+#define COMMON_H
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* Constants used by Serial Command Line Mode */
+#define TX_TIMEOUT          ((uint32_t)100U)
+#define RX_TIMEOUT          ((uint32_t)2000U)
+
+/* Exported macro ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= 'A') && ((c) <= 'F'))
+#define IS_LC_LETTER(c)     (((c) >= 'a') && ((c) <= 'f'))
+#define IS_09(c)            (((c) >= '0') && ((c) <= '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       (c - '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - 'A'+10) : ((c) - 'a'+10))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - '0') : CONVERTHEX_ALPHA(c))
+
+/* Exported functions ------------------------------------------------------- */
+uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+HAL_StatusTypeDef Serial_PutByte(uint8_t uParam);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif  /* COMMON_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/flash_if.h
new file mode 100644
index 00000000..5e6a4123
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/flash_if.h
@@ -0,0 +1,64 @@
+/**
+  ******************************************************************************
+  * @file    flash_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef FLASH_IF_H
+#define FLASH_IF_H
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+#define FLASH_IF_MIN_WRITE_LEN (8U)  /* Flash programming by 64 bits */
+/* Exported functions ------------------------------------------------------- */
+
+HAL_StatusTypeDef FLASH_If_Init(void);
+HAL_StatusTypeDef FLASH_If_Write(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_If_Read(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_If_Erase_Size(void *pStart, uint32_t uLength);
+HAL_StatusTypeDef FLASH_INT_Init(void);
+HAL_StatusTypeDef FLASH_INT_If_Write(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_INT_If_Read(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_INT_If_Erase_Size(void *pStart, uint32_t uLength);
+HAL_StatusTypeDef FLASH_EXT_Init(void);
+HAL_StatusTypeDef FLASH_EXT_If_Write(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_EXT_If_Read(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_EXT_If_Erase_Size(void *pStart, uint32_t uLength);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif  /* FLASH_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/fw_update_app.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/fw_update_app.h
new file mode 100644
index 00000000..5df3b13e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/fw_update_app.h
@@ -0,0 +1,44 @@
+/**
+  ******************************************************************************
+  * @file    fw_update_app.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Firmware Update module
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef FW_UPDATE_APP_H
+#define FW_UPDATE_APP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+void FW_UPDATE_Run(void);
+void FW_UPDATE_MULTIPLE_RunMenu(void);
+void FW_VALIDATE_RunMenu(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FW_UPDATE_APP_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/main.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/main.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/main.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/mpu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/mpu.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/mpu.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/mpu.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h
new file mode 100644
index 00000000..1e0a4b1f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h
@@ -0,0 +1,73 @@
+/**
+  ******************************************************************************
+  * @file    se_user_code.h
+  * @author  MCD Application Team
+  * @brief   Secure Engine User code example module.
+  *          This file demonstrates how to call user defined services running
+  *          in Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_USER_CODE_H
+#define SE_USER_CODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup SE_USER_CODE Secure Engine User Code Example
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+/* Exported macro ------------------------------------------------------------*/
+/* applicative sys call */
+#define UPDATE_IRQ_SERVICE
+
+/* Exported functions ------------------------------------------------------- */
+
+/** @addtogroup  SE_USER_CODE_Exported_Functions
+  * @{
+  */
+
+void SE_USER_CODE_RunMenu(void);
+void SE_USER_CODE_DisableIrq(void);
+void SE_USER_CODE_EnableIrq(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_USER_CODE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h
new file mode 100644
index 00000000..b273cbce
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    sfu_app_new_image.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New
+  *          Firmware Image storage and installation.
+  *          This file contains the services the bootloader and the user application
+  *          can use to know where to store a new FW image and request its installation.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_APP_NEW_IMAGE_H
+#define SFU_APP_NEW_IMAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Specifies a structure containing values related to the management of multi-images in Flash.
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+  uint32_t  ExecutionAddr;         /*!< The execution address for the FwImage in UserFlash */
+} SFU_FwImageFlashTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+HAL_StatusTypeDef SFU_APP_InstallAtNextReset(uint8_t *fw_header);
+void SFU_APP_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_APP_NEW_IMAGE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/test_protections.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/test_protections.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/test_protections.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/test_protections.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h
new file mode 100644
index 00000000..da212f0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for tkms application examples.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_APP_H
+#define KMS_APP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported macros -----------------------------------------------------------*/
+#if  defined(SFU_IWDG_PROTECT_ENABLE)
+/* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register */
+#define INVOKE_SCHEDULE_NEEDS()            \
+  do {                                     \
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);  \
+  } while(0);
+#else
+#define INVOKE_SCHEDULE_NEEDS()            \
+  do {                                     \
+    ;                                      \
+  } while(0);
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+
+
+/* Exported functions ------------------------------------------------------- */
+void tkms_app_menu(void);
+void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length);
+
+CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage);
+CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage);
+CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage);
+CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pMessage);
+CK_RV tkms_app_find(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_APP_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/ymodem.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/ymodem.h
new file mode 100644
index 00000000..4441b9e6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Inc/ymodem.h
@@ -0,0 +1,119 @@
+/**
+  ******************************************************************************
+  * @file    ymodem.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Ymodem functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef YMODEM_H_
+#define YMODEM_H_
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  FW_UPDATE Firmware Update Example
+  * @{
+  */
+/* Compiler switches ---------------------------------------------------------*/
+#ifndef MINICOM_YMODEM /* Avoid redefinition from app_sfu.h */
+/* Uncomment the switch below if you are using Minicom (Linux) */
+/* YMODEM protocol handled by Minicom instead of Teraterm: 128B packets instead of 1kB packets */
+/* #define MINICOM_YMODEM */
+#endif /* MINICOM_YMODEM */
+/* Includes ------------------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+
+typedef enum
+{
+  COM_OK       = 0x00U,  /*!< OK */
+  COM_ERROR    = 0x01U,  /*!< Error */
+  COM_ABORT    = 0x02U,  /*!< Abort */
+  COM_TIMEOUT  = 0x03U,  /*!< Timeout */
+  COM_DATA     = 0x04U,  /*!< Data */
+  COM_LIMIT    = 0x05U   /*!< Limit*/
+} COM_StatusTypeDef;     /*!< Comm status structures definition */
+
+typedef struct
+{
+  HAL_StatusTypeDef(* Ymodem_HeaderPktRxCpltCallback)(uint32_t uFileSize);
+  HAL_StatusTypeDef(* Ymodem_DataPktRxCpltCallback)(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize);
+} YMODEM_CallbacksTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/* Packet structure defines */
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define PACKET_HEADER_SIZE      ((uint32_t)3U)    /*!<Header Size*/
+#define PACKET_DATA_INDEX       ((uint32_t)4U)    /*!<Data Index*/
+#define PACKET_START_INDEX      ((uint32_t)1U)    /*!<Start Index*/
+#define PACKET_NUMBER_INDEX     ((uint32_t)2U)    /*!<Packet Number Index*/
+#define PACKET_CNUMBER_INDEX    ((uint32_t)3U)    /*!<Cnumber Index*/
+#else
+/* Minicom YMODEM */
+#define PACKET_HEADER_SIZE      ((uint32_t)6U)    /*!<Header Size*/
+#define PACKET_DATA_INDEX       ((uint32_t)7U)    /*!<Data Index*/
+#define PACKET_START_INDEX      ((uint32_t)4U)    /*!<Start Index*/
+#define PACKET_NUMBER_INDEX     ((uint32_t)5U)    /*!<Packet Number Index*/
+#define PACKET_CNUMBER_INDEX    ((uint32_t)6U)    /*!<Cnumber Index*/
+#endif /* MINICOM_YMODEM */
+#define PACKET_TRAILER_SIZE     ((uint32_t)2U)    /*!<Trailer Size*/
+#define PACKET_OVERHEAD_SIZE    (PACKET_HEADER_SIZE + PACKET_TRAILER_SIZE - 1U) /*!<Overhead Size*/
+#define PACKET_SIZE             ((uint32_t)128U)  /*!<Packet Size*/
+#define PACKET_1K_SIZE          ((uint32_t)1024U) /*!<Packet 1K Size*/
+
+/* /-------- Packet in IAP memory ------------------------------------------\
+ * | 0      |  1    |  2     |  3   |  4      | ... | n+4     | n+5  | n+6  |
+ * |------------------------------------------------------------------------|
+ * | unused | start | number | !num | data[0] | ... | data[n] | crc0 | crc1 |
+ * \------------------------------------------------------------------------/
+ * the first byte is left unused for memory alignment reasons                 */
+
+#define FILE_NAME_LENGTH        ((uint32_t)64U)  /*!< File name length*/
+#define FILE_SIZE_LENGTH        ((uint32_t)16U)  /*!< File size length*/
+
+#define SOH                     ((uint8_t)0x01U)  /*!< start of 128-byte data packet */
+#define STX                     ((uint8_t)0x02U)  /*!< start of 1024-byte data packet */
+#define EOT                     ((uint8_t)0x04U)  /*!< end of transmission */
+#define ACK                     ((uint8_t)0x06U)  /*!< acknowledge */
+#define NAK                     ((uint8_t)0x15U)  /*!< negative acknowledge */
+#define CA                      ((uint8_t)0x18U)  /*!< two of these in succession aborts transfer */
+#define CRC16                   ((uint8_t)0x43U)  /*!< 'C' == 0x43, request 16-bit CRC */
+#define RB                      ((uint8_t)0x72U)  /*!< Startup sequence */
+#define NEGATIVE_BYTE           ((uint8_t)0xFFU)  /*!< Negative Byte*/
+
+#define ABORT1                  ((uint8_t)0x41U)  /* 'A' == 0x41, abort by user */
+#define ABORT2                  ((uint8_t)0x61U)  /* 'a' == 0x61, abort by user */
+
+#define NAK_TIMEOUT             ((uint32_t)0x100000U)  /*!< NAK Timeout*/
+#define DOWNLOAD_TIMEOUT        ((uint32_t)1000U) /* One second retry delay */
+#define MAX_ERRORS              ((uint32_t)5U)    /*!< Maximum number of retry*/
+
+/* Exported functions ------------------------------------------------------- */
+void Ymodem_Init(void);
+COM_StatusTypeDef Ymodem_Receive(uint32_t *puSize, uint32_t uFlashDestination, YMODEM_CallbacksTypeDef *appCb);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif  /* YMODEM_H_ */
+
+/*******************(C)COPYRIGHT STMicroelectronics ********END OF FILE********/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..faf5f544
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx
@@ -0,0 +1,773 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>0</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=98,207,509,709,0)(1007=673,180,880,401,0)(1008=566,409,942,645,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>2</SubType>
+          <ItemText>0x2000A400</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\svc_handler.s</PathWithFileName>
+      <FilenameWithoutPath>svc_handler.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/com.c</PathWithFileName>
+      <FilenameWithoutPath>com.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/common.c</PathWithFileName>
+      <FilenameWithoutPath>common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/fw_update_app.c</PathWithFileName>
+      <FilenameWithoutPath>fw_update_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_object_update_app.c</PathWithFileName>
+      <FilenameWithoutPath>kms_object_update_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/mpu.c</PathWithFileName>
+      <FilenameWithoutPath>mpu.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_user_code.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_code.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/test_protections.c</PathWithFileName>
+      <FilenameWithoutPath>test_protections.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_derive_key.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_derive_key.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_encrypt_decrypt.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_encrypt_decrypt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_find.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_find.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ymodem.c</PathWithFileName>
+      <FilenameWithoutPath>ymodem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>3</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</PathWithFileName>
+      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..a27773f2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx
@@ -0,0 +1,647 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>UserApp_CM0Plus</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,DISABLE_IMAGE_STATE_HANDLING</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../2_Images_SECoreBin/Inc;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>.\UserApp_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+            <File>
+              <FileName>svc_handler.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\svc_handler.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>com.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/com.c</FilePath>
+            </File>
+            <File>
+              <FileName>common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/common.c</FilePath>
+            </File>
+            <File>
+              <FileName>flash_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/flash_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>fw_update_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/fw_update_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_object_update_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_object_update_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>mpu.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/mpu.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_code.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_user_code.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>test_protections.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/test_protections.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_derive_key.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_derive_key.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_encrypt_decrypt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_encrypt_decrypt.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_find.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_find.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_sign_verify.c</FilePath>
+            </File>
+            <File>
+              <FileName>ymodem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ymodem.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_appli.txt</FileName>
+              <FileType>3</FileType>
+              <FilePath>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/STM32WL_cm0plus.ini b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/STM32WL_cm0plus.ini
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/STM32WL_cm0plus.ini
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/STM32WL_cm0plus.ini
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct
new file mode 100644
index 00000000..ca8d3ce4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct
@@ -0,0 +1,29 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_1_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+  ROM_region +0 {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+; SBSFU RAM area is reused for UserApp_M0  
+  RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE {
+  .ANY (STACK)
+  .ANY (HEAP)
+  .ANY (+RW +ZI)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm0plus.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/startup_stm32wl55xx_cm0plus.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/startup_stm32wl55xx_cm0plus.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/startup_stm32wl55xx_cm0plus.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/svc_handler.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/svc_handler.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/svc_handler.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..caf5da96
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="UserApp_cm0plus" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;" prebuildStep="">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/UserApp_cm0plus.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_UserApp_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="DISABLE_IMAGE_STATE_HANDLING"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata.1159753008" name="Place data in their own sections (-fdata-sections)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1663313052" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp_cm0plus.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.401807756" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs">
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath.741843002" name="Use C math library (-Wl,--start-group -lc -lm -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/UserApp_cm0plus.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_UserApp_CM0PLUS.null.394363235" name="2_Images_UserApp_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/2_Images_UserApp_CM0PLUS"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/2_Images_UserApp_CM0PLUS"/>
+		</configuration>
+	</storageModule>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project
new file mode 100644
index 00000000..90ff3203
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_UserApp_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/com.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/com.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/flash_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/flash_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/fw_update_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/fw_update_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_object_update_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/kms_object_update_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/mpu.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/mpu.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_user_code.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/se_user_code.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/test_protections.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/test_protections.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_derive_key.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_derive_key.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_encrypt_decrypt.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_encrypt_decrypt.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_find.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_find.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ymodem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/ymodem.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/svc_handler.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/svc_handler.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/svc_handler.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch
new file mode 100644
index 00000000..83782618
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\UserApp_cm0plus.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_UserApp_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\UserApp_cm0plus.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_UserApp_CM0PLUS"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_UserApp_CM0PLUS"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.ld
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/com.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/com.c
new file mode 100644
index 00000000..0de12dc0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/com.c
@@ -0,0 +1,285 @@
+/**
+  ******************************************************************************
+  * @file    com.c
+  * @author  MCD Application Team
+  * @brief   COM module.
+  *          This file provides set of firmware functions to manage Com
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "com.h"
+#include "stm32wlxx_hal.h"
+
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/** @defgroup  COM_Private_Defines Private Defines
+  * @{
+  */
+
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+/**
+  * @}
+  */
+
+/** @defgroup  COM_Private_Variables Exported Variables
+  * @{
+  */
+
+static UART_HandleTypeDef   UartHandle; /*!< Uart Handler*/
+
+/**
+  * @}
+  */
+
+/** @defgroup  COM_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup  COM_Initialization_Functions Initialization Functions
+  * @{
+  */
+
+/**
+  * @brief  Initialize COM module.
+  * @param  None.
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef  COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = COM_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+
+  return HAL_UART_Init(&UartHandle);
+}
+
+/**
+  * @brief  DeInitialize COM module.
+  * @retval None.
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef  COM_DeInit(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  * ...
+  */
+  return HAL_OK;
+}
+
+/**
+  * @brief  UART MSP Init.
+  * @param  huart: UART handler pointer.
+  * @retval None.
+  */
+void HAL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == COM_UART)
+  {
+    /* Peripheral Clock Enable */
+    COM_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    COM_UART_TX_GPIO_CLK_ENABLE();
+    COM_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : COM_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = COM_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = COM_UART_TX_AF;
+    HAL_GPIO_Init(COM_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : COM_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = COM_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = COM_UART_RX_AF;
+    HAL_GPIO_Init(COM_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief  UART MSP DeInit.
+  * @param  huart: UART handler pointer.
+  * @retval None.
+  */
+void HAL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+  if (huart->Instance == COM_UART)
+  {
+    /* Peripheral clock disable */
+    COM_UART_CLK_DISABLE();
+
+    HAL_GPIO_DeInit(COM_UART_TX_GPIO_PORT, COM_UART_TX_PIN);
+    HAL_GPIO_DeInit(COM_UART_RX_GPIO_PORT, COM_UART_RX_PIN);
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/** @defgroup  COM_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief Transmit Data.
+  * @param uDataLength: Data pointer to the Data to transmit.
+  * @param uTimeout: Timeout duration.
+  * @retval Status of the Transmit operation.
+  */
+HAL_StatusTypeDef COM_Transmit(uint8_t *Data, uint16_t uDataLength, uint32_t uTimeout)
+{
+  return HAL_UART_Transmit(&UartHandle, (uint8_t *)Data, uDataLength, uTimeout);
+}
+
+/**
+  * @brief Receive Data.
+  * @param uDataLength: Data pointer to the Data to receive.
+  * @param uTimeout: Timeout duration.
+  * @retval Status of the Receive operation.
+  */
+HAL_StatusTypeDef COM_Receive(uint8_t *Data, uint16_t uDataLength, uint32_t uTimeout)
+{
+  return HAL_UART_Receive(&UartHandle, (uint8_t *)Data, uDataLength, uTimeout);
+}
+
+/**
+  * @brief  Flush COM Input.
+  * @param None.
+  * @retval HAL_Status.
+  */
+HAL_StatusTypeDef COM_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+  return HAL_OK;
+}
+
+/**
+  * @}
+  */
+
+/** @addtogroup  COM_Private_Functions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup COM_Callback_Functions Callback Functions
+  * @{
+  */
+
+/**
+  * @brief  Retargets the C library printf function to the USART.
+  * @param  None
+  * @retval ch
+  */
+PUTCHAR_PROTOTYPE
+{
+  /* Place your implementation of fputc here */
+  /* e.g. write a character to the USART1 and Loop until the end of transmission */
+  HAL_UART_Transmit(&UartHandle, (uint8_t *)&ch, 1U, 0xFFFFU);
+
+  return ch;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  FileSize Dimension of the file that will be received.
+  * @retval None
+  */
+__weak HAL_StatusTypeDef Ymodem_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the Ymodem_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  return HAL_OK;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData Pointer to the buffer.
+  * @param  Size Packet dimension.
+  * @retval None
+  */
+__weak HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the Ymodem_DataPktRxCpltCallback could be implemented in the user file
+   */
+  return HAL_OK;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/common.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/common.c
new file mode 100644
index 00000000..54c71d02
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/common.c
@@ -0,0 +1,133 @@
+/**
+  ******************************************************************************
+  * @file    common.c
+  * @author  MCD Application Team
+  * @brief   COMMON module.
+  *          This file provides set of firmware functions to manage Common
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "common.h"
+#include "main.h"
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+/**
+  * @brief  Convert a string to an integer
+  * @param  pInputStr: The string to be converted
+  * @param  pIntNum: The integer value
+  * @retval 1: Correct
+  *         0: Error
+  */
+uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+
+  if ((pInputStr[0U] == '0') && ((pInputStr[1U] == 'x') || (pInputStr[1U] == 'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != '\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        val = (val << 4U) + CONVERTHEX(pInputStr[i]);
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == '\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == '\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == 'k') || (pInputStr[i] == 'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == 'm') || (pInputStr[i] == 'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        val = val * 10U + CONVERTDEC(pInputStr[i]);
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+
+/**
+  * @brief  Transmit a byte to the HyperTerminal
+  * @param  param The byte to be sent
+  * @retval HAL_StatusTypeDef HAL_OK if OK
+  */
+HAL_StatusTypeDef Serial_PutByte(uint8_t uParam)
+{
+  return COM_Transmit(&uParam, 1U, TX_TIMEOUT);
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c
new file mode 100644
index 00000000..6ecbce70
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c
@@ -0,0 +1,361 @@
+/**
+  ******************************************************************************
+  * @file    flash_if.c
+  * @author  MCD Application Team
+  * @brief   FLASH Interface module.
+  *          This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "flash_if.h"
+#include "string.h"
+#include <stdio.h>
+
+/* Uncomment the line below if you want some debug logs */
+#define FLASH_IF_DBG
+#ifdef FLASH_IF_DBG
+#define FLASH_IF_TRACE printf
+#else
+#define FLASH_IF_TRACE(...)
+#endif /* FLASH_IF_DBG */
+
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+#define EXTERNAL_FLASH_ADDRESS    0x90000000U
+
+
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+
+
+/* Private function prototypes -----------------------------------------------*/
+static uint32_t GetPage(uint32_t uAddr);
+static HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void);
+
+/* Public functions : wrapper ---------------------------------------------------------*/
+
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_If_Init(void)
+{
+  HAL_StatusTypeDef e_ret_status = HAL_OK;
+
+  e_ret_status = FLASH_INT_Init();
+  if (e_ret_status == HAL_OK)
+  {
+    e_ret_status = FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pStart: flash address to be erased
+  * @param  uLength: number of bytes
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Erase_Size(pStart, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Erase_Size(pStart, uLength);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Write(pDestination, pSource, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Write(pDestination, pSource, uLength);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Read(pDestination, pSource, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Read(pDestination, pSource, uLength);
+  }
+}
+
+/* Public functions : internal flash --------------------------------------------------------- */
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_INT_Init(void)
+{
+  return HAL_OK;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pStart: Start of user flash area
+  * @param  uLength: number of bytes.
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  uint32_t page_error = 0U;
+  uint32_t uStart = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef x_erase_init;
+  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
+  uint32_t first_page = 0U;
+  uint32_t nb_pages = 0U;
+  uint32_t chunk_nb_pages;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = FLASH_INT_If_Clear_Error();
+
+  if (e_ret_status == HAL_OK)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = GetPage(uStart);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = GetPage(uStart + uLength - 1U) - first_page + 1U;
+      x_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        x_erase_init.Page = first_page;
+        x_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&x_erase_init, &page_error) != HAL_OK)
+        {
+          HAL_FLASH_GetError();
+          e_ret_status = HAL_ERROR;
+        }
+        /* Refresh Watchdog */
+        WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+      } while (nb_pages > 0);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      HAL_FLASH_Lock();
+
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
+  uint32_t i = 0U;
+  uint32_t pdata = (uint32_t)pSource;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = FLASH_INT_If_Clear_Error();
+
+  if (e_ret_status == HAL_OK)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() != HAL_OK)
+    {
+      return HAL_ERROR;
+
+    }
+    else
+    {
+      /* DataLength must be a multiple of 64 bit */
+      for (i = 0U; i < uLength; i += 8U)
+      {
+        /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+        be done by word */
+        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)pDestination,  *((uint64_t *)(pdata + i)))
+            == HAL_OK)
+        {
+          /* Check the written value */
+          if (*(uint64_t *)pDestination != *(uint64_t *)(pdata + i))
+          {
+            /* Flash content doesn't match SRAM content */
+            e_ret_status = HAL_ERROR;
+            break;
+          }
+          /* Increment FLASH Destination address */
+          pDestination = (void *)((uint32_t)pDestination + 8U);
+        }
+        else
+        {
+          /* Error occurred while writing data in Flash memory */
+          e_ret_status = HAL_ERROR;
+          break;
+        }
+      }
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      HAL_FLASH_Lock();
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  memcpy(pDestination, pSource, uLength);
+  return HAL_OK;
+}
+
+/* Public functions : external flash ---------------------------------------------------------*/
+
+HAL_StatusTypeDef FLASH_EXT_Init(void)
+{
+  return HAL_OK;
+}
+
+/* No external flash available on this product
+   ==> return SFU_ERROR */
+
+HAL_StatusTypeDef FLASH_EXT_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+HAL_StatusTypeDef FLASH_EXT_If_Write(void  *pDestination, const void *pSource, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+HAL_StatusTypeDef FLASH_EXT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+/* Private functions ---------------------------------------------------------*/
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      ret = HAL_OK;
+    }
+#ifdef FLASH_IF_DBG
+    else
+    {
+      FLASH_IF_TRACE("[FLASH_IF] Lock failure\r\n");
+    }
+#endif /* FLASH_IF_DBG */
+  }
+#ifdef FLASH_IF_DBG
+  else
+  {
+    FLASH_IF_TRACE("[FLASH_IF] Unlock failure\r\n");
+  }
+#endif /* FLASH_IF_DBG */
+  return ret;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+uint32_t GetPage(uint32_t Addr)
+{
+  uint32_t page = 0U;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c
new file mode 100644
index 00000000..119418a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c
@@ -0,0 +1,146 @@
+/**
+  ******************************************************************************
+  * @file    fw_update_app.c
+  * @author  MCD Application Team
+  * @brief   Firmware Update module.
+  *          This file provides set of firmware functions to manage Firmware
+  *          Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "fw_update_app.h"
+#include "se_interface_application.h"
+#include "sfu_fwimg_regions.h"
+#include "string.h"
+#include "mpu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#elif defined(__CC_ARM)
+#include "mapping_fwimg.h"
+#include "mapping_sbsfu.h"
+#endif /* __ARMCC_VERSION */
+#include "ymodem.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+#define ALL_SLOTS 255U                   /*!< Validate all new firmware installed in a single request */
+/* Global variables ----------------------------------------------------------*/
+
+
+/* Private function prototypes -----------------------------------------------*/
+
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Run FW Update process.
+  * @param  None
+  * @retval HAL Status.
+  */
+#if defined(EXTERNAL_LOADER)
+void FW_UPDATE_Run(void)
+{
+  /* Print Firmware Update welcome message */
+  printf("\r\n================ New Fw Download =========================\r\n\n");
+
+  /* Standalone loader communication : execution requested */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+
+  /*  use virtual HAL API allowing the access to Privileged register */
+  SVC_NVIC_SystemReset();
+}
+
+#else
+void FW_UPDATE_Run(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#endif
+
+
+#if defined(EXTERNAL_LOADER)
+/**
+  * @brief  Run Multiple FW Update process.
+  * @param  None
+  * @retval None.
+  */
+void FW_UPDATE_MULTIPLE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#else
+/**
+  * @brief  Run Multiple FW Update process.
+  * @param  None
+  * @retval None.
+  */
+void FW_UPDATE_MULTIPLE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#endif
+
+
+#if defined(EXTERNAL_LOADER)
+/**
+  * @brief  Run validation of a FW image menu.
+  * @param  None
+  * @retval None.
+  */
+void FW_VALIDATE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#else
+/**
+  * @brief  Run validation of a FW image menu.
+  * @param  None
+  * @retval None.
+  */
+void FW_VALIDATE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#endif
+
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/kms_object_update_app.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/kms_object_update_app.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/kms_object_update_app.c
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/kms_object_update_app.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/main.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/main.c
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/main.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c
new file mode 100644
index 00000000..132d01ea
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c
@@ -0,0 +1,181 @@
+/**
+  ******************************************************************************
+  * @file    mpu.c
+  * @author  MCD Application Team
+  * @brief   virtual HAL api for non privilieged :
+  *          implementing HAL service performing access to register being
+  *          mapped by mpu  on privilieged area
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "mpu.h"
+#include "se_def.h"
+#include "se_interface_application.h"
+#include "common.h"
+#include "flash_if.h"
+#include "se_callgate.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+#define HAL_SVC_NVIC_SYSTEM_RESET            0
+#define HAL_SVC_MPU_DISABLE                  1
+
+static void HAL_SysCall(uint32_t syscall, ...);
+
+/**
+  * @brief This functions triggers a HAL system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+#if defined (__ICCARM__) || defined(__GNUC__)
+static void HAL_SysCall(uint32_t syscall, ...)
+{
+#if defined ( __GNUC__ )
+  /*
+    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
+    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
+    */
+  __ASM volatile("MOV r0, %0" : : "r"(syscall));
+#endif /* __GNUC__ */
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+    */
+  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate HAL syscall */
+}
+#elif defined(__CC_ARM)
+/*
+  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
+  * caller is in same file. Defining the function as ASM avoids the issue.
+  */
+static void __ASM HAL_SysCall(uint32_t syscall, ...)
+{
+  /*
+   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+   * example an SVC.
+   * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+   */
+  SVC #1
+  BX LR
+}
+#endif /* (__ICCARM__) || defined(__GNUC__) */
+
+/**
+  * @brief  Request a system reset after switching in privileged mode.
+  * @param  None
+  * @retval None
+  */
+void SVC_NVIC_SystemReset(void)
+{
+  HAL_SysCall(HAL_SVC_NVIC_SYSTEM_RESET);
+}
+
+
+/**
+  * @brief  Request to disable the MPU after switching in privileged mode.
+  * @param  None
+  * @retval None
+  */
+void SVC_MPU_Disable(void)
+{
+  HAL_SysCall(HAL_SVC_MPU_DISABLE);
+}
+
+
+/**
+  * @brief This is the Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  * @note Installed in startup_stm32xxxx.s
+  *
+  * This handler handles 2 requests:
+  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter (see @ref
+  * \li SE_FunctionIDTypeDef)
+  * \li HAL SVC: run a HAL privileged operation provided as a parameter
+  */
+void MPU_SVC_Handler(uint32_t *args)
+{
+  uint8_t code = ((char *)args[6])[-2];
+  switch (code)
+  {
+    case 0: /* SE SVC CALL */
+    {
+      SE_APP_SVC_Handler(args);
+      break;
+    }
+    case 1:  /* HAL SVC CALL */
+    {
+      HAL_APP_SVC_Handler(args);
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+}
+/**
+  * @brief This is the HAL Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  *
+  * This handler handles 2 requests:
+  * \li NVIC system reset
+  * \li MPU disable request
+  */
+void HAL_APP_SVC_Handler(uint32_t *args)
+{
+  switch (args[0])
+  {
+    case HAL_SVC_NVIC_SYSTEM_RESET :  /* HAL NVIC system reset */
+    {
+      HAL_NVIC_SystemReset();
+      break;
+    }
+    case HAL_SVC_MPU_DISABLE :        /* HAL Disable MPU */
+    {
+      HAL_MPU_Disable();
+      break;
+    }
+    default:
+    {
+      HAL_NVIC_SystemReset();
+      break;
+    }
+  }
+}
+
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void MPU_EnterUnprivilegedMode(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
+  __set_CONTROL(__get_CONTROL() | 3); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c
new file mode 100644
index 00000000..f3dc21d2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c
@@ -0,0 +1,273 @@
+/**
+  ******************************************************************************
+  * @file    se_user_code.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine User code example module.
+  *          This file demonstrates how to call user defined services running
+  *          in Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "se_user_code.h"
+#include "mpu.h"
+#include "se_interface_application.h"
+#include "sfu_fwimg_regions.h"
+#include <string.h> /* needed for memset */
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  SE_USER_CODE Secure Engine User Code Example
+  * @brief Example of user defined code running in Secure Engine.
+  *        This code provides user defined services to the user application.
+  * @{
+  */
+
+/** @defgroup  SE_USER_CODE_Private_Variables Private Variables
+  * @{
+  */
+static uint32_t IrqState[1] = {0x00UL};
+/**
+  * @}
+  */
+
+/** @defgroup  SE_USER_CODE_Private_Functions Private Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the SE_USER_CODE Menu choices on hyperterminal
+  * @param  None.
+  * @retval None.
+  */
+static void SE_USER_CODE_PrintMenu(void)
+{
+  printf("\r\n=== Call User Defined Code running in Secure Engine ===\r\n\n");
+  printf("  Get firmware information of SLOT_ACTIVE_1 ------------- 1\r\n\n");
+  printf("  Get firmware information of SLOT_ACTIVE_2 ------------- 2\r\n\n");
+  printf("  Save and Disable IRQ ---------------------------------- a\r\n\n");
+  printf("  Restore and Enable IRQ -------------------------------- b\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Get FW information.
+  * @param  SlotNumber slot identification
+  * @retval HAL Status.
+  */
+static void SE_USER_CODE_GetFwInfo(uint32_t SlotNumber)
+{
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+  SE_APP_ActiveFwInfo_t sl_FwInfo;
+
+  memset(&sl_FwInfo, 0xFF, sizeof(SE_APP_ActiveFwInfo_t));
+
+
+  printf("If the Secure User Memory is enabled you should not be able to call a SE service and get stuck.\r\n\n");
+  printf("  -- Calling FwInfo service.\r\n\n");
+  printf("Press the RESET button to restart the device (or wait until IWDG expires if enabled).\r\n\n");
+
+  /* Get FW info */
+  se_retCode = SE_APP_GetActiveFwInfo(&se_Status, SlotNumber, &sl_FwInfo);
+
+  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+  {
+    /* Print the result */
+    printf("Firmware Info:\r\n");
+    printf("\tActiveFwVersion: %d\r\n", sl_FwInfo.ActiveFwVersion);
+    printf("\tActiveFwSize: %d bytes\r\n", sl_FwInfo.ActiveFwSize);
+  }
+  else
+  {
+    /* Failure */
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+
+  /* This point should not be reached */
+  printf("  -- !! Secure User Memory protection is NOT ENABLED !!\r\n\n");
+}
+
+/**
+  * @brief  Disable the IRQ and print saved IRQ configuration
+  * @param  None.
+  * @retval None.
+  */
+void SE_USER_CODE_DisableIrq(void)
+{
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+
+  se_retCode = SE_SYS_SaveDisableIrq(&se_Status, &IrqState[0], 1);
+
+  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+  {
+    /* Print the result */
+    printf("IRQ saved: 0x%08X\r\n", IrqState[0]);
+    printf("IRQ disabled\r\n");
+  }
+  else
+  {
+    /* Failure */
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+}
+
+/**
+  * @brief  Restore saved IRQ configuration
+  * @param  None.
+  * @retval None.
+  */
+void SE_USER_CODE_EnableIrq(void)
+{
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+
+  se_retCode = SE_SYS_RestoreEnableIrq(&se_Status, &IrqState[0], 1);
+
+  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+  {
+    /* Print the result */
+    printf("IRQ restored: 0x%08X\r\n", IrqState[0]);
+    printf("IRQ enabled\r\n");
+  }
+  else
+  {
+    /* Failure */
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/** @addtogroup  SE_USER_CODE_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Run get firmware info menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+void SE_USER_CODE_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+
+  /*Print Main Menu message*/
+  SE_USER_CODE_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          if (SlotStartAdd[slot_number] == 0U)
+          {
+            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+          }
+          else
+          {
+            SE_USER_CODE_GetFwInfo(slot_number);
+          }
+          break;
+        case '2' :
+          slot_number = SLOT_ACTIVE_2;
+          if (SlotStartAdd[slot_number] == 0U)
+          {
+            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+          }
+          else
+          {
+            SE_USER_CODE_GetFwInfo(slot_number);
+          }
+          break;
+        case 'a':
+          SE_USER_CODE_DisableIrq();
+          break;
+        case 'b':
+          SE_USER_CODE_EnableIrq();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if ((exit != 1U) && (key != 'a') && (key != 'b'))
+      {
+        if (SlotStartAdd[slot_number] == 0U)
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          SE_USER_CODE_GetFwInfo(slot_number);
+        }
+
+        /*Print Main Menu message*/
+        SE_USER_CODE_PrintMenu();
+      }
+      else if (exit != 1U)
+      {
+        /*Print Main Menu message*/
+        SE_USER_CODE_PrintMenu();
+      }
+    }
+  }
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..bc6fc220
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c
@@ -0,0 +1,175 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+#include "test_protections.h"
+#include "mpu.h"
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+RTC_HandleTypeDef RtcHandle;
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+
+/******************************************************************************/
+/*            Cortex-M0+ Processor Exceptions Handlers                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles NMI exception.
+  * @param  None
+  * @retval None
+  */
+void NMI_Handler(void)
+{
+  /* Go to infinite loop when NMI exception occurs */
+  while (1)
+  {
+    printf("NMI exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Hard Fault exception.
+  * @param  None
+  * @retval None
+  */
+void HardFault_Handler(void)
+{
+  /* Go to infinite loop when Memory Manage exception occurs */
+  while (1)
+  {
+    printf("Hard Fault exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+
+/* SVC call handler is implemented in svc_handler.s */
+
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers             */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles Flash operation error interrupt request.
+  * @param  None
+  * @retval None
+  */
+void FLASH_IRQHandler(void)
+{
+  HAL_FLASH_IRQHandler();
+}
+
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void RTC_LSECSS_IRQHandler(void)
+{
+  /* Handle only the tamper enabled by SBSFU */
+  uint32_t tmp = READ_REG(TAMP->MISR) & RTC_TAMPER_ID;
+
+  /* Immediately clear flags to avoid eternal resets */
+  WRITE_REG(TAMP->SCR, tmp);
+
+  /* SRAM2 is erased and RtcHandle is corrupted: no specific handling is possible. */
+  NVIC_SystemReset();
+}
+
+/**
+  * @brief  This function handles TZIC interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TZIC_ILA_IRQHandler(void)
+{
+  HAL_GTZC_IRQHandler();
+}
+
+void BUTTON_IRQHANDLER(void)
+{
+  HAL_GPIO_EXTI_IRQHandler(BUTTON_EXTI_LINE);
+}
+
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  if (GPIO_Pin == BUTTON_EXTI_LINE)
+  {
+    printf("\r\nUser IRQ Handler: User Button pressed\r\n");
+  }
+}
+
+/**
+  * @brief  This function handles PPP interrupt request.
+  * @param  None
+  * @retval None
+  */
+/*void PPP_IRQHandler(void)
+{
+}*/
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Src/system_stm32wlxx.c
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c
new file mode 100644
index 00000000..5f002ada
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c
@@ -0,0 +1,822 @@
+/**
+  ******************************************************************************
+  * @file    test_protections.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define TEST_PROTECTIONS_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "test_protections.h"
+#include "se_def.h"
+#include "se_interface_application.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "sfu_fwimg_regions.h" /* required for corruption tests (a real user application should NOT need this file) */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "mpu.h"
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup TEST_PROTECTIONS Test protections
+  * @{
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Private_Defines Private Defines
+  * @{
+  */
+
+/**
+  * @brief  Isolated enclave Test.
+  */
+/*!< Address used to test SE CODE protection*/
+#define TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS     ((uint32_t) SE_CALLGATE_REGION_ROM_START)
+/*!< Address used to test SE VDATA protection*/
+#define TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS     ((uint32_t) SE_REGION_RAM_START)
+
+/**
+  * @brief  Secure Memory Test.
+  */
+/*!< Address used to test HDP */
+#define TEST_PROTECTIONS_HDP_FLASH_ADDRESS          ((uint32_t) SE_KEY_REGION_ROM_START)
+
+/**
+  * @brief  WRP Test.
+  */
+/*!< Address used to test WRP protection */
+#define TEST_PROTECTIONS_WRP_FLASH_ADDRESS            ((uint32_t) SE_IF_REGION_ROM_START)
+/*!< WRP Test Size */
+#define TEST_PROTECTIONS_WRP_FLASH_SIZE               ((uint32_t)0x800U)
+
+/**
+  * @brief  IWDG Test.
+  */
+/*!< IWDG Test delay in ms (it has to be greater than what used in SB)*/
+#define TEST_PROTECTIONS_IWDG_DELAY                   ((uint32_t)10000U)
+
+/**
+  * @brief  TAMPER Test.
+  */
+#define TEST_PROTECTIONS_TAMPER_DELAY                 ((uint32_t)10U)         /*!< TAMPER Test delay in s */
+
+/**
+  * @brief  CORRUPT_IMAGE Test.
+  */
+/*!< CORRUPT_IMAGE Test: address where data will be corrupted: address of active slot + offset */
+#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(A)  ((uint32_t)(SlotStartAdd[A] \
+                                                                     +SFU_IMG_IMAGE_OFFSET))
+/*!< CORRUPT_IMAGE Test: size of data to be corrupted */
+#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE     ((uint32_t)32U)
+
+/**
+  * @brief  GTZC Test.
+  */
+/*!< GTZC Test error code */
+#define TEST_GTZC_ERROR_CODE                          ((uint32_t)0xFFU)
+
+/** @defgroup  TEST_PROTECTIONS_Private_Variables Private Variables
+  * @{
+  */
+static uint8_t uRead_WRP[TEST_PROTECTIONS_WRP_FLASH_SIZE];
+static __IO uint32_t m_uTamperEvent = 0U;                /*!< Tamper Event */
+static __IO uint32_t m_uGtzcTzicEvent = 0U;              /*!< GTZC_TZIC Event */
+/**
+  * @}
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Private_Functions Private Functions
+  * @{
+  */
+static void TEST_PROTECTIONS_RunSE_CODE(void);
+static void TEST_PROTECTIONS_RunSE_VDATA(void);
+static void TEST_PROTECTIONS_RunSecUserMem_CODE(void);
+static void TEST_PROTECTIONS_RunWRP(void);
+static void TEST_PROTECTIONS_RunTAMPER(void);
+static void TEST_PROTECTIONS_RunIWDG(void);
+static void TEST_PROTECTIONS_CORRUPT_RunMenu(void);
+static void TEST_PROTECTIONS_Run_GTZC(void);
+static void TEST_PROTECTIONS_GtzcPrintTestingSubMenu(void);
+static void TEST_PROTECTIONS_Run_KMS_DATA_STORAGE(void);
+static void TEST_PROTECTIONS_Run_SYNC_FLAG(void);
+static void TEST_PROTECTIONS_PrintTestingMenu(void);
+/**
+  * @}
+  */
+
+
+
+/** @defgroup  TEST_PROTECTIONS_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void TEST_PROTECTIONS_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint8_t exit = 0U;
+
+  /* Print Main Menu message */
+  TEST_PROTECTIONS_PrintTestingMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
+       reload register*/
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          TEST_PROTECTIONS_CORRUPT_RunMenu();
+          break;
+        case '2' :
+          TEST_PROTECTIONS_RunSE_CODE();
+          break;
+        case '3' :
+          TEST_PROTECTIONS_RunSE_VDATA();
+          break;
+        case '4' :
+          TEST_PROTECTIONS_RunSecUserMem_CODE();
+          break;
+        case '5' :
+          TEST_PROTECTIONS_RunWRP();
+          break;
+        case '6' :
+          TEST_PROTECTIONS_RunIWDG();
+          break;
+        case '7' :
+          TEST_PROTECTIONS_RunTAMPER();
+          break;
+        case '8' :
+          TEST_PROTECTIONS_Run_GTZC();
+          break;
+        case '9' :
+          TEST_PROTECTIONS_Run_KMS_DATA_STORAGE();
+          break;
+        case 'a' :
+          TEST_PROTECTIONS_Run_SYNC_FLAG();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+      /*Print Main Menu message*/
+      TEST_PROTECTIONS_PrintTestingMenu();
+    }
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup  TEST_PROTECTIONS_Private_Functions
+  * @{
+  */
+
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_PrintTestingMenu(void)
+{
+  printf("\r\n=================== Test Menu ============================\r\n\n");
+  printf("  Test : CORRUPT ACTIVE IMAGE --------------------------- 1\r\n\n");
+  printf("  Test SE isolation - CODE ------------------------------ 2\r\n\n");
+  printf("  Test SE isolation - VDATA ----------------------------- 3\r\n\n");
+  printf("  Test Protection: HDP ---------------------------------- 4\r\n\n");
+  printf("  Test Protection: WRP ---------------------------------- 5\r\n\n");
+  printf("  Test Protection: IWDG --------------------------------- 6\r\n\n");
+  printf("  Test Protection: TAMPER ------------------------------- 7\r\n\n");
+  printf("  Test Protection: GTZSC -------------------------------- 8\r\n\n");
+  printf("  Test KMS_DataStorage isolation ------------------------ 9\r\n\n");
+  printf("  Test synchronization flag protection ------------------ a\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  TEST Run Secure User Memory
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunSecUserMem_CODE(void)
+{
+  uint32_t u_read_key = 0;
+  printf("\r\n====== Test Protection: HDP \r\n\n");
+  printf("  -- Reading address: 0x%x\r\n\n", TEST_PROTECTIONS_HDP_FLASH_ADDRESS);
+
+  /* Try to read a 32-bit data from the Flash protected by HDP */
+  u_read_key = *((uint32_t *)TEST_PROTECTIONS_HDP_FLASH_ADDRESS);
+
+  /* Should not get here if HDP is available and enabled  */
+  printf("  -- Address: 0x%x = 0x%x\r\n\n", TEST_PROTECTIONS_HDP_FLASH_ADDRESS, u_read_key);
+  if(u_read_key == 0U)
+  {
+    printf("  -- 0 has been read: HDP is enabled.\r\n\n");
+  }
+  else
+  {
+    printf("  -- !! HDP privileged CODE protection is NOT ENABLED !!\r\n\n");
+  }
+}
+
+/**
+  * @brief  TEST Run SE_CODE
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunSE_CODE(void)
+{
+
+  uint8_t code[4U];
+  m_uGtzcTzicEvent = 0;
+  printf("\r\n====== Test Protection: GTZC privileged - CODE ==========\r\n\n");
+  printf("  -- Dumping code\r\n\n");
+
+  /* Dumping the first 4 bytes */
+  code[0] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS);
+  code[1] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 1);
+  code[2] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 2);
+  code[3] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 3);
+
+  printf("  -- Dump : %x %x %x %x \r\n\n", code[0], code[1], code[2], code[3]);
+  if (m_uGtzcTzicEvent == 0U)
+  {
+   printf("  -- !! GTZC privileged CODE protection is NOT ENABLED !!\r\n\n");
+  }
+  else
+  {
+    printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+    SVC_NVIC_SystemReset();
+  }
+}
+/**
+  * @brief  TEST Run SE_VDATA
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunSE_VDATA(void)
+{
+  uint32_t u_read_fw_vdata = 0;
+  m_uGtzcTzicEvent = 0;
+  printf("\r\n====== Test Protection: GTZC privileged - VDATA ==========\r\n\n");
+  printf("  -- Reading address: 0x%x\r\n\n", TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
+
+  /* Try to read a 32-bit data from the SRAM2 protected by the GTZC */
+  u_read_fw_vdata = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
+
+  /* Should not get here if MPU was available and enabled  */
+  printf("  -- Address: 0x%x = %d\r\n\n", TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS, u_read_fw_vdata);
+  if (m_uGtzcTzicEvent == 0U)
+  {
+    printf("  -- !! GTZC privileged VDATA protection is NOT ENABLED !!\r\n\n");
+  }
+  else
+  {
+    printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+    SVC_NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @brief  TEST Run WRP
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunWRP(void)
+{
+  uint32_t i = 0U;
+  uint32_t address = 0U;
+
+  printf("\r\n====== Test Protection: WRP ===========================\r\n\n");
+
+  address = TEST_PROTECTIONS_WRP_FLASH_ADDRESS;
+
+  /* 1 - Read Page to be used for restoring*/
+  printf("  -- Reading 0x%x bytes at address: 0x%x (for backup)\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
+         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+  for (i = 0U; i < TEST_PROTECTIONS_WRP_FLASH_SIZE; i++)
+  {
+    uRead_WRP[i] = *((uint8_t *)(address + i));
+  }
+
+  /* 2 - Erasing page */
+  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
+         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+  /* Check that it is not allowed to erase this page */
+  if (FLASH_If_Erase_Size((void *)address, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
+  {
+    /* Error returned during programmation. */
+    /* Check that WRPERR flag is set */
+    if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
+    {
+      printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
+    }
+  }
+  else
+  {
+    /* 3 - Writing Data previously read*/
+    if (FLASH_If_Write((void *)address, uRead_WRP, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
+    {
+      /* Error returned during programmation. */
+      printf("-- !! HAL_FLASH_ERROR: FLASH Write error\r\n\n");
+
+      /* Check that WRPERR flag is set */
+      if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
+      {
+        printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
+      }
+    }
+    else
+    {
+      printf("  -- Written successfully at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+      /*No Errors detected means WRP was not enabled*/
+      printf("  -- !! WRP protection is NOT ENABLED !!\r\n\n");
+    }
+  }
+}
+
+/**
+  * @brief  TEST Run CORRUPT_IMAGE
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunCORRUPT(uint32_t slot_number)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  uint8_t pattern[TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE] = {0};
+
+  /* On this series, MPU should be disable to allow flash corruption.
+     Switching in privileged mode is requested to be able to disable MPU */
+  printf("  -- Disable MPU protection to be able to erase\r\n");
+  SVC_MPU_Disable();
+
+  /* Erase first sector of active slot */
+  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n", TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE,
+         TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number));
+  printf("  -- At next boot Signature Verification will fail. Download a new FW to restore FW image !!\r\n\n");
+
+  /* On this series, the memory corruption is performed by writing again the flash (but not header).
+     The header is preserved for anti-rollback check. */
+  ret = FLASH_If_Write((void *)(TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number)), (void *) &pattern,
+                       TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE);
+
+  /* This code may not be reached, due to the memory corruption performed.
+     In this case, the execution will probably trig hard fault exception (while (1)),
+     then watchdog reset. */
+  if (ret == HAL_OK)
+  {
+    SVC_NVIC_SystemReset();
+  }
+  else
+  {
+    printf("-- !! HAL_FLASH_ERROR_CORRUPT_IMAGE: erasing failure ...\r\n\n");
+  }
+}
+
+/**
+  * @brief  Display the corruption menu
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_CORRUPT_PrintMenu(void)
+{
+  printf("\r\n============  Test: CORRUPT ACTIVE IMAGE ============\r\n\n");
+  printf("  Corrupt image from SLOT_ACTIVE_1 ---------------------- 1\r\n\n");
+  printf("  Corrupt image from SLOT_ACTIVE_2 ---------------------- 2\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Run get firmware info menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+static void TEST_PROTECTIONS_CORRUPT_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+
+  /*Print Main Menu message*/
+  TEST_PROTECTIONS_CORRUPT_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          break;
+        case '2' :
+          slot_number = SLOT_ACTIVE_2;
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (exit != 1U)
+      {
+        if (SlotStartAdd[slot_number] == 0U)
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          TEST_PROTECTIONS_RunCORRUPT(slot_number);
+        }
+
+        /*Print Main Menu message*/
+        TEST_PROTECTIONS_CORRUPT_PrintMenu();
+      }
+    }
+  }
+}
+
+
+/**
+  * @brief  TEST Run TAMPER
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunTAMPER(void)
+{
+  uint32_t i = 0U;
+  m_uTamperEvent = 0U;
+
+  printf("\r\n====== Test Protection: TAMPER ========================\r\n\n");
+  /* Print instructions*/
+  printf("  -- Pull PC13 (CN7.23) to GND \r\n\n");
+  printf("  -- -- Note: sometimes it may be enough to put your finger close to PC13 (CN7.23)\r\n\n");
+  printf("  -- Should reset if TAMPER is enabled. \r\n\n");
+  printf("  Waiting for 10 seconds...\r\n\n")  ;
+
+  /* #2 - Wait 10 seconds*/
+  while ((i < TEST_PROTECTIONS_TAMPER_DELAY) && (m_uTamperEvent == 0U))
+  {
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register
+     */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+    HAL_Delay(1000U);
+    i++;
+  }
+  if (m_uTamperEvent == 0U)
+  {
+    printf("\r\n\n  -- Waited 10 seconds, if you have connected TAMPER pin to GND it means TAMPER protection ");
+    printf("is NOT ENABLED !! \r\n\n");
+  }
+  else
+  {
+    printf("\r\n\n  -- TAMPER Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+    SVC_NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  TEST Run IWDG
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunIWDG(void)
+{
+  printf("\r\n====== Test Protection: IWDG ===========================\r\n\n");
+
+  /* Wait for TEST_PROTECTIONS_IWDG_DELAY*/
+  printf("  -- Waiting %d (ms). Should reset if IWDG is enabled. \r\n\n", TEST_PROTECTIONS_IWDG_DELAY);
+
+  HAL_Delay(TEST_PROTECTIONS_IWDG_DELAY);
+
+  /* No Reset means IWDG was not enabled*/
+  printf("  -- !! IWDG protection is NOT ENABLED !!\r\n\n");
+}
+
+
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void TEST_PROTECTIONS_GtzcPrintTestingSubMenu(void)
+{
+  printf("\r\n====== Test Protection: GTZC ===========================\r\n\n");
+  printf("  Test Protection: TZSC (Flash) ------------------------- 1\r\n\n");
+  printf("  Test Protection: TZSC (RAM) --------------------------- 2\r\n\n");
+  printf("  Test Protection: TZSC (AES) --------------------------- 3\r\n\n");
+  printf("  Test Protection: TZSC (PKA) --------------------------- 4\r\n\n");
+  printf("  Test Protection: TZSC (RNG) --------------------------- 5\r\n\n");
+  printf("  Test Protection: TZSC (SUBGHZSPI) --------------------- 6\r\n\n");
+  printf("  Test Protection: TZSC (TZIC)--------------------------- 7\r\n\n");
+  printf("  Test Protection: TZSC (TZSC)--------------------------- 8\r\n\n");
+  printf("  Test Protection: TZIC (PWR) --------------------------- 9\r\n\n");
+  printf("  Test Protection: TZIC (FLASHIF) ----------------------- a\r\n\n");
+  printf("  Test Protection: TZIC (DMA1) -------------------------- b\r\n\n");
+  printf("  Test Protection: TZIC (DMA2) -------------------------- c\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+}
+
+/**
+  * @brief  TEST Run TZIC
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_Run_GTZC(void)
+{
+  m_uGtzcTzicEvent = 0;
+  uint8_t key = 0U;
+  uint8_t exit = 0U;
+  uint8_t invalid = 0U;
+  uint8_t error_code = 0U;
+  uint32_t value = 0U;
+
+  TEST_PROTECTIONS_GtzcPrintTestingSubMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    invalid = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      printf("If GTZC (TZSC and TZIC) is configured, you should get a TZIC interrupt.\r\n\n");
+      switch (key)
+      {
+        case '1' :
+          value = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS);
+          break;
+        case '2' :
+          /* Try to read a 32-bit data from the SRAM2 protected by the MPU */
+          value = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
+          break;
+        case '3' :
+          value = READ_REG(AES->SR);
+          break;
+        case '4' :
+          value = READ_REG(PKA->SR);
+          break;
+        case '5' :
+          value = READ_REG(RNG->SR);
+          break;
+        case '6' :
+          value = READ_REG(SUBGHZSPI->SR);
+          break;
+        case '7' :
+          value = READ_REG(GTZC_TZIC->MISR1);
+          break;
+        case '8' :
+          /* All GTZSC registers can be read by non-secure unprivileged accesses */
+
+          /* All peripheral aren't privileged in PRIVCFGR1 so there shouldn't be an illegal access */
+          error_code = 0;
+          value = READ_REG(GTZC_TZSC->SECCFGR1);
+          WRITE_REG(GTZC_TZSC->SECCFGR1, 0U);
+          if(value != READ_REG(GTZC_TZSC->SECCFGR1))
+          {
+            error_code = TEST_GTZC_ERROR_CODE;
+          }
+
+          /* This should generate an illegal access */
+          value = READ_REG(GTZC_TZSC->PRIVCFGR1);
+          WRITE_REG(GTZC_TZSC->PRIVCFGR1, 0U);
+          if(value != READ_REG(GTZC_TZSC->PRIVCFGR1))
+          {
+            error_code = TEST_GTZC_ERROR_CODE;
+          }
+          break;
+        case '9' :
+          /* The other PWR registers can be read and written by non-secure unprivileged accesses */
+          value = READ_REG(PWR->SECCFGR);
+          break;
+        case 'a' :
+          MODIFY_REG(FLASH->WRP1AR, FLASH_WRP1AR_WRP1A_STRT, 0x1F);
+          break;
+        case 'b' :
+          __HAL_RCC_DMA1_CLK_ENABLE();
+          __HAL_RCC_DMA1_FORCE_RESET();
+          __HAL_RCC_DMA1_RELEASE_RESET();
+          SET_BIT(DMA1_Channel1->CCR, DMA_CCR_PRIV);
+          __HAL_RCC_DMA1_CLK_DISABLE();
+          break;
+        case 'c' :
+          __HAL_RCC_DMA2_CLK_ENABLE();
+          __HAL_RCC_DMA2_FORCE_RESET();
+          __HAL_RCC_DMA2_RELEASE_RESET();
+          SET_BIT(DMA2_Channel1->CCR, DMA_CCR_PRIV);
+          __HAL_RCC_DMA2_CLK_ENABLE();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+
+        default:
+          printf("Invalid Number !\r");
+          invalid = 1U;
+          break;
+      }
+    }
+
+    if ((key != 0) && (exit != 1) && (invalid != 1))
+    {
+      if ((key == 'a') || (key == 'b') || (key == 'c'))
+      {
+        printf("  -- Register successfully written for the choice %c\r\n", key);
+      }
+      else if ((key == '8') && (error_code == TEST_GTZC_ERROR_CODE))
+      {
+        printf("The GTZC registers aren't properly locked !! \r\n\n");
+      }
+      else if (key == '8')
+      {
+        printf("  -- The GTZC registers are locked.\r\n");
+      }
+      else
+      {
+        printf("  -- Read value for the choice %c: %d\r\n", key, value);
+      }
+
+      /* Wait 1 second */
+      WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+      HAL_Delay(1U);
+
+      if (m_uGtzcTzicEvent == 0U)
+      {
+        printf("GTZC is NOT ENABLED in this use case !! \r\n\n");
+      }
+      else
+      {
+        printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+        SVC_NVIC_SystemReset();
+      }
+
+      TEST_PROTECTIONS_GtzcPrintTestingSubMenu();
+    }
+  }
+}
+
+/**
+  * @brief  TEST Run KMS_DataStorage
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_Run_KMS_DATA_STORAGE(void)
+{
+  uint32_t u_read_fw_code = 0;
+  printf("\r\n====== Test Protection: MPU privileged - KMS_DataStorage \r\n\n");
+  printf("  -- Reading address: 0x%x\r\n\n", KMS_DATASTORAGE_START);
+
+  /* Try to read a 32-bit data from the Flash protected by the MPU */
+  u_read_fw_code = *((uint32_t *)KMS_DATASTORAGE_START);
+
+  /* Should not get here if MPU is available and enabled  */
+  printf("  -- Address: 0x%x = 0x%x\r\n\n", KMS_DATASTORAGE_START, u_read_fw_code);
+  printf("  -- !! MPU privileged CODE protection is NOT ENABLED !!\r\n\n");
+}
+
+/**
+  * @brief  TEST Run SYNC_FLAG
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_Run_SYNC_FLAG(void)
+{
+  __IO uint32_t *pSyncFlag = (__IO uint32_t *)M4_M0PLUS_FLAG_RAM_START;
+  uint32_t u_read_flag_value = 0;
+  printf("\r\n====== Test Protection: MPU Read Only - Synchronization flag \r\n\n");
+  printf("  -- Reading address: 0x%x\r\n\n", M4_M0PLUS_FLAG_RAM_START);
+
+  /* Try to change the value of the synchronization flag */
+  u_read_flag_value = *pSyncFlag;
+  *pSyncFlag = 0U;
+
+  /* Restore the value */
+  *pSyncFlag = u_read_flag_value;
+
+  /* Should not get here if MPU is available and enabled  */
+  printf("  -- Address: 0x%x = 0x%x\r\n\n", M4_M0PLUS_FLAG_RAM_START, *pSyncFlag);
+  printf("  -- !! MPU read only FLAG protection is NOT ENABLED !!\r\n\n");
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup TEST_PROTECTIONS_Callback_Functions Callback Functions
+  * @{
+  */
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void CALLBACK_Antitamper(void)
+{
+  /*Set tamper event variable*/
+  m_uTamperEvent = 1U;
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC IRQ.
+  * @param  None
+  * @retval None
+  */
+void CALLBACK_GTZC_TZIC(void)
+{
+  /*Set GTZC TZIC event variable*/
+  m_uGtzcTzicEvent = 1U;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c
new file mode 100644
index 00000000..50a2847b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c
@@ -0,0 +1,207 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app.c
+  * @author  MCD Application Team
+  * @brief   tKMS application examples module.
+  *          This file provides examples of KMS API usages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+extern void KMS_UPDATE_StartLocalUpdate(void);  /* Function to perform Ymodem download of blob image to import */
+
+static void tkms_app_print_menu(void)
+{
+  (void)printf("\r\n======================= tKMS Examples Menu ===========================\r\n\n");
+  (void)printf("  (*) Requires execution of 'Import Blob' test (3) prior to execute this one\r\n\n");
+  (void)printf("  TKMS - Test All (*)                               --------------------- 0\r\n\n");
+  (void)printf("  TKMS - Tests AES-GCM Embedded key                 --------------------- 1\r\n\n");
+  (void)printf("  TKMS - Tests AES-CBC Embedded key                 --------------------- 2\r\n\n");
+  (void)printf("  TKMS - Import blob                                --------------------- 3\r\n\n");
+  (void)printf("  TKMS - Tests RSA Static key (*)                   --------------------- 4\r\n\n");
+  (void)printf("  TKMS - Tests Derive Static key (*)                --------------------- 5\r\n\n");
+  (void)printf("  TKMS - Tests key finding                          --------------------- 6\r\n\n");
+  (void)printf("  Exit tKMS Examples Menu                           --------------------- x\r\n\n");
+}
+
+void tkms_app_menu(void)
+{
+  uint8_t key;
+  uint8_t exit = 0U;
+  CK_RV ret_status;
+  uint8_t tests_executed; /* Tests executed count */
+  uint8_t tests_success;  /* Tests success count */
+  uint8_t clear_buffer[128] = "STM32 Key Management Services - Example buffer"; /* Clear text test buffer */
+
+  /* Initialize tKMS for subsequent usage */
+  ret_status = C_Initialize(NULL);
+  if (ret_status != CKR_OK)
+  {
+    (void)printf("tKMS initialization failed\r\n");
+    exit = 1;
+  }
+  else
+  {
+    tkms_app_print_menu();
+  }
+
+  while (exit == 0U)  /* Till user request to exit this menu, loop on it */
+  {
+    key = 0U;
+
+    INVOKE_SCHEDULE_NEEDS();
+
+    /* Clean the user input path */
+    (void)COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)  /* User pressed key */
+      {
+        case '0' :
+          /*
+           * Execute the whole supported tests in sequence
+           * For each test:
+           * - call INVOKE_SCHEDULE_NEEDS to rewarm WDG
+           * - check results and report test status
+           * At the end, global result is provided
+           */
+          tests_executed = 0U;
+          tests_success = 0U;
+          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
+          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
+          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_find();
+          (void)printf("Find key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          /* Report final status */
+          if (tests_success == tests_executed)
+          {
+            (void)printf("CUMULATIVE RESULT: ALL TESTS PASSED\r\n");
+          }
+          else
+          {
+            (void)printf("CUMULATIVE RESULT: %d/%d success\r\n", tests_success, tests_executed);
+          }
+          tkms_app_print_menu();
+          break;
+
+        /* 1 = TKMS - Tests AES-GCM Embedded key */
+        case '1' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 2 = Tests AES-CBC Embedded key */
+        case '2' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 3 = Import Blob */
+        case '3':
+          INVOKE_SCHEDULE_NEEDS();
+          KMS_UPDATE_StartLocalUpdate();
+          tkms_app_print_menu();
+          break;
+        /* 4 = Tests RSA Static key (requires blob import) */
+        case '4' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
+          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 5 = Tests Key derivation (requires blob import) */
+        case '5':
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
+          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 6 = Tests Key finding */
+        case '6':
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_find();
+          (void)printf("Find key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        case 'x':
+          exit = 1;
+          break;
+
+        default:
+          (void)printf("Invalid Number !\r");
+          tkms_app_print_menu();
+          break;
+      }
+    }
+  }
+
+  /* Finalize tKMS since no more in use */
+  ret_status = C_Finalize(NULL);
+  if (ret_status != CKR_OK)
+  {
+    (void)printf("tKMS finalization failed\r\n");
+  }
+}
+
+/*
+ * Utilities to format buffer in string for display in traces
+ */
+void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length)
+{
+  uint8_t ascii[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+  uint8_t *ptmp = pstr;
+  uint8_t *ptmp2 = pbuff;
+  for (uint32_t i = 0UL; i < length; i += 1UL)
+  {
+    *ptmp = ascii[*ptmp2 >> 4];
+    ptmp++;
+    *ptmp = ascii[*ptmp2 & 0x0FUL];
+    ptmp++;
+    ptmp2++;
+  }
+  *ptmp = 0U;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c
new file mode 100644
index 00000000..6d6e7ebb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_derive_key.c
+  * @author  MCD Application Team
+  * @brief   tKMS application examples module.
+  *          This file provides examples of KMS API usage to derivate a key
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define EC_POINT_MAX_LEN          (3U + (2U * 32U))   /* EC Point Max Length : X962 header + DER header +
+                                                         NIST-P256 *2 - > (0x04|LEN|0x04|X|Y) */
+#define DH_SECRET_X_MAX_LEN       (32U)               /* DH Secret X Max Length */
+
+/* Private structures --------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+
+
+/**
+  * @brief  Key derivation
+  *         This example is showing how to use key derivation to create
+  *         a specific session key.
+  * @note
+  *     Key derivation shared information between emitter and receiver
+  *       - Secret derivation Key: stored in KMS under
+  *                  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE object handle
+  *       - Session key variation: transmitted or calculated by both emitter & receiver
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pClearMessage)
+{
+  uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
+  uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
+  /* Generated key template definition */
+  CK_ULONG DeriveKey_template_class = CKO_SECRET_KEY;
+  CK_ULONG DeriveKey_template_destroyable = CK_TRUE;
+  CK_ULONG DeriveKey_template_encrypt = CK_TRUE;
+  CK_ULONG DeriveKey_template_decrypt = CK_TRUE;
+  CK_ULONG DeriveKey_template_extract = CK_TRUE;
+  CK_ATTRIBUTE DeriveKey_template[] =
+  {
+    {CKA_CLASS, (CK_VOID_PTR) &DeriveKey_template_class,       sizeof(CK_ULONG)},
+    {CKA_DESTROYABLE, (CK_VOID_PTR) &DeriveKey_template_destroyable, sizeof(CK_ULONG)},
+    {CKA_ENCRYPT, (CK_VOID_PTR) &DeriveKey_template_encrypt,     sizeof(CK_ULONG)},
+    {CKA_DECRYPT, (CK_VOID_PTR) &DeriveKey_template_decrypt,     sizeof(CK_ULONG)},
+    {CKA_EXTRACTABLE, (CK_VOID_PTR) &DeriveKey_template_extract,     sizeof(CK_ULONG)}
+  };
+  /* Template to retrieve generate key value */
+  CK_ATTRIBUTE GetKey_template[] = {{CKA_VALUE, (CK_VOID_PTR) &DeriveKey_template_class, 32UL}};
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  /* Key derivation */
+  uint8_t session_variant[32] = "My session variation 0122004578";
+  CK_MECHANISM      mech = {CKM_AES_ECB_ENCRYPT_DATA, session_variant, 32};
+  CK_OBJECT_HANDLE  derivedKeyHdle = 0UL;
+  uint8_t derivedKey[32] = {0};
+  /* AES encryption / decryption */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)cbc_iv, sizeof(cbc_iv) };
+  uint8_t tag[16] = {0};
+  uint32_t tag_lenth;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Derive key with pass phrase */
+  if (rv == CKR_OK)
+  {
+    rv = C_DeriveKey(session, &(mech), (CK_OBJECT_HANDLE)KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE,
+                     &DeriveKey_template[0], sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derivedKeyHdle);
+  }
+
+  /* Get derived key to display */
+  if (rv == CKR_OK)
+  {
+    GetKey_template[0].pValue = derivedKey;
+    rv = C_GetAttributeValue(session, derivedKeyHdle, &(GetKey_template[0]), sizeof(GetKey_template) /
+                             sizeof(CK_ATTRIBUTE));
+  }
+  if (rv == CKR_OK)
+  {
+    (void)printf("--- Derivating key --------------------------------------------\r\n");
+    (void)printf("--- AES ECB\r\n");
+    (void)printf("--- Pass phrase   [%s]\r\n", session_variant);
+    tkms_buff2str(derivedKey, a_string, 32);
+    (void)printf("--- Derived key   [%s]\r\n", a_string);
+  }
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES CBC\r\n");
+  (void)printf("--- IV      [%s]\r\n", cbc_iv);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Remove key once no more needed */
+  if (rv == CKR_OK)
+  {
+    rv = C_DestroyObject(session, derivedKeyHdle);
+  }
+
+  /* Verify key is no more usable */
+  if (rv == CKR_OK)
+  {
+    if (C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle) == CKR_OK)
+    {
+      rv = CKR_FUNCTION_FAILED;
+    }
+  }
+
+  /* Close sessions */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c
new file mode 100644
index 00000000..5692f717
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c
@@ -0,0 +1,293 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_encrypt_decrypt.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to encrypt & decrypt
+  *          messages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines ---------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+static uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
+static uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
+
+/**
+  * @brief  AES GCM 128 Bits
+  *         This example is showing how to use AES GCM encryption/decryption to
+  *         authenticate and protect a message.
+  * @note
+  *     Shared information between emitter and receiver
+  *       - Secret encryption/decryption Key: stored in KMS under
+  *                        KMS_KEY_AES128_OBJECT_HANDLE object handle
+  *       - Encrypted message: transmitted from emitter to sender
+  *       - Initialization Vector: transmitted from emitter to sender
+  *       - Message Header: transmitted from emitter to sender
+  *       - Authentication Tag: transmitted from emitter to sender
+  *                      (calculated during encryption, verified during decryption)
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t tag[16] = {0};  /* 128 bits tag size */
+  uint32_t tag_lenth = 0UL;
+
+  /* AES GCM Configuration variables */
+  uint8_t gcm_iv[12] = ">GCM VECTOR";
+  uint8_t gcm_header[16] = ">AES GCM Header";
+  /* Prepare GCM mechanism */
+  CK_GCM_PARAMS gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    sizeof(gcm_iv),
+    (CK_BYTE_PTR)gcm_header,
+    sizeof(gcm_header),
+    128   /* Tag length in Bits */
+  };
+  CK_MECHANISM aes_gcm_mechanism = { CKM_AES_GCM, (CK_VOID_PTR *)(uint32_t) &gcm_params, sizeof(gcm_params) };
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES GCM\r\n");
+  (void)printf("--- IV      [%s]\r\n", gcm_iv);
+  (void)printf("--- Header  [%s]\r\n", gcm_header);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+  tkms_buff2str(tag, a_string, tag_lenth);
+  (void)printf("--- Tag     [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  if (rv == CKR_OK)
+  {
+    (void)printf(">>> Decrypted message authenticated\r\n");
+  }
+  else
+  {
+    (void)printf("XXX Decrypted message not authenticated\r\n");
+  }
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)     /* Tag verification done into C_DecryptFinal, thus tag check reflected into rv */
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/**
+  * @brief  AES CBC 256 Bits
+  *         This example is showing how to use AES CBC encryption/decryption to
+  *         protect a message.
+  * @note
+  *     CBC shared information between emitter and receiver
+  *       - Secret encryption/decryption Key: stored in KMS under
+  *                             KMS_KEY_AESC256_OBJECT_HANDLE object handle
+  *       - Encrypted message: transmitted from emitter to sender
+  *       - Initialization Vector: transmitted from emitter to sender
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t tag[16] = {0};
+  uint32_t tag_lenth;
+
+  /* AES CBC Configuration variables */
+  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)(uint32_t)cbc_iv, sizeof(cbc_iv) };
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES CBC\r\n");
+  (void)printf("--- IV      [%s]\r\n", cbc_iv);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES CBC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES CBC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth); /* In case of AES CBC, no tag comparison is done */
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_find.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_find.c
new file mode 100644
index 00000000..6241319d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_find.c
@@ -0,0 +1,96 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_find.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to find
+  *          objects.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_KEY_AES128 "USERCRYP128"
+#define TEST_KEY_AES256 "USERCRYP256"
+/* Private variables ---------------------------------------------------------*/
+
+/**
+  * @brief  Object search
+  *         This example is showing how to find an object.
+  * @param  None
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_find(void)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_ATTRIBUTE object_template;
+  CK_OBJECT_HANDLE object_handle;
+  CK_ULONG count;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Fill in the template with the attribute to retrieve the specific key
+  (CKA_LABEL is used to refer to a specific object) */
+  object_template.type = CKA_LABEL;
+  object_template.pValue = TEST_KEY_AES128;
+  object_template.ulValueLen = sizeof(TEST_KEY_AES128);
+
+  (void)printf("--- Find Object -----------------------------------------------------\r\n");
+  (void)printf("--- Label [%s]\r\n", (uint8_t *)object_template.pValue);
+
+  /* Find Objects Init : template of the object to retrieve is passed to KMS */
+  if (rv == CKR_OK)
+  {
+    rv = C_FindObjectsInit(session, (CK_ATTRIBUTE_PTR)&object_template, 1);
+  }
+
+  /* Find Objects : Find object corresponding to the template specified in FindObjectsInit */
+  if (rv == CKR_OK)
+  {
+    count = 1;
+    rv = C_FindObjects(session, &object_handle, 1, &count);
+  }
+
+  /* Find Objects Final: Finalize the operation */
+  if (rv == CKR_OK)
+  {
+    rv = C_FindObjectsFinal(session);
+  }
+
+  if (rv == CKR_OK)
+  {
+    (void)printf("--- Object Found ------------------------------------------------\r\n");
+    (void)printf("--- Object Handle [%d]\r\n", object_handle);
+  }
+  else
+  {
+    printf("--- Object Not Found --------------------------------------------\r\n");
+  }
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c
new file mode 100644
index 00000000..c4a0c8aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c
@@ -0,0 +1,123 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_sign_verify.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to sign & verify
+  *          messages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+static uint8_t signature[2048 / 8] __attribute__((aligned(8))) = {0};
+
+
+/**
+  * @brief  RSA 1024 Bits
+  *         This example is showing how to use RSA signature to
+  *         authenticate a message.
+  * @note
+  *     RSA shared information between emitter and receiver
+  *       - Secret signature/verification Key: stored in KMS under
+  *         KMS_KEY_RSA2048_OBJECT_HANDLE object handle
+  *       - Message to authenticate: transmitted from emitter to sender
+  *       - Signature: transmitted from emitter to sender
+  *             (calculated by emitter, verified by receiver)
+  * @param  length  Length of the clear text for signature/verification tests
+  * @param  pMessage  Clear text for signature/verification tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage)
+{
+
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t signature_length = 0UL;
+
+  /* Prepare RSA mechanism */
+  CK_MECHANISM rsa_mechanism = { CKM_SHA256_RSA_PKCS, (CK_VOID_PTR *) NULL, 0};
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Signature --------------------------------------------------------------*/
+  (void)printf("--- Signing -----------------------------------------------------\r\n");
+  (void)printf("--- RSA 1024 bits\r\n");
+  (void)printf("--- Message [%s]\r\n", pMessage);
+  tkms_buff2str(pMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to sign message using RSA with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_SignInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
+  }
+
+  /* Sign message */
+  if (rv == CKR_OK)
+  {
+    signature_length = sizeof(signature);
+    rv = C_Sign(session, pMessage, length,
+                signature, &signature_length);
+  }
+
+  (void)printf("--- Signed ------------------------------------------------------\r\n");
+  tkms_buff2str(signature, a_string, signature_length);
+  (void)printf("--- Signature [0x%s]\r\n", a_string);
+  (void)printf("--- Length    [%d]\r\n", signature_length);
+
+  /* Verification ------------------------------------------------------------*/
+
+  /* Configure session to verify message using RSA with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_VerifyInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
+  }
+
+  /* Verify message */
+  if (rv == CKR_OK)
+  {
+    rv = C_Verify(session, pMessage, length,
+                  signature, signature_length);
+  }
+
+  if (rv == CKR_OK)
+  {
+    (void)printf(">>> Message authenticated\r\n");
+  }
+  else
+  {
+    (void)printf("XXX Message not authenticated\r\n");
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/ymodem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/ymodem.c
new file mode 100644
index 00000000..8a61d4a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/Src/ymodem.c
@@ -0,0 +1,395 @@
+/**
+  ******************************************************************************
+  * @file    ymodem.c
+  * @author  MCD Application Team
+  * @brief   Ymodem module.
+  *          This file provides set of firmware functions to manage Ymodem
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  FW_UPDATE Firmware Update Example
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "common.h"
+#include "ymodem.h"
+#include "string.h"
+#include "main.h"
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* @note ATTENTION - please keep this variable 32bit aligned */
+static uint8_t m_aPacketData[PACKET_1K_SIZE + PACKET_DATA_INDEX +
+                             PACKET_TRAILER_SIZE]; /*!<Array used to store Packet Data*/
+uint8_t m_aFileName[FILE_NAME_LENGTH + 1U]; /*!< Array used to store File Name data */
+static CRC_HandleTypeDef CrcHandle; /*!<CRC handle*/
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout);
+
+/* Private functions ---------------------------------------------------------*/
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeout
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  uint8_t char1;
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0;
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
+     reload register */
+  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+  status = (HAL_StatusTypeDef)COM_Receive(&char1, 1, uTimeout);
+
+  if (status == HAL_OK)
+  {
+    switch (char1)
+    {
+      /* start of 128-byte data packet */
+      case SOH:
+        packet_size = PACKET_SIZE;
+        break;
+      /* start of 1024-byte data packet */
+      case STX:
+        packet_size = PACKET_1K_SIZE;
+        break;
+      /* end of transmission */
+      case EOT:
+        break;
+      /* CA + CA : transmission aborted by sender */
+      case CA:
+        if ((COM_Receive(&char1, 1U, uTimeout) == HAL_OK) && (char1 == CA))
+        {
+          packet_size = 2U;                               /* specific packet_size to indicate transmission aborted */
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      /* abort requested */
+      case ABORT1:
+      case ABORT2:
+        status = HAL_BUSY;
+        break;
+      /* Begin of startup sequence */
+      case RB:
+        COM_Receive(&char1, 1U, uTimeout);                /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        COM_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;                                 /* specific packet_size to indicate transmission started */
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= PACKET_SIZE)
+    {
+#ifndef MINICOM_YMODEM
+      /* Receiving the packet */
+      status = COM_Receive(&pData[PACKET_NUMBER_INDEX], packet_size + PACKET_OVERHEAD_SIZE, uTimeout);
+#else
+      status = HAL_OK;
+      while ((HAL_OK == status) &&
+             ((myIdx + PACKET_NUMBER_INDEX) < (PACKET_1K_SIZE + PACKET_DATA_INDEX + PACKET_TRAILER_SIZE))
+            )
+      {
+        status = COM_Receive(&pData[PACKET_NUMBER_INDEX + myIdx], 1, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        status = HAL_OK;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (status == HAL_OK)
+      {
+        if (pData[PACKET_NUMBER_INDEX] != ((pData[PACKET_CNUMBER_INDEX]) ^ NEGATIVE_BYTE))
+        {
+          /* Packet size set to 0 in case of sanity check error */
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC */
+          crc = pData[ packet_size + PACKET_DATA_INDEX ] << 8U;
+          crc += pData[ packet_size + PACKET_DATA_INDEX + 1U ];
+          if (HAL_CRC_Calculate(&CrcHandle, (uint32_t *)&pData[PACKET_DATA_INDEX], packet_size) != crc)
+          {
+            /* Packet size set to 0 in case of CRC error */
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        /* Packet size set to 0 in case of reception error */
+        packet_size = 0U;
+      }
+    }
+  }
+
+  /* Update the length parameter */
+  *puLength = packet_size;
+  return status;
+}
+
+
+/**
+  * @brief  Init of Ymodem module.
+  * @param None.
+  * @retval None.
+  */
+void Ymodem_Init(void)
+{
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  /* Configure the CRC peripheral */
+  CrcHandle.Instance = CRC;
+
+  /* The CRC-16-CCIT polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+  CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+  CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+
+  /* The zero init value is used */
+  CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+  CrcHandle.Init.InitValue               = 0U;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode  = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+
+  if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1U)
+    {}
+  }
+}
+
+
+/* Public functions ---------------------------------------------------------*/
+/**
+  * @brief  Receive a file using the ymodem protocol with CRC16.
+  * @param  puSize The uSize of the file.
+  * @param  uFlashDestination where the file has to be downloaded.
+  * @retval COM_StatusTypeDef result of reception/programming
+  */
+COM_StatusTypeDef Ymodem_Receive(uint32_t *puSize, uint32_t uFlashDestination, YMODEM_CallbacksTypeDef *appCb)
+{
+  uint32_t i;
+  uint32_t packet_length;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t ramsource;
+  uint32_t filesize;
+  uint8_t *file_ptr;
+  uint8_t file_size[FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  uint32_t packets_received;
+  COM_StatusTypeDef e_result = COM_OK;
+
+  while ((session_done == 0U) && (e_result == COM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (e_result == COM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              Serial_PutByte(ACK);
+              e_result = COM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              Serial_PutByte(ACK);
+              *puSize = filesize;
+              file_done = 1U;           /* file reception ended */
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[PACKET_NUMBER_INDEX] != (packets_received & 0xff))
+              {
+                /* Serial_PutByte(NAK); */
+              }
+              else
+              {
+                /* first packet : header (file name + file size) */
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name extraction */
+                    i = 0U;
+                    file_ptr = m_aPacketData + PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < FILE_NAME_LENGTH))
+                    {
+                      m_aFileName[i++] = *file_ptr++;
+                    }
+
+                    /* File size extraction */
+                    m_aFileName[i++] = '\0';
+                    i = 0U;
+                    file_ptr ++;
+                    while ((*file_ptr != ' ') && (i < FILE_SIZE_LENGTH))
+                    {
+                      file_size[i++] = *file_ptr++;
+                    }
+                    file_size[i++] = '\0';
+                    Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call */
+                    if (appCb->Ymodem_HeaderPktRxCpltCallback((uint32_t) filesize) == HAL_OK)
+                    {
+                      /* Send acknowledge and next packet requested */
+                      Serial_PutByte(ACK);
+                      COM_Flush();
+                      Serial_PutByte(CRC16);
+                    }
+                    else
+                    {
+                      /* In case of error : transmission aborted
+                         Send CA + CA */
+                      tmp = CA;
+                      COM_Transmit(&tmp, 1U, NAK_TIMEOUT);
+                      COM_Transmit(&tmp, 1U, NAK_TIMEOUT);
+                      e_result = COM_ABORT;
+                      break;
+                    }
+
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    Serial_PutByte(ACK);
+                    file_done = 1;           /* file reception ended */
+                    session_done = 1;        /* sesion ended */
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  ramsource = (uint32_t) & m_aPacketData[PACKET_DATA_INDEX];
+
+                  /* Data packet received callback call*/
+                  if (appCb->Ymodem_DataPktRxCpltCallback((uint8_t *) ramsource, uFlashDestination,
+                                                          (uint32_t) packet_length) == HAL_OK)
+                  {
+                    /* Packet acknowledged : newt one requested */
+                    Serial_PutByte(ACK);
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* Abort transmission : CA + CA */
+                    tmp = CA;
+                    COM_Transmit(&tmp, 1U, NAK_TIMEOUT);
+                    COM_Transmit(&tmp, 1U, NAK_TIMEOUT);
+                    e_result = COM_ERROR;
+                  }
+                }
+                packets_received ++;
+                session_begin = 1U;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          Serial_PutByte(CA);
+          Serial_PutByte(CA);
+          e_result = COM_ABORT;
+          break;
+        default:
+          /* Com aborted after 5 consecutives error */
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > MAX_ERRORS)
+          {
+            /* Abort communication */
+            Serial_PutByte(CA);
+            Serial_PutByte(CA);
+            e_result = COM_ABORT;
+          }
+          else
+          {
+            Serial_PutByte(CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            printf("\b.");         /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+          }
+          break;
+      }
+    }
+  }
+  return e_result;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/readme.txt
new file mode 100644
index 00000000..d1585d76
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M0Plus/readme.txt
@@ -0,0 +1,146 @@
+/**
+  @page 2_Images_UserApp_M0Plus / Secure Firmware Update - M0+ User Application Demo
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows a User Application
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application demonstrates firmware download capabilities and provides a set of functions to test the active
+protections offered by Secure Boot and Secure Engine.
+It also demonstrates key management services through basic examples and specific boot
+mechanism (secure firmware update decryption, verification...)
+A terminal connected with the board via VCOM is needed to communicate with the board and to select which feature
+to demonstrate.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from
+the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 2_Images_UserApp_M0Plus/Src/com.c                    Communication module file
+   - 2_Images_UserApp_M0Plus/Src/common.c                 Common module file
+   - 2_Images_UserApp_M0Plus/Src/flash_if.c               Flash interface file
+   - 2_Images_UserApp_M0Plus/Src/fw_update_app.c          Firmware update application
+   - 2_Images_UserApp_M0Plus/Src/kms_object_update_app.c  KMS Blob update application
+   - 2_Images_UserApp_M0Plus/Src/main.c                   Main program
+   - 2_Images_UserApp_M0Plus/Src/mpu.c                    Secure Engine isolation with MPU (when no Firewall is available)
+   - 2_Images_UserApp_M0Plus/Src/se_user_code.c           Call user defined services running in Secure Engine
+   - 2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c           Interrupt handlers
+   - 2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c       STM32 system file
+   - 2_Images_UserApp_M0Plus/Src/test_protections.c       Protection test
+   - 2_Images_UserApp_M0Plus/Src/tkms_app.c               tKMS tests
+   - 2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c    tKMS key derivation tests
+   - 2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c tKMS encryption/decryption tests
+   - 2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c   tKMS signature/verification tests
+   - 2_Images_UserApp_M0Plus/Src/ymodem.c                 Ymodem communication module
+   - 2_Images_UserApp_M0Plus/Inc/com.h                    Header for com.c file
+   - 2_Images_UserApp_M0Plus/Inc/common.h                 Header for common.c file
+   - 2_Images_UserApp_M0Plus/Inc/flash_if.h               Header for flash_if.c file
+   - 2_Images_UserApp_M0Plus/Inc/fw_update_app.h          Header for fw_update_app.c file
+   - 2_Images_UserApp_M0Plus/Inc/main.h                   Header for main.c file
+   - 2_Images_UserApp_M0Plus/Inc/mpu.h                    Header file for mpu.c
+   - 2_Images_UserApp_M0Plus/Inc/se_user_code.h           Header file for se_user_code.c
+   - 2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h      Definition for the new blob storage and installation
+   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h     HAL configuration file
+   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h           Header for stm32wlxx_it.c file
+   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h  BSP configuration file
+   - 2_Images_UserApp_M0Plus/Inc/test_protections.h       Header for test_protections.c file
+   - 2_Images_UserApp_M0Plus/Inc/tkms_app.h               Header for tkms_app.c file
+   - 2_Images_UserApp_M0Plus/Inc/ymodem.h                 Header for ymodem.c file
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices.
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
+    is a feature provided by STM32Cube programmer available on www.st.com.
+  - This example is based on se_interface_application.o module exported by SBSFU project.
+  - This example needs a terminal emulator.
+  - Microsoft Windows has a limitation whereby paths to files and directories cannot
+    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
+    shell scripts) to fail reading from or writing to such files.
+    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
+    up a local drive out of an existing directory on the hard drive, such as:
+    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par IDE postbuild script
+
+In order to ease the development process, a postbuild script ("postbuild.bat") is integrated in each IDE project.
+This postbuild script:
+ - is generated when compiling the Secure Engine Core project,
+ - prepares the firmware image of the user application to be installed in the device.
+
+A known limitation of this integration occurs when you update the firmware version (parameter of postbuild.bat script).
+The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+Refer to SBSFU readme and follow steps by steps instructions.
+
+Once executed, this user application gives access to a menu which allows:
+  1 - to download a new firmware : feature not supported in 1 firmware image example
+  2 - to test protections (GTZC isolation, HDP, WRP, IWDG, TAMPER, MPU isolation)
+  3 - to demonstrate how to call user defined services running in Secure Engine
+  4 - to provide access to multiple images feature (not supported)
+  5 - to validate a firmware image at first start-up (not supported)
+  a - to demonstrate usage of key management services
+
+1. Pressing 1 allows to download a new firmware.
+Feature not supported in 1 firmware image example
+
+2. Pressing 2 allows to test protections.
+
+ - CORRUPT IMAGE test (#1): causes a signature verification failure at next boot
+ - Isolation tests (#2, #3): cause a reset trying to access protected code or data (either in RAM or FLASH)
+ - Secure user memory protection test (#4): cause an error trying to access protected code
+ - WRP test (#5): causes an error trying to erase write protected code
+ - IWDG test (#6): causes a reset simulating a deadlock by not refreshing the watchdog.
+ - TAMPER test (#7): causes a reset if a tamper event is detected. In order to generate a tamper event,
+   user has to connect PC13 (CN7.23) to GND (It may be enough to put your finger close to PC13 (CN7.23)).
+   By default, the feature is disabled (see the SBSFU readme.txt).
+ - GTZC tests (#8): causes an error trying to access to protected IP, code or data (either in RAM or FLASH)
+ - KMS data storage test (#9): causes an error trying to access KMS data storage (NVM data)
+
+3. Pressing 3 allows to call user defined services running in Secure Engine.
+ - As an example, SE_APP_GetActiveFwInfo (#1, #2) service is called in order to display the firmware information
+   located in the protected area such as version and size.
+ - The IRQ handling tests (#a, #b) show how to disable and to enable IRQ services.
+   Each interface must be called once (no consecutive calls of the same interface).
+   Presses on the User Button generate interrupts (handled or not depending on whether the interrupts are enabled).
+
+4. This menu is dedicated to multiple images feature.
+Feature not available as there is no firmware download area.
+
+5. This menu is dedicated to image validation.
+Feature available under ENABLE_IMAGE_STATE_HANDLING compilation switch, not available in this example.
+
+a. Pressing a allows to enter specific key management services test menu.
+With this menu, you should be able to try encryption/decryption, signature/verification or key derivation mechanisms.
+
+
+Note1 : There is only 1 active slot configured in this example.
+Note2 : for Linux users Minicom can be used but to do so you need to compile the UserApp project with the MINICOM_YMODEM
+        switch enabled (ymodem.h)
+
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/Project.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/Project.ewd
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/Project.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp
new file mode 100644
index 00000000..2fd9e4f7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp
@@ -0,0 +1,1109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_UserApp_M4</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\UserApp.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 2 1"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+      </file>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..a465e21c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,41 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_M4_APP_ROM_start__ = __ICFEDIT_SLOT_Active_2_start__ + 512;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+define region M4_APP_ROM_region      = mem:[from __ICFEDIT_region_M4_APP_ROM_start__ to __ICFEDIT_SLOT_Active_2_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_region_M4_APP_ROM_start__ { readonly section .intvec };
+place in M4_APP_ROM_region   { readonly, last section aes_block_padding };
+place in M4_APP_RAM_region   { readwrite, block CSTACK, block HEAP };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/main.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/main.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/main.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_hal_conf.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_hal_conf.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_hal_conf.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_it.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_it.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_it.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvoptx
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvoptx
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvoptx
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..c40f67e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M4</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>UserApp_CM4</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 2 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>0</hadIROM>
+            <hadIRAM>0</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>1</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../Linker_Common/MDK-ARM;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>.\UserApp_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_UserApp_M4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/STM32WL_cm4.ini b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/STM32WL_cm4.ini
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/STM32WL_cm4.ini
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/STM32WL_cm4.ini
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct
new file mode 100644
index 00000000..327142fc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct
@@ -0,0 +1,28 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_2_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_2_START + 0x200) FIXED VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+  ROM_region +0 {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  RAM_region M4_APP_REGION_RAM_START M4_APP_RAM_REGION_SIZE {
+  .ANY (STACK)
+  .ANY (HEAP)
+  .ANY (+RW +ZI)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/startup_stm32wl55xx_cm4.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/startup_stm32wl55xx_cm4.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/MDK-ARM/startup_stm32wl55xx_cm4.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..47ba5770
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="UserApp_cm4" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;2&quot; &quot;1&quot;" prebuildStep="">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/UserApp_cm4.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_UserApp_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp_cm4.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.401807756" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/UserApp_cm4.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_UserApp_CM4.null.394363235" name="2_Images_UserApp_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.project
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.project
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.project
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch
new file mode 100644
index 00000000..24d9fd10
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\UserApp_cm4.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_UserApp_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\UserApp_cm4.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_UserApp_CM4"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_UserApp_CM4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.ld
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Src/main.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Src/main.c
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Src/main.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..10ec0e6a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c
@@ -0,0 +1,181 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+
+/******************************************************************************/
+/*            Cortex-M4 Processor Exceptions Handlers                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles NMI exception.
+  * @param  None
+  * @retval None
+  */
+void NMI_Handler(void)
+{
+  /* Go to infinite loop when NMI exception occurs */
+  while (1)
+  {
+    /* Reboot when NMI exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Hard Fault exception.
+  * @param  None
+  * @retval None
+  */
+void HardFault_Handler(void)
+{
+  /* Go to infinite loop when Hard Fault exception occurs */
+  while (1)
+  {
+    /* Reboot when Hard Fault exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Memory Manage exception.
+  * @param  None
+  * @retval None
+  */
+void MemManage_Handler(void)
+{
+  /* Go to infinite loop when Memory Manage exception occurs */
+  while (1)
+  {
+    /* Reboot when Memory Manage exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Bus Fault exception.
+  * @param  None
+  * @retval None
+  */
+void BusFault_Handler(void)
+{
+  /* Go to infinite loop when Bus Fault exception occurs */
+  while (1)
+  {
+    /* Reboot when Bus Fault exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Usage Fault exception.
+  * @param  None
+  * @retval None
+  */
+void UsageFault_Handler(void)
+{
+  /* Go to infinite loop when Usage Fault exception occurs */
+  while (1)
+  {
+    /* Reboot when Usage Fault exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles SVCall exception.
+  * @param  None
+  * @retval None
+  */
+void SVC_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles Debug Monitor exception.
+  * @param  None
+  * @retval None
+  */
+void DebugMon_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers             */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles PPP interrupt request.
+  * @param  None
+  * @retval None
+  */
+/*void PPP_IRQHandler(void)
+{
+}*/
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Src/system_stm32wlxx.c
new file mode 100644
index 00000000..bedef774
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/Src/system_stm32wlxx.c
@@ -0,0 +1,388 @@
+/**
+  ******************************************************************************
+  * @file    system_stm32wlxx.c
+  * @author  MCD Application Team
+  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
+  *
+  *   This file provides two functions and one global variable to be called from
+  *   user application:
+  *      - SystemInit(): This function is called at startup just after reset and
+  *                      before branch to main program. This call is made inside
+  *                      the "startup_stm32wlxx.s" file.
+  *
+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
+  *                                  by the user application to setup the SysTick
+  *                                  timer or configure other parameters.
+  *
+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
+  *                                 be called whenever the core clock is changed
+  *                                 during program execution.
+  *
+  *   After each device reset the MSI (4 MHz) is used as system clock source.
+  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
+  *   configure the system clock before to branch to main program.
+  *
+  *   This file configures the system clock as follows:
+  *=============================================================================
+  *-----------------------------------------------------------------------------
+  *        System Clock source                    | MSI
+  *-----------------------------------------------------------------------------
+  *        SYSCLK(Hz)                             | 4000000
+  *-----------------------------------------------------------------------------
+  *        HCLK(Hz)                               | 4000000
+  *-----------------------------------------------------------------------------
+  *        AHB Prescaler                          | 1
+  *-----------------------------------------------------------------------------
+  *        APB1 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        APB2 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_M                                  | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_N                                  | 8
+  *-----------------------------------------------------------------------------
+  *        PLL_P                                  | 7
+  *-----------------------------------------------------------------------------
+  *        PLL_Q                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLL_R                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_P                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_Q                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_R                              | NA
+  *-----------------------------------------------------------------------------
+  *        Require 48MHz for USB OTG FS,          | Disabled
+  *        SDIO and RNG clock                     |
+  *-----------------------------------------------------------------------------
+  *=============================================================================
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics. 
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup CMSIS
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_system
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_System_Private_Includes
+  * @{
+  */
+
+#include "stm32wlxx.h"
+
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (MSI_VALUE)
+   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
+#endif /* LSI_VALUE */
+
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Defines
+  * @{
+  */
+
+/* Note: Following vector table addresses must be defined in line with linker
+         configuration. */
+/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
+     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
+     at address 0x00 which correspond to automatic remap of boot address selected */
+/* #define USER_VECT_TAB_ADDRESS */
+#if defined(USER_VECT_TAB_ADDRESS)
+#ifdef CORE_CM0PLUS
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
+#else /* CORE_CM4 */
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+#endif
+#endif
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Variables
+  * @{
+  */
+  /* The SystemCoreClock variable is updated in three ways:
+      1) from within HAL_Init()
+      2) by calling CMSIS function SystemCoreClockUpdate()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
+  */
+  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
+
+  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
+
+  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
+
+  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
+    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Functions
+  * @{
+  */
+#if defined(__ARMCC_VERSION)
+extern void * __Vectors;
+#define INTVECT_START ((uint32_t) & __Vectors)
+#elif defined(__ICCARM__)
+extern uint32_t __vector_table;
+#define INTVECT_START ((uint32_t)& __vector_table)
+#elif defined(__GNUC__)
+extern void * g_pfnVectors;
+#define INTVECT_START ((uint32_t)& g_pfnVectors)
+#endif
+
+/**
+  * @brief  Setup the microcontroller system.
+  * @param  None
+  * @retval None
+  */
+void SystemInit(void)
+{
+  /* Configure the Vector Table location  ------------------*/
+  SCB->VTOR = INTVECT_START;
+
+  /* FPU settings ------------------------------------------------------------*/
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
+#endif
+
+  /* Reset the RCC clock configuration to the default reset state ------------*/
+  /* Set MSION bit */
+  RCC->CR |= RCC_CR_MSION;
+
+  /* Reset CFGR register */
+  RCC->CFGR = 0x00070000U;
+
+  /* Reset HSEON, CSSON , HSION, and PLLON bits */
+  /* RCC->CR &= 0xEAF6FFFFU; */
+  RCC->CR &= 0x2321EFF;
+
+  /* Reset PLLCFGR register */
+  RCC->PLLCFGR = 0x22040100;
+
+  /* Reset HSEBYP bit */
+  RCC->CR &= 0xFFDFFFFFFU;
+
+  /* Disable all interrupts */
+  RCC->CIER = 0x00000000U;
+}
+
+/**
+  * @brief  Update SystemCoreClock variable according to Clock Register Values.
+  *         The SystemCoreClock variable contains the core clock (HCLK), it can
+  *         be used by the user application to setup the SysTick timer or configure
+  *         other parameters.
+  *
+  * @note   Each time the core clock (HCLK) changes, this function must be called
+  *         to update SystemCoreClock variable value. Otherwise, any configuration
+  *         based on this variable will be incorrect.
+  *
+  * @note   - The system frequency computed by this function is not the real
+  *           frequency in the chip. It is calculated based on the predefined
+  *           constant and the selected clock source:
+  *
+  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
+  *
+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
+  *
+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
+  *
+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
+  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
+  *
+  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
+  *             4 MHz) but the real value may vary depending on the variations
+  *             in voltage and temperature.
+  *
+  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              16 MHz) but the real value may vary depending on the variations
+  *              in voltage and temperature.
+  *
+  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
+  *              frequency of the crystal used. Otherwise, this function may
+  *              have wrong result.
+  *
+  *         - The result of this function could be not correct when using fractional
+  *           value for HSE crystal.
+  *
+  * @param  None
+  * @retval None
+  */
+void SystemCoreClockUpdate(void)
+{
+  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
+
+ /* Get MSI Range frequency--------------------------------------------------*/
+
+   /* Get MSI Range frequency--------------------------------------------------*/
+   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
+   { /* MSISRANGE from RCC_CSR applies */
+     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
+   }
+   else
+   { /* MSIRANGE from RCC_CR applies */
+     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
+   }
+   /*MSI frequency range in HZ*/
+   msirange = MSIRangeTable[msirange];
+
+
+  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
+  /* Get SYSCLK source -------------------------------------------------------*/
+  switch (RCC->CFGR & RCC_CFGR_SWS)
+  {
+    case 0x00:   /* MSI used as system clock source */
+      SystemCoreClock = msirange;
+      break;
+
+    case 0x04:  /* HSI used as system clock source */
+      /* HSI used as system clock source */
+        SystemCoreClock = HSI_VALUE;
+      break;
+
+    case 0x08:  /* HSE used as system clock source */
+      SystemCoreClock = HSE_VALUE;
+      break;
+
+    case 0x0C: /* PLL used as system clock  source */
+      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
+         SYSCLK = PLL_VCO / PLLR
+         */
+      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
+      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
+
+      switch (pllsource)
+      {
+        case 0x02:  /* HSI used as PLL clock source */
+          pllvco = (HSI_VALUE / pllm);
+          break;
+
+        case 0x03:  /* HSE used as PLL clock source */
+          pllvco = (HSE_VALUE / pllm);
+          break;
+
+        default:    /* MSI used as PLL clock source */
+          pllvco = (msirange / pllm);
+          break;
+      }
+
+      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
+      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
+
+      SystemCoreClock = pllvco/pllr;
+      break;
+
+    default:
+      SystemCoreClock = msirange;
+      break;
+  }
+
+  /* Compute HCLK clock frequency --------------------------------------------*/
+#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
+  /* Get HCLK2 prescaler */
+  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
+#else
+  /* Get HCLK1 prescaler */
+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
+#endif
+
+  /* Core clock frequency */
+  SystemCoreClock = SystemCoreClock / tmp;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/readme.txt
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/readme.txt
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/2_Images_UserApp_M4/readme.txt
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h
new file mode 100644
index 00000000..8b9f956b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h
@@ -0,0 +1,114 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t __ICFEDIT_M4_SB_region_ROM_start__;
+#define M4_SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_M4_SB_region_ROM_end__;
+#define M4_SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_intvec_start__;
+#define INTVECT_START ((uint32_t)& __ICFEDIT_intvec_start__)
+extern uint32_t __ICFEDIT_SE_Startup_region_ROM_start__;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Startup_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_start__;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_end__;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_start__;
+#define SE_IF_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_end__;
+#define SE_IF_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_start__;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_end__;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_CallGate_region_ROM_start__;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_CallGate_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_start__;
+#define SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_end__;
+#define SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_start__;
+#define SE_REGION_RAM_START ((uint32_t)& __ICFEDIT_SE_region_RAM_start__)
+extern uint32_t __ICFEDIT_SE_region_RAM_end__ ;
+#define SE_REGION_RAM_END ((uint32_t)& __ICFEDIT_SE_region_RAM_end__)
+extern uint32_t __ICFEDIT_SB_region_RAM_start__ ;
+#define SB_REGION_RAM_START ((uint32_t)& __ICFEDIT_SB_region_RAM_start__)
+extern uint32_t __ICFEDIT_SB_region_RAM_end__ ;
+#define SB_REGION_RAM_END ((uint32_t)& __ICFEDIT_SB_region_RAM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_stack_top__;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& __ICFEDIT_SE_region_RAM_stack_top__)
+
+extern uint32_t __ICFEDIT_KMS_DataStorage_start__ ;
+#define KMS_DATASTORAGE_START ((uint32_t)& __ICFEDIT_KMS_DataStorage_start__)
+extern uint32_t __ICFEDIT_KMS_DataStorage_end__ ;
+#define KMS_DATASTORAGE_END ((uint32_t)& __ICFEDIT_KMS_DataStorage_end__)
+
+
+#if defined (__ICCARM__) || defined(__GNUC__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_header__;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_1_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_start__;
+#define SLOT_ACTIVE_1_START ((uint32_t)& __ICFEDIT_SLOT_Active_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_end__;
+#define SLOT_ACTIVE_1_END ((uint32_t)& __ICFEDIT_SLOT_Active_1_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_header__;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_2_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_start__;
+#define SLOT_ACTIVE_2_START ((uint32_t)& __ICFEDIT_SLOT_Active_2_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_end__;
+#define SLOT_ACTIVE_2_END ((uint32_t)& __ICFEDIT_SLOT_Active_2_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_header__;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_3_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_start__;
+#define SLOT_ACTIVE_3_START ((uint32_t)& __ICFEDIT_SLOT_Active_3_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_end__;
+#define SLOT_ACTIVE_3_END ((uint32_t)& __ICFEDIT_SLOT_Active_3_end__)
+extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_start__;
+#define SLOT_BLOB_DWL_1_START ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_end__;
+#define SLOT_BLOB_DWL_1_END ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_end__)
+
+/* DualCore specificities */
+#if !defined(CORE_CM0PLUS)
+extern uint32_t __ICFEDIT_region_ROM_end__ ;
+#define C1_AREA_ADDR_END  ((uint32_t)& __ICFEDIT_region_ROM_end__)
+#define C2_BOOT_BASE_ADDR ((uint32_t)& __ICFEDIT_intvec_start__)
+#endif /* CORE_CM0PLUS */
+extern volatile uint32_t __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ ;
+#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__)
+
+#endif /* __ICCARM__ || __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
new file mode 100644
index 00000000..999a67d1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
@@ -0,0 +1,24 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* Active slot #1 (60 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_1_header__= 0x0803F800;
+define exported symbol  __ICFEDIT_SLOT_Active_1_start__ = 0x0801C000;
+define exported symbol  __ICFEDIT_SLOT_Active_1_end__   = 0x0802AFFF;
+
+/* Active slot #2 (100 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_2_header__= 0x0803F000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_start__ = 0x08003000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_end__   = 0x0801BFFF;
+
+/* Slot download 1 region (2 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Blob_Dwl_1_start__= 0x08002800;
+define exported symbol  __ICFEDIT_SLOT_Blob_Dwl_1_end__  = 0x08002FFF;
+
+/* Slots not configured */
+define exported symbol  __ICFEDIT_SLOT_Active_3_header__= 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_start__ = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_end__   = 0x00000000;
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
new file mode 100644
index 00000000..f86e609f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
@@ -0,0 +1,88 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 SB Code region */
+define exported symbol __ICFEDIT_M4_SB_region_ROM_start__          = 0x08000000;
+define exported symbol __ICFEDIT_M4_SB_region_ROM_end__            = 0x080027FF;
+
+/* ROM regions definition */
+define region M4_SB_ROM_region           = mem:[from __ICFEDIT_M4_SB_region_ROM_start__   to __ICFEDIT_M4_SB_region_ROM_end__];
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+define exported symbol __ICFEDIT_KMS_DataStorage_start__           = 0x0802B000;
+define exported symbol __ICFEDIT_KMS_DataStorage_end__             = 0x0802CFFF;
+
+/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation */
+define exported symbol __ICFEDIT_SE_IF_region_ROM_start__          = __ICFEDIT_KMS_DataStorage_end__ + 1;
+define exported symbol __ICFEDIT_SE_IF_region_ROM_end__            = __ICFEDIT_SE_IF_region_ROM_start__ + 0x13FF;
+
+/* SBSFU Code region */
+define exported symbol __ICFEDIT_SB_region_ROM_start__             = __ICFEDIT_SE_IF_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_ROM_end__               = 0x080367FF;
+
+/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+define exported symbol __ICFEDIT_intvec_start__                    = __ICFEDIT_SB_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_Vector_size__                     = 0x200;
+
+/* SE Code region protected by MPU isolation */
+define exported symbol __ICFEDIT_SE_Code_region_ROM_start__        = __ICFEDIT_intvec_start__ + __ICFEDIT_Vector_size__;
+define exported symbol __ICFEDIT_SE_CallGate_region_ROM_start__    = __ICFEDIT_SE_Code_region_ROM_start__ + 4;
+define exported symbol __ICFEDIT_SE_CallGate_Region_ROM_End__      = __ICFEDIT_SE_Code_region_ROM_start__ + 0x1FF;
+
+/* SE Startup */
+define exported symbol __ICFEDIT_SE_Startup_region_ROM_start__     = __ICFEDIT_SE_CallGate_Region_ROM_End__ + 1;
+define exported symbol __ICFEDIT_SE_Code_nokey_region_ROM_start__  = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x100;
+
+/* SE Embedded Keys */
+define exported symbol __ICFEDIT_SE_Key_region_ROM_start__         = 0x0803E800;
+define exported symbol __ICFEDIT_SE_Key_region_ROM_end__           = 0x0803EFFF;
+define exported symbol __ICFEDIT_SE_Code_region_ROM_end__          = __ICFEDIT_SE_Key_region_ROM_end__;
+
+/* ROM regions definition */
+define region KMS_DataStorage            = mem:[from __ICFEDIT_KMS_DataStorage_start__ to __ICFEDIT_KMS_DataStorage_end__];
+define region SE_IF_ROM_region           = mem:[from __ICFEDIT_SE_IF_region_ROM_start__ to __ICFEDIT_SE_IF_region_ROM_end__];
+define region SB_ROM_region              = mem:[from __ICFEDIT_SB_region_ROM_start__ to __ICFEDIT_SB_region_ROM_end__];
+define region SE_CALLGATE_ROM_Region     = mem:[from __ICFEDIT_SE_CallGate_region_ROM_start__ to __ICFEDIT_SE_CallGate_Region_ROM_End__];
+define region SE_CODE_NOKEY_ROM_region   = mem:[from __ICFEDIT_SE_Code_nokey_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_start__ - 1];
+define region SE_Key_ROM_region          = mem:[from __ICFEDIT_SE_Key_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_end__];
+define region SE_ROM_region              = mem:[from __ICFEDIT_SE_Code_region_ROM_start__ to __ICFEDIT_SE_Code_region_ROM_end__];
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+define symbol __ICFEDIT_M4_SB_region_RAM_start__                   = 0x20000000;
+define symbol __ICFEDIT_M4_SB_region_RAM_end__                     = __ICFEDIT_M4_SB_region_RAM_start__ + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ = __ICFEDIT_M4_SB_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__   = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ + 0x1F;
+
+/* M4 UserApp */
+define symbol __ICFEDIT_M4_APP_region_RAM_start__                  = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__ + 1;
+define symbol __ICFEDIT_M4_APP_region_RAM_end__                    = 0x20007FFF;
+
+/* SBSFU RAM region */
+define exported symbol __ICFEDIT_SB_region_RAM_start__             = __ICFEDIT_M4_APP_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_RAM_end__               = 0x2000D3FF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
+define exported symbol __ICFEDIT_SE_region_RAM_start__             = __ICFEDIT_SB_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_SE_region_RAM_stack_top__         = 0x2000DB00; /* Secure Engine's private stack */
+define exported symbol __ICFEDIT_SE_region_RAM_end__               = 0x2000FFFF;
+
+/* RAM regions definition */
+define region M4_SB_RAM_region           = mem:[from __ICFEDIT_M4_SB_region_RAM_start__ to __ICFEDIT_M4_SB_region_RAM_end__];
+define region M4_APP_RAM_region          = mem:[from __ICFEDIT_M4_APP_region_RAM_start__ to __ICFEDIT_M4_APP_region_RAM_end__];
+define region SE_RAM_region              = mem:[from __ICFEDIT_SE_region_RAM_stack_top__ to __ICFEDIT_SE_region_RAM_end__];
+define region SB_RAM_region              = mem:[from __ICFEDIT_SB_region_RAM_start__ to __ICFEDIT_SB_region_RAM_end__];
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
new file mode 100644
index 00000000..c5322b08
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    mapping_fwimg.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for firmware images mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_FWIMG_H
+#define MAPPING_FWIMG_H
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* Active slot #1  (60 kbytes) */
+#define SLOT_ACTIVE_1_HEADER         0x0803F800
+#define SLOT_ACTIVE_1_START          0x0801C000
+#define SLOT_ACTIVE_1_END            0x0802AFFF
+
+/* Active slot #2  (100 kbytes) */
+#define SLOT_ACTIVE_2_HEADER         0x0803F000
+#define SLOT_ACTIVE_2_START          0x08003000
+#define SLOT_ACTIVE_2_END            0x0801BFFF
+
+/* Dwl slot #1  (2 kbytes) */
+#define SLOT_BLOB_DWL_1_START        0x08002800
+#define SLOT_BLOB_DWL_1_END          0x08002FFF
+
+/* Slots not configured */
+#define SLOT_ACTIVE_3_HEADER         0x00000000
+#define SLOT_ACTIVE_3_START          0x00000000
+#define SLOT_ACTIVE_3_END            0x00000000
+
+#endif
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
new file mode 100644
index 00000000..9a1c24bd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    mapping_sbsfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SBSFU mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_SBSFU_H
+#define MAPPING_SBSFU_H
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 SB Code region */
+#define M4_SB_REGION_ROM_START          0x08000000
+#define M4_SB_REGION_ROM_END            0x080027FF
+
+/* ROM regions definition */
+#define M4_SB_ROM_REGION_SIZE          (M4_SB_REGION_ROM_END - M4_SB_REGION_ROM_START + 0x1)
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+#define KMS_DATASTORAGE_START           0x0802B000
+#define KMS_DATASTORAGE_END             0x0802CFFF
+
+/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation     */
+#define SE_IF_REGION_ROM_START          (KMS_DATASTORAGE_END + 0x1)
+#define SE_IF_REGION_ROM_END            (SE_IF_REGION_ROM_START + 0x15FF)
+
+/* SBSFU Code region */
+#define SB_REGION_ROM_START             (SE_IF_REGION_ROM_END + 1)
+#define SB_REGION_ROM_END               0x080367FF
+
+/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+#define VECTOR_SIZE                     0x200
+#define INTVECT_START                   (SB_REGION_ROM_END + 0x1)
+
+/* SE Code region protected by MPU isolation */
+#define SE_CODE_REGION_ROM_START        (INTVECT_START + VECTOR_SIZE)
+#define SE_CALLGATE_REGION_ROM_START    (SE_CODE_REGION_ROM_START + 4)
+#define SE_CALLGATE_REGION_ROM_END      (SE_CODE_REGION_ROM_START + 0xFF)
+
+/* SE Startup                               */
+#define SE_STARTUP_REGION_ROM_START     (SE_CALLGATE_REGION_ROM_END + 1)
+#define SE_CODE_NOKEY_REGION_ROM_START  (SE_STARTUP_REGION_ROM_START + 0x100)
+
+/* SE Embedded Keys */
+#define SE_KEY_REGION_ROM_START         0x0803E800
+#define SE_KEY_REGION_ROM_END           0x0803EFFF
+#define SE_CODE_REGION_ROM_END          SE_KEY_REGION_ROM_END
+
+/* ROM regions size definition */
+#define KMS_DATASTORAGE_SIZE            (KMS_DATASTORAGE_END - KMS_DATASTORAGE_START + 0x1)
+#define SE_IF_ROM_REGION_SIZE           (SE_IF_REGION_ROM_END - SE_IF_REGION_ROM_START + 0x1)
+#define SB_ROM_REGION_SIZE              (SB_REGION_ROM_END - SB_REGION_ROM_START + 0x1)
+#define SE_CALLGATE_REGION_ROM_SIZE     (SE_CALLGATE_REGION_ROM_END - SE_CALLGATE_REGION_ROM_START + 0x1)
+#define SE_CODE_NOKEY_REGION_ROM_SIZE   (SE_KEY_REGION_ROM_START - SE_CODE_NOKEY_REGION_ROM_START)
+#define SE_KEY_REGION_ROM_SIZE          (SE_KEY_REGION_ROM_END - SE_KEY_REGION_ROM_START + 0x1)
+#define SE_ROM_REGION_SIZE              (SE_CODE_REGION_ROM_END - SE_CODE_REGION_ROM_START + 0x1)
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+#define M4_SB_REGION_RAM_START          0x20000000
+#define M4_SB_REGION_RAM_END            (M4_SB_REGION_RAM_START + 0xCDF)
+
+/* M0+/M4 Synchronization flag */
+#define M4_M0PLUS_FLAG_RAM_START        (M4_SB_REGION_RAM_END + 0x1)
+#define M4_M0PLUS_FLAG_RAM_END          (M4_M0PLUS_FLAG_RAM_START + 0x1F)
+
+/* M4 UserApp : allocation limited to half RAM size */
+#define M4_APP_REGION_RAM_START         (M4_M0PLUS_FLAG_RAM_END + 0x1)
+#define M4_APP_REGION_RAM_END           0x20007FFF
+
+/* SBSFU RAM region */
+#define SB_REGION_RAM_START             (M4_APP_REGION_RAM_END + 0x1)
+#define SB_REGION_RAM_END               0x2000D3FF
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
+#define SE_REGION_RAM_START             (SB_REGION_RAM_END +0x1)
+#define SE_REGION_RAM_STACK_TOP         0x2000DB00                /* Secure Engine's private stack */
+#define SE_REGION_RAM_END               0x2000FFFF
+
+/* RAM regions definition */
+#define M4_SB_RAM_REGION_SIZE           (M4_SB_REGION_RAM_END - M4_SB_REGION_RAM_START + 0x1)
+#define M4_APP_RAM_REGION_SIZE          (M4_APP_REGION_RAM_END - M4_APP_REGION_RAM_START + 0x1)
+#define SB_RAM_REGION_SIZE              (SB_REGION_RAM_END - SB_REGION_RAM_START + 0x1)
+#define SE_RAM_REGION_SIZE              (SE_REGION_RAM_END - SE_REGION_RAM_STACK_TOP + 0x1)
+
+#endif
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
new file mode 100644
index 00000000..a2a79be4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t M4_SB_region_ROM_start;
+#define M4_SB_REGION_ROM_START ((uint32_t)& M4_SB_region_ROM_start)
+extern uint32_t M4_SB_region_ROM_end;
+#define M4_SB_REGION_ROM_END ((uint32_t)& M4_SB_region_ROM_end)
+extern uint32_t INTVECT_start;
+#define INTVECT_START ((uint32_t)& INTVECT_start)
+extern uint32_t SE_Startup_region_ROM_start;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& SE_Startup_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_start;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& SE_Code_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_end;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& SE_Code_region_ROM_end)
+extern uint32_t SE_IF_region_ROM_start;
+#define SE_IF_REGION_ROM_START ((uint32_t)& SE_IF_region_ROM_start)
+extern uint32_t SE_IF_region_ROM_end;
+#define SE_IF_REGION_ROM_END ((uint32_t)& SE_IF_region_ROM_end)
+extern uint32_t SE_Key_region_ROM_start;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& SE_Key_region_ROM_start)
+extern uint32_t SE_Key_region_ROM_end;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& SE_Key_region_ROM_end)
+extern uint32_t SE_CallGate_region_ROM_start;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& SE_CallGate_region_ROM_start)
+extern uint32_t SB_region_ROM_start;
+#define SB_REGION_ROM_START ((uint32_t)& SB_region_ROM_start)
+extern uint32_t SB_region_ROM_end;
+#define SB_REGION_ROM_END ((uint32_t)& SB_region_ROM_end)
+extern uint32_t SE_region_RAM_start;
+#define SE_REGION_RAM_START ((uint32_t)& SE_region_RAM_start)
+extern uint32_t SE_region_RAM_end ;
+#define SE_REGION_RAM_END ((uint32_t)& SE_region_RAM_end)
+extern uint32_t SB_region_RAM_start ;
+#define SB_REGION_RAM_START ((uint32_t)& SB_region_RAM_start)
+extern uint32_t SB_region_RAM_end ;
+#define SB_REGION_RAM_END ((uint32_t)& SB_region_RAM_end)
+extern uint32_t SE_region_RAM_stack_top;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& SE_region_RAM_stack_top)
+
+extern uint32_t KMS_DataStorage_start ;
+#define KMS_DATASTORAGE_START ((uint32_t)& KMS_DataStorage_start)
+extern uint32_t KMS_DataStorage_end ;
+#define KMS_DATASTORAGE_END ((uint32_t)& KMS_DataStorage_end)
+
+extern uint32_t SLOT_Active_1_header;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& SLOT_Active_1_header)
+extern uint32_t SLOT_Active_1_start;
+#define SLOT_ACTIVE_1_START ((uint32_t)& SLOT_Active_1_start)
+extern uint32_t SLOT_Active_1_end;
+#define SLOT_ACTIVE_1_END ((uint32_t)& SLOT_Active_1_end)
+extern uint32_t SLOT_Active_2_header;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& SLOT_Active_2_header)
+extern uint32_t SLOT_Active_2_start;
+#define SLOT_ACTIVE_2_START ((uint32_t)& SLOT_Active_2_start)
+extern uint32_t SLOT_Active_2_end;
+#define SLOT_ACTIVE_2_END ((uint32_t)& SLOT_Active_2_end)
+extern uint32_t SLOT_Active_3_header;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& SLOT_Active_3_header)
+extern uint32_t SLOT_Active_3_start;
+#define SLOT_ACTIVE_3_START ((uint32_t)& SLOT_Active_3_start)
+extern uint32_t SLOT_Active_3_end;
+#define SLOT_ACTIVE_3_END ((uint32_t)& SLOT_Active_3_end)
+extern uint32_t SLOT_Blob_Dwl_1_start;
+#define SLOT_BLOB_DWL_1_START ((uint32_t)& SLOT_Blob_Dwl_1_start)
+extern uint32_t SLOT_Blob_Dwl_1_end;
+#define SLOT_BLOB_DWL_1_END ((uint32_t)& SLOT_Blob_Dwl_1_end)
+
+/* DualCore specificities */
+#if !defined(CORE_CM0PLUS)
+extern uint32_t region_ROM_end ;
+#define C2_AREA_ADDR_END  ((uint32_t)& region_ROM_end)
+extern uint32_t INTVEC_start;
+#define C2_BOOT_BASE_ADDR    ((uint32_t)& INTVEC_start)
+#endif /* CORE_CM0PLUS */
+extern volatile uint32_t M4_M0PLUS_flag_RAM_start ;
+#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& M4_M0PLUS_flag_RAM_start)
+
+
+#ifdef cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
new file mode 100644
index 00000000..d44d1d62
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
@@ -0,0 +1,25 @@
+/*
+** LinkerScript
+*/
+
+/* Slots must be aligned on sector size */
+
+/* Active slot #1 (60 kbytes) */
+SLOT_Active_1_header  = 0x0803F800;
+SLOT_Active_1_start   = 0x0801C000;
+SLOT_Active_1_end     = 0x0802AFFF;
+
+/* Active slot #2 (100 kbytes) */
+SLOT_Active_2_header  = 0x0803F000;
+SLOT_Active_2_start   = 0x08003000;
+SLOT_Active_2_end     = 0x0801BFFF;
+
+/* Dwl slot #1 : (2 kbytes) */
+SLOT_Blob_Dwl_1_start = 0x08002800;
+SLOT_Blob_Dwl_1_end   = 0x08002FFF;
+
+/* Slots not configured */
+SLOT_Active_3_header  = 0x00000000;
+SLOT_Active_3_start   = 0x00000000;
+SLOT_Active_3_end     = 0x00000000;
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
new file mode 100644
index 00000000..1ffa3bdf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
@@ -0,0 +1,120 @@
+/*
+** LinkerScript
+*/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 Vector table */
+M4_INTVECT_start               = 0x08000000;
+M4_SB_region_ROM_start         = M4_INTVECT_start;
+M4_Vector_size                 = 0x200;
+
+/* M4 SB Code region */
+M4_SB_Code_region_ROM_start    = M4_INTVECT_start + M4_Vector_size;
+M4_SB_Code_region_ROM_end      = 0x080027FF;
+M4_SB_region_ROM_end           = M4_SB_Code_region_ROM_end;
+
+/* ROM regions size definition */
+M4_SB_Code_region_ROM_size     = M4_SB_Code_region_ROM_end - M4_SB_Code_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+KMS_DataStorage_start          = 0x0802B000;
+KMS_DataStorage_end            = KMS_DataStorage_start + 0x1FFF;
+
+/* SE IF ROM: used to locate Secure Engine interface Code out of MPU isolation     */
+SE_IF_region_ROM_start         = KMS_DataStorage_end + 0x1; 
+SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0x17FF;
+
+/* SBSFU Code region */
+SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
+SB_region_ROM_end              = 0x080367FF;
+
+/* M0 Vector table with alignment constraint on Vector_size */
+INTVECT_start                  = 0x08036800;
+Vector_size                    = 0x200;
+C2_BOOT_BASE_ADDR              = INTVECT_start;
+
+/* SE Code region protected by MPU isolation */
+SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start; /* No need to do +4 as we have dummy bytes in SE_CoreBin .ld file */
+SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
+
+/* SE Startup */
+SE_Startup_region_ROM_start    = SE_CallGate_region_ROM_end + 0x1;
+SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
+
+/* SE Embedded Keys */
+SE_Key_region_ROM_start        = 0x0803E800;
+SE_Key_region_ROM_end          = 0x0803EFFF;
+SE_Code_region_ROM_end         = SE_Key_region_ROM_end;
+
+/* ROM regions size definition */
+KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
+SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
+SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
+SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
+SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
+SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
+SE_Code_NoKey_region_ROM_size  = SE_Key_region_ROM_start - SE_Code_NoKey_region_ROM_start;
+SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+M4_SB_region_RAM_start         = 0x20000000;
+M4_SB_region_RAM_end           = M4_SB_region_RAM_start + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+M4_M0PLUS_flag_RAM_start       = M4_SB_region_RAM_end + 0x1;
+M4_M0PLUS_flag_RAM_end         = M4_M0PLUS_flag_RAM_start + 0x1F;
+
+/* M4 UserApp : allocation limited to half RAM size */
+M4_APP_region_RAM_start        = M4_M0PLUS_flag_RAM_end + 0x1;
+M4_APP_region_RAM_end          = 0x20007FFF;
+
+/* SBSFU RAM region */
+SB_region_RAM_start            = M4_APP_region_RAM_end + 0x1;
+SB_region_RAM_end              = 0x2000CBFF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000CC00 */
+SE_region_RAM_start            = SB_region_RAM_end + 0x1;
+SE_region_RAM_stack_top        = SE_region_RAM_start + 0xC00;                /* Secure Engine's private stack */
+SE_region_RAM_end              = 0x2000FFFF;
+
+/* RAM regions size definition */
+M4_SB_region_RAM_size          = M4_SB_region_RAM_end - M4_SB_region_RAM_start + 0x1;
+M4_APP_region_RAM_size         = M4_APP_region_RAM_end - M4_APP_region_RAM_start + 0x1;
+SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
+SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
+
+/******************************************************************************/
+/*                              RAM/ROM regions                               */
+/*                                                                            */
+/******************************************************************************/
+
+MEMORY
+{
+ M4_INTVECT_ROM_region (rx)       : ORIGIN = M4_INTVECT_start, LENGTH = M4_Vector_size
+ M4_SB_Code_ROM_region (rx)       : ORIGIN = M4_SB_Code_region_ROM_start, LENGTH = M4_SB_Code_region_ROM_size
+ SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
+ SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
+ INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
+ SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
+ SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
+ SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
+ SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
+ SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
+ M4_SB_RAM_region (xrw)           : ORIGIN = M4_SB_region_RAM_start, LENGTH = M4_SB_region_RAM_size
+ SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+ SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
deleted file mode 100644
index 5fdcfbd5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
+++ /dev/null
@@ -1,1056 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state>CORE_CM0PLUS</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Platform</state>
-          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>..\..\KMS_Blob.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
-      </file>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
deleted file mode 100644
index ba1fb39b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM0P</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>KMS_blob</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
-            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
-          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> </TargetDllArguments>
-          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>4</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Platform;../../2_Images_SECoreBin/Inc</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>0</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>KMS_Blob.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--diag_suppress L6305W</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>kms_blob_example_keys.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_2_Images_KMS_Blob"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
deleted file mode 100644
index 43bc6fbb..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../2_Images_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/2_Images_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="2_Images_KMS_Blob.null.1082786794" name="2_Images_KMS_Blob"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1003497030;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1841871715">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope"/>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/postbuild.sh b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/postbuild.sh
deleted file mode 100644
index 82dd9adb..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_KMS_Blob/STM32CubeIDE/postbuild.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-# arg1 is the build directory
-# arg2 is the bin file path+name without extension
-# arg3 is the version
-
-projectdir=$1
-execname=$2
-version=$3
-
-userAppBinary=$projectdir"/../Binary"
-bin=$execname".bin"
-
-kmsu=$userAppBinary"/"$execname".kmsu"
-kmsb=$userAppBinary"/"$execname".kmsb"
-sign=$userAppBinary"/"$execname".sign"
-
-iv=$userAppBinary"/iv.bin"
-oemkey=$userAppBinary"/OEM_KEY_COMPANY1_key_AES_CBC.bin"
-ecckey=$userAppBinary"/ECCKEY.txt"
-
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname | grep -i -e windows -e mingw
-
-if [ $? == 0 ] && [   -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  cmd=""
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-echo "$cmd $prepareimage" > $1/output.txt
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-command=$cmd" "$prepareimage" enc -k "$oemkey" -i "$iv" "$bin" "$kmsu
-echo $command
-$command >> "$projectdir"/output.txt
-ret=$?
-if [ $ret == 0 ]; then
-# -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
-  command=$cmd" "$prepareimage" sha256 "$bin" "$sign" -p 16"
-  echo $command
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret == 0 ]; then 
-    command=$cmd" "$prepareimage" pack -k "$ecckey" -m "KMSB" -r 28 -v "$version" -i "$iv" -f "$kmsu" -t "$sign" -o 320 "$kmsb
-    echo $command
-    $command >> $projectdir"/output.txt"
-    ret=$?
-  fi
-fi
-
-if [ $ret == 0 ]; then
-  rm $sign
-  rm $kmsu
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
deleted file mode 100644
index 119621d7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_hw.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update hardware
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef APP_HW_H
-#define APP_HW_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Exported macros -----------------------------------------------------------*/
-#define BUTTON_INIT()         BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);
-#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APP_HW_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 6b8db4f7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/* COM usage define */
-#define USE_BSP_COM_FEATURE                 0U
-
-/* COM log define */
-#define USE_COM_LOG                         0U
-
-/* IRQ priorities */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
deleted file mode 100644
index 133e5826..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    app_sfu.h
-  * @author  MCD Application Team
-  * @brief   This file contains the configuration of SBSFU application.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef APP_SFU_H
-#define APP_SFU_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_crypto_config.h"
-#include "app_sfu_common.h"
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * Use this define to choose the type of Firmware Image Programming you want to use.
-  * This version supports only 2 modes:
-  *
-  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
-  *       The image is received in encrypted format.
-  *       The image must be decrypted to be installed:
-  *         this is done according to the selected crypto scheme,
-  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
-  *
-  * SFU_CLEAR_IMAGE: Clear Firmware Image
-  *       The image is received in clear format.
-  *       No decrypt operation is needed before installing the image:
-  *         the selected crypto scheme must be compatible with this choice,
-  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
-  *
-  *
-  */
-#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
-#else
-#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
-#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
-
-#define SFU_DEBUG_MODE               /*!< Comment this define to optimize memory footprint (debug mode removed)
-                                          No more print on terminal during SBSFU execution */
-
-/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
-                                          this switch activates more debug prints in the console (FSM state info...) */
-
-
-/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
-                                                          When this switch is activated, the FWIMG part of SB_SFU will
-                                                          block when an abnormal error is encountered */
-
-#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
-#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
-#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
-
-#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
-#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
-#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
-
-/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
-                                           Automatically executed @startup */
-#if defined(SFU_TEST_PROTECTION)
-#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
-#endif /* SFU_TEST_PROTECTION */
-
-/**
-  * SB_SFU status LED.
-  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
-  * This is useful when no log is enabled.
-  *
-  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
-  * \li For the other situations, please check the other defines below.
-  */
-#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
-#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
-                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
-#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
-
-
-/**
-  * Optional Features Software Configuration
-  */
-#if !defined(SFU_TEST_PROTECTION)
-#define SECBOOT_LOADER SECBOOT_DUAL_CORE_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
-#else
-#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
-#endif /* SFU_TEST_PROTECTION */
-
-/* Uncomment the define below if you want to remove the swap area
-   ==> partial update is not supported in this configuration */
-/*#define SFU_NO_SWAP*/                              /*!< FW upgrade installation process without swap area */
-
-/* Multi-images configuration :
-   - Max : 3 Active images and 3 Download area
-   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
-   - Active slot identified with SFU magic (1,2,3) information from header
-   - Do not forget to add keys for each image in SE_Corebin/Binary folder
-   - Master slot : image started in priority if valid
-   - FW image valide all feature authorized from master slot
-*/
-#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
-
-#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
-
-/* Uncomment the following defines when in Release mode.
-   In debug mode it can be better to disable some of the following protection
-   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
-
-#define SFU_RDP_PROTECT_ENABLE
-/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
-                                             neither connected to GND nor to 5V (floating level), there are too many
-                                             spurious tamper event detected */
-#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
-                                        Enables/Disables the MPU protection.
-                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
-                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
-                                        addition to the overall MPU protection. */
-#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
-                                        executable area */
-
-#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
-#define SFU_GTZC_PROTECT_ENABLE    /*!< GTZC protection (dependent on SFU_SECURE_USER_PROTECT_ENABLE):
-                                        Enables/Disables the GTZC protection. */
-#define SFU_C2SWDBG_PROTECT_ENABLE /*!< Dynamic disabling of the CPU2 debug:
-                                        not writable if ESE=0, no meaning if DDS=1. */
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
-#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
-                                                      completely disabled, OB update no more possible  */
-
-
-#else
-#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
-                                                      field should set it as Level2 */
-#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
-
-#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
-
-
-/** 
-  * Application Configuration
-  *
-  */
-#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
-                                              You can also define an upper bound here if you plan to use it */
-
-#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
-                                              no FW installed or due to an attack attempt). Could be different from
-                                              SFU_FW_VERSION_START_NUM */
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APP_SFU_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
deleted file mode 100644
index b67b2523..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
+++ /dev/null
@@ -1,1954 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_boot.c
-  * @author  MCD Application Team
-  * @brief   SFU BOOT module
-  *          This file provides firmware functions to manage the following
-  *          functionalities of the Secure Boot:
-  *           + Initialization and de-initialization functions
-  *           + Secure Boot Control functions
-  *           + Secure Boot State functions
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_BOOT_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "string.h"
-#include "sfu_boot.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level.h"
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
-
-#include "sfu_trace.h"
-#include "se_def.h"
-#include "se_bootinfo.h"
-#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
-#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
-#include "sfu_test.h"                 /* auto tests */
-#include "sfu_fwimg_internal.h"
-#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
-
-#ifdef KMS_ENABLED
-#include "tkms.h"
-#include "sfu_kms.h"
-#endif /* KMS_ENABLED */
-
-/* Private typedef -----------------------------------------------------------*/
-typedef struct
-{
-  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
-  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
-} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
-                                                     information using during the SM evolution. */
-
-/* Private defines -----------------------------------------------------------*/
-#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
-#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
-#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
-                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
-
-#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
-                                    maintained for future customization/expansion of the field itself */
-
-#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
-
-/* Private macros ------------------------------------------------------------*/
-#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
-  do{                                                                   \
-    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
-    if (Status == SFU_SUCCESS){                                         \
-      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
-    }                                                                   \
-    else {                                                              \
-      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
-    }                                                                   \
-  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
-
-
-#define SFU_SET_SM_CURR_STATE(NewState)                                 \
-  do{                                                                   \
-    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
-    m_StateMachineContext.CurrState = NewState;                         \
-  }while(0) /*!< Set a State Machine state*/
-
-
-#define SFU_GET_LAST_EXEC_STATE(STATUS)         (((STATUS)>>8U) & 0xFFU)          /*!< Get last State Machine state*/
-#define SFU_GET_LAST_EXEC_IMAGE_ID(STATUS)      (((STATUS)>>16U) & 0xFFU)         /*!< Get image ID*/
-#define SFU_GET_LAST_EXEC_ID(STATUS)            (((STATUS)>>24U) & 0xFFU)         /*!< Get Execution ID*/
-
-/* Private variables ---------------------------------------------------------*/
-/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
-static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
-                                                                         SFU_STATE_INITIAL
-                                                                        };
-
-/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
-static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
-static uint32_t m_ActiveSlotToResume = SLOT_INACTIVE;
-static uint32_t m_ActiveSlotToRollback = SLOT_INACTIVE;
-static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
-static uint32_t m_C1ActiveSlot = SLOT_INACTIVE;
-static uint32_t m_C2ActiveSlot = SLOT_INACTIVE;
-
-/* Global variables ----------------------------------------------------------*/
-/**
-  * This variable indicates if at boot-up the FW presence check has already been performed or not:
-  * \li It is reset when the FW status has already been checked once and no FW is present
-  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
-  * \li It is used to display some messages only once in the teraterm console
-  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
-  * \li This is used at LocalDownload and CheckUserFwStatus stages.
-  */
-uint8_t initialDeviceStatusCheck;
-
-/**
-  *  Flow control initial values.
-  *   - Security protections flow (static + dynamic)
-  *   - Crypto operations flow (authentication, integrity)
-  */
-uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
-uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_BOOT_Init(void);
-static SFU_ErrorStatus SFU_BOOT_DeInit(void);
-static void SFU_BOOT_BspConfiguration(void);
-static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
-static void SFU_BOOT_SM_CheckStatusOnReset(void);
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-static void SFU_BOOT_SM_CheckNewFwToDownload(void);
-static void SFU_BOOT_SM_DownloadNewUserFw(void);
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-#ifdef KMS_ENABLED
-static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
-static void SFU_BOOT_SM_InstallKMSBlob(void);
-#endif /* KMS_ENABLED */
-static void SFU_BOOT_SM_CheckUserFwStatus(void);
-static void SFU_BOOT_SM_VerifyUserFwSignature(void);
-static void SFU_BOOT_SM_ExecuteUserFw(void);
-static void SFU_BOOT_SM_HandleCriticalFailure(void);
-static void SFU_BOOT_SM_RebootStateMachine(void);
-static void SFU_BOOT_SM_InstallNewUserFw(void);
-static void SFU_BOOT_SM_ResumeInstallNewUserFw(void);
-static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void);
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
-static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
-static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
-static SFU_ErrorStatus SFU_BOOT_SetLastExecStatus(uint8_t uExecID, uint8_t uLastExecState);
-static SFU_ErrorStatus SFU_BOOT_ManageLastExecStatus(uint32_t uLastExecStatus);
-static SFU_ErrorStatus SFU_BOOT_ManageResetSources(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
-  *        In the nominal case, the bootloader service runs until the user application is launched.
-  *        When no valid user application can be run (after installing a new image or not),
-  *        if the local loader feature is not enabled then the execution stops,
-  *        otherwise a local download will be awaited.
-  *        If the state machine encounters a major issue then a reboot is triggered.
-  * @param None.
-  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
-  * @note Constraints
-  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
-  *       2. This function also takes care of BSP initialization after enabling the secure mode.
-  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
-  *       3. No other entity should handle the initialization of the Secure Engine.
-  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
-  *          configurations will be overwritten).
-  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
-  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
-  *          error cause.
-  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
-  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
-  *          new image).
-  * @note Settings are handled at compilation time:
-  *       1. See compiler switches in main.h for secure IPs settings
-  *       2. The trace system is configured in the sfu_trace.h file
-  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
-  *          stage.
-  */
-SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
-{
-  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
-
-  /*
-   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
-   * "automatically" managed by SBSFU compiler command
-   */
-  if (SE_Startup() == SE_SUCCESS)
-  {
-    /* Security Configuration */
-    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
-    {
-      /* Board BSP  Configuration */
-      SFU_BOOT_BspConfiguration();
-
-      /* Configure the Secure Boot and start the State machine */
-      if (SFU_BOOT_Init() == SFU_SUCCESS)
-      {
-        /* Start the Secure Boot State Machine */
-        (void) SFU_BOOT_SM_Run();
-      }
-      else
-      {
-        /* failure when initializing the secure boot service */
-        e_ret_code = SFU_BOOT_INIT_FAIL;
-      }
-    }
-    else
-    {
-      /* failure when configuring the security IPs  */
-      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
-    }
-  }
-  else
-  {
-    /* failure at secure engine initialization stage */
-    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
-  }
-
-  /*
-   * This point should not be reached unless a critical init failure occurred
-   * Return the error code
-   */
-  return (e_ret_code);
-}
-
-/**
-  * @brief  Force System Reboot
-  * @param  None
-  * @retval None
-  */
-void SFU_BOOT_ForceReboot(void)
-{
-  /*
-   * WARNING: The follow TRACEs are for debug only. This function could be called
-   * inside an IRQ so the below printf could not be executed or could generate a fault!
-   */
-  TRACE("\r\n========= End of Execution ==========");
-  TRACE("\r\n\r\n\r\n");
-
-  /*
-   * This is the last operation executed. Force a System Reset.
-   * The check below is needed in case we reboot before setting the Unpriviledged mode.
-   * This can happen in a factory reset use-case typically.
-   */
-  if (0U != SFU_MPU_IsUnprivileged())
-  {
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
-  }
-  else
-  {
-    NVIC_SystemReset();
-  }
-}
-
-/**
-  * @brief  Initialize the Secure Boot State machine.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_Init(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-
-  /*
-   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
-   * download)
-   */
-  initialDeviceStatusCheck = 1U;
-
-  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
-  if (SFU_LL_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Flash interface initialization */
-  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* The COM modules is required only if the trace or the local download is enabled */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
-  if (SFU_COM_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  /* Call the SFU_LOADER module Init */
-  if (SFU_LOADER_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER */
-
-  /* Call the Exception module Init */
-  if (SFU_EXCPT_Init() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Call the image handling Init  */
-  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
-  {
-    return SFU_ERROR;
-  } /* else continue */
-
-
-  TRACE("\r\n\r\n");
-  TRACE("\r\n======================================================================");
-  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
-  TRACE("\r\n=                                                                    =");
-  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
-  TRACE("\r\n======================================================================");
-  TRACE("\r\n\r\n");
-
-  /* Initialize the Secure Engine that will be used for all the most critical operations */
-  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
-  {
-    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
-  }
-  else
-  {
-    /* Check the Secure Engine Status in order to get more information */
-    if (e_se_status == SE_BOOT_INFO_ERR_FACTORY_RESET)
-    {
-      TRACE("\r\n= [SBOOT] STATE: WARNING: SECURE ENGINE INITIALIZATION WITH FACTORY DEFAULT VALUES!");
-      /* Please add your custom action here */
-      /* ... */
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-      TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
-    }
-    /*
-     * The BootInfo consecutive boot on error counter will be handled in SFU_BOOT_ManageResetSources() to decide if it
-     * is incremented or reset.
-     * This counter is used to count the number of consecutive resets triggered by an error (in the User Application or
-     * in SB_SFU when dealing with the user application management).
-     * So this counter is reset as soon as a normal power off/power on boot is performed.
-     */
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  DeInitialize the Secure Boot State machine.
-  * @param  None
-  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
-  *         The bootloader can terminate:
-  *         1. with an init failure : no de-init needed
-  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
-  *            by this function.
-  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
-  *            required security mechanisms.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_DeInit(void)
-{
-  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* SECBOOT_USE_LOCAL_LOADER */
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  if (SFU_COM_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
-
-  if (SFU_LL_DeInit() != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  BSP Initialization.
-  *         Called when the secure mode is enabled.
-  * @note   The BSP configuration should be handled only in this function.
-  * @param  None
-  * @retval None
-  */
-static void SFU_BOOT_BspConfiguration()
-{
-  /* LED Init*/
-  (void) BSP_LED_Init(SFU_STATUS_LED);
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-  /* User Button */
-  BUTTON_INIT();
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-}
-
-/**
-  * @brief  Execute the Secure Boot state machine.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
-  void (*fnStateMachineFunction)(void);
-  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-                                                 SFU_BOOT_SM_CheckNewFwToDownload,
-                                                 SFU_BOOT_SM_DownloadNewUserFw,
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-#ifdef KMS_ENABLED
-                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
-                                                 SFU_BOOT_SM_InstallKMSBlob,
-#endif /* KMS_ENABLED */
-                                                 SFU_BOOT_SM_CheckUserFwStatus,
-                                                 SFU_BOOT_SM_InstallNewUserFw,
-                                                 SFU_BOOT_SM_VerifyUserFwSignature,
-                                                 SFU_BOOT_SM_ExecuteUserFw,
-                                                 SFU_BOOT_SM_ResumeInstallNewUserFw,
-                                                 SFU_BOOT_SM_RollbackInstallPrevUserFw,
-                                                 SFU_BOOT_SM_HandleCriticalFailure,
-                                                 SFU_BOOT_SM_RebootStateMachine
-                                                };
-
-  /* Start the State Machine loop/evolution */
-  while (e_ret_status == SFU_SUCCESS)
-  {
-    /* Always execute a security/safety check before moving to the next state */
-    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
-    {
-      /*
-       * Except for the 1st state, used to check the last saved execution status,
-       * let's save the current Execution Status in order to be retrieved and analyzed
-       * in case a reboot will be triggered by an error, bug, power-off, Hw reset, etc.
-       */
-      if (m_StateMachineContext.CurrState != SFU_STATE_CHECK_STATUS_ON_RESET)
-      {
-        (void) SFU_BOOT_SetLastExecStatus(EXEC_ID_SECURE_BOOT, (uint8_t)m_StateMachineContext.CurrState);
-      }
-
-      /* Get the right StateMachine function according to the current state */
-      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
-
-      /* Call the State Machine function associated to the current state */
-      fnStateMachineFunction();
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  /* If the State Machine cannot evolve anymore, reboot is the only option */
-
-  /* Set the error before forcing a reboot */
-  (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_UNKNOWN);
-
-  /* This is the last operation executed. Force a System Reset */
-  SFU_BOOT_ForceReboot();
-
-  return e_ret_status;
-}
-
-/** @brief  Check the Reset status in order to understand the last cause of Reset
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckStatusOnReset(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef         e_se_status;
-  SE_BootInfoTypeDef       x_boot_info;
-  uint32_t                 u_last_exec_status;
-
-  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
-
-  /* First of all, locally get the last execution status we'll work on, before setting the new state */
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    u_last_exec_status = x_boot_info.LastExecStatus;
-    /*
-     * Try to save here the current Execution Status in order to be retrieved and analyzed in case a reboot will be
-     * triggered by an error, bug, power-off, Hw reset, etc.
-     */
-
-    if (SFU_BOOT_SetLastExecStatus(EXEC_ID_SECURE_BOOT, (uint8_t)m_StateMachineContext.CurrState) == SFU_SUCCESS)
-    {
-      /* Check the wakeup sources */
-      if (SFU_BOOT_ManageResetSources() == SFU_SUCCESS)
-      {
-        /* Check the last execution status and take the opportune actions */
-        if (SFU_BOOT_ManageLastExecStatus(u_last_exec_status) == SFU_SUCCESS)
-        {
-          if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-          {
-            e_ret_status = SFU_SUCCESS;
-          } /* else SE_INFO_ReadBootInfo fails: go forward as we end up with a critical failure anyway */
-        } /* else SFU_BOOT_ManageLastExecStatus fails: go forward as we end up with a critical failure anyway */
-      } /* else SFU_BOOT_ManageResetSources fails: go forward as we end up with a critical failure anyway */
-    } /* else SFU_BOOT_SetLastExecStatus fails: go forward as we end up with a critical failure anyway */
-  } /* else SE_INFO_ReadBootInfo fails: go forward as we end up with a critical failure anyway */
-
-  /* RCC access done to identify the wakeup sources, we can switch to unpriviledged */
-  SFU_MPU_EnterUnprivilegedMode();
-#ifdef SFU_TEST_PROTECTION
-  /*
-   * All protections are installed and the correct execution mode is set (unprivileged).
-   * This is the good time to run the auto-tests.
-   */
-  SFU_TEST_Init();
-#endif /* SFU_TEST_PROTECTION */
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-  /* When the local loader feature is supported we need to check if a local download is requested */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#else
-#ifdef KMS_ENABLED
-  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#else
-  /* When the local loader feature is disabled go directly to the check of the FW status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_VERIFY_USER_FW_STATUS, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#endif /* KMS_ENABLED */
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-}
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-/**
-  * @brief  Check if a new UserApp firmware is available for downloading.
-  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
-  *         to press the user button to force the local download.
-  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
-  *         (because there is no other action to do).
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckNewFwToDownload(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-#ifdef SECBOOT_BYPASS_MODE_ENABLED
-  if ((*(uint32_t *)LOADER_COM_REGION_RAM_START) == STANDALONE_LOADER_BYPASS_REQ)
-  {
-    TRACE("\r\n= [SBOOT] STATE: Bypass mode - execution standalone loader");
-    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
-
-    /* This is unreachable code (dead code) in principle...
-    At this point we should not be able to reach the following instructions.
-    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
-    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-#endif /* SECBOOT_BYPASS_MODE_ENABLED */
-#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
-
-  if (initialDeviceStatusCheck == 1U)
-  {
-    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
-    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
-    if (0U != BUTTON_PUSHED())
-    {
-      /* Download requested */
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-  else
-  {
-    /*
-     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
-     * download to start
-     */
-    e_ret_status = SFU_SUCCESS;
-  }
-
-#ifdef KMS_ENABLED
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
-#else
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
-#endif /* KMS_ENABLED */
-
-}
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
-
-#ifdef KMS_ENABLED
-/**
-  * @brief  Check if a KMSBlob is waiting for installation.
-  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
-  *         disabled.
-  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
-  *         enabled.
-  *         In this latter case,
-  *               if a new Firmware download is requested,
-  *               it has priority over the KMS blob installation,
-  *               and the KMS blob installation request will be lost.
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
-
-  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
-  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
-
-  /* Check if a Blob Installation is requested or on-going */
-  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
-
-  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
-  {
-    /* Blob installation requested */
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
-}
-
-/**
-  * @brief  Check if a KMSBlob is waiting for install.
-  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
-  *         to press the user button to force the local download.
-  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
-  *         (because there is no other action to do).
-  * @param  None
-  * @note   This function must set the next State Machine State.
-  * @retval None
-  */
-static void SFU_BOOT_SM_InstallKMSBlob(void)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  uint8_t         *pBlobHdr;
-  uint8_t         *pBlobInFlash;
-  CK_RV           e_status;
-
-  /* At boot-up, Managing ImportBlob through KMS services.  */
-  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
-
-  /* Here we will Launch SE service to take consume the Blob */
-  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
-  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
-  }
-  else
-  {
-    /* Initialize KMS in order to be able to import blob using internal algorithms */
-    e_status = C_Initialize(NULL);
-    if (e_status == CKR_OK)
-    {
-      /* we do not take the return value into account as we will not retry the import in case of issue */
-      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
-
-      if (e_status != CKR_OK)
-      {
-        (void)C_Finalize(NULL);
-      }
-      else
-      {
-        e_status = C_Finalize(NULL);
-      }
-    }
-
-    if (e_status != CKR_OK)
-    {
-      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
-    }
-
-    /* In any case, we remove the Blob To Install (regardless of the result) */
-    e_ret_status = SFU_KMS_EraseBlob();
-
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
-    }
-
-    /* Display the KMS import result */
-    switch (e_status)
-    {
-      case CKR_OK:
-        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
-        e_ret_status = SFU_SUCCESS;
-        break;
-
-      case CKR_SIGNATURE_INVALID:
-        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_DATA_INVALID:
-        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_DEVICE_ERROR:
-        /* At boot-up, NVM Error when trying to install KMSBlob.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      case CKR_OPERATION_ACTIVE:
-        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
-        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
-        e_ret_status = SFU_ERROR;
-        break;
-
-      default:
-        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
-        e_ret_status = SFU_ERROR;
-        break;
-    }
-  }
-
-  /* Set the next State Machine regardless of the KMS import result */
-  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
-}
-
-#endif /* KMS_ENABLED */
-
-
-/**
-  * @brief  Check the Status of the Fw Image to work on  in order to set the next
-  *         State Machine state accordingly
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_CheckUserFwStatus(void)
-{
-  SFU_IMG_ImgInstallStateTypeDef e_PendingInstallStatus;
-  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
-  uint32_t i;
-
-
-  if (initialDeviceStatusCheck == 1U)
-  {
-    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
-  }
-
-  /* Check if there is a pending action related to a FW update procedure */
-  e_PendingInstallStatus = SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall, &m_ActiveSlotToResume,
-                                                            &m_ActiveSlotToRollback);
-
-  switch (e_PendingInstallStatus)
-  {
-    case SFU_IMG_FWIMAGE_ROLLBACK:
-      /*
-       * The new FW image has not been validated : rollback requested @ next reset
-       * Rollback is done assuming the previous image was backed-up in corresponding dwl slot
-       * As example : new image installed in SLOT_ACTIVE_2. Previous image was backed-up in SLOT_DWL_2
-       */
-      /* Identify corresponding backed-up slot */
-      m_DwlSlotToInstall = m_ActiveSlotToRollback - SLOT_ACTIVE_1 + SLOT_DWL_1;
-      TRACE("\r\n\t  Installation not validated: rollback procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
-            m_ActiveSlotToRollback, m_DwlSlotToInstall);
-      SFU_SET_SM_CURR_STATE(SFU_STATE_ROLLBACK_PREV_USER_FW);
-      break;
-
-    case SFU_IMG_FWUPDATE_STOPPED:
-      /* The installation of a downloaded FW has been interrupted */
-      /* We perform a resume of the installation */
-      TRACE("\r\n\t  Installation Failed: resume installation procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
-            m_ActiveSlotToResume, m_DwlSlotToInstall);
-      SFU_SET_SM_CURR_STATE(SFU_STATE_RESUME_INSTALL_NEW_USER_FW);
-      break;
-
-    case SFU_IMG_FWIMAGE_TO_INSTALL:
-      /*
-       * A new FW is detected in the dwl slot and ready to be installed
-       */
-      TRACE("\r\n\t  New Fw to be installed from slot SLOT_DWL_%d", m_DwlSlotToInstall);
-      SFU_SET_SM_CURR_STATE(SFU_STATE_INSTALL_NEW_USER_FW);
-      break;
-
-    case SFU_IMG_NO_FWUPDATE:
-      /*
-       * No FW image installation pending :
-       *   1- Check if firmwares are detected for C1 and C2 (MASTER_SLOT)
-       *   2- No active firmware candidate for execution ==> Local download
-       *
-       * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
-       */
-      m_C1ActiveSlot = 0U;
-      m_C2ActiveSlot = 0U;
-      m_ActiveSlotToExecute = 0U;
-
-      /* Check if firmwares are detected for C1 and C2 (MASTER_SLOT) */
-      if (MASTER_SLOT == 0xFFU)
-      {
-        TRACE("\r\n\t  No master slot has been defined for C2");
-      }
-      else
-      {
-        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-        {
-          if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
-          {
-            if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-            {
-              if ((SLOT_ACTIVE_1 + i) == MASTER_SLOT)
-              {
-                m_C2ActiveSlot = MASTER_SLOT;
-                TRACE("\r\n\t  A C2 FW is detected in the slot SLOT_ACTIVE_%d", m_C2ActiveSlot);
-              }
-              else
-              {
-                m_C1ActiveSlot = SLOT_ACTIVE_1 + i;
-                TRACE("\r\n\t  A C1 FW is detected in the slot SLOT_ACTIVE_%d", m_C1ActiveSlot);
-              }
-            }
-          }
-        }
-      }
-
-      /* 2- No active firmware candidates for execution ==> Local download */
-      if ((m_C1ActiveSlot != 0U) && (m_C2ActiveSlot != 0U))
-      {
-        m_ActiveSlotToExecute = m_C2ActiveSlot;
-        SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
-      }
-      else
-      {
-        /* Control if all active slot are empty */
-        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-        {
-          if ((m_C1ActiveSlot != (SLOT_ACTIVE_1 + i)) && (m_C2ActiveSlot != (SLOT_ACTIVE_1 + i)))
-          {
-            if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
-            {
-              if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-              {
-                /*
-                 * We should never reach this code.
-                 * Could come from an attack ==> as an example we invalidate current firmware.
-                 */
-                TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
-                (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-              }
-            }
-          }
-        }
-
-        /*
-         * No valid FW is present in the active slot
-         * and there is no FW to be installed in UserApp download area: local download (when possible)
-         */
-        if (1U == initialDeviceStatusCheck)
-        {
-          TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-          /* Waiting for a local download is automatic, no trigger required. */
-          TRACE("\r\n\t  Waiting for the local download to start... ");
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-          initialDeviceStatusCheck = 0U;
-#ifdef SFU_TEST_PROTECTION
-          SFU_TEST_Reset();
-#endif /* SFU_TEST_PROTECTION */
-        }
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        else
-        {
-          /*
-           * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
-           *   If a FW is present in the active slot => it is checked then launched.
-           *   If there is a FW to install => the installation procedure starts.
-           *   If no FW is present and no installation is pending:
-           *      - if the local loader feature is enabled we enter the local download state
-           *      - if the local loader feature is disabled, the execution is stopped.
-           */
-          TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS should not be entered more than once per boot.");
-        }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-        SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
-#else
-        /*
-         * When the local loader feature is disabled it is not possible to enter the local download state.
-         * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
-         * So we end up waiting for the user to reboot (or the IWDG to expire).
-         */
-        TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
-        /* Release CM4 (via SRAM) */
-        *pSbsfuFlag = SBSFU_FW_DOWNLOAD;
-        while (1 == 1)
-        {
-          (void) BSP_LED_Toggle(SFU_STATUS_LED);
-          HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
-        }
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-      }
-      break;
-
-    default:
-      TRACE("\r\n\t  Flash State Unknown, Critical failure");
-      /* If not in one of the previous state, something bad occurred */
-      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-      break;
-  }
-}
-
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
-/**
-  * @brief  A new UserApp Fw was available. Start to download it
-  * @param  None
-  * @note   Reset is generated at by standalone loader when FW is downloaded.
-  * @retval None
-  */
-static void SFU_BOOT_SM_DownloadNewUserFw(void)
-{
-  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
-
-  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
-
-  *pSbsfuFlag = SBSFU_FW_DOWNLOAD;
-  while (1 == 1)
-  {
-    (void) BSP_LED_Toggle(SFU_STATUS_LED);
-    HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
-  }
-}
-#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-/**
-  * @brief  A new UserApp Fw was available. Start to download it
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_DownloadNewUserFw(void)
-{
-  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
-  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
-  uint32_t                  dwl_slot;
-  uint32_t                  u_size = 0;
-
-  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
-
-  /*
-   * Download area will be chosen as following. After header analysis :
-   *   - same DWL slot number as SFU magic number, if the slot is configured.
-   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
-   *   - by default : SLOT_DWL_1
-   */
-  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
-          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
-          fw_image_header_validated.PartialFwOffset, u_size);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-    /* Read header in dwl slot */
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
-                                     sizeof(SE_FwRawHeaderTypeDef));
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /*
-     * Notify the Secure Boot that a new image has been downloaded
-     * by calling the SE interface function to trigger the installation procedure at next reboot.
-     */
-    if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
-    {
-      /* Erase downloaded image */
-      (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
-
-      /* no specific error cause set */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-  else
-  {
-    /* Erase downloaded image */
-    (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
-
-    /* Memorize the specific error cause if any before handling this critical failure */
-    switch (e_ret_status_app)
-    {
-      case SFU_LOADER_ERR_COM:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_COM_ERROR);
-        break;
-      case SFU_LOADER_ERR_FW_VERSION:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_INCORRECT_VERSION);
-        break;
-      case SFU_LOADER_ERR_FW_LENGTH:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FW_TOO_BIG);
-        break;
-      case SFU_LOADER_ERR_AUTH_FAILED:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_HEADER_AUTH_FAILED);
-        break;
-      case SFU_LOADER_ERR_FLASH:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-        break;
-      case SFU_LOADER_ERR_CRYPTO:
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-        break;
-      default:
-        /* no specific error cause */
-        break;
-    }
-  } /* else error with no specific error cause */
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
-
-/**
-  * @brief  Install the new UserApp Fw
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_InstallNewUserFw(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  TRACE("\r\n= [SBOOT] STATE: INSTALL NEW USER FIRMWARE ");
-  /* Double security check :
-     - testing "static protections" twice will avoid basic hardware attack
-     - flow control reached : dynamic protections checked
-     - re-execute static then dynamic check
-     - errors caught by FLOW_CONTROL ==> infinite loop */
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
-  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_SECOND_CONFIGURATION);
-  }
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    /*
-     * Due to previous flow control, we should never reach this code  :
-     * Critical failure management if installation failed
-     */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-    return;
-  }
-
-  /* Check the candidate version vs current active version */
-  e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
-
-  if (SFU_SUCCESS != e_ret_status)
-  {
-    /* Erase downloaded FW in case of authentication/integrity error */
-    (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
-  }
-
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    /* Launch the Firmware Installation procedure */
-    e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
-  }
-
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    /*
-     * The FW installation succeeded: the previous FW is now backed up in the dwl slot.
-     * Nothing more to do, in the next FSM state we are going to verify the FW again and execute it if possible.
-     */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] FW installation succeeded.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-  else
-  {
-    /*
-     * The FW installation failed: we need to reboot and the resume procedure will be triggered at next boot.
-     * Nothing more to do, the next FSM state (HANDLE_CRITICAL_FAILURE) will deal with it.
-     */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] FW installation failed!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-  /* Installation successful : reboot for next operations on other slots
-       - installation
-       - resume
-       - rollback */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    SFU_BOOT_ForceReboot();
-  }
-  else
-  {
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-}
-
-/**
-  * @brief  Execute a UserApp Fw installation resume
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_ResumeInstallNewUserFw(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  TRACE("\r\n= [SBOOT] STATE: RESUME INSTALLATION OF NEW USER FIRMWARE");
-
-  /*
-   * This resume installation procedure continue installation of new User FW in the active slot
-   */
-  e_ret_status = SFU_IMG_TriggerResumeInstallation(m_ActiveSlotToResume, m_DwlSlotToInstall);
-
-  /* Installation successful : reboot for next operations on other slots
-       - installation
-       - resume
-       - rollback */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    SFU_BOOT_ForceReboot();
-  }
-  else
-  {
-    /* No specific error cause managed here because the FSM state already provides the information. */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-}
-
-/**
-  * @brief  Execute a rollback to the previous UserApp Fw
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void)
-{
-#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  TRACE("\r\n= [SBOOT] STATE: ROLLBACK INSTALLATION TO PREVIOUS USER FIRMWARE");
-
-  /*
-   * Rollack installation to the previous User FW from Dwl_Slot
-   */
-  e_ret_status = SFU_IMG_TriggerRollbackInstallation(m_ActiveSlotToRollback, m_DwlSlotToInstall);
-
-  /* Installation successful : reboot for next operations on other slots
-       - installation
-       - resume
-       - rollback */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    SFU_BOOT_ForceReboot();
-  }
-  else
-  {
-    /* No specific error cause managed here because the FSM state already provides the information. */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-  }
-#else
-  TRACE("\r\n= [SBOOT] STATE: ROLLBACK NOT SUPPORTED");
-
-  /* No specific error cause managed here because the FSM state already provides the information. */
-  SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-#endif /* ENABLE_IMAGE_STATE_HANDLING && !(SFU_NO_SWAP) */
-}
-
-
-/**
-  * @brief  Verify the UserApp Fw signature before executing it
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_VerifyUserFwSignature(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t u_configured_slot_nb = 0U;
-  uint32_t u_verified_slot_nb = 0U;
-  uint32_t i;
-
-  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
-
-  /* Double security check :
-     - testing "static protections" twice will avoid basic hardware attack
-     - flow control reached : dynamic protections checked
-     - re-execute static then dynamic check
-     - errors caught by FLOW_CONTROL ==> infinite loop */
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
-  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
-  }
-  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    /*
-     * Due to previous flow control, we should never reach this code  :
-     * Critical failure management if installation failed
-     */
-    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
-    return;
-  }
-
-  /*
-   * With the 2 images handling:
-   *       1. the header signature is verified  when installing a new firmware
-   *       2. the firmware signature is checked when installing a new firmware
-   *       3. remaining part of active slot is kept "clean" during installation procedure
-   * So following checks should never fail.
-   */
-  /* Check all active slots configured */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      u_configured_slot_nb ++;
-      /* FW installed ? */
-      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-      {
-        /* Initialize Flow control */
-        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
-
-        /* Check the header signature */
-        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
-        if (SFU_SUCCESS == e_ret_status)
-        {
-          /* Check the FW signature */
-          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
-          if (SFU_SUCCESS == e_ret_status)
-          {
-            /* Verify that there is no additional code beyond firmware image */
-            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
-            if (SFU_SUCCESS != e_ret_status)
-            {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-            }
-            else
-            {
-              u_verified_slot_nb ++;
-            }
-          }
-          else
-          {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          }
-        }
-        else
-        {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-        }
-        /*
-         * One of the checks fails :
-         *  - Header signature
-         *  - FW signature
-         *  - No malicious code
-         *  ==> Active slot should be invalidated
-         */
-        if (SFU_SUCCESS != e_ret_status)
-        {
-          /*
-           * We should never reach this code.
-           * Could come from an attack ==> as an example we invalidate current firmware.
-           */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-        }
-        else
-        {
-          /* Verify if authentication and integrity controls performed */
-          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-        }
-      }
-      else
-      {
-        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /*
-           * We should never reach this code.
-           * Could come from an attack ==> as an example we invalidate current firmware.
-           */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
-        }
-      }
-    }
-  }
-
-  /* Check that C1 and C2 firmwares are present */
-  if ( u_configured_slot_nb != u_verified_slot_nb )
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Set the next State Machine state according to the success of the failure of e_ret_status */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-
-/**
-  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
-  * @param  None
-  * @note   This function must set the next State Machine State
-  * @retval None
-  */
-static void SFU_BOOT_SM_ExecuteUserFw(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status = SE_KO;
-  uint32_t i;
-
-  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
-
-  /* Reload Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
-  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-
-  /* Double security check for all active slots :
-     - Control twice the Header signature will avoid basic hardware attack
-     - Control twice the FW signature will avoid basic hardware attack */
-
-  /* Check all active slots configured */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      /* FW installed ? */
-      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
-      {
-        /* Initialize Flow control */
-        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
-
-        /* Check the header signature */
-        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Security issue : execution stopped ! */
-          SFU_EXCPT_Security_Error();
-        }
-
-        /* Check the FW signature */
-        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Security issue : execution stopped ! */
-          SFU_EXCPT_Security_Error();
-        }
-
-#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
-        /* Move the state to SELFTEST for the new images */
-        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
-        {
-          /* Image state cannot be changed : What to do ?
-             ==> decision to continue execution */
-          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
-        }
-#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
-
-        /* Verify if authentication and integrity controls performed */
-        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
-      }
-    }
-  }
-
-  /*
-   * Try to set the last execution status and continue: we assume the UserApp will start or a failure will be linked to
-   * the UserApp code so we can change the EXEC_ID now
-   */
-  e_ret_status = SFU_BOOT_SetLastExecStatus(EXEC_ID_USER_APP, (uint8_t)m_StateMachineContext.CurrState);
-
-  /*
-   * You may decide to implement additional checks before running the Firmware.
-   * For the time being we launch the FW present in the active slot.
-   *
-   * The bootloader must also take care of the security aspects:
-   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
-   *   B.lock the SE services the UserApp is not allowed to call
-   *   C.leave secure boot mode
-   */
-
-  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-
-    /* Lock part of Secure Engine services */
-    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
-    {
-      /* De-initialize the SB_SFU bootloader before launching the UserApp */
-      (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
-
-      /* Last flow control : lock service */
-      FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
-
-      /* This function should not return */
-      e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
-
-      /* This point should not be reached */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      /* We do not memorize any specific error, the FSM state is already providing the info */
-      TRACE("\r\n=         SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      while (1 == 1)
-      {
-        ;    /* wait for watchdog */
-      }
-    }
-    else
-    {
-      TRACE("\r\n= [FWIMG] SECURE ENGINE CRITICAL FAILURE!");
-
-      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_LOCK_SE_SERVICES_ERR);
-
-      /* This is the last operation executed. Force a System Reset */
-      SFU_BOOT_ForceReboot();
-    }
-  }
-  else
-  {
-    TRACE("\r\n= [FWIMG] EXTERNAL FLASH CONFIGURATION FAILURE!");
-
-    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-
-    /* This is the last operation executed. Force a System Reset */
-    SFU_BOOT_ForceReboot();
-  }
-
-  /* This is unreachable code (dead code) in principle...
-  At this point we should not be able to reach the following instructions.
-  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
-  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
-}
-
-/**
-  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
-  * @param  None
-  * @note   After a Critical Failure a Reboot will be called.
-  * @retval None
-  */
-static void SFU_BOOT_SM_HandleCriticalFailure(void)
-{
-  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
-
-  /* Any Critical Failure will be served and a SystemReset will be triggered */
-  SFU_BOOT_StateExceptionHandler(m_StateMachineContext.PrevState);
-
-  /* It's not possible to continue without compromising the stability or the security of the solution.
-     The State Machine needs to be aborted and a Reset must be triggered */
-  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
-}
-
-/**
-  * @brief  The state machine is aborted and a Reset is triggered
-  * @param  None
-  * @note   You are in this condition because it's not possible to continue without
-            compromising the stability or the security of the solution.
-  * @retval None
-  */
-static void SFU_BOOT_SM_RebootStateMachine(void)
-{
-  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
-
-  /*
-   * In case some clean-up must be done before resetting.
-   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
-   */
-  (void)SFU_BOOT_DeInit();
-
-  /* This is the last operation executed. Force a System Reset */
-  SFU_BOOT_ForceReboot();
-}
-
-#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
-/**
-  * @brief  Jump into standalone loader
-  * @param  None
-  * @retval None
-  */
-static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
-{
-  /* this function does not return */
-  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, LOADER_REGION_ROM_START);
-
-  /* The point below should NOT be reached */
-  return SFU_SUCCESS;
-}
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
-
-/**
-  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
-  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
-  * @param  None
-  * @note   This operation should be done as soon as possible after a reboot.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply Static protections involving Option Bytes */
-  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
-  {
-    /* Apply runtime protections needed to be enabled after each Reset */
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  System security configuration
-  * @param  None
-  * @note   Check and apply the security protections. This has to be done as soon
-  *         as possible after a reset
-  * @retval None
-  */
-static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  /* WARNING: The following CheckApplySecurityProtection function must be called
-     as soon as possible after a Reset in order to be sure the system is secured
-     before starting any other operation. The drawback is that the ErrorManagement
-     is not initialized yet, so in case of failure of this function, there will not be
-     any error stored into the BootInfo or other visible effects.  */
-
-  /* Very few things are already initialized at this stage. Need additional initialization
-     to show a message that is added as below only in Debug/Test mode */
-#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-  (void) SFU_COM_Init();
-#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
-
-  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
-  {
-    /* WARNING: This might be generated by an attempted attack or a bug of your code!
-       Add your code here in order to implement a custom action for this event,
-       e.g. trigger a mass erase or take any other action in order to
-       protect your system, or simply discard it if this is expected.
-       ...
-       ...
-    */
-    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
-  }
-  else
-  {
-    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
-  *         a malicious code removing some of the applied security/integrity features.
-  *         The IWDG is also refreshed in this function.
-  * @param  None
-  * @note   This function must be called with a frequency greater than 0.25Hz!
-  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
-  *         So the User App should continue to refresh the IWDG counter.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Refresh the IWDG */
-  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
-
-
-  /* Add your code here for customization:
-     e.g. for additional security or safety periodic check.
-     ...
-     ...
-  */
-  return e_ret_status;
-}
-
-/**
-  * @brief  Set the last execution status. For future customization the parameter
-  *         list can be extended with an additional uint8_t, that at the moment is
-  *         stored with a reserved default value.
-  * @param  uExecID: This parameter can be a value of @ref SFU_BOOT_Private_Defines_Execution_Id
-  * @param  uLastExecState: the last SM state to store into the BootInfo structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_BOOT_SetLastExecStatus(uint8_t uExecID, uint8_t uLastExecState)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef        e_se_status;
-  SE_BootInfoTypeDef      x_boot_info;
-  uint8_t uFwImageIdx = 0U;
-
-  if ((IS_VALID_EXEC_ID(uExecID)) && (IS_SFU_SM_STATE(uLastExecState)))
-  {
-    if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      /* Set the last execution status as a 32-bit data */
-      x_boot_info.LastExecStatus = RESERVED_VALUE
-                                   | ((uint32_t)uLastExecState << 8U)
-                                   | ((uint32_t)uFwImageIdx << 16U)
-                                   | ((uint32_t)uExecID << 24U);
-
-      /* Update the BootInfo shared area according to the modifications above */
-      if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the  the last execution status, and take the right actions accordingly
-  * @param  uLastExecStatus: 32-bit representing the @ref SFU_BOOT_Private_Macros_Execution_Status
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus  SFU_BOOT_ManageLastExecStatus(uint32_t uLastExecStatus)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef         e_se_status;
-  SE_BootInfoTypeDef       x_boot_info;
-  SFU_EXCPT_IdTypeDef      u_last_error;
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    /* Show the last execution state */
-    TRACE("\r\n\t  INFO: Last execution status before Reboot was:");
-    if (IS_SFU_SM_STATE(SFU_GET_LAST_EXEC_STATE(uLastExecStatus)))
-    {
-      TRACE(m_aStateMachineStrings[SFU_GET_LAST_EXEC_STATE(uLastExecStatus)]);
-    }
-    else
-    {
-      TRACE("Unknown");
-    }
-#else
-    UNUSED(uLastExecStatus);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-    /* Show the last execution error */
-    u_last_error = (SFU_EXCPT_IdTypeDef) x_boot_info.LastExecError;
-    TRACE("\r\n\t  INFO: Last execution detected error was: ");
-    if (IS_SFU_EXCPT(u_last_error))
-    {
-      TRACE((char const *)m_aErrorStrings[u_last_error]);
-    }
-    else
-    {
-      TRACE("Unknown error.");
-      u_last_error = SFU_EXCPT_UNKNOWN;
-    }
-
-    /* Custom handler of the last error detected at reset */
-    if ((SFU_EXCPT_IdTypeDef)u_last_error != SFU_EXCPT_NONE)
-    {
-      SFU_EXCPT_ResetExceptionHandler((SFU_EXCPT_IdTypeDef)u_last_error);
-    }
-
-    /*
-     * It's possible to reset the error at this point (because we are in SFU_STATE_CHECK_STATUS_ON_RESET context so no
-     * need to memorize the exception further)
-     */
-    x_boot_info.LastExecError = (uint32_t) SFU_EXCPT_NONE;
-
-    /* Update the BootInfo shared area according to the modifications above */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus  SFU_BOOT_ManageResetSources(void)
-{
-  SFU_ErrorStatus     e_ret_status = SFU_ERROR;
-  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
-  SFU_EXCPT_IdTypeDef e_exception;
-  SE_BootInfoTypeDef  x_boot_info; /* to retrieve and  update the counter of consecutive errors */
-  SE_StatusTypeDef    e_se_status;
-
-  /* Check the wakeup sources */
-  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
-  switch (e_wakeup_source_id)
-  {
-    /*
-     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
-     * RCC_CSR flags can be used to do so.
-     * It is based on the behaviors we consider as normal and abnormal for the SB_SFU and UserApp example projects
-     * running on a Nucleo HW board.
-     * Hence this piece of code must systematically be revisited and tuned for the targeted system (software and
-     * hardware expected behaviors must be assessed to tune this code).
-     *
-     * One may use the "uExecID" parameter to determine if the last exec status was in the SB_SFU context or UserApp
-     * context to implement more clever checks in the reset cause handling below.
-     */
-
-    case SFU_RESET_WDG_RESET:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* This event has to be considered as an error to manage */
-      e_exception = SFU_EXCPT_WATCHDOG_RESET;
-      break;
-
-    case SFU_RESET_LOW_POWER:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_HW_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         This is because a Nucleo board offers a RESET button triggering the HW reset.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_BOR_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_SW_RESET:
-      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage,
-         also because a sw reset is generated when the State Machine forces a Reboot.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    case SFU_RESET_OB_LOADER:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage,
-         also because an OptionByte loader is called after applying some of the security protections
-         (see SFU_CheckApplyStaticProtections).
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line.
-         Typically we may implement a more clever check where we determine if this OB reset occurred only once because
-         SB_SFU had to tune the OB initially, or if it occurred again after these initial settings. If so, we could
-         consider it as an attack. */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-
-    default:
-      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system, or simply discard it if this is expected.
-         ...
-         ...
-      */
-      /* In the current implementation this event is not considered as an error to manage.
-         But this is strictly related to the final system. If needed to be managed as an error
-         please add the right error code in the following src code line */
-      e_exception = SFU_EXCPT_NONE;
-      break;
-  }
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) != SE_SUCCESS)
-  {
-    /* This is not supposed to occur because ReadBootInfo is already called before SFU_BOOT_ManageResetSources() is
-       entered... */
-    TRACE("\r\n\t  BOOT INFO reading Error");
-    /* Do nothing more and return an error */
-  }
-  else
-  {
-    /* In case an error has been set above, set/overwrite it into the BootInfo */
-    if (e_exception != SFU_EXCPT_NONE)
-    {
-      /* increment number of consecutive boot errors */
-      x_boot_info.ConsecutiveBootOnErrorCounter++;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter ++ ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-    else
-    {
-      /*
-       * The reset cause is considered as normal so we reset the counter of consecutive errors
-       */
-      x_boot_info.ConsecutiveBootOnErrorCounter = 0;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter reset ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-
-    /* Log the consecutive init counter value in the console */
-    TRACE("\r\n\t  Consecutive Boot on error counter = %d ", x_boot_info.ConsecutiveBootOnErrorCounter);
-
-    /* Update BootInfo structure with  consecutive boot counter */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) != SE_SUCCESS)
-    {
-      TRACE("\r\n\t  BOOT INFO Consecutive Boot on error counter writing error ");
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Consecutive Boot on error counter updated ");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* Update the last exec error if needed */
-  if (e_exception != SFU_EXCPT_NONE)
-  {
-    if (SFU_BOOT_SetLastExecError((uint32_t)e_exception) != SFU_SUCCESS)
-    {
-      e_ret_status = SFU_ERROR;
-    } /* else keep the previous e_ret_status value */
-  } /* else: no need to update it */
-
-  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
-  SFU_LL_SECU_ClearResetSources();
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
-  * @param  None
-  * @retval None
-  */
-void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
-{
-  UNUSED(hrtc);
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
-}
-
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC Fault.
-  * @param  None
-  * @retval None
-  */
-void SFU_CALLBACK_GTZC_TZIC(void)
-{
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_GTZC_TZIC_FAULT);
-}
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
deleted file mode 100644
index 5d9f0b2f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_error.c
-  * @author  MCD Application Team
-  * @brief   SFU ERROR
-  *          This file provides set of firmware functions for SB_SFU errors handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-#include "sfu_low_level_security.h"
-#include "sfu_trace.h"
-#include "se_interface_bootloader.h"
-#include "sfu_fwimg_services.h"
-#include "sfu_boot.h"
-#include "sfu_test.h"
-#include "sfu_mpu_isolation.h"
-
-
-/* Private function prototypes -----------------------------------------------*/
-static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Set the last execution error. The state of the FSM that generated the error is stored
-  * @param  uLastExecError: the last error to store into the BootInfo structure.
-  * @note   for product with MPU isolation : e_se_status and x_boot_info parameters are defined as static to avoid to
-  *         be located into SE stack. This function can be called from IT and thus use the SE stack (privilege mode).
-  *         SE callgate will generate a reset if the parameters are not well located.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_BOOT_SetLastExecError(uint32_t uLastExecError)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  static SE_StatusTypeDef   e_se_status;
-  static SE_BootInfoTypeDef x_boot_info;
-
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    /* Set the last execution status as a 32-bit data */
-    x_boot_info.LastExecError = uLastExecError;
-
-    /* Update the BootInfo shared area according to the modifications above */
-    if (SE_INFO_WriteBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Manage the Exception generated by an IRQ
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   Because of the interruption of the State Machine execution,
-  *         it's not possible to continue without compromising the stability or
-  *         the security of the solution. A System Reset is forced at the end.
-  * @retval None
-  */
-void SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  SFU_EXCPT_IdTypeDef exception_id;
-  
-  /* Check the value */
-  exception_id = eExceptionId;
-  if (!IS_SFU_EXCPT(exception_id))
-  {
-    exception_id = SFU_EXCPT_UNKNOWN;
-  }
-
-  /* At this point and according to the detected critical exceptions, the execution
-     itself may be compromised and could not be possible to execute the following instructions.
-     It's worth trying anyway */
-
-  /* Try to take an action */
-  SFU_EXCPT_RuntimeExceptionHandler(exception_id);
-
-  /* Try to store the detected error */
-  (void)SFU_BOOT_SetLastExecError((uint32_t) exception_id);
-
-  /* It's not possible to continue without compromising the stability or the security of the solution.
-  The State Machine needs to be aborted and a Reset must be triggered */
-  SFU_BOOT_ForceReboot();
-}
-
-/**
-  * @brief  Manage the Error generated during the StateMachine execution
-  *
-  *         If a specific error has been logged in the BootInfo area it is used.
-  *         Otherwise, a generic exception is derived from the previous FSM state (minimal info).
-  *         Nevertheless, the max.consecutive boot on error counter has priority over all other errors.
-  * @note   This function is called when processing a critical failure
-  *         (called from @ref SFU_BOOT_SM_HandleCriticalFailure in state @ref SFU_STATE_HANDLE_CRITICAL_FAILURE)
-  * @param  eStateMachineState: This parameter can be a value of @ref SFU_BOOT_State_Machine_Structure_definition
-  * @retval None
-  */
-void SFU_BOOT_StateExceptionHandler(SFU_BOOT_StateMachineTypeDef eStateMachineState)
-{
-  SFU_EXCPT_IdTypeDef eExceptionId;
-  SE_BootInfoTypeDef  x_boot_info; /* to retrieve the counter of consecutive errors */
-  SE_StatusTypeDef    e_se_status;
-  SFU_EXCPT_IdTypeDef u_specific_LastExecError = SFU_EXCPT_NONE;
-
-  /* Check the parameters */
-  assert_param(IS_SFU_SM_STATE(eStateMachineState));
-
-  /*
-   * First we retrieve the specific error set when the error was detected if any.
-   * This gives a chance to set a specific error cause, more detailed than the exceptions computed from the FSM state.
-   */
-  if (SE_INFO_ReadBootInfo(&e_se_status, &x_boot_info) == SE_SUCCESS)
-  {
-    u_specific_LastExecError = (SFU_EXCPT_IdTypeDef) x_boot_info.LastExecError;
-  } /* else keep u_specific_LastExecError as SFU_EXCPT_NONE */
-
-  switch (eStateMachineState)
-  {
-
-    case SFU_STATE_CHECK_STATUS_ON_RESET:
-      eExceptionId = SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR;
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD:
-      eExceptionId = SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR;
-      break;
-
-    case SFU_STATE_DOWNLOAD_NEW_USER_FW:
-      eExceptionId = SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR;
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_STATE_VERIFY_USER_FW_STATUS:
-      eExceptionId = SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR;
-      break;
-
-    case SFU_STATE_INSTALL_NEW_USER_FW:
-      eExceptionId = SFU_EXCPT_INSTALL_NEW_USER_FW_ERR;
-      break;
-
-    case SFU_STATE_VERIFY_USER_FW_SIGNATURE:
-      eExceptionId = SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR;
-      break;
-
-    case SFU_STATE_RESUME_INSTALL_NEW_USER_FW:
-      eExceptionId = SFU_EXCPT_RESUME_INSTALL_NEW_USER_FW_ERR;
-      break;
-
-    case SFU_STATE_EXECUTE_USER_FW:
-      eExceptionId = SFU_EXCPT_EXECUTE_USER_FW_ERR;
-      break;
-
-    default:
-      /* Set an unknown error */
-      eExceptionId = SFU_EXCPT_UNKNOWN;
-      break;
-  }
-
-  if (SFU_EXCPT_NONE != u_specific_LastExecError)
-  {
-    /* The specific error cause set at error detection stage has priority over the exception computed from the FSM
-       state */
-    eExceptionId = u_specific_LastExecError;
-  } /* else go ahead with the exception derived from the FSM state */
-
-  /* Take an immediate action */
-  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
-
-  /* Try to store the error inside the BootInfo structure */
-  (void)SFU_BOOT_SetLastExecError((uint32_t) eExceptionId);
-
-}
-
-/**
-  * @brief  Check exception code among the known list
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-SFU_ErrorStatus SFU_EXCPT_Check_Code(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  switch (eExceptionId)
-  {
-    case SFU_EXCPT_WATCHDOG_RESET :
-      break;
-    case SFU_EXCPT_MEMORY_FAULT :
-      break;
-    case SFU_EXCPT_HARD_FAULT :
-      break;
-    case SFU_EXCPT_TAMPERING_FAULT :
-      break;
-#ifdef SFU_GTZC_PROTECT_ENABLE
-    case SFU_EXCPT_GTZC_TZIC_FAULT :
-      break;
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-    case SFU_EXCPT_CHECK_PROTECTIONS_ERR :
-      break;
-    case SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR :
-      break;
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR :
-      break;
-    case SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR :
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-    case SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR :
-      break;
-    case SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_INSTALL_NEW_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR :
-      break;
-    case SFU_EXCPT_RESUME_INSTALL_NEW_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_EXECUTE_USER_FW_ERR :
-      break;
-    case SFU_EXCPT_LOCK_SE_SERVICES_ERR :
-      break;
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_FW_TOO_BIG :
-      break;
-    case SFU_EXCPT_COM_ERROR :
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-    case SFU_EXCPT_HEADER_AUTH_FAILED :
-      break;
-    case SFU_EXCPT_DECRYPT_FAILURE :
-      break;
-    case SFU_EXCPT_SIGNATURE_FAILURE :
-      break;
-    case SFU_EXCPT_FLASH_ERROR :
-      break;
-    case SFU_EXCPT_FWIMG_MAGIC :
-      break;
-    case SFU_EXCPT_FWIMG_SWAP :
-      break;
-    case SFU_EXCPT_FWIMG_ROLLBACK :
-      break;
-    case SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID :
-      break;
-    case SFU_EXCPT_INCORRECT_VERSION :
-      break;
-    case SFU_EXCPT_UNKNOWN :
-      break;
-    default :
-      break;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Stop in case of security error
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-void SFU_EXCPT_Security_Error(void)
-{
-  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
-  HAL_Delay(1000);
-  /* While(1) by-passed by an fault injection attack ==> Reset */
-  if (0U != SFU_MPU_IsUnprivileged())
-  {
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
-  }
-  else
-  {
-    NVIC_SystemReset();
-  }
-}
-
-/**
-  * @brief  SFU Exception Initialization.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_EXCPT_Init(void)
-{
-  SFU_ErrorStatus e_ret_status;
-
-  /* ADD SRC CODE HERE
-       ...
-  */
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU Exception DeInitialization.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_EXCPT_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status;
-  /* ADD SRC CODE HERE
-      ...
-  */
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Manage the Exception/Errors/Fault at reset,
-  *         after reading the stored values related to the last execution errors/status
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   this function is exported because the reset exceptions are also handled at boot time
-  *         when the last execution status is checked.
-  * @retval None
-  */
-void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-
-  switch (eExceptionId)
-  {
-
-    case SFU_EXCPT_WATCHDOG_RESET:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] WATCHDOG RESET FAULT!");
-      break;
-
-    default:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* As an example all the other errors/exceptions/fault retrieved at reset
-         and related to the previous execution can be managed at the same way of the
-         errors/exceptions/fault detected at runtime: See SFU_EXCPT_RuntimeExceptionHandler
-      */
-      break;
-  }
-}
-
-/**
-  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
-  * @param  eExceptionId : Exception ID.
-  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
-  * @note   A System Reset is forced at the end by the caller of this function.
-  *         WARNING: Be aware that this function can be called by an IRQ while
-  *         using the printf, since the printf is not a reentrant function, and using
-  *         the printf inside this function as well, a fault will likely occur.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
-{
-  switch (eExceptionId)
-  {
-    case SFU_EXCPT_TAMPERING_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at runt-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TAMPERING FAULT!");
-      break;
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-  case SFU_EXCPT_GTZC_TZIC_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at runt-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TZIC FAULT!");
-      break;
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-    case SFU_EXCPT_MEMORY_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at run-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] MEMORY FAULT!");
-      break;
-
-    case SFU_EXCPT_HARD_FAULT:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      /* WARNING: Please consider that at run-time,  this "case" execution is
-      inside an ISR */
-      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] HARD FAULT!");
-#ifdef SFU_TEST_PROTECTION
-      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
-         ==> this is not an error */
-#endif /* SFU_TEST_PROTECTION */
-      break;
-
-    case SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-        Add your code here in order to implement a custom action for this event,
-        e.g. trigger a mass erase or take any other action in order to
-        protect your system.
-        ...
-        ...
-      */
-      TRACE("\r\n= [EXCPT] CHECK ON-RESET FAILED!");
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] CHECK FOR NEW FW DOWNLOAD FAILED!");
-      break;
-
-    case SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FW DOWNLOAD FAILED!");
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO CHECK THE FW STATUS. FAILURE!");
-      break;
-
-    case SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] USER FW DECRYPTION FAILED!");
-      break;
-
-    case SFU_EXCPT_INSTALL_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] USER FW INSTALLATION FAILED!");
-      break;
-
-    case SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] USER FW CANNOT BE VERIFIED. FAILURE!");
-      break;
-
-    case SFU_EXCPT_RESUME_INSTALL_NEW_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] RESUME INSTALL NEW USER FW CANNOT BE EXECUTED. FAILURE!");
-      break;
-
-    case SFU_EXCPT_EXECUTE_USER_FW_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO EXECUTE THE NEW FW. FAILURE!");
-      break;
-
-    case SFU_EXCPT_UNKNOWN:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] UNKNOWN FAILURE!");
-      break;
-
-    case SFU_EXCPT_LOCK_SE_SERVICES_ERR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] CANNOT CONFIGURE SECURE ENGINE TO RUN THE FIRMWARE!");
-      break;
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-    case SFU_EXCPT_FW_TOO_BIG:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] BINARY IMAGE TOO BIG TO BE STORED IN DWL SLOT!");
-      break;
-
-    case SFU_EXCPT_COM_ERROR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] COM ERROR DURING DOWNLOAD !");
-      break;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-    case SFU_EXCPT_HEADER_AUTH_FAILED:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] HEADER AUTHENTICATION FAILURE!");
-      break;
-
-    case SFU_EXCPT_DECRYPT_FAILURE:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] DECRYPT FAILURE!");
-      break;
-
-    case SFU_EXCPT_SIGNATURE_FAILURE:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FIRMWARE SIGNATURE CHECK FAILED!");
-      break;
-
-    case SFU_EXCPT_FLASH_ERROR:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] FLASH ERROR!");
-      break;
-
-    case SFU_EXCPT_FWIMG_MAGIC:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] INTERNAL FWIMG ISSUE!");
-      break;
-
-    case SFU_EXCPT_FWIMG_SWAP:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO SWAP IMAGES!");
-      break;
-    case SFU_EXCPT_FWIMG_ROLLBACK:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] NOT POSSIBLE TO ROLLBACK IMAGES!");
-      break;
-    case SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] BACKED-UP IMAGE NOT IDENTIFIED FOR ROLLBACK!");
-      break;
-
-
-    case SFU_EXCPT_INCORRECT_VERSION:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] INSTALLATION CANCELLED: FORBIDDEN VERSION!");
-      break;
-
-    default:
-      /* WARNING: This might be generated by an attempted attack, a bug or your code!
-         Add your code here in order to implement a custom action for this event,
-         e.g. trigger a mass erase or take any other  action in order to
-         protect your system.
-         ...
-         ...
-      */
-      TRACE("\r\n= [EXCPT] UNKNOWN FAILURE!");
-      break;
-  }
-
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
deleted file mode 100644
index ed45b79a..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_error.h
-  * @author  MCD Application Team
-  * @brief   This file contains the error handling elements for SB_SFU.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_ERROR_H
-#define SFU_ERROR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * This enum must start from 0.
-  * When adding a new error in the enum below please also:
-  *  1. update IS_SFU_EXCPT
-  *  2. update m_aErrorStrings
-  */
-typedef enum
-{
-  SFU_EXCPT_NONE = 0UL,
-  /* System errors */
-  SFU_EXCPT_WATCHDOG_RESET,
-  SFU_EXCPT_MEMORY_FAULT,
-  SFU_EXCPT_HARD_FAULT,
-  SFU_EXCPT_TAMPERING_FAULT,
-#ifdef SFU_GTZC_PROTECT_ENABLE
-  SFU_EXCPT_GTZC_TZIC_FAULT,
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-  SFU_EXCPT_CHECK_PROTECTIONS_ERR,
-  /* Generic errors derived from the FSM state */
-  SFU_EXCPT_CHECK_STATUS_ON_RESET_ERR,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  SFU_EXCPT_CHECK_NEW_FW_TO_DOWNLOAD_ERR,
-  SFU_EXCPT_DOWNLOAD_NEW_USER_FW_ERR,
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-  SFU_EXCPT_VERIFY_USER_FW_STATUS_ERR,
-  SFU_EXCPT_DECRYPT_NEW_USER_FW_ERR,
-  SFU_EXCPT_INSTALL_NEW_USER_FW_ERR,
-  SFU_EXCPT_VERIFY_USER_FW_SIGNATURE_ERR,
-  SFU_EXCPT_RESUME_INSTALL_NEW_USER_FW_ERR,
-  SFU_EXCPT_EXECUTE_USER_FW_ERR,
-  /* Specific errors */
-  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
-  SFU_EXCPT_COM_ERROR,             /* COM error during the local download of the binary */
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-  SFU_EXCPT_HEADER_AUTH_FAILED,    /* header authentication failure */
-  SFU_EXCPT_DECRYPT_FAILURE,       /* Decrypt failure */
-  SFU_EXCPT_SIGNATURE_FAILURE,     /* Signature check failure */
-  SFU_EXCPT_FLASH_ERROR,           /* Problem with FLASH */
-  SFU_EXCPT_FWIMG_MAGIC,           /* Problem with a FWIMG pattern */
-  SFU_EXCPT_FWIMG_SWAP,            /* Problem while swapping the images */
-  SFU_EXCPT_FWIMG_ROLLBACK,        /* Problem during rollback process */
-  SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID,/* Backed-up firmware not identified */
-  SFU_EXCPT_INCORRECT_VERSION,     /* Anti-rollback check rejected the version to be installed */
-  /* Unknown error */
-  SFU_EXCPT_UNKNOWN
-} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
-
-/* External variables --------------------------------------------------------*/
-#ifdef SFU_DEBUG_MODE
-#if defined (SFU_BOOT_C)
-
-/**
-  *  The following strings associated to the exceptions/errors are used for debugging purpose.
-  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
-  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
-  */
-char *m_aErrorStrings[] =       {  "No error. Success.",
-                                   "Watchdog error.",
-                                   "Memory fault.",
-                                   "Hard fault.",
-                                   "Tampering fault.",
-                                   "Check protections error.",
-                                   "Check status on reset error.",
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-                                   "Check new user fw to download error.",
-                                   "Download new user fw error.",
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-                                   "Verify user fw status error.",
-                                   "Decrypt user fw error.",
-                                   "Install user fw error.",
-                                   "Verify user fw signature.",
-                                   "Resume install new user fw error.",
-                                   "Execute user fw error.",
-                                   "Max. Consecutive Errors reached.",
-                                   "SE lock cannot be set.",
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-                                   "Inconsistent FW size.",
-                                   "FW too big.",
-                                   "YMODEM com failure.",
-                                   "File not correctly received.",
-                                   "Header authentication failed.",
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-                                   "Decrypt failure.",
-                                   "Signature check failure.",
-                                   "Incorrect binary format (not encrypted).",
-                                   "Flash error.",
-                                   "FWIMG pattern issue.",
-                                   "Error while swapping the images in slot #0 and slot #1.",
-                                   "Firmware version rejected by anti-rollback check.",
-                                   "Unknown error."
-                                };
-
-#endif /* SFU_BOOT_C */
-#endif /* SFU_DEBUG_MODE */
-
-/* Exported macros -----------------------------------------------------------*/
-#define IS_SFU_EXCPT(EXCPT)  (SFU_EXCPT_Check_Code((EXCPT)) == SFU_SUCCESS) /*!< Check validity of exception Id */
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_BOOT_SetLastExecError(uint32_t uLastExecError);
-void SFU_BOOT_StateExceptionHandler(SFU_BOOT_StateMachineTypeDef eStateMachineState);
-void SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-SFU_ErrorStatus SFU_EXCPT_Check_Code(SFU_EXCPT_IdTypeDef eExceptionId);
-void SFU_EXCPT_Security_Error(void);
-
-SFU_ErrorStatus SFU_EXCPT_Init(void);
-SFU_ErrorStatus SFU_EXCPT_DeInit(void);
-
-void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_ERROR_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
deleted file mode 100644
index 3c40b4e0..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
+++ /dev/null
@@ -1,1184 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_common.c
-  * @author  MCD Application Team
-  * @brief   This file provides set of firmware functions to manage the Firmware Images.
-  *          This file contains the "common" functionalities of the image handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_FWIMG_COMMON_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "main.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "sfu_low_level.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "sfu_interface_crypto_scheme.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_fwimg_services.h"
-#include "sfu_fwimg_internal.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
-
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
-
-/* Global variables ----------------------------------------------------------*/
-/**
-  *  FWIMG status variables used to log errors and display debug messages.
-  *  This is related to FLASH operations.
-  *  This is handled with STATUS_FWIMG.
-  */
-SFU_IMG_StatusTypeDef SFU_IMG_Status;
-uint32_t SFU_IMG_Line;
-
-/**
-  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
-  */
-SE_FwRawHeaderTypeDef fw_image_header_validated;
-
-/**
-  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
-  */
-SE_FwRawHeaderTypeDef fw_image_header_to_test;
-
-/* Functions Definition : helper ---------------------------------------------*/
-/**
-  * @brief  Memory compare with constant time execution.
-  * @note   Objective is to avoid basic attacks based on time execution
-  * @param  pAdd1 Address of the first buffer to compare
-  * @param  pAdd2 Address of the second buffer to compare
-  * @param  Size Size of the comparison
-  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
-  */
-SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
-{
-  uint8_t result = 0x00U;
-  uint32_t i;
-
-  for (i = 0U; i < Size; i++)
-  {
-    result |= pAdd1[i] ^ pAdd2[i];
-  }
-
-  if (result == 0x00U)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-}
-
-
-/**
-  * @brief  Check header signature
-  * @param  pFwImageHeader: pointer to raw header.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef se_status;
-  uint8_t result = 0x00U;
-  uint32_t i;
-
-  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
-  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
-  {
-    /* Unused bytes should be set at 0x00 value
-       Comparison with constant time execution */
-    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
-    {
-      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
-    }
-
-    if (result == 0x00U)
-    {
-      /* Check signature of the FW header */
-      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
-      {
-        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
-  *        It handles Firmware TAG verification of a complete buffer by calling
-  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
-  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
-  *        and at the end compare the obtained TAG with the one provided as input
-  *        in pSE_GMCInit parameter.
-  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
-  * @param pSE_Status: Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param SlotNumber index of the slot in the list
-  * @param pSE_Metadata: Firmware metadata.
-  * @param pSE_Payload: pointer to Payload Buffer descriptor.
-  * @param SE_FwType: Type of Fw Image.
-  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
-                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
-                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
-{
-  SE_ErrorStatus se_ret_status = SE_ERROR;
-  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
-  /* Loop variables */
-  uint32_t i;
-  uint32_t j;
-  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
-  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
-  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
-  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
-  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
-  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(4)));
-  /* FW chunk produced by the verification procedure if any   */
-  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(4)));
-  /* FW chunk provided as input to the verification procedure */
-  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(4)));
-  /* Variables to handle the FW image (this will be split in chunks) */
-  uint32_t payloadsize;
-  uint32_t ppayload;
-  uint32_t scatter_nb;
-  /* Variables to handle FW image size and tag */
-  uint32_t fw_size;
-  uint8_t *fw_tag;
-
-  /* Check the pointers allocation */
-  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
-  {
-    return SFU_ERROR;
-  }
-  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Check the parameters value and set fw_size and fw_tag to check */
-  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
-  {
-    fw_size = pSE_Metadata->FwSize;
-    fw_tag = pSE_Metadata->FwTag;
-  }
-  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
-  {
-    fw_size = pSE_Metadata->PartialFwSize;
-    fw_tag = pSE_Metadata->PartialFwTag;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-   
-  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
-  {
-    return SFU_ERROR;
-  }
-
-  /*  fix number of scatter block */
-  if (pSE_Payload->PayloadSize[1] != 0U)
-  {
-    scatter_nb = 2U;
-  }
-  else
-  {
-    scatter_nb = 1U;
-  }
-
-
-  /* Encryption process*/
-  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
-
-  /* check for initialization errors */
-  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-  {
-    for (j = 0; j < scatter_nb; j++)
-    {
-      payloadsize = pSE_Payload->PayloadSize[j];
-      ppayload = pSE_Payload->pPayload[j];
-      i = 0;
-      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
-
-      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
-             (sfu_ret_status == SFU_SUCCESS))
-      {
-
-        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
-        if (sfu_ret_status == SFU_SUCCESS)
-        {
-          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
-                                                   fw_chunk, (int32_t *)&fw_chunk_size);
-        }
-        else
-        {
-          *pSeStatus = SE_ERR_FLASH_READ;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-        }
-        ppayload += fw_chunk_size;
-        fw_verified_total_size += fw_chunk_size;
-        i++;
-      }
-      /* this the last path , size can be smaller */
-      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
-      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-      {
-        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
-        if (sfu_ret_status == SFU_SUCCESS)
-        {
-
-          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
-                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)), 
-                                                   fw_chunk, (int32_t *)&fw_chunk_size);
-        }
-        else
-        {
-          *pSeStatus = SE_ERR_FLASH_READ;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-        }
-        fw_verified_total_size += fw_chunk_size;
-      }
-    }
-  }
-
-  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
-  {
-    if (fw_verified_total_size <= fw_size)
-    {
-      /* Do the Finalization, check the authentication TAG*/
-      fw_tag_len = sizeof(fw_tag_output);
-      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
-
-      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
-      {
-        /* Firmware tag verification */
-        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
-        {
-          *pSeStatus = SE_SIGNATURE_ERR;
-          se_ret_status = SE_ERROR;
-          sfu_ret_status = SFU_ERROR;
-
-          /* Save result for active slot :
-             to avoid single fault attack the signature will be double checked before UserApp execution */
-          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
-          {
-            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
-          }
-        }
-        else
-        {
-          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
-
-          /* Save result for active slot :
-             to avoid single fault attacje the signature will be doble checked before UserApp execution */
-          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
-          {
-            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag, SE_TAG_LEN);
-          }
-        }
-      }
-      else
-      {
-        sfu_ret_status = SFU_ERROR;
-      }
-    }
-    else
-    {
-      sfu_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    sfu_ret_status = SFU_ERROR;
-  }
-  return sfu_ret_status;
-}
-
-/**
-  * @brief Fill authenticated info in SE_FwImage.
-  * @param SFU_APP_Status
-  * @param pBuffer
-  * @param BufferSize
-  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
-{
-  /* Check the pointers allocation */
-  if ((pFwHeader == NULL) || (pBuffer == NULL))
-  {
-    return SFU_ERROR;
-  }
-  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Verify Image Header in the slot given as a parameter
-  * @param  SlotNumber index of the slot in the list
-  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
-  * @note   Not used in Alpha version -
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* use api read to detect possible ECC error */
-  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
-                                   sizeof(SE_FwRawHeaderTypeDef));
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Verify signature */
-    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Verify Fw signature of binary contiguous in flash
-  * @param  pSeStatus pointer giving the SE status result
-  * @param  SlotNumber flash slot to check
-  * @param  pFwImageHeader pointer to fw header
-  * @param  SlotNumber flash slot to check
-  * @param SE_FwType: Type of Fw Image.
-  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
-                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
-                                  uint32_t SE_FwType)
-{
-  SE_Ex_PayloadDescTypeDef  pse_payload;
-  uint32_t fw_size;
-  uint32_t fw_offset;
-
-  /*  put it OK, to discriminate error in SFU FWIMG parts */
-  *pSeStatus = SE_OK;
-
-  /* Check the parameters value */
-  if (pFwImageHeader == NULL)
-  {
-    return SFU_ERROR;
-  }
-  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Check SE_FwType parameter, and fix size and offset accordingly */
-  switch (SE_FwType)
-  {
-    case SE_FW_IMAGE_COMPLETE :
-      fw_size = pFwImageHeader->FwSize;
-      fw_offset = 0U;
-      break;
-    case SE_FW_IMAGE_PARTIAL :
-      fw_size = pFwImageHeader->PartialFwSize;
-#if  !defined(SFU_NO_SWAP)
-      fw_offset = pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
-#else
-      fw_offset = pFwImageHeader->PartialFwOffset;
-#endif /* !SFU_NO_SWAP */
-      break;
-    default :
-      /* error */
-      fw_size = 0U;
-      fw_offset = 0U;   
-      break;      
-  }
-
-  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
-  pse_payload.PayloadSize[0] = fw_size;
-  pse_payload.pPayload[1] = 0U;
-  pse_payload.PayloadSize[1] = 0U;
-
-  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
-}
-
-/**
-  * @brief Verifies the validity of a slot.
-  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
-  * @param pSlotBegin Start address of a slot.
-  * @param uSlotSize Size of a slot.
-  * @param uFwSize Size of the firmware image.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_LL_FLASH_write_t pattern1;
-  SFU_LL_FLASH_write_t pattern2;
-  SFU_LL_FLASH_write_t value;
-  uint32_t pdata;
-  uint32_t fw_size;
-  uint32_t slot_begin;
-
-  /* Set dimension to the appropriate length for FLASH programming.
-   * Example: 64-bit length for L4.
-   */
-  if ((uFwSize % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
-  {
-    fw_size = uFwSize + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (uFwSize % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-  }
-  else
-  {
-    fw_size = uFwSize;
-  }
-
-  /* Clean-up pattern initialization */
-  (void) memset((void *)&pattern1, 0xFF, sizeof(SFU_LL_FLASH_write_t));
-  (void) memset((void *)&pattern2, 0x00, sizeof(SFU_LL_FLASH_write_t));
-
-  /* Clean-up Check operation */
-  slot_begin = (uint32_t) pSlotBegin;
-  for (pdata = slot_begin + SFU_IMG_IMAGE_OFFSET + fw_size; 
-      (pdata < (slot_begin + uSlotSize)) && (e_ret_status == SFU_SUCCESS);
-       pdata += sizeof(SFU_LL_FLASH_write_t))
-  {
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check is already clean */
-      if ((memcmp((void *) &value, (void *) &pattern1, sizeof(SFU_LL_FLASH_write_t)) != 0) &&
-          (memcmp((void *) &value, (void *) &pattern2, sizeof(SFU_LL_FLASH_write_t)) != 0))
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    /* Reload watchdoag every 64Kbytes */
-    if ((pdata % 0x10000U) == 0U)
-    {
-      (void) SFU_LL_SECU_IWDG_Refresh();
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function clean-up the flash
-  * @note   Not designed to clean-up area inside secure engine isolation.
-  * @note   To clean the slot without erasing the header we write "0x00" except if already written
-  * @param  pSlotBegin Start address of a slot.
-  * @param  uSlotSize Size of a slot.
-  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t pdata;
-  uint32_t slot_begin;
-  SFU_LL_FLASH_write_t pattern;
-  SFU_LL_FLASH_write_t value;
-  SFU_FLASH_StatusTypeDef flash_if_info;
-
-  /* Clean-up pattern initialization */
-  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
-
-  /* Cleaning operation */
-  slot_begin = (uint32_t) pSlotBegin;
-  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
-  {
-    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* If read succeed, then the pattern write is performed only if pattern is not already present */
-      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
-      {
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
-                                          sizeof(SFU_LL_FLASH_write_t));
-      }
-    }
-    else
-    {
-      /* If read fail, then the write is performed unconditionally */
-      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
-                                        sizeof(SFU_LL_FLASH_write_t));
-    }
-
-    /* Reload Watchdog every 4Kbytes */
-    if ((pdata % 0x1000U) == 0U)
-    {
-      (void) SFU_LL_SECU_IWDG_Refresh();
-    }
-  }
-  return e_ret_status;
-}
-
-/* Functions Definition : services ------------------------------------------- */
-
-/**
-  * @brief FW Image Handling (FWIMG) initialization function.
-  *        Checks the validity of the settings related to image handling (slots size and alignments...).
-  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
-  *        used...etc...).
-  *        Must be called first (and once) before calling the other Image handling services.
-  * @param  None.
-  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
-  */
-SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
-{
-  uint32_t i;
-  uint32_t mpu_size;
-  uint32_t mpu_max_size;
-  uint32_t mpu_sub_size;
-  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
-#if  !defined(SFU_NO_SWAP)
-  SFU_IMG_InitStatusTypeDef e_swap_ret_status;
-#endif /*(GENERATOR_2_FW_IMAGE) && !(SFU_NO_SWAP) */
-
-  /*
-   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
-   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
-   * starting with 0s.
-   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
-   * side-effects).
-   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
-   */
-  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
-
-  /*
-   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
-      {
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
-              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
-      } /* else active slot is properly aligned */
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if (!IS_ALIGNED(SlotStartAdd[SLOT_DWL_1 + i]))
-      {
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-        TRACE("\r\n= [FWIMG] SLOT_DWL_%d (%x) is not properly aligned\r\n",
-              i + 1U, SlotStartAdd[SLOT_DWL_1 + 1U]);
-      } /* else dwl slot is properly aligned */
-    }
-  }
-
-
-  /*
-   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
-   */
-  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
-  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
-
-  /*
-   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
-   */
-  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
-  } /* else the FW Header Length is fine with regards to FLASH constraints */
-
-  /*
-   * Sanity check: let's make sure the chunks used for decrypt match the FLASH constraints
-   */
-  if (0U != (uint32_t)(SFU_IMG_CHUNK_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The size of the chunks used to store the decrypted data must be a multiple of the FLASH write length */
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] Decrypt chunk size (%d) is not matching the FLASH constraints\r\n", SFU_IMG_CHUNK_SIZE);
-  } /* else the decrypt chunk size is fine with regards to FLASH constraints */
-
-  /*
-   * Sanity check: let's make sure the chunk size used for decrypt is fine with regards to AES CBC constraints.
-   *               This block alignment constraint does not exist for AES GCM but we do not want to specialize the code
-   *               for a specific crypto scheme.
-   */
-  if (0U != (uint32_t)((uint32_t)SFU_IMG_CHUNK_SIZE % (uint32_t)AES_BLOCK_SIZE))
-  {
-    /* For AES CBC block encryption/decryption the chunks must be aligned on the AES block size */
-    e_ret_status = SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] Chunk size (%d) is not matching the AES CBC constraints\r\n", SFU_IMG_CHUNK_SIZE);
-  }
-
-  /*
-   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if(!((((SlotStartAdd[SLOT_ACTIVE_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
-        || (((SlotEndAdd[SLOT_ACTIVE_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
-      {
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-  /*
-   * Sanity check: let's make sure the dwl slot does not overlap SB code area protected by WRP
-   */
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else /* (__GNUC__) */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if(!((((SlotStartAdd[SLOT_DWL_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
-        || (((SlotEndAdd[SLOT_DWL_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
-      {
-        TRACE("\r\n= [FWIMG] SLOT_DWL_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-
-  /*
-   * Sanity check: let's make sure headers are under the MPU protection
-   */
-  /* Calculate size of image header MPU region */
-  mpu_max_size = 2U;
-  for (i = 0U; i < SFU_PROTECT_MPU_HEADER_SIZE; i++)
-  {
-    mpu_max_size = mpu_max_size * 2U;
-  }
-  /* Take into account 8 sub-regions (assuming they are continuous) */
-  mpu_sub_size = mpu_max_size / 8U;
-  mpu_size = 0U;
-  for (i = 0U; i < 8U; i++)
-  {
-    if (((~SFU_PROTECT_MPU_HEADER_SREG) & (0x1U << i)) != 0U)
-    {
-      mpu_size = mpu_size + mpu_sub_size;
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-#if defined(__GNUC__)
-    __IO uint32_t start_add;
-    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
-    if (start_add != 0U)
-#else
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-#endif /* (__GNUC__) */
-    {
-      if (!((SlotHeaderAdd[SLOT_ACTIVE_1 + i] >= SFU_PROTECT_MPU_HEADER_START)
-            && ((SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SE_FW_HEADER_TOT_LEN) <=
-                (SFU_PROTECT_MPU_HEADER_START + mpu_size))))
-      {
-        TRACE("\r\n= [FWIMG] Header of SLOT_ACTIVE_%d is not under the MPU protection\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
-   */
-  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
-        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
-  {
-    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-  }
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
-            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
-      {
-        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap dwl slot area
-   */
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      if (!(((SlotStartAdd[SLOT_DWL_1 + i]) > KMS_DATASTORAGE_END)
-            || ((SlotEndAdd[SLOT_DWL_1 + i]) < (KMS_DATASTORAGE_START))))
-      {
-        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_DWL_%d area\r\n", i + 1U);
-        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-      }
-    }
-  }
-
-#if  !defined(SFU_NO_SWAP)
-  /*
-   * Sanity check: specific swap process checks
-   */
-  e_swap_ret_status = SFU_IMG_CheckSwapImageHandling();
-  if (e_swap_ret_status != SFU_IMG_INIT_OK)
-  {
-    e_ret_status = e_swap_ret_status;
-  }
-#endif /* defined(SFU_NO_SWAP) */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief This function makes sure the current active firmware will not be considered as valid any more.
-  *        This function alters the FLASH content.
-  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *       running the procedure).
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Reload Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
-  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief Verifies the validity of the active firmware image metadata.
-  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
-  *       elements have been configured.
-  * @note This function populates the FWIMG module variable: fw_image_header_validated
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
-{
-  /*
-   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
-   */
-  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
-}
-
-/**
-  * @brief Verifies the validity of the active firmware image.
-  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
-  *       elements have been configured.
-  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
-  *       fw_image_header_validated.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status = SE_KO;
-
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (SFU_ERROR == e_ret_status)
-  {
-    /* We do not memorize any specific error, the FSM state is already providing the info */
-    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
-  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
-{
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
-}
-
-/**
-  * @brief Verifies if no malicious code in active slot.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
-{
-  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
-}
-
-/**
-  * @brief  Control firmware signature
-  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
-{
-  /*
-   * fw_image_header_validated MUST have been populated with valid metadata first,
-   */
-  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
-                    SE_TAG_LEN) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  else
-  {
-    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
-    return SFU_SUCCESS;
-  }
-
-}
-
-/**
-  * @brief Launches the user application.
-  *        The caller must be prepared to never get the hand back after calling this function.
-  *        If a problem occurs, it must be memorized in the bootinfo area.
-  *        If the caller gets the hand back then this situation must be handled as a critical error.
-  * @note It is up to the caller to make sure the conditions to call this primitive are met
-  *       (typically: no security check performed before launching the firmware).
-  * @note This function only handles the "system" aspects.
-  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
-  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
-  *       function (as this needs to be done just before jumping into the user application).
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Verify if authentication/integrity/lock SE service performed */
-  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
-
-  /* this function does not return */
-  /* first image identified as master image */
-  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET);
-
-  /* The point below should NOT be reached */
-  return (e_ret_status);
-}
-
-/**
-  * @brief Get the version of the active FW
-  * @note It is up to the caller to make sure the active slot contains a valid active FW.
-  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
-  *       fails.
-  * @param  SlotNumber index of the slot in the list
-  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
-  */
-uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
-{
-  SE_FwRawHeaderTypeDef fw_image_header;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint16_t version = 0;
-
-  /* check the header of the active FW */
-  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* retrieve the version from the header without any further check */
-    version = fw_image_header.FwVersion;
-  }
-
-  return (version);
-}
-
-/**
-  * @brief Detect if a FW is present in a slot.
-  * @note  Detection done based on MAGIC header + FW signature. Header verification
-  *        not done at this stage for timing optimization.
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *pbuffer;
-  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
-  SE_FwRawHeaderTypeDef *p_header;
-
-  /* Read header */
-  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
-  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
-  {
-    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
-    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
-    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
-    {
-      /*
-       * Control if the first 32 bytes (could be more but time consuming ...) are significants
-       * At this location we should find the vector table.
-       * Objective is to detect if the FW image has been erased
-       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
-       */
-      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Validate the active FW image in active slot by installing the header
-  * @param  SlotNumber index of the slot in the list
-  * @param  pFwImageHeader pointer in ram to the header to install
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-
-SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-
-  /* Header writing: encrypted part with signature */
-  e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
-                                    SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-
-  /* Header writing : Do not update image state part */
-
-  /* Header writing: previous FW image fingerprint */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
-                                                                 SE_FW_HEADER_FINGERPRINT_LEN),
-                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Get firmware image ID from header.
-  * @param  pFwImageHeader pointer to a structure to handle the header info
-  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
-  */
-uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  uint32_t active_slot;
-
-  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_1;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
-  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_2;
-  }
-#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
-  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    active_slot = SLOT_ACTIVE_3;
-  }
-#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
-  else
-  {
-    active_slot = SLOT_INACTIVE;
-  }
-
-  return active_slot;
-}
-
-/**
-  * @brief  Check candidate image version is allowed.
-  * @param  CurrentVersion Version of currently installed image if any
-  * @param  CandidateVersion Version of candidate image
-  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint16_t CurrentVersion, uint16_t CandidateVersion)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-
-  /* If the headre of the active firmware is not valid, the CurrentVersion is 0 */
-  if (CurrentVersion == 0U)
-  {
-    /*
-     * If the header of the active firmware is not valide (could comes from an attak atempt, we authorize only the 
-     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
-     */
-     if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
-     {
-       /* Candidate version is allowed */
-       e_ret_status = SFU_SUCCESS;
-     }
-  }
-  else
-  {
-    /*
-     * It is not allowed to install a Firmware with a lower version than the active firmware.
-     * But we authorize the re-installation of the current firmware version.
-     * We also check that the candidate version is at least the min. allowed version for this device.
-     */
-    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
-    {
-      /* Candidate version is allowed */
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief Verifies the validity of the metadata associated to a candidate image.
-  *        The anti-rollback check is performed.
-  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
-  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *       running the procedure):
-  *       SFU_IMG_CheckPendingInstallation should be called first.
-  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
-  *       @ref SFU_APP_VerifyFwHeader.
-  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
-  */
-
-/* anti-rollback mechanism is tested twice to avoid basic hardware attack
-   ==> compiler optimization is disabled for this reason */
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O0")))
-#endif /* __ICCARM__ */
-
-SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  uint32_t active_slot;
-  uint16_t curVer;
-
-  /*
-   * - Candidate FW Header Authentication
-   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
-   *       As a consequence: fw_image_header_to_test is already populated
-   *
-   * - Check version is allowed
-   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
-   */
-
-  /* Header analysis to find slot based on number with magic tag */
-  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
-
-  /* Get the version of active_slot */
-  curVer = SFU_IMG_GetActiveFwVersion(active_slot);
-
-  if (SFU_IMG_CheckFwVersion(curVer, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
-  {
-    /* The installation is forbidden */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    /* a FW with a lower version cannot be installed */
-    TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
-          fw_image_header_to_test.FwVersion, curVer, SFU_FW_VERSION_START_NUM);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-    /* Memorize this error as this will be handled as a critical failure */
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_INCORRECT_VERSION);
-
-    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-    /* leave now to handle the critical failure in the appropriate FSM state */
-    e_ret_status = SFU_ERROR;
-  }
-  else
-  {
-    /* the anti-rollback check succeeds: the version is fine */
-    /* double check to avoid basic hardware attack attack */
-    e_ret_status = SFU_IMG_CheckFwVersion(curVer, fw_image_header_to_test.FwVersion);
-  }
-
-  /* Return the result */
-  return (e_ret_status);
-}
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
deleted file mode 100644
index 8f731a2f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_internal.h
-  * @author  MCD Application Team
-  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
-  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
-  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
-  *          fw_image_header_to_test to install an KMS blob.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_INTERNAL_H
-#define SFU_FWIMG_INTERNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_fwimg_regions.h"
-#include "kms_blob_metadata.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Payload Buffer descriptor.
-  * This structure describes how a Firmware is split in Flash.
-  * In the nominal case a Firmware is stored in 1 contiguous area.
-  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
-  * decrypt operation).
-  */
-typedef struct
-{
-  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
-  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
-} SE_Ex_PayloadDescTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief SFU_IMG Flash Status Type Definition
-  * Status of a FLASH operation.
-  */
-typedef enum
-{
-  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
-  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
-  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
-  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
-} SFU_IMG_StatusTypeDef;
-
-/**
-  * @brief RAM chunk used for decryption / comparison / swap
-  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
-  * some function allocates 2 buffer of this size in stack.
-  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
-  */
-#define VALID_SIZE (3U*MAGIC_LENGTH)
-#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
-
-#define SFU_IMG_CHUNK_SIZE  (512UL)
-#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
-
-/* Exported macros -----------------------------------------------------------*/
-/**
-  * @brief  Status Macro
-  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
-  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
-  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
-  * activated) and the execution continues.
-  */
-#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
-#define STATUS_FWIMG(B,A) if (B) { \
-                                   SFU_IMG_Status=A; \
-                                   SFU_IMG_Line = __LINE__; \
-                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
-                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
-                                   while(1==1){;} \
-                                 } while(0==1){;}
-#else
-#define STATUS_FWIMG(B,A) if (B) { \
-                                   SFU_IMG_Status=A; \
-                                   SFU_IMG_Line = __LINE__; \
-                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
-                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
-                                 } while(0==1){;}
-#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
-
-/* External variables --------------------------------------------------------*/
-/**
-  *  FWIMG status variables used to log errors and display debug messages.
-  *  This is related to FLASH operations.
-  *  This is handled with STATUS_FWIMG.
-  */
-extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
-extern uint32_t SFU_IMG_Line;
-
-extern SE_FwRawHeaderTypeDef fw_image_header_validated;
-extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
-
-/* Exported functions : helper ---------------------------------------------- */
-SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
-SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
-                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
-                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
-SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
-                          uint8_t  *pPayload, uint32_t SE_FwType);
-SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
-SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
-                                  uint32_t SE_FwType);
-SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
-SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_INTERNAL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c
deleted file mode 100644
index 05b856c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c
+++ /dev/null
@@ -1,914 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_no_swap.c
-  * @author  MCD Application Team
-  * @brief   This file provides set of firmware functions to manage the Firmware Images.
-  *          This file contains the specific functionalities of the image handling for
-  *          the installation process without swap area.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_FWIMG_NO_SWAP_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "main.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "sfu_interface_crypto_scheme.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_fwimg_services.h"
-#include "sfu_fwimg_internal.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-
-
-#if  defined(SFU_NO_SWAP)
-/* Private macros ------------------------------------------------------------*/
-#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH)
-
-/*             DWL_SLOT_REGION_SIZE             */
-/* <------------------------------------------> */
-/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH| */
-/* | header 1     | header 2     |SWAP magic  | */
-
-#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A] + SLOT_SIZE(A) - TRAILER_HEADER))
-#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
-#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
-#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
-
-#endif /* defined(SFU_NO_SWAP) */
-
-/* Functions Definition : helper ---------------------------------------------*/
-#if  defined(SFU_NO_SWAP)
-
-/**
-  * @brief  Write Trailer Headers : TEST + VALID + SWAP
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                          SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  /* everything is in place , just compute from present data and write it */
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_info;
-  uint8_t  magic[MAGIC_LENGTH];
-  uint32_t buffer;
-
-  /* Write Headers VALID + TEST */
-  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
-                                    SE_FW_HEADER_TOT_LEN);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
-                                      SE_FW_HEADER_TOT_LEN);
-  }
-
-  /* Write Magic */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    buffer = (uint32_t) pValidHeader;
-    (void) memcpy(&magic[0U], (uint8_t *) (buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
-    buffer = (uint32_t) pTestHeader;
-    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *) (buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check the magic from trailer or counter
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
-{
-  uint8_t  magic[MAGIC_LENGTH];
-  uint8_t  signature_valid[MAGIC_LENGTH / 2];
-  uint8_t  signature_test[MAGIC_LENGTH / 2];
-  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
-
-  /* Pattern initialization */
-  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
-
-  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
-  if (SFU_LL_FLASH_Read(signature_valid,
-                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
-                        sizeof(signature_valid)) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(signature_test,
-                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
-                        sizeof(signature_test)) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /*
-   * Check magic validity :
-   *  - last 16 bytes of validated header
-   *  - last 16 bytes of test header
-   *  - significant values (not an erased flash pattern)
-   */
-  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
-      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
-      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0))
-  {
-    return SFU_ERROR;
-  }
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  check trailer validity to allow resume installation.
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus  CheckTrailerValid(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                          SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
-  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
-  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN + VALID_SIZE];
-
-  /*
-   *  Initial conditions to be fulfilled :
-   *   - Trailer magic is present
-   *   - Active slot number is correct
-   *   - test header from trailer is signed
-   */
-
-  /* check trailer Magic */
-  e_ret_status = CheckTrailerMagic(DwlSlot);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Populate the pTestHeader and verify it the active slot is correct */
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-  }  
-  
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Populate pTestHeader parameter */
-    e_ret_status= ParseFWInfo(pTestHeader, fw_header_trailer_test);
-  }
-  
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Active slot number correct ?
-       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
-    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
-    {
-      /* Check header test field in trailer is signed */
-      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Read header in active slot if any */
-  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                   sizeof(fw_header_active_slot));
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Verify the header signature in active slot */
-    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
-
-    /* Populate pValidHeader parameter */
-    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Read header valid field in trailer */
-      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
-                                     sizeof(fw_header_trailer_valid));
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-    }
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check if header in active slot is same as header valid in trailer */
-      if (memcmp(fw_header_active_slot, fw_header_trailer_test, sizeof(fw_header_trailer_test)) != 0)
-      {
-        /*
-         * Header in active slot is not identical to header valid field:
-         * Either install is already complete (if header in active slot is same as header test field in trailer),
-         * or there is hack tentative.
-         * In both cases, resume install must not be triggered.
-         */
-        e_ret_status = SFU_ERROR;
-      }
-      else
-      {
-        /* Check candidate image version */
-        e_ret_status = SFU_IMG_CheckFwVersion(pValidHeader->FwVersion, pTestHeader->FwVersion);
-      }
-    }
-    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
-  }
-  else
-  {
-    /*
-     * Header in active slot is not valid.
-     * It is considered this can not be hack attempt, because header in active slot is in
-     * protected area.
-     * Possible reasons:
-     * - Installation has been interrupted during very first image installation (active slot was empty)
-     * - Installation has been interrupted during reconstitution of first sector of active slot
-     * If header test field in trailer is signed and with proper version, we resume install.
-     */
-
-    /* Read header valid field in trailer */
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
-                                     sizeof(fw_header_trailer_valid));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check header valid field in trailer is signed */
-      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
-
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /* active slot was containing an active image */
-
-        /* Populate pValidHeader parameter */
-        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
-
-        if (e_ret_status == SFU_SUCCESS)
-        {
-          /* Check candidate image version */
-          e_ret_status = SFU_IMG_CheckFwVersion(pValidHeader->FwVersion, pTestHeader->FwVersion);
-        }
-      }
-      else
-      {
-        /* active slot was empty : we authorize only the installation of a specific version identified by 
-           SFU_FW_VERSION_INIT_NUM */
-        if (pTestHeader->FwVersion == SFU_FW_VERSION_INIT_NUM)
-        {
-          /* active slot was empty or was containing bricked Fw image */
-          e_ret_status = SFU_SUCCESS;
-        }
-      }
-    }
-
-    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Verify signature on encrypted FW
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus VerifyFwSignatureBeforeDecrypt(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-  SE_ErrorStatus   se_ret_status;
-  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint32_t fw_decrypted_chunk_size;
-#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  uint8_t fw_authenticated_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint32_t fw_authenticated_chunk_size;
-#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
-  uint32_t fw_index;
-  uint32_t size;
-  uint32_t fw_tag_len;
-  uint8_t fw_tag_output[SE_TAG_LEN];
-
-  /* Verify header presence */
-  if ((pFwImageHeader == NULL))
-  {
-    return e_ret_status;
-  }
-
-  /* Decryption process initialization
-     ================================= */
-  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
-  if (se_ret_status == SE_SUCCESS)
-  {
-#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-    se_ret_status = SE_AuthenticateFW_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
-#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
-
-    /* Skip header : no decryption needed */
-    fw_index = SFU_IMG_IMAGE_OFFSET;
-    
-    e_ret_status = SFU_SUCCESS;
-    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
-           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
-    {
-      /* Set size of reading/decryption */
-      size = SFU_IMG_CHUNK_SIZE;
-
-      /* Last pass ? */
-      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
-      {
-        /* Default chunk size can be troncated at end of file */
-        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
-      }
-
-      /* read then decrypt phase
-       ======================= */
-      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        fw_decrypted_chunk_size = size;
-        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
-                                          (int32_t *)&fw_decrypted_chunk_size);
-
-        if (se_ret_status == SE_SUCCESS)
-        {
-#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-          fw_authenticated_chunk_size = sizeof(fw_authenticated_chunk);
-          se_ret_status = SE_AuthenticateFW_Append(&e_se_status, fw_decrypted_chunk, (int32_t)size, fw_authenticated_chunk,
-                                                   (int32_t *)&fw_authenticated_chunk_size);
-#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
-          fw_index += size;
-        }
-      }
-    }
-  }
-
-  /* Do the Finalization, check the authentication TAG
-     ================================================= */
-  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
-  {
-    e_ret_status = SFU_ERROR;
-
-    /* Finalization stage */
-    fw_tag_len = sizeof(fw_tag_output);
-    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
-    if (se_ret_status == SE_SUCCESS)
-    {
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-      e_ret_status = SFU_SUCCESS;
-#else
-      fw_tag_len = sizeof(fw_tag_output);
-      se_ret_status = SE_AuthenticateFW_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
-      if ((se_ret_status == SE_SUCCESS) && (fw_tag_len == SE_TAG_LEN))
-      {
-        /* Firmware tag verification */
-        if (MemoryCompare(fw_tag_output, pFwImageHeader->FwTag, SE_TAG_LEN) == SFU_SUCCESS)
-        {
-          e_ret_status = SFU_SUCCESS;
-        }
-      }
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
-    }
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Decrypt Image from dwl slot to active slot
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus DecryptImageFromDwlSlotToActiveSlot(uint32_t ActiveSlot, uint32_t DwlSlot,
-                                                           SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-  SE_ErrorStatus   se_ret_status;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint32_t fw_index;
-  uint32_t size;
-  uint32_t fw_decrypted_chunk_size;
-  uint32_t fw_tag_len;
-  uint8_t fw_tag_output[SE_TAG_LEN];
-
-  TRACE("\r\n\t  Image preparation done.\r\n\t  Installation started ...");
-  
-  /* Verify header presence */
-  if ((pFwImageHeader == NULL))
-  {
-    return e_ret_status;
-  }
-  
-  /* Control the firwmare size vs slot size */ 
-  if ((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) > SLOT_SIZE(ActiveSlot))
-  {
-    return e_ret_status;
-  }
-  
-  /* Decryption process initialization
-     ================================= */
-  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
-  if (se_ret_status == SE_SUCCESS)
-  {
-
-    /* Erasing operation
-     ================= */
-
-    /*
-     *  The header may not be contiguous with the FW image : 2 erasing operations needed
-     */
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot], SFU_IMG_IMAGE_OFFSET);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
-                                             (uint8_t *)(SlotStartAdd[ActiveSlot] + SFU_IMG_IMAGE_OFFSET),
-                                             SLOT_SIZE(ActiveSlot) - SFU_IMG_IMAGE_OFFSET);
-    }
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-    /*
-     * Save immediately the new active FW header
-     */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_IMG_Validation(ActiveSlot, pFwImageHeader);
-      if (e_ret_status != SFU_SUCCESS)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [FWIMG] Header writing failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-    }
-
-    /* 
-     * Skip header : no decryption needed
-     */
-    fw_index = SFU_IMG_IMAGE_OFFSET;
-
-    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
-           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
-    {
-      /* Refresh Watchdog every 10 iterations */
-      if ((fw_index % 10U) != 0U)
-      {
-        (void) SFU_LL_SECU_IWDG_Refresh();
-      }
-
-      /* Set size of reading/decryption */
-      size = SFU_IMG_CHUNK_SIZE;
-
-      /* Last pass ? */
-      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
-      {
-        /* Default chunk size can be troncated at end of file */
-        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
-      }
-
-      /* read then decrypt phase
-       ======================= */
-      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        fw_decrypted_chunk_size = size;
-        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
-                                          (int32_t *)&fw_decrypted_chunk_size);
-
-        /*
-        * writing phase
-        * =============== */
-        if (se_ret_status == SE_SUCCESS)
-        {
-          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotStartAdd[ActiveSlot] + fw_index),
-                                            fw_decrypted_chunk, size);
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-
-          /* Update pointer */
-          fw_index += size;
-        }
-      }
-    }
-  }
-
-#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_index);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-#endif /* SFU_ENCRYPTED_IMAGE */
-
-  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
-  {
-    /* Do the Finalization, check the authentication TAG*/
-    fw_tag_len = sizeof(fw_tag_output);
-    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
-    if (se_ret_status != SE_SUCCESS)
-    {
-      e_ret_status = SFU_ERROR;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Install the new version
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                         SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef x_flash_info;
-
-  /* Verify FW Image signature in dwl slot */
-  e_ret_status = VerifyFwSignatureBeforeDecrypt(DwlSlot, pTestHeader);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_SIGNATURE_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] The decrypted image is incorrect!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-   * Control if there is no additional code beyond the firmware image (malicious SW)
-   */
-  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot), pTestHeader->FwSize);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Additional code detected beyond FW image!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-   * Write trailer : memorize installation process started
-   */
-  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t) SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Trailer update failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-    
-  /*
-   * Decrypt the FW image : from dwl slot to active slot
-   */
-  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, pTestHeader);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Decryption failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-   * erase downloaded FW after installation
-   */
-  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Dwl slot erasing failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief  Check that there is an Image to Install
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header to be populated
-  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
-  */
-static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
-  uint32_t end_of_test_image;
-
-  /* Verify FW Image Header tag in dwl slot */
-  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* image header in dwl slot not consistent with swap header */
-    end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
-                         SFU_IMG_IMAGE_OFFSET);
-
-    /* Check if there is enough room for the trailers */
-    if (trailer_begin < end_of_test_image)
-    {
-      /*
-       * This error causes is not memorized in the BootInfo area because there won't be any error handling
-       * procedure.
-       * If this function returns that no new firmware can be installed (as this may be a normal case).
-       */
-      e_ret_status = SFU_ERROR;
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      /* Display the debug message(s) only once */
-      if (1U == initialDeviceStatusCheck)
-      {
-        TRACE("\r\n= [FWIMG] The binary image to be installed overlap with the trailer area!");
-      }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-}
-#endif /* (SFU_NO_SWAP) */
-
-
-
-/* Functions Definition : services ------------------------------------------- */
-
-#if  defined(SFU_NO_SWAP)
-/**
-  * @brief Checks if there is a pending firmware installation.
-  *        2 situations can occur:
-  *        A. Pending firmware installation: a firmware is ready to be installed.
-  *        B. No firmware installation pending
-  * @note  The anti-rollback check is not taken into account at this stage.
-  * @note  This function populates the FWIMG module variables: fw_image_header_to_test
-  * @param  pDwlSlotToInstall identification of the downloaded slot to install
-  * @param  pActiveSlotToResume identification of the active slot to resume
-  * @param  pActiveSlotToRollback identification of the active slot to rollback
-  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, no pending action)
-  */
-SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
-                                                                uint32_t *pActiveSlotToResume, \
-                                                                uint32_t *pActiveSlotToRollback)
-{
-  SFU_IMG_ImgInstallStateTypeDef e_ret_state = SFU_IMG_NO_FWUPDATE;
-  uint32_t i;
-  uint32_t j;
-
-  /* No rollback capability in "NO_SWAP" configuration */
-  *pActiveSlotToResume = SLOT_INACTIVE;
-  *pActiveSlotToRollback = SLOT_INACTIVE;
-  *pDwlSlotToInstall = SLOT_INACTIVE;
-
-  /* Check image installation stopped
-     ================================ */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      /* Check trailer valide : installation stopped ?
-         ============================================= */
-      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
-      {
-        /* Slot configured ? */
-        if (SlotStartAdd[SLOT_ACTIVE_1 + j] != 0U)
-        {
-          if (SFU_SUCCESS == CheckTrailerValid(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
-                                               &fw_image_header_to_test))
-          {
-            /* A Firmware Update has been stopped
-             * fw_image_header_to_test & fw_image_header_validated have been populated
-             * Stop at first occurrence : next ones if any will be resumed after reset
-             */
-            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
-            *pDwlSlotToInstall = SLOT_DWL_1 + j;
-            return SFU_IMG_FWUPDATE_STOPPED;
-          }
-        }
-      }
-    }
-  }
-
-  /* Install new firmware if requested
-     ================================= */
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + i, &fw_image_header_to_test))
-      {
-        /*
-         * A Firmware is available for installation:
-         * fw_image_header_to_test has been populated
-         * Stop at first occurrence : next ones if any will be installed after reset
-         */
-        e_ret_state = SFU_IMG_FWIMAGE_TO_INSTALL;
-        *pDwlSlotToInstall = SLOT_DWL_1 + i;
-        break;
-      }
-    }
-  }
-
-  return e_ret_state;
-}
-
-/**
-  * @brief Resume installation : not required but present for compatibility with swap process
-  *        If installation procedure is interrupted (e.g.: switch off) it will be restarted from begin at next reboot.
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS
-  */
-SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef x_flash_info;
- 
-  /*
-   * Decrypt the FW image : from dwl slot to active slot
-   */
-  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, &fw_image_header_to_test);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Decryption failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-  /*
-   * erase downloaded FW after installation
-   */
-  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Dwl slot erasing failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Resume procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Resume procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return (e_ret_status);
-}
-
-/**
-  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
-  *        valid if the checks are successful.
-  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
-  *        afterwards if the cryptographic scheme allows this (signature check for instance).
-  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
-  *        This function modifies the FLASH content.
-  *        If this procedure is interrupted (e.g.: switch off) installation will be restarted from begin at next reboot.
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *pbuffer;
-  uint32_t active_slot;
-
-  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
-
-  /*
-   * Check the active slot is big enough
-   */
-  if (fw_image_header_to_test.FwSize + SFU_IMG_IMAGE_OFFSET <= SLOT_SIZE(active_slot))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  /*
-   * Populate fw_image_header_validated
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
-                                     sizeof(fw_image_header_validated));
-  }
-  
-  /*
-   * Installing the new firmware image consists in decrypting the candidate firmware image.
-   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
-  }
-
-  if (SFU_SUCCESS != e_ret_status)
-  {
-    /* Erase downloaded FW in case of installation  error */
-    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Installation procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Installation procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  /* return the installation result */
-  return (e_ret_status);
-}
-#endif /* (SFU_NO_SWAP) */
-
-
-#if   defined(SFU_NO_SWAP)
-/**
-  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
-{
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
-
-  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
-                                             SLOT_SIZE(DwlSlot));
-  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-  return ((e_ret_status_dwl != SFU_SUCCESS) ?  SFU_ERROR : SFU_SUCCESS);
-}
-
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SFU_NO_SWAP) */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
deleted file mode 100644
index 4dff5f1f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_services.h
-  * @author  MCD Application Team
-  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
-  *          API definitions.
-  *          These services can be called by the bootloader to deal with images handling.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_SERVICES_H
-#define SFU_FWIMG_SERVICES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU_IMG Initialization Status Type Definition
-  */
-typedef enum
-{
-  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
-  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
-  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
-  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
-  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
-  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
-} SFU_IMG_InitStatusTypeDef;
-
-/**
-  * @brief  SFU_IMG Image Installation State Type Definition
-  */
-typedef enum
-{
-  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
-  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
-  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
-  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
-} SFU_IMG_ImgInstallStateTypeDef;
-
-/* Exported functions ------------------------------------------------------- */
-SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
-SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
-SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
-                                                                uint32_t *pActiveSlotToResume, \
-                                                                uint32_t *pActiveSlotToRollback);
-SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
-SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
-SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
-SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber);
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
-uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
-uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
-SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
-SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
-uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
-SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint16_t CurrentVersion, uint16_t CandidateVersion);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_SERVICES_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c
deleted file mode 100644
index 8cdf7bf2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c
+++ /dev/null
@@ -1,2354 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_swap.c
-  * @author  MCD Application Team
-  * @brief   This file provides set of firmware functions to manage the Firmware Images.
-  *          This file contains the specific functionalities of the image handling for
-  *          the installation process with swap area.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_FWIMG_SWAP_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "main.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "sfu_interface_crypto_scheme.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_fwimg_services.h" /* to have definitions like SFU_IMG_InitStatusTypeDef
-                                   (required by sfu_fwimg_internal.h) */
-#include "sfu_fwimg_internal.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-
-#if  !defined(SFU_NO_SWAP)
-
-/* Private macros ------------------------------------------------------------*/
-#define TRAILER_INDEX(A)  (SLOT_SIZE(A) / SLOT_SIZE(SLOT_SWAP))
-/*  position of image begin on 1st block */
-#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH + MAGIC_LENGTH)
-
-/*                                         DWL_SLOT_REGION_SIZE                                             */
-/* <----------------------------------------------------------------------------------------------------->  */
-/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH|N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t) */
-/* | header 1     | header 2     |SWAP magic  |CLEAN pat.  | N*CPY_TO_ACTIVE_SLOT  | N*CPY_TO_DWL_SLOT      */
-/*                                                                                                          */
-/* Please note that the size of the trailer area (N*CPY_TO_SLOTx) depends directly on SFU_LL_FLASH_write_t type, */
-/* so it can differ from one platform to another (this is FLASH-dependent)                                       */
-#define TRAILER_SIZE(A) ((sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A)))\
-                         + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) + (uint32_t)(TRAILER_HEADER))
-#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A]\
-                                        + SLOT_SIZE(A) - TRAILER_SIZE(A)))
-#define TRAILER_CPY_TO_DWL_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
-                                              + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) \
-                                              + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
-#define TRAILER_CPY_TO_ACTIVE_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
-                                                 + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
-
-#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
-#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
-#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
-#define TRAILER_CLEAN_ADDR(A)((uint8_t *)(TRAILER_BEGIN(A)\
-                                          + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH))
-
-#define CHUNK_1_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
-                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
-#define CHUNK_0_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
-                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
-
-#define CHUNK_0_ADDR_HEADER(A,B,C) ((((B)==0) && ((C)==0))?\
-                                    (uint8_t *)(SlotHeaderAdd[(A)]) : \
-                                    (uint8_t *)(SlotStartAdd[(A)]\
-                                                +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
-
-#define CHUNK_0_ADDR_MODIFIED(A,B,C) ((((B)==0) && ((C)==0))?\
-                                      ((uint8_t*)(SlotStartAdd[(A)] + SFU_IMG_IMAGE_OFFSET)) : \
-                                      ((uint8_t*)(SlotStartAdd[(A)] + (SLOT_SIZE(SLOT_SWAP)*(B)) \
-                                                  + (SFU_IMG_CHUNK_SIZE*(C)))))
-#define CHUNK_SWAP_ADDR(B) ((uint8_t *)(SlotStartAdd[SLOT_SWAP]+(SFU_IMG_CHUNK_SIZE*(B))))
-
-/* Private variables ----------------------------------------------------------*/
-/* Trailer pattern : sizeof of write access type */
-static const int8_t SWAPPED[sizeof(SFU_LL_FLASH_write_t)] __attribute__((aligned(4))) = {0, 0, 0, 0, 0, 0, 0, 0};
-static const int8_t NOT_SWAPPED[sizeof(SFU_LL_FLASH_write_t)] __attribute__((aligned(4))) = {-1, -1, -1, -1, -1, -1,
-                                                                                             -1, -1};
-
-/* Functions Definition : helper ---------------------------------------------*/
-#if defined(ENABLE_IMAGE_STATE_HANDLING)
-/**
-  * @brief  Checks if a rollback is required
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_SUCCESS if Image should be rollbacked, a SFU_ERROR  otherwise.
-  */
-static SFU_ErrorStatus FirmwareToRollback(uint32_t SlotNumber, SE_FwStateTypeDef MasterSlotState)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_ErrorStatus e_ret_status_se;
-  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
-  SE_StatusTypeDef e_se_status;
-  SE_FwStateTypeDef e_next_image_state;
-
-
-  /* If an image is detected, read the image state :
-   * if image is new, nothing to do. Switch from NEW to SELFTEST will be done before when launching user application.
-   * if image is selftest, set to invalid. Rollback required.
-   * if image is valid, nothing to do.
-   * if image is invalid, Rollback is required.
-   */
-  if (SFU_SUCCESS == SFU_IMG_DetectFW(SlotNumber))
-  {
-    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
-    if (e_ret_status_se == SE_SUCCESS)
-    {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d state = %d", SlotNumber, image_state);
-#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
-      switch (image_state)
-      {
-        case FWIMG_STATE_NEW:
-        {
-          /* Multiple reset can occur during installation
-           * Switch from NEW to SELFTEST will be done before when launching user application
-           */
-          break;
-        }
-        case FWIMG_STATE_SELFTEST:
-        {
-          if (MasterSlotState == FWIMG_STATE_VALID_ALL)
-          {
-            /* Master slot is in VALID_ALL state, all other images should be validated
-             * Compare to successive validation operations VALID_ALL is a single request thus robust to reset
-             */
-            e_next_image_state = FWIMG_STATE_VALID;
-            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
-            e_ret_status = SFU_ERROR;
-          }
-          else
-          {
-            /* Bootloader should never find an image in SELFTEST state - bootloader
-             * assumes self test was not able to complete and marks image as INVALID
-             */
-            e_next_image_state = FWIMG_STATE_INVALID;
-            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
-            e_ret_status = SFU_SUCCESS;
-          }              
-          break;
-        }
-        case FWIMG_STATE_VALID:
-        case FWIMG_STATE_VALID_ALL:
-        {
-          break;
-        }
-        default:
-        {
-          /* image may be in INVALID state 
-           * Image marked as invalid failed selftest so we need to attempt a rollback to last good image
-           */
-          e_ret_status = SFU_SUCCESS;
-          break;
-        }
-      }
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Updates the finger print of the new firmware the header signature of the previous firmware
-  * @param  pNewHeader: pointer in ram to header of new installed fw
-  * @param  pPrevHeader: pointer in ram to header of backed-up fw
-  * @retval none
-  */
-static void UpdateHeaderFingerPrint(SE_FwRawHeaderTypeDef *pNewHeader, SE_FwRawHeaderTypeDef *pPrevHeader)
-{
-  (void) memcpy(pNewHeader->PrevHeaderFingerprint, pPrevHeader->HeaderSignature, sizeof(pNewHeader->PrevHeaderFingerprint));
-}
-#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
-
-/**
-  * @brief  Check the magic from trailer or counter
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
-{
-  uint8_t  magic[MAGIC_LENGTH];
-  uint8_t  clean[MAGIC_LENGTH];
-  uint8_t  signature_valid[MAGIC_LENGTH / 2];
-  uint8_t  signature_test[MAGIC_LENGTH / 2];
-  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
-
-  /* Pattern initialization */
-  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
-
-  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
-  if (SFU_LL_FLASH_Read(signature_valid,
-                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
-                        sizeof(signature_valid)) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(signature_test,
-                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
-                        sizeof(signature_test)) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-  if (SFU_LL_FLASH_Read(clean, TRAILER_CLEAN_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /*
-   * Check magic validity :
-   *  - last 16 bytes of validated header
-   *  - last 16 bytes of test header
-   *  - significant values (not an erased flash pattern)
-   *
-   *  Check clean tag not set :
-   *  - should be erased flash pattern but not clean-up paatern (0x55 0x55 ...)
-   */
-  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
-      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
-      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0)
-      || (memcmp(clean, erased_flash_pattern, MAGIC_LENGTH) != 0))
-  {
-    return SFU_ERROR;
-  }
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Write the minimum value possible on the flash
-  * @param  pAddr: pointer to address to write .
-  * @param  pValue: pointer to the value to write
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  *
-  * @note This function should be FLASH dependent.
-  *       We abstract this dependency thanks to the type SFU_LL_FLASH_write_t.
-  *       See @ref SFU_LL_FLASH_write_t
-  */
-static SFU_ErrorStatus AtomicWrite(uint8_t *pAddr, SFU_LL_FLASH_write_t *pValue)
-{
-  SFU_FLASH_StatusTypeDef flash_if_info;
-
-  return SFU_LL_FLASH_Write(&flash_if_info, pAddr, (uint8_t *)pValue, sizeof(SFU_LL_FLASH_write_t));
-}
-
-/**
-  * @brief  Clean Magic value
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus CleanMagicValue(uint32_t DwlSlot)
-{
-  SFU_FLASH_StatusTypeDef flash_if_info;
-  uint8_t clean_tag[MAGIC_LENGTH];
-
-  /* set the clean tag into trailer */
-  (void) memset(clean_tag, 0x55, MAGIC_LENGTH);
-  return SFU_LL_FLASH_Write(&flash_if_info, TRAILER_CLEAN_ADDR(DwlSlot), clean_tag, MAGIC_LENGTH);
-}
-
-/**
-  * @brief  Write Trailer Headers : TEST + VALID + SWAP
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                          SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  /* everything is in place , just compute from present data and write it */
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_info;
-  uint8_t  magic[MAGIC_LENGTH];
-  uint32_t buffer;
-
-  /* Write Headers VALID + TEST */
-  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
-                                    SE_FW_HEADER_TOT_LEN);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
-                                      SE_FW_HEADER_TOT_LEN);
-  }
-
-  /* Write Magic */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    buffer = (uint32_t) pValidHeader;
-    (void) memcpy(&magic[0U], (uint8_t *) (buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
-    buffer = (uint32_t) pTestHeader;
-    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *) (buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
-    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Erase the size of the swap area in a given slot sector.
-  * @note   The erasure occurs at @: @slot + index*swap_area_size
-  * @param  SlotNumber index of the slot in the list
-  * @param  Index This is the number of "swap size" we jump from the slot start
-  * @retval SFU_ SUCCESS if valid, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus EraseSlotIndex(uint32_t SlotNumber, uint32_t index)
-{
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t buffer;
-
-  buffer = SlotStartAdd[SlotNumber];
-  buffer = buffer + (SLOT_SIZE(SLOT_SWAP) * index);
-
-  /* If this is an active slot and the index is 0 then header is concerned */
-  if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber <= (SLOT_ACTIVE_1 + SFU_NB_MAX_ACTIVE_IMAGE)) && (index == 0U))
-  {
-
-    /*
-     *  As the header may not be contiguous with FW, this action is split in 2 actions :
-     *    - HEADER : executed in secured environment
-     *    - remaining part : done by SBSFU
-     */
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber],
-                                           SFU_IMG_IMAGE_OFFSET) ;
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SlotNumber] +
-                                             SFU_IMG_IMAGE_OFFSET, SLOT_SIZE(SLOT_SWAP) - SFU_IMG_IMAGE_OFFSET);
-    }
-  }
-  else
-  {
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)buffer, SLOT_SIZE(SLOT_SWAP)) ;
-  }
-
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
-  return e_ret_status;
-}
-
-/**
-  * @brief  Verify image signature of binary after decryption
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pSeStatus pointer giving the SE status result
-  * @param  pFwImageHeader pointer to fw header
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus VerifyFwSignatureAfterDecrypt(SE_StatusTypeDef *pSeStatus, uint32_t DwlSlot,
-                                                     SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SE_Ex_PayloadDescTypeDef payload_desc;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t fw_size;
-  uint32_t fw_offset;
-
-  /*
-   * The values below are not necessarily matching the way the firmware
-   * has been spread in FLASH but this is adjusted later on in the this function.
-   */
-  payload_desc.pPayload[0] = SlotStartAdd[SLOT_SWAP];
-  payload_desc.PayloadSize[0] = SLOT_SIZE(SLOT_SWAP);
-  payload_desc.pPayload[1] = SlotStartAdd[DwlSlot];
-  payload_desc.PayloadSize[1] = SLOT_SIZE(DwlSlot);
-
-  fw_size = pFwImageHeader->PartialFwSize;
-  fw_offset = (SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
-              SLOT_SIZE(SLOT_SWAP);
-
-  /*
-   * Adjusting the description of the way the Firmware is written in FLASH.
-   */
-  payload_desc.pPayload[0] = payload_desc.pPayload[0] + fw_offset;
-
-  /* The first part contains the execution offset so the payload size must be adjusted accordingly */
-  payload_desc.PayloadSize[0] = payload_desc.PayloadSize[0] - fw_offset;
-
-  if (fw_size <= payload_desc.PayloadSize[0])
-  {
-    /* The firmware is written fully in a contiguous manner */
-    payload_desc.PayloadSize[0] = fw_size;
-    payload_desc.PayloadSize[1] = 0U;
-    payload_desc.pPayload[1] = 0U;
-  }
-  else
-  {
-    /*
-     * The firmware is too big to be contained in the first payload slot.
-     * So, the firmware is split in 2 non-contiguous parts
-     */
-
-    if ((payload_desc.pPayload[1] == 0U)
-        || (payload_desc.PayloadSize[1] < (fw_size - payload_desc.PayloadSize[0])))
-    {
-      return  e_ret_status;
-    }
-
-    /* The second part contains the end of the firmware so the size is the total size - size already stored in the
-       first area */
-    payload_desc.PayloadSize[1] = fw_size - payload_desc.PayloadSize[0];
-
-  }
-
-  /* Signature Verification */
-  return VerifyFwSignatureScatter(pSeStatus, DwlSlot, pFwImageHeader, &payload_desc, SE_FW_IMAGE_PARTIAL);
-}
-
-
-/**
-  * @brief  Swap active slot with decrypted FW to install
-  *         With the 2 images implementation, installing a new Firmware Image means swapping active slot and dwl slot.
-  *         To perform this swap, the image to be installed is split in blocks of the swap size:
-  *         SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP) blocks to be swapped .
-  *         Each of these blocks is swapped using smaller chunks of SFU_IMG_CHUNK_SIZE size.
-  *         The swap starts from the tail of the image and ends with the beginning of the image ("swap from tail to
-  *         head").
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer in ram to the header to install
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus SwapFirmwareImages(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  SFU_LL_FLASH_write_t trailer;
-  int32_t index_active_slot;
-  int32_t index_dwl_slot_write;
-  int32_t index_dwl_slot_read;
-  int32_t chunk;
-  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  int32_t index_active_slot_partial_begin;
-  int32_t index_active_slot_partial_end;
-  int32_t index_active_slot_final_end;
-  int32_t index_dwl_slot_partial_end;
-  int32_t index_active_slot_empty_begin;
-  /* number_of_index_active_slot is the number of blocks in active slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
-  uint32_t number_of_index_active_slot = SLOT_SIZE(ActiveSlot) / SLOT_SIZE(SLOT_SWAP);
-  /* number_of_index_dwl_slot is the number of blocks in dwl slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
-  uint32_t number_of_index_dwl_slot = SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP);
-  /* number_of_chunk is the number of chunks used to swap 1 block (moving a block of SLOT_SIZE(SLOT_SWAP) bytes
-     split in number_of_chunk chunks of SFU_IMG_CHUNK_SIZE bytes) */
-  uint32_t number_of_chunk = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
-  uint32_t write_len;
-  uint32_t offset_block_partial_begin;
-  uint32_t offset_block_partial_end;
-  uint32_t offset_block_final_end;
-
-  TRACE("\r\n\t  Image preparation done.\r\n\t  Swapping the firmware images");
-
-  /* index_active_slot_partial_begin is the index of first block (of SLOT_SIZE(SLOT_SWAP) bytes) in active slot
-     impacted by partial image */
-  index_active_slot_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) /
-                                    SLOT_SIZE(SLOT_SWAP);
-
-  /* offset_block_partial_begin is the offset of first byte of partial image inside index_active_slot_partial_begin
-     block */
-  offset_block_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) %
-                               SLOT_SIZE(SLOT_SWAP);
-
-  /* In case of COMPLETE update, the full slots are swapped
-     Assumption : DwlSlot is at least greater than ActiveSlot */
-  if ((pFwImageHeader->FwSize == pFwImageHeader->PartialFwSize) && (SLOT_SIZE(DwlSlot) >= SLOT_SIZE(ActiveSlot)))
-  {
-    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       partial image in active slot */
-    index_active_slot_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
-
-    /* offset_block_partial_end is the offset of first byte following partial image, inside
-       index_active_slot_partial_end block */
-    offset_block_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
-
-    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       partial image in dwl slot or swap area */
-    index_dwl_slot_partial_end = ((SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP)) - 1U;
-
-    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following final
-       image in active slot */
-    index_active_slot_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
-
-    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
-       block */
-    offset_block_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
-
-    /* set index_dwl_slot_write: starting from the end */
-    index_dwl_slot_write = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
-
-  }
-  else
-  {
-    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       partial image in active slot */
-    index_active_slot_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
-                                     pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP);
-
-    /* offset_block_partial_end is the offset of first byte following partial image, inside
-       index_active_slot_partial_end block */
-    offset_block_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
-                                pFwImageHeader->PartialFwSize) % SLOT_SIZE(SLOT_SWAP);
-
-    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       partial image in dwl slot or swap area */
-    index_dwl_slot_partial_end = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
-                                                            SLOT_SIZE(SLOT_SWAP))) % SLOT_SIZE(SLOT_SWAP) +
-                                   pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP)) - 1U;
-
-    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
-       final image in active slot */
-    index_active_slot_final_end = ((SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) / SLOT_SIZE(SLOT_SWAP));
-
-    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
-       block */
-    offset_block_final_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) % SLOT_SIZE(SLOT_SWAP);
-
-    /* set index_dwl_slot_write: starting from the end, block index in dwl slot or swap area to receive block from
-       active slot */
-    if (index_active_slot_partial_end == (number_of_index_active_slot - 1))
-    {
-      /* last block of dwl slot can only receive last block of active slot, due to trailer presence */
-      index_dwl_slot_write = number_of_index_dwl_slot - 1;
-    }
-    else
-    {
-      index_dwl_slot_write = number_of_index_dwl_slot - 2;
-    }
-  }
-
-  /* set index_active_slot: starting from the end, block index from active slot to copy in dwl slot */
-  index_active_slot = index_active_slot_partial_end;
-
-  /* set index_dwl_slot_read: starting from the end, block index in dwl slot or swap area to copy updated image to
-     active slot */
-  index_dwl_slot_read = index_dwl_slot_partial_end;
-
-  /* Adjust indexes in case offset is 0: in this case, first block to swap is the previous one */
-  if (offset_block_partial_end == 0)
-  {
-    index_active_slot--;
-    index_dwl_slot_read--;
-  }
-
-  /*
-   * dwl slot read index should be lower than dwl slot write index.
-   * If not the case, the dwl slot is not big enough to manage this partial firmware image
-   * (depends on offset and size).
-   */
-  if (index_dwl_slot_read >= index_dwl_slot_write)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Swap one block at each loop, until all targeted blocks of active slot have been copied
-   * Concerned blocks are:
-   * 1- block impacted by partial image
-   * 2- first block containing the header
-   */
-  while (index_active_slot >= 0)
-  {
-    /* Reload watchdoag every SWAP size */
-    SFU_LL_SECU_IWDG_Refresh();
-
-    TRACE(".");
-
-    if ((index_dwl_slot_write < -1) || (index_dwl_slot_read < -1))
-    {
-      return SFU_ERROR;
-    }
-
-    /* If CPY_TO_DWL_SLOT(i) is still virgin, then swap the block from active slot to dwl slot */
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
-                                     TRAILER_CPY_TO_DWL_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 - index_active_slot),
-                                     sizeof(trailer));
-    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
-    {
-      /* Erase destination block in dwl slot or swap, if not the trailer block */
-      if (index_dwl_slot_write != (number_of_index_dwl_slot - 1))
-      {
-        if (index_dwl_slot_write == -1)
-        {
-          /* Erase the swap */
-          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
-                                                 SLOT_SIZE(SLOT_SWAP));
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
-        }
-        else /* index_dwl_slot_write >= 0 */
-        {
-          /* erase the size of "swap area" at @: Dwl slot + index_dwl_slot_write*swap_area_size */
-          e_ret_status = EraseSlotIndex(DwlSlot, index_dwl_slot_write);
-        }
-        if (e_ret_status !=  SFU_SUCCESS)
-        {
-          return SFU_ERROR;
-        }
-      }
-
-      /* Copy the block from active slot to dwl slot or swap (using "number_of_chunk" chunks) */
-      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
-      {
-        /* ignore return value,  no double ecc error is expected, area already read before */
-        (void)SFU_LL_FLASH_Read(buffer, CHUNK_0_ADDR_HEADER(ActiveSlot, index_active_slot, chunk), sizeof(buffer));
-        write_len = sizeof(buffer);
-        if (index_dwl_slot_write == -1)
-        {
-          /* Destination block is the swap */
-          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_SWAP_ADDR(chunk), buffer, write_len);
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-          if (e_ret_status != SFU_SUCCESS)
-          {
-            return SFU_ERROR;
-          }
-        }
-        else /* index_dwl_slot_write >= 0 */
-        {
-          /* Destination block is in dwl slot: Do not overwrite the trailer. */
-          if (((uint32_t)CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk)) < (uint32_t)TRAILER_BEGIN(DwlSlot))
-          {
-            /*  write is possible length can be modified  */
-            if ((uint32_t)(CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) + write_len) >
-                (uint32_t)TRAILER_BEGIN(DwlSlot))
-            {
-              write_len = TRAILER_BEGIN(DwlSlot) - CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk);
-            }
-            e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
-                                              buffer, write_len);
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-        }
-      }
-
-      /*
-       * The block of the active firmware has been backed up.
-       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
-       */
-      e_ret_status  = AtomicWrite(TRAILER_CPY_TO_DWL_SLOT(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
-                                  (SFU_LL_FLASH_write_t *) SWAPPED);
-
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-      if (e_ret_status != SFU_SUCCESS)
-      {
-        return e_ret_status;
-      }
-    }
-
-    /* If CPY_TO_ACTIVE_SLOT(i) is still virgin, then swap the block from dwl slot to active slot */
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t*) &trailer,
-                                     TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 -
-                                                                index_active_slot),
-                                     sizeof(trailer));
-    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
-    {
-      /* erase the size of "swap area" at @: active slot + index_active_slot*swap_area_size*/
-      e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
-
-      if (e_ret_status !=  SFU_SUCCESS)
-      {
-        return SFU_ERROR;
-      }
-
-      /*
-       * Fill block in active slot:
-       * The appropriate update image block of dwl slot together with initial image block that has been backed up in
-       * dwl slot,
-       * are associated to constitute final block in active slot (installing the block of the new firmware image).
-       */
-      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
-      {
-        /* Read complete chunk of updated image */
-        if (index_dwl_slot_read == -1)
-        {
-          /* ignore return value, no double ecc error is expected, area already read before */
-          (void)SFU_LL_FLASH_Read(buffer, CHUNK_SWAP_ADDR(chunk), sizeof(buffer));
-        }
-        else /* index_dwl_slot_read >= 0 */
-        {
-          /* ignore return value, no double ecc error is expected, area already read before */
-          (void)SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_read, chunk), sizeof(buffer));
-        }
-
-        /* Last impacted block: end of block has to be updated with initial image */
-        if (index_active_slot == index_active_slot_partial_end)
-        {
-          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
-          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) >= (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
-                                                                                  0) + offset_block_partial_end))
-          {
-            /* check return value, as this area has not been read before */
-            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
-                                             sizeof(buffer));
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-
-          /* If chunk is partially impacted by updated image, end of chunk is updated with the initial image content */
-          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) < (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
-                                                                                  0) + offset_block_partial_end))
-              && ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1))) >
-                  (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_end)))
-          {
-            /* check return value, as this area has not been read before */
-            e_ret_status = SFU_LL_FLASH_Read(buffer + (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
-                                             CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) +
-                                             (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
-                                             sizeof(buffer) - (offset_block_partial_end % SFU_IMG_CHUNK_SIZE));
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-        }
-
-        /* First impacted block: beginning of block has to be updated with initial image */
-        if (index_active_slot == index_active_slot_partial_begin)
-        {
-          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
-          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) <=
-              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin))
-          {
-            /* check return value, as this area has not been read before */
-            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
-                                             sizeof(buffer));
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-
-          /* If chunk is partially impacted by updated image, beginning of chunk is updated with the initial image
-             content */
-          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) <
-               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)) &&
-              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) >
-               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)))
-          {
-            /* check return value, as this area has not been read before */
-            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
-                                             offset_block_partial_begin % SFU_IMG_CHUNK_SIZE);
-            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-            if (e_ret_status != SFU_SUCCESS)
-            {
-              return SFU_ERROR;
-            }
-          }
-        }
-        /* Header block not impacted by partial image: complete block, except header, is updated with initial image */
-        else if (index_active_slot == 0)
-        {
-          /* check return value, as this area has not been read before */
-          e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk), sizeof(buffer));
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-          if (e_ret_status != SFU_SUCCESS)
-          {
-            return SFU_ERROR;
-          }
-        }
-
-        /* Last block of final image: end of block has to be cleaned with empty data */
-        if (index_active_slot == index_active_slot_final_end)
-        {
-          /* If chunk is completely beyond the final image, then chunk takes empty data */
-          if (CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) >=
-              CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)
-          {
-            memset(buffer, 0xFF, sizeof(buffer));
-          }
-
-          /* If chunk is partially beyond the final image, then chunk is partially updated with empty data */
-          if ((CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) <
-               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)) &&
-              (CHUNK_0_ADDR(ActiveSlot, index_active_slot, (chunk + 1)) >
-               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)))
-          {
-            memset(buffer + (offset_block_final_end % SFU_IMG_CHUNK_SIZE), 0xFF,
-                   sizeof(buffer) - (offset_block_final_end % SFU_IMG_CHUNK_SIZE));
-          }
-        }
-
-        write_len = SFU_IMG_CHUNK_SIZE;
-        /*  don't copy header in active slot
-            this will be done at the end during validation step */
-        if ((index_active_slot == 0) && (chunk == 0))
-        {
-          write_len = write_len - SFU_IMG_IMAGE_OFFSET;
-        }
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_0_ADDR_MODIFIED(ActiveSlot, index_active_slot, chunk),
-                                          buffer, write_len);
-        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-        if (e_ret_status != SFU_SUCCESS)
-        {
-          return SFU_ERROR;
-        }
-      }
-
-      /*
-       * The block of the active firmware has been backed up.
-       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
-       * Except for block 0, because block 0 is incomplete at this stage (final header installation not yet done)
-       */
-      if (index_active_slot != 0)
-      {
-        e_ret_status  = AtomicWrite(TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot,
-                                                               (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
-                                    (SFU_LL_FLASH_write_t *) SWAPPED);
-
-        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-        if (e_ret_status != SFU_SUCCESS)
-        {
-          return e_ret_status;
-        }
-      }
-    }
-
-    /* Decrement all block indexes */
-    index_dwl_slot_write--;
-    index_dwl_slot_read--;
-    index_active_slot--;
-
-    /*
-     * After having copied the impacted image blocks from active slot, copy also the first block
-     * due to header, if not already copied among the impacted image blocks.
-     */
-    if ((index_active_slot < index_active_slot_partial_begin) && (index_active_slot >= 0))
-    {
-      index_active_slot = 0;
-      index_dwl_slot_read = -1;  /* force read from swap area, to avoid exiting dwl slot / swap index allowed range */
-    }
-  }
-
-  /*
-   * Now, erase the blocks in active slot, located after final image
-   */
-  if (offset_block_final_end == 0)
-  {
-    index_active_slot_empty_begin = index_active_slot_final_end;
-  }
-  else
-  {
-    index_active_slot_empty_begin = index_active_slot_final_end + 1;
-  }
-  index_active_slot = number_of_index_active_slot - 1;
-  while (index_active_slot >= index_active_slot_empty_begin)
-  {
-    e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
-    if (e_ret_status !=  SFU_SUCCESS)
-    {
-      return SFU_ERROR;
-    }
-
-    /* Decrement block index */
-    index_active_slot--;
-  }
-
-  return e_ret_status;
-}
-
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-/**
-  * @brief  Executes a rollback to the original firmware if a firmware update fails
-  * @param  ActiveSlot identification of the new active image
-  * @param  DwlSlot identification of previous firmware image (backed-up slot)
-  * @param  pFwImageHeader pointer in ram to the header of the backed-up FW
-  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
-  */
-static SFU_ErrorStatus RollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot,
-                                            SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t number_chunk_per_sector = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  SE_FwRawHeaderTypeDef *p_header;
-  uint32_t size;
-  uint32_t pass_index;
-  uint32_t erase_index;
-  uint32_t fw_source_address;
-  uint32_t fw_dest_write_address;
-  uint32_t fw_dest_erase_address;
-
-  if (number_chunk_per_sector == 0U)
-  {
-    return SFU_ERROR;
-  }
-  
-  size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET;
-  fw_source_address = SlotStartAdd[DwlSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
-  fw_dest_write_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
-  fw_dest_erase_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SLOT_SIZE(SLOT_SWAP)) * SLOT_SIZE(SLOT_SWAP));
-  pass_index = ((size - 1U) / SFU_IMG_CHUNK_SIZE) + 1U;
-  erase_index = (pass_index - 1U) / number_chunk_per_sector * number_chunk_per_sector;
-
-  /* Erase the part of the active slot that will not be updated
-     ========================================================== */
-  size = (SLOT_SIZE(ActiveSlot) - (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)) / SLOT_SIZE(SLOT_SWAP) *
-         SLOT_SIZE(SLOT_SWAP);
-  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)(fw_dest_erase_address + SLOT_SIZE(SLOT_SWAP)),
-                                         size);
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-  while ((e_ret_status == SFU_SUCCESS) && (pass_index > 0U))
-  {
-    /* Reading phase
-       =============== */
-    e_ret_status = SFU_LL_FLASH_Read(buffer, (uint8_t *) fw_source_address, SFU_IMG_CHUNK_SIZE);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-    /* Erasing operation when aligned on erase_index
-       ============================================= */
-
-    /*
-     *  The header may not be contiguous with the FW image : 2 erasing operations needed
-     */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if ((((pass_index - 1U) / number_chunk_per_sector) * number_chunk_per_sector) == erase_index)
-      {
-        (void) SFU_LL_SECU_IWDG_Refresh();
-        size = 0U;
-        if (erase_index == 0U)
-        {
-          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                                 SFU_IMG_IMAGE_OFFSET);
-          size = SFU_IMG_IMAGE_OFFSET;
-        }
-        if (e_ret_status == SFU_SUCCESS)
-        {
-          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) fw_dest_erase_address + size,
-                                                 SLOT_SIZE(SLOT_SWAP) - size);
-        }
-        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-        erase_index -= number_chunk_per_sector;
-        fw_dest_erase_address -= SLOT_SIZE(SLOT_SWAP);
-      }
-    }
-
-    /* Writing phase
-       ============= */
-    /*
-     * Header is under isolated environment protection
-     * Thus the writing operation is split in 2 actions (HEADER + remaining part)
-     */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      size = 0U;
-      if (pass_index == 1U)
-      {
-        /* Ensure there is no Fingerprint in original firmware header
-         * This stops someone attempting multiple rollbacks by writing fake fingerprint in original header
-         */
-        p_header = (SE_FwRawHeaderTypeDef *) buffer;
-        (void) memset(p_header->PrevHeaderFingerprint, 0x00, sizeof(p_header->PrevHeaderFingerprint));
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],  buffer,
-                                          SFU_IMG_IMAGE_OFFSET);
-        size = SFU_IMG_IMAGE_OFFSET;
-      }
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) fw_dest_write_address + size,  buffer + size,
-                                          SFU_IMG_CHUNK_SIZE - size);
-      }
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-    }
-
-    /* Index update
-       ============ */
-    pass_index--;
-    fw_source_address -= SFU_IMG_CHUNK_SIZE;
-    fw_dest_write_address -= SFU_IMG_CHUNK_SIZE;
-  }
-
-  return e_ret_status;
-}
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-
-/**
-  * @brief Decrypt Image in dwl slot
-  * @ note Decrypt is done from dwl slot to dwl slot + swap with 2 images (swap contains 1st sector)
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer in ram to the header to decrypt
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus DecryptImageInDwlSlot(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-  SE_ErrorStatus   se_ret_status;
-  uint32_t NumberOfChunkPerSwap = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  /*  chunk size is the maximum , the 1st block can be smaller */
-  /*  the chunk is static to avoid  large stack */
-  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(4)));
-  uint32_t fw_source_address = 0U;
-  uint32_t fw_dest_address_write = 0U;
-  uint32_t fw_dest_erase_address = 0U;
-  uint32_t fw_decrypted_total_size = 0U;
-  uint32_t size;
-  uint32_t oldsize;
-  uint32_t fw_decrypted_chunk_size;
-  uint32_t fw_tag_len;
-  uint8_t fw_tag_output[SE_TAG_LEN];
-  uint32_t pass_index = 0U;
-  uint32_t erase_index = 0U;
-
-  if ((pFwImageHeader == NULL))
-  {
-    return e_ret_status;
-  }
-
-  /* Decryption process*/
-  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_PARTIAL);
-  if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK))
-  {
-    e_ret_status = SFU_SUCCESS;
-
-    /* Decryption loop*/
-    while ((e_ret_status == SFU_SUCCESS) && (fw_decrypted_total_size < (pFwImageHeader->PartialFwSize)) &&
-           (e_se_status == SE_OK))
-    {
-      if (pass_index == NumberOfChunkPerSwap)
-      {
-        fw_dest_address_write = SlotStartAdd[DwlSlot];
-        fw_dest_erase_address =  fw_dest_address_write;
-        erase_index = NumberOfChunkPerSwap;
-      }
-      if (pass_index == 0U)
-      {
-        fw_source_address = SlotStartAdd[DwlSlot] + SFU_IMG_IMAGE_OFFSET +
-                                         (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP));
-        fw_dest_erase_address = SlotStartAdd[SLOT_SWAP];
-        fw_dest_address_write = fw_dest_erase_address + ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
-                                                                                  SLOT_SIZE(SLOT_SWAP))) %
-                                                         SLOT_SIZE(SLOT_SWAP));
-        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk) -
-                                  ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
-                                   sizeof(fw_decrypted_chunk));
-        if (fw_decrypted_chunk_size > pFwImageHeader->PartialFwSize)
-        {
-          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize;
-        }
-        pass_index = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)))
-                       % SLOT_SIZE(SLOT_SWAP)) / sizeof(fw_decrypted_chunk));
-      }
-      else
-      {
-        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk);
-
-        /* For the last 2 pass, divide by 2 remaining buffer to ensure that :
-         *     - chunk size greater than 16 bytes : minimum size of a block to be decrypted
-         *     - except last one chunk size is 16 bytes aligned
-         *
-         * Pass n - 1 : remaining bytes / 2 with (16 bytes alignment for crypto AND sizeof(SFU_LL_FLASH_write_t) for
-         *              flash programming)
-         * Pass n : remaining bytes
-         */
-
-        /* Last pass : n */
-        if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < fw_decrypted_chunk_size)
-        {
-          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize - fw_decrypted_total_size;
-        }
-        /* Previous pass : n - 1 */
-        else if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < ((2U * fw_decrypted_chunk_size) - 16U))
-        {
-          fw_decrypted_chunk_size = ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) / 32U) * 16U;
-
-          /* Set dimension to the appropriate length for FLASH programming.
-           * Example: 64-bit length for L4.
-           */
-          if ((fw_decrypted_chunk_size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
-          {
-            fw_decrypted_chunk_size = fw_decrypted_chunk_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
-                                                                 (fw_decrypted_chunk_size %
-                                                                  (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-          }
-        }
-        /* All others pass */
-        else
-        {
-          /* nothing */
-        }
-      }
-
-      size = fw_decrypted_chunk_size;
-
-      /* Decrypt Append*/
-      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *) fw_source_address, size);
-      if (e_ret_status != SFU_SUCCESS)
-      {
-        break;
-      }
-      if (size != 0U)
-      {
-        se_ret_status = SE_Decrypt_Append(&e_se_status, (uint8_t *)fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
-                                          (int32_t *)&fw_decrypted_chunk_size);
-      }
-      else
-      {
-        e_ret_status = SFU_SUCCESS;
-        fw_decrypted_chunk_size = 0U;
-      }
-      if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK) && (fw_decrypted_chunk_size == size))
-      {
-        /* Erase Page */
-        if ((pass_index == erase_index)
-            || (pass_index == ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) /
-                               sizeof(fw_decrypted_chunk))))
-        {
-          (void) SFU_LL_SECU_IWDG_Refresh();
-          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address,
-                                                 SLOT_SIZE(SLOT_SWAP)) ;
-          erase_index += NumberOfChunkPerSwap;
-          fw_dest_erase_address += SLOT_SIZE(SLOT_SWAP);
-        }
-        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-        if (e_ret_status == SFU_SUCCESS)
-        {
-          /*
-           * For last pass with remaining size not aligned on 16 bytes : Set dimension AFTER decrypt to the appropriate
-           * length for FLASH programming.
-           * Example: 64-bit length for L4.
-           */
-          if ((size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
-          {
-            /*
-            * By construction, SFU_IMG_CHUNK_SIZE is a multiple of sizeof(SFU_LL_FLASH_write_t) so there is no risk to
-             * read out of the buffer
-             */
-            oldsize = size;
-            size = size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-            while (oldsize < size)
-            {
-              fw_decrypted_chunk[oldsize] = 0xFF;
-              oldsize++;
-            }
-          }
-
-          /* Write Decrypted Data in Flash - size has to be 32-bit aligned */
-          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)fw_dest_address_write,  fw_decrypted_chunk, size);
-          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
-
-          if (e_ret_status == SFU_SUCCESS)
-          {
-            /* Update flash pointer */
-            fw_dest_address_write  += (size);
-
-            /* Update source pointer */
-            fw_source_address += size;
-            fw_decrypted_total_size += size;
-            (void) memset(fw_decrypted_chunk, 0xff, sizeof(fw_decrypted_chunk));
-            pass_index += 1U;
-
-          }
-        }
-      }
-    }
-  }
-
-#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_decrypted_total_size);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-#endif /* SFU_ENCRYPTED_IMAGE */
-
-  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS) && (e_se_status == SE_OK))
-  {
-    /* Do the Finalization, check the authentication TAG*/
-    fw_tag_len = sizeof(fw_tag_output);
-    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
-    if ((se_ret_status != SE_SUCCESS) || (e_se_status != SE_OK))
-    {
-      e_ret_status = SFU_ERROR;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-    else
-    {
-      /* erase the remaining part of the image after shifting inside dwl slot */
-      if (pass_index <= NumberOfChunkPerSwap)
-      {
-        fw_dest_erase_address = SlotStartAdd[DwlSlot];
-      }
-      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address, SLOT_SIZE(SLOT_SWAP));
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-    }
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  check trailer validity to allow resume installation.
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-static SFU_ErrorStatus  CheckTrailerValid(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                          SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
-  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
-  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN + VALID_SIZE];
-
-  /*
-   *  Initial conditions to be fulfilled :
-   *   - Trailer magic is present
-   *   - Active slot number is correct
-   *   - test header from trailer is signed
-   */
-
-  /* check trailer Magic */
-  e_ret_status = CheckTrailerMagic(DwlSlot);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Populate the pTestHeader and verify it the active slot is correct */
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-  }  
-  
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Populate pTestHeader parameter */
-    e_ret_status= ParseFWInfo(pTestHeader, fw_header_trailer_test);
-  }
-  
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Active slot number correct ?
-       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
-    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
-    {
-      /* Check header test field in trailer is signed */
-      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    return SFU_ERROR;
-  }
-
-  /* Read header in active slot if any */
-  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                   sizeof(fw_header_active_slot));
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Verify the header signature in active slot */
-    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
-
-    /* Populate pValidHeader parameter */
-    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Read header valid field in trailer */
-      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
-                                     sizeof(fw_header_trailer_valid));
-      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-    }
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check if header in active slot is same as header valid in trailer */
-      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, sizeof(fw_header_trailer_valid)) != 0)
-      {
-        /*
-         * Header in active slot is not identical to header valid field:
-         * Either install is already complete (if header in active slot is same as header test field in trailer),
-         * or there is hack tentative.
-         * In both cases, resume install must not be triggered.
-         */
-        e_ret_status = SFU_ERROR;
-      }
-      else
-      {
-        /* Check candidate image version */
-        e_ret_status = SFU_IMG_CheckFwVersion(pValidHeader->FwVersion, pTestHeader->FwVersion);
-      }
-    }
-    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
-  }
-  else
-  {
-    /*
-     * Header in active slot is not valid.
-     * It is considered this can not be hack attempt, because header in active slot is in
-     * protected area.
-     * Possible reasons:
-     * - Swap has been interrupted during very first image installation (active slot was empty)
-     * - Swap has been interrupted during reconstitution of first sector of active slot
-     * If header test field in trailer is signed and with proper version, we resume install.
-     */
-
-    /* Read header valid field in trailer */
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
-                                     sizeof(fw_header_trailer_valid));
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Check header valid field in trailer is signed */
-      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
-
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /* active slot was containing an active image */
-
-        /* Populate pValidHeader parameter */
-        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
-
-        if (e_ret_status == SFU_SUCCESS)
-        {
-          /* Check candidate image version */
-          e_ret_status = SFU_IMG_CheckFwVersion(pValidHeader->FwVersion, pTestHeader->FwVersion);
-        }
-      }
-      else
-      {
-        /* active slot was empty or was containing bricked Fw image */
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-
-    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
-  }
-
-  return e_ret_status;
-}
-
-
-#if defined(ENABLE_IMAGE_STATE_HANDLING)
-/**
-  * @brief  Check that there is an Image to Install
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header to install
-  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
-  */
-static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_ErrorStatus e_ret_status_se;
-  SE_StatusTypeDef e_se_status;
-  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
-  uint32_t end_of_test_image;
-  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
-
-  /*
-    * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
-    * to be able to handle a specific error cause.
-    */
-  /*  check swap header */
-  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, DwlSlot, &image_state);
-    if (e_ret_status_se == SE_SUCCESS)
-    {
-      /* Control the size of image to be installed taking into account trailers */
-      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET);
-
-      if ((image_state != FWIMG_STATE_NEW) || (trailer_begin < end_of_test_image))
-      {
-        /*
-          * These error causes are not memorized in the BootInfo area because there won't be any error handling
-          * procedure.
-          * If this function returns that no new firmware can be installed (as this may be a normal case).
-          */
-        e_ret_status = SFU_ERROR;
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        /* Display the debug message(s) only once */
-        if (1U == initialDeviceStatusCheck)
-        {
-          if (trailer_begin < end_of_test_image)
-          {
-            TRACE("\r\n= [FWIMG] The binary image to be installed overlap with the trailer area!");
-          }
-        }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-    else
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-  return e_ret_status;
-}
-
-#else
-
-/**
-  * @brief  Check that there is an Image to Install
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header to install
-  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
-  */
-static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *p_header_swap;
-  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN + VALID_SIZE]; /* header + VALID tags */
-  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
-  uint32_t end_of_test_image;
-  int32_t ret;
-  /*
-     * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
-     * to be able to handle a specific error cause.
-     */
-
-  /*  check swap header */
-  e_ret_status = CheckAndGetFWHeader(SLOT_SWAP, pFwImageHeader);
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /*  compare the header in dwl slot with the header in swap */
-    p_header_swap = (uint8_t *) pFwImageHeader;
-    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
-                                     sizeof(fw_header_dwl_slot));
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* image header in dwl slot not consistent with swap header */
-      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
-                           SFU_IMG_IMAGE_OFFSET);
-
-      /* the header in swap must be the same as the header in dwl slot */
-      ret = memcmp(fw_header_dwl_slot, p_header_swap, SE_FW_HEADER_TOT_LEN);
-
-      /* Check if there is enough room for the trailers */
-      if ((trailer_begin < end_of_test_image) || (ret != 0))
-      {
-        /*
-          * These error causes are not memorized in the BootInfo area because there won't be any error handling
-          * procedure.
-          * If this function returns that no new firmware can be installed (as this may be a normal case).
-          */
-        e_ret_status = SFU_ERROR;
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        /* Display the debug message(s) only once */
-        if (1U == initialDeviceStatusCheck)
-        {
-          if (trailer_begin < end_of_test_image)
-          {
-            TRACE("\r\n= [FWIMG] The binary image to be installed overlap with the trailer area!");
-          } /* check next error cause */
-
-          if (SFU_SUCCESS == e_ret_status)
-          {
-            TRACE("\r\n= [FWIMG] The binary image to be installed is already tagged as VALID!");
-          } /* check next error cause */
-
-          if (ret != 0)
-          {
-            TRACE("\r\n= [FWIMG] The headers in dwl slot and swap area do not match!");
-          } /* no more error cause to check */
-        } /* else do not print the message(s) again */
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-    }
-  }
-  return e_ret_status;
-}
-#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
-
-
-/**
-  * @brief Prepares the Candidate FW image for Installation.
-  *        This stage depends on the supported features: in this example this consists in decrypting the candidate
-  *        image.
-  * @note Even if the Firmware Image is in clear format the decrypt function is called.
-  *       But, in this case no decrypt is performed, it is only a set of copy operations
-  *       to organize the Firmware Image in FLASH as expected by the swap procedure.
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pFwImageHeader pointer to fw header to install
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-static SFU_ErrorStatus PrepareCandidateImageForInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_StatusTypeDef e_se_status;
-
-  /*
-    * Control if there is no additional code beyond the firmware image (malicious SW)
-    */
-  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot),
-                            pFwImageHeader->PartialFwSize + (pFwImageHeader->PartialFwOffset %
-                                                             SLOT_SIZE(SLOT_SWAP)));
-
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t) SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Additional code detected beyond FW image!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-    * Pre-condition: all checks have been performed,
-    *                so all FWIMG module variables are populated.
-    * Now we can decrypt in FLASH.
-    *
-    * Initial FLASH state (focus on dwl slot and swap area):
-    *
-    * Depending on partial FW offset, we can have:
-    * <dwl slot>   : {Candidate Image Header + encrypted FW - page k}
-    *                {encrypted FW - page k+1}
-    *                .....
-    *                {encrypted FW - page k+N}
-    *                .....
-    * </dwl slot>
-    * or:
-    * <dwl slot>   : {Candidate Image Header }
-    *                {encrypted FW - page k}
-    *                .....
-    *                {encrypted FW - page k+N}
-    *                .....
-    * </dwl slot>
-    *
-    * <Swap area>  : {Candidate Image Header}
-    * </Swap area>
-    */
-  e_ret_status =  DecryptImageInDwlSlot(DwlSlot, pFwImageHeader);
-
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_DECRYPT_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Decryption failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /*
-    * At this step, the FLASH content looks like this:
-    *
-    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
-    *                {decrypted FW - data from page k+2 in page 1}
-    *                .....
-    *                {decrypted FW - data from page k+N in page N-1}
-    *                {page N is now empty}
-    *                .....
-    * </dwl slot>
-    *
-    * <Swap area>  : {No Header (shift) + decrypted FW data from page k}
-    * </Swap area>
-    *
-    * The Candidate FW image has been decrypted
-    * and a "hole" has been created in dwl slot to be able to swap.
-    */
-
-  e_ret_status = VerifyFwSignatureAfterDecrypt(&e_se_status, DwlSlot, pFwImageHeader);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t) SFU_EXCPT_SIGNATURE_FAILURE);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] The decrypted image is incorrect!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    return e_ret_status;
-  }
-
-  /* Return the result of this preparation */
-  return (e_ret_status);
-}
-
-
-/**
-  * @brief  Install the new version
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @param  pValidHeader: pointer in ram to header of valid fw to backup
-  * @param  pTestHeader: pointer in ram to header of fw to test
-  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
-  */
-static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
-                                         SE_FwRawHeaderTypeDef *pTestHeader)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-    * At this step, the FLASH content looks like this:
-    *
-    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
-    *                {decrypted FW - data from page k+2 in page 1}
-    *                .....
-    *                {decrypted FW - data from page k+N in page N-1}
-    *                {page N is now empty}
-    *                .....
-    * </dwl slot>
-    *
-    * <Swap area> : {No Header (shift) + decrypted FW data from page k}
-    * </Swap area>
-    *
-    */
-
-  /* erase "swap area" size at the end of dwl slot */
-  e_ret_status = EraseSlotIndex(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1U));
-  if (e_ret_status !=  SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Trailer erasing failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-  /*
-    * At this step, the FLASH content looks like this:
-    *
-    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
-    *                {decrypted FW - data from page k+2 in page 1}
-    *                .....
-    *                {decrypted FW - data from page k+N in page N-1}
-    *                {page N is now empty}
-    *                .....
-    *                {at least the swap area size at the end of the last page of dwl slot is empty }
-    * </dwl slot>
-    *
-    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
-    * </Swap area>
-    *
-    */
-
-
-  /*  write trailer  */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t) SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Trailer update failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /*
-    * At this step, the FLASH content looks like this:
-    *
-    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
-    *                {decrypted FW - data from page k+2 in page 1}
-    *                .....
-    *                {decrypted FW - data from page k+N in page N-1}
-    *                {page N is now empty}
-    *                .....
-    *                {the last page of dwl slot ends with the trailer magic patterns and the free space for the trailer
-    *                 info}
-    * </dwl slot>
-    *
-    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
-    * </Swap area>
-    *
-    * The trailer magic patterns is ActiveFwHeader|CandidateFwHeader|SWAPmagic.
-    * This is followed by a free space to store the trailer info (N*CPY_TO_ACTIVE_SLOT) and (N*CPY_TO_DWL_SLOT):
-    *
-    *<------------------------------------------ Last page of dwl slot --------------------------------------->
-    * |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH |N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t)
-    * | header 1     | header 2     |SWAP magic  |CLEAN pattern|N*CPY_TO_ACTIVE_SLOT   | N*CPY_TO_DWL_SLOT
-    *
-    */
-
-  /*  swap  */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, pTestHeader);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_SWAP);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Swap process failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-  /* Update fingerprint from previous FW image */
-  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-  /* Validate immediately the new active FW */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = SFU_IMG_Validation(ActiveSlot, pTestHeader);
-    if (SFU_SUCCESS != e_ret_status)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Header validation failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* clear swap pattern */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = CleanMagicValue(DwlSlot);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      /* Memorize the error */
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_MAGIC);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Clean magic tag update failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  return e_ret_status;   /* Leave the function now */
-}
-
-/* Functions Definition : services ------------------------------------------- */
-/**
-  * @brief FW Image Handling (FWIMG) initialization function from swap process.
-  *        Checks the validity of the settings related to image handling (slots size and alignments...).
-  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
-  *        used...etc...).
-  *        Must be called first (and once) before calling the other Image handling services.
-  * @param  None.
-  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
-  */
-SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void)
-{
-  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
-  uint32_t i;
-
-  /*
-   * Sanity check: let's make sure the slot sizes are correct
-   * to avoid discrepancies between linker definitions and constants in sfu_fwimg_regions.h
-   */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP))))
-      {
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d size (%d) must be a multiple of swap size (%d)\r\n",
-              SLOT_ACTIVE_1 + i, SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP));
-        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
-      }
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP))))
-      {
-        TRACE("\r\n= [FWIMG] SLOT_DWL_%d size (%d) must be a multiple of swap size (%d)\r\n",
-              SLOT_DWL_1 + i, SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP));
-        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
-      }
-    }
-  }
-
-  /*
-   * Sanity check: let's make sure the slot size is correct with regards to the swap procedure constraints.
-   * The swap procedure cannot succeed if the trailer info size is bigger than what a chunk used for swapping can carry.
-   */
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      if (((int32_t)(SFU_IMG_CHUNK_SIZE - (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)))) < 0)
-      {
-        e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
-        TRACE("\r\n= [FWIMG] %d bytes required for the swap metadata of SLOT_DWL_%d is too much\r\n",
-              (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)), SLOT_DWL_1 + i);
-      } /* else the swap settings are fine from a metadata size perspective */
-    }
-  }
-
-  /*
-   * Sanity check: let's make sure the swap size is correct with regards to the swap procedure constraints.
-   * The swap size must be a multiple of the chunks size used to do the swap.
-   */
-#if defined(__GNUC__)
-  __IO uint32_t swap_size = SLOT_SIZE(SLOT_SWAP), swap_chunk = SFU_IMG_CHUNK_SIZE;
-  if (0U != ((uint32_t)(swap_size % swap_chunk)))
-#else
-  if (0U != ((uint32_t)(SLOT_SIZE(SLOT_SWAP) % SFU_IMG_CHUNK_SIZE)))
-#endif /* __GNUC__ */
-  {
-    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
-    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the swap size (%d) is not a multiple\r\n",
-          SFU_IMG_CHUNK_SIZE, SLOT_SIZE(SLOT_SWAP));
-  } /* else the swap settings are fine from a chunk size perspective */
-
-  /*
-   * Sanity check: let's make sure the chunks used for the swap procedure are big enough with regards to the offset
-   * giving the start @ of the firmware
-   */
-  if (((int32_t)(SFU_IMG_CHUNK_SIZE - SFU_IMG_IMAGE_OFFSET)) < 0)
-  {
-    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
-    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the firmware start offset is %d bytes\r\n",
-          SFU_IMG_CHUNK_SIZE, SFU_IMG_IMAGE_OFFSET);
-  } /* else the swap settings are fine from a firmware start offset perspective */
-
-  /*
-   * Sanity check: let's make sure SWAP slot is properly aligned with regards to flash constraints
-   */
-
-  if (!IS_ALIGNED(SlotStartAdd[SLOT_SWAP]))
-  {
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-    TRACE("\r\n= [FWIMG] swap (%x) is not properly aligned\r\n",
-          SlotStartAdd[SLOT_SWAP]);
-  } /* else swap is properly aligned */
-
-  /*
-   * Sanity check: let's make sure the swap area does not overlap SB code area protected by WRP)
-   */
-  if(!((((SlotStartAdd[SLOT_SWAP]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
-    || (((SlotEndAdd[SLOT_SWAP] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
-  {
-    TRACE("\r\n= [FWIMG] SWAP overlaps SBSFU code area protected by WRP\r\n");
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-  }
-
-  /*
-   * Sanity check: let's make sure the KMS NVM area does not overlap Swap area)
-   */
-  if (!(((SlotStartAdd[SLOT_SWAP]) > KMS_DATASTORAGE_END)
-        || ((SlotEndAdd[SLOT_SWAP]) < (KMS_DATASTORAGE_START))))
-  {
-    TRACE("\r\n= [FWIMG] KMS NVM area overlaps Swap area\r\n");
-    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
-  }
-
-  /* FWIMG core initialization completed */
-  return e_ret_status;
-}
-
-
-
-/**
-  * @brief Checks if there is a pending firmware installation.
-  *        3 situations can occur:
-  *        A. Pending firmware installation: a firmware is ready to be installed but the installation has never been
-  *           triggered so far.
-  *        B. Pending firmware installation resume: a firmware installation has been interrupted and a resume procedure
-  *           is required to finalize installation.
-  *        C. No firmware installation pending
-  * @note  The anti-rollback check is not taken into account at this stage.
-  *        But, if the firmware to be installed already carries some metadata (VALID tag) a newly downloaded firmware
-  *        should not have then the installation is not considered as pending.
-  * @note This function populates the FWIMG module variables:
-  *        - case SFU_IMG_FWUPDATE_STOPPED : fw_image_header_to_test & fw_image_header_validated
-  *        - case SFU_IMG_FWIMAGE_TO_INSTALL : fw_image_header_to_test
-  *        - case SFU_IMG_NO_FWUPDATE : none
-  * @param  pDwlSlotToInstall identification of the downloaded slot to install
-  * @param  pActiveSlotToResume identification of the active slot to resume
-  * @param  pActiveSlotToRollback identification of the active slot to rollback
-  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, pending resume install, no
-  *         pending action)
-  */
-SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
-                                                                uint32_t *pActiveSlotToResume, \
-                                                                uint32_t *pActiveSlotToRollback)
-{
-  uint32_t i;
-  uint32_t j;
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-  SE_FwStateTypeDef master_slot_state = FWIMG_STATE_INVALID;
-  SE_StatusTypeDef e_se_status;
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-  /*
-   * The order of the checks is important:
-   *
-   * A. Check if a FW update has been interrupted first.
-   *    This check is based on the content of the trailer area and the validity of the update image.
-   *
-   * B. Check if a Firmware image is waiting to be installed.
-   */
-
-  /* Init values */
-  *pActiveSlotToResume = SLOT_INACTIVE;
-  *pActiveSlotToRollback = SLOT_INACTIVE;
-  *pDwlSlotToInstall = SLOT_INACTIVE;
-  
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-  /* 
-   * Read MASTER_SLOT state (if configured == (!= 255)) :
-   *   In case of VALID_ALL state, all other slots in SELF_TEST should be validated
-   *   Else all other slots in SELF_TEST are invalidated
-   */
-  if (MASTER_SLOT != 0xFFU)
-  {
-    if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
-    {        
-      if (SE_SFU_IMG_GetActiveFwState(&e_se_status, MASTER_SLOT, &master_slot_state) != SE_SUCCESS)
-      {
-        master_slot_state = FWIMG_STATE_INVALID;
-      }
-    }
-  }
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-  /* Check image installation stopped or installation to be done
-     =========================================================== */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
-    {
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-      /* Rollback if seltftest not validated
-         =================================== */
-      if (SFU_SUCCESS == FirmwareToRollback(SLOT_ACTIVE_1 + i, master_slot_state))
-      {
-        /* The firmware state is either FWIMG_STATE_SELFTEST or FWIMG_STATE_INVALID
-         * Rollback is required
-         * Stop at first occurrence : next ones if any will be resumed after reset
-         */
-        *pActiveSlotToRollback = SLOT_ACTIVE_1 + i;
-        return SFU_IMG_FWIMAGE_ROLLBACK;
-      }
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-      /* Check trailer valide : installation stopped ?
-         ============================================= */
-      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
-      {
-        /* Slot configured ? */
-        if (SlotStartAdd[SLOT_ACTIVE_1 + j] != 0U)
-        {
-          if (SFU_SUCCESS == CheckTrailerValid(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
-                                               &fw_image_header_to_test))
-          {
-            /* A Firmware Update has been stopped
-             * fw_image_header_to_test & fw_image_header_validated have been populated
-             * Stop at first occurrence : next ones if any will be resumed after reset
-             */
-            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
-            *pDwlSlotToInstall = SLOT_DWL_1 + j;
-            return SFU_IMG_FWUPDATE_STOPPED;
-          }
-        }
-      }
-    }
-  }
-
-  /* Install new firmware if requested in the swap
-     ============================================= */
-  for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
-  {
-    /* Slot configured ? */
-    if (SlotStartAdd[SLOT_ACTIVE_1 + j] != 0U)
-    {
-      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + j, &fw_image_header_to_test))
-      {
-        /*
-         * A Firmware is available for installation:
-         * fw_image_header_to_test has been populated
-         * Stop at first occurrence : next ones if any will be installed after reset
-         */
-        *pDwlSlotToInstall = SLOT_DWL_1 + j;
-        return SFU_IMG_FWIMAGE_TO_INSTALL;
-      }
-    }
-  }
-
-  return SFU_IMG_NO_FWUPDATE;
-}
-
-/**
-  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
-  *        valid if the checks are successful.
-  *        The anti-rollback check is performed and errors are memorized in the bootinfo area, but no action is taken
-  *        in this procedure.
-  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
-  *        afterwards if the cryptographic scheme allows this (signature check for instance).
-  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
-  *        This function modifies the FLASH content.
-  *        If this procedure is interrupted during image preparation stage (e.g.: switch off) it cannot be resumed.
-  *        If it is interrupted during installation stage, it can be resumed.
-  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *        running the procedure): SFU_IMG_CheckPendingInstallation, SFU_IMG_CheckCandidateVersion should be called
-  *        first.
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t *pbuffer;
-  uint32_t active_slot;
-
-  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
-
-  /*
-   * Check the active slot is big enough
-   */
-  if (fw_image_header_to_test.FwSize + SFU_IMG_IMAGE_OFFSET + TRAILER_SIZE(DwlSlot) <= SLOT_SIZE(active_slot))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  /*
-   * The preparation stage consists in decrypting the candidate firmware image.
-   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = PrepareCandidateImageForInstall(DwlSlot, &fw_image_header_to_test);
-  }
-
-  /*
-   * Populate fw_image_header_validated
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
-    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
-                                     sizeof(fw_image_header_validated));
-  }
-
-  /*
-   * Installing the new firmware image consists in swapping the 2 FW images.
-   */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
-  }
-
-  /* Erase downloaded FW in case of authentication/integrity error
-     Erase downloaded FW also in case of installation issue to avoid any infinite loop */
-  if (SFU_SUCCESS != e_ret_status)
-  {
-    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Installation procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Installation procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  /* return the installation result */
-  return (e_ret_status);
-}
-
-/**
-  * @brief Resume installation of new valid firmware after installation failure.
-  *        If this procedure is interrupted before its completion (e.g.: switch off) it can be resumed.
-  *        This function is dedicated (only) to the resume of installation when a new firmware installation is stopped
-  *        before its completion.
-  *        This function does not handle explicitly the metadata tagging the firmware as valid: these metadata must
-  *        have been preserved during the installation procedure.
-  *        This function modifies the FLASH content.
-  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
-  *        running the procedure): need to make sure an installation has been interrupted.
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-   * resume swap process
-   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation()call.
-   */
-  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, &fw_image_header_to_test);
-  if (e_ret_status != SFU_SUCCESS)
-  {
-    (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_SWAP);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [FWIMG] Swap process failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-  }
-
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-  /* Update fingerprint from previous FW image */
-  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-  /* Validate immediately the new active FW */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_IMG_Validation(ActiveSlot, &fw_image_header_to_test);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FLASH_ERROR);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Header validation failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* clear swap pattern */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = CleanMagicValue(DwlSlot);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      /* Memorize the error */
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_MAGIC);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Clean magic tag update failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* Erase downloaded FW in case of installation issue to avoid any infinite loop */
-  if (SFU_SUCCESS != e_ret_status)
-  {
-    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Resume procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Resume procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return e_ret_status;
-}
-
-#ifdef ENABLE_IMAGE_STATE_HANDLING
-/**
-  * @brief Executes a rollback to the original firmware if a firmware update fails
-  * @param  ActiveSlot identification of the active image
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
-  */
-SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t zero_buffer[32U] = {0U};
-  SE_FwRawHeaderTypeDef active_header;
-  SE_FwRawHeaderTypeDef dwl_header;
-  SFU_FLASH_StatusTypeDef flash_if_status;
-
-
-  /* Verify slot 1 header is from fw that triggered the update */
-  /* Backed-up header is in flash Slot1 at pHdr address */
-  /* Load current header (start of Slot 0, normally behind the firewall) */
-  e_ret_status =  SFU_LL_FLASH_Read((uint8_t *)&active_header, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                    sizeof(dwl_header));
-  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    /* if fingerprint is 0x00 we cannot do rollback */
-    if (0 == memcmp(active_header.PrevHeaderFingerprint, zero_buffer, sizeof(active_header.PrevHeaderFingerprint)))
-    {
-      e_ret_status = SFU_ERROR;
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Rollback failure : backed-up FW not identified!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  /* Get and check previous FW header saved in DWL slot
-     then compare header signature with active slot header finger print */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = CheckAndGetFWHeader(DwlSlot, &dwl_header);
-    if (SFU_SUCCESS == e_ret_status)
-    {
-      /* Fingerprint of active firmware should be the signature of previous firmware */
-      if (0 != memcmp(active_header.PrevHeaderFingerprint, dwl_header.HeaderSignature,
-                       sizeof(active_header.PrevHeaderFingerprint)))
-      {
-        e_ret_status = SFU_ERROR;
-        (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [FWIMG] Rollback failure : backed-up FW not identified!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-    }
-  }
-
-  /* Rollback execution */
-  if (SFU_SUCCESS == e_ret_status)
-  {
-    e_ret_status = RollbackInstallation(ActiveSlot, DwlSlot, &dwl_header);
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      (void)SFU_BOOT_SetLastExecError((uint32_t)SFU_EXCPT_FWIMG_ROLLBACK);
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-      TRACE("\r\n= [FWIMG] Rollback process failure!");
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Rollback is complete, now erase downloaded image to prevent an attempt to
-     * reinstall
-     */
-    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
-  }
-  else
-  {
-    /* Erase the header of active slot to avoid any infinite loop */
-    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
-                                           SFU_IMG_IMAGE_OFFSET);
-    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-  }
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    TRACE("\r\n=         Rollback procedure completed.");
-  }
-  else
-  {
-    TRACE("\r\n=         Rollback procedure cannot be finalized!");
-  }
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Updates the state of the current firmware
-  * @param  SlotNumber index of the slot in the list
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SE_ErrorStatus e_ret_status_se;
-  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
-  SE_StatusTypeDef e_se_status;
-  SE_FwStateTypeDef e_next_image_state;
-
-  /* Read Image state : if image is new, set to self test
-   *
-   * An OTA image arrives on the device in the NEW state
-   * The bootloader switches the new image to SELFTEST state so
-   * that when the image boots it can detect that it should carry out the
-   * self test routine
-   */
-  e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
-  if (e_ret_status_se == SE_SUCCESS)
-  {
-    if (image_state == FWIMG_STATE_NEW)
-    {
-      e_next_image_state = FWIMG_STATE_SELFTEST;
-      e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
-      if (e_ret_status_se == SE_SUCCESS)
-      {
-        e_ret_status = SFU_SUCCESS;
-      }
-      else
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d state = %d failed to switch in FWIMG_STATE_SELFTEST", SlotNumber,
-              image_state);
-#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
-        e_ret_status = SFU_ERROR;
-      }
-    }
-  }
-  return e_ret_status;
-}
-#endif /* ENABLE_IMAGE_STATE_HANDLING */
-
-/**
-  * @brief  Get size of the trailer
-  * @note   This area mapped at the end of a dwl slot is not available for the firmware image
-  * @param  SlotNumber index of the slot in the list
-  * @retval Size of the trailer.
-  */
-uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber)
-{
-  return TRAILER_SIZE(SlotNumber);
-}
-
-/**
-  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
-  * @param  DwlSlot identification of the downloaded area
-  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
-  */
-SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
-{
-  SFU_FLASH_StatusTypeDef flash_if_status;
-  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
-  SFU_ErrorStatus e_ret_status_swap = SFU_ERROR;
-
-  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
-                                             SLOT_SIZE(DwlSlot));
-  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-  e_ret_status_swap = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
-                                              SLOT_SIZE(SLOT_SWAP));
-  STATUS_FWIMG(e_ret_status_swap == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
-
-  return (((e_ret_status_swap != SFU_SUCCESS) || (e_ret_status_dwl != SFU_SUCCESS)) ?  SFU_ERROR : SFU_SUCCESS);
-}
-
-#endif /* !(SFU_NO_SWAP) */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
deleted file mode 100644
index 0b3acd0b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_interface_crypto_scheme.c
-  * @author  MCD Application Team
-  * @brief   Secure Engine Interface module.
-  *          This file provides set of firmware functions to manage SE Interface
-  *          functionalities. These services are used by the bootloader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
-#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
-                               STM32 board specificities */
-#include "tkms.h"
-#include "sfu_interface_crypto_scheme.h"
-#include <string.h>
-#include "kms_platf_objects_interface.h"
-
-/* Private defines -----------------------------------------------------------*/
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-#define GCM_TAGBITS_SIZE          128
-#define GCM_IVLEN_BITS            16
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-/* Private variables ---------------------------------------------------------*/
-CK_SESSION_HANDLE EncryptSession;
-CK_SESSION_HANDLE DecryptSession;
-CK_SESSION_HANDLE AuthenticateSession;
-CK_SESSION_HANDLE VerifySession;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-static uint8_t *gcm_tag_header;
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Get AES key handle.
-  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
-  * @param  phAESKey pointer on AES key object handle
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  /* Identify the slot number */
-  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 2) */
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-/**
-  * @brief  Get ECDSA key handle.
-  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
-  * @param  phAESKey pointer on AES key object handle
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  /* Identify the slot number */
-  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 1) */
-#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
-  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
-  {
-    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
-    e_ret_status = SE_SUCCESS;
-  }
-#endif  /* (NB_FW_IMAGES > 2) */
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
-
-
-/**
-  * @brief Secure Engine Decrypt Init function.
-  *        It is a wrapper of Decrypt_Init function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  CK_RV rv = CKR_OK;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    NULL,
-    0,
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-  gcm_tag_header = pxSE_Metadata->FwTag;
-
-#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  CK_RV rv = CKR_OK;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_MECHANISM cktest_aes_cbc_mechanism =
-  {
-    CKM_AES_CBC,
-    iv_cbc,
-    SE_IV_LEN
-  };
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /*
-   * In this crypto scheme the Firmware is not encrypted.
-   * The Decrypt operation is called anyhow before installing the firmware.
-   * Indeed, it allows moving the Firmware image blocks in FLASH.
-   * These moves are mandatory to create the appropriate mapping in FLASH
-   * allowing the swap procedure to run without using the swap area at each and every move.
-   *
-   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
-   */
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointer allocation */
-  if (pxSE_Metadata == NULL)
-  {
-    return SE_ERROR;
-  }
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /* Nothing to do as we won't decrypt anything */
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Decrypt Append function.
-  *        It is a wrapper of Decrypt_Append function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pInputBuffer pointer to Input Buffer.
-  * @param uInputSize Input Size (bytes).
-  * @param pOutputBuffe pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
-                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  CK_RV rv = CKR_OK;
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
-  if (0 == InputSize)
-  {
-    /* Nothing to do but we must return a success for the decrypt operation to continue */
-    return (SE_SUCCESS);
-  }
-
-  /* Check the pointers allocation */
-  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  /* Buffer decryption */
-  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /*
-   * The firmware is not encrypted.
-   * The only thing we need to do is to recopy the input buffer in the output buffer
-   */
-  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
-  *pOutputSize = InputSize;
-  se_status = SE_SUCCESS;
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Decrypt Finish function.
-  *        It is a wrapper of Decrypt_Finish function included in the protected area.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  *peSE_Status = SE_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  CK_RV rv = CKR_OK;
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-  /* Check the pointers allocation */
-  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
-     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  memcpy(pOutputBuffer, gcm_tag_header, 16);
-
-  /* End-up decryption session */
-  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-  /* Nothing to do */
-  se_status = SE_SUCCESS;
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
-  /* Close the session */
-  rv = C_CloseSession(DecryptSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Init function.
-  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
-                                       uint32_t SE_FwType)
-{
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  CK_RV rv = CKR_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
-  CK_OBJECT_HANDLE hAESKey;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    NULL,
-    0,
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  CK_MECHANISM cktest_sha_256_mechanism =
-  {
-    CKM_SHA256,
-    NULL,
-    0
-  };
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointer allocation */
-  if (pxSE_Metadata == NULL)
-  {
-    return SE_ERROR;
-  }
-
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize encryption session  */
-  rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* Digest initialization */
-  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Append function.
-  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pInputBuffer pointer to Input Buffer.
-  * @param uInputSize Input Size (bytes).
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
-                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  CK_RV rv = CKR_OK;
-
-  /* Check the pointers allocation */
-  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Buffer encryption */
-  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
-                       (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* Digest calculation */
-  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Firmware Authentication Finish function.
-  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pOutputBuffer pointer to Output Buffer.
-  * @param puOutputSize pointer to Output Size (bytes).
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
-{
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  CK_RV rv = CKR_OK;
-
-  /* Check the pointers allocation */
-  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
-  {
-    return SE_ERROR;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* End-up encryption session */
-  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
-  /* End-up Digest calculation */
-  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Close the session */
-  rv = C_CloseSession(AuthenticateSession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-
-  return se_status;
-}
-
-/**
-  * @brief Secure Engine Verify Raw Fw Header Tag.
-  *        It verifies the signature of a raw header file.
-  * @param peSE_Status Secure Engine Status.
-  *        This parameter can be a value of @ref SE_Status_Structure_definition.
-  * @param pFwRawHeader pointer to RawHeader Buffer.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
-{
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  CK_RV rv = CKR_OK;
-  SE_ErrorStatus se_status = SE_SUCCESS;
-  *peSE_Status = SE_OK;
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  int32_t fw_raw_header_output_length = SE_TAG_LEN;
-  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
-  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
-  CK_OBJECT_HANDLE hAESKey = 0UL;
-
-  CK_GCM_PARAMS kms_test_gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    SE_NONCE_LEN,
-    (CK_BYTE_PTR)gcm_header,
-    ((int32_t)SE_FW_AUTH_LEN),
-    GCM_TAGBITS_SIZE
-  };
-
-  CK_MECHANISM cktest_aes_gcm_mechanism =
-  {
-    CKM_AES_GCM,
-    (CK_VOID_PTR *) &kms_test_gcm_params,
-    sizeof(kms_test_gcm_params)
-  };
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
-       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-
-  const uint8_t *pPayload;                        /* Metadata payload */
-  int32_t payloadSize;                            /* Metadata length to be considered for hash */
-  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
-  CK_OBJECT_HANDLE hECDSAKey = 0UL;
-  CK_MECHANISM cktest_ecdsa_256_mechanism =
-  {
-    CKM_ECDSA_SHA256,
-    NULL,
-    0
-  };
-#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
-
-  /* Check the pointers allocation */
-  if (NULL == pxFwRawHeader)
-  {
-    *peSE_Status = SE_KO;
-    return SE_ERROR;
-  }
-
-#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
-  gcm_tag_header = pxFwRawHeader->HeaderSignature;
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-
-  /* Initialize the KMS service */
-  C_Initialize(NULL) ;
-
-  /* Start by opening a session */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize the decryption session */
-  rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up decryption session  : control if the tag is correct */
-  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
-
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
-       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
-
-  pPayload = (const uint8_t *)pxFwRawHeader;
-  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
-
-  /* Identify the keys after FW header analysis (magic tag) */
-  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* Initialize the verification process */
-  rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up verification process : control if the signature is correct */
-  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-#else
-#error "The current example does not support the selected crypto scheme."
-#endif /* SECBOOT_CRYPTO_SCHEME */
-
-  /* Close the session */
-  rv = C_CloseSession(VerifySession);
-  if (rv != CKR_OK)
-  {
-    se_status = SE_ERROR;
-    *peSE_Status = SE_KO;
-  }
-
-  /* End-up the KMS service */
-  C_Finalize(NULL) ;
-
-  return se_status;
-
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
deleted file mode 100644
index 2fffde16..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_mpu_isolation.c
-  * @author  MCD Application Team
-  * @brief   SFU MPU isolation primitives
-  *          This file provides functions to manage the MPU isolation of the Secure Engine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_mpu_isolation.h"
-#include "sfu_low_level_security.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-
-/* Private function prototypes -----------------------------------------------*/
-static void SFU_SE_STACK_Clean(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief Clean SE Stack.
-  *
-  */
-static void SFU_SE_STACK_Clean(void)
-{
-  uint32_t sp_base = SE_REGION_RAM_START;
-  uint32_t sp_top = SE_REGION_RAM_STACK_TOP;
-  uint32_t sp = __get_MSP();
-  if ((sp > sp_base) && (sp <= sp_top))
-  {
-    while (sp_base < sp)
-    {
-      *(__IO uint32_t *)sp_base = 0U;
-      sp_base += 4U;
-    }
-  }
-  else
-  {
-    /*  error trigger a reset */
-    HAL_NVIC_SystemReset();
-  }
-}
-
-
-/**
-  * @brief This is the Supervisor calls handler.
-  * @param args SVC arguments
-  * @retval void
-  * @note Installed in startup_stm32xxxx.s
-  *
-  * This handler handles 2 requests:
-  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter
-  * \li (see @ref SE_FunctionIDTypeDef)
-  * \li Internal SB_SFU SVC: run a SB_SFU privileged operation provided as a parameter (see @ref SFU_MPU_PrivilegedOpId)
-  */
-void MPU_SVC_Handler(uint32_t *args)
-{
-  /* in PSP (args) contains caller context as follow *
-    * args[0] :R0
-    * args[1] :R1
-    * args[2] :R2
-    * args[3] :R3
-    * args[4] :R12
-    * args[5] :LR
-    * args[6] :PC to return after exception
-    * args[7] :xPSR
-  */
-  /*  read code OP of instruction that generate SVC interrupt
-   *  bottom 8-bits of the SVC instruction code OP are SVC value  */
-  uint8_t code = ((uint8_t *)args[6])[-2];
-
-  switch (code)
-  {
-    case 0:
-      /* A Secure Engine service is called */
-      SE_SVC_Handler(args);
-      break;
-    case 1:
-      /* Internal SB_SFU privileged service */
-      SFU_MPU_SVC_Handler(args);
-      break;
-    default:
-      /* Force a reset */
-      HAL_NVIC_SystemReset();
-      break;
-  }
-}
-
-/**
-  * @brief This function triggers a SB_SFU Privileged Operation requested with SB_SysCall
-  * @param args arguments
-  *             The first argument is the identifier of the requested operation.
-  * @retval void
-  */
-void SFU_MPU_SVC_Handler(uint32_t *args)
-{
-  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
-
-  switch (args[0])
-  {
-    case SB_SYSCALL_LAUNCH_APP:
-      /* Clean SE STACK RAM */
-      SFU_SE_STACK_Clean();
-      /* Release CM4 (via SRAM) */
-      *pSbsfuFlag = SBSFU_BOOTED;
-#if defined(SFU_MPU_PROTECT_ENABLE)
-#if defined(SFU_MPU_USERAPP_ACTIVATION)
-      SFU_LL_SECU_SetProtectionMPU_UserApp();
-#else
-      HAL_MPU_Disable();
-#endif /* SFU_MPU_USERAPP_ACTIVATION */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
-#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
-      /* Disable (Hide) Hide Protection Area */
-      SET_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS);
-#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-      /* make sure to return into application in privileged mode */
-      __set_CONTROL(__get_CONTROL() & ~0x3U); /* clear process stack & unprivileged bit */
-      launch_application(args[1], (uint32_t)jump_to_function);
-      break;
-    case SB_SYSCALL_RESET:
-      HAL_NVIC_SystemReset();
-      break;
-    case SB_SYSCALL_MPU_CONFIG:
-#if defined(SFU_MPU_PROTECT_ENABLE)
-      /* Privileged mode required for MPU re-configuration */
-      (void )SFU_LL_SECU_SetProtectionMPU();
-#endif /* SFU_MPU_PROTECT_ENABLE */
-      break;
-    case SB_SYSCALL_DMA_CONFIG:
-#if defined(SFU_DMA_PROTECT_ENABLE)
-      /* Privileged mode required for DMA re-configuration (clocks access required privilege mode) */
-      (void )SFU_LL_SECU_SetProtectionDMA();
-#endif /* SFU_DMA_PROTECT_ENABLE */
-      break;
-    case SB_SYSCALL_DAP_CONFIG:
-#if defined(SFU_DAP_PROTECT_ENABLE)
-      /* Privileged mode required for DAP re-configuration (clock access required privilege mode) */
-      (void )SFU_LL_SECU_SetProtectionDAP();
-#endif /* SFU_DAP_PROTECT_ENABLE */
-      break;
-    case SB_SYSCALL_TAMPER_CONFIG:
-#if defined(SFU_TAMPER_PROTECT_ENABLE)
-      /* Privileged mode required for TAMPER re-configuration (clock access required privilege mode) */
-      (void )SFU_LL_SECU_SetProtectionANTI_TAMPER();
-#endif /* SFU_DAP_PROTECT_ENABLE */
-      break;
-#ifdef SFU_GTZC_PROTECT_ENABLE
-    case SB_SYSCALL_GTZC_CONFIG:
-      /* Privileged mode required for GTZC re-configuration */
-      SFU_LL_SECU_SetProtectionGTZC();
-      break;
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-    default:
-      /* Force a reset */
-      HAL_NVIC_SystemReset();
-      break;
-  }
-}
-
-/**
-  * @brief This functions triggers a SB_SFU system call (supervisor call): request privileged operation
-  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
-  * @param arguments arguments of the privileged operation
-  * @retval void
-  */
-void SFU_MPU_SysCall(uint32_t syscall, ...)
-{
-  /*
-    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
-    * example an SVC.
-    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
-    */
-  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate a SB_SFU syscall */
-}
-
-/**
-  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
-  * @param void
-  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
-  */
-uint32_t SFU_MPU_IsUnprivileged(void)
-{
-  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
-}
-
-/**
-  * @brief This is a helper function to enter the unprivileged level for software execution
-  * @param void
-  * @retval void
-  */
-void SFU_MPU_EnterUnprivilegedMode(void)
-{
-  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
-  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
-  __set_CONTROL(__get_CONTROL() | 3U); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
-  __ISB();
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
deleted file mode 100644
index bf146433..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_test.c
-  * @author  MCD Application Team
-  * @brief   Test Protections module.
-  *          This file provides set of firmware functions to manage Test Protections
-  *          functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_test.h"
-#include "main.h"
-#include "sfu_trace.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level.h"
-#include "string.h" /* required for strncmp */
-
-#if defined(SFU_TEST_PROTECTION)
-
-extern RTC_HandleTypeDef RtcHandle;
-
-/* Private defines -----------------------------------------------------------*/
-#define TEST_ISOLATION 1
-
-/* Automatic tests : list of tests (Address, Message, Operation */
-/* Flash programming by 64 bits */
-#define SHIFT_FLASH_WRITE (8U-1U)
-
-/* Private variables ---------------------------------------------------------*/
-static ProtectionTest_t aProtectTests[] =
-{
-#ifdef SFU_MPU_PROTECT_ENABLE
-  {SFU_RAM_BASE, "MPU SRAM start add", TEST_EXECUTE},
-  {SFU_RAM_END - 3U, "MPU SRAM end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
-  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
-  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
-  /* READ_FLASH is possible only in privileged mode */
-  {INTVECT_START, "Init. Vector", TEST_READ_FLASH},
-  {SLOT_DWL_1_START, "MPU code dwl slot1 begin add", TEST_EXECUTE},
-  {SLOT_DWL_1_END - 3U, "MPU code dwl slot1 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
-  {SLOT_DWL_2_START, "MPU code dwl slot2 begin add", TEST_EXECUTE},
-  {SLOT_DWL_2_END - 3U, "MPU code dwl slot2 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
-  {SLOT_DWL_3_START, "MPU code dwl slot3 begin add", TEST_EXECUTE},
-  {SLOT_DWL_3_END - 3U, "MPU code dwl slot3 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
-  {SWAP_START, "MPU code swap begin add", TEST_EXECUTE},
-  {SWAP_END - 3U, "MPU code swap end add", TEST_EXECUTE},       /* -3 : alignment for 32bits execute test */
-  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
-  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-#ifdef SFU_WRP_PROTECT_ENABLE
-  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
-  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
-  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
-#endif /* SFU_WRP_PROTECT_ENABLE */
-#ifdef SFU_PCROP_PROTECT_ENABLE
-  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
-  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
-                                                                                         writing test */
-  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
-  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
-#endif /* SFU_PCROP_PROTECT_ENABLE */
-#if defined(TEST_ISOLATION)
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
-  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
-                                                                         64bits writing test + WRP protection applies */
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
-  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
-  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
-                                                                    that initializes all the variables in the binary. */
-  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
-  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
-  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
-  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
-  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
-  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
-  /* -8 : previous 64 bits for writing test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
-                                                                                                   for reading test */
-  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
-                                                                                                   for execute test */
-#endif /* TEST_ISOLATION  */
-#ifdef SFU_MPU_PROTECT_ENABLE
-  /* Testing the MPU protection of the OBs */
-  /*
-   * WL55JC
-   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
-   * 0x1FFF 7818 Reserved Write protection 1A
-   * 0x1FFF 7820 Reserved Write protection 1B
-   * 0x1FFF 7870 User option bytes (USER)
-   * 0x1FFF 7878 User option bytes (USER)
-   */
-  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFFC000", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7870, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-  {(uint32_t)0x1FFF7878, "OBs @ 0x1FFFC008", TEST_WRITE_FLASH},
-#endif /* SFU_MPU_PROTECT_ENABLE  */
-  {0xAAAAAAAA, "Execution successful", TEST_END},
-};
-
-
-/* Automatic test : list of operation */
-uint8_t aTestOperation[][20] =
-{
-  "write 8 bytes",
-  "read 1 byte",
-  "erase 512 bytes",
-  "write 4 bytes",
-  "read 1 byte",
-  "execute",
-  "end"
-};
-
-/* Private function prototypes -----------------------------------------------*/
-static void SFU_TEST_Protection(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
-  * @param  None.
-  * @retval None.
-  */
-static void SFU_TEST_Protection(void)
-{
-  uint32_t test_idx;
-  uint32_t flashErrCode = 0;
-  uint64_t pattern = 0U;
-  uint32_t page_error = 0U;
-  FLASH_EraseInitTypeDef p_erase_init;
-  TestStatus status = TEST_IN_PROGRESS;
-  __IO uint8_t tmp;
-  void (*func)(void);
-
-  /*
-    * Now checking the security
-    * We will try to access protected @ and run protected code.
-    * Each time a a flash error will be raised or a reset will be generated by IP protection.
-    * At next boot we read the backup register to check the next @ until all addresses have been verified.
-    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
-    * FWALL/Code Isolation
-    */
-
-  do
-  {
-    /* slow down execution */
-    HAL_Delay(100);
-
-    /* Increment test number for next execution */
-    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
-    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
-           aProtectTests[test_idx].address);
-
-    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
-    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
-        && (aProtectTests[test_idx].address > 0x00000FFFU))
-    {
-      switch (aProtectTests[test_idx].type)
-      {
-        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_WRITE_FLASH :
-          HAL_FLASH_Unlock();
-          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
-          HAL_FLASH_Lock();
-          flashErrCode = HAL_FLASH_GetError();
-          printf("\r\nflash error code: %x", flashErrCode);
-          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
-          {
-            status = TEST_ERROR;
-          }
-
-          /*
-           * OBs protection test: no MPU enabled because the OB cannot be written directly.
-           * A flash error should occur.
-           */
-          break;
-
-        /* Trying to read in FLASH : RDP set in case of PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_READ_FLASH :
-          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
-          HAL_Delay(1);                                                 /* ensure Flag is set */
-          /*
-           * When Isolation activated : RESET should be generated
-           * So the test is FAILED if we reach this line
-           */
-          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
-          {
-            status = TEST_ERROR;
-          }
-
-          break;
-
-        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
-           or reset generated if under FWALL or MPU protection */
-        case TEST_ERASE_FLASH :
-          HAL_FLASH_Unlock();
-          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
-          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
-          p_erase_init.NbPages     = 1;
-          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
-          HAL_FLASH_Lock();
-          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
-          {
-            status = TEST_ERROR;
-          }
-          break;
-
-        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
-        case TEST_WRITE_RAM :
-          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
-          status = TEST_ERROR;
-          break;
-
-        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
-        case TEST_READ_RAM :
-          tmp = *(uint8_t *)aProtectTests[test_idx].address;
-          printf(" value : %d ", tmp);
-          status = TEST_ERROR;
-          break;
-
-          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
-        case TEST_EXECUTE :
-          func = (void(*)(void))(aProtectTests[test_idx].address);
-          func();
-          status = TEST_ERROR;
-          break;
-
-        /* End of execution */
-        case TEST_END :
-          status = TEST_COMPLETED;
-          break;
-
-        default :
-          break;
-      }
-    }
-  } while (status == TEST_IN_PROGRESS) ;
-
-  if (status == TEST_ERROR)
-  {
-    SFU_TEST_Error();
-  }
-  else if (status == TEST_COMPLETED)
-  {
-    /* reset for next run (need a RESET of the platform to restart a session) */
-    printf("\b\b\b\b\b\b\b\b");
-    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
-  }
-}
-
-/**
-  * @brief  Initialization of backup register and start test
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Init(void)
-{
-  /* Use register DR0 to know which if the test sequence is in progress or done */
-  /* Use register DR1 to know which test to run after a reset */
-
-  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
-  {
-    return;
-  }
-  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
-                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
-                                                                  reset test index (DR1) */
-  {
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
-    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
-  }
-
-  /* Start test */
-  SFU_TEST_Protection();
-}
-
-/**
-  * @brief  Reset backup register to be able to execute a new test sequence
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Reset(void)
-{
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
-}
-
-/**
-  * @brief  Error detected during test sequence
-  * @param  None.
-  * @retval None.
-  */
-void SFU_TEST_Error(void)
-{
-  printf(" ===> KO!!!!!");
-  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
-}
-
-#endif /* SFU_TEST_PROTECTION */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
deleted file mode 100644
index 94809362..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
+++ /dev/null
@@ -1,1621 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.c
-  * @author  MCD Application Team
-  * @brief   SFU Security Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level.h"
-#include "sfu_trace.h"
-#include "sfu_boot.h"
-#include "sfu_fsm_states.h" /* needed for sfu_error.h */
-#include "sfu_error.h"
-#include "stm32wlxx_it.h"
-#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
-
-#ifndef  SFU_WRP_PROTECT_ENABLE
-#warning "SFU_WRP_PROTECT_DISABLED"
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifndef  SFU_RDP_PROTECT_ENABLE
-#warning "SFU_RDP_PROTECT_DISABLED"
-#endif /* SFU_RDP_PROTECT_ENABLE */
-
-
-#ifndef  SFU_MPU_PROTECT_ENABLE
-#warning "SFU_MPU_PROTECT_DISABLED"
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#ifndef  SFU_GTZC_PROTECT_ENABLE
-#warning "SFU_GTZC_PROTECT_DISABLED"
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifndef  SFU_C2_DDS_PROTECT_ENABLE
-#warning "SFU_C2_DDS_PROTECT_DISABLED"
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifndef  SFU_C2SWDBG_PROTECT_ENABLE
-#warning "SFU_C2SWDBG_DISABLED"
-#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
-
-
-#ifndef  SFU_TAMPER_PROTECT_ENABLE
-/* #warning "SFU_TAMPER_PROTECT_DISABLED" */
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-#ifndef  SFU_DAP_PROTECT_ENABLE
-#warning "SFU_DAP_PROTECT_DISABLED"
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-#ifndef  SFU_DMA_PROTECT_ENABLE
-#warning "SFU_DMA_PROTECT_DISABLED"
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-#ifndef  SFU_IWDG_PROTECT_ENABLE
-#warning "SFU_IWDG_PROTECT_DISABLED"
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
-#warning "SFU_SECURE_USER_PROTECT_DISABLED"
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-/* Private typedef -----------------------------------------------------------*/
-typedef enum
-{
-  SFU_FALSE = 0U,
-  SFU_TRUE = !SFU_FALSE
-} SFU_BoolTypeDef;
-
-typedef struct
-{
-  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Number */
-  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
-  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
-  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Permission_Attributes */
-  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
-                                                 of  CORTEX_MPU_Instruction_Access */
-  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
-                                                 is 1 region sub region is disabled */
-  uint8_t                Tex;               /*!< Specifies the tex value  */
-  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
-  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
-} SFU_MPU_InitTypeDef;
-
-typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
-
-/* Private variables ---------------------------------------------------------*/
-#ifdef  SFU_IWDG_PROTECT_ENABLE
-static IWDG_HandleTypeDef   IwdgHandle;
-
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-#ifdef  SFU_MPU_PROTECT_ENABLE
-static SFU_MPU_InitTypeDef MpuAreas[] =
-
-{
-  /* Aliases Region and all User Flash & internal RAM */
-  {
-    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
-    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
-    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
-  },
-
-  /* install header : read /write only for privileged */
-  {
-    SFU_PROTECT_MPU_HEADER_RGNV, SFU_PROTECT_MPU_HEADER_START, SFU_PROTECT_MPU_HEADER_SIZE,
-    SFU_PROTECT_MPU_HEADER_PERM, SFU_PROTECT_MPU_HEADER_EXECV, SFU_PROTECT_MPU_HEADER_SREG,
-    SFU_PROTECT_MPU_HEADER_TEXV, SFU_PROTECT_MPU_HEADER_C, SFU_PROTECT_MPU_HEADER_B
-  },
-
-  /*  Flash execution */
-  {
-    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
-    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
-    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
-  },
-
-  /* KMS_DataStorage: NVM storage */
-  {
-    SFU_PROTECT_MPU_KMS_RGNV, SFU_PROTECT_MPU_KMS_START, SFU_PROTECT_MPU_KMS_SIZE,
-    SFU_PROTECT_MPU_KMS_PERM, SFU_PROTECT_MPU_KMS_EXECV, SFU_PROTECT_MPU_KMS_SREG,
-    SFU_PROTECT_MPU_KMS_TEXV, SFU_PROTECT_MPU_KMS_C, SFU_PROTECT_MPU_KMS_B
-  },
-  /*  peripheral  */
-  {
-    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
-    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
-    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
-  }
-};
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#ifdef SFU_RDP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /*SFU_RDP_PROTECT_ENABLE*/
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-
-
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef SFU_C2SWDBG_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void);
-#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
-
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
-#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
-
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
-#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-#ifdef SFU_GTZC_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Check and if not applied apply the Static security  protections to
-  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
-  *         those protections not impacted by a Reset. They are set using the Option Bytes
-  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
-  * @param  None
-  * @note   By default, the best security protections are applied to the different
-  *         flash sections in order to maximize the security level for the specific MCU.
-  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
-  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
-{
-  FLASH_OBProgramInitTypeDef flash_option_bytes;
-  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  (void) HAL_FLASH_Unlock();
-
-  /* Clear OPTVERR bit set on virgin samples */
-  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
-
-  /* Unlock the Options Bytes *************************************************/
-  (void) HAL_FLASH_OB_Unlock();
-
-  /* Get Option Bytes status for WRP AREA_A  **********/
-  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
-  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
-
-  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
-  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
-  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
-  {
-    /* Sanity check of the (enabled) static protections */
-    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-
-#ifdef SFU_SECURE_USER_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
-#ifdef SFU_GTZC_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
-
-    /*RDP level 2 ==> Flow control by-passed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-  }
-  else
-  {
-    /* Check/Set Flash configuration *******************************************/
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-
-    /* Check/Apply WRP ********************************************************/
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-    /* Check/Apply PCRoP ******************************************************/
-
-    /* Check/Apply Secure User Memory *****************************************/
-#ifdef SFU_SECURE_USER_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionSUBGHZSPI(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
-
-    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
-#ifdef SFU_RDP_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_RDP_PROTECT_ENABLE */
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (is_protection_to_be_applied)
-      {
-        /* Generate System Reset to reload the new option byte values *************/
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        (void) HAL_FLASH_OB_Launch();
-      }
-    }
-  }
-
-
-  /* Lock the Options Bytes ***************************************************/
-  (void) HAL_FLASH_OB_Lock();
-
-  /* Lock the Flash to disable the flash control register access (recommended
-  to protect the FLASH memory against possible unwanted operation) *********/
-  (void) HAL_FLASH_Lock();
-
-  /* If it was not possible to apply one of the above mandatory protections, the
-  Option bytes have not been reloaded. Return the error status in order for the
-  caller function to take the right actions */
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  Apply Runtime security  protections.
-  *         Runtime security protections have to be re-configured at each Reset.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
-
-  /* Depending on compilation switches, prevent compilation warning */
-  UNUSED(runtime_protection);
-
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-  /* Check/Apply MPU ************************************************/
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionMPU() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for MPU second-configuration
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_MPU_CONFIG);
-  }
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-
-
-  /* Check/Apply disable DMAs  ************************************************/
-#ifdef SFU_DMA_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DMA_CONFIG);
-  }
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-  /* Check/Apply  IWDG **************************************************/
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-  /* Check/Apply  DAP *********************************************************/
-#ifdef SFU_DAP_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DAP_CONFIG);
-  }
-#else
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-  /* Check/Apply  ANTI_TAMPER *************************************************/
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for TAMPER second-configuration in order to activate the clock through RCC
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_TAMPER_CONFIG);
-  }
-#else
-#ifdef SFU_TEST_PROTECTION
-  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_TEST_PROTECTION */
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-  /* Check/Apply  C2SWDBG *****************************************************/
-#ifdef SFU_C2SWDBG_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionC2SWDBG() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    if (SFU_LL_SECU_CheckProtectionC2SWDBG() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
-    }
-    else
-    {
-      /* When a protection cannot be set then SFU_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
-
-  /* Check/Apply  GTZC ********************************************************/
-#ifdef SFU_GTZC_PROTECT_ENABLE
-  if (uStep == SFU_INITIAL_CONFIGURATION)
-  {
-    if (SFU_LL_SECU_SetProtectionGTZC() == SFU_SUCCESS)
-    {
-      runtime_protection |= SFU_RUNTIME_PROTECTION_GTZC;
-    }
-    else
-    {
-      /* When a protection cannot be set then SB_ERROR is returned */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else
-  {
-    /* Privileged mode required for GTZC second-configuration
-       Errors caught by FLOW_CONTROL */
-    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_GTZC_CONFIG);
-  }
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-  /* Check/Apply  CLOCK_MONITOR **********************************************/
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
-
-  /* Check/Apply  TEMP_MONITOR **********************************************/
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
-
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Return the reset source  detected after a reboot. The related flag is reset
-  *         at the end of this function.
-  * @param  peResetpSourceId: to be filled with the detected source of reset
-  * @note   In case of multiple reset sources this function return only one of them.
-  *         It can be improved returning and managing a combination of them.
-  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
-  */
-void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
-{
-  /* Check if the last reset has been generated from a Watchdog exception */
-  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
-      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
-  {
-    *peResetpSourceId = SFU_RESET_WDG_RESET;
-
-  }
-
-
-  /* Check if the last reset has been generated from a Low Power reset */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_LOW_POWER;
-
-  }
-
-  /* Check if the last reset has been generated from a Software reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_SW_RESET;
-
-  }
-  /* Check if the last reset has been generated from an Option Byte Loader reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_OB_LOADER;
-  }
-  /* Check if the last reset has been generated from a Hw pin reset  */
-  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
-  {
-    *peResetpSourceId = SFU_RESET_HW_RESET;
-
-  }
-  /* Unknown */
-  else
-  {
-    *peResetpSourceId = SFU_RESET_UNKNOWN;
-  }
-}
-
-/**
-  * @brief  Clear the reset sources. This function should be called after the actions
-  *         on the reset sources has been already taken.
-  * @param  none
-  * @note   none
-  * @retval none
-  */
-void SFU_LL_SECU_ClearResetSources()
-{
-  /* Clear reset flags  */
-  __HAL_RCC_CLEAR_RESET_FLAGS();
-}
-
-/**
-  * @brief  Refresh Watchdog : reload counter
-  *         This function must be called just before jumping to the UserFirmware
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  /* Refresh IWDG: reload counter */
-  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-#else
-  e_ret_status = SFU_SUCCESS;
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check Flash configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
-  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
-      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-  }
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  Set Flash configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check Flash configuration */
-  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
-    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
-    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
-    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-    }
-#else
-    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-#ifdef SFU_RDP_PROTECT_ENABLE
-/**
-  * @brief  Apply the RDP protection
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply RDP **********************************************************/
-  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
-  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
-  {
-    e_ret_status = SFU_SUCCESS; /*Protection already applied */
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
-    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
-#else
-    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
-#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
-    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
-    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-  return e_ret_status;
-}
-#endif /*SFU_RDP_PROTECT_ENABLE*/
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-/**
-  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Check WRP ****************************************************************/
-  if ((psFlashOptionBytes->WRPStartOffset > SFU_PROTECT_WRP_PAGE_START_1) ||
-      (psFlashOptionBytes->WRPEndOffset   < SFU_PROTECT_WRP_PAGE_END_1))
-  {
-    e_ret_status = SFU_ERROR; /*Protection not applied */
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply WRP **********************************************************/
-  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS; /*Protection already applied */
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
-    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
-    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
-    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-/**
-  * @brief  Apply MPU protection before executing UserApp
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
-{
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  /* configure a new area for the currently executing code (SBSFU + active slots) */
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_2_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_2_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_2_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_2_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_2_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_2_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_2_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_2_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_2_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  /* remap the current area (SBSFU + active slots) */
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_1_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_1_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_1_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_1_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_1_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_1_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_1_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_1_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_1_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  /*  Remove the write rights for the SRAM synchronization flag */
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_SRAM_FLAG_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_SRAM_FLAG_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_SRAM_FLAG_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_SRAM_FLAG_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_SRAM_FLAG_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_SRAM_FLAG_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_SRAM_FLAG_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_SRAM_FLAG_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_SRAM_FLAG_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-
-  return SFU_SUCCESS;
-}
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-
-/**
-  * @brief  Apply MPU protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint8_t mpu_region_num; /* id of the MPU region being configured */
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  HAL_MPU_Disable();
-
-  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
-  {
-    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
-    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
-    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
-    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
-    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
-    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
-    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
-    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
-    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
-          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
-          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    HAL_MPU_ConfigRegion(&MPU_InitStruct);
-  }
-  HAL_MPU_Enable(MPU_HARDFAULT_NMI);
-  e_ret_status = SFU_SUCCESS;
-
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
-  }
-  return e_ret_status;
-}
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-/**
-  * @brief  Apply GTZC protection: FLASH, RAM, PKA, RNG, AES.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionGTZC(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  MPCWM_ConfigTypeDef mpcwm_desc;
-
-  /* Handle the GTZC TZC lock *************************************************/
-
-  /* Configure FLASH memory ***************************************************/
-  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
-  mpcwm_desc.Length = SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE;
-  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
-  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Configure SRAM1 memory ***************************************************/
-  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
-  mpcwm_desc.Length = SRAM1_SIZE;
-  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Configure SRAM2 memory ***************************************************/
-  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
-  mpcwm_desc.Length = SE_REGION_RAM_START - SRAM2_BASE;
-  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Configure TZSC peripherals ***********************************************/
-  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_AES,
-                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_RNG,
-                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
-                                           (GTZC_TZSC_ATTRIBUTE_NPRIV)) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_PKA,
-                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Configure TZIC peripherals ***********************************************/
-
-  /* Configure FLASH_ACR2 */
-  MODIFY_REG(FLASH->ACR2, FLASH_ACR2_PRIVMODE, FLASH_ACR2_PRIVMODE);
-
-  /* Enable the IT for the concerned peripherals */
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZIC) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZSC) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_AES) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_RNG) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SUBGHZSPI) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PWR) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASHIF) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA1) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA2) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMAMUX) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASH) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM1) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PKA) != HAL_OK)
-  {
-    e_ret_status = SFU_ERROR;
-  }
-
-  /* Enable IRQ */
-  NVIC_EnableIRQ(TZIC_ILA_IRQn);
-
-  /* Handle the GTZC TZC lock *************************************************/
-  HAL_GTZC_TZSC_Lock(GTZC_TZSC);
-
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-
-
-#ifdef SFU_DMA_PROTECT_ENABLE
-/**
-  * @brief  Apply DMA protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
-{
-  /*
-   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
-   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
-   * information in SRAM, FLASH
-   */
-  /* Disable  DMA1, DMA2 */
-  __HAL_RCC_DMA1_CLK_DISABLE();
-
-  __HAL_RCC_DMA2_CLK_DISABLE();
-
-  __HAL_RCC_DMAMUX1_CLK_DISABLE();
-
-
-
-
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
-  return SFU_SUCCESS;
-}
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-/**
-  *  @brief Apply IWDG protection
-  *         The IWDG timeout is set to 4 second.
-  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
-  *         to the measured LSI frequency after setting the prescaler value:
-  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
-  This is not used in this implementation because not necessary and in order
-  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
-
-  /* Configure & Start the IWDG peripheral */
-  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
-  IWDG counter clock Frequency = uwLsiFreq
-  Set Prescaler to 64 (IWDG_PRESCALER_64)
-  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
-  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
-  IwdgHandle.Instance = IWDG;
-  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
-  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
-  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
-
-  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef SFU_DAP_PROTECT_ENABLE
-/**
-  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-
-  /* Enable clock of DBG GPIO port */
-  SFU_DBG_CLK_ENABLE();
-
-  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
-  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
-  e_ret_status = SFU_SUCCESS;
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
-
-  return e_ret_status;
-}
-#else
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-/**
-  * @brief  Apply ANTI TAMPER protection
-  * @param None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  RTC_TamperTypeDef  stamperstructure;
-
-  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
-  TAMPER_GPIO_CLK_ENABLE();
-
-  /* Configure Tamper Pin */
-  /* tamper is an additional function */
-  /* not an alternate Function : config not needed */
-  /* Configure the RTC peripheral */
-  /* Configure RTC prescaler and RTC data registers */
-  /* RTC configured as follows:
-  - Hour Format    = Format 24
-  - Asynch Prediv  = Value according to source clock
-  - Synch Prediv   = Value according to source clock
-  - OutPut         = Output Disable
-  - OutPutPolarity = High Polarity
-  - OutPutType     = Open Drain */
-  RtcHandle.Instance            = RTC;
-  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
-  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
-  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
-  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
-  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
-  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
-
-  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
-  {
-    /* Configure RTC Tamper */
-    stamperstructure.Tamper                       = RTC_TAMPER_ID;
-    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
-    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
-    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
-    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
-    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
-    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
-    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
-    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
-
-    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
-    {
-
-      /* Clear the Tamper interrupt pending bit */
-      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
-    }
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-
-#ifdef SFU_C2SWDBG_PROTECT_ENABLE
-/**
-  * @brief  Check if C2SWDBG protection is enabled.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_C2SWDBGEN) == 0U)
-  {
-    /* C2SWDBG disabled */
-    e_ret_status = SFU_SUCCESS;
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply C2SWDBG protection
-  * @param None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void)
-{
-  HAL_FLASHEx_DisableC2Debug();
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
-  return SFU_SUCCESS;
-}
-#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
-
-#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
-/**
-  * @brief  Apply CLOCK MONITOR protection
-  * @note   This function has been added just as template to be used/customized
-  *         if a clock monitor is requested.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply the Clock Monitoring */
-  /* Add your code here for customization
-     e.g. if HSE or LSE is used enable the CSS!
-   ...
-   ...
-  */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
-
-#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
-/**
-  * @brief  Apply TEMP MONITOR protection
-  * @note   This function has been added just as template to be used/customized
-  *         if a temperature monitor is requested.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply the Temperature Monitoring */
-  /* Add your code here for customization
-     ...
-     ...
-  */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-}
-#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
-
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-/**
-  * @brief  Check Secure User Memory protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
-   */
-  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
-  {
-    /*
-     * In this example secure area covers:
-     * - the SB_SFU code
-     * - the header of the active slots
-     */
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-    TRACE("\r\n= [SBOOT] Secure Mode: [%x]", psFlashOptionBytes->SecureMode);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-    e_ret_status = SFU_SUCCESS;
-
-    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
-    {
-      if (psFlashOptionBytes->SecureFlashStartAddr == SFU_SECURE_FLASH_START)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [SBOOT] Secure Flash Start Address: [%x]", psFlashOptionBytes->SecureFlashStartAddr);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
-    {
-      if (psFlashOptionBytes->HideProtectionStartAddr == SFU_HIDE_PROTECTION_START)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [SBOOT] Hide Protection Start Address: [%x]", psFlashOptionBytes->HideProtectionStartAddr);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
-    {
-      if (psFlashOptionBytes->SecureSRAM1StartAddr == SFU_SECURE_SRAM1_START)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [SBOOT] Secure SRAM1 Start Address: [%x]", psFlashOptionBytes->SecureSRAM1StartAddr);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
-    {
-      if (psFlashOptionBytes->SecureSRAM2StartAddr == SFU_SECURE_SRAM2_START)
-      {
-#if defined(SFU_VERBOSE_DEBUG_MODE)
-        TRACE("\r\n= [SBOOT] Secure SRAM2 Start Address: [%x]", psFlashOptionBytes->SecureSRAM2StartAddr);
-#endif /* SFU_VERBOSE_DEBUG_MODE */
-      }
-      else
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-  }
-
-  /* Execution stopped if flow control failed */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Apply Secure User Memory protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if Secure User Memory is already configured */
-  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
-
-    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
-    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
-    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
-    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
-    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: Secure User Memory is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-/**
-  * @brief  Activate Secure User Memory protection and jump into user application.
-  * @param  Address of the code to jump into
-  * @retval none.
-  */
-
-
-#ifdef SFU_GTZC_PROTECT_ENABLE
-/**
-  * @brief  Check Sub-GHz radio SPI protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply Sub-GHz radio SPI ********************************************/
-  /* Check if the protection is already applied */
-  if (psFlashOptionBytes->SUBGHZSPISecureAccess == OB_SUBGHZSPI_SECURE_ACCESS_ENABLE)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply Sub-GHz radio SPI protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if the protection is already applied */
-  if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_SUBGHZSPI_SECURE_ACCESS;
-
-    psFlashOptionBytes->SUBGHZSPISecureAccess = OB_SUBGHZSPI_SECURE_ACCESS_ENABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-/**
-  * @brief  Check DDS protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply DDS ********************************************/
-  /* Check if the protection is already applied */
-  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply DDS protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if the protection is already applied */
-  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
-
-    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
-    }
-#else
-    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
deleted file mode 100644
index ce5a8dad..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_SECURITY_H
-#define SFU_LOW_LEVEL_SECURITY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_fwimg_regions.h"
-#include "sfu_def.h"
-
-/* Exported constants --------------------------------------------------------*/
-/* Secure User Memory end : from FLASH_BASE to end of active slot header */
-#define SFU_SEC_MEM_AREA_ADDR_END ((uint32_t) (SlotHeaderAdd[SLOT_ACTIVE_1] + SFU_IMG_IMAGE_OFFSET - 1U))
-
-
-/*!< Bank 1, Area A  used to protect Vector Table */
-#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
-
-/*!< First page including the Vector Table: 0 based */
-#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Last page: (code_size-1)/page_size because the page
-     indexes start from 0 */
-#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-
-
-#define SFU_PROTECT_GTZC_EXEC_SE_START INTVECT_START /*!< GTZC Configuration */
-
-/**
-  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
-  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
-  *    The priorities are fixed, and cannot be changed.
-  */
-
-
-
-
-#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
-
-/**
-  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
-  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
-  *                   but used only to read and write the downloaded code RAM is also not executable.
-  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
-#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
-#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
-#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
-#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
-
-/**
-  * @brief Region 1 - Enable the read/write operations for full peripheral area in unprivileged mode.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
-#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
-#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
-#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
-#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys) in unprivileged mode.
-  *                   Read only capability configured
-  *                   Inner region inside the Region 0
-  *                   From 0x0802C000 ==> 0x0803FFFF
-  */
-#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
-#define SFU_PROTECT_MPU_FLASHEXE_START 0x08020000UL
-#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_128KB
-#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x07U               /*!< 128 Kbytes / 8 * 5 ==> 80 Kbytes */
-#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
-#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 3 - Enable the read/write operation in privileged mode for Header of active slots
-  *                   Execution capability disabled
-  *                   Inner region inside the Region 0
-  */
-#define SFU_PROTECT_MPU_HEADER_RGNV  MPU_REGION_NUMBER3
-#define SFU_PROTECT_MPU_HEADER_START SLOT_ACTIVE_2_HEADER
-#define SFU_PROTECT_MPU_HEADER_SREG  0x00U                 /*!< All subregions activated */
-#define SFU_PROTECT_MPU_HEADER_SIZE  MPU_REGION_SIZE_4KB
-#define SFU_PROTECT_MPU_HEADER_PERM  MPU_REGION_PRIV_RW
-#define SFU_PROTECT_MPU_HEADER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_HEADER_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_HEADER_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_HEADER_C     MPU_ACCESS_CACHEABLE
-
-/**
-  * @brief Region 4 - Enable the read/write operation in privileged mode for KMS_DataStorage
-  *                   Execution capability disabled
-  *                   Inner region inside the Region 0
-  */
-#define SFU_PROTECT_MPU_KMS_RGNV  MPU_REGION_NUMBER4
-#define SFU_PROTECT_MPU_KMS_START (uint32_t)KMS_DATASTORAGE_START
-#define SFU_PROTECT_MPU_KMS_SREG  0x00U               /*!< All subregions activated */
-#define SFU_PROTECT_MPU_KMS_SIZE  MPU_REGION_SIZE_8KB
-#define SFU_PROTECT_MPU_KMS_PERM  MPU_REGION_PRIV_RW
-#define SFU_PROTECT_MPU_KMS_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_KMS_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_KMS_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_KMS_C     MPU_ACCESS_CACHEABLE
-
-/**
-  */
-
-/**
-  * MPU configuration for UserApp execution
-  * =======================================
-  * Reconfiguration of existing regions (useless during UserApp execution)
-  * MPU constraint = Region base address should be aligned on Region size
-  */
-
-/**
-  * @brief Region 2 - Enable the execution for the SBSFU and active slots in unprivileged mode.
-  *                   Read only capability configured
-  *                   Execution capability enabled
-  *                   Execution capability restricted by other regions (MPU and secure)
-  *                   From 0x08015000 ==> 0x08017FFF (12 kbytes)
-  */
-#define APP_PROTECT_MPU_FLASHEXE_1_RGNV  MPU_REGION_NUMBER2
-#define APP_PROTECT_MPU_FLASHEXE_1_START 0x08014000UL
-#define APP_PROTECT_MPU_FLASHEXE_1_SIZE  MPU_REGION_SIZE_16KB
-#define APP_PROTECT_MPU_FLASHEXE_1_SREG  0x03U               /*!< 16 Kbytes / 8 * 6 ==> 12 Kbytes */
-#define APP_PROTECT_MPU_FLASHEXE_1_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_FLASHEXE_1_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_FLASHEXE_1_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_FLASHEXE_1_B     MPU_ACCESS_BUFFERABLE
-#define APP_PROTECT_MPU_FLASHEXE_1_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 3 - Enable the execution for the SBSFU and active slots in unprivileged mode.
-  *                   Read only capability configured
-  *                   Execution capability enabled
-  *                   Execution capability restricted by other regions (MPU and secure)
-  *                   From 0x08018000 ==> 0x0803FFFF (160 kbytes)
-  */
-#define APP_PROTECT_MPU_FLASHEXE_2_RGNV  MPU_REGION_NUMBER3
-#define APP_PROTECT_MPU_FLASHEXE_2_START FLASH_BASE          /*!< FLASH memory area */
-#define APP_PROTECT_MPU_FLASHEXE_2_SIZE  MPU_REGION_SIZE_256KB
-#define APP_PROTECT_MPU_FLASHEXE_2_SREG  0x07U               /*!< 256 Kbytes / 8 * 5 ==> 160 Kbytes */
-#define APP_PROTECT_MPU_FLASHEXE_2_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_FLASHEXE_2_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_FLASHEXE_2_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_FLASHEXE_2_B     MPU_ACCESS_BUFFERABLE
-#define APP_PROTECT_MPU_FLASHEXE_2_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
-  *                   Execution capability disabled
-  */
-#define APP_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
-#define APP_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
-#define APP_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
-#define APP_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
-#define APP_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define APP_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
-#define APP_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
-
-
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
-  * @{
-  */
-#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RTC_TAMPER_ID                      RTC_TAMPER_1
-#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
-  * @{
-  */
-#define SFU_DBG_PORT            GPIOA
-#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
-#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
-  * @{
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
-  * @{
-  */
-typedef enum
-{
-  SFU_RESET_UNKNOWN = 0x00U,
-  SFU_RESET_WDG_RESET,
-  SFU_RESET_LOW_POWER,
-  SFU_RESET_HW_RESET,
-  SFU_RESET_BOR_RESET,
-  SFU_RESET_SW_RESET,
-  SFU_RESET_OB_LOADER,
-} SFU_RESET_IdTypeDef;
-
-/**
-  * @}
-  */
-
-/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
-  * @{
-  */
-#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
-#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
-#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
-                                                                            separate section to support PCRoP */
-#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
-#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
-                                                                            Std Protections cannot be
-                                                                            added/removed/modified */
-#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
-                                                                            boot in bank1! */
-
-#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
-#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
-#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
-#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
-#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
-#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
-#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
-#define SFU_RUNTIME_PROTECTION_GTZC          ((uint32_t)0x00010000U)   /*!< GTZC protection */
-#define SFU_RUNTIME_PROTECTION_C2SWDBG       ((uint32_t)0x00020000U)   /*!< CPU2 Software Debug */
-
-#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
-                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
-/*!< All the static protections */
-
-#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
-                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
-                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
-                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | \
-                                             SFU_RUNTIME_PROTECTION_TEMP_MONITOR  | \
-                                             SFU_RUNTIME_PROTECTION_GTZC          | \
-                                             SFU_RUNTIME_PROTECTION_C2SWDBG)
-/*!< All the run-time protections */
-
-#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
-#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
-#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
-
-/* Exported functions ------------------------------------------------------- */
-#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
-/*!<SFU Redirect of RTC Tamper Event Callback*/
-#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
-#ifdef SFU_GTZC_PROTECT_ENABLE
-#define SFU_CALLBACK_GTZC_TZIC(void) HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
-void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
-void               SFU_LL_SECU_ClearResetSources(void);
-#ifdef SFU_MPU_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(void);
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-#ifdef SFU_DMA_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-#ifdef SFU_DAP_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-#if defined(SFU_MPU_PROTECT_ENABLE)
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
-#endif /* SFU_MPU_PROTECT_ENABLE */
-#ifdef SFU_GTZC_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionGTZC(void);
-#endif /* SFU_GTZC_PROTECT_ENABLE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_SECURITY_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/main.h
deleted file mode 100644
index 9b52ebc4..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/main.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    main.h
-  * @author  MCD Application Team
-  * @brief   Header for main.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MAIN_H
-#define __MAIN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-
-#include "stm32wlxx_nucleo.h"
-#include "sfu_def.h"
-#include "app_sfu.h"
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-void Error_Handler(void);
-
-/* USER CODE BEGIN EFP */
-SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
-void SFU_EXCPT_Security_Error(void);
-/* USER CODE END EFP */
-
-/* Private defines -----------------------------------------------------------*/
-/* USER CODE BEGIN Private defines */
-
-/* USER CODE END Private defines */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MAIN_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
deleted file mode 100644
index e38cb702..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_boot.h
-  * @author  MCD Application Team
-  * @brief   Header the Secure Boot module.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_BOOT_H
-#define SFU_BOOT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/**
-  * @brief  SB Flow Control : Initial value
-  */
-#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
-
-/**
-  * @brief  SB Flow Control : Steps definition
-  */
-
-#define FLOW_STEP_C2BOOT 0x00006787U             /*!< Step C2OPT and SBRV value */
-
-#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
-
-#ifdef  SFU_WRP_PROTECT_ENABLE
-#define FLOW_STEP_WRP 0x0002cccdU                /*!< Step WRP value */
-#else
-#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifdef  SFU_RDP_PROTECT_ENABLE
-#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
-#else
-#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_RDP_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-#define FLOW_STEP_C2_DDS 0x00003befU             /*!< Step DDS value */
-#else
-#define FLOW_STEP_C2_DDS 0x00000000U             /*!< No effect on control flow */
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
-#else
-#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-#ifdef  SFU_TAMPER_PROTECT_ENABLE
-#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
-#else
-#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-#ifdef  SFU_MPU_PROTECT_ENABLE
-#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
-#else
-#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#ifdef  SFU_FWALL_PROTECT_ENABLE
-#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
-#else
-#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
-#endif /* SFU_FWALL_PROTECT_ENABLE */
-
-#ifdef  SFU_DMA_PROTECT_ENABLE
-#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
-#else
-#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-#ifdef  SFU_IWDG_PROTECT_ENABLE
-#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
-#else
-#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-#ifdef  SFU_DAP_PROTECT_ENABLE
-#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
-#else
-#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-/**
-  * @brief  SB Flow Control : Control values static protections
-  */
-#define FLOW_CTRL_C2BOOT (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_C2BOOT)
-#define FLOW_CTRL_UBE (FLOW_CTRL_C2BOOT ^ FLOW_STEP_UBE)
-#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
-#define FLOW_CTRL_C2_DDS (FLOW_CTRL_WRP ^ FLOW_STEP_C2_DDS)
-#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_C2_DDS ^ FLOW_STEP_SEC_MEM)
-#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
-#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
-
-/**
-  * @brief  SB Flow Control : Control values runtime protections
-  */
-#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
-#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
-#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
-#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
-#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
-#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
-#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
-
-/**
-  * @brief  SB Flow Control : Exported macro
-  */
-#if defined(MAIN_C)
-uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
-uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
-#else
-extern uint32_t uFlowProtectValue;
-extern uint32_t uFlowCryptoValue;
-#endif /* MAIN_C */
-
-/* Control with STEP operation :
- * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
- */
-#define FLOW_CONTROL_STEP(C,B,A) \
-  do{ \
-    (C) ^= (B);\
-    if ((C) != (A))\
-      SFU_EXCPT_Security_Error();\
-  }while(0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_BOOT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h
deleted file mode 100644
index e74ce1d3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_loader.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update local
-  *          loader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOADER_H
-#define SFU_LOADER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "se_def.h"
-#include "sfu_def.h"
-#include "sfu_new_image.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU_LOADER Status Type Definition
-  */
-typedef enum
-{
-  SFU_LOADER_OK                            = 0x00U,
-  SFU_LOADER_ERR_COM                       = 0x01U,
-  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
-  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
-  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
-  SFU_LOADER_ERR_FLASH                     = 0x05U,
-  SFU_LOADER_ERR_CRYPTO                    = 0x06U
-} SFU_LOADER_StatusTypeDef;
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LOADER_Init(void);
-SFU_ErrorStatus SFU_LOADER_DeInit(void);
-SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
-                                             uint32_t *p_Size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOADER_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
deleted file mode 100644
index 881d6886..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_SECURITY_H
-#define SFU_LOW_LEVEL_SECURITY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_fwimg_regions.h"
-#include "se_def_core.h"
-
-
-/*!< Bank 1, Area A  used to protect Vector Table */
-#define SFU_C2_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAA)
-
-/*!< First page including the Vector Table: 0 based */
-#define SFU_C2_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Last page: (code_size-1)/page_size because the page
-     indexes start from 0 */
-#define SFU_C2_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Bank 1, Area B  used to protect Vector Table */
-#define SFU_C1_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAB)
-
-/*!< First page including the Vector Table: 0 based */
-#define SFU_C1_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_C1_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/*!< Last page: (code_size-1)/page_size because the page
-     indexes start from 0 */
-#define SFU_C1_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_C1_AREA_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
-
-/**
-  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
-  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
-  *    The priorities are fixed, and cannot be changed.
-  */
-
-
-
-
-#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
-
-/**
-  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
-  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
-  *                   but used only to read and write the downloaded code RAM is also not executable.
-  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
-#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
-#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
-#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
-#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
-
-/**
-  * @brief Region 1 - Enable the read/write operations for full peripheral area (without bit banding region) in
-  *                   unprivileged mode.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
-#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
-#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
-#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
-#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
-#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 2 - Enable the execution for SB Full area in unprivileged mode.
-  *                   Read only capability configured
-  *                   from 0x08000000 ==> 0x08004FFF (20 Kbytes)
-  */
-#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
-#define SFU_PROTECT_MPU_FLASHEXE_START M4_SB_REGION_ROM_START
-#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_32KB
-#define SFU_PROTECT_MPU_FLASHEXE_SREG  0xE0U               /*!< 32 Kbytes / 8 * 5 ==> 20 Kbytes */
-#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO
-#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 3 - Enable the execution for SB Full area in unprivileged mode.
-  *                   Read only capability configured
-  *                   In addition to region 2, from 0x08005000 ==> 0x080057FF (2 Kbytes)
-  */
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER3
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_START 0x08005000UL
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_2KB
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x00U               /*!< All subregions activated */
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 4 - Forbid all access to the active slot.
-  *                   From 0x08018000 ==> 0x0801BFFF (16 kbytes)
-  */
-#define SFU_PROTECT_MPU_APP_FLASHEXE_RGNV  MPU_REGION_NUMBER4
-#define SFU_PROTECT_MPU_APP_FLASHEXE_START 0x08018000UL
-#define SFU_PROTECT_MPU_APP_FLASHEXE_SIZE  MPU_REGION_SIZE_16KB
-#define SFU_PROTECT_MPU_APP_FLASHEXE_SREG  0x00U           /*!< All subregions activated */
-#define SFU_PROTECT_MPU_APP_FLASHEXE_PERM  MPU_REGION_NO_ACCESS
-#define SFU_PROTECT_MPU_APP_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_APP_FLASHEXE_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_APP_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_APP_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 5 - Forbid all access to the active slot.
-  *                   In addition to region 4, from 0x08015000 ==> 0x08017FFF (12 kbytes)
-  */
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER5
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START 0x08014000UL
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_16KB
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG  0x03U    /*!< 16 Kbytes / 8 * 6 ==> 12 Kbytes */
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM  MPU_REGION_NO_ACCESS
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
-#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 6 - Enable the read operation for SBSFU synchronization flag.
-  *                   Execution capability disabled
-  */
-#define SFU_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER6
-#define SFU_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
-#define SFU_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
-#define SFU_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
-#define SFU_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
-#define SFU_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
-#define SFU_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
-#define SFU_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
-#define SFU_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
-
-/**
-  * MPU configuration for UserApp execution
-  * =======================================
-  * Reconfiguration of existing regions (useless during UserApp execution)
-  * MPU constraint = Region base address should be aligned on Region size
-  */
-
-/**
-  * @brief Region 4 - Enable the execution for the active slot in unprivileged mode.
-  *                   Read only capability configured
-  *                   From 0x08018000 ==> 0x0801BFFF (16 kbytes)
-  */
-#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER4
-#define APP_PROTECT_MPU_FLASHEXE_START 0x08018000UL
-#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_16KB
-#define APP_PROTECT_MPU_FLASHEXE_SREG  0x00U           /*!< All subregions activated */
-#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
-#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
-
-/**
-  * @brief Region 5 - Enable the execution for active slot in unprivileged mode.
-  *                   Read only capability configured
-  *                   In addition to region 4, from 0x08015000 ==> 0x08017FFF (12 kbytes)
-  */
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER5
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_START 0x08014000UL
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_16KB
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x03U    /*!< 16 Kbytes / 8 * 6 ==> 12 Kbytes */
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO_URO
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
-#define APP_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
-
-
-#define SFU_DBG_PORT            GPIOA
-#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
-#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
-
-#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
-#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. */
-#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
-#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
-#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
-#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
-
-#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_WRP)
-/*!< All the static protections */
-
-#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | \
-                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP  | \
-                                             SFU_RUNTIME_PROTECTION_DMA )
-/*!< All the run-time protections */
-
-#define SFU_INITIAL_CONFIGURATION           (0x00)     /*!< Initial configuration */
-
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
-SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
-#ifdef SFU_MPU_PROTECT_ENABLE
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(void);
-SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void);
-SE_ErrorStatus SE_SFU_IMG_Write(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SE_ErrorStatus SE_SFU_IMG_Read(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_SECURITY_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 6b8db4f7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/* COM usage define */
-#define USE_BSP_COM_FEATURE                 0U
-
-/* COM log define */
-#define USE_COM_LOG                         0U
-
-/* IRQ priorities */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/main.c
deleted file mode 100644
index b66749d7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/main.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    main.c
-  * @author  MCD Application Team
-  * @brief   Main program body
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-
-#define MAIN_C
-
-#include "sfu_fwimg_regions.h"
-#include "sfu_def.h"
-#include "sfu_loader.h"
-#include "sfu_com_loader.h"
-#include "sfu_low_level.h"
-#include "sfu_low_level_security.h"
-#include "sfu_low_level_flash.h"
-#include "sfu_trace.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_new_image.h"
-#include "sfu_boot.h"
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-/**
-  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
-  */
-SE_FwRawHeaderTypeDef fw_image_header_validated;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-void SystemClock_Config(void);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/**
-  * @brief  The application entry point.
-  * @retval int
-  */
-int main(void)
-{
-  /* USER CODE BEGIN 1 */
-  uint32_t jump_address ;
-  typedef void (*Function_Pointer)(void);
-  Function_Pointer  p_jump_to_function;
-  __IO uint32_t *pSbsfuFlag = (__IO uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
-  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
-  uint32_t                  dwl_slot;
-  uint32_t                  u_size = 0;
-  SFU_FLASH_StatusTypeDef   flash_if_info;
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-  /* USER CODE END 1 */
-
-  /* MCU Configuration--------------------------------------------------------*/
-
-  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-  HAL_Init();
-
-  /* USER CODE BEGIN Init */
-
-  /* USER CODE END Init */
-
-  /* Configure the system clock */
-  SystemClock_Config();
-
-  /* USER CODE BEGIN SysInit */
-  /* LED Init*/
-  BSP_LED_Init(LED_RED);
-
-  /* Reset the SRAM1 flag */
-  *pSbsfuFlag = SBSFU_NOT_BOOTED;
-
-  /* Configure the security features */
-  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
-  {
-    SFU_EXCPT_Security_Error();
-  }
-
-  /* Boot CPU2 */
-  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-
-  /* Wait for the flag */
-  while (*pSbsfuFlag == SBSFU_NOT_BOOTED)
-  {
-    BSP_LED_Toggle(LED_RED);
-    HAL_Delay(500U);
-  }
-  BSP_LED_Off(LED_RED);
-  /* USER CODE END SysInit */
-
-  /* Initialize all configured peripherals */
-  /* USER CODE BEGIN 2 */
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-  if (*pSbsfuFlag == SBSFU_FW_DOWNLOAD)
-  {
-    /* Initialize external flash interface (OSPI/QSPI) */
-    SFU_LL_FLASH_Init();
-
-    /* Configure Communication module */
-    SFU_LL_UART_Init();
-
-    TRACE("\r\n======================================================================");
-    TRACE("\r\n=                           Loader                                   =");
-    TRACE("\r\n======================================================================");
-    TRACE("\r\n");
-
-    /* Loader initialization */
-    e_ret_status = SFU_LOADER_Init();
-    if (e_ret_status != SFU_SUCCESS)
-    {
-      TRACE("Initialization failure : reset !");
-      NVIC_SystemReset();
-    }
-
-    /* Download new firmware */
-    e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Read header in dwl slot */
-      e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
-                                       sizeof(SE_FwRawHeaderTypeDef));
-    }
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /*
-       * Notify the Secure Boot that a new image has been downloaded
-       * by calling the SE interface function to trigger the installation procedure at next reboot.
-       */
-       TRACE("\r\nDownload successful : %d bytes received\r\n", u_size);
-      if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
-      {
-        /* Erase downloaded image */
-        SFU_LL_FLASH_Erase_Size(&flash_if_info, (void *) SlotStartAdd[SLOT_DWL_1], SLOT_SIZE(SLOT_DWL_1));
-
-        /* no specific error cause set */
-      }
-    }
-    else
-    {
-      /* Erase downloaded image */
-      TRACE("\r\nDownload failed (%d)\r\n", e_ret_status);
-      SFU_LL_FLASH_Erase_Size(&flash_if_info, (void *) SlotStartAdd[SLOT_DWL_1], SLOT_SIZE(SLOT_DWL_1));
-    }
-
-    /* Reset to restart SBSFU */
-    NVIC_SystemReset();
-  }
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-  if (*pSbsfuFlag == SBSFU_BOOTED)
-  {
-#if defined(SFU_MPU_USERAPP_ACTIVATION)
-    SFU_LL_SECU_SetProtectionMPU_UserApp();
-#else
-    HAL_MPU_Disable();
-#endif /* SFU_MPU_USERAPP_ACTIVATION */
-
-    jump_address = *(__IO uint32_t *)((SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET + 4));
-    /* Jump to user application */
-    p_jump_to_function = (Function_Pointer) jump_address;
-    /* Initialize user application's Stack Pointer */
-    __set_MSP(*(__IO uint32_t *)(SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET));
-
-    /* JUMP into User App */
-    p_jump_to_function();
-  }
-
-  /* We shouldn't reach this point */
-  SFU_EXCPT_Security_Error();
-
-  /* USER CODE END 2 */
-
-  /* Infinite loop */
-  /* USER CODE BEGIN WHILE */
-  while (1)
-  {
-    /* USER CODE BEGIN 3 */
-
-    /* USER CODE END 3 */
-  }
-  /* USER CODE END WHILE */
-}
-
-/**
-  * @brief  System Clock Configuration
-  *         The system Clock is configured as follow :
-  *            System Clock source            = PLL (HSI)
-  *            SYSCLK(Hz)                     = 48000000
-  *            HCLK(Hz)                       = 48000000
-  *            HCLK1 Prescaler                = 1
-  *            HCKL2 Prescaler                = 1
-  *            HCKL3 Prescaler                = 1
-  *            APB1 Prescaler                 = 1
-  *            APB2 Prescaler                 = 1
-  *            HSI Frequency(Hz)              = 16000000
-  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
-  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
-  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
-  *                                                  with PLL_DIV5
-  *            PLL_P                          = 5
-  *            PLL_Q                          = 5
-  *            PLL_R                          = 5
-  *            Flash Latency(WS)              = 2
-  * @param  None
-  * @retval None
-  */
-void SystemClock_Config(void)
-{
-  RCC_ClkInitTypeDef RCC_ClkInitStruct;
-  RCC_OscInitTypeDef RCC_OscInitStruct;
-  /* Activate PLL with HSI as source */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
-  RCC_OscInitStruct.HSICalibrationValue = 70;
-  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
-  RCC_OscInitStruct.PLL.PLLN = 20;
-  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
-  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
-  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    /* Initialization Error */
-    while (1);
-  }
-
-  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
-     clocks dividers */
-  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
-                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
-  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
-  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
-  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
-  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
-  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
-  {
-    /* Initialization Error */
-    while (1);
-  }
-}
-
-/* USER CODE BEGIN 4 */
-
-/**
-  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
-  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
-  * @param  None
-  * @note   This operation should be done as soon as possible after a reboot.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Apply Static protections involving Option Bytes */
-  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
-  {
-    /* Apply runtime protections needed to be enabled after each Reset */
-    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Stop in case of security error
-  * @retval None
-  */
-void SFU_EXCPT_Security_Error(void)
-{
-  HAL_Delay(1000);
-  /* This is the last operation executed. Force a System Reset. */
-  NVIC_SystemReset();
-}
-
-/* USER CODE END 4 */
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @retval None
-  */
-void Error_Handler(void)
-{
-  /* USER CODE BEGIN Error_Handler_Debug */
-  /* User can add his own implementation to report the HAL error return state */
-  /* Security issue : execution stopped ! */
-  SFU_EXCPT_Security_Error();
-  /* USER CODE END Error_Handler_Debug */
-}
-
-#ifdef  USE_FULL_ASSERT
-/**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t *file, uint32_t line)
-{
-  /* USER CODE BEGIN 6 */
-  /* User can add his own implementation to report the file name and line number,
-    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  /* Security issue : execution stopped ! */
-  SFU_EXCPT_Security_Error();
-  /* USER CODE END 6 */
-}
-#endif /* USE_FULL_ASSERT */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c
deleted file mode 100644
index 23111c05..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_com_loader.c
-  * @author  MCD Application Team
-  * @brief   Secure Firmware Update COM module.
-  *          This file provides set of firmware functions to manage SFU Com
-  *          functionalities for the local loader.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level.h"
-#include "sfu_low_level_security.h"
-#include "sfu_com_loader.h"
-#include "sfu_trace.h"
-
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
-
-/* Private defines -----------------------------------------------------------*/
-#if defined(__ICCARM__)
-#define PUTCHAR_PROTOTYPE int putchar(int ch)
-#elif defined(__ARMCC_VERSION)
-#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
-#elif defined(__GNUC__)
-#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
-#endif /* __ICCARM__ */
-
-#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
-#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
-
-/* Private macros ------------------------------------------------------------*/
-#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
-#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
-#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
-#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
-#define ISVALIDDEC(c)       IS_09(c)
-#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
-
-#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
-#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
-
-/* Private function prototypes -----------------------------------------------*/
-static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
-static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
-
-/* Functions Definition ------------------------------------------------------*/
-
-#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
-/**
-  * @brief  SFU Com Init function.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_Init(void)
-{
-#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
-  setvbuf(stdout, NULL, _IONBF, 0);
-#endif /* __GNUC__ */
-  return SFU_LL_UART_Init();
-}
-
-/**
-  * @brief  SFU Com DeInit function.
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_DeInit(void)
-{
-  return SFU_LL_UART_DeInit();
-}
-
-#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
-
-/**
-  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
-  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
-  * @param  puSize: size of received file.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
-  */
-SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
-{
-  uint32_t i;
-  uint32_t packet_length = 0U;
-  uint32_t session_done = 0U;
-  uint32_t file_done;
-  uint32_t errors = 0U;
-  uint32_t session_begin = 0U;
-  uint32_t filesize = 0U;
-  uint32_t packets_received;
-  uint8_t *file_ptr;
-  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
-  uint8_t tmp;
-  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
-                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(4)));
-
-  /* Check the pointers allocation */
-  if ((peCOMStatus == NULL) || (puSize == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  *peCOMStatus = SFU_COM_YMODEM_OK;
-
-  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
-  {
-    packets_received = 0U;
-    file_done = 0U;
-    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
-    {
-      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
-      {
-        case HAL_OK:
-          errors = 0U;
-          switch (packet_length)
-          {
-            case 3U:
-              /* Startup sequence */
-              break;
-            case 2U:
-              /* Abort by sender */
-              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-              *peCOMStatus = SFU_COM_YMODEM_ABORT;
-              break;
-            case 0U:
-              /* End of transmission */
-              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-              *puSize = filesize;
-              file_done = 1U;
-              break;
-            default:
-              /* Normal packet */
-              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
-              {
-                /* No NACK sent for a better synchro with remote : packet will be repeated */
-              }
-              else
-              {
-                if (packets_received == 0U)
-                {
-                  /* File name packet */
-                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
-                  {
-                    /* File name skipped */
-                    i = 0U;
-                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
-                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
-                    {
-                      i++;
-                      file_ptr++;
-                    }
-                    /* end of file name ('\0') skipped */
-                    file_ptr++;
-                    
-                    /* File size extraction */
-                    i = 0U;
-                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
-                    {
-                      file_size[i] = *file_ptr;
-                      i++;
-                      file_ptr++;
-                    }
-                    file_size[i] = (uint8_t) '\0';
-                    (void) Str2Int(file_size, &filesize);
-
-                    /* Header packet received callback call*/
-                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
-                    {
-                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-                      (void) SFU_LL_UART_Flush();
-                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
-                    }
-                    else
-                    {
-                      /* End session */
-                      tmp = SFU_COM_YMODEM_CA;
-                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
-                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
-                      return SFU_ERROR;
-                    }
-                  }
-                  /* File header packet is empty, end session */
-                  else
-                  {
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-                    file_done = 1U;
-                    session_done = 1U;
-                    break;
-                  }
-                }
-                else /* Data packet */
-                {
-                  /* Data packet received callback call*/
-                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX], 
-                                                           packet_length) == SFU_SUCCESS)
-                  {
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
-
-                  }
-                  else /* An error occurred while writing to Flash memory */
-                  {
-                    /* End session */
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-                    *peCOMStatus = SFU_COM_YMODEM_DATA;
-                  }
-
-                }
-                packets_received ++;
-                session_begin = 1;
-              }
-              break;
-          }
-          break;
-        case HAL_BUSY: /* Abort actually */
-          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-          *peCOMStatus = SFU_COM_YMODEM_ABORT;
-          break;
-        default:
-          if (session_begin > 0U)
-          {
-            errors ++;
-          }
-          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
-          {
-            /* Abort communication */
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
-            *peCOMStatus = SFU_COM_YMODEM_ABORT;
-          }
-          else
-          {
-            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
-#ifndef MINICOM_YMODEM
-            /* Minicom does not accept this extra character */
-            TRACE("\b.");                                 /* Replace C char by . on display console */
-#endif /* MINICOM_YMODEM */
-            /*
-             * Toggling the LED in case no console is available: the toggling frequency depends on
-             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
-             */
-            (void) BSP_LED_Toggle(SFU_STATUS_LED);
-          }
-          break;
-      }
-    }
-  }
-  /* Make sure the status LED is turned off */
-  (void) BSP_LED_Off(SFU_STATUS_LED);
-
-  if (*peCOMStatus == SFU_COM_YMODEM_OK)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_ERROR;
-  }
-}
-
-/**
-  * @brief  Transmit a byte to the COM Port.
-  * @param  uParam: The byte to be sent.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
-{
-  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
-}
-
-/**
-  * @brief  Convert a string to an integer.
-  * @param  pInputStr: The string to be converted.
-  * @param  pIntNum: The integer value.
-  * @retval 1: Correct
-  *         0: Error
-  */
-static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
-{
-  uint32_t i = 0U;
-  uint32_t res = 0U;
-  uint32_t val = 0U;
-  uint8_t  x;
-
-  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
-  {
-    i = 2U;
-    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
-    {
-      if (ISVALIDHEX(pInputStr[i]))
-      {
-        x = CONVERTHEX(pInputStr[i]);
-        val = (val << 4U) + x;
-      }
-      else
-      {
-        /* Return 0, Invalid input */
-        res = 0U;
-        break;
-      }
-      i++;
-    }
-
-    /* valid result */
-    if (pInputStr[i] == (uint8_t)'\0')
-    {
-      *pIntNum = val;
-      res = 1U;
-    }
-  }
-  else /* max 10-digit decimal input */
-  {
-    while ((i < 11U) && (res != 1U))
-    {
-      if (pInputStr[i] == (uint8_t)'\0')
-      {
-        *pIntNum = val;
-        /* return 1 */
-        res = 1U;
-      }
-      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
-      {
-        val = val << 10U;
-        *pIntNum = val;
-        res = 1U;
-      }
-      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
-      {
-        val = val << 20U;
-        *pIntNum = val;
-        res = 1U;
-      }
-      else if (ISVALIDDEC(pInputStr[i]))
-      {
-        x =  CONVERTDEC(pInputStr[i]);
-        val = (val * 10U) + x;
-      }
-      else
-      {
-        /* return 0, Invalid input */
-        res = 0U;
-        break;
-      }
-      i++;
-    }
-  }
-
-  return res;
-}
-
-/**
-  * @brief  Receive a packet from sender
-  * @param  pData: pointer to received data.
-  * @param  puLength
-  *     0: end of transmission
-  *     2: abort by sender
-  *    >0: packet length
-  * @param  uTimeOut: receive timeout (ms).
-  * @retval HAL_OK: normally return
-  *         HAL_BUSY: abort by user
-  */
-static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
-{
-  uint32_t crc;
-  uint32_t packet_size = 0U;
-  HAL_StatusTypeDef status;
-  SFU_ErrorStatus eRetStatus;
-
-  uint8_t char1;
-
-#ifdef MINICOM_YMODEM
-  uint32_t myIdx = 0; /* index indicating where to write in pData */
-#endif /* MINICOM_YMODEM */
-
-  *puLength = 0U;
-
-  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
-
-  if (eRetStatus == SFU_SUCCESS)
-  {
-    status = HAL_OK;
-
-    switch (char1)
-    {
-      case SFU_COM_YMODEM_SOH:
-        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
-        break;
-      case SFU_COM_YMODEM_STX:
-        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
-        break;
-      case SFU_COM_YMODEM_EOT:
-        break;
-      case SFU_COM_YMODEM_CA:
-        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
-        {
-          packet_size = 2U;
-        }
-        else
-        {
-          status = HAL_ERROR;
-        }
-        break;
-      case SFU_COM_YMODEM_ABORT1:
-      case SFU_COM_YMODEM_ABORT2:
-        status = HAL_BUSY;
-        break;
-      case SFU_COM_YMODEM_RB:
-        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
-        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
-        packet_size = 3U;
-        break;
-      default:
-        status = HAL_ERROR;
-        break;
-    }
-    *pData = char1;
-
-    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
-    {
-
-#ifndef MINICOM_YMODEM
-      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX], 
-                                       (uint16_t) (packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
-#else
-      eRetStatus = SFU_SUCCESS;
-      /* Receive byte per byte until no data left or no space left in buffer */
-      while ((SFU_SUCCESS == eRetStatus) &&
-             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
-              SFU_COM_YMODEM_PACKET_DATA_INDEX +
-              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
-            )
-      {
-        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
-                                         1U, uTimeout);
-        myIdx++;
-      }
-
-      if (myIdx > 1)
-      {
-        /* We received some bytes */
-        eRetStatus = SFU_SUCCESS;
-      }
-#endif /* MINICOM_YMODEM */
-
-      /* Simple packet sanity check */
-      if (eRetStatus == SFU_SUCCESS)
-      {
-        status = HAL_OK;
-
-        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
-                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
-        {
-          packet_size = 0U;
-          status = HAL_ERROR;
-        }
-        else
-        {
-          /* Check packet CRC*/
-          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
-          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
-
-          /*Configure CRC with 16-bit polynomial*/
-          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
-          {
-            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
-            {
-              packet_size = 0U;
-              status = HAL_ERROR;
-            }
-
-          }
-          else
-          {
-            packet_size = 0U;
-            status = HAL_ERROR;
-          }
-        }
-      }
-      else
-      {
-        status = HAL_ERROR;
-      }
-    }
-  }
-  else
-  {
-    status = HAL_ERROR;
-  }
-
-  *puLength = packet_size;
-  return status;
-}
-
-/**
-  * @brief  Ymodem Header Packet Transfer completed callback.
-  * @param  uFileSize: Dimension of the file that will be received.
-  * @retval None
-  */
-__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
-{
-
-  /* NOTE : This function should not be modified, when the callback is needed,
-            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
-   */
-  UNUSED(uFileSize);
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Ymodem Data Packet Transfer completed callback.
-  * @param  pData: Pointer to the buffer.
-  * @param  uSize: Packet dimension.
-  * @retval None
-  */
-__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-
-  /* NOTE : This function should not be modified, when the callback is needed,
-            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
-   */
-  UNUSED(pData);
-  UNUSED(uSize);
-  return SFU_SUCCESS;
-}
-
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c
deleted file mode 100644
index 8cdf9097..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_loader.c
-  * @author  MCD Application Team
-  * @brief   Secure Firmware Update LOADER module.
-  *          This file provides set of firmware functions to manage SFU local
-  *          loader functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SFU_LOADER_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include <stdlib.h>
-#include "main.h"
-#include "sfu_loader.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "sfu_com_loader.h"
-#include "sfu_trace.h"
-#include "se_interface_bootloader.h" /* for metadata authentication */
-#include "app_sfu.h"
-
-#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
-
-/* Private variables ---------------------------------------------------------*/
-#ifdef MINICOM_YMODEM
-/*
- * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
- * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
- */
-/* With Minicom YMODEM each packet carries 128 bytes of data */
-static uint8_t alignedBuffer[SFU_COM_YMODEM_PACKET_SIZE] __attribute__((aligned(4)));
-#endif /* MINICOM_YMODEM */
-static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
-static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
-static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
-static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
-static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
-static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
-static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
-static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
-
-/* Private function prototypes -----------------------------------------------*/
-static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize the SFU LOADER.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_Init(void)
-{
-  /*
-  * ADD SRC CODE HERE
-  */
-
-  /*
-   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
-   * when doing a length alignment before writing in FLASH.
-   */
-#ifndef MINICOM_YMODEM
-  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_1K_SIZE bytes of payload */
-  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_1K_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
-    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints",
-          SFU_COM_YMODEM_PACKET_1K_SIZE);
-    return SFU_ERROR;
-  } /* else the FW Header Length is fine with regards to FLASH constraints */
-#else /* MINICOM_YMODEM */
-  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_SIZE bytes of payload */
-  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
-  {
-    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
-    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints", SFU_COM_YMODEM_PACKET_SIZE);
-    return SFU_ERROR;
-  }
-#endif /* MINICOM_YMODEM */
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  DeInitialize the SFU LOADER.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_DeInit(void)
-{
-  /*
-   * ADD SRC CODE HERE
-   */
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Download a new User Fw.
-  *         Writes firmware received via Ymodem in FLASH.
-  * @param  peSFU_LOADER_Status: SFU LOADER Status.
-  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
-  * @param  p_DwlSlot identification of the downloaded area
-  * @param  p_Size Size of the downloaded image.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
-                                             uint32_t *pSize)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
-
-  /* Check the pointers allocation */
-  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Refresh Watchdog */
-  (void) SFU_LL_SECU_IWDG_Refresh();
-
-  /* Transfer FW Image via YMODEM protocol */
-  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
-
-  /* Initialize global variables to be used during the YMODEM process */
-  m_uDwlAreaAddress = 0U;
-  m_uDwlAreaStart = 0U;
-  m_uDwlAreaSize = 0U;
-  m_uFileSizeYmodem = 0U;
-  m_uNbrBlocksYmodem = 0U;
-  m_uPacketsReceived = 0U;
-  m_uDwlSlot = SLOT_DWL_1;
-  m_LoaderStatus = SFU_LOADER_ERR_COM;
-
-  /* Receive the FW in RAM and write it in the Flash*/
-  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
-  {
-    if (*pSize > 0U)
-    {
-      /* File download correct*/
-      m_LoaderStatus = SFU_LOADER_OK;
-    }
-  }
-  else
-  {
-    /* Nothing to do : m_LoaderStatus updated during during YModem process */
-  }
-
-  /* Provide slot information to the caller
-     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
-     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
-  *pDwlSlot = m_uDwlSlot;
-
-
-  *peSFU_LOADER_Status = m_LoaderStatus;
-  if (m_LoaderStatus == SFU_LOADER_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Ymodem Header Packet Transfer completed callback.
-  * @param  uFileSize: Dimension of the file that will be received.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
-{
-  /*Reset of the ymodem variables */
-  m_uFileSizeYmodem = 0U;
-  m_uPacketsReceived = 0U;
-  m_uNbrBlocksYmodem = 0U;
-
-  /*Filesize information is stored*/
-  m_uFileSizeYmodem = uFileSize;
-
-  /*Compute the number of blocks */
-#ifndef MINICOM_YMODEM
-  /* Teraterm sends 1kB YMODEM packets */
-  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
-#else
-  /* Minicom sends 128 bytes YMODEM packets */
-  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
-#endif /* MINICOM_YMODEM */
-
-  /* NOTE : delay inserted for Ymodem protocol*/
-  HAL_Delay(1000U);
-
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  Ymodem Data Packet Transfer completed callback.
-  * @param  pData: Pointer to the buffer.
-  * @param  uSize: Packet dimension.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-#ifndef MINICOM_YMODEM
-/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
-SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-  /* The local loader must make a copy of the Firmware metadata,
-   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
-   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
-  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(4)));
-  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
-  static uint32_t m_uDwlImgSize = 0U;
-
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_FLASH_StatusTypeDef x_flash_info;
-  uint32_t rx_size = uSize;
-  uint8_t *p_data = pData;
-  uint32_t uOldSize;
-#if  !defined(SFU_NO_SWAP)
-  uint32_t uLength;
-#endif /* !SFU_NO_SWAP */
-
-  /* Check the pointers allocation */
-  if (p_data == NULL)
-  {
-    return SFU_ERROR;
-  }
-    
-  /*Increase the number of received packets*/
-  m_uPacketsReceived++;
-
-  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    /*Extracting actual payload from last packet*/
-    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
-    {
-      /* The last packet must be fully considered */
-      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
-    }
-    else
-    {
-      /* The last packet is not full, drop the extra bytes */
-      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
-                                   SFU_COM_YMODEM_PACKET_1K_SIZE);
-    }
-  }
-
-  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
-  if (m_uPacketsReceived == 1U)
-  {
-
-    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
-
-    /* Verify header */
-    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress = m_uDwlAreaStart;
-#if   defined(SFU_NO_SWAP)
-
-      /* Downloaded Image size : Header size + Image size */
-      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
-#else
-      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
-         Partial Image size */
-      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwSize +
-                      (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
-                      SFU_IMG_IMAGE_OFFSET;
-#endif /* (SFU_NO_SWAP) */
-    }
-
-    /* Clear Download application area (including TRAILERS area) */
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
-          SFU_SUCCESS)
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-  }
-
-#if  !defined(SFU_NO_SWAP)
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* This packet : contains end of FW header */
-    if ((m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)) &&
-        ((m_uDwlAreaAddress + rx_size) >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)))
-    {
-      /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE bytes length) */
-      uLength = SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE;
-      if (uLength == 0U)
-      {
-        uLength = SFU_COM_YMODEM_PACKET_1K_SIZE;
-      }
-      if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, uLength) == SFU_SUCCESS)
-      {
-        /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
-        m_uDwlAreaAddress += uLength + (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP));
-
-        /* Update remaining packet size to write */
-        rx_size -= uLength;
-
-        /* Update p_data pointer to received packet data */
-        p_data += uLength;
-      }
-      else
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-        e_ret_status = SFU_ERROR;
-      }
-    }
-  }
-#endif /* !SFU_NO_SWAP */
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Check size to avoid writing beyond DWL image size */
-    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Set dimension to the appropriate length for FLASH programming.
-     * Example: 64-bit length for L4.
-     */
-    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
-    {
-      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
-         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
-      uOldSize = rx_size;
-      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-      while (uOldSize < rx_size)
-      {
-        p_data[uOldSize] = 0xFF;
-        uOldSize++;
-      }
-    }
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Check size to avoid writing beyond DWL area */
-    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  /* Write Data in Flash */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, rx_size) == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress += (rx_size);
-    }
-    else
-    {
-      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-
-  /* Last packet : reset m_uPacketsReceived */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    m_uPacketsReceived = 0U;
-  }
-
-  /* Reset data counters in case of error */
-  if (e_ret_status == SFU_ERROR)
-  {
-    /*Reset of the ymodem variables */
-    m_uFileSizeYmodem = 0U;
-    m_uPacketsReceived = 0U;
-    m_uNbrBlocksYmodem = 0U;
-  }
-
-  return e_ret_status;
-}
-#else /* MINICOM_YMODEM */
-/* Minicom variant of the YMODEM protocol: uses 128B packets */
-SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
-{
-  /* The local loader must make a copy of the Firmware metadata,
-   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
-   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
-  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(4)));
-  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
-  static uint32_t m_uDwlImgSize = 0U;
-
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_FLASH_StatusTypeDef x_flash_info;
-  uint32_t rx_size = uSize;  
-  uint8_t *p_data = pData;
-  uint32_t uOldSize;
-
-  /* Check the pointers allocation */
-  if (p_data == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  /*Increase the number of received packets*/
-  m_uPacketsReceived++;
-
-  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
-    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
-    {
-      /* The last packet must be fully considered */
-      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
-    }
-    else
-    {
-      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
-      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
-                                   SFU_COM_YMODEM_PACKET_SIZE);
-    }
-  }
-
-
-  /*
-   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
-   */
-
-  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
-     not encrypted  */
-  if (1 == m_uPacketsReceived)
-  {
-    /* First packet: beginning of header */
-    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
-    {
-      /* Copy the beginning of the header */
-      memcpy(fw_header, p_data, rx_size);
-      rx_size = 0U; /* nothing more to do */
-    }
-    else
-    {
-      /* Unexpected case */
-      e_ret_status = SFU_ERROR;
-    }
-  }
-  else if (2U == m_uPacketsReceived)
-  {
-    /* Second packet: end of header (64 bytes) */
-    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
-    rx_size -= 64U;
-    p_data += 64U;
-
-    /* Verify header */
-    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      m_uDwlAreaAddress = m_uDwlAreaStart;
-      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
-         Partial Image size */
-      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwSize +
-                      (((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
-                      SFU_IMG_IMAGE_OFFSET;
-
-      /* Clear Download application area (including TRAILERS area) */
-      if ((e_ret_status == SFU_SUCCESS)
-          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
-              SFU_SUCCESS))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
-        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
-            == SFU_SUCCESS)
-        {
-          /* Shift the DWL area pointer (still to be aligned image with (PartialFwOffset % sector size) in DWL area ) */
-          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
-        }
-        else
-        {
-          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-          e_ret_status = SFU_ERROR;
-        }
-      }
-      /* The remaining 64 bytes of data must be handled : standard processing */
-    }
-  }
-  /*
-   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
-   */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /*
-     * End of the second packet (64B) or full 128B packet
-     * Skip padding bytes then take partial FW offset into account
-     */
-    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
-    {
-      /* Skip the padding bytes */
-      m_uDwlAreaAddress += rx_size;
-      rx_size = 0U;
-    }
-    else
-    {
-      /*
-       * m_uDwlAreaAddress >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)
-       */
-      if (((SFU_IMG_IMAGE_OFFSET / SFU_COM_YMODEM_PACKET_SIZE) + 1) == m_uPacketsReceived)
-      {
-        /* End of padding bytes : We must take the partial offset into account */
-        m_uDwlAreaAddress += ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
-      }
-      /* else nothing more to do */
-
-      /* Check size to avoid writing beyond DWL image size */
-      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      /* Set dimension to the appropriate length for FLASH programming.
-       * Example: 64-bit length for L4.
-       */
-      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
-      {
-        /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
-           sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
-        uOldSize = rx_size;
-        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
-        while (uOldSize < rx_size)
-        {
-          p_data[uOldSize] = 0xFF;
-          uOldSize++;
-        }
-      }
-
-      /* Check size to avoid writing beyond DWL area */
-      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
-      {
-        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
-        e_ret_status = SFU_ERROR;
-      }
-
-      /* Write Data in Flash */
-      if (e_ret_status == SFU_SUCCESS)
-      {
-        /*
-         * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
-         * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
-         */
-        memcpy(alignedBuffer, p_data, rx_size);
-
-        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, alignedBuffer, rx_size) == SFU_SUCCESS)
-        {
-          m_uDwlAreaAddress += (rx_size);
-        }
-        else
-        {
-          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
-          e_ret_status = SFU_ERROR;
-        }
-      }
-    }
-  }
-
-
-  /* Last packet : reset m_uPacketsReceived */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    m_uPacketsReceived = 0U;
-  }
-
-  /* Reset data counters in case of error */
-  if (e_ret_status == SFU_ERROR)
-  {
-    /*Reset of the ymodem variables */
-    m_uFileSizeYmodem = 0U;
-    m_uPacketsReceived = 0U;
-    m_uNbrBlocksYmodem = 0U;
-  }
-
-  return e_ret_status;
-}
-#endif /* MINICOM_YMODEM */
-
-
-/**
-  * @brief  Verifies the Raw Fw Header received. It checks if the header is
-  *         authentic and if the fields are ok with the device (e.g. size and version).
-  * @note   Please note that when the new image is installed, this metadata is checked
-  *         by @ref SFU_IMG_CheckCandidateVersion.
-  * @param  peSFU_LOADER_Status: SFU LOADER Status.
-  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
-  * @param  pBuffer: pointer to header Buffer.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-
-/* anti-rollback mechanism is tested twice to avoid basic hardware attack
-   ==> compiler optimization is disabled for this reason */
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O0")))
-#endif /* __ICCARM__ */
-
-static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
-{
-  SFU_FwImageFlashTypeDef       fw_image_flash_data;
-
-  m_uDwlSlot = SLOT_DWL_1;
-
-  SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
-
-  /* Assign the download flash address to be used during the YMODEM process */
-  m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
-  m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
-
-  return SFU_SUCCESS;
-}
-
-#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
deleted file mode 100644
index 1d51fa13..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
+++ /dev/null
@@ -1,1049 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_security.c
-  * @author  MCD Application Team
-  * @brief   SB Security Low Level Interface module
-  *          This file provides set of firmware functions to manage SB security
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_security.h"
-#include "sfu_boot.h"
-
-#ifndef  SFU_WRP_PROTECT_ENABLE
-#warning "SFU_WRP_PROTECT_DISABLED"
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifndef  SFU_MPU_PROTECT_ENABLE
-#warning "SFU_MPU_PROTECT_DISABLED"
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#ifndef  SFU_C2_DDS_PROTECT_ENABLE
-#warning "SFU_C2_DDS_PROTECT_DISABLED"
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifndef  SFU_DAP_PROTECT_ENABLE
-#warning "SFU_DAP_PROTECT_DISABLED"
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-#ifndef  SFU_DMA_PROTECT_ENABLE
-#warning "SFU_DMA_PROTECT_DISABLED"
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-#ifndef  SFU_IWDG_PROTECT_ENABLE
-#warning "SFU_IWDG_PROTECT_DISABLED"
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
-#warning "SFU_SECURE_USER_PROTECT_DISABLED"
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-/* Private typedef -----------------------------------------------------------*/
-typedef enum
-{
-  SFU_FALSE = 0U,
-  SFU_TRUE = !SFU_FALSE
-} SFU_BoolTypeDef;
-
-typedef struct
-{
-  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Number */
-  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
-  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
-  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
-                                                 value of CORTEX_MPU_Region_Permission_Attributes */
-  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
-                                                 of  CORTEX_MPU_Instruction_Access */
-  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
-                                                 is 1 region sub region is disabled */
-  uint8_t                Tex;               /*!< Specifies the tex value  */
-  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
-  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
-} SFU_MPU_InitTypeDef;
-
-typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
-
-/* Private variables ---------------------------------------------------------*/
-
-#ifdef  SFU_IWDG_PROTECT_ENABLE
-static IWDG_HandleTypeDef   IwdgHandle;
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-#ifdef  SFU_MPU_PROTECT_ENABLE
-static SFU_MPU_InitTypeDef MpuAreas[] =
-{
-  /* Aliases Region and all User Flash & internal RAM */
-  {
-    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
-    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
-    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
-  },
-  /* SRAM flag access */
-  {
-    SFU_PROTECT_MPU_SRAM_FLAG_RGNV, SFU_PROTECT_MPU_SRAM_FLAG_START, SFU_PROTECT_MPU_SRAM_FLAG_SIZE,
-    SFU_PROTECT_MPU_SRAM_FLAG_PERM, SFU_PROTECT_MPU_SRAM_FLAG_EXECV, SFU_PROTECT_MPU_SRAM_FLAG_SREG,
-    SFU_PROTECT_MPU_SRAM_FLAG_TEXV, SFU_PROTECT_MPU_SRAM_FLAG_C, SFU_PROTECT_MPU_SRAM_FLAG_B
-  },
-  /*  Flash execution */
-  {
-    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
-    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
-    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
-  },
-  /*  Flash execution */
-  {
-    SFU_PROTECT_MPU_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_FLASHEXE_ADJUST_SIZE,
-    SFU_PROTECT_MPU_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_FLASHEXE_ADJUST_SREG,
-    SFU_PROTECT_MPU_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_FLASHEXE_ADJUST_B
-  },
-  /*  App Access */
-  {
-    SFU_PROTECT_MPU_APP_FLASHEXE_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_START, SFU_PROTECT_MPU_APP_FLASHEXE_SIZE,
-    SFU_PROTECT_MPU_APP_FLASHEXE_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_SREG,
-    SFU_PROTECT_MPU_APP_FLASHEXE_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_C, SFU_PROTECT_MPU_APP_FLASHEXE_B
-  },
-  /*  App Access */
-  {
-    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE,
-    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG,
-    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B
-  },
-  /*  peripheral  */
-  {
-    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
-    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
-    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
-  }
-};
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-static SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
-                                                      FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
-                                                    FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifdef SFU_DAP_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void);
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-
-#ifdef SFU_DMA_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void);
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
-static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-
-/**
-  * @brief  Check and if not applied apply the Static security  protections to
-  *         all the SfuEn Sections in Flash: RDP, WRP. Static security protections
-  *         those protections not impacted by a Reset. They are set using the Option Bytes
-  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
-  * @param  None
-  * @note   By default, the best security protections are applied to the different
-  *         flash sections in order to maximize the security level for the specific MCU.
-  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
-  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
-{
-  FLASH_OBProgramInitTypeDef flash_option_bytes;
-  FLASH_OBProgramInitTypeDef sfu_flash_option_bytes;
-  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
-  SFU_BoolTypeDef is_current_protection_to_be_applied = SFU_FALSE;
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  HAL_FLASH_Unlock();
-
-  /* Clear OPTVERR bit set on virgin samples */
-  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
-
-  /* Unlock the Options Bytes *************************************************/
-  HAL_FLASH_OB_Unlock();
-
-  /* Get Option Bytes status for WRP AREA  **********/
-  flash_option_bytes.WRPArea     = SFU_C1_PROTECT_WRP_AREA;
-  HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
-  sfu_flash_option_bytes.WRPArea = SFU_C2_PROTECT_WRP_AREA;
-  HAL_FLASHEx_OBGetConfig(&sfu_flash_option_bytes);
-
-  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
-  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
-  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
-  {
-
-    /* Sanity check of the (enabled) static protections */
-    if (SFU_LL_SECU_CheckC2BootConfiguration(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-
-    if (SFU_LL_SECU_CheckProtectionBootLock(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifdef SFU_SECURE_USER_PROTECT_ENABLE
-    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
-    {
-      /* Security issue : execution stopped ! */
-      SFU_EXCPT_Security_Error();
-    }
-#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-    /*RDP level 2 ==> Flow control by-passed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
-  }
-  else
-  {
-    /* Check/Set C2 Boot configuration **********************************************/
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      is_current_protection_to_be_applied = SFU_FALSE;
-      e_ret_status = SFU_LL_SECU_SetC2BootConfiguration(&flash_option_bytes, &is_current_protection_to_be_applied);
-      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
-      {
-        /* Generate a first system Reset to reload the new option byte values *************/
-        /* C2OPT and SBRV cannot be written if C2BOOT_LOCK = 1 */
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        HAL_FLASH_OB_Launch();
-      }
-    }
-
-    /* Check/Set Boot Lock configuration *******************************************/
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionBootLock(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-
-    /* Check/Apply WRP ********************************************************/
-#ifdef SFU_WRP_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes,
-                                                  &is_protection_to_be_applied);
-    }
-#endif /* SFU_WRP_PROTECT_ENABLE */
-
-    /* Check/Apply C2 DDS *****************************************************/
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      is_current_protection_to_be_applied = SFU_FALSE;
-      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_current_protection_to_be_applied);
-      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
-      {
-        /* Generate a first system Reset to reload the new option byte values *************/
-        /* DDS cannot be written if ESE = 1 */
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        HAL_FLASH_OB_Launch();
-      }
-    }
-#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
-
-    /* Check/Apply Secure User Memory *****************************************/
-#ifdef SFU_SECURE_USER_PROTECT_ENABLE
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
-    }
-#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      if (is_protection_to_be_applied)
-      {
-        /* Generate System Reset to reload the new option byte values *************/
-        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
-        HAL_FLASH_OB_Launch();
-      }
-    }
-  }
-
-
-  /* Lock the Options Bytes ***************************************************/
-  HAL_FLASH_OB_Lock();
-
-  /* Lock the Flash to disable the flash control register access (recommended
-  to protect the FLASH memory against possible unwanted operation) *********/
-  HAL_FLASH_Lock();
-
-  /* If it was not possible to apply one of the above mandatory protections, the
-  Option bytes have not been reloaded. Return the error status in order for the
-  caller function to take the right actions */
-  return e_ret_status;
-
-}
-
-
-/**
-  * @brief  Apply Runtime security  protections.
-  *         Runtime security protections have to be re-configured at each Reset.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
-
-  /* Depending on compilation switches, prevent compilation warning */
-  UNUSED(runtime_protection);
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionMPU() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-
-  /* Check/Apply disable DMAs  ************************************************/
-#ifdef SFU_DMA_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_DMA_PROTECT_ENABLE */
-
-  /* Check/Apply  IWDG **************************************************/
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-  /* Check/Apply  DAP *********************************************************/
-#ifdef SFU_DAP_PROTECT_ENABLE
-  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
-  {
-    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
-  }
-  else
-  {
-    /* When a protection cannot be set then SFU_ERROR is returned */
-    e_ret_status = SFU_ERROR;
-  }
-#endif /* SFU_DAP_PROTECT_ENABLE */
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check C2 boot configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply C2OPT and SBRV ***********************************************/
-  if ((psFlashOptionBytes->C2BootRegion == OB_C2_BOOT_FROM_FLASH)&&
-      (psFlashOptionBytes->C2SecureBootVectAddr == SFU_C2_BOOT_BASE_ADDR))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  /* Execution stopped if flow control failed */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Apply C2 boot configuration.
-  * @note   C2OPT and SBRV can only be accessed by software when C2BOOT_LOCK = 0.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if Secure User Memory is already configured */
-  if (SFU_LL_SECU_CheckC2BootConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_BOOT_VECT;
-    psFlashOptionBytes->C2BootRegion            = OB_C2_BOOT_FROM_FLASH;
-    psFlashOptionBytes->C2SecureBootVectAddr    = SFU_C2_BOOT_BASE_ADDR;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
-    }
-#else
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Check Boot Lock configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
-  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
-      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-  }
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  Set Boot Lock configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check Boot Lock configuration */
-  if (SFU_LL_SECU_CheckProtectionBootLock(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
-    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
-    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
-    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
-    }
-#else
-    /* Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed */
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-
-#ifdef SFU_WRP_PROTECT_ENABLE
-/**
-  * @brief  Check the WRP protection to the specified Area. It includes the SB Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
-                                               FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Check WRP ****************************************************************/
-  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
-  if ((psSbFlashOptionBytes->WRPStartOffset > SFU_C1_PROTECT_WRP_PAGE_START) ||
-      (psSbFlashOptionBytes->WRPEndOffset   < SFU_C1_PROTECT_WRP_PAGE_END))
-  {
-    e_ret_status = SFU_ERROR; /*Protection not applied */
-  }
-  if ((psSfuFlashOptionBytes->WRPStartOffset > SFU_C2_PROTECT_WRP_PAGE_START) ||
-      (psSfuFlashOptionBytes->WRPEndOffset   < SFU_C2_PROTECT_WRP_PAGE_END))
-  {
-    e_ret_status = SFU_ERROR; /*Protection not applied */
-  }
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply the WRP protection to the specified Area. It includes the SB Vector Table
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
-                                             FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply WRP **********************************************************/
-  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
-  if (SFU_LL_SECU_CheckProtectionWRP(psSbFlashOptionBytes, psSfuFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS; /*Protection already applied */
-  }
-  else
-  {
-#if defined(SECBOOT_OB_DEV_MODE)
-    psSbFlashOptionBytes->OptionType      = OPTIONBYTE_WRP;
-    psSbFlashOptionBytes->WRPArea         = SFU_C1_PROTECT_WRP_AREA;
-    psSbFlashOptionBytes->WRPStartOffset  = SFU_C1_PROTECT_WRP_PAGE_START;
-    psSbFlashOptionBytes->WRPEndOffset    = SFU_C1_PROTECT_WRP_PAGE_END;
-
-    if (HAL_FLASHEx_OBProgram(psSbFlashOptionBytes) == HAL_OK)
-    {
-      psSfuFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
-      psSfuFlashOptionBytes->WRPArea        = SFU_C2_PROTECT_WRP_AREA;
-      psSfuFlashOptionBytes->WRPStartOffset = SFU_C2_PROTECT_WRP_PAGE_START;
-      psSfuFlashOptionBytes->WRPEndOffset   = SFU_C2_PROTECT_WRP_PAGE_END;
-
-      if (HAL_FLASHEx_OBProgram(psSfuFlashOptionBytes) == HAL_OK)
-      {
-        *pbIsProtectionToBeApplied |= 1U;
-        e_ret_status = SFU_SUCCESS;
-        /* Execution stopped if flow control failed */
-        FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
-      }
-    }
-#else
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_WRP_PROTECT_ENABLE*/
-
-#ifdef SFU_C2_DDS_PROTECT_ENABLE
-/**
-  * @brief  Check DDS protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check WRP ****************************************************************/
-  /* Check if the protection is already applied */
-  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Apply DDS protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check/Apply DDS **********************************************************/
-  /* Check if the protection is already applied */
-  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
-
-    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
-    }
-#else
-    /* System Security Configuration failed: Sub-GHz radio SPI security access is incorrect */
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_C2_DDS_PROTECT_ENABLE */
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-/**
-  * @brief  Apply MPU protection before executing UserApp
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  /*  modify executable region for executing UserAPP*/
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  /*  modify executable region for executing UserAPP */
-  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV;
-  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_ADJUST_START;
-  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE;
-  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG;
-  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM;
-  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV;
-  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_ADJUST_B ;
-  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_ADJUST_C;
-  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV;
-  HAL_MPU_ConfigRegion(&MPU_InitStruct);
-
-  return e_ret_status;
-}
-#endif /* SFU_MPU_PROTECT_ENABLE */
-
-#ifdef SFU_MPU_PROTECT_ENABLE
-
-/**
-  * @brief  Apply MPU protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  uint8_t mpu_region_num = 0U; /* id of the MPU region being configured */
-  MPU_Region_InitTypeDef MPU_InitStruct;
-
-  HAL_MPU_Disable();
-
-  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
-  {
-    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
-    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
-    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
-    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
-    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
-    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
-    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
-    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
-    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Bufferable;
-    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Cacheable;
-    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
-    HAL_MPU_ConfigRegion(&MPU_InitStruct);
-  }
-  HAL_MPU_Enable(MPU_HARDFAULT_NMI);
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
-  }
-  return e_ret_status;
-}
-#endif /*SFU_MPU_PROTECT_ENABLE*/
-
-#ifdef SFU_DMA_PROTECT_ENABLE
-/**
-  * @brief  Apply DMA protection
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-  /*
-   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
-   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
-   * information in SRAM, FLASH
-   */
-  /* Disable  DMA1, DMA2 */
-  __HAL_RCC_DMA1_CLK_DISABLE();
-
-  __HAL_RCC_DMA2_CLK_DISABLE();
-
-  __HAL_RCC_DMAMUX1_CLK_DISABLE();
-
-
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
-  return e_ret_status;
-}
-#endif /*SFU_DMA_PROTECT_ENABLE*/
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-/**
-  *  @brief Apply IWDG protection
-  *         The IWDG timeout is set to 4 second.
-  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
-  *         to the measured LSI frequency after setting the prescaler value:
-  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
-  This is not used in this implementation because not necessary and in order
-  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
-
-  /* Configure & Start the IWDG peripheral */
-  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
-  IWDG counter clock Frequency = uwLsiFreq
-  Set Prescaler to 64 (IWDG_PRESCALER_64)
-  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
-  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
-  IwdgHandle.Instance = IWDG;
-  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
-  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
-  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
-
-  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-    /* Execution stopped if flow control failed */
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
-  }
-
-  return e_ret_status;
-}
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-#ifdef SFU_DAP_PROTECT_ENABLE
-/**
-  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-
-  assert_param(SFU_IS_FUNCTIONAL_STATE(eState));
-
-  /* Enable clock of DBG GPIO port */
-  SFU_DBG_CLK_ENABLE();
-
-  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
-  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
-  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
-  e_ret_status = SFU_SUCCESS;
-  /* Execution stopped if flow control failed */
-  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
-
-  return e_ret_status;
-}
-#endif /*SFU_DAP_PROTECT_ENABLE*/
-
-#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
-/**
-  * @brief  Check Secure User Memory protection configuration.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
-   */
-  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
-  {
-    /*
-     * In this example secure area covers:
-     * - the SB_SFU code
-     * - the header of the slot #0
-     */
-    e_ret_status = SFU_SUCCESS;
-
-    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
-    {
-      if (psFlashOptionBytes->SecureFlashStartAddr != SFU_SECURE_FLASH_START)
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
-    {
-      if (psFlashOptionBytes->HideProtectionStartAddr != SFU_HIDE_PROTECTION_START)
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
-    {
-      if (psFlashOptionBytes->SecureSRAM1StartAddr != SFU_SECURE_SRAM1_START)
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-
-    if ((e_ret_status == SFU_SUCCESS)
-        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
-    {
-      if (psFlashOptionBytes->SecureSRAM2StartAddr != SFU_SECURE_SRAM2_START)
-      {
-        e_ret_status = SFU_ERROR;
-      }
-    }
-  }
-
-  /* Execution stopped if flow control failed */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
-  }
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  Apply Secure User Memory protection.
-  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
-  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
-  *         this OptByte has to be modified and immediately reloaded.
-  * @retval If Protection is not set, RSS procedure is called with a System Reset
-  */
-SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
-                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check if Secure User Memory is already configured */
-  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    /* Apply the proper configuration if we are in development mode */
-#if defined(SECBOOT_OB_DEV_MODE)
-    /* Set the security bit if needed */
-    /* ------------------------------ */
-    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
-
-    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
-    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
-    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
-    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
-    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
-
-    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
-    {
-      *pbIsProtectionToBeApplied |= 1U;
-      e_ret_status = SFU_SUCCESS;
-      /* Execution stopped if flow control failed */
-      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
-    }
-#else
-    /* Security issue : execution stopped ! */
-    SFU_EXCPT_Security_Error();
-#endif /* SECBOOT_OB_DEV_MODE */
-  }
-
-  return e_ret_status;
-}
-#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
-
-/**
-  * @brief  Refresh Watchdog : reload counter
-  *         This function must be called just before jumping to the UserFirmware
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-#ifdef SFU_IWDG_PROTECT_ENABLE
-  /* Refresh IWDG: reload counter */
-  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-#else
-  e_ret_status = SFU_SUCCESS;
-#endif /*SFU_IWDG_PROTECT_ENABLE*/
-
-  return e_ret_status;
-}
-
-/**
-  * @brief call by SFU to write a flash protected area
-  *         This SE function should never be called.
-  * @param  pSE_Status: Secure Engine Status.
-  * @param  pDestination: pointer to flash area to write.
-  * @param  pSource: pointer to input buffer.
-  * @param  Length: number of bytes to write to flash
-  * @retval SE_ErrorStatus SE_ERROR.
-  */
-SE_ErrorStatus SE_SFU_IMG_Write(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  /* Security issue : execution stopped ! */
-  SFU_EXCPT_Security_Error();
-
-  /* We shouldn't get there */
-  return SE_ERROR;
-}
-
-/**
-  * @brief call by SFU to read flash protected area
-  *         This SE function should never be called.
-  * @param  pSE_Status: Secure Engine Status.
-  * @param  pDestination: pointer to output buffer.
-  * @param  pSource: pointer to the flash area to read.
-  * @param  Length: number of bytes to read from flash
-  * @retval SE_ErrorStatus SE_ERROR.
-  */
-SE_ErrorStatus SE_SFU_IMG_Read(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  /* Security issue : execution stopped ! */
-  SFU_EXCPT_Security_Error();
-
-  /* We shouldn't get there */
-  return SE_ERROR;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
deleted file mode 100644
index eb9b8c4d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_it.c
-  * @author  MCD Application Team
-  * @brief   Main Interrupt Service Routines.
-  *          This file provides template for all exceptions handler and
-  *          peripherals interrupt service routine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "stm32wlxx_it.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN TD */
-
-/* USER CODE END TD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/* External variables --------------------------------------------------------*/
-
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/******************************************************************************/
-/*           Cortex Processor Interruption and Exception Handlers          */
-/******************************************************************************/
-/**
-  * @brief This function handles Hard fault interrupt.
-  */
-void HardFault_Handler(void)
-{
-  /* USER CODE BEGIN HardFault_IRQn 0 */
-
-  /* USER CODE END HardFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
-    /* USER CODE END W1_HardFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Memory management fault.
-  */
-void MemManage_Handler(void)
-{
-  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
-
-  /* USER CODE END MemoryManagement_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
-    /* USER CODE END W1_MemoryManagement_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Prefetch fault, memory access fault.
-  */
-void BusFault_Handler(void)
-{
-  /* USER CODE BEGIN BusFault_IRQn 0 */
-
-  /* USER CODE END BusFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
-    /* USER CODE END W1_BusFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles Undefined instruction or illegal state.
-  */
-void UsageFault_Handler(void)
-{
-  /* USER CODE BEGIN UsageFault_IRQn 0 */
-
-  /* USER CODE END UsageFault_IRQn 0 */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
-    /* USER CODE END W1_UsageFault_IRQn 0 */
-  }
-}
-
-/**
-  * @brief This function handles System service call via SWI instruction.
-  */
-void SVC_Handler(void)
-{
-  /* USER CODE BEGIN SVCall_IRQn 0 */
-
-  /* USER CODE END SVCall_IRQn 0 */
-  /* USER CODE BEGIN SVCall_IRQn 1 */
-
-  /* USER CODE END SVCall_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Debug monitor.
-  */
-void DebugMon_Handler(void)
-{
-  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
-
-  /* USER CODE END DebugMonitor_IRQn 0 */
-  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
-
-  /* USER CODE END DebugMonitor_IRQn 1 */
-}
-
-/**
-  * @brief This function handles Pendable request for system service.
-  */
-void PendSV_Handler(void)
-{
-  /* USER CODE BEGIN PendSV_IRQn 0 */
-
-  /* USER CODE END PendSV_IRQn 0 */
-  /* USER CODE BEGIN PendSV_IRQn 1 */
-
-  /* USER CODE END PendSV_IRQn 1 */
-}
-
-/**
-  * @brief This function handles System tick timer.
-  */
-void SysTick_Handler(void)
-{
-  /* USER CODE BEGIN SysTick_IRQn 0 */
-
-  /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
-  /* USER CODE BEGIN SysTick_IRQn 1 */
-
-  /* USER CODE END SysTick_IRQn 1 */
-}
-
-/******************************************************************************/
-/* STM32WLxx Peripheral Interrupt Handlers                                    */
-/* Add here the Interrupt Handlers for the used peripherals.                  */
-/* For the available peripheral interrupt handler names,                      */
-/* please refer to the startup file (startup_stm32wlxx.s).                    */
-/******************************************************************************/
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
deleted file mode 100644
index d9e68443..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_fwimg_regions.h
-  * @author  MCD Application Team
-  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_FWIMG_REGIONS_H
-#define SFU_FWIMG_REGIONS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_sfu.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_fwimg.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-#include "se_crypto_config.h"
-
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  *  Slot list : 2 slots per image configuration + swap
-  */
-#define NB_SLOTS      6U
-#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
-#define SLOT_ACTIVE_1 1U
-#define SLOT_ACTIVE_2 2U
-#define SLOT_DWL_1    3U
-#define SLOT_DWL_2    4U
-#define SLOT_SWAP     5U
-
-
-/* Calculation of the size of a slot */
-#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
-
-/*
- * Design constraint: the image slot size must be a multiple of the swap area size.
- * And of course both image slots must have the same size.
- */
-#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
-
-/*
- * Checking that the slot sizes are consistent with the .icf file
- * Sizes expressed in bytes (+1 because the end address belongs to the slot)
- * The checks are executed at runtime in the SFU_Img_Init() function.
- */
-#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
-
-/**
-  * Image starting offset to add to the  address of 1st block
-  */
-#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
-
-
-/* External variables --------------------------------------------------------*/
-extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
-extern const uint32_t  SlotStartAdd[NB_SLOTS];
-extern const uint32_t  SlotEndAdd[NB_SLOTS];
-
-#if defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C) || defined(SFU_LOADER_C)
-
-const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
-                                            SLOT_ACTIVE_1_HEADER,
-                                            SLOT_ACTIVE_2_HEADER,
-                                            SLOT_DWL_1_START,
-                                            0U,
-                                            SWAP_START,
-                                          };
-/* List of slot start address */
-const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
-                                            SLOT_ACTIVE_1_START,
-                                            SLOT_ACTIVE_2_START,
-                                            SLOT_DWL_1_START,
-                                            0U,
-                                            SWAP_START,
-                                          };
-/* List of slot end address */
-const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
-                                            SLOT_ACTIVE_1_END,
-                                            SLOT_ACTIVE_2_END,
-                                            SLOT_DWL_1_END,
-                                            0U,
-                                            SWAP_END,
-                                          };
-#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_FWIMG_REGIONS_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level.c
deleted file mode 100644
index 34b9a787..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level.c
+++ /dev/null
@@ -1,579 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level.c
-  * @author  MCD Application Team
-  * @brief   SFU Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU low level
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level.h"
-#include "sfu_trace.h"
-
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-extern RTC_HandleTypeDef RtcHandle;
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-
-/* Private variables ---------------------------------------------------------*/
-static UART_HandleTypeDef   UartHandle;
-static CRC_HandleTypeDef    CrcHandle;
-
-/* Private function prototypes -----------------------------------------------*/
-static void     SFU_LL_Error_Handler(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize SFU Interface.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Initialize CRC */
-  e_ret_status = SFU_LL_CRC_Init();
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  DeInitialize SFU Interface.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* ADD SRC CODE HERE
-       ...
-  */
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU IF CRC Init.
-  * @param  None
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_CRC_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Configure the peripheral clock */
-  __HAL_RCC_CRC_CLK_ENABLE();
-
-
-  /* Configure CRC with default polynomial - standard configuration */
-  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU  IF CRC Configuration.
-  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
-  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  /* Check the parameters */
-  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
-
-  /* Switch to the selected configuration */
-  CrcHandle.Instance = CRC;
-
-  /* The input data are not inverted */
-  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
-
-  /* The output data are not inverted */
-  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
-
-  switch (eCRCConfg)
-  {
-    case SFU_CRC_CONFIG_DEFAULT:
-      /* The Default polynomial is used */
-      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
-      /* The default init value is used */
-      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
-      /* The input data are 32-bit long words */
-      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
-      /* Valid parameter*/
-      e_ret_status = SFU_SUCCESS;
-      break;
-
-    case SFU_CRC_CONFIG_16BIT:
-      /* The CRC-16-CCIT polynomial is used */
-      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
-      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
-      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
-      /* The zero init value is used */
-      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
-      CrcHandle.Init.InitValue               = 0U;
-      /* The input data are 8-bit long */
-      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
-      /* Valid parameter*/
-      e_ret_status = SFU_SUCCESS;
-      break;
-
-    default:
-      /* Invalid parameter */
-      e_ret_status = SFU_ERROR;
-      break;
-  }
-
-  /* Proceed to CRC Init (Correct Parameters) */
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
-    {
-      e_ret_status = SFU_ERROR;
-    }
-  }
-
-  return e_ret_status;
-}
-
-
-/**
-  * @brief  SFU IF CRC Calculate.
-  * @param  pBuffer: pointer to data buffer.
-  * @param  BufferLength: buffer length in bytes.
-  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
-  */
-uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
-{
-  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
-}
-
-/**
-  * @brief SFU UART Init.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_UART_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
-  /* USART configured as follow:
-  - BaudRate = 115200 baud
-  - Word Length = 8 Bits
-  - One Stop Bit
-  - No parity
-  - Hardware flow control disabled (RTS and CTS signals)
-  - Receive and transmit enabled
-  */
-  UartHandle.Instance = SFU_UART;
-  UartHandle.Init.BaudRate = 115200U;
-  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
-  UartHandle.Init.StopBits = UART_STOPBITS_1;
-  UartHandle.Init.Parity = UART_PARITY_NONE;
-  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
-  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
-  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
-  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
-  if (HAL_UART_Init(&UartHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-
-}
-
-/**
-  * @brief SFU IF UART DeInit.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_UART_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-
-}
-
-/**
-  * @brief  SFU IF Write data (send).
-  * @param  pData: pointer to the 128bit data to write.
-  * @param  DataLength: pointer to the 128bit data to write.
-  * @param  pData: pointer to the 128bit data to write.
-  * @param  Timeout: Timeout duration.
-  * @retval status of the write operation
-  *         SFU_ERROR : if the write operation is not performed
-  *         SFU_SUCCESS : if the write operation is successfully performed
-  */
-SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check the pointers allocation */
-  if (pData == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU IF Read data (receive).
-  * @param  pData: pointer to the 128bit data where to store the received data.
-  * @param  DataLength: the length of the data to be read in bytes.
-  * @param Timeout: Timeout duration.
-  * @retval status of the read operation
-  *         SFU_ERROR : if the read operation is not performed
-  *         SFU_SUCCESS : if the read operation is successfully performed
-  */
-SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Check the pointers allocation */
-  if (pData == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  SFU HAL IF Flush.
-  * @param  None.
-  * @retval status of the operation.
-  */
-SFU_ErrorStatus SFU_LL_UART_Flush(void)
-{
-  /* Clean the input path */
-  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
-
-  return SFU_SUCCESS;
-}
-
-#if  defined(CORE_CM0PLUS)
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-/**
-  * @brief SFU IF RTC Init.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_RTC_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Configure RTC prescaler and RTC data registers */
-  /* RTC configured as follows:
-  - Hour Format    = Format 24
-  - Asynch Prediv  = Value according to source clock
-  - Synch Prediv   = Value according to source clock
-  - OutPut         = Output Disable
-  - OutPutPolarity = High Polarity
-  - OutPutType     = Open Drain */
-  RtcHandle.Instance            = RTC;
-  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
-  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
-  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
-  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
-  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
-  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
-
-  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief SFU IF RTC DeInit.
-  * @param  None
-  * @retval status of the Init operation
-  *         SFU_ERROR : if the Init operation failed.
-  *         SFU_SUCCESS : if the Init operation is successfully performed.
-  */
-SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  e_ret_status = SFU_SUCCESS;
-
-  return e_ret_status;
-
-}
-
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-#endif /* CORE_CM0PLUS */
-
-/**
-  * @brief SFU IF RTC MSP Initialization
-  *        This function configures the hardware resources used in this example
-  * @param hrtc: RTC handle pointer.
-  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
-  *        the RTC clock source; in this case the Backup domain will be reset in
-  *        order to modify the RTC Clock source, as consequence RTC registers (including
-  *        the backup registers) and RCC_BDCR register are set to their reset values.
-  * @retval None
-  */
-void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
-{
-  RCC_OscInitTypeDef        RCC_OscInitStruct;
-  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
-
-  UNUSED(hrtc);
-  /*-1- Enables access to the backup domain */
-  /* To enable access on RTC registers */
-
-  HAL_PWR_EnableBkUpAccess();
-
-  /*-2- Configure LSE/LSI as RTC clock source */
-#ifdef RTC_CLOCK_SOURCE_LSE
-
-  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
-  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-
-  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
-  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-#elif defined (RTC_CLOCK_SOURCE_LSI)
-  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
-  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
-  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-
-  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
-  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
-  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
-  {
-    SFU_LL_Error_Handler();
-  }
-#else
-#error Please select the RTC Clock source inside the main.h file
-#endif /*RTC_CLOCK_SOURCE_LSE*/
-
-  /*-3- Enable RTC peripheral Clocks */
-  /* Enable RTC Clock */
-  __HAL_RCC_RTC_ENABLE();
-
-  /* Enable RTC APB clock  */
-  __HAL_RCC_RTCAPB_CLK_ENABLE();
-#ifdef SFU_TAMPER_PROTECT_ENABLE
-  /*-4- Configure the NVIC for RTC Tamper */
-  HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0x0FU, 0U);
-  HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
-#endif /* SFU_TAMPER_PROTECT_ENABLE */
-}
-
-/**
-  * @brief RTC MSP De-Initialization
-  *        This function frees the hardware resources used in in SFU application:
-  *          - Disable the Peripheral's clock
-  * @param hrtc: RTC handle pointer
-  * @retval None
-  */
-void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
-{
-  UNUSED(hrtc);
-
-  __HAL_RCC_RTC_DISABLE();
-
-  /* Disable RTC APB clock  */
-  __HAL_RCC_RTCAPB_CLK_DISABLE();
-}
-
-/**
-  * @brief UART MSP Initialization
-  *        This function configures the hardware resources used in SFU application.
-  * @param huart: UART handle pointer
-  * @retval None
-  */
-void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
-{
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-  if (huart->Instance == SFU_UART)
-  {
-    /* Peripheral Clock Enable */
-    SFU_UART_CLK_ENABLE();
-
-    /* GPIO Ports Clock Enable */
-    SFU_UART_TX_GPIO_CLK_ENABLE();
-    SFU_UART_RX_GPIO_CLK_ENABLE();
-
-    /*Configure GPIO pins : SFU_UART_TX_Pin  */
-    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
-    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
-
-    /*Configure GPIO pins : SFU_UART_RX_Pin  */
-    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
-    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
-
-  }
-
-}
-
-/**
-  * @brief UART MSP De-Initialization
-  *        This function frees the hardware resources used in SFU application:
-  *          - Disable the Peripheral's clock
-  * @param huart: UART handle pointer
-  * @retval None
-  */
-void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
-{
-
-  if (huart->Instance == SFU_UART)
-  {
-    /* Peripheral clock disable */
-    SFU_UART_CLK_DISABLE();
-
-    /* GPIO DeInit*/
-    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
-    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
-
-  }
-
-
-}
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @param  None
-  * @retval None
-  */
-static void SFU_LL_Error_Handler(void)
-{
-  /*
-    * ADD SRC CODE HERE
-    */
-
-  while (1 == 1)
-  {
-    ;
-  }
-}
-
-
-/**
-  * @}
-  */
-/**
-  * @brief function checking if a buffer is in se ram.
-  * @param pBuff: Secure Engine protected function ID.
-  * @param length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in se ram, SE_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + length - 1U;
-
-  /* Check if length is positive with no overflow and included in the correct range */
-  if ((length != 0U) && (!((0xFFFFFFFFUL - addr_start) < length))
-      && ((addr_end  <= SE_REGION_RAM_END) && (addr_start >= SE_REGION_RAM_START)))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief Check if an array is inside the RAM of the product
-  * @param Addr : address  of array
-  * @param Length : length of array in byte
-  */
-SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow and included in the correct range */
-  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
-      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
-  {
-    e_ret_status = SFU_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SFU_ERROR;
-  }
-  return e_ret_status;
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level.h
deleted file mode 100644
index c22f96a6..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef  SFU_LOW_LEVEL_H
-#define  SFU_LOW_LEVEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief  SFU CRC Configuration definition
-  */
-typedef enum
-{
-  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
-  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
-  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
-} SFU_CRC_ConfigTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define SFU_UART                                USART2
-#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
-#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
-
-#define SFU_UART_TX_AF                          GPIO_AF7_USART2
-#define SFU_UART_TX_GPIO_PORT                   GPIOA
-#define SFU_UART_TX_PIN                         GPIO_PIN_2
-#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
-
-#define SFU_UART_RX_AF                          GPIO_AF7_USART2
-#define SFU_UART_RX_GPIO_PORT                   GPIOA
-#define SFU_UART_RX_PIN                         GPIO_PIN_3
-#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
-#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
-
-/* Uncomment to enable the adequate Clock Source */
-#define RTC_CLOCK_SOURCE_LSI
-/*#define RTC_CLOCK_SOURCE_LSE*/
-
-#ifdef RTC_CLOCK_SOURCE_LSI
-#define RTC_ASYNCH_PREDIV    0x1FU
-#define RTC_SYNCH_PREDIV     0x3FF
-#endif /* RTC_CLOCK_SOURCE_LSI */
-
-#ifdef RTC_CLOCK_SOURCE_LSE
-#define RTC_ASYNCH_PREDIV  0x7FU
-#define RTC_SYNCH_PREDIV   0x00FFU
-#endif /* RTC_CLOCK_SOURCE_LSE */
-
-
-/* Exported macros -----------------------------------------------------------*/
-#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
-                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
-                               ((CONF) == SFU_CRC_CONFIG_16BIT))
-
-/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
-   but not meaningful for this product */
-#define SFU_LL_DummyAccess() \
-  do{ \
-  }while(0)
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus    SFU_LL_Init(void);
-SFU_ErrorStatus    SFU_LL_DeInit(void);
-
-SFU_ErrorStatus    SFU_LL_CRC_Init(void);
-SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
-uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
-
-SFU_ErrorStatus    SFU_LL_UART_Init(void);
-SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
-SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
-SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
-SFU_ErrorStatus    SFU_LL_UART_Flush(void);
-
-#ifndef SFU_TAMPER_PROTECT_ENABLE
-SFU_ErrorStatus SFU_LL_RTC_Init(void);
-SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
-#endif /*SFU_TAMPER_PROTECT_ENABLE*/
-
-void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
-void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
-void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
-void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
-
-SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
-SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*  SFU_LOW_LEVEL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c
deleted file mode 100644
index 2dbc00c7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU flash
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_flash_ext.h"
-#include "sfu_fwimg_regions.h"
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
-  * @param  none
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Init(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
-
-  e_ret_status = SFU_LL_FLASH_INT_Init();
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    e_ret_status = SFU_LL_FLASH_EXT_Init();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pFlashStatus: SFU_FLASH Status pointer
-  * @param  pStart: flash address to be erased
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-
-  /* Check Flash start address */
-  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
-  }
-}
-
-/**
-  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pFlashStatus: FLASH_StatusTypeDef
-  * @param  pDestination: flash address to write
-  * @param  pSource: pointer on buffer with data to write
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                   uint32_t Length)
-{
-  /* Check Flash destination address */
-  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
-  }
-}
-
-/**
-  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pDestination: pointer on buffer to store data
-  * @param  pSource: flash address to read
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  /* Check Flash source address */
-  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
-  }
-}
-
-/**
-  * @brief  This function configure the flash to be able to execute code
-  * @param  Addr: flash address
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
-{
-  /*
-   * Internal flash : nothing to do
-   * External flash : configure memory mapped mode
-   */
-
-  /* Check Flash address */
-  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_SUCCESS;
-  }
-  else
-  {
-    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
-  }
-}
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: flash address
-  * @retval The page of a given address
-  */
-uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
-{
-  /* Check Flash address */
-  if (Addr < EXTERNAL_FLASH_ADDRESS)
-  {
-    return SFU_LL_FLASH_INT_GetPage(Addr);
-  }
-  else
-  {
-    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
-  }
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h
deleted file mode 100644
index a7b6aaca..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update flash
-  *          low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_H
-#define SFU_LOW_LEVEL_FLASH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-typedef enum
-{
-  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
-  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
-  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
-  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
-  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
-  SFU_FLASH_SUCCESS           /*!< Flash Success */
-} SFU_FLASH_StatusTypeDef;
-
-/* Exported constants --------------------------------------------------------*/
-#define INVALID_SECTOR 0xFFFFFFFFU
-#define INVALID_PAGE   0xFFFFFFFFU
-#define INVALID_BANK   0xFFFFFFFFU
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                   uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
-
-uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c
deleted file mode 100644
index 2e4b5b65..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_ext.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU external
-  *          flash low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_flash_ext.h"
-#include "sfu_low_level_security.h"
-
-/* Private defines -----------------------------------------------------------*/
-#define BLOC_64_KBYTES 0x10000U
-
-/* Functions Definition ------------------------------------------------------*/
-
-/* No external flash available on this product
-   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
-       systematically during startup phase */
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
-{
-  return SFU_SUCCESS;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-  UNUSED(pFlashStatus);
-  UNUSED(pStart);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                       uint32_t Length)
-{
-  UNUSED(pFlashStatus);
-  UNUSED(pDestination);
-  UNUSED(pSource);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  UNUSED(pDestination);
-  UNUSED(pSource);
-  UNUSED(Length);
-  return SFU_ERROR;
-}
-
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
-{
-  UNUSED(SlotNumber);
-  return SFU_SUCCESS;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h
deleted file mode 100644
index 2f900bb8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_ext.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface for external flash.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
-#define SFU_LOW_LEVEL_FLASH_EXT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash.h"
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported constants --------------------------------------------------------*/
-#define EXTERNAL_FLASH_ADDRESS  0x90000000U
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                       uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c
deleted file mode 100644
index 1d62570d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_int.c
-  * @author  MCD Application Team
-  * @brief   SFU Flash Low Level Interface module
-  *          This file provides set of firmware functions to manage SFU internal
-  *          flash low level interface.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "sfu_low_level_flash_int.h"
-#include "sfu_low_level_security.h"
-#include "se_interface_bootloader.h"
-#include "string.h"
-#ifdef CORE_CM0PLUS
-#include "sfu_fsm_states.h"
-#include "sfu_error.h"
-#endif /* CORE_CM0PLUS */
-
-/* Private defines -----------------------------------------------------------*/
-#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
-
-/* Private variables ---------------------------------------------------------*/
-static __IO uint32_t DoubleECC_Error_Counter = 0U;
-
-
-static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
-
-/* Functions Definition ------------------------------------------------------*/
-/**
-  * @brief  This function initialize the internal flash interface if required
-  * @param  none
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
-{
-  return SFU_SUCCESS;
-}
-
-/**
-  * @brief  This function does an erase of n (depends on Length) pages in user flash area
-  * @param  pFlashStatus: SFU_FLASH Status pointer
-  * @param  pStart: flash address to be erased
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
-{
-  uint32_t page_error = 0U;
-  uint32_t start = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef p_erase_init;
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t first_page;
-  uint32_t nb_pages;
-  uint32_t chunk_nb_pages;
-  uint32_t length = Length;
-
-  /* Check the pointers allocation */
-  if (pFlashStatus == NULL)
-  {
-    return SFU_ERROR;
-  }
-
-  *pFlashStatus = SFU_FLASH_SUCCESS;
-
-  /* Clear error flags raised during previous operation */
-  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
-
-  if (e_ret_status == SFU_SUCCESS)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() == HAL_OK)
-    {
-      first_page = SFU_LL_FLASH_INT_GetPage(start);
-      /* Get the number of pages to erase from 1st page */
-      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
-      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
-      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
-      do
-      {
-        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
-        p_erase_init.Page = first_page;
-        p_erase_init.NbPages = chunk_nb_pages;
-        first_page += chunk_nb_pages;
-        nb_pages -= chunk_nb_pages;
-        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
-        {
-          e_ret_status = SFU_ERROR;
-          *pFlashStatus = SFU_FLASH_ERR_ERASE;
-        }
-        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
-      } while (nb_pages > 0U);
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      if (HAL_FLASH_Lock() != HAL_OK)
-      {
-        e_ret_status = SFU_ERROR;
-        *pFlashStatus = SFU_FLASH_ERR_HAL;
-      }
-    }
-    else
-    {
-      *pFlashStatus = SFU_FLASH_ERR_HAL;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
-  * @note   After writing data buffer, the flash content is checked.
-  * @param  pFlashStatus: FLASH_StatusTypeDef
-  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
-  * @param  pSource: pointer on buffer with data to write
-  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination, const uint8_t *pSource,
-                                       uint32_t Length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  uint32_t i;
-  uint32_t inside_header = 0U;
-  uint32_t destination = (uint32_t)pDestination;
-  uint32_t source = (uint32_t)pSource;
-
-  /* Check the pointers allocation */
-  if ((pFlashStatus == NULL) || (pSource == NULL))
-  {
-    return SFU_ERROR;
-  }
-
-  /* Is destination area inside 1 of the firmware image headers ? */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      inside_header = 1U;
-    }
-  }
-
-  /* Destination area part of 1 of the firmware image headers :
-     writing operation should be executed inside secure environment */
-  if ((inside_header == 1U) && (Length != 0U))
-  {
-    /* SE Access */
-    SE_StatusTypeDef se_status;
-    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
-    if (se_ret_status == SE_SUCCESS)
-    {
-      e_ret_status = SFU_SUCCESS;
-      *pFlashStatus = SFU_FLASH_SUCCESS;
-    }
-    else
-    {
-      e_ret_status = SFU_ERROR;
-      *pFlashStatus = SFU_FLASH_ERROR;
-    }
-  }
-  /* Writing operation executed by SBSFU */
-  else
-  {
-    *pFlashStatus = SFU_FLASH_ERROR;
-
-    /* Clear error flags raised during previous operation */
-    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
-
-    if (e_ret_status == SFU_SUCCESS)
-    {
-      /* Unlock the Flash to enable the flash control register access *************/
-      if (HAL_FLASH_Unlock() != HAL_OK)
-      {
-        *pFlashStatus = SFU_FLASH_ERR_HAL;
-
-      }
-      else
-      {
-        /* DataLength must be a multiple of 64 bit */
-        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
-        {
-          *pFlashStatus = SFU_FLASH_ERROR;
-
-          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
-          be done by word */
-          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
-              == HAL_OK)
-          {
-            /* Check the written value */
-            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
-            {
-              /* Flash content doesn't match SRAM content */
-              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
-              e_ret_status = SFU_ERROR;
-            }
-            else
-            {
-              /* Increment FLASH Destination address */
-              destination = destination + sizeof(SFU_LL_FLASH_write_t);
-              e_ret_status = SFU_SUCCESS;
-              *pFlashStatus = SFU_FLASH_SUCCESS;
-            }
-          }
-          else
-          {
-            /* Error occurred while writing data in Flash memory */
-            *pFlashStatus = SFU_FLASH_ERR_WRITING;
-            e_ret_status = SFU_ERROR;
-          }
-        }
-        /* Lock the Flash to disable the flash control register access (recommended
-        to protect the FLASH memory against possible unwanted operation) */
-        if (HAL_FLASH_Lock() != HAL_OK)
-        {
-          e_ret_status = SFU_ERROR;
-          *pFlashStatus = SFU_FLASH_ERR_HAL;
-        }
-      }
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function reads flash
-  * @param  pDestination: Start address for target location
-  * @param  pSource: flash address to read
-  * @param  Length: number of bytes
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-  SE_ErrorStatus se_ret_status;
-  SE_StatusTypeDef se_status;
-  uint32_t i;
-  uint32_t inside_header = 0U;
-  uint32_t source = (uint32_t)pSource;
-
-  /* Is destination area inside 1 of the firmware image headers ? */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      inside_header = 1U;
-    }
-  }
-
-  /* Destination area part of 1 of the firmware image headers :
-     reading operation should be executed inside secure environment */
-  if (inside_header == 1U)
-  {
-    /* SE Access */
-    DoubleECC_Error_Counter = 0U;
-    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
-    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-    DoubleECC_Error_Counter = 0U;
-  }
-  /* Reading operation executed by SBSFU */
-  else
-  {
-    DoubleECC_Error_Counter = 0U;
-    (void) memcpy(pDestination, (uint8_t *)source, Length);
-    if (DoubleECC_Error_Counter == 0U)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-    DoubleECC_Error_Counter = 0U;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: flash address
-  * @retval The page of a given address
-  */
-uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
-{
-  uint32_t page;
-
-  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
-
-  return page;
-}
-
-
-
-
-/**
-  * @brief  Clear error flags raised during previous operation
-  * @param  None.
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
-{
-  SFU_ErrorStatus e_ret_status = SFU_ERROR;
-
-  /* Unlock the Program memory */
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-
-    /* Clear all FLASH flags */
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-
-    /* Unlock the Program memory */
-    if (HAL_FLASH_Lock() == HAL_OK)
-    {
-      e_ret_status = SFU_SUCCESS;
-    }
-  }
-
-  return e_ret_status;
-
-}
-
-
-/**
-  * @brief  Get Link Register value (LR)
-  * @param  None.
-  * @retval LR Register value
-  */
-__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
-{
-  register uint32_t result;
-
-#if defined ( __ICCARM__ ) || ( __GNUC__ )
-  __ASM volatile("MOV %0, LR" : "=r"(result));
-#elif defined ( __CC_ARM )
-  __ASM volatile("MOV result, __return_address()");
-#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
-
-  return result;
-}
-
-/*
-   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
-   not to use extra registers (on top of scratch registers), because it would change the stack pointer
-   position. Then compiler optimizations are customized to ensure that.
-*/
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O1")))
-#endif /* __ICCARM__ */
-/**
-  * @brief  NMI Handler present for handling Double ECC NMI interrupt
-  * @param  None.
-  * @retvat void
-  */
-void NMI_Handler(void)
-{
-  uint32_t *p_sp;
-  uint32_t lr;
-  uint16_t opcode_msb;
-
-  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
-  {
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
-
-    /* Memorize error to ignore the read value */
-    DoubleECC_Error_Counter++;
-
-    lr = __get_LR();
-
-    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
-    if (((lr) & (0xFU)) == 0xDU)
-    {
-      /* interrupted code was using Process Stack Pointer */
-      p_sp = (uint32_t *)__get_PSP();
-    }
-    else
-    {
-      /* interrupted code was using Main Stack Pointer */
-      p_sp = (uint32_t *)__get_MSP();
-    }
-
-    /* Test caller mode T bit from CPSR in stack */
-    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
-    {
-      /* Thumb  mode.
-         Test PC in stack.
-         If bits [15:11] of the halfword being decoded take any of the following values,
-         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
-         Otherwise, the halfword is a 16-bit instruction.
-      */
-      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
-      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
-      {
-        /* execute next instruction PC +4  */
-        *(p_sp + 6U) += 4U;
-      }
-      else
-      {
-        /* execute next instruction PC +2  */
-        *(p_sp + 6U) += 2U;
-      }
-    }
-    else
-    {
-      /* ARM mode execute next instruction PC +4 */
-      *(p_sp + 6U) += 4U;
-    }
-  }
-  else
-  {
-    while (1 == 1)
-    {
-      ;
-    }
-  }
-}
-
-
-/**
-  * @brief  HardFault Handler
-  * @param  None.
-  * @retval None.
-  */
-#ifdef CORE_CM0PLUS
-void HardFault_Handler(void)
-{
-  SFU_BOOT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
-}
-#endif /* CORE_CM0PLUS */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h
deleted file mode 100644
index 221c183f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_low_level_flash_int.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Firmware Update low level
-  *          interface for internal flash.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_LOW_LEVEL_FLASH_INT_H
-#define SFU_LOW_LEVEL_FLASH_INT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "sfu_low_level_flash.h"
-#include "main.h"
-#include "sfu_def.h"
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Flash Write Access Constraints (size and alignment)
-  *
-  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
-  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
-  *
-  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
-  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
-  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
-  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_CheckTrailerValid).
-  */
-
-/* double-word is the default setting for most platforms */
-typedef uint64_t SFU_LL_FLASH_write_t;
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * Length of a MAGIC tag (32 bytes).
-  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
-  */
-#define MAGIC_LENGTH ((uint32_t)32U)
-
-/* External variables --------------------------------------------------------*/
-#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
-
-/* Exported functions ------------------------------------------------------- */
-SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination, const uint8_t *pSource,
-                                       uint32_t Length);
-SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
-void NMI_Handler(void);
-void HardFault_Handler(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_trace.h
deleted file mode 100644
index 41b6e137..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/sfu_trace.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    sfu_trace.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for SFU_TRACE functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SFU_TRACE_H
-#define SFU_TRACE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_sfu.h"
-#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
-#include "sfu_com_trace.h"
-#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
-
-/* External variables --------------------------------------------------------*/
-/**
-  * This variable indicates if at boot-up the FW presence check has already been performed or not:
-  * \li It is reset when the FW status has already been checked once and no FW is present
-  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
-  * \li It is used to display some messages only once in the teraterm console
-  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
-  * \li This is used at LocalDownload and CheckUserFwStatus stages.
-  */
-extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
-
-/* Exported macros -----------------------------------------------------------*/
-#ifdef SFU_DEBUG_MODE
-#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid faults. 
-                                                                        printf is not rieentrant */
-#define TRACE   (void) printf
-#else
-#define TRACE(...)
-#define TRACE_IRQ(pbuffer)
-#endif /* SFU_DEBUG_MODE */
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SFU_TRACE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
deleted file mode 100644
index 71ffbae3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
+++ /dev/null
@@ -1,1246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>3</fileVersion>
-    <configuration>
-        <name>CM0PLUS</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>General</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <version>31</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>ExePath</name>
-                    <state>CM0PLUS\Exe</state>
-                </option>
-                <option>
-                    <name>ObjPath</name>
-                    <state>CM0PLUS\Obj</state>
-                </option>
-                <option>
-                    <name>ListPath</name>
-                    <state>CM0PLUS\List</state>
-                </option>
-                <option>
-                    <name>GEndianMode</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>GOutputBinary</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGCoreOrChip</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelect</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelectSlave</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>RTDescription</name>
-                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-                </option>
-                <option>
-                    <name>OGProductVersion</name>
-                    <state>4.41A</state>
-                </option>
-                <option>
-                    <name>OGLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGChipSelectEditMenu</name>
-                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-                </option>
-                <option>
-                    <name>GenLowLevelInterface</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GEndianModeBE</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGBufferedTerminalOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GenStdoutInterface</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>RTConfigPath2</name>
-                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
-                </option>
-                <option>
-                    <name>GBECoreSlave</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>OGUseCmsis</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGUseCmsisDspLib</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibThreads</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CoreVariant</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>GFPUDeviceSlave</name>
-                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-                </option>
-                <option>
-                    <name>FPU2</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NrRegs</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NEON</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GFPUCoreSlave2</name>
-                    <version>26</version>
-                    <state>35</state>
-                </option>
-                <option>
-                    <name>OGCMSISPackSelectDevice</name>
-                </option>
-                <option>
-                    <name>OgLibHeap</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGLibAdditionalLocale</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGPrintfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGPrintfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GenLocaleTags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>GenLocaleDisplayOnly</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DSPExtension</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZone</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZoneModes</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ICCARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>34</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDefines</name>
-                    <state>USE_HAL_DRIVER</state>
-                    <state>STM32WL55xx</state>
-                    <state>CORE_CM0PLUS</state>
-                    <state>KMS_ENABLED</state>
-                </option>
-                <option>
-                    <name>CCPreprocFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocComments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMnemonics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMessages</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDiagSuppress</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagRemark</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagWarning</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagError</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCAllowList</name>
-                    <version>1</version>
-                    <state>11111110</state>
-                </option>
-                <option>
-                    <name>CCDebugInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IEndianMode</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCLangConformance</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSignedPlainChar</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRequirePrototypes</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCDiagWarnAreErr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCompilerRuntimeInfo</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>CCLibConfigHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>PreInclude</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../Common</state>
-                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$\..\CM0PLUS\Core\Inc</state>
-                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\App</state>
-                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target</state>
-                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
-                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Cryptographic\Fw_Crypto\STM32L0\Inc</state>
-                    <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
-                </option>
-                <option>
-                    <name>CCStdIncCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCodeSection</name>
-                    <state>.text</state>
-                </option>
-                <option>
-                    <name>IProcessorMode2</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevel</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CCOptStrategy</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevelSlave</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
-                <option>
-                    <name>CCPosIndRopi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndRwpi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndNoDynInit</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccLang</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCDialect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccAllowVLA</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccStaticDestr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCppInlineSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccFloatSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCOptStrategySlave</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCGuardCalls</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccExceptions2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccRTTI2</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>AARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>10</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>AObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>ACaseSensitivity</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacroChars</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnWhat</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnOne</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>ADebug</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AltRegisterNames</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ADefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AList</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AListHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AListing</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Includes</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacDefs</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacExps</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacExec</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OnlyAssed</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MultiLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLengthCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLength</name>
-                    <state>80</state>
-                </option>
-                <option>
-                    <name>TabSpacing</name>
-                    <state>8</state>
-                </option>
-                <option>
-                    <name>AXRef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDefines</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefInternal</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDual</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AOutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsEdit</name>
-                    <state>100</state>
-                </option>
-                <option>
-                    <name>AIgnoreStdInclude</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AUserIncludes</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AExtraOptionsCheckV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AExtraOptionsV2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AsmNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>OBJCOPY</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OOCOutputFormat</name>
-                    <version>3</version>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>OCOutputOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCOutputFile</name>
-                    <state>Project.bin</state>
-                </option>
-                <option>
-                    <name>OOCCommandLineProducer</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCObjCopyEnable</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CUSTOM</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <extensions></extensions>
-                <cmdline></cmdline>
-                <hasPrio>0</hasPrio>
-            </data>
-        </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-        <settings>
-            <name>BUILDACTION</name>
-            <archiveVersion>1</archiveVersion>
-            <data>
-                <prebuild></prebuild>
-                <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$.\se_interface_appli.o"</postbuild>
-            </data>
-        </settings>
-        <settings>
-            <name>ILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>21</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IlinkLibIOConfig</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkInputFileSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOutputFile</name>
-                    <state>Project.out</state>
-                </option>
-                <option>
-                    <name>IlinkDebugInfoEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkKeepSymbols</name>
-                    <state>SE_CORE_Bin</state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryFile</name>
-                    <state>$PROJ_DIR$.\..\..\2_Images_SECoreBin\EWARM\SE_Core.bin</state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySymbol</name>
-                    <state>SE_CORE_Bin</state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySegment</name>
-                    <state>SE_CORE_Bin</state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkConfigDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkMapFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogInitialization</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogModule</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogSection</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogVeneer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFileSlave</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkSuppressDiags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsRem</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsWarn</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsErr</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkWarningsAreErrors</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkUseExtraOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkExtraOptions</name>
-                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-                </option>
-                <option>
-                    <name>IlinkLowLevelInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAutoLibEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAdditionalLibs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkOverrideProgramEntryLabel</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabelSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabel</name>
-                    <state>__iar_program_start</state>
-                </option>
-                <option>
-                    <name>DoFill</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>FillerByte</name>
-                    <state>0xFF</state>
-                </option>
-                <option>
-                    <name>FillerStart</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>FillerEnd</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>CrcSize</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcPoly</name>
-                    <state>0x11021</state>
-                </option>
-                <option>
-                    <name>CrcCompl</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcBitOrder</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcInitialValue</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>DoCrc</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkBufferedTerminalOutput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkStdoutInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcFullSize</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIElfToolPostProcess</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogAutoLibSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogRedirSymbols</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogUnusedFragments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcReverseByteOrder</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcUseAsInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptInline</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsAllow</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsForce</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptMergeDuplSections</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptUseVfe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptForceVfe</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackAnalysisEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackControlFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkStackCallGraphFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CrcAlgorithm</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcUnitSize</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkThreadsSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogCallGraph</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile_AltDefault</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkHeapSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLocaleSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>CM0PLUS_import_lib.o</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IARCHIVE</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IarchiveInputs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IarchiveOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IarchiveOutput</name>
-                    <state>###Uninitialized###</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-    </configuration>
-    <group>
-        <name>Doc</name>
-        <file>
-            <name>$PROJ_DIR$\..\readme.txt</name>
-        </file>
-    </group>
-    <group>
-        <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-        </group>
-        <group>
-            <name>SBSFU</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_boot.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_error.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_mpu_isolation.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_test.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_common.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_no_swap.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_swap.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_kms.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_interface_crypto_scheme.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Target</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_security.c</name>
-                </file>
-            </group>
-            <group>
-                <name>Common</name>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_com_trace.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_low_level.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_int.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_ext.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>EWARM</name>
-            <file>
-                <name>$PROJ_DIR$\sfu_se_mpu.s</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Drivers</name>
-        <group>
-            <name>BSP</name>
-            <group>
-                <name>STM32WLxx_Nucleo</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>STM32WLxx_HAL_Driver</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-            </file>
-        </group>
-        <group>
-            <name>CMSIS</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
-            </file>
-        </group>
-    </group>
-        <group>
-          <name>Middlewares</name>
-          <group>
-            <name>STM32_Secure_Engine</name>
-            <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
-            </file>
-            <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
-            </file>
-            <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
-            </file>
-          </group>
-          <group>
-            <name>STM32_Key_Management_Services</name>
-            <file>
-              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
-            </file>
-        </group>
-    </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
deleted file mode 100644
index 7cf6df49..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
+++ /dev/null
@@ -1,1176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-    <fileVersion>3</fileVersion>
-    <configuration>
-        <name>CM4</name>
-        <toolchain>
-            <name>ARM</name>
-        </toolchain>
-        <debug>1</debug>
-        <settings>
-            <name>General</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <version>31</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>ExePath</name>
-                    <state>CM4\Exe</state>
-                </option>
-                <option>
-                    <name>ObjPath</name>
-                    <state>CM4\Obj</state>
-                </option>
-                <option>
-                    <name>ListPath</name>
-                    <state>CM4\List</state>
-                </option>
-                <option>
-                    <name>GEndianMode</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
-                </option>
-                <option>
-                    <name>GOutputBinary</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGCoreOrChip</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelect</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibSelectSlave</name>
-                    <version>0</version>
-                    <state>2</state>
-                </option>
-                <option>
-                    <name>RTDescription</name>
-                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-                </option>
-                <option>
-                    <name>OGProductVersion</name>
-                    <state>4.41A</state>
-                </option>
-                <option>
-                    <name>OGLastSavedByProductVersion</name>
-                    <state>8.30.1.17146</state>
-                </option>
-                <option>
-                    <name>GeneralEnableMisra</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVerbose</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGChipSelectEditMenu</name>
-                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-                </option>
-                <option>
-                    <name>GenLowLevelInterface</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GEndianModeBE</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGBufferedTerminalOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GenStdoutInterface</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>GeneralMisraVer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GeneralMisraRules04</name>
-                    <version>0</version>
-                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>RTConfigPath2</name>
-                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
-                </option>
-                <option>
-                    <name>GBECoreSlave</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>OGUseCmsis</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGUseCmsisDspLib</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GRuntimeLibThreads</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CoreVariant</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>GFPUDeviceSlave</name>
-                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-                </option>
-                <option>
-                    <name>FPU2</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NrRegs</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>NEON</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>GFPUCoreSlave2</name>
-                    <version>26</version>
-                    <state>39</state>
-                </option>
-                <option>
-                    <name>OGCMSISPackSelectDevice</name>
-                </option>
-                <option>
-                    <name>OgLibHeap</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGLibAdditionalLocale</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OGPrintfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGPrintfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfVariant</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OGScanfMultibyteSupport</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>GenLocaleTags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>GenLocaleDisplayOnly</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>DSPExtension</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>TrustZone</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>TrustZoneModes</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>ICCARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>34</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDefines</name>
-                    <state>USE_HAL_DRIVER</state>
-                    <state>STM32WL55xx</state>
-                </option>
-                <option>
-                    <name>CCPreprocFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocComments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPreprocLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMnemonics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListCMessages</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCListAssSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCDiagSuppress</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagRemark</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagWarning</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCDiagError</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCAllowList</name>
-                    <version>1</version>
-                    <state>11111110</state>
-                </option>
-                <option>
-                    <name>CCDebugInfo</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IEndianMode</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IExtraOptionsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IExtraOptions</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CCLangConformance</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCSignedPlainChar</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCRequirePrototypes</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCDiagWarnAreErr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCompilerRuntimeInfo</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>CCLibConfigHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>PreInclude</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CompilerMisraOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../Common</state>
-                    <state>$PROJ_DIR$/../CM4/Inc</state>
-                    <state>$PROJ_DIR$/../../2_Images_SECoreBin/Inc</state>
-                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</state>
-                </option>
-                <option>
-                    <name>CCStdIncCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCCodeSection</name>
-                    <state>.text</state>
-                </option>
-                <option>
-                    <name>IProcessorMode2</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevel</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CCOptStrategy</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCOptLevelSlave</name>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules98</name>
-                    <version>0</version>
-                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-                </option>
-                <option>
-                    <name>CompilerMisraRules04</name>
-                    <version>0</version>
-                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-                </option>
-                <option>
-                    <name>CCPosIndRopi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndRwpi</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCPosIndNoDynInit</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccLang</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCDialect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccAllowVLA</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccStaticDestr</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCppInlineSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IccFloatSemantics</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCOptStrategySlave</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCGuardCalls</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncSource</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CCEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CCEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccExceptions2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IccRTTI2</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>AARM</name>
-            <archiveVersion>2</archiveVersion>
-            <data>
-                <version>10</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>AObjPrefix</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AEndian</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>ACaseSensitivity</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacroChars</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnWhat</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AWarnOne</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange1</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AWarnRange2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>ADebug</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AltRegisterNames</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ADefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AList</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AListHeader</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AListing</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>Includes</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacDefs</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MacExps</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>MacExec</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>OnlyAssed</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>MultiLine</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLengthCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>PageLength</name>
-                    <state>80</state>
-                </option>
-                <option>
-                    <name>TabSpacing</name>
-                    <state>8</state>
-                </option>
-                <option>
-                    <name>AXRef</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDefines</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefInternal</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AXRefDual</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AFpuProcessor</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>AOutputFile</name>
-                    <state>$FILE_BNAME$.o</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsCheck</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>ALimitErrorsEdit</name>
-                    <state>100</state>
-                </option>
-                <option>
-                    <name>AIgnoreStdInclude</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AUserIncludes</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AExtraOptionsCheckV2</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>AExtraOptionsV2</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>AsmNoLiteralPool</name>
-                    <state>0</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>OBJCOPY</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>1</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>OOCOutputFormat</name>
-                    <version>3</version>
-                    <state>3</state>
-                </option>
-                <option>
-                    <name>OCOutputOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCOutputFile</name>
-                    <state>Project.bin</state>
-                </option>
-                <option>
-                    <name>OOCCommandLineProducer</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>OOCObjCopyEnable</name>
-                    <state>1</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>CUSTOM</name>
-            <archiveVersion>3</archiveVersion>
-            <data>
-                <extensions></extensions>
-                <cmdline></cmdline>
-                <hasPrio>0</hasPrio>
-            </data>
-        </settings>
-        <settings>
-            <name>BICOMP</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-        <settings>
-            <name>BUILDACTION</name>
-            <archiveVersion>1</archiveVersion>
-            <data>
-                <prebuild></prebuild>
-                <postbuild></postbuild>
-            </data>
-        </settings>
-        <settings>
-            <name>ILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>21</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IlinkLibIOConfig</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>XLinkMisraHandler</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkInputFileSlave</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOutputFile</name>
-                    <state>Project.out</state>
-                </option>
-                <option>
-                    <name>IlinkDebugInfoEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkKeepSymbols</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySymbol</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinarySegment</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkRawBinaryAlign</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkConfigDefines</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkMapFile</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogFile</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogInitialization</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogModule</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogSection</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogVeneer</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfOverride</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFileSlave</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEnableRemarks</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkSuppressDiags</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsRem</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsWarn</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkTreatAsErr</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkWarningsAreErrors</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkUseExtraOptions</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkExtraOptions</name>
-                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-                </option>
-                <option>
-                    <name>IlinkLowLevelInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAutoLibEnable</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkAdditionalLibs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkOverrideProgramEntryLabel</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabelSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkProgramEntryLabel</name>
-                    <state>__iar_program_start</state>
-                </option>
-                <option>
-                    <name>DoFill</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>FillerByte</name>
-                    <state>0xFF</state>
-                </option>
-                <option>
-                    <name>FillerStart</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>FillerEnd</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>CrcSize</name>
-                    <version>0</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcAlign</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcPoly</name>
-                    <state>0x11021</state>
-                </option>
-                <option>
-                    <name>CrcCompl</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcBitOrder</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>CrcInitialValue</name>
-                    <state>0x0</state>
-                </option>
-                <option>
-                    <name>DoCrc</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkBE8Slave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkBufferedTerminalOutput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkStdoutInterfaceSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcFullSize</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIElfToolPostProcess</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogAutoLibSelect</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogRedirSymbols</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkLogUnusedFragments</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcReverseByteOrder</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCrcUseAsInput</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptInline</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsAllow</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptExceptionsForce</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkCmsis</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptMergeDuplSections</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkOptUseVfe</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkOptForceVfe</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackAnalysisEnable</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkStackControlFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkStackCallGraphFile</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>CrcAlgorithm</name>
-                    <version>1</version>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>CrcUnitSize</name>
-                    <version>0</version>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkThreadsSlave</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLogCallGraph</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkIcfFile_AltDefault</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IlinkEncInput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutput</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IlinkEncOutputBom</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkHeapSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkLocaleSelect</name>
-                    <state>1</state>
-                </option>
-                <option>
-                    <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>CM4_import_lib.o</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>IARCHIVE</name>
-            <archiveVersion>0</archiveVersion>
-            <data>
-                <version>0</version>
-                <wantNonLocal>1</wantNonLocal>
-                <debug>1</debug>
-                <option>
-                    <name>IarchiveInputs</name>
-                    <state></state>
-                </option>
-                <option>
-                    <name>IarchiveOverride</name>
-                    <state>0</state>
-                </option>
-                <option>
-                    <name>IarchiveOutput</name>
-                    <state>###Uninitialized###</state>
-                </option>
-            </data>
-        </settings>
-        <settings>
-            <name>BILINK</name>
-            <archiveVersion>0</archiveVersion>
-            <data />
-        </settings>
-    </configuration>
-    <group>
-        <name>Application</name>
-        <group>
-            <name>EWARM</name>
-            <file>
-                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
-            </file>
-        </group>
-        <group>
-            <name>User</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\sfu_com_loader.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\sfu_loader.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\sfu_low_level_security.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Src\sfu_new_image.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Common</name>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_com_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_int.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_ext.c</name>
-            </file>
-        </group>
-    </group>
-    <group>
-        <name>Doc</name>
-        <file>
-            <name>$PROJ_DIR$\..\readme.txt</name>
-        </file>
-    </group>
-    <group>
-        <name>Drivers</name>
-        <group>
-            <name>BSP</name>
-            <group>
-                <name>STM32WLxx_Nucleo</name>
-                <file>
-                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>CMSIS</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
-            </file>
-        </group>
-        <group>
-            <name>STM32WLxx_HAL_Driver</name>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-            </file>
-            <file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
-            </file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_hsem.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
-            </file>
-        </group>
-    </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
deleted file mode 100644
index a6cf0145..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
+++ /dev/null
@@ -1,316 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm0plus.s
-;* Author             : MCD Application Team
-;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M0+ processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
-        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
-        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
-        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
-        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
-        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
-        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
-        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
-        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
-
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-
-        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
-        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
-        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
-        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
-        DCD     RNG_IRQHandler                      ; RNG Interrupt
-        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
-        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
-        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
-        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
-        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                   ; USART1 Interrupt
-        DCD     USART2_IRQHandler                   ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
-        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK TZIC_ILA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TZIC_ILA_IRQHandler
-        B TZIC_ILA_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK RTC_LSECSS_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_LSECSS_IRQHandler
-        B RTC_LSECSS_IRQHandler
-
-        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_FLASH_C1SEV_IRQHandler
-        B RCC_FLASH_C1SEV_IRQHandler
-
-        PUBWEAK EXTI1_0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_0_IRQHandler
-        B EXTI1_0_IRQHandler
-
-        PUBWEAK EXTI3_2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_2_IRQHandler
-        B EXTI3_2_IRQHandler
-
-        PUBWEAK EXTI15_4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_4_IRQHandler
-        B EXTI15_4_IRQHandler
-
-        PUBWEAK ADC_COMP_DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_COMP_DAC_IRQHandler
-        B ADC_COMP_DAC_IRQHandler
-
-        PUBWEAK DMA1_Channel1_2_3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_2_3_IRQHandler
-        B DMA1_Channel1_2_3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_5_6_7_IRQHandler
-        B DMA1_Channel4_5_6_7_IRQHandler
-
-        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_DMAMUX1_OVR_IRQHandler
-        B DMA2_DMAMUX1_OVR_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK TIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_IRQHandler
-        B TIM1_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C2_RX_C2_TX_IRQHandler
-        B IPCC_C2_RX_C2_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK AES_PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_PKA_IRQHandler
-        B AES_PKA_IRQHandler
-
-        PUBWEAK LCD_802_1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LCD_802_1_IRQHandler
-        B LCD_802_1_IRQHandler
-
-        PUBWEAK I2C1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_IRQHandler
-        B I2C1_IRQHandler
-
-        PUBWEAK I2C2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_IRQHandler
-        B I2C2_IRQHandler
-
-        PUBWEAK I2C3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_IRQHandler
-        B I2C3_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
deleted file mode 100644
index 1431e7f3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
+++ /dev/null
@@ -1,509 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm4.s
-;* Author             : MCD Application Team
-;* Description        : M4 core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M4 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     MemManage_Handler                 ; MPU Fault Handler
-        DCD     BusFault_Handler                  ; Bus Fault Handler
-        DCD     UsageFault_Handler                ; Usage Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     DebugMon_Handler                  ; Debug Monitor Handler
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     WWDG_IRQHandler                   ; Window WatchDog
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
-        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
-        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
-        DCD     RCC_IRQHandler                    ; RCC Interrupt
-        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
-        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
-        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
-        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
-        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
-        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
-        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
-        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
-        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
-        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
-        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
-        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
-        DCD     ADC_IRQHandler                    ; ADC Interrupt
-        DCD     DAC_IRQHandler                    ; DAC Interrupt
-        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
-        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
-        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
-        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
-        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
-        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
-        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
-        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
-        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
-        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
-        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
-        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
-        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                 ; USART1 Interrupt
-        DCD     USART2_IRQHandler                 ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
-        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
-        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
-        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
-        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
-        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
-        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
-        DCD     AES_IRQHandler                    ; AES Interrupt
-        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
-        DCD     PKA_IRQHandler                    ; PKA Interrupt
-        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
-        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
-        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
-        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
-        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
-        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
-        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
-        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK MemManage_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-MemManage_Handler
-        B MemManage_Handler
-
-        PUBWEAK BusFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-BusFault_Handler
-        B BusFault_Handler
-
-        PUBWEAK UsageFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-UsageFault_Handler
-        B UsageFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK DebugMon_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DebugMon_Handler
-        B DebugMon_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK WWDG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-WWDG_IRQHandler
-        B WWDG_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
-
-        PUBWEAK RTC_WKUP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_WKUP_IRQHandler
-        B RTC_WKUP_IRQHandler
-
-        PUBWEAK FLASH_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-FLASH_IRQHandler
-        B FLASH_IRQHandler
-
-        PUBWEAK RCC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_IRQHandler
-        B RCC_IRQHandler
-
-        PUBWEAK EXTI0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI0_IRQHandler
-        B EXTI0_IRQHandler
-
-        PUBWEAK EXTI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_IRQHandler
-        B EXTI1_IRQHandler
-
-        PUBWEAK EXTI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI2_IRQHandler
-        B EXTI2_IRQHandler
-
-        PUBWEAK EXTI3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_IRQHandler
-        B EXTI3_IRQHandler
-
-        PUBWEAK EXTI4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI4_IRQHandler
-        B EXTI4_IRQHandler
-
-        PUBWEAK DMA1_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_IRQHandler
-        B DMA1_Channel1_IRQHandler
-
-        PUBWEAK DMA1_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel2_IRQHandler
-        B DMA1_Channel2_IRQHandler
-
-        PUBWEAK DMA1_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel3_IRQHandler
-        B DMA1_Channel3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_IRQHandler
-        B DMA1_Channel4_IRQHandler
-
-        PUBWEAK DMA1_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel5_IRQHandler
-        B DMA1_Channel5_IRQHandler
-
-        PUBWEAK DMA1_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel6_IRQHandler
-        B DMA1_Channel6_IRQHandler
-
-        PUBWEAK DMA1_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel7_IRQHandler
-        B DMA1_Channel7_IRQHandler
-
-        PUBWEAK ADC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_IRQHandler
-        B ADC_IRQHandler
-
-        PUBWEAK DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DAC_IRQHandler
-        B DAC_IRQHandler
-
-        PUBWEAK C2SEV_PWR_C2H_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-C2SEV_PWR_C2H_IRQHandler
-        B C2SEV_PWR_C2H_IRQHandler
-
-        PUBWEAK COMP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-COMP_IRQHandler
-        B COMP_IRQHandler
-
-        PUBWEAK EXTI9_5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI9_5_IRQHandler
-        B EXTI9_5_IRQHandler
-
-        PUBWEAK TIM1_BRK_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_BRK_IRQHandler
-        B TIM1_BRK_IRQHandler
-
-        PUBWEAK TIM1_UP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_UP_IRQHandler
-        B TIM1_UP_IRQHandler
-
-        PUBWEAK TIM1_TRG_COM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_TRG_COM_IRQHandler
-        B TIM1_TRG_COM_IRQHandler
-
-        PUBWEAK TIM1_CC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_CC_IRQHandler
-        B TIM1_CC_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK I2C1_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_EV_IRQHandler
-        B I2C1_EV_IRQHandler
-
-        PUBWEAK I2C1_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_ER_IRQHandler
-        B I2C1_ER_IRQHandler
-
-        PUBWEAK I2C2_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_EV_IRQHandler
-        B I2C2_EV_IRQHandler
-
-        PUBWEAK I2C2_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_ER_IRQHandler
-        B I2C2_ER_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK EXTI15_10_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_10_IRQHandler
-        B EXTI15_10_IRQHandler
-
-        PUBWEAK RTC_Alarm_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_Alarm_IRQHandler
-        B RTC_Alarm_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK IPCC_C1_RX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_RX_IRQHandler
-        B IPCC_C1_RX_IRQHandler
-
-        PUBWEAK IPCC_C1_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_TX_IRQHandler
-        B IPCC_C1_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK I2C3_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_EV_IRQHandler
-        B I2C3_EV_IRQHandler
-
-        PUBWEAK I2C3_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_ER_IRQHandler
-        B I2C3_ER_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        PUBWEAK AES_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_IRQHandler
-        B AES_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PKA_IRQHandler
-        B PKA_IRQHandler
-
-        PUBWEAK DMA2_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel1_IRQHandler
-        B DMA2_Channel1_IRQHandler
-
-        PUBWEAK DMA2_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel2_IRQHandler
-        B DMA2_Channel2_IRQHandler
-
-        PUBWEAK DMA2_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel3_IRQHandler
-        B DMA2_Channel3_IRQHandler
-
-        PUBWEAK DMA2_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel4_IRQHandler
-        B DMA2_Channel4_IRQHandler
-
-        PUBWEAK DMA2_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel5_IRQHandler
-        B DMA2_Channel5_IRQHandler
-
-        PUBWEAK DMA2_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel6_IRQHandler
-        B DMA2_Channel6_IRQHandler
-
-        PUBWEAK DMA2_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel7_IRQHandler
-        B DMA2_Channel7_IRQHandler
-
-        PUBWEAK DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMAMUX1_OVR_IRQHandler
-        B DMAMUX1_OVR_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
deleted file mode 100644
index f9c5ea74..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-show SE_APP_GetActiveFwInfo
-show SE_APP_ValidateFw
-show SE_APP_SVC_Handler
-show SE_SYS_SaveDisableIrq
-show SE_SYS_RestoreEnableIrq
-show SE_KMS_Initialize
-show SE_KMS_Finalize
-show SE_KMS_GetInfo
-show SE_KMS_GetFunctionList
-show SE_KMS_GetSlotList
-show SE_KMS_GetSlotInfo
-show SE_KMS_GetTokenInfo
-show SE_KMS_GetMechanismInfo
-show SE_KMS_OpenSession
-show SE_KMS_CloseSession
-show SE_KMS_CreateObject
-show SE_KMS_DestroyObject
-show SE_KMS_GetAttributeValue
-show SE_KMS_SetAttributeValue
-show SE_KMS_FindObjectsInit
-show SE_KMS_FindObjects
-show SE_KMS_FindObjectsFinal
-show SE_KMS_EncryptInit
-show SE_KMS_Encrypt
-show SE_KMS_EncryptUpdate
-show SE_KMS_EncryptFinal
-show SE_KMS_DecryptInit
-show SE_KMS_Decrypt
-show SE_KMS_DecryptUpdate
-show SE_KMS_DecryptFinal
-show SE_KMS_DigestInit
-show SE_KMS_Digest
-show SE_KMS_DigestUpdate
-show SE_KMS_DigestFinal
-show SE_KMS_SignInit
-show SE_KMS_Sign
-show SE_KMS_VerifyInit
-show SE_KMS_Verify
-show SE_KMS_DeriveKey
-show SE_KMS_GenerateKeyPair
-show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
deleted file mode 100644
index 3238fd37..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
+++ /dev/null
@@ -1,914 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>1</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>1</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>0</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>42</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134423046</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>../CM0PLUS/Core/Src/main.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\SBSFU\../CM0PLUS/Core/Src/main.c\42</Expression>
-        </Bp>
-      </Breakpoint>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>0</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>0</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>sfu_se_mpu.s</PathWithFileName>
-      <FilenameWithoutPath>sfu_se_mpu.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>se_core_bin.s</PathWithFileName>
-      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/SBSFU/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_boot.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_error.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_fwimg_no_swap.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_fwimg_swap.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_kms.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_mpu_isolation.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_test.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/SBSFU/Common</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_com_trace.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash_ext.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Common/sfu_low_level_flash_int.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/SBSFU/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>38</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>39</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>40</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>41</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>42</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>43</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>44</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>45</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>46</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>47</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>10</GroupNumber>
-      <FileNumber>48</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
-      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>10</GroupNumber>
-      <FileNumber>49</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
-      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>10</GroupNumber>
-      <FileNumber>50</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
-      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>11</GroupNumber>
-      <FileNumber>51</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
-      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
deleted file mode 100644
index b832c252..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
+++ /dev/null
@@ -1,710 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM0P</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo_CM0PLUS\Exe\</OutputDirectory>
-          <OutputName>SBSFU</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
-          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments></TargetDllArguments>
-          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls>-Wno-format</MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Common;../CM0PLUS/Core/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../CM0PLUS/Core/Inc;../CM0PLUS/SBSFU/App;../CM0PLUS/SBSFU/Target;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Cryptographic/Fw_Crypto/STM32L0/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>SBSFU_cm0plus.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--symdefs=se_interface_appli.txt
---keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/Core</GroupName>
-          <Files>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_se_mpu.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>sfu_se_mpu.s</FilePath>
-            </File>
-            <File>
-              <FileName>se_core_bin.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>se_core_bin.s</FilePath>
-            </File>
-            <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/SBSFU/App</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_boot.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_boot.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_error.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_error.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_fwimg_common.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_fwimg_no_swap.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_fwimg_swap.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_interface_crypto_scheme.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_kms.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_mpu_isolation.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_test.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/App/sfu_test.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/SBSFU/Common</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_com_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_com_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_ext.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash_ext.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_int.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash_int.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/SBSFU/Target</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_low_level_security.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_nucleo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gtzc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_iwdg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_spi.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_application.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_interface_bootloader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_interface_common.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="CM0PLUS"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
deleted file mode 100644
index b6543c7e..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
+++ /dev/null
@@ -1,609 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM4</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll></FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile></RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>STM32WL55JC_Nucleo_CM4\Exe\</OutputDirectory>
-          <OutputName>SB</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>1</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments>-REMAP -MPU</SimDllArguments>
-          <SimDlgDll>DCM.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments>-MPU</TargetDllArguments>
-          <TargetDlgDll>TCM.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>0</hadIROM>
-            <hadIRAM>0</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>0</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>4</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>0</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>0</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>4</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Common;../CM4/Inc;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>SB_cm4.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/Common</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_com_trace.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_com_trace.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_int.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash_int.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_flash_ext.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/sfu_low_level_flash_ext.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/main.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/stm32wlxx_hal_msp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/stm32wlxx_it.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_com_loader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/sfu_com_loader.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_loader.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/sfu_loader.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_low_level_security.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/sfu_low_level_security.c</FilePath>
-            </File>
-            <File>
-              <FileName>sfu_new_image.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Src/sfu_new_image.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_nucleo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_hsem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_iwdg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
-        <targetInfos>
-          <targetInfo name="CM4"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
deleted file mode 100644
index 38aa4233..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="SBSFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../CM0PLUS/SBSFU/App | ../../../CM0PLUS/SBSFU/Target | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../../Common"/>
-									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/App"/>
-									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/Target"/>
-									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="2_Images_SBSFU_CM0PLUS.null.839446873" name="2_Images_SBSFU_CM0PLUS"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1415671833;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1687290193">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="refreshScope"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
deleted file mode 100644
index 14c24135..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
-<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SECoreBin.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SECoreBin&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161&quot;,&quot;fPerformBuild&quot;:false,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="8000"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="C:\git\wl_master\Firmware\Projects\NUCLEO-WL55JC\Applications\SBSFU_2_Images_DualCore\2_Images_SBSFU\STM32CubeIDE\CM0PLUS\Debug\st-link_gdbserver_log.txt"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
-<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SBSFU.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM0PLUS"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/2_Images_SBSFU_CM0PLUS"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
deleted file mode 100644
index ff9b2425..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-SE_APP_GetActiveFwInfo
-SE_APP_ValidateFw
-SE_APP_SVC_Handler
-SE_SYS_SaveDisableIrq
-SE_SYS_RestoreEnableIrq
-SE_KMS_Initialize
-SE_KMS_Finalize
-SE_KMS_GetInfo
-SE_KMS_GetFunctionList
-SE_KMS_GetSlotList
-SE_KMS_GetSlotInfo
-SE_KMS_GetTokenInfo
-SE_KMS_GetMechanismInfo
-SE_KMS_OpenSession
-SE_KMS_CloseSession
-SE_KMS_CreateObject
-SE_KMS_DestroyObject
-SE_KMS_GetAttributeValue
-SE_KMS_SetAttributeValue
-SE_KMS_FindObjectsInit
-SE_KMS_FindObjects
-SE_KMS_FindObjectsFinal
-SE_KMS_EncryptInit
-SE_KMS_Encrypt
-SE_KMS_EncryptUpdate
-SE_KMS_EncryptFinal
-SE_KMS_DecryptInit
-SE_KMS_Decrypt
-SE_KMS_DecryptUpdate
-SE_KMS_DecryptFinal
-SE_KMS_DigestInit
-SE_KMS_Digest
-SE_KMS_DigestUpdate
-SE_KMS_DigestFinal
-SE_KMS_SignInit
-SE_KMS_Sign
-SE_KMS_VerifyInit
-SE_KMS_Verify
-SE_KMS_DeriveKey
-SE_KMS_GenerateKeyPair
-SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
deleted file mode 100644
index c7ea6119..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="SB" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2015646735" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1427517226" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.219198562" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.717379913" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1323484811" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.358650252" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.437904655" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1049432240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM4/Inc | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core ||  ||  || USE_HAL_DRIVER | STM32WL55xx ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.857176010" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1383605403" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.758517685" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.92741657" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.261244217" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1809731028" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1152988115" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1052358781" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.209012098" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../../Common"/>
-									<listOptionValue builtIn="false" value="../../../CM4/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1008796121" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.189316865" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.85880463" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.964611899" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.360401545" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.974389923" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.94946969" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2140178522" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1240986986" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2113270654" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1941785021" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.483477110" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1843769445" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1745519627" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1919967923" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1803902265" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.854144635" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.438689590" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="2_Images_SBSFU_CM4.null.2010752311" name="2_Images_SBSFU_CM4"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.583077904;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.583077904.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1197799154;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1116976384">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="refreshScope"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
deleted file mode 100644
index b9fb51fa..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
-<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SB.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="C:\git\wl_master\Firmware\Projects\NUCLEO-WL55JC\Applications\SBSFU_2_Images_DualCore\2_Images_SBSFU\STM32CubeIDE\CM4\Debug\st-link_gdbserver_log.txt"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
-<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SB.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM4"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/2_Images_SBSFU_CM4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/readme.txt
deleted file mode 100644
index 00a6e951..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/readme.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
-  @page 2_Images_SBSFU / Secure Boot and Secure Firmware Update Demo Application (Dual Core)
-
-  @verbatim
-  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
-  * @file    readme.txt
-  * @brief   This application shows Secure Boot and Secure Firmware Update example.
-  ******************************************************************************
-  *
-  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                               www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Application Description
-
-The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update
-of the STM32 microcontroller built-in program with new firmware versions, adding
-new features and correcting potential issues. The update process is performed in
-a secure way to prevent unauthorized updates and access to confidential on-device
-data such as secret code and firmware encryption key.
-In addition, Secure Boot (Root of Trust services) checks and activates the STM32
-security mechanisms, and checks the authenticity and integrity of user application
-code before every execution to ensure that invalid or malicious code cannot be run.
-The Secure Firmware Update application receives the encrypted firmware image, decrypts
-it, then checks the authenticity and integrity of the code before installing it.
-
-The secure key management services provide cryptographic services to the user
-application through the pkcs11 APIs (KEY ID based APIs) that are executed inside
-a protected and isolated environment. User application keys are stored in the
-protected and isolated environment. They can be updated in a secure way (authenticity
-check, data decryption and data integrity check).
-
-This example supports multiple images feature configured with 2 active images for
-execution from internal flash and 1 download area also located in internal flash.
-This example allows to demonstrate features like:
-* download a new firmware image from the application
-* resume firmware update procedure in case of power off during installation
-
-For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
-available from the STMicroelectronics microcontroller website www.st.com.
-
-@par Keywords
-
-Security, SBSFU, GTZC, Dual core, MPU
-
-@par Directory contents
-
-   - 2_Images_SBSFU/CM0PLUS/Core/Src/main.c                           Main M0+ application file
-   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              M0+ HAL MSP module
-   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c                   STM32 M0+ interrupt handlers
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h                         Hardware definition for application
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/main.h                           Header file for M0+ main.c
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h          M0+ BSP configuration file
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             M0+ HAL configuration file
-   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h                   Header file for M0+ stm32wlxx_it.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c                     SBSFU errors management
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c              SBSFU image handling: common functionalities/services
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c                SBSFU image handling: FW upgrade without swap area services
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c             SBSFU image handling: FW upgrade with swap area services
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c                       Key management service blob importation handling
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c             Secure Engine isolation with MPU (when no Firewall is available)
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c                      SBSFU security protection automatic test
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h                       Software configuration of M0+ SBSFU application
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h                      Header file for sfu_boot.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h                     Header file for sfu_error.c file
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h                SBSFU FSM states definitions
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h                       Header file for sfu_kms.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h             Header file for sfu_mpu_isolation.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h                      Header file for sfu_test.c
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c     SBSFU security low level interface
-   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h     Header file for security low level interface
-   - 2_Images_SBSFU/CM4/Src/main.c                                    Main M4 application file
-   - 2_Images_SBSFU/CM4/Src/sfu_com_loader.c                          SBSFU communication module: local loader part
-   - 2_Images_SBSFU/CM4/Src/sfu_loader.c                              SBSFU Local Loader
-   - 2_Images_SBSFU/CM4/Src/sfu_low_level_security.c                  M4 SB security low level interface
-   - 2_Images_SBSFU/CM4/Src/sfu_new_image.c                           SBSFU image handling: new image storage and installation request
-   - 2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c                       M4 HAL MSP module
-   - 2_Images_SBSFU/CM4/Src/stm32wlxx_it.c                            STM32 M4 interrupt handlers
-   - 2_Images_SBSFU/CM4/Inc/app_sfu.h                                 Software configuration of M4 SB application
-   - 2_Images_SBSFU/CM4/Inc/main.h                                    Header file for M4 main.c
-   - 2_Images_SBSFU/CM4/Inc/sfu_boot.h                                Definitions for Secure Boot (SB) flow control
-   - 2_Images_SBSFU/CM4/Inc/sfu_com_loader.h                          Header file for sfu_com_loader.c
-   - 2_Images_SBSFU/CM4/Inc/sfu_loader.h                              Header file for sfu_loader.c
-   - 2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h                  Header file for security low level interface
-   - 2_Images_SBSFU/CM4/Inc/sfu_new_image.h                           Header file for sfu_new_image.c
-   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h                      M4 HAL configuration file
-   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h                            Header file for M4 stm32wlxx_it.c
-   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h                   M4 BSP configuration file
-   - 2_Images_SBSFU/Common/sfu_com_trace.c                            SBSFU communication module: trace part
-   - 2_Images_SBSFU/Common/sfu_low_level.c                            SBSFU general low level interface
-   - 2_Images_SBSFU/Common/sfu_low_level_flash.c                      SBSFU flash low level interface (wrapper)
-   - 2_Images_SBSFU/Common/sfu_low_level_flash_ext.c                  SBSFU external flash low level interface
-   - 2_Images_SBSFU/Common/sfu_low_level_flash_int.c                  SBSFU internal flash low level interface
-   - 2_Images_SBSFU/Common/app_sfu_common.h                           Common software configuration of M4 SB and M0+ SBSFU applications
-   - 2_Images_SBSFU/Common/sfu_com_trace.h                            Header file for sfu_com_trace.c
-   - 2_Images_SBSFU/Common/sfu_def.h                                  General definition for SBSFU application
-   - 2_Images_SBSFU/Common/sfu_fwimg_regions.h                        FLASH regions definitions for image handling
-   - 2_Images_SBSFU/Common/sfu_low_level.h                            Header file for general low level interface
-   - 2_Images_SBSFU/Common/sfu_low_level_flash.h                      Header file for flash low level interface (wrapper)
-   - 2_Images_SBSFU/Common/sfu_low_level_flash_ext.h                  Header external file for flash low level interface
-   - 2_Images_SBSFU/Common/sfu_low_level_flash_int.h                  Header internal file for flash low level interface
-   - 2_Images_SBSFU/Common/sfu_trace.h                                Header file for sfu_trace.c
-
-@par Hardware and Software environment
-
-  - This example runs on STM32WL55xx devices.
-  - This example has been tested with NUCLEO-WL55JC RevC board and can be
-    easily tailored to any other supported device and development board.
-  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
-    is a feature provided by STM32Cube programmer available on www.st.com.
-  - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
-  - This example needs a terminal emulator.
-  - Microsoft Windows has a limitation whereby paths to files and directories cannot
-    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
-    shell scripts) to fail reading from or writing to such files.
-    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
-    up a local drive out of an existing directory on the hard drive, such as:
-    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
-
-@par How to use it ?
-
-Several steps to run SBSFU application :
-
-1. Compile projects in the following order. This is mandatory as each project requests some objects
-   generated by the compilation of the previous one:
-  - 2_Images_SECoreBin (see also SECoreBin/readme.txt)
-  - 2_Images_SBSFU (using both CM4 and CM0+ workspaces)
-  - 2_Images_UserApp_M0Plus (see also UserApp_M0Plus/readme.txt)
-  - 2_Images_UserApp_M4 (see also UserApp_M4/readme.txt)
-
-2. Before loading SBSFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that
-   the following are valid for the device:
- - RDP Level 0
- - Write Protection disabled on all FLASH pages
- - Chip has been erased
-
-3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator
-   that can be downloaded from https://osdn.net/projects/ttssh2/) for UART connection with the board.
-   Support of YMODEM protocol is required. Serial port configuration should be :
- - Baud rate = 115200
- - Data = 8 bits
- - Parity = none
- - Stop = 1 bit
- - Flow control = none
-
-4. Load CM4 SB image and CM0+ SBSFU image into target memory with your preferred toolchain or STM32CubeProgammer.
-
-5. Once the SB_SFU software is downloaded, power cycle the board (unplug/plug USB cable) : the SBSFU
-   application starts and configures the security mechanisms.
-
-6. Power cycle the board a second time (unplug/plug the USB cable): the SBSFU application starts with
-   the configured securities turned on and the Tera Term connection is possible.
-   Caution: Make sure to use an up-to-date version of ST-LINK firmware else SBSFU may not start.
-
-7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
-   Red LED blinks every 500 ms when waiting for the CM0+ SBSFU to boot.
-   Green LED blinks every 100 ms when CM0+ and/or CM4 firmware image(s) need(s) to be dowloaded.
-   Red LED blinks every 3 seconds when a local download is waited.
-   A reboot occurs in case of error in option bytes configuration.
-
-8. Send the first user encrypted firmware file (\2_Images\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
-   \2_Images\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term
-   by using menu "File > Transfer > YMODEM > Send..."
-
-9. Send the second user encrypted firmware file (\2_Images\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
-   \2_Images\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term
-   by using menu "File > Transfer > YMODEM > Send..."
-
-Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
-Note2 : As TAMPER detection can be very sensitive, the protection is disabled by default.
-        Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
-Note3 :  for Linux users Minicom can be used but to do so you need to compile the SBSFU project with the MINICOM_YMODEM switch enabled (app_sfu.h)
-
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
deleted file mode 100644
index d5f8eac5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
+++ /dev/null
@@ -1,1184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state>CORE_CM0PLUS</state>
-          <state>KMS_ENABLED</state>
-          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
-          <state>IT_MANAGEMENT_DISABLED</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
-          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
-          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
-          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-          <state>$PROJ_DIR$</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>..\..\SE_Core.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
-        <postbuild></postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>SE_CallGate</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
-    <group>
-      <name>STM32_Secure_Engine</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_bootinfo.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
-      </file>
-    </group>
-    <group>
-      <name>STM32_Key_Management_Services</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
-      </file>
-    </group>
-    <group>
-      <name>Third_Party</name>
-      <group>
-        <name>mbed-crypto</name>
-        <file>
-          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
-        </file>
-      </group>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
deleted file mode 100644
index a99eff0d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
+++ /dev/null
@@ -1,178 +0,0 @@
-::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfu=%userAppBinary%\\%execname%.sfu"
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-
-set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\project.out"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\project.out"
-:setkeys
-set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%"
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header.txt (
-  del %projectdir%\header.txt
-)
-set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
-echo header %header% >> %projectdir%\output.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %partialbin% %partialsfu%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
-%command%
-
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialsfu%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
deleted file mode 100644
index f9bb40c3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
+++ /dev/null
@@ -1,168 +0,0 @@
-::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-set "oemkey="
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\project.out"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\project.out"
-:setkeys
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
-IF %ERRORLEVEL% NEQ 0 goto :error
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-:: no encryption
-set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:: no encryption so pack the binary file
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header.txt (
-  del %projectdir%\header.txt
-)
-set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
-echo header %header% >> %projectdir%\output.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% -o 512 --pfw %partialbin% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
deleted file mode 100644
index 8813f92b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
+++ /dev/null
@@ -1,177 +0,0 @@
-::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-:: arg1 is the build directory
-:: arg2 is the elf file path+name
-:: arg3 is the bin file path+name
-:: arg4 is the firmware Id (1/2/3)
-:: arg5 is the version
-:: arg6 when present forces "bigelf" generation
-@echo off
-set "projectdir=%1"
-set "execname=%~n3"
-set "elf=%2"
-set "bin=%3"
-set "fwid=%4"
-set "version=%5"
-
-set "SBSFUBootLoader=%~d0%~p0\\..\\.."
-::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
-::If you installed it in another location, please update the %programmertool% variable below accordingly.
-set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
-set "userAppBinary=%projectdir%\\..\\Binary\\"
-
-set "sfu=%userAppBinary%\\%execname%.sfu"
-set "sfb=%userAppBinary%\\%execname%.sfb"
-set "sign=%userAppBinary%\\%execname%.sign"
-set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
-set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
-set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
-set "partialbin=%userAppBinary%\\Partial%execname%.bin"
-set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
-set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
-set "partialsign=%userAppBinary%\\Partial%execname%.sign"
-set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
-set "ref_userapp=%projectdir%\\RefUserApp.bin"
-
-set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
-set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
-IF "%fwid%"=="2" (
-set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\project.out"
-goto setkeys
-)
-set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\project.out"
-:setkeys
-set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
-set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
-set "magic=SFU%fwid%"
-
-::comment this line to force python
-::python is used if windows executable not found
-pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
-set basedir=%cd%
-popd
-goto exe:
-goto py:
-:exe
-::line for window executable
-echo Postbuild with windows executable
-set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
-set "python="
-if exist %prepareimage% (
-goto postbuild
-)
-:py
-::line for python
-echo Postbuild with python script
-set "prepareimage=%basedir%\\prepareimage.py"
-set "python=python "
-:postbuild
-
-::Make sure we have a Binary sub-folder in UserApp folder
-if not exist "%userAppBinary%" (
-mkdir "%userAppBinary%"
-)
-
-::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
-if exist %elfbackup% (
-fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
-)
-
-set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::get Header address when not contiguous with firmware
-if exist %projectdir%\header.txt (
-  del %projectdir%\header.txt
-)
-set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
-echo header %header% >> %projectdir%\output.txt 2>>&1
-
-if exist %priorbin%.baseadd (goto addpriorbin)
-set extramergebin=
-goto buildmergecmd
-:addpriorbin
-set /P priorbinbaseadd=<%priorbin%.baseadd
-set extramergebin=%priorbin%@%priorbinbaseadd%;
-:buildmergecmd
-set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-::Partial image generation if reference userapp exists
-if not exist "%ref_userapp%" (
-goto :bigelf
-)
-set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a 16 --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %partialbin% %partialsfu%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% -o 512 --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
-%command%
-
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:bigelf
-IF  "%~6"=="" goto :finish
-echo "Generating the global elf file (SBSFU and userApp)"
-echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
-set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
-%command%
-IF %ERRORLEVEL% NEQ 0 goto :error
-
-:finish
-::backup and clean up the intermediate file
-del %sign%
-del %sfu%
-del %headerbin%
-if exist "%ref_userapp%" (
-del %partialsign%
-del %partialbin%
-del %partialsfu%
-del %partialoffset%
-)
-
-exit 0
-
-:error
-echo "%command% : failed" >> %projectdir%\\output.txt
-:: remove the elf to force the regeneration
-if exist %elf%(
-  del %elf%
-)
-if exist %elfbackup%(
-  del %elfbackup%
-)
-echo %command% : failed
-
-pause
-exit 1
-
-:nothingtodo
-exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
deleted file mode 100644
index 71d0aaf5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ /dev/null
@@ -1,28 +0,0 @@
-/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
-
-define memory mem with size = 4G;
-
-define symbol __ICFEDIT_size_heap__ = 0x200;
-
-/******************************************************************************/
-/*       Include of SE symbols file                                           */
-/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
-/*   specify the the directory to search for include files                    */
-/******************************************************************************/
-include "mapping_sbsfu.icf";
-include "mapping_fwimg.icf";
-
-initialize by copy { readwrite };
-do not initialize  { section .noinit, section BOOTINFO_DATA};
-
-define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
-
-/******************************************************************************/
-/*                          placement instructions                            */
-/******************************************************************************/
-place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
-place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
-place in SE_CODE_NOKEY_ROM_region {readonly};
-place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
-keep { section .SE_embedded_Keys };
-place in SE_RAM_region {readwrite, section BOOTINFO_DATA, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
deleted file mode 100644
index a8adec58..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_low_level.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for Secure Engine low level interface
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SE_LOW_LEVEL_H
-#define SE_LOW_LEVEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_def.h"
-
-/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
-   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
-#include "sfu_fwimg_regions.h"
-
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup SE
-  * @{
-  */
-
-/** @addtogroup SE_HARDWARE
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
-  * @{
-  */
-/**
-  * @brief flash handling constants: these constants are used in se_fwimg.c
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
-  * @{
-  */
-
-/**
-  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
-  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
-  * 32-bit word.
-  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
-  */
-#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
-  do{                                  \
-    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
-  }while(0)
-
-/**
-  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
-  */
-#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
-  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
-  * @{
-  */
-
-/* == Code isolation : FIREWALL example ==*/
-#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
-#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
-
-/* == Code isolation : MPU example ==*/
-/**
-  * This switch enables the Secure Engine isolation based on the MPU usage.
-  * This switch must be enabled if the STM32 platform in use does not have a Firewall.
-  * This switch cannot be enabled if the example is provided with Firewall isolation.
-  */
-/* == MPU isolation ENABLED ==*/
-#define SFU_ISOLATE_SE_WITH_MPU
-
-/** @addtogroup SE_LOW_LEVEL_Exported_Functions
-  * @{
-  */
-void SE_LL_CORE_Cleanup(void);
-#if defined (__CC_ARM)
-void __arm_clean_data(void);
-#elif defined(__GNUC__)
-void __gcc_clean_data(void);
-#endif /* __CC_ARM */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_Functions
-  * @{
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_CRC_Config(void);
-SE_ErrorStatus SE_LL_CRC_Init(void);
-SE_ErrorStatus SE_LL_CRC_DeInit(void);
-uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
-SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
-
-void NMI_Handler(void);
-void HardFault_Handler(void);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
-  * @{
-  */
-SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
-SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SE_LOW_LEVEL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
deleted file mode 100644
index 4fe870aa..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
+++ /dev/null
@@ -1,705 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath></ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>1</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>1</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>1</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint/>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>1</periodic>
-        <aLwin>0</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>1</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>.\data_init.c</PathWithFileName>
-      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/User</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_bootinfo.c</PathWithFileName>
-      <FilenameWithoutPath>se_bootinfo.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
-      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
-      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
-      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
-      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
-      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
-      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
-      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
-      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
-      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
-      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
-      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
-      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
-      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
-      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
-      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
-      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
-      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
-      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>::CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>1</RteFlg>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 2c08ec25..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM0P</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>SECoreBin</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath></ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name>prebuild.bat .</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
-          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> </TargetDllArguments>
-          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
-              <Undefine></Undefine>
-              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>SECoreBin.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--entry=SE_CallGate
---diag_suppress L6404W
---diag_suppress L6314W</Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>data_init.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\data_init.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>ca_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/ca_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/kms_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>nvms_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/nvms_low_level.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_low_level.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/se_low_level.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pka.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_bootinfo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_bootinfo.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_callgate.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_exception.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_fwimg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_startup.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_user_application.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_utils.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
-          <Files>
-            <File>
-              <FileName>ca_core.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_der_x962.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_digest.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_dyn_obj.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_ecc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_enc_dec.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_entry.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_init.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_key_mgt.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_mem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_nvm_storage.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_objects.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_platf_objects.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_sign_verify.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
-          <Files>
-            <File>
-              <FileName>platform_util.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
-            </File>
-            <File>
-              <FileName>sha256.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_2_Images_SECoreBin"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
deleted file mode 100644
index 4778d9e5..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
+++ /dev/null
@@ -1,29 +0,0 @@
-#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
-; *************************************************************
-; *** Scatter-Loading Description File generated by uVision ***
-; *************************************************************
-#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
-#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
-
-
-; *** regions needed by SE_CoreBin project ***
-LR_SE SE_CODE_REGION_ROM_START {
-  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
-  *(.SE_CallGate_Code)
-  }
-  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
-  *(.SE_Startup_Code)
-  }
-  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_CODE_NOKEY_REGION_ROM_SIZE{
-  .ANY (+RO)
-  } 
-  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
-  *(.SE_embedded_Keys)
-  }
-  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
-  .ANY (+RW +ZI)
-  }
-  SE_region_RAM_Boot +0  {
-   *(BOOTINFO_DATA) 
-  }
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
deleted file mode 100644
index cc4430d8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/2_Images_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../Inc"/>
-									<listOptionValue builtIn="false" value=".."/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
-									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
-									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
-									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="2_Images_SECoreBin.null.394363235" name="2_Images_SECoreBin"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope"/>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
deleted file mode 100644
index 560ac564..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>2_Images_SECoreBin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Doc/readme.txt</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
-		</link>
-		<link>
-			<name>Application/User/ca_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/kms_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/nvms_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/se_low_level.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_bootinfo.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_bootinfo.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.sh b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.sh
deleted file mode 100644
index b7e52f1a..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.sh
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_AES128_GCM_WITH_AES128_GCM
-# arg1 is the build directory
-# arg2 is the elf file path+name
-# arg3 is the bin file path+name
-# arg4 is the firmware Id (1/2/3)
-# arg5 is the version
-# arg6 when present forces "bigelf" generation
-projectdir=$1
-FileName=${3##*/}
-execname=${FileName%.*}
-elf=$2
-bin=$3
-fwid=$4
-version=$5
-
-SecureEngine=${0%/*} 
-
-userAppBinary=$projectdir"/../Binary"
-
-sfu=$userAppBinary"/"$execname".sfu"
-sfb=$userAppBinary"/"$execname".sfb"
-sign=$userAppBinary"/"$execname".sign"
-headerbin=$userAppBinary"/"$execname"sfuh.bin"
-bigbinary=$userAppBinary"/SBSFU_"$execname".bin"
-elfbackup=$userAppBinary"/SBSFU_"$execname".elf"
-nonce=$SecureEngine"/../Binary/nonce.bin"
-magic="SFU"$fwid
-oemkey=$SecureEngine"/../Binary/OEM_KEY_COMPANY"$fwid"_key_AES_GCM.bin"
-partialbin=$userAppBinary"/Partial"$execname".bin"
-partialsfb=$userAppBinary"/Partial"$execname".sfb"
-partialsfu=$userAppBinary"/Partial"$execname".sfu"
-partialsign=$userAppBinary"/Partial"$execname".sign"
-partialoffset=$userAppBinary"/Partial"$execname".offset"
-ref_userapp=$projectdir"/RefUserApp.bin"
-current_directory=`pwd`
-cd  $SecureEngine"/../../"
-SecureDir=`pwd`
-cd $current_directory
-if [ $fwid -eq 2 ]; then
-  priorbin="$SecureDir/2_Images_UserApp_M0Plus/Binary/SBSFU_UserApp_CM0Plus.bin"
-  priorbinadd="$SecureDir/2_Images_UserApp_M0Plus/Binary/SBSFU_UserApp_CM0Plus.bin.baseadd"
-  sbsfuelf="$SecureDir/2_Images_SBSFU/STM32CubeIDE/CM4/Debug/SB.elf"
-  if [ -e "$priorbinadd" ]; then
-    baseadd=`cat $priorbinadd`
-    extramergebin=$priorbin"@"$baseadd";"
-  fi
-else
-  sbsfuelf="$SecureDir/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/SBSFU.elf"
-  extramergebin=""
-fi
-mapping="$SecureDir/Linker_Common/STM32CubeIDE/mapping_fwimg.ld" 
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname | grep -i -e windows -e mingw > /dev/null 2>&1
-
-if [ $? -eq 0 ] && [   -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  export PATH=$basedir"\win\prepareimage";$PATH > /dev/null 2>&1
-  cmd=""
-  prepareimage="prepareimage.exe"
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-echo "$cmd $prepareimage" >> $1/output.txt
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-command=$cmd" "$prepareimage" enc -k "$oemkey" -n "$nonce" "$bin" "$sfu
-$command > $projectdir"/output.txt"
-ret=$?
-if [ $ret -eq 0 ]; then
-  command=$cmd" "$prepareimage" sign -k "$oemkey" -n "$nonce" "$bin" "$sign
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret -eq 0 ]; then 
-    command=$cmd" "$prepareimage" pack -m "$magic" -k "$oemkey"  -r 112 -v "$version" -n "$nonce" -f "$sfu" -t "$sign" "$sfb" -o 512"
-    $command >> $projectdir"/output.txt"
-    ret=$?
-    if [ $ret -eq 0 ]; then
-      command=$cmd" "$prepareimage" header -m "$magic" -k  "$oemkey" -r 112 -v "$version"  -n "$nonce" -f "$sfu" -t "$sign" -o 512 "$headerbin
-      $command >> $projectdir"/output.txt"
-      ret=$?
-      if [ $ret -eq 0 ]; then
-        command=$cmd" "$prepareimage" extract -d SLOT_Active_"$fwid"_header "$mapping
-        header=`$command`
-        ret=$?
-        echo "header $header" >> $projectdir"/output.txt"
-        if [ $ret -eq 0 ]; then
-          command=$cmd" "$prepareimage" mergev2 -v 0 -e 1 -b "$extramergebin$headerbin"@"$header" -f "$sbsfuelf";"$elf" "$bigbinary
-          echo "merge: $command" >> $projectdir"/output.txt"
-          $command >> $projectdir"/output.txt"
-          ret=$?
-          #Partial image generation if reference userapp exists
-          if [ $ret -eq 0 ] && [ -e "$ref_userapp" ]; then
-            echo "Generating the partial image .sfb"
-            echo "Generating the partial image .sfb" >> $projectdir"/output.txt"
-            command=$cmd" "$prepareimage" diff -1 "$ref_userapp" -2 "$bin" "$partialbin" -a 16 --poffset "$partialoffset
-            $command >> $projectdir"/output.txt"
-            ret=$?
-            if [ $ret -eq 0 ]; then
-              command=$cmd" "$prepareimage" enc -k "$oemkey" -i "$nonce" "$partialbin" "$partialsfu
-              $command >> $projectdir"/output.txt"
-              ret=$?
-              if [ $ret -eq 0 ]; then  
-                command=$cmd" "$prepareimage" sign -k "$oemkey" -n "$nonce" "$partialbin" "$partialsign
-                $command >> $projectdir"/output.txt"
-                ret=$?
-                if [ $ret -eq 0 ]; then
-                  command=$cmd" "$prepareimage" pack -m "$magic" -k "$oemkey" -r 112 -v "$version" -i "$nonce" -f "$sfu" -t "$sign" -o 512 --pfw "$partialsfu" --ptag "$partialsign" --poffset  "$partialoffset" "$partialsfb
-                  $command >> $projectdir"/output.txt"
-                  ret=$?
-                fi
-              fi
-            fi
-          fi
-        fi
-        if [ $ret -eq 0 ] && [ $# = 6 ]; then
-          echo "Generating the global elf file SBSFU and userApp"
-          echo "Generating the global elf file SBSFU and userApp" >> $projectdir"/output.txt"
-          uname | grep -i -e windows -e mingw > /dev/null 2>&1
-          if [ $? -eq 0 ]; then
-            # Set to the default installation path of the Cube Programmer tool
-            # If you installed it in another location, please update PATH.
-            PATH="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin":$PATH > /dev/null 2>&1
-            programmertool="STM32_Programmer_CLI.exe"
-          else
-            which STM32_Programmer_CLI > /dev/null
-            if [ $? = 0 ]; then
-              programmertool="STM32_Programmer_CLI"
-            else
-              echo "fix access path to STM32_Programmer_CLI"
-            fi
-          fi
-          command=$programmertool" -ms "$elf" "$headerbin" "$sbsfuelf
-          $command >> $projectdir"/output.txt"
-          ret=$?
-        fi
-      fi
-    fi
-  fi
-fi
-
-if [ $ret -eq 0 ]; then
-  rm $sign
-  rm $sfu
-  rm $headerbin
-  if [ -e "$ref_userapp" ]; then
-    rm $partialbin
-    rm $partialsfu
-    rm $partialsign
-    rm $partialoffset
-  fi  
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  if [ -e  "$elf" ]; then
-    rm  $elf
-  fi
-  if [ -e "$elfbackup" ]; then 
-    rm  $elfbackup
-  fi
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.sh b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.sh
deleted file mode 100644
index 53805aa7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.sh
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-# arg1 is the build directory
-# arg2 is the elf file path+name
-# arg3 is the bin file path+name
-# arg4 is the firmware Id (1/2/3)
-# arg5 is the version
-# arg6 when present forces "bigelf" generation
-projectdir=$1
-FileName=${3##*/}
-execname=${FileName%.*}
-elf=$2
-bin=$3
-fwid=$4
-version=$5
-
-SecureEngine=${0%/*} 
-
-userAppBinary=$projectdir"/../Binary"
-
-sfb=$userAppBinary"/"$execname".sfb"
-sign=$userAppBinary"/"$execname".sign"
-headerbin=$userAppBinary"/"$execname"sfuh.bin"
-bigbinary=$userAppBinary"/SBSFU_"$execname".bin"
-elfbackup=$userAppBinary"/SBSFU_"$execname".elf"
-magic="SFU"$fwid
-ecckey=$SecureEngine"/../Binary/ECCKEY"$fwid".txt"
-partialbin=$userAppBinary"/Partial"$execname".bin"
-partialsfb=$userAppBinary"/Partial"$execname".sfb"
-partialsign=$userAppBinary"/Partial"$execname".sign"
-partialoffset=$userAppBinary"/Partial"$execname".offset"
-ref_userapp=$projectdir"/RefUserApp.bin"
-current_directory=`pwd`
-cd  $SecureEngine"/../../"
-SecureDir=`pwd`
-cd $current_directory
-if [ $fwid -eq 2 ]; then
-  priorbin="$SecureDir/2_Images_UserApp_M0Plus/Binary/SBSFU_UserApp_CM0Plus.bin"
-  priorbinadd="$SecureDir/2_Images_UserApp_M0Plus/Binary/SBSFU_UserApp_CM0Plus.bin.baseadd"
-  sbsfuelf="$SecureDir/2_Images_SBSFU/STM32CubeIDE/CM4/Debug/SB.elf"
-  if [ -e "$priorbinadd" ]; then
-    baseadd=`cat $priorbinadd`
-    extramergebin=$priorbin"@"$baseadd";"
-  fi
-else
-  sbsfuelf="$SecureDir/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/SBSFU.elf"
-  extramergebin=""
-fi
-mapping="$SecureDir/Linker_Common/STM32CubeIDE/mapping_fwimg.ld" 
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname | grep -i -e windows -e mingw > /dev/null 2>&1
-
-if [ $? -eq 0 ] && [   -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  export PATH=$basedir"\win\prepareimage";$PATH > /dev/null 2>&1
-  cmd=""
-  prepareimage="prepareimage.exe"
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-echo "$cmd $prepareimage" >> $1/output.txt
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-command=$cmd" "$prepareimage" sha256 "$bin" "$sign
-$command > $projectdir"/output.txt"
-ret=$?
-if [ $ret -eq 0 ]; then
-  command=$cmd" "$prepareimage" pack -m "$magic" -k "$ecckey" -p 1 -r 44 -v "$version" -f "$bin" -t "$sign" "$sfb" -o 512" 
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret -eq 0 ]; then
-    command=$cmd" "$prepareimage" header -m "$magic" -k  "$ecckey"  -p 1 -r 44 -v "$version"  -f "$bin" -t "$sign" -o 512 "$headerbin
-    $command >> $projectdir"/output.txt"
-    ret=$?
-    if [ $ret -eq 0 ]; then
-      command=$cmd" "$prepareimage" extract -d SLOT_Active_"$fwid"_header "$mapping
-      header=`$command`
-      ret=$?
-      echo "header $header" >> $projectdir"/output.txt"
-      if [ $ret -eq 0 ]; then
-        command=$cmd" "$prepareimage" mergev2 -v 0 -e 1 -b "$extramergebin$headerbin"@"$header" -f "$sbsfuelf";"$elf" "$bigbinary
-        echo "merge: $command" >> $projectdir"/output.txt"
-        $command >> $projectdir"/output.txt"
-        ret=$?
-        #Partial image generation if reference userapp exists
-        if [ $ret -eq 0 ] && [ -e "$ref_userapp" ]; then
-          echo "Generating the partial image .sfb"
-          echo "Generating the partial image .sfb" >> $projectdir"/output.txt"
-          command=$cmd" "$prepareimage" diff -1 "$ref_userapp" -2 "$bin" "$partialbin" -a 16 --poffset "$partialoffset
-          $command >> $projectdir"/output.txt"
-          ret=$?
-          if [ $ret -eq 0 ]; then
-            command=$cmd" "$prepareimage" sha256 "$partialbin" "$partialsign
-            $command >> $projectdir"/output.txt"
-            ret=$?
-            if [ $ret -eq 0 ]; then
-              command=$cmd" "$prepareimage" pack -m "$magic" -k "$ecckey" -p 1 -r 44 -v "$version" -f "$bin" -t "$sign" -o 512 --pfw "$partialbin" --ptag "$partialsign" --poffset  "$partialoffset" "$partialsfb
-              $command >> $projectdir"/output.txt"
-              ret=$?
-            fi
-          fi
-        fi
-      fi
-      if [ $ret -eq 0 ] && [ $# = 6 ]; then
-        echo "Generating the global elf file (SBSFU and userApp)"
-        echo "Generating the global elf file (SBSFU and userApp)" >> $projectdir"/output.txt"
-        uname | grep -i -e windows -e mingw > /dev/null 2>&1
-        if [ $? -eq 0 ]; then
-          # Set to the default installation path of the Cube Programmer tool
-          # If you installed it in another location, please update PATH.
-          PATH="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin":$PATH > /dev/null 2>&1
-          programmertool="STM32_Programmer_CLI.exe"
-        else
-          which STM32_Programmer_CLI > /dev/null
-          if [ $? = 0 ]; then
-            programmertool="STM32_Programmer_CLI"
-          else
-            echo "fix access path to STM32_Programmer_CLI"
-          fi
-        fi
-        command=$programmertool" -ms "$elf" "$headerbin" "$sbsfuelf
-        $command >> $projectdir"/output.txt"
-        ret=$?
-      fi
-    fi
-  fi
-fi
-
-if [ $ret -eq 0 ]; then
-  rm $sign
-  rm $headerbin
-  if [ -e "$ref_userapp" ]; then
-    rm $partialbin
-    rm $partialsign
-    rm $partialoffset
-  fi  
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  if [ -e  "$elf" ]; then
-    rm  $elf
-  fi
-  if [ -e "$elfbackup" ]; then 
-    rm  $elfbackup
-  fi
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.sh b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.sh
deleted file mode 100644
index d2946e79..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.sh
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/bin/bash - 
-#Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
-# arg1 is the build directory
-# arg2 is the elf file path+name
-# arg3 is the bin file path+name
-# arg4 is the firmware Id (1/2/3)
-# arg5 is the version
-# arg6 when present forces "bigelf" generation
-projectdir=$1
-FileName=${3##*/}
-execname=${FileName%.*}
-elf=$2
-bin=$3
-fwid=$4
-version=$5
-
-SecureEngine=${0%/*} 
-
-userAppBinary=$projectdir"/../Binary"
-
-sfu=$userAppBinary"/"$execname".sfu"
-sfb=$userAppBinary"/"$execname".sfb"
-sign=$userAppBinary"/"$execname".sign"
-headerbin=$userAppBinary"/"$execname"sfuh.bin"
-bigbinary=$userAppBinary"/SBSFU_"$execname".bin"
-elfbackup=$userAppBinary"/SBSFU_"$execname".elf"
-iv=$SecureEngine"/../Binary/iv.bin"
-magic="SFU"$fwid
-oemkey=$SecureEngine"/../Binary/OEM_KEY_COMPANY"$fwid"_key_AES_CBC.bin"
-ecckey=$SecureEngine"/../Binary/ECCKEY"$fwid".txt"
-partialbin=$userAppBinary"/Partial"$execname".bin"
-partialsfb=$userAppBinary"/Partial"$execname".sfb"
-partialsfu=$userAppBinary"/Partial"$execname".sfu"
-partialsign=$userAppBinary"/Partial"$execname".sign"
-partialoffset=$userAppBinary"/Partial"$execname".offset"
-ref_userapp=$projectdir"/RefUserApp.bin"
-current_directory=`pwd`
-cd  $SecureEngine"/../../"
-SecureDir=`pwd`
-cd $current_directory
-if [ $fwid -eq 2 ]; then
-  priorbin="$SecureDir/2_Images_UserApp_M0Plus/Binary/SBSFU_UserApp_CM0Plus.bin"
-  priorbinadd="$SecureDir/2_Images_UserApp_M0Plus/Binary/SBSFU_UserApp_CM0Plus.bin.baseadd"
-  sbsfuelf="$SecureDir/2_Images_SBSFU/STM32CubeIDE/CM4/Debug/SB.elf"
-  if [ -e "$priorbinadd" ]; then
-    baseadd=`cat $priorbinadd`
-    extramergebin=$priorbin"@"$baseadd";"
-  fi
-else
-  sbsfuelf="$SecureDir/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/SBSFU.elf"
-  extramergebin=""
-fi
-mapping="$SecureDir/Linker_Common/STM32CubeIDE/mapping_fwimg.ld" 
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-# test if window executable usable
-prepareimage=$basedir"/win/prepareimage/prepareimage.exe"
-uname | grep -i -e windows -e mingw > /dev/null 2>&1
-
-if [ $? -eq 0 ] && [   -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable"
-  export PATH=$basedir"\win\prepareimage";$PATH > /dev/null 2>&1
-  cmd=""
-  prepareimage="prepareimage.exe"
-else
-  # line for python
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd="python"
-fi
-
-echo "$cmd $prepareimage" >> $1/output.txt
-# Make sure we have a Binary sub-folder in UserApp folder
-if [ ! -e $userAppBinary ]; then
-mkdir $userAppBinary
-fi
-
-command=$cmd" "$prepareimage" enc -k "$oemkey" -i "$iv" "$bin" "$sfu
-$command > "$projectdir"/output.txt
-ret=$?
-if [ $ret -eq 0 ]; then
-  command=$cmd" "$prepareimage" sha256 "$bin" "$sign
-  $command >> $projectdir"/output.txt"
-  ret=$?
-  if [ $ret -eq 0 ]; then 
-    command=$cmd" "$prepareimage" pack -m "$magic" -k "$ecckey" -r 28 -v "$version" -i "$iv" -f "$sfu" -t "$sign" "$sfb" -o 512"
-    $command >> $projectdir"/output.txt"
-    ret=$?
-    if [ $ret -eq 0 ]; then
-      command=$cmd" "$prepareimage" header -m "$magic" -k  "$ecckey" -r 28 -v "$version"  -i "$iv" -f "$sfu" -t "$sign" -o 512 "$headerbin
-      $command >> $projectdir"/output.txt"
-      ret=$?
-      if [ $ret -eq 0 ]; then
-        command=$cmd" "$prepareimage" extract -d SLOT_Active_"$fwid"_header "$mapping
-        header=`$command`
-        ret=$?
-        echo "header $header" >> $projectdir"/output.txt"
-        if [ $ret -eq 0 ]; then
-          command=$cmd" "$prepareimage" mergev2 -v 0 -e 1 -b "$extramergebin$headerbin"@"$header" -f "$sbsfuelf";"$elf" "$bigbinary
-          echo "merge: $command" >> $projectdir"/output.txt"
-          $command >> $projectdir"/output.txt"
-          ret=$?
-          #Partial image generation if reference userapp exists
-          if [ $ret -eq 0 ] && [ -e "$ref_userapp" ]; then
-            echo "Generating the partial image .sfb"
-            echo "Generating the partial image .sfb" >> $projectdir"/output.txt"
-            command=$cmd" "$prepareimage" diff -1 "$ref_userapp" -2 "$bin" "$partialbin" -a 16 --poffset "$partialoffset
-            $command >> $projectdir"/output.txt"
-            ret=$?
-            if [ $ret -eq 0 ]; then
-              command=$cmd" "$prepareimage" enc -k "$oemkey" -i "$iv" "$partialbin" "$partialsfu
-              $command >> $projectdir"/output.txt"
-              ret=$?
-              if [ $ret -eq 0 ]; then
-                command=$cmd" "$prepareimage" sha256 "$partialbin" "$partialsign
-                $command >> $projectdir"/output.txt"
-                ret=$?
-                if [ $ret -eq 0 ]; then
-                  command=$cmd" "$prepareimage" pack -m "$magic" -k "$ecckey" -r 28 -v "$version" -i "$iv" -f "$sfu" -t "$sign" -o 512 --pfw "$partialsfu" --ptag "$partialsign" --poffset  "$partialoffset" "$partialsfb
-                  $command >> $projectdir"/output.txt"
-                  ret=$?
-                fi
-              fi
-            fi
-          fi
-        fi
-        if [ $ret -eq 0 ] && [ $# = 6 ]; then
-          echo "Generating the global elf file SBSFU and userApp"
-          echo "Generating the global elf file SBSFU and userApp" >> $projectdir"/output.txt"
-          uname | grep -i -e windows -e mingw > /dev/null 2>&1
-          if [ $? -eq 0 ]; then
-            # Set to the default installation path of the Cube Programmer tool
-            # If you installed it in another location, please update PATH.
-            PATH="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin":$PATH > /dev/null 2>&1
-            programmertool="STM32_Programmer_CLI.exe"
-          else
-            which STM32_Programmer_CLI > /dev/null
-            if [ $? = 0 ]; then
-              programmertool="STM32_Programmer_CLI"
-            else
-              echo "fix access path to STM32_Programmer_CLI"
-            fi
-          fi
-          command=$programmertool" -ms "$elf" "$headerbin" "$sbsfuelf
-          $command >> $projectdir"/output.txt"
-          ret=$?
-        fi
-      fi
-    fi
-  fi
-fi
-
-if [ $ret -eq 0 ]; then
-  rm $sign
-  rm $sfu
-  rm $headerbin
-  if [ -e "$ref_userapp" ]; then
-    rm $partialbin
-    rm $partialsfu
-    rm $partialsign
-    rm $partialoffset
-  fi  
-  exit 0
-else 
-  echo "$command : failed" >> $projectdir"/output.txt"
-  if [ -e  "$elf" ]; then
-    rm  $elf
-  fi
-  if [ -e "$elfbackup" ]; then 
-    rm  $elfbackup
-  fi
-  echo $command : failed
-  read -n 1 -s
-  exit 1
-fi
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
deleted file mode 100644
index 22098ef8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-** LinkerScript
-*/
-
-/* Entry Point */
-ENTRY(SE_CallGate)
-
-/* Generate a link error if heap and stack don't fit into RAM */
-_Min_Heap_Size = 0x200;      /* required amount of heap  */
-_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
-
-INCLUDE mapping_fwimg.ld
-INCLUDE mapping_sbsfu.ld
-
-/* Define output sections */
-SECTIONS
-{
-  .SE_CallGate_Code : { KEEP(*(.SE_CallGate_Code)) } > SE_CallGate_ROM_region
-
-  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
-  .text :
-  {
-    . = ALIGN(8);
-    *(.text)           /* .text sections (code) */
-    *(.text*)          /* .text* sections (code) */
-    *(.glue_7)         /* glue arm to thumb code */
-    *(.glue_7t)        /* glue thumb to arm code */
-    *(.eh_frame)
-
-    KEEP (*(.init))
-    KEEP (*(.fini))
-
-    . = ALIGN(8);
-    _etext = .;        /* define a global symbols at end of code */
-  } >SE_Code_NoKey_ROM_region
-
-  /* Constant data goes into FLASH */
-  .rodata :
-  {
-    . = ALIGN(8);
-    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
-    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .ARM.extab   : 
-  { 
-  . = ALIGN(8);
-  *(.ARM.extab* .gnu.linkonce.armextab.*)
-  . = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .ARM : {
-	. = ALIGN(8);
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-	. = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .preinit_array     :
-  {
-	. = ALIGN(8);
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array*))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-	. = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-  
-  .init_array :
-  {
-	. = ALIGN(8);
-    PROVIDE_HIDDEN (__init_array_start = .);
-    KEEP (*(SORT(.init_array.*)))
-    KEEP (*(.init_array*))
-    PROVIDE_HIDDEN (__init_array_end = .);
-	. = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .fini_array :
-  {
-	. = ALIGN(8);
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(SORT(.fini_array.*)))
-    KEEP (*(.fini_array*))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-	. = ALIGN(8);
-  } >SE_Code_NoKey_ROM_region
-
-  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
-  
-  /* used by the startup to initialize data */
-  _sidata = LOADADDR(.data);
-
-  /* Initialized data sections goes into RAM, load LMA copy after code */
-  .data : 
-  {
-    . = ALIGN(8);
-    _sdata = .;        /* create a global symbol at data start */
-    *(.data)           /* .data sections */
-    *(.data*)          /* .data* sections */
-
-    . = ALIGN(8);
-    _edata = .;        /* define a global symbol at data end */
-  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
-
-  
-  /* Uninitialized data section */
-  . = ALIGN(8);
-  .bss :
-  {
-    /* This is used by the startup in order to initialize the .bss section */
-    _sbss = .;         /* define a global symbol at bss start */
-    __bss_start__ = _sbss;
-    *(.bss)
-    *(.bss*)
-    *(COMMON)
-
-    . = ALIGN(8);
-    _ebss = .;         /* define a global symbol at bss end */
-    __bss_end__ = _ebss;
-  } >SE_RAM_region
-
-  BOOTINFO_DATA : 
-  {
-    . = ALIGN(8);
-    _sBOOTINFO_DATA = .;        /* create a global symbol at BOOTINFO_DATA start */
-    *(BOOTINFO_DATA)          /* BOOTINFO_DATA* sections */
-    *(BOOTINFO_DATA*)
-    . = ALIGN(8);
-    _eBOOTINFO_DATA = .;        /* define a global symbol at BOOTINFO_DATA end */
-  
-  } >SE_RAM_region AT> SE_Code_NoKey_ROM_region
-
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
-  ._user_heap_stack :
-  {
-    . = ALIGN(8);
-    PROVIDE ( end = . );
-    PROVIDE ( _end = . );
-    . = . + _Min_Heap_Size;
-    . = . + _Min_Stack_Size;
-    . = ALIGN(8);
-  } >SE_RAM_region
-   
-  /* Remove information from the standard libraries */
-  /DISCARD/ :
-  {
-    libc.a ( * )
-    libm.a ( * )
-    libgcc.a ( * )
-  }
-
-  .ARM.attributes 0 : { *(.ARM.attributes) }
-}
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/prebuild.sh b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/prebuild.sh
deleted file mode 100644
index 07bd7215..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/STM32CubeIDE/prebuild.sh
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/bin/bash - 
-#prebuild script 
-echo prebuild.sh : started > $1/output.txt
-asmfile=$1/se_key.s
-# comment this line to force python
-# python is used if  executable not found
-current_directory=`pwd`
-cd $1/../../../../../../Middlewares/ST/STM32_Secure_Engine/Utilities/KeysAndImages
-basedir=`pwd`
-cd $current_directory
-SBSFUBootLoader=$1/../..
-
-# test if window executable usable
-prepareimage=$basedir/win/prepareimage/prepareimage.exe
-uname  | grep -i -e windows -e mingw > /dev/null 2>&1
-
-if [ $? -eq 0 ] && [  -e "$prepareimage" ]; then
-  echo "prepareimage with windows executable" >> $1/output.txt
-  echo "prepareimage with windows executable"
-  cmd=""
-else
-  # line for python
-  echo "prepareimage with python script" >> $1/output.txt
-  echo "prepareimage with python script"
-  prepareimage=$basedir/prepareimage.py
-  cmd=python
-fi
-
-echo "$cmd $prepareimage" >> $1/output.txt
-crypto_h=$1/../Inc/se_crypto_config.h
-
-#clean
-if [ -e "$1/crypto.txt" ]; then
-  rm $1"/crypto.txt"
-fi
-
-if [ -e "$asmfile" ]; then
-  rm $asmfile
-fi
-
-if [ -e "$1"/postbuild.sh ]; then
-  rm $1"/postbuild.sh"
-fi
-
-#get crypto name
-command="$cmd $prepareimage conf "$crypto_h""
-echo $command
-crypto=`$command`
-echo $crypto > $1"/crypto.txt"
-echo "$crypto selected">> $1"/output.txt"
-echo $crypto selected
-ret=$?
-
-kms_config=$1"/kms_platf_objects_config.h"
-kms_tmp=$1"/kms_platf_objects_config.h.tmp"
-
-#Patch KMS embedded keys with Blob Keys
-if [ $ret -eq 0 ]; then
-  kms_blob_ecckey=$SBSFUBootLoader"/2_Images_KMS_Blob/Binary/ECCKEY.txt"
-  command=$cmd" "$prepareimage" inject -k "$kms_blob_ecckey" -f "$1"/../Inc/kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ "$kms_tmp
-  echo $command
-  $command
-  ret=$?
-  if [ $ret -eq 0 ]; then
-    kms_blob_oemkey=$SBSFUBootLoader"/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin"
-    command=$cmd" "$prepareimage" inject -k "$kms_blob_oemkey" -f "$kms_tmp" -p @AES_BLOB_KEY@ "$kms_config
-    echo $command
-    $command
-    ret=$?
-  fi
-fi    
-
-# Patch AES keys part
-if [ $ret -eq 0 ]; then
-  type="vide"
-  if [ $crypto = "SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" ]; then
-    type="GCM"
-  fi  
-  if [ $crypto = "SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" ]; then
-    type="CBC"
-  fi
-  if [ $crypto = "SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" ]; then
-# For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
-    type="CBC"
-  fi
-  if [ $type != "vide" ]; then
-    oemkey="$1/../Binary/OEM_KEY_COMPANY1_key_AES_$type.bin"
-    command="cat "$kms_config
-    $command > $kms_tmp
-    ret=$?
-    if [ $? -eq 0 ]; then
-      command=$cmd" "$prepareimage" inject -k "$oemkey" -f "$kms_tmp" -p @AES_SBSFU_KEY_1@ "$kms_config
-      echo $command
-      $command
-      ret=$?
-    fi
-
-    oemkey="$1/../Binary/OEM_KEY_COMPANY2_key_AES_$type.bin"
-    if [ -e "$oemkey" ]; then
-      command="cat "$kms_config
-      $command > $kms_tmp
-      ret=$?
-      if [ $? -eq 0 ]; then
-        command=$cmd" "$prepareimage" inject -k "$oemkey" -f "$kms_tmp" -p @AES_SBSFU_KEY_2@ "$kms_config
-        echo $command
-        $command
-        ret=$?
-      fi
-    fi
-
-    oemkey="$1/../Binary/OEM_KEY_COMPANY3_key_AES_$type.bin"
-    if [ -e "$oemkey" ]; then
-      command="cat "$kms_config
-      $command > $kms_tmp
-      ret=$?
-      if [ $? -eq 0 ]; then
-        command=$cmd" "$prepareimage" inject -k "$oemkey" -f "$kms_tmp" -p @AES_SBSFU_KEY_3@ "$kms_config
-        echo $command
-        $command
-        ret=$?
-      fi
-    fi
-  fi
-fi
-
-# Patch ECC keys part
-if [ $ret -eq 0 ]; then
-  type="vide"
-  if [ $crypto = "SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" ]; then
-    type="ECC"
-  fi  
-  if [ $crypto = "SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" ]; then
-    type="ECC"
-  fi
-  if [ $crypto = "SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" ]; then
-# For KMS dummy ECC keys are needed
-    type="ECC"
-  fi
-  if [ $type != "vide" ]; then
-    ecckey="$1/../Binary/ECCKEY1.txt"
-    command="cat "$kms_config
-    $command > $kms_tmp
-    ret=$?
-    if [ $? -eq 0 ]; then
-      command=$cmd" "$prepareimage" inject -k "$ecckey" -f "$kms_tmp" -p @ECDSA_SBSFU_KEY_1@ "$kms_config
-      echo $command
-      $command
-      ret=$?
-    fi
-
-    ecckey="$1/../Binary/ECCKEY2.txt"
-    if [ -e "$ecckey" ]; then
-      command="cat "$kms_config
-      $command > $kms_tmp
-      ret=$?
-      if [ $? -eq 0 ]; then
-        command=$cmd" "$prepareimage" inject -k "$ecckey" -f "$kms_tmp" -p @ECDSA_SBSFU_KEY_2@ "$kms_config
-        echo $command
-        $command
-        ret=$?
-      fi
-    fi
-
-    ecckey="$1/../Binary/ECCKEY3.txt"
-    if [ -e "$ecckey" ]; then
-      command="cat "$kms_config
-      $command > $kms_tmp
-      ret=$?
-      if [ $? -eq 0 ]; then
-        command=$cmd" "$prepareimage" inject -k "$ecckey" -f "$kms_tmp" -p @ECDSA_SBSFU_KEY_3@ "$kms_config
-        echo $command
-        $command
-        ret=$?
-      fi
-    fi
-  fi
-fi
-
-rm $kms_tmp
-
-if [ $ret -eq 0 ]; then
-#no error recopy post build script
-    uname  | grep -i -e windows -e mingw > /dev/null 2>&1
-    if [ $? -eq 0 ]; then
-        echo "recopy postbuild.sh script with "$crypto".sh script"
-        command="cat "$1"/"$crypto".sh"
-        $command > "$1"/"postbuild.sh"
-        ret=$?
-    else
-        echo "create symbolic link postbuild.sh to "$crypto".sh"
-        command="ln -s ./"$crypto".sh "$1"/postbuild.sh"
-        $command
-        ret=$?
-    fi
-fi
-
-if [ $ret != 0 ]; then
-#an error
-echo $command : failed >> $1/output.txt 
-echo $command : failed
-read -n 1 -s
-exit 1
-fi
-exit 0
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
deleted file mode 100644
index f641765f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    ca_low_level.c
-  * @author  MCD Application Team
-  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef CA_LOW_LEVEL_C
-#define CA_LOW_LEVEL_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "CryptoApi/ca.h"
-
-/* Private defines -----------------------------------------------------------*/
-/* Private typedef -----------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-
-
-/* Exported functions implementation -----------------------------------------*/
-
-#if defined(CA_HAL_CRYPTOLIB_SUPP)
-
-#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
- || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
- || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
- || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
-     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
-
-/**
-  * @brief CRYP MSP Initialization
-  * This function configures the hardware resources
-  * @param hcryp: CRYP handle pointer
-  * @retval None
-  */
-void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
-{
-  if (hcryp->Instance == CA_AES_INSTANCE)
-  {
-    /* Release AES/CRYP from reset state */
-    __HAL_RCC_AES_RELEASE_RESET();
-    /* Peripheral clock enable */
-    __HAL_RCC_AES_CLK_ENABLE();
-  }
-}
-
-/**
-  * @brief CRYP MSP De-Initialization
-  * This function freeze the hardware resources
-  * @param hcryp: CRYP handle pointer
-  * @retval None
-  */
-void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
-{
-  if (hcryp->Instance == CA_AES_INSTANCE)
-  {
-    /* Peripheral clock disable */
-    __HAL_RCC_AES_CLK_DISABLE();
-    /* Force AES/CRYP into reset state */
-    __HAL_RCC_AES_FORCE_RESET();
-  }
-}
-#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
-       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
-
-
-#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
-/**
-  * @brief      PKA MSP Initialization
-  *             This function configures the hardware resources used in this example
-  * @param[in] hpka: PKA handle pointer
-  * @retval None
-  */
-void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
-{
-  if (hpka->Instance == CA_PKA_INSTANCE)
-  {
-    /* Release PKA from reset state */
-    __HAL_RCC_PKA_RELEASE_RESET();
-    /* Peripheral clock enable */
-    __HAL_RCC_PKA_CLK_ENABLE();
-  }
-}
-
-/**
-  * @brief      PKA MSP De-Initialization
-  *             This function freeze the hardware resources used in this example
-  * @param[in] hpka: PKA handle pointer
-  * @retval None
-  */
-void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
-{
-  if (hpka->Instance == CA_PKA_INSTANCE)
-  {
-    /* Peripheral clock disable */
-    __HAL_RCC_PKA_CLK_DISABLE();
-    /* Force PKA into reset state */
-    __HAL_RCC_PKA_FORCE_RESET();
-  }
-}
-#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
-
-#endif /* CA_HAL_CRYPTOLIB_SUPP */
-
-
-#if defined(CA_ST_CRYPTOLIB_SUPP)
-/**
-  * @brief      CRC initialization
-  *             This function release reset and clock CRC IP peripheral
-  * @retval None
-  */
-void CA_LL_CRC_Init(void)
-{
-  /* Force CRC into reset state */
-  __HAL_RCC_CRC_FORCE_RESET();
-  /* Release CRC from reset state */
-  __HAL_RCC_CRC_RELEASE_RESET();
-  /* Peripheral clock enable */
-  __HAL_RCC_CRC_CLK_ENABLE();
-}
-
-#endif /* CA_ST_CRYPTOLIB_SUPP */
-
-#endif /* CA_LOW_LEVEL_C */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/se_low_level.c
deleted file mode 100644
index 911fc3a2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/Src/se_low_level.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_low_level.c
-  * @author  MCD Application Team
-  * @brief   Secure Engine Interface module.
-  *          This file provides set of firmware functions to manage SE low level
-  *          interface functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define SE_LOW_LEVEL_C
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_low_level.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#endif /* __CC_ARM */
-#include "se_exception.h"
-#include "string.h"
-
-/** @addtogroup SE Secure Engine
-  * @{
-  */
-/** @defgroup  SE_HARDWARE SE Hardware Interface
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Private_Variables Private Variables
-  * @{
-  */
-static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
-
-static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Private_Functions Private Functions
-  * @{
-  */
-
-static uint32_t SE_LL_GetPage(uint32_t Address);
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
-  * @{
-  */
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
-  * @{
-  */
-
-/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
-  * @{
-  */
-
-/**
-  * @brief  Set CRC configuration and call HAL CRC initialization function.
-  * @param  None.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
-  */
-SE_ErrorStatus SE_LL_CRC_Config(void)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  CrcHandle.Instance = CRC;
-  /* The input data are not inverted */
-  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
-
-  /* The output data are not inverted */
-  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
-
-  /* The Default polynomial is used */
-  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
-  /* The default init value is used */
-  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
-  /* The input data are 32-bit long words */
-  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
-  /* CRC Init*/
-  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Wrapper to HAL CRC initialization function.
-  * @param  None
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_CRC_Init(void)
-{
-  /* CRC Peripheral clock enable */
-  __HAL_RCC_CRC_CLK_ENABLE();
-
-  return SE_LL_CRC_Config();
-}
-
-/**
-  * @brief  Wrapper to HAL CRC de-initialization function.
-  * @param  None
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_CRC_DeInit(void)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-
-  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
-  {
-    /* Initialization OK */
-    e_ret_status = SE_SUCCESS;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Wrapper to HAL CRC Calculate function.
-  * @param  pBuffer: pointer to data buffer.
-  * @param  uBufferLength: buffer length in 32-bits word.
-  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
-  */
-uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
-{
-  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
-}
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
-  * @{
-  */
-
-/**
-  * @brief  This function does an erase of nb pages in user flash area
-  * @param  pStart: pointer to  user flash area
-  * @param  Length: number of bytes.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
-{
-  uint32_t page_error = 0U;
-  uint32_t start = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef p_erase_init;
-  SE_ErrorStatus e_ret_status = SE_SUCCESS;
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-    /* Fill EraseInit structure*/
-    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
-    p_erase_init.Page          = SE_LL_GetPage(start);
-    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
-    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
-    {
-      e_ret_status = SE_ERROR;
-    }
-
-    /* Lock the Flash to disable the flash control register access (recommended
-    to protect the FLASH memory against possible unwanted operation) *********/
-    (void)HAL_FLASH_Lock();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  Write in Flash  protected area
-  * @param  pDestination pointer to destination area in Flash
-  * @param  pSource pointer to input buffer
-  * @param  Length number of bytes to be written
-  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
-  */
-
-SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  SE_ErrorStatus ret = SE_SUCCESS;
-  uint32_t i;
-  uint32_t verified = 0U;
-  uint32_t destination = (uint32_t)pDestination;
-  uint32_t source = (uint32_t)pSource;
-
-  if (Length == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  /* Area should be inside 1 of the firmware image headers */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      verified = 1U;
-    }
-  }
-  if (verified == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  /* Unlock the Flash to enable the flash control register access *************/
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-    for (i = 0U; i < Length; i += 8U)
-    {
-      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
-      {
-        ret = SE_ERROR;
-        break;
-      }
-    }
-
-    /* Lock the Flash to disable the flash control register access (recommended
-    to protect the FLASH memory against possible unwanted operation) */
-    (void)HAL_FLASH_Lock();
-  }
-  else
-  {
-    ret = SE_ERROR;
-  }
-  return ret;
-}
-
-/**
-  * @brief  Read in Flash protected area
-  * @param  pDestination: Start address for target location
-  * @param  pSource: pointer on buffer with data to read
-  * @param  Length: Length in bytes of data buffer
-  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
-{
-  uint32_t source = (uint32_t)pSource;
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  uint32_t i;
-  uint32_t verified = 0U;
-
-
-  /* Area should be inside 1 of the firmware image headers
-     or inside 1 of the download areas */
-  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
-  {
-    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
-        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
-    {
-      verified = 1U;
-    }
-  }
-
-  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
-        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
-    {
-      verified = 1U;
-    }
-  }
-
-  if (verified == 0U)
-  {
-    return SE_ERROR;
-  }
-
-  SE_DoubleECC_Error_Counter = 0U;
-  (void)memcpy(pDestination, pSource, Length);
-  if (SE_DoubleECC_Error_Counter == 0U)
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  SE_DoubleECC_Error_Counter = 0U;
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
-  * @{
-  */
-
-/**
-  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
-  * @param pxSE_Metadata: Firmware metadata.
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(pxSE_Metadata);
-  return SE_SUCCESS;
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @brief Check if an array is inside the RAM of the product
-  * @param Addr : address  of array
-  * @param Length : length of array in byte
-  */
-SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
-      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_ROM_START)))
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is in sbsfu ram.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
-      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
-  {
-    e_ret_status = SE_SUCCESS;
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se ram.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
-                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
-      || ((0xFFFFFFFFUL - addr_start) < Length))
-  {
-    e_ret_status = SE_SUCCESS;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se rom.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
-{
-  SE_ErrorStatus e_ret_status;
-  uint32_t addr_start = (uint32_t)pBuff;
-  uint32_t addr_end = addr_start + Length - 1U;
-
-  /* Check if length is positive with no overflow */
-  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
-                         || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
-      )))
-      || ((0xFFFFFFFFUL - addr_start) < Length))
-  {
-    e_ret_status = SE_SUCCESS;
-
-    /* Could be an attack ==> Reset */
-    NVIC_SystemReset();
-  }
-  else
-  {
-    e_ret_status = SE_ERROR;
-  }
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
-  * @{
-  */
-
-/**
-  * @brief function to disable all IRQ, previously enabled ones are stored in parameter
-  * @param pIrqState: IRQ state buffer
-  * @param IrqStateNb: Number of IRQ state that can be stored
-  * @retval SE_ErrorStatus SE_SUCCESS when complete successfully, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
-  {
-    pIrqState[0] = NVIC->ICER[0];     /* Save currently enabled IRQ */
-    NVIC->ICER[0] = pIrqState[0];     /* Disable All IRQ */
-    if (NVIC->ICER[0] == 0UL)         /* Verify effectiveness of the operation */
-    {
-      e_ret_status = SE_SUCCESS;
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief function checking if a buffer is PARTLY in se rom.
-  * @param pBuff: address of buffer
-  * @param Length: length of buffer in bytes
-  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
-  */
-SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
-{
-  SE_ErrorStatus e_ret_status = SE_ERROR;
-  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
-  {
-    NVIC->ISER[0] = pIrqState[0];         /* Disable All enabled IRQ */
-    if (NVIC->ICER[0] == pIrqState[0])    /* Verify effectiveness of the operation */
-    {
-      e_ret_status = SE_SUCCESS;
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup SE_HARDWARE_Private_Functions
-  * @{
-  */
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: Address of the FLASH Memory
-  * @retval The page of a given address
-  */
-static uint32_t SE_LL_GetPage(uint32_t Address)
-{
-  uint32_t page;
-
-  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
-  {
-    /* Bank 1 */
-    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
-  }
-  else
-  {
-    /* Bank 2 */
-    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
-  }
-  return page;
-}
-
-/**
-  * @brief  Gets the bank of a given address
-  * @param  Addr: Address of the FLASH Memory
-  * @retval The bank of a given address
-  */
-
-
-/**
-  * @brief  Get Link Register value (LR)
-  * @param  None.
-  * @retval LR Register value
-  */
-__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
-{
-  register uint32_t result;
-
-#if defined ( __ICCARM__ ) || ( __GNUC__ )
-  __ASM volatile("MOV %0, LR" : "=r"(result));
-#elif defined ( __CC_ARM )
-  __ASM volatile("MOV result, __return_address()");
-#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
-
-  return result;
-}
-
-/*
-   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
-   not to use extra registers (on top of scratch registers), because it would change the stack pointer
-   position. Then compiler optimizations are customized to ensure that.
-*/
-#if defined(__ICCARM__)
-#pragma optimize=none
-#elif defined(__CC_ARM)
-#pragma O0
-#elif defined(__ARMCC_VERSION)
-__attribute__((optnone))
-#elif defined(__GNUC__)
-__attribute__((optimize("O1")))
-#endif /* __ICCARM__ */
-
-/**
-  * @brief  NMI Handler present for handling Double ECC NMI interrupt
-  * @param  None.
-  * @retval None.
-  */
-void NMI_Handler(void)
-{
-  uint32_t *p_sp;
-  uint32_t lr;
-  uint16_t opcode_msb;
-
-  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
-  {
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
-
-    /* Memorize error to ignore the read value */
-    SE_DoubleECC_Error_Counter++;
-
-    lr = __get_LR();
-
-    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
-    if (((lr) & (0xFU)) == 0xDU)
-    {
-      /* interrupted code was using Process Stack Pointer */
-      p_sp = (uint32_t *)__get_PSP();
-    }
-    else
-    {
-      /* interrupted code was using Main Stack Pointer */
-      p_sp = (uint32_t *)__get_MSP();
-    }
-
-    /* Test caller mode T bit from CPSR in stack */
-    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
-    {
-      /* Thumb  mode.
-         Test PC in stack.
-         If bits [15:11] of the halfword being decoded take any of the following values,
-         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
-         Otherwise, the halfword is a 16-bit instruction.
-      */
-      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
-      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
-      {
-        /* execute next instruction PC +4  */
-        *(p_sp + 6U) += 4U;
-      }
-      else
-      {
-        /* execute next instruction PC +2  */
-        *(p_sp + 6U) += 2U;
-      }
-    }
-    else
-    {
-      /* ARM mode execute next instruction PC +4 */
-      *(p_sp + 6U) += 4U;
-    }
-  }
-  else
-  {
-    /* This exception occurs for another reason than flash double ECC errors */
-    SE_NMI_ExceptionHandler();
-  }
-}
-
-/**
-  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
-  * @param  None.
-  * @retvat void
-  */
-void HardFault_Handler(void)
-{
-  SE_NMI_ExceptionHandler();
-}
-
-/**
-  * @brief  Cleanup SE CORE
-  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
-  *
-  */
-void  SE_LL_CORE_Cleanup(void)
-{
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/readme.txt
deleted file mode 100644
index 5bcc7828..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/readme.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
-  @page 2_Images_SECoreBin / Secure Engine Core binary generation.
-
-  @verbatim
-  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
-  * @file    readme.txt
-  * @brief   Secure Engine Core binary generation.
-  *          SE Core binary exports SE CallGate function entry point for
-  *          SFU Application.
-  ******************************************************************************
-  *
-  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                               www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Application Description
-
-This application is used to generate Secure Engine Core binary file to be linked
-with Secure Boot & Secure Firmware Update application (SBSFU).
-SE Core binary exports a single entry point to SE CallGate function and a startup
-method for data initialization. It is based on the Secure Engine Middleware.
-
-Generated SE Core Binary embeds Key Management Services accessible through this same
-single entry point using APIs defined by iKMS interface.
-
-It has to be compiled before SBSFU project.
-
-Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default cryptographic
-scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are provided and can be
-selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
-- SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
-- SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
-- SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
-
-This example supports multiple images feature configured with 2 active images for execution from internal flash and 1
-download area also located in internal flash. Each image has its own keys for signature verification and firwmare encryption.
-
-For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
-available from the STMicroelectronics microcontroller website www.st.com.
-
-@par Keywords
-
-Security, KMS, SBSFU
-
-@par Directory contents
-
-   - 2_Images_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
-   - 2_Images_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
-   - 2_Images_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
-   - 2_Images_SECoreBin/Src/se_low_level.c                      Low level interface
-   - 2_Images_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
-   - 2_Images_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
-   - 2_Images_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
-   - 2_Images_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
-   - 2_Images_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
-   - 2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
-                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
-   - 2_Images_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
-                                                                Exported to KMS user to ease embedded object usage
-   - 2_Images_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
-   - 2_Images_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
-   - 2_Images_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
-   - 2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
-   - 2_Images_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
-   - 2_Images_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
-   - 2_Images_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
-   - 2_Images_SECoreBin/Binary/ECCKEY2.txt                      Private ECCDSA key for signature verification of 2nd active image
-   - 2_Images_SECoreBin/Binary/ECCKEY3.txt                      Private ECCDSA key for signature verification of a possible 3rd active image
-   - 2_Images_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin Public key for AES CBC encryption of 2nd active image
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin Public key for AES GCM encryption of 2nd active image
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY3_key_AES_CBC.bin Public key for AES CBC encryption of a possible 3rd active image
-   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY3_key_AES_GCM.bin Public key for AES GCM encryption of a possible 3rd active image
-
-@par Hardware and Software environment
-
-  - This example runs on STM32WL55xx devices
-  - This example has been tested with NUCLEO-WL55JC RevC board and can be
-    easily tailored to any other supported device and development board.
-  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
-    is a feature provided by STM32Cube programmer available on www.st.com.
-  - Microsoft Windows has a limitation whereby paths to files and directories cannot
-    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
-    shell scripts) to fail reading from or writing to such files.
-    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
-    up a local drive out of an existing directory on the hard drive, such as:
-    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
-
-   
-@par IDE prebuild script
-
-In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
-This preliminary processing is in charge of:
- - determining the requested cryptographic scheme
- - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of SBSFU & Blob importation keys into the KMS embedded objects pattern file)
- - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
-A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic key).
-The IDE does not track this update so you need to force the rebuild of the project manually.
-
-@par How to use it ?
-
-In order to generate Secure Engine Core binary file, you must do the following :
- - Open your preferred toolchain
- - Rebuild the project
-
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp
deleted file mode 100644
index dcf92b03..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp
+++ /dev/null
@@ -1,1212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-          <state>CORE_CM0PLUS</state>
-          <state>KMS_ENABLED</state>
-          <state>DISABLE_IMAGE_STATE_HANDLING</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
-          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
-          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
-          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
-          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
-          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Cryptographic\Fw_Crypto\STM32L0\Inc</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>..\..\UserApp.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\PostBuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 1 1"</postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\com.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\common.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\fw_update_app.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\se_user_code.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\test_protections.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\ymodem.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\flash_if.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\kms_object_update_app.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\tkms_app.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\tkms_app_derive_key.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\tkms_app_encrypt_decrypt.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\tkms_app_sign_verify.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\mpu.c</name>
-      </file>
-    </group>
-    <group>
-      <name>SFU_Services</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\sfu_app_new_image.c</name>
-      </file>
-    </group>
-    <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\svc_handler.s</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
-        <file>
-          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-        </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
-      </file>
-    </group>
-    <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Middlewares</name>
-    <group>
-      <name>STM32_Secure_Engine</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\2_Images_SBSFU\EWARM\se_interface_appli.o</name>
-      </file>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s
deleted file mode 100644
index a6cf0145..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s
+++ /dev/null
@@ -1,316 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm0plus.s
-;* Author             : MCD Application Team
-;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M0+ processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
-        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
-        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
-        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
-        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
-        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
-        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
-        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
-        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
-
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-
-        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
-        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
-        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
-        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
-        DCD     RNG_IRQHandler                      ; RNG Interrupt
-        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
-        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
-        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
-        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
-        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                   ; USART1 Interrupt
-        DCD     USART2_IRQHandler                   ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
-        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK TZIC_ILA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TZIC_ILA_IRQHandler
-        B TZIC_ILA_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK RTC_LSECSS_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_LSECSS_IRQHandler
-        B RTC_LSECSS_IRQHandler
-
-        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_FLASH_C1SEV_IRQHandler
-        B RCC_FLASH_C1SEV_IRQHandler
-
-        PUBWEAK EXTI1_0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_0_IRQHandler
-        B EXTI1_0_IRQHandler
-
-        PUBWEAK EXTI3_2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_2_IRQHandler
-        B EXTI3_2_IRQHandler
-
-        PUBWEAK EXTI15_4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_4_IRQHandler
-        B EXTI15_4_IRQHandler
-
-        PUBWEAK ADC_COMP_DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_COMP_DAC_IRQHandler
-        B ADC_COMP_DAC_IRQHandler
-
-        PUBWEAK DMA1_Channel1_2_3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_2_3_IRQHandler
-        B DMA1_Channel1_2_3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_5_6_7_IRQHandler
-        B DMA1_Channel4_5_6_7_IRQHandler
-
-        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_DMAMUX1_OVR_IRQHandler
-        B DMA2_DMAMUX1_OVR_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK TIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_IRQHandler
-        B TIM1_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C2_RX_C2_TX_IRQHandler
-        B IPCC_C2_RX_C2_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK AES_PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_PKA_IRQHandler
-        B AES_PKA_IRQHandler
-
-        PUBWEAK LCD_802_1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LCD_802_1_IRQHandler
-        B LCD_802_1_IRQHandler
-
-        PUBWEAK I2C1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_IRQHandler
-        B I2C1_IRQHandler
-
-        PUBWEAK I2C2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_IRQHandler
-        B I2C2_IRQHandler
-
-        PUBWEAK I2C3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_IRQHandler
-        B I2C3_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf
deleted file mode 100644
index 69526e1c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ /dev/null
@@ -1,48 +0,0 @@
-/*###ICF### Set of symbols used in UserApp project ****/
-
-define memory mem with size = 4G;
-
-/******************************************************************************/
-/*       Include of SBSFU symbols file                                        */
-/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
-/*   specify the the directory to search for include files                    */
-/******************************************************************************/
-include "mapping_sbsfu.icf";
-include "mapping_fwimg.icf";
-
-/*-Memory Regions-*/
-define symbol __ICFEDIT_region_M4_start__       = __ICFEDIT_SLOT_Active_2_start__ + 512;
-define symbol __ICFEDIT_region_M4_end__         = __ICFEDIT_SLOT_Active_2_end__;
-define symbol __ICFEDIT_region_ROM_start__      = __ICFEDIT_SLOT_Active_1_start__ + 512;
-define symbol __ICFEDIT_region_ROM_end__        = __ICFEDIT_SLOT_Active_1_end__ ;
-define symbol __ICFEDIT_region_RAM_start__      = __ICFEDIT_SB_region_RAM_start__;
-define symbol __ICFEDIT_region_RAM_end__        = __ICFEDIT_SB_region_RAM_end__;
-
-/*-Sizes-*/
-define symbol __ICFEDIT_size_cstack__ = 0x800;
-define symbol __ICFEDIT_size_heap__ = 0x200;
-
-define region M4_region       = mem:[from __ICFEDIT_region_M4_start__  to __ICFEDIT_region_M4_end__];
-define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];
-define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];
-
-/* to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes) */
-define root section aes_block_padding with alignment=16
-{
-udata8 "Force Alignment";
-pad_to 16;
-};
-
-
-define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
-define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
-
-initialize by copy { readwrite };
-do not initialize  { section .noinit };
-
-place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
-
-place in M4_region    { readonly section M4_UserApp_Bin };
-place in ROM_region   { readonly, last section aes_block_padding };
-place in RAM_region   { readwrite, block CSTACK, block HEAP };
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h
deleted file mode 100644
index dc11577b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_user_code.h
-  * @author  MCD Application Team
-  * @brief   Secure Engine User code example module.
-  *          This file demonstrates how to call user defined services running
-  *          in Secure Engine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef SE_USER_CODE_H
-#define SE_USER_CODE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup SE_USER_CODE Secure Engine User Code Example
-  * @{
-  */
-
-/* Includes ------------------------------------------------------------------*/
-
-/** @addtogroup  SE_USER_CODE_Exported_Functions
-  * @{
-  */
-
-void SE_USER_CODE_RunMenu(void);
-void SE_USER_CODE_DisableIrq(void);
-void SE_USER_CODE_EnableIrq(void);
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SE_USER_CODE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 6b8db4f7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/* COM usage define */
-#define USE_BSP_COM_FEATURE                 0U
-
-/* COM log define */
-#define USE_COM_LOG                         0U
-
-/* IRQ priorities */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h
deleted file mode 100644
index e6a35163..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app.h
-  * @author  MCD Application Team
-  * @brief   This file contains definitions for tkms application examples.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef KMS_APP_H
-#define KMS_APP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "app_sfu.h"
-
-/* Exported macros -----------------------------------------------------------*/
-#if  defined(SFU_IWDG_PROTECT_ENABLE)
-/* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register */
-#define INVOKE_SCHEDULE_NEEDS()            \
-  do {                                     \
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);  \
-  } while(0);
-#else
-#define INVOKE_SCHEDULE_NEEDS()            \
-  do {                                     \
-    ;                                      \
-  } while(0);
-#endif /* SFU_IWDG_PROTECT_ENABLE */
-
-
-
-/* Exported functions ------------------------------------------------------- */
-void tkms_app_menu(void);
-void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length);
-
-CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage);
-CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage);
-CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage);
-CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pMessage);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* KMS_APP_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx
deleted file mode 100644
index 220c9e6c..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx
+++ /dev/null
@@ -1,781 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
-
-  <SchemaVersion>1.0</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Extensions>
-    <cExt>*.c</cExt>
-    <aExt>*.s*; *.src; *.a*</aExt>
-    <oExt>*.obj; *.o</oExt>
-    <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
-    <pExt>*.plm</pExt>
-    <CppX>*.cpp</CppX>
-    <nMigrate>0</nMigrate>
-  </Extensions>
-
-  <DaveTm>
-    <dwLowDateTime>0</dwLowDateTime>
-    <dwHighDateTime>0</dwHighDateTime>
-  </DaveTm>
-
-  <Target>
-    <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</TargetName>
-    <ToolsetNumber>0x4</ToolsetNumber>
-    <ToolsetName>ARM-ADS</ToolsetName>
-    <TargetOption>
-      <CLKADS>12000000</CLKADS>
-      <OPTTT>
-        <gFlags>1</gFlags>
-        <BeepAtEnd>1</BeepAtEnd>
-        <RunSim>0</RunSim>
-        <RunTarget>1</RunTarget>
-        <RunAbUc>0</RunAbUc>
-      </OPTTT>
-      <OPTHX>
-        <HexSelection>1</HexSelection>
-        <FlashByte>65535</FlashByte>
-        <HexRangeLowAddress>0</HexRangeLowAddress>
-        <HexRangeHighAddress>0</HexRangeHighAddress>
-        <HexOffset>0</HexOffset>
-      </OPTHX>
-      <OPTLEX>
-        <PageWidth>79</PageWidth>
-        <PageLength>66</PageLength>
-        <TabStop>8</TabStop>
-        <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
-      </OPTLEX>
-      <ListingPage>
-        <CreateCListing>1</CreateCListing>
-        <CreateAListing>1</CreateAListing>
-        <CreateLListing>1</CreateLListing>
-        <CreateIListing>0</CreateIListing>
-        <AsmCond>1</AsmCond>
-        <AsmSymb>1</AsmSymb>
-        <AsmXref>0</AsmXref>
-        <CCond>1</CCond>
-        <CCode>0</CCode>
-        <CListInc>0</CListInc>
-        <CSymb>0</CSymb>
-        <LinkerCodeListing>0</LinkerCodeListing>
-      </ListingPage>
-      <OPTXL>
-        <LMap>1</LMap>
-        <LComments>1</LComments>
-        <LGenerateSymbols>1</LGenerateSymbols>
-        <LLibSym>1</LLibSym>
-        <LLines>1</LLines>
-        <LLocSym>1</LLocSym>
-        <LPubSym>1</LPubSym>
-        <LXref>0</LXref>
-        <LExpSel>0</LExpSel>
-      </OPTXL>
-      <OPTFL>
-        <tvExp>1</tvExp>
-        <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
-      </OPTFL>
-      <CpuCode>18</CpuCode>
-      <DebugOpt>
-        <uSim>0</uSim>
-        <uTrg>1</uTrg>
-        <sLdApp>0</sLdApp>
-        <sGomain>1</sGomain>
-        <sRbreak>1</sRbreak>
-        <sRwatch>1</sRwatch>
-        <sRmem>1</sRmem>
-        <sRfunc>1</sRfunc>
-        <sRbox>1</sRbox>
-        <tLdApp>1</tLdApp>
-        <tGomain>1</tGomain>
-        <tRbreak>1</tRbreak>
-        <tRwatch>1</tRwatch>
-        <tRmem>1</tRmem>
-        <tRfunc>0</tRfunc>
-        <tRbox>1</tRbox>
-        <tRtrace>1</tRtrace>
-        <sRSysVw>1</sRSysVw>
-        <tRSysVw>1</tRSysVw>
-        <sRunDeb>0</sRunDeb>
-        <sLrtime>0</sLrtime>
-        <bEvRecOn>1</bEvRecOn>
-        <bSchkAxf>0</bSchkAxf>
-        <bTchkAxf>0</bTchkAxf>
-        <nTsel>6</nTsel>
-        <sDll></sDll>
-        <sDllPa></sDllPa>
-        <sDlgDll></sDlgDll>
-        <sDlgPa></sDlgPa>
-        <sIfile></sIfile>
-        <tDll></tDll>
-        <tDllPa></tDllPa>
-        <tDlgDll></tDlgDll>
-        <tDlgPa></tDlgPa>
-        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
-      </DebugOpt>
-      <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=98,207,509,709,0)(1007=673,180,880,401,0)(1008=566,409,942,645,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name></Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
-        </SetRegEntry>
-      </TargetDriverDllRegistry>
-      <Breakpoint/>
-      <MemoryWindow1>
-        <Mm>
-          <WinNumber>1</WinNumber>
-          <SubType>2</SubType>
-          <ItemText>0x2000A400</ItemText>
-          <AccSizeX>0</AccSizeX>
-        </Mm>
-      </MemoryWindow1>
-      <Tracepoint>
-        <THDelay>0</THDelay>
-      </Tracepoint>
-      <DebugFlag>
-        <trace>0</trace>
-        <periodic>0</periodic>
-        <aLwin>1</aLwin>
-        <aCover>0</aCover>
-        <aSer1>0</aSer1>
-        <aSer2>0</aSer2>
-        <aPa>0</aPa>
-        <viewmode>1</viewmode>
-        <vrSel>0</vrSel>
-        <aSym>0</aSym>
-        <aTbox>0</aTbox>
-        <AscS1>0</AscS1>
-        <AscS2>0</AscS2>
-        <AscS3>0</AscS3>
-        <aSer3>0</aSer3>
-        <eProf>0</eProf>
-        <aLa>0</aLa>
-        <aPa1>0</aPa1>
-        <AscS4>0</AscS4>
-        <aSer4>0</aSer4>
-        <StkLoc>1</StkLoc>
-        <TrcWin>0</TrcWin>
-        <newCpu>0</newCpu>
-        <uProt>0</uProt>
-      </DebugFlag>
-      <LintExecutable></LintExecutable>
-      <LintConfigFile></LintConfigFile>
-      <bLintAuto>0</bLintAuto>
-      <bAutoGenD>0</bAutoGenD>
-      <LntExFlags>0</LntExFlags>
-      <pMisraName></pMisraName>
-      <pszMrule></pszMrule>
-      <pSingCmds></pSingCmds>
-      <pMultCmds></pMultCmds>
-      <pMisraNamep></pMisraNamep>
-      <pszMrulep></pszMrulep>
-      <pSingCmdsp></pSingCmdsp>
-      <pMultCmdsp></pMultCmdsp>
-    </TargetOption>
-  </Target>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>1</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>.\startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>.\svc_handler.s</PathWithFileName>
-      <FilenameWithoutPath>svc_handler.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/SFU_Services</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/sfu_app_new_image.c</PathWithFileName>
-      <FilenameWithoutPath>sfu_app_new_image.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/User</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>4</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/com.c</PathWithFileName>
-      <FilenameWithoutPath>com.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/common.c</PathWithFileName>
-      <FilenameWithoutPath>common.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>6</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/flash_if.c</PathWithFileName>
-      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>7</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/fw_update_app.c</PathWithFileName>
-      <FilenameWithoutPath>fw_update_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>8</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/kms_object_update_app.c</PathWithFileName>
-      <FilenameWithoutPath>kms_object_update_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>9</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/mpu.c</PathWithFileName>
-      <FilenameWithoutPath>mpu.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/se_user_code.c</PathWithFileName>
-      <FilenameWithoutPath>se_user_code.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>12</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>13</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/test_protections.c</PathWithFileName>
-      <FilenameWithoutPath>test_protections.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>14</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/tkms_app.c</PathWithFileName>
-      <FilenameWithoutPath>tkms_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>15</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/tkms_app_derive_key.c</PathWithFileName>
-      <FilenameWithoutPath>tkms_app_derive_key.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/tkms_app_encrypt_decrypt.c</PathWithFileName>
-      <FilenameWithoutPath>tkms_app_encrypt_decrypt.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>17</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/tkms_app_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>tkms_app_sign_verify.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>18</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/ymodem.c</PathWithFileName>
-      <FilenameWithoutPath>ymodem.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>19</FileNumber>
-      <FileType>5</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>20</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>21</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>22</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>23</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>24</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>25</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>26</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>27</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>33</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>34</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>35</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>36</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>37</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>38</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>39</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>40</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>41</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../Src/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>42</FileNumber>
-      <FileType>3</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</PathWithFileName>
-      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>::CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>1</RteFlg>
-  </Group>
-
-</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 26ae329f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,652 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM0P</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>UserApp_CM0Plus</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
-            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
-          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments> </TargetDllArguments>
-          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>1</hadIROM>
-            <hadIRAM>1</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>0</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>7</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,DISABLE_IMAGE_STATE_HANDLING</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../2_Images_SECoreBin/Inc;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Cryptographic/Fw_Crypto/STM32L0/Inc</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>.\UserApp_cm0plus.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>.\startup_stm32wl55xx_cm0plus.s</FilePath>
-            </File>
-            <File>
-              <FileName>svc_handler.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>.\svc_handler.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/SFU_Services</GroupName>
-          <Files>
-            <File>
-              <FileName>sfu_app_new_image.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/sfu_app_new_image.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>com.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/com.c</FilePath>
-            </File>
-            <File>
-              <FileName>common.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/common.c</FilePath>
-            </File>
-            <File>
-              <FileName>flash_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/flash_if.c</FilePath>
-            </File>
-            <File>
-              <FileName>fw_update_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/fw_update_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>kms_object_update_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/kms_object_update_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/main.c</FilePath>
-            </File>
-            <File>
-              <FileName>mpu.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/mpu.c</FilePath>
-            </File>
-            <File>
-              <FileName>se_user_code.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/se_user_code.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/stm32wlxx_it.c</FilePath>
-            </File>
-            <File>
-              <FileName>test_protections.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/test_protections.c</FilePath>
-            </File>
-            <File>
-              <FileName>tkms_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/tkms_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>tkms_app_derive_key.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/tkms_app_derive_key.c</FilePath>
-            </File>
-            <File>
-              <FileName>tkms_app_encrypt_decrypt.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/tkms_app_encrypt_decrypt.c</FilePath>
-            </File>
-            <File>
-              <FileName>tkms_app_sign_verify.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/tkms_app_sign_verify.c</FilePath>
-            </File>
-            <File>
-              <FileName>ymodem.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/ymodem.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_nucleo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gtzc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_iwdg.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
-          <Files>
-            <File>
-              <FileName>se_interface_appli.txt</FileName>
-              <FileType>3</FileType>
-              <FilePath>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct
deleted file mode 100644
index c3f43d9d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct
+++ /dev/null
@@ -1,29 +0,0 @@
-#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
-; *************************************************************
-; *** Scatter-Loading Description File generated by uVision ***
-; *************************************************************
-#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
-#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
-
-LR_ROM (SLOT_ACTIVE_1_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
-  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
-  *.o (RESET, +First)
-  }
-  ROM_region +0 {
-  *(InRoot$$Sections)
-  .ANY (+RO)
-  }
-; SBSFU RAM area is reused for UserApp_M0  
-  RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE {
-  .ANY (STACK)
-  .ANY (HEAP)
-  .ANY (+RW +ZI)
-  }
-}
-
-; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes)
-LR_ROM1(+0) ALIGN(16) {
-  ForAlignment +0 {
-    startup_stm32wl55xx_cm0plus.o (ALIGNTOAESBLOCK,+Last)
-  }
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject
deleted file mode 100644
index b3b00d80..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="UserApp_cm0plus" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;" prebuildStep="">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/2_Images_UserApp_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="DISABLE_IMAGE_STATE_HANDLING"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
-									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
-									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
-									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
-									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata.1159753008" name="Place data in their own sections (-fdata-sections)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata" useByScannerDiscovery="false" value="false" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1663313052" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp_cm0plus.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.401807756" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":se_interface_app.o"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
-									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath.741843002" name="Use C math library (-Wl,--start-group -lc -lm -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="2_Images_UserApp_CM0PLUS.null.394363235" name="2_Images_UserApp_CM0PLUS"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/2_Images_UserApp_CM0PLUS"/>
-		</configuration>
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/2_Images_UserApp_CM0PLUS"/>
-		</configuration>
-	</storageModule>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project
deleted file mode 100644
index 98f6d743..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>2_Images_UserApp_CM0PLUS</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Doc/readme.txt</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
-		</link>
-		<link>
-			<name>Application/User/com.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/com.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/common.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/common.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/flash_if.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/flash_if.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/fw_update_app.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/fw_update_app.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/kms_object_update_app.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/kms_object_update_app.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/main.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/main.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/mpu.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/mpu.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/se_user_code.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/se_user_code.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/sfu_app_new_image.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/sfu_app_new_image.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/stm32wlxx_it.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/stm32wlxx_it.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/test_protections.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/test_protections.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/tkms_app.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/tkms_app_derive_key.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_derive_key.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/tkms_app_encrypt_decrypt.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_encrypt_decrypt.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/tkms_app_sign_verify.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_sign_verify.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/ymodem.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/ymodem.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
-			<type>1</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Src/system_stm32wlxx.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
-		</link>
-		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o</locationURI>
-		</link>
-		<link>
-			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
-			<type>1</type>
-			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch
deleted file mode 100644
index 7c8d59ad..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
-<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\UserApp_cm0plus.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_UserApp_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="C:\git\wl_master\Firmware\Projects\NUCLEO-WL55JC\Applications\SBSFU_2_Images_DualCore\2_Images_UserApp_M0Plus\STM32CubeIDE\Debug\st-link_gdbserver_log.txt"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
-<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\UserApp_cm0plus.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_UserApp_CM0PLUS"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/2_Images_UserApp_CM0PLUS"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c
deleted file mode 100644
index fe37d3ee..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    flash_if.c
-  * @author  MCD Application Team
-  * @brief   FLASH Interface module.
-  *          This file provides set of firmware functions to manage Flash
-  *          Interface functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup USER_APP_COMMON Common
-  * @{
-  */
-/* Includes ------------------------------------------------------------------*/
-#include "flash_if.h"
-#include "string.h"
-#include <stdio.h>
-
-/* Uncomment the line below if you want some debug logs */
-#define FLASH_IF_DBG
-#ifdef FLASH_IF_DBG
-#define FLASH_IF_TRACE printf
-#else
-#define FLASH_IF_TRACE(...)
-#endif /* FLASH_IF_DBG */
-
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
-#define EXTERNAL_FLASH_ADDRESS    0x90000000U
-#define BLOC_64_KBYTES            0x10000U
-
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-
-
-/* Private function prototypes -----------------------------------------------*/
-static uint32_t GetPage(uint32_t uAddr);
-static HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void);
-
-/* Public functions : wrapper ---------------------------------------------------------*/
-
-/**
-  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
-  * @param  none
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_If_Init(void)
-{
-  HAL_StatusTypeDef e_ret_status = HAL_OK;
-
-  e_ret_status = FLASH_INT_Init();
-  if (e_ret_status == HAL_OK)
-  {
-    e_ret_status = FLASH_EXT_Init();
-  }
-  return e_ret_status;
-}
-/**
-  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pStart: flash address to be erased
-  * @param  uLength: number of bytes
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_If_Erase_Size(void *pStart, uint32_t uLength)
-{
-  /* Check Flash start address */
-  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
-  {
-    return FLASH_INT_If_Erase_Size(pStart, uLength);
-  }
-  else
-  {
-    return FLASH_EXT_If_Erase_Size(pStart, uLength);
-  }
-}
-
-/**
-  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pDestination: flash address to write
-  * @param  pSource: pointer on buffer with data to write
-  * @param  uLength: number of bytes
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  /* Check Flash destination address */
-  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
-  {
-    return FLASH_INT_If_Write(pDestination, pSource, uLength);
-  }
-  else
-  {
-    return FLASH_EXT_If_Write(pDestination, pSource, uLength);
-  }
-}
-
-/**
-  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
-  * @param  pDestination: pointer on buffer to store data
-  * @param  pSource: flash address to read
-  * @param  uLength: number of bytes
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  /* Check Flash source address */
-  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
-  {
-    return FLASH_INT_If_Read(pDestination, pSource, uLength);
-  }
-  else
-  {
-    return FLASH_EXT_If_Read(pDestination, pSource, uLength);
-  }
-}
-
-/* Public functions : internal flash --------------------------------------------------------- */
-/**
-  * @brief  This function initialize the internal flash interface if required
-  * @param  none
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_INT_Init(void)
-{
-  return HAL_OK;
-}
-
-/**
-  * @brief  This function does an erase of n (depends on Length) pages in user flash area
-  * @param  pStart: Start of user flash area
-  * @param  uLength: number of bytes.
-  * @retval HAL status.
-  */
-HAL_StatusTypeDef FLASH_INT_If_Erase_Size(void *pStart, uint32_t uLength)
-{
-  uint32_t page_error = 0U;
-  uint32_t uStart = (uint32_t)pStart;
-  FLASH_EraseInitTypeDef x_erase_init;
-  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
-  uint32_t first_page = 0U;
-  uint32_t nb_pages = 0U;
-  uint32_t chunk_nb_pages;
-
-  /* Clear error flags raised during previous operation */
-  e_ret_status = FLASH_INT_If_Clear_Error();
-
-  if (e_ret_status == HAL_OK)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() == HAL_OK)
-    {
-      first_page = GetPage(uStart);
-      /* Get the number of pages to erase from 1st page */
-      nb_pages = GetPage(uStart + uLength - 1U) - first_page + 1U;
-      x_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
-      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
-      do
-      {
-        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
-        x_erase_init.Page = first_page;
-        x_erase_init.NbPages = chunk_nb_pages;
-        first_page += chunk_nb_pages;
-        nb_pages -= chunk_nb_pages;
-        if (HAL_FLASHEx_Erase(&x_erase_init, &page_error) != HAL_OK)
-        {
-          HAL_FLASH_GetError();
-          e_ret_status = HAL_ERROR;
-        }
-        /* Refresh Watchdog */
-        WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-      } while (nb_pages > 0);
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      HAL_FLASH_Lock();
-
-    }
-    else
-    {
-      e_ret_status = HAL_ERROR;
-    }
-  }
-
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
-  * @note   After writing data buffer, the flash content is checked.
-  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
-  * @param  pSource: pointer on buffer with data to write
-  * @param  uLength: Length of data buffer in bytes. It has to be 8 bytes aligned.
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_INT_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
-  uint32_t i = 0U;
-  uint32_t pdata = (uint32_t)pSource;
-
-  /* Clear error flags raised during previous operation */
-  e_ret_status = FLASH_INT_If_Clear_Error();
-
-  if (e_ret_status == HAL_OK)
-  {
-    /* Unlock the Flash to enable the flash control register access *************/
-    if (HAL_FLASH_Unlock() != HAL_OK)
-    {
-      return HAL_ERROR;
-
-    }
-    else
-    {
-      /* DataLength must be a multiple of 64 bit */
-      for (i = 0U; i < uLength; i += 8U)
-      {
-        /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
-        be done by word */
-        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)pDestination,  *((uint64_t *)(pdata + i)))
-            == HAL_OK)
-        {
-          /* Check the written value */
-          if (*(uint64_t *)pDestination != *(uint64_t *)(pdata + i))
-          {
-            /* Flash content doesn't match SRAM content */
-            e_ret_status = HAL_ERROR;
-            break;
-          }
-          /* Increment FLASH Destination address */
-          pDestination = (void *)((uint32_t)pDestination + 8U);
-        }
-        else
-        {
-          /* Error occurred while writing data in Flash memory */
-          e_ret_status = HAL_ERROR;
-          break;
-        }
-      }
-      /* Lock the Flash to disable the flash control register access (recommended
-      to protect the FLASH memory against possible unwanted operation) *********/
-      HAL_FLASH_Lock();
-    }
-  }
-  return e_ret_status;
-}
-
-/**
-  * @brief  This function reads flash
-  * @param  pDestination: Start address for target location
-  * @param  pSource: flash address to read
-  * @param  uLength: number of bytes
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_INT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  memcpy(pDestination, pSource, uLength);
-  return HAL_OK;
-}
-
-/* Public functions : external flash ---------------------------------------------------------*/
-
-HAL_StatusTypeDef FLASH_EXT_Init(void)
-{
-  return HAL_OK;
-}
-
-/* No external flash available on this product
-   ==> return SFU_ERROR */
-
-HAL_StatusTypeDef FLASH_EXT_If_Erase_Size(void *pStart, uint32_t uLength)
-{
-  return HAL_ERROR;
-}
-
-HAL_StatusTypeDef FLASH_EXT_If_Write(void  *pDestination, const void *pSource, uint32_t uLength)
-{
-  return HAL_ERROR;
-}
-
-HAL_StatusTypeDef FLASH_EXT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
-{
-  return HAL_ERROR;
-}
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  Clear error flags raised during previous operation
-  * @param  None
-  * @retval HAL Status.
-  */
-HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void)
-{
-  HAL_StatusTypeDef ret = HAL_ERROR;
-
-  /* Unlock the Program memory */
-  if (HAL_FLASH_Unlock() == HAL_OK)
-  {
-
-    /* Clear all FLASH flags */
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-    /* Unlock the Program memory */
-    if (HAL_FLASH_Lock() == HAL_OK)
-    {
-      ret = HAL_OK;
-    }
-#ifdef FLASH_IF_DBG
-    else
-    {
-      FLASH_IF_TRACE("[FLASH_IF] Lock failure\r\n");
-    }
-#endif /* FLASH_IF_DBG */
-  }
-#ifdef FLASH_IF_DBG
-  else
-  {
-    FLASH_IF_TRACE("[FLASH_IF] Unlock failure\r\n");
-  }
-#endif /* FLASH_IF_DBG */
-  return ret;
-}
-
-/**
-  * @brief  Gets the page of a given address
-  * @param  Addr: Address of the FLASH Memory
-  * @retval The page of a given address
-  */
-uint32_t GetPage(uint32_t Addr)
-{
-  uint32_t page = 0U;
-
-  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
-
-  return page;
-}
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c
deleted file mode 100644
index a4be6b59..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c
+++ /dev/null
@@ -1,794 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    fw_update_app.c
-  * @author  MCD Application Team
-  * @brief   Firmware Update module.
-  *          This file provides set of firmware functions to manage Firmware
-  *          Update functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-
-#include "se_def.h"
-#include "com.h"
-#include "common.h"
-#include "flash_if.h"
-#include "stm32wlxx_hal.h"
-#include "stm32wlxx_nucleo.h"
-#include "fw_update_app.h"
-#include "se_interface_application.h"
-#include "sfu_fwimg_regions.h"
-#include "sfu_app_new_image.h"
-#include "string.h"
-#include "mpu.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-#include "ymodem.h"
-
-/* Private defines -----------------------------------------------------------*/
-
-
-/* Global variables ----------------------------------------------------------*/
-
-#if !defined(EXTERNAL_LOADER)
-static uint32_t m_uFileSizeYmodem = 0U;  /*!< Ymodem File size*/
-static uint32_t m_uNbrBlocksYmodem = 0U; /*!< Ymodem Number of blocks*/
-static uint32_t m_uPacketsReceived = 0U; /*!< Ymodem packets received*/
-
-#ifdef MINICOM_YMODEM
-/*
- * With Minicom Ymodem, the data offset is not aligned because PACKET_DATA_INDEX is 7
- * So we cannot write in FLASH with pData as source, we need a copy in an aligned buffer
- */
-/* With Minicom YMODEM each packet carries 128 bytes of data */
-static uint8_t alignedBuffer[PACKET_SIZE] __attribute__((aligned(4)));
-#endif /* MINICOM_YMODEM */
-#endif /* !EXTERNAL_LOADER */
-
-/* Private function prototypes -----------------------------------------------*/
-
-#if !defined(EXTERNAL_LOADER)
-static HAL_StatusTypeDef FW_UPDATE_DownloadNewFirmware(SFU_FwImageFlashTypeDef *pFwImageDwlArea);
-#endif /* !EXTERNAL_LOADER */
-
-/* Functions Definition ------------------------------------------------------*/
-
-/**
-  * @brief  Run FW Update process.
-  * @param  None
-  * @retval HAL Status.
-  */
-#if defined(EXTERNAL_LOADER)
-void FW_UPDATE_Run(void)
-{
-  /* Print Firmware Update welcome message */
-  printf("\r\n================ New Fw Download =========================\r\n\n");
-
-  /* Standalone loader communication : execution requested */
-  (*(uint32_t *)LOADER_COM_REGION_RAM_START) = STANDALONE_LOADER_BYPASS_REQ;
-
-  /*  use virtual HAL API allowing the access to Privileged register */
-  SVC_NVIC_SystemReset();
-}
-
-#else
-void FW_UPDATE_Run(void)
-{
-  HAL_StatusTypeDef ret = HAL_ERROR;
-  uint8_t  fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
-  SFU_FwImageFlashTypeDef fw_image_dwl_area;
-
-  /* Print Firmware Update welcome message */
-  printf("\r\n================ New Fw Download =========================\r\n\n");
-
-  /* Get Info about the download area */
-  SFU_APP_GetDownloadAreaInfo(SLOT_DWL_1, &fw_image_dwl_area);
-
-  /* Download new firmware image*/
-  ret = FW_UPDATE_DownloadNewFirmware(&fw_image_dwl_area);
-
-  if (HAL_OK == ret)
-  {
-    /* Read header in dwl slot */
-    ret = FLASH_If_Read(fw_header_dwl_slot, (void *) fw_image_dwl_area.DownloadAddr, SE_FW_HEADER_TOT_LEN);
-
-    /* Ask for installation at next reset */
-    (void)SFU_APP_InstallAtNextReset((uint8_t *) fw_header_dwl_slot);
-
-    /* System Reboot*/
-    printf("  -- Image correctly downloaded - reboot\r\n\n");
-    HAL_Delay(1000U);
-    /*  use virtual HAL API allowing the access to Privileged register */
-    SVC_NVIC_SystemReset();
-  }
-
-  if (ret != HAL_OK)
-  {
-    printf("  -- !!Operation failed!! \r\n\n");
-  }
-}
-#endif /* EXTERNAL_LOADER */
-
-
-#if defined(EXTERNAL_LOADER)
-/**
-  * @brief  Run Multiple FW Update process.
-  * @param  None
-  * @retval None.
-  */
-void FW_UPDATE_MULTIPLE_RunMenu(void)
-{
-  printf("  Feature not supported ! \r\n");
-}
-
-#else
-/**
-  * @brief  Print Multiple FW Update menu.
-  * @param  None
-  * @retval HAL Status.
-  */
-static void FW_UPDATE_MULTIPLE_PrintMenu(void)
-{
-  /* Print Multiple Download menu */
-  printf("\r\n============= Multiple Download Menu ================\r\n\n");
-  printf("  Download firmware in DWL_SLOT #1 ---------------------- 1\r\n\n");
-  printf("  Start installation ------------------------------------ 4\r\n\n");
-  printf("  Previous Menu ----------------------------------------- x\r\n\n");
-  printf("  Selection :\r\n\n");
-}
-
-/**
-  * @brief  Run Multiple FW Update process.
-  * @param  None
-  * @retval None.
-  */
-void FW_UPDATE_MULTIPLE_RunMenu(void)
-{
-  SFU_FwImageFlashTypeDef fw_image_dwl_area;
-  uint8_t key = 0U;
-  uint32_t exit = 0U;
-  uint32_t i = 0U;
-  uint32_t several_dwl_area = 1U;
-  uint32_t slot_number = 0U;
-  static  uint8_t fw_to_install = 0U;
-  uint8_t  fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
-
-  /* Print Menu */
-  FW_UPDATE_MULTIPLE_PrintMenu();
-
-  /* Verify if at least 2 DWL areas exist */
-  for (i = 1U; i < SFU_NB_MAX_DWL_AREA; i++)
-  {
-    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
-    {
-      several_dwl_area++;
-    }
-  }
-
-  if (several_dwl_area == 1)
-  {
-    printf("  -- !!Only 1 download area configured - feature not available!! \r\n\n");
-    return;
-  }
-
-  while (exit == 0U)
-  {
-    key = 0U;
-    slot_number = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
-       reload register */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '1' :
-          slot_number = SLOT_DWL_1 + 0U;
-          break;
-        case '4' :
-          /*
-           * When IMAGE_STATE_HANDLING switch is not activated :
-           *  - requesting installation means writing the header in the SWAP slot then reset.
-           *  - else, reset is enough. Image state set as NEW in the header of dwl_slot will identify the dwl_slot
-           *    to install.
-           */
-          /* Get Info about the download area */
-          SFU_APP_GetDownloadAreaInfo(fw_to_install, &fw_image_dwl_area);
-
-          /* Read header in dwl slot */
-          FLASH_If_Read(fw_header_dwl_slot, (void *) fw_image_dwl_area.DownloadAddr, SE_FW_HEADER_TOT_LEN);
-
-          /* Ask for installation at next reset */
-          (void)SFU_APP_InstallAtNextReset((uint8_t *) fw_header_dwl_slot);
-
-          /* System Reboot*/
-          printf("  -- Installation requested - Reboot");
-          HAL_Delay(1000U);
-          /*  use virtual HAL API allowing the access to Privileged register */
-          SVC_NVIC_SystemReset();
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-
-        default:
-          printf("Invalid Number !\r");
-          break;
-      }
-
-      if (slot_number != 0U)
-      {
-        /* Get Info about the download area */
-        SFU_APP_GetDownloadAreaInfo(slot_number, &fw_image_dwl_area);
-
-        if ((fw_image_dwl_area.DownloadAddr != 0U) && (fw_image_dwl_area.MaxSizeInBytes != 0U))
-        {
-          /* Download new firmware image*/
-          if (FW_UPDATE_DownloadNewFirmware(&fw_image_dwl_area) == HAL_OK)
-          {
-            fw_to_install = slot_number;
-          }
-          else
-          {
-            printf("  -- !!Download failed!! \r\n\n");
-            HAL_Delay(1000U);
-          }
-        }
-        else
-        {
-          printf("  -- !!Download slot not configured!! \r\n\n");
-          HAL_Delay(1000U);
-        }
-      }
-
-      /* Print Menu */
-      FW_UPDATE_MULTIPLE_PrintMenu();
-    }
-  }
-}
-#endif /* EXTERNAL_LOADER */
-
-#if !defined(EXTERNAL_LOADER)
-/**
-  * @brief Download a new Firmware from the host.
-  * @retval HAL status
-  */
-static HAL_StatusTypeDef FW_UPDATE_DownloadNewFirmware(SFU_FwImageFlashTypeDef *pFwImageDwlArea)
-{
-  HAL_StatusTypeDef ret = HAL_ERROR;
-  COM_StatusTypeDef e_result;
-  uint32_t u_fw_size;
-  YMODEM_CallbacksTypeDef ymodemCb = {Ymodem_HeaderPktRxCpltCallback, Ymodem_DataPktRxCpltCallback};
-
-  printf("  -- Send Firmware \r\n\n");
-  /* Refresh Watchdog */
-  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-  /* Clear download area */
-  printf("  -- -- Erasing download area ...\r\n\n");
-  if ((ret = FLASH_If_Erase_Size((void *)(pFwImageDwlArea->DownloadAddr), pFwImageDwlArea->MaxSizeInBytes)) == HAL_OK)
-  {
-    /* Download binary */
-    printf("  -- -- File> Transfer> YMODEM> Send ");
-
-    /*Init of Ymodem*/
-    Ymodem_Init();
-
-    /*Receive through Ymodem*/
-    e_result = Ymodem_Receive(&u_fw_size, pFwImageDwlArea->DownloadAddr, &ymodemCb);
-    printf("\r\n\n");
-
-    if ((e_result == COM_OK))
-    {
-      printf("  -- -- Programming Completed Successfully!\r\n\n");
-      printf("  -- -- Bytes: %d\r\n\n", u_fw_size);
-      ret = HAL_OK;
-    }
-    else if (e_result == COM_ABORT)
-    {
-      printf("  -- -- !!Aborted by user!!\r\n\n");
-      ret = HAL_ERROR;
-    }
-    else
-    {
-      printf("  -- -- !!Error during file download!!\r\n\n");
-      ret = HAL_ERROR;
-    }
-  }
-  return ret;
-}
-#endif /* !(EXTERNAL_LOADER) */
-
-#if defined(EXTERNAL_LOADER)
-/**
-  * @brief  Run validation of a FW image menu.
-  * @param  None
-  * @retval None.
-  */
-void FW_VALIDATE_RunMenu(void)
-{
-  printf("  Feature not supported ! \r\n");
-}
-
-#else
-#if defined(ENABLE_IMAGE_STATE_HANDLING)
-/**
-  * @brief  Display the validation firmware menu choices on hyperterminal
-  * @param  None.
-  * @retval None.
-  */
-static void FW_VALIDATE_PrintMenu(void)
-{
-  printf("\r\n========== Validation of FW Image ============\r\n\n");
-  printf("  Validate all firmwares ------------------------- 0\r\n\n");
-  printf("  Validate firmware of SLOT_ACTIVE_1 ------------- 1\r\n\n");
-  printf("  Validate firmware of SLOT_ACTIVE_2 ------------- 2\r\n\n");
-  printf("  Validate firmware of SLOT_ACTIVE_3 ------------- 3\r\n\n");
-  printf("  Previous Menu ---------------------------------- x\r\n\n");
-  printf("  Selection :\r\n\n");
-}
-#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
-
-/**
-  * @brief  Run validation of a FW image menu.
-  * @param  None
-  * @retval None.
-  */
-void FW_VALIDATE_RunMenu(void)
-{
-#if defined(ENABLE_IMAGE_STATE_HANDLING)
-  uint8_t key = 0U;
-  uint32_t exit = 0U;
-  uint32_t slot_number = 0U;
-  SE_ErrorStatus se_retCode = SE_ERROR;
-  SE_StatusTypeDef se_Status = SE_KO;
-
-  /*Print Main Menu message*/
-  FW_VALIDATE_PrintMenu();
-
-  while (exit == 0U)
-  {
-    key = 0U;
-    slot_number = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
-       register */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '0' :
-          slot_number = 255;
-          break;
-        case '1' :
-          slot_number = SLOT_ACTIVE_1;
-          break;
-        case '2' :
-          slot_number = SLOT_ACTIVE_2;
-          break;
-        case '3' :
-          slot_number = SLOT_ACTIVE_3;
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-        default:
-          printf("Invalid Number !\r");
-          break;
-      }
-
-      if (slot_number != 0U)
-      {
-        if ((slot_number != 255U) && (SlotStartAdd[slot_number] == 0U))
-        {
-          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
-        }
-        else
-        {
-          se_retCode = SE_APP_ValidateFw(&se_Status, slot_number);
-          if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
-          {
-            printf("Firmware validated\r\n");
-          }
-          else
-          {
-            printf("Firmware validation failure\r\n");
-          }
-        }
-        /*Print Main Menu message*/
-        FW_VALIDATE_PrintMenu();
-      }
-    }
-  }
-#else
-  printf("  Feature not supported ! \r\n");
-#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
-}
-#endif /* EXTERNAL_LOADER */
-
-
-
-#if !defined(EXTERNAL_LOADER)
-/**
-  * @brief  Ymodem Header Packet Transfer completed callback.
-  * @param  uFileSize Dimension of the file that will be received (Bytes).
-  * @retval None
-  */
-HAL_StatusTypeDef Ymodem_HeaderPktRxCpltCallback(uint32_t uFileSize)
-{
-  /*Reset of the ymodem variables */
-  m_uFileSizeYmodem = 0U;
-  m_uPacketsReceived = 0U;
-  m_uNbrBlocksYmodem = 0U;
-
-  /*Filesize information is stored*/
-  m_uFileSizeYmodem = uFileSize;
-
-  /*Compute the number of blocks */
-#ifndef MINICOM_YMODEM
-  /* Teraterm sends 1kB YMODEM packets */
-  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (PACKET_1K_SIZE - 1U)) / PACKET_1K_SIZE;
-#else
-  /* Minicom sends 128 bytes YMODEM packets */
-  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (PACKET_SIZE - 1U)) / PACKET_SIZE;
-#endif /* MINICOM_YMODEM */
-
-  /* NOTE : delay inserted for Ymodem protocol*/
-  HAL_Delay(1000U);
-
-  return HAL_OK;
-}
-
-/**
-  * @brief  Ymodem Data Packet Transfer completed callback.
-  * @param  pData Pointer to the buffer.
-  * @param  uSize Packet dimension (Bytes).
-  * @retval None
-  */
-#ifndef MINICOM_YMODEM
-/* Teraterm YMODEM */
-HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
-{
-  /* Start address of downloaded area : initialized with first packet (header) */
-  static uint32_t m_uDwlImgStart = 0U;
-
-  /* End address of downloaded Image : initialized with first packet (header) and checked along download process */
-  static uint32_t m_uDwlImgEnd = 0U;
-
-  /* Current destination address for data packet : initialized with first packet (header), incremented at each
-     flash write */
-  static uint32_t m_uDwlImgCurrent = 0U;
-
-  HAL_StatusTypeDef e_ret_status = HAL_OK;
-  uint32_t uLength;
-  uint32_t uOldSize;
-#if !defined(SFU_NO_SWAP)
-  SE_FwRawHeaderTypeDef fw_header_dwl;
-#endif /* (SFU_NO_SWAP) */
-
-  m_uPacketsReceived++;
-
-  /*Increase the number of received packets*/
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem) /*Last Packet*/
-  {
-    /*Extracting actual payload from last packet*/
-    if (0 == (m_uFileSizeYmodem % PACKET_1K_SIZE))
-    {
-      /* The last packet must be fully considered */
-      uSize = PACKET_1K_SIZE;
-    }
-    else
-    {
-      /* The last packet is not full, drop the extra bytes */
-      uSize = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / PACKET_1K_SIZE) * PACKET_1K_SIZE);
-    }
-  }
-
-  /* First packet : Contains header information: PartialFwSize and PartialFwOffset information */
-  if (m_uPacketsReceived == 1)
-  {
-    /* Start of Download area */
-    m_uDwlImgStart = uFlashDestination;
-
-    /* Initialize Current destination address for data packet */
-    m_uDwlImgCurrent = uFlashDestination;
-
-    /* End of Image to be downloaded */
-#if defined(SFU_NO_SWAP)
-    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->FwSize + SFU_IMG_IMAGE_OFFSET;
-#else
-    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->PartialFwSize
-                   + (((SE_FwRawHeaderTypeDef *)pData)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))
-                   + SFU_IMG_IMAGE_OFFSET;
-#endif /* SFU_NO_SWAP */
-  }
-
-  /* This packet : contains end of FW header */
-  if ((m_uDwlImgCurrent < (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)) &&
-      ((m_uDwlImgCurrent + uSize) >= (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)))
-  {
-    /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE bytes length) */
-    uLength = SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE;
-    if (uLength == 0)
-    {
-      uLength = PACKET_1K_SIZE;
-    }
-    if (FLASH_If_Write((void *)m_uDwlImgCurrent, pData, uLength) == HAL_OK)
-    {
-#if defined(SFU_NO_SWAP)
-      m_uDwlImgCurrent += uLength;
-#else
-      /*
-       * Read header from dwl area : in some configuration header can be transmitted with 2 YMODEM packets
-       * ==> pData contains only the last part of the header and cannot be used to retrieve PartialFwOffset
-       */
-      e_ret_status = FLASH_If_Read((uint8_t *)&fw_header_dwl, (void *) m_uDwlImgStart, SE_FW_HEADER_TOT_LEN);
-
-      /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
-      m_uDwlImgCurrent += uLength + fw_header_dwl.PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
-#endif /* SFU_NO_SWAP */
-
-      /* Update remaining packet size to write */
-      uSize -= uLength;
-
-      /* Update pData pointer to received packet data */
-      pData += uLength;
-    }
-    else
-    {
-      e_ret_status = HAL_ERROR;
-    }
-  }
-
-  /* Skip data write if all has been already written as part of the header */
-  if (uSize != 0U)
-  {
-    /*Adjust dimension to unitary flash programming length */
-    if (uSize % FLASH_IF_MIN_WRITE_LEN != 0U)
-    {
-      uOldSize = uSize;
-      uSize += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
-      m_uDwlImgEnd += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
-      while (uOldSize < uSize)
-      {
-        pData[uOldSize] = 0xFF;
-        uOldSize++;
-      }
-    }
-
-    /* Write Data in Flash - size has to be 64-bit aligned */
-
-    /* Write in flash only if not beyond allowed area */
-    if (((m_uDwlImgCurrent + uSize) <= m_uDwlImgEnd) && (e_ret_status == HAL_OK))
-    {
-      if (FLASH_If_Write((void *)m_uDwlImgCurrent, pData, uSize) == HAL_OK)
-      {
-        e_ret_status = HAL_OK;
-
-        /* Move Current destination address for next packet */
-        m_uDwlImgCurrent += uSize;
-      }
-      else
-      {
-        e_ret_status = HAL_ERROR;
-      }
-    }
-    else
-    {
-      e_ret_status = HAL_ERROR;
-    }
-  }
-
-  /* Last packet : reset m_uPacketsReceived */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    m_uPacketsReceived = 0U;
-  }
-
-  /* Reset data counters in case of error */
-  if (e_ret_status == HAL_ERROR)
-  {
-
-    /*Reset of the ymodem variables */
-    m_uFileSizeYmodem = 0U;
-    m_uPacketsReceived = 0U;
-    m_uNbrBlocksYmodem = 0U;
-  }
-  return e_ret_status;
-}
-#else
-/* Minicom YMODEM */
-HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
-{
-  /* Start address of downloaded area : initialized with first packet (header) */
-  static uint32_t m_uDwlImgStart = 0U;
-
-  /* End address of downloaded Image : initialized with first packet (header) and checked along download process */
-  static uint32_t m_uDwlImgEnd = 0U;
-
-  /* Current destination address for data packet : initialized with first packet (header), incremented at each
-     flash write */
-  static uint32_t m_uDwlImgCurrent = 0U;
-
-  HAL_StatusTypeDef e_ret_status = HAL_OK;
-  uint32_t uLength;
-  uint32_t uOldSize;
-  SE_FwRawHeaderTypeDef fw_header_dwl;
-
-  m_uPacketsReceived++;
-
-  /*Increase the number of received packets*/
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem) /*Last Packet*/
-  {
-    /*Extracting actual payload from last packet*/
-    if (0 == (m_uFileSizeYmodem % PACKET_SIZE))
-    {
-      /* The last packet must be fully considered */
-      uSize = PACKET_SIZE;
-    }
-    else
-    {
-      /* The last packet is not full, drop the extra bytes */
-      uSize = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / PACKET_SIZE) * PACKET_SIZE);
-    }
-  }
-
-  /* First packet : Contains header information: PartialFwSize and PartialFwOffset information */
-  if (m_uPacketsReceived == 1)
-  {
-    /* Start of Download area */
-    m_uDwlImgStart = uFlashDestination;
-
-    /* Initialize Current destination address for data packet */
-    m_uDwlImgCurrent = uFlashDestination;
-
-    /* End of Image to be downloaded */
-#if defined(SFU_NO_SWAP)
-    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->FwSize + SFU_IMG_IMAGE_OFFSET;
-#else
-    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->PartialFwSize
-                   + (((SE_FwRawHeaderTypeDef *)pData)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))
-                   + SFU_IMG_IMAGE_OFFSET;
-#endif /* SFU_NO_SWAP */
-
-  }
-
-  /* This packet : contains end of FW header */
-  if ((m_uDwlImgCurrent < (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)) &&
-      ((m_uDwlImgCurrent + uSize) >= (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)))
-  {
-    /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE bytes length) */
-    uLength = SFU_IMG_IMAGE_OFFSET % PACKET_SIZE;
-    if (uLength == 0)
-    {
-      uLength = PACKET_SIZE;
-    }
-
-    memcpy(alignedBuffer, pData, uLength);
-
-    if (FLASH_If_Write((void *)m_uDwlImgCurrent, alignedBuffer, uLength) == HAL_OK)
-    {
-#if defined(SFU_NO_SWAP)
-      m_uDwlImgCurrent += uLength;
-#else
-      /*
-       * Read header from dwl area : in some configuration header can be transmitted with 2 YMODEM packets
-       * ==> pData contains only the last part of the header and cannot be used to retrieve PartialFwOffset
-       */
-      e_ret_status = FLASH_If_Read((uint8_t *)&fw_header_dwl, (void *) m_uDwlImgStart, SE_FW_HEADER_TOT_LEN);
-      /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
-      m_uDwlImgCurrent += uLength + fw_header_dwl.PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
-#endif /* SFU_NO_SWAP */
-
-      /* Update remaining packet size to write */
-      uSize -= uLength;
-
-      /* Update pData pointer to received packet data */
-      pData += uLength;
-    }
-    else
-    {
-      e_ret_status = HAL_ERROR;
-    }
-  }
-  /* Skip data write if all has been already written as part of the header */
-  if (uSize != 0U)
-  {
-    /*Adjust dimension to unitary flash programming length */
-    if (uSize % FLASH_IF_MIN_WRITE_LEN != 0U)
-    {
-      uOldSize = uSize;
-      uSize += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
-      m_uDwlImgEnd += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
-      while (uOldSize < uSize)
-      {
-        pData[uOldSize] = 0xFF;
-        uOldSize++;
-      }
-    }
-
-    /* Write Data in Flash - size has to be 64-bit aligned */
-
-
-    /* Write in flash only if not beyond allowed area */
-    if (((m_uDwlImgCurrent + uSize) <= m_uDwlImgEnd) && (e_ret_status == HAL_OK))
-    {
-      memcpy(alignedBuffer, pData, uSize);
-
-      if (FLASH_If_Write((void *)m_uDwlImgCurrent, alignedBuffer, uSize) == HAL_OK)
-      {
-        e_ret_status = HAL_OK;
-
-        /* Move Current destination address for next packet */
-        m_uDwlImgCurrent += uSize;
-      }
-      else
-      {
-        e_ret_status = HAL_ERROR;
-      }
-    }
-    else
-    {
-      e_ret_status = HAL_ERROR;
-    }
-  }
-
-  /* Last packet : reset m_uPacketsReceived */
-  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
-  {
-    m_uPacketsReceived = 0U;
-  }
-
-  /* Reset data counters in case of error */
-  if (e_ret_status == HAL_ERROR)
-  {
-
-    /*Reset of the ymodem variables */
-    m_uFileSizeYmodem = 0U;
-    m_uPacketsReceived = 0U;
-    m_uNbrBlocksYmodem = 0U;
-  }
-  return e_ret_status;
-}
-#endif /* MINICOM_YMODEM */
-#endif /* !(EXTERNAL_LOADER) */
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c
deleted file mode 100644
index e7ec9421..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mpu.c
-  * @author  MCD Application Team
-  * @brief   virtual HAL api for non privilieged :
-  *          implementing HAL service performing access to register being
-  *          mapped by mpu  on privilieged area
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "mpu.h"
-#include "se_def.h"
-#include "se_interface_application.h"
-#include "common.h"
-#include "flash_if.h"
-#include "se_callgate.h"
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-
-#define HAL_SVC_NVIC_SYSTEM_RESET            0
-#define HAL_SVC_MPU_DISABLE                  1
-
-static void HAL_SysCall(uint32_t syscall, ...);
-
-/**
-  * @brief This functions triggers a HAL system call (supervisor call): request privileged operation
-  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
-  * @param arguments arguments of the privileged operation
-  * @retval void
-  */
-#if defined (__ICCARM__) || defined(__GNUC__)
-static void HAL_SysCall(uint32_t syscall, ...)
-{
-#if defined ( __GNUC__ )
-  /*
-    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
-    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
-    */
-  __ASM volatile ("MOV r0, %0" : : "r"(syscall));
-#endif /* __GNUC__ */
-  /*
-    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
-    * example an SVC.
-    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
-    */
-  __ASM volatile ("SVC #1");  /* 1 is the hard-coded value to indicate HAL syscall */
-}
-#elif defined(__CC_ARM)
-/*
-  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
-  * caller is in same file. Defining the function as ASM avoids the issue.
-  */
-static void __ASM HAL_SysCall(uint32_t syscall, ...)
-{
-  /*
-   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
-   * example an SVC.
-   * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
-   */
-  SVC #1
-  BX LR
-}
-#endif /* (__ICCARM__) || defined(__GNUC__) */
-
-/**
-  * @brief  Request a system reset after switching in privileged mode.
-  * @param  None
-  * @retval None
-  */
-void SVC_NVIC_SystemReset(void)
-{
-  HAL_SysCall(HAL_SVC_NVIC_SYSTEM_RESET);
-}
-
-
-/**
-  * @brief  Request to disable the MPU after switching in privileged mode.
-  * @param  None
-  * @retval None
-  */
-void SVC_MPU_Disable(void)
-{
-  HAL_SysCall(HAL_SVC_MPU_DISABLE);
-}
-
-
-/**
-  * @brief This is the Supervisor calls handler.
-  * @param args SVC arguments
-  * @retval void
-  * @note Installed in startup_stm32xxxx.s
-  *
-  * This handler handles 2 requests:
-  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter (see @ref
-  * \li SE_FunctionIDTypeDef)
-  * \li HAL SVC: run a HAL privileged operation provided as a parameter
-  */
-void MPU_SVC_Handler(uint32_t *args)
-{
-  uint8_t code = ((char *)args[6])[-2];
-  switch (code)
-  {
-    case 0: /* SE SVC CALL */
-    {
-      SE_APP_SVC_Handler(args);
-      break;
-    }
-    case 1:  /* HAL SVC CALL */
-    {
-      HAL_APP_SVC_Handler(args);
-      break;
-    }
-    default:
-    {
-      break;
-    }
-  }
-}
-/**
-  * @brief This is the HAL Supervisor calls handler.
-  * @param args SVC arguments
-  * @retval void
-  *
-  * This handler handles 2 requests:
-  * \li NVIC system reset
-  * \li MPU disable request
-  */
-void HAL_APP_SVC_Handler(uint32_t *args)
-{
-  switch (args[0])
-  {
-    case HAL_SVC_NVIC_SYSTEM_RESET :  /* HAL NVIC system reset */
-    {
-      HAL_NVIC_SystemReset();
-      break;
-    }
-    case HAL_SVC_MPU_DISABLE :        /* HAL Disable MPU */
-    {
-      HAL_MPU_Disable();
-      break;
-    }
-    default:
-    {
-      HAL_NVIC_SystemReset();
-      break;
-    }
-  }
-}
-
-
-/**
-  * @brief This is a helper function to enter the unprivileged level for software execution
-  * @param void
-  * @retval void
-  */
-void MPU_EnterUnprivilegedMode(void)
-{
-  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
-  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
-  __set_CONTROL(__get_CONTROL() | 3); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
-  __ISB();
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c
deleted file mode 100644
index 3f59ffa3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    se_user_code.c
-  * @author  MCD Application Team
-  * @brief   Secure Engine User code example module.
-  *          This file demonstrates how to call user defined services running
-  *          in Secure Engine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "se_def.h"
-#include "com.h"
-#include "common.h"
-#include "stm32wlxx_hal.h"
-#include "stm32wlxx_nucleo.h"
-#include "se_user_code.h"
-#include "mpu.h"
-#include "se_interface_application.h"
-#include "sfu_fwimg_regions.h"
-#include <string.h> /* needed for memset */
-
-
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup  SE_USER_CODE Secure Engine User Code Example
-  * @brief Example of user defined code running in Secure Engine.
-  *        This code provides user defined services to the user application.
-  * @{
-  */
-
-/** @defgroup  SE_USER_CODE_Private_Variables Private Variables
-  * @{
-  */
-static uint32_t IrqState[1] = {0x00UL};
-/**
-  * @}
-  */
-
-/** @defgroup  SE_USER_CODE_Private_Functions Private Functions
-  * @{
-  */
-
-/**
-  * @brief  Display the SE_USER_CODE Menu choices on hyperterminal
-  * @param  None.
-  * @retval None.
-  */
-static void SE_USER_CODE_PrintMenu(void)
-{
-  printf("\r\n=== Call User Defined Code running in Secure Engine ===\r\n\n");
-  printf("  Get firmware information of SLOT_ACTIVE_1 ------------- 1\r\n\n");
-  printf("  Get firmware information of SLOT_ACTIVE_2 ------------- 2\r\n\n");
-  printf("  Save and Disable IRQ ---------------------------------- a\r\n\n");
-  printf("  Restore and Enable IRQ -------------------------------- b\r\n\n");
-  printf("  Previous Menu ----------------------------------------- x\r\n\n");
-  printf("  Selection :\r\n\n");
-}
-
-/**
-  * @brief  Get FW information.
-  * @param  SlotNumber slot identification
-  * @retval HAL Status.
-  */
-static void SE_USER_CODE_GetFwInfo(uint32_t SlotNumber)
-{
-  SE_ErrorStatus se_retCode = SE_ERROR;
-  SE_StatusTypeDef se_Status = SE_KO;
-  SE_APP_ActiveFwInfo_t sl_FwInfo;
-
-  memset(&sl_FwInfo, 0xFF, sizeof(SE_APP_ActiveFwInfo_t));
-
-
-  printf("If the Secure User Memory is enabled you should not be able to call a SE service and get stuck.\r\n\n");
-  printf("  -- Calling FwInfo service.\r\n\n");
-  printf("Press the RESET button to restart the device (or wait until IWDG expires if enabled).\r\n\n");
-
-  /* Get FW info */
-  se_retCode = SE_APP_GetActiveFwInfo(&se_Status, SlotNumber, &sl_FwInfo);
-
-  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
-  {
-    /* Print the result */
-    printf("Firmware Info:\r\n");
-    printf("\tActiveFwVersion: %d\r\n", sl_FwInfo.ActiveFwVersion);
-    printf("\tActiveFwSize: %d bytes\r\n", sl_FwInfo.ActiveFwSize);
-  }
-  else
-  {
-    /* Failure */
-    printf("  -- !!Operation failed!! \r\n\n");
-  }
-
-  /* This point should not be reached */
-  printf("  -- !! Secure User Memory protection is NOT ENABLED !!\r\n\n");
-}
-
-/**
-  * @brief  Disable the IRQ and print saved IRQ configuration
-  * @param  None.
-  * @retval None.
-  */
-void SE_USER_CODE_DisableIrq(void)
-{
-  SE_ErrorStatus se_retCode = SE_ERROR;
-  SE_StatusTypeDef se_Status = SE_KO;
-
-  se_retCode = SE_SYS_SaveDisableIrq(&se_Status, &IrqState[0], 1);
-
-  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
-  {
-    /* Print the result */
-    printf("IRQ saved: 0x%08X\r\n", IrqState[0]);
-    printf("IRQ disabled\r\n");
-  }
-  else
-  {
-    /* Failure */
-    printf("  -- !!Operation failed!! \r\n\n");
-  }
-}
-
-/**
-  * @brief  Restore saved IRQ configuration
-  * @param  None.
-  * @retval None.
-  */
-void SE_USER_CODE_EnableIrq(void)
-{
-  SE_ErrorStatus se_retCode = SE_ERROR;
-  SE_StatusTypeDef se_Status = SE_KO;
-
-  se_retCode = SE_SYS_RestoreEnableIrq(&se_Status, &IrqState[0], 1);
-
-  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
-  {
-    /* Print the result */
-    printf("IRQ restored: 0x%08X\r\n", IrqState[0]);
-    printf("IRQ enabled\r\n");
-  }
-  else
-  {
-    /* Failure */
-    printf("  -- !!Operation failed!! \r\n\n");
-  }
-}
-
-
-/**
-  * @}
-  */
-
-/** @addtogroup  SE_USER_CODE_Exported_Functions
-  * @{
-  */
-
-/**
-  * @brief  Run get firmware info menu.
-  * @param  None
-  * @retval HAL Status.
-  */
-void SE_USER_CODE_RunMenu(void)
-{
-  uint8_t key = 0U;
-  uint32_t exit = 0U;
-  uint32_t slot_number = 0U;
-
-  /*Print Main Menu message*/
-  SE_USER_CODE_PrintMenu();
-
-  while (exit == 0U)
-  {
-    key = 0U;
-    slot_number = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
-       register */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '1' :
-          slot_number = SLOT_ACTIVE_1;
-          if (SlotStartAdd[slot_number] == 0U)
-          {
-            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
-          }
-          else
-          {
-            SE_USER_CODE_GetFwInfo(slot_number);
-          }
-          break;
-        case '2' :
-          slot_number = SLOT_ACTIVE_2;
-          if (SlotStartAdd[slot_number] == 0U)
-          {
-            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
-          }
-          else
-          {
-            SE_USER_CODE_GetFwInfo(slot_number);
-          }
-          break;
-        case 'a':
-          SE_USER_CODE_DisableIrq();
-          break;
-        case 'b':
-          SE_USER_CODE_EnableIrq();
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-        default:
-          printf("Invalid Number !\r");
-          break;
-      }
-
-      /*Print Main Menu message*/
-      SE_USER_CODE_PrintMenu();
-    }
-  }
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c
deleted file mode 100644
index 82105637..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_it.c
-  * @author  MCD Application Team
-  * @brief   Main Interrupt Service Routines.
-  *          This file provides template for all exceptions handler and
-  *          peripherals interrupt service routine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "stm32wlxx_it.h"
-#include "test_protections.h"
-#include "mpu.h"
-
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup USER_APP_COMMON Common
-  * @{
-  */
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-RTC_HandleTypeDef RtcHandle;
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/******************************************************************************/
-/*            Cortex-M0+ Processor Exceptions Handlers                         */
-/******************************************************************************/
-
-/**
-  * @brief  This function handles NMI exception.
-  * @param  None
-  * @retval None
-  */
-void NMI_Handler(void)
-{
-  /* Go to infinite loop when NMI exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Hard Fault exception.
-  * @param  None
-  * @retval None
-  */
-void HardFault_Handler(void)
-{
-  /* Go to infinite loop when Memory Manage exception occurs */
-  while (1)
-  {
-  }
-}
-
-
-/* SVC call handler is implemented in svc_handler.s */
-
-
-/**
-  * @brief  This function handles PendSVC exception.
-  * @param  None
-  * @retval None
-  */
-void PendSV_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles SysTick Handler.
-  * @param  None
-  * @retval None
-  */
-void SysTick_Handler(void)
-{
-  HAL_IncTick();
-}
-
-/******************************************************************************/
-/*                 STM32WLxx Peripherals Interrupt Handlers             */
-/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
-/*  available peripheral interrupt handler's name please refer to the startup */
-/*  file (startup_stm32wlxx.s).                                         */
-/******************************************************************************/
-
-/**
-  * @brief  This function handles Flash operation error interrupt request.
-  * @param  None
-  * @retval None
-  */
-void FLASH_IRQHandler(void)
-{
-  HAL_FLASH_IRQHandler();
-}
-
-/**
-  * @brief  This function handles Tamper interrupt request.
-  * @param  None
-  * @retval None
-  */
-void RTC_LSECSS_IRQHandler(void)
-{
-  /* Handle only the tamper enabled by SBSFU */
-  uint32_t tmp = READ_REG(TAMP->MISR) & RTC_TAMPER_ID;
-
-  /* Immediately clear flags to avoid eternal resets */
-  WRITE_REG(TAMP->SCR, tmp);
-
-  /* SRAM2 is erased and RtcHandle is corrupted: no specific handling is possible. */
-  NVIC_SystemReset();
-}
-
-/**
-  * @brief  This function handles TZIC interrupt request.
-  * @param  None
-  * @retval None
-  */
-void TZIC_ILA_IRQHandler(void)
-{
-  HAL_GTZC_IRQHandler();
-}
-
-void BUTTON_IRQHANDLER(void)
-{
-  HAL_GPIO_EXTI_IRQHandler(BUTTON_EXTI_LINE);
-}
-
-void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
-{
-  if (GPIO_Pin == BUTTON_EXTI_LINE)
-  {
-    printf("\r\nUser IRQ Handler: User Button pressed\r\n");
-  }
-}
-
-/**
-  * @brief  This function handles PPP interrupt request.
-  * @param  None
-  * @retval None
-  */
-/*void PPP_IRQHandler(void)
-{
-}*/
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c
deleted file mode 100644
index 33d93025..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c
+++ /dev/null
@@ -1,818 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    test_protections.c
-  * @author  MCD Application Team
-  * @brief   Test Protections module.
-  *          This file provides set of firmware functions to manage Test Protections
-  *          functionalities.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-#define TEST_PROTECTIONS_C
-
-/* Includes ------------------------------------------------------------------*/
-#include <string.h>
-#include "test_protections.h"
-#include "se_def.h"
-#include "se_interface_application.h"
-#include "com.h"
-#include "common.h"
-#include "flash_if.h"
-#include "sfu_fwimg_regions.h" /* required for corruption tests (a real user application should NOT need this file) */
-#if defined(__ARMCC_VERSION)
-#include "mapping_sbsfu.h"
-#elif defined (__ICCARM__) || defined(__GNUC__)
-#include "mapping_export.h"
-#endif /* __ARMCC_VERSION */
-#include "mpu.h"
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup TEST_PROTECTIONS Test protections
-  * @{
-  */
-
-/** @defgroup  TEST_PROTECTIONS_Private_Defines Private Defines
-  * @{
-  */
-
-/**
-  * @brief  Isolated enclave Test.
-  */
-/*!< Address used to test SE CODE protection*/
-#define TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS     ((uint32_t) SE_CALLGATE_REGION_ROM_START)
-/*!< Address used to test SE VDATA protection*/
-#define TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS     ((uint32_t) SE_REGION_RAM_START)
-
-/**
-  * @brief  Secure Memory Test.
-  */
-/*!< Address used to test HDP */
-#define TEST_PROTECTIONS_HDP_FLASH_ADDRESS          ((uint32_t) SE_KEY_REGION_ROM_START)
-
-/**
-  * @brief  WRP Test.
-  */
-/*!< Address used to test WRP protection */
-#define TEST_PROTECTIONS_WRP_FLASH_ADDRESS            ((uint32_t) SE_IF_REGION_ROM_START)
-/*!< WRP Test Size */
-#define TEST_PROTECTIONS_WRP_FLASH_SIZE               ((uint32_t)0x800U)
-
-/**
-  * @brief  IWDG Test.
-  */
-/*!< IWDG Test delay in ms (it has to be greater than what used in SB)*/
-#define TEST_PROTECTIONS_IWDG_DELAY                   ((uint32_t)10000U)
-
-/**
-  * @brief  TAMPER Test.
-  */
-#define TEST_PROTECTIONS_TAMPER_DELAY                 ((uint32_t)10U)         /*!< TAMPER Test delay in s */
-
-/**
-  * @brief  CORRUPT_IMAGE Test.
-  */
-/*!< CORRUPT_IMAGE Test: address where data will be corrupted: address of active slot + offset */
-#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(A)  ((uint32_t)(SlotStartAdd[A] \
-                                                                     +SFU_IMG_IMAGE_OFFSET))
-/*!< CORRUPT_IMAGE Test: size of data to be corrupted */
-#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE     ((uint32_t)32U)
-
-/**
-  * @brief  GTZC Test.
-  */
-/*!< GTZC Test error code */
-#define TEST_GTZC_ERROR_CODE                          ((uint32_t)0xFFU)
-
-/** @defgroup  TEST_PROTECTIONS_Private_Variables Private Variables
-  * @{
-  */
-static uint8_t uRead_WRP[TEST_PROTECTIONS_WRP_FLASH_SIZE];
-static __IO uint32_t m_uTamperEvent = 0U;                /*!< Tamper Event */
-static __IO uint32_t m_uGtzcTzicEvent = 0U;              /*!< GTZC_TZIC Event */
-/**
-  * @}
-  */
-
-/** @defgroup  TEST_PROTECTIONS_Private_Functions Private Functions
-  * @{
-  */
-static void TEST_PROTECTIONS_RunSE_CODE(void);
-static void TEST_PROTECTIONS_RunSE_VDATA(void);
-static void TEST_PROTECTIONS_RunSecUserMem_CODE(void);
-static void TEST_PROTECTIONS_RunWRP(void);
-static void TEST_PROTECTIONS_RunTAMPER(void);
-static void TEST_PROTECTIONS_RunIWDG(void);
-static void TEST_PROTECTIONS_CORRUPT_RunMenu(void);
-static void TEST_PROTECTIONS_Run_GTZC(void);
-static void TEST_PROTECTIONS_GtzcPrintTestingSubMenu(void);
-static void TEST_PROTECTIONS_Run_KMS_DATA_STORAGE(void);
-static void TEST_PROTECTIONS_Run_SYNC_FLAG(void);
-static void TEST_PROTECTIONS_PrintTestingMenu(void);
-/**
-  * @}
-  */
-
-
-
-/** @defgroup  TEST_PROTECTIONS_Exported_Functions Exported Functions
-  * @{
-  */
-
-/** @defgroup  TEST_PROTECTIONS_Control_Functions Control Functions
-  * @{
-  */
-
-/**
-  * @brief  Display the TEST Main Menu choices on HyperTerminal
-  * @param  None.
-  * @retval None.
-  */
-void TEST_PROTECTIONS_RunMenu(void)
-{
-  uint8_t key = 0U;
-  uint8_t exit = 0U;
-
-  /* Print Main Menu message */
-  TEST_PROTECTIONS_PrintTestingMenu();
-
-  while (exit == 0U)
-  {
-    key = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
-       reload register*/
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '1' :
-          TEST_PROTECTIONS_CORRUPT_RunMenu();
-          break;
-        case '2' :
-          TEST_PROTECTIONS_RunSE_CODE();
-          break;
-        case '3' :
-          TEST_PROTECTIONS_RunSE_VDATA();
-          break;
-        case '4' :
-          TEST_PROTECTIONS_RunSecUserMem_CODE();
-          break;
-        case '5' :
-          TEST_PROTECTIONS_RunWRP();
-          break;
-        case '6' :
-          TEST_PROTECTIONS_RunIWDG();
-          break;
-        case '7' :
-          TEST_PROTECTIONS_RunTAMPER();
-          break;
-        case '8' :
-          TEST_PROTECTIONS_Run_GTZC();
-          break;
-        case '9' :
-          TEST_PROTECTIONS_Run_KMS_DATA_STORAGE();
-          break;
-        case 'a' :
-          TEST_PROTECTIONS_Run_SYNC_FLAG();
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-
-        default:
-          printf("Invalid Number !\r");
-          break;
-      }
-      /*Print Main Menu message*/
-      TEST_PROTECTIONS_PrintTestingMenu();
-    }
-  }
-}
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/** @addtogroup  TEST_PROTECTIONS_Private_Functions
-  * @{
-  */
-
-
-/**
-  * @brief  Display the TEST Main Menu choices on HyperTerminal
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_PrintTestingMenu(void)
-{
-  printf("\r\n=================== Test Menu ============================\r\n\n");
-  printf("  Test : CORRUPT ACTIVE IMAGE --------------------------- 1\r\n\n");
-  printf("  Test SE isolation - CODE ------------------------------ 2\r\n\n");
-  printf("  Test SE isolation - VDATA ----------------------------- 3\r\n\n");
-  printf("  Test Protection: HDP ---------------------------------- 4\r\n\n");
-  printf("  Test Protection: WRP ---------------------------------- 5\r\n\n");
-  printf("  Test Protection: IWDG --------------------------------- 6\r\n\n");
-  printf("  Test Protection: TAMPER ------------------------------- 7\r\n\n");
-  printf("  Test Protection: GTZSC -------------------------------- 8\r\n\n");
-  printf("  Test KMS_DataStorage isolation ------------------------ 9\r\n\n");
-  printf("  Test synchronization flag protection ------------------ a\r\n\n");
-  printf("  Previous Menu ----------------------------------------- x\r\n\n");
-  printf("  Selection :\r\n\n");
-}
-
-/**
-  * @brief  TEST Run Secure User Memory
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunSecUserMem_CODE(void)
-{
-  uint32_t u_read_key = 0;
-  printf("\r\n====== Test Protection: HDP \r\n\n");
-  printf("  -- Reading address: 0x%x\r\n\n", TEST_PROTECTIONS_HDP_FLASH_ADDRESS);
-
-  /* Try to read a 32-bit data from the Flash protected by HDP */
-  u_read_key = *((uint32_t *)TEST_PROTECTIONS_HDP_FLASH_ADDRESS);
-
-  /* Should not get here if HDP is available and enabled  */
-  printf("  -- Address: 0x%x = 0x%x\r\n\n", TEST_PROTECTIONS_HDP_FLASH_ADDRESS, u_read_key);
-  if(u_read_key == 0U)
-  {
-    printf("  -- 0 has been read: HDP is enabled.\r\n\n");
-  }
-  else
-  {
-    printf("  -- !! HDP privileged CODE protection is NOT ENABLED !!\r\n\n");
-  }
-}
-
-/**
-  * @brief  TEST Run SE_CODE
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunSE_CODE(void)
-{
-
-  uint8_t code[4U];
-  m_uGtzcTzicEvent = 0;
-  printf("\r\n====== Test Protection: GTZC privileged - CODE ==========\r\n\n");
-  printf("  -- Dumping code\r\n\n");
-
-  /* Dumping the first 4 bytes */
-  code[0] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS);
-  code[1] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 1);
-  code[2] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 2);
-  code[3] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 3);
-
-  printf("  -- Dump : %x %x %x %x \r\n\n", code[0], code[1], code[2], code[3]);
-  if (m_uGtzcTzicEvent == 0U)
-  {
-   printf("  -- !! GTZC privileged CODE protection is NOT ENABLED !!\r\n\n");
-  }
-  else
-  {
-    printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
-    SVC_NVIC_SystemReset();
-  }
-}
-/**
-  * @brief  TEST Run SE_VDATA
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunSE_VDATA(void)
-{
-  uint32_t u_read_fw_vdata = 0;
-  m_uGtzcTzicEvent = 0;
-  printf("\r\n====== Test Protection: GTZC privileged - VDATA ==========\r\n\n");
-  printf("  -- Reading address: 0x%x\r\n\n", TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
-
-  /* Try to read a 32-bit data from the SRAM2 protected by the GTZC */
-  u_read_fw_vdata = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
-
-  /* Should not get here if MPU was available and enabled  */
-  printf("  -- Address: 0x%x = %d\r\n\n", TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS, u_read_fw_vdata);
-  if (m_uGtzcTzicEvent == 0U)
-  {
-    printf("  -- !! GTZC privileged VDATA protection is NOT ENABLED !!\r\n\n");
-  }
-  else
-  {
-    printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
-    SVC_NVIC_SystemReset();
-  }
-}
-
-
-/**
-  * @brief  TEST Run WRP
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunWRP(void)
-{
-  uint32_t i = 0U;
-  uint32_t address = 0U;
-
-  printf("\r\n====== Test Protection: WRP ===========================\r\n\n");
-
-  address = TEST_PROTECTIONS_WRP_FLASH_ADDRESS;
-
-  /* #1 - Read Page to be used for restoring*/
-  printf("  -- Reading 0x%x bytes at address: 0x%x (for backup)\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
-         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
-
-  for (i = 0U; i < TEST_PROTECTIONS_WRP_FLASH_SIZE; i++)
-  {
-    uRead_WRP[i] = *((uint8_t *)(address + i));
-  }
-
-  /* #2 - Erasing page */
-  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
-         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
-
-  /* Check that it is not allowed to erase this page */
-  if (FLASH_If_Erase_Size((void *)address, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
-  {
-    /* Error returned during programmation. */
-    /* Check that WRPERR flag is set */
-    if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
-    {
-      printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
-    }
-  }
-  else
-  {
-    /* #3 - Writing Data previously read*/
-    if (FLASH_If_Write((void *)address, uRead_WRP, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
-    {
-      /* Error returned during programmation. */
-      printf("-- !! HAL_FLASH_ERROR: FLASH Write error\r\n\n");
-
-      /* Check that WRPERR flag is set */
-      if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
-      {
-        printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
-      }
-    }
-    else
-    {
-      printf("  -- Written successfully at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
-
-      /*No Errors detected means WRP was not enabled*/
-      printf("  -- !! WRP protection is NOT ENABLED !!\r\n\n");
-    }
-  }
-}
-
-/**
-  * @brief  TEST Run CORRUPT_IMAGE
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunCORRUPT(uint32_t slot_number)
-{
-  HAL_StatusTypeDef ret = HAL_ERROR;
-  uint8_t pattern[TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE] = {0};
-
-  /* On this series, MPU should be disable to allow flash corruption.
-     Switching in privileged mode is requested to be able to disable MPU */
-  printf("  -- Disable MPU protection to be able to erase\r\n");
-  SVC_MPU_Disable();
-
-  /* Erase first sector of active slot */
-  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n", TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE,
-         TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number));
-  printf("  -- At next boot Signature Verification will fail. Download a new FW to restore FW image !!\r\n\n");
-
-  /* On this series, the memory corruption is performed by writing again the flash (but not header).
-     The header is preserved for anti-rollback check. */
-  ret = FLASH_If_Write((void *)(TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number)), (void *) &pattern,
-                       TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE);
-
-  /* This code may not be reached, due to the memory corruption performed.
-     In this case, the execution will probably trig hard fault exception (while (1)),
-     then watchdog reset. */
-  if (ret == HAL_OK)
-  {
-    SVC_NVIC_SystemReset();
-  }
-  else
-  {
-    printf("-- !! HAL_FLASH_ERROR_CORRUPT_IMAGE: erasing failure ...\r\n\n");
-  }
-}
-
-/**
-  * @brief  Display the corruption menu
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_CORRUPT_PrintMenu(void)
-{
-  printf("\r\n============  Test: CORRUPT ACTIVE IMAGE ============\r\n\n");
-  printf("  Corrupt image from SLOT_ACTIVE_1 ---------------------- 1\r\n\n");
-  printf("  Corrupt image from SLOT_ACTIVE_2 ---------------------- 2\r\n\n");
-  printf("  Selection :\r\n\n");
-}
-
-/**
-  * @brief  Run get firmware info menu.
-  * @param  None
-  * @retval HAL Status.
-  */
-static void TEST_PROTECTIONS_CORRUPT_RunMenu(void)
-{
-  uint8_t key = 0U;
-  uint32_t exit = 0U;
-  uint32_t slot_number = 0U;
-
-  /*Print Main Menu message*/
-  TEST_PROTECTIONS_CORRUPT_PrintMenu();
-
-  while (exit == 0U)
-  {
-    key = 0U;
-    slot_number = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
-       register */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '1' :
-          slot_number = SLOT_ACTIVE_1;
-          break;
-        case '2' :
-          slot_number = SLOT_ACTIVE_2;
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-        default:
-          printf("Invalid Number !\r");
-          break;
-      }
-
-      if (SlotStartAdd[slot_number] == 0U)
-      {
-        printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
-      }
-      else
-      {
-        TEST_PROTECTIONS_RunCORRUPT(slot_number);
-      }
-
-      /*Print Main Menu message*/
-      TEST_PROTECTIONS_CORRUPT_PrintMenu();
-    }
-  }
-}
-
-
-/**
-  * @brief  TEST Run TAMPER
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunTAMPER(void)
-{
-  uint32_t i = 0U;
-  m_uTamperEvent = 0U;
-
-  printf("\r\n====== Test Protection: TAMPER ========================\r\n\n");
-  /* Print instructions*/
-  printf("  -- Pull PC13 (CN7.23) to GND \r\n\n");
-  printf("  -- -- Note: sometimes it may be enough to put your finger close to PC13 (CN7.23)\r\n\n");
-  printf("  -- Should reset if TAMPER is enabled. \r\n\n");
-  printf("  Waiting for 10 seconds...\r\n\n")  ;
-
-  /* #2 - Wait 10 seconds*/
-  while ((i < TEST_PROTECTIONS_TAMPER_DELAY) && (m_uTamperEvent == 0U))
-  {
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register
-     */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-    HAL_Delay(1000U);
-    i++;
-  }
-  if (m_uTamperEvent == 0U)
-  {
-    printf("\r\n\n  -- Waited 10 seconds, if you have connected TAMPER pin to GND it means TAMPER protection ");
-    printf("is NOT ENABLED !! \r\n\n");
-  }
-  else
-  {
-    printf("\r\n\n  -- TAMPER Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
-    SVC_NVIC_SystemReset();
-  }
-}
-
-/**
-  * @brief  TEST Run IWDG
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_RunIWDG(void)
-{
-  printf("\r\n====== Test Protection: IWDG ===========================\r\n\n");
-
-  /* Wait for TEST_PROTECTIONS_IWDG_DELAY*/
-  printf("  -- Waiting %d (ms). Should reset if IWDG is enabled. \r\n\n", TEST_PROTECTIONS_IWDG_DELAY);
-
-  HAL_Delay(TEST_PROTECTIONS_IWDG_DELAY);
-
-  /* No Reset means IWDG was not enabled*/
-  printf("  -- !! IWDG protection is NOT ENABLED !!\r\n\n");
-}
-
-
-
-/**
-  * @brief  Display the TEST Main Menu choices on HyperTerminal
-  * @param  None.
-  * @retval None.
-  */
-void TEST_PROTECTIONS_GtzcPrintTestingSubMenu(void)
-{
-  printf("\r\n====== Test Protection: GTZC ===========================\r\n\n");
-  printf("  Test Protection: TZSC (Flash) ------------------------- 1\r\n\n");
-  printf("  Test Protection: TZSC (RAM) --------------------------- 2\r\n\n");
-  printf("  Test Protection: TZSC (AES) --------------------------- 3\r\n\n");
-  printf("  Test Protection: TZSC (PKA) --------------------------- 4\r\n\n");
-  printf("  Test Protection: TZSC (RNG) --------------------------- 5\r\n\n");
-  printf("  Test Protection: TZSC (SUBGHZSPI) --------------------- 6\r\n\n");
-  printf("  Test Protection: TZSC (TZIC)--------------------------- 7\r\n\n");
-  printf("  Test Protection: TZSC (TZSC)--------------------------- 8\r\n\n");
-  printf("  Test Protection: TZIC (PWR) --------------------------- 9\r\n\n");
-  printf("  Test Protection: TZIC (FLASHIF) ----------------------- a\r\n\n");
-  printf("  Test Protection: TZIC (DMA1) -------------------------- b\r\n\n");
-  printf("  Test Protection: TZIC (DMA2) -------------------------- c\r\n\n");
-  printf("  Previous Menu ----------------------------------------- x\r\n\n");
-}
-
-/**
-  * @brief  TEST Run TZIC
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_Run_GTZC(void)
-{
-  m_uGtzcTzicEvent = 0;
-  uint8_t key = 0U;
-  uint8_t exit = 0U;
-  uint8_t invalid = 0U;
-  uint8_t error_code = 0U;
-  uint32_t value = 0U;
-
-  TEST_PROTECTIONS_GtzcPrintTestingSubMenu();
-
-  while (exit == 0U)
-  {
-    key = 0U;
-    invalid = 0U;
-
-    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
-       register */
-    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-
-    /* Clean the input path */
-    COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      printf("If GTZC (TZSC and TZIC) is configured, you should get a TZIC interrupt.\r\n\n");
-      switch (key)
-      {
-        case '1' :
-          value = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS);
-          break;
-        case '2' :
-          /* Try to read a 32-bit data from the SRAM2 protected by the MPU */
-          value = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
-          break;
-        case '3' :
-          value = READ_REG(AES->SR);
-          break;
-        case '4' :
-          value = READ_REG(PKA->SR);
-          break;
-        case '5' :
-          value = READ_REG(RNG->SR);
-          break;
-        case '6' :
-          value = READ_REG(SUBGHZSPI->SR);
-          break;
-        case '7' :
-          value = READ_REG(GTZC_TZIC->MISR1);
-          break;
-        case '8' :
-          /* All GTZSC registers can be read by non-secure unprivileged accesses */
-
-          /* All peripheral aren't privileged in PRIVCFGR1 so there shouldn't be an illegal access */
-          error_code = 0;
-          value = READ_REG(GTZC_TZSC->SECCFGR1);
-          WRITE_REG(GTZC_TZSC->SECCFGR1, 0U);
-          if(value != READ_REG(GTZC_TZSC->SECCFGR1))
-          {
-            error_code = TEST_GTZC_ERROR_CODE;
-          }
-
-          /* This should generate an illegal access */
-          value = READ_REG(GTZC_TZSC->PRIVCFGR1);
-          WRITE_REG(GTZC_TZSC->PRIVCFGR1, 0U);
-          if(value != READ_REG(GTZC_TZSC->PRIVCFGR1))
-          {
-            error_code = TEST_GTZC_ERROR_CODE;
-          }
-          break;
-        case '9' :
-          /* The other PWR registers can be read and written by non-secure unprivileged accesses */
-          value = READ_REG(PWR->SECCFGR);
-          break;
-        case 'a' :
-          MODIFY_REG(FLASH->WRP1AR, FLASH_WRP1AR_WRP1A_STRT, 0x1F);
-          break;
-        case 'b' :
-          __HAL_RCC_DMA1_CLK_ENABLE();
-          __HAL_RCC_DMA1_FORCE_RESET();
-          __HAL_RCC_DMA1_RELEASE_RESET();
-          SET_BIT(DMA1_Channel1->CCR, DMA_CCR_PRIV);
-          __HAL_RCC_DMA1_CLK_DISABLE();
-          break;
-        case 'c' :
-          __HAL_RCC_DMA2_CLK_ENABLE();
-          __HAL_RCC_DMA2_FORCE_RESET();
-          __HAL_RCC_DMA2_RELEASE_RESET();
-          SET_BIT(DMA2_Channel1->CCR, DMA_CCR_PRIV);
-          __HAL_RCC_DMA2_CLK_ENABLE();
-          break;
-        case 'x' :
-          exit = 1U;
-          break;
-
-        default:
-          printf("Invalid Number !\r");
-          invalid = 1U;
-          break;
-      }
-    }
-
-    if ((key != 0) && (exit != 1) && (invalid != 1))
-    {
-      if ((key == 'a') || (key == 'b') || (key == 'c'))
-      {
-        printf("  -- Register successfully written for the choice %c\r\n", key);
-      }
-      else if ((key == '8') && (error_code == TEST_GTZC_ERROR_CODE))
-      {
-        printf("The GTZC registers aren't properly locked !! \r\n\n");
-      }
-      else if (key == '8')
-      {
-        printf("  -- The GTZC registers are locked.\r\n");
-      }
-      else
-      {
-        printf("  -- Read value for the choice %c: %d\r\n", key, value);
-      }
-
-      /* Wait 1 second */
-      WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
-      HAL_Delay(1U);
-
-      if (m_uGtzcTzicEvent == 0U)
-      {
-        printf("GTZC is NOT ENABLED in this use case !! \r\n\n");
-      }
-      else
-      {
-        printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
-        SVC_NVIC_SystemReset();
-      }
-
-      TEST_PROTECTIONS_GtzcPrintTestingSubMenu();
-    }
-  }
-}
-
-/**
-  * @brief  TEST Run KMS_DataStorage
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_Run_KMS_DATA_STORAGE(void)
-{
-  uint32_t u_read_fw_code = 0;
-  printf("\r\n====== Test Protection: MPU privileged - KMS_DataStorage \r\n\n");
-  printf("  -- Reading address: 0x%x\r\n\n", KMS_DATASTORAGE_START);
-
-  /* Try to read a 32-bit data from the Flash protected by the MPU */
-  u_read_fw_code = *((uint32_t *)KMS_DATASTORAGE_START);
-
-  /* Should not get here if MPU is available and enabled  */
-  printf("  -- Address: 0x%x = 0x%x\r\n\n", KMS_DATASTORAGE_START, u_read_fw_code);
-  printf("  -- !! MPU privileged CODE protection is NOT ENABLED !!\r\n\n");
-}
-
-/**
-  * @brief  TEST Run SYNC_FLAG
-  * @param  None.
-  * @retval None.
-  */
-static void TEST_PROTECTIONS_Run_SYNC_FLAG(void)
-{
-  __IO uint32_t *pSyncFlag = (__IO uint32_t *)M4_M0PLUS_FLAG_RAM_START;
-  uint32_t u_read_flag_value = 0;
-  printf("\r\n====== Test Protection: MPU Read Only - Synchronization flag \r\n\n");
-  printf("  -- Reading address: 0x%x\r\n\n", M4_M0PLUS_FLAG_RAM_START);
-
-  /* Try to change the value of the synchronization flag */
-  u_read_flag_value = *pSyncFlag;
-  *pSyncFlag = 0U;
-
-  /* Restore the value */
-  *pSyncFlag = u_read_flag_value;
-
-  /* Should not get here if MPU is available and enabled  */
-  printf("  -- Address: 0x%x = 0x%x\r\n\n", M4_M0PLUS_FLAG_RAM_START, *pSyncFlag);
-  printf("  -- !! MPU read only FLAG protection is NOT ENABLED !!\r\n\n");
-}
-
-/**
-  * @}
-  */
-
-/** @defgroup TEST_PROTECTIONS_Callback_Functions Callback Functions
-  * @{
-  */
-
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
-  * @param  None
-  * @retval None
-  */
-void CALLBACK_Antitamper(void)
-{
-  /*Set tamper event variable*/
-  m_uTamperEvent = 1U;
-}
-
-/**
-  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC IRQ.
-  * @param  None
-  * @retval None
-  */
-void CALLBACK_GTZC_TZIC(void)
-{
-  /*Set GTZC TZIC event variable*/
-  m_uGtzcTzicEvent = 1U;
-}
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c
deleted file mode 100644
index f97b7f89..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app.c
-  * @author  MCD Application Team
-  * @brief   tKMS application examples module.
-  *          This file provides examples of KMS API usages.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "tkms.h"
-#include "tkms_app.h"
-#include "com.h"
-#include "common.h"
-
-
-/* Private variables ---------------------------------------------------------*/
-extern void KMS_UPDATE_StartLocalUpdate(void);
-
-static void tkms_app_print_menu(void)
-{
-  (void)printf("\r\n======================= tKMS Examples Menu ===========================\r\n\n");
-  (void)printf("  (*) Requires execution of 'Import Blob' test (3) prior to execute this one\r\n\n");
-  (void)printf("  TKMS - Test All (*)                               --------------------- 0\r\n\n");
-  (void)printf("  TKMS - Tests AES-GCM Embedded key                 --------------------- 1\r\n\n");
-  (void)printf("  TKMS - Tests AES-CBC Embedded key                 --------------------- 2\r\n\n");
-  (void)printf("  TKMS - Import blob                                --------------------- 3\r\n\n");
-  (void)printf("  TKMS - Tests RSA Static key (*)                   --------------------- 4\r\n\n");
-  (void)printf("  TKMS - Tests Derive Static key (*)                --------------------- 5\r\n\n");
-  (void)printf("  Exit tKMS Examples Menu                           --------------------- x\r\n\n");
-}
-
-void tkms_app_menu(void)
-{
-  uint8_t key;
-  uint8_t exit = 0U;
-  CK_RV ret_status;
-  uint8_t tests_executed;
-  uint8_t tests_success;
-  uint8_t clear_buffer[128] = "STM32 Key Management Services - Example buffer";
-
-  /* Initialize tKMS for subsequent usage */
-  ret_status = C_Initialize(NULL);
-  if (ret_status != CKR_OK)
-  {
-    (void)printf("tKMS initialization failed\r\n");
-    exit = 1;
-  }
-  else
-  {
-    tkms_app_print_menu();
-  }
-
-  while (exit == 0U)
-  {
-    key = 0U;
-
-    INVOKE_SCHEDULE_NEEDS();
-
-    /* Clean the user input path */
-    (void)COM_Flush();
-
-    /* Receive key */
-    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
-    {
-      switch (key)
-      {
-        case '0' :
-          tests_executed = 0U;
-          tests_success = 0U;
-          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
-          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tests_executed++;
-          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
-          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tests_executed++;
-          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
-          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tests_executed++;
-          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
-          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tests_executed++;
-          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
-          INVOKE_SCHEDULE_NEEDS();
-          if (tests_success == tests_executed)
-          {
-            (void)printf("CUMULATIVE RESULT: ALL TESTS PASSED\r\n");
-          }
-          else
-          {
-            (void)printf("CUMULATIVE RESULT: %d/%d success\r\n", tests_success, tests_executed);
-          }
-          tkms_app_print_menu();
-          break;
-
-        /* 1 = TKMS - Tests AES-GCM Embedded key */
-        case '1' :
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
-          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tkms_app_print_menu();
-          break;
-        /* 2 = Tests AES-CBC Embedded key */
-        case '2' :
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
-          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tkms_app_print_menu();
-          break;
-        /* 3 = Import Blob */
-        case '3':
-          INVOKE_SCHEDULE_NEEDS();
-          KMS_UPDATE_StartLocalUpdate();
-          tkms_app_print_menu();
-          break;
-        /* 4 = Tests RSA Static key (requires blob import) */
-        case '4' :
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
-          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tkms_app_print_menu();
-          break;
-        /* 5 = Tests Key derivation (requires blob import) */
-        case '5':
-          INVOKE_SCHEDULE_NEEDS();
-          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
-          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
-          tkms_app_print_menu();
-          break;
-        case 'x':
-          exit = 1;
-          break;
-
-        default:
-          (void)printf("Invalid Number !\r");
-          tkms_app_print_menu();
-          break;
-      }
-    }
-  }
-
-  /* Finalize tKMS since no more in use */
-  ret_status = C_Finalize(NULL);
-  if (ret_status != CKR_OK)
-  {
-    (void)printf("tKMS finalization failed\r\n");
-  }
-}
-
-void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length)
-{
-  uint8_t ascii[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-  uint8_t *ptmp = pstr;
-  uint8_t *ptmp2 = pbuff;
-  for (uint32_t i = 0UL; i < length; i += 1UL)
-  {
-    *ptmp = ascii[*ptmp2 >> 4];
-    ptmp++;
-    *ptmp = ascii[*ptmp2 & 0x0FUL];
-    ptmp++;
-    ptmp2++;
-  }
-  *ptmp = 0U;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c
deleted file mode 100644
index bd2e720f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app_derive_key.c
-  * @author  MCD Application Team
-  * @brief   tKMS application examples module.
-  *          This file provides examples of KMS API usage to derivate a key
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "tkms.h"
-#include "tkms_app.h"
-#include "com.h"
-#include "common.h"
-#include "kms_platf_objects_interface.h"
-
-/* Private defines -----------------------------------------------------------*/
-#define EC_POINT_MAX_LEN          (3U + (2U * 32U))   /* EC Point Max Length : X962 header + DER header +
-                                                         NIST-P256 *2 - > (0x04|LEN|0x04|X|Y) */
-#define DH_SECRET_X_MAX_LEN       (32U)               /* DH Secret X Max Length */
-
-/* Private structures -- -----------------------------------------------------*/
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t a_string[1024] = {0};
-
-/*
- * Key derivation
- * -----------------------------------------------------------------------------
- * This example is showing how to use key derivation to create
- * a specific session key.
- * -----------------------------------------------------------------------------
- * Key derivation shared information between emitter and receiver
- * - Secret derivation Key: stored in KMS under
- *                         KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE object handle
- * - Session key variation: transmitted or calculated by both emitter & receiver
- */
-CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pClearMessage)
-{
-  uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
-  uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
-  CK_ULONG DeriveKey_template_class = CKO_SECRET_KEY;
-  CK_ULONG DeriveKey_template_destroyable = CK_TRUE;
-  CK_ULONG DeriveKey_template_encrypt = CK_TRUE;
-  CK_ULONG DeriveKey_template_decrypt = CK_TRUE;
-  CK_ULONG DeriveKey_template_extract = CK_TRUE;
-  CK_ATTRIBUTE DeriveKey_template[] =
-  {
-    {CKA_CLASS, (CK_VOID_PTR) &DeriveKey_template_class,       sizeof(CK_ULONG)},
-    {CKA_DESTROYABLE, (CK_VOID_PTR) &DeriveKey_template_destroyable, sizeof(CK_ULONG)},
-    {CKA_ENCRYPT, (CK_VOID_PTR) &DeriveKey_template_encrypt,     sizeof(CK_ULONG)},
-    {CKA_DECRYPT, (CK_VOID_PTR) &DeriveKey_template_decrypt,     sizeof(CK_ULONG)},
-    {CKA_EXTRACTABLE, (CK_VOID_PTR) &DeriveKey_template_extract,     sizeof(CK_ULONG)}
-  };
-  CK_ATTRIBUTE GetKey_template[] = {{CKA_VALUE, (CK_VOID_PTR) &DeriveKey_template_class, 32UL}};
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  /* Key derivation */
-  uint8_t session_variant[32] = "My session variation 0122004578";
-  CK_MECHANISM      mech = {CKM_AES_ECB_ENCRYPT_DATA, session_variant, 32};
-  CK_OBJECT_HANDLE  derivedKeyHdle = 0UL;
-  uint8_t derivedKey[32] = {0};
-  /* AES encryption / decryption */
-  uint32_t encrypted_length = 0UL;
-  uint32_t decrypted_length = 0UL;
-  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
-  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)cbc_iv, sizeof(cbc_iv) };
-  uint8_t tag[16] = {0};
-  uint32_t tag_lenth;
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Derive key with pass phrase */
-  if (rv == CKR_OK)
-  {
-    rv = C_DeriveKey(session, &(mech), (CK_OBJECT_HANDLE)KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE,
-                     &DeriveKey_template[0], sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derivedKeyHdle);
-  }
-
-  /* Get derived key to display */
-  if (rv == CKR_OK)
-  {
-    GetKey_template[0].pValue = derivedKey;
-    rv = C_GetAttributeValue(session, derivedKeyHdle, &(GetKey_template[0]), sizeof(GetKey_template) /
-                             sizeof(CK_ATTRIBUTE));
-  }
-  if (rv == CKR_OK)
-  {
-    (void)printf("--- Derivating key --------------------------------------------\r\n");
-    (void)printf("--- AES ECB\r\n");
-    (void)printf("--- Pass phrase   [%s]\r\n", session_variant);
-    tkms_buff2str(derivedKey, a_string, 32);
-    (void)printf("--- Derived key   [%s]\r\n", a_string);
-  }
-
-  /* Encryption --------------------------------------------------------------*/
-  (void)printf("--- Encrypting --------------------------------------------------\r\n");
-  (void)printf("--- AES CBC\r\n");
-  (void)printf("--- IV      [%s]\r\n", cbc_iv);
-  (void)printf("--- Message [%s]\r\n", pClearMessage);
-  tkms_buff2str(pClearMessage, a_string, length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-  (void)printf("--- Length  [%d]\r\n", length);
-
-  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
-  }
-
-  /* Encrypt clear message */
-  if (rv == CKR_OK)
-  {
-    encrypted_length = sizeof(encrypted_message);
-    rv = C_EncryptUpdate(session, pClearMessage, length,
-                         encrypted_message, &encrypted_length);
-  }
-
-  /* Finalize message encryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
-  }
-
-  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
-  tkms_buff2str(encrypted_message, a_string, encrypted_length);
-  (void)printf("--- Message [0x%s]\r\n", a_string);
-
-  /* Decryption --------------------------------------------------------------*/
-
-  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_DecryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
-  }
-
-  /* Decrypt encrypted message */
-  if (rv == CKR_OK)
-  {
-    decrypted_length = sizeof(decrypted_message);
-    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
-                         decrypted_message, &decrypted_length);
-  }
-
-  /* Finalize message decryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
-  }
-  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
-  (void)printf("--- Message [%s]\r\n", decrypted_message);
-  tkms_buff2str(decrypted_message, a_string, decrypted_length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-
-  /* Compare decrypted message with clear one */
-  if (rv == CKR_OK)
-  {
-    if (memcmp(pClearMessage, decrypted_message, length) != 0)
-    {
-      (void)printf("XXX Decrypted message differs\r\n");
-      rv = CKR_FUNCTION_FAILED;
-    }
-    else
-    {
-      (void)printf(">>> Decrypted message is same\r\n");
-    }
-  }
-
-  /* Remove key once no more needed */
-  if (rv == CKR_OK)
-  {
-    rv = C_DestroyObject(session, derivedKeyHdle);
-  }
-
-  /* Verify key is no more usable */
-  if (rv == CKR_OK)
-  {
-    if (C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle) == CKR_OK)
-    {
-      rv = CKR_FUNCTION_FAILED;
-    }
-  }
-
-  /* Close sessions */
-  (void)C_CloseSession(session);
-
-  return rv;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c
deleted file mode 100644
index 5401f895..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app_encrypt_decrypt.c
-  * @author  MCD Application Team
-  * @brief   KMS application examples module.
-  *          This file provides examples of KMS API usage to encrypt & decrypt
-  *          messages.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "tkms.h"
-#include "tkms_app.h"
-#include "com.h"
-#include "common.h"
-#include "kms_platf_objects_interface.h"
-
-/* Private defines ---------------------------------------------------------*/
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t a_string[1024] = {0};
-static uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
-static uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
-
-/*
- * AES GCM 128 Bits
- * -----------------------------------------------------------------------------
- * This example is showing how to use AES GCM encryption/decryption to
- * authenticate and protect a message.
- * -----------------------------------------------------------------------------
- * Shared information between emitter and receiver
- * - Secret encryption/decryption Key: stored in KMS under
- *                                     KMS_KEY_AES128_OBJECT_HANDLE object handle
- * - Encrypted message: transmitted from emitter to sender
- * - Initialization Vector: transmitted from emitter to sender
- * - Message Header: transmitted from emitter to sender
- * - Authentication Tag: transmitted from emitter to sender
- *                      (calculated during encryption, verified during decryption)
- */
-CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage)
-{
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint32_t encrypted_length = 0UL;
-  uint32_t decrypted_length = 0UL;
-  uint8_t tag[16] = {0};  /* 128 bits tag size */
-  uint32_t tag_lenth = 0UL;
-
-  /* AES GCM Configuration variables */
-  uint8_t gcm_iv[12] = ">GCM VECTOR";
-  uint8_t gcm_header[16] = ">AES GCM Header";
-  CK_GCM_PARAMS gcm_params =
-  {
-    (CK_BYTE *)gcm_iv,
-    sizeof(gcm_iv),
-    (CK_BYTE_PTR)gcm_header,
-    sizeof(gcm_header),
-    128   /* Tag length in Bits */
-  };
-  CK_MECHANISM aes_gcm_mechanism = { CKM_AES_GCM, (CK_VOID_PTR *)(uint32_t)&gcm_params, sizeof(gcm_params) };
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Encryption --------------------------------------------------------------*/
-  (void)printf("--- Encrypting --------------------------------------------------\r\n");
-  (void)printf("--- AES GCM\r\n");
-  (void)printf("--- IV      [%s]\r\n", gcm_iv);
-  (void)printf("--- Header  [%s]\r\n", gcm_header);
-  (void)printf("--- Message [%s]\r\n", pClearMessage);
-  tkms_buff2str(pClearMessage, a_string, length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-  (void)printf("--- Length  [%d]\r\n", length);
-
-  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_EncryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
-  }
-
-  /* Encrypt clear message */
-  if (rv == CKR_OK)
-  {
-    encrypted_length = sizeof(encrypted_message);
-    rv = C_EncryptUpdate(session, pClearMessage, length,
-                         encrypted_message, &encrypted_length);
-  }
-
-  /* Finalize message encryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
-  }
-
-  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
-  tkms_buff2str(encrypted_message, a_string, encrypted_length);
-  (void)printf("--- Message [0x%s]\r\n", a_string);
-  tkms_buff2str(tag, a_string, tag_lenth);
-  (void)printf("--- Tag     [0x%s]\r\n", a_string);
-
-  /* Decryption --------------------------------------------------------------*/
-
-  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_DecryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
-  }
-
-  /* Decrypt encrypted message */
-  if (rv == CKR_OK)
-  {
-    decrypted_length = sizeof(decrypted_message);
-    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
-                         decrypted_message, &decrypted_length);
-  }
-
-  /* Finalize message decryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
-  }
-  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
-  (void)printf("--- Message [%s]\r\n", decrypted_message);
-  tkms_buff2str(decrypted_message, a_string, decrypted_length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-
-  if (rv == CKR_OK)
-  {
-    (void)printf(">>> Decrypted message authenticated\r\n");
-  }
-  else
-  {
-    (void)printf("XXX Decrypted message not authenticated\r\n");
-  }
-
-  /* Compare decrypted message with clear one */
-  if (rv == CKR_OK)
-  {
-    if (memcmp(pClearMessage, decrypted_message, length) != 0)
-    {
-      (void)printf("XXX Decrypted message differs\r\n");
-      rv = CKR_FUNCTION_FAILED;
-    }
-    else
-    {
-      (void)printf(">>> Decrypted message is same\r\n");
-    }
-  }
-
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
-
-  return rv;
-}
-
-/*
- * AES CBC 256 Bits
- * -----------------------------------------------------------------------------
- * This example is showing how to use AES CBC encryption/decryption to
- * protect a message.
- * -----------------------------------------------------------------------------
- * CBC shared information between emitter and receiver
- * - Secret encryption/decryption Key: stored in KMS under
- *                                     KMS_KEY_AESC256_OBJECT_HANDLE object handle
- * - Encrypted message: transmitted from emitter to sender
- * - Initialization Vector: transmitted from emitter to sender
- */
-CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage)
-{
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint32_t encrypted_length = 0UL;
-  uint32_t decrypted_length = 0UL;
-  uint8_t tag[16] = {0};
-  uint32_t tag_lenth;
-
-  /* AES CBC Configuration variables */
-  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
-  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)(uint32_t)cbc_iv, sizeof(cbc_iv) };
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Encryption --------------------------------------------------------------*/
-  (void)printf("--- Encrypting --------------------------------------------------\r\n");
-  (void)printf("--- AES CBC\r\n");
-  (void)printf("--- IV      [%s]\r\n", cbc_iv);
-  (void)printf("--- Message [%s]\r\n", pClearMessage);
-  tkms_buff2str(pClearMessage, a_string, length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-  (void)printf("--- Length  [%d]\r\n", length);
-
-  /* Configure session to encrypt message in AES CBC with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_EncryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
-  }
-
-  /* Encrypt clear message */
-  if (rv == CKR_OK)
-  {
-    encrypted_length = sizeof(encrypted_message);
-    rv = C_EncryptUpdate(session, pClearMessage, length,
-                         encrypted_message, &encrypted_length);
-  }
-
-  /* Finalize message encryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
-  }
-
-  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
-  tkms_buff2str(encrypted_message, a_string, encrypted_length);
-  (void)printf("--- Message [0x%s]\r\n", a_string);
-
-  /* Decryption --------------------------------------------------------------*/
-
-  /* Configure session to decrypt message in AES CBC with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_DecryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
-  }
-
-  /* Decrypt encrypted message */
-  if (rv == CKR_OK)
-  {
-    decrypted_length = sizeof(decrypted_message);
-    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
-                         decrypted_message, &decrypted_length);
-  }
-
-  /* Finalize message decryption */
-  if (rv == CKR_OK)
-  {
-    tag_lenth = sizeof(tag);
-    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
-  }
-  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
-  (void)printf("--- Message [%s]\r\n", decrypted_message);
-  tkms_buff2str(decrypted_message, a_string, decrypted_length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-
-  /* Compare decrypted message with clear one */
-  if (rv == CKR_OK)
-  {
-    if (memcmp(pClearMessage, decrypted_message, length) != 0)
-    {
-      (void)printf("XXX Decrypted message differs\r\n");
-      rv = CKR_FUNCTION_FAILED;
-    }
-    else
-    {
-      (void)printf(">>> Decrypted message is same\r\n");
-    }
-  }
-
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
-
-  return rv;
-}
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c
deleted file mode 100644
index cd6b1209..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    tkms_app_sign_verify.c
-  * @author  MCD Application Team
-  * @brief   KMS application examples module.
-  *          This file provides examples of KMS API usage to sign & verify
-  *          messages.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "tkms.h"
-#include "tkms_app.h"
-#include "com.h"
-#include "common.h"
-#include "kms_platf_objects_interface.h"
-
-/* Private defines -----------------------------------------------------------*/
-
-/* Private variables ---------------------------------------------------------*/
-static uint8_t a_string[1024] = {0};
-static uint8_t signature[2048 / 8] __attribute__((aligned(8))) = {0};
-
-/*
- * RSA 1024 Bits
- * -----------------------------------------------------------------------------
- * This example is showing how to use RSA signature to
- * authenticate a message.
- * -----------------------------------------------------------------------------
- * RSA shared information between emitter and receiver
- * - Secret signature/verification Key: stored in KMS under
- *   KMS_KEY_RSA2048_OBJECT_HANDLE object handle
- * - Message to authenticate: transmitted from emitter to sender
- * - Signature: transmitted from emitter to sender
- *              (calculated by emitter, verified by receiver)
- */
-CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage)
-{
-
-  CK_RV rv;
-  CK_SESSION_HANDLE session;
-  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
-  uint32_t signature_length = 0UL;
-
-  CK_MECHANISM rsa_mechanism = { CKM_SHA256_RSA_PKCS, (CK_VOID_PTR *) NULL, 0};
-
-  /* Open session with KMS */
-  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
-
-  /* Signature --------------------------------------------------------------*/
-  (void)printf("--- Signing -----------------------------------------------------\r\n");
-  (void)printf("--- RSA 1024 bits\r\n");
-  (void)printf("--- Message [%s]\r\n", pMessage);
-  tkms_buff2str(pMessage, a_string, length);
-  (void)printf("---         [0x%s]\r\n", a_string);
-  (void)printf("--- Length  [%d]\r\n", length);
-
-  /* Configure session to sign message using RSA with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_SignInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
-  }
-
-  /* Sign message */
-  if (rv == CKR_OK)
-  {
-    signature_length = sizeof(signature);
-    rv = C_Sign(session, pMessage, length,
-                signature, &signature_length);
-  }
-
-  (void)printf("--- Signed ------------------------------------------------------\r\n");
-  tkms_buff2str(signature, a_string, signature_length);
-  (void)printf("--- Signature [0x%s]\r\n", a_string);
-  (void)printf("--- Length    [%d]\r\n", signature_length);
-
-  /* Verification ------------------------------------------------------------*/
-
-  /* Configure session to verify message using RSA with settings included into the mechanism */
-  if (rv == CKR_OK)
-  {
-    rv = C_VerifyInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
-  }
-
-  /* Verify message */
-  if (rv == CKR_OK)
-  {
-    rv = C_Verify(session, pMessage, length,
-                  signature, signature_length);
-  }
-
-  if (rv == CKR_OK)
-  {
-    (void)printf(">>> Message authenticated\r\n");
-  }
-  else
-  {
-    (void)printf("XXX Message not authenticated\r\n");
-  }
-
-  /* Close session with KMS */
-  (void)C_CloseSession(session);
-
-  return rv;
-}
-
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/readme.txt
deleted file mode 100644
index 9aea450f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/readme.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
-  @page 2_Images_UserApp_M0Plus / Secure Firmware Update - M0+ User Application Demo
-
-  @verbatim
-  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
-  * @file    readme.txt
-  * @brief   This application shows a User Application
-  ******************************************************************************
-  *
-  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                               www.st.com/SLA0044
-  *
-  ******************************************************************************
-  @endverbatim
-
-@par Application Description
-
-This application demonstrates firmware download capabilities and provides a set
-of functions to test the active protections offered by Secure Boot and Secure Engine.
-It also demonstrates key management services through basic examples and specific boot
-mechanism (secure firmware update decryption, verification...)
-A terminal connected with the board via VCOM is needed to communicate with the
-board and to select which feature to demonstrate.
-
-For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
-available from the STMicroelectronics microcontroller website www.st.com.
-
-@par Keywords
-
-Security, KMS, SBSFU
-
-@par Directory contents
-
-   - 2_Images_UserApp_M0Plus/Src/com.c                    Communication module file
-   - 2_Images_UserApp_M0Plus/Src/common.c                 Common module file
-   - 2_Images_UserApp_M0Plus/Src/flash_if.c               Flash interface file
-   - 2_Images_UserApp_M0Plus/Src/fw_update_app.c          Firmware update application
-   - 2_Images_UserApp_M0Plus/Src/kms_object_update_app.c  KMS Blob update application
-   - 2_Images_UserApp_M0Plus/Src/main.c                   Main program
-   - 2_Images_UserApp_M0Plus/Src/mpu.c                    Secure Engine isolation with MPU (when no Firewall is available)
-   - 2_Images_UserApp_M0Plus/Src/se_user_code.c           Call user defined services running in Secure Engine
-   - 2_Images_UserApp_M0Plus/Src/sfu_app_new_image.c      Manage the new firmware image storage and installation
-   - 2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c           Interrupt handlers
-   - 2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c       STM32 system file
-   - 2_Images_UserApp_M0Plus/Src/test_protections.c       Protection test
-   - 2_Images_UserApp_M0Plus/Src/tkms_app.c               tKMS tests
-   - 2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c    tKMS key derivation tests
-   - 2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c tKMS encryption/decryption tests
-   - 2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c   tKMS signature/verification tests
-   - 2_Images_UserApp_M0Plus/Src/ymodem.c                 Ymodem communication module
-   - 2_Images_UserApp_M0Plus/Inc/com.h                    Header for com.c file
-   - 2_Images_UserApp_M0Plus/Inc/common.h                 Header for common.c file
-   - 2_Images_UserApp_M0Plus/Inc/flash_if.h               Header for flash_if.c file
-   - 2_Images_UserApp_M0Plus/Inc/fw_update_app.h          Header for fw_update_app.c file
-   - 2_Images_UserApp_M0Plus/Inc/main.h                   Header for main.c file
-   - 2_Images_UserApp_M0Plus/Inc/mpu.h                    Header file for mpu.c
-   - 2_Images_UserApp_M0Plus/Inc/se_user_code.h           Header file for se_user_code.c
-   - 2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h      Header file for sfu_app_new_image.c
-   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h     HAL configuration file
-   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h           Header for stm32wlxx_it.c file
-   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h  BSP configuration file
-   - 2_Images_UserApp_M0Plus/Inc/test_protections.h       Header for test_protections.c file
-   - 2_Images_UserApp_M0Plus/Inc/tkms_app.h               Header for tkms_app.c file
-   - 2_Images_UserApp_M0Plus/Inc/ymodem.h                 Header for ymodem.c file
-
-@par Hardware and Software environment
-
-  - This example runs on STM32WL55xx devices.
-  - This example has been tested with NUCLEO-WL55JC RevC board and can be
-    easily tailored to any other supported device and development board.
-  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
-    is a feature provided by STM32Cube programmer available on www.st.com.
-  - This example is based on se_interface_application.o module exported by SBSFU project.
-  - This example needs a terminal emulator.
-  - Microsoft Windows has a limitation whereby paths to files and directories cannot
-    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
-    shell scripts) to fail reading from or writing to such files.
-    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
-    up a local drive out of an existing directory on the hard drive, such as:
-    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
-
-@par IDE postbuild script
-
-In order to ease the development process, a postbuild script ("postbuild.bat") is integrated in each IDE project.
-This postbuild script:
- - is generated when compiling the Secure Engine Core project,
- - prepares the firmware image of the user application to be installed in the device.
- - prepares the new portion of firmware image: part of firmware image which changed vs a reference firmware image.
-   The reference firmware image is provided to the postbuild script by manually copying the UserApp.bin of the running
-   application into RefUserApp.bin (in folder 2_Images_UserApp_M0Plus/IDE).
-
-   As an example, once original user application has been built, downloaded and installed, you may create the
-   RefUserApp.bin, then change UserAppId constant from 'A' to 'B' in source file main.c, then build again the user
-   application.
-   At post processing stage, the portion of code containing the UserAppId will be identified as a difference vs
-   the reference binary file and a PartialUserApp.sfb will be generated in 2_Images_UserApp_M0Plus/Binary folder.
-
-A known limitation of this integration occurs when you update the firmware version (parameter of
-postbuild.bat script).
-The IDE does not track this update so you need to force the rebuild of the project manually.
-
-@par How to use it ?
-
-Refer to SBSFU readme and follow steps by steps instructions.
-
-Once executed, this user application gives access to a menu which allows:
-  1 - to download a new firmware
-  2 - to test protections (GTZC isolation, HDP, WRP, IWDG, TAMPER, MPU isolation)
-  3 - to demonstrate how to call user defined services running in Secure Engine
-  4 - to provide access to multiple images feature (not supported)
-  5 - to validate a firmware image at first start-up (not supported)
-  a - to demonstrate usage of key management services
-
-1. Pressing 1 allows to download a new firmware.
-
-Send the user encrypted firmware file (.sfb) with Tera Term by using menu "File > Transfer > YMODEM > Send..."
-After the download, the system reboots.
-The downloaded encrypted firmware is detected, decrypted, installed and executed.
-
-The downloaded image can be either a complete UserApp.sfb or a PartialUserApp.sfb.
-To download a PartialUserApp.sfb, it is mandatory to have previously installed the UserApp.sfb identified as reference
-into the device.
-
-2. Pressing 2 allows to test protections.
-
- - CORRUPT IMAGE test (#1): causes a signature verification failure at next boot
- - Isolation tests (#2, #3): cause a reset trying to access protected code or data (either in RAM or FLASH)
- - Secure user memory protection test (#4): cause an error trying to access protected code
- - WRP test (#5): causes an error trying to erase write protected code
- - IWDG test (#6): causes a reset simulating a deadlock by not refreshing the watchdog.
- - TAMPER test (#7): causes a reset if a tamper event is detected. In order to generate a tamper event,
-   user has to connect PC13 (CN7.23) to GND (It may be enough to put your finger close to PC13 (CN7.23)).
-   By default, the feature is disabled (see the SBSFU readme.txt).
- - GTZC tests (#8): causes an error trying to access to protected IP, code or data (either in RAM or FLASH)
- - KMS data storage test (#9): causes an error trying to access KMS data storage (NVM data)
-
-Return to previous menu by pressing x.
-
-3. Pressing 3 allows to call user defined services running in Secure Engine.
- - As an example, SE_APP_GetActiveFwInfo (#1, #2) service is called in order to display the firmware information
-   located in the protected area such as version and size.
- - The IRQ handling tests (#a, #b) show how to disable and to enable IRQ services.
-   Each interface must be called once (no consecutive calls of the same interface).
-   Presses on the User Button generate interrupts (handled or not depending on whether the interrupts are enabled).
-
-4. This menu is dedicated to multiple images feature.
-Feature not available as there is only 1 download area configured.
-
-5. This menu is dedicated to image validation.
-Feature available under ENABLE_IMAGE_STATE_HANDLING compilation switch, not available in this example.
-
-a. Pressing a allows to enter specific key management services test menu.
-With this menu, you should be able to try encryption/decryption, signature/verification or key derivation mechanisms.
-
-
-Note :  for Linux users Minicom can be used but to do so you need to compile the UserApp project with the MINICOM_YMODEM switch enabled (ymodem.h)
- * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
- */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp
deleted file mode 100644
index f7c4693e..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp
+++ /dev/null
@@ -1,1109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-  <fileVersion>2</fileVersion>
-  <configuration>
-    <name>STM32WL55JC_Nucleo_2_Images_UserApp_M4</name>
-    <toolchain>
-      <name>ARM</name>
-    </toolchain>
-    <debug>1</debug>
-    <settings>
-      <name>General</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <version>31</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>ExePath</name>
-          <state>STM32WL55JC_Nucleo/Exe</state>
-        </option>
-        <option>
-          <name>ObjPath</name>
-          <state>STM32WL55JC_Nucleo/Obj</state>
-        </option>
-        <option>
-          <name>ListPath</name>
-          <state>STM32WL55JC_Nucleo/List</state>
-        </option>
-        <option>
-          <name>GEndianMode</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>Input description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>Output description</name>
-          <state>Full formatting, with multibyte support.</state>
-        </option>
-        <option>
-          <name>GOutputBinary</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGCoreOrChip</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelect</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>GRuntimeLibSelectSlave</name>
-          <version>0</version>
-          <state>2</state>
-        </option>
-        <option>
-          <name>RTDescription</name>
-          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
-        </option>
-        <option>
-          <name>OGProductVersion</name>
-          <state>4.41A</state>
-        </option>
-        <option>
-          <name>OGLastSavedByProductVersion</name>
-          <state>8.30.1.17146</state>
-        </option>
-        <option>
-          <name>GeneralEnableMisra</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraVerbose</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGChipSelectEditMenu</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>GenLowLevelInterface</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GEndianModeBE</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGBufferedTerminalOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GenStdoutInterface</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>GeneralMisraVer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GeneralMisraRules04</name>
-          <version>0</version>
-          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
-        </option>
-        <option>
-          <name>RTConfigPath2</name>
-          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
-        </option>
-        <option>
-          <name>GBECoreSlave</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGUseCmsis</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGUseCmsisDspLib</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GRuntimeLibThreads</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CoreVariant</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>GFPUDeviceSlave</name>
-          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
-        </option>
-        <option>
-          <name>FPU2</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NrRegs</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>NEON</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>GFPUCoreSlave2</name>
-          <version>26</version>
-          <state>39</state>
-        </option>
-        <option>
-          <name>OGCMSISPackSelectDevice</name>
-        </option>
-        <option>
-          <name>OgLibHeap</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGLibAdditionalLocale</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OGPrintfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGPrintfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfVariant</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OGScanfMultibyteSupport</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>GenLocaleTags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>GenLocaleDisplayOnly</name>
-          <state></state>
-        </option>
-        <option>
-          <name>DSPExtension</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>TrustZone</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>TrustZoneModes</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>ICCARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>34</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>CCOptimizationNoSizeConstraints</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDefines</name>
-          <state>CORE_CM4</state>
-          <state>USE_HAL_DRIVER</state>
-          <state>STM32WL55xx</state>
-        </option>
-        <option>
-          <name>CCPreprocFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocComments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPreprocLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMnemonics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListCMessages</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCListAssSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCDiagSuppress</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagRemark</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagWarning</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCDiagError</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCAllowList</name>
-          <version>1</version>
-          <state>11111110</state>
-        </option>
-        <option>
-          <name>CCDebugInfo</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IEndianMode</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IExtraOptionsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IExtraOptions</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CCLangConformance</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCSignedPlainChar</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCRequirePrototypes</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCDiagWarnAreErr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCompilerRuntimeInfo</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>CCLibConfigHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>PreInclude</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CompilerMisraOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCIncludePath2</name>
-          <state>$PROJ_DIR$/../Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
-          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
-        </option>
-        <option>
-          <name>CCStdIncCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCCodeSection</name>
-          <state>.text</state>
-        </option>
-        <option>
-          <name>IProcessorMode2</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevel</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CCOptStrategy</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCOptLevelSlave</name>
-          <state>3</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules98</name>
-          <version>0</version>
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
-        </option>
-        <option>
-          <name>CompilerMisraRules04</name>
-          <version>0</version>
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
-        </option>
-        <option>
-          <name>CCPosIndRopi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndRwpi</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCPosIndNoDynInit</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccLang</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCDialect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccAllowVLA</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccStaticDestr</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCppInlineSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IccFloatSemantics</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCNoLiteralPool</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCOptStrategySlave</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCGuardCalls</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncSource</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CCEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CCEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccExceptions2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IccRTTI2</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>AARM</name>
-      <archiveVersion>2</archiveVersion>
-      <data>
-        <version>10</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>AObjPrefix</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AEndian</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>ACaseSensitivity</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacroChars</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnWhat</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AWarnOne</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange1</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AWarnRange2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>ADebug</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AltRegisterNames</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ADefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AList</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AListHeader</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AListing</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>Includes</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacDefs</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MacExps</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>MacExec</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>OnlyAssed</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>MultiLine</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLengthCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>PageLength</name>
-          <state>80</state>
-        </option>
-        <option>
-          <name>TabSpacing</name>
-          <state>8</state>
-        </option>
-        <option>
-          <name>AXRef</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDefines</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefInternal</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AXRefDual</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AFpuProcessor</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>AOutputFile</name>
-          <state>$FILE_BNAME$.o</state>
-        </option>
-        <option>
-          <name>ALimitErrorsCheck</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>ALimitErrorsEdit</name>
-          <state>100</state>
-        </option>
-        <option>
-          <name>AIgnoreStdInclude</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AUserIncludes</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AExtraOptionsCheckV2</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>AExtraOptionsV2</name>
-          <state></state>
-        </option>
-        <option>
-          <name>AsmNoLiteralPool</name>
-          <state>0</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>OBJCOPY</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>1</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>OOCOutputFormat</name>
-          <version>3</version>
-          <state>3</state>
-        </option>
-        <option>
-          <name>OCOutputOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCOutputFile</name>
-          <state>..\..\UserApp.bin</state>
-        </option>
-        <option>
-          <name>OOCCommandLineProducer</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>OOCObjCopyEnable</name>
-          <state>1</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>CUSTOM</name>
-      <archiveVersion>3</archiveVersion>
-      <data>
-        <extensions></extensions>
-        <cmdline></cmdline>
-        <hasPrio>0</hasPrio>
-      </data>
-    </settings>
-    <settings>
-      <name>BICOMP</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-    <settings>
-      <name>BUILDACTION</name>
-      <archiveVersion>1</archiveVersion>
-      <data>
-        <prebuild></prebuild>
-        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\PostBuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 2 1"</postbuild>
-      </data>
-    </settings>
-    <settings>
-      <name>ILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>21</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IlinkLibIOConfig</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>XLinkMisraHandler</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkInputFileSlave</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOutputFile</name>
-          <state>Project.out</state>
-        </option>
-        <option>
-          <name>IlinkDebugInfoEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkKeepSymbols</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySymbol</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinarySegment</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkRawBinaryAlign</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkConfigDefines</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkMapFile</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogFile</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogInitialization</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogModule</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogSection</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogVeneer</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfOverride</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile</name>
-          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
-        </option>
-        <option>
-          <name>IlinkIcfFileSlave</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEnableRemarks</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkSuppressDiags</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsRem</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsWarn</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkTreatAsErr</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkWarningsAreErrors</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkUseExtraOptions</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkExtraOptions</name>
-          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
-        </option>
-        <option>
-          <name>IlinkLowLevelInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAutoLibEnable</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkAdditionalLibs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkOverrideProgramEntryLabel</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabelSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkProgramEntryLabel</name>
-          <state>__iar_program_start</state>
-        </option>
-        <option>
-          <name>DoFill</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>FillerByte</name>
-          <state>0xFF</state>
-        </option>
-        <option>
-          <name>FillerStart</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>FillerEnd</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>CrcSize</name>
-          <version>0</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcAlign</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcPoly</name>
-          <state>0x11021</state>
-        </option>
-        <option>
-          <name>CrcCompl</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcBitOrder</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>CrcInitialValue</name>
-          <state>0x0</state>
-        </option>
-        <option>
-          <name>DoCrc</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkBE8Slave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkBufferedTerminalOutput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkStdoutInterfaceSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcFullSize</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIElfToolPostProcess</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogAutoLibSelect</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogRedirSymbols</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkLogUnusedFragments</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcReverseByteOrder</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCrcUseAsInput</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptInline</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsAllow</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptExceptionsForce</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkCmsis</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptMergeDuplSections</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkOptUseVfe</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkOptForceVfe</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackAnalysisEnable</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkStackControlFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkStackCallGraphFile</name>
-          <state></state>
-        </option>
-        <option>
-          <name>CrcAlgorithm</name>
-          <version>1</version>
-          <state>1</state>
-        </option>
-        <option>
-          <name>CrcUnitSize</name>
-          <version>0</version>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkThreadsSlave</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLogCallGraph</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkIcfFile_AltDefault</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IlinkEncInput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutput</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IlinkEncOutputBom</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkHeapSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkLocaleSelect</name>
-          <state>1</state>
-        </option>
-        <option>
-          <name>IlinkTrustzoneImportLibraryOut</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>IARCHIVE</name>
-      <archiveVersion>0</archiveVersion>
-      <data>
-        <version>0</version>
-        <wantNonLocal>1</wantNonLocal>
-        <debug>1</debug>
-        <option>
-          <name>IarchiveInputs</name>
-          <state></state>
-        </option>
-        <option>
-          <name>IarchiveOverride</name>
-          <state>0</state>
-        </option>
-        <option>
-          <name>IarchiveOutput</name>
-          <state>###Uninitialized###</state>
-        </option>
-      </data>
-    </settings>
-    <settings>
-      <name>BILINK</name>
-      <archiveVersion>0</archiveVersion>
-      <data/>
-    </settings>
-  </configuration>
-  <group>
-    <name>Doc</name>
-    <file>
-      <name>$PROJ_DIR$\..\readme.txt</name>
-    </file>
-  </group>
-  <group>
-    <name>Application</name>
-    <group>
-      <name>User</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\main.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
-      </file>
-    </group>
-    <group>
-      <name>EWARM</name>
-      <file>
-        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
-      </file>
-    </group>
-  </group>
-  <group>
-    <name>Drivers</name>
-    <group>
-      <name>BSP</name>
-      <group>
-        <name>STM32WLxx_Nucleo</name>
-        <file>
-          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
-        </file>
-      </group>
-    </group>
-    <group>
-      <name>STM32WLxx_HAL_Driver</name>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
-      </file>
-    </group>
-    <group>
-      <name>CMSIS</name>
-      <file>
-        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
-      </file>
-    </group>
-  </group>
-</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s
deleted file mode 100644
index 1431e7f3..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s
+++ /dev/null
@@ -1,509 +0,0 @@
-;********************************************************************************
-;* File Name          : startup_stm32wl55xx_cm4.s
-;* Author             : MCD Application Team
-;* Description        : M4 core vector table of the STM32WLxxxx devices for the
-;*                      IAR (EWARM) toolchain.
-;*
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == _iar_program_start,
-;*                      - Set the vector table entries with the exceptions ISR
-;*                        address.
-;*                      - Branches to main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the Cortex-M4 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
-;********************************************************************************
-;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
-;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
-;
-;*******************************************************************************
-;
-;
-; The modules in this file are included in the libraries, and may be replaced
-; by any user-defined modules that define the PUBLIC symbol _program_start or
-; a user defined start symbol.
-; To override the cstartup defined in the library, simply add your modified
-; version to the workbench project.
-;
-; The vector table is normally located at address 0.
-; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
-; The name "__vector_table" has special meaning for C-SPY:
-; it is where the SP start value is found, and the NVIC vector
-; table register (VTOR) is initialized to this address if != 0.
-;
-; Cortex-M version
-;
-
-        MODULE  ?cstartup
-
-        ;; Forward declaration of sections.
-        SECTION CSTACK:DATA:NOROOT(3)
-
-        SECTION .intvec:CODE:NOROOT(2)
-
-        EXTERN  __iar_program_start
-        EXTERN  SystemInit
-        PUBLIC  __vector_table
-
-        DATA
-__vector_table
-        DCD     sfe(CSTACK)
-        DCD     Reset_Handler                     ; Reset Handler
-
-        DCD     NMI_Handler                       ; NMI Handler
-        DCD     HardFault_Handler                 ; Hard Fault Handler
-        DCD     MemManage_Handler                 ; MPU Fault Handler
-        DCD     BusFault_Handler                  ; Bus Fault Handler
-        DCD     UsageFault_Handler                ; Usage Fault Handler
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     0                                 ; Reserved
-        DCD     SVC_Handler                       ; SVCall Handler
-        DCD     DebugMon_Handler                  ; Debug Monitor Handler
-        DCD     0                                 ; Reserved
-        DCD     PendSV_Handler                    ; PendSV Handler
-        DCD     SysTick_Handler                   ; SysTick Handler
-
-        ; External Interrupts
-        DCD     WWDG_IRQHandler                   ; Window WatchDog
-        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
-        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
-        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
-        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
-        DCD     RCC_IRQHandler                    ; RCC Interrupt
-        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
-        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
-        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
-        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
-        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
-        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
-        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
-        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
-        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
-        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
-        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
-        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
-        DCD     ADC_IRQHandler                    ; ADC Interrupt
-        DCD     DAC_IRQHandler                    ; DAC Interrupt
-        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
-        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
-        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
-        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
-        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
-        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
-        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
-        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
-        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
-        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
-        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
-        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
-        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
-        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
-        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
-        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
-        DCD     USART1_IRQHandler                 ; USART1 Interrupt
-        DCD     USART2_IRQHandler                 ; USART2 Interrupt
-        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
-        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
-        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
-        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
-        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
-        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
-        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
-        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
-        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
-        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
-        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
-        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
-        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
-        DCD     AES_IRQHandler                    ; AES Interrupt
-        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
-        DCD     PKA_IRQHandler                    ; PKA Interrupt
-        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
-        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
-        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
-        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
-        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
-        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
-        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
-        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Default interrupt handlers.
-;;
-        THUMB
-
-        PUBWEAK Reset_Handler
-        SECTION .text:CODE:NOROOT:REORDER(2)
-Reset_Handler
-        LDR     R0, =SystemInit
-        BLX     R0
-        LDR     R0, =__iar_program_start
-        BX      R0
-
-        PUBWEAK NMI_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-NMI_Handler
-        B NMI_Handler
-
-        PUBWEAK HardFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HardFault_Handler
-        B HardFault_Handler
-
-        PUBWEAK MemManage_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-MemManage_Handler
-        B MemManage_Handler
-
-        PUBWEAK BusFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-BusFault_Handler
-        B BusFault_Handler
-
-        PUBWEAK UsageFault_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-UsageFault_Handler
-        B UsageFault_Handler
-
-        PUBWEAK SVC_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SVC_Handler
-        B SVC_Handler
-
-        PUBWEAK DebugMon_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DebugMon_Handler
-        B DebugMon_Handler
-
-        PUBWEAK PendSV_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PendSV_Handler
-        B PendSV_Handler
-
-        PUBWEAK SysTick_Handler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SysTick_Handler
-        B SysTick_Handler
-
-        PUBWEAK WWDG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-WWDG_IRQHandler
-        B WWDG_IRQHandler
-
-        PUBWEAK PVD_PVM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PVD_PVM_IRQHandler
-        B PVD_PVM_IRQHandler
-
-        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TAMP_STAMP_LSECSS_SSRU_IRQHandler
-        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
-
-        PUBWEAK RTC_WKUP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_WKUP_IRQHandler
-        B RTC_WKUP_IRQHandler
-
-        PUBWEAK FLASH_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-FLASH_IRQHandler
-        B FLASH_IRQHandler
-
-        PUBWEAK RCC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RCC_IRQHandler
-        B RCC_IRQHandler
-
-        PUBWEAK EXTI0_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI0_IRQHandler
-        B EXTI0_IRQHandler
-
-        PUBWEAK EXTI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI1_IRQHandler
-        B EXTI1_IRQHandler
-
-        PUBWEAK EXTI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI2_IRQHandler
-        B EXTI2_IRQHandler
-
-        PUBWEAK EXTI3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI3_IRQHandler
-        B EXTI3_IRQHandler
-
-        PUBWEAK EXTI4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI4_IRQHandler
-        B EXTI4_IRQHandler
-
-        PUBWEAK DMA1_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel1_IRQHandler
-        B DMA1_Channel1_IRQHandler
-
-        PUBWEAK DMA1_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel2_IRQHandler
-        B DMA1_Channel2_IRQHandler
-
-        PUBWEAK DMA1_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel3_IRQHandler
-        B DMA1_Channel3_IRQHandler
-
-        PUBWEAK DMA1_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel4_IRQHandler
-        B DMA1_Channel4_IRQHandler
-
-        PUBWEAK DMA1_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel5_IRQHandler
-        B DMA1_Channel5_IRQHandler
-
-        PUBWEAK DMA1_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel6_IRQHandler
-        B DMA1_Channel6_IRQHandler
-
-        PUBWEAK DMA1_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA1_Channel7_IRQHandler
-        B DMA1_Channel7_IRQHandler
-
-        PUBWEAK ADC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-ADC_IRQHandler
-        B ADC_IRQHandler
-
-        PUBWEAK DAC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DAC_IRQHandler
-        B DAC_IRQHandler
-
-        PUBWEAK C2SEV_PWR_C2H_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-C2SEV_PWR_C2H_IRQHandler
-        B C2SEV_PWR_C2H_IRQHandler
-
-        PUBWEAK COMP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-COMP_IRQHandler
-        B COMP_IRQHandler
-
-        PUBWEAK EXTI9_5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI9_5_IRQHandler
-        B EXTI9_5_IRQHandler
-
-        PUBWEAK TIM1_BRK_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_BRK_IRQHandler
-        B TIM1_BRK_IRQHandler
-
-        PUBWEAK TIM1_UP_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_UP_IRQHandler
-        B TIM1_UP_IRQHandler
-
-        PUBWEAK TIM1_TRG_COM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_TRG_COM_IRQHandler
-        B TIM1_TRG_COM_IRQHandler
-
-        PUBWEAK TIM1_CC_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM1_CC_IRQHandler
-        B TIM1_CC_IRQHandler
-
-        PUBWEAK TIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM2_IRQHandler
-        B TIM2_IRQHandler
-
-        PUBWEAK TIM16_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM16_IRQHandler
-        B TIM16_IRQHandler
-
-        PUBWEAK TIM17_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-TIM17_IRQHandler
-        B TIM17_IRQHandler
-
-        PUBWEAK I2C1_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_EV_IRQHandler
-        B I2C1_EV_IRQHandler
-
-        PUBWEAK I2C1_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C1_ER_IRQHandler
-        B I2C1_ER_IRQHandler
-
-        PUBWEAK I2C2_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_EV_IRQHandler
-        B I2C2_EV_IRQHandler
-
-        PUBWEAK I2C2_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C2_ER_IRQHandler
-        B I2C2_ER_IRQHandler
-
-        PUBWEAK SPI1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI1_IRQHandler
-        B SPI1_IRQHandler
-
-        PUBWEAK SPI2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SPI2_IRQHandler
-        B SPI2_IRQHandler
-
-        PUBWEAK USART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART1_IRQHandler
-        B USART1_IRQHandler
-
-        PUBWEAK USART2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-USART2_IRQHandler
-        B USART2_IRQHandler
-
-        PUBWEAK LPUART1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPUART1_IRQHandler
-        B LPUART1_IRQHandler
-
-        PUBWEAK LPTIM1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM1_IRQHandler
-        B LPTIM1_IRQHandler
-
-        PUBWEAK LPTIM2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM2_IRQHandler
-        B LPTIM2_IRQHandler
-
-        PUBWEAK EXTI15_10_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-EXTI15_10_IRQHandler
-        B EXTI15_10_IRQHandler
-
-        PUBWEAK RTC_Alarm_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RTC_Alarm_IRQHandler
-        B RTC_Alarm_IRQHandler
-
-        PUBWEAK LPTIM3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-LPTIM3_IRQHandler
-        B LPTIM3_IRQHandler
-
-        PUBWEAK SUBGHZSPI_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZSPI_IRQHandler
-        B SUBGHZSPI_IRQHandler
-
-        PUBWEAK IPCC_C1_RX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_RX_IRQHandler
-        B IPCC_C1_RX_IRQHandler
-
-        PUBWEAK IPCC_C1_TX_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-IPCC_C1_TX_IRQHandler
-        B IPCC_C1_TX_IRQHandler
-
-        PUBWEAK HSEM_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-HSEM_IRQHandler
-        B HSEM_IRQHandler
-
-        PUBWEAK I2C3_EV_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_EV_IRQHandler
-        B I2C3_EV_IRQHandler
-
-        PUBWEAK I2C3_ER_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-I2C3_ER_IRQHandler
-        B I2C3_ER_IRQHandler
-
-        PUBWEAK SUBGHZ_Radio_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-SUBGHZ_Radio_IRQHandler
-        B SUBGHZ_Radio_IRQHandler
-
-        PUBWEAK AES_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-AES_IRQHandler
-        B AES_IRQHandler
-
-        PUBWEAK RNG_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-RNG_IRQHandler
-        B RNG_IRQHandler
-
-        PUBWEAK PKA_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-PKA_IRQHandler
-        B PKA_IRQHandler
-
-        PUBWEAK DMA2_Channel1_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel1_IRQHandler
-        B DMA2_Channel1_IRQHandler
-
-        PUBWEAK DMA2_Channel2_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel2_IRQHandler
-        B DMA2_Channel2_IRQHandler
-
-        PUBWEAK DMA2_Channel3_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel3_IRQHandler
-        B DMA2_Channel3_IRQHandler
-
-        PUBWEAK DMA2_Channel4_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel4_IRQHandler
-        B DMA2_Channel4_IRQHandler
-
-        PUBWEAK DMA2_Channel5_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel5_IRQHandler
-        B DMA2_Channel5_IRQHandler
-
-        PUBWEAK DMA2_Channel6_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel6_IRQHandler
-        B DMA2_Channel6_IRQHandler
-
-        PUBWEAK DMA2_Channel7_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMA2_Channel7_IRQHandler
-        B DMA2_Channel7_IRQHandler
-
-        PUBWEAK DMAMUX1_OVR_IRQHandler
-        SECTION .text:CODE:NOROOT:REORDER(1)
-DMAMUX1_OVR_IRQHandler
-        B DMAMUX1_OVR_IRQHandler
-
-        END
-
-;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf
deleted file mode 100644
index e9afe044..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf
+++ /dev/null
@@ -1,41 +0,0 @@
-/*###ICF### Set of symbols used in UserApp project ****/
-
-define memory mem with size = 4G;
-
-/******************************************************************************/
-/*       Include of SBSFU symbols file                                        */
-/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
-/*   specify the the directory to search for include files                    */
-/******************************************************************************/
-include "mapping_sbsfu.icf";
-include "mapping_fwimg.icf";
-
-/*-Memory Regions-*/
-define symbol __ICFEDIT_region_M4_APP_ROM_start__ = __ICFEDIT_SLOT_Active_2_start__ + 512;
-
-/*-Sizes-*/
-define symbol __ICFEDIT_size_cstack__ = 0x800;
-define symbol __ICFEDIT_size_heap__ = 0x200;
-
-define region M4_APP_ROM_region      = mem:[from __ICFEDIT_region_M4_APP_ROM_start__ to __ICFEDIT_SLOT_Active_2_end__];
-
-/* to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes) */
-define root section aes_block_padding with alignment=16
-{
-udata8 "Force Alignment";
-pad_to 16;
-};
-
-define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
-define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
-
-initialize by copy { readwrite };
-do not initialize  { section .noinit };
-
-/******************************************************************************/
-/*                          placement instructions                            */
-/******************************************************************************/
-place at address mem:__ICFEDIT_region_M4_APP_ROM_start__ { readonly section .intvec };
-place in M4_APP_ROM_region   { readonly, last section aes_block_padding };
-place in M4_APP_RAM_region   { readwrite, block CSTACK, block HEAP };
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h
deleted file mode 100644
index 6b8db4f7..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_nucleo_conf.h
-  * @author  MCD Application Team
-  * @brief   STM32WLxx_Nucleo board configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef STM32WLXX_NUCLEO_CONF_H
-#define STM32WLXX_NUCLEO_CONF_H
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx_hal.h"
-
-/** @addtogroup BSP
-  * @{
-  */
-
-/** @addtogroup STM32WLXX_NUCLEO
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
-  * @{
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
-  * @{
-  */
-/* COM usage define */
-#define USE_BSP_COM_FEATURE                 0U
-
-/* COM log define */
-#define USE_COM_LOG                         0U
-
-/* IRQ priorities */
-#define BSP_BUTTON_SWx_IT_PRIORITY         15U
-   
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     100U
-
-/* Indicates whether or not TCXO is supported by the board
- * 0: TCXO not supported
- * 1: TCXO supported
- */
-#define IS_TCXO_SUPPORTED                   0U
-
-/* Indicates whether or not DCDC is supported by the board
- * 0: DCDC not supported
- * 1: DCDC supported
- */
-#define IS_DCDC_SUPPORTED                   1U
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* STM32WLXX_NUCLEO_CONF_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx
deleted file mode 100644
index 6658eaad..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx
+++ /dev/null
@@ -1,502 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
-
-  <SchemaVersion>2.1</SchemaVersion>
-
-  <Header>### uVision Project, (C) Keil Software</Header>
-
-  <Targets>
-    <Target>
-      <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M4</TargetName>
-      <ToolsetNumber>0x4</ToolsetNumber>
-      <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
-      <TargetOption>
-        <TargetCommonOption>
-          <Device>STM32WL55JCIx:CM4</Device>
-          <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.4</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
-          <FlashUtilSpec></FlashUtilSpec>
-          <StartupFile></StartupFile>
-          <FlashDriverDll></FlashDriverDll>
-          <DeviceId>0</DeviceId>
-          <RegisterFile></RegisterFile>
-          <MemoryEnv></MemoryEnv>
-          <Cmp></Cmp>
-          <Asm></Asm>
-          <Linker></Linker>
-          <OHString></OHString>
-          <InfinionOptionDll></InfinionOptionDll>
-          <SLE66CMisc></SLE66CMisc>
-          <SLE66AMisc></SLE66AMisc>
-          <SLE66LinkerMisc></SLE66LinkerMisc>
-          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
-          <bCustSvd>0</bCustSvd>
-          <UseEnv>0</UseEnv>
-          <BinPath></BinPath>
-          <IncludePath></IncludePath>
-          <LibPath></LibPath>
-          <RegisterFilePath></RegisterFilePath>
-          <DBRegisterFilePath></DBRegisterFilePath>
-          <TargetStatus>
-            <Error>0</Error>
-            <ExitCodeStop>0</ExitCodeStop>
-            <ButtonStop>0</ButtonStop>
-            <NotGenerated>0</NotGenerated>
-            <InvalidFlash>1</InvalidFlash>
-          </TargetStatus>
-          <OutputDirectory>STM32WL55JC_Nucleo\Exe\</OutputDirectory>
-          <OutputName>UserApp_CM4</OutputName>
-          <CreateExecutable>1</CreateExecutable>
-          <CreateLib>0</CreateLib>
-          <CreateHexFile>0</CreateHexFile>
-          <DebugInformation>1</DebugInformation>
-          <BrowseInformation>1</BrowseInformation>
-          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
-          <HexFormatSelection>1</HexFormatSelection>
-          <Merge32K>0</Merge32K>
-          <CreateBatchFile>0</CreateBatchFile>
-          <BeforeCompile>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopU1X>0</nStopU1X>
-            <nStopU2X>0</nStopU2X>
-          </BeforeCompile>
-          <BeforeMake>
-            <RunUserProg1>0</RunUserProg1>
-            <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name></UserProg1Name>
-            <UserProg2Name></UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopB1X>0</nStopB1X>
-            <nStopB2X>0</nStopB2X>
-          </BeforeMake>
-          <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
-            <RunUserProg2>1</RunUserProg2>
-            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
-            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 2 1</UserProg2Name>
-            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
-            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
-            <nStopA1X>0</nStopA1X>
-            <nStopA2X>0</nStopA2X>
-          </AfterMake>
-          <SelectedForBatchBuild>1</SelectedForBatchBuild>
-          <SVCSIdString></SVCSIdString>
-        </TargetCommonOption>
-        <CommonProperty>
-          <UseCPPCompiler>0</UseCPPCompiler>
-          <RVCTCodeConst>0</RVCTCodeConst>
-          <RVCTZI>0</RVCTZI>
-          <RVCTOtherData>0</RVCTOtherData>
-          <ModuleSelection>0</ModuleSelection>
-          <IncludeInBuild>1</IncludeInBuild>
-          <AlwaysBuild>0</AlwaysBuild>
-          <GenerateAssemblyFile>0</GenerateAssemblyFile>
-          <AssembleAssemblyFile>0</AssembleAssemblyFile>
-          <PublicsOnly>0</PublicsOnly>
-          <StopOnExitCode>3</StopOnExitCode>
-          <CustomArgument></CustomArgument>
-          <IncludeLibraryModules></IncludeLibraryModules>
-          <ComprImg>0</ComprImg>
-        </CommonProperty>
-        <DllOption>
-          <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments>-REMAP -MPU</SimDllArguments>
-          <SimDlgDll>DCM.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
-          <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments>-MPU</TargetDllArguments>
-          <TargetDlgDll>TCM.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
-        </DllOption>
-        <DebugOption>
-          <OPTHX>
-            <HexSelection>1</HexSelection>
-            <HexRangeLowAddress>0</HexRangeLowAddress>
-            <HexRangeHighAddress>0</HexRangeHighAddress>
-            <HexOffset>0</HexOffset>
-            <Oh166RecLen>16</Oh166RecLen>
-          </OPTHX>
-        </DebugOption>
-        <Utilities>
-          <Flash1>
-            <UseTargetDll>1</UseTargetDll>
-            <UseExternalTool>0</UseExternalTool>
-            <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
-            <Capability>1</Capability>
-            <DriverSelection>4101</DriverSelection>
-          </Flash1>
-          <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
-          <Flash4></Flash4>
-          <pFcarmOut></pFcarmOut>
-          <pFcarmGrp></pFcarmGrp>
-          <pFcArmRoot></pFcArmRoot>
-          <FcArmLst>0</FcArmLst>
-        </Utilities>
-        <TargetArmAds>
-          <ArmAdsMisc>
-            <GenerateListings>0</GenerateListings>
-            <asHll>1</asHll>
-            <asAsm>1</asAsm>
-            <asMacX>1</asMacX>
-            <asSyms>1</asSyms>
-            <asFals>1</asFals>
-            <asDbgD>1</asDbgD>
-            <asForm>1</asForm>
-            <ldLst>0</ldLst>
-            <ldmm>1</ldmm>
-            <ldXref>1</ldXref>
-            <BigEnd>0</BigEnd>
-            <AdsALst>1</AdsALst>
-            <AdsACrf>1</AdsACrf>
-            <AdsANop>0</AdsANop>
-            <AdsANot>0</AdsANot>
-            <AdsLLst>1</AdsLLst>
-            <AdsLmap>1</AdsLmap>
-            <AdsLcgr>1</AdsLcgr>
-            <AdsLsym>1</AdsLsym>
-            <AdsLszi>1</AdsLszi>
-            <AdsLtoi>1</AdsLtoi>
-            <AdsLsun>1</AdsLsun>
-            <AdsLven>1</AdsLven>
-            <AdsLsxf>1</AdsLsxf>
-            <RvctClst>0</RvctClst>
-            <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"Cortex-M4"</AdsCpuType>
-            <RvctDeviceName></RvctDeviceName>
-            <mOS>0</mOS>
-            <uocRom>0</uocRom>
-            <uocRam>0</uocRam>
-            <hadIROM>0</hadIROM>
-            <hadIRAM>0</hadIRAM>
-            <hadXRAM>0</hadXRAM>
-            <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
-            <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>0</hadIROM2>
-            <StupSel>8</StupSel>
-            <useUlib>1</useUlib>
-            <EndSel>0</EndSel>
-            <uLtcg>0</uLtcg>
-            <nSecure>0</nSecure>
-            <RoSelD>3</RoSelD>
-            <RwSelD>4</RwSelD>
-            <CodeSel>0</CodeSel>
-            <OptFeed>0</OptFeed>
-            <NoZi1>0</NoZi1>
-            <NoZi2>0</NoZi2>
-            <NoZi3>0</NoZi3>
-            <NoZi4>0</NoZi4>
-            <NoZi5>0</NoZi5>
-            <Ro1Chk>0</Ro1Chk>
-            <Ro2Chk>0</Ro2Chk>
-            <Ro3Chk>0</Ro3Chk>
-            <Ir1Chk>1</Ir1Chk>
-            <Ir2Chk>0</Ir2Chk>
-            <Ra1Chk>0</Ra1Chk>
-            <Ra2Chk>0</Ra2Chk>
-            <Ra3Chk>0</Ra3Chk>
-            <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
-            <OnChipMemories>
-              <Ocm1>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm1>
-              <Ocm2>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm2>
-              <Ocm3>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm3>
-              <Ocm4>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm4>
-              <Ocm5>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm5>
-              <Ocm6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </Ocm6>
-              <IRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </IRAM>
-              <IROM>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </IROM>
-              <XRAM>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </XRAM>
-              <OCR_RVCT1>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT1>
-              <OCR_RVCT2>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT2>
-              <OCR_RVCT3>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT3>
-              <OCR_RVCT4>
-                <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
-              </OCR_RVCT4>
-              <OCR_RVCT5>
-                <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT5>
-              <OCR_RVCT6>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT6>
-              <OCR_RVCT7>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT7>
-              <OCR_RVCT8>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT8>
-              <OCR_RVCT9>
-                <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
-              </OCR_RVCT9>
-              <OCR_RVCT10>
-                <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
-              </OCR_RVCT10>
-            </OnChipMemories>
-            <RvctStartVector></RvctStartVector>
-          </ArmAdsMisc>
-          <Cads>
-            <interw>1</interw>
-            <Optim>4</Optim>
-            <oTime>0</oTime>
-            <SplitLS>0</SplitLS>
-            <OneElfS>1</OneElfS>
-            <Strict>0</Strict>
-            <EnumInt>0</EnumInt>
-            <PlainCh>0</PlainCh>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
-            <uThumb>0</uThumb>
-            <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
-            <uGnu>0</uGnu>
-            <useXO>0</useXO>
-            <v6Lang>5</v6Lang>
-            <v6LangP>3</v6LangP>
-            <vShortEn>0</vShortEn>
-            <vShortWch>0</vShortWch>
-            <v6Lto>0</v6Lto>
-            <v6WtE>0</v6WtE>
-            <v6Rtti>0</v6Rtti>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
-              <Undefine></Undefine>
-              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../Linker_Common/MDK-ARM;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
-            </VariousControls>
-          </Cads>
-          <Aads>
-            <interw>1</interw>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <thumb>0</thumb>
-            <SplitLS>0</SplitLS>
-            <SwStkChk>0</SwStkChk>
-            <NoWarn>0</NoWarn>
-            <uSurpInc>0</uSurpInc>
-            <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
-            <VariousControls>
-              <MiscControls></MiscControls>
-              <Define></Define>
-              <Undefine></Undefine>
-              <IncludePath></IncludePath>
-            </VariousControls>
-          </Aads>
-          <LDads>
-            <umfTarg>0</umfTarg>
-            <Ropi>0</Ropi>
-            <Rwpi>0</Rwpi>
-            <noStLib>0</noStLib>
-            <RepFail>1</RepFail>
-            <useFile>0</useFile>
-            <TextAddressRange></TextAddressRange>
-            <DataAddressRange></DataAddressRange>
-            <pXoBase></pXoBase>
-            <ScatterFile>.\UserApp_cm4.sct</ScatterFile>
-            <IncludeLibs></IncludeLibs>
-            <IncludeLibsPath></IncludeLibsPath>
-            <Misc></Misc>
-            <LinkerInputFile></LinkerInputFile>
-            <DisabledWarnings></DisabledWarnings>
-          </LDads>
-        </TargetArmAds>
-      </TargetOption>
-      <Groups>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
-            <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>.\startup_stm32wl55xx_cm4.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/User</GroupName>
-          <Files>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/main.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/stm32wlxx_it.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
-            <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>../readme.txt</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_nucleo.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Src/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>::CMSIS</GroupName>
-        </Group>
-      </Groups>
-    </Target>
-  </Targets>
-
-  <RTE>
-    <apis/>
-    <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
-        <targetInfos>
-          <targetInfo name="STM32WL55JC_Nucleo_2_Images_UserApp_M4"/>
-        </targetInfos>
-      </component>
-    </components>
-    <files/>
-  </RTE>
-
-</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct
deleted file mode 100644
index 1ca3157f..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct
+++ /dev/null
@@ -1,28 +0,0 @@
-#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
-; *************************************************************
-; *** Scatter-Loading Description File generated by uVision ***
-; *************************************************************
-#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
-#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
-
-LR_ROM (SLOT_ACTIVE_2_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
-  vector_start (SLOT_ACTIVE_2_START + 0x200) FIXED VECTOR_SIZE {
-  *.o (RESET, +First)
-  }
-  ROM_region +0 {
-  *(InRoot$$Sections)
-  .ANY (+RO)
-  }
-  RAM_region M4_APP_REGION_RAM_START M4_APP_RAM_REGION_SIZE {
-  .ANY (STACK)
-  .ANY (HEAP)
-  .ANY (+RW +ZI)
-  }
-}
-
-; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes)
-LR_ROM1(+0) ALIGN(16) {
-  ForAlignment +0 {
-    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
-  }
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject
deleted file mode 100644
index bda55778..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="UserApp_cm4" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;2&quot; &quot;1&quot;" prebuildStep="">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  ||  || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/2_Images_UserApp_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../../Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
-									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp_cm4.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.401807756" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="2_Images_UserApp_CM4.null.394363235" name="2_Images_UserApp_CM4"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope"/>
-</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch
deleted file mode 100644
index 53b73c95..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
-<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\UserApp_cm4.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_UserApp_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="C:\git\wl_master\Firmware\Projects\NUCLEO-WL55JC\Applications\SBSFU_2_Images_DualCore\2_Images_UserApp_M4\STM32CubeIDE\Debug\st-link_gdbserver_log.txt"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
-<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
-<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
-<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
-<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
-<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
-<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
-<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
-<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\UserApp_cm4.elf"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_UserApp_CM4"/>
-<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
-<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/2_Images_UserApp_CM4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c
deleted file mode 100644
index 5cd0af84..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32wlxx_it.c
-  * @author  MCD Application Team
-  * @brief   Main Interrupt Service Routines.
-  *          This file provides template for all exceptions handler and
-  *          peripherals interrupt service routine.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "stm32wlxx_it.h"
-
-/** @addtogroup USER_APP User App Example
-  * @{
-  */
-
-/** @addtogroup USER_APP_COMMON Common
-  * @{
-  */
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/******************************************************************************/
-/*            Cortex-M4 Processor Exceptions Handlers                         */
-/******************************************************************************/
-
-/**
-  * @brief  This function handles NMI exception.
-  * @param  None
-  * @retval None
-  */
-void NMI_Handler(void)
-{
-  /* Go to infinite loop when NMI exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Hard Fault exception.
-  * @param  None
-  * @retval None
-  */
-void HardFault_Handler(void)
-{
-  /* Go to infinite loop when Hard Fault exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Memory Manage exception.
-  * @param  None
-  * @retval None
-  */
-void MemManage_Handler(void)
-{
-  /* Go to infinite loop when Memory Manage exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Bus Fault exception.
-  * @param  None
-  * @retval None
-  */
-void BusFault_Handler(void)
-{
-  /* Go to infinite loop when Bus Fault exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles Usage Fault exception.
-  * @param  None
-  * @retval None
-  */
-void UsageFault_Handler(void)
-{
-  /* Go to infinite loop when Usage Fault exception occurs */
-  while (1)
-  {
-  }
-}
-
-/**
-  * @brief  This function handles SVCall exception.
-  * @param  None
-  * @retval None
-  */
-void SVC_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles Debug Monitor exception.
-  * @param  None
-  * @retval None
-  */
-void DebugMon_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles PendSVC exception.
-  * @param  None
-  * @retval None
-  */
-void PendSV_Handler(void)
-{
-}
-
-/**
-  * @brief  This function handles SysTick Handler.
-  * @param  None
-  * @retval None
-  */
-void SysTick_Handler(void)
-{
-  HAL_IncTick();
-}
-
-/******************************************************************************/
-/*                 STM32WLxx Peripherals Interrupt Handlers             */
-/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
-/*  available peripheral interrupt handler's name please refer to the startup */
-/*  file (startup_stm32wlxx.s).                                         */
-/******************************************************************************/
-
-/**
-  * @brief  This function handles PPP interrupt request.
-  * @param  None
-  * @retval None
-  */
-/*void PPP_IRQHandler(void)
-{
-}*/
-
-
-/**
-  * @}
-  */
-
-/**
-  * @}
-  */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
deleted file mode 100644
index 681a6e40..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-** LinkerScript
-*/
-
-/******************************************************************************/
-/*                               M4 ROM section                               */
-/******************************************************************************/
-
-/* M4 Vector table */
-M4_INTVECT_start               = 0x08000000;
-M4_SB_region_ROM_start         = M4_INTVECT_start;
-M4_Vector_size                 = 0x200;
-
-/* M4 SB Code region */
-M4_SB_Code_region_ROM_start    = M4_INTVECT_start + M4_Vector_size;
-M4_SB_Code_region_ROM_end      = 0x080057FF;
-M4_SB_region_ROM_end           = M4_SB_Code_region_ROM_end;
-
-/* ROM regions size definition */
-M4_SB_Code_region_ROM_size     = M4_SB_Code_region_ROM_end - M4_SB_Code_region_ROM_start + 0x1;
-
-/******************************************************************************/
-/*                               M0+ ROM section                              */
-/******************************************************************************/
-
-/* KMS Data Storage (NVMS) region protected area */
-/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
-KMS_DataStorage_start          = 0x0802A000;
-KMS_DataStorage_end            = KMS_DataStorage_start + 0x1FFF;
-
-/* SE IF ROM: used to locate Secure Engine interface Code out of MPU isolation     */
-SE_IF_region_ROM_start         = KMS_DataStorage_end + 0x1; 
-SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0x17FF;
-
-/* SBSFU Code region */
-SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
-SB_region_ROM_end              = 0x080367FF;
-
-/* M0 Vector table with alignment constraint on Vector_size */
-INTVECT_start                  = 0x08036800;
-Vector_size                    = 0x200;
-C2_BOOT_BASE_ADDR              = INTVECT_start;
-
-/* SE Code region protected by MPU isolation */
-SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
-SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start + 0x4;
-SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
-
-/* SE Startup */
-SE_Startup_region_ROM_start    = SE_CallGate_region_ROM_end + 0x1;
-SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
-
-/* SE Embedded Keys */
-SE_Key_region_ROM_start        = 0x0803E800;
-SE_Key_region_ROM_end          = 0x0803EFFF;
-SE_Code_region_ROM_end         = SE_Key_region_ROM_end;
-
-/* ROM regions size definition */
-KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
-SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
-SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
-SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
-SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
-SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
-SE_Code_NoKey_region_ROM_size  = SE_Key_region_ROM_start - SE_Code_NoKey_region_ROM_start;
-SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
-
-/******************************************************************************/
-/*                              RAM section                                   */
-/*                                                                            */
-/******************************************************************************/
-
-/* M4 SB */
-M4_SB_region_RAM_start         = 0x20000000;
-M4_SB_region_RAM_end           = M4_SB_region_RAM_start + 0xCDF;
-
-/* M0+/M4 Synchronization flag */
-M4_M0PLUS_flag_RAM_start       = M4_SB_region_RAM_end + 0x1;
-M4_M0PLUS_flag_RAM_end         = M4_M0PLUS_flag_RAM_start + 0x1F;
-
-/* M4 UserApp : allocation limited to half RAM size */
-M4_APP_region_RAM_start        = M4_M0PLUS_flag_RAM_end + 0x1;
-M4_APP_region_RAM_end          = 0x20007FFF;
-
-/* SBSFU RAM region */
-SB_region_RAM_start            = M4_APP_region_RAM_end + 0x1;
-SB_region_RAM_end              = 0x2000CBFF;
-
-/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000CC00 */
-SE_region_RAM_start            = SB_region_RAM_end + 0x1;
-SE_region_RAM_stack_top        = SE_region_RAM_start + 0xC00;                /* Secure Engine's private stack */
-SE_region_RAM_end              = 0x2000FFFF;
-
-/* RAM regions size definition */
-M4_SB_region_RAM_size          = M4_SB_region_RAM_end - M4_SB_region_RAM_start + 0x1;
-M4_APP_region_RAM_size         = M4_APP_region_RAM_end - M4_APP_region_RAM_start + 0x1;
-SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
-SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
-
-/******************************************************************************/
-/*                              RAM/ROM regions                               */
-/*                                                                            */
-/******************************************************************************/
-
-MEMORY
-{
- M4_INTVECT_ROM_region (rx)       : ORIGIN = M4_INTVECT_start, LENGTH = M4_Vector_size
- M4_SB_Code_ROM_region (rx)       : ORIGIN = M4_SB_Code_region_ROM_start, LENGTH = M4_SB_Code_region_ROM_size
- SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
- SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
- INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
- SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
- SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
- SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
- SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
- SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
- M4_SB_RAM_region (xrw)           : ORIGIN = M4_SB_region_RAM_start, LENGTH = M4_SB_region_RAM_size
- SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
- SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/iv.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/iv.bin
new file mode 100644
index 00000000..87418a0d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Binary/iv.bin
@@ -0,0 +1 @@
+�!Eˠ;P=����+�f
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
new file mode 100644
index 00000000..b0959594
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
new file mode 100644
index 00000000..6f66889b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
@@ -0,0 +1,1054 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\KMS_Blob.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..e6140477
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,21 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+
+define region ROM_region   = mem:[from 0 to 0x8000];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+
+place in ROM_region   { section .KMS_blob_Keys, last section aes_block_padding };
+keep { section .KMS_blob_Keys };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
new file mode 100644
index 00000000..ec939c17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
@@ -0,0 +1,14 @@
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+
+; *** regions needed by KMS_Blob project ***
+LR_ROM (0x00000000) ALIGN(16) {
+  ROM_region +0 {
+  *(.KMS_blob_Keys)
+  .ANY (+RO)
+  }
+  ALIGN_region +0 ALIGN(16) EMPTY(16) {
+  }
+} 
+ 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..35a88778
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>1</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>0</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>BIN\UL2CM3.DLL</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_blob_example_keys.c</PathWithFileName>
+      <FilenameWithoutPath>kms_blob_example_keys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..efc3799c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>KMS_blob</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../2_Images_SECoreBin/Inc</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>0</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>KMS_Blob.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--diag_suppress L6305W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>kms_blob_example_keys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_KMS_Blob"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..4056ed95
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../2_Images_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/KMS_Blob.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_KMS_Blob.null.1082786794" name="2_Images_KMS_Blob"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1256424455.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1003497030;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1841871715">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
new file mode 100644
index 00000000..364b1864
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_KMS_Blob</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_blob_example_keys.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_blob_example_keys.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
new file mode 100644
index 00000000..cf21882e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
@@ -0,0 +1,29 @@
+/*
+** LinkerScript
+*/
+
+APPLI_region_ROM_start    = 0x00000000;
+APPLI_region_ROM_length   = 0x8000;
+
+/* Specify the memory areas */
+MEMORY
+{
+ APPLI_region_ROM  : ORIGIN = APPLI_region_ROM_start, LENGTH = APPLI_region_ROM_length
+}
+
+/* Define output sections */
+SECTIONS
+{
+  .rodata :
+  {
+    . = ALIGN(16);
+    KEEP(*(.KMS_blob_Keys))
+    . = ALIGN(16);
+  } >APPLI_region_ROM
+  
+  /DISCARD/ :
+  {
+    *(.init)
+    *(.fini)
+  }
+}
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
new file mode 100644
index 00000000..64af9746
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
@@ -0,0 +1,153 @@
+/**
+  ******************************************************************************
+  * @file    kms_blob_example_key.c
+  * @author  MCD Application Team
+  * @brief   Key Management Services module.
+  *          This file provides examples of data to be loaded as a blob
+  *          (provisioning).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#if !defined(KMS_ENABLED)
+#define KMS_ENABLED
+#endif /* KMS_ENABLED */
+
+#include "kms.h"
+#include "kms_platf_objects_interface.h"
+
+/* Custom Structures declaration */
+KMS_DECLARE_BLOB_STRUCT(, 225)
+KMS_DECLARE_BLOB_STRUCT(, 36)
+
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".KMS_blob_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".KMS_blob_Keys"
+#else
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* __ICCARM__ */
+
+const kms_obj_keyhead_225_t   Test_Key_RSA_2048 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,          /*   uint32_t configuration;     */
+  900,                             /*   uint32_t blobs_size;        */
+  11,                              /*   uint32_t blobs_count;       */
+  KMS_KEY_RSA2048_OBJECT_HANDLE,   /*   uint32_t object_id;         */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PRIVATE_KEY,               /* CLASS = PRIVATE KEY */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_RSA,                           /* TYPE = RSA KEY */
+    CKA_TOKEN,        4, CK_TRUE,
+    CKA_LABEL,        16, 0x52455355U, 0x424F4C42U, 0x20415352U, 0x38343032U, /* 'USER', 'BLOB', 'RSA ', '2048' */
+    CKA_ID,           4, 123,
+    CKA_SENSITIVE,    4, CK_TRUE,                                             /* SENSITIVE KEY */
+    CKA_VERIFY,       4, CK_TRUE,                                             /* CAN BE USED FOR VERIFICATION */
+    CKA_SIGN,         4, CK_TRUE,                                             /* CAN BE USED FOR SIGNATURE */
+
+    CKA_MODULUS,      256,                                                    /* RSA KEY MODULUS */
+    0xcea80475U, 0x324c1dc8U, 0x34782781U, 0x8da58bacU,
+    0x069d3419U, 0xc614a6eaU, 0x1ac6a3b5U, 0x10dcd72cU,
+    0xc5169549U, 0x05e9fef9U, 0x08d45e13U, 0x006adf27U,
+    0xd467a7d8U, 0x3c111d1aU, 0x5df15ef2U, 0x93771aefU,
+    0xb920032aU, 0x5bb989f8U, 0xe4f5e1b0U, 0x5093d3f1U,
+    0x30f984c0U, 0x7a772a36U, 0x83f4dc6fU, 0xb28a9681U,
+    0x5b32123cU, 0xcdd13954U, 0xf19d5b8bU, 0x24a103e7U,
+    0x71a34c32U, 0x8755c65eU, 0xd64e1924U, 0xffd04d30U,
+    0xb2142cc2U, 0x62f6e004U, 0x8fef6dbcU, 0x652f2147U,
+    0x9ea1c4b1U, 0xd66d28f4U, 0xd46ef718U, 0x5e390cbfU,
+    0xa2e02380U, 0x582f3188U, 0xbb94ebbfU, 0x05d31487U,
+    0xa09aff01U, 0xfcbb4cd4U, 0xbfd1f0a8U, 0x33b38c11U,
+    0x813c8436U, 0x0bb53c7dU, 0x4481031cU, 0x40bad871U,
+    0x3bb6b835U, 0xcb08098eU, 0xd15ba31eU, 0xe4ba728aU,
+    0x8c8e10f7U, 0x294e1b41U, 0x63b7aee5U, 0x7277bfd8U,
+    0x81a6f9d4U, 0x3e02c692U, 0x5aa3a043U, 0xfb7fb78dU,
+
+    CKA_PUBLIC_EXPONENT, 256,                                                  /* RSA PUBLIC EXPONENT */
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00260445U,
+
+
+    CKA_PRIVATE_EXPONENT, 256,                                                  /* RSA PRIVATE EXPONENT */
+    0x0997634cU, 0x477c1a03U, 0x9d44c810U, 0xb2aaa3c7U,
+    0x862b0b88U, 0xd3708272U, 0xe1e15f66U, 0xfc938970U,
+    0x9f8a11f3U, 0xea6a5af7U, 0xeffa2d01U, 0xc189c50fU,
+    0x0d5bcbe3U, 0xfa272e56U, 0xcfc4a4e1U, 0xd388a9dcU,
+    0xd65df862U, 0x8902556cU, 0x8b6bb6a6U, 0x41709b5aU,
+    0x35dd2622U, 0xc73d4640U, 0xbfa1359dU, 0x0e76e1f2U,
+    0x19f8e33eU, 0xb9bd0b59U, 0xec198eb2U, 0xfccaae03U,
+    0x46bd8b40U, 0x1e12e3c6U, 0x7cb62956U, 0x9c185a2eU,
+    0x0f35a2f7U, 0x41644c1cU, 0xca5ebb13U, 0x9d77a89aU,
+    0x2953fc5eU, 0x30048c0eU, 0x619f07c8U, 0xd21d1e56U,
+    0xb8af0719U, 0x3d0fdf3fU, 0x49cd49f2U, 0xef3138b5U,
+    0x138862f1U, 0x470bd2d1U, 0x6e34a2b9U, 0xe7777a6cU,
+    0x8c8d4cb9U, 0x4b4e8b5dU, 0x616cd539U, 0x3753e7b0U,
+    0xf31cc7daU, 0x559ba8e9U, 0x8d888914U, 0xe334773bU,
+    0xaf498ad8U, 0x8d9631ebU, 0x5fe32e53U, 0xa4145bf0U,
+    0xba548bf2U, 0xb0a50c63U, 0xf67b14e3U, 0x98a34b0dU,
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* (__GNUC__) */
+
+const kms_obj_keyhead_36_t   Test_Key_AES256_Derivable =
+{
+  KMS_ABI_VERSION_CK_2_40,                /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,                 /*   uint32_t configuration;     */
+  144,                                    /*   uint32_t blobs_size;        */
+  8,                                      /*   uint32_t blobs_count;       */
+  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE, /*   uint32_t object_id;         */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_AES,                          /* TYPE = AES KEY */
+    CKA_VALUE,        32, 0x603deb10U, 0x15ca71beU, 0x2b73aef0U, 0x857d7781U,
+    0x1f352c07U, 0x3b6108d7U, 0x2d9810a3U, 0x0914dff4U,
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO ENCRYPT */
+    CKA_DECRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO DECRYPT */
+    CKA_TOKEN,        sizeof(CK_BBOOL), CK_TRUE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,               /* CLASS = SECRET KEY */
+    CKA_DERIVE,       sizeof(CK_BBOOL), (uint8_t)CK_TRUE,                    /* CAN BE USED TO DERIVE A NEW KEY */
+    CKA_LABEL,        24, 0x52455355U, 0x424F4C42U, 0x50595243U, 0x49524544U, 0x4C424156U, 0x00000045U,
+    /* 'USER', 'BLOB', 'CRYP', 'DERI', 'VABL', 'E' */
+  }
+};
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_function_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif /* (__ICCARM__) */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/readme.txt
new file mode 100644
index 00000000..2bbeb396
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_KMS_Blob/readme.txt
@@ -0,0 +1,62 @@
+/**
+  @page 2_Images_KMS_Blob / Key Management Services / Blob generation project.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2019 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Key Management Services Blob generation.
+  *          Allows to generate Blob to be injected to a device supporting
+  *          KMS ImportBlob().
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description 
+
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+
+You can edit your own keys to generate your own Blob.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Cryptography, KMS, Provisioning
+
+@par Directory contents
+
+   - 2_Images_KMS_Blob/Src/kms_blob_example_keys.c             KMS blob objects definition
+   - 2_Images_KMS_Blob/Binary/ECCKEY.txt                       Private ECCDSA key for signature verification
+   - 2_Images_KMS_Blob/Binary/iv.bin                           Encryption/decryption initialization vector
+   - 2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - Python installation required. In addition, install the appropriate python modules as described in
+    Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages\readme.txt
+    
+    
+@par How to use it ? 
+
+In order to generate Secure Key Storage Blob file, you must do the following :
+ - Edit the .c source file, where examples of keys are provided. Update with your own keys.
+ - Open your preferred toolchain 
+ - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
new file mode 100644
index 00000000..696d8368
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    app_hw.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update hardware
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_HW_H
+#define APP_HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported macros -----------------------------------------------------------*/
+/* At power-on, the capacitor related to SW1 button needs to charge.
+ * The charging time must be waited to be sure that a low level is a real one. */
+#define BUTTON_INIT() \
+  BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);                               \
+  if ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET) \
+  {                                                                       \
+     HAL_Delay(6U);                                                       \
+  }
+
+#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_HW_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
new file mode 100644
index 00000000..5ac7113c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
@@ -0,0 +1,32 @@
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAIN_H
+#define MAIN_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "app_sfu.h"
+#include "app_hw.h"
+
+#endif /* MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..8fff5bd0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+#define HAL_GTZC_MODULE_ENABLED
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..f6b5e516
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,53 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* External variables --------------------------------------------------------*/
+extern RTC_HandleTypeDef    RtcHandle;
+
+/* Exported functions ------------------------------------------------------- */
+void SVC_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+void RTC_LSECSS_IRQHandler(void);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+void TZIC_ILA_IRQHandler(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
new file mode 100644
index 00000000..df18911f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
@@ -0,0 +1,89 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Secure Boot and Secure Firmware Update.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_boot.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  main function
+  * @param  None
+  * @retval int
+  */
+int main(void)
+{
+
+  /* MCU Configuration--------------------------------------------------------*/
+  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
+  (void) HAL_Init();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+  /*
+   * As the secure mode has not been entered yet, we do not configure BSP right now .
+   * The BSP will be configured by the bootloader.
+   */
+
+
+  /* Launch the Bootloader----------------------------------------------------*/
+  /*
+   * This is the beginning of the secure part:
+   * security mechanisms will be enabled.
+   * The function below should not return (unless a critical failure is encountered).
+   */
+  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
+
+  /* Security or SecureBoot initialization failure. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+}
+
+
+
+
+
+
+#ifdef USE_FULL_ASSERT
+
+/**
+  * @brief Reports the name of the source file and the source line number
+  * where the assert_param error has occurred.
+  * @param file: pointer to the source file name
+  * @param line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+
+}
+
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..1c509696
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_msp.c
+  * @author  MCD Application Team
+  * @brief   This file provides code for the MSP Initialization
+  *          and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0U, 0U);
+
+}
+
+/**
+  * @brief RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspInit(hrtc);
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in this example.
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspDeInit(hrtc);
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspInit(huart);
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in this example:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspDeInit(huart);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..47e5904e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,100 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+#include "sfu_low_level_security.h"
+
+/* Global variables ----------------------------------------------------------*/
+/* RTC handler declaration */
+RTC_HandleTypeDef RtcHandle;
+
+/* Functions Definition ------------------------------------------------------*/
+/******************************************************************************/
+/*            Cortex-M0+ Processor Interruption and Exception Handlers         */
+/******************************************************************************/
+
+/* Exception handlers are implemented in the various source files of sbsfu application */
+
+/* NMI exception handler is implemented in sfu_low_level_flash_int.c file */
+/* Hard Fault exception handler is implemented in sfu_boot.c file */
+
+/* SVC call handler is implemented in se_sfu_mpu.s */
+
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers                  */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                               */
+/******************************************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void RTC_LSECSS_IRQHandler()
+{
+  /* Handle only the tamper enabled by SBSFU */
+  uint32_t tmp = READ_REG(TAMP->MISR) & RTC_TAMPER_ID;
+
+  /* Immediately clear flags to avoid eternal resets */
+  WRITE_REG(TAMP->SCR, tmp);
+
+  /* SRAM2 is erased and RtcHandle is corrupted: no specific handling is possible. */
+  NVIC_SystemReset();
+}
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  This function handles TZIC interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TZIC_ILA_IRQHandler(void)
+{
+  HAL_GTZC_IRQHandler();
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
new file mode 100644
index 00000000..be785277
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
@@ -0,0 +1,190 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_crypto_config.h"
+#include "app_sfu_common.h"
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Use this define to choose the type of Firmware Image Programming you want to use.
+  * This version supports only 2 modes:
+  *
+  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
+  *       The image is received in encrypted format.
+  *       The image must be decrypted to be installed:
+  *         this is done according to the selected crypto scheme,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  * SFU_CLEAR_IMAGE: Clear Firmware Image
+  *       The image is received in clear format.
+  *       No decrypt operation is needed before installing the image:
+  *         the selected crypto scheme must be compatible with this choice,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  *
+  */
+#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
+#else
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
+#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
+
+#define SFU_DEBUG_MODE               /*!< Comment this define to optimize memory footprint (debug mode removed)
+                                          No more print on terminal during SBSFU execution */
+
+/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
+                                          this switch activates more debug prints in the console (FSM state info...) */
+
+
+/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
+                                                          When this switch is activated, the FWIMG part of SB_SFU will
+                                                          block when an abnormal error is encountered */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
+#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
+#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
+
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
+#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
+
+/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
+                                           Automatically executed @startup */
+#if defined(SFU_TEST_PROTECTION)
+#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
+#endif /* SFU_TEST_PROTECTION */
+
+/**
+  * SB_SFU status LED.
+  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
+  * This is useful when no log is enabled.
+  *
+  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
+  * \li For the other situations, please check the other defines below.
+  */
+#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
+#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
+                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
+#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
+
+
+/**
+  * Optional Features Software Configuration
+  */
+#if !defined(SFU_TEST_PROTECTION)
+#define SECBOOT_LOADER SECBOOT_DUAL_CORE_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+#else
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
+#endif /* SFU_TEST_PROTECTION */
+
+/* Uncomment the define below if you want to remove the swap area
+   ==> partial update is not supported in this configuration
+   ==> image validation is not supported in this configuration */
+/*#define SFU_NO_SWAP*/                              /*!< FW upgrade installation process without swap area */
+
+/* Multi-images configuration :
+   - Max : 3 Active images and 3 Download area
+   - Not necessary same configuration between SFU_NB_MAX_ACTIVE_IMAGE and SFU_NB_MAX_DWL_AREA
+   - Active slot identified with SFU magic (1,2,3) information from header
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+   - FW image valide all feature authorized from master slot
+*/
+#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
+
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_RDP_PROTECT_ENABLE
+/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
+                                             neither connected to GND nor to 5V (floating level), there are too many
+                                             spurious tamper event detected */
+#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
+                                        Enables/Disables the MPU protection.
+                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
+                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
+                                        addition to the overall MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
+                                        executable area */
+
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_GTZC_PROTECT_ENABLE    /*!< GTZC protection (dependent on SFU_SECURE_USER_PROTECT_ENABLE):
+                                        Enables/Disables the GTZC protection. */
+#define SFU_C2SWDBG_PROTECT_ENABLE /*!< Dynamic disabling of the CPU2 debug:
+                                        not writable if ESE=0, no meaning if DDS=1. */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
+                                                      completely disabled, OB update no more possible  */
+
+
+#else
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
+                                                      field should set it as Level2 */
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+
+/**
+  * Application Configuration
+  *
+  */
+#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
+                                              You can also define an upper bound here if you plan to use it */
+
+#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
+                                              no FW installed or due to an attack attempt). Could be different from
+                                              SFU_FW_VERSION_START_NUM */
+
+/**
+  * Features compatibility control
+  */
+#if defined(SFU_NO_SWAP) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_NO_SWAP process"
+#endif
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_SECURE_USER_PROTECT_ENABLE process"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
new file mode 100644
index 00000000..269aed78
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
@@ -0,0 +1,1739 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.c
+  * @author  MCD Application Team
+  * @brief   SFU BOOT module
+  *          This file provides firmware functions to manage the following
+  *          functionalities of the Secure Boot:
+  *           + Initialization and de-initialization functions
+  *           + Secure Boot Control functions
+  *           + Secure Boot State functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_BOOT_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+#include "sfu_boot.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
+
+#include "sfu_trace.h"
+#include "se_def.h"
+#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
+#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
+#include "sfu_test.h"                 /* auto tests */
+#include "sfu_fwimg_internal.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "sfu_kms.h"
+#endif /* KMS_ENABLED */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct
+{
+  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
+  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
+} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
+                                                     information using during the SM evolution. */
+
+/* Private defines -----------------------------------------------------------*/
+#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
+#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
+#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
+                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
+
+#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
+                                    maintained for future customization/expansion of the field itself */
+
+#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
+
+/* Private macros ------------------------------------------------------------*/
+#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    if (Status == SFU_SUCCESS){                                         \
+      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
+    }                                                                   \
+    else {                                                              \
+      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
+    }                                                                   \
+  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
+
+
+#define SFU_SET_SM_CURR_STATE(NewState)                                 \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    m_StateMachineContext.CurrState = NewState;                         \
+  }while(0) /*!< Set a State Machine state*/
+
+/* Private variables ---------------------------------------------------------*/
+/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
+static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
+                                                                         SFU_STATE_INITIAL
+                                                                        };
+
+/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
+static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToResume = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToRollback = SLOT_INACTIVE;
+static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
+static uint32_t m_C1ActiveSlot = SLOT_INACTIVE;
+static uint32_t m_C2ActiveSlot = SLOT_INACTIVE;
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+uint8_t initialDeviceStatusCheck;
+
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_BOOT_Init(void);
+static SFU_ErrorStatus SFU_BOOT_DeInit(void);
+static void SFU_BOOT_BspConfiguration(void);
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
+static void SFU_BOOT_SM_CheckStatusOnReset(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+static void SFU_BOOT_SM_CheckNewFwToDownload(void);
+static void SFU_BOOT_SM_DownloadNewUserFw(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
+static void SFU_BOOT_SM_InstallKMSBlob(void);
+#endif /* KMS_ENABLED */
+static void SFU_BOOT_SM_CheckUserFwStatus(void);
+static void SFU_BOOT_SM_VerifyUserFwSignature(void);
+static void SFU_BOOT_SM_ExecuteUserFw(void);
+static void SFU_BOOT_SM_HandleCriticalFailure(void);
+static void SFU_BOOT_SM_RebootStateMachine(void);
+static void SFU_BOOT_SM_InstallNewUserFw(void);
+static void SFU_BOOT_SM_ResumeInstallNewUserFw(void);
+static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
+static void SFU_BOOT_ManageResetSources(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
+  *        In the nominal case, the bootloader service runs until the user application is launched.
+  *        When no valid user application can be run (after installing a new image or not),
+  *        if the local loader feature is not enabled then the execution stops,
+  *        otherwise a local download will be awaited.
+  *        If the state machine encounters a major issue then a reboot is triggered.
+  * @param None.
+  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
+  * @note Constraints
+  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
+  *       2. This function also takes care of BSP initialization after enabling the secure mode.
+  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
+  *       3. No other entity should handle the initialization of the Secure Engine.
+  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
+  *          configurations will be overwritten).
+  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
+  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
+  *          error cause.
+  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
+  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
+  *          new image).
+  * @note Settings are handled at compilation time:
+  *       1. See compiler switches in main.h for secure IPs settings
+  *       2. The trace system is configured in the sfu_trace.h file
+  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
+  *          stage.
+  */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
+{
+  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
+
+  /*
+   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
+   * "automatically" managed by SBSFU compiler command
+   */
+  if (SE_Startup() == SE_SUCCESS)
+  {
+    /* Security Configuration */
+    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
+    {
+      /* Board BSP  Configuration */
+      SFU_BOOT_BspConfiguration();
+
+      /* Configure the Secure Boot and start the State machine */
+      if (SFU_BOOT_Init() == SFU_SUCCESS)
+      {
+        /* Start the Secure Boot State Machine */
+        (void) SFU_BOOT_SM_Run();
+      }
+      else
+      {
+        /* failure when initializing the secure boot service */
+        e_ret_code = SFU_BOOT_INIT_FAIL;
+      }
+    }
+    else
+    {
+      /* failure when configuring the security IPs  */
+      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
+    }
+  }
+  else
+  {
+    /* failure at secure engine initialization stage */
+    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
+  }
+
+  /*
+   * This point should not be reached unless a critical init failure occurred
+   * Return the error code
+   */
+  return (e_ret_code);
+}
+
+/**
+  * @brief  Force System Reboot
+  * @param  None
+  * @retval None
+  */
+void SFU_BOOT_ForceReboot(void)
+{
+  /*
+   * WARNING: The follow TRACEs are for debug only. This function could be called
+   * inside an IRQ so the below printf could not be executed or could generate a fault!
+   */
+  TRACE("\r\n========= End of Execution ==========");
+  TRACE("\r\n\r\n\r\n");
+
+  /*
+   * This is the last operation executed. Force a System Reset.
+   * The check below is needed in case we reboot before setting the Unpriviledged mode.
+   * This can happen in a factory reset use-case typically.
+   */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  Initialize the Secure Boot State machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_Init(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
+   * download)
+   */
+  initialDeviceStatusCheck = 1U;
+
+  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
+  if (SFU_LL_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Flash interface initialization */
+  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* The COM modules is required only if the trace or the local download is enabled */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
+  if (SFU_COM_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  /* Call the SFU_LOADER module Init */
+  if (SFU_LOADER_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+  /* Call the Exception module Init */
+  if (SFU_EXCPT_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Call the image handling Init  */
+  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
+  {
+    return SFU_ERROR;
+  } /* else continue */
+
+
+  TRACE("\r\n\r\n");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  TRACE("\r\n=                                                                    =");
+  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n\r\n");
+
+  /* Initialize the Secure Engine that will be used for all the most critical operations */
+  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
+  }
+  else
+  {
+    e_ret_status = SFU_SUCCESS;
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize the Secure Boot State machine.
+  * @param  None
+  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
+  *         The bootloader can terminate:
+  *         1. with an init failure : no de-init needed
+  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
+  *            by this function.
+  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
+  *            required security mechanisms.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_DeInit(void)
+{
+  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  if (SFU_COM_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+  if (SFU_LL_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  BSP Initialization.
+  *         Called when the secure mode is enabled.
+  * @note   The BSP configuration should be handled only in this function.
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_BspConfiguration()
+{
+  /* LED Init*/
+  (void) BSP_LED_Init(SFU_STATUS_LED);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+  /* User Button */
+  BUTTON_INIT();
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Execute the Secure Boot state machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
+  void (*fnStateMachineFunction)(void);
+  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+                                                 SFU_BOOT_SM_CheckNewFwToDownload,
+                                                 SFU_BOOT_SM_DownloadNewUserFw,
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
+                                                 SFU_BOOT_SM_InstallKMSBlob,
+#endif /* KMS_ENABLED */
+                                                 SFU_BOOT_SM_CheckUserFwStatus,
+                                                 SFU_BOOT_SM_InstallNewUserFw,
+                                                 SFU_BOOT_SM_VerifyUserFwSignature,
+                                                 SFU_BOOT_SM_ExecuteUserFw,
+                                                 SFU_BOOT_SM_ResumeInstallNewUserFw,
+                                                 SFU_BOOT_SM_RollbackInstallPrevUserFw,
+                                                 SFU_BOOT_SM_HandleCriticalFailure,
+                                                 SFU_BOOT_SM_RebootStateMachine
+                                                };
+
+  /* Start the State Machine loop/evolution */
+  while (e_ret_status == SFU_SUCCESS)
+  {
+    /* Always execute a security/safety check before moving to the next state */
+    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
+    {
+      /* Get the right StateMachine function according to the current state */
+      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
+
+      /* Call the State Machine function associated to the current state */
+      fnStateMachineFunction();
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* If the State Machine cannot evolve anymore, reboot is the only option */
+
+  /* Set the error before forcing a reboot */
+  SFU_EXCPT_SetError(SFU_EXCPT_UNKNOWN);
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+  return e_ret_status;
+}
+
+/** @brief  Check the Reset status in order to understand the last cause of Reset
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckStatusOnReset(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
+
+  /* Check the wakeup sources */
+  SFU_BOOT_ManageResetSources();
+
+  /* RCC access done to identify the wakeup sources, we can switch to unpriviledged */
+  SFU_MPU_EnterUnprivilegedMode();
+#ifdef SFU_TEST_PROTECTION
+  /*
+   * All protections are installed and the correct execution mode is set (unprivileged).
+   * This is the good time to run the auto-tests.
+   */
+  SFU_TEST_Init();
+#endif /* SFU_TEST_PROTECTION */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+  /* When the local loader feature is supported we need to check if a local download is requested */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+#ifdef KMS_ENABLED
+  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* When the local loader feature is disabled go directly to the check of the FW status */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+/**
+  * @brief  Check if a new UserApp firmware is available for downloading.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckNewFwToDownload(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_DWL_REQ)
+  {
+    TRACE("\r\n= [SBOOT] STATE: execution standalone loader");
+    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+    /* This is unreachable code (dead code) in principle...
+    At this point we should not be able to reach the following instructions.
+    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
+    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
+    if (0U != BUTTON_PUSHED())
+    {
+      /* Download requested */
+      e_ret_status = SFU_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /*
+     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
+     * download to start
+     */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+#ifdef KMS_ENABLED
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
+
+#ifdef KMS_ENABLED
+/**
+  * @brief  Check if a KMSBlob is waiting for installation.
+  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
+  *         disabled.
+  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
+  *         enabled.
+  *         In this latter case,
+  *               if a new Firmware download is requested,
+  *               it has priority over the KMS blob installation,
+  *               and the KMS blob installation request will be lost.
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
+
+  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
+  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
+
+  /* Check if a Blob Installation is requested or on-going */
+  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
+
+  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
+  {
+    /* Blob installation requested */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+/**
+  * @brief  Check if a KMSBlob is waiting for install.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallKMSBlob(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  uint8_t         *pBlobHdr;
+  uint8_t         *pBlobInFlash;
+  CK_RV           e_status;
+
+  /* At boot-up, Managing ImportBlob through KMS services.  */
+  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
+
+  /* Here we will Launch SE service to take consume the Blob */
+  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
+  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
+  }
+  else
+  {
+    /* Initialize KMS in order to be able to import blob using internal algorithms */
+    e_status = C_Initialize(NULL);
+    if (e_status == CKR_OK)
+    {
+      /* we do not take the return value into account as we will not retry the import in case of issue */
+      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
+
+      if (e_status != CKR_OK)
+      {
+        (void)C_Finalize(NULL);
+      }
+      else
+      {
+        e_status = C_Finalize(NULL);
+      }
+    }
+
+    if (e_status != CKR_OK)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
+    }
+
+    /* In any case, we remove the Blob To Install (regardless of the result) */
+    e_ret_status = SFU_KMS_EraseBlob();
+
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
+    }
+
+    /* Display the KMS import result */
+    switch (e_status)
+    {
+      case CKR_OK:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
+        e_ret_status = SFU_SUCCESS;
+        break;
+
+      case CKR_SIGNATURE_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DATA_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DEVICE_ERROR:
+        /* At boot-up, NVM Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_OPERATION_ACTIVE:
+        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      default:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
+        e_ret_status = SFU_ERROR;
+        break;
+    }
+  }
+
+  /* Set the next State Machine regardless of the KMS import result */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+#endif /* KMS_ENABLED */
+
+
+/**
+  * @brief  Check the Status of the Fw Image to work on  in order to set the next
+  *         State Machine state accordingly
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckUserFwStatus(void)
+{
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  SFU_IMG_ImgInstallStateTypeDef e_PendingInstallStatus;
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+  uint32_t i;
+
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_INSTALL_REQ)
+  {
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[SLOT_DWL_1],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * Notify the Secure Boot that a new image has been downloaded
+       */
+      e_ret_status = SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated);
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    if (e_ret_status == SFU_ERROR)
+    {
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* In all cases, standard SBSFU start-up at next reset */
+    STANDALONE_LOADER_STATE = STANDALONE_LOADER_NO_REQ;
+  }
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+  /* Check if there is a pending action related to a FW update procedure */
+  e_PendingInstallStatus = SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall, &m_ActiveSlotToResume,
+                                                            &m_ActiveSlotToRollback);
+
+  switch (e_PendingInstallStatus)
+  {
+    case SFU_IMG_FWIMAGE_ROLLBACK:
+      /*
+       * The new FW image has not been validated : rollback requested @ next reset
+       * Rollback is done assuming the previous image was backed-up in corresponding dwl slot
+       * As example : new image installed in SLOT_ACTIVE_2. Previous image was backed-up in SLOT_DWL_2
+       */
+      /* Identify corresponding backed-up slot */
+      m_DwlSlotToInstall = m_ActiveSlotToRollback - SLOT_ACTIVE_1 + SLOT_DWL_1;
+      TRACE("\r\n\t  Installation not validated: rollback procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
+            m_ActiveSlotToRollback, m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_ROLLBACK_PREV_USER_FW);
+      break;
+
+    case SFU_IMG_FWUPDATE_STOPPED:
+      /* The installation of a downloaded FW has been interrupted */
+      /* We perform a resume of the installation */
+      TRACE("\r\n\t  Installation Failed: resume installation procedure initiated (SLOT_ACTIVE_%d / SLOT_DWL_%d)",
+            m_ActiveSlotToResume, m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_RESUME_INSTALL_NEW_USER_FW);
+      break;
+
+    case SFU_IMG_FWIMAGE_TO_INSTALL:
+      /*
+       * A new FW is detected in the dwl slot and ready to be installed
+       */
+      TRACE("\r\n\t  New Fw to be installed from slot SLOT_DWL_%d", m_DwlSlotToInstall - SLOT_DWL_1 + 1U);
+      SFU_SET_SM_CURR_STATE(SFU_STATE_INSTALL_NEW_USER_FW);
+      break;
+
+    case SFU_IMG_NO_FWUPDATE:
+      /*
+       * No FW image installation pending :
+       *   1- Check if firmwares are detected for C1 and C2 (MASTER_SLOT)
+       *   2- No active firmware candidate for execution ==> Local download
+       *
+       * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
+       */
+      m_C1ActiveSlot = 0U;
+      m_C2ActiveSlot = 0U;
+      m_ActiveSlotToExecute = 0U;
+
+      /* Check if firmwares are detected for C1 and C2 (MASTER_SLOT) */
+      if (MASTER_SLOT == 0xFFU)
+      {
+        TRACE("\r\n\t  No master slot has been defined for C2");
+      }
+      else
+      {
+        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+        {
+          if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
+          {
+            if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+            {
+              if ((SLOT_ACTIVE_1 + i) == MASTER_SLOT)
+              {
+                m_C2ActiveSlot = MASTER_SLOT;
+                TRACE("\r\n\t  A C2 FW is detected in the slot SLOT_ACTIVE_%d", m_C2ActiveSlot);
+              }
+              else
+              {
+                m_C1ActiveSlot = SLOT_ACTIVE_1 + i;
+                TRACE("\r\n\t  A C1 FW is detected in the slot SLOT_ACTIVE_%d", m_C1ActiveSlot);
+              }
+            }
+          }
+        }
+      }
+
+      /* 2- No active firmware candidates for execution ==> Local download */
+      if ((m_C1ActiveSlot != 0U) && (m_C2ActiveSlot != 0U))
+      {
+        m_ActiveSlotToExecute = m_C2ActiveSlot;
+        SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+      }
+      else
+      {
+        /* Control if all active slot are empty */
+        for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+        {
+          if ((m_C1ActiveSlot != (SLOT_ACTIVE_1 + i)) && (m_C2ActiveSlot != (SLOT_ACTIVE_1 + i)))
+          {
+            if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
+            {
+              if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+              {
+                /*
+                 * We should never reach this code.
+                 * Could come from an attack ==> as an example we invalidate current firmware.
+                 */
+                TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+                (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+              }
+            }
+          }
+        }
+
+        /*
+         * No valid FW is present in the active slot
+         * and there is no FW to be installed in UserApp download area: local download (when possible)
+         */
+        if (1U == initialDeviceStatusCheck)
+        {
+          TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+          /* Waiting for a local download is automatic, no trigger required. */
+          TRACE("\r\n\t  Waiting for the local download to start... ");
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+          initialDeviceStatusCheck = 0U;
+#ifdef SFU_TEST_PROTECTION
+          SFU_TEST_Reset();
+#endif /* SFU_TEST_PROTECTION */
+        }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        else
+        {
+          /*
+           * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
+           *   If a FW is present in the active slot => it is checked then launched.
+           *   If there is a FW to install => the installation procedure starts.
+           *   If no FW is present and no installation is pending:
+           *      - if the local loader feature is enabled we enter the local download state
+           *      - if the local loader feature is disabled, the execution is stopped.
+           */
+          TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS should not be entered more than once per boot.");
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+        SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+        /*
+         * When the local loader feature is disabled it is not possible to enter the local download state.
+         * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
+         * So we end up waiting for the user to reboot (or the IWDG to expire).
+         */
+        TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
+        /* Release CM4 (via SRAM) */
+        *pSbsfuFlag = SBSFU_FW_DOWNLOAD;
+        while (1 == 1)
+        {
+          (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+        }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+      }
+      break;
+
+    default:
+      TRACE("\r\n\t  Flash State Unknown, Critical failure");
+      /* If not in one of the previous state, something bad occurred */
+      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+      break;
+  }
+}
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   Reset is generated at by standalone loader when FW is downloaded.
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  *pSbsfuFlag = SBSFU_FW_DOWNLOAD;
+  while (1 == 1)
+  {
+    (void) BSP_LED_Toggle(SFU_STATUS_LED);
+    HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+  }
+}
+#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /*
+   * Download area will be chosen as following. After header analysis :
+   *   - same DWL slot number as SFU magic number, if the slot is configured.
+   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
+   *   - by default : SLOT_DWL_1
+   */
+  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
+          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
+          fw_image_header_validated.PartialFwOffset, u_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * Notify the Secure Boot that a new image has been downloaded
+     * by calling the SE interface function to trigger the installation procedure at next reboot.
+     */
+    if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
+    {
+      /* Erase downloaded image */
+      (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
+
+      /* no specific error cause set */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    /* Erase downloaded image */
+    (void) SFU_IMG_EraseDownloadedImg(dwl_slot);
+
+    /* Memorize the specific error cause if any before handling this critical failure */
+    switch (e_ret_status_app)
+    {
+      case SFU_LOADER_ERR_COM:
+        SFU_EXCPT_SetError(SFU_EXCPT_COM_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_VERSION:
+        SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_LENGTH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FW_TOO_BIG);
+        break;
+      case SFU_LOADER_ERR_AUTH_FAILED:
+        SFU_EXCPT_SetError(SFU_EXCPT_HEADER_AUTH_ERR);
+        break;
+      case SFU_LOADER_ERR_FLASH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FLASH_ERR);
+        break;
+      case SFU_LOADER_ERR_CRYPTO:
+        SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+        break;
+      default:
+        /* no specific error cause */
+        break;
+    }
+  } /* else error with no specific error cause */
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+/**
+  * @brief  Install the new UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: INSTALL NEW USER FIRMWARE ");
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_SECOND_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /* Check the candidate version vs current active version */
+  e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    /* Erase downloaded FW in case of authentication/integrity error */
+    (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
+  }
+  else
+  {
+    /* Secure coding : double check the candidate version vs current active version */
+    e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+  }
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* Launch the Firmware Installation procedure */
+    e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
+  }
+
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /*
+     * The FW installation succeeded: the previous FW is now backed up in the dwl slot.
+     * Nothing more to do, in the next FSM state we are going to verify the FW again and execute it if possible.
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FW installation succeeded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * The FW installation failed: we need to reboot and the resume procedure will be triggered at next boot.
+     * Nothing more to do, the next FSM state (HANDLE_CRITICAL_FAILURE) will deal with it.
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FW installation failed!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+}
+
+/**
+  * @brief  Execute a UserApp Fw installation resume
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ResumeInstallNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: RESUME INSTALLATION OF NEW USER FIRMWARE");
+
+  /*
+   * This resume installation procedure continue installation of new User FW in the active slot
+   */
+  e_ret_status = SFU_IMG_TriggerResumeInstallation(m_ActiveSlotToResume, m_DwlSlotToInstall);
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    /* No specific error cause managed here because the FSM state already provides the information. */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+}
+
+/**
+  * @brief  Execute a rollback to the previous UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_RollbackInstallPrevUserFw(void)
+{
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: ROLLBACK INSTALLATION TO PREVIOUS USER FIRMWARE");
+
+  /*
+   * Rollack installation to the previous User FW from Dwl_Slot
+   */
+  e_ret_status = SFU_IMG_TriggerRollbackInstallation(m_ActiveSlotToRollback, m_DwlSlotToInstall);
+
+  /* Installation successful : reboot for next operations on other slots
+       - installation
+       - resume
+       - rollback */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    SFU_BOOT_ForceReboot();
+  }
+  else
+  {
+    /* No specific error cause managed here because the FSM state already provides the information. */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+  }
+#else
+  TRACE("\r\n= [SBOOT] STATE: ROLLBACK NOT SUPPORTED");
+
+  /* No specific error cause managed here because the FSM state already provides the information. */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+#endif /* ENABLE_IMAGE_STATE_HANDLING && !(SFU_NO_SWAP) */
+}
+
+
+/**
+  * @brief  Verify the UserApp Fw signature before executing it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_VerifyUserFwSignature(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t u_configured_slot_nb = 0U;
+  uint32_t u_verified_slot_nb = 0U;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
+
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /*
+   * With the 2 images handling:
+   *       1. the header signature is verified  when installing a new firmware
+   *       2. the firmware signature is checked when installing a new firmware
+   *       3. remaining part of active slot is kept "clean" during installation procedure
+   * So following checks should never fail.
+   */
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      u_configured_slot_nb ++;
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
+        if (SFU_SUCCESS == e_ret_status)
+        {
+          /* Check the FW signature */
+          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
+          if (SFU_SUCCESS == e_ret_status)
+          {
+            /* Verify that there is no additional code beyond firmware image */
+            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
+            if (SFU_SUCCESS != e_ret_status)
+            {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+            }
+            else
+            {
+              u_verified_slot_nb ++;
+            }
+          }
+          else
+          {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          }
+        }
+        else
+        {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        }
+        /*
+         * One of the checks fails :
+         *  - Header signature
+         *  - FW signature
+         *  - No malicious code
+         *  ==> Active slot should be invalidated
+         */
+        if (SFU_SUCCESS != e_ret_status)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+        else
+        {
+          /* Verify if authentication and integrity controls performed */
+          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+        }
+      }
+      else
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+  }
+
+  /* Check that C1 and C2 firmwares are present */
+  if ( u_configured_slot_nb != u_verified_slot_nb )
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ExecuteUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+
+  /* Double security check for all active slots :
+     - Control twice the Header signature will avoid basic hardware attack
+     - Control twice the FW signature will avoid basic hardware attack */
+
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+        /* Check the FW signature */
+        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+        /* Move the state to SELFTEST for the new images */
+        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Image state cannot be changed : What to do ?
+             ==> decision to continue execution */
+          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
+        }
+#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
+
+        /* Verify if authentication and integrity controls performed */
+        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+      }
+    }
+  }
+
+  /*
+   * You may decide to implement additional checks before running the Firmware.
+   * For the time being we launch the FW present in the active slot.
+   *
+   * The bootloader must also take care of the security aspects:
+   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
+   *   B.lock the SE services the UserApp is not allowed to call
+   *   C.leave secure boot mode
+   */
+
+  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
+  e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+    SFU_EXCPT_SetError(SFU_EXCPT_FLASH_CFG_ERR);
+
+    /* This is the last operation executed. Force a System Reset */
+    SFU_BOOT_ForceReboot();
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Double instruction to avoid basic fault injection */
+      if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+      {
+        /* De-initialize the SB_SFU bootloader before launching the UserApp */
+        (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
+
+        /* Last flow control : lock service */
+        FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
+
+        /* This function should not return */
+        e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
+
+        /* This point should not be reached */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        /* We do not memorize any specific error, the FSM state is already providing the info */
+        TRACE("\r\n\t  SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        while (1 == 1)
+        {
+          ;    /* wait for watchdog */
+        }
+      }
+      else
+      {
+        /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+        SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+        /* This is the last operation executed. Force a System Reset */
+        SFU_BOOT_ForceReboot();
+      }
+    }
+    else
+    {
+      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+      SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+      /* This is the last operation executed. Force a System Reset */
+      SFU_BOOT_ForceReboot();
+    }
+  }
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
+  * @param  None
+  * @note   After a Critical Failure a Reboot will be called.
+  * @retval None
+  */
+static void SFU_BOOT_SM_HandleCriticalFailure(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+     The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
+}
+
+/**
+  * @brief  The state machine is aborted and a Reset is triggered
+  * @param  None
+  * @note   You are in this condition because it's not possible to continue without
+            compromising the stability or the security of the solution.
+  * @retval None
+  */
+static void SFU_BOOT_SM_RebootStateMachine(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
+
+  /*
+   * In case some clean-up must be done before resetting.
+   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
+   */
+  (void)SFU_BOOT_DeInit();
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Jump into standalone loader
+  * @param  None
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
+{
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+
+  /* Lock part of Secure Engine services */
+  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+  {
+    /* Double instruction to avoid basic fault injection */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* this function does not return */
+      SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, LOADER_REGION_ROM_START);
+
+      /* The point below should NOT be reached */
+      return SFU_SUCCESS;
+    }
+    else
+    {
+      return SFU_ERROR;
+    }
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply Static protections involving Option Bytes */
+  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  System security configuration
+  * @param  None
+  * @note   Check and apply the security protections. This has to be done as soon
+  *         as possible after a reset
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  /* WARNING: The following CheckApplySecurityProtection function must be called
+     as soon as possible after a Reset in order to be sure the system is secured
+     before starting any other operation. The drawback is that the ErrorManagement
+     is not initialized yet, so in case of failure of this function, there will not be
+     any error stored into the BootInfo or other visible effects.  */
+
+  /* Very few things are already initialized at this stage. Need additional initialization
+     to show a message that is added as below only in Debug/Test mode */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  (void) SFU_COM_Init();
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
+  {
+    /* WARNING: This might be generated by an attempted attack or a bug of your code!
+       Add your code here in order to implement a custom action for this event,
+       e.g. trigger a mass erase or take any other action in order to
+       protect your system, or simply discard it if this is expected.
+       ...
+       ...
+    */
+    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
+  }
+  else
+  {
+    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
+  *         a malicious code removing some of the applied security/integrity features.
+  *         The IWDG is also refreshed in this function.
+  * @param  None
+  * @note   This function must be called with a frequency greater than 0.25Hz!
+  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
+  *         So the User App should continue to refresh the IWDG counter.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Refresh the IWDG */
+  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
+
+
+  /* Add your code here for customization:
+     e.g. for additional security or safety periodic check.
+     ...
+     ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_ManageResetSources(void)
+{
+  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
+
+  /* Check the wakeup sources */
+  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
+  switch (e_wakeup_source_id)
+  {
+    /*
+     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
+     * RCC_CSR flags can be used to do so.
+     */
+
+    case SFU_RESET_WDG_RESET:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_LOW_POWER:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_HW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_BOR_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_SW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_OB_LOADER:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    default:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+  }
+
+  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
+  SFU_LL_SECU_ClearResetSources();
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
+}
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC Fault.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_GTZC_TZIC(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_GTZC_TZIC_FAULT);
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
new file mode 100644
index 00000000..03ad46cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
@@ -0,0 +1,232 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module, part of the SFU-En project (SB/SFU).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Init Error Type Definition
+  */
+typedef enum
+{
+  SFU_BOOT_SECENG_INIT_FAIL,   /*!< failure at secure engine initialization stage */
+  SFU_BOOT_SECIPS_CFG_FAIL,    /*!< failure when configuring the security IPs  */
+  SFU_BOOT_INIT_FAIL,          /*!< failure when initializing the secure boot service  */
+  SFU_BOOT_INIT_ERROR          /*!< Service cannot start: unspecified error */
+} SFU_BOOT_InitErrorTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Steps definition
+  */
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+#define FLOW_STEP_AUTHENTICATE 0x00007999U       /*!< Step AUTHENTICATE value */
+#define FLOW_STEP_INTEGRITY 0x0000aab5U          /*!< Step INTEGRITY value */
+#define FLOW_STEP_LOCK_SERVICE 0x0000b4abU       /*!< Step LOCK SERVICE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0000cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_PCROP_PROTECT_ENABLE
+#define FLOW_STEP_PCROP 0x0000d2d3U              /*!< Step PCROP value */
+#else
+#define FLOW_STEP_PCROP 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef  SFU_SUBGHZSPI_PROTECT_ENABLE
+#define FLOW_STEP_SUBGHZSPI 0x0003befU           /*!< Step SUBGHZSPI value */
+#else
+#define FLOW_STEP_SUBGHZSPI 0x00000000U          /*!< No effect on control flow */
+#endif /* SFU_SUBGHZSPI_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+#define FLOW_STEP_C2_DDS 0x000096bdU             /*!< Step DDS value */
+#else
+#define FLOW_STEP_C2_DDS 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+#define FLOW_STEP_C2SWDBG 0x00024e87U            /*!< Step C2SWDBG value */
+#else
+#define FLOW_STEP_C2SWDBG 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef  SFU_GTZC_PROTECT_ENABLE
+#define FLOW_STEP_GTZC 0x0000dbaeU               /*!< Step GTZC value */
+#else
+#define FLOW_STEP_GTZC 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_UBE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_PCROP (FLOW_CTRL_WRP ^ FLOW_STEP_PCROP)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_PCROP ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_SUBGHZSPI (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_SUBGHZSPI)
+#define FLOW_CTRL_C2_DDS (FLOW_CTRL_SUBGHZSPI ^ FLOW_STEP_C2_DDS)
+#define FLOW_CTRL_RDP (FLOW_CTRL_C2_DDS ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_DMA (FLOW_CTRL_MPU ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_C2SWDBG (FLOW_CTRL_TAMPER ^ FLOW_STEP_C2SWDBG)
+#define FLOW_CTRL_GTZC (FLOW_CTRL_C2SWDBG ^ FLOW_STEP_GTZC)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_GTZC
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values crypto operations
+  */
+#define FLOW_CTRL_AUTHENTICATE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_AUTHENTICATE)
+#define FLOW_CTRL_INTEGRITY (FLOW_CTRL_AUTHENTICATE ^ FLOW_STEP_INTEGRITY)
+#define FLOW_CTRL_LOCK_SERVICE (FLOW_CTRL_INTEGRITY ^ FLOW_STEP_LOCK_SERVICE)
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+
+/* Exported macros -----------------------------------------------------------*/
+/** Control with STEP operation :
+  * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+/** STEP update only :
+  * (uFlowValue XOR STEP_VALUE)
+  */
+#define FLOW_STEP(B,A) \
+  do{ \
+    (B) ^= (A);\
+  }while(0)
+
+
+/* Exported functions ------------------------------------------------------- */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService(void);
+void SFU_BOOT_ForceReboot(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
new file mode 100644
index 00000000..c3a1ff95
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
@@ -0,0 +1,262 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.c
+  * @author  MCD Application Team
+  * @brief   SFU ERROR
+  *          This file provides set of firmware functions for SB_SFU errors handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "sfu_low_level_security.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_boot.h"
+#include "sfu_test.h"
+#include "sfu_mpu_isolation.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+/**
+  *  The following strings associated to the exceptions/errors are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
+  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
+  */
+static char *m_aErrorStrings[] ={  "No error. Success",
+                                   "Memory fault",
+                                   "Hard fault",
+                                   "Tampering fault",
+#ifdef SFU_GTZC_PROTECT_ENABLE
+                                   "GTZC TZIC fault",
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+                                   "SE lock cannot be set",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Fw too big",
+                                   "File not correctly received",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Fw header authentication error",
+                                   "Fw decryption error",
+                                   "Fw signature check error",
+                                   "Flash error",
+                                   "External flash configuration error.",
+                                   "Header erasing error",
+                                   "Header validation error",
+                                   "Additional code detected beyond FW",
+                                   "Error during swap process",
+                                   "Error during rollback process",
+                                   "Backed-up fw not identified",
+                                   "Backup copy error",
+                                   "Dwl slot erasing error",
+                                   "Trailer erasing error",
+                                   "Trailer update error",
+                                   "Magic tag update error",
+                                   "Fw version rejected (anti-rollback)",
+                                   "Unknown error"
+                                };
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Print relevant errpr message.
+  * @param  Error Error code.
+  * @retval None
+  */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  if (eExceptionId <= SFU_EXCPT_UNKNOWN)
+  {
+#ifdef SFU_DEBUG_MODE
+    TRACE("\r\n\t%s",m_aErrorStrings[(uint32_t) eExceptionId]);
+#endif /* SFU_DEBUG_MODE */
+  }
+}
+
+
+/**
+  * @brief  Manage the Exception generated by an IRQ
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   Because of the interruption of the State Machine execution,
+  *         it's not possible to continue without compromising the stability or
+  *         the security of the solution. A System Reset is forced at the end.
+  * @retval None
+  */
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+#ifdef SFU_DEBUG_MODE
+  uint8_t message[150];
+  uint32_t i = 0U;
+
+  /* Avoid warning with cast frombetween char* and uint8_t* */
+  while ((m_aErrorStrings[(uint32_t) eExceptionId][i] != 0u) && (i < 149U))
+  {
+    message[i] = m_aErrorStrings[(uint32_t) eExceptionId][i];
+    i++;
+  }
+  message[i] = 0U;
+
+  /* Print relevant error message */
+  TRACE_IRQ((uint8_t *)"\r\n\t  ");
+  TRACE_IRQ(message);
+#endif /* SFU_DEBUG_MODE */
+
+  /* Try to take an action */
+  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+  The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_BOOT_ForceReboot();
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+void SFU_EXCPT_Security_Error(void)
+{
+  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
+  HAL_Delay(1000);
+  /* While(1) by-passed by an fault injection attack ==> Reset */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  SFU Exception Initialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_Init(void)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU Exception DeInitialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status;
+  /* ADD SRC CODE HERE
+      ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   A System Reset is forced at the end by the caller of this function.
+  *         WARNING: Be aware that this function can be called by an IRQ while
+  *         using the printf, since the printf is not a reentrant function, and using
+  *         the printf inside this function as well, a fault will likely occur.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  switch (eExceptionId)
+  {
+    case SFU_EXCPT_TAMPERING_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  case SFU_EXCPT_GTZC_TZIC_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      /* WARNING: Please consider that at runt-time,  this "case" execution is
+      inside an ISR */
+      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TZIC FAULT!");
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+    case SFU_EXCPT_MEMORY_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_HARD_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+#ifdef SFU_TEST_PROTECTION
+      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
+         ==> this is not an error */
+#endif /* SFU_TEST_PROTECTION */
+      break;
+
+    default:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+  }
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
new file mode 100644
index 00000000..7f3631f6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
@@ -0,0 +1,96 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.h
+  * @author  MCD Application Team
+  * @brief   This file contains the error handling elements for SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_ERROR_H
+#define SFU_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * This enum must start from 0.
+  * When adding a new error in the enum below please also:
+  *  1. update IS_SFU_EXCPT
+  *  2. update m_aErrorStrings
+  */
+typedef enum
+{
+  SFU_EXCPT_NONE = 0UL,
+  /* System errors */
+  SFU_EXCPT_MEMORY_FAULT,
+  SFU_EXCPT_HARD_FAULT,
+  SFU_EXCPT_TAMPERING_FAULT,
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  SFU_EXCPT_GTZC_TZIC_FAULT,
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+  /* Specific errors */
+  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
+  SFU_EXCPT_COM_ERR,               /* COM error during the local download of the binary */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  SFU_EXCPT_HEADER_AUTH_ERR,       /* header authentication failure */
+  SFU_EXCPT_DECRYPT_ERR,           /* Decrypt failure */
+  SFU_EXCPT_SIGNATURE_ERR,         /* Signature check failure */
+  SFU_EXCPT_FLASH_ERR,             /* Problem with FLASH */
+  SFU_EXCPT_FLASH_CFG_ERR,         /* Flash configuration issue (external flash) */
+  SFU_EXCPT_HEADER_ERASING_ERR,    /* Header erasing failure */
+  SFU_EXCPT_HEADER_VALIDATION_ERR, /* Header validation failure */
+  SFU_EXCPT_ADDITIONAL_CODE_ERR,   /* Additional code detected beyond the firmware image (malicious SW) */
+  SFU_EXCPT_FWIMG_SWAP_ERR,        /* Problem while swapping the images */
+  SFU_EXCPT_FWIMG_ROLLBACK_ERR,    /* Problem during rollback process */
+  SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR,/* Backed-up firmware not identified */
+  SFU_EXCPT_BACKUP_COPY_FAILURE_ERR, /* Copy in the backup slot failure */
+  SFU_EXCPT_DWL_SLOT_ERASING_ERR,  /* Dwl slot erasing failure */
+  SFU_EXCPT_TRAILER_ERASING_ERR,   /* Trailer update failure */
+  SFU_EXCPT_TRAILER_UPDATE_ERR,    /* Trailer update failure */
+  SFU_EXCPT_FWIMG_MAGIC_ERR,       /* Problem with a FWIMG pattern */
+  SFU_EXCPT_VERSION_ERR,           /* Anti-rollback check rejected the version to be installed */
+  /* Unknown error */
+  SFU_EXCPT_UNKNOWN                /* To be kept as last error */
+} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
+
+/* External variables --------------------------------------------------------*/
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_Security_Error(void);
+
+SFU_ErrorStatus SFU_EXCPT_Init(void);
+SFU_ErrorStatus SFU_EXCPT_DeInit(void);
+
+void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_ERROR_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
new file mode 100644
index 00000000..1832cdd1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
@@ -0,0 +1,1157 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_common.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the "common" functionalities of the image handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_COMMON_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+SFU_IMG_StatusTypeDef SFU_IMG_Status;
+uint32_t SFU_IMG_Line;
+
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+
+/**
+  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_to_test;
+
+/* Functions Definition : helper ---------------------------------------------*/
+/**
+  * @brief  Memory compare with constant time execution.
+  * @note   Objective is to avoid basic attacks based on time execution
+  * @param  pAdd1 Address of the first buffer to compare
+  * @param  pAdd2 Address of the second buffer to compare
+  * @param  Size Size of the comparison
+  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
+  */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
+{
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  for (i = 0U; i < Size; i++)
+  {
+    result |= pAdd1[i] ^ pAdd2[i];
+  }
+
+  if (result == 0x00U)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+
+/**
+  * @brief  Check header signature
+  * @param  pFwImageHeader: pointer to raw header.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef se_status;
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
+  {
+    /* Unused bytes should be set at 0x00 value
+       Comparison with constant time execution */
+    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
+    {
+      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
+    }
+
+    if (result == 0x00U)
+    {
+      /* Check signature of the FW header */
+      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
+      {
+        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
+  *        It handles Firmware TAG verification of a complete buffer by calling
+  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
+  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
+  *        and at the end compare the obtained TAG with the one provided as input
+  *        in pSE_GMCInit parameter.
+  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
+  * @param pSE_Status: Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param SlotNumber index of the slot in the list
+  * @param pSE_Metadata: Firmware metadata.
+  * @param pSE_Payload: pointer to Payload Buffer descriptor.
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_ret_status = SE_ERROR;
+  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
+  /* Loop variables */
+  uint32_t i;
+  uint32_t j;
+  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
+  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
+  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
+  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
+  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
+  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(8)));
+  /* FW chunk produced by the verification procedure if any   */
+  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* FW chunk provided as input to the verification procedure */
+  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* Variables to handle the FW image (this will be split in chunks) */
+  uint32_t payloadsize;
+  uint32_t ppayload;
+  uint32_t scatter_nb;
+  /* Variables to handle FW image size and tag */
+  uint32_t fw_size;
+  uint8_t *fw_tag;
+
+  /* Check the pointers allocation */
+  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
+  {
+    return SFU_ERROR;
+  }
+  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check the parameters value and set fw_size and fw_tag to check */
+  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
+  {
+    fw_size = pSE_Metadata->FwSize;
+    fw_tag = pSE_Metadata->FwTag;
+  }
+  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
+  {
+    fw_size = pSE_Metadata->PartialFwSize;
+    fw_tag = pSE_Metadata->PartialFwTag;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+
+  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
+  {
+    return SFU_ERROR;
+  }
+
+  /*  fix number of scatter block */
+  if (pSE_Payload->PayloadSize[1] != 0U)
+  {
+    scatter_nb = 2U;
+  }
+  else
+  {
+    scatter_nb = 1U;
+  }
+
+
+  /* Encryption process*/
+  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
+
+  /* check for initialization errors */
+  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    for (j = 0; j < scatter_nb; j++)
+    {
+      payloadsize = pSE_Payload->PayloadSize[j];
+      ppayload = pSE_Payload->pPayload[j];
+      i = 0;
+      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
+
+      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
+             (sfu_ret_status == SFU_SUCCESS))
+      {
+
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        ppayload += fw_chunk_size;
+        fw_verified_total_size += fw_chunk_size;
+        i++;
+      }
+      /* this the last path , size can be smaller */
+      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
+      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+      {
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
+                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)),
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        fw_verified_total_size += fw_chunk_size;
+      }
+    }
+  }
+
+  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    if (fw_verified_total_size <= fw_size)
+    {
+      /* Do the Finalization, check the authentication TAG*/
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
+
+      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
+        {
+          *pSeStatus = SE_SIGNATURE_ERR;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+
+          /* Save result for active slot :
+             to avoid single fault attack the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
+          }
+        }
+        else
+        {
+          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+
+          /* Save result for active slot :
+             to avoid single fault attacje the signature will be doble checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag_output, SE_TAG_LEN);
+          }
+        }
+      }
+      else
+      {
+        sfu_ret_status = SFU_ERROR;
+      }
+    }
+    else
+    {
+      sfu_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    sfu_ret_status = SFU_ERROR;
+  }
+  return sfu_ret_status;
+}
+
+/**
+  * @brief Fill authenticated info in SE_FwImage.
+  * @param SFU_APP_Status
+  * @param pBuffer
+  * @param BufferSize
+  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
+{
+  /* Check the pointers allocation */
+  if ((pFwHeader == NULL) || (pBuffer == NULL))
+  {
+    return SFU_ERROR;
+  }
+  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Verify Image Header in the slot given as a parameter
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
+  * @note   Not used in Alpha version -
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* use api read to detect possible ECC error */
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                   sizeof(SE_FwRawHeaderTypeDef));
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify signature */
+    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify Fw signature of binary contiguous in flash
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  SlotNumber flash slot to check
+  * @param  pFwImageHeader pointer to fw header
+  * @param  SlotNumber flash slot to check
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
+                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType)
+{
+  SE_Ex_PayloadDescTypeDef  pse_payload;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*  put it OK, to discriminate error in SFU FWIMG parts */
+  *pSeStatus = SE_OK;
+
+  /* Check the parameters value */
+  if (pFwImageHeader == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check SE_FwType parameter, and fix size and offset accordingly */
+  switch (SE_FwType)
+  {
+    case SE_FW_IMAGE_COMPLETE :
+      fw_size = pFwImageHeader->FwSize;
+      fw_offset = 0U;
+      break;
+    case SE_FW_IMAGE_PARTIAL :
+      fw_size = pFwImageHeader->PartialFwSize;
+#if  !defined(SFU_NO_SWAP)
+      fw_offset = pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+#else
+      fw_offset = pFwImageHeader->PartialFwOffset;
+#endif /* !SFU_NO_SWAP */
+      break;
+    default :
+      /* error */
+      fw_size = 0U;
+      fw_offset = 0U;
+      break;
+  }
+
+  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
+  pse_payload.PayloadSize[0] = fw_size;
+  pse_payload.pPayload[1] = 0U;
+  pse_payload.PayloadSize[1] = 0U;
+
+  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
+}
+
+/**
+  * @brief Verifies the validity of a slot.
+  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
+  * @param pSlotBegin Start address of a slot.
+  * @param uSlotSize Size of a slot.
+  * @param uFwSize Size of the firmware image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
+{
+  uint8_t *pdata;
+  uint32_t length;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check is already clean */
+  pdata = pSlotBegin + SFU_IMG_IMAGE_OFFSET + uFwSize;
+  length = uSlotSize - SFU_IMG_IMAGE_OFFSET - uFwSize;
+  e_ret_status = SFU_LL_FLASH_Compare(pdata, 0x00000000U, 0xFFFFFFFFU, length);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function clean-up the flash
+  * @note   Not designed to clean-up area inside secure engine isolation.
+  * @note   To clean the slot without erasing the header we write "0x00" except if already written
+  * @param  pSlotBegin Start address of a slot.
+  * @param  uSlotSize Size of a slot.
+  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t pdata;
+  uint32_t slot_begin;
+  SFU_LL_FLASH_write_t pattern;
+  SFU_LL_FLASH_write_t value;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  /* Clean-up pattern initialization */
+  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
+
+  /* Cleaning operation */
+  slot_begin = (uint32_t) pSlotBegin;
+  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
+  {
+    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* If read succeed, then the pattern write is performed only if pattern is not already present */
+      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                          sizeof(SFU_LL_FLASH_write_t));
+      }
+    }
+    else
+    {
+      /* If read fail, then the write is performed unconditionally */
+      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                        sizeof(SFU_LL_FLASH_write_t));
+    }
+
+    /* Reload Watchdog every 4Kbytes */
+    if ((pdata % 0x1000U) == 0U)
+    {
+      (void) SFU_LL_SECU_IWDG_Refresh();
+    }
+  }
+  return e_ret_status;
+}
+
+/* Functions Definition : services ------------------------------------------- */
+
+/**
+  * @brief FW Image Handling (FWIMG) initialization function.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
+{
+  uint32_t i;
+  uint32_t mpu_size;
+  uint32_t mpu_max_size;
+  uint32_t mpu_sub_size;
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+#if  !defined(SFU_NO_SWAP)
+  SFU_IMG_InitStatusTypeDef e_swap_ret_status;
+#endif /*(GENERATOR_2_FW_IMAGE) && !(SFU_NO_SWAP) */
+
+  /*
+   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
+   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
+   * starting with 0s.
+   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
+   * side-effects).
+   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
+   */
+  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
+
+  /*
+   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
+      } /* else active slot is properly aligned */
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_DWL_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_DWL_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_DWL_1 + 1U]);
+      } /* else dwl slot is properly aligned */
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
+   */
+  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
+  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
+   */
+  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the chunks used for decrypt match the FLASH constraints
+   */
+  if (0U != (uint32_t)(SFU_IMG_CHUNK_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The size of the chunks used to store the decrypted data must be a multiple of the FLASH write length */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] Decrypt chunk size (%d) is not matching the FLASH constraints\r\n", SFU_IMG_CHUNK_SIZE);
+  } /* else the decrypt chunk size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the chunk size used for decrypt is fine with regards to AES CBC constraints.
+   *               This block alignment constraint does not exist for AES GCM but we do not want to specialize the code
+   *               for a specific crypto scheme.
+   */
+  if (0U != (uint32_t)((uint32_t)SFU_IMG_CHUNK_SIZE % (uint32_t)AES_BLOCK_SIZE))
+  {
+    /* For AES CBC block encryption/decryption the chunks must be aligned on the AES block size */
+    e_ret_status = SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] Chunk size (%d) is not matching the AES CBC constraints\r\n", SFU_IMG_CHUNK_SIZE);
+  }
+
+  /*
+   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if(!((((SlotStartAdd[SLOT_ACTIVE_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+        || (((SlotEndAdd[SLOT_ACTIVE_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the dwl slot does not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_DWL_1 + i];
+    if (start_add != 0U)
+#else /* (__GNUC__) */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if(!((((SlotStartAdd[SLOT_DWL_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+        || (((SlotEndAdd[SLOT_DWL_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure headers are under the MPU protection
+   */
+  /* Calculate size of image header MPU region */
+  mpu_max_size = 2U;
+  for (i = 0U; i < SFU_PROTECT_MPU_HEADER_SIZE; i++)
+  {
+    mpu_max_size = mpu_max_size * 2U;
+  }
+  /* Take into account 8 sub-regions (assuming they are continuous) */
+  mpu_sub_size = mpu_max_size / 8U;
+  mpu_size = 0U;
+  for (i = 0U; i < 8U; i++)
+  {
+    if (((~SFU_PROTECT_MPU_HEADER_SREG) & (0x1U << i)) != 0U)
+    {
+      mpu_size = mpu_size + mpu_sub_size;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!((SlotHeaderAdd[SLOT_ACTIVE_1 + i] >= SFU_PROTECT_MPU_HEADER_START)
+            && ((SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SE_FW_HEADER_TOT_LEN) <=
+                (SFU_PROTECT_MPU_HEADER_START + mpu_size))))
+      {
+        TRACE("\r\n= [FWIMG] Header of SLOT_ACTIVE_%d is not under the MPU protection\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
+   */
+  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
+        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap dwl slot area
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_DWL_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_DWL_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_DWL_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+#if  !defined(SFU_NO_SWAP)
+  /*
+   * Sanity check: specific swap process checks
+   */
+  e_swap_ret_status = SFU_IMG_CheckSwapImageHandling();
+  if (e_swap_ret_status != SFU_IMG_INIT_OK)
+  {
+    e_ret_status = e_swap_ret_status;
+  }
+#endif /* defined(SFU_NO_SWAP) */
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief This function makes sure the current active firmware will not be considered as valid any more.
+  *        This function alters the FLASH content.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
+  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image metadata.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  * @note This function populates the FWIMG module variable: fw_image_header_validated
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
+{
+  /*
+   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
+   */
+  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
+  *       fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (SFU_ERROR == e_ret_status)
+  {
+    /* We do not memorize any specific error, the FSM state is already providing the info */
+    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
+  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
+}
+
+/**
+  * @brief Verifies if no malicious code in active slot.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
+{
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
+}
+
+/**
+  * @brief  Control firmware signature
+  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
+                    SE_TAG_LEN) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  else
+  {
+    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+    return SFU_SUCCESS;
+  }
+
+}
+
+/**
+  * @brief Launches the user application.
+  *        The caller must be prepared to never get the hand back after calling this function.
+  *        If a problem occurs, it must be memorized in the bootinfo area.
+  *        If the caller gets the hand back then this situation must be handled as a critical error.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met
+  *       (typically: no security check performed before launching the firmware).
+  * @note This function only handles the "system" aspects.
+  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
+  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
+  *       function (as this needs to be done just before jumping into the user application).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Verify if authentication/integrity/lock SE service performed */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
+
+  /* this function does not return */
+  /* first image identified as master image */
+  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET);
+
+  /* The point below should NOT be reached */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Get the version of the active FW
+  * @note It is up to the caller to make sure the active slot contains a valid active FW.
+  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
+  *       fails.
+  * @param  SlotNumber index of the slot in the list
+  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
+  */
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
+{
+  SE_FwRawHeaderTypeDef fw_image_header;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint16_t version = 0;
+
+  /* check the header of the active FW */
+  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* retrieve the version from the header without any further check */
+    version = fw_image_header.FwVersion;
+  }
+
+  return (version);
+}
+
+/**
+  * @brief Detect if a FW is present in a slot.
+  * @note  Detection done based on MAGIC header + FW signature. Header verification
+  *        not done at this stage for timing optimization.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
+  SE_FwRawHeaderTypeDef *p_header;
+
+  /* Read header */
+  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
+  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
+  {
+    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
+    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
+    {
+      /*
+       * Control if the first 32 bytes (could be more but time consuming ...) are significants
+       * At this location we should find the vector table.
+       * Objective is to detect if the FW image has been erased
+       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
+       */
+      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Validate the active FW image in active slot by installing the header
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /* Header writing: encrypted part with signature */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
+                                    SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+  /* Header writing : Do not update image state part */
+
+  /* Header writing: previous FW image fingerprint */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
+                                                                    SE_FW_HEADER_FINGERPRINT_LEN),
+                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Get firmware image ID from header.
+  * @param  pFwImageHeader pointer to a structure to handle the header info
+  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
+  */
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  uint32_t active_slot;
+
+  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_1;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_2;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_3;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
+  else
+  {
+    active_slot = SLOT_INACTIVE;
+  }
+
+  return active_slot;
+}
+
+/**
+  * @brief  Check candidate image version is allowed.
+  * @param  ActiveSlot Slot identification used in case of secure counters usage
+  * @param  CurrentVersion Version of currently installed image if any
+  * @param  CandidateVersion Version of candidate image
+  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  UNUSED(ActiveSlot);
+
+  /* If the header of the active firmware is not valid, the CurrentVersion is 0 */
+  if (CurrentVersion == 0U)
+  {
+    /*
+     * If the header of the active firmware is not valide (could comes from an attak atempt, we authorize only the
+     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
+     */
+    if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * It is not allowed to install a Firmware with a lower version than the active firmware.
+     * But we authorize the re-installation of the current firmware version.
+     * We also check that the candidate version is at least the min. allowed version for this device.
+     */
+    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief Verifies the validity of the metadata associated to a candidate image.
+  *        The anti-rollback check is performed.
+  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure):
+  *       SFU_IMG_CheckPendingInstallation should be called first.
+  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
+  *       @ref SFU_APP_VerifyFwHeader.
+  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint32_t active_slot;
+  uint16_t cur_ver;
+  uint16_t verif_ver;
+
+  /*
+   * - Candidate FW Header Authentication
+   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
+   *       As a consequence: fw_image_header_to_test is already populated
+   *
+   * - Check version is allowed
+   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+   */
+
+  /* Header analysis to find slot based on number with magic tag */
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /* Get the version of active_slot */
+  cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+
+  if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
+  {
+    /* The installation is forbidden */
+    /* Memorize this error as this will be handled as a critical failure */
+    SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+
+    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /* leave now to handle the critical failure in the appropriate FSM state */
+    e_ret_status = SFU_ERROR;
+  }
+  else
+  {
+    /* the anti-rollback check succeeds: the version is fine */
+    /* double check to avoid basic hardware attack attack */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    e_ret_status = SFU_IMG_CheckFwVersion(active_slot, verif_ver, fw_image_header_to_test.FwVersion);
+  }
+
+  /* Return the result */
+  return (e_ret_status);
+}
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
new file mode 100644
index 00000000..a2e0d18c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
@@ -0,0 +1,134 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_internal.h
+  * @author  MCD Application Team
+  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
+  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
+  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
+  *          fw_image_header_to_test to install an KMS blob.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_INTERNAL_H
+#define SFU_FWIMG_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_fwimg_regions.h"
+#include "kms_blob_metadata.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Payload Buffer descriptor.
+  * This structure describes how a Firmware is split in Flash.
+  * In the nominal case a Firmware is stored in 1 contiguous area.
+  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
+  * decrypt operation).
+  */
+typedef struct
+{
+  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
+  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
+} SE_Ex_PayloadDescTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief SFU_IMG Flash Status Type Definition
+  * Status of a FLASH operation.
+  */
+typedef enum
+{
+  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
+  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
+  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
+  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
+} SFU_IMG_StatusTypeDef;
+
+/**
+  * @brief RAM chunk used for decryption / comparison / swap
+  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
+  * some function allocates 2 buffer of this size in stack.
+  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
+  */
+#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
+
+#define SFU_IMG_CHUNK_SIZE  (512UL)
+#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief  Status Macro
+  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
+  * activated) and the execution continues.
+  */
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                   while(1==1){;} \
+                                 } while(0==1){;}
+#else
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                 } while(0==1){;}
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
+extern uint32_t SFU_IMG_Line;
+
+extern SE_FwRawHeaderTypeDef fw_image_header_validated;
+extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
+
+/* Exported functions : helper ---------------------------------------------- */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
+SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
+                          uint8_t  *pPayload, uint32_t SE_FwType);
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType);
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_INTERNAL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c
new file mode 100644
index 00000000..071227d3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c
@@ -0,0 +1,930 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_no_swap.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the specific functionalities of the image handling for
+  *          the installation process without swap area.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_NO_SWAP_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+
+#if  defined(SFU_NO_SWAP)
+/* Private macros ------------------------------------------------------------*/
+#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH)
+
+/*             DWL_SLOT_REGION_SIZE             */
+/* <------------------------------------------> */
+/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH| */
+/* | header 1     | header 2     |SWAP magic  | */
+
+#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A] + SLOT_SIZE(A) - TRAILER_HEADER))
+#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
+#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
+
+#endif /* defined(SFU_NO_SWAP) */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#if  defined(SFU_NO_SWAP)
+
+/**
+  * @brief  Write Trailer Headers : TEST + VALID + SWAP
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  /* everything is in place , just compute from present data and write it */
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t  magic[MAGIC_LENGTH];
+  uint32_t buffer;
+
+  /* Write Headers VALID + TEST */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
+                                    SE_FW_HEADER_TOT_LEN);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
+                                      SE_FW_HEADER_TOT_LEN);
+  }
+
+  /* Write Magic */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    buffer = (uint32_t) pValidHeader;
+    (void) memcpy(&magic[0U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
+    buffer = (uint32_t) pTestHeader;
+    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                  MAGIC_LENGTH / 2U);
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check the magic from trailer or counter
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
+{
+  uint8_t  magic[MAGIC_LENGTH];
+  uint8_t  signature_valid[MAGIC_LENGTH / 2];
+  uint8_t  signature_test[MAGIC_LENGTH / 2];
+  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
+
+  /* Pattern initialization */
+  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
+
+  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
+  if (SFU_LL_FLASH_Read(signature_valid,
+                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_valid)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(signature_test,
+                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_test)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /*
+   * Check magic validity :
+   *  - last 16 bytes of validated header
+   *  - last 16 bytes of test header
+   *  - significant values (not an erased flash pattern)
+   */
+  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
+      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
+      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0))
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  check trailer validity to allow resume installation.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus  FirmwareToResume(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+
+  /*
+   *  Initial conditions to be fulfilled :
+   *   - Trailer magic is present
+   *   - Active slot number is correct
+   *   - test header from trailer is signed
+   *   - header from dwl slot is same as the one from trailer
+   */
+
+  /* check trailer Magic */
+  e_ret_status = CheckTrailerMagic(DwlSlot);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate the pTestHeader and verify it the active slot is correct */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate pTestHeader parameter */
+    e_ret_status = ParseFWInfo(pTestHeader, fw_header_trailer_test);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Active slot number correct ?
+       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
+    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
+    {
+      /* Check header test field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
+    }
+    else
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not valid!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Read header from dwl slot and verify this is the same as the test header from trailer */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
+                                     sizeof(fw_header_dwl_slot));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (memcmp(fw_header_dwl_slot, fw_header_trailer_test, SE_FW_AUTH_LEN) != 0U)
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not same as dwl slot header!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* First part KO : return error */
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Read header in active slot if any */
+  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                   sizeof(fw_header_active_slot));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify the header signature in active slot */
+    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
+
+    /* Populate pValidHeader parameter */
+    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header valid field in trailer */
+      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                       sizeof(fw_header_trailer_valid));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * 3 cases:
+       * - Header in active slot is identical to the header valid field
+       *   ==> installation interrupted very early. Resume install must be triggered.
+       * - Header in active slot is identical to the header test field
+       *   ==> installation interrupted after active header erasing. Resume install must be triggered.
+       * - Any other values
+       *   ==> Hack tentative, resume install must not be triggered.
+       */
+
+      /* Check if header in active slot is same as header valid in trailer */
+      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, SE_FW_AUTH_LEN) != 0)
+      {
+        /* Check candidate image version : should be OK */
+        e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+      }
+      /* Check if header in active slot is same as header test in trailer */
+      else if (memcmp(fw_header_active_slot, fw_header_trailer_test, SE_FW_AUTH_LEN) == 0U)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+      else
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  No resume required : Header in active slot is neither sames TRAILER_HDR_TEST as nor TRAILER_VALID_TEST!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        e_ret_status = SFU_ERROR;
+      }
+    }
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+  else
+  {
+    /*
+     * Header in active slot is not valid.
+     * It is considered this can not be hack attempt, because header in active slot is in
+     * protected area.
+     * Possible reasons:
+     * - Installation has been interrupted during very first image installation (active slot was empty)
+     * - Installation has been interrupted during reconstitution of first sector of active slot
+     * If header test field in trailer is signed and with proper version, we resume install.
+     */
+
+    /* Read header valid field in trailer */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                     sizeof(fw_header_trailer_valid));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check header valid field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* active slot was containing an active image */
+
+        /* Populate pValidHeader parameter */
+        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /* Check candidate image version */
+          e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+        }
+      }
+      else
+      {
+        /* active slot was empty : we authorize only the installation of a specific version identified by
+           SFU_FW_VERSION_INIT_NUM */
+        if (pTestHeader->FwVersion == SFU_FW_VERSION_INIT_NUM)
+        {
+          /* active slot was empty or was containing bricked Fw image */
+          e_ret_status = SFU_SUCCESS;
+        }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        else
+        {
+          TRACE("\r\n\t  Init version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, pTestHeader->FwVersion);
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+    }
+
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify signature on encrypted FW
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus VerifyFwSignatureBeforeDecrypt(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_decrypted_chunk_size;
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t fw_authenticated_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_authenticated_chunk_size;
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+  uint32_t fw_index;
+  uint32_t size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  /* Verify header presence */
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process initialization
+     ================================= */
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+  if (se_ret_status == SE_SUCCESS)
+  {
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+    se_ret_status = SE_AuthenticateFW_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+
+    /* Skip header : no decryption needed */
+    fw_index = SFU_IMG_IMAGE_OFFSET;
+
+    e_ret_status = SFU_SUCCESS;
+    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
+           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Set size of reading/decryption */
+      size = SFU_IMG_CHUNK_SIZE;
+
+      /* Last pass ? */
+      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
+      {
+        /* Default chunk size can be troncated at end of file */
+        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
+      }
+
+      /* read then decrypt phase
+       ======================= */
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        fw_decrypted_chunk_size = size;
+        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
+                                          (int32_t *)&fw_decrypted_chunk_size);
+
+        if (se_ret_status == SE_SUCCESS)
+        {
+#if (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+          fw_authenticated_chunk_size = sizeof(fw_authenticated_chunk);
+          se_ret_status = SE_AuthenticateFW_Append(&e_se_status, fw_decrypted_chunk, (int32_t)size,
+                                                   fw_authenticated_chunk, (int32_t *)&fw_authenticated_chunk_size);
+#endif /* (SECBOOT_CRYPTO_SCHEME != SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+          fw_index += size;
+        }
+      }
+    }
+  }
+
+  /* Do the Finalization, check the authentication TAG
+     ================================================= */
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
+  {
+    e_ret_status = SFU_ERROR;
+
+    /* Finalization stage */
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if (se_ret_status == SE_SUCCESS)
+    {
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+      e_ret_status = SFU_SUCCESS;
+#else
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status = SE_AuthenticateFW_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+      if ((se_ret_status == SE_SUCCESS) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, pFwImageHeader->FwTag, SE_TAG_LEN) == SFU_SUCCESS)
+        {
+          e_ret_status = SFU_SUCCESS;
+        }
+      }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) */
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Decrypt Image from dwl slot to active slot
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus DecryptImageFromDwlSlotToActiveSlot(uint32_t ActiveSlot, uint32_t DwlSlot,
+                                                           SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_index;
+  uint32_t size;
+  uint32_t fw_decrypted_chunk_size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  TRACE("\r\n\t  Image preparation done.\r\n\t  Installation started ...");
+
+  /* Verify header presence */
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Control the firwmare size vs slot size */
+  if ((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) > SLOT_SIZE(ActiveSlot))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process initialization
+     ================================= */
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_COMPLETE);
+  if (se_ret_status == SE_SUCCESS)
+  {
+
+    /* Erasing operation
+     ================= */
+
+    /*
+     *  The header may not be contiguous with the FW image : 2 erasing operations needed
+     */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                           SFU_IMG_IMAGE_OFFSET);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                             (uint8_t *)(SlotStartAdd[ActiveSlot] + SFU_IMG_IMAGE_OFFSET),
+                                             SLOT_SIZE(ActiveSlot) - SFU_IMG_IMAGE_OFFSET);
+    }
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /*
+     * Save immediately the new active FW header
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_IMG_Validation(ActiveSlot, pFwImageHeader);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  Header writing failure!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+    }
+
+    /*
+     * Skip header : no decryption needed
+     */
+    fw_index = SFU_IMG_IMAGE_OFFSET;
+
+    while ((e_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) &&
+           (fw_index < (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Refresh Watchdog every 10 iterations */
+      if ((fw_index % 10U) != 0U)
+      {
+        (void) SFU_LL_SECU_IWDG_Refresh();
+      }
+
+      /* Set size of reading/decryption */
+      size = SFU_IMG_CHUNK_SIZE;
+
+      /* Last pass ? */
+      if (((pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET) - fw_index) < size)
+      {
+        /* Default chunk size can be troncated at end of file */
+        size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET - fw_index;
+      }
+
+      /* read then decrypt phase
+       ======================= */
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *)(SlotStartAdd[DwlSlot] + fw_index), size);
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        fw_decrypted_chunk_size = size;
+        se_ret_status = SE_Decrypt_Append(&e_se_status, fw_encrypted_chunk, (int32_t)size, fw_decrypted_chunk,
+                                          (int32_t *)&fw_decrypted_chunk_size);
+
+        /*
+        * writing phase
+        * =============== */
+        if (se_ret_status == SE_SUCCESS)
+        {
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotStartAdd[ActiveSlot] + fw_index),
+                                            fw_decrypted_chunk, size);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+          /* Update pointer */
+          fw_index += size;
+        }
+      }
+    }
+  }
+
+#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_index);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#endif /* SFU_ENCRYPTED_IMAGE */
+
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS))
+  {
+    /* Do the Finalization, check the authentication TAG*/
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if (se_ret_status != SE_SUCCESS)
+    {
+      e_ret_status = SFU_ERROR;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Install the new version
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                         SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+
+  /*
+   * Verify FW Image signature in dwl slot
+   */
+  e_ret_status = VerifyFwSignatureBeforeDecrypt(DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_SIGNATURE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Control if there is no additional code beyond the firmware image (malicious SW)
+   */
+  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot), pTestHeader->FwSize);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_ADDITIONAL_CODE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Write trailer : memorize installation process started
+   */
+  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_UPDATE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+   * Decrypt the FW image : from dwl slot to active slot
+   */
+  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+    return e_ret_status;
+  }
+
+
+  /*
+   * erase downloaded FW after installation
+   */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    SFU_EXCPT_SetError(SFU_EXCPT_DWL_SLOT_ERASING_ERR);
+    return e_ret_status;
+  }
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to be populated
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+
+  /* Verify FW Image Header tag in dwl slot */
+  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
+                         SFU_IMG_IMAGE_OFFSET);
+
+    /* Check if there is enough room for the trailers */
+    if (trailer_begin < end_of_test_image)
+    {
+      /*
+       * This error causes is not memorized in the BootInfo area because there won't be any error handling
+       * procedure.
+       * If this function returns that no new firmware can be installed (as this may be a normal case).
+       */
+      e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+    else
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SFU_NO_SWAP) */
+
+
+
+/* Functions Definition : services ------------------------------------------- */
+
+#if  defined(SFU_NO_SWAP)
+/**
+  * @brief Checks if there is a pending firmware installation.
+  *        2 situations can occur:
+  *        A. Pending firmware installation: a firmware is ready to be installed.
+  *        B. No firmware installation pending
+  * @note  The anti-rollback check is not taken into account at this stage.
+  * @note  This function populates the FWIMG module variables: fw_image_header_to_test
+  * @param  pDwlSlotToInstall identification of the downloaded slot to install
+  * @param  pActiveSlotToResume identification of the active slot to resume
+  * @param  pActiveSlotToRollback identification of the active slot to rollback
+  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, no pending action)
+  */
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback)
+{
+  SFU_IMG_ImgInstallStateTypeDef e_ret_state = SFU_IMG_NO_FWUPDATE;
+  uint32_t i;
+  uint32_t j;
+
+  /* No rollback capability in "NO_SWAP" configuration */
+  *pActiveSlotToResume = SLOT_INACTIVE;
+  *pActiveSlotToRollback = SLOT_INACTIVE;
+  *pDwlSlotToInstall = SLOT_INACTIVE;
+
+  /* Check image installation stopped
+     ================================ */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+      {
+        /* Slot configured ? */
+        if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+        {
+          if (SFU_SUCCESS == FirmwareToResume(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
+                                               &fw_image_header_to_test))
+          {
+            /* A Firmware Update has been stopped
+             * fw_image_header_to_test & fw_image_header_validated have been populated
+             * Stop at first occurrence : next ones if any will be resumed after reset
+             */
+            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
+            *pDwlSlotToInstall = SLOT_DWL_1 + j;
+            return SFU_IMG_FWUPDATE_STOPPED;
+          }
+        }
+      }
+    }
+  }
+
+  /* Install new firmware if requested
+     ================================= */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + i, &fw_image_header_to_test))
+      {
+        /*
+         * A Firmware is available for installation:
+         * fw_image_header_to_test has been populated
+         * Stop at first occurrence : next ones if any will be installed after reset
+         */
+        *pDwlSlotToInstall = SLOT_DWL_1 + i;
+        return SFU_IMG_FWIMAGE_TO_INSTALL;
+      }
+    }
+  }
+
+  return e_ret_state;
+}
+
+/**
+  * @brief Resume installation : not required but present for compatibility with swap process
+  *        If installation procedure is interrupted (e.g.: switch off) it will be restarted from begin at next reboot.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS
+  */
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+
+  /*
+   * Decrypt the FW image : from dwl slot to active slot
+   */
+  e_ret_status = DecryptImageFromDwlSlotToActiveSlot(ActiveSlot, DwlSlot, &fw_image_header_to_test);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+  }
+
+  /*
+   * erase downloaded FW after installation
+   */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot));
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    SFU_EXCPT_SetError(SFU_EXCPT_DWL_SLOT_ERASING_ERR);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Resume procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Resume procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
+  *        valid if the checks are successful.
+  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
+  *        afterwards if the cryptographic scheme allows this (signature check for instance).
+  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
+  *        This function modifies the FLASH content.
+  *        If this procedure is interrupted (e.g.: switch off) installation will be restarted from begin at next reboot.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint32_t active_slot;
+
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /*
+   * Check the active slot is big enough
+   */
+  if (fw_image_header_to_test.FwSize + SFU_IMG_IMAGE_OFFSET <= SLOT_SIZE(active_slot))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /*
+   * Populate fw_image_header_validated
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
+                                     sizeof(fw_image_header_validated));
+  }
+  
+  /*
+   * Installing the new firmware image consists in decrypting the candidate firmware image.
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
+  }
+
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    /* Erase downloaded FW in case of installation  error */
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Installation procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Installation procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  /* return the installation result */
+  return (e_ret_status);
+}
+#endif /* (SFU_NO_SWAP) */
+
+
+#if   defined(SFU_NO_SWAP)
+/**
+  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
+
+  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
+                                             SLOT_SIZE(DwlSlot));
+  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  return ((e_ret_status_dwl != SFU_SUCCESS) ?  SFU_ERROR : SFU_SUCCESS);
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SFU_NO_SWAP) */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
new file mode 100644
index 00000000..4d127d81
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
@@ -0,0 +1,95 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_services.h
+  * @author  MCD Application Team
+  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
+  *          API definitions.
+  *          These services can be called by the bootloader to deal with images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_SERVICES_H
+#define SFU_FWIMG_SERVICES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_IMG Initialization Status Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_IMG_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_IMG Image Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
+  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
+  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
+  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
+} SFU_IMG_ImgInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback);
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_SERVICES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c
new file mode 100644
index 00000000..d7cd4849
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c
@@ -0,0 +1,2329 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_swap.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the specific functionalities of the image handling for
+  *          the installation process with swap area.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_SWAP_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h" /* to have definitions like SFU_IMG_InitStatusTypeDef
+                                   (required by sfu_fwimg_internal.h) */
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+
+#if  !defined(SFU_NO_SWAP)
+
+/* Private macros ------------------------------------------------------------*/
+#define TRAILER_INDEX(A)  (SLOT_SIZE(A) / SLOT_SIZE(SLOT_SWAP))
+/*  position of image begin on 1st block */
+#define TRAILER_HEADER   (SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH + MAGIC_LENGTH)
+
+/*                                         DWL_SLOT_REGION_SIZE                                             */
+/* <----------------------------------------------------------------------------------------------------->  */
+/* |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH|N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t) */
+/* | header 1     | header 2     |SWAP magic  |CLEAN pat.  | N*CPY_TO_ACTIVE_SLOT  | N*CPY_TO_DWL_SLOT      */
+/*                                                                                                          */
+/* Please note that the size of the trailer area (N*CPY_TO_SLOTx) depends directly on SFU_LL_FLASH_write_t type, */
+/* so it can differ from one platform to another (this is FLASH-dependent)                                       */
+#define TRAILER_SIZE(A) ((sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A)))\
+                         + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) + (uint32_t)(TRAILER_HEADER))
+#define TRAILER_BEGIN(A)  (( uint8_t *)(SlotStartAdd[A]\
+                                        + SLOT_SIZE(A) - TRAILER_SIZE(A)))
+#define TRAILER_CPY_TO_DWL_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
+                                              + (sizeof(SFU_LL_FLASH_write_t)*(TRAILER_INDEX(A))) \
+                                              + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
+#define TRAILER_CPY_TO_ACTIVE_SLOT(A,i) ((void*)((uint32_t)TRAILER_BEGIN(A)\
+                                                 + (uint32_t)TRAILER_HEADER+((i)*sizeof(SFU_LL_FLASH_write_t))))
+
+#define TRAILER_HDR_VALID(A) ((uint8_t *)(TRAILER_BEGIN(A)))
+#define TRAILER_HDR_TEST(A)  ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_SWAP_ADDR(A) ((uint8_t *)(TRAILER_BEGIN(A) + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN))
+#define TRAILER_CLEAN_ADDR(A)((uint8_t *)(TRAILER_BEGIN(A)\
+                                          + SE_FW_HEADER_TOT_LEN + SE_FW_HEADER_TOT_LEN + MAGIC_LENGTH))
+
+#define CHUNK_1_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
+                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+#define CHUNK_0_ADDR(A,B,C) ((uint8_t *)(SlotStartAdd[A]\
+                                         +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+
+#define CHUNK_0_ADDR_HEADER(A,B,C) ((((B)==0) && ((C)==0))?\
+                                    (uint8_t *)(SlotHeaderAdd[(A)]) : \
+                                    (uint8_t *)(SlotStartAdd[(A)]\
+                                                +(SLOT_SIZE(SLOT_SWAP)*(B))+(SFU_IMG_CHUNK_SIZE*(C))))
+
+#define CHUNK_0_ADDR_MODIFIED(A,B,C) ((((B)==0) && ((C)==0))?\
+                                      ((uint8_t*)(SlotStartAdd[(A)] + SFU_IMG_IMAGE_OFFSET)) : \
+                                      ((uint8_t*)(SlotStartAdd[(A)] + (SLOT_SIZE(SLOT_SWAP)*(B)) \
+                                                  + (SFU_IMG_CHUNK_SIZE*(C)))))
+#define CHUNK_SWAP_ADDR(B) ((uint8_t *)(SlotStartAdd[SLOT_SWAP]+(SFU_IMG_CHUNK_SIZE*(B))))
+
+/* Private variables ----------------------------------------------------------*/
+/* Trailer pattern : sizeof of write access type */
+static const int8_t SWAPPED[sizeof(SFU_LL_FLASH_write_t)] __attribute__((aligned(8))) = {0, 0, 0, 0, 0, 0, 0, 0};
+static const int8_t NOT_SWAPPED[sizeof(SFU_LL_FLASH_write_t)]  __attribute__((aligned(8))) = {-1, -1, -1, -1, -1, -1,
+                                                                                              -1, -1
+                                                                                             };
+
+/* Functions Definition : helper ---------------------------------------------*/
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Checks if a rollback is required
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if Image should be rollbacked, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToRollback(uint32_t SlotNumber, SE_FwStateTypeDef MasterSlotState)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus e_ret_status_se;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+  SE_FwStateTypeDef e_next_image_state;
+
+
+  /* If an image is detected, read the image state :
+   * if image is new, nothing to do. Switch from NEW to SELFTEST will be done before when launching user application.
+   * if image is selftest, set to invalid. Rollback required.
+   * if image is valid, nothing to do.
+   * if image is invalid, Rollback is required.
+   */
+  if (SFU_SUCCESS == SFU_IMG_DetectFW(SlotNumber))
+  {
+    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
+    if (e_ret_status_se == SE_SUCCESS)
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  SLOT_ACTIVE_%d state = %d", SlotNumber, image_state);
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+      switch (image_state)
+      {
+        case FWIMG_STATE_NEW:
+        {
+          /* Multiple reset can occur during installation
+           * Switch from NEW to SELFTEST will be done before when launching user application
+           */
+          break;
+        }
+        case FWIMG_STATE_SELFTEST:
+        {
+          if (MasterSlotState == FWIMG_STATE_VALID_ALL)
+          {
+            /* Master slot is in VALID_ALL state, all other images should be validated
+             * Compare to successive validation operations VALID_ALL is a single request thus robust to reset
+             */
+            e_next_image_state = FWIMG_STATE_VALID;
+            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            if (e_ret_status_se != SE_SUCCESS)
+            {
+              TRACE("\r\n\t  SLOT_ACTIVE_%d state update error", SlotNumber);
+            }
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+            e_ret_status = SFU_ERROR;
+          }
+          else
+          {
+            /* Bootloader should never find an image in SELFTEST state - bootloader
+             * assumes self test was not able to complete and marks image as INVALID
+             */
+            e_next_image_state = FWIMG_STATE_INVALID;
+            e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            if (e_ret_status_se != SE_SUCCESS)
+            {
+              TRACE("\r\n\t  SLOT_ACTIVE_%d state update error", SlotNumber);
+            }
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+            e_ret_status = SFU_SUCCESS;
+          }
+          break;
+        }
+        case FWIMG_STATE_VALID:
+        case FWIMG_STATE_VALID_ALL:
+        {
+          break;
+        }
+        default:
+        {
+          /* image may be in INVALID state
+           * Image marked as invalid failed selftest so we need to attempt a rollback to last good image
+           */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Updates the finger print of the new firmware the header signature of the previous firmware
+  * @param  pNewHeader: pointer in ram to header of new installed fw
+  * @param  pPrevHeader: pointer in ram to header of backed-up fw
+  * @retval none
+  */
+static void UpdateHeaderFingerPrint(SE_FwRawHeaderTypeDef *pNewHeader, SE_FwRawHeaderTypeDef *pPrevHeader)
+{
+  (void) memcpy(pNewHeader->PrevHeaderFingerprint, pPrevHeader->HeaderSignature,
+                sizeof(pNewHeader->PrevHeaderFingerprint));
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+/**
+  * @brief  Check the magic from trailer or counter
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CheckTrailerMagic(uint32_t DwlSlot)
+{
+  uint8_t  magic[MAGIC_LENGTH];
+  uint8_t  clean[MAGIC_LENGTH];
+  uint8_t  signature_valid[MAGIC_LENGTH / 2];
+  uint8_t  signature_test[MAGIC_LENGTH / 2];
+  uint8_t  erased_flash_pattern[MAGIC_LENGTH];
+
+  /* Pattern initialization */
+  (void) memset(erased_flash_pattern, 0xFF, MAGIC_LENGTH);
+
+  /* Read trailer fields : TRAILER_HDR_VALID, TRAILER_HDR_TEST, MAGIC, CLEAN */
+  if (SFU_LL_FLASH_Read(signature_valid,
+                        (uint8_t *)((uint32_t)TRAILER_HDR_VALID(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_valid)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(signature_test,
+                        (uint8_t *)((uint32_t) TRAILER_HDR_TEST(DwlSlot) + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                        sizeof(signature_test)) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(magic, TRAILER_SWAP_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  if (SFU_LL_FLASH_Read(clean, TRAILER_CLEAN_ADDR(DwlSlot), MAGIC_LENGTH) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /*
+   * Check magic validity :
+   *  - last 16 bytes of validated header
+   *  - last 16 bytes of test header
+   *  - significant values (not an erased flash pattern)
+   *
+   *  Check clean tag not set :
+   *  - should be erased flash pattern but not clean-up paatern (0x55 0x55 ...)
+   */
+  if ((memcmp(magic, signature_valid, sizeof(signature_valid)) != 0)
+      || (memcmp(&magic[MAGIC_LENGTH / 2U], signature_test, sizeof(signature_test)) != 0)
+      || (memcmp(magic, erased_flash_pattern, MAGIC_LENGTH) == 0)
+      || (memcmp(clean, erased_flash_pattern, MAGIC_LENGTH) != 0))
+  {
+    return SFU_ERROR;
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Write the minimum value possible on the flash
+  * @param  pAddr: pointer to address to write .
+  * @param  pValue: pointer to the value to write
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  *
+  * @note This function should be FLASH dependent.
+  *       We abstract this dependency thanks to the type SFU_LL_FLASH_write_t.
+  *       See @ref SFU_LL_FLASH_write_t
+  */
+static SFU_ErrorStatus AtomicWrite(uint8_t *pAddr, SFU_LL_FLASH_write_t *pValue)
+{
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  return SFU_LL_FLASH_Write(&flash_if_info, pAddr, (uint8_t *)pValue, sizeof(SFU_LL_FLASH_write_t));
+}
+
+/**
+  * @brief  Clean Magic value
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus CleanMagicValue(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t clean_tag[MAGIC_LENGTH];
+
+  /* set the clean tag into trailer */
+  (void) memset(clean_tag, 0x55, MAGIC_LENGTH);
+  return SFU_LL_FLASH_Write(&flash_if_info, TRAILER_CLEAN_ADDR(DwlSlot), clean_tag, MAGIC_LENGTH);
+}
+
+/**
+  * @brief  Write Trailer Headers : TEST + VALID + SWAP
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus WriteTrailerHeader(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  /* everything is in place , just compute from present data and write it */
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+  uint8_t  magic[MAGIC_LENGTH];
+  uint32_t buffer;
+
+  /* Write Headers VALID + TEST */
+  e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_TEST(DwlSlot), (uint8_t *) pTestHeader,
+                                    SE_FW_HEADER_TOT_LEN);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_HDR_VALID(DwlSlot), (uint8_t *) pValidHeader,
+                                      SE_FW_HEADER_TOT_LEN);
+  }
+
+  /* Write Magic */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    buffer = (uint32_t) pValidHeader;
+    (void) memcpy(&magic[0U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)), MAGIC_LENGTH / 2U);
+    buffer = (uint32_t) pTestHeader;
+    (void) memcpy(&magic[MAGIC_LENGTH / 2U], (uint8_t *)(buffer + SE_FW_AUTH_LEN + (MAGIC_LENGTH / 2U)),
+                  MAGIC_LENGTH / 2U);
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, TRAILER_SWAP_ADDR(DwlSlot), magic, MAGIC_LENGTH);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the size of the swap area in a given slot sector.
+  * @note   The erasure occurs at @: @slot + index*swap_area_size
+  * @param  SlotNumber index of the slot in the list
+  * @param  Index This is the number of "swap size" we jump from the slot start
+  * @retval SFU_ SUCCESS if valid, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus EraseSlotIndex(uint32_t SlotNumber, uint32_t index)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t buffer;
+
+  buffer = SlotStartAdd[SlotNumber];
+  buffer = buffer + (SLOT_SIZE(SLOT_SWAP) * index);
+
+  /* If this is an active slot and the index is 0 then header is concerned */
+  if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber <= (SLOT_ACTIVE_1 + SFU_NB_MAX_ACTIVE_IMAGE)) && (index == 0U))
+  {
+
+    /*
+     *  As the header may not be contiguous with FW, this action is split in 2 actions :
+     *    - HEADER : executed in secured environment
+     *    - remaining part : done by SBSFU
+     */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                           SFU_IMG_IMAGE_OFFSET) ;
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SlotNumber] +
+                                             SFU_IMG_IMAGE_OFFSET, SLOT_SIZE(SLOT_SWAP) - SFU_IMG_IMAGE_OFFSET);
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)buffer, SLOT_SIZE(SLOT_SWAP)) ;
+  }
+
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify image signature of binary after decryption
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  pFwImageHeader pointer to fw header
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus VerifyFwSignatureAfterDecrypt(SE_StatusTypeDef *pSeStatus, uint32_t DwlSlot,
+                                                     SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SE_Ex_PayloadDescTypeDef payload_desc;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*
+   * The values below are not necessarily matching the way the firmware
+   * has been spread in FLASH but this is adjusted later on in the this function.
+   */
+  payload_desc.pPayload[0] = SlotStartAdd[SLOT_SWAP];
+  payload_desc.PayloadSize[0] = SLOT_SIZE(SLOT_SWAP);
+  payload_desc.pPayload[1] = SlotStartAdd[DwlSlot];
+  payload_desc.PayloadSize[1] = SLOT_SIZE(DwlSlot);
+
+  fw_size = pFwImageHeader->PartialFwSize;
+  fw_offset = (SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
+              SLOT_SIZE(SLOT_SWAP);
+
+  /*
+   * Adjusting the description of the way the Firmware is written in FLASH.
+   */
+  payload_desc.pPayload[0] = payload_desc.pPayload[0] + fw_offset;
+
+  /* The first part contains the execution offset so the payload size must be adjusted accordingly */
+  payload_desc.PayloadSize[0] = payload_desc.PayloadSize[0] - fw_offset;
+
+  if (fw_size <= payload_desc.PayloadSize[0])
+  {
+    /* The firmware is written fully in a contiguous manner */
+    payload_desc.PayloadSize[0] = fw_size;
+    payload_desc.PayloadSize[1] = 0U;
+    payload_desc.pPayload[1] = 0U;
+  }
+  else
+  {
+    /*
+     * The firmware is too big to be contained in the first payload slot.
+     * So, the firmware is split in 2 non-contiguous parts
+     */
+
+    if ((payload_desc.pPayload[1] == 0U)
+        || (payload_desc.PayloadSize[1] < (fw_size - payload_desc.PayloadSize[0])))
+    {
+      return SFU_ERROR;
+    }
+
+    /* The second part contains the end of the firmware so the size is the total size - size already stored in the
+       first area */
+    payload_desc.PayloadSize[1] = fw_size - payload_desc.PayloadSize[0];
+
+  }
+
+  /* Signature Verification */
+  return VerifyFwSignatureScatter(pSeStatus, DwlSlot, pFwImageHeader, &payload_desc, SE_FW_IMAGE_PARTIAL);
+}
+
+
+/**
+  * @brief  Swap active slot with decrypted FW to install
+  *         With the 2 images implementation, installing a new Firmware Image means swapping active slot and dwl slot.
+  *         To perform this swap, the image to be installed is split in blocks of the swap size:
+  *         SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP) blocks to be swapped .
+  *         Each of these blocks is swapped using smaller chunks of SFU_IMG_CHUNK_SIZE size.
+  *         The swap starts from the tail of the image and ends with the beginning of the image ("swap from tail to
+  *         head").
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus SwapFirmwareImages(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_LL_FLASH_write_t trailer;
+  int32_t index_active_slot;
+  int32_t index_dwl_slot_write;
+  int32_t index_dwl_slot_read;
+  int32_t chunk;
+  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  int32_t index_active_slot_partial_begin;
+  int32_t index_active_slot_partial_end;
+  int32_t index_active_slot_final_end;
+  int32_t index_dwl_slot_partial_end;
+  int32_t index_active_slot_empty_begin;
+  /* number_of_index_active_slot is the number of blocks in active slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
+  uint32_t number_of_index_active_slot = SLOT_SIZE(ActiveSlot) / SLOT_SIZE(SLOT_SWAP);
+  /* number_of_index_dwl_slot is the number of blocks in dwl slot (block of SLOT_SIZE(SLOT_SWAP) bytes) */
+  uint32_t number_of_index_dwl_slot = SLOT_SIZE(DwlSlot) / SLOT_SIZE(SLOT_SWAP);
+  /* number_of_chunk is the number of chunks used to swap 1 block (moving a block of SLOT_SIZE(SLOT_SWAP) bytes
+     split in number_of_chunk chunks of SFU_IMG_CHUNK_SIZE bytes) */
+  uint32_t number_of_chunk = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  uint32_t write_len;
+  uint32_t offset_block_partial_begin;
+  uint32_t offset_block_partial_end;
+  uint32_t offset_block_final_end;
+
+  TRACE("\r\n\t  Image preparation done.\r\n\t  Swapping the firmware images");
+
+  /* index_active_slot_partial_begin is the index of first block (of SLOT_SIZE(SLOT_SWAP) bytes) in active slot
+     impacted by partial image */
+  index_active_slot_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) /
+                                    SLOT_SIZE(SLOT_SWAP);
+
+  /* offset_block_partial_begin is the offset of first byte of partial image inside index_active_slot_partial_begin
+     block */
+  offset_block_partial_begin = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset) %
+                               SLOT_SIZE(SLOT_SWAP);
+
+  /* In case of COMPLETE update, the full slots are swapped
+     Assumption : DwlSlot is at least greater than ActiveSlot */
+  if ((pFwImageHeader->FwSize == pFwImageHeader->PartialFwSize) && (SLOT_SIZE(DwlSlot) >= SLOT_SIZE(ActiveSlot)))
+  {
+    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in active slot */
+    index_active_slot_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_partial_end is the offset of first byte following partial image, inside
+       index_active_slot_partial_end block */
+    offset_block_partial_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
+
+    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in dwl slot or swap area */
+    index_dwl_slot_partial_end = ((SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP)) - 1U;
+
+    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following final
+       image in active slot */
+    index_active_slot_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
+       block */
+    offset_block_final_end = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) % SLOT_SIZE(SLOT_SWAP);
+
+    /* set index_dwl_slot_write: starting from the end */
+    index_dwl_slot_write = (SLOT_SIZE(ActiveSlot) - TRAILER_SIZE(DwlSlot)) / SLOT_SIZE(SLOT_SWAP);
+
+  }
+  else
+  {
+    /* index_active_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in active slot */
+    index_active_slot_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
+                                     pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP);
+
+    /* offset_block_partial_end is the offset of first byte following partial image, inside
+       index_active_slot_partial_end block */
+    offset_block_partial_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->PartialFwOffset +
+                                pFwImageHeader->PartialFwSize) % SLOT_SIZE(SLOT_SWAP);
+
+    /* index_dwl_slot_partial_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       partial image in dwl slot or swap area */
+    index_dwl_slot_partial_end = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
+                                                            SLOT_SIZE(SLOT_SWAP))) % SLOT_SIZE(SLOT_SWAP) +
+                                   pFwImageHeader->PartialFwSize) / SLOT_SIZE(SLOT_SWAP)) - 1U;
+
+    /* index_active_slot_final_end is the index of block (of SLOT_SIZE(SLOT_SWAP) bytes) of first byte following
+       final image in active slot */
+    index_active_slot_final_end = ((SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) / SLOT_SIZE(SLOT_SWAP));
+
+    /* offset_block_final_end is the offset of first byte following final image, inside index_active_slot_final_end
+       block */
+    offset_block_final_end = (SFU_IMG_IMAGE_OFFSET + pFwImageHeader->FwSize) % SLOT_SIZE(SLOT_SWAP);
+
+    /* set index_dwl_slot_write: starting from the end, block index in dwl slot or swap area to receive block from
+       active slot */
+    if (index_active_slot_partial_end == (number_of_index_active_slot - 1))
+    {
+      /* last block of dwl slot can only receive last block of active slot, due to trailer presence */
+      index_dwl_slot_write = number_of_index_dwl_slot - 1;
+    }
+    else
+    {
+      index_dwl_slot_write = number_of_index_dwl_slot - 2;
+    }
+  }
+
+  /* set index_active_slot: starting from the end, block index from active slot to copy in dwl slot */
+  index_active_slot = index_active_slot_partial_end;
+
+  /* set index_dwl_slot_read: starting from the end, block index in dwl slot or swap area to copy updated image to
+     active slot */
+  index_dwl_slot_read = index_dwl_slot_partial_end;
+
+  /* Adjust indexes in case offset is 0: in this case, first block to swap is the previous one */
+  if (offset_block_partial_end == 0)
+  {
+    index_active_slot--;
+    index_dwl_slot_read--;
+  }
+
+  /*
+   * dwl slot read index should be lower than dwl slot write index.
+   * If not the case, the dwl slot is not big enough to manage this partial firmware image
+   * (depends on offset and size).
+   */
+  if (index_dwl_slot_read >= index_dwl_slot_write)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Swap one block at each loop, until all targeted blocks of active slot have been copied
+   * Concerned blocks are:
+   * 1- block impacted by partial image
+   * 2- first block containing the header
+   */
+  while (index_active_slot >= 0)
+  {
+    /* Reload watchdoag every SWAP size */
+    SFU_LL_SECU_IWDG_Refresh();
+
+    TRACE(".");
+
+    if ((index_dwl_slot_write < -1) || (index_dwl_slot_read < -1))
+    {
+      return SFU_ERROR;
+    }
+
+    /* If CPY_TO_DWL_SLOT(i) is still virgin, then swap the block from active slot to dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
+                                     TRAILER_CPY_TO_DWL_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 - index_active_slot),
+                                     sizeof(trailer));
+    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
+    {
+      /* Erase destination block in dwl slot or swap, if not the trailer block */
+      if (index_dwl_slot_write != (number_of_index_dwl_slot - 1))
+      {
+        if (index_dwl_slot_write == -1)
+        {
+          /* Erase the swap */
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
+                                                 SLOT_SIZE(SLOT_SWAP));
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED)
+        }
+        else /* index_dwl_slot_write >= 0 */
+        {
+          /* erase the size of "swap area" at @: Dwl slot + index_dwl_slot_write*swap_area_size */
+          e_ret_status = EraseSlotIndex(DwlSlot, index_dwl_slot_write);
+        }
+        if (e_ret_status !=  SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+
+      /* Copy the block from active slot to dwl slot or swap (using "number_of_chunk" chunks) */
+      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
+      {
+        /* ignore return value,  no double ecc error is expected, area already read before */
+        (void)SFU_LL_FLASH_Read(buffer, CHUNK_0_ADDR_HEADER(ActiveSlot, index_active_slot, chunk), sizeof(buffer));
+        write_len = sizeof(buffer);
+        if (index_dwl_slot_write == -1)
+        {
+          /* Destination block is the swap */
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_SWAP_ADDR(chunk), buffer, write_len);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+          if (e_ret_status != SFU_SUCCESS)
+          {
+            return SFU_ERROR;
+          }
+        }
+        else /* index_dwl_slot_write >= 0 */
+        {
+          /* Destination block is in dwl slot: Do not overwrite the trailer. */
+          if (((uint32_t)CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk)) < (uint32_t)TRAILER_BEGIN(DwlSlot))
+          {
+            /*  write is possible length can be modified  */
+            if ((uint32_t)(CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) + write_len) >
+                (uint32_t)TRAILER_BEGIN(DwlSlot))
+            {
+              write_len = TRAILER_BEGIN(DwlSlot) - CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk);
+            }
+            e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                              buffer, write_len);
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+      }
+
+      /*
+       * The block of the active firmware has been backed up.
+       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
+       */
+      e_ret_status  = AtomicWrite(TRAILER_CPY_TO_DWL_SLOT(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
+                                  (SFU_LL_FLASH_write_t *) SWAPPED);
+
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+        return SFU_ERROR;
+      }
+    }
+
+    /* If CPY_TO_ACTIVE_SLOT(i) is still virgin, then swap the block from dwl slot to active slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &trailer,
+                                     TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot, TRAILER_INDEX(DwlSlot) - 1 -
+                                                                index_active_slot),
+                                     sizeof(trailer));
+    if ((e_ret_status == SFU_SUCCESS) && (memcmp(&trailer, NOT_SWAPPED, sizeof(trailer)) == 0))
+    {
+      /* erase the size of "swap area" at @: active slot + index_active_slot*swap_area_size*/
+      e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
+
+      if (e_ret_status !=  SFU_SUCCESS)
+      {
+        return SFU_ERROR;
+      }
+
+      /*
+       * Fill block in active slot:
+       * The appropriate update image block of dwl slot together with initial image block that has been backed up in
+       * dwl slot,
+       * are associated to constitute final block in active slot (installing the block of the new firmware image).
+       */
+      for (chunk = (number_of_chunk - 1); chunk >= 0 ; chunk--)
+      {
+        /* Read complete chunk of updated image */
+        if (index_dwl_slot_read == -1)
+        {
+          /* ignore return value, no double ecc error is expected, area already read before */
+          (void)SFU_LL_FLASH_Read(buffer, CHUNK_SWAP_ADDR(chunk), sizeof(buffer));
+        }
+        else /* index_dwl_slot_read >= 0 */
+        {
+          /* ignore return value, no double ecc error is expected, area already read before */
+          (void)SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_read, chunk), sizeof(buffer));
+        }
+
+        /* Last impacted block: end of block has to be updated with initial image */
+        if (index_active_slot == index_active_slot_partial_end)
+        {
+          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
+          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) >= (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
+                                                                                  0) + offset_block_partial_end))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             sizeof(buffer));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+
+          /* If chunk is partially impacted by updated image, end of chunk is updated with the initial image content */
+          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) < (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write,
+                                                                                  0) + offset_block_partial_end))
+              && ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1))) >
+                  (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_end)))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer + (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
+                                             CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) +
+                                             (offset_block_partial_end % SFU_IMG_CHUNK_SIZE),
+                                             sizeof(buffer) - (offset_block_partial_end % SFU_IMG_CHUNK_SIZE));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+
+        /* First impacted block: beginning of block has to be updated with initial image */
+        if (index_active_slot == index_active_slot_partial_begin)
+        {
+          /* If chunk is not impacted by updated image, chunk fully takes initial image content */
+          if (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) <=
+              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             sizeof(buffer));
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+
+          /* If chunk is partially impacted by updated image, beginning of chunk is updated with the initial image
+             content */
+          if ((CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk) <
+               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)) &&
+              (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, (chunk + 1)) >
+               (CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, 0) + offset_block_partial_begin)))
+          {
+            /* check return value, as this area has not been read before */
+            e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk),
+                                             offset_block_partial_begin % SFU_IMG_CHUNK_SIZE);
+            STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+            if (e_ret_status != SFU_SUCCESS)
+            {
+              return SFU_ERROR;
+            }
+          }
+        }
+        /* Header block not impacted by partial image: complete block, except header, is updated with initial image */
+        else if (index_active_slot == 0)
+        {
+          /* check return value, as this area has not been read before */
+          e_ret_status = SFU_LL_FLASH_Read(buffer, CHUNK_1_ADDR(DwlSlot, index_dwl_slot_write, chunk), sizeof(buffer));
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+          if (e_ret_status != SFU_SUCCESS)
+          {
+            return SFU_ERROR;
+          }
+        }
+
+        /* Last block of final image: end of block has to be cleaned with empty data */
+        if (index_active_slot == index_active_slot_final_end)
+        {
+          /* If chunk is completely beyond the final image, then chunk takes empty data */
+          if (CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) >=
+              CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)
+          {
+            memset(buffer, 0xFF, sizeof(buffer));
+          }
+
+          /* If chunk is partially beyond the final image, then chunk is partially updated with empty data */
+          if ((CHUNK_0_ADDR(ActiveSlot, index_active_slot, chunk) <
+               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)) &&
+              (CHUNK_0_ADDR(ActiveSlot, index_active_slot, (chunk + 1)) >
+               (CHUNK_0_ADDR(ActiveSlot, index_active_slot_final_end, 0) + offset_block_final_end)))
+          {
+            memset(buffer + (offset_block_final_end % SFU_IMG_CHUNK_SIZE), 0xFF,
+                   sizeof(buffer) - (offset_block_final_end % SFU_IMG_CHUNK_SIZE));
+          }
+        }
+
+        write_len = SFU_IMG_CHUNK_SIZE;
+        /*  don't copy header in active slot
+            this will be done at the end during validation step */
+        if ((index_active_slot == 0) && (chunk == 0))
+        {
+          write_len = write_len - SFU_IMG_IMAGE_OFFSET;
+        }
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, CHUNK_0_ADDR_MODIFIED(ActiveSlot, index_active_slot, chunk),
+                                          buffer, write_len);
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+        if (e_ret_status != SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+
+      /*
+       * The block of the active firmware has been backed up.
+       * The trailer is updated to memorize this: the CPY bytes at the appropriate index are set to SWAPPED.
+       * Except for block 0, because block 0 is incomplete at this stage (final header installation not yet done)
+       */
+      if (index_active_slot != 0)
+      {
+        e_ret_status  = AtomicWrite(TRAILER_CPY_TO_ACTIVE_SLOT(DwlSlot,
+                                                               (TRAILER_INDEX(DwlSlot) - 1 - index_active_slot)),
+                                    (SFU_LL_FLASH_write_t *) SWAPPED);
+
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+        if (e_ret_status != SFU_SUCCESS)
+        {
+          return SFU_ERROR;
+        }
+      }
+    }
+
+    /* Decrement all block indexes */
+    index_dwl_slot_write--;
+    index_dwl_slot_read--;
+    index_active_slot--;
+
+    /*
+     * After having copied the impacted image blocks from active slot, copy also the first block
+     * due to header, if not already copied among the impacted image blocks.
+     */
+    if ((index_active_slot < index_active_slot_partial_begin) && (index_active_slot >= 0))
+    {
+      index_active_slot = 0;
+      index_dwl_slot_read = -1;  /* force read from swap area, to avoid exiting dwl slot / swap index allowed range */
+    }
+  }
+
+  /*
+   * Now, erase the blocks in active slot, located after final image
+   */
+  if (offset_block_final_end == 0)
+  {
+    index_active_slot_empty_begin = index_active_slot_final_end;
+  }
+  else
+  {
+    index_active_slot_empty_begin = index_active_slot_final_end + 1;
+  }
+  index_active_slot = number_of_index_active_slot - 1;
+  while (index_active_slot >= index_active_slot_empty_begin)
+  {
+    e_ret_status = EraseSlotIndex(ActiveSlot, index_active_slot);
+    if (e_ret_status !=  SFU_SUCCESS)
+    {
+      return SFU_ERROR;
+    }
+
+    /* Decrement block index */
+    index_active_slot--;
+  }
+
+  return e_ret_status;
+}
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/**
+  * @brief  Executes a rollback to the original firmware if a firmware update fails
+  * @param  ActiveSlot identification of the new active image
+  * @param  DwlSlot identification of previous firmware image (backed-up slot)
+  * @param  pFwImageHeader pointer in ram to the header of the backed-up FW
+  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
+  */
+static SFU_ErrorStatus RollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot,
+                                            SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t number_chunk_per_sector = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint8_t buffer[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  SE_FwRawHeaderTypeDef *p_header;
+  uint32_t size;
+  uint32_t pass_index;
+  uint32_t erase_index;
+  uint32_t fw_source_address;
+  uint32_t fw_dest_write_address;
+  uint32_t fw_dest_erase_address;
+
+  if (number_chunk_per_sector == 0U)
+  {
+    return SFU_ERROR;
+  }
+
+  size = pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET;
+  fw_source_address = SlotStartAdd[DwlSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
+  fw_dest_write_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SFU_IMG_CHUNK_SIZE) * SFU_IMG_CHUNK_SIZE);
+  fw_dest_erase_address = SlotStartAdd[ActiveSlot] + (((size - 1U) / SLOT_SIZE(SLOT_SWAP)) * SLOT_SIZE(SLOT_SWAP));
+  pass_index = ((size - 1U) / SFU_IMG_CHUNK_SIZE) + 1U;
+  erase_index = (pass_index - 1U) / number_chunk_per_sector * number_chunk_per_sector;
+
+  /* Erase the part of the active slot that will not be updated
+     ========================================================== */
+  size = (SLOT_SIZE(ActiveSlot) - (pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET)) / SLOT_SIZE(SLOT_SWAP) *
+         SLOT_SIZE(SLOT_SWAP);
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)(fw_dest_erase_address + SLOT_SIZE(SLOT_SWAP)),
+                                         size);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  while ((e_ret_status == SFU_SUCCESS) && (pass_index > 0U))
+  {
+    /* Reading phase
+       =============== */
+    e_ret_status = SFU_LL_FLASH_Read(buffer, (uint8_t *) fw_source_address, SFU_IMG_CHUNK_SIZE);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+    /* Erasing operation when aligned on erase_index
+       ============================================= */
+
+    /*
+     *  The header may not be contiguous with the FW image : 2 erasing operations needed
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if ((((pass_index - 1U) / number_chunk_per_sector) * number_chunk_per_sector) == erase_index)
+      {
+        (void) SFU_LL_SECU_IWDG_Refresh();
+        size = 0U;
+        if (erase_index == 0U)
+        {
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                                 SFU_IMG_IMAGE_OFFSET);
+          size = SFU_IMG_IMAGE_OFFSET;
+        }
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) fw_dest_erase_address + size,
+                                                 SLOT_SIZE(SLOT_SWAP) - size);
+        }
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+        erase_index -= number_chunk_per_sector;
+        fw_dest_erase_address -= SLOT_SIZE(SLOT_SWAP);
+      }
+    }
+
+    /* Writing phase
+       ============= */
+    /*
+     * Header is under isolated environment protection
+     * Thus the writing operation is split in 2 actions (HEADER + remaining part)
+     */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      size = 0U;
+      if (pass_index == 1U)
+      {
+        /* Ensure there is no Fingerprint in original firmware header
+         * This stops someone attempting multiple rollbacks by writing fake fingerprint in original header
+         */
+        p_header = (SE_FwRawHeaderTypeDef *) buffer;
+        (void) memset(p_header->PrevHeaderFingerprint, 0x00, sizeof(p_header->PrevHeaderFingerprint));
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],  buffer,
+                                          SFU_IMG_IMAGE_OFFSET);
+        size = SFU_IMG_IMAGE_OFFSET;
+      }
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) fw_dest_write_address + size,  buffer + size,
+                                          SFU_IMG_CHUNK_SIZE - size);
+      }
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+    }
+
+    /* Index update
+       ============ */
+    pass_index--;
+    fw_source_address -= SFU_IMG_CHUNK_SIZE;
+    fw_dest_write_address -= SFU_IMG_CHUNK_SIZE;
+  }
+
+  return e_ret_status;
+}
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+
+/**
+  * @brief Decrypt Image in dwl slot
+  * @ note Decrypt is done from dwl slot to dwl slot + swap with 2 images (swap contains 1st sector)
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer in ram to the header to decrypt
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus DecryptImageInDwlSlot(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+  SE_ErrorStatus   se_ret_status;
+  uint32_t NumberOfChunkPerSwap = SLOT_SIZE(SLOT_SWAP) / SFU_IMG_CHUNK_SIZE;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  /*  chunk size is the maximum , the 1st block can be smaller */
+  /*  the chunk is static to avoid  large stack */
+  uint8_t fw_decrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint8_t fw_encrypted_chunk[SFU_IMG_CHUNK_SIZE] __attribute__((aligned(8)));
+  uint32_t fw_source_address = 0U;
+  uint32_t fw_dest_address_write = 0U;
+  uint32_t fw_dest_erase_address = 0U;
+  uint32_t fw_decrypted_total_size = 0U;
+  uint32_t size;
+  uint32_t oldsize;
+  uint32_t fw_decrypted_chunk_size;
+  uint32_t fw_tag_len;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+  uint32_t pass_index = 0U;
+  uint32_t erase_index = 0U;
+
+  if ((pFwImageHeader == NULL))
+  {
+    return e_ret_status;
+  }
+
+  /* Decryption process*/
+  se_ret_status = SE_Decrypt_Init(&e_se_status, pFwImageHeader, SE_FW_IMAGE_PARTIAL);
+  if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK))
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Decryption loop*/
+    while ((e_ret_status == SFU_SUCCESS) && (fw_decrypted_total_size < (pFwImageHeader->PartialFwSize)) &&
+           (e_se_status == SE_OK))
+    {
+      if (pass_index == NumberOfChunkPerSwap)
+      {
+        fw_dest_address_write = SlotStartAdd[DwlSlot];
+        fw_dest_erase_address =  fw_dest_address_write;
+        erase_index = NumberOfChunkPerSwap;
+      }
+      if (pass_index == 0U)
+      {
+        fw_source_address = SlotStartAdd[DwlSlot] + SFU_IMG_IMAGE_OFFSET +
+                            (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP));
+        fw_dest_erase_address = SlotStartAdd[SLOT_SWAP];
+        fw_dest_address_write = fw_dest_erase_address + ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset %
+                                                                                  SLOT_SIZE(SLOT_SWAP))) %
+                                                         SLOT_SIZE(SLOT_SWAP));
+        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk) -
+                                  ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) %
+                                   sizeof(fw_decrypted_chunk));
+        if (fw_decrypted_chunk_size > pFwImageHeader->PartialFwSize)
+        {
+          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize;
+        }
+        pass_index = (((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)))
+                       % SLOT_SIZE(SLOT_SWAP)) / sizeof(fw_decrypted_chunk));
+      }
+      else
+      {
+        fw_decrypted_chunk_size = sizeof(fw_decrypted_chunk);
+
+        /* For the last 2 pass, divide by 2 remaining buffer to ensure that :
+         *     - chunk size greater than 16 bytes : minimum size of a block to be decrypted
+         *     - except last one chunk size is 16 bytes aligned
+         *
+         * Pass n - 1 : remaining bytes / 2 with (16 bytes alignment for crypto AND sizeof(SFU_LL_FLASH_write_t) for
+         *              flash programming)
+         * Pass n : remaining bytes
+         */
+
+        /* Last pass : n */
+        if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < fw_decrypted_chunk_size)
+        {
+          fw_decrypted_chunk_size = pFwImageHeader->PartialFwSize - fw_decrypted_total_size;
+        }
+        /* Previous pass : n - 1 */
+        else if ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) < ((2U * fw_decrypted_chunk_size) - 16U))
+        {
+          fw_decrypted_chunk_size = ((pFwImageHeader->PartialFwSize - fw_decrypted_total_size) / 32U) * 16U;
+
+          /* Set dimension to the appropriate length for FLASH programming.
+           * Example: 64-bit length for L4.
+           */
+          if ((fw_decrypted_chunk_size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
+          {
+            fw_decrypted_chunk_size = fw_decrypted_chunk_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                                                                 (fw_decrypted_chunk_size %
+                                                                  (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+          }
+        }
+        /* All others pass */
+        else
+        {
+          /* nothing */
+        }
+      }
+
+      size = fw_decrypted_chunk_size;
+
+      /* Decrypt Append*/
+      e_ret_status = SFU_LL_FLASH_Read(fw_encrypted_chunk, (uint8_t *) fw_source_address, size);
+      if (e_ret_status != SFU_SUCCESS)
+      {
+        break;
+      }
+      if (size != 0U)
+      {
+        se_ret_status = SE_Decrypt_Append(&e_se_status, (uint8_t *)fw_encrypted_chunk, (int32_t)size,
+                                          fw_decrypted_chunk, (int32_t *)&fw_decrypted_chunk_size);
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+        fw_decrypted_chunk_size = 0U;
+      }
+      if ((se_ret_status == SE_SUCCESS) && (e_se_status == SE_OK) && (fw_decrypted_chunk_size == size))
+      {
+        /* Erase Page */
+        if ((pass_index == erase_index)
+            || (pass_index == ((SFU_IMG_IMAGE_OFFSET + (pFwImageHeader->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))) /
+                               sizeof(fw_decrypted_chunk))))
+        {
+          (void) SFU_LL_SECU_IWDG_Refresh();
+          e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address,
+                                                 SLOT_SIZE(SLOT_SWAP)) ;
+          erase_index += NumberOfChunkPerSwap;
+          fw_dest_erase_address += SLOT_SIZE(SLOT_SWAP);
+        }
+        STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /*
+           * For last pass with remaining size not aligned on 16 bytes : Set dimension AFTER decrypt to the appropriate
+           * length for FLASH programming.
+           * Example: 64-bit length for L4.
+           */
+          if ((size & ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - 1U)) != 0U)
+          {
+            /*
+            * By construction, SFU_IMG_CHUNK_SIZE is a multiple of sizeof(SFU_LL_FLASH_write_t) so there is no risk to
+             * read out of the buffer
+             */
+            oldsize = size;
+            size = size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+            while (oldsize < size)
+            {
+              fw_decrypted_chunk[oldsize] = 0xFF;
+              oldsize++;
+            }
+          }
+
+          /* Write Decrypted Data in Flash - size has to be 32-bit aligned */
+          e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)fw_dest_address_write,  fw_decrypted_chunk,
+                                            size);
+          STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+
+          if (e_ret_status == SFU_SUCCESS)
+          {
+            /* Update flash pointer */
+            fw_dest_address_write  += (size);
+
+            /* Update source pointer */
+            fw_source_address += size;
+            fw_decrypted_total_size += size;
+            (void) memset(fw_decrypted_chunk, 0xff, sizeof(fw_decrypted_chunk));
+            pass_index += 1U;
+
+          }
+        }
+      }
+    }
+  }
+
+#if (SFU_IMAGE_PROGRAMMING_TYPE == SFU_ENCRYPTED_IMAGE)
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n\t  %d bytes of ciphertext decrypted.", fw_decrypted_total_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#endif /* SFU_ENCRYPTED_IMAGE */
+
+  if ((se_ret_status == SE_SUCCESS) && (e_ret_status == SFU_SUCCESS) && (e_se_status == SE_OK))
+  {
+    /* Do the Finalization, check the authentication TAG*/
+    fw_tag_len = sizeof(fw_tag_output);
+    se_ret_status = SE_Decrypt_Finish(&e_se_status, fw_tag_output, (int32_t *)&fw_tag_len);
+    if ((se_ret_status != SE_SUCCESS) || (e_se_status != SE_OK))
+    {
+      e_ret_status = SFU_ERROR;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Decrypt fails at Finalization stage.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+    else
+    {
+      /* erase the remaining part of the image after shifting inside dwl slot */
+      if (pass_index <= NumberOfChunkPerSwap)
+      {
+        fw_dest_erase_address = SlotStartAdd[DwlSlot];
+      }
+      e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)fw_dest_erase_address, SLOT_SIZE(SLOT_SWAP));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+    }
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  check trailer validity to allow resume installation.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+static SFU_ErrorStatus  FirmwareToResume(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                          SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t fw_header_trailer_valid[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_trailer_test[SE_FW_HEADER_TOT_LEN];
+  uint8_t fw_header_active_slot[SE_FW_HEADER_TOT_LEN];
+
+  /*
+   *  Initial conditions to be fulfilled :
+   *   - Trailer magic is present
+   *   - Active slot number is correct
+   *   - test header from trailer is signed
+   */
+
+  /* check trailer Magic */
+  e_ret_status = CheckTrailerMagic(DwlSlot);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate the pTestHeader and verify it the active slot is correct */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_test, TRAILER_HDR_TEST(DwlSlot), sizeof(fw_header_trailer_test));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Populate pTestHeader parameter */
+    e_ret_status = ParseFWInfo(pTestHeader, fw_header_trailer_test);
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Active slot number correct ?
+       As example : if magic is SFU2 active slot should be SLOT_ACTIVE_2 */
+    if (ActiveSlot == SFU_IMG_GetFwImageSlot(pTestHeader))
+    {
+      /* Check header test field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_test);
+    }
+    else
+    {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  No resume required : TRAILER_HDR_TEST not valid!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Read header in active slot if any */
+  e_ret_status = SFU_LL_FLASH_Read(fw_header_active_slot, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                   sizeof(fw_header_active_slot));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify the header signature in active slot */
+    e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_active_slot);
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Header in active slot is signed and validated, in protected area: it can be trusted. */
+
+    /* Populate pValidHeader parameter */
+    e_ret_status = ParseFWInfo(pValidHeader, fw_header_active_slot);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header valid field in trailer */
+      e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                       sizeof(fw_header_trailer_valid));
+      STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check if header in active slot is same as header valid in trailer */
+      if (memcmp(fw_header_active_slot, fw_header_trailer_valid, SE_FW_AUTH_LEN) != 0)
+      {
+        /*
+         * Header in active slot is not identical to header valid field:
+         * Either install is already complete (if header in active slot is same as header test field in trailer),
+         * or there is hack tentative.
+         * In both cases, resume install must not be triggered.
+         */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  No resume required : TRAILER_HDR_VALID already stored in active slot!");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /* Check candidate image version */
+        e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+      }
+    }
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+  else
+  {
+    /*
+     * Header in active slot is not valid.
+     * It is considered this can not be hack attempt, because header in active slot is in
+     * protected area.
+     * Possible reasons:
+     * - Swap has been interrupted during very first image installation (active slot was empty)
+     * - Swap has been interrupted during reconstitution of first sector of active slot
+     * If header test field in trailer is signed and with proper version, we resume install.
+     */
+
+    /* Read header valid field in trailer */
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_trailer_valid, TRAILER_HDR_VALID(DwlSlot),
+                                     sizeof(fw_header_trailer_valid));
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Check header valid field in trailer is signed */
+      e_ret_status = VerifyHeaderSignature((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header_trailer_valid);
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* active slot was containing an active image */
+
+        /* Populate pValidHeader parameter */
+        e_ret_status = ParseFWInfo(pValidHeader, fw_header_trailer_valid);
+
+        if (e_ret_status == SFU_SUCCESS)
+        {
+          /* Check candidate image version */
+          e_ret_status = SFU_IMG_CheckFwVersion(ActiveSlot, pValidHeader->FwVersion, pTestHeader->FwVersion);
+        }
+      }
+      else
+      {
+        /* active slot was empty or was containing bricked Fw image */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+
+    /* At this point, if (e_ret_status == SFU_SUCCESS) then resume of installation is allowed */
+  }
+
+  return e_ret_status;
+}
+
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus e_ret_status_se;
+  SE_StatusTypeDef e_se_status;
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+
+  /*
+    * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
+    * to be able to handle a specific error cause.
+    */
+  /*  check swap header */
+  e_ret_status = CheckAndGetFWHeader(DwlSlot, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, DwlSlot, &image_state);
+    if (e_ret_status_se == SE_SUCCESS)
+    {
+      /* Control the size of image to be installed taking into account trailers */
+      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize + SFU_IMG_IMAGE_OFFSET);
+
+      if ((image_state != FWIMG_STATE_NEW) || (trailer_begin < end_of_test_image))
+      {
+        /*
+          * These error causes are not memorized in the BootInfo area because there won't be any error handling
+          * procedure.
+          * If this function returns that no new firmware can be installed (as this may be a normal case).
+          */
+        e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        if (image_state != FWIMG_STATE_NEW)
+        {
+          TRACE("\r\n\t  The image state of SLOT_DWL_%d is not FWIMG_STATE_NEW!", DwlSlot);
+        }
+        if (trailer_begin < end_of_test_image)
+        {
+          TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+        }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  return e_ret_status;
+}
+
+#else
+
+/**
+  * @brief  Check that there is an Image to Install
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+static SFU_ErrorStatus FirmwareToInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *p_header_swap;
+  uint8_t fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+  uint32_t trailer_begin = (uint32_t) TRAILER_BEGIN(DwlSlot);
+  uint32_t end_of_test_image;
+  int32_t ret;
+  /*
+     * The anti-rollback check is implemented at installation stage (SFU_IMG_InstallNewVersion)
+     * to be able to handle a specific error cause.
+     */
+
+  /*  check swap header */
+  e_ret_status = CheckAndGetFWHeader(SLOT_SWAP, pFwImageHeader);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*  compare the header in dwl slot with the header in swap */
+    p_header_swap = (uint8_t *) pFwImageHeader;
+    e_ret_status = SFU_LL_FLASH_Read(fw_header_dwl_slot, (uint8_t *) SlotStartAdd[DwlSlot],
+                                     sizeof(fw_header_dwl_slot));
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* image header in dwl slot not consistent with swap header */
+      end_of_test_image = (SlotStartAdd[DwlSlot] + pFwImageHeader->FwSize +
+                           SFU_IMG_IMAGE_OFFSET);
+
+      /* the header in swap must be the same as the header in dwl slot */
+      ret = memcmp(fw_header_dwl_slot, p_header_swap, SE_FW_HEADER_TOT_LEN);
+
+      /* Check if there is enough room for the trailers */
+      if ((trailer_begin < end_of_test_image) || (ret != 0))
+      {
+        /*
+          * These error causes are not memorized in the BootInfo area because there won't be any error handling
+          * procedure.
+          * If this function returns that no new firmware can be installed (as this may be a normal case).
+          */
+        e_ret_status = SFU_ERROR;
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        if (trailer_begin < end_of_test_image)
+        {
+          TRACE("\r\n\t  The binary image to be installed overlap with the trailer area!");
+        } /* check next error cause */
+
+        if (ret != 0)
+        {
+          TRACE("\r\n\t  The headers in dwl slot and swap area do not match!");
+        } /* else do not print the message(s) again */
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+
+/**
+  * @brief Prepares the Candidate FW image for Installation.
+  *        This stage depends on the supported features: in this example this consists in decrypting the candidate
+  *        image.
+  * @note Even if the Firmware Image is in clear format the decrypt function is called.
+  *       But, in this case no decrypt is performed, it is only a set of copy operations
+  *       to organize the Firmware Image in FLASH as expected by the swap procedure.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pFwImageHeader pointer to fw header to install
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus PrepareCandidateImageForInstall(uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+    * Control if there is no additional code beyond the firmware image (malicious SW)
+    */
+  e_ret_status = VerifySlot((uint8_t *) SlotStartAdd[DwlSlot], SLOT_SIZE(DwlSlot),
+                            pFwImageHeader->PartialFwSize + (pFwImageHeader->PartialFwOffset %
+                                                             SLOT_SIZE(SLOT_SWAP)));
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_ADDITIONAL_CODE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * Pre-condition: all checks have been performed,
+    *                so all FWIMG module variables are populated.
+    * Now we can decrypt in FLASH.
+    *
+    * Initial FLASH state (focus on dwl slot and swap area):
+    *
+    * Depending on partial FW offset, we can have:
+    * <dwl slot>   : {Candidate Image Header + encrypted FW - page k}
+    *                {encrypted FW - page k+1}
+    *                .....
+    *                {encrypted FW - page k+N}
+    *                .....
+    * </dwl slot>
+    * or:
+    * <dwl slot>   : {Candidate Image Header }
+    *                {encrypted FW - page k}
+    *                .....
+    *                {encrypted FW - page k+N}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area>  : {Candidate Image Header}
+    * </Swap area>
+    */
+  e_ret_status =  DecryptImageInDwlSlot(DwlSlot, pFwImageHeader);
+
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page k}
+    * </Swap area>
+    *
+    * The Candidate FW image has been decrypted
+    * and a "hole" has been created in dwl slot to be able to swap.
+    */
+
+  e_ret_status = VerifyFwSignatureAfterDecrypt(&e_se_status, DwlSlot, pFwImageHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_SIGNATURE_ERR);
+  }
+
+  /* Return the result of this preparation */
+  return (e_ret_status);
+}
+
+
+/**
+  * @brief  Install the new version
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pValidHeader: pointer in ram to header of valid fw to backup
+  * @param  pTestHeader: pointer in ram to header of fw to test
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+static SFU_ErrorStatus InstallNewVersion(uint32_t ActiveSlot, uint32_t DwlSlot, SE_FwRawHeaderTypeDef *pValidHeader,
+                                         SE_FwRawHeaderTypeDef *pTestHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    * </dwl slot>
+    *
+    * <Swap area> : {No Header (shift) + decrypted FW data from page k}
+    * </Swap area>
+    *
+    */
+
+  /* erase "swap area" size at the end of dwl slot */
+  e_ret_status = EraseSlotIndex(DwlSlot, (TRAILER_INDEX(DwlSlot) - 1U));
+  if (e_ret_status !=  SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_ERASING_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    *                {at least the swap area size at the end of the last page of dwl slot is empty }
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
+    * </Swap area>
+    *
+    */
+
+
+  /*  write trailer  */
+  e_ret_status = WriteTrailerHeader(DwlSlot, pValidHeader, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_TRAILER_UPDATE_ERR);
+    return e_ret_status;
+  }
+
+  /*
+    * At this step, the FLASH content looks like this:
+    *
+    * <dwl slot>   : {decrypted FW - data from page k+1 in page 0}
+    *                {decrypted FW - data from page k+2 in page 1}
+    *                .....
+    *                {decrypted FW - data from page k+N in page N-1}
+    *                {page N is now empty}
+    *                .....
+    *                {the last page of dwl slot ends with the trailer magic patterns and the free space for the trailer
+    *                 info}
+    * </dwl slot>
+    *
+    * <Swap area>  : {No Header (shift) + decrypted FW data from page 0}
+    * </Swap area>
+    *
+    * The trailer magic patterns is ActiveFwHeader|CandidateFwHeader|SWAPmagic.
+    * This is followed by a free space to store the trailer info (N*CPY_TO_ACTIVE_SLOT) and (N*CPY_TO_DWL_SLOT):
+    *
+    *<------------------------------------------ Last page of dwl slot --------------------------------------->
+    * |HEADER_TOT_LEN|HEADER_TOT_LEN|MAGIC_LENGTH|MAGIC_LENGTH |N*sizeof(FLASH_write_t)|N*sizeof(FLASH_write_t)
+    * | header 1     | header 2     |SWAP magic  |CLEAN pattern|N*CPY_TO_ACTIVE_SLOT   | N*CPY_TO_DWL_SLOT
+    *
+    */
+
+  /*  swap  */
+  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, pTestHeader);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_SWAP_ERR);
+    return e_ret_status;
+  }
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /* Update fingerprint from previous FW image */
+  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Validate immediately the new active FW */
+  e_ret_status = SFU_IMG_Validation(ActiveSlot, pTestHeader);
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_HEADER_VALIDATION_ERR);
+    return e_ret_status;
+  }
+
+  /* clear swap pattern */
+  e_ret_status = CleanMagicValue(DwlSlot);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Memorize the error */
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_MAGIC_ERR);
+    return e_ret_status;
+  }
+
+  return e_ret_status;   /* Leave the function now */
+}
+
+/* Functions Definition : services ------------------------------------------- */
+/**
+  * @brief FW Image Handling (FWIMG) initialization function from swap process.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void)
+{
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+  uint32_t i;
+
+  /*
+   * Sanity check: let's make sure the slot sizes are correct
+   * to avoid discrepancies between linker definitions and constants in sfu_fwimg_regions.h
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP))))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d size (%d) must be a multiple of swap size (%d)\r\n",
+              SLOT_ACTIVE_1 + i, SLOT_SIZE(SLOT_ACTIVE_1 + i), SLOT_SIZE(SLOT_SWAP));
+        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
+      }
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (!(SFU_IMG_REGION_IS_MULTIPLE(SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP))))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_DWL_%d size (%d) must be a multiple of swap size (%d)\r\n",
+              i + 1U, SLOT_SIZE(SLOT_DWL_1 + i), SLOT_SIZE(SLOT_SWAP));
+        e_ret_status = SFU_IMG_INIT_SLOTS_SIZE_ERROR;
+      }
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the slot size is correct with regards to the swap procedure constraints.
+   * The swap procedure cannot succeed if the trailer info size is bigger than what a chunk used for swapping can carry.
+   */
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      if (((int32_t)(SFU_IMG_CHUNK_SIZE - (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)))) < 0)
+      {
+        e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+        TRACE("\r\n= [FWIMG] %d bytes required for the swap metadata of SLOT_DWL_%d is too much\r\n",
+              (TRAILER_INDEX(SLOT_DWL_1 + i) * sizeof(SFU_LL_FLASH_write_t)), i + 1U);
+      } /* else the swap settings are fine from a metadata size perspective */
+    }
+  }
+
+  /*
+   * Sanity check: let's make sure the swap size is correct with regards to the swap procedure constraints.
+   * The swap size must be a multiple of the chunks size used to do the swap.
+   */
+#if defined(__GNUC__)
+  __IO uint32_t swap_size = SLOT_SIZE(SLOT_SWAP), swap_chunk = SFU_IMG_CHUNK_SIZE;
+  if (0U != ((uint32_t)(swap_size % swap_chunk)))
+#else
+  if (0U != ((uint32_t)(SLOT_SIZE(SLOT_SWAP) % SFU_IMG_CHUNK_SIZE)))
+#endif /* __GNUC__ */
+  {
+    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the swap size (%d) is not a multiple\r\n",
+          SFU_IMG_CHUNK_SIZE, SLOT_SIZE(SLOT_SWAP));
+  } /* else the swap settings are fine from a chunk size perspective */
+
+  /*
+   * Sanity check: let's make sure the chunks used for the swap procedure are big enough with regards to the offset
+   * giving the start @ of the firmware
+   */
+  if (((int32_t)(SFU_IMG_CHUNK_SIZE - SFU_IMG_IMAGE_OFFSET)) < 0)
+  {
+    e_ret_status = SFU_IMG_INIT_SWAP_SETTINGS_ERROR;
+    TRACE("\r\n= [FWIMG] The swap procedure uses chunks of %d bytes but the firmware start offset is %d bytes\r\n",
+          SFU_IMG_CHUNK_SIZE, SFU_IMG_IMAGE_OFFSET);
+  } /* else the swap settings are fine from a firmware start offset perspective */
+
+  /*
+   * Sanity check: let's make sure SWAP slot is properly aligned with regards to flash constraints
+   */
+
+  if (!IS_ALIGNED(SlotStartAdd[SLOT_SWAP]))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] swap (%x) is not properly aligned\r\n",
+          SlotStartAdd[SLOT_SWAP]);
+  } /* else swap is properly aligned */
+
+  /*
+   * Sanity check: let's make sure the swap area does not overlap SB code area protected by WRP)
+   */
+  if(!((((SlotStartAdd[SLOT_SWAP]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+    || (((SlotEndAdd[SLOT_SWAP] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+  {
+    TRACE("\r\n= [FWIMG] SWAP overlaps SBSFU code area protected by WRP\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap Swap area)
+   */
+  if (!(((SlotStartAdd[SLOT_SWAP]) > KMS_DATASTORAGE_END)
+        || ((SlotEndAdd[SLOT_SWAP]) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps Swap area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /* FWIMG core initialization completed */
+  return e_ret_status;
+}
+
+
+
+/**
+  * @brief Checks if there is a pending firmware installation.
+  *        3 situations can occur:
+  *        A. Pending firmware installation: a firmware is ready to be installed but the installation has never been
+  *           triggered so far.
+  *        B. Pending firmware installation resume: a firmware installation has been interrupted and a resume procedure
+  *           is required to finalize installation.
+  *        C. No firmware installation pending
+  * @note  The anti-rollback check is not taken into account at this stage.
+  *        But, if the firmware to be installed already carries some metadata (VALID tag) a newly downloaded firmware
+  *        should not have then the installation is not considered as pending.
+  * @note This function populates the FWIMG module variables:
+  *        - case SFU_IMG_FWUPDATE_STOPPED : fw_image_header_to_test & fw_image_header_validated
+  *        - case SFU_IMG_FWIMAGE_TO_INSTALL : fw_image_header_to_test
+  *        - case SFU_IMG_NO_FWUPDATE : none
+  * @param  pDwlSlotToInstall identification of the downloaded slot to install
+  * @param  pActiveSlotToResume identification of the active slot to resume
+  * @param  pActiveSlotToRollback identification of the active slot to rollback
+  * @retval SFU_IMG_ImgInstallStateTypeDef Pending Installation status (pending install, pending resume install, no
+  *         pending action)
+  */
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback)
+{
+  uint32_t i;
+  uint32_t j;
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  SE_FwStateTypeDef master_slot_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /*
+   * The order of the checks is important:
+   *
+   * A. Check if a FW update has been interrupted first.
+   *    This check is based on the content of the trailer area and the validity of the update image.
+   *
+   * B. Check if a Firmware image is waiting to be installed.
+   */
+
+  /* Init values */
+  *pActiveSlotToResume = SLOT_INACTIVE;
+  *pActiveSlotToRollback = SLOT_INACTIVE;
+  *pDwlSlotToInstall = SLOT_INACTIVE;
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /*
+   * Read MASTER_SLOT state (if configured == (!= 255)) :
+   *   In case of VALID_ALL state, all other slots in SELF_TEST should be validated
+   *   Else all other slots in SELF_TEST are invalidated
+   */
+  if (MASTER_SLOT != 0xFFU)
+  {
+    if (SFU_SUCCESS == SFU_IMG_DetectFW(MASTER_SLOT))
+    {
+      if (SE_SFU_IMG_GetActiveFwState(&e_se_status, MASTER_SLOT, &master_slot_state) != SE_SUCCESS)
+      {
+        master_slot_state = FWIMG_STATE_INVALID;
+      }
+    }
+  }
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Check image installation stopped or installation to be done
+     =========================================================== */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+      /* Rollback if seltftest not validated
+         =================================== */
+      if (SFU_SUCCESS == FirmwareToRollback(SLOT_ACTIVE_1 + i, master_slot_state))
+      {
+        /* The firmware state is either FWIMG_STATE_SELFTEST or FWIMG_STATE_INVALID
+         * Rollback is required
+         * Stop at first occurrence : next ones if any will be resumed after reset
+         */
+        *pActiveSlotToRollback = SLOT_ACTIVE_1 + i;
+        return SFU_IMG_FWIMAGE_ROLLBACK;
+      }
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+      /* Check trailer valide : installation stopped ?
+         ============================================= */
+      for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+      {
+        /* Slot configured ? */
+        if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+        {
+          if (SFU_SUCCESS == FirmwareToResume(SLOT_ACTIVE_1 + i, SLOT_DWL_1 + j, &fw_image_header_validated,
+                                               &fw_image_header_to_test))
+          {
+            /* A Firmware Update has been stopped
+             * fw_image_header_to_test & fw_image_header_validated have been populated
+             * Stop at first occurrence : next ones if any will be resumed after reset
+             */
+            *pActiveSlotToResume = SLOT_ACTIVE_1 + i;
+            *pDwlSlotToInstall = SLOT_DWL_1 + j;
+            return SFU_IMG_FWUPDATE_STOPPED;
+          }
+        }
+      }
+    }
+  }
+
+  /* Install new firmware if requested in the swap
+     ============================================= */
+  for (j = 0U; j < SFU_NB_MAX_DWL_AREA; j++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + j] != 0U)
+    {
+      if (SFU_SUCCESS == FirmwareToInstall(SLOT_DWL_1 + j, &fw_image_header_to_test))
+      {
+        /*
+         * A Firmware is available for installation:
+         * fw_image_header_to_test has been populated
+         * Stop at first occurrence : next ones if any will be installed after reset
+         */
+        *pDwlSlotToInstall = SLOT_DWL_1 + j;
+        return SFU_IMG_FWIMAGE_TO_INSTALL;
+      }
+    }
+  }
+
+  return SFU_IMG_NO_FWUPDATE;
+}
+
+/**
+  * @brief Installs a new firmware, performs the post-installation checks and sets the metadata to tag this firmware as
+  *        valid if the checks are successful.
+  *        The anti-rollback check is performed and errors are memorized in the bootinfo area, but no action is taken
+  *        in this procedure.
+  *        Cryptographic operations are used (if enabled): the firmware is decrypted and its authenticity is checked
+  *        afterwards if the cryptographic scheme allows this (signature check for instance).
+  *        The detailed errors are memorized in bootinfo area to be processed as critical errors if needed.
+  *        This function modifies the FLASH content.
+  *        If this procedure is interrupted during image preparation stage (e.g.: switch off) it cannot be resumed.
+  *        If it is interrupted during installation stage, it can be resumed.
+  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *        running the procedure): SFU_IMG_CheckPendingInstallation, SFU_IMG_CheckCandidateVersion should be called
+  *        first.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint32_t active_slot = 0U;
+
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /*
+   * Check the active slot is big enough
+   */
+  if (fw_image_header_to_test.FwSize + SFU_IMG_IMAGE_OFFSET + TRAILER_SIZE(DwlSlot) <= SLOT_SIZE(active_slot))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /*
+   * The preparation stage consists in decrypting the candidate firmware image.
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation() call.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = PrepareCandidateImageForInstall(DwlSlot, &fw_image_header_to_test);
+  }
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    goto exit;
+  }
+
+  /*
+   * Populate fw_image_header_validated
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    pbuffer = (uint8_t *) SlotHeaderAdd[active_slot];
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, pbuffer,
+                                     sizeof(fw_image_header_validated));
+  }
+
+  /*
+   * Installing the new firmware image consists in swapping the 2 FW images.
+   */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = InstallNewVersion(active_slot, DwlSlot, &fw_image_header_validated, &fw_image_header_to_test);
+  }
+
+exit:
+  /* Erase downloaded FW in case of authentication/integrity error
+     Erase downloaded FW also in case of installation issue to avoid any infinite loop */
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Installation procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Installation procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  /* return the installation result */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Resume installation of new valid firmware after installation failure.
+  *        If this procedure is interrupted before its completion (e.g.: switch off) it can be resumed.
+  *        This function is dedicated (only) to the resume of installation when a new firmware installation is stopped
+  *        before its completion.
+  *        This function does not handle explicitly the metadata tagging the firmware as valid: these metadata must
+  *        have been preserved during the installation procedure.
+  *        This function modifies the FLASH content.
+  * @note  It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *        running the procedure): need to make sure an installation has been interrupted.
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+   * resume swap process
+   * fw_image_header_to_test is already populated after SFU_IMG_CheckPendingInstallation()call.
+   */
+  e_ret_status = SwapFirmwareImages(ActiveSlot, DwlSlot, &fw_image_header_to_test);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_SWAP_ERR);
+    goto exit;
+  }
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+  /* Update fingerprint from previous FW image */
+  UpdateHeaderFingerPrint(&fw_image_header_to_test, &fw_image_header_validated);
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+  /* Validate immediately the new active FW */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_IMG_Validation(ActiveSlot, &fw_image_header_to_test);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_EXCPT_SetError(SFU_EXCPT_HEADER_VALIDATION_ERR);
+      goto exit;
+    }
+  }
+
+  /* clear swap pattern */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = CleanMagicValue(DwlSlot);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      /* Memorize the error */
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_MAGIC_ERR);
+      goto exit;
+    }
+  }
+
+exit:
+  /* Erase downloaded FW in case of installation issue to avoid any infinite loop */
+  if (SFU_SUCCESS != e_ret_status)
+  {
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Resume procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Resume procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return e_ret_status;
+}
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/**
+  * @brief Executes a rollback to the original firmware if a firmware update fails
+  * @param  ActiveSlot identification of the active image
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if the rollback is successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_TriggerRollbackInstallation(uint32_t ActiveSlot, uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t zero_buffer[32U] = {0U};
+  SE_FwRawHeaderTypeDef active_header;
+  SE_FwRawHeaderTypeDef dwl_header;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+
+  /* Verify slot 1 header is from fw that triggered the update */
+  /* Backed-up header is in flash Slot1 at pHdr address */
+  /* Load current header (start of Slot 0, normally behind the firewall) */
+  e_ret_status =  SFU_LL_FLASH_Read((uint8_t *)&active_header, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                    sizeof(dwl_header));
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_READ_FAILED);
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    /* if fingerprint is 0x00 we cannot do rollback */
+    if (0U == memcmp(active_header.PrevHeaderFingerprint, zero_buffer, sizeof(active_header.PrevHeaderFingerprint)))
+    {
+      e_ret_status = SFU_ERROR;
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR);
+      goto exit;
+    }
+  }
+
+  /* Get and check previous FW header saved in DWL slot
+     then compare header signature with active slot header finger print */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = CheckAndGetFWHeader(DwlSlot, &dwl_header);
+    if (SFU_SUCCESS == e_ret_status)
+    {
+      /* Fingerprint of active firmware should be the signature of previous firmware */
+      if (0 != memcmp(active_header.PrevHeaderFingerprint, dwl_header.HeaderSignature,
+                      sizeof(active_header.PrevHeaderFingerprint)))
+      {
+        e_ret_status = SFU_ERROR;
+        SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_PREV_ID_ERR);
+        goto exit;
+      }
+    }
+  }
+
+  /* Rollback execution */
+  if (SFU_SUCCESS == e_ret_status)
+  {
+    e_ret_status = RollbackInstallation(ActiveSlot, DwlSlot, &dwl_header);
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_EXCPT_SetError(SFU_EXCPT_FWIMG_ROLLBACK_ERR);
+      goto exit;
+    }
+  }
+
+exit:
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Rollback is complete, now erase downloaded image to prevent an attempt to
+     * reinstall
+     */
+    (void) SFU_IMG_EraseDownloadedImg(DwlSlot);
+  }
+  else
+  {
+    /* Erase the header of active slot to avoid any infinite loop */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[ActiveSlot],
+                                           SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+  }
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    TRACE("\r\n\t  Rollback procedure completed.");
+  }
+  else
+  {
+    TRACE("\r\n\t  Rollback procedure cannot be finalized!");
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Updates the state of the current firmware
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_UpdateImageState(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SE_ErrorStatus e_ret_status_se;
+  SE_FwStateTypeDef image_state = FWIMG_STATE_INVALID;
+  SE_StatusTypeDef e_se_status;
+  SE_FwStateTypeDef e_next_image_state;
+
+  /* Read Image state : if image is new, set to self test
+   *
+   * An OTA image arrives on the device in the NEW state
+   * The bootloader switches the new image to SELFTEST state so
+   * that when the image boots it can detect that it should carry out the
+   * self test routine
+   */
+  e_ret_status_se = SE_SFU_IMG_GetActiveFwState(&e_se_status, SlotNumber, &image_state);
+  if (e_ret_status_se == SE_SUCCESS)
+  {
+    if (image_state == FWIMG_STATE_NEW)
+    {
+      e_next_image_state = FWIMG_STATE_SELFTEST;
+      e_ret_status_se = SE_SFU_IMG_SetActiveFwState(&e_se_status, SlotNumber, &e_next_image_state);
+      if (e_ret_status_se == SE_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+      else
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n\t  SLOT_ACTIVE_%d state = %d failed to switch in FWIMG_STATE_SELFTEST", SlotNumber,
+              image_state);
+#endif /* (SFU_VERBOSE_DEBUG_MODE)     */
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+  return e_ret_status;
+}
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @brief  Get size of the trailer
+  * @note   This area mapped at the end of a dwl slot is not available for the firmware image
+  * @param  SlotNumber index of the slot in the list
+  * @retval Size of the trailer.
+  */
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber)
+{
+  return TRAILER_SIZE(SlotNumber);
+}
+
+/**
+  * @brief  Erase downloaded firmware in case of decryption/authentication/integrity error
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot)
+{
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  SFU_ErrorStatus e_ret_status_dwl = SFU_ERROR;
+  SFU_ErrorStatus e_ret_status_swap = SFU_ERROR;
+
+  e_ret_status_dwl = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[DwlSlot],
+                                             SLOT_SIZE(DwlSlot));
+  STATUS_FWIMG(e_ret_status_dwl == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  e_ret_status_swap = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotStartAdd[SLOT_SWAP],
+                                              SLOT_SIZE(SLOT_SWAP));
+  STATUS_FWIMG(e_ret_status_swap == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  return (((e_ret_status_swap != SFU_SUCCESS) || (e_ret_status_dwl != SFU_SUCCESS)) ?  SFU_ERROR : SFU_SUCCESS);
+}
+
+#endif /* !(SFU_NO_SWAP) */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
new file mode 100644
index 00000000..9083965c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
@@ -0,0 +1,747 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
+#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
+                               STM32 board specificities */
+#include "tkms.h"
+#include "sfu_interface_crypto_scheme.h"
+#include <string.h>
+#include "kms_platf_objects_interface.h"     /* To get keys handle definitions */
+
+/* Private defines -----------------------------------------------------------*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+#define GCM_TAGBITS_SIZE          128
+#define GCM_IVLEN_BITS            16
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+/* Private variables ---------------------------------------------------------*/
+CK_SESSION_HANDLE EncryptSession;
+CK_SESSION_HANDLE DecryptSession;
+CK_SESSION_HANDLE AuthenticateSession;
+CK_SESSION_HANDLE VerifySession;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static uint8_t *gcm_tag_header;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Get AES key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/**
+  * @brief  Get ECDSA key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
+
+
+/**
+  * @brief Secure Engine Decrypt Init function.
+  *        It is a wrapper of Decrypt_Init function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+  gcm_tag_header = pxSE_Metadata->FwTag;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_MECHANISM cktest_aes_cbc_mechanism =
+  {
+    CKM_AES_CBC,
+    iv_cbc,
+    SE_IV_LEN
+  };
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * In this crypto scheme the Firmware is not encrypted.
+   * The Decrypt operation is called anyhow before installing the firmware.
+   * Indeed, it allows moving the Firmware image blocks in FLASH.
+   * These moves are mandatory to create the appropriate mapping in FLASH
+   * allowing the swap procedure to run without using the swap area at each and every move.
+   *
+   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
+   */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the decryption session */
+  if (se_status == SE_SUCCESS)
+  {
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do as we won't decrypt anything */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Append function.
+  *        It is a wrapper of Decrypt_Append function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffe pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
+  if (0 == InputSize)
+  {
+    /* Nothing to do but we must return a success for the decrypt operation to continue */
+    return (SE_SUCCESS);
+  }
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  /* Buffer decryption */
+  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * The firmware is not encrypted.
+   * The only thing we need to do is to recopy the input buffer in the output buffer
+   */
+  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
+  *pOutputSize = InputSize;
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Finish function.
+  *        It is a wrapper of Decrypt_Finish function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  *peSE_Status = SE_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  memcpy(pOutputBuffer, gcm_tag_header, 16);
+
+  /* End-up decryption session */
+  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do */
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Close the session */
+  rv = C_CloseSession(DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Init function.
+  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  CK_MECHANISM cktest_sha_256_mechanism =
+  {
+    CKM_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize encryption session  */
+    rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest initialization */
+  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Append function.
+  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Buffer encryption */
+  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
+                       (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest calculation */
+  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Finish function.
+  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* End-up encryption session */
+  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* End-up Digest calculation */
+  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Close the session */
+  rv = C_CloseSession(AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Verify Raw Fw Header Tag.
+  *        It verifies the signature of a raw header file.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pFwRawHeader pointer to RawHeader Buffer.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  int32_t fw_raw_header_output_length = SE_TAG_LEN;
+  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
+  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    (CK_BYTE_PTR)gcm_header,
+    ((int32_t)SE_FW_AUTH_LEN),
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  const uint8_t *pPayload;                        /* Metadata payload */
+  int32_t payloadSize;                            /* Metadata length to be considered for hash */
+  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
+  CK_OBJECT_HANDLE hECDSAKey = 0UL;
+  CK_MECHANISM cktest_ecdsa_256_mechanism =
+  {
+    CKM_ECDSA_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointers allocation */
+  if (NULL == pxFwRawHeader)
+  {
+    *peSE_Status = SE_KO;
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  gcm_tag_header = pxFwRawHeader->HeaderSignature;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up decryption session  : control if the tag is correct */
+  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
+
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  pPayload = (const uint8_t *)pxFwRawHeader;
+  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up verification process : control if the signature is correct */
+  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Double Check to avoid basic fault injection */
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+
+    if (se_status == SE_SUCCESS)
+    {
+      /* End-up verification process : control if the signature is correct */
+      rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+      if (rv != CKR_OK)
+      {
+        se_status = SE_ERROR;
+        *peSE_Status = SE_KO;
+      }
+    }
+  }
+
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+  /* Close the session */
+  rv = C_CloseSession(VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
new file mode 100644
index 00000000..992941e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
@@ -0,0 +1,73 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported functions ------------------------------------------------------- */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                uint32_t SE_FwType);
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType);
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader);
+
+#define SE_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType ) \
+  SFU_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType )
+
+#define SE_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+
+#define SE_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType ) \
+  SFU_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType )
+
+#define SE_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+#define SE_VerifyHeaderSignature( peSE_Status, pxFwRawHeader ) \
+  SFU_VerifyHeaderSignature( peSE_Status, pxFwRawHeader )
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* SFU_KMS_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
new file mode 100644
index 00000000..d7bb34fa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
@@ -0,0 +1,187 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage the KMS Images.
+  *          This file contains the kms services the bootloader (sfu_boot) can
+  *             use to deal with the KMS Blob images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_KMS_C
+
+
+#ifdef KMS_ENABLED
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_kms.h"
+#include "sfu_fwimg_internal.h" /* required to re-use kmsblob_image_header_to_test (and SWAP_HDR) in the KMS blob 
+                                   installation procedure */
+#include "sfu_fwimg_regions.h"  /* required because KMS re-uses the SBSFU SWAP area */
+
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * Magic pattern identifying the beginning of a KMS blob.
+  */
+static uint8_t     kms_magic[4] = {"KMSB"};
+
+/**
+  * KMS Blob header (metadata) of the candidate Blob in SWAP: structured format (access by fields)
+  */
+static KMS_BlobRawHeaderTypeDef kmsblob_image_header_to_test;
+static uint32_t                 kmsblob_slot;
+
+/* Private macros ------------------------------------------------------------*/
+/**
+  * The KMS blob header has the same structure as the SBSFU Firmware Header.
+  * Therefore, authenticating a KMS blob header can be done by re-using the SBSFU FWIMG service authenticating a FW
+  * Header.
+  * The authentication of the KMS blob itself is not in the scope of sfu_kms, this is handled by the KMS middleware.
+  */
+#define SFU_KMS_AUTHENTICATE_BLOB_HEADER SFU_IMG_CheckAndGetFWHeader
+
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Check that there is a Blob to Install ==> KMSB MAGIC present at the beginning of a DWN slot ?
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+
+  /*
+   * The KMS blob header uses a structure dedicated Header.
+   * In this function we focus only on the KMS blob header, not the entire KMS blob.
+   */
+
+  for (uint32_t i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      /*  Loading the KMS blob header contained in the SWAP area to verify if it can be a valid KMS blob */
+      if (SFU_LL_FLASH_Read((uint8_t *)(uint32_t)(&kmsblob_image_header_to_test),
+                            (uint8_t *)SlotStartAdd[SLOT_DWL_1 + i],
+                            sizeof(KMS_BlobRawHeaderTypeDef)) == SFU_SUCCESS)
+      {
+        /* Is there any KMSBlob present in the SWAP ? */
+        if (memcmp((uint8_t *)&kmsblob_image_header_to_test.KMSMagic, kms_magic, sizeof(kms_magic)) == 0)
+        {
+          /*
+           * Check the authenticity of the KMS Blob stored in the DWN slot.
+           * This check is restricted to the authentication of the KMS blob header.
+           * Authenticating the KMS blob itself is the role of the KMS module (KMS middleware).
+           */
+          kmsblob_slot = SLOT_DWL_1 + i; /* Save also DWN slot for later use */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Retrieve information about the KMS blob hdr and location in flash
+  * @param  pHdr is the pointer to the encrypted blob header
+  * @param  pFlash is the pointer to the blob location in flash
+  * @retval none
+  */
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  if ((ppHdr != NULL) && (ppFlash != NULL))
+  {
+    *ppHdr = (uint8_t *)(uint32_t)&kmsblob_image_header_to_test;
+    *ppFlash = (uint8_t *)(((uint32_t)SlotStartAdd[kmsblob_slot]) + sizeof(kmsblob_image_header_to_test));
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the Blob
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_EraseBlob(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /*  Erase in flash  */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                         (uint8_t *) SlotStartAdd[kmsblob_slot],
+                                         SLOT_SIZE(kmsblob_slot));
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Checks if there is a pending Blob installation.
+  *        3 situations can occur:
+  *        A. First installation request for a blob: a blob is ready to be installed but the installation has never
+  *           been triggered so far.
+  *        B. Blob installation to be retried: a blob installation has been interrupted (switch off) and we can restart
+  *           its installation.
+  *        C. No blob installation pending.
+    * @note This function populates the FWIMG module variable: kmsblob_image_header_to_test.
+  *         If a KMS blob is present then it is copied in kmsblob_image_header_to_test.
+  * @param  None.
+  * @retval SFU_KMS_BlobInstallStateTypeDef Pending Installation status (installation requested or not)
+  */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void)
+{
+  SFU_KMS_BlobInstallStateTypeDef e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+
+  /*
+   * While the SWAP AREA contains a KMSB Magic, it means the KMSBlob installation is not finalized.
+   *
+   */
+  if (SFU_SUCCESS == SFU_KMS_BlobToInstall())
+  {
+    /*
+     * A KMS blob is available for installation:
+     * kmsblob_image_header_to_test has been populated with this blob.
+     */
+    e_ret_state = SFU_KMS_BLOBIMAGE_TO_INSTALL;
+  }
+  else
+  {
+    /* No pending update */
+    e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+  }
+
+  return e_ret_state;
+}
+
+#endif /* KMS_ENABLED */
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
new file mode 100644
index 00000000..8a47b5e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
@@ -0,0 +1,78 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.h
+  * @author  MCD Application Team
+  * @brief   This file contains the KMS Blob service (SFU_KMS_ENABLED) API definitions.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_KMS Installation Status Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_KMS_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_KMS_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_KMS_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_KMS_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_KMS_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_KMS_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_KMS Blob Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_BLOBIMAGE_TO_INSTALL = 0x0U,   /*!< There is a KMS blob to be installed */
+  SFU_KMS_NO_BLOBUPDATE,                 /*!< No KMS blob installation pending */
+} SFU_KMS_BlobInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void);
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash);
+
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void);
+SFU_ErrorStatus SFU_KMS_EraseBlob(void);
+
+SFU_ErrorStatus SFU_KMS_InvalidateCurrentFirmware(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImgMetadata(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImg(void);
+SFU_ErrorStatus SFU_KMS_LaunchActiveImg(void);
+int32_t SFU_KMS_GetActiveFwVersion(void);
+SFU_ErrorStatus SFU_KMS_HasValidActiveFirmware(void);
+SFU_ErrorStatus SFU_KMS_Validation(uint8_t *pHeader);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_KMS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
new file mode 100644
index 00000000..8164c740
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
@@ -0,0 +1,229 @@
+/**
+  ******************************************************************************
+  * @file    sfu_mpu_isolation.c
+  * @author  MCD Application Team
+  * @brief   SFU MPU isolation primitives
+  *          This file provides functions to manage the MPU isolation of the Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_mpu_isolation.h"
+#include "sfu_low_level_security.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_SE_STACK_Clean(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief Clean SE Stack.
+  *
+  */
+static void SFU_SE_STACK_Clean(void)
+{
+  uint32_t sp_base = SE_REGION_RAM_START;
+  uint32_t sp_top = SE_REGION_RAM_STACK_TOP;
+  uint32_t sp = __get_MSP();
+  if ((sp > sp_base) && (sp <= sp_top))
+  {
+    while (sp_base < sp)
+    {
+      *(__IO uint32_t *)sp_base = 0U;
+      sp_base += 4U;
+    }
+  }
+  else
+  {
+    /*  error trigger a reset */
+    HAL_NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @brief This is the Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  * @note Installed in startup_stm32xxxx.s
+  *
+  * This handler handles 2 requests:
+  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter
+  * \li (see @ref SE_FunctionIDTypeDef)
+  * \li Internal SB_SFU SVC: run a SB_SFU privileged operation provided as a parameter (see @ref SFU_MPU_PrivilegedOpId)
+  */
+void MPU_SVC_Handler(uint32_t *args)
+{
+  /* in PSP (args) contains caller context as follow *
+    * args[0] :R0
+    * args[1] :R1
+    * args[2] :R2
+    * args[3] :R3
+    * args[4] :R12
+    * args[5] :LR
+    * args[6] :PC to return after exception
+    * args[7] :xPSR
+  */
+  /*  read code OP of instruction that generate SVC interrupt
+   *  bottom 8-bits of the SVC instruction code OP are SVC value  */
+  uint8_t code = ((uint8_t *)args[6])[-2];
+
+  switch (code)
+  {
+    case 0:
+      /* A Secure Engine service is called */
+      SE_SVC_Handler(args);
+      break;
+    case 1:
+      /* Internal SB_SFU privileged service */
+      SFU_MPU_SVC_Handler(args);
+      break;
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This function triggers a SB_SFU Privileged Operation requested with SB_SysCall
+  * @param args arguments
+  *             The first argument is the identifier of the requested operation.
+  * @retval void
+  */
+void SFU_MPU_SVC_Handler(uint32_t *args)
+{
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+
+  switch (args[0])
+  {
+    case SB_SYSCALL_LAUNCH_APP:
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Disable (Hide) Hide Protection Area */
+      SET_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS);
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* Clean SE STACK RAM */
+      SFU_SE_STACK_Clean();
+      /* Release CM4 (via SRAM) */
+      *pSbsfuFlag = SBSFU_BOOTED;
+#if defined(SFU_MPU_PROTECT_ENABLE)
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+      SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+      HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Check Hide Protection Area */
+      if (READ_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS) != FLASH_ACR2_HDPADIS)
+      {
+        /* Security issue : execution stopped ! */
+        HAL_NVIC_SystemReset();
+      }
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* make sure to return into application in privileged mode */
+      __set_CONTROL(__get_CONTROL() & ~0x3U); /* clear process stack & unprivileged bit */
+      launch_application(args[1], (uint32_t)jump_to_function);
+      break;
+    case SB_SYSCALL_RESET:
+      HAL_NVIC_SystemReset();
+      break;
+    case SB_SYSCALL_MPU_CONFIG:
+#if defined(SFU_MPU_PROTECT_ENABLE)
+      /* Privileged mode required for MPU re-configuration */
+      (void)SFU_LL_SECU_SetProtectionMPU(SFU_SECOND_CONFIGURATION);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DMA_CONFIG:
+#if defined(SFU_DMA_PROTECT_ENABLE)
+      /* Privileged mode required for DMA re-configuration (clocks access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDMA();
+#endif /* SFU_DMA_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DAP_CONFIG:
+#if defined(SFU_DAP_PROTECT_ENABLE)
+      /* Privileged mode required for DAP re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDAP();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_TAMPER_CONFIG:
+#if defined(SFU_TAMPER_PROTECT_ENABLE)
+      /* Privileged mode required for TAMPER re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionANTI_TAMPER();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    case SB_SYSCALL_GTZC_CONFIG:
+      /* Privileged mode required for GTZC checks */
+      SFU_LL_SECU_CheckProtectionGTZC();
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This functions triggers a SB_SFU system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SFU_MPU_SysCall(uint32_t syscall, ...)
+{
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+    */
+  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate a SB_SFU syscall */
+}
+
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t SFU_MPU_IsUnprivileged(void)
+{
+  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
+}
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void SFU_MPU_EnterUnprivilegedMode(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
+  __set_CONTROL(__get_CONTROL() | 3U); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
new file mode 100644
index 00000000..56ac7d87
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
@@ -0,0 +1,92 @@
+/**
+  ******************************************************************************
+  * @file    sfu_mpu_isolation.h
+  * @author  MCD Application Team
+  * @brief   SFU MPU isolation primitives
+  *          This file provides functions to manage the MPU isolation of the Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+
+
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_MPU_ISOLATION_H
+#define SFU_MPU_ISOLATION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  *  @brief SFU BOOT Privileged operation identifier.
+  *         SB_SFU can trigger a SB_SFU privileged operation by calling a syscall (@ref SFU_MPU_SysCall) with one of
+  *         the values of this enum.
+  */
+typedef enum
+{
+  SB_SYSCALL_LAUNCH_APP = 1, /*!< SB_SFU service call identifier: launch the user application */
+  SB_SYSCALL_RESET,          /*!< SB_SFU service call identifier: system reset */
+  SB_SYSCALL_MPU_CONFIG,     /*!< SB_SFU service call identifier: MPU re-configuration */
+  SB_SYSCALL_DMA_CONFIG,     /*!< SB_SFU service call identifier: DMA re-configuration */
+  SB_SYSCALL_DAP_CONFIG,     /*!< SB_SFU service call identifier: DAP re-configuration */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  SB_SYSCALL_GTZC_CONFIG,    /*!< SB_SFU service call identifier: GTZC re-configuration */
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+  SB_SYSCALL_TAMPER_CONFIG   /*!< SB_SFU service call identifier: TAMPER re-configuration */
+} SFU_MPU_PrivilegedOpId;
+
+/* Exported functions ------------------------------------------------------- */
+/* SVC call handler for Secure Engine: this function is defined in se_interface_common.c */
+extern void SE_SVC_Handler(uint32_t *args);
+
+/* SB_SFU SVC handling */
+void MPU_SVC_Handler(uint32_t *args);
+void SFU_MPU_SVC_Handler(uint32_t *args);
+void SFU_MPU_SysCall(uint32_t syscall, ...);
+
+/* Helpers for unprivileged mode handling */
+void SFU_MPU_EnterUnprivilegedMode(void);
+uint32_t SFU_MPU_IsUnprivileged(void);
+
+/**
+  * @brief This function sets the Stack Pointer and Program Counter to jump into a function
+  * @param  vector_address Start Address (where to jump)
+  * @retval void
+  */
+void jump_to_function(uint8_t *vector_address);
+
+/**
+  * @brief This function returns from an interrupt and launches the user application code
+  * @param  applicationVectorAddress Start address of the user application (active slot+offset: vectors)
+  * @param  exitFunctionAddress Function to jump into the user application code
+  * @param  address Function to jump into the BL code in case of exit_sticky usage
+  * @param  magic number used by BL code in case of exit_sticky usage
+  * @retval void
+  */
+void launch_application(uint32_t applicationVectorAddress, uint32_t exitFunctionAddress);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_MPU_ISOLATION_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
new file mode 100644
index 00000000..4c3720e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
@@ -0,0 +1,332 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_test.h"
+#include "main.h"
+#include "sfu_trace.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "string.h" /* required for strncmp */
+
+#if defined(SFU_TEST_PROTECTION)
+
+extern RTC_HandleTypeDef RtcHandle;
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_ISOLATION 1
+
+/* Automatic tests : list of tests (Address, Message, Operation */
+/* Flash programming by 64 bits */
+#define SHIFT_FLASH_WRITE (8U-1U)
+
+/* Private variables ---------------------------------------------------------*/
+static ProtectionTest_t aProtectTests[] =
+{
+#ifdef SFU_MPU_PROTECT_ENABLE
+  {SFU_RAM_BASE, "MPU SRAM start add", TEST_EXECUTE},
+  {SFU_RAM_END - 3U, "MPU SRAM end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
+  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
+  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
+  /* READ_FLASH is possible only in privileged mode */
+  {INTVECT_START, "Init. Vector", TEST_READ_FLASH},
+  {SLOT_DWL_1_START, "MPU code dwl slot1 begin add", TEST_EXECUTE},
+  {SLOT_DWL_1_END - 3U, "MPU code dwl slot1 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SLOT_DWL_2_START, "MPU code dwl slot2 begin add", TEST_EXECUTE},
+  {SLOT_DWL_2_END - 3U, "MPU code dwl slot2 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SLOT_DWL_3_START, "MPU code dwl slot3 begin add", TEST_EXECUTE},
+  {SLOT_DWL_3_END - 3U, "MPU code dwl slot3 end add", TEST_EXECUTE},   /* -3 : alignment for 32bits execute test */
+  {SWAP_START, "MPU code swap begin add", TEST_EXECUTE},
+  {SWAP_END - 3U, "MPU code swap end add", TEST_EXECUTE},       /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_WRP_PROTECT_ENABLE
+  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
+  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
+  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
+#endif /* SFU_WRP_PROTECT_ENABLE */
+#ifdef SFU_PCROP_PROTECT_ENABLE
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
+  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
+                                                                                         writing test */
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
+  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+#if defined(TEST_ISOLATION)
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
+  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
+                                                                         64bits writing test + WRP protection applies */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
+  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
+  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
+                                                                    that initializes all the variables in the binary. */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
+  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+#endif /* TEST_ISOLATION  */
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Testing the MPU protection of the OBs */
+  /*
+   * WL55JC
+   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
+   * 0x1FFF 7818 Reserved Write protection 1A
+   * 0x1FFF 7820 Reserved Write protection 1B
+   */
+  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFF7800", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFF7818", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFF7820", TEST_WRITE_FLASH},
+#endif /* SFU_MPU_PROTECT_ENABLE  */
+  {0xAAAAAAAA, "Execution successful", TEST_END},
+};
+
+
+/* Automatic test : list of operation */
+uint8_t aTestOperation[][20] =
+{
+  "write 8 bytes",
+  "read 1 byte",
+  "erase 512 bytes",
+  "write 4 bytes",
+  "read 1 byte",
+  "execute",
+  "end"
+};
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_TEST_Protection(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
+  * @param  None.
+  * @retval None.
+  */
+static void SFU_TEST_Protection(void)
+{
+  uint32_t test_idx;
+  uint32_t flashErrCode = 0;
+  uint64_t pattern = 0U;
+  uint32_t page_error = 0U;
+  FLASH_EraseInitTypeDef p_erase_init;
+  TestStatus status = TEST_IN_PROGRESS;
+  __IO uint8_t tmp;
+  void (*func)(void);
+
+  /*
+    * Now checking the security
+    * We will try to access protected @ and run protected code.
+    * Each time a a flash error will be raised or a reset will be generated by IP protection.
+    * At next boot we read the backup register to check the next @ until all addresses have been verified.
+    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
+    * FWALL/Code Isolation
+    */
+
+  do
+  {
+    /* slow down execution */
+    HAL_Delay(100);
+
+    /* Increment test number for next execution */
+    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
+    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
+           aProtectTests[test_idx].address);
+
+    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
+    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
+        && (aProtectTests[test_idx].address > 0x00000FFFU))
+    {
+      switch (aProtectTests[test_idx].type)
+      {
+        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_FLASH :
+          HAL_FLASH_Unlock();
+          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
+          HAL_FLASH_Lock();
+          flashErrCode = HAL_FLASH_GetError();
+          printf("\r\nflash error code: %x", flashErrCode);
+          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+
+          /*
+           * OBs protection test: no MPU enabled because the OB cannot be written directly.
+           * A flash error should occur.
+           */
+          break;
+
+        /* Trying to read in FLASH : RDP set in case of PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_READ_FLASH :
+          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
+          HAL_Delay(1);                                                 /* ensure Flag is set */
+          /*
+           * When Isolation activated : RESET should be generated
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
+          {
+            status = TEST_ERROR;
+          }
+
+          break;
+
+        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_ERASE_FLASH :
+          HAL_FLASH_Unlock();
+          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
+          p_erase_init.NbPages     = 1;
+          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
+          HAL_FLASH_Lock();
+          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+          break;
+
+        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_RAM :
+          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
+          status = TEST_ERROR;
+          break;
+
+        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_READ_RAM :
+          tmp = *(uint8_t *)aProtectTests[test_idx].address;
+          printf(" value : %d ", tmp);
+          status = TEST_ERROR;
+          break;
+
+          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
+        case TEST_EXECUTE :
+          func = (void(*)(void))(aProtectTests[test_idx].address);
+          func();
+          status = TEST_ERROR;
+          break;
+
+        /* End of execution */
+        case TEST_END :
+          status = TEST_COMPLETED;
+          break;
+
+        default :
+          break;
+      }
+    }
+  } while (status == TEST_IN_PROGRESS) ;
+
+  if (status == TEST_ERROR)
+  {
+    SFU_TEST_Error();
+  }
+  else if (status == TEST_COMPLETED)
+  {
+    /* reset for next run (need a RESET of the platform to restart a session) */
+    printf("\b\b\b\b\b\b\b\b");
+    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
+  }
+}
+
+/**
+  * @brief  Initialization of backup register and start test
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Init(void)
+{
+  /* Use register DR0 to know which if the test sequence is in progress or done */
+  /* Use register DR1 to know which test to run after a reset */
+
+  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
+  {
+    return;
+  }
+  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
+                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
+                                                                  reset test index (DR1) */
+  {
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+  }
+
+  /* Start test */
+  SFU_TEST_Protection();
+}
+
+/**
+  * @brief  Reset backup register to be able to execute a new test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Reset(void)
+{
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+}
+
+/**
+  * @brief  Error detected during test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Error(void)
+{
+  printf(" ===> KO!!!!!");
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
+}
+
+#endif /* SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
new file mode 100644
index 00000000..375e610f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
@@ -0,0 +1,81 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Test Protections functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TEST_H
+#define SFU_TEST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "app_sfu.h"
+
+#if defined(SFU_TEST_PROTECTION)
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  TEST_WRITE_FLASH = 0U,                /* Writing test in FLASH */
+  TEST_READ_FLASH,                      /* Reading test in FLASH */
+  TEST_ERASE_FLASH,                     /* Erasing test in FLASH */
+  TEST_WRITE_RAM,                       /* Writing test in RAM */
+  TEST_READ_RAM,                        /* Reading test in RAM */
+  TEST_EXECUTE,                         /* Execution function test */
+  TEST_END,                             /* Last test : Success ! */
+} TestType;
+
+typedef enum
+{
+  TEST_IN_PROGRESS = 0U,                /* Test in progress */
+  TEST_COMPLETED,                       /* Test ended : success */
+  TEST_ERROR,                           /* Test aborted : error */
+} TestStatus;
+
+
+#define PROTECT_MSG_LEN (35U)           /* message to be displayed length           */
+typedef struct
+{
+  uint32_t address;                     /* address to be tested */
+  uint8_t msg[PROTECT_MSG_LEN];         /* message to be displayed when testing */
+  TestType type;                        /* type of test */
+} ProtectionTest_t;
+
+/* Exported constants --------------------------------------------------------*/
+/* Magic number saved in DR0 backup register */
+#define MAGIC_TEST_DONE          0xAAA2
+#define MAGIC_TEST_INIT          0xAAA3
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_TEST_Init(void);
+void SFU_TEST_Reset(void);
+void SFU_TEST_Error(void);
+
+#endif /* SFU_TEST_PROTECTION */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TEST_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
new file mode 100644
index 00000000..d79c6aa0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
@@ -0,0 +1,2021 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SFU Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "stm32wlxx_it.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_RDP_PROTECT_ENABLE
+#warning "SFU_RDP_PROTECT_DISABLED"
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_GTZC_PROTECT_ENABLE
+#warning "SFU_GTZC_PROTECT_DISABLED"
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_C2SWDBG_PROTECT_ENABLE
+#warning "SFU_C2SWDBG_DISABLED"
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+
+
+#ifndef  SFU_TAMPER_PROTECT_ENABLE
+/* #warning "SFU_TAMPER_PROTECT_DISABLED" */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+#warning "SFU_IWDG_PROTECT_DISABLED"
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+
+  /* install header : read /write only for privileged */
+  {
+    SFU_PROTECT_MPU_HEADER_RGNV, SFU_PROTECT_MPU_HEADER_START, SFU_PROTECT_MPU_HEADER_SIZE,
+    SFU_PROTECT_MPU_HEADER_PERM, SFU_PROTECT_MPU_HEADER_EXECV, SFU_PROTECT_MPU_HEADER_SREG,
+    SFU_PROTECT_MPU_HEADER_TEXV, SFU_PROTECT_MPU_HEADER_C, SFU_PROTECT_MPU_HEADER_B
+  },
+
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+
+  /* KMS_DataStorage: NVM storage */
+  {
+    SFU_PROTECT_MPU_KMS_RGNV, SFU_PROTECT_MPU_KMS_START, SFU_PROTECT_MPU_KMS_SIZE,
+    SFU_PROTECT_MPU_KMS_PERM, SFU_PROTECT_MPU_KMS_EXECV, SFU_PROTECT_MPU_KMS_SREG,
+    SFU_PROTECT_MPU_KMS_TEXV, SFU_PROTECT_MPU_KMS_C, SFU_PROTECT_MPU_KMS_B
+  },
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+  /* DMA */
+  {
+    SFU_PROTECT_MPU_DMA_RGNV, SFU_PROTECT_MPU_DMA_START, SFU_PROTECT_MPU_DMA_SIZE,
+    SFU_PROTECT_MPU_DMA_PERM, SFU_PROTECT_MPU_DMA_EXECV, SFU_PROTECT_MPU_DMA_SREG,
+    SFU_PROTECT_MPU_DMA_TEXV, SFU_PROTECT_MPU_DMA_C, SFU_PROTECT_MPU_DMA_B
+  },
+#endif /* SFU_DMA_PROTECT_ENABLE */
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+
+
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus    SFU_LL_SECU_SetProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void);
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check that a GTZC interrupt is enabled
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if enabled, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus GTZC_CheckITEnabled(uint32_t PeriphId)
+{
+  uint32_t register_address;
+  uint32_t bit_pos;
+
+  register_address = (uint32_t)&(GTZC_TZIC->IER1) + (4U * GTZC_GET_REG_INDEX(PeriphId));
+  bit_pos = (uint32_t)(1UL << GTZC_GET_PERIPH_POS(PeriphId));
+  if (READ_BIT(*(uint32_t *)register_address, bit_pos) == bit_pos)
+  {
+    return SFU_SUCCESS;
+  }
+  return SFU_ERROR;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void) HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  (void) HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA_A  **********/
+  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
+  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set Flash configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply PCRoP ******************************************************/
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSUBGHZSPI(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
+#ifdef SFU_RDP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_RDP_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        (void) HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Lock the Options Bytes ***************************************************/
+  (void) HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void) HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Check/Apply MPU ************************************************/
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for MPU second-configuration
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_MPU_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DMA_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DAP_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  /* Check/Apply  ANTI_TAMPER *************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for TAMPER second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_TAMPER_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#ifdef SFU_TEST_PROTECTION
+  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_TEST_PROTECTION */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+  /* Check/Apply  C2SWDBG *****************************************************/
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    if (SFU_LL_SECU_CheckProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  i_ctrl++;
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+  /* Check/Apply  GTZC ********************************************************/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionGTZC() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_GTZC;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for GTZC checks
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_GTZC_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+  /* Check/Apply  CLOCK_MONITOR **********************************************/
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
+
+  /* Check/Apply  TEMP_MONITOR **********************************************/
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Return the reset source  detected after a reboot. The related flag is reset
+  *         at the end of this function.
+  * @param  peResetpSourceId: to be filled with the detected source of reset
+  * @note   In case of multiple reset sources this function return only one of them.
+  *         It can be improved returning and managing a combination of them.
+  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
+{
+  /* Check if the last reset has been generated from a Watchdog exception */
+  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
+      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
+  {
+    *peResetpSourceId = SFU_RESET_WDG_RESET;
+
+  }
+
+
+  /* Check if the last reset has been generated from a Low Power reset */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_LOW_POWER;
+
+  }
+
+  /* Check if the last reset has been generated from a Software reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_SW_RESET;
+
+  }
+  /* Check if the last reset has been generated from an Option Byte Loader reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_OB_LOADER;
+  }
+  /* Check if the last reset has been generated from a Hw pin reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_HW_RESET;
+
+  }
+  /* Unknown */
+  else
+  {
+    *peResetpSourceId = SFU_RESET_UNKNOWN;
+  }
+}
+
+/**
+  * @brief  Clear the reset sources. This function should be called after the actions
+  *         on the reset sources has been already taken.
+  * @param  none
+  * @note   none
+  * @retval none
+  */
+void SFU_LL_SECU_ClearResetSources()
+{
+  /* Clear reset flags  */
+  __HAL_RCC_CLEAR_RESET_FLAGS();
+}
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Flash configuration */
+  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+/**
+  * @brief  Apply the RDP protection
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply RDP **********************************************************/
+  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
+  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
+#else
+    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
+    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+  return e_ret_status;
+}
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  if ((psFlashOptionBytes->WRPStartOffset == SFU_PROTECT_WRP_PAGE_START_1) &&
+      (psFlashOptionBytes->WRPEndOffset   == SFU_PROTECT_WRP_PAGE_END_1))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
+    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
+    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /* configure a new area for the currently executing code (SBSFU + active slots) */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_2_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_2_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_2_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_2_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_2_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_2_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_2_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_2_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_2_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* remap the current area (SBSFU + active slots) */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_1_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_1_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_1_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_1_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_1_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_1_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_1_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_1_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_1_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  Remove the write rights for the SRAM synchronization flag */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_SRAM_FLAG_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_SRAM_FLAG_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_SRAM_FLAG_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_SRAM_FLAG_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_SRAM_FLAG_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_SRAM_FLAG_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_SRAM_FLAG_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_SRAM_FLAG_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_SRAM_FLAG_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  return SFU_SUCCESS;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t mpu_region_num; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
+          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
+          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    /* Enables the MPU */
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    /* Enables memory fault exception */
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    if ((SCB->SHCSR & SCB_SHCSR_MEMFAULTENA_Msk) != SCB_SHCSR_MEMFAULTENA_Msk)
+    {
+      return SFU_ERROR;
+    }
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+
+  e_ret_status = SFU_SUCCESS;
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check if GTZC protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionGTZC(void)
+{
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t periph_attributes;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Check FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SRAM1_SIZE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SE_REGION_RAM_START - SRAM2_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_NPRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZIC peripherals ***********************************************/
+
+  /* Check FLASH_ACR2 */
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the IT for the concerned peripherals */
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZIC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZSC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_AES) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_RNG) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SUBGHZSPI) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PWR) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASHIF) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMAMUX) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASH) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PKA) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the GTZC TZC lock *************************************************/
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+
+    return SFU_SUCCESS;
+  }
+
+  return SFU_ERROR;
+}
+
+/**
+  * @brief  Apply GTZC protection: FLASH, RAM, PKA, RNG, AES.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionGTZC(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Handle the GTZC TZC lock *************************************************/
+
+  /* Configure FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SRAM1_SIZE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SE_REGION_RAM_START - SRAM2_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                           (GTZC_TZSC_ATTRIBUTE_NPRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZIC peripherals ***********************************************/
+
+  /* Configure FLASH_ACR2 */
+  MODIFY_REG(FLASH->ACR2, FLASH_ACR2_PRIVMODE, FLASH_ACR2_PRIVMODE);
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable the IT for the concerned peripherals */
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZIC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZSC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_AES) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_RNG) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SUBGHZSPI) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PWR) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASHIF) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMAMUX) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASH) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PKA) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  NVIC_EnableIRQ(TZIC_ILA_IRQn);
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Handle the GTZC TZC lock *************************************************/
+  HAL_GTZC_TZSC_Lock(GTZC_TZSC);
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return SFU_SUCCESS;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#else
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  Apply ANTI TAMPER protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  RTC_TamperTypeDef  stamperstructure;
+
+  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
+  TAMPER_GPIO_CLK_ENABLE();
+
+  /* Configure Tamper Pin */
+  /* tamper is an additional function */
+  /* not an alternate Function : config not needed */
+  /* Configure the RTC peripheral */
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    /* Configure RTC Tamper */
+    stamperstructure.Tamper                       = RTC_TAMPER_ID;
+    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
+    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
+    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
+    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
+    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
+    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
+    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
+    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
+
+    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
+    {
+
+      /* Clear the Tamper interrupt pending bit */
+      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
+    }
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+/**
+  * @brief  Check if C2SWDBG protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_C2SWDBGEN) == 0U)
+  {
+    /* C2SWDBG disabled */
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply C2SWDBG protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void)
+{
+  HAL_FLASHEx_DisableC2Debug();
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  return SFU_SUCCESS;
+}
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply CLOCK MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a clock monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Clock Monitoring */
+  /* Add your code here for customization
+     e.g. if HSE or LSE is used enable the CSS!
+   ...
+   ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply TEMP MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a temperature monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Temperature Monitoring */
+  /* Add your code here for customization
+     ...
+     ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the active slots
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n= [SBOOT] Secure Mode: [%x]", psFlashOptionBytes->SecureMode);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr == SFU_SECURE_FLASH_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure Flash Start Address: [%x]", psFlashOptionBytes->SecureFlashStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr == SFU_HIDE_PROTECTION_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Hide Protection Start Address: [%x]", psFlashOptionBytes->HideProtectionStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr == SFU_SECURE_SRAM1_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM1 Start Address: [%x]", psFlashOptionBytes->SecureSRAM1StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr == SFU_SECURE_SRAM2_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM2 Start Address: [%x]", psFlashOptionBytes->SecureSRAM2StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START;
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Secure User Memory is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/**
+  * @brief  Activate Secure User Memory protection and jump into user application.
+  * @param  Address of the code to jump into
+  * @retval none.
+  */
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check Sub-GHz radio SPI protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply Sub-GHz radio SPI ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->SUBGHZSPISecureAccess == OB_SUBGHZSPI_SECURE_ACCESS_ENABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply Sub-GHz radio SPI protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SUBGHZSPI_SECURE_ACCESS;
+
+    psFlashOptionBytes->SUBGHZSPISecureAccess = OB_SUBGHZSPI_SECURE_ACCESS_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
new file mode 100644
index 00000000..73227eba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
@@ -0,0 +1,348 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+/* Secure User Memory end : from FLASH_BASE to end of active slot header */
+#define SFU_SEC_MEM_AREA_ADDR_END SFU_ROM_ADDR_END
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+
+
+#define SFU_PROTECT_GTZC_EXEC_SE_START INTVECT_START /*!< GTZC Configuration */
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area in unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys) in unprivileged mode.
+  *                   Read only capability configured
+  *                   Inner region inside the Region 0
+  *                   From 0x0802C000 ==> 0x0803FFFF
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START 0x08020000UL
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_128KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x07U               /*!< 128 Kbytes / 8 * 5 ==> 80 Kbytes */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the read/write operation in privileged mode for Header of active slots
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_HEADER_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_HEADER_START SLOT_ACTIVE_2_HEADER
+#define SFU_PROTECT_MPU_HEADER_SREG  0x00U                 /*!< All subregions activated */
+#define SFU_PROTECT_MPU_HEADER_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_HEADER_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_HEADER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_HEADER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_HEADER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_HEADER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the read/write operation in privileged mode for KMS_DataStorage
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_KMS_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_KMS_START (uint32_t)KMS_DATASTORAGE_START
+#define SFU_PROTECT_MPU_KMS_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_KMS_SIZE  MPU_REGION_SIZE_8KB
+#define SFU_PROTECT_MPU_KMS_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_KMS_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_KMS_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_KMS_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_KMS_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 6 - Forbid all access to the DMA IPs
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_DMA_RGNV  MPU_REGION_NUMBER6
+#define SFU_PROTECT_MPU_DMA_START 0x40020000UL
+#define SFU_PROTECT_MPU_DMA_SREG  0xC0U               /*!< 4 Kbytes / 8 * 6 ==> 3 Kbytes */
+#define SFU_PROTECT_MPU_DMA_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_DMA_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_DMA_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_DMA_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_DMA_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_DMA_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+/**
+  */
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 2 - Enable the execution for the SBSFU and active slots in unprivileged mode.
+  *                   Read only capability configured
+  *                   Execution capability enabled
+  *                   Execution capability restricted by other regions (MPU and secure)
+  *                   From 0x08015000 ==> 0x08017FFF (12 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_1_RGNV  MPU_REGION_NUMBER2
+#define APP_PROTECT_MPU_FLASHEXE_1_START 0x08014000UL
+#define APP_PROTECT_MPU_FLASHEXE_1_SIZE  MPU_REGION_SIZE_16KB
+#define APP_PROTECT_MPU_FLASHEXE_1_SREG  0x03U               /*!< 16 Kbytes / 8 * 6 ==> 12 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_1_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_1_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_1_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_1_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the execution for the SBSFU and active slots in unprivileged mode.
+  *                   Read only capability configured
+  *                   Execution capability enabled
+  *                   Execution capability restricted by other regions (MPU and secure)
+  *                   From 0x08018000 ==> 0x0803FFFF (160 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_2_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_FLASHEXE_2_START FLASH_BASE          /*!< FLASH memory area */
+#define APP_PROTECT_MPU_FLASHEXE_2_SIZE  MPU_REGION_SIZE_256KB
+#define APP_PROTECT_MPU_FLASHEXE_2_SREG  0x07U               /*!< 256 Kbytes / 8 * 5 ==> 160 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_2_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_2_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_2_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_2_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_2_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define APP_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define APP_PROTECT_MPU_SRAM_FLAG_START 0x20000C00UL
+#define APP_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_256B
+#define APP_PROTECT_MPU_SRAM_FLAG_SREG  0x7FU                /*!< 256 bytes / 8 * 1 ==> 32 bytes */
+#define APP_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
+  * @{
+  */
+#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOC_CLK_ENABLE()
+#define RTC_TAMPER_ID                      RTC_TAMPER_1
+#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
+  * @{
+  */
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
+  * @{
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
+  * @{
+  */
+typedef enum
+{
+  SFU_RESET_UNKNOWN = 0x00U,
+  SFU_RESET_WDG_RESET,
+  SFU_RESET_LOW_POWER,
+  SFU_RESET_HW_RESET,
+  SFU_RESET_BOR_RESET,
+  SFU_RESET_SW_RESET,
+  SFU_RESET_OB_LOADER,
+} SFU_RESET_IdTypeDef;
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
+  * @{
+  */
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
+                                                                            separate section to support PCRoP */
+#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
+#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
+                                                                            Std Protections cannot be
+                                                                            added/removed/modified */
+#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
+                                                                            boot in bank1! */
+
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
+#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
+#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
+#define SFU_RUNTIME_PROTECTION_GTZC          ((uint32_t)0x00010000U)   /*!< GTZC protection */
+#define SFU_RUNTIME_PROTECTION_C2SWDBG       ((uint32_t)0x00020000U)   /*!< CPU2 Software Debug */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
+                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
+                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
+                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | \
+                                             SFU_RUNTIME_PROTECTION_TEMP_MONITOR  | \
+                                             SFU_RUNTIME_PROTECTION_GTZC          | \
+                                             SFU_RUNTIME_PROTECTION_C2SWDBG)
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
+
+/* Exported functions ------------------------------------------------------- */
+#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
+/*!<SFU Redirect of RTC Tamper Event Callback*/
+#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+#define SFU_CALLBACK_GTZC_TZIC(void) HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
+void               SFU_LL_SECU_ClearResetSources(void);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+#ifdef SFU_DMA_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+#ifdef SFU_DAP_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#if defined(SFU_MPU_PROTECT_ENABLE)
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_CheckProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/main.h
new file mode 100644
index 00000000..91935232
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/main.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+#include "stm32wlxx_nucleo.h"
+#include "sfu_def.h"
+#include "app_sfu.h"
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep);
+void SFU_EXCPT_Security_Error(void);
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
new file mode 100644
index 00000000..b9458efe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/**
+  * @brief  SB Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SB Flow Control : Steps definition
+  */
+
+#define FLOW_STEP_C2BOOT 0x00006787U             /*!< Step C2OPT and SBRV value */
+
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0002cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+#define FLOW_STEP_C2_DDS 0x00003befU             /*!< Step DDS value */
+#else
+#define FLOW_STEP_C2_DDS 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+/**
+  * @brief  SB Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_C2BOOT (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_C2BOOT)
+#define FLOW_CTRL_UBE (FLOW_CTRL_C2BOOT ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_C2_DDS (FLOW_CTRL_WRP ^ FLOW_STEP_C2_DDS)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_C2_DDS ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SB Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
+#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
+
+/**
+  * @brief  SB Flow Control : Exported macro
+  */
+#if defined(MAIN_C)
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+#else
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+#endif /* MAIN_C */
+
+/* Control with STEP operation :
+ * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+ */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+      SFU_EXCPT_Security_Error();\
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h
new file mode 100644
index 00000000..755199fd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_com_loader.h
@@ -0,0 +1,121 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_LOADER_H
+#define SFU_COM_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include <stdint.h>
+#include <stdio.h>
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_COM_LOADER_YMODEM Status structure definition
+  */
+typedef enum
+{
+  SFU_COM_YMODEM_OK       = 0x00U,  /*!< OK */
+  SFU_COM_YMODEM_ERROR    = 0x01U,  /*!< Error */
+  SFU_COM_YMODEM_ABORT    = 0x02U,  /*!< Abort */
+  SFU_COM_YMODEM_TIMEOUT  = 0x03U,  /*!< Timeout */
+  SFU_COM_YMODEM_DATA     = 0x04U,  /*!< Data */
+  SFU_COM_YMODEM_LIMIT    = 0x05U   /*!< Limit*/
+} SFU_COM_YMODEM_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)3U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)4U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)1U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)2U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)3U)    /*!<Cnumber Index*/
+#else
+/* Minicom YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)6U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)7U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)4U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)5U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)6U)    /*!<Cnumber Index*/
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_PACKET_TRAILER_SIZE     ((uint32_t)2U)    /*!<Trailer Size*/
+#define SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE    (SFU_COM_YMODEM_PACKET_HEADER_SIZE + SFU_COM_YMODEM_PACKET_TRAILER_SIZE \
+                                                - 1U)           /*!<Overhead Size*/
+#define SFU_COM_YMODEM_PACKET_SIZE             ((uint32_t)128U)  /*!<Packet Size*/
+#define SFU_COM_YMODEM_PACKET_1K_SIZE          ((uint32_t)1024U) /*!<Packet 1K Size*/
+
+#define SFU_COM_YMODEM_FILE_NAME_LENGTH        ((uint32_t)64U)   /*!< File name length*/
+#define SFU_COM_YMODEM_FILE_SIZE_LENGTH        ((uint32_t)16U)   /*!< File size length*/
+
+#define SFU_COM_YMODEM_SOH                     ((uint8_t)0x01U)  /*!< Start of 128-byte data packet */
+#define SFU_COM_YMODEM_STX                     ((uint8_t)0x02U)  /*!< Start of 1024-byte data packet */
+#define SFU_COM_YMODEM_EOT                     ((uint8_t)0x04U)  /*!< End of transmission */
+#define SFU_COM_YMODEM_ACK                     ((uint8_t)0x06U)  /*!< Acknowledge */
+#define SFU_COM_YMODEM_NAK                     ((uint8_t)0x15U)  /*!< Negative acknowledge */
+#define SFU_COM_YMODEM_CA                      ((uint8_t)0x18U)  /*!< Two of these in succession aborts transfer */
+#define SFU_COM_YMODEM_CRC16                   ((uint8_t)0x43U)  /*!< 'C' == 0x43, request 16-bit CRC */
+#define SFU_COM_YMODEM_RB                      ((uint8_t)0x72U)  /*!< Startup sequence */
+#define SFU_COM_YMODEM_NEGATIVE_BYTE           ((uint8_t)0xFFU)  /*!< Negative Byte*/
+
+#define SFU_COM_YMODEM_ABORT1                  ((uint8_t)0x41U)  /*!< 'A' == 0x41, abort by user */
+#define SFU_COM_YMODEM_ABORT2                  ((uint8_t)0x61U)  /*!< 'a' == 0x61, abort by user */
+
+#define SFU_COM_YMODEM_NAK_TIMEOUT             ((uint32_t)0x100000U)  /*!< NAK Timeout*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)3000U) /*!< Retry delay, has to be smaller than IWDG */
+#else
+/* Minicom YMODEM : reduce the download timeout to speed-up the download operation */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)1000U) /*!< Retry delay, has to be smaller than IWDG */
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_MAX_ERRORS              ((uint32_t)3U)    /*!< Maximum number of retry*/
+
+/* Exported functions ------------------------------------------------------- */
+/*
+ * If the debug mode is not enabled then the local loader must also provide the COM init functions
+ */
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+SFU_ErrorStatus SFU_COM_Transmit(uint8_t *pData, uint16_t uDataLength, uint32_t uTimeOut);
+SFU_ErrorStatus SFU_COM_Receive(uint8_t *pData, uint16_t uDataLength);
+SFU_ErrorStatus SFU_COM_Flush(void);
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize);
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam);
+
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize);
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h
new file mode 100644
index 00000000..7467d978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_loader.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update local
+  *          loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOADER_H
+#define SFU_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Local loader status Type Definition
+  */
+typedef enum
+{
+  SFU_LOADER_OK                            = 0x00U,
+  SFU_LOADER_ERR_COM                       = 0x01U,
+  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
+  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
+  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
+  SFU_LOADER_ERR_FLASH                     = 0x05U,
+  SFU_LOADER_ERR_CRYPTO                    = 0x06U
+} SFU_LOADER_StatusTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LOADER_Init(void);
+SFU_ErrorStatus SFU_LOADER_DeInit(void);
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
+                                             uint32_t *p_Size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
new file mode 100644
index 00000000..afa70f2c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
@@ -0,0 +1,248 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fwimg_regions.h"
+#include "se_def_core.h"
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_C2_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C2_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C2_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Bank 1, Area B  used to protect Vector Table */
+#define SFU_C1_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAB)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C1_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_C1_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C1_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_C1_AREA_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area (without bit banding region) in
+  *                   unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB Full area in unprivileged mode.
+  *                   Read only capability configured
+  *                   from 0x08000000 ==> 0x08004FFF (20 Kbytes)
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START M4_SB_REGION_ROM_START
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_32KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0xE0U               /*!< 32 Kbytes / 8 * 5 ==> 20 Kbytes */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the execution for SB Full area in unprivileged mode.
+  *                   Read only capability configured
+  *                   In addition to region 2, from 0x08005000 ==> 0x080057FF (2 Kbytes)
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_START 0x08005000UL
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_2KB
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Forbid all access to the active slot.
+  *                   From 0x08018000 ==> 0x0801BFFF (16 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_APP_FLASHEXE_START 0x08018000UL
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SIZE  MPU_REGION_SIZE_16KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SREG  0x00U           /*!< All subregions activated */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Forbid all access to the active slot.
+  *                   In addition to region 4, from 0x08015000 ==> 0x08017FFF (12 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER5
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START 0x08014000UL
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_16KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG  0x03U    /*!< 16 Kbytes / 8 * 6 ==> 12 Kbytes */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 6 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER6
+#define SFU_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
+#define SFU_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
+#define SFU_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
+#define SFU_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 4 - Enable the execution for the active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   From 0x08018000 ==> 0x0801BFFF (16 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER4
+#define APP_PROTECT_MPU_FLASHEXE_START 0x08018000UL
+#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_16KB
+#define APP_PROTECT_MPU_FLASHEXE_SREG  0x00U           /*!< All subregions activated */
+#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the execution for active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   In addition to region 4, from 0x08015000 ==> 0x08017FFF (12 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER5
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_START 0x08014000UL
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_16KB
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x03U    /*!< 16 Kbytes / 8 * 6 ==> 12 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. */
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_WRP)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP  | \
+                                             SFU_RUNTIME_PROTECTION_DMA )
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02)     /*!< Third configuration */
+
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void);
+SE_ErrorStatus SE_SFU_IMG_Write(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_SFU_IMG_Read(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_new_image.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_new_image.h
new file mode 100644
index 00000000..c234da77
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/sfu_new_image.h
@@ -0,0 +1,58 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware
+  *          Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar
+  *          file integrated in the user application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_NEW_IMAGE_H
+#define SFU_NEW_IMAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Specifies a structure containing values related to the management of multi-images in Flash.
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+  uint32_t  ExecutionAddr;         /*!< The execution address for the FwImage in UserFlash */
+} SFU_FwImageFlashTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header);
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_NEW_IMAGE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..8fff5bd0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+#define HAL_GTZC_MODULE_ENABLED
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..4a4b906b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
@@ -0,0 +1,70 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/main.c
new file mode 100644
index 00000000..3e2bc373
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/main.c
@@ -0,0 +1,385 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+#define MAIN_C
+
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+#include "sfu_loader.h"
+#include "sfu_com_loader.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash.h"
+#include "sfu_trace.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_new_image.h"
+#include "sfu_boot.h"
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+  __IO uint32_t *pSbsfuFlag = (__IO uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+  SFU_FLASH_StatusTypeDef   flash_if_info;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+  /* LED Init*/
+  BSP_LED_Init(LED_RED);
+
+  /* Reset the SRAM1 flag */
+  *pSbsfuFlag = SBSFU_NOT_BOOTED;
+
+  /* Configure the security features */
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_INITIAL_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  /* Boot CPU2 */
+  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
+
+  /* Wait for the flag */
+  while (*pSbsfuFlag == SBSFU_NOT_BOOTED)
+  {
+    BSP_LED_Toggle(LED_RED);
+    HAL_Delay(500U);
+  }
+  BSP_LED_Off(LED_RED);
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  /* USER CODE BEGIN 2 */
+
+  /* Check the security features once CPU2 has booted */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_SECOND_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (*pSbsfuFlag == SBSFU_FW_DOWNLOAD)
+  {
+    /* Initialize external flash interface (OSPI/QSPI) */
+    SFU_LL_FLASH_Init();
+
+    /* Configure Communication module */
+    SFU_LL_UART_Init();
+
+    TRACE("\r\n======================================================================");
+    TRACE("\r\n=                           Loader                                   =");
+    TRACE("\r\n======================================================================");
+    TRACE("\r\n");
+
+    /* Loader initialization */
+    e_ret_status = SFU_LOADER_Init();
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("Initialization failure : reset !");
+      NVIC_SystemReset();
+    }
+
+    /* Download new firmware */
+    e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Read header in dwl slot */
+      e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                       sizeof(SE_FwRawHeaderTypeDef));
+    }
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /*
+       * Notify the Secure Boot that a new image has been downloaded
+       * by calling the SE interface function to trigger the installation procedure at next reboot.
+       */
+       TRACE("\r\nDownload successful : %d bytes received\r\n", u_size);
+      if (SFU_IMG_InstallAtNextReset((uint8_t *) &fw_image_header_validated) != SFU_SUCCESS)
+      {
+        /* Erase downloaded image */
+        SFU_LL_FLASH_Erase_Size(&flash_if_info, (void *) SlotStartAdd[SLOT_DWL_1], SLOT_SIZE(SLOT_DWL_1));
+
+        /* no specific error cause set */
+      }
+    }
+    else
+    {
+      /* Erase downloaded image */
+      TRACE("\r\nDownload failed (%d)\r\n", e_ret_status);
+      SFU_LL_FLASH_Erase_Size(&flash_if_info, (void *) SlotStartAdd[SLOT_DWL_1], SLOT_SIZE(SLOT_DWL_1));
+    }
+
+    /* Reset to restart SBSFU */
+    NVIC_SystemReset();
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+  if (*pSbsfuFlag == SBSFU_BOOTED)
+  {
+
+    /* Check the security features before jumping in the user application CPU2 */
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+    FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+    if (SFU_BOOT_CheckApplySecurityProtections(SFU_THIRD_CONFIGURATION) != SFU_SUCCESS)
+    {
+      SFU_EXCPT_Security_Error();
+    }
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+    SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+    HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+
+    jump_address = *(__IO uint32_t *)((SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET + 4));
+    /* Jump to user application */
+    p_jump_to_function = (Function_Pointer) jump_address;
+    /* Initialize user application's Stack Pointer */
+    __set_MSP(*(__IO uint32_t *)(SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET));
+
+    /* JUMP into User App */
+    p_jump_to_function();
+  }
+
+  /* We shouldn't reach this point */
+  SFU_EXCPT_Security_Error();
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE BEGIN 3 */
+
+    /* USER CODE END 3 */
+  }
+  /* USER CODE END WHILE */
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* Apply Static protections involving Option Bytes */
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(uStep);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @retval None
+  */
+void SFU_EXCPT_Security_Error(void)
+{
+  HAL_Delay(1000);
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c
new file mode 100644
index 00000000..f7599f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_com_loader.c
@@ -0,0 +1,544 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
+#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
+
+/* Private macros ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
+#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
+#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+/**
+  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
+  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
+  * @param  puSize: size of received file.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
+{
+  uint32_t i;
+  uint32_t packet_length = 0U;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t filesize = 0U;
+  uint32_t packets_received;
+  uint8_t *file_ptr;
+  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
+                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(8)));
+
+  /* Check the pointers allocation */
+  if ((peCOMStatus == NULL) || (puSize == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  *peCOMStatus = SFU_COM_YMODEM_OK;
+
+  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *peCOMStatus = SFU_COM_YMODEM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *puSize = filesize;
+              file_done = 1U;
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
+              {
+                /* No NACK sent for a better synchro with remote : packet will be repeated */
+              }
+              else
+              {
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name skipped */
+                    i = 0U;
+                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
+                    {
+                      i++;
+                      file_ptr++;
+                    }
+                    /* end of file name ('\0') skipped */
+                    file_ptr++;
+
+                    /* File size extraction */
+                    i = 0U;
+                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
+                    {
+                      file_size[i] = *file_ptr;
+                      i++;
+                      file_ptr++;
+                    }
+                    file_size[i] = (uint8_t) '\0';
+                    (void) Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call*/
+                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
+                    {
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                      (void) SFU_LL_UART_Flush();
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
+                    }
+                    else
+                    {
+                      /* End session */
+                      tmp = SFU_COM_YMODEM_CA;
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      return SFU_ERROR;
+                    }
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                    file_done = 1U;
+                    session_done = 1U;
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  /* Data packet received callback call*/
+                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX],
+                                                           packet_length) == SFU_SUCCESS)
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* End session */
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    *peCOMStatus = SFU_COM_YMODEM_DATA;
+                  }
+
+                }
+                packets_received ++;
+                session_begin = 1;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          break;
+        default:
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
+          {
+            /* Abort communication */
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          }
+          else
+          {
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            /* Minicom does not accept this extra character */
+            TRACE("\b.");                                 /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+            /*
+             * Toggling the LED in case no console is available: the toggling frequency depends on
+             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
+             */
+            (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          }
+          break;
+      }
+    }
+  }
+  /* Make sure the status LED is turned off */
+  (void) BSP_LED_Off(SFU_STATUS_LED);
+
+  if (*peCOMStatus == SFU_COM_YMODEM_OK)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+/**
+  * @brief  Transmit a byte to the COM Port.
+  * @param  uParam: The byte to be sent.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
+{
+  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
+}
+
+/**
+  * @brief  Convert a string to an integer.
+  * @param  pInputStr: The string to be converted.
+  * @param  pIntNum: The integer value.
+  * @retval 1: Correct
+  *         0: Error
+  */
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+  uint8_t  digit;
+
+  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        digit = CONVERTHEX(pInputStr[i]);
+        val = (val << 4U) + digit;
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == (uint8_t)'\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == (uint8_t)'\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        digit =  CONVERTDEC(pInputStr[i]);
+        val = (val * 10U) + digit;
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData: pointer to received data.
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeOut: receive timeout (ms).
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  SFU_ErrorStatus eRetStatus;
+
+  uint8_t char1;
+
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0; /* index indicating where to write in pData */
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
+
+  if (eRetStatus == SFU_SUCCESS)
+  {
+    status = HAL_OK;
+
+    switch (char1)
+    {
+      case SFU_COM_YMODEM_SOH:
+        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
+        break;
+      case SFU_COM_YMODEM_STX:
+        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+        break;
+      case SFU_COM_YMODEM_EOT:
+        break;
+      case SFU_COM_YMODEM_CA:
+        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
+        {
+          packet_size = 2U;
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      case SFU_COM_YMODEM_ABORT1:
+      case SFU_COM_YMODEM_ABORT2:
+        status = HAL_BUSY;
+        break;
+      case SFU_COM_YMODEM_RB:
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
+    {
+
+#ifndef MINICOM_YMODEM
+      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX],
+                                       (uint16_t)(packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
+#else
+      eRetStatus = SFU_SUCCESS;
+      /* Receive byte per byte until no data left or no space left in buffer */
+      while ((SFU_SUCCESS == eRetStatus) &&
+             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
+              SFU_COM_YMODEM_PACKET_DATA_INDEX +
+              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
+            )
+      {
+        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
+                                         1U, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        /* We received some bytes */
+        eRetStatus = SFU_SUCCESS;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (eRetStatus == SFU_SUCCESS)
+      {
+        status = HAL_OK;
+
+        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
+                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
+        {
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC*/
+          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
+          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
+
+          /*Configure CRC with 16-bit polynomial*/
+          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
+          {
+            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
+            {
+              packet_size = 0U;
+              status = HAL_ERROR;
+            }
+
+          }
+          else
+          {
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        status = HAL_ERROR;
+      }
+    }
+  }
+  else
+  {
+    status = HAL_ERROR;
+  }
+
+  *puLength = packet_size;
+  return status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(uFileSize);
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(pData);
+  UNUSED(uSize);
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c
new file mode 100644
index 00000000..1aeb2646
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_loader.c
@@ -0,0 +1,654 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update LOADER module.
+  *          This file provides set of firmware functions to manage SFU local
+  *          loader functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOADER_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include <stdlib.h>
+#include "main.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h" /* for metadata authentication */
+#include "app_sfu.h"
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef MINICOM_YMODEM
+/*
+ * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
+ * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
+ */
+/* With Minicom YMODEM each packet carries 128 bytes of data */
+static uint8_t alignedBuffer[SFU_COM_YMODEM_PACKET_SIZE] __attribute__((aligned(8)));
+#endif /* MINICOM_YMODEM */
+static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
+static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
+static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
+static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
+static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
+static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
+static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
+static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_Init(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  */
+
+  /*
+   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
+   * when doing a length alignment before writing in FLASH.
+   */
+#ifndef MINICOM_YMODEM
+  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_1K_SIZE bytes of payload */
+  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_1K_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints",
+          SFU_COM_YMODEM_PACKET_1K_SIZE);
+    return SFU_ERROR;
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+#else /* MINICOM_YMODEM */
+  /* m_aPacketData contains SFU_COM_YMODEM_PACKET_SIZE bytes of payload */
+  if (0U != (uint32_t)(SFU_COM_YMODEM_PACKET_SIZE % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The packet buffer (payload part) must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Packet Payload size (%d) is not matching the FLASH constraints", SFU_COM_YMODEM_PACKET_SIZE);
+    return SFU_ERROR;
+  }
+#endif /* MINICOM_YMODEM */
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  DeInitialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DeInit(void)
+{
+  /*
+   * ADD SRC CODE HERE
+   */
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Download a new User Fw.
+  *         Writes firmware received via Ymodem in FLASH.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  p_DwlSlot identification of the downloaded area
+  * @param  p_Size Size of the downloaded image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
+                                             uint32_t *pSize)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
+
+  /* Check the pointers allocation */
+  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Refresh Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Transfer FW Image via YMODEM protocol */
+  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
+
+  /* Initialize global variables to be used during the YMODEM process */
+  m_uDwlAreaAddress = 0U;
+  m_uDwlAreaStart = 0U;
+  m_uDwlAreaSize = 0U;
+  m_uFileSizeYmodem = 0U;
+  m_uNbrBlocksYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uDwlSlot = SLOT_DWL_1;
+  m_LoaderStatus = SFU_LOADER_ERR_COM;
+
+  /* Receive the FW in RAM and write it in the Flash*/
+  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
+  {
+    if (*pSize > 0U)
+    {
+      /* File download correct*/
+      m_LoaderStatus = SFU_LOADER_OK;
+    }
+  }
+  else
+  {
+    /* Nothing to do : m_LoaderStatus updated during during YModem process */
+  }
+
+  /* Provide slot information to the caller
+     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
+     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
+  *pDwlSlot = m_uDwlSlot;
+
+
+  *peSFU_LOADER_Status = m_LoaderStatus;
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+#if  !defined(SFU_NO_SWAP)
+  uint32_t uLength;
+#endif /* !SFU_NO_SWAP */
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet*/
+    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
+  if (m_uPacketsReceived == 1U)
+  {
+
+    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+#if   defined(SFU_NO_SWAP)
+
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+#else
+      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
+         Partial Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwSize +
+                      (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
+                      SFU_IMG_IMAGE_OFFSET;
+#endif /* (SFU_NO_SWAP) */
+    }
+
+    /* Clear Download application area (including TRAILERS area) */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+          SFU_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+  }
+
+#if  !defined(SFU_NO_SWAP)
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* This packet : contains end of FW header */
+    if ((m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)) &&
+        ((m_uDwlAreaAddress + rx_size) >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)))
+    {
+      /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE bytes length) */
+      uLength = SFU_IMG_IMAGE_OFFSET % SFU_COM_YMODEM_PACKET_1K_SIZE;
+      if (uLength == 0U)
+      {
+        uLength = SFU_COM_YMODEM_PACKET_1K_SIZE;
+      }
+      if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, uLength) == SFU_SUCCESS)
+      {
+        /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
+        m_uDwlAreaAddress += uLength + (((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->PartialFwOffset %
+                                        SLOT_SIZE(SLOT_SWAP));
+
+        /* Update remaining packet size to write */
+        rx_size -= uLength;
+
+        /* Update p_data pointer to received packet data */
+        p_data += uLength;
+      }
+      else
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+#endif /* !SFU_NO_SWAP */
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL image size */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Set dimension to the appropriate length for FLASH programming.
+     * Example: 64-bit length for L4.
+     */
+    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
+    {
+      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+      uOldSize = rx_size;
+      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+      while (uOldSize < rx_size)
+      {
+        p_data[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL area */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Write Data in Flash */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, rx_size) == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress += (rx_size);
+    }
+    else
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#else /* MINICOM_YMODEM */
+/* Minicom variant of the YMODEM protocol: uses 128B packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
+    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_SIZE);
+    }
+  }
+
+
+  /*
+   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
+   */
+
+  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
+     not encrypted  */
+  if (1 == m_uPacketsReceived)
+  {
+    /* First packet: beginning of header */
+    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
+    {
+      /* Copy the beginning of the header */
+      memcpy(fw_header, p_data, rx_size);
+      rx_size = 0U; /* nothing more to do */
+    }
+    else
+    {
+      /* Unexpected case */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else if (2U == m_uPacketsReceived)
+  {
+    /* Second packet: end of header (64 bytes) */
+    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
+    rx_size -= 64U;
+    p_data += 64U;
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+      /* Downloaded Image size : Header size + gap for image alignment to (UpdateFwOffset % sector size) +
+         Partial Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwSize +
+                      (((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP)) +
+                      SFU_IMG_IMAGE_OFFSET;
+
+      /* Clear Download application area (including TRAILERS area) */
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+              SFU_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
+            == SFU_SUCCESS)
+        {
+          /* Shift the DWL area pointer (still to be aligned image with (PartialFwOffset % sector size) in DWL area ) */
+          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+      /* The remaining 64 bytes of data must be handled : standard processing */
+    }
+  }
+  /*
+   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
+   */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * End of the second packet (64B) or full 128B packet
+     * Skip padding bytes then take partial FW offset into account
+     */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      /* Skip the padding bytes */
+      m_uDwlAreaAddress += rx_size;
+      rx_size = 0U;
+    }
+    else
+    {
+      /*
+       * m_uDwlAreaAddress >= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET)
+       */
+      if (((SFU_IMG_IMAGE_OFFSET / SFU_COM_YMODEM_PACKET_SIZE) + 1) == m_uPacketsReceived)
+      {
+        /* End of padding bytes : We must take the partial offset into account */
+        m_uDwlAreaAddress += ((SE_FwRawHeaderTypeDef *)fw_header)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+      }
+      /* else nothing more to do */
+
+      /* Check size to avoid writing beyond DWL image size */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /*
+       * Set dimension to the appropriate length for FLASH programming.
+       * Example: 64-bit length for L4.
+       */
+      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        /*
+         * By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         * sizeof(SFU_IMG_write_t) to avoid reading out of the buffer
+         */
+        uOldSize = rx_size;
+        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                             (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+        while (uOldSize < rx_size)
+        {
+          p_data[uOldSize] = 0xFF;
+          uOldSize++;
+        }
+      }
+
+      /* Check size to avoid writing beyond DWL area */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Write Data in Flash */
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /*
+         * With Minicom Ymodem, the data offset is not aligned because SFU_COM_YMODEM_PACKET_DATA_INDEX is 7
+         * So we cannot write in FLASH with p_data as source, we need a copy in an aligned buffer
+         */
+        memcpy(alignedBuffer, p_data, rx_size);
+
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, alignedBuffer, rx_size) == SFU_SUCCESS)
+        {
+          m_uDwlAreaAddress += (rx_size);
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+
+
+/**
+  * @brief  Verifies the Raw Fw Header received. It checks if the header is
+  *         authentic and if the fields are ok with the device (e.g. size and version).
+  * @note   Please note that when the new image is installed, this metadata is checked
+  *         by @ref SFU_IMG_CheckCandidateVersion.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  pBuffer: pointer to header Buffer.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
+{
+  SFU_FwImageFlashTypeDef       fw_image_flash_data;
+
+  m_uDwlSlot = SLOT_DWL_1;
+
+  SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
+
+  /* Assign the download flash address to be used during the YMODEM process */
+  m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
+  m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
+
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
new file mode 100644
index 00000000..5728b10c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
@@ -0,0 +1,1115 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SB Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SB security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_boot.h"
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+#warning "SFU_IWDG_PROTECT_DISABLED"
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+  /* SRAM flag access */
+  {
+    SFU_PROTECT_MPU_SRAM_FLAG_RGNV, SFU_PROTECT_MPU_SRAM_FLAG_START, SFU_PROTECT_MPU_SRAM_FLAG_SIZE,
+    SFU_PROTECT_MPU_SRAM_FLAG_PERM, SFU_PROTECT_MPU_SRAM_FLAG_EXECV, SFU_PROTECT_MPU_SRAM_FLAG_SREG,
+    SFU_PROTECT_MPU_SRAM_FLAG_TEXV, SFU_PROTECT_MPU_SRAM_FLAG_C, SFU_PROTECT_MPU_SRAM_FLAG_B
+  },
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_FLASHEXE_ADJUST_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_FLASHEXE_ADJUST_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_FLASHEXE_ADJUST_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_START, SFU_PROTECT_MPU_APP_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_C, SFU_PROTECT_MPU_APP_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B
+  },
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                      FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                    FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  FLASH_OBProgramInitTypeDef sfu_flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_BoolTypeDef is_current_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA  **********/
+  flash_option_bytes.WRPArea     = SFU_C1_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+  sfu_flash_option_bytes.WRPArea = SFU_C2_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&sfu_flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckC2BootConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+    if (SFU_LL_SECU_CheckProtectionBootLock(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set C2 Boot configuration **********************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetC2BootConfiguration(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* C2OPT and SBRV cannot be written if C2BOOT_LOCK = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+
+    /* Check/Set Boot Lock configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionBootLock(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes,
+                                                  &is_protection_to_be_applied);
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply C2 DDS *****************************************************/
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* DDS cannot be written if ESE = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+
+  /* Lock the Options Bytes ***************************************************/
+  HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  SFU_ProtectionTypeDef expected_runtime_protection = SFU_PROTECTIONS_NONE;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  if (runtime_protection != expected_runtime_protection)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check C2 boot configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2OPT and SBRV ***********************************************/
+  if ((psFlashOptionBytes->C2BootRegion == OB_C2_BOOT_FROM_FLASH)&&
+      (psFlashOptionBytes->C2SecureBootVectAddr == SFU_C2_BOOT_BASE_ADDR))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply C2 boot configuration.
+  * @note   C2OPT and SBRV can only be accessed by software when C2BOOT_LOCK = 0.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckC2BootConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_BOOT_VECT;
+    psFlashOptionBytes->C2BootRegion            = OB_C2_BOOT_FROM_FLASH;
+    psFlashOptionBytes->C2SecureBootVectAddr    = SFU_C2_BOOT_BASE_ADDR;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Boot Lock configuration */
+  if (SFU_LL_SECU_CheckProtectionBootLock(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    /* Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                               FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if ((psSbFlashOptionBytes->WRPStartOffset == SFU_C1_PROTECT_WRP_PAGE_START) ||
+      (psSbFlashOptionBytes->WRPEndOffset   == SFU_C1_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if ((psSfuFlashOptionBytes->WRPStartOffset == SFU_C2_PROTECT_WRP_PAGE_START) ||
+      (psSfuFlashOptionBytes->WRPEndOffset   == SFU_C2_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                             FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if (SFU_LL_SECU_CheckProtectionWRP(psSbFlashOptionBytes, psSfuFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psSbFlashOptionBytes->OptionType      = OPTIONBYTE_WRP;
+    psSbFlashOptionBytes->WRPArea         = SFU_C1_PROTECT_WRP_AREA;
+    psSbFlashOptionBytes->WRPStartOffset  = SFU_C1_PROTECT_WRP_PAGE_START;
+    psSbFlashOptionBytes->WRPEndOffset    = SFU_C1_PROTECT_WRP_PAGE_END;
+
+    if (HAL_FLASHEx_OBProgram(psSbFlashOptionBytes) == HAL_OK)
+    {
+      psSfuFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+      psSfuFlashOptionBytes->WRPArea        = SFU_C2_PROTECT_WRP_AREA;
+      psSfuFlashOptionBytes->WRPStartOffset = SFU_C2_PROTECT_WRP_PAGE_START;
+      psSfuFlashOptionBytes->WRPEndOffset   = SFU_C2_PROTECT_WRP_PAGE_END;
+
+      if (HAL_FLASHEx_OBProgram(psSfuFlashOptionBytes) == HAL_OK)
+      {
+        *pbIsProtectionToBeApplied |= 1U;
+        e_ret_status = SFU_SUCCESS;
+        /* Execution stopped if flow control failed */
+        FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+      }
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS **********************************************************/
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    /* System Security Configuration failed: Sub-GHz radio SPI security access is incorrect */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /*  modify executable region for executing UserAPP*/
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  modify executable region for executing UserAPP */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_ADJUST_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_ADJUST_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_ADJUST_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  return e_ret_status;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint8_t mpu_region_num = 0U; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return e_ret_status;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  assert_param(SFU_IS_FUNCTIONAL_STATE(eState));
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the slot #0
+     */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr != SFU_SECURE_FLASH_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr != SFU_HIDE_PROTECTION_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr != SFU_SECURE_SRAM1_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr != SFU_SECURE_SRAM2_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief call by SFU to write a flash protected area
+  *         This SE function should never be called.
+  * @param  pSE_Status: Secure Engine Status.
+  * @param  pDestination: pointer to flash area to write.
+  * @param  pSource: pointer to input buffer.
+  * @param  Length: number of bytes to write to flash
+  * @retval SE_ErrorStatus SE_ERROR.
+  */
+SE_ErrorStatus SE_SFU_IMG_Write(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+
+  /* We shouldn't get there */
+  return SE_ERROR;
+}
+
+/**
+  * @brief call by SFU to read flash protected area
+  *         This SE function should never be called.
+  * @param  pSE_Status: Secure Engine Status.
+  * @param  pDestination: pointer to output buffer.
+  * @param  pSource: pointer to the flash area to read.
+  * @param  Length: number of bytes to read from flash
+  * @retval SE_ErrorStatus SE_ERROR.
+  */
+SE_ErrorStatus SE_SFU_IMG_Read(SE_StatusTypeDef *pSE_Status, uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+
+  /* We shouldn't get there */
+  return SE_ERROR;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_new_image.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_new_image.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/sfu_new_image.c
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/sfu_new_image.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..7a3565e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
@@ -0,0 +1,198 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  HAL_IncTick();
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/app_sfu_common.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_com_trace.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_com_trace.c
new file mode 100644
index 00000000..38dbfe17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_com_trace.c
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_com_trace.h"
+
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_TRACE_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutString Timeout*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+/**
+  * @}
+  */
+
+/** @defgroup SFU_COM_TRACE_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Print a string on the COM Port.
+  * @param  pString: The string to be printed
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString)
+{
+  uint16_t length = 0U;
+
+  /* Check the pointers allocation */
+  if (pString == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  while (pString[length] != (uint8_t)'\0')
+  {
+    length++;
+  }
+
+  return SFU_LL_UART_Transmit(pString, length, SFU_COM_TRACE_SERIAL_TIME_OUT);
+
+}
+
+/**
+  * @brief  Retargets the C library printf function to SFU UART.
+  * @param  None
+  * @retval ch
+  */
+PUTCHAR_PROTOTYPE
+{
+  /* Place your implementation of fputc here */
+  /* e.g. write a character to the USART1 and Loop until the end of transmission */
+  (void) SFU_LL_UART_Transmit((uint8_t *)&ch, 1U, 0xFFFFU);
+
+  return ch;
+}
+
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_com_trace.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_com_trace.h
new file mode 100644
index 00000000..d5981e4d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_com_trace.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities  for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_TRACE_H
+#define SFU_COM_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include <stdio.h>
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_def.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_def.h
new file mode 100644
index 00000000..3dc4df82
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_def.h
@@ -0,0 +1,94 @@
+/**
+  ******************************************************************************
+  * @file    sfu_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains the general definitions for SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_DEF_H
+#define SFU_DEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU Error Typedef
+  */
+typedef enum
+{
+  SFU_ERROR = 0x00001FE1U,
+  SFU_SUCCESS = 0x00122F11U
+} SFU_ErrorStatus;
+
+/* Exported constants --------------------------------------------------------*/
+
+#define SFU_RAM_BASE             ((uint32_t) SE_REGION_RAM_START)
+#define SFU_RAM_END              ((uint32_t) SB_REGION_RAM_END)
+#define SFU_SB_RAM_BASE          ((uint32_t) SB_REGION_RAM_START)
+#define SFU_SB_RAM_END           ((uint32_t) SB_REGION_RAM_END)
+
+
+#ifdef CORE_CM0PLUS
+#define SFU_BOOT_BASE_ADDR       ((uint32_t) INTVECT_START)           /* SFU Boot Address */
+#else /* CORE_CM0PLUS */
+#define SFU_C2_BOOT_BASE_ADDR    ((uint32_t) INTVECT_START)           /* SFU Boot Address */
+#define SFU_C2_AREA_ADDR_END     ((uint32_t) SE_KEY_REGION_ROM_END)   /* SBSFU end Address (covering all the SBSFU
+                                                                         executable code and the related keys) */
+#define SFU_C1_BOOT_BASE_ADDR    ((uint32_t) M4_SB_REGION_ROM_START)  /* SB Boot Address */
+#define SFU_C1_AREA_ADDR_END     ((uint32_t) M4_SB_REGION_ROM_END)    /* SB end Address (covering all the SB
+                                                                         executable code */
+#endif /* CORE_CM0PLUS */
+#define SFU_ROM_ADDR_START       ((uint32_t) SE_IF_REGION_ROM_START)  /* SBSFU base Address */
+
+#define SFU_ROM_ADDR_END         ((uint32_t) SE_KEY_REGION_ROM_END)   /* SBSFU end Address (covering all the SBSFU
+                                                                         executable code and the related keys) */
+
+#define SFU_SENG_ROM_ADDR_START  ((uint32_t) SE_CODE_REGION_ROM_START)/* Secure Engine area address START */
+#define SFU_SENG_ROM_ADDR_END    ((uint32_t) SE_CODE_REGION_ROM_END)  /* Secure Engine area address END - SE includes
+                                                                         everything up to the License */
+#define SFU_SENG_ROM_SIZE        ((uint32_t) (SFU_SENG_ROM_ADDR_END - \
+                                              SFU_SENG_ROM_ADDR_START + 1U)) /* Secure Engine area size */
+
+#define SFU_KEYS_ROM_ADDR_START  ((uint32_t) SE_KEY_REGION_ROM_START) /* Keys Area (Keys + Keys Retrieve function)
+                                                                         START. This is the PCRoP Area */
+#define SFU_KEYS_ROM_ADDR_END    ((uint32_t) SE_KEY_REGION_ROM_END)   /* Keys Area (Keys + Keys Retrieve function) END.
+                                                                         This is the PCRoP Area */
+
+#define SFU_SENG_RAM_ADDR_START  ((uint32_t) SE_REGION_RAM_START)   /* Secure Engine reserved RAM2 area START
+                                                                       address */
+#define SFU_SENG_RAM_ADDR_END    ((uint32_t) SE_REGION_RAM_END)     /* Secure Engine reserved RAM2 area END address */
+#define SFU_SENG_RAM_SIZE        ((uint32_t) (SFU_SENG_RAM_ADDR_END - \
+                                              SFU_SENG_RAM_ADDR_START + 1U)) /* Secure Engine reserved RAM area SIZE */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_DEF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
new file mode 100644
index 00000000..2947403a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
@@ -0,0 +1,111 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_regions.h
+  * @author  MCD Application Team
+  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_REGIONS_H
+#define SFU_FWIMG_REGIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "se_crypto_config.h"
+
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  *  Slot list : 2 slots per image configuration + swap
+  */
+#define NB_SLOTS      6U
+#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
+#define SLOT_ACTIVE_1 1U
+#define SLOT_ACTIVE_2 2U
+#define SLOT_DWL_1    3U
+#define SLOT_DWL_2    4U
+#define SLOT_SWAP     5U
+
+/* Calculation of the size of a slot */
+#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
+
+/*
+ * Design constraint: the image slot size must be a multiple of the swap area size.
+ * And of course both image slots must have the same size.
+ */
+#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
+
+/*
+ * Checking that the slot sizes are consistent with the .icf file
+ * Sizes expressed in bytes (+1 because the end address belongs to the slot)
+ * The checks are executed at runtime in the SFU_Img_Init() function.
+ */
+#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
+
+/**
+  * Image starting offset to add to the  address of 1st block
+  */
+#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
+
+
+/* External variables --------------------------------------------------------*/
+extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
+extern const uint32_t  SlotStartAdd[NB_SLOTS];
+extern const uint32_t  SlotEndAdd[NB_SLOTS];
+
+#if defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C) || defined(SFU_LOADER_C)
+
+const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
+                                            SLOT_ACTIVE_1_HEADER,
+                                            SLOT_ACTIVE_2_HEADER,
+                                            SLOT_DWL_1_START,
+                                            0U,
+                                            SWAP_START,
+                                          };
+/* List of slot start address */
+const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
+                                            SLOT_ACTIVE_1_START,
+                                            SLOT_ACTIVE_2_START,
+                                            SLOT_DWL_1_START,
+                                            0U,
+                                            SWAP_START,
+                                          };
+/* List of slot end address */
+const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
+                                            SLOT_ACTIVE_1_END,
+                                            SLOT_ACTIVE_2_END,
+                                            SLOT_DWL_1_END,
+                                            0U,
+                                            SWAP_END,
+                                          };
+#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_REGIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level.c
new file mode 100644
index 00000000..a502fa43
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level.c
@@ -0,0 +1,581 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.c
+  * @author  MCD Application Team
+  * @brief   SFU Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+extern RTC_HandleTypeDef RtcHandle;
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+/* Private variables ---------------------------------------------------------*/
+static UART_HandleTypeDef   UartHandle;
+static CRC_HandleTypeDef    CrcHandle;
+
+/* Private function prototypes -----------------------------------------------*/
+static void     SFU_LL_Error_Handler(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Initialize CRC */
+  e_ret_status = SFU_LL_CRC_Init();
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF CRC Init.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure the peripheral clock */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+
+  /* Configure CRC with default polynomial - standard configuration */
+  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU  IF CRC Configuration.
+  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
+  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Check the parameters */
+  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
+
+  /* Switch to the selected configuration */
+  CrcHandle.Instance = CRC;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  switch (eCRCConfg)
+  {
+    case SFU_CRC_CONFIG_DEFAULT:
+      /* The Default polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+      /* The default init value is used */
+      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+      /* The input data are 32-bit long words */
+      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    case SFU_CRC_CONFIG_16BIT:
+      /* The CRC-16-CCIT polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+      /* The zero init value is used */
+      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+      CrcHandle.Init.InitValue               = 0U;
+      /* The input data are 8-bit long */
+      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    default:
+      /* Invalid parameter */
+      e_ret_status = SFU_ERROR;
+      break;
+  }
+
+  /* Proceed to CRC Init (Correct Parameters) */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  SFU IF CRC Calculate.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  BufferLength: buffer length in bytes.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
+}
+
+/**
+  * @brief SFU UART Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = SFU_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+  if (HAL_UART_Init(&UartHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief SFU IF UART DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  SFU IF Write data (send).
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  DataLength: pointer to the 128bit data to write.
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  Timeout: Timeout duration.
+  * @retval status of the write operation
+  *         SFU_ERROR : if the write operation is not performed
+  *         SFU_SUCCESS : if the write operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF Read data (receive).
+  * @param  pData: pointer to the 128bit data where to store the received data.
+  * @param  DataLength: the length of the data to be read in bytes.
+  * @param Timeout: Timeout duration.
+  * @retval status of the read operation
+  *         SFU_ERROR : if the read operation is not performed
+  *         SFU_SUCCESS : if the read operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU HAL IF Flush.
+  * @param  None.
+  * @retval status of the operation.
+  */
+SFU_ErrorStatus SFU_LL_UART_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+
+  return SFU_SUCCESS;
+}
+
+#if  defined(CORE_CM0PLUS)
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief SFU IF RTC Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief SFU IF RTC DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+#endif /* CORE_CM0PLUS */
+
+/**
+  * @brief SFU IF RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer.
+  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  *        the RTC clock source; in this case the Backup domain will be reset in
+  *        order to modify the RTC Clock source, as consequence RTC registers (including
+  *        the backup registers) and RCC_BDCR register are set to their reset values.
+  * @retval None
+  */
+void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  RCC_OscInitTypeDef        RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+  UNUSED(hrtc);
+  /*-1- Enables access to the backup domain */
+  /* To enable access on RTC registers */
+
+  HAL_PWR_EnableBkUpAccess();
+
+  /*-2- Configure LSE/LSI as RTC clock source */
+#ifdef RTC_CLOCK_SOURCE_LSE
+
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#elif defined (RTC_CLOCK_SOURCE_LSI)
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
+  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#else
+#error Please select the RTC Clock source inside the main.h file
+#endif /*RTC_CLOCK_SOURCE_LSE*/
+
+  /*-3- Enable RTC peripheral Clocks */
+  /* Enable RTC Clock */
+  __HAL_RCC_RTC_ENABLE();
+
+  /* Enable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_ENABLE();
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  /*-4- Configure the NVIC for RTC Tamper */
+  HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0x0FU, 0U);
+  HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+
+  __HAL_RCC_RTC_DISABLE();
+
+  /* Disable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_DISABLE();
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in SFU application.
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral Clock Enable */
+    SFU_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    SFU_UART_TX_GPIO_CLK_ENABLE();
+    SFU_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : SFU_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
+    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : SFU_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
+    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral clock disable */
+    SFU_UART_CLK_DISABLE();
+
+    /* GPIO DeInit*/
+    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
+    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
+
+  }
+
+
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @param  None
+  * @retval None
+  */
+static void SFU_LL_Error_Handler(void)
+{
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  while (1 == 1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @}
+  */
+/**
+  * @brief function checking if a buffer is in se ram.
+  * @param pBuff: Secure Engine protected function ID.
+  * @param length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in se ram, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((length != 0U) && (!((0xFFFFFFFFUL - addr_start) < length))
+      && ((addr_end  <= SE_REGION_RAM_END) && (addr_start >= SE_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level.h
new file mode 100644
index 00000000..da4792af
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level.h
@@ -0,0 +1,132 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef  SFU_LOW_LEVEL_H
+#define  SFU_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU CRC Configuration definition
+  */
+typedef enum
+{
+  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
+  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
+  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
+} SFU_CRC_ConfigTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Uncomment to enable the adequate Clock Source */
+#define RTC_CLOCK_SOURCE_LSI
+/*#define RTC_CLOCK_SOURCE_LSE*/
+
+#ifdef RTC_CLOCK_SOURCE_LSI
+#define RTC_ASYNCH_PREDIV    0x1FU
+#define RTC_SYNCH_PREDIV     0x3FF
+#endif /* RTC_CLOCK_SOURCE_LSI */
+
+#ifdef RTC_CLOCK_SOURCE_LSE
+#define RTC_ASYNCH_PREDIV  0x7FU
+#define RTC_SYNCH_PREDIV   0x00FFU
+#endif /* RTC_CLOCK_SOURCE_LSE */
+
+/* External variables --------------------------------------------------------*/
+extern __IO uint32_t  DummyMemAccess;
+#if defined(SFU_LOW_LEVEL_C)
+#if defined(IT_MANAGEMENT)
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+__IO uint32_t DummyMemAccess;
+#endif /* defined(IT_MANAGEMENT) */
+#endif /* defined(SFU_LOW_LEVEL_C) */
+
+
+/* Exported macros -----------------------------------------------------------*/
+#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
+                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
+                               ((CONF) == SFU_CRC_CONFIG_16BIT))
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+#define SFU_LL_DummyAccess() \
+  do{ \
+  }while(0)
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus    SFU_LL_Init(void);
+SFU_ErrorStatus    SFU_LL_DeInit(void);
+
+SFU_ErrorStatus    SFU_LL_CRC_Init(void);
+SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
+uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
+
+SFU_ErrorStatus    SFU_LL_UART_Init(void);
+SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
+SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Flush(void);
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus SFU_LL_RTC_Init(void);
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
+void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
+
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  SFU_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c
new file mode 100644
index 00000000..4cea3348
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.c
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_fwimg_regions.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  e_ret_status = SFU_LL_FLASH_INT_Init();
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                   const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pFlash < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+}
+
+/**
+  * @brief  This function configure the flash to be able to execute code
+  * @param  Addr: flash address
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
+{
+  /*
+   * Internal flash : nothing to do
+   * External flash : configure memory mapped mode
+   */
+
+  /* Check Flash address */
+  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
+  }
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
+{
+  /* Check Flash address */
+  if (Addr < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_GetPage(Addr);
+  }
+  else
+  {
+    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
+  }
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h
new file mode 100644
index 00000000..726365d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_H
+#define SFU_LOW_LEVEL_FLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
+  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
+  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
+  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
+  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
+  SFU_FLASH_SUCCESS           /*!< Flash Success */
+} SFU_FLASH_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define INVALID_SECTOR 0xFFFFFFFFU
+#define INVALID_PAGE   0xFFFFFFFFU
+#define INVALID_BANK   0xFFFFFFFFU
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                   const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
+
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c
new file mode 100644
index 00000000..7b10b14d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.c
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU external
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_low_level_security.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+/* No external flash available on this product
+   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
+       systematically during startup phase */
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pStart);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  UNUSED(pFlash);
+  UNUSED(Pattern1);
+  UNUSED(Pattern2);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
+{
+  UNUSED(SlotNumber);
+  return SFU_SUCCESS;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h
new file mode 100644
index 00000000..08566d80
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_ext.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for external flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
+#define SFU_LOW_LEVEL_FLASH_EXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+#define EXTERNAL_FLASH_ADDRESS  0x90000000U
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c
new file mode 100644
index 00000000..77082978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.c
@@ -0,0 +1,482 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU internal
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "string.h"
+#ifdef CORE_CM0PLUS
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#endif /* CORE_CM0PLUS */
+
+/* Private defines -----------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+
+/* Private variables ---------------------------------------------------------*/
+static __IO uint32_t DoubleECC_Error_Counter = 0U;
+
+
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t first_page;
+  uint32_t nb_pages;
+  uint32_t chunk_nb_pages;
+  uint32_t length = Length;
+
+  /* Check the pointers allocation */
+  if (pFlashStatus == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  *pFlashStatus = SFU_FLASH_SUCCESS;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = SFU_LL_FLASH_INT_GetPage(start);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
+      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        p_erase_init.Page = first_page;
+        p_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_ERASE;
+        }
+        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
+      } while (nb_pages > 0U);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      if (HAL_FLASH_Lock() != HAL_OK)
+      {
+        e_ret_status = SFU_ERROR;
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+      }
+    }
+    else
+    {
+      *pFlashStatus = SFU_FLASH_ERR_HAL;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Check the pointers allocation */
+  if ((pFlashStatus == NULL) || (pSource == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     writing operation should be executed inside secure environment */
+  if ((inside_header == 1U) && (Length != 0U))
+  {
+    /* SE Access */
+    SE_StatusTypeDef se_status;
+    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
+    if (se_ret_status == SE_SUCCESS)
+    {
+      e_ret_status = SFU_SUCCESS;
+      *pFlashStatus = SFU_FLASH_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+      *pFlashStatus = SFU_FLASH_ERROR;
+    }
+  }
+  /* Writing operation executed by SBSFU */
+  else
+  {
+    *pFlashStatus = SFU_FLASH_ERROR;
+
+    /* Clear error flags raised during previous operation */
+    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Unlock the Flash to enable the flash control register access *************/
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+
+      }
+      else
+      {
+        /* DataLength must be a multiple of 64 bit */
+        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
+        {
+          *pFlashStatus = SFU_FLASH_ERROR;
+
+          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+          be done by word */
+          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
+              == HAL_OK)
+          {
+            /* Check the written value */
+            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
+            {
+              /* Flash content doesn't match SRAM content */
+              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
+              e_ret_status = SFU_ERROR;
+            }
+            else
+            {
+              /* Increment FLASH Destination address */
+              destination = destination + sizeof(SFU_LL_FLASH_write_t);
+              e_ret_status = SFU_SUCCESS;
+              *pFlashStatus = SFU_FLASH_SUCCESS;
+            }
+          }
+          else
+          {
+            /* Error occurred while writing data in Flash memory */
+            *pFlashStatus = SFU_FLASH_ERR_WRITING;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+        /* Lock the Flash to disable the flash control register access (recommended
+        to protect the FLASH memory against possible unwanted operation) */
+        if (HAL_FLASH_Lock() != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_HAL;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus se_ret_status;
+  SE_StatusTypeDef se_status;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     reading operation should be executed inside secure environment */
+  if (inside_header == 1U)
+  {
+    /* SE Access */
+    DoubleECC_Error_Counter = 0U;
+    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
+    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  /* Reading operation executed by SBSFU */
+  else
+  {
+    DoubleECC_Error_Counter = 0U;
+    /* Do not use memcpy from lib : ECC error should be checked at each loop */
+    for (i = 0; (i < Length) && (DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+    {
+      *pDestination = *pSource;
+    }
+    if (DoubleECC_Error_Counter == 0U)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  uint32_t flash = (uint32_t) pFlash;
+  uint32_t i;
+
+  /* Comparison executed by SBSFU ==> flash area could not be located inside secured environment */
+  for ( i = 0U; i < Length; i += 4U)
+  {
+    if ((*(uint32_t *)(flash + i) != Pattern1) &&  (*(uint32_t *)(flash + i) != Pattern2))
+    {
+      return SFU_ERROR;
+    }
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+
+
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retvat void
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    while (1 == 1)
+    {
+#ifdef CORE_CM0PLUS
+      SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_UNKNOWN);
+#else /* CORE_CM0PLUS */
+      NVIC_SystemReset();
+#endif /* CORE_CM0PLUS */
+    }
+  }
+}
+
+
+/**
+  * @brief  HardFault Handler
+  * @param  None.
+  * @retval None.
+  */
+#ifdef CORE_CM0PLUS
+void HardFault_Handler(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
+}
+#endif /* CORE_CM0PLUS */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h
new file mode 100644
index 00000000..5ef51fc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_low_level_flash_int.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for internal flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_INT_H
+#define SFU_LOW_LEVEL_FLASH_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash Write Access Constraints (size and alignment)
+  *
+  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
+  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
+  *
+  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
+  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
+  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
+  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_FirmwareToResume).
+  */
+
+/* double-word is the default setting for most platforms */
+typedef uint64_t SFU_LL_FLASH_write_t;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Length of a MAGIC tag (32 bytes).
+  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
+  */
+#define MAGIC_LENGTH ((uint32_t)32U)
+
+/* External variables --------------------------------------------------------*/
+#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
+void NMI_Handler(void);
+void HardFault_Handler(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_trace.h
new file mode 100644
index 00000000..cf6d3387
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/Common/sfu_trace.h
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SFU_TRACE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TRACE_H
+#define SFU_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_com_trace.h"
+#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+/* External variables --------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid
+                                                                        faults. printf is not rieentrant */
+#define TRACE   (void) printf
+#else
+#define TRACE(...)
+#define TRACE_IRQ(pbuffer)
+#endif /* SFU_DEBUG_MODE */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
new file mode 100644
index 00000000..783cd4b0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>7.10.3.6927</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
new file mode 100644
index 00000000..7c9e213f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM0PLUS\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM0PLUS\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM0PLUS\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>CORE_CM0PLUS</state>
+                    <state>KMS_ENABLED</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\Core\Inc</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\App</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+                    <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$\se_interface_appli.o"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state>$PROJ_DIR$.\..\..\2_Images_SECoreBin\EWARM\SE_Core.bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM0PLUS_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>Core</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
+        <group>
+            <name>SBSFU</name>
+            <group>
+                <name>App</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_boot.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_error.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_mpu_isolation.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_test.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_common.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_no_swap.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_swap.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_kms.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_interface_crypto_scheme.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Target</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_security.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Common</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_com_trace.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_low_level.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_int.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_ext.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\sfu_se_mpu.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+    </group>
+        <group>
+          <name>Middlewares</name>
+          <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
+            </file>
+          </group>
+          <group>
+            <name>STM32_Key_Management_Services</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm4.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/LoRaWAN_FUOTA/2_Images_SBSFU/EWARM/cm4.ewd
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
new file mode 100644
index 00000000..43271def
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
@@ -0,0 +1,1176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM4\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM4\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM4\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM4/Inc</state>
+                    <state>$PROJ_DIR$/../../2_Images_SECoreBin/Inc</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM4_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_it.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_com_loader.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_loader.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_low_level_security.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_new_image.c</name>
+            </file>
+        </group>
+        <group>
+            <name>Common</name>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_com_trace.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_low_level.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_int.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\Common\sfu_low_level_flash_ext.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_hsem.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
new file mode 100644
index 00000000..3d66e556
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\CM4.ewp</path>
+  </project>
+  <project>
+    <path>$WS_DIR$\CM0PLUS.ewp</path>
+  </project>
+  <batchBuild />
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
new file mode 100644
index 00000000..08e10787
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
@@ -0,0 +1,65 @@
+;/******************************************************************************
+;* File Name          : sfu_se_mpu.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;*  @attention
+;* 
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;* 
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;* 
+;*******************************************************************************
+;
+;
+; Cortex-M version
+;
+        SECTION .text:CODE:NOROOT:REORDER(2)
+        EXPORT SVC_Handler, jump_to_function, launch_application
+SVC_Handler
+        IMPORT MPU_SVC_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+jump_to_function
+        ; assume R1 R2 are useless
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+launch_application
+        ; return from exception to application launch function
+        ; R0: application vector address
+        ; R1: exit function address
+        ; push interrupt context R0 R1 R2 R3 R12 LR PC xPSR
+        ;MOV R2, #0x01000000 ; xPSR activate Thumb bit
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} ; FLAGS=0
+        MOVS R2, #1
+        BICS R1, R1, R2  ; clear least significant bit of exit function
+        PUSH {R1}  ; return address = application entry point
+        MOVS R1, #0 ; clear other context registers
+        PUSH {R1} ; LR =0
+        PUSH {R1} ; R12 =0
+        PUSH {R1} ; R3 = 0
+        PUSH {R1} ; R2 = 0
+        PUSH {R1} ; R1 = 0
+        ; set R0 to application entry point
+        PUSH {R0} ; R0 = application entry point
+        ; set LR to return to thread mode with main stack
+        ;MOV LR, #0xFFFFFFF9
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        ; return from interrupt
+        BX LR
+      
+        END
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
new file mode 100644
index 00000000..b8446db6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
@@ -0,0 +1,40 @@
+show SE_APP_GetActiveFwInfo
+show SE_APP_SVC_Handler
+show SE_SYS_SaveDisableIrq
+show SE_SYS_RestoreEnableIrq
+show SE_KMS_Initialize
+show SE_KMS_Finalize
+show SE_KMS_GetInfo
+show SE_KMS_GetFunctionList
+show SE_KMS_GetSlotList
+show SE_KMS_GetSlotInfo
+show SE_KMS_GetTokenInfo
+show SE_KMS_GetMechanismInfo
+show SE_KMS_OpenSession
+show SE_KMS_CloseSession
+show SE_KMS_CreateObject
+show SE_KMS_DestroyObject
+show SE_KMS_GetAttributeValue
+show SE_KMS_SetAttributeValue
+show SE_KMS_FindObjectsInit
+show SE_KMS_FindObjects
+show SE_KMS_FindObjectsFinal
+show SE_KMS_EncryptInit
+show SE_KMS_Encrypt
+show SE_KMS_EncryptUpdate
+show SE_KMS_EncryptFinal
+show SE_KMS_DecryptInit
+show SE_KMS_Decrypt
+show SE_KMS_DecryptUpdate
+show SE_KMS_DecryptFinal
+show SE_KMS_DigestInit
+show SE_KMS_Digest
+show SE_KMS_DigestUpdate
+show SE_KMS_DigestFinal
+show SE_KMS_SignInit
+show SE_KMS_Sign
+show SE_KMS_VerifyInit
+show SE_KMS_Verify
+show SE_KMS_DeriveKey
+show SE_KMS_GenerateKeyPair
+show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..5a0e4ad5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,30 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x1A00;
+define symbol __ICFEDIT_size_heap__ = 0;
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section SE_CORE_Bin };
+place in SE_IF_ROM_region {section .SE_IF_Code};
+place in SB_ROM_region    { readonly };
+place in SB_RAM_region    { readwrite, block CSTACK, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..16046813
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,29 @@
+/*###ICF### Set of symbols used in M4 SB ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x200;
+define symbol __ICFEDIT_size_heap__ = 0x100;
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_M4_SB_region_ROM_start__ { readonly section .intvec };
+place in M4_SB_ROM_region   { readonly };
+place in M4_SB_RAM_region   { readwrite,
+                              block CSTACK, block HEAP };
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
new file mode 100644
index 00000000..edc50db9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
@@ -0,0 +1,897 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>sfu_se_mpu.s</PathWithFileName>
+      <FilenameWithoutPath>sfu_se_mpu.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>se_core_bin.s</PathWithFileName>
+      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_boot.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_error.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_no_swap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_swap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_kms.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_mpu_isolation.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_test.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/Common</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_com_trace.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash_ext.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/sfu_low_level_flash_int.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
new file mode 100644
index 00000000..6fc11a59
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
@@ -0,0 +1,710 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo_CM0PLUS\Exe\</OutputDirectory>
+          <OutputName>SBSFU</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments></TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-Wno-format</MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM0PLUS/Core/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../CM0PLUS/Core/Inc;../CM0PLUS/SBSFU/App;../CM0PLUS/SBSFU/Target;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SBSFU_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--symdefs=se_interface_appli.txt
+--keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_se_mpu.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>sfu_se_mpu.s</FilePath>
+            </File>
+            <File>
+              <FileName>se_core_bin.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>se_core_bin.s</FilePath>
+            </File>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/App</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_boot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_boot.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_error.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_error.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_no_swap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_swap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_interface_crypto_scheme.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_kms.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_mpu_isolation.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_test.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/Common</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash_ext.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash_int.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_bootloader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="CM0PLUS"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
new file mode 100644
index 00000000..c02b5772
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
@@ -0,0 +1,609 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>STM32WL55JC_Nucleo_CM4\Exe\</OutputDirectory>
+          <OutputName>SB</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>0</hadIROM>
+            <hadIRAM>0</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>1</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>0</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>0</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>0</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM4/Inc;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SB_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Common</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash_int.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/sfu_low_level_flash_ext.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_com_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_low_level_security.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_new_image.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_hsem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="CM4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
new file mode 100644
index 00000000..0dc4693b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectWorkspace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_mpw.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <WorkspaceName></WorkspaceName>
+
+  <project>
+    <PathAndName>.\CM4.uvprojx</PathAndName>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+  <project>
+    <PathAndName>.\CM0PLUS.uvprojx</PathAndName>
+    <NodeIsActive>1</NodeIsActive>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+</ProjectWorkspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
new file mode 100644
index 00000000..49d5b3cf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
@@ -0,0 +1,48 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+; *** regions needed by SBSFU project ***
+
+LR_KMS_DataStorage KMS_DATASTORAGE_START KMS_DATASTORAGE_SIZE {
+  ER_KMS_DataStorage KMS_DATASTORAGE_START FILL 0X00000000 KMS_DATASTORAGE_SIZE {
+  }
+}
+
+LR_IF SE_IF_REGION_ROM_START SE_IF_ROM_REGION_SIZE {
+  ER_IF SE_IF_REGION_ROM_START SE_IF_ROM_REGION_SIZE {
+  se_interface_application.o (+RO)
+  se_interface_bootloader.o (+RO)
+  se_interface_common.o (+RO)
+  se_interface_kms.o (+RO)
+  }
+}
+
+LR_SB SB_REGION_ROM_START SB_ROM_REGION_SIZE {  
+  ER_SB SB_REGION_ROM_START SB_ROM_REGION_SIZE {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  SB_RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  .ANY (STACK)
+  .ANY (HEAP)
+  }
+}
+
+LR_ROM_Vector INTVECT_START VECTOR_SIZE {
+  vector_start INTVECT_START VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+}
+
+LR_SE SE_CODE_REGION_ROM_START SE_ROM_REGION_SIZE {
+  ER_SE SE_CODE_REGION_ROM_START SE_ROM_REGION_SIZE {
+  *(SE_CORE_Bin)
+  }
+}
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
new file mode 100644
index 00000000..253a0369
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
@@ -0,0 +1,21 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+; *** regions needed by SBSFU project ***
+LR_SB M4_SB_REGION_ROM_START M4_SB_ROM_REGION_SIZE {  
+  ER_SB M4_SB_REGION_ROM_START M4_SB_ROM_REGION_SIZE {
+   *.o (RESET, +First)
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  SB_RAM_region M4_SB_REGION_RAM_START M4_SB_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  .ANY (STACK)
+  .ANY (HEAP)
+  }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
new file mode 100644
index 00000000..da9e5f43
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
@@ -0,0 +1,41 @@
+#<SYMDEFS># ARM Linker, 6120001: Last Updated: Fri Sep 25 17:34:25 2020
+0x0802c001 T SE_APP_GetActiveFwInfo
+0x0802c049 T SE_APP_SVC_Handler
+0x0802d2bd T SE_SYS_SaveDisableIrq
+0x0802d275 T SE_SYS_RestoreEnableIrq
+0x0802cca9 T SE_KMS_Initialize
+0x0802c7bd T SE_KMS_Finalize
+0x0802ca71 T SE_KMS_GetInfo
+0x0802ca6d T SE_KMS_GetFunctionList
+0x0802cb89 T SE_KMS_GetSlotList
+0x0802cb29 T SE_KMS_GetSlotInfo
+0x0802cbed T SE_KMS_GetTokenInfo
+0x0802cac5 T SE_KMS_GetMechanismInfo
+0x0802cdbd T SE_KMS_OpenSession
+0x0802c171 T SE_KMS_CloseSession
+0x0802c1c1 T SE_KMS_CreateObject
+0x0802c429 T SE_KMS_DestroyObject
+0x0802ca0d T SE_KMS_GetAttributeValue
+0x0802ce29 T SE_KMS_SetAttributeValue
+0x0802c8c5 T SE_KMS_FindObjectsInit
+0x0802c811 T SE_KMS_FindObjects
+0x0802c871 T SE_KMS_FindObjectsFinal
+0x0802c6ed T SE_KMS_EncryptInit
+0x0802c61d T SE_KMS_Encrypt
+0x0802c751 T SE_KMS_EncryptUpdate
+0x0802c689 T SE_KMS_EncryptFinal
+0x0802c2e9 T SE_KMS_DecryptInit
+0x0802c221 T SE_KMS_Decrypt
+0x0802c349 T SE_KMS_DecryptUpdate
+0x0802c289 T SE_KMS_DecryptFinal
+0x0802c559 T SE_KMS_DigestInit
+0x0802c489 T SE_KMS_Digest
+0x0802c5b9 T SE_KMS_DigestUpdate
+0x0802c4f5 T SE_KMS_DigestFinal
+0x0802cef9 T SE_KMS_SignInit
+0x0802ce8d T SE_KMS_Sign
+0x0802cfc9 T SE_KMS_VerifyInit
+0x0802cf5d T SE_KMS_Verify
+0x0802c3b5 T SE_KMS_DeriveKey
+0x0802c929 T SE_KMS_GenerateKeyPair
+0x0802c9a9 T SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
new file mode 100644
index 00000000..c4321d77
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
@@ -0,0 +1,23 @@
+/******************************************************************************/
+/* STM32WL_cm0plus.INI: CM0 CPU Initialization File                                           
+/******************************************************************************/
+/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
+/* * All rights reserved.</center>*/
+/*  *
+/*  * This software component is licensed by ST under BSD 3-Clause license,*/
+/*  * the "License"; You may not use this file except in compliance with the */
+/*  * License. You may obtain a copy of the License at:*/
+/*  *                        opensource.org/licenses/BSD-3-Clause*/
+/*  *
+/*  ****************************************************************************/
+/******************************************************************************/
+
+FUNC void Setup (void) {
+  SP = _RDWORD(0x8036800);          // Setup Stack Pointer
+  PC = _RDWORD(0x8036804);          // Setup Program Counter
+   
+}
+
+Setup();                             // Setup for Running
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
new file mode 100644
index 00000000..ca5958f1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
@@ -0,0 +1,20 @@
+;/******************************************************************************
+;* File Name          : se_core_bin.s
+;* Author             : MCD Application Team
+;* Description        : Include SECoreBin binary.
+;********************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;******************************************************************************
+;
+;
+ AREA SE_CORE_Bin, CODE, READONLY
+ INCBIN .\..\..\2_Images_SECoreBin\MDK-ARM\STM32WL55JC_Nucleo\Exe\SECoreBin.bin
+ END
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
new file mode 100644
index 00000000..7355fbb5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
@@ -0,0 +1,71 @@
+;*******************************************************************************
+;* File Name          : sfu_se_mpu.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;*******************************************************************************
+;
+;
+; Cortex-M version
+;
+      PRESERVE8
+      THUMB
+      AREA    |.text|, CODE, READONLY
+ 
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT MPU_SVC_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+      AREA    |.SB_HDP_Code|, CODE, READONLY
+      EXPORT jump_to_function
+jump_to_function
+        ; assume R1 R2 are useless
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+      EXPORT launch_application
+launch_application
+        ; return from exception to application launch function
+        ; R0: application vector address
+        ; R1: exit function address
+        ; push interrupt context R0 R1 R2 R3 R12 LR PC xPSR
+        ;MOV R2, #0x01000000 ; xPSR activate Thumb bit
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} ; FLAGS=0
+        MOVS R2, #1
+        BICS R1, R1, R2  ; clear least significant bit of exit function
+        PUSH {R1}  ; return address = application entry point
+        MOVS R1, #0 ; clear other context registers
+        PUSH {R1} ; LR =0
+        PUSH {R1} ; R12 =0
+        PUSH {R1} ; R3 = 0
+        PUSH {R1} ; R2 = 0
+        PUSH {R1} ; R1 = 0
+        ; set R0 to application entry point
+        PUSH {R0} ; R0 = application entry point
+        ; set LR to return to thread mode with main stack
+        ;MOV LR, #0xFFFFFFF9
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        ; return from interrupt
+        BX LR
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
new file mode 100644
index 00000000..c30ae114
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1597224213341</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.launch</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
new file mode 100644
index 00000000..e80af641
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SBSFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../CM0PLUS/SBSFU/App | ../../../CM0PLUS/SBSFU/Target | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM0PLUS.null.839446873" name="2_Images_SBSFU_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.502950195.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1415671833;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1687290193">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
new file mode 100644
index 00000000..7adbf1cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/se_interface_kms.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_bootloader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_common.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_boot.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_boot.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_error.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_error.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_fwimg_common.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_fwimg_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_fwimg_no_swap.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_fwimg_swap.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_interface_crypto_scheme.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_kms.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_mpu_isolation.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_test.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_test.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Common/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Common/sfu_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Common/sfu_low_level_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_low_level_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Common/sfu_low_level_flash_ext.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_low_level_flash_ext.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Common/sfu_low_level_flash_int.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/sfu_low_level_flash_int.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
new file mode 100644
index 00000000..1f567ea5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file      sfu_se_mpu.s
+  * @author    MCD Application Team
+  * @brief     Wrapper for SE isolation with MPU.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+        .section  .text,"ax",%progbits
+        .syntax unified
+        .weak  MPU_SVC_Handler
+        .global SVC_Handler
+        .type  SVC_Handler, %function
+SVC_Handler:
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+        .section  .RamFunc,"ax",%progbits       
+        .global jump_to_function
+jump_to_function:
+        /* assume R1 R2 are useless */
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+        .global launch_application
+launch_application:
+        /* return from exception to application launch function */
+        /* R0: application vector address */
+        /* R1: exit function address */
+        /* push interrupt context R0 R1 R2 R3 R12 LR PC xPSR */
+        /* MOV R2, #0x01000000 ; xPSR activate Thumb bit */
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} /* FLAGS=0 */
+        MOVS R2, #1
+        BICS R1, R1, R2  /* clear least significant bit of exit function */
+        PUSH {R1}  /* return address = application entry point */
+        MOVS R1, #0 /* clear other context registers */
+        PUSH {R1} /* LR =0 */
+        PUSH {R1} /* R12 =0 */
+        PUSH {R1} /* R3 = 0 */
+        PUSH {R1} /* R2 = 0 */
+        PUSH {R1} /* R1 = 0 */
+        /* set R0 to application entry point */
+        PUSH {R0} /* R0 = application entry point */
+        /* set LR to return to thread mode with main stack */
+        /* MOV LR, #0xFFFFFFF9 */
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        /* return from interrupt */
+        BX LR
+.end
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
new file mode 100644
index 00000000..3a556990
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    sfu_secorebin_inc.c
+  * @author  MCD Application Team
+  * @brief   Include SECoreBin binary.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+
+#if defined (__GNUC__)
+asm(".section SE_CORE_Bin,\"a\";"
+                             ".incbin \"../../2_Images_SECoreBin/STM32CubeIDE/Debug/SECoreBin.bin\";"
+);
+#endif 
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/BFU_1_Image/1_Image_UserApp/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm0plus.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
new file mode 100644
index 00000000..164c4ed1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SECoreBin.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SECoreBin&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161&quot;,&quot;fPerformBuild&quot;:false,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="8000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SBSFU.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM0PLUS"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM0PLUS"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
new file mode 100644
index 00000000..51b33c92
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
@@ -0,0 +1,163 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0;                /* required amount of heap  */
+_Min_Stack_Size = 0x1A00;          /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_IF_Code : { KEEP(*se_interface_application.o (.text .text*))
+                  KEEP(*se_interface_bootloader.o (.text .text*))
+                  KEEP(*se_interface_common.o (.text .text*))
+                  KEEP(*se_interface_kms.o (.text .text*))
+  } >SE_IF_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SB_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SB_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SB_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >INTVECT_ROM_region
+  
+  SE_CORE_Bin :
+  {
+    KEEP(*(SE_CORE_Bin));
+  } > SE_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SB_RAM_region AT>SB_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
new file mode 100644
index 00000000..05aa5e0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
@@ -0,0 +1,40 @@
+SE_APP_GetActiveFwInfo
+SE_APP_SVC_Handler
+SE_SYS_SaveDisableIrq
+SE_SYS_RestoreEnableIrq
+SE_KMS_Initialize
+SE_KMS_Finalize
+SE_KMS_GetInfo
+SE_KMS_GetFunctionList
+SE_KMS_GetSlotList
+SE_KMS_GetSlotInfo
+SE_KMS_GetTokenInfo
+SE_KMS_GetMechanismInfo
+SE_KMS_OpenSession
+SE_KMS_CloseSession
+SE_KMS_CreateObject
+SE_KMS_DestroyObject
+SE_KMS_GetAttributeValue
+SE_KMS_SetAttributeValue
+SE_KMS_FindObjectsInit
+SE_KMS_FindObjects
+SE_KMS_FindObjectsFinal
+SE_KMS_EncryptInit
+SE_KMS_Encrypt
+SE_KMS_EncryptUpdate
+SE_KMS_EncryptFinal
+SE_KMS_DecryptInit
+SE_KMS_Decrypt
+SE_KMS_DecryptUpdate
+SE_KMS_DecryptFinal
+SE_KMS_DigestInit
+SE_KMS_Digest
+SE_KMS_DigestUpdate
+SE_KMS_DigestFinal
+SE_KMS_SignInit
+SE_KMS_Sign
+SE_KMS_VerifyInit
+SE_KMS_Verify
+SE_KMS_DeriveKey
+SE_KMS_GenerateKeyPair
+SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
new file mode 100644
index 00000000..759832cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SB" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2015646735" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1427517226" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.219198562" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.717379913" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1323484811" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.358650252" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.437904655" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1049432240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM4/Inc | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core ||  ||  || USE_HAL_DRIVER | STM32WL55xx ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SB_cm4.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.857176010" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1383605403" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.758517685" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.92741657" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.261244217" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1809731028" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1152988115" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1052358781" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.209012098" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM4/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1008796121" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.189316865" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.85880463" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.964611899" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.360401545" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.974389923" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.94946969" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2140178522" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1240986986" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2113270654" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1941785021" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.483477110" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1843769445" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1745519627" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1919967923" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1803902265" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.854144635" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.438689590" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM4.null.2010752311" name="2_Images_SBSFU_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.583077904;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.583077904.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1197799154;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1116976384">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
new file mode 100644
index 00000000..8d27486b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SB.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SB.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM4"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
new file mode 100644
index 00000000..92d8b68b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
@@ -0,0 +1,152 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = M4_SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;       /* required amount of heap  */
+_Min_Stack_Size = 0x200;      /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >M4_INTVECT_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >M4_SB_Code_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >M4_SB_RAM_region AT>M4_SB_Code_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >M4_SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >M4_SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/readme.txt
new file mode 100644
index 00000000..95c5e773
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SBSFU/readme.txt
@@ -0,0 +1,187 @@
+/**
+  @page 2_Images_SBSFU / Secure Boot and Secure Firmware Update Demo Application (Dual Core)
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows Secure Boot and Secure Firmware Update example.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
+In addition, Secure Boot (Root of Trust services) checks and activates the STM32 security mechanisms, and checks the
+authenticity and integrity of user application code before every execution to ensure that invalid or malicious code
+cannot be run. The Secure Firmware Update application receives the encrypted firmware image, decrypts it, then checks
+the authenticity and integrity of the code before installing it.
+
+The secure key management services provide cryptographic services to the user application through the pkcs11 APIs
+(KEY ID based APIs) that are executed inside a protected and isolated environment. User application keys are stored in
+the protected and isolated environment. They can be updated in a secure way (authenticity check, data decryption and
+data integrity check).
+
+This example supports multiple images feature configured with 2 active images for
+execution from internal flash and 1 download area also located in internal flash.
+This example allows to demonstrate features like:
+   - download a new firmware image from the application
+   - resume firmware update procedure in case of power off during installation
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from the
+STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, SBSFU, GTZC, Dual core, MPU
+
+@par Directory contents
+
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/main.c                           Main M0+ application file
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              M0+ HAL MSP module
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c                   STM32 M0+ interrupt handlers
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h                         Hardware definition for application
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/main.h                           Header file for M0+ main.c
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h          M0+ BSP configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             M0+ HAL configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h                   Header file for M0+ stm32wlxx_it.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c                     SBSFU errors management
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c              SBSFU image handling: common functionalities/services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_swap.c                SBSFU image handling: FW upgrade without swap area services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_no_swap.c             SBSFU image handling: FW upgrade with swap area services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c                       Key management service blob importation handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c             Secure Engine isolation with MPU (when no Firewall is available)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c                      SBSFU security protection automatic test
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h                       Software configuration of M0+ SBSFU application
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h                      Header file for sfu_boot.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h                     Header file for sfu_error.c file
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h                SBSFU FSM states definitions
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h                       Header file for sfu_kms.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h             Header file for sfu_mpu_isolation.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h                      Header file for sfu_test.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c     SBSFU security low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h     Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Src/main.c                                    Main M4 application file
+   - 2_Images_SBSFU/CM4/Src/sfu_com_loader.c                          SBSFU communication module: local loader part
+   - 2_Images_SBSFU/CM4/Src/sfu_loader.c                              SBSFU Local Loader
+   - 2_Images_SBSFU/CM4/Src/sfu_low_level_security.c                  M4 SB security low level interface
+   - 2_Images_SBSFU/CM4/Src/sfu_new_image.c                           SBSFU image handling: new image storage and installation request
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c                       M4 HAL MSP module
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_it.c                            STM32 M4 interrupt handlers
+   - 2_Images_SBSFU/CM4/Inc/app_sfu.h                                 Software configuration of M4 SB application
+   - 2_Images_SBSFU/CM4/Inc/main.h                                    Header file for M4 main.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_boot.h                                Definitions for Secure Boot (SB) flow control
+   - 2_Images_SBSFU/CM4/Inc/sfu_com_loader.h                          Header file for sfu_com_loader.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_loader.h                              Header file for sfu_loader.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h                  Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Inc/sfu_new_image.h                           Header file for sfu_new_image.c
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h                      M4 HAL configuration file
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h                            Header file for M4 stm32wlxx_it.c
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h                   M4 BSP configuration file
+   - 2_Images_SBSFU/Common/sfu_com_trace.c                            SBSFU communication module: trace part
+   - 2_Images_SBSFU/Common/sfu_low_level.c                            SBSFU general low level interface
+   - 2_Images_SBSFU/Common/sfu_low_level_flash.c                      SBSFU flash low level interface (wrapper)
+   - 2_Images_SBSFU/Common/sfu_low_level_flash_ext.c                  SBSFU external flash low level interface
+   - 2_Images_SBSFU/Common/sfu_low_level_flash_int.c                  SBSFU internal flash low level interface
+   - 2_Images_SBSFU/Common/app_sfu_common.h                           Common software configuration of M4 SB and M0+ SBSFU applications
+   - 2_Images_SBSFU/Common/sfu_com_trace.h                            Header file for sfu_com_trace.c
+   - 2_Images_SBSFU/Common/sfu_def.h                                  General definition for SBSFU application
+   - 2_Images_SBSFU/Common/sfu_fwimg_regions.h                        FLASH regions definitions for image handling
+   - 2_Images_SBSFU/Common/sfu_low_level.h                            Header file for general low level interface
+   - 2_Images_SBSFU/Common/sfu_low_level_flash.h                      Header file for flash low level interface (wrapper)
+   - 2_Images_SBSFU/Common/sfu_low_level_flash_ext.h                  Header external file for flash low level interface
+   - 2_Images_SBSFU/Common/sfu_low_level_flash_int.h                  Header internal file for flash low level interface
+   - 2_Images_SBSFU/Common/sfu_trace.h                                Header file for sfu_trace.c
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices.
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
+   - This example needs a terminal emulator.
+   - By default, SBSFU is configured in development mode. To switch in production mode, refer to AN5056 "Integration
+     guide - software expansion for STM32Cube" available from the STMicroelectronics microcontroller website
+     www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files.
+     As a workaround, it is advised to use the subst.exe command from within a command prompt to set up a local drive
+     out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par How to use it ?
+
+Several steps to run SBSFU application :
+
+1. Compile projects in the following order. This is mandatory as each project requests some objects generated by the
+   compilation of the previous one:
+   - 2_Images_SECoreBin (see also SECoreBin/readme.txt)
+   - 2_Images_SBSFU (using both CM4 and CM0+ workspaces)
+   - 2_Images_UserApp_M0Plus (see also UserApp_M0Plus/readme.txt)
+   - 2_Images_UserApp_M4 (see also UserApp_M4/readme.txt)
+
+2. Before loading SBSFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that the
+   following are valid for the device:
+   - RDP Level 0
+   - Write Protection disabled on all FLASH pages
+   - Chip has been erased
+
+3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator that can be downloaded
+   from https://osdn.net/projects/ttssh2/) for UART connection with the board.
+   Support of YMODEM protocol is required. Serial port configuration should be :
+   - Baud rate = 115200
+   - Data = 8 bits
+   - Parity = none
+   - Stop = 1 bit
+   - Flow control = none
+
+4. Load CM4 SB image and CM0+ SBSFU image into target memory with your preferred toolchain or STM32CubeProgammer.
+
+5. Once the SB_SFU software is downloaded, power cycle the board (unplug/plug USB cable) : the SBSFU application starts
+   and configures the security mechanisms.
+
+6. Power cycle the board a second time (unplug/plug the USB cable): the SBSFU application starts with the configured
+   securities turned on and the Tera Term connection is possible.
+   Caution: Make sure to use an up-to-date version of ST-LINK firmware else SBSFU may not start.
+
+7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
+   Red LED blinks every 500 ms when waiting for the CM0+ SBSFU to boot.
+   Green LED blinks every 100 ms when CM0+ and/or CM4 firmware image(s) need(s) to be dowloaded.
+   Red LED blinks every 3 seconds when a local download is waited.
+   A reboot occurs in case of error in option bytes configuration.
+
+8. Send the first user encrypted firmware file (\2_Images\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \2_Images\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+9. Send the second user encrypted firmware file (\2_Images\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \2_Images\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
+Note2 : As TAMPER detection can be very sensitive, the protection is disabled by default.
+        Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
+Note3 : for Linux users Minicom can be used but to do so you need to compile the SBSFU project with the MINICOM_YMODEM
+        switch enabled (app_sfu.h)
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
new file mode 100644
index 00000000..1cdd8ce9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIEbzXMiF8fTUDKWWppKCHkKgLVqrhvGd96DNs11+aAyEoAoGCCqGSM49
+AwEHoUQDQgAEx1uaYDL95LOLizohUs9LXQ1Np/3uq3SX35H5rxB5KRURLRUzQ9Rm
+iYDexMr3mmUqR3QsRQmL4LJbbkCxFLq1dw==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
new file mode 100644
index 00000000..0e687f3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY2
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
new file mode 100644
index 00000000..0e687f3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY2
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/nonce.bin b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/nonce.bin
new file mode 100644
index 00000000..020162be
Binary files /dev/null and b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Binary/nonce.bin differ
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
new file mode 100644
index 00000000..91e39b0a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
new file mode 100644
index 00000000..8beac3b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
@@ -0,0 +1,1181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+          <state>KMS_ENABLED</state>
+          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
+          <state>IT_MANAGEMENT_DISABLED</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
+        <postbuild></postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>SE_CallGate</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
+      </file>
+    </group>
+    <group>
+      <name>Third_Party</name>
+      <group>
+        <name>mbed-crypto</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
+        </file>
+      </group>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..b355feac
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,179 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% %headerbin%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %partialbin% %partialsfu%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..8fca7b01
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,169 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% -o %offset% --pfw %partialbin% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..ef96d748
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,178 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files (x86)\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files (x86)\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+set "partialbin=%userAppBinary%\\Partial%execname%.bin"
+set "partialsfb=%userAppBinary%\\Partial%execname%.sfb"
+set "partialsfu=%userAppBinary%\\Partial%execname%.sfu"
+set "partialsign=%userAppBinary%\\Partial%execname%.sign"
+set "partialoffset=%userAppBinary%\\Partial%execname%.offset"
+set "ref_userapp=%projectdir%\\RefUserApp.bin"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%projectdir%\\..\\..\\2_Images_UserApp_M0Plus\\Binary\\SBSFU_%execname%.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+set "alignment=16"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%"
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o %offset% %headerbin% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header.txt (
+  del %projectdir%\header.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output.txt 2>>&1
+echo header %header% >> %projectdir%\output.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::Partial image generation if reference userapp exists
+if not exist "%ref_userapp%" (
+goto :bigelf
+)
+set "command=%python%%prepareimage% diff -1 %ref_userapp% -2 %bin% %partialbin% -a %alignment% --poffset %partialoffset% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %partialbin% %partialsfu%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256  %partialbin% %partialsign% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% -o %offset% --pfw %partialsfu% --ptag %partialsign% --poffset  %partialoffset% %partialsfb%>> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+if exist "%ref_userapp%" (
+del %partialsign%
+del %partialbin%
+del %partialsfu%
+del %partialoffset%
+)
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
new file mode 100644
index 00000000..83291a72
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V6M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..68937ca8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,28 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit};
+
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
+place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
+place in SE_CODE_NOKEY_ROM_region {readonly};
+place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
+keep { section .SE_embedded_Keys };
+place in SE_RAM_region {readwrite, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/ca_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
new file mode 100644
index 00000000..0dea918c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
@@ -0,0 +1,639 @@
+/**
+  ******************************************************************************
+  * @file    ca_conf.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Cryptographic API (CA)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_CONF_H
+#define CA_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Cryptographic_API Cryptographic API (CA)
+  * @{
+  */
+
+/** @defgroup CA_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup CA_Crypto_Libraries Cryptographic Libraries
+  * @{
+  */
+
+/**
+  * @brief Define CA_ST_CRYPTOLIB_SUPP to use services from ST Cryptographic firmware Library
+  * @note  More details on this library can be found here www.st.com/en/embedded-software/x-cube-cryptolib.html
+  */
+/*#define CA_ST_CRYPTOLIB_SUPP*/
+
+/**
+  * @brief Define CA_MBED_CRYPTOLIB_SUPP to use services from the Mbed Cryptography Library
+  * @note  More details on this library can be found here github.com/ARMmbed/mbed-crypto
+  */
+#define CA_MBED_CRYPTOLIB_SUPP
+
+/**
+  * @brief Define CA_HAL_CRYPTOLIB_SUPP to use services from the STM32Cube HAL drivers
+  * @note  HAL drivers can be used to access cryptographic services of specific IP peripherals
+  *        Supported IP peripherals are CRYP & PKA
+  */
+#define CA_HAL_CRYPTOLIB_SUPP
+
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Features_Config Supported Features
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RNG to support RNG cryptographic algorithm
+  */
+/* #define CA_FEAT_RNG */
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define the below line to support AES cryptographic algorithm
+  */
+#define CA_FEAT_AES
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_AES_Features_Config AES Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_AES_ENCRYPT to support AES cryptographic algorithm encryption
+  */
+#define CA_FEAT_AES_ENCRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_DECRYPT to support AES cryptographic algorithm decryption
+  */
+#define CA_FEAT_AES_DECRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_128BITS to support AES cryptographic algorithm on 128 bits length keys
+  */
+#define CA_FEAT_AES_128BITS
+
+/**
+  * @brief Define CA_FEAT_AES_192BITS to support AES cryptographic algorithm on 192 bits length keys
+  */
+/* #define CA_FEAT_AES_192BITS */
+
+/**
+  * @brief Define CA_FEAT_AES_256BITS to support AES cryptographic algorithm on 256 bits length keys
+  */
+#define CA_FEAT_AES_256BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+/**
+  * @brief Define CA_FEAT_HASH to support HASH cryptographic algorithm
+  */
+#define CA_FEAT_HASH
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC to support ECC cryptographic algorithm
+  */
+#define CA_FEAT_ECC
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC_VERIFY to support ECC cryptographic algorithm verification
+  */
+#define CA_FEAT_ECC_VERIFY
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+/**
+  * @brief Define CA_FEAT_RSA to support RSA cryptographic algorithm
+  */
+#define CA_FEAT_RSA
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RSA_SIGN to support RSA cryptographic algorithm signature
+  */
+#define CA_FEAT_RSA_SIGN
+
+/**
+  * @brief Define CA_FEAT_RSA_VERIFY to support RSA cryptographic algorithm verification
+  */
+#define CA_FEAT_RSA_VERIFY
+
+/**
+  * @brief Define CA_FEAT_RSA_1024BITS to support RSA cryptographic algorithm on 1024 bits length modulus
+  */
+#define CA_FEAT_RSA_1024BITS
+
+/**
+  * @brief Define CA_FEAT_RSA_2048BITS to support RSA cryptographic algorithm on 2048 bits length modulus
+  */
+#define CA_FEAT_RSA_2048BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/** @defgroup CA_Router_Config Algorithms Router & Configuration
+  * @{
+  */
+
+/** @defgroup CA_Router_Config_Def Router defines
+  * @note     Masks & Defines to use to configure algorithm routing options
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_MASK to extract configured route from algorithm configuration definition
+  */
+#define CA_ROUTE_MASK   (0xFUL)
+
+/**
+  * @brief Use CA_ROUTE_ST to make the configured algorithm using ST Cryptographic firmware Library
+  * @note  See @ref CA_ST_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_ST     (1UL)
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#define CA_ROUTE_ST     (0UL)
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_MBED to make the configured algorithm using Mbed Cryptography Library
+  * @note  See @ref CA_MBED_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_MBED   (2UL)
+#else /* CA_MBED_CRYPTOLIB_SUPP */
+#define CA_ROUTE_MBED   (0UL)
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_HAL to make the configured algorithm using STM32Cube HAL drivers
+  * @note  See @ref CA_HAL_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_HAL    (3UL)
+#else /* CA_HAL_CRYPTOLIB_SUPP */
+#define CA_ROUTE_HAL    (0UL)
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if !defined(CA_ROUTE_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_DEFAULT to choose default route for the configured algorithm
+  * @note  Default is chosen as below described:
+  *        - If CA_ST_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_ST
+  *        - else if CA_MBED_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_MBED
+  *        - else if CA_HAL_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_HAL
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_ST
+#elif defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_MBED
+#elif defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_HAL
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ROUTE_DEFAULT */
+
+/**
+  * @}
+  */
+#if defined(CA_FEAT_RNG)
+/** @defgroup CA_Router_Config_RNG_Def RNG Defines
+  * @note     Masks & Defines to use to configure RNG algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief RNG configuration
+  * @note  Define CA_ROUTE_RNG to enable RNG algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_RNG  (CA_ROUTE_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RNG */
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_Router_Config_AES_Def AES Defines
+  * @note     Masks & Defines to use to configure AES algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_ENCRYPT_ENABLE to enable encryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_ENCRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_ENCRYPT)
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (1UL << 8)
+#else /* CA_FEAT_AES_ENCRYPT */
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_ENCRYPT */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DECRYPT_ENABLE to enable decryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_DECRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_DECRYPT)
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (1UL << 9)
+#else /* CA_FEAT_AES_DECRYPT */
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_DECRYPT */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_128BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_128BITS to be defined
+  */
+#if defined(CA_FEAT_AES_128BITS)
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (1UL << 10)
+#else /* CA_FEAT_AES_128BITS */
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_128BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_192BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_192BITS to be defined
+  */
+#if defined(CA_FEAT_AES_192BITS)
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (1UL << 11)
+#else /* CA_FEAT_AES_192BITS */
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_192BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_256BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_256BITS to be defined
+  */
+#if defined(CA_FEAT_AES_256BITS)
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_AES_256BITS */
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_256BITS */
+
+#if !defined(CA_ROUTE_AES_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DEFAULT to choose default settings for the configured AES algorithm
+  * @note  Default is: encryption & decryption using 128, 192 & 256 bits lengths keys enabled
+  */
+#define CA_ROUTE_AES_CFG_DEFAULT  (CA_ROUTE_AES_CFG_ENCRYPT_ENABLE  \
+                                   | CA_ROUTE_AES_CFG_DECRYPT_ENABLE \
+                                   | CA_ROUTE_AES_CFG_128BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_192BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_256BITS_ENABLE)
+#endif /* CA_ROUTE_AES_CFG_DEFAULT */
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Router_Config_AES AES Algorithms configurations
+  * @{
+  */
+
+/**
+  * @brief AES CBC configuration
+  * @note  Define CA_ROUTE_AES_CBC to enable AES CBC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CBC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CCM configuration
+  * @note  Define CA_ROUTE_AES_CCM to enable AES CCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CMAC configuration
+  * @note  Define CA_ROUTE_AES_CMAC to enable AES CMAC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CMAC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES ECB configuration
+  * @note  Define CA_ROUTE_AES_ECB to enable AES ECB algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_ECB  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES GCM configuration
+  * @note  Define CA_ROUTE_AES_GCM to enable AES GCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_GCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+
+#if defined(CA_FEAT_HASH)
+/** @defgroup CA_Router_Config_HASH_Def HASH Defines
+  * @note     Masks & Defines to use to configure HASH algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief HASH SHA1 configuration
+  * @note  Define CA_ROUTE_HASH_SHA1 to enable HASH SHA1 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+/* #define CA_ROUTE_HASH_SHA1  (CA_ROUTE_DEFAULT) */
+
+/**
+  * @brief HASH SHA256 configuration
+  * @note  Define CA_ROUTE_HASH_SHA256 to enable HASH SHA256 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_HASH_SHA256  (CA_ROUTE_MBED)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_HASH */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_Router_Config_ECC_Def ECC Defines
+  * @note     Masks & Defines to use to configure ECC algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_VERIFY_ENABLE to enable verification for the configured ECC algorithm
+  * @note  Requires @ref CA_FEAT_ECC_VERIFY to be defined
+  */
+#if defined(CA_FEAT_ECC_VERIFY)
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_ECC_VERIFY */
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_ECC_VERIFY */
+
+
+#if !defined(CA_ROUTE_ECC_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_DEFAULT to choose default settings for the configured ECC algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_ECC_CFG_DEFAULT  (CA_ROUTE_ECC_CFG_VERIFY_ENABLE)
+#endif /* CA_ROUTE_ECC_CFG_DEFAULT */
+
+/**
+  * @brief ECC ECDSA configuration
+  * @note  Define CA_ROUTE_ECC_ECDSA to enable ECC ECDSA algorithm
+  * @note  Requires CA_ROUTE_RNG to be defined
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_ECC_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_ECC_CFG_DEFAULT to use default ECC algorithm configuration
+  */
+#define CA_ROUTE_ECC_ECDSA  (CA_ROUTE_HAL | CA_ROUTE_ECC_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_Router_Config_RSA_Def RSA Defines
+  * @note     Masks & Defines to use to configure RSA algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_SIGN_ENABLE to enable signature for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_SIGN to be defined
+  */
+#if defined(CA_FEAT_RSA_SIGN)
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (1UL << 8)
+#else /* CA_FEAT_RSA_SIGN */
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_SIGN */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_VERIFY_ENABLE to enable verification for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_VERIFY to be defined
+  */
+#if defined(CA_FEAT_RSA_VERIFY)
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_RSA_VERIFY */
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_VERIFY */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_1024BITS_ENABLE to enable support of 1024 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_1024BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_1024BITS)
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_RSA_1024BITS */
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_1024BITS */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_2048BITS_ENABLE to enable support of 2048 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_2048BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_2048BITS)
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (1UL << 13)
+#else /* CA_FEAT_RSA_2048BITS */
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_2048BITS */
+
+
+#if !defined(CA_ROUTE_RSA_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_DEFAULT to choose default settings for the configured RSA algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_RSA_CFG_DEFAULT  (CA_ROUTE_RSA_CFG_SIGN_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_VERIFY_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_1024BITS_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_2048BITS_ENABLE)
+#endif /* CA_ROUTE_RSA_CFG_DEFAULT */
+
+/**
+  * @brief RSA configuration
+  * @note  Define CA_ROUTE_RSA to enable RSA algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_RSA_CFG_SIGN_ENABLE      Signature is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_1024BITS_ENABLE  1024 bits length modulus is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_2048BITS_ENABLE  2048 bits length modulus is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_RSA_CFG_DEFAULT to use default RSA algorithm configuration
+  */
+#define CA_ROUTE_RSA  (CA_ROUTE_HAL | CA_ROUTE_RSA_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
new file mode 100644
index 00000000..64ef96b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains the low level definitions of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_H
+#define CA_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+/*
+ * STM32 target HAL driver include
+ * ex: stm32l4xx_hal.h
+ */
+#include "stm32wlxx_hal.h"
+
+/* Exported constants --------------------------------------------------------*/
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * AES/CRYP instance to use
+ * ex: AES1
+ */
+#define CA_AES_INSTANCE     (AES)
+
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * PKA instance to use
+ * ex: PKA
+ */
+#define CA_PKA_INSTANCE     (PKA)
+
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+
+/* Exported function ---------------------------------------------------------*/
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+void CA_LL_CRC_Init(void);
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_config.h
new file mode 100644
index 00000000..a73094e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_config.h
@@ -0,0 +1,530 @@
+/**
+  ******************************************************************************
+  * @file    kms_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Key Management Services (KMS)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_CONFIG_H
+#define KMS_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @defgroup KMS_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup KMS_HW_Config Hardware
+  * @{
+  */
+
+/**
+  * @brief KMS_EXT_TOKEN_ENABLED Uncomment the below line to support External Token
+  */
+/*#define KMS_EXT_TOKEN_ENABLED*/
+
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Storage_Config Storage
+  * @{
+  */
+
+/**
+  * @brief KMS_NVM_ENABLED Uncomment the below line to support Non Volatile
+  *        Memory storage
+  * @note  Mandatory to handle runtime objects addition through blob import or
+  *        creation through specific KMS services
+  */
+#define KMS_NVM_ENABLED
+
+/**
+  * @brief KMS_NVM_DYNAMIC_ENABLED Uncomment the below line to support Non
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  * @note  Requires @ref KMS_NVM_ENABLED to be defined
+  */
+#define KMS_NVM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_NVM_SLOT_NUMBERS Specify here the number of slots to use in the Non Volatile Memory storage
+  * @note  NVM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into NVM. But if you intend to manipulate objects (create, destroy, derivate...) better use a greater
+  *        number to avoid too much erase of the flash sectors containing the NVM storage.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in NVM.
+  * @note  Mandatory to set if @ref KMS_NVM_ENABLED is defined
+  */
+#define KMS_NVM_SLOT_NUMBERS                    (40UL)
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Config Services
+  * @{
+  */
+/**
+  * @brief KMS_NB_SESSIONS_MAX Defines the number of sessions KMS will be able
+  *        to handle in parallel
+  * @note  This value has an impact on memory footprint
+  */
+#define KMS_NB_SESSIONS_MAX                     (10UL)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_PKCS_Config PKCS#11 services
+  * @{
+  */
+
+/**
+  * @brief KMS_ENCRYPT Uncomment the below line to support encryption services
+  * @note  Requires a supported encryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_ENCRYPT
+
+/**
+  * @brief KMS_DECRYPT Uncomment the below line to support decryption services
+  * @note  Requires a supported decryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_DECRYPT
+
+/**
+  * @brief KMS_DIGEST Uncomment the below line to support digest services
+  * @note  Requires a supported digest algorithm to be enabled too:
+  *        @ref KMS_SHA1
+  *        @ref KMS_SHA256
+  */
+#define KMS_DIGEST
+
+/**
+  * @brief KMS_SIGN Uncomment the below line to support signature services
+  * @note  Requires a supported signature algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_SIGN
+
+/**
+  * @brief KMS_VERIFY Uncomment the below line to support verification services
+  * @note  Requires a supported verification algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_ECDSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_VERIFY
+
+/**
+  * @brief KMS_DERIVE_KEY Uncomment the below line to support key derivation services
+  * @note  Requires a supported derivation algorithm to be enabled too:
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  */
+#define KMS_DERIVE_KEY
+
+/**
+  * @brief KMS_SEARCH Uncomment the below line to support key search or mechanism search services
+  */
+#define KMS_SEARCH
+
+/**
+  * @brief KMS_GENERATE_KEYS Uncomment the below line to support key generation services
+  * @note  Requires a supported key generation algorithm to be enabled too:
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  */
+/*#define KMS_GENERATE_KEYS*/
+
+/**
+  * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  */
+#define KMS_ATTRIBUTES
+
+/**
+  * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  */
+#define KMS_OBJECTS
+
+/**
+  * @brief KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT Uncomment the below line to support C_GetFunctionList API
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT*/
+
+/**
+  * @brief KMS_PKCS11_COMPLIANCE Uncomment the below line to support PKCS11 APIs and implementation that are required
+  *        to be compliant with PKCS11 standard
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_COMPLIANCE*/
+
+/**
+  * @brief KMS_NIKMS_ROUTER_BYPASS Uncomment the below line to bypass KMS router and perform direct KMS API calls
+  * @note  Only applicable when using 'niKMS' access
+  * @note  Enabling this feature allows to save some code footprint, but forbid any use of the external token services
+  */
+/*#define KMS_NIKMS_ROUTER_BYPASS*/
+
+/**
+  * @brief KMS_IMPORT_BLOB Uncomment the below line to use vendor defined blob import features
+  * @note  Requires @ref KMS_NVM_ENABLED to store imported keys
+  * @note  Requires the following services and algorithm to Authenticate, Verify and decrypt the imported blobs:
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_DIGEST
+  *        @ref KMS_SHA256
+  *        @ref KMS_VERIFY
+  *        @ref KMS_ECDSA
+  *        @ref KMS_EC_SECP256
+  */
+#define KMS_IMPORT_BLOB
+
+/**
+  * @brief KMS_IMPORT_BLOB_CHUNK_SIZE Configure the blob importation chunk size
+  * @note  This size must be a multiple of 4
+  * @note  This size must be greater to at least the blob import header size
+  * @note  Requires @ref KMS_IMPORT_BLOB to be enabled
+  */
+#define KMS_IMPORT_BLOB_CHUNK_SIZE      (512U)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Memory_Config Memory management
+  * @{
+  */
+
+/**
+  * @brief KMS_MEM_USE_HEAP_ALLOCATOR Uncomment the below line to perform dynamic allocation in HEAP
+  * @note  KMS will use standard malloc and free APIs
+  * @note  Requires a dynamic allocator provided by the toolchain like dlmalloc
+  * @note  KMS_MEM_USE_HEAP_ALLOCATOR and KMS_MEM_USE_POOL_ALLOCATOR are mutually exclusive
+  */
+/*#define KMS_MEM_USE_HEAP_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_USE_POOL_ALLOCATOR Uncomment the below line to perform dynamic allocation using internal pool
+  *        allocator
+  * @note  Requires a pool definition in a file called kms_mem_pool_def.h (see kms_mem_pool_def_template.h for example)
+  */
+#define KMS_MEM_USE_POOL_ALLOCATOR
+
+/**
+  * @brief KMS_MEM_USE_CUSTOM_ALLOCATOR Uncomment the below line to perform dynamic
+  *        allocation using a custom allocator
+  * @note  To use this custom allocator, implement the kms_mem_low_level.c
+  *        - void KMS_MemInit(void)
+  *        - CK_VOID_PTR KMS_Alloc(CK_SESSION_HANDLE session, size_t size)
+  *        - void KMS_Free(CK_SESSION_HANDLE session, CK_VOID_PTR ptr)
+  */
+/*#define KMS_MEM_USE_CUSTOM_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_DEBUGGING Uncomment the below line to keep memory profiling information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_DEBUGGING
+
+/**
+  * @brief KMS_MEM_CLEANING Uncomment the below line to clean dynamically freed memory
+  * @note  The freed memory will be reset to 0
+  * @note  If using @ref KMS_MEM_USE_HEAP_ALLOCATOR, @ref KMS_MEM_DEBUGGING required
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_CLEANING
+
+/**
+  * @brief KMS_MEM_LOGGING Uncomment the below line to log memory allocation information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  * @note  Information about allocations will be transmitted to @ref KMS_LL_ReportMemAlloc and @ref KMS_LL_ReportMemFree
+  */
+/*#define KMS_MEM_LOGGING*/
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Security_Config Security Enforcement
+  * @{
+  */
+
+/**
+  * @brief KMS_SE_CHECK_PARAMS Uncomment the below line to check input & output parameters location vs secure enclave
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_CHECK_PARAMS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS Uncomment the below line to use key locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_KEYS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS_MAXIMUM Specify here the number of keys that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_KEYS is defined
+  */
+#define KMS_SE_LOCK_KEYS_MAX                 (10UL)
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES Uncomment the below line to use services locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_SERVICES
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES_MAX Specify here the number of services that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_SERVICES is defined
+  */
+#define KMS_SE_LOCK_SERVICES_MAX             (2UL)
+
+/**
+  * @}
+  */
+
+/** Function flag definition to be used to qualify algorithm usage **/
+
+#if defined(KMS_ENCRYPT)
+#define KMS_FCT_ENCRYPT         (1UL << 0)
+#else /* KMS_ENCRYPT */
+#define KMS_FCT_ENCRYPT         (0UL << 0)
+#endif /* KMS_ENCRYPT */
+#if defined(KMS_DECRYPT)
+#define KMS_FCT_DECRYPT         (1UL << 1)
+#else /* KMS_DECRYPT */
+#define KMS_FCT_DECRYPT         (0UL << 1)
+#endif /* KMS_DECRYPT */
+#if defined(KMS_SIGN)
+#define KMS_FCT_SIGN            (1UL << 2)
+#else /* KMS_SIGN */
+#define KMS_FCT_SIGN            (0UL << 2)
+#endif /* KMS_SIGN */
+#if defined(KMS_VERIFY)
+#define KMS_FCT_VERIFY          (1UL << 3)
+#else /* KMS_VERIFY */
+#define KMS_FCT_VERIFY          (0UL << 3)
+#endif /* KMS_VERIFY */
+#if defined(KMS_DERIVE_KEY)
+#define KMS_FCT_DERIVE_KEY      (1UL << 4)
+#else /* KMS_DERIVE_KEY */
+#define KMS_FCT_DERIVE_KEY      (0UL << 4)
+#endif /* KMS_DERIVE_KEY */
+#if defined(KMS_GENERATE_KEYS)
+#define KMS_FCT_GENERATE_KEYS   (1UL << 5)
+#else /* KMS_GENERATE_KEYS */
+#define KMS_FCT_GENERATE_KEYS   (0UL << 5)
+#endif /* KMS_GENERATE_KEYS */
+#if defined(KMS_DIGEST)
+#define KMS_FCT_DIGEST          (1UL << 6)
+#else /* KMS_DIGEST */
+#define KMS_FCT_DIGEST          (0UL << 6)
+#endif /* KMS_DIGEST */
+
+/** @defgroup KMS_Features_Config Features
+  * @{
+  */
+
+/**
+  * @brief KMS_AES_CBC Uncomment the below line to support AES CBC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_CBC           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CCM Uncomment the below line to support AES CCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+/*#define KMS_AES_CCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)*/
+
+/**
+  * @brief KMS_AES_ECB Uncomment the below line to support AES ECB algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_DERIVE_KEY
+  */
+#define KMS_AES_ECB           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY)
+
+/**
+  * @brief KMS_AES_GCM Uncomment the below line to support AES GCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_GCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CMAC Uncomment the below line to support AES CMAC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  */
+#define KMS_AES_CMAC          (KMS_FCT_SIGN|KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_RSA Uncomment the below line to support RSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  * @note  Requires at least one of the following RSA modulus length to be enabled:
+  *        @ref KMS_RSA_1024
+  *        @ref KMS_RSA_2048
+  */
+#define KMS_RSA               (KMS_FCT_SIGN|KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_RSA_1024 Uncomment the below line to support RSA 1024 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+#define KMS_RSA_1024
+
+/**
+  * @brief KMS_RSA_2048 Uncomment the below line to support RSA 2048 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+#define KMS_RSA_2048
+
+/**
+  * @brief KMS_ECDSA Uncomment the below line to support ECDSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  *        - KMS_FCT_GENERATE_KEYS    This algorithm can be used to perform key generation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_VERIFY
+  *        @ref KMS_DERIVE_KEY
+  *        @ref KMS_GENERATE_KEYS
+  * @note  Requires at least one of the following elliptic curve to be enabled:
+  *        @ref KMS_EC_SECP192
+  *        @ref KMS_EC_SECP256
+  *        @ref KMS_EC_SECP384
+  */
+#define KMS_ECDSA             (KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_EC_SECP192 Uncomment the below line to support elliptic curve SECP-192
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP192*/
+
+/**
+  * @brief KMS_EC_SECP256 Uncomment the below line to support elliptic curve SECP-256
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+#define KMS_EC_SECP256
+
+/**
+  * @brief KMS_EC_SECP384 Uncomment the below line to support elliptic curve SECP-384
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP384*/
+
+/**
+  * @brief KMS_SHA1 Uncomment the below line to support SHA1 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+/*#define KMS_SHA1              (KMS_FCT_DIGEST)*/
+
+/**
+  * @brief KMS_SHA256 Uncomment the below line to support SHA256 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+#define KMS_SHA256            (KMS_FCT_DIGEST)
+
+
+
+/** @defgroup KMS_Debug_Config Debug
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
new file mode 100644
index 00000000..ae3e8d6b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef KMS_LOW_LEVEL_H
+#define KMS_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup KMS_LL_Exported_Constants Exported Constants
+  * @{
+  */
+
+#define KMS_LL_ERROR_MEM_ALLOC_FAILURE    (0x00000001UL)    /*!< Memory allocation failure error */
+#define KMS_LL_ERROR_MEM_FREE_CANARY      (0x00000002UL)    /*!< Memory free detected altered canaries error */
+#define KMS_LL_ERROR_MEM_FREE_NULL_PTR    (0x00000003UL)    /*!< Memory free detected a NULL pointer error */
+#define KMS_LL_ERROR_MEM_FREE_UNKNOWN     (0x00000004UL)    /*!< Memory free detected an unknown pointer error */
+
+/**
+  * @}
+  */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_LL_Exported_Functions Exported Functions
+  * @{
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length);
+uint32_t KMS_LL_FLASH_GetBlobDownloadAddress(void);
+
+#ifdef KMS_SE_CHECK_PARAMS
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize);
+#endif /* KMS_SE_CHECK_PARAMS */
+
+void KMS_LL_ReportError(uint32_t error);
+
+void KMS_LL_ReportMemInit(void);
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem);
+void KMS_LL_ReportMemFree(void *pmem);
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t KMS_LL_GetLR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif /* KMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
new file mode 100644
index 00000000..a5f54fbf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
@@ -0,0 +1,54 @@
+/**
+  ******************************************************************************
+  * @file    kms_mem_pool_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          memory pool definition
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Recursive inclusion autorised ---------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * POOL DESCRIPTION
+ */
+
+/*
+ * Memory pools definition:
+ * 2 pools of 256
+ * 1 pool of 512
+ * 2 pools of 1K
+ * 1 pool of 5K
+ */
+
+KMS_MEM_DECLARE_POOL_START()
+KMS_MEM_DECLARE_POOL_ENTRY(1, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(2, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(3, 512)
+KMS_MEM_DECLARE_POOL_ENTRY(4, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(5, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(6, 5 * 1024)
+KMS_MEM_DECLARE_POOL_END()
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
new file mode 100644
index 00000000..31ce1225
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
@@ -0,0 +1,390 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_CONFIG_H
+#define KMS_PLATF_OBJECTS_CONFIG_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "kms_platf_objects_interface.h"
+#include "app_sfu.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_PLATF Platform Objects
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_PLATF_Exported_Constants Exported Constants
+  * @note KMS support different type of objects, their respective ranges are
+  *       defined here
+  * @{
+  */
+
+/* We consider that the ORDER (static = lower ids) will be kept. */
+#define KMS_INDEX_MIN_EMBEDDED_OBJECTS       1UL   /*!< Embedded objects min ID. Must be > 0 as '0' is never a
+                                                        valid key index */
+#define KMS_INDEX_MAX_EMBEDDED_OBJECTS       (KMS_INDEX_MIN_EMBEDDED_OBJECTS+19UL)    /*!< Embedded objects max ID */
+#define KMS_INDEX_MIN_NVM_STATIC_OBJECTS     (KMS_INDEX_MAX_EMBEDDED_OBJECTS+1UL)     /*!< NVM static objects min ID */
+#define KMS_INDEX_MAX_NVM_STATIC_OBJECTS     (KMS_INDEX_MIN_NVM_STATIC_OBJECTS+19UL)  /*!< NVM static objects max ID */
+
+#define KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MAX_NVM_STATIC_OBJECTS+1UL)   /*!< NVM dynamic objects min ID */
+#define KMS_INDEX_MAX_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS+19UL) /*!< NVM dynamic objects max ID */
+
+/* When EXTERNAL TOKEN is not supported the below values can be commented */
+#define KMS_INDEX_MIN_EXT_TOKEN_STATIC_OBJECTS        70UL  /*!< External token static objects min ID */
+#define KMS_INDEX_MAX_EXT_TOKEN_STATIC_OBJECTS        89UL  /*!< External token static objects max ID */
+#define KMS_INDEX_MIN_EXT_TOKEN_DYNAMIC_OBJECTS       90UL  /*!< External token dynamic objects min ID */
+#define KMS_INDEX_MAX_EXT_TOKEN_DYNAMIC_OBJECTS      110UL  /*!< External token dynamic objects max ID */
+
+/* Blob import key index */
+#define KMS_INDEX_BLOBIMPORT_VERIFY       (1U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob verification key is stored */
+#define KMS_INDEX_BLOBIMPORT_DECRYPT      (2U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob decryption key is stored */
+
+/**
+  * @}
+  */
+
+/*
+ * Embedded objects definition
+ *
+ */
+#ifdef KMS_PLATF_OBJECTS_C
+/** @addtogroup KMS_PLATF_Private_Variables Private Variables
+  * @{
+  */
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".SE_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".SE_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 24);
+KMS_DECLARE_BLOB_STRUCT(, 30);
+KMS_DECLARE_BLOB_STRUCT(, 256);
+
+/* This object is used for KMS blob header signature                 */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   KMS_Blob_ECDSA_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  1,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_BLOB_KEY@
+  }
+};
+
+/* This object is used for KMS blob encryption                    */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   KMS_Blob_AES_CBC128_Decrypt =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  2,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_BLOB_KEY@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_1_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  3,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_1@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_2_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_2@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /*(SFU_NB_MAX_ACTIVE_IMAGE > 1U)*/
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_3_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_3@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_1_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  6,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_1@
+  }
+};
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_2_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  7,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_2@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_3_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  8,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_3@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+
+
+
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif
+
+/* These objects are used by user tKMS application                 */
+static const kms_obj_keyhead_24_t   Test_Key_AES128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  68,                              /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  13,                              /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        16, 0xfeffe992U, 0x8665731cU, 0x6d6a8f94U, 0x67308308U,
+    CKA_LABEL,        12, 0x52455355U, 0x50595243U, 0x00383231U,      /* 'USER', 'CRYP', '128' */
+    0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL /* Fill end of structure */
+  }
+};
+
+static const kms_obj_keyhead_24_t   Test_Key_AES256 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /* uint32_t version;  */
+  KMS_ABI_CONFIG_KEYHEAD,          /* uint32_t configuration; */
+  84,                              /* uint32_t blobs_size; */
+  9,                               /* uint32_t blobs_count; */
+  14,                              /* uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        32, 0x03030303U, 0x03030303U, 0x03030303U, 0x03030303U,
+    0x03030303U, 0x03030303U, 0x03030303U, 0x03030303U,
+    CKA_LABEL,        12, 0x52455355U, 0x50595243U, 0x00363532U,      /* 'USER', 'CRYP', '256' */
+    0UL, 0UL, 0UL                 /* Fill end of structure */
+  }
+};
+
+/**
+  * @brief  KMS embedded objects definition
+  * @note   Must contains KMS blob verification and decryption keys
+  */
+static const kms_obj_keyhead_t *const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBEDDED_OBJECTS -
+                                                                    KMS_INDEX_MIN_EMBEDDED_OBJECTS + 1] =
+{
+  /* KMS Blob import keys */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_ECDSA_Verify,       /* Index = 1 */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_AES_CBC128_Decrypt, /* Index = 2 */
+  /* SBSFU keys */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_1_128,             /* Index = 3 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_2_128,             /* Index = 4 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_3_128,             /* Index = 5 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 3 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_1_Verify,        /* Index = 6 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_2_Verify,        /* Index = 7 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_3_Verify,        /* Index = 8 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 12 */
+  /* UserApp example keys */
+  (kms_obj_keyhead_t *)(uint32_t) &Test_Key_AES128,             /* Index = 13 */
+  (kms_obj_keyhead_t *)(uint32_t) &Test_Key_AES256,             /* Index = 14 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 15 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 16 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 20 */
+};
+
+/**
+  * @}
+  */
+#endif /* KMS_PLATF_OBJECTS_C */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
new file mode 100644
index 00000000..d2a45750
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
@@ -0,0 +1,64 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_interface.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_INTERFACE_H
+#define KMS_PLATF_OBJECTS_INTERFACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* KMS exported Object handles for Secure Boot */
+
+/* SBSFU Root CA Certificate */
+#define KMS_SBSFU_ROOT_CA_CRT_LABEL           "SBSFURootCACertificate"  /*!< SBSFU Root CA Certificate Label */
+#define KMS_SBSFU_ROOT_CA_CRT_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)9)  /*!< SBSFU Root CA Certificate object handle */
+
+/* OEM Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_LABEL           "OEMIntermCACertificate_1"  /*!< OEM 1 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_LABEL           "OEMIntermCACertificate_2"  /*!< OEM 2 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_LABEL           "OEMIntermCACertificate_3"  /*!< OEM 3 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)10)  /*!< OEM 1 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)11)  /*!< OEM 2 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)12)  /*!< OEM 3 Interm CA Certificate object handle */
+
+
+#define KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)3)
+#define KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)4)
+#define KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)5)
+#define KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)6)
+#define KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)7)
+#define KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)8)
+
+/* KMS exported Object handles for tKMS test application */
+#define KMS_KEY_RSA2048_OBJECT_HANDLE                 ((CK_OBJECT_HANDLE)21)
+#define KMS_KEY_AES128_OBJECT_HANDLE                  ((CK_OBJECT_HANDLE)13)
+#define KMS_KEY_AES256_OBJECT_HANDLE                  ((CK_OBJECT_HANDLE)14)
+#define KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE        ((CK_OBJECT_HANDLE)22)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_INTERFACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
new file mode 100644
index 00000000..5ea26e4f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
@@ -0,0 +1,1976 @@
+/**
+ * \file config.h
+ *
+ * \brief Configuration options (set of defines)
+ *
+ *  This set of compile-time options may be used to enable
+ *  or disable features selectively, and reduce the global
+ *  memory footprint.
+ */
+/*
+ *  Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  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.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+/**
+ * \name SECTION: System support
+ *
+ * This section sets system specific settings.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_HAVE_ASM
+ *
+ * The compiler has support for asm().
+ *
+ * Requires support for asm() in compiler.
+ *
+ * Used in:
+ *      library/aria.c
+ *      library/timing.c
+ *      include/mbedtls/bn_mul.h
+ *
+ * Required by:
+ *      MBEDTLS_AESNI_C
+ *      MBEDTLS_PADLOCK_C
+ *
+ * Comment to disable the use of assembly code.
+ */
+//#define MBEDTLS_HAVE_ASM
+
+/**
+ * \def MBEDTLS_NO_UDBL_DIVISION
+ *
+ * The platform lacks support for double-width integer division (64-bit
+ * division on a 32-bit platform, 128-bit division on a 64-bit platform).
+ *
+ * Used in:
+ *      include/mbedtls/bignum.h
+ *      library/bignum.c
+ *
+ * The bignum code uses double-width division to speed up some operations.
+ * Double-width division is often implemented in software that needs to
+ * be linked with the program. The presence of a double-width integer
+ * type is usually detected automatically through preprocessor macros,
+ * but the automatic detection cannot know whether the code needs to
+ * and can be linked with an implementation of division for that type.
+ * By default division is assumed to be usable if the type is present.
+ * Uncomment this option to prevent the use of double-width division.
+ *
+ * Note that division for the native integer type is always required.
+ * Furthermore, a 64-bit type is always required even on a 32-bit
+ * platform, but it need not support multiplication or division. In some
+ * cases it is also desirable to disable some double-width operations. For
+ * example, if double-width division is implemented in software, disabling
+ * it can reduce code size in some embedded targets.
+ */
+//#define MBEDTLS_NO_UDBL_DIVISION
+
+/**
+ * \def MBEDTLS_NO_64BIT_MULTIPLICATION
+ *
+ * The platform lacks support for 32x32 -> 64-bit multiplication.
+ *
+ * Used in:
+ *      library/poly1305.c
+ *
+ * Some parts of the library may use multiplication of two unsigned 32-bit
+ * operands with a 64-bit result in order to speed up computations. On some
+ * platforms, this is not available in hardware and has to be implemented in
+ * software, usually in a library provided by the toolchain.
+ *
+ * Sometimes it is not desirable to have to link to that library. This option
+ * removes the dependency of that library on platforms that lack a hardware
+ * 64-bit multiplier by embedding a software implementation in Mbed TLS.
+ *
+ * Note that depending on the compiler, this may decrease performance compared
+ * to using the library function provided by the toolchain.
+ */
+//#define MBEDTLS_NO_64BIT_MULTIPLICATION
+
+/**
+ * \def MBEDTLS_HAVE_SSE2
+ *
+ * CPU supports SSE2 instruction set.
+ *
+ * Uncomment if the CPU supports SSE2 (IA-32 specific).
+ */
+//#define MBEDTLS_HAVE_SSE2
+
+/**
+ * \def MBEDTLS_HAVE_TIME
+ *
+ * System has time.h and time().
+ * The time does not need to be correct, only time differences are used,
+ * by contrast with MBEDTLS_HAVE_TIME_DATE
+ *
+ * Defining MBEDTLS_HAVE_TIME allows you to specify MBEDTLS_PLATFORM_TIME_ALT,
+ * MBEDTLS_PLATFORM_TIME_MACRO, MBEDTLS_PLATFORM_TIME_TYPE_MACRO and
+ * MBEDTLS_PLATFORM_STD_TIME.
+ *
+ * Comment if your system does not support time functions
+ */
+//#define MBEDTLS_HAVE_TIME
+
+/**
+ * \def MBEDTLS_HAVE_TIME_DATE
+ *
+ * System has time.h, time(), and an implementation for
+ * mbedtls_platform_gmtime_r() (see below).
+ * The time needs to be correct (not necessarily very accurate, but at least
+ * the date should be correct). This is used to verify the validity period of
+ * X.509 certificates.
+ *
+ * Comment if your system does not have a correct clock.
+ *
+ * \note mbedtls_platform_gmtime_r() is an abstraction in platform_util.h that
+ * behaves similarly to the gmtime_r() function from the C standard. Refer to
+ * the documentation for mbedtls_platform_gmtime_r() for more information.
+ *
+ * \note It is possible to configure an implementation for
+ * mbedtls_platform_gmtime_r() at compile-time by using the macro
+ * MBEDTLS_PLATFORM_GMTIME_R_ALT.
+ */
+//#define MBEDTLS_HAVE_TIME_DATE
+
+/**
+ * \def MBEDTLS_PLATFORM_MEMORY
+ *
+ * Enable the memory allocation layer.
+ *
+ * By default mbed TLS uses the system-provided calloc() and free().
+ * This allows different allocators (self-implemented or provided) to be
+ * provided to the platform abstraction layer.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY without the
+ * MBEDTLS_PLATFORM_{FREE,CALLOC}_MACROs will provide
+ * "mbedtls_platform_set_calloc_free()" allowing you to set an alternative calloc() and
+ * free() function pointer at runtime.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY and specifying
+ * MBEDTLS_PLATFORM_{CALLOC,FREE}_MACROs will allow you to specify the
+ * alternate function at compile time.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Enable this layer to allow use of alternative memory allocators.
+ */
+//#define MBEDTLS_PLATFORM_MEMORY
+
+/**
+ * \def MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+ *
+ * Do not assign standard functions in the platform layer (e.g. calloc() to
+ * MBEDTLS_PLATFORM_STD_CALLOC and printf() to MBEDTLS_PLATFORM_STD_PRINTF)
+ *
+ * This makes sure there are no linking errors on platforms that do not support
+ * these functions. You will HAVE to provide alternatives, either at runtime
+ * via the platform_set_xxx() functions or at compile time by setting
+ * the MBEDTLS_PLATFORM_STD_XXX defines, or enabling a
+ * MBEDTLS_PLATFORM_XXX_MACRO.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Uncomment to prevent default assignment of standard functions in the
+ * platform layer.
+ */
+//#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+/**
+ * \def MBEDTLS_PLATFORM_EXIT_ALT
+ *
+ * MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let mbed TLS support the
+ * function in the platform abstraction layer.
+ *
+ * Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, mbed TLS will
+ * provide a function "mbedtls_platform_set_printf()" that allows you to set an
+ * alternative printf function pointer.
+ *
+ * All these define require MBEDTLS_PLATFORM_C to be defined!
+ *
+ * \note MBEDTLS_PLATFORM_SNPRINTF_ALT is required on Windows;
+ * it will be enabled automatically by check_config.h
+ *
+ * \warning MBEDTLS_PLATFORM_XXX_ALT cannot be defined at the same time as
+ * MBEDTLS_PLATFORM_XXX_MACRO!
+ *
+ * Requires: MBEDTLS_PLATFORM_TIME_ALT requires MBEDTLS_HAVE_TIME
+ *
+ * Uncomment a macro to enable alternate implementation of specific base
+ * platform function
+ */
+//#define MBEDTLS_PLATFORM_EXIT_ALT
+//#define MBEDTLS_PLATFORM_TIME_ALT
+//#define MBEDTLS_PLATFORM_FPRINTF_ALT
+//#define MBEDTLS_PLATFORM_PRINTF_ALT
+//#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_VSNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_NV_SEED_ALT
+//#define MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
+
+/**
+ * \def MBEDTLS_DEPRECATED_WARNING
+ *
+ * Mark deprecated functions so that they generate a warning if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * This only works with GCC and Clang. With other compilers, you may want to
+ * use MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Uncomment to get warnings on using deprecated functions.
+ */
+//#define MBEDTLS_DEPRECATED_WARNING
+
+/**
+ * \def MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Remove deprecated functions so that they generate an error if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * Uncomment to get errors on using deprecated functions.
+ */
+#define MBEDTLS_DEPRECATED_REMOVED
+
+/**
+ * \def MBEDTLS_CHECK_PARAMS
+ *
+ * This configuration option controls whether the library validates more of
+ * the parameters passed to it.
+ *
+ * When this flag is not defined, the library only attempts to validate an
+ * input parameter if: (1) they may come from the outside world (such as the
+ * network, the filesystem, etc.) or (2) not validating them could result in
+ * internal memory errors such as overflowing a buffer controlled by the
+ * library. On the other hand, it doesn't attempt to validate parameters whose
+ * values are fully controlled by the application (such as pointers).
+ *
+ * When this flag is defined, the library additionally attempts to validate
+ * parameters that are fully controlled by the application, and should always
+ * be valid if the application code is fully correct and trusted.
+ *
+ * For example, when a function accepts as input a pointer to a buffer that may
+ * contain untrusted data, and its documentation mentions that this pointer
+ * must not be NULL:
+ * - the pointer is checked to be non-NULL only if this option is enabled
+ * - the content of the buffer is always validated
+ *
+ * When this flag is defined, if a library function receives a parameter that
+ * is invalid, it will:
+ * - invoke the macro MBEDTLS_PARAM_FAILED() which by default expands to a
+ *   call to the function mbedtls_param_failed()
+ * - immediately return (with a specific error code unless the function
+ *   returns void and can't communicate an error).
+ *
+ * When defining this flag, you also need to:
+ * - either provide a definition of the function mbedtls_param_failed() in
+ *   your application (see platform_util.h for its prototype) as the library
+ *   calls that function, but does not provide a default definition for it,
+ * - or provide a different definition of the macro MBEDTLS_PARAM_FAILED()
+ *   below if the above mechanism is not flexible enough to suit your needs.
+ *   See the documentation of this macro later in this file.
+ *
+ * Uncomment to enable validation of application-controlled parameters.
+ */
+//#define MBEDTLS_CHECK_PARAMS
+
+/* \} name SECTION: System support */
+
+/**
+ * \name SECTION: mbed TLS feature support
+ *
+ * This section sets support for features that are or are not needed
+ * within the modules that are enabled.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_TIMING_ALT
+ *
+ * Uncomment to provide your own alternate implementation for mbedtls_timing_hardclock(),
+ * mbedtls_timing_get_timer(), mbedtls_set_alarm(), mbedtls_set/get_delay()
+ *
+ * Only works if you have MBEDTLS_TIMING_C enabled.
+ *
+ * You will need to provide a header "timing_alt.h" and an implementation at
+ * compile time.
+ */
+//#define MBEDTLS_TIMING_ALT
+
+/**
+ * \def MBEDTLS_AES_ALT
+ *
+ * MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternate core implementation of a symmetric crypto, an arithmetic or hash
+ * module (e.g. platform specific assembly optimized implementations). Keep
+ * in mind that the function prototypes should remain the same.
+ *
+ * This replaces the whole module. If you only want to replace one of the
+ * functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_AES_ALT, mbed TLS will no longer
+ * provide the "struct mbedtls_aes_context" definition and omit the base
+ * function declarations and implementations. "aes_alt.h" will be included from
+ * "aes.h" to include the new function definitions.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * module.
+ *
+ * \warning   MD2, MD4, MD5, ARC4, DES and SHA-1 are considered weak and their
+ *            use constitutes a security risk. If possible, we recommend
+ *            avoiding dependencies on them, and considering stronger message
+ *            digests and ciphers instead.
+ *
+ */
+//#define MBEDTLS_AES_ALT
+//#define MBEDTLS_ARC4_ALT
+//#define MBEDTLS_ARIA_ALT
+//#define MBEDTLS_BLOWFISH_ALT
+//#define MBEDTLS_CAMELLIA_ALT
+//#define MBEDTLS_CCM_ALT
+//#define MBEDTLS_CHACHA20_ALT
+//#define MBEDTLS_CHACHAPOLY_ALT
+//#define MBEDTLS_CMAC_ALT
+//#define MBEDTLS_DES_ALT
+//#define MBEDTLS_DHM_ALT
+//#define MBEDTLS_ECJPAKE_ALT
+//#define MBEDTLS_GCM_ALT
+//#define MBEDTLS_NIST_KW_ALT
+//#define MBEDTLS_MD2_ALT
+//#define MBEDTLS_MD4_ALT
+//#define MBEDTLS_MD5_ALT
+//#define MBEDTLS_POLY1305_ALT
+//#define MBEDTLS_RIPEMD160_ALT
+//#define MBEDTLS_RSA_ALT
+//#define MBEDTLS_SHA1_ALT
+//#define MBEDTLS_SHA256_ALT
+//#define MBEDTLS_SHA512_ALT
+//#define MBEDTLS_XTEA_ALT
+
+/*
+ * When replacing the elliptic curve module, pleace consider, that it is
+ * implemented with two .c files:
+ *      - ecp.c
+ *      - ecp_curves.c
+ * You can replace them very much like all the other MBEDTLS__MODULE_NAME__ALT
+ * macros as described above. The only difference is that you have to make sure
+ * that you provide functionality for both .c files.
+ */
+//#define MBEDTLS_ECP_ALT
+
+/**
+ * \def MBEDTLS_MD2_PROCESS_ALT
+ *
+ * MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use you
+ * alternate core implementation of symmetric crypto or hash function. Keep in
+ * mind that function prototypes should remain the same.
+ *
+ * This replaces only one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, mbed TLS will
+ * no longer provide the mbedtls_sha1_process() function, but it will still provide
+ * the other function (using your mbedtls_sha1_process() function) and the definition
+ * of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible
+ * with this definition.
+ *
+ * \note Because of a signature change, the core AES encryption and decryption routines are
+ *       currently named mbedtls_aes_internal_encrypt and mbedtls_aes_internal_decrypt,
+ *       respectively. When setting up alternative implementations, these functions should
+ *       be overridden, but the wrapper functions mbedtls_aes_decrypt and mbedtls_aes_encrypt
+ *       must stay untouched.
+ *
+ * \note If you use the AES_xxx_ALT macros, then is is recommended to also set
+ *       MBEDTLS_AES_ROM_TABLES in order to help the linker garbage-collect the AES
+ *       tables.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ *
+ * \warning   MD2, MD4, MD5, DES and SHA-1 are considered weak and their use
+ *            constitutes a security risk. If possible, we recommend avoiding
+ *            dependencies on them, and considering stronger message digests
+ *            and ciphers instead.
+ *
+ */
+//#define MBEDTLS_MD2_PROCESS_ALT
+//#define MBEDTLS_MD4_PROCESS_ALT
+//#define MBEDTLS_MD5_PROCESS_ALT
+//#define MBEDTLS_RIPEMD160_PROCESS_ALT
+//#define MBEDTLS_SHA1_PROCESS_ALT
+//#define MBEDTLS_SHA256_PROCESS_ALT
+//#define MBEDTLS_SHA512_PROCESS_ALT
+//#define MBEDTLS_DES_SETKEY_ALT
+//#define MBEDTLS_DES_CRYPT_ECB_ALT
+//#define MBEDTLS_DES3_CRYPT_ECB_ALT
+//#define MBEDTLS_AES_SETKEY_ENC_ALT
+//#define MBEDTLS_AES_SETKEY_DEC_ALT
+//#define MBEDTLS_AES_ENCRYPT_ALT
+//#define MBEDTLS_AES_DECRYPT_ALT
+//#define MBEDTLS_ECDH_GEN_PUBLIC_ALT
+//#define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
+//#define MBEDTLS_ECDSA_VERIFY_ALT
+//#define MBEDTLS_ECDSA_SIGN_ALT
+//#define MBEDTLS_ECDSA_GENKEY_ALT
+
+/**
+ * \def MBEDTLS_ECP_INTERNAL_ALT
+ *
+ * Expose a part of the internal interface of the Elliptic Curve Point module.
+ *
+ * MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternative core implementation of elliptic curve arithmetic. Keep in mind
+ * that function prototypes should remain the same.
+ *
+ * This partially replaces one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation
+ * is still present and it is used for group structures not supported by the
+ * alternative.
+ *
+ * Any of these options become available by defining MBEDTLS_ECP_INTERNAL_ALT
+ * and implementing the following functions:
+ *      unsigned char mbedtls_internal_ecp_grp_capable(
+ *          const mbedtls_ecp_group *grp )
+ *      int  mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp )
+ *      void mbedtls_internal_ecp_free( const mbedtls_ecp_group *grp )
+ * The mbedtls_internal_ecp_grp_capable function should return 1 if the
+ * replacement functions implement arithmetic for the given group and 0
+ * otherwise.
+ * The functions mbedtls_internal_ecp_init and mbedtls_internal_ecp_free are
+ * called before and after each point operation and provide an opportunity to
+ * implement optimized set up and tear down instructions.
+ *
+ * Example: In case you uncomment MBEDTLS_ECP_INTERNAL_ALT and
+ * MBEDTLS_ECP_DOUBLE_JAC_ALT, mbed TLS will still provide the ecp_double_jac
+ * function, but will use your mbedtls_internal_ecp_double_jac if the group is
+ * supported (your mbedtls_internal_ecp_grp_capable function returns 1 when
+ * receives it as an argument). If the group is not supported then the original
+ * implementation is used. The other functions and the definition of
+ * mbedtls_ecp_group and mbedtls_ecp_point will not change, so your
+ * implementation of mbedtls_internal_ecp_double_jac and
+ * mbedtls_internal_ecp_grp_capable must be compatible with this definition.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ */
+/* Required for all the functions in this section */
+//#define MBEDTLS_ECP_INTERNAL_ALT
+/* Support for Weierstrass curves with Jacobi representation */
+//#define MBEDTLS_ECP_RANDOMIZE_JAC_ALT
+//#define MBEDTLS_ECP_ADD_MIXED_ALT
+//#define MBEDTLS_ECP_DOUBLE_JAC_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_ALT
+/* Support for curves with Montgomery arithmetic */
+//#define MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT
+//#define MBEDTLS_ECP_RANDOMIZE_MXZ_ALT
+//#define MBEDTLS_ECP_NORMALIZE_MXZ_ALT
+
+/**
+ * \def MBEDTLS_TEST_NULL_ENTROPY
+ *
+ * Enables testing and use of mbed TLS without any configured entropy sources.
+ * This permits use of the library on platforms before an entropy source has
+ * been integrated (see for example the MBEDTLS_ENTROPY_HARDWARE_ALT or the
+ * MBEDTLS_ENTROPY_NV_SEED switches).
+ *
+ * WARNING! This switch MUST be disabled in production builds, and is suitable
+ * only for development.
+ * Enabling the switch negates any security provided by the library.
+ *
+ * Requires MBEDTLS_ENTROPY_C, MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ */
+//#define MBEDTLS_TEST_NULL_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_HARDWARE_ALT
+ *
+ * Uncomment this macro to let mbed TLS use your own implementation of a
+ * hardware entropy collector.
+ *
+ * Your function must be called \c mbedtls_hardware_poll(), have the same
+ * prototype as declared in entropy_poll.h, and accept NULL as first argument.
+ *
+ * Uncomment to use your own hardware entropy collector.
+ */
+//#define MBEDTLS_ENTROPY_HARDWARE_ALT
+
+/**
+ * \def MBEDTLS_AES_ROM_TABLES
+ *
+ * Use precomputed AES tables stored in ROM.
+ *
+ * Uncomment this macro to use precomputed AES tables stored in ROM.
+ * Comment this macro to generate AES tables in RAM at runtime.
+ *
+ * Tradeoff: Using precomputed ROM tables reduces RAM usage by ~8kb
+ * (or ~2kb if \c MBEDTLS_AES_FEWER_TABLES is used) and reduces the
+ * initialization time before the first AES operation can be performed.
+ * It comes at the cost of additional ~8kb ROM use (resp. ~2kb if \c
+ * MBEDTLS_AES_FEWER_TABLES below is used), and potentially degraded
+ * performance if ROM access is slower than RAM access.
+ *
+ * This option is independent of \c MBEDTLS_AES_FEWER_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_ROM_TABLES
+
+/**
+ * \def MBEDTLS_AES_FEWER_TABLES
+ *
+ * Use less ROM/RAM for AES tables.
+ *
+ * Uncommenting this macro omits 75% of the AES tables from
+ * ROM / RAM (depending on the value of \c MBEDTLS_AES_ROM_TABLES)
+ * by computing their values on the fly during operations
+ * (the tables are entry-wise rotations of one another).
+ *
+ * Tradeoff: Uncommenting this reduces the RAM / ROM footprint
+ * by ~6kb but at the cost of more arithmetic operations during
+ * runtime. Specifically, one has to compare 4 accesses within
+ * different tables to 4 accesses with additional arithmetic
+ * operations within the same table. The performance gain/loss
+ * depends on the system and memory details.
+ *
+ * This option is independent of \c MBEDTLS_AES_ROM_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_FEWER_TABLES
+
+/**
+ * \def MBEDTLS_CAMELLIA_SMALL_MEMORY
+ *
+ * Use less ROM for the Camellia implementation (saves about 768 bytes).
+ *
+ * Uncomment this macro to use less memory for Camellia.
+ */
+//#define MBEDTLS_CAMELLIA_SMALL_MEMORY
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CBC
+ *
+ * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CBC
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CFB
+ *
+ * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CTR
+ *
+ * Enable Counter Block Cipher mode (CTR) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CTR
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_OFB
+ *
+ * Enable Output Feedback mode (OFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_OFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_XTS
+ *
+ * Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
+ */
+//#define MBEDTLS_CIPHER_MODE_XTS
+
+/**
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+ *
+ * Enable NULL cipher.
+ * Warning: Only do so when you know what you are doing. This allows for
+ * encryption or channels without any security!
+ *
+ * This module is required to support the TLS ciphersuites that use the NULL
+ * cipher.
+ *
+ * Uncomment this macro to enable the NULL cipher
+ */
+//#define MBEDTLS_CIPHER_NULL_CIPHER
+
+/**
+ * \def MBEDTLS_CIPHER_PADDING_PKCS7
+ *
+ * MBEDTLS_CIPHER_PADDING_XXX: Uncomment or comment macros to add support for
+ * specific padding modes in the cipher layer with cipher modes that support
+ * padding (e.g. CBC)
+ *
+ * If you disable all padding modes, only full blocks can be used with CBC.
+ *
+ * Enable padding modes in the cipher layer.
+ */
+//#define MBEDTLS_CIPHER_PADDING_PKCS7
+//#define MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS
+//#define MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN
+//#define MBEDTLS_CIPHER_PADDING_ZEROS
+
+/**
+ * \def MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ *
+ * MBEDTLS_ECP_XXXX_ENABLED: Enables specific curves within the Elliptic Curve
+ * module.  By default all supported curves are enabled.
+ *
+ * Comment macros to disable the curve and functions for it
+ */
+//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE448_ENABLED
+
+/**
+ * \def MBEDTLS_ECP_NIST_OPTIM
+ *
+ * Enable specific 'modulo p' routines for each NIST prime.
+ * Depending on the prime and architecture, makes operations 4 to 8 times
+ * faster on the corresponding curve.
+ *
+ * Comment this macro to disable NIST curves optimisation.
+ */
+//#define MBEDTLS_ECP_NIST_OPTIM
+
+/**
+ * \def MBEDTLS_ECP_RESTARTABLE
+ *
+ * Enable "non-blocking" ECC operations that can return early and be resumed.
+ *
+ * This allows various functions to pause by returning
+ * #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in Mbed TLS's SSL module,
+ * MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in order
+ * to further progress and eventually complete their operation. This is
+ * controlled through mbedtls_ecp_set_max_ops() which limits the maximum number
+ * of ECC operations a function may perform before pausing; see
+ * mbedtls_ecp_set_max_ops() for more information.
+ *
+ * This is useful in non-threaded environments if you want to avoid blocking
+ * for too long on ECC (and, hence, X.509 or SSL/TLS) operations.
+ *
+ * Uncomment this macro to enable restartable ECC computations.
+ *
+ * \note  This option only works with the default software implementation of
+ *        elliptic curve functionality. It is incompatible with
+ *        MBEDTLS_ECP_ALT, MBEDTLS_ECDH_XXX_ALT and MBEDTLS_ECDSA_XXX_ALT.
+ */
+//#define MBEDTLS_ECP_RESTARTABLE
+
+/**
+ * \def MBEDTLS_ECDSA_DETERMINISTIC
+ *
+ * Enable deterministic ECDSA (RFC 6979).
+ * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
+ * may result in a compromise of the long-term signing key. This is avoided by
+ * the deterministic variant.
+ *
+ * Requires: MBEDTLS_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+ */
+//#define MBEDTLS_ECDSA_DETERMINISTIC
+
+/**
+ * \def MBEDTLS_PK_PARSE_EC_EXTENDED
+ *
+ * Enhance support for reading EC keys using variants of SEC1 not allowed by
+ * RFC 5915 and RFC 5480.
+ *
+ * Currently this means parsing the SpecifiedECDomain choice of EC
+ * parameters (only known groups are supported, not arbitrary domains, to
+ * avoid validation issues).
+ *
+ * Disable if you only need to support RFC 5915 + 5480 key formats.
+ */
+//#define MBEDTLS_PK_PARSE_EC_EXTENDED
+
+/**
+ * \def MBEDTLS_ERROR_STRERROR_DUMMY
+ *
+ * Enable a dummy error function to make use of mbedtls_strerror() in
+ * third party libraries easier when MBEDTLS_ERROR_C is disabled
+ * (no effect when MBEDTLS_ERROR_C is enabled).
+ *
+ * You can safely disable this if MBEDTLS_ERROR_C is enabled, or if you're
+ * not using mbedtls_strerror() or error_strerror() in your application.
+ *
+ * Disable if you run into name conflicts and want to really remove the
+ * mbedtls_strerror()
+ */
+//#define MBEDTLS_ERROR_STRERROR_DUMMY
+
+/**
+ * \def MBEDTLS_GENPRIME
+ *
+ * Enable the prime-number generation code.
+ *
+ * Requires: MBEDTLS_BIGNUM_C
+ */
+//#define MBEDTLS_GENPRIME
+
+/**
+ * \def MBEDTLS_FS_IO
+ *
+ * Enable functions that use the filesystem.
+ */
+//#define MBEDTLS_FS_IO
+
+/**
+ * \def MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ * Do not add default entropy sources. These are the platform specific,
+ * mbedtls_timing_hardclock and HAVEGE based poll functions.
+ *
+ * This is useful to have more control over the added entropy sources in an
+ * application.
+ *
+ * Uncomment this macro to prevent loading of default entropy functions.
+ */
+//#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+
+/**
+ * \def MBEDTLS_NO_PLATFORM_ENTROPY
+ *
+ * Do not use built-in platform entropy functions.
+ * This is useful if your platform does not support
+ * standards like the /dev/urandom or Windows CryptoAPI.
+ *
+ * Uncomment this macro to disable the built-in platform entropy functions.
+ */
+//#define MBEDTLS_NO_PLATFORM_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_FORCE_SHA256
+ *
+ * Force the entropy accumulator to use a SHA-256 accumulator instead of the
+ * default SHA-512 based one (if both are available).
+ *
+ * Requires: MBEDTLS_SHA256_C
+ *
+ * On 32-bit systems SHA-256 can be much faster than SHA-512. Use this option
+ * if you have performance concerns.
+ *
+ * This option is only useful if both MBEDTLS_SHA256_C and
+ * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
+ */
+//#define MBEDTLS_ENTROPY_FORCE_SHA256
+
+/**
+ * \def MBEDTLS_ENTROPY_NV_SEED
+ *
+ * Enable the non-volatile (NV) seed file-based entropy source.
+ * (Also enables the NV seed read/write functions in the platform layer)
+ *
+ * This is crucial (if not required) on systems that do not have a
+ * cryptographic entropy source (in hardware or kernel) available.
+ *
+ * Requires: MBEDTLS_ENTROPY_C, MBEDTLS_PLATFORM_C
+ *
+ * \note The read/write functions that are used by the entropy source are
+ *       determined in the platform layer, and can be modified at runtime and/or
+ *       compile-time depending on the flags (MBEDTLS_PLATFORM_NV_SEED_*) used.
+ *
+ * \note If you use the default implementation functions that read a seedfile
+ *       with regular fopen(), please make sure you make a seedfile with the
+ *       proper name (defined in MBEDTLS_PLATFORM_STD_NV_SEED_FILE) and at
+ *       least MBEDTLS_ENTROPY_BLOCK_SIZE bytes in size that can be read from
+ *       and written to or you will get an entropy source error! The default
+ *       implementation will only use the first MBEDTLS_ENTROPY_BLOCK_SIZE
+ *       bytes from the file.
+ *
+ * \note The entropy collector will write to the seed file before entropy is
+ *       given to an external source, to update it.
+ */
+//#define MBEDTLS_ENTROPY_NV_SEED
+
+/* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+ *
+ * In PSA key storage, encode the owner of the key.
+ *
+ * This is only meaningful when building the library as part of a
+ * multi-client service. When you activate this option, you must provide
+ * an implementation of the type psa_key_owner_id_t and a translation
+ * from psa_key_file_id_t to file name in all the storage backends that
+ * you wish to support.
+ *
+ * Note that this option is meant for internal use only and may be removed
+ * without notice.
+ */
+//#define MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+
+/**
+ * \def MBEDTLS_MEMORY_DEBUG
+ *
+ * Enable debugging of buffer allocator memory issues. Automatically prints
+ * (to stderr) all (fatal) messages on memory allocation issues. Enables
+ * function for 'debug output' of allocated memory.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Uncomment this macro to let the buffer allocator print out error messages.
+ */
+//#define MBEDTLS_MEMORY_DEBUG
+
+/**
+ * \def MBEDTLS_MEMORY_BACKTRACE
+ *
+ * Include backtrace information with each allocated block.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *           GLIBC-compatible backtrace() an backtrace_symbols() support
+ *
+ * Uncomment this macro to include backtrace information
+ */
+//#define MBEDTLS_MEMORY_BACKTRACE
+
+/**
+ * \def MBEDTLS_PK_RSA_ALT_SUPPORT
+ *
+ * Support external private RSA keys (eg from a HSM) in the PK layer.
+ *
+ * Comment this macro to disable support for external private RSA keys.
+ */
+//#define MBEDTLS_PK_RSA_ALT_SUPPORT
+
+/**
+ * \def MBEDTLS_PKCS1_V15
+ *
+ * Enable support for PKCS#1 v1.5 encoding.
+ *
+ * Requires: MBEDTLS_RSA_C
+ *
+ * This enables support for PKCS#1 v1.5 operations.
+ */
+//#define MBEDTLS_PKCS1_V15
+
+/**
+ * \def MBEDTLS_PKCS1_V21
+ *
+ * Enable support for PKCS#1 v2.1 encoding.
+ *
+ * Requires: MBEDTLS_MD_C, MBEDTLS_RSA_C
+ *
+ * This enables support for RSAES-OAEP and RSASSA-PSS operations.
+ */
+//#define MBEDTLS_PKCS1_V21
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_SPM
+ *
+ * When MBEDTLS_PSA_CRYPTO_SPM is defined, the code is built for SPM (Secure
+ * Partition Manager) integration which separates the code into two parts: a
+ * NSPE (Non-Secure Process Environment) and an SPE (Secure Process
+ * Environment).
+ *
+ * Module:  library/psa_crypto.c
+ * Requires: MBEDTLS_PSA_CRYPTO_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_SPM
+
+/**
+ * \def MBEDTLS_PSA_INJECT_ENTROPY
+ *
+ * Enable support for entropy injection at first boot. This feature is
+ * required on systems that do not have a built-in entropy source (TRNG).
+ * This feature is currently not supported on systems that have a built-in
+ * entropy source.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_STORAGE_C, MBEDTLS_ENTROPY_NV_SEED
+ *
+ */
+//#define MBEDTLS_PSA_INJECT_ENTROPY
+
+/**
+ * \def MBEDTLS_RSA_NO_CRT
+ *
+ * Do not use the Chinese Remainder Theorem
+ * for the RSA private operation.
+ *
+ * Uncomment this macro to disable the use of CRT in RSA.
+ *
+ */
+//#define MBEDTLS_RSA_NO_CRT
+
+/**
+ * \def MBEDTLS_SELF_TEST
+ *
+ * Enable the checkup functions (*_self_test).
+ */
+//#define MBEDTLS_SELF_TEST
+
+/**
+ * \def MBEDTLS_SHA256_SMALLER
+ *
+ * Enable an implementation of SHA-256 that has lower ROM footprint but also
+ * lower performance.
+ *
+ * The default implementation is meant to be a reasonable compromise between
+ * performance and size. This version optimizes more aggressively for size at
+ * the expense of performance. Eg on Cortex-M4 it reduces the size of
+ * mbedtls_sha256_process() from ~2KB to ~0.5KB for a performance hit of about
+ * 30%.
+ *
+ * Uncomment to enable the smaller implementation of SHA256.
+ */
+#define MBEDTLS_SHA256_SMALLER
+
+/**
+ * \def MBEDTLS_THREADING_ALT
+ *
+ * Provide your own alternate threading implementation.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to allow your own alternate threading implementation.
+ */
+//#define MBEDTLS_THREADING_ALT
+
+/**
+ * \def MBEDTLS_THREADING_PTHREAD
+ *
+ * Enable the pthread wrapper layer for the threading layer.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to enable pthread mutexes.
+ */
+//#define MBEDTLS_THREADING_PTHREAD
+
+/**
+ * \def MBEDTLS_USE_PSA_CRYPTO
+ *
+ * Make the X.509 and TLS library use PSA for cryptographic operations, see
+ * #MBEDTLS_PSA_CRYPTO_C.
+ *
+ * Note: this option is still in progress, the full X.509 and TLS modules are
+ * not covered yet, but parts that are not ported to PSA yet will still work
+ * as usual, so enabling this option should not break backwards compatibility.
+ *
+ * \warning  Support for PSA is still an experimental feature.
+ *           Any public API that depends on this option may change
+ *           at any time until this warning is removed.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C.
+ */
+//#define MBEDTLS_USE_PSA_CRYPTO
+
+/**
+ * \def MBEDTLS_VERSION_FEATURES
+ *
+ * Allow run-time checking of compile-time enabled features. Thus allowing users
+ * to check at run-time if the library is for instance compiled with threading
+ * support via mbedtls_version_check_feature().
+ *
+ * Requires: MBEDTLS_VERSION_C
+ *
+ * Comment this to disable run-time checking and save ROM space
+ */
+//#define MBEDTLS_VERSION_FEATURES
+
+/* \} name SECTION: mbed TLS feature support */
+
+/**
+ * \name SECTION: mbed TLS modules
+ *
+ * This section enables or disables entire modules in mbed TLS
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_AESNI_C
+ *
+ * Enable AES-NI support on x86-64.
+ *
+ * Module:  library/aesni.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the AES-NI instructions on x86-64
+ */
+//#define MBEDTLS_AESNI_C
+
+/**
+ * \def MBEDTLS_AES_C
+ *
+ * Enable the AES block cipher.
+ *
+ * Module:  library/aes.c
+ * Caller:  library/cipher.c
+ *          library/pem.c
+ *          library/ctr_drbg.c
+ *
+ * This module is required to support the TLS ciphersuites that use the AES
+ * cipher.
+ *
+ * PEM_PARSE uses AES for decrypting encrypted keys.
+ */
+//#define MBEDTLS_AES_C
+
+/**
+ * \def MBEDTLS_ARC4_C
+ *
+ * Enable the ARCFOUR stream cipher.
+ *
+ * Module:  library/arc4.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the ARC4
+ * cipher.
+ *
+ * \warning   ARC4 is considered a weak cipher and its use constitutes a
+ *            security risk. If possible, we recommend avoidng dependencies on
+ *            it, and considering stronger ciphers instead.
+ *
+ */
+//#define MBEDTLS_ARC4_C
+
+/**
+ * \def MBEDTLS_ASN1_PARSE_C
+ *
+ * Enable the generic ASN1 parser.
+ *
+ * Module:  library/asn1.c
+ * Caller:  library/dhm.c
+ *          library/pkcs12.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ */
+//#define MBEDTLS_ASN1_PARSE_C
+
+/**
+ * \def MBEDTLS_ASN1_WRITE_C
+ *
+ * Enable the generic ASN1 writer.
+ *
+ * Module:  library/asn1write.c
+ * Caller:  library/ecdsa.c
+ *          library/pkwrite.c
+ */
+//#define MBEDTLS_ASN1_WRITE_C
+
+/**
+ * \def MBEDTLS_BASE64_C
+ *
+ * Enable the Base64 module.
+ *
+ * Module:  library/base64.c
+ * Caller:  library/pem.c
+ *
+ * This module is required for PEM support (required by X.509).
+ */
+//#define MBEDTLS_BASE64_C
+
+/**
+ * \def MBEDTLS_BIGNUM_C
+ *
+ * Enable the multi-precision integer library.
+ *
+ * Module:  library/bignum.c
+ * Caller:  library/dhm.c
+ *          library/ecp.c
+ *          library/ecdsa.c
+ *          library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is required for RSA, DHM and ECC (ECDH, ECDSA) support.
+ */
+//#define MBEDTLS_BIGNUM_C
+
+/**
+ * \def MBEDTLS_BLOWFISH_C
+ *
+ * Enable the Blowfish block cipher.
+ *
+ * Module:  library/blowfish.c
+ */
+//#define MBEDTLS_BLOWFISH_C
+
+/**
+ * \def MBEDTLS_CAMELLIA_C
+ *
+ * Enable the Camellia block cipher.
+ *
+ * Module:  library/camellia.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * Camellia cipher.
+ */
+//#define MBEDTLS_CAMELLIA_C
+
+/**
+ * \def MBEDTLS_ARIA_C
+ *
+ * Enable the ARIA block cipher.
+ *
+ * Module:  library/aria.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * ARIA cipher.
+ */
+//#define MBEDTLS_ARIA_C
+
+/**
+ * \def MBEDTLS_CCM_C
+ *
+ * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
+ *
+ * Module:  library/ccm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support AES-CCM ciphersuites in TLS.
+ */
+//#define MBEDTLS_CCM_C
+
+/**
+ * \def MBEDTLS_CHACHA20_C
+ *
+ * Enable the ChaCha20 stream cipher.
+ *
+ * Module:  library/chacha20.c
+ */
+//#define MBEDTLS_CHACHA20_C
+
+/**
+ * \def MBEDTLS_CHACHAPOLY_C
+ *
+ * Enable the ChaCha20-Poly1305 AEAD algorithm.
+ *
+ * Module:  library/chachapoly.c
+ *
+ * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
+ */
+//#define MBEDTLS_CHACHAPOLY_C
+
+/**
+ * \def MBEDTLS_CIPHER_C
+ *
+ * Enable the generic cipher layer.
+ *
+ * Module:  library/cipher.c
+ *
+ * Uncomment to enable generic cipher wrappers.
+ */
+//#define MBEDTLS_CIPHER_C
+
+/**
+ * \def MBEDTLS_CMAC_C
+ *
+ * Enable the CMAC (Cipher-based Message Authentication Code) mode for block
+ * ciphers.
+ *
+ * Module:  library/cmac.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
+ *
+ */
+//#define MBEDTLS_CMAC_C
+
+/**
+ * \def MBEDTLS_CTR_DRBG_C
+ *
+ * Enable the CTR_DRBG AES-based random generator.
+ * The CTR_DRBG generator uses AES-256 by default.
+ * To use AES-128 instead, enable MBEDTLS_CTR_DRBG_USE_128_BIT_KEY below.
+ *
+ * Module:  library/ctr_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_AES_C
+ *
+ * This module provides the CTR_DRBG AES random number generator.
+ */
+//#define MBEDTLS_CTR_DRBG_C
+
+/**
+ * \def MBEDTLS_DES_C
+ *
+ * Enable the DES block cipher.
+ *
+ * Module:  library/des.c
+ * Caller:  library/pem.c
+ *          library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the DES
+ * cipher.
+ *
+ * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
+ *
+ * \warning   DES is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ */
+//#define MBEDTLS_DES_C
+
+/**
+ * \def MBEDTLS_DHM_C
+ *
+ * Enable the Diffie-Hellman-Merkle module.
+ *
+ * Module:  library/dhm.c
+ *
+ * This module is used by the following key exchanges:
+ *      DHE-RSA, DHE-PSK
+ *
+ * \warning    Using DHE constitutes a security risk as it
+ *             is not possible to validate custom DH parameters.
+ *             If possible, it is recommended users should consider
+ *             preferring other methods of key exchange.
+ *             See dhm.h for more details.
+ *
+ */
+//#define MBEDTLS_DHM_C
+
+/**
+ * \def MBEDTLS_ECDH_C
+ *
+ * Enable the elliptic curve Diffie-Hellman library.
+ *
+ * Module:  library/ecdh.c
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
+ *
+ * Requires: MBEDTLS_ECP_C
+ */
+//#define MBEDTLS_ECDH_C
+
+/**
+ * \def MBEDTLS_ECDSA_C
+ *
+ * Enable the elliptic curve DSA library.
+ *
+ * Module:  library/ecdsa.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_ASN1_WRITE_C, MBEDTLS_ASN1_PARSE_C
+ */
+//#define MBEDTLS_ECDSA_C
+
+/**
+ * \def MBEDTLS_ECJPAKE_C
+ *
+ * Enable the elliptic curve J-PAKE library.
+ *
+ * \warning This is currently experimental. EC J-PAKE support is based on the
+ * Thread v1.0.0 specification; incompatible changes to the specification
+ * might still happen. For this reason, this is disabled by default.
+ *
+ * Module:  library/ecjpake.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECJPAKE
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_MD_C
+ */
+//#define MBEDTLS_ECJPAKE_C
+
+/**
+ * \def MBEDTLS_ECP_C
+ *
+ * Enable the elliptic curve over GF(p) library.
+ *
+ * Module:  library/ecp.c
+ * Caller:  library/ecdh.c
+ *          library/ecdsa.c
+ *          library/ecjpake.c
+ *
+ * Requires: MBEDTLS_BIGNUM_C and at least one MBEDTLS_ECP_DP_XXX_ENABLED
+ */
+//#define MBEDTLS_ECP_C
+
+/**
+ * \def MBEDTLS_ENTROPY_C
+ *
+ * Enable the platform-specific entropy code.
+ *
+ * Module:  library/entropy.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SHA512_C or MBEDTLS_SHA256_C
+ *
+ * This module provides a generic entropy pool
+ */
+//#define MBEDTLS_ENTROPY_C
+
+/**
+ * \def MBEDTLS_ERROR_C
+ *
+ * Enable error code to error string conversion.
+ *
+ * Module:  library/error.c
+ * Caller:
+ *
+ * This module enables mbedtls_strerror().
+ */
+//#define MBEDTLS_ERROR_C
+
+/**
+ * \def MBEDTLS_GCM_C
+ *
+ * Enable the Galois/Counter Mode (GCM) for AES.
+ *
+ * Module:  library/gcm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support the TLS ciphersuites that use GCM.
+ */
+//#define MBEDTLS_GCM_C
+
+/**
+ * \def MBEDTLS_HAVEGE_C
+ *
+ * Enable the HAVEGE random generator.
+ *
+ * Warning: the HAVEGE random generator is not suitable for virtualized
+ *          environments
+ *
+ * Warning: the HAVEGE random generator is dependent on timing and specific
+ *          processor traits. It is therefore not advised to use HAVEGE as
+ *          your applications primary random generator or primary entropy pool
+ *          input. As a secondary input to your entropy pool, it IS able add
+ *          the (limited) extra entropy it provides.
+ *
+ * Module:  library/havege.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_TIMING_C
+ *
+ * Uncomment to enable the HAVEGE random generator.
+ */
+//#define MBEDTLS_HAVEGE_C
+
+/**
+ * \def MBEDTLS_HKDF_C
+ *
+ * Enable the HKDF algorithm (RFC 5869).
+ *
+ * Module:  library/hkdf.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the Hashed Message Authentication Code
+ * (HMAC)-based key derivation function (HKDF).
+ */
+//#define MBEDTLS_HKDF_C
+
+/**
+ * \def MBEDTLS_HMAC_DRBG_C
+ *
+ * Enable the HMAC_DRBG random generator.
+ *
+ * Module:  library/hmac_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+ */
+//#define MBEDTLS_HMAC_DRBG_C
+
+/**
+ * \def MBEDTLS_NIST_KW_C
+ *
+ * Enable the Key Wrapping mode for 128-bit block ciphers,
+ * as defined in NIST SP 800-38F. Only KW and KWP modes
+ * are supported. At the moment, only AES is approved by NIST.
+ *
+ * Module:  library/nist_kw.c
+ *
+ * Requires: MBEDTLS_AES_C and MBEDTLS_CIPHER_C
+ */
+//#define MBEDTLS_NIST_KW_C
+
+/**
+ * \def MBEDTLS_MD_C
+ *
+ * Enable the generic message digest layer.
+ *
+ * Module:  library/md.c
+ * Caller:
+ *
+ * Uncomment to enable generic message digest wrappers.
+ */
+//#define MBEDTLS_MD_C
+
+/**
+ * \def MBEDTLS_MD2_C
+ *
+ * Enable the MD2 hash algorithm.
+ *
+ * Module:  library/md2.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD2-signed X.509 certs.
+ *
+ * \warning   MD2 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD2_C
+
+/**
+ * \def MBEDTLS_MD4_C
+ *
+ * Enable the MD4 hash algorithm.
+ *
+ * Module:  library/md4.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD4-signed X.509 certs.
+ *
+ * \warning   MD4 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD4_C
+
+/**
+ * \def MBEDTLS_MD5_C
+ *
+ * Enable the MD5 hash algorithm.
+ *
+ * Module:  library/md5.c
+ * Caller:  library/md.c
+ *          library/pem.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, and for TLS 1.2
+ * depending on the handshake parameters. Further, it is used for checking
+ * MD5-signed certificates, and for PBKDF1 when decrypting PEM-encoded
+ * encrypted keys.
+ *
+ * \warning   MD5 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD5_C
+
+/**
+ * \def MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Enable the buffer allocator implementation that makes use of a (stack)
+ * based buffer to 'allocate' dynamic memory. (replaces calloc() and free()
+ * calls)
+ *
+ * Module:  library/memory_buffer_alloc.c
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *           MBEDTLS_PLATFORM_MEMORY (to use it within mbed TLS)
+ *
+ * Enable this module to enable the buffer memory allocator.
+ */
+//#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+
+/**
+ * \def MBEDTLS_OID_C
+ *
+ * Enable the OID database.
+ *
+ * Module:  library/oid.c
+ * Caller:  library/asn1write.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ *          library/pkwrite.c
+ *          library/rsa.c
+ *
+ * This modules translates between OIDs and internal values.
+ */
+//#define MBEDTLS_OID_C
+
+/**
+ * \def MBEDTLS_PADLOCK_C
+ *
+ * Enable VIA Padlock support on x86.
+ *
+ * Module:  library/padlock.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the VIA PadLock on x86.
+ */
+//#define MBEDTLS_PADLOCK_C
+
+/**
+ * \def MBEDTLS_PEM_PARSE_C
+ *
+ * Enable PEM decoding / parsing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/dhm.c
+ *          library/pkparse.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for decoding / parsing PEM files.
+ */
+//#define MBEDTLS_PEM_PARSE_C
+
+/**
+ * \def MBEDTLS_PEM_WRITE_C
+ *
+ * Enable PEM encoding / writing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for encoding / writing PEM files.
+ */
+//#define MBEDTLS_PEM_WRITE_C
+
+/**
+ * \def MBEDTLS_PK_C
+ *
+ * Enable the generic public (asymmetric) key layer.
+ *
+ * Module:  library/pk.c
+ *
+ * Requires: MBEDTLS_RSA_C or MBEDTLS_ECP_C
+ *
+ * Uncomment to enable generic public key wrappers.
+ */
+//#define MBEDTLS_PK_C
+
+/**
+ * \def MBEDTLS_PK_PARSE_C
+ *
+ * Enable the generic public (asymmetric) key parser.
+ *
+ * Module:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key parse functions.
+ */
+//#define MBEDTLS_PK_PARSE_C
+
+/**
+ * \def MBEDTLS_PK_WRITE_C
+ *
+ * Enable the generic public (asymmetric) key writer.
+ *
+ * Module:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key write functions.
+ */
+//#define MBEDTLS_PK_WRITE_C
+
+/**
+ * \def MBEDTLS_PKCS5_C
+ *
+ * Enable PKCS#5 functions.
+ *
+ * Module:  library/pkcs5.c
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the PKCS#5 functions.
+ */
+//#define MBEDTLS_PKCS5_C
+
+/**
+ * \def MBEDTLS_PKCS12_C
+ *
+ * Enable PKCS#12 PBE functions.
+ * Adds algorithms for parsing PKCS#8 encrypted private keys
+ *
+ * Module:  library/pkcs12.c
+ * Caller:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_CIPHER_C, MBEDTLS_MD_C
+ * Can use:  MBEDTLS_ARC4_C
+ *
+ * This module enables PKCS#12 functions.
+ */
+//#define MBEDTLS_PKCS12_C
+
+/**
+ * \def MBEDTLS_PLATFORM_C
+ *
+ * Enable the platform abstraction layer that allows you to re-assign
+ * functions like calloc(), free(), snprintf(), printf(), fprintf(), exit().
+ *
+ * Enabling MBEDTLS_PLATFORM_C enables to use of MBEDTLS_PLATFORM_XXX_ALT
+ * or MBEDTLS_PLATFORM_XXX_MACRO directives, allowing the functions mentioned
+ * above to be specified at runtime or compile time respectively.
+ *
+ * \note This abstraction layer must be enabled on Windows (including MSYS2)
+ * as other module rely on it for a fixed snprintf implementation.
+ *
+ * Module:  library/platform.c
+ * Caller:  Most other .c files
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+//#define MBEDTLS_PLATFORM_C
+
+/**
+ * \def MBEDTLS_POLY1305_C
+ *
+ * Enable the Poly1305 MAC algorithm.
+ *
+ * Module:  library/poly1305.c
+ * Caller:  library/chachapoly.c
+ */
+//#define MBEDTLS_POLY1305_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_C
+ *
+ * Enable the Platform Security Architecture cryptography API.
+ *
+ * Module:  library/psa_crypto.c
+ *
+ * Requires: MBEDTLS_CTR_DRBG_C, MBEDTLS_ENTROPY_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_STORAGE_C
+ *
+ * Enable the Platform Security Architecture persistent key storage.
+ *
+ * Module:  library/psa_crypto_storage.c
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C,
+ *           either MBEDTLS_PSA_ITS_FILE_C or a native implementation of
+ *           the PSA ITS interface
+ */
+//#define MBEDTLS_PSA_CRYPTO_STORAGE_C
+
+/**
+ * \def MBEDTLS_PSA_ITS_FILE_C
+ *
+ * Enable the emulation of the Platform Security Architecture
+ * Internal Trusted Storage (PSA ITS) over files.
+ *
+ * Module:  library/psa_its_file.c
+ *
+ * Requires: MBEDTLS_FS_IO
+ */
+//#define MBEDTLS_PSA_ITS_FILE_C
+
+/**
+ * \def MBEDTLS_RIPEMD160_C
+ *
+ * Enable the RIPEMD-160 hash algorithm.
+ *
+ * Module:  library/ripemd160.c
+ * Caller:  library/md.c
+ *
+ */
+//#define MBEDTLS_RIPEMD160_C
+
+/**
+ * \def MBEDTLS_RSA_C
+ *
+ * Enable the RSA public-key cryptosystem.
+ *
+ * Module:  library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is used by the following key exchanges:
+ *      RSA, DHE-RSA, ECDHE-RSA, RSA-PSK
+ *
+ * Requires: MBEDTLS_BIGNUM_C, MBEDTLS_OID_C
+ */
+/* #define MBEDTLS_RSA_C */
+
+/**
+ * \def MBEDTLS_SHA1_C
+ *
+ * Enable the SHA1 cryptographic hash algorithm.
+ *
+ * Module:  library/sha1.c
+ * Caller:  library/md.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, for TLS 1.2
+ * depending on the handshake parameters, and for SHA1-signed certificates.
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. If possible, we recommend avoiding dependencies
+ *            on it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_SHA1_C
+
+/**
+ * \def MBEDTLS_SHA256_C
+ *
+ * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
+ *
+ * Module:  library/sha256.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-224 and SHA-256.
+ * This module is required for the SSL/TLS 1.2 PRF function.
+ */
+#define MBEDTLS_SHA256_C
+
+/**
+ * \def MBEDTLS_SHA512_C
+ *
+ * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
+ *
+ * Module:  library/sha512.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-384 and SHA-512.
+ */
+//#define MBEDTLS_SHA512_C
+
+/**
+ * \def MBEDTLS_THREADING_C
+ *
+ * Enable the threading abstraction layer.
+ * By default mbed TLS assumes it is used in a non-threaded environment or that
+ * contexts are not shared between threads. If you do intend to use contexts
+ * between threads, you will need to enable this layer to prevent race
+ * conditions. See also our Knowledge Base article about threading:
+ * https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
+ *
+ * Module:  library/threading.c
+ *
+ * This allows different threading implementations (self-implemented or
+ * provided).
+ *
+ * You will have to enable either MBEDTLS_THREADING_ALT or
+ * MBEDTLS_THREADING_PTHREAD.
+ *
+ * Enable this layer to allow use of mutexes within mbed TLS
+ */
+//#define MBEDTLS_THREADING_C
+
+/**
+ * \def MBEDTLS_TIMING_C
+ *
+ * Enable the semi-portable timing interface.
+ *
+ * \note The provided implementation only works on POSIX/Unix (including Linux,
+ * BSD and OS X) and Windows. On other platforms, you can either disable that
+ * module and provide your own implementations of the callbacks needed by Mbed
+ * TLS's \c mbedtls_ssl_set_timer_cb() for DTLS, or leave it enabled and
+ * provide your own implementation of the whole module by setting
+ * \c MBEDTLS_TIMING_ALT in the current file.
+ *
+ * \note See also our Knowledge Base article about porting to a new
+ * environment:
+ * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS
+ *
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+//#define MBEDTLS_TIMING_C
+
+/**
+ * \def MBEDTLS_VERSION_C
+ *
+ * Enable run-time version information.
+ *
+ * Module:  library/version.c
+ *
+ * This module provides run-time version information.
+ */
+//#define MBEDTLS_VERSION_C
+
+/**
+ * \def MBEDTLS_XTEA_C
+ *
+ * Enable the XTEA block cipher.
+ *
+ * Module:  library/xtea.c
+ * Caller:
+ */
+//#define MBEDTLS_XTEA_C
+
+/* \} name SECTION: mbed TLS modules */
+
+/**
+ * \name SECTION: Module configuration options
+ *
+ * This section allows for the setting of module specific sizes and
+ * configuration options. The default values are already present in the
+ * relevant header files and should suffice for the regular use cases.
+ *
+ * Our advice is to enable options and change their values here
+ * only if you have a good reason and know the consequences.
+ *
+ * Please check the respective header file for documentation on these
+ * parameters (to prevent duplicate documentation).
+ * \{
+ */
+
+/* MPI / BIGNUM options */
+//#define MBEDTLS_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
+//#define MBEDTLS_MPI_MAX_SIZE            1024 /**< Maximum number of bytes for usable MPIs. */
+
+/* CTR_DRBG options */
+//#define MBEDTLS_CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+//#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
+//#define MBEDTLS_CTR_DRBG_USE_128_BIT_KEY              /**< Use 128-bit key for CTR_DRBG - may reduce security (see ctr_drbg.h) */
+
+/* HMAC_DRBG options */
+//#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_HMAC_DRBG_MAX_INPUT           256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_HMAC_DRBG_MAX_REQUEST        1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT      384 /**< Maximum size of (re)seed buffer */
+
+/* ECP options */
+//#define MBEDTLS_ECP_MAX_BITS             521 /**< Maximum bit size of groups */
+//#define MBEDTLS_ECP_WINDOW_SIZE            6 /**< Maximum window size used */
+//#define MBEDTLS_ECP_FIXED_POINT_OPTIM      1 /**< Enable fixed-point speed-up */
+
+/* Entropy options */
+//#define MBEDTLS_ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
+//#define MBEDTLS_ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
+//#define MBEDTLS_ENTROPY_MIN_HARDWARE               32 /**< Default minimum number of bytes required for the hardware entropy source mbedtls_hardware_poll() before entropy is released */
+
+/* Memory buffer allocator options */
+//#define MBEDTLS_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
+
+/* Platform options */
+//#define MBEDTLS_PLATFORM_STD_MEM_HDR   <stdlib.h> /**< Header to include if MBEDTLS_PLATFORM_NO_STD_FUNCTIONS is defined. Don't define if no header is needed. */
+//#define MBEDTLS_PLATFORM_STD_CALLOC        calloc /**< Default allocator to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_FREE            free /**< Default free to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT            exit /**< Default exit to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_TIME            time /**< Default time to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_STD_FPRINTF      fprintf /**< Default fprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_PRINTF        printf /**< Default printf to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_STD_SNPRINTF    snprintf /**< Default snprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS       0 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE       1 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_READ   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_FILE  "seedfile" /**< Seed file to read/write with default implementation */
+
+/* To Use Function Macros MBEDTLS_PLATFORM_C must be enabled */
+/* MBEDTLS_PLATFORM_XXX_MACRO and MBEDTLS_PLATFORM_XXX_ALT cannot both be defined */
+//#define MBEDTLS_PLATFORM_CALLOC_MACRO        calloc /**< Default allocator macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_FREE_MACRO            free /**< Default free macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_EXIT_MACRO            exit /**< Default exit macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_TIME_MACRO            time /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO       time_t /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_FPRINTF_MACRO      fprintf /**< Default fprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_PRINTF_MACRO        printf /**< Default printf macro to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_SNPRINTF_MACRO    snprintf /**< Default snprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_VSNPRINTF_MACRO    vsnprintf /**< Default vsnprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+
+/**
+ * Uncomment the macro to let mbed TLS use your alternate implementation of
+ * mbedtls_platform_zeroize(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * mbedtls_platform_zeroize() is a widely used function across the library to
+ * zero a block of memory. The implementation is expected to be secure in the
+ * sense that it has been written to prevent the compiler from removing calls
+ * to mbedtls_platform_zeroize() as part of redundant code elimination
+ * optimizations. However, it is difficult to guarantee that calls to
+ * mbedtls_platform_zeroize() will not be optimized by the compiler as older
+ * versions of the C language standards do not provide a secure implementation
+ * of memset(). Therefore, MBEDTLS_PLATFORM_ZEROIZE_ALT enables users to
+ * configure their own implementation of mbedtls_platform_zeroize(), for
+ * example by using directives specific to their compiler, features from newer
+ * C standards (e.g using memset_s() in C11) or calling a secure memset() from
+ * their system (e.g explicit_bzero() in BSD).
+ */
+//#define MBEDTLS_PLATFORM_ZEROIZE_ALT
+
+/**
+ * Uncomment the macro to let Mbed TLS use your alternate implementation of
+ * mbedtls_platform_gmtime_r(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * gmtime() is not a thread-safe function as defined in the C standard. The
+ * library will try to use safer implementations of this function, such as
+ * gmtime_r() when available. However, if Mbed TLS cannot identify the target
+ * system, the implementation of mbedtls_platform_gmtime_r() will default to
+ * using the standard gmtime(). In this case, calls from the library to
+ * gmtime() will be guarded by the global mutex mbedtls_threading_gmtime_mutex
+ * if MBEDTLS_THREADING_C is enabled. We recommend that calls from outside the
+ * library are also guarded with this mutex to avoid race conditions. However,
+ * if the macro MBEDTLS_PLATFORM_GMTIME_R_ALT is defined, Mbed TLS will
+ * unconditionally use the implementation for mbedtls_platform_gmtime_r()
+ * supplied at compile time.
+ */
+//#define MBEDTLS_PLATFORM_GMTIME_R_ALT
+
+/* \} name SECTION: Customisation configuration options */
+
+/* Target and application specific configurations
+ *
+ * Allow user to override any previous default.
+ *
+ */
+#if defined(MBEDTLS_USER_CONFIG_FILE)
+#include MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#include "mbedtls/check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
new file mode 100644
index 00000000..8ebb6f6f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
@@ -0,0 +1,142 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef NVMS_LOW_LEVEL_H
+#define NVMS_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Constants Exported Constants
+  * @{
+  */
+#define NVMS_LL_BLOCK0_ADDRESS   KMS_DATASTORAGE_START
+#define NVMS_LL_BLOCK1_ADDRESS   (KMS_DATASTORAGE_START + NVMS_LL_BLOCK_SIZE)
+
+#define NVMS_LL_NB_PAGE_PER_BLOCK  (NVMS_LL_BLOCK_SIZE / FLASH_PAGE_SIZE)
+#define NVMS_LL_BLOCK_SIZE         ((KMS_DATASTORAGE_END- KMS_DATASTORAGE_START + 1U) / 2U)
+
+#define NVMS_LL_ERASED           0xFFFFFFFFU
+
+/* not physical flash page size, but writing granularity size -> 8 bytes */
+#define NVMS_LL_PAGE_SIZE    8UL
+
+/**
+  * @}
+  */
+
+/* Exported types ------------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief   Block identifiers.
+  */
+typedef enum
+{
+  NVMS_BLOCK0 = 0,
+  NVMS_BLOCK1 = 1,
+} nvms_block_t;
+
+
+/**
+  * @}
+  */
+
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+void NVMS_LL_Init(void);
+bool NVMS_LL_IsBlockErased(nvms_block_t block);
+bool NVMS_LL_BlockErase(nvms_block_t block);
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size);
+
+/* Exported in line functions ------------------------------------------------*/
+
+/**
+  * @brief   Returns the base address of the specified flash block
+  * @param   block block identifier
+  * @retval  pointer to the block base
+  */
+static inline uint32_t NVMS_LL_GetBlockAddress(nvms_block_t block)
+{
+
+  if (block == NVMS_BLOCK0)
+  {
+    return (uint32_t)NVMS_LL_BLOCK0_ADDRESS;
+  }
+  return (uint32_t)NVMS_LL_BLOCK1_ADDRESS;
+}
+
+
+/**
+  * @brief   Returns the size of the flash blocks
+  * @note    Blocks are required to be of equal size
+  * @retval  Block size
+  */
+static inline size_t NVMS_LL_GetBlockSize(void)
+{
+
+  return NVMS_LL_BLOCK_SIZE;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NVMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
new file mode 100644
index 00000000..8a159341
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    se_crypto_config.h
+  * @author  MCD Application Team
+  *          This file provides a template to configure the crypto scheme used
+  *          for the services used by the bootloader (crypto operations for the
+  *          Firmware and Metadata).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_CRYPTO_CONFIG_H
+#define SE_CRYPTO_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup SE_CRYPTO SE Crypto
+  * @{
+  */
+
+/** @defgroup SE_CRYPTO_CONFIG SE Crypto scheme configuration
+  * @brief Choose the cryptographic scheme you want the bootloader to use.
+  *        These settings apply to the services used by the bootloader only, not to the services called by the User
+  *        Application.
+  * @{
+  */
+
+/**
+  * SE_CoreBin instantiates the crypto scheme selected thanks to "SECBOOT_CRYPTO_SCHEME".
+  * "SECBOOT_CRYPTO_SCHEME" is composed as indicated below:
+  *        SECBOOT_authenticationalgo_encryptionalgo_MACalgo
+  *
+  * Set "SECBOOT_CRYPTO_SCHEME" to one of the values listed below:
+  *
+  * SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256: no FW encryption, only Authentication and Integrity are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           No Firmware encryption.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           Decrypt Firmware Image with AES128-CBC.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using AES128-GCM tag.
+  *                           Decrypt Firmware image using AES128-GCM algo.
+  *                           Firmware Image Integrity using AES128-GCM tag.
+  */
+#define SECBOOT_CRYPTO_SCHEME SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256     /*!< Selected Crypto Scheme */
+
+#define SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256        (1U) /*!< asymmetric crypto, no FW encryption           */
+#define SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256        (2U) /*!< asymmetric crypto with encrypted Firmware     */
+#define SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM     (3U) /*!< symmetric crypto                              */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_CRYPTO_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
new file mode 100644
index 00000000..85f027a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
@@ -0,0 +1,215 @@
+/**
+  ******************************************************************************
+  * @file    se_def_metadata.h
+  * @author  MCD Application Team
+  * @brief   This file contains metadata definitions for SE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_DEF_METADATA_H
+#define SE_DEF_METADATA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "se_crypto_config.h"
+
+/** @addtogroup  SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup  SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup  SE_CORE_DEF SE Definitions
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA SE Metadata Definitions
+  *  @brief definitions related to FW metadata (header).
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Constants Exported Constants
+  * @brief  Firmware Image Header (FW metadata) constants
+  * @{
+  */
+
+#define SE_FW_HEADER_TOT_LEN    (sizeof(SE_FwRawHeaderTypeDef))   /*!< FW INFO header Total Length */
+#define SE_FW_HEADER_SIGN_LEN   SE_HEADER_SIGN_LEN                /*!< FW Header signature Len */
+#define SE_FW_HEADER_STATE_LEN  (3U * 32U)                        /*!< FW Header state Len */
+#define SE_FW_HEADER_FINGERPRINT_LEN  (32U)                       /*!< FW Header finger print Len */
+#define SE_FW_AUTH_LEN          (SE_FW_HEADER_TOT_LEN - SE_FW_HEADER_SIGN_LEN  \
+                                 - SE_FW_HEADER_STATE_LEN - SE_FW_HEADER_FINGERPRINT_LEN) /*!< Authenticated part of the header */
+
+#define SE_SYMKEY_LEN           (16U)  /*!< SE Symmetric Key length (bytes)*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+/* AES-GCM encryption and FW Tag */
+#define SE_NONCE_LEN            (12U)  /*!< Secure Engine Nonce Length (Bytes)*/
+#define SE_TAG_LEN              (16U)  /*!< Secure Engine Tag Length (Bytes): AES-GCM for the FW tag */
+#define SE_HEADER_SIGN_LEN      (16U)  /*!< Firmware Header signature LEN : AES-GCM for header signature */
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/* AES-CBC encryption (or no encryption) and SHA256 for FW tag */
+#define SE_IV_LEN               (16U)  /*!< Secure Engine IV Length (Bytes): same size as an AES block*/
+#define SE_TAG_LEN              (32U)  /*!< Secure Engine Tag Length (Bytes): SHA-256 for the FW tag */
+#define SE_HEADER_SIGN_LEN      (64U)  /*!< Firmware Header signarure LEN*/
+#define SE_ASYM_PUBKEY_LEN      (64U)  /*!< SE Asymmetric Public Key length (bytes)*/
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Image type: complete or partial image */
+#define SE_FW_IMAGE_COMPLETE    (0U) /*!< Complete Fw Image */
+#define SE_FW_IMAGE_PARTIAL     (1U) /*!< Partial Fw Image */
+
+/*!< FW Magic IDs */
+#define SFUM_1 "SFU1"      /*!< Active Slot #1 : first active also referred as master */
+#define SFUM_2 "SFU2"      /*!< Active Slot #2 : second active slot */
+#define SFUM_3 "SFU3"      /*!< Active Slot #3 : third active slot */
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/* SE_FwStateTypeDef - firmware image state type representing the state of the firmware image
+ * In the header (SE_FwRawHeaderTypeDef.FwImageState), these states are encoded as follows:
+   * FWIMG_STATE_INVALID  : 32 * 0x00, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID    : 32 * 0xFF, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID_ALL: 32 * 0xFF, 32 * 0x55, 32 * 0x00
+   * FWIMG_STATE_SELFTEST : 32 * 0xFF, 32 * 0xFF, 32 * 0x00
+   * FWIMG_STATE_NEW      : 32 * 0xFF, 32 * 0xFF, 32 * 0xFF
+ */
+typedef enum
+{
+  FWIMG_STATE_INVALID   = 0U, /* image is not valid (typically selftest has failed) and should not boot */
+  FWIMG_STATE_VALID     = 1U, /* image is valid (selftest passed), image OK to boot if signature checks pass */
+  FWIMG_STATE_VALID_ALL = 2U, /* master image is valid (selftest passed), all other images are automatically validated */
+  FWIMG_STATE_SELFTEST  = 3U, /* self tests to be executed. Image OK to boot one time if signature checks pass */
+  FWIMG_STATE_NEW       = 4U, /* new image, has never run on the device */
+} SE_FwStateTypeDef;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief  Firmware Header structure definition
+  * @note This structure MUST be called SE_FwRawHeaderTypeDef
+  * @note This structure MUST contain a field named 'FwVersion'
+  * @note This structure MUST contain a field named 'FwSize'
+  * @note This structure MUST contain a field named 'FwTag' (to control intergrity of full FW)
+  * @note This structure MUST contain a field named 'PartialFwOffset'
+  * @note This structure MUST contain a field named 'PartialFwSize'
+  * @note This structure MUST contain a field named 'PartialFwTag' (to control intergrity of partial FW)
+  * @note This structure MUST contain a field named 'HeaderSignature' (to control authentication of the header)
+  * @note This structure MUST contain a field named 'FwImageState' (not part of the authentified header)
+  * @note This structure MUST contain a field named 'PrevHeaderFingerprint' (not part of the authentified header)
+  * @note In this example, the header size is always a multiple of 32 to match the FLASH constraint on STM32H7.
+  *       We keep this alignment for all platforms (even when the FLASH alignment constraint is another value) to have
+  *       one unique header size per crypto scheme.
+  * @note In this example, the authentified header size + the header signature is always 192 bytes (for all crypto
+  *       schemes).
+  */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Nonce[SE_NONCE_LEN];    /*!< Nonce used to encrypt firmware*/
+  uint8_t  Reserved[112U];         /*!< Reserved for future use: 112 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN]; /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  InitVector[SE_IV_LEN];  /*!< IV used to encrypt firmware */
+  uint8_t  Reserved[28U];          /*!< Reserved for future use: 28 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Reserved[44U];          /*!< Reserved for future use: 44 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#else
+
+#error "The current example does not support the selected crypto scheme."
+
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_DEF_METADATA_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
new file mode 100644
index 00000000..3d7e71b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Engine low level interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_LOW_LEVEL_H
+#define SE_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+
+/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
+   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
+#include "sfu_fwimg_regions.h"
+
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup SE
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
+  * @{
+  */
+/**
+  * @brief flash handling constants: these constants are used in se_fwimg.c
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
+  * @{
+  */
+
+/**
+  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
+  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
+  * 32-bit word.
+  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
+  */
+#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
+  do{                                  \
+    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
+  }while(0)
+
+/**
+  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
+  */
+#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
+  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
+  * @{
+  */
+
+/**
+  * Code isolation based on Firewall
+  */
+#define SFU_ISOLATE_SE_WITH_MPU
+
+/**
+  * MPU : Enter/Exit secured area ==> nothing to do
+  */
+#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
+#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
+
+/**
+  * Service to enable/disable interrupts
+  */
+#define UPDATE_IRQ_SERVICE
+
+
+/** @addtogroup SE_LOW_LEVEL_Exported_Functions
+  * @{
+  */
+void SE_LL_CORE_Cleanup(void);
+#if defined (__CC_ARM)
+void __arm_clean_data(void);
+#elif defined(__GNUC__)
+void __gcc_clean_data(void);
+#endif /* __CC_ARM */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_Functions
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void);
+SE_ErrorStatus SE_LL_CRC_Init(void);
+SE_ErrorStatus SE_LL_CRC_DeInit(void);
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..99ddd88d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+/* #define HAL_IWDG_MODULE_ENABLED */
+/* #define HAL_LPTIM_MODULE_ENABLED */
+#define HAL_PKA_MODULE_ENABLED
+/* #define HAL_RNG_MODULE_ENABLED */
+/* #define HAL_RTC_MODULE_ENABLED */
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+/* #define HAL_TIM_MODULE_ENABLED */
+/* #define HAL_UART_MODULE_ENABLED */
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+/* #define HAL_EXTI_MODULE_ENABLED */
+/* #define HAL_CORTEX_MODULE_ENABLED */
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..15b64f1c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
@@ -0,0 +1,693 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>0</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\data_init.c</PathWithFileName>
+      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
+      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
+      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
+      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
+      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
+      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..aff0e063
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>SECoreBin</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name>prebuild.bat .</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SECoreBin.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--entry=SE_CallGate
+--diag_suppress L6404W
+--diag_suppress L6314W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>data_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\data_init.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ca_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>nvms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/nvms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_low_level.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_callgate.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_exception.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_fwimg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_der_x962.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_digest.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_dyn_obj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_ecc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_enc_dec.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_key_mgt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_nvm_storage.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_platf_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+          <Files>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
+            <File>
+              <FileName>sha256.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_SECoreBin"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
new file mode 100644
index 00000000..8f3619cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
@@ -0,0 +1,26 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+
+; *** regions needed by SE_CoreBin project ***
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
+  *(.SE_CallGate_Code)
+  }
+  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
+  *(.SE_Startup_Code)
+  }
+  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_CODE_NOKEY_REGION_ROM_SIZE{
+  .ANY (+RO)
+  } 
+  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
+  *(.SE_embedded_Keys)
+  }
+  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
new file mode 100644
index 00000000..67246f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
@@ -0,0 +1,84 @@
+/**
+  ******************************************************************************
+  * @file    data_init.c
+  * @author  MCD Application Team
+  * @brief   Data section (RW + ZI) initialization.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+******************************************************************************
+*/
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+
+extern uint32_t Image$$SE_region_RAM$$RW$$Base;
+extern uint32_t Load$$SE_region_RAM$$RW$$Base;
+extern uint32_t Image$$SE_region_RAM$$RW$$Length;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Base;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Length;
+
+
+#define data_ram Image$$SE_region_RAM$$RW$$Base
+#define data_rom Load$$SE_region_RAM$$RW$$Base
+#define data_rom_length Image$$SE_region_RAM$$RW$$Length
+#define bss Image$$SE_region_RAM$$ZI$$Base
+#define bss_length Image$$SE_region_RAM$$ZI$$Length;
+
+
+/**
+  * @brief  Copy initialized data from ROM to RAM.
+  * @param  None.
+  * @retval None.
+  */
+void LoopCopyDataInit(void) 
+{
+  uint32_t i;
+	uint8_t* src = (uint8_t*)&data_rom;
+	uint8_t* dst = (uint8_t*)&data_ram;
+	uint32_t len = (uint32_t)&data_rom_length;
+
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = src[i];
+  }
+}
+  
+/**
+  * @brief  Clear the zero-initialized data section.
+  * @param  None.
+  * @retval None.
+  */
+void LoopFillZerobss(void) 
+{
+  uint32_t i;
+	uint8_t* dst = (uint8_t*)&bss;
+	uint32_t len = (uint32_t)&bss_length;
+	
+	/* Clear the zero-initialized data section */
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = 0;
+  }
+}
+	
+/**
+  * @brief  Data section initialization.
+  * @param  None.
+  * @retval None.
+  */
+ void __arm_data_init(void) {
+	 	LoopFillZerobss();
+	  LoopCopyDataInit();
+} 
+ 
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
new file mode 100644
index 00000000..83291a72
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V6M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..a369fd4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SECoreBin.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value=".."/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SECoreBin.null.394363235" name="2_Images_SECoreBin"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
new file mode 100644
index 00000000..4a09bf52
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SECoreBin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ca_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
new file mode 100644
index 00000000..dcc46a55
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
@@ -0,0 +1,36 @@
+
+#include "stdint-gcc.h"
+
+#ifndef vu32
+#	define vu32 volatile uint32_t
+#endif
+
+void LoopCopyDataInit(void) {
+	extern char _sidata asm("_sidata");
+	extern char _sdata asm("_sdata");
+	extern char _edata asm("_edata");
+	
+	vu32* src = (vu32*) &_sidata;
+	vu32* dst = (vu32*) &_sdata;
+	
+	vu32 len = (&_edata - &_sdata) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = src[i];
+}
+
+void LoopFillZerobss(void) {
+	extern char _sbss asm("_sbss");
+	extern char _ebss asm("_ebss");
+	
+	vu32* dst = (vu32*) &_sbss;
+	vu32 len = (&_ebss - &_sbss) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = 0;
+}
+
+void __gcc_data_init(void) {
+	LoopFillZerobss();
+	LoopCopyDataInit();
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
new file mode 100644
index 00000000..8b684fc9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
@@ -0,0 +1,152 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(SE_CallGate)
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_CallGate_Code :
+  {
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    KEEP(*(.SE_CallGate_Code))
+  } > SE_CallGate_ROM_region
+
+  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SE_Code_NoKey_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
+  
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SE_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SE_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
new file mode 100644
index 00000000..30759a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_C
+#define CA_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "CryptoApi/ca.h"
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#include "mbedtls/entropy_poll.h"
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#define COMPILER_BARRIER() __DMB();__DSB();
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static RNG_HandleTypeDef handle;
+static uint8_t users = 0;
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private function prototypes -----------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta);
+static void RNG_Init(void);
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length);
+static void RNG_DeInit(void);
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Exported functions implementation -----------------------------------------*/
+
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+
+/**
+  * @brief CRYP MSP Initialization
+  * This function configures the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Release AES/CRYP from reset state */
+    __HAL_RCC_AES_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_AES_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief CRYP MSP De-Initialization
+  * This function freeze the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_AES_CLK_DISABLE();
+    /* Force AES/CRYP into reset state */
+    __HAL_RCC_AES_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/**
+  * @brief      PKA MSP Initialization
+  *             This function configures the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Release PKA from reset state */
+    __HAL_RCC_PKA_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_PKA_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief      PKA MSP De-Initialization
+  *             This function freeze the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_PKA_CLK_DISABLE();
+    /* Force PKA into reset state */
+    __HAL_RCC_PKA_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta)
+{
+  COMPILER_BARRIER();
+  uint8_t newValue;
+  do
+  {
+    newValue = __LDREXB(valuePtr) + delta;
+  } while (__STREXB(newValue, valuePtr));
+  COMPILER_BARRIER();
+  return newValue;
+}
+
+static void RNG_Init(void)
+{
+  uint32_t dummy;
+
+  /*  We're only supporting a single user of RNG */
+  if (atomic_incr_u8(&users, 1) > 1)
+  {
+    while (1);
+  }
+
+  /* Select MSI as RNG clock source */
+  __HAL_RCC_RNG_CONFIG(RCC_RNGCLKSOURCE_MSI);
+
+  /* RNG Peripheral clock enable */
+  __HAL_RCC_RNG_CLK_ENABLE();
+
+  /* Initialize RNG instance */
+  handle.Instance = RNG;
+  handle.State = HAL_RNG_STATE_RESET;
+  handle.Lock = HAL_UNLOCKED;
+
+  HAL_RNG_Init(&handle);
+
+  /* first random number generated after setting the RNGEN bit should not be used */
+  HAL_RNG_GenerateRandomNumber(&handle, &dummy);
+}
+
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length)
+{
+  int32_t ret = 0;
+  __IO uint8_t random[4];
+  *output_length = 0;
+
+  /* Get Random byte */
+  while ((*output_length < length) && (ret == 0))
+  {
+    if (HAL_RNG_GenerateRandomNumber(&handle, (uint32_t *)random) != HAL_OK)
+    {
+      ret = -1;
+    }
+    else
+    {
+      for (uint8_t i = 0; (i < 4) && (*output_length < length) ; i++)
+      {
+        *output++ = random[i];
+        *output_length += 1;
+        random[i] = 0;
+      }
+    }
+  }
+  /* Just be extra sure that we didn't do it wrong */
+  if ((__HAL_RNG_GET_FLAG(&handle, (RNG_FLAG_CECS | RNG_FLAG_SECS))) != 0)
+  {
+    *output_length = 0;
+  }
+}
+
+static void RNG_DeInit(void)
+{
+  /*Disable the RNG peripheral */
+  HAL_RNG_DeInit(&handle);
+  /* RNG Peripheral clock disable - assume we're the only users of RNG  */
+  __HAL_RCC_RNG_CLK_DISABLE();
+
+  users = 0;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+  RNG_Init();
+  RNG_GetBytes(output, len, olen);
+  RNG_DeInit();
+  if (*olen != len)
+  {
+    return -1;
+  }
+  return 0;
+}
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+/**
+  * @brief      CRC initialization
+  *             This function release reset and clock CRC IP peripheral
+  * @retval None
+  */
+void CA_LL_CRC_Init(void)
+{
+  /* Force CRC into reset state */
+  __HAL_RCC_CRC_FORCE_RESET();
+  /* Release CRC from reset state */
+  __HAL_RCC_CRC_RELEASE_RESET();
+  /* Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+}
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#endif /* CA_LOW_LEVEL_C */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/kms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
new file mode 100644
index 00000000..3db7b5e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
@@ -0,0 +1,188 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains implementations for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include "kms.h"
+#include "kms_low_level.h"
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+typedef enum
+{
+  KMS_MEM_NONE    = 0,
+  KMS_MEM_ALLOC,
+  KMS_MEM_FREE
+} kms_ll_mem_optype;
+typedef struct
+{
+  kms_ll_mem_optype   optype;
+  uint32_t            size;
+  void               *ptr;
+} kms_ll_mem_operation_t;
+#endif /* KMS_MEM_LOGGING */
+/* Private define ------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+#define KMS_LL_MEM_LOGGING_MAX    (100UL)
+#endif /* KMS_MEM_LOGGING */
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+kms_ll_mem_operation_t kms_ll_mem_logging[KMS_LL_MEM_LOGGING_MAX];
+uint32_t kms_ll_mem_logging_idx;
+#endif /* KMS_MEM_LOGGING */
+/* Private function prototypes -----------------------------------------------*/
+/* Private function ----------------------------------------------------------*/
+/* Exported functions --------------------------------------------------------*/
+
+/**
+  * @brief  Read data from flash and store into buffer
+  * @note   Used to access encrypted blob in flash.
+  * @param  pDestination buffer to store red data
+  * @param  pSource flash aread to read from
+  * @param  Length amount of data to read from flash
+  * @retval Operation status
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length)
+{
+  SE_ErrorStatus seStatus;
+  seStatus = SE_LL_FLASH_Read(pDestination, pSource, Length);
+  return (seStatus == SE_SUCCESS) ? CKR_OK : CKR_GENERAL_ERROR;
+}
+
+#ifdef KMS_SE_CHECK_PARAMS
+
+/* Remove compilation optimization */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  Check if given buffer in inside secure enclave (RAM or Flash, NVM_Storgae)
+  *              If it is in Enclave area, then generate a RESET.
+  * @param  pBuffer Buffer address
+  * @param  ulSize  Buffer size
+  * @retval void
+  */
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize)
+{
+  /* If pBuffer is NULL, simply return FALSE */
+  if ((pBuffer == NULL) || (ulSize == 0UL))
+  {
+    return;
+  }
+  /* Check if address range is within secure enclave                           */
+  /* Called APIs will generate exception in case buffer is in forbidden area   */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  /* Double Check to avoid basic fault injection */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  return;
+}
+#endif /* KMS_SE_CHECK_PARAMS */
+
+/**
+  * @brief  An error occurred
+  * @note   Used to debug or reset in case of important issue
+  * @param  error Error reported by KMS
+  */
+void KMS_LL_ReportError(uint32_t error)
+{
+  (void)error;
+  while (1 == 1) {;}
+}
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory initialization occurred
+  */
+void KMS_LL_ReportMemInit(void)
+{
+  for (uint32_t i = 0; i < KMS_LL_MEM_LOGGING_MAX; i++)
+  {
+    kms_ll_mem_logging[i].optype = KMS_MEM_NONE;
+    kms_ll_mem_logging[i].size = 0;
+    kms_ll_mem_logging[i].ptr = NULL_PTR;
+  }
+  kms_ll_mem_logging_idx = 0;
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory allocation occurred
+  * @param  size    Size allocated
+  * @param  pmem    Allocated pointer
+  */
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_ALLOC;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = size;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory free occurred
+  * @param  pmem    Freed pointer
+  */
+void KMS_LL_ReportMemFree(void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_FREE;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = 0;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
new file mode 100644
index 00000000..f9ca9236
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
@@ -0,0 +1,236 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_hal_flash.h"
+#include "nvms_low_level.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep);
+static uint32_t get_page(uint32_t Addr);
+/* Private function ----------------------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep)
+{
+  uint8_t *p;
+  uint32_t maxsize;
+  HAL_StatusTypeDef ret = HAL_OK;
+
+  /* Calculating the maximum writable chunk size.*/
+  maxsize = (size_t)(NVMS_LL_PAGE_SIZE -
+                     ((uint32_t) * destinationp & (NVMS_LL_PAGE_SIZE - 1UL)));
+  if (maxsize > *sizep)
+  {
+    maxsize = *sizep;
+  }
+
+  p = *destinationp;
+
+  /* Updating size and pointers.*/
+  *sizep        -= maxsize;
+  *destinationp += maxsize;
+
+  /* Programming, 64 bits granularity  */
+  (void)HAL_FLASH_Unlock();
+  while ((maxsize >= 8UL) && (ret == HAL_OK))
+  {
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+    p = &p[8];
+    *sourcep = &((*sourcep)[8]);
+    maxsize -= 8UL;
+  }
+
+  if (maxsize != 0UL)
+  {
+    uint8_t block[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    /* Problem, there are remaining bytes to write, but not a full 64bit word --> we can't handle it */
+    /* Let's write a full 64bit word */
+    (void)memcpy(block, *sourcep, maxsize);
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+  }
+  (void)HAL_FLASH_Lock();
+
+  if (ret == HAL_OK)
+  {
+    return false;
+  }
+  return true;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t get_page(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+/* Exported functions --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+
+/**
+  * @brief   Flash low level driver initialization.
+  */
+void NVMS_LL_Init(void)
+{
+
+}
+
+/**
+  * @brief   Determines if a flash block is in erased state.
+  *
+  * @param   block         the block identifier
+  * @return                  The block state.
+  * @retval false            if the block is not in erased state.
+  * @retval true             if the block is in erased state.
+  */
+bool NVMS_LL_IsBlockErased(nvms_block_t block)
+{
+  uint32_t i;
+  uint32_t *p = (uint32_t *)((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS :
+                             NVMS_LL_BLOCK1_ADDRESS);
+
+  for (i = 0; i < (NVMS_LL_BLOCK_SIZE / sizeof(uint32_t)); i++)
+  {
+    if (*p != NVMS_LL_ERASED)
+    {
+      return false;
+    }
+    p++;
+  }
+  return true;
+}
+
+
+
+/**
+  * @brief   Erases a block.
+  * @note    The erase operation is verified internally.
+  *
+  * @param   block         the block identifier
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the erase operation failed.
+  */
+bool NVMS_LL_BlockErase(nvms_block_t block)
+{
+  /* Erase First Flash sector */
+  FLASH_EraseInitTypeDef EraseInitStruct;
+  uint32_t SectorError = 0;
+
+  EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+  EraseInitStruct.Page        = get_page((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS : NVMS_LL_BLOCK1_ADDRESS);
+  EraseInitStruct.NbPages     = NVMS_LL_NB_PAGE_PER_BLOCK;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void)HAL_FLASH_Unlock();
+
+  if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK)
+  {
+    /* Error occurred while sector erase.
+      User can add here some code to deal with this error.
+      SectorError will contain the faulty sector and then to know the code error on this sector,
+      user can call function 'HAL_FLASH_GetError()'
+      FLASH_ErrorTypeDef errorcode = HAL_FLASH_GetError(); */
+  }
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void)HAL_FLASH_Lock();
+
+  /* Operation verification.*/
+  return !NVMS_LL_IsBlockErased(block);
+}
+
+/**
+  * @brief   Writes data.
+  * @note    The write operation is verified internally.
+  * @note    If the write operation partially writes flash pages then the
+  *          unwritten bytes are left to the filler value.
+  *
+  * @param   source        pointer to the data to be written
+  * @param   destination   pointer to the flash position
+  * @param   size          size of data
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the write operation failed.
+  */
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size)
+{
+  const uint8_t *s = source;
+  uint8_t *d = destination;
+  size_t sz = size;
+
+  while (sz > 0UL)
+  {
+    /* Writes as much as a single operation allows.*/
+    if (page_write(&s, &d, &sz))
+    {
+      return true;
+    }
+  }
+
+  /* Operation verification.*/
+  return (bool)(memcmp(source, destination, size) != 0);
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/se_low_level.c
new file mode 100644
index 00000000..576319a2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/Src/se_low_level.c
@@ -0,0 +1,757 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SE_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#endif /* __CC_ARM */
+#include "se_exception.h"
+#include "string.h"
+
+#ifdef KMS_ENABLED
+#include "kms.h"
+#include "kms_objects.h"
+#include "kms_platf_objects_config.h"
+#endif /* KMS_ENABLED */
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+/** @defgroup  SE_HARDWARE SE Hardware Interface
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Private_Variables Private Variables
+  * @{
+  */
+static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
+
+static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Private_Functions Private Functions
+  * @{
+  */
+
+static uint32_t SE_LL_GetPage(uint32_t Address);
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  Set CRC configuration and call HAL CRC initialization function.
+  * @param  None.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  CrcHandle.Instance = CRC;
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The Default polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+  /* The default init value is used */
+  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+  /* CRC Init*/
+  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_Init(void)
+{
+  /* CRC Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  return SE_LL_CRC_Config();
+}
+
+/**
+  * @brief  Wrapper to HAL CRC de-initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_DeInit(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
+  {
+    /* Initialization OK */
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC Calculate function.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  uBufferLength: buffer length in 32-bits word.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  This function does an erase of nb pages in user flash area
+  * @param  pStart: pointer to  user flash area
+  * @param  Length: number of bytes.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SE_ErrorStatus e_ret_status = SE_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    /* Fill EraseInit structure*/
+    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
+    p_erase_init.Page          = SE_LL_GetPage(start);
+    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
+    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+    {
+      e_ret_status = SE_ERROR;
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Write in Flash  protected area
+  * @param  pDestination pointer to destination area in Flash
+  * @param  pSource pointer to input buffer
+  * @param  Length number of bytes to be written
+  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
+  */
+
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SE_ErrorStatus ret = SE_SUCCESS;
+  uint32_t i;
+  uint32_t verified = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  if (Length == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Area should be inside 1 of the firmware image headers */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    for (i = 0U; i < Length; i += 8U)
+    {
+      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
+      {
+        ret = SE_ERROR;
+        break;
+      }
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) */
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    ret = SE_ERROR;
+  }
+  return ret;
+}
+
+/**
+  * @brief  Read in Flash protected area
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to read
+  * @param  Length: Length in bytes of data buffer
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  uint32_t source = (uint32_t)pSource;
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+  uint32_t i;
+  uint32_t verified = 0U;
+
+  /* Area should be inside 1 of the firmware image headers
+     or inside 1 of the download areas */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
+        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
+    {
+      verified = 1U;
+    }
+  }
+
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  SE_DoubleECC_Error_Counter = 0U;
+  /* Do not use memcpy from lib : ECC error should be checked at each loop */
+  for (i = 0; (i < Length) && (SE_DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+  {
+    *pDestination = *pSource;
+  }
+  if (SE_DoubleECC_Error_Counter == 0U)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  SE_DoubleECC_Error_Counter = 0U;
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
+  * @param pxSE_Metadata: Firmware metadata.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(pxSE_Metadata);
+  return SE_SUCCESS;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_ROM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is in sbsfu ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
+                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
+                            || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
+                           )))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+/**
+  * @brief function to disable all IRQ, previously enabled ones are stored in parameter
+  * @param pIrqState: IRQ state buffer
+  * @param IrqStateNb: Number of IRQ state that can be stored
+  * @retval SE_ErrorStatus SE_SUCCESS when complete successfully, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    pIrqState[0] = NVIC->ICER[0];     /* Save currently enabled IRQ */
+    NVIC->ICER[0] = pIrqState[0];     /* Disable All IRQ */
+    if (NVIC->ICER[0] == 0UL)         /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    NVIC->ISER[0] = pIrqState[0];         /* Disable All enabled IRQ */
+    if (NVIC->ICER[0] == pIrqState[0])    /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Lock the embedded keys used by SBSFU
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void)
+{
+#ifdef KMS_ENABLED
+  uint32_t i_key_locked = 0U;
+  uint32_t i_ctrl = 0U;
+
+#ifdef KMS_INDEX_BLOBIMPORT_VERIFY
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_VERIFY) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_VERIFY */
+#ifdef KMS_INDEX_BLOBIMPORT_DECRYPT
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_DECRYPT) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_DECRYPT */
+#ifdef KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE */
+  if(i_ctrl == i_key_locked)
+  {
+    return SE_SUCCESS;
+  }
+  else
+  {
+    return SE_ERROR;
+  }
+#else /* KMS_ENABLED */
+  return SE_SUCCESS;
+#endif /* KMS_ENABLED */
+}
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t SE_LL_GetPage(uint32_t Address)
+{
+  uint32_t page;
+
+  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
+  {
+    /* Bank 1 */
+    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
+  }
+  else
+  {
+    /* Bank 2 */
+    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
+  }
+  return page;
+}
+
+/**
+  * @brief  Gets the bank of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The bank of a given address
+  */
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retval None.
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    SE_DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    /* This exception occurs for another reason than flash double ECC errors */
+    SE_NMI_ExceptionHandler();
+  }
+}
+
+/**
+  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
+  * @param  None.
+  * @retvat void
+  */
+void HardFault_Handler(void)
+{
+  SE_NMI_ExceptionHandler();
+}
+
+/**
+  * @brief  Cleanup SE CORE
+  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
+  *
+  */
+void  SE_LL_CORE_Cleanup(void)
+{
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/readme.txt
new file mode 100644
index 00000000..174ef3dd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_SECoreBin/readme.txt
@@ -0,0 +1,113 @@
+/**
+  @page 2_Images_SECoreBin / Secure Engine Core binary generation.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Secure Engine Core binary generation.
+  *          SE Core binary exports SE CallGate function entry point for
+  *          SFU Application.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application is used to generate Secure Engine Core binary file to be linked
+with Secure Boot & Secure Firmware Update application (SBSFU).
+SE Core binary exports a single entry point to SE CallGate function and a startup method for data initialization.
+It is based on the Secure Engine Middleware.
+
+Generated SE Core Binary embeds Key Management Services accessible through this same single entry point using APIs
+defined by tKMS interface.
+
+It has to be compiled before SBSFU project.
+
+Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default
+cryptographic scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are
+provided and can be selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
+   - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
+   - SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+   - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+
+This example supports multiple images feature configured with 2 active images for execution from internal flash and 1
+download area also located in internal flash. Each image has its own keys for signature verification and firwmare encryption.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 2_Images_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
+   - 2_Images_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
+   - 2_Images_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
+   - 2_Images_SECoreBin/Src/se_low_level.c                      Low level interface
+   - 2_Images_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
+   - 2_Images_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
+   - 2_Images_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
+                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
+                                                                Exported to KMS user to ease embedded object usage
+   - 2_Images_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
+   - 2_Images_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
+   - 2_Images_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
+   - 2_Images_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
+   - 2_Images_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
+   - 2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
+   - 2_Images_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
+   - 2_Images_SECoreBin/Binary/ECCKEY2.txt                      Private ECCDSA key for signature verification of 2nd active image
+   - 2_Images_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin Public key for AES CBC encryption of 2nd active image
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin Public key for AES GCM encryption of 2nd active image
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files. As a workaround, it is advised to use the subst.exe command from within a command prompt to set up
+     a local drive out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+   
+@par IDE prebuild script
+
+In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
+This preliminary processing is in charge of:
+   - determining the requested cryptographic scheme
+   - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of SBSFU & Blob
+     importation keys into the KMS embedded objects pattern file)
+   - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
+
+A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic
+key). The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+In order to generate Secure Engine Core binary file, you must do the following :
+   - Open your preferred toolchain
+   - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewd
new file mode 100644
index 00000000..d410b327
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp
new file mode 100644
index 00000000..6e2270a3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.ewp
@@ -0,0 +1,1214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+          <state>KMS_ENABLED</state>
+          <state>DISABLE_IMAGE_STATE_HANDLING</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\UserApp.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 1 1"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\com.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\common.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\fw_update_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_user_code.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\test_protections.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ymodem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\flash_if.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_object_update_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_derive_key.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_encrypt_decrypt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_find.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\tkms_app_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\mpu.c</name>
+      </file>
+    </group>
+    <group>
+      <name>SFU_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\sfu_app_new_image.c</name>
+      </file>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\svc_handler.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\2_Images_SBSFU\EWARM\se_interface_appli.o</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..0b291e36
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,48 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_M4_start__       = __ICFEDIT_SLOT_Active_2_start__ + 512;
+define symbol __ICFEDIT_region_M4_end__         = __ICFEDIT_SLOT_Active_2_end__;
+define symbol __ICFEDIT_region_ROM_start__      = __ICFEDIT_SLOT_Active_1_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__        = __ICFEDIT_SLOT_Active_1_end__ ;
+define symbol __ICFEDIT_region_RAM_start__      = __ICFEDIT_SB_region_RAM_start__;
+define symbol __ICFEDIT_region_RAM_end__        = __ICFEDIT_SB_region_RAM_end__;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+define region M4_region       = mem:[from __ICFEDIT_region_M4_start__  to __ICFEDIT_region_M4_end__];
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];
+define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in M4_region    { readonly section M4_UserApp_Bin };
+place in ROM_region   { readonly, last section aes_block_padding };
+place in RAM_region   { readwrite, block CSTACK, block HEAP };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/svc_handler.s
new file mode 100644
index 00000000..0259460d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/EWARM/svc_handler.s
@@ -0,0 +1,30 @@
+;/******************** (C) COPYRIGHT 2017 STMicroelectronics ********************
+;* File Name          : svc_handler.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;*  @attention
+;* 
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;* 
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;* 
+;*******************************************************************************
+;
+;
+;
+; Cortex-M version
+;
+      SECTION .text:CODE:NOROOT:REORDER(2)
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT MPU_SVC_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+        END
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/com.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/com.h
new file mode 100644
index 00000000..e5ae5467
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/com.h
@@ -0,0 +1,108 @@
+/**
+  ******************************************************************************
+  * @file    com.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for COM module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef COM_H
+#define COM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include <stdio.h>
+#include "stm32wlxx.h"
+
+/** @defgroup  COM_Exported_Constants Exported Constants
+  * @{
+  */
+/** @defgroup COM_UART  UART Configuration
+  * @{
+  */
+
+#define COM_UART                                USART2
+#define COM_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define COM_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define COM_UART_TX_AF                          GPIO_AF7_USART2
+#define COM_UART_TX_GPIO_PORT                   GPIOA
+#define COM_UART_TX_PIN                         GPIO_PIN_2
+#define COM_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define COM_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define COM_UART_RX_AF                          GPIO_AF7_USART2
+#define COM_UART_RX_GPIO_PORT                   GPIOA
+#define COM_UART_RX_PIN                         GPIO_PIN_3
+#define COM_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define COM_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Maximum Timeout values for flags waiting loops.
+   You may modify these timeout values depending on CPU frequency and application
+   conditions (interrupts routines ...). */
+#define COM_UART_TIMEOUT_MAX                   1000U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup  COM_Exported_Functions
+  * @{
+  */
+
+HAL_StatusTypeDef  COM_Init(void);
+HAL_StatusTypeDef  COM_DeInit(void);
+HAL_StatusTypeDef  COM_Transmit(uint8_t *Data, uint16_t uDataLength, uint32_t uTimeout);
+HAL_StatusTypeDef  COM_Receive(uint8_t *Data, uint16_t uDataLength, uint32_t uTimeout);
+HAL_StatusTypeDef  COM_Flush(void);
+
+HAL_StatusTypeDef Ymodem_HeaderPktRxCpltCallback(uint32_t uFileSize);
+HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* COM_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/common.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/common.h
new file mode 100644
index 00000000..ffe54146
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/common.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    common.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for COMMON module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef COMMON_H
+#define COMMON_H
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* Constants used by Serial Command Line Mode */
+#define TX_TIMEOUT          ((uint32_t)100U)
+#define RX_TIMEOUT          ((uint32_t)2000U)
+
+/* Exported macro ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= 'A') && ((c) <= 'F'))
+#define IS_LC_LETTER(c)     (((c) >= 'a') && ((c) <= 'f'))
+#define IS_09(c)            (((c) >= '0') && ((c) <= '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       (c - '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - 'A'+10) : ((c) - 'a'+10))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - '0') : CONVERTHEX_ALPHA(c))
+
+/* Exported functions ------------------------------------------------------- */
+uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+HAL_StatusTypeDef Serial_PutByte(uint8_t uParam);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif  /* COMMON_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/flash_if.h
new file mode 100644
index 00000000..5e6a4123
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/flash_if.h
@@ -0,0 +1,64 @@
+/**
+  ******************************************************************************
+  * @file    flash_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef FLASH_IF_H
+#define FLASH_IF_H
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+#define FLASH_IF_MIN_WRITE_LEN (8U)  /* Flash programming by 64 bits */
+/* Exported functions ------------------------------------------------------- */
+
+HAL_StatusTypeDef FLASH_If_Init(void);
+HAL_StatusTypeDef FLASH_If_Write(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_If_Read(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_If_Erase_Size(void *pStart, uint32_t uLength);
+HAL_StatusTypeDef FLASH_INT_Init(void);
+HAL_StatusTypeDef FLASH_INT_If_Write(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_INT_If_Read(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_INT_If_Erase_Size(void *pStart, uint32_t uLength);
+HAL_StatusTypeDef FLASH_EXT_Init(void);
+HAL_StatusTypeDef FLASH_EXT_If_Write(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_EXT_If_Read(void *pDestination, const void *pSource, uint32_t uLength);
+HAL_StatusTypeDef FLASH_EXT_If_Erase_Size(void *pStart, uint32_t uLength);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif  /* FLASH_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/fw_update_app.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/fw_update_app.h
new file mode 100644
index 00000000..5df3b13e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/fw_update_app.h
@@ -0,0 +1,44 @@
+/**
+  ******************************************************************************
+  * @file    fw_update_app.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Firmware Update module
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef FW_UPDATE_APP_H
+#define FW_UPDATE_APP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+void FW_UPDATE_Run(void);
+void FW_UPDATE_MULTIPLE_RunMenu(void);
+void FW_VALIDATE_RunMenu(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FW_UPDATE_APP_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/main.h
new file mode 100644
index 00000000..ae83444c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/main.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for main application file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAIN_H
+#define MAIN_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "com.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* User can use this section to tailor UARTx instance used and associated
+   resources */
+
+#define BUTTON_INIT()         BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);
+#define BUTTON_PUSHED()      (BSP_PB_GetState(BUTTON_SW1) == GPIO_PIN_RESET)
+#define BUTTON_INIT_EXTI()    BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI)
+#define BUTTON_IRQHANDLER     EXTI1_0_IRQHandler
+#define BUTTON_EXTI_LINE      BUTTON_SW1_PIN
+
+/* Definition for USARTx clock resources */
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Maximum Timeout values for flags waiting loops.
+   You may modify these timeout values depending on CPU frequency and application
+   conditions (interrupts routines ...). */
+#define SFU_UART_TIMEOUT_MAX                   1000U
+
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+#endif /* MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/mpu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/mpu.h
new file mode 100644
index 00000000..3817fe2a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/mpu.h
@@ -0,0 +1,50 @@
+/**
+  ******************************************************************************
+  * @file    mpu.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for MPU module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MPU_H
+#define MPU_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* Exported macro ------------------------------------------------------------*/
+/* applicative sys call */
+#define SFU_ISOLATE_SE_WITH_MPU
+
+
+/* Exported functions ------------------------------------------------------- */
+void MPU_EnterUnprivilegedMode(void);
+void SVC_NVIC_SystemReset(void);
+void SVC_MPU_Disable(void);
+void MPU_SVC_Handler(uint32_t *args);
+void HAL_APP_SVC_Handler(uint32_t *args);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MPU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h
new file mode 100644
index 00000000..1e0a4b1f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/se_user_code.h
@@ -0,0 +1,73 @@
+/**
+  ******************************************************************************
+  * @file    se_user_code.h
+  * @author  MCD Application Team
+  * @brief   Secure Engine User code example module.
+  *          This file demonstrates how to call user defined services running
+  *          in Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_USER_CODE_H
+#define SE_USER_CODE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup SE_USER_CODE Secure Engine User Code Example
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+/* Exported macro ------------------------------------------------------------*/
+/* applicative sys call */
+#define UPDATE_IRQ_SERVICE
+
+/* Exported functions ------------------------------------------------------- */
+
+/** @addtogroup  SE_USER_CODE_Exported_Functions
+  * @{
+  */
+
+void SE_USER_CODE_RunMenu(void);
+void SE_USER_CODE_DisableIrq(void);
+void SE_USER_CODE_EnableIrq(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_USER_CODE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h
new file mode 100644
index 00000000..b273cbce
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    sfu_app_new_image.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New
+  *          Firmware Image storage and installation.
+  *          This file contains the services the bootloader and the user application
+  *          can use to know where to store a new FW image and request its installation.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_APP_NEW_IMAGE_H
+#define SFU_APP_NEW_IMAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Specifies a structure containing values related to the management of multi-images in Flash.
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+  uint32_t  ExecutionAddr;         /*!< The execution address for the FwImage in UserFlash */
+} SFU_FwImageFlashTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+HAL_StatusTypeDef SFU_APP_InstallAtNextReset(uint8_t *fw_header);
+void SFU_APP_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_APP_NEW_IMAGE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..af556fa8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+#define HAL_GTZC_MODULE_ENABLED
+/* #define HAL_HSEM_MODULE_ENABLED */
+#define HAL_I2C_MODULE_ENABLED
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+/* #define HAL_TIM_MODULE_ENABLED */
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..4595a1da
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void SVC_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+void FLASH_IRQHandler(void);
+void RTC_LSECSS_IRQHandler(void);
+void TZIC_ILA_IRQHandler(void);
+void BUTTON_IRQHANDLER(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/test_protections.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/test_protections.h
new file mode 100644
index 00000000..0e50d898
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/test_protections.h
@@ -0,0 +1,51 @@
+/**
+  ******************************************************************************
+  * @file    test_protections.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Test Protections functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef TEST_PROTECTIONS_H
+#define TEST_PROTECTIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+
+/* Exported constants --------------------------------------------------------*/
+/* Tamper instance used by SBSFU */
+#define RTC_TAMPER_ID RTC_TAMPER_1
+
+/* Exported macros -----------------------------------------------------------*/
+/* SFU Redirect of RTC Tamper Event Callback*/
+#define  CALLBACK_Antitamper(void) HAL_RTCEx_Tamper1EventCallback(RTC_HandleTypeDef *hrtc)
+/* SFU Redirect of GTZC_TZIC Event Callback*/
+#define  CALLBACK_GTZC_TZIC(void) HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+
+/* Exported functions ------------------------------------------------------- */
+void     TEST_PROTECTIONS_RunMenu(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* TEST_PROTECTIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h
new file mode 100644
index 00000000..da212f0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/tkms_app.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for tkms application examples.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_APP_H
+#define KMS_APP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported macros -----------------------------------------------------------*/
+#if  defined(SFU_IWDG_PROTECT_ENABLE)
+/* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register */
+#define INVOKE_SCHEDULE_NEEDS()            \
+  do {                                     \
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);  \
+  } while(0);
+#else
+#define INVOKE_SCHEDULE_NEEDS()            \
+  do {                                     \
+    ;                                      \
+  } while(0);
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+
+
+/* Exported functions ------------------------------------------------------- */
+void tkms_app_menu(void);
+void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length);
+
+CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage);
+CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage);
+CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage);
+CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pMessage);
+CK_RV tkms_app_find(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_APP_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/ymodem.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/ymodem.h
new file mode 100644
index 00000000..4441b9e6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Inc/ymodem.h
@@ -0,0 +1,119 @@
+/**
+  ******************************************************************************
+  * @file    ymodem.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Ymodem functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef YMODEM_H_
+#define YMODEM_H_
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  FW_UPDATE Firmware Update Example
+  * @{
+  */
+/* Compiler switches ---------------------------------------------------------*/
+#ifndef MINICOM_YMODEM /* Avoid redefinition from app_sfu.h */
+/* Uncomment the switch below if you are using Minicom (Linux) */
+/* YMODEM protocol handled by Minicom instead of Teraterm: 128B packets instead of 1kB packets */
+/* #define MINICOM_YMODEM */
+#endif /* MINICOM_YMODEM */
+/* Includes ------------------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+
+typedef enum
+{
+  COM_OK       = 0x00U,  /*!< OK */
+  COM_ERROR    = 0x01U,  /*!< Error */
+  COM_ABORT    = 0x02U,  /*!< Abort */
+  COM_TIMEOUT  = 0x03U,  /*!< Timeout */
+  COM_DATA     = 0x04U,  /*!< Data */
+  COM_LIMIT    = 0x05U   /*!< Limit*/
+} COM_StatusTypeDef;     /*!< Comm status structures definition */
+
+typedef struct
+{
+  HAL_StatusTypeDef(* Ymodem_HeaderPktRxCpltCallback)(uint32_t uFileSize);
+  HAL_StatusTypeDef(* Ymodem_DataPktRxCpltCallback)(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize);
+} YMODEM_CallbacksTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/* Packet structure defines */
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define PACKET_HEADER_SIZE      ((uint32_t)3U)    /*!<Header Size*/
+#define PACKET_DATA_INDEX       ((uint32_t)4U)    /*!<Data Index*/
+#define PACKET_START_INDEX      ((uint32_t)1U)    /*!<Start Index*/
+#define PACKET_NUMBER_INDEX     ((uint32_t)2U)    /*!<Packet Number Index*/
+#define PACKET_CNUMBER_INDEX    ((uint32_t)3U)    /*!<Cnumber Index*/
+#else
+/* Minicom YMODEM */
+#define PACKET_HEADER_SIZE      ((uint32_t)6U)    /*!<Header Size*/
+#define PACKET_DATA_INDEX       ((uint32_t)7U)    /*!<Data Index*/
+#define PACKET_START_INDEX      ((uint32_t)4U)    /*!<Start Index*/
+#define PACKET_NUMBER_INDEX     ((uint32_t)5U)    /*!<Packet Number Index*/
+#define PACKET_CNUMBER_INDEX    ((uint32_t)6U)    /*!<Cnumber Index*/
+#endif /* MINICOM_YMODEM */
+#define PACKET_TRAILER_SIZE     ((uint32_t)2U)    /*!<Trailer Size*/
+#define PACKET_OVERHEAD_SIZE    (PACKET_HEADER_SIZE + PACKET_TRAILER_SIZE - 1U) /*!<Overhead Size*/
+#define PACKET_SIZE             ((uint32_t)128U)  /*!<Packet Size*/
+#define PACKET_1K_SIZE          ((uint32_t)1024U) /*!<Packet 1K Size*/
+
+/* /-------- Packet in IAP memory ------------------------------------------\
+ * | 0      |  1    |  2     |  3   |  4      | ... | n+4     | n+5  | n+6  |
+ * |------------------------------------------------------------------------|
+ * | unused | start | number | !num | data[0] | ... | data[n] | crc0 | crc1 |
+ * \------------------------------------------------------------------------/
+ * the first byte is left unused for memory alignment reasons                 */
+
+#define FILE_NAME_LENGTH        ((uint32_t)64U)  /*!< File name length*/
+#define FILE_SIZE_LENGTH        ((uint32_t)16U)  /*!< File size length*/
+
+#define SOH                     ((uint8_t)0x01U)  /*!< start of 128-byte data packet */
+#define STX                     ((uint8_t)0x02U)  /*!< start of 1024-byte data packet */
+#define EOT                     ((uint8_t)0x04U)  /*!< end of transmission */
+#define ACK                     ((uint8_t)0x06U)  /*!< acknowledge */
+#define NAK                     ((uint8_t)0x15U)  /*!< negative acknowledge */
+#define CA                      ((uint8_t)0x18U)  /*!< two of these in succession aborts transfer */
+#define CRC16                   ((uint8_t)0x43U)  /*!< 'C' == 0x43, request 16-bit CRC */
+#define RB                      ((uint8_t)0x72U)  /*!< Startup sequence */
+#define NEGATIVE_BYTE           ((uint8_t)0xFFU)  /*!< Negative Byte*/
+
+#define ABORT1                  ((uint8_t)0x41U)  /* 'A' == 0x41, abort by user */
+#define ABORT2                  ((uint8_t)0x61U)  /* 'a' == 0x61, abort by user */
+
+#define NAK_TIMEOUT             ((uint32_t)0x100000U)  /*!< NAK Timeout*/
+#define DOWNLOAD_TIMEOUT        ((uint32_t)1000U) /* One second retry delay */
+#define MAX_ERRORS              ((uint32_t)5U)    /*!< Maximum number of retry*/
+
+/* Exported functions ------------------------------------------------------- */
+void Ymodem_Init(void);
+COM_StatusTypeDef Ymodem_Receive(uint32_t *puSize, uint32_t uFlashDestination, YMODEM_CallbacksTypeDef *appCb);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif  /* YMODEM_H_ */
+
+/*******************(C)COPYRIGHT STMicroelectronics ********END OF FILE********/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..047f4140
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvoptx
@@ -0,0 +1,793 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>0</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=98,207,509,709,0)(1007=673,180,880,401,0)(1008=566,409,942,645,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>2</SubType>
+          <ItemText>0x2000A400</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\svc_handler.s</PathWithFileName>
+      <FilenameWithoutPath>svc_handler.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SFU_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/sfu_app_new_image.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_app_new_image.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/com.c</PathWithFileName>
+      <FilenameWithoutPath>com.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/common.c</PathWithFileName>
+      <FilenameWithoutPath>common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/fw_update_app.c</PathWithFileName>
+      <FilenameWithoutPath>fw_update_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_object_update_app.c</PathWithFileName>
+      <FilenameWithoutPath>kms_object_update_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/mpu.c</PathWithFileName>
+      <FilenameWithoutPath>mpu.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_user_code.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_code.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/test_protections.c</PathWithFileName>
+      <FilenameWithoutPath>test_protections.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_derive_key.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_derive_key.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_encrypt_decrypt.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_encrypt_decrypt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_find.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_find.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/tkms_app_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>tkms_app_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ymodem.c</PathWithFileName>
+      <FilenameWithoutPath>ymodem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>3</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</PathWithFileName>
+      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..9a207e9f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/Project.uvprojx
@@ -0,0 +1,657 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>UserApp_CM0Plus</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,DISABLE_IMAGE_STATE_HANDLING</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../2_Images_SECoreBin/Inc;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>.\UserApp_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+            <File>
+              <FileName>svc_handler.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\svc_handler.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SFU_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_app_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/sfu_app_new_image.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>com.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/com.c</FilePath>
+            </File>
+            <File>
+              <FileName>common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/common.c</FilePath>
+            </File>
+            <File>
+              <FileName>flash_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/flash_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>fw_update_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/fw_update_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_object_update_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_object_update_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>mpu.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/mpu.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_code.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_user_code.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>test_protections.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/test_protections.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_derive_key.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_derive_key.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_encrypt_decrypt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_encrypt_decrypt.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_find.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_find.c</FilePath>
+            </File>
+            <File>
+              <FileName>tkms_app_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/tkms_app_sign_verify.c</FilePath>
+            </File>
+            <File>
+              <FileName>ymodem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ymodem.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_appli.txt</FileName>
+              <FileType>3</FileType>
+              <FilePath>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_UserApp_M0Plus"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/STM32WL_cm0plus.ini b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/STM32WL_cm0plus.ini
new file mode 100644
index 00000000..8be49a05
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/STM32WL_cm0plus.ini
@@ -0,0 +1,23 @@
+/******************************************************************************/
+/* STM32WL_cm0plus.INI: CM0 CPU Initialization File                                           
+/******************************************************************************/
+/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
+/* * All rights reserved.</center>*/
+/*  *
+/*  * This software component is licensed by ST under BSD 3-Clause license,*/
+/*  * the "License"; You may not use this file except in compliance with the */
+/*  * License. You may obtain a copy of the License at:*/
+/*  *                        opensource.org/licenses/BSD-3-Clause*/
+/*  *
+/*  ****************************************************************************/
+/******************************************************************************/
+
+FUNC void Setup (void) {
+  SP = _RDWORD(0x0801C200);          // Setup Stack Pointer
+  PC = _RDWORD(0x0801C204);          // Setup Program Counter
+   
+}
+
+Setup();                             // Setup for Running
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct
new file mode 100644
index 00000000..ca8d3ce4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/UserApp_cm0plus.sct
@@ -0,0 +1,29 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_1_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+  ROM_region +0 {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+; SBSFU RAM area is reused for UserApp_M0  
+  RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE {
+  .ANY (STACK)
+  .ANY (HEAP)
+  .ANY (+RW +ZI)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm0plus.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..fab9a434
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,259 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;*
+;* This software component is licensed by ST under 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:
+;*                        opensource.org/licenses/Apache-2.0
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size      EQU     0x00000800
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size       EQU     0x00000200
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                     ; Top of Stack
+                DCD     Reset_Handler                    ; Reset Handler
+                DCD     NMI_Handler                      ; NMI Handler
+                DCD     HardFault_Handler                ; Hard Fault Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     SVC_Handler                      ; SVCall Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     PendSV_Handler                   ; PendSV Handler
+                DCD     SysTick_Handler                  ; SysTick Handler
+
+                ; External Interrupts                    
+                DCD     TZIC_ILA_IRQHandler              ; Security Interrupt controller illegal access Interrupts
+                DCD     PVD_PVM_IRQHandler               ; PVD and PVM detector
+                DCD     RTC_LSECSS_IRQHandler            ; RTC Wakeup + RTC Tamper and TimeStamp + RTC Alarms (A & B) + SSR Underflow and LSECSS Interrupts
+                DCD     RCC_FLASH_C1SEV_IRQHandler       ; RCC1 and FLASH and CPU1 M4 SEV Interrupts
+                DCD     EXTI1_0_IRQHandler               ; EXTI Line 1:0 Interrupts
+                DCD     EXTI3_2_IRQHandler               ; XTI Line 3:2 Interrupts
+                DCD     EXTI15_4_IRQHandler              ; EXTI Line 15:4 interrupts
+                DCD     ADC_COMP_DAC_IRQHandler          ; ADC, COMP1, COMP2, DAC Interrupts
+                DCD     DMA1_Channel1_2_3_IRQHandler     ; DMA1 Channel 1 to 3 Interrupts
+                DCD     DMA1_Channel4_5_6_7_IRQHandler   ; DMA1 Channels 4, 5, 6, 7 Interrupts
+                DCD     DMA2_DMAMUX1_OVR_IRQHandler      ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+                DCD     LPTIM1_IRQHandler                ; LPTIM1 global Interrupt
+                DCD     LPTIM2_IRQHandler                ; LPTIM2 global Interrupt
+                DCD     LPTIM3_IRQHandler                ; LPTIM3 global Interrupt
+                DCD     TIM1_IRQHandler                  ; TIM1 Interrupt
+                DCD     TIM2_IRQHandler                  ; TIM2 Interrupt
+                DCD     TIM16_IRQHandler                 ; TIM16 Interrupt
+                DCD     TIM17_IRQHandler                 ; TIM17 Interrupt
+                DCD     IPCC_C2_RX_C2_TX_IRQHandler      ; IPCC RX Occupied and TX Free Interrupt Interrupts
+                DCD     HSEM_IRQHandler                  ; Semaphore Interrupt
+                DCD     RNG_IRQHandler                   ; RNG Interrupt
+                DCD     AES_PKA_IRQHandler               ; AES and PKA Interrupts
+                DCD     I2C1_IRQHandler                  ; I2C1 Event and Error Interrupt
+                DCD     I2C2_IRQHandler                  ; I2C2 Event and Error Interrupt
+                DCD     I2C3_IRQHandler                  ; I2C3 Event and Error Interrupt
+                DCD     SPI1_IRQHandler                  ; SPI1 Interrupts
+                DCD     SPI2_IRQHandler                  ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                ; USART1 Interrupt
+                DCD     USART2_IRQHandler                ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler               ; LPUART1 Interrupt
+                DCD     SUBGHZSPI_IRQHandler             ; SUBGHZSPI Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler          ; SUBGHZ Radio Interrupt
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+                EXPORT  TZIC_ILA_IRQHandler            [WEAK]
+                EXPORT  PVD_PVM_IRQHandler             [WEAK]
+                EXPORT  RTC_LSECSS_IRQHandler          [WEAK]
+                EXPORT  RCC_FLASH_C1SEV_IRQHandler     [WEAK]
+                EXPORT  EXTI1_0_IRQHandler             [WEAK]
+                EXPORT  EXTI3_2_IRQHandler             [WEAK]
+                EXPORT  EXTI15_4_IRQHandler            [WEAK]
+                EXPORT  ADC_COMP_DAC_IRQHandler        [WEAK]
+                EXPORT  DMA1_Channel1_2_3_IRQHandler   [WEAK]
+                EXPORT  DMA1_Channel4_5_6_7_IRQHandler [WEAK]
+                EXPORT  DMA2_DMAMUX1_OVR_IRQHandler    [WEAK]
+                EXPORT  LPTIM1_IRQHandler              [WEAK]
+                EXPORT  LPTIM2_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler              [WEAK]
+                EXPORT  TIM1_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                [WEAK]
+                EXPORT  TIM16_IRQHandler               [WEAK]
+                EXPORT  TIM17_IRQHandler               [WEAK]
+                EXPORT  IPCC_C2_RX_C2_TX_IRQHandler    [WEAK]
+                EXPORT  HSEM_IRQHandler                [WEAK]
+                EXPORT  RNG_IRQHandler                 [WEAK]
+                EXPORT  AES_PKA_IRQHandler             [WEAK]
+                EXPORT  I2C1_IRQHandler                [WEAK]
+                EXPORT  I2C2_IRQHandler                [WEAK]
+                EXPORT  I2C3_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                [WEAK]
+                EXPORT  SPI2_IRQHandler                [WEAK]
+                EXPORT  USART1_IRQHandler              [WEAK]
+                EXPORT  USART2_IRQHandler              [WEAK]
+                EXPORT  LPUART1_IRQHandler             [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler           [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler        [WEAK]
+
+TZIC_ILA_IRQHandler
+PVD_PVM_IRQHandler
+RTC_LSECSS_IRQHandler
+RCC_FLASH_C1SEV_IRQHandler
+EXTI1_0_IRQHandler
+EXTI3_2_IRQHandler
+EXTI15_4_IRQHandler
+ADC_COMP_DAC_IRQHandler
+DMA1_Channel1_2_3_IRQHandler
+DMA1_Channel4_5_6_7_IRQHandler
+DMA2_DMAMUX1_OVR_IRQHandler   
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+LPTIM3_IRQHandler
+TIM1_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+IPCC_C2_RX_C2_TX_IRQHandler
+HSEM_IRQHandler
+RNG_IRQHandler
+AES_PKA_IRQHandler
+I2C1_IRQHandler
+I2C2_IRQHandler
+I2C3_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler
+USART2_IRQHandler
+LPUART1_IRQHandler
+SUBGHZSPI_IRQHandler
+SUBGHZ_Radio_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/svc_handler.s
new file mode 100644
index 00000000..95a0c32e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/MDK-ARM/svc_handler.s
@@ -0,0 +1,33 @@
+;*******************************************************************************
+;* File Name          : svc_handler.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;*******************************************************************************
+;
+;
+; Cortex-M version
+;
+      PRESERVE8
+      THUMB
+      AREA    |.text|, CODE, READONLY
+ 
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT MPU_SVC_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..caf5da96
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.cproject
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="UserApp_cm0plus" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;" prebuildStep="">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/UserApp_cm0plus.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_UserApp_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="DISABLE_IMAGE_STATE_HANDLING"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata.1159753008" name="Place data in their own sections (-fdata-sections)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.fdata" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1663313052" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp_cm0plus.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.401807756" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs">
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath.741843002" name="Use C math library (-Wl,--start-group -lc -lm -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libmath" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/UserApp_cm0plus.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_UserApp_CM0PLUS.null.394363235" name="2_Images_UserApp_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/2_Images_UserApp_CM0PLUS"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/2_Images_UserApp_CM0PLUS"/>
+		</configuration>
+	</storageModule>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project
new file mode 100644
index 00000000..a80772c8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/.project
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_UserApp_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/com.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/com.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/common.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/flash_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/flash_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/fw_update_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/fw_update_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_object_update_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/kms_object_update_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/mpu.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/mpu.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_user_code.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/se_user_code.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_app_new_image.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/sfu_app_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/test_protections.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/test_protections.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_derive_key.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_derive_key.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_encrypt_decrypt.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_encrypt_decrypt.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_find.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_find.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/tkms_app_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/tkms_app_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ymodem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/ymodem.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm0plus.s
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/svc_handler.s
new file mode 100644
index 00000000..01ca743b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/svc_handler.s
@@ -0,0 +1,29 @@
+/**
+  ******************************************************************************
+  * @file      svc_handler.s
+  * @author    MCD Application Team
+  * @brief     Wrapper for SE isolation with MPU.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+        .section  .text,"ax",%progbits
+        .syntax unified
+        .weak  MPU_SVC_Handler
+        .global SVC_Handler
+        .type  SVC_Handler, %function
+SVC_Handler:
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+.end
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch
new file mode 100644
index 00000000..83782618
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\UserApp_cm0plus.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_UserApp_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\UserApp_cm0plus.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_UserApp_CM0PLUS"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_UserApp_CM0PLUS"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.ld
new file mode 100644
index 00000000..2462e3ef
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/STM32CubeIDE/UserApp_cm0plus.ld
@@ -0,0 +1,173 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size  = 0x200; /* required amount of heap  */
+_Min_Stack_Size = 0x800; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  ISR_VECTOR (rx)    : ORIGIN = (SLOT_Active_1_start + 0x200), LENGTH = Vector_size
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_1_start + Vector_size + 0x200), LENGTH = (SLOT_Active_1_end - SLOT_Active_1_start + 1 - 0x200 - Vector_size)
+  APPLI_RAM  (xrw)   : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+}
+
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >ISR_VECTOR
+
+  .SE_IF_Code : {
+    . = ALIGN(8);
+    KEEP(*se_interface_app.o (.text .text*))
+    KEEP(*se_interface_kms.o (.text .text*))
+    . = ALIGN(8);
+  } >SE_IF_ROM_region
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .ARM.extab   : { 
+    . = ALIGN(8);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .ARM : {
+    . = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .init_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .fini_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+    
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/com.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/com.c
new file mode 100644
index 00000000..0de12dc0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/com.c
@@ -0,0 +1,285 @@
+/**
+  ******************************************************************************
+  * @file    com.c
+  * @author  MCD Application Team
+  * @brief   COM module.
+  *          This file provides set of firmware functions to manage Com
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "com.h"
+#include "stm32wlxx_hal.h"
+
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/** @defgroup  COM_Private_Defines Private Defines
+  * @{
+  */
+
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+/**
+  * @}
+  */
+
+/** @defgroup  COM_Private_Variables Exported Variables
+  * @{
+  */
+
+static UART_HandleTypeDef   UartHandle; /*!< Uart Handler*/
+
+/**
+  * @}
+  */
+
+/** @defgroup  COM_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup  COM_Initialization_Functions Initialization Functions
+  * @{
+  */
+
+/**
+  * @brief  Initialize COM module.
+  * @param  None.
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef  COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = COM_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+
+  return HAL_UART_Init(&UartHandle);
+}
+
+/**
+  * @brief  DeInitialize COM module.
+  * @retval None.
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef  COM_DeInit(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  * ...
+  */
+  return HAL_OK;
+}
+
+/**
+  * @brief  UART MSP Init.
+  * @param  huart: UART handler pointer.
+  * @retval None.
+  */
+void HAL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == COM_UART)
+  {
+    /* Peripheral Clock Enable */
+    COM_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    COM_UART_TX_GPIO_CLK_ENABLE();
+    COM_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : COM_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = COM_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = COM_UART_TX_AF;
+    HAL_GPIO_Init(COM_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : COM_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = COM_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = COM_UART_RX_AF;
+    HAL_GPIO_Init(COM_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief  UART MSP DeInit.
+  * @param  huart: UART handler pointer.
+  * @retval None.
+  */
+void HAL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+  if (huart->Instance == COM_UART)
+  {
+    /* Peripheral clock disable */
+    COM_UART_CLK_DISABLE();
+
+    HAL_GPIO_DeInit(COM_UART_TX_GPIO_PORT, COM_UART_TX_PIN);
+    HAL_GPIO_DeInit(COM_UART_RX_GPIO_PORT, COM_UART_RX_PIN);
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/** @defgroup  COM_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief Transmit Data.
+  * @param uDataLength: Data pointer to the Data to transmit.
+  * @param uTimeout: Timeout duration.
+  * @retval Status of the Transmit operation.
+  */
+HAL_StatusTypeDef COM_Transmit(uint8_t *Data, uint16_t uDataLength, uint32_t uTimeout)
+{
+  return HAL_UART_Transmit(&UartHandle, (uint8_t *)Data, uDataLength, uTimeout);
+}
+
+/**
+  * @brief Receive Data.
+  * @param uDataLength: Data pointer to the Data to receive.
+  * @param uTimeout: Timeout duration.
+  * @retval Status of the Receive operation.
+  */
+HAL_StatusTypeDef COM_Receive(uint8_t *Data, uint16_t uDataLength, uint32_t uTimeout)
+{
+  return HAL_UART_Receive(&UartHandle, (uint8_t *)Data, uDataLength, uTimeout);
+}
+
+/**
+  * @brief  Flush COM Input.
+  * @param None.
+  * @retval HAL_Status.
+  */
+HAL_StatusTypeDef COM_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+  return HAL_OK;
+}
+
+/**
+  * @}
+  */
+
+/** @addtogroup  COM_Private_Functions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup COM_Callback_Functions Callback Functions
+  * @{
+  */
+
+/**
+  * @brief  Retargets the C library printf function to the USART.
+  * @param  None
+  * @retval ch
+  */
+PUTCHAR_PROTOTYPE
+{
+  /* Place your implementation of fputc here */
+  /* e.g. write a character to the USART1 and Loop until the end of transmission */
+  HAL_UART_Transmit(&UartHandle, (uint8_t *)&ch, 1U, 0xFFFFU);
+
+  return ch;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  FileSize Dimension of the file that will be received.
+  * @retval None
+  */
+__weak HAL_StatusTypeDef Ymodem_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the Ymodem_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  return HAL_OK;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData Pointer to the buffer.
+  * @param  Size Packet dimension.
+  * @retval None
+  */
+__weak HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the Ymodem_DataPktRxCpltCallback could be implemented in the user file
+   */
+  return HAL_OK;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/common.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/common.c
new file mode 100644
index 00000000..54c71d02
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/common.c
@@ -0,0 +1,133 @@
+/**
+  ******************************************************************************
+  * @file    common.c
+  * @author  MCD Application Team
+  * @brief   COMMON module.
+  *          This file provides set of firmware functions to manage Common
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "common.h"
+#include "main.h"
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+/**
+  * @brief  Convert a string to an integer
+  * @param  pInputStr: The string to be converted
+  * @param  pIntNum: The integer value
+  * @retval 1: Correct
+  *         0: Error
+  */
+uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+
+  if ((pInputStr[0U] == '0') && ((pInputStr[1U] == 'x') || (pInputStr[1U] == 'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != '\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        val = (val << 4U) + CONVERTHEX(pInputStr[i]);
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == '\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == '\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == 'k') || (pInputStr[i] == 'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == 'm') || (pInputStr[i] == 'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        val = val * 10U + CONVERTDEC(pInputStr[i]);
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+
+/**
+  * @brief  Transmit a byte to the HyperTerminal
+  * @param  param The byte to be sent
+  * @retval HAL_StatusTypeDef HAL_OK if OK
+  */
+HAL_StatusTypeDef Serial_PutByte(uint8_t uParam)
+{
+  return COM_Transmit(&uParam, 1U, TX_TIMEOUT);
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c
new file mode 100644
index 00000000..6ecbce70
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/flash_if.c
@@ -0,0 +1,361 @@
+/**
+  ******************************************************************************
+  * @file    flash_if.c
+  * @author  MCD Application Team
+  * @brief   FLASH Interface module.
+  *          This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "flash_if.h"
+#include "string.h"
+#include <stdio.h>
+
+/* Uncomment the line below if you want some debug logs */
+#define FLASH_IF_DBG
+#ifdef FLASH_IF_DBG
+#define FLASH_IF_TRACE printf
+#else
+#define FLASH_IF_TRACE(...)
+#endif /* FLASH_IF_DBG */
+
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+#define EXTERNAL_FLASH_ADDRESS    0x90000000U
+
+
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+
+
+/* Private function prototypes -----------------------------------------------*/
+static uint32_t GetPage(uint32_t uAddr);
+static HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void);
+
+/* Public functions : wrapper ---------------------------------------------------------*/
+
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_If_Init(void)
+{
+  HAL_StatusTypeDef e_ret_status = HAL_OK;
+
+  e_ret_status = FLASH_INT_Init();
+  if (e_ret_status == HAL_OK)
+  {
+    e_ret_status = FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pStart: flash address to be erased
+  * @param  uLength: number of bytes
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Erase_Size(pStart, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Erase_Size(pStart, uLength);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Write(pDestination, pSource, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Write(pDestination, pSource, uLength);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return FLASH_INT_If_Read(pDestination, pSource, uLength);
+  }
+  else
+  {
+    return FLASH_EXT_If_Read(pDestination, pSource, uLength);
+  }
+}
+
+/* Public functions : internal flash --------------------------------------------------------- */
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_INT_Init(void)
+{
+  return HAL_OK;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pStart: Start of user flash area
+  * @param  uLength: number of bytes.
+  * @retval HAL status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  uint32_t page_error = 0U;
+  uint32_t uStart = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef x_erase_init;
+  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
+  uint32_t first_page = 0U;
+  uint32_t nb_pages = 0U;
+  uint32_t chunk_nb_pages;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = FLASH_INT_If_Clear_Error();
+
+  if (e_ret_status == HAL_OK)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = GetPage(uStart);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = GetPage(uStart + uLength - 1U) - first_page + 1U;
+      x_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        x_erase_init.Page = first_page;
+        x_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&x_erase_init, &page_error) != HAL_OK)
+        {
+          HAL_FLASH_GetError();
+          e_ret_status = HAL_ERROR;
+        }
+        /* Refresh Watchdog */
+        WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+      } while (nb_pages > 0);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      HAL_FLASH_Lock();
+
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Write(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  HAL_StatusTypeDef e_ret_status = HAL_ERROR;
+  uint32_t i = 0U;
+  uint32_t pdata = (uint32_t)pSource;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = FLASH_INT_If_Clear_Error();
+
+  if (e_ret_status == HAL_OK)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() != HAL_OK)
+    {
+      return HAL_ERROR;
+
+    }
+    else
+    {
+      /* DataLength must be a multiple of 64 bit */
+      for (i = 0U; i < uLength; i += 8U)
+      {
+        /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+        be done by word */
+        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)pDestination,  *((uint64_t *)(pdata + i)))
+            == HAL_OK)
+        {
+          /* Check the written value */
+          if (*(uint64_t *)pDestination != *(uint64_t *)(pdata + i))
+          {
+            /* Flash content doesn't match SRAM content */
+            e_ret_status = HAL_ERROR;
+            break;
+          }
+          /* Increment FLASH Destination address */
+          pDestination = (void *)((uint32_t)pDestination + 8U);
+        }
+        else
+        {
+          /* Error occurred while writing data in Flash memory */
+          e_ret_status = HAL_ERROR;
+          break;
+        }
+      }
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      HAL_FLASH_Lock();
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  uLength: number of bytes
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  memcpy(pDestination, pSource, uLength);
+  return HAL_OK;
+}
+
+/* Public functions : external flash ---------------------------------------------------------*/
+
+HAL_StatusTypeDef FLASH_EXT_Init(void)
+{
+  return HAL_OK;
+}
+
+/* No external flash available on this product
+   ==> return SFU_ERROR */
+
+HAL_StatusTypeDef FLASH_EXT_If_Erase_Size(void *pStart, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+HAL_StatusTypeDef FLASH_EXT_If_Write(void  *pDestination, const void *pSource, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+HAL_StatusTypeDef FLASH_EXT_If_Read(void *pDestination, const void *pSource, uint32_t uLength)
+{
+  return HAL_ERROR;
+}
+
+/* Private functions ---------------------------------------------------------*/
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None
+  * @retval HAL Status.
+  */
+HAL_StatusTypeDef FLASH_INT_If_Clear_Error(void)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      ret = HAL_OK;
+    }
+#ifdef FLASH_IF_DBG
+    else
+    {
+      FLASH_IF_TRACE("[FLASH_IF] Lock failure\r\n");
+    }
+#endif /* FLASH_IF_DBG */
+  }
+#ifdef FLASH_IF_DBG
+  else
+  {
+    FLASH_IF_TRACE("[FLASH_IF] Unlock failure\r\n");
+  }
+#endif /* FLASH_IF_DBG */
+  return ret;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+uint32_t GetPage(uint32_t Addr)
+{
+  uint32_t page = 0U;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c
new file mode 100644
index 00000000..d7b1dc11
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/fw_update_app.c
@@ -0,0 +1,806 @@
+/**
+  ******************************************************************************
+  * @file    fw_update_app.c
+  * @author  MCD Application Team
+  * @brief   Firmware Update module.
+  *          This file provides set of firmware functions to manage Firmware
+  *          Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "fw_update_app.h"
+#include "se_interface_application.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_app_new_image.h"
+#include "string.h"
+#include "mpu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#elif defined(__CC_ARM)
+#include "mapping_fwimg.h"
+#include "mapping_sbsfu.h"
+#endif /* __ARMCC_VERSION */
+#include "ymodem.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+#define ALL_SLOTS 255U                   /*!< Validate all new firmware installed in a single request */
+/* Global variables ----------------------------------------------------------*/
+
+#if !defined(EXTERNAL_LOADER)
+static uint32_t m_uFileSizeYmodem = 0U;  /*!< Ymodem File size*/
+static uint32_t m_uNbrBlocksYmodem = 0U; /*!< Ymodem Number of blocks*/
+static uint32_t m_uPacketsReceived = 0U; /*!< Ymodem packets received*/
+
+#ifdef MINICOM_YMODEM
+/*
+ * With Minicom Ymodem, the data offset is not aligned because PACKET_DATA_INDEX is 7
+ * So we cannot write in FLASH with pData as source, we need a copy in an aligned buffer
+ */
+/* With Minicom YMODEM each packet carries 128 bytes of data */
+static uint8_t alignedBuffer[PACKET_SIZE] __attribute__((aligned(8)));
+#endif /* MINICOM_YMODEM */
+#endif /* !EXTERNAL_LOADER */
+
+/* Private function prototypes -----------------------------------------------*/
+
+#if !defined(EXTERNAL_LOADER)
+static HAL_StatusTypeDef FW_UPDATE_DownloadNewFirmware(SFU_FwImageFlashTypeDef *pFwImageDwlArea);
+#endif /* !EXTERNAL_LOADER */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Run FW Update process.
+  * @param  None
+  * @retval HAL Status.
+  */
+#if defined(EXTERNAL_LOADER)
+void FW_UPDATE_Run(void)
+{
+  /* Print Firmware Update welcome message */
+  printf("\r\n================ New Fw Download =========================\r\n\n");
+
+  /* Standalone loader communication : execution requested */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+
+  /*  use virtual HAL API allowing the access to Privileged register */
+  SVC_NVIC_SystemReset();
+}
+
+#else
+void FW_UPDATE_Run(void)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  uint8_t  fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+  SFU_FwImageFlashTypeDef fw_image_dwl_area;
+
+  /* Print Firmware Update welcome message */
+  printf("\r\n================ New Fw Download =========================\r\n\n");
+
+  /* Get Info about the download area */
+  SFU_APP_GetDownloadAreaInfo(SLOT_DWL_1, &fw_image_dwl_area);
+
+  /* Download new firmware image*/
+  ret = FW_UPDATE_DownloadNewFirmware(&fw_image_dwl_area);
+
+  if (HAL_OK == ret)
+  {
+    /* Read header in dwl slot */
+    ret = FLASH_If_Read(fw_header_dwl_slot, (void *) fw_image_dwl_area.DownloadAddr, SE_FW_HEADER_TOT_LEN);
+
+    /* Ask for installation at next reset */
+    (void)SFU_APP_InstallAtNextReset((uint8_t *) fw_header_dwl_slot);
+
+    /* System Reboot*/
+    printf("  -- Image correctly downloaded - reboot\r\n\n");
+    HAL_Delay(1000U);
+    /*  use virtual HAL API allowing the access to Privileged register */
+    SVC_NVIC_SystemReset();
+  }
+
+  if (ret != HAL_OK)
+  {
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+}
+#endif /* EXTERNAL_LOADER */
+
+
+#if defined(EXTERNAL_LOADER)
+/**
+  * @brief  Run Multiple FW Update process.
+  * @param  None
+  * @retval None.
+  */
+void FW_UPDATE_MULTIPLE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#else
+/**
+  * @brief  Print Multiple FW Update menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+static void FW_UPDATE_MULTIPLE_PrintMenu(void)
+{
+  /* Print Multiple Download menu */
+  printf("\r\n============= Multiple Download Menu ================\r\n\n");
+  printf("  Download firmware in DWL_SLOT #1 ---------------------- 1\r\n\n");
+  printf("  Start installation ------------------------------------ 4\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Run Multiple FW Update process.
+  * @param  None
+  * @retval None.
+  */
+void FW_UPDATE_MULTIPLE_RunMenu(void)
+{
+  SFU_FwImageFlashTypeDef fw_image_dwl_area;
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t i = 0U;
+  uint32_t several_dwl_area = 1U;
+  uint32_t slot_number = 0U;
+  static  uint8_t fw_to_install = 0U;
+  uint8_t  fw_header_dwl_slot[SE_FW_HEADER_TOT_LEN];
+
+  /* Print Menu */
+  FW_UPDATE_MULTIPLE_PrintMenu();
+
+  /* Verify if at least 2 DWL areas exist */
+  for (i = 1U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      several_dwl_area++;
+    }
+  }
+
+  if (several_dwl_area == 1)
+  {
+    printf("  -- !!Only 1 download area configured - feature not available!! \r\n\n");
+    return;
+  }
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
+       reload register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_DWL_1 + 0U;
+          break;
+        case '4' :
+          /*
+           * When IMAGE_STATE_HANDLING switch is not activated :
+           *  - requesting installation means writing the header in the SWAP slot then reset.
+           *  - else, reset is enough. Image state set as NEW in the header of dwl_slot will identify the dwl_slot
+           *    to install.
+           */
+          /* Get Info about the download area */
+          SFU_APP_GetDownloadAreaInfo(fw_to_install, &fw_image_dwl_area);
+
+          /* Read header in dwl slot */
+          FLASH_If_Read(fw_header_dwl_slot, (void *) fw_image_dwl_area.DownloadAddr, SE_FW_HEADER_TOT_LEN);
+
+          /* Ask for installation at next reset */
+          (void)SFU_APP_InstallAtNextReset((uint8_t *) fw_header_dwl_slot);
+
+          /* System Reboot*/
+          printf("  -- Installation requested - Reboot");
+          HAL_Delay(1000U);
+          /*  use virtual HAL API allowing the access to Privileged register */
+          SVC_NVIC_SystemReset();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (slot_number != 0U)
+      {
+        /* Get Info about the download area */
+        SFU_APP_GetDownloadAreaInfo(slot_number, &fw_image_dwl_area);
+
+        if ((fw_image_dwl_area.DownloadAddr != 0U) && (fw_image_dwl_area.MaxSizeInBytes != 0U))
+        {
+          /* Download new firmware image*/
+          if (FW_UPDATE_DownloadNewFirmware(&fw_image_dwl_area) == HAL_OK)
+          {
+            fw_to_install = slot_number;
+          }
+          else
+          {
+            printf("  -- !!Download failed!! \r\n\n");
+            HAL_Delay(1000U);
+          }
+        }
+        else
+        {
+          printf("  -- !!Download slot not configured!! \r\n\n");
+          HAL_Delay(1000U);
+        }
+      }
+
+      /* Print Menu */
+      FW_UPDATE_MULTIPLE_PrintMenu();
+    }
+  }
+}
+#endif /* EXTERNAL_LOADER */
+
+#if !defined(EXTERNAL_LOADER)
+/**
+  * @brief Download a new Firmware from the host.
+  * @retval HAL status
+  */
+static HAL_StatusTypeDef FW_UPDATE_DownloadNewFirmware(SFU_FwImageFlashTypeDef *pFwImageDwlArea)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  COM_StatusTypeDef e_result;
+  uint32_t u_fw_size;
+  YMODEM_CallbacksTypeDef ymodemCb = {Ymodem_HeaderPktRxCpltCallback, Ymodem_DataPktRxCpltCallback};
+
+  printf("  -- Send Firmware \r\n\n");
+  /* Refresh Watchdog */
+  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+  /* Clear download area */
+  printf("  -- -- Erasing download area ...\r\n\n");
+  if ((ret = FLASH_If_Erase_Size((void *)(pFwImageDwlArea->DownloadAddr), pFwImageDwlArea->MaxSizeInBytes)) == HAL_OK)
+  {
+    /* Download binary */
+    printf("  -- -- File> Transfer> YMODEM> Send ");
+
+    /*Init of Ymodem*/
+    Ymodem_Init();
+
+    /*Receive through Ymodem*/
+    e_result = Ymodem_Receive(&u_fw_size, pFwImageDwlArea->DownloadAddr, &ymodemCb);
+    printf("\r\n\n");
+
+    if ((e_result == COM_OK))
+    {
+      printf("  -- -- Programming Completed Successfully!\r\n\n");
+      printf("  -- -- Bytes: %d\r\n\n", u_fw_size);
+      ret = HAL_OK;
+    }
+    else if (e_result == COM_ABORT)
+    {
+      printf("  -- -- !!Aborted by user!!\r\n\n");
+      ret = HAL_ERROR;
+    }
+    else
+    {
+      printf("  -- -- !!Error during file download!!\r\n\n");
+      ret = HAL_ERROR;
+    }
+  }
+  return ret;
+}
+#endif /* !(EXTERNAL_LOADER) */
+
+#if defined(EXTERNAL_LOADER)
+/**
+  * @brief  Run validation of a FW image menu.
+  * @param  None
+  * @retval None.
+  */
+void FW_VALIDATE_RunMenu(void)
+{
+  printf("  Feature not supported ! \r\n");
+}
+
+#else
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+/**
+  * @brief  Display the validation firmware menu choices on hyperterminal
+  * @param  None.
+  * @retval None.
+  */
+static void FW_VALIDATE_PrintMenu(void)
+{
+  printf("\r\n========== Validation of FW Image ============\r\n\n");
+  printf("  Validate all firmwares ------------------------- 0\r\n\n");
+  printf("  Validate firmware of SLOT_ACTIVE_1 ------------- 1\r\n\n");
+  printf("  Validate firmware of SLOT_ACTIVE_2 ------------- 2\r\n\n");
+  printf("  Validate firmware of SLOT_ACTIVE_3 ------------- 3\r\n\n");
+  printf("  Previous Menu ---------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+
+/**
+  * @brief  Run validation of a FW image menu.
+  * @param  None
+  * @retval None.
+  */
+void FW_VALIDATE_RunMenu(void)
+{
+#if defined(ENABLE_IMAGE_STATE_HANDLING)
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+  SE_FwStateTypeDef fw_state = FWIMG_STATE_INVALID;
+
+  /*Print Main Menu message*/
+  FW_VALIDATE_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '0' :
+          slot_number = VALID_ALL_SLOTS;
+          break;
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          break;
+        case '2' :
+          slot_number = SLOT_ACTIVE_2;
+          break;
+        case '3' :
+          slot_number = SLOT_ACTIVE_3;
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (slot_number != 0U)
+      {
+        if ((slot_number != ALL_SLOTS) && (SlotStartAdd[slot_number] == 0U))
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          SE_APP_GetActiveFwState(&se_Status, slot_number, &fw_state);
+          if (fw_state != FWIMG_STATE_SELFTEST )
+          {
+            printf("Firmware not is SELF_TEST state\r\n");
+          }
+          else
+          {
+            se_retCode = SE_APP_ValidateFw(&se_Status, slot_number);
+            if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+            {
+              printf("Firmware validated\r\n");
+            }
+            else
+            {
+              printf("Firmware validation failure\r\n");
+            }
+          }
+        }
+        /*Print Main Menu message*/
+        FW_VALIDATE_PrintMenu();
+      }
+    }
+  }
+#else
+  printf("  Feature not supported ! \r\n");
+#endif /* (ENABLE_IMAGE_STATE_HANDLING) */
+}
+#endif /* EXTERNAL_LOADER */
+
+
+
+#if !defined(EXTERNAL_LOADER)
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize Dimension of the file that will be received (Bytes).
+  * @retval None
+  */
+HAL_StatusTypeDef Ymodem_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (PACKET_1K_SIZE - 1U)) / PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (PACKET_SIZE - 1U)) / PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return HAL_OK;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData Pointer to the buffer.
+  * @param  uSize Packet dimension (Bytes).
+  * @retval None
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
+{
+  /* Start address of downloaded area : initialized with first packet (header) */
+  static uint32_t m_uDwlImgStart = 0U;
+
+  /* End address of downloaded Image : initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgEnd = 0U;
+
+  /* Current destination address for data packet : initialized with first packet (header), incremented at each
+     flash write */
+  static uint32_t m_uDwlImgCurrent = 0U;
+
+  HAL_StatusTypeDef e_ret_status = HAL_OK;
+  uint32_t uLength;
+  uint32_t uOldSize;
+#if !defined(SFU_NO_SWAP)
+  SE_FwRawHeaderTypeDef fw_header_dwl;
+#endif /* (SFU_NO_SWAP) */
+
+  m_uPacketsReceived++;
+
+  /*Increase the number of received packets*/
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem) /*Last Packet*/
+  {
+    /*Extracting actual payload from last packet*/
+    if (0 == (m_uFileSizeYmodem % PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      uSize = PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      uSize = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / PACKET_1K_SIZE) * PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains header information: PartialFwSize and PartialFwOffset information */
+  if (m_uPacketsReceived == 1)
+  {
+    /* Start of Download area */
+    m_uDwlImgStart = uFlashDestination;
+
+    /* Initialize Current destination address for data packet */
+    m_uDwlImgCurrent = uFlashDestination;
+
+    /* End of Image to be downloaded */
+#if defined(SFU_NO_SWAP)
+    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->FwSize + SFU_IMG_IMAGE_OFFSET;
+#else
+    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->PartialFwSize
+                   + (((SE_FwRawHeaderTypeDef *)pData)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))
+                   + SFU_IMG_IMAGE_OFFSET;
+#endif /* SFU_NO_SWAP */
+  }
+
+  /* This packet : contains end of FW header */
+  if ((m_uDwlImgCurrent < (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)) &&
+      ((m_uDwlImgCurrent + uSize) >= (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)))
+  {
+    /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE bytes length) */
+    uLength = SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE;
+    if (uLength == 0)
+    {
+      uLength = PACKET_1K_SIZE;
+    }
+    if (FLASH_If_Write((void *)m_uDwlImgCurrent, pData, uLength) == HAL_OK)
+    {
+#if defined(SFU_NO_SWAP)
+      m_uDwlImgCurrent += uLength;
+#else
+      /*
+       * Read header from dwl area : in some configuration header can be transmitted with 2 YMODEM packets
+       * ==> pData contains only the last part of the header and cannot be used to retrieve PartialFwOffset
+       */
+      e_ret_status = FLASH_If_Read((uint8_t *)&fw_header_dwl, (void *) m_uDwlImgStart, SE_FW_HEADER_TOT_LEN);
+
+      /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
+      m_uDwlImgCurrent += uLength + fw_header_dwl.PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+#endif /* SFU_NO_SWAP */
+
+      /* Update remaining packet size to write */
+      uSize -= uLength;
+
+      /* Update pData pointer to received packet data */
+      pData += uLength;
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  /* Skip data write if all has been already written as part of the header */
+  if (uSize != 0U)
+  {
+    /*Adjust dimension to unitary flash programming length */
+    if (uSize % FLASH_IF_MIN_WRITE_LEN != 0U)
+    {
+      uOldSize = uSize;
+      uSize += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
+      m_uDwlImgEnd += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
+      while (uOldSize < uSize)
+      {
+        pData[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+
+    /* Write Data in Flash - size has to be 64-bit aligned */
+
+    /* Write in flash only if not beyond allowed area */
+    if (((m_uDwlImgCurrent + uSize) <= m_uDwlImgEnd) && (e_ret_status == HAL_OK))
+    {
+      if (FLASH_If_Write((void *)m_uDwlImgCurrent, pData, uSize) == HAL_OK)
+      {
+        e_ret_status = HAL_OK;
+
+        /* Move Current destination address for next packet */
+        m_uDwlImgCurrent += uSize;
+      }
+      else
+      {
+        e_ret_status = HAL_ERROR;
+      }
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == HAL_ERROR)
+  {
+
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+  return e_ret_status;
+}
+#else
+/* Minicom YMODEM */
+HAL_StatusTypeDef Ymodem_DataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
+{
+  /* Start address of downloaded area : initialized with first packet (header) */
+  static uint32_t m_uDwlImgStart = 0U;
+
+  /* End address of downloaded Image : initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgEnd = 0U;
+
+  /* Current destination address for data packet : initialized with first packet (header), incremented at each
+     flash write */
+  static uint32_t m_uDwlImgCurrent = 0U;
+
+  HAL_StatusTypeDef e_ret_status = HAL_OK;
+  uint32_t uLength;
+  uint32_t uOldSize;
+  SE_FwRawHeaderTypeDef fw_header_dwl;
+
+  m_uPacketsReceived++;
+
+  /*Increase the number of received packets*/
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem) /*Last Packet*/
+  {
+    /*Extracting actual payload from last packet*/
+    if (0 == (m_uFileSizeYmodem % PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      uSize = PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      uSize = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / PACKET_SIZE) * PACKET_SIZE);
+    }
+  }
+
+  /* First packet : Contains header information: PartialFwSize and PartialFwOffset information */
+  if (m_uPacketsReceived == 1)
+  {
+    /* Start of Download area */
+    m_uDwlImgStart = uFlashDestination;
+
+    /* Initialize Current destination address for data packet */
+    m_uDwlImgCurrent = uFlashDestination;
+
+    /* End of Image to be downloaded */
+#if defined(SFU_NO_SWAP)
+    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->FwSize + SFU_IMG_IMAGE_OFFSET;
+#else
+    m_uDwlImgEnd = uFlashDestination + ((SE_FwRawHeaderTypeDef *)pData)->PartialFwSize
+                   + (((SE_FwRawHeaderTypeDef *)pData)->PartialFwOffset % SLOT_SIZE(SLOT_SWAP))
+                   + SFU_IMG_IMAGE_OFFSET;
+#endif /* SFU_NO_SWAP */
+
+  }
+
+  /* This packet : contains end of FW header */
+  if ((m_uDwlImgCurrent < (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)) &&
+      ((m_uDwlImgCurrent + uSize) >= (m_uDwlImgStart + SFU_IMG_IMAGE_OFFSET)))
+  {
+    /* Write the FW header part (SFU_IMG_IMAGE_OFFSET % PACKET_1K_SIZE bytes length) */
+    uLength = SFU_IMG_IMAGE_OFFSET % PACKET_SIZE;
+    if (uLength == 0)
+    {
+      uLength = PACKET_SIZE;
+    }
+
+    memcpy(alignedBuffer, pData, uLength);
+
+    if (FLASH_If_Write((void *)m_uDwlImgCurrent, alignedBuffer, uLength) == HAL_OK)
+    {
+#if defined(SFU_NO_SWAP)
+      m_uDwlImgCurrent += uLength;
+#else
+      /*
+       * Read header from dwl area : in some configuration header can be transmitted with 2 YMODEM packets
+       * ==> pData contains only the last part of the header and cannot be used to retrieve PartialFwOffset
+       */
+      e_ret_status = FLASH_If_Read((uint8_t *)&fw_header_dwl, (void *) m_uDwlImgStart, SE_FW_HEADER_TOT_LEN);
+      /* Shift the DWL area pointer, to align image with (PartialFwOffset % sector size) in DWL area */
+      m_uDwlImgCurrent += uLength + fw_header_dwl.PartialFwOffset % SLOT_SIZE(SLOT_SWAP);
+#endif /* SFU_NO_SWAP */
+
+      /* Update remaining packet size to write */
+      uSize -= uLength;
+
+      /* Update pData pointer to received packet data */
+      pData += uLength;
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+  /* Skip data write if all has been already written as part of the header */
+  if (uSize != 0U)
+  {
+    /*Adjust dimension to unitary flash programming length */
+    if (uSize % FLASH_IF_MIN_WRITE_LEN != 0U)
+    {
+      uOldSize = uSize;
+      uSize += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
+      m_uDwlImgEnd += (FLASH_IF_MIN_WRITE_LEN - (uSize % FLASH_IF_MIN_WRITE_LEN));
+      while (uOldSize < uSize)
+      {
+        pData[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+
+    /* Write Data in Flash - size has to be 64-bit aligned */
+
+
+    /* Write in flash only if not beyond allowed area */
+    if (((m_uDwlImgCurrent + uSize) <= m_uDwlImgEnd) && (e_ret_status == HAL_OK))
+    {
+      memcpy(alignedBuffer, pData, uSize);
+
+      if (FLASH_If_Write((void *)m_uDwlImgCurrent, alignedBuffer, uSize) == HAL_OK)
+      {
+        e_ret_status = HAL_OK;
+
+        /* Move Current destination address for next packet */
+        m_uDwlImgCurrent += uSize;
+      }
+      else
+      {
+        e_ret_status = HAL_ERROR;
+      }
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == HAL_ERROR)
+  {
+
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+#endif /* !(EXTERNAL_LOADER) */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/kms_object_update_app.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/kms_object_update_app.c
new file mode 100644
index 00000000..8d20c63b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/kms_object_update_app.c
@@ -0,0 +1,339 @@
+/**
+  ******************************************************************************
+  * @file    kms_object_update_app.c
+  * @author  MCD Application Team
+  * @brief   Firmware Update module.
+  *          This file provides set of firmware functions to manage KMS
+  *          Update functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "ymodem.h"
+#include "stm32wlxx_hal.h"
+#include "fw_update_app.h"
+
+#include "sfu_app_new_image.h"
+#include "sfu_fwimg_regions.h"
+
+#include "mpu.h"
+
+#include "string.h"
+
+#include "kms.h"
+#include "pkcs11.h"
+#include "kms_blob_metadata.h"
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  FW_UPDATE Firmware Update Example
+  * @{
+  */
+static uint32_t m_uFileSizeYmodem = 0U;  /* !< Ymodem File size*/
+static uint32_t m_uNbrBlocksYmodem = 0U; /* !< Ymodem Number of blocks*/
+static uint32_t m_uPacketsReceived = 0U; /* !< Ymodem packets received*/
+
+
+/** @defgroup  FW_UPDATE_Private_Functions Private Functions
+  * @{
+  */
+static void KMS_UPDATE_PrintMenu(void);
+static HAL_StatusTypeDef KMS_UPDATE_ImportBlob(SFU_FwImageFlashTypeDef *pFwImageDwlArea);
+
+HAL_StatusTypeDef KMS_UPDATE_GetDownloadAreaInfo(SFU_FwImageFlashTypeDef *pArea);
+void KMS_UPDATE_StartLocalUpdate(void);
+
+
+HAL_StatusTypeDef Ymodem_BlobHeaderPktRxCpltCallback(uint32_t uFileSize);
+HAL_StatusTypeDef Ymodem_BlobDataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize);
+
+/**
+  * @}
+  */
+/** @defgroup  FW_UPDATE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup  FW_UPDATE_Control_Functions Control Functions
+  * @{
+   */
+
+/**
+  * @brief  Provide the area descriptor to write a KMS image in Flash.
+  *         This function is used by the User Application to know where to store a new KMS Blob Image before asking for
+  *         its installation.
+  * @param  pArea pointer to area descriptor
+  * @retval HAL_OK if successful, otherwise HAL_ERROR
+  */
+HAL_StatusTypeDef KMS_UPDATE_GetDownloadAreaInfo(SFU_FwImageFlashTypeDef *pArea)
+{
+  HAL_StatusTypeDef ret;
+  if (pArea != NULL)
+  {
+    pArea->DownloadAddr = SlotStartAdd[SLOT_DWL_1];
+    pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(SLOT_DWL_1);
+    pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
+    ret =  HAL_OK;
+  }
+  else
+  {
+    ret = HAL_ERROR;
+  }
+  return ret;
+}
+
+
+/**
+  * @brief  Run KMS Blob Update process.
+  * @param  None
+  * @retval HAL Status.
+  */
+void KMS_UPDATE_StartLocalUpdate(void)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  uint8_t  fw_header_input[SE_FW_HEADER_TOT_LEN];
+  SFU_FwImageFlashTypeDef fw_image_dwl_area;
+
+  /* Print Firmware Update welcome message */
+  KMS_UPDATE_PrintMenu();
+
+  /* Get Info about the download area */
+  if (KMS_UPDATE_GetDownloadAreaInfo(&fw_image_dwl_area) != HAL_ERROR)
+  {
+    /* Download new blob image*/
+    ret = KMS_UPDATE_ImportBlob(&fw_image_dwl_area);
+
+    if (HAL_OK == ret)
+    {
+      /* Read header in SWAP Area */
+      (void)memcpy(fw_header_input, (uint32_t *)(fw_image_dwl_area.DownloadAddr), sizeof(fw_header_input));
+
+      /* Ask for installation at next reset */
+      /* FOR KMS, data are directly written to the SWAP Area. */
+      /* So in the next reset, we will detect that a KMS Header is present */
+      /* This will launch a call to KMS ImportBlob */
+
+      /* System Reboot*/
+      (void)printf("  -- Image correctly downloaded - reboot\r\n\n");
+      HAL_Delay(1000U);
+      SVC_NVIC_SystemReset();
+    }
+  }
+
+  if (ret != HAL_OK)
+  {
+    (void)printf("  -- !!Operation failed!! \r\n\n");
+  }
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup  FW_UPDATE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the KMS Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+static void KMS_UPDATE_PrintMenu(void)
+{
+  (void)printf("\r\n================ New KMS Blob Download =========================\r\n\n");
+}
+
+/**
+  * @brief Download a new BLOB from the host.
+  * @retval HAL status
+  */
+static HAL_StatusTypeDef KMS_UPDATE_ImportBlob(SFU_FwImageFlashTypeDef *pFwImageDwlArea)
+{
+  HAL_StatusTypeDef ret;
+  COM_StatusTypeDef e_result;
+  uint32_t u_fw_size;
+  YMODEM_CallbacksTypeDef ymodemCb = {Ymodem_BlobHeaderPktRxCpltCallback, Ymodem_BlobDataPktRxCpltCallback};
+
+  (void)printf("  -- Send KMS Blob \r\n\n");
+  /* Refresh Watchdog */
+  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+  /* Clear download area */
+  (void)printf("  -- -- Erasing download area ...\r\n\n");
+  ret = FLASH_If_Erase_Size((uint32_t *)(pFwImageDwlArea->DownloadAddr), pFwImageDwlArea->MaxSizeInBytes);
+  if (ret == HAL_OK)
+  {
+    /* Download binary */
+    (void)printf("  -- -- File> Transfer> YMODEM> Send ");
+
+    /*Init of Ymodem*/
+    Ymodem_Init();
+
+    /*Receive through Ymodem*/
+    e_result = Ymodem_Receive(&u_fw_size, pFwImageDwlArea->DownloadAddr, &ymodemCb);
+    (void)printf("\r\n\n");
+
+    if ((e_result == COM_OK))
+    {
+      (void)printf("  -- -- Programming Completed Successfully!\r\n\n");
+      (void)printf("  -- -- Bytes: %d\r\n\n", u_fw_size);
+      ret = HAL_OK;
+    }
+    else if (e_result == COM_ABORT)
+    {
+      (void)printf("  -- -- !!Aborted by user!!\r\n\n");
+      ret = HAL_ERROR;
+    }
+    else
+    {
+      (void)printf("  -- -- !!Error during file download!!\r\n\n");
+      ret = HAL_ERROR;
+    }
+  }
+  return ret;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize Dimension of the file that will be received (Bytes).
+  * @retval None
+  */
+HAL_StatusTypeDef Ymodem_BlobHeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /* compute the number of 1K blocks */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (PACKET_1K_SIZE - 1U)) / PACKET_1K_SIZE;
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return HAL_OK;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData Pointer to the buffer.
+  * @param  uSize Packet dimension (Bytes).
+  * @retval None
+  */
+HAL_StatusTypeDef Ymodem_BlobDataPktRxCpltCallback(uint8_t *pData, uint32_t uFlashDestination, uint32_t uSize)
+{
+  /* End address of downloaded Image : initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgEnd = 0U;
+  /* Current destination address for data packet : initialized with first packet (header), incremented at each flash
+     write */
+  static uint32_t m_uDwlImgCurrent = 0U;
+  uint32_t tmpSize = uSize;
+
+  HAL_StatusTypeDef e_ret_status;
+
+  m_uPacketsReceived++;
+
+  /*Increase the number of received packets*/
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem) /*Last Packet*/
+  {
+    /*Extracting actual payload from last packet*/
+    if (0UL == (m_uFileSizeYmodem % PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      tmpSize = PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      tmpSize = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / PACKET_1K_SIZE) * PACKET_1K_SIZE);
+    }
+
+    m_uPacketsReceived = 0U;
+  }
+
+  /* First packet : Contains the FW header */
+  if (m_uPacketsReceived == 1UL)
+  {
+    /* End of Image to be downloaded */
+    m_uDwlImgEnd = uFlashDestination + ((KMS_BlobRawHeaderTypeDef *)(uint32_t)pData)->BlobSize + KMS_BLOB_IMG_OFFSET;
+    /* Initialize Current destination address for data packet */
+    m_uDwlImgCurrent = uFlashDestination;
+  }
+
+  /*Adjust dimension to 64-bit length */
+  if ((tmpSize % FLASH_IF_MIN_WRITE_LEN) != 0U)
+  {
+    tmpSize += (FLASH_IF_MIN_WRITE_LEN - (tmpSize % FLASH_IF_MIN_WRITE_LEN));
+    m_uDwlImgEnd += (FLASH_IF_MIN_WRITE_LEN - (tmpSize % FLASH_IF_MIN_WRITE_LEN));
+  }
+
+  /* Write Data in Flash - size has to be 64-bit aligned */
+
+  /* Write in flash only if not beyond allowed area */
+  if ((m_uDwlImgCurrent + tmpSize) <= m_uDwlImgEnd)
+  {
+    if (FLASH_If_Write((uint32_t *)m_uDwlImgCurrent, pData, tmpSize) == HAL_OK)
+    {
+      e_ret_status = HAL_OK;
+      m_uDwlImgCurrent += tmpSize;
+    }
+    else
+    {
+      e_ret_status = HAL_ERROR;
+    }
+  }
+  else
+  {
+    e_ret_status = HAL_ERROR;
+  }
+
+  if (e_ret_status == HAL_ERROR)
+  {
+
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/main.c
new file mode 100644
index 00000000..aa202a09
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/main.c
@@ -0,0 +1,305 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Firmware Update, protections
+  *          and crypto testing functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "flash_if.h"
+#include "se_interface_application.h"
+#include "common.h"
+#include "test_protections.h"
+#include "fw_update_app.h"
+#include "se_user_code.h"
+#include "mpu.h"
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "tkms_app.h"
+#endif /* KMS_ENABLED */
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+#define USER_APP_NBLINKS  ((uint8_t) 1U)
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+uint8_t *pUserAppId;
+const uint8_t UserAppId = 'A';
+SE_ErrorStatus eRetStatus = SE_ERROR;
+SE_StatusTypeDef eStatus;
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+void FW_APP_PrintMainMenu(void);
+void FW_APP_Run(void);
+
+/**
+  * @brief  Main program
+  * @param  None
+  * @retval None
+  */
+int main(void)
+{
+  uint32_t i = 0U;
+  /*  set example to const : this const changes in binary without rebuild */
+  pUserAppId = (uint8_t *)&UserAppId;
+
+  /* STM32WLxx HAL library initialization:
+  - Configure the Flash prefetch
+  - Systick timer is configured by default as source of time base, but user
+  can eventually implement his proper time base source (a general purpose
+  timer for example or other time source), keeping in mind that Time base
+  duration should be kept 1ms since PPP_TIMEOUT_VALUEs are defined and
+  handled in milliseconds basis.
+  - Set NVIC Group Priority to 4
+  - Low Level Initialization
+  */
+  HAL_Init();
+
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* Flash driver initialization*/
+  FLASH_If_Init();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+
+  /* LED Init*/
+  BSP_LED_Init(LED_GREEN);
+  for (i = 0U; i < USER_APP_NBLINKS; i++)
+  {
+    BSP_LED_Toggle(LED_GREEN);
+    HAL_Delay(100U);
+    BSP_LED_Toggle(LED_GREEN);
+    HAL_Delay(100U);
+    BSP_LED_Toggle(LED_GREEN);
+    HAL_Delay(100U);
+    BSP_LED_Toggle(LED_GREEN);
+    HAL_Delay(100U);
+  }
+
+  /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register*/
+  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+  /* Configure Communication module */
+  COM_Init();
+
+  /* Configure button in EXTI mode */
+  BUTTON_INIT_EXTI();
+
+  printf("\r\n======================================================================");
+  printf("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  printf("\r\n=                                                                    =");
+  printf("\r\n=                          User App #%c                               =", *pUserAppId);
+  printf("\r\n======================================================================");
+  printf("\r\n\r\n");
+
+  MPU_EnterUnprivilegedMode();
+
+  /* User App firmware runs*/
+  FW_APP_Run();
+
+  while (1U)
+  {}
+
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void FW_APP_PrintMainMenu(void)
+{
+  printf("\r\n=================== Main Menu ============================\r\n\n");
+  printf("  Download a new Fw Image ------------------------------- 1\r\n\n");
+  printf("  Test Protections -------------------------------------- 2\r\n\n");
+  printf("  Test SE User Code ------------------------------------- 3\r\n\n");
+  printf("  Multiple download ------------------------------------- 4\r\n\n");
+  printf("  Validate a FW Image------------------------------------ 5\r\n\n");
+#ifdef KMS_ENABLED
+  printf("  Test tKMS --------------------------------------------- a\r\n\n");
+#endif /* KMS_ENABLED */
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void FW_APP_Run(void)
+{
+  uint8_t key = 0U;
+
+  /* Print Main Menu message*/
+  FW_APP_PrintMainMenu();
+
+  while (1U)
+  {
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          FW_UPDATE_Run();
+          break;
+        case '2' :
+          TEST_PROTECTIONS_RunMenu();
+          break;
+        case '3' :
+          SE_USER_CODE_RunMenu();
+          break;
+        case '4' :
+          FW_UPDATE_MULTIPLE_RunMenu();
+          break;
+        case '5' :
+          FW_VALIDATE_RunMenu();
+          break;
+#ifdef KMS_ENABLED
+        case 'a' :
+          tkms_app_menu();
+          break;
+#endif /* KMS_ENABLED */
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      /*Print Main Menu message*/
+      FW_APP_PrintMainMenu();
+    }
+
+    BSP_LED_Toggle(LED_GREEN);
+  }
+}
+
+
+#ifdef  USE_FULL_ASSERT
+
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* User can add his own implementation to report the file name and line number,
+   ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+
+  /* Infinite loop */
+  while (1U)
+  {
+  }
+}
+#endif /* USE_FULL_ASSERT */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c
new file mode 100644
index 00000000..132d01ea
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/mpu.c
@@ -0,0 +1,181 @@
+/**
+  ******************************************************************************
+  * @file    mpu.c
+  * @author  MCD Application Team
+  * @brief   virtual HAL api for non privilieged :
+  *          implementing HAL service performing access to register being
+  *          mapped by mpu  on privilieged area
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "mpu.h"
+#include "se_def.h"
+#include "se_interface_application.h"
+#include "common.h"
+#include "flash_if.h"
+#include "se_callgate.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+#define HAL_SVC_NVIC_SYSTEM_RESET            0
+#define HAL_SVC_MPU_DISABLE                  1
+
+static void HAL_SysCall(uint32_t syscall, ...);
+
+/**
+  * @brief This functions triggers a HAL system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+#if defined (__ICCARM__) || defined(__GNUC__)
+static void HAL_SysCall(uint32_t syscall, ...)
+{
+#if defined ( __GNUC__ )
+  /*
+    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
+    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
+    */
+  __ASM volatile("MOV r0, %0" : : "r"(syscall));
+#endif /* __GNUC__ */
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+    */
+  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate HAL syscall */
+}
+#elif defined(__CC_ARM)
+/*
+  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
+  * caller is in same file. Defining the function as ASM avoids the issue.
+  */
+static void __ASM HAL_SysCall(uint32_t syscall, ...)
+{
+  /*
+   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+   * example an SVC.
+   * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+   */
+  SVC #1
+  BX LR
+}
+#endif /* (__ICCARM__) || defined(__GNUC__) */
+
+/**
+  * @brief  Request a system reset after switching in privileged mode.
+  * @param  None
+  * @retval None
+  */
+void SVC_NVIC_SystemReset(void)
+{
+  HAL_SysCall(HAL_SVC_NVIC_SYSTEM_RESET);
+}
+
+
+/**
+  * @brief  Request to disable the MPU after switching in privileged mode.
+  * @param  None
+  * @retval None
+  */
+void SVC_MPU_Disable(void)
+{
+  HAL_SysCall(HAL_SVC_MPU_DISABLE);
+}
+
+
+/**
+  * @brief This is the Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  * @note Installed in startup_stm32xxxx.s
+  *
+  * This handler handles 2 requests:
+  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter (see @ref
+  * \li SE_FunctionIDTypeDef)
+  * \li HAL SVC: run a HAL privileged operation provided as a parameter
+  */
+void MPU_SVC_Handler(uint32_t *args)
+{
+  uint8_t code = ((char *)args[6])[-2];
+  switch (code)
+  {
+    case 0: /* SE SVC CALL */
+    {
+      SE_APP_SVC_Handler(args);
+      break;
+    }
+    case 1:  /* HAL SVC CALL */
+    {
+      HAL_APP_SVC_Handler(args);
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+}
+/**
+  * @brief This is the HAL Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  *
+  * This handler handles 2 requests:
+  * \li NVIC system reset
+  * \li MPU disable request
+  */
+void HAL_APP_SVC_Handler(uint32_t *args)
+{
+  switch (args[0])
+  {
+    case HAL_SVC_NVIC_SYSTEM_RESET :  /* HAL NVIC system reset */
+    {
+      HAL_NVIC_SystemReset();
+      break;
+    }
+    case HAL_SVC_MPU_DISABLE :        /* HAL Disable MPU */
+    {
+      HAL_MPU_Disable();
+      break;
+    }
+    default:
+    {
+      HAL_NVIC_SystemReset();
+      break;
+    }
+  }
+}
+
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void MPU_EnterUnprivilegedMode(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
+  __set_CONTROL(__get_CONTROL() | 3); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c
new file mode 100644
index 00000000..f3dc21d2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/se_user_code.c
@@ -0,0 +1,273 @@
+/**
+  ******************************************************************************
+  * @file    se_user_code.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine User code example module.
+  *          This file demonstrates how to call user defined services running
+  *          in Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+#include "com.h"
+#include "common.h"
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "se_user_code.h"
+#include "mpu.h"
+#include "se_interface_application.h"
+#include "sfu_fwimg_regions.h"
+#include <string.h> /* needed for memset */
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  SE_USER_CODE Secure Engine User Code Example
+  * @brief Example of user defined code running in Secure Engine.
+  *        This code provides user defined services to the user application.
+  * @{
+  */
+
+/** @defgroup  SE_USER_CODE_Private_Variables Private Variables
+  * @{
+  */
+static uint32_t IrqState[1] = {0x00UL};
+/**
+  * @}
+  */
+
+/** @defgroup  SE_USER_CODE_Private_Functions Private Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the SE_USER_CODE Menu choices on hyperterminal
+  * @param  None.
+  * @retval None.
+  */
+static void SE_USER_CODE_PrintMenu(void)
+{
+  printf("\r\n=== Call User Defined Code running in Secure Engine ===\r\n\n");
+  printf("  Get firmware information of SLOT_ACTIVE_1 ------------- 1\r\n\n");
+  printf("  Get firmware information of SLOT_ACTIVE_2 ------------- 2\r\n\n");
+  printf("  Save and Disable IRQ ---------------------------------- a\r\n\n");
+  printf("  Restore and Enable IRQ -------------------------------- b\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Get FW information.
+  * @param  SlotNumber slot identification
+  * @retval HAL Status.
+  */
+static void SE_USER_CODE_GetFwInfo(uint32_t SlotNumber)
+{
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+  SE_APP_ActiveFwInfo_t sl_FwInfo;
+
+  memset(&sl_FwInfo, 0xFF, sizeof(SE_APP_ActiveFwInfo_t));
+
+
+  printf("If the Secure User Memory is enabled you should not be able to call a SE service and get stuck.\r\n\n");
+  printf("  -- Calling FwInfo service.\r\n\n");
+  printf("Press the RESET button to restart the device (or wait until IWDG expires if enabled).\r\n\n");
+
+  /* Get FW info */
+  se_retCode = SE_APP_GetActiveFwInfo(&se_Status, SlotNumber, &sl_FwInfo);
+
+  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+  {
+    /* Print the result */
+    printf("Firmware Info:\r\n");
+    printf("\tActiveFwVersion: %d\r\n", sl_FwInfo.ActiveFwVersion);
+    printf("\tActiveFwSize: %d bytes\r\n", sl_FwInfo.ActiveFwSize);
+  }
+  else
+  {
+    /* Failure */
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+
+  /* This point should not be reached */
+  printf("  -- !! Secure User Memory protection is NOT ENABLED !!\r\n\n");
+}
+
+/**
+  * @brief  Disable the IRQ and print saved IRQ configuration
+  * @param  None.
+  * @retval None.
+  */
+void SE_USER_CODE_DisableIrq(void)
+{
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+
+  se_retCode = SE_SYS_SaveDisableIrq(&se_Status, &IrqState[0], 1);
+
+  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+  {
+    /* Print the result */
+    printf("IRQ saved: 0x%08X\r\n", IrqState[0]);
+    printf("IRQ disabled\r\n");
+  }
+  else
+  {
+    /* Failure */
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+}
+
+/**
+  * @brief  Restore saved IRQ configuration
+  * @param  None.
+  * @retval None.
+  */
+void SE_USER_CODE_EnableIrq(void)
+{
+  SE_ErrorStatus se_retCode = SE_ERROR;
+  SE_StatusTypeDef se_Status = SE_KO;
+
+  se_retCode = SE_SYS_RestoreEnableIrq(&se_Status, &IrqState[0], 1);
+
+  if ((SE_SUCCESS == se_retCode) && (SE_OK == se_Status))
+  {
+    /* Print the result */
+    printf("IRQ restored: 0x%08X\r\n", IrqState[0]);
+    printf("IRQ enabled\r\n");
+  }
+  else
+  {
+    /* Failure */
+    printf("  -- !!Operation failed!! \r\n\n");
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/** @addtogroup  SE_USER_CODE_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Run get firmware info menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+void SE_USER_CODE_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+
+  /*Print Main Menu message*/
+  SE_USER_CODE_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          if (SlotStartAdd[slot_number] == 0U)
+          {
+            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+          }
+          else
+          {
+            SE_USER_CODE_GetFwInfo(slot_number);
+          }
+          break;
+        case '2' :
+          slot_number = SLOT_ACTIVE_2;
+          if (SlotStartAdd[slot_number] == 0U)
+          {
+            printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+          }
+          else
+          {
+            SE_USER_CODE_GetFwInfo(slot_number);
+          }
+          break;
+        case 'a':
+          SE_USER_CODE_DisableIrq();
+          break;
+        case 'b':
+          SE_USER_CODE_EnableIrq();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if ((exit != 1U) && (key != 'a') && (key != 'b'))
+      {
+        if (SlotStartAdd[slot_number] == 0U)
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          SE_USER_CODE_GetFwInfo(slot_number);
+        }
+
+        /*Print Main Menu message*/
+        SE_USER_CODE_PrintMenu();
+      }
+      else if (exit != 1U)
+      {
+        /*Print Main Menu message*/
+        SE_USER_CODE_PrintMenu();
+      }
+    }
+  }
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/sfu_app_new_image.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/sfu_app_new_image.c
new file mode 100644
index 00000000..632eb5f4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/sfu_app_new_image.c
@@ -0,0 +1,99 @@
+/**
+  ******************************************************************************
+  * @file    sfu_app_new_image.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware
+  *          Image storage and installation.
+  *          This file contains the services the user application can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the local loader thanks to a similar
+  *          file integrated in SB_SFU.
+  * @note    This file is compiled in the scope of the User Application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_APP_NEW_IMAGE_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include "flash_if.h"
+#include "sfu_app_new_image.h"
+#include "sfu_fwimg_regions.h"
+#include "se_def_metadata.h"
+#include <string.h> /* needed for memset (see WriteInstallHeader)*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if  !defined(SFU_NO_SWAP)
+/**
+  * @brief  Write the header of the firmware to install
+  * @param  pfw_header pointer to header to write.
+  * @retval HAL_OK on success otherwise HAL_ERROR
+  */
+static HAL_StatusTypeDef WriteInstallHeader(uint8_t *pfw_header)
+{
+  HAL_StatusTypeDef ret = HAL_OK;
+
+  ret = FLASH_If_Erase_Size((void *) SlotStartAdd[SLOT_SWAP], SFU_IMG_IMAGE_OFFSET);
+  if (ret == HAL_OK)
+  {
+    ret = FLASH_If_Write((void *)SlotStartAdd[SLOT_SWAP], pfw_header, SE_FW_HEADER_TOT_LEN);
+  }
+  return ret;
+}
+#endif /* !SFU_NO_SWAP */
+
+/**
+  * @brief  Write in Flash the next header image to install.
+  *         This function is used by the User Application to request a Firmware installation (at next reboot).
+  * @param  fw_header FW header of the FW to be installed
+  * @retval HAL_OK if successful, otherwise HAL_ERROR
+  */
+HAL_StatusTypeDef SFU_APP_InstallAtNextReset(uint8_t *fw_header)
+{
+#if  !defined(SFU_NO_SWAP)
+  if (fw_header == NULL)
+  {
+    return HAL_ERROR;
+  }
+  if (WriteInstallHeader(fw_header) != HAL_OK)
+  {
+    return HAL_ERROR;
+  }
+  return HAL_OK;
+#else
+  return HAL_OK;                   /* Nothing to do */
+#endif /* !SFU_NO_SWAP */
+}
+
+/**
+  * @brief  Provide the area descriptor to write a FW image in Flash.
+  *         This function is used by the User Application to know where to store a new Firmware Image before asking for
+  *         its installation.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pArea pointer to area descriptor
+  * @retval HAL_OK if successful, otherwise HAL_ERROR
+  */
+
+void SFU_APP_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea)
+{
+  pArea->DownloadAddr = SlotStartAdd[DwlSlot];
+  pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(DwlSlot);
+  pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
+}
+
+#undef SFU_APP_NEW_IMAGE_C
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..bc6fc220
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c
@@ -0,0 +1,175 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+#include "test_protections.h"
+#include "mpu.h"
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+RTC_HandleTypeDef RtcHandle;
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+
+/******************************************************************************/
+/*            Cortex-M0+ Processor Exceptions Handlers                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles NMI exception.
+  * @param  None
+  * @retval None
+  */
+void NMI_Handler(void)
+{
+  /* Go to infinite loop when NMI exception occurs */
+  while (1)
+  {
+    printf("NMI exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Hard Fault exception.
+  * @param  None
+  * @retval None
+  */
+void HardFault_Handler(void)
+{
+  /* Go to infinite loop when Memory Manage exception occurs */
+  while (1)
+  {
+    printf("Hard Fault exception!\r");
+    NVIC_SystemReset();
+  }
+}
+
+
+/* SVC call handler is implemented in svc_handler.s */
+
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers             */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles Flash operation error interrupt request.
+  * @param  None
+  * @retval None
+  */
+void FLASH_IRQHandler(void)
+{
+  HAL_FLASH_IRQHandler();
+}
+
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void RTC_LSECSS_IRQHandler(void)
+{
+  /* Handle only the tamper enabled by SBSFU */
+  uint32_t tmp = READ_REG(TAMP->MISR) & RTC_TAMPER_ID;
+
+  /* Immediately clear flags to avoid eternal resets */
+  WRITE_REG(TAMP->SCR, tmp);
+
+  /* SRAM2 is erased and RtcHandle is corrupted: no specific handling is possible. */
+  NVIC_SystemReset();
+}
+
+/**
+  * @brief  This function handles TZIC interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TZIC_ILA_IRQHandler(void)
+{
+  HAL_GTZC_IRQHandler();
+}
+
+void BUTTON_IRQHANDLER(void)
+{
+  HAL_GPIO_EXTI_IRQHandler(BUTTON_EXTI_LINE);
+}
+
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  if (GPIO_Pin == BUTTON_EXTI_LINE)
+  {
+    printf("\r\nUser IRQ Handler: User Button pressed\r\n");
+  }
+}
+
+/**
+  * @brief  This function handles PPP interrupt request.
+  * @param  None
+  * @retval None
+  */
+/*void PPP_IRQHandler(void)
+{
+}*/
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c
new file mode 100644
index 00000000..bedef774
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c
@@ -0,0 +1,388 @@
+/**
+  ******************************************************************************
+  * @file    system_stm32wlxx.c
+  * @author  MCD Application Team
+  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
+  *
+  *   This file provides two functions and one global variable to be called from
+  *   user application:
+  *      - SystemInit(): This function is called at startup just after reset and
+  *                      before branch to main program. This call is made inside
+  *                      the "startup_stm32wlxx.s" file.
+  *
+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
+  *                                  by the user application to setup the SysTick
+  *                                  timer or configure other parameters.
+  *
+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
+  *                                 be called whenever the core clock is changed
+  *                                 during program execution.
+  *
+  *   After each device reset the MSI (4 MHz) is used as system clock source.
+  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
+  *   configure the system clock before to branch to main program.
+  *
+  *   This file configures the system clock as follows:
+  *=============================================================================
+  *-----------------------------------------------------------------------------
+  *        System Clock source                    | MSI
+  *-----------------------------------------------------------------------------
+  *        SYSCLK(Hz)                             | 4000000
+  *-----------------------------------------------------------------------------
+  *        HCLK(Hz)                               | 4000000
+  *-----------------------------------------------------------------------------
+  *        AHB Prescaler                          | 1
+  *-----------------------------------------------------------------------------
+  *        APB1 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        APB2 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_M                                  | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_N                                  | 8
+  *-----------------------------------------------------------------------------
+  *        PLL_P                                  | 7
+  *-----------------------------------------------------------------------------
+  *        PLL_Q                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLL_R                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_P                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_Q                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_R                              | NA
+  *-----------------------------------------------------------------------------
+  *        Require 48MHz for USB OTG FS,          | Disabled
+  *        SDIO and RNG clock                     |
+  *-----------------------------------------------------------------------------
+  *=============================================================================
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics. 
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup CMSIS
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_system
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_System_Private_Includes
+  * @{
+  */
+
+#include "stm32wlxx.h"
+
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (MSI_VALUE)
+   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
+#endif /* LSI_VALUE */
+
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Defines
+  * @{
+  */
+
+/* Note: Following vector table addresses must be defined in line with linker
+         configuration. */
+/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
+     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
+     at address 0x00 which correspond to automatic remap of boot address selected */
+/* #define USER_VECT_TAB_ADDRESS */
+#if defined(USER_VECT_TAB_ADDRESS)
+#ifdef CORE_CM0PLUS
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
+#else /* CORE_CM4 */
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+#endif
+#endif
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Variables
+  * @{
+  */
+  /* The SystemCoreClock variable is updated in three ways:
+      1) from within HAL_Init()
+      2) by calling CMSIS function SystemCoreClockUpdate()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
+  */
+  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
+
+  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
+
+  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
+
+  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
+    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Functions
+  * @{
+  */
+#if defined(__ARMCC_VERSION)
+extern void * __Vectors;
+#define INTVECT_START ((uint32_t) & __Vectors)
+#elif defined(__ICCARM__)
+extern uint32_t __vector_table;
+#define INTVECT_START ((uint32_t)& __vector_table)
+#elif defined(__GNUC__)
+extern void * g_pfnVectors;
+#define INTVECT_START ((uint32_t)& g_pfnVectors)
+#endif
+
+/**
+  * @brief  Setup the microcontroller system.
+  * @param  None
+  * @retval None
+  */
+void SystemInit(void)
+{
+  /* Configure the Vector Table location  ------------------*/
+  SCB->VTOR = INTVECT_START;
+
+  /* FPU settings ------------------------------------------------------------*/
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
+#endif
+
+  /* Reset the RCC clock configuration to the default reset state ------------*/
+  /* Set MSION bit */
+  RCC->CR |= RCC_CR_MSION;
+
+  /* Reset CFGR register */
+  RCC->CFGR = 0x00070000U;
+
+  /* Reset HSEON, CSSON , HSION, and PLLON bits */
+  /* RCC->CR &= 0xEAF6FFFFU; */
+  RCC->CR &= 0x2321EFF;
+
+  /* Reset PLLCFGR register */
+  RCC->PLLCFGR = 0x22040100;
+
+  /* Reset HSEBYP bit */
+  RCC->CR &= 0xFFDFFFFFFU;
+
+  /* Disable all interrupts */
+  RCC->CIER = 0x00000000U;
+}
+
+/**
+  * @brief  Update SystemCoreClock variable according to Clock Register Values.
+  *         The SystemCoreClock variable contains the core clock (HCLK), it can
+  *         be used by the user application to setup the SysTick timer or configure
+  *         other parameters.
+  *
+  * @note   Each time the core clock (HCLK) changes, this function must be called
+  *         to update SystemCoreClock variable value. Otherwise, any configuration
+  *         based on this variable will be incorrect.
+  *
+  * @note   - The system frequency computed by this function is not the real
+  *           frequency in the chip. It is calculated based on the predefined
+  *           constant and the selected clock source:
+  *
+  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
+  *
+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
+  *
+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
+  *
+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
+  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
+  *
+  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
+  *             4 MHz) but the real value may vary depending on the variations
+  *             in voltage and temperature.
+  *
+  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              16 MHz) but the real value may vary depending on the variations
+  *              in voltage and temperature.
+  *
+  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
+  *              frequency of the crystal used. Otherwise, this function may
+  *              have wrong result.
+  *
+  *         - The result of this function could be not correct when using fractional
+  *           value for HSE crystal.
+  *
+  * @param  None
+  * @retval None
+  */
+void SystemCoreClockUpdate(void)
+{
+  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
+
+ /* Get MSI Range frequency--------------------------------------------------*/
+
+   /* Get MSI Range frequency--------------------------------------------------*/
+   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
+   { /* MSISRANGE from RCC_CSR applies */
+     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
+   }
+   else
+   { /* MSIRANGE from RCC_CR applies */
+     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
+   }
+   /*MSI frequency range in HZ*/
+   msirange = MSIRangeTable[msirange];
+
+
+  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
+  /* Get SYSCLK source -------------------------------------------------------*/
+  switch (RCC->CFGR & RCC_CFGR_SWS)
+  {
+    case 0x00:   /* MSI used as system clock source */
+      SystemCoreClock = msirange;
+      break;
+
+    case 0x04:  /* HSI used as system clock source */
+      /* HSI used as system clock source */
+        SystemCoreClock = HSI_VALUE;
+      break;
+
+    case 0x08:  /* HSE used as system clock source */
+      SystemCoreClock = HSE_VALUE;
+      break;
+
+    case 0x0C: /* PLL used as system clock  source */
+      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
+         SYSCLK = PLL_VCO / PLLR
+         */
+      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
+      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
+
+      switch (pllsource)
+      {
+        case 0x02:  /* HSI used as PLL clock source */
+          pllvco = (HSI_VALUE / pllm);
+          break;
+
+        case 0x03:  /* HSE used as PLL clock source */
+          pllvco = (HSE_VALUE / pllm);
+          break;
+
+        default:    /* MSI used as PLL clock source */
+          pllvco = (msirange / pllm);
+          break;
+      }
+
+      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
+      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
+
+      SystemCoreClock = pllvco/pllr;
+      break;
+
+    default:
+      SystemCoreClock = msirange;
+      break;
+  }
+
+  /* Compute HCLK clock frequency --------------------------------------------*/
+#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
+  /* Get HCLK2 prescaler */
+  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
+#else
+  /* Get HCLK1 prescaler */
+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
+#endif
+
+  /* Core clock frequency */
+  SystemCoreClock = SystemCoreClock / tmp;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c
new file mode 100644
index 00000000..5f002ada
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/test_protections.c
@@ -0,0 +1,822 @@
+/**
+  ******************************************************************************
+  * @file    test_protections.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define TEST_PROTECTIONS_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "test_protections.h"
+#include "se_def.h"
+#include "se_interface_application.h"
+#include "com.h"
+#include "common.h"
+#include "flash_if.h"
+#include "sfu_fwimg_regions.h" /* required for corruption tests (a real user application should NOT need this file) */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "mpu.h"
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup TEST_PROTECTIONS Test protections
+  * @{
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Private_Defines Private Defines
+  * @{
+  */
+
+/**
+  * @brief  Isolated enclave Test.
+  */
+/*!< Address used to test SE CODE protection*/
+#define TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS     ((uint32_t) SE_CALLGATE_REGION_ROM_START)
+/*!< Address used to test SE VDATA protection*/
+#define TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS     ((uint32_t) SE_REGION_RAM_START)
+
+/**
+  * @brief  Secure Memory Test.
+  */
+/*!< Address used to test HDP */
+#define TEST_PROTECTIONS_HDP_FLASH_ADDRESS          ((uint32_t) SE_KEY_REGION_ROM_START)
+
+/**
+  * @brief  WRP Test.
+  */
+/*!< Address used to test WRP protection */
+#define TEST_PROTECTIONS_WRP_FLASH_ADDRESS            ((uint32_t) SE_IF_REGION_ROM_START)
+/*!< WRP Test Size */
+#define TEST_PROTECTIONS_WRP_FLASH_SIZE               ((uint32_t)0x800U)
+
+/**
+  * @brief  IWDG Test.
+  */
+/*!< IWDG Test delay in ms (it has to be greater than what used in SB)*/
+#define TEST_PROTECTIONS_IWDG_DELAY                   ((uint32_t)10000U)
+
+/**
+  * @brief  TAMPER Test.
+  */
+#define TEST_PROTECTIONS_TAMPER_DELAY                 ((uint32_t)10U)         /*!< TAMPER Test delay in s */
+
+/**
+  * @brief  CORRUPT_IMAGE Test.
+  */
+/*!< CORRUPT_IMAGE Test: address where data will be corrupted: address of active slot + offset */
+#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(A)  ((uint32_t)(SlotStartAdd[A] \
+                                                                     +SFU_IMG_IMAGE_OFFSET))
+/*!< CORRUPT_IMAGE Test: size of data to be corrupted */
+#define TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE     ((uint32_t)32U)
+
+/**
+  * @brief  GTZC Test.
+  */
+/*!< GTZC Test error code */
+#define TEST_GTZC_ERROR_CODE                          ((uint32_t)0xFFU)
+
+/** @defgroup  TEST_PROTECTIONS_Private_Variables Private Variables
+  * @{
+  */
+static uint8_t uRead_WRP[TEST_PROTECTIONS_WRP_FLASH_SIZE];
+static __IO uint32_t m_uTamperEvent = 0U;                /*!< Tamper Event */
+static __IO uint32_t m_uGtzcTzicEvent = 0U;              /*!< GTZC_TZIC Event */
+/**
+  * @}
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Private_Functions Private Functions
+  * @{
+  */
+static void TEST_PROTECTIONS_RunSE_CODE(void);
+static void TEST_PROTECTIONS_RunSE_VDATA(void);
+static void TEST_PROTECTIONS_RunSecUserMem_CODE(void);
+static void TEST_PROTECTIONS_RunWRP(void);
+static void TEST_PROTECTIONS_RunTAMPER(void);
+static void TEST_PROTECTIONS_RunIWDG(void);
+static void TEST_PROTECTIONS_CORRUPT_RunMenu(void);
+static void TEST_PROTECTIONS_Run_GTZC(void);
+static void TEST_PROTECTIONS_GtzcPrintTestingSubMenu(void);
+static void TEST_PROTECTIONS_Run_KMS_DATA_STORAGE(void);
+static void TEST_PROTECTIONS_Run_SYNC_FLAG(void);
+static void TEST_PROTECTIONS_PrintTestingMenu(void);
+/**
+  * @}
+  */
+
+
+
+/** @defgroup  TEST_PROTECTIONS_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup  TEST_PROTECTIONS_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void TEST_PROTECTIONS_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint8_t exit = 0U;
+
+  /* Print Main Menu message */
+  TEST_PROTECTIONS_PrintTestingMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
+       reload register*/
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          TEST_PROTECTIONS_CORRUPT_RunMenu();
+          break;
+        case '2' :
+          TEST_PROTECTIONS_RunSE_CODE();
+          break;
+        case '3' :
+          TEST_PROTECTIONS_RunSE_VDATA();
+          break;
+        case '4' :
+          TEST_PROTECTIONS_RunSecUserMem_CODE();
+          break;
+        case '5' :
+          TEST_PROTECTIONS_RunWRP();
+          break;
+        case '6' :
+          TEST_PROTECTIONS_RunIWDG();
+          break;
+        case '7' :
+          TEST_PROTECTIONS_RunTAMPER();
+          break;
+        case '8' :
+          TEST_PROTECTIONS_Run_GTZC();
+          break;
+        case '9' :
+          TEST_PROTECTIONS_Run_KMS_DATA_STORAGE();
+          break;
+        case 'a' :
+          TEST_PROTECTIONS_Run_SYNC_FLAG();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+      /*Print Main Menu message*/
+      TEST_PROTECTIONS_PrintTestingMenu();
+    }
+  }
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup  TEST_PROTECTIONS_Private_Functions
+  * @{
+  */
+
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_PrintTestingMenu(void)
+{
+  printf("\r\n=================== Test Menu ============================\r\n\n");
+  printf("  Test : CORRUPT ACTIVE IMAGE --------------------------- 1\r\n\n");
+  printf("  Test SE isolation - CODE ------------------------------ 2\r\n\n");
+  printf("  Test SE isolation - VDATA ----------------------------- 3\r\n\n");
+  printf("  Test Protection: HDP ---------------------------------- 4\r\n\n");
+  printf("  Test Protection: WRP ---------------------------------- 5\r\n\n");
+  printf("  Test Protection: IWDG --------------------------------- 6\r\n\n");
+  printf("  Test Protection: TAMPER ------------------------------- 7\r\n\n");
+  printf("  Test Protection: GTZSC -------------------------------- 8\r\n\n");
+  printf("  Test KMS_DataStorage isolation ------------------------ 9\r\n\n");
+  printf("  Test synchronization flag protection ------------------ a\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  TEST Run Secure User Memory
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunSecUserMem_CODE(void)
+{
+  uint32_t u_read_key = 0;
+  printf("\r\n====== Test Protection: HDP \r\n\n");
+  printf("  -- Reading address: 0x%x\r\n\n", TEST_PROTECTIONS_HDP_FLASH_ADDRESS);
+
+  /* Try to read a 32-bit data from the Flash protected by HDP */
+  u_read_key = *((uint32_t *)TEST_PROTECTIONS_HDP_FLASH_ADDRESS);
+
+  /* Should not get here if HDP is available and enabled  */
+  printf("  -- Address: 0x%x = 0x%x\r\n\n", TEST_PROTECTIONS_HDP_FLASH_ADDRESS, u_read_key);
+  if(u_read_key == 0U)
+  {
+    printf("  -- 0 has been read: HDP is enabled.\r\n\n");
+  }
+  else
+  {
+    printf("  -- !! HDP privileged CODE protection is NOT ENABLED !!\r\n\n");
+  }
+}
+
+/**
+  * @brief  TEST Run SE_CODE
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunSE_CODE(void)
+{
+
+  uint8_t code[4U];
+  m_uGtzcTzicEvent = 0;
+  printf("\r\n====== Test Protection: GTZC privileged - CODE ==========\r\n\n");
+  printf("  -- Dumping code\r\n\n");
+
+  /* Dumping the first 4 bytes */
+  code[0] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS);
+  code[1] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 1);
+  code[2] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 2);
+  code[3] = * (uint8_t *)(TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS + 3);
+
+  printf("  -- Dump : %x %x %x %x \r\n\n", code[0], code[1], code[2], code[3]);
+  if (m_uGtzcTzicEvent == 0U)
+  {
+   printf("  -- !! GTZC privileged CODE protection is NOT ENABLED !!\r\n\n");
+  }
+  else
+  {
+    printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+    SVC_NVIC_SystemReset();
+  }
+}
+/**
+  * @brief  TEST Run SE_VDATA
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunSE_VDATA(void)
+{
+  uint32_t u_read_fw_vdata = 0;
+  m_uGtzcTzicEvent = 0;
+  printf("\r\n====== Test Protection: GTZC privileged - VDATA ==========\r\n\n");
+  printf("  -- Reading address: 0x%x\r\n\n", TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
+
+  /* Try to read a 32-bit data from the SRAM2 protected by the GTZC */
+  u_read_fw_vdata = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
+
+  /* Should not get here if MPU was available and enabled  */
+  printf("  -- Address: 0x%x = %d\r\n\n", TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS, u_read_fw_vdata);
+  if (m_uGtzcTzicEvent == 0U)
+  {
+    printf("  -- !! GTZC privileged VDATA protection is NOT ENABLED !!\r\n\n");
+  }
+  else
+  {
+    printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+    SVC_NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @brief  TEST Run WRP
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunWRP(void)
+{
+  uint32_t i = 0U;
+  uint32_t address = 0U;
+
+  printf("\r\n====== Test Protection: WRP ===========================\r\n\n");
+
+  address = TEST_PROTECTIONS_WRP_FLASH_ADDRESS;
+
+  /* 1 - Read Page to be used for restoring*/
+  printf("  -- Reading 0x%x bytes at address: 0x%x (for backup)\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
+         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+  for (i = 0U; i < TEST_PROTECTIONS_WRP_FLASH_SIZE; i++)
+  {
+    uRead_WRP[i] = *((uint8_t *)(address + i));
+  }
+
+  /* 2 - Erasing page */
+  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_SIZE,
+         TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+  /* Check that it is not allowed to erase this page */
+  if (FLASH_If_Erase_Size((void *)address, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
+  {
+    /* Error returned during programmation. */
+    /* Check that WRPERR flag is set */
+    if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
+    {
+      printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
+    }
+  }
+  else
+  {
+    /* 3 - Writing Data previously read*/
+    if (FLASH_If_Write((void *)address, uRead_WRP, TEST_PROTECTIONS_WRP_FLASH_SIZE) != HAL_OK)
+    {
+      /* Error returned during programmation. */
+      printf("-- !! HAL_FLASH_ERROR: FLASH Write error\r\n\n");
+
+      /* Check that WRPERR flag is set */
+      if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) != 0U)
+      {
+        printf("-- !! HAL_FLASH_ERROR_WRP: FLASH Write protected error flag !!\r\n\n");
+      }
+    }
+    else
+    {
+      printf("  -- Written successfully at address: 0x%x\r\n\n", TEST_PROTECTIONS_WRP_FLASH_ADDRESS);
+
+      /*No Errors detected means WRP was not enabled*/
+      printf("  -- !! WRP protection is NOT ENABLED !!\r\n\n");
+    }
+  }
+}
+
+/**
+  * @brief  TEST Run CORRUPT_IMAGE
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunCORRUPT(uint32_t slot_number)
+{
+  HAL_StatusTypeDef ret = HAL_ERROR;
+  uint8_t pattern[TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE] = {0};
+
+  /* On this series, MPU should be disable to allow flash corruption.
+     Switching in privileged mode is requested to be able to disable MPU */
+  printf("  -- Disable MPU protection to be able to erase\r\n");
+  SVC_MPU_Disable();
+
+  /* Erase first sector of active slot */
+  printf("  -- Erasing 0x%x bytes at address: 0x%x\r\n", TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE,
+         TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number));
+  printf("  -- At next boot Signature Verification will fail. Download a new FW to restore FW image !!\r\n\n");
+
+  /* On this series, the memory corruption is performed by writing again the flash (but not header).
+     The header is preserved for anti-rollback check. */
+  ret = FLASH_If_Write((void *)(TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_ADDRESS(slot_number)), (void *) &pattern,
+                       TEST_PROTECTIONS_CORRUPT_IMAGE_FLASH_SIZE);
+
+  /* This code may not be reached, due to the memory corruption performed.
+     In this case, the execution will probably trig hard fault exception (while (1)),
+     then watchdog reset. */
+  if (ret == HAL_OK)
+  {
+    SVC_NVIC_SystemReset();
+  }
+  else
+  {
+    printf("-- !! HAL_FLASH_ERROR_CORRUPT_IMAGE: erasing failure ...\r\n\n");
+  }
+}
+
+/**
+  * @brief  Display the corruption menu
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_CORRUPT_PrintMenu(void)
+{
+  printf("\r\n============  Test: CORRUPT ACTIVE IMAGE ============\r\n\n");
+  printf("  Corrupt image from SLOT_ACTIVE_1 ---------------------- 1\r\n\n");
+  printf("  Corrupt image from SLOT_ACTIVE_2 ---------------------- 2\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+  printf("  Selection :\r\n\n");
+}
+
+/**
+  * @brief  Run get firmware info menu.
+  * @param  None
+  * @retval HAL Status.
+  */
+static void TEST_PROTECTIONS_CORRUPT_RunMenu(void)
+{
+  uint8_t key = 0U;
+  uint32_t exit = 0U;
+  uint32_t slot_number = 0U;
+
+  /*Print Main Menu message*/
+  TEST_PROTECTIONS_CORRUPT_PrintMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    slot_number = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)
+      {
+        case '1' :
+          slot_number = SLOT_ACTIVE_1;
+          break;
+        case '2' :
+          slot_number = SLOT_ACTIVE_2;
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+        default:
+          printf("Invalid Number !\r");
+          break;
+      }
+
+      if (exit != 1U)
+      {
+        if (SlotStartAdd[slot_number] == 0U)
+        {
+          printf("SLOT_ACTIVE_%d is not configured !\r", slot_number);
+        }
+        else
+        {
+          TEST_PROTECTIONS_RunCORRUPT(slot_number);
+        }
+
+        /*Print Main Menu message*/
+        TEST_PROTECTIONS_CORRUPT_PrintMenu();
+      }
+    }
+  }
+}
+
+
+/**
+  * @brief  TEST Run TAMPER
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunTAMPER(void)
+{
+  uint32_t i = 0U;
+  m_uTamperEvent = 0U;
+
+  printf("\r\n====== Test Protection: TAMPER ========================\r\n\n");
+  /* Print instructions*/
+  printf("  -- Pull PC13 (CN7.23) to GND \r\n\n");
+  printf("  -- -- Note: sometimes it may be enough to put your finger close to PC13 (CN7.23)\r\n\n");
+  printf("  -- Should reset if TAMPER is enabled. \r\n\n");
+  printf("  Waiting for 10 seconds...\r\n\n")  ;
+
+  /* #2 - Wait 10 seconds*/
+  while ((i < TEST_PROTECTIONS_TAMPER_DELAY) && (m_uTamperEvent == 0U))
+  {
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload register
+     */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+    HAL_Delay(1000U);
+    i++;
+  }
+  if (m_uTamperEvent == 0U)
+  {
+    printf("\r\n\n  -- Waited 10 seconds, if you have connected TAMPER pin to GND it means TAMPER protection ");
+    printf("is NOT ENABLED !! \r\n\n");
+  }
+  else
+  {
+    printf("\r\n\n  -- TAMPER Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+    SVC_NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  TEST Run IWDG
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_RunIWDG(void)
+{
+  printf("\r\n====== Test Protection: IWDG ===========================\r\n\n");
+
+  /* Wait for TEST_PROTECTIONS_IWDG_DELAY*/
+  printf("  -- Waiting %d (ms). Should reset if IWDG is enabled. \r\n\n", TEST_PROTECTIONS_IWDG_DELAY);
+
+  HAL_Delay(TEST_PROTECTIONS_IWDG_DELAY);
+
+  /* No Reset means IWDG was not enabled*/
+  printf("  -- !! IWDG protection is NOT ENABLED !!\r\n\n");
+}
+
+
+
+/**
+  * @brief  Display the TEST Main Menu choices on HyperTerminal
+  * @param  None.
+  * @retval None.
+  */
+void TEST_PROTECTIONS_GtzcPrintTestingSubMenu(void)
+{
+  printf("\r\n====== Test Protection: GTZC ===========================\r\n\n");
+  printf("  Test Protection: TZSC (Flash) ------------------------- 1\r\n\n");
+  printf("  Test Protection: TZSC (RAM) --------------------------- 2\r\n\n");
+  printf("  Test Protection: TZSC (AES) --------------------------- 3\r\n\n");
+  printf("  Test Protection: TZSC (PKA) --------------------------- 4\r\n\n");
+  printf("  Test Protection: TZSC (RNG) --------------------------- 5\r\n\n");
+  printf("  Test Protection: TZSC (SUBGHZSPI) --------------------- 6\r\n\n");
+  printf("  Test Protection: TZSC (TZIC)--------------------------- 7\r\n\n");
+  printf("  Test Protection: TZSC (TZSC)--------------------------- 8\r\n\n");
+  printf("  Test Protection: TZIC (PWR) --------------------------- 9\r\n\n");
+  printf("  Test Protection: TZIC (FLASHIF) ----------------------- a\r\n\n");
+  printf("  Test Protection: TZIC (DMA1) -------------------------- b\r\n\n");
+  printf("  Test Protection: TZIC (DMA2) -------------------------- c\r\n\n");
+  printf("  Previous Menu ----------------------------------------- x\r\n\n");
+}
+
+/**
+  * @brief  TEST Run TZIC
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_Run_GTZC(void)
+{
+  m_uGtzcTzicEvent = 0;
+  uint8_t key = 0U;
+  uint8_t exit = 0U;
+  uint8_t invalid = 0U;
+  uint8_t error_code = 0U;
+  uint32_t value = 0U;
+
+  TEST_PROTECTIONS_GtzcPrintTestingSubMenu();
+
+  while (exit == 0U)
+  {
+    key = 0U;
+    invalid = 0U;
+
+    /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the reload
+       register */
+    WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+    /* Clean the input path */
+    COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      printf("If GTZC (TZSC and TZIC) is configured, you should get a TZIC interrupt.\r\n\n");
+      switch (key)
+      {
+        case '1' :
+          value = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_CODE_FLASH_ADDRESS);
+          break;
+        case '2' :
+          /* Try to read a 32-bit data from the SRAM2 protected by the MPU */
+          value = *((uint32_t *)TEST_PROTECTIONS_SE_ISOLATED_VDATA_SRAM_ADDRESS);
+          break;
+        case '3' :
+          value = READ_REG(AES->SR);
+          break;
+        case '4' :
+          value = READ_REG(PKA->SR);
+          break;
+        case '5' :
+          value = READ_REG(RNG->SR);
+          break;
+        case '6' :
+          value = READ_REG(SUBGHZSPI->SR);
+          break;
+        case '7' :
+          value = READ_REG(GTZC_TZIC->MISR1);
+          break;
+        case '8' :
+          /* All GTZSC registers can be read by non-secure unprivileged accesses */
+
+          /* All peripheral aren't privileged in PRIVCFGR1 so there shouldn't be an illegal access */
+          error_code = 0;
+          value = READ_REG(GTZC_TZSC->SECCFGR1);
+          WRITE_REG(GTZC_TZSC->SECCFGR1, 0U);
+          if(value != READ_REG(GTZC_TZSC->SECCFGR1))
+          {
+            error_code = TEST_GTZC_ERROR_CODE;
+          }
+
+          /* This should generate an illegal access */
+          value = READ_REG(GTZC_TZSC->PRIVCFGR1);
+          WRITE_REG(GTZC_TZSC->PRIVCFGR1, 0U);
+          if(value != READ_REG(GTZC_TZSC->PRIVCFGR1))
+          {
+            error_code = TEST_GTZC_ERROR_CODE;
+          }
+          break;
+        case '9' :
+          /* The other PWR registers can be read and written by non-secure unprivileged accesses */
+          value = READ_REG(PWR->SECCFGR);
+          break;
+        case 'a' :
+          MODIFY_REG(FLASH->WRP1AR, FLASH_WRP1AR_WRP1A_STRT, 0x1F);
+          break;
+        case 'b' :
+          __HAL_RCC_DMA1_CLK_ENABLE();
+          __HAL_RCC_DMA1_FORCE_RESET();
+          __HAL_RCC_DMA1_RELEASE_RESET();
+          SET_BIT(DMA1_Channel1->CCR, DMA_CCR_PRIV);
+          __HAL_RCC_DMA1_CLK_DISABLE();
+          break;
+        case 'c' :
+          __HAL_RCC_DMA2_CLK_ENABLE();
+          __HAL_RCC_DMA2_FORCE_RESET();
+          __HAL_RCC_DMA2_RELEASE_RESET();
+          SET_BIT(DMA2_Channel1->CCR, DMA_CCR_PRIV);
+          __HAL_RCC_DMA2_CLK_ENABLE();
+          break;
+        case 'x' :
+          exit = 1U;
+          break;
+
+        default:
+          printf("Invalid Number !\r");
+          invalid = 1U;
+          break;
+      }
+    }
+
+    if ((key != 0) && (exit != 1) && (invalid != 1))
+    {
+      if ((key == 'a') || (key == 'b') || (key == 'c'))
+      {
+        printf("  -- Register successfully written for the choice %c\r\n", key);
+      }
+      else if ((key == '8') && (error_code == TEST_GTZC_ERROR_CODE))
+      {
+        printf("The GTZC registers aren't properly locked !! \r\n\n");
+      }
+      else if (key == '8')
+      {
+        printf("  -- The GTZC registers are locked.\r\n");
+      }
+      else
+      {
+        printf("  -- Read value for the choice %c: %d\r\n", key, value);
+      }
+
+      /* Wait 1 second */
+      WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+      HAL_Delay(1U);
+
+      if (m_uGtzcTzicEvent == 0U)
+      {
+        printf("GTZC is NOT ENABLED in this use case !! \r\n\n");
+      }
+      else
+      {
+        printf("\r\n\n  -- TZIC Event detected!!\r\n\n  -- System reset requested!!!\r\n\n");
+        SVC_NVIC_SystemReset();
+      }
+
+      TEST_PROTECTIONS_GtzcPrintTestingSubMenu();
+    }
+  }
+}
+
+/**
+  * @brief  TEST Run KMS_DataStorage
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_Run_KMS_DATA_STORAGE(void)
+{
+  uint32_t u_read_fw_code = 0;
+  printf("\r\n====== Test Protection: MPU privileged - KMS_DataStorage \r\n\n");
+  printf("  -- Reading address: 0x%x\r\n\n", KMS_DATASTORAGE_START);
+
+  /* Try to read a 32-bit data from the Flash protected by the MPU */
+  u_read_fw_code = *((uint32_t *)KMS_DATASTORAGE_START);
+
+  /* Should not get here if MPU is available and enabled  */
+  printf("  -- Address: 0x%x = 0x%x\r\n\n", KMS_DATASTORAGE_START, u_read_fw_code);
+  printf("  -- !! MPU privileged CODE protection is NOT ENABLED !!\r\n\n");
+}
+
+/**
+  * @brief  TEST Run SYNC_FLAG
+  * @param  None.
+  * @retval None.
+  */
+static void TEST_PROTECTIONS_Run_SYNC_FLAG(void)
+{
+  __IO uint32_t *pSyncFlag = (__IO uint32_t *)M4_M0PLUS_FLAG_RAM_START;
+  uint32_t u_read_flag_value = 0;
+  printf("\r\n====== Test Protection: MPU Read Only - Synchronization flag \r\n\n");
+  printf("  -- Reading address: 0x%x\r\n\n", M4_M0PLUS_FLAG_RAM_START);
+
+  /* Try to change the value of the synchronization flag */
+  u_read_flag_value = *pSyncFlag;
+  *pSyncFlag = 0U;
+
+  /* Restore the value */
+  *pSyncFlag = u_read_flag_value;
+
+  /* Should not get here if MPU is available and enabled  */
+  printf("  -- Address: 0x%x = 0x%x\r\n\n", M4_M0PLUS_FLAG_RAM_START, *pSyncFlag);
+  printf("  -- !! MPU read only FLAG protection is NOT ENABLED !!\r\n\n");
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup TEST_PROTECTIONS_Callback_Functions Callback Functions
+  * @{
+  */
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void CALLBACK_Antitamper(void)
+{
+  /*Set tamper event variable*/
+  m_uTamperEvent = 1U;
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC IRQ.
+  * @param  None
+  * @retval None
+  */
+void CALLBACK_GTZC_TZIC(void)
+{
+  /*Set GTZC TZIC event variable*/
+  m_uGtzcTzicEvent = 1U;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c
new file mode 100644
index 00000000..50a2847b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app.c
@@ -0,0 +1,207 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app.c
+  * @author  MCD Application Team
+  * @brief   tKMS application examples module.
+  *          This file provides examples of KMS API usages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+extern void KMS_UPDATE_StartLocalUpdate(void);  /* Function to perform Ymodem download of blob image to import */
+
+static void tkms_app_print_menu(void)
+{
+  (void)printf("\r\n======================= tKMS Examples Menu ===========================\r\n\n");
+  (void)printf("  (*) Requires execution of 'Import Blob' test (3) prior to execute this one\r\n\n");
+  (void)printf("  TKMS - Test All (*)                               --------------------- 0\r\n\n");
+  (void)printf("  TKMS - Tests AES-GCM Embedded key                 --------------------- 1\r\n\n");
+  (void)printf("  TKMS - Tests AES-CBC Embedded key                 --------------------- 2\r\n\n");
+  (void)printf("  TKMS - Import blob                                --------------------- 3\r\n\n");
+  (void)printf("  TKMS - Tests RSA Static key (*)                   --------------------- 4\r\n\n");
+  (void)printf("  TKMS - Tests Derive Static key (*)                --------------------- 5\r\n\n");
+  (void)printf("  TKMS - Tests key finding                          --------------------- 6\r\n\n");
+  (void)printf("  Exit tKMS Examples Menu                           --------------------- x\r\n\n");
+}
+
+void tkms_app_menu(void)
+{
+  uint8_t key;
+  uint8_t exit = 0U;
+  CK_RV ret_status;
+  uint8_t tests_executed; /* Tests executed count */
+  uint8_t tests_success;  /* Tests success count */
+  uint8_t clear_buffer[128] = "STM32 Key Management Services - Example buffer"; /* Clear text test buffer */
+
+  /* Initialize tKMS for subsequent usage */
+  ret_status = C_Initialize(NULL);
+  if (ret_status != CKR_OK)
+  {
+    (void)printf("tKMS initialization failed\r\n");
+    exit = 1;
+  }
+  else
+  {
+    tkms_app_print_menu();
+  }
+
+  while (exit == 0U)  /* Till user request to exit this menu, loop on it */
+  {
+    key = 0U;
+
+    INVOKE_SCHEDULE_NEEDS();
+
+    /* Clean the user input path */
+    (void)COM_Flush();
+
+    /* Receive key */
+    if (COM_Receive(&key, 1U, RX_TIMEOUT) == HAL_OK)
+    {
+      switch (key)  /* User pressed key */
+      {
+        case '0' :
+          /*
+           * Execute the whole supported tests in sequence
+           * For each test:
+           * - call INVOKE_SCHEDULE_NEEDS to rewarm WDG
+           * - check results and report test status
+           * At the end, global result is provided
+           */
+          tests_executed = 0U;
+          tests_success = 0U;
+          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
+          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
+          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_find();
+          (void)printf("Find key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tests_executed++;
+          tests_success += (ret_status == CKR_OK) ? 1U : 0U;
+          INVOKE_SCHEDULE_NEEDS();
+          /* Report final status */
+          if (tests_success == tests_executed)
+          {
+            (void)printf("CUMULATIVE RESULT: ALL TESTS PASSED\r\n");
+          }
+          else
+          {
+            (void)printf("CUMULATIVE RESULT: %d/%d success\r\n", tests_success, tests_executed);
+          }
+          tkms_app_print_menu();
+          break;
+
+        /* 1 = TKMS - Tests AES-GCM Embedded key */
+        case '1' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_gcm(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES GCM test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 2 = Tests AES-CBC Embedded key */
+        case '2' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_encrypt_decrypt_aes_cbc(sizeof(clear_buffer), clear_buffer);
+          (void)printf("AES CBC test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 3 = Import Blob */
+        case '3':
+          INVOKE_SCHEDULE_NEEDS();
+          KMS_UPDATE_StartLocalUpdate();
+          tkms_app_print_menu();
+          break;
+        /* 4 = Tests RSA Static key (requires blob import) */
+        case '4' :
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_sign_verify_rsa(sizeof(clear_buffer), clear_buffer);
+          (void)printf("RSA test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 5 = Tests Key derivation (requires blob import) */
+        case '5':
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_derive_key(sizeof(clear_buffer), clear_buffer);
+          (void)printf("Derive key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        /* 6 = Tests Key finding */
+        case '6':
+          INVOKE_SCHEDULE_NEEDS();
+          ret_status = tkms_app_find();
+          (void)printf("Find key test %s\r\n", (ret_status == CKR_OK) ? "SUCCESSFUL" : "FAILED");
+          tkms_app_print_menu();
+          break;
+        case 'x':
+          exit = 1;
+          break;
+
+        default:
+          (void)printf("Invalid Number !\r");
+          tkms_app_print_menu();
+          break;
+      }
+    }
+  }
+
+  /* Finalize tKMS since no more in use */
+  ret_status = C_Finalize(NULL);
+  if (ret_status != CKR_OK)
+  {
+    (void)printf("tKMS finalization failed\r\n");
+  }
+}
+
+/*
+ * Utilities to format buffer in string for display in traces
+ */
+void tkms_buff2str(uint8_t *pbuff, uint8_t *pstr, uint32_t length)
+{
+  uint8_t ascii[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+  uint8_t *ptmp = pstr;
+  uint8_t *ptmp2 = pbuff;
+  for (uint32_t i = 0UL; i < length; i += 1UL)
+  {
+    *ptmp = ascii[*ptmp2 >> 4];
+    ptmp++;
+    *ptmp = ascii[*ptmp2 & 0x0FUL];
+    ptmp++;
+    ptmp2++;
+  }
+  *ptmp = 0U;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c
new file mode 100644
index 00000000..6d6e7ebb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_derive_key.c
+  * @author  MCD Application Team
+  * @brief   tKMS application examples module.
+  *          This file provides examples of KMS API usage to derivate a key
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define EC_POINT_MAX_LEN          (3U + (2U * 32U))   /* EC Point Max Length : X962 header + DER header +
+                                                         NIST-P256 *2 - > (0x04|LEN|0x04|X|Y) */
+#define DH_SECRET_X_MAX_LEN       (32U)               /* DH Secret X Max Length */
+
+/* Private structures --------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+
+
+/**
+  * @brief  Key derivation
+  *         This example is showing how to use key derivation to create
+  *         a specific session key.
+  * @note
+  *     Key derivation shared information between emitter and receiver
+  *       - Secret derivation Key: stored in KMS under
+  *                  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE object handle
+  *       - Session key variation: transmitted or calculated by both emitter & receiver
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_derive_key(uint32_t length, uint8_t *pClearMessage)
+{
+  uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
+  uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
+  /* Generated key template definition */
+  CK_ULONG DeriveKey_template_class = CKO_SECRET_KEY;
+  CK_ULONG DeriveKey_template_destroyable = CK_TRUE;
+  CK_ULONG DeriveKey_template_encrypt = CK_TRUE;
+  CK_ULONG DeriveKey_template_decrypt = CK_TRUE;
+  CK_ULONG DeriveKey_template_extract = CK_TRUE;
+  CK_ATTRIBUTE DeriveKey_template[] =
+  {
+    {CKA_CLASS, (CK_VOID_PTR) &DeriveKey_template_class,       sizeof(CK_ULONG)},
+    {CKA_DESTROYABLE, (CK_VOID_PTR) &DeriveKey_template_destroyable, sizeof(CK_ULONG)},
+    {CKA_ENCRYPT, (CK_VOID_PTR) &DeriveKey_template_encrypt,     sizeof(CK_ULONG)},
+    {CKA_DECRYPT, (CK_VOID_PTR) &DeriveKey_template_decrypt,     sizeof(CK_ULONG)},
+    {CKA_EXTRACTABLE, (CK_VOID_PTR) &DeriveKey_template_extract,     sizeof(CK_ULONG)}
+  };
+  /* Template to retrieve generate key value */
+  CK_ATTRIBUTE GetKey_template[] = {{CKA_VALUE, (CK_VOID_PTR) &DeriveKey_template_class, 32UL}};
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  /* Key derivation */
+  uint8_t session_variant[32] = "My session variation 0122004578";
+  CK_MECHANISM      mech = {CKM_AES_ECB_ENCRYPT_DATA, session_variant, 32};
+  CK_OBJECT_HANDLE  derivedKeyHdle = 0UL;
+  uint8_t derivedKey[32] = {0};
+  /* AES encryption / decryption */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)cbc_iv, sizeof(cbc_iv) };
+  uint8_t tag[16] = {0};
+  uint32_t tag_lenth;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Derive key with pass phrase */
+  if (rv == CKR_OK)
+  {
+    rv = C_DeriveKey(session, &(mech), (CK_OBJECT_HANDLE)KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE,
+                     &DeriveKey_template[0], sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derivedKeyHdle);
+  }
+
+  /* Get derived key to display */
+  if (rv == CKR_OK)
+  {
+    GetKey_template[0].pValue = derivedKey;
+    rv = C_GetAttributeValue(session, derivedKeyHdle, &(GetKey_template[0]), sizeof(GetKey_template) /
+                             sizeof(CK_ATTRIBUTE));
+  }
+  if (rv == CKR_OK)
+  {
+    (void)printf("--- Derivating key --------------------------------------------\r\n");
+    (void)printf("--- AES ECB\r\n");
+    (void)printf("--- Pass phrase   [%s]\r\n", session_variant);
+    tkms_buff2str(derivedKey, a_string, 32);
+    (void)printf("--- Derived key   [%s]\r\n", a_string);
+  }
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES CBC\r\n");
+  (void)printf("--- IV      [%s]\r\n", cbc_iv);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_cbc_mechanism, derivedKeyHdle);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Remove key once no more needed */
+  if (rv == CKR_OK)
+  {
+    rv = C_DestroyObject(session, derivedKeyHdle);
+  }
+
+  /* Verify key is no more usable */
+  if (rv == CKR_OK)
+  {
+    if (C_EncryptInit(session, &aes_cbc_mechanism, derivedKeyHdle) == CKR_OK)
+    {
+      rv = CKR_FUNCTION_FAILED;
+    }
+  }
+
+  /* Close sessions */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c
new file mode 100644
index 00000000..5692f717
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c
@@ -0,0 +1,293 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_encrypt_decrypt.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to encrypt & decrypt
+  *          messages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines ---------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+static uint8_t encrypted_message[256] __attribute__((aligned(8))) = {0};
+static uint8_t decrypted_message[256] __attribute__((aligned(8))) = {0};
+
+/**
+  * @brief  AES GCM 128 Bits
+  *         This example is showing how to use AES GCM encryption/decryption to
+  *         authenticate and protect a message.
+  * @note
+  *     Shared information between emitter and receiver
+  *       - Secret encryption/decryption Key: stored in KMS under
+  *                        KMS_KEY_AES128_OBJECT_HANDLE object handle
+  *       - Encrypted message: transmitted from emitter to sender
+  *       - Initialization Vector: transmitted from emitter to sender
+  *       - Message Header: transmitted from emitter to sender
+  *       - Authentication Tag: transmitted from emitter to sender
+  *                      (calculated during encryption, verified during decryption)
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_encrypt_decrypt_aes_gcm(uint32_t length, uint8_t *pClearMessage)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t tag[16] = {0};  /* 128 bits tag size */
+  uint32_t tag_lenth = 0UL;
+
+  /* AES GCM Configuration variables */
+  uint8_t gcm_iv[12] = ">GCM VECTOR";
+  uint8_t gcm_header[16] = ">AES GCM Header";
+  /* Prepare GCM mechanism */
+  CK_GCM_PARAMS gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    sizeof(gcm_iv),
+    (CK_BYTE_PTR)gcm_header,
+    sizeof(gcm_header),
+    128   /* Tag length in Bits */
+  };
+  CK_MECHANISM aes_gcm_mechanism = { CKM_AES_GCM, (CK_VOID_PTR *)(uint32_t) &gcm_params, sizeof(gcm_params) };
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES GCM\r\n");
+  (void)printf("--- IV      [%s]\r\n", gcm_iv);
+  (void)printf("--- Header  [%s]\r\n", gcm_header);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+  tkms_buff2str(tag, a_string, tag_lenth);
+  (void)printf("--- Tag     [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES GCM with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_gcm_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES128_OBJECT_HANDLE);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth);
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  if (rv == CKR_OK)
+  {
+    (void)printf(">>> Decrypted message authenticated\r\n");
+  }
+  else
+  {
+    (void)printf("XXX Decrypted message not authenticated\r\n");
+  }
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)     /* Tag verification done into C_DecryptFinal, thus tag check reflected into rv */
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/**
+  * @brief  AES CBC 256 Bits
+  *         This example is showing how to use AES CBC encryption/decryption to
+  *         protect a message.
+  * @note
+  *     CBC shared information between emitter and receiver
+  *       - Secret encryption/decryption Key: stored in KMS under
+  *                             KMS_KEY_AESC256_OBJECT_HANDLE object handle
+  *       - Encrypted message: transmitted from emitter to sender
+  *       - Initialization Vector: transmitted from emitter to sender
+  * @param  length  Length of the clear text for encryption/decryption tests
+  * @param  pClearMessage  Clear text for encryption/decryption tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_encrypt_decrypt_aes_cbc(uint32_t length, uint8_t *pClearMessage)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t encrypted_length = 0UL;
+  uint32_t decrypted_length = 0UL;
+  uint8_t tag[16] = {0};
+  uint32_t tag_lenth;
+
+  /* AES CBC Configuration variables */
+  uint8_t cbc_iv[16] = ">CBC VECTOR    ";
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)(uint32_t)cbc_iv, sizeof(cbc_iv) };
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Encryption --------------------------------------------------------------*/
+  (void)printf("--- Encrypting --------------------------------------------------\r\n");
+  (void)printf("--- AES CBC\r\n");
+  (void)printf("--- IV      [%s]\r\n", cbc_iv);
+  (void)printf("--- Message [%s]\r\n", pClearMessage);
+  tkms_buff2str(pClearMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to encrypt message in AES CBC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    encrypted_length = sizeof(encrypted_message);
+    rv = C_EncryptUpdate(session, pClearMessage, length,
+                         encrypted_message, &encrypted_length);
+  }
+
+  /* Finalize message encryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_EncryptFinal(session, &tag[0], &tag_lenth);
+  }
+
+  (void)printf("--- Encrypted ---------------------------------------------------\r\n");
+  tkms_buff2str(encrypted_message, a_string, encrypted_length);
+  (void)printf("--- Message [0x%s]\r\n", a_string);
+
+  /* Decryption --------------------------------------------------------------*/
+
+  /* Configure session to decrypt message in AES CBC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_DecryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_AES256_OBJECT_HANDLE);
+  }
+
+  /* Decrypt encrypted message */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    decrypted_length = sizeof(decrypted_message);
+    rv = C_DecryptUpdate(session, encrypted_message, encrypted_length,
+                         decrypted_message, &decrypted_length);
+  }
+
+  /* Finalize message decryption */
+  if (rv == CKR_OK)
+  {
+    /* Set given buffer length */
+    tag_lenth = sizeof(tag);
+    rv = C_DecryptFinal(session, &tag[0], &tag_lenth); /* In case of AES CBC, no tag comparison is done */
+  }
+  (void)printf("--- Decrypted ---------------------------------------------------\r\n");
+  (void)printf("--- Message [%s]\r\n", decrypted_message);
+  tkms_buff2str(decrypted_message, a_string, decrypted_length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+
+  /* Compare decrypted message with clear one */
+  if (rv == CKR_OK)
+  {
+    if (memcmp(pClearMessage, decrypted_message, length) != 0)
+    {
+      (void)printf("XXX Decrypted message differs\r\n");
+      rv = CKR_FUNCTION_FAILED;
+    }
+    else
+    {
+      (void)printf(">>> Decrypted message is same\r\n");
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_find.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_find.c
new file mode 100644
index 00000000..6241319d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_find.c
@@ -0,0 +1,96 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_find.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to find
+  *          objects.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_KEY_AES128 "USERCRYP128"
+#define TEST_KEY_AES256 "USERCRYP256"
+/* Private variables ---------------------------------------------------------*/
+
+/**
+  * @brief  Object search
+  *         This example is showing how to find an object.
+  * @param  None
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_find(void)
+{
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_ATTRIBUTE object_template;
+  CK_OBJECT_HANDLE object_handle;
+  CK_ULONG count;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Fill in the template with the attribute to retrieve the specific key
+  (CKA_LABEL is used to refer to a specific object) */
+  object_template.type = CKA_LABEL;
+  object_template.pValue = TEST_KEY_AES128;
+  object_template.ulValueLen = sizeof(TEST_KEY_AES128);
+
+  (void)printf("--- Find Object -----------------------------------------------------\r\n");
+  (void)printf("--- Label [%s]\r\n", (uint8_t *)object_template.pValue);
+
+  /* Find Objects Init : template of the object to retrieve is passed to KMS */
+  if (rv == CKR_OK)
+  {
+    rv = C_FindObjectsInit(session, (CK_ATTRIBUTE_PTR)&object_template, 1);
+  }
+
+  /* Find Objects : Find object corresponding to the template specified in FindObjectsInit */
+  if (rv == CKR_OK)
+  {
+    count = 1;
+    rv = C_FindObjects(session, &object_handle, 1, &count);
+  }
+
+  /* Find Objects Final: Finalize the operation */
+  if (rv == CKR_OK)
+  {
+    rv = C_FindObjectsFinal(session);
+  }
+
+  if (rv == CKR_OK)
+  {
+    (void)printf("--- Object Found ------------------------------------------------\r\n");
+    (void)printf("--- Object Handle [%d]\r\n", object_handle);
+  }
+  else
+  {
+    printf("--- Object Not Found --------------------------------------------\r\n");
+  }
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c
new file mode 100644
index 00000000..c4a0c8aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c
@@ -0,0 +1,123 @@
+/**
+  ******************************************************************************
+  * @file    tkms_app_sign_verify.c
+  * @author  MCD Application Team
+  * @brief   KMS application examples module.
+  *          This file provides examples of KMS API usage to sign & verify
+  *          messages.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "tkms.h"
+#include "tkms_app.h"
+#include "com.h"
+#include "common.h"
+#include "kms_platf_objects_interface.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t a_string[1024] = {0};
+static uint8_t signature[2048 / 8] __attribute__((aligned(8))) = {0};
+
+
+/**
+  * @brief  RSA 1024 Bits
+  *         This example is showing how to use RSA signature to
+  *         authenticate a message.
+  * @note
+  *     RSA shared information between emitter and receiver
+  *       - Secret signature/verification Key: stored in KMS under
+  *         KMS_KEY_RSA2048_OBJECT_HANDLE object handle
+  *       - Message to authenticate: transmitted from emitter to sender
+  *       - Signature: transmitted from emitter to sender
+  *             (calculated by emitter, verified by receiver)
+  * @param  length  Length of the clear text for signature/verification tests
+  * @param  pMessage  Clear text for signature/verification tests
+  * @retval CK_RV return value.
+  */
+CK_RV tkms_app_sign_verify_rsa(uint32_t length, uint8_t *pMessage)
+{
+
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t signature_length = 0UL;
+
+  /* Prepare RSA mechanism */
+  CK_MECHANISM rsa_mechanism = { CKM_SHA256_RSA_PKCS, (CK_VOID_PTR *) NULL, 0};
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Signature --------------------------------------------------------------*/
+  (void)printf("--- Signing -----------------------------------------------------\r\n");
+  (void)printf("--- RSA 1024 bits\r\n");
+  (void)printf("--- Message [%s]\r\n", pMessage);
+  tkms_buff2str(pMessage, a_string, length);
+  (void)printf("---         [0x%s]\r\n", a_string);
+  (void)printf("--- Length  [%d]\r\n", length);
+
+  /* Configure session to sign message using RSA with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_SignInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
+  }
+
+  /* Sign message */
+  if (rv == CKR_OK)
+  {
+    signature_length = sizeof(signature);
+    rv = C_Sign(session, pMessage, length,
+                signature, &signature_length);
+  }
+
+  (void)printf("--- Signed ------------------------------------------------------\r\n");
+  tkms_buff2str(signature, a_string, signature_length);
+  (void)printf("--- Signature [0x%s]\r\n", a_string);
+  (void)printf("--- Length    [%d]\r\n", signature_length);
+
+  /* Verification ------------------------------------------------------------*/
+
+  /* Configure session to verify message using RSA with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+    rv = C_VerifyInit(session, &rsa_mechanism, (CK_OBJECT_HANDLE)KMS_KEY_RSA2048_OBJECT_HANDLE);
+  }
+
+  /* Verify message */
+  if (rv == CKR_OK)
+  {
+    rv = C_Verify(session, pMessage, length,
+                  signature, signature_length);
+  }
+
+  if (rv == CKR_OK)
+  {
+    (void)printf(">>> Message authenticated\r\n");
+  }
+  else
+  {
+    (void)printf("XXX Message not authenticated\r\n");
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  return rv;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/ymodem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/ymodem.c
new file mode 100644
index 00000000..8a61d4a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/Src/ymodem.c
@@ -0,0 +1,395 @@
+/**
+  ******************************************************************************
+  * @file    ymodem.c
+  * @author  MCD Application Team
+  * @brief   Ymodem module.
+  *          This file provides set of firmware functions to manage Ymodem
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup  FW_UPDATE Firmware Update Example
+  * @{
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "common.h"
+#include "ymodem.h"
+#include "string.h"
+#include "main.h"
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* @note ATTENTION - please keep this variable 32bit aligned */
+static uint8_t m_aPacketData[PACKET_1K_SIZE + PACKET_DATA_INDEX +
+                             PACKET_TRAILER_SIZE]; /*!<Array used to store Packet Data*/
+uint8_t m_aFileName[FILE_NAME_LENGTH + 1U]; /*!< Array used to store File Name data */
+static CRC_HandleTypeDef CrcHandle; /*!<CRC handle*/
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout);
+
+/* Private functions ---------------------------------------------------------*/
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeout
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  uint8_t char1;
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0;
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* If the SecureBoot configured the IWDG, UserApp must reload IWDG counter with value defined in the
+     reload register */
+  WRITE_REG(IWDG->KR, IWDG_KEY_RELOAD);
+
+  status = (HAL_StatusTypeDef)COM_Receive(&char1, 1, uTimeout);
+
+  if (status == HAL_OK)
+  {
+    switch (char1)
+    {
+      /* start of 128-byte data packet */
+      case SOH:
+        packet_size = PACKET_SIZE;
+        break;
+      /* start of 1024-byte data packet */
+      case STX:
+        packet_size = PACKET_1K_SIZE;
+        break;
+      /* end of transmission */
+      case EOT:
+        break;
+      /* CA + CA : transmission aborted by sender */
+      case CA:
+        if ((COM_Receive(&char1, 1U, uTimeout) == HAL_OK) && (char1 == CA))
+        {
+          packet_size = 2U;                               /* specific packet_size to indicate transmission aborted */
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      /* abort requested */
+      case ABORT1:
+      case ABORT2:
+        status = HAL_BUSY;
+        break;
+      /* Begin of startup sequence */
+      case RB:
+        COM_Receive(&char1, 1U, uTimeout);                /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        COM_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;                                 /* specific packet_size to indicate transmission started */
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= PACKET_SIZE)
+    {
+#ifndef MINICOM_YMODEM
+      /* Receiving the packet */
+      status = COM_Receive(&pData[PACKET_NUMBER_INDEX], packet_size + PACKET_OVERHEAD_SIZE, uTimeout);
+#else
+      status = HAL_OK;
+      while ((HAL_OK == status) &&
+             ((myIdx + PACKET_NUMBER_INDEX) < (PACKET_1K_SIZE + PACKET_DATA_INDEX + PACKET_TRAILER_SIZE))
+            )
+      {
+        status = COM_Receive(&pData[PACKET_NUMBER_INDEX + myIdx], 1, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        status = HAL_OK;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (status == HAL_OK)
+      {
+        if (pData[PACKET_NUMBER_INDEX] != ((pData[PACKET_CNUMBER_INDEX]) ^ NEGATIVE_BYTE))
+        {
+          /* Packet size set to 0 in case of sanity check error */
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC */
+          crc = pData[ packet_size + PACKET_DATA_INDEX ] << 8U;
+          crc += pData[ packet_size + PACKET_DATA_INDEX + 1U ];
+          if (HAL_CRC_Calculate(&CrcHandle, (uint32_t *)&pData[PACKET_DATA_INDEX], packet_size) != crc)
+          {
+            /* Packet size set to 0 in case of CRC error */
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        /* Packet size set to 0 in case of reception error */
+        packet_size = 0U;
+      }
+    }
+  }
+
+  /* Update the length parameter */
+  *puLength = packet_size;
+  return status;
+}
+
+
+/**
+  * @brief  Init of Ymodem module.
+  * @param None.
+  * @retval None.
+  */
+void Ymodem_Init(void)
+{
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  /* Configure the CRC peripheral */
+  CrcHandle.Instance = CRC;
+
+  /* The CRC-16-CCIT polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+  CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+  CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+
+  /* The zero init value is used */
+  CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+  CrcHandle.Init.InitValue               = 0U;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode  = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+
+  if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1U)
+    {}
+  }
+}
+
+
+/* Public functions ---------------------------------------------------------*/
+/**
+  * @brief  Receive a file using the ymodem protocol with CRC16.
+  * @param  puSize The uSize of the file.
+  * @param  uFlashDestination where the file has to be downloaded.
+  * @retval COM_StatusTypeDef result of reception/programming
+  */
+COM_StatusTypeDef Ymodem_Receive(uint32_t *puSize, uint32_t uFlashDestination, YMODEM_CallbacksTypeDef *appCb)
+{
+  uint32_t i;
+  uint32_t packet_length;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t ramsource;
+  uint32_t filesize;
+  uint8_t *file_ptr;
+  uint8_t file_size[FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  uint32_t packets_received;
+  COM_StatusTypeDef e_result = COM_OK;
+
+  while ((session_done == 0U) && (e_result == COM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (e_result == COM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              Serial_PutByte(ACK);
+              e_result = COM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              Serial_PutByte(ACK);
+              *puSize = filesize;
+              file_done = 1U;           /* file reception ended */
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[PACKET_NUMBER_INDEX] != (packets_received & 0xff))
+              {
+                /* Serial_PutByte(NAK); */
+              }
+              else
+              {
+                /* first packet : header (file name + file size) */
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name extraction */
+                    i = 0U;
+                    file_ptr = m_aPacketData + PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < FILE_NAME_LENGTH))
+                    {
+                      m_aFileName[i++] = *file_ptr++;
+                    }
+
+                    /* File size extraction */
+                    m_aFileName[i++] = '\0';
+                    i = 0U;
+                    file_ptr ++;
+                    while ((*file_ptr != ' ') && (i < FILE_SIZE_LENGTH))
+                    {
+                      file_size[i++] = *file_ptr++;
+                    }
+                    file_size[i++] = '\0';
+                    Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call */
+                    if (appCb->Ymodem_HeaderPktRxCpltCallback((uint32_t) filesize) == HAL_OK)
+                    {
+                      /* Send acknowledge and next packet requested */
+                      Serial_PutByte(ACK);
+                      COM_Flush();
+                      Serial_PutByte(CRC16);
+                    }
+                    else
+                    {
+                      /* In case of error : transmission aborted
+                         Send CA + CA */
+                      tmp = CA;
+                      COM_Transmit(&tmp, 1U, NAK_TIMEOUT);
+                      COM_Transmit(&tmp, 1U, NAK_TIMEOUT);
+                      e_result = COM_ABORT;
+                      break;
+                    }
+
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    Serial_PutByte(ACK);
+                    file_done = 1;           /* file reception ended */
+                    session_done = 1;        /* sesion ended */
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  ramsource = (uint32_t) & m_aPacketData[PACKET_DATA_INDEX];
+
+                  /* Data packet received callback call*/
+                  if (appCb->Ymodem_DataPktRxCpltCallback((uint8_t *) ramsource, uFlashDestination,
+                                                          (uint32_t) packet_length) == HAL_OK)
+                  {
+                    /* Packet acknowledged : newt one requested */
+                    Serial_PutByte(ACK);
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* Abort transmission : CA + CA */
+                    tmp = CA;
+                    COM_Transmit(&tmp, 1U, NAK_TIMEOUT);
+                    COM_Transmit(&tmp, 1U, NAK_TIMEOUT);
+                    e_result = COM_ERROR;
+                  }
+                }
+                packets_received ++;
+                session_begin = 1U;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          Serial_PutByte(CA);
+          Serial_PutByte(CA);
+          e_result = COM_ABORT;
+          break;
+        default:
+          /* Com aborted after 5 consecutives error */
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > MAX_ERRORS)
+          {
+            /* Abort communication */
+            Serial_PutByte(CA);
+            Serial_PutByte(CA);
+            e_result = COM_ABORT;
+          }
+          else
+          {
+            Serial_PutByte(CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            printf("\b.");         /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+          }
+          break;
+      }
+    }
+  }
+  return e_result;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/readme.txt
new file mode 100644
index 00000000..b033e836
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M0Plus/readme.txt
@@ -0,0 +1,162 @@
+/**
+  @page 2_Images_UserApp_M0Plus / Secure Firmware Update - M0+ User Application Demo
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows a User Application
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application demonstrates firmware download capabilities and provides a set of functions to test the active
+protections offered by Secure Boot and Secure Engine.
+It also demonstrates key management services through basic examples and specific boot
+mechanism (secure firmware update decryption, verification...)
+A terminal connected with the board via VCOM is needed to communicate with the board and to select which feature
+to demonstrate.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from
+the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 2_Images_UserApp_M0Plus/Src/com.c                    Communication module file
+   - 2_Images_UserApp_M0Plus/Src/common.c                 Common module file
+   - 2_Images_UserApp_M0Plus/Src/flash_if.c               Flash interface file
+   - 2_Images_UserApp_M0Plus/Src/fw_update_app.c          Firmware update application
+   - 2_Images_UserApp_M0Plus/Src/kms_object_update_app.c  KMS Blob update application
+   - 2_Images_UserApp_M0Plus/Src/main.c                   Main program
+   - 2_Images_UserApp_M0Plus/Src/mpu.c                    Secure Engine isolation with MPU (when no Firewall is available)
+   - 2_Images_UserApp_M0Plus/Src/se_user_code.c           Call user defined services running in Secure Engine
+   - 2_Images_UserApp_M0Plus/Src/sfu_app_new_image.c      Manage the new firmware image storage and installation
+   - 2_Images_UserApp_M0Plus/Src/stm32wlxx_it.c           Interrupt handlers
+   - 2_Images_UserApp_M0Plus/Src/system_stm32wlxx.c       STM32 system file
+   - 2_Images_UserApp_M0Plus/Src/test_protections.c       Protection test
+   - 2_Images_UserApp_M0Plus/Src/tkms_app.c               tKMS tests
+   - 2_Images_UserApp_M0Plus/Src/tkms_app_derive_key.c    tKMS key derivation tests
+   - 2_Images_UserApp_M0Plus/Src/tkms_app_encrypt_decrypt.c tKMS encryption/decryption tests
+   - 2_Images_UserApp_M0Plus/Src/tkms_app_sign_verify.c   tKMS signature/verification tests
+   - 2_Images_UserApp_M0Plus/Src/ymodem.c                 Ymodem communication module
+   - 2_Images_UserApp_M0Plus/Inc/com.h                    Header for com.c file
+   - 2_Images_UserApp_M0Plus/Inc/common.h                 Header for common.c file
+   - 2_Images_UserApp_M0Plus/Inc/flash_if.h               Header for flash_if.c file
+   - 2_Images_UserApp_M0Plus/Inc/fw_update_app.h          Header for fw_update_app.c file
+   - 2_Images_UserApp_M0Plus/Inc/main.h                   Header for main.c file
+   - 2_Images_UserApp_M0Plus/Inc/mpu.h                    Header file for mpu.c
+   - 2_Images_UserApp_M0Plus/Inc/se_user_code.h           Header file for se_user_code.c
+   - 2_Images_UserApp_M0Plus/Inc/sfu_app_new_image.h      Header file for sfu_app_new_image.c
+   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_hal_conf.h     HAL configuration file
+   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_it.h           Header for stm32wlxx_it.c file
+   - 2_Images_UserApp_M0Plus/Inc/stm32wlxx_nucleo_conf.h  BSP configuration file
+   - 2_Images_UserApp_M0Plus/Inc/test_protections.h       Header for test_protections.c file
+   - 2_Images_UserApp_M0Plus/Inc/tkms_app.h               Header for tkms_app.c file
+   - 2_Images_UserApp_M0Plus/Inc/ymodem.h                 Header for ymodem.c file
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices.
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
+    is a feature provided by STM32Cube programmer available on www.st.com.
+  - This example is based on se_interface_application.o module exported by SBSFU project.
+  - This example needs a terminal emulator.
+  - Microsoft Windows has a limitation whereby paths to files and directories cannot
+    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
+    shell scripts) to fail reading from or writing to such files.
+    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
+    up a local drive out of an existing directory on the hard drive, such as:
+    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par IDE postbuild script
+
+In order to ease the development process, a postbuild script ("postbuild.bat") is integrated in each IDE project.
+This postbuild script:
+ - is generated when compiling the Secure Engine Core project,
+ - prepares the firmware image of the user application to be installed in the device.
+ - prepares the new portion of firmware image: part of firmware image which changed vs a reference firmware image.
+   The reference firmware image is provided to the postbuild script by manually copying the UserApp.bin of the running
+   application into RefUserApp.bin (in folder 2_Images_UserApp_M0Plus/IDE).
+
+   As an example, once original user application has been built, downloaded and installed, you may create the
+   RefUserApp.bin, then change UserAppId constant from 'A' to 'B' in source file main.c, then build again the user
+   application.
+   At post processing stage, the portion of code containing the UserAppId will be identified as a difference vs
+   the reference binary file and a PartialUserApp.sfb will be generated in 2_Images_UserApp_M0Plus/Binary folder.
+
+A known limitation of this integration occurs when you update the firmware version (parameter of postbuild.bat script).
+The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+Refer to SBSFU readme and follow steps by steps instructions.
+
+Once executed, this user application gives access to a menu which allows:
+  1 - to download a new firmware
+  2 - to test protections (GTZC isolation, HDP, WRP, IWDG, TAMPER, MPU isolation)
+  3 - to demonstrate how to call user defined services running in Secure Engine
+  4 - to provide access to multiple images feature (not supported)
+  5 - to validate a firmware image at first start-up (not supported)
+  a - to demonstrate usage of key management services
+
+1. Pressing 1 allows to download a new firmware.
+Send the user encrypted firmware file (.sfb) with Tera Term by using menu "File > Transfer > YMODEM > Send..."
+After the download, the system reboots.
+The downloaded encrypted firmware is detected, decrypted, installed and executed.
+
+The downloaded image can be either a complete UserApp.sfb or a PartialUserApp.sfb.
+To download a PartialUserApp.sfb, it is mandatory to have previously installed the UserApp.sfb identified as reference
+into the device.
+
+2. Pressing 2 allows to test protections.
+
+ - CORRUPT IMAGE test (#1): causes a signature verification failure at next boot
+ - Isolation tests (#2, #3): cause a reset trying to access protected code or data (either in RAM or FLASH)
+ - Secure user memory protection test (#4): cause an error trying to access protected code
+ - WRP test (#5): causes an error trying to erase write protected code
+ - IWDG test (#6): causes a reset simulating a deadlock by not refreshing the watchdog.
+ - TAMPER test (#7): causes a reset if a tamper event is detected. In order to generate a tamper event,
+   user has to connect PC13 (CN7.23) to GND (It may be enough to put your finger close to PC13 (CN7.23)).
+   By default, the feature is disabled (see the SBSFU readme.txt).
+ - GTZC tests (#8): causes an error trying to access to protected IP, code or data (either in RAM or FLASH)
+ - KMS data storage test (#9): causes an error trying to access KMS data storage (NVM data)
+
+3. Pressing 3 allows to call user defined services running in Secure Engine.
+ - As an example, SE_APP_GetActiveFwInfo (#1, #2) service is called in order to display the firmware information
+   located in the protected area such as version and size.
+ - The IRQ handling tests (#a, #b) show how to disable and to enable IRQ services.
+   Each interface must be called once (no consecutive calls of the same interface).
+   Presses on the User Button generate interrupts (handled or not depending on whether the interrupts are enabled).
+
+4. This menu is dedicated to multiple images feature.
+Feature not available as there is only 1 download area configured.
+
+5. This menu is dedicated to image validation.
+Feature available under ENABLE_IMAGE_STATE_HANDLING compilation switch, not available in this example.
+
+a. Pressing a allows to enter specific key management services test menu.
+With this menu, you should be able to try encryption/decryption, signature/verification or key derivation mechanisms.
+
+
+Note1 : There is only 1 active slot configured in this example.
+Note2 : for Linux users Minicom can be used but to do so you need to compile the UserApp project with the MINICOM_YMODEM
+        switch enabled (ymodem.h)
+
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.ewd
new file mode 100644
index 00000000..ed5b792a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_UserApp_M4</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp
new file mode 100644
index 00000000..2fd9e4f7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.ewp
@@ -0,0 +1,1109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_UserApp_M4</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>CORE_CM4</state>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\UserApp.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\UserApp.bin" 2 1"</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM\</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\main.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\stm32wlxx_it.c</name>
+      </file>
+    </group>
+    <group>
+      <name>EWARM</name>
+      <file>
+        <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>BSP</name>
+      <group>
+        <name>STM32WLxx_Nucleo</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+        </file>
+      </group>
+    </group>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+      </file>
+    </group>
+    <group>
+      <name>CMSIS</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\system_stm32wlxx.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..a465e21c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,41 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+define symbol __ICFEDIT_region_M4_APP_ROM_start__ = __ICFEDIT_SLOT_Active_2_start__ + 512;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+define region M4_APP_ROM_region      = mem:[from __ICFEDIT_region_M4_APP_ROM_start__ to __ICFEDIT_SLOT_Active_2_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_region_M4_APP_ROM_start__ { readonly section .intvec };
+place in M4_APP_ROM_region   { readonly, last section aes_block_padding };
+place in M4_APP_RAM_region   { readwrite, block CSTACK, block HEAP };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/main.h
new file mode 100644
index 00000000..b7b1fd30
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/main.h
@@ -0,0 +1,35 @@
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for main application file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAIN_H
+#define MAIN_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+#endif /* MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..49fdd150
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+/* #define HAL_CRC_MODULE_ENABLED */
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+/* #define HAL_IWDG_MODULE_ENABLED */
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+/* #define HAL_RTC_MODULE_ENABLED */
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+/* #define HAL_TIM_MODULE_ENABLED */
+/* #define HAL_UART_MODULE_ENABLED */
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+/* #define HAL_DMA_MODULE_ENABLED */
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..1aaa7878
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_it.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/* Exported macro ------------------------------------------------------------*/
+/* Exported functions ------------------------------------------------------- */
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..49a562ad
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvoptx
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M4</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_cm4.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..c40f67e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/Project.uvprojx
@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_UserApp_M4</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6120000::V6.12::.\ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>UserApp_CM4</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath>STM32WL55JC_Nucleo/List\</ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 2 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>0</hadIROM>
+            <hadIRAM>0</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>1</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../Linker_Common/MDK-ARM;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>.\UserApp_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_UserApp_M4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/STM32WL_cm4.ini b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/STM32WL_cm4.ini
new file mode 100644
index 00000000..f42b2bba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/STM32WL_cm4.ini
@@ -0,0 +1,23 @@
+/******************************************************************************/
+/* STM32WL_cm0plus.INI: CM0 CPU Initialization File                                           
+/******************************************************************************/
+/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
+/* * All rights reserved.</center>*/
+/*  *
+/*  * This software component is licensed by ST under BSD 3-Clause license,*/
+/*  * the "License"; You may not use this file except in compliance with the */
+/*  * License. You may obtain a copy of the License at:*/
+/*  *                        opensource.org/licenses/BSD-3-Clause*/
+/*  *
+/*  ****************************************************************************/
+/******************************************************************************/
+
+FUNC void Setup (void) {
+  SP = _RDWORD(0x08015200);          // Setup Stack Pointer
+  PC = _RDWORD(0x08015204);          // Setup Program Counter
+   
+}
+
+Setup();                             // Setup for Running
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct
new file mode 100644
index 00000000..327142fc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/UserApp_cm4.sct
@@ -0,0 +1,28 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_2_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_2_START + 0x200) FIXED VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+  ROM_region +0 {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  RAM_region M4_APP_REGION_RAM_START M4_APP_RAM_REGION_SIZE {
+  .ANY (STACK)
+  .ANY (HEAP)
+  .ANY (+RW +ZI)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and WL flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..adc65365
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,371 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;*
+;* This software component is licensed by ST under 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:
+;*                        opensource.org/licenses/Apache-2.0
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size      EQU     0x00000400
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size       EQU     0x00000200
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..47ba5770
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.cproject
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="UserApp_cm4" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;2&quot; &quot;1&quot;" prebuildStep="">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/UserApp_cm4.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_UserApp_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/UserApp_cm4.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.401807756" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1858145420" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/UserApp_cm4.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_UserApp_CM4.null.394363235" name="2_Images_UserApp_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1841872319.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1760382810;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.348888983">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.project
new file mode 100644
index 00000000..c99eaa2f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/.project
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_UserApp_CM4</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Src/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..89dfe9e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,436 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under 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:
+  *                        opensource.org/licenses/Apache-2.0
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch
new file mode 100644
index 00000000..24d9fd10
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\UserApp_cm4.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_UserApp_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\UserApp_cm4.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_UserApp_CM4"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_UserApp_CM4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.ld
new file mode 100644
index 00000000..802579dc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/STM32CubeIDE/UserApp_cm4.ld
@@ -0,0 +1,164 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size  = 0x200; /* required amount of heap  */
+_Min_Stack_Size = 0x800; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  ISR_VECTOR (rx)    : ORIGIN = (SLOT_Active_2_start + 0x200), LENGTH = Vector_size
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_2_start + Vector_size + 0x200), LENGTH = (SLOT_Active_2_end - SLOT_Active_2_start + 1 - 0x200 - Vector_size)
+  APPLI_RAM  (xrw)   : ORIGIN = M4_APP_region_RAM_start, LENGTH = M4_APP_region_RAM_size
+}
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >ISR_VECTOR
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .ARM.extab   : { 
+    . = ALIGN(8);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .ARM : {
+    . = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .init_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+  
+  .fini_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+    
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/main.c
new file mode 100644
index 00000000..fb5174e9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/main.c
@@ -0,0 +1,174 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Firmware Update.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+uint8_t *pUserAppId;
+const uint8_t UserAppId = 'A';
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+
+/**
+  * @brief  Main program
+  * @param  None
+  * @retval None
+  */
+int main(void)
+{
+  /*  set example to const : this const changes in binary without rebuild */
+  pUserAppId = (uint8_t *)&UserAppId;
+
+  /* STM32WLxx HAL library initialization:
+  - Configure the Flash prefetch
+  - Systick timer is configured by default as source of time base, but user
+  can eventually implement his proper time base source (a general purpose
+  timer for example or other time source), keeping in mind that Time base
+  duration should be kept 1ms since PPP_TIMEOUT_VALUEs are defined and
+  handled in milliseconds basis.
+  - Set NVIC Group Priority to 4
+  - Low Level Initialization
+  */
+  HAL_Init();
+
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+  /* LED Init*/
+  BSP_LED_Init(LED_BLUE);
+
+  while (1U)
+  {
+    BSP_LED_Toggle(LED_BLUE);
+    HAL_Delay(100U);
+  }
+
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+
+#ifdef  USE_FULL_ASSERT
+
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* User can add his own implementation to report the file name and line number,
+   ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+
+  /* Infinite loop */
+  while (1U)
+  {
+  }
+}
+#endif /* USE_FULL_ASSERT */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..10ec0e6a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/stm32wlxx_it.c
@@ -0,0 +1,181 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/** @addtogroup USER_APP User App Example
+  * @{
+  */
+
+/** @addtogroup USER_APP_COMMON Common
+  * @{
+  */
+/* Private typedef -----------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+/* Private functions ---------------------------------------------------------*/
+
+/******************************************************************************/
+/*            Cortex-M4 Processor Exceptions Handlers                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles NMI exception.
+  * @param  None
+  * @retval None
+  */
+void NMI_Handler(void)
+{
+  /* Go to infinite loop when NMI exception occurs */
+  while (1)
+  {
+    /* Reboot when NMI exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Hard Fault exception.
+  * @param  None
+  * @retval None
+  */
+void HardFault_Handler(void)
+{
+  /* Go to infinite loop when Hard Fault exception occurs */
+  while (1)
+  {
+    /* Reboot when Hard Fault exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Memory Manage exception.
+  * @param  None
+  * @retval None
+  */
+void MemManage_Handler(void)
+{
+  /* Go to infinite loop when Memory Manage exception occurs */
+  while (1)
+  {
+    /* Reboot when Memory Manage exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Bus Fault exception.
+  * @param  None
+  * @retval None
+  */
+void BusFault_Handler(void)
+{
+  /* Go to infinite loop when Bus Fault exception occurs */
+  while (1)
+  {
+    /* Reboot when Bus Fault exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles Usage Fault exception.
+  * @param  None
+  * @retval None
+  */
+void UsageFault_Handler(void)
+{
+  /* Go to infinite loop when Usage Fault exception occurs */
+  while (1)
+  {
+    /* Reboot when Usage Fault exception occurs */
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  This function handles SVCall exception.
+  * @param  None
+  * @retval None
+  */
+void SVC_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles Debug Monitor exception.
+  * @param  None
+  * @retval None
+  */
+void DebugMon_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers             */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                         */
+/******************************************************************************/
+
+/**
+  * @brief  This function handles PPP interrupt request.
+  * @param  None
+  * @retval None
+  */
+/*void PPP_IRQHandler(void)
+{
+}*/
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/system_stm32wlxx.c
new file mode 100644
index 00000000..bedef774
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/Src/system_stm32wlxx.c
@@ -0,0 +1,388 @@
+/**
+  ******************************************************************************
+  * @file    system_stm32wlxx.c
+  * @author  MCD Application Team
+  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
+  *
+  *   This file provides two functions and one global variable to be called from
+  *   user application:
+  *      - SystemInit(): This function is called at startup just after reset and
+  *                      before branch to main program. This call is made inside
+  *                      the "startup_stm32wlxx.s" file.
+  *
+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
+  *                                  by the user application to setup the SysTick
+  *                                  timer or configure other parameters.
+  *
+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
+  *                                 be called whenever the core clock is changed
+  *                                 during program execution.
+  *
+  *   After each device reset the MSI (4 MHz) is used as system clock source.
+  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
+  *   configure the system clock before to branch to main program.
+  *
+  *   This file configures the system clock as follows:
+  *=============================================================================
+  *-----------------------------------------------------------------------------
+  *        System Clock source                    | MSI
+  *-----------------------------------------------------------------------------
+  *        SYSCLK(Hz)                             | 4000000
+  *-----------------------------------------------------------------------------
+  *        HCLK(Hz)                               | 4000000
+  *-----------------------------------------------------------------------------
+  *        AHB Prescaler                          | 1
+  *-----------------------------------------------------------------------------
+  *        APB1 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        APB2 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_M                                  | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_N                                  | 8
+  *-----------------------------------------------------------------------------
+  *        PLL_P                                  | 7
+  *-----------------------------------------------------------------------------
+  *        PLL_Q                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLL_R                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_P                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_Q                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_R                              | NA
+  *-----------------------------------------------------------------------------
+  *        Require 48MHz for USB OTG FS,          | Disabled
+  *        SDIO and RNG clock                     |
+  *-----------------------------------------------------------------------------
+  *=============================================================================
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics. 
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/** @addtogroup CMSIS
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_system
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_System_Private_Includes
+  * @{
+  */
+
+#include "stm32wlxx.h"
+
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (MSI_VALUE)
+   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
+#endif /* LSI_VALUE */
+
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Defines
+  * @{
+  */
+
+/* Note: Following vector table addresses must be defined in line with linker
+         configuration. */
+/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
+     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
+     at address 0x00 which correspond to automatic remap of boot address selected */
+/* #define USER_VECT_TAB_ADDRESS */
+#if defined(USER_VECT_TAB_ADDRESS)
+#ifdef CORE_CM0PLUS
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
+#else /* CORE_CM4 */
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+#endif
+#endif
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Variables
+  * @{
+  */
+  /* The SystemCoreClock variable is updated in three ways:
+      1) from within HAL_Init()
+      2) by calling CMSIS function SystemCoreClockUpdate()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
+  */
+  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
+
+  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
+
+  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
+
+  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
+    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Functions
+  * @{
+  */
+#if defined(__ARMCC_VERSION)
+extern void * __Vectors;
+#define INTVECT_START ((uint32_t) & __Vectors)
+#elif defined(__ICCARM__)
+extern uint32_t __vector_table;
+#define INTVECT_START ((uint32_t)& __vector_table)
+#elif defined(__GNUC__)
+extern void * g_pfnVectors;
+#define INTVECT_START ((uint32_t)& g_pfnVectors)
+#endif
+
+/**
+  * @brief  Setup the microcontroller system.
+  * @param  None
+  * @retval None
+  */
+void SystemInit(void)
+{
+  /* Configure the Vector Table location  ------------------*/
+  SCB->VTOR = INTVECT_START;
+
+  /* FPU settings ------------------------------------------------------------*/
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
+#endif
+
+  /* Reset the RCC clock configuration to the default reset state ------------*/
+  /* Set MSION bit */
+  RCC->CR |= RCC_CR_MSION;
+
+  /* Reset CFGR register */
+  RCC->CFGR = 0x00070000U;
+
+  /* Reset HSEON, CSSON , HSION, and PLLON bits */
+  /* RCC->CR &= 0xEAF6FFFFU; */
+  RCC->CR &= 0x2321EFF;
+
+  /* Reset PLLCFGR register */
+  RCC->PLLCFGR = 0x22040100;
+
+  /* Reset HSEBYP bit */
+  RCC->CR &= 0xFFDFFFFFFU;
+
+  /* Disable all interrupts */
+  RCC->CIER = 0x00000000U;
+}
+
+/**
+  * @brief  Update SystemCoreClock variable according to Clock Register Values.
+  *         The SystemCoreClock variable contains the core clock (HCLK), it can
+  *         be used by the user application to setup the SysTick timer or configure
+  *         other parameters.
+  *
+  * @note   Each time the core clock (HCLK) changes, this function must be called
+  *         to update SystemCoreClock variable value. Otherwise, any configuration
+  *         based on this variable will be incorrect.
+  *
+  * @note   - The system frequency computed by this function is not the real
+  *           frequency in the chip. It is calculated based on the predefined
+  *           constant and the selected clock source:
+  *
+  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
+  *
+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
+  *
+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
+  *
+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
+  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
+  *
+  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
+  *             4 MHz) but the real value may vary depending on the variations
+  *             in voltage and temperature.
+  *
+  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              16 MHz) but the real value may vary depending on the variations
+  *              in voltage and temperature.
+  *
+  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
+  *              frequency of the crystal used. Otherwise, this function may
+  *              have wrong result.
+  *
+  *         - The result of this function could be not correct when using fractional
+  *           value for HSE crystal.
+  *
+  * @param  None
+  * @retval None
+  */
+void SystemCoreClockUpdate(void)
+{
+  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
+
+ /* Get MSI Range frequency--------------------------------------------------*/
+
+   /* Get MSI Range frequency--------------------------------------------------*/
+   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
+   { /* MSISRANGE from RCC_CSR applies */
+     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
+   }
+   else
+   { /* MSIRANGE from RCC_CR applies */
+     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
+   }
+   /*MSI frequency range in HZ*/
+   msirange = MSIRangeTable[msirange];
+
+
+  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
+  /* Get SYSCLK source -------------------------------------------------------*/
+  switch (RCC->CFGR & RCC_CFGR_SWS)
+  {
+    case 0x00:   /* MSI used as system clock source */
+      SystemCoreClock = msirange;
+      break;
+
+    case 0x04:  /* HSI used as system clock source */
+      /* HSI used as system clock source */
+        SystemCoreClock = HSI_VALUE;
+      break;
+
+    case 0x08:  /* HSE used as system clock source */
+      SystemCoreClock = HSE_VALUE;
+      break;
+
+    case 0x0C: /* PLL used as system clock  source */
+      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
+         SYSCLK = PLL_VCO / PLLR
+         */
+      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
+      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
+
+      switch (pllsource)
+      {
+        case 0x02:  /* HSI used as PLL clock source */
+          pllvco = (HSI_VALUE / pllm);
+          break;
+
+        case 0x03:  /* HSE used as PLL clock source */
+          pllvco = (HSE_VALUE / pllm);
+          break;
+
+        default:    /* MSI used as PLL clock source */
+          pllvco = (msirange / pllm);
+          break;
+      }
+
+      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
+      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
+
+      SystemCoreClock = pllvco/pllr;
+      break;
+
+    default:
+      SystemCoreClock = msirange;
+      break;
+  }
+
+  /* Compute HCLK clock frequency --------------------------------------------*/
+#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
+  /* Get HCLK2 prescaler */
+  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
+#else
+  /* Get HCLK1 prescaler */
+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
+#endif
+
+  /* Core clock frequency */
+  SystemCoreClock = SystemCoreClock / tmp;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/readme.txt
new file mode 100644
index 00000000..4ad380fb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/2_Images_UserApp_M4/readme.txt
@@ -0,0 +1,81 @@
+/**
+  @page 2_Images_UserApp_M4 / Secure Firmware Update - M4 User Application Demo
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows a User Application
+  ******************************************************************************
+  *
+  * Copyright (c) 2020 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application demonstrates firmware download capabilities.
+
+This very simple user application makes the blue LED blink every 100 ms.
+
+@par Keywords
+
+Security
+
+@par Directory contents
+
+
+   - 2_Images_UserApp_M4/Src/main.c                   Main program
+   - 2_Images_UserApp_M4/Src/stm32wlxx_it.c           Interrupt handlers
+   - 2_Images_UserApp_M4/Src/system_stm32wlxx.c       STM32 system file
+   - 2_Images_UserApp_M4/Inc/main.h                   Header for main.c file
+   - 2_Images_UserApp_M4/Inc/stm32wlxx_hal_conf.h     HAL configuration file
+   - 2_Images_UserApp_M4/Inc/stm32wlxx_it.h           Header for stm32wlxx_it.c file
+   - 2_Images_UserApp_M4/Inc/stm32wlxx_nucleo_conf.h  BSP configuration file
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices.
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware
+    is a feature provided by STM32Cube programmer available on www.st.com.
+  - Microsoft Windows has a limitation whereby paths to files and directories cannot
+    be longer than 256 characters. Paths to files exceeding that limits cause tools (e.g. compilers,
+    shell scripts) to fail reading from or writing to such files.
+    As a workaround, it is advised to use the subst.exe command from within a command prompt to set
+    up a local drive out of an existing directory on the hard drive, such as:
+    C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par IDE postbuild script
+
+In order to ease the development process, a postbuild script ("postbuild.bat") is integrated in each IDE project.
+This postbuild script:
+ - is generated when compiling the Secure Engine Core project,
+ - prepares the firmware image of the user application to be installed in the device.
+ - prepares the new portion of firmware image: part of firmware image which changed vs a reference firmware image.
+   The reference firmware image is provided to the postbuild script by manually copying the UserApp.bin of the running
+   application into RefUserApp.bin (in folder 2_Images_UserApp_M4/IDE).
+ - generates a big binary including M4 SB, M0+ SBSFU, M0+ UserApp, M4 UserApp.
+
+   As an example, once original user application has been built, downloaded and installed, you may create the
+   RefUserApp.bin, then change the LED blinking period in source file main.c, then build again the user
+   application.
+   At post processing stage, the portion of changed code will be identified as a difference vs
+   the reference binary file and a PartialUserApp.sfb will be generated in 2_Images_UserApp_M4/Binary folder.
+
+A known limitation of this integration occurs when you update the firmware version (parameter of
+postbuild.bat script).
+The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+Refer to SBSFU readme and follow steps by steps instructions.
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/EWARM/mapping_export.h
new file mode 100644
index 00000000..cc707721
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/EWARM/mapping_export.h
@@ -0,0 +1,126 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t __ICFEDIT_M4_SB_region_ROM_start__;
+#define M4_SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_M4_SB_region_ROM_end__;
+#define M4_SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_intvec_start__;
+#define INTVECT_START ((uint32_t)& __ICFEDIT_intvec_start__)
+extern uint32_t __ICFEDIT_SE_Startup_region_ROM_start__;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Startup_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_start__;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_end__;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_start__;
+#define SE_IF_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_end__;
+#define SE_IF_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_start__;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_end__;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_CallGate_region_ROM_start__;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_CallGate_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_start__;
+#define SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_end__;
+#define SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_start__;
+#define SE_REGION_RAM_START ((uint32_t)& __ICFEDIT_SE_region_RAM_start__)
+extern uint32_t __ICFEDIT_SE_region_RAM_end__ ;
+#define SE_REGION_RAM_END ((uint32_t)& __ICFEDIT_SE_region_RAM_end__)
+extern uint32_t __ICFEDIT_SB_region_RAM_start__ ;
+#define SB_REGION_RAM_START ((uint32_t)& __ICFEDIT_SB_region_RAM_start__)
+extern uint32_t __ICFEDIT_SB_region_RAM_end__ ;
+#define SB_REGION_RAM_END ((uint32_t)& __ICFEDIT_SB_region_RAM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_stack_top__;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& __ICFEDIT_SE_region_RAM_stack_top__)
+
+extern uint32_t __ICFEDIT_KMS_DataStorage_start__ ;
+#define KMS_DATASTORAGE_START ((uint32_t)& __ICFEDIT_KMS_DataStorage_start__)
+extern uint32_t __ICFEDIT_KMS_DataStorage_end__ ;
+#define KMS_DATASTORAGE_END ((uint32_t)& __ICFEDIT_KMS_DataStorage_end__)
+
+
+#if defined (__ICCARM__) || defined(__GNUC__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_header__;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_1_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_start__;
+#define SLOT_ACTIVE_1_START ((uint32_t)& __ICFEDIT_SLOT_Active_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_end__;
+#define SLOT_ACTIVE_1_END ((uint32_t)& __ICFEDIT_SLOT_Active_1_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_header__;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_2_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_start__;
+#define SLOT_ACTIVE_2_START ((uint32_t)& __ICFEDIT_SLOT_Active_2_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_end__;
+#define SLOT_ACTIVE_2_END ((uint32_t)& __ICFEDIT_SLOT_Active_2_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_header__;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_3_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_start__;
+#define SLOT_ACTIVE_3_START ((uint32_t)& __ICFEDIT_SLOT_Active_3_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_end__;
+#define SLOT_ACTIVE_3_END ((uint32_t)& __ICFEDIT_SLOT_Active_3_end__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_1_start__;
+#define SLOT_DWL_1_START ((uint32_t)& __ICFEDIT_SLOT_Dwl_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_1_end__;
+#define SLOT_DWL_1_END ((uint32_t)& __ICFEDIT_SLOT_Dwl_1_end__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_2_start__;
+#define SLOT_DWL_2_START ((uint32_t)& __ICFEDIT_SLOT_Dwl_2_start__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_2_end__;
+#define SLOT_DWL_2_END ((uint32_t)& __ICFEDIT_SLOT_Dwl_2_end__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_3_start__;
+#define SLOT_DWL_3_START ((uint32_t)& __ICFEDIT_SLOT_Dwl_3_start__)
+extern uint32_t __ICFEDIT_SLOT_Dwl_3_end__;
+#define SLOT_DWL_3_END ((uint32_t)& __ICFEDIT_SLOT_Dwl_3_end__)
+extern uint32_t __ICFEDIT_SWAP_start__;
+#define SWAP_START ((uint32_t)& __ICFEDIT_SWAP_start__)
+extern uint32_t __ICFEDIT_SWAP_end__;
+#define SWAP_END ((uint32_t)& __ICFEDIT_SWAP_end__)
+
+/* DualCore specificities */
+#if !defined(CORE_CM0PLUS)
+extern uint32_t __ICFEDIT_region_ROM_end__ ;
+#define C1_AREA_ADDR_END  ((uint32_t)& __ICFEDIT_region_ROM_end__)
+#define C2_BOOT_BASE_ADDR ((uint32_t)& __ICFEDIT_intvec_start__)
+#endif /* CORE_CM0PLUS */
+extern volatile uint32_t __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ ;
+#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__)
+
+#endif /* __ICCARM__ || __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/EWARM/mapping_fwimg.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
new file mode 100644
index 00000000..fd2d4b1a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
@@ -0,0 +1,124 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t M4_SB_region_ROM_start;
+#define M4_SB_REGION_ROM_START ((uint32_t)& M4_SB_region_ROM_start)
+extern uint32_t M4_SB_region_ROM_end;
+#define M4_SB_REGION_ROM_END ((uint32_t)& M4_SB_region_ROM_end)
+extern uint32_t INTVECT_start;
+#define INTVECT_START ((uint32_t)& INTVECT_start)
+extern uint32_t SE_Startup_region_ROM_start;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& SE_Startup_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_start;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& SE_Code_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_end;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& SE_Code_region_ROM_end)
+extern uint32_t SE_IF_region_ROM_start;
+#define SE_IF_REGION_ROM_START ((uint32_t)& SE_IF_region_ROM_start)
+extern uint32_t SE_IF_region_ROM_end;
+#define SE_IF_REGION_ROM_END ((uint32_t)& SE_IF_region_ROM_end)
+extern uint32_t SE_Key_region_ROM_start;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& SE_Key_region_ROM_start)
+extern uint32_t SE_Key_region_ROM_end;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& SE_Key_region_ROM_end)
+extern uint32_t SE_CallGate_region_ROM_start;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& SE_CallGate_region_ROM_start)
+extern uint32_t SB_region_ROM_start;
+#define SB_REGION_ROM_START ((uint32_t)& SB_region_ROM_start)
+extern uint32_t SB_region_ROM_end;
+#define SB_REGION_ROM_END ((uint32_t)& SB_region_ROM_end)
+extern uint32_t SE_region_RAM_start;
+#define SE_REGION_RAM_START ((uint32_t)& SE_region_RAM_start)
+extern uint32_t SE_region_RAM_end ;
+#define SE_REGION_RAM_END ((uint32_t)& SE_region_RAM_end)
+extern uint32_t SB_region_RAM_start ;
+#define SB_REGION_RAM_START ((uint32_t)& SB_region_RAM_start)
+extern uint32_t SB_region_RAM_end ;
+#define SB_REGION_RAM_END ((uint32_t)& SB_region_RAM_end)
+extern uint32_t SE_region_RAM_stack_top;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& SE_region_RAM_stack_top)
+
+extern uint32_t KMS_DataStorage_start ;
+#define KMS_DATASTORAGE_START ((uint32_t)& KMS_DataStorage_start)
+extern uint32_t KMS_DataStorage_end ;
+#define KMS_DATASTORAGE_END ((uint32_t)& KMS_DataStorage_end)
+
+extern uint32_t SLOT_Active_1_header;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& SLOT_Active_1_header)
+extern uint32_t SLOT_Active_1_start;
+#define SLOT_ACTIVE_1_START ((uint32_t)& SLOT_Active_1_start)
+extern uint32_t SLOT_Active_1_end;
+#define SLOT_ACTIVE_1_END ((uint32_t)& SLOT_Active_1_end)
+extern uint32_t SLOT_Active_2_header;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& SLOT_Active_2_header)
+extern uint32_t SLOT_Active_2_start;
+#define SLOT_ACTIVE_2_START ((uint32_t)& SLOT_Active_2_start)
+extern uint32_t SLOT_Active_2_end;
+#define SLOT_ACTIVE_2_END ((uint32_t)& SLOT_Active_2_end)
+extern uint32_t SLOT_Active_3_header;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& SLOT_Active_3_header)
+extern uint32_t SLOT_Active_3_start;
+#define SLOT_ACTIVE_3_START ((uint32_t)& SLOT_Active_3_start)
+extern uint32_t SLOT_Active_3_end;
+#define SLOT_ACTIVE_3_END ((uint32_t)& SLOT_Active_3_end)
+extern uint32_t SLOT_Dwl_1_start;
+#define SLOT_DWL_1_START ((uint32_t)& SLOT_Dwl_1_start)
+extern uint32_t SLOT_Dwl_1_end;
+#define SLOT_DWL_1_END ((uint32_t)& SLOT_Dwl_1_end)
+extern uint32_t SLOT_Dwl_2_start;
+#define SLOT_DWL_2_START ((uint32_t)& SLOT_Dwl_2_start)
+extern uint32_t SLOT_Dwl_2_end;
+#define SLOT_DWL_2_END ((uint32_t)& SLOT_Dwl_2_end)
+extern uint32_t SLOT_Dwl_3_start;
+#define SLOT_DWL_3_START ((uint32_t)& SLOT_Dwl_3_start)
+extern uint32_t SLOT_Dwl_3_end;
+#define SLOT_DWL_3_END ((uint32_t)& SLOT_Dwl_3_end)
+extern uint32_t SWAP_start;
+#define SWAP_START ((uint32_t)& SWAP_start)
+extern uint32_t SWAP_end;
+#define SWAP_END ((uint32_t)& SWAP_end)
+
+/* DualCore specificities */
+#if !defined(CORE_CM0PLUS)
+extern uint32_t region_ROM_end ;
+#define C2_AREA_ADDR_END  ((uint32_t)& region_ROM_end)
+extern uint32_t INTVEC_start;
+#define C2_BOOT_BASE_ADDR    ((uint32_t)& INTVEC_start)
+#endif /* CORE_CM0PLUS */
+extern volatile uint32_t M4_M0PLUS_flag_RAM_start ;
+#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& M4_M0PLUS_flag_RAM_start)
+
+
+#ifdef cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Images_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
rename to Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
diff --git a/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
new file mode 100644
index 00000000..7283f191
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SBSFU_2_Slots_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
@@ -0,0 +1,120 @@
+/*
+** LinkerScript
+*/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 Vector table */
+M4_INTVECT_start               = 0x08000000;
+M4_SB_region_ROM_start         = M4_INTVECT_start;
+M4_Vector_size                 = 0x200;
+
+/* M4 SB Code region */
+M4_SB_Code_region_ROM_start    = M4_INTVECT_start + M4_Vector_size;
+M4_SB_Code_region_ROM_end      = 0x080057FF;
+M4_SB_region_ROM_end           = M4_SB_Code_region_ROM_end;
+
+/* ROM regions size definition */
+M4_SB_Code_region_ROM_size     = M4_SB_Code_region_ROM_end - M4_SB_Code_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+KMS_DataStorage_start          = 0x0802A000;
+KMS_DataStorage_end            = KMS_DataStorage_start + 0x1FFF;
+
+/* SE IF ROM: used to locate Secure Engine interface Code out of MPU isolation     */
+SE_IF_region_ROM_start         = KMS_DataStorage_end + 0x1; 
+SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0x17FF;
+
+/* SBSFU Code region */
+SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
+SB_region_ROM_end              = 0x080367FF;
+
+/* M0 Vector table with alignment constraint on Vector_size */
+INTVECT_start                  = 0x08036800;
+Vector_size                    = 0x200;
+C2_BOOT_BASE_ADDR              = INTVECT_start;
+
+/* SE Code region protected by MPU isolation */
+SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start; /* No need to do +4 as we have dummy bytes in SE_CoreBin .ld file */
+SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
+
+/* SE Startup */
+SE_Startup_region_ROM_start    = SE_CallGate_region_ROM_end + 0x1;
+SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
+
+/* SE Embedded Keys */
+SE_Key_region_ROM_start        = 0x0803E800;
+SE_Key_region_ROM_end          = 0x0803EFFF;
+SE_Code_region_ROM_end         = SE_Key_region_ROM_end;
+
+/* ROM regions size definition */
+KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
+SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
+SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
+SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
+SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
+SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
+SE_Code_NoKey_region_ROM_size  = SE_Key_region_ROM_start - SE_Code_NoKey_region_ROM_start;
+SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+M4_SB_region_RAM_start         = 0x20000000;
+M4_SB_region_RAM_end           = M4_SB_region_RAM_start + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+M4_M0PLUS_flag_RAM_start       = M4_SB_region_RAM_end + 0x1;
+M4_M0PLUS_flag_RAM_end         = M4_M0PLUS_flag_RAM_start + 0x1F;
+
+/* M4 UserApp : allocation limited to half RAM size */
+M4_APP_region_RAM_start        = M4_M0PLUS_flag_RAM_end + 0x1;
+M4_APP_region_RAM_end          = 0x20007FFF;
+
+/* SBSFU RAM region */
+SB_region_RAM_start            = M4_APP_region_RAM_end + 0x1;
+SB_region_RAM_end              = 0x2000CBFF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000CC00 */
+SE_region_RAM_start            = SB_region_RAM_end + 0x1;
+SE_region_RAM_stack_top        = SE_region_RAM_start + 0xC00;                /* Secure Engine's private stack */
+SE_region_RAM_end              = 0x2000FFFF;
+
+/* RAM regions size definition */
+M4_SB_region_RAM_size          = M4_SB_region_RAM_end - M4_SB_region_RAM_start + 0x1;
+M4_APP_region_RAM_size         = M4_APP_region_RAM_end - M4_APP_region_RAM_start + 0x1;
+SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
+SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
+
+/******************************************************************************/
+/*                              RAM/ROM regions                               */
+/*                                                                            */
+/******************************************************************************/
+
+MEMORY
+{
+ M4_INTVECT_ROM_region (rx)       : ORIGIN = M4_INTVECT_start, LENGTH = M4_Vector_size
+ M4_SB_Code_ROM_region (rx)       : ORIGIN = M4_SB_Code_region_ROM_start, LENGTH = M4_SB_Code_region_ROM_size
+ SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
+ SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
+ INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
+ SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
+ SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
+ SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
+ SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
+ SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
+ M4_SB_RAM_region (xrw)           : ORIGIN = M4_SB_region_RAM_start, LENGTH = M4_SB_region_RAM_size
+ SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+ SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/.extSettings b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/board_resources.h
deleted file mode 100644
index 953761d8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/board_resources.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/flash_if.h
index e5bd4f0d..9cb596ba 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/flash_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/flash_if.h
@@ -1,9 +1,10 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    flash_if.h
   * @author  MCD Application Team
-  * @brief   This file provides interface to low level driver
-  *****************************************************************************
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
   * @attention
   *
   * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
@@ -14,23 +15,40 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __FLASH_H__
-#define __FLASH_H__
+#ifndef __FLASH_IF_H__
+#define __FLASH_IF_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
 /* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash status enumeration
+  */
+enum
+{
+  FLASH_PARAM_ERROR = -5,
+  FLASH_LOCK_ERROR = -4,
+  FLASH_WRITE_ERROR = -3,
+  FLASH_ERASE_ERROR  = -2,
+  FLASH_ERROR  = -1,
+  FLASH_OK     = 0,
+  FLASH_BUSY   = 1
+};
+
 /* USER CODE BEGIN ET */
 
 /* USER CODE END ET */
@@ -46,18 +64,30 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
+#define PAGE(__ADDRESS__) (uint32_t)((((__ADDRESS__) - FLASH_BASE) % FLASH_BANK_SIZE) / FLASH_PAGE_SIZE) /*!< Get page index from page address */
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function writes a user flash area (read/modify/write)
+  * @param  address: ptr to user flash area
+  * @param  data: ptr to data to be written
+  * @param  size: number of 32b.
+  * @param  dataTempPage: ptr used to copy already written page in ram
+  * @return Flash status.
+  */
+int32_t FLASH_IF_Write(uint32_t  address, uint8_t *data, uint32_t size, uint8_t *dataTempPage);
+
 /**
   * Writes a 64-bit word in flash at a specific address.
   * @param address (in bytes) must be a multiple of 8.
   * @param data data to write
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
   */
-extern int32_t HW_FLASH_Write(uint32_t address, uint64_t data);
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data);
 
 /**
   * Erases 'n' flash pages from page number 'page' to page number
@@ -71,26 +101,14 @@ extern int32_t HW_FLASH_Write(uint32_t address, uint64_t data);
   * @param page memory start page number
   * @param n number of page
   * @param interrupt choice polling/interrupt
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
-  */
-extern int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt);
-
-/**
-  * Get from Option Bytes the IPCC buffer address
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
-  */
-extern uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void);
-
-/**
-  * Get from Option Bytes the SFSA secure flash address
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
   */
-extern uint32_t HW_FLASH_OB_GetSFSA(void);
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt);
 
 /**
   * Callback
   */
-extern void HWCB_FLASH_EndOfCleanup(void);
+void HWCB_FLASH_EndOfCleanup(void);
 
 /* USER CODE BEGIN EFP */
 
@@ -100,6 +118,6 @@ extern void HWCB_FLASH_EndOfCleanup(void);
 }
 #endif
 
-#endif /* __FLASH_H__ */
+#endif /* __FLASH_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/lptim.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/lptim.h
index cc1f8fe9..7fe5ac5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/lptim.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/lptim.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/main.h
index 7665e1c1..6fd91c18 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -62,23 +61,22 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
 #define LED1_Pin GPIO_PIN_15
 #define LED1_GPIO_Port GPIOB
 #define LED2_Pin GPIO_PIN_9
 #define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
 #define RF_CTRL3_Pin GPIO_PIN_3
 #define RF_CTRL3_GPIO_Port GPIOC
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
 #define RF_CTRL2_Pin GPIO_PIN_5
 #define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define RF_CTRL1_Pin GPIO_PIN_4
 #define RF_CTRL1_GPIO_Port GPIOC
 #define BUT3_Pin GPIO_PIN_6
@@ -91,8 +89,8 @@ void Error_Handler(void);
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/mn_lptim_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/mn_lptim_if.h
index 542d0487..d1831b4d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/mn_lptim_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/mn_lptim_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_lptim_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MN_LPTIM_IF_H__
@@ -25,6 +27,8 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
+#include "lptim.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -71,4 +75,3 @@ void MN_LPTIM_IF_DeInit(void);
 #endif /* __MN_LPTIM_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32wlxx_hal_conf.h
index 64b98a7c..088f81d1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32wlxx_nucleo_conf.h
index 8dae344f..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     150U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_app.h
index d7f25dc8..37d3218b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -33,6 +35,11 @@ extern "C" {
 
 /* USER CODE END Includes */
 
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -68,9 +75,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_conf.h
index 47d27319..7f902a10 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief  Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_debug.h
index bbae8f87..710e8852 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/sys_debug.h
@@ -43,89 +43,89 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/**  Definition for Debug Line 1   **/
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 /* USER CODE BEGIN EC */
 
@@ -137,39 +137,41 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
@@ -177,9 +179,20 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initializes the debug
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/usart.h
index c196d42b..29cb339e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/utilities_conf.h
index 8f8d9d54..2fb01d50 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/utilities_def.h
index 85eeacfc..79dd9f59 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   CFG_LPM_SGFX_MN_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/flash_if.c
index f9d9852d..a33a673d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/flash_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/flash_if.c
@@ -1,9 +1,11 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    flash_if.c
   * @author  MCD Application Team
-  * @brief   This file contains the FLASH driver
-  *****************************************************************************
+  * @brief   This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
   * @attention
   *
   * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
@@ -14,13 +16,13 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "stm32wlxx.h"
 #include "flash_if.h"
+#include "stm32_mem.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -38,14 +40,14 @@
 
 /* Private define ------------------------------------------------------------*/
 /**
-  * @brief Flash status enumeration
+  * @brief Flash empty status enumeration
   */
 enum
 {
-  FLASH_ERROR  = -1,
-  FLASH_OK     = 0,
-  FLASH_BUSY   = 1
+  FLASH_EMPTY      = 0,
+  FLASH_NOT_EMPTY  = 1
 };
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -61,46 +63,136 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
+  * @retval HAL Status.
+  */
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength);
+
+/**
+  * @brief  This function checks if part of Flash is empty
+            It handles 32b unaligned address
+  * @param  addr: Start of user flash area
+  * @param  size: number of bytes.
+  * @retval FLASH_EMPTY or FLASH_NOT_EMPTY.
+  */
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-int32_t HW_FLASH_Write(uint32_t address,
-                       uint64_t data)
+int32_t FLASH_IF_Write(uint32_t address, uint8_t *data, uint32_t size, uint8_t *dataTempPage)
 {
-  /* USER CODE BEGIN HW_FLASH_Write_1 */
+  /* USER CODE BEGIN FLASH_IF_Write_1 */
+
+  /* USER CODE END FLASH_IF_Write_1 */
+  int32_t status = FLASH_OK;
+  uint32_t page_start_index = PAGE(address);
+  uint32_t page_end_index = PAGE(address + size - 1);
+  uint32_t curr_size = size;
+  uint32_t curr_dest_addr = address;
+  uint32_t curr_src_addr = (uint32_t)data;
+
+  if ((data == NULL) || ((size % sizeof(uint64_t)) != 0) || ((address % sizeof(uint64_t)) != 0))
+  {
+    return FLASH_PARAM_ERROR;
+  }
+
+  if (READ_BIT(FLASH->CR, FLASH_CR_LOCK) != 0U)
+  {
+    return FLASH_LOCK_ERROR;
+  }
 
-  /* USER CODE END HW_FLASH_Write_1 */
-  HAL_StatusTypeDef hal_status = HAL_ERROR;
+  if (page_start_index != page_end_index)
+  {
+    curr_size = FLASH_PAGE_SIZE - (address % FLASH_PAGE_SIZE);
+  }
+
+  for (uint32_t idx = page_start_index; idx <= page_end_index; idx++)
+  {
+    if (FLASH_IF_IsEmpty((uint8_t *)curr_dest_addr, curr_size) != FLASH_EMPTY)
+    {
+      if (dataTempPage == NULL)
+      {
+        return FLASH_PARAM_ERROR;
+      }
+      /* backup initial Flash page data in RAM area */
+      UTIL_MEM_cpy_8(dataTempPage, (uint8_t *)(idx * FLASH_PAGE_SIZE + FLASH_BASE), FLASH_PAGE_SIZE);
+      /* copy fragment into RAM area */
+      UTIL_MEM_cpy_8(&dataTempPage[((uint32_t)curr_dest_addr) % FLASH_PAGE_SIZE], (uint8_t *)curr_src_addr, curr_size);
+
+      /*  erase the Flash sector, to avoid writing twice in RAM */
+      if (FLASH_IF_EraseByPages(idx, 1, 0) != FLASH_OK)
+      {
+        status = FLASH_ERASE_ERROR;
+        break; /* exit for loop */
+      }
+      else
+      {
+        /* copy the whole flash sector including fragment from RAM to Flash*/
+        if (FLASH_IF_Write_Buffer(idx * FLASH_PAGE_SIZE + FLASH_BASE, dataTempPage, FLASH_PAGE_SIZE) != FLASH_OK)
+        {
+          status = FLASH_WRITE_ERROR;
+          break; /* exit for loop */
+        }
+      }
+    }
+    else
+    {
+      if (FLASH_IF_Write_Buffer(curr_dest_addr, (uint8_t *)curr_src_addr, curr_size) != FLASH_OK)
+      {
+        status = FLASH_WRITE_ERROR;
+        break; /* exit for loop */
+      }
+    }
+
+    /* 2nd part of memory overlapped on 2nd flash sector */
+    curr_dest_addr += curr_size;
+    curr_src_addr += curr_size;
+    curr_size = size - curr_size;
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_2 */
+
+  /* USER CODE END FLASH_IF_Write_2 */
+}
 
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data)
+{
+  /* USER CODE BEGIN FLASH_IF_Write64_1 */
+
+  /* USER CODE END FLASH_IF_Write64_1 */
   while (*(uint64_t *)address != data)
   {
     while (LL_FLASH_IsActiveFlag_OperationSuspended());
-
-    hal_status =
-      HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
+    HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
   }
 
-  return ((hal_status == HAL_OK) ? FLASH_OK :
-          ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERROR));
+  return FLASH_OK;
   /* USER CODE BEGIN HW_FLASH_Write_2 */
 
   /* USER CODE END HW_FLASH_Write_2 */
 }
 
-int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt)
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt)
 {
-  /* USER CODE BEGIN HW_FLASH_Erase_1 */
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_1 */
 
-  /* USER CODE END HW_FLASH_Erase_1 */
+  /* USER CODE END FLASH_IF_EraseByPages_1 */
   HAL_StatusTypeDef hal_status;
   FLASH_EraseInitTypeDef erase_str;
   uint32_t page_error;
 
   erase_str.TypeErase = FLASH_TYPEERASE_PAGES;
-  erase_str.Page      = page;
-  erase_str.NbPages   = n;
+  erase_str.Page = page;
+  erase_str.NbPages = n;
 
   /* Erase the Page */
   if (interrupt)
@@ -112,33 +204,10 @@ int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt)
     hal_status = HAL_FLASHEx_Erase(&erase_str, &page_error);
   }
 
-  return ((hal_status == HAL_OK) ? FLASH_OK :
-          ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERROR));
-  /* USER CODE BEGIN HW_FLASH_Erase_2 */
-
-  /* USER CODE END HW_FLASH_Erase_2 */
-}
-
-uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void)
-{
-  /* USER CODE BEGIN HW_FLASH_OB_GetIPCCBufferAddr_1 */
-
-  /* USER CODE END HW_FLASH_OB_GetIPCCBufferAddr_1 */
-  return READ_BIT(FLASH->IPCCBR, FLASH_IPCCBR_IPCCDBA);
-  /* USER CODE BEGIN HW_FLASH_OB_GetIPCCBufferAddr_2 */
+  return ((hal_status == HAL_OK) ? FLASH_OK : ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERASE_ERROR));
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_2 */
 
-  /* USER CODE END HW_FLASH_OB_GetIPCCBufferAddr_2 */
-}
-
-uint32_t HW_FLASH_OB_GetSFSA(void)
-{
-  /* USER CODE BEGIN HW_FLASH_OB_GetSFSA_1 */
-
-  /* USER CODE END HW_FLASH_OB_GetSFSA_1 */
-  return (READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos);
-  /* USER CODE BEGIN HW_FLASH_OB_GetSFSA_2 */
-
-  /* USER CODE END HW_FLASH_OB_GetSFSA_2 */
+  /* USER CODE END FLASH_IF_EraseByPages_2 */
 }
 
 void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
@@ -156,7 +225,14 @@ void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
   /* USER CODE END HAL_FLASH_EndOfOperationCallback_2 */
 }
 
-__WEAK void HWCB_FLASH_EndOfCleanup(void)
+void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_OperationErrorCallback_1 */
+
+  /* USER CODE END HAL_FLASH_OperationErrorCallback_1 */
+}
+
+void HWCB_FLASH_EndOfCleanup(void)
 {
   /* USER CODE BEGIN HWCB_FLASH_EndOfCleanup_1 */
 
@@ -168,6 +244,86 @@ __WEAK void HWCB_FLASH_EndOfCleanup(void)
 /* USER CODE END EF */
 
 /* Private Functions Definition -----------------------------------------------*/
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_1 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_1 */
+  uint8_t *pSrc = pSource;
+  uint64_t src_value;
+  int32_t status = FLASH_OK;
+
+  for (uint32_t i = 0; i < (uLength / sizeof(uint64_t)); i++)
+  {
+    UTIL_MEM_cpy_8(&src_value, pSrc, sizeof(uint64_t));
+
+    /* Avoid writing 0xFFFFFFFFFFFFFFFFLL on erased Flash */
+    if (src_value != UINT64_MAX)
+    {
+      status = FLASH_IF_Write64(pDestination, src_value);
+    }
+
+    pDestination += sizeof(uint64_t);
+    pSrc += sizeof(uint64_t);
+
+    if (status != FLASH_OK)
+    {
+      /* exit the for loop*/
+      break;
+    }
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_2 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_2 */
+}
+
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size)
+{
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_1 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_1 */
+  uint64_t *addr64;
+  uint32_t i;
+
+  /* start memory NOT 64bits aligned */
+  while ((((uint32_t)addr) % sizeof(uint64_t)) != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+
+  /* addr64 is 64 bits aligned */
+  addr64 = (uint64_t *)addr;
+  for (i = 0; i < (size / sizeof(uint64_t)); i++)
+  {
+    if (*addr64++ != UINT64_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+  }
+  size -= sizeof(uint64_t) * i;
+
+  /* end memory NOT 64 bits aligned */
+  addr = (uint8_t *)addr64;
+  while (size != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+  return FLASH_EMPTY;
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_2 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/lptim.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/lptim.c
index c9742859..6b18ae32 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/lptim.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/lptim.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ LPTIM_HandleTypeDef hlptim1;
 void MX_LPTIM1_Init(void)
 {
 
+  /* USER CODE BEGIN LPTIM1_Init 0 */
+
+  /* USER CODE END LPTIM1_Init 0 */
+
+  /* USER CODE BEGIN LPTIM1_Init 1 */
+
+  /* USER CODE END LPTIM1_Init 1 */
   hlptim1.Instance = LPTIM1;
   hlptim1.Init.Clock.Source = LPTIM_CLOCKSOURCE_APBCLOCK_LPOSC;
   hlptim1.Init.Clock.Prescaler = LPTIM_PRESCALER_DIV1;
@@ -43,6 +50,9 @@ void MX_LPTIM1_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPTIM1_Init 2 */
+
+  /* USER CODE END LPTIM1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/main.c
index d4f46c8d..b22cca80 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -157,6 +158,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/mn_lptim_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/mn_lptim_if.c
index 3ed8de69..c81d7a90 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/mn_lptim_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/mn_lptim_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_lptim_if.c
@@ -16,12 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "lptim.h"
 #include "mn_lptim_if.h"
 
 /* USER CODE BEGIN Includes */
+
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -63,25 +65,29 @@ extern LPTIM_HandleTypeDef hlptim1;
 void MN_LPTIM_IF_Init(void)
 {
   /* USER CODE BEGIN MN_LPTIM_IF_Init_0 */
+
   /* USER CODE END MN_LPTIM_IF_Init_0 */
 
-  /* Force the LPTIM1 Periheral Clock Reset */
+  /* Force the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_FORCE_RESET();
-  /* Release the LPTIM1 Periheral Clock Reset */
+  /* Release the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_RELEASE_RESET();
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_1 */
+
   /* USER CODE END MN_LPTIM_IF_Init_1 */
 
   MX_LPTIM1_Init();
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_2 */
+
   /* USER CODE END MN_LPTIM_IF_Init_2 */
 
   /* w.a.: LL_EXTI_LINE_X should be enabled in HAL_LPTIM_MspInit */
   LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_29);
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_3 */
+
   /* USER CODE END MN_LPTIM_IF_Init_3 */
 }
 
@@ -90,6 +96,7 @@ void MN_LPTIM_IF_DeInit(void)
   RCC_PeriphCLKInitTypeDef RCC_PeriphCLKInitStruct;
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_0 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_0 */
 
   if (HAL_LPTIM_DeInit(&hlptim1) != HAL_OK)
@@ -98,6 +105,7 @@ void MN_LPTIM_IF_DeInit(void)
   }
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_1 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_1 */
 
   /* Select the PCLK clock as LPTIM1 peripheral clock */
@@ -106,15 +114,17 @@ void MN_LPTIM_IF_DeInit(void)
   HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphCLKInitStruct);
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_2 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_2 */
 
-  /* Force the LPTIM1 Periheral Clock Reset */
+  /* Force the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_FORCE_RESET();
 
-  /* Release the LPTIM1 Periheral Clock Reset */
+  /* Release the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_RELEASE_RESET();
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_3 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_3 */
 
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/rtc.c
index 4464f7dc..c616f129 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,10 +71,13 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/stm32wlxx_it.c
index 032032da..11b8718a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/stm32wlxx_it.c
@@ -77,7 +77,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -188,7 +190,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/sys_app.c
index 99347482..b1918ed0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,9 +27,9 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 #include "sgfx_eeprom_if.h"
 
 /* USER CODE BEGIN Includes */
@@ -62,16 +64,10 @@
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
-  */
-static void Gpio_PreInit(void);
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -79,16 +75,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -97,13 +89,15 @@ void SystemApp_Init(void)
 
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-  /*Initialises timer and RTC*/
+
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
-  Gpio_PreInit();
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -116,6 +110,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(E2P_Read_VerboseLevel());
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -130,6 +125,7 @@ void SystemApp_Init(void)
 #elif !defined (LOW_POWER_DISABLE)
 #error LOW_POWER_DISABLE not defined
 #endif /* LOW_POWER_DISABLE */
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
@@ -137,8 +133,6 @@ void SystemApp_Init(void)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -151,11 +145,12 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
+
 static void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -169,45 +164,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -248,13 +204,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -269,13 +223,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -286,13 +238,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -307,4 +257,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/sys_debug.c
index 2e4c40f7..f0395f5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/sys_debug.c
@@ -41,6 +41,7 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
+
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 
@@ -58,39 +59,121 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
-  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
-  /* Enable the GPIO Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
   GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -108,44 +191,42 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
 #endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
-
-  /* USER CODE END DBG_Init_Last */
-}
-/* USER CODE BEGIN EF */
+#endif /* CORE_CM4 */
 
-/* USER CODE END EF */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-/* Private Functions Definition -----------------------------------------------*/
+  /* USER CODE END DBG_ProbesInit_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/timer_if.c
index 615131a0..66e51602 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -104,6 +104,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -153,7 +164,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -173,9 +183,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -183,18 +193,21 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
     /*overload RTC feature enable*/
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -277,64 +290,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,7 +379,7 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
@@ -383,6 +402,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -392,16 +412,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -428,24 +448,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/usart.c
index 343006bc..476eb1f2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_lpuart1_tx;
 void MX_LPUART1_UART_Init(void)
 {
 
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
-  hlpuart1.Init.BaudRate = LPUART_BAUDRATE;
+  hlpuart1.Init.BaudRate = 9600;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
   hlpuart1.Init.StopBits = UART_STOPBITS_1;
   hlpuart1.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_LPUART1_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/usart_if.c
index cfa581cd..36217a2f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&hlpuart1);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/Sigfox_AT_Slave.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/Sigfox_AT_Slave.ewd
index 7be7ed24..65cc99fe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/Sigfox_AT_Slave.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/Sigfox_AT_Slave.ewd
@@ -40,11 +40,11 @@
                 </option>
                 <option>
                     <name>MemOverride</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\config\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1025,7 +1025,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state>48.0</state>
+                    <state>32.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/Sigfox_AT_Slave.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/Sigfox_AT_Slave.ewp
index 6d74d421..813a07fc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/Sigfox_AT_Slave.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/Sigfox_AT_Slave.ewp
@@ -16,15 +16,15 @@
                 <debug>1</debug>
                 <option>
                     <name>ExePath</name>
-                    <state>Sigfox_AT_Slave\Exe</state>
+                    <state>Sigfox_AT_Slave/Exe</state>
                 </option>
                 <option>
                     <name>ObjPath</name>
-                    <state>Sigfox_AT_Slave\Obj</state>
+                    <state>Sigfox_AT_Slave/Obj</state>
                 </option>
                 <option>
                     <name>ListPath</name>
-                    <state>Sigfox_AT_Slave\List</state>
+                    <state>Sigfox_AT_Slave/List</state>
                 </option>
                 <option>
                     <name>GEndianMode</name>
@@ -32,11 +32,11 @@
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
                 </option>
                 <option>
                     <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
                 </option>
                 <option>
                     <name>GOutputBinary</name>
@@ -108,7 +108,7 @@
                 <option>
                     <name>GeneralMisraRules04</name>
                     <version>0</version>
-                    <state>011111111111111110111111111111111111111111111010110100111111111111110111111111111111111111111111111111110111111011111111111111111111111111111</state>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
                 </option>
                 <option>
                     <name>RTConfigPath2</name>
@@ -218,10 +218,15 @@
                 <version>34</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>CCDefines</name>
-                    <state>STM32WL55xx</state>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
                 </option>
                 <option>
                     <name>CCPreprocFile</name>
@@ -348,22 +353,23 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$/../Core/Inc</state>
                     <state>$PROJ_DIR$/../Sigfox/App</state>
+                    <state>$PROJ_DIR$/../Sigfox/Target</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Crypto</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
-                    <state>$PROJ_DIR$/../Sigfox/Target</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Crypto</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Monarch</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -426,11 +432,11 @@
                 </option>
                 <option>
                     <name>IccStaticDestr</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCppInlineSemantics</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCmsis</name>
@@ -440,10 +446,6 @@
                     <name>IccFloatSemantics</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCNoLiteralPool</name>
                     <state>0</state>
@@ -782,7 +784,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1048,87 +1050,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>App</name>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\app_sigfox.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\ee.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\sgfx_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\sgfx_at.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\sgfx_command.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\sgfx_cstimer.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\sgfx_eeprom_if.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\flash_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\lptim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\mn_lptim_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1136,25 +1057,109 @@
             </file>
         </group>
         <group>
-            <name>Target</name>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\mcu_api.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\mn_api.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\radio_board_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\rf_api.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\se_nvm.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\sgfx_credentials.c</name>
-            </file>
+            <name>User</name>
+            <group>
+                <name>Core</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\flash_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\lptim.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\mn_lptim_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Sigfox</name>
+                <group>
+                    <name>App</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\app_sigfox.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\ee.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\sgfx_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\sgfx_at.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\sgfx_command.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\sgfx_cstimer.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\sgfx_eeprom_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Target</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\mcu_api.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\mn_api.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\radio_board_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\rf_api.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\se_nvm.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\sgfx_credentials.c</name>
+                    </file>
+                </group>
+            </group>
         </group>
     </group>
     <group>
@@ -1167,9 +1172,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>Sigfox_AT_Slave</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1254,6 +1256,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1261,19 +1266,19 @@
         <group>
             <name>Sigfox</name>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_aes.c</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.10.0_SE_FDL_MON.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.8.1_SE_FDL_MON.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\Sgfx-Cmac-V1.0.0-CM0-O3.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\Sgfx-Cmac-V1.0.0-CM0-O3.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.1-CM0-O3.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.0-CM0-O3.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_aes.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_data.c</name>
@@ -1287,6 +1292,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/Sigfox_AT_Slave.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/Sigfox_AT_Slave.uvoptx
index d2661e86..4fd4dbb7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/Sigfox_AT_Slave.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/Sigfox_AT_Slave.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>32000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/App</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,119 +203,119 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/app_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/ee.c</PathWithFileName>
-      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/sgfx_app.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/sgfx_at.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_at.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/sgfx_command.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_command.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/lptim.c</PathWithFileName>
+      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/sgfx_cstimer.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
       <FileNumber>10</FileNumber>
@@ -303,8 +323,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -315,8 +335,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -327,8 +347,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -339,8 +359,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -351,8 +371,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/flash_if.c</PathWithFileName>
-      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -363,8 +383,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/lptim.c</PathWithFileName>
-      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/mn_lptim_if.c</PathWithFileName>
+      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -375,8 +395,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -387,8 +407,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/mn_lptim_if.c</PathWithFileName>
-      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -399,123 +419,123 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Sigfox/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/app_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/ee.c</PathWithFileName>
+      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/sgfx_app.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/sgfx_at.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_at.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/sgfx_command.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_command.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/sgfx_cstimer.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
+    <GroupName>Application/User/Sigfox/Target</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>26</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/Target/sgfx_credentials.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Target</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
       <FileNumber>27</FileNumber>
@@ -571,23 +591,11 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\Sigfox\Target\se_nvm.c</PathWithFileName>
+      <PathWithFileName>../Sigfox/Target/se_nvm.c</PathWithFileName>
       <FilenameWithoutPath>se_nvm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>32</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Sigfox\Target\sgfx_credentials.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
   </Group>
 
   <Group>
@@ -598,7 +606,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>32</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -618,7 +626,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -630,7 +638,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>35</FileNumber>
+      <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -643,11 +651,23 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>7</GroupNumber>
       <FileNumber>36</FileNumber>
@@ -655,271 +675,271 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>58</FileNumber>
@@ -927,8 +947,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -936,7 +956,7 @@
 
   <Group>
     <GroupName>Middlewares/Sigfox</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -955,12 +975,12 @@
     <File>
       <GroupNumber>9</GroupNumber>
       <FileNumber>60</FileNumber>
-      <FileType>4</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</PathWithFileName>
-      <FilenameWithoutPath>SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -971,8 +991,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a</PathWithFileName>
-      <FilenameWithoutPath>SFX_LIB_V2.8.1_SE_FDL_MON.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</PathWithFileName>
+      <FilenameWithoutPath>Sgfx-Cmac-V1.0.0-CM0-O3.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -983,8 +1003,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</PathWithFileName>
-      <FilenameWithoutPath>Sgfx-Cmac-V1.0.0-CM0-O3.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a</PathWithFileName>
+      <FilenameWithoutPath>Sgfx-Monarch-V2.0.1-CM0-O3.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -995,20 +1015,20 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a</PathWithFileName>
-      <FilenameWithoutPath>Sgfx-Monarch-V2.0.0-CM0-O3.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_LIB_V2.10.0_SE_FDL_MON.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>9</GroupNumber>
       <FileNumber>64</FileNumber>
-      <FileType>1</FileType>
+      <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1027,8 +1047,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1039,8 +1059,20 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>67</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1054,7 +1086,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>67</FileNumber>
+      <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1066,85 +1098,85 @@
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>68</FileNumber>
+      <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>69</FileNumber>
+      <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>70</FileNumber>
+      <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>71</FileNumber>
+      <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>72</FileNumber>
+      <FileNumber>73</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>73</FileNumber>
+      <FileNumber>74</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>74</FileNumber>
+      <FileNumber>75</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/Sigfox_AT_Slave.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/Sigfox_AT_Slave.uvprojx
index f3f8af91..2c41a479 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/Sigfox_AT_Slave.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/Sigfox_AT_Slave.uvprojx
@@ -10,15 +10,15 @@
       <TargetName>Sigfox_AT_Slave</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IROM2(0x0803F800-0x803FFFF) IRAM(0x20000000-0x20007FFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>Sigfox_AT_Slave\Exe\</OutputDirectory>
+          <OutputDirectory>Sigfox_AT_Slave\</OutputDirectory>
           <OutputName>Sigfox_AT_Slave</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -141,7 +141,7 @@
           <Flash3>"" ()</Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -183,10 +183,11 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>1</hadIROM2>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>1</useUlib>
             <EndSel>0</EndSel>
@@ -210,7 +211,7 @@
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
             <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
+            <Im2Chk>1</Im2Chk>
             <OnChipMemories>
               <Ocm1>
                 <Type>0</Type>
@@ -245,7 +246,7 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
@@ -336,9 +337,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-fshort-enums</MiscControls>
-              <Define>STM32WL55xx,CORE_CM4,USE_HAL_DRIVER</Define>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../Sigfox/App;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace;../Sigfox/Target</IncludePath>
+              <IncludePath>../Core/Inc;../Sigfox/App;../Sigfox/Target;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -351,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -380,42 +381,57 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/App</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>app_sigfox.c</FileName>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/app_sigfox.c</FilePath>
+              <FilePath>../Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>ee.c</FileName>
+              <FileName>adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/ee.c</FilePath>
+              <FilePath>../Core/Src/adc.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_app.c</FileName>
+              <FileName>dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/sgfx_app.c</FilePath>
+              <FilePath>../Core/Src/dma.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_at.c</FileName>
+              <FileName>lptim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/sgfx_at.c</FilePath>
+              <FilePath>../Core/Src/lptim.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_command.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/sgfx_command.c</FilePath>
+              <FilePath>../Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_cstimer.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/sgfx_cstimer.c</FilePath>
+              <FilePath>../Core/Src/rtc.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_eeprom_if.c</FileName>
+              <FileName>flash_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/sgfx_eeprom_if.c</FilePath>
+              <FilePath>../Core/Src/flash_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
               <FileName>sys_app.c</FileName>
@@ -427,15 +443,10 @@
               <FileType>1</FileType>
               <FilePath>../Core/Src/sys_debug.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Core</GroupName>
-          <Files>
             <File>
-              <FileName>adc.c</FileName>
+              <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/adc.c</FilePath>
+              <FilePath>../Core/Src/timer_if.c</FilePath>
             </File>
             <File>
               <FileName>adc_if.c</FileName>
@@ -443,90 +454,80 @@
               <FilePath>../Core/Src/adc_if.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/board_resources.c</FilePath>
-            </File>
-            <File>
-              <FileName>dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>flash_if.c</FileName>
+              <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/flash_if.c</FilePath>
+              <FilePath>../Core/Src/usart_if.c</FilePath>
             </File>
             <File>
-              <FileName>lptim.c</FileName>
+              <FileName>mn_lptim_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/lptim.c</FilePath>
+              <FilePath>../Core/Src/mn_lptim_if.c</FilePath>
             </File>
             <File>
-              <FileName>main.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/main.c</FilePath>
+              <FilePath>../Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>mn_lptim_if.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/mn_lptim_if.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/rtc.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Sigfox/App</GroupName>
+          <Files>
             <File>
-              <FileName>timer_if.c</FileName>
+              <FileName>app_sigfox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/timer_if.c</FilePath>
+              <FilePath>../Sigfox/App/app_sigfox.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>ee.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../Sigfox/App/ee.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileName>sgfx_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+              <FilePath>../Sigfox/App/sgfx_app.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>sgfx_at.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../Sigfox/App/sgfx_at.c</FilePath>
             </File>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>sgfx_command.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/subghz.c</FilePath>
+              <FilePath>../Sigfox/App/sgfx_command.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>sgfx_cstimer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart.c</FilePath>
+              <FilePath>../Sigfox/App/sgfx_cstimer.c</FilePath>
             </File>
             <File>
-              <FileName>usart_if.c</FileName>
+              <FileName>sgfx_eeprom_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart_if.c</FilePath>
+              <FilePath>../Sigfox/App/sgfx_eeprom_if.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
+          <GroupName>Application/User/Sigfox/Target</GroupName>
           <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FileName>sgfx_credentials.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Sigfox/Target/sgfx_credentials.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Target</GroupName>
-          <Files>
             <File>
               <FileName>mcu_api.c</FileName>
               <FileType>1</FileType>
@@ -550,12 +551,7 @@
             <File>
               <FileName>se_nvm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Sigfox\Target\se_nvm.c</FilePath>
-            </File>
-            <File>
-              <FileName>sgfx_credentials.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Sigfox\Target\sgfx_credentials.c</FilePath>
+              <FilePath>../Sigfox/Target/se_nvm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -584,24 +580,9 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -613,24 +594,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -648,9 +624,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_lptim.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -663,14 +644,34 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_lptim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -697,15 +698,15 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
             <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -718,29 +719,29 @@
               <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</FilePath>
             </File>
             <File>
-              <FileName>SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FileName>
-              <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FilePath>
+              <FileName>sigfox_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
             </File>
             <File>
-              <FileName>SFX_LIB_V2.8.1_SE_FDL_MON.a</FileName>
+              <FileName>Sgfx-Cmac-V1.0.0-CM0-O3.a</FileName>
               <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</FilePath>
             </File>
             <File>
-              <FileName>Sgfx-Cmac-V1.0.0-CM0-O3.a</FileName>
+              <FileName>Sgfx-Monarch-V2.0.1-CM0-O3.a</FileName>
               <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a</FilePath>
             </File>
             <File>
-              <FileName>Sgfx-Monarch-V2.0.0-CM0-O3.a</FileName>
+              <FileName>SFX_LIB_V2.10.0_SE_FDL_MON.a</FileName>
               <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a</FilePath>
             </File>
             <File>
-              <FileName>sigfox_data.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
+              <FileName>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilePath>
             </File>
           </Files>
         </Group>
@@ -748,14 +749,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -768,39 +774,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -824,4 +830,19 @@
     <files/>
   </RTE>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
 </Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/startup_stm32wl55xx_cm4.s
index fad38baf..6274a768 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size      EQU     0x00001000
+Stack_Size		EQU     0x1000
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x00000200
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/.cproject
index dd400bb6..c3853ea0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/.cproject
@@ -1,195 +1,198 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.777126803">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.777126803" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1443964609">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1443964609" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.777126803" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.777126803." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1386103491" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1907000620" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.2083791394" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.856393925" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2140052143" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.13205450" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1680343700" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.542583690" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../Sigfox/App | ../../Sigfox/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  || ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.321275345" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.563055288" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.204541511" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.790983593" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1355795131" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1443964609" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1443964609." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.148001773" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1162099596" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.537824633" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.876032723" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1886682652" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1328401353" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../Sigfox/App | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../Sigfox/Target | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  || ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.903104173" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.255880800" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.336980768" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1178539718" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1673704308" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.948145952" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1537739826" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1040950746" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1750618228" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1061562187" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.401994247" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.95857310" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.295450156" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1500746787" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1934787492" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1848408860" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../Sigfox/App"/>
 									<listOptionValue builtIn="false" value="../../Sigfox/Target"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1912111873" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.839122058" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1680691728" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.141181070" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.277524616" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.570858991" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1438120216" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1003770828" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.155581957" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1368712163" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1846336231" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.759221173" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1671036311" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.563378059" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.979160611" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
-									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":SFX_LIB_V2.8.1_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.0-CM0-O3.a"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1433536432" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.463993071" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.1614447206" name="Place libraries in a linker group (-Wl,--start-group $(LIBS) -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1645383725" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.427077155" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.826629026" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1419268170" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.339023561" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1007114351" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.773402043" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1531384733" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.477739641" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.631422371" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1161821346" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.525279648" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.743336479" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.369198283" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1033962224" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.491635234" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.2105984402" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.931325167" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1902173291" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.525328685" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1384707602">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1384707602" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1530908624">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1530908624" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1384707602" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1384707602." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.270796889" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.57964780" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.796008820" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1967285105" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.435990526" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2056281626" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.188647721" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.790717896" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../Sigfox/App | ../../Sigfox/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  || ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.910066696" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1099261019" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1656237542" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1307872486" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1492651043" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1530908624" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1530908624." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1374748146" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.24445158" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1639611693" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.839123684" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1630881018" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.7772630" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../Sigfox/App | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../Sigfox/Target | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  || ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2044618839" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1181743732" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.504930969" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1023153258" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1850398182" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.400662556" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.885623970" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.74179492" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1739619814" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1550052540" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1266410685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.598532990" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1709779282" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1581987839" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.758775511" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../Sigfox/App"/>
 									<listOptionValue builtIn="false" value="../../Sigfox/Target"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1140254980" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2028589161" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1895893109" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.28297530" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.291091917" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1736170611" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.367354663" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1171075115" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1314318709" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.708134193" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1905039045" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1098057216" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1297758090" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.543655990" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.992354586" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":SFX_LIB_V2.8.1_SE_FDL_MON.a"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1906531194" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
-									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.0-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.198255024" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.2045145675" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1206601552" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.543230411" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1653528193" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.151474151" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1802198391" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1475549358" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1197582416" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1520704530" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.2102417524" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.606928440" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1945534741" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.537940373" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1543417766" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.962187738" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1002798830" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1515175973" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.545977907" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.394486764" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.482219687" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.539668711" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -197,18 +200,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="Sigfox_AT_Slave.null.515514563" name="Sigfox_AT_Slave"/>
+		<project id="Sigfox_AT_Slave.null.1764207955" name="Sigfox_AT_Slave"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1384707602;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1384707602.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.400662556;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1140254980">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1530908624;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1530908624.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1550052540;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2028589161">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.777126803;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.777126803.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1537739826;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1912111873">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1443964609;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1443964609.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.401994247;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.839122058">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/.project
index a9ec3ca2..9c838884 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/.project
@@ -25,7 +25,6 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
@@ -36,342 +35,357 @@
 		<link>
 			<name>Sigfox_AT_Slave.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox_AT_Slave.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox_AT_Slave.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/app_sigfox.c</name>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/app_sigfox.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/ee.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/ee.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/sgfx_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/sgfx_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/sgfx_at.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/sgfx_at.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/sgfx_command.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/sgfx_command.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/sgfx_cstimer.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/sgfx_cstimer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/sgfx_eeprom_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/sgfx_eeprom_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/adc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/adc_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/board_resources.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/dma.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/flash_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_lptim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/flash_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/lptim.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/lptim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/main.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/mn_lptim_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/mn_lptim_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/rtc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/timer_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32_lpm_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_it.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/subghz.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_debug.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_debug.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart_if.c</name>
+			<name>Middlewares/Sigfox/sigfox_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/mcu_api.c</name>
+			<name>Middlewares/Sigfox/sigfox_data.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/mcu_api.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/mn_api.c</name>
+			<name>Middlewares/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/mn_api.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/radio_board_if.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/rf_api.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/rf_api.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/se_nvm.c</name>
+			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/se_nvm.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/sgfx_credentials.c</name>
+			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/sgfx_credentials.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<name>Application/User/Core/flash_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/flash_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
+			<name>Application/User/Core/lptim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/lptim.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
+			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<name>Application/User/Core/mn_lptim_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/mn_lptim_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_lptim.c</name>
+			<name>Application/User/Core/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<name>Application/User/Sigfox/App/app_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/app_sigfox.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<name>Application/User/Sigfox/App/ee.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/ee.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<name>Application/User/Sigfox/App/sgfx_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/sgfx_app.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<name>Application/User/Sigfox/App/sgfx_at.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/sgfx_at.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<name>Application/User/Sigfox/App/sgfx_command.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/sgfx_command.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<name>Application/User/Sigfox/App/sgfx_cstimer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/sgfx_cstimer.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
+			<name>Application/User/Sigfox/App/sgfx_eeprom_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/sgfx_eeprom_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Sigfox/sigfox_aes.c</name>
+			<name>Application/User/Sigfox/Target/mcu_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/mcu_api.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Sigfox/sigfox_data.c</name>
+			<name>Application/User/Sigfox/Target/mn_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/mn_api.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Application/User/Sigfox/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/radio_board_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Application/User/Sigfox/Target/rf_api.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/rf_api.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/se_nvm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/se_nvm.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/sgfx_credentials.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/sgfx_credentials.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/Core/sysmem.c
deleted file mode 100644
index 656b3aa2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/Core/sysmem.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- ******************************************************************************
- * @file      sysmem.c
- * @author    Generated by STM32CubeIDE
- * @brief     STM32CubeIDE System Memory calls file
- *
- *            For more information about which C functions
- *            need which of these lowlevel functions
- *            please consult the newlib libc manual
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- ******************************************************************************
- */
-
-/* Includes */
-#include <errno.h>
-#include <stdint.h>
-
-/**
- * Pointer to the current high watermark of the heap usage
- */
-static uint8_t *__sbrk_heap_end = NULL;
-
-/**
- * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
- *        and others from the C library
- *
- * @verbatim
- * ############################################################################
- * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
- * #         #        #                         # Reserved by _Min_Stack_Size #
- * ############################################################################
- * ^-- RAM start      ^-- _end                             _estack, RAM end --^
- * @endverbatim
- *
- * This implementation starts allocating at the '_end' linker symbol
- * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
- * The implementation considers '_estack' linker symbol to be RAM end
- * NOTE: If the MSP stack, at any point during execution, grows larger than the
- * reserved size, please increase the '_Min_Stack_Size'.
- *
- * @param incr Memory size
- * @return Pointer to allocated memory
- */
-void *_sbrk(ptrdiff_t incr)
-{
-  extern uint8_t _end; /* Symbol defined in the linker script */
-  extern uint8_t _estack; /* Symbol defined in the linker script */
-  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
-  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
-  const uint8_t *max_heap = (uint8_t *)stack_limit;
-  uint8_t *prev_heap_end;
-
-  /* Initialize  heap end at first call */
-  if (NULL == __sbrk_heap_end)
-  {
-    __sbrk_heap_end = &_end;
-  }
-
-  /* Protect heap from growing into the reserved MSP stack */
-  if (__sbrk_heap_end + incr > max_heap)
-  {
-    errno = ENOMEM;
-    return (void *)-1;
-  }
-
-  prev_heap_end = __sbrk_heap_end;
-  __sbrk_heap_end += incr;
-
-  return (void *)prev_heap_end;
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
index 690a211f..482ef29f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -1,23 +1,57 @@
 /*
-** LinkerScript
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
 */
 
 /* Entry Point */
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "SRAM1" Ram type memory */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
 
-_Min_Heap_Size  = 0x200; /* required amount of heap  */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
 _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 256K
+  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 256K
   SIGFOX_DATA (rx) : ORIGIN = 0x0803E500, LENGTH = 768  /* memory dedicated to User embedded Keys */
-  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K    /* Non-backup SRAM1 */
-  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K    /* Backup SRAM2 */
 }
 
 /* Sections */
@@ -27,20 +61,21 @@ SECTIONS
   .sigfox_data :
   {
     */sigfox_data.o (.rodata)        /* .sigfox_data sections  */	
-    . = ALIGN(8);
-  } >SIGFOX_DATA   
-  /* The startup code into "ROM" Rom type memory */
+    . = ALIGN(4);
+  } >SIGFOX_DATA
+
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -50,80 +85,82 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
-  /* Initialized data sections into "SRAM1" Ram type memory */
-  .data : 
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM1 AT> ROM
 
-  /* Uninitialized data section into "SRAM1" Ram type memory */
-  . = ALIGN(8);
+  } >RAM1 AT> FLASH
+
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -133,34 +170,34 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM1
 
-  /* Data section into "SRAM1" Ram type memory: Non-backup SRAM1 dedicated to CM4 */
-  . = ALIGN(8);
+  /* Data section into "RAM1" Ram type memory: Non-backup RAM1 dedicated to CM4 */
+  . = ALIGN(4);
   RAM1_region :
   {
     _sRAM1_region = .;         /* define a global symbol at section start */
     *(.RAM1_region)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _eRAM1_region = .;         /* define a global symbol at section end */
   } >RAM1
 
-  /* Data section into "SRAM2" Ram type memory: Backup SRAM2 dedicated to CM4 */
-  . = ALIGN(8);
+  /* Data section into "RAM2" Ram type memory: Backup RAM2 dedicated to CM4 */
+  . = ALIGN(4);
   RAM2_region :
   {
     _sRAM2_region = .;         /* define a global symbol at section start */
     *(.RAM2_region)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _eRAM2_region = .;         /* define a global symbol at section end */
   } >RAM2
 
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
   ._user_heap_stack :
   {
     . = ALIGN(8);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/app_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/app_sigfox.c
index e5188411..165374fe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/app_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/app_sigfox.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_sigfox.h"
@@ -77,11 +79,11 @@ void MX_Sigfox_Process(void)
 
   /* USER CODE END MX_Sigfox_Process_1 */
   UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
-
   /* USER CODE BEGIN MX_Sigfox_Process_2 */
 
   /* USER CODE END MX_Sigfox_Process_2 */
 }
+
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/app_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/app_sigfox.h
index d9166162..3608c67f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/app_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/app_sigfox.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SIGFOX_H__
@@ -37,6 +39,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 /* USER CODE BEGIN EC */
+
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Sigfox Application
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Init(void);
 
 /**
   * @brief  entry Sigfox Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/ee.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/ee.c
index 6b209af1..aa1c02f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/ee.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/ee.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ee.c
@@ -16,6 +17,7 @@
   *
   *****************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "ee.h"
@@ -206,7 +208,7 @@ int32_t EE_Init(int32_t format, uint32_t base_address)
     total_nb_pages =
       2 * (EE_var[0].nb_pages + (CFG_EE_BANK1_SIZE ? EE_var[1].nb_pages : 0));
 
-    if (HW_FLASH_Erase(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
+    if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
     {
       return EE_ERASE_ERROR;
     }
@@ -242,7 +244,7 @@ int32_t EE_Read(int32_t bank, uint16_t addr, uint32_t *data)
   /* USER CODE BEGIN EE_Read_1 */
 
   /* USER CODE END EE_Read_1 */
-  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];;
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
 
   /* Read element starting from active page */
   return EE_ReadEl(pv, addr, data, pv->current_write_page);
@@ -256,7 +258,7 @@ int32_t EE_Write(int32_t bank, uint16_t addr, uint32_t data)
   /* USER CODE BEGIN EE_Write_1 */
 
   /* USER CODE END EE_Write_1 */
-  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];;
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
   uint32_t page;
 
   /* Check if current pool is full */
@@ -334,7 +336,7 @@ int32_t EE_Clean(int32_t bank, int32_t interrupt)
   DBG_EE(EE_1);
 
   /* Erase all the pages of the pool */
-  if (HW_FLASH_Erase(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
+  if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
       != 0)
   {
     return EE_ERASE_ERROR;
@@ -471,7 +473,7 @@ static int32_t EE_Recovery(EE_var_t *pv)
       {
         if (EE_GetState(pv, page) != EE_STATE_ERASED)
         {
-          if (HW_FLASH_Erase(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
+          if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
           {
             return EE_ERASE_ERROR;
           }
@@ -505,7 +507,7 @@ static int32_t EE_Transfer(EE_var_t *pv, uint16_t addr, uint32_t page)
      or ACTIVE, except in case of recovery, where some pages may be already
      in ERASING state.
      However, in case of recovery, we do not not need to set ERASING,
-     as initialization phase erases the unactive pool. */
+     as initialization phase erases the inactive pool. */
   last_page =
     (page < pv->nb_pages) ? (2 * pv->nb_pages - 1) : (pv->nb_pages - 1);
 
@@ -624,7 +626,7 @@ static int32_t EE_WriteEl(EE_var_t *pv, uint16_t addr, uint32_t data)
     EE_FLASH_ADDR(pv, pv->current_write_page) + pv->next_write_offset;
 
   /* Write element in flash */
-  if (HW_FLASH_Write(flash_addr, el) != 0)
+  if (FLASH_IF_Write64(flash_addr, el) != 0)
   {
     return EE_WRITE_ERROR;
   }
@@ -700,7 +702,7 @@ static int32_t EE_SetState(const EE_var_t *pv, uint32_t page, uint32_t state)
   DBG_EE(EE_0);
 
   /* Set new page state inside page header */
-  if (HW_FLASH_Write(flash_addr, EE_PROGRAMMED) != 0)
+  if (FLASH_IF_Write64(flash_addr, EE_PROGRAMMED) != 0)
   {
     return EE_WRITE_ERROR;
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/ee.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/ee.h
index 27947917..81b544f1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/ee.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/ee.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ee.h
@@ -16,6 +17,7 @@
   *
   *****************************************************************************
   */
+/* USER CODE END Header */
 
 #ifndef EE_H__
 #define EE_H__
@@ -35,7 +37,7 @@
   *
   * - M_BEGIN, M_END and DBG() macro definitions.
   *
-  * - Hadrwae flash driver definitions:
+  * - Hardware flash driver definitions:
   *
   *      * HW_FLASH_PAGE_SIZE (in bytes)
   *
@@ -66,7 +68,7 @@
   *
   * Notes
   * -----
-  * - a corrupted word in FLASH detected by the user aoftware shall be set to 0.
+  * - a corrupted word in FLASH detected by the user software shall be set to 0.
   *   The EEPROM emulation software will then handle it properly.
   */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app.c
index 542e1bfd..912acf38 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app.c
@@ -16,8 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
+
 #include "st_sigfox_api.h"
 #include "sgfx_app.h"
 #include "sgfx_app_version.h"
@@ -59,7 +62,6 @@ extern RadioEvents_t RfApiRadioEvents;
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
@@ -77,14 +79,17 @@ static void CmdProcessNotify(void);
 
 void Sigfox_Init(void)
 {
-  /* USER CODE BEGIN Sigfox_Init_1 */
+  sfx_rc_enum_t sfx_rc = SFX_RC1;
+  sfx_error_t error = 0;
+  /* USER CODE BEGIN Sigfox_Init_0 */
 
-  /* USER CODE END Sigfox_Init_1 */
-  sfx_u8 error = 0;
+  /* USER CODE END Sigfox_Init_0 */
 
   CMD_Init(CmdProcessNotify);
 
-  APP_PPRINTF("ATtention command interface\n\r");
+  /* USER CODE BEGIN Sigfox_Init_1 */
+  BSP_LED_Init(LED_BLUE);
+  BSP_LED_Init(LED_GREEN);
 
   /* Get Sigfox APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION:        V%X.%X.%X\r\n",
@@ -103,20 +108,17 @@ void Sigfox_Init(void)
           (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_MAIN_SHIFT),
           (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB1_SHIFT),
           (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB2_SHIFT));
+  APP_PPRINTF("ATtention command interface\n\r");
 
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Init(LED_BLUE);
-  BSP_LED_Init(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-#endif /* defined(USE_BSP_DRIVER) */
+  /* USER CODE END Sigfox_Init_1 */
 
-  /*OPen Sifox Lib*/
-  error = st_sigfox_open(E2P_Read_Rc());
+  sfx_rc = E2P_Read_Rc();
 
-  Radio.Init(&RfApiRadioEvents);
+  /*Open Sigfox library */
+  error = st_sigfox_open(sfx_rc);
 
+  Radio.Init(&RfApiRadioEvents);
+  /* USER CODE BEGIN Sigfox_Init_ErrorCheck */
   if (1U == E2P_Read_AtEcho())
   {
     if (error == SFX_ERR_NONE)
@@ -125,17 +127,16 @@ void Sigfox_Init(void)
     }
     else
     {
-      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: %d\n\r\n\r", error);
+      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: 0x%04X\n\r\n\r", error);
     }
   }
-
+  /* USER CODE END Sigfox_Init_ErrorCheck */
   /* Put radio in Sleep waiting next cmd */
   UTIL_SEQ_RegTask(1 << CFG_SEQ_Task_Vcom, UTIL_SEQ_RFU, CMD_Process);
   /* USER CODE BEGIN Sigfox_Init_2 */
 
   /* USER CODE END Sigfox_Init_2 */
 }
-
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
@@ -235,6 +236,9 @@ static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc)
       error = SIGFOX_API_open(&SgfxRc);
       break;
     }
+    /* USER CODE BEGIN st_sigfox_open_case */
+
+    /* USER CODE END st_sigfox_open_case */
     default:
     {
       error = SFX_ERR_API_OPEN;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app.h
index 14e7ed0f..e9881084 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_APP_H__
 #define __SGFX_APP_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app_version.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app_version.h
index 52edffa6..7e2b2395 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_at.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_at.c
index 21c0420e..996b325e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_at.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_at.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_at.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdbool.h>
@@ -24,7 +26,7 @@
 #include "sgfx_at.h"
 #include "sigfox_types.h"
 #include "st_sigfox_api.h"
-#include "usart.h"
+#include "usart_if.h"
 #include "stm32_tiny_sscanf.h"
 #include "sgfx_app_version.h"
 #include "sgfx_eeprom_if.h"
@@ -77,67 +79,81 @@
 
 /* Private function prototypes -----------------------------------------------*/
 #ifdef MN_ON
+
+/**
+  * @brief      monarch scan callback
+  * @param[out] rc_bit_mask bit mask of detected region configuration
+  * @param[out] rssi of the detected monarch signal
+  * @retval     SFX_ERR_NONE
+  */
 static sfx_u8 app_callback_handler(sfx_u8 rc_bit_mask, sfx_s16 rssi);
+
+/**
+  * @brief  rf test mode call back starting a while wait loop
+  */
+static void sfx_monarch_test_mode_wait_start_cb(void);
+
+/**
+  * @brief  rf test mode call back exiting a while wait loop
+  */
+static void sfx_monarch_test_mode_wait_end_cb(void);
 #endif /* MN_ON */
 /**
 
   * @brief  Print n bytes as %02x
-  * @param  the pointer containing the bytes to print
-  * @param  n th number of bytes
-  * @retval None
+  * @param  pt pointer containing the bytes to print
+  * @param  n number of bytes
   */
 static void print_n(uint8_t *pt, uint32_t n);
 
 /**
-  * @brief  Print receveid n bytes as %02x
-  * @param  the pointer containing the bytes to print
-  * @param  n th number of bytes
-  * @retval None
+  * @brief  Print received n bytes as %02x
+  * @param  pt pointer containing the bytes to print
+  * @param  n number of bytes
   */
 static void print_rx(uint8_t *pt, uint32_t n);
 
 /**
   * @brief  Print an unsigned int
-  * @param  the value to print
-  * @retval None
+  * @param  value to print
   */
 static void print_u(uint32_t value);
 
 /**
   * @brief  get the length and the number of parameters of the string
-  * @param  the string
-  * @param  the output vector
-  * @param  the length of the output vector
-  * @retval None
+  * @param  str the string
+  * @param  data output vector
+  * @param  dataSize length of the output vector
   */
 static ErrorStatus stringToData(const char *str, uint8_t *data, uint32_t *dataSize);
 
 /**
-  * @brief  check if Char is an Hex value
-  * @param  none
-  * @retval none
+  * @brief  Check if character in parameter is alphanumeric
+  * @param  Char for the alphanumeric check
+  * @retval ERROR or SUCCESS
   */
 static ErrorStatus isHex(char Char);
 
 /**
-  * @brief  Converts hexa string to a nibble ( 0x0X )
-  * @param  hexa string
-  * @retval the nibble. Returns 0xF0 in case input was not an hexa string (a..f; A..F or 0..9)
+  * @brief  Converts hex string to a nibble ( 0x0X )
+  * @param  Char hex string
+  * @retval the nibble. Returns 0xF0 in case input was not an hex string (a..f; A..F or 0..9)
   */
 static uint8_t Char2Nibble(char Char);
 
 /**
-  * @brief  reopens Sigfox anr rerestores radio configuration as from EEPROM
-  * @param  none
-  * @retval none
+  * @brief  reopens Sigfox and restores radio configuration as from EEPROM
+  * @param  sfx_rc region configuration
+  * @param  config_words configuration parameters
+  * @return sfx_error_t status
   */
 static sfx_error_t SIGFOX_reopen_and_reconf(sfx_rc_enum_t sfx_rc,  sfx_u32 *config_words);
 
 /**
   * @brief  run testmode 12
   * @note   specific for SE_MON_FDL lib as HW SE do not support public switch key
-  * @param  none
-  * @retval none
+  * @param  rc_enum region configuration
+  * @return sfx_error_t status
   */
 static sfx_error_t testmode_12(sfx_rc_enum_t rc_enum);
 
@@ -211,7 +227,7 @@ ATEerror_t AT_SendBit(const char *param)
       }
       else
       {
-        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
         return AT_LIB_ERROR;
       }
     }
@@ -230,7 +246,7 @@ ATEerror_t AT_SendBit(const char *param)
     }
     else
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
       return AT_LIB_ERROR;
     }
   }
@@ -280,7 +296,7 @@ ATEerror_t AT_SendFrame(const char *param)
       }
       else
       {
-        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
         return AT_LIB_ERROR;
       }
     }
@@ -299,7 +315,7 @@ ATEerror_t AT_SendFrame(const char *param)
     }
     else
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
       return AT_LIB_ERROR;
     }
   }
@@ -360,7 +376,7 @@ ATEerror_t AT_SendHexFrame(const char *param)
       }
       else
       {
-        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
         return AT_LIB_ERROR;
       }
     }
@@ -379,7 +395,7 @@ ATEerror_t AT_SendHexFrame(const char *param)
     }
     else
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
       return AT_LIB_ERROR;
     }
   }
@@ -708,7 +724,6 @@ ATEerror_t AT_scan_mn(const char *param)
 
   sfx_u8 rc_capabilities_bit_mask = 0x7F; /*all RCs from RC1 to RC7*/
   sfx_u16 timer = 5;
-  sfx_timer_unit_enum_t unit = SFX_TIME_S;
 
   sfx_rc_enum_t sfx_rc = E2P_Read_Rc();
 
@@ -722,7 +737,7 @@ ATEerror_t AT_scan_mn(const char *param)
   }
   SIGFOX_API_close();
 
-  SIGFOX_MONARCH_API_execute_rc_scan(rc_capabilities_bit_mask, timer, unit, app_callback_handler);
+  SIGFOX_MONARCH_API_execute_rc_scan(rc_capabilities_bit_mask, timer, SFX_TIME_S, app_callback_handler);
 
   UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Monarch);
 
@@ -795,11 +810,22 @@ static sfx_u8 app_callback_handler(sfx_u8 rc_bit_mask, sfx_s16 rssi)
 
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Monarch);
 
-  return rc_bit_mask;
+  return SFX_ERR_NONE;
   /* USER CODE BEGIN app_callback_handler_2 */
 
   /* USER CODE END app_callback_handler_2 */
 }
+
+static void sfx_monarch_test_mode_wait_start_cb(void)
+{
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Monarch);
+
+}
+
+static void sfx_monarch_test_mode_wait_end_cb(void)
+{
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Monarch);
+}
 #endif /* MN_ON */
 
 ATEerror_t AT_test_mode(const char *param)
@@ -890,7 +916,9 @@ ATEerror_t AT_test_mode(const char *param)
   if ((test_mode >= 7) && (test_mode <= 10))
   {
 #ifdef MN_ON
-    sfx_error = ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(rc, tm, rc_capabilities_bit_mask);
+    sfx_error = ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_async(rc, tm, rc_capabilities_bit_mask,
+                                                                        sfx_monarch_test_mode_wait_start_cb,
+                                                                        sfx_monarch_test_mode_wait_end_cb);
 #else
     at_status = AT_ERROR;
 #endif /* MN_ON */
@@ -1349,9 +1377,9 @@ ATEerror_t AT_rssi_cal_get(const char *param)
   AT_PRINTF("%d dB\r\n", rssi_cal);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_rssi_cal_get_1 */
+  /* USER CODE BEGIN AT_rssi_cal_get_2 */
 
-  /* USER CODE END AT_rssi_cal_get_1 */
+  /* USER CODE END AT_rssi_cal_get_2 */
 }
 
 ATEerror_t AT_echo_set(const char *param)
@@ -1500,7 +1528,7 @@ static ErrorStatus stringToData(const char *str, uint8_t *data, uint32_t *dataSi
     hex[0] = *str++;
     hex[1] = *str++;
 
-    /*check if input is hexa */
+    /*check if input is hex */
     if ((isHex(hex[0]) == ERROR) || (isHex(hex[1]) == ERROR))
     {
       return ERROR;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_at.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_at.h
index d3c23228..9e645e7e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_at.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_at.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_at.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_AT_H__
@@ -103,219 +105,219 @@ typedef enum eATEerror
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Return AT_OK in all cases
-  * @param  Param string of the AT command - unused
+  * @param  param string of the AT command - unused
   * @retval AT_OK
   */
 ATEerror_t AT_return_ok(const char *param);
 
 /**
   * @brief  Return AT_ERROR in all cases
-  * @param  Param string of the AT command - unused
+  * @param  param string of the AT command - unused
   * @retval AT_ERROR
   */
 ATEerror_t AT_return_error(const char *param);
 
 /**
   * @brief  Trig a reset of the MCU
-  * @param  Param string of the AT command - unused
+  * @param  param string of the AT command - unused
   * @retval AT_OK
   */
 ATEerror_t AT_reset(const char *param);
 
 /**
   * @brief  Restore factory settings in Eeprom
-  * @param  Param string of the AT command - unused
+  * @param  param string of the AT command - unused
   * @retval AT_OK
   */
 ATEerror_t AT_restore_factory_settings(const char *param);
 
 /**
   * @brief  Send Bit w/wo ack to Sigfox Nw
-  * @param  String pointing to command parameters
+  * @param  param String pointing to command parameters
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_SendBit(const char *param);
 
 /**
   * @brief  Send  ASCII frame w/wo ack to Sigfox Nw
-  * @param  String pointing to command parameters
+  * @param  param String pointing to command parameters
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_SendFrame(const char *param);
 
 /**
-  * @brief  Send  Hexa frame w/wo ack to Sigfox Nw
-  * @param  String pointing to command parameters
+  * @brief  Send  Hex frame w/wo ack to Sigfox Nw
+  * @param  param String pointing to command parameters
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_SendHexFrame(const char *param);
 
 /**
   * @brief  Print last received message
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_Send(const char *param);
 
 /**
   * @brief  Get the DevId
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_DevId_get(const char *param);
 
 /**
   * @brief  Get the Dev Pac
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_DevPac_get(const char *param);
 
 /**
   * @brief  Set public Key
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PublicKey_set(const char *param);
 
 /**
   * @brief  Get public Key
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PublicKey_get(const char *param);
 /**
   * @brief  Set Payload Encryption
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PayloadEncryption_set(const char *param);
 
 /**
   * @brief  Get Payload Encryption
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PayloadEncryption_get(const char *param);
 
 /**
   * @brief  Print the version of the AT_Slave FW
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_version_get(const char *param);
 
 /**
   * @brief  Print the battery level
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_bat_get(const char *param);
 
 /**
   * @brief  Test Tone
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_cw(const char *param);
 
 /**
   * @brief  Tx Test with prbs9 modulation
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_pn(const char *param);
 
 /**
   * @brief  Starts a monarch scan
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_scan_mn(const char *param);
 /**
   * @brief  Test Tone
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_mode(const char *param);
 
 /**
   * @brief  set the output power of the radio (power in dBm)
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_power_set(const char *param);
 
 /**
   * @brief  get the output power of the radio (power in dBm)
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_power_get(const char *param);
 /**
   * @brief  send an out of band message one
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_outOfBand_run(const char *param);
 
 /**
   * @brief  to configure the enabled channels for FCC
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_ChannelConfigFcc_set(const char *param);
 
 /**
   * @brief  set zones (1 2 3 or 4)
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_rc_set(const char *param);
 
 /**
   * @brief  get zones (1 2 3 or 4)
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_rc_get(const char *param);
 
 /**
   * @brief  to get the rssi calibration value from eeprom.
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_rssi_cal_get(const char *param);
 
 /**
   * @brief  to set the rssi calibration state in eeprom.
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_rssi_cal_set(const char *param);
 /**
   * @brief  to get the current echo state from eeprom.
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_echo_get(const char *param);
 
 /**
   * @brief  to set the echo state in eeprom.
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_echo_set(const char *param);
 /**
   * @brief  Set the verbose level
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_verbose_set(const char *param);
 
 /**
   * @brief  Get the verbose level
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_verbose_get(const char *param);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_command.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_command.c
index 349d4e92..157a00cc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_command.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_command.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_command.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <string.h>
@@ -37,7 +39,6 @@
 /* #define NO_HELP */
 /* #define NO_KEY_ADDR_EUI */
 #define CMD_SIZE                        64
-#define HELP_DISPLAY_FLUSH_DELAY        100
 
 /* USER CODE BEGIN PD */
 
@@ -194,7 +195,7 @@ static const struct ATCommand_s ATCommand[] =
     .string = AT_SENDH,
     .size_string = sizeof(AT_SENDH) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_SENDH "=<PayloadLength>,<Payload>,<Opt downlink>,<Opt TxRepeat><CR>. Send a Hexa frame to the sigfox network\r\n",
+    .help_string = "AT"AT_SENDH "=<PayloadLength>,<Payload>,<Opt downlink>,<Opt TxRepeat><CR>. Send a Hex frame to the sigfox network\r\n",
 #endif /* !NO_HELP */
     .get = AT_return_error,
     .set = AT_SendHexFrame,
@@ -332,6 +333,9 @@ static const struct ATCommand_s ATCommand[] =
     .set = AT_verbose_set,
     .run = AT_return_error,
   },
+  /* USER CODE BEGIN ATCommand */
+
+  /* USER CODE END ATCommand */
 };
 
 static char command[CMD_SIZE];
@@ -345,15 +349,13 @@ static uint32_t IsBusy = 0;
 /* Private function prototypes -----------------------------------------------*/
 /**
   * @brief  Parse a command and process it
-  * @param  The command
-  * @retval None
+  * @param  cmd The command
   */
 static void parse_cmd(const char *cmd);
 
 /**
   * @brief  Print a string corresponding to an ATEerror_t
-  * @param  The AT error code
-  * @retval None
+  * @param  error_type The AT error code
   */
 static void com_error(ATEerror_t error_type);
 
@@ -362,20 +364,17 @@ static void com_error(ATEerror_t error_type);
   * @param  rxChar th char received
   * @param  size
   * @param  error
-  * @retval None
   */
 static void CMD_GetChar(uint8_t *rxChar, uint16_t size, uint8_t error);
 
 /**
-  * @brief  CNotifies the upper layer that a charchter has been receveid
-  * @param  None
-  * @retval None
+  * @brief  CNotifies the upper layer that a character has been received
   */
 static void (*NotifyCb)(void);
 
 /**
   * @brief  Remove backspace and its preceding character in the Command string
-  * @param  Command string to process
+  * @param  cmd string to process
   * @retval 0 when OK, otherwise error
   */
 static int32_t CMD_ProcessBackSpace(char *cmd);
@@ -550,9 +549,12 @@ static void parse_cmd(const char *cmd)
     {
       AT_PPRINTF(ATCommand[i].help_string);
     }
-    /* Wait for the message queue to be flushed in order
-       not to disturb following com_error() display */
-    HAL_Delay(HELP_DISPLAY_FLUSH_DELAY);
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
 #endif /* !NO_HELP */
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_command.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_command.h
index b8759d28..a7ebb631 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_command.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_command.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_command.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_COMMAND_H__
@@ -56,17 +58,12 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief Initializes command module
-  *
-  * @param [IN] cb to signal appli that character has been received
-  * @retval None
+  * @param CmdProcessNotify cb to signal application that character has been received
   */
 void CMD_Init(void (*CmdProcessNotify)(void));
 
 /**
   * @brief Process the command
-  *
-  * @param [IN] None
-  * @retval None
   */
 void CMD_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.c
index c86679dd..8f722834 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_cstimer.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sgfx_cstimer.h"
@@ -62,7 +64,7 @@ void RxCarrierSenseInitStatus(void)
   /* USER CODE BEGIN RxCarrierSenseInitStatus_1 */
 
   /* USER CODE END RxCarrierSenseInitStatus_1 */
-  /*Initialises the Flag*/
+  /*Initialize the Flag*/
   rxCarrierSenseFlag = 0;
   /* USER CODE BEGIN RxCarrierSenseInitStatus_2 */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.h
index bd7acc9b..d51103ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_cstimer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_CSTIMER_H__
 #define __SGFX_CSTIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.c
index 64d63a2e..cbd604b9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -23,6 +25,8 @@
 #include "ee.h"
 #include "st_sigfox_api.h"
 #include "se_nvm.h"
+#include "sys_conf.h"
+#include "utilities_conf.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -72,8 +76,19 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief        Read Sigfox Configuration from eeprom
+  * @param addr   variable virtual address
+  * @param data   pointer to a 32-bit word (allocated by the caller) containing the
+  *               variable value in case of success.
+  */
 static void E2P_Read(e_EE_ID addr, uint32_t *data);
 
+/**
+  * @brief        Write Sigfox Configuration to eeprom
+  * @param addr   variable virtual address
+  * @param data   32-bit data word to be written
+  */
 static void E2P_Write(e_EE_ID addr, uint32_t data);
 
 /* USER CODE BEGIN PFP */
@@ -152,7 +167,7 @@ void E2P_RestoreFs(void)
   E2P_Write(EE_MCU_NVM_2_ID, 0);
   E2P_Write(EE_MCU_NVM_3_ID, 0);
   E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, 0);
-  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, 0);
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, VERBOSE_LEVEL);
 
   HAL_FLASH_Lock();
   /* USER CODE BEGIN E2P_RestoreFs_2 */
@@ -407,9 +422,9 @@ void E2P_Write_VerboseLevel(uint8_t verboselevel)
   E2P_Write(EE_SGFX_VERBOSELEVEL_ID, (uint32_t) verboselevel);
 
   HAL_FLASH_Lock();
-  /* USER CODE BEGIN E2P_Write_VerboseLevel_1 */
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_2 */
 
-  /* USER CODE END E2P_Write_VerboseLevel_1 */
+  /* USER CODE END E2P_Write_VerboseLevel_2 */
 }
 
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
@@ -561,7 +576,7 @@ E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len)
   E2P_Read(EE_SE_NVM_1_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_2_ID, &data_from_eeprom);
-  read_data[i++] = (sfx_u8) data_from_eeprom;;
+  read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_3_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_4_ID, &data_from_eeprom);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.h
index 02c69e55..a623ee7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_EEPROM_IF_H__
@@ -118,182 +120,164 @@ typedef enum
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_Init(void);
 
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_RestoreFs(void);
 
 /*!
- * @brief Read Output Power
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Read Output Power
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @return Output Power
  */
 int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Write Output Power to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Write Output Power to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @param  power Output Power
  */
 void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power);
 
 /*!
- * @brief Read Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval Region Configuration RC
+ * @brief  Read Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return Region Configuration RC
  */
 sfx_rc_enum_t E2P_Read_Rc(void);
 
 /*!
- * @brief Write Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Region Configuration RC
- * @retval None
+ * @brief  Write Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
  */
 void E2P_Write_Rc(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Read Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Read Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Write Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Write Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Read rssi calibration value from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval rssi calibration value
+ * @brief  Read rssi calibration value from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return rssi calibration value
  */
 int16_t E2P_Read_RssiCal(void);
 
 /*!
- * @brief Writes rssi calibration value to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  rssi calibration value
- * @retval None
+ * @brief  Writes rssi calibration value to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  rssi_cal calibration value
  */
 void E2P_Write_RssiCal(int16_t rssi_cal);
 
 /*!
- * @brief Read Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval at_echo
  */
 uint32_t E2P_Read_AtEcho(void);
 
 /*!
- * @brief Write Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  at_echo
- * @retval None
  */
 void E2P_Write_AtEcho(uint32_t at_echo);
 
 /*!
- * @brief Read KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval KeyType
  */
 sfx_key_type_t E2P_Read_KeyType(void);
 
 /*!
- * @brief Write KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  KeyType
- * @retval None
+ * @brief  Write KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  key_type KeyType setting
  */
 void E2P_Write_KeyType(sfx_key_type_t key_type);
 
 /*!
- * @brief Read EncryptionFlag setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read EncryptionFlag setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval encryption_flag
  */
 uint8_t E2P_Read_EncryptionFlag(void);
 
 /*!
- * @brief Write EncryptionFlag  setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write EncryptionFlag  setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  encryption_flag
- * @retval None
  */
 void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len);
 
 /*!
- * @brief Write Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Write Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Read MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data,  uint32_t len);
 
 /*!
- * @brief Write Region MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Write Region MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param   None
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval the VL
  */
 uint8_t E2P_Read_VerboseLevel(void);
 
 /*!
- * @brief Read verbose levelsetting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Read verbose levelsetting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  verboselevel
- * @retval None
  */
 void E2P_Write_VerboseLevel(uint8_t verboselevel);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sigfox_data.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sigfox_data.h
index a32f9ae0..9dbd7b64 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sigfox_data.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/App/sigfox_data.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file   sigfox_data.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SIGFOX_DATA_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mcu_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mcu_api.c
index 142351f2..4099d895 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mcu_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mcu_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mcu_api.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -31,6 +33,7 @@
 #include "utilities_def.h"
 #include "sys_app.h" /*for APP_LOG*/
 #include "radio_board_if.h"
+#include "radio_conf.h" /* RF_WAKEUP_TIME */
 
 /* USER CODE BEGIN Includes */
 
@@ -116,9 +119,6 @@ sfx_u8 MCU_API_malloc(sfx_u16 size, sfx_u8 **returned_pointer)
 
   /* USER CODE END MCU_API_malloc_1 */
 
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
   /* Allocate a memory : static or dynamic allocation */
   /* knowing that the sigfox library will ask for a buffer once at the SIGFOX_API_open() call. */
   /* This buffer will be released after SIGFOX_API_close() call. */
@@ -144,6 +144,8 @@ sfx_u8 MCU_API_free(sfx_u8 *ptr)
   /* USER CODE BEGIN MCU_API_free_1 */
 
   /* USER CODE END MCU_API_free_1 */
+  /* Free the buffer allocated during the MCU_API_malloc()
+   * called only when SIGFOX_API_close() is called. */
   return SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_free_2 */
 
@@ -158,8 +160,11 @@ sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_t
 
   /* USER CODE END MCU_API_get_voltage_temperature_1 */
 
-  /* brief Get voltage and temperature for Out of band frames*/
-  /* Value must respect the units bellow for backend compatibility*/
+  /* Get the idle voltage of the complete device
+   * Get the TX voltage of the complete device ( during transmission )
+   * Get the temperature of the device
+   * If those values are not available : set it to 0x0000
+   * return the voltage_idle in 1/10 volt on 16bits and 1/10 degrees for the temperature */
   *voltage_idle = (uint16_t) SYS_GetBatteryLevel(); /* mV */
   *voltage_tx = 0;   /* mV */
   *temperature = (uint16_t)((SYS_GetTemperatureLevel() * 10) >> 8);  /* */
@@ -187,8 +192,12 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
   switch (delay_type)
   {
     case SFX_DLY_INTER_FRAME_TRX :
+      /* Interframe used when sending an Uplink Message with a downlink request */
       /* Delay  is 500ms  in FCC and ETSI
-        * In ARIB : minimum delay is 50 ms */
+       * In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX1 */
       if ((sfx_rc == SFX_RC3A) ||
           (sfx_rc == SFX_RC3C) ||
           (sfx_rc == SFX_RC5))
@@ -205,11 +214,18 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
       {
         Delay_Lp(510 - (T_RADIO_DELAY_ON) - T_RADIO_DELAY_OFF); /* 500-525 ms */
       }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX2 */
       break;
 
     case SFX_DLY_INTER_FRAME_TX :
+      /* Interframe used when sending an Uplink Message without downlink request */
       /* Start delay 0 seconds to 2 seconds in FCC and ETSI*/
       /* In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX1 */
       if ((sfx_rc == SFX_RC3A) ||
           (sfx_rc == SFX_RC3C) ||
           (sfx_rc == SFX_RC5))
@@ -221,19 +237,41 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
       {
         Delay_Lp(1000 - T_RADIO_DELAY_ON - T_RADIO_DELAY_OFF); /* 1000 ms */
       }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX2 */
       break;
 
     case SFX_DLY_OOB_ACK :
+      /*  Delay between RX frame and sending ack in oob service frame*/
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK1 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK1 */
       /* Start delay between 1.4 seconds to 4 seconds in FCC and ETSI */
       Delay_Lp(1600 - T_RADIO_DELAY_ON);
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK2 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK2 */
       break;
 
     case SFX_DLY_CS_SLEEP :
+      /* Delay between attempts of carrier sense for the first frame*/
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP1 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP1 */
       Delay_Lp(500 - T_RADIO_DELAY_ON); /* 500 ms */
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP2 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP2 */
       break;
+    /* USER CODE BEGIN SFX_DLY_ADD_CASE */
 
+    /* USER CODE END SFX_DLY_ADD_CASE */
     default :
       err = MCU_ERR_API_DLY;
+      /* USER CODE BEGIN SFX_DLY_DEFAULT */
+
+      /* USER CODE END SFX_DLY_DEFAULT */
       break;
   }
   /* USER CODE BEGIN MCU_API_delay_Last */
@@ -245,26 +283,33 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
 /*******************************************************************/
 sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
 {
-  /* USER CODE BEGIN MCU_API_get_nv_mem_1 */
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_get_nv_mem1 */
 
-  /* USER CODE END MCU_API_get_nv_mem_1 */
+  /* USER CODE END MCU_API_get_nv_mem1 */
+  /* Read out SFX_NVMEM_BLOCK_SIZE bytes in eeprom or equivalent
+   * in flash as Non Volatile Memory (NVM)
+   * This cannot be in RAM : must be remanent*/
   if (E2P_Read_McuNvm(read_data, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
   {
     return MCU_ERR_API_GETNVMEM;
   }
-  /* USER CODE BEGIN MCU_API_get_nv_mem_2 */
+  /* USER CODE BEGIN MCU_API_get_nv_mem2 */
 
-  /* USER CODE END MCU_API_get_nv_mem_2 */
-  return SFX_ERR_NONE;
+  /* USER CODE END MCU_API_get_nv_mem2 */
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_set_nv_mem_1 */
 
   /* USER CODE END MCU_API_set_nv_mem_1 */
-
+  /* Write down SFX_NVMEM_BLOCK_SIZE bytes
+   * in the eeprom or flash such as it can be retrieved
+   * later even if device is switched off or rebooting*/
   if (E2P_Write_McuNvm(data_to_write, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
   {
     return MCU_ERR_API_SETNVMEM;
@@ -272,15 +317,21 @@ sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
   /* USER CODE BEGIN MCU_API_set_nv_mem_2 */
 
   /* USER CODE END MCU_API_set_nv_mem_2 */
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_1 */
 
   /* USER CODE END MCU_API_timer_start_carrier_sense_1 */
+  /* Starts a timer for the carrier sense. You can plug your timer
+   * expiration to a callback that will update the timer event
+   * status checked by RF_API_wait_for_clear_channel*/
+  /* Starts CS timeout during time_duration_in_ms */
+
   APP_LOG(TS_ON, VLEVEL_M, "CS timeout Started= %d msec\n\r", time_duration_in_ms);
   UTIL_TIMER_Create(&Timer_TimeoutCs, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTimerTimeoutCsEvt, NULL);
   UTIL_TIMER_Stop(&Timer_TimeoutCs);
@@ -289,15 +340,19 @@ sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
   /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_2 */
 
   /* USER CODE END MCU_API_timer_start_carrier_sense_2 */
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_start_1 */
 
   /* USER CODE END MCU_API_timer_start_1 */
+  /* Starts MCU timer during time_duration_in_ms */
+  /* This timer start can install a callback to indicate when it occurs
+   * This event will be caught in the MCU_API_wait_for_end_timer() function. */
   uint32_t time_duration_in_millisec = time_duration_in_s * 1000;
   APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Started= %d sec\n\r", time_duration_in_s);
 
@@ -305,112 +360,120 @@ sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
   UTIL_TIMER_Stop(&Timer_Timeout);
   UTIL_TIMER_SetPeriod(&Timer_Timeout, time_duration_in_millisec);
   UTIL_TIMER_Start(&Timer_Timeout);
+
   /* USER CODE BEGIN MCU_API_timer_start_2 */
 
   /* USER CODE END MCU_API_timer_start_2 */
 
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_stop(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_stop_1 */
 
   /* USER CODE END MCU_API_timer_stop_1 */
+  /* Stops MCU timer started in MCU_API_timer_start*/
   APP_LOG(TS_ON, VLEVEL_M, "timer_stop\n\r");
 
   UTIL_TIMER_Stop(&Timer_Timeout);
   /* USER CODE BEGIN MCU_API_timer_stop_2 */
 
   /* USER CODE END MCU_API_timer_stop_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_stop_carrier_sense(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_1 */
 
   /* USER CODE END MCU_API_timer_stop_carrier_sense_1 */
+  /* Abort the carrier sense: stops CS timer */
   APP_LOG(TS_ON, VLEVEL_M, "CS timer_stop\n\r");
 
   UTIL_TIMER_Stop(&Timer_TimeoutCs);
   /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_2 */
 
   /* USER CODE END MCU_API_timer_stop_carrier_sense_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_wait_for_end(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_wait_for_end_1 */
 
   /* USER CODE END MCU_API_timer_wait_for_end_1 */
+  /* This function is waiting (actively or not) on the event for end timer
+   * (started by MCU_API_timer_start) elapsed and then returns*/
   APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Wait\n\r");
 
   UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
   /* USER CODE BEGIN MCU_API_timer_wait_for_end_2 */
 
   /* USER CODE END MCU_API_timer_wait_for_end_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_report_test_result(sfx_bool status, sfx_s16 rssi)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_report_test_result_1 */
 
   /* USER CODE END MCU_API_report_test_result_1 */
+  /* this function is used to to report status and rssi
+   * optionally, it can log data on terminal*/
   rxcount++;
 
   if (status == SFX_TRUE)
   {
-    /* Set the LED3 to inform the user that we received a frame for the device */
-#if defined(USE_BSP_DRIVER)
+    /* Last Rx Packet received*/
+    /* USER CODE BEGIN SFX_TRUE_1 */
     BSP_LED_On(LED_GREEN);
     HAL_Delay(50);
     BSP_LED_Off(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN);
-    HAL_Delay(50);
-    SYS_LED_Off(SYS_LED_GREEN);
-#endif /* defined(USE_BSP_DRIVER) */
+    /* USER CODE END SFX_TRUE_1 */
     okcount++;
     APP_LOG(TS_ON, VLEVEL_H, TERM_GREEN"RX OK. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r  "TERM_RESET, (int32_t) rssi, rxcount,
             ((rxcount - okcount) * 100) / rxcount);
+    /* USER CODE BEGIN SFX_TRUE_2 */
+
+    /* USER CODE END SFX_TRUE_2 */
   }
   else
   {
-#if defined(USE_BSP_DRIVER)
+    /* Last Rx Packet on error or timeout*/
+    /* USER CODE BEGIN SFX_FALSE_1 */
     BSP_LED_On(LED_BLUE);
     HAL_Delay(50);
     BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE);
-    HAL_Delay(50);
-    SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
+    /* USER CODE END SFX_FALSE_1 */
     APP_LOG(TS_ON, VLEVEL_H, TERM_RED"RX KO. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r "TERM_RESET, (int32_t)rssi, rxcount,
             ((rxcount - okcount) * 100) / rxcount);
-  }
+    /* USER CODE BEGIN SFX_FALSE_2 */
 
-  return SFX_ERR_NONE;
+    /* USER CODE END SFX_FALSE_2 */
+  }
   /* USER CODE BEGIN MCU_API_report_test_result_2 */
 
   /* USER CODE END MCU_API_report_test_result_2 */
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_get_version_1 */
 
   /* USER CODE END MCU_API_get_version_1 */
+  /* Reports version and the size of the version buffer*/
   *version = (sfx_u8 *)mcu_api_version;
   if (size == SFX_NULL)
   {
@@ -421,7 +484,7 @@ sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
 
   /* USER CODE END MCU_API_get_version_2 */
 
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 static void Delay_Lp(uint32_t delay_ms)
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mcu_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mcu_api.h
index 892fe41a..c0a63471 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mcu_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mcu_api.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mcu_api.h
   * @author  MCD Application Team
-  * @brief   defines the interfaace to mcu_api.c
+  * @brief   defines the interface to mcu_api.c
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /*!
 \if SIGFOX PATTERN
 ----------------------------------------------
@@ -180,7 +182,7 @@ sfx_u8 MCU_API_free(sfx_u8 *ptr);
 /*!******************************************************************
   * \fn sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_tx, sfx_s16 *temperature)
   * \brief Get voltage and temperature for Out of band frames
-  * Value must respect the units bellow for <B>backend compatibility</B>
+  * Value must respect the units below for <B>backend compatibility</B>
   *
   * \param[in] none
   * \param[out] sfx_u16 *voltage_idle             Device's voltage in Idle state (mV)
@@ -210,28 +212,6 @@ sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle,
   *******************************************************************/
 sfx_u8 MCU_API_delay(sfx_delay_t delay_type);
 
-/*!******************************************************************
-  * \fn sfx_u8 MCU_API_aes_128_cbc_encrypt(sfx_u8 *encrypted_data, sfx_u8 *data_to_encrypt, sfx_u8 aes_block_len, sfx_u8 key[16], sfx_credentials_use_key_t use_key)
-  * \brief Encrypt a complete buffer with Secret or Test key.<BR>
-  * The secret key corresponds to the private key provided from the CRA.
-  * <B>These keys must be stored in a secure place.</B> <BR>
-  * Can be hardcoded or soft coded (iv vector contains '0')
-  *
-  * \param[out] sfx_u8 *encrypted_data            Result of AES Encryption
-  * \param[in] sfx_u8 *data_to_encrypt            Input data to Encrypt
-  * \param[in] sfx_u8 aes_block_len               Input data length (should be a multiple of an AES block size, ie. AES_BLOCK_SIZE bytes)
-  * \param[in] sfx_u8 key[16]                     Input key
-  * \param[in] sfx_credentials_use_key_t use_key  Key to use - private key or input key
-  *
-  * \retval SFX_ERR_NONE:                         No error
-  * \retval MCU_ERR_API_AES:                      AES Encryption error
-  *******************************************************************/
-sfx_u8 MCU_API_aes_128_cbc_encrypt(sfx_u8 *encrypted_data,
-                                   sfx_u8 *data_to_encrypt,
-                                   sfx_u8 aes_block_len,
-                                   sfx_u8 key[16],
-                                   sfx_credentials_use_key_t use_key);
-
 /*!******************************************************************
   * \fn sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
   * \brief This function copies the data read from non volatile memory
@@ -340,7 +320,7 @@ sfx_u8 MCU_API_timer_wait_for_end(void);
   *
   * \param[in] sfx_bool status                    Is SFX_TRUE when result ok else SFX_FALSE
   *                                               See SIGFOX_API_test_mode summary
-  * \param[out] rssi                              RSSI of the received frame
+  * \param[in] rssi                              RSSI of the received frame
   *
   * \retval SFX_ERR_NONE:                         No error
   * \retval MCU_ERR_API_TEST_REPORT:              Report test result error
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mn_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mn_api.c
index 1dd2b585..5a748e02 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mn_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mn_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_api.c
@@ -16,31 +17,32 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "stm32wlxx_hal.h"
 
 #include "mn_api.h"
-#include "lptim.h"
-#include "stm32_lpm.h"
+#include "mn_lptim_if.h"
 #include "radio.h"
-#include "sys_debug.h"
-#include "sys_app.h"
-#include "utilities_conf.h"
-#include "sys_conf.h"             /*For led*/
+#include "platform.h"          /*For led*/
 #include "sys_app.h"           /*For log*/
+#include "stm32_lpm.h"
 #include "stm32_timer.h"
 #include "stm32_seq.h"
 #include "utilities_def.h"
-#include "platform.h"
-#include "mn_lptim_if.h"
 
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
+/**
+  * @brief LPTIM handle
+  */
+extern LPTIM_HandleTypeDef hlptim1;
+
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -52,7 +54,7 @@
 
 /* Private define ------------------------------------------------------------*/
 /*OOK demod on for debug*/
-#define MN_PROCESS_IN_BG 0
+#define MN_PROCESS_IN_BG 1
 
 #define LPTIM_PERIOD     ((uint32_t)  2)        /* 1/16384~61.03us  */
 
@@ -185,7 +187,7 @@ void MN_API_StopRx(void)
   /* USER CODE BEGIN MN_API_StopRx_1 */
 
   /* USER CODE END MN_API_StopRx_1 */
-  /*no need to stanby xosc, radio will just
+  /*no need to standby xosc, radio will just
     change freq with MN_API_change_frequency*/
   /* USER CODE BEGIN MN_API_StopRx_2 */
 
@@ -232,38 +234,19 @@ void MN_API_Disable16KHzSamplingTimer(void)
 void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequency, int32_t best_rssi)
 {
   /* USER CODE BEGIN MN_API_Pattern_Found_1 */
-
+  BSP_LED_On(LED_BLUE);
   /* USER CODE END MN_API_Pattern_Found_1 */
   /* debug function to display sweep/window detected pattern*/
-#if defined(USE_BSP_DRIVER)
-  if (window_type == 0)
-  {
-    BSP_LED_On(LED_BLUE);
-    APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    BSP_LED_Off(LED_BLUE);
-  }
-  else
-  {
-    BSP_LED_On(LED_BLUE);
-    APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    BSP_LED_Off(LED_BLUE);
-  }
-#elif defined(MX_BOARD_PSEUDODRIVER)
   if (window_type == 0)
   {
-    SYS_LED_On(SYS_LED_BLUE);
     APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    SYS_LED_Off(SYS_LED_BLUE);
   }
   else
   {
-    SYS_LED_On(SYS_LED_BLUE);
     APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    SYS_LED_Off(SYS_LED_BLUE);
   }
-#endif /* defined(USE_BSP_DRIVER) */
   /* USER CODE BEGIN MN_API_Pattern_Found_2 */
-
+  BSP_LED_Off(LED_BLUE);
   /* USER CODE END MN_API_Pattern_Found_2 */
 }
 
@@ -338,7 +321,6 @@ void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
   /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_1 */
   int16_t rssi = RADIO_NOISE_LEVEL;
 
-  DBG_GPIO_SET_LINE(GPIOB, GPIO_PIN_12);
   /*read rssi*/
   if (RssiReadOnIT_Enable == 1)
   {
@@ -352,12 +334,11 @@ void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
       RssiBuffWriteIdx = 0;
     }
     /*run process_MonarchBackGround in background*/
-    UTIL_SEQ_SetTask(1 << CFG_SEQ_TASK_MONARCH, CFG_SEQ_Prio_0);
+    UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_Monarch, CFG_SEQ_Prio_0);
 #else
     MN_Timer_CB(rssi);
 #endif /* MN_PROCESS_IN_BG==1 */
   }
-  DBG_GPIO_RST_LINE(GPIOB, GPIO_PIN_12);
   /* USER CODE BEGIN HAL_LPTIM_AutoReloadMatchCallback_2 */
 
   /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_2 */
@@ -370,7 +351,7 @@ static void process_MonarchBackGround(void)
 
   /* USER CODE END process_MonarchBackGround_1 */
   int16_t rssi;
-  DBG_GPIO_SET_LINE(GPIOB, GPIO_PIN_13);
+
   while (RssiBuffWriteIdx != RssiBuffReadIdx)
   {
     rssi = RssiBuff[RssiBuffReadIdx++];
@@ -381,7 +362,6 @@ static void process_MonarchBackGround(void)
     }
     MN_Timer_CB(rssi);
   }
-  DBG_GPIO_RST_LINE(GPIOB, GPIO_PIN_13);
   /* USER CODE BEGIN process_MonarchBackGround_2 */
 
   /* USER CODE END process_MonarchBackGround_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mn_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mn_api.h
index 240019f7..1f76066c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mn_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mn_api.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_api.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MN_API_H__
@@ -53,14 +55,14 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialises the Monarch Low level
-  * @param Callback for rssi samplep rocess
+  * @brief Initialize the Monarch Low level
+  * @param Callback for rssi sample process
   * @retval None
   */
 void MN_API_Init(void (*MN_API_Timer_CB)(int16_t rssi));
 
 /**
-  * @brief DeInitialises the Monarch Low level
+  * @brief DeInitialize the Monarch Low level
   * @param None
   * @retval None
   */
@@ -116,7 +118,7 @@ void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequenc
   * @brief starts timer
   * @param timer_value_ms timer value in ms
   * @param call back when timer elapses
-  * @note Argurment can be left unused
+  * @note Argument can be left unused
   * @retval None
   */void MN_API_TimerSart(uint32_t timer_value_ms, void (*TimeoutHandle)(void *Argument));
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_board_if.h
index 11ef6af2..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     150U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_conf.h
index 29cc81b5..64c1f183 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,7 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
-#include "stm32_mem.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,20 +48,16 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-
-/**
-  * @brief Max payload buffer size
-  */
-#define RADIO_RX_BUF_SIZE          255
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -67,25 +65,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 15UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -125,6 +140,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/rf_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/rf_api.c
index 71140893..a877cf85 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/rf_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/rf_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ****************************************************************************
   * @file    rf_api.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* includes -----------------------------------------------------------*/
 #include "stdint.h"
@@ -50,7 +52,7 @@
 /* Private define ------------------------------------------------------------*/
 #define RF_VER                   "RF_API_V1.0"
 #define SFX_PREAMBLE_LENGTH      2
-#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronise*/
+#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronize*/
 #define SFX_MAX_PAYLOAD_LENGTH   15
 #define SFX_DATARATE_600         600
 #define SFX_DATARATE_100         100
@@ -129,27 +131,34 @@ const RadioEvents_t RfApiRadioEvents =
 /* Exported functions --------------------------------------------------------*/
 sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_init_1 */
 
   /* USER CODE END RF_API_init_1 */
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
   /* Put here all RF initialization concerning the RC IC you are using. */
-  /* this function is dependent of SPI driver or equivalent. */
 
   switch (rf_mode)
   {
     case SFX_RF_MODE_TX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_TX_1 */
+
+      /* USER CODE END SFX_RF_MODE_TX_1 */
+      /* Initialize Tx if necessary*/
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in TX\n\r");
-      /* nothing to do */
-      /* set the RF IC in TX mode : this could be DBPSK100 or 600:  this distinction will be done during the RF_API_send */
-      /* you can add some code to switch on TCXO or warm up quartz for stabilization : in case of frequency drift issue */
+
+      /* USER CODE BEGIN SFX_RF_MODE_TX_2 */
+
+      /* USER CODE END SFX_RF_MODE_TX_2 */
       break;
     }
     case SFX_RF_MODE_RX:
     {
+      /* Configure the RF_IP IC in RX mode : GFSK 600bps*/
+      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+      /* USER CODE BEGIN SFX_RF_MODE_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_RX_1 */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in RX\n\r");
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 1600,
                         SFX_DATARATE_600, NA,
@@ -158,13 +167,19 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* set the RF IC in RX mode : GFSK 600bps is the only mode now */
-      /* Enable interrupts on RX fifo */
-      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+
+      /* USER CODE BEGIN SFX_RF_MODE_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_RX_2 */
       break;
     }
     case SFX_RF_MODE_CS200K_RX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_1 */
+      /* configure the RF_IP into sensing 200KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS200\n\r");
 
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 200000,
@@ -174,12 +189,20 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 200KHz bandwidth to be able to read out RSSI level */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function */
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_2 */
       break;
     }
     case SFX_RF_MODE_CS300K_RX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_1 */
+
+      /* configure the RF_IP into sensing 300KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function. */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS300\n\r");
 
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 300000,
@@ -189,13 +212,19 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 300KHz bandwidth to be able to read out RSSI level */
-      /* This is poosible to make this carrier sense in 2 * 200Kz if you respect the regulation time for listening */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function. */
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_2 */
       break;
     }
     case SFX_RF_MODE_MONARCH:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_1 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_1 */
+
+      /* configure the RF_IP into sensing 20KHz bandwidth */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in MN20\n\r");
       /* APP_LOG(TS_ON, VLEVEL_L,"RxBw=20kHz\n\r"); */
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 20000,
@@ -205,22 +234,25 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 20KHz bandwidth to be able to read out RSSI level */
-      /* This is poosible to make this carrier sense in 2 * 200Kz if you respect the regulation time for listening */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function. */
+
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_2 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_2 */
       break;
     }
     default :
+      status = RF_ERR_API_INIT;
       break;
   }
-  return SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_init_2 */
 
   /* USER CODE END RF_API_init_2 */
+  return status;
 }
 
 sfx_u8 RF_API_stop(void)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_stop_1 */
 
   /* USER CODE END RF_API_stop_1 */
@@ -231,35 +263,56 @@ sfx_u8 RF_API_stop(void)
 
   /* USER CODE END RF_API_stop_2 */
 
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_send_1 */
 
   /* USER CODE END RF_API_send_1 */
-  sfx_u8 status = SFX_ERR_NONE;
 
   uint32_t datarate;
 
   int8_t power = E2P_Read_Power(E2P_Read_Rc());
 
   APP_LOG(TS_ON, VLEVEL_M, "TX START:nB=%d\n\r", size);
-
   switch (type)
   {
     case SFX_DBPSK_100BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @100bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
       datarate = SFX_DATARATE_100;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_2 */
       break;
     case SFX_DBPSK_600BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @600bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
       datarate = SFX_DATARATE_600;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_2 */
+
       break;
     default :
       status = RF_ERR_API_SEND;
       break;
   }
+  /* USER CODE BEGIN RF_API_send_2 */
+  BSP_LED_On(LED_BLUE);
 
+  /* USER CODE END RF_API_send_2 */
   if (status == SFX_ERR_NONE)
   {
     Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
@@ -268,12 +321,6 @@ sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
                       NA, NA, NA,
                       NA, NA, 3000);
 
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
-
     Radio.Send(stream, size);
 
     APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Tx\n\r");
@@ -282,70 +329,87 @@ sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
 
     APP_LOG(TS_ON, VLEVEL_M, "End Of Tx\n\r");
 
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
-
   }
 
   APP_LOG(TS_ON, VLEVEL_M, "TX END\n\r");
+  /* USER CODE BEGIN RF_API_send_3 */
+  BSP_LED_Off(LED_BLUE);
 
-  /* BSP_LED_Off( LED_RED2 ); */
+  /* USER CODE END RF_API_send_3 */
   return status;
-  /* USER CODE BEGIN RF_API_send_2 */
 
-  /* USER CODE END RF_API_send_2 */
 }
 
 sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_start_continuous_transmission_1 */
 
   /* USER CODE END RF_API_start_continuous_transmission_1 */
-  sfx_u8 status = SFX_ERR_NONE;
 
   int8_t power = E2P_Read_Power(E2P_Read_Rc());
 
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
-
   switch (type)
   {
     case SFX_NO_MODULATION :
+      /* Starts CW continuous Tx at the frequency given by the RF_API_change_frequency()*/
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_1 */
       Radio.TxCw(power);
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_2 */
       break;
     case SFX_DBPSK_100BPS :
-      /* Make an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+      /* Starts an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
       Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
                         NA, SFX_DATARATE_100,
                         NA, NA,
                         NA, NA, NA,
                         NA, NA, 3000);
       Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
       break;
     case SFX_DBPSK_600BPS :
+      /* Starts an infinite DBPSK 600bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
       Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
                         NA, SFX_DATARATE_600,
                         NA, NA,
                         NA, NA, NA,
                         NA, NA, 3000);
       Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
       break;
     default :
       status = RF_ERR_API_SEND;
       break;
   }
-  return status;
   /* USER CODE BEGIN RF_API_start_continuous_transmission_2 */
 
   /* USER CODE END RF_API_start_continuous_transmission_2 */
+  return status;
 }
 
 sfx_u8 RF_API_stop_continuous_transmission(void)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* stop continuous Tx */
+
   /* USER CODE BEGIN RF_API_stop_continuous_transmission_1 */
 
   /* USER CODE END RF_API_stop_continuous_transmission_1 */
@@ -355,11 +419,14 @@ sfx_u8 RF_API_stop_continuous_transmission(void)
   /* USER CODE BEGIN RF_API_stop_continuous_transmission_2 */
 
   /* USER CODE END RF_API_stop_continuous_transmission_2 */
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* set rf frequency for Rx or Tx*/
+
   /* USER CODE BEGIN RF_API_change_frequency_1 */
 
   /* USER CODE END RF_API_change_frequency_1 */
@@ -369,16 +436,22 @@ sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
   /* USER CODE BEGIN RF_API_change_frequency_2 */
 
   /* USER CODE END RF_API_change_frequency_2 */
-
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *state)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_s16 res_rssi = 0;
+  sfx_rx_state_enum_t ret_state = DL_TIMEOUT;
   /* USER CODE BEGIN RF_API_wait_frame_1 */
 
   /* USER CODE END RF_API_wait_frame_1 */
-  sfx_error_t status;
+  /* Starts Rx Windows and wait up to the end of frame or end of rx window*/
+  /*  Wait for 2 events :
+   *  event from your RF_IP indicating a buffer is received or
+   *  event from the timer end : event_timer (see mcu_api.c)
+   * If buffer is received, then copy the buffer in frame buffer and update the state parameter*/
 
   APP_LOG(TS_ON, VLEVEL_M, "RX START\n\r");
 
@@ -389,39 +462,41 @@ sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *stat
 
   if (sfx_wait_end_of_rx() == 1)
   {
-#if 0
-    APP_LOG(TS_ON, VLEVEL_M, "RX= %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n\r",
-            RxFrame[0], RxFrame[1], RxFrame[2], RxFrame[3],
-            RxFrame[4], RxFrame[5], RxFrame[6], RxFrame[7],
-            RxFrame[8], RxFrame[9], RxFrame[10], RxFrame[11],
-            RxFrame[12], RxFrame[13], RxFrame[14], RxFrame[15]);
-#endif /* 0 */
     status = SFX_ERR_NONE;
-    *state = DL_PASSED;
+    ret_state = DL_PASSED;
   }
   else
   {
-    *state = DL_TIMEOUT;
+    ret_state = DL_TIMEOUT;
     status = SFX_ERR_NONE;
   }
 
-  *rssi = (sfx_s16) RxRssi;
+  res_rssi = (sfx_s16) RxRssi;
 
   APP_LOG(TS_ON, VLEVEL_M, "RX END\n\r");
-
-  return status;
   /* USER CODE BEGIN RF_API_wait_frame_2 */
 
   /* USER CODE END RF_API_wait_frame_2 */
+  *state = ret_state;
+  *rssi = res_rssi;
+  return status;
 }
 
 sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_state_enum_t *state)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
+  /* Starts Rx Windows to sense if channel is occupied or clear*
+   * If the channel is clear during the minimum carrier sense
+   * value (cs_min), under the limit of the cs_threshold,
+   * the functions returns with SFX_ERR_NONE (transmission
+   * allowed). Otherwise it continues to listen to the channel till the expiration of the
+   * carrier sense maximum window and then updates the state ( with timeout enum ).*/
+
   /* USER CODE BEGIN RF_API_wait_for_clear_channel_1 */
 
   /* USER CODE END RF_API_wait_for_clear_channel_1 */
-  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
-  /**/
+
   RxCarrierSenseInitStatus();
 
   Radio.Rx(0);
@@ -449,19 +524,21 @@ sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_
     APP_LOG(TS_ON, VLEVEL_M, "LBT Channel Busy\n\r");
   }
 
-  *state = cs_state;
   /* USER CODE BEGIN RF_API_wait_for_clear_channel_2 */
 
   /* USER CODE END RF_API_wait_for_clear_channel_2 */
-
-  return SFX_ERR_NONE;
+  *state = cs_state;
+  return status;
 }
 
 sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* return version and size of the version buffer*/
   /* USER CODE BEGIN RF_API_get_version_1 */
 
   /* USER CODE END RF_API_get_version_1 */
+
   *version = (sfx_u8 *)rf_api_version;
   if (size == SFX_NULL)
   {
@@ -471,8 +548,7 @@ sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
   /* USER CODE BEGIN RF_API_get_version_2 */
 
   /* USER CODE END RF_API_get_version_2 */
-
-  return SFX_ERR_NONE;
+  return status;
 }
 
 /* USER CODE BEGIN EF */
@@ -481,29 +557,6 @@ sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
 
 /* Private Functions Definition -----------------------------------------------*/
 
-static sfx_u8 sfx_wait_end_of_rx(void)
-{
-  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
-
-  /* USER CODE END sfx_wait_end_of_rx_1 */
-  RxPacketReceived = 0;
-
-  RxRssi = -150;
-
-  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
-
-  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
-
-  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
-
-  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
-
-  return RxPacketReceived;
-  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
-
-  /* USER CODE END sfx_wait_end_of_rx_2 */
-}
-
 static void OnTxDone(void)
 {
   /* USER CODE BEGIN OnTxDone_1 */
@@ -532,6 +585,7 @@ static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t offse
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M, "OnRxDone\n\r");
+
   /* USER CODE BEGIN OnRxDone_2 */
 
   /* USER CODE END OnRxDone_2 */
@@ -545,6 +599,7 @@ static void OnTxTimeout(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_TxTimeout);
 
   APP_LOG(TS_ON, VLEVEL_M,  "OnTxTimeout\n\r");
+
   /* USER CODE BEGIN OnTxTimeout_2 */
 
   /* USER CODE END OnTxTimeout_2 */
@@ -560,6 +615,7 @@ static void OnRxTimeout(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M,  "OnRxTimeout\n\r");
+
   /* USER CODE BEGIN OnRxTimeout_2 */
 
   /* USER CODE END OnRxTimeout_2 */
@@ -575,11 +631,35 @@ static void OnRxError(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M, "OnRxError\n\r");
+
   /* USER CODE BEGIN OnRxError_2 */
 
   /* USER CODE END OnRxError_2 */
 }
 
+static sfx_u8 sfx_wait_end_of_rx(void)
+{
+  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
+
+  /* USER CODE END sfx_wait_end_of_rx_1 */
+  RxPacketReceived = 0;
+
+  RxRssi = -150;
+
+  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
+
+  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
+
+  return RxPacketReceived;
+  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
+
+  /* USER CODE END sfx_wait_end_of_rx_2 */
+}
+
 bool RF_API_isChannelFree(int16_t rssiThresh, uint32_t maxCarrierSenseTime)
 {
   /* USER CODE BEGIN RF_API_isChannelFree_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/rf_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/rf_api.h
index 87216197..6b1eeb25 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/rf_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/rf_api.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    rf_api.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /*!
 \if SIGFOX PATTERN
 ----------------------------------------------
@@ -32,7 +34,7 @@
    !!!!  DO NOT MODIFY THIS FILE !!!!
 
  ----------------------------------------------
- \endif
+ \endif
  ----------------------------------------------*/
 /*!
  * \file rf_api.h
@@ -197,7 +199,7 @@ sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type);
 
 /*!******************************************************************
   * \fn sfx_u8 RF_API_stop_continuous_transmission (void)
-  * \brief Stop the current continuous transmisssion
+  * \brief Stop the current continuous transmission
   *
   * \retval SFX_ERR_NONE:                                 No error
   * \retval RF_ERR_API_STOP_CONTINUOUS_TRANSMISSION:      Continuous Transmission Stop error
@@ -254,9 +256,9 @@ sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *stat
   *        allowed). Otherwise it continues to listen to the channel till the expiration of the
   *        carrier sense maximum window and then updates the state ( with timeout enum ).
   *
-  * \param[in] none
-  * \param[out] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
-  * \param[out] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
+  *
+  * \param[in] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
+  * \param[in] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
   *                                            i.e : cs_threshold value -80dBm in Japan / -65dBm in Korea
   * \param[out] sfx_rx_state_enum_t state      Indicate the final state of the carrier sense. Value can be DL_TIMEOUT or PASSED
   *                                            as per defined in sigfox_api.h file.
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/se_nvm.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/se_nvm.c
index acacc5c7..28c83de8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/se_nvm.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/se_nvm.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/se_nvm.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/se_nvm.h
index 3047bfbd..97cbfbee 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/se_nvm.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/se_nvm.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SE_NVM_H__
@@ -67,48 +69,46 @@ typedef enum
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief This function reads data pointed by read_data to non
-  * volatile memory
+  * @brief     This function reads data pointed by read_data to non volatile memory
   *
-  * @param [IN] sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] read_data Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief This function write data pointed by data_to_write to non
-  * volatile memory
+  * @brief     This function write data pointed by data_to_write to non volatile memory
   *
-  * @param [IN] sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] data_to_write Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief Get the active encryption payload flag
-  * @retval encryption_flag 0:Off, 1:On
+  * @brief     Get the active encryption payload flag
+  * @retval    encryption_flag 0:Off, 1:On
   */
 sfx_u8 SE_NVM_get_encrypt_flag(void);
 
 /**
-  * @brief Set the active encryption payload flag
-  * @param [IN]  encryption_flag 0:Off, 1:On
+  * @brief     Set the active encryption payload flag
+  * @param[in] encryption_flag 0:Off, 1:On
   */
 void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag);
 
 /**
-  * @brief Get the active encryption key
-  * @retval  sfx_key_type_t key: public or private
+  * @brief     Get the active encryption key
+  * @return    key public or private
   */
 sfx_key_type_t SE_NVM_get_key_type(void);
 
 /**
-  * @brief Set the active encryption key
-  * @param [IN]  sfx_key_type_t key: public or private
+  * @brief     Set the active encryption key
+  * @param[in] keyType key public or private
   */
-void  SE_NVM_set_key_type(sfx_key_type_t keyType);
+void SE_NVM_set_key_type(sfx_key_type_t keyType);
 
 /* USER CODE BEGIN EFP */
 
@@ -120,4 +120,3 @@ void  SE_NVM_set_key_type(sfx_key_type_t keyType);
 #endif /* __SE_NVM_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.c
index 2a3cc9c4..6094fb8a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_credentials.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -120,10 +122,10 @@ sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *da
   memset(key, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_encrypt(data_to_encrypt,
-                  encrypted_data,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
   /* USER CODE BEGIN CREDENTIALS_aes_128_cbc_encrypt_2 */
 
   /* USER CODE END CREDENTIALS_aes_128_cbc_encrypt_2 */
@@ -142,10 +144,10 @@ sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_
   sigfox_aes_set_key(session_key, AES_KEY_LEN,  &AesContext);
 
   sigfox_aes_cbc_encrypt(data_to_encrypt,
-                  encrypted_data,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
   /* USER CODE BEGIN CREDENTIALS_aes_128_cbc_encrypt_with_session_key_2 */
 
   /* USER CODE END CREDENTIALS_aes_128_cbc_encrypt_with_session_key_2 */
@@ -169,10 +171,10 @@ sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks)
   memset(key, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_encrypt(data,
-                  session_key,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         session_key,
+                         blocks,
+                         iv,
+                         &AesContext);
   /* USER CODE BEGIN CREDENTIALS_wrap_session_key_2 */
 
   /* USER CODE END CREDENTIALS_wrap_session_key_2 */
@@ -227,10 +229,13 @@ void CREDENTIALS_get_initial_pac(uint8_t *pac)
 
 sfx_bool CREDENTIALS_get_payload_encryption_flag(void)
 {
+  sfx_bool ret = SFX_FALSE;
+
+  ret = (sfx_bool) SE_NVM_get_encrypt_flag();
   /* USER CODE BEGIN CREDENTIALS_get_payload_encryption_flag_1 */
 
   /* USER CODE END CREDENTIALS_get_payload_encryption_flag_1 */
-  return (sfx_bool) SE_NVM_get_encrypt_flag();
+  return ret;
 }
 
 void CREDENTIALS_set_payload_encryption_flag(uint8_t enable)
@@ -306,10 +311,10 @@ static sfx_error_t CREDENTIALS_get_cra(sfx_u8 *decrypted_data, sfx_u8 *data_to_d
   memset(CredentialKey, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_decrypt(data_to_decrypt,
-                  decrypted_data,
-                  sizeof(manuf_device_info_t) / AES_KEY_LEN,
-                  iv,
-                  &AesContext);
+                         decrypted_data,
+                         sizeof(manuf_device_info_t) / AES_KEY_LEN,
+                         iv,
+                         &AesContext);
 #else
   /* default sigfox_data.h provided, sigfox_data.h is not encrypted*/
   memcpy((uint8_t *) decrypted_data, (uint8_t *) data_to_decrypt, sizeof(manuf_device_info_t));
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.h
index 5205769f..c7d84239 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_credentials.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_CREDENTIALS_H__
 #define __SGFX_CREDENTIALS_H__
@@ -67,57 +70,59 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief get the cmac library version
-  * @retval return a string containing the library version
+  * @brief      get the cmac library version
+  * @return     string containing the library version
   */
 const char *CREDENTIALS_get_version(void);
 
 /**
-  * @brief get the loaded dev_id
-  * @param[out] return the dev_id in the pointer
+  * @brief      get the loaded dev_id
+  * @param[out] dev_id return the dev_id in the pointer
   */
 void CREDENTIALS_get_dev_id(uint8_t *dev_id);
 
 /**
-  * @brief get the loaded pac
-  * @param[out] return the pac in the pointer
+  * @brief      get the loaded pac
+  * @param[out] pac return the pac in the pointer
   */
 void CREDENTIALS_get_initial_pac(uint8_t *pac);
 
 /**
-  * @brief get the payload_encryption_flag
-  * @retval  the payload_encryption_flag
+  * @brief      get the payload_encryption_flag
+  * @retval     the payload_encryption_flag
   */
 sfx_bool CREDENTIALS_get_payload_encryption_flag(void);
 
 /**
-  * @brief set the payload_encryption_flag
-  * @param[in] enable flag. 0: disable, 1: enable
-  * @retval  none
+  * @brief      set the payload_encryption_flag
+  * @param[in]  enable flag. 0: disable, 1: enable
   */
 void CREDENTIALS_set_payload_encryption_flag(uint8_t enable);
 
 /**
-  * @brief encrypts the data_to_encrypt with aes secrete Key
-  * @param[out] the encrypted data
-  * @param[in] the data_to_encrypt
-  * @param[in] the number of aes blocks
+  * @brief      encrypts the data_to_encrypt with aes secrete Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *data_to_encrypt, uint8_t block_len);
 
 /**
-  * @brief encrypts the data_to_encrypt with aes session Key
-  * @param[out] the encrypted data
-  * @param[in] the data_to_encrypt
-  * @param[in] the number of aes blocks
+  * @brief      encrypts the data_to_encrypt with aes session Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_data, uint8_t *data_to_encrypt,
                                                              uint8_t block_len);
 
 /**
-  * @brief wraps the session Key
-  * @param[in] the arguments used to generate the session Key
-  * @param[in] the number of aes blocks
+  * @brief      wraps the session Key
+  * @param[in]  data the arguments used to generate the session Key
+  * @param[in]  blocks the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox_AT_Slave.ioc b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox_AT_Slave.ioc
index 5bfe0013..c965956e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox_AT_Slave.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/Sigfox_AT_Slave.ioc
@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
@@ -29,68 +29,71 @@ Dma.RequestsNb=1
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
-LPUART1.BaudRate=LPUART_BAUDRATE
+LPUART1.BaudRate=9600
 LPUART1.FIFOMode=UART_FIFOMODE_ENABLE
 LPUART1.IPParameters=BaudRate,FIFOMode
 Mcu.ContextProject=MonoOnDualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=SIGFOX
-Mcu.IP11=SUBGHZ
-Mcu.IP12=SYS
-Mcu.IP13=TIMER
-Mcu.IP14=TINY_LPM
-Mcu.IP2=DMA
-Mcu.IP3=LPTIM1
-Mcu.IP4=LPUART1
-Mcu.IP5=MISC
-Mcu.IP6=NVIC
-Mcu.IP7=RCC
-Mcu.IP8=RTC
-Mcu.IP9=SEQUENCER_M4
-Mcu.IPNb=15
+Mcu.IP10=SEQUENCER_M4
+Mcu.IP11=SIGFOX
+Mcu.IP12=SUBGHZ
+Mcu.IP13=SYS
+Mcu.IP14=TIMER
+Mcu.IP15=TINY_LPM
+Mcu.IP2=DEBUG
+Mcu.IP3=DMA
+Mcu.IP4=LPTIM1
+Mcu.IP5=LPUART1
+Mcu.IP6=MISC
+Mcu.IP7=NVIC
+Mcu.IP8=RCC
+Mcu.IP9=RTC
+Mcu.IPNb=16
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
-Mcu.Pin23=VP_MISC_VS_MISC
-Mcu.Pin24=VP_RTC_VS_RTC_Activate
-Mcu.Pin25=VP_RTC_VS_RTC_Calendar
-Mcu.Pin26=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin27=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin28=VP_SIGFOX_VS_Sigfox
-Mcu.Pin29=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_SYS_VS_Systick
-Mcu.Pin31=VP_TIMER_VS_TIMER
-Mcu.Pin32=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=33
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
+Mcu.Pin25=VP_MISC_VS_MISC
+Mcu.Pin26=VP_RTC_VS_RTC_Activate
+Mcu.Pin27=VP_RTC_VS_RTC_Calendar
+Mcu.Pin28=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin29=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_SIGFOX_VS_Sigfox
+Mcu.Pin31=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin32=VP_SYS_VS_None
+Mcu.Pin33=VP_TIMER_VS_TIMER
+Mcu.Pin34=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=35
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);LPUART_BAUDRATE,9600
+Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -105,21 +108,24 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.RTC_Alarm_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.TAMP_STAMP_LSECSS_SSRU_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.TimeBase=None
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4MonoOnDual
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4MonoOnDual
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -134,40 +140,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=LPUART1_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4MonoOnDual
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4MonoOnDual
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4MonoOnDual
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4MonoOnDual
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4MonoOnDual
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4MonoOnDual
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4MonoOnDual
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -175,26 +174,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4MonoOnDual
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4MonoOnDual
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4MonoOnDual
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4MonoOnDual
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -273,18 +275,18 @@ SH.GPXTI1.0=GPIO_EXTI1
 SH.GPXTI1.ConfNb=1
 SH.GPXTI6.0=GPIO_EXTI6
 SH.GPXTI6.ConfNb=1
-SIGFOX.Activate_BOARD_RESOURCES=M4
 SIGFOX.Activate_DEBUG_LINE=true
-SIGFOX.Activate_RADIO_BOARD_INTERFACE=true
-SIGFOX.IPParameters=Activate_RADIO_BOARD_INTERFACE,Activate_DEBUG_LINE,Activate_BOARD_RESOURCES,SUBGHZ_APPLICATION
+SIGFOX.Activate_RADIO_BOARD_INTERFACE=Bsp
+SIGFOX.IPParameters=Activate_DEBUG_LINE,SUBGHZ_APPLICATION,TX_RFO_CONFIG,Activate_RADIO_BOARD_INTERFACE
 SIGFOX.SUBGHZ_APPLICATION=SIGFOX_AT_SLAVE
+SIGFOX.TX_RFO_CONFIG=RBI_CONF_RFO_LP_HP
 SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
-Sigfox.BSP.number=17
+Sigfox.BSP.number=8
 Sigfox0.BSP.STBoard=false
 Sigfox0.BSP.api=Unknown
 Sigfox0.BSP.component=
-Sigfox0.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON
+Sigfox0.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION | SEM_SGX_USE_ADC
 Sigfox0.BSP.i2caddr=0
 Sigfox0.BSP.i2creg=
 Sigfox0.BSP.instance=ADC
@@ -296,7 +298,7 @@ Sigfox0.BSP.solution=ADC
 Sigfox1.BSP.STBoard=false
 Sigfox1.BSP.api=Unknown
 Sigfox1.BSP.component=
-Sigfox1.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION
+Sigfox1.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION | SEM_SGX_USE_RTC
 Sigfox1.BSP.i2caddr=0
 Sigfox1.BSP.i2creg=
 Sigfox1.BSP.instance=RTC
@@ -305,186 +307,78 @@ Sigfox1.BSP.mode=RTC Enabled
 Sigfox1.BSP.name=RTC
 Sigfox1.BSP.semaphore=
 Sigfox1.BSP.solution=RTC
-Sigfox10.BSP.STBoard=false
-Sigfox10.BSP.api=Unknown
-Sigfox10.BSP.component=
-Sigfox10.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox10.BSP.i2caddr=0
-Sigfox10.BSP.i2creg=
-Sigfox10.BSP.instance=PC3
-Sigfox10.BSP.ip=GPIO
-Sigfox10.BSP.mode=Output
-Sigfox10.BSP.name=RF SW CTRL 3
-Sigfox10.BSP.semaphore=
-Sigfox10.BSP.solution=PC3
-Sigfox11.BSP.STBoard=false
-Sigfox11.BSP.api=Unknown
-Sigfox11.BSP.component=
-Sigfox11.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox11.BSP.i2caddr=0
-Sigfox11.BSP.i2creg=
-Sigfox11.BSP.instance=PA0
-Sigfox11.BSP.ip=GPIO
-Sigfox11.BSP.mode=EXTI
-Sigfox11.BSP.name=BUTTON 1
-Sigfox11.BSP.semaphore=
-Sigfox11.BSP.solution=PA0
-Sigfox12.BSP.STBoard=false
-Sigfox12.BSP.api=Unknown
-Sigfox12.BSP.component=
-Sigfox12.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON
-Sigfox12.BSP.i2caddr=0
-Sigfox12.BSP.i2creg=
-Sigfox12.BSP.instance=LPTIM1
-Sigfox12.BSP.ip=LPTIM
-Sigfox12.BSP.mode=Counts internal clock events
-Sigfox12.BSP.name=TIM
-Sigfox12.BSP.semaphore=
-Sigfox12.BSP.solution=LPTIM1
-Sigfox13.BSP.STBoard=false
-Sigfox13.BSP.api=Unknown
-Sigfox13.BSP.component=
-Sigfox13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox13.BSP.i2caddr=0
-Sigfox13.BSP.i2creg=
-Sigfox13.BSP.instance=PC4
-Sigfox13.BSP.ip=GPIO
-Sigfox13.BSP.mode=Output
-Sigfox13.BSP.name=RF SW CTRL 1
-Sigfox13.BSP.semaphore=
-Sigfox13.BSP.solution=PC4
-Sigfox14.BSP.STBoard=false
-Sigfox14.BSP.api=Unknown
-Sigfox14.BSP.component=
-Sigfox14.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox14.BSP.i2caddr=0
-Sigfox14.BSP.i2creg=
-Sigfox14.BSP.instance=PC5
-Sigfox14.BSP.ip=GPIO
-Sigfox14.BSP.mode=Output
-Sigfox14.BSP.name=RF SW CTRL 2
-Sigfox14.BSP.semaphore=
-Sigfox14.BSP.solution=PC5
-Sigfox15.BSP.STBoard=false
-Sigfox15.BSP.api=Unknown
-Sigfox15.BSP.component=
-Sigfox15.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox15.BSP.i2caddr=0
-Sigfox15.BSP.i2creg=
-Sigfox15.BSP.instance=PC6
-Sigfox15.BSP.ip=GPIO
-Sigfox15.BSP.mode=EXTI
-Sigfox15.BSP.name=BUTTON 3
-Sigfox15.BSP.semaphore=
-Sigfox15.BSP.solution=PC6
-Sigfox16.BSP.STBoard=false
-Sigfox16.BSP.api=Unknown
-Sigfox16.BSP.component=
-Sigfox16.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox16.BSP.i2caddr=0
-Sigfox16.BSP.i2creg=
-Sigfox16.BSP.instance=PA1
-Sigfox16.BSP.ip=GPIO
-Sigfox16.BSP.mode=EXTI
-Sigfox16.BSP.name=BUTTON 2
-Sigfox16.BSP.semaphore=
-Sigfox16.BSP.solution=PA1
 Sigfox2.BSP.STBoard=false
 Sigfox2.BSP.api=Unknown
 Sigfox2.BSP.component=
-Sigfox2.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox2.BSP.condition=SEM_SGX_AT_SLAVE
 Sigfox2.BSP.i2caddr=0
 Sigfox2.BSP.i2creg=
-Sigfox2.BSP.instance=PB12
-Sigfox2.BSP.ip=GPIO
-Sigfox2.BSP.mode=Output
-Sigfox2.BSP.name=Debug Line 1
+Sigfox2.BSP.instance=LPUART1
+Sigfox2.BSP.ip=LPUART
+Sigfox2.BSP.mode=Asynchronous
+Sigfox2.BSP.name=USART
 Sigfox2.BSP.semaphore=
-Sigfox2.BSP.solution=PB12
+Sigfox2.BSP.solution=LPUART1
 Sigfox3.BSP.STBoard=false
 Sigfox3.BSP.api=Unknown
 Sigfox3.BSP.component=
-Sigfox3.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox3.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox3.BSP.i2caddr=0
 Sigfox3.BSP.i2creg=
-Sigfox3.BSP.instance=PB13
+Sigfox3.BSP.instance=PB12
 Sigfox3.BSP.ip=GPIO
 Sigfox3.BSP.mode=Output
-Sigfox3.BSP.name=Debug Line 2
+Sigfox3.BSP.name=Debug Line 1
 Sigfox3.BSP.semaphore=
-Sigfox3.BSP.solution=PB13
+Sigfox3.BSP.solution=PB12
 Sigfox4.BSP.STBoard=false
 Sigfox4.BSP.api=Unknown
 Sigfox4.BSP.component=
-Sigfox4.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox4.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON | SEM_SGX_USE_LPTIM
 Sigfox4.BSP.i2caddr=0
 Sigfox4.BSP.i2creg=
-Sigfox4.BSP.instance=PB14
-Sigfox4.BSP.ip=GPIO
-Sigfox4.BSP.mode=Output
-Sigfox4.BSP.name=Debug Line 3
+Sigfox4.BSP.instance=LPTIM1
+Sigfox4.BSP.ip=LPTIM
+Sigfox4.BSP.mode=Counts internal clock events
+Sigfox4.BSP.name=TIM
 Sigfox4.BSP.semaphore=
-Sigfox4.BSP.solution=PB14
+Sigfox4.BSP.solution=LPTIM1
 Sigfox5.BSP.STBoard=false
 Sigfox5.BSP.api=Unknown
 Sigfox5.BSP.component=
-Sigfox5.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox5.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox5.BSP.i2caddr=0
 Sigfox5.BSP.i2creg=
-Sigfox5.BSP.instance=PB10
+Sigfox5.BSP.instance=PB13
 Sigfox5.BSP.ip=GPIO
 Sigfox5.BSP.mode=Output
-Sigfox5.BSP.name=Debug Line 4
+Sigfox5.BSP.name=Debug Line 2
 Sigfox5.BSP.semaphore=
-Sigfox5.BSP.solution=PB10
+Sigfox5.BSP.solution=PB13
 Sigfox6.BSP.STBoard=false
 Sigfox6.BSP.api=Unknown
 Sigfox6.BSP.component=
-Sigfox6.BSP.condition=SEM_SGX_AT_SLAVE
+Sigfox6.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox6.BSP.i2caddr=0
 Sigfox6.BSP.i2creg=
-Sigfox6.BSP.instance=LPUART1
-Sigfox6.BSP.ip=LPUART
-Sigfox6.BSP.mode=Asynchronous
-Sigfox6.BSP.name=USART
+Sigfox6.BSP.instance=PB14
+Sigfox6.BSP.ip=GPIO
+Sigfox6.BSP.mode=Output
+Sigfox6.BSP.name=Debug Line 3
 Sigfox6.BSP.semaphore=
-Sigfox6.BSP.solution=LPUART1
+Sigfox6.BSP.solution=PB14
 Sigfox7.BSP.STBoard=false
 Sigfox7.BSP.api=Unknown
 Sigfox7.BSP.component=
-Sigfox7.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
+Sigfox7.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox7.BSP.i2caddr=0
 Sigfox7.BSP.i2creg=
-Sigfox7.BSP.instance=PB11
+Sigfox7.BSP.instance=PB10
 Sigfox7.BSP.ip=GPIO
 Sigfox7.BSP.mode=Output
-Sigfox7.BSP.name=LED 3
+Sigfox7.BSP.name=Debug Line 4
 Sigfox7.BSP.semaphore=
-Sigfox7.BSP.solution=PB11
-Sigfox8.BSP.STBoard=false
-Sigfox8.BSP.api=Unknown
-Sigfox8.BSP.component=
-Sigfox8.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox8.BSP.i2caddr=0
-Sigfox8.BSP.i2creg=
-Sigfox8.BSP.instance=PB9
-Sigfox8.BSP.ip=GPIO
-Sigfox8.BSP.mode=Output
-Sigfox8.BSP.name=LED 2
-Sigfox8.BSP.semaphore=
-Sigfox8.BSP.solution=PB9
-Sigfox9.BSP.STBoard=false
-Sigfox9.BSP.api=Unknown
-Sigfox9.BSP.component=
-Sigfox9.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox9.BSP.i2caddr=0
-Sigfox9.BSP.i2creg=
-Sigfox9.BSP.instance=PB15
-Sigfox9.BSP.ip=GPIO
-Sigfox9.BSP.mode=Output
-Sigfox9.BSP.name=LED 1
-Sigfox9.BSP.semaphore=
-Sigfox9.BSP.solution=PB15
+Sigfox7.BSP.solution=PB10
 VP_ADC_TempSens_Input.Mode=IN-TempSens
 VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
 VP_ADC_Vref_Input.Mode=IN-Vrefint
@@ -507,10 +401,13 @@ VP_SIGFOX_VS_Sigfox.Mode=Sigfox_Enabled
 VP_SIGFOX_VS_Sigfox.Signal=SIGFOX_VS_Sigfox
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=Sigfox_AT_Slave
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/readme.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/readme.txt
index 61ad2016..3e564fe8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave/readme.txt
@@ -1,9 +1,9 @@
 /**
   @page Sigfox_AT_Slave Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/Sigfox/Sigfox_AT_Slave/readme.txt 
+  * @file    Applications/Sigfox/Sigfox_AT_Slave/readme.txt
   * @author  MCD Application Team
   * @brief   This application is a simple demo application software of a Sigfox
   *          modem controlled though AT command interface over UART by an
@@ -29,23 +29,21 @@ modem that is controlled though AT command interface over UART by an external ho
 like a computer executing a terminal.
 
 This application is targeting the NUCLEO-WL55JC1 (HIGH-BAND) embedding the STM32WLxx.
-
   ******************************************************************************
 
 @par Keywords
 
 Applications, SubGHz_Phy, Sigfox, AT_Slave, SingleCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - Sigfox_AT_Slave/Core/Inc/adc.h                                              This file contains all the function prototypes for
                                                                                 the adc.c file
   - Sigfox_AT_Slave/Core/Inc/adc_if.h                                           Header for ADC interface configuration
-  - Sigfox_AT_Slave/Core/Inc/board_resources.h                                  Header for driver at.c module
   - Sigfox_AT_Slave/Core/Inc/dma.h                                              This file contains all the function prototypes for
                                                                                 the dma.c file
-  - Sigfox_AT_Slave/Core/Inc/flash_if.h                                         This file provides interface to low level driver
+  - Sigfox_AT_Slave/Core/Inc/flash_if.h                                         This file contains definitions for FLASH Interface functionalities.
   - Sigfox_AT_Slave/Core/Inc/lptim.h                                            This file contains all the function prototypes for
                                                                                 the lptim.c file
   - Sigfox_AT_Slave/Core/Inc/main.h                                             : Header for main.c file.
@@ -78,7 +76,7 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, SingleCore
   - Sigfox_AT_Slave/Sigfox/App/sgfx_cstimer.h                                   Interface for  cstimer.c driver
   - Sigfox_AT_Slave/Sigfox/App/sgfx_eeprom_if.h                                 eeprom interface to the upper module.
   - Sigfox_AT_Slave/Sigfox/App/sigfox_data.h                                    provides encrypted data
-  - Sigfox_AT_Slave/Sigfox/Target/mcu_api.h                                     defines the interfaace to mcu_api.c
+  - Sigfox_AT_Slave/Sigfox/Target/mcu_api.h                                     defines the interface to mcu_api.c
   - Sigfox_AT_Slave/Sigfox/Target/mn_api.h                                      monarch library interface
   - Sigfox_AT_Slave/Sigfox/Target/mw_log_conf.h                                 Configure (enable/disable) traces for CM0
   - Sigfox_AT_Slave/Sigfox/Target/radio_board_if.h                              Header for Radio interface configuration
@@ -91,10 +89,10 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, SingleCore
   - Sigfox_AT_Slave/Core/Src/adc.c                                              This file provides code for the configuration
                                                                                 of the ADC instances.
   - Sigfox_AT_Slave/Core/Src/adc_if.c                                           Read status related to the chip (battery level, VREF, chip temperature)
-  - Sigfox_AT_Slave/Core/Src/board_resources.c                                  Source file
   - Sigfox_AT_Slave/Core/Src/dma.c                                              This file provides code for the configuration
                                                                                 of all the requested memory to memory DMA transfers.
-  - Sigfox_AT_Slave/Core/Src/flash_if.c                                         This file contains the FLASH driver
+  - Sigfox_AT_Slave/Core/Src/flash_if.c                                         This file provides set of firmware functions to manage Flash
+                                                                                Interface functionalities.
   - Sigfox_AT_Slave/Core/Src/lptim.c                                            This file provides code for the configuration
                                                                                 of the LPTIM instances.
   - Sigfox_AT_Slave/Core/Src/main.c                                             : Main program body
@@ -113,7 +111,7 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, SingleCore
   - Sigfox_AT_Slave/Core/Src/timer_if.c                                         Configure RTC Alarm, Tick and Calendar manager
   - Sigfox_AT_Slave/Core/Src/usart.c                                            This file provides code for the configuration
                                                                                 of the USART instances.
-  - Sigfox_AT_Slave/Core/Src/usart_if.c                                         Configuration of UART MX driver interface for hyperterminal communication
+  - Sigfox_AT_Slave/Core/Src/usart_if.c                                         Configuration of UART driver interface for hyperterminal communication
   - Sigfox_AT_Slave/Sigfox/App/app_sigfox.c                                     Application of the Sigfox Middleware
   - Sigfox_AT_Slave/Sigfox/App/ee.c                                             Implementation of the EEPROM emulator
   - Sigfox_AT_Slave/Sigfox/App/sgfx_app.c                                       provides code for the application of the sigfox Middleware
@@ -127,23 +125,21 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, SingleCore
   - Sigfox_AT_Slave/Sigfox/Target/rf_api.c                                      rf library interface
   - Sigfox_AT_Slave/Sigfox/Target/se_nvm.c                                      manages SE nvm data
   - Sigfox_AT_Slave/Sigfox/Target/sgfx_credentials.c                            manages keys and encryption algorithm
-  - Sigfox_AT_Slave/STM32CubeIDE/Application/Core/syscalls.c                    STM32CubeIDE Minimal System calls file
-  - Sigfox_AT_Slave/STM32CubeIDE/Application/Core/sysmem.c                      STM32CubeIDE System Memory calls file
+  - Sigfox_AT_Slave/STM32CubeIDE/Application/User/Core/syscalls.c               STM32CubeIDE Minimal System calls file
+  - Sigfox_AT_Slave/STM32CubeIDE/Application/User/Core/sysmem.c                 STM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - sys_conf.h, radio_conf.h, mw_log_conf.h, radio_board_if.h, nucleo_conf.h, main.h, etc
-    - Careful: 
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
+    - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
 
   -Set Up:
 
@@ -154,9 +150,9 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, SingleCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all files and load your image into target memory
   - Run the example
   - Open a Terminal, connected the Sigfox Object
@@ -166,5 +162,10 @@ In order to make the program work, you must do the following :
   - type AT? to get all available commands
   - Send your AT commands by typing them in the terminal
 
+@par How to debug ?
+  - make sure the flag DEBUGGER_ENABLED to 1 in sys_conf.h
+  - simpler to define the flag LOW_POWER_DISABLE to 1 as well
+  - compile, download and attach
+
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/.extSettings b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/flash_if.h
index e5bd4f0d..9cb596ba 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/flash_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/flash_if.h
@@ -1,9 +1,10 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    flash_if.h
   * @author  MCD Application Team
-  * @brief   This file provides interface to low level driver
-  *****************************************************************************
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
   * @attention
   *
   * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
@@ -14,23 +15,40 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __FLASH_H__
-#define __FLASH_H__
+#ifndef __FLASH_IF_H__
+#define __FLASH_IF_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
 /* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash status enumeration
+  */
+enum
+{
+  FLASH_PARAM_ERROR = -5,
+  FLASH_LOCK_ERROR = -4,
+  FLASH_WRITE_ERROR = -3,
+  FLASH_ERASE_ERROR  = -2,
+  FLASH_ERROR  = -1,
+  FLASH_OK     = 0,
+  FLASH_BUSY   = 1
+};
+
 /* USER CODE BEGIN ET */
 
 /* USER CODE END ET */
@@ -46,18 +64,30 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
+#define PAGE(__ADDRESS__) (uint32_t)((((__ADDRESS__) - FLASH_BASE) % FLASH_BANK_SIZE) / FLASH_PAGE_SIZE) /*!< Get page index from page address */
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function writes a user flash area (read/modify/write)
+  * @param  address: ptr to user flash area
+  * @param  data: ptr to data to be written
+  * @param  size: number of 32b.
+  * @param  dataTempPage: ptr used to copy already written page in ram
+  * @return Flash status.
+  */
+int32_t FLASH_IF_Write(uint32_t  address, uint8_t *data, uint32_t size, uint8_t *dataTempPage);
+
 /**
   * Writes a 64-bit word in flash at a specific address.
   * @param address (in bytes) must be a multiple of 8.
   * @param data data to write
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
   */
-extern int32_t HW_FLASH_Write(uint32_t address, uint64_t data);
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data);
 
 /**
   * Erases 'n' flash pages from page number 'page' to page number
@@ -71,26 +101,14 @@ extern int32_t HW_FLASH_Write(uint32_t address, uint64_t data);
   * @param page memory start page number
   * @param n number of page
   * @param interrupt choice polling/interrupt
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
-  */
-extern int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt);
-
-/**
-  * Get from Option Bytes the IPCC buffer address
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
-  */
-extern uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void);
-
-/**
-  * Get from Option Bytes the SFSA secure flash address
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
   */
-extern uint32_t HW_FLASH_OB_GetSFSA(void);
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt);
 
 /**
   * Callback
   */
-extern void HWCB_FLASH_EndOfCleanup(void);
+void HWCB_FLASH_EndOfCleanup(void);
 
 /* USER CODE BEGIN EFP */
 
@@ -100,6 +118,6 @@ extern void HWCB_FLASH_EndOfCleanup(void);
 }
 #endif
 
-#endif /* __FLASH_H__ */
+#endif /* __FLASH_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
index 45049335..40330641 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM0PLUS_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_CommandRcv_cb     command callback
   * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_config.h
index 4534c749..16fdc3aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 #define KMS_NVM_SLOT_NUMBERS                     (50UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,6 +167,7 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 #define KMS_DERIVE_KEY
 
@@ -164,18 +181,21 @@ extern "C" {
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 #define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 #define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_if.h
index 9a324008..1c890dbe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    kms_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef KMS_IF_H
@@ -67,4 +69,3 @@ extern "C" {
 #endif /* KMS_IF_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
index 8cf9cfbf..c6688943 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
@@ -37,13 +37,11 @@ extern "C" {
  * - Pool #3 is a 512 Bytes pool
  */
 /* USER CODE BEGIN KMS_MEM_POOL_Declare */
-
 KMS_MEM_DECLARE_POOL_START()
 KMS_MEM_DECLARE_POOL_ENTRY(1,256)
 KMS_MEM_DECLARE_POOL_ENTRY(2,256)
 KMS_MEM_DECLARE_POOL_ENTRY(3,512)
 KMS_MEM_DECLARE_POOL_END()
-
 /* USER CODE END KMS_MEM_POOL_Declare */
 
 /* USER CODE BEGIN KMS_MEM_POOL_DEF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
index 904ffdbd..45baa542 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
@@ -98,6 +98,7 @@ extern "C" {
 #ifdef KMS_PLATF_OBJECTS_C
 /* USER CODE BEGIN KMS_PLATF_OBJECTS_CONFIG_Embedded_Objects_Definition */
 /* Place code in a specific section*/
+
 #if defined(__ICCARM__)
 #pragma default_variable_attributes = @ ".USER_embedded_Keys"
 #elif defined(__CC_ARM)
@@ -106,7 +107,10 @@ extern "C" {
 
 KMS_DECLARE_BLOB_STRUCT(, 32)
 
+
 #if defined(__GNUC__)
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
 __attribute__((section(".USER_embedded_Keys")))
 #endif
 /* These objects are used by user tKMS application                 */
@@ -130,6 +134,7 @@ static const kms_obj_keyhead_32_t   Sigfox_Data_Key =
   }
 };
 
+
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
@@ -154,6 +159,7 @@ static const kms_obj_keyhead_32_t   Sigfox_pac =
   }
 };
 
+
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
@@ -206,6 +212,8 @@ static const kms_obj_keyhead_32_t   Sigfox_Public_Key =
 #pragma default_variable_attributes =
 #elif defined(__CC_ARM)
 #pragma arm section code
+#elif defined(__GNUC__)
+#pragma GCC pop_options
 #endif
 
 /* USER CODE END KMS_PLATF_OBJECTS_CONFIG_Embedded_Objects_Definition */
@@ -225,7 +233,22 @@ const kms_obj_keyhead_t * const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBE
   (kms_obj_keyhead_t *) &Sigfox_pac,                 /* Index = 2 */
   (kms_obj_keyhead_t *) &Sigfox_id,                  /* Index = 3 */
   (kms_obj_keyhead_t *) &Sigfox_Public_Key,          /* Index = 4 */
-
+  (kms_obj_keyhead_t *) NULL,       /* Index = 5 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 8 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 12 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 13 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 14 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 15 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 16 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 20 */
 /* USER CODE END KMS_PlatfObjects_EmbeddedList */
 };
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/lptim.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/lptim.h
index b5e50fad..7fe5ac5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/lptim.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/lptim.h
@@ -1,13 +1,12 @@
 /**
   ******************************************************************************
   * @file    lptim.h
-  * @author  MCD Application Team
   * @brief   This file contains all the function prototypes for
   *          the lptim.c file
-  *****************************************************************************
+  ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -15,9 +14,8 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
-
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LPTIM_H__
 #define __LPTIM_H__
@@ -33,35 +31,17 @@ extern "C" {
 
 /* USER CODE END Includes */
 
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
+extern LPTIM_HandleTypeDef hlptim1;
 
-/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN Private defines */
 
-extern LPTIM_HandleTypeDef hlptim1;
+/* USER CODE END Private defines */
 
 void MX_LPTIM1_Init(void);
 
-/* USER CODE BEGIN EFP */
+/* USER CODE BEGIN Prototypes */
 
-/* USER CODE END EFP */
+/* USER CODE END Prototypes */
 
 #ifdef __cplusplus
 }
@@ -69,4 +49,4 @@ void MX_LPTIM1_Init(void);
 
 #endif /* __LPTIM_H__ */
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/main.h
index b75ce9d0..d6e56436 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/main.h
@@ -29,9 +29,9 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
+
 #include "app_kms.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -63,33 +63,14 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h
index 542d0487..d1831b4d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_lptim_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MN_LPTIM_IF_H__
@@ -25,6 +27,8 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
+#include "lptim.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -71,4 +75,3 @@ void MN_LPTIM_IF_DeInit(void);
 #endif /* __MN_LPTIM_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
index 5c4dcb28..9341f796 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 /*#define HAL_UART_MODULE_ENABLED   */
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_app.h
index 2ed00a30..eee9c7ac 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -38,6 +40,10 @@ extern "C" {
 /* currently not supported */
 /* #define ALLOW_KMS_VIA_MBMUX */
 
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -71,29 +77,27 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
   */
 void SystemApp_Init(void);
 
 /**
-  * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
-void GetUniqueId(uint8_t *id);
+void TimestampNow(uint8_t *buff, uint16_t *size);
 
 /**
-  * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
-  * @retval devAddr Device Address
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
   */
-uint32_t GetDevAddr(void);
-
-void TimestampNow(uint8_t *buff, uint16_t *size);
 void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_conf.h
index b8334f49..a7e879fc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -41,24 +43,28 @@ extern "C" {
 /**
   * @brief CM0PLUS Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
index f19258a6..72caddc5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -35,7 +37,6 @@ extern "C" {
 #include "stm32_tiny_vsnprintf.h"
 
 #include "mbmuxif_trace.h"
-
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h
index a16ff4a3..757853e8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   CFG_LPM_SGFX_MN_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
@@ -96,6 +100,7 @@ typedef enum
   CFG_SEQ_Evt_MbSystemAckRcv,
   CFG_SEQ_Evt_MbTraceAckRcv,
   CFG_SEQ_Evt_MbSigfoxAckRcv,
+  CFG_SEQ_Evt_Monarch,
   CFG_SEQ_Evt_MbRadioAckRcv,
   CFG_SEQ_Evt_Timeout,
   CFG_SEQ_Evt_TxTimeout,
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/flash_if.c
index f9d9852d..a33a673d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/flash_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/flash_if.c
@@ -1,9 +1,11 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    flash_if.c
   * @author  MCD Application Team
-  * @brief   This file contains the FLASH driver
-  *****************************************************************************
+  * @brief   This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
   * @attention
   *
   * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
@@ -14,13 +16,13 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "stm32wlxx.h"
 #include "flash_if.h"
+#include "stm32_mem.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -38,14 +40,14 @@
 
 /* Private define ------------------------------------------------------------*/
 /**
-  * @brief Flash status enumeration
+  * @brief Flash empty status enumeration
   */
 enum
 {
-  FLASH_ERROR  = -1,
-  FLASH_OK     = 0,
-  FLASH_BUSY   = 1
+  FLASH_EMPTY      = 0,
+  FLASH_NOT_EMPTY  = 1
 };
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -61,46 +63,136 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
+  * @retval HAL Status.
+  */
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength);
+
+/**
+  * @brief  This function checks if part of Flash is empty
+            It handles 32b unaligned address
+  * @param  addr: Start of user flash area
+  * @param  size: number of bytes.
+  * @retval FLASH_EMPTY or FLASH_NOT_EMPTY.
+  */
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-int32_t HW_FLASH_Write(uint32_t address,
-                       uint64_t data)
+int32_t FLASH_IF_Write(uint32_t address, uint8_t *data, uint32_t size, uint8_t *dataTempPage)
 {
-  /* USER CODE BEGIN HW_FLASH_Write_1 */
+  /* USER CODE BEGIN FLASH_IF_Write_1 */
+
+  /* USER CODE END FLASH_IF_Write_1 */
+  int32_t status = FLASH_OK;
+  uint32_t page_start_index = PAGE(address);
+  uint32_t page_end_index = PAGE(address + size - 1);
+  uint32_t curr_size = size;
+  uint32_t curr_dest_addr = address;
+  uint32_t curr_src_addr = (uint32_t)data;
+
+  if ((data == NULL) || ((size % sizeof(uint64_t)) != 0) || ((address % sizeof(uint64_t)) != 0))
+  {
+    return FLASH_PARAM_ERROR;
+  }
+
+  if (READ_BIT(FLASH->CR, FLASH_CR_LOCK) != 0U)
+  {
+    return FLASH_LOCK_ERROR;
+  }
 
-  /* USER CODE END HW_FLASH_Write_1 */
-  HAL_StatusTypeDef hal_status = HAL_ERROR;
+  if (page_start_index != page_end_index)
+  {
+    curr_size = FLASH_PAGE_SIZE - (address % FLASH_PAGE_SIZE);
+  }
+
+  for (uint32_t idx = page_start_index; idx <= page_end_index; idx++)
+  {
+    if (FLASH_IF_IsEmpty((uint8_t *)curr_dest_addr, curr_size) != FLASH_EMPTY)
+    {
+      if (dataTempPage == NULL)
+      {
+        return FLASH_PARAM_ERROR;
+      }
+      /* backup initial Flash page data in RAM area */
+      UTIL_MEM_cpy_8(dataTempPage, (uint8_t *)(idx * FLASH_PAGE_SIZE + FLASH_BASE), FLASH_PAGE_SIZE);
+      /* copy fragment into RAM area */
+      UTIL_MEM_cpy_8(&dataTempPage[((uint32_t)curr_dest_addr) % FLASH_PAGE_SIZE], (uint8_t *)curr_src_addr, curr_size);
+
+      /*  erase the Flash sector, to avoid writing twice in RAM */
+      if (FLASH_IF_EraseByPages(idx, 1, 0) != FLASH_OK)
+      {
+        status = FLASH_ERASE_ERROR;
+        break; /* exit for loop */
+      }
+      else
+      {
+        /* copy the whole flash sector including fragment from RAM to Flash*/
+        if (FLASH_IF_Write_Buffer(idx * FLASH_PAGE_SIZE + FLASH_BASE, dataTempPage, FLASH_PAGE_SIZE) != FLASH_OK)
+        {
+          status = FLASH_WRITE_ERROR;
+          break; /* exit for loop */
+        }
+      }
+    }
+    else
+    {
+      if (FLASH_IF_Write_Buffer(curr_dest_addr, (uint8_t *)curr_src_addr, curr_size) != FLASH_OK)
+      {
+        status = FLASH_WRITE_ERROR;
+        break; /* exit for loop */
+      }
+    }
+
+    /* 2nd part of memory overlapped on 2nd flash sector */
+    curr_dest_addr += curr_size;
+    curr_src_addr += curr_size;
+    curr_size = size - curr_size;
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_2 */
+
+  /* USER CODE END FLASH_IF_Write_2 */
+}
 
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data)
+{
+  /* USER CODE BEGIN FLASH_IF_Write64_1 */
+
+  /* USER CODE END FLASH_IF_Write64_1 */
   while (*(uint64_t *)address != data)
   {
     while (LL_FLASH_IsActiveFlag_OperationSuspended());
-
-    hal_status =
-      HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
+    HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
   }
 
-  return ((hal_status == HAL_OK) ? FLASH_OK :
-          ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERROR));
+  return FLASH_OK;
   /* USER CODE BEGIN HW_FLASH_Write_2 */
 
   /* USER CODE END HW_FLASH_Write_2 */
 }
 
-int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt)
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt)
 {
-  /* USER CODE BEGIN HW_FLASH_Erase_1 */
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_1 */
 
-  /* USER CODE END HW_FLASH_Erase_1 */
+  /* USER CODE END FLASH_IF_EraseByPages_1 */
   HAL_StatusTypeDef hal_status;
   FLASH_EraseInitTypeDef erase_str;
   uint32_t page_error;
 
   erase_str.TypeErase = FLASH_TYPEERASE_PAGES;
-  erase_str.Page      = page;
-  erase_str.NbPages   = n;
+  erase_str.Page = page;
+  erase_str.NbPages = n;
 
   /* Erase the Page */
   if (interrupt)
@@ -112,33 +204,10 @@ int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt)
     hal_status = HAL_FLASHEx_Erase(&erase_str, &page_error);
   }
 
-  return ((hal_status == HAL_OK) ? FLASH_OK :
-          ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERROR));
-  /* USER CODE BEGIN HW_FLASH_Erase_2 */
-
-  /* USER CODE END HW_FLASH_Erase_2 */
-}
-
-uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void)
-{
-  /* USER CODE BEGIN HW_FLASH_OB_GetIPCCBufferAddr_1 */
-
-  /* USER CODE END HW_FLASH_OB_GetIPCCBufferAddr_1 */
-  return READ_BIT(FLASH->IPCCBR, FLASH_IPCCBR_IPCCDBA);
-  /* USER CODE BEGIN HW_FLASH_OB_GetIPCCBufferAddr_2 */
+  return ((hal_status == HAL_OK) ? FLASH_OK : ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERASE_ERROR));
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_2 */
 
-  /* USER CODE END HW_FLASH_OB_GetIPCCBufferAddr_2 */
-}
-
-uint32_t HW_FLASH_OB_GetSFSA(void)
-{
-  /* USER CODE BEGIN HW_FLASH_OB_GetSFSA_1 */
-
-  /* USER CODE END HW_FLASH_OB_GetSFSA_1 */
-  return (READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos);
-  /* USER CODE BEGIN HW_FLASH_OB_GetSFSA_2 */
-
-  /* USER CODE END HW_FLASH_OB_GetSFSA_2 */
+  /* USER CODE END FLASH_IF_EraseByPages_2 */
 }
 
 void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
@@ -156,7 +225,14 @@ void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
   /* USER CODE END HAL_FLASH_EndOfOperationCallback_2 */
 }
 
-__WEAK void HWCB_FLASH_EndOfCleanup(void)
+void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_OperationErrorCallback_1 */
+
+  /* USER CODE END HAL_FLASH_OperationErrorCallback_1 */
+}
+
+void HWCB_FLASH_EndOfCleanup(void)
 {
   /* USER CODE BEGIN HWCB_FLASH_EndOfCleanup_1 */
 
@@ -168,6 +244,86 @@ __WEAK void HWCB_FLASH_EndOfCleanup(void)
 /* USER CODE END EF */
 
 /* Private Functions Definition -----------------------------------------------*/
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_1 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_1 */
+  uint8_t *pSrc = pSource;
+  uint64_t src_value;
+  int32_t status = FLASH_OK;
+
+  for (uint32_t i = 0; i < (uLength / sizeof(uint64_t)); i++)
+  {
+    UTIL_MEM_cpy_8(&src_value, pSrc, sizeof(uint64_t));
+
+    /* Avoid writing 0xFFFFFFFFFFFFFFFFLL on erased Flash */
+    if (src_value != UINT64_MAX)
+    {
+      status = FLASH_IF_Write64(pDestination, src_value);
+    }
+
+    pDestination += sizeof(uint64_t);
+    pSrc += sizeof(uint64_t);
+
+    if (status != FLASH_OK)
+    {
+      /* exit the for loop*/
+      break;
+    }
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_2 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_2 */
+}
+
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size)
+{
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_1 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_1 */
+  uint64_t *addr64;
+  uint32_t i;
+
+  /* start memory NOT 64bits aligned */
+  while ((((uint32_t)addr) % sizeof(uint64_t)) != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+
+  /* addr64 is 64 bits aligned */
+  addr64 = (uint64_t *)addr;
+  for (i = 0; i < (size / sizeof(uint64_t)); i++)
+  {
+    if (*addr64++ != UINT64_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+  }
+  size -= sizeof(uint64_t) * i;
+
+  /* end memory NOT 64 bits aligned */
+  addr = (uint8_t *)addr64;
+  while (size != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+  return FLASH_EMPTY;
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_2 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c
index 617042e8..1d49b00f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c
index ad72640a..d8ea5d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,7 +82,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* Enable C2AHB3 peripherals clock. */
@@ -89,14 +91,14 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccCommandRcv = IPCC_IF_CommandRcv_cb;
   IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/lptim.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/lptim.c
index c9742859..6b18ae32 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/lptim.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/lptim.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ LPTIM_HandleTypeDef hlptim1;
 void MX_LPTIM1_Init(void)
 {
 
+  /* USER CODE BEGIN LPTIM1_Init 0 */
+
+  /* USER CODE END LPTIM1_Init 0 */
+
+  /* USER CODE BEGIN LPTIM1_Init 1 */
+
+  /* USER CODE END LPTIM1_Init 1 */
   hlptim1.Instance = LPTIM1;
   hlptim1.Init.Clock.Source = LPTIM_CLOCKSOURCE_APBCLOCK_LPOSC;
   hlptim1.Init.Clock.Prescaler = LPTIM_PRESCALER_DIV1;
@@ -43,6 +50,9 @@ void MX_LPTIM1_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPTIM1_Init 2 */
+
+  /* USER CODE END LPTIM1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c
index 964fb0f8..e1964d23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/main.c
@@ -80,8 +80,8 @@ int main(void)
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
-  MX_Sigfox_Init();
   MX_KMS_Init();
+  MX_Sigfox_Init();
   /* USER CODE BEGIN 2 */
 
   /* USER CODE END 2 */
@@ -110,6 +110,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c
index 3ed8de69..c81d7a90 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_lptim_if.c
@@ -16,12 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "lptim.h"
 #include "mn_lptim_if.h"
 
 /* USER CODE BEGIN Includes */
+
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -63,25 +65,29 @@ extern LPTIM_HandleTypeDef hlptim1;
 void MN_LPTIM_IF_Init(void)
 {
   /* USER CODE BEGIN MN_LPTIM_IF_Init_0 */
+
   /* USER CODE END MN_LPTIM_IF_Init_0 */
 
-  /* Force the LPTIM1 Periheral Clock Reset */
+  /* Force the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_FORCE_RESET();
-  /* Release the LPTIM1 Periheral Clock Reset */
+  /* Release the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_RELEASE_RESET();
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_1 */
+
   /* USER CODE END MN_LPTIM_IF_Init_1 */
 
   MX_LPTIM1_Init();
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_2 */
+
   /* USER CODE END MN_LPTIM_IF_Init_2 */
 
   /* w.a.: LL_EXTI_LINE_X should be enabled in HAL_LPTIM_MspInit */
   LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_29);
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_3 */
+
   /* USER CODE END MN_LPTIM_IF_Init_3 */
 }
 
@@ -90,6 +96,7 @@ void MN_LPTIM_IF_DeInit(void)
   RCC_PeriphCLKInitTypeDef RCC_PeriphCLKInitStruct;
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_0 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_0 */
 
   if (HAL_LPTIM_DeInit(&hlptim1) != HAL_OK)
@@ -98,6 +105,7 @@ void MN_LPTIM_IF_DeInit(void)
   }
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_1 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_1 */
 
   /* Select the PCLK clock as LPTIM1 peripheral clock */
@@ -106,15 +114,17 @@ void MN_LPTIM_IF_DeInit(void)
   HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphCLKInitStruct);
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_2 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_2 */
 
-  /* Force the LPTIM1 Periheral Clock Reset */
+  /* Force the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_FORCE_RESET();
 
-  /* Release the LPTIM1 Periheral Clock Reset */
+  /* Release the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_RELEASE_RESET();
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_3 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_3 */
 
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c
index f74cd49b..ab828d03 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,17 +71,20 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
   /** Enable the Alarm B
   */
   sAlarm.Alarm = RTC_ALARM_B;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
index 3dfcda11..eb2e798d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm_if.h"
 
 /* USER CODE BEGIN Includes */
@@ -91,7 +93,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C2STOP_C2STB();
@@ -110,7 +111,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
index 26cf182e..a6deacbb 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -76,7 +76,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -129,7 +131,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/sys_app.c
index 4191e4b2..d7cf6e8c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -27,16 +29,15 @@
 #include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-
+#include "sgfx_eeprom_if.h"
 #include "msg_id.h"
-#include "features_info.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
 #include "mbmuxif_radio.h"
+#include "features_info.h"
 #include "mbmuxif_sigfox.h"
-#include "sgfx_eeprom_if.h"
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-#include "mbmuxif_kms.h"
+/* #include "mbmuxif_kms.h" */
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
@@ -55,6 +56,7 @@
 
 /* Private define ------------------------------------------------------------*/
 #define MAX_TS_SIZE (int) 16
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -72,8 +74,6 @@
 /* Private function prototypes -----------------------------------------------*/
 /**
   * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
-  * @param none
-  * @retval  none
   */
 static void System_Init(void);
 
@@ -81,16 +81,12 @@ static void System_Init(void);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises MBMUXIF System and send a notification to Cm4 when ready
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   int8_t init_status;
@@ -99,13 +95,13 @@ void SystemApp_Init(void)
   /* USER CODE END SystemApp_Init_1 */
 
   /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
+  /* #warning "should be removed when proper obl is done" */
   __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
-  E2P_Init();
 
-  /*Set verbose LEVEL*/
-  UTIL_ADV_TRACE_SetVerboseLevel(E2P_Read_VerboseLevel());
+  E2P_Init();
 
   /*Init low power manager*/
   UTIL_LPM_Init();
@@ -122,7 +118,7 @@ void SystemApp_Init(void)
   /* Init Feat_Info table */
   FEAT_INFO_Init();
 
-  /* Note: the trace is initialised in the context of MBMUXIF because it uses the MB on Cm0 side */
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
@@ -131,8 +127,8 @@ void SystemApp_Init(void)
 
   System_Init();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
 
   /* Registers Sigfox Notif to the sequencer */
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSigfoxNotifRcv), UTIL_SEQ_RFU, MBMUXIF_SigfoxSendNotifTask);
@@ -142,11 +138,6 @@ void SystemApp_Init(void)
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
-  */
 void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -166,7 +157,7 @@ void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Kms_Cmd_1 */
 
   /* USER CODE END Process_Kms_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
 
   APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
 
@@ -207,19 +198,19 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   switch (ComObj->MsgId)
   {
     case SYS_OTHER_MSG_ID:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
 
-  /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
       break;
 
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
 
-  /* USER CODE END Process_Sys_Cmd_switch_case */
+    /* USER CODE END Process_Sys_Cmd_switch_case */
 
     default:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
 
-  /* USER CODE END Process_Sys_Cmd_switch_default */
+      /* USER CODE END Process_Sys_Cmd_switch_default */
       break;
   }
 
@@ -231,16 +222,16 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Cmd_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -249,8 +240,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -263,66 +252,9 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-void GetUniqueId(uint8_t *id)
-{
-  /* USER CODE BEGIN GetUniqueId_1 */
-
-  /* USER CODE END GetUniqueId_1 */
-  uint32_t val = 0;
-  val = LL_FLASH_GetUDN();
-  if (val == 0xFFFFFFFF)  /* Normally this should not happen */
-  {
-    uint32_t ID_1_3_val = HAL_GetUIDw0() + HAL_GetUIDw2();
-    uint32_t ID_2_val = HAL_GetUIDw1();
-
-    id[7] = (ID_1_3_val) >> 24;
-    id[6] = (ID_1_3_val) >> 16;
-    id[5] = (ID_1_3_val) >> 8;
-    id[4] = (ID_1_3_val);
-    id[3] = (ID_2_val) >> 24;
-    id[2] = (ID_2_val) >> 16;
-    id[1] = (ID_2_val) >> 8;
-    id[0] = (ID_2_val);
-  }
-  else  /* Typical use case */
-  {
-    id[7] = val & 0xFF;
-    id[6] = (val >> 8) & 0xFF;
-    id[5] = (val >> 16) & 0xFF;
-    id[4] = (val >> 24) & 0xFF;
-    val = LL_FLASH_GetDeviceID();
-    id[3] = val & 0xFF;
-    val = LL_FLASH_GetSTCompanyID();
-    id[2] = val & 0xFF;
-    id[1] = (val >> 8) & 0xFF;
-    id[0] = (val >> 16) & 0xFF;
-  }
-
-  /* USER CODE BEGIN GetUniqueId_2 */
-
-  /* USER CODE END GetUniqueId_2 */
-}
-
-uint32_t GetDevAddr(void)
-{
-  uint32_t val = 0;
-  /* USER CODE BEGIN GetDevAddr_1 */
-
-  /* USER CODE END GetDevAddr_1 */
-  val = LL_FLASH_GetUDN();
-  if (val == 0xFFFFFFFF)
-  {
-    val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
-  }
-  /* USER CODE BEGIN GetDevAddr_2 */
-
-  /* USER CODE END GetDevAddr_2 */
-  return val;
-}
-
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
 static void System_Init(void)
@@ -334,7 +266,7 @@ static void System_Init(void)
   LL_C2_PWR_DisableInternWU();
 
   /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
-  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach onlt Cm4 */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
   LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
   LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
 
@@ -395,10 +327,7 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -413,13 +342,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -430,13 +357,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/timer_if.c
index 6133e380..6405002c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -106,6 +106,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -155,7 +166,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -175,9 +185,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -185,7 +195,7 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A and Alarm B enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
     /*overload RTC feature enable*/
@@ -193,11 +203,14 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -280,64 +293,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,9 +379,9 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
 {
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
   MBMUX_ComParam_t *com_obj;
 
   if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
@@ -376,9 +395,9 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
       MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
     }
   }
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
 }
 
 void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
@@ -386,7 +405,7 @@ void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
@@ -409,6 +428,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -418,16 +438,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -454,24 +474,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c
index 37a8e2d2..30d2715f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stddef.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c
index 013f7100..ef887470 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -51,15 +54,53 @@
 
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -67,11 +108,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -80,27 +116,23 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   uint8_t i;
   IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
 
-  p_MBMUX_ComTable = pMBMUX_ComTable;
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
 
   for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
   {
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
   }
   /* USER CODE BEGIN MBMUX_Init_Last */
 
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval  return -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
-  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
 {
   uint8_t channel_idx;
@@ -116,15 +148,19 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   {
     /* channel has been registered by CM4 registered */
     channel_idx = check_existing_feature_registration;
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm0plusCb = MsgCb;
-    }
-    else
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
     {
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm0plusCb = MsgCb;
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
     }
-    ret = channel_idx;
   }
   /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
 
@@ -132,13 +168,6 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -155,11 +184,11 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
       /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
       IPCC_IF_ResponseSnd(mb_ch);
 
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
     else
     {
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
   }
   /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
@@ -167,12 +196,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -199,11 +222,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Notif to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
@@ -214,7 +232,7 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
   if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
   {
-    while (1) {}
+    Error_Handler();
   }
   return IPCC_IF_NotificationSnd(mb_ch);
   /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
@@ -222,11 +240,6 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_NotificationSnd_Last */
 }
 
-/**
-  * @brief Send response to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
@@ -241,17 +254,118 @@ uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_ResponseSnd_Last */
 }
 
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
 /* USER CODE BEGIN EFD */
 
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
@@ -260,18 +374,13 @@ static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
@@ -280,19 +389,13 @@ static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
   return;
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -304,17 +407,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h
index e91b1547..a938e544 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM0PLUS_H__
@@ -52,19 +54,58 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 0ec2ec5d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *KmsComObj;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskKmsCmdRcv(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers KMS feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsCmdRcvCb);
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskKmsCmdRcv);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Sends a Kms-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendResp(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_1 */
-  if (MBMUX_ResponseSnd(FEAT_INFO_KMS_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_1 */
-  KmsComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_Last */
-}
-
-/**
-  * @brief  KMS task to process the command
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskKmsCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_1 */
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-  Process_Kms_Cmd(KmsComObj);
-#endif /* ALLOW_KMS_VIA_MBMUX */
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
deleted file mode 100644
index 12b71c19..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM0PLUS_H__
-#define __MBMUXIF_KMS_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-void MBMUXIF_KmsSendResp(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
index 3ba64a2b..fe5fd070 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -57,22 +59,33 @@ static MBMUX_ComParam_t *RadioComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
 static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
 static void MBMUXIF_TaskRadioNotifSnd(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers RADIO feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   int8_t ret;
@@ -99,11 +112,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
@@ -112,7 +120,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
@@ -120,11 +128,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendNotif(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
@@ -136,11 +139,6 @@ void MBMUXIF_RadioSendNotif(void)
   /* USER CODE END MBMUXIF_RadioSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Radio-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
@@ -148,7 +146,7 @@ void MBMUXIF_RadioSendResp(void)
   /* USER CODE END MBMUXIF_RadioSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
 
@@ -160,11 +158,6 @@ void MBMUXIF_RadioSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
@@ -176,11 +169,6 @@ static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
@@ -193,11 +181,6 @@ static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the command
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
@@ -209,11 +192,6 @@ static void MBMUXIF_TaskRadioCmdRcv(void)
   /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
 }
 
-/**
-  * @brief  RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifSnd(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
@@ -225,7 +203,7 @@ static void MBMUXIF_TaskRadioNotifSnd(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
index 44fab48f..7e226c6c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM0PLUS_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_RadioSendResp(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c
index 73e12d3e..c68a5481 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sigfox.c
   * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle Sigfox to MBMUX
+  * @brief   allows CM0PLUS application to register and handle Sigfox to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -57,8 +59,21 @@ static MBMUX_ComParam_t *SigfoxComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  Sigfox acknowledge callbacks: set event to release waiting task
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
 static void MBMUXIF_IsrSigfoxAckRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox command callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
 static void MBMUXIF_IsrSigfoxCmdRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox task to process the command
+  */
 static void MBMUXIF_TaskSigfoxCmdRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -66,13 +81,6 @@ static void MBMUXIF_TaskSigfoxCmdRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_SigfoxInit(void)
 {
   int8_t ret;
@@ -99,11 +107,6 @@ int8_t MBMUXIF_SigfoxInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Sigfox feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureNotifComPtr_1 */
@@ -112,7 +115,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_SIGFOX_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureNotifComPtr_Last */
@@ -120,11 +123,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetSigfoxFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief  Set a Task to prevent being blocked on ISR
-  * @param  none
-  * @retval none
-  */
 void MBMUXIF_SigfoxSendNotif(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendNotif_1 */
@@ -136,11 +134,6 @@ void MBMUXIF_SigfoxSendNotif(void)
   /* USER CODE END MBMUXIF_SigfoxSendNotif_Last */
 }
 
-/**
-  * @brief  Sends a Sigfox-Notif via Ipcc and Wait for the Ack
-  * @param  none
-  * @retval none
-  */
 void MBMUXIF_SigfoxSendNotifTask(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendNotifTask_1 */
@@ -152,18 +145,13 @@ void MBMUXIF_SigfoxSendNotifTask(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SigfoxSendNotifTask_Last */
 
   /* USER CODE END MBMUXIF_SigfoxSendNotifTask_Last */
 }
 
-/**
-  * @brief Sends a Sigfox-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SigfoxSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendResp_1 */
@@ -171,7 +159,7 @@ void MBMUXIF_SigfoxSendResp(void)
   /* USER CODE END MBMUXIF_SigfoxSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_SIGFOX_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SigfoxSendResp_Last */
 
@@ -183,11 +171,7 @@ void MBMUXIF_SigfoxSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  Sigfox acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
+
 static void MBMUXIF_IsrSigfoxAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSigfoxAckRcvCb_1 */
@@ -199,11 +183,6 @@ static void MBMUXIF_IsrSigfoxAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSigfoxAckRcvCb_Last */
 }
 
-/**
-  * @brief  Sigfox command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSigfoxCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSigfoxCmdRcvCb_1 */
@@ -216,11 +195,6 @@ static void MBMUXIF_IsrSigfoxCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSigfoxCmdRcvCb_Last */
 }
 
-/**
-  * @brief  Sigfox task to process the command
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSigfoxCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSigfoxCmdRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h
index ad6b9356..9aac213b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sigfox.h
   * @author  MCD Application Team
-  * @brief   API provided to CM0 appli to register and handle Sigfox to MBMUX
+  * @brief   API provided to CM0 application to register and handle Sigfox to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SIGFOX_CM0PLUS_H__
@@ -52,10 +54,30 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS; -3: callback error on CM0PLUS
+  */
 int8_t MBMUXIF_SigfoxInit(void);
+/**
+  * @brief   gives back the pointer to the com buffer associated to Sigfox feature Notif
+  * @return  pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void);
+
+/**
+  * @brief   Set a Task to prevent being blocked on ISR
+  */
 void MBMUXIF_SigfoxSendNotif(void);
+
+/**
+  * @brief   Sends a Sigfox-Notif via Ipcc and Wait for the Ack
+  */
 void MBMUXIF_SigfoxSendNotifTask(void);
+
+/**
+  * @brief   Sends a Sigfox-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_SigfoxSendResp(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
index b33d6ae5..c94507ea 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to handle the SYSTEM MBMUX channel
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -63,27 +65,59 @@ static MBMUX_ComParam_t *SystemComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
 static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
 
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf);
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
 
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
@@ -118,7 +152,7 @@ int8_t MBMUXIF_SystemInit(void)
 
   if (ret >= 0)
   {
-    /* Notify Cm4 that MBMUXIF_System and RTC are initialised on Cm0 side */
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
     /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
     while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
     pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
@@ -130,14 +164,6 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Get synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
@@ -146,11 +172,6 @@ uint16_t MBMUXIF_GetCpusSynchroFlag(void)
   return pMb_RefTable->SynchronizeCpusAtBoot;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
@@ -159,7 +180,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
 
@@ -167,11 +188,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   return com_param_ptr;
 }
 
-/**
-  * @brief Sends a System-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
@@ -183,18 +199,13 @@ void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
@@ -202,26 +213,21 @@ void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
 }
 
-/**
-  * @brief Sends a System-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
 
-  /* USER CODE END EFMBMUXIF_SystemSendResp_1 */
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
   if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
 
@@ -238,7 +244,7 @@ int16_t MBMUXIF_ChipRevId(void)
   int16_t ret = pMb_RefTable->ChipRevId;
   /* USER CODE BEGIN MBMUXIF_ChipRevId */
 
-  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+  /* USER CODE END MBMUXIF_ChipRevId */
   return ret ;
 }
 
@@ -247,27 +253,17 @@ int16_t MBMUXIF_ChipRevId(void)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 {
   SystemComObj = (MBMUX_ComParam_t *) ComObj;
@@ -276,7 +272,7 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
 
   /* process Command on Isr or schedule a task*/
   switch (SystemComObj->MsgId)
@@ -286,11 +282,6 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
       MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
       break;
 
-    case SYS_REGISTER_FEATURE_MSG_ID:
-      SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
-      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-      break;
-
     case SYS_EE_READ_ID:
       status = (uint32_t) EE_ReadValue((e_EE_ID) com_buffer[0], (uint32_t *) com_buffer[1]);
       /* prepare response buffer */
@@ -309,7 +300,7 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
     /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
     default:
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
@@ -318,89 +309,68 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
 
 }
 
-/**
-  * @brief  SYSTEM task to process the command
-  * @param  none
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemCmdRcv(void)
 {
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
-  Process_Sys_Cmd(SystemComObj);
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
 
 }
 
-/**
-  * @brief  SYSTEM PRIO_A acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
 }
 
-/**
-  * @brief  Retrieve the feature that needs MbMux registration and call correspondent Init
-  * @param  pointer to parameter buffer of the command
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  */
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
 {
   int8_t ret = -2; /* feature not supported */
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  switch (ParamBuf[0])
+  switch (pBuf[0])
   {
     case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
       ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
@@ -424,6 +394,9 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
       ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
       break;
 
@@ -433,17 +406,23 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora not supported\r\n");
       break;
 
     case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
       ret = MBMUXIF_SigfoxInit();
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox registration done\r\n");
       break;
 
     /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
     default:
       break;
@@ -451,7 +430,7 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
   return ret;
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
index 01dff052..f780cdde 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM0PLUS_H__
@@ -54,11 +56,44 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -66,6 +101,10 @@ void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
 int16_t MBMUXIF_ChipRevId(void);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
index 04c9f7b6..05704d23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -25,6 +27,7 @@
 #include "msg_id.h"
 #include "stm32_seq.h"
 #include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
 
 /* USER CODE BEGIN Includes */
 
@@ -46,15 +49,43 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
-static void (*TraceUtilCpltCallback)(void *);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
 
 /* USER CODE BEGIN PFP */
@@ -75,12 +106,6 @@ const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
 /* USER CODE END PTD */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
 {
   int8_t ret;
@@ -92,6 +117,8 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
   if (ret >= 0)
   {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
     /*Initialize the terminal */
     UTIL_ADV_TRACE_Init();
     UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
@@ -107,11 +134,6 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Trace feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
@@ -120,7 +142,7 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
@@ -128,11 +150,6 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendNotif_NoWait(void)
 {
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
@@ -140,7 +157,7 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
   /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
 
@@ -152,14 +169,6 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
 /* USER CODE END EFD */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief The trace utilities inform the mbmuxif which func to call
-  *        once the Mb transmission is completed
-  * @param:  "stm32_adv_trace.c callback"
-  * @retval: none
-  */
-
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
@@ -172,26 +181,23 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
   /* USER CODE END MBMUXIF_TraceBufferInit_Last */
 }
 
-/**
-  * @brief TraceBufferSend sends the formatted buffer to CM4 which
-  *        posts it to the circular queue for printing
-  * @param:  strFormat: string to be printed
-  * @retval: 0 when ok, -1 when circular queue is full
-  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
 
   /* USER CODE END MBMUXIF_TraceBufferSend_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
 
-  /* notify CM4 that CM0PLUS is initialised */
+  /* notify CM4 that CM0PLUS is initialized */
   com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
   if (com_obj != NULL)
   {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
     com_obj->MsgId = TRACE_SEND_MSG_ID;
-    com_obj->ParamBuf[0] = (uint32_t) buf;
-    com_obj->ParamBuf[1] = (uint32_t) bufSize;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
     com_obj->ParamCnt = 2;
     MBMUXIF_TraceSendNotif_NoWait();
   }
@@ -202,24 +208,28 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bu
 }
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TRACE acknowledge callbacks: set event to release waiting task
-  *             and use callback to check if other trace need to be sent to CM4
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
-  TraceUtilCpltCallback(NULL);
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
 }
 
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
index 490321d2..8aad9276 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle TRACE via MBMUX
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM0PLUS_H__
@@ -52,8 +54,23 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendNotif_NoWait(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
index c09f8d55..063d379e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -47,7 +49,6 @@
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
 
 /* USER CODE BEGIN PD */
 
@@ -59,7 +60,15 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_S
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-static  RadioEvents_t    radioevents_mbwrapper;
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/**
+  * @brief local structure of radio callbacks for command processes
+  */
+static  RadioEvents_t radioevents_mbwrapper;
 
 /* USER CODE BEGIN PV */
 
@@ -79,10 +88,10 @@ static void RadioTxTimeout_mbwrapper(void);
 /*!
  * \brief Rx Done callback prototype.
  *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
+ * \param[in] payload Received buffer pointer
+ * \param[in] size    Received buffer size
+ * \param[in] rssi    RSSI value computed while receiving the frame [dBm]
+ * \param[in] snr     Raw SNR value given by the radio hardware
  *                     FSK : N/A ( set to 0 )
  *                     LoRa: SNR value in dB
  */
@@ -108,13 +117,15 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Radio_Cmd_1 */
 
   /* USER CODE END Process_Radio_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = NULL;
   uint32_t ret_uint;
   int32_t ret_int;
   RadioState_t status;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
@@ -242,7 +253,7 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = 0; /* */
       break;
 
-    case RADIO_SET_TX_CONTINOUS_WAVE_ID:
+    case RADIO_SET_TX_CONTINUOUS_WAVE_ID:
       Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -411,16 +422,26 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
 
   /* USER CODE END RadioRxDone_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
+  uint32_t *com_buffer = NULL ;
   uint16_t i = 0;
 
   /* copy data from Cm0 private memory to shared memory */
-  UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  if (payload != NULL)
+  {
+    UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  }
 
   com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
   com_obj->MsgId = RADIO_RX_DONE_CB_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (payload == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  }
   com_buffer[i++] = (uint32_t) size;
   com_buffer[i++] = (uint32_t) rssi;
   com_buffer[i++] = (uint32_t) snr;
@@ -435,7 +456,7 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
   /* once event is received and semaphore released: */
 
   /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
-     this migh be requested just if the buffer should be processed by the applic and the stack */
+     this might be requested just if the buffer should be processed by the application and the stack */
   /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
   return;
   /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
index 4b3da2cd..ac6a70d3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_info.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_info.c
index 455048ee..8629b1bf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_info.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sigfox_info.h"
@@ -58,9 +60,7 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") SigfoxInfo_t SigfoxInfoTable;
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief initialises the SigfoxInfo capabilities table
-  * @param none
-  * @retval  none
+  * @brief initialize the SigfoxInfo capabilities table
   */
 static void StoreValueInFeatureListTable(void);
 
@@ -69,11 +69,6 @@ static void StoreValueInFeatureListTable(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief initialises the SigfoxInfo capabilities table
-  * @param none
-  * @retval  none
-  */
 void SigfoxInfo_Init(void)
 {
   /* USER CODE BEGIN SigfoxInfo_Init_1 */
@@ -95,11 +90,6 @@ void SigfoxInfo_Init(void)
   /* USER CODE END SigfoxInfo_Init_2 */
 }
 
-/**
-  * @brief returns the pointer to the SigfoxInfo capabilities table
-  * @param none
-  * @retval  SigfoxInfoTable pointer
-  */
 SigfoxInfo_t *SigfoxInfo_GetPtr(void)
 {
   /* USER CODE BEGIN SigfoxInfo_GetPtr_1 */
@@ -146,7 +136,7 @@ static void StoreValueInFeatureListTable(void)
 
   if (found)
   {
-    p_feature->Feat_Info_Config_Size = sizeof(SigfoxInfo_t)/sizeof(uint32_t);
+    p_feature->Feat_Info_Config_Size = sizeof(SigfoxInfo_t) / sizeof(uint32_t);
     p_feature->Feat_Info_Config_Ptr = &SigfoxInfoTable;
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c
index 1d643738..976269c7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -31,7 +33,7 @@
 #include "st_sigfox_api.h"
 #include "sigfox_monarch_api.h"
 #include "sigfox_info.h"
-
+#include "utilities_def.h"
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -70,8 +72,23 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aSigfoxMbWrapShare2Buffer[SIGFOX_MB
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/*!
+  * @brief This is the function that will be called by the Sigfox Library when the scan is completed
+  * @param[out] rc_bit_mask  rc  Value of the RC found. There could be only 1 RC or 0 ( not found )
+  * @param[out] rssi         RSSI value of the RC found. if rc = 0, rssi is not valid ( is set to 0 too )
+  */
 static sfx_u8 app_monarch_rcscan_wrapper(sfx_u8 rc_bit_mask, sfx_s16 rssi);
 
+/**
+  * @brief  rf test mode call back starting a while wait loop
+  */
+static void sfx_monarch_test_mode_wait_start_cb(void);
+
+/**
+  * @brief  rf test mode call back exiting a while wait loop
+  */
+static void sfx_monarch_test_mode_wait_end_cb(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
@@ -82,7 +99,7 @@ void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Sigfox_Cmd_1 */
 
   /* USER CODE END Process_Sigfox_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;
+  uint32_t *com_buffer = NULL;
   sfx_u32 config_words[SIZE_CONF_WORDS];
   sfx_u8 frame_ul[SGFX_MAX_PAYLOAD_SIZE];
   sfx_u8 frame_dwnl[SGFX_DWNL_SIZE];
@@ -93,6 +110,8 @@ void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
 
   APP_LOG(TS_ON, VLEVEL_H, " * CM0PLUS Sigfox command received\n\r");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
@@ -203,7 +222,9 @@ void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
       break;
 
     case SIGFOX_API_MONARCH_TEST_MODE_ID:
-      status = ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode((sfx_rc_enum_t) com_buffer[0], (sfx_test_mode_t) com_buffer[1], (sfx_u8)  com_buffer[2]);
+      status = ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_async((sfx_rc_enum_t) com_buffer[0], (sfx_test_mode_t) com_buffer[1], (sfx_u8)  com_buffer[2],
+                                                                       sfx_monarch_test_mode_wait_start_cb,
+                                                                       sfx_monarch_test_mode_wait_end_cb);
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal = (uint32_t) status;
@@ -243,48 +264,6 @@ void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sigfox_Cmd_2 */
 }
 
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/*!
-  * \brief   This is the function that will be called by the Sigfox Library when the scan is completed
-  *
-  *                     \param[out] sfx_u8       rc  Value of the RC found. There could be only 1 RC or 0 ( not found )
-  *                     \param[out] rssi         RSSI value of the RC found. if rc = 0, rssi is not valid ( is set to 0 too )
-  */
-static sfx_u8 app_monarch_rcscan_wrapper(sfx_u8 rc_bit_mask, sfx_s16 rssi)
-{
-  /* USER CODE BEGIN app_monarch_rcscan_wrapper_1 */
-
-  /* USER CODE END app_monarch_rcscan_wrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetSigfoxFeatureNotifComPtr();
-  com_obj->MsgId = SIGFOX_MONARCH_RC_SCAN_CB_ID;
-  com_obj->ParamBuf[0] = (uint32_t) rc_bit_mask;
-  com_obj->ParamBuf[1] = (uint32_t) rssi;
-  com_obj->ParamCnt = 2;
-  MBMUXIF_SigfoxSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (sfx_u8) ret;
-  /* USER CODE BEGIN app_monarch_rcscan_wrapper_2 */
-
-  /* USER CODE END app_monarch_rcscan_wrapper_2 */
-}
-
-/*!
-  * \brief   Measures the battery level
-  *
-  * \statusval  Battery level [0: node is connected to an external
-  *          power source, 1..254: battery level, where 1 is the minimum
-  *          and 254 is the maximum value, 255: the node was not able
-  *          to measure the battery level]
-  */
 uint16_t GetBatteryLevel_mbwrapper(void)
 {
   /* USER CODE BEGIN GetBatteryLevel_mbwrapper_1 */
@@ -308,12 +287,6 @@ uint16_t GetBatteryLevel_mbwrapper(void)
   /* USER CODE END GetBatteryLevel_mbwrapper_2 */
 }
 
-/*!
-  * \brief   Measures the temperature level
-  *
-  * \retval  Temperature level
-  */
-
 int16_t GetTemperatureLevel_mbwrapper(void)
 {
   /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_1 */
@@ -337,6 +310,64 @@ int16_t GetTemperatureLevel_mbwrapper(void)
   /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
 }
 
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static sfx_u8 app_monarch_rcscan_wrapper(sfx_u8 rc_bit_mask, sfx_s16 rssi)
+{
+  /* USER CODE BEGIN app_monarch_rcscan_wrapper_1 */
+
+  /* USER CODE END app_monarch_rcscan_wrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureNotifComPtr();
+  com_obj->MsgId = SIGFOX_MONARCH_RC_SCAN_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t) rc_bit_mask;
+  com_buffer[1] = (uint32_t) rssi;
+  com_obj->ParamCnt = 2;
+  MBMUXIF_SigfoxSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (sfx_u8) ret;
+  /* USER CODE BEGIN app_monarch_rcscan_wrapper_2 */
+
+  /* USER CODE END app_monarch_rcscan_wrapper_2 */
+}
+
+static void sfx_monarch_test_mode_wait_start_cb(void)
+{
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_start_cb_1 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_start_cb_1 */
+
+  /* don't exit this function until test_mode_wait_end callback is called */
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Monarch);
+
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_start_cb_2 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_start_cb_2 */
+}
+
+static void sfx_monarch_test_mode_wait_end_cb(void)
+{
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_end_cb_1 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_end_cb_1 */
+
+  /* release from the test_mode_wait */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Monarch);
+
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_end_cb_2 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_end_cb_2 */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h
index 7ad611ab..9220c66b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SIGFOX_MBWRAPPER_CM0PLUS_H__
@@ -57,8 +59,19 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj);
 
+/*!
+  * @brief   Measures the battery level
+  * @return  Battery level [0: node is connected to an external
+  *          power source, 1..254: battery level, where 1 is the minimum
+  *          and 254 is the maximum value, 255: the node was not able
+  *          to measure the battery level]
+  */
 uint16_t GetBatteryLevel_mbwrapper(void);
 
+/*!
+  * @brief   Measures the temperature level
+  * @return  Temperature level
+  */
 int16_t GetTemperatureLevel_mbwrapper(void);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c
index d07afac5..5bbdbdf3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_sigfox.h"
@@ -79,11 +81,11 @@ void MX_Sigfox_Process(void)
 
   /* USER CODE END MX_Sigfox_Process_1 */
   UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
-
   /* USER CODE BEGIN MX_Sigfox_Process_2 */
 
   /* USER CODE END MX_Sigfox_Process_2 */
 }
+
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h
index 0a8d78db..601d642c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SIGFOX_H__
@@ -47,6 +49,7 @@ extern "C" {
 #define SIGFOX_KMS 1
 /* USER CODE END SIGFOX_KMS */
 /* USER CODE BEGIN EC */
+
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -62,15 +65,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Sigfox Application
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Init(void);
 
 /**
   * @brief  entry Sigfox Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/ee.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/ee.c
index 6b209af1..aa1c02f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/ee.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/ee.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ee.c
@@ -16,6 +17,7 @@
   *
   *****************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "ee.h"
@@ -206,7 +208,7 @@ int32_t EE_Init(int32_t format, uint32_t base_address)
     total_nb_pages =
       2 * (EE_var[0].nb_pages + (CFG_EE_BANK1_SIZE ? EE_var[1].nb_pages : 0));
 
-    if (HW_FLASH_Erase(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
+    if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
     {
       return EE_ERASE_ERROR;
     }
@@ -242,7 +244,7 @@ int32_t EE_Read(int32_t bank, uint16_t addr, uint32_t *data)
   /* USER CODE BEGIN EE_Read_1 */
 
   /* USER CODE END EE_Read_1 */
-  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];;
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
 
   /* Read element starting from active page */
   return EE_ReadEl(pv, addr, data, pv->current_write_page);
@@ -256,7 +258,7 @@ int32_t EE_Write(int32_t bank, uint16_t addr, uint32_t data)
   /* USER CODE BEGIN EE_Write_1 */
 
   /* USER CODE END EE_Write_1 */
-  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];;
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
   uint32_t page;
 
   /* Check if current pool is full */
@@ -334,7 +336,7 @@ int32_t EE_Clean(int32_t bank, int32_t interrupt)
   DBG_EE(EE_1);
 
   /* Erase all the pages of the pool */
-  if (HW_FLASH_Erase(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
+  if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
       != 0)
   {
     return EE_ERASE_ERROR;
@@ -471,7 +473,7 @@ static int32_t EE_Recovery(EE_var_t *pv)
       {
         if (EE_GetState(pv, page) != EE_STATE_ERASED)
         {
-          if (HW_FLASH_Erase(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
+          if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
           {
             return EE_ERASE_ERROR;
           }
@@ -505,7 +507,7 @@ static int32_t EE_Transfer(EE_var_t *pv, uint16_t addr, uint32_t page)
      or ACTIVE, except in case of recovery, where some pages may be already
      in ERASING state.
      However, in case of recovery, we do not not need to set ERASING,
-     as initialization phase erases the unactive pool. */
+     as initialization phase erases the inactive pool. */
   last_page =
     (page < pv->nb_pages) ? (2 * pv->nb_pages - 1) : (pv->nb_pages - 1);
 
@@ -624,7 +626,7 @@ static int32_t EE_WriteEl(EE_var_t *pv, uint16_t addr, uint32_t data)
     EE_FLASH_ADDR(pv, pv->current_write_page) + pv->next_write_offset;
 
   /* Write element in flash */
-  if (HW_FLASH_Write(flash_addr, el) != 0)
+  if (FLASH_IF_Write64(flash_addr, el) != 0)
   {
     return EE_WRITE_ERROR;
   }
@@ -700,7 +702,7 @@ static int32_t EE_SetState(const EE_var_t *pv, uint32_t page, uint32_t state)
   DBG_EE(EE_0);
 
   /* Set new page state inside page header */
-  if (HW_FLASH_Write(flash_addr, EE_PROGRAMMED) != 0)
+  if (FLASH_IF_Write64(flash_addr, EE_PROGRAMMED) != 0)
   {
     return EE_WRITE_ERROR;
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/ee.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/ee.h
index 27947917..81b544f1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/ee.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/ee.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ee.h
@@ -16,6 +17,7 @@
   *
   *****************************************************************************
   */
+/* USER CODE END Header */
 
 #ifndef EE_H__
 #define EE_H__
@@ -35,7 +37,7 @@
   *
   * - M_BEGIN, M_END and DBG() macro definitions.
   *
-  * - Hadrwae flash driver definitions:
+  * - Hardware flash driver definitions:
   *
   *      * HW_FLASH_PAGE_SIZE (in bytes)
   *
@@ -66,7 +68,7 @@
   *
   * Notes
   * -----
-  * - a corrupted word in FLASH detected by the user aoftware shall be set to 0.
+  * - a corrupted word in FLASH detected by the user software shall be set to 0.
   *   The EEPROM emulation software will then handle it properly.
   */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h
index c5ded3d1..ae7d30ed 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c
index c86679dd..8f722834 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_cstimer.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sgfx_cstimer.h"
@@ -62,7 +64,7 @@ void RxCarrierSenseInitStatus(void)
   /* USER CODE BEGIN RxCarrierSenseInitStatus_1 */
 
   /* USER CODE END RxCarrierSenseInitStatus_1 */
-  /*Initialises the Flag*/
+  /*Initialize the Flag*/
   rxCarrierSenseFlag = 0;
   /* USER CODE BEGIN RxCarrierSenseInitStatus_2 */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h
index bd7acc9b..d51103ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_cstimer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_CSTIMER_H__
 #define __SGFX_CSTIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c
index acc336eb..10028955 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -23,6 +25,8 @@
 #include "ee.h"
 #include "st_sigfox_api.h"
 #include "se_nvm.h"
+#include "sys_conf.h"
+#include "utilities_conf.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -72,8 +76,19 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief        Read Sigfox Configuration from eeprom
+  * @param addr   variable virtual address
+  * @param data   pointer to a 32-bit word (allocated by the caller) containing the
+  *               variable value in case of success.
+  */
 static void E2P_Read(e_EE_ID addr, uint32_t *data);
 
+/**
+  * @brief        Write Sigfox Configuration to eeprom
+  * @param addr   variable virtual address
+  * @param data   32-bit data word to be written
+  */
 static void E2P_Write(e_EE_ID addr, uint32_t data);
 
 /* USER CODE BEGIN PFP */
@@ -152,7 +167,7 @@ void E2P_RestoreFs(void)
   E2P_Write(EE_MCU_NVM_2_ID, 0);
   E2P_Write(EE_MCU_NVM_3_ID, 0);
   E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, 0);
-  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, 0);
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, VERBOSE_LEVEL);
 
   HAL_FLASH_Lock();
   /* USER CODE BEGIN E2P_RestoreFs_2 */
@@ -407,9 +422,9 @@ void E2P_Write_VerboseLevel(uint8_t verboselevel)
   E2P_Write(EE_SGFX_VERBOSELEVEL_ID, (uint32_t) verboselevel);
 
   HAL_FLASH_Lock();
-  /* USER CODE BEGIN E2P_Write_VerboseLevel_1 */
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_2 */
 
-  /* USER CODE END E2P_Write_VerboseLevel_1 */
+  /* USER CODE END E2P_Write_VerboseLevel_2 */
 }
 
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
@@ -561,7 +576,7 @@ E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len)
   E2P_Read(EE_SE_NVM_1_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_2_ID, &data_from_eeprom);
-  read_data[i++] = (sfx_u8) data_from_eeprom;;
+  read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_3_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_4_ID, &data_from_eeprom);
@@ -658,43 +673,6 @@ E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len)
   /* USER CODE END E2P_Write_McuNvm_2 */
 }
 
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void E2P_Write(e_EE_ID addr, uint32_t data)
-{
-  /* USER CODE BEGIN E2P_Write_1 */
-
-  /* USER CODE END E2P_Write_1 */
-  if (EE_Write(EE_BANK_0, (uint16_t) addr, data) == EE_CLEAN_NEEDED)
-  {
-    EE_Clean(EE_BANK_0, EE_CLEAN_MODE_POLLING);
-  }
-  /* USER CODE BEGIN E2P_Write_2 */
-
-  /* USER CODE END E2P_Write_2 */
-}
-
-static void E2P_Read(e_EE_ID addr, uint32_t *data)
-{
-  /* USER CODE BEGIN E2P_Read_1 */
-
-  /* USER CODE END E2P_Read_1 */
-  EE_Read(EE_BANK_0, (uint16_t) addr, data);
-  /* USER CODE BEGIN E2P_Read_2 */
-
-  /* USER CODE END E2P_Read_2 */
-}
-
-/*!
-* \brief   Returns the last stored variable data, if found, which corresponds to
-*          the passed virtual address
-* \param   EEsgfxID:
-*          data: to be read
-* \retval  error status
-*/
 int32_t EE_ReadValue(e_EE_ID EEsgfxID,  uint32_t *data)
 {
   /* USER CODE BEGIN EE_ReadValue_1 */
@@ -717,12 +695,6 @@ int32_t EE_ReadValue(e_EE_ID EEsgfxID,  uint32_t *data)
   /* USER CODE END EE_ReadValue_2 */
 }
 
-/*!
-* \brief   Writes/updates variable data in EEPROM emulator.
-* \param   EEsgfxID:
-*          data: to be written
-* \retval error status
-*/
 int32_t EE_WriteValue(e_EE_ID EEsgfxID,  uint32_t data)
 {
   /* USER CODE BEGIN EE_WriteValue_1 */
@@ -754,6 +726,36 @@ int32_t EE_WriteValue(e_EE_ID EEsgfxID,  uint32_t data)
   /* USER CODE END EE_WriteValue_2 */
 }
 
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void E2P_Write(e_EE_ID addr, uint32_t data)
+{
+  /* USER CODE BEGIN E2P_Write_1 */
+
+  /* USER CODE END E2P_Write_1 */
+  if (EE_Write(EE_BANK_0, (uint16_t) addr, data) == EE_CLEAN_NEEDED)
+  {
+    EE_Clean(EE_BANK_0, EE_CLEAN_MODE_POLLING);
+  }
+  /* USER CODE BEGIN E2P_Write_2 */
+
+  /* USER CODE END E2P_Write_2 */
+}
+
+static void E2P_Read(e_EE_ID addr, uint32_t *data)
+{
+  /* USER CODE BEGIN E2P_Read_1 */
+
+  /* USER CODE END E2P_Read_1 */
+  EE_Read(EE_BANK_0, (uint16_t) addr, data);
+  /* USER CODE BEGIN E2P_Read_2 */
+
+  /* USER CODE END E2P_Read_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h
index 47d34ed8..b8f92029 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_EEPROM_IF_H__
@@ -76,7 +78,7 @@ typedef enum
   EE_MCU_NVM_2_ID,
   EE_MCU_NVM_3_ID,
   /*Public ID e.g. visible on M4 starting at EE_ID=EE_RSSI_CAL_ID */
-  EE_RSSI_CAL_ID= 100,
+  EE_RSSI_CAL_ID = 100,
   EE_AT_ECHO_ID,
   EE_TX_POWER_RC1_ID,
   EE_TX_POWER_RC2_ID,
@@ -122,197 +124,179 @@ typedef enum
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_Init(void);
 
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_RestoreFs(void);
 
 /*!
- * @brief Read Output Power
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Read Output Power
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @return Output Power
  */
 int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Write Output Power to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Write Output Power to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @param  power Output Power
  */
 void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power);
 
 /*!
- * @brief Read Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval Region Configuration RC
+ * @brief  Read Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return Region Configuration RC
  */
 sfx_rc_enum_t E2P_Read_Rc(void);
 
 /*!
- * @brief Write Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Region Configuration RC
- * @retval None
+ * @brief  Write Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
  */
 void E2P_Write_Rc(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Read Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Read Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Write Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Write Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Read rssi calibration value from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval rssi calibration value
+ * @brief  Read rssi calibration value from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return rssi calibration value
  */
 int16_t E2P_Read_RssiCal(void);
 
 /*!
- * @brief Writes rssi calibration value to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  rssi calibration value
- * @retval None
+ * @brief  Writes rssi calibration value to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  rssi_cal calibration value
  */
 void E2P_Write_RssiCal(int16_t rssi_cal);
 
 /*!
- * @brief Read Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval at_echo
  */
 uint32_t E2P_Read_AtEcho(void);
 
 /*!
- * @brief Write Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  at_echo
- * @retval None
  */
 void E2P_Write_AtEcho(uint32_t at_echo);
 
 /*!
- * @brief Read KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval KeyType
  */
 sfx_key_type_t E2P_Read_KeyType(void);
 
 /*!
- * @brief Write KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  KeyType
- * @retval None
+ * @brief  Write KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  key_type KeyType setting
  */
 void E2P_Write_KeyType(sfx_key_type_t key_type);
 
 /*!
- * @brief Read EncryptionFlag setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read EncryptionFlag setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval encryption_flag
  */
 uint8_t E2P_Read_EncryptionFlag(void);
 
 /*!
- * @brief Write EncryptionFlag  setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write EncryptionFlag  setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  encryption_flag
- * @retval None
  */
 void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len);
 
 /*!
- * @brief Write Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Write Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Read MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data,  uint32_t len);
 
 /*!
- * @brief Write Region MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Write Region MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param   None
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval the VL
  */
 uint8_t E2P_Read_VerboseLevel(void);
 
 /*!
- * @brief Read verbose levelsetting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Read verbose levelsetting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  verboselevel
- * @retval None
  */
 void E2P_Write_VerboseLevel(uint8_t verboselevel);
 
 /*!
- * @brief Read Sigfox Configuration from eeprom
- * @param  e_EE_ID
- *         data read
+ * @brief  Read Sigfox Configuration from eeprom
+ * @param  EEsgfxID e_EE_ID
+ * @param  data read
  * @retval error status
  */
 int32_t EE_ReadValue(e_EE_ID EEsgfxID,  uint32_t *data);
 
 /*!
- * @brief Write Sigfox Configuration from eeprom
- * @param  e_EE_ID
- *         data read
+ * @brief  Write Sigfox Configuration from eeprom
+ * @param  EEsgfxID e_EE_ID
+ * @param  data read
  * @retval error status
  */
 int32_t EE_WriteValue(e_EE_ID EEsgfxID,  uint32_t data);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h
index a32f9ae0..9dbd7b64 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file   sigfox_data.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SIGFOX_DATA_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c
index f24f98e1..1b6e1096 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mcu_api.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -31,6 +33,7 @@
 #include "utilities_def.h"
 #include "sys_app.h" /*for APP_LOG*/
 #include "radio_board_if.h"
+#include "radio_conf.h" /* RF_WAKEUP_TIME */
 
 /* USER CODE BEGIN Includes */
 
@@ -116,9 +119,6 @@ sfx_u8 MCU_API_malloc(sfx_u16 size, sfx_u8 **returned_pointer)
 
   /* USER CODE END MCU_API_malloc_1 */
 
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
   /* Allocate a memory : static or dynamic allocation */
   /* knowing that the sigfox library will ask for a buffer once at the SIGFOX_API_open() call. */
   /* This buffer will be released after SIGFOX_API_close() call. */
@@ -144,6 +144,8 @@ sfx_u8 MCU_API_free(sfx_u8 *ptr)
   /* USER CODE BEGIN MCU_API_free_1 */
 
   /* USER CODE END MCU_API_free_1 */
+  /* Free the buffer allocated during the MCU_API_malloc()
+   * called only when SIGFOX_API_close() is called. */
   return SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_free_2 */
 
@@ -158,8 +160,11 @@ sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_t
 
   /* USER CODE END MCU_API_get_voltage_temperature_1 */
 
-  /* brief Get voltage and temperature for Out of band frames*/
-  /* Value must respect the units bellow for backend compatibility*/
+  /* Get the idle voltage of the complete device
+   * Get the TX voltage of the complete device ( during transmission )
+   * Get the temperature of the device
+   * If those values are not available : set it to 0x0000
+   * return the voltage_idle in 1/10 volt on 16bits and 1/10 degrees for the temperature */
   *voltage_idle = (uint16_t)GetBatteryLevel_mbwrapper(); /* mV */
   *voltage_tx = 0;
   *temperature = (uint16_t)((GetTemperatureLevel_mbwrapper() * 10) >> 8);   /* */
@@ -187,8 +192,12 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
   switch (delay_type)
   {
     case SFX_DLY_INTER_FRAME_TRX :
+      /* Interframe used when sending an Uplink Message with a downlink request */
       /* Delay  is 500ms  in FCC and ETSI
-        * In ARIB : minimum delay is 50 ms */
+       * In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX1 */
       if ((sfx_rc == SFX_RC3A) ||
           (sfx_rc == SFX_RC3C) ||
           (sfx_rc == SFX_RC5))
@@ -205,11 +214,18 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
       {
         Delay_Lp(510 - (T_RADIO_DELAY_ON) - T_RADIO_DELAY_OFF); /* 500-525 ms */
       }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX2 */
       break;
 
     case SFX_DLY_INTER_FRAME_TX :
+      /* Interframe used when sending an Uplink Message without downlink request */
       /* Start delay 0 seconds to 2 seconds in FCC and ETSI*/
       /* In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX1 */
       if ((sfx_rc == SFX_RC3A) ||
           (sfx_rc == SFX_RC3C) ||
           (sfx_rc == SFX_RC5))
@@ -221,19 +237,41 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
       {
         Delay_Lp(1000 - T_RADIO_DELAY_ON - T_RADIO_DELAY_OFF); /* 1000 ms */
       }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX2 */
       break;
 
     case SFX_DLY_OOB_ACK :
+      /*  Delay between RX frame and sending ack in oob service frame*/
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK1 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK1 */
       /* Start delay between 1.4 seconds to 4 seconds in FCC and ETSI */
       Delay_Lp(1600 - T_RADIO_DELAY_ON);
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK2 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK2 */
       break;
 
     case SFX_DLY_CS_SLEEP :
+      /* Delay between attempts of carrier sense for the first frame*/
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP1 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP1 */
       Delay_Lp(500 - T_RADIO_DELAY_ON); /* 500 ms */
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP2 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP2 */
       break;
+    /* USER CODE BEGIN SFX_DLY_ADD_CASE */
 
+    /* USER CODE END SFX_DLY_ADD_CASE */
     default :
       err = MCU_ERR_API_DLY;
+      /* USER CODE BEGIN SFX_DLY_DEFAULT */
+
+      /* USER CODE END SFX_DLY_DEFAULT */
       break;
   }
   /* USER CODE BEGIN MCU_API_delay_Last */
@@ -245,26 +283,33 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
 /*******************************************************************/
 sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
 {
-  /* USER CODE BEGIN MCU_API_get_nv_mem_1 */
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_get_nv_mem1 */
 
-  /* USER CODE END MCU_API_get_nv_mem_1 */
+  /* USER CODE END MCU_API_get_nv_mem1 */
+  /* Read out SFX_NVMEM_BLOCK_SIZE bytes in eeprom or equivalent
+   * in flash as Non Volatile Memory (NVM)
+   * This cannot be in RAM : must be remanent*/
   if (E2P_Read_McuNvm(read_data, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
   {
     return MCU_ERR_API_GETNVMEM;
   }
-  /* USER CODE BEGIN MCU_API_get_nv_mem_2 */
+  /* USER CODE BEGIN MCU_API_get_nv_mem2 */
 
-  /* USER CODE END MCU_API_get_nv_mem_2 */
-  return SFX_ERR_NONE;
+  /* USER CODE END MCU_API_get_nv_mem2 */
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_set_nv_mem_1 */
 
   /* USER CODE END MCU_API_set_nv_mem_1 */
-
+  /* Write down SFX_NVMEM_BLOCK_SIZE bytes
+   * in the eeprom or flash such as it can be retrieved
+   * later even if device is switched off or rebooting*/
   if (E2P_Write_McuNvm(data_to_write, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
   {
     return MCU_ERR_API_SETNVMEM;
@@ -272,15 +317,21 @@ sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
   /* USER CODE BEGIN MCU_API_set_nv_mem_2 */
 
   /* USER CODE END MCU_API_set_nv_mem_2 */
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_1 */
 
   /* USER CODE END MCU_API_timer_start_carrier_sense_1 */
+  /* Starts a timer for the carrier sense. You can plug your timer
+   * expiration to a callback that will update the timer event
+   * status checked by RF_API_wait_for_clear_channel*/
+  /* Starts CS timeout during time_duration_in_ms */
+
   APP_LOG(TS_ON, VLEVEL_M, "CS timeout Started= %d msec\n\r", time_duration_in_ms);
   UTIL_TIMER_Create(&Timer_TimeoutCs, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTimerTimeoutCsEvt, NULL);
   UTIL_TIMER_Stop(&Timer_TimeoutCs);
@@ -289,15 +340,19 @@ sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
   /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_2 */
 
   /* USER CODE END MCU_API_timer_start_carrier_sense_2 */
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_start_1 */
 
   /* USER CODE END MCU_API_timer_start_1 */
+  /* Starts MCU timer during time_duration_in_ms */
+  /* This timer start can install a callback to indicate when it occurs
+   * This event will be caught in the MCU_API_wait_for_end_timer() function. */
   uint32_t time_duration_in_millisec = time_duration_in_s * 1000;
   APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Started= %d sec\n\r", time_duration_in_s);
 
@@ -305,112 +360,120 @@ sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
   UTIL_TIMER_Stop(&Timer_Timeout);
   UTIL_TIMER_SetPeriod(&Timer_Timeout, time_duration_in_millisec);
   UTIL_TIMER_Start(&Timer_Timeout);
+
   /* USER CODE BEGIN MCU_API_timer_start_2 */
 
   /* USER CODE END MCU_API_timer_start_2 */
 
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_stop(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_stop_1 */
 
   /* USER CODE END MCU_API_timer_stop_1 */
+  /* Stops MCU timer started in MCU_API_timer_start*/
   APP_LOG(TS_ON, VLEVEL_M, "timer_stop\n\r");
 
   UTIL_TIMER_Stop(&Timer_Timeout);
   /* USER CODE BEGIN MCU_API_timer_stop_2 */
 
   /* USER CODE END MCU_API_timer_stop_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_stop_carrier_sense(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_1 */
 
   /* USER CODE END MCU_API_timer_stop_carrier_sense_1 */
+  /* Abort the carrier sense: stops CS timer */
   APP_LOG(TS_ON, VLEVEL_M, "CS timer_stop\n\r");
 
   UTIL_TIMER_Stop(&Timer_TimeoutCs);
   /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_2 */
 
   /* USER CODE END MCU_API_timer_stop_carrier_sense_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_wait_for_end(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_wait_for_end_1 */
 
   /* USER CODE END MCU_API_timer_wait_for_end_1 */
+  /* This function is waiting (actively or not) on the event for end timer
+   * (started by MCU_API_timer_start) elapsed and then returns*/
   APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Wait\n\r");
 
   UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
   /* USER CODE BEGIN MCU_API_timer_wait_for_end_2 */
 
   /* USER CODE END MCU_API_timer_wait_for_end_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_report_test_result(sfx_bool status, sfx_s16 rssi)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_report_test_result_1 */
 
   /* USER CODE END MCU_API_report_test_result_1 */
+  /* this function is used to to report status and rssi
+   * optionally, it can log data on terminal*/
   rxcount++;
 
   if (status == SFX_TRUE)
   {
-    /* Set the LED3 to inform the user that we received a frame for the device */
-#if defined(USE_BSP_DRIVER)
+    /* Last Rx Packet received*/
+    /* USER CODE BEGIN SFX_TRUE_1 */
     BSP_LED_On(LED_GREEN);
     HAL_Delay(50);
     BSP_LED_Off(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN);
-    HAL_Delay(50);
-    SYS_LED_Off(SYS_LED_GREEN);
-#endif /* defined(USE_BSP_DRIVER) */
+    /* USER CODE END SFX_TRUE_1 */
     okcount++;
     APP_LOG(TS_ON, VLEVEL_H, TERM_GREEN"RX OK. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r  "TERM_RESET, (int32_t) rssi, rxcount,
             ((rxcount - okcount) * 100) / rxcount);
+    /* USER CODE BEGIN SFX_TRUE_2 */
+
+    /* USER CODE END SFX_TRUE_2 */
   }
   else
   {
-#if defined(USE_BSP_DRIVER)
+    /* Last Rx Packet on error or timeout*/
+    /* USER CODE BEGIN SFX_FALSE_1 */
     BSP_LED_On(LED_BLUE);
     HAL_Delay(50);
     BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE);
-    HAL_Delay(50);
-    SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
+    /* USER CODE END SFX_FALSE_1 */
     APP_LOG(TS_ON, VLEVEL_H, TERM_RED"RX KO. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r "TERM_RESET, (int32_t)rssi, rxcount,
             ((rxcount - okcount) * 100) / rxcount);
-  }
+    /* USER CODE BEGIN SFX_FALSE_2 */
 
-  return SFX_ERR_NONE;
+    /* USER CODE END SFX_FALSE_2 */
+  }
   /* USER CODE BEGIN MCU_API_report_test_result_2 */
 
   /* USER CODE END MCU_API_report_test_result_2 */
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_get_version_1 */
 
   /* USER CODE END MCU_API_get_version_1 */
+  /* Reports version and the size of the version buffer*/
   *version = (sfx_u8 *)mcu_api_version;
   if (size == SFX_NULL)
   {
@@ -421,7 +484,7 @@ sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
 
   /* USER CODE END MCU_API_get_version_2 */
 
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 static void Delay_Lp(uint32_t delay_ms)
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h
index 892fe41a..c0a63471 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mcu_api.h
   * @author  MCD Application Team
-  * @brief   defines the interfaace to mcu_api.c
+  * @brief   defines the interface to mcu_api.c
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /*!
 \if SIGFOX PATTERN
 ----------------------------------------------
@@ -180,7 +182,7 @@ sfx_u8 MCU_API_free(sfx_u8 *ptr);
 /*!******************************************************************
   * \fn sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_tx, sfx_s16 *temperature)
   * \brief Get voltage and temperature for Out of band frames
-  * Value must respect the units bellow for <B>backend compatibility</B>
+  * Value must respect the units below for <B>backend compatibility</B>
   *
   * \param[in] none
   * \param[out] sfx_u16 *voltage_idle             Device's voltage in Idle state (mV)
@@ -210,28 +212,6 @@ sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle,
   *******************************************************************/
 sfx_u8 MCU_API_delay(sfx_delay_t delay_type);
 
-/*!******************************************************************
-  * \fn sfx_u8 MCU_API_aes_128_cbc_encrypt(sfx_u8 *encrypted_data, sfx_u8 *data_to_encrypt, sfx_u8 aes_block_len, sfx_u8 key[16], sfx_credentials_use_key_t use_key)
-  * \brief Encrypt a complete buffer with Secret or Test key.<BR>
-  * The secret key corresponds to the private key provided from the CRA.
-  * <B>These keys must be stored in a secure place.</B> <BR>
-  * Can be hardcoded or soft coded (iv vector contains '0')
-  *
-  * \param[out] sfx_u8 *encrypted_data            Result of AES Encryption
-  * \param[in] sfx_u8 *data_to_encrypt            Input data to Encrypt
-  * \param[in] sfx_u8 aes_block_len               Input data length (should be a multiple of an AES block size, ie. AES_BLOCK_SIZE bytes)
-  * \param[in] sfx_u8 key[16]                     Input key
-  * \param[in] sfx_credentials_use_key_t use_key  Key to use - private key or input key
-  *
-  * \retval SFX_ERR_NONE:                         No error
-  * \retval MCU_ERR_API_AES:                      AES Encryption error
-  *******************************************************************/
-sfx_u8 MCU_API_aes_128_cbc_encrypt(sfx_u8 *encrypted_data,
-                                   sfx_u8 *data_to_encrypt,
-                                   sfx_u8 aes_block_len,
-                                   sfx_u8 key[16],
-                                   sfx_credentials_use_key_t use_key);
-
 /*!******************************************************************
   * \fn sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
   * \brief This function copies the data read from non volatile memory
@@ -340,7 +320,7 @@ sfx_u8 MCU_API_timer_wait_for_end(void);
   *
   * \param[in] sfx_bool status                    Is SFX_TRUE when result ok else SFX_FALSE
   *                                               See SIGFOX_API_test_mode summary
-  * \param[out] rssi                              RSSI of the received frame
+  * \param[in] rssi                              RSSI of the received frame
   *
   * \retval SFX_ERR_NONE:                         No error
   * \retval MCU_ERR_API_TEST_REPORT:              Report test result error
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.c
index 1dd2b585..5a748e02 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_api.c
@@ -16,31 +17,32 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "stm32wlxx_hal.h"
 
 #include "mn_api.h"
-#include "lptim.h"
-#include "stm32_lpm.h"
+#include "mn_lptim_if.h"
 #include "radio.h"
-#include "sys_debug.h"
-#include "sys_app.h"
-#include "utilities_conf.h"
-#include "sys_conf.h"             /*For led*/
+#include "platform.h"          /*For led*/
 #include "sys_app.h"           /*For log*/
+#include "stm32_lpm.h"
 #include "stm32_timer.h"
 #include "stm32_seq.h"
 #include "utilities_def.h"
-#include "platform.h"
-#include "mn_lptim_if.h"
 
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
+/**
+  * @brief LPTIM handle
+  */
+extern LPTIM_HandleTypeDef hlptim1;
+
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -52,7 +54,7 @@
 
 /* Private define ------------------------------------------------------------*/
 /*OOK demod on for debug*/
-#define MN_PROCESS_IN_BG 0
+#define MN_PROCESS_IN_BG 1
 
 #define LPTIM_PERIOD     ((uint32_t)  2)        /* 1/16384~61.03us  */
 
@@ -185,7 +187,7 @@ void MN_API_StopRx(void)
   /* USER CODE BEGIN MN_API_StopRx_1 */
 
   /* USER CODE END MN_API_StopRx_1 */
-  /*no need to stanby xosc, radio will just
+  /*no need to standby xosc, radio will just
     change freq with MN_API_change_frequency*/
   /* USER CODE BEGIN MN_API_StopRx_2 */
 
@@ -232,38 +234,19 @@ void MN_API_Disable16KHzSamplingTimer(void)
 void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequency, int32_t best_rssi)
 {
   /* USER CODE BEGIN MN_API_Pattern_Found_1 */
-
+  BSP_LED_On(LED_BLUE);
   /* USER CODE END MN_API_Pattern_Found_1 */
   /* debug function to display sweep/window detected pattern*/
-#if defined(USE_BSP_DRIVER)
-  if (window_type == 0)
-  {
-    BSP_LED_On(LED_BLUE);
-    APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    BSP_LED_Off(LED_BLUE);
-  }
-  else
-  {
-    BSP_LED_On(LED_BLUE);
-    APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    BSP_LED_Off(LED_BLUE);
-  }
-#elif defined(MX_BOARD_PSEUDODRIVER)
   if (window_type == 0)
   {
-    SYS_LED_On(SYS_LED_BLUE);
     APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    SYS_LED_Off(SYS_LED_BLUE);
   }
   else
   {
-    SYS_LED_On(SYS_LED_BLUE);
     APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    SYS_LED_Off(SYS_LED_BLUE);
   }
-#endif /* defined(USE_BSP_DRIVER) */
   /* USER CODE BEGIN MN_API_Pattern_Found_2 */
-
+  BSP_LED_Off(LED_BLUE);
   /* USER CODE END MN_API_Pattern_Found_2 */
 }
 
@@ -338,7 +321,6 @@ void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
   /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_1 */
   int16_t rssi = RADIO_NOISE_LEVEL;
 
-  DBG_GPIO_SET_LINE(GPIOB, GPIO_PIN_12);
   /*read rssi*/
   if (RssiReadOnIT_Enable == 1)
   {
@@ -352,12 +334,11 @@ void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
       RssiBuffWriteIdx = 0;
     }
     /*run process_MonarchBackGround in background*/
-    UTIL_SEQ_SetTask(1 << CFG_SEQ_TASK_MONARCH, CFG_SEQ_Prio_0);
+    UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_Monarch, CFG_SEQ_Prio_0);
 #else
     MN_Timer_CB(rssi);
 #endif /* MN_PROCESS_IN_BG==1 */
   }
-  DBG_GPIO_RST_LINE(GPIOB, GPIO_PIN_12);
   /* USER CODE BEGIN HAL_LPTIM_AutoReloadMatchCallback_2 */
 
   /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_2 */
@@ -370,7 +351,7 @@ static void process_MonarchBackGround(void)
 
   /* USER CODE END process_MonarchBackGround_1 */
   int16_t rssi;
-  DBG_GPIO_SET_LINE(GPIOB, GPIO_PIN_13);
+
   while (RssiBuffWriteIdx != RssiBuffReadIdx)
   {
     rssi = RssiBuff[RssiBuffReadIdx++];
@@ -381,7 +362,6 @@ static void process_MonarchBackGround(void)
     }
     MN_Timer_CB(rssi);
   }
-  DBG_GPIO_RST_LINE(GPIOB, GPIO_PIN_13);
   /* USER CODE BEGIN process_MonarchBackGround_2 */
 
   /* USER CODE END process_MonarchBackGround_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.h
index 240019f7..1f76066c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_api.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MN_API_H__
@@ -53,14 +55,14 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialises the Monarch Low level
-  * @param Callback for rssi samplep rocess
+  * @brief Initialize the Monarch Low level
+  * @param Callback for rssi sample process
   * @retval None
   */
 void MN_API_Init(void (*MN_API_Timer_CB)(int16_t rssi));
 
 /**
-  * @brief DeInitialises the Monarch Low level
+  * @brief DeInitialize the Monarch Low level
   * @param None
   * @retval None
   */
@@ -116,7 +118,7 @@ void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequenc
   * @brief starts timer
   * @param timer_value_ms timer value in ms
   * @param call back when timer elapses
-  * @note Argurment can be left unused
+  * @note Argument can be left unused
   * @retval None
   */void MN_API_TimerSart(uint32_t timer_value_ms, void (*TimeoutHandle)(void *Argument));
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h
index 11ef6af2..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     150U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h
index 3a3fd8a1..3f3a274e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,6 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,12 +49,12 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief Max payload buffer size
@@ -65,6 +68,7 @@ extern "C" {
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -72,25 +76,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 15UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -130,6 +151,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/rf_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/rf_api.c
index 71140893..a877cf85 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/rf_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/rf_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ****************************************************************************
   * @file    rf_api.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* includes -----------------------------------------------------------*/
 #include "stdint.h"
@@ -50,7 +52,7 @@
 /* Private define ------------------------------------------------------------*/
 #define RF_VER                   "RF_API_V1.0"
 #define SFX_PREAMBLE_LENGTH      2
-#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronise*/
+#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronize*/
 #define SFX_MAX_PAYLOAD_LENGTH   15
 #define SFX_DATARATE_600         600
 #define SFX_DATARATE_100         100
@@ -129,27 +131,34 @@ const RadioEvents_t RfApiRadioEvents =
 /* Exported functions --------------------------------------------------------*/
 sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_init_1 */
 
   /* USER CODE END RF_API_init_1 */
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
   /* Put here all RF initialization concerning the RC IC you are using. */
-  /* this function is dependent of SPI driver or equivalent. */
 
   switch (rf_mode)
   {
     case SFX_RF_MODE_TX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_TX_1 */
+
+      /* USER CODE END SFX_RF_MODE_TX_1 */
+      /* Initialize Tx if necessary*/
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in TX\n\r");
-      /* nothing to do */
-      /* set the RF IC in TX mode : this could be DBPSK100 or 600:  this distinction will be done during the RF_API_send */
-      /* you can add some code to switch on TCXO or warm up quartz for stabilization : in case of frequency drift issue */
+
+      /* USER CODE BEGIN SFX_RF_MODE_TX_2 */
+
+      /* USER CODE END SFX_RF_MODE_TX_2 */
       break;
     }
     case SFX_RF_MODE_RX:
     {
+      /* Configure the RF_IP IC in RX mode : GFSK 600bps*/
+      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+      /* USER CODE BEGIN SFX_RF_MODE_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_RX_1 */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in RX\n\r");
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 1600,
                         SFX_DATARATE_600, NA,
@@ -158,13 +167,19 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* set the RF IC in RX mode : GFSK 600bps is the only mode now */
-      /* Enable interrupts on RX fifo */
-      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+
+      /* USER CODE BEGIN SFX_RF_MODE_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_RX_2 */
       break;
     }
     case SFX_RF_MODE_CS200K_RX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_1 */
+      /* configure the RF_IP into sensing 200KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS200\n\r");
 
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 200000,
@@ -174,12 +189,20 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 200KHz bandwidth to be able to read out RSSI level */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function */
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_2 */
       break;
     }
     case SFX_RF_MODE_CS300K_RX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_1 */
+
+      /* configure the RF_IP into sensing 300KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function. */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS300\n\r");
 
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 300000,
@@ -189,13 +212,19 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 300KHz bandwidth to be able to read out RSSI level */
-      /* This is poosible to make this carrier sense in 2 * 200Kz if you respect the regulation time for listening */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function. */
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_2 */
       break;
     }
     case SFX_RF_MODE_MONARCH:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_1 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_1 */
+
+      /* configure the RF_IP into sensing 20KHz bandwidth */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in MN20\n\r");
       /* APP_LOG(TS_ON, VLEVEL_L,"RxBw=20kHz\n\r"); */
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 20000,
@@ -205,22 +234,25 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 20KHz bandwidth to be able to read out RSSI level */
-      /* This is poosible to make this carrier sense in 2 * 200Kz if you respect the regulation time for listening */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function. */
+
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_2 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_2 */
       break;
     }
     default :
+      status = RF_ERR_API_INIT;
       break;
   }
-  return SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_init_2 */
 
   /* USER CODE END RF_API_init_2 */
+  return status;
 }
 
 sfx_u8 RF_API_stop(void)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_stop_1 */
 
   /* USER CODE END RF_API_stop_1 */
@@ -231,35 +263,56 @@ sfx_u8 RF_API_stop(void)
 
   /* USER CODE END RF_API_stop_2 */
 
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_send_1 */
 
   /* USER CODE END RF_API_send_1 */
-  sfx_u8 status = SFX_ERR_NONE;
 
   uint32_t datarate;
 
   int8_t power = E2P_Read_Power(E2P_Read_Rc());
 
   APP_LOG(TS_ON, VLEVEL_M, "TX START:nB=%d\n\r", size);
-
   switch (type)
   {
     case SFX_DBPSK_100BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @100bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
       datarate = SFX_DATARATE_100;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_2 */
       break;
     case SFX_DBPSK_600BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @600bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
       datarate = SFX_DATARATE_600;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_2 */
+
       break;
     default :
       status = RF_ERR_API_SEND;
       break;
   }
+  /* USER CODE BEGIN RF_API_send_2 */
+  BSP_LED_On(LED_BLUE);
 
+  /* USER CODE END RF_API_send_2 */
   if (status == SFX_ERR_NONE)
   {
     Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
@@ -268,12 +321,6 @@ sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
                       NA, NA, NA,
                       NA, NA, 3000);
 
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
-
     Radio.Send(stream, size);
 
     APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Tx\n\r");
@@ -282,70 +329,87 @@ sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
 
     APP_LOG(TS_ON, VLEVEL_M, "End Of Tx\n\r");
 
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
-
   }
 
   APP_LOG(TS_ON, VLEVEL_M, "TX END\n\r");
+  /* USER CODE BEGIN RF_API_send_3 */
+  BSP_LED_Off(LED_BLUE);
 
-  /* BSP_LED_Off( LED_RED2 ); */
+  /* USER CODE END RF_API_send_3 */
   return status;
-  /* USER CODE BEGIN RF_API_send_2 */
 
-  /* USER CODE END RF_API_send_2 */
 }
 
 sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_start_continuous_transmission_1 */
 
   /* USER CODE END RF_API_start_continuous_transmission_1 */
-  sfx_u8 status = SFX_ERR_NONE;
 
   int8_t power = E2P_Read_Power(E2P_Read_Rc());
 
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
-
   switch (type)
   {
     case SFX_NO_MODULATION :
+      /* Starts CW continuous Tx at the frequency given by the RF_API_change_frequency()*/
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_1 */
       Radio.TxCw(power);
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_2 */
       break;
     case SFX_DBPSK_100BPS :
-      /* Make an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+      /* Starts an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
       Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
                         NA, SFX_DATARATE_100,
                         NA, NA,
                         NA, NA, NA,
                         NA, NA, 3000);
       Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
       break;
     case SFX_DBPSK_600BPS :
+      /* Starts an infinite DBPSK 600bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
       Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
                         NA, SFX_DATARATE_600,
                         NA, NA,
                         NA, NA, NA,
                         NA, NA, 3000);
       Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
       break;
     default :
       status = RF_ERR_API_SEND;
       break;
   }
-  return status;
   /* USER CODE BEGIN RF_API_start_continuous_transmission_2 */
 
   /* USER CODE END RF_API_start_continuous_transmission_2 */
+  return status;
 }
 
 sfx_u8 RF_API_stop_continuous_transmission(void)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* stop continuous Tx */
+
   /* USER CODE BEGIN RF_API_stop_continuous_transmission_1 */
 
   /* USER CODE END RF_API_stop_continuous_transmission_1 */
@@ -355,11 +419,14 @@ sfx_u8 RF_API_stop_continuous_transmission(void)
   /* USER CODE BEGIN RF_API_stop_continuous_transmission_2 */
 
   /* USER CODE END RF_API_stop_continuous_transmission_2 */
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* set rf frequency for Rx or Tx*/
+
   /* USER CODE BEGIN RF_API_change_frequency_1 */
 
   /* USER CODE END RF_API_change_frequency_1 */
@@ -369,16 +436,22 @@ sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
   /* USER CODE BEGIN RF_API_change_frequency_2 */
 
   /* USER CODE END RF_API_change_frequency_2 */
-
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *state)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_s16 res_rssi = 0;
+  sfx_rx_state_enum_t ret_state = DL_TIMEOUT;
   /* USER CODE BEGIN RF_API_wait_frame_1 */
 
   /* USER CODE END RF_API_wait_frame_1 */
-  sfx_error_t status;
+  /* Starts Rx Windows and wait up to the end of frame or end of rx window*/
+  /*  Wait for 2 events :
+   *  event from your RF_IP indicating a buffer is received or
+   *  event from the timer end : event_timer (see mcu_api.c)
+   * If buffer is received, then copy the buffer in frame buffer and update the state parameter*/
 
   APP_LOG(TS_ON, VLEVEL_M, "RX START\n\r");
 
@@ -389,39 +462,41 @@ sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *stat
 
   if (sfx_wait_end_of_rx() == 1)
   {
-#if 0
-    APP_LOG(TS_ON, VLEVEL_M, "RX= %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n\r",
-            RxFrame[0], RxFrame[1], RxFrame[2], RxFrame[3],
-            RxFrame[4], RxFrame[5], RxFrame[6], RxFrame[7],
-            RxFrame[8], RxFrame[9], RxFrame[10], RxFrame[11],
-            RxFrame[12], RxFrame[13], RxFrame[14], RxFrame[15]);
-#endif /* 0 */
     status = SFX_ERR_NONE;
-    *state = DL_PASSED;
+    ret_state = DL_PASSED;
   }
   else
   {
-    *state = DL_TIMEOUT;
+    ret_state = DL_TIMEOUT;
     status = SFX_ERR_NONE;
   }
 
-  *rssi = (sfx_s16) RxRssi;
+  res_rssi = (sfx_s16) RxRssi;
 
   APP_LOG(TS_ON, VLEVEL_M, "RX END\n\r");
-
-  return status;
   /* USER CODE BEGIN RF_API_wait_frame_2 */
 
   /* USER CODE END RF_API_wait_frame_2 */
+  *state = ret_state;
+  *rssi = res_rssi;
+  return status;
 }
 
 sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_state_enum_t *state)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
+  /* Starts Rx Windows to sense if channel is occupied or clear*
+   * If the channel is clear during the minimum carrier sense
+   * value (cs_min), under the limit of the cs_threshold,
+   * the functions returns with SFX_ERR_NONE (transmission
+   * allowed). Otherwise it continues to listen to the channel till the expiration of the
+   * carrier sense maximum window and then updates the state ( with timeout enum ).*/
+
   /* USER CODE BEGIN RF_API_wait_for_clear_channel_1 */
 
   /* USER CODE END RF_API_wait_for_clear_channel_1 */
-  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
-  /**/
+
   RxCarrierSenseInitStatus();
 
   Radio.Rx(0);
@@ -449,19 +524,21 @@ sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_
     APP_LOG(TS_ON, VLEVEL_M, "LBT Channel Busy\n\r");
   }
 
-  *state = cs_state;
   /* USER CODE BEGIN RF_API_wait_for_clear_channel_2 */
 
   /* USER CODE END RF_API_wait_for_clear_channel_2 */
-
-  return SFX_ERR_NONE;
+  *state = cs_state;
+  return status;
 }
 
 sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* return version and size of the version buffer*/
   /* USER CODE BEGIN RF_API_get_version_1 */
 
   /* USER CODE END RF_API_get_version_1 */
+
   *version = (sfx_u8 *)rf_api_version;
   if (size == SFX_NULL)
   {
@@ -471,8 +548,7 @@ sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
   /* USER CODE BEGIN RF_API_get_version_2 */
 
   /* USER CODE END RF_API_get_version_2 */
-
-  return SFX_ERR_NONE;
+  return status;
 }
 
 /* USER CODE BEGIN EF */
@@ -481,29 +557,6 @@ sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
 
 /* Private Functions Definition -----------------------------------------------*/
 
-static sfx_u8 sfx_wait_end_of_rx(void)
-{
-  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
-
-  /* USER CODE END sfx_wait_end_of_rx_1 */
-  RxPacketReceived = 0;
-
-  RxRssi = -150;
-
-  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
-
-  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
-
-  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
-
-  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
-
-  return RxPacketReceived;
-  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
-
-  /* USER CODE END sfx_wait_end_of_rx_2 */
-}
-
 static void OnTxDone(void)
 {
   /* USER CODE BEGIN OnTxDone_1 */
@@ -532,6 +585,7 @@ static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t offse
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M, "OnRxDone\n\r");
+
   /* USER CODE BEGIN OnRxDone_2 */
 
   /* USER CODE END OnRxDone_2 */
@@ -545,6 +599,7 @@ static void OnTxTimeout(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_TxTimeout);
 
   APP_LOG(TS_ON, VLEVEL_M,  "OnTxTimeout\n\r");
+
   /* USER CODE BEGIN OnTxTimeout_2 */
 
   /* USER CODE END OnTxTimeout_2 */
@@ -560,6 +615,7 @@ static void OnRxTimeout(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M,  "OnRxTimeout\n\r");
+
   /* USER CODE BEGIN OnRxTimeout_2 */
 
   /* USER CODE END OnRxTimeout_2 */
@@ -575,11 +631,35 @@ static void OnRxError(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M, "OnRxError\n\r");
+
   /* USER CODE BEGIN OnRxError_2 */
 
   /* USER CODE END OnRxError_2 */
 }
 
+static sfx_u8 sfx_wait_end_of_rx(void)
+{
+  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
+
+  /* USER CODE END sfx_wait_end_of_rx_1 */
+  RxPacketReceived = 0;
+
+  RxRssi = -150;
+
+  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
+
+  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
+
+  return RxPacketReceived;
+  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
+
+  /* USER CODE END sfx_wait_end_of_rx_2 */
+}
+
 bool RF_API_isChannelFree(int16_t rssiThresh, uint32_t maxCarrierSenseTime)
 {
   /* USER CODE BEGIN RF_API_isChannelFree_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/rf_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/rf_api.h
index 87216197..6b1eeb25 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/rf_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/rf_api.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    rf_api.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /*!
 \if SIGFOX PATTERN
 ----------------------------------------------
@@ -32,7 +34,7 @@
    !!!!  DO NOT MODIFY THIS FILE !!!!
 
  ----------------------------------------------
- \endif
+ \endif
  ----------------------------------------------*/
 /*!
  * \file rf_api.h
@@ -197,7 +199,7 @@ sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type);
 
 /*!******************************************************************
   * \fn sfx_u8 RF_API_stop_continuous_transmission (void)
-  * \brief Stop the current continuous transmisssion
+  * \brief Stop the current continuous transmission
   *
   * \retval SFX_ERR_NONE:                                 No error
   * \retval RF_ERR_API_STOP_CONTINUOUS_TRANSMISSION:      Continuous Transmission Stop error
@@ -254,9 +256,9 @@ sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *stat
   *        allowed). Otherwise it continues to listen to the channel till the expiration of the
   *        carrier sense maximum window and then updates the state ( with timeout enum ).
   *
-  * \param[in] none
-  * \param[out] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
-  * \param[out] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
+  *
+  * \param[in] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
+  * \param[in] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
   *                                            i.e : cs_threshold value -80dBm in Japan / -65dBm in Korea
   * \param[out] sfx_rx_state_enum_t state      Indicate the final state of the carrier sense. Value can be DL_TIMEOUT or PASSED
   *                                            as per defined in sigfox_api.h file.
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c
index acacc5c7..28c83de8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h
index 3047bfbd..97cbfbee 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SE_NVM_H__
@@ -67,48 +69,46 @@ typedef enum
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief This function reads data pointed by read_data to non
-  * volatile memory
+  * @brief     This function reads data pointed by read_data to non volatile memory
   *
-  * @param [IN] sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] read_data Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief This function write data pointed by data_to_write to non
-  * volatile memory
+  * @brief     This function write data pointed by data_to_write to non volatile memory
   *
-  * @param [IN] sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] data_to_write Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief Get the active encryption payload flag
-  * @retval encryption_flag 0:Off, 1:On
+  * @brief     Get the active encryption payload flag
+  * @retval    encryption_flag 0:Off, 1:On
   */
 sfx_u8 SE_NVM_get_encrypt_flag(void);
 
 /**
-  * @brief Set the active encryption payload flag
-  * @param [IN]  encryption_flag 0:Off, 1:On
+  * @brief     Set the active encryption payload flag
+  * @param[in] encryption_flag 0:Off, 1:On
   */
 void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag);
 
 /**
-  * @brief Get the active encryption key
-  * @retval  sfx_key_type_t key: public or private
+  * @brief     Get the active encryption key
+  * @return    key public or private
   */
 sfx_key_type_t SE_NVM_get_key_type(void);
 
 /**
-  * @brief Set the active encryption key
-  * @param [IN]  sfx_key_type_t key: public or private
+  * @brief     Set the active encryption key
+  * @param[in] keyType key public or private
   */
-void  SE_NVM_set_key_type(sfx_key_type_t keyType);
+void SE_NVM_set_key_type(sfx_key_type_t keyType);
 
 /* USER CODE BEGIN EFP */
 
@@ -120,4 +120,3 @@ void  SE_NVM_set_key_type(sfx_key_type_t keyType);
 #endif /* __SE_NVM_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c
index 1264874b..2a26019d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_credentials.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -160,10 +162,10 @@ sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *da
   memset(key, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_encrypt(data_to_encrypt,
-                  encrypted_data,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
 #else
   sfx_key_type_t KeyType = SE_NVM_get_key_type();
   switch (KeyType)
@@ -197,10 +199,10 @@ sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_
   sigfox_aes_set_key(session_key, AES_KEY_LEN,  &AesContext);
 
   sigfox_aes_cbc_encrypt(data_to_encrypt,
-                  encrypted_data,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
 #else
   /* encrypt with session key */
   retval = Sgfx_KMS_AES_CBC_encrypt(data_to_encrypt, encrypted_data, (CK_OBJECT_HANDLE)kms_sgfx_session_key_handle, blocks);
@@ -229,10 +231,10 @@ sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks)
   memset(key, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_encrypt(data,
-                  session_key,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         session_key,
+                         blocks,
+                         iv,
+                         &AesContext);
 #else
   /* DestroyKey: to be done before new deriveKey */
   Sgfx_KMS_DeleteDerivedKeys(kms_sgfx_session_key_handle);
@@ -301,10 +303,13 @@ void CREDENTIALS_get_initial_pac(uint8_t *pac)
 
 sfx_bool CREDENTIALS_get_payload_encryption_flag(void)
 {
+  sfx_bool ret = SFX_FALSE;
+
+  ret = (sfx_bool) SE_NVM_get_encrypt_flag();
   /* USER CODE BEGIN CREDENTIALS_get_payload_encryption_flag_1 */
 
   /* USER CODE END CREDENTIALS_get_payload_encryption_flag_1 */
-  return (sfx_bool) SE_NVM_get_encrypt_flag();
+  return ret;
 }
 
 void CREDENTIALS_set_payload_encryption_flag(uint8_t enable)
@@ -381,10 +386,10 @@ static sfx_error_t CREDENTIALS_get_cra(sfx_u8 *decrypted_data, sfx_u8 *data_to_d
   memset(CredentialKey, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_decrypt(data_to_decrypt,
-                  decrypted_data,
-                  sizeof(manuf_device_info_t) / AES_KEY_LEN,
-                  iv,
-                  &AesContext);
+                         decrypted_data,
+                         sizeof(manuf_device_info_t) / AES_KEY_LEN,
+                         iv,
+                         &AesContext);
 #else
   /* default sigfox_data.h provided, sigfox_data.h is not encrypted*/
   memcpy((uint8_t *) decrypted_data, (uint8_t *) data_to_decrypt, sizeof(manuf_device_info_t));
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h
index 5205769f..c7d84239 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_credentials.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_CREDENTIALS_H__
 #define __SGFX_CREDENTIALS_H__
@@ -67,57 +70,59 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief get the cmac library version
-  * @retval return a string containing the library version
+  * @brief      get the cmac library version
+  * @return     string containing the library version
   */
 const char *CREDENTIALS_get_version(void);
 
 /**
-  * @brief get the loaded dev_id
-  * @param[out] return the dev_id in the pointer
+  * @brief      get the loaded dev_id
+  * @param[out] dev_id return the dev_id in the pointer
   */
 void CREDENTIALS_get_dev_id(uint8_t *dev_id);
 
 /**
-  * @brief get the loaded pac
-  * @param[out] return the pac in the pointer
+  * @brief      get the loaded pac
+  * @param[out] pac return the pac in the pointer
   */
 void CREDENTIALS_get_initial_pac(uint8_t *pac);
 
 /**
-  * @brief get the payload_encryption_flag
-  * @retval  the payload_encryption_flag
+  * @brief      get the payload_encryption_flag
+  * @retval     the payload_encryption_flag
   */
 sfx_bool CREDENTIALS_get_payload_encryption_flag(void);
 
 /**
-  * @brief set the payload_encryption_flag
-  * @param[in] enable flag. 0: disable, 1: enable
-  * @retval  none
+  * @brief      set the payload_encryption_flag
+  * @param[in]  enable flag. 0: disable, 1: enable
   */
 void CREDENTIALS_set_payload_encryption_flag(uint8_t enable);
 
 /**
-  * @brief encrypts the data_to_encrypt with aes secrete Key
-  * @param[out] the encrypted data
-  * @param[in] the data_to_encrypt
-  * @param[in] the number of aes blocks
+  * @brief      encrypts the data_to_encrypt with aes secrete Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *data_to_encrypt, uint8_t block_len);
 
 /**
-  * @brief encrypts the data_to_encrypt with aes session Key
-  * @param[out] the encrypted data
-  * @param[in] the data_to_encrypt
-  * @param[in] the number of aes blocks
+  * @brief      encrypts the data_to_encrypt with aes session Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_data, uint8_t *data_to_encrypt,
                                                              uint8_t block_len);
 
 /**
-  * @brief wraps the session Key
-  * @param[in] the arguments used to generate the session Key
-  * @param[in] the number of aes blocks
+  * @brief      wraps the session Key
+  * @param[in]  data the arguments used to generate the session Key
+  * @param[in]  blocks the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/ipcc_if.h
index 49ee1e48..e891e529 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM4_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_ResponseRcv_cb     response callback
   * @param  IPCC_IF_NotificationRcv_cb notification callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/main.h
index 7665e1c1..0831d7f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -61,38 +60,18 @@ void Error_Handler(void);
 /* Private defines -----------------------------------------------------------*/
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
-#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
index 75f1386d..2fffde50 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 /*#define HAL_SUBGHZ_MODULE_ENABLED   */
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/sys_app.h
index 6252f990..024b3713 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -35,6 +37,10 @@ extern "C" {
 /* USER CODE END Includes */
 
 /* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -70,12 +76,14 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
 void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/sys_conf.h
index 0edc96eb..a2ed64fe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief CM4 Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/usart.h
index c196d42b..29cb339e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h
index f26ca77e..31fa7a54 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h
index 258beb96..c734b02c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   CFG_LPM_SGFX_MN_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
@@ -73,6 +77,9 @@ typedef enum
 typedef enum
 {
   /* CM4 */
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t_0 */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t_0 */
   CFG_SEQ_Task_MbSystemNotifRcv,
   CFG_SEQ_Task_MbSigfoxNotifRcv,
   CFG_SEQ_Task_MbRadioNotifRcv,
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc.c
index ad6e2e7c..fdcbc616 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c
index abfae080..672a366f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,21 +82,21 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* IPCC EXTI (AIEC) line for CPU1  */
   LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
   IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/main.c
index f114602d..d147df2a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -158,6 +159,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_it.c
index 78324eb9..877470fb 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_it.c
@@ -75,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -186,7 +188,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/sys_app.c
index fa1df999..7e6b6c35 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,16 +27,19 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
+#include "sgfx_eeprom_if.h"
 #include "msg_id.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
+#include "mbmuxif_radio.h"
 #include "mbmuxif_sigfox.h"
 #include "sgfx_app.h"
-#include "mbmuxif_radio.h"
-/*#include "mbmuxif_kms.h"*/
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
 
@@ -65,23 +70,21 @@
 /* Private variables ---------------------------------------------------------*/
 uint32_t InstanceIndex;
 uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_Init(void);
-
 /**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
   */
-static void Gpio_PreInit(void);
+static void MBMUXIF_Init(void);
+
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -89,15 +92,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
+
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -107,10 +107,8 @@ void SystemApp_Init(void)
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
 
-  Gpio_PreInit();
-
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -118,6 +116,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -136,16 +135,19 @@ void SystemApp_Init(void)
   /*Initialize MBMux (to be done after LPM because MBMux uses the sequencer) */
   MBMUXIF_Init();
 
+  /*Update verbose LEVEL with EEPROM content*/
+  UTIL_ADV_TRACE_SetVerboseLevel(E2P_Read_VerboseLevel());
+
   UTIL_TIMER_Init();
 
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief  Process System Notifications
-  */
 void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Sys_Notif_1 */
@@ -157,14 +159,24 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 
   switch (notif_ack_id)
   {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
     case SYS_OTHER_MSG_ID:
       APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
       /* prepare ack buffer*/
       ComObj->ParamCnt = 0;
-      ComObj->ReturnVal = 7; /* dummy value for test */
-      break;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
 
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
     default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
       break;
   }
 
@@ -176,16 +188,16 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Notif_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -194,8 +206,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -208,51 +218,46 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Test: Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialises other features
-  * @param none
-  * @retval none
-  */
 static void MBMUXIF_Init(void)
 {
   /* USER CODE BEGIN MBMUXIF_Init_1 */
 
   /* USER CODE END MBMUXIF_Init_1 */
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
   int8_t init_status;
 
-  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
 
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   /* start CM0PLUS */
-  /* Note: when debugging in order to connect with the deggugger CPUU2 shall be start using workspace CM4 starts CM0PLUS */
-  /* On the other hand is up to the devepoper make sure the CM0PLUS debugger is run after CM4 debugger */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
   HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-  /* CM4 has started and it has reset the mailbox and initialised the MbMux; */
-  /* once CM0PLUS is also initialised it send a SYS notification */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialisation done: Wait for CM0PLUS \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
 
-  MBMUXIF_WaitCm0MbmuxIsInitialised();
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
-  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supprted_features_list);
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
 
-  APP_LOG(TS_ON, VLEVEL_H, "System Initialisation CM4-CM0PLUS completed \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
 
   init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
   if (init_status < 0)
@@ -301,45 +306,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -380,13 +346,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -401,13 +365,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -418,13 +380,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -439,4 +399,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/timer_if.c
index e04bdfc6..f02a544d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/timer_if.c
@@ -21,8 +21,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -163,9 +163,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   /** Configure the Instance */
   hrtc.Instance = RTC;
   HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
@@ -245,64 +245,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -325,6 +331,7 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -334,16 +341,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -370,24 +377,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart.c
index 343006bc..476eb1f2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_lpuart1_tx;
 void MX_LPUART1_UART_Init(void)
 {
 
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
-  hlpuart1.Init.BaudRate = LPUART_BAUDRATE;
+  hlpuart1.Init.BaudRate = 9600;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
   hlpuart1.Init.StopBits = UART_STOPBITS_1;
   hlpuart1.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_LPUART1_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart_if.c
index cfa581cd..36217a2f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&hlpuart1);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.c
index 76152897..8328a537 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -58,11 +61,44 @@ static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -70,11 +106,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -107,11 +138,6 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief The application informs MBMUX about the CM0PLUS supported feature list
-  * @param p_CM0PLUS_FeatureList  pointer to the list of CM0PLUS features
-  * @retval  none
-  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
 {
   /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
@@ -123,15 +149,6 @@ void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
   /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval   channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
 {
   int8_t check_if_feature_provided_by_cm0plus = 0;
@@ -203,13 +220,6 @@ int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -235,9 +245,9 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
     }
     else
     {
-      /* Make sure to clear pending IRQ Notification before unregistering the callback */
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
       /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
-      /* if the mask is removed by anyone, the unwhished IRQ is generated if SR isn't cleaned */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
       IPCC_IF_AcknowledgeSnd(mb_ch);
 
       p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
@@ -254,12 +264,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the MailBox com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -286,11 +290,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Cmd to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_CommandSnd_1 */
@@ -309,11 +308,6 @@ int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_CommandSnd_Last */
 }
 
-/**
-  * @brief Send ack to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
@@ -333,12 +327,6 @@ uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Check if the FEATURE is in the CM0 table and return it's position
-  * @param e_featID  identifier of the feature
-  * @retval 0 not present, 1 present
-  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
 {
   int8_t ret = 0;
@@ -370,11 +358,6 @@ static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_feat
   return ret;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
@@ -390,11 +373,6 @@ static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
@@ -410,11 +388,6 @@ static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Find the first channel not yet associated to a feature (available)
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means no channel available
-  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
@@ -475,12 +448,6 @@ static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
   /* USER CODE END MBMUX_FindChStillUnregistered_Last */
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -492,17 +459,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.h
index fd31da65..a15773f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM4_H__
@@ -52,23 +54,60 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
-                             void (*MsgCm4Cb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
-
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 1b866fbe..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmuxif_sys.h"
-#include "stm32_mem.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aKmsCmdRespBuff[MAX_PARAM_OF_KMS_CMD_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers KMS feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeature(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsRespRcvCb, aKmsCmdRespBuff, sizeof(aKmsCmdRespBuff));
-  if (ret >= 0)
-  {
-    /* Note: Kms uses only NOTIF_ACK channel, the SEQ_TASK only on CM0PLUS */
-
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_KMS_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Kms feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void)
-{
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP);
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  if (com_param_ptr == NULL)
-  {
-    Error_Handler(); /* ErrorHandler() : feature isn't registered */
-  }
-
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-  return com_param_ptr;
-}
-
-/**
-  * @brief Sends a Kms-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendCmd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_1 */
-  if (MBMUX_CommandSnd(FEAT_INFO_KMS_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS response callbacks: set event to release waiting task
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.h
deleted file mode 100644
index cfc715c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM4_H__
-#define __MBMUXIF_KMS_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void);
-void MBMUXIF_KmsSendCmd(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c
index 26d69db0..81fc561a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -55,7 +57,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *RadioComObj;
 
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -63,8 +72,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RA
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
 static void MBMUXIF_TaskRadioNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -72,16 +94,6 @@ static void MBMUXIF_TaskRadioNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers RADIO feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
@@ -125,11 +137,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
@@ -138,7 +145,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
@@ -146,11 +153,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
@@ -169,11 +171,6 @@ void MBMUXIF_RadioSendCmd(void)
   /* USER CODE END MBMUXIF_RadioSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Radio-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
@@ -193,11 +190,6 @@ void MBMUXIF_RadioSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO response callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
@@ -209,11 +201,6 @@ static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
@@ -226,11 +213,6 @@ static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the notification
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h
index 1f4c2454..3d565fcd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM4_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_RadioSendAck(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.c
index 38508bbe..c4b71d29 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sigfox.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle SigfoxWAN via MBMUX
+  * @brief   allows CM4 application to register and handle SigfoxWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -62,8 +64,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSigfoxNotifAckBuff[MAX_PARAM_OF_S
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  Sigfox response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
 static void MBMUXIF_IsrSigfoxRespRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
 static void MBMUXIF_IsrSigfoxNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox task to process the notification
+  */
 static void MBMUXIF_TaskSigfoxNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -71,12 +86,6 @@ static void MBMUXIF_TaskSigfoxNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS; -3: callback error on CM0PLUS
-  */
 int8_t MBMUXIF_SigfoxInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_system_info;
@@ -124,11 +133,6 @@ int8_t MBMUXIF_SigfoxInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Sigfox feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureCmdComPtr_1 */
@@ -137,7 +141,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_SIGFOX_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureCmdComPtr_Last */
@@ -145,11 +149,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetSigfoxFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief  Sends a Sigfox-Cmd via Ipcc and Wait for the response
-  * @param  none
-  * @retval none
-  */
 void MBMUXIF_SigfoxSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendCmd_1 */
@@ -168,11 +167,6 @@ void MBMUXIF_SigfoxSendCmd(void)
   /* USER CODE END MBMUXIF_SigfoxSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Sigfox-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SigfoxSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendAck_1 */
@@ -192,11 +186,6 @@ void MBMUXIF_SigfoxSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  Sigfox response callbacks: set event to release waiting task
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSigfoxRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSigfoxRespRcvCb_1 */
@@ -208,11 +197,6 @@ static void MBMUXIF_IsrSigfoxRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSigfoxRespRcvCb_Last */
 }
 
-/**
-  * @brief  Sigfox notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSigfoxNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSigfoxNotifRcvCb_1 */
@@ -225,11 +209,6 @@ static void MBMUXIF_IsrSigfoxNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSigfoxNotifRcvCb_Last */
 }
 
-/**
-  * @brief  Sigfox task to process the notification
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSigfoxNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSigfoxNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.h
index b23941bb..3834fe17 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sigfox.h
   * @author  MCD Application Team
-  * @brief   API provided to CM0 appli to register and handle Sigfox to MBMUX
+  * @brief   API provided to CM0 application to register and handle Sigfox to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SIGFOX_CM4_H__
@@ -52,9 +54,25 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS; -3: callback error on CM0PLUS
+  */
 int8_t MBMUXIF_SigfoxInit(void);
+/**
+  * @brief   gives back the pointer to the com buffer associated to Sigfox feature Cmd
+  * @return  pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Sigfox-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_SigfoxSendCmd(void);
+
+/**
+  * @brief   Sends a Sigfox-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_SigfoxSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c
index c937c14c..1884bb44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -53,10 +55,10 @@
 
 /* Private variables ---------------------------------------------------------*/
 static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
-static __IO uint8_t AllowSeqencerForSysCmd = 0;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
 static __IO uint8_t MbSystemRespRcvFlag;
 
-UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(4) ;
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
 
 MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
 MBMUX_ComParam_t *SystemComObj;
@@ -64,23 +66,54 @@ MBMUX_ComParam_t *SystemComObj;
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
 static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -88,47 +121,54 @@ static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
 
   /* USER CODE END MBMUXIF_SystemInit_1 */
 
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
   /* Get the Dual boot configuration status */
   HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
 
   if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
   {
-    APP_PPRINTF("\r\n WARNING: There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n",  (uint32_t) pMb_RefTable);
-    APP_PPRINTF(" and the address calculated according to the IPCCDBA option byte: 0x%X \r\n", OptionsBytesStruct.IPCCdataBufAddr);
-    APP_PPRINTF(" The execution enters now in a while(1){}  \r\n");
-    APP_PPRINTF(" please check the CM4\\MbMux\\mbmuxif_sys.c or update the scatter file \r\n\r\n");
-
-    /* USER CODE BEGIN MBMUXIF_SystemInit_Prevent_OB_Programming */
-      /* If you are sure you need to reprogram the IPCCDBA set #if to 0 (to avoid while(1){}) */
-      /* Please first check the  CM4 scatter file.*/
-      /* Make sure that the MAPPING_TABLE is placed in SRAM2 (memory with retention) */
-      /* Examples of scatter files available in the LoraWAN and Sigfox DualCore Applications pack*/
-      /* */
-      /* After HAL_FLASH_OB_Launch you will have to unplug and plug the board from power after this operation.*/
-      /* Additionally possible Issue under investigation, i.e.: */
-      /* In some cases happen that unplugging the chip power is not sufficient */
-      /* if so you need to reboot from RAM putting the BOOT0 pin to 3v3 */
-      /* attach with Cube Programmer and full erase the chip memory. */
-      /* */
-      /* PS: of course if you are attached with the debugger, it will not respond anymore after HAL_FLASH_OB_Launch*/
-#if 1
-    /* USER CODE END MBMUXIF_SystemInit_Prevent_OB_Programming */
-    while(1){}
-#else
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
 
     /* write FLASH->IPCCBR option byte */
     /* Unlock the Flash to enable the flash control register access *************/
@@ -140,7 +180,7 @@ int8_t MBMUXIF_SystemInit(void)
     HAL_FLASH_OB_Unlock();
 
     /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
-    OptionsBytesStruct.OptionType  = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
     OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
 
     if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
@@ -170,10 +210,8 @@ int8_t MBMUXIF_SystemInit(void)
     (void) HAL_FLASH_OB_Lock();
     /* Lock the Flash to disable the flash control register access  *********/
     (void) HAL_FLASH_Lock();
-#endif
   }
-  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
-
+  /* Init MailBoxMultiplexer */
   MBMUX_Init(pMb_RefTable);
 
   ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
@@ -186,16 +224,13 @@ int8_t MBMUXIF_SystemInit(void)
     ret = 0;
     UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
   }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
 
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
   /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
   /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-#else
-#warning "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_ON */
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
 
@@ -203,14 +238,9 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
-  int8_t ret=0;
+  int8_t ret = 0;
 
   /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
 
@@ -259,14 +289,6 @@ int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
   return ret;
 }
 
-/**
-  * @brief Set synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
 {
   pMb_RefTable->SynchronizeCpusAtBoot = flag;
@@ -275,26 +297,16 @@ void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
   /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
 }
 
-/**
-  * @brief gives green light to Cm0 to Initialised MBMUX on its side
-  * @param none
-  * @retval  none
-  */
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void)
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
 {
   while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
   {
   }
-  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
 
-  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
@@ -303,30 +315,19 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPr
   /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
 }
 
-/**
-  * @brief To allow SystemCmd to use the sequencer (hence entering in low power)
-  * @note  For compatib with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The applic can call this API at the end of the Init
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void)
 {
-  AllowSeqencerForSysCmd = 1;
+  AllowSequencerForSysCmd = 1;
   /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
 
   /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
 }
 
-/**
-  * @brief Sends a System-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
@@ -339,7 +340,7 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
     MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
     if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
     {
-      if (AllowSeqencerForSysCmd)
+      if (AllowSequencerForSysCmd)
       {
         UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
       }
@@ -356,20 +357,15 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
 
-  /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
 
   /* USER CODE END MBMUXIF_SystemSendCmd_Last */
 }
 
-/**
-  * @brief Sends a System-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
@@ -384,17 +380,11 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendAck_Last */
 }
 
-/* USER CODE BEGIN ExpoF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExpoF */
+/* USER CODE END EF */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief   Gets the pointer to CM0PLUS capabilities info table
-  * @param   none
-  * @retval  pointer to CM0PLUS capabilities info table
-  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
 {
   MBMUX_ComParam_t *com_obj;
@@ -421,14 +411,9 @@ FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
   return (FEAT_INFO_List_t *) ret;   /* need to verify */
 }
 
-/**
-  * @brief returns the pointer to the Capability Info table of a given feature
-  * @param e_featID ID of the feature from which retrieve the ptr
-  * @retval  LoRaMacInfoTable pointer
-  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
 {
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list = NULL;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
   FEAT_INFO_Param_t  *p_feature = NULL;
   uint8_t i;
   uint8_t cm0plus_nr_of_supported_features;
@@ -438,15 +423,15 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
 
   /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
 
-  if (p_cm0plus_supprted_features_list != NULL)
+  if (p_cm0plus_supported_features_list != NULL)
   {
-    cm0plus_nr_of_supported_features = p_cm0plus_supprted_features_list->Feat_Info_Cnt;
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
 
     for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
     {
-      p_feature = i + p_cm0plus_supprted_features_list->Feat_Info_TableAddress;
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
       if (p_feature->Feat_Info_Feature_Id == e_featID)
       {
         found = 1;
@@ -466,12 +451,6 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
   return  p_feature;
 }
 
-/**
-  * @brief Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @retval   0 ok, else error code
-  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 {
   MBMUX_ComParam_t *com_obj;
@@ -506,11 +485,6 @@ int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM response callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
@@ -519,7 +493,7 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 
   /* During "SystemInit sequence" Flag is used instead of Sequencer */
   MbSystemRespRcvFlag = 1;
-  if (AllowSeqencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
   {
     UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
   }
@@ -528,11 +502,6 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
@@ -545,11 +514,6 @@ static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM task to process the notification
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
@@ -561,11 +525,6 @@ static void MBMUXIF_TaskSystemNotifRcv(void)
   /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
@@ -573,11 +532,6 @@ static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
@@ -591,11 +545,6 @@ static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
@@ -603,11 +552,6 @@ static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h
index d6f9cc5c..61f37d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM4_H__
@@ -55,13 +57,56 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -69,8 +114,24 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c
index b42f9402..c91551a5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to receive by CM0 TRACE via MBMUX
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -46,25 +48,26 @@
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
-
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
 /* USER CODE BEGIN PM */
 
 /* USER CODE END PM */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_TraceInit(void)
 {
   int8_t ret;
@@ -90,23 +93,18 @@ int8_t MBMUXIF_TraceInit(void)
   return ret;
 }
 
-/**
-  * @brief Sends a Trace-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendAck(void)
 {
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
 
-/* USER CODE END MBMUXIF_TraceSendAck_1 */
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
   if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
   {
     Error_Handler();
   }
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
 
-/* USER CODE END MBMUXIF_TraceSendAck_Last */
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
 }
 
 /* USER CODE BEGIN EFD */
@@ -114,16 +112,11 @@ void MBMUXIF_TraceSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 {
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
   MBMUX_ComParam_t *TraceComObj;
   uint32_t  notif_ack_id;
   uint8_t *buffer;
@@ -151,9 +144,9 @@ static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 
   /* Send ack */
   MBMUXIF_TraceSendAck();
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
 }
 
 /* USER CODE BEGIN PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h
index 7a8d3fa7..f98a156d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle TRACE via MBMUX
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM4_H__
@@ -52,7 +54,15 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c
index 1326f87b..fd0e305e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "radio_mbwrapper.h"
@@ -72,38 +75,38 @@ static void RadioIrqProcess(void);
 /*!
  * \brief Initializes the radio
  *
- * \param [IN] events Structure containing the driver callback functions
+ * \param[in] events Structure containing the driver callback functions
  */
 static void RadioInit(RadioEvents_t *events);
 
 /*!
  * Return current radio status
  *
- * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
  */
 static RadioState_t RadioGetStatus(void);
 
 /*!
  * \brief Configures the radio with the given modem
  *
- * \param [IN] modem Modem to be used [0: FSK, 1: LoRa]
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
  */
 static void RadioSetModem(RadioModems_t modem);
 
 /*!
  * \brief Sets the channel frequency
  *
- * \param [IN] freq         Channel RF frequency
+ * \param[in] freq Channel RF frequency
  */
 static void RadioSetChannel(uint32_t freq);
 
 /*!
   * \brief Checks if the channel is free for the given time
   *
-  * \param [IN] freq                Channel RF frequency in Hertz
-  * \param [IN] rxBandwidth         Rx bandwidth in Hertz
-  * \param [IN] rssiThresh          RSSI threshold in dBm
-  * \param [IN] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
   *
   * \retval isFree         [true: Channel is free, false: Channel is not free]
   */
@@ -125,40 +128,40 @@ static uint32_t RadioRandom(void);
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: N/A ( set to 0 )
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [false: single mode, true: continuous mode]
  */
 static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
@@ -172,37 +175,37 @@ static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] fdev         Sets the frequency deviation (FSK only)
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
  *                          FSK : [Hz]
  *                          LoRa: 0
- * \param [IN] bandwidth    Sets the bandwidth (LoRa only)
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
  *                          FSK : 0
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the preamble length
+ * \param[in] preambleLen  Sets the preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] crcOn        Enables disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] timeout      Transmission timeout [ms]
  */
 static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
                              uint32_t bandwidth, uint32_t datarate,
@@ -213,7 +216,7 @@ static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
 /*!
  * \brief Checks if the given RF frequency is supported by the hardware
  *
- * \param [IN] frequency RF frequency to be checked
+ * \param[in] frequency RF frequency to be checked
  * \retval isSupported [true: supported, false: unsupported]
  */
 static bool RadioCheckRfFrequency(uint32_t frequency);
@@ -221,26 +224,26 @@ static bool RadioCheckRfFrequency(uint32_t frequency);
 /*!
  * \brief Computes the packet time on air in ms for the given payload
  *
- * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] spreadingFactor  Sets the Spreading Factor
+ * \param[in] spreadingFactor  Sets the Spreading Factor
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
  *
  * \retval airTime        Computed airTime (ms) for the given packet payload length
  */
@@ -253,8 +256,8 @@ static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
  * \brief Sends the buffer of size. Prepares the packet to be sent and sets
  *        the radio in transmission
  *
- * \param [IN]: buffer     Buffer pointer
- * \param [IN]: size       Buffer size
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
  */
 static void RadioSend(uint8_t *buffer, uint8_t size);
 
@@ -270,7 +273,7 @@ static void RadioStandby(void);
 
 /*!
  * \brief Sets the radio in reception mode for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRx(uint32_t timeout);
@@ -283,15 +286,17 @@ static void RadioStartCad(void);
 /*!
  * \brief Sets the radio in continuous wave transmission mode
  *
- * \param [IN]: freq       Channel RF frequency
- * \param [IN]: power      Sets the output power [dBm]
- * \param [IN]: time       Transmission mode timeout [s]
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
  */
 static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
 
 /*!
  * \brief Reads the current RSSI value
  *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
  * \retval rssiValue Current RSSI value in [dBm]
  */
 static int16_t RadioRssi(RadioModems_t modem);
@@ -299,15 +304,15 @@ static int16_t RadioRssi(RadioModems_t modem);
 /*!
  * \brief Writes the radio register at the specified address
  *
- * \param [IN]: addr Register address
- * \param [IN]: data New register value
+ * \param[in] addr Register address
+ * \param[in] data New register value
  */
 static void RadioWrite(uint16_t addr, uint8_t data);
 
 /*!
  * \brief Reads the radio register at the specified address
  *
- * \param [IN]: addr Register address
+ * \param[in] addr Register address
  * \retval data Register value
  */
 static uint8_t RadioRead(uint16_t addr);
@@ -315,26 +320,26 @@ static uint8_t RadioRead(uint16_t addr);
 /*!
  * \brief Writes multiple radio registers starting at address
  *
- * \param [IN] addr   First Radio register address
- * \param [IN] buffer Buffer containing the new register's values
- * \param [IN] size   Number of registers to be written
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
  */
 static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Reads multiple radio registers starting at address
  *
- * \param [IN] addr First Radio register address
- * \param [OUT] buffer Buffer where to copy the registers data
- * \param [IN] size Number of registers to be read
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
  */
 static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Sets the maximum payload length.
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] max        Maximum payload length in bytes
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
  */
 static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
 
@@ -343,7 +348,7 @@ static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
  *
  * \remark Applies to LoRa modem only
  *
- * \param [IN] enable if true, it enables a public network
+ * \param[in] enable if true, it enables a public network
  */
 static void RadioSetPublicNetwork(bool enable);
 
@@ -356,7 +361,7 @@ static uint32_t RadioGetWakeUpTime(void);
 
 /*!
  * \brief Sets the radio in reception mode with Max LNA gain for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRxBoosted(uint32_t timeout);
@@ -364,51 +369,49 @@ static void RadioRxBoosted(uint32_t timeout);
 /*!
  * \brief Sets the Rx duty cycle management parameters
  *
- * \param [in]  rxTime        Structure describing reception timeout value
- * \param [in]  sleepTime     Structure describing sleep timeout value
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
  */
 static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
 
 /*!
  * \brief Set Tx PRBS modulated wave
- * \retval none
  */
 static void RadioTxPrbs(void);
 
 /*!
  * \brief Set Tx continuous wave
- * \param [in]  power  Tx power level [0..15]
- * \retval none
+ * \param[in]  power  Tx power level [0..15]
  */
 static void RadioTxCw(int8_t power);
 
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [0: single mode, otherwise continuous mode]
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
  * \return 0 when no parameters error, -1 otherwise
  */
-static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t* config,
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
                                        uint32_t rxContinuous, uint32_t symbTimeout);
 
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
                             bpsk field to be used if modem =GENERIC_BPSK
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
  * \return 0 when no parameters error, -1 otherwise
  */
 static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
@@ -461,11 +464,6 @@ const struct Radio_s Radio =
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief This function processes the radio events callbacks  from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Radio_Notif_1 */
@@ -486,7 +484,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -500,7 +498,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -564,7 +562,7 @@ static void RadioInit(RadioEvents_t *events)
 
   if (events == NULL)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   radioevents_wrap.TxDone = events->TxDone;
@@ -590,7 +588,7 @@ static void RadioInit(RadioEvents_t *events)
 /*!
   * Return current radio status
   *
-  * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
   */
 static RadioState_t RadioGetStatus(void)
 {
@@ -999,7 +997,7 @@ static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
   uint16_t i = 0;
 
   com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_CONTINOUS_WAVE_ID;
+  com_obj->MsgId = RADIO_SET_TX_CONTINUOUS_WAVE_ID;
   com_buffer = com_obj->ParamBuf;
   com_buffer[i++] = (uint32_t) freq;
   com_buffer[i++] = (uint32_t) power;
@@ -1424,10 +1422,4 @@ static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t
 
 /* USER CODE END PrFD */
 
-/**
-  * @}
-  *
-  */
-
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h
index f73a1283..e7eebe2c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.c
index e7fe6308..df4d17bc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -54,6 +56,14 @@
 #endif /* MAX */
 #define NB_ELEMENTS_MAX 3
 
+#define SGFX_OPEN_SIZE       (sizeof(sfx_rc_t))
+#define SGFX_SEND_SIZE       ((SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8)) + (SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8)))
+#define SGFX_SET_CONFIG_SIZE (NB_ELEMENTS_MAX * sizeof(sfx_u32))
+#define SGFX_START_TX_SIZE   (sizeof(sfx_modulation_type_t))
+#define SGFX_GET_VER_SIZE    (sizeof(sfx_u32) + sizeof(sfx_u8))
+#define SGFX_GET_PAC_SIZE    (PAC_LENGTH * sizeof(sfx_u8))
+#define SGFX_MBWRAP_SHBUF_SIZE MAX(MAX(MAX(SGFX_OPEN_SIZE, SGFX_SEND_SIZE), MAX(SGFX_SET_CONFIG_SIZE, SGFX_START_TX_SIZE)), MAX(SGFX_GET_VER_SIZE, SGFX_GET_PAC_SIZE))
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -64,7 +74,10 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aSigfoxMbWrapShareBuffer[sizeof(sfx_rc_t)];
+/**
+  * @brief Sigfox buffer to exchange data between from CM4 to CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aSigfoxMbWrapShareBuffer[SGFX_MBWRAP_SHBUF_SIZE];
 
 static sfx_u8(* app_cb)(sfx_u8 rc_bit_mask, sfx_s16 rssi);
 
@@ -80,16 +93,6 @@ static SigfoxCallback_t *callback_wrap;
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/*!
-  * \brief   Open Sigfox API
-  *
-  *
-  * \param   [IN] sfx_rc_t - Radio configuration structure
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_OPEN_xx
-  */
 sfx_error_t SIGFOX_API_open(sfx_rc_t *rc)
 {
   /* USER CODE BEGIN SIGFOX_API_open_1 */
@@ -100,6 +103,11 @@ sfx_error_t SIGFOX_API_open(sfx_rc_t *rc)
   uint16_t i = 0;
   uint32_t ret;
 
+  if (rc == NULL)
+  {
+    return SFX_ERR_API_OPEN;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) rc, sizeof(sfx_rc_t));
 
@@ -122,13 +130,6 @@ sfx_error_t SIGFOX_API_open(sfx_rc_t *rc)
   /* USER CODE END SIGFOX_API_open_2 */
 }
 
-/*!
-  * \brief   Close Sigfox API
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_CLOSE_xx
-  */
 sfx_error_t SIGFOX_API_close(void)
 {
   /* USER CODE BEGIN SIGFOX_API_close_1 */
@@ -150,14 +151,6 @@ sfx_error_t SIGFOX_API_close(void)
   /* USER CODE END SIGFOX_API_close_2 */
 }
 
-/*!
-  * \brief Send a standard SIGFOX frame with customer payload
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_SEND_FRAME_xx
-  *          \ref SFX_ERR_INT_xx
-  */
 sfx_error_t SIGFOX_API_send_frame(sfx_u8 *customer_data, sfx_u8 customer_data_length,
                                   sfx_u8 *customer_response, sfx_u8 tx_mode,
                                   sfx_bool initiate_downlink_flag)
@@ -170,6 +163,15 @@ sfx_error_t SIGFOX_API_send_frame(sfx_u8 *customer_data, sfx_u8 customer_data_le
   uint16_t i = 0;
   uint32_t ret;
 
+  if (customer_data == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_DATA_PTR;
+  }
+  else if (customer_response == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_RESPONSE_PTR;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) customer_data,
                  SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8));
@@ -204,18 +206,6 @@ sfx_error_t SIGFOX_API_send_frame(sfx_u8 *customer_data, sfx_u8 customer_data_le
   /* USER CODE END SIGFOX_API_send_frame_2 */
 }
 
-/*!
-  * \brief Send a standard SIGFOX frame with customer payload
-  *
-  * \param[in] sfx_bool bit_value                Bit state (SFX_TRUE or SFX_FALSE)
-  * \param[out] sfx_u8 *customer_response        Returned 8 Bytes data in case of downlink
-  * \param[in] sfx_u8 tx_mode                    tx_mode shall be set to 2.
-  * \param[in] sfx_bool initiate_downlink_flag   Flag to initiate a downlink response
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_SEND_BIT_xx
-  *          \ref SFX_ERR_INT_xx
-  */
 sfx_error_t SIGFOX_API_send_bit(sfx_bool bit_value,
                                 sfx_u8 *customer_response,
                                 sfx_u8 tx_mode,
@@ -229,6 +219,11 @@ sfx_error_t SIGFOX_API_send_bit(sfx_bool bit_value,
   uint16_t i = 0;
   uint32_t ret;
 
+  if (customer_response == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_RESPONSE_PTR;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *)aSigfoxMbWrapShareBuffer, (uint8_t *)customer_response,
                  SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8));
@@ -257,16 +252,6 @@ sfx_error_t SIGFOX_API_send_bit(sfx_bool bit_value,
   /* USER CODE END SIGFOX_API_send_bit_2 */
 }
 
-/*!
-  * \brief   Send an out of band SIGFOX frame
-  *
-  *
-  * \param   [IN] sfx_oob_enum_t oob_type  - Type of the OOB frame to send
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_INT_xx
-  */
 sfx_error_t SIGFOX_API_send_outofband(sfx_oob_enum_t oob_type)
 {
   /* USER CODE BEGIN SIGFOX_API_send_outofband_1 */
@@ -293,16 +278,6 @@ sfx_error_t SIGFOX_API_send_outofband(sfx_oob_enum_t oob_type)
   /* USER CODE END SIGFOX_API_send_outofband_2 */
 }
 
-/*!
-  * \brief   configure specific variables for standard
-  *          It is mandatory to call this function after SIGFOX_API_open() for FH and LBT
-  *
-  * \param   [IN] config_words          -  Meaning depends on the standard
-  * \param   [IN] sfx_bool timer_enable -  Enable timer feature for FH
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_SET_CONFIG_xx
-  */
 sfx_error_t SIGFOX_API_set_std_config(sfx_u32 config_words[NB_ELEMENTS_MAX],
                                       sfx_bool timer_enable)
 {
@@ -338,15 +313,6 @@ sfx_error_t SIGFOX_API_set_std_config(sfx_u32 config_words[NB_ELEMENTS_MAX],
   /* USER CODE END SIGFOX_API_set_std_config_2 */
 }
 
-/*!
-  * \brief   Executes a continuous wave or modulation depending on the parameter type
-  *
-  * \param   [IN] frequency          -  Frequency at which the signal has to be generated
-  * \param   [IN] sfx_modulation_type_t type   -  Type of modulation to use in continuous mode
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_START_CONTINUOUS_TRANSMISSION_xx
-  */
 sfx_error_t SIGFOX_API_start_continuous_transmission(sfx_u32 frequency, sfx_modulation_type_t type)
 {
   /* USER CODE BEGIN SIGFOX_API_start_continuous_transmission_1 */
@@ -381,13 +347,6 @@ sfx_error_t SIGFOX_API_start_continuous_transmission(sfx_u32 frequency, sfx_modu
   /* USER CODE END SIGFOX_API_start_continuous_transmission_2 */
 }
 
-/*!
-  * \brief   Stop the current continuous transmission
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_STOP_CONTINUOUS_TRANSMISSION_xx
-  */
 sfx_error_t SIGFOX_API_stop_continuous_transmission(void)
 {
   /* USER CODE BEGIN SIGFOX_API_stop_continuous_transmission_1 */
@@ -409,16 +368,6 @@ sfx_error_t SIGFOX_API_stop_continuous_transmission(void)
   /* USER CODE END SIGFOX_API_stop_continuous_transmission_2 */
 }
 
-/*!
-  * \brief   Returns current SIGFOX library version, or RF Version, or MCU version
-  *
-  * \param[out] sfx_u8 **version                 Pointer to Byte array (ASCII format) containing library version
-  * \param[out] sfx_u8 *size                     Size of the byte array pointed by *version
-  * \param[in]  sfx_version_type_t type          Type of the version ( MCU, RF, ... )
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_GET_VERSION_xx
-  */
 sfx_error_t SIGFOX_API_get_version(sfx_u8 **version, sfx_u8 *size, sfx_version_type_t type)
 {
   /* USER CODE BEGIN SIGFOX_API_get_version_1 */
@@ -429,6 +378,11 @@ sfx_error_t SIGFOX_API_get_version(sfx_u8 **version, sfx_u8 *size, sfx_version_t
   uint16_t i = 0;
   uint32_t ret;
 
+  if (version == NULL)
+  {
+    return SFX_ERR_API_GET_VERSION;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) version, sizeof(sfx_u32));
   UTIL_MEM_cpy_8((uint8_t *)(aSigfoxMbWrapShareBuffer + sizeof(sfx_u32)), (uint8_t *) size, sizeof(sfx_u8));
@@ -455,16 +409,6 @@ sfx_error_t SIGFOX_API_get_version(sfx_u8 **version, sfx_u8 *size, sfx_version_t
   /* USER CODE END SIGFOX_API_get_version_2 */
 }
 
-/*!
-  * \brief   copies the ID of the device to the pointer given in parameter
-  *
-  *
-  * \param[out] sfx_u8* dev_id    Pointer where to write the device ID
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_GET_DEVICE_ID_xx
-  */
 sfx_error_t SIGFOX_API_get_device_id(sfx_u8 *dev_id)
 {
   /* USER CODE BEGIN SIGFOX_API_get_device_id_1 */
@@ -475,6 +419,11 @@ sfx_error_t SIGFOX_API_get_device_id(sfx_u8 *dev_id)
   uint16_t i = 0;
   uint32_t ret;
 
+  if (dev_id == NULL)
+  {
+    return SFX_ERR_INT_GET_DEVICE_ID;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) dev_id, sizeof(sfx_u32));
 
@@ -497,16 +446,6 @@ sfx_error_t SIGFOX_API_get_device_id(sfx_u8 *dev_id)
   /* USER CODE END SIGFOX_API_get_device_id_2 */
 }
 
-/*!
-  * \brief   Get the value of the PAC stored in the device
-  *
-  *
-  * \param[out] sfx_u8* initial_pac              Pointer to initial PAC
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_GET_DEVICE_ID_xx
-  */
 sfx_error_t SIGFOX_API_get_initial_pac(sfx_u8 *initial_pac)
 {
   /* USER CODE BEGIN SIGFOX_API_get_initial_pac_1 */
@@ -517,6 +456,11 @@ sfx_error_t SIGFOX_API_get_initial_pac(sfx_u8 *initial_pac)
   uint16_t i = 0;
   uint32_t ret;
 
+  if (initial_pac == NULL)
+  {
+    return SFX_ERR_API_GET_INITIAL_PAC;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) initial_pac, PAC_LENGTH * sizeof(sfx_u8));
 
@@ -539,17 +483,6 @@ sfx_error_t SIGFOX_API_get_initial_pac(sfx_u8 *initial_pac)
   /* USER CODE END SIGFOX_API_get_initial_pac_2 */
 }
 
-/*!
-  * \brief   Set the period for transmission of RC Sync frame
-  *
-  *
-  * \param[in] sfx_u16 rollover_counter_period
-  *       Transmission period of the RC Sync frame (in number of 'normal' frames)
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_GET_DEVICE_ID_xx
-  */
 sfx_error_t SIGFOX_API_set_rc_sync_period(sfx_u16 rc_sync_period)
 {
   /* USER CODE BEGIN SIGFOX_API_set_rc_sync_period_1 */
@@ -576,14 +509,6 @@ sfx_error_t SIGFOX_API_set_rc_sync_period(sfx_u16 rc_sync_period)
   /* USER CODE END SIGFOX_API_set_rc_sync_period_2 */
 }
 
-/*!
-  * \brief   executes the test modes needed for the Sigfox RF and Protocol Tests
-  *
-  * \param[in]  sfx_rc_t                    Radio Configuration pointer
-  * \param[in]  sfx_test_mode_t test_mode   Test mode to be executed
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  */
 sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_test_mode(sfx_rc_enum_t rc_enum, sfx_test_mode_t test_mode)
 {
   /* USER CODE BEGIN ADDON_SIGFOX_RF_PROTOCOL_API_test_mode_1 */
@@ -611,21 +536,12 @@ sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_test_mode(sfx_rc_enum_t rc_enum, sfx_te
   /* USER CODE END ADDON_SIGFOX_RF_PROTOCOL_API_test_mode_2 */
 }
 
-/*!
-  * \brief   executes the test modes needed for the Sigfox RF and Protocol Tests
-  *
-  * \param[in]  sfx_rc_t                    Radio Configuration pointer
-  * \param[in]  sfx_test_mode_t test_mode   Test mode to be executed
-  * \param[in]  sfx_u8 rc_capabilities      Radio Capabilities in bitmask format
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  */
-sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(sfx_rc_enum_t rc_enum, sfx_test_mode_t test_mode,
-                                                           sfx_u8 rc_capabilities)
+sfx_error_t ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(sfx_rc_enum_t rc_enum, sfx_test_mode_t test_mode,
+                                                              sfx_u8 rc_capabilities)
 {
-  /* USER CODE BEGIN ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
+  /* USER CODE BEGIN ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
 
-  /* USER CODE END ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
+  /* USER CODE END ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
   MBMUX_ComParam_t *com_obj;
   uint32_t *com_buffer ;
   uint16_t i = 0;
@@ -644,25 +560,11 @@ sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(sfx_rc_enum_t rc_enum
 
   ret = com_obj->ReturnVal;
   return (sfx_error_t) ret;
-  /* USER CODE BEGIN ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
+  /* USER CODE BEGIN ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
 
-  /* USER CODE END ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
+  /* USER CODE END ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
 }
 
-/*!
-  * \brief   executes a scan of the air to detect a Sigfox Beacon
-  *
-  * \param[in] sfx_u16 timer                     Scan duration value ( with the unit parameter information )
-  * \param[in] sfx_timer_unit_enum_t  unit       Unit to be considered for the scan time computation
-  * \param[in] app_callback_handler              This is the function that will be called by the Sigfox Library when the scan is completed.
-  *                                              ( either when RC Found or when Timeout )
-  *                 parameter of this callback are :
-  *                     \param[out] sfx_u8       rc  Value of the RC found. There could be only 1 RC or 0 ( not found )
-  *                     \param[out] rssi         RSSI value of the RC found. if rc = 0, rssi is not valid ( is set to 0 too )
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_MONARCH_API_xx
-  */
 sfx_error_t SIGFOX_MONARCH_API_execute_rc_scan(sfx_u8 rc_capabilities_bit_mask, sfx_u16 timer,
                                                sfx_timer_unit_enum_t unit, sfx_u8(* app_callback_handler)(sfx_u8 rc_bit_mask, sfx_s16 rssi))
 {
@@ -674,6 +576,11 @@ sfx_error_t SIGFOX_MONARCH_API_execute_rc_scan(sfx_u8 rc_capabilities_bit_mask,
   uint16_t i = 0;
   uint32_t ret;
 
+  if (app_callback_handler == NULL)
+  {
+    return SFX_ERR_MONARCH_API_EXECUTE_RC_SCAN_NULL_CALLBACK;
+  }
+
   /*Init callback on M4 side*/
   app_cb = app_callback_handler;
 
@@ -696,13 +603,6 @@ sfx_error_t SIGFOX_MONARCH_API_execute_rc_scan(sfx_u8 rc_capabilities_bit_mask,
   /* USER CODE END SIGFOX_MONARCH_API_execute_rc_scan_2 */
 }
 
-/*!
-  * \brief    stops a RC scan which is on going
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_MONARCH_API_xx
-  */
 sfx_error_t SIGFOX_MONARCH_API_stop_rc_scan(void)
 {
   /* USER CODE BEGIN SIGFOX_MONARCH_API_stop_rc_scan_1 */
@@ -724,11 +624,6 @@ sfx_error_t SIGFOX_MONARCH_API_stop_rc_scan(void)
   /* USER CODE END SIGFOX_MONARCH_API_stop_rc_scan_2 */
 }
 
-/**
-  * @brief initialises the SigfoxInfo capabilities table
-  * @param none
-  * @retval  none
-  */
 void SigfoxInfo_Init(void)
 {
   /* USER CODE BEGIN SigfoxInfo_Init_1 */
@@ -748,11 +643,6 @@ void SigfoxInfo_Init(void)
   /* USER CODE END SigfoxInfo_Init_2 */
 }
 
-/**
-  * @brief returns the pointer to the SigfoxInfo capabilities table
-  * @param none
-  * @retval  SigfoxInfoTable pointer
-  */
 SigfoxInfo_t *SigfoxInfo_GetPtr(void)
 {
   /* USER CODE BEGIN SigfoxInfo_GetPtr_1 */
@@ -777,11 +667,6 @@ void Sigfox_Register(SigfoxCallback_t *SigfoxCallback)
 
   /* USER CODE END Sigfox_Register_2 */
 }
-/**
-  * @brief This function processes the callbacks and primitives from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 
 void Process_Sigfox_Notif(MBMUX_ComParam_t *ComObj)
 {
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.h
index 37fa7260..cd7dc2dc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SIGFOX_MBWRAPPER_CM4_H__
@@ -76,8 +78,16 @@ typedef struct sSigfoxCallback
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the callbacks and primitives from Cm0
+  * @param ComObj exchange buffer parameter
+  */
 void Process_Sigfox_Notif(MBMUX_ComParam_t *ComObj);
 
+/**
+ * @brief Register the callbacks structure for the process notification
+ * @param SigfoxCallback struct of callbacks
+ */
 void Sigfox_Register(SigfoxCallback_t *SigfoxCallback);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.c
index 02add77c..c2e924b9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    system_mbwrapper.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "system_mbwrapper.h"
@@ -48,20 +50,22 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
 
-/*!
-* \brief   Returns the last stored variable data, if found, which corresponds to
-*          the passed virtual address
-* \param   EEsgfxID:
-*          data: to be read
-* \retval  error status
-*/
-uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t *data)
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t *data)
 {
   MBMUX_ComParam_t *com_obj;
   uint32_t *com_buffer ;
   uint16_t i = 0;
-  uint32_t ret= 0;
+  uint32_t ret = 0;
 
   com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
   if (com_obj != NULL)
@@ -80,18 +84,12 @@ uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t *data)
   return (uint32_t) ret;
 }
 
-/*!
-* \brief   Writes/updates variable data in EEPROM emulator.
-* \param   EEsgfxID:
-*          data: to be written
-* \retval error status
-*/
-uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t data)
+uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t data)
 {
   MBMUX_ComParam_t *com_obj;
   uint32_t *com_buffer ;
   uint16_t i = 0;
-  uint32_t ret= 0;
+  uint32_t ret = 0;
 
   com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
   if (com_obj != NULL)
@@ -110,8 +108,8 @@ uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t data)
   return (uint32_t) ret;
 }
 
-/* USER CODE BEGIN PV */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END PV */
+/* USER CODE END EF */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.h
index 8f8eeb35..2acca318 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    system_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTEM_MBWRAPPER_CM4_H__
@@ -48,8 +50,24 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
-uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t *data);
-uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t data);
+/**
+  * @brief   Returns the last stored variable data, if found, which corresponds to
+  *          the passed virtual address
+  * @param   EEsgfxID ID of EEPROM Sigfox variable
+  * @param   data to be read
+  *
+  * @retval  error status
+  */
+uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t *data);
+
+/**
+  * \brief   Writes/updates variable data in EEPROM emulator.
+  * @param   EEsgfxID ID of EEPROM Sigfox variable
+  * @param   data to be written
+  *
+  * @retval error status
+  */
+uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t data);
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.c
index e5188411..165374fe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_sigfox.h"
@@ -77,11 +79,11 @@ void MX_Sigfox_Process(void)
 
   /* USER CODE END MX_Sigfox_Process_1 */
   UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
-
   /* USER CODE BEGIN MX_Sigfox_Process_2 */
 
   /* USER CODE END MX_Sigfox_Process_2 */
 }
+
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.h
index a8c87594..7245c333 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SIGFOX_H__
@@ -38,6 +40,7 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 #define DEFAULT_RC SFX_RC1
 /* USER CODE BEGIN EC */
+
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -53,15 +56,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Sigfox Application
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Init(void);
 
 /**
   * @brief  entry Sigfox Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.c
index e8416208..d4fb64d1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app.c
@@ -16,8 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
+
 #include "st_sigfox_api.h"
 #include "sgfx_app.h"
 #include "sgfx_app_version.h"
@@ -63,7 +66,8 @@ extern RadioEvents_t RfApiRadioEvents;
 
 /* Private variables ---------------------------------------------------------*/
 static SigfoxCallback_t SigfoxCallbacks = { SYS_GetBatteryLevel,
-                                            SYS_GetTemperatureLevel};
+                                            SYS_GetTemperatureLevel
+                                          };
 
 /* USER CODE BEGIN PV */
 
@@ -82,17 +86,20 @@ static void CmdProcessNotify(void);
 
 void Sigfox_Init(void)
 {
-  /* USER CODE BEGIN Sigfox_Init_1 */
+  sfx_rc_enum_t sfx_rc = SFX_RC1;
+  sfx_error_t error = 0;
+  /* USER CODE BEGIN Sigfox_Init_0 */
 
-  /* USER CODE END Sigfox_Init_1 */
-  sfx_u8 error = 0;
+  /* USER CODE END Sigfox_Init_0 */
   SigfoxInfo_t *SigfoxRegionInfo;
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
   uint32_t sgfx_cm0plus_app;
 
   CMD_Init(CmdProcessNotify);
 
-  APP_PPRINTF("ATtention command interface\n\r");
+  /* USER CODE BEGIN Sigfox_Init_1 */
+  BSP_LED_Init(LED_BLUE);
+  BSP_LED_Init(LED_GREEN);
 
   /* Get CM4 Sigfox APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
@@ -123,19 +130,16 @@ void Sigfox_Init(void)
           (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
           (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
           (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+  APP_PPRINTF("ATtention command interface\n\r");
 
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Init(LED_BLUE);
-  BSP_LED_Init(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-#endif /* defined(USE_BSP_DRIVER) */
+  /* USER CODE END Sigfox_Init_1 */
+
+  sfx_rc = E2P_Read_Rc();
 
-  /*OPen Sifox Lib*/
-  error = st_sigfox_open(E2P_Read_Rc());
+  /*Open Sigfox library */
+  error = st_sigfox_open(sfx_rc);
 
-  /* Init SigfoxInfo capabilities table (redondant: Cm0 is supposed to have done it already) */
+  /* Init SigfoxInfo capabilities table (redundant: Cm0 is supposed to have done it already) */
   SigfoxInfo_Init();
 
   SigfoxRegionInfo = SigfoxInfo_GetPtr();
@@ -145,9 +149,9 @@ void Sigfox_Init(void)
     while (1) {} /* At least one region shall be defined */
   }
 
-  /* Register get Battery and Get temp functions */
+  /* Register GetBatteryLevel and GetTemperatureLevel functions */
   Sigfox_Register(&SigfoxCallbacks);
-
+  /* USER CODE BEGIN Sigfox_Init_ErrorCheck */
   if (1U == E2P_Read_AtEcho())
   {
     if (error == SFX_ERR_NONE)
@@ -156,17 +160,16 @@ void Sigfox_Init(void)
     }
     else
     {
-      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: %d\n\r\n\r", error);
+      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: 0x%04X\n\r\n\r", error);
     }
   }
-
+  /* USER CODE END Sigfox_Init_ErrorCheck */
   /* Put radio in Sleep waiting next cmd */
   UTIL_SEQ_RegTask(1 << CFG_SEQ_Task_Vcom, UTIL_SEQ_RFU, CMD_Process);
   /* USER CODE BEGIN Sigfox_Init_2 */
 
   /* USER CODE END Sigfox_Init_2 */
 }
-
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
@@ -266,6 +269,9 @@ static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc)
       error = SIGFOX_API_open(&SgfxRc);
       break;
     }
+    /* USER CODE BEGIN st_sigfox_open_case */
+
+    /* USER CODE END st_sigfox_open_case */
     default:
     {
       error = SFX_ERR_API_OPEN;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.h
index 14e7ed0f..e9881084 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_APP_H__
 #define __SGFX_APP_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app_version.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app_version.h
index b372c642..a52b63af 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.c
index 21c0420e..3397be8d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_at.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdbool.h>
@@ -24,7 +26,7 @@
 #include "sgfx_at.h"
 #include "sigfox_types.h"
 #include "st_sigfox_api.h"
-#include "usart.h"
+#include "usart_if.h"
 #include "stm32_tiny_sscanf.h"
 #include "sgfx_app_version.h"
 #include "sgfx_eeprom_if.h"
@@ -77,67 +79,71 @@
 
 /* Private function prototypes -----------------------------------------------*/
 #ifdef MN_ON
+
+/**
+  * @brief      monarch scan callback
+  * @param[out] rc_bit_mask bit mask of detected region configuration
+  * @param[out] rssi of the detected monarch signal
+  * @retval     SFX_ERR_NONE
+  */
 static sfx_u8 app_callback_handler(sfx_u8 rc_bit_mask, sfx_s16 rssi);
 #endif /* MN_ON */
 /**
 
   * @brief  Print n bytes as %02x
-  * @param  the pointer containing the bytes to print
-  * @param  n th number of bytes
-  * @retval None
+  * @param  pt pointer containing the bytes to print
+  * @param  n number of bytes
   */
 static void print_n(uint8_t *pt, uint32_t n);
 
 /**
-  * @brief  Print receveid n bytes as %02x
-  * @param  the pointer containing the bytes to print
-  * @param  n th number of bytes
-  * @retval None
+  * @brief  Print received n bytes as %02x
+  * @param  pt pointer containing the bytes to print
+  * @param  n number of bytes
   */
 static void print_rx(uint8_t *pt, uint32_t n);
 
 /**
   * @brief  Print an unsigned int
-  * @param  the value to print
-  * @retval None
+  * @param  value to print
   */
 static void print_u(uint32_t value);
 
 /**
   * @brief  get the length and the number of parameters of the string
-  * @param  the string
-  * @param  the output vector
-  * @param  the length of the output vector
-  * @retval None
+  * @param  str the string
+  * @param  data output vector
+  * @param  dataSize length of the output vector
   */
 static ErrorStatus stringToData(const char *str, uint8_t *data, uint32_t *dataSize);
 
 /**
-  * @brief  check if Char is an Hex value
-  * @param  none
-  * @retval none
+  * @brief  Check if character in parameter is alphanumeric
+  * @param  Char for the alphanumeric check
+  * @retval ERROR or SUCCESS
   */
 static ErrorStatus isHex(char Char);
 
 /**
-  * @brief  Converts hexa string to a nibble ( 0x0X )
-  * @param  hexa string
-  * @retval the nibble. Returns 0xF0 in case input was not an hexa string (a..f; A..F or 0..9)
+  * @brief  Converts hex string to a nibble ( 0x0X )
+  * @param  Char hex string
+  * @retval the nibble. Returns 0xF0 in case input was not an hex string (a..f; A..F or 0..9)
   */
 static uint8_t Char2Nibble(char Char);
 
 /**
-  * @brief  reopens Sigfox anr rerestores radio configuration as from EEPROM
-  * @param  none
-  * @retval none
+  * @brief  reopens Sigfox and restores radio configuration as from EEPROM
+  * @param  sfx_rc region configuration
+  * @param  config_words configuration parameters
+  * @return sfx_error_t status
   */
 static sfx_error_t SIGFOX_reopen_and_reconf(sfx_rc_enum_t sfx_rc,  sfx_u32 *config_words);
 
 /**
   * @brief  run testmode 12
   * @note   specific for SE_MON_FDL lib as HW SE do not support public switch key
-  * @param  none
-  * @retval none
+  * @param  rc_enum region configuration
+  * @return sfx_error_t status
   */
 static sfx_error_t testmode_12(sfx_rc_enum_t rc_enum);
 
@@ -211,7 +217,7 @@ ATEerror_t AT_SendBit(const char *param)
       }
       else
       {
-        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
         return AT_LIB_ERROR;
       }
     }
@@ -230,7 +236,7 @@ ATEerror_t AT_SendBit(const char *param)
     }
     else
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
       return AT_LIB_ERROR;
     }
   }
@@ -280,7 +286,7 @@ ATEerror_t AT_SendFrame(const char *param)
       }
       else
       {
-        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
         return AT_LIB_ERROR;
       }
     }
@@ -299,7 +305,7 @@ ATEerror_t AT_SendFrame(const char *param)
     }
     else
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
       return AT_LIB_ERROR;
     }
   }
@@ -360,7 +366,7 @@ ATEerror_t AT_SendHexFrame(const char *param)
       }
       else
       {
-        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+        APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
         return AT_LIB_ERROR;
       }
     }
@@ -379,7 +385,7 @@ ATEerror_t AT_SendHexFrame(const char *param)
     }
     else
     {
-      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%02X\r\n", error);
+      APP_LOG(TS_OFF, VLEVEL_H, "ERROR 0x%04X\r\n", error);
       return AT_LIB_ERROR;
     }
   }
@@ -708,7 +714,6 @@ ATEerror_t AT_scan_mn(const char *param)
 
   sfx_u8 rc_capabilities_bit_mask = 0x7F; /*all RCs from RC1 to RC7*/
   sfx_u16 timer = 5;
-  sfx_timer_unit_enum_t unit = SFX_TIME_S;
 
   sfx_rc_enum_t sfx_rc = E2P_Read_Rc();
 
@@ -722,7 +727,7 @@ ATEerror_t AT_scan_mn(const char *param)
   }
   SIGFOX_API_close();
 
-  SIGFOX_MONARCH_API_execute_rc_scan(rc_capabilities_bit_mask, timer, unit, app_callback_handler);
+  SIGFOX_MONARCH_API_execute_rc_scan(rc_capabilities_bit_mask, timer, SFX_TIME_S, app_callback_handler);
 
   UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Monarch);
 
@@ -795,11 +800,12 @@ static sfx_u8 app_callback_handler(sfx_u8 rc_bit_mask, sfx_s16 rssi)
 
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Monarch);
 
-  return rc_bit_mask;
+  return SFX_ERR_NONE;
   /* USER CODE BEGIN app_callback_handler_2 */
 
   /* USER CODE END app_callback_handler_2 */
 }
+
 #endif /* MN_ON */
 
 ATEerror_t AT_test_mode(const char *param)
@@ -890,7 +896,7 @@ ATEerror_t AT_test_mode(const char *param)
   if ((test_mode >= 7) && (test_mode <= 10))
   {
 #ifdef MN_ON
-    sfx_error = ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(rc, tm, rc_capabilities_bit_mask);
+    sfx_error = ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(rc, tm, rc_capabilities_bit_mask);
 #else
     at_status = AT_ERROR;
 #endif /* MN_ON */
@@ -1349,9 +1355,9 @@ ATEerror_t AT_rssi_cal_get(const char *param)
   AT_PRINTF("%d dB\r\n", rssi_cal);
 
   return AT_OK;
-  /* USER CODE BEGIN AT_rssi_cal_get_1 */
+  /* USER CODE BEGIN AT_rssi_cal_get_2 */
 
-  /* USER CODE END AT_rssi_cal_get_1 */
+  /* USER CODE END AT_rssi_cal_get_2 */
 }
 
 ATEerror_t AT_echo_set(const char *param)
@@ -1500,7 +1506,7 @@ static ErrorStatus stringToData(const char *str, uint8_t *data, uint32_t *dataSi
     hex[0] = *str++;
     hex[1] = *str++;
 
-    /*check if input is hexa */
+    /*check if input is hex */
     if ((isHex(hex[0]) == ERROR) || (isHex(hex[1]) == ERROR))
     {
       return ERROR;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.h
index d3c23228..9e645e7e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_at.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_AT_H__
@@ -103,219 +105,219 @@ typedef enum eATEerror
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Return AT_OK in all cases
-  * @param  Param string of the AT command - unused
+  * @param  param string of the AT command - unused
   * @retval AT_OK
   */
 ATEerror_t AT_return_ok(const char *param);
 
 /**
   * @brief  Return AT_ERROR in all cases
-  * @param  Param string of the AT command - unused
+  * @param  param string of the AT command - unused
   * @retval AT_ERROR
   */
 ATEerror_t AT_return_error(const char *param);
 
 /**
   * @brief  Trig a reset of the MCU
-  * @param  Param string of the AT command - unused
+  * @param  param string of the AT command - unused
   * @retval AT_OK
   */
 ATEerror_t AT_reset(const char *param);
 
 /**
   * @brief  Restore factory settings in Eeprom
-  * @param  Param string of the AT command - unused
+  * @param  param string of the AT command - unused
   * @retval AT_OK
   */
 ATEerror_t AT_restore_factory_settings(const char *param);
 
 /**
   * @brief  Send Bit w/wo ack to Sigfox Nw
-  * @param  String pointing to command parameters
+  * @param  param String pointing to command parameters
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_SendBit(const char *param);
 
 /**
   * @brief  Send  ASCII frame w/wo ack to Sigfox Nw
-  * @param  String pointing to command parameters
+  * @param  param String pointing to command parameters
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_SendFrame(const char *param);
 
 /**
-  * @brief  Send  Hexa frame w/wo ack to Sigfox Nw
-  * @param  String pointing to command parameters
+  * @brief  Send  Hex frame w/wo ack to Sigfox Nw
+  * @param  param String pointing to command parameters
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_SendHexFrame(const char *param);
 
 /**
   * @brief  Print last received message
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK if OK, or an appropriate AT_xxx error code
   */
 ATEerror_t AT_Send(const char *param);
 
 /**
   * @brief  Get the DevId
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_DevId_get(const char *param);
 
 /**
   * @brief  Get the Dev Pac
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_DevPac_get(const char *param);
 
 /**
   * @brief  Set public Key
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PublicKey_set(const char *param);
 
 /**
   * @brief  Get public Key
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PublicKey_get(const char *param);
 /**
   * @brief  Set Payload Encryption
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PayloadEncryption_set(const char *param);
 
 /**
   * @brief  Get Payload Encryption
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_PayloadEncryption_get(const char *param);
 
 /**
   * @brief  Print the version of the AT_Slave FW
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_version_get(const char *param);
 
 /**
   * @brief  Print the battery level
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_bat_get(const char *param);
 
 /**
   * @brief  Test Tone
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_cw(const char *param);
 
 /**
   * @brief  Tx Test with prbs9 modulation
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_pn(const char *param);
 
 /**
   * @brief  Starts a monarch scan
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_scan_mn(const char *param);
 /**
   * @brief  Test Tone
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_test_mode(const char *param);
 
 /**
   * @brief  set the output power of the radio (power in dBm)
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_power_set(const char *param);
 
 /**
   * @brief  get the output power of the radio (power in dBm)
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_power_get(const char *param);
 /**
   * @brief  send an out of band message one
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_outOfBand_run(const char *param);
 
 /**
   * @brief  to configure the enabled channels for FCC
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_ChannelConfigFcc_set(const char *param);
 
 /**
   * @brief  set zones (1 2 3 or 4)
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_rc_set(const char *param);
 
 /**
   * @brief  get zones (1 2 3 or 4)
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_rc_get(const char *param);
 
 /**
   * @brief  to get the rssi calibration value from eeprom.
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_rssi_cal_get(const char *param);
 
 /**
   * @brief  to set the rssi calibration state in eeprom.
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_rssi_cal_set(const char *param);
 /**
   * @brief  to get the current echo state from eeprom.
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_echo_get(const char *param);
 
 /**
   * @brief  to set the echo state in eeprom.
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_echo_set(const char *param);
 /**
   * @brief  Set the verbose level
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_verbose_set(const char *param);
 
 /**
   * @brief  Get the verbose level
-  * @param  String parameter
+  * @param  param String parameter
   * @retval AT_OK
   */
 ATEerror_t AT_verbose_get(const char *param);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.c
index 349d4e92..157a00cc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_command.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <string.h>
@@ -37,7 +39,6 @@
 /* #define NO_HELP */
 /* #define NO_KEY_ADDR_EUI */
 #define CMD_SIZE                        64
-#define HELP_DISPLAY_FLUSH_DELAY        100
 
 /* USER CODE BEGIN PD */
 
@@ -194,7 +195,7 @@ static const struct ATCommand_s ATCommand[] =
     .string = AT_SENDH,
     .size_string = sizeof(AT_SENDH) - 1,
 #ifndef NO_HELP
-    .help_string = "AT"AT_SENDH "=<PayloadLength>,<Payload>,<Opt downlink>,<Opt TxRepeat><CR>. Send a Hexa frame to the sigfox network\r\n",
+    .help_string = "AT"AT_SENDH "=<PayloadLength>,<Payload>,<Opt downlink>,<Opt TxRepeat><CR>. Send a Hex frame to the sigfox network\r\n",
 #endif /* !NO_HELP */
     .get = AT_return_error,
     .set = AT_SendHexFrame,
@@ -332,6 +333,9 @@ static const struct ATCommand_s ATCommand[] =
     .set = AT_verbose_set,
     .run = AT_return_error,
   },
+  /* USER CODE BEGIN ATCommand */
+
+  /* USER CODE END ATCommand */
 };
 
 static char command[CMD_SIZE];
@@ -345,15 +349,13 @@ static uint32_t IsBusy = 0;
 /* Private function prototypes -----------------------------------------------*/
 /**
   * @brief  Parse a command and process it
-  * @param  The command
-  * @retval None
+  * @param  cmd The command
   */
 static void parse_cmd(const char *cmd);
 
 /**
   * @brief  Print a string corresponding to an ATEerror_t
-  * @param  The AT error code
-  * @retval None
+  * @param  error_type The AT error code
   */
 static void com_error(ATEerror_t error_type);
 
@@ -362,20 +364,17 @@ static void com_error(ATEerror_t error_type);
   * @param  rxChar th char received
   * @param  size
   * @param  error
-  * @retval None
   */
 static void CMD_GetChar(uint8_t *rxChar, uint16_t size, uint8_t error);
 
 /**
-  * @brief  CNotifies the upper layer that a charchter has been receveid
-  * @param  None
-  * @retval None
+  * @brief  CNotifies the upper layer that a character has been received
   */
 static void (*NotifyCb)(void);
 
 /**
   * @brief  Remove backspace and its preceding character in the Command string
-  * @param  Command string to process
+  * @param  cmd string to process
   * @retval 0 when OK, otherwise error
   */
 static int32_t CMD_ProcessBackSpace(char *cmd);
@@ -550,9 +549,12 @@ static void parse_cmd(const char *cmd)
     {
       AT_PPRINTF(ATCommand[i].help_string);
     }
-    /* Wait for the message queue to be flushed in order
-       not to disturb following com_error() display */
-    HAL_Delay(HELP_DISPLAY_FLUSH_DELAY);
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
 #endif /* !NO_HELP */
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.h
index b8759d28..a7ebb631 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_command.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_COMMAND_H__
@@ -56,17 +58,12 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief Initializes command module
-  *
-  * @param [IN] cb to signal appli that character has been received
-  * @retval None
+  * @param CmdProcessNotify cb to signal application that character has been received
   */
 void CMD_Init(void (*CmdProcessNotify)(void));
 
 /**
   * @brief Process the command
-  *
-  * @param [IN] None
-  * @retval None
   */
 void CMD_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c
index 2433eb96..6a2ab9e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -23,6 +25,8 @@
 #include "system_mbwrapper.h"
 #include "st_sigfox_api.h"
 #include "se_nvm.h"
+#include "sys_conf.h"
+#include "utilities_conf.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -74,8 +78,19 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief        Read Sigfox Configuration from eeprom
+  * @param addr   variable virtual address
+  * @param data   pointer to a 32-bit word (allocated by the caller) containing the
+  *               variable value in case of success.
+  */
 static void E2P_Read(e_EE_ID addr, uint32_t *data);
 
+/**
+  * @brief        Write Sigfox Configuration to eeprom
+  * @param addr   variable virtual address
+  * @param data   32-bit data word to be written
+  */
 static void E2P_Write(e_EE_ID addr, uint32_t data);
 
 /* USER CODE BEGIN PFP */
@@ -130,7 +145,7 @@ void E2P_RestoreFs(void)
   E2P_Write(EE_MCU_NVM_2_ID, 0);
   E2P_Write(EE_MCU_NVM_3_ID, 0);
   E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, 0);
-  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, 0);
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, VERBOSE_LEVEL);
 
   /* USER CODE BEGIN E2P_RestoreFs_2 */
 
@@ -370,9 +385,9 @@ void E2P_Write_VerboseLevel(uint8_t verboselevel)
 
   E2P_Write(EE_SGFX_VERBOSELEVEL_ID, (uint32_t) verboselevel);
 
-  /* USER CODE BEGIN E2P_Write_VerboseLevel_1 */
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_2 */
 
-  /* USER CODE END E2P_Write_VerboseLevel_1 */
+  /* USER CODE END E2P_Write_VerboseLevel_2 */
 }
 
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
@@ -522,7 +537,7 @@ E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len)
   E2P_Read(EE_SE_NVM_1_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_2_ID, &data_from_eeprom);
-  read_data[i++] = (sfx_u8) data_from_eeprom;;
+  read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_3_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_4_ID, &data_from_eeprom);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h
index 10599cbd..e6993155 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_EEPROM_IF_H__
@@ -73,7 +75,7 @@ typedef enum
   EE_MCU_NVM_2_ID,
   EE_MCU_NVM_3_ID,
   /*Public ID e.g. visible on M4 starting at EE_ID=EE_RSSI_CAL_ID */
-  EE_RSSI_CAL_ID= 100,
+  EE_RSSI_CAL_ID = 100,
   EE_AT_ECHO_ID,
   EE_TX_POWER_RC1_ID,
   EE_TX_POWER_RC2_ID,
@@ -119,182 +121,164 @@ typedef enum
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_Init(void);
 
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_RestoreFs(void);
 
 /*!
- * @brief Read Output Power
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Read Output Power
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @return Output Power
  */
 int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Write Output Power to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Write Output Power to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @param  power Output Power
  */
 void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power);
 
 /*!
- * @brief Read Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval Region Configuration RC
+ * @brief  Read Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return Region Configuration RC
  */
 sfx_rc_enum_t E2P_Read_Rc(void);
 
 /*!
- * @brief Write Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Region Configuration RC
- * @retval None
+ * @brief  Write Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
  */
 void E2P_Write_Rc(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Read Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Read Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Write Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Write Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Read rssi calibration value from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval rssi calibration value
+ * @brief  Read rssi calibration value from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return rssi calibration value
  */
 int16_t E2P_Read_RssiCal(void);
 
 /*!
- * @brief Writes rssi calibration value to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  rssi calibration value
- * @retval None
+ * @brief  Writes rssi calibration value to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  rssi_cal calibration value
  */
 void E2P_Write_RssiCal(int16_t rssi_cal);
 
 /*!
- * @brief Read Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval at_echo
  */
 uint32_t E2P_Read_AtEcho(void);
 
 /*!
- * @brief Write Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  at_echo
- * @retval None
  */
 void E2P_Write_AtEcho(uint32_t at_echo);
 
 /*!
- * @brief Read KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval KeyType
  */
 sfx_key_type_t E2P_Read_KeyType(void);
 
 /*!
- * @brief Write KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  KeyType
- * @retval None
+ * @brief  Write KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  key_type KeyType setting
  */
 void E2P_Write_KeyType(sfx_key_type_t key_type);
 
 /*!
- * @brief Read EncryptionFlag setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read EncryptionFlag setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval encryption_flag
  */
 uint8_t E2P_Read_EncryptionFlag(void);
 
 /*!
- * @brief Write EncryptionFlag  setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write EncryptionFlag  setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  encryption_flag
- * @retval None
  */
 void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len);
 
 /*!
- * @brief Write Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Write Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Read MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data,  uint32_t len);
 
 /*!
- * @brief Write Region MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Write Region MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param   None
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval the VL
  */
 uint8_t E2P_Read_VerboseLevel(void);
 
 /*!
- * @brief Read verbose levelsetting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Read verbose levelsetting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  verboselevel
- * @retval None
  */
 void E2P_Write_VerboseLevel(uint8_t verboselevel);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/Target/se_nvm.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/Target/se_nvm.h
index 3047bfbd..97cbfbee 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/Target/se_nvm.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/CM4/Sigfox/Target/se_nvm.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SE_NVM_H__
@@ -67,48 +69,46 @@ typedef enum
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief This function reads data pointed by read_data to non
-  * volatile memory
+  * @brief     This function reads data pointed by read_data to non volatile memory
   *
-  * @param [IN] sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] read_data Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief This function write data pointed by data_to_write to non
-  * volatile memory
+  * @brief     This function write data pointed by data_to_write to non volatile memory
   *
-  * @param [IN] sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] data_to_write Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief Get the active encryption payload flag
-  * @retval encryption_flag 0:Off, 1:On
+  * @brief     Get the active encryption payload flag
+  * @retval    encryption_flag 0:Off, 1:On
   */
 sfx_u8 SE_NVM_get_encrypt_flag(void);
 
 /**
-  * @brief Set the active encryption payload flag
-  * @param [IN]  encryption_flag 0:Off, 1:On
+  * @brief     Set the active encryption payload flag
+  * @param[in] encryption_flag 0:Off, 1:On
   */
 void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag);
 
 /**
-  * @brief Get the active encryption key
-  * @retval  sfx_key_type_t key: public or private
+  * @brief     Get the active encryption key
+  * @return    key public or private
   */
 sfx_key_type_t SE_NVM_get_key_type(void);
 
 /**
-  * @brief Set the active encryption key
-  * @param [IN]  sfx_key_type_t key: public or private
+  * @brief     Set the active encryption key
+  * @param[in] keyType key public or private
   */
-void  SE_NVM_set_key_type(sfx_key_type_t keyType);
+void SE_NVM_set_key_type(sfx_key_type_t keyType);
 
 /* USER CODE BEGIN EFP */
 
@@ -120,4 +120,3 @@ void  SE_NVM_set_key_type(sfx_key_type_t keyType);
 #endif /* __SE_NVM_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/board_resources.h
deleted file mode 100644
index 8cf7f3ed..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/board_resources.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON1_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON3_EXTI_IRQn              EXTI15_4_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
index 8dae344f..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     150U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/features_info.h
index 6604ead3..9df16d26 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/features_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/features_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTEM_INFO_H
@@ -36,7 +38,7 @@ extern "C" {
 /**
   * @brief Feature enumeration
   * @note This is the list of all available feature so far,
-          the one available in a fiven build are listed in the Feat_Info_Table[]
+          the one available in a given build are listed in the Feat_Info_Table[]
           to keep compatibility, in order to add a feature
           use a new value to the bottom without changing the existing order
   */
@@ -115,7 +117,6 @@ typedef struct
 /* Exported functions ------------------------------------------------------- */
 /**
   * @brief  Init configuration params by calling specific feature xxx_info.c
-  * @return void
   */
 void FEAT_INFO_Init(void);
 /**
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/mbmux_table.h
index 2874d9de..84cb7539 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/mbmux_table.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/mbmux_table.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux_table.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_TABLE_H__
@@ -48,12 +50,14 @@ typedef enum
   MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
 } MBMUX_ComType_t;
 
+/* Shared memory tables */
+
 typedef struct
 {
   uint32_t MsgId;
   void (*MsgCm4Cb)(void *ComObj);
-  void (*MsgCm0plusCb)(void *ComObj);
-  uint16_t BufSize;      /*!<  size of the array given by the applic */
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
   uint16_t ParamCnt;     /*!<  nr of words composing the message */
   uint32_t *ParamBuf;
   uint32_t ReturnVal;    /*!<  only used in RX */
@@ -66,7 +70,19 @@ typedef struct
   uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
   __IO uint16_t           SynchronizeCpusAtBoot;
   uint16_t                ChipRevId;
-} MBMUX_ComTable_t;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
 
 /* USER CODE BEGIN ET */
 
@@ -87,3 +103,5 @@ typedef struct
 #endif
 
 #endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/msg_id.h
index d0b5d1ae..a2cc312e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/msg_id.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/msg_id.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    msg_id.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MSG_ID_H__
@@ -98,7 +100,7 @@ typedef enum
   RADIO_STANDBY_ID,
   RADIO_RX_ID,
   RADIO_START_CAD_ID,
-  RADIO_SET_TX_CONTINOUS_WAVE_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
   RADIO_RSSI_ID,
   RADIO_WRITE_ID,
   RADIO_READ_ID,
@@ -192,3 +194,5 @@ typedef enum
 #endif
 
 #endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/sigfox_info.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/sigfox_info.h
index 3389cab5..099d2c78 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/sigfox_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/MbMux/sigfox_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_info.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 #ifndef __SIGFOX_INFO_H__
 #define __SIGFOX_INFO_H__
@@ -61,16 +63,13 @@ typedef struct
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the SigfoxInfo table
-  * @param none
-  * @retval  none
+  * @brief initialize the SigfoxInfo capabilities table
   */
 void SigfoxInfo_Init(void);
 
 /**
-  * @brief returns the pointer to the SigfoxMacInfo table
-  * @param none
-  * @retval  SigfoxMacInfoTable pointer
+  * @brief returns the pointer to the SigfoxInfo capabilities table
+  * @return  SigfoxInfo_t pointer
   */
 SigfoxInfo_t *SigfoxInfo_GetPtr(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/sys_debug.c
index 807e1bb4..d01a65d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/sys_debug.c
@@ -41,9 +41,6 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
-#define DBGMCU_LPM   0   /* if 1 enables/disables the Debug Module during LowPower modes */
-                         /* if 0 it does not modify the DBGMCU_CR_DBG registers */
-                         /* in DualCore few issues are under investigation when 1 */
 
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
@@ -62,12 +59,90 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
   GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
@@ -75,57 +150,49 @@ void DBG_Init(void)
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  /* make sure a pin is not used simultaneusly by the two cores */
-  /* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
 #if defined(CORE_CM4)
 
   /* Enable the GPIO_LINES Clock */
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
 
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+#else /* CORE_CM0PLUS */
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-#if defined (DBGMCU_LPM) && ( DBGMCU_LPM == 1 )
-  /* careful does not work correctly in dual core: Bugzilla 71087 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
-#elif defined (DBGMCU_LPM) && ( DBGMCU_LPM == 0 )
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
-#elif !defined (DBGMCU_LPM)
-#error "DBGMCU_LPM not defined or out of range <0,1>"
-#endif /* DBGMCU_LPM */
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
 
-#else /* CORE_CM0PLUS */
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
 
-  /* Enable the GPIO_LINES Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN ;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
+  /* HW alternate functions for monitoring RF */
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -143,7 +210,7 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /* LDO_rdy & BUCK_rdy */
+  /* LDO_rdy & BUCK_rdy (SMPS) */
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
   GPIO_InitStruct.Pull   = GPIO_NOPULL;
   GPIO_InitStruct.Pin    = (GPIO_PIN_2);
@@ -158,40 +225,29 @@ void DBG_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-#endif /* CORE_CM4 */
+#endif /* CORE_CM0PLUS */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#if defined(CORE_CM4)
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
 #endif /* CORE_CM4 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-  /* USER CODE END DBG_Init_Last */
+  /* USER CODE END DBG_ProbesInit_Last */
 }
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/sys_debug.h
index 162d992f..28890d05 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/sys_debug.h
@@ -43,94 +43,96 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/* make sure a pin is not used simultaneusly by the two cores */
-/* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
 #if defined(CORE_CM0PLUS)
-/**  Definition for Debug Line 1   **/
+
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 #else
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-#endif /* CORE_CM4 */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
 
 /* USER CODE BEGIN EC */
 
@@ -142,49 +144,66 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
 /**
-  * @brief Initializes the debug
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Common/System/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM0PLUS.ewd
index 6057259c..91024448 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM0PLUS.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM0PLUS.ewd
@@ -1106,15 +1106,15 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>1</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
-                    <state>0</state>
+                    <state>1</state>
                 </option>
             </data>
         </settings>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM0PLUS.ewp
index 872e4705..05700d05 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM0PLUS.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM0PLUS.ewp
@@ -117,7 +117,7 @@
                 <option>
                     <name>GBECoreSlave</name>
                     <version>26</version>
-                    <state>39</state>
+                    <state>35</state>
                 </option>
                 <option>
                     <name>OGUseCmsis</name>
@@ -226,6 +226,7 @@
                     <name>CCDefines</name>
                     <state>CORE_CM0PLUS</state>
                     <state>KMS_ENABLED</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                     <state>MBEDTLS_CONFIG_FILE="mbedtls_config.h"</state>
                 </option>
@@ -358,8 +359,9 @@
                     <state>$PROJ_DIR$/../CM0PLUS/Sigfox/Target</state>
                     <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
@@ -1033,7 +1035,7 @@
                 </option>
                 <option>
                     <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>Sigfox_AT_Slave_DualCore_CM0PLUS_import_lib.o</state>
+                    <state>###Unitialized###</state>
                 </option>
             </data>
         </settings>
@@ -1066,60 +1068,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\flash_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\lptim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\mn_lptim_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1127,87 +1075,147 @@
             </file>
         </group>
         <group>
-            <name>KMS</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>Sigfox_AT_Slave_DualCore_CM0PLUS</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sigfox.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_mbwrapper.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Sigfox</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\app_sigfox.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\ee.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_cstimer.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_eeprom_if.c</name>
-                </file>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\flash_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\lptim.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\mn_lptim_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>KMS</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sigfox.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_mbwrapper.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Sigfox</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\app_sigfox.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\ee.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_cstimer.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_eeprom_if.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mcu_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mn_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\radio_board_if.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\rf_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\se_nvm.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\sgfx_credentials.c</name>
+                        </file>
+                    </group>
+                </group>
             </group>
             <group>
-                <name>Target</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mcu_api.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mn_api.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\radio_board_if.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\rf_api.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\se_nvm.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\sgfx_credentials.c</name>
-                </file>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
         </group>
     </group>
@@ -1221,9 +1229,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>Sigfox_AT_Slave_DualCore_CM0PLUS</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1302,6 +1307,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1395,6 +1406,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_vm_storage.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\HAL\mac_stm32hal.c</name>
             </file>
@@ -1420,16 +1434,16 @@
         <group>
             <name>Sigfox</name>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.8.1_SE_FDL_MON.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.10.0_SE_FDL_MON.a</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\Sgfx-Cmac-V1.0.0-CM0-O3.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.0-CM0-O3.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.1-CM0-O3.a</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_aes.c</name>
@@ -1446,6 +1460,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM4.ewd
index d8f5e23b..3d7b7ff2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM4.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM4.ewd
@@ -44,7 +44,7 @@
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -112,7 +112,7 @@
                 </option>
                 <option>
                     <name>FlashLoadersV3</name>
-                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCImagesSuppressCheck1</name>
@@ -184,7 +184,7 @@
                 </option>
                 <option>
                     <name>OCMulticoreMaster</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>OCMulticorePort</name>
@@ -192,15 +192,15 @@
                 </option>
                 <option>
                     <name>OCMulticoreWorkspace</name>
-                    <state>$PROJ_DIR$\Project.eww</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveProject</name>
-                    <state>Sigfox_AT_Slave_DualCore_CM0PLUS</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveConfiguration</name>
-                    <state>MBMUX_STM32WL_M0_FLASH</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCDownloadExtraImage</name>
@@ -1106,11 +1106,11 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>0</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM4.ewp
index f00bb63d..d562738b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM4.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/Sigfox_AT_Slave_DualCore_CM4.ewp
@@ -225,6 +225,7 @@
                 <option>
                     <name>CCDefines</name>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                 </option>
                 <option>
@@ -355,8 +356,9 @@
                     <state>$PROJ_DIR$/../CM4/Sigfox/Target</state>
                     <state>$PROJ_DIR$/../CM4/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
@@ -1051,54 +1053,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1106,72 +1060,129 @@
             </file>
         </group>
         <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>Sigfox_AT_Slave_DualCore_CM4</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sigfox.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\sigfox_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\system_mbwrapper.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Sigfox</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\Sigfox\App\app_sigfox.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_app.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_at.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_command.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_eeprom_if.c</name>
-                </file>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sigfox.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\sigfox_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\system_mbwrapper.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Sigfox</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\app_sigfox.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_app.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_at.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_command.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_eeprom_if.c</name>
+                        </file>
+                    </group>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
         </group>
     </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
     <group>
         <name>Drivers</name>
-	<group>
+        <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>Sigfox_AT_Slave_DualCore_CM4</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
                     <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
                 </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
             </group>
         </group>
         <group>
@@ -1233,6 +1244,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
             </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
index a6cf0145..cd6560d5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
index 6f11cd34..3e66df44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -11,10 +11,10 @@ define symbol __ICFEDIT_region_ROM_end__      = 0x0803CFFF;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_start__   = 0x0803E500;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_end__     = 0x0803E7FF;
 /***** SRAM2 shared allocated by M0+ *****/
-define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x2000B000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000BFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20009000;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20009FFF;
 /***** SRAM2 dedicated to M0+ *****/
-define symbol __ICFEDIT_region_RAM2_start__   = 0x2000C000;
+define symbol __ICFEDIT_region_RAM2_start__   = 0x2000A000;
 define symbol __ICFEDIT_region_RAM2_end__     = 0x2000FFFF;
 
 /* KMS Data Storage (NVMS) region */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
index e88361e7..cb0d93d2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
@@ -13,7 +13,7 @@ define symbol __ICFEDIT_region_RAM_start__    = 0x20000000;
 define symbol __ICFEDIT_region_RAM_end__      = 0x20007FFF;
 /***** SRAM2 shared allocated by M4 *****/
 define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20008000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000AFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20008FFF;
 
 /*-Sizes-*/
 define symbol __ICFEDIT_size_cstack__ = 0x1000;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Project.uvmpw
index 5e4a7aa0..d03ddbe7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Project.uvmpw
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Project.uvmpw
@@ -10,11 +10,13 @@
   <project>
     <PathAndName>.\Sigfox_AT_Slave_DualCore_CM0PLUS.uvprojx</PathAndName>
     <NodeIsActive>1</NodeIsActive>
+    <NodeIsExpanded>1</NodeIsExpanded>
     <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
   </project>
 
   <project>
     <PathAndName>.\Sigfox_AT_Slave_DualCore_CM4.uvprojx</PathAndName>
+    <NodeIsExpanded>1</NodeIsExpanded>
     <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
   </project>
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM0PLUS.uvoptx
index d235afd9..368a4536 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM0PLUS.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM0PLUS.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>12000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -73,7 +73,7 @@
         <LExpSel>0</LExpSel>
       </OPTXL>
       <OPTFL>
-        <tvExp>0</tvExp>
+        <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
@@ -125,7 +125,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)</Name>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -134,13 +134,18 @@
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
-          <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O974 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM0+ -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U-O142 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -150,7 +155,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>1</periodic>
-        <aLwin>0</aLwin>
+        <aLwin>1</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
@@ -190,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -198,508 +203,504 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Sigfox/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/flash_if.c</PathWithFileName>
-      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/app_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/ee.c</PathWithFileName>
+      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Sigfox/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/lptim.c</PathWithFileName>
-      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/mcu_api.c</PathWithFileName>
+      <FilenameWithoutPath>mcu_api.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/mn_lptim_if.c</PathWithFileName>
-      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/mn_api.c</PathWithFileName>
+      <FilenameWithoutPath>mn_api.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/rf_api.c</PathWithFileName>
+      <FilenameWithoutPath>rf_api.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/se_nvm.c</PathWithFileName>
+      <FilenameWithoutPath>se_nvm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>18</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/KMS/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
-      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/lptim.c</PathWithFileName>
+      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/features_info.c</PathWithFileName>
-      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmux.c</PathWithFileName>
-      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/mn_lptim_if.c</PathWithFileName>
+      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/sigfox_info.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_info.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/sigfox_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/Sigfox/App</GroupName>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/App/app_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/features_info.c</PathWithFileName>
+      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/App/ee.c</PathWithFileName>
-      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/sigfox_info.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Sigfox/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/mcu_api.c</PathWithFileName>
-      <FilenameWithoutPath>mcu_api.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/mn_api.c</PathWithFileName>
-      <FilenameWithoutPath>mn_api.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/rf_api.c</PathWithFileName>
-      <FilenameWithoutPath>rf_api.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/se_nvm.c</PathWithFileName>
-      <FilenameWithoutPath>se_nvm.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>39</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/sigfox_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -707,13 +708,13 @@
 
   <Group>
     <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>40</FileNumber>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -732,8 +733,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>41</FileNumber>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -744,8 +745,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>42</FileNumber>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -758,31 +759,35 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
       <FileNumber>44</FileNumber>
@@ -790,8 +795,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -802,8 +807,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -814,8 +819,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -826,8 +831,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -838,8 +843,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -850,8 +855,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -862,8 +867,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -874,8 +879,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -886,8 +891,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -898,8 +903,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -922,8 +927,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -934,8 +939,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -946,8 +951,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -958,8 +963,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -970,8 +975,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -982,8 +987,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -994,8 +999,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1006,8 +1011,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1018,15 +1023,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/KMS</GroupName>
+    <GroupName>Drivers/CMSIS</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -1038,391 +1043,391 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/KMS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
-      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>73</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
-      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>74</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>75</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>76</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>77</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>78</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_vm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>79</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
-      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
+      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>80</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
-      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
+      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>81</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
-      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>82</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>83</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
-      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>84</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
-      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>85</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
-      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
+      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>86</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
-      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>87</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
-      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>88</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
-      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>89</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
-      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>90</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>91</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>92</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>93</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>94</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>95</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
-      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/mbed-crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>12</GroupNumber>
       <FileNumber>96</FileNumber>
@@ -1430,8 +1435,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
-      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1442,14 +1447,34 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>98</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</PathWithFileName>
       <FilenameWithoutPath>sha1.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>98</FileNumber>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>99</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1459,6 +1484,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>100</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -1468,32 +1505,32 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>99</FileNumber>
-      <FileType>4</FileType>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>101</FileNumber>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</PathWithFileName>
-      <FilenameWithoutPath>SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>100</FileNumber>
-      <FileType>4</FileType>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>102</FileNumber>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a</PathWithFileName>
-      <FilenameWithoutPath>SFX_LIB_V2.8.1_SE_FDL_MON.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>101</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>103</FileNumber>
       <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1504,38 +1541,38 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>102</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>104</FileNumber>
       <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a</PathWithFileName>
-      <FilenameWithoutPath>Sgfx-Monarch-V2.0.0-CM0-O3.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a</PathWithFileName>
+      <FilenameWithoutPath>Sgfx-Monarch-V2.0.1-CM0-O3.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>103</FileNumber>
-      <FileType>1</FileType>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>105</FileNumber>
+      <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_LIB_V2.10.0_SE_FDL_MON.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>104</FileNumber>
-      <FileType>1</FileType>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>106</FileNumber>
+      <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1548,26 +1585,38 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>105</FileNumber>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>107</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>106</FileNumber>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>108</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>109</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1580,8 +1629,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>107</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>110</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1592,86 +1641,86 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>108</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>111</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>109</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>112</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>110</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>113</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>111</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>114</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>112</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>115</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>113</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>116</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>114</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>117</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM0PLUS.uvprojx
index eb6c549d..afddb0ec 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM0PLUS.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM0PLUS.uvprojx
@@ -16,14 +16,14 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM0P</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <FlashDriverDll></FlashDriverDll>
           <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <RegisterFile></RegisterFile>
           <MemoryEnv></MemoryEnv>
           <Cmp></Cmp>
           <Asm></Asm>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>Sigfox_AT_Slave_DualCore_CM0PLUS\Exe\</OutputDirectory>
+          <OutputDirectory>Sigfox_AT_Slave_DualCore_CM0PLUS\</OutputDirectory>
           <OutputName>Sigfox_AT_Slave_DualCore_CM0PLUS</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -110,13 +110,13 @@
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDllArguments>-REMAP</SimDllArguments>
           <SimDlgDll>DARMCM1.DLL</SimDlgDll>
-          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
           <TargetDllName>SARMCM3.DLL</TargetDllName>
-          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDllArguments> </TargetDllArguments>
           <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
-          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
         </DllOption>
         <DebugOption>
           <OPTHX>
@@ -134,14 +134,14 @@
             <RunIndependent>0</RunIndependent>
             <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
+            <DriverSelection>4101</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -186,7 +186,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <hadIRAM2>0</hadIRAM2>
+            <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>1</useUlib>
@@ -194,7 +194,7 @@
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
             <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
+            <RwSelD>4</RwSelD>
             <CodeSel>0</CodeSel>
             <OptFeed>0</OptFeed>
             <NoZi1>0</NoZi1>
@@ -245,13 +245,13 @@
               </Ocm6>
               <IRAM>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls> -fshort-enums</MiscControls>
-              <Define>CORE_CM0PLUS,KMS_ENABLED,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM0PLUS,KMS_ENABLED,USE_HAL_DRIVER,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/Sigfox/App;../CM0PLUS/Sigfox/Target;../CM0PLUS/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/Sigfox/App;../CM0PLUS/Sigfox/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,278 +381,227 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>board_resources.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
             <File>
-              <FileName>ca_low_level.c</FileName>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Sigfox/App</GroupName>
+          <Files>
             <File>
-              <FileName>flash_if.c</FileName>
+              <FileName>app_sigfox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/flash_if.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/App/app_sigfox.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>ee.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/App/ee.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>sgfx_cstimer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</FilePath>
             </File>
             <File>
-              <FileName>kms_low_level.c</FileName>
+              <FileName>sgfx_eeprom_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Sigfox/Target</GroupName>
+          <Files>
             <File>
-              <FileName>lptim.c</FileName>
+              <FileName>sgfx_credentials.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/lptim.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</FilePath>
             </File>
             <File>
-              <FileName>main.c</FileName>
+              <FileName>mcu_api.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/mcu_api.c</FilePath>
             </File>
             <File>
-              <FileName>mn_lptim_if.c</FileName>
+              <FileName>mn_api.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/mn_lptim_if.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/mn_api.c</FilePath>
             </File>
             <File>
-              <FileName>nvms_low_level.c</FileName>
+              <FileName>radio_board_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/radio_board_if.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>rf_api.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/rf_api.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>se_nvm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/se_nvm.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+          <Files>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>app_kms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>main.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>kms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>timer_if.c</FileName>
+              <FileName>nvms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/KMS/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_kms.c</FileName>
+              <FileName>lptim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/lptim.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MbMux</GroupName>
-          <Files>
             <File>
-              <FileName>features_info.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/features_info.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
             </File>
             <File>
-              <FileName>mbmux.c</FileName>
+              <FileName>flash_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/flash_if.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_kms.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_radio.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_radio.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_sigfox.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_sigfox.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_sys.c</FileName>
+              <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_sys.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_trace.c</FileName>
+              <FileName>mn_lptim_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_trace.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/mn_lptim_if.c</FilePath>
             </File>
             <File>
-              <FileName>radio_mbwrapper.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/radio_mbwrapper.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>sigfox_info.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/sigfox_info.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>sigfox_mbwrapper.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/sigfox_mbwrapper.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/Sigfox/App</GroupName>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
           <Files>
             <File>
-              <FileName>app_sigfox.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/App/app_sigfox.c</FilePath>
-            </File>
-            <File>
-              <FileName>ee.c</FileName>
+              <FileName>features_info.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/App/ee.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/features_info.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_cstimer.c</FileName>
+              <FileName>sigfox_info.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/sigfox_info.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_eeprom_if.c</FileName>
+              <FileName>mbmux.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Sigfox/Target</GroupName>
-          <Files>
             <File>
-              <FileName>mcu_api.c</FileName>
+              <FileName>mbmuxif_sigfox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/mcu_api.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_sigfox.c</FilePath>
             </File>
             <File>
-              <FileName>mn_api.c</FileName>
+              <FileName>mbmuxif_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/mn_api.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_radio.c</FilePath>
             </File>
             <File>
-              <FileName>radio_board_if.c</FileName>
+              <FileName>mbmuxif_sys.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/radio_board_if.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_sys.c</FilePath>
             </File>
             <File>
-              <FileName>rf_api.c</FileName>
+              <FileName>mbmuxif_trace.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/rf_api.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_trace.c</FilePath>
             </File>
             <File>
-              <FileName>se_nvm.c</FileName>
+              <FileName>radio_mbwrapper.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/se_nvm.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/radio_mbwrapper.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_credentials.c</FileName>
+              <FileName>sigfox_mbwrapper.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/sigfox_mbwrapper.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -682,37 +631,32 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
             <File>
-              <FileName>stm32wlxx_hal.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_dma.c</FileName>
@@ -725,24 +669,29 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_ipcc.c</FileName>
@@ -750,49 +699,59 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_lptim.c</FileName>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_lptim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -800,175 +759,226 @@
           <GroupName>Middlewares/KMS</GroupName>
           <Files>
             <File>
-              <FileName>ca_aes.c</FileName>
+              <FileName>kms_der_x962.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
             </File>
             <File>
-              <FileName>ca_aes_hal.c</FileName>
+              <FileName>kms_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>ca_aes_mbed.c</FileName>
+              <FileName>kms_entry.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
             </File>
             <File>
-              <FileName>ca_core.c</FileName>
+              <FileName>kms_init.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc.c</FileName>
+              <FileName>kms_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_hal.c</FileName>
+              <FileName>kms_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_mbed.c</FileName>
+              <FileName>kms_platf_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash.c</FileName>
+              <FileName>kms_digest.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash_mbed.c</FileName>
+              <FileName>kms_dyn_obj.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
             </File>
             <File>
-              <FileName>ca_if_utils.c</FileName>
+              <FileName>kms_enc_dec.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng.c</FileName>
+              <FileName>kms_key_mgt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng_mbed.c</FileName>
+              <FileName>kms_nvm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa.c</FileName>
+              <FileName>kms_sign_verify.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa_hal.c</FileName>
+              <FileName>kms_vm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls></MiscControls>
+                      <Define></Define>
+                      <Undefine></Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
             </File>
             <File>
-              <FileName>ca_rsa_mbed.c</FileName>
+              <FileName>kms_interface.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
             </File>
             <File>
-              <FileName>kms_der_x962.c</FileName>
+              <FileName>tkms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
             </File>
             <File>
-              <FileName>kms_digest.c</FileName>
+              <FileName>ca_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
             </File>
             <File>
-              <FileName>kms_dyn_obj.c</FileName>
+              <FileName>ca_core.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
             </File>
             <File>
-              <FileName>kms_ecc.c</FileName>
+              <FileName>ca_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>kms_enc_dec.c</FileName>
+              <FileName>ca_hash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
             </File>
             <File>
-              <FileName>kms_entry.c</FileName>
+              <FileName>ca_if_utils.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
             </File>
             <File>
-              <FileName>kms_init.c</FileName>
+              <FileName>ca_rng.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
             </File>
             <File>
-              <FileName>kms_interface.c</FileName>
+              <FileName>ca_rsa.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
             </File>
             <File>
-              <FileName>kms_key_mgt.c</FileName>
+              <FileName>ca_aes_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_mem.c</FileName>
+              <FileName>ca_ecc_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_nvm_storage.c</FileName>
+              <FileName>ca_rsa_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_objects.c</FileName>
+              <FileName>mac_stm32hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_platf_objects.c</FileName>
+              <FileName>rsa_stm32hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_sign_verify.c</FileName>
+              <FileName>ca_aes_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>mac_stm32hal.c</FileName>
+              <FileName>ca_ecc_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>rsa_stm32hal.c</FileName>
+              <FileName>ca_hash_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>tkms.c</FileName>
+              <FileName>ca_rng_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+            </File>
+            <File>
+              <FileName>ca_rsa_mbed.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Middlewares/mbed-crypto</GroupName>
           <Files>
-            <File>
-              <FileName>platform_util.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
-            </File>
             <File>
               <FileName>sha1.c</FileName>
               <FileType>1</FileType>
@@ -979,20 +989,25 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
             </File>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Middlewares/Sigfox</GroupName>
           <Files>
             <File>
-              <FileName>SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FileName>
-              <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FilePath>
+              <FileName>sigfox_aes.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</FilePath>
             </File>
             <File>
-              <FileName>SFX_LIB_V2.8.1_SE_FDL_MON.a</FileName>
-              <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a</FilePath>
+              <FileName>sigfox_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
             </File>
             <File>
               <FileName>Sgfx-Cmac-V1.0.0-CM0-O3.a</FileName>
@@ -1000,19 +1015,19 @@
               <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</FilePath>
             </File>
             <File>
-              <FileName>Sgfx-Monarch-V2.0.0-CM0-O3.a</FileName>
+              <FileName>Sgfx-Monarch-V2.0.1-CM0-O3.a</FileName>
               <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a</FilePath>
             </File>
             <File>
-              <FileName>sigfox_aes.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</FilePath>
+              <FileName>SFX_LIB_V2.10.0_SE_FDL_MON.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a</FilePath>
             </File>
             <File>
-              <FileName>sigfox_data.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
+              <FileName>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilePath>
             </File>
           </Files>
         </Group>
@@ -1020,14 +1035,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1040,39 +1060,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1086,8 +1106,8 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
         <targetInfos>
           <targetInfo name="Sigfox_AT_Slave_DualCore_CM0PLUS"/>
         </targetInfos>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM4.uvoptx
index 203b1d9d..1751adaa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM4.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM4.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>12000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -73,7 +73,7 @@
         <LExpSel>0</LExpSel>
       </OPTXL>
       <OPTFL>
-        <tvExp>0</tvExp>
+        <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
@@ -145,50 +145,10 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O2254 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U-O142 -O2766 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>173</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134234448</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>&lt;2&gt;../CM4/MbMux/mbmuxif_sys.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\Sigfox_AT_Slave_DualCore_CM4\../CM4/MbMux/mbmuxif_sys.c\173</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>244</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134238488</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>&lt;2&gt;../CM4/Core/Src/sys_app.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\Sigfox_AT_Slave_DualCore_CM4\../CM4/Core/Src/sys_app.c\244</Expression>
-        </Bp>
-      </Breakpoint>
-      <WatchWindow1>
-        <Ww>
-          <count>0</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>pMb_RefTable</ItemText>
-        </Ww>
-      </WatchWindow1>
+      <Breakpoint/>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
@@ -235,392 +195,396 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>1</tvExp>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Sigfox/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Sigfox/App/app_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Sigfox/App/sgfx_app.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Sigfox/App/sgfx_at.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_at.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Sigfox/App/sgfx_command.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_command.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>16</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmux.c</PathWithFileName>
-      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/sigfox_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/system_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>system_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Sigfox/App</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Sigfox/App/app_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Sigfox/App/sgfx_app.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/sigfox_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Sigfox/App/sgfx_at.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_at.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/system_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>system_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>29</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Sigfox/App/sgfx_command.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_command.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>30</FileNumber>
-      <FileType>1</FileType>
+      <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -633,8 +597,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -644,23 +608,15 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -673,253 +629,257 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>53</FileNumber>
@@ -927,49 +887,65 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -981,58 +957,62 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Doc</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>61</FileNumber>
-      <FileType>5</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\readme.txt</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>62</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM4.uvprojx
index bb548179..cf5884bc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM4.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/Sigfox_AT_Slave_DualCore_CM4.uvprojx
@@ -16,9 +16,9 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20007FFF) IRAM2(0x20008000-0x2000AFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>Sigfox_AT_Slave_DualCore_CM4\Exe\</OutputDirectory>
+          <OutputDirectory>Sigfox_AT_Slave_DualCore_CM4\</OutputDirectory>
           <OutputName>Sigfox_AT_Slave_DualCore_CM4</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -80,9 +80,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -138,7 +138,7 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -183,7 +183,7 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
@@ -246,7 +246,7 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
@@ -301,12 +301,12 @@
               <OCR_RVCT9>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
                 <StartAddress>0x20008000</StartAddress>
-                <Size>0x3000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls>-fshort-enums </MiscControls>
-              <Define>CORE_CM4,STM32WL55xx</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM4/Core/Inc;../CM4/Sigfox/App;../CM4/Sigfox/Target;../CM4/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM4/Core/Inc;../CM4/Sigfox/App;../CM4/Sigfox/Target;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,67 +381,97 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>adc.c</FileName>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Sigfox/App</GroupName>
+          <Files>
             <File>
-              <FileName>adc_if.c</FileName>
+              <FileName>app_sigfox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
+              <FilePath>../CM4/Sigfox/App/app_sigfox.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>sgfx_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FilePath>../CM4/Sigfox/App/sgfx_app.c</FilePath>
             </File>
             <File>
-              <FileName>dma.c</FileName>
+              <FileName>sgfx_at.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/dma.c</FilePath>
+              <FilePath>../CM4/Sigfox/App/sgfx_at.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>sgfx_command.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
+              <FilePath>../CM4/Sigfox/App/sgfx_command.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>sgfx_eeprom_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM4/Sigfox/App/sgfx_eeprom_if.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
             <File>
               <FileName>main.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileName>dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+              <FilePath>../CM4/Core/Src/dma.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
+              <FilePath>../CM4/Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
               <FileName>timer_if.c</FileName>
@@ -449,29 +479,29 @@
               <FilePath>../CM4/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>adc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/usart.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
             </File>
             <File>
               <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/usart_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
           <Files>
             <File>
               <FileName>mbmux.c</FileName>
@@ -479,71 +509,15 @@
               <FilePath>../CM4/MbMux/mbmux.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FileName>mbmuxif_sigfox.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/mbmuxif_sigfox.c</FilePath>
             </File>
             <File>
               <FileName>mbmuxif_radio.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/MbMux/mbmuxif_radio.c</FilePath>
             </File>
-            <File>
-              <FileName>mbmuxif_sigfox.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/MbMux/mbmuxif_sigfox.c</FilePath>
-            </File>
             <File>
               <FileName>mbmuxif_sys.c</FileName>
               <FileType>1</FileType>
@@ -572,32 +546,12 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/Sigfox/App</GroupName>
+          <GroupName>Doc</GroupName>
           <Files>
             <File>
-              <FileName>app_sigfox.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Sigfox/App/app_sigfox.c</FilePath>
-            </File>
-            <File>
-              <FileName>sgfx_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Sigfox/App/sgfx_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>sgfx_at.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Sigfox/App/sgfx_at.c</FilePath>
-            </File>
-            <File>
-              <FileName>sgfx_command.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Sigfox/App/sgfx_command.c</FilePath>
-            </File>
-            <File>
-              <FileName>sgfx_eeprom_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Sigfox/App/sgfx_eeprom_if.c</FilePath>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
             </File>
           </Files>
         </Group>
@@ -609,26 +563,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -640,24 +584,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -675,9 +614,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -690,24 +634,24 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_uart.c</FileName>
@@ -720,45 +664,55 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Utilities</GroupName>
+          <GroupName>Drivers/CMSIS</GroupName>
           <Files>
             <File>
-              <FileName>stm32_adv_trace.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_adv_trace.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
               <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
               <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
-            <File>
-              <FileName>stm32_seq.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
-            </File>
             <File>
               <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
               <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
-            <File>
-              <FileName>stm32_timer.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
-            </File>
             <File>
               <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
@@ -769,15 +723,20 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Doc</GroupName>
-          <Files>
             <File>
-              <FileName>readme.txt</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\readme.txt</FilePath>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
index 5707d81c..7c9ba28d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
index d8b28e60..6274a768 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
index d8c59f1d..c307169e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
@@ -14,13 +14,11 @@ LR_IROM1 0x08020000 0x00020000  {    ; load region size_region
     *(.USER_embedded_Keys)
   }
   ; SRAM2 dedicated to M0+
-  RW_IRAM1 0x2000C000 0x00004000  {  ; RW data
+  RW_IRAM1 0x2000A000 0x00006000  {  ; RW data
    .ANY (+RW +ZI)
   }
 
-  RW_RAM_SHARED 0x2000B000 0x1000  {
+  RW_RAM_SHARED 0x20009000 0x1000  {
    *(MB_MEM2)
   }
 }
-
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
index 79a183e1..5141de4a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -14,7 +14,7 @@ LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
    .ANY (+RW +ZI)
   }
   ; Backup SRAM2 dedicated to M4
-RW_IRAM2 0x20008000 0x00003000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+RW_IRAM2 0x20008000 0x00001000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
     *(MAPPING_TABLE)
     *(MB_MEM1)
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/.project
index 05b18ad4..a0ddc62f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/.project
@@ -12,159 +12,168 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
 			<name>Sigfox_AT_Slave_DualCore.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox_AT_Slave_DualCore.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox_AT_Slave_DualCore.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1602083952620</id>
+			<id>1612373109269</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.cproject
index e895b2df..3747cafb 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.cproject
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1960582935">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1960582935" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.212834637">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.212834637" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1960582935" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1960582935." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1078788446" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1894221798" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1555962040" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.2059124349" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1141137198" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1643050861" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1295330208" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1703361935" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../CM0PLUS/Sigfox/App | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/Sigfox/Target | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1821006670" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1452244704" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1192511309" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1029608576" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.109614308" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.212834637" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.212834637." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.668095570" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.574162430" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.149922407" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.659669108" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2123991103" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.198572585" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../CM0PLUS/Sigfox/App | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/Sigfox/Target | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1607404845" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.526430705" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1366759913" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1435304068" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.82143255" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.690309466" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.2087610129" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1021860087" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1057049976" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1013432887" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1133718850" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1416147480" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.754628739" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2127872639" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.153140440" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.856114974" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Sigfox/App"/>
@@ -50,6 +51,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
@@ -77,88 +79,85 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1421357066" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.395018993" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1621834610" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.870776501" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1514154219" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.132892369" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1411274434" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.375576908" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.838810410" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.860722006" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1239226590" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.641625220" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1831482068" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1851152147" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.2004382762" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":SFX_LIB_V2.8.1_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.0-CM0-O3.a"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1461659710" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.168783414" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.527967970" name="Place libraries in a linker group (-Wl,--start-group $(LIBS) -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2090973129" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1853027426" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1673471136" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.725537392" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.125786282" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.731438963" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.643428082" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.245814257" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1607033751" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1095695104" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.908359425" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.140200307" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.2042068609" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.2103825747" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1308906850" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.961427701" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.707707342" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1509954700" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1117410562" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.639044280" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.283329705">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.283329705" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1678790034">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1678790034" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.283329705" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.283329705." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1291602160" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.941523797" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.425858552" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1372780721" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2075831148" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.977777846" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.33203459" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1228798478" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/Sigfox/App | ../../../CM0PLUS/Sigfox/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1381659113" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.15059412" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1471891691" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1647912256" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.359874770" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1678790034" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1678790034." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.600359463" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1324038498" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.13695755" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1078923872" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.794460975" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1958283718" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../CM0PLUS/Sigfox/App | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/Sigfox/Target | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1101624304" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.966002913" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.989347285" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2021032782" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1050095358" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1654396083" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1527017926" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.549610145" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.959784812" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.477527134" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.116861652" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1035853506" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.261375317" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1856347277" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1144167166" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Sigfox/App"/>
@@ -167,6 +166,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
@@ -194,42 +194,41 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1616951522" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.335739820" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1852844217" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1684755151" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1370216435" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.660018078" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1920551818" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1067828991" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.877561754" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.431337980" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1037450888" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.414093940" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1023861891" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1073929638" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1771017287" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":SFX_LIB_V2.8.1_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.0-CM0-O3.a"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.133694920" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.398102017" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.1636912998" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1413340946" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1316602346" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1925313823" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.789652383" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1156696391" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.271956581" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1429382028" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.91181585" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.2071101722" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.845089091" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.951328680" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.92146079" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1525497373" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1026628764" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.150337336" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1104406734" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1530491579" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.169546312" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.421644129" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1764756120" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -237,26 +236,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="Sigfox_AT_Slave_DualCore_CM0PLUS.null.674560343" name="Sigfox_AT_Slave_DualCore_CM0PLUS"/>
+		<project id="Sigfox_AT_Slave_DualCore_CM0PLUS.null.142430716" name="Sigfox_AT_Slave_DualCore_CM0PLUS"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1960582935;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1960582935.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.2087610129;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1421357066">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.212834637;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.212834637.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1133718850;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.395018993">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.283329705;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.283329705.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1654396083;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1616951522">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1678790034;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1678790034.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.477527134;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.335739820">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/Sigfox_AT_Slave_DualCore_CM0PLUS"/>
-		</configuration>
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/Sigfox_AT_Slave_DualCore_CM0PLUS"/>
-		</configuration>
-	</storageModule>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.project
index 7cec3a0f..15540d09 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/.project
@@ -25,536 +25,570 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_lptim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_if_utils.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_interface.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/STM32_Key_Management_Services/mac_stm32hal.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/kms_vm_storage.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/STM32_Key_Management_Services/rsa_stm32hal.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/mac_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/STM32_Key_Management_Services/tkms.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/platform_util.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/platform_util.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/rsa_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/sha1.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha1.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/sigfox_aes.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/sha256.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/sigfox_data.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/tkms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ca_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/flash_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/flash_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/flash_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/kms_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/lptim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/lptim.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/lptim.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/mn_lptim_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/mn_lptim_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/mn_lptim_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/nvms_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/features_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/features_info.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmux.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_sigfox.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sigfox.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/sigfox_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/sigfox_info.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/sigfox_info.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/sigfox_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/sigfox_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/sigfox_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/Sigfox/sigfox_aes.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/Sigfox/sigfox_data.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/KMS/App/app_kms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/KMS/App/app_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/KMS/App/app_kms.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/app_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/App/app_sigfox.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/app_sigfox.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/ee.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/App/ee.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/ee.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_cstimer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/App/sgfx_cstimer.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/sgfx_cstimer.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_eeprom_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/mcu_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/mcu_api.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/mcu_api.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/mn_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/mn_api.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/mn_api.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/radio_board_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/rf_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/rf_api.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/rf_api.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/se_nvm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/se_nvm.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/se_nvm.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/sgfx_credentials.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/sgfx_credentials.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/sgfx_credentials.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
index 9e23530f..f98fb740 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,51 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +105,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
-
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
 
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
-
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
index f582b1e5..9908f780 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -46,7 +49,7 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x2000A000, LENGTH = 24K
-  ROM    (rx)    : ORIGIN = 0x08020000, LENGTH = 128K
+  FLASH    (rx)    : ORIGIN = 0x08020000, LENGTH = 124K
   RAM_SHARED (xrw): ORIGIN = 0x20009000, LENGTH = 4K
   USER_Key_region_ROM (rx)    : ORIGIN = 0x0803E500, LENGTH = 768
 }
@@ -54,18 +57,18 @@ MEMORY
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -75,80 +78,103 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
+
+  .USER_embedded_Keys : {
+    . = ALIGN(4);
+    *(.USER_embedded_Keys.encrypted_sigfox_data) 
+    *(.USER_embedded_Keys)
+    . = ALIGN(4);
+  } >USER_Key_region_ROM
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
     
-  } >RAM AT> ROM
+  } >RAM AT> FLASH
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(4);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(4);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> FLASH
 
   /* Uninitialized data section into "RAM" Ram type memory */
-  . = ALIGN(8);
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -158,7 +184,7 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM
@@ -183,6 +209,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MB_MEM2       : { *(MB_MEM2) } >RAM_SHARED
-  .USER_embedded_Keys : { KEEP(*(.USER_embedded_Keys)) } > USER_Key_region_ROM
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/.cproject
index ac1ac12d..ee9e8584 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/.cproject
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.510499553">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.510499553" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.617063235">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.617063235" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.510499553" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.510499553." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1678400492" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.284787441" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.502879227" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.506481174" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1598077140" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.895052151" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.332568802" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1374510481" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/Sigfox/Target | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../CM4/Sigfox/App | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.613846868" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1150909287" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.639739351" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1983406726" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.257044186" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.617063235" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.617063235." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1829494575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1027242362" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1925688773" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1562169761" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1463718694" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1650164646" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/Sigfox/Target | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../CM4/Sigfox/App | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.841600783" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1341094057" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.167719797" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.811339837" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1828831543" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1275296996" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1931032422" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1369918070" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.667158881" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.777478435" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1133813927" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.737317275" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.908834344" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.461371538" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1029187559" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2117168829" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/Target"/>
@@ -47,6 +48,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
@@ -62,74 +64,70 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.993072363" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.482117259" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.323216117" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.965659348" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.489271393" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1797550462" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2141998619" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1365001562" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.149913607" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1633307442" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.403532822" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.835956846" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.2079532268" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.539056867" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.732296957" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.32082868" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1993352015" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.821367527" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1566929436" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1703707845" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.875377324" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1606500981" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.797775444" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.750138200" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.275926411" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.2009959149" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.418821598" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.88161946" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.936700454" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1532551736" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.139394350" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.312006953" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.63442231" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309981289">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309981289" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.788710493">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.788710493" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309981289" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309981289." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1335645313" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1506596601" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.731635055" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1050470984" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.912688238" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.333022666" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1770104701" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1407803418" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/Sigfox/App | ../../../CM4/Sigfox/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1241452157" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2065019057" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.497488852" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.156821329" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2066557779" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.788710493" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.788710493." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1265067500" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.391841521" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1810368503" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1031596388" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.947737085" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1001236448" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/Sigfox/Target | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../CM4/Sigfox/App | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.589670176" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_AT_Slave_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1793665628" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1112899675" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.551818625" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.381114136" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.621904190" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.40410031" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.578149869" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.94210572" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.532202429" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1158171027" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.649522491" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1454818354" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1773403686" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1180232296" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/Target"/>
@@ -137,6 +135,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
@@ -152,30 +151,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1318005309" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1930764654" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1862353338" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.125410676" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2019067694" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.145580979" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1962240381" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1687578125" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2046805057" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1709120778" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1188855924" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1120242105" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1892458091" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.976214243" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.985253416" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1370142219" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1668834133" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.2092159499" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1063421222" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.2065139401" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.691513956" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1145108400" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.675553789" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1316166977" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1852225497" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1137204036" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.788939714" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1907195621" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.2038578226" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1927792794" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.724501632" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1639057620" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2005827055" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -183,18 +180,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="Sigfox_AT_Slave_DualCore_CM4.null.1285338582" name="Sigfox_AT_Slave_DualCore_CM4"/>
+		<project id="Sigfox_AT_Slave_DualCore_CM4.null.645995970" name="Sigfox_AT_Slave_DualCore_CM4"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.510499553;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.510499553.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1931032422;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.993072363">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.788710493;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.788710493.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.532202429;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1930764654">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309981289;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1309981289.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.621904190;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1318005309">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.617063235;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.617063235.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1133813927;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.482117259">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/.project
index a66f435a..ebf88204 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/.project
@@ -25,311 +25,315 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmux.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sigfox.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sigfox.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/radio_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/sigfox_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/sigfox_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/sigfox_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/system_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/system_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/system_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/app_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Sigfox/App/app_sigfox.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/app_sigfox.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Sigfox/App/sgfx_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/sgfx_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_at.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Sigfox/App/sgfx_at.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/sgfx_at.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_command.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Sigfox/App/sgfx_command.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/sgfx_command.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_eeprom_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Sigfox/App/sgfx_eeprom_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/sgfx_eeprom_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
index 89dfe9e5..af218d28 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,52 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +106,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
-
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
-
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
 
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
index 1eeab01b..8add7315 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -39,29 +42,29 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x400 ; /* required amount of heap  */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
 _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 128K
   RAM_SHARED (rw): ORIGIN = 0x20008000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
     . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
     . = ALIGN(4);
@@ -76,30 +79,30 @@ SECTIONS
 
     . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
     . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  .ARM.extab   : { 
+  .ARM.extab   : {
     . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .ARM : {
     . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   .preinit_array     :
   {
@@ -108,8 +111,8 @@ SECTIONS
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .init_array :
   {
     . = ALIGN(4);
@@ -118,8 +121,8 @@ SECTIONS
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .fini_array :
   {
     . = ALIGN(4);
@@ -128,23 +131,47 @@ SECTIONS
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
     
-  } >RAM AT> ROM
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
 
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
@@ -182,6 +209,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
-   MB_MEM1 (NOLOAD)       : { *(MB_MEM1) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Sigfox_AT_Slave_DualCore.ioc b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Sigfox_AT_Slave_DualCore.ioc
index 119a0024..34317a8c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Sigfox_AT_Slave_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/Sigfox_AT_Slave_DualCore.ioc
@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
@@ -30,7 +30,7 @@ Dma.Request0=LPUART1_TX
 Dma.RequestsNb=1
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
-KMS.IPParameters=KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_CMAC,KMS_AES_GCM,KMS_MEM_LOGGING,KMS_NB_SESSIONS_MAX
+KMS.IPParameters=KMS_NB_SESSIONS_MAX,KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_LOGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_GCM,KMS_AES_CMAC,KMS_NVM_ENABLED,KMS_VM_DYNAMIC_ENABLED,KMS_NVM_DYNAMIC_ENABLED
 KMS.KMS_AES_CBC=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT
 KMS.KMS_AES_CMAC=KMS_FCT_SIGN|KMS_FCT_VERIFY
 KMS.KMS_AES_ECB=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY
@@ -39,16 +39,18 @@ KMS.KMS_ATTRIBUTES=\#define KMS_ATTRIBUTES
 KMS.KMS_DECRYPT=\#define KMS_DECRYPT
 KMS.KMS_DERIVE_KEY=\#define KMS_DERIVE_KEY
 KMS.KMS_ENCRYPT=\#define KMS_ENCRYPT
-KMS.KMS_MEM_DEBUGGING=\#define KMS_MEM_DEBUGGING
 KMS.KMS_MEM_LOGGING=//\#define KMS_MEM_LOGGING
 KMS.KMS_MEM_USE_ALLOCATOR=KMS_MEM_USE_POOL_ALLOCATOR
 KMS.KMS_NB_SESSIONS_MAX=1
 KMS.KMS_NIKMS_ROUTER_BYPASS=\#define KMS_NIKMS_ROUTER_BYPASS
+KMS.KMS_NVM_DYNAMIC_ENABLED=\#define KMS_NVM_DYNAMIC_ENABLED
+KMS.KMS_NVM_ENABLED=\#define KMS_NVM_ENABLED
 KMS.KMS_OBJECTS=\#define KMS_OBJECTS
 KMS.KMS_SIGN=\#define KMS_SIGN
 KMS.KMS_VERIFY=\#define KMS_VERIFY
+KMS.KMS_VM_DYNAMIC_ENABLED=//\#define KMS_VM_DYNAMIC_ENABLED
 KeepUserPlacement=false
-LPUART1.BaudRate=LPUART_BAUDRATE
+LPUART1.BaudRate=9600
 LPUART1.FIFOMode=UART_FIFOMODE_ENABLE
 LPUART1.IPParameters=BaudRate,FIFOMode
 Mcu.Context0=CortexM4
@@ -58,71 +60,74 @@ Mcu.ContextProject=DualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=RCC
-Mcu.IP11=RTC
-Mcu.IP12=SEQUENCER_M0PLUS
-Mcu.IP13=SEQUENCER_M4
-Mcu.IP14=SIGFOX
-Mcu.IP15=SUBGHZ
-Mcu.IP16=SYS_M0PLUS
-Mcu.IP17=SYS
-Mcu.IP18=TIMER
-Mcu.IP19=TINY_LPM
-Mcu.IP2=DMA
-Mcu.IP3=IPCC
-Mcu.IP4=KMS
-Mcu.IP5=LPTIM1
-Mcu.IP6=LPUART1
-Mcu.IP7=MISC
-Mcu.IP8=NVIC1
-Mcu.IP9=NVIC2
-Mcu.IPNb=20
+Mcu.IP10=NVIC2
+Mcu.IP11=RCC
+Mcu.IP12=RTC
+Mcu.IP13=SEQUENCER_M0PLUS
+Mcu.IP14=SEQUENCER_M4
+Mcu.IP15=SIGFOX
+Mcu.IP16=SUBGHZ
+Mcu.IP17=SYS_M0PLUS
+Mcu.IP18=SYS
+Mcu.IP19=TIMER
+Mcu.IP2=DEBUG
+Mcu.IP20=TINY_LPM
+Mcu.IP3=DMA
+Mcu.IP4=IPCC
+Mcu.IP5=KMS
+Mcu.IP6=LPTIM1
+Mcu.IP7=LPUART1
+Mcu.IP8=MISC
+Mcu.IP9=NVIC1
+Mcu.IPNb=21
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_IPCC_VS_IPCC
-Mcu.Pin23=VP_KMS_VS_KMS
-Mcu.Pin24=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
-Mcu.Pin25=VP_MISC_VS_MISC
-Mcu.Pin26=VP_RTC_VS_RTC_Activate
-Mcu.Pin27=VP_RTC_VS_RTC_Calendar
-Mcu.Pin28=VP_RTC_VS_RTC_Alarm_B_Intern
-Mcu.Pin29=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
-Mcu.Pin31=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin32=VP_SIGFOX_VS_Sigfox
-Mcu.Pin33=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin34=VP_SYS_VS_Systick
-Mcu.Pin35=VP_SYS_M0PLUS_VS_Systick
-Mcu.Pin36=VP_TIMER_VS_TIMER
-Mcu.Pin37=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=38
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_IPCC_VS_IPCC
+Mcu.Pin25=VP_KMS_VS_KMS
+Mcu.Pin26=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
+Mcu.Pin27=VP_MISC_VS_MISC
+Mcu.Pin28=VP_RTC_VS_RTC_Activate
+Mcu.Pin29=VP_RTC_VS_RTC_Calendar
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_RTC_VS_RTC_Alarm_B_Intern
+Mcu.Pin31=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin32=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
+Mcu.Pin33=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin34=VP_SIGFOX_VS_Sigfox
+Mcu.Pin35=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin36=VP_SYS_VS_None
+Mcu.Pin37=VP_SYS_M0PLUS_VS_None
+Mcu.Pin38=VP_TIMER_VS_TIMER
+Mcu.Pin39=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=40
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);LPUART_BAUDRATE,9600
+Mcu.UserConstants=RTC_N_PREDIV_S-CortexM0Plus,10;RTC_PREDIV_S-CortexM0Plus,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A-CortexM0Plus,((1<<(15-RTC_N_PREDIV_S))-1);RTC_N_PREDIV_S-CortexM4,10;RTC_PREDIV_S-CortexM4,((1<<RTC_N_PREDIV_S)-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -136,7 +141,8 @@ NVIC1.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC1.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC1.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC1.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC1.TimeBase=None
 NVIC1.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.ForceEnableDMAVector=true
 NVIC2.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -147,19 +153,22 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.RTC_LSECSS_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC2.TimeBase=None
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -174,40 +183,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=LPUART1_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -215,26 +217,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -247,7 +252,7 @@ ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32WL55JCIx
 ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
-ProjectManager.HeapSize=0x400
+ProjectManager.HeapSize=M4-0x200,M0P-0x400
 ProjectManager.KeepUserCode=true
 ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
@@ -258,11 +263,11 @@ ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=Sigfox_AT_Slave_DualCore.ioc
 ProjectManager.ProjectName=Sigfox_AT_Slave_DualCore
 ProjectManager.RegisterCallBack=
-ProjectManager.StackSize=0x1000
+ProjectManager.StackSize=M4-0x1000,M0P-0x1000
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,false-6-MX_RTC_Init-RTC-true-HAL-false-CortexM4,7-MX_LPUART1_UART_Init-LPUART1-true-HAL-false-CortexM4,8-MX_Sigfox_Init-SIGFOX-false-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,4-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,6-MX_Sigfox_Init-SIGFOX-false-HAL-false-CortexM0Plus,7-MX_LPTIM1_Init-LPTIM1-true-HAL-false-CortexM0Plus,8-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus
+ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,false-6-MX_RTC_Init-RTC-true-HAL-false-CortexM4,7-MX_LPUART1_UART_Init-LPUART1-true-HAL-false-CortexM4,8-MX_Sigfox_Init-SIGFOX-false-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,4-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,6-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus,7-MX_Sigfox_Init-SIGFOX-false-HAL-false-CortexM0Plus,8-MX_LPTIM1_Init-LPTIM1-true-HAL-false-CortexM0Plus
 RCC.AHBFreq_Value=32000000
 RCC.APB1Freq_Value=32000000
 RCC.APB1TimFreq_Value=32000000
@@ -313,29 +318,28 @@ RTC.AsynchPrediv=RTC_PREDIV_A
 RTC.BinMode=RTC_BINARY_ONLY
 RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
 RTC.BinaryAutoClr_B-Alarm\ B=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
-RTC.Format=RTC_FORMAT_BIN
-RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B,Format
+RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B
 SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI0.ConfNb=1
 SH.GPXTI1.0=GPIO_EXTI1
 SH.GPXTI1.ConfNb=1
 SH.GPXTI6.0=GPIO_EXTI6
 SH.GPXTI6.ConfNb=1
-SIGFOX.Activate_BOARD_RESOURCES=both
 SIGFOX.Activate_DEBUG_LINE=true
-SIGFOX.Activate_RADIO_BOARD_INTERFACE=true
+SIGFOX.Activate_RADIO_BOARD_INTERFACE=Bsp
 SIGFOX.DEBUGGER_ON_CM0PLUS=false
-SIGFOX.IPParameters=SUBGHZ_APPLICATION,DEBUGGER_ON_CM0PLUS,Activate_RADIO_BOARD_INTERFACE,Activate_DEBUG_LINE,Activate_BOARD_RESOURCES
+SIGFOX.IPParameters=SUBGHZ_APPLICATION,DEBUGGER_ON_CM0PLUS,Activate_DEBUG_LINE,TX_RFO_CONFIG,Activate_RADIO_BOARD_INTERFACE
 SIGFOX.SUBGHZ_APPLICATION=SIGFOX_AT_SLAVE
+SIGFOX.TX_RFO_CONFIG=RBI_CONF_RFO_LP_HP
 SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
 SYS.userName=SYS_M4
 SYS_M0PLUS.userName=SYS_M0+
-Sigfox.BSP.number=17
+Sigfox.BSP.number=8
 Sigfox0.BSP.STBoard=false
 Sigfox0.BSP.api=Unknown
 Sigfox0.BSP.component=
-Sigfox0.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON
+Sigfox0.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION | SEM_SGX_USE_ADC
 Sigfox0.BSP.i2caddr=0
 Sigfox0.BSP.i2creg=
 Sigfox0.BSP.instance=ADC
@@ -347,7 +351,7 @@ Sigfox0.BSP.solution=ADC
 Sigfox1.BSP.STBoard=false
 Sigfox1.BSP.api=Unknown
 Sigfox1.BSP.component=
-Sigfox1.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION
+Sigfox1.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION | SEM_SGX_USE_RTC
 Sigfox1.BSP.i2caddr=0
 Sigfox1.BSP.i2creg=
 Sigfox1.BSP.instance=RTC
@@ -356,186 +360,78 @@ Sigfox1.BSP.mode=RTC Enabled
 Sigfox1.BSP.name=RTC
 Sigfox1.BSP.semaphore=
 Sigfox1.BSP.solution=RTC
-Sigfox10.BSP.STBoard=false
-Sigfox10.BSP.api=Unknown
-Sigfox10.BSP.component=
-Sigfox10.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox10.BSP.i2caddr=0
-Sigfox10.BSP.i2creg=
-Sigfox10.BSP.instance=PC3
-Sigfox10.BSP.ip=GPIO
-Sigfox10.BSP.mode=Output
-Sigfox10.BSP.name=RF SW CTRL 3
-Sigfox10.BSP.semaphore=
-Sigfox10.BSP.solution=PC3
-Sigfox11.BSP.STBoard=false
-Sigfox11.BSP.api=Unknown
-Sigfox11.BSP.component=
-Sigfox11.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox11.BSP.i2caddr=0
-Sigfox11.BSP.i2creg=
-Sigfox11.BSP.instance=PA0
-Sigfox11.BSP.ip=GPIO
-Sigfox11.BSP.mode=EXTI
-Sigfox11.BSP.name=BUTTON 1
-Sigfox11.BSP.semaphore=
-Sigfox11.BSP.solution=PA0
-Sigfox12.BSP.STBoard=false
-Sigfox12.BSP.api=Unknown
-Sigfox12.BSP.component=
-Sigfox12.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON
-Sigfox12.BSP.i2caddr=0
-Sigfox12.BSP.i2creg=
-Sigfox12.BSP.instance=LPTIM1
-Sigfox12.BSP.ip=LPTIM
-Sigfox12.BSP.mode=Counts internal clock events
-Sigfox12.BSP.name=TIM
-Sigfox12.BSP.semaphore=
-Sigfox12.BSP.solution=LPTIM1
-Sigfox13.BSP.STBoard=false
-Sigfox13.BSP.api=Unknown
-Sigfox13.BSP.component=
-Sigfox13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox13.BSP.i2caddr=0
-Sigfox13.BSP.i2creg=
-Sigfox13.BSP.instance=PC4
-Sigfox13.BSP.ip=GPIO
-Sigfox13.BSP.mode=Output
-Sigfox13.BSP.name=RF SW CTRL 1
-Sigfox13.BSP.semaphore=
-Sigfox13.BSP.solution=PC4
-Sigfox14.BSP.STBoard=false
-Sigfox14.BSP.api=Unknown
-Sigfox14.BSP.component=
-Sigfox14.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox14.BSP.i2caddr=0
-Sigfox14.BSP.i2creg=
-Sigfox14.BSP.instance=PC5
-Sigfox14.BSP.ip=GPIO
-Sigfox14.BSP.mode=Output
-Sigfox14.BSP.name=RF SW CTRL 2
-Sigfox14.BSP.semaphore=
-Sigfox14.BSP.solution=PC5
-Sigfox15.BSP.STBoard=false
-Sigfox15.BSP.api=Unknown
-Sigfox15.BSP.component=
-Sigfox15.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox15.BSP.i2caddr=0
-Sigfox15.BSP.i2creg=
-Sigfox15.BSP.instance=PC6
-Sigfox15.BSP.ip=GPIO
-Sigfox15.BSP.mode=EXTI
-Sigfox15.BSP.name=BUTTON 3
-Sigfox15.BSP.semaphore=
-Sigfox15.BSP.solution=PC6
-Sigfox16.BSP.STBoard=false
-Sigfox16.BSP.api=Unknown
-Sigfox16.BSP.component=
-Sigfox16.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox16.BSP.i2caddr=0
-Sigfox16.BSP.i2creg=
-Sigfox16.BSP.instance=PA1
-Sigfox16.BSP.ip=GPIO
-Sigfox16.BSP.mode=EXTI
-Sigfox16.BSP.name=BUTTON 2
-Sigfox16.BSP.semaphore=
-Sigfox16.BSP.solution=PA1
 Sigfox2.BSP.STBoard=false
 Sigfox2.BSP.api=Unknown
 Sigfox2.BSP.component=
-Sigfox2.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox2.BSP.condition=SEM_SGX_AT_SLAVE
 Sigfox2.BSP.i2caddr=0
 Sigfox2.BSP.i2creg=
-Sigfox2.BSP.instance=PB12
-Sigfox2.BSP.ip=GPIO
-Sigfox2.BSP.mode=Output
-Sigfox2.BSP.name=Debug Line 1
+Sigfox2.BSP.instance=LPUART1
+Sigfox2.BSP.ip=LPUART
+Sigfox2.BSP.mode=Asynchronous
+Sigfox2.BSP.name=USART
 Sigfox2.BSP.semaphore=
-Sigfox2.BSP.solution=PB12
+Sigfox2.BSP.solution=LPUART1
 Sigfox3.BSP.STBoard=false
 Sigfox3.BSP.api=Unknown
 Sigfox3.BSP.component=
-Sigfox3.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox3.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox3.BSP.i2caddr=0
 Sigfox3.BSP.i2creg=
-Sigfox3.BSP.instance=PB13
+Sigfox3.BSP.instance=PB12
 Sigfox3.BSP.ip=GPIO
 Sigfox3.BSP.mode=Output
-Sigfox3.BSP.name=Debug Line 2
+Sigfox3.BSP.name=Debug Line 1
 Sigfox3.BSP.semaphore=
-Sigfox3.BSP.solution=PB13
+Sigfox3.BSP.solution=PB12
 Sigfox4.BSP.STBoard=false
 Sigfox4.BSP.api=Unknown
 Sigfox4.BSP.component=
-Sigfox4.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox4.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON | SEM_SGX_USE_LPTIM
 Sigfox4.BSP.i2caddr=0
 Sigfox4.BSP.i2creg=
-Sigfox4.BSP.instance=PB14
-Sigfox4.BSP.ip=GPIO
-Sigfox4.BSP.mode=Output
-Sigfox4.BSP.name=Debug Line 3
+Sigfox4.BSP.instance=LPTIM1
+Sigfox4.BSP.ip=LPTIM
+Sigfox4.BSP.mode=Counts internal clock events
+Sigfox4.BSP.name=TIM
 Sigfox4.BSP.semaphore=
-Sigfox4.BSP.solution=PB14
+Sigfox4.BSP.solution=LPTIM1
 Sigfox5.BSP.STBoard=false
 Sigfox5.BSP.api=Unknown
 Sigfox5.BSP.component=
-Sigfox5.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox5.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox5.BSP.i2caddr=0
 Sigfox5.BSP.i2creg=
-Sigfox5.BSP.instance=PB10
+Sigfox5.BSP.instance=PB13
 Sigfox5.BSP.ip=GPIO
 Sigfox5.BSP.mode=Output
-Sigfox5.BSP.name=Debug Line 4
+Sigfox5.BSP.name=Debug Line 2
 Sigfox5.BSP.semaphore=
-Sigfox5.BSP.solution=PB10
+Sigfox5.BSP.solution=PB13
 Sigfox6.BSP.STBoard=false
 Sigfox6.BSP.api=Unknown
 Sigfox6.BSP.component=
-Sigfox6.BSP.condition=SEM_SGX_AT_SLAVE
+Sigfox6.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox6.BSP.i2caddr=0
 Sigfox6.BSP.i2creg=
-Sigfox6.BSP.instance=LPUART1
-Sigfox6.BSP.ip=LPUART
-Sigfox6.BSP.mode=Asynchronous
-Sigfox6.BSP.name=USART
+Sigfox6.BSP.instance=PB14
+Sigfox6.BSP.ip=GPIO
+Sigfox6.BSP.mode=Output
+Sigfox6.BSP.name=Debug Line 3
 Sigfox6.BSP.semaphore=
-Sigfox6.BSP.solution=LPUART1
+Sigfox6.BSP.solution=PB14
 Sigfox7.BSP.STBoard=false
 Sigfox7.BSP.api=Unknown
 Sigfox7.BSP.component=
-Sigfox7.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
+Sigfox7.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox7.BSP.i2caddr=0
 Sigfox7.BSP.i2creg=
-Sigfox7.BSP.instance=PB11
+Sigfox7.BSP.instance=PB10
 Sigfox7.BSP.ip=GPIO
 Sigfox7.BSP.mode=Output
-Sigfox7.BSP.name=LED 3
+Sigfox7.BSP.name=Debug Line 4
 Sigfox7.BSP.semaphore=
-Sigfox7.BSP.solution=PB11
-Sigfox8.BSP.STBoard=false
-Sigfox8.BSP.api=Unknown
-Sigfox8.BSP.component=
-Sigfox8.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox8.BSP.i2caddr=0
-Sigfox8.BSP.i2creg=
-Sigfox8.BSP.instance=PB9
-Sigfox8.BSP.ip=GPIO
-Sigfox8.BSP.mode=Output
-Sigfox8.BSP.name=LED 2
-Sigfox8.BSP.semaphore=
-Sigfox8.BSP.solution=PB9
-Sigfox9.BSP.STBoard=false
-Sigfox9.BSP.api=Unknown
-Sigfox9.BSP.component=
-Sigfox9.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox9.BSP.i2caddr=0
-Sigfox9.BSP.i2creg=
-Sigfox9.BSP.instance=PB15
-Sigfox9.BSP.ip=GPIO
-Sigfox9.BSP.mode=Output
-Sigfox9.BSP.name=LED 1
-Sigfox9.BSP.semaphore=
-Sigfox9.BSP.solution=PB15
+Sigfox7.BSP.solution=PB10
 VP_ADC_TempSens_Input.Mode=IN-TempSens
 VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
 VP_ADC_Vref_Input.Mode=IN-Vrefint
@@ -566,12 +462,15 @@ VP_SIGFOX_VS_Sigfox.Mode=Sigfox_Enabled
 VP_SIGFOX_VS_Sigfox.Signal=SIGFOX_VS_Sigfox
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_M0PLUS_VS_Systick.Mode=SysTick
-VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_M0PLUS_VS_None.Mode=None
+VP_SYS_M0PLUS_VS_None.Signal=SYS_M0PLUS_VS_None
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=Sigfox_AT_Slave_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/readme.txt
index 34482192..4bea0146 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_AT_Slave_DualCore/readme.txt
@@ -1,9 +1,9 @@
 /**
   @page Sigfox_AT_Slave_DualCore Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/Sigfox/Sigfox_AT_Slave_DualCore/readme.txt 
+  * @file    Applications/Sigfox/Sigfox_AT_Slave_DualCore/readme.txt
   * @author  MCD Application Team
   * @brief   This application is a simple demo application software of a Sigfox
   *          modem controlled though AT command interface over UART by an
@@ -37,13 +37,13 @@ This application is targeting the NUCLEO-WL55JC1 (HIGH-BAND) embedding the STM32
 
 Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ca_conf.h                         This file contains configuration for Cryptographic API (CA)
                                                                                 module functionalities.
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ca_low_level.h                    This file contains the low level definitions of the Cryptographic API (CA) module.
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/flash_if.h                        This file provides interface to low level driver
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/flash_if.h                        This file contains definitions for FLASH Interface functionalities.
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc.h                            This file contains all the function prototypes for
                                                                                 the ipcc.c file
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/ipcc_if.h                         This file contains the interface of the ipcc driver on CM0PLUS.
@@ -81,11 +81,10 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Inc/utilities_def.h                   Definitions for modules requiring utilities
   - Sigfox_AT_Slave_DualCore/CM0PLUS/KMS/App/app_kms.h                          !!! No description found !!!
   - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.h                              API which interfaces CM0PLUS to IPCC
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h                        Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                      API for CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h                     API provided to CM0 appli to register and handle Sigfox to MBMUX
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                        API for CM0PLUS applic to handle the SYSTEM MBMUX channel
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                      API for CM0PLUS applic to register and handle TRACE via MBMUX
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                      API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h                     API provided to CM0 application to register and handle Sigfox to MBMUX
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                        API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                      API for CM0PLUS application to register and handle TRACE via MBMUX
   - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                    This file implements the CM0PLUS side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h                   This file implements the CM0 side wrapper of the SigfoxMac interface
@@ -96,7 +95,7 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h                  Interface for  cstimer.c driver
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h                eeprom interface to the upper module.
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h                   provides encrypted data
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h                    defines the interfaace to mcu_api.c
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h                    defines the interface to mcu_api.c
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mn_api.h                     monarch library interface
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h                Configure (enable/disable) traces for CM0
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h             Header for Radio interface configuration
@@ -128,11 +127,10 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
   - Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_conf.h                      Header for configuration file to utilities
   - Sigfox_AT_Slave_DualCore/CM4/Core/Inc/utilities_def.h                       Definitions for modules requiring utilities
   - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.h                                  API which interfaces CM4 to IPCC
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.h                            Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h                          API for CM4 applic to register and handle RADIO driver via MBMUX
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.h                         API provided to CM0 appli to register and handle Sigfox to MBMUX
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h                            API for CM4 applic to handle the SYSTEM MBMUX channel
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h                          API for CM4 applic to register and handle TRACE via MBMUX
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.h                          API for CM4 application to register and handle RADIO driver via MBMUX
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.h                         API provided to CM0 application to register and handle Sigfox to MBMUX
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.h                            API for CM4 application to handle the SYSTEM MBMUX channel
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.h                          API for CM4 application to register and handle TRACE via MBMUX
   - Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.h                        This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.h                       This file implements the CM0 side wrapper of the SigfoxMac interface
@@ -146,7 +144,6 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
   - Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.h                      Header for sgfx_command.c
   - Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h                    eeprom interface to the upper module.
   - Sigfox_AT_Slave_DualCore/CM4/Sigfox/Target/se_nvm.h                         header to emulated SE nvm data
-  - Sigfox_AT_Slave_DualCore/Common/Board/board_resources.h                     Header for driver at.c module
   - Sigfox_AT_Slave_DualCore/Common/Board/stm32wlxx_nucleo_conf.h               STM32WLxx_Nucleo board configuration file.
   - Sigfox_AT_Slave_DualCore/Common/MbMux/features_info.h                       Feature list and parameters TypeDefinitions
   - Sigfox_AT_Slave_DualCore/Common/MbMux/mbmux_table.h                         Maps the IPCC channels to memory buffers
@@ -155,10 +152,11 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
   - Sigfox_AT_Slave_DualCore/Common/System/sys_debug.h                          Configuration of the debug.c instances
 
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ca_low_level.c                    This file contains the low level implementations of the Cryptographic API (CA) module.
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/flash_if.c                        This file contains the FLASH driver
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/flash_if.c                        This file provides set of firmware functions to manage Flash
+                                                                                Interface functionalities.
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc.c                            This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c                         Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/ipcc_if.c                         Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/kms_low_level.c                   This file contains implementations for Key Management Services (KMS)
                                                                                 module Low Level access to Flash, CRC...
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/lptim.c                           This file provides code for the configuration
@@ -169,6 +167,8 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
                                                                                 module NVM Low Level access to physical storage (Flash...)
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/rtc.c                             This file provides code for the configuration
                                                                                 of the RTC instances.
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c               This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                    Interrupt Service Routines.
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                    Low layer function to enter/exit low power modes (stop, sleep)
   - Sigfox_AT_Slave_DualCore/CM0PLUS/Core/Src/subghz.c                          This file provides code for the configuration
@@ -178,10 +178,9 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
   - Sigfox_AT_Slave_DualCore/CM0PLUS/KMS/App/app_kms.c                          !!! No description found !!!
   - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/features_info.c                      CM0PLUS supported features list
   - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmux.c                              Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c                        Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                      allows CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c                     allows CM0PLUS applic to register and handle Sigfox to MBMUX
-  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                        allows CM0 applic to handle the SYSTEM MBMUX channel
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                      allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c                     allows CM0PLUS application to register and handle Sigfox to MBMUX
+  - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                        allows CM0 application to handle the SYSTEM MBMUX channel
   - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                      Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
   - Sigfox_AT_Slave_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                    This file implements the CM0 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
@@ -205,7 +204,7 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
                                                                                 of all the requested memory to memory DMA transfers.
   - Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc.c                                This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c                             Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - Sigfox_AT_Slave_DualCore/CM4/Core/Src/ipcc_if.c                             Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - Sigfox_AT_Slave_DualCore/CM4/Core/Src/main.c                                : Main program body
   - Sigfox_AT_Slave_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c                   This file provides code for the MSP Initialization
                                                                                 and de-Initialization codes.
@@ -215,44 +214,44 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
   - Sigfox_AT_Slave_DualCore/CM4/Core/Src/timer_if.c                            Configure RTC Alarm, Tick and Calendar manager
   - Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart.c                               This file provides code for the configuration
                                                                                 of the USART instances.
-  - Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart_if.c                            Configuration of UART MX driver interface for hyperterminal communication
+  - Sigfox_AT_Slave_DualCore/CM4/Core/Src/usart_if.c                            Configuration of UART driver interface for hyperterminal communication
   - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmux.c                                  CM4 side multiplexer to map features to IPCC channels
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_kms.c                            Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c                          allows CM4 applic to register and handle RADIO driver via MBMUX
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.c                         allows CM4 applic to register and handle SigfoxWAN via MBMUX
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c                            allows CM4 applic to handle the SYSTEM MBMUX channel.
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c                          allows CM4 applic to receive by CM0 TRACE via MBMUX
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_radio.c                          allows CM4 application to register and handle RADIO driver via MBMUX
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sigfox.c                         allows CM4 application to register and handle SigfoxWAN via MBMUX
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_sys.c                            allows CM4 application to handle the SYSTEM MBMUX channel.
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/mbmuxif_trace.c                          allows CM4 application to receive by CM0 TRACE via MBMUX
   - Sigfox_AT_Slave_DualCore/CM4/MbMux/radio_mbwrapper.c                        This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - Sigfox_AT_Slave_DualCore/CM4/MbMux/sigfox_mbwrapper.c                       This file implements the CM4 side wrapper of the Sigfox interface
                                                                                 shared between M0 and M4.
-  - Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.c                       allows CM4 applic to handle the SYSTEM MBMUX channel.
+  - Sigfox_AT_Slave_DualCore/CM4/MbMux/system_mbwrapper.c                       allows CM4 application to handle the SYSTEM MBMUX channel.
   - Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/app_sigfox.c                        Application of the Sigfox Middleware
   - Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_app.c                          provides code for the application of the sigfox Middleware
   - Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_at.c                           Header for driver sgfx_at.c module
   - Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_command.c                      main command driver dedicated to command AT
   - Sigfox_AT_Slave_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c                    eeprom interface to the sigfox component
-  - Sigfox_AT_Slave_DualCore/Common/Board/board_resources.c                     Source file
   - Sigfox_AT_Slave_DualCore/Common/System/system_stm32wlxx.c                   CMSIS Cortex Device Peripheral Access Layer System Source File
   - Sigfox_AT_Slave_DualCore/Common/System/sys_debug.c                          Enables 4 debug pins for internal signals RealTime debugging
+  - Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c  STM32CubeIDE Minimal System calls file
+  - Sigfox_AT_Slave_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c    STM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - CM0PLUS (Mw and radio drivers config) 
-        - sys_conf.h, radio_conf.h, mw_log_conf.h, radio_board_if.h, main.h, etc
-    - CM4 (Sigfox appli)
-        - app_sigfox.h, nucleo_conf.h, main.h, etc
-    - Careful: 
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
+    - CM4 (Sigfox application)
+        - sys_conf.h, sgfx_app.h, nucleo_conf.h, main.h, etc
 
   -Set Up:
 
@@ -263,11 +262,11 @@ Applications, SubGHz_Phy, Sigfox, AT_Slave, DualCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all CM4 files and load your image into CM4 target memory
-  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory 
+  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory
   - Reset the system (two cores)
   - Run the example
   - Open a Terminal, connected the Sigfox Object
@@ -277,21 +276,23 @@ In order to make the program work, you must do the following :
   - type AT? to get all available commands
   - Send your AT commands by typing them in the terminal
 
-@par How to use IAR to debug ? 
-  - open project.eww and select CM4 project
-  - make sure the flag DEBUGGER_ON =1 in app_conf.h
-  - better to define the flag LOW_POWER_DISABLE = 1 at least on one MCU (currently debugger has problem in dual core STOP mode)
-  - compile and download (Ctrl + D)
+@par How to debug ?
+  - Open your preferred toolchain and select CM4 project
+  - define the flag DEBUGGER_ENABLED to 1 in CM4\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download
   - put a breakpoint in sys_app.c one line after HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
   - run CM4 (the above functions sets PWR_CR4_C2BOOT flag)
-  - open a second instance of project.eww and select CM0PLUS project
-  - compile and download using "Download active application" 
+  - open a second instance of your preferred toolchain and select CM0PLUS project
+  - to debug CM0PLUS as well, define the flag DEBUGGER_ENABLED to 1 in CM0PLUS\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download using "Download active application"
   - once CM0PLUS code is downloaded reset (system reset) the CM4
   - run CM4 to the breakpoint again
-  - attach to running target CM0PLUS 
+  - attach to running target CM0PLUS
          (CM0PLUS is in a while loop waiting CM4 to give green light to go further)
          (this is done to prevent CM0PLUS to execute too much code before attaching)
-  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exite the while loop
+  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exit the while loop
 
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/.extSettings b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/board_resources.h
deleted file mode 100644
index 953761d8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/board_resources.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/flash_if.h
index e5bd4f0d..9cb596ba 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/flash_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/flash_if.h
@@ -1,9 +1,10 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    flash_if.h
   * @author  MCD Application Team
-  * @brief   This file provides interface to low level driver
-  *****************************************************************************
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
   * @attention
   *
   * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
@@ -14,23 +15,40 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __FLASH_H__
-#define __FLASH_H__
+#ifndef __FLASH_IF_H__
+#define __FLASH_IF_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
 /* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash status enumeration
+  */
+enum
+{
+  FLASH_PARAM_ERROR = -5,
+  FLASH_LOCK_ERROR = -4,
+  FLASH_WRITE_ERROR = -3,
+  FLASH_ERASE_ERROR  = -2,
+  FLASH_ERROR  = -1,
+  FLASH_OK     = 0,
+  FLASH_BUSY   = 1
+};
+
 /* USER CODE BEGIN ET */
 
 /* USER CODE END ET */
@@ -46,18 +64,30 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
+#define PAGE(__ADDRESS__) (uint32_t)((((__ADDRESS__) - FLASH_BASE) % FLASH_BANK_SIZE) / FLASH_PAGE_SIZE) /*!< Get page index from page address */
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function writes a user flash area (read/modify/write)
+  * @param  address: ptr to user flash area
+  * @param  data: ptr to data to be written
+  * @param  size: number of 32b.
+  * @param  dataTempPage: ptr used to copy already written page in ram
+  * @return Flash status.
+  */
+int32_t FLASH_IF_Write(uint32_t  address, uint8_t *data, uint32_t size, uint8_t *dataTempPage);
+
 /**
   * Writes a 64-bit word in flash at a specific address.
   * @param address (in bytes) must be a multiple of 8.
   * @param data data to write
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
   */
-extern int32_t HW_FLASH_Write(uint32_t address, uint64_t data);
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data);
 
 /**
   * Erases 'n' flash pages from page number 'page' to page number
@@ -71,26 +101,14 @@ extern int32_t HW_FLASH_Write(uint32_t address, uint64_t data);
   * @param page memory start page number
   * @param n number of page
   * @param interrupt choice polling/interrupt
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
-  */
-extern int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt);
-
-/**
-  * Get from Option Bytes the IPCC buffer address
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
-  */
-extern uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void);
-
-/**
-  * Get from Option Bytes the SFSA secure flash address
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
   */
-extern uint32_t HW_FLASH_OB_GetSFSA(void);
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt);
 
 /**
   * Callback
   */
-extern void HWCB_FLASH_EndOfCleanup(void);
+void HWCB_FLASH_EndOfCleanup(void);
 
 /* USER CODE BEGIN EFP */
 
@@ -100,6 +118,6 @@ extern void HWCB_FLASH_EndOfCleanup(void);
 }
 #endif
 
-#endif /* __FLASH_H__ */
+#endif /* __FLASH_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/lptim.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/lptim.h
index cc1f8fe9..7fe5ac5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/lptim.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/lptim.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/main.h
index fe91d70b..2aa45791 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -62,24 +61,23 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
 #define LED1_Pin GPIO_PIN_15
 #define LED1_GPIO_Port GPIOB
 #define LED2_Pin GPIO_PIN_9
 #define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
 #define RF_CTRL3_Pin GPIO_PIN_3
 #define RF_CTRL3_GPIO_Port GPIOC
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
 #define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
 #define RF_CTRL2_Pin GPIO_PIN_5
 #define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define RF_CTRL1_Pin GPIO_PIN_4
 #define RF_CTRL1_GPIO_Port GPIOC
 #define BUT3_Pin GPIO_PIN_6
@@ -92,8 +90,8 @@ void Error_Handler(void);
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/mn_lptim_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/mn_lptim_if.h
index 542d0487..d1831b4d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/mn_lptim_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/mn_lptim_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_lptim_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MN_LPTIM_IF_H__
@@ -25,6 +27,8 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
+#include "lptim.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -71,4 +75,3 @@ void MN_LPTIM_IF_DeInit(void);
 #endif /* __MN_LPTIM_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32wlxx_hal_conf.h
index 64b98a7c..088f81d1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32wlxx_nucleo_conf.h
index 8dae344f..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     150U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_app.h
index d7f25dc8..37d3218b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -33,6 +35,11 @@ extern "C" {
 
 /* USER CODE END Includes */
 
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -68,9 +75,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_conf.h
index b3806936..cea8b074 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -41,29 +43,33 @@ extern "C" {
   * @brief Temperature and pressure values are retrieved from sensors shield
   *        (instead of sending dummy values). It requires MEMS IKS shield
   */
-#define SENSOR_ENABLED  0
+#define SENSOR_ENABLED              0
 
 /**
   * @brief  Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_debug.h
index bbae8f87..710e8852 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_debug.h
@@ -43,89 +43,89 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/**  Definition for Debug Line 1   **/
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 /* USER CODE BEGIN EC */
 
@@ -137,39 +137,41 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
@@ -177,9 +179,20 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initializes the debug
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_sensors.h
index 27c3485c..fc37f342 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_sensors.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/sys_sensors.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SENSORS_H__
@@ -54,13 +56,12 @@ typedef struct
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
 #define HTS221_0    0U
 #define LPS22HB_0   1U
 #endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
-
-/* USER CODE BEGIN EC */
-
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -75,15 +76,15 @@ typedef struct
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief  initialises the environmental sensor
+  * @brief  initialize the environmental sensor
   */
-void  EnvSensors_Init(void);
+int32_t EnvSensors_Init(void);
 
 /**
   * @brief  Environmental sensor  read.
   * @param  sensor_data sensor data
   */
-void EnvSensors_Read(sensor_t *sensor_data);
+int32_t EnvSensors_Read(sensor_t *sensor_data);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/usart.h
index c196d42b..29cb339e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/utilities_conf.h
index 8f8d9d54..2fb01d50 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/utilities_def.h
index 144df031..6dab049e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   CFG_LPM_SGFX_MN_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/flash_if.c
index f9d9852d..a33a673d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/flash_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/flash_if.c
@@ -1,9 +1,11 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    flash_if.c
   * @author  MCD Application Team
-  * @brief   This file contains the FLASH driver
-  *****************************************************************************
+  * @brief   This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
   * @attention
   *
   * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
@@ -14,13 +16,13 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "stm32wlxx.h"
 #include "flash_if.h"
+#include "stm32_mem.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -38,14 +40,14 @@
 
 /* Private define ------------------------------------------------------------*/
 /**
-  * @brief Flash status enumeration
+  * @brief Flash empty status enumeration
   */
 enum
 {
-  FLASH_ERROR  = -1,
-  FLASH_OK     = 0,
-  FLASH_BUSY   = 1
+  FLASH_EMPTY      = 0,
+  FLASH_NOT_EMPTY  = 1
 };
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -61,46 +63,136 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
+  * @retval HAL Status.
+  */
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength);
+
+/**
+  * @brief  This function checks if part of Flash is empty
+            It handles 32b unaligned address
+  * @param  addr: Start of user flash area
+  * @param  size: number of bytes.
+  * @retval FLASH_EMPTY or FLASH_NOT_EMPTY.
+  */
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-int32_t HW_FLASH_Write(uint32_t address,
-                       uint64_t data)
+int32_t FLASH_IF_Write(uint32_t address, uint8_t *data, uint32_t size, uint8_t *dataTempPage)
 {
-  /* USER CODE BEGIN HW_FLASH_Write_1 */
+  /* USER CODE BEGIN FLASH_IF_Write_1 */
+
+  /* USER CODE END FLASH_IF_Write_1 */
+  int32_t status = FLASH_OK;
+  uint32_t page_start_index = PAGE(address);
+  uint32_t page_end_index = PAGE(address + size - 1);
+  uint32_t curr_size = size;
+  uint32_t curr_dest_addr = address;
+  uint32_t curr_src_addr = (uint32_t)data;
+
+  if ((data == NULL) || ((size % sizeof(uint64_t)) != 0) || ((address % sizeof(uint64_t)) != 0))
+  {
+    return FLASH_PARAM_ERROR;
+  }
+
+  if (READ_BIT(FLASH->CR, FLASH_CR_LOCK) != 0U)
+  {
+    return FLASH_LOCK_ERROR;
+  }
 
-  /* USER CODE END HW_FLASH_Write_1 */
-  HAL_StatusTypeDef hal_status = HAL_ERROR;
+  if (page_start_index != page_end_index)
+  {
+    curr_size = FLASH_PAGE_SIZE - (address % FLASH_PAGE_SIZE);
+  }
+
+  for (uint32_t idx = page_start_index; idx <= page_end_index; idx++)
+  {
+    if (FLASH_IF_IsEmpty((uint8_t *)curr_dest_addr, curr_size) != FLASH_EMPTY)
+    {
+      if (dataTempPage == NULL)
+      {
+        return FLASH_PARAM_ERROR;
+      }
+      /* backup initial Flash page data in RAM area */
+      UTIL_MEM_cpy_8(dataTempPage, (uint8_t *)(idx * FLASH_PAGE_SIZE + FLASH_BASE), FLASH_PAGE_SIZE);
+      /* copy fragment into RAM area */
+      UTIL_MEM_cpy_8(&dataTempPage[((uint32_t)curr_dest_addr) % FLASH_PAGE_SIZE], (uint8_t *)curr_src_addr, curr_size);
+
+      /*  erase the Flash sector, to avoid writing twice in RAM */
+      if (FLASH_IF_EraseByPages(idx, 1, 0) != FLASH_OK)
+      {
+        status = FLASH_ERASE_ERROR;
+        break; /* exit for loop */
+      }
+      else
+      {
+        /* copy the whole flash sector including fragment from RAM to Flash*/
+        if (FLASH_IF_Write_Buffer(idx * FLASH_PAGE_SIZE + FLASH_BASE, dataTempPage, FLASH_PAGE_SIZE) != FLASH_OK)
+        {
+          status = FLASH_WRITE_ERROR;
+          break; /* exit for loop */
+        }
+      }
+    }
+    else
+    {
+      if (FLASH_IF_Write_Buffer(curr_dest_addr, (uint8_t *)curr_src_addr, curr_size) != FLASH_OK)
+      {
+        status = FLASH_WRITE_ERROR;
+        break; /* exit for loop */
+      }
+    }
+
+    /* 2nd part of memory overlapped on 2nd flash sector */
+    curr_dest_addr += curr_size;
+    curr_src_addr += curr_size;
+    curr_size = size - curr_size;
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_2 */
+
+  /* USER CODE END FLASH_IF_Write_2 */
+}
 
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data)
+{
+  /* USER CODE BEGIN FLASH_IF_Write64_1 */
+
+  /* USER CODE END FLASH_IF_Write64_1 */
   while (*(uint64_t *)address != data)
   {
     while (LL_FLASH_IsActiveFlag_OperationSuspended());
-
-    hal_status =
-      HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
+    HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
   }
 
-  return ((hal_status == HAL_OK) ? FLASH_OK :
-          ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERROR));
+  return FLASH_OK;
   /* USER CODE BEGIN HW_FLASH_Write_2 */
 
   /* USER CODE END HW_FLASH_Write_2 */
 }
 
-int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt)
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt)
 {
-  /* USER CODE BEGIN HW_FLASH_Erase_1 */
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_1 */
 
-  /* USER CODE END HW_FLASH_Erase_1 */
+  /* USER CODE END FLASH_IF_EraseByPages_1 */
   HAL_StatusTypeDef hal_status;
   FLASH_EraseInitTypeDef erase_str;
   uint32_t page_error;
 
   erase_str.TypeErase = FLASH_TYPEERASE_PAGES;
-  erase_str.Page      = page;
-  erase_str.NbPages   = n;
+  erase_str.Page = page;
+  erase_str.NbPages = n;
 
   /* Erase the Page */
   if (interrupt)
@@ -112,33 +204,10 @@ int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt)
     hal_status = HAL_FLASHEx_Erase(&erase_str, &page_error);
   }
 
-  return ((hal_status == HAL_OK) ? FLASH_OK :
-          ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERROR));
-  /* USER CODE BEGIN HW_FLASH_Erase_2 */
-
-  /* USER CODE END HW_FLASH_Erase_2 */
-}
-
-uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void)
-{
-  /* USER CODE BEGIN HW_FLASH_OB_GetIPCCBufferAddr_1 */
-
-  /* USER CODE END HW_FLASH_OB_GetIPCCBufferAddr_1 */
-  return READ_BIT(FLASH->IPCCBR, FLASH_IPCCBR_IPCCDBA);
-  /* USER CODE BEGIN HW_FLASH_OB_GetIPCCBufferAddr_2 */
+  return ((hal_status == HAL_OK) ? FLASH_OK : ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERASE_ERROR));
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_2 */
 
-  /* USER CODE END HW_FLASH_OB_GetIPCCBufferAddr_2 */
-}
-
-uint32_t HW_FLASH_OB_GetSFSA(void)
-{
-  /* USER CODE BEGIN HW_FLASH_OB_GetSFSA_1 */
-
-  /* USER CODE END HW_FLASH_OB_GetSFSA_1 */
-  return (READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos);
-  /* USER CODE BEGIN HW_FLASH_OB_GetSFSA_2 */
-
-  /* USER CODE END HW_FLASH_OB_GetSFSA_2 */
+  /* USER CODE END FLASH_IF_EraseByPages_2 */
 }
 
 void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
@@ -156,7 +225,14 @@ void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
   /* USER CODE END HAL_FLASH_EndOfOperationCallback_2 */
 }
 
-__WEAK void HWCB_FLASH_EndOfCleanup(void)
+void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_OperationErrorCallback_1 */
+
+  /* USER CODE END HAL_FLASH_OperationErrorCallback_1 */
+}
+
+void HWCB_FLASH_EndOfCleanup(void)
 {
   /* USER CODE BEGIN HWCB_FLASH_EndOfCleanup_1 */
 
@@ -168,6 +244,86 @@ __WEAK void HWCB_FLASH_EndOfCleanup(void)
 /* USER CODE END EF */
 
 /* Private Functions Definition -----------------------------------------------*/
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_1 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_1 */
+  uint8_t *pSrc = pSource;
+  uint64_t src_value;
+  int32_t status = FLASH_OK;
+
+  for (uint32_t i = 0; i < (uLength / sizeof(uint64_t)); i++)
+  {
+    UTIL_MEM_cpy_8(&src_value, pSrc, sizeof(uint64_t));
+
+    /* Avoid writing 0xFFFFFFFFFFFFFFFFLL on erased Flash */
+    if (src_value != UINT64_MAX)
+    {
+      status = FLASH_IF_Write64(pDestination, src_value);
+    }
+
+    pDestination += sizeof(uint64_t);
+    pSrc += sizeof(uint64_t);
+
+    if (status != FLASH_OK)
+    {
+      /* exit the for loop*/
+      break;
+    }
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_2 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_2 */
+}
+
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size)
+{
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_1 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_1 */
+  uint64_t *addr64;
+  uint32_t i;
+
+  /* start memory NOT 64bits aligned */
+  while ((((uint32_t)addr) % sizeof(uint64_t)) != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+
+  /* addr64 is 64 bits aligned */
+  addr64 = (uint64_t *)addr;
+  for (i = 0; i < (size / sizeof(uint64_t)); i++)
+  {
+    if (*addr64++ != UINT64_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+  }
+  size -= sizeof(uint64_t) * i;
+
+  /* end memory NOT 64 bits aligned */
+  addr = (uint8_t *)addr64;
+  while (size != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+  return FLASH_EMPTY;
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_2 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/lptim.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/lptim.c
index c9742859..6b18ae32 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/lptim.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/lptim.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ LPTIM_HandleTypeDef hlptim1;
 void MX_LPTIM1_Init(void)
 {
 
+  /* USER CODE BEGIN LPTIM1_Init 0 */
+
+  /* USER CODE END LPTIM1_Init 0 */
+
+  /* USER CODE BEGIN LPTIM1_Init 1 */
+
+  /* USER CODE END LPTIM1_Init 1 */
   hlptim1.Instance = LPTIM1;
   hlptim1.Init.Clock.Source = LPTIM_CLOCKSOURCE_APBCLOCK_LPOSC;
   hlptim1.Init.Clock.Prescaler = LPTIM_PRESCALER_DIV1;
@@ -43,6 +50,9 @@ void MX_LPTIM1_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPTIM1_Init 2 */
+
+  /* USER CODE END LPTIM1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/main.c
index d4f46c8d..2a787d06 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -157,6 +158,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
@@ -176,9 +178,6 @@ void assert_failed(uint8_t *file, uint32_t line)
   /* USER CODE BEGIN 6 */
   /* User can add his own implementation to report the file name and line number,
      ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-  while (1)
-  {
-  }
   /* USER CODE END 6 */
 }
 #endif /* USE_FULL_ASSERT */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/mn_lptim_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/mn_lptim_if.c
index 3ed8de69..c81d7a90 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/mn_lptim_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/mn_lptim_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_lptim_if.c
@@ -16,12 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "lptim.h"
 #include "mn_lptim_if.h"
 
 /* USER CODE BEGIN Includes */
+
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -63,25 +65,29 @@ extern LPTIM_HandleTypeDef hlptim1;
 void MN_LPTIM_IF_Init(void)
 {
   /* USER CODE BEGIN MN_LPTIM_IF_Init_0 */
+
   /* USER CODE END MN_LPTIM_IF_Init_0 */
 
-  /* Force the LPTIM1 Periheral Clock Reset */
+  /* Force the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_FORCE_RESET();
-  /* Release the LPTIM1 Periheral Clock Reset */
+  /* Release the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_RELEASE_RESET();
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_1 */
+
   /* USER CODE END MN_LPTIM_IF_Init_1 */
 
   MX_LPTIM1_Init();
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_2 */
+
   /* USER CODE END MN_LPTIM_IF_Init_2 */
 
   /* w.a.: LL_EXTI_LINE_X should be enabled in HAL_LPTIM_MspInit */
   LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_29);
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_3 */
+
   /* USER CODE END MN_LPTIM_IF_Init_3 */
 }
 
@@ -90,6 +96,7 @@ void MN_LPTIM_IF_DeInit(void)
   RCC_PeriphCLKInitTypeDef RCC_PeriphCLKInitStruct;
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_0 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_0 */
 
   if (HAL_LPTIM_DeInit(&hlptim1) != HAL_OK)
@@ -98,6 +105,7 @@ void MN_LPTIM_IF_DeInit(void)
   }
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_1 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_1 */
 
   /* Select the PCLK clock as LPTIM1 peripheral clock */
@@ -106,15 +114,17 @@ void MN_LPTIM_IF_DeInit(void)
   HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphCLKInitStruct);
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_2 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_2 */
 
-  /* Force the LPTIM1 Periheral Clock Reset */
+  /* Force the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_FORCE_RESET();
 
-  /* Release the LPTIM1 Periheral Clock Reset */
+  /* Release the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_RELEASE_RESET();
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_3 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_3 */
 
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/rtc.c
index 4464f7dc..c616f129 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,10 +71,13 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/stm32wlxx_it.c
index 0f4129ba..05be41e4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/stm32wlxx_it.c
@@ -77,7 +77,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -188,7 +190,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_app.c
index 3a491968..f2cc7489 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,9 +27,9 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 #include "sys_sensors.h"
 #include "sgfx_eeprom_if.h"
 
@@ -63,16 +65,10 @@
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
-  */
-static void Gpio_PreInit(void);
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -80,16 +76,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -98,13 +90,15 @@ void SystemApp_Init(void)
 
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-  /*Initialises timer and RTC*/
+
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
-  Gpio_PreInit();
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -117,6 +111,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(E2P_Read_VerboseLevel());
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -134,6 +129,7 @@ void SystemApp_Init(void)
 #elif !defined (LOW_POWER_DISABLE)
 #error LOW_POWER_DISABLE not defined
 #endif /* LOW_POWER_DISABLE */
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
@@ -141,8 +137,6 @@ void SystemApp_Init(void)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -155,11 +149,12 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
+
 static void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -173,45 +168,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -252,13 +208,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -273,13 +227,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -290,13 +242,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -311,4 +261,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_debug.c
index 2e4c40f7..f0395f5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_debug.c
@@ -41,6 +41,7 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
+
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 
@@ -58,39 +59,121 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
-  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
-  /* Enable the GPIO Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
   GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -108,44 +191,42 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
 #endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
-
-  /* USER CODE END DBG_Init_Last */
-}
-/* USER CODE BEGIN EF */
+#endif /* CORE_CM4 */
 
-/* USER CODE END EF */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-/* Private Functions Definition -----------------------------------------------*/
+  /* USER CODE END DBG_ProbesInit_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_sensors.c
index e2c80e45..3afffff8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_sensors.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/sys_sensors.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.c
@@ -16,12 +17,14 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "sys_conf.h"
 #include "sys_sensors.h"
 
+/* USER CODE BEGIN Includes */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -104,9 +107,6 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN Includes */
-
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -120,15 +120,14 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
 #define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
 #define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
 #define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
 #define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
 #define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
 #define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
-
-/* USER CODE BEGIN PD */
-
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -137,6 +136,8 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -151,9 +152,6 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -162,11 +160,9 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-void EnvSensors_Read(sensor_t *sensor_data)
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
 {
-  /* USER CODE BEGIN EnvSensors_Read_1 */
-
-  /* USER CODE END EnvSensors_Read_1 */
+  /* USER CODE BEGIN EnvSensors_Read */
   float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
   float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
   float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
@@ -198,17 +194,14 @@ void EnvSensors_Read(sensor_t *sensor_data)
 
   sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
   sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
-  /* USER CODE BEGIN EnvSensors_Read_Last */
 
-  /* USER CODE END EnvSensors_Read_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Read */
 }
 
-void  EnvSensors_Init(void)
+int32_t  EnvSensors_Init(void)
 {
-  /* USER CODE BEGIN EnvSensors_Init_1 */
-
-  /* USER CODE END EnvSensors_Init_1 */
-
+  /* USER CODE BEGIN EnvSensors_Init */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
   /* Init */
 #if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
@@ -259,9 +252,8 @@ void  EnvSensors_Init(void)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif /* SENSOR_ENABLED  */
-  /* USER CODE BEGIN EnvSensors_Init_Last */
-
-  /* USER CODE END EnvSensors_Init_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/timer_if.c
index 615131a0..66e51602 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -104,6 +104,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -153,7 +164,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -173,9 +183,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -183,18 +193,21 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
     /*overload RTC feature enable*/
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -277,64 +290,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,7 +379,7 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
@@ -383,6 +402,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -392,16 +412,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -428,24 +448,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/usart.c
index 343006bc..476eb1f2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_lpuart1_tx;
 void MX_LPUART1_UART_Init(void)
 {
 
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
-  hlpuart1.Init.BaudRate = LPUART_BAUDRATE;
+  hlpuart1.Init.BaudRate = 9600;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
   hlpuart1.Init.StopBits = UART_STOPBITS_1;
   hlpuart1.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_LPUART1_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/usart_if.c
index cfa581cd..36217a2f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&hlpuart1);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/Sigfox_PushButton.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/Sigfox_PushButton.ewd
index e37795a3..797b84dc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/Sigfox_PushButton.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/Sigfox_PushButton.ewd
@@ -40,11 +40,11 @@
                 </option>
                 <option>
                     <name>MemOverride</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\config\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1025,7 +1025,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state>48.0</state>
+                    <state>32.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/Sigfox_PushButton.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/Sigfox_PushButton.ewp
index fcc5aec0..12e3c97c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/Sigfox_PushButton.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/Sigfox_PushButton.ewp
@@ -16,15 +16,15 @@
                 <debug>1</debug>
                 <option>
                     <name>ExePath</name>
-                    <state>Sigfox_PushButton\Exe</state>
+                    <state>Sigfox_PushButton/Exe</state>
                 </option>
                 <option>
                     <name>ObjPath</name>
-                    <state>Sigfox_PushButton\Obj</state>
+                    <state>Sigfox_PushButton/Obj</state>
                 </option>
                 <option>
                     <name>ListPath</name>
-                    <state>Sigfox_PushButton\List</state>
+                    <state>Sigfox_PushButton/List</state>
                 </option>
                 <option>
                     <name>GEndianMode</name>
@@ -32,11 +32,11 @@
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
                 </option>
                 <option>
                     <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
                 </option>
                 <option>
                     <name>GOutputBinary</name>
@@ -108,7 +108,7 @@
                 <option>
                     <name>GeneralMisraRules04</name>
                     <version>0</version>
-                    <state>011111111111111110111111111111111111111111111010110100111111111111110111111111111111111111111111111111110111111011111111111111111111111111111</state>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
                 </option>
                 <option>
                     <name>RTConfigPath2</name>
@@ -218,10 +218,15 @@
                 <version>34</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>CCDefines</name>
-                    <state>STM32WL55xx</state>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
                 </option>
                 <option>
                     <name>CCPreprocFile</name>
@@ -348,22 +353,23 @@
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$/../Core/Inc</state>
                     <state>$PROJ_DIR$/../Sigfox/App</state>
+                    <state>$PROJ_DIR$/../Sigfox/Target</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Crypto</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest</state>
-                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
-                    <state>$PROJ_DIR$/../Sigfox/Target</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Crypto</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Monarch</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -426,11 +432,11 @@
                 </option>
                 <option>
                     <name>IccStaticDestr</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCppInlineSemantics</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCmsis</name>
@@ -440,10 +446,6 @@
                     <name>IccFloatSemantics</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCNoLiteralPool</name>
                     <state>0</state>
@@ -782,7 +784,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1048,84 +1050,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>App</name>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\app_sigfox.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\ee.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\sgfx_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\sgfx_cstimer.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\App\sgfx_eeprom_if.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\flash_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\lptim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\mn_lptim_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_sensors.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1133,25 +1057,106 @@
             </file>
         </group>
         <group>
-            <name>Target</name>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\mcu_api.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\mn_api.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\radio_board_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\rf_api.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\se_nvm.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Sigfox\Target\sgfx_credentials.c</name>
-            </file>
+            <name>User</name>
+            <group>
+                <name>Core</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\adc_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\flash_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\lptim.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\mn_lptim_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_sensors.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Sigfox</name>
+                <group>
+                    <name>App</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\app_sigfox.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\ee.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\sgfx_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\sgfx_cstimer.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\App\sgfx_eeprom_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Target</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\mcu_api.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\mn_api.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\radio_board_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\rf_api.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\se_nvm.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\Sigfox\Target\sgfx_credentials.c</name>
+                    </file>
+                </group>
+            </group>
         </group>
     </group>
     <group>
@@ -1164,9 +1169,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>Sigfox_PushButton</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1251,6 +1253,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1258,19 +1263,19 @@
         <group>
             <name>Sigfox</name>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_aes.c</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.10.0_SE_FDL_MON.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.8.1_SE_FDL_MON.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\Sgfx-Cmac-V1.0.0-CM0-O3.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\Sgfx-Cmac-V1.0.0-CM0-O3.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.1-CM0-O3.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.0-CM0-O3.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_aes.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_data.c</name>
@@ -1284,6 +1289,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/Sigfox_PushButton.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/Sigfox_PushButton.uvoptx
index 4d0c2ea1..0047282e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/Sigfox_PushButton.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/Sigfox_PushButton.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>32000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/App</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,119 +203,119 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/app_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/ee.c</PathWithFileName>
-      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/sgfx_app.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/sgfx_cstimer.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/lptim.c</PathWithFileName>
+      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_sensors.c</PathWithFileName>
-      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
       <FileNumber>10</FileNumber>
@@ -303,8 +323,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -315,8 +335,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -327,8 +347,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_sensors.c</PathWithFileName>
+      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -339,8 +359,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -351,8 +371,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/flash_if.c</PathWithFileName>
-      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -363,8 +383,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/lptim.c</PathWithFileName>
-      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -375,8 +395,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/mn_lptim_if.c</PathWithFileName>
+      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -387,8 +407,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/mn_lptim_if.c</PathWithFileName>
-      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -399,8 +419,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -411,99 +431,99 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Sigfox/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/app_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/ee.c</PathWithFileName>
+      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/sgfx_app.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/sgfx_cstimer.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
+    <GroupName>Application/User/Sigfox/Target</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>25</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../Sigfox/Target/sgfx_credentials.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Target</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
       <FileNumber>26</FileNumber>
@@ -559,23 +579,11 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\Sigfox\Target\se_nvm.c</PathWithFileName>
+      <PathWithFileName>../Sigfox/Target/se_nvm.c</PathWithFileName>
       <FilenameWithoutPath>se_nvm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>31</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\Sigfox\Target\sgfx_credentials.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
   </Group>
 
   <Group>
@@ -586,7 +594,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <FileNumber>31</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -606,7 +614,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -618,7 +626,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -631,11 +639,23 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>7</GroupNumber>
       <FileNumber>35</FileNumber>
@@ -643,271 +663,271 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>57</FileNumber>
@@ -915,8 +935,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -924,7 +944,7 @@
 
   <Group>
     <GroupName>Middlewares/Sigfox</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -943,12 +963,12 @@
     <File>
       <GroupNumber>9</GroupNumber>
       <FileNumber>59</FileNumber>
-      <FileType>4</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</PathWithFileName>
-      <FilenameWithoutPath>SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -959,8 +979,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a</PathWithFileName>
-      <FilenameWithoutPath>SFX_LIB_V2.8.1_SE_FDL_MON.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</PathWithFileName>
+      <FilenameWithoutPath>Sgfx-Cmac-V1.0.0-CM0-O3.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -971,8 +991,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</PathWithFileName>
-      <FilenameWithoutPath>Sgfx-Cmac-V1.0.0-CM0-O3.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a</PathWithFileName>
+      <FilenameWithoutPath>Sgfx-Monarch-V2.0.1-CM0-O3.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -983,20 +1003,20 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a</PathWithFileName>
-      <FilenameWithoutPath>Sgfx-Monarch-V2.0.0-CM0-O3.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_LIB_V2.10.0_SE_FDL_MON.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>9</GroupNumber>
       <FileNumber>63</FileNumber>
-      <FileType>1</FileType>
+      <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1015,8 +1035,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1027,8 +1047,20 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>66</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1042,7 +1074,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>66</FileNumber>
+      <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1054,85 +1086,85 @@
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>67</FileNumber>
+      <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>68</FileNumber>
+      <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>69</FileNumber>
+      <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>70</FileNumber>
+      <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>71</FileNumber>
+      <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>72</FileNumber>
+      <FileNumber>73</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>73</FileNumber>
+      <FileNumber>74</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/Sigfox_PushButton.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/Sigfox_PushButton.uvprojx
index cfb04b04..b467bab4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/Sigfox_PushButton.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/Sigfox_PushButton.uvprojx
@@ -10,15 +10,15 @@
       <TargetName>Sigfox_PushButton</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IROM2(0x0803F800-0x803FFFF) IRAM(0x20000000-0x20007FFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>Sigfox_PushButton\Exe\</OutputDirectory>
+          <OutputDirectory>Sigfox_PushButton\</OutputDirectory>
           <OutputName>Sigfox_PushButton</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -138,10 +138,10 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -183,10 +183,11 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
-            <hadIRAM2>0</hadIRAM2>
-            <hadIROM2>1</hadIROM2>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>1</useUlib>
             <EndSel>0</EndSel>
@@ -210,7 +211,7 @@
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
             <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
+            <Im2Chk>1</Im2Chk>
             <OnChipMemories>
               <Ocm1>
                 <Type>0</Type>
@@ -245,7 +246,7 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
@@ -336,9 +337,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-fshort-enums</MiscControls>
-              <Define>STM32WL55xx,CORE_CM4,USE_HAL_DRIVER</Define>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../Sigfox/App;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../Sigfox/Target</IncludePath>
+              <IncludePath>../Core/Inc;../Sigfox/App;../Sigfox/Target;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -351,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -380,148 +381,148 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/App</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>app_sigfox.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Sigfox/App/app_sigfox.c</FilePath>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Core</GroupName>
+          <Files>
             <File>
-              <FileName>ee.c</FileName>
+              <FileName>main.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/ee.c</FilePath>
+              <FilePath>../Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_app.c</FileName>
+              <FileName>adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/sgfx_app.c</FilePath>
+              <FilePath>../Core/Src/adc.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_cstimer.c</FileName>
+              <FileName>dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/sgfx_cstimer.c</FilePath>
+              <FilePath>../Core/Src/dma.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_eeprom_if.c</FileName>
+              <FileName>lptim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Sigfox/App/sgfx_eeprom_if.c</FilePath>
+              <FilePath>../Core/Src/lptim.c</FilePath>
             </File>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/subghz.c</FilePath>
+              <FilePath>../Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_app.c</FilePath>
+              <FilePath>../Core/Src/rtc.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>flash_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_debug.c</FilePath>
+              <FilePath>../Core/Src/flash_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_sensors.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_sensors.c</FilePath>
+              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Core</GroupName>
-          <Files>
             <File>
-              <FileName>adc.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/adc.c</FilePath>
+              <FilePath>../Core/Src/sys_app.c</FilePath>
             </File>
             <File>
-              <FileName>adc_if.c</FileName>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/adc_if.c</FilePath>
+              <FilePath>../Core/Src/sys_debug.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>sys_sensors.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/board_resources.c</FilePath>
+              <FilePath>../Core/Src/sys_sensors.c</FilePath>
             </File>
             <File>
-              <FileName>dma.c</FileName>
+              <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/dma.c</FilePath>
+              <FilePath>../Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>flash_if.c</FileName>
+              <FileName>adc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/flash_if.c</FilePath>
+              <FilePath>../Core/Src/adc_if.c</FilePath>
             </File>
             <File>
-              <FileName>lptim.c</FileName>
+              <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/lptim.c</FilePath>
+              <FilePath>../Core/Src/usart_if.c</FilePath>
             </File>
             <File>
-              <FileName>main.c</FileName>
+              <FileName>mn_lptim_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/main.c</FilePath>
+              <FilePath>../Core/Src/mn_lptim_if.c</FilePath>
             </File>
             <File>
-              <FileName>mn_lptim_if.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/mn_lptim_if.c</FilePath>
+              <FilePath>../Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/rtc.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>timer_if.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/timer_if.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Sigfox/App</GroupName>
+          <Files>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>app_sigfox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../Sigfox/App/app_sigfox.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileName>ee.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+              <FilePath>../Sigfox/App/ee.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>sgfx_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../Sigfox/App/sgfx_app.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>sgfx_cstimer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart.c</FilePath>
+              <FilePath>../Sigfox/App/sgfx_cstimer.c</FilePath>
             </File>
             <File>
-              <FileName>usart_if.c</FileName>
+              <FileName>sgfx_eeprom_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart_if.c</FilePath>
+              <FilePath>../Sigfox/App/sgfx_eeprom_if.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
+          <GroupName>Application/User/Sigfox/Target</GroupName>
           <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FileName>sgfx_credentials.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Sigfox/Target/sgfx_credentials.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Target</GroupName>
-          <Files>
             <File>
               <FileName>mcu_api.c</FileName>
               <FileType>1</FileType>
@@ -545,12 +546,7 @@
             <File>
               <FileName>se_nvm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\Sigfox\Target\se_nvm.c</FilePath>
-            </File>
-            <File>
-              <FileName>sgfx_credentials.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Sigfox\Target\sgfx_credentials.c</FilePath>
+              <FilePath>../Sigfox/Target/se_nvm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -579,24 +575,9 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -608,24 +589,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -643,9 +619,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_lptim.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -658,14 +639,34 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_lptim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -692,15 +693,15 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
             <File>
-              <FileName>stm32wlxx_hal_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -713,29 +714,29 @@
               <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</FilePath>
             </File>
             <File>
-              <FileName>SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FileName>
-              <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FilePath>
+              <FileName>sigfox_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
             </File>
             <File>
-              <FileName>SFX_LIB_V2.8.1_SE_FDL_MON.a</FileName>
+              <FileName>Sgfx-Cmac-V1.0.0-CM0-O3.a</FileName>
               <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</FilePath>
             </File>
             <File>
-              <FileName>Sgfx-Cmac-V1.0.0-CM0-O3.a</FileName>
+              <FileName>Sgfx-Monarch-V2.0.1-CM0-O3.a</FileName>
               <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a</FilePath>
             </File>
             <File>
-              <FileName>Sgfx-Monarch-V2.0.0-CM0-O3.a</FileName>
+              <FileName>SFX_LIB_V2.10.0_SE_FDL_MON.a</FileName>
               <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a</FilePath>
             </File>
             <File>
-              <FileName>sigfox_data.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
+              <FileName>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilePath>
             </File>
           </Files>
         </Group>
@@ -743,14 +744,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -763,39 +769,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -819,4 +825,19 @@
     <files/>
   </RTE>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
 </Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/startup_stm32wl55xx_cm4.s
index fad38baf..6274a768 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size      EQU     0x00001000
+Stack_Size		EQU     0x1000
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x00000200
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/.cproject
index 69537f8a..bfee137b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/.cproject
@@ -1,195 +1,198 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.885297112">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.885297112" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2144274794">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2144274794" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.885297112" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.885297112." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1237827730" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.512054750" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.2119745410" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.446980529" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.517734651" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.261470817" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.500225758" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.959135035" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../Sigfox/App | ../../Sigfox/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  || ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.610369207" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_PushButton}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.416359418" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.307283659" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.693237449" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1306981493" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2144274794" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2144274794." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1179451273" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1643820600" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1435600447" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1080228708" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.67546181" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1871230374" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../Sigfox/App | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../Sigfox/Target | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  || ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.206877261" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_PushButton}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1855212648" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1699418787" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1351226488" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.741290982" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.72016575" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.236363761" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2030276682" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1663714109" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.847784298" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1170902303" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.575730158" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1615140297" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.144008419" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.742209235" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1836698473" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../Sigfox/App"/>
 									<listOptionValue builtIn="false" value="../../Sigfox/Target"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.73884346" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2112606061" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.651043328" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2102770237" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1090475828" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1469444973" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.981274555" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.814140191" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.40628356" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1640870160" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.582547703" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.429726954" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1339243005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.2059429283" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1287963494" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":SFX_LIB_V2.8.1_SE_FDL_MON.a"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.2055235203" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
-									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.0-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1689056283" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.1850099799" name="Place libraries in a linker group (-Wl,--start-group $(LIBS) -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.651561140" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.927618308" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2064765298" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1751506791" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1271244808" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1300043670" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1340048431" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.367076549" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.963969331" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.660775672" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.38539620" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.237601484" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.544211944" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.938984917" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.125817721" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1353529946" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1271787908" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.167201966" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1147085747" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1213918947" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1745683253">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1745683253" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1364686317">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1364686317" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1745683253" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1745683253." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1007739045" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1536935666" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.92491349" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1490590137" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.477495898" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.255690268" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.220149743" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.575818158" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../Sigfox/App | ../../Sigfox/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  || ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1580319558" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_PushButton}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.187688887" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.736980753" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.32810952" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1137677424" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1364686317" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1364686317." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1208974580" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.66757376" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1710876490" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.832724076" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2011506102" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.739022612" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../Utilities/sequencer | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../Sigfox/App | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Utilities/timer | ../../Sigfox/Target | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  || ../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a | ../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a | ../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1987395273" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_PushButton}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1672011042" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.494265591" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1718860560" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1826937858" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.437402545" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.64813943" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1659629555" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.890127539" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1009774182" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1422351745" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.532704069" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.990665367" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1599413067" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1181281010" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../Sigfox/App"/>
 									<listOptionValue builtIn="false" value="../../Sigfox/Target"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1035391232" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1059596899" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1267839102" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.869906005" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1811280439" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.206577400" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1398596693" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1617200277" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1097217101" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.667266182" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1141127985" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1128119045" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1498237002" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1215725594" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.2013307502" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":SFX_LIB_V2.8.1_SE_FDL_MON.a"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1295478332" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
-									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.0-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1172753658" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.2058326355" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.359988682" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1105678862" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2001562188" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.142066890" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.532817285" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1202737591" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1030293671" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.441928121" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.7878582" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.2005257541" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1907402182" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.968754630" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.332949507" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.242768736" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.13961450" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1363136800" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.170148388" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.2004639747" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1970953604" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1634163126" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -197,26 +200,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="Sigfox_PushButton.null.127472624" name="Sigfox_PushButton"/>
+		<project id="Sigfox_PushButton.null.1115540731" name="Sigfox_PushButton"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.885297112;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.885297112.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.236363761;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.73884346">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1364686317;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1364686317.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1009774182;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1059596899">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1745683253;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1745683253.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.437402545;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1035391232">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2144274794;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2144274794.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1170902303;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2112606061">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/Sigfox_PushButton"/>
-		</configuration>
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/Sigfox_PushButton"/>
-		</configuration>
-	</storageModule>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/.project
index 8c92866e..85e1ba9c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/.project
@@ -25,7 +25,6 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
@@ -36,337 +35,352 @@
 		<link>
 			<name>Sigfox_PushButton.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox_PushButton.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox_PushButton.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/app_sigfox.c</name>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/app_sigfox.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/ee.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/ee.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/sgfx_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/sgfx_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/sgfx_cstimer.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/sgfx_cstimer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/sgfx_eeprom_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/App/sgfx_eeprom_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/adc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/adc_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/board_resources.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/dma.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/flash_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/flash_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/lptim.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/lptim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/main.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_lptim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/mn_lptim_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/mn_lptim_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/rtc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/timer_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32_lpm_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_it.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/subghz.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_debug.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_debug.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_sensors.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_sensors.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/mcu_api.c</name>
+			<name>Middlewares/Sigfox/sigfox_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/mcu_api.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/mn_api.c</name>
+			<name>Middlewares/Sigfox/sigfox_data.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/mn_api.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/radio_board_if.c</name>
+			<name>Middlewares/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/rf_api.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/rf_api.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/se_nvm.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/se_nvm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/sgfx_credentials.c</name>
+			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox/Target/sgfx_credentials.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
+			<name>Application/User/Core/flash_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/flash_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
+			<name>Application/User/Core/lptim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/lptim.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<name>Application/User/Core/mn_lptim_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/mn_lptim_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_lptim.c</name>
+			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<name>Application/User/Core/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<name>Application/User/Core/sys_sensors.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_sensors.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<name>Application/User/Sigfox/App/app_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/app_sigfox.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<name>Application/User/Sigfox/App/ee.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/ee.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<name>Application/User/Sigfox/App/sgfx_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/sgfx_app.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<name>Application/User/Sigfox/App/sgfx_cstimer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/sgfx_cstimer.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
+			<name>Application/User/Sigfox/App/sgfx_eeprom_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/App/sgfx_eeprom_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Sigfox/sigfox_aes.c</name>
+			<name>Application/User/Sigfox/Target/mcu_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/mcu_api.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Sigfox/sigfox_data.c</name>
+			<name>Application/User/Sigfox/Target/mn_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/mn_api.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Application/User/Sigfox/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/radio_board_if.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Application/User/Sigfox/Target/rf_api.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/rf_api.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/se_nvm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/se_nvm.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/sgfx_credentials.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox/Target/sgfx_credentials.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/Core/sysmem.c
deleted file mode 100644
index 656b3aa2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/Core/sysmem.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- ******************************************************************************
- * @file      sysmem.c
- * @author    Generated by STM32CubeIDE
- * @brief     STM32CubeIDE System Memory calls file
- *
- *            For more information about which C functions
- *            need which of these lowlevel functions
- *            please consult the newlib libc manual
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- ******************************************************************************
- */
-
-/* Includes */
-#include <errno.h>
-#include <stdint.h>
-
-/**
- * Pointer to the current high watermark of the heap usage
- */
-static uint8_t *__sbrk_heap_end = NULL;
-
-/**
- * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
- *        and others from the C library
- *
- * @verbatim
- * ############################################################################
- * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
- * #         #        #                         # Reserved by _Min_Stack_Size #
- * ############################################################################
- * ^-- RAM start      ^-- _end                             _estack, RAM end --^
- * @endverbatim
- *
- * This implementation starts allocating at the '_end' linker symbol
- * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
- * The implementation considers '_estack' linker symbol to be RAM end
- * NOTE: If the MSP stack, at any point during execution, grows larger than the
- * reserved size, please increase the '_Min_Stack_Size'.
- *
- * @param incr Memory size
- * @return Pointer to allocated memory
- */
-void *_sbrk(ptrdiff_t incr)
-{
-  extern uint8_t _end; /* Symbol defined in the linker script */
-  extern uint8_t _estack; /* Symbol defined in the linker script */
-  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
-  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
-  const uint8_t *max_heap = (uint8_t *)stack_limit;
-  uint8_t *prev_heap_end;
-
-  /* Initialize  heap end at first call */
-  if (NULL == __sbrk_heap_end)
-  {
-    __sbrk_heap_end = &_end;
-  }
-
-  /* Protect heap from growing into the reserved MSP stack */
-  if (__sbrk_heap_end + incr > max_heap)
-  {
-    errno = ENOMEM;
-    return (void *)-1;
-  }
-
-  prev_heap_end = __sbrk_heap_end;
-  __sbrk_heap_end += incr;
-
-  return (void *)prev_heap_end;
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
index 690a211f..482ef29f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -1,23 +1,57 @@
 /*
-** LinkerScript
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
 */
 
 /* Entry Point */
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "SRAM1" Ram type memory */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
 
-_Min_Heap_Size  = 0x200; /* required amount of heap  */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
 _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 256K
+  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 256K
   SIGFOX_DATA (rx) : ORIGIN = 0x0803E500, LENGTH = 768  /* memory dedicated to User embedded Keys */
-  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K    /* Non-backup SRAM1 */
-  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K    /* Backup SRAM2 */
 }
 
 /* Sections */
@@ -27,20 +61,21 @@ SECTIONS
   .sigfox_data :
   {
     */sigfox_data.o (.rodata)        /* .sigfox_data sections  */	
-    . = ALIGN(8);
-  } >SIGFOX_DATA   
-  /* The startup code into "ROM" Rom type memory */
+    . = ALIGN(4);
+  } >SIGFOX_DATA
+
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -50,80 +85,82 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
-  /* Initialized data sections into "SRAM1" Ram type memory */
-  .data : 
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM1 AT> ROM
 
-  /* Uninitialized data section into "SRAM1" Ram type memory */
-  . = ALIGN(8);
+  } >RAM1 AT> FLASH
+
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -133,34 +170,34 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM1
 
-  /* Data section into "SRAM1" Ram type memory: Non-backup SRAM1 dedicated to CM4 */
-  . = ALIGN(8);
+  /* Data section into "RAM1" Ram type memory: Non-backup RAM1 dedicated to CM4 */
+  . = ALIGN(4);
   RAM1_region :
   {
     _sRAM1_region = .;         /* define a global symbol at section start */
     *(.RAM1_region)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _eRAM1_region = .;         /* define a global symbol at section end */
   } >RAM1
 
-  /* Data section into "SRAM2" Ram type memory: Backup SRAM2 dedicated to CM4 */
-  . = ALIGN(8);
+  /* Data section into "RAM2" Ram type memory: Backup RAM2 dedicated to CM4 */
+  . = ALIGN(4);
   RAM2_region :
   {
     _sRAM2_region = .;         /* define a global symbol at section start */
     *(.RAM2_region)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _eRAM2_region = .;         /* define a global symbol at section end */
   } >RAM2
 
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
   ._user_heap_stack :
   {
     . = ALIGN(8);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/app_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/app_sigfox.c
index e5188411..165374fe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/app_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/app_sigfox.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_sigfox.h"
@@ -77,11 +79,11 @@ void MX_Sigfox_Process(void)
 
   /* USER CODE END MX_Sigfox_Process_1 */
   UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
-
   /* USER CODE BEGIN MX_Sigfox_Process_2 */
 
   /* USER CODE END MX_Sigfox_Process_2 */
 }
+
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/app_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/app_sigfox.h
index d9166162..3608c67f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/app_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/app_sigfox.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SIGFOX_H__
@@ -37,6 +39,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 /* USER CODE BEGIN EC */
+
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Sigfox Application
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Init(void);
 
 /**
   * @brief  entry Sigfox Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/ee.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/ee.c
index 6b209af1..aa1c02f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/ee.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/ee.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ee.c
@@ -16,6 +17,7 @@
   *
   *****************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "ee.h"
@@ -206,7 +208,7 @@ int32_t EE_Init(int32_t format, uint32_t base_address)
     total_nb_pages =
       2 * (EE_var[0].nb_pages + (CFG_EE_BANK1_SIZE ? EE_var[1].nb_pages : 0));
 
-    if (HW_FLASH_Erase(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
+    if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
     {
       return EE_ERASE_ERROR;
     }
@@ -242,7 +244,7 @@ int32_t EE_Read(int32_t bank, uint16_t addr, uint32_t *data)
   /* USER CODE BEGIN EE_Read_1 */
 
   /* USER CODE END EE_Read_1 */
-  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];;
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
 
   /* Read element starting from active page */
   return EE_ReadEl(pv, addr, data, pv->current_write_page);
@@ -256,7 +258,7 @@ int32_t EE_Write(int32_t bank, uint16_t addr, uint32_t data)
   /* USER CODE BEGIN EE_Write_1 */
 
   /* USER CODE END EE_Write_1 */
-  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];;
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
   uint32_t page;
 
   /* Check if current pool is full */
@@ -334,7 +336,7 @@ int32_t EE_Clean(int32_t bank, int32_t interrupt)
   DBG_EE(EE_1);
 
   /* Erase all the pages of the pool */
-  if (HW_FLASH_Erase(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
+  if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
       != 0)
   {
     return EE_ERASE_ERROR;
@@ -471,7 +473,7 @@ static int32_t EE_Recovery(EE_var_t *pv)
       {
         if (EE_GetState(pv, page) != EE_STATE_ERASED)
         {
-          if (HW_FLASH_Erase(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
+          if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
           {
             return EE_ERASE_ERROR;
           }
@@ -505,7 +507,7 @@ static int32_t EE_Transfer(EE_var_t *pv, uint16_t addr, uint32_t page)
      or ACTIVE, except in case of recovery, where some pages may be already
      in ERASING state.
      However, in case of recovery, we do not not need to set ERASING,
-     as initialization phase erases the unactive pool. */
+     as initialization phase erases the inactive pool. */
   last_page =
     (page < pv->nb_pages) ? (2 * pv->nb_pages - 1) : (pv->nb_pages - 1);
 
@@ -624,7 +626,7 @@ static int32_t EE_WriteEl(EE_var_t *pv, uint16_t addr, uint32_t data)
     EE_FLASH_ADDR(pv, pv->current_write_page) + pv->next_write_offset;
 
   /* Write element in flash */
-  if (HW_FLASH_Write(flash_addr, el) != 0)
+  if (FLASH_IF_Write64(flash_addr, el) != 0)
   {
     return EE_WRITE_ERROR;
   }
@@ -700,7 +702,7 @@ static int32_t EE_SetState(const EE_var_t *pv, uint32_t page, uint32_t state)
   DBG_EE(EE_0);
 
   /* Set new page state inside page header */
-  if (HW_FLASH_Write(flash_addr, EE_PROGRAMMED) != 0)
+  if (FLASH_IF_Write64(flash_addr, EE_PROGRAMMED) != 0)
   {
     return EE_WRITE_ERROR;
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/ee.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/ee.h
index 27947917..81b544f1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/ee.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/ee.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ee.h
@@ -16,6 +17,7 @@
   *
   *****************************************************************************
   */
+/* USER CODE END Header */
 
 #ifndef EE_H__
 #define EE_H__
@@ -35,7 +37,7 @@
   *
   * - M_BEGIN, M_END and DBG() macro definitions.
   *
-  * - Hadrwae flash driver definitions:
+  * - Hardware flash driver definitions:
   *
   *      * HW_FLASH_PAGE_SIZE (in bytes)
   *
@@ -66,7 +68,7 @@
   *
   * Notes
   * -----
-  * - a corrupted word in FLASH detected by the user aoftware shall be set to 0.
+  * - a corrupted word in FLASH detected by the user software shall be set to 0.
   *   The EEPROM emulation software will then handle it properly.
   */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app.c
index f86c8548..30d9bc0f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app.c
@@ -16,8 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
+
 #include "st_sigfox_api.h"
 #include "sgfx_app.h"
 #include "sgfx_app_version.h"
@@ -31,9 +34,9 @@
 #include "stm32_lpm.h"
 #include "stm32_seq.h"
 #include "utilities_def.h"
-#include "sys_sensors.h"
 
 /* USER CODE BEGIN Includes */
+#include "sys_sensors.h"
 
 /* USER CODE END Includes */
 
@@ -59,7 +62,6 @@ extern RadioEvents_t RfApiRadioEvents;
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
@@ -67,9 +69,8 @@ extern RadioEvents_t RfApiRadioEvents;
 /* Private function prototypes -----------------------------------------------*/
 static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc);
 
-static void SendSigfox(void);
-
 /* USER CODE BEGIN PFP */
+static void SendSigfox(void);
 
 /* USER CODE END PFP */
 
@@ -77,10 +78,13 @@ static void SendSigfox(void);
 
 void Sigfox_Init(void)
 {
+  sfx_rc_enum_t sfx_rc = SFX_RC1;
+  sfx_error_t error = 0;
   /* USER CODE BEGIN Sigfox_Init_1 */
-
-  /* USER CODE END Sigfox_Init_1 */
-  sfx_u8 error = 0;
+  BSP_LED_Init(LED_BLUE);
+  BSP_LED_Init(LED_GREEN);
+  /* Initialize button here*/
+  BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
 
   /* Get Sigfox APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION:        V%X.%X.%X\r\n",
@@ -100,27 +104,16 @@ void Sigfox_Init(void)
           (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB1_SHIFT),
           (uint8_t)(__SUBGHZ_PHY_VERSION >> __APP_VERSION_SUB2_SHIFT));
 
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Init(LED_BLUE);
-  BSP_LED_Init(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-#endif /* defined(USE_BSP_DRIVER) */
-
-#if defined(USE_BSP_DRIVER)
-  BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_PB_Init(SYS_BUTTON1, SYS_BUTTON_MODE_EXTI);
-#endif /* defined(USE_BSP_DRIVER) */
+  /* USER CODE END Sigfox_Init_1 */
 
   E2P_Write_Rc(DEFAULT_RC);
+  sfx_rc = E2P_Read_Rc();
 
-  /*OPen Sifox Lib*/
-  error = st_sigfox_open(E2P_Read_Rc());
+  /*Open Sigfox library */
+  error = st_sigfox_open(sfx_rc);
 
   Radio.Init(&RfApiRadioEvents);
-
+  /* USER CODE BEGIN Sigfox_Init_ErrorCheck */
   if (1U == E2P_Read_AtEcho())
   {
     if (error == SFX_ERR_NONE)
@@ -129,81 +122,15 @@ void Sigfox_Init(void)
     }
     else
     {
-      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: %d\n\r\n\r", error);
+      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: 0x%04X\n\r\n\r", error);
     }
   }
-
-  /* Put radio in Sleep waiting next cmd */
-  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_Pb), UTIL_SEQ_RFU, SendSigfox);
+  /* USER CODE END Sigfox_Init_ErrorCheck */
   /* USER CODE BEGIN Sigfox_Init_2 */
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_Pb), UTIL_SEQ_RFU, SendSigfox);
 
   /* USER CODE END Sigfox_Init_2 */
 }
-
-#if defined(USE_BSP_DRIVER)
-void BSP_PB_Callback(Button_TypeDef Button)
-{
-  /* USER CODE BEGIN BSP_PB_Callback_1 */
-
-  /* USER CODE END BSP_PB_Callback_1 */
-#warning: adapt stm32wlxx_it.c to call BSP_PB_IRQHandler if you want to use BSP
-  switch (Button)
-  {
-    case  BUTTON_SW1:
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_Pb), CFG_SEQ_Prio_0);
-      break;
-    default:
-      break;
-  }
-  /* USER CODE BEGIN BSP_PB_Callback_1 */
-
-  /* USER CODE END BSP_PB_Callback_1 */
-}
-#elif defined(MX_BOARD_PSEUDODRIVER)
-/* Note: Current MX does not support EXTI IP neither BSP. */
-/* In order to get a push button IRS by code automatically generated */
-/* this function is today the only available possibility. */
-/* Calling BSP_PB_Callback() from here it shortcuts the BSP. */
-/* If users wants to go through the BSP, it can remove BSP_PB_Callback() from here */
-/* and add a call to BSP_PB_IRQHandler() in the USER CODE SESSION of the */
-/* correspondent EXTIn_IRQHandler() in the stm32wlxx_it.c */
-void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
-{
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_1 */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_1 */
-  switch (GPIO_Pin)
-  {
-    case  SYS_BUTTON1_PIN:
-      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialised */
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_Pb), CFG_SEQ_Prio_0);
-      /* USER CODE BEGIN EXTI_Callback_2 */
-
-      /* USER CODE END EXTI_Callback_2 */
-      break;
-    case  SYS_BUTTON2_PIN:
-      /* USER CODE BEGIN EXTI_Callback_3 */
-
-      /* USER CODE END EXTI_Callback_3 */
-      break;
-    /* USER CODE BEGIN EXTI_Callback_4 */
-
-    /* USER CODE END EXTI_Callback_4 */
-    default:
-      /* USER CODE BEGIN EXTI_Callback_5 */
-
-      /* USER CODE END EXTI_Callback_5 */
-
-      break;
-  }
-  /* USER CODE BEGIN EXTI_Callback_6 */
-
-  /* USER CODE END EXTI_Callback_6 */
-}
-#else
-#error user to provide its board code or to call his board driver functions
-#endif /* defined(USE_BSP_DRIVER) */
-
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
@@ -303,6 +230,9 @@ static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc)
       error = SIGFOX_API_open(&SgfxRc);
       break;
     }
+    /* USER CODE BEGIN st_sigfox_open_case */
+
+    /* USER CODE END st_sigfox_open_case */
     default:
     {
       error = SFX_ERR_API_OPEN;
@@ -316,11 +246,33 @@ static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc)
   /* USER CODE END st_sigfox_open_2 */
 }
 
-static void SendSigfox(void)
+/* USER CODE BEGIN PrFD */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
+/* In order to get a push button IRS by code automatically generated */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to really go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
-  /* USER CODE BEGIN SendSigfox_1 */
+  switch (GPIO_Pin)
+  {
+    case  BUTTON_SW1_PIN:
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_Pb), CFG_SEQ_Prio_0);
+      break;
+    case  BUTTON_SW2_PIN:
+      break;
+    case  BUTTON_SW3_PIN:
+      break;
+    default:
+      break;
+  }
+}
 
-  /* USER CODE END SendSigfox_1 */
+static void SendSigfox(void)
+{
   uint8_t ul_msg[12] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11};
   uint8_t dl_msg[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
   uint32_t  ul_size = 0;
@@ -345,28 +297,15 @@ static void SendSigfox(void)
   ul_msg[ul_size++] = (humidity >> 8) & 0xFF;
   ul_msg[ul_size++] = humidity & 0xFF;
 
-#if defined(USE_BSP_DRIVER)
   BSP_LED_On(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_On(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
 
   SIGFOX_API_send_frame(ul_msg, ul_size, dl_msg, nbTxRepeatFlag, SFX_FALSE);
 
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
 
   APP_LOG(TS_OFF, VLEVEL_L, " done\n\r");
-  /* USER CODE BEGIN SendSigfox_2 */
-
-  /* USER CODE END SendSigfox_2 */
 }
 
-/* USER CODE BEGIN PrFD */
-
 /* USER CODE END PrFD */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app.h
index 96c02e95..e9432537 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_APP_H__
 #define __SGFX_APP_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app_version.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app_version.h
index 52edffa6..7e2b2395 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_cstimer.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_cstimer.c
index c86679dd..8f722834 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_cstimer.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_cstimer.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_cstimer.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sgfx_cstimer.h"
@@ -62,7 +64,7 @@ void RxCarrierSenseInitStatus(void)
   /* USER CODE BEGIN RxCarrierSenseInitStatus_1 */
 
   /* USER CODE END RxCarrierSenseInitStatus_1 */
-  /*Initialises the Flag*/
+  /*Initialize the Flag*/
   rxCarrierSenseFlag = 0;
   /* USER CODE BEGIN RxCarrierSenseInitStatus_2 */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_cstimer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_cstimer.h
index bd7acc9b..d51103ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_cstimer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_cstimer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_cstimer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_CSTIMER_H__
 #define __SGFX_CSTIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.c
index 64d63a2e..cbd604b9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -23,6 +25,8 @@
 #include "ee.h"
 #include "st_sigfox_api.h"
 #include "se_nvm.h"
+#include "sys_conf.h"
+#include "utilities_conf.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -72,8 +76,19 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief        Read Sigfox Configuration from eeprom
+  * @param addr   variable virtual address
+  * @param data   pointer to a 32-bit word (allocated by the caller) containing the
+  *               variable value in case of success.
+  */
 static void E2P_Read(e_EE_ID addr, uint32_t *data);
 
+/**
+  * @brief        Write Sigfox Configuration to eeprom
+  * @param addr   variable virtual address
+  * @param data   32-bit data word to be written
+  */
 static void E2P_Write(e_EE_ID addr, uint32_t data);
 
 /* USER CODE BEGIN PFP */
@@ -152,7 +167,7 @@ void E2P_RestoreFs(void)
   E2P_Write(EE_MCU_NVM_2_ID, 0);
   E2P_Write(EE_MCU_NVM_3_ID, 0);
   E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, 0);
-  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, 0);
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, VERBOSE_LEVEL);
 
   HAL_FLASH_Lock();
   /* USER CODE BEGIN E2P_RestoreFs_2 */
@@ -407,9 +422,9 @@ void E2P_Write_VerboseLevel(uint8_t verboselevel)
   E2P_Write(EE_SGFX_VERBOSELEVEL_ID, (uint32_t) verboselevel);
 
   HAL_FLASH_Lock();
-  /* USER CODE BEGIN E2P_Write_VerboseLevel_1 */
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_2 */
 
-  /* USER CODE END E2P_Write_VerboseLevel_1 */
+  /* USER CODE END E2P_Write_VerboseLevel_2 */
 }
 
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
@@ -561,7 +576,7 @@ E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len)
   E2P_Read(EE_SE_NVM_1_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_2_ID, &data_from_eeprom);
-  read_data[i++] = (sfx_u8) data_from_eeprom;;
+  read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_3_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_4_ID, &data_from_eeprom);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.h
index 02c69e55..a623ee7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_EEPROM_IF_H__
@@ -118,182 +120,164 @@ typedef enum
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_Init(void);
 
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_RestoreFs(void);
 
 /*!
- * @brief Read Output Power
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Read Output Power
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @return Output Power
  */
 int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Write Output Power to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Write Output Power to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @param  power Output Power
  */
 void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power);
 
 /*!
- * @brief Read Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval Region Configuration RC
+ * @brief  Read Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return Region Configuration RC
  */
 sfx_rc_enum_t E2P_Read_Rc(void);
 
 /*!
- * @brief Write Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Region Configuration RC
- * @retval None
+ * @brief  Write Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
  */
 void E2P_Write_Rc(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Read Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Read Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Write Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Write Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Read rssi calibration value from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval rssi calibration value
+ * @brief  Read rssi calibration value from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return rssi calibration value
  */
 int16_t E2P_Read_RssiCal(void);
 
 /*!
- * @brief Writes rssi calibration value to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  rssi calibration value
- * @retval None
+ * @brief  Writes rssi calibration value to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  rssi_cal calibration value
  */
 void E2P_Write_RssiCal(int16_t rssi_cal);
 
 /*!
- * @brief Read Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval at_echo
  */
 uint32_t E2P_Read_AtEcho(void);
 
 /*!
- * @brief Write Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  at_echo
- * @retval None
  */
 void E2P_Write_AtEcho(uint32_t at_echo);
 
 /*!
- * @brief Read KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval KeyType
  */
 sfx_key_type_t E2P_Read_KeyType(void);
 
 /*!
- * @brief Write KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  KeyType
- * @retval None
+ * @brief  Write KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  key_type KeyType setting
  */
 void E2P_Write_KeyType(sfx_key_type_t key_type);
 
 /*!
- * @brief Read EncryptionFlag setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read EncryptionFlag setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval encryption_flag
  */
 uint8_t E2P_Read_EncryptionFlag(void);
 
 /*!
- * @brief Write EncryptionFlag  setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write EncryptionFlag  setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  encryption_flag
- * @retval None
  */
 void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len);
 
 /*!
- * @brief Write Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Write Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Read MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data,  uint32_t len);
 
 /*!
- * @brief Write Region MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Write Region MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param   None
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval the VL
  */
 uint8_t E2P_Read_VerboseLevel(void);
 
 /*!
- * @brief Read verbose levelsetting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Read verbose levelsetting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  verboselevel
- * @retval None
  */
 void E2P_Write_VerboseLevel(uint8_t verboselevel);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sigfox_data.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sigfox_data.h
index a32f9ae0..9dbd7b64 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sigfox_data.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/App/sigfox_data.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file   sigfox_data.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SIGFOX_DATA_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mcu_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mcu_api.c
index 142351f2..4099d895 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mcu_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mcu_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mcu_api.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -31,6 +33,7 @@
 #include "utilities_def.h"
 #include "sys_app.h" /*for APP_LOG*/
 #include "radio_board_if.h"
+#include "radio_conf.h" /* RF_WAKEUP_TIME */
 
 /* USER CODE BEGIN Includes */
 
@@ -116,9 +119,6 @@ sfx_u8 MCU_API_malloc(sfx_u16 size, sfx_u8 **returned_pointer)
 
   /* USER CODE END MCU_API_malloc_1 */
 
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
   /* Allocate a memory : static or dynamic allocation */
   /* knowing that the sigfox library will ask for a buffer once at the SIGFOX_API_open() call. */
   /* This buffer will be released after SIGFOX_API_close() call. */
@@ -144,6 +144,8 @@ sfx_u8 MCU_API_free(sfx_u8 *ptr)
   /* USER CODE BEGIN MCU_API_free_1 */
 
   /* USER CODE END MCU_API_free_1 */
+  /* Free the buffer allocated during the MCU_API_malloc()
+   * called only when SIGFOX_API_close() is called. */
   return SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_free_2 */
 
@@ -158,8 +160,11 @@ sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_t
 
   /* USER CODE END MCU_API_get_voltage_temperature_1 */
 
-  /* brief Get voltage and temperature for Out of band frames*/
-  /* Value must respect the units bellow for backend compatibility*/
+  /* Get the idle voltage of the complete device
+   * Get the TX voltage of the complete device ( during transmission )
+   * Get the temperature of the device
+   * If those values are not available : set it to 0x0000
+   * return the voltage_idle in 1/10 volt on 16bits and 1/10 degrees for the temperature */
   *voltage_idle = (uint16_t) SYS_GetBatteryLevel(); /* mV */
   *voltage_tx = 0;   /* mV */
   *temperature = (uint16_t)((SYS_GetTemperatureLevel() * 10) >> 8);  /* */
@@ -187,8 +192,12 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
   switch (delay_type)
   {
     case SFX_DLY_INTER_FRAME_TRX :
+      /* Interframe used when sending an Uplink Message with a downlink request */
       /* Delay  is 500ms  in FCC and ETSI
-        * In ARIB : minimum delay is 50 ms */
+       * In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX1 */
       if ((sfx_rc == SFX_RC3A) ||
           (sfx_rc == SFX_RC3C) ||
           (sfx_rc == SFX_RC5))
@@ -205,11 +214,18 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
       {
         Delay_Lp(510 - (T_RADIO_DELAY_ON) - T_RADIO_DELAY_OFF); /* 500-525 ms */
       }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX2 */
       break;
 
     case SFX_DLY_INTER_FRAME_TX :
+      /* Interframe used when sending an Uplink Message without downlink request */
       /* Start delay 0 seconds to 2 seconds in FCC and ETSI*/
       /* In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX1 */
       if ((sfx_rc == SFX_RC3A) ||
           (sfx_rc == SFX_RC3C) ||
           (sfx_rc == SFX_RC5))
@@ -221,19 +237,41 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
       {
         Delay_Lp(1000 - T_RADIO_DELAY_ON - T_RADIO_DELAY_OFF); /* 1000 ms */
       }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX2 */
       break;
 
     case SFX_DLY_OOB_ACK :
+      /*  Delay between RX frame and sending ack in oob service frame*/
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK1 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK1 */
       /* Start delay between 1.4 seconds to 4 seconds in FCC and ETSI */
       Delay_Lp(1600 - T_RADIO_DELAY_ON);
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK2 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK2 */
       break;
 
     case SFX_DLY_CS_SLEEP :
+      /* Delay between attempts of carrier sense for the first frame*/
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP1 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP1 */
       Delay_Lp(500 - T_RADIO_DELAY_ON); /* 500 ms */
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP2 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP2 */
       break;
+    /* USER CODE BEGIN SFX_DLY_ADD_CASE */
 
+    /* USER CODE END SFX_DLY_ADD_CASE */
     default :
       err = MCU_ERR_API_DLY;
+      /* USER CODE BEGIN SFX_DLY_DEFAULT */
+
+      /* USER CODE END SFX_DLY_DEFAULT */
       break;
   }
   /* USER CODE BEGIN MCU_API_delay_Last */
@@ -245,26 +283,33 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
 /*******************************************************************/
 sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
 {
-  /* USER CODE BEGIN MCU_API_get_nv_mem_1 */
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_get_nv_mem1 */
 
-  /* USER CODE END MCU_API_get_nv_mem_1 */
+  /* USER CODE END MCU_API_get_nv_mem1 */
+  /* Read out SFX_NVMEM_BLOCK_SIZE bytes in eeprom or equivalent
+   * in flash as Non Volatile Memory (NVM)
+   * This cannot be in RAM : must be remanent*/
   if (E2P_Read_McuNvm(read_data, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
   {
     return MCU_ERR_API_GETNVMEM;
   }
-  /* USER CODE BEGIN MCU_API_get_nv_mem_2 */
+  /* USER CODE BEGIN MCU_API_get_nv_mem2 */
 
-  /* USER CODE END MCU_API_get_nv_mem_2 */
-  return SFX_ERR_NONE;
+  /* USER CODE END MCU_API_get_nv_mem2 */
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_set_nv_mem_1 */
 
   /* USER CODE END MCU_API_set_nv_mem_1 */
-
+  /* Write down SFX_NVMEM_BLOCK_SIZE bytes
+   * in the eeprom or flash such as it can be retrieved
+   * later even if device is switched off or rebooting*/
   if (E2P_Write_McuNvm(data_to_write, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
   {
     return MCU_ERR_API_SETNVMEM;
@@ -272,15 +317,21 @@ sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
   /* USER CODE BEGIN MCU_API_set_nv_mem_2 */
 
   /* USER CODE END MCU_API_set_nv_mem_2 */
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_1 */
 
   /* USER CODE END MCU_API_timer_start_carrier_sense_1 */
+  /* Starts a timer for the carrier sense. You can plug your timer
+   * expiration to a callback that will update the timer event
+   * status checked by RF_API_wait_for_clear_channel*/
+  /* Starts CS timeout during time_duration_in_ms */
+
   APP_LOG(TS_ON, VLEVEL_M, "CS timeout Started= %d msec\n\r", time_duration_in_ms);
   UTIL_TIMER_Create(&Timer_TimeoutCs, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTimerTimeoutCsEvt, NULL);
   UTIL_TIMER_Stop(&Timer_TimeoutCs);
@@ -289,15 +340,19 @@ sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
   /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_2 */
 
   /* USER CODE END MCU_API_timer_start_carrier_sense_2 */
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_start_1 */
 
   /* USER CODE END MCU_API_timer_start_1 */
+  /* Starts MCU timer during time_duration_in_ms */
+  /* This timer start can install a callback to indicate when it occurs
+   * This event will be caught in the MCU_API_wait_for_end_timer() function. */
   uint32_t time_duration_in_millisec = time_duration_in_s * 1000;
   APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Started= %d sec\n\r", time_duration_in_s);
 
@@ -305,112 +360,120 @@ sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
   UTIL_TIMER_Stop(&Timer_Timeout);
   UTIL_TIMER_SetPeriod(&Timer_Timeout, time_duration_in_millisec);
   UTIL_TIMER_Start(&Timer_Timeout);
+
   /* USER CODE BEGIN MCU_API_timer_start_2 */
 
   /* USER CODE END MCU_API_timer_start_2 */
 
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_stop(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_stop_1 */
 
   /* USER CODE END MCU_API_timer_stop_1 */
+  /* Stops MCU timer started in MCU_API_timer_start*/
   APP_LOG(TS_ON, VLEVEL_M, "timer_stop\n\r");
 
   UTIL_TIMER_Stop(&Timer_Timeout);
   /* USER CODE BEGIN MCU_API_timer_stop_2 */
 
   /* USER CODE END MCU_API_timer_stop_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_stop_carrier_sense(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_1 */
 
   /* USER CODE END MCU_API_timer_stop_carrier_sense_1 */
+  /* Abort the carrier sense: stops CS timer */
   APP_LOG(TS_ON, VLEVEL_M, "CS timer_stop\n\r");
 
   UTIL_TIMER_Stop(&Timer_TimeoutCs);
   /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_2 */
 
   /* USER CODE END MCU_API_timer_stop_carrier_sense_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_wait_for_end(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_wait_for_end_1 */
 
   /* USER CODE END MCU_API_timer_wait_for_end_1 */
+  /* This function is waiting (actively or not) on the event for end timer
+   * (started by MCU_API_timer_start) elapsed and then returns*/
   APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Wait\n\r");
 
   UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
   /* USER CODE BEGIN MCU_API_timer_wait_for_end_2 */
 
   /* USER CODE END MCU_API_timer_wait_for_end_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_report_test_result(sfx_bool status, sfx_s16 rssi)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_report_test_result_1 */
 
   /* USER CODE END MCU_API_report_test_result_1 */
+  /* this function is used to to report status and rssi
+   * optionally, it can log data on terminal*/
   rxcount++;
 
   if (status == SFX_TRUE)
   {
-    /* Set the LED3 to inform the user that we received a frame for the device */
-#if defined(USE_BSP_DRIVER)
+    /* Last Rx Packet received*/
+    /* USER CODE BEGIN SFX_TRUE_1 */
     BSP_LED_On(LED_GREEN);
     HAL_Delay(50);
     BSP_LED_Off(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN);
-    HAL_Delay(50);
-    SYS_LED_Off(SYS_LED_GREEN);
-#endif /* defined(USE_BSP_DRIVER) */
+    /* USER CODE END SFX_TRUE_1 */
     okcount++;
     APP_LOG(TS_ON, VLEVEL_H, TERM_GREEN"RX OK. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r  "TERM_RESET, (int32_t) rssi, rxcount,
             ((rxcount - okcount) * 100) / rxcount);
+    /* USER CODE BEGIN SFX_TRUE_2 */
+
+    /* USER CODE END SFX_TRUE_2 */
   }
   else
   {
-#if defined(USE_BSP_DRIVER)
+    /* Last Rx Packet on error or timeout*/
+    /* USER CODE BEGIN SFX_FALSE_1 */
     BSP_LED_On(LED_BLUE);
     HAL_Delay(50);
     BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE);
-    HAL_Delay(50);
-    SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
+    /* USER CODE END SFX_FALSE_1 */
     APP_LOG(TS_ON, VLEVEL_H, TERM_RED"RX KO. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r "TERM_RESET, (int32_t)rssi, rxcount,
             ((rxcount - okcount) * 100) / rxcount);
-  }
+    /* USER CODE BEGIN SFX_FALSE_2 */
 
-  return SFX_ERR_NONE;
+    /* USER CODE END SFX_FALSE_2 */
+  }
   /* USER CODE BEGIN MCU_API_report_test_result_2 */
 
   /* USER CODE END MCU_API_report_test_result_2 */
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_get_version_1 */
 
   /* USER CODE END MCU_API_get_version_1 */
+  /* Reports version and the size of the version buffer*/
   *version = (sfx_u8 *)mcu_api_version;
   if (size == SFX_NULL)
   {
@@ -421,7 +484,7 @@ sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
 
   /* USER CODE END MCU_API_get_version_2 */
 
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 static void Delay_Lp(uint32_t delay_ms)
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mcu_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mcu_api.h
index 892fe41a..c0a63471 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mcu_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mcu_api.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mcu_api.h
   * @author  MCD Application Team
-  * @brief   defines the interfaace to mcu_api.c
+  * @brief   defines the interface to mcu_api.c
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /*!
 \if SIGFOX PATTERN
 ----------------------------------------------
@@ -180,7 +182,7 @@ sfx_u8 MCU_API_free(sfx_u8 *ptr);
 /*!******************************************************************
   * \fn sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_tx, sfx_s16 *temperature)
   * \brief Get voltage and temperature for Out of band frames
-  * Value must respect the units bellow for <B>backend compatibility</B>
+  * Value must respect the units below for <B>backend compatibility</B>
   *
   * \param[in] none
   * \param[out] sfx_u16 *voltage_idle             Device's voltage in Idle state (mV)
@@ -210,28 +212,6 @@ sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle,
   *******************************************************************/
 sfx_u8 MCU_API_delay(sfx_delay_t delay_type);
 
-/*!******************************************************************
-  * \fn sfx_u8 MCU_API_aes_128_cbc_encrypt(sfx_u8 *encrypted_data, sfx_u8 *data_to_encrypt, sfx_u8 aes_block_len, sfx_u8 key[16], sfx_credentials_use_key_t use_key)
-  * \brief Encrypt a complete buffer with Secret or Test key.<BR>
-  * The secret key corresponds to the private key provided from the CRA.
-  * <B>These keys must be stored in a secure place.</B> <BR>
-  * Can be hardcoded or soft coded (iv vector contains '0')
-  *
-  * \param[out] sfx_u8 *encrypted_data            Result of AES Encryption
-  * \param[in] sfx_u8 *data_to_encrypt            Input data to Encrypt
-  * \param[in] sfx_u8 aes_block_len               Input data length (should be a multiple of an AES block size, ie. AES_BLOCK_SIZE bytes)
-  * \param[in] sfx_u8 key[16]                     Input key
-  * \param[in] sfx_credentials_use_key_t use_key  Key to use - private key or input key
-  *
-  * \retval SFX_ERR_NONE:                         No error
-  * \retval MCU_ERR_API_AES:                      AES Encryption error
-  *******************************************************************/
-sfx_u8 MCU_API_aes_128_cbc_encrypt(sfx_u8 *encrypted_data,
-                                   sfx_u8 *data_to_encrypt,
-                                   sfx_u8 aes_block_len,
-                                   sfx_u8 key[16],
-                                   sfx_credentials_use_key_t use_key);
-
 /*!******************************************************************
   * \fn sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
   * \brief This function copies the data read from non volatile memory
@@ -340,7 +320,7 @@ sfx_u8 MCU_API_timer_wait_for_end(void);
   *
   * \param[in] sfx_bool status                    Is SFX_TRUE when result ok else SFX_FALSE
   *                                               See SIGFOX_API_test_mode summary
-  * \param[out] rssi                              RSSI of the received frame
+  * \param[in] rssi                              RSSI of the received frame
   *
   * \retval SFX_ERR_NONE:                         No error
   * \retval MCU_ERR_API_TEST_REPORT:              Report test result error
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mn_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mn_api.c
index 1dd2b585..5a748e02 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mn_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mn_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_api.c
@@ -16,31 +17,32 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "stm32wlxx_hal.h"
 
 #include "mn_api.h"
-#include "lptim.h"
-#include "stm32_lpm.h"
+#include "mn_lptim_if.h"
 #include "radio.h"
-#include "sys_debug.h"
-#include "sys_app.h"
-#include "utilities_conf.h"
-#include "sys_conf.h"             /*For led*/
+#include "platform.h"          /*For led*/
 #include "sys_app.h"           /*For log*/
+#include "stm32_lpm.h"
 #include "stm32_timer.h"
 #include "stm32_seq.h"
 #include "utilities_def.h"
-#include "platform.h"
-#include "mn_lptim_if.h"
 
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
+/**
+  * @brief LPTIM handle
+  */
+extern LPTIM_HandleTypeDef hlptim1;
+
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -52,7 +54,7 @@
 
 /* Private define ------------------------------------------------------------*/
 /*OOK demod on for debug*/
-#define MN_PROCESS_IN_BG 0
+#define MN_PROCESS_IN_BG 1
 
 #define LPTIM_PERIOD     ((uint32_t)  2)        /* 1/16384~61.03us  */
 
@@ -185,7 +187,7 @@ void MN_API_StopRx(void)
   /* USER CODE BEGIN MN_API_StopRx_1 */
 
   /* USER CODE END MN_API_StopRx_1 */
-  /*no need to stanby xosc, radio will just
+  /*no need to standby xosc, radio will just
     change freq with MN_API_change_frequency*/
   /* USER CODE BEGIN MN_API_StopRx_2 */
 
@@ -232,38 +234,19 @@ void MN_API_Disable16KHzSamplingTimer(void)
 void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequency, int32_t best_rssi)
 {
   /* USER CODE BEGIN MN_API_Pattern_Found_1 */
-
+  BSP_LED_On(LED_BLUE);
   /* USER CODE END MN_API_Pattern_Found_1 */
   /* debug function to display sweep/window detected pattern*/
-#if defined(USE_BSP_DRIVER)
-  if (window_type == 0)
-  {
-    BSP_LED_On(LED_BLUE);
-    APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    BSP_LED_Off(LED_BLUE);
-  }
-  else
-  {
-    BSP_LED_On(LED_BLUE);
-    APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    BSP_LED_Off(LED_BLUE);
-  }
-#elif defined(MX_BOARD_PSEUDODRIVER)
   if (window_type == 0)
   {
-    SYS_LED_On(SYS_LED_BLUE);
     APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    SYS_LED_Off(SYS_LED_BLUE);
   }
   else
   {
-    SYS_LED_On(SYS_LED_BLUE);
     APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    SYS_LED_Off(SYS_LED_BLUE);
   }
-#endif /* defined(USE_BSP_DRIVER) */
   /* USER CODE BEGIN MN_API_Pattern_Found_2 */
-
+  BSP_LED_Off(LED_BLUE);
   /* USER CODE END MN_API_Pattern_Found_2 */
 }
 
@@ -338,7 +321,6 @@ void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
   /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_1 */
   int16_t rssi = RADIO_NOISE_LEVEL;
 
-  DBG_GPIO_SET_LINE(GPIOB, GPIO_PIN_12);
   /*read rssi*/
   if (RssiReadOnIT_Enable == 1)
   {
@@ -352,12 +334,11 @@ void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
       RssiBuffWriteIdx = 0;
     }
     /*run process_MonarchBackGround in background*/
-    UTIL_SEQ_SetTask(1 << CFG_SEQ_TASK_MONARCH, CFG_SEQ_Prio_0);
+    UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_Monarch, CFG_SEQ_Prio_0);
 #else
     MN_Timer_CB(rssi);
 #endif /* MN_PROCESS_IN_BG==1 */
   }
-  DBG_GPIO_RST_LINE(GPIOB, GPIO_PIN_12);
   /* USER CODE BEGIN HAL_LPTIM_AutoReloadMatchCallback_2 */
 
   /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_2 */
@@ -370,7 +351,7 @@ static void process_MonarchBackGround(void)
 
   /* USER CODE END process_MonarchBackGround_1 */
   int16_t rssi;
-  DBG_GPIO_SET_LINE(GPIOB, GPIO_PIN_13);
+
   while (RssiBuffWriteIdx != RssiBuffReadIdx)
   {
     rssi = RssiBuff[RssiBuffReadIdx++];
@@ -381,7 +362,6 @@ static void process_MonarchBackGround(void)
     }
     MN_Timer_CB(rssi);
   }
-  DBG_GPIO_RST_LINE(GPIOB, GPIO_PIN_13);
   /* USER CODE BEGIN process_MonarchBackGround_2 */
 
   /* USER CODE END process_MonarchBackGround_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mn_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mn_api.h
index 240019f7..1f76066c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mn_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mn_api.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_api.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MN_API_H__
@@ -53,14 +55,14 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialises the Monarch Low level
-  * @param Callback for rssi samplep rocess
+  * @brief Initialize the Monarch Low level
+  * @param Callback for rssi sample process
   * @retval None
   */
 void MN_API_Init(void (*MN_API_Timer_CB)(int16_t rssi));
 
 /**
-  * @brief DeInitialises the Monarch Low level
+  * @brief DeInitialize the Monarch Low level
   * @param None
   * @retval None
   */
@@ -116,7 +118,7 @@ void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequenc
   * @brief starts timer
   * @param timer_value_ms timer value in ms
   * @param call back when timer elapses
-  * @note Argurment can be left unused
+  * @note Argument can be left unused
   * @retval None
   */void MN_API_TimerSart(uint32_t timer_value_ms, void (*TimeoutHandle)(void *Argument));
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_board_if.h
index 11ef6af2..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     150U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_conf.h
index 29cc81b5..64c1f183 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,7 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
-#include "stm32_mem.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,20 +48,16 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-
-/**
-  * @brief Max payload buffer size
-  */
-#define RADIO_RX_BUF_SIZE          255
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -67,25 +65,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 15UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -125,6 +140,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/rf_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/rf_api.c
index 71140893..a877cf85 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/rf_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/rf_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ****************************************************************************
   * @file    rf_api.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* includes -----------------------------------------------------------*/
 #include "stdint.h"
@@ -50,7 +52,7 @@
 /* Private define ------------------------------------------------------------*/
 #define RF_VER                   "RF_API_V1.0"
 #define SFX_PREAMBLE_LENGTH      2
-#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronise*/
+#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronize*/
 #define SFX_MAX_PAYLOAD_LENGTH   15
 #define SFX_DATARATE_600         600
 #define SFX_DATARATE_100         100
@@ -129,27 +131,34 @@ const RadioEvents_t RfApiRadioEvents =
 /* Exported functions --------------------------------------------------------*/
 sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_init_1 */
 
   /* USER CODE END RF_API_init_1 */
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
   /* Put here all RF initialization concerning the RC IC you are using. */
-  /* this function is dependent of SPI driver or equivalent. */
 
   switch (rf_mode)
   {
     case SFX_RF_MODE_TX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_TX_1 */
+
+      /* USER CODE END SFX_RF_MODE_TX_1 */
+      /* Initialize Tx if necessary*/
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in TX\n\r");
-      /* nothing to do */
-      /* set the RF IC in TX mode : this could be DBPSK100 or 600:  this distinction will be done during the RF_API_send */
-      /* you can add some code to switch on TCXO or warm up quartz for stabilization : in case of frequency drift issue */
+
+      /* USER CODE BEGIN SFX_RF_MODE_TX_2 */
+
+      /* USER CODE END SFX_RF_MODE_TX_2 */
       break;
     }
     case SFX_RF_MODE_RX:
     {
+      /* Configure the RF_IP IC in RX mode : GFSK 600bps*/
+      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+      /* USER CODE BEGIN SFX_RF_MODE_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_RX_1 */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in RX\n\r");
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 1600,
                         SFX_DATARATE_600, NA,
@@ -158,13 +167,19 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* set the RF IC in RX mode : GFSK 600bps is the only mode now */
-      /* Enable interrupts on RX fifo */
-      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+
+      /* USER CODE BEGIN SFX_RF_MODE_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_RX_2 */
       break;
     }
     case SFX_RF_MODE_CS200K_RX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_1 */
+      /* configure the RF_IP into sensing 200KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS200\n\r");
 
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 200000,
@@ -174,12 +189,20 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 200KHz bandwidth to be able to read out RSSI level */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function */
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_2 */
       break;
     }
     case SFX_RF_MODE_CS300K_RX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_1 */
+
+      /* configure the RF_IP into sensing 300KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function. */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS300\n\r");
 
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 300000,
@@ -189,13 +212,19 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 300KHz bandwidth to be able to read out RSSI level */
-      /* This is poosible to make this carrier sense in 2 * 200Kz if you respect the regulation time for listening */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function. */
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_2 */
       break;
     }
     case SFX_RF_MODE_MONARCH:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_1 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_1 */
+
+      /* configure the RF_IP into sensing 20KHz bandwidth */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in MN20\n\r");
       /* APP_LOG(TS_ON, VLEVEL_L,"RxBw=20kHz\n\r"); */
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 20000,
@@ -205,22 +234,25 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 20KHz bandwidth to be able to read out RSSI level */
-      /* This is poosible to make this carrier sense in 2 * 200Kz if you respect the regulation time for listening */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function. */
+
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_2 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_2 */
       break;
     }
     default :
+      status = RF_ERR_API_INIT;
       break;
   }
-  return SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_init_2 */
 
   /* USER CODE END RF_API_init_2 */
+  return status;
 }
 
 sfx_u8 RF_API_stop(void)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_stop_1 */
 
   /* USER CODE END RF_API_stop_1 */
@@ -231,35 +263,56 @@ sfx_u8 RF_API_stop(void)
 
   /* USER CODE END RF_API_stop_2 */
 
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_send_1 */
 
   /* USER CODE END RF_API_send_1 */
-  sfx_u8 status = SFX_ERR_NONE;
 
   uint32_t datarate;
 
   int8_t power = E2P_Read_Power(E2P_Read_Rc());
 
   APP_LOG(TS_ON, VLEVEL_M, "TX START:nB=%d\n\r", size);
-
   switch (type)
   {
     case SFX_DBPSK_100BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @100bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
       datarate = SFX_DATARATE_100;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_2 */
       break;
     case SFX_DBPSK_600BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @600bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
       datarate = SFX_DATARATE_600;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_2 */
+
       break;
     default :
       status = RF_ERR_API_SEND;
       break;
   }
+  /* USER CODE BEGIN RF_API_send_2 */
+  BSP_LED_On(LED_BLUE);
 
+  /* USER CODE END RF_API_send_2 */
   if (status == SFX_ERR_NONE)
   {
     Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
@@ -268,12 +321,6 @@ sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
                       NA, NA, NA,
                       NA, NA, 3000);
 
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
-
     Radio.Send(stream, size);
 
     APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Tx\n\r");
@@ -282,70 +329,87 @@ sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
 
     APP_LOG(TS_ON, VLEVEL_M, "End Of Tx\n\r");
 
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
-
   }
 
   APP_LOG(TS_ON, VLEVEL_M, "TX END\n\r");
+  /* USER CODE BEGIN RF_API_send_3 */
+  BSP_LED_Off(LED_BLUE);
 
-  /* BSP_LED_Off( LED_RED2 ); */
+  /* USER CODE END RF_API_send_3 */
   return status;
-  /* USER CODE BEGIN RF_API_send_2 */
 
-  /* USER CODE END RF_API_send_2 */
 }
 
 sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_start_continuous_transmission_1 */
 
   /* USER CODE END RF_API_start_continuous_transmission_1 */
-  sfx_u8 status = SFX_ERR_NONE;
 
   int8_t power = E2P_Read_Power(E2P_Read_Rc());
 
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
-
   switch (type)
   {
     case SFX_NO_MODULATION :
+      /* Starts CW continuous Tx at the frequency given by the RF_API_change_frequency()*/
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_1 */
       Radio.TxCw(power);
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_2 */
       break;
     case SFX_DBPSK_100BPS :
-      /* Make an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+      /* Starts an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
       Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
                         NA, SFX_DATARATE_100,
                         NA, NA,
                         NA, NA, NA,
                         NA, NA, 3000);
       Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
       break;
     case SFX_DBPSK_600BPS :
+      /* Starts an infinite DBPSK 600bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
       Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
                         NA, SFX_DATARATE_600,
                         NA, NA,
                         NA, NA, NA,
                         NA, NA, 3000);
       Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
       break;
     default :
       status = RF_ERR_API_SEND;
       break;
   }
-  return status;
   /* USER CODE BEGIN RF_API_start_continuous_transmission_2 */
 
   /* USER CODE END RF_API_start_continuous_transmission_2 */
+  return status;
 }
 
 sfx_u8 RF_API_stop_continuous_transmission(void)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* stop continuous Tx */
+
   /* USER CODE BEGIN RF_API_stop_continuous_transmission_1 */
 
   /* USER CODE END RF_API_stop_continuous_transmission_1 */
@@ -355,11 +419,14 @@ sfx_u8 RF_API_stop_continuous_transmission(void)
   /* USER CODE BEGIN RF_API_stop_continuous_transmission_2 */
 
   /* USER CODE END RF_API_stop_continuous_transmission_2 */
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* set rf frequency for Rx or Tx*/
+
   /* USER CODE BEGIN RF_API_change_frequency_1 */
 
   /* USER CODE END RF_API_change_frequency_1 */
@@ -369,16 +436,22 @@ sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
   /* USER CODE BEGIN RF_API_change_frequency_2 */
 
   /* USER CODE END RF_API_change_frequency_2 */
-
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *state)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_s16 res_rssi = 0;
+  sfx_rx_state_enum_t ret_state = DL_TIMEOUT;
   /* USER CODE BEGIN RF_API_wait_frame_1 */
 
   /* USER CODE END RF_API_wait_frame_1 */
-  sfx_error_t status;
+  /* Starts Rx Windows and wait up to the end of frame or end of rx window*/
+  /*  Wait for 2 events :
+   *  event from your RF_IP indicating a buffer is received or
+   *  event from the timer end : event_timer (see mcu_api.c)
+   * If buffer is received, then copy the buffer in frame buffer and update the state parameter*/
 
   APP_LOG(TS_ON, VLEVEL_M, "RX START\n\r");
 
@@ -389,39 +462,41 @@ sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *stat
 
   if (sfx_wait_end_of_rx() == 1)
   {
-#if 0
-    APP_LOG(TS_ON, VLEVEL_M, "RX= %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n\r",
-            RxFrame[0], RxFrame[1], RxFrame[2], RxFrame[3],
-            RxFrame[4], RxFrame[5], RxFrame[6], RxFrame[7],
-            RxFrame[8], RxFrame[9], RxFrame[10], RxFrame[11],
-            RxFrame[12], RxFrame[13], RxFrame[14], RxFrame[15]);
-#endif /* 0 */
     status = SFX_ERR_NONE;
-    *state = DL_PASSED;
+    ret_state = DL_PASSED;
   }
   else
   {
-    *state = DL_TIMEOUT;
+    ret_state = DL_TIMEOUT;
     status = SFX_ERR_NONE;
   }
 
-  *rssi = (sfx_s16) RxRssi;
+  res_rssi = (sfx_s16) RxRssi;
 
   APP_LOG(TS_ON, VLEVEL_M, "RX END\n\r");
-
-  return status;
   /* USER CODE BEGIN RF_API_wait_frame_2 */
 
   /* USER CODE END RF_API_wait_frame_2 */
+  *state = ret_state;
+  *rssi = res_rssi;
+  return status;
 }
 
 sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_state_enum_t *state)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
+  /* Starts Rx Windows to sense if channel is occupied or clear*
+   * If the channel is clear during the minimum carrier sense
+   * value (cs_min), under the limit of the cs_threshold,
+   * the functions returns with SFX_ERR_NONE (transmission
+   * allowed). Otherwise it continues to listen to the channel till the expiration of the
+   * carrier sense maximum window and then updates the state ( with timeout enum ).*/
+
   /* USER CODE BEGIN RF_API_wait_for_clear_channel_1 */
 
   /* USER CODE END RF_API_wait_for_clear_channel_1 */
-  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
-  /**/
+
   RxCarrierSenseInitStatus();
 
   Radio.Rx(0);
@@ -449,19 +524,21 @@ sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_
     APP_LOG(TS_ON, VLEVEL_M, "LBT Channel Busy\n\r");
   }
 
-  *state = cs_state;
   /* USER CODE BEGIN RF_API_wait_for_clear_channel_2 */
 
   /* USER CODE END RF_API_wait_for_clear_channel_2 */
-
-  return SFX_ERR_NONE;
+  *state = cs_state;
+  return status;
 }
 
 sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* return version and size of the version buffer*/
   /* USER CODE BEGIN RF_API_get_version_1 */
 
   /* USER CODE END RF_API_get_version_1 */
+
   *version = (sfx_u8 *)rf_api_version;
   if (size == SFX_NULL)
   {
@@ -471,8 +548,7 @@ sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
   /* USER CODE BEGIN RF_API_get_version_2 */
 
   /* USER CODE END RF_API_get_version_2 */
-
-  return SFX_ERR_NONE;
+  return status;
 }
 
 /* USER CODE BEGIN EF */
@@ -481,29 +557,6 @@ sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
 
 /* Private Functions Definition -----------------------------------------------*/
 
-static sfx_u8 sfx_wait_end_of_rx(void)
-{
-  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
-
-  /* USER CODE END sfx_wait_end_of_rx_1 */
-  RxPacketReceived = 0;
-
-  RxRssi = -150;
-
-  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
-
-  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
-
-  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
-
-  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
-
-  return RxPacketReceived;
-  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
-
-  /* USER CODE END sfx_wait_end_of_rx_2 */
-}
-
 static void OnTxDone(void)
 {
   /* USER CODE BEGIN OnTxDone_1 */
@@ -532,6 +585,7 @@ static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t offse
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M, "OnRxDone\n\r");
+
   /* USER CODE BEGIN OnRxDone_2 */
 
   /* USER CODE END OnRxDone_2 */
@@ -545,6 +599,7 @@ static void OnTxTimeout(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_TxTimeout);
 
   APP_LOG(TS_ON, VLEVEL_M,  "OnTxTimeout\n\r");
+
   /* USER CODE BEGIN OnTxTimeout_2 */
 
   /* USER CODE END OnTxTimeout_2 */
@@ -560,6 +615,7 @@ static void OnRxTimeout(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M,  "OnRxTimeout\n\r");
+
   /* USER CODE BEGIN OnRxTimeout_2 */
 
   /* USER CODE END OnRxTimeout_2 */
@@ -575,11 +631,35 @@ static void OnRxError(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M, "OnRxError\n\r");
+
   /* USER CODE BEGIN OnRxError_2 */
 
   /* USER CODE END OnRxError_2 */
 }
 
+static sfx_u8 sfx_wait_end_of_rx(void)
+{
+  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
+
+  /* USER CODE END sfx_wait_end_of_rx_1 */
+  RxPacketReceived = 0;
+
+  RxRssi = -150;
+
+  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
+
+  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
+
+  return RxPacketReceived;
+  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
+
+  /* USER CODE END sfx_wait_end_of_rx_2 */
+}
+
 bool RF_API_isChannelFree(int16_t rssiThresh, uint32_t maxCarrierSenseTime)
 {
   /* USER CODE BEGIN RF_API_isChannelFree_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/rf_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/rf_api.h
index 87216197..6b1eeb25 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/rf_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/rf_api.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    rf_api.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /*!
 \if SIGFOX PATTERN
 ----------------------------------------------
@@ -32,7 +34,7 @@
    !!!!  DO NOT MODIFY THIS FILE !!!!
 
  ----------------------------------------------
- \endif
+ \endif
  ----------------------------------------------*/
 /*!
  * \file rf_api.h
@@ -197,7 +199,7 @@ sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type);
 
 /*!******************************************************************
   * \fn sfx_u8 RF_API_stop_continuous_transmission (void)
-  * \brief Stop the current continuous transmisssion
+  * \brief Stop the current continuous transmission
   *
   * \retval SFX_ERR_NONE:                                 No error
   * \retval RF_ERR_API_STOP_CONTINUOUS_TRANSMISSION:      Continuous Transmission Stop error
@@ -254,9 +256,9 @@ sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *stat
   *        allowed). Otherwise it continues to listen to the channel till the expiration of the
   *        carrier sense maximum window and then updates the state ( with timeout enum ).
   *
-  * \param[in] none
-  * \param[out] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
-  * \param[out] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
+  *
+  * \param[in] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
+  * \param[in] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
   *                                            i.e : cs_threshold value -80dBm in Japan / -65dBm in Korea
   * \param[out] sfx_rx_state_enum_t state      Indicate the final state of the carrier sense. Value can be DL_TIMEOUT or PASSED
   *                                            as per defined in sigfox_api.h file.
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/se_nvm.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/se_nvm.c
index acacc5c7..28c83de8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/se_nvm.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/se_nvm.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/se_nvm.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/se_nvm.h
index 3047bfbd..97cbfbee 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/se_nvm.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/se_nvm.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SE_NVM_H__
@@ -67,48 +69,46 @@ typedef enum
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief This function reads data pointed by read_data to non
-  * volatile memory
+  * @brief     This function reads data pointed by read_data to non volatile memory
   *
-  * @param [IN] sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] read_data Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief This function write data pointed by data_to_write to non
-  * volatile memory
+  * @brief     This function write data pointed by data_to_write to non volatile memory
   *
-  * @param [IN] sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] data_to_write Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief Get the active encryption payload flag
-  * @retval encryption_flag 0:Off, 1:On
+  * @brief     Get the active encryption payload flag
+  * @retval    encryption_flag 0:Off, 1:On
   */
 sfx_u8 SE_NVM_get_encrypt_flag(void);
 
 /**
-  * @brief Set the active encryption payload flag
-  * @param [IN]  encryption_flag 0:Off, 1:On
+  * @brief     Set the active encryption payload flag
+  * @param[in] encryption_flag 0:Off, 1:On
   */
 void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag);
 
 /**
-  * @brief Get the active encryption key
-  * @retval  sfx_key_type_t key: public or private
+  * @brief     Get the active encryption key
+  * @return    key public or private
   */
 sfx_key_type_t SE_NVM_get_key_type(void);
 
 /**
-  * @brief Set the active encryption key
-  * @param [IN]  sfx_key_type_t key: public or private
+  * @brief     Set the active encryption key
+  * @param[in] keyType key public or private
   */
-void  SE_NVM_set_key_type(sfx_key_type_t keyType);
+void SE_NVM_set_key_type(sfx_key_type_t keyType);
 
 /* USER CODE BEGIN EFP */
 
@@ -120,4 +120,3 @@ void  SE_NVM_set_key_type(sfx_key_type_t keyType);
 #endif /* __SE_NVM_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/sgfx_credentials.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/sgfx_credentials.c
index 2a3cc9c4..6094fb8a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/sgfx_credentials.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/sgfx_credentials.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_credentials.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -120,10 +122,10 @@ sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *da
   memset(key, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_encrypt(data_to_encrypt,
-                  encrypted_data,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
   /* USER CODE BEGIN CREDENTIALS_aes_128_cbc_encrypt_2 */
 
   /* USER CODE END CREDENTIALS_aes_128_cbc_encrypt_2 */
@@ -142,10 +144,10 @@ sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_
   sigfox_aes_set_key(session_key, AES_KEY_LEN,  &AesContext);
 
   sigfox_aes_cbc_encrypt(data_to_encrypt,
-                  encrypted_data,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
   /* USER CODE BEGIN CREDENTIALS_aes_128_cbc_encrypt_with_session_key_2 */
 
   /* USER CODE END CREDENTIALS_aes_128_cbc_encrypt_with_session_key_2 */
@@ -169,10 +171,10 @@ sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks)
   memset(key, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_encrypt(data,
-                  session_key,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         session_key,
+                         blocks,
+                         iv,
+                         &AesContext);
   /* USER CODE BEGIN CREDENTIALS_wrap_session_key_2 */
 
   /* USER CODE END CREDENTIALS_wrap_session_key_2 */
@@ -227,10 +229,13 @@ void CREDENTIALS_get_initial_pac(uint8_t *pac)
 
 sfx_bool CREDENTIALS_get_payload_encryption_flag(void)
 {
+  sfx_bool ret = SFX_FALSE;
+
+  ret = (sfx_bool) SE_NVM_get_encrypt_flag();
   /* USER CODE BEGIN CREDENTIALS_get_payload_encryption_flag_1 */
 
   /* USER CODE END CREDENTIALS_get_payload_encryption_flag_1 */
-  return (sfx_bool) SE_NVM_get_encrypt_flag();
+  return ret;
 }
 
 void CREDENTIALS_set_payload_encryption_flag(uint8_t enable)
@@ -306,10 +311,10 @@ static sfx_error_t CREDENTIALS_get_cra(sfx_u8 *decrypted_data, sfx_u8 *data_to_d
   memset(CredentialKey, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_decrypt(data_to_decrypt,
-                  decrypted_data,
-                  sizeof(manuf_device_info_t) / AES_KEY_LEN,
-                  iv,
-                  &AesContext);
+                         decrypted_data,
+                         sizeof(manuf_device_info_t) / AES_KEY_LEN,
+                         iv,
+                         &AesContext);
 #else
   /* default sigfox_data.h provided, sigfox_data.h is not encrypted*/
   memcpy((uint8_t *) decrypted_data, (uint8_t *) data_to_decrypt, sizeof(manuf_device_info_t));
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/sgfx_credentials.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/sgfx_credentials.h
index 5205769f..c7d84239 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/sgfx_credentials.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/sgfx_credentials.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_credentials.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_CREDENTIALS_H__
 #define __SGFX_CREDENTIALS_H__
@@ -67,57 +70,59 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief get the cmac library version
-  * @retval return a string containing the library version
+  * @brief      get the cmac library version
+  * @return     string containing the library version
   */
 const char *CREDENTIALS_get_version(void);
 
 /**
-  * @brief get the loaded dev_id
-  * @param[out] return the dev_id in the pointer
+  * @brief      get the loaded dev_id
+  * @param[out] dev_id return the dev_id in the pointer
   */
 void CREDENTIALS_get_dev_id(uint8_t *dev_id);
 
 /**
-  * @brief get the loaded pac
-  * @param[out] return the pac in the pointer
+  * @brief      get the loaded pac
+  * @param[out] pac return the pac in the pointer
   */
 void CREDENTIALS_get_initial_pac(uint8_t *pac);
 
 /**
-  * @brief get the payload_encryption_flag
-  * @retval  the payload_encryption_flag
+  * @brief      get the payload_encryption_flag
+  * @retval     the payload_encryption_flag
   */
 sfx_bool CREDENTIALS_get_payload_encryption_flag(void);
 
 /**
-  * @brief set the payload_encryption_flag
-  * @param[in] enable flag. 0: disable, 1: enable
-  * @retval  none
+  * @brief      set the payload_encryption_flag
+  * @param[in]  enable flag. 0: disable, 1: enable
   */
 void CREDENTIALS_set_payload_encryption_flag(uint8_t enable);
 
 /**
-  * @brief encrypts the data_to_encrypt with aes secrete Key
-  * @param[out] the encrypted data
-  * @param[in] the data_to_encrypt
-  * @param[in] the number of aes blocks
+  * @brief      encrypts the data_to_encrypt with aes secrete Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *data_to_encrypt, uint8_t block_len);
 
 /**
-  * @brief encrypts the data_to_encrypt with aes session Key
-  * @param[out] the encrypted data
-  * @param[in] the data_to_encrypt
-  * @param[in] the number of aes blocks
+  * @brief      encrypts the data_to_encrypt with aes session Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_data, uint8_t *data_to_encrypt,
                                                              uint8_t block_len);
 
 /**
-  * @brief wraps the session Key
-  * @param[in] the arguments used to generate the session Key
-  * @param[in] the number of aes blocks
+  * @brief      wraps the session Key
+  * @param[in]  data the arguments used to generate the session Key
+  * @param[in]  blocks the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox_PushButton.ioc b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox_PushButton.ioc
index a6107a6d..46864798 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox_PushButton.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/Sigfox_PushButton.ioc
@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
@@ -29,68 +29,71 @@ Dma.RequestsNb=1
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
-LPUART1.BaudRate=LPUART_BAUDRATE
+LPUART1.BaudRate=9600
 LPUART1.FIFOMode=UART_FIFOMODE_ENABLE
 LPUART1.IPParameters=BaudRate,FIFOMode
 Mcu.ContextProject=MonoOnDualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=SIGFOX
-Mcu.IP11=SUBGHZ
-Mcu.IP12=SYS
-Mcu.IP13=TIMER
-Mcu.IP14=TINY_LPM
-Mcu.IP2=DMA
-Mcu.IP3=LPTIM1
-Mcu.IP4=LPUART1
-Mcu.IP5=MISC
-Mcu.IP6=NVIC
-Mcu.IP7=RCC
-Mcu.IP8=RTC
-Mcu.IP9=SEQUENCER_M4
-Mcu.IPNb=15
+Mcu.IP10=SEQUENCER_M4
+Mcu.IP11=SIGFOX
+Mcu.IP12=SUBGHZ
+Mcu.IP13=SYS
+Mcu.IP14=TIMER
+Mcu.IP15=TINY_LPM
+Mcu.IP2=DEBUG
+Mcu.IP3=DMA
+Mcu.IP4=LPTIM1
+Mcu.IP5=LPUART1
+Mcu.IP6=MISC
+Mcu.IP7=NVIC
+Mcu.IP8=RCC
+Mcu.IP9=RTC
+Mcu.IPNb=16
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
-Mcu.Pin23=VP_MISC_VS_MISC
-Mcu.Pin24=VP_RTC_VS_RTC_Activate
-Mcu.Pin25=VP_RTC_VS_RTC_Calendar
-Mcu.Pin26=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin27=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin28=VP_SIGFOX_VS_Sigfox
-Mcu.Pin29=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_SYS_VS_Systick
-Mcu.Pin31=VP_TIMER_VS_TIMER
-Mcu.Pin32=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=33
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
+Mcu.Pin25=VP_MISC_VS_MISC
+Mcu.Pin26=VP_RTC_VS_RTC_Activate
+Mcu.Pin27=VP_RTC_VS_RTC_Calendar
+Mcu.Pin28=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin29=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_SIGFOX_VS_Sigfox
+Mcu.Pin31=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin32=VP_SYS_VS_None
+Mcu.Pin33=VP_TIMER_VS_TIMER
+Mcu.Pin34=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=35
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);LPUART_BAUDRATE,9600
+Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -106,21 +109,24 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.RTC_Alarm_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.TAMP_STAMP_LSECSS_SSRU_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.TimeBase=None
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4MonoOnDual
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4MonoOnDual
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -135,40 +141,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=LPUART1_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4MonoOnDual
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4MonoOnDual
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4MonoOnDual
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4MonoOnDual
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4MonoOnDual
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4MonoOnDual
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4MonoOnDual
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -176,26 +175,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4MonoOnDual
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4MonoOnDual
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4MonoOnDual
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4MonoOnDual
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -274,18 +276,18 @@ SH.GPXTI1.0=GPIO_EXTI1
 SH.GPXTI1.ConfNb=1
 SH.GPXTI6.0=GPIO_EXTI6
 SH.GPXTI6.ConfNb=1
-SIGFOX.Activate_BOARD_RESOURCES=M4
 SIGFOX.Activate_DEBUG_LINE=true
-SIGFOX.Activate_RADIO_BOARD_INTERFACE=true
-SIGFOX.IPParameters=SUBGHZ_APPLICATION,Activate_BOARD_RESOURCES,Activate_RADIO_BOARD_INTERFACE,Activate_DEBUG_LINE
+SIGFOX.Activate_RADIO_BOARD_INTERFACE=Bsp
+SIGFOX.IPParameters=Activate_DEBUG_LINE,SUBGHZ_APPLICATION,TX_RFO_CONFIG,Activate_RADIO_BOARD_INTERFACE
 SIGFOX.SUBGHZ_APPLICATION=SIGFOX_PUSHBUTTON
+SIGFOX.TX_RFO_CONFIG=RBI_CONF_RFO_LP_HP
 SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
-Sigfox.BSP.number=17
+Sigfox.BSP.number=8
 Sigfox0.BSP.STBoard=false
 Sigfox0.BSP.api=Unknown
 Sigfox0.BSP.component=
-Sigfox0.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON
+Sigfox0.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION | SEM_SGX_USE_ADC
 Sigfox0.BSP.i2caddr=0
 Sigfox0.BSP.i2creg=
 Sigfox0.BSP.instance=ADC
@@ -297,7 +299,7 @@ Sigfox0.BSP.solution=ADC
 Sigfox1.BSP.STBoard=false
 Sigfox1.BSP.api=Unknown
 Sigfox1.BSP.component=
-Sigfox1.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION
+Sigfox1.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION | SEM_SGX_USE_RTC
 Sigfox1.BSP.i2caddr=0
 Sigfox1.BSP.i2creg=
 Sigfox1.BSP.instance=RTC
@@ -306,186 +308,78 @@ Sigfox1.BSP.mode=RTC Enabled
 Sigfox1.BSP.name=RTC
 Sigfox1.BSP.semaphore=
 Sigfox1.BSP.solution=RTC
-Sigfox10.BSP.STBoard=false
-Sigfox10.BSP.api=Unknown
-Sigfox10.BSP.component=
-Sigfox10.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox10.BSP.i2caddr=0
-Sigfox10.BSP.i2creg=
-Sigfox10.BSP.instance=PA0
-Sigfox10.BSP.ip=GPIO
-Sigfox10.BSP.mode=EXTI
-Sigfox10.BSP.name=BUTTON 1
-Sigfox10.BSP.semaphore=
-Sigfox10.BSP.solution=PA0
-Sigfox11.BSP.STBoard=false
-Sigfox11.BSP.api=Unknown
-Sigfox11.BSP.component=
-Sigfox11.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox11.BSP.i2caddr=0
-Sigfox11.BSP.i2creg=
-Sigfox11.BSP.instance=PC3
-Sigfox11.BSP.ip=GPIO
-Sigfox11.BSP.mode=Output
-Sigfox11.BSP.name=RF SW CTRL 3
-Sigfox11.BSP.semaphore=
-Sigfox11.BSP.solution=PC3
-Sigfox12.BSP.STBoard=false
-Sigfox12.BSP.api=Unknown
-Sigfox12.BSP.component=
-Sigfox12.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON
-Sigfox12.BSP.i2caddr=0
-Sigfox12.BSP.i2creg=
-Sigfox12.BSP.instance=LPTIM1
-Sigfox12.BSP.ip=LPTIM
-Sigfox12.BSP.mode=Counts internal clock events
-Sigfox12.BSP.name=TIM
-Sigfox12.BSP.semaphore=
-Sigfox12.BSP.solution=LPTIM1
-Sigfox13.BSP.STBoard=false
-Sigfox13.BSP.api=Unknown
-Sigfox13.BSP.component=
-Sigfox13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox13.BSP.i2caddr=0
-Sigfox13.BSP.i2creg=
-Sigfox13.BSP.instance=PC4
-Sigfox13.BSP.ip=GPIO
-Sigfox13.BSP.mode=Output
-Sigfox13.BSP.name=RF SW CTRL 1
-Sigfox13.BSP.semaphore=
-Sigfox13.BSP.solution=PC4
-Sigfox14.BSP.STBoard=false
-Sigfox14.BSP.api=Unknown
-Sigfox14.BSP.component=
-Sigfox14.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox14.BSP.i2caddr=0
-Sigfox14.BSP.i2creg=
-Sigfox14.BSP.instance=PC5
-Sigfox14.BSP.ip=GPIO
-Sigfox14.BSP.mode=Output
-Sigfox14.BSP.name=RF SW CTRL 2
-Sigfox14.BSP.semaphore=
-Sigfox14.BSP.solution=PC5
-Sigfox15.BSP.STBoard=false
-Sigfox15.BSP.api=Unknown
-Sigfox15.BSP.component=
-Sigfox15.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox15.BSP.i2caddr=0
-Sigfox15.BSP.i2creg=
-Sigfox15.BSP.instance=PC6
-Sigfox15.BSP.ip=GPIO
-Sigfox15.BSP.mode=EXTI
-Sigfox15.BSP.name=BUTTON 3
-Sigfox15.BSP.semaphore=
-Sigfox15.BSP.solution=PC6
-Sigfox16.BSP.STBoard=false
-Sigfox16.BSP.api=Unknown
-Sigfox16.BSP.component=
-Sigfox16.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox16.BSP.i2caddr=0
-Sigfox16.BSP.i2creg=
-Sigfox16.BSP.instance=PA1
-Sigfox16.BSP.ip=GPIO
-Sigfox16.BSP.mode=EXTI
-Sigfox16.BSP.name=BUTTON 2
-Sigfox16.BSP.semaphore=
-Sigfox16.BSP.solution=PA1
 Sigfox2.BSP.STBoard=false
 Sigfox2.BSP.api=Unknown
 Sigfox2.BSP.component=
-Sigfox2.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox2.BSP.condition=SEM_SGX_PUSHBUTTON
 Sigfox2.BSP.i2caddr=0
 Sigfox2.BSP.i2creg=
-Sigfox2.BSP.instance=PB12
-Sigfox2.BSP.ip=GPIO
-Sigfox2.BSP.mode=Output
-Sigfox2.BSP.name=Debug Line 1
+Sigfox2.BSP.instance=LPUART1
+Sigfox2.BSP.ip=(LPU|US)ART
+Sigfox2.BSP.mode=Asynchronous
+Sigfox2.BSP.name=USART
 Sigfox2.BSP.semaphore=
-Sigfox2.BSP.solution=PB12
+Sigfox2.BSP.solution=LPUART1
 Sigfox3.BSP.STBoard=false
 Sigfox3.BSP.api=Unknown
 Sigfox3.BSP.component=
-Sigfox3.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox3.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox3.BSP.i2caddr=0
 Sigfox3.BSP.i2creg=
-Sigfox3.BSP.instance=PB13
+Sigfox3.BSP.instance=PB12
 Sigfox3.BSP.ip=GPIO
 Sigfox3.BSP.mode=Output
-Sigfox3.BSP.name=Debug Line 2
+Sigfox3.BSP.name=Debug Line 1
 Sigfox3.BSP.semaphore=
-Sigfox3.BSP.solution=PB13
+Sigfox3.BSP.solution=PB12
 Sigfox4.BSP.STBoard=false
 Sigfox4.BSP.api=Unknown
 Sigfox4.BSP.component=
-Sigfox4.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox4.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON | SEM_SGX_USE_LPTIM
 Sigfox4.BSP.i2caddr=0
 Sigfox4.BSP.i2creg=
-Sigfox4.BSP.instance=PB14
-Sigfox4.BSP.ip=GPIO
-Sigfox4.BSP.mode=Output
-Sigfox4.BSP.name=Debug Line 3
+Sigfox4.BSP.instance=LPTIM1
+Sigfox4.BSP.ip=LPTIM
+Sigfox4.BSP.mode=Counts internal clock events
+Sigfox4.BSP.name=TIM
 Sigfox4.BSP.semaphore=
-Sigfox4.BSP.solution=PB14
+Sigfox4.BSP.solution=LPTIM1
 Sigfox5.BSP.STBoard=false
 Sigfox5.BSP.api=Unknown
 Sigfox5.BSP.component=
-Sigfox5.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox5.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox5.BSP.i2caddr=0
 Sigfox5.BSP.i2creg=
-Sigfox5.BSP.instance=PB10
+Sigfox5.BSP.instance=PB13
 Sigfox5.BSP.ip=GPIO
 Sigfox5.BSP.mode=Output
-Sigfox5.BSP.name=Debug Line 4
+Sigfox5.BSP.name=Debug Line 2
 Sigfox5.BSP.semaphore=
-Sigfox5.BSP.solution=PB10
+Sigfox5.BSP.solution=PB13
 Sigfox6.BSP.STBoard=false
 Sigfox6.BSP.api=Unknown
 Sigfox6.BSP.component=
-Sigfox6.BSP.condition=SEM_SGX_PUSHBUTTON
+Sigfox6.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox6.BSP.i2caddr=0
 Sigfox6.BSP.i2creg=
-Sigfox6.BSP.instance=LPUART1
-Sigfox6.BSP.ip=(LPU|US)ART
-Sigfox6.BSP.mode=Asynchronous
-Sigfox6.BSP.name=USART
+Sigfox6.BSP.instance=PB14
+Sigfox6.BSP.ip=GPIO
+Sigfox6.BSP.mode=Output
+Sigfox6.BSP.name=Debug Line 3
 Sigfox6.BSP.semaphore=
-Sigfox6.BSP.solution=LPUART1
+Sigfox6.BSP.solution=PB14
 Sigfox7.BSP.STBoard=false
 Sigfox7.BSP.api=Unknown
 Sigfox7.BSP.component=
-Sigfox7.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
+Sigfox7.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox7.BSP.i2caddr=0
 Sigfox7.BSP.i2creg=
-Sigfox7.BSP.instance=PB11
+Sigfox7.BSP.instance=PB10
 Sigfox7.BSP.ip=GPIO
 Sigfox7.BSP.mode=Output
-Sigfox7.BSP.name=LED 3
+Sigfox7.BSP.name=Debug Line 4
 Sigfox7.BSP.semaphore=
-Sigfox7.BSP.solution=PB11
-Sigfox8.BSP.STBoard=false
-Sigfox8.BSP.api=Unknown
-Sigfox8.BSP.component=
-Sigfox8.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox8.BSP.i2caddr=0
-Sigfox8.BSP.i2creg=
-Sigfox8.BSP.instance=PB9
-Sigfox8.BSP.ip=GPIO
-Sigfox8.BSP.mode=Output
-Sigfox8.BSP.name=LED 2
-Sigfox8.BSP.semaphore=
-Sigfox8.BSP.solution=PB9
-Sigfox9.BSP.STBoard=false
-Sigfox9.BSP.api=Unknown
-Sigfox9.BSP.component=
-Sigfox9.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SIGFOX
-Sigfox9.BSP.i2caddr=0
-Sigfox9.BSP.i2creg=
-Sigfox9.BSP.instance=PB15
-Sigfox9.BSP.ip=GPIO
-Sigfox9.BSP.mode=Output
-Sigfox9.BSP.name=LED 1
-Sigfox9.BSP.semaphore=
-Sigfox9.BSP.solution=PB15
+Sigfox7.BSP.solution=PB10
 VP_ADC_TempSens_Input.Mode=IN-TempSens
 VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
 VP_ADC_Vref_Input.Mode=IN-Vrefint
@@ -508,10 +402,13 @@ VP_SIGFOX_VS_Sigfox.Mode=Sigfox_Enabled
 VP_SIGFOX_VS_Sigfox.Signal=SIGFOX_VS_Sigfox
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=Sigfox_PushButton
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/readme.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/readme.txt
index 1a1980c1..c3b7aa95 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton/readme.txt
@@ -1,12 +1,12 @@
 /**
   @page Sigfox_PushButton Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/Sigfox/Sigfox_PushButton/readme.txt 
+  * @file    Applications/Sigfox/Sigfox_PushButton/readme.txt
   * @author  MCD Application Team
-  * @brief   This application is a simple demo of a Sigfox Modem sending temperature 
-  *          and Batterie Level to a Sigfox Network. 
+  * @brief   This application is a simple demo of a Sigfox Modem sending temperature
+  *          and Battery Level to a Sigfox Network.
   ******************************************************************************
   * @attention
   *
@@ -23,27 +23,25 @@
 
 @par Description
 
-This directory contains a set of source files that implements an example of a 
-Sigfox object sending temperature - and Batterie Level to a Sigfox Network. 
+This directory contains a set of source files that implements an example of a
+Sigfox object sending temperature and Battery Level to a Sigfox Network.
 
 This application is targeting the NUCLEO-WL55JC1 (HIGH-BAND) embedding the STM32WLxx.
-
   ******************************************************************************
 
 @par Keywords
 
 Applications, SubGHz_Phy, Sigfox, PushButton, SingleCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - Sigfox_PushButton/Core/Inc/adc.h                                            This file contains all the function prototypes for
                                                                                 the adc.c file
   - Sigfox_PushButton/Core/Inc/adc_if.h                                         Header for ADC interface configuration
-  - Sigfox_PushButton/Core/Inc/board_resources.h                                Header for driver at.c module
   - Sigfox_PushButton/Core/Inc/dma.h                                            This file contains all the function prototypes for
                                                                                 the dma.c file
-  - Sigfox_PushButton/Core/Inc/flash_if.h                                       This file provides interface to low level driver
+  - Sigfox_PushButton/Core/Inc/flash_if.h                                       This file contains definitions for FLASH Interface functionalities.
   - Sigfox_PushButton/Core/Inc/lptim.h                                          This file contains all the function prototypes for
                                                                                 the lptim.c file
   - Sigfox_PushButton/Core/Inc/main.h                                           : Header for main.c file.
@@ -75,7 +73,7 @@ Applications, SubGHz_Phy, Sigfox, PushButton, SingleCore
   - Sigfox_PushButton/Sigfox/App/sgfx_cstimer.h                                 Interface for  cstimer.c driver
   - Sigfox_PushButton/Sigfox/App/sgfx_eeprom_if.h                               eeprom interface to the upper module.
   - Sigfox_PushButton/Sigfox/App/sigfox_data.h                                  provides encrypted data
-  - Sigfox_PushButton/Sigfox/Target/mcu_api.h                                   defines the interfaace to mcu_api.c
+  - Sigfox_PushButton/Sigfox/Target/mcu_api.h                                   defines the interface to mcu_api.c
   - Sigfox_PushButton/Sigfox/Target/mn_api.h                                    monarch library interface
   - Sigfox_PushButton/Sigfox/Target/mw_log_conf.h                               Configure (enable/disable) traces for CM0
   - Sigfox_PushButton/Sigfox/Target/radio_board_if.h                            Header for Radio interface configuration
@@ -88,10 +86,10 @@ Applications, SubGHz_Phy, Sigfox, PushButton, SingleCore
   - Sigfox_PushButton/Core/Src/adc.c                                            This file provides code for the configuration
                                                                                 of the ADC instances.
   - Sigfox_PushButton/Core/Src/adc_if.c                                         Read status related to the chip (battery level, VREF, chip temperature)
-  - Sigfox_PushButton/Core/Src/board_resources.c                                Source file
   - Sigfox_PushButton/Core/Src/dma.c                                            This file provides code for the configuration
                                                                                 of all the requested memory to memory DMA transfers.
-  - Sigfox_PushButton/Core/Src/flash_if.c                                       This file contains the FLASH driver
+  - Sigfox_PushButton/Core/Src/flash_if.c                                       This file provides set of firmware functions to manage Flash
+                                                                                Interface functionalities.
   - Sigfox_PushButton/Core/Src/lptim.c                                          This file provides code for the configuration
                                                                                 of the LPTIM instances.
   - Sigfox_PushButton/Core/Src/main.c                                           : Main program body
@@ -111,7 +109,7 @@ Applications, SubGHz_Phy, Sigfox, PushButton, SingleCore
   - Sigfox_PushButton/Core/Src/timer_if.c                                       Configure RTC Alarm, Tick and Calendar manager
   - Sigfox_PushButton/Core/Src/usart.c                                          This file provides code for the configuration
                                                                                 of the USART instances.
-  - Sigfox_PushButton/Core/Src/usart_if.c                                       Configuration of UART MX driver interface for hyperterminal communication
+  - Sigfox_PushButton/Core/Src/usart_if.c                                       Configuration of UART driver interface for hyperterminal communication
   - Sigfox_PushButton/Sigfox/App/app_sigfox.c                                   Application of the Sigfox Middleware
   - Sigfox_PushButton/Sigfox/App/ee.c                                           Implementation of the EEPROM emulator
   - Sigfox_PushButton/Sigfox/App/sgfx_app.c                                     provides code for the application of the sigfox Middleware
@@ -123,23 +121,21 @@ Applications, SubGHz_Phy, Sigfox, PushButton, SingleCore
   - Sigfox_PushButton/Sigfox/Target/rf_api.c                                    rf library interface
   - Sigfox_PushButton/Sigfox/Target/se_nvm.c                                    manages SE nvm data
   - Sigfox_PushButton/Sigfox/Target/sgfx_credentials.c                          manages keys and encryption algorithm
-  - Sigfox_PushButton/STM32CubeIDE/Application/Core/syscalls.c                  STM32CubeIDE Minimal System calls file
-  - Sigfox_PushButton/STM32CubeIDE/Application/Core/sysmem.c                    STM32CubeIDE System Memory calls file
+  - Sigfox_PushButton/STM32CubeIDE/Application/User/Core/syscalls.c             STM32CubeIDE Minimal System calls file
+  - Sigfox_PushButton/STM32CubeIDE/Application/User/Core/sysmem.c               STM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - sys_conf.h, radio_conf.h, mw_log_conf.h, radio_board_if.h, nucleo_conf.h, main.h, etc
-    - Careful: 
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
+    - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
 
   -Set Up:
 
@@ -150,9 +146,9 @@ Applications, SubGHz_Phy, Sigfox, PushButton, SingleCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all files and load your image into target memory
   - Run the example
   - Open a Terminal, connected the Sigfox Object
@@ -160,5 +156,10 @@ In order to make the program work, you must do the following :
   - Terminal Config: Select 'CR+LF' for Transmit New-Line and switch 'Local echo' on
   - Push Button 1 (it will send a sigfox message, Blue LED blinking)
 
+@par How to debug ?
+  - make sure the flag DEBUGGER_ENABLED to 1 in sys_conf.h
+  - simpler to define the flag LOW_POWER_DISABLE to 1 as well
+  - compile, download and attach
+
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/.extSettings b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h
index e5bd4f0d..9cb596ba 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h
@@ -1,9 +1,10 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    flash_if.h
   * @author  MCD Application Team
-  * @brief   This file provides interface to low level driver
-  *****************************************************************************
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
   * @attention
   *
   * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
@@ -14,23 +15,40 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __FLASH_H__
-#define __FLASH_H__
+#ifndef __FLASH_IF_H__
+#define __FLASH_IF_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
 /* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash status enumeration
+  */
+enum
+{
+  FLASH_PARAM_ERROR = -5,
+  FLASH_LOCK_ERROR = -4,
+  FLASH_WRITE_ERROR = -3,
+  FLASH_ERASE_ERROR  = -2,
+  FLASH_ERROR  = -1,
+  FLASH_OK     = 0,
+  FLASH_BUSY   = 1
+};
+
 /* USER CODE BEGIN ET */
 
 /* USER CODE END ET */
@@ -46,18 +64,30 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
+#define PAGE(__ADDRESS__) (uint32_t)((((__ADDRESS__) - FLASH_BASE) % FLASH_BANK_SIZE) / FLASH_PAGE_SIZE) /*!< Get page index from page address */
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function writes a user flash area (read/modify/write)
+  * @param  address: ptr to user flash area
+  * @param  data: ptr to data to be written
+  * @param  size: number of 32b.
+  * @param  dataTempPage: ptr used to copy already written page in ram
+  * @return Flash status.
+  */
+int32_t FLASH_IF_Write(uint32_t  address, uint8_t *data, uint32_t size, uint8_t *dataTempPage);
+
 /**
   * Writes a 64-bit word in flash at a specific address.
   * @param address (in bytes) must be a multiple of 8.
   * @param data data to write
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
   */
-extern int32_t HW_FLASH_Write(uint32_t address, uint64_t data);
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data);
 
 /**
   * Erases 'n' flash pages from page number 'page' to page number
@@ -71,26 +101,14 @@ extern int32_t HW_FLASH_Write(uint32_t address, uint64_t data);
   * @param page memory start page number
   * @param n number of page
   * @param interrupt choice polling/interrupt
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
-  */
-extern int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt);
-
-/**
-  * Get from Option Bytes the IPCC buffer address
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
-  */
-extern uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void);
-
-/**
-  * Get from Option Bytes the SFSA secure flash address
-  * @returns HW_OK, HW_BUSY or HW_FLASH_ERROR.
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
   */
-extern uint32_t HW_FLASH_OB_GetSFSA(void);
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt);
 
 /**
   * Callback
   */
-extern void HWCB_FLASH_EndOfCleanup(void);
+void HWCB_FLASH_EndOfCleanup(void);
 
 /* USER CODE BEGIN EFP */
 
@@ -100,6 +118,6 @@ extern void HWCB_FLASH_EndOfCleanup(void);
 }
 #endif
 
-#endif /* __FLASH_H__ */
+#endif /* __FLASH_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
index 45049335..40330641 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM0PLUS_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_CommandRcv_cb     command callback
   * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_config.h
index 4534c749..16fdc3aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_config.h
@@ -78,6 +78,22 @@ extern "C" {
   */
 #define KMS_NVM_SLOT_NUMBERS                     (50UL)
 
+/**
+  * @brief KMS_VM_DYNAMIC_ENABLED Uncomment the below line to support
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  */
+//#define KMS_VM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_VM_SLOT_NUMBERS Specify here the number of slots to use in the Volatile Memory storage
+  * @note  VM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into VM.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in VM.
+  * @note  Mandatory to set if @ref KMS_VM_DYNAMIC_ENABLED is defined
+  */
+//#define KMS_VM_SLOT_NUMBERS                    (50UL)
+
 /**
   * @}
   */
@@ -151,6 +167,7 @@ extern "C" {
   *        @ref KMS_AES_ECB
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store derived key into VM
   */
 #define KMS_DERIVE_KEY
 
@@ -164,18 +181,21 @@ extern "C" {
   * @note  Requires a supported key generation algorithm to be enabled too:
   *        @ref KMS_ECDSA
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to store generated key into VM
   */
 //#define KMS_GENERATE_KEYS
 
 /**
   * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
-  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED or @ref KMS_VM_DYNAMIC_ENABLED to be enabled
+  *        in order to modify attributes
   */
 #define KMS_ATTRIBUTES
 
 /**
   * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
   * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  *        or @ref KMS_VM_DYNAMIC_ENABLED to be enabled to create or delete objects into VM
   */
 #define KMS_OBJECTS
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_if.h
index 9a324008..1c890dbe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    kms_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef KMS_IF_H
@@ -67,4 +69,3 @@ extern "C" {
 #endif /* KMS_IF_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
index 8cf9cfbf..c6688943 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_mem_pool_def.h
@@ -37,13 +37,11 @@ extern "C" {
  * - Pool #3 is a 512 Bytes pool
  */
 /* USER CODE BEGIN KMS_MEM_POOL_Declare */
-
 KMS_MEM_DECLARE_POOL_START()
 KMS_MEM_DECLARE_POOL_ENTRY(1,256)
 KMS_MEM_DECLARE_POOL_ENTRY(2,256)
 KMS_MEM_DECLARE_POOL_ENTRY(3,512)
 KMS_MEM_DECLARE_POOL_END()
-
 /* USER CODE END KMS_MEM_POOL_Declare */
 
 /* USER CODE BEGIN KMS_MEM_POOL_DEF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
index 904ffdbd..45baa542 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_platf_objects_config.h
@@ -98,6 +98,7 @@ extern "C" {
 #ifdef KMS_PLATF_OBJECTS_C
 /* USER CODE BEGIN KMS_PLATF_OBJECTS_CONFIG_Embedded_Objects_Definition */
 /* Place code in a specific section*/
+
 #if defined(__ICCARM__)
 #pragma default_variable_attributes = @ ".USER_embedded_Keys"
 #elif defined(__CC_ARM)
@@ -106,7 +107,10 @@ extern "C" {
 
 KMS_DECLARE_BLOB_STRUCT(, 32)
 
+
 #if defined(__GNUC__)
+#pragma GCC push_options
+#pragma GCC optimize ("O0")
 __attribute__((section(".USER_embedded_Keys")))
 #endif
 /* These objects are used by user tKMS application                 */
@@ -130,6 +134,7 @@ static const kms_obj_keyhead_32_t   Sigfox_Data_Key =
   }
 };
 
+
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
@@ -154,6 +159,7 @@ static const kms_obj_keyhead_32_t   Sigfox_pac =
   }
 };
 
+
 #if defined(__GNUC__)
 __attribute__((section(".USER_embedded_Keys")))
 #endif
@@ -206,6 +212,8 @@ static const kms_obj_keyhead_32_t   Sigfox_Public_Key =
 #pragma default_variable_attributes =
 #elif defined(__CC_ARM)
 #pragma arm section code
+#elif defined(__GNUC__)
+#pragma GCC pop_options
 #endif
 
 /* USER CODE END KMS_PLATF_OBJECTS_CONFIG_Embedded_Objects_Definition */
@@ -225,7 +233,22 @@ const kms_obj_keyhead_t * const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBE
   (kms_obj_keyhead_t *) &Sigfox_pac,                 /* Index = 2 */
   (kms_obj_keyhead_t *) &Sigfox_id,                  /* Index = 3 */
   (kms_obj_keyhead_t *) &Sigfox_Public_Key,          /* Index = 4 */
-
+  (kms_obj_keyhead_t *) NULL,       /* Index = 5 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 8 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 12 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 13 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 14 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 15 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 16 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,       /* Index = 20 */
 /* USER CODE END KMS_PlatfObjects_EmbeddedList */
 };
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/lptim.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/lptim.h
index b5e50fad..7fe5ac5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/lptim.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/lptim.h
@@ -1,13 +1,12 @@
 /**
   ******************************************************************************
   * @file    lptim.h
-  * @author  MCD Application Team
   * @brief   This file contains all the function prototypes for
   *          the lptim.c file
-  *****************************************************************************
+  ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -15,9 +14,8 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
-
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __LPTIM_H__
 #define __LPTIM_H__
@@ -33,35 +31,17 @@ extern "C" {
 
 /* USER CODE END Includes */
 
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
+extern LPTIM_HandleTypeDef hlptim1;
 
-/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN Private defines */
 
-extern LPTIM_HandleTypeDef hlptim1;
+/* USER CODE END Private defines */
 
 void MX_LPTIM1_Init(void);
 
-/* USER CODE BEGIN EFP */
+/* USER CODE BEGIN Prototypes */
 
-/* USER CODE END EFP */
+/* USER CODE END Prototypes */
 
 #ifdef __cplusplus
 }
@@ -69,4 +49,4 @@ void MX_LPTIM1_Init(void);
 
 #endif /* __LPTIM_H__ */
 
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/main.h
index 90a199f1..d6e56436 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/main.h
@@ -29,9 +29,9 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
+
 #include "app_kms.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -63,35 +63,14 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h
index 542d0487..d1831b4d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_lptim_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MN_LPTIM_IF_H__
@@ -25,6 +27,8 @@
 extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
+#include "lptim.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -71,4 +75,3 @@ void MN_LPTIM_IF_DeInit(void);
 #endif /* __MN_LPTIM_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
index 5c4dcb28..9341f796 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 /*#define HAL_UART_MODULE_ENABLED   */
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_app.h
index 2ed00a30..eee9c7ac 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -38,6 +40,10 @@ extern "C" {
 /* currently not supported */
 /* #define ALLOW_KMS_VIA_MBMUX */
 
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -71,29 +77,27 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
   */
 void SystemApp_Init(void);
 
 /**
-  * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
-void GetUniqueId(uint8_t *id);
+void TimestampNow(uint8_t *buff, uint16_t *size);
 
 /**
-  * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
-  * @retval devAddr Device Address
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
   */
-uint32_t GetDevAddr(void);
-
-void TimestampNow(uint8_t *buff, uint16_t *size);
 void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_conf.h
index b8334f49..a7e879fc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -41,24 +43,28 @@ extern "C" {
 /**
   * @brief CM0PLUS Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
index f19258a6..72caddc5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -35,7 +37,6 @@ extern "C" {
 #include "stm32_tiny_vsnprintf.h"
 
 #include "mbmuxif_trace.h"
-
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h
index a16ff4a3..757853e8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   CFG_LPM_SGFX_MN_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
@@ -96,6 +100,7 @@ typedef enum
   CFG_SEQ_Evt_MbSystemAckRcv,
   CFG_SEQ_Evt_MbTraceAckRcv,
   CFG_SEQ_Evt_MbSigfoxAckRcv,
+  CFG_SEQ_Evt_Monarch,
   CFG_SEQ_Evt_MbRadioAckRcv,
   CFG_SEQ_Evt_Timeout,
   CFG_SEQ_Evt_TxTimeout,
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c
index f9d9852d..a33a673d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c
@@ -1,9 +1,11 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    flash_if.c
   * @author  MCD Application Team
-  * @brief   This file contains the FLASH driver
-  *****************************************************************************
+  * @brief   This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
   * @attention
   *
   * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
@@ -14,13 +16,13 @@
   * the License. You may obtain a copy of the License at:
   *                             www.st.com/SLA0044
   *
-  *****************************************************************************
+  ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "stm32wlxx.h"
 #include "flash_if.h"
+#include "stm32_mem.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -38,14 +40,14 @@
 
 /* Private define ------------------------------------------------------------*/
 /**
-  * @brief Flash status enumeration
+  * @brief Flash empty status enumeration
   */
 enum
 {
-  FLASH_ERROR  = -1,
-  FLASH_OK     = 0,
-  FLASH_BUSY   = 1
+  FLASH_EMPTY      = 0,
+  FLASH_NOT_EMPTY  = 1
 };
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -61,46 +63,136 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
+  * @retval HAL Status.
+  */
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength);
+
+/**
+  * @brief  This function checks if part of Flash is empty
+            It handles 32b unaligned address
+  * @param  addr: Start of user flash area
+  * @param  size: number of bytes.
+  * @retval FLASH_EMPTY or FLASH_NOT_EMPTY.
+  */
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-int32_t HW_FLASH_Write(uint32_t address,
-                       uint64_t data)
+int32_t FLASH_IF_Write(uint32_t address, uint8_t *data, uint32_t size, uint8_t *dataTempPage)
 {
-  /* USER CODE BEGIN HW_FLASH_Write_1 */
+  /* USER CODE BEGIN FLASH_IF_Write_1 */
+
+  /* USER CODE END FLASH_IF_Write_1 */
+  int32_t status = FLASH_OK;
+  uint32_t page_start_index = PAGE(address);
+  uint32_t page_end_index = PAGE(address + size - 1);
+  uint32_t curr_size = size;
+  uint32_t curr_dest_addr = address;
+  uint32_t curr_src_addr = (uint32_t)data;
+
+  if ((data == NULL) || ((size % sizeof(uint64_t)) != 0) || ((address % sizeof(uint64_t)) != 0))
+  {
+    return FLASH_PARAM_ERROR;
+  }
+
+  if (READ_BIT(FLASH->CR, FLASH_CR_LOCK) != 0U)
+  {
+    return FLASH_LOCK_ERROR;
+  }
 
-  /* USER CODE END HW_FLASH_Write_1 */
-  HAL_StatusTypeDef hal_status = HAL_ERROR;
+  if (page_start_index != page_end_index)
+  {
+    curr_size = FLASH_PAGE_SIZE - (address % FLASH_PAGE_SIZE);
+  }
+
+  for (uint32_t idx = page_start_index; idx <= page_end_index; idx++)
+  {
+    if (FLASH_IF_IsEmpty((uint8_t *)curr_dest_addr, curr_size) != FLASH_EMPTY)
+    {
+      if (dataTempPage == NULL)
+      {
+        return FLASH_PARAM_ERROR;
+      }
+      /* backup initial Flash page data in RAM area */
+      UTIL_MEM_cpy_8(dataTempPage, (uint8_t *)(idx * FLASH_PAGE_SIZE + FLASH_BASE), FLASH_PAGE_SIZE);
+      /* copy fragment into RAM area */
+      UTIL_MEM_cpy_8(&dataTempPage[((uint32_t)curr_dest_addr) % FLASH_PAGE_SIZE], (uint8_t *)curr_src_addr, curr_size);
+
+      /*  erase the Flash sector, to avoid writing twice in RAM */
+      if (FLASH_IF_EraseByPages(idx, 1, 0) != FLASH_OK)
+      {
+        status = FLASH_ERASE_ERROR;
+        break; /* exit for loop */
+      }
+      else
+      {
+        /* copy the whole flash sector including fragment from RAM to Flash*/
+        if (FLASH_IF_Write_Buffer(idx * FLASH_PAGE_SIZE + FLASH_BASE, dataTempPage, FLASH_PAGE_SIZE) != FLASH_OK)
+        {
+          status = FLASH_WRITE_ERROR;
+          break; /* exit for loop */
+        }
+      }
+    }
+    else
+    {
+      if (FLASH_IF_Write_Buffer(curr_dest_addr, (uint8_t *)curr_src_addr, curr_size) != FLASH_OK)
+      {
+        status = FLASH_WRITE_ERROR;
+        break; /* exit for loop */
+      }
+    }
+
+    /* 2nd part of memory overlapped on 2nd flash sector */
+    curr_dest_addr += curr_size;
+    curr_src_addr += curr_size;
+    curr_size = size - curr_size;
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_2 */
+
+  /* USER CODE END FLASH_IF_Write_2 */
+}
 
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data)
+{
+  /* USER CODE BEGIN FLASH_IF_Write64_1 */
+
+  /* USER CODE END FLASH_IF_Write64_1 */
   while (*(uint64_t *)address != data)
   {
     while (LL_FLASH_IsActiveFlag_OperationSuspended());
-
-    hal_status =
-      HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
+    HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
   }
 
-  return ((hal_status == HAL_OK) ? FLASH_OK :
-          ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERROR));
+  return FLASH_OK;
   /* USER CODE BEGIN HW_FLASH_Write_2 */
 
   /* USER CODE END HW_FLASH_Write_2 */
 }
 
-int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt)
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt)
 {
-  /* USER CODE BEGIN HW_FLASH_Erase_1 */
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_1 */
 
-  /* USER CODE END HW_FLASH_Erase_1 */
+  /* USER CODE END FLASH_IF_EraseByPages_1 */
   HAL_StatusTypeDef hal_status;
   FLASH_EraseInitTypeDef erase_str;
   uint32_t page_error;
 
   erase_str.TypeErase = FLASH_TYPEERASE_PAGES;
-  erase_str.Page      = page;
-  erase_str.NbPages   = n;
+  erase_str.Page = page;
+  erase_str.NbPages = n;
 
   /* Erase the Page */
   if (interrupt)
@@ -112,33 +204,10 @@ int32_t HW_FLASH_Erase(uint32_t page, uint16_t n, int32_t interrupt)
     hal_status = HAL_FLASHEx_Erase(&erase_str, &page_error);
   }
 
-  return ((hal_status == HAL_OK) ? FLASH_OK :
-          ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERROR));
-  /* USER CODE BEGIN HW_FLASH_Erase_2 */
-
-  /* USER CODE END HW_FLASH_Erase_2 */
-}
-
-uint32_t HW_FLASH_OB_GetIPCCBufferAddr(void)
-{
-  /* USER CODE BEGIN HW_FLASH_OB_GetIPCCBufferAddr_1 */
-
-  /* USER CODE END HW_FLASH_OB_GetIPCCBufferAddr_1 */
-  return READ_BIT(FLASH->IPCCBR, FLASH_IPCCBR_IPCCDBA);
-  /* USER CODE BEGIN HW_FLASH_OB_GetIPCCBufferAddr_2 */
+  return ((hal_status == HAL_OK) ? FLASH_OK : ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERASE_ERROR));
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_2 */
 
-  /* USER CODE END HW_FLASH_OB_GetIPCCBufferAddr_2 */
-}
-
-uint32_t HW_FLASH_OB_GetSFSA(void)
-{
-  /* USER CODE BEGIN HW_FLASH_OB_GetSFSA_1 */
-
-  /* USER CODE END HW_FLASH_OB_GetSFSA_1 */
-  return (READ_BIT(FLASH->SFR, FLASH_SFR_SFSA) >> FLASH_SFR_SFSA_Pos);
-  /* USER CODE BEGIN HW_FLASH_OB_GetSFSA_2 */
-
-  /* USER CODE END HW_FLASH_OB_GetSFSA_2 */
+  /* USER CODE END FLASH_IF_EraseByPages_2 */
 }
 
 void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
@@ -156,7 +225,14 @@ void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
   /* USER CODE END HAL_FLASH_EndOfOperationCallback_2 */
 }
 
-__WEAK void HWCB_FLASH_EndOfCleanup(void)
+void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_OperationErrorCallback_1 */
+
+  /* USER CODE END HAL_FLASH_OperationErrorCallback_1 */
+}
+
+void HWCB_FLASH_EndOfCleanup(void)
 {
   /* USER CODE BEGIN HWCB_FLASH_EndOfCleanup_1 */
 
@@ -168,6 +244,86 @@ __WEAK void HWCB_FLASH_EndOfCleanup(void)
 /* USER CODE END EF */
 
 /* Private Functions Definition -----------------------------------------------*/
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_1 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_1 */
+  uint8_t *pSrc = pSource;
+  uint64_t src_value;
+  int32_t status = FLASH_OK;
+
+  for (uint32_t i = 0; i < (uLength / sizeof(uint64_t)); i++)
+  {
+    UTIL_MEM_cpy_8(&src_value, pSrc, sizeof(uint64_t));
+
+    /* Avoid writing 0xFFFFFFFFFFFFFFFFLL on erased Flash */
+    if (src_value != UINT64_MAX)
+    {
+      status = FLASH_IF_Write64(pDestination, src_value);
+    }
+
+    pDestination += sizeof(uint64_t);
+    pSrc += sizeof(uint64_t);
+
+    if (status != FLASH_OK)
+    {
+      /* exit the for loop*/
+      break;
+    }
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_2 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_2 */
+}
+
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size)
+{
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_1 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_1 */
+  uint64_t *addr64;
+  uint32_t i;
+
+  /* start memory NOT 64bits aligned */
+  while ((((uint32_t)addr) % sizeof(uint64_t)) != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+
+  /* addr64 is 64 bits aligned */
+  addr64 = (uint64_t *)addr;
+  for (i = 0; i < (size / sizeof(uint64_t)); i++)
+  {
+    if (*addr64++ != UINT64_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+  }
+  size -= sizeof(uint64_t) * i;
+
+  /* end memory NOT 64 bits aligned */
+  addr = (uint8_t *)addr64;
+  while (size != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+  return FLASH_EMPTY;
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_2 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c
index 617042e8..1d49b00f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c
index ad72640a..d8ea5d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,7 +82,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* Enable C2AHB3 peripherals clock. */
@@ -89,14 +91,14 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccCommandRcv = IPCC_IF_CommandRcv_cb;
   IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c
index c9742859..6b18ae32 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ LPTIM_HandleTypeDef hlptim1;
 void MX_LPTIM1_Init(void)
 {
 
+  /* USER CODE BEGIN LPTIM1_Init 0 */
+
+  /* USER CODE END LPTIM1_Init 0 */
+
+  /* USER CODE BEGIN LPTIM1_Init 1 */
+
+  /* USER CODE END LPTIM1_Init 1 */
   hlptim1.Instance = LPTIM1;
   hlptim1.Init.Clock.Source = LPTIM_CLOCKSOURCE_APBCLOCK_LPOSC;
   hlptim1.Init.Clock.Prescaler = LPTIM_PRESCALER_DIV1;
@@ -43,6 +50,9 @@ void MX_LPTIM1_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPTIM1_Init 2 */
+
+  /* USER CODE END LPTIM1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/main.c
index 964fb0f8..e1964d23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/main.c
@@ -80,8 +80,8 @@ int main(void)
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
-  MX_Sigfox_Init();
   MX_KMS_Init();
+  MX_Sigfox_Init();
   /* USER CODE BEGIN 2 */
 
   /* USER CODE END 2 */
@@ -110,6 +110,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c
index 3ed8de69..c81d7a90 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_lptim_if.c
@@ -16,12 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "lptim.h"
 #include "mn_lptim_if.h"
 
 /* USER CODE BEGIN Includes */
+
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -63,25 +65,29 @@ extern LPTIM_HandleTypeDef hlptim1;
 void MN_LPTIM_IF_Init(void)
 {
   /* USER CODE BEGIN MN_LPTIM_IF_Init_0 */
+
   /* USER CODE END MN_LPTIM_IF_Init_0 */
 
-  /* Force the LPTIM1 Periheral Clock Reset */
+  /* Force the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_FORCE_RESET();
-  /* Release the LPTIM1 Periheral Clock Reset */
+  /* Release the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_RELEASE_RESET();
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_1 */
+
   /* USER CODE END MN_LPTIM_IF_Init_1 */
 
   MX_LPTIM1_Init();
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_2 */
+
   /* USER CODE END MN_LPTIM_IF_Init_2 */
 
   /* w.a.: LL_EXTI_LINE_X should be enabled in HAL_LPTIM_MspInit */
   LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_29);
 
   /* USER CODE BEGIN MN_LPTIM_IF_Init_3 */
+
   /* USER CODE END MN_LPTIM_IF_Init_3 */
 }
 
@@ -90,6 +96,7 @@ void MN_LPTIM_IF_DeInit(void)
   RCC_PeriphCLKInitTypeDef RCC_PeriphCLKInitStruct;
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_0 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_0 */
 
   if (HAL_LPTIM_DeInit(&hlptim1) != HAL_OK)
@@ -98,6 +105,7 @@ void MN_LPTIM_IF_DeInit(void)
   }
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_1 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_1 */
 
   /* Select the PCLK clock as LPTIM1 peripheral clock */
@@ -106,15 +114,17 @@ void MN_LPTIM_IF_DeInit(void)
   HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphCLKInitStruct);
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_2 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_2 */
 
-  /* Force the LPTIM1 Periheral Clock Reset */
+  /* Force the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_FORCE_RESET();
 
-  /* Release the LPTIM1 Periheral Clock Reset */
+  /* Release the LPTIM1 Peripheral Clock Reset */
   __HAL_RCC_LPTIM1_RELEASE_RESET();
 
   /* USER CODE BEGIN MN_LPTIM_IF_DeInit_3 */
+
   /* USER CODE END MN_LPTIM_IF_DeInit_3 */
 
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c
index f74cd49b..ab828d03 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,17 +71,20 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
   /** Enable the Alarm B
   */
   sAlarm.Alarm = RTC_ALARM_B;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
index 3dfcda11..eb2e798d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm_if.h"
 
 /* USER CODE BEGIN Includes */
@@ -91,7 +93,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C2STOP_C2STB();
@@ -110,7 +111,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
index 26cf182e..a6deacbb 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -76,7 +76,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -129,7 +131,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_app.c
index 4191e4b2..d7cf6e8c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -27,16 +29,15 @@
 #include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-
+#include "sgfx_eeprom_if.h"
 #include "msg_id.h"
-#include "features_info.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
 #include "mbmuxif_radio.h"
+#include "features_info.h"
 #include "mbmuxif_sigfox.h"
-#include "sgfx_eeprom_if.h"
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-#include "mbmuxif_kms.h"
+/* #include "mbmuxif_kms.h" */
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
@@ -55,6 +56,7 @@
 
 /* Private define ------------------------------------------------------------*/
 #define MAX_TS_SIZE (int) 16
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -72,8 +74,6 @@
 /* Private function prototypes -----------------------------------------------*/
 /**
   * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
-  * @param none
-  * @retval  none
   */
 static void System_Init(void);
 
@@ -81,16 +81,12 @@ static void System_Init(void);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises MBMUXIF System and send a notification to Cm4 when ready
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   int8_t init_status;
@@ -99,13 +95,13 @@ void SystemApp_Init(void)
   /* USER CODE END SystemApp_Init_1 */
 
   /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
+  /* #warning "should be removed when proper obl is done" */
   __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
-  E2P_Init();
 
-  /*Set verbose LEVEL*/
-  UTIL_ADV_TRACE_SetVerboseLevel(E2P_Read_VerboseLevel());
+  E2P_Init();
 
   /*Init low power manager*/
   UTIL_LPM_Init();
@@ -122,7 +118,7 @@ void SystemApp_Init(void)
   /* Init Feat_Info table */
   FEAT_INFO_Init();
 
-  /* Note: the trace is initialised in the context of MBMUXIF because it uses the MB on Cm0 side */
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
@@ -131,8 +127,8 @@ void SystemApp_Init(void)
 
   System_Init();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
 
   /* Registers Sigfox Notif to the sequencer */
   UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSigfoxNotifRcv), UTIL_SEQ_RFU, MBMUXIF_SigfoxSendNotifTask);
@@ -142,11 +138,6 @@ void SystemApp_Init(void)
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
-  */
 void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -166,7 +157,7 @@ void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Kms_Cmd_1 */
 
   /* USER CODE END Process_Kms_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
 
   APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
 
@@ -207,19 +198,19 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   switch (ComObj->MsgId)
   {
     case SYS_OTHER_MSG_ID:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
 
-  /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
       break;
 
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
 
-  /* USER CODE END Process_Sys_Cmd_switch_case */
+    /* USER CODE END Process_Sys_Cmd_switch_case */
 
     default:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
 
-  /* USER CODE END Process_Sys_Cmd_switch_default */
+      /* USER CODE END Process_Sys_Cmd_switch_default */
       break;
   }
 
@@ -231,16 +222,16 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Cmd_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -249,8 +240,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -263,66 +252,9 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-void GetUniqueId(uint8_t *id)
-{
-  /* USER CODE BEGIN GetUniqueId_1 */
-
-  /* USER CODE END GetUniqueId_1 */
-  uint32_t val = 0;
-  val = LL_FLASH_GetUDN();
-  if (val == 0xFFFFFFFF)  /* Normally this should not happen */
-  {
-    uint32_t ID_1_3_val = HAL_GetUIDw0() + HAL_GetUIDw2();
-    uint32_t ID_2_val = HAL_GetUIDw1();
-
-    id[7] = (ID_1_3_val) >> 24;
-    id[6] = (ID_1_3_val) >> 16;
-    id[5] = (ID_1_3_val) >> 8;
-    id[4] = (ID_1_3_val);
-    id[3] = (ID_2_val) >> 24;
-    id[2] = (ID_2_val) >> 16;
-    id[1] = (ID_2_val) >> 8;
-    id[0] = (ID_2_val);
-  }
-  else  /* Typical use case */
-  {
-    id[7] = val & 0xFF;
-    id[6] = (val >> 8) & 0xFF;
-    id[5] = (val >> 16) & 0xFF;
-    id[4] = (val >> 24) & 0xFF;
-    val = LL_FLASH_GetDeviceID();
-    id[3] = val & 0xFF;
-    val = LL_FLASH_GetSTCompanyID();
-    id[2] = val & 0xFF;
-    id[1] = (val >> 8) & 0xFF;
-    id[0] = (val >> 16) & 0xFF;
-  }
-
-  /* USER CODE BEGIN GetUniqueId_2 */
-
-  /* USER CODE END GetUniqueId_2 */
-}
-
-uint32_t GetDevAddr(void)
-{
-  uint32_t val = 0;
-  /* USER CODE BEGIN GetDevAddr_1 */
-
-  /* USER CODE END GetDevAddr_1 */
-  val = LL_FLASH_GetUDN();
-  if (val == 0xFFFFFFFF)
-  {
-    val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
-  }
-  /* USER CODE BEGIN GetDevAddr_2 */
-
-  /* USER CODE END GetDevAddr_2 */
-  return val;
-}
-
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
 static void System_Init(void)
@@ -334,7 +266,7 @@ static void System_Init(void)
   LL_C2_PWR_DisableInternWU();
 
   /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
-  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach onlt Cm4 */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
   LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
   LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
 
@@ -395,10 +327,7 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -413,13 +342,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -430,13 +357,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/timer_if.c
index 6133e380..6405002c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -106,6 +106,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -155,7 +166,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -175,9 +185,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -185,7 +195,7 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A and Alarm B enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
     /*overload RTC feature enable*/
@@ -193,11 +203,14 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -280,64 +293,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,9 +379,9 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
 {
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
   MBMUX_ComParam_t *com_obj;
 
   if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
@@ -376,9 +395,9 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
       MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
     }
   }
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
 }
 
 void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
@@ -386,7 +405,7 @@ void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
@@ -409,6 +428,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -418,16 +438,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -454,24 +474,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c
index 37a8e2d2..30d2715f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stddef.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c
index 013f7100..ef887470 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -51,15 +54,53 @@
 
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -67,11 +108,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -80,27 +116,23 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   uint8_t i;
   IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
 
-  p_MBMUX_ComTable = pMBMUX_ComTable;
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
 
   for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
   {
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
   }
   /* USER CODE BEGIN MBMUX_Init_Last */
 
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval  return -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
-  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
 {
   uint8_t channel_idx;
@@ -116,15 +148,19 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   {
     /* channel has been registered by CM4 registered */
     channel_idx = check_existing_feature_registration;
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm0plusCb = MsgCb;
-    }
-    else
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
     {
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm0plusCb = MsgCb;
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
     }
-    ret = channel_idx;
   }
   /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
 
@@ -132,13 +168,6 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -155,11 +184,11 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
       /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
       IPCC_IF_ResponseSnd(mb_ch);
 
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
     else
     {
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
   }
   /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
@@ -167,12 +196,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -199,11 +222,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Notif to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
@@ -214,7 +232,7 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
   if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
   {
-    while (1) {}
+    Error_Handler();
   }
   return IPCC_IF_NotificationSnd(mb_ch);
   /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
@@ -222,11 +240,6 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_NotificationSnd_Last */
 }
 
-/**
-  * @brief Send response to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
@@ -241,17 +254,118 @@ uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_ResponseSnd_Last */
 }
 
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
 /* USER CODE BEGIN EFD */
 
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
@@ -260,18 +374,13 @@ static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
@@ -280,19 +389,13 @@ static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
   return;
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -304,17 +407,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h
index e91b1547..a938e544 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM0PLUS_H__
@@ -52,19 +54,58 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 0ec2ec5d..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmux.h"
-#include "sys_app.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-static MBMUX_ComParam_t *KmsComObj;
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj);
-static void MBMUXIF_TaskKmsCmdRcv(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers KMS feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsCmdRcvCb);
-  if (ret >= 0)
-  {
-    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskKmsCmdRcv);
-    ret = 0;
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief Sends a Kms-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendResp(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_1 */
-  if (MBMUX_ResponseSnd(FEAT_INFO_KMS_ID) != 0)
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendResp_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendResp_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsCmdRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_1 */
-  KmsComObj = (MBMUX_ComParam_t *) ComObj;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbKmsCmdRcv), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsCmdRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsCmdRcvCb_Last */
-}
-
-/**
-  * @brief  KMS task to process the command
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_TaskKmsCmdRcv(void)
-{
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_1 */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_1 */
-#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
-  Process_Kms_Cmd(KmsComObj);
-#endif /* ALLOW_KMS_VIA_MBMUX */
-  /* USER CODE BEGIN MBMUXIF_TaskKmsCmdRcv_Last */
-
-  /* USER CODE END MBMUXIF_TaskKmsCmdRcv_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
deleted file mode 100644
index 12b71c19..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM0PLUS_H__
-#define __MBMUXIF_KMS_CM0PLUS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-void MBMUXIF_KmsSendResp(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM0PLUS_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
index 3ba64a2b..fe5fd070 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -57,22 +59,33 @@ static MBMUX_ComParam_t *RadioComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
 static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
 static void MBMUXIF_TaskRadioNotifSnd(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers RADIO feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   int8_t ret;
@@ -99,11 +112,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
@@ -112,7 +120,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
@@ -120,11 +128,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendNotif(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
@@ -136,11 +139,6 @@ void MBMUXIF_RadioSendNotif(void)
   /* USER CODE END MBMUXIF_RadioSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Radio-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
@@ -148,7 +146,7 @@ void MBMUXIF_RadioSendResp(void)
   /* USER CODE END MBMUXIF_RadioSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
 
@@ -160,11 +158,6 @@ void MBMUXIF_RadioSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
@@ -176,11 +169,6 @@ static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
@@ -193,11 +181,6 @@ static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the command
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
@@ -209,11 +192,6 @@ static void MBMUXIF_TaskRadioCmdRcv(void)
   /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
 }
 
-/**
-  * @brief  RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifSnd(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
@@ -225,7 +203,7 @@ static void MBMUXIF_TaskRadioNotifSnd(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
index 44fab48f..7e226c6c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM0PLUS_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_RadioSendResp(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c
index 73e12d3e..c68a5481 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sigfox.c
   * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle Sigfox to MBMUX
+  * @brief   allows CM0PLUS application to register and handle Sigfox to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -57,8 +59,21 @@ static MBMUX_ComParam_t *SigfoxComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  Sigfox acknowledge callbacks: set event to release waiting task
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
 static void MBMUXIF_IsrSigfoxAckRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox command callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
 static void MBMUXIF_IsrSigfoxCmdRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox task to process the command
+  */
 static void MBMUXIF_TaskSigfoxCmdRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -66,13 +81,6 @@ static void MBMUXIF_TaskSigfoxCmdRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_SigfoxInit(void)
 {
   int8_t ret;
@@ -99,11 +107,6 @@ int8_t MBMUXIF_SigfoxInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Sigfox feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureNotifComPtr_1 */
@@ -112,7 +115,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_SIGFOX_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureNotifComPtr_Last */
@@ -120,11 +123,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetSigfoxFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief  Set a Task to prevent being blocked on ISR
-  * @param  none
-  * @retval none
-  */
 void MBMUXIF_SigfoxSendNotif(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendNotif_1 */
@@ -136,11 +134,6 @@ void MBMUXIF_SigfoxSendNotif(void)
   /* USER CODE END MBMUXIF_SigfoxSendNotif_Last */
 }
 
-/**
-  * @brief  Sends a Sigfox-Notif via Ipcc and Wait for the Ack
-  * @param  none
-  * @retval none
-  */
 void MBMUXIF_SigfoxSendNotifTask(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendNotifTask_1 */
@@ -152,18 +145,13 @@ void MBMUXIF_SigfoxSendNotifTask(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SigfoxSendNotifTask_Last */
 
   /* USER CODE END MBMUXIF_SigfoxSendNotifTask_Last */
 }
 
-/**
-  * @brief Sends a Sigfox-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SigfoxSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendResp_1 */
@@ -171,7 +159,7 @@ void MBMUXIF_SigfoxSendResp(void)
   /* USER CODE END MBMUXIF_SigfoxSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_SIGFOX_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SigfoxSendResp_Last */
 
@@ -183,11 +171,7 @@ void MBMUXIF_SigfoxSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  Sigfox acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
+
 static void MBMUXIF_IsrSigfoxAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSigfoxAckRcvCb_1 */
@@ -199,11 +183,6 @@ static void MBMUXIF_IsrSigfoxAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSigfoxAckRcvCb_Last */
 }
 
-/**
-  * @brief  Sigfox command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSigfoxCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSigfoxCmdRcvCb_1 */
@@ -216,11 +195,6 @@ static void MBMUXIF_IsrSigfoxCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSigfoxCmdRcvCb_Last */
 }
 
-/**
-  * @brief  Sigfox task to process the command
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSigfoxCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSigfoxCmdRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h
index ad6b9356..9aac213b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sigfox.h
   * @author  MCD Application Team
-  * @brief   API provided to CM0 appli to register and handle Sigfox to MBMUX
+  * @brief   API provided to CM0 application to register and handle Sigfox to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SIGFOX_CM0PLUS_H__
@@ -52,10 +54,30 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS; -3: callback error on CM0PLUS
+  */
 int8_t MBMUXIF_SigfoxInit(void);
+/**
+  * @brief   gives back the pointer to the com buffer associated to Sigfox feature Notif
+  * @return  pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void);
+
+/**
+  * @brief   Set a Task to prevent being blocked on ISR
+  */
 void MBMUXIF_SigfoxSendNotif(void);
+
+/**
+  * @brief   Sends a Sigfox-Notif via Ipcc and Wait for the Ack
+  */
 void MBMUXIF_SigfoxSendNotifTask(void);
+
+/**
+  * @brief   Sends a Sigfox-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_SigfoxSendResp(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
index b33d6ae5..c94507ea 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to handle the SYSTEM MBMUX channel
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -63,27 +65,59 @@ static MBMUX_ComParam_t *SystemComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
 static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
 
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf);
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
 
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
@@ -118,7 +152,7 @@ int8_t MBMUXIF_SystemInit(void)
 
   if (ret >= 0)
   {
-    /* Notify Cm4 that MBMUXIF_System and RTC are initialised on Cm0 side */
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
     /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
     while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
     pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
@@ -130,14 +164,6 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Get synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
@@ -146,11 +172,6 @@ uint16_t MBMUXIF_GetCpusSynchroFlag(void)
   return pMb_RefTable->SynchronizeCpusAtBoot;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
@@ -159,7 +180,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
 
@@ -167,11 +188,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   return com_param_ptr;
 }
 
-/**
-  * @brief Sends a System-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
@@ -183,18 +199,13 @@ void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
@@ -202,26 +213,21 @@ void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
 }
 
-/**
-  * @brief Sends a System-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
 
-  /* USER CODE END EFMBMUXIF_SystemSendResp_1 */
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
   if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
 
@@ -238,7 +244,7 @@ int16_t MBMUXIF_ChipRevId(void)
   int16_t ret = pMb_RefTable->ChipRevId;
   /* USER CODE BEGIN MBMUXIF_ChipRevId */
 
-  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+  /* USER CODE END MBMUXIF_ChipRevId */
   return ret ;
 }
 
@@ -247,27 +253,17 @@ int16_t MBMUXIF_ChipRevId(void)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 {
   SystemComObj = (MBMUX_ComParam_t *) ComObj;
@@ -276,7 +272,7 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
 
   /* process Command on Isr or schedule a task*/
   switch (SystemComObj->MsgId)
@@ -286,11 +282,6 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
       MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
       break;
 
-    case SYS_REGISTER_FEATURE_MSG_ID:
-      SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
-      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-      break;
-
     case SYS_EE_READ_ID:
       status = (uint32_t) EE_ReadValue((e_EE_ID) com_buffer[0], (uint32_t *) com_buffer[1]);
       /* prepare response buffer */
@@ -309,7 +300,7 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
     /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
     default:
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
@@ -318,89 +309,68 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
 
 }
 
-/**
-  * @brief  SYSTEM task to process the command
-  * @param  none
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemCmdRcv(void)
 {
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
-  Process_Sys_Cmd(SystemComObj);
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
 
 }
 
-/**
-  * @brief  SYSTEM PRIO_A acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
 }
 
-/**
-  * @brief  Retrieve the feature that needs MbMux registration and call correspondent Init
-  * @param  pointer to parameter buffer of the command
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  */
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
 {
   int8_t ret = -2; /* feature not supported */
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  switch (ParamBuf[0])
+  switch (pBuf[0])
   {
     case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
       ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
@@ -424,6 +394,9 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
       ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
       break;
 
@@ -433,17 +406,23 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora not supported\r\n");
       break;
 
     case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
       ret = MBMUXIF_SigfoxInit();
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox registration done\r\n");
       break;
 
     /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
     default:
       break;
@@ -451,7 +430,7 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
   return ret;
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
index 01dff052..f780cdde 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM0PLUS_H__
@@ -54,11 +56,44 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -66,6 +101,10 @@ void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
 int16_t MBMUXIF_ChipRevId(void);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
index 04c9f7b6..05704d23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -25,6 +27,7 @@
 #include "msg_id.h"
 #include "stm32_seq.h"
 #include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
 
 /* USER CODE BEGIN Includes */
 
@@ -46,15 +49,43 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
-static void (*TraceUtilCpltCallback)(void *);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
 
 /* USER CODE BEGIN PFP */
@@ -75,12 +106,6 @@ const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
 /* USER CODE END PTD */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
 {
   int8_t ret;
@@ -92,6 +117,8 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
   if (ret >= 0)
   {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
     /*Initialize the terminal */
     UTIL_ADV_TRACE_Init();
     UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
@@ -107,11 +134,6 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Trace feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
@@ -120,7 +142,7 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
@@ -128,11 +150,6 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendNotif_NoWait(void)
 {
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
@@ -140,7 +157,7 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
   /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
 
@@ -152,14 +169,6 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
 /* USER CODE END EFD */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief The trace utilities inform the mbmuxif which func to call
-  *        once the Mb transmission is completed
-  * @param:  "stm32_adv_trace.c callback"
-  * @retval: none
-  */
-
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
@@ -172,26 +181,23 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
   /* USER CODE END MBMUXIF_TraceBufferInit_Last */
 }
 
-/**
-  * @brief TraceBufferSend sends the formatted buffer to CM4 which
-  *        posts it to the circular queue for printing
-  * @param:  strFormat: string to be printed
-  * @retval: 0 when ok, -1 when circular queue is full
-  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
 
   /* USER CODE END MBMUXIF_TraceBufferSend_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
 
-  /* notify CM4 that CM0PLUS is initialised */
+  /* notify CM4 that CM0PLUS is initialized */
   com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
   if (com_obj != NULL)
   {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
     com_obj->MsgId = TRACE_SEND_MSG_ID;
-    com_obj->ParamBuf[0] = (uint32_t) buf;
-    com_obj->ParamBuf[1] = (uint32_t) bufSize;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
     com_obj->ParamCnt = 2;
     MBMUXIF_TraceSendNotif_NoWait();
   }
@@ -202,24 +208,28 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bu
 }
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TRACE acknowledge callbacks: set event to release waiting task
-  *             and use callback to check if other trace need to be sent to CM4
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
-  TraceUtilCpltCallback(NULL);
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
 }
 
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
index 490321d2..8aad9276 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle TRACE via MBMUX
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM0PLUS_H__
@@ -52,8 +54,23 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendNotif_NoWait(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
index c09f8d55..063d379e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -47,7 +49,6 @@
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
 
 /* USER CODE BEGIN PD */
 
@@ -59,7 +60,15 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_S
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-static  RadioEvents_t    radioevents_mbwrapper;
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/**
+  * @brief local structure of radio callbacks for command processes
+  */
+static  RadioEvents_t radioevents_mbwrapper;
 
 /* USER CODE BEGIN PV */
 
@@ -79,10 +88,10 @@ static void RadioTxTimeout_mbwrapper(void);
 /*!
  * \brief Rx Done callback prototype.
  *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
+ * \param[in] payload Received buffer pointer
+ * \param[in] size    Received buffer size
+ * \param[in] rssi    RSSI value computed while receiving the frame [dBm]
+ * \param[in] snr     Raw SNR value given by the radio hardware
  *                     FSK : N/A ( set to 0 )
  *                     LoRa: SNR value in dB
  */
@@ -108,13 +117,15 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Radio_Cmd_1 */
 
   /* USER CODE END Process_Radio_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = NULL;
   uint32_t ret_uint;
   int32_t ret_int;
   RadioState_t status;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
@@ -242,7 +253,7 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = 0; /* */
       break;
 
-    case RADIO_SET_TX_CONTINOUS_WAVE_ID:
+    case RADIO_SET_TX_CONTINUOUS_WAVE_ID:
       Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -411,16 +422,26 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
 
   /* USER CODE END RadioRxDone_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
+  uint32_t *com_buffer = NULL ;
   uint16_t i = 0;
 
   /* copy data from Cm0 private memory to shared memory */
-  UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  if (payload != NULL)
+  {
+    UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  }
 
   com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
   com_obj->MsgId = RADIO_RX_DONE_CB_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (payload == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  }
   com_buffer[i++] = (uint32_t) size;
   com_buffer[i++] = (uint32_t) rssi;
   com_buffer[i++] = (uint32_t) snr;
@@ -435,7 +456,7 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
   /* once event is received and semaphore released: */
 
   /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
-     this migh be requested just if the buffer should be processed by the applic and the stack */
+     this might be requested just if the buffer should be processed by the application and the stack */
   /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
   return;
   /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
index 4b3da2cd..ac6a70d3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_info.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_info.c
index 455048ee..8629b1bf 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_info.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sigfox_info.h"
@@ -58,9 +60,7 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") SigfoxInfo_t SigfoxInfoTable;
 
 /* Private function prototypes -----------------------------------------------*/
 /**
-  * @brief initialises the SigfoxInfo capabilities table
-  * @param none
-  * @retval  none
+  * @brief initialize the SigfoxInfo capabilities table
   */
 static void StoreValueInFeatureListTable(void);
 
@@ -69,11 +69,6 @@ static void StoreValueInFeatureListTable(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief initialises the SigfoxInfo capabilities table
-  * @param none
-  * @retval  none
-  */
 void SigfoxInfo_Init(void)
 {
   /* USER CODE BEGIN SigfoxInfo_Init_1 */
@@ -95,11 +90,6 @@ void SigfoxInfo_Init(void)
   /* USER CODE END SigfoxInfo_Init_2 */
 }
 
-/**
-  * @brief returns the pointer to the SigfoxInfo capabilities table
-  * @param none
-  * @retval  SigfoxInfoTable pointer
-  */
 SigfoxInfo_t *SigfoxInfo_GetPtr(void)
 {
   /* USER CODE BEGIN SigfoxInfo_GetPtr_1 */
@@ -146,7 +136,7 @@ static void StoreValueInFeatureListTable(void)
 
   if (found)
   {
-    p_feature->Feat_Info_Config_Size = sizeof(SigfoxInfo_t)/sizeof(uint32_t);
+    p_feature->Feat_Info_Config_Size = sizeof(SigfoxInfo_t) / sizeof(uint32_t);
     p_feature->Feat_Info_Config_Ptr = &SigfoxInfoTable;
   }
   else
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c
index 1d643738..976269c7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -31,7 +33,7 @@
 #include "st_sigfox_api.h"
 #include "sigfox_monarch_api.h"
 #include "sigfox_info.h"
-
+#include "utilities_def.h"
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
@@ -70,8 +72,23 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aSigfoxMbWrapShare2Buffer[SIGFOX_MB
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/*!
+  * @brief This is the function that will be called by the Sigfox Library when the scan is completed
+  * @param[out] rc_bit_mask  rc  Value of the RC found. There could be only 1 RC or 0 ( not found )
+  * @param[out] rssi         RSSI value of the RC found. if rc = 0, rssi is not valid ( is set to 0 too )
+  */
 static sfx_u8 app_monarch_rcscan_wrapper(sfx_u8 rc_bit_mask, sfx_s16 rssi);
 
+/**
+  * @brief  rf test mode call back starting a while wait loop
+  */
+static void sfx_monarch_test_mode_wait_start_cb(void);
+
+/**
+  * @brief  rf test mode call back exiting a while wait loop
+  */
+static void sfx_monarch_test_mode_wait_end_cb(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
@@ -82,7 +99,7 @@ void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Sigfox_Cmd_1 */
 
   /* USER CODE END Process_Sigfox_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;
+  uint32_t *com_buffer = NULL;
   sfx_u32 config_words[SIZE_CONF_WORDS];
   sfx_u8 frame_ul[SGFX_MAX_PAYLOAD_SIZE];
   sfx_u8 frame_dwnl[SGFX_DWNL_SIZE];
@@ -93,6 +110,8 @@ void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
 
   APP_LOG(TS_ON, VLEVEL_H, " * CM0PLUS Sigfox command received\n\r");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
@@ -203,7 +222,9 @@ void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
       break;
 
     case SIGFOX_API_MONARCH_TEST_MODE_ID:
-      status = ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode((sfx_rc_enum_t) com_buffer[0], (sfx_test_mode_t) com_buffer[1], (sfx_u8)  com_buffer[2]);
+      status = ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_async((sfx_rc_enum_t) com_buffer[0], (sfx_test_mode_t) com_buffer[1], (sfx_u8)  com_buffer[2],
+                                                                       sfx_monarch_test_mode_wait_start_cb,
+                                                                       sfx_monarch_test_mode_wait_end_cb);
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
       ComObj->ReturnVal = (uint32_t) status;
@@ -243,48 +264,6 @@ void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sigfox_Cmd_2 */
 }
 
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-/*!
-  * \brief   This is the function that will be called by the Sigfox Library when the scan is completed
-  *
-  *                     \param[out] sfx_u8       rc  Value of the RC found. There could be only 1 RC or 0 ( not found )
-  *                     \param[out] rssi         RSSI value of the RC found. if rc = 0, rssi is not valid ( is set to 0 too )
-  */
-static sfx_u8 app_monarch_rcscan_wrapper(sfx_u8 rc_bit_mask, sfx_s16 rssi)
-{
-  /* USER CODE BEGIN app_monarch_rcscan_wrapper_1 */
-
-  /* USER CODE END app_monarch_rcscan_wrapper_1 */
-  MBMUX_ComParam_t *com_obj;
-  uint32_t ret;
-
-  com_obj = MBMUXIF_GetSigfoxFeatureNotifComPtr();
-  com_obj->MsgId = SIGFOX_MONARCH_RC_SCAN_CB_ID;
-  com_obj->ParamBuf[0] = (uint32_t) rc_bit_mask;
-  com_obj->ParamBuf[1] = (uint32_t) rssi;
-  com_obj->ParamCnt = 2;
-  MBMUXIF_SigfoxSendNotif();
-  /* waiting for event */
-  /* once event is received and semaphore released: */
-  ret = com_obj->ReturnVal;
-  return (sfx_u8) ret;
-  /* USER CODE BEGIN app_monarch_rcscan_wrapper_2 */
-
-  /* USER CODE END app_monarch_rcscan_wrapper_2 */
-}
-
-/*!
-  * \brief   Measures the battery level
-  *
-  * \statusval  Battery level [0: node is connected to an external
-  *          power source, 1..254: battery level, where 1 is the minimum
-  *          and 254 is the maximum value, 255: the node was not able
-  *          to measure the battery level]
-  */
 uint16_t GetBatteryLevel_mbwrapper(void)
 {
   /* USER CODE BEGIN GetBatteryLevel_mbwrapper_1 */
@@ -308,12 +287,6 @@ uint16_t GetBatteryLevel_mbwrapper(void)
   /* USER CODE END GetBatteryLevel_mbwrapper_2 */
 }
 
-/*!
-  * \brief   Measures the temperature level
-  *
-  * \retval  Temperature level
-  */
-
 int16_t GetTemperatureLevel_mbwrapper(void)
 {
   /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_1 */
@@ -337,6 +310,64 @@ int16_t GetTemperatureLevel_mbwrapper(void)
   /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
 }
 
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static sfx_u8 app_monarch_rcscan_wrapper(sfx_u8 rc_bit_mask, sfx_s16 rssi)
+{
+  /* USER CODE BEGIN app_monarch_rcscan_wrapper_1 */
+
+  /* USER CODE END app_monarch_rcscan_wrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureNotifComPtr();
+  com_obj->MsgId = SIGFOX_MONARCH_RC_SCAN_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t) rc_bit_mask;
+  com_buffer[1] = (uint32_t) rssi;
+  com_obj->ParamCnt = 2;
+  MBMUXIF_SigfoxSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (sfx_u8) ret;
+  /* USER CODE BEGIN app_monarch_rcscan_wrapper_2 */
+
+  /* USER CODE END app_monarch_rcscan_wrapper_2 */
+}
+
+static void sfx_monarch_test_mode_wait_start_cb(void)
+{
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_start_cb_1 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_start_cb_1 */
+
+  /* don't exit this function until test_mode_wait_end callback is called */
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Monarch);
+
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_start_cb_2 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_start_cb_2 */
+}
+
+static void sfx_monarch_test_mode_wait_end_cb(void)
+{
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_end_cb_1 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_end_cb_1 */
+
+  /* release from the test_mode_wait */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Monarch);
+
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_end_cb_2 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_end_cb_2 */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h
index 7ad611ab..9220c66b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SIGFOX_MBWRAPPER_CM0PLUS_H__
@@ -57,8 +59,19 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj);
 
+/*!
+  * @brief   Measures the battery level
+  * @return  Battery level [0: node is connected to an external
+  *          power source, 1..254: battery level, where 1 is the minimum
+  *          and 254 is the maximum value, 255: the node was not able
+  *          to measure the battery level]
+  */
 uint16_t GetBatteryLevel_mbwrapper(void);
 
+/*!
+  * @brief   Measures the temperature level
+  * @return  Temperature level
+  */
 int16_t GetTemperatureLevel_mbwrapper(void);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c
index d07afac5..5bbdbdf3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_sigfox.h"
@@ -79,11 +81,11 @@ void MX_Sigfox_Process(void)
 
   /* USER CODE END MX_Sigfox_Process_1 */
   UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
-
   /* USER CODE BEGIN MX_Sigfox_Process_2 */
 
   /* USER CODE END MX_Sigfox_Process_2 */
 }
+
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h
index 0a8d78db..601d642c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SIGFOX_H__
@@ -47,6 +49,7 @@ extern "C" {
 #define SIGFOX_KMS 1
 /* USER CODE END SIGFOX_KMS */
 /* USER CODE BEGIN EC */
+
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -62,15 +65,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Sigfox Application
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Init(void);
 
 /**
   * @brief  entry Sigfox Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.c
index 6b209af1..aa1c02f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ee.c
@@ -16,6 +17,7 @@
   *
   *****************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "ee.h"
@@ -206,7 +208,7 @@ int32_t EE_Init(int32_t format, uint32_t base_address)
     total_nb_pages =
       2 * (EE_var[0].nb_pages + (CFG_EE_BANK1_SIZE ? EE_var[1].nb_pages : 0));
 
-    if (HW_FLASH_Erase(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
+    if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
     {
       return EE_ERASE_ERROR;
     }
@@ -242,7 +244,7 @@ int32_t EE_Read(int32_t bank, uint16_t addr, uint32_t *data)
   /* USER CODE BEGIN EE_Read_1 */
 
   /* USER CODE END EE_Read_1 */
-  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];;
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
 
   /* Read element starting from active page */
   return EE_ReadEl(pv, addr, data, pv->current_write_page);
@@ -256,7 +258,7 @@ int32_t EE_Write(int32_t bank, uint16_t addr, uint32_t data)
   /* USER CODE BEGIN EE_Write_1 */
 
   /* USER CODE END EE_Write_1 */
-  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];;
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
   uint32_t page;
 
   /* Check if current pool is full */
@@ -334,7 +336,7 @@ int32_t EE_Clean(int32_t bank, int32_t interrupt)
   DBG_EE(EE_1);
 
   /* Erase all the pages of the pool */
-  if (HW_FLASH_Erase(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
+  if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
       != 0)
   {
     return EE_ERASE_ERROR;
@@ -471,7 +473,7 @@ static int32_t EE_Recovery(EE_var_t *pv)
       {
         if (EE_GetState(pv, page) != EE_STATE_ERASED)
         {
-          if (HW_FLASH_Erase(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
+          if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
           {
             return EE_ERASE_ERROR;
           }
@@ -505,7 +507,7 @@ static int32_t EE_Transfer(EE_var_t *pv, uint16_t addr, uint32_t page)
      or ACTIVE, except in case of recovery, where some pages may be already
      in ERASING state.
      However, in case of recovery, we do not not need to set ERASING,
-     as initialization phase erases the unactive pool. */
+     as initialization phase erases the inactive pool. */
   last_page =
     (page < pv->nb_pages) ? (2 * pv->nb_pages - 1) : (pv->nb_pages - 1);
 
@@ -624,7 +626,7 @@ static int32_t EE_WriteEl(EE_var_t *pv, uint16_t addr, uint32_t data)
     EE_FLASH_ADDR(pv, pv->current_write_page) + pv->next_write_offset;
 
   /* Write element in flash */
-  if (HW_FLASH_Write(flash_addr, el) != 0)
+  if (FLASH_IF_Write64(flash_addr, el) != 0)
   {
     return EE_WRITE_ERROR;
   }
@@ -700,7 +702,7 @@ static int32_t EE_SetState(const EE_var_t *pv, uint32_t page, uint32_t state)
   DBG_EE(EE_0);
 
   /* Set new page state inside page header */
-  if (HW_FLASH_Write(flash_addr, EE_PROGRAMMED) != 0)
+  if (FLASH_IF_Write64(flash_addr, EE_PROGRAMMED) != 0)
   {
     return EE_WRITE_ERROR;
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.h
index 27947917..81b544f1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ee.h
@@ -16,6 +17,7 @@
   *
   *****************************************************************************
   */
+/* USER CODE END Header */
 
 #ifndef EE_H__
 #define EE_H__
@@ -35,7 +37,7 @@
   *
   * - M_BEGIN, M_END and DBG() macro definitions.
   *
-  * - Hadrwae flash driver definitions:
+  * - Hardware flash driver definitions:
   *
   *      * HW_FLASH_PAGE_SIZE (in bytes)
   *
@@ -66,7 +68,7 @@
   *
   * Notes
   * -----
-  * - a corrupted word in FLASH detected by the user aoftware shall be set to 0.
+  * - a corrupted word in FLASH detected by the user software shall be set to 0.
   *   The EEPROM emulation software will then handle it properly.
   */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h
index c5ded3d1..ae7d30ed 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c
index c86679dd..8f722834 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_cstimer.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "sgfx_cstimer.h"
@@ -62,7 +64,7 @@ void RxCarrierSenseInitStatus(void)
   /* USER CODE BEGIN RxCarrierSenseInitStatus_1 */
 
   /* USER CODE END RxCarrierSenseInitStatus_1 */
-  /*Initialises the Flag*/
+  /*Initialize the Flag*/
   rxCarrierSenseFlag = 0;
   /* USER CODE BEGIN RxCarrierSenseInitStatus_2 */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h
index bd7acc9b..d51103ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_cstimer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_CSTIMER_H__
 #define __SGFX_CSTIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c
index acc336eb..10028955 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -23,6 +25,8 @@
 #include "ee.h"
 #include "st_sigfox_api.h"
 #include "se_nvm.h"
+#include "sys_conf.h"
+#include "utilities_conf.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -72,8 +76,19 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief        Read Sigfox Configuration from eeprom
+  * @param addr   variable virtual address
+  * @param data   pointer to a 32-bit word (allocated by the caller) containing the
+  *               variable value in case of success.
+  */
 static void E2P_Read(e_EE_ID addr, uint32_t *data);
 
+/**
+  * @brief        Write Sigfox Configuration to eeprom
+  * @param addr   variable virtual address
+  * @param data   32-bit data word to be written
+  */
 static void E2P_Write(e_EE_ID addr, uint32_t data);
 
 /* USER CODE BEGIN PFP */
@@ -152,7 +167,7 @@ void E2P_RestoreFs(void)
   E2P_Write(EE_MCU_NVM_2_ID, 0);
   E2P_Write(EE_MCU_NVM_3_ID, 0);
   E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, 0);
-  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, 0);
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, VERBOSE_LEVEL);
 
   HAL_FLASH_Lock();
   /* USER CODE BEGIN E2P_RestoreFs_2 */
@@ -407,9 +422,9 @@ void E2P_Write_VerboseLevel(uint8_t verboselevel)
   E2P_Write(EE_SGFX_VERBOSELEVEL_ID, (uint32_t) verboselevel);
 
   HAL_FLASH_Lock();
-  /* USER CODE BEGIN E2P_Write_VerboseLevel_1 */
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_2 */
 
-  /* USER CODE END E2P_Write_VerboseLevel_1 */
+  /* USER CODE END E2P_Write_VerboseLevel_2 */
 }
 
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
@@ -561,7 +576,7 @@ E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len)
   E2P_Read(EE_SE_NVM_1_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_2_ID, &data_from_eeprom);
-  read_data[i++] = (sfx_u8) data_from_eeprom;;
+  read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_3_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_4_ID, &data_from_eeprom);
@@ -658,43 +673,6 @@ E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len)
   /* USER CODE END E2P_Write_McuNvm_2 */
 }
 
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void E2P_Write(e_EE_ID addr, uint32_t data)
-{
-  /* USER CODE BEGIN E2P_Write_1 */
-
-  /* USER CODE END E2P_Write_1 */
-  if (EE_Write(EE_BANK_0, (uint16_t) addr, data) == EE_CLEAN_NEEDED)
-  {
-    EE_Clean(EE_BANK_0, EE_CLEAN_MODE_POLLING);
-  }
-  /* USER CODE BEGIN E2P_Write_2 */
-
-  /* USER CODE END E2P_Write_2 */
-}
-
-static void E2P_Read(e_EE_ID addr, uint32_t *data)
-{
-  /* USER CODE BEGIN E2P_Read_1 */
-
-  /* USER CODE END E2P_Read_1 */
-  EE_Read(EE_BANK_0, (uint16_t) addr, data);
-  /* USER CODE BEGIN E2P_Read_2 */
-
-  /* USER CODE END E2P_Read_2 */
-}
-
-/*!
-* \brief   Returns the last stored variable data, if found, which corresponds to
-*          the passed virtual address
-* \param   EEsgfxID:
-*          data: to be read
-* \retval  error status
-*/
 int32_t EE_ReadValue(e_EE_ID EEsgfxID,  uint32_t *data)
 {
   /* USER CODE BEGIN EE_ReadValue_1 */
@@ -717,12 +695,6 @@ int32_t EE_ReadValue(e_EE_ID EEsgfxID,  uint32_t *data)
   /* USER CODE END EE_ReadValue_2 */
 }
 
-/*!
-* \brief   Writes/updates variable data in EEPROM emulator.
-* \param   EEsgfxID:
-*          data: to be written
-* \retval error status
-*/
 int32_t EE_WriteValue(e_EE_ID EEsgfxID,  uint32_t data)
 {
   /* USER CODE BEGIN EE_WriteValue_1 */
@@ -754,6 +726,36 @@ int32_t EE_WriteValue(e_EE_ID EEsgfxID,  uint32_t data)
   /* USER CODE END EE_WriteValue_2 */
 }
 
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void E2P_Write(e_EE_ID addr, uint32_t data)
+{
+  /* USER CODE BEGIN E2P_Write_1 */
+
+  /* USER CODE END E2P_Write_1 */
+  if (EE_Write(EE_BANK_0, (uint16_t) addr, data) == EE_CLEAN_NEEDED)
+  {
+    EE_Clean(EE_BANK_0, EE_CLEAN_MODE_POLLING);
+  }
+  /* USER CODE BEGIN E2P_Write_2 */
+
+  /* USER CODE END E2P_Write_2 */
+}
+
+static void E2P_Read(e_EE_ID addr, uint32_t *data)
+{
+  /* USER CODE BEGIN E2P_Read_1 */
+
+  /* USER CODE END E2P_Read_1 */
+  EE_Read(EE_BANK_0, (uint16_t) addr, data);
+  /* USER CODE BEGIN E2P_Read_2 */
+
+  /* USER CODE END E2P_Read_2 */
+}
+
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h
index 47d34ed8..b8f92029 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_EEPROM_IF_H__
@@ -76,7 +78,7 @@ typedef enum
   EE_MCU_NVM_2_ID,
   EE_MCU_NVM_3_ID,
   /*Public ID e.g. visible on M4 starting at EE_ID=EE_RSSI_CAL_ID */
-  EE_RSSI_CAL_ID= 100,
+  EE_RSSI_CAL_ID = 100,
   EE_AT_ECHO_ID,
   EE_TX_POWER_RC1_ID,
   EE_TX_POWER_RC2_ID,
@@ -122,197 +124,179 @@ typedef enum
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_Init(void);
 
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_RestoreFs(void);
 
 /*!
- * @brief Read Output Power
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Read Output Power
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @return Output Power
  */
 int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Write Output Power to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Write Output Power to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @param  power Output Power
  */
 void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power);
 
 /*!
- * @brief Read Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval Region Configuration RC
+ * @brief  Read Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return Region Configuration RC
  */
 sfx_rc_enum_t E2P_Read_Rc(void);
 
 /*!
- * @brief Write Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Region Configuration RC
- * @retval None
+ * @brief  Write Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
  */
 void E2P_Write_Rc(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Read Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Read Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Write Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Write Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Read rssi calibration value from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval rssi calibration value
+ * @brief  Read rssi calibration value from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return rssi calibration value
  */
 int16_t E2P_Read_RssiCal(void);
 
 /*!
- * @brief Writes rssi calibration value to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  rssi calibration value
- * @retval None
+ * @brief  Writes rssi calibration value to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  rssi_cal calibration value
  */
 void E2P_Write_RssiCal(int16_t rssi_cal);
 
 /*!
- * @brief Read Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval at_echo
  */
 uint32_t E2P_Read_AtEcho(void);
 
 /*!
- * @brief Write Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  at_echo
- * @retval None
  */
 void E2P_Write_AtEcho(uint32_t at_echo);
 
 /*!
- * @brief Read KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval KeyType
  */
 sfx_key_type_t E2P_Read_KeyType(void);
 
 /*!
- * @brief Write KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  KeyType
- * @retval None
+ * @brief  Write KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  key_type KeyType setting
  */
 void E2P_Write_KeyType(sfx_key_type_t key_type);
 
 /*!
- * @brief Read EncryptionFlag setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read EncryptionFlag setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval encryption_flag
  */
 uint8_t E2P_Read_EncryptionFlag(void);
 
 /*!
- * @brief Write EncryptionFlag  setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write EncryptionFlag  setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  encryption_flag
- * @retval None
  */
 void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len);
 
 /*!
- * @brief Write Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Write Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Read MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data,  uint32_t len);
 
 /*!
- * @brief Write Region MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Write Region MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param   None
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval the VL
  */
 uint8_t E2P_Read_VerboseLevel(void);
 
 /*!
- * @brief Read verbose levelsetting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Read verbose levelsetting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  verboselevel
- * @retval None
  */
 void E2P_Write_VerboseLevel(uint8_t verboselevel);
 
 /*!
- * @brief Read Sigfox Configuration from eeprom
- * @param  e_EE_ID
- *         data read
+ * @brief  Read Sigfox Configuration from eeprom
+ * @param  EEsgfxID e_EE_ID
+ * @param  data read
  * @retval error status
  */
 int32_t EE_ReadValue(e_EE_ID EEsgfxID,  uint32_t *data);
 
 /*!
- * @brief Write Sigfox Configuration from eeprom
- * @param  e_EE_ID
- *         data read
+ * @brief  Write Sigfox Configuration from eeprom
+ * @param  EEsgfxID e_EE_ID
+ * @param  data read
  * @retval error status
  */
 int32_t EE_WriteValue(e_EE_ID EEsgfxID,  uint32_t data);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h
index a32f9ae0..9dbd7b64 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file   sigfox_data.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SIGFOX_DATA_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c
index f24f98e1..1b6e1096 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mcu_api.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -31,6 +33,7 @@
 #include "utilities_def.h"
 #include "sys_app.h" /*for APP_LOG*/
 #include "radio_board_if.h"
+#include "radio_conf.h" /* RF_WAKEUP_TIME */
 
 /* USER CODE BEGIN Includes */
 
@@ -116,9 +119,6 @@ sfx_u8 MCU_API_malloc(sfx_u16 size, sfx_u8 **returned_pointer)
 
   /* USER CODE END MCU_API_malloc_1 */
 
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
   /* Allocate a memory : static or dynamic allocation */
   /* knowing that the sigfox library will ask for a buffer once at the SIGFOX_API_open() call. */
   /* This buffer will be released after SIGFOX_API_close() call. */
@@ -144,6 +144,8 @@ sfx_u8 MCU_API_free(sfx_u8 *ptr)
   /* USER CODE BEGIN MCU_API_free_1 */
 
   /* USER CODE END MCU_API_free_1 */
+  /* Free the buffer allocated during the MCU_API_malloc()
+   * called only when SIGFOX_API_close() is called. */
   return SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_free_2 */
 
@@ -158,8 +160,11 @@ sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_t
 
   /* USER CODE END MCU_API_get_voltage_temperature_1 */
 
-  /* brief Get voltage and temperature for Out of band frames*/
-  /* Value must respect the units bellow for backend compatibility*/
+  /* Get the idle voltage of the complete device
+   * Get the TX voltage of the complete device ( during transmission )
+   * Get the temperature of the device
+   * If those values are not available : set it to 0x0000
+   * return the voltage_idle in 1/10 volt on 16bits and 1/10 degrees for the temperature */
   *voltage_idle = (uint16_t)GetBatteryLevel_mbwrapper(); /* mV */
   *voltage_tx = 0;
   *temperature = (uint16_t)((GetTemperatureLevel_mbwrapper() * 10) >> 8);   /* */
@@ -187,8 +192,12 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
   switch (delay_type)
   {
     case SFX_DLY_INTER_FRAME_TRX :
+      /* Interframe used when sending an Uplink Message with a downlink request */
       /* Delay  is 500ms  in FCC and ETSI
-        * In ARIB : minimum delay is 50 ms */
+       * In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX1 */
       if ((sfx_rc == SFX_RC3A) ||
           (sfx_rc == SFX_RC3C) ||
           (sfx_rc == SFX_RC5))
@@ -205,11 +214,18 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
       {
         Delay_Lp(510 - (T_RADIO_DELAY_ON) - T_RADIO_DELAY_OFF); /* 500-525 ms */
       }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX2 */
       break;
 
     case SFX_DLY_INTER_FRAME_TX :
+      /* Interframe used when sending an Uplink Message without downlink request */
       /* Start delay 0 seconds to 2 seconds in FCC and ETSI*/
       /* In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX1 */
       if ((sfx_rc == SFX_RC3A) ||
           (sfx_rc == SFX_RC3C) ||
           (sfx_rc == SFX_RC5))
@@ -221,19 +237,41 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
       {
         Delay_Lp(1000 - T_RADIO_DELAY_ON - T_RADIO_DELAY_OFF); /* 1000 ms */
       }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX2 */
       break;
 
     case SFX_DLY_OOB_ACK :
+      /*  Delay between RX frame and sending ack in oob service frame*/
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK1 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK1 */
       /* Start delay between 1.4 seconds to 4 seconds in FCC and ETSI */
       Delay_Lp(1600 - T_RADIO_DELAY_ON);
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK2 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK2 */
       break;
 
     case SFX_DLY_CS_SLEEP :
+      /* Delay between attempts of carrier sense for the first frame*/
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP1 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP1 */
       Delay_Lp(500 - T_RADIO_DELAY_ON); /* 500 ms */
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP2 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP2 */
       break;
+    /* USER CODE BEGIN SFX_DLY_ADD_CASE */
 
+    /* USER CODE END SFX_DLY_ADD_CASE */
     default :
       err = MCU_ERR_API_DLY;
+      /* USER CODE BEGIN SFX_DLY_DEFAULT */
+
+      /* USER CODE END SFX_DLY_DEFAULT */
       break;
   }
   /* USER CODE BEGIN MCU_API_delay_Last */
@@ -245,26 +283,33 @@ sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
 /*******************************************************************/
 sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
 {
-  /* USER CODE BEGIN MCU_API_get_nv_mem_1 */
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_get_nv_mem1 */
 
-  /* USER CODE END MCU_API_get_nv_mem_1 */
+  /* USER CODE END MCU_API_get_nv_mem1 */
+  /* Read out SFX_NVMEM_BLOCK_SIZE bytes in eeprom or equivalent
+   * in flash as Non Volatile Memory (NVM)
+   * This cannot be in RAM : must be remanent*/
   if (E2P_Read_McuNvm(read_data, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
   {
     return MCU_ERR_API_GETNVMEM;
   }
-  /* USER CODE BEGIN MCU_API_get_nv_mem_2 */
+  /* USER CODE BEGIN MCU_API_get_nv_mem2 */
 
-  /* USER CODE END MCU_API_get_nv_mem_2 */
-  return SFX_ERR_NONE;
+  /* USER CODE END MCU_API_get_nv_mem2 */
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_set_nv_mem_1 */
 
   /* USER CODE END MCU_API_set_nv_mem_1 */
-
+  /* Write down SFX_NVMEM_BLOCK_SIZE bytes
+   * in the eeprom or flash such as it can be retrieved
+   * later even if device is switched off or rebooting*/
   if (E2P_Write_McuNvm(data_to_write, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
   {
     return MCU_ERR_API_SETNVMEM;
@@ -272,15 +317,21 @@ sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
   /* USER CODE BEGIN MCU_API_set_nv_mem_2 */
 
   /* USER CODE END MCU_API_set_nv_mem_2 */
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_1 */
 
   /* USER CODE END MCU_API_timer_start_carrier_sense_1 */
+  /* Starts a timer for the carrier sense. You can plug your timer
+   * expiration to a callback that will update the timer event
+   * status checked by RF_API_wait_for_clear_channel*/
+  /* Starts CS timeout during time_duration_in_ms */
+
   APP_LOG(TS_ON, VLEVEL_M, "CS timeout Started= %d msec\n\r", time_duration_in_ms);
   UTIL_TIMER_Create(&Timer_TimeoutCs, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTimerTimeoutCsEvt, NULL);
   UTIL_TIMER_Stop(&Timer_TimeoutCs);
@@ -289,15 +340,19 @@ sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
   /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_2 */
 
   /* USER CODE END MCU_API_timer_start_carrier_sense_2 */
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_start_1 */
 
   /* USER CODE END MCU_API_timer_start_1 */
+  /* Starts MCU timer during time_duration_in_ms */
+  /* This timer start can install a callback to indicate when it occurs
+   * This event will be caught in the MCU_API_wait_for_end_timer() function. */
   uint32_t time_duration_in_millisec = time_duration_in_s * 1000;
   APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Started= %d sec\n\r", time_duration_in_s);
 
@@ -305,112 +360,120 @@ sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
   UTIL_TIMER_Stop(&Timer_Timeout);
   UTIL_TIMER_SetPeriod(&Timer_Timeout, time_duration_in_millisec);
   UTIL_TIMER_Start(&Timer_Timeout);
+
   /* USER CODE BEGIN MCU_API_timer_start_2 */
 
   /* USER CODE END MCU_API_timer_start_2 */
 
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_stop(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_stop_1 */
 
   /* USER CODE END MCU_API_timer_stop_1 */
+  /* Stops MCU timer started in MCU_API_timer_start*/
   APP_LOG(TS_ON, VLEVEL_M, "timer_stop\n\r");
 
   UTIL_TIMER_Stop(&Timer_Timeout);
   /* USER CODE BEGIN MCU_API_timer_stop_2 */
 
   /* USER CODE END MCU_API_timer_stop_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_stop_carrier_sense(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_1 */
 
   /* USER CODE END MCU_API_timer_stop_carrier_sense_1 */
+  /* Abort the carrier sense: stops CS timer */
   APP_LOG(TS_ON, VLEVEL_M, "CS timer_stop\n\r");
 
   UTIL_TIMER_Stop(&Timer_TimeoutCs);
   /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_2 */
 
   /* USER CODE END MCU_API_timer_stop_carrier_sense_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_timer_wait_for_end(void)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_timer_wait_for_end_1 */
 
   /* USER CODE END MCU_API_timer_wait_for_end_1 */
+  /* This function is waiting (actively or not) on the event for end timer
+   * (started by MCU_API_timer_start) elapsed and then returns*/
   APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Wait\n\r");
 
   UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
   /* USER CODE BEGIN MCU_API_timer_wait_for_end_2 */
 
   /* USER CODE END MCU_API_timer_wait_for_end_2 */
-
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_report_test_result(sfx_bool status, sfx_s16 rssi)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_report_test_result_1 */
 
   /* USER CODE END MCU_API_report_test_result_1 */
+  /* this function is used to to report status and rssi
+   * optionally, it can log data on terminal*/
   rxcount++;
 
   if (status == SFX_TRUE)
   {
-    /* Set the LED3 to inform the user that we received a frame for the device */
-#if defined(USE_BSP_DRIVER)
+    /* Last Rx Packet received*/
+    /* USER CODE BEGIN SFX_TRUE_1 */
     BSP_LED_On(LED_GREEN);
     HAL_Delay(50);
     BSP_LED_Off(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_GREEN);
-    HAL_Delay(50);
-    SYS_LED_Off(SYS_LED_GREEN);
-#endif /* defined(USE_BSP_DRIVER) */
+    /* USER CODE END SFX_TRUE_1 */
     okcount++;
     APP_LOG(TS_ON, VLEVEL_H, TERM_GREEN"RX OK. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r  "TERM_RESET, (int32_t) rssi, rxcount,
             ((rxcount - okcount) * 100) / rxcount);
+    /* USER CODE BEGIN SFX_TRUE_2 */
+
+    /* USER CODE END SFX_TRUE_2 */
   }
   else
   {
-#if defined(USE_BSP_DRIVER)
+    /* Last Rx Packet on error or timeout*/
+    /* USER CODE BEGIN SFX_FALSE_1 */
     BSP_LED_On(LED_BLUE);
     HAL_Delay(50);
     BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE);
-    HAL_Delay(50);
-    SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
+    /* USER CODE END SFX_FALSE_1 */
     APP_LOG(TS_ON, VLEVEL_H, TERM_RED"RX KO. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r "TERM_RESET, (int32_t)rssi, rxcount,
             ((rxcount - okcount) * 100) / rxcount);
-  }
+    /* USER CODE BEGIN SFX_FALSE_2 */
 
-  return SFX_ERR_NONE;
+    /* USER CODE END SFX_FALSE_2 */
+  }
   /* USER CODE BEGIN MCU_API_report_test_result_2 */
 
   /* USER CODE END MCU_API_report_test_result_2 */
+  return ret;
 }
 
 /*******************************************************************/
 sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
 {
+  sfx_u8 ret = SFX_ERR_NONE;
   /* USER CODE BEGIN MCU_API_get_version_1 */
 
   /* USER CODE END MCU_API_get_version_1 */
+  /* Reports version and the size of the version buffer*/
   *version = (sfx_u8 *)mcu_api_version;
   if (size == SFX_NULL)
   {
@@ -421,7 +484,7 @@ sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
 
   /* USER CODE END MCU_API_get_version_2 */
 
-  return SFX_ERR_NONE;
+  return ret;
 }
 
 static void Delay_Lp(uint32_t delay_ms)
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h
index 892fe41a..c0a63471 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mcu_api.h
   * @author  MCD Application Team
-  * @brief   defines the interfaace to mcu_api.c
+  * @brief   defines the interface to mcu_api.c
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /*!
 \if SIGFOX PATTERN
 ----------------------------------------------
@@ -180,7 +182,7 @@ sfx_u8 MCU_API_free(sfx_u8 *ptr);
 /*!******************************************************************
   * \fn sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_tx, sfx_s16 *temperature)
   * \brief Get voltage and temperature for Out of band frames
-  * Value must respect the units bellow for <B>backend compatibility</B>
+  * Value must respect the units below for <B>backend compatibility</B>
   *
   * \param[in] none
   * \param[out] sfx_u16 *voltage_idle             Device's voltage in Idle state (mV)
@@ -210,28 +212,6 @@ sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle,
   *******************************************************************/
 sfx_u8 MCU_API_delay(sfx_delay_t delay_type);
 
-/*!******************************************************************
-  * \fn sfx_u8 MCU_API_aes_128_cbc_encrypt(sfx_u8 *encrypted_data, sfx_u8 *data_to_encrypt, sfx_u8 aes_block_len, sfx_u8 key[16], sfx_credentials_use_key_t use_key)
-  * \brief Encrypt a complete buffer with Secret or Test key.<BR>
-  * The secret key corresponds to the private key provided from the CRA.
-  * <B>These keys must be stored in a secure place.</B> <BR>
-  * Can be hardcoded or soft coded (iv vector contains '0')
-  *
-  * \param[out] sfx_u8 *encrypted_data            Result of AES Encryption
-  * \param[in] sfx_u8 *data_to_encrypt            Input data to Encrypt
-  * \param[in] sfx_u8 aes_block_len               Input data length (should be a multiple of an AES block size, ie. AES_BLOCK_SIZE bytes)
-  * \param[in] sfx_u8 key[16]                     Input key
-  * \param[in] sfx_credentials_use_key_t use_key  Key to use - private key or input key
-  *
-  * \retval SFX_ERR_NONE:                         No error
-  * \retval MCU_ERR_API_AES:                      AES Encryption error
-  *******************************************************************/
-sfx_u8 MCU_API_aes_128_cbc_encrypt(sfx_u8 *encrypted_data,
-                                   sfx_u8 *data_to_encrypt,
-                                   sfx_u8 aes_block_len,
-                                   sfx_u8 key[16],
-                                   sfx_credentials_use_key_t use_key);
-
 /*!******************************************************************
   * \fn sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
   * \brief This function copies the data read from non volatile memory
@@ -340,7 +320,7 @@ sfx_u8 MCU_API_timer_wait_for_end(void);
   *
   * \param[in] sfx_bool status                    Is SFX_TRUE when result ok else SFX_FALSE
   *                                               See SIGFOX_API_test_mode summary
-  * \param[out] rssi                              RSSI of the received frame
+  * \param[in] rssi                              RSSI of the received frame
   *
   * \retval SFX_ERR_NONE:                         No error
   * \retval MCU_ERR_API_TEST_REPORT:              Report test result error
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.c
index 1dd2b585..5a748e02 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_api.c
@@ -16,31 +17,32 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "stm32wlxx_hal.h"
 
 #include "mn_api.h"
-#include "lptim.h"
-#include "stm32_lpm.h"
+#include "mn_lptim_if.h"
 #include "radio.h"
-#include "sys_debug.h"
-#include "sys_app.h"
-#include "utilities_conf.h"
-#include "sys_conf.h"             /*For led*/
+#include "platform.h"          /*For led*/
 #include "sys_app.h"           /*For log*/
+#include "stm32_lpm.h"
 #include "stm32_timer.h"
 #include "stm32_seq.h"
 #include "utilities_def.h"
-#include "platform.h"
-#include "mn_lptim_if.h"
 
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
+/**
+  * @brief LPTIM handle
+  */
+extern LPTIM_HandleTypeDef hlptim1;
+
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -52,7 +54,7 @@
 
 /* Private define ------------------------------------------------------------*/
 /*OOK demod on for debug*/
-#define MN_PROCESS_IN_BG 0
+#define MN_PROCESS_IN_BG 1
 
 #define LPTIM_PERIOD     ((uint32_t)  2)        /* 1/16384~61.03us  */
 
@@ -185,7 +187,7 @@ void MN_API_StopRx(void)
   /* USER CODE BEGIN MN_API_StopRx_1 */
 
   /* USER CODE END MN_API_StopRx_1 */
-  /*no need to stanby xosc, radio will just
+  /*no need to standby xosc, radio will just
     change freq with MN_API_change_frequency*/
   /* USER CODE BEGIN MN_API_StopRx_2 */
 
@@ -232,38 +234,19 @@ void MN_API_Disable16KHzSamplingTimer(void)
 void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequency, int32_t best_rssi)
 {
   /* USER CODE BEGIN MN_API_Pattern_Found_1 */
-
+  BSP_LED_On(LED_BLUE);
   /* USER CODE END MN_API_Pattern_Found_1 */
   /* debug function to display sweep/window detected pattern*/
-#if defined(USE_BSP_DRIVER)
-  if (window_type == 0)
-  {
-    BSP_LED_On(LED_BLUE);
-    APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    BSP_LED_Off(LED_BLUE);
-  }
-  else
-  {
-    BSP_LED_On(LED_BLUE);
-    APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    BSP_LED_Off(LED_BLUE);
-  }
-#elif defined(MX_BOARD_PSEUDODRIVER)
   if (window_type == 0)
   {
-    SYS_LED_On(SYS_LED_BLUE);
     APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    SYS_LED_Off(SYS_LED_BLUE);
   }
   else
   {
-    SYS_LED_On(SYS_LED_BLUE);
     APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
-    SYS_LED_Off(SYS_LED_BLUE);
   }
-#endif /* defined(USE_BSP_DRIVER) */
   /* USER CODE BEGIN MN_API_Pattern_Found_2 */
-
+  BSP_LED_Off(LED_BLUE);
   /* USER CODE END MN_API_Pattern_Found_2 */
 }
 
@@ -338,7 +321,6 @@ void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
   /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_1 */
   int16_t rssi = RADIO_NOISE_LEVEL;
 
-  DBG_GPIO_SET_LINE(GPIOB, GPIO_PIN_12);
   /*read rssi*/
   if (RssiReadOnIT_Enable == 1)
   {
@@ -352,12 +334,11 @@ void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
       RssiBuffWriteIdx = 0;
     }
     /*run process_MonarchBackGround in background*/
-    UTIL_SEQ_SetTask(1 << CFG_SEQ_TASK_MONARCH, CFG_SEQ_Prio_0);
+    UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_Monarch, CFG_SEQ_Prio_0);
 #else
     MN_Timer_CB(rssi);
 #endif /* MN_PROCESS_IN_BG==1 */
   }
-  DBG_GPIO_RST_LINE(GPIOB, GPIO_PIN_12);
   /* USER CODE BEGIN HAL_LPTIM_AutoReloadMatchCallback_2 */
 
   /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_2 */
@@ -370,7 +351,7 @@ static void process_MonarchBackGround(void)
 
   /* USER CODE END process_MonarchBackGround_1 */
   int16_t rssi;
-  DBG_GPIO_SET_LINE(GPIOB, GPIO_PIN_13);
+
   while (RssiBuffWriteIdx != RssiBuffReadIdx)
   {
     rssi = RssiBuff[RssiBuffReadIdx++];
@@ -381,7 +362,6 @@ static void process_MonarchBackGround(void)
     }
     MN_Timer_CB(rssi);
   }
-  DBG_GPIO_RST_LINE(GPIOB, GPIO_PIN_13);
   /* USER CODE BEGIN process_MonarchBackGround_2 */
 
   /* USER CODE END process_MonarchBackGround_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h
index 240019f7..1f76066c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mn_api.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MN_API_H__
@@ -53,14 +55,14 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialises the Monarch Low level
-  * @param Callback for rssi samplep rocess
+  * @brief Initialize the Monarch Low level
+  * @param Callback for rssi sample process
   * @retval None
   */
 void MN_API_Init(void (*MN_API_Timer_CB)(int16_t rssi));
 
 /**
-  * @brief DeInitialises the Monarch Low level
+  * @brief DeInitialize the Monarch Low level
   * @param None
   * @retval None
   */
@@ -116,7 +118,7 @@ void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequenc
   * @brief starts timer
   * @param timer_value_ms timer value in ms
   * @param call back when timer elapses
-  * @note Argurment can be left unused
+  * @note Argument can be left unused
   * @retval None
   */void MN_API_TimerSart(uint32_t timer_value_ms, void (*TimeoutHandle)(void *Argument));
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h
index 11ef6af2..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     150U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h
index 3a3fd8a1..3f3a274e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,6 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,12 +49,12 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief Max payload buffer size
@@ -65,6 +68,7 @@ extern "C" {
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -72,25 +76,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 15UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -130,6 +151,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.c
index 71140893..a877cf85 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ****************************************************************************
   * @file    rf_api.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* includes -----------------------------------------------------------*/
 #include "stdint.h"
@@ -50,7 +52,7 @@
 /* Private define ------------------------------------------------------------*/
 #define RF_VER                   "RF_API_V1.0"
 #define SFX_PREAMBLE_LENGTH      2
-#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronise*/
+#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronize*/
 #define SFX_MAX_PAYLOAD_LENGTH   15
 #define SFX_DATARATE_600         600
 #define SFX_DATARATE_100         100
@@ -129,27 +131,34 @@ const RadioEvents_t RfApiRadioEvents =
 /* Exported functions --------------------------------------------------------*/
 sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_init_1 */
 
   /* USER CODE END RF_API_init_1 */
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
   /* Put here all RF initialization concerning the RC IC you are using. */
-  /* this function is dependent of SPI driver or equivalent. */
 
   switch (rf_mode)
   {
     case SFX_RF_MODE_TX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_TX_1 */
+
+      /* USER CODE END SFX_RF_MODE_TX_1 */
+      /* Initialize Tx if necessary*/
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in TX\n\r");
-      /* nothing to do */
-      /* set the RF IC in TX mode : this could be DBPSK100 or 600:  this distinction will be done during the RF_API_send */
-      /* you can add some code to switch on TCXO or warm up quartz for stabilization : in case of frequency drift issue */
+
+      /* USER CODE BEGIN SFX_RF_MODE_TX_2 */
+
+      /* USER CODE END SFX_RF_MODE_TX_2 */
       break;
     }
     case SFX_RF_MODE_RX:
     {
+      /* Configure the RF_IP IC in RX mode : GFSK 600bps*/
+      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+      /* USER CODE BEGIN SFX_RF_MODE_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_RX_1 */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in RX\n\r");
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 1600,
                         SFX_DATARATE_600, NA,
@@ -158,13 +167,19 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* set the RF IC in RX mode : GFSK 600bps is the only mode now */
-      /* Enable interrupts on RX fifo */
-      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+
+      /* USER CODE BEGIN SFX_RF_MODE_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_RX_2 */
       break;
     }
     case SFX_RF_MODE_CS200K_RX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_1 */
+      /* configure the RF_IP into sensing 200KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS200\n\r");
 
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 200000,
@@ -174,12 +189,20 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 200KHz bandwidth to be able to read out RSSI level */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function */
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_2 */
       break;
     }
     case SFX_RF_MODE_CS300K_RX:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_1 */
+
+      /* configure the RF_IP into sensing 300KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function. */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS300\n\r");
 
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 300000,
@@ -189,13 +212,19 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 300KHz bandwidth to be able to read out RSSI level */
-      /* This is poosible to make this carrier sense in 2 * 200Kz if you respect the regulation time for listening */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function. */
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_2 */
       break;
     }
     case SFX_RF_MODE_MONARCH:
     {
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_1 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_1 */
+
+      /* configure the RF_IP into sensing 20KHz bandwidth */
       APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in MN20\n\r");
       /* APP_LOG(TS_ON, VLEVEL_L,"RxBw=20kHz\n\r"); */
       Radio.SetRxConfig(MODEM_SIGFOX_RX, 20000,
@@ -205,22 +234,25 @@ sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
                         SFX_MAX_PAYLOAD_LENGTH,
                         false, NA, NA,
                         NA, true);
-      /* configure the RF IC into sensing 20KHz bandwidth to be able to read out RSSI level */
-      /* This is poosible to make this carrier sense in 2 * 200Kz if you respect the regulation time for listening */
-      /* RSSI level will outputted during the RF_API_wait_for_clear_channel function. */
+
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_2 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_2 */
       break;
     }
     default :
+      status = RF_ERR_API_INIT;
       break;
   }
-  return SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_init_2 */
 
   /* USER CODE END RF_API_init_2 */
+  return status;
 }
 
 sfx_u8 RF_API_stop(void)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_stop_1 */
 
   /* USER CODE END RF_API_stop_1 */
@@ -231,35 +263,56 @@ sfx_u8 RF_API_stop(void)
 
   /* USER CODE END RF_API_stop_2 */
 
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_send_1 */
 
   /* USER CODE END RF_API_send_1 */
-  sfx_u8 status = SFX_ERR_NONE;
 
   uint32_t datarate;
 
   int8_t power = E2P_Read_Power(E2P_Read_Rc());
 
   APP_LOG(TS_ON, VLEVEL_M, "TX START:nB=%d\n\r", size);
-
   switch (type)
   {
     case SFX_DBPSK_100BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @100bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
       datarate = SFX_DATARATE_100;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_2 */
       break;
     case SFX_DBPSK_600BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @600bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
       datarate = SFX_DATARATE_600;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_2 */
+
       break;
     default :
       status = RF_ERR_API_SEND;
       break;
   }
+  /* USER CODE BEGIN RF_API_send_2 */
+  BSP_LED_On(LED_BLUE);
 
+  /* USER CODE END RF_API_send_2 */
   if (status == SFX_ERR_NONE)
   {
     Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
@@ -268,12 +321,6 @@ sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
                       NA, NA, NA,
                       NA, NA, 3000);
 
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_On(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_On(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
-
     Radio.Send(stream, size);
 
     APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Tx\n\r");
@@ -282,70 +329,87 @@ sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
 
     APP_LOG(TS_ON, VLEVEL_M, "End Of Tx\n\r");
 
-#if defined(USE_BSP_DRIVER)
-    BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-    SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
-
   }
 
   APP_LOG(TS_ON, VLEVEL_M, "TX END\n\r");
+  /* USER CODE BEGIN RF_API_send_3 */
+  BSP_LED_Off(LED_BLUE);
 
-  /* BSP_LED_Off( LED_RED2 ); */
+  /* USER CODE END RF_API_send_3 */
   return status;
-  /* USER CODE BEGIN RF_API_send_2 */
 
-  /* USER CODE END RF_API_send_2 */
 }
 
 sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type)
 {
+  sfx_u8 status = SFX_ERR_NONE;
   /* USER CODE BEGIN RF_API_start_continuous_transmission_1 */
 
   /* USER CODE END RF_API_start_continuous_transmission_1 */
-  sfx_u8 status = SFX_ERR_NONE;
 
   int8_t power = E2P_Read_Power(E2P_Read_Rc());
 
-  /* ------------------------------------------------------ */
-  /* PSEUDO code */
-  /* ------------------------------------------------------ */
-
   switch (type)
   {
     case SFX_NO_MODULATION :
+      /* Starts CW continuous Tx at the frequency given by the RF_API_change_frequency()*/
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_1 */
       Radio.TxCw(power);
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_2 */
       break;
     case SFX_DBPSK_100BPS :
-      /* Make an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+      /* Starts an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
       Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
                         NA, SFX_DATARATE_100,
                         NA, NA,
                         NA, NA, NA,
                         NA, NA, 3000);
       Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
       break;
     case SFX_DBPSK_600BPS :
+      /* Starts an infinite DBPSK 600bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
       Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
                         NA, SFX_DATARATE_600,
                         NA, NA,
                         NA, NA, NA,
                         NA, NA, 3000);
       Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
       break;
     default :
       status = RF_ERR_API_SEND;
       break;
   }
-  return status;
   /* USER CODE BEGIN RF_API_start_continuous_transmission_2 */
 
   /* USER CODE END RF_API_start_continuous_transmission_2 */
+  return status;
 }
 
 sfx_u8 RF_API_stop_continuous_transmission(void)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* stop continuous Tx */
+
   /* USER CODE BEGIN RF_API_stop_continuous_transmission_1 */
 
   /* USER CODE END RF_API_stop_continuous_transmission_1 */
@@ -355,11 +419,14 @@ sfx_u8 RF_API_stop_continuous_transmission(void)
   /* USER CODE BEGIN RF_API_stop_continuous_transmission_2 */
 
   /* USER CODE END RF_API_stop_continuous_transmission_2 */
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* set rf frequency for Rx or Tx*/
+
   /* USER CODE BEGIN RF_API_change_frequency_1 */
 
   /* USER CODE END RF_API_change_frequency_1 */
@@ -369,16 +436,22 @@ sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
   /* USER CODE BEGIN RF_API_change_frequency_2 */
 
   /* USER CODE END RF_API_change_frequency_2 */
-
-  return SFX_ERR_NONE;
+  return status;
 }
 
 sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *state)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_s16 res_rssi = 0;
+  sfx_rx_state_enum_t ret_state = DL_TIMEOUT;
   /* USER CODE BEGIN RF_API_wait_frame_1 */
 
   /* USER CODE END RF_API_wait_frame_1 */
-  sfx_error_t status;
+  /* Starts Rx Windows and wait up to the end of frame or end of rx window*/
+  /*  Wait for 2 events :
+   *  event from your RF_IP indicating a buffer is received or
+   *  event from the timer end : event_timer (see mcu_api.c)
+   * If buffer is received, then copy the buffer in frame buffer and update the state parameter*/
 
   APP_LOG(TS_ON, VLEVEL_M, "RX START\n\r");
 
@@ -389,39 +462,41 @@ sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *stat
 
   if (sfx_wait_end_of_rx() == 1)
   {
-#if 0
-    APP_LOG(TS_ON, VLEVEL_M, "RX= %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n\r",
-            RxFrame[0], RxFrame[1], RxFrame[2], RxFrame[3],
-            RxFrame[4], RxFrame[5], RxFrame[6], RxFrame[7],
-            RxFrame[8], RxFrame[9], RxFrame[10], RxFrame[11],
-            RxFrame[12], RxFrame[13], RxFrame[14], RxFrame[15]);
-#endif /* 0 */
     status = SFX_ERR_NONE;
-    *state = DL_PASSED;
+    ret_state = DL_PASSED;
   }
   else
   {
-    *state = DL_TIMEOUT;
+    ret_state = DL_TIMEOUT;
     status = SFX_ERR_NONE;
   }
 
-  *rssi = (sfx_s16) RxRssi;
+  res_rssi = (sfx_s16) RxRssi;
 
   APP_LOG(TS_ON, VLEVEL_M, "RX END\n\r");
-
-  return status;
   /* USER CODE BEGIN RF_API_wait_frame_2 */
 
   /* USER CODE END RF_API_wait_frame_2 */
+  *state = ret_state;
+  *rssi = res_rssi;
+  return status;
 }
 
 sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_state_enum_t *state)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
+  /* Starts Rx Windows to sense if channel is occupied or clear*
+   * If the channel is clear during the minimum carrier sense
+   * value (cs_min), under the limit of the cs_threshold,
+   * the functions returns with SFX_ERR_NONE (transmission
+   * allowed). Otherwise it continues to listen to the channel till the expiration of the
+   * carrier sense maximum window and then updates the state ( with timeout enum ).*/
+
   /* USER CODE BEGIN RF_API_wait_for_clear_channel_1 */
 
   /* USER CODE END RF_API_wait_for_clear_channel_1 */
-  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
-  /**/
+
   RxCarrierSenseInitStatus();
 
   Radio.Rx(0);
@@ -449,19 +524,21 @@ sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_
     APP_LOG(TS_ON, VLEVEL_M, "LBT Channel Busy\n\r");
   }
 
-  *state = cs_state;
   /* USER CODE BEGIN RF_API_wait_for_clear_channel_2 */
 
   /* USER CODE END RF_API_wait_for_clear_channel_2 */
-
-  return SFX_ERR_NONE;
+  *state = cs_state;
+  return status;
 }
 
 sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
 {
+  sfx_u8 status = SFX_ERR_NONE;
+  /* return version and size of the version buffer*/
   /* USER CODE BEGIN RF_API_get_version_1 */
 
   /* USER CODE END RF_API_get_version_1 */
+
   *version = (sfx_u8 *)rf_api_version;
   if (size == SFX_NULL)
   {
@@ -471,8 +548,7 @@ sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
   /* USER CODE BEGIN RF_API_get_version_2 */
 
   /* USER CODE END RF_API_get_version_2 */
-
-  return SFX_ERR_NONE;
+  return status;
 }
 
 /* USER CODE BEGIN EF */
@@ -481,29 +557,6 @@ sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
 
 /* Private Functions Definition -----------------------------------------------*/
 
-static sfx_u8 sfx_wait_end_of_rx(void)
-{
-  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
-
-  /* USER CODE END sfx_wait_end_of_rx_1 */
-  RxPacketReceived = 0;
-
-  RxRssi = -150;
-
-  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
-
-  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
-
-  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
-
-  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
-
-  return RxPacketReceived;
-  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
-
-  /* USER CODE END sfx_wait_end_of_rx_2 */
-}
-
 static void OnTxDone(void)
 {
   /* USER CODE BEGIN OnTxDone_1 */
@@ -532,6 +585,7 @@ static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t offse
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M, "OnRxDone\n\r");
+
   /* USER CODE BEGIN OnRxDone_2 */
 
   /* USER CODE END OnRxDone_2 */
@@ -545,6 +599,7 @@ static void OnTxTimeout(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_TxTimeout);
 
   APP_LOG(TS_ON, VLEVEL_M,  "OnTxTimeout\n\r");
+
   /* USER CODE BEGIN OnTxTimeout_2 */
 
   /* USER CODE END OnTxTimeout_2 */
@@ -560,6 +615,7 @@ static void OnRxTimeout(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M,  "OnRxTimeout\n\r");
+
   /* USER CODE BEGIN OnRxTimeout_2 */
 
   /* USER CODE END OnRxTimeout_2 */
@@ -575,11 +631,35 @@ static void OnRxError(void)
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
 
   APP_LOG(TS_ON, VLEVEL_M, "OnRxError\n\r");
+
   /* USER CODE BEGIN OnRxError_2 */
 
   /* USER CODE END OnRxError_2 */
 }
 
+static sfx_u8 sfx_wait_end_of_rx(void)
+{
+  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
+
+  /* USER CODE END sfx_wait_end_of_rx_1 */
+  RxPacketReceived = 0;
+
+  RxRssi = -150;
+
+  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
+
+  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
+
+  return RxPacketReceived;
+  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
+
+  /* USER CODE END sfx_wait_end_of_rx_2 */
+}
+
 bool RF_API_isChannelFree(int16_t rssiThresh, uint32_t maxCarrierSenseTime)
 {
   /* USER CODE BEGIN RF_API_isChannelFree_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.h
index 87216197..6b1eeb25 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    rf_api.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 /*!
 \if SIGFOX PATTERN
 ----------------------------------------------
@@ -32,7 +34,7 @@
    !!!!  DO NOT MODIFY THIS FILE !!!!
 
  ----------------------------------------------
- \endif
+ \endif
  ----------------------------------------------*/
 /*!
  * \file rf_api.h
@@ -197,7 +199,7 @@ sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type);
 
 /*!******************************************************************
   * \fn sfx_u8 RF_API_stop_continuous_transmission (void)
-  * \brief Stop the current continuous transmisssion
+  * \brief Stop the current continuous transmission
   *
   * \retval SFX_ERR_NONE:                                 No error
   * \retval RF_ERR_API_STOP_CONTINUOUS_TRANSMISSION:      Continuous Transmission Stop error
@@ -254,9 +256,9 @@ sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *stat
   *        allowed). Otherwise it continues to listen to the channel till the expiration of the
   *        carrier sense maximum window and then updates the state ( with timeout enum ).
   *
-  * \param[in] none
-  * \param[out] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
-  * \param[out] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
+  *
+  * \param[in] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
+  * \param[in] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
   *                                            i.e : cs_threshold value -80dBm in Japan / -65dBm in Korea
   * \param[out] sfx_rx_state_enum_t state      Indicate the final state of the carrier sense. Value can be DL_TIMEOUT or PASSED
   *                                            as per defined in sigfox_api.h file.
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c
index acacc5c7..28c83de8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h
index 3047bfbd..97cbfbee 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SE_NVM_H__
@@ -67,48 +69,46 @@ typedef enum
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief This function reads data pointed by read_data to non
-  * volatile memory
+  * @brief     This function reads data pointed by read_data to non volatile memory
   *
-  * @param [IN] sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] read_data Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief This function write data pointed by data_to_write to non
-  * volatile memory
+  * @brief     This function write data pointed by data_to_write to non volatile memory
   *
-  * @param [IN] sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] data_to_write Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief Get the active encryption payload flag
-  * @retval encryption_flag 0:Off, 1:On
+  * @brief     Get the active encryption payload flag
+  * @retval    encryption_flag 0:Off, 1:On
   */
 sfx_u8 SE_NVM_get_encrypt_flag(void);
 
 /**
-  * @brief Set the active encryption payload flag
-  * @param [IN]  encryption_flag 0:Off, 1:On
+  * @brief     Set the active encryption payload flag
+  * @param[in] encryption_flag 0:Off, 1:On
   */
 void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag);
 
 /**
-  * @brief Get the active encryption key
-  * @retval  sfx_key_type_t key: public or private
+  * @brief     Get the active encryption key
+  * @return    key public or private
   */
 sfx_key_type_t SE_NVM_get_key_type(void);
 
 /**
-  * @brief Set the active encryption key
-  * @param [IN]  sfx_key_type_t key: public or private
+  * @brief     Set the active encryption key
+  * @param[in] keyType key public or private
   */
-void  SE_NVM_set_key_type(sfx_key_type_t keyType);
+void SE_NVM_set_key_type(sfx_key_type_t keyType);
 
 /* USER CODE BEGIN EFP */
 
@@ -120,4 +120,3 @@ void  SE_NVM_set_key_type(sfx_key_type_t keyType);
 #endif /* __SE_NVM_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c
index 1264874b..2a26019d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_credentials.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -160,10 +162,10 @@ sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *da
   memset(key, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_encrypt(data_to_encrypt,
-                  encrypted_data,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
 #else
   sfx_key_type_t KeyType = SE_NVM_get_key_type();
   switch (KeyType)
@@ -197,10 +199,10 @@ sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_
   sigfox_aes_set_key(session_key, AES_KEY_LEN,  &AesContext);
 
   sigfox_aes_cbc_encrypt(data_to_encrypt,
-                  encrypted_data,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
 #else
   /* encrypt with session key */
   retval = Sgfx_KMS_AES_CBC_encrypt(data_to_encrypt, encrypted_data, (CK_OBJECT_HANDLE)kms_sgfx_session_key_handle, blocks);
@@ -229,10 +231,10 @@ sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks)
   memset(key, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_encrypt(data,
-                  session_key,
-                  blocks,
-                  iv,
-                  &AesContext);
+                         session_key,
+                         blocks,
+                         iv,
+                         &AesContext);
 #else
   /* DestroyKey: to be done before new deriveKey */
   Sgfx_KMS_DeleteDerivedKeys(kms_sgfx_session_key_handle);
@@ -301,10 +303,13 @@ void CREDENTIALS_get_initial_pac(uint8_t *pac)
 
 sfx_bool CREDENTIALS_get_payload_encryption_flag(void)
 {
+  sfx_bool ret = SFX_FALSE;
+
+  ret = (sfx_bool) SE_NVM_get_encrypt_flag();
   /* USER CODE BEGIN CREDENTIALS_get_payload_encryption_flag_1 */
 
   /* USER CODE END CREDENTIALS_get_payload_encryption_flag_1 */
-  return (sfx_bool) SE_NVM_get_encrypt_flag();
+  return ret;
 }
 
 void CREDENTIALS_set_payload_encryption_flag(uint8_t enable)
@@ -381,10 +386,10 @@ static sfx_error_t CREDENTIALS_get_cra(sfx_u8 *decrypted_data, sfx_u8 *data_to_d
   memset(CredentialKey, 0, AES_KEY_LEN);
 
   sigfox_aes_cbc_decrypt(data_to_decrypt,
-                  decrypted_data,
-                  sizeof(manuf_device_info_t) / AES_KEY_LEN,
-                  iv,
-                  &AesContext);
+                         decrypted_data,
+                         sizeof(manuf_device_info_t) / AES_KEY_LEN,
+                         iv,
+                         &AesContext);
 #else
   /* default sigfox_data.h provided, sigfox_data.h is not encrypted*/
   memcpy((uint8_t *) decrypted_data, (uint8_t *) data_to_decrypt, sizeof(manuf_device_info_t));
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h
index 5205769f..c7d84239 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_credentials.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_CREDENTIALS_H__
 #define __SGFX_CREDENTIALS_H__
@@ -67,57 +70,59 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief get the cmac library version
-  * @retval return a string containing the library version
+  * @brief      get the cmac library version
+  * @return     string containing the library version
   */
 const char *CREDENTIALS_get_version(void);
 
 /**
-  * @brief get the loaded dev_id
-  * @param[out] return the dev_id in the pointer
+  * @brief      get the loaded dev_id
+  * @param[out] dev_id return the dev_id in the pointer
   */
 void CREDENTIALS_get_dev_id(uint8_t *dev_id);
 
 /**
-  * @brief get the loaded pac
-  * @param[out] return the pac in the pointer
+  * @brief      get the loaded pac
+  * @param[out] pac return the pac in the pointer
   */
 void CREDENTIALS_get_initial_pac(uint8_t *pac);
 
 /**
-  * @brief get the payload_encryption_flag
-  * @retval  the payload_encryption_flag
+  * @brief      get the payload_encryption_flag
+  * @retval     the payload_encryption_flag
   */
 sfx_bool CREDENTIALS_get_payload_encryption_flag(void);
 
 /**
-  * @brief set the payload_encryption_flag
-  * @param[in] enable flag. 0: disable, 1: enable
-  * @retval  none
+  * @brief      set the payload_encryption_flag
+  * @param[in]  enable flag. 0: disable, 1: enable
   */
 void CREDENTIALS_set_payload_encryption_flag(uint8_t enable);
 
 /**
-  * @brief encrypts the data_to_encrypt with aes secrete Key
-  * @param[out] the encrypted data
-  * @param[in] the data_to_encrypt
-  * @param[in] the number of aes blocks
+  * @brief      encrypts the data_to_encrypt with aes secrete Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *data_to_encrypt, uint8_t block_len);
 
 /**
-  * @brief encrypts the data_to_encrypt with aes session Key
-  * @param[out] the encrypted data
-  * @param[in] the data_to_encrypt
-  * @param[in] the number of aes blocks
+  * @brief      encrypts the data_to_encrypt with aes session Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_data, uint8_t *data_to_encrypt,
                                                              uint8_t block_len);
 
 /**
-  * @brief wraps the session Key
-  * @param[in] the arguments used to generate the session Key
-  * @param[in] the number of aes blocks
+  * @brief      wraps the session Key
+  * @param[in]  data the arguments used to generate the session Key
+  * @param[in]  blocks the number of aes blocks
+  * @return     sfx_error_t status
   */
 sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc_if.h
index 49ee1e48..e891e529 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM4_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_ResponseRcv_cb     response callback
   * @param  IPCC_IF_NotificationRcv_cb notification callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/main.h
index d7ee0094..14990858 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -61,40 +60,24 @@ void Error_Handler(void);
 /* Private defines -----------------------------------------------------------*/
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
-#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define LPUART_BAUDRATE 9600
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
 #define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define BUT2_Pin GPIO_PIN_1
 #define BUT2_GPIO_Port GPIOA
 #define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
index 75f1386d..2fffde50 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 /*#define HAL_SUBGHZ_MODULE_ENABLED   */
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_app.h
index 6252f990..024b3713 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -35,6 +37,10 @@ extern "C" {
 /* USER CODE END Includes */
 
 /* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -70,12 +76,14 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
 void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_conf.h
index 74840d89..a2f39fa4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -41,29 +43,33 @@ extern "C" {
   * @brief Temperature and pressure values are retrieved from sensors shield
   *        (instead of sending dummy values). It requires MEMS IKS shield
   */
-#define SENSOR_ENABLED  0
+#define SENSOR_ENABLED              0
 
 /**
   * @brief CM4 Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_sensors.h
index 27c3485c..fc37f342 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_sensors.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_sensors.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SENSORS_H__
@@ -54,13 +56,12 @@ typedef struct
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
 #define HTS221_0    0U
 #define LPS22HB_0   1U
 #endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
-
-/* USER CODE BEGIN EC */
-
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -75,15 +76,15 @@ typedef struct
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief  initialises the environmental sensor
+  * @brief  initialize the environmental sensor
   */
-void  EnvSensors_Init(void);
+int32_t EnvSensors_Init(void);
 
 /**
   * @brief  Environmental sensor  read.
   * @param  sensor_data sensor data
   */
-void EnvSensors_Read(sensor_t *sensor_data);
+int32_t EnvSensors_Read(sensor_t *sensor_data);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart.h
index c196d42b..29cb339e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h
index f26ca77e..31fa7a54 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h
index 254daca6..6e1488ab 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   CFG_LPM_SGFX_MN_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
@@ -73,6 +77,9 @@ typedef enum
 typedef enum
 {
   /* CM4 */
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t_0 */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t_0 */
   CFG_SEQ_Task_MbSystemNotifRcv,
   CFG_SEQ_Task_MbSigfoxNotifRcv,
   CFG_SEQ_Task_MbRadioNotifRcv,
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c
index ad6e2e7c..fdcbc616 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c
index abfae080..672a366f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,21 +82,21 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* IPCC EXTI (AIEC) line for CPU1  */
   LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
   IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/main.c
index f114602d..d147df2a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -158,6 +159,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_it.c
index 6d180d61..3f8494d3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_it.c
@@ -75,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -186,7 +188,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_app.c
index 9d0cbb54..c047716d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,17 +27,20 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 #include "sys_sensors.h"
+#include "sgfx_eeprom_if.h"
 #include "msg_id.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
+#include "mbmuxif_radio.h"
 #include "mbmuxif_sigfox.h"
 #include "sgfx_app.h"
-#include "mbmuxif_radio.h"
-/*#include "mbmuxif_kms.h"*/
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
 
 /* USER CODE BEGIN Includes */
 
@@ -66,23 +71,21 @@
 /* Private variables ---------------------------------------------------------*/
 uint32_t InstanceIndex;
 uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_Init(void);
-
 /**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
   */
-static void Gpio_PreInit(void);
+static void MBMUXIF_Init(void);
+
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -90,15 +93,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
+
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -108,10 +108,8 @@ void SystemApp_Init(void)
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
 
-  Gpio_PreInit();
-
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -119,6 +117,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -140,16 +139,19 @@ void SystemApp_Init(void)
   /*Initialize MBMux (to be done after LPM because MBMux uses the sequencer) */
   MBMUXIF_Init();
 
+  /*Update verbose LEVEL with EEPROM content*/
+  UTIL_ADV_TRACE_SetVerboseLevel(E2P_Read_VerboseLevel());
+
   UTIL_TIMER_Init();
 
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief  Process System Notifications
-  */
 void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Sys_Notif_1 */
@@ -161,14 +163,24 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 
   switch (notif_ack_id)
   {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
     case SYS_OTHER_MSG_ID:
       APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
       /* prepare ack buffer*/
       ComObj->ParamCnt = 0;
-      ComObj->ReturnVal = 7; /* dummy value for test */
-      break;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
 
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
     default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
       break;
   }
 
@@ -180,16 +192,16 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Notif_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -198,8 +210,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -212,51 +222,46 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Test: Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialises other features
-  * @param none
-  * @retval none
-  */
 static void MBMUXIF_Init(void)
 {
   /* USER CODE BEGIN MBMUXIF_Init_1 */
 
   /* USER CODE END MBMUXIF_Init_1 */
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
   int8_t init_status;
 
-  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
 
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   /* start CM0PLUS */
-  /* Note: when debugging in order to connect with the deggugger CPUU2 shall be start using workspace CM4 starts CM0PLUS */
-  /* On the other hand is up to the devepoper make sure the CM0PLUS debugger is run after CM4 debugger */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
   HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-  /* CM4 has started and it has reset the mailbox and initialised the MbMux; */
-  /* once CM0PLUS is also initialised it send a SYS notification */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialisation done: Wait for CM0PLUS \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
 
-  MBMUXIF_WaitCm0MbmuxIsInitialised();
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
-  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supprted_features_list);
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
 
-  APP_LOG(TS_ON, VLEVEL_H, "System Initialisation CM4-CM0PLUS completed \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
 
   init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
   if (init_status < 0)
@@ -305,45 +310,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -384,13 +350,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -405,13 +369,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -422,13 +384,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -443,4 +403,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_sensors.c
index e2c80e45..3afffff8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_sensors.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_sensors.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_sensors.c
@@ -16,12 +17,14 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "sys_conf.h"
 #include "sys_sensors.h"
 
+/* USER CODE BEGIN Includes */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -104,9 +107,6 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN Includes */
-
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -120,15 +120,14 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
 #define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
 #define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
 #define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
 #define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
 #define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
 #define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
-
-/* USER CODE BEGIN PD */
-
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -137,6 +136,8 @@ static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
 #if defined (X_NUCLEO_IKS01A2)
 #warning "IKS drivers are today available for several families but not stm32WL"
@@ -151,9 +152,6 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif  /* SENSOR_ENABLED */
-
-/* USER CODE BEGIN PV */
-
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -162,11 +160,9 @@ IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-void EnvSensors_Read(sensor_t *sensor_data)
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
 {
-  /* USER CODE BEGIN EnvSensors_Read_1 */
-
-  /* USER CODE END EnvSensors_Read_1 */
+  /* USER CODE BEGIN EnvSensors_Read */
   float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
   float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
   float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
@@ -198,17 +194,14 @@ void EnvSensors_Read(sensor_t *sensor_data)
 
   sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
   sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
-  /* USER CODE BEGIN EnvSensors_Read_Last */
 
-  /* USER CODE END EnvSensors_Read_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Read */
 }
 
-void  EnvSensors_Init(void)
+int32_t  EnvSensors_Init(void)
 {
-  /* USER CODE BEGIN EnvSensors_Init_1 */
-
-  /* USER CODE END EnvSensors_Init_1 */
-
+  /* USER CODE BEGIN EnvSensors_Init */
 #if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
   /* Init */
 #if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
@@ -259,9 +252,8 @@ void  EnvSensors_Init(void)
 #elif !defined (SENSOR_ENABLED)
 #error SENSOR_ENABLED not defined
 #endif /* SENSOR_ENABLED  */
-  /* USER CODE BEGIN EnvSensors_Init_Last */
-
-  /* USER CODE END EnvSensors_Init_Last */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c
index e04bdfc6..f02a544d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c
@@ -21,8 +21,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -163,9 +163,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   /** Configure the Instance */
   hrtc.Instance = RTC;
   HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
@@ -245,64 +245,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -325,6 +331,7 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -334,16 +341,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -370,24 +377,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c
index 343006bc..476eb1f2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_lpuart1_tx;
 void MX_LPUART1_UART_Init(void)
 {
 
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
-  hlpuart1.Init.BaudRate = LPUART_BAUDRATE;
+  hlpuart1.Init.BaudRate = 9600;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
   hlpuart1.Init.StopBits = UART_STOPBITS_1;
   hlpuart1.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_LPUART1_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c
index cfa581cd..36217a2f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&hlpuart1);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c
index 76152897..8328a537 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -58,11 +61,44 @@ static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -70,11 +106,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -107,11 +138,6 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief The application informs MBMUX about the CM0PLUS supported feature list
-  * @param p_CM0PLUS_FeatureList  pointer to the list of CM0PLUS features
-  * @retval  none
-  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
 {
   /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
@@ -123,15 +149,6 @@ void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
   /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval   channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
 {
   int8_t check_if_feature_provided_by_cm0plus = 0;
@@ -203,13 +220,6 @@ int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -235,9 +245,9 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
     }
     else
     {
-      /* Make sure to clear pending IRQ Notification before unregistering the callback */
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
       /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
-      /* if the mask is removed by anyone, the unwhished IRQ is generated if SR isn't cleaned */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
       IPCC_IF_AcknowledgeSnd(mb_ch);
 
       p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
@@ -254,12 +264,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the MailBox com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -286,11 +290,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Cmd to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_CommandSnd_1 */
@@ -309,11 +308,6 @@ int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_CommandSnd_Last */
 }
 
-/**
-  * @brief Send ack to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
@@ -333,12 +327,6 @@ uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Check if the FEATURE is in the CM0 table and return it's position
-  * @param e_featID  identifier of the feature
-  * @retval 0 not present, 1 present
-  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
 {
   int8_t ret = 0;
@@ -370,11 +358,6 @@ static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_feat
   return ret;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
@@ -390,11 +373,6 @@ static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
@@ -410,11 +388,6 @@ static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Find the first channel not yet associated to a feature (available)
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means no channel available
-  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
@@ -475,12 +448,6 @@ static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
   /* USER CODE END MBMUX_FindChStillUnregistered_Last */
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -492,17 +459,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h
index fd31da65..a15773f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM4_H__
@@ -52,23 +54,60 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
-                             void (*MsgCm4Cb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
-
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_kms.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_kms.c
deleted file mode 100644
index 1b866fbe..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_kms.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.c
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "mbmuxif_kms.h"
-#include "mbmuxif_sys.h"
-#include "stm32_mem.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aKmsCmdRespBuff[MAX_PARAM_OF_KMS_CMD_FUNCTIONS];/*shared*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers KMS feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
-int8_t MBMUXIF_KmsInit(void)
-{
-  int8_t ret;
-  /* USER CODE BEGIN MBMUXIF_KmsInit_1 */
-
-  /* USER CODE END MBMUXIF_KmsInit_1 */
-
-  ret = MBMUX_RegisterFeature(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP, MBMUXIF_IsrKmsRespRcvCb, aKmsCmdRespBuff, sizeof(aKmsCmdRespBuff));
-  if (ret >= 0)
-  {
-    /* Note: Kms uses only NOTIF_ACK channel, the SEQ_TASK only on CM0PLUS */
-
-    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_KMS_ID);
-    if (ret < 0)
-    {
-      ret = -3;
-    }
-  }
-
-  /* USER CODE BEGIN MBMUXIF_KmsInit_Last */
-
-  /* USER CODE END MBMUXIF_KmsInit_Last */
-  return ret;
-}
-
-/**
-  * @brief gives back the pointer to the com buffer associated to Kms feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void)
-{
-  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_KMS_ID, MBMUX_CMD_RESP);
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_1 */
-
-  if (com_param_ptr == NULL)
-  {
-    Error_Handler(); /* ErrorHandler() : feature isn't registered */
-  }
-
-  /* USER CODE BEGIN MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-
-  /* USER CODE END MBMUXIF_GetKmsFeatureCmdComPtr_Last */
-  return com_param_ptr;
-}
-
-/**
-  * @brief Sends a Kms-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
-void MBMUXIF_KmsSendCmd(void)
-{
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_1 */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_1 */
-  if (MBMUX_CommandSnd(FEAT_INFO_KMS_ID) == 0)
-  {
-    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  }
-  else
-  {
-    while (1) {} /* ErrorHandler(); */
-  }
-  /* USER CODE BEGIN MBMUXIF_KmsSendCmd_Last */
-
-  /* USER CODE END MBMUXIF_KmsSendCmd_Last */
-}
-
-/* USER CODE BEGIN EFD */
-
-/* USER CODE END EFD */
-
-/* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  KMS response callbacks: set event to release waiting task
-  * @param  pointer to the KMS com param buffer
-  * @retval  none
-  */
-static void MBMUXIF_IsrKmsRespRcvCb(void *ComObj)
-{
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_1 */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_1 */
-  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbKmsRespRcv);
-  /* USER CODE BEGIN MBMUXIF_IsrKmsRespRcvCb_Last */
-
-  /* USER CODE END MBMUXIF_IsrKmsRespRcvCb_Last */
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_kms.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_kms.h
deleted file mode 100644
index cfc715c2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_kms.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    mbmuxif_kms.h
-  * @author  MCD Application Team
-  * @brief   Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __MBMUXIF_KMS_CM4_H__
-#define __MBMUXIF_KMS_CM4_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "mbmux.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-int8_t MBMUXIF_KmsInit(void);
-MBMUX_ComParam_t *MBMUXIF_GetKmsFeatureCmdComPtr(void);
-void MBMUXIF_KmsSendCmd(void);
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__MBMUXIF_KMS_CM4_H__ */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c
index 26d69db0..81fc561a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -55,7 +57,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *RadioComObj;
 
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -63,8 +72,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RA
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
 static void MBMUXIF_TaskRadioNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -72,16 +94,6 @@ static void MBMUXIF_TaskRadioNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers RADIO feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
@@ -125,11 +137,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
@@ -138,7 +145,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
@@ -146,11 +153,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
@@ -169,11 +171,6 @@ void MBMUXIF_RadioSendCmd(void)
   /* USER CODE END MBMUXIF_RadioSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Radio-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
@@ -193,11 +190,6 @@ void MBMUXIF_RadioSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO response callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
@@ -209,11 +201,6 @@ static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
@@ -226,11 +213,6 @@ static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the notification
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h
index 1f4c2454..3d565fcd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM4_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_RadioSendAck(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c
index 38508bbe..c4b71d29 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sigfox.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle SigfoxWAN via MBMUX
+  * @brief   allows CM4 application to register and handle SigfoxWAN via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -62,8 +64,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSigfoxNotifAckBuff[MAX_PARAM_OF_S
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  Sigfox response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
 static void MBMUXIF_IsrSigfoxRespRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
 static void MBMUXIF_IsrSigfoxNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox task to process the notification
+  */
 static void MBMUXIF_TaskSigfoxNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -71,12 +86,6 @@ static void MBMUXIF_TaskSigfoxNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS; -3: callback error on CM0PLUS
-  */
 int8_t MBMUXIF_SigfoxInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_system_info;
@@ -124,11 +133,6 @@ int8_t MBMUXIF_SigfoxInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Sigfox feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureCmdComPtr_1 */
@@ -137,7 +141,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_SIGFOX_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureCmdComPtr_Last */
@@ -145,11 +149,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetSigfoxFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief  Sends a Sigfox-Cmd via Ipcc and Wait for the response
-  * @param  none
-  * @retval none
-  */
 void MBMUXIF_SigfoxSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendCmd_1 */
@@ -168,11 +167,6 @@ void MBMUXIF_SigfoxSendCmd(void)
   /* USER CODE END MBMUXIF_SigfoxSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Sigfox-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SigfoxSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_SigfoxSendAck_1 */
@@ -192,11 +186,6 @@ void MBMUXIF_SigfoxSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  Sigfox response callbacks: set event to release waiting task
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSigfoxRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSigfoxRespRcvCb_1 */
@@ -208,11 +197,6 @@ static void MBMUXIF_IsrSigfoxRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSigfoxRespRcvCb_Last */
 }
 
-/**
-  * @brief  Sigfox notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSigfoxNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSigfoxNotifRcvCb_1 */
@@ -225,11 +209,6 @@ static void MBMUXIF_IsrSigfoxNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSigfoxNotifRcvCb_Last */
 }
 
-/**
-  * @brief  Sigfox task to process the notification
-  * @param  pointer to the Sigfox com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSigfoxNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSigfoxNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h
index b23941bb..3834fe17 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sigfox.h
   * @author  MCD Application Team
-  * @brief   API provided to CM0 appli to register and handle Sigfox to MBMUX
+  * @brief   API provided to CM0 application to register and handle Sigfox to MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SIGFOX_CM4_H__
@@ -52,9 +54,25 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS; -3: callback error on CM0PLUS
+  */
 int8_t MBMUXIF_SigfoxInit(void);
+/**
+  * @brief   gives back the pointer to the com buffer associated to Sigfox feature Cmd
+  * @return  pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Sigfox-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_SigfoxSendCmd(void);
+
+/**
+  * @brief   Sends a Sigfox-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_SigfoxSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c
index c937c14c..1884bb44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -53,10 +55,10 @@
 
 /* Private variables ---------------------------------------------------------*/
 static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
-static __IO uint8_t AllowSeqencerForSysCmd = 0;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
 static __IO uint8_t MbSystemRespRcvFlag;
 
-UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(4) ;
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
 
 MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
 MBMUX_ComParam_t *SystemComObj;
@@ -64,23 +66,54 @@ MBMUX_ComParam_t *SystemComObj;
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
 static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -88,47 +121,54 @@ static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
 
   /* USER CODE END MBMUXIF_SystemInit_1 */
 
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
   /* Get the Dual boot configuration status */
   HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
 
   if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
   {
-    APP_PPRINTF("\r\n WARNING: There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n",  (uint32_t) pMb_RefTable);
-    APP_PPRINTF(" and the address calculated according to the IPCCDBA option byte: 0x%X \r\n", OptionsBytesStruct.IPCCdataBufAddr);
-    APP_PPRINTF(" The execution enters now in a while(1){}  \r\n");
-    APP_PPRINTF(" please check the CM4\\MbMux\\mbmuxif_sys.c or update the scatter file \r\n\r\n");
-
-    /* USER CODE BEGIN MBMUXIF_SystemInit_Prevent_OB_Programming */
-      /* If you are sure you need to reprogram the IPCCDBA set #if to 0 (to avoid while(1){}) */
-      /* Please first check the  CM4 scatter file.*/
-      /* Make sure that the MAPPING_TABLE is placed in SRAM2 (memory with retention) */
-      /* Examples of scatter files available in the LoraWAN and Sigfox DualCore Applications pack*/
-      /* */
-      /* After HAL_FLASH_OB_Launch you will have to unplug and plug the board from power after this operation.*/
-      /* Additionally possible Issue under investigation, i.e.: */
-      /* In some cases happen that unplugging the chip power is not sufficient */
-      /* if so you need to reboot from RAM putting the BOOT0 pin to 3v3 */
-      /* attach with Cube Programmer and full erase the chip memory. */
-      /* */
-      /* PS: of course if you are attached with the debugger, it will not respond anymore after HAL_FLASH_OB_Launch*/
-#if 1
-    /* USER CODE END MBMUXIF_SystemInit_Prevent_OB_Programming */
-    while(1){}
-#else
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
 
     /* write FLASH->IPCCBR option byte */
     /* Unlock the Flash to enable the flash control register access *************/
@@ -140,7 +180,7 @@ int8_t MBMUXIF_SystemInit(void)
     HAL_FLASH_OB_Unlock();
 
     /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
-    OptionsBytesStruct.OptionType  = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
     OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
 
     if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
@@ -170,10 +210,8 @@ int8_t MBMUXIF_SystemInit(void)
     (void) HAL_FLASH_OB_Lock();
     /* Lock the Flash to disable the flash control register access  *********/
     (void) HAL_FLASH_Lock();
-#endif
   }
-  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
-
+  /* Init MailBoxMultiplexer */
   MBMUX_Init(pMb_RefTable);
 
   ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
@@ -186,16 +224,13 @@ int8_t MBMUXIF_SystemInit(void)
     ret = 0;
     UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
   }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
 
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
   /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
   /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-#else
-#warning "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_ON */
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
 
@@ -203,14 +238,9 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
-  int8_t ret=0;
+  int8_t ret = 0;
 
   /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
 
@@ -259,14 +289,6 @@ int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
   return ret;
 }
 
-/**
-  * @brief Set synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
 {
   pMb_RefTable->SynchronizeCpusAtBoot = flag;
@@ -275,26 +297,16 @@ void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
   /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
 }
 
-/**
-  * @brief gives green light to Cm0 to Initialised MBMUX on its side
-  * @param none
-  * @retval  none
-  */
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void)
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
 {
   while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
   {
   }
-  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
 
-  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
@@ -303,30 +315,19 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPr
   /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
 }
 
-/**
-  * @brief To allow SystemCmd to use the sequencer (hence entering in low power)
-  * @note  For compatib with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The applic can call this API at the end of the Init
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void)
 {
-  AllowSeqencerForSysCmd = 1;
+  AllowSequencerForSysCmd = 1;
   /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
 
   /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
 }
 
-/**
-  * @brief Sends a System-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
@@ -339,7 +340,7 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
     MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
     if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
     {
-      if (AllowSeqencerForSysCmd)
+      if (AllowSequencerForSysCmd)
       {
         UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
       }
@@ -356,20 +357,15 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
 
-  /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
 
   /* USER CODE END MBMUXIF_SystemSendCmd_Last */
 }
 
-/**
-  * @brief Sends a System-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
@@ -384,17 +380,11 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendAck_Last */
 }
 
-/* USER CODE BEGIN ExpoF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExpoF */
+/* USER CODE END EF */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief   Gets the pointer to CM0PLUS capabilities info table
-  * @param   none
-  * @retval  pointer to CM0PLUS capabilities info table
-  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
 {
   MBMUX_ComParam_t *com_obj;
@@ -421,14 +411,9 @@ FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
   return (FEAT_INFO_List_t *) ret;   /* need to verify */
 }
 
-/**
-  * @brief returns the pointer to the Capability Info table of a given feature
-  * @param e_featID ID of the feature from which retrieve the ptr
-  * @retval  LoRaMacInfoTable pointer
-  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
 {
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list = NULL;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
   FEAT_INFO_Param_t  *p_feature = NULL;
   uint8_t i;
   uint8_t cm0plus_nr_of_supported_features;
@@ -438,15 +423,15 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
 
   /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
 
-  if (p_cm0plus_supprted_features_list != NULL)
+  if (p_cm0plus_supported_features_list != NULL)
   {
-    cm0plus_nr_of_supported_features = p_cm0plus_supprted_features_list->Feat_Info_Cnt;
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
 
     for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
     {
-      p_feature = i + p_cm0plus_supprted_features_list->Feat_Info_TableAddress;
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
       if (p_feature->Feat_Info_Feature_Id == e_featID)
       {
         found = 1;
@@ -466,12 +451,6 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
   return  p_feature;
 }
 
-/**
-  * @brief Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @retval   0 ok, else error code
-  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 {
   MBMUX_ComParam_t *com_obj;
@@ -506,11 +485,6 @@ int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM response callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
@@ -519,7 +493,7 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 
   /* During "SystemInit sequence" Flag is used instead of Sequencer */
   MbSystemRespRcvFlag = 1;
-  if (AllowSeqencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
   {
     UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
   }
@@ -528,11 +502,6 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
@@ -545,11 +514,6 @@ static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM task to process the notification
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
@@ -561,11 +525,6 @@ static void MBMUXIF_TaskSystemNotifRcv(void)
   /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
@@ -573,11 +532,6 @@ static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
@@ -591,11 +545,6 @@ static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
@@ -603,11 +552,6 @@ static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h
index d6f9cc5c..61f37d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM4_H__
@@ -55,13 +57,56 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -69,8 +114,24 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c
index b42f9402..c91551a5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to receive by CM0 TRACE via MBMUX
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -46,25 +48,26 @@
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
-
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
 /* USER CODE BEGIN PM */
 
 /* USER CODE END PM */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_TraceInit(void)
 {
   int8_t ret;
@@ -90,23 +93,18 @@ int8_t MBMUXIF_TraceInit(void)
   return ret;
 }
 
-/**
-  * @brief Sends a Trace-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendAck(void)
 {
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
 
-/* USER CODE END MBMUXIF_TraceSendAck_1 */
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
   if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
   {
     Error_Handler();
   }
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
 
-/* USER CODE END MBMUXIF_TraceSendAck_Last */
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
 }
 
 /* USER CODE BEGIN EFD */
@@ -114,16 +112,11 @@ void MBMUXIF_TraceSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 {
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
   MBMUX_ComParam_t *TraceComObj;
   uint32_t  notif_ack_id;
   uint8_t *buffer;
@@ -151,9 +144,9 @@ static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 
   /* Send ack */
   MBMUXIF_TraceSendAck();
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
 }
 
 /* USER CODE BEGIN PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h
index 7a8d3fa7..f98a156d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle TRACE via MBMUX
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM4_H__
@@ -52,7 +54,15 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c
index 1326f87b..fd0e305e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "radio_mbwrapper.h"
@@ -72,38 +75,38 @@ static void RadioIrqProcess(void);
 /*!
  * \brief Initializes the radio
  *
- * \param [IN] events Structure containing the driver callback functions
+ * \param[in] events Structure containing the driver callback functions
  */
 static void RadioInit(RadioEvents_t *events);
 
 /*!
  * Return current radio status
  *
- * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
  */
 static RadioState_t RadioGetStatus(void);
 
 /*!
  * \brief Configures the radio with the given modem
  *
- * \param [IN] modem Modem to be used [0: FSK, 1: LoRa]
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
  */
 static void RadioSetModem(RadioModems_t modem);
 
 /*!
  * \brief Sets the channel frequency
  *
- * \param [IN] freq         Channel RF frequency
+ * \param[in] freq Channel RF frequency
  */
 static void RadioSetChannel(uint32_t freq);
 
 /*!
   * \brief Checks if the channel is free for the given time
   *
-  * \param [IN] freq                Channel RF frequency in Hertz
-  * \param [IN] rxBandwidth         Rx bandwidth in Hertz
-  * \param [IN] rssiThresh          RSSI threshold in dBm
-  * \param [IN] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
   *
   * \retval isFree         [true: Channel is free, false: Channel is not free]
   */
@@ -125,40 +128,40 @@ static uint32_t RadioRandom(void);
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: N/A ( set to 0 )
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [false: single mode, true: continuous mode]
  */
 static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
@@ -172,37 +175,37 @@ static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] fdev         Sets the frequency deviation (FSK only)
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
  *                          FSK : [Hz]
  *                          LoRa: 0
- * \param [IN] bandwidth    Sets the bandwidth (LoRa only)
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
  *                          FSK : 0
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the preamble length
+ * \param[in] preambleLen  Sets the preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] crcOn        Enables disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] timeout      Transmission timeout [ms]
  */
 static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
                              uint32_t bandwidth, uint32_t datarate,
@@ -213,7 +216,7 @@ static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
 /*!
  * \brief Checks if the given RF frequency is supported by the hardware
  *
- * \param [IN] frequency RF frequency to be checked
+ * \param[in] frequency RF frequency to be checked
  * \retval isSupported [true: supported, false: unsupported]
  */
 static bool RadioCheckRfFrequency(uint32_t frequency);
@@ -221,26 +224,26 @@ static bool RadioCheckRfFrequency(uint32_t frequency);
 /*!
  * \brief Computes the packet time on air in ms for the given payload
  *
- * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] spreadingFactor  Sets the Spreading Factor
+ * \param[in] spreadingFactor  Sets the Spreading Factor
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
  *
  * \retval airTime        Computed airTime (ms) for the given packet payload length
  */
@@ -253,8 +256,8 @@ static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
  * \brief Sends the buffer of size. Prepares the packet to be sent and sets
  *        the radio in transmission
  *
- * \param [IN]: buffer     Buffer pointer
- * \param [IN]: size       Buffer size
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
  */
 static void RadioSend(uint8_t *buffer, uint8_t size);
 
@@ -270,7 +273,7 @@ static void RadioStandby(void);
 
 /*!
  * \brief Sets the radio in reception mode for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRx(uint32_t timeout);
@@ -283,15 +286,17 @@ static void RadioStartCad(void);
 /*!
  * \brief Sets the radio in continuous wave transmission mode
  *
- * \param [IN]: freq       Channel RF frequency
- * \param [IN]: power      Sets the output power [dBm]
- * \param [IN]: time       Transmission mode timeout [s]
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
  */
 static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
 
 /*!
  * \brief Reads the current RSSI value
  *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
  * \retval rssiValue Current RSSI value in [dBm]
  */
 static int16_t RadioRssi(RadioModems_t modem);
@@ -299,15 +304,15 @@ static int16_t RadioRssi(RadioModems_t modem);
 /*!
  * \brief Writes the radio register at the specified address
  *
- * \param [IN]: addr Register address
- * \param [IN]: data New register value
+ * \param[in] addr Register address
+ * \param[in] data New register value
  */
 static void RadioWrite(uint16_t addr, uint8_t data);
 
 /*!
  * \brief Reads the radio register at the specified address
  *
- * \param [IN]: addr Register address
+ * \param[in] addr Register address
  * \retval data Register value
  */
 static uint8_t RadioRead(uint16_t addr);
@@ -315,26 +320,26 @@ static uint8_t RadioRead(uint16_t addr);
 /*!
  * \brief Writes multiple radio registers starting at address
  *
- * \param [IN] addr   First Radio register address
- * \param [IN] buffer Buffer containing the new register's values
- * \param [IN] size   Number of registers to be written
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
  */
 static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Reads multiple radio registers starting at address
  *
- * \param [IN] addr First Radio register address
- * \param [OUT] buffer Buffer where to copy the registers data
- * \param [IN] size Number of registers to be read
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
  */
 static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Sets the maximum payload length.
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] max        Maximum payload length in bytes
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
  */
 static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
 
@@ -343,7 +348,7 @@ static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
  *
  * \remark Applies to LoRa modem only
  *
- * \param [IN] enable if true, it enables a public network
+ * \param[in] enable if true, it enables a public network
  */
 static void RadioSetPublicNetwork(bool enable);
 
@@ -356,7 +361,7 @@ static uint32_t RadioGetWakeUpTime(void);
 
 /*!
  * \brief Sets the radio in reception mode with Max LNA gain for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRxBoosted(uint32_t timeout);
@@ -364,51 +369,49 @@ static void RadioRxBoosted(uint32_t timeout);
 /*!
  * \brief Sets the Rx duty cycle management parameters
  *
- * \param [in]  rxTime        Structure describing reception timeout value
- * \param [in]  sleepTime     Structure describing sleep timeout value
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
  */
 static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
 
 /*!
  * \brief Set Tx PRBS modulated wave
- * \retval none
  */
 static void RadioTxPrbs(void);
 
 /*!
  * \brief Set Tx continuous wave
- * \param [in]  power  Tx power level [0..15]
- * \retval none
+ * \param[in]  power  Tx power level [0..15]
  */
 static void RadioTxCw(int8_t power);
 
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [0: single mode, otherwise continuous mode]
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
  * \return 0 when no parameters error, -1 otherwise
  */
-static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t* config,
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
                                        uint32_t rxContinuous, uint32_t symbTimeout);
 
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
                             bpsk field to be used if modem =GENERIC_BPSK
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
  * \return 0 when no parameters error, -1 otherwise
  */
 static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
@@ -461,11 +464,6 @@ const struct Radio_s Radio =
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief This function processes the radio events callbacks  from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Radio_Notif_1 */
@@ -486,7 +484,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -500,7 +498,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -564,7 +562,7 @@ static void RadioInit(RadioEvents_t *events)
 
   if (events == NULL)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   radioevents_wrap.TxDone = events->TxDone;
@@ -590,7 +588,7 @@ static void RadioInit(RadioEvents_t *events)
 /*!
   * Return current radio status
   *
-  * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
   */
 static RadioState_t RadioGetStatus(void)
 {
@@ -999,7 +997,7 @@ static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
   uint16_t i = 0;
 
   com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_CONTINOUS_WAVE_ID;
+  com_obj->MsgId = RADIO_SET_TX_CONTINUOUS_WAVE_ID;
   com_buffer = com_obj->ParamBuf;
   com_buffer[i++] = (uint32_t) freq;
   com_buffer[i++] = (uint32_t) power;
@@ -1424,10 +1422,4 @@ static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t
 
 /* USER CODE END PrFD */
 
-/**
-  * @}
-  *
-  */
-
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h
index f73a1283..e7eebe2c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c
index e7fe6308..df4d17bc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -54,6 +56,14 @@
 #endif /* MAX */
 #define NB_ELEMENTS_MAX 3
 
+#define SGFX_OPEN_SIZE       (sizeof(sfx_rc_t))
+#define SGFX_SEND_SIZE       ((SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8)) + (SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8)))
+#define SGFX_SET_CONFIG_SIZE (NB_ELEMENTS_MAX * sizeof(sfx_u32))
+#define SGFX_START_TX_SIZE   (sizeof(sfx_modulation_type_t))
+#define SGFX_GET_VER_SIZE    (sizeof(sfx_u32) + sizeof(sfx_u8))
+#define SGFX_GET_PAC_SIZE    (PAC_LENGTH * sizeof(sfx_u8))
+#define SGFX_MBWRAP_SHBUF_SIZE MAX(MAX(MAX(SGFX_OPEN_SIZE, SGFX_SEND_SIZE), MAX(SGFX_SET_CONFIG_SIZE, SGFX_START_TX_SIZE)), MAX(SGFX_GET_VER_SIZE, SGFX_GET_PAC_SIZE))
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -64,7 +74,10 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aSigfoxMbWrapShareBuffer[sizeof(sfx_rc_t)];
+/**
+  * @brief Sigfox buffer to exchange data between from CM4 to CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aSigfoxMbWrapShareBuffer[SGFX_MBWRAP_SHBUF_SIZE];
 
 static sfx_u8(* app_cb)(sfx_u8 rc_bit_mask, sfx_s16 rssi);
 
@@ -80,16 +93,6 @@ static SigfoxCallback_t *callback_wrap;
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/*!
-  * \brief   Open Sigfox API
-  *
-  *
-  * \param   [IN] sfx_rc_t - Radio configuration structure
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_OPEN_xx
-  */
 sfx_error_t SIGFOX_API_open(sfx_rc_t *rc)
 {
   /* USER CODE BEGIN SIGFOX_API_open_1 */
@@ -100,6 +103,11 @@ sfx_error_t SIGFOX_API_open(sfx_rc_t *rc)
   uint16_t i = 0;
   uint32_t ret;
 
+  if (rc == NULL)
+  {
+    return SFX_ERR_API_OPEN;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) rc, sizeof(sfx_rc_t));
 
@@ -122,13 +130,6 @@ sfx_error_t SIGFOX_API_open(sfx_rc_t *rc)
   /* USER CODE END SIGFOX_API_open_2 */
 }
 
-/*!
-  * \brief   Close Sigfox API
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_CLOSE_xx
-  */
 sfx_error_t SIGFOX_API_close(void)
 {
   /* USER CODE BEGIN SIGFOX_API_close_1 */
@@ -150,14 +151,6 @@ sfx_error_t SIGFOX_API_close(void)
   /* USER CODE END SIGFOX_API_close_2 */
 }
 
-/*!
-  * \brief Send a standard SIGFOX frame with customer payload
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_SEND_FRAME_xx
-  *          \ref SFX_ERR_INT_xx
-  */
 sfx_error_t SIGFOX_API_send_frame(sfx_u8 *customer_data, sfx_u8 customer_data_length,
                                   sfx_u8 *customer_response, sfx_u8 tx_mode,
                                   sfx_bool initiate_downlink_flag)
@@ -170,6 +163,15 @@ sfx_error_t SIGFOX_API_send_frame(sfx_u8 *customer_data, sfx_u8 customer_data_le
   uint16_t i = 0;
   uint32_t ret;
 
+  if (customer_data == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_DATA_PTR;
+  }
+  else if (customer_response == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_RESPONSE_PTR;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) customer_data,
                  SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8));
@@ -204,18 +206,6 @@ sfx_error_t SIGFOX_API_send_frame(sfx_u8 *customer_data, sfx_u8 customer_data_le
   /* USER CODE END SIGFOX_API_send_frame_2 */
 }
 
-/*!
-  * \brief Send a standard SIGFOX frame with customer payload
-  *
-  * \param[in] sfx_bool bit_value                Bit state (SFX_TRUE or SFX_FALSE)
-  * \param[out] sfx_u8 *customer_response        Returned 8 Bytes data in case of downlink
-  * \param[in] sfx_u8 tx_mode                    tx_mode shall be set to 2.
-  * \param[in] sfx_bool initiate_downlink_flag   Flag to initiate a downlink response
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_SEND_BIT_xx
-  *          \ref SFX_ERR_INT_xx
-  */
 sfx_error_t SIGFOX_API_send_bit(sfx_bool bit_value,
                                 sfx_u8 *customer_response,
                                 sfx_u8 tx_mode,
@@ -229,6 +219,11 @@ sfx_error_t SIGFOX_API_send_bit(sfx_bool bit_value,
   uint16_t i = 0;
   uint32_t ret;
 
+  if (customer_response == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_RESPONSE_PTR;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *)aSigfoxMbWrapShareBuffer, (uint8_t *)customer_response,
                  SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8));
@@ -257,16 +252,6 @@ sfx_error_t SIGFOX_API_send_bit(sfx_bool bit_value,
   /* USER CODE END SIGFOX_API_send_bit_2 */
 }
 
-/*!
-  * \brief   Send an out of band SIGFOX frame
-  *
-  *
-  * \param   [IN] sfx_oob_enum_t oob_type  - Type of the OOB frame to send
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_INT_xx
-  */
 sfx_error_t SIGFOX_API_send_outofband(sfx_oob_enum_t oob_type)
 {
   /* USER CODE BEGIN SIGFOX_API_send_outofband_1 */
@@ -293,16 +278,6 @@ sfx_error_t SIGFOX_API_send_outofband(sfx_oob_enum_t oob_type)
   /* USER CODE END SIGFOX_API_send_outofband_2 */
 }
 
-/*!
-  * \brief   configure specific variables for standard
-  *          It is mandatory to call this function after SIGFOX_API_open() for FH and LBT
-  *
-  * \param   [IN] config_words          -  Meaning depends on the standard
-  * \param   [IN] sfx_bool timer_enable -  Enable timer feature for FH
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_SET_CONFIG_xx
-  */
 sfx_error_t SIGFOX_API_set_std_config(sfx_u32 config_words[NB_ELEMENTS_MAX],
                                       sfx_bool timer_enable)
 {
@@ -338,15 +313,6 @@ sfx_error_t SIGFOX_API_set_std_config(sfx_u32 config_words[NB_ELEMENTS_MAX],
   /* USER CODE END SIGFOX_API_set_std_config_2 */
 }
 
-/*!
-  * \brief   Executes a continuous wave or modulation depending on the parameter type
-  *
-  * \param   [IN] frequency          -  Frequency at which the signal has to be generated
-  * \param   [IN] sfx_modulation_type_t type   -  Type of modulation to use in continuous mode
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_START_CONTINUOUS_TRANSMISSION_xx
-  */
 sfx_error_t SIGFOX_API_start_continuous_transmission(sfx_u32 frequency, sfx_modulation_type_t type)
 {
   /* USER CODE BEGIN SIGFOX_API_start_continuous_transmission_1 */
@@ -381,13 +347,6 @@ sfx_error_t SIGFOX_API_start_continuous_transmission(sfx_u32 frequency, sfx_modu
   /* USER CODE END SIGFOX_API_start_continuous_transmission_2 */
 }
 
-/*!
-  * \brief   Stop the current continuous transmission
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_STOP_CONTINUOUS_TRANSMISSION_xx
-  */
 sfx_error_t SIGFOX_API_stop_continuous_transmission(void)
 {
   /* USER CODE BEGIN SIGFOX_API_stop_continuous_transmission_1 */
@@ -409,16 +368,6 @@ sfx_error_t SIGFOX_API_stop_continuous_transmission(void)
   /* USER CODE END SIGFOX_API_stop_continuous_transmission_2 */
 }
 
-/*!
-  * \brief   Returns current SIGFOX library version, or RF Version, or MCU version
-  *
-  * \param[out] sfx_u8 **version                 Pointer to Byte array (ASCII format) containing library version
-  * \param[out] sfx_u8 *size                     Size of the byte array pointed by *version
-  * \param[in]  sfx_version_type_t type          Type of the version ( MCU, RF, ... )
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_GET_VERSION_xx
-  */
 sfx_error_t SIGFOX_API_get_version(sfx_u8 **version, sfx_u8 *size, sfx_version_type_t type)
 {
   /* USER CODE BEGIN SIGFOX_API_get_version_1 */
@@ -429,6 +378,11 @@ sfx_error_t SIGFOX_API_get_version(sfx_u8 **version, sfx_u8 *size, sfx_version_t
   uint16_t i = 0;
   uint32_t ret;
 
+  if (version == NULL)
+  {
+    return SFX_ERR_API_GET_VERSION;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) version, sizeof(sfx_u32));
   UTIL_MEM_cpy_8((uint8_t *)(aSigfoxMbWrapShareBuffer + sizeof(sfx_u32)), (uint8_t *) size, sizeof(sfx_u8));
@@ -455,16 +409,6 @@ sfx_error_t SIGFOX_API_get_version(sfx_u8 **version, sfx_u8 *size, sfx_version_t
   /* USER CODE END SIGFOX_API_get_version_2 */
 }
 
-/*!
-  * \brief   copies the ID of the device to the pointer given in parameter
-  *
-  *
-  * \param[out] sfx_u8* dev_id    Pointer where to write the device ID
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_GET_DEVICE_ID_xx
-  */
 sfx_error_t SIGFOX_API_get_device_id(sfx_u8 *dev_id)
 {
   /* USER CODE BEGIN SIGFOX_API_get_device_id_1 */
@@ -475,6 +419,11 @@ sfx_error_t SIGFOX_API_get_device_id(sfx_u8 *dev_id)
   uint16_t i = 0;
   uint32_t ret;
 
+  if (dev_id == NULL)
+  {
+    return SFX_ERR_INT_GET_DEVICE_ID;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) dev_id, sizeof(sfx_u32));
 
@@ -497,16 +446,6 @@ sfx_error_t SIGFOX_API_get_device_id(sfx_u8 *dev_id)
   /* USER CODE END SIGFOX_API_get_device_id_2 */
 }
 
-/*!
-  * \brief   Get the value of the PAC stored in the device
-  *
-  *
-  * \param[out] sfx_u8* initial_pac              Pointer to initial PAC
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_GET_DEVICE_ID_xx
-  */
 sfx_error_t SIGFOX_API_get_initial_pac(sfx_u8 *initial_pac)
 {
   /* USER CODE BEGIN SIGFOX_API_get_initial_pac_1 */
@@ -517,6 +456,11 @@ sfx_error_t SIGFOX_API_get_initial_pac(sfx_u8 *initial_pac)
   uint16_t i = 0;
   uint32_t ret;
 
+  if (initial_pac == NULL)
+  {
+    return SFX_ERR_API_GET_INITIAL_PAC;
+  }
+
   /* copy data from Cm4 stack memory to shared memory */
   UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) initial_pac, PAC_LENGTH * sizeof(sfx_u8));
 
@@ -539,17 +483,6 @@ sfx_error_t SIGFOX_API_get_initial_pac(sfx_u8 *initial_pac)
   /* USER CODE END SIGFOX_API_get_initial_pac_2 */
 }
 
-/*!
-  * \brief   Set the period for transmission of RC Sync frame
-  *
-  *
-  * \param[in] sfx_u16 rollover_counter_period
-  *       Transmission period of the RC Sync frame (in number of 'normal' frames)
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_API_GET_DEVICE_ID_xx
-  */
 sfx_error_t SIGFOX_API_set_rc_sync_period(sfx_u16 rc_sync_period)
 {
   /* USER CODE BEGIN SIGFOX_API_set_rc_sync_period_1 */
@@ -576,14 +509,6 @@ sfx_error_t SIGFOX_API_set_rc_sync_period(sfx_u16 rc_sync_period)
   /* USER CODE END SIGFOX_API_set_rc_sync_period_2 */
 }
 
-/*!
-  * \brief   executes the test modes needed for the Sigfox RF and Protocol Tests
-  *
-  * \param[in]  sfx_rc_t                    Radio Configuration pointer
-  * \param[in]  sfx_test_mode_t test_mode   Test mode to be executed
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  */
 sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_test_mode(sfx_rc_enum_t rc_enum, sfx_test_mode_t test_mode)
 {
   /* USER CODE BEGIN ADDON_SIGFOX_RF_PROTOCOL_API_test_mode_1 */
@@ -611,21 +536,12 @@ sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_test_mode(sfx_rc_enum_t rc_enum, sfx_te
   /* USER CODE END ADDON_SIGFOX_RF_PROTOCOL_API_test_mode_2 */
 }
 
-/*!
-  * \brief   executes the test modes needed for the Sigfox RF and Protocol Tests
-  *
-  * \param[in]  sfx_rc_t                    Radio Configuration pointer
-  * \param[in]  sfx_test_mode_t test_mode   Test mode to be executed
-  * \param[in]  sfx_u8 rc_capabilities      Radio Capabilities in bitmask format
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  */
-sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(sfx_rc_enum_t rc_enum, sfx_test_mode_t test_mode,
-                                                           sfx_u8 rc_capabilities)
+sfx_error_t ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(sfx_rc_enum_t rc_enum, sfx_test_mode_t test_mode,
+                                                              sfx_u8 rc_capabilities)
 {
-  /* USER CODE BEGIN ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
+  /* USER CODE BEGIN ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
 
-  /* USER CODE END ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
+  /* USER CODE END ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
   MBMUX_ComParam_t *com_obj;
   uint32_t *com_buffer ;
   uint16_t i = 0;
@@ -644,25 +560,11 @@ sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(sfx_rc_enum_t rc_enum
 
   ret = com_obj->ReturnVal;
   return (sfx_error_t) ret;
-  /* USER CODE BEGIN ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
+  /* USER CODE BEGIN ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
 
-  /* USER CODE END ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
+  /* USER CODE END ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
 }
 
-/*!
-  * \brief   executes a scan of the air to detect a Sigfox Beacon
-  *
-  * \param[in] sfx_u16 timer                     Scan duration value ( with the unit parameter information )
-  * \param[in] sfx_timer_unit_enum_t  unit       Unit to be considered for the scan time computation
-  * \param[in] app_callback_handler              This is the function that will be called by the Sigfox Library when the scan is completed.
-  *                                              ( either when RC Found or when Timeout )
-  *                 parameter of this callback are :
-  *                     \param[out] sfx_u8       rc  Value of the RC found. There could be only 1 RC or 0 ( not found )
-  *                     \param[out] rssi         RSSI value of the RC found. if rc = 0, rssi is not valid ( is set to 0 too )
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_MONARCH_API_xx
-  */
 sfx_error_t SIGFOX_MONARCH_API_execute_rc_scan(sfx_u8 rc_capabilities_bit_mask, sfx_u16 timer,
                                                sfx_timer_unit_enum_t unit, sfx_u8(* app_callback_handler)(sfx_u8 rc_bit_mask, sfx_s16 rssi))
 {
@@ -674,6 +576,11 @@ sfx_error_t SIGFOX_MONARCH_API_execute_rc_scan(sfx_u8 rc_capabilities_bit_mask,
   uint16_t i = 0;
   uint32_t ret;
 
+  if (app_callback_handler == NULL)
+  {
+    return SFX_ERR_MONARCH_API_EXECUTE_RC_SCAN_NULL_CALLBACK;
+  }
+
   /*Init callback on M4 side*/
   app_cb = app_callback_handler;
 
@@ -696,13 +603,6 @@ sfx_error_t SIGFOX_MONARCH_API_execute_rc_scan(sfx_u8 rc_capabilities_bit_mask,
   /* USER CODE END SIGFOX_MONARCH_API_execute_rc_scan_2 */
 }
 
-/*!
-  * \brief    stops a RC scan which is on going
-  *
-  * \retval  sfx_error_t Status of the operation. Possible returns are:
-  *          \ref SFX_ERR_NONE,
-  *          \ref SFX_ERR_MONARCH_API_xx
-  */
 sfx_error_t SIGFOX_MONARCH_API_stop_rc_scan(void)
 {
   /* USER CODE BEGIN SIGFOX_MONARCH_API_stop_rc_scan_1 */
@@ -724,11 +624,6 @@ sfx_error_t SIGFOX_MONARCH_API_stop_rc_scan(void)
   /* USER CODE END SIGFOX_MONARCH_API_stop_rc_scan_2 */
 }
 
-/**
-  * @brief initialises the SigfoxInfo capabilities table
-  * @param none
-  * @retval  none
-  */
 void SigfoxInfo_Init(void)
 {
   /* USER CODE BEGIN SigfoxInfo_Init_1 */
@@ -748,11 +643,6 @@ void SigfoxInfo_Init(void)
   /* USER CODE END SigfoxInfo_Init_2 */
 }
 
-/**
-  * @brief returns the pointer to the SigfoxInfo capabilities table
-  * @param none
-  * @retval  SigfoxInfoTable pointer
-  */
 SigfoxInfo_t *SigfoxInfo_GetPtr(void)
 {
   /* USER CODE BEGIN SigfoxInfo_GetPtr_1 */
@@ -777,11 +667,6 @@ void Sigfox_Register(SigfoxCallback_t *SigfoxCallback)
 
   /* USER CODE END Sigfox_Register_2 */
 }
-/**
-  * @brief This function processes the callbacks and primitives from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 
 void Process_Sigfox_Notif(MBMUX_ComParam_t *ComObj)
 {
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h
index 37fa7260..cd7dc2dc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SIGFOX_MBWRAPPER_CM4_H__
@@ -76,8 +78,16 @@ typedef struct sSigfoxCallback
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the callbacks and primitives from Cm0
+  * @param ComObj exchange buffer parameter
+  */
 void Process_Sigfox_Notif(MBMUX_ComParam_t *ComObj);
 
+/**
+ * @brief Register the callbacks structure for the process notification
+ * @param SigfoxCallback struct of callbacks
+ */
 void Sigfox_Register(SigfoxCallback_t *SigfoxCallback);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c
index 02add77c..c2e924b9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    system_mbwrapper.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "system_mbwrapper.h"
@@ -48,20 +50,22 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
 
-/*!
-* \brief   Returns the last stored variable data, if found, which corresponds to
-*          the passed virtual address
-* \param   EEsgfxID:
-*          data: to be read
-* \retval  error status
-*/
-uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t *data)
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t *data)
 {
   MBMUX_ComParam_t *com_obj;
   uint32_t *com_buffer ;
   uint16_t i = 0;
-  uint32_t ret= 0;
+  uint32_t ret = 0;
 
   com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
   if (com_obj != NULL)
@@ -80,18 +84,12 @@ uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t *data)
   return (uint32_t) ret;
 }
 
-/*!
-* \brief   Writes/updates variable data in EEPROM emulator.
-* \param   EEsgfxID:
-*          data: to be written
-* \retval error status
-*/
-uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t data)
+uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t data)
 {
   MBMUX_ComParam_t *com_obj;
   uint32_t *com_buffer ;
   uint16_t i = 0;
-  uint32_t ret= 0;
+  uint32_t ret = 0;
 
   com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
   if (com_obj != NULL)
@@ -110,8 +108,8 @@ uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t data)
   return (uint32_t) ret;
 }
 
-/* USER CODE BEGIN PV */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END PV */
+/* USER CODE END EF */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.h
index 8f8eeb35..2acca318 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    system_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTEM_MBWRAPPER_CM4_H__
@@ -48,8 +50,24 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
-uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t *data);
-uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID,  uint32_t data);
+/**
+  * @brief   Returns the last stored variable data, if found, which corresponds to
+  *          the passed virtual address
+  * @param   EEsgfxID ID of EEPROM Sigfox variable
+  * @param   data to be read
+  *
+  * @retval  error status
+  */
+uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t *data);
+
+/**
+  * \brief   Writes/updates variable data in EEPROM emulator.
+  * @param   EEsgfxID ID of EEPROM Sigfox variable
+  * @param   data to be written
+  *
+  * @retval error status
+  */
+uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t data);
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c
index e5188411..165374fe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_sigfox.h"
@@ -77,11 +79,11 @@ void MX_Sigfox_Process(void)
 
   /* USER CODE END MX_Sigfox_Process_1 */
   UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
-
   /* USER CODE BEGIN MX_Sigfox_Process_2 */
 
   /* USER CODE END MX_Sigfox_Process_2 */
 }
+
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.h
index a8c87594..7245c333 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_sigfox.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SIGFOX_H__
@@ -38,6 +40,7 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 #define DEFAULT_RC SFX_RC1
 /* USER CODE BEGIN EC */
+
 /* USER CODE END EC */
 
 /* External variables --------------------------------------------------------*/
@@ -53,15 +56,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Sigfox Application
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Init(void);
 
 /**
   * @brief  entry Sigfox Process or scheduling
-  * @param None
-  * @retval None
   */
 void MX_Sigfox_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c
index f7a3f4fe..77f78b2d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app.c
@@ -16,8 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
+
 #include "st_sigfox_api.h"
 #include "sgfx_app.h"
 #include "sgfx_app_version.h"
@@ -31,12 +34,12 @@
 #include "stm32_lpm.h"
 #include "stm32_seq.h"
 #include "utilities_def.h"
-#include "sys_sensors.h"
 #include "sigfox_mbwrapper.h"
 #include "sigfox_info.h"
 #include "mbmuxif_sys.h"
 
 /* USER CODE BEGIN Includes */
+#include "sys_sensors.h"
 
 /* USER CODE END Includes */
 
@@ -63,7 +66,8 @@ extern RadioEvents_t RfApiRadioEvents;
 
 /* Private variables ---------------------------------------------------------*/
 static SigfoxCallback_t SigfoxCallbacks = { SYS_GetBatteryLevel,
-                                            SYS_GetTemperatureLevel};
+                                            SYS_GetTemperatureLevel
+                                          };
 
 /* USER CODE BEGIN PV */
 
@@ -72,9 +76,8 @@ static SigfoxCallback_t SigfoxCallbacks = { SYS_GetBatteryLevel,
 /* Private function prototypes -----------------------------------------------*/
 static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc);
 
-static void SendSigfox(void);
-
 /* USER CODE BEGIN PFP */
+static void SendSigfox(void);
 
 /* USER CODE END PFP */
 
@@ -82,14 +85,18 @@ static void SendSigfox(void);
 
 void Sigfox_Init(void)
 {
-  /* USER CODE BEGIN Sigfox_Init_1 */
-
-  /* USER CODE END Sigfox_Init_1 */
-  sfx_u8 error = 0;
+  sfx_rc_enum_t sfx_rc = SFX_RC1;
+  sfx_error_t error = 0;
   SigfoxInfo_t *SigfoxRegionInfo;
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
   uint32_t sgfx_cm0plus_app;
 
+  /* USER CODE BEGIN Sigfox_Init_1 */
+  BSP_LED_Init(LED_BLUE);
+  BSP_LED_Init(LED_GREEN);
+  /* Initialize button here*/
+  BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
+
   /* Get CM4 Sigfox APP version*/
   APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
           (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
@@ -120,26 +127,15 @@ void Sigfox_Init(void)
           (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
           (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
 
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Init(LED_BLUE);
-  BSP_LED_Init(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_BLUE);
-  SYS_LED_Init(SYS_LED_GREEN);
-#endif /* defined(USE_BSP_DRIVER) */
-
-#if defined(USE_BSP_DRIVER)
-  BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_PB_Init(SYS_BUTTON1, SYS_BUTTON_MODE_EXTI);
-#endif /* defined(USE_BSP_DRIVER) */
+  /* USER CODE END Sigfox_Init_1 */
 
   E2P_Write_Rc(DEFAULT_RC);
+  sfx_rc = E2P_Read_Rc();
 
-  /*OPen Sifox Lib*/
-  error = st_sigfox_open(E2P_Read_Rc());
+  /*Open Sigfox library */
+  error = st_sigfox_open(sfx_rc);
 
-  /* Init SigfoxInfo capabilities table (redondant: Cm0 is supposed to have done it already) */
+  /* Init SigfoxInfo capabilities table (redundant: Cm0 is supposed to have done it already) */
   SigfoxInfo_Init();
 
   SigfoxRegionInfo = SigfoxInfo_GetPtr();
@@ -149,9 +145,9 @@ void Sigfox_Init(void)
     while (1) {} /* At least one region shall be defined */
   }
 
-  /* Register get Battery and Get temp functions */
+  /* Register GetBatteryLevel and GetTemperatureLevel functions */
   Sigfox_Register(&SigfoxCallbacks);
-
+  /* USER CODE BEGIN Sigfox_Init_ErrorCheck */
   if (1U == E2P_Read_AtEcho())
   {
     if (error == SFX_ERR_NONE)
@@ -160,81 +156,15 @@ void Sigfox_Init(void)
     }
     else
     {
-      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: %d\n\r\n\r", error);
+      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: 0x%04X\n\r\n\r", error);
     }
   }
-
-  /* Put radio in Sleep waiting next cmd */
-  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_Pb), UTIL_SEQ_RFU, SendSigfox);
+  /* USER CODE END Sigfox_Init_ErrorCheck */
   /* USER CODE BEGIN Sigfox_Init_2 */
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_Pb), UTIL_SEQ_RFU, SendSigfox);
 
   /* USER CODE END Sigfox_Init_2 */
 }
-
-#if defined(USE_BSP_DRIVER)
-void BSP_PB_Callback(Button_TypeDef Button)
-{
-  /* USER CODE BEGIN BSP_PB_Callback_1 */
-
-  /* USER CODE END BSP_PB_Callback_1 */
-#warning: adapt stm32wlxx_it.c to call BSP_PB_IRQHandler if you want to use BSP
-  switch (Button)
-  {
-    case  BUTTON_SW1:
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_Pb), CFG_SEQ_Prio_0);
-      break;
-    default:
-      break;
-  }
-  /* USER CODE BEGIN BSP_PB_Callback_1 */
-
-  /* USER CODE END BSP_PB_Callback_1 */
-}
-#elif defined(MX_BOARD_PSEUDODRIVER)
-/* Note: Current MX does not support EXTI IP neither BSP. */
-/* In order to get a push button IRS by code automatically generated */
-/* this function is today the only available possibility. */
-/* Calling BSP_PB_Callback() from here it shortcuts the BSP. */
-/* If users wants to go through the BSP, it can remove BSP_PB_Callback() from here */
-/* and add a call to BSP_PB_IRQHandler() in the USER CODE SESSION of the */
-/* correspondent EXTIn_IRQHandler() in the stm32wlxx_it.c */
-void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
-{
-  /* USER CODE BEGIN HAL_GPIO_EXTI_Callback_1 */
-
-  /* USER CODE END HAL_GPIO_EXTI_Callback_1 */
-  switch (GPIO_Pin)
-  {
-    case  SYS_BUTTON1_PIN:
-      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialised */
-      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_Pb), CFG_SEQ_Prio_0);
-      /* USER CODE BEGIN EXTI_Callback_2 */
-
-      /* USER CODE END EXTI_Callback_2 */
-      break;
-    case  SYS_BUTTON2_PIN:
-      /* USER CODE BEGIN EXTI_Callback_3 */
-
-      /* USER CODE END EXTI_Callback_3 */
-      break;
-    /* USER CODE BEGIN EXTI_Callback_4 */
-
-    /* USER CODE END EXTI_Callback_4 */
-    default:
-      /* USER CODE BEGIN EXTI_Callback_5 */
-
-      /* USER CODE END EXTI_Callback_5 */
-
-      break;
-  }
-  /* USER CODE BEGIN EXTI_Callback_6 */
-
-  /* USER CODE END EXTI_Callback_6 */
-}
-#else
-#error user to provide its board code or to call his board driver functions
-#endif /* defined(USE_BSP_DRIVER) */
-
 /* USER CODE BEGIN EF */
 
 /* USER CODE END EF */
@@ -334,6 +264,9 @@ static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc)
       error = SIGFOX_API_open(&SgfxRc);
       break;
     }
+    /* USER CODE BEGIN st_sigfox_open_case */
+
+    /* USER CODE END st_sigfox_open_case */
     default:
     {
       error = SFX_ERR_API_OPEN;
@@ -347,11 +280,33 @@ static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc)
   /* USER CODE END st_sigfox_open_2 */
 }
 
-static void SendSigfox(void)
+/* USER CODE BEGIN PrFD */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
+/* In order to get a push button IRS by code automatically generated */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to really go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
-  /* USER CODE BEGIN SendSigfox_1 */
+  switch (GPIO_Pin)
+  {
+    case  BUTTON_SW1_PIN:
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_Pb), CFG_SEQ_Prio_0);
+      break;
+    case  BUTTON_SW2_PIN:
+      break;
+    case  BUTTON_SW3_PIN:
+      break;
+    default:
+      break;
+  }
+}
 
-  /* USER CODE END SendSigfox_1 */
+static void SendSigfox(void)
+{
   uint8_t ul_msg[12] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11};
   uint8_t dl_msg[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
   uint32_t  ul_size = 0;
@@ -376,28 +331,15 @@ static void SendSigfox(void)
   ul_msg[ul_size++] = (humidity >> 8) & 0xFF;
   ul_msg[ul_size++] = humidity & 0xFF;
 
-#if defined(USE_BSP_DRIVER)
   BSP_LED_On(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_On(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
 
   SIGFOX_API_send_frame(ul_msg, ul_size, dl_msg, nbTxRepeatFlag, SFX_FALSE);
 
-#if defined(USE_BSP_DRIVER)
   BSP_LED_Off(LED_BLUE);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Off(SYS_LED_BLUE);
-#endif /* defined(USE_BSP_DRIVER) */
 
   APP_LOG(TS_OFF, VLEVEL_L, " done\n\r");
-  /* USER CODE BEGIN SendSigfox_2 */
-
-  /* USER CODE END SendSigfox_2 */
 }
 
-/* USER CODE BEGIN PrFD */
-
 /* USER CODE END PrFD */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.h
index 96c02e95..e9432537 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_APP_H__
 #define __SGFX_APP_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h
index b372c642..a52b63af 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c
index 2433eb96..6a2ab9e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
@@ -23,6 +25,8 @@
 #include "system_mbwrapper.h"
 #include "st_sigfox_api.h"
 #include "se_nvm.h"
+#include "sys_conf.h"
+#include "utilities_conf.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -74,8 +78,19 @@ enum
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief        Read Sigfox Configuration from eeprom
+  * @param addr   variable virtual address
+  * @param data   pointer to a 32-bit word (allocated by the caller) containing the
+  *               variable value in case of success.
+  */
 static void E2P_Read(e_EE_ID addr, uint32_t *data);
 
+/**
+  * @brief        Write Sigfox Configuration to eeprom
+  * @param addr   variable virtual address
+  * @param data   32-bit data word to be written
+  */
 static void E2P_Write(e_EE_ID addr, uint32_t data);
 
 /* USER CODE BEGIN PFP */
@@ -130,7 +145,7 @@ void E2P_RestoreFs(void)
   E2P_Write(EE_MCU_NVM_2_ID, 0);
   E2P_Write(EE_MCU_NVM_3_ID, 0);
   E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, 0);
-  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, 0);
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, VERBOSE_LEVEL);
 
   /* USER CODE BEGIN E2P_RestoreFs_2 */
 
@@ -370,9 +385,9 @@ void E2P_Write_VerboseLevel(uint8_t verboselevel)
 
   E2P_Write(EE_SGFX_VERBOSELEVEL_ID, (uint32_t) verboselevel);
 
-  /* USER CODE BEGIN E2P_Write_VerboseLevel_1 */
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_2 */
 
-  /* USER CODE END E2P_Write_VerboseLevel_1 */
+  /* USER CODE END E2P_Write_VerboseLevel_2 */
 }
 
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
@@ -522,7 +537,7 @@ E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len)
   E2P_Read(EE_SE_NVM_1_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_2_ID, &data_from_eeprom);
-  read_data[i++] = (sfx_u8) data_from_eeprom;;
+  read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_3_ID, &data_from_eeprom);
   read_data[i++] = (sfx_u8) data_from_eeprom;
   E2P_Read(EE_SE_NVM_4_ID, &data_from_eeprom);
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h
index 10599cbd..e6993155 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sgfx_eeprom_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SGFX_EEPROM_IF_H__
@@ -73,7 +75,7 @@ typedef enum
   EE_MCU_NVM_2_ID,
   EE_MCU_NVM_3_ID,
   /*Public ID e.g. visible on M4 starting at EE_ID=EE_RSSI_CAL_ID */
-  EE_RSSI_CAL_ID= 100,
+  EE_RSSI_CAL_ID = 100,
   EE_AT_ECHO_ID,
   EE_TX_POWER_RC1_ID,
   EE_TX_POWER_RC2_ID,
@@ -119,182 +121,164 @@ typedef enum
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_Init(void);
 
 /*!
  * @brief Initializes the Eeprom
  * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval None
  */
 void E2P_RestoreFs(void);
 
 /*!
- * @brief Read Output Power
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Read Output Power
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @return Output Power
  */
 int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Write Output Power to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Output Power
- * @retval None
+ * @brief  Write Output Power to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @param  power Output Power
  */
 void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power);
 
 /*!
- * @brief Read Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval Region Configuration RC
+ * @brief  Read Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return Region Configuration RC
  */
 sfx_rc_enum_t E2P_Read_Rc(void);
 
 /*!
- * @brief Write Region Configuration RC from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  Region Configuration RC
- * @retval None
+ * @brief  Write Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
  */
 void E2P_Write_Rc(sfx_rc_enum_t SgfxRc);
 
 /*!
- * @brief Read Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Read Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Write Region Configuration words depending on RC
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  RC
- * @param  Configuration words
- * @retval None
+ * @brief  Write Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
  */
 void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
 
 /*!
- * @brief Read rssi calibration value from eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
- * @retval rssi calibration value
+ * @brief  Read rssi calibration value from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return rssi calibration value
  */
 int16_t E2P_Read_RssiCal(void);
 
 /*!
- * @brief Writes rssi calibration value to eeprom
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  rssi calibration value
- * @retval None
+ * @brief  Writes rssi calibration value to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  rssi_cal calibration value
  */
 void E2P_Write_RssiCal(int16_t rssi_cal);
 
 /*!
- * @brief Read Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval at_echo
  */
 uint32_t E2P_Read_AtEcho(void);
 
 /*!
- * @brief Write Region At echo setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  at_echo
- * @retval None
  */
 void E2P_Write_AtEcho(uint32_t at_echo);
 
 /*!
- * @brief Read KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval KeyType
  */
 sfx_key_type_t E2P_Read_KeyType(void);
 
 /*!
- * @brief Write KeyType setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  KeyType
- * @retval None
+ * @brief  Write KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  key_type KeyType setting
  */
 void E2P_Write_KeyType(sfx_key_type_t key_type);
 
 /*!
- * @brief Read EncryptionFlag setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  None
+ * @brief  Read EncryptionFlag setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval encryption_flag
  */
 uint8_t E2P_Read_EncryptionFlag(void);
 
 /*!
- * @brief Write EncryptionFlag  setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Write EncryptionFlag  setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  encryption_flag
- * @retval None
  */
 void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len);
 
 /*!
- * @brief Write Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  SEnvm
+ * @brief  Write Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write SEnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Read MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data,  uint32_t len);
 
 /*!
- * @brief Write Region MCUnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param  MCUnvm
+ * @brief  Write Region MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write MCUnvm
  * @param  len
  * @retval error status
  */
 E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len);
 
 /*!
- * @brief Read Region SEnvm setting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
- * @param   None
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @retval the VL
  */
 uint8_t E2P_Read_VerboseLevel(void);
 
 /*!
- * @brief Read verbose levelsetting
- * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @brief  Read verbose levelsetting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
  * @param  verboselevel
- * @retval None
  */
 void E2P_Write_VerboseLevel(uint8_t verboselevel);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h
index 3047bfbd..97cbfbee 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    se_nvm.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SE_NVM_H__
@@ -67,48 +69,46 @@ typedef enum
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief This function reads data pointed by read_data to non
-  * volatile memory
+  * @brief     This function reads data pointed by read_data to non volatile memory
   *
-  * @param [IN] sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] read_data Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief This function write data pointed by data_to_write to non
-  * volatile memory
+  * @brief     This function write data pointed by data_to_write to non volatile memory
   *
-  * @param [IN] sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
-  * @retval SFX_ERR_NONE:                      No error
-  * @retval SE_ERR_API_SE_NVM:                 SE nvmem error
+  * @param[in] data_to_write Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
   */
 sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE]);
 
 /**
-  * @brief Get the active encryption payload flag
-  * @retval encryption_flag 0:Off, 1:On
+  * @brief     Get the active encryption payload flag
+  * @retval    encryption_flag 0:Off, 1:On
   */
 sfx_u8 SE_NVM_get_encrypt_flag(void);
 
 /**
-  * @brief Set the active encryption payload flag
-  * @param [IN]  encryption_flag 0:Off, 1:On
+  * @brief     Set the active encryption payload flag
+  * @param[in] encryption_flag 0:Off, 1:On
   */
 void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag);
 
 /**
-  * @brief Get the active encryption key
-  * @retval  sfx_key_type_t key: public or private
+  * @brief     Get the active encryption key
+  * @return    key public or private
   */
 sfx_key_type_t SE_NVM_get_key_type(void);
 
 /**
-  * @brief Set the active encryption key
-  * @param [IN]  sfx_key_type_t key: public or private
+  * @brief     Set the active encryption key
+  * @param[in] keyType key public or private
   */
-void  SE_NVM_set_key_type(sfx_key_type_t keyType);
+void SE_NVM_set_key_type(sfx_key_type_t keyType);
 
 /* USER CODE BEGIN EFP */
 
@@ -120,4 +120,3 @@ void  SE_NVM_set_key_type(sfx_key_type_t keyType);
 #endif /* __SE_NVM_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/board_resources.h
deleted file mode 100644
index 8cf7f3ed..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/board_resources.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON1_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON3_EXTI_IRQn              EXTI15_4_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
index 8dae344f..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     150U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/features_info.h
index 6604ead3..9df16d26 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/features_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/features_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTEM_INFO_H
@@ -36,7 +38,7 @@ extern "C" {
 /**
   * @brief Feature enumeration
   * @note This is the list of all available feature so far,
-          the one available in a fiven build are listed in the Feat_Info_Table[]
+          the one available in a given build are listed in the Feat_Info_Table[]
           to keep compatibility, in order to add a feature
           use a new value to the bottom without changing the existing order
   */
@@ -115,7 +117,6 @@ typedef struct
 /* Exported functions ------------------------------------------------------- */
 /**
   * @brief  Init configuration params by calling specific feature xxx_info.c
-  * @return void
   */
 void FEAT_INFO_Init(void);
 /**
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h
index 2874d9de..84cb7539 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux_table.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_TABLE_H__
@@ -48,12 +50,14 @@ typedef enum
   MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
 } MBMUX_ComType_t;
 
+/* Shared memory tables */
+
 typedef struct
 {
   uint32_t MsgId;
   void (*MsgCm4Cb)(void *ComObj);
-  void (*MsgCm0plusCb)(void *ComObj);
-  uint16_t BufSize;      /*!<  size of the array given by the applic */
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
   uint16_t ParamCnt;     /*!<  nr of words composing the message */
   uint32_t *ParamBuf;
   uint32_t ReturnVal;    /*!<  only used in RX */
@@ -66,7 +70,19 @@ typedef struct
   uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
   __IO uint16_t           SynchronizeCpusAtBoot;
   uint16_t                ChipRevId;
-} MBMUX_ComTable_t;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
 
 /* USER CODE BEGIN ET */
 
@@ -87,3 +103,5 @@ typedef struct
 #endif
 
 #endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/msg_id.h
index d0b5d1ae..a2cc312e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/msg_id.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/msg_id.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    msg_id.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MSG_ID_H__
@@ -98,7 +100,7 @@ typedef enum
   RADIO_STANDBY_ID,
   RADIO_RX_ID,
   RADIO_START_CAD_ID,
-  RADIO_SET_TX_CONTINOUS_WAVE_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
   RADIO_RSSI_ID,
   RADIO_WRITE_ID,
   RADIO_READ_ID,
@@ -192,3 +194,5 @@ typedef enum
 #endif
 
 #endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/sigfox_info.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/sigfox_info.h
index 3389cab5..099d2c78 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/sigfox_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/MbMux/sigfox_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sigfox_info.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 #ifndef __SIGFOX_INFO_H__
 #define __SIGFOX_INFO_H__
@@ -61,16 +63,13 @@ typedef struct
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the SigfoxInfo table
-  * @param none
-  * @retval  none
+  * @brief initialize the SigfoxInfo capabilities table
   */
 void SigfoxInfo_Init(void);
 
 /**
-  * @brief returns the pointer to the SigfoxMacInfo table
-  * @param none
-  * @retval  SigfoxMacInfoTable pointer
+  * @brief returns the pointer to the SigfoxInfo capabilities table
+  * @return  SigfoxInfo_t pointer
   */
 SigfoxInfo_t *SigfoxInfo_GetPtr(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/sys_debug.c
index 807e1bb4..d01a65d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/sys_debug.c
@@ -41,9 +41,6 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
-#define DBGMCU_LPM   0   /* if 1 enables/disables the Debug Module during LowPower modes */
-                         /* if 0 it does not modify the DBGMCU_CR_DBG registers */
-                         /* in DualCore few issues are under investigation when 1 */
 
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
@@ -62,12 +59,90 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
   GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
@@ -75,57 +150,49 @@ void DBG_Init(void)
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  /* make sure a pin is not used simultaneusly by the two cores */
-  /* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
 #if defined(CORE_CM4)
 
   /* Enable the GPIO_LINES Clock */
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
 
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+#else /* CORE_CM0PLUS */
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-#if defined (DBGMCU_LPM) && ( DBGMCU_LPM == 1 )
-  /* careful does not work correctly in dual core: Bugzilla 71087 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
-#elif defined (DBGMCU_LPM) && ( DBGMCU_LPM == 0 )
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
-#elif !defined (DBGMCU_LPM)
-#error "DBGMCU_LPM not defined or out of range <0,1>"
-#endif /* DBGMCU_LPM */
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
 
-#else /* CORE_CM0PLUS */
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
 
-  /* Enable the GPIO_LINES Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN ;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
+  /* HW alternate functions for monitoring RF */
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -143,7 +210,7 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /* LDO_rdy & BUCK_rdy */
+  /* LDO_rdy & BUCK_rdy (SMPS) */
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
   GPIO_InitStruct.Pull   = GPIO_NOPULL;
   GPIO_InitStruct.Pin    = (GPIO_PIN_2);
@@ -158,40 +225,29 @@ void DBG_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-#endif /* CORE_CM4 */
+#endif /* CORE_CM0PLUS */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#if defined(CORE_CM4)
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
 #endif /* CORE_CM4 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-  /* USER CODE END DBG_Init_Last */
+  /* USER CODE END DBG_ProbesInit_Last */
 }
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/sys_debug.h
index 162d992f..28890d05 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/sys_debug.h
@@ -43,94 +43,96 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/* make sure a pin is not used simultaneusly by the two cores */
-/* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
 #if defined(CORE_CM0PLUS)
-/**  Definition for Debug Line 1   **/
+
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 #else
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-#endif /* CORE_CM4 */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
 
 /* USER CODE BEGIN EC */
 
@@ -142,49 +144,66 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
 /**
-  * @brief Initializes the debug
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewd
index 364b4b56..d6c4e81c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewd
@@ -1106,15 +1106,15 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>1</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
-                    <state>0</state>
+                    <state>1</state>
                 </option>
             </data>
         </settings>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewp
index 9b12e178..d306dd10 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewp
@@ -117,7 +117,7 @@
                 <option>
                     <name>GBECoreSlave</name>
                     <version>26</version>
-                    <state>39</state>
+                    <state>35</state>
                 </option>
                 <option>
                     <name>OGUseCmsis</name>
@@ -226,6 +226,7 @@
                     <name>CCDefines</name>
                     <state>CORE_CM0PLUS</state>
                     <state>KMS_ENABLED</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                     <state>MBEDTLS_CONFIG_FILE="mbedtls_config.h"</state>
                 </option>
@@ -358,8 +359,9 @@
                     <state>$PROJ_DIR$/../CM0PLUS/Sigfox/Target</state>
                     <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
@@ -1066,60 +1068,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\flash_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\lptim.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\mn_lptim_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1127,87 +1075,147 @@
             </file>
         </group>
         <group>
-            <name>KMS</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
-                </file>
-            </group>
-        </group>
-        <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>Sigfox_PushButton_DualCore_CM0PLUS</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sigfox.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_mbwrapper.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Sigfox</name>
-            <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\app_sigfox.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\ee.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_cstimer.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_eeprom_if.c</name>
-                </file>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ca_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\flash_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\kms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\lptim.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\mn_lptim_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\nvms_low_level.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>KMS</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sigfox.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_mbwrapper.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Sigfox</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\app_sigfox.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\ee.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_cstimer.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_eeprom_if.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mcu_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mn_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\radio_board_if.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\rf_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\se_nvm.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\sgfx_credentials.c</name>
+                        </file>
+                    </group>
+                </group>
             </group>
             <group>
-                <name>Target</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mcu_api.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mn_api.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\radio_board_if.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\rf_api.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\se_nvm.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\sgfx_credentials.c</name>
-                </file>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
         </group>
     </group>
@@ -1221,9 +1229,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>Sigfox_PushButton_DualCore_CM0PLUS</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1302,6 +1307,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1395,6 +1406,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_vm_storage.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\HAL\mac_stm32hal.c</name>
             </file>
@@ -1420,16 +1434,16 @@
         <group>
             <name>Sigfox</name>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.8.1_SE_FDL_MON.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.10.0_SE_FDL_MON.a</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\Sgfx-Cmac-V1.0.0-CM0-O3.a</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.0-CM0-O3.a</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.1-CM0-O3.a</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_aes.c</name>
@@ -1446,6 +1460,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewd
index 6105fc0a..fe027c72 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewd
@@ -44,7 +44,7 @@
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -112,7 +112,7 @@
                 </option>
                 <option>
                     <name>FlashLoadersV3</name>
-                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCImagesSuppressCheck1</name>
@@ -184,7 +184,7 @@
                 </option>
                 <option>
                     <name>OCMulticoreMaster</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>OCMulticorePort</name>
@@ -192,15 +192,15 @@
                 </option>
                 <option>
                     <name>OCMulticoreWorkspace</name>
-                    <state>$PROJ_DIR$\Project.eww</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveProject</name>
-                    <state>Sigfox_PushButton_DualCore_CM0PLUS</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveConfiguration</name>
-                    <state>MBMUX_STM32WL_M0_FLASH</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCDownloadExtraImage</name>
@@ -1106,11 +1106,11 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>0</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewp
index ffe8c924..2b4cf64b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewp
@@ -356,8 +356,9 @@
                     <state>$PROJ_DIR$/../CM4/Sigfox/Target</state>
                     <state>$PROJ_DIR$/../CM4/MbMux</state>
                     <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
@@ -1019,7 +1020,7 @@
                 </option>
                 <option>
                     <name>IlinkTrustzoneImportLibraryOut</name>
-                    <state>Sigfox_PushButton_DualCore_CM4_import_lib.o</state>
+                    <state>###Unitialized###</state>
                 </option>
             </data>
         </settings>
@@ -1052,54 +1053,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1107,51 +1060,105 @@
             </file>
         </group>
         <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_kms.c</name>
-                <excluded>
-                    <configuration>Sigfox_PushButton_DualCore_CM4</configuration>
-                </excluded>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sigfox.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\sigfox_mbwrapper.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\system_mbwrapper.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Sigfox</name>
+            <name>User</name>
             <group>
-                <name>App</name>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\Sigfox\App\app_sigfox.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_app.c</name>
-                </file>
-                <file>
-                    <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_eeprom_if.c</name>
-                </file>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sigfox.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\sigfox_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\system_mbwrapper.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Sigfox</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\app_sigfox.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_app.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_eeprom_if.c</name>
+                        </file>
+                    </group>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
             </group>
         </group>
     </group>
@@ -1165,14 +1172,14 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>Sigfox_PushButton_DualCore_CM4</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
                     <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
                 </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
             </group>
         </group>
         <group>
@@ -1234,6 +1241,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
             </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
index a6cf0145..cd6560d5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
index 6f11cd34..3e66df44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -11,10 +11,10 @@ define symbol __ICFEDIT_region_ROM_end__      = 0x0803CFFF;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_start__   = 0x0803E500;
 define symbol __ICFEDIT_region_User_Keys_region_ROM_end__     = 0x0803E7FF;
 /***** SRAM2 shared allocated by M0+ *****/
-define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x2000B000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000BFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20009000;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20009FFF;
 /***** SRAM2 dedicated to M0+ *****/
-define symbol __ICFEDIT_region_RAM2_start__   = 0x2000C000;
+define symbol __ICFEDIT_region_RAM2_start__   = 0x2000A000;
 define symbol __ICFEDIT_region_RAM2_end__     = 0x2000FFFF;
 
 /* KMS Data Storage (NVMS) region */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
index e88361e7..cb0d93d2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
@@ -13,7 +13,7 @@ define symbol __ICFEDIT_region_RAM_start__    = 0x20000000;
 define symbol __ICFEDIT_region_RAM_end__      = 0x20007FFF;
 /***** SRAM2 shared allocated by M4 *****/
 define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20008000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000AFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20008FFF;
 
 /*-Sizes-*/
 define symbol __ICFEDIT_size_cstack__ = 0x1000;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvoptx
index 5ab65411..8f473093 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>12000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -113,19 +113,39 @@
         <tDllPa></tDllPa>
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
-        <tIfile></tIfile>
+        <tIfile>.\STM32WL_CM0+.ini</tIfile>
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
-          <Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32WLxx_CM0+ -FL040000 -FS08000000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O206 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Name>-U002F003A3038510534333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,508 +203,504 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Sigfox/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/flash_if.c</PathWithFileName>
-      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/app_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/ee.c</PathWithFileName>
+      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Sigfox/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/lptim.c</PathWithFileName>
-      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/mcu_api.c</PathWithFileName>
+      <FilenameWithoutPath>mcu_api.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/mn_lptim_if.c</PathWithFileName>
-      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/mn_api.c</PathWithFileName>
+      <FilenameWithoutPath>mn_api.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
-      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/rf_api.c</PathWithFileName>
+      <FilenameWithoutPath>rf_api.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/se_nvm.c</PathWithFileName>
+      <FilenameWithoutPath>se_nvm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>18</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/KMS/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
-      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/lptim.c</PathWithFileName>
+      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/features_info.c</PathWithFileName>
-      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmux.c</PathWithFileName>
-      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/mn_lptim_if.c</PathWithFileName>
+      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/sigfox_info.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_info.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/sigfox_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/Sigfox/App</GroupName>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/App/app_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/features_info.c</PathWithFileName>
+      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/App/ee.c</PathWithFileName>
-      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/sigfox_info.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Sigfox/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/mcu_api.c</PathWithFileName>
-      <FilenameWithoutPath>mcu_api.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/mn_api.c</PathWithFileName>
-      <FilenameWithoutPath>mn_api.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/rf_api.c</PathWithFileName>
-      <FilenameWithoutPath>rf_api.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/se_nvm.c</PathWithFileName>
-      <FilenameWithoutPath>se_nvm.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>39</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/sigfox_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -697,8 +713,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>40</FileNumber>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -717,8 +733,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>41</FileNumber>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -729,8 +745,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
-      <FileNumber>42</FileNumber>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -743,31 +759,35 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
       <FileNumber>44</FileNumber>
@@ -775,8 +795,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -787,8 +807,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -799,8 +819,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -811,8 +831,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -823,8 +843,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -835,8 +855,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -847,8 +867,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -859,8 +879,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -871,8 +891,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -883,8 +903,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -907,8 +927,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -919,8 +939,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -931,8 +951,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -943,8 +963,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -955,8 +975,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -967,8 +987,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -979,8 +999,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -991,8 +1011,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1003,15 +1023,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Middlewares/KMS</GroupName>
+    <GroupName>Drivers/CMSIS</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -1023,391 +1043,391 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/KMS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
-      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>73</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
-      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>74</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>75</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>76</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>77</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>78</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
-      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_vm_storage.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>79</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
-      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
+      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>80</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
-      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
+      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>81</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
-      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>82</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
-      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>83</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
-      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>84</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
-      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>85</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
-      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</PathWithFileName>
+      <FilenameWithoutPath>ca_if_utils.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>86</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</PathWithFileName>
-      <FilenameWithoutPath>kms_interface.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>87</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
-      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>88</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
-      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>89</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
-      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>90</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>91</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
-      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>92</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
-      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
+      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>93</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>mac_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_aes_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>94</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</PathWithFileName>
-      <FilenameWithoutPath>rsa_stm32hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_ecc_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>95</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</PathWithFileName>
-      <FilenameWithoutPath>tkms.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_hash_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/mbed-crypto</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>12</GroupNumber>
       <FileNumber>96</FileNumber>
@@ -1415,8 +1435,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
-      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rng_mbed.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1427,14 +1447,34 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</PathWithFileName>
+      <FilenameWithoutPath>ca_rsa_mbed.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>98</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha1.c</PathWithFileName>
       <FilenameWithoutPath>sha1.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>12</GroupNumber>
-      <FileNumber>98</FileNumber>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>99</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1444,6 +1484,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>100</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -1453,32 +1505,32 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>99</FileNumber>
-      <FileType>4</FileType>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>101</FileNumber>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</PathWithFileName>
-      <FilenameWithoutPath>SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_aes.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>100</FileNumber>
-      <FileType>4</FileType>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>102</FileNumber>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a</PathWithFileName>
-      <FilenameWithoutPath>SFX_LIB_V2.8.1_SE_FDL_MON.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>101</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>103</FileNumber>
       <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1489,38 +1541,38 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>102</FileNumber>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>104</FileNumber>
       <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a</PathWithFileName>
-      <FilenameWithoutPath>Sgfx-Monarch-V2.0.0-CM0-O3.a</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a</PathWithFileName>
+      <FilenameWithoutPath>Sgfx-Monarch-V2.0.1-CM0-O3.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>103</FileNumber>
-      <FileType>1</FileType>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>105</FileNumber>
+      <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_aes.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_LIB_V2.10.0_SE_FDL_MON.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>13</GroupNumber>
-      <FileNumber>104</FileNumber>
-      <FileType>1</FileType>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>106</FileNumber>
+      <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1533,26 +1585,38 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>105</FileNumber>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>107</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>14</GroupNumber>
-      <FileNumber>106</FileNumber>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>108</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>109</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1565,8 +1629,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>107</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>110</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1577,86 +1641,86 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>108</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>111</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>109</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>112</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>110</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>113</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>111</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>114</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>112</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>115</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>113</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>116</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>15</GroupNumber>
-      <FileNumber>114</FileNumber>
+      <GroupNumber>16</GroupNumber>
+      <FileNumber>117</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvprojx
index 1da8e9d0..3904f13c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvprojx
@@ -16,14 +16,14 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM0P</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <FlashDriverDll></FlashDriverDll>
           <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <RegisterFile></RegisterFile>
           <MemoryEnv></MemoryEnv>
           <Cmp></Cmp>
           <Asm></Asm>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>Sigfox_PushButton_DualCore_CM0PLUS\Exe\</OutputDirectory>
+          <OutputDirectory>Sigfox_PushButton_DualCore_CM0PLUS\</OutputDirectory>
           <OutputName>Sigfox_PushButton_DualCore_CM0PLUS</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -110,7 +110,7 @@
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDllArguments>-REMAP</SimDllArguments>
           <SimDlgDll>DARMCM1.DLL</SimDlgDll>
           <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
           <TargetDllName>SARMCM3.DLL</TargetDllName>
@@ -134,11 +134,11 @@
             <RunIndependent>0</RunIndependent>
             <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
+            <DriverSelection>4101</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -186,7 +186,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <hadIRAM2>0</hadIRAM2>
+            <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>1</useUlib>
@@ -194,7 +194,7 @@
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
             <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
+            <RwSelD>4</RwSelD>
             <CodeSel>0</CodeSel>
             <OptFeed>0</OptFeed>
             <NoZi1>0</NoZi1>
@@ -211,7 +211,7 @@
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
             <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
+            <Im2Chk>1</Im2Chk>
             <OnChipMemories>
               <Ocm1>
                 <Type>0</Type>
@@ -245,13 +245,13 @@
               </Ocm6>
               <IRAM>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -275,8 +275,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -300,13 +300,13 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x2000c000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -337,9 +337,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-fshort-enums</MiscControls>
-              <Define>CORE_CM0PLUS,KMS_ENABLED,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
+              <Define>CORE_CM0PLUS,KMS_ENABLED,USE_HAL_DRIVER,STM32WL55xx,MBEDTLS_CONFIG_FILE=&lt;mbedtls_config.h&gt;</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/Sigfox/App;../CM0PLUS/Sigfox/Target;../CM0PLUS/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/Sigfox/App;../CM0PLUS/Sigfox/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST;../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,278 +381,227 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>board_resources.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
             <File>
-              <FileName>ca_low_level.c</FileName>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Sigfox/App</GroupName>
+          <Files>
             <File>
-              <FileName>flash_if.c</FileName>
+              <FileName>app_sigfox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/flash_if.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/App/app_sigfox.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>ee.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/App/ee.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>sgfx_cstimer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</FilePath>
             </File>
             <File>
-              <FileName>kms_low_level.c</FileName>
+              <FileName>sgfx_eeprom_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Sigfox/Target</GroupName>
+          <Files>
             <File>
-              <FileName>lptim.c</FileName>
+              <FileName>sgfx_credentials.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/lptim.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</FilePath>
             </File>
             <File>
-              <FileName>main.c</FileName>
+              <FileName>mcu_api.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/mcu_api.c</FilePath>
             </File>
             <File>
-              <FileName>mn_lptim_if.c</FileName>
+              <FileName>mn_api.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/mn_lptim_if.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/mn_api.c</FilePath>
             </File>
             <File>
-              <FileName>nvms_low_level.c</FileName>
+              <FileName>radio_board_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/radio_board_if.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>rf_api.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/rf_api.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>se_nvm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM0PLUS/Sigfox/Target/se_nvm.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+          <Files>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>app_kms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>main.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>kms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/kms_low_level.c</FilePath>
             </File>
             <File>
-              <FileName>timer_if.c</FileName>
+              <FileName>nvms_low_level.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/nvms_low_level.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/ca_low_level.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/KMS/App</GroupName>
-          <Files>
             <File>
-              <FileName>app_kms.c</FileName>
+              <FileName>lptim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/lptim.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MbMux</GroupName>
-          <Files>
             <File>
-              <FileName>features_info.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/features_info.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
             </File>
             <File>
-              <FileName>mbmux.c</FileName>
+              <FileName>flash_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/flash_if.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_kms.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_radio.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_radio.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_sigfox.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_sigfox.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_sys.c</FileName>
+              <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_sys.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_trace.c</FileName>
+              <FileName>mn_lptim_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/mbmuxif_trace.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/mn_lptim_if.c</FilePath>
             </File>
             <File>
-              <FileName>radio_mbwrapper.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/radio_mbwrapper.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>sigfox_info.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/sigfox_info.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>sigfox_mbwrapper.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/MbMux/sigfox_mbwrapper.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/Sigfox/App</GroupName>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
           <Files>
             <File>
-              <FileName>app_sigfox.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/App/app_sigfox.c</FilePath>
-            </File>
-            <File>
-              <FileName>ee.c</FileName>
+              <FileName>features_info.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/App/ee.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/features_info.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_cstimer.c</FileName>
+              <FileName>sigfox_info.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/sigfox_info.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_eeprom_if.c</FileName>
+              <FileName>mbmux.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Sigfox/Target</GroupName>
-          <Files>
             <File>
-              <FileName>mcu_api.c</FileName>
+              <FileName>mbmuxif_sigfox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/mcu_api.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_sigfox.c</FilePath>
             </File>
             <File>
-              <FileName>mn_api.c</FileName>
+              <FileName>mbmuxif_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/mn_api.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_radio.c</FilePath>
             </File>
             <File>
-              <FileName>radio_board_if.c</FileName>
+              <FileName>mbmuxif_sys.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/radio_board_if.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_sys.c</FilePath>
             </File>
             <File>
-              <FileName>rf_api.c</FileName>
+              <FileName>mbmuxif_trace.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/rf_api.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_trace.c</FilePath>
             </File>
             <File>
-              <FileName>se_nvm.c</FileName>
+              <FileName>radio_mbwrapper.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/se_nvm.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/radio_mbwrapper.c</FilePath>
             </File>
             <File>
-              <FileName>sgfx_credentials.c</FileName>
+              <FileName>sigfox_mbwrapper.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</FilePath>
+              <FilePath>../CM0PLUS/MbMux/sigfox_mbwrapper.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -682,37 +631,32 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
             <File>
-              <FileName>stm32wlxx_hal.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_dma.c</FileName>
@@ -725,24 +669,29 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_ipcc.c</FileName>
@@ -750,49 +699,59 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_lptim.c</FileName>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_lptim.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -800,175 +759,226 @@
           <GroupName>Middlewares/KMS</GroupName>
           <Files>
             <File>
-              <FileName>ca_aes.c</FileName>
+              <FileName>kms_der_x962.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
             </File>
             <File>
-              <FileName>ca_aes_hal.c</FileName>
+              <FileName>kms_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>ca_aes_mbed.c</FileName>
+              <FileName>kms_entry.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
             </File>
             <File>
-              <FileName>ca_core.c</FileName>
+              <FileName>kms_init.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc.c</FileName>
+              <FileName>kms_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_hal.c</FileName>
+              <FileName>kms_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_ecc_mbed.c</FileName>
+              <FileName>kms_platf_objects.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash.c</FileName>
+              <FileName>kms_digest.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
             </File>
             <File>
-              <FileName>ca_hash_mbed.c</FileName>
+              <FileName>kms_dyn_obj.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
             </File>
             <File>
-              <FileName>ca_if_utils.c</FileName>
+              <FileName>kms_enc_dec.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng.c</FileName>
+              <FileName>kms_key_mgt.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rng_mbed.c</FileName>
+              <FileName>kms_nvm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa.c</FileName>
+              <FileName>kms_sign_verify.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
             </File>
             <File>
-              <FileName>ca_rsa_hal.c</FileName>
+              <FileName>kms_vm_storage.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>2</AlwaysBuild>
+                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
+                  <PublicsOnly>2</PublicsOnly>
+                  <StopOnExitCode>11</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <uGnu>2</uGnu>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls></MiscControls>
+                      <Define></Define>
+                      <Undefine></Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
             </File>
             <File>
-              <FileName>ca_rsa_mbed.c</FileName>
+              <FileName>kms_interface.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
             </File>
             <File>
-              <FileName>kms_der_x962.c</FileName>
+              <FileName>tkms.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
             </File>
             <File>
-              <FileName>kms_digest.c</FileName>
+              <FileName>ca_aes.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</FilePath>
             </File>
             <File>
-              <FileName>kms_dyn_obj.c</FileName>
+              <FileName>ca_core.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
             </File>
             <File>
-              <FileName>kms_ecc.c</FileName>
+              <FileName>ca_ecc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</FilePath>
             </File>
             <File>
-              <FileName>kms_enc_dec.c</FileName>
+              <FileName>ca_hash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</FilePath>
             </File>
             <File>
-              <FileName>kms_entry.c</FileName>
+              <FileName>ca_if_utils.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</FilePath>
             </File>
             <File>
-              <FileName>kms_init.c</FileName>
+              <FileName>ca_rng.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</FilePath>
             </File>
             <File>
-              <FileName>kms_interface.c</FileName>
+              <FileName>ca_rsa.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</FilePath>
             </File>
             <File>
-              <FileName>kms_key_mgt.c</FileName>
+              <FileName>ca_aes_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_mem.c</FileName>
+              <FileName>ca_ecc_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_nvm_storage.c</FileName>
+              <FileName>ca_rsa_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_objects.c</FileName>
+              <FileName>mac_stm32hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_platf_objects.c</FileName>
+              <FileName>rsa_stm32hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</FilePath>
             </File>
             <File>
-              <FileName>kms_sign_verify.c</FileName>
+              <FileName>ca_aes_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>mac_stm32hal.c</FileName>
+              <FileName>ca_ecc_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>rsa_stm32hal.c</FileName>
+              <FileName>ca_hash_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</FilePath>
             </File>
             <File>
-              <FileName>tkms.c</FileName>
+              <FileName>ca_rng_mbed.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</FilePath>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</FilePath>
+            </File>
+            <File>
+              <FileName>ca_rsa_mbed.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Middlewares/mbed-crypto</GroupName>
           <Files>
-            <File>
-              <FileName>platform_util.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
-            </File>
             <File>
               <FileName>sha1.c</FileName>
               <FileType>1</FileType>
@@ -979,20 +989,25 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
             </File>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Middlewares/Sigfox</GroupName>
           <Files>
             <File>
-              <FileName>SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FileName>
-              <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a</FilePath>
+              <FileName>sigfox_aes.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</FilePath>
             </File>
             <File>
-              <FileName>SFX_LIB_V2.8.1_SE_FDL_MON.a</FileName>
-              <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a</FilePath>
+              <FileName>sigfox_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
             </File>
             <File>
               <FileName>Sgfx-Cmac-V1.0.0-CM0-O3.a</FileName>
@@ -1000,19 +1015,19 @@
               <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</FilePath>
             </File>
             <File>
-              <FileName>Sgfx-Monarch-V2.0.0-CM0-O3.a</FileName>
+              <FileName>Sgfx-Monarch-V2.0.1-CM0-O3.a</FileName>
               <FileType>4</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a</FilePath>
             </File>
             <File>
-              <FileName>sigfox_aes.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</FilePath>
+              <FileName>SFX_LIB_V2.10.0_SE_FDL_MON.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a</FilePath>
             </File>
             <File>
-              <FileName>sigfox_data.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
+              <FileName>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilePath>
             </File>
           </Files>
         </Group>
@@ -1020,14 +1035,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1040,39 +1060,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1086,8 +1106,8 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
         <targetInfos>
           <targetInfo name="Sigfox_PushButton_DualCore_CM0PLUS"/>
         </targetInfos>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvoptx
index 04846a5d..8df0bdec 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>32000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O2254 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U-O142 -O2766 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,368 +195,364 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>1</tvExp>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
-      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Sigfox/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Sigfox/App/app_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Sigfox/App/sgfx_app.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/sys_sensors.c</PathWithFileName>
-      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/sys_sensors.c</PathWithFileName>
+      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>16</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmux.c</PathWithFileName>
-      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_kms.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_kms.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/sigfox_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/MbMux/system_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>system_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Sigfox/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Sigfox/App/app_sigfox.c</PathWithFileName>
-      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/sigfox_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Sigfox/App/sgfx_app.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>28</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
-      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/MbMux/system_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>system_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -549,8 +565,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -569,8 +585,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -580,23 +596,15 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -608,6 +616,18 @@
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>32</FileNumber>
@@ -615,8 +635,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -627,8 +647,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -639,8 +659,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -651,8 +671,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -663,8 +683,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -675,8 +695,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -687,8 +707,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -699,8 +719,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -711,8 +731,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -723,8 +743,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -735,8 +755,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -747,8 +767,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -759,8 +779,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -771,8 +791,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -783,8 +803,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -795,8 +815,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -807,8 +827,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -819,8 +839,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -831,8 +851,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -843,31 +863,31 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Utilities</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>9</GroupNumber>
       <FileNumber>53</FileNumber>
@@ -875,37 +895,45 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -917,38 +945,62 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
+      <GroupNumber>10</GroupNumber>
       <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>60</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>61</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvprojx
index 76d86467..eee5e570 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvprojx
@@ -16,9 +16,9 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20007FFF) IRAM2(0x20008000-0x2000AFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>Sigfox_PushButton_DualCore_CM4\Exe\</OutputDirectory>
+          <OutputDirectory>Sigfox_PushButton_DualCore_CM4\</OutputDirectory>
           <OutputName>Sigfox_PushButton_DualCore_CM4</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -138,7 +138,7 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -183,7 +183,7 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
@@ -246,7 +246,7 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
@@ -301,12 +301,12 @@
               <OCR_RVCT9>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
                 <StartAddress>0x20008000</StartAddress>
-                <Size>0x3000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -330,8 +330,8 @@
             <useXO>0</useXO>
             <v6Lang>5</v6Lang>
             <v6LangP>3</v6LangP>
-            <vShortEn>1</vShortEn>
-            <vShortWch>1</vShortWch>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
             <v6Lto>0</v6Lto>
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
@@ -339,7 +339,7 @@
               <MiscControls>-fshort-enums</MiscControls>
               <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../CM4/Core/Inc;../CM4/Sigfox/App;../CM4/Sigfox/Target;../CM4/MbMux;../Common/Board;../Common/MbMux;../Common/System;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
+              <IncludePath>../CM4/Core/Inc;../CM4/Sigfox/App;../CM4/Sigfox/Target;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,22 +381,57 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>adc.c</FileName>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Sigfox/App</GroupName>
+          <Files>
             <File>
-              <FileName>adc_if.c</FileName>
+              <FileName>app_sigfox.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
+              <FilePath>../CM4/Sigfox/App/app_sigfox.c</FilePath>
+            </File>
+            <File>
+              <FileName>sgfx_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Sigfox/App/sgfx_app.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>sgfx_eeprom_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Sigfox/App/sgfx_eeprom_if.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FilePath>../CM4/Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/adc.c</FilePath>
             </File>
             <File>
               <FileName>dma.c</FileName>
@@ -409,35 +444,25 @@
               <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM4/Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>main.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/main.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
               <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
-            <File>
-              <FileName>stm32wlxx_it.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
-            </File>
             <File>
               <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
             </File>
-            <File>
-              <FileName>sys_debug.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
-            </File>
             <File>
               <FileName>sys_sensors.c</FileName>
               <FileType>1</FileType>
@@ -449,29 +474,29 @@
               <FilePath>../CM4/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>adc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/usart.c</FilePath>
+              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
             </File>
             <File>
               <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/usart_if.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
           <Files>
             <File>
               <FileName>mbmux.c</FileName>
@@ -479,71 +504,15 @@
               <FilePath>../CM4/MbMux/mbmux.c</FilePath>
             </File>
             <File>
-              <FileName>mbmuxif_kms.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/MbMux/mbmuxif_kms.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FileName>mbmuxif_sigfox.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/mbmuxif_sigfox.c</FilePath>
             </File>
             <File>
               <FileName>mbmuxif_radio.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/MbMux/mbmuxif_radio.c</FilePath>
             </File>
-            <File>
-              <FileName>mbmuxif_sigfox.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/MbMux/mbmuxif_sigfox.c</FilePath>
-            </File>
             <File>
               <FileName>mbmuxif_sys.c</FileName>
               <FileType>1</FileType>
@@ -571,26 +540,6 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>Application/Sigfox/App</GroupName>
-          <Files>
-            <File>
-              <FileName>app_sigfox.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Sigfox/App/app_sigfox.c</FilePath>
-            </File>
-            <File>
-              <FileName>sgfx_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Sigfox/App/sgfx_app.c</FilePath>
-            </File>
-            <File>
-              <FileName>sgfx_eeprom_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Sigfox/App/sgfx_eeprom_if.c</FilePath>
-            </File>
-          </Files>
-        </Group>
         <Group>
           <GroupName>Doc</GroupName>
           <Files>
@@ -609,26 +558,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
-            <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_adc.c</FileName>
               <FileType>1</FileType>
@@ -640,24 +579,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -675,9 +609,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -690,24 +629,24 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_uart.c</FileName>
@@ -720,9 +659,34 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -735,39 +699,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -781,8 +745,8 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
         <targetInfos>
           <targetInfo name="Sigfox_PushButton_DualCore_CM4"/>
         </targetInfos>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
index 5707d81c..7c9ba28d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
index a8b1492f..6274a768 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size      EQU     0x400
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
index dc47ab2f..c307169e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
@@ -14,11 +14,11 @@ LR_IROM1 0x08020000 0x00020000  {    ; load region size_region
     *(.USER_embedded_Keys)
   }
   ; SRAM2 dedicated to M0+
-  RW_IRAM1 0x2000C000 0x00004000  {  ; RW data
+  RW_IRAM1 0x2000A000 0x00006000  {  ; RW data
    .ANY (+RW +ZI)
   }
 
-  RW_RAM_SHARED 0x2000B000 0x1000  {
+  RW_RAM_SHARED 0x20009000 0x1000  {
    *(MB_MEM2)
   }
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
index 79a183e1..5141de4a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -14,7 +14,7 @@ LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
    .ANY (+RW +ZI)
   }
   ; Backup SRAM2 dedicated to M4
-RW_IRAM2 0x20008000 0x00003000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+RW_IRAM2 0x20008000 0x00001000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
     *(MAPPING_TABLE)
     *(MB_MEM1)
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/.project
index e3da718f..438eab28 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/.project
@@ -12,159 +12,168 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
 			<name>Sigfox_PushButton_DualCore.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Sigfox_PushButton_DualCore.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Sigfox_PushButton_DualCore.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1602236848623</id>
+			<id>1612374128130</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.cproject
index 603bfb46..1bd0b9da 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.cproject
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1520802400">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1520802400" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1299281857" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1967487472" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.687430112" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1691004467" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1496951530" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1795144788" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1227276338" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1879601100" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/Sigfox/App | ../../../CM0PLUS/Sigfox/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.42487753" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1484431087" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.778968319" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.953778663" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1784904725" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1520802400" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1520802400." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.806486693" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1048778580" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.44020938" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1430845266" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.561178793" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1421170668" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../CM0PLUS/Sigfox/App | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/Sigfox/Target | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.148366815" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1202232574" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.247883547" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1503984899" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.363788156" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1954703523" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1841901683" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2071589823" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.324193626" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.937029173" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1523960046" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.288086327" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.241278072" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1833548834" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1643537430" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.240547621" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Sigfox/App"/>
@@ -50,6 +51,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
@@ -77,88 +79,85 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1165575457" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.208147953" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.2072603310" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1862834284" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.914569323" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1391911628" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.458554680" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1496902793" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1423034062" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.770430749" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1334017384" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.732806748" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1841531678" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1998041067" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1235793158" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":SFX_LIB_V2.8.1_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.0-CM0-O3.a"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.58885892" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1504180899" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.120656057" name="Place libraries in a linker group (-Wl,--start-group $(LIBS) -Wl,--end-group)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1392768755" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.503402028" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1579307198" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1087354777" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1016491299" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.87961705" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1615282665" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.467419945" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1745522575" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1776702696" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1462308514" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1767265094" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.837857522" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.2056683065" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1183651490" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1799846087" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1792711728" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1046135677" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1378225686" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1482459434" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1242343103">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1242343103" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.987464344">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.987464344" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1242343103" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1242343103." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1507454057" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.2091660500" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1622933109" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1119116130" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1824131150" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1215664390" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.477498416" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.189439473" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/Sigfox/App | ../../../CM0PLUS/Sigfox/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.386336592" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2117435441" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.252341483" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2024103471" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1154843322" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.987464344" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.987464344." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1831428881" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1052080165" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1922874145" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.15948876" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1939547277" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.740298766" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../CM0PLUS/Sigfox/App | ../../../Common/Board | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../CM0PLUS/KMS/App | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../CM0PLUS/Sigfox/Target | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.1-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.10.0_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.883984718" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1865829391" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1712381088" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.945835735" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.478878749" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1675140265" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.675506424" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1852669604" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1997909824" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1916108225" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.405182081" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.875763464" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.348809221" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
-									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1961286957" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1510680577" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Sigfox/App"/>
@@ -167,6 +166,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
@@ -194,42 +194,41 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.466249528" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1901891042" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1243832491" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1801907111" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1892447722" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.833520427" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.705555994" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2113181130" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.838445333" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1294705415" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1929362549" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.819247444" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.108796544" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.368621256" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" valueType="libPaths">
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.732097685" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
-									<listOptionValue builtIn="false" value=":SFX_LIB_V2.8.1_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a"/>
-									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.0-CM0-O3.a"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1087736306" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" valueType="libs">
 									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.954023066" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.1538143433" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.211319370" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.475534364" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1772780642" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.924231396" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1897831828" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.2044393812" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.753515853" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1567417688" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.2027914017" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1196639906" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.927705714" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1081646432" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1151452399" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.878047307" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.239304642" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1843206322" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1915864092" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1465217011" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1213722973" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1967852607" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -237,19 +236,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="Sigfox_PushButton_DualCore_CM0PLUS.null.1458807887" name="Sigfox_PushButton_DualCore_CM0PLUS"/>
+		<project id="Sigfox_PushButton_DualCore_CM0PLUS.null.309642896" name="Sigfox_PushButton_DualCore_CM0PLUS"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1242343103;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1242343103.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1675140265;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.466249528">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1520802400;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1520802400.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1523960046;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.208147953">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1841901683;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1165575457">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.987464344;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.987464344.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1916108225;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1901891042">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.project
index 4f2efadf..03a1c8c4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.project
@@ -25,536 +25,570 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_lptim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_aes.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_aes_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_aes_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_aes_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_ecc_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_ecc_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_ecc_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_hash.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_hash_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_hash_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_if_utils.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_if_utils.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rng.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rng_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rng_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_rsa.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/ca_rsa_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/ca_rsa_mbed.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED/ca_rsa_mbed.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_interface.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/kms_interface.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/STM32_Key_Management_Services/mac_stm32hal.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/kms_vm_storage.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_vm_storage.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/STM32_Key_Management_Services/rsa_stm32hal.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/mac_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/mac_stm32hal.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/STM32_Key_Management_Services/tkms.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/platform_util.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/platform_util.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/rsa_stm32hal.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL/rsa_stm32hal.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/sha1.c</name>
 			<type>1</type>
-			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha1.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/sigfox_aes.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/sha256.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/Third_Party/sigfox_data.c</name>
+			<name>Middlewares/STM32_Key_Management_Services/tkms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/ST/STM32_Key_Management_Services/niKMS/tkms.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ca_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ca_low_level.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/flash_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/flash_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/flash_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/kms_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/kms_low_level.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/lptim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/lptim.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/lptim.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/mn_lptim_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/mn_lptim_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/mn_lptim_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/nvms_low_level.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/nvms_low_level.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/features_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/features_info.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmux.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_sigfox.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sigfox.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/sigfox_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/sigfox_info.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/sigfox_info.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/sigfox_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/sigfox_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/sigfox_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/Sigfox/sigfox_aes.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/Sigfox/sigfox_data.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/KMS/App/app_kms.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/KMS/App/app_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/KMS/App/app_kms.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/app_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/App/app_sigfox.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/app_sigfox.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/ee.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/App/ee.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/ee.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_cstimer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/App/sgfx_cstimer.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/sgfx_cstimer.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_eeprom_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/mcu_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/mcu_api.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/mcu_api.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/mn_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/mn_api.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/mn_api.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/radio_board_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/rf_api.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/rf_api.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/rf_api.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/se_nvm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/se_nvm.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/se_nvm.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/Target/sgfx_credentials.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Sigfox/Target/sgfx_credentials.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/sgfx_credentials.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
index 9e23530f..f98fb740 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,51 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +105,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
-
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
 
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
-
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
index f582b1e5..9908f780 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -46,7 +49,7 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x2000A000, LENGTH = 24K
-  ROM    (rx)    : ORIGIN = 0x08020000, LENGTH = 128K
+  FLASH    (rx)    : ORIGIN = 0x08020000, LENGTH = 124K
   RAM_SHARED (xrw): ORIGIN = 0x20009000, LENGTH = 4K
   USER_Key_region_ROM (rx)    : ORIGIN = 0x0803E500, LENGTH = 768
 }
@@ -54,18 +57,18 @@ MEMORY
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -75,80 +78,103 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
+
+  .USER_embedded_Keys : {
+    . = ALIGN(4);
+    *(.USER_embedded_Keys.encrypted_sigfox_data) 
+    *(.USER_embedded_Keys)
+    . = ALIGN(4);
+  } >USER_Key_region_ROM
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
     
-  } >RAM AT> ROM
+  } >RAM AT> FLASH
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(4);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(4);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> FLASH
 
   /* Uninitialized data section into "RAM" Ram type memory */
-  . = ALIGN(8);
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -158,7 +184,7 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM
@@ -183,6 +209,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MB_MEM2       : { *(MB_MEM2) } >RAM_SHARED
-  .USER_embedded_Keys : { KEEP(*(.USER_embedded_Keys)) } > USER_Key_region_ROM
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.cproject
index 4abc0315..a5cdb691 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.cproject
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.307566516">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.307566516" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1653359249" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.560190773" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.934286202" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.672586383" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.268074494" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.41946571" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.619886424" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.293970326" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/Sigfox/App | ../../../CM4/Sigfox/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1137870109" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.97007145" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1001278020" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.698085663" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.719377926" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.307566516" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.307566516." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1420060302" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1622783498" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1463102358" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1818226117" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.644992714" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.682088667" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/Sigfox/Target | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../CM4/Sigfox/App | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.165028519" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.134861312" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.2265579" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.453183181" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.665364726" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2014113121" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.898891516" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.484088664" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1061756617" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.93296640" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.564695376" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1830336032" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1705117170" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2022150657" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1054216882" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1054665972" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/Target"/>
@@ -47,6 +48,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
@@ -62,74 +64,70 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1371241978" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.588701266" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1825854381" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1899156162" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1034454810" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.600175232" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1487344259" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.4635035" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1123267593" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.169767631" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.651882848" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.941477608" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1131620432" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1118099635" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1263991271" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.10556409" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1313707981" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1508836901" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1497574572" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.270878611" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1425459788" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1422730250" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1514119801" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1249370821" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2051914737" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1087965940" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.463930267" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.128388993" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1513744948" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.943432428" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1553935761" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1028445568" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.791241902" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.243483654">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.243483654" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1950005805">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1950005805" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.243483654" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.243483654." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.212800641" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1369473248" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.2037179663" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.390608594" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.666278534" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1857885261" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.906393359" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1066167954" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/Sigfox/App | ../../../CM4/Sigfox/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2118945750" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1118502253" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1556263949" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.604270686" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.470922741" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1950005805" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1950005805." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1271630561" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1371899150" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.88310423" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2143845593" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.213079307" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.2012376019" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../CM4/Sigfox/Target | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../CM4/Sigfox/App | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1855833260" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.87610096" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.614786901" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1201244571" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.808212179" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.410976506" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.482987100" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2115495645" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1741457019" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.917815390" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1605112688" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.968921658" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.800570439" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1806715063" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1395340608" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/Target"/>
@@ -137,6 +135,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
@@ -152,30 +151,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.311625675" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1678817296" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.886117781" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1235013183" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1470022913" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1759801532" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.555992425" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1405231491" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1887335916" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1283953026" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.873206931" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2141566328" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.979627510" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.289719969" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.913118352" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.367898970" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.671985437" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.656791231" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.923966806" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1652714331" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.280644264" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.600103638" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1973735142" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1564317002" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1854601096" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.729054405" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.114535375" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.521253851" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.31859001" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1847547712" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1724702576" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1303254406" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1957642228" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -183,19 +180,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="Sigfox_PushButton_DualCore_CM4.null.1342273716" name="Sigfox_PushButton_DualCore_CM4"/>
+		<project id="Sigfox_PushButton_DualCore_CM4.null.1152560714" name="Sigfox_PushButton_DualCore_CM4"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.898891516;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1371241978">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.307566516;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.307566516.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.564695376;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.588701266">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.243483654;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.243483654.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.410976506;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.311625675">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1950005805;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1950005805.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.917815390;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1678817296">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.project
index 1c8953bf..922af772 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.project
@@ -25,306 +25,310 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_sensors.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_sensors.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_sensors.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmux.c</locationURI>
-		</link>
-		<link>
-			<name>Application/User/MbMux/mbmuxif_kms.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_kms.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sigfox.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sigfox.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/radio_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/sigfox_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/sigfox_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/sigfox_mbwrapper.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/system_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/system_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/system_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/app_sigfox.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Sigfox/App/app_sigfox.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/app_sigfox.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Sigfox/App/sgfx_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/sgfx_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Sigfox/App/sgfx_eeprom_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Sigfox/App/sgfx_eeprom_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/sgfx_eeprom_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
index 89dfe9e5..af218d28 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,52 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +106,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
-
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
-
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
 
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
index 1eeab01b..8add7315 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -39,29 +42,29 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x400 ; /* required amount of heap  */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
 _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 128K
   RAM_SHARED (rw): ORIGIN = 0x20008000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
     . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
     . = ALIGN(4);
@@ -76,30 +79,30 @@ SECTIONS
 
     . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
     . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  .ARM.extab   : { 
+  .ARM.extab   : {
     . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .ARM : {
     . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   .preinit_array     :
   {
@@ -108,8 +111,8 @@ SECTIONS
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .init_array :
   {
     . = ALIGN(4);
@@ -118,8 +121,8 @@ SECTIONS
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .fini_array :
   {
     . = ALIGN(4);
@@ -128,23 +131,47 @@ SECTIONS
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
     
-  } >RAM AT> ROM
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
 
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
@@ -182,6 +209,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
-   MB_MEM1 (NOLOAD)       : { *(MB_MEM1) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Sigfox_PushButton_DualCore.ioc b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Sigfox_PushButton_DualCore.ioc
index b9bbd761..924660bd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Sigfox_PushButton_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/Sigfox_PushButton_DualCore.ioc
@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
 ADC.ClockPrescaler=ADC_CLOCK_SYNC_PCLK_DIV4
-ADC.IPParameters=SelectedChannel,ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion
+ADC.IPParameters=ClockPrescaler,SamplingTimeCommon1,SamplingTimeCommon2,Overrun,NbrOfConversion,SelectedChannel
 ADC.NbrOfConversion=1
 ADC.Overrun=ADC_OVR_DATA_OVERWRITTEN
 ADC.SamplingTimeCommon1=ADC_SAMPLETIME_160CYCLES_5
@@ -8,6 +8,7 @@ ADC.SamplingTimeCommon2=ADC_SAMPLETIME_160CYCLES_5
 ADC.SelectedChannel=ADC_CHANNEL_TEMPSENSOR|ADC_CHANNEL_VREFINT
 CortexM0Plus.IPs=IPCC,LORAWAN,RCC,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,DMA,NVIC2\:I,RTC\:I,SUBGHZ\:I,ADV_TRACE,MISC,TIMER,TINY_LPM,LPTIM1\:I,KMS\:I,GTZC_S\:I,SEQUENCER_M0PLUS\:I
 CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,DMA\:I,NVIC1\:I,ADC\:I,RTC,ADV_TRACE\:I,MISC\:I,TIMER\:I,TINY_LPM\:I,LPUART1\:I,GTZC_NS\:I,SEQUENCER_M4\:I
+CortexM4.Pins=PA0,PA1
 Dma.LPUART1_TX.0.Channel_PRIV_NPRIV=DMA_CHANNEL_NPRIV_DISABLE
 Dma.LPUART1_TX.0.Direction=DMA_MEMORY_TO_PERIPH
 Dma.LPUART1_TX.0.EventEnable=DISABLE
@@ -30,7 +31,7 @@ Dma.Request0=LPUART1_TX
 Dma.RequestsNb=1
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
-KMS.IPParameters=KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_DEBUGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_CMAC,KMS_AES_GCM,KMS_MEM_LOGGING,KMS_NB_SESSIONS_MAX
+KMS.IPParameters=KMS_NB_SESSIONS_MAX,KMS_ENCRYPT,KMS_DECRYPT,KMS_SIGN,KMS_VERIFY,KMS_DERIVE_KEY,KMS_ATTRIBUTES,KMS_OBJECTS,KMS_NIKMS_ROUTER_BYPASS,KMS_MEM_USE_ALLOCATOR,KMS_MEM_LOGGING,KMS_AES_CBC,KMS_AES_ECB,KMS_AES_GCM,KMS_AES_CMAC,KMS_NVM_ENABLED,KMS_VM_DYNAMIC_ENABLED,KMS_NVM_DYNAMIC_ENABLED
 KMS.KMS_AES_CBC=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT
 KMS.KMS_AES_CMAC=KMS_FCT_SIGN|KMS_FCT_VERIFY
 KMS.KMS_AES_ECB=KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY
@@ -39,16 +40,18 @@ KMS.KMS_ATTRIBUTES=\#define KMS_ATTRIBUTES
 KMS.KMS_DECRYPT=\#define KMS_DECRYPT
 KMS.KMS_DERIVE_KEY=\#define KMS_DERIVE_KEY
 KMS.KMS_ENCRYPT=\#define KMS_ENCRYPT
-KMS.KMS_MEM_DEBUGGING=\#define KMS_MEM_DEBUGGING
 KMS.KMS_MEM_LOGGING=//\#define KMS_MEM_LOGGING
 KMS.KMS_MEM_USE_ALLOCATOR=KMS_MEM_USE_POOL_ALLOCATOR
 KMS.KMS_NB_SESSIONS_MAX=1
 KMS.KMS_NIKMS_ROUTER_BYPASS=\#define KMS_NIKMS_ROUTER_BYPASS
+KMS.KMS_NVM_DYNAMIC_ENABLED=\#define KMS_NVM_DYNAMIC_ENABLED
+KMS.KMS_NVM_ENABLED=\#define KMS_NVM_ENABLED
 KMS.KMS_OBJECTS=\#define KMS_OBJECTS
 KMS.KMS_SIGN=\#define KMS_SIGN
 KMS.KMS_VERIFY=\#define KMS_VERIFY
+KMS.KMS_VM_DYNAMIC_ENABLED=//\#define KMS_VM_DYNAMIC_ENABLED
 KeepUserPlacement=false
-LPUART1.BaudRate=LPUART_BAUDRATE
+LPUART1.BaudRate=9600
 LPUART1.FIFOMode=UART_FIFOMODE_ENABLE
 LPUART1.IPParameters=BaudRate,FIFOMode
 Mcu.Context0=CortexM4
@@ -58,71 +61,74 @@ Mcu.ContextProject=DualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADC
 Mcu.IP1=ADV_TRACE
-Mcu.IP10=RCC
-Mcu.IP11=RTC
-Mcu.IP12=SEQUENCER_M0PLUS
-Mcu.IP13=SEQUENCER_M4
-Mcu.IP14=SIGFOX
-Mcu.IP15=SUBGHZ
-Mcu.IP16=SYS_M0PLUS
-Mcu.IP17=SYS
-Mcu.IP18=TIMER
-Mcu.IP19=TINY_LPM
-Mcu.IP2=DMA
-Mcu.IP3=IPCC
-Mcu.IP4=KMS
-Mcu.IP5=LPTIM1
-Mcu.IP6=LPUART1
-Mcu.IP7=MISC
-Mcu.IP8=NVIC1
-Mcu.IP9=NVIC2
-Mcu.IPNb=20
+Mcu.IP10=NVIC2
+Mcu.IP11=RCC
+Mcu.IP12=RTC
+Mcu.IP13=SEQUENCER_M0PLUS
+Mcu.IP14=SEQUENCER_M4
+Mcu.IP15=SIGFOX
+Mcu.IP16=SUBGHZ
+Mcu.IP17=SYS_M0PLUS
+Mcu.IP18=SYS
+Mcu.IP19=TIMER
+Mcu.IP2=DEBUG
+Mcu.IP20=TINY_LPM
+Mcu.IP3=DMA
+Mcu.IP4=IPCC
+Mcu.IP5=KMS
+Mcu.IP6=LPTIM1
+Mcu.IP7=LPUART1
+Mcu.IP8=MISC
+Mcu.IP9=NVIC1
+Mcu.IPNb=21
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADC_TempSens_Input
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_ADC_Vref_Input
-Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin22=VP_IPCC_VS_IPCC
-Mcu.Pin23=VP_KMS_VS_KMS
-Mcu.Pin24=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
-Mcu.Pin25=VP_MISC_VS_MISC
-Mcu.Pin26=VP_RTC_VS_RTC_Activate
-Mcu.Pin27=VP_RTC_VS_RTC_Calendar
-Mcu.Pin28=VP_RTC_VS_RTC_Alarm_B_Intern
-Mcu.Pin29=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
-Mcu.Pin31=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin32=VP_SIGFOX_VS_Sigfox
-Mcu.Pin33=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin34=VP_SYS_VS_Systick
-Mcu.Pin35=VP_SYS_M0PLUS_VS_Systick
-Mcu.Pin36=VP_TIMER_VS_TIMER
-Mcu.Pin37=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=38
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADC_TempSens_Input
+Mcu.Pin22=VP_ADC_Vref_Input
+Mcu.Pin23=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin24=VP_IPCC_VS_IPCC
+Mcu.Pin25=VP_KMS_VS_KMS
+Mcu.Pin26=VP_LPTIM1_VS_LPTIM_counterModeInternalClock
+Mcu.Pin27=VP_MISC_VS_MISC
+Mcu.Pin28=VP_RTC_VS_RTC_Activate
+Mcu.Pin29=VP_RTC_VS_RTC_Calendar
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_RTC_VS_RTC_Alarm_B_Intern
+Mcu.Pin31=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin32=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
+Mcu.Pin33=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin34=VP_SIGFOX_VS_Sigfox
+Mcu.Pin35=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin36=VP_SYS_VS_None
+Mcu.Pin37=VP_SYS_M0PLUS_VS_None
+Mcu.Pin38=VP_TIMER_VS_TIMER
+Mcu.Pin39=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=40
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);LPUART_BAUDRATE,9600
+Mcu.UserConstants=RTC_N_PREDIV_S-CortexM0Plus,10;RTC_PREDIV_S-CortexM0Plus,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A-CortexM0Plus,((1<<(15-RTC_N_PREDIV_S))-1);RTC_N_PREDIV_S-CortexM4,10;RTC_PREDIV_S-CortexM4,((1<<RTC_N_PREDIV_S)-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -138,7 +144,8 @@ NVIC1.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC1.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC1.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC1.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC1.TimeBase=None
 NVIC1.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.ForceEnableDMAVector=true
 NVIC2.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -149,19 +156,24 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.RTC_LSECSS_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC2.TimeBase=None
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.ContextOwner=CortexM4
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.ContextOwner=CortexM4
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -176,40 +188,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=LPUART1_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -217,26 +222,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -249,7 +257,7 @@ ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32WL55JCIx
 ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
-ProjectManager.HeapSize=0x400
+ProjectManager.HeapSize=M4-0x200,M0P-0x400
 ProjectManager.KeepUserCode=true
 ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
@@ -260,11 +268,11 @@ ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=Sigfox_PushButton_DualCore.ioc
 ProjectManager.ProjectName=Sigfox_PushButton_DualCore
 ProjectManager.RegisterCallBack=
-ProjectManager.StackSize=0x1000
+ProjectManager.StackSize=M4-0x1000,M0P-0x1000
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,false-6-MX_RTC_Init-RTC-true-HAL-false-CortexM4,7-MX_LPUART1_UART_Init-LPUART1-true-HAL-false-CortexM4,8-MX_Sigfox_Init-SIGFOX-false-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,4-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,6-MX_Sigfox_Init-SIGFOX-false-HAL-false-CortexM0Plus,7-MX_LPTIM1_Init-LPTIM1-true-HAL-false-CortexM0Plus,8-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus
+ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM4,2-MX_DMA_Init-DMA-true-HAL-false-CortexM4,3-SystemClock_Config-RCC-false-HAL-false-CortexM4,4-MX_ADC_Init-ADC-true-HAL-false-CortexM4,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM4,false-6-MX_RTC_Init-RTC-true-HAL-false-CortexM4,7-MX_LPUART1_UART_Init-LPUART1-true-HAL-false-CortexM4,8-MX_Sigfox_Init-SIGFOX-false-HAL-false-CortexM4,false-1-MX_GPIO_Init-GPIO-false-HAL-false-CortexM0Plus,false-2-MX_DMA_Init-DMA-false-HAL-false-CortexM0Plus,3-MX_RTC_Init-RTC-true-HAL-false-CortexM0Plus,4-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false-CortexM0Plus,5-MX_IPCC_Init-IPCC-true-HAL-false-CortexM0Plus,6-MX_KMS_Init-KMS-false-HAL-false-CortexM0Plus,7-MX_Sigfox_Init-SIGFOX-false-HAL-false-CortexM0Plus,8-MX_LPTIM1_Init-LPTIM1-true-HAL-false-CortexM0Plus
 RCC.AHBFreq_Value=32000000
 RCC.APB1Freq_Value=32000000
 RCC.APB1TimFreq_Value=32000000
@@ -315,30 +323,28 @@ RTC.AsynchPrediv=RTC_PREDIV_A
 RTC.BinMode=RTC_BINARY_ONLY
 RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
 RTC.BinaryAutoClr_B-Alarm\ B=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
-RTC.Format=RTC_FORMAT_BIN
-RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B,Format
+RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B
 SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI0.ConfNb=1
 SH.GPXTI1.0=GPIO_EXTI1
 SH.GPXTI1.ConfNb=1
 SH.GPXTI6.0=GPIO_EXTI6
 SH.GPXTI6.ConfNb=1
-SIGFOX.APP_LOG_ENABLED_CM0PLUS=true
-SIGFOX.Activate_BOARD_RESOURCES=both
 SIGFOX.Activate_DEBUG_LINE=true
-SIGFOX.Activate_RADIO_BOARD_INTERFACE=true
+SIGFOX.Activate_RADIO_BOARD_INTERFACE=Bsp
 SIGFOX.DEBUGGER_ON_CM0PLUS=false
-SIGFOX.IPParameters=SUBGHZ_APPLICATION,DEBUGGER_ON_CM0PLUS,Activate_RADIO_BOARD_INTERFACE,Activate_DEBUG_LINE,APP_LOG_ENABLED_CM0PLUS,Activate_BOARD_RESOURCES
+SIGFOX.IPParameters=SUBGHZ_APPLICATION,DEBUGGER_ON_CM0PLUS,Activate_DEBUG_LINE,TX_RFO_CONFIG,Activate_RADIO_BOARD_INTERFACE
 SIGFOX.SUBGHZ_APPLICATION=SIGFOX_PUSHBUTTON
+SIGFOX.TX_RFO_CONFIG=RBI_CONF_RFO_LP_HP
 SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
 SYS.userName=SYS_M4
 SYS_M0PLUS.userName=SYS_M0+
-Sigfox.BSP.number=17
+Sigfox.BSP.number=8
 Sigfox0.BSP.STBoard=false
 Sigfox0.BSP.api=Unknown
 Sigfox0.BSP.component=
-Sigfox0.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON
+Sigfox0.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION | SEM_SGX_USE_ADC
 Sigfox0.BSP.i2caddr=0
 Sigfox0.BSP.i2creg=
 Sigfox0.BSP.instance=ADC
@@ -350,7 +356,7 @@ Sigfox0.BSP.solution=ADC
 Sigfox1.BSP.STBoard=false
 Sigfox1.BSP.api=Unknown
 Sigfox1.BSP.component=
-Sigfox1.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION
+Sigfox1.BSP.condition=\!SEM_SIGFOX_USER_APPLICATION | SEM_SGX_USE_RTC
 Sigfox1.BSP.i2caddr=0
 Sigfox1.BSP.i2creg=
 Sigfox1.BSP.instance=RTC
@@ -359,186 +365,78 @@ Sigfox1.BSP.mode=RTC Enabled
 Sigfox1.BSP.name=RTC
 Sigfox1.BSP.semaphore=
 Sigfox1.BSP.solution=RTC
-Sigfox10.BSP.STBoard=false
-Sigfox10.BSP.api=Unknown
-Sigfox10.BSP.component=
-Sigfox10.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox10.BSP.i2caddr=0
-Sigfox10.BSP.i2creg=
-Sigfox10.BSP.instance=PC3
-Sigfox10.BSP.ip=GPIO
-Sigfox10.BSP.mode=Output
-Sigfox10.BSP.name=RF SW CTRL 3
-Sigfox10.BSP.semaphore=
-Sigfox10.BSP.solution=PC3
-Sigfox11.BSP.STBoard=false
-Sigfox11.BSP.api=Unknown
-Sigfox11.BSP.component=
-Sigfox11.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox11.BSP.i2caddr=0
-Sigfox11.BSP.i2creg=
-Sigfox11.BSP.instance=PA0
-Sigfox11.BSP.ip=GPIO
-Sigfox11.BSP.mode=EXTI
-Sigfox11.BSP.name=BUTTON 1
-Sigfox11.BSP.semaphore=
-Sigfox11.BSP.solution=PA0
-Sigfox12.BSP.STBoard=false
-Sigfox12.BSP.api=Unknown
-Sigfox12.BSP.component=
-Sigfox12.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON
-Sigfox12.BSP.i2caddr=0
-Sigfox12.BSP.i2creg=
-Sigfox12.BSP.instance=LPTIM1
-Sigfox12.BSP.ip=LPTIM
-Sigfox12.BSP.mode=Counts internal clock events
-Sigfox12.BSP.name=TIM
-Sigfox12.BSP.semaphore=
-Sigfox12.BSP.solution=LPTIM1
-Sigfox13.BSP.STBoard=false
-Sigfox13.BSP.api=Unknown
-Sigfox13.BSP.component=
-Sigfox13.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox13.BSP.i2caddr=0
-Sigfox13.BSP.i2creg=
-Sigfox13.BSP.instance=PC4
-Sigfox13.BSP.ip=GPIO
-Sigfox13.BSP.mode=Output
-Sigfox13.BSP.name=RF SW CTRL 1
-Sigfox13.BSP.semaphore=
-Sigfox13.BSP.solution=PC4
-Sigfox14.BSP.STBoard=false
-Sigfox14.BSP.api=Unknown
-Sigfox14.BSP.component=
-Sigfox14.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SIGFOX
-Sigfox14.BSP.i2caddr=0
-Sigfox14.BSP.i2creg=
-Sigfox14.BSP.instance=PC5
-Sigfox14.BSP.ip=GPIO
-Sigfox14.BSP.mode=Output
-Sigfox14.BSP.name=RF SW CTRL 2
-Sigfox14.BSP.semaphore=
-Sigfox14.BSP.solution=PC5
-Sigfox15.BSP.STBoard=false
-Sigfox15.BSP.api=Unknown
-Sigfox15.BSP.component=
-Sigfox15.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox15.BSP.i2caddr=0
-Sigfox15.BSP.i2creg=
-Sigfox15.BSP.instance=PC6
-Sigfox15.BSP.ip=GPIO
-Sigfox15.BSP.mode=EXTI
-Sigfox15.BSP.name=BUTTON 3
-Sigfox15.BSP.semaphore=
-Sigfox15.BSP.solution=PC6
-Sigfox16.BSP.STBoard=false
-Sigfox16.BSP.api=Unknown
-Sigfox16.BSP.component=
-Sigfox16.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox16.BSP.i2caddr=0
-Sigfox16.BSP.i2creg=
-Sigfox16.BSP.instance=PA1
-Sigfox16.BSP.ip=GPIO
-Sigfox16.BSP.mode=EXTI
-Sigfox16.BSP.name=BUTTON 2
-Sigfox16.BSP.semaphore=
-Sigfox16.BSP.solution=PA1
 Sigfox2.BSP.STBoard=false
 Sigfox2.BSP.api=Unknown
 Sigfox2.BSP.component=
-Sigfox2.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox2.BSP.condition=SEM_SGX_PUSHBUTTON
 Sigfox2.BSP.i2caddr=0
 Sigfox2.BSP.i2creg=
-Sigfox2.BSP.instance=PB12
-Sigfox2.BSP.ip=GPIO
-Sigfox2.BSP.mode=Output
-Sigfox2.BSP.name=Debug Line 1
+Sigfox2.BSP.instance=LPUART1
+Sigfox2.BSP.ip=(LPU|US)ART
+Sigfox2.BSP.mode=Asynchronous
+Sigfox2.BSP.name=USART
 Sigfox2.BSP.semaphore=
-Sigfox2.BSP.solution=PB12
+Sigfox2.BSP.solution=LPUART1
 Sigfox3.BSP.STBoard=false
 Sigfox3.BSP.api=Unknown
 Sigfox3.BSP.component=
-Sigfox3.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox3.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox3.BSP.i2caddr=0
 Sigfox3.BSP.i2creg=
-Sigfox3.BSP.instance=PB13
+Sigfox3.BSP.instance=PB12
 Sigfox3.BSP.ip=GPIO
 Sigfox3.BSP.mode=Output
-Sigfox3.BSP.name=Debug Line 2
+Sigfox3.BSP.name=Debug Line 1
 Sigfox3.BSP.semaphore=
-Sigfox3.BSP.solution=PB13
+Sigfox3.BSP.solution=PB12
 Sigfox4.BSP.STBoard=false
 Sigfox4.BSP.api=Unknown
 Sigfox4.BSP.component=
-Sigfox4.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox4.BSP.condition=SEM_SGX_AT_SLAVE | SEM_SGX_PUSHBUTTON | SEM_SGX_USE_LPTIM
 Sigfox4.BSP.i2caddr=0
 Sigfox4.BSP.i2creg=
-Sigfox4.BSP.instance=PB14
-Sigfox4.BSP.ip=GPIO
-Sigfox4.BSP.mode=Output
-Sigfox4.BSP.name=Debug Line 3
+Sigfox4.BSP.instance=LPTIM1
+Sigfox4.BSP.ip=LPTIM
+Sigfox4.BSP.mode=Counts internal clock events
+Sigfox4.BSP.name=TIM
 Sigfox4.BSP.semaphore=
-Sigfox4.BSP.solution=PB14
+Sigfox4.BSP.solution=LPTIM1
 Sigfox5.BSP.STBoard=false
 Sigfox5.BSP.api=Unknown
 Sigfox5.BSP.component=
-Sigfox5.BSP.condition=SEM_DEBUG_LINE_FOR_SIGFOX
+Sigfox5.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox5.BSP.i2caddr=0
 Sigfox5.BSP.i2creg=
-Sigfox5.BSP.instance=PB10
+Sigfox5.BSP.instance=PB13
 Sigfox5.BSP.ip=GPIO
 Sigfox5.BSP.mode=Output
-Sigfox5.BSP.name=Debug Line 4
+Sigfox5.BSP.name=Debug Line 2
 Sigfox5.BSP.semaphore=
-Sigfox5.BSP.solution=PB10
+Sigfox5.BSP.solution=PB13
 Sigfox6.BSP.STBoard=false
 Sigfox6.BSP.api=Unknown
 Sigfox6.BSP.component=
-Sigfox6.BSP.condition=SEM_SGX_PUSHBUTTON
+Sigfox6.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox6.BSP.i2caddr=0
 Sigfox6.BSP.i2creg=
-Sigfox6.BSP.instance=LPUART1
-Sigfox6.BSP.ip=(LPU|US)ART
-Sigfox6.BSP.mode=Asynchronous
-Sigfox6.BSP.name=USART
+Sigfox6.BSP.instance=PB14
+Sigfox6.BSP.ip=GPIO
+Sigfox6.BSP.mode=Output
+Sigfox6.BSP.name=Debug Line 3
 Sigfox6.BSP.semaphore=
-Sigfox6.BSP.solution=LPUART1
+Sigfox6.BSP.solution=PB14
 Sigfox7.BSP.STBoard=false
 Sigfox7.BSP.api=Unknown
 Sigfox7.BSP.component=
-Sigfox7.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
+Sigfox7.BSP.condition=SEM_PROBE_LINE_FOR_SIGFOX
 Sigfox7.BSP.i2caddr=0
 Sigfox7.BSP.i2creg=
-Sigfox7.BSP.instance=PB11
+Sigfox7.BSP.instance=PB10
 Sigfox7.BSP.ip=GPIO
 Sigfox7.BSP.mode=Output
-Sigfox7.BSP.name=LED 3
+Sigfox7.BSP.name=Debug Line 4
 Sigfox7.BSP.semaphore=
-Sigfox7.BSP.solution=PB11
-Sigfox8.BSP.STBoard=false
-Sigfox8.BSP.api=Unknown
-Sigfox8.BSP.component=
-Sigfox8.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox8.BSP.i2caddr=0
-Sigfox8.BSP.i2creg=
-Sigfox8.BSP.instance=PB9
-Sigfox8.BSP.ip=GPIO
-Sigfox8.BSP.mode=Output
-Sigfox8.BSP.name=LED 2
-Sigfox8.BSP.semaphore=
-Sigfox8.BSP.solution=PB9
-Sigfox9.BSP.STBoard=false
-Sigfox9.BSP.api=Unknown
-Sigfox9.BSP.component=
-Sigfox9.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SIGFOX | SEM_BOARD_RESOURCES_M4_FOR_SIGFOX | SEM_BOARD_RESOURCES_BOTH_FOR_SIGFOX
-Sigfox9.BSP.i2caddr=0
-Sigfox9.BSP.i2creg=
-Sigfox9.BSP.instance=PB15
-Sigfox9.BSP.ip=GPIO
-Sigfox9.BSP.mode=Output
-Sigfox9.BSP.name=LED 1
-Sigfox9.BSP.semaphore=
-Sigfox9.BSP.solution=PB15
+Sigfox7.BSP.solution=PB10
 VP_ADC_TempSens_Input.Mode=IN-TempSens
 VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
 VP_ADC_Vref_Input.Mode=IN-Vrefint
@@ -569,12 +467,15 @@ VP_SIGFOX_VS_Sigfox.Mode=Sigfox_Enabled
 VP_SIGFOX_VS_Sigfox.Signal=SIGFOX_VS_Sigfox
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_M0PLUS_VS_Systick.Mode=SysTick
-VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_M0PLUS_VS_None.Mode=None
+VP_SYS_M0PLUS_VS_None.Signal=SYS_M0PLUS_VS_None
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=Sigfox_PushButton_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/readme.txt
index 394e7867..f05a942a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox/Sigfox_PushButton_DualCore/readme.txt
@@ -1,12 +1,12 @@
 /**
   @page Sigfox_PushButton_DualCore Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/Sigfox/Sigfox_PushButton_DualCore/readme.txt 
+  * @file    Applications/Sigfox/Sigfox_PushButton_DualCore/readme.txt
   * @author  MCD Application Team
-  * @brief   This application is a simple demo application software of a Sigfox 
-  *          Modem sending temperature and Batterie Level to a Sigfox Network.
+  * @brief   This application is a simple demo application software of a Sigfox
+  *          Modem sending temperature and Battery Level to a Sigfox Network.
   *          The application runs on CM4, the MW and radio driver
   *          run on CM0PLUS. IPCC and MBMUX are used for multicore communication
   ******************************************************************************
@@ -26,7 +26,7 @@
 @par Description
 
 This directory contains a set of source files that implements a Dual Core (CM4 / CM0) Sigfox application
-example of a Sigfox object sending temperature - and Batterie Level to a Sigfox Network.
+example of a Sigfox object sending temperature and Battery Level to a Sigfox Network.
 
 This application is targeting the NUCLEO-WL55JC1 (HIGH-BAND) embedding the STM32WLxx.
 
@@ -36,13 +36,13 @@ This application is targeting the NUCLEO-WL55JC1 (HIGH-BAND) embedding the STM32
 
 Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ca_conf.h                       This file contains configuration for Cryptographic API (CA)
                                                                                 module functionalities.
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ca_low_level.h                  This file contains the low level definitions of the Cryptographic API (CA) module.
-  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h                      This file provides interface to low level driver
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h                      This file contains definitions for FLASH Interface functionalities.
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h                          This file contains all the function prototypes for
                                                                                 the ipcc.c file
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h                       This file contains the interface of the ipcc driver on CM0PLUS.
@@ -80,11 +80,10 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h                 Definitions for modules requiring utilities
   - Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.h                        !!! No description found !!!
   - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h                            API which interfaces CM0PLUS to IPCC
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_kms.h                      Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                    API for CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h                   API provided to CM0 appli to register and handle Sigfox to MBMUX
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                      API for CM0PLUS applic to handle the SYSTEM MBMUX channel
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                    API for CM0PLUS applic to register and handle TRACE via MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                    API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h                   API provided to CM0 application to register and handle Sigfox to MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                      API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                    API for CM0PLUS application to register and handle TRACE via MBMUX
   - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                  This file implements the CM0PLUS side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h                 This file implements the CM0 side wrapper of the SigfoxMac interface
@@ -95,7 +94,7 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
   - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h                Interface for  cstimer.c driver
   - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h              eeprom interface to the upper module.
   - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h                 provides encrypted data
-  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h                  defines the interfaace to mcu_api.c
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h                  defines the interface to mcu_api.c
   - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h                   monarch library interface
   - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h              Configure (enable/disable) traces for CM0
   - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h           Header for Radio interface configuration
@@ -128,11 +127,10 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
   - Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h                    Header for configuration file to utilities
   - Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h                     Definitions for modules requiring utilities
   - Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h                                API which interfaces CM4 to IPCC
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_kms.h                          Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h                        API for CM4 applic to register and handle RADIO driver via MBMUX
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h                       API provided to CM0 appli to register and handle Sigfox to MBMUX
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h                          API for CM4 applic to handle the SYSTEM MBMUX channel
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h                        API for CM4 applic to register and handle TRACE via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h                        API for CM4 application to register and handle RADIO driver via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h                       API provided to CM0 application to register and handle Sigfox to MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h                          API for CM4 application to handle the SYSTEM MBMUX channel
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h                        API for CM4 application to register and handle TRACE via MBMUX
   - Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h                      This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h                     This file implements the CM0 side wrapper of the SigfoxMac interface
@@ -144,7 +142,6 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
   - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h                Definition the version of the CM4 application
   - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h                  eeprom interface to the upper module.
   - Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h                       header to emulated SE nvm data
-  - Sigfox_PushButton_DualCore/Common/Board/board_resources.h                   Header for driver at.c module
   - Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h             STM32WLxx_Nucleo board configuration file.
   - Sigfox_PushButton_DualCore/Common/MbMux/features_info.h                     Feature list and parameters TypeDefinitions
   - Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h                       Maps the IPCC channels to memory buffers
@@ -153,10 +150,11 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
   - Sigfox_PushButton_DualCore/Common/System/sys_debug.h                        Configuration of the debug.c instances
 
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ca_low_level.c                  This file contains the low level implementations of the Cryptographic API (CA) module.
-  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c                      This file contains the FLASH driver
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c                      This file provides set of firmware functions to manage Flash
+                                                                                Interface functionalities.
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c                          This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c                       Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c                       Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/kms_low_level.c                 This file contains implementations for Key Management Services (KMS)
                                                                                 module Low Level access to Flash, CRC...
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c                         This file provides code for the configuration
@@ -167,6 +165,8 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
                                                                                 module NVM Low Level access to physical storage (Flash...)
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c                           This file provides code for the configuration
                                                                                 of the RTC instances.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c             This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                  Interrupt Service Routines.
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                  Low layer function to enter/exit low power modes (stop, sleep)
   - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c                        This file provides code for the configuration
@@ -176,10 +176,9 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
   - Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.c                        !!! No description found !!!
   - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c                    CM0PLUS supported features list
   - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c                            Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_kms.c                      Interface layer CM0PLUS Kms to MBMUX (Mailbox Multiplexer)
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                    allows CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c                   allows CM0PLUS applic to register and handle Sigfox to MBMUX
-  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                      allows CM0 applic to handle the SYSTEM MBMUX channel
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                    allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c                   allows CM0PLUS application to register and handle Sigfox to MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                      allows CM0 application to handle the SYSTEM MBMUX channel
   - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                    Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
   - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                  This file implements the CM0 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
@@ -203,7 +202,7 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
                                                                                 of all the requested memory to memory DMA transfers.
   - Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c                              This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c                           Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c                           Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - Sigfox_PushButton_DualCore/CM4/Core/Src/main.c                              : Main program body
   - Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c                 This file provides code for the MSP Initialization
                                                                                 and de-Initialization codes.
@@ -214,42 +213,42 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
   - Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c                          Configure RTC Alarm, Tick and Calendar manager
   - Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c                             This file provides code for the configuration
                                                                                 of the USART instances.
-  - Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c                          Configuration of UART MX driver interface for hyperterminal communication
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c                          Configuration of UART driver interface for hyperterminal communication
   - Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c                                CM4 side multiplexer to map features to IPCC channels
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_kms.c                          Interface layer CM4 Kms to MBMUX (Mailbox Multiplexer)
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c                        allows CM4 applic to register and handle RADIO driver via MBMUX
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c                       allows CM4 applic to register and handle SigfoxWAN via MBMUX
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c                          allows CM4 applic to handle the SYSTEM MBMUX channel.
-  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c                        allows CM4 applic to receive by CM0 TRACE via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c                        allows CM4 application to register and handle RADIO driver via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c                       allows CM4 application to register and handle SigfoxWAN via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c                          allows CM4 application to handle the SYSTEM MBMUX channel.
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c                        allows CM4 application to receive by CM0 TRACE via MBMUX
   - Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c                      This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c                     This file implements the CM4 side wrapper of the Sigfox interface
                                                                                 shared between M0 and M4.
-  - Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c                     allows CM4 applic to handle the SYSTEM MBMUX channel.
+  - Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c                     allows CM4 application to handle the SYSTEM MBMUX channel.
   - Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c                      Application of the Sigfox Middleware
   - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c                        provides code for the application of the sigfox Middleware
   - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c                  eeprom interface to the sigfox component
-  - Sigfox_PushButton_DualCore/Common/Board/board_resources.c                   Source file
   - Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c                 CMSIS Cortex Device Peripheral Access Layer System Source File
   - Sigfox_PushButton_DualCore/Common/System/sys_debug.c                        Enables 4 debug pins for internal signals RealTime debugging
+  - Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c  STM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - CM0PLUS (Mw and radio drivers config) 
-        - sys_conf.h, radio_conf.h, mw_log_conf.h, radio_board_if.h, main.h, etc
-    - CM4 (Sigfox appli)
-        - app_sigfox.h, nucleo_conf.h, main.h, etc
-    - Careful: 
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
+    - CM4 (Sigfox application)
+        - sys_conf.h, sgfx_app.h, nucleo_conf.h, main.h, etc
 
   -Set Up:
 
@@ -260,11 +259,11 @@ Applications, SubGHz_Phy, Sigfox, PushButton, DualCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all CM4 files and load your image into CM4 target memory
-  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory 
+  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory
   - Reset the system (two cores)
   - Run the example
   - Open a Terminal, connected the Sigfox Object
@@ -272,21 +271,23 @@ In order to make the program work, you must do the following :
   - Terminal Config: Select 'CR+LF' for Transmit New-Line and switch 'Local echo' on
   - Push Button 1 (it will send a sigfox message, Blue LED blinking)
 
-@par How to use IAR to debug ? 
-  - open project.eww and select CM4 project
-  - make sure the flag DEBUGGER_ON =1 in app_conf.h
-  - better to define the flag LOW_POWER_DISABLE = 1 at least on one MCU (currently debugger has problem in dual core STOP mode)
-  - compile and download (Ctrl + D)
+@par How to debug ?
+  - Open your preferred toolchain and select CM4 project
+  - define the flag DEBUGGER_ENABLED to 1 in CM4\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download
   - put a breakpoint in sys_app.c one line after HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
   - run CM4 (the above functions sets PWR_CR4_C2BOOT flag)
-  - open a second instance of project.eww and select CM0PLUS project
-  - compile and download using "Download active application" 
+  - open a second instance of your preferred toolchain and select CM0PLUS project
+  - to debug CM0PLUS as well, define the flag DEBUGGER_ENABLED to 1 in CM0PLUS\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download using "Download active application"
   - once CM0PLUS code is downloaded reset (system reset) the CM4
   - run CM4 to the breakpoint again
-  - attach to running target CM0PLUS 
+  - attach to running target CM0PLUS
          (CM0PLUS is in a while loop waiting CM4 to give green light to go further)
          (this is done to prevent CM0PLUS to execute too much code before attaching)
-  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exite the while loop
+  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exit the while loop
 
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/ECCKEY.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin
new file mode 100644
index 00000000..87418a0d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Binary/iv.bin
@@ -0,0 +1 @@
+�!Eˠ;P=����+�f
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
new file mode 100644
index 00000000..b0959594
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
new file mode 100644
index 00000000..6f66889b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.ewp
@@ -0,0 +1,1054 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_KMS_Blob</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\KMS_Blob.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild></prebuild>
+        <postbuild>cmd /C "cmd /C $PROJ_DIR$\postbuild.bat "$PROJ_DIR$" "KMS_Blob" 1 "</postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>__iar_program_start</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_blob_example_keys.c</name>
+      </file>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..e6140477
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,21 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+
+define region ROM_region   = mem:[from 0 to 0x8000];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+
+place in ROM_region   { section .KMS_blob_Keys, last section aes_block_padding };
+keep { section .KMS_blob_Keys };
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
new file mode 100644
index 00000000..ec939c17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/KMS_Blob.sct
@@ -0,0 +1,14 @@
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+
+; *** regions needed by KMS_Blob project ***
+LR_ROM (0x00000000) ALIGN(16) {
+  ROM_region +0 {
+  *(.KMS_blob_Keys)
+  .ANY (+RO)
+  }
+  ALIGN_region +0 ALIGN(16) EMPTY(16) {
+  }
+} 
+ 
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..35a88778
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvoptx
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>1</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>0</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>BIN\UL2CM3.DLL</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_blob_example_keys.c</PathWithFileName>
+      <FilenameWithoutPath>kms_blob_example_keys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..4c05c195
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/Project.uvprojx
@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_KMS_Blob</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>KMS_blob</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L../../@L.bin</UserProg1Name>
+            <UserProg2Name>postbuild.bat .  @L 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS</Define>
+              <Undefine></Undefine>
+              <IncludePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../2_Images_SECoreBin/Inc</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>0</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>KMS_Blob.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--diag_suppress L6305W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>kms_blob_example_keys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_blob_example_keys.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_KMS_Blob"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
new file mode 100644
index 00000000..f4981f15
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/MDK-ARM/postbuild.bat
@@ -0,0 +1,56 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+@echo off
+::comment this line to force python
+::python is used if windows executable not found
+goto exe:
+goto py:
+:exe
+::line for window executable
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+set "prepareimage=%1\\..\\..\\..\\..\\..\\..\\Middlewares\\ST\\STM32_Secure_Engine\\Utilities\\KeysAndImages\\prepareimage.py"
+set "python=python "
+:postbuild
+
+set "bin=%1\\%2.bin"
+set "kmsu=%1\\..\\Binary\\%2.kmsu"
+set "kmsb=%1\\..\\Binary\\%2.kmsb"
+set "sign=%1\\..\\Binary\\%2.sign"
+set "iv=%1\\..\\Binary\\iv.bin"
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "ecckey=%1\\..\\Binary\\ECCKEY.txt"
+set "kmsBinary=%1\\..\\Binary\\"
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%kmsBinary%" (
+mkdir "%kmsBinary%"
+)
+
+:: When doing the AES CBC encrypt, prepareimage.py pads the input file if needed (to be a multiple of the AES block size = 16 bytes)
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %kmsu%  > %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+:: -p 16 indicates that the input file must be a multiple of the AES block size (16 bytes). Padding is done before computing the sha256 if needed.
+set "command=%python%%prepareimage% sha256 %1\\%2.bin %sign%  -p 16 >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% pack -k %ecckey%  -m "KMSB" -r 28 -v %3 -i %iv% -f %kmsu% -t %sign% -o 320 %kmsb% >> %1\output.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+::clean up the intermediate file
+del %sign%
+del %kmsu%
+
+
+exit 0
+:error
+:: remove the elf to force the regeneration
+del %elf%
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..a4620af6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.cproject
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="KMS_Blob" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../postbuild.sh&quot; &quot;..&quot; &quot;KMS_Blob&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1669346575" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.944369123" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.298158857" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.290249560" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1154508321" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2041438171" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1548146284" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1466210745" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../2_Images_SECoreBin/Inc ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/KMS_Blob.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1967342521" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_KMS_Blob}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1113520689" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207471465" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1059479948" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1433889975" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1351935685" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.455796024" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.634390140" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.889153004" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SECoreBin/Inc"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1956291565" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1441953164" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1903380026" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.787320659" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1970235885" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826688896" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.841499623" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.283084005" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/KMS_Blob.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.344707086" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.241795928" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.578933745" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1133750130" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.857465058" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1312517338" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1071361790" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.974344415" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_KMS_Blob.null.1082786794" name="2_Images_KMS_Blob"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2000907082.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.958621989;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1237343012">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
new file mode 100644
index 00000000..364b1864
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/.project
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_KMS_Blob</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_blob_example_keys.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_blob_example_keys.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
new file mode 100644
index 00000000..cf21882e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/STM32CubeIDE/KMS_Blob.ld
@@ -0,0 +1,29 @@
+/*
+** LinkerScript
+*/
+
+APPLI_region_ROM_start    = 0x00000000;
+APPLI_region_ROM_length   = 0x8000;
+
+/* Specify the memory areas */
+MEMORY
+{
+ APPLI_region_ROM  : ORIGIN = APPLI_region_ROM_start, LENGTH = APPLI_region_ROM_length
+}
+
+/* Define output sections */
+SECTIONS
+{
+  .rodata :
+  {
+    . = ALIGN(16);
+    KEEP(*(.KMS_blob_Keys))
+    . = ALIGN(16);
+  } >APPLI_region_ROM
+  
+  /DISCARD/ :
+  {
+    *(.init)
+    *(.fini)
+  }
+}
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
new file mode 100644
index 00000000..64af9746
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/Src/kms_blob_example_keys.c
@@ -0,0 +1,153 @@
+/**
+  ******************************************************************************
+  * @file    kms_blob_example_key.c
+  * @author  MCD Application Team
+  * @brief   Key Management Services module.
+  *          This file provides examples of data to be loaded as a blob
+  *          (provisioning).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#if !defined(KMS_ENABLED)
+#define KMS_ENABLED
+#endif /* KMS_ENABLED */
+
+#include "kms.h"
+#include "kms_platf_objects_interface.h"
+
+/* Custom Structures declaration */
+KMS_DECLARE_BLOB_STRUCT(, 225)
+KMS_DECLARE_BLOB_STRUCT(, 36)
+
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".KMS_blob_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".KMS_blob_Keys"
+#else
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* __ICCARM__ */
+
+const kms_obj_keyhead_225_t   Test_Key_RSA_2048 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,          /*   uint32_t configuration;     */
+  900,                             /*   uint32_t blobs_size;        */
+  11,                              /*   uint32_t blobs_count;       */
+  KMS_KEY_RSA2048_OBJECT_HANDLE,   /*   uint32_t object_id;         */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PRIVATE_KEY,               /* CLASS = PRIVATE KEY */
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_RSA,                           /* TYPE = RSA KEY */
+    CKA_TOKEN,        4, CK_TRUE,
+    CKA_LABEL,        16, 0x52455355U, 0x424F4C42U, 0x20415352U, 0x38343032U, /* 'USER', 'BLOB', 'RSA ', '2048' */
+    CKA_ID,           4, 123,
+    CKA_SENSITIVE,    4, CK_TRUE,                                             /* SENSITIVE KEY */
+    CKA_VERIFY,       4, CK_TRUE,                                             /* CAN BE USED FOR VERIFICATION */
+    CKA_SIGN,         4, CK_TRUE,                                             /* CAN BE USED FOR SIGNATURE */
+
+    CKA_MODULUS,      256,                                                    /* RSA KEY MODULUS */
+    0xcea80475U, 0x324c1dc8U, 0x34782781U, 0x8da58bacU,
+    0x069d3419U, 0xc614a6eaU, 0x1ac6a3b5U, 0x10dcd72cU,
+    0xc5169549U, 0x05e9fef9U, 0x08d45e13U, 0x006adf27U,
+    0xd467a7d8U, 0x3c111d1aU, 0x5df15ef2U, 0x93771aefU,
+    0xb920032aU, 0x5bb989f8U, 0xe4f5e1b0U, 0x5093d3f1U,
+    0x30f984c0U, 0x7a772a36U, 0x83f4dc6fU, 0xb28a9681U,
+    0x5b32123cU, 0xcdd13954U, 0xf19d5b8bU, 0x24a103e7U,
+    0x71a34c32U, 0x8755c65eU, 0xd64e1924U, 0xffd04d30U,
+    0xb2142cc2U, 0x62f6e004U, 0x8fef6dbcU, 0x652f2147U,
+    0x9ea1c4b1U, 0xd66d28f4U, 0xd46ef718U, 0x5e390cbfU,
+    0xa2e02380U, 0x582f3188U, 0xbb94ebbfU, 0x05d31487U,
+    0xa09aff01U, 0xfcbb4cd4U, 0xbfd1f0a8U, 0x33b38c11U,
+    0x813c8436U, 0x0bb53c7dU, 0x4481031cU, 0x40bad871U,
+    0x3bb6b835U, 0xcb08098eU, 0xd15ba31eU, 0xe4ba728aU,
+    0x8c8e10f7U, 0x294e1b41U, 0x63b7aee5U, 0x7277bfd8U,
+    0x81a6f9d4U, 0x3e02c692U, 0x5aa3a043U, 0xfb7fb78dU,
+
+    CKA_PUBLIC_EXPONENT, 256,                                                  /* RSA PUBLIC EXPONENT */
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00260445U,
+
+
+    CKA_PRIVATE_EXPONENT, 256,                                                  /* RSA PRIVATE EXPONENT */
+    0x0997634cU, 0x477c1a03U, 0x9d44c810U, 0xb2aaa3c7U,
+    0x862b0b88U, 0xd3708272U, 0xe1e15f66U, 0xfc938970U,
+    0x9f8a11f3U, 0xea6a5af7U, 0xeffa2d01U, 0xc189c50fU,
+    0x0d5bcbe3U, 0xfa272e56U, 0xcfc4a4e1U, 0xd388a9dcU,
+    0xd65df862U, 0x8902556cU, 0x8b6bb6a6U, 0x41709b5aU,
+    0x35dd2622U, 0xc73d4640U, 0xbfa1359dU, 0x0e76e1f2U,
+    0x19f8e33eU, 0xb9bd0b59U, 0xec198eb2U, 0xfccaae03U,
+    0x46bd8b40U, 0x1e12e3c6U, 0x7cb62956U, 0x9c185a2eU,
+    0x0f35a2f7U, 0x41644c1cU, 0xca5ebb13U, 0x9d77a89aU,
+    0x2953fc5eU, 0x30048c0eU, 0x619f07c8U, 0xd21d1e56U,
+    0xb8af0719U, 0x3d0fdf3fU, 0x49cd49f2U, 0xef3138b5U,
+    0x138862f1U, 0x470bd2d1U, 0x6e34a2b9U, 0xe7777a6cU,
+    0x8c8d4cb9U, 0x4b4e8b5dU, 0x616cd539U, 0x3753e7b0U,
+    0xf31cc7daU, 0x559ba8e9U, 0x8d888914U, 0xe334773bU,
+    0xaf498ad8U, 0x8d9631ebU, 0x5fe32e53U, 0xa4145bf0U,
+    0xba548bf2U, 0xb0a50c63U, 0xf67b14e3U, 0x98a34b0dU,
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".KMS_blob_Keys")))
+#endif /* (__GNUC__) */
+
+const kms_obj_keyhead_36_t   Test_Key_AES256_Derivable =
+{
+  KMS_ABI_VERSION_CK_2_40,                /*   uint32_t version;           */
+  KMS_ABI_CONFIG_KEYHEAD,                 /*   uint32_t configuration;     */
+  144,                                    /*   uint32_t blobs_size;        */
+  8,                                      /*   uint32_t blobs_count;       */
+  KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE, /*   uint32_t object_id;         */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE), CKK_AES,                          /* TYPE = AES KEY */
+    CKA_VALUE,        32, 0x603deb10U, 0x15ca71beU, 0x2b73aef0U, 0x857d7781U,
+    0x1f352c07U, 0x3b6108d7U, 0x2d9810a3U, 0x0914dff4U,
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO ENCRYPT */
+    CKA_DECRYPT,      sizeof(CK_BBOOL), CK_TRUE,                             /* CAN BE USED TO DECRYPT */
+    CKA_TOKEN,        sizeof(CK_BBOOL), CK_TRUE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,               /* CLASS = SECRET KEY */
+    CKA_DERIVE,       sizeof(CK_BBOOL), (uint8_t)CK_TRUE,                    /* CAN BE USED TO DERIVE A NEW KEY */
+    CKA_LABEL,        24, 0x52455355U, 0x424F4C42U, 0x50595243U, 0x49524544U, 0x4C424156U, 0x00000045U,
+    /* 'USER', 'BLOB', 'CRYP', 'DERI', 'VABL', 'E' */
+  }
+};
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_function_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif /* (__ICCARM__) */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/readme.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/readme.txt
new file mode 100644
index 00000000..2bbeb396
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_KMS_Blob/readme.txt
@@ -0,0 +1,62 @@
+/**
+  @page 2_Images_KMS_Blob / Key Management Services / Blob generation project.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2019 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Key Management Services Blob generation.
+  *          Allows to generate Blob to be injected to a device supporting
+  *          KMS ImportBlob().
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description 
+
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+
+You can edit your own keys to generate your own Blob.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Cryptography, KMS, Provisioning
+
+@par Directory contents
+
+   - 2_Images_KMS_Blob/Src/kms_blob_example_keys.c             KMS blob objects definition
+   - 2_Images_KMS_Blob/Binary/ECCKEY.txt                       Private ECCDSA key for signature verification
+   - 2_Images_KMS_Blob/Binary/iv.bin                           Encryption/decryption initialization vector
+   - 2_Images_KMS_Blob/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+
+@par Hardware and Software environment
+
+  - This example runs on STM32WL55xx devices
+  - This example has been tested with NUCLEO-WL55JC RevC board and can be
+    easily tailored to any other supported device and development board.
+  - Python installation required. In addition, install the appropriate python modules as described in
+    Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages\readme.txt
+    
+    
+@par How to use it ? 
+
+In order to generate Secure Key Storage Blob file, you must do the following :
+ - Edit the .c source file, where examples of keys are provided. Update with your own keys.
+ - Open your preferred toolchain 
+ - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
new file mode 100644
index 00000000..696d8368
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h
@@ -0,0 +1,49 @@
+/**
+  ******************************************************************************
+  * @file    app_hw.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update hardware
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_HW_H
+#define APP_HW_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported macros -----------------------------------------------------------*/
+/* At power-on, the capacitor related to SW1 button needs to charge.
+ * The charging time must be waited to be sure that a low level is a real one. */
+#define BUTTON_INIT() \
+  BSP_PB_Init(BUTTON_SW1,BUTTON_MODE_GPIO);                               \
+  if ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET) \
+  {                                                                       \
+     HAL_Delay(6U);                                                       \
+  }
+
+#define BUTTON_PUSHED()      ((uint32_t) BSP_PB_GetState(BUTTON_SW1) == (uint32_t)GPIO_PIN_RESET)
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_HW_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
new file mode 100644
index 00000000..5ac7113c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/main.h
@@ -0,0 +1,32 @@
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAIN_H
+#define MAIN_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_nucleo.h"
+#include "app_sfu.h"
+#include "app_hw.h"
+
+#endif /* MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..8fff5bd0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+#define HAL_GTZC_MODULE_ENABLED
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..f6b5e516
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,53 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* External variables --------------------------------------------------------*/
+extern RTC_HandleTypeDef    RtcHandle;
+
+/* Exported functions ------------------------------------------------------- */
+void SVC_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+void RTC_LSECSS_IRQHandler(void);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+void TZIC_ILA_IRQHandler(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
new file mode 100644
index 00000000..df18911f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/main.c
@@ -0,0 +1,89 @@
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main application file.
+  *          This application demonstrates Secure Boot and Secure Firmware Update.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_boot.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  main function
+  * @param  None
+  * @retval int
+  */
+int main(void)
+{
+
+  /* MCU Configuration--------------------------------------------------------*/
+  /* This part is NOT secure (security mechanisms NOT enabled yet)            */
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick*/
+  (void) HAL_Init();
+
+  /* Board BSP  Configuration-------------------------------------------------*/
+  /*
+   * As the secure mode has not been entered yet, we do not configure BSP right now .
+   * The BSP will be configured by the bootloader.
+   */
+
+
+  /* Launch the Bootloader----------------------------------------------------*/
+  /*
+   * This is the beginning of the secure part:
+   * security mechanisms will be enabled.
+   * The function below should not return (unless a critical failure is encountered).
+   */
+  (void)SFU_BOOT_RunSecureBootService(); /* no need to take care of the returned value as we reboot in all cases */
+
+  /* Security or SecureBoot initialization failure. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+}
+
+
+
+
+
+
+#ifdef USE_FULL_ASSERT
+
+/**
+  * @brief Reports the name of the source file and the source line number
+  * where the assert_param error has occurred.
+  * @param file: pointer to the source file name
+  * @param line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* USER CODE END 6 */
+
+}
+
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..1c509696
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_msp.c
+  * @author  MCD Application Team
+  * @brief   This file provides code for the MSP Initialization
+  *          and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0U, 0U);
+
+}
+
+/**
+  * @brief RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspInit(hrtc);
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in this example.
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  SFU_LL_RTC_MspDeInit(hrtc);
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspInit(huart);
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in this example:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void HAL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+  SFU_LL_UART_MspDeInit(huart);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..47e5904e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,100 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+#include "sfu_low_level_security.h"
+
+/* Global variables ----------------------------------------------------------*/
+/* RTC handler declaration */
+RTC_HandleTypeDef RtcHandle;
+
+/* Functions Definition ------------------------------------------------------*/
+/******************************************************************************/
+/*            Cortex-M0+ Processor Interruption and Exception Handlers         */
+/******************************************************************************/
+
+/* Exception handlers are implemented in the various source files of sbsfu application */
+
+/* NMI exception handler is implemented in sfu_low_level_flash_int.c file */
+/* Hard Fault exception handler is implemented in sfu_boot.c file */
+
+/* SVC call handler is implemented in se_sfu_mpu.s */
+
+
+/**
+  * @brief  This function handles PendSVC exception.
+  * @param  None
+  * @retval None
+  */
+void PendSV_Handler(void)
+{
+}
+
+/**
+  * @brief  This function handles SysTick Handler.
+  * @param  None
+  * @retval None
+  */
+void SysTick_Handler(void)
+{
+  HAL_IncTick();
+}
+
+/******************************************************************************/
+/*                 STM32WLxx Peripherals Interrupt Handlers                  */
+/*  Add here the Interrupt Handler for the used peripheral(s) (PPP), for the  */
+/*  available peripheral interrupt handler's name please refer to the startup */
+/*  file (startup_stm32wlxx.s).                                               */
+/******************************************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  This function handles Tamper interrupt request.
+  * @param  None
+  * @retval None
+  */
+void RTC_LSECSS_IRQHandler()
+{
+  /* Handle only the tamper enabled by SBSFU */
+  uint32_t tmp = READ_REG(TAMP->MISR) & RTC_TAMPER_ID;
+
+  /* Immediately clear flags to avoid eternal resets */
+  WRITE_REG(TAMP->SCR, tmp);
+
+  /* SRAM2 is erased and RtcHandle is corrupted: no specific handling is possible. */
+  NVIC_SystemReset();
+}
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  This function handles TZIC interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TZIC_ILA_IRQHandler(void)
+{
+  HAL_GTZC_IRQHandler();
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
new file mode 100644
index 00000000..2adf5e24
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h
@@ -0,0 +1,206 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_crypto_config.h"
+#include "app_sfu_common.h"
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Use this define to choose the type of Firmware Image Programming you want to use.
+  * This version supports only 2 modes:
+  *
+  * SFU_ENCRYPTED_IMAGE: Encrypted Firmware Image
+  *       The image is received in encrypted format.
+  *       The image must be decrypted to be installed:
+  *         this is done according to the selected crypto scheme,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  * SFU_CLEAR_IMAGE: Clear Firmware Image
+  *       The image is received in clear format.
+  *       No decrypt operation is needed before installing the image:
+  *         the selected crypto scheme must be compatible with this choice,
+  *         see @ref SECBOOT_CRYPTO_SCHEME in the SE_CoreBin part.
+  *
+  *
+  */
+#if  SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_CLEAR_IMAGE
+#else
+#define SFU_IMAGE_PROGRAMMING_TYPE SFU_ENCRYPTED_IMAGE
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+#define SFU_ENCRYPTED_IMAGE (0U) /*!< The Firmware Image to be installed is downloaded in ENCRYPTED format */
+#define SFU_CLEAR_IMAGE     (1U) /*!< The Firmware Image to be installed is downloaded in CLEAR format */
+
+#define SFU_DEBUG_MODE               /*!< Comment this define to optimize memory footprint (debug mode removed)
+                                          No more print on terminal during SBSFU execution */
+
+/*#define SFU_VERBOSE_DEBUG_MODE*/   /*!< Uncomment this define when in verbose Debug mode.
+                                          this switch activates more debug prints in the console (FSM state info...) */
+
+
+/*#define SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE*/  /*!< You may uncomment this define when running development tests.
+                                                          When this switch is activated, the FWIMG part of SB_SFU will
+                                                          block when an abnormal error is encountered */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE) && !defined(SFU_DEBUG_MODE)
+#error You cannot activate SFU_VERBOSE_DEBUG_MODE without activating SFU_DEBUG_MODE too.
+#endif /* SFU_VERBOSE_DEBUG_MODE && !SFU_DEBUG_MODE */
+
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE) && !defined(SFU_DEBUG_MODE)
+#error SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is meant to be used in DEBUG mode
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE && !SFU_DEBUG_MODE */
+
+/*#define SFU_TEST_PROTECTION*/       /*!< Auto-test of protections : WRP, PCROP, MPU, FWALL.
+                                           Automatically executed @startup */
+#if defined(SFU_TEST_PROTECTION)
+#undef SFU_DEBUG_MODE                 /*!< Remove definition to optimize memory footprint (debug mode removed) */
+#endif /* SFU_TEST_PROTECTION */
+
+/**
+  * SB_SFU status LED.
+  * The constants below define the LED to be used and the LED blinking frequency to identify some situations.
+  * This is useful when no log is enabled.
+  *
+  * \li The LED blinks every see @ref SFU_COM_YMODEM_DOWNLOAD_TIMEOUT seconds when a local download is waited.
+  * \li For the other situations, please check the other defines below.
+  */
+#define SFU_STATUS_LED (LED_GREEN)            /*!< LED to be used to provide the SB_SFU status to the end-user */
+#define SFU_STOP_NO_FW_BLINK_DELAY     (100U) /*!< Blinks every 100ms when no valid firmware is available and the local
+                                                   loader feature is disabled - see @ref SECBOOT_USE_LOCAL_LOADER */
+#define SFU_INCORRECT_OB_BLINK_DELAY   (250U) /*!< Blinks every 250ms when an Option Bytes issue is detected */
+
+
+/**
+  * Optional Features Software Configuration
+  */
+#if !defined(SFU_TEST_PROTECTION)
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+#else
+#define SECBOOT_LOADER SECBOOT_USE_NO_LOADER       /*!< No loader usage forced when SFU_TEST_PROTECTION is set */
+#endif /* SFU_TEST_PROTECTION */
+
+#define SECBOOT_USE_LOCAL_LOADER              (1U) /*!< local loader feature integrated into SBSFU (YMODEM over UART) */
+#define SECBOOT_USE_STANDALONE_LOADER         (2U) /*!< standalone loader : see specific loader project  */
+#define SECBOOT_USE_NO_LOADER                 (3U) /*!< no loader capability at SBSFU stage */
+
+/* Uncomment the define below if you want to use minicom with Linux */
+/* #define MINICOM_YMODEM */                       /*!< YMODEM protocol handled by MINICOM (Linux): 128 bytes packets */
+
+#if defined(MINICOM_YMODEM)
+/* Minicom does not accept the debug prints during the YMODEM session */
+#undef SFU_VERBOSE_DEBUG_MODE
+#endif /* MINICOM_YMODEM */
+
+
+/* Multi-images configuration :
+   - Max : 3 Active images
+   - Do not forget to add keys for each image in SE_Corebin/Binary folder
+   - Master slot : image started in priority if valid
+*/
+#define SFU_NB_MAX_ACTIVE_IMAGE 2U                        /*!< 2 active images managed */
+#define SFU_NB_MAX_DWL_AREA     1U                        /*!< 1 blob dwl area managed */
+#define MASTER_SLOT             SLOT_ACTIVE_1             /*!< SLOT_ACTIVE_1 identified as master slot */
+
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_RDP_PROTECT_ENABLE
+/*#define SFU_TAMPER_PROTECT_ENABLE */  /*!< WARNING : Tamper protection deactivated. As the tamper tamper pin is
+                                             neither connected to GND nor to 5V (floating level), there are too many
+                                             spurious tamper event detected */
+/* #define SFU_IWDG_PROTECT_ENABLE  */  /*!< WARNING:
+                                        1. Be Careful if enabling this protection. IWDG will be active also after
+                                           switching to UserApp: a refresh is needed.
+                                        2. The IWDG reload in the SB_SFU code will have to be tuned depending on your
+                                           platform (flash size...)*/
+#define SFU_MPU_PROTECT_ENABLE     /*!< MPU protection:
+                                        Enables/Disables the MPU protection.
+                                        If Secure Engine isolation is ensured by MPU (see SFU_ISOLATE_SE_WITH_MPU in
+                                        SE_CoreBin\Inc\se_low_level.h), then this switch also enables/disables it, in
+                                        addition to the overall MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION /*!< MPU protection during UserApp execution : Only active slot(s) considered as an
+                                        executable area */
+
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_GTZC_PROTECT_ENABLE    /*!< GTZC protection (dependent on SFU_SECURE_USER_PROTECT_ENABLE):
+                                        Enables/Disables the GTZC protection. */
+#define SFU_C2SWDBG_PROTECT_ENABLE /*!< Dynamic disabling of the CPU2 debug:
+                                        not writable if ESE=0, no meaning if DDS=1. */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_2)  /*!< RDP level2 for product on the field. Final OB lock, Debug
+                                                      completely disabled, OB update no more possible  */
+
+
+#else
+#define SFU_PROTECT_RDP_LEVEL  (OB_RDP_LEVEL_1)  /*!< RDP level is set as 1 for debugging purposes. A product on the
+                                                      field should set it as Level2 */
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+
+#define SFU_IWDG_TIMEOUT  ((uint32_t)15) /*!< IWDG timeout in seconds (the max. value that can be set here depends on
+                                              the prescaler settings: IWDG_PRESCALER_XXX. ) */
+
+
+/**
+  * Application Configuration
+  *
+  */
+#define SFU_FW_VERSION_START_NUM (1U)    /*!< The very first version number a Firmware can have
+                                              You can also define an upper bound here if you plan to use it */
+
+#define SFU_FW_VERSION_INIT_NUM (1U)     /*!< The version number accepted when the header is not valid (either because 
+                                              no FW installed or due to an attack attempt). Could be different from
+                                              SFU_FW_VERSION_START_NUM */
+
+/**
+  * Features compatibility control
+  */
+#if defined(SFU_NO_SWAP) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_NO_SWAP process"
+#endif
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE) && defined(ENABLE_IMAGE_STATE_HANDLING)
+#warning "ENABLE_IMAGE_STATE_HANDLING not compatible with SFU_SECURE_USER_PROTECT_ENABLE process"
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
new file mode 100644
index 00000000..b04ef4cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c
@@ -0,0 +1,1552 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.c
+  * @author  MCD Application Team
+  * @brief   SFU BOOT module
+  *          This file provides firmware functions to manage the following
+  *          functionalities of the Secure Boot:
+  *           + Initialization and de-initialization functions
+  *           + Secure Boot Control functions
+  *           + Secure Boot State functions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_BOOT_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+#include "sfu_boot.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "stm32wlxx_it.h" /* required for the HAL Cube callbacks */
+
+/*
+ * The sfu_com init is provided by the sfu_com_trace module by default.
+ * If not, then it is taken from the sfu_com_loader module.
+ */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_trace.h"
+#else
+#include "sfu_trace.h"      /* needed anyhow even if the defines will be empty */
+#include "sfu_com_loader.h" /* needed only for the COM init/de-init */
+#endif /* SFU_DEBUG_MODE  || SFU_TEST_PROTECTION */
+#include "se_def.h"
+#include "se_interface_bootloader.h"  /* sfu_boot is the bootloader core part */
+#include "sfu_new_image.h"            /* the local loader is a kind of "application" running in SB_SFU so it needs the
+                                         services to install a FW image */
+#include "sfu_fwimg_services.h"       /* sfu_boot uses the services of the FWIMG module */
+#include "sfu_test.h"                 /* auto tests */
+#include "sfu_fwimg_internal.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifdef KMS_ENABLED
+#include "tkms.h"
+#include "sfu_kms.h"
+#endif /* KMS_ENABLED */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct
+{
+  SFU_BOOT_StateMachineTypeDef  PrevState;      /*!< The previous state of the State Machine */
+  SFU_BOOT_StateMachineTypeDef  CurrState;      /*!< The current state of the State Machine */
+} SFU_BOOT_StateMachineContextTypeDef;          /*!< Specifies a structure containing the State Machine context
+                                                     information using during the SM evolution. */
+
+/* Private defines -----------------------------------------------------------*/
+#define EXEC_ID_SECURE_BOOT     0U       /*!< ID for Secure Boot */
+#define EXEC_ID_USER_APP        1U       /*!< ID for User App */
+#define IS_VALID_EXEC_ID(EXEC_ID)        (((EXEC_ID) == EXEC_ID_SECURE_BOOT) || \
+                                          ((EXEC_ID) == EXEC_ID_USER_APP)) /*!< Check for valid ID */
+
+#define RESERVED_VALUE (0xFEU) /*!< Reserved value. The reserved field used inside the LastExecStatus of the BootInfo is 
+                                    maintained for future customization/expansion of the field itself */
+
+#define SFU_STATE_INITIAL     SFU_STATE_CHECK_STATUS_ON_RESET  /*!< Define the initial state*/
+
+/* Private macros ------------------------------------------------------------*/
+#define SFU_SET_SM_IF_CURR_STATE(Status, SM_STATE_OK, SM_STATE_FAILURE) \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    if (Status == SFU_SUCCESS){                                         \
+      m_StateMachineContext.CurrState = SM_STATE_OK;                    \
+    }                                                                   \
+    else {                                                              \
+      m_StateMachineContext.CurrState = SM_STATE_FAILURE;               \
+    }                                                                   \
+  }while(0) /*!< Set a State Machine state according to the 'Status' value*/
+
+
+#define SFU_SET_SM_CURR_STATE(NewState)                                 \
+  do{                                                                   \
+    m_StateMachineContext.PrevState = m_StateMachineContext.CurrState;  \
+    m_StateMachineContext.CurrState = NewState;                         \
+  }while(0) /*!< Set a State Machine state*/
+
+/* Private variables ---------------------------------------------------------*/
+/*!< Static member variables representing the StateMachine context used during the StateMachine evolution. */
+static __IO SFU_BOOT_StateMachineContextTypeDef m_StateMachineContext = {SFU_STATE_INITIAL,
+                                                                         SFU_STATE_INITIAL
+                                                                        };
+
+/*!< Static member variables identifyng the slots to be processed by secure firmware update . */
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static uint32_t m_DwlSlotToInstall = SLOT_INACTIVE;
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+static uint32_t m_ActiveSlotToExecute = SLOT_INACTIVE;
+static uint32_t m_C1ActiveSlot = SLOT_INACTIVE;
+static uint32_t m_C2ActiveSlot = SLOT_INACTIVE;
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+uint8_t initialDeviceStatusCheck;
+
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_BOOT_Init(void);
+static SFU_ErrorStatus SFU_BOOT_DeInit(void);
+static void SFU_BOOT_BspConfiguration(void);
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void);
+static void SFU_BOOT_SM_CheckStatusOnReset(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static void SFU_BOOT_SM_CheckNewFwToDownload(void);
+static void SFU_BOOT_SM_DownloadNewUserFw(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void);
+static void SFU_BOOT_SM_InstallKMSBlob(void);
+#endif /* KMS_ENABLED */
+static void SFU_BOOT_SM_CheckUserFwStatus(void);
+static void SFU_BOOT_SM_VerifyUserFwSignature(void);
+static void SFU_BOOT_SM_ExecuteUserFw(void);
+static void SFU_BOOT_SM_HandleCriticalFailure(void);
+static void SFU_BOOT_SM_RebootStateMachine(void);
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void);
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void);
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void);
+static void SFU_BOOT_ManageResetSources(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief This function starts the secure boot service and returns only if a configuration issue occurs.
+  *        In the nominal case, the bootloader service runs until the user application is launched.
+  *        When no valid user application can be run (after installing a new image or not),
+  *        if the local loader feature is not enabled then the execution stops,
+  *        otherwise a local download will be awaited.
+  *        If the state machine encounters a major issue then a reboot is triggered.
+  * @param None.
+  * @note Please note that this service initializes all the required sub-services and rely on them to perform its tasks.
+  * @note Constraints
+  *       1. The system initialization must be completed (HAL, clocks, peripherals...) before calling this function.
+  *       2. This function also takes care of BSP initialization after enabling the secure mode.
+  *          The BSP init code can be added in @ref SFU_BOOT_BspConfiguration().
+  *       3. No other entity should handle the initialization of the Secure Engine.
+  *       4. The other SB_SFU services should NOT be configured by other entities if this service is used (the previous
+  *          configurations will be overwritten).
+  *       5. The other SB_SFU services should NOT be used by any other entity if this service is running.
+  *       6. When returning from this function a reboot should be triggered (NVIC_SystemReset) after processing the
+  *          error cause.
+  *       7. The caller must be prepared to never get the hand back after calling this function (jumping in user
+  *          application by default or entering local loader state if local loader is enabled or rebooting to install a
+  *          new image).
+  * @note Settings are handled at compilation time:
+  *       1. See compiler switches in main.h for secure IPs settings
+  *       2. The trace system is configured in the sfu_trace.h file
+  * @retval SFU_BOOT_InitErrorTypeDef error code as the function returns only if a critical failure occurs at init
+  *          stage.
+  */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService()
+{
+  SFU_BOOT_InitErrorTypeDef e_ret_code = SFU_BOOT_INIT_ERROR;
+
+  /*
+   * initialize Secure Engine variable as secure Engine is managed as a completely separate binary - not
+   * "automatically" managed by SBSFU compiler command
+   */
+  if (SE_Startup() == SE_SUCCESS)
+  {
+    /* Security Configuration */
+    if (SFU_BOOT_SystemSecurity_Config() == SFU_SUCCESS)
+    {
+      /* Board BSP  Configuration */
+      SFU_BOOT_BspConfiguration();
+
+      /* Configure the Secure Boot and start the State machine */
+      if (SFU_BOOT_Init() == SFU_SUCCESS)
+      {
+        /* Start the Secure Boot State Machine */
+        (void) SFU_BOOT_SM_Run();
+      }
+      else
+      {
+        /* failure when initializing the secure boot service */
+        e_ret_code = SFU_BOOT_INIT_FAIL;
+      }
+    }
+    else
+    {
+      /* failure when configuring the security IPs  */
+      e_ret_code = SFU_BOOT_SECIPS_CFG_FAIL;
+    }
+  }
+  else
+  {
+    /* failure at secure engine initialization stage */
+    e_ret_code = SFU_BOOT_SECENG_INIT_FAIL;
+  }
+
+  /*
+   * This point should not be reached unless a critical init failure occurred
+   * Return the error code
+   */
+  return (e_ret_code);
+}
+
+/**
+  * @brief  Force System Reboot
+  * @param  None
+  * @retval None
+  */
+void SFU_BOOT_ForceReboot(void)
+{
+  /*
+   * WARNING: The follow TRACEs are for debug only. This function could be called
+   * inside an IRQ so the below printf could not be executed or could generate a fault!
+   */
+  TRACE("\r\n========= End of Execution ==========");
+  TRACE("\r\n\r\n\r\n");
+
+  /*
+   * This is the last operation executed. Force a System Reset.
+   * The check below is needed in case we reboot before setting the Unpriviledged mode.
+   * This can happen in a factory reset use-case typically.
+   */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  Initialize the Secure Boot State machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_Init(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status;
+
+  /*
+   * We start the execution at boot-up (display all messages in teraterm console, check the trigger to force a local
+   * download)
+   */
+  initialDeviceStatusCheck = 1U;
+
+  /* Call the Hardware Abstraction Layer Init implemented for the specific MCU */
+  if (SFU_LL_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Flash interface initialization */
+  if (SFU_LL_FLASH_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* The COM modules is required only if the trace or the local download is enabled */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  /* Call the COM module Init (already handled in SFU_BOOT_SystemSecurity_Config) */
+  if (SFU_COM_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER || SFU_DEBUG_MODE || SFU_TEST_PROTECTION*/
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  /* Call the SFU_LOADER module Init */
+  if (SFU_LOADER_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+  /* Call the Exception module Init */
+  if (SFU_EXCPT_Init() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  /* Call the image handling Init  */
+  if (SFU_IMG_InitImageHandling() != SFU_IMG_INIT_OK)
+  {
+    return SFU_ERROR;
+  } /* else continue */
+
+
+  TRACE("\r\n\r\n");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n=              (C) COPYRIGHT 2017 STMicroelectronics                 =");
+  TRACE("\r\n=                                                                    =");
+  TRACE("\r\n=              Secure Boot and Secure Firmware Update                =");
+  TRACE("\r\n======================================================================");
+  TRACE("\r\n\r\n");
+
+  /* Initialize the Secure Engine that will be used for all the most critical operations */
+  if (SE_Init(&e_se_status, SystemCoreClock) != SE_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION CRITICAL FAILURE!");
+  }
+  else
+  {
+    e_ret_status = SFU_SUCCESS;
+    TRACE("\r\n= [SBOOT] SECURE ENGINE INITIALIZATION SUCCESSFUL");
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize the Secure Boot State machine.
+  * @param  None
+  * @note   Please note that in this example the de-init function is used only once to avoid a compiler warning.
+  *         The bootloader can terminate:
+  *         1. with an init failure : no de-init needed
+  *         2. with a critical failure leading to a reboot: no de-init needed as long as no persistent info is stored
+  *            by this function.
+  *         3. when launching the user app: de-init may be called here if required as long as it does not disengage the
+  *            required security mechanisms.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_DeInit(void)
+{
+  if (SFU_EXCPT_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  if (SFU_LOADER_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* SECBOOT_USE_LOCAL_LOADER */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  if (SFU_COM_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+  if (SFU_LL_DeInit() != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  BSP Initialization.
+  *         Called when the secure mode is enabled.
+  * @note   The BSP configuration should be handled only in this function.
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_BspConfiguration()
+{
+  /* LED Init*/
+  (void) BSP_LED_Init(SFU_STATUS_LED);
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  /* User Button */
+  BUTTON_INIT();
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+/**
+  * @brief  Execute the Secure Boot state machine.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SM_Run(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_SUCCESS;
+  void (*fnStateMachineFunction)(void);
+  static void (* fnStateMachineTable[])(void) = {SFU_BOOT_SM_CheckStatusOnReset,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+                                                 SFU_BOOT_SM_CheckNewFwToDownload,
+                                                 SFU_BOOT_SM_DownloadNewUserFw,
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+                                                 SFU_BOOT_SM_CheckKMSBlobToInstall,
+                                                 SFU_BOOT_SM_InstallKMSBlob,
+#endif /* KMS_ENABLED */
+                                                 SFU_BOOT_SM_CheckUserFwStatus,
+                                                 SFU_BOOT_SM_VerifyUserFwSignature,
+                                                 SFU_BOOT_SM_ExecuteUserFw,
+                                                 SFU_BOOT_SM_HandleCriticalFailure,
+                                                 SFU_BOOT_SM_RebootStateMachine
+                                                };
+
+  /* Start the State Machine loop/evolution */
+  while (e_ret_status == SFU_SUCCESS)
+  {
+    /* Always execute a security/safety check before moving to the next state */
+    if (SFU_BOOT_SecuritySafetyCheck() == SFU_SUCCESS)
+    {
+      /* Get the right StateMachine function according to the current state */
+      fnStateMachineFunction = fnStateMachineTable[(uint8_t)m_StateMachineContext.CurrState];
+
+      /* Call the State Machine function associated to the current state */
+      fnStateMachineFunction();
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* If the State Machine cannot evolve anymore, reboot is the only option */
+
+  /* Set the error before forcing a reboot */
+  SFU_EXCPT_SetError(SFU_EXCPT_UNKNOWN);
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+
+  return e_ret_status;
+}
+
+/** @brief  Check the Reset status in order to understand the last cause of Reset
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckStatusOnReset(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: CHECK STATUS ON RESET");
+
+  /* Check the wakeup sources */
+  SFU_BOOT_ManageResetSources();
+
+  /* RCC access done to identify the wakeup sources, we can switch to unpriviledged */
+  SFU_MPU_EnterUnprivilegedMode();
+#ifdef SFU_TEST_PROTECTION
+  /*
+   * All protections are installed and the correct execution mode is set (unprivileged).
+   * This is the good time to run the auto-tests.
+   */
+  SFU_TEST_Init();
+#endif /* SFU_TEST_PROTECTION */
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+  /* When the local loader feature is supported we need to check if a local download is requested */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+#ifdef KMS_ENABLED
+  /* When the local loader feature is disabled go directly to the check of the KMS blob presence */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* When the local loader feature is disabled go directly to the check of the FW status */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) || (SECBOOT_LOADER == SECBOOT_DUAL_CORE_LOADER)
+/**
+  * @brief  Check if a new UserApp firmware is available for downloading.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckNewFwToDownload(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_DWL_REQ)
+  {
+    TRACE("\r\n= [SBOOT] STATE: execution standalone loader");
+    e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+    /* This is unreachable code (dead code) in principle...
+    At this point we should not be able to reach the following instructions.
+    If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+    SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    /* At boot-up, before checking the FW status, a local download can be forced thanks to the user button */
+    TRACE("\r\n= [SBOOT] STATE: CHECK NEW FIRMWARE TO DOWNLOAD");
+    if (0U != BUTTON_PUSHED())
+    {
+      /* Download requested */
+      e_ret_status = SFU_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /*
+     * The FW status has already been checked and no FW can be launched: no need to check the trigger, wait for a local
+     * download to start
+     */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+#ifdef KMS_ENABLED
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL);
+#else
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_DOWNLOAD_NEW_USER_FW, SFU_STATE_VERIFY_USER_FW_STATUS);
+#endif /* KMS_ENABLED */
+
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)*/
+
+#ifdef KMS_ENABLED
+/**
+  * @brief  Check if a KMSBlob is waiting for installation.
+  *         This state can be entered only from SFU_STATE_CHECK_STATUS_ON_RESET when the local loader feature is
+  *         disabled.
+  *         This state can be entered only from SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD when the local loader feature is
+  *         enabled.
+  *         In this latter case,
+  *               if a new Firmware download is requested,
+  *               it has priority over the KMS blob installation,
+  *               and the KMS blob installation request will be lost.
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckKMSBlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  SFU_KMS_BlobInstallStateTypeDef e_PendingInstallStatus;
+
+  /* At boot-up, before checking the FW status, we must check if a KMS blob installation is pending */
+  TRACE("\r\n= [SBOOT] STATE: CHECK KMS BLOB TO INSTALL");
+
+  /* Check if a Blob Installation is requested or on-going */
+  e_PendingInstallStatus = SFU_KMS_CheckPendingBlobInstallation();
+
+  if (SFU_KMS_NO_BLOBUPDATE != e_PendingInstallStatus)
+  {
+    /* Blob installation requested */
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_INSTALL_KMS_BLOB, SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+/**
+  * @brief  Check if a KMSBlob is waiting for install.
+  *         When entering this state from SFU_STATE_CHECK_STATUS_ON_RESET (initialDeviceStatusCheck=1) it is required
+  *         to press the user button to force the local download.
+  *         When entering this state from SFU_STATE_VERIFY_USER_FW_STATUS the local download is awaited automatically
+  *         (because there is no other action to do).
+  * @param  None
+  * @note   This function must set the next State Machine State.
+  * @retval None
+  */
+static void SFU_BOOT_SM_InstallKMSBlob(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  uint8_t         *pBlobHdr;
+  uint8_t         *pBlobInFlash;
+  CK_RV           e_status;
+
+  /* At boot-up, Managing ImportBlob through KMS services.  */
+  TRACE("\r\n= [SBOOT] STATE: INSTALL KMS BLOB");
+
+  /* Here we will Launch SE service to take consume the Blob */
+  /* When the Service confirms that the Blob is installed, then we can erase the SWAP */
+  e_ret_status = SFU_KMS_GetBlobInstallInfo(&pBlobHdr, &pBlobInFlash);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN RETRIEVING BLOB LOCATION");
+  }
+  else
+  {
+    /* Initialize KMS in order to be able to import blob using internal algorithms */
+    e_status = C_Initialize(NULL);
+    if (e_status == CKR_OK)
+    {
+      /* we do not take the return value into account as we will not retry the import in case of issue */
+      e_status = C_STM_ImportBlob(pBlobHdr, pBlobInFlash);
+
+      if (e_status != CKR_OK)
+      {
+        (void)C_Finalize(NULL);
+      }
+      else
+      {
+        e_status = C_Finalize(NULL);
+      }
+    }
+
+    if (e_status != CKR_OK)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN COMMUNICATING WITH KMS");
+    }
+
+    /* In any case, we remove the Blob To Install (regardless of the result) */
+    e_ret_status = SFU_KMS_EraseBlob();
+
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] INSTALL KMS: ERROR WHEN ERASING KMS BLOB");
+    }
+
+    /* Display the KMS import result */
+    switch (e_status)
+    {
+      case CKR_OK:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS BLOB WELL INSTALLED");
+        e_ret_status = SFU_SUCCESS;
+        break;
+
+      case CKR_SIGNATURE_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB AUTHENT ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DATA_INVALID:
+        /* At boot-up, Crypto Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: BLOB FORM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_DEVICE_ERROR:
+        /* At boot-up, NVM Error when trying to install KMSBlob.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: NVM ERROR WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      case CKR_OPERATION_ACTIVE:
+        /* At boot-up, trying to install KMSBlob while KMS is being use.  */
+        TRACE("\r\n= [SBOOT] INSTALL KMS: KMS KEYS IN USE WHEN INSTALLING KMS BLOB");
+        e_ret_status = SFU_ERROR;
+        break;
+
+      default:
+        TRACE("\r\n= [SBOOT] INSTALL KMS: UNKNOWN STATUS");
+        e_ret_status = SFU_ERROR;
+        break;
+    }
+  }
+
+  /* Set the next State Machine regardless of the KMS import result */
+  SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_STATUS);
+}
+
+#endif /* KMS_ENABLED */
+
+
+/**
+  * @brief  Check the Status of the Fw Image to work on  in order to set the next
+  *         State Machine state accordingly
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_CheckUserFwStatus(void)
+{
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  uint32_t i;
+
+  if (initialDeviceStatusCheck == 1U)
+  {
+    TRACE("\r\n= [SBOOT] STATE: CHECK USER FW STATUS");
+  }
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  if (STANDALONE_LOADER_STATE == STANDALONE_LOADER_INSTALL_REQ)
+  {
+    /* Whatever the status the decryption can be done only once ==> no interruption allowed */
+    STANDALONE_LOADER_STATE = STANDALONE_LOADER_NO_REQ;
+
+    TRACE("\r\n\t  New Fw Encrypted, to be decrypted");
+
+    /* Check if there is a pending action related to a FW update procedure */
+    if (SFU_IMG_CheckPendingInstallation(&m_DwlSlotToInstall) == SFU_IMG_FWIMAGE_TO_INSTALL)
+    {
+      /* Check the candidate version vs current active version */
+      e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+
+      if (SFU_SUCCESS != e_ret_status)
+      {
+        /* Erase downloaded FW in case of authentication/integrity error */
+        (void) SFU_IMG_EraseDownloadedImg(m_DwlSlotToInstall);
+      }
+      else
+      {
+        /* Secure coding : double check the candidate version vs current active version */
+        e_ret_status = SFU_IMG_CheckCandidateVersion(m_DwlSlotToInstall);
+      }
+
+      if (SFU_SUCCESS == e_ret_status)
+      {
+        /* Start installation */
+        e_ret_status = SFU_IMG_TriggerImageInstallation(m_DwlSlotToInstall);
+      }
+    }
+
+    /* Critical failure management if installation failed */
+    if (e_ret_status != SFU_SUCCESS)
+    {
+      SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+      return;
+    }
+  }
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+  /*
+   * No FW image installation pending :
+   *   1- Check if firmwares are detected for C1 and C2 (MASTER_SLOT)
+   *   2- No active firmware candidate for execution ==> Local download
+   *
+   * This strategy can be adapted by removing for example execution of step2 ==> focus only on MASTER_SLOT.
+   */
+  m_C1ActiveSlot = 0U;
+  m_C2ActiveSlot = 0U;
+  m_ActiveSlotToExecute = 0U;
+
+  /* Check if firmwares are detected for C1 and C2 (MASTER_SLOT) */
+  if (MASTER_SLOT == 0xFFU)
+  {
+    TRACE("\r\n\t  No master slot has been defined for C2");
+  }
+  else
+  {
+    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+    {
+      if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)         /* Slot configured ? */
+      {
+        if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+        {
+          if ((SLOT_ACTIVE_1 + i) == MASTER_SLOT)
+          {
+            m_C2ActiveSlot = MASTER_SLOT;
+            TRACE("\r\n\t  A C2 FW is detected in the slot SLOT_ACTIVE_%d", m_C2ActiveSlot);
+          }
+          else
+          {
+            m_C1ActiveSlot = SLOT_ACTIVE_1 + i;
+            TRACE("\r\n\t  A C1 FW is detected in the slot SLOT_ACTIVE_%d", m_C1ActiveSlot);
+          }
+        }
+      }
+    }
+  }
+
+  /* 2- No active firmware candidates for execution ==> Local download */
+  if ((m_C1ActiveSlot != 0U) && (m_C2ActiveSlot != 0U))
+  {
+    m_ActiveSlotToExecute = m_C2ActiveSlot;
+    SFU_SET_SM_CURR_STATE(SFU_STATE_VERIFY_USER_FW_SIGNATURE);
+  }
+  else
+  {
+    /* Control if all active slot are empty */
+    for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+    {
+      if ((m_C1ActiveSlot != (SLOT_ACTIVE_1 + i)) && (m_C2ActiveSlot != (SLOT_ACTIVE_1 + i)))
+      {
+        if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)       /* Slot configured ? */
+        {
+          if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+          {
+            /*
+             * We should never reach this code.
+             * Could come from an attack ==> as an example we invalidate current firmware.
+             */
+            TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+            (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+          }
+        }
+      }
+    }
+
+    /*
+     * No valid FW is present in the active slot
+     * and there is no FW to be installed in UserApp download area: local download (when possible)
+     */
+    if (initialDeviceStatusCheck == 1U)
+    {
+      TRACE("\r\n\t  No valid FW found in the active slots nor new FW to be installed");
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+      /* Waiting for a local download is automatic, no trigger required. */
+      TRACE("\r\n\t  Waiting for the local download to start... ");
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+      initialDeviceStatusCheck = 0U;
+#ifdef SFU_TEST_PROTECTION
+      SFU_TEST_Reset();
+#endif /* SFU_TEST_PROTECTION */
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      /*
+       * No ELSE branch (except for verbose debug), because the FW status is checked only once per boot:
+       *   If a FW is present in the active slot => it is checked then launched.
+       *   If there is a FW to install => the installation procedure starts.
+       *   If no FW is present and no installation is pending:
+       *      - if the local loader feature is enabled we enter the local download state
+       *      - if the local loader feature is disabled, the execution is stopped.
+       */
+      TRACE("\r\n\t  Abnormal case: SFU_STATE_VERIFY_USER_FW_STATUS is not supposed to be entered more than once per boot.");
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+    SFU_SET_SM_CURR_STATE(SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD);
+#else
+    /*
+     * When the local loader feature is disabled it is not possible to enter the "check new fw download" state.
+     * Rebooting automatically or keeping on checking the FW status would not necessarily be better.
+     * So we end up waiting for the user to reboot (or the IWDG to expire).
+     */
+    TRACE("\r\n\t  No valid FW and no local loader: execution stopped.\r\n");
+    while (1 == 1)
+    {
+      (void) BSP_LED_Toggle(SFU_STATUS_LED);
+      HAL_Delay(SFU_STOP_NO_FW_BLINK_DELAY);
+    }
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+  }
+}
+
+
+#if SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   Reset is generated at by standalone loader when FW is downloaded.
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /* Jump into standalone loader */
+  STANDALONE_LOADER_STATE = STANDALONE_LOADER_DWL_REQ;
+  e_ret_status = SFU_BOOT_LaunchStandaloneLoader();
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#elif (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+/**
+  * @brief  A new UserApp Fw was available. Start to download it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_DownloadNewUserFw(void)
+{
+  SFU_ErrorStatus           e_ret_status = SFU_ERROR;
+  SFU_LOADER_StatusTypeDef  e_ret_status_app = SFU_LOADER_ERR_COM;
+  uint32_t                  dwl_slot;
+  uint32_t                  u_size = 0;
+
+  TRACE("\r\n= [SBOOT] STATE: DOWNLOAD NEW USER FIRMWARE");
+
+  /*
+   * Download area will be chosen as following. After header analysis :
+   *   - same DWL slot number as SFU magic number, if the slot is configured.
+   *     As example, we will choose SLOT_DWL_2 for SFU2 magic in the FW header
+   *   - by default : SLOT_DWL_1
+   */
+  e_ret_status = SFU_LOADER_DownloadNewUserFw(&e_ret_status_app, &dwl_slot, &u_size);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n\t  FwSize=%d | PartialFwSize=%d | PartialFwOffset=%d | %d bytes received",
+          fw_image_header_validated.FwSize, fw_image_header_validated.PartialFwSize,
+          fw_image_header_validated.PartialFwOffset, u_size);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    /* Read header in dwl slot */
+    e_ret_status = SFU_LL_FLASH_Read((uint8_t *) &fw_image_header_validated, (uint8_t *) SlotStartAdd[dwl_slot],
+                                     sizeof(SE_FwRawHeaderTypeDef));
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * In 1_Image example : dwl_slot == active_slot
+     */
+    if (SFU_IMG_Validation(dwl_slot, &fw_image_header_validated) != SFU_SUCCESS)
+    {
+      /* CleanUp downloaded image (header preserved, for anti-rollback) */
+      (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
+
+      /* no specific error cause set */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+      TRACE("\r\n\t  Cannot memorize that a new image has been downloaded.");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    }
+  }
+  else
+  {
+    /* CleanUp downloaded image (header preserved, for anti-rollback) */
+    (void) SFU_IMG_InvalidateCurrentFirmware(dwl_slot);
+
+    /* Memorize the specific error cause if any before handling this critical failure */
+    switch (e_ret_status_app)
+    {
+      case SFU_LOADER_ERR_COM:
+        SFU_EXCPT_SetError(SFU_EXCPT_COM_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_VERSION:
+        SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+        break;
+      case SFU_LOADER_ERR_FW_LENGTH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FW_TOO_BIG);
+        break;
+      case SFU_LOADER_ERR_AUTH_FAILED:
+        SFU_EXCPT_SetError(SFU_EXCPT_HEADER_AUTH_ERR);
+        break;
+      case SFU_LOADER_ERR_FLASH:
+        SFU_EXCPT_SetError(SFU_EXCPT_FLASH_ERR);
+        break;
+      case SFU_LOADER_ERR_CRYPTO:
+        SFU_EXCPT_SetError(SFU_EXCPT_DECRYPT_ERR);
+        break;
+      default:
+        /* no specific error cause */
+        break;
+    }
+  } /* else error with no specific error cause */
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+
+
+/**
+  * @brief  Verify the UserApp Fw signature before executing it
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_VerifyUserFwSignature(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t u_configured_slot_nb = 0U;
+  uint32_t u_verified_slot_nb = 0U;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: VERIFY USER FW SIGNATURE");
+
+  /* Double security check :
+     - testing "static protections" twice will avoid basic hardware attack
+     - flow control reached : dynamic protections checked
+     - re-execute static then dynamic check
+     - errors caught by FLOW_CONTROL ==> infinite loop */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_THIRD_CONFIGURATION);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /*
+     * Due to previous flow control, we should never reach this code  :
+     * Critical failure management if installation failed
+     */
+    SFU_SET_SM_CURR_STATE(SFU_STATE_HANDLE_CRITICAL_FAILURE);
+    return;
+  }
+
+  /*
+   * With the 2 images handling:
+   *       1. the header signature is verified  when installing a new firmware
+   *       2. the firmware signature is checked when installing a new firmware
+   *       3. remaining part of active slot is kept "clean" during installation procedure
+   * So following checks should never fail.
+   */
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      u_configured_slot_nb ++;
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        e_ret_status = SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i);
+        if (SFU_SUCCESS == e_ret_status)
+        {
+          /* Check the FW signature */
+          e_ret_status = SFU_IMG_VerifyActiveImg(SLOT_ACTIVE_1 + i);
+          if (SFU_SUCCESS == e_ret_status)
+          {
+            /* Verify that there is no additional code beyond firmware image */
+            e_ret_status = SFU_IMG_VerifyActiveSlot(SLOT_ACTIVE_1 + i);
+            if (SFU_SUCCESS != e_ret_status)
+            {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+              TRACE("\r\n\t  Unexpected code beyond FW image in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+            }
+            else
+            {
+              u_verified_slot_nb ++;
+            }
+          }
+          else
+          {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+            TRACE("\r\n\t  Firmware signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          }
+        }
+        else
+        {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Header signature verification failure in slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        }
+        /*
+         * One of the checks fails :
+         *  - Header signature
+         *  - FW signature
+         *  - No malicious code
+         *  ==> Active slot should be invalidated
+         */
+        if (SFU_SUCCESS != e_ret_status)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Erasing slot SLOT_ACTIVE_%d", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+        else
+        {
+          /* Verify if authentication and integrity controls performed */
+          FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+        }
+      }
+      else
+      {
+        if (SFU_IMG_VerifyEmptyActiveSlot(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /*
+           * We should never reach this code.
+           * Could come from an attack ==> as an example we invalidate current firmware.
+           */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+          TRACE("\r\n\t  Slot SLOT_ACTIVE_%d not empty : erasing ...", SLOT_ACTIVE_1 + i);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+          (void)SFU_IMG_InvalidateCurrentFirmware(SLOT_ACTIVE_1 + i); /* If this fails we continue anyhow */
+        }
+      }
+    }
+  }
+
+  /* Check that C1 and C2 firmwares are present */
+  if ( u_configured_slot_nb != u_verified_slot_nb )
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Set the next State Machine state according to the success of the failure of e_ret_status */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_EXECUTE_USER_FW, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Exit from the SB/SFU State Machine and try to execute the UserApp Fw
+  * @param  None
+  * @note   This function must set the next State Machine State
+  * @retval None
+  */
+static void SFU_BOOT_SM_ExecuteUserFw(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+  uint32_t i;
+
+  TRACE("\r\n= [SBOOT] STATE: EXECUTE USER FIRMWARE");
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Verify if authentication and integrity controls performed at SFU_STATE_VERIFY_USER_FW_SIGNATURE */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+
+  /* Double security check for all active slots :
+     - Control twice the Header signature will avoid basic hardware attack
+     - Control twice the FW signature will avoid basic hardware attack */
+
+  /* Check all active slots configured */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      /* FW installed ? */
+      if (SFU_SUCCESS == SFU_IMG_DetectFW(SLOT_ACTIVE_1 + i))
+      {
+        /* Initialize Flow control */
+        FLOW_CONTROL_INIT(uFlowCryptoValue, FLOW_CTRL_INIT_VALUE);
+
+        /* Check the header signature */
+        if (SFU_IMG_VerifyActiveImgMetadata(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+        /* Check the FW signature */
+        if (SFU_IMG_ControlActiveImgTag(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Security issue : execution stopped ! */
+          SFU_EXCPT_Security_Error();
+        }
+
+#if defined(ENABLE_IMAGE_STATE_HANDLING) && !defined(SFU_NO_SWAP)
+        /* Move the state to SELFTEST for the new images */
+        if (SFU_IMG_UpdateImageState(SLOT_ACTIVE_1 + i) != SFU_SUCCESS)
+        {
+          /* Image state cannot be changed : What to do ?
+             ==> decision to continue execution */
+          TRACE("\r\n= [FWIMG] WARNING: IMAGE STATE CANNOT BE CHANGED!");
+        }
+#endif /* ENABLE_IMAGE_STATE_HANDLING  && !(SFU_NO_SWAP) */
+
+        /* Verify if authentication and integrity controls performed */
+        FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_INTEGRITY);
+      }
+    }
+  }
+
+  /*
+   * You may decide to implement additional checks before running the Firmware.
+   * For the time being we launch the FW present in the active slot.
+   *
+   * The bootloader must also take care of the security aspects:
+   *   A.configure (if any) the external flash in execution mode with On The Fly DECryption (OTFDEC)
+   *   B.lock the SE services the UserApp is not allowed to call
+   *   C.leave secure boot mode
+   */
+
+  /* Configure active slot in execution mode with OTFDEC (if any) : required in case of external flash */
+  e_ret_status = SFU_LL_FLASH_Config_Exe(m_ActiveSlotToExecute);
+  if (e_ret_status != SFU_SUCCESS)
+  {
+    /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+    SFU_EXCPT_SetError(SFU_EXCPT_FLASH_CFG_ERR);
+
+    /* This is the last operation executed. Force a System Reset */
+    SFU_BOOT_ForceReboot();
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Lock part of Secure Engine services */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* Double instruction to avoid basic fault injection */
+      if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+      {
+        /* De-initialize the SB_SFU bootloader before launching the UserApp */
+        (void)SFU_BOOT_DeInit(); /* the return value is not checked, we will always try launching the UserApp */
+
+        /* Last flow control : lock service */
+        FLOW_CONTROL_STEP(uFlowCryptoValue, FLOW_STEP_LOCK_SERVICE, FLOW_CTRL_LOCK_SERVICE);
+
+        /* This function should not return */
+        e_ret_status = SFU_IMG_LaunchActiveImg(m_ActiveSlotToExecute);
+
+        /* This point should not be reached */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        /* We do not memorize any specific error, the FSM state is already providing the info */
+        TRACE("\r\n\t  SFU_IMG_LaunchActiveImg(SLOT_ACTIVE_%d) failure!", m_ActiveSlotToExecute);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+        while (1 == 1)
+        {
+          ;    /* wait for watchdog */
+        }
+      }
+      else
+      {
+        /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+        SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+        /* This is the last operation executed. Force a System Reset */
+        SFU_BOOT_ForceReboot();
+      }
+    }
+    else
+    {
+      /* Set the error before forcing a reboot, don't care of return value as followed by reboot */
+      SFU_EXCPT_SetError(SFU_EXCPT_LOCK_SE_SERVICES_ERR);
+
+      /* This is the last operation executed. Force a System Reset */
+      SFU_BOOT_ForceReboot();
+    }
+  }
+
+  /* This is unreachable code (dead code) in principle...
+  At this point we should not be able to reach the following instructions.
+  If we can execute them a critical issue has occurred.. So set the next State Machine accordingly */
+  SFU_SET_SM_IF_CURR_STATE(e_ret_status, SFU_STATE_HANDLE_CRITICAL_FAILURE, SFU_STATE_HANDLE_CRITICAL_FAILURE);
+}
+
+/**
+  * @brief  Manage a Critical Failure occurred during the evolution of the State Machine
+  * @param  None
+  * @note   After a Critical Failure a Reboot will be called.
+  * @retval None
+  */
+static void SFU_BOOT_SM_HandleCriticalFailure(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: HANDLE CRITICAL FAILURE");
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+     The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_SET_SM_IF_CURR_STATE(SFU_ERROR, SFU_STATE_REBOOT_STATE_MACHINE, SFU_STATE_REBOOT_STATE_MACHINE);
+}
+
+/**
+  * @brief  The state machine is aborted and a Reset is triggered
+  * @param  None
+  * @note   You are in this condition because it's not possible to continue without
+            compromising the stability or the security of the solution.
+  * @retval None
+  */
+static void SFU_BOOT_SM_RebootStateMachine(void)
+{
+  TRACE("\r\n= [SBOOT] STATE: REBOOT STATE MACHINE");
+
+  /*
+   * In case some clean-up must be done before resetting.
+   * Please note that at the moment this function does not clean-up the RAM used by SB_SFU.
+   */
+  (void)SFU_BOOT_DeInit();
+
+  /* This is the last operation executed. Force a System Reset */
+  SFU_BOOT_ForceReboot();
+}
+
+#if (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief  Jump into standalone loader
+  * @param  None
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_LaunchStandaloneLoader(void)
+{
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+
+  /* Lock part of Secure Engine services */
+  if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+  {
+    /* Double instruction to avoid basic fault injection */
+    if (SE_LockRestrictServices(&e_se_status) == SE_SUCCESS)
+    {
+      /* this function does not return */
+      SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, LOADER_REGION_ROM_START);
+
+      /* The point below should NOT be reached */
+      return SFU_SUCCESS;
+    }
+    else
+    {
+      return SFU_ERROR;
+    }
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply Static protections involving Option Bytes */
+  if (SFU_LL_SECU_CheckApplyStaticProtections() == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(SFU_INITIAL_CONFIGURATION);
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  System security configuration
+  * @param  None
+  * @note   Check and apply the security protections. This has to be done as soon
+  *         as possible after a reset
+  * @retval None
+  */
+static SFU_ErrorStatus SFU_BOOT_SystemSecurity_Config(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  /* WARNING: The following CheckApplySecurityProtection function must be called
+     as soon as possible after a Reset in order to be sure the system is secured
+     before starting any other operation. The drawback is that the ErrorManagement
+     is not initialized yet, so in case of failure of this function, there will not be
+     any error stored into the BootInfo or other visible effects.  */
+
+  /* Very few things are already initialized at this stage. Need additional initialization
+     to show a message that is added as below only in Debug/Test mode */
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+  (void) SFU_COM_Init();
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+  if (SFU_BOOT_CheckApplySecurityProtections() != SFU_SUCCESS)
+  {
+    /* WARNING: This might be generated by an attempted attack or a bug of your code!
+       Add your code here in order to implement a custom action for this event,
+       e.g. trigger a mass erase or take any other action in order to
+       protect your system, or simply discard it if this is expected.
+       ...
+       ...
+    */
+    TRACE("\r\n= [SBOOT] System Security Check failed! Rebooting...");
+  }
+  else
+  {
+    TRACE("\r\n= [SBOOT] System Security Check successfully passed. Starting...");
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Periodic verification of applied protection mechanisms, in order to prevent
+  *         a malicious code removing some of the applied security/integrity features.
+  *         The IWDG is also refreshed in this function.
+  * @param  None
+  * @note   This function must be called with a frequency greater than 0.25Hz!
+  *         Otherwise a Reset will occur. Once enabled the IWDG cannot be disabled
+  *         So the User App should continue to refresh the IWDG counter.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_BOOT_SecuritySafetyCheck(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Refresh the IWDG */
+  e_ret_status = SFU_LL_SECU_IWDG_Refresh();
+
+
+  /* Add your code here for customization:
+     e.g. for additional security or safety periodic check.
+     ...
+     ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the  the Reset sources, and if the case store the error for the next steps
+  * @param  None
+  * @retval None
+  */
+static void SFU_BOOT_ManageResetSources(void)
+{
+  SFU_RESET_IdTypeDef e_wakeup_source_id = SFU_RESET_UNKNOWN;
+
+  /* Check the wakeup sources */
+  SFU_LL_SECU_GetResetSources(&e_wakeup_source_id);
+  switch (e_wakeup_source_id)
+  {
+    /*
+     * Please note that the example of reset causes handling below is only a basic example to illustrate the way the
+     * RCC_CSR flags can be used to do so.
+     */
+
+    case SFU_RESET_WDG_RESET:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by a Watchdog reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_LOW_POWER:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a LowPower reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_HW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Hardware reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_BOR_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a BOR reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_SW_RESET:
+      TRACE("\r\n\t  INFO: A Reboot has been triggered by a Software reset!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_RESET_OB_LOADER:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Option Bytes reload!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+
+    default:
+      TRACE("\r\n\t  WARNING: A Reboot has been triggered by an Unknown reset source!");
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system, or simply discard it if this is expected.
+         ...
+         ...
+      */
+      break;
+  }
+
+  /* Once the reset sources has been managed and a possible error has been set, clear the reset sources */
+  SFU_LL_SECU_ClearResetSources();
+}
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_ANTITAMPER(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_TAMPERING_FAULT);
+}
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the GTZC TZIC Fault.
+  * @param  None
+  * @retval None
+  */
+void SFU_CALLBACK_GTZC_TZIC(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_GTZC_TZIC_FAULT);
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
new file mode 100644
index 00000000..03ad46cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h
@@ -0,0 +1,232 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module, part of the SFU-En project (SB/SFU).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Init Error Type Definition
+  */
+typedef enum
+{
+  SFU_BOOT_SECENG_INIT_FAIL,   /*!< failure at secure engine initialization stage */
+  SFU_BOOT_SECIPS_CFG_FAIL,    /*!< failure when configuring the security IPs  */
+  SFU_BOOT_INIT_FAIL,          /*!< failure when initializing the secure boot service  */
+  SFU_BOOT_INIT_ERROR          /*!< Service cannot start: unspecified error */
+} SFU_BOOT_InitErrorTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief  SFU_BOOT Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Steps definition
+  */
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+#define FLOW_STEP_AUTHENTICATE 0x00007999U       /*!< Step AUTHENTICATE value */
+#define FLOW_STEP_INTEGRITY 0x0000aab5U          /*!< Step INTEGRITY value */
+#define FLOW_STEP_LOCK_SERVICE 0x0000b4abU       /*!< Step LOCK SERVICE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0000cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_PCROP_PROTECT_ENABLE
+#define FLOW_STEP_PCROP 0x0000d2d3U              /*!< Step PCROP value */
+#else
+#define FLOW_STEP_PCROP 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef  SFU_SUBGHZSPI_PROTECT_ENABLE
+#define FLOW_STEP_SUBGHZSPI 0x0003befU           /*!< Step SUBGHZSPI value */
+#else
+#define FLOW_STEP_SUBGHZSPI 0x00000000U          /*!< No effect on control flow */
+#endif /* SFU_SUBGHZSPI_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+#define FLOW_STEP_C2_DDS 0x000096bdU             /*!< Step DDS value */
+#else
+#define FLOW_STEP_C2_DDS 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+#define FLOW_STEP_C2SWDBG 0x00024e87U            /*!< Step C2SWDBG value */
+#else
+#define FLOW_STEP_C2SWDBG 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef  SFU_GTZC_PROTECT_ENABLE
+#define FLOW_STEP_GTZC 0x0000dbaeU               /*!< Step GTZC value */
+#else
+#define FLOW_STEP_GTZC 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_UBE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_PCROP (FLOW_CTRL_WRP ^ FLOW_STEP_PCROP)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_PCROP ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_SUBGHZSPI (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_SUBGHZSPI)
+#define FLOW_CTRL_C2_DDS (FLOW_CTRL_SUBGHZSPI ^ FLOW_STEP_C2_DDS)
+#define FLOW_CTRL_RDP (FLOW_CTRL_C2_DDS ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_DMA (FLOW_CTRL_MPU ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_C2SWDBG (FLOW_CTRL_TAMPER ^ FLOW_STEP_C2SWDBG)
+#define FLOW_CTRL_GTZC (FLOW_CTRL_C2SWDBG ^ FLOW_STEP_GTZC)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_GTZC
+
+/**
+  * @brief  SFU_BOOT Flow Control : Control values crypto operations
+  */
+#define FLOW_CTRL_AUTHENTICATE (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_AUTHENTICATE)
+#define FLOW_CTRL_INTEGRITY (FLOW_CTRL_AUTHENTICATE ^ FLOW_STEP_INTEGRITY)
+#define FLOW_CTRL_LOCK_SERVICE (FLOW_CTRL_INTEGRITY ^ FLOW_STEP_LOCK_SERVICE)
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  Flow control initial values.
+  *   - Security protections flow (static + dynamic)
+  *   - Crypto operations flow (authentication, integrity)
+  */
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+
+/* Exported macros -----------------------------------------------------------*/
+/** Control with STEP operation :
+  * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+/** STEP update only :
+  * (uFlowValue XOR STEP_VALUE)
+  */
+#define FLOW_STEP(B,A) \
+  do{ \
+    (B) ^= (A);\
+  }while(0)
+
+
+/* Exported functions ------------------------------------------------------- */
+SFU_BOOT_InitErrorTypeDef SFU_BOOT_RunSecureBootService(void);
+void SFU_BOOT_ForceReboot(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c
new file mode 100644
index 00000000..f7599f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.c
@@ -0,0 +1,544 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_LOADER_TIME_OUT            ((uint32_t )0x800U)   /*!< COM Transmit and Receive Timeout*/
+#define SFU_COM_LOADER_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutByte and PutString Timeout*/
+
+/* Private macros ------------------------------------------------------------*/
+#define IS_CAP_LETTER(c)    (((c) >= (uint8_t) 'A') && ((c) <= (uint8_t) 'F'))
+#define IS_LC_LETTER(c)     (((c) >= (uint8_t) 'a') && ((c) <= (uint8_t) 'f'))
+#define IS_09(c)            (((c) >= (uint8_t) '0') && ((c) <= (uint8_t) '9'))
+#define ISVALIDHEX(c)       (IS_CAP_LETTER(c) || IS_LC_LETTER(c) || IS_09(c))
+#define ISVALIDDEC(c)       IS_09(c)
+#define CONVERTDEC(c)       ((c) - (uint8_t) '0')
+
+#define CONVERTHEX_ALPHA(c) (IS_CAP_LETTER(c) ? ((c) - (uint8_t) 'A' + 10U) : ((c) - (uint8_t) 'a' + 10U))
+#define CONVERTHEX(c)       (IS_09(c) ? ((c) - (uint8_t) '0') : CONVERTHEX_ALPHA(c))
+
+/* Private function prototypes -----------------------------------------------*/
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeOut);
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum);
+
+/* Functions Definition ------------------------------------------------------*/
+
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+/**
+  * @brief  Receive a file using the ymodem protocol with SFU_COM_YMODEM_CRC16.
+  * @param  peCOMStatus: SFU_COM_YMODEM_StatusTypeDef result of reception/programming.
+  * @param  puSize: size of received file.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize)
+{
+  uint32_t i;
+  uint32_t packet_length = 0U;
+  uint32_t session_done = 0U;
+  uint32_t file_done;
+  uint32_t errors = 0U;
+  uint32_t session_begin = 0U;
+  uint32_t filesize = 0U;
+  uint32_t packets_received;
+  uint8_t *file_ptr;
+  uint8_t file_size[SFU_COM_YMODEM_FILE_SIZE_LENGTH + 1U];
+  uint8_t tmp;
+  static uint8_t m_aPacketData[SFU_COM_YMODEM_PACKET_1K_SIZE + SFU_COM_YMODEM_PACKET_DATA_INDEX +
+                               SFU_COM_YMODEM_PACKET_TRAILER_SIZE] __attribute__((aligned(8)));
+
+  /* Check the pointers allocation */
+  if ((peCOMStatus == NULL) || (puSize == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  *peCOMStatus = SFU_COM_YMODEM_OK;
+
+  while ((session_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+  {
+    packets_received = 0U;
+    file_done = 0U;
+    while ((file_done == 0U) && (*peCOMStatus == SFU_COM_YMODEM_OK))
+    {
+      switch (ReceivePacket(m_aPacketData, &packet_length, SFU_COM_YMODEM_DOWNLOAD_TIMEOUT))
+      {
+        case HAL_OK:
+          errors = 0U;
+          switch (packet_length)
+          {
+            case 3U:
+              /* Startup sequence */
+              break;
+            case 2U:
+              /* Abort by sender */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *peCOMStatus = SFU_COM_YMODEM_ABORT;
+              break;
+            case 0U:
+              /* End of transmission */
+              (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+              *puSize = filesize;
+              file_done = 1U;
+              break;
+            default:
+              /* Normal packet */
+              if (m_aPacketData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != (packets_received & 0x000000FFU))
+              {
+                /* No NACK sent for a better synchro with remote : packet will be repeated */
+              }
+              else
+              {
+                if (packets_received == 0U)
+                {
+                  /* File name packet */
+                  if (m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX] != 0U)
+                  {
+                    /* File name skipped */
+                    i = 0U;
+                    file_ptr = m_aPacketData + SFU_COM_YMODEM_PACKET_DATA_INDEX;
+                    while ((*file_ptr != 0U) && (i < SFU_COM_YMODEM_FILE_NAME_LENGTH))
+                    {
+                      i++;
+                      file_ptr++;
+                    }
+                    /* end of file name ('\0') skipped */
+                    file_ptr++;
+
+                    /* File size extraction */
+                    i = 0U;
+                    while ((*file_ptr != (uint8_t) ' ') && (i < SFU_COM_YMODEM_FILE_SIZE_LENGTH))
+                    {
+                      file_size[i] = *file_ptr;
+                      i++;
+                      file_ptr++;
+                    }
+                    file_size[i] = (uint8_t) '\0';
+                    (void) Str2Int(file_size, &filesize);
+
+                    /* Header packet received callback call*/
+                    if (SFU_COM_YMODEM_HeaderPktRxCpltCallback((uint32_t) filesize) == SFU_SUCCESS)
+                    {
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                      (void) SFU_LL_UART_Flush();
+                      (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16);
+                    }
+                    else
+                    {
+                      /* End session */
+                      tmp = SFU_COM_YMODEM_CA;
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      (void) SFU_LL_UART_Transmit(&tmp, 1U, SFU_COM_YMODEM_NAK_TIMEOUT);
+                      return SFU_ERROR;
+                    }
+                  }
+                  /* File header packet is empty, end session */
+                  else
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+                    file_done = 1U;
+                    session_done = 1U;
+                    break;
+                  }
+                }
+                else /* Data packet */
+                {
+                  /* Data packet received callback call*/
+                  if (SFU_COM_YMODEM_DataPktRxCpltCallback(&m_aPacketData[SFU_COM_YMODEM_PACKET_DATA_INDEX],
+                                                           packet_length) == SFU_SUCCESS)
+                  {
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_ACK);
+
+                  }
+                  else /* An error occurred while writing to Flash memory */
+                  {
+                    /* End session */
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+                    *peCOMStatus = SFU_COM_YMODEM_DATA;
+                  }
+
+                }
+                packets_received ++;
+                session_begin = 1;
+              }
+              break;
+          }
+          break;
+        case HAL_BUSY: /* Abort actually */
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+          *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          break;
+        default:
+          if (session_begin > 0U)
+          {
+            errors ++;
+          }
+          if (errors > SFU_COM_YMODEM_MAX_ERRORS)
+          {
+            /* Abort communication */
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CA);
+            *peCOMStatus = SFU_COM_YMODEM_ABORT;
+          }
+          else
+          {
+            (void) SFU_COM_Serial_PutByte(SFU_COM_YMODEM_CRC16); /* Ask for a packet */
+#ifndef MINICOM_YMODEM
+            /* Minicom does not accept this extra character */
+            TRACE("\b.");                                 /* Replace C char by . on display console */
+#endif /* MINICOM_YMODEM */
+            /*
+             * Toggling the LED in case no console is available: the toggling frequency depends on
+             * SFU_COM_YMODEM_DOWNLOAD_TIMEOUT
+             */
+            (void) BSP_LED_Toggle(SFU_STATUS_LED);
+          }
+          break;
+      }
+    }
+  }
+  /* Make sure the status LED is turned off */
+  (void) BSP_LED_Off(SFU_STATUS_LED);
+
+  if (*peCOMStatus == SFU_COM_YMODEM_OK)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+/**
+  * @brief  Transmit a byte to the COM Port.
+  * @param  uParam: The byte to be sent.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam)
+{
+  return SFU_LL_UART_Transmit(&uParam, 1U, SFU_COM_LOADER_SERIAL_TIME_OUT);
+}
+
+/**
+  * @brief  Convert a string to an integer.
+  * @param  pInputStr: The string to be converted.
+  * @param  pIntNum: The integer value.
+  * @retval 1: Correct
+  *         0: Error
+  */
+static uint32_t Str2Int(uint8_t *pInputStr, uint32_t *pIntNum)
+{
+  uint32_t i = 0U;
+  uint32_t res = 0U;
+  uint32_t val = 0U;
+  uint8_t  digit;
+
+  if ((pInputStr[0] == (uint8_t)'0') && ((pInputStr[1] == (uint8_t)'x') || (pInputStr[1] == (uint8_t)'X')))
+  {
+    i = 2U;
+    while ((i < 11U) && (pInputStr[i] != (uint8_t)'\0'))
+    {
+      if (ISVALIDHEX(pInputStr[i]))
+      {
+        digit = CONVERTHEX(pInputStr[i]);
+        val = (val << 4U) + digit;
+      }
+      else
+      {
+        /* Return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+
+    /* valid result */
+    if (pInputStr[i] == (uint8_t)'\0')
+    {
+      *pIntNum = val;
+      res = 1U;
+    }
+  }
+  else /* max 10-digit decimal input */
+  {
+    while ((i < 11U) && (res != 1U))
+    {
+      if (pInputStr[i] == (uint8_t)'\0')
+      {
+        *pIntNum = val;
+        /* return 1 */
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'k') || (pInputStr[i] == (uint8_t)'K')) && (i > 0U))
+      {
+        val = val << 10U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (((pInputStr[i] == (uint8_t)'m') || (pInputStr[i] == (uint8_t)'M')) && (i > 0U))
+      {
+        val = val << 20U;
+        *pIntNum = val;
+        res = 1U;
+      }
+      else if (ISVALIDDEC(pInputStr[i]))
+      {
+        digit =  CONVERTDEC(pInputStr[i]);
+        val = (val * 10U) + digit;
+      }
+      else
+      {
+        /* return 0, Invalid input */
+        res = 0U;
+        break;
+      }
+      i++;
+    }
+  }
+
+  return res;
+}
+
+/**
+  * @brief  Receive a packet from sender
+  * @param  pData: pointer to received data.
+  * @param  puLength
+  *     0: end of transmission
+  *     2: abort by sender
+  *    >0: packet length
+  * @param  uTimeOut: receive timeout (ms).
+  * @retval HAL_OK: normally return
+  *         HAL_BUSY: abort by user
+  */
+static HAL_StatusTypeDef ReceivePacket(uint8_t *pData, uint32_t *puLength, uint32_t uTimeout)
+{
+  uint32_t crc;
+  uint32_t packet_size = 0U;
+  HAL_StatusTypeDef status;
+  SFU_ErrorStatus eRetStatus;
+
+  uint8_t char1;
+
+#ifdef MINICOM_YMODEM
+  uint32_t myIdx = 0; /* index indicating where to write in pData */
+#endif /* MINICOM_YMODEM */
+
+  *puLength = 0U;
+
+  /* This operation could last long. Need to refresh the Watchdog if enabled. It could be implemented as a callback*/
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  eRetStatus = SFU_LL_UART_Receive(&char1, 1, uTimeout);
+
+  if (eRetStatus == SFU_SUCCESS)
+  {
+    status = HAL_OK;
+
+    switch (char1)
+    {
+      case SFU_COM_YMODEM_SOH:
+        packet_size = SFU_COM_YMODEM_PACKET_SIZE;
+        break;
+      case SFU_COM_YMODEM_STX:
+        packet_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+        break;
+      case SFU_COM_YMODEM_EOT:
+        break;
+      case SFU_COM_YMODEM_CA:
+        if ((SFU_LL_UART_Receive(&char1, 1U, uTimeout) == SFU_SUCCESS) && (char1 == SFU_COM_YMODEM_CA))
+        {
+          packet_size = 2U;
+        }
+        else
+        {
+          status = HAL_ERROR;
+        }
+        break;
+      case SFU_COM_YMODEM_ABORT1:
+      case SFU_COM_YMODEM_ABORT2:
+        status = HAL_BUSY;
+        break;
+      case SFU_COM_YMODEM_RB:
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);             /* Ymodem startup sequence : rb ==> 0x72 + 0x62 + 0x0D */
+        (void) SFU_LL_UART_Receive(&char1, 1U, uTimeout);
+        packet_size = 3U;
+        break;
+      default:
+        status = HAL_ERROR;
+        break;
+    }
+    *pData = char1;
+
+    if (packet_size >= SFU_COM_YMODEM_PACKET_SIZE)
+    {
+
+#ifndef MINICOM_YMODEM
+      eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX],
+                                       (uint16_t)(packet_size + SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE), uTimeout);
+#else
+      eRetStatus = SFU_SUCCESS;
+      /* Receive byte per byte until no data left or no space left in buffer */
+      while ((SFU_SUCCESS == eRetStatus) &&
+             ((myIdx + SFU_COM_YMODEM_PACKET_NUMBER_INDEX) < SFU_COM_YMODEM_PACKET_1K_SIZE +
+              SFU_COM_YMODEM_PACKET_DATA_INDEX +
+              SFU_COM_YMODEM_PACKET_TRAILER_SIZE)
+            )
+      {
+        eRetStatus = SFU_LL_UART_Receive(&pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX + myIdx],
+                                         1U, uTimeout);
+        myIdx++;
+      }
+
+      if (myIdx > 1)
+      {
+        /* We received some bytes */
+        eRetStatus = SFU_SUCCESS;
+      }
+#endif /* MINICOM_YMODEM */
+
+      /* Simple packet sanity check */
+      if (eRetStatus == SFU_SUCCESS)
+      {
+        status = HAL_OK;
+
+        if (pData[SFU_COM_YMODEM_PACKET_NUMBER_INDEX] != ((pData[SFU_COM_YMODEM_PACKET_CNUMBER_INDEX]) ^
+                                                          SFU_COM_YMODEM_NEGATIVE_BYTE))
+        {
+          packet_size = 0U;
+          status = HAL_ERROR;
+        }
+        else
+        {
+          /* Check packet CRC*/
+          crc = (((uint32_t)pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX ]) << 8U) & 0x0000FF00U;
+          crc += pData[ packet_size + SFU_COM_YMODEM_PACKET_DATA_INDEX + 1U ];
+
+          /*Configure CRC with 16-bit polynomial*/
+          if (SFU_LL_CRC_Config(SFU_CRC_CONFIG_16BIT) == SFU_SUCCESS)
+          {
+            if (SFU_LL_CRC_Calculate((uint32_t *)(uint32_t)&pData[SFU_COM_YMODEM_PACKET_DATA_INDEX], packet_size) != crc)
+            {
+              packet_size = 0U;
+              status = HAL_ERROR;
+            }
+
+          }
+          else
+          {
+            packet_size = 0U;
+            status = HAL_ERROR;
+          }
+        }
+      }
+      else
+      {
+        status = HAL_ERROR;
+      }
+    }
+  }
+  else
+  {
+    status = HAL_ERROR;
+  }
+
+  *puLength = packet_size;
+  return status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_HeaderPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(uFileSize);
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval None
+  */
+__weak SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+
+  /* NOTE : This function should not be modified, when the callback is needed,
+            the SFU_COM_YMODEM_DataPktRxCpltCallback could be implemented in the user file
+   */
+  UNUSED(pData);
+  UNUSED(uSize);
+  return SFU_SUCCESS;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || defined(SFU_TEST_PROTECTION) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h
new file mode 100644
index 00000000..755199fd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h
@@ -0,0 +1,121 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities for the local loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_LOADER_H
+#define SFU_COM_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include <stdint.h>
+#include <stdio.h>
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_COM_LOADER_YMODEM Status structure definition
+  */
+typedef enum
+{
+  SFU_COM_YMODEM_OK       = 0x00U,  /*!< OK */
+  SFU_COM_YMODEM_ERROR    = 0x01U,  /*!< Error */
+  SFU_COM_YMODEM_ABORT    = 0x02U,  /*!< Abort */
+  SFU_COM_YMODEM_TIMEOUT  = 0x03U,  /*!< Timeout */
+  SFU_COM_YMODEM_DATA     = 0x04U,  /*!< Data */
+  SFU_COM_YMODEM_LIMIT    = 0x05U   /*!< Limit*/
+} SFU_COM_YMODEM_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)3U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)4U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)1U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)2U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)3U)    /*!<Cnumber Index*/
+#else
+/* Minicom YMODEM */
+#define SFU_COM_YMODEM_PACKET_HEADER_SIZE      ((uint32_t)6U)    /*!<Header Size*/
+#define SFU_COM_YMODEM_PACKET_DATA_INDEX       ((uint32_t)7U)    /*!<Data Index*/
+#define SFU_COM_YMODEM_PACKET_START_INDEX      ((uint32_t)4U)    /*!<Start Index*/
+#define SFU_COM_YMODEM_PACKET_NUMBER_INDEX     ((uint32_t)5U)    /*!<Packet Number Index*/
+#define SFU_COM_YMODEM_PACKET_CNUMBER_INDEX    ((uint32_t)6U)    /*!<Cnumber Index*/
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_PACKET_TRAILER_SIZE     ((uint32_t)2U)    /*!<Trailer Size*/
+#define SFU_COM_YMODEM_PACKET_OVERHEAD_SIZE    (SFU_COM_YMODEM_PACKET_HEADER_SIZE + SFU_COM_YMODEM_PACKET_TRAILER_SIZE \
+                                                - 1U)           /*!<Overhead Size*/
+#define SFU_COM_YMODEM_PACKET_SIZE             ((uint32_t)128U)  /*!<Packet Size*/
+#define SFU_COM_YMODEM_PACKET_1K_SIZE          ((uint32_t)1024U) /*!<Packet 1K Size*/
+
+#define SFU_COM_YMODEM_FILE_NAME_LENGTH        ((uint32_t)64U)   /*!< File name length*/
+#define SFU_COM_YMODEM_FILE_SIZE_LENGTH        ((uint32_t)16U)   /*!< File size length*/
+
+#define SFU_COM_YMODEM_SOH                     ((uint8_t)0x01U)  /*!< Start of 128-byte data packet */
+#define SFU_COM_YMODEM_STX                     ((uint8_t)0x02U)  /*!< Start of 1024-byte data packet */
+#define SFU_COM_YMODEM_EOT                     ((uint8_t)0x04U)  /*!< End of transmission */
+#define SFU_COM_YMODEM_ACK                     ((uint8_t)0x06U)  /*!< Acknowledge */
+#define SFU_COM_YMODEM_NAK                     ((uint8_t)0x15U)  /*!< Negative acknowledge */
+#define SFU_COM_YMODEM_CA                      ((uint8_t)0x18U)  /*!< Two of these in succession aborts transfer */
+#define SFU_COM_YMODEM_CRC16                   ((uint8_t)0x43U)  /*!< 'C' == 0x43, request 16-bit CRC */
+#define SFU_COM_YMODEM_RB                      ((uint8_t)0x72U)  /*!< Startup sequence */
+#define SFU_COM_YMODEM_NEGATIVE_BYTE           ((uint8_t)0xFFU)  /*!< Negative Byte*/
+
+#define SFU_COM_YMODEM_ABORT1                  ((uint8_t)0x41U)  /*!< 'A' == 0x41, abort by user */
+#define SFU_COM_YMODEM_ABORT2                  ((uint8_t)0x61U)  /*!< 'a' == 0x61, abort by user */
+
+#define SFU_COM_YMODEM_NAK_TIMEOUT             ((uint32_t)0x100000U)  /*!< NAK Timeout*/
+#ifndef MINICOM_YMODEM
+/* Teraterm YMODEM */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)3000U) /*!< Retry delay, has to be smaller than IWDG */
+#else
+/* Minicom YMODEM : reduce the download timeout to speed-up the download operation */
+#define SFU_COM_YMODEM_DOWNLOAD_TIMEOUT        ((uint32_t)1000U) /*!< Retry delay, has to be smaller than IWDG */
+#endif /* MINICOM_YMODEM */
+#define SFU_COM_YMODEM_MAX_ERRORS              ((uint32_t)3U)    /*!< Maximum number of retry*/
+
+/* Exported functions ------------------------------------------------------- */
+/*
+ * If the debug mode is not enabled then the local loader must also provide the COM init functions
+ */
+#if !defined(SFU_DEBUG_MODE) && !defined(SFU_TEST_PROTECTION)
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+#endif /* !SFU_DEBUG_MODE && !SFU_TEST_PROTECTION */
+
+SFU_ErrorStatus SFU_COM_Transmit(uint8_t *pData, uint16_t uDataLength, uint32_t uTimeOut);
+SFU_ErrorStatus SFU_COM_Receive(uint8_t *pData, uint16_t uDataLength);
+SFU_ErrorStatus SFU_COM_Flush(void);
+SFU_ErrorStatus SFU_COM_YMODEM_Receive(SFU_COM_YMODEM_StatusTypeDef *peCOMStatus, uint32_t *puSize);
+SFU_ErrorStatus SFU_COM_Serial_PutByte(uint8_t uParam);
+
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize);
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c
new file mode 100644
index 00000000..38dbfe17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.c
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update COM module.
+  *          This file provides set of firmware functions to manage SFU Com
+  *          functionalities for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_com_trace.h"
+
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(__ICCARM__)
+#define PUTCHAR_PROTOTYPE int putchar(int ch)
+#elif defined(__ARMCC_VERSION)
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#elif defined(__GNUC__)
+#define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#endif /* __ICCARM__ */
+
+#define SFU_COM_TRACE_SERIAL_TIME_OUT       ((uint32_t )100U)   /*!< Serial PutString Timeout*/
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  SFU Com Init function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Init(void)
+{
+#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
+  setvbuf(stdout, NULL, _IONBF, 0);
+#endif /* __GNUC__ */
+  return SFU_LL_UART_Init();
+}
+
+/**
+  * @brief  SFU Com DeInit function.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_DeInit(void)
+{
+  return SFU_LL_UART_DeInit();
+}
+/**
+  * @}
+  */
+
+/** @defgroup SFU_COM_TRACE_Control_Functions Control Functions
+  * @{
+  */
+
+/**
+  * @brief  Print a string on the COM Port.
+  * @param  pString: The string to be printed
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString)
+{
+  uint16_t length = 0U;
+
+  /* Check the pointers allocation */
+  if (pString == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  while (pString[length] != (uint8_t)'\0')
+  {
+    length++;
+  }
+
+  return SFU_LL_UART_Transmit(pString, length, SFU_COM_TRACE_SERIAL_TIME_OUT);
+
+}
+
+/**
+  * @brief  Retargets the C library printf function to SFU UART.
+  * @param  None
+  * @retval ch
+  */
+PUTCHAR_PROTOTYPE
+{
+  /* Place your implementation of fputc here */
+  /* e.g. write a character to the USART1 and Loop until the end of transmission */
+  (void) SFU_LL_UART_Transmit((uint8_t *)&ch, 1U, 0xFFFFU);
+
+  return ch;
+}
+
+#endif /* SFU_DEBUG_MODE || SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h
new file mode 100644
index 00000000..d5981e4d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h
@@ -0,0 +1,67 @@
+/**
+  ******************************************************************************
+  * @file    sfu_com_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update COM module
+  *          functionalities  for the trace.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_COM_TRACE_H
+#define SFU_COM_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include <stdio.h>
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_COM_Init(void);
+SFU_ErrorStatus SFU_COM_DeInit(void);
+SFU_ErrorStatus SFU_COM_Serial_PutString(uint8_t *pString);
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_COM_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
new file mode 100644
index 00000000..f68bdf63
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c
@@ -0,0 +1,254 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.c
+  * @author  MCD Application Team
+  * @brief   SFU ERROR
+  *          This file provides set of firmware functions for SB_SFU errors handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+#include "sfu_low_level_security.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_boot.h"
+#include "sfu_test.h"
+#include "sfu_mpu_isolation.h"
+
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+/**
+  *  The following strings associated to the exceptions/errors are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the @ref SFU_EXCPT_IdTypeDef.
+  *  And the @ref SFU_EXCPT_IdTypeDef enum must be a sequence starting from 0
+  */
+static char *m_aErrorStrings[] ={  "No error. Success",
+                                   "Memory fault",
+                                   "Hard fault",
+                                   "Tampering fault",
+#ifdef SFU_GTZC_PROTECT_ENABLE
+                                   "GTZC TZIC fault",
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+                                   "SE lock cannot be set",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Fw too big",
+                                   "File not correctly received",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Fw header authentication error",
+                                   "Fw decryption error",
+                                   "Fw signature check error",
+                                   "Flash error",
+                                   "External flash configuration error.",
+                                   "Header erasing error",
+                                   "Header validation error",
+                                   "Additional code detected beyond FW",
+                                   "Fw version rejected (anti-rollback)",
+                                   "Unknown error"
+                                };
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Print relevant errpr message.
+  * @param  Error Error code.
+  * @retval None
+  */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  if (eExceptionId <= SFU_EXCPT_UNKNOWN)
+  {
+#ifdef SFU_DEBUG_MODE
+    TRACE("\r\n\t%s",m_aErrorStrings[(uint32_t) eExceptionId]);
+#endif /* SFU_DEBUG_MODE */
+  }
+}
+
+
+/**
+  * @brief  Manage the Exception generated by an IRQ
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   Because of the interruption of the State Machine execution,
+  *         it's not possible to continue without compromising the stability or
+  *         the security of the solution. A System Reset is forced at the end.
+  * @retval None
+  */
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+#ifdef SFU_DEBUG_MODE
+  uint8_t message[150];
+  uint32_t i = 0U;
+
+  /* Avoid warning with cast frombetween char* and uint8_t* */
+  while ((m_aErrorStrings[(uint32_t) eExceptionId][i] != 0u) && (i < 149U))
+  {
+    message[i] = m_aErrorStrings[(uint32_t) eExceptionId][i];
+    i++;
+  }
+  message[i] = 0U;
+
+  /* Print relevant error message */
+  TRACE_IRQ((uint8_t *)"\r\n\t  ");
+  TRACE_IRQ(message);
+#endif /* SFU_DEBUG_MODE */
+
+  /* Try to take an action */
+  SFU_EXCPT_RuntimeExceptionHandler(eExceptionId);
+
+  /* It's not possible to continue without compromising the stability or the security of the solution.
+  The State Machine needs to be aborted and a Reset must be triggered */
+  SFU_BOOT_ForceReboot();
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+void SFU_EXCPT_Security_Error(void)
+{
+  TRACE("\r\n= [SBOOT] Security issue : execution stopped !");
+  HAL_Delay(1000);
+  /* While(1) by-passed by an fault injection attack ==> Reset */
+  if (0U != SFU_MPU_IsUnprivileged())
+  {
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_RESET);
+  }
+  else
+  {
+    NVIC_SystemReset();
+  }
+}
+
+/**
+  * @brief  SFU Exception Initialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_Init(void)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU Exception DeInitialization.
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_EXCPT_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status;
+  /* ADD SRC CODE HERE
+      ...
+  */
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Manage the Exception/Errors/Fault at runtime, when detected
+  * @param  eExceptionId : Exception ID.
+  *         This parameter can be a value of @ref SFU_EXCPT_ID_Structure_definition.
+  * @note   A System Reset is forced at the end by the caller of this function.
+  *         WARNING: Be aware that this function can be called by an IRQ while
+  *         using the printf, since the printf is not a reentrant function, and using
+  *         the printf inside this function as well, a fault will likely occur.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static void SFU_EXCPT_RuntimeExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId)
+{
+  switch (eExceptionId)
+  {
+    case SFU_EXCPT_TAMPERING_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  case SFU_EXCPT_GTZC_TZIC_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      /* WARNING: Please consider that at runt-time,  this "case" execution is
+      inside an ISR */
+      TRACE_IRQ((uint8_t *)"\r\n= [EXCPT] TZIC FAULT!");
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+    case SFU_EXCPT_MEMORY_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+
+    case SFU_EXCPT_HARD_FAULT:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other action in order to
+         protect your system.
+         ...
+         ...
+      */
+#ifdef SFU_TEST_PROTECTION
+      /* On STM32WLXX : Hard fault IT is generated instead of memory fault when MPU accessed
+         ==> this is not an error */
+#endif /* SFU_TEST_PROTECTION */
+      break;
+
+    default:
+      /* WARNING: This might be generated by an attempted attack, a bug or your code!
+         Add your code here in order to implement a custom action for this event,
+         e.g. trigger a mass erase or take any other  action in order to
+         protect your system.
+         ...
+         ...
+      */
+      break;
+  }
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
new file mode 100644
index 00000000..41d53daf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h
@@ -0,0 +1,88 @@
+/**
+  ******************************************************************************
+  * @file    sfu_error.h
+  * @author  MCD Application Team
+  * @brief   This file contains the error handling elements for SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_ERROR_H
+#define SFU_ERROR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * This enum must start from 0.
+  * When adding a new error in the enum below please also:
+  *  1. update IS_SFU_EXCPT
+  *  2. update m_aErrorStrings
+  */
+typedef enum
+{
+  SFU_EXCPT_NONE = 0UL,
+  /* System errors */
+  SFU_EXCPT_MEMORY_FAULT,
+  SFU_EXCPT_HARD_FAULT,
+  SFU_EXCPT_TAMPERING_FAULT,
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  SFU_EXCPT_GTZC_TZIC_FAULT,
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+  /* Specific errors */
+  SFU_EXCPT_LOCK_SE_SERVICES_ERR,
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+  SFU_EXCPT_FW_TOO_BIG,            /* The binary is too big to be installed */
+  SFU_EXCPT_COM_ERR,               /* COM error during the local download of the binary */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+  SFU_EXCPT_HEADER_AUTH_ERR,       /* header authentication failure */
+  SFU_EXCPT_DECRYPT_ERR,           /* Decrypt failure */
+  SFU_EXCPT_SIGNATURE_ERR,         /* Signature check failure */
+  SFU_EXCPT_FLASH_ERR,             /* Problem with FLASH */
+  SFU_EXCPT_FLASH_CFG_ERR,         /* Flash configuration issue (external flash) */
+  SFU_EXCPT_HEADER_ERASING_ERR,    /* Header erasing failure */
+  SFU_EXCPT_HEADER_VALIDATION_ERR, /* Header validation failure */
+  SFU_EXCPT_ADDITIONAL_CODE_ERR,   /* Additional code detected beyond the firmware image (malicious SW) */
+  SFU_EXCPT_VERSION_ERR,           /* Anti-rollback check rejected the version to be installed */
+  /* Unknown error */
+  SFU_EXCPT_UNKNOWN                /* To be kept as last error */
+} SFU_EXCPT_IdTypeDef;   /*!< Errors, Exception, Faults Id */
+
+/* External variables --------------------------------------------------------*/
+
+/* Exported macros -----------------------------------------------------------*/
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_EXCPT_SetError(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+void SFU_EXCPT_Security_Error(void);
+
+SFU_ErrorStatus SFU_EXCPT_Init(void);
+SFU_ErrorStatus SFU_EXCPT_DeInit(void);
+
+void SFU_EXCPT_ResetExceptionHandler(SFU_EXCPT_IdTypeDef eExceptionId);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_ERROR_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
new file mode 100644
index 00000000..a95da12f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h
@@ -0,0 +1,103 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fsm_states.h
+  * @author  MCD Application Team
+  * @brief   This file defines the SB_SFU Finite State Machine states.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FSM_STATES_H
+#define SFU_FSM_STATES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * FSM states: this enum must start from 0.
+  */
+typedef enum
+{
+  SFU_STATE_CHECK_STATUS_ON_RESET = 0U, /*!< checks the reset cause and decide how to proceed     */
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+  SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD,   /*!< SFU checks if a local download must be handled       */
+  SFU_STATE_DOWNLOAD_NEW_USER_FW,       /*!< downloads the encrypted firmware to be installed     */
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) || (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#ifdef KMS_ENABLED
+  SFU_STATE_CHECK_KMS_BLOB_TO_INSTALL, /*!< SFU checks if a kms blob download must be handled    */
+  SFU_STATE_INSTALL_KMS_BLOB,          /* !< download the new kms_blob */
+#endif /* KMS_ENABLED */
+  SFU_STATE_VERIFY_USER_FW_STATUS,      /*!< checks the internal FLASH state to derive a status   */
+  SFU_STATE_VERIFY_USER_FW_SIGNATURE,   /*!< checks the validity of the active firmware           */
+  SFU_STATE_EXECUTE_USER_FW,            /*!< launch the user application                          */
+  SFU_STATE_HANDLE_CRITICAL_FAILURE,    /*!< deal with the critical failures                      */
+  SFU_STATE_REBOOT_STATE_MACHINE        /*!< a reboot is forced                                   */
+} SFU_BOOT_StateMachineTypeDef; /*!< SFU BOOT State Machine States */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  The following strings associated to the SM state are used for debugging purpose.
+  *  WARNING: The string array must match perfectly with the SFU_BOOT_StateMachineTypeDef defined above.
+  *           And the above enum must be a sequence starting from 0
+  */
+#ifdef SFU_DEBUG_MODE
+#if defined(SFU_VERBOSE_DEBUG_MODE) && defined (SFU_BOOT_C)
+char *m_aStateMachineStrings[] = { "Checking Status on Reset.",
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+                                   "Checking if new Fw Image available to download.",
+                                   "Downloading new Fw Image.",
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+                                   "Verifying Fw Image status.",
+                                   "Verifying Fw Image signature.",
+                                   "Executing Fw Image.",
+                                   "Handling a critical failure.",
+                                   "Rebooting the State Machine"
+                                 };
+#endif /* SFU_VERBOSE_DEBUG_MODE && SFU_BOOT_C */
+
+#endif /* SFU_DEBUG_MODE */
+
+/* Exported macros -----------------------------------------------------------*/
+/************ SFU SM States****************************************************/
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_CHECK_NEW_FW_TO_DOWNLOAD) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_DOWNLOAD_NEW_USER_FW)     || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#else
+#define IS_SFU_SM_STATE(STATE)  (((STATE) == (uint8_t)SFU_STATE_CHECK_STATUS_ON_RESET)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_STATUS)    || \
+                                 ((STATE) == (uint8_t)SFU_STATE_VERIFY_USER_FW_SIGNATURE) || \
+                                 ((STATE) == (uint8_t)SFU_STATE_EXECUTE_USER_FW)          || \
+                                 ((STATE) == (uint8_t)SFU_STATE_HANDLE_CRITICAL_FAILURE)  || \
+                                 ((STATE) == (uint8_t)SFU_STATE_REBOOT_STATE_MACHINE))   /*!< SFU SM States*/
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FSM_STATES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
new file mode 100644
index 00000000..d7b72718
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c
@@ -0,0 +1,1075 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_common.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the Firmware Images.
+  *          This file contains the "common" functionalities of the image handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_FWIMG_COMMON_C
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_regions.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t fw_tag_validated[SFU_NB_MAX_ACTIVE_IMAGE][SE_TAG_LEN];
+
+/* Global variables ----------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+SFU_IMG_StatusTypeDef SFU_IMG_Status;
+uint32_t SFU_IMG_Line;
+
+/**
+  * FW header (metadata) of the active FW in active slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_validated;
+
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * FW header (metadata) of the candidate FW in dwl slot: structured format (access by fields)
+  */
+SE_FwRawHeaderTypeDef fw_image_header_to_test;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/* Functions Definition : helper ---------------------------------------------*/
+/**
+  * @brief  Memory compare with constant time execution.
+  * @note   Objective is to avoid basic attacks based on time execution
+  * @param  pAdd1 Address of the first buffer to compare
+  * @param  pAdd2 Address of the second buffer to compare
+  * @param  Size Size of the comparison
+  * @retval SFU_ SUCCESS if equal, a SFU_error otherwise.
+  */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size)
+{
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  for (i = 0U; i < Size; i++)
+  {
+    result |= pAdd1[i] ^ pAdd2[i];
+  }
+
+  if (result == 0x00U)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+
+
+/**
+  * @brief  Check header signature
+  * @param  pFwImageHeader: pointer to raw header.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef se_status;
+  uint8_t result = 0x00U;
+  uint32_t i;
+
+  /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+  if (SFU_IMG_GetFwImageSlot(pFwImageHeader) != SLOT_INACTIVE)
+  {
+    /* Unused bytes should be set at 0x00 value
+       Comparison with constant time execution */
+    for (i = 0U; i < sizeof(pFwImageHeader->Reserved); i++)
+    {
+      result |= pFwImageHeader->Reserved[i] ^ 0x00U;
+    }
+
+    if (result == 0x00U)
+    {
+      /* Check signature of the FW header */
+      if (SE_VerifyHeaderSignature(&se_status, pFwImageHeader) == SE_SUCCESS)
+      {
+        FLOW_STEP(uFlowCryptoValue, FLOW_STEP_AUTHENTICATE);
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Secure Engine Firmware signature verification (FW in non contiguous area).
+  *        It handles Firmware TAG verification of a complete buffer by calling
+  *        SE_AuthenticateFW_Init, SE_AuthenticateFW_Append and SE_AuthenticateFW_Finish inside the firewall.
+  * @note: AES_GCM tag: In order to verify the TAG of a buffer, the function will re-encrypt it
+  *        and at the end compare the obtained TAG with the one provided as input
+  *        in pSE_GMCInit parameter.
+  * @note: SHA-256 tag: a hash of the firmware is performed and compared with the digest stored in the Firmware header.
+  * @param pSE_Status: Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param SlotNumber index of the slot in the list
+  * @param pSE_Metadata: Firmware metadata.
+  * @param pSE_Payload: pointer to Payload Buffer descriptor.
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_ret_status = SE_ERROR;
+  SFU_ErrorStatus sfu_ret_status = SFU_SUCCESS;
+  /* Loop variables */
+  uint32_t i;
+  uint32_t j;
+  /* Variables to handle the FW image chunks to be injected in the verification procedure and the result */
+  uint32_t fw_tag_len;                 /* length of the authentication tag to be verified */
+  uint32_t fw_verified_total_size = 0; /* number of bytes that have been processed during authentication check */
+  uint32_t fw_chunk_size;              /* size of a FW chunk to be verified */
+  /* Authentication tag computed in this procedure (to be compared with the one stored in the FW metadata) */
+  uint8_t fw_tag_output[SE_TAG_LEN] __attribute__((aligned(8)));
+  /* FW chunk produced by the verification procedure if any   */
+  uint8_t fw_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* FW chunk provided as input to the verification procedure */
+  uint8_t fw_image_chunk[CHUNK_SIZE_SIGN_VERIFICATION] __attribute__((aligned(8)));
+  /* Variables to handle the FW image (this will be split in chunks) */
+  uint32_t payloadsize;
+  uint32_t ppayload;
+  uint32_t scatter_nb;
+  /* Variables to handle FW image size and tag */
+  uint32_t fw_size;
+  uint8_t *fw_tag;
+
+  /* Check the pointers allocation */
+  if ((pSeStatus == NULL) || (pSE_Metadata == NULL) || (pSE_Payload == NULL))
+  {
+    return SFU_ERROR;
+  }
+  if ((pSE_Payload->pPayload[0] == 0U) || ((pSE_Payload->pPayload[1] == 0U) && (pSE_Payload->PayloadSize[1] != 0U)))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check the parameters value and set fw_size and fw_tag to check */
+  if (SE_FwType == SE_FW_IMAGE_COMPLETE)
+  {
+    fw_size = pSE_Metadata->FwSize;
+    fw_tag = pSE_Metadata->FwTag;
+  }
+  else if (SE_FwType == SE_FW_IMAGE_PARTIAL)
+  {
+    fw_size = pSE_Metadata->PartialFwSize;
+    fw_tag = pSE_Metadata->PartialFwTag;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+
+  if ((pSE_Payload->PayloadSize[0] + pSE_Payload->PayloadSize[1]) != fw_size)
+  {
+    return SFU_ERROR;
+  }
+
+  /*  fix number of scatter block */
+  if (pSE_Payload->PayloadSize[1] != 0U)
+  {
+    scatter_nb = 2U;
+  }
+  else
+  {
+    scatter_nb = 1U;
+  }
+
+
+  /* Encryption process*/
+  se_ret_status = SE_AuthenticateFW_Init(pSeStatus, pSE_Metadata, SE_FwType);
+
+  /* check for initialization errors */
+  if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    for (j = 0; j < scatter_nb; j++)
+    {
+      payloadsize = pSE_Payload->PayloadSize[j];
+      ppayload = pSE_Payload->pPayload[j];
+      i = 0;
+      fw_chunk_size = CHUNK_SIZE_SIGN_VERIFICATION;
+
+      while ((i < (payloadsize / CHUNK_SIZE_SIGN_VERIFICATION)) && (*pSeStatus == SE_OK) &&
+             (sfu_ret_status == SFU_SUCCESS))
+      {
+
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk, (int32_t)fw_chunk_size,
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        ppayload += fw_chunk_size;
+        fw_verified_total_size += fw_chunk_size;
+        i++;
+      }
+      /* this the last path , size can be smaller */
+      fw_chunk_size = pSE_Payload->pPayload[j] + pSE_Payload->PayloadSize[j] - ppayload;
+      if ((fw_chunk_size != 0U) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+      {
+        sfu_ret_status = SFU_LL_FLASH_Read(fw_image_chunk, (uint8_t *)ppayload, fw_chunk_size) ;
+        if (sfu_ret_status == SFU_SUCCESS)
+        {
+
+          se_ret_status = SE_AuthenticateFW_Append(pSeStatus, fw_image_chunk,
+                                                   (int32_t)(payloadsize - (i * CHUNK_SIZE_SIGN_VERIFICATION)),
+                                                   fw_chunk, (int32_t *)&fw_chunk_size);
+        }
+        else
+        {
+          *pSeStatus = SE_ERR_FLASH_READ;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+        }
+        fw_verified_total_size += fw_chunk_size;
+      }
+    }
+  }
+
+  if ((sfu_ret_status == SFU_SUCCESS) && (se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK))
+  {
+    if (fw_verified_total_size <= fw_size)
+    {
+      /* Do the Finalization, check the authentication TAG*/
+      fw_tag_len = sizeof(fw_tag_output);
+      se_ret_status =   SE_AuthenticateFW_Finish(pSeStatus, fw_tag_output, (int32_t *)&fw_tag_len);
+
+      if ((se_ret_status == SE_SUCCESS) && (*pSeStatus == SE_OK) && (fw_tag_len == SE_TAG_LEN))
+      {
+        /* Firmware tag verification */
+        if (MemoryCompare(fw_tag_output, fw_tag, SE_TAG_LEN) != SFU_SUCCESS)
+        {
+          *pSeStatus = SE_SIGNATURE_ERR;
+          se_ret_status = SE_ERROR;
+          sfu_ret_status = SFU_ERROR;
+
+          /* Save result for active slot :
+             to avoid single fault attack the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memset(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], 0x00, SE_TAG_LEN);
+          }
+        }
+        else
+        {
+          FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+
+          /* Save result for active slot :
+             to avoid single fault attacje the signature will be double checked before UserApp execution */
+          if ((SlotNumber >= SLOT_ACTIVE_1) && (SlotNumber < SLOT_DWL_1))
+          {
+            (void) memcpy(&fw_tag_validated[SlotNumber - SLOT_ACTIVE_1][0U], fw_tag_output, SE_TAG_LEN);
+          }
+        }
+      }
+      else
+      {
+        sfu_ret_status = SFU_ERROR;
+      }
+    }
+    else
+    {
+      sfu_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    sfu_ret_status = SFU_ERROR;
+  }
+  return sfu_ret_status;
+}
+
+/**
+  * @brief Fill authenticated info in SE_FwImage.
+  * @param SFU_APP_Status
+  * @param pBuffer
+  * @param BufferSize
+  * @retval SFU_SUCCESS if successful, a SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer)
+{
+  /* Check the pointers allocation */
+  if ((pFwHeader == NULL) || (pBuffer == NULL))
+  {
+    return SFU_ERROR;
+  }
+  (void) memcpy(pFwHeader, pBuffer, sizeof(*pFwHeader));
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Verify Image Header in the slot given as a parameter
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer to a structure to handle the header info (filled by this function)
+  * @note   Not used in Alpha version -
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* use api read to detect possible ECC error */
+  e_ret_status = SFU_LL_FLASH_Read((uint8_t *) pFwImageHeader, (uint8_t *) SlotHeaderAdd[SlotNumber],
+                                   sizeof(SE_FwRawHeaderTypeDef));
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Verify signature */
+    e_ret_status = VerifyHeaderSignature(pFwImageHeader);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Verify Fw signature of binary contiguous in flash
+  * @param  pSeStatus pointer giving the SE status result
+  * @param  SlotNumber flash slot to check
+  * @param  pFwImageHeader pointer to fw header
+  * @param  SlotNumber flash slot to check
+  * @param SE_FwType: Type of Fw Image.
+  *        This parameter can be SE_FW_IMAGE_COMPLETE or SE_FW_IMAGE_PARTIAL.
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t SlotNumber,
+                                  SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType)
+{
+  SE_Ex_PayloadDescTypeDef  pse_payload;
+  uint32_t fw_size;
+  uint32_t fw_offset;
+
+  /*  put it OK, to discriminate error in SFU FWIMG parts */
+  *pSeStatus = SE_OK;
+
+  /* Check the parameters value */
+  if (pFwImageHeader == NULL)
+  {
+    return SFU_ERROR;
+  }
+  if ((SE_FwType != SE_FW_IMAGE_PARTIAL) && (SE_FwType != SE_FW_IMAGE_COMPLETE))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Check SE_FwType parameter, and fix size and offset accordingly */
+  switch (SE_FwType)
+  {
+    case SE_FW_IMAGE_COMPLETE :
+      fw_size = pFwImageHeader->FwSize;
+      fw_offset = 0U;
+      break;
+    case SE_FW_IMAGE_PARTIAL :
+      fw_size = pFwImageHeader->PartialFwSize;
+      fw_offset = pFwImageHeader->PartialFwOffset;
+      break;
+    default :
+      /* error */
+      fw_size = 0U;
+      fw_offset = 0U;
+      break;
+  }
+
+  pse_payload.pPayload[0] = SlotStartAdd[SlotNumber] + fw_offset + SFU_IMG_IMAGE_OFFSET;
+  pse_payload.PayloadSize[0] = fw_size;
+  pse_payload.pPayload[1] = 0U;
+  pse_payload.PayloadSize[1] = 0U;
+
+  return  VerifyFwSignatureScatter(pSeStatus, SlotNumber, pFwImageHeader, &pse_payload, SE_FwType);
+}
+
+/**
+  * @brief Verifies the validity of a slot.
+  * @note  Control if there is no additional code beyond the firmware image (malicious SW).
+  * @param pSlotBegin Start address of a slot.
+  * @param uSlotSize Size of a slot.
+  * @param uFwSize Size of the firmware image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize)
+{
+  uint8_t *pdata;
+  uint32_t length;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check is already clean */
+  pdata = pSlotBegin + SFU_IMG_IMAGE_OFFSET + uFwSize;
+  length = uSlotSize - SFU_IMG_IMAGE_OFFSET - uFwSize;
+  e_ret_status = SFU_LL_FLASH_Compare(pdata, 0x00000000U, 0xFFFFFFFFU, length);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function clean-up the flash
+  * @note   Not designed to clean-up area inside secure engine isolation.
+  * @note   To clean the slot without erasing the header we write "0x00" except if already written
+  * @param  pSlotBegin Start address of a slot.
+  * @param  uSlotSize Size of a slot.
+  * @param  uOffset Offset in the slot to start cleanup, until end of the slot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t pdata;
+  uint32_t slot_begin;
+  SFU_LL_FLASH_write_t pattern;
+  SFU_LL_FLASH_write_t value;
+  SFU_FLASH_StatusTypeDef flash_if_info;
+
+  /* Clean-up pattern initialization */
+  (void) memset((void *)&pattern, 0x00, sizeof(SFU_LL_FLASH_write_t));
+
+  /* Cleaning operation */
+  slot_begin = (uint32_t) pSlotBegin;
+  for (pdata = slot_begin + uOffset; pdata < (slot_begin + uSlotSize); pdata += sizeof(SFU_LL_FLASH_write_t))
+  {
+    e_ret_status =  SFU_LL_FLASH_Read((uint8_t *) &value, (uint8_t *) pdata, sizeof(SFU_LL_FLASH_write_t));
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* If read succeed, then the pattern write is performed only if pattern is not already present */
+      if (memcmp((void *) &value, (void *) &pattern, sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                          sizeof(SFU_LL_FLASH_write_t));
+      }
+    }
+    else
+    {
+      /* If read fail, then the write is performed unconditionally */
+      e_ret_status = SFU_LL_FLASH_Write(&flash_if_info, (uint8_t *) pdata, (uint8_t *) &pattern,
+                                        sizeof(SFU_LL_FLASH_write_t));
+    }
+
+    /* Reload Watchdog every 4Kbytes */
+    if ((pdata % 0x1000U) == 0U)
+    {
+      (void) SFU_LL_SECU_IWDG_Refresh();
+    }
+  }
+  return e_ret_status;
+}
+
+/* Functions Definition : services ------------------------------------------- */
+
+/**
+  * @brief FW Image Handling (FWIMG) initialization function.
+  *        Checks the validity of the settings related to image handling (slots size and alignments...).
+  * @note  The system initialization must have been performed before calling this function (flash driver ready to be
+  *        used...etc...).
+  *        Must be called first (and once) before calling the other Image handling services.
+  * @param  None.
+  * @retval SFU_IMG_InitStatusTypeDef SFU_IMG_INIT_OK if successful, an error code otherwise.
+  */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void)
+{
+  uint32_t i;
+  uint32_t mpu_size;
+  uint32_t mpu_max_size;
+  uint32_t mpu_sub_size;
+  SFU_IMG_InitStatusTypeDef e_ret_status = SFU_IMG_INIT_OK;
+
+  /*
+   * When there is no valid FW in active, the fw_image_header_validated structure is filled with 0s.
+   * When installing a first FW (after local download) this means that WRITE_TRAILER_MAGIC will write a SWAP magic
+   * starting with 0s.
+   * This causes an issue when calling CLEAN_TRAILER_MAGIC (because of this we added an erase that generated
+   * side-effects).
+   * To avoid all these problems we can initialize fw_image_header_validated with a non-0  value.
+   */
+  (void) memset((uint8_t *) &fw_image_header_validated, 0xFE, sizeof(fw_image_header_validated));
+
+  /*
+   * Sanity check: let's make sure all actives slots are properly aligned with regards to flash constraints
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!IS_ALIGNED(SlotStartAdd[SLOT_ACTIVE_1 + i]))
+      {
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d (%x) is not properly aligned\r\n",
+              i + 1U, SlotStartAdd[SLOT_ACTIVE_1 + i]);
+      } /* else active slot is properly aligned */
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the MAGIC patterns used by the internal algorithms match the FLASH constraints.
+   */
+  if (0U != (uint32_t)(MAGIC_LENGTH % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] magic size (%d) is not matching the FLASH constraints\r\n", MAGIC_LENGTH);
+  } /* else the MAGIC patterns size is fine with regards to FLASH constraints */
+
+  /*
+   * Sanity check: let's make sure the Firmware Header Length is fine with regards to FLASH constraints
+   */
+  if (0U != (uint32_t)(SE_FW_HEADER_TOT_LEN % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The code writing the FW header in FLASH requires the FW Header length to match the FLASH constraints */
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+    TRACE("\r\n= [FWIMG] FW Header size (%d) is not matching the FLASH constraints\r\n", SE_FW_HEADER_TOT_LEN);
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+
+  /*
+   * Sanity check: let's make sure the active slot headers do not overlap SB code area protected by WRP
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if(!((((SlotStartAdd[SLOT_ACTIVE_1 + i]   - FLASH_BASE) / FLASH_PAGE_SIZE) > SFU_PROTECT_WRP_PAGE_END_1 )
+        || (((SlotEndAdd[SLOT_ACTIVE_1 + i] + 1 - FLASH_BASE) / FLASH_PAGE_SIZE) < SFU_PROTECT_WRP_PAGE_START_1)))
+      {
+        TRACE("\r\n= [FWIMG] SLOT_ACTIVE_%d overlaps SBSFU code area protected by WRP\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+  /*
+   * Sanity check: let's make sure headers are under the MPU protection
+   */
+  /* Calculate size of image header MPU region */
+  mpu_max_size = 2U;
+  for (i = 0U; i < SFU_PROTECT_MPU_HEADER_SIZE; i++)
+  {
+    mpu_max_size = mpu_max_size * 2U;
+  }
+  /* Take into account 8 sub-regions (assuming they are continuous) */
+  mpu_sub_size = mpu_max_size / 8U;
+  mpu_size = 0U;
+  for (i = 0U; i < 8U; i++)
+  {
+    if (((~SFU_PROTECT_MPU_HEADER_SREG) & (0x1U << i)) != 0U)
+    {
+      mpu_size = mpu_size + mpu_sub_size;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+#if defined(__GNUC__)
+    __IO uint32_t start_add;
+    start_add = SlotStartAdd[SLOT_ACTIVE_1 + i];
+    if (start_add != 0U)
+#else
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+#endif /* (__GNUC__) */
+    {
+      if (!((SlotHeaderAdd[SLOT_ACTIVE_1 + i] >= SFU_PROTECT_MPU_HEADER_START)
+            && ((SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SE_FW_HEADER_TOT_LEN) <=
+                (SFU_PROTECT_MPU_HEADER_START + mpu_size))))
+      {
+        TRACE("\r\n= [FWIMG] Header of SLOT_ACTIVE_%d is not under the MPU protection\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap SB code area
+   */
+  if (!(((SB_REGION_ROM_START) > KMS_DATASTORAGE_END)
+        || ((SB_REGION_ROM_END) < (KMS_DATASTORAGE_START))))
+  {
+    TRACE("\r\n= [FWIMG] KMS NVM area overlaps SB Code area\r\n");
+    e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+  }
+
+  /*
+   * Sanity check: let's make sure the KMS NVM area does not overlap active slots area
+   */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if (SlotStartAdd[SLOT_ACTIVE_1 + i] != 0U)
+    {
+      if (!(((SlotStartAdd[SLOT_ACTIVE_1 + i]) > KMS_DATASTORAGE_END)
+            || ((SlotEndAdd[SLOT_ACTIVE_1 + i]) < (KMS_DATASTORAGE_START))))
+      {
+        TRACE("\r\n= [FWIMG] KMS NVM area overlaps SLOT_ACTIVE_%d area\r\n", i + 1U);
+        e_ret_status = SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR;
+      }
+    }
+  }
+
+
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief This function makes sure the current active firmware will not be considered as valid any more.
+  *        This function alters the FLASH content.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Reload Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* erase active slot except Header (under SECoreBin protection) for the anti-rollback check during next Fw update */
+  e_ret_status = CleanUpSlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), SFU_IMG_IMAGE_OFFSET);
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image metadata.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  * @note This function populates the FWIMG module variable: fw_image_header_validated
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber)
+{
+  /*
+   * If the metadata is valid then 'fw_image_header_validated' is filled with the metadata.
+   */
+  return (CheckAndGetFWHeader(SlotNumber, &fw_image_header_validated));
+}
+
+/**
+  * @brief Verifies the validity of the active firmware image.
+  * @note This function relies on cryptographic procedures and it is up to the caller to make sure the required
+  *       elements have been configured.
+  *       Typically, SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate
+  *       fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  e_ret_status = VerifyFwSignature(&e_se_status, SlotNumber, &fw_image_header_validated, SE_FW_IMAGE_COMPLETE);
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  if (SFU_ERROR == e_ret_status)
+  {
+    /* We do not memorize any specific error, the FSM state is already providing the info */
+    TRACE("\r\n=         SFU_IMG_VerifyActiveImg failure with se_status=%d!", e_se_status);
+  }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  return (e_ret_status);
+}
+
+/**
+  * @brief Verifies if no malicious code beyond Fw Image in an active slot.
+  * @note SFU_IMG_VerifyActiveImgMetadata() must have been called first to populate fw_image_header_validated.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), fw_image_header_validated.FwSize));
+}
+
+/**
+  * @brief Verifies if no malicious code in active slot.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber)
+{
+  return (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SLOT_SIZE(SlotNumber), 0U));
+}
+
+/**
+  * @brief  Control firmware signature
+  * @note   This control will be done twice for security reasons (first control done in VerifyFwSignatureScatter)
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful,SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber)
+{
+  /*
+   * fw_image_header_validated MUST have been populated with valid metadata first,
+   */
+  if (MemoryCompare(fw_tag_validated[SlotNumber - SLOT_ACTIVE_1], fw_image_header_validated.FwTag,
+                    SE_TAG_LEN) != SFU_SUCCESS)
+  {
+    return SFU_ERROR;
+  }
+  else
+  {
+    FLOW_STEP(uFlowCryptoValue, FLOW_STEP_INTEGRITY);
+    return SFU_SUCCESS;
+  }
+
+}
+
+/**
+  * @brief Launches the user application.
+  *        The caller must be prepared to never get the hand back after calling this function.
+  *        If a problem occurs, it must be memorized in the bootinfo area.
+  *        If the caller gets the hand back then this situation must be handled as a critical error.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met
+  *       (typically: no security check performed before launching the firmware).
+  * @note This function only handles the "system" aspects.
+  *       It is up to the caller to manage any security related action (enable ITs, disengage MPU, clean RAM...).
+  *       Nevertheless, cleaning-up the stack and heap used by SB_SFU is part of the system actions handled by this
+  *       function (as this needs to be done just before jumping into the user application).
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_ErrorStatus Does not return if successful, returns SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Verify if authentication/integrity/lock SE service performed */
+  FLOW_CONTROL_CHECK(uFlowCryptoValue, FLOW_CTRL_LOCK_SERVICE);
+
+  /* this function does not return */
+  /* first image identified as master image */
+  SFU_MPU_SysCall((uint32_t)SB_SYSCALL_LAUNCH_APP, SlotStartAdd[SlotNumber] + SFU_IMG_IMAGE_OFFSET);
+
+  /* The point below should NOT be reached */
+  return (e_ret_status);
+}
+
+/**
+  * @brief Get the version of the active FW
+  * @note It is up to the caller to make sure the active slot contains a valid active FW.
+  * @note In the current implementation the header is checked (authentication) and no version is returned if this check
+  *       fails.
+  * @param  SlotNumber index of the slot in the list
+  * @retval the FW version if the header is valid (coded on uint16_t), 0 otherwise
+  */
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber)
+{
+  SE_FwRawHeaderTypeDef fw_image_header;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint16_t version = 0;
+
+  /* check the header of the active FW */
+  e_ret_status = CheckAndGetFWHeader(SlotNumber, &fw_image_header);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* retrieve the version from the header without any further check */
+    version = fw_image_header.FwVersion;
+  }
+
+  return (version);
+}
+
+/**
+  * @brief Detect if a FW is present in a slot.
+  * @note  Detection done based on MAGIC header + FW signature. Header verification
+  *        not done at this stage for timing optimization.
+  * @param  SlotNumber index of the slot in the list
+  * @retval SFU_SUCCESS if successful, error code otherwise
+  */
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t *pbuffer;
+  uint8_t  buffer[SE_FW_HEADER_TOT_LEN];
+  SE_FwRawHeaderTypeDef *p_header;
+
+  /* Read header */
+  pbuffer = (uint8_t *) SlotHeaderAdd[SlotNumber];
+  if (SFU_LL_FLASH_Read(buffer, pbuffer, sizeof(buffer)) == SFU_SUCCESS)
+  {
+    /* Check if the FW header is authentic : SFU1 / SFU2 / SFU3 */
+    p_header = (SE_FwRawHeaderTypeDef *)(uint32_t)buffer;
+    if (SFU_IMG_GetFwImageSlot(p_header) != SLOT_INACTIVE)
+    {
+      /*
+       * Control if the first 32 bytes (could be more but time consuming ...) are significants
+       * At this location we should find the vector table.
+       * Objective is to detect if the FW image has been erased
+       * ==> this is the case after SFU_IMG_InvalidateCurrentFirmware() (could be an attack attempt)
+       */
+      if (VerifySlot((uint8_t *) SlotStartAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET + 0x20U, 0U) != SFU_SUCCESS)
+      {
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Validate the active FW image in active slot by installing the header
+  * @param  SlotNumber index of the slot in the list
+  * @param  pFwImageHeader pointer in ram to the header to install
+  * @retval SFU_SUCCESS if successful, a SFU_ErrorStatus error otherwise.
+  */
+
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /* Header erasing */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], SFU_IMG_IMAGE_OFFSET);
+  STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+  /* Header writing: encrypted part with signature */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *) SlotHeaderAdd[SlotNumber], (uint8_t *) pFWImageHeader,
+                                      SE_FW_AUTH_LEN + SE_FW_HEADER_SIGN_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+  /* Header writing : Do not update image state part */
+
+  /* Header writing: previous FW image fingerprint */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_Write(&flash_if_status, (uint8_t *)(SlotHeaderAdd[SlotNumber] + SE_FW_HEADER_TOT_LEN -
+                                                                    SE_FW_HEADER_FINGERPRINT_LEN),
+                                      (uint8_t *) pFWImageHeader->PrevHeaderFingerprint, SE_FW_HEADER_FINGERPRINT_LEN);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_WRITE_FAILED);
+  }
+
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Get firmware image ID from header.
+  * @param  pFwImageHeader pointer to a structure to handle the header info
+  * @retval Fw Id : SLOT_ACTIVE_1 / 2 /... / SFU_NB_MAX_ACTIVE_IMAGE
+  */
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader)
+{
+  uint32_t active_slot;
+
+  if (memcmp(pFwImageHeader->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_1;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_2;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2)
+  else if (memcmp(pFwImageHeader->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    active_slot = SLOT_ACTIVE_3;
+  }
+#endif  /* (SFU_NB_MAX_ACTIVE_IMAGE > 2) */
+  else
+  {
+    active_slot = SLOT_INACTIVE;
+  }
+
+  return active_slot;
+}
+
+/**
+  * @brief  Check candidate image version is allowed.
+  * @param  ActiveSlot Slot identification used in case of secure counters usage
+  * @param  CurrentVersion Version of currently installed image if any
+  * @param  CandidateVersion Version of candidate image
+  * @retval SFU_SUCCESS if candidate image version is allowed, SFU_ErrorStatus error otherwise.
+  */
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  UNUSED(ActiveSlot);
+
+  /* If the header of the active firmware is not valid, the CurrentVersion is 0 */
+  if (CurrentVersion == 0U)
+  {
+    /*
+     * If the header of the active firmware is not valid (could comes from an attack attempt, we authorize only the
+     * installation of a specific version identified by SFU_FW_VERSION_INIT_NUM.
+     */
+    if (CandidateVersion == SFU_FW_VERSION_INIT_NUM)
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+  }
+  else
+  {
+    /*
+     * It is not allowed to install a Firmware with a lower version than the active firmware.
+     * But we authorize the re-installation of the current firmware version.
+     * We also check that the candidate version is at least the min. allowed version for this device.
+     */
+    if ((CandidateVersion >= CurrentVersion) && (CandidateVersion >= SFU_FW_VERSION_START_NUM))
+    {
+      /* Candidate version is allowed */
+      e_ret_status = SFU_SUCCESS;
+    }
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    else
+    {
+      TRACE("\r\n\t  Init version:%d - Current version:%d - Candidate version:%d : Installation not allowed!", SFU_FW_VERSION_INIT_NUM, CurrentVersion, CandidateVersion);
+    }
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  }
+
+  return e_ret_status;
+}
+
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+/**
+  * @brief Verifies the validity of the metadata associated to a candidate image.
+  *        The anti-rollback check is performed.
+  *        Errors can be memorized in the bootinfo area but no action is taken in this procedure.
+  * @note It is up to the caller to make sure the conditions to call this primitive are met (no check performed before
+  *       running the procedure):
+  *       SFU_IMG_CheckPendingInstallation should be called first.
+  * @note For the local loader (@ref SECBOOT_USE_LOCAL_LOADER), the candidate metadata is verified by:
+  *       @ref SFU_APP_VerifyFwHeader.
+  *       But, SFU_IMG_CheckCandidateVersion will be called when the installation of the new image is triggered.
+  * @param  DwlSlot identification of the downloaded area
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, error code otherwise
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+  uint32_t active_slot;
+  uint16_t cur_ver;
+  uint16_t verif_ver;
+
+  /*
+   * - Candidate FW Header Authentication
+   *       An authentication check is already performed with SFU_IMG_CheckPendingInstallation().
+   *       As a consequence: fw_image_header_to_test is already populated
+   *
+   * - Check version is allowed
+   *      SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+   */
+
+  /* Header analysis to find slot based on number with magic tag */
+  active_slot = SFU_IMG_GetFwImageSlot(&fw_image_header_to_test);
+
+  /* Get the version of active_slot */
+  cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+
+  if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, fw_image_header_to_test.FwVersion) != SFU_SUCCESS)
+  {
+    /* The installation is forbidden */
+    /* Memorize this error as this will be handled as a critical failure */
+    SFU_EXCPT_SetError(SFU_EXCPT_VERSION_ERR);
+
+    /* We would enter an infinite loop of installation attempts if we do not clean-up the dwl slot header */
+    e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status, (uint8_t *)SlotStartAdd[DwlSlot], SFU_IMG_IMAGE_OFFSET);
+    STATUS_FWIMG(e_ret_status == SFU_ERROR, SFU_IMG_FLASH_ERASE_FAILED);
+
+    /* leave now to handle the critical failure in the appropriate FSM state */
+    e_ret_status = SFU_ERROR;
+  }
+  else
+  {
+    /* the anti-rollback check succeeds: the version is fine */
+    /* double check to avoid basic hardware attack attack */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    e_ret_status = SFU_IMG_CheckFwVersion(active_slot, verif_ver, fw_image_header_to_test.FwVersion);
+  }
+
+  /* Return the result */
+  return (e_ret_status);
+}
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
new file mode 100644
index 00000000..469b89ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h
@@ -0,0 +1,136 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_internal.h
+  * @author  MCD Application Team
+  * @brief   This file contains internal definitions (private) for SFU_FWIMG functionalities.
+  *          This file should be included only by sfu_fwimg_core.c and sfu_fwimg_services.c.
+  *          Nevertheless, the SFU_KMS module is allowed to include it to re-use the variable
+  *          fw_image_header_to_test to install an KMS blob.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_INTERNAL_H
+#define SFU_FWIMG_INTERNAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_fwimg_regions.h"
+#include "kms_blob_metadata.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Payload Buffer descriptor.
+  * This structure describes how a Firmware is split in Flash.
+  * In the nominal case a Firmware is stored in 1 contiguous area.
+  * But, a Firmware can be split in up to 2 areas (typically when a FW installation procedure is interrupted or after a
+  * decrypt operation).
+  */
+typedef struct
+{
+  uint32_t  pPayload[2];               /*!<  table containing payload pointer*/
+  uint32_t  PayloadSize[2];            /*!<  table containing Payload Size*/
+} SE_Ex_PayloadDescTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief SFU_IMG Flash Status Type Definition
+  * Status of a FLASH operation.
+  */
+typedef enum
+{
+  SFU_IMG_OK = 0x0U,             /*!< No problem reported */
+  SFU_IMG_FLASH_ERASE_FAILED,    /*!< FLASH erase failure */
+  SFU_IMG_FLASH_WRITE_FAILED,    /*!< FLASH write failure */
+  SFU_IMG_FLASH_READ_FAILED,     /*!< FLASH read failure */
+} SFU_IMG_StatusTypeDef;
+
+/**
+  * @brief RAM chunk used for decryption / comparison / swap
+  * it is the size of RAM buffer allocated in stack and used for decrypting/moving images.
+  * some function allocates 2 buffer of this size in stack.
+  * As image are encrypted by 128 bits blocks, this value is 16 bytes aligned.
+  */
+#define CHUNK_SIZE_SIGN_VERIFICATION (1024UL)  /*!< Signature verification chunk size*/
+
+#define SFU_IMG_CHUNK_SIZE  (512UL)
+#define AES_BLOCK_SIZE (16UL)  /*!< Size of an AES block to check padding needs for decrypting */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief  Status Macro
+  * This macros aims at capturing abnormal errors in the FWIMG sub-module (typically FLASH errors).
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is activated this macro blocks the execution.
+  * When SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE is deactivated, a log is printed in the console (if SFU_DEBUG_MODE is
+  * activated) and the execution continues.
+  */
+#if defined(SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE)
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - BLOCK", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                   while(1==1){;} \
+                                 } while(0==1){;}
+#else
+#define STATUS_FWIMG(B,A) if (B) { \
+                                   SFU_IMG_Status=A; \
+                                   SFU_IMG_Line = __LINE__; \
+                                   TRACE("\r\n          Abnormal error %d at line %d in %s - CONTINUE", \
+                                         SFU_IMG_Status, SFU_IMG_Line, __FILE__); \
+                                 } while(0==1){;}
+#endif /* SFU_FWIMG_BLOCK_ON_ABNORMAL_ERRORS_MODE */
+
+/* External variables --------------------------------------------------------*/
+/**
+  *  FWIMG status variables used to log errors and display debug messages.
+  *  This is related to FLASH operations.
+  *  This is handled with STATUS_FWIMG.
+  */
+extern SFU_IMG_StatusTypeDef SFU_IMG_Status;
+extern uint32_t SFU_IMG_Line;
+
+extern SE_FwRawHeaderTypeDef fw_image_header_validated;
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+extern SE_FwRawHeaderTypeDef fw_image_header_to_test;
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+
+/* Exported functions : helper ---------------------------------------------- */
+SFU_ErrorStatus MemoryCompare(uint8_t *pAdd1, uint8_t *pAdd2, uint32_t Size);
+SFU_ErrorStatus VerifyHeaderSignature(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignatureScatter(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber,
+                                         SE_FwRawHeaderTypeDef *pSE_Metadata,
+                                         SE_Ex_PayloadDescTypeDef  *pSE_Payload, uint32_t SE_FwType);
+SFU_ErrorStatus VerifyTag(SE_StatusTypeDef *pSeStatus, uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pSE_Metadata,
+                          uint8_t  *pPayload, uint32_t SE_FwType);
+SFU_ErrorStatus ParseFWInfo(SE_FwRawHeaderTypeDef *pFwHeader, uint8_t *pBuffer);
+SFU_ErrorStatus CheckAndGetFWHeader(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus VerifyFwSignature(SE_StatusTypeDef  *pSeStatus, uint32_t slot, SE_FwRawHeaderTypeDef *pFwImageHeader,
+                                  uint32_t SE_FwType);
+SFU_ErrorStatus VerifySlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uFwSize);
+SFU_ErrorStatus CleanUpSlot(uint8_t *pSlotBegin, uint32_t uSlotSize, uint32_t uOffset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_INTERNAL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
new file mode 100644
index 00000000..08724f4a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h
@@ -0,0 +1,97 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_services.h
+  * @author  MCD Application Team
+  * @brief   This file contains the 2 images handling service (SFU_FWIMG functionalities)
+  *          API definitions.
+  *          These services can be called by the bootloader to deal with images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_SERVICES_H
+#define SFU_FWIMG_SERVICES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_IMG Initialization Status Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_IMG_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_IMG_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_IMG_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_IMG_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_IMG_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_IMG_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_IMG Image Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_IMG_FWIMAGE_TO_INSTALL = 0x0U,   /*!< There is a FW image to be installed */
+  SFU_IMG_FWUPDATE_STOPPED,            /*!< A previous installation has been interrupted before it completed : resume installation */
+  SFU_IMG_NO_FWUPDATE,                 /*!< No FW image installation pending */
+  SFU_IMG_FWIMAGE_ROLLBACK,            /*!< A new FW image installation has not been validated : rollback initiated @ next reset */
+} SFU_IMG_ImgInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_IMG_InitStatusTypeDef SFU_IMG_InitImageHandling(void);
+SFU_IMG_InitStatusTypeDef SFU_IMG_CheckSwapImageHandling(void);
+#if  (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall);
+#else
+SFU_IMG_ImgInstallStateTypeDef SFU_IMG_CheckPendingInstallation(uint32_t *pDwlSlotToInstall, \
+                                                                uint32_t *pActiveSlotToResume, \
+                                                                uint32_t *pActiveSlotToRollback);
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER) */
+#if   (SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER)
+SFU_ErrorStatus SFU_IMG_CheckCandidateVersion(uint32_t DwlSlot);
+#endif /* SECBOOT_LOADER == SECBOOT_USE_STANDALONE_LOADER */
+SFU_ErrorStatus SFU_IMG_TriggerImageInstallation(uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_TriggerResumeInstallation(uint32_t ActiveSlot, uint32_t DwlSlot);
+SFU_ErrorStatus SFU_IMG_EraseDownloadedImg(uint32_t DwlSlot);
+uint32_t SFU_IMG_GetTrailerSize(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_InvalidateCurrentFirmware(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImgMetadata(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveImg(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_VerifyEmptyActiveSlot(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_LaunchActiveImg(uint32_t SlotNumber);
+uint16_t SFU_IMG_GetActiveFwVersion(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_DetectFW(uint32_t SlotNumber);
+SFU_ErrorStatus SFU_IMG_Validation(uint32_t SlotNumber, SE_FwRawHeaderTypeDef *pFWImageHeader);
+SFU_ErrorStatus SFU_IMG_ControlActiveImgTag(uint32_t SlotNumber);
+uint32_t SFU_IMG_GetFwImageSlot(SE_FwRawHeaderTypeDef *pFwImageHeader);
+SFU_ErrorStatus SFU_IMG_CheckFwVersion(uint32_t ActiveSlot, uint16_t CurrentVersion, uint16_t CandidateVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_SERVICES_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
new file mode 100644
index 00000000..9083965c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c
@@ -0,0 +1,747 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"           /* se_interface_bootloader.c is compiled in SBSFU project using main.h from this project */
+#include "se_low_level.h"   /* This file is part of SE_CoreBin and adapts the Secure Engine (and its interface) to the 
+                               STM32 board specificities */
+#include "tkms.h"
+#include "sfu_interface_crypto_scheme.h"
+#include <string.h>
+#include "kms_platf_objects_interface.h"     /* To get keys handle definitions */
+
+/* Private defines -----------------------------------------------------------*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+#define GCM_TAGBITS_SIZE          128
+#define GCM_IVLEN_BITS            16
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+/* Private variables ---------------------------------------------------------*/
+CK_SESSION_HANDLE EncryptSession;
+CK_SESSION_HANDLE DecryptSession;
+CK_SESSION_HANDLE AuthenticateSession;
+CK_SESSION_HANDLE VerifySession;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static uint8_t *gcm_tag_header;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Get AES key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+static SE_ErrorStatus SFU_GetAESKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phAESKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phAESKey = KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /* ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)) */
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/**
+  * @brief  Get ECDSA key handle.
+  * @param  pxSE_Metadata Metadata that will be used to identify the keys.
+  * @param  phAESKey pointer on AES key object handle
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+static SE_ErrorStatus SFU_GetECDSAKeyObject(SE_FwRawHeaderTypeDef *pxSE_Metadata, CK_OBJECT_HANDLE *phECDSAKey)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  /* Each magic corresponds to a different key:
+   * SFUM_1 = SBSFU_KEY_1
+   * SFUM_2 = SBSFU_KEY_2
+   * SFUM_3 = SBSFU_KEY_3
+   */
+  if (memcmp(pxSE_Metadata->SFUMagic, SFUM_1, strlen(SFUM_1)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_2, strlen(SFUM_2)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 1) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  else if (memcmp(pxSE_Metadata->SFUMagic, SFUM_3, strlen(SFUM_3)) == 0)
+  {
+    *phECDSAKey = KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE;
+    e_ret_status = SE_SUCCESS;
+  }
+#endif  /* (NB_FW_IMAGES > 2) */
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+#endif /*((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)) */
+
+
+/**
+  * @brief Secure Engine Decrypt Init function.
+  *        It is a wrapper of Decrypt_Init function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata, uint32_t SE_FwType)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *gcm_iv = pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+  gcm_tag_header = pxSE_Metadata->FwTag;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  CK_RV rv = CKR_OK;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint8_t *iv_cbc = pxSE_Metadata->InitVector;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_MECHANISM cktest_aes_cbc_mechanism =
+  {
+    CKM_AES_CBC,
+    iv_cbc,
+    SE_IV_LEN
+  };
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * In this crypto scheme the Firmware is not encrypted.
+   * The Decrypt operation is called anyhow before installing the firmware.
+   * Indeed, it allows moving the Firmware image blocks in FLASH.
+   * These moves are mandatory to create the appropriate mapping in FLASH
+   * allowing the swap procedure to run without using the swap area at each and every move.
+   *
+   * See in SB_SFU project: @ref SFU_IMG_PrepareCandidateImageForInstall.
+   */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Initialize the decryption session */
+  if (se_status == SE_SUCCESS)
+  {
+    rv = C_DecryptInit(DecryptSession, &cktest_aes_cbc_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do as we won't decrypt anything */
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Append function.
+  *        It is a wrapper of Decrypt_Append function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffe pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* DecryptImageInDwlSlot() always starts by calling the Decrypt service with a 0 byte buffer */
+  if (0 == InputSize)
+  {
+    /* Nothing to do but we must return a success for the decrypt operation to continue */
+    return (SE_SUCCESS);
+  }
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  /* Buffer decryption */
+  rv = C_DecryptUpdate(DecryptSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /*
+   * The firmware is not encrypted.
+   * The only thing we need to do is to recopy the input buffer in the output buffer
+   */
+  (void)memcpy(pOutputBuffer, pInputBuffer, (uint32_t)InputSize);
+  *pOutputSize = InputSize;
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Decrypt Finish function.
+  *        It is a wrapper of Decrypt_Finish function included in the protected area.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  *peSE_Status = SE_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  CK_RV rv = CKR_OK;
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)\
+     || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  memcpy(pOutputBuffer, gcm_tag_header, 16);
+
+  /* End-up decryption session */
+  rv = C_DecryptFinal(DecryptSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+  /* Nothing to do */
+  se_status = SE_SUCCESS;
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  /* Close the session */
+  rv = C_CloseSession(DecryptSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Init function.
+  *        It is a wrapper of AuthenticateFW_Init function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pxSE_Metadata Metadata that will be used to fill the Crypto Init structure.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  uint8_t *gcm_iv =  pxSE_Metadata->Nonce;
+  CK_OBJECT_HANDLE hAESKey;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    NULL,
+    0,
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  CK_MECHANISM cktest_sha_256_mechanism =
+  {
+    CKM_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointer allocation */
+  if (pxSE_Metadata == NULL)
+  {
+    return SE_ERROR;
+  }
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxSE_Metadata, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize encryption session  */
+    rv = C_EncryptInit(AuthenticateSession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest initialization */
+  rv = C_DigestInit(AuthenticateSession, &cktest_sha_256_mechanism);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Append function.
+  *        It is a wrapper of AuthenticateFW_Append function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pInputBuffer pointer to Input Buffer.
+  * @param uInputSize Input Size (bytes).
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pInputBuffer == NULL) || (pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Buffer encryption */
+  rv = C_EncryptUpdate(AuthenticateSession, (CK_BYTE *)pInputBuffer, InputSize, pOutputBuffer,
+                       (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* Digest calculation */
+  rv = C_DigestUpdate(AuthenticateSession, (CK_BYTE_PTR)pInputBuffer, InputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Firmware Authentication Finish function.
+  *        It is a wrapper of AuthenticateFW_Finish function included in the Firewall.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pOutputBuffer pointer to Output Buffer.
+  * @param puOutputSize pointer to Output Size (bytes).
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize)
+{
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  CK_RV rv = CKR_OK;
+
+  /* Check the pointers allocation */
+  if ((pOutputBuffer == NULL) || (pOutputSize == NULL))
+  {
+    return SE_ERROR;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* End-up encryption session */
+  rv = C_EncryptFinal(AuthenticateSession, pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) )
+  /* End-up Digest calculation */
+  rv = C_DigestFinal(AuthenticateSession, (CK_BYTE_PTR)pOutputBuffer, (CK_ULONG_PTR)pOutputSize);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Close the session */
+  rv = C_CloseSession(AuthenticateSession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+}
+
+/**
+  * @brief Secure Engine Verify Raw Fw Header Tag.
+  *        It verifies the signature of a raw header file.
+  * @param peSE_Status Secure Engine Status.
+  *        This parameter can be a value of @ref SE_Status_Structure_definition.
+  * @param pFwRawHeader pointer to RawHeader Buffer.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader)
+{
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  CK_RV rv = CKR_OK;
+  SE_ErrorStatus se_status = SE_SUCCESS;
+  *peSE_Status = SE_OK;
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  int32_t fw_raw_header_output_length = SE_TAG_LEN;
+  uint8_t *gcm_iv = pxFwRawHeader->Nonce;
+  SE_FwRawHeaderTypeDef *gcm_header = pxFwRawHeader;
+  CK_OBJECT_HANDLE hAESKey = 0UL;
+
+  CK_GCM_PARAMS kms_test_gcm_params =
+  {
+    (CK_BYTE *)gcm_iv,
+    SE_NONCE_LEN,
+    (CK_BYTE_PTR)gcm_header,
+    ((int32_t)SE_FW_AUTH_LEN),
+    GCM_TAGBITS_SIZE
+  };
+
+  CK_MECHANISM cktest_aes_gcm_mechanism =
+  {
+    CKM_AES_GCM,
+    (CK_VOID_PTR *) &kms_test_gcm_params,
+    sizeof(kms_test_gcm_params)
+  };
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  const uint8_t *pPayload;                        /* Metadata payload */
+  int32_t payloadSize;                            /* Metadata length to be considered for hash */
+  uint8_t *pSignature = pxFwRawHeader->HeaderSignature; /* Signature ECDSA */
+  CK_OBJECT_HANDLE hECDSAKey = 0UL;
+  CK_MECHANISM cktest_ecdsa_256_mechanism =
+  {
+    CKM_ECDSA_SHA256,
+    NULL,
+    0
+  };
+#endif /* SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM */
+
+  /* Check the pointers allocation */
+  if (NULL == pxFwRawHeader)
+  {
+    *peSE_Status = SE_KO;
+    return SE_ERROR;
+  }
+
+#if ((SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256))
+  gcm_tag_header = pxFwRawHeader->HeaderSignature;
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+
+  /* Initialize the KMS service */
+  C_Initialize(NULL) ;
+
+  /* Start by opening a session */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetAESKeyObject(pxFwRawHeader, &hAESKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the decryption session */
+    rv = C_DecryptInit(VerifySession, &cktest_aes_gcm_mechanism, hAESKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up decryption session  : control if the tag is correct */
+  rv = C_DecryptFinal(VerifySession, gcm_tag_header, (CK_ULONG_PTR)&fw_raw_header_output_length);
+
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+
+  pPayload = (const uint8_t *)pxFwRawHeader;
+  payloadSize = SE_FW_AUTH_LEN;          /* Authenticated part of the header */
+
+  /* Identify the keys after FW header analysis (magic tag) */
+  if (SFU_GetECDSAKeyObject(pxFwRawHeader, &hECDSAKey) != SE_SUCCESS)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+  }
+
+  /* End-up verification process : control if the signature is correct */
+  rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* Double Check to avoid basic fault injection */
+  if (se_status == SE_SUCCESS)
+  {
+    /* Initialize the verification process */
+    rv = C_VerifyInit(VerifySession, &cktest_ecdsa_256_mechanism, hECDSAKey);
+    if (rv != CKR_OK)
+    {
+      se_status = SE_ERROR;
+      *peSE_Status = SE_KO;
+    }
+
+    if (se_status == SE_SUCCESS)
+    {
+      /* End-up verification process : control if the signature is correct */
+      rv = C_Verify(VerifySession, (CK_BYTE_PTR)pPayload, payloadSize, (CK_BYTE_PTR)pSignature, SE_HEADER_SIGN_LEN);
+      if (rv != CKR_OK)
+      {
+        se_status = SE_ERROR;
+        *peSE_Status = SE_KO;
+      }
+    }
+  }
+
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+  /* Close the session */
+  rv = C_CloseSession(VerifySession);
+  if (rv != CKR_OK)
+  {
+    se_status = SE_ERROR;
+    *peSE_Status = SE_KO;
+  }
+
+  /* End-up the KMS service */
+  C_Finalize(NULL) ;
+
+  return se_status;
+
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
new file mode 100644
index 00000000..992941e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h
@@ -0,0 +1,73 @@
+/**
+  ******************************************************************************
+  * @file    sfu_interface_crypto_scheme.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE Interface
+  *          functionalities. These services are used by the bootloader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported functions ------------------------------------------------------- */
+SE_ErrorStatus SFU_Decrypt_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                uint32_t SE_FwType);
+SE_ErrorStatus SFU_Decrypt_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                  uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_Decrypt_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Init(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxSE_Metadata,
+                                       uint32_t SE_FwType);
+SE_ErrorStatus SFU_AuthenticateFW_Append(SE_StatusTypeDef *peSE_Status, const uint8_t *pInputBuffer, int32_t InputSize,
+                                         uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_AuthenticateFW_Finish(SE_StatusTypeDef *peSE_Status, uint8_t *pOutputBuffer, int32_t *pOutputSize);
+SE_ErrorStatus SFU_VerifyHeaderSignature(SE_StatusTypeDef *peSE_Status, SE_FwRawHeaderTypeDef *pxFwRawHeader);
+
+#define SE_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType ) \
+  SFU_Decrypt_Init( peSE_Status,  pxSE_Metadata, SE_FwType )
+
+#define SE_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_Decrypt_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+
+#define SE_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType ) \
+  SFU_AuthenticateFW_Init( peSE_Status, pxSE_Metadata, SE_FwType )
+
+#define SE_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Append( peSE_Status, pInputBuffer, InputSize, pOutputBuffer, pOutputSize )
+
+#define SE_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize ) \
+  SFU_AuthenticateFW_Finish( peSE_Status, pOutputBuffer, pOutputSize )
+
+#define SE_VerifyHeaderSignature( peSE_Status, pxFwRawHeader ) \
+  SFU_VerifyHeaderSignature( peSE_Status, pxFwRawHeader )
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* SFU_KMS_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
new file mode 100644
index 00000000..d7bb34fa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c
@@ -0,0 +1,187 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of functions to manage the KMS Images.
+  *          This file contains the kms services the bootloader (sfu_boot) can
+  *             use to deal with the KMS Blob images handling.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_KMS_C
+
+
+#ifdef KMS_ENABLED
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include "main.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_internal.h"
+#include "sfu_trace.h"
+#include "sfu_kms.h"
+#include "sfu_fwimg_internal.h" /* required to re-use kmsblob_image_header_to_test (and SWAP_HDR) in the KMS blob 
+                                   installation procedure */
+#include "sfu_fwimg_regions.h"  /* required because KMS re-uses the SBSFU SWAP area */
+
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * Magic pattern identifying the beginning of a KMS blob.
+  */
+static uint8_t     kms_magic[4] = {"KMSB"};
+
+/**
+  * KMS Blob header (metadata) of the candidate Blob in SWAP: structured format (access by fields)
+  */
+static KMS_BlobRawHeaderTypeDef kmsblob_image_header_to_test;
+static uint32_t                 kmsblob_slot;
+
+/* Private macros ------------------------------------------------------------*/
+/**
+  * The KMS blob header has the same structure as the SBSFU Firmware Header.
+  * Therefore, authenticating a KMS blob header can be done by re-using the SBSFU FWIMG service authenticating a FW
+  * Header.
+  * The authentication of the KMS blob itself is not in the scope of sfu_kms, this is handled by the KMS middleware.
+  */
+#define SFU_KMS_AUTHENTICATE_BLOB_HEADER SFU_IMG_CheckAndGetFWHeader
+
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Check that there is a Blob to Install ==> KMSB MAGIC present at the beginning of a DWN slot ?
+  * @retval SFU_SUCCESS if Image can be installed, a SFU_ERROR  otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+
+  /*
+   * The KMS blob header uses a structure dedicated Header.
+   * In this function we focus only on the KMS blob header, not the entire KMS blob.
+   */
+
+  for (uint32_t i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    /* Slot configured ? */
+    if (SlotStartAdd[SLOT_DWL_1 + i] != 0U)
+    {
+      /*  Loading the KMS blob header contained in the SWAP area to verify if it can be a valid KMS blob */
+      if (SFU_LL_FLASH_Read((uint8_t *)(uint32_t)(&kmsblob_image_header_to_test),
+                            (uint8_t *)SlotStartAdd[SLOT_DWL_1 + i],
+                            sizeof(KMS_BlobRawHeaderTypeDef)) == SFU_SUCCESS)
+      {
+        /* Is there any KMSBlob present in the SWAP ? */
+        if (memcmp((uint8_t *)&kmsblob_image_header_to_test.KMSMagic, kms_magic, sizeof(kms_magic)) == 0)
+        {
+          /*
+           * Check the authenticity of the KMS Blob stored in the DWN slot.
+           * This check is restricted to the authentication of the KMS blob header.
+           * Authenticating the KMS blob itself is the role of the KMS module (KMS middleware).
+           */
+          kmsblob_slot = SLOT_DWL_1 + i; /* Save also DWN slot for later use */
+          e_ret_status = SFU_SUCCESS;
+          break;
+        }
+      }
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Retrieve information about the KMS blob hdr and location in flash
+  * @param  pHdr is the pointer to the encrypted blob header
+  * @param  pFlash is the pointer to the blob location in flash
+  * @retval none
+  */
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash)
+{
+  SFU_ErrorStatus  e_ret_status = SFU_ERROR;
+  if ((ppHdr != NULL) && (ppFlash != NULL))
+  {
+    *ppHdr = (uint8_t *)(uint32_t)&kmsblob_image_header_to_test;
+    *ppFlash = (uint8_t *)(((uint32_t)SlotStartAdd[kmsblob_slot]) + sizeof(kmsblob_image_header_to_test));
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Erase the Blob
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_KMS_EraseBlob(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_FLASH_StatusTypeDef flash_if_status;
+
+  /*  Erase in flash  */
+  e_ret_status = SFU_LL_FLASH_Erase_Size(&flash_if_status,
+                                         (uint8_t *) SlotStartAdd[kmsblob_slot],
+                                         SLOT_SIZE(kmsblob_slot));
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief Checks if there is a pending Blob installation.
+  *        3 situations can occur:
+  *        A. First installation request for a blob: a blob is ready to be installed but the installation has never
+  *           been triggered so far.
+  *        B. Blob installation to be retried: a blob installation has been interrupted (switch off) and we can restart
+  *           its installation.
+  *        C. No blob installation pending.
+    * @note This function populates the FWIMG module variable: kmsblob_image_header_to_test.
+  *         If a KMS blob is present then it is copied in kmsblob_image_header_to_test.
+  * @param  None.
+  * @retval SFU_KMS_BlobInstallStateTypeDef Pending Installation status (installation requested or not)
+  */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void)
+{
+  SFU_KMS_BlobInstallStateTypeDef e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+
+  /*
+   * While the SWAP AREA contains a KMSB Magic, it means the KMSBlob installation is not finalized.
+   *
+   */
+  if (SFU_SUCCESS == SFU_KMS_BlobToInstall())
+  {
+    /*
+     * A KMS blob is available for installation:
+     * kmsblob_image_header_to_test has been populated with this blob.
+     */
+    e_ret_state = SFU_KMS_BLOBIMAGE_TO_INSTALL;
+  }
+  else
+  {
+    /* No pending update */
+    e_ret_state = SFU_KMS_NO_BLOBUPDATE;
+  }
+
+  return e_ret_state;
+}
+
+#endif /* KMS_ENABLED */
+
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
new file mode 100644
index 00000000..8a47b5e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h
@@ -0,0 +1,78 @@
+/**
+  ******************************************************************************
+  * @file    sfu_kms.h
+  * @author  MCD Application Team
+  * @brief   This file contains the KMS Blob service (SFU_KMS_ENABLED) API definitions.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_KMS_H
+#define SFU_KMS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU_KMS Installation Status Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_INIT_OK = 0x0U,                /*!< SFU Firmware Image Handling (FWIMG) Init OK */
+  SFU_KMS_INIT_SLOTS_SIZE_ERROR,         /*!< error related to slots size */
+  SFU_KMS_INIT_SWAP_SETTINGS_ERROR,      /*!< error related to swap settings */
+  SFU_KMS_INIT_FLASH_CONSTRAINTS_ERROR,  /*!< error related to flash constraints */
+  SFU_KMS_INIT_CRYPTO_CONSTRAINTS_ERROR, /*!< error related to crypto constraints */
+  SFU_KMS_INIT_ERROR                     /*!< Init is FAILED: unspecified error */
+} SFU_KMS_InitStatusTypeDef;
+
+/**
+  * @brief  SFU_KMS Blob Installation State Type Definition
+  */
+typedef enum
+{
+  SFU_KMS_BLOBIMAGE_TO_INSTALL = 0x0U,   /*!< There is a KMS blob to be installed */
+  SFU_KMS_NO_BLOBUPDATE,                 /*!< No KMS blob installation pending */
+} SFU_KMS_BlobInstallStateTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_KMS_BlobInstallStateTypeDef SFU_KMS_CheckPendingBlobInstallation(void);
+SFU_ErrorStatus SFU_KMS_GetBlobInstallInfo(uint8_t **ppHdr, uint8_t **ppFlash);
+
+SFU_ErrorStatus SFU_KMS_BlobToInstall(void);
+SFU_ErrorStatus SFU_KMS_EraseBlob(void);
+
+SFU_ErrorStatus SFU_KMS_InvalidateCurrentFirmware(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImgMetadata(void);
+SFU_ErrorStatus SFU_KMS_VerifyActiveImg(void);
+SFU_ErrorStatus SFU_KMS_LaunchActiveImg(void);
+int32_t SFU_KMS_GetActiveFwVersion(void);
+SFU_ErrorStatus SFU_KMS_HasValidActiveFirmware(void);
+SFU_ErrorStatus SFU_KMS_Validation(uint8_t *pHeader);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_KMS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c
new file mode 100644
index 00000000..fb5936c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c
@@ -0,0 +1,803 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.c
+  * @author  MCD Application Team
+  * @brief   Secure Firmware Update LOADER module.
+  *          This file provides set of firmware functions to manage SFU local
+  *          loader functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <string.h>
+#include <stdlib.h>
+#include "main.h"
+#include "sfu_loader.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_com_loader.h"
+#include "sfu_trace.h"
+#include "se_interface_bootloader.h" /* for metadata authentication */
+#include "sfu_interface_crypto_scheme.h"
+#include "sfu_fwimg_services.h"      /* for version checking & to check if a valid FW is installed (the local
+                                        bootloader is a kind of "application" running in SB_SFU) */
+#include "app_sfu.h"
+
+#if (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER)
+
+/* Private variables ---------------------------------------------------------*/
+static uint8_t
+fw_decrypted_chunk[SFU_COM_YMODEM_PACKET_1K_SIZE];/*!< Buffer used for decryption during reception process */
+static uint32_t m_uDwlAreaAddress = 0U;                          /*!< Address of to write in download area */
+static uint32_t m_uDwlAreaStart = 0U;                            /*!< Address of download area */
+static uint32_t m_uDwlAreaSize = 0U;                             /*!< Size of download area */
+static uint32_t m_uFileSizeYmodem = 0U;                          /*!< Ymodem file size being received */
+static uint32_t m_uNbrBlocksYmodem = 0U;                         /*!< Number of blocks being received via Ymodem*/
+static uint32_t m_uPacketsReceived = 0U;                         /*!< Number of packets received via Ymodem*/
+static uint32_t m_uDwlSlot = SLOT_INACTIVE;                      /*!< Dwl slot identification : to be intialialized after header check */
+static SFU_LOADER_StatusTypeDef m_LoaderStatus;                  /*!< Status of the loader */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_Init(void)
+{
+  /*
+  * ADD SRC CODE HERE
+  */
+
+  /*
+   * Sanity check to make sure that the local loader cannot read out of the buffer bounds
+   * when doing a length alignment before writing in FLASH.
+   */
+  if (0U != (uint32_t)(sizeof(fw_decrypted_chunk) % (uint32_t)sizeof(SFU_LL_FLASH_write_t)))
+  {
+    /* The decrypt buffer must be a multiple of the FLASH write length  */
+    TRACE("\r\n= [FWIMG] Decrypt buffer size (%d) is not matching the FLASH constraints", sizeof(fw_decrypted_chunk));
+    return SFU_ERROR;
+  } /* else the FW Header Length is fine with regards to FLASH constraints */
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  DeInitialize the SFU LOADER.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DeInit(void)
+{
+  /*
+   * ADD SRC CODE HERE
+   */
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Download a new User Fw.
+  *         Writes firmware received via Ymodem in FLASH.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  p_DwlSlot identification of the downloaded area
+  * @param  p_Size Size of the downloaded image.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *pDwlSlot,
+                                             uint32_t *pSize)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SFU_COM_YMODEM_StatusTypeDef e_com_status = SFU_COM_YMODEM_ERROR;
+  SE_StatusTypeDef e_se_status;
+  int32_t fw_tag_len = 0;
+  uint8_t fw_tag_output[SE_TAG_LEN];
+
+  /* Check the pointers allocation */
+  if ((peSFU_LOADER_Status == NULL) || (pSize == NULL) || (pDwlSlot == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Refresh Watchdog */
+  (void) SFU_LL_SECU_IWDG_Refresh();
+
+  /* Transfer FW Image via YMODEM protocol */
+  TRACE("\r\n\t  File> Transfer> YMODEM> Send ");
+
+  /* Initialize global variables to be used during the YMODEM process */
+  m_uDwlAreaAddress = 0U;
+  m_uDwlAreaStart = 0U;
+  m_uDwlAreaSize = 0U;
+  m_uFileSizeYmodem = 0U;
+  m_uNbrBlocksYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uDwlSlot = SLOT_ACTIVE_1;
+  m_LoaderStatus = SFU_LOADER_ERR_COM;
+
+  /* Receive the FW in RAM and write it in the Flash*/
+  if (SFU_COM_YMODEM_Receive(&e_com_status, pSize) == SFU_SUCCESS)
+  {
+    if (*pSize > 0U)
+    {
+      /* File download correct*/
+      m_LoaderStatus = SFU_LOADER_OK;
+    }
+  }
+  else
+  {
+    /* Nothing to do : m_LoaderStatus updated during during YModem process */
+  }
+
+  /* Provide slot information to the caller
+     m_uDwlSlot updated during VerifyFwHeader() except in case of bad formatted file
+     ==> m_uDwlSlot stick at SLOT_DWL_1 value if the header signature is not verified */
+  *pDwlSlot = m_uDwlSlot;
+
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    /* End of decryption process */
+    fw_tag_len = sizeof(fw_tag_output);
+    if (SE_Decrypt_Finish(&e_se_status, fw_tag_output, &fw_tag_len) != SE_SUCCESS)
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+
+    }
+    else if (e_se_status != SE_OK)
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+    }
+    else
+    {
+      /* Nothing */
+    }
+  }
+
+  *peSFU_LOADER_Status = m_LoaderStatus;
+  if (m_LoaderStatus == SFU_LOADER_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Ymodem Header Packet Transfer completed callback.
+  * @param  uFileSize: Dimension of the file that will be received.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_COM_YMODEM_HeaderPktRxCpltCallback(uint32_t uFileSize)
+{
+  /*Reset of the ymodem variables */
+  m_uFileSizeYmodem = 0U;
+  m_uPacketsReceived = 0U;
+  m_uNbrBlocksYmodem = 0U;
+
+  /*Filesize information is stored*/
+  m_uFileSizeYmodem = uFileSize;
+
+  /*Compute the number of blocks */
+#ifndef MINICOM_YMODEM
+  /* Teraterm sends 1kB YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_1K_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_1K_SIZE;
+#else
+  /* Minicom sends 128 bytes YMODEM packets */
+  m_uNbrBlocksYmodem = (m_uFileSizeYmodem + (SFU_COM_YMODEM_PACKET_SIZE - 1U)) / SFU_COM_YMODEM_PACKET_SIZE;
+#endif /* MINICOM_YMODEM */
+
+  /* NOTE : delay inserted for Ymodem protocol*/
+  HAL_Delay(1000U);
+
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Ymodem Data Packet Transfer completed callback.
+  * @param  pData: Pointer to the buffer.
+  * @param  uSize: Packet dimension.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+#ifndef MINICOM_YMODEM
+/* Teraterm variant of the YMODEM protocol: uses 1kB packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+  int32_t fw_decrypted_chunk_size;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet*/
+    if (0U == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_1K_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_1K_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_1K_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_1K_SIZE);
+    }
+  }
+
+  /* First packet : Contains the FW header (SE_FW_HEADER_TOT_LEN bytes length) which is not encrypted  */
+  if (m_uPacketsReceived == 1U)
+  {
+
+    (void) memcpy(fw_header, p_data, SE_FW_HEADER_TOT_LEN);
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(p_data);
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)(uint32_t)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+    }
+
+    /* Clear Download application area (including TRAILERS area) */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+          SFU_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    /* Initialize decryption process */
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if (e_se_status != SE_OK)
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /* Store FW image header in Flash */
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, p_data, SE_FW_HEADER_TOT_LEN) ==
+            SFU_SUCCESS)
+        {
+          /* Shift the DWL area pointer */
+          m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+          rx_size -= SE_FW_HEADER_TOT_LEN;
+          p_data += SE_FW_HEADER_TOT_LEN;
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
+      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+      {
+        m_uDwlAreaAddress += rx_size;
+        p_data += rx_size;
+        rx_size = 0U;
+      }
+      /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be deccrypted */
+      else
+      {
+        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+      }
+    }
+
+    /* remaining bytes to decrypt ? */
+    if (rx_size != 0U)
+    {
+      fw_decrypted_chunk_size = rx_size;
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
+              != SE_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /*Nothing */
+      }
+    }
+  }
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL image size */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Set dimension to the appropriate length for FLASH programming.
+     * Example: 64-bit length for L4.
+     */
+    if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0U)
+    {
+      /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+         sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+      uOldSize = rx_size;
+      rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) - (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+      while (uOldSize < rx_size)
+      {
+        fw_decrypted_chunk[uOldSize] = 0xFF;
+        uOldSize++;
+      }
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Check size to avoid writing beyond DWL area */
+    if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  /* Write Data in Flash */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress += (rx_size);
+    }
+    else
+    {
+      m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#else /* MINICOM_YMODEM */
+/* Minicom variant of the YMODEM protocol: uses 128B packets */
+SFU_ErrorStatus SFU_COM_YMODEM_DataPktRxCpltCallback(uint8_t *pData, uint32_t uSize)
+{
+  /* The local loader must make a copy of the Firmware metadata,
+   * because this memory area is not copied when calling the SE_Decrypt_Init() primitive.
+   * Hence we must make sure this memory area still contains the FW header when SE_Decrypt_Finish() is called. */
+  static uint8_t fw_header[SE_FW_HEADER_TOT_LEN] __attribute__((aligned(8)));
+  /* Size of downloaded Image initialized with first packet (header) and checked along download process */
+  static uint32_t m_uDwlImgSize = 0U;
+
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_FLASH_StatusTypeDef x_flash_info;
+  uint32_t rx_size = uSize;
+  uint8_t *p_data = pData;
+  uint32_t uOldSize;
+  int32_t fw_decrypted_chunk_size;
+  SE_StatusTypeDef e_se_status = SE_KO;
+
+  /* Check the pointers allocation */
+  if (p_data == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  /*Increase the number of received packets*/
+  m_uPacketsReceived++;
+
+  /* Last packet : size of data to write could be different than SFU_COM_YMODEM_PACKET_1K_SIZE */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    /*Extracting actual payload from last packet: minicom works by default with 128B packets */
+    if (0 == (m_uFileSizeYmodem % SFU_COM_YMODEM_PACKET_SIZE))
+    {
+      /* The last packet must be fully considered */
+      rx_size = SFU_COM_YMODEM_PACKET_SIZE;
+    }
+    else
+    {
+      /* The last packet is not full, drop the extra bytes: minicom works by default with 128B packets */
+      rx_size = m_uFileSizeYmodem - ((uint32_t)(m_uFileSizeYmodem / SFU_COM_YMODEM_PACKET_SIZE) *
+                                     SFU_COM_YMODEM_PACKET_SIZE);
+    }
+  }
+
+
+  /*
+   * Minicom splits the header of 192 bytes on 2 packets of 128 bytes.
+   */
+
+  /* First packet : Contains the first 128B of FW header (out of SE_FW_HEADER_TOT_LEN bytes length) which is
+     not encrypted  */
+  if (1 == m_uPacketsReceived)
+  {
+    /* First packet: beginning of header */
+    if (SFU_COM_YMODEM_PACKET_SIZE == rx_size)
+    {
+      /* Copy the beginning of the header */
+      memcpy(fw_header, p_data, rx_size);
+      rx_size = 0U; /* nothing more to do */
+    }
+    else
+    {
+      /* Unexpected case */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else if (2U == m_uPacketsReceived)
+  {
+    /* Second packet: end of header (64 bytes) */
+    memcpy(fw_header + SFU_COM_YMODEM_PACKET_SIZE, p_data, 64U);
+    rx_size -= 64U;
+    p_data += 64U;
+
+    /* Verify header */
+    e_ret_status = SFU_LOADER_VerifyFwHeader(fw_header);
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      m_uDwlAreaAddress = m_uDwlAreaStart;
+      /* Downloaded Image size : Header size + Image size */
+      m_uDwlImgSize = ((SE_FwRawHeaderTypeDef *)fw_header)->FwSize + SFU_IMG_IMAGE_OFFSET;
+
+      /* Clear Download application area (including TRAILERS area) */
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SFU_LL_FLASH_Erase_Size(&x_flash_info, (uint8_t *) m_uDwlAreaAddress, SLOT_SIZE(m_uDwlSlot)) !=
+              SFU_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        /* Initialize decryption process */
+        if ((e_ret_status == SFU_SUCCESS)
+            && (SE_Decrypt_Init(&e_se_status, (SE_FwRawHeaderTypeDef *)fw_header, SE_FW_IMAGE_COMPLETE) != SE_SUCCESS))
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+          e_ret_status = SFU_ERROR;
+        }
+        else if (e_se_status != SE_OK)
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+          e_ret_status = SFU_ERROR;
+        }
+        else
+        {
+          /* Write the FW header (SE_FW_HEADER_TOT_LEN bytes length) at start of DWL area */
+          if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_header, SE_FW_HEADER_TOT_LEN)
+              == SFU_SUCCESS)
+          {
+            /* Shift the DWL area pointer */
+            m_uDwlAreaAddress += SE_FW_HEADER_TOT_LEN;
+          }
+          else
+          {
+            m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+      }
+      /* The remaining 64 bytes of data must be handled : standard processing */
+    }
+  }
+  /*
+   * Else: standard packet data processing based on rx_size (full packet or the last 64 bytes of the 2nd packet)
+   */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /*
+     * if the data is part of SFU_IMG_IMAGE_OFFSET nothing to do  ==> padding
+     */
+    if (m_uDwlAreaAddress < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+    {
+      if ((m_uDwlAreaAddress + rx_size) < (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET))
+      {
+        /* all the data are located inside SFU_IMG_IMAGE_OFFSET : nothing to do  ==> full padding */
+        m_uDwlAreaAddress += rx_size;
+        p_data += rx_size;
+        rx_size = 0U;
+      }
+      else
+      {
+        /* part of the data is inside SFU_IMG_IMAGE_OFFSET ==> remaining bytes to be decrypted */
+        rx_size -= (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        p_data += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+        m_uDwlAreaAddress += (m_uDwlAreaStart + SFU_IMG_IMAGE_OFFSET - m_uDwlAreaAddress);
+      }
+    }
+
+    /* remaining bytes to decrypt ? */
+    if (rx_size != 0)
+    {
+      fw_decrypted_chunk_size = rx_size;
+      if ((e_ret_status == SFU_SUCCESS)
+          && (SE_Decrypt_Append(&e_se_status, p_data, rx_size, fw_decrypted_chunk, &fw_decrypted_chunk_size)
+              != SE_SUCCESS))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else if ((e_se_status != SE_OK) || (fw_decrypted_chunk_size != rx_size))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_CRYPTO;
+        e_ret_status = SFU_ERROR;
+      }
+      else
+      {
+        /*Nothing */
+      }
+
+      /* Check size to avoid writing beyond DWL image size */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlImgSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Set dimension to the appropriate length for FLASH programming.
+       * Example: 64-bit length for L4.
+       */
+      if ((rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)) != 0)
+      {
+        /* By construction, the length of the buffer (fw_decrypted_chunk or p_data) must be a multiple of
+           sizeof(SFU_IMG_write_t) to avoid reading out of the buffer */
+        uOldSize = rx_size;
+        rx_size = rx_size + ((uint32_t)sizeof(SFU_LL_FLASH_write_t) -
+                             (rx_size % (uint32_t)sizeof(SFU_LL_FLASH_write_t)));
+        while (uOldSize < rx_size)
+        {
+          p_data[uOldSize] = 0xFF;
+          uOldSize++;
+        }
+      }
+
+      /* Check size to avoid writing beyond DWL area */
+      if ((m_uDwlAreaAddress + rx_size) > (m_uDwlAreaStart + m_uDwlAreaSize))
+      {
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+        e_ret_status = SFU_ERROR;
+      }
+
+      /* Write Data in Flash */
+      if (e_ret_status == SFU_SUCCESS)
+      {
+        if (SFU_LL_FLASH_Write(&x_flash_info, (uint8_t *)m_uDwlAreaAddress, fw_decrypted_chunk, rx_size) == SFU_SUCCESS)
+        {
+          m_uDwlAreaAddress += (rx_size);
+        }
+        else
+        {
+          m_LoaderStatus = SFU_LOADER_ERR_FLASH;
+          e_ret_status = SFU_ERROR;
+        }
+      }
+    }
+  }
+
+
+  /* Last packet : reset m_uPacketsReceived */
+  if (m_uPacketsReceived == m_uNbrBlocksYmodem)
+  {
+    m_uPacketsReceived = 0U;
+  }
+
+  /* Reset data counters in case of error */
+  if (e_ret_status == SFU_ERROR)
+  {
+    /*Reset of the ymodem variables */
+    m_uFileSizeYmodem = 0U;
+    m_uPacketsReceived = 0U;
+    m_uNbrBlocksYmodem = 0U;
+  }
+
+  return e_ret_status;
+}
+#endif /* MINICOM_YMODEM */
+
+
+/**
+  * @brief  Verifies the Raw Fw Header received. It checks if the header is
+  *         authentic and if the fields are ok with the device (e.g. size and version).
+  * @note   Please note that when the new image is installed, this metadata is checked
+  *         by @ref SFU_IMG_CheckCandidateVersion.
+  * @param  peSFU_LOADER_Status: SFU LOADER Status.
+  *         This parameter can be a value of @ref SFU_LOADER_Status_Structure_definition.
+  * @param  pBuffer: pointer to header Buffer.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+
+/* anti-rollback mechanism is tested twice to avoid basic hardware attack
+   ==> compiler optimization is disabled for this reason */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+static SFU_ErrorStatus SFU_LOADER_VerifyFwHeader(uint8_t *pBuffer)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_StatusTypeDef              e_se_status;
+  SE_FwRawHeaderTypeDef         *p_x_fw_raw_header;
+  SFU_FwImageFlashTypeDef       fw_image_flash_data;
+  uint16_t                      cur_ver;
+  uint16_t                      verif_ver;
+  uint32_t                      active_slot;
+
+  /*Parse the received buffer*/
+  p_x_fw_raw_header = (SE_FwRawHeaderTypeDef *)(uint32_t)pBuffer;
+  /*Check if the received header packet is authentic*/
+  if (SE_VerifyHeaderSignature(&e_se_status, p_x_fw_raw_header) != SE_ERROR)
+  {
+    active_slot = SFU_IMG_GetFwImageSlot(p_x_fw_raw_header);
+    /*
+     * 1 slot per image configuration. Identify the download area.
+     *   It will be based on SFU magic :
+     *   - dwl slot is the active_slot if configured.
+     *   - else : SLOT_ACTIVE_1
+     */
+    m_uDwlSlot = active_slot;
+    if (SLOT_SIZE(m_uDwlSlot) == 1U)
+    {
+      m_uDwlSlot = SLOT_ACTIVE_1;
+    }
+    SFU_IMG_GetDownloadAreaInfo(m_uDwlSlot, &fw_image_flash_data);
+
+    /* Assign the download flash address to be used during the YMODEM process */
+    m_uDwlAreaStart = fw_image_flash_data.DownloadAddr;
+    m_uDwlAreaSize = fw_image_flash_data.MaxSizeInBytes;
+
+    /*
+     * Check if the version is allowed
+     * ==> SFU_IMG_GetActiveFwVersion() returns 0 if the header of active firmware is not valid
+     */
+    cur_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, cur_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, cur_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+
+
+    /*
+     * Control of version and length is done twice to avoid basic hardware attack
+     * This more important for the 1 image configuration as the installation is done during the download procedure
+     * For the 2 images configuration anti-rollback will be checked again during installation process
+     */
+    verif_ver = SFU_IMG_GetActiveFwVersion(active_slot);
+    if (SFU_IMG_CheckFwVersion(active_slot, verif_ver, p_x_fw_raw_header->FwVersion) == SFU_SUCCESS)
+    {
+      /*
+       * Check length : Let's make sure the Firmware image can be written in the destination slot.
+       */
+      if (p_x_fw_raw_header->FwSize > (SLOT_SIZE(m_uDwlSlot) - SFU_IMG_IMAGE_OFFSET))
+      {
+        /* The firmware cannot be written in dwl slot */
+        m_LoaderStatus = SFU_LOADER_ERR_FW_LENGTH;
+      }
+      else
+      {
+        /* Installation authorized */
+        e_ret_status = SFU_SUCCESS;
+      }
+    }
+    else
+    {
+      /* The installation is forbidden */
+      TRACE("\r\n          Anti-rollback: candidate version(%d) rejected | current version(%d) , min.version(%d) !",
+            p_x_fw_raw_header->FwVersion, verif_ver, SFU_FW_VERSION_START_NUM);
+      m_LoaderStatus = SFU_LOADER_ERR_FW_VERSION;
+    }
+  }
+  else
+  {
+    /* Header authentication failure */
+    m_LoaderStatus = SFU_LOADER_ERR_AUTH_FAILED;
+  }
+
+  return e_ret_status;
+}
+
+#endif /* (SECBOOT_LOADER == SECBOOT_USE_LOCAL_LOADER) */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h
new file mode 100644
index 00000000..7467d978
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h
@@ -0,0 +1,63 @@
+/**
+  ******************************************************************************
+  * @file    sfu_loader.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update local
+  *          loader.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOADER_H
+#define SFU_LOADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "se_def.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Local loader status Type Definition
+  */
+typedef enum
+{
+  SFU_LOADER_OK                            = 0x00U,
+  SFU_LOADER_ERR_COM                       = 0x01U,
+  SFU_LOADER_ERR_AUTH_FAILED               = 0x02U,
+  SFU_LOADER_ERR_FW_LENGTH                 = 0x03U,
+  SFU_LOADER_ERR_FW_VERSION                = 0x04U,
+  SFU_LOADER_ERR_FLASH                     = 0x05U,
+  SFU_LOADER_ERR_CRYPTO                    = 0x06U
+} SFU_LOADER_StatusTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LOADER_Init(void);
+SFU_ErrorStatus SFU_LOADER_DeInit(void);
+SFU_ErrorStatus SFU_LOADER_DownloadNewUserFw(SFU_LOADER_StatusTypeDef *peSFU_LOADER_Status, uint32_t *p_DwlSlot,
+                                             uint32_t *p_Size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOADER_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
new file mode 100644
index 00000000..8164c740
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c
@@ -0,0 +1,229 @@
+/**
+  ******************************************************************************
+  * @file    sfu_mpu_isolation.c
+  * @author  MCD Application Team
+  * @brief   SFU MPU isolation primitives
+  *          This file provides functions to manage the MPU isolation of the Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_mpu_isolation.h"
+#include "sfu_low_level_security.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_SE_STACK_Clean(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief Clean SE Stack.
+  *
+  */
+static void SFU_SE_STACK_Clean(void)
+{
+  uint32_t sp_base = SE_REGION_RAM_START;
+  uint32_t sp_top = SE_REGION_RAM_STACK_TOP;
+  uint32_t sp = __get_MSP();
+  if ((sp > sp_base) && (sp <= sp_top))
+  {
+    while (sp_base < sp)
+    {
+      *(__IO uint32_t *)sp_base = 0U;
+      sp_base += 4U;
+    }
+  }
+  else
+  {
+    /*  error trigger a reset */
+    HAL_NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @brief This is the Supervisor calls handler.
+  * @param args SVC arguments
+  * @retval void
+  * @note Installed in startup_stm32xxxx.s
+  *
+  * This handler handles 2 requests:
+  * \li Secure Engine SVC: run a Secure Engine privileged operation provided as a parameter
+  * \li (see @ref SE_FunctionIDTypeDef)
+  * \li Internal SB_SFU SVC: run a SB_SFU privileged operation provided as a parameter (see @ref SFU_MPU_PrivilegedOpId)
+  */
+void MPU_SVC_Handler(uint32_t *args)
+{
+  /* in PSP (args) contains caller context as follow *
+    * args[0] :R0
+    * args[1] :R1
+    * args[2] :R2
+    * args[3] :R3
+    * args[4] :R12
+    * args[5] :LR
+    * args[6] :PC to return after exception
+    * args[7] :xPSR
+  */
+  /*  read code OP of instruction that generate SVC interrupt
+   *  bottom 8-bits of the SVC instruction code OP are SVC value  */
+  uint8_t code = ((uint8_t *)args[6])[-2];
+
+  switch (code)
+  {
+    case 0:
+      /* A Secure Engine service is called */
+      SE_SVC_Handler(args);
+      break;
+    case 1:
+      /* Internal SB_SFU privileged service */
+      SFU_MPU_SVC_Handler(args);
+      break;
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This function triggers a SB_SFU Privileged Operation requested with SB_SysCall
+  * @param args arguments
+  *             The first argument is the identifier of the requested operation.
+  * @retval void
+  */
+void SFU_MPU_SVC_Handler(uint32_t *args)
+{
+  uint32_t *pSbsfuFlag = (uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+
+  switch (args[0])
+  {
+    case SB_SYSCALL_LAUNCH_APP:
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Disable (Hide) Hide Protection Area */
+      SET_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS);
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* Clean SE STACK RAM */
+      SFU_SE_STACK_Clean();
+      /* Release CM4 (via SRAM) */
+      *pSbsfuFlag = SBSFU_BOOTED;
+#if defined(SFU_MPU_PROTECT_ENABLE)
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+      SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+      HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#if (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE)
+      /* Check Hide Protection Area */
+      if (READ_BIT(FLASH->ACR2, FLASH_ACR2_HDPADIS) != FLASH_ACR2_HDPADIS)
+      {
+        /* Security issue : execution stopped ! */
+        HAL_NVIC_SystemReset();
+      }
+#endif /* (SFU_HIDE_PROTECTION_CFG == OB_SECURE_HIDE_PROTECTION_ENABLE) */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+      /* make sure to return into application in privileged mode */
+      __set_CONTROL(__get_CONTROL() & ~0x3U); /* clear process stack & unprivileged bit */
+      launch_application(args[1], (uint32_t)jump_to_function);
+      break;
+    case SB_SYSCALL_RESET:
+      HAL_NVIC_SystemReset();
+      break;
+    case SB_SYSCALL_MPU_CONFIG:
+#if defined(SFU_MPU_PROTECT_ENABLE)
+      /* Privileged mode required for MPU re-configuration */
+      (void)SFU_LL_SECU_SetProtectionMPU(SFU_SECOND_CONFIGURATION);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DMA_CONFIG:
+#if defined(SFU_DMA_PROTECT_ENABLE)
+      /* Privileged mode required for DMA re-configuration (clocks access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDMA();
+#endif /* SFU_DMA_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_DAP_CONFIG:
+#if defined(SFU_DAP_PROTECT_ENABLE)
+      /* Privileged mode required for DAP re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionDAP();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+    case SB_SYSCALL_TAMPER_CONFIG:
+#if defined(SFU_TAMPER_PROTECT_ENABLE)
+      /* Privileged mode required for TAMPER re-configuration (clock access required privilege mode) */
+      (void)SFU_LL_SECU_SetProtectionANTI_TAMPER();
+#endif /* SFU_DAP_PROTECT_ENABLE */
+      break;
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    case SB_SYSCALL_GTZC_CONFIG:
+      /* Privileged mode required for GTZC checks */
+      SFU_LL_SECU_CheckProtectionGTZC();
+      break;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+    default:
+      /* Force a reset */
+      HAL_NVIC_SystemReset();
+      break;
+  }
+}
+
+/**
+  * @brief This functions triggers a SB_SFU system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called (see @ref SFU_MPU_PrivilegedOpId)
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SFU_MPU_SysCall(uint32_t syscall, ...)
+{
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref MPU_SVC_Handler() and finally @ref SFU_MPU_SVC_Handler()
+    */
+  __ASM volatile("SVC #1");   /* 1 is the hard-coded value to indicate a SB_SFU syscall */
+}
+
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t SFU_MPU_IsUnprivileged(void)
+{
+  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
+}
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void SFU_MPU_EnterUnprivilegedMode(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change main stack to point on privileged stack */
+  __set_CONTROL(__get_CONTROL() | 3U); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
new file mode 100644
index 00000000..56ac7d87
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h
@@ -0,0 +1,92 @@
+/**
+  ******************************************************************************
+  * @file    sfu_mpu_isolation.h
+  * @author  MCD Application Team
+  * @brief   SFU MPU isolation primitives
+  *          This file provides functions to manage the MPU isolation of the Secure Engine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+
+
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_MPU_ISOLATION_H
+#define SFU_MPU_ISOLATION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  *  @brief SFU BOOT Privileged operation identifier.
+  *         SB_SFU can trigger a SB_SFU privileged operation by calling a syscall (@ref SFU_MPU_SysCall) with one of
+  *         the values of this enum.
+  */
+typedef enum
+{
+  SB_SYSCALL_LAUNCH_APP = 1, /*!< SB_SFU service call identifier: launch the user application */
+  SB_SYSCALL_RESET,          /*!< SB_SFU service call identifier: system reset */
+  SB_SYSCALL_MPU_CONFIG,     /*!< SB_SFU service call identifier: MPU re-configuration */
+  SB_SYSCALL_DMA_CONFIG,     /*!< SB_SFU service call identifier: DMA re-configuration */
+  SB_SYSCALL_DAP_CONFIG,     /*!< SB_SFU service call identifier: DAP re-configuration */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  SB_SYSCALL_GTZC_CONFIG,    /*!< SB_SFU service call identifier: GTZC re-configuration */
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+  SB_SYSCALL_TAMPER_CONFIG   /*!< SB_SFU service call identifier: TAMPER re-configuration */
+} SFU_MPU_PrivilegedOpId;
+
+/* Exported functions ------------------------------------------------------- */
+/* SVC call handler for Secure Engine: this function is defined in se_interface_common.c */
+extern void SE_SVC_Handler(uint32_t *args);
+
+/* SB_SFU SVC handling */
+void MPU_SVC_Handler(uint32_t *args);
+void SFU_MPU_SVC_Handler(uint32_t *args);
+void SFU_MPU_SysCall(uint32_t syscall, ...);
+
+/* Helpers for unprivileged mode handling */
+void SFU_MPU_EnterUnprivilegedMode(void);
+uint32_t SFU_MPU_IsUnprivileged(void);
+
+/**
+  * @brief This function sets the Stack Pointer and Program Counter to jump into a function
+  * @param  vector_address Start Address (where to jump)
+  * @retval void
+  */
+void jump_to_function(uint8_t *vector_address);
+
+/**
+  * @brief This function returns from an interrupt and launches the user application code
+  * @param  applicationVectorAddress Start address of the user application (active slot+offset: vectors)
+  * @param  exitFunctionAddress Function to jump into the user application code
+  * @param  address Function to jump into the BL code in case of exit_sticky usage
+  * @param  magic number used by BL code in case of exit_sticky usage
+  * @retval void
+  */
+void launch_application(uint32_t applicationVectorAddress, uint32_t exitFunctionAddress);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_MPU_ISOLATION_H */
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c
new file mode 100644
index 00000000..c2740714
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c
@@ -0,0 +1,61 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar file integrated in the user
+  *          application.
+  * @note    This file is compiled in the scope of SB_SFU.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+#include "sfu_new_image.h"
+#include "sfu_fwimg_services.h"
+#include "sfu_fwimg_regions.h"
+#include "se_def_metadata.h"
+#include <string.h> /* needed for memset (see WriteInstallHeader)*/
+
+
+/**
+  * @brief  Write in Flash the next header image to install.
+  *         This function is used by the local loader to request a Firmware installation (at next reboot).
+  * @param  fw_header FW header of the FW to be installed
+  * @retval SFU_SUCCESS if successful, otherwise SFU_ERROR
+  */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header)
+{
+  return SFU_SUCCESS;           /* Nothing to do */
+}
+
+/**
+  * @brief  Provide the area descriptor to write a FW image in Flash.
+  *         This function is used by the local loader to know where to store a new Firmware Image before asking for its
+  *         installation.
+  * @param  DwlSlot identification of the downloaded area
+  * @param  pArea pointer to area descriptor
+  * @retval none
+  */
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea)
+{
+  pArea->DownloadAddr = SlotStartAdd[DwlSlot];
+  pArea->MaxSizeInBytes = (uint32_t)SLOT_SIZE(DwlSlot);
+  pArea->ImageOffsetInBytes = SFU_IMG_IMAGE_OFFSET;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h
new file mode 100644
index 00000000..c234da77
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h
@@ -0,0 +1,58 @@
+/**
+  ******************************************************************************
+  * @file    sfu_new_image.h
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage the New Firmware
+  *          Image storage and installation.
+  *          This file contains the services the bootloader can use to
+  *          know where to store a new FW image and request its installation.
+  *          The same services are offered to the user application thanks to a similar
+  *          file integrated in the user application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_NEW_IMAGE_H
+#define SFU_NEW_IMAGE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Specifies a structure containing values related to the management of multi-images in Flash.
+  */
+typedef struct
+{
+  uint32_t  MaxSizeInBytes;        /*!< The maximum allowed size for the FwImage in User Flash (in Bytes) */
+  uint32_t  DownloadAddr;          /*!< The download address for the FwImage in UserFlash */
+  uint32_t  ImageOffsetInBytes;    /*!< Image write starts at this offset */
+  uint32_t  ExecutionAddr;         /*!< The execution address for the FwImage in UserFlash */
+} SFU_FwImageFlashTypeDef;
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_IMG_InstallAtNextReset(uint8_t *fw_header);
+void SFU_IMG_GetDownloadAreaInfo(uint32_t DwlSlot, SFU_FwImageFlashTypeDef *pArea);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_NEW_IMAGE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
new file mode 100644
index 00000000..d167b5ab
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c
@@ -0,0 +1,324 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.c
+  * @author  MCD Application Team
+  * @brief   Test Protections module.
+  *          This file provides set of firmware functions to manage Test Protections
+  *          functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_test.h"
+#include "main.h"
+#include "sfu_trace.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level.h"
+#include "string.h" /* required for strncmp */
+
+#if defined(SFU_TEST_PROTECTION)
+
+extern RTC_HandleTypeDef RtcHandle;
+
+/* Private defines -----------------------------------------------------------*/
+#define TEST_ISOLATION 1
+
+/* Automatic tests : list of tests (Address, Message, Operation */
+/* Flash programming by 64 bits */
+#define SHIFT_FLASH_WRITE (8U-1U)
+
+/* Private variables ---------------------------------------------------------*/
+static ProtectionTest_t aProtectTests[] =
+{
+#ifdef SFU_MPU_PROTECT_ENABLE
+  {SFU_RAM_BASE, "MPU SRAM start add", TEST_EXECUTE},
+  {SFU_RAM_END - 3U, "MPU SRAM end add", TEST_EXECUTE},             /* -3 : previous 32 bits for execute test */
+  {PERIPH_BASE, "Peripheral base add", TEST_EXECUTE},
+  {((uint32_t)0x5FFFFFFF - 3U), "Peripheral end address", TEST_EXECUTE},    /* -3 : previous 32 bits for execute test */
+  /* READ_FLASH is possible only in privileged mode */
+  {INTVECT_START, "Init. Vector", TEST_READ_FLASH},
+  {SLOT_ACTIVE_1_START, "MPU code active slot1 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_1_END - 3U, "MPU code active1 slot end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_2_START, "MPU code active slot2 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_2_END - 3U, "MPU code active slot2 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SLOT_ACTIVE_3_START, "MPU code active slot3 begin add", TEST_EXECUTE},
+  {SLOT_ACTIVE_3_END - 3U, "MPU code active slot3 end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_WRP_PROTECT_ENABLE
+  {INTVECT_START, "WRP start add", TEST_WRITE_FLASH},
+  {SFU_ROM_ADDR_END - SHIFT_FLASH_WRITE, "WRP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits writing test */
+  {SB_REGION_ROM_START, "WRP internal (SB) add", TEST_ERASE_FLASH},
+#endif /* SFU_WRP_PROTECT_ENABLE */
+#ifdef SFU_PCROP_PROTECT_ENABLE
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_WRITE_FLASH},
+  {SE_KEY_REGION_ROM_END - SHIFT_FLASH_WRITE, "PCROP end add", TEST_WRITE_FLASH}, /* -7 : alignment for 64bits
+                                                                                         writing test */
+  {SE_KEY_REGION_ROM_START, "PCROP start add", TEST_READ_FLASH},
+  {SE_KEY_REGION_ROM_END, "PCROP end add", TEST_READ_FLASH},
+#endif /* SFU_PCROP_PROTECT_ENABLE */
+#if defined(TEST_ISOLATION)
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_WRITE_FLASH},        /* WRP protection applies  */
+  {SE_CODE_REGION_ROM_END - SHIFT_FLASH_WRITE, "Isolated code end add", TEST_WRITE_FLASH},/* -7 : alignment for
+                                                                         64bits writing test + WRP protection applies */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_READ_FLASH},
+  {SE_CODE_REGION_ROM_END, "Isolated code end add", TEST_READ_FLASH},
+  {SE_STARTUP_REGION_ROM_START + 1U, "Isolated startup add", TEST_EXECUTE}, /* +1 : contains the SE startup code
+                                                                    that initializes all the variables in the binary. */
+  {SE_CODE_REGION_ROM_START, "Isolated code start add", TEST_EXECUTE},
+  {SE_CODE_REGION_ROM_END - 3U, "Isolated code end add", TEST_EXECUTE}, /* -3 : alignment for 32bits execute test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_WRITE_RAM},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_WRITE_RAM},     /* -3 : alignment for 32bits writing test */
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_END, "Isolated Vdata add", TEST_READ_RAM},
+  {SE_REGION_RAM_START, "Isolated Vdata add", TEST_EXECUTE},
+  {SE_REGION_RAM_END - 3U, "Isolated Vdata add", TEST_EXECUTE},       /* -3 : alignment for 32bits writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_1_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_2_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - (SHIFT_FLASH_WRITE + 1U), "Isolated NVdata add", TEST_WRITE_FLASH},
+  /* -8 : previous 64 bits for writing test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 1U, "Isolated NVdata add", TEST_READ_FLASH},/* -1 : previous 8bits
+                                                                                                   for reading test */
+  {SLOT_ACTIVE_3_HEADER + SFU_IMG_IMAGE_OFFSET - 4U, "Isolated NVdata add", TEST_EXECUTE},   /* -4 : previous 32bits
+                                                                                                   for execute test */
+#endif /* TEST_ISOLATION  */
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Testing the MPU protection of the OBs */
+  /*
+   * WL55JC
+   * 0x1FFF 7800 Reserved user option bytes & RDP (USER & RDP)
+   * 0x1FFF 7818 Reserved Write protection 1A
+   * 0x1FFF 7820 Reserved Write protection 1B
+   */
+  {(uint32_t)0x1FFF7800, "OBs @ 0x1FFF7800", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7818, "OBs @ 0x1FFF7818", TEST_WRITE_FLASH},
+  {(uint32_t)0x1FFF7820, "OBs @ 0x1FFF7820", TEST_WRITE_FLASH},
+#endif /* SFU_MPU_PROTECT_ENABLE  */
+  {0xAAAAAAAA, "Execution successful", TEST_END},
+};
+
+
+/* Automatic test : list of operation */
+uint8_t aTestOperation[][20] =
+{
+  "write 8 bytes",
+  "read 1 byte",
+  "erase 512 bytes",
+  "write 4 bytes",
+  "read 1 byte",
+  "execute",
+  "end"
+};
+
+/* Private function prototypes -----------------------------------------------*/
+static void SFU_TEST_Protection(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Automatic test of PCROP/WRP/FWALL/MPU protections
+  * @param  None.
+  * @retval None.
+  */
+static void SFU_TEST_Protection(void)
+{
+  uint32_t test_idx;
+  uint32_t flashErrCode = 0;
+  uint64_t pattern = 0U;
+  uint32_t page_error = 0U;
+  FLASH_EraseInitTypeDef p_erase_init;
+  TestStatus status = TEST_IN_PROGRESS;
+  __IO uint8_t tmp;
+  void (*func)(void);
+
+  /*
+    * Now checking the security
+    * We will try to access protected @ and run protected code.
+    * Each time a a flash error will be raised or a reset will be generated by IP protection.
+    * At next boot we read the backup register to check the next @ until all addresses have been verified.
+    * WatchDog should be disabled : while(1) loop in case HardFault when trying to execute code @ address protected by
+    * FWALL/Code Isolation
+    */
+
+  do
+  {
+    /* slow down execution */
+    HAL_Delay(100);
+
+    /* Increment test number for next execution */
+    test_idx = HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR1);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, (test_idx + 1));
+    printf("\r\n= [TEST] %s @ %s %08x", aTestOperation[aProtectTests[test_idx].type], aProtectTests[test_idx].msg,
+           aProtectTests[test_idx].address);
+
+    /* Remove test for slots not configured (taking into accounbt SFU_IMG_IMAGE_OFFSET) */
+    if ((aProtectTests[test_idx].address != 0U) && (aProtectTests[test_idx].address < 0xFFFFFF00U)
+        && (aProtectTests[test_idx].address > 0x00000FFFU))
+    {
+      switch (aProtectTests[test_idx].type)
+      {
+        /* Trying to write 64bits in FLASH : WRP flag is set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_FLASH :
+          HAL_FLASH_Unlock();
+          HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, aProtectTests[test_idx].address, pattern);
+          HAL_FLASH_Lock();
+          flashErrCode = HAL_FLASH_GetError();
+          printf("\r\nflash error code: %x", flashErrCode);
+          if ((flashErrCode & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+
+          /*
+           * OBs protection test: no MPU enabled because the OB cannot be written directly.
+           * A flash error should occur.
+           */
+          break;
+
+        /* Trying to read in FLASH : RDP set in case of PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_READ_FLASH :
+          tmp = *(uint8_t *)(aProtectTests[test_idx].address);
+          HAL_Delay(1);                                                 /* ensure Flag is set */
+          /*
+           * When Isolation activated : RESET should be generated
+           * So the test is FAILED if we reach this line
+           */
+          if (0 == strncmp("Isolated", (const char *)aProtectTests[test_idx].msg, 8))
+          {
+            status = TEST_ERROR;
+          }
+
+          break;
+
+        /* Trying to erase 512 bytes in FLASH : WRP flag set for WRP or PCROP protected area
+           or reset generated if under FWALL or MPU protection */
+        case TEST_ERASE_FLASH :
+          HAL_FLASH_Unlock();
+          p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+          p_erase_init.Page        = SFU_LL_FLASH_GetPage(aProtectTests[test_idx].address);
+          p_erase_init.NbPages     = 1;
+          HAL_FLASHEx_Erase(&p_erase_init, &page_error);
+          HAL_FLASH_Lock();
+          if ((HAL_FLASH_GetError() & HAL_FLASH_ERROR_WRP) == 0U)
+          {
+            status = TEST_ERROR;
+          }
+          break;
+
+        /* Trying to write in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_WRITE_RAM :
+          *(uint32_t *)aProtectTests[test_idx].address = 0x00000000;
+          status = TEST_ERROR;
+          break;
+
+        /* Trying to read in RAM : reset generated if under FWALL or MPU protection */
+        case TEST_READ_RAM :
+          tmp = *(uint8_t *)aProtectTests[test_idx].address;
+          printf(" value : %d ", tmp);
+          status = TEST_ERROR;
+          break;
+
+          /* Tryning to execute code : reset generated if under FWALL or MPU protection */
+        case TEST_EXECUTE :
+          func = (void(*)(void))(aProtectTests[test_idx].address);
+          func();
+          status = TEST_ERROR;
+          break;
+
+        /* End of execution */
+        case TEST_END :
+          status = TEST_COMPLETED;
+          break;
+
+        default :
+          break;
+      }
+    }
+  } while (status == TEST_IN_PROGRESS) ;
+
+  if (status == TEST_ERROR)
+  {
+    SFU_TEST_Error();
+  }
+  else if (status == TEST_COMPLETED)
+  {
+    /* reset for next run (need a RESET of the platform to restart a session) */
+    printf("\b\b\b\b\b\b\b\b");
+    printf("\r\nYou can RESET the platform to restart the tests.\r\n");
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);              /* no more test in progress */
+  }
+}
+
+/**
+  * @brief  Initialization of backup register and start test
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Init(void)
+{
+  /* Use register DR0 to know which if the test sequence is in progress or done */
+  /* Use register DR1 to know which test to run after a reset */
+
+  if (MAGIC_TEST_DONE == HAL_RTCEx_BKUPRead(&RtcHandle, RTC_BKP_DR0))      /* Test done */
+  {
+    return;
+  }
+  else if (MAGIC_TEST_INIT != HAL_RTCEx_BKUPRead(&RtcHandle,
+                                                 RTC_BKP_DR0)) /* Test not done nor in progress: Init magic (DR0) and
+                                                                  reset test index (DR1) */
+  {
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+    HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+  }
+
+  /* Start test */
+  SFU_TEST_Protection();
+}
+
+/**
+  * @brief  Reset backup register to be able to execute a new test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Reset(void)
+{
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_INIT);
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR1, 0x0000);
+}
+
+/**
+  * @brief  Error detected during test sequence
+  * @param  None.
+  * @retval None.
+  */
+void SFU_TEST_Error(void)
+{
+  printf(" ===> KO!!!!!");
+  HAL_RTCEx_BKUPWrite(&RtcHandle, RTC_BKP_DR0, MAGIC_TEST_DONE);
+}
+
+#endif /* SFU_TEST_PROTECTION */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
new file mode 100644
index 00000000..375e610f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h
@@ -0,0 +1,81 @@
+/**
+  ******************************************************************************
+  * @file    sfu_test.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Test Protections functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TEST_H
+#define SFU_TEST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "app_sfu.h"
+
+#if defined(SFU_TEST_PROTECTION)
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  TEST_WRITE_FLASH = 0U,                /* Writing test in FLASH */
+  TEST_READ_FLASH,                      /* Reading test in FLASH */
+  TEST_ERASE_FLASH,                     /* Erasing test in FLASH */
+  TEST_WRITE_RAM,                       /* Writing test in RAM */
+  TEST_READ_RAM,                        /* Reading test in RAM */
+  TEST_EXECUTE,                         /* Execution function test */
+  TEST_END,                             /* Last test : Success ! */
+} TestType;
+
+typedef enum
+{
+  TEST_IN_PROGRESS = 0U,                /* Test in progress */
+  TEST_COMPLETED,                       /* Test ended : success */
+  TEST_ERROR,                           /* Test aborted : error */
+} TestStatus;
+
+
+#define PROTECT_MSG_LEN (35U)           /* message to be displayed length           */
+typedef struct
+{
+  uint32_t address;                     /* address to be tested */
+  uint8_t msg[PROTECT_MSG_LEN];         /* message to be displayed when testing */
+  TestType type;                        /* type of test */
+} ProtectionTest_t;
+
+/* Exported constants --------------------------------------------------------*/
+/* Magic number saved in DR0 backup register */
+#define MAGIC_TEST_DONE          0xAAA2
+#define MAGIC_TEST_INIT          0xAAA3
+
+/* Exported functions ------------------------------------------------------- */
+void SFU_TEST_Init(void);
+void SFU_TEST_Reset(void);
+void SFU_TEST_Error(void);
+
+#endif /* SFU_TEST_PROTECTION */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TEST_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h
new file mode 100644
index 00000000..cf6d3387
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_trace.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SFU_TRACE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_TRACE_H
+#define SFU_TRACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION)
+#include "sfu_com_trace.h"
+#endif /* defined(SFU_DEBUG_MODE) || defined(SFU_TEST_PROTECTION) */
+
+/* External variables --------------------------------------------------------*/
+/**
+  * This variable indicates if at boot-up the FW presence check has already been performed or not:
+  * \li It is reset when the FW status has already been checked once and no FW is present
+  * \li (see @ref SFU_BOOT_SM_CheckUserFwStatus)
+  * \li It is used to display some messages only once in the teraterm console
+  * \li It is used to determine if the user button must be pressed before waiting for a local download to start
+  * \li This is used at LocalDownload and CheckUserFwStatus stages.
+  */
+extern uint8_t initialDeviceStatusCheck; /* used also in sfu_fwimg_swap.c */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifdef SFU_DEBUG_MODE
+#define TRACE_IRQ(pbuffer) (void) SFU_COM_Serial_PutString(pbuffer); /* Printf is not used inside interrupt to avoid
+                                                                        faults. printf is not rieentrant */
+#define TRACE   (void) printf
+#else
+#define TRACE(...)
+#define TRACE_IRQ(pbuffer)
+#endif /* SFU_DEBUG_MODE */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_TRACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c
new file mode 100644
index 00000000..a502fa43
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c
@@ -0,0 +1,581 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.c
+  * @author  MCD Application Team
+  * @brief   SFU Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SFU_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+extern RTC_HandleTypeDef RtcHandle;
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+/* Private variables ---------------------------------------------------------*/
+static UART_HandleTypeDef   UartHandle;
+static CRC_HandleTypeDef    CrcHandle;
+
+/* Private function prototypes -----------------------------------------------*/
+static void     SFU_LL_Error_Handler(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Initialize CRC */
+  e_ret_status = SFU_LL_CRC_Init();
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  DeInitialize SFU Interface.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* ADD SRC CODE HERE
+       ...
+  */
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF CRC Init.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure the peripheral clock */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+
+  /* Configure CRC with default polynomial - standard configuration */
+  e_ret_status = SFU_LL_CRC_Config(SFU_CRC_CONFIG_DEFAULT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU  IF CRC Configuration.
+  * @param  eCRCConfg: SFU_CRC_ConfigTypeDef.
+  *         This parameter can be a value of @ref SFU_CRC_ConfigTypeDef.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Check the parameters */
+  assert_param(IS_SFU_CRC_CONF(eCRCConfg));
+
+  /* Switch to the selected configuration */
+  CrcHandle.Instance = CRC;
+
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  switch (eCRCConfg)
+  {
+    case SFU_CRC_CONFIG_DEFAULT:
+      /* The Default polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+      /* The default init value is used */
+      CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+      /* The input data are 32-bit long words */
+      CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    case SFU_CRC_CONFIG_16BIT:
+      /* The CRC-16-CCIT polynomial is used */
+      CrcHandle.Init.DefaultPolynomialUse    = DEFAULT_POLYNOMIAL_DISABLE;
+      CrcHandle.Init.GeneratingPolynomial    = 0x1021U;
+      CrcHandle.Init.CRCLength               = CRC_POLYLENGTH_16B;
+      /* The zero init value is used */
+      CrcHandle.Init.DefaultInitValueUse     = DEFAULT_INIT_VALUE_DISABLE;
+      CrcHandle.Init.InitValue               = 0U;
+      /* The input data are 8-bit long */
+      CrcHandle.InputDataFormat              = CRC_INPUTDATA_FORMAT_BYTES;
+      /* Valid parameter*/
+      e_ret_status = SFU_SUCCESS;
+      break;
+
+    default:
+      /* Invalid parameter */
+      e_ret_status = SFU_ERROR;
+      break;
+  }
+
+  /* Proceed to CRC Init (Correct Parameters) */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    if (HAL_CRC_Init(&CrcHandle) != HAL_OK)
+    {
+      e_ret_status = SFU_ERROR;
+    }
+  }
+
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  SFU IF CRC Calculate.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  BufferLength: buffer length in bytes.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, BufferLength);
+}
+
+/**
+  * @brief SFU UART Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* USART resources configuration (Clock, GPIO pins and USART registers) ----*/
+  /* USART configured as follow:
+  - BaudRate = 115200 baud
+  - Word Length = 8 Bits
+  - One Stop Bit
+  - No parity
+  - Hardware flow control disabled (RTS and CTS signals)
+  - Receive and transmit enabled
+  */
+  UartHandle.Instance = SFU_UART;
+  UartHandle.Init.BaudRate = 115200U;
+  UartHandle.Init.WordLength = UART_WORDLENGTH_8B;
+  UartHandle.Init.StopBits = UART_STOPBITS_1;
+  UartHandle.Init.Parity = UART_PARITY_NONE;
+  UartHandle.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  UartHandle.Init.Mode = UART_MODE_RX | UART_MODE_TX;
+  UartHandle.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_RXOVERRUNDISABLE_INIT;
+  UartHandle.AdvancedInit.OverrunDisable = UART_ADVFEATURE_OVERRUN_DISABLE;
+  if (HAL_UART_Init(&UartHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief SFU IF UART DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_UART_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  SFU IF Write data (send).
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  DataLength: pointer to the 128bit data to write.
+  * @param  pData: pointer to the 128bit data to write.
+  * @param  Timeout: Timeout duration.
+  * @retval status of the write operation
+  *         SFU_ERROR : if the write operation is not performed
+  *         SFU_SUCCESS : if the write operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Transmit(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU IF Read data (receive).
+  * @param  pData: pointer to the 128bit data where to store the received data.
+  * @param  DataLength: the length of the data to be read in bytes.
+  * @param Timeout: Timeout duration.
+  * @retval status of the read operation
+  *         SFU_ERROR : if the read operation is not performed
+  *         SFU_SUCCESS : if the read operation is successfully performed
+  */
+SFU_ErrorStatus SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check the pointers allocation */
+  if (pData == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  if (HAL_UART_Receive(&UartHandle, (uint8_t *)pData, DataLength, Timeout) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  SFU HAL IF Flush.
+  * @param  None.
+  * @retval status of the operation.
+  */
+SFU_ErrorStatus SFU_LL_UART_Flush(void)
+{
+  /* Clean the input path */
+  __HAL_UART_FLUSH_DRREGISTER(&UartHandle);
+
+  return SFU_SUCCESS;
+}
+
+#if  defined(CORE_CM0PLUS)
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief SFU IF RTC Init.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief SFU IF RTC DeInit.
+  * @param  None
+  * @retval status of the Init operation
+  *         SFU_ERROR : if the Init operation failed.
+  *         SFU_SUCCESS : if the Init operation is successfully performed.
+  */
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+
+}
+
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+#endif /* CORE_CM0PLUS */
+
+/**
+  * @brief SFU IF RTC MSP Initialization
+  *        This function configures the hardware resources used in this example
+  * @param hrtc: RTC handle pointer.
+  * @note  Care must be taken when HAL_RCCEx_PeriphCLKConfig() is used to select
+  *        the RTC clock source; in this case the Backup domain will be reset in
+  *        order to modify the RTC Clock source, as consequence RTC registers (including
+  *        the backup registers) and RCC_BDCR register are set to their reset values.
+  * @retval None
+  */
+void SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc)
+{
+  RCC_OscInitTypeDef        RCC_OscInitStruct;
+  RCC_PeriphCLKInitTypeDef  PeriphClkInitStruct;
+
+  UNUSED(hrtc);
+  /*-1- Enables access to the backup domain */
+  /* To enable access on RTC registers */
+
+  HAL_PWR_EnableBkUpAccess();
+
+  /*-2- Configure LSE/LSI as RTC clock source */
+#ifdef RTC_CLOCK_SOURCE_LSE
+
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#elif defined (RTC_CLOCK_SOURCE_LSI)
+  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
+  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
+  RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+
+  PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+  PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSI;
+  if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+  {
+    SFU_LL_Error_Handler();
+  }
+#else
+#error Please select the RTC Clock source inside the main.h file
+#endif /*RTC_CLOCK_SOURCE_LSE*/
+
+  /*-3- Enable RTC peripheral Clocks */
+  /* Enable RTC Clock */
+  __HAL_RCC_RTC_ENABLE();
+
+  /* Enable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_ENABLE();
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  /*-4- Configure the NVIC for RTC Tamper */
+  HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0x0FU, 0U);
+  HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+}
+
+/**
+  * @brief RTC MSP De-Initialization
+  *        This function frees the hardware resources used in in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param hrtc: RTC handle pointer
+  * @retval None
+  */
+void SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc)
+{
+  UNUSED(hrtc);
+
+  __HAL_RCC_RTC_DISABLE();
+
+  /* Disable RTC APB clock  */
+  __HAL_RCC_RTCAPB_CLK_DISABLE();
+}
+
+/**
+  * @brief UART MSP Initialization
+  *        This function configures the hardware resources used in SFU application.
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspInit(UART_HandleTypeDef *huart)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral Clock Enable */
+    SFU_UART_CLK_ENABLE();
+
+    /* GPIO Ports Clock Enable */
+    SFU_UART_TX_GPIO_CLK_ENABLE();
+    SFU_UART_RX_GPIO_CLK_ENABLE();
+
+    /*Configure GPIO pins : SFU_UART_TX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_TX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_TX_AF;
+    HAL_GPIO_Init(SFU_UART_TX_GPIO_PORT, &GPIO_InitStruct);
+
+    /*Configure GPIO pins : SFU_UART_RX_Pin  */
+    GPIO_InitStruct.Pin = SFU_UART_RX_PIN;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = SFU_UART_RX_AF;
+    HAL_GPIO_Init(SFU_UART_RX_GPIO_PORT, &GPIO_InitStruct);
+
+  }
+
+}
+
+/**
+  * @brief UART MSP De-Initialization
+  *        This function frees the hardware resources used in SFU application:
+  *          - Disable the Peripheral's clock
+  * @param huart: UART handle pointer
+  * @retval None
+  */
+void SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart)
+{
+
+  if (huart->Instance == SFU_UART)
+  {
+    /* Peripheral clock disable */
+    SFU_UART_CLK_DISABLE();
+
+    /* GPIO DeInit*/
+    HAL_GPIO_DeInit(SFU_UART_TX_GPIO_PORT, SFU_UART_TX_PIN);
+    HAL_GPIO_DeInit(SFU_UART_RX_GPIO_PORT, SFU_UART_RX_PIN);
+
+  }
+
+
+}
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @param  None
+  * @retval None
+  */
+static void SFU_LL_Error_Handler(void)
+{
+  /*
+    * ADD SRC CODE HERE
+    */
+
+  while (1 == 1)
+  {
+    NVIC_SystemReset();
+  }
+}
+
+
+/**
+  * @}
+  */
+/**
+  * @brief function checking if a buffer is in se ram.
+  * @param pBuff: Secure Engine protected function ID.
+  * @param length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in se ram, SE_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((length != 0U) && (!((0xFFFFFFFFUL - addr_start) < length))
+      && ((addr_end  <= SE_REGION_RAM_END) && (addr_start >= SE_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow and included in the correct range */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SFU_ERROR;
+  }
+  return e_ret_status;
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h
new file mode 100644
index 00000000..da4792af
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h
@@ -0,0 +1,132 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef  SFU_LOW_LEVEL_H
+#define  SFU_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU CRC Configuration definition
+  */
+typedef enum
+{
+  SFU_CRC_CONFIG_NONE = 0U,   /*!< None */
+  SFU_CRC_CONFIG_DEFAULT,     /*!< Default configuration */
+  SFU_CRC_CONFIG_16BIT        /*!< 16 bit configuration */
+} SFU_CRC_ConfigTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_UART                                USART2
+#define SFU_UART_CLK_ENABLE()                   __HAL_RCC_USART2_CLK_ENABLE()
+#define SFU_UART_CLK_DISABLE()                  __HAL_RCC_USART2_CLK_DISABLE()
+
+#define SFU_UART_TX_AF                          GPIO_AF7_USART2
+#define SFU_UART_TX_GPIO_PORT                   GPIOA
+#define SFU_UART_TX_PIN                         GPIO_PIN_2
+#define SFU_UART_TX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_TX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+#define SFU_UART_RX_AF                          GPIO_AF7_USART2
+#define SFU_UART_RX_GPIO_PORT                   GPIOA
+#define SFU_UART_RX_PIN                         GPIO_PIN_3
+#define SFU_UART_RX_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_UART_RX_GPIO_CLK_DISABLE()          __HAL_RCC_GPIOA_CLK_DISABLE()
+
+/* Uncomment to enable the adequate Clock Source */
+#define RTC_CLOCK_SOURCE_LSI
+/*#define RTC_CLOCK_SOURCE_LSE*/
+
+#ifdef RTC_CLOCK_SOURCE_LSI
+#define RTC_ASYNCH_PREDIV    0x1FU
+#define RTC_SYNCH_PREDIV     0x3FF
+#endif /* RTC_CLOCK_SOURCE_LSI */
+
+#ifdef RTC_CLOCK_SOURCE_LSE
+#define RTC_ASYNCH_PREDIV  0x7FU
+#define RTC_SYNCH_PREDIV   0x00FFU
+#endif /* RTC_CLOCK_SOURCE_LSE */
+
+/* External variables --------------------------------------------------------*/
+extern __IO uint32_t  DummyMemAccess;
+#if defined(SFU_LOW_LEVEL_C)
+#if defined(IT_MANAGEMENT)
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+__IO uint32_t DummyMemAccess;
+#endif /* defined(IT_MANAGEMENT) */
+#endif /* defined(SFU_LOW_LEVEL_C) */
+
+
+/* Exported macros -----------------------------------------------------------*/
+#define IS_SFU_CRC_CONF(CONF) (((CONF) == SFU_CRC_CONFIG_NONE) || \
+                               ((CONF) == SFU_CRC_CONFIG_DEFAULT) || \
+                               ((CONF) == SFU_CRC_CONFIG_16BIT))
+
+/* Dummy memory access : avoid compilation issue with STM32_Secure_Engine middleware
+   but not meaningful for this product */
+#define SFU_LL_DummyAccess() \
+  do{ \
+  }while(0)
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus    SFU_LL_Init(void);
+SFU_ErrorStatus    SFU_LL_DeInit(void);
+
+SFU_ErrorStatus    SFU_LL_CRC_Init(void);
+SFU_ErrorStatus    SFU_LL_CRC_Config(SFU_CRC_ConfigTypeDef eCRCConfg);
+uint32_t           SFU_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t BufferLength);
+
+SFU_ErrorStatus    SFU_LL_UART_Init(void);
+SFU_ErrorStatus    SFU_LL_UART_DeInit(void);
+SFU_ErrorStatus    SFU_LL_UART_Transmit(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Receive(uint8_t *pData, uint16_t DataLength, uint32_t Timeout);
+SFU_ErrorStatus    SFU_LL_UART_Flush(void);
+
+#ifndef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus SFU_LL_RTC_Init(void);
+SFU_ErrorStatus SFU_LL_RTC_DeInit(void);
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+void  SFU_LL_RTC_MspInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc);
+void  SFU_LL_UART_MspInit(UART_HandleTypeDef *huart);
+void  SFU_LL_UART_MspDeInit(UART_HandleTypeDef *huart);
+
+SFU_ErrorStatus SFU_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SFU_ErrorStatus SFU_LL_BufferCheck_in_se_ram(const void *pBuff, uint32_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  SFU_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c
new file mode 100644
index 00000000..4cea3348
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_fwimg_regions.h"
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  Initialize internal and external flash interface (OSPI/QSPI)
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  e_ret_status = SFU_LL_FLASH_INT_Init();
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_LL_FLASH_EXT_Init();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Depending on start address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+
+  /* Check Flash start address */
+  if ((uint32_t) pStart < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Erase_Size(pFlashStatus, pStart, Length);
+  }
+}
+
+/**
+  * @brief  Depending on destination address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: flash address to write
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                   const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash destination address */
+  if ((uint32_t) pDestination < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Write(pFlashStatus, pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  Depending on source address, this function will call internal or external (OSPI/QSPI) flash driver
+  * @param  pDestination: pointer on buffer to store data
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pSource < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Read(pDestination, pSource, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Read(pDestination, pSource, Length);
+  }
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  /* Check Flash source address */
+  if ((uint32_t) pFlash < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Compare(pFlash, Pattern1, Pattern2, Length);
+  }
+}
+
+/**
+  * @brief  This function configure the flash to be able to execute code
+  * @param  Addr: flash address
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber)
+{
+  /*
+   * Internal flash : nothing to do
+   * External flash : configure memory mapped mode
+   */
+
+  /* Check Flash address */
+  if (SlotStartAdd[SlotNumber] < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_LL_FLASH_EXT_Config_Exe(SlotNumber);
+  }
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr)
+{
+  /* Check Flash address */
+  if (Addr < EXTERNAL_FLASH_ADDRESS)
+  {
+    return SFU_LL_FLASH_INT_GetPage(Addr);
+  }
+  else
+  {
+    return INVALID_PAGE;                         /* Page number is not used in SBSFU application for external flash */
+  }
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h
new file mode 100644
index 00000000..726365d6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update flash
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_H
+#define SFU_LOW_LEVEL_FLASH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  SFU_FLASH_ERROR = 0U,       /*!< Error Flash generic*/
+  SFU_FLASH_ERR_HAL,          /*!< Error Flash HAL init */
+  SFU_FLASH_ERR_ERASE,        /*!< Error Flash erase */
+  SFU_FLASH_ERR_WRITING,      /*!< Error writing data in Flash */
+  SFU_FLASH_ERR_WRITINGCTRL,  /*!< Error checking data written in Flash */
+  SFU_FLASH_SUCCESS           /*!< Flash Success */
+} SFU_FLASH_StatusTypeDef;
+
+/* Exported constants --------------------------------------------------------*/
+#define INVALID_SECTOR 0xFFFFFFFFU
+#define INVALID_PAGE   0xFFFFFFFFU
+#define INVALID_BANK   0xFFFFFFFFU
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                   const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_Config_Exe(uint32_t SlotNumber);
+
+uint32_t SFU_LL_FLASH_GetPage(uint32_t Addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c
new file mode 100644
index 00000000..7b10b14d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c
@@ -0,0 +1,80 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU external
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_ext.h"
+#include "sfu_low_level_security.h"
+
+/* Private defines -----------------------------------------------------------*/
+
+/* Functions Definition ------------------------------------------------------*/
+
+/* No external flash available on this product
+   ==> return SFU_ERROR except for SFU_LL_FLASH_EXT_Init and SFU_LL_FLASH_EXT_Config_Exe which are called
+       systematically during startup phase */
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pStart);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pFlashStatus);
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  UNUSED(pDestination);
+  UNUSED(pSource);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  UNUSED(pFlash);
+  UNUSED(Pattern1);
+  UNUSED(Pattern2);
+  UNUSED(Length);
+  return SFU_ERROR;
+}
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber)
+{
+  UNUSED(SlotNumber);
+  return SFU_SUCCESS;
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h
new file mode 100644
index 00000000..08566d80
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_ext.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for external flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_EXT_H
+#define SFU_LOW_LEVEL_FLASH_EXT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+#define EXTERNAL_FLASH_ADDRESS  0x90000000U
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_EXT_Config_Exe(uint32_t SlotNumber);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_EXT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c
new file mode 100644
index 00000000..1e8db303
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c
@@ -0,0 +1,474 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.c
+  * @author  MCD Application Team
+  * @brief   SFU Flash Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU internal
+  *          flash low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level_security.h"
+#include "se_interface_bootloader.h"
+#include "string.h"
+#include "sfu_fsm_states.h"
+#include "sfu_error.h"
+
+/* Private defines -----------------------------------------------------------*/
+#define NB_PAGE_SECTOR_PER_ERASE  2U    /*!< Nb page erased per erase */
+
+/* Private variables ---------------------------------------------------------*/
+static __IO uint32_t DoubleECC_Error_Counter = 0U;
+
+
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void);
+
+/* Functions Definition ------------------------------------------------------*/
+/**
+  * @brief  This function initialize the internal flash interface if required
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void)
+{
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  This function does an erase of n (depends on Length) pages in user flash area
+  * @param  pFlashStatus: SFU_FLASH Status pointer
+  * @param  pStart: flash address to be erased
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t first_page;
+  uint32_t nb_pages;
+  uint32_t chunk_nb_pages;
+  uint32_t length = Length;
+
+  /* Check the pointers allocation */
+  if (pFlashStatus == NULL)
+  {
+    return SFU_ERROR;
+  }
+
+  *pFlashStatus = SFU_FLASH_SUCCESS;
+
+  /* Clear error flags raised during previous operation */
+  e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Unlock the Flash to enable the flash control register access *************/
+    if (HAL_FLASH_Unlock() == HAL_OK)
+    {
+      first_page = SFU_LL_FLASH_INT_GetPage(start);
+      /* Get the number of pages to erase from 1st page */
+      nb_pages = SFU_LL_FLASH_INT_GetPage(start + length - 1U) - first_page + 1U;
+      p_erase_init.TypeErase   = FLASH_TYPEERASE_PAGES;
+      /* Erase flash per NB_PAGE_SECTOR_PER_ERASE to avoid watch-dog */
+      do
+      {
+        chunk_nb_pages = (nb_pages >= NB_PAGE_SECTOR_PER_ERASE) ? NB_PAGE_SECTOR_PER_ERASE : nb_pages;
+        p_erase_init.Page = first_page;
+        p_erase_init.NbPages = chunk_nb_pages;
+        first_page += chunk_nb_pages;
+        nb_pages -= chunk_nb_pages;
+        if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_ERASE;
+        }
+        SFU_LL_SECU_IWDG_Refresh(); /* calling this function which checks the compiler switch */
+      } while (nb_pages > 0U);
+      /* Lock the Flash to disable the flash control register access (recommended
+      to protect the FLASH memory against possible unwanted operation) *********/
+      if (HAL_FLASH_Lock() != HAL_OK)
+      {
+        e_ret_status = SFU_ERROR;
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+      }
+    }
+    else
+    {
+      *pFlashStatus = SFU_FLASH_ERR_HAL;
+    }
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function writes a data buffer in flash (data are 32-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pFlashStatus: FLASH_StatusTypeDef
+  * @param  pDestination: Start address for target location. It has to be 8 bytes aligned.
+  * @param  pSource: pointer on buffer with data to write
+  * @param  Length: Length of data buffer in bytes. It has to be 8 bytes aligned.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pFlashStatus, uint8_t  *pDestination,
+                                       const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Check the pointers allocation */
+  if ((pFlashStatus == NULL) || (pSource == NULL))
+  {
+    return SFU_ERROR;
+  }
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     writing operation should be executed inside secure environment */
+  if ((inside_header == 1U) && (Length != 0U))
+  {
+    /* SE Access */
+    SE_StatusTypeDef se_status;
+    SE_ErrorStatus se_ret_status = SE_SFU_IMG_Write(&se_status, (uint8_t *)destination, pSource, Length);
+    if (se_ret_status == SE_SUCCESS)
+    {
+      e_ret_status = SFU_SUCCESS;
+      *pFlashStatus = SFU_FLASH_SUCCESS;
+    }
+    else
+    {
+      e_ret_status = SFU_ERROR;
+      *pFlashStatus = SFU_FLASH_ERROR;
+    }
+  }
+  /* Writing operation executed by SBSFU */
+  else
+  {
+    *pFlashStatus = SFU_FLASH_ERROR;
+
+    /* Clear error flags raised during previous operation */
+    e_ret_status = SFU_LL_FLASH_INT_Clear_Error();
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      /* Unlock the Flash to enable the flash control register access *************/
+      if (HAL_FLASH_Unlock() != HAL_OK)
+      {
+        *pFlashStatus = SFU_FLASH_ERR_HAL;
+
+      }
+      else
+      {
+        /* DataLength must be a multiple of 64 bit */
+        for (i = 0U; (i < Length) && (e_ret_status == SFU_SUCCESS);  i += sizeof(SFU_LL_FLASH_write_t))
+        {
+          *pFlashStatus = SFU_FLASH_ERROR;
+
+          /* Device voltage range supposed to be [2.7V to 3.6V], the operation will
+          be done by word */
+          if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, destination, *((uint64_t *)(source + i)))
+              == HAL_OK)
+          {
+            /* Check the written value */
+            if (*(uint64_t *)destination != *(uint64_t *)(source + i))
+            {
+              /* Flash content doesn't match SRAM content */
+              *pFlashStatus = SFU_FLASH_ERR_WRITINGCTRL;
+              e_ret_status = SFU_ERROR;
+            }
+            else
+            {
+              /* Increment FLASH Destination address */
+              destination = destination + sizeof(SFU_LL_FLASH_write_t);
+              e_ret_status = SFU_SUCCESS;
+              *pFlashStatus = SFU_FLASH_SUCCESS;
+            }
+          }
+          else
+          {
+            /* Error occurred while writing data in Flash memory */
+            *pFlashStatus = SFU_FLASH_ERR_WRITING;
+            e_ret_status = SFU_ERROR;
+          }
+        }
+        /* Lock the Flash to disable the flash control register access (recommended
+        to protect the FLASH memory against possible unwanted operation) */
+        if (HAL_FLASH_Lock() != HAL_OK)
+        {
+          e_ret_status = SFU_ERROR;
+          *pFlashStatus = SFU_FLASH_ERR_HAL;
+        }
+      }
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function reads flash
+  * @param  pDestination: Start address for target location
+  * @param  pSource: flash address to read
+  * @param  Length: number of bytes
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  SE_ErrorStatus se_ret_status;
+  SE_StatusTypeDef se_status;
+  uint32_t i;
+  uint32_t inside_header = 0U;
+  uint32_t source = (uint32_t)pSource;
+
+  /* Is destination area inside 1 of the firmware image headers ? */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      inside_header = 1U;
+    }
+  }
+
+  /* Destination area part of 1 of the firmware image headers :
+     reading operation should be executed inside secure environment */
+  if (inside_header == 1U)
+  {
+    /* SE Access */
+    DoubleECC_Error_Counter = 0U;
+    se_ret_status = SE_SFU_IMG_Read(&se_status, pDestination, (uint8_t *)source, Length);
+    if ((se_ret_status == SE_SUCCESS) && (DoubleECC_Error_Counter == 0U))
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  /* Reading operation executed by SBSFU */
+  else
+  {
+    DoubleECC_Error_Counter = 0U;
+    /* Do not use memcpy from lib : ECC error should be checked at each loop */
+    for (i = 0; (i < Length) && (DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+    {
+      *pDestination = *pSource;
+    }
+    if (DoubleECC_Error_Counter == 0U)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+    DoubleECC_Error_Counter = 0U;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  This function compare a buffer with a flash area
+  * @note   The flash area should not be located inside the secure area
+  * @param  pFlash: address of the flash area
+  * @param  Pattern1: first 32 bits pattern to be compared
+  * @param  Pattern2: second 32 bits pattern to be compared
+  * @param  Length: number of bytes to be compared
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length)
+{
+  uint32_t flash = (uint32_t) pFlash;
+  uint32_t i;
+
+  /* Comparison executed by SBSFU ==> flash area could not be located inside secured environment */
+  for ( i = 0U; i < Length; i += 4U)
+  {
+    if ((*(uint32_t *)(flash + i) != Pattern1) &&  (*(uint32_t *)(flash + i) != Pattern2))
+    {
+      return SFU_ERROR;
+    }
+  }
+  return SFU_SUCCESS;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: flash address
+  * @retval The page of a given address
+  */
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+
+
+
+/**
+  * @brief  Clear error flags raised during previous operation
+  * @param  None.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_FLASH_INT_Clear_Error(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Unlock the Program memory */
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+
+    /* Clear all FLASH flags */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+
+    /* Unlock the Program memory */
+    if (HAL_FLASH_Lock() == HAL_OK)
+    {
+      e_ret_status = SFU_SUCCESS;
+    }
+  }
+
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retvat void
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    while (1 == 1)
+    {
+      SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_UNKNOWN);
+    }
+  }
+}
+
+
+/**
+  * @brief  HardFault Handler
+  * @param  None.
+  * @retval None.
+  */
+void HardFault_Handler(void)
+{
+  SFU_EXCPT_IrqExceptionHandler(SFU_EXCPT_HARD_FAULT);
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h
new file mode 100644
index 00000000..5ef51fc6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_flash_int.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update low level
+  *          interface for internal flash.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_FLASH_INT_H
+#define SFU_LOW_LEVEL_FLASH_INT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_low_level_flash.h"
+#include "main.h"
+#include "sfu_def.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash Write Access Constraints (size and alignment)
+  *
+  * For instance, on L4, it is only possible to program double word (2 x 32-bit data).
+  * See http://www.st.com/content/ccc/resource/technical/document/reference_manual/02/35/09/0c/4f/f7/40/03/DM00083560.pdf/files/DM00083560.pdf/jcr:content/translations/en.DM00083560.pdf
+  *
+  * @note This type is very important for the FWIMG module (see @ref SFU_IMG).
+  * \li This is the type to be used for an atomic write in FLASH: see @ref AtomicWrite.
+  * \li The size of this type changes the size of the TRAILER area at the end of dwl slot,
+  *     as it is used to tag if a Firmware Image chunk has been swapped or not (see @ref SFU_IMG_FirmwareToResume).
+  */
+
+/* double-word is the default setting for most platforms */
+typedef uint64_t SFU_LL_FLASH_write_t;
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * Length of a MAGIC tag (32 bytes).
+  * This must be a multiple of @ref SFU_LL_FLASH_write_t with a minimum value of 32.
+  */
+#define MAGIC_LENGTH ((uint32_t)32U)
+
+/* External variables --------------------------------------------------------*/
+#define IS_ALIGNED(address) (0U == ((address) % FLASH_PAGE_SIZE))
+
+/* Exported functions ------------------------------------------------------- */
+SFU_ErrorStatus SFU_LL_FLASH_INT_Init(void);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Erase_Size(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pStart, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Write(SFU_FLASH_StatusTypeDef *pxFlashStatus, uint8_t *pDestination,
+                                       const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SFU_ErrorStatus SFU_LL_FLASH_INT_Compare(const uint8_t *pFlash, const uint32_t Pattern1, const uint32_t Pattern2, uint32_t Length);
+uint32_t SFU_LL_FLASH_INT_GetPage(uint32_t Addr);
+void NMI_Handler(void);
+void HardFault_Handler(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_FLASH_INT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
new file mode 100644
index 00000000..5ab1c424
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c
@@ -0,0 +1,2040 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SFU Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SFU security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_low_level_flash_int.h"
+#include "sfu_low_level.h"
+#include "sfu_trace.h"
+#include "sfu_boot.h"
+#include "sfu_fsm_states.h" /* needed for sfu_error.h */
+#include "sfu_error.h"
+#include "stm32wlxx_it.h"
+#include "sfu_mpu_isolation.h"        /* Secure Engine isolated thanks to MPU */
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_RDP_PROTECT_ENABLE
+#warning "SFU_RDP_PROTECT_DISABLED"
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_GTZC_PROTECT_ENABLE
+#warning "SFU_GTZC_PROTECT_DISABLED"
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_C2SWDBG_PROTECT_ENABLE
+#warning "SFU_C2SWDBG_DISABLED"
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+
+
+#ifndef  SFU_TAMPER_PROTECT_ENABLE
+/* #warning "SFU_TAMPER_PROTECT_DISABLED" */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifndef  SFU_IWDG_PROTECT_ENABLE
+/* #warning "SFU_IWDG_PROTECT_DISABLED" */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+static IWDG_HandleTypeDef   IwdgHandle;
+
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+
+  /* install header : read /write only for privileged */
+  {
+    SFU_PROTECT_MPU_HEADER_RGNV, SFU_PROTECT_MPU_HEADER_START, SFU_PROTECT_MPU_HEADER_SIZE,
+    SFU_PROTECT_MPU_HEADER_PERM, SFU_PROTECT_MPU_HEADER_EXECV, SFU_PROTECT_MPU_HEADER_SREG,
+    SFU_PROTECT_MPU_HEADER_TEXV, SFU_PROTECT_MPU_HEADER_C, SFU_PROTECT_MPU_HEADER_B
+  },
+
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+
+  /* KMS_DataStorage: NVM storage */
+  {
+    SFU_PROTECT_MPU_KMS_RGNV, SFU_PROTECT_MPU_KMS_START, SFU_PROTECT_MPU_KMS_SIZE,
+    SFU_PROTECT_MPU_KMS_PERM, SFU_PROTECT_MPU_KMS_EXECV, SFU_PROTECT_MPU_KMS_SREG,
+    SFU_PROTECT_MPU_KMS_TEXV, SFU_PROTECT_MPU_KMS_C, SFU_PROTECT_MPU_KMS_B
+  },
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+  /* DMA */
+  {
+    SFU_PROTECT_MPU_DMA_RGNV, SFU_PROTECT_MPU_DMA_START, SFU_PROTECT_MPU_DMA_SIZE,
+    SFU_PROTECT_MPU_DMA_PERM, SFU_PROTECT_MPU_DMA_EXECV, SFU_PROTECT_MPU_DMA_SREG,
+    SFU_PROTECT_MPU_DMA_TEXV, SFU_PROTECT_MPU_DMA_C, SFU_PROTECT_MPU_DMA_B
+  },
+#endif /* SFU_DMA_PROTECT_ENABLE */
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+
+
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void);
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus    SFU_LL_SECU_SetProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void);
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void);
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void);
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check that a GTZC interrupt is enabled
+  * @param  none
+  * @retval SFU_ErrorStatus SFU_SUCCESS if enabled, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus GTZC_CheckITEnabled(uint32_t PeriphId)
+{
+  uint32_t register_address;
+  uint32_t bit_pos;
+
+  register_address = (uint32_t)&(GTZC_TZIC->IER1) + (4U * GTZC_GET_REG_INDEX(PeriphId));
+  bit_pos = (uint32_t)(1UL << GTZC_GET_PERIPH_POS(PeriphId));
+  if (READ_BIT(*(uint32_t *)register_address, bit_pos) == bit_pos)
+  {
+    return SFU_SUCCESS;
+  }
+  return SFU_ERROR;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP, PCRoP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void) HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  (void) HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA_A  **********/
+  flash_option_bytes.WRPArea     = SFU_PROTECT_WRP_AREA_1;
+  (void) HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckFlashConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] Flash configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      TRACE("\r\n= [SBOOT] System Security Configuration failed! Product blocked.");
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set Flash configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetFlashConfiguration(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply PCRoP ******************************************************/
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionSUBGHZSPI(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply RDP : RDP-L2 should be done as last option bytes configuration */
+#ifdef SFU_RDP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      e_ret_status = SFU_LL_SECU_SetProtectionRDP(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+    i_ctrl++;
+#endif  /* SFU_RDP_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      i_protection_set++;
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        (void) HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  /* Lock the Options Bytes ***************************************************/
+  (void) HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void) HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  /* Check/Apply MPU ************************************************/
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for MPU second-configuration
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_MPU_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DMA_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  IWDG **************************************************/
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionIWDG() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_IWDG;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for DMA second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_DAP_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  /* Check/Apply  ANTI_TAMPER *************************************************/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionANTI_TAMPER() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_ANTI_TAMPER;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for TAMPER second-configuration in order to activate the clock through RCC
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_TAMPER_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#else
+#ifdef SFU_TEST_PROTECTION
+  if (SFU_LL_RTC_Init() != SFU_SUCCESS)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_TEST_PROTECTION */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+  /* Check/Apply  C2SWDBG *****************************************************/
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    if (SFU_LL_SECU_CheckProtectionC2SWDBG() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_C2SWDBG;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  i_ctrl++;
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+  /* Check/Apply  GTZC ********************************************************/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    if (SFU_LL_SECU_SetProtectionGTZC() == SFU_SUCCESS)
+    {
+      runtime_protection |= SFU_RUNTIME_PROTECTION_GTZC;
+      i_protection_set++;
+    }
+    else
+    {
+      /* When a protection cannot be set then SFU_ERROR is returned */
+      e_ret_status = SFU_ERROR;
+    }
+  }
+  else
+  {
+    /* Privileged mode required for GTZC checks
+       Errors caught by FLOW_CONTROL */
+    SFU_MPU_SysCall((uint32_t)SB_SYSCALL_GTZC_CONFIG);
+    i_protection_set++;
+  }
+  i_ctrl++;
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+  /* Check/Apply  CLOCK_MONITOR **********************************************/
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionCLOCK_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_CLOCK_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_CLCK_MNTR_PROTECT_ENABLE */
+
+  /* Check/Apply  TEMP_MONITOR **********************************************/
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+  if (SFU_LL_SECU_SetProtectionTEMP_MONITOR() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_TEMP_MONITOR;
+    i_protection_set++;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+  i_ctrl++;
+#endif /* SFU_TEMP_MNTR_PROTECT_ENABLE */
+
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+  TRACE("\r\n= [SBOOT] RuntimeProtections: %x", runtime_protection);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+  if (i_protection_set != i_ctrl)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Return the reset source  detected after a reboot. The related flag is reset
+  *         at the end of this function.
+  * @param  peResetpSourceId: to be filled with the detected source of reset
+  * @note   In case of multiple reset sources this function return only one of them.
+  *         It can be improved returning and managing a combination of them.
+  * @retval SFU_SUCCESS if successful, SFU_ERROR otherwise
+  */
+void SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId)
+{
+  /* Check if the last reset has been generated from a Watchdog exception */
+  if ((__HAL_RCC_GET_FLAG(RCC_FLAG_IWDGRST) != RESET) ||
+      (__HAL_RCC_GET_FLAG(RCC_FLAG_WWDGRST) != RESET))
+  {
+    *peResetpSourceId = SFU_RESET_WDG_RESET;
+
+  }
+
+
+  /* Check if the last reset has been generated from a Low Power reset */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_LPWRRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_LOW_POWER;
+
+  }
+
+  /* Check if the last reset has been generated from a Software reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_SFTRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_SW_RESET;
+
+  }
+  /* Check if the last reset has been generated from an Option Byte Loader reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_OBLRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_OB_LOADER;
+  }
+  /* Check if the last reset has been generated from a Hw pin reset  */
+  else if (__HAL_RCC_GET_FLAG(RCC_FLAG_PINRST) != RESET)
+  {
+    *peResetpSourceId = SFU_RESET_HW_RESET;
+
+  }
+  /* Unknown */
+  else
+  {
+    *peResetpSourceId = SFU_RESET_UNKNOWN;
+  }
+}
+
+/**
+  * @brief  Clear the reset sources. This function should be called after the actions
+  *         on the reset sources has been already taken.
+  * @param  none
+  * @note   none
+  * @retval none
+  */
+void SFU_LL_SECU_ClearResetSources()
+{
+  /* Clear reset flags  */
+  __HAL_RCC_CLEAR_RESET_FLAGS();
+}
+
+/**
+  * @brief  Refresh Watchdog : reload counter
+  *         This function must be called just before jumping to the UserFirmware
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_IWDG_Refresh(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+  /* Refresh IWDG: reload counter */
+  if (HAL_IWDG_Refresh(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+#else
+  e_ret_status = SFU_SUCCESS;
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Flash configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetFlashConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Flash configuration */
+  if (SFU_LL_SECU_CheckFlashConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    TRACE("\r\n= [SBOOT] Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_RDP_PROTECT_ENABLE
+/**
+  * @brief  Apply the RDP protection
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionRDP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply RDP **********************************************************/
+  /* Please consider that the suggested and most secure approach is to set the RDP_LEVEL_2 */
+  if (psFlashOptionBytes->RDPLevel == SFU_PROTECT_RDP_LEVEL)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+#if defined(SFU_FINAL_SECURE_LOCK_ENABLE)
+    TRACE("\r\n\t  Applying RDP-2 Level. Product locked! You might need to unplug/plug the USB cable!");
+#else
+    TRACE("\r\n\t  Applying RDP-1 Level. You might need to unplug/plug the USB cable!");
+#endif /* SFU_FINAL_SECURE_LOCK_ENABLE */
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_RDP;
+    psFlashOptionBytes->RDPLevel        = SFU_PROTECT_RDP_LEVEL;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: RDP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+  return e_ret_status;
+}
+#endif /*SFU_RDP_PROTECT_ENABLE*/
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  if ((psFlashOptionBytes->WRPStartOffset == SFU_PROTECT_WRP_PAGE_START_1) &&
+      (psFlashOptionBytes->WRPEndOffset   == SFU_PROTECT_WRP_PAGE_END_1))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SFU Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  if (SFU_LL_SECU_CheckProtectionWRP(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+    psFlashOptionBytes->WRPArea        = SFU_PROTECT_WRP_AREA_1;
+    psFlashOptionBytes->WRPStartOffset = SFU_PROTECT_WRP_PAGE_START_1;
+    psFlashOptionBytes->WRPEndOffset   = SFU_PROTECT_WRP_PAGE_END_1;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: WRP is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /* configure a temporary area for the currently executing code (SBSFU + active slots) */
+  /* This area of higher rank will keep the execution rights when reconfiguring the current area */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_BLOB_DWL_RGNV; /* temporary area */
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* configure a new area for the currently executing code (SBSFU + active slots) */
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* remap the current area (SBSFU + active slots) */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_BLOB_DWL_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_BLOB_DWL_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_BLOB_DWL_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_BLOB_DWL_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_BLOB_DWL_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_BLOB_DWL_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_BLOB_DWL_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_BLOB_DWL_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_BLOB_DWL_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /* Enable read/write rights for EE area */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_EE_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_EE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_EE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_EE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_EE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_EE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_EE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_EE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_EE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  Remove the write rights for the SRAM synchronization flag */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_SRAM_FLAG_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_SRAM_FLAG_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_SRAM_FLAG_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_SRAM_FLAG_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_SRAM_FLAG_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_SRAM_FLAG_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_SRAM_FLAG_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_SRAM_FLAG_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_SRAM_FLAG_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+
+  return SFU_SUCCESS;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  uint8_t mpu_region_num; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE(" @%d:%x size:%x sub:%x perm:%x exec:%x\r\n",
+          MPU_InitStruct.Number, MPU_InitStruct.BaseAddress, MPU_InitStruct.Size, MPU_InitStruct.SubRegionDisable,
+          MPU_InitStruct.AccessPermission, MPU_InitStruct.DisableExec);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n");
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    /* Enables the MPU */
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    /* Enables memory fault exception */
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+#if defined(SCB_SHCSR_MEMFAULTENA_Msk)
+    if ((SCB->SHCSR & SCB_SHCSR_MEMFAULTENA_Msk) != SCB_SHCSR_MEMFAULTENA_Msk)
+    {
+      return SFU_ERROR;
+    }
+#endif /* SCB_SHCSR_MEMFAULTENA_Msk */
+  }
+
+  e_ret_status = SFU_SUCCESS;
+
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check if GTZC protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionGTZC(void)
+{
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t periph_attributes;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Check FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SRAM1_SIZE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  if (HAL_GTZC_TZSC_MPCWM_GetConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    if (mpcwm_desc.Length == SE_REGION_RAM_START - SRAM2_BASE)
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_NPRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_GetConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                              &periph_attributes) == HAL_OK)
+  {
+    if (periph_attributes == (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV))
+    {
+      i_protection_set++;
+    }
+  }
+  i_ctrl++;
+
+  /* Check TZIC peripherals ***********************************************/
+
+  /* Check FLASH_ACR2 */
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the IT for the concerned peripherals */
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZIC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_TZSC) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_AES) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_RNG) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SUBGHZSPI) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PWR) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASHIF) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMA2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_DMAMUX) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_FLASH) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM1) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_SRAM2) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (GTZC_CheckITEnabled(GTZC_PERIPH_PKA) == SFU_SUCCESS)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Check the GTZC TZC lock *************************************************/
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+
+    return SFU_SUCCESS;
+  }
+
+  return SFU_ERROR;
+}
+
+/**
+  * @brief  Apply GTZC protection: FLASH, RAM, PKA, RNG, AES.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionGTZC(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  MPCWM_ConfigTypeDef mpcwm_desc;
+  uint32_t i_protection_set = 0U;
+  uint32_t i_ctrl = 0U;
+
+  /* Handle the GTZC TZC lock *************************************************/
+
+  /* Configure FLASH memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SFU_PROTECT_GTZC_EXEC_SE_START - FLASH_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV_WRITABLE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM1 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SRAM1_SIZE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM1_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure SRAM2 memory ***************************************************/
+  mpcwm_desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
+  mpcwm_desc.Length = SE_REGION_RAM_START - SRAM2_BASE;
+  if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &mpcwm_desc) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZSC peripherals ***********************************************/
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_AES,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_RNG,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_SUBGHZSPI,
+                                           (GTZC_TZSC_ATTRIBUTE_NPRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_PKA,
+                                           (GTZC_TZSC_ATTRIBUTE_SEC  | GTZC_TZSC_ATTRIBUTE_PRIV)) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Configure TZIC peripherals ***********************************************/
+
+  /* Configure FLASH_ACR2 */
+  MODIFY_REG(FLASH->ACR2, FLASH_ACR2_PRIVMODE, FLASH_ACR2_PRIVMODE);
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_PRIVMODE) == FLASH_ACR2_PRIVMODE)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable the IT for the concerned peripherals */
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZIC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_TZSC) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_AES) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_RNG) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SUBGHZSPI) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PWR) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASHIF) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMAMUX) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASH) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM1) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_PKA) == HAL_OK)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Enable IRQ */
+  NVIC_EnableIRQ(TZIC_ILA_IRQn);
+  if (NVIC_GetEnableIRQ(TZIC_ILA_IRQn))
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Handle the GTZC TZC lock *************************************************/
+  HAL_GTZC_TZSC_Lock(GTZC_TZSC);
+  if (HAL_GTZC_TZSC_GetLock(GTZC_TZSC) == GTZC_TZSC_LOCK_ON)
+  {
+    i_protection_set++;
+  }
+  i_ctrl++;
+
+  /* Double Check to avoid basic fault injection : no configuration skipped */
+  if (i_protection_set == i_ctrl)
+  {
+    e_ret_status = SFU_SUCCESS;
+
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_GTZC, FLOW_CTRL_GTZC);
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return SFU_SUCCESS;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_IWDG_PROTECT_ENABLE
+/**
+  *  @brief Apply IWDG protection
+  *         The IWDG timeout is set to 4 second.
+  *         Then, the IWDG reload counter is configured as below to obtain 4 second according
+  *         to the measured LSI frequency after setting the prescaler value:
+  *         IWDG counter clock Frequency = LSI Frequency / Prescaler value
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionIWDG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* TIMER could be used to get the LSI frequency in order to have a more precise IWDG.
+  This is not used in this implementation because not necessary and in order
+  to optimize code-size. If you are interested, please have a look at the IWDG Cube example. */
+
+  /* Configure & Start the IWDG peripheral */
+  /* Set counter reload value to obtain 6 sec. IWDG TimeOut.
+  IWDG counter clock Frequency = uwLsiFreq
+  Set Prescaler to 64 (IWDG_PRESCALER_64)
+  Timeout Period = (Reload Counter Value * 64) / uwLsiFreq
+  So Set Reload Counter Value = (6 * uwLsiFreq) / 64 */
+  IwdgHandle.Instance = IWDG;
+  IwdgHandle.Init.Prescaler = IWDG_PRESCALER_64;
+  IwdgHandle.Init.Reload = (SFU_IWDG_TIMEOUT * LSI_VALUE / 64U);
+  IwdgHandle.Init.Window = IWDG_WINDOW_DISABLE;
+
+  if (HAL_IWDG_Init(&IwdgHandle) == HAL_OK)
+  {
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_IWDG, FLOW_CTRL_IWDG);
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_IWDG_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#else
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+/**
+  * @brief  Apply ANTI TAMPER protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionANTI_TAMPER(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+  RTC_TamperTypeDef  stamperstructure;
+
+  /* RTC_TAMPER_1 (PC13) selected. PA0 connected to RTC_TAMPER_2 is also connected to the B1 button */
+  TAMPER_GPIO_CLK_ENABLE();
+
+  /* Configure Tamper Pin */
+  /* tamper is an additional function */
+  /* not an alternate Function : config not needed */
+  /* Configure the RTC peripheral */
+  /* Configure RTC prescaler and RTC data registers */
+  /* RTC configured as follows:
+  - Hour Format    = Format 24
+  - Asynch Prediv  = Value according to source clock
+  - Synch Prediv   = Value according to source clock
+  - OutPut         = Output Disable
+  - OutPutPolarity = High Polarity
+  - OutPutType     = Open Drain */
+  RtcHandle.Instance            = RTC;
+  RtcHandle.Init.HourFormat     = RTC_HOURFORMAT_24;
+  RtcHandle.Init.AsynchPrediv   = RTC_ASYNCH_PREDIV;
+  RtcHandle.Init.SynchPrediv    = RTC_SYNCH_PREDIV;
+  RtcHandle.Init.OutPut         = RTC_OUTPUT_DISABLE;
+  RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  RtcHandle.Init.OutPutType     = RTC_OUTPUT_TYPE_OPENDRAIN;
+
+  if (HAL_RTC_Init(&RtcHandle) == HAL_OK)
+  {
+    /* Configure RTC Tamper */
+    stamperstructure.Tamper                       = RTC_TAMPER_ID;
+    stamperstructure.Trigger                      = RTC_TAMPERTRIGGER_FALLINGEDGE;
+    stamperstructure.Filter                       = RTC_TAMPERFILTER_DISABLE;
+    stamperstructure.SamplingFrequency            = RTC_TAMPERSAMPLINGFREQ_RTCCLK_DIV32768;
+    stamperstructure.PrechargeDuration            = RTC_TAMPERPRECHARGEDURATION_1RTCCLK;
+    stamperstructure.TamperPullUp                 = RTC_TAMPER_PULLUP_ENABLE;
+    stamperstructure.TimeStampOnTamperDetection   = RTC_TIMESTAMPONTAMPERDETECTION_DISABLE;
+    stamperstructure.NoErase                      = RTC_TAMPER_ERASE_BACKUP_ENABLE;
+    stamperstructure.MaskFlag                     = RTC_TAMPERMASK_FLAG_DISABLE;
+
+    if (HAL_RTCEx_SetTamper_IT(&RtcHandle, &stamperstructure) == HAL_OK)
+    {
+
+      /* Clear the Tamper interrupt pending bit */
+      __HAL_RTC_TAMPER_CLEAR_FLAG(&RtcHandle, RTC_FLAG_TAMP_1);
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_TAMPER, FLOW_CTRL_TAMPER);
+    }
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_TAMPER_PROTECT_ENABLE*/
+
+#ifdef SFU_C2SWDBG_PROTECT_ENABLE
+/**
+  * @brief  Check if C2SWDBG protection is enabled.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionC2SWDBG(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  if (READ_BIT(FLASH->ACR2, FLASH_ACR2_C2SWDBGEN) == 0U)
+  {
+    /* C2SWDBG disabled */
+    e_ret_status = SFU_SUCCESS;
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply C2SWDBG protection
+  * @param None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionC2SWDBG(void)
+{
+  HAL_FLASHEx_DisableC2Debug();
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2SWDBG, FLOW_CTRL_C2SWDBG);
+  return SFU_SUCCESS;
+}
+#endif /* SFU_C2SWDBG_PROTECT_ENABLE */
+
+#ifdef SFU_CLCK_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply CLOCK MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a clock monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionCLOCK_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Clock Monitoring */
+  /* Add your code here for customization
+     e.g. if HSE or LSE is used enable the CSS!
+   ...
+   ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_CLCK_MNTR_PROTECT_ENABLE*/
+
+#ifdef SFU_TEMP_MNTR_PROTECT_ENABLE
+/**
+  * @brief  Apply TEMP MONITOR protection
+  * @note   This function has been added just as template to be used/customized
+  *         if a temperature monitor is requested.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionTEMP_MONITOR(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Apply the Temperature Monitoring */
+  /* Add your code here for customization
+     ...
+     ...
+  */
+
+  e_ret_status = SFU_SUCCESS;
+
+  return e_ret_status;
+}
+#endif /*SFU_TEMP_MNTR_PROTECT_ENABLE*/
+
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the active slots
+     */
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+    TRACE("\r\n= [SBOOT] Secure Mode: [%x]", psFlashOptionBytes->SecureMode);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr == SFU_SECURE_FLASH_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure Flash Start Address: [%x]", psFlashOptionBytes->SecureFlashStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr == SFU_HIDE_PROTECTION_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Hide Protection Start Address: [%x]", psFlashOptionBytes->HideProtectionStartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr == SFU_SECURE_SRAM1_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM1 Start Address: [%x]", psFlashOptionBytes->SecureSRAM1StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr == SFU_SECURE_SRAM2_START)
+      {
+#if defined(SFU_VERBOSE_DEBUG_MODE)
+        TRACE("\r\n= [SBOOT] Secure SRAM2 Start Address: [%x]", psFlashOptionBytes->SecureSRAM2StartAddr);
+#endif /* SFU_VERBOSE_DEBUG_MODE */
+      }
+      else
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START;
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Secure User Memory is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/**
+  * @brief  Activate Secure User Memory protection and jump into user application.
+  * @param  Address of the code to jump into
+  * @retval none.
+  */
+
+
+#ifdef SFU_GTZC_PROTECT_ENABLE
+/**
+  * @brief  Check Sub-GHz radio SPI protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply Sub-GHz radio SPI ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->SUBGHZSPISecureAccess == OB_SUBGHZSPI_SECURE_ACCESS_ENABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply Sub-GHz radio SPI protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSUBGHZSPI(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionSUBGHZSPI(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SUBGHZSPI_SECURE_ACCESS;
+
+    psFlashOptionBytes->SUBGHZSPISecureAccess = OB_SUBGHZSPI_SECURE_ACCESS_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SUBGHZSPI, FLOW_CTRL_SUBGHZSPI);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS ********************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    TRACE("\r\n= [SBOOT] System Security Configuration failed: Sub-GHz radio SPI security access is incorrect. STOP!");
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
new file mode 100644
index 00000000..b08ccb0c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h
@@ -0,0 +1,363 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "sfu_def.h"
+
+/* Exported constants --------------------------------------------------------*/
+/* Secure User Memory end : from FLASH_BASE to end of active slot header */
+#define SFU_SEC_MEM_AREA_ADDR_END SFU_ROM_ADDR_END
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_PROTECT_WRP_AREA_1          (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_PROTECT_WRP_PAGE_START_1    ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_PROTECT_WRP_PAGE_END_1      ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+
+
+#define SFU_PROTECT_GTZC_EXEC_SE_START INTVECT_START /*!< GTZC Configuration */
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area in unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB/SFU Full area (SBSFU + SE + Keys) in unprivileged mode.
+  *                   Read only capability configured
+  *                   Inner region inside the Region 0
+  *                   From 0x0802C000 ==> 0x0803FFFF
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START 0x08020000UL
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_128KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0x07U               /*!< 128 Kbytes / 8 * 5 ==> 80 Kbytes */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the read/write operation in privileged mode for Header of active slots
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_HEADER_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_HEADER_START SLOT_ACTIVE_2_HEADER
+#define SFU_PROTECT_MPU_HEADER_SREG  0x00U                 /*!< All subregions activated */
+#define SFU_PROTECT_MPU_HEADER_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_HEADER_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_HEADER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_HEADER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_HEADER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_HEADER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the read/write operation in privileged mode for KMS_DataStorage
+  *                   Execution capability disabled
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_KMS_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_KMS_START 0x08028000UL
+#define SFU_PROTECT_MPU_KMS_SREG  0xE7U               /*!< 32 Kbytes / 8 * 2 ==> 8 Kbytes */
+#define SFU_PROTECT_MPU_KMS_SIZE  MPU_REGION_SIZE_32KB
+#define SFU_PROTECT_MPU_KMS_PERM  MPU_REGION_PRIV_RW
+#define SFU_PROTECT_MPU_KMS_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_KMS_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_KMS_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_KMS_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 6 - Forbid all access to the DMA IPs
+  *                   Inner region inside the Region 0
+  */
+#define SFU_PROTECT_MPU_DMA_RGNV  MPU_REGION_NUMBER6
+#define SFU_PROTECT_MPU_DMA_START 0x40020000UL
+#define SFU_PROTECT_MPU_DMA_SREG  0xC0U               /*!< 4 Kbytes / 8 * 6 ==> 3 Kbytes */
+#define SFU_PROTECT_MPU_DMA_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_DMA_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_DMA_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_DMA_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_DMA_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_DMA_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+/**
+  */
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 2 - Enable the execution for the SBSFU and active slots in unprivileged mode.
+  *                   Read only capability configured
+  *                   Execution capability enabled
+  *                   Execution capability restricted by other regions (secure)
+  *                   From 0x08000000 ==> 0x0803FFFF (256 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define APP_PROTECT_MPU_FLASHEXE_START FLASH_BASE
+#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_256KB
+#define APP_PROTECT_MPU_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Enable the read/write operations for the blob download slots in unprivileged mode.
+  *                   Read/write capability configured
+  *                   Execution capability disabled
+  *                   From 0x08002800U ==>  0x08002FFF (2 kbytes)
+  */
+#define APP_PROTECT_MPU_BLOB_DWL_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_BLOB_DWL_START SLOT_BLOB_DWL_1_START
+#define APP_PROTECT_MPU_BLOB_DWL_SIZE  MPU_REGION_SIZE_2KB
+#define APP_PROTECT_MPU_BLOB_DWL_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_BLOB_DWL_PERM  MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_BLOB_DWL_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_BLOB_DWL_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_BLOB_DWL_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_BLOB_DWL_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the read/write operations for the EE DataStorage in unprivileged mode.
+  *                   Read/write capability configured
+  *                   Execution capability disabled
+  *                   From 0x0802A000U ==>  0x0802AFFF (4 kbytes)
+  */
+#define APP_PROTECT_MPU_EE_RGNV  MPU_REGION_NUMBER4
+#define APP_PROTECT_MPU_EE_START EE_DATASTORAGE_START
+#define APP_PROTECT_MPU_EE_SIZE  MPU_REGION_SIZE_4KB
+#define APP_PROTECT_MPU_EE_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_EE_PERM  MPU_REGION_FULL_ACCESS
+#define APP_PROTECT_MPU_EE_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_EE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_EE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_EE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define APP_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define APP_PROTECT_MPU_SRAM_FLAG_START 0x20000C00UL
+#define APP_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_256B
+#define APP_PROTECT_MPU_SRAM_FLAG_SREG  0x7FU                /*!< 256 bytes / 8 * 1 ==> 32 bytes */
+#define APP_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define APP_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_TAMPER Tamper Configuration
+  * @{
+  */
+#define TAMPER_GPIO_CLK_ENABLE()           __HAL_RCC_GPIOC_CLK_ENABLE()
+#define RTC_TAMPER_ID                      RTC_TAMPER_1
+#define RTC_TAMPER_ID_INTERRUPT            RTC_IT_TAMP_1
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_CONFIG_DBG Debug Port Configuration
+  * @{
+  */
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants Exported Constants
+  * @{
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Wakeup FU WAKEUP ID Type definition
+  * @{
+  */
+typedef enum
+{
+  SFU_RESET_UNKNOWN = 0x00U,
+  SFU_RESET_WDG_RESET,
+  SFU_RESET_LOW_POWER,
+  SFU_RESET_HW_RESET,
+  SFU_RESET_BOR_RESET,
+  SFU_RESET_SW_RESET,
+  SFU_RESET_OB_LOADER,
+} SFU_RESET_IdTypeDef;
+
+/**
+  * @}
+  */
+
+/** @defgroup SFU_SECURITY_Exported_Constants_Protections FU SECURITY Protections_Constants
+  * @{
+  */
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_RDP            ((uint32_t)0x00000001U)   /*!< RDP protection level 1 is applied */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. Needed as
+                                                                            separate section to support PCRoP */
+#define SFU_STATIC_PROTECTION_PCROP          ((uint32_t)0x00000004U)   /*!< SFU App section in Flash */
+#define SFU_STATIC_PROTECTION_LOCKED         ((uint32_t)0x00000008U)   /*!< RDP Level2 is applied. The device is Locked!
+                                                                            Std Protections cannot be
+                                                                            added/removed/modified */
+#define SFU_STATIC_PROTECTION_BFB2           ((uint32_t)0x00000010U)   /*!< BFB2 is disabled. The device shall always
+                                                                            boot in bank1! */
+
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_IWDG          ((uint32_t)0x00000400U)   /*!< Independent Watchdog */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+#define SFU_RUNTIME_PROTECTION_ANTI_TAMPER   ((uint32_t)0x00002000U)   /*!< Anti-Tampering protections */
+#define SFU_RUNTIME_PROTECTION_CLOCK_MONITOR ((uint32_t)0x00004000U)   /*!< Activate a clock monitoring */
+#define SFU_RUNTIME_PROTECTION_TEMP_MONITOR  ((uint32_t)0x00008000U)   /*!< Activate a Temperature monitoring */
+#define SFU_RUNTIME_PROTECTION_GTZC          ((uint32_t)0x00010000U)   /*!< GTZC protection */
+#define SFU_RUNTIME_PROTECTION_C2SWDBG       ((uint32_t)0x00020000U)   /*!< CPU2 Software Debug */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_RDP   | SFU_STATIC_PROTECTION_WRP   | \
+                                             SFU_STATIC_PROTECTION_PCROP | SFU_STATIC_PROTECTION_LOCKED)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | SFU_RUNTIME_PROTECTION_FWALL | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP   | \
+                                             SFU_RUNTIME_PROTECTION_DMA  | SFU_RUNTIME_PROTECTION_ANTI_TAMPER  | \
+                                             SFU_RUNTIME_PROTECTION_CLOCK_MONITOR | \
+                                             SFU_RUNTIME_PROTECTION_TEMP_MONITOR  | \
+                                             SFU_RUNTIME_PROTECTION_GTZC          | \
+                                             SFU_RUNTIME_PROTECTION_C2SWDBG)
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00U)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01U)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02U)     /*!< Third configuration */
+
+/* Exported functions ------------------------------------------------------- */
+#define SFU_CALLBACK_ANTITAMPER HAL_RTCEx_Tamper1EventCallback
+/*!<SFU Redirect of RTC Tamper Event Callback*/
+#define SFU_CALLBACK_MEMORYFAULT(void) MemManage_Handler(void)  /*!<SFU Redirect of Mem Manage Callback*/
+#ifdef SFU_GTZC_PROTECT_ENABLE
+#define SFU_CALLBACK_GTZC_TZIC(void) HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+SFU_ErrorStatus    SFU_LL_SECU_IWDG_Refresh(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+void               SFU_LL_SECU_GetResetSources(SFU_RESET_IdTypeDef *peResetpSourceId);
+void               SFU_LL_SECU_ClearResetSources(void);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+#ifdef SFU_DMA_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+#ifdef SFU_DAP_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#ifdef SFU_TAMPER_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionANTI_TAMPER(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+#if defined(SFU_MPU_PROTECT_ENABLE)
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /* SFU_MPU_PROTECT_ENABLE */
+#ifdef SFU_GTZC_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_CheckProtectionGTZC(void);
+#endif /* SFU_GTZC_PROTECT_ENABLE */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
new file mode 100644
index 00000000..71bd8e65
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/app_sfu.h
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SB application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_H
+#define APP_SFU_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu_common.h"
+
+/**
+  * Optional Features Software Configuration
+  */
+#define SECBOOT_LOADER SECBOOT_USE_LOCAL_LOADER    /*!< Loader selection inside SBSFU : local/standalone/none */
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_MPU_PROTECT_ENABLE         /*!< MPU protection:
+                                            Enables/Disables the MPU protection. */
+#define SFU_MPU_USERAPP_ACTIVATION     /*!< MPU protection during UserApp execution : Only Active Slot 2 considered as
+                                            an executable area */
+
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h
new file mode 100644
index 00000000..7a49bd99
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/main.h
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.h
+  * @author  MCD Application Team
+  * @brief   Header for main.c module
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+#include "stm32wlxx_nucleo.h"
+#include "sfu_def.h"
+#include "app_sfu.h"
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep);
+void SFU_EXCPT_Security_Error(void);
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
new file mode 100644
index 00000000..b9458efe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_boot.h
@@ -0,0 +1,172 @@
+/**
+  ******************************************************************************
+  * @file    sfu_boot.h
+  * @author  MCD Application Team
+  * @brief   Header the Secure Boot module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_BOOT_H
+#define SFU_BOOT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/**
+  * @brief  SB Flow Control : Initial value
+  */
+#define FLOW_CTRL_INIT_VALUE 0x00005776U         /*!< Init value definition */
+
+/**
+  * @brief  SB Flow Control : Steps definition
+  */
+
+#define FLOW_STEP_C2BOOT 0x00006787U             /*!< Step C2OPT and SBRV value */
+
+#define FLOW_STEP_UBE 0x00006787U                /*!< Step UBE value */
+
+#ifdef  SFU_WRP_PROTECT_ENABLE
+#define FLOW_STEP_WRP 0x0002cccdU                /*!< Step WRP value */
+#else
+#define FLOW_STEP_WRP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef  SFU_RDP_PROTECT_ENABLE
+#define FLOW_STEP_RDP 0x0000e3dcU                /*!< Step RDP value */
+#else
+#define FLOW_STEP_RDP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_RDP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+#define FLOW_STEP_C2_DDS 0x00003befU             /*!< Step DDS value */
+#else
+#define FLOW_STEP_C2_DDS 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+#define FLOW_STEP_SEC_MEM 0x0000fdc2U            /*!< Step SECURE MEMORY value */
+#else
+#define FLOW_STEP_SEC_MEM 0x00000000U            /*!< No effect on control flow */
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+#ifdef  SFU_TAMPER_PROTECT_ENABLE
+#define FLOW_STEP_TAMPER 0x00012cd3U             /*!< Step TAMPER value */
+#else
+#define FLOW_STEP_TAMPER 0x00000000U             /*!< No effect on control flow */
+#endif /* SFU_TAMPER_PROTECT_ENABLE */
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+#define FLOW_STEP_MPU 0x000132cdU                /*!< Step MPU value */
+#else
+#define FLOW_STEP_MPU 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef  SFU_FWALL_PROTECT_ENABLE
+#define FLOW_STEP_FWALL 0x00014aabU              /*!< Step FWALL value */
+#else
+#define FLOW_STEP_FWALL 0x00000000U              /*!< No effect on control flow */
+#endif /* SFU_FWALL_PROTECT_ENABLE */
+
+#ifdef  SFU_DMA_PROTECT_ENABLE
+#define FLOW_STEP_DMA 0x000154b5U                /*!< Step DMA value */
+#else
+#define FLOW_STEP_DMA 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+#ifdef  SFU_IWDG_PROTECT_ENABLE
+#define FLOW_STEP_IWDG 0x000165baU               /*!< Step IWDG value */
+#else
+#define FLOW_STEP_IWDG 0x00000000U               /*!< No effect on control flow */
+#endif /* SFU_IWDG_PROTECT_ENABLE */
+
+#ifdef  SFU_DAP_PROTECT_ENABLE
+#define FLOW_STEP_DAP 0x00017ba4U                /*!< Step DAP value */
+#else
+#define FLOW_STEP_DAP 0x00000000U                /*!< No effect on control flow */
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+/**
+  * @brief  SB Flow Control : Control values static protections
+  */
+#define FLOW_CTRL_C2BOOT (FLOW_CTRL_INIT_VALUE ^ FLOW_STEP_C2BOOT)
+#define FLOW_CTRL_UBE (FLOW_CTRL_C2BOOT ^ FLOW_STEP_UBE)
+#define FLOW_CTRL_WRP (FLOW_CTRL_UBE ^ FLOW_STEP_WRP)
+#define FLOW_CTRL_C2_DDS (FLOW_CTRL_WRP ^ FLOW_STEP_C2_DDS)
+#define FLOW_CTRL_SEC_MEM (FLOW_CTRL_C2_DDS ^ FLOW_STEP_SEC_MEM)
+#define FLOW_CTRL_RDP (FLOW_CTRL_SEC_MEM ^ FLOW_STEP_RDP)
+#define FLOW_CTRL_STATIC_PROTECT FLOW_CTRL_RDP
+
+/**
+  * @brief  SB Flow Control : Control values runtime protections
+  */
+#define FLOW_CTRL_MPU (FLOW_CTRL_STATIC_PROTECT ^ FLOW_STEP_MPU)
+#define FLOW_CTRL_FWALL (FLOW_CTRL_MPU ^ FLOW_STEP_FWALL)
+#define FLOW_CTRL_DMA (FLOW_CTRL_FWALL ^ FLOW_STEP_DMA)
+#define FLOW_CTRL_IWDG (FLOW_CTRL_DMA ^ FLOW_STEP_IWDG)
+#define FLOW_CTRL_DAP (FLOW_CTRL_IWDG ^ FLOW_STEP_DAP)
+#define FLOW_CTRL_TAMPER (FLOW_CTRL_DAP ^ FLOW_STEP_TAMPER)
+#define FLOW_CTRL_RUNTIME_PROTECT FLOW_CTRL_TAMPER
+
+/**
+  * @brief  SB Flow Control : Exported macro
+  */
+#if defined(MAIN_C)
+uint32_t uFlowProtectValue = FLOW_CTRL_INIT_VALUE;
+uint32_t uFlowCryptoValue = FLOW_CTRL_INIT_VALUE;
+#else
+extern uint32_t uFlowProtectValue;
+extern uint32_t uFlowCryptoValue;
+#endif /* MAIN_C */
+
+/* Control with STEP operation :
+ * (uFlowValue XOR STEP_VALUE) should be equal to CTRL_VALUE ==> execution stopped if failed !
+ */
+#define FLOW_CONTROL_STEP(C,B,A) \
+  do{ \
+    (C) ^= (B);\
+    if ((C) != (A))\
+      SFU_EXCPT_Security_Error();\
+  }while(0)
+
+/** Control without STEP operation :
+  * uFlowValue should be equal to CTRL_VALUE ==> execution stopped if failed !
+  */
+#define FLOW_CONTROL_CHECK(B,A) \
+  do{ \
+    if ((B) != (A))\
+    { \
+      SFU_EXCPT_Security_Error();\
+    } \
+  }while(0)
+
+/** Control flow initialization
+  */
+#define FLOW_CONTROL_INIT(B,A) \
+  do{ \
+    (B) = (A);\
+  }while(0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_BOOT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
new file mode 100644
index 00000000..e738ec01
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h
@@ -0,0 +1,227 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Firmware Update security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_LOW_LEVEL_SECURITY_H
+#define SFU_LOW_LEVEL_SECURITY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+
+/*!< Bank 1, Area A  used to protect Vector Table */
+#define SFU_C2_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAA)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C2_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_ROM_ADDR_START - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C2_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_ROM_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Bank 1, Area B  used to protect Vector Table */
+#define SFU_C1_PROTECT_WRP_AREA            (OB_WRPAREA_BANK1_AREAB)
+
+/*!< First page including the Vector Table: 0 based */
+#define SFU_C1_PROTECT_WRP_PAGE_START      ((uint32_t)((SFU_C1_BOOT_BASE_ADDR - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/*!< Last page: (code_size-1)/page_size because the page
+     indexes start from 0 */
+#define SFU_C1_PROTECT_WRP_PAGE_END        ((uint32_t)((SFU_C1_AREA_ADDR_END - FLASH_BASE) / FLASH_PAGE_SIZE))
+
+/**
+  * @brief The regions can overlap, and can be nested. The region 7 has the highest priority
+  *    and the region 0 has the lowest one and this governs how overlapping the regions behave.
+  *    The priorities are fixed, and cannot be changed.
+  */
+
+
+
+
+#define SFU_PROTECT_MPU_MAX_NB_SUBREG           (8U)
+
+/**
+  * @brief Region 0 - The Aliases Region and all User Flash & internal RAM. When executing inside SB/SFU by default all
+  *                   the Aliases and all the User Flash (used for UserApp1 and UserApp2) area must not be executable,
+  *                   but used only to read and write the downloaded code RAM is also not executable.
+  *                   From this full Area we'll enable the Execution permission only on the SB/SFU Flash Area.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_AREA_USER_RGNV  MPU_REGION_NUMBER0
+#define SFU_PROTECT_MPU_AREA_USER_START ((uint32_t)0x00000000U)
+#define SFU_PROTECT_MPU_AREA_USER_SIZE  MPU_REGION_SIZE_1GB  /*!< up to 0x3FFFFFFF */
+#define SFU_PROTECT_MPU_AREA_USER_SREG  0x00U      /*!< All subregions activated */
+#define SFU_PROTECT_MPU_AREA_USER_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_AREA_USER_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_AREA_USER_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_AREA_USER_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_AREA_USER_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * @brief Region 1 - Enable the read/write operations for full peripheral area (without bit banding region) in
+  *                   unprivileged mode.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_PERIPH_1_RGNV  MPU_REGION_NUMBER1
+#define SFU_PROTECT_MPU_PERIPH_1_START PERIPH_BASE         /*!< Peripheral memory area */
+#define SFU_PROTECT_MPU_PERIPH_1_SIZE  MPU_REGION_SIZE_512MB
+#define SFU_PROTECT_MPU_PERIPH_1_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_PERIPH_1_PERM  MPU_REGION_FULL_ACCESS
+#define SFU_PROTECT_MPU_PERIPH_1_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_PERIPH_1_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_PERIPH_1_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_PERIPH_1_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 2 - Enable the execution for SB Full area in unprivileged mode.
+  *                   Read only capability configured
+  *                   from 0x08000000 ==> 0x080027FF (10 Kbytes)
+  */
+#define SFU_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER2
+#define SFU_PROTECT_MPU_FLASHEXE_START M4_SB_REGION_ROM_START
+#define SFU_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_16KB
+#define SFU_PROTECT_MPU_FLASHEXE_SREG  0xE0U    /*!< 16 Kbytes / 8 * 5 ==> 10 Kbytes */
+#define SFU_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO
+#define SFU_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define SFU_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 3 - Forbid all access to the active slot.
+  *                   From 0x08003000 ==> 0x08003FFF (4 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_RGNV  MPU_REGION_NUMBER3
+#define SFU_PROTECT_MPU_APP_FLASHEXE_START SLOT_ACTIVE_2_START
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SIZE  MPU_REGION_SIZE_4KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Forbid all access to the active slot.
+  *                   In addition to region 3, from 0x08004000 ==> 0x0801BFFF (96 kbytes)
+  */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START FLASH_BASE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_128KB
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG  0x81U    /*!< 128 Kbytes / 8 * 6 ==> 96 Kbytes */
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM  MPU_REGION_NO_ACCESS
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 5 - Enable the read operation for SBSFU synchronization flag.
+  *                   Execution capability disabled
+  */
+#define SFU_PROTECT_MPU_SRAM_FLAG_RGNV  MPU_REGION_NUMBER5
+#define SFU_PROTECT_MPU_SRAM_FLAG_START M4_M0PLUS_FLAG_RAM_START /*!< SBSFU synchronization flag */
+#define SFU_PROTECT_MPU_SRAM_FLAG_SIZE  MPU_REGION_SIZE_32B
+#define SFU_PROTECT_MPU_SRAM_FLAG_SREG  0x00U                /*!< All subregions activated */
+#define SFU_PROTECT_MPU_SRAM_FLAG_PERM  MPU_REGION_PRIV_RO_URO
+#define SFU_PROTECT_MPU_SRAM_FLAG_EXECV MPU_INSTRUCTION_ACCESS_DISABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_TEXV  MPU_TEX_LEVEL0
+#define SFU_PROTECT_MPU_SRAM_FLAG_B     MPU_ACCESS_NOT_BUFFERABLE
+#define SFU_PROTECT_MPU_SRAM_FLAG_C     MPU_ACCESS_CACHEABLE
+
+/**
+  * MPU configuration for UserApp execution
+  * =======================================
+  * Reconfiguration of existing regions (useless during UserApp execution)
+  * MPU constraint = Region base address should be aligned on Region size
+  */
+
+/**
+  * @brief Region 3 - Enable the execution for the active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   from 0x08003000 ==> 0x08003FFF (4 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_RGNV  MPU_REGION_NUMBER3
+#define APP_PROTECT_MPU_FLASHEXE_START SLOT_ACTIVE_2_START
+#define APP_PROTECT_MPU_FLASHEXE_SIZE  MPU_REGION_SIZE_4KB
+#define APP_PROTECT_MPU_FLASHEXE_SREG  0x00U               /*!< All subregions activated */
+#define APP_PROTECT_MPU_FLASHEXE_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_C     MPU_ACCESS_NOT_CACHEABLE
+
+/**
+  * @brief Region 4 - Enable the execution for active slot in unprivileged mode.
+  *                   Read only capability configured
+  *                   In addition to region 3, from 0x08004000 ==> 0x0801BFFF (96 kbytes)
+  */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV  MPU_REGION_NUMBER4
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_START FLASH_BASE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE  MPU_REGION_SIZE_128KB
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG  0x81U    /*!< 128 Kbytes / 8 * 6 ==> 80 Kbytes */
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM  MPU_REGION_PRIV_RO_URO
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV MPU_INSTRUCTION_ACCESS_ENABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV  MPU_TEX_LEVEL0
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_B     MPU_ACCESS_BUFFERABLE
+#define APP_PROTECT_MPU_FLASHEXE_ADJUST_C     MPU_ACCESS_NOT_CACHEABLE
+
+
+#define SFU_DBG_PORT            GPIOA
+#define SFU_DBG_CLK_ENABLE()    __HAL_RCC_GPIOA_CLK_ENABLE()
+#define SFU_DBG_SWDIO_PIN       GPIO_PIN_13
+#define SFU_DBG_SWCLK_PIN       GPIO_PIN_14
+
+#define SFU_PROTECTIONS_NONE                 ((uint32_t)0x00000000U)   /*!< Protection configuration unchanged */
+#define SFU_STATIC_PROTECTION_WRP            ((uint32_t)0x00000002U)   /*!< Constants section in Flash. */
+#define SFU_RUNTIME_PROTECTION_MPU           ((uint32_t)0x00000100U)   /*!< Shared Info section in Flash */
+#define SFU_RUNTIME_PROTECTION_DAP           ((uint32_t)0x00000800U)   /*!< Debug Access Port control */
+#define SFU_RUNTIME_PROTECTION_DMA           ((uint32_t)0x00001000U)   /*!< DMA protection, disable DMAs */
+
+#define SFU_STATIC_PROTECTION_ALL           (SFU_STATIC_PROTECTION_WRP)
+/*!< All the static protections */
+
+#define SFU_RUNTIME_PROTECTION_ALL          (SFU_RUNTIME_PROTECTION_MPU  | \
+                                             SFU_RUNTIME_PROTECTION_IWDG | SFU_RUNTIME_PROTECTION_DAP  | \
+                                             SFU_RUNTIME_PROTECTION_DMA )
+/*!< All the run-time protections */
+
+#define SFU_INITIAL_CONFIGURATION           (0x00)     /*!< Initial configuration */
+#define SFU_SECOND_CONFIGURATION            (0x01)     /*!< Second configuration */
+#define SFU_THIRD_CONFIGURATION             (0x02)     /*!< Third configuration */
+
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyStaticProtections(void);
+SFU_ErrorStatus    SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep);
+#ifdef SFU_MPU_PROTECT_ENABLE
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU(uint8_t uStep);
+SFU_ErrorStatus    SFU_LL_SECU_SetProtectionMPU_UserApp(void);
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_LOW_LEVEL_SECURITY_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..8fff5bd0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+/* #define HAL_CRYP_MODULE_ENABLED */
+/* #define HAL_DAC_MODULE_ENABLED */
+#define HAL_GTZC_MODULE_ENABLED
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+#define HAL_IWDG_MODULE_ENABLED
+/* #define HAL_LPTIM_MODULE_ENABLED */
+/* #define HAL_PKA_MODULE_ENABLED */
+/* #define HAL_RNG_MODULE_ENABLED */
+#define HAL_RTC_MODULE_ENABLED
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..4a4b906b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h
@@ -0,0 +1,70 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @author  MCD Application Team
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_IT_H
+#define STM32WLxx_IT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..0af7b23e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,76 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c
new file mode 100644
index 00000000..8c7bdaaf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/main.c
@@ -0,0 +1,307 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    main.c
+  * @author  MCD Application Team
+  * @brief   Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+#define MAIN_C
+
+#include "sfu_fwimg_regions.h"
+#include "sfu_low_level_security.h"
+#include "sfu_boot.h"
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+  uint32_t jump_address ;
+  typedef void (*Function_Pointer)(void);
+  Function_Pointer  p_jump_to_function;
+  __IO uint32_t *pSbsfuFlag = (__IO uint32_t *)CM4_SBFU_BOOT_FLAG_ADDRESS;
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+  /* LED Init*/
+  BSP_LED_Init(LED_RED);
+
+  /* Reset the SRAM1 flag */
+  *pSbsfuFlag = SBSFU_NOT_BOOTED;
+
+  /* Configure the security features */
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_INITIAL_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  /* Boot CPU2 */
+  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
+
+  /* Wait for the flag */
+  while (*pSbsfuFlag == SBSFU_NOT_BOOTED)
+  {
+    BSP_LED_Toggle(LED_RED);
+    HAL_Delay(500U);
+  }
+  BSP_LED_Off(LED_RED);
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  /* USER CODE BEGIN 2 */
+
+  /* Check the security features once CPU2 has booted */
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+  FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+  if (SFU_BOOT_CheckApplySecurityProtections(SFU_SECOND_CONFIGURATION) != SFU_SUCCESS)
+  {
+    SFU_EXCPT_Security_Error();
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+
+  if (*pSbsfuFlag == SBSFU_BOOTED)
+  {
+
+    /* Check the security features before jumping in the user application CPU2 */
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+    FLOW_CONTROL_INIT(uFlowProtectValue, FLOW_CTRL_INIT_VALUE);
+    if (SFU_BOOT_CheckApplySecurityProtections(SFU_THIRD_CONFIGURATION) != SFU_SUCCESS)
+    {
+      SFU_EXCPT_Security_Error();
+    }
+    FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+#if defined(SFU_MPU_USERAPP_ACTIVATION)
+    SFU_LL_SECU_SetProtectionMPU_UserApp();
+#else
+    HAL_MPU_Disable();
+#endif /* SFU_MPU_USERAPP_ACTIVATION */
+
+    jump_address = *(__IO uint32_t *)((SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET + 4));
+    /* Jump to user application */
+    p_jump_to_function = (Function_Pointer) jump_address;
+    /* Initialize user application's Stack Pointer */
+    __set_MSP(*(__IO uint32_t *)(SLOT_ACTIVE_2_START + SFU_IMG_IMAGE_OFFSET));
+
+    /* JUMP into User App */
+    p_jump_to_function();
+  }
+
+  /* We shouldn't reach this point */
+  SFU_EXCPT_Security_Error();
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE BEGIN 3 */
+
+    /* USER CODE END 3 */
+  }
+  /* USER CODE END WHILE */
+}
+
+/**
+  * @brief  System Clock Configuration
+  *         The system Clock is configured as follow :
+  *            System Clock source            = PLL (HSI)
+  *            SYSCLK(Hz)                     = 48000000
+  *            HCLK(Hz)                       = 48000000
+  *            HCLK1 Prescaler                = 1
+  *            HCKL2 Prescaler                = 1
+  *            HCKL3 Prescaler                = 1
+  *            APB1 Prescaler                 = 1
+  *            APB2 Prescaler                 = 1
+  *            HSI Frequency(Hz)              = 16000000
+  *            PLL_M                          = 2 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 30 //not considered on FPGA as VCO output is fixed at 240Mhz
+  *            PLL_N                          = 20 //Allow to fix VCO to 160Mhz, and reach Sysclk Max Frqe = 32MHz
+  *                                                  with PLL_DIV5
+  *            PLL_P                          = 5
+  *            PLL_Q                          = 5
+  *            PLL_R                          = 5
+  *            Flash Latency(WS)              = 2
+  * @param  None
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_ClkInitTypeDef RCC_ClkInitStruct;
+  RCC_OscInitTypeDef RCC_OscInitStruct;
+  /* Activate PLL with HSI as source */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI |  RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.HSICalibrationValue = 70;
+  RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+  RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV2;
+  RCC_OscInitStruct.PLL.PLLN = 20;
+  RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV5;
+  RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV5;
+  RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV5;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+
+  /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
+     clocks dividers */
+  RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2\
+                                 | RCC_CLOCKTYPE_HCLK2 | RCC_CLOCKTYPE_HCLK3);
+  RCC_ClkInitStruct.SYSCLKSource   = RCC_SYSCLKSOURCE_PLLCLK;
+  RCC_ClkInitStruct.AHBCLKDivider  = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    /* Initialization Error */
+    while (1);
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/**
+  * @brief  Check (and Apply when possible) the security/safety/integrity protections.
+  *         The "Apply" part depends on @ref SECBOOT_OB_DEV_MODE and @ref SFU_PROTECT_RDP_LEVEL.
+  * @param  None
+  * @note   This operation should be done as soon as possible after a reboot.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_BOOT_CheckApplySecurityProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status;
+
+  /* Apply Static protections involving Option Bytes */
+  e_ret_status = SFU_LL_SECU_CheckApplyStaticProtections();
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_STATIC_PROTECT);
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Apply runtime protections needed to be enabled after each Reset */
+    e_ret_status = SFU_LL_SECU_CheckApplyRuntimeProtections(uStep);
+  }
+  FLOW_CONTROL_CHECK(uFlowProtectValue, FLOW_CTRL_RUNTIME_PROTECT);
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Stop in case of security error
+  * @retval None
+  */
+void SFU_EXCPT_Security_Error(void)
+{
+  HAL_Delay(1000);
+  /* This is the last operation executed. Force a System Reset. */
+  NVIC_SystemReset();
+}
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+    ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  /* Security issue : execution stopped ! */
+  SFU_EXCPT_Security_Error();
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
new file mode 100644
index 00000000..af5949de
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/sfu_low_level_security.c
@@ -0,0 +1,987 @@
+/**
+  ******************************************************************************
+  * @file    sfu_low_level_security.c
+  * @author  MCD Application Team
+  * @brief   SB Security Low Level Interface module
+  *          This file provides set of firmware functions to manage SB security
+  *          low level interface.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sfu_low_level_security.h"
+#include "sfu_boot.h"
+
+#ifndef  SFU_WRP_PROTECT_ENABLE
+#warning "SFU_WRP_PROTECT_DISABLED"
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifndef  SFU_MPU_PROTECT_ENABLE
+#warning "SFU_MPU_PROTECT_DISABLED"
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifndef  SFU_C2_DDS_PROTECT_ENABLE
+#warning "SFU_C2_DDS_PROTECT_DISABLED"
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifndef  SFU_DAP_PROTECT_ENABLE
+#warning "SFU_DAP_PROTECT_DISABLED"
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+#ifndef  SFU_DMA_PROTECT_ENABLE
+#warning "SFU_DMA_PROTECT_DISABLED"
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+
+#ifndef  SFU_SECURE_USER_PROTECT_ENABLE
+#warning "SFU_SECURE_USER_PROTECT_DISABLED"
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef enum
+{
+  SFU_FALSE = 0U,
+  SFU_TRUE = !SFU_FALSE
+} SFU_BoolTypeDef;
+
+typedef struct
+{
+  uint8_t                Number;            /*!< Specifies the number of the region to protect. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Number */
+  uint32_t               BaseAddress;       /*!< Specifies the base address of the region to protect. */
+  uint8_t                Size;              /*!< Specifies the size of the region to protect. */
+  uint8_t                AccessPermission;  /*!< Specifies the region access permission type. This parameter can be a
+                                                 value of CORTEX_MPU_Region_Permission_Attributes */
+  uint8_t                DisableExec;       /*!< Specifies the instruction access status. This parameter can be a value
+                                                 of  CORTEX_MPU_Instruction_Access */
+  uint8_t                SubRegionDisable;  /*!< Specifies the sub region field (region is divided in 8 slices) when bit
+                                                 is 1 region sub region is disabled */
+  uint8_t                Tex;               /*!< Specifies the tex value  */
+  uint8_t                Cacheable;         /*!< Specifies the cacheable value  */
+  uint8_t                Bufferable;        /*!< Specifies the cacheable value  */
+} SFU_MPU_InitTypeDef;
+
+typedef uint32_t      SFU_ProtectionTypeDef;  /*!<   SFU HAL IF Protection Type Def*/
+
+/* Private variables ---------------------------------------------------------*/
+
+
+#ifdef  SFU_MPU_PROTECT_ENABLE
+static SFU_MPU_InitTypeDef MpuAreas[] =
+{
+  /* Aliases Region and all User Flash & internal RAM */
+  {
+    SFU_PROTECT_MPU_AREA_USER_RGNV, SFU_PROTECT_MPU_AREA_USER_START, SFU_PROTECT_MPU_AREA_USER_SIZE,
+    SFU_PROTECT_MPU_AREA_USER_PERM, SFU_PROTECT_MPU_AREA_USER_EXECV, SFU_PROTECT_MPU_AREA_USER_SREG,
+    SFU_PROTECT_MPU_AREA_USER_TEXV, SFU_PROTECT_MPU_AREA_USER_C,     SFU_PROTECT_MPU_AREA_USER_B
+  },
+  /* SRAM flag access */
+  {
+    SFU_PROTECT_MPU_SRAM_FLAG_RGNV, SFU_PROTECT_MPU_SRAM_FLAG_START, SFU_PROTECT_MPU_SRAM_FLAG_SIZE,
+    SFU_PROTECT_MPU_SRAM_FLAG_PERM, SFU_PROTECT_MPU_SRAM_FLAG_EXECV, SFU_PROTECT_MPU_SRAM_FLAG_SREG,
+    SFU_PROTECT_MPU_SRAM_FLAG_TEXV, SFU_PROTECT_MPU_SRAM_FLAG_C, SFU_PROTECT_MPU_SRAM_FLAG_B
+  },
+  /*  Flash execution */
+  {
+    SFU_PROTECT_MPU_FLASHEXE_RGNV, SFU_PROTECT_MPU_FLASHEXE_START, SFU_PROTECT_MPU_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_FLASHEXE_PERM, SFU_PROTECT_MPU_FLASHEXE_EXECV, SFU_PROTECT_MPU_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_FLASHEXE_TEXV, SFU_PROTECT_MPU_FLASHEXE_C, SFU_PROTECT_MPU_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_START, SFU_PROTECT_MPU_APP_FLASHEXE_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_C, SFU_PROTECT_MPU_APP_FLASHEXE_B
+  },
+  /*  App Access */
+  {
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_RGNV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_START, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SIZE,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_PERM, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_EXECV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_SREG,
+    SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_TEXV, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_C, SFU_PROTECT_MPU_APP_FLASHEXE_ADJUST_B
+  },
+  /*  peripheral  */
+  {
+    SFU_PROTECT_MPU_PERIPH_1_RGNV, SFU_PROTECT_MPU_PERIPH_1_START, SFU_PROTECT_MPU_PERIPH_1_SIZE,
+    SFU_PROTECT_MPU_PERIPH_1_PERM, SFU_PROTECT_MPU_PERIPH_1_EXECV, SFU_PROTECT_MPU_PERIPH_1_SREG,
+    SFU_PROTECT_MPU_PERIPH_1_TEXV, SFU_PROTECT_MPU_PERIPH_1_C, SFU_PROTECT_MPU_PERIPH_1_B
+  }
+};
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Private function prototypes -----------------------------------------------*/
+static SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                          SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                         SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                      FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                                    FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                    SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void);
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void);
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+static SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes);
+static SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                        SFU_BoolTypeDef *pbIsProtectionToBeApplied);
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/* Functions Definition : helper ---------------------------------------------*/
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Check MPU configuration
+  * @param  MPU_InitStruct Configuration to be checked
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+static SFU_ErrorStatus MPU_CheckConfig(MPU_Region_InitTypeDef *pMPUInitStruct)
+{
+  uint32_t mpu_rasr = 0UL;
+
+  /* Set the Region number */
+  MPU->RNR = pMPUInitStruct->Number;
+
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->DisableExec        << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->AccessPermission   << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->TypeExtField       << MPU_RASR_TEX_Pos) & MPU_RASR_TEX_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsShareable        << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsCacheable        << MPU_RASR_C_Pos) & MPU_RASR_C_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->IsBufferable       << MPU_RASR_B_Pos) & MPU_RASR_B_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->SubRegionDisable   << MPU_RASR_SRD_Pos) & MPU_RASR_SRD_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Size               << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+  mpu_rasr |= (((uint32_t)pMPUInitStruct->Enable             << MPU_RASR_ENABLE_Pos) & MPU_RASR_ENABLE_Msk);
+
+  if (((MPU->RBAR & MPU_RBAR_ADDR_Msk) == pMPUInitStruct->BaseAddress) && (MPU->RASR == mpu_rasr))
+  {
+    return SFU_SUCCESS;
+  }
+  else
+  {
+    return SFU_ERROR;
+  }
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+/* Functions Definition ------------------------------------------------------*/
+
+/**
+  * @brief  Check and if not applied apply the Static security  protections to
+  *         all the SfuEn Sections in Flash: RDP, WRP. Static security protections
+  *         those protections not impacted by a Reset. They are set using the Option Bytes
+  *         When the device is locked (RDP Level2), these protections cannot be changed anymore
+  * @param  None
+  * @note   By default, the best security protections are applied to the different
+  *         flash sections in order to maximize the security level for the specific MCU.
+  * @retval uint32_t CRC (returned value is the combination of all the applied protections.
+  *         If different from SFU_STD_PROTECTION_ALL, 1 or more protections cannot be applied)
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyStaticProtections(void)
+{
+  FLASH_OBProgramInitTypeDef flash_option_bytes;
+  FLASH_OBProgramInitTypeDef sfu_flash_option_bytes;
+  SFU_BoolTypeDef is_protection_to_be_applied = SFU_FALSE;
+  SFU_BoolTypeDef is_current_protection_to_be_applied = SFU_FALSE;
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  HAL_FLASH_Unlock();
+
+  /* Clear OPTVERR bit set on virgin samples */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  /* Unlock the Options Bytes *************************************************/
+  HAL_FLASH_OB_Unlock();
+
+  /* Get Option Bytes status for WRP AREA  **********/
+  flash_option_bytes.WRPArea     = SFU_C1_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&flash_option_bytes);
+  sfu_flash_option_bytes.WRPArea = SFU_C2_PROTECT_WRP_AREA;
+  HAL_FLASHEx_OBGetConfig(&sfu_flash_option_bytes);
+
+  /* Check/Apply RDP_Level 1. This is the minimum protection allowed */
+  /* if RDP_Level 2 is already applied it's not possible to modify the OptionBytes anymore */
+  if (flash_option_bytes.RDPLevel == OB_RDP_LEVEL_2)
+  {
+
+    /* Sanity check of the (enabled) static protections */
+    if (SFU_LL_SECU_CheckC2BootConfiguration(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+    if (SFU_LL_SECU_CheckProtectionBootLock(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionDDS(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (SFU_LL_SECU_CheckProtectionSecUser(&flash_option_bytes) != SFU_SUCCESS)
+    {
+      /* Security issue : execution stopped ! */
+      SFU_EXCPT_Security_Error();
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    /*RDP level 2 ==> Flow control by-passed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_RDP, FLOW_CTRL_RDP);
+  }
+  else
+  {
+    /* Check/Set C2 Boot configuration **********************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetC2BootConfiguration(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* C2OPT and SBRV cannot be written if C2BOOT_LOCK = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+
+    /* Check/Set Boot Lock configuration *******************************************/
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionBootLock(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+
+    /* Check/Apply WRP ********************************************************/
+#ifdef SFU_WRP_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionWRP(&flash_option_bytes, &sfu_flash_option_bytes,
+                                                  &is_protection_to_be_applied);
+    }
+#endif /* SFU_WRP_PROTECT_ENABLE */
+
+    /* Check/Apply C2 DDS *****************************************************/
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      is_current_protection_to_be_applied = SFU_FALSE;
+      e_ret_status = SFU_LL_SECU_SetProtectionDDS(&flash_option_bytes, &is_current_protection_to_be_applied);
+      if ((e_ret_status == SFU_SUCCESS) && (is_current_protection_to_be_applied))
+      {
+        /* Generate a first system Reset to reload the new option byte values *************/
+        /* DDS cannot be written if ESE = 1 */
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+#endif  /* SFU_C2_DDS_PROTECT_ENABLE */
+
+    /* Check/Apply Secure User Memory *****************************************/
+#ifdef SFU_SECURE_USER_PROTECT_ENABLE
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      e_ret_status = SFU_LL_SECU_SetProtectionSecUser(&flash_option_bytes, &is_protection_to_be_applied);
+    }
+#endif  /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+    if (e_ret_status == SFU_SUCCESS)
+    {
+      if (is_protection_to_be_applied)
+      {
+        /* Generate System Reset to reload the new option byte values *************/
+        /* WARNING: This means that if a protection can't be set, there will be a reset loop! */
+        HAL_FLASH_OB_Launch();
+      }
+    }
+  }
+
+
+  /* Lock the Options Bytes ***************************************************/
+  HAL_FLASH_OB_Lock();
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  HAL_FLASH_Lock();
+
+  /* If it was not possible to apply one of the above mandatory protections, the
+  Option bytes have not been reloaded. Return the error status in order for the
+  caller function to take the right actions */
+  return e_ret_status;
+
+}
+
+
+/**
+  * @brief  Apply Runtime security  protections.
+  *         Runtime security protections have to be re-configured at each Reset.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckApplyRuntimeProtections(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  SFU_ProtectionTypeDef runtime_protection = SFU_PROTECTIONS_NONE;
+  SFU_ProtectionTypeDef expected_runtime_protection = SFU_PROTECTIONS_NONE;
+
+  /* Depending on compilation switches, prevent compilation warning */
+  UNUSED(runtime_protection);
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  if (SFU_LL_SECU_SetProtectionMPU(uStep) == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_MPU;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+
+  /* Check/Apply disable DMAs  ************************************************/
+#ifdef SFU_DMA_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  if (SFU_LL_SECU_SetProtectionDMA() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DMA;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DMA_PROTECT_ENABLE */
+
+  /* Check/Apply  DAP *********************************************************/
+#ifdef SFU_DAP_PROTECT_ENABLE
+  expected_runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  if (SFU_LL_SECU_SetProtectionDAP() == SFU_SUCCESS)
+  {
+    runtime_protection |= SFU_RUNTIME_PROTECTION_DAP;
+  }
+  else
+  {
+    /* When a protection cannot be set then SFU_ERROR is returned */
+    e_ret_status = SFU_ERROR;
+  }
+#endif /* SFU_DAP_PROTECT_ENABLE */
+
+  if (runtime_protection != expected_runtime_protection)
+  {
+    e_ret_status = SFU_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check C2 boot configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2OPT and SBRV ***********************************************/
+  if ((psFlashOptionBytes->C2BootRegion == OB_C2_BOOT_FROM_FLASH)&&
+      (psFlashOptionBytes->C2SecureBootVectAddr == SFU_C2_BOOT_BASE_ADDR))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply C2 boot configuration.
+  * @note   C2OPT and SBRV can only be accessed by software when C2BOOT_LOCK = 0.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetC2BootConfiguration(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                   SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckC2BootConfiguration(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_BOOT_VECT;
+    psFlashOptionBytes->C2BootRegion            = OB_C2_BOOT_FROM_FLASH;
+    psFlashOptionBytes->C2SecureBootVectAddr    = SFU_C2_BOOT_BASE_ADDR;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2BOOT, FLOW_CTRL_C2BOOT);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Check Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if Flash configuration is correct, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply C2BOOT_LOCK, BOOT_LOCK ***************************************/
+  if (((psFlashOptionBytes->UserConfig & FLASH_OPTR_BOOT_LOCK) == OB_BOOT_LOCK_ENABLE)&&
+      ((psFlashOptionBytes->UserConfig & FLASH_OPTR_C2BOOT_LOCK) == OB_C2BOOT_LOCK_ENABLE))
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+  }
+  return e_ret_status;
+
+}
+
+/**
+  * @brief  Set Boot Lock configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionBootLock(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                  SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check Boot Lock configuration */
+  if (SFU_LL_SECU_CheckProtectionBootLock(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psFlashOptionBytes->OptionType      = OPTIONBYTE_USER;
+    psFlashOptionBytes->UserConfig      &= ~(OB_BOOT_LOCK_ENABLE | OB_C2BOOT_LOCK_ENABLE);
+    psFlashOptionBytes->UserConfig      |= OB_BOOT_LOCK_ENABLE;
+    psFlashOptionBytes->UserConfig      |= OB_C2BOOT_LOCK_ENABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_UBE, FLOW_CTRL_UBE);
+    }
+#else
+    /* Boot Configuration issue: booting Main flash through PA14-BOOT0 pin functionality cannot be guaranteed */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+
+#ifdef SFU_WRP_PROTECT_ENABLE
+/**
+  * @brief  Check the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                               FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if ((psSbFlashOptionBytes->WRPStartOffset == SFU_C1_PROTECT_WRP_PAGE_START) ||
+      (psSbFlashOptionBytes->WRPEndOffset   == SFU_C1_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if ((psSfuFlashOptionBytes->WRPStartOffset == SFU_C2_PROTECT_WRP_PAGE_START) ||
+      (psSfuFlashOptionBytes->WRPEndOffset   == SFU_C2_PROTECT_WRP_PAGE_END))
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection applied */
+  }
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply the WRP protection to the specified Area. It includes the SB Vector Table
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionWRP(FLASH_OBProgramInitTypeDef *psSbFlashOptionBytes,
+                                             FLASH_OBProgramInitTypeDef *psSfuFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply WRP **********************************************************/
+  /* The UserApp needs to know this configuration in case it wants to use the same WRP Areas */
+  if (SFU_LL_SECU_CheckProtectionWRP(psSbFlashOptionBytes, psSfuFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS; /*Protection already applied */
+  }
+  else
+  {
+#if defined(SECBOOT_OB_DEV_MODE)
+    psSbFlashOptionBytes->OptionType      = OPTIONBYTE_WRP;
+    psSbFlashOptionBytes->WRPArea         = SFU_C1_PROTECT_WRP_AREA;
+    psSbFlashOptionBytes->WRPStartOffset  = SFU_C1_PROTECT_WRP_PAGE_START;
+    psSbFlashOptionBytes->WRPEndOffset    = SFU_C1_PROTECT_WRP_PAGE_END;
+
+    if (HAL_FLASHEx_OBProgram(psSbFlashOptionBytes) == HAL_OK)
+    {
+      psSfuFlashOptionBytes->OptionType     = OPTIONBYTE_WRP;
+      psSfuFlashOptionBytes->WRPArea        = SFU_C2_PROTECT_WRP_AREA;
+      psSfuFlashOptionBytes->WRPStartOffset = SFU_C2_PROTECT_WRP_PAGE_START;
+      psSfuFlashOptionBytes->WRPEndOffset   = SFU_C2_PROTECT_WRP_PAGE_END;
+
+      if (HAL_FLASHEx_OBProgram(psSfuFlashOptionBytes) == HAL_OK)
+      {
+        *pbIsProtectionToBeApplied |= 1U;
+        e_ret_status = SFU_SUCCESS;
+        /* Execution stopped if flow control failed */
+        FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_WRP, FLOW_CTRL_WRP);
+      }
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /*SFU_WRP_PROTECT_ENABLE*/
+
+#ifdef SFU_C2_DDS_PROTECT_ENABLE
+/**
+  * @brief  Check DDS protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check WRP ****************************************************************/
+  /* Check if the protection is already applied */
+  if (psFlashOptionBytes->C2DebugAccessMode == OB_C2_DEBUG_ACCESS_DISABLE)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief  Apply DDS protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDDS(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                             SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check/Apply DDS **********************************************************/
+  /* Check if the protection is already applied */
+  if (SFU_LL_SECU_CheckProtectionDDS(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_C2_DEBUG_ACCESS;
+
+    psFlashOptionBytes->C2DebugAccessMode = OB_C2_DEBUG_ACCESS_DISABLE;
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_C2_DDS, FLOW_CTRL_C2_DDS);
+    }
+#else
+    /* System Security Configuration failed: Sub-GHz radio SPI security access is incorrect */
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_C2_DDS_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+/**
+  * @brief  Apply MPU protection before executing UserApp
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU_UserApp(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  /*  modify executable region for executing UserAPP*/
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  /*  modify executable region for executing UserAPP */
+  MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+  MPU_InitStruct.Number               = APP_PROTECT_MPU_FLASHEXE_ADJUST_RGNV;
+  MPU_InitStruct.BaseAddress          = APP_PROTECT_MPU_FLASHEXE_ADJUST_START;
+  MPU_InitStruct.Size                 = APP_PROTECT_MPU_FLASHEXE_ADJUST_SIZE;
+  MPU_InitStruct.SubRegionDisable     = APP_PROTECT_MPU_FLASHEXE_ADJUST_SREG;
+  MPU_InitStruct.AccessPermission     = APP_PROTECT_MPU_FLASHEXE_ADJUST_PERM;
+  MPU_InitStruct.DisableExec          = APP_PROTECT_MPU_FLASHEXE_ADJUST_EXECV;
+  MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+  MPU_InitStruct.IsBufferable         = APP_PROTECT_MPU_FLASHEXE_ADJUST_B ;
+  MPU_InitStruct.IsCacheable          = APP_PROTECT_MPU_FLASHEXE_ADJUST_C;
+  MPU_InitStruct.TypeExtField         = APP_PROTECT_MPU_FLASHEXE_ADJUST_TEXV;
+  HAL_MPU_ConfigRegion(&MPU_InitStruct);
+
+  return e_ret_status;
+}
+#endif /* SFU_MPU_PROTECT_ENABLE */
+
+#ifdef SFU_MPU_PROTECT_ENABLE
+
+/**
+  * @brief  Apply MPU protection
+  * @param  uStep Configuration step : SFU_INITIAL_CONFIGURATION, SFU_SECOND_CONFIGURATION, SFU_THIRD_CONFIGURATION
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionMPU(uint8_t uStep)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  uint8_t mpu_region_num = 0U; /* id of the MPU region being configured */
+  MPU_Region_InitTypeDef MPU_InitStruct;
+
+  for (mpu_region_num = 0U; mpu_region_num < (sizeof(MpuAreas) / sizeof(SFU_MPU_InitTypeDef)); mpu_region_num++)
+  {
+    MPU_InitStruct.Enable               = MPU_REGION_ENABLE;
+    MPU_InitStruct.Number               = MpuAreas[mpu_region_num].Number;
+    MPU_InitStruct.BaseAddress          = MpuAreas[mpu_region_num].BaseAddress;
+    MPU_InitStruct.Size                 = MpuAreas[mpu_region_num].Size;
+    MPU_InitStruct.SubRegionDisable     = MpuAreas[mpu_region_num].SubRegionDisable;
+    MPU_InitStruct.AccessPermission     = MpuAreas[mpu_region_num].AccessPermission;
+    MPU_InitStruct.DisableExec          = MpuAreas[mpu_region_num].DisableExec;
+    MPU_InitStruct.IsShareable          = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.IsCacheable          = MpuAreas[mpu_region_num].Cacheable;
+    MPU_InitStruct.IsBufferable         = MpuAreas[mpu_region_num].Bufferable;
+    MPU_InitStruct.TypeExtField         = MpuAreas[mpu_region_num].Tex;
+    if (uStep == SFU_INITIAL_CONFIGURATION)
+    {
+      HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    else
+    {
+      if (MPU_CheckConfig(&MPU_InitStruct) == SFU_ERROR)
+      {
+        return SFU_ERROR;
+      }
+    }
+  }
+
+  if (uStep == SFU_INITIAL_CONFIGURATION)
+  {
+    HAL_MPU_Enable(MPU_HARDFAULT_NMI);
+  }
+  else
+  {
+    if (MPU->CTRL != (MPU_HARDFAULT_NMI | MPU_CTRL_ENABLE_Msk))
+    {
+      return SFU_ERROR;
+    }
+  }
+
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    /* Execution stopped if flow control failed */
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_MPU, FLOW_CTRL_MPU);
+  }
+  return e_ret_status;
+}
+#endif /*SFU_MPU_PROTECT_ENABLE*/
+
+#ifdef SFU_DMA_PROTECT_ENABLE
+/**
+  * @brief  Apply DMA protection
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDMA(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_SUCCESS;
+  /*
+   * In this function we disable the DMA buses in order to avoid that while the SB/SFU is running
+   * some DMA has been already enabled (e.g. through debugger in RDP-1 after reset) in order to access sensitive
+   * information in SRAM, FLASH
+   */
+  /* Disable  DMA1, DMA2 */
+  __HAL_RCC_DMA1_CLK_DISABLE();
+
+  __HAL_RCC_DMA2_CLK_DISABLE();
+
+  __HAL_RCC_DMAMUX1_CLK_DISABLE();
+
+
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DMA, FLOW_CTRL_DMA);
+  return e_ret_status;
+}
+#endif /*SFU_DMA_PROTECT_ENABLE*/
+
+#ifdef SFU_DAP_PROTECT_ENABLE
+/**
+  * @brief  Set DAP protection status, configuring SWCLK and SWDIO GPIO pins.
+  * @param  None
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionDAP(void)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  assert_param(SFU_IS_FUNCTIONAL_STATE(eState));
+
+  /* Enable clock of DBG GPIO port */
+  SFU_DBG_CLK_ENABLE();
+
+  /* Enable the DAP protections, so disable the DAP re-configuring SWCLK and SWDIO GPIO pins */
+  GPIO_InitStruct.Pin = SFU_DBG_SWDIO_PIN | SFU_DBG_SWCLK_PIN;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(SFU_DBG_PORT, &GPIO_InitStruct);
+  e_ret_status = SFU_SUCCESS;
+  /* Execution stopped if flow control failed */
+  FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_DAP, FLOW_CTRL_DAP);
+
+  return e_ret_status;
+}
+#endif /*SFU_DAP_PROTECT_ENABLE*/
+
+#ifdef  SFU_SECURE_USER_PROTECT_ENABLE
+/**
+  * @brief  Check Secure User Memory protection configuration.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SFU_ErrorStatus SFU_LL_SECU_CheckProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Test if Secure Memory size is correctly programmed and unique boot entry activated.
+   */
+  if (psFlashOptionBytes->SecureMode == SFU_SECURE_MODE)
+  {
+    /*
+     * In this example secure area covers:
+     * - the SB_SFU code
+     * - the header of the slot #0
+     */
+    e_ret_status = SFU_SUCCESS;
+
+    if ((psFlashOptionBytes->SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) == OB_SECURE_SYSTEM_AND_FLASH_ENABLE)
+    {
+      if (psFlashOptionBytes->SecureFlashStartAddr != SFU_SECURE_FLASH_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_HIDE_PROTECTION_ENABLE) == OB_SECURE_HIDE_PROTECTION_ENABLE))
+    {
+      if (psFlashOptionBytes->HideProtectionStartAddr != SFU_HIDE_PROTECTION_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM1_ENABLE) == OB_SECURE_SRAM1_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM1StartAddr != SFU_SECURE_SRAM1_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+
+    if ((e_ret_status == SFU_SUCCESS)
+        && ((psFlashOptionBytes->SecureMode & OB_SECURE_SRAM2_ENABLE) == OB_SECURE_SRAM2_ENABLE))
+    {
+      if (psFlashOptionBytes->SecureSRAM2StartAddr != SFU_SECURE_SRAM2_START)
+      {
+        e_ret_status = SFU_ERROR;
+      }
+    }
+  }
+
+  /* Execution stopped if flow control failed */
+  if (e_ret_status == SFU_SUCCESS)
+  {
+    FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+  }
+  return e_ret_status;
+}
+
+
+/**
+  * @brief  Apply Secure User Memory protection.
+  * @param  psFlashOptionBytes: pointer to the Option Bytes structure.
+  * @param  pbIsProtectionToBeApplied: Output parameter to be set as "TRUE" if
+  *         this OptByte has to be modified and immediately reloaded.
+  * @retval If Protection is not set, RSS procedure is called with a System Reset
+  */
+SFU_ErrorStatus SFU_LL_SECU_SetProtectionSecUser(FLASH_OBProgramInitTypeDef *psFlashOptionBytes,
+                                                 SFU_BoolTypeDef *pbIsProtectionToBeApplied)
+{
+  SFU_ErrorStatus e_ret_status = SFU_ERROR;
+
+  /* Check if Secure User Memory is already configured */
+  if (SFU_LL_SECU_CheckProtectionSecUser(psFlashOptionBytes) == SFU_SUCCESS)
+  {
+    e_ret_status = SFU_SUCCESS;
+  }
+  else
+  {
+    /* Apply the proper configuration if we are in development mode */
+#if defined(SECBOOT_OB_DEV_MODE)
+    /* Set the security bit if needed */
+    /* ------------------------------ */
+    psFlashOptionBytes->OptionType = OPTIONBYTE_SECURE_MODE;
+
+    psFlashOptionBytes->SecureFlashStartAddr    = SFU_SECURE_FLASH_START;
+    psFlashOptionBytes->SecureSRAM2StartAddr    = SFU_SECURE_SRAM2_START;
+    /* psFlashOptionBytes->SecureSRAM1StartAddr    = SFU_SECURE_SRAM1_START; */
+    psFlashOptionBytes->HideProtectionStartAddr = SFU_HIDE_PROTECTION_START;
+    psFlashOptionBytes->SecureMode              = SFU_SECURE_MODE;
+
+    if (HAL_FLASHEx_OBProgram(psFlashOptionBytes) == HAL_OK)
+    {
+      *pbIsProtectionToBeApplied |= 1U;
+      e_ret_status = SFU_SUCCESS;
+      /* Execution stopped if flow control failed */
+      FLOW_CONTROL_STEP(uFlowProtectValue, FLOW_STEP_SEC_MEM, FLOW_CTRL_SEC_MEM);
+    }
+#else
+    /* Security issue : execution stopped ! */
+    SFU_EXCPT_Security_Error();
+#endif /* SECBOOT_OB_DEV_MODE */
+  }
+
+  return e_ret_status;
+}
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..0b9986c2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,94 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_msp.c
+  * @author  MCD Application Team
+  * @brief   This file provides code for the MSP Initialization
+  *          and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+  /* CM4 only: Set Interrupt Group Priority */
+  HAL_NVIC_SetPriorityGrouping(NVIC_PRIORITYGROUP_4);
+
+  /* System interrupt init*/
+  /* CM4 only: MemoryManagement_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(MemoryManagement_IRQn, 0U, 0U);
+  /* CM4 only: BusFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(BusFault_IRQn, 0U, 0U);
+  /* CM4 only: UsageFault_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(UsageFault_IRQn, 0U, 0U);
+  /* CM4 only: DebugMonitor_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DebugMonitor_IRQn, 0U, 0U);
+  /* SysTick_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(SysTick_IRQn, 0U, 0U);
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..7a3565e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/CM4/Src/stm32wlxx_it.c
@@ -0,0 +1,198 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @author  MCD Application Team
+  * @brief   Main Interrupt Service Routines.
+  *          This file provides template for all exceptions handler and
+  *          peripherals interrupt service routine.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    NVIC_SystemReset();
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  HAL_IncTick();
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
new file mode 100644
index 00000000..eb92c618
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/app_sfu_common.h
@@ -0,0 +1,109 @@
+/**
+  ******************************************************************************
+  * @file    app_sfu_common.h
+  * @author  MCD Application Team
+  * @brief   This file contains the configuration of SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef APP_SFU_COMMON_H
+#define APP_SFU_COMMON_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/**
+  * Optional Features Software Configuration
+  */
+#define CM4_SBFU_BOOT_FLAG_ADDRESS M4_M0PLUS_FLAG_RAM_START /*!< address of the M4/M0+ synchronization flag (unused RAM) */
+#define SBSFU_NOT_BOOTED           0xFFFF               /*!< M0+ SBSFU hasn't finished its boot */
+#define SBSFU_BOOTED               0xAAAA               /*!< M0+ SBSFU boot is over: the M4 UserApp can be started */
+/* The define below allows disabling all security IPs at once.
+ *
+ * Enabled: all security IPs (WRP, watchdog...) are disabled.
+ * Disabled: the security IPs can be used (if their specific compiler switches are enabled too).
+ *
+ */
+
+/*#define SECBOOT_DISABLE_SECURITY_IPS*/  /*!< Disable all security IPs at once when activated */
+
+#if !defined(SECBOOT_DISABLE_SECURITY_IPS)
+
+/* Uncomment the following defines when in Release mode.
+   In debug mode it can be better to disable some of the following protection
+   for a better Debug experience (WRP, RDP, IWDG, DAP, etc.) */
+
+#define SFU_WRP_PROTECT_ENABLE
+#define SFU_DAP_PROTECT_ENABLE         /*!< WARNING: Be Careful if enabling this protection. Debugger will be disconnected.
+                                            It might be difficult to reconnect the Debugger.*/
+#define SFU_DMA_PROTECT_ENABLE
+#define SFU_C2_DDS_PROTECT_ENABLE      /*!< Static disabling of the CPU2 debug */
+#define SFU_SECURE_USER_PROTECT_ENABLE /*!< Only accessible in Secure access mode,
+                                          the Secure user software is stored in the secure user memory, a configurable
+                                          protected area which is part of the user main memory. */
+
+/*#define SFU_FINAL_SECURE_LOCK_ENABLE */   /*!< WARNING: Should be enabled at the end of product development and test
+                                                 steps.
+                                                 When enabling this lock, Static protections cannot be modified any more
+                                                 and Debug is finally disabled. */
+#endif /* !SECBOOT_DISABLE_SECURITY_IPS */
+
+/**
+  * The define below (SECBOOT_OB_DEV_MODE) determines if the OPTION BYTES should be handled in Development mode or not.
+  * This define is taken into account only if RDP level 2 is not set.
+  * If RDP level 2 is set no modification can be done anyway.
+  *
+  * Enabled: Option Bytes Development Mode enabled.
+  *          SB_SFU uses a "check and apply" strategy when checking the Option Bytes configuration.
+  *          If an OB is not set though it should be then this setting is automatically corrected.
+  *          This applies only as long as RDP level 2 is not set.
+  *
+  * Disabled: Option Bytes Development Mode disabled.
+  *           In this mode the Option Bytes are supposed to be already configured properly when the software starts for
+              the first time.
+  *           SB_SFU checks the Option Bytes configuration but does not correct it.
+  *           If a problem is detected an error message is reported and the execution stops.
+  */
+#define SECBOOT_OB_DEV_MODE
+#if defined(SFU_SECURE_USER_PROTECT_ENABLE)
+#define SFU_SECURE_FLASH_START    SLOT_ACTIVE_1_START              /*!< Secure Flash start address: SFSA[6:0] */
+#define SFU_SECURE_SRAM1_START    0x1F                             /*!< Secure non-Backup SRAM1 start address:
+                                                                        SNBRSA[4:0]. 0x1F configures an entirely
+                                                                        non-secure SRAM1. */
+#define SFU_SECURE_SRAM2_START    SB_REGION_RAM_START              /*!< Secure Backup SRAM2 start address: SBRSA[4:0] */
+#define SFU_HIDE_PROTECTION_START SE_KEY_REGION_ROM_START          /*!< Hide Protection area start address:
+                                                                        HDPSA[6:0] */
+#define SFU_HIDE_PROTECTION_CFG OB_SECURE_HIDE_PROTECTION_ENABLE   /*!< Hide Protection area start address:
+                                                                        HDPSA[6:0] */
+
+/*!< Secure mode activated or deactivated */
+#define SFU_SECURE_MODE           (OB_SECURE_SYSTEM_AND_FLASH_ENABLE | \
+                                   SFU_HIDE_PROTECTION_CFG           | \
+                                   OB_SECURE_SRAM1_DISABLE           | \
+                                   OB_SECURE_SRAM2_ENABLE)
+#endif /* SFU_SECURE_USER_PROTECT_ENABLE */
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APP_SFU_COMMON_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_def.h
new file mode 100644
index 00000000..3dc4df82
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_def.h
@@ -0,0 +1,94 @@
+/**
+  ******************************************************************************
+  * @file    sfu_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains the general definitions for SBSFU application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_DEF_H
+#define SFU_DEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "app_sfu.h"
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief  SFU Error Typedef
+  */
+typedef enum
+{
+  SFU_ERROR = 0x00001FE1U,
+  SFU_SUCCESS = 0x00122F11U
+} SFU_ErrorStatus;
+
+/* Exported constants --------------------------------------------------------*/
+
+#define SFU_RAM_BASE             ((uint32_t) SE_REGION_RAM_START)
+#define SFU_RAM_END              ((uint32_t) SB_REGION_RAM_END)
+#define SFU_SB_RAM_BASE          ((uint32_t) SB_REGION_RAM_START)
+#define SFU_SB_RAM_END           ((uint32_t) SB_REGION_RAM_END)
+
+
+#ifdef CORE_CM0PLUS
+#define SFU_BOOT_BASE_ADDR       ((uint32_t) INTVECT_START)           /* SFU Boot Address */
+#else /* CORE_CM0PLUS */
+#define SFU_C2_BOOT_BASE_ADDR    ((uint32_t) INTVECT_START)           /* SFU Boot Address */
+#define SFU_C2_AREA_ADDR_END     ((uint32_t) SE_KEY_REGION_ROM_END)   /* SBSFU end Address (covering all the SBSFU
+                                                                         executable code and the related keys) */
+#define SFU_C1_BOOT_BASE_ADDR    ((uint32_t) M4_SB_REGION_ROM_START)  /* SB Boot Address */
+#define SFU_C1_AREA_ADDR_END     ((uint32_t) M4_SB_REGION_ROM_END)    /* SB end Address (covering all the SB
+                                                                         executable code */
+#endif /* CORE_CM0PLUS */
+#define SFU_ROM_ADDR_START       ((uint32_t) SE_IF_REGION_ROM_START)  /* SBSFU base Address */
+
+#define SFU_ROM_ADDR_END         ((uint32_t) SE_KEY_REGION_ROM_END)   /* SBSFU end Address (covering all the SBSFU
+                                                                         executable code and the related keys) */
+
+#define SFU_SENG_ROM_ADDR_START  ((uint32_t) SE_CODE_REGION_ROM_START)/* Secure Engine area address START */
+#define SFU_SENG_ROM_ADDR_END    ((uint32_t) SE_CODE_REGION_ROM_END)  /* Secure Engine area address END - SE includes
+                                                                         everything up to the License */
+#define SFU_SENG_ROM_SIZE        ((uint32_t) (SFU_SENG_ROM_ADDR_END - \
+                                              SFU_SENG_ROM_ADDR_START + 1U)) /* Secure Engine area size */
+
+#define SFU_KEYS_ROM_ADDR_START  ((uint32_t) SE_KEY_REGION_ROM_START) /* Keys Area (Keys + Keys Retrieve function)
+                                                                         START. This is the PCRoP Area */
+#define SFU_KEYS_ROM_ADDR_END    ((uint32_t) SE_KEY_REGION_ROM_END)   /* Keys Area (Keys + Keys Retrieve function) END.
+                                                                         This is the PCRoP Area */
+
+#define SFU_SENG_RAM_ADDR_START  ((uint32_t) SE_REGION_RAM_START)   /* Secure Engine reserved RAM2 area START
+                                                                       address */
+#define SFU_SENG_RAM_ADDR_END    ((uint32_t) SE_REGION_RAM_END)     /* Secure Engine reserved RAM2 area END address */
+#define SFU_SENG_RAM_SIZE        ((uint32_t) (SFU_SENG_RAM_ADDR_END - \
+                                              SFU_SENG_RAM_ADDR_START + 1U)) /* Secure Engine reserved RAM area SIZE */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_DEF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
new file mode 100644
index 00000000..6ec983e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/Common/sfu_fwimg_regions.h
@@ -0,0 +1,111 @@
+/**
+  ******************************************************************************
+  * @file    sfu_fwimg_regions.h
+  * @author  MCD Application Team
+  * @brief   This file contains FLASH regions definitions for SFU_FWIMG functionalities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SFU_FWIMG_REGIONS_H
+#define SFU_FWIMG_REGIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sfu.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_fwimg.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+#include "se_crypto_config.h"
+
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  *  Slot list : 2 slots per image configuration + swap
+  */
+#define NB_SLOTS      6U
+#define SLOT_INACTIVE 0U     /* this index should not be used ==> no tag found in the header */
+#define SLOT_ACTIVE_1 1U
+#define SLOT_ACTIVE_2 2U
+#define SLOT_DWL_1    3U
+#define SLOT_DWL_2    4U
+#define SLOT_SWAP     5U
+
+/* Calculation of the size of a slot */
+#define SLOT_SIZE(a) (SlotEndAdd[a] - SlotStartAdd[a] + 1U)
+
+/*
+ * Design constraint: the image slot size must be a multiple of the swap area size.
+ * And of course both image slots must have the same size.
+ */
+#define SFU_IMG_REGION_IS_MULTIPLE(a,b) ((a / b * b) == a)
+
+/*
+ * Checking that the slot sizes are consistent with the .icf file
+ * Sizes expressed in bytes (+1 because the end address belongs to the slot)
+ * The checks are executed at runtime in the SFU_Img_Init() function.
+ */
+#define SFU_IMG_REGION_IS_SAME_SIZE(a,b) ((a) == (b))
+
+/**
+  * Image starting offset to add to the  address of 1st block
+  */
+#define SFU_IMG_IMAGE_OFFSET ((uint32_t)512U)
+
+
+/* External variables --------------------------------------------------------*/
+extern const uint32_t  SlotHeaderAdd[NB_SLOTS];
+extern const uint32_t  SlotStartAdd[NB_SLOTS];
+extern const uint32_t  SlotEndAdd[NB_SLOTS];
+
+#if  (defined(SFU_FWIMG_COMMON_C) || defined(SE_LOW_LEVEL_C) || defined(TEST_PROTECTIONS_C))
+
+const uint32_t  SlotHeaderAdd[NB_SLOTS] = { 0U,
+                                            SLOT_ACTIVE_1_HEADER,
+                                            SLOT_ACTIVE_2_HEADER,
+                                            SLOT_BLOB_DWL_1_START,
+                                            0U,
+                                            0U,
+                                          };
+/* List of slot start address */
+const uint32_t  SlotStartAdd[NB_SLOTS]  = { 0U,
+                                            SLOT_ACTIVE_1_START,
+                                            SLOT_ACTIVE_2_START,
+                                            SLOT_BLOB_DWL_1_START,
+                                            0U,
+                                            0U,
+                                          };
+/* List of slot end address */
+const uint32_t  SlotEndAdd[NB_SLOTS]    = { 0U,
+                                            SLOT_ACTIVE_1_END,
+                                            SLOT_ACTIVE_2_END,
+                                            SLOT_BLOB_DWL_1_END,
+                                            0U,
+                                            0U,
+                                          };
+#endif /* SFU_FWIMG_COMMON_C  || SE_LOW_LEVEL_C || TEST_PROTECTIONS_C || SFU_LOADER_C */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SFU_FWIMG_REGIONS_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
new file mode 100644
index 00000000..783cd4b0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>7.10.3.6927</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
new file mode 100644
index 00000000..2615a977
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM0PLUS.ewp
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM0PLUS\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM0PLUS\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM0PLUS\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>CORE_CM0PLUS</state>
+                    <state>KMS_ENABLED</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\Core\Inc</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\App</state>
+                    <state>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Interface</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+                    <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS</state>
+                    <state>..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>$TOOLKIT_DIR$\bin\isymexport.exe --edit "$PROJ_DIR$\steering_file.txt" "$TARGET_PATH$" "$PROJ_DIR$\se_interface_appli.o"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\SE_Core.bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state>SE_CORE_Bin</state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM0PLUS_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>Core</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+            </file>
+        </group>
+        <group>
+            <name>SBSFU</name>
+            <group>
+                <name>App</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_loader.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_boot.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_com_loader.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_com_trace.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_error.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_mpu_isolation.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_test.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_fwimg_common.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_new_image.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_kms.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\App\sfu_interface_crypto_scheme.c</name>
+                </file>
+            </group>
+            <group>
+                <name>Target</name>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash_int.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_flash_ext.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\CM0PLUS\SBSFU\Target\sfu_low_level_security.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\sfu_se_mpu.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_iwdg.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_spi_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+    </group>
+        <group>
+          <name>Middlewares</name>
+          <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_application.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_bootloader.c</name>
+            </file>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_interface_common.c</name>
+            </file>
+          </group>
+          <group>
+            <name>STM32_Key_Management_Services</name>
+            <file>
+              <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\iKMS\se_interface_kms.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
new file mode 100644
index 00000000..455613cb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>7.10.3.6927</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
new file mode 100644
index 00000000..0f2e43e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/CM4.ewp
@@ -0,0 +1,1136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>CM4\Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>CM4\Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>CM4\List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>Full formatting, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Common</state>
+                    <state>$PROJ_DIR$/../CM4/Inc</state>
+                    <state>$PROJ_DIR$/../../2_Images_SECoreBin/Inc</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>Project.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Project.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>CM4_import_lib.o</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Uninitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\main.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_hal_msp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\stm32wlxx_it.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\CM4\Src\sfu_low_level_security.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\CMSIS\Device\ST\STM32WLxx\Source\Templates\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_hsem.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
new file mode 100644
index 00000000..3d66e556
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/Project_SBSFU.eww
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\CM4.ewp</path>
+  </project>
+  <project>
+    <path>$WS_DIR$\CM0PLUS.ewp</path>
+  </project>
+  <batchBuild />
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
new file mode 100644
index 00000000..08e10787
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/sfu_se_mpu.s
@@ -0,0 +1,65 @@
+;/******************************************************************************
+;* File Name          : sfu_se_mpu.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;*  @attention
+;* 
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;* 
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;* 
+;*******************************************************************************
+;
+;
+; Cortex-M version
+;
+        SECTION .text:CODE:NOROOT:REORDER(2)
+        EXPORT SVC_Handler, jump_to_function, launch_application
+SVC_Handler
+        IMPORT MPU_SVC_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+jump_to_function
+        ; assume R1 R2 are useless
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+launch_application
+        ; return from exception to application launch function
+        ; R0: application vector address
+        ; R1: exit function address
+        ; push interrupt context R0 R1 R2 R3 R12 LR PC xPSR
+        ;MOV R2, #0x01000000 ; xPSR activate Thumb bit
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} ; FLAGS=0
+        MOVS R2, #1
+        BICS R1, R1, R2  ; clear least significant bit of exit function
+        PUSH {R1}  ; return address = application entry point
+        MOVS R1, #0 ; clear other context registers
+        PUSH {R1} ; LR =0
+        PUSH {R1} ; R12 =0
+        PUSH {R1} ; R3 = 0
+        PUSH {R1} ; R2 = 0
+        PUSH {R1} ; R1 = 0
+        ; set R0 to application entry point
+        PUSH {R0} ; R0 = application entry point
+        ; set LR to return to thread mode with main stack
+        ;MOV LR, #0xFFFFFFF9
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        ; return from interrupt
+        BX LR
+      
+        END
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
new file mode 100644
index 00000000..b8446db6
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/steering_file.txt
@@ -0,0 +1,40 @@
+show SE_APP_GetActiveFwInfo
+show SE_APP_SVC_Handler
+show SE_SYS_SaveDisableIrq
+show SE_SYS_RestoreEnableIrq
+show SE_KMS_Initialize
+show SE_KMS_Finalize
+show SE_KMS_GetInfo
+show SE_KMS_GetFunctionList
+show SE_KMS_GetSlotList
+show SE_KMS_GetSlotInfo
+show SE_KMS_GetTokenInfo
+show SE_KMS_GetMechanismInfo
+show SE_KMS_OpenSession
+show SE_KMS_CloseSession
+show SE_KMS_CreateObject
+show SE_KMS_DestroyObject
+show SE_KMS_GetAttributeValue
+show SE_KMS_SetAttributeValue
+show SE_KMS_FindObjectsInit
+show SE_KMS_FindObjects
+show SE_KMS_FindObjectsFinal
+show SE_KMS_EncryptInit
+show SE_KMS_Encrypt
+show SE_KMS_EncryptUpdate
+show SE_KMS_EncryptFinal
+show SE_KMS_DecryptInit
+show SE_KMS_Decrypt
+show SE_KMS_DecryptUpdate
+show SE_KMS_DecryptFinal
+show SE_KMS_DigestInit
+show SE_KMS_Digest
+show SE_KMS_DigestUpdate
+show SE_KMS_DigestFinal
+show SE_KMS_SignInit
+show SE_KMS_Sign
+show SE_KMS_VerifyInit
+show SE_KMS_Verify
+show SE_KMS_DeriveKey
+show SE_KMS_GenerateKeyPair
+show SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..5a0e4ad5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,30 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x1A00;
+define symbol __ICFEDIT_size_heap__ = 0;
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section SE_CORE_Bin };
+place in SE_IF_ROM_region {section .SE_IF_Code};
+place in SB_ROM_region    { readonly };
+place in SB_RAM_region    { readwrite, block CSTACK, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..16046813
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,29 @@
+/*###ICF### Set of symbols used in M4 SB ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x200;
+define symbol __ICFEDIT_size_heap__ = 0x100;
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_M4_SB_region_ROM_start__ { readonly section .intvec };
+place in M4_SB_ROM_region   { readonly };
+place in M4_SB_RAM_region   { readwrite,
+                              block CSTACK, block HEAP };
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
new file mode 100644
index 00000000..93fe9354
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvoptx
@@ -0,0 +1,901 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_cm0plus.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>-U -O206 -S0 -C0 -P00 -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20008000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>sfu_se_mpu.s</PathWithFileName>
+      <FilenameWithoutPath>sfu_se_mpu.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>se_core_bin.s</PathWithFileName>
+      <FilenameWithoutPath>se_core_bin.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_boot.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_boot.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_com_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_com_trace.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_com_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_error.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_error.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_fwimg_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_interface_crypto_scheme.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_kms.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_loader.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_loader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_mpu_isolation.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_new_image.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_new_image.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/App/sfu_test.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_test.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/SBSFU/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_ext.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_flash_int.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_spi_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_bootloader.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_common.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</PathWithFileName>
+      <FilenameWithoutPath>se_interface_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
new file mode 100644
index 00000000..c2d5b07b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM0PLUS.uvprojx
@@ -0,0 +1,726 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SBSFU</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo_CM0PLUS\Exe\</OutputDirectory>
+          <OutputName>SBSFU</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments></TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4096</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-Wno-format</MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM0PLUS/Core/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../CM0PLUS/Core/Inc;../CM0PLUS/SBSFU/App;../CM0PLUS/SBSFU/Target;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SBSFU_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--symdefs=se_interface_appli.txt
+--keep=SE_CORE_Bin.o(SE_CORE_Bin)</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_se_mpu.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>sfu_se_mpu.s</FilePath>
+            </File>
+            <File>
+              <FileName>se_core_bin.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>se_core_bin.s</FilePath>
+            </File>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/App</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_boot.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_boot.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_com_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_com_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_com_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_error.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_error.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_fwimg_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_fwimg_common.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_interface_crypto_scheme.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_kms.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_loader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_loader.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_mpu_isolation.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_new_image.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_new_image.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_test.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/App/sfu_test.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/SBSFU/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sfu_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_ext.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_flash_int.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SBSFU/Target/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_spi_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_bootloader.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_interface_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="CM0PLUS"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
new file mode 100644
index 00000000..28c068d4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvoptx
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>0</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>0</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>0</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Src/sfu_low_level_security.c</PathWithFileName>
+      <FilenameWithoutPath>sfu_low_level_security.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_hsem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_iwdg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
new file mode 100644
index 00000000..17e61bd3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/CM4.uvprojx
@@ -0,0 +1,580 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SB</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>STM32WL55JC_Nucleo_CM4\Exe\</OutputDirectory>
+          <OutputName>SB</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>0</hadIROM>
+            <hadIRAM>0</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>1</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>0</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>0</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>0</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>4</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Common;../CM4/Inc;../../2_Images_SECoreBin/Inc;../../Linker_Common/MDK-ARM;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SB_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>sfu_low_level_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Src/sfu_low_level_security.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_hsem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_iwdg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="CM4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
new file mode 100644
index 00000000..0dc4693b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/Project.uvmpw
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectWorkspace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_mpw.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <WorkspaceName></WorkspaceName>
+
+  <project>
+    <PathAndName>.\CM4.uvprojx</PathAndName>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+  <project>
+    <PathAndName>.\CM0PLUS.uvprojx</PathAndName>
+    <NodeIsActive>1</NodeIsActive>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+</ProjectWorkspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
new file mode 100644
index 00000000..49d5b3cf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SBSFU_cm0plus.sct
@@ -0,0 +1,48 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+; *** regions needed by SBSFU project ***
+
+LR_KMS_DataStorage KMS_DATASTORAGE_START KMS_DATASTORAGE_SIZE {
+  ER_KMS_DataStorage KMS_DATASTORAGE_START FILL 0X00000000 KMS_DATASTORAGE_SIZE {
+  }
+}
+
+LR_IF SE_IF_REGION_ROM_START SE_IF_ROM_REGION_SIZE {
+  ER_IF SE_IF_REGION_ROM_START SE_IF_ROM_REGION_SIZE {
+  se_interface_application.o (+RO)
+  se_interface_bootloader.o (+RO)
+  se_interface_common.o (+RO)
+  se_interface_kms.o (+RO)
+  }
+}
+
+LR_SB SB_REGION_ROM_START SB_ROM_REGION_SIZE {  
+  ER_SB SB_REGION_ROM_START SB_ROM_REGION_SIZE {
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  SB_RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  .ANY (STACK)
+  .ANY (HEAP)
+  }
+}
+
+LR_ROM_Vector INTVECT_START VECTOR_SIZE {
+  vector_start INTVECT_START VECTOR_SIZE {
+  *.o (RESET, +First)
+  }
+}
+
+LR_SE SE_CODE_REGION_ROM_START SE_ROM_REGION_SIZE {
+  ER_SE SE_CODE_REGION_ROM_START SE_ROM_REGION_SIZE {
+  *(SE_CORE_Bin)
+  }
+}
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
new file mode 100644
index 00000000..253a0369
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/SB_cm4.sct
@@ -0,0 +1,21 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+; *** regions needed by SBSFU project ***
+LR_SB M4_SB_REGION_ROM_START M4_SB_ROM_REGION_SIZE {  
+  ER_SB M4_SB_REGION_ROM_START M4_SB_ROM_REGION_SIZE {
+   *.o (RESET, +First)
+  *(InRoot$$Sections)
+  .ANY (+RO)
+  }
+  SB_RAM_region M4_SB_REGION_RAM_START M4_SB_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  .ANY (STACK)
+  .ANY (HEAP)
+  }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
new file mode 100644
index 00000000..699a640a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL55JC_Nucleo_CM0PLUS/Exe/se_interface_appli.txt
@@ -0,0 +1,41 @@
+#<SYMDEFS># ARM Linker, 6140002: Last Updated: Fri May 14 12:01:00 2021
+0x0802d001 T SE_APP_GetActiveFwInfo
+0x0802d045 T SE_APP_SVC_Handler
+0x0802e1d1 T SE_SYS_SaveDisableIrq
+0x0802e189 T SE_SYS_RestoreEnableIrq
+0x0802dbdd T SE_KMS_Initialize
+0x0802d6fd T SE_KMS_Finalize
+0x0802d9ad T SE_KMS_GetInfo
+0x0802d9a9 T SE_KMS_GetFunctionList
+0x0802dac1 T SE_KMS_GetSlotList
+0x0802da65 T SE_KMS_GetSlotInfo
+0x0802db25 T SE_KMS_GetTokenInfo
+0x0802da01 T SE_KMS_GetMechanismInfo
+0x0802dce9 T SE_KMS_OpenSession
+0x0802d0c5 T SE_KMS_CloseSession
+0x0802d115 T SE_KMS_CreateObject
+0x0802d375 T SE_KMS_DestroyObject
+0x0802d949 T SE_KMS_GetAttributeValue
+0x0802dd55 T SE_KMS_SetAttributeValue
+0x0802d805 T SE_KMS_FindObjectsInit
+0x0802d751 T SE_KMS_FindObjects
+0x0802d7b1 T SE_KMS_FindObjectsFinal
+0x0802d631 T SE_KMS_EncryptInit
+0x0802d561 T SE_KMS_Encrypt
+0x0802d695 T SE_KMS_EncryptUpdate
+0x0802d5cd T SE_KMS_EncryptFinal
+0x0802d23d T SE_KMS_DecryptInit
+0x0802d175 T SE_KMS_Decrypt
+0x0802d29d T SE_KMS_DecryptUpdate
+0x0802d1dd T SE_KMS_DecryptFinal
+0x0802d4a1 T SE_KMS_DigestInit
+0x0802d3d1 T SE_KMS_Digest
+0x0802d4fd T SE_KMS_DigestUpdate
+0x0802d43d T SE_KMS_DigestFinal
+0x0802de25 T SE_KMS_SignInit
+0x0802ddb9 T SE_KMS_Sign
+0x0802def5 T SE_KMS_VerifyInit
+0x0802de89 T SE_KMS_Verify
+0x0802d305 T SE_KMS_DeriveKey
+0x0802d869 T SE_KMS_GenerateKeyPair
+0x0802d8e5 T SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
new file mode 100644
index 00000000..c4321d77
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/STM32WL_cm0plus.ini
@@ -0,0 +1,23 @@
+/******************************************************************************/
+/* STM32WL_cm0plus.INI: CM0 CPU Initialization File                                           
+/******************************************************************************/
+/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
+/* * All rights reserved.</center>*/
+/*  *
+/*  * This software component is licensed by ST under BSD 3-Clause license,*/
+/*  * the "License"; You may not use this file except in compliance with the */
+/*  * License. You may obtain a copy of the License at:*/
+/*  *                        opensource.org/licenses/BSD-3-Clause*/
+/*  *
+/*  ****************************************************************************/
+/******************************************************************************/
+
+FUNC void Setup (void) {
+  SP = _RDWORD(0x8036800);          // Setup Stack Pointer
+  PC = _RDWORD(0x8036804);          // Setup Program Counter
+   
+}
+
+Setup();                             // Setup for Running
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
new file mode 100644
index 00000000..ca5958f1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/se_core_bin.s
@@ -0,0 +1,20 @@
+;/******************************************************************************
+;* File Name          : se_core_bin.s
+;* Author             : MCD Application Team
+;* Description        : Include SECoreBin binary.
+;********************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;******************************************************************************
+;
+;
+ AREA SE_CORE_Bin, CODE, READONLY
+ INCBIN .\..\..\2_Images_SECoreBin\MDK-ARM\STM32WL55JC_Nucleo\Exe\SECoreBin.bin
+ END
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
new file mode 100644
index 00000000..7355fbb5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/sfu_se_mpu.s
@@ -0,0 +1,71 @@
+;*******************************************************************************
+;* File Name          : sfu_se_mpu.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2017 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;*******************************************************************************
+;
+;
+; Cortex-M version
+;
+      PRESERVE8
+      THUMB
+      AREA    |.text|, CODE, READONLY
+ 
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT MPU_SVC_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+      AREA    |.SB_HDP_Code|, CODE, READONLY
+      EXPORT jump_to_function
+jump_to_function
+        ; assume R1 R2 are useless
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+      EXPORT launch_application
+launch_application
+        ; return from exception to application launch function
+        ; R0: application vector address
+        ; R1: exit function address
+        ; push interrupt context R0 R1 R2 R3 R12 LR PC xPSR
+        ;MOV R2, #0x01000000 ; xPSR activate Thumb bit
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} ; FLAGS=0
+        MOVS R2, #1
+        BICS R1, R1, R2  ; clear least significant bit of exit function
+        PUSH {R1}  ; return address = application entry point
+        MOVS R1, #0 ; clear other context registers
+        PUSH {R1} ; LR =0
+        PUSH {R1} ; R12 =0
+        PUSH {R1} ; R3 = 0
+        PUSH {R1} ; R2 = 0
+        PUSH {R1} ; R1 = 0
+        ; set R0 to application entry point
+        PUSH {R0} ; R0 = application entry point
+        ; set LR to return to thread mode with main stack
+        ;MOV LR, #0xFFFFFFF9
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        ; return from interrupt
+        BX LR
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..36c63d7a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,253 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1A00
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                     ; Top of Stack
+                DCD     Reset_Handler                    ; Reset Handler
+                DCD     NMI_Handler                      ; NMI Handler
+                DCD     HardFault_Handler                ; Hard Fault Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     SVC_Handler                      ; SVCall Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     PendSV_Handler                   ; PendSV Handler
+                DCD     SysTick_Handler                  ; SysTick Handler
+
+                ; External Interrupts                    
+                DCD     TZIC_ILA_IRQHandler              ; Security Interrupt controller illegal access Interrupts
+                DCD     PVD_PVM_IRQHandler               ; PVD and PVM detector
+                DCD     RTC_LSECSS_IRQHandler            ; RTC Wakeup + RTC Tamper and TimeStamp + RTC Alarms (A & B) + SSR Underflow and LSECSS Interrupts
+                DCD     RCC_FLASH_C1SEV_IRQHandler       ; RCC1 and FLASH and CPU1 M4 SEV Interrupts
+                DCD     EXTI1_0_IRQHandler               ; EXTI Line 1:0 Interrupts
+                DCD     EXTI3_2_IRQHandler               ; XTI Line 3:2 Interrupts
+                DCD     EXTI15_4_IRQHandler              ; EXTI Line 15:4 interrupts
+                DCD     ADC_COMP_DAC_IRQHandler          ; ADC, COMP1, COMP2, DAC Interrupts
+                DCD     DMA1_Channel1_2_3_IRQHandler     ; DMA1 Channel 1 to 3 Interrupts
+                DCD     DMA1_Channel4_5_6_7_IRQHandler   ; DMA1 Channels 4, 5, 6, 7 Interrupts
+                DCD     DMA2_DMAMUX1_OVR_IRQHandler      ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+                DCD     LPTIM1_IRQHandler                ; LPTIM1 global Interrupt
+                DCD     LPTIM2_IRQHandler                ; LPTIM2 global Interrupt
+                DCD     LPTIM3_IRQHandler                ; LPTIM3 global Interrupt
+                DCD     TIM1_IRQHandler                  ; TIM1 Interrupt
+                DCD     TIM2_IRQHandler                  ; TIM2 Interrupt
+                DCD     TIM16_IRQHandler                 ; TIM16 Interrupt
+                DCD     TIM17_IRQHandler                 ; TIM17 Interrupt
+                DCD     IPCC_C2_RX_C2_TX_IRQHandler      ; IPCC RX Occupied and TX Free Interrupt Interrupts
+                DCD     HSEM_IRQHandler                  ; Semaphore Interrupt
+                DCD     RNG_IRQHandler                   ; RNG Interrupt
+                DCD     AES_PKA_IRQHandler               ; AES and PKA Interrupts
+                DCD     I2C1_IRQHandler                  ; I2C1 Event and Error Interrupt
+                DCD     I2C2_IRQHandler                  ; I2C2 Event and Error Interrupt
+                DCD     I2C3_IRQHandler                  ; I2C3 Event and Error Interrupt
+                DCD     SPI1_IRQHandler                  ; SPI1 Interrupts
+                DCD     SPI2_IRQHandler                  ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                ; USART1 Interrupt
+                DCD     USART2_IRQHandler                ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler               ; LPUART1 Interrupt
+                DCD     SUBGHZSPI_IRQHandler             ; SUBGHZSPI Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler          ; SUBGHZ Radio Interrupt
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+                EXPORT  TZIC_ILA_IRQHandler            [WEAK]
+                EXPORT  PVD_PVM_IRQHandler             [WEAK]
+                EXPORT  RTC_LSECSS_IRQHandler          [WEAK]
+                EXPORT  RCC_FLASH_C1SEV_IRQHandler     [WEAK]
+                EXPORT  EXTI1_0_IRQHandler             [WEAK]
+                EXPORT  EXTI3_2_IRQHandler             [WEAK]
+                EXPORT  EXTI15_4_IRQHandler            [WEAK]
+                EXPORT  ADC_COMP_DAC_IRQHandler        [WEAK]
+                EXPORT  DMA1_Channel1_2_3_IRQHandler   [WEAK]
+                EXPORT  DMA1_Channel4_5_6_7_IRQHandler [WEAK]
+                EXPORT  DMA2_DMAMUX1_OVR_IRQHandler    [WEAK]
+                EXPORT  LPTIM1_IRQHandler              [WEAK]
+                EXPORT  LPTIM2_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler              [WEAK]
+                EXPORT  TIM1_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                [WEAK]
+                EXPORT  TIM16_IRQHandler               [WEAK]
+                EXPORT  TIM17_IRQHandler               [WEAK]
+                EXPORT  IPCC_C2_RX_C2_TX_IRQHandler    [WEAK]
+                EXPORT  HSEM_IRQHandler                [WEAK]
+                EXPORT  RNG_IRQHandler                 [WEAK]
+                EXPORT  AES_PKA_IRQHandler             [WEAK]
+                EXPORT  I2C1_IRQHandler                [WEAK]
+                EXPORT  I2C2_IRQHandler                [WEAK]
+                EXPORT  I2C3_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                [WEAK]
+                EXPORT  SPI2_IRQHandler                [WEAK]
+                EXPORT  USART1_IRQHandler              [WEAK]
+                EXPORT  USART2_IRQHandler              [WEAK]
+                EXPORT  LPUART1_IRQHandler             [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler           [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler        [WEAK]
+
+TZIC_ILA_IRQHandler
+PVD_PVM_IRQHandler
+RTC_LSECSS_IRQHandler
+RCC_FLASH_C1SEV_IRQHandler
+EXTI1_0_IRQHandler
+EXTI3_2_IRQHandler
+EXTI15_4_IRQHandler
+ADC_COMP_DAC_IRQHandler
+DMA1_Channel1_2_3_IRQHandler
+DMA1_Channel4_5_6_7_IRQHandler
+DMA2_DMAMUX1_OVR_IRQHandler   
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+LPTIM3_IRQHandler
+TIM1_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+IPCC_C2_RX_C2_TX_IRQHandler
+HSEM_IRQHandler
+RNG_IRQHandler
+AES_PKA_IRQHandler
+I2C1_IRQHandler
+I2C2_IRQHandler
+I2C3_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler
+USART2_IRQHandler
+LPUART1_IRQHandler
+SUBGHZSPI_IRQHandler
+SUBGHZ_Radio_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..5c25b669
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,365 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x200
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x100
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
new file mode 100644
index 00000000..c30ae114
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1597224213341</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.launch</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
new file mode 100644
index 00000000..58e587de
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.cproject
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SBSFU" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; &amp;&amp; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot; &amp;&amp; arm-none-eabi-objcopy -j .SE_IF_Code &quot;${BuildArtifactFileBaseName}.elf&quot; se_inter.elf &gt; /dev/null 2&gt;&gt;1 &amp;&amp; arm-none-eabi-objcopy --extract-symbol se_inter.elf se_interface_app.elf &amp;&amp; arm-none-eabi-objcopy -S --keep-symbols=../se_interface.txt se_interface_app.elf se_interface_app.o">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.881818625" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1917490952" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1719443276" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1221549224" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1589745676" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.880688866" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.183131562" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1522065490" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../CM0PLUS/SBSFU/App | ../../../CM0PLUS/SBSFU/Target | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2016264562" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1230579521" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1583239620" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1871753883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.2005981074" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.16838725" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.143299388" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1592472811" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1224986284" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/SBSFU/Target"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.580890983" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1114281993" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1714089742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.580103581" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1187394661" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.691907095" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1692455483" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1580459046" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.607234888" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.2027033046" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1675718727" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SBSFU_cm0plus.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.459390721" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1150535273" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1269719444" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1195912190" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1480071344" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.391747263" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1617359256" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.6895175" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM0PLUS.null.839446873" name="2_Images_SBSFU_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.611110898;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.14180497">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
new file mode 100644
index 00000000..53dc73d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/.project
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_spi_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_spi_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/se_interface_kms.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/iKMS/se_interface_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_bootloader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_bootloader.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_common.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_interface_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_boot.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_boot.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_loader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_error.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_error.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_fwimg_common.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_fwimg_common.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_interface_crypto_scheme.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_kms.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_loader.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_loader.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_mpu_isolation.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_new_image.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_new_image.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_test.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_test.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/App/sfu_com_trace.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/App/sfu_com_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash_ext.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_flash_int.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c</locationURI>
+		</link>
+		<link>
+			<name>Application/SBSFU/Target/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SBSFU/Target/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
new file mode 100644
index 00000000..1f567ea5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_se_mpu.s
@@ -0,0 +1,66 @@
+/**
+  ******************************************************************************
+  * @file      sfu_se_mpu.s
+  * @author    MCD Application Team
+  * @brief     Wrapper for SE isolation with MPU.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+        .section  .text,"ax",%progbits
+        .syntax unified
+        .weak  MPU_SVC_Handler
+        .global SVC_Handler
+        .type  SVC_Handler, %function
+SVC_Handler:
+        MRS r0, PSP
+        PUSH {LR}
+        BL MPU_SVC_Handler
+        POP {PC}
+
+        .section  .RamFunc,"ax",%progbits       
+        .global jump_to_function
+jump_to_function:
+        /* assume R1 R2 are useless */
+        LDR R1, [R0]
+        LDR R2, [R0,#4]
+        MOV SP, R1
+        BX  R2
+
+        .global launch_application
+launch_application:
+        /* return from exception to application launch function */
+        /* R0: application vector address */
+        /* R1: exit function address */
+        /* push interrupt context R0 R1 R2 R3 R12 LR PC xPSR */
+        /* MOV R2, #0x01000000 ; xPSR activate Thumb bit */
+        MOVS R2, #0x1
+        LSLS R2, R2, #24
+        PUSH {R2} /* FLAGS=0 */
+        MOVS R2, #1
+        BICS R1, R1, R2  /* clear least significant bit of exit function */
+        PUSH {R1}  /* return address = application entry point */
+        MOVS R1, #0 /* clear other context registers */
+        PUSH {R1} /* LR =0 */
+        PUSH {R1} /* R12 =0 */
+        PUSH {R1} /* R3 = 0 */
+        PUSH {R1} /* R2 = 0 */
+        PUSH {R1} /* R1 = 0 */
+        /* set R0 to application entry point */
+        PUSH {R0} /* R0 = application entry point */
+        /* set LR to return to thread mode with main stack */
+        /* MOV LR, #0xFFFFFFF9 */
+        MOVS R2, #6
+        MVNS R2, R2
+        MOV LR, R2
+        /* return from interrupt */
+        BX LR
+.end
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
new file mode 100644
index 00000000..3a556990
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sfu_secorebin_inc.c
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    sfu_secorebin_inc.c
+  * @author  MCD Application Team
+  * @brief   Include SECoreBin binary.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "string.h"
+
+#if defined (__GNUC__)
+asm(".section SE_CORE_Bin,\"a\";"
+                             ".incbin \"../../2_Images_SECoreBin/STM32CubeIDE/Debug/SECoreBin.bin\";"
+);
+#endif 
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..55cfe378
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Application/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,303 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm0plus.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M0+ vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M0+ processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m0plus
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M0+ vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	0
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	TZIC_ILA_IRQHandler                  			/* TZIC ILA Interrupt                                 */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	RTC_LSECSS_IRQHandler                			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RCC_FLASH_C1SEV_IRQHandler           			/* RCC and FLASH and CPU1 M4 SEV Interrupt            */
+  .word	EXTI1_0_IRQHandler                   			/* EXTI Line 1:0 Interrupt                            */
+  .word	EXTI3_2_IRQHandler                   			/* EXTI Line 3:2 Interrupt                            */
+  .word	EXTI15_4_IRQHandler                  			/* EXTI Line 15:4 interrupt                           */
+  .word	ADC_COMP_DAC_IRQHandler              			/* ADC, COMP1, COMP2, DAC Interrupt                   */
+  .word	DMA1_Channel1_2_3_IRQHandler         			/* DMA1 Channel 1 to 3 Interrupt                      */
+  .word	DMA1_Channel4_5_6_7_IRQHandler       			/* DMA1 Channels 4,5,6,7 Interrupt                    */
+  .word	DMA2_DMAMUX1_OVR_IRQHandler          			/* DMA2 Channels[1..7] and DMAMUX Overrun Interrupts  */
+  .word	LPTIM1_IRQHandler                    			/* LPTIM1 Global Interrupt                            */
+  .word	LPTIM2_IRQHandler                    			/* LPTIM2 Global Interrupt                            */
+  .word	LPTIM3_IRQHandler                    			/* LPTIM3 Global Interrupt                            */
+  .word	TIM1_IRQHandler                      			/* TIM1 Global Interrupt                              */
+  .word	TIM2_IRQHandler                      			/* TIM2 Global Interrupt                              */
+  .word	TIM16_IRQHandler                     			/* TIM16 Global Interrupt                             */
+  .word	TIM17_IRQHandler                     			/* TIM17 Global Interrupt                             */
+  .word	IPCC_C2_RX_C2_TX_IRQHandler          			/* IPCC RX Occupied and TX Free Interrupt Interrupt   */
+  .word	HSEM_IRQHandler                      			/* Semaphore Interrupt                                */
+  .word	RNG_IRQHandler                       			/* RNG Interrupt                                      */
+  .word	AES_PKA_IRQHandler                   			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	I2C1_IRQHandler                      			/* I2C1 Event and Error Interrupt                     */
+  .word	I2C2_IRQHandler                      			/* I2C2 Event and Error Interrupt                     */
+  .word	I2C3_IRQHandler                      			/* I2C3 Event and Error Interrupt                     */
+  .word	SPI1_IRQHandler                      			/* SPI1 Interrupt                                     */
+  .word	SPI2_IRQHandler                      			/* SPI2 Interrupt                                     */
+  .word	USART1_IRQHandler                    			/* USART1 Interrupt                                   */
+  .word	USART2_IRQHandler                    			/* USART2 Interrupt                                   */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 Interrupt                                  */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI Interrupt                                */
+  .word	SUBGHZ_Radio_IRQHandler              			/* SUBGHZ Radio Interrupt                             */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	TZIC_ILA_IRQHandler
+	.thumb_set TZIC_ILA_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	RTC_LSECSS_IRQHandler
+	.thumb_set RTC_LSECSS_IRQHandler,Default_Handler
+
+	.weak	RCC_FLASH_C1SEV_IRQHandler
+	.thumb_set RCC_FLASH_C1SEV_IRQHandler,Default_Handler
+
+	.weak	EXTI1_0_IRQHandler
+	.thumb_set EXTI1_0_IRQHandler,Default_Handler
+
+	.weak	EXTI3_2_IRQHandler
+	.thumb_set EXTI3_2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_4_IRQHandler
+	.thumb_set EXTI15_4_IRQHandler,Default_Handler
+
+	.weak	ADC_COMP_DAC_IRQHandler
+	.thumb_set ADC_COMP_DAC_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_2_3_IRQHandler
+	.thumb_set DMA1_Channel1_2_3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_5_6_7_IRQHandler
+	.thumb_set DMA1_Channel4_5_6_7_IRQHandler,Default_Handler
+
+	.weak	DMA2_DMAMUX1_OVR_IRQHandler
+	.thumb_set DMA2_DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	TIM1_IRQHandler
+	.thumb_set TIM1_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	IPCC_C2_RX_C2_TX_IRQHandler
+	.thumb_set IPCC_C2_RX_C2_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	AES_PKA_IRQHandler
+	.thumb_set AES_PKA_IRQHandler,Default_Handler
+
+	.weak	I2C1_IRQHandler
+	.thumb_set I2C1_IRQHandler,Default_Handler
+
+	.weak	I2C2_IRQHandler
+	.thumb_set I2C2_IRQHandler,Default_Handler
+
+	.weak	I2C3_IRQHandler
+	.thumb_set I2C3_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
new file mode 100644
index 00000000..164c4ed1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="1"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SECoreBin.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SECoreBin&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161&quot;,&quot;fPerformBuild&quot;:false,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:false,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="8000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="no_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61236"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SBSFU.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM0PLUS"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM0PLUS"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
new file mode 100644
index 00000000..51b33c92
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/SBSFU_cm0plus.ld
@@ -0,0 +1,163 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0;                /* required amount of heap  */
+_Min_Stack_Size = 0x1A00;          /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_IF_Code : { KEEP(*se_interface_application.o (.text .text*))
+                  KEEP(*se_interface_bootloader.o (.text .text*))
+                  KEEP(*se_interface_common.o (.text .text*))
+                  KEEP(*se_interface_kms.o (.text .text*))
+  } >SE_IF_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SB_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SB_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SB_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SB_ROM_region
+
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >INTVECT_ROM_region
+  
+  SE_CORE_Bin :
+  {
+    KEEP(*(SE_CORE_Bin));
+  } > SE_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SB_RAM_region AT>SB_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
new file mode 100644
index 00000000..05aa5e0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/se_interface.txt
@@ -0,0 +1,40 @@
+SE_APP_GetActiveFwInfo
+SE_APP_SVC_Handler
+SE_SYS_SaveDisableIrq
+SE_SYS_RestoreEnableIrq
+SE_KMS_Initialize
+SE_KMS_Finalize
+SE_KMS_GetInfo
+SE_KMS_GetFunctionList
+SE_KMS_GetSlotList
+SE_KMS_GetSlotInfo
+SE_KMS_GetTokenInfo
+SE_KMS_GetMechanismInfo
+SE_KMS_OpenSession
+SE_KMS_CloseSession
+SE_KMS_CreateObject
+SE_KMS_DestroyObject
+SE_KMS_GetAttributeValue
+SE_KMS_SetAttributeValue
+SE_KMS_FindObjectsInit
+SE_KMS_FindObjects
+SE_KMS_FindObjectsFinal
+SE_KMS_EncryptInit
+SE_KMS_Encrypt
+SE_KMS_EncryptUpdate
+SE_KMS_EncryptFinal
+SE_KMS_DecryptInit
+SE_KMS_Decrypt
+SE_KMS_DecryptUpdate
+SE_KMS_DecryptFinal
+SE_KMS_DigestInit
+SE_KMS_Digest
+SE_KMS_DigestUpdate
+SE_KMS_DigestFinal
+SE_KMS_SignInit
+SE_KMS_Sign
+SE_KMS_VerifyInit
+SE_KMS_Verify
+SE_KMS_DeriveKey
+SE_KMS_GenerateKeyPair
+SE_KMS_GenerateRandom
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
new file mode 100644
index 00000000..38cca5bb
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.cproject
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SB" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2015646735" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1427517226" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.219198562" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.717379913" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1323484811" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.358650252" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.437904655" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1049432240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../Common | ../../../CM4/Inc | ../../../../2_Images_SECoreBin/Inc | ../../../../Linker_Common/EWARM | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core ||  ||  || USE_HAL_DRIVER | STM32WL55xx ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SB_cm4.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.857176010" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SBSFU_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1383605403" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.758517685" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.92741657" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.261244217" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1809731028" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1152988115" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1052358781" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.209012098" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../Common"/>
+									<listOptionValue builtIn="false" value="../../../CM4/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1008796121" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format -Wno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.189316865" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.85880463" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.964611899" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.360401545" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.974389923" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.94946969" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2140178522" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1240986986" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2113270654" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SB_cm4.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1941785021" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.483477110" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1843769445" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1745519627" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1919967923" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1803902265" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.854144635" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.438689590" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SBSFU_CM4.null.2010752311" name="2_Images_SBSFU_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.362863525;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.939731813">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
new file mode 100644
index 00000000..dec3fb36
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/.project
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SBSFU_CM4</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/main.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/sfu_low_level_security.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/sfu_low_level_security.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/CMSIS/Device/ST/STM32WLxx/Source/Templates/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_hsem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_hsem.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_iwdg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_iwdg.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
new file mode 100644
index 00000000..8d27486b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB.launch
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.st.stm32cube.ide.mcu.debug.launch.launchConfigurationType">
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.access_port_id" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/>
+<intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.ip_address_local" value="localhost"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.loadList" value="{&quot;fItems&quot;:[{&quot;fIsFromMainTab&quot;:false,&quot;fPath&quot;:&quot;Debug/SBSFU.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM0PLUS&quot;,&quot;fBuildConfigId&quot;:&quot;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1781898240&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true},{&quot;fIsFromMainTab&quot;:true,&quot;fPath&quot;:&quot;Debug\\SB.elf&quot;,&quot;fProjectName&quot;:&quot;2_Images_SBSFU_CM4&quot;,&quot;fPerformBuild&quot;:true,&quot;fDownload&quot;:true,&quot;fLoadSymbols&quot;:true}]}"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.override_start_address_mode" value="default"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.remoteCommand" value="target remote"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startServer" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.divby0" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.exception.unaligned" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.startuptab.haltonexception" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swd_mode" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_port" value="61235"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_div" value="8"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.swv_trace_hclk" value="16000000"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.useRemoteTarget" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.vector_table" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.verify_flash_download" value="true"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_allow_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.cti_signal_halt" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_external_loader" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_logging" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_max_halt_delay" value="false"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.enable_shared_stlink" value="true"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader" value=""/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.external_loader_init" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.frequency" value="0"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.halt_all_on_reset" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.log_file" value="Debug\st-link_gdbserver_log.txt"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.low_power_debug" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.max_halt_delay" value="2"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.reset_strategy" value="connect_under_reset"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_check_serial_number" value="false"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
+<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fLaunchAttribute&quot;:&quot;monitor reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset&quot;],&quot;fCmdOptions&quot;:[]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]}}]}"/>
+<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.swv.swv_wait_for_sync" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="false"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="ST-LINK (ST-LINK GDB server)"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="61234"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${TOOLCHAIN_PATH}/arm-none-eabi-gdb"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.NON_STOP" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_START_MODE" value="remote"/>
+<booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug\SB.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="2_Images_SBSFU_CM4"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1280553077"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/2_Images_SBSFU_CM4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
new file mode 100644
index 00000000..92d8b68b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/STM32CubeIDE/CM4/SB_cm4.ld
@@ -0,0 +1,152 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = M4_SB_region_RAM_end + 1;   /* end of SB_SRAM1 *
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;       /* required amount of heap  */
+_Min_Stack_Size = 0x200;      /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >M4_INTVECT_ROM_region
+
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >M4_SB_Code_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .ARM : 
+  {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+  
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >M4_SB_Code_ROM_region
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >M4_SB_RAM_region AT>M4_SB_Code_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >M4_SB_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >M4_SB_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt
new file mode 100644
index 00000000..8b576979
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SBSFU/readme.txt
@@ -0,0 +1,185 @@
+/**
+  @page 2_Images_SBSFU / Secure Boot and Secure Firmware Update Demo Application (Dual Core)
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   This application shows Secure Boot and Secure Firmware Update example.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
+In addition, Secure Boot (Root of Trust services) checks and activates the STM32 security mechanisms, and checks the
+authenticity and integrity of user application code before every execution to ensure that invalid or malicious code
+cannot be run. The Secure Firmware Update application receives the encrypted firmware image, decrypts it, then checks
+the authenticity and integrity of the code before installing it.
+
+The secure key management services provide cryptographic services to the user application through the pkcs11 APIs
+(KEY ID based APIs) that are executed inside a protected and isolated environment. User application keys are stored in
+the protected and isolated environment. They can be updated in a secure way (authenticity check, data decryption and
+data integrity check).
+
+This example supports multiple images feature configured with 2 active images for
+execution from internal flash and a 1-slot configuration allowing to
+maximize the user application size.
+As a consequence, some features are not available:
+* download a new firmware image from the application
+* resume firmware update procedure in case of power off during installation
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube" available from the
+STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, SBSFU, GTZC, Dual core, MPU
+
+@par Directory contents
+
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/main.c                           Main M0+ application file
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c              M0+ HAL MSP module
+   - 2_Images_SBSFU/CM0PLUS/Core/Src/stm32wlxx_it.c                   STM32 M0+ interrupt handlers
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/app_hw.h                         Hardware definition for application
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/main.h                           Header file for M0+ main.c
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_nucleo_conf.h          M0+ BSP configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h             M0+ HAL configuration file
+   - 2_Images_SBSFU/CM0PLUS/Core/Inc/stm32wlxx_it.h                   Header file for M0+ stm32wlxx_it.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.c                      Secure Boot (SB): entry/exit points and state machine
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/Src/sfu_com_loader.c            SBSFU communication module: local loader part
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/Src/sfu_com_trace.c             SBSFU communication module: trace part
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.c                     SBSFU errors management
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_common.c              SBSFU image handling: common functionalities/services
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.c   Crypto scheme implementation based on KMS API
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.c                       Key management service blob importation handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.c                    SBSFU Local Loader
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.c             Secure Engine isolation with MPU (when no Firewall is available)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.c                 SBSFU image handling: new image storage and installation request
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.c                      SBSFU security protection automatic test
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/app_sfu.h                       Software configuration of M0+ SBSFU application
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_boot.h                      Header file for sfu_boot.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_loader.h                Header file for sfu_com_loader.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_com_trace.h                 Header file for sfu_com_trace.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_error.h                     Header file for sfu_error.c file
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fsm_states.h                SBSFU FSM states definitions
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_internal.h            Internal definitions for firmware image handling
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_fwimg_services.h            Header file for sfu_fwimg_services.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_interface_crypto_scheme.h   Header file for sfu_interface_crypto_scheme.h
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_kms.h                       Header file for sfu_kms.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_loader.h                    Header file for sfu_loader.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_mpu_isolation.h             Header file for sfu_mpu_isolation.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_new_image.h                 Header file for sfu_new_image.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_test.h                      Header file for sfu_test.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/App/sfu_trace.h                     Header file for sfu_trace.c
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.c              SBSFU general low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.c        SBSFU flash low level interface (wrapper)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.c    SBSFU external flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.c    SBSFU internal flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.c     SBSFU security low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level.h              Header file for general low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash.h        Header file for flash low level interface (wrapper)
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_ext.h    Header external file for flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_flash_int.h    Header internal file for flash low level interface
+   - 2_Images_SBSFU/CM0PLUS/SBSFU/Target/sfu_low_level_security.h     Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Src/main.c                                    Main M4 application file
+   - 2_Images_SBSFU/CM4/Src/sfu_low_level_security.c                  M4 SB security low level interface
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_hal_msp.c                       M4 HAL MSP module
+   - 2_Images_SBSFU/CM4/Src/stm32wlxx_it.c                            STM32 M4 interrupt handlers
+   - 2_Images_SBSFU/CM4/Inc/app_sfu.h                                 Software configuration of M4 SB application
+   - 2_Images_SBSFU/CM4/Inc/main.h                                    Header file for M4 main.c
+   - 2_Images_SBSFU/CM4/Inc/sfu_boot.h                                Definitions for Secure Boot (SB) flow control
+   - 2_Images_SBSFU/CM4/Inc/sfu_low_level_security.h                  Header file for security low level interface
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_hal_conf.h                      M4 HAL configuration file
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_it.h                            Header file for M4 stm32wlxx_it.c
+   - 2_Images_SBSFU/CM4/Inc/stm32wlxx_nucleo_conf.h                   M4 BSP configuration file
+   - 2_Images_SBSFU/Common/app_sfu_common.h                           Common software configuration of M4 SB and M0+ SBSFU applications
+   - 2_Images_SBSFU/Common/sfu_def.h                                  General definition for SBSFU application
+   - 2_Images_SBSFU/Common/sfu_fwimg_regions.h                        FLASH regions definitions for image handling
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices.
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - This example is linked with SE_Core binary generated by Secure Engine Core binary generation project.
+   - This example needs a terminal emulator.
+   - By default, SBSFU is configured in development mode. To switch in production mode, refer to AN5056 "Integration
+     guide - software expansion for STM32Cube" available from the STMicroelectronics microcontroller website
+     www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files.
+     As a workaround, it is advised to use the subst.exe command from within a command prompt to set up a local drive
+     out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+@par How to use it ?
+
+Several steps to run SBSFU application :
+
+1. Compile projects in the following order. This is mandatory as each project requests some objects generated by the
+   compilation of the previous one:
+   - 2_Images_SECoreBin (see also SECoreBin/readme.txt)
+   - 2_Images_SBSFU (using both CM4 and CM0+ workspaces)
+   - 2_Images_UserApp_M0Plus (see also UserApp_M0Plus/readme.txt)
+   - 2_Images_UserApp_M4 (see also UserApp_M4/readme.txt)
+
+2. Before loading SBSFU image into the target, please ensure with STM32CubeProgrammer available on www.st.com that the
+   following are valid for the device:
+   - RDP Level 0
+   - Write Protection disabled on all FLASH pages
+   - Chip has been erased
+
+3. Use a terminal emulator (Tera Term for example, open source free software terminal emulator that can be downloaded
+   from https://osdn.net/projects/ttssh2/) for UART connection with the board.
+   Support of YMODEM protocol is required. Serial port configuration should be :
+   - Baud rate = 115200
+   - Data = 8 bits
+   - Parity = none
+   - Stop = 1 bit
+   - Flow control = none
+
+4. Load CM4 SB image and CM0+ SBSFU image into target memory with your preferred toolchain or STM32CubeProgammer.
+
+5. Once the SB_SFU software is downloaded, power cycle the board (unplug/plug USB cable) : the SBSFU application starts
+   and configures the security mechanisms.
+
+6. Power cycle the board a second time (unplug/plug the USB cable): the SBSFU application starts with the configured
+   securities turned on and the Tera Term connection is possible.
+   Caution: Make sure to use an up-to-date version of ST-LINK firmware else SBSFU may not start.
+
+7. At startup (Power On or Reset button pushed) welcome information are displayed on terminal emulator.
+   Red LED blinks every 500 ms when waiting for the CM0+ SBSFU to boot.
+   Green LED blinks every 100 ms when CM0+ and/or CM4 firmware image(s) need(s) to be downloaded.
+   Red LED blinks every 3 seconds when a local download is waited.
+   A reboot occurs in case of error in option bytes configuration.
+
+8. Send the first user encrypted firmware file (\1_Slot\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \1_Slot\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+9. Send the second user encrypted firmware file (\1_Slot\2_Images_UserApp_M0Plus\Binary\UserApp.sfb or
+   \1_Slot\2_Images_UserApp_M4\Binary\UserApp.sfb) with Tera Term by using menu
+   "File > Transfer > YMODEM > Send..."
+
+Note1 : Press User push-button (B1) at reset to force a local download if an application is already installed.
+Note2 : As TAMPER detection can be very sensitive, the protection is disabled by default.
+        Uncomment "SFU_TAMPER_PROTECT_ENABLE" in app_sfu.h to enable it.
+Note3 : for Linux users Minicom can be used but to do so you need to compile the SBSFU project with the MINICOM_YMODEM
+        switch enabled (app_sfu.h)
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
new file mode 100644
index 00000000..1ba4cb1b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY1.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIIEobnAEKh92mvSE+X70hQMvFb8LOg+TGB9Dqu4dyvO8oAoGCCqGSM49
+AwEHoUQDQgAEuvKX+D7jB9wWw3F4HfGwPvCVsERUEoFI+yxmuVQ9pUroJgR2tzeL
+PEbY/WpjYXxGw33pRkQxbtfhbbpw7US6Ag==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
new file mode 100644
index 00000000..1cdd8ce9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/ECCKEY2.txt
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIEbzXMiF8fTUDKWWppKCHkKgLVqrhvGd96DNs11+aAyEoAoGCCqGSM49
+AwEHoUQDQgAEx1uaYDL95LOLizohUs9LXQ1Np/3uq3SX35H5rxB5KRURLRUzQ9Rm
+iYDexMr3mmUqR3QsRQmL4LJbbkCxFLq1dw==
+-----END EC PRIVATE KEY-----
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
new file mode 100644
index 00000000..7b3c9adf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY1
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
new file mode 100644
index 00000000..0e687f3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY2
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
new file mode 100644
index 00000000..0e687f3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin
@@ -0,0 +1 @@
+OEM_KEY_COMPANY2
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin
new file mode 100644
index 00000000..020162be
Binary files /dev/null and b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Binary/nonce.bin differ
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
new file mode 100644
index 00000000..91e39b0a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewd
@@ -0,0 +1,1419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>3</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>C-SPY</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>29</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCVariant</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>MemOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MemFile</name>
+          <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+        </option>
+        <option>
+          <name>RunToEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RunToName</name>
+          <state>main</state>
+        </option>
+        <option>
+          <name>CExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDDFArgumentProducer</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadSuppressDownload</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDownloadVerifyAll</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCProductVersion</name>
+          <state>7.10.3.6927</state>
+        </option>
+        <option>
+          <name>OCDynDriverList</name>
+          <state>STLINK_ID</state>
+        </option>
+        <option>
+          <name>OCLastSavedByProductVersion</name>
+          <state>8.20.1.14181</state>
+        </option>
+        <option>
+          <name>UseFlashLoader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CLowLevel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacFile2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CDevice</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>FlashLoadersV3</name>
+          <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesSuppressCheck3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesPath3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OverrideDefFlashBoard</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCImagesUse3</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDeviceConfigMacroFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDebuggerExtraOption</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAllMTBOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreNrOfCores</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCMulticoreMaster</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCMulticorePort</name>
+          <state>53461</state>
+        </option>
+        <option>
+          <name>OCMulticoreWorkspace</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveProject</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCMulticoreSlaveConfiguration</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCDownloadExtraImage</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCAttachSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MassEraseBeforeFlashing</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ARMSIM_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCSimDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCSimEnablePSP</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspOverrideConfig</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCSimPspConfigFile</name>
+          <state></state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CADI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCadiMemory</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Fast Model</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCADILogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCADILogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CMSISDAP_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CMSISDAPResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>CMSISDAPHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>CMSISDAPDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CMSISDAPProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CMSISDAPSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCMSISDAPUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>GDBSERVER_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJTagBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJTagUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IJET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>8</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CatchSFERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OCIarProbeScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetResetList</name>
+          <version>1</version>
+          <state>10</state>
+        </option>
+        <option>
+          <name>IjetHWResetDuration</name>
+          <state>300</state>
+        </option>
+        <option>
+          <name>IjetHWResetDelay</name>
+          <state>200</state>
+        </option>
+        <option>
+          <name>IjetPowerFromProbe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPowerRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>IjetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTargetEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetProtocolRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSwoPin</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>IjetSwoPrescalerList</name>
+          <version>1</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetRestoreBreakpointsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetUpdateBreakpointsEdit</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>RDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchUndef</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchData</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchPrefetch</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>RDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>RDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CatchMMERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchNOCPERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchCHKERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchSTATERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchBUSERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchINTERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchHARDERR</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeCfgOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCProbeConfig</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IjetProbeConfigRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetMultiCPUNumber</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetSelectedCPUBehaviour</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ICpuName</name>
+          <state></state>
+        </option>
+        <option>
+          <name>OCJetEmuParams</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetPreferETB</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IjetTraceSettingsList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IjetTraceSizeList</name>
+          <version>0</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>FlashBoardPathSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCIjetUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>JLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>16</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>JLinkSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCJLinkDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCJLinkHWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>JLinkInitialSpeed</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCDoJlinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCScanChainNonARMDevices</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkMultiTarget</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkIRLength</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkCommRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTCPIP</name>
+          <state>aaa.bbb.ccc.ddd</state>
+        </option>
+        <option>
+          <name>CCJLinkSpeedRadioV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCUSBDevice</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRDICatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCRDICatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkBreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkResetList</name>
+          <version>6</version>
+          <state>7</state>
+        </option>
+        <option>
+          <name>CCJLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkScriptFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCTcpIpAlt</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCJLinkTcpIpSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>72.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkTraceSourceDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OCJLinkDeviceName</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>LMIFTDI_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>2</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>LmiftdiSpeed</name>
+          <state>500</state>
+        </option>
+        <option>
+          <name>CCLmiftdiDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiftdiLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCLmiFtdiInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>PEMICRO_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>3</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCJPEMicroShowSettings</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>STLINK_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>4</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceRadio</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCSTLinkInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkResetList</name>
+          <version>3</version>
+          <state>4</state>
+        </option>
+        <option>
+          <name>CCCpuClockEdit</name>
+          <state>48.0</state>
+        </option>
+        <option>
+          <name>CCSwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSwoClockEdit</name>
+          <state>2000</state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCSTLinkDoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkCatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkUsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkJtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSTLinkDAPNumber</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCSTLinkDebugAccessPortRadio</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>THIRDPARTY_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CThirdPartyDriverDll</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CThirdPartyLogFileEditB</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>TIFET_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetInterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVccTypeDefault</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetVoltage</name>
+          <state>###Uninitialized###</state>
+        </option>
+        <option>
+          <name>CCMSPFetVCCDefault</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetTargetSettlingtime</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioJtagSpeedType</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCMSPFetConnection</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetUsbComPort</name>
+          <state>Automatic</state>
+        </option>
+        <option>
+          <name>CCMSPFetAllowAccessToBSL</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetDoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCMSPFetLogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCMSPFetRadioEraseFlash</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>XDS100_ID</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>6</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OCDriverInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TIPackageOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TIPackage</name>
+          <state></state>
+        </option>
+        <option>
+          <name>BoardFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DoLogfile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>LogFile</name>
+          <state>$PROJ_DIR$\cspycomm.log</state>
+        </option>
+        <option>
+          <name>CCXds100BreakpointRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100DoUpdateBreakpoints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UpdateBreakpoints</name>
+          <state>_call_main</state>
+        </option>
+        <option>
+          <name>CCXds100CatchReset</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchUndef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSWI</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchData</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchPrefetch</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchIRQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchFIQ</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCORERESET</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchMMERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchNOCPERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchCHRERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSTATERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchBUSERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchINTERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchSFERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchHARDERR</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CatchDummy</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100CpuClockEdit</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockAuto</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SwoClockEdit</name>
+          <state>1000</state>
+        </option>
+        <option>
+          <name>CCXds100HWResetDelay</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ResetList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNo</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCXds100UsbSerialNoSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100JtagSpeedList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100InterfaceCmdLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100ProbeList</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPortRadio</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCXds100SWOPort</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+        <loadFlag>1</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+      <plugin>
+        <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
+    </debuggerPlugins>
+  </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
new file mode 100644
index 00000000..35977dc9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.ewp
@@ -0,0 +1,1185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <fileVersion>2</fileVersion>
+  <configuration>
+    <name>STM32WL55JC_Nucleo_2_Images_SECoreBin</name>
+    <toolchain>
+      <name>ARM</name>
+    </toolchain>
+    <debug>1</debug>
+    <settings>
+      <name>General</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <version>31</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>ExePath</name>
+          <state>STM32WL55JC_Nucleo/Exe</state>
+        </option>
+        <option>
+          <name>ObjPath</name>
+          <state>STM32WL55JC_Nucleo/Obj</state>
+        </option>
+        <option>
+          <name>ListPath</name>
+          <state>STM32WL55JC_Nucleo/List</state>
+        </option>
+        <option>
+          <name>GEndianMode</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>Input description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>Output description</name>
+          <state>Full formatting, with multibyte support.</state>
+        </option>
+        <option>
+          <name>GOutputBinary</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGCoreOrChip</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelect</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>GRuntimeLibSelectSlave</name>
+          <version>0</version>
+          <state>2</state>
+        </option>
+        <option>
+          <name>RTDescription</name>
+          <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+        </option>
+        <option>
+          <name>OGProductVersion</name>
+          <state>4.41A</state>
+        </option>
+        <option>
+          <name>OGLastSavedByProductVersion</name>
+          <state>8.30.1.17146</state>
+        </option>
+        <option>
+          <name>GeneralEnableMisra</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraVerbose</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGChipSelectEditMenu</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>GenLowLevelInterface</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GEndianModeBE</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGBufferedTerminalOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GenStdoutInterface</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>GeneralMisraVer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GeneralMisraRules04</name>
+          <version>0</version>
+          <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+        </option>
+        <option>
+          <name>RTConfigPath2</name>
+          <state>$TOOLKIT_DIR$\INC\c\DLib_Config_Full.h</state>
+        </option>
+        <option>
+          <name>GBECoreSlave</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGUseCmsis</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGUseCmsisDspLib</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GRuntimeLibThreads</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CoreVariant</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>GFPUDeviceSlave</name>
+          <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+        </option>
+        <option>
+          <name>FPU2</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NrRegs</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>NEON</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>GFPUCoreSlave2</name>
+          <version>26</version>
+          <state>39</state>
+        </option>
+        <option>
+          <name>OGCMSISPackSelectDevice</name>
+        </option>
+        <option>
+          <name>OgLibHeap</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGLibAdditionalLocale</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OGPrintfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGPrintfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfVariant</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OGScanfMultibyteSupport</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>GenLocaleTags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>GenLocaleDisplayOnly</name>
+          <state></state>
+        </option>
+        <option>
+          <name>DSPExtension</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>TrustZone</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>TrustZoneModes</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>ICCARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>34</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>CCOptimizationNoSizeConstraints</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDefines</name>
+          <state>USE_HAL_DRIVER</state>
+          <state>STM32WL55xx</state>
+          <state>CORE_CM0PLUS</state>
+          <state>KMS_ENABLED</state>
+          <state>MBEDTLS_CONFIG_FILE="$PROJ_DIR$\..\Inc\mbed_crypto_config.h"</state>
+          <state>IT_MANAGEMENT_DISABLED</state>
+        </option>
+        <option>
+          <name>CCPreprocFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocComments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPreprocLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMnemonics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListCMessages</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCListAssSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCDiagSuppress</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagRemark</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagWarning</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCDiagError</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCAllowList</name>
+          <version>1</version>
+          <state>11111110</state>
+        </option>
+        <option>
+          <name>CCDebugInfo</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IEndianMode</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IExtraOptionsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IExtraOptions</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CCLangConformance</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCSignedPlainChar</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCRequirePrototypes</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCDiagWarnAreErr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCompilerRuntimeInfo</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>CCLibConfigHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>PreInclude</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CompilerMisraOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCIncludePath2</name>
+          <state>$PROJ_DIR$/../Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+          <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Key</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\include</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+          <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+          <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+          <state>$PROJ_DIR$</state>
+          <state>$PROJ_DIR$\..\..\Sigfox_PushButton_DualCore\CM0PLUS\Sigfox\App</state>
+          <state>$PROJ_DIR$\..\..\Sigfox_PushButton_DualCore\CM0PLUS\Sigfox\Target</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib</state>
+          <state>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest</state>
+        </option>
+        <option>
+          <name>CCStdIncCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCCodeSection</name>
+          <state>.text</state>
+        </option>
+        <option>
+          <name>IProcessorMode2</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevel</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CCOptStrategy</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCOptLevelSlave</name>
+          <state>3</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules98</name>
+          <version>0</version>
+          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+        </option>
+        <option>
+          <name>CompilerMisraRules04</name>
+          <version>0</version>
+          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+        </option>
+        <option>
+          <name>CCPosIndRopi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndRwpi</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCPosIndNoDynInit</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccLang</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCDialect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccAllowVLA</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccStaticDestr</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCppInlineSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IccFloatSemantics</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCNoLiteralPool</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCOptStrategySlave</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCGuardCalls</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncSource</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CCEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CCEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccExceptions2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IccRTTI2</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>AARM</name>
+      <archiveVersion>2</archiveVersion>
+      <data>
+        <version>10</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>AObjPrefix</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AEndian</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>ACaseSensitivity</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacroChars</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnWhat</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AWarnOne</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AWarnRange2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>ADebug</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AltRegisterNames</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ADefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AList</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AListHeader</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AListing</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>Includes</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacDefs</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MacExps</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>MacExec</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>OnlyAssed</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>MultiLine</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLengthCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>PageLength</name>
+          <state>80</state>
+        </option>
+        <option>
+          <name>TabSpacing</name>
+          <state>8</state>
+        </option>
+        <option>
+          <name>AXRef</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDefines</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefInternal</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AXRefDual</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AFpuProcessor</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>AOutputFile</name>
+          <state>$FILE_BNAME$.o</state>
+        </option>
+        <option>
+          <name>ALimitErrorsCheck</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>ALimitErrorsEdit</name>
+          <state>100</state>
+        </option>
+        <option>
+          <name>AIgnoreStdInclude</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AUserIncludes</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AExtraOptionsCheckV2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>AExtraOptionsV2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>AsmNoLiteralPool</name>
+          <state>0</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>OBJCOPY</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>1</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>OOCOutputFormat</name>
+          <version>3</version>
+          <state>3</state>
+        </option>
+        <option>
+          <name>OCOutputOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCOutputFile</name>
+          <state>..\..\SE_Core.bin</state>
+        </option>
+        <option>
+          <name>OOCCommandLineProducer</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>OOCObjCopyEnable</name>
+          <state>1</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>CUSTOM</name>
+      <archiveVersion>3</archiveVersion>
+      <data>
+        <extensions></extensions>
+        <cmdline></cmdline>
+        <hasPrio>0</hasPrio>
+      </data>
+    </settings>
+    <settings>
+      <name>BICOMP</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+    <settings>
+      <name>BUILDACTION</name>
+      <archiveVersion>1</archiveVersion>
+      <data>
+        <prebuild>cmd /C "cmd /C $PROJ_DIR$\prebuild.bat "$PROJ_DIR$" "</prebuild>
+        <postbuild></postbuild>
+      </data>
+    </settings>
+    <settings>
+      <name>ILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>21</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IlinkLibIOConfig</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>XLinkMisraHandler</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkInputFileSlave</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOutputFile</name>
+          <state>Project.out</state>
+        </option>
+        <option>
+          <name>IlinkDebugInfoEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkKeepSymbols</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySymbol</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinarySegment</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkRawBinaryAlign</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkConfigDefines</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkMapFile</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogFile</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogInitialization</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogModule</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogSection</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogVeneer</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfOverride</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile</name>
+          <state>$PROJ_DIR$\stm32wl55xx_flash_cm0plus.icf</state>
+        </option>
+        <option>
+          <name>IlinkIcfFileSlave</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEnableRemarks</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkSuppressDiags</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsRem</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsWarn</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkTreatAsErr</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkWarningsAreErrors</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkUseExtraOptions</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkExtraOptions</name>
+          <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+        </option>
+        <option>
+          <name>IlinkLowLevelInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAutoLibEnable</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkAdditionalLibs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkOverrideProgramEntryLabel</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabelSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkProgramEntryLabel</name>
+          <state>SE_CallGate</state>
+        </option>
+        <option>
+          <name>DoFill</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>FillerByte</name>
+          <state>0xFF</state>
+        </option>
+        <option>
+          <name>FillerStart</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>FillerEnd</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>CrcSize</name>
+          <version>0</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcAlign</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcPoly</name>
+          <state>0x11021</state>
+        </option>
+        <option>
+          <name>CrcCompl</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcBitOrder</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CrcInitialValue</name>
+          <state>0x0</state>
+        </option>
+        <option>
+          <name>DoCrc</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkBE8Slave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkBufferedTerminalOutput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkStdoutInterfaceSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcFullSize</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIElfToolPostProcess</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogAutoLibSelect</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogRedirSymbols</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkLogUnusedFragments</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptInline</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsAllow</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptExceptionsForce</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCmsis</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptMergeDuplSections</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkOptUseVfe</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkOptForceVfe</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackAnalysisEnable</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkStackControlFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkStackCallGraphFile</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CrcAlgorithm</name>
+          <version>1</version>
+          <state>1</state>
+        </option>
+        <option>
+          <name>CrcUnitSize</name>
+          <version>0</version>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkThreadsSlave</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLogCallGraph</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkIcfFile_AltDefault</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IlinkEncInput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutput</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkEncOutputBom</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkHeapSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkLocaleSelect</name>
+          <state>1</state>
+        </option>
+        <option>
+          <name>IlinkTrustzoneImportLibraryOut</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>IARCHIVE</name>
+      <archiveVersion>0</archiveVersion>
+      <data>
+        <version>0</version>
+        <wantNonLocal>1</wantNonLocal>
+        <debug>1</debug>
+        <option>
+          <name>IarchiveInputs</name>
+          <state></state>
+        </option>
+        <option>
+          <name>IarchiveOverride</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IarchiveOutput</name>
+          <state>###Uninitialized###</state>
+        </option>
+      </data>
+    </settings>
+    <settings>
+      <name>BILINK</name>
+      <archiveVersion>0</archiveVersion>
+      <data/>
+    </settings>
+  </configuration>
+  <group>
+    <name>Doc</name>
+    <file>
+      <name>$PROJ_DIR$\..\readme.txt</name>
+    </file>
+  </group>
+  <group>
+    <name>Application</name>
+    <group>
+      <name>User</name>
+      <file>
+        <name>$PROJ_DIR$\..\Src\se_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\kms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\nvms_low_level.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\Src\ca_low_level.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Drivers</name>
+    <group>
+      <name>STM32WLxx_HAL_Driver</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_crc_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pka.c</name>
+      </file>
+    </group>
+  </group>
+  <group>
+    <name>Middlewares</name>
+    <group>
+      <name>STM32_Secure_Engine</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_callgate.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_exception.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_fwimg.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_startup.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_user_application.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Core\se_utils.c</name>
+      </file>
+    </group>
+    <group>
+      <name>STM32_Key_Management_Services</name>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_der_x962.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_ecc.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_entry.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_init.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_mem.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Core\kms_platf_objects.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_digest.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_dyn_obj.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_enc_dec.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_key_mgt.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_nvm_storage.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Modules\kms_sign_verify.c</name>
+      </file>
+      <file>
+        <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\ST\STM32_Key_Management_Services\Interface\CryptoApi\ca_core.c</name>
+      </file>
+    </group>
+    <group>
+      <name>Third_Party</name>
+      <group>
+        <name>mbed-crypto</name>
+        <file>
+          <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\mbed-crypto\library\sha256.c</name>
+        </file>
+      </group>
+    </group>
+  </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww
new file mode 100644
index 00000000..7f76633d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Project.ewp</path>
+  </project>
+  <batchBuild/>
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..a6db3625
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,148 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_Sigfox_PushButton_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o %offset% %headerbin%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..e4dc9528
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,143 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_Sigfox_PushButton_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o %offset% %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..9f97379a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,147 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\EWARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_Sigfox_PushButton_DualCore_CM0Plus.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM4\\Exe\\Project.out"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\EWARM\\CM0PLUS\\Exe\\Project.out"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\EWARM\\mapping_fwimg.icf"
+set "magic=SFU%fwid%"
+set "offset=512"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o %offset% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o %offset% %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "__ICFEDIT_SLOT_Active_%fwid%_header__" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -v 0  -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
new file mode 100644
index 00000000..83291a72
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V6M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..1672cb97
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,30 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+define memory mem with size = 4G;
+
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+/******************************************************************************/
+/*       Include of SE symbols file                                           */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit};
+
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+/******************************************************************************/
+/*                          placement instructions                            */
+/******************************************************************************/
+place at address mem:__ICFEDIT_SE_CallGate_region_ROM_start__ { readonly section .SE_CallGate_Code };
+place at address mem:__ICFEDIT_SE_Startup_region_ROM_start__ { readonly section .SE_Startup_Code};
+place in SE_CODE_NOKEY_ROM_region {readonly};
+place in User_Key_ROM_region { section .USER_embedded_Keys };
+keep { section .USER_embedded_Keys };
+place in SE_Key_ROM_region { readonly section .SE_embedded_Keys };
+keep { section .SE_embedded_Keys };
+place in SE_RAM_region {readwrite, block HEAP};
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
new file mode 100644
index 00000000..7847dbb0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_conf.h
@@ -0,0 +1,639 @@
+/**
+  ******************************************************************************
+  * @file    ca_conf.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Cryptographic API (CA)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_CONF_H
+#define CA_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Cryptographic_API Cryptographic API (CA)
+  * @{
+  */
+
+/** @defgroup CA_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup CA_Crypto_Libraries Cryptographic Libraries
+  * @{
+  */
+
+/**
+  * @brief Define CA_ST_CRYPTOLIB_SUPP to use services from ST Cryptographic firmware Library
+  * @note  More details on this library can be found here www.st.com/en/embedded-software/x-cube-cryptolib.html
+  */
+/*#define CA_ST_CRYPTOLIB_SUPP*/
+
+/**
+  * @brief Define CA_MBED_CRYPTOLIB_SUPP to use services from the Mbed Cryptography Library
+  * @note  More details on this library can be found here github.com/ARMmbed/mbed-crypto
+  */
+#define CA_MBED_CRYPTOLIB_SUPP
+
+/**
+  * @brief Define CA_HAL_CRYPTOLIB_SUPP to use services from the STM32Cube HAL drivers
+  * @note  HAL drivers can be used to access cryptographic services of specific IP peripherals
+  *        Supported IP peripherals are CRYP & PKA
+  */
+#define CA_HAL_CRYPTOLIB_SUPP
+
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Features_Config Supported Features
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RNG to support RNG cryptographic algorithm
+  */
+/* #define CA_FEAT_RNG */
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define the below line to support AES cryptographic algorithm
+  */
+#define CA_FEAT_AES
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_AES_Features_Config AES Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_AES_ENCRYPT to support AES cryptographic algorithm encryption
+  */
+#define CA_FEAT_AES_ENCRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_DECRYPT to support AES cryptographic algorithm decryption
+  */
+#define CA_FEAT_AES_DECRYPT
+
+/**
+  * @brief Define CA_FEAT_AES_128BITS to support AES cryptographic algorithm on 128 bits length keys
+  */
+#define CA_FEAT_AES_128BITS
+
+/**
+  * @brief Define CA_FEAT_AES_192BITS to support AES cryptographic algorithm on 192 bits length keys
+  */
+/* #define CA_FEAT_AES_192BITS */
+
+/**
+  * @brief Define CA_FEAT_AES_256BITS to support AES cryptographic algorithm on 256 bits length keys
+  */
+#define CA_FEAT_AES_256BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+/**
+  * @brief Define CA_FEAT_HASH to support HASH cryptographic algorithm
+  */
+#define CA_FEAT_HASH
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC to support ECC cryptographic algorithm
+  */
+#define CA_FEAT_ECC
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_ECC_VERIFY to support ECC cryptographic algorithm verification
+  */
+#define CA_FEAT_ECC_VERIFY
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+/**
+  * @brief Define CA_FEAT_RSA to support RSA cryptographic algorithm
+  */
+/* #define CA_FEAT_RSA */
+
+/**
+  * @}
+  */
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_ECC_Features_Config ECC Feature Configuration
+  * @{
+  */
+
+/**
+  * @brief Define CA_FEAT_RSA_SIGN to support RSA cryptographic algorithm signature
+  */
+#define CA_FEAT_RSA_SIGN
+
+/**
+  * @brief Define CA_FEAT_RSA_VERIFY to support RSA cryptographic algorithm verification
+  */
+#define CA_FEAT_RSA_VERIFY
+
+/**
+  * @brief Define CA_FEAT_RSA_1024BITS to support RSA cryptographic algorithm on 1024 bits length modulus
+  */
+#define CA_FEAT_RSA_1024BITS
+
+/**
+  * @brief Define CA_FEAT_RSA_2048BITS to support RSA cryptographic algorithm on 2048 bits length modulus
+  */
+#define CA_FEAT_RSA_2048BITS
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/** @defgroup CA_Router_Config Algorithms Router & Configuration
+  * @{
+  */
+
+/** @defgroup CA_Router_Config_Def Router defines
+  * @note     Masks & Defines to use to configure algorithm routing options
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_MASK to extract configured route from algorithm configuration definition
+  */
+#define CA_ROUTE_MASK   (0xFUL)
+
+/**
+  * @brief Use CA_ROUTE_ST to make the configured algorithm using ST Cryptographic firmware Library
+  * @note  See @ref CA_ST_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_ST     (1UL)
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#define CA_ROUTE_ST     (0UL)
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_MBED to make the configured algorithm using Mbed Cryptography Library
+  * @note  See @ref CA_MBED_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_MBED   (2UL)
+#else /* CA_MBED_CRYPTOLIB_SUPP */
+#define CA_ROUTE_MBED   (0UL)
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/**
+  * @brief Use CA_ROUTE_HAL to make the configured algorithm using STM32Cube HAL drivers
+  * @note  See @ref CA_HAL_CRYPTOLIB_SUPP for more details
+  */
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_HAL    (3UL)
+#else /* CA_HAL_CRYPTOLIB_SUPP */
+#define CA_ROUTE_HAL    (0UL)
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if !defined(CA_ROUTE_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_DEFAULT to choose default route for the configured algorithm
+  * @note  Default is chosen as below described:
+  *        - If CA_ST_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_ST
+  *        - else if CA_MBED_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_MBED
+  *        - else if CA_HAL_CRYPTOLIB_SUPP is defined, default route is CA_ROUTE_HAL
+  */
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_ST
+#elif defined(CA_MBED_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_MBED
+#elif defined(CA_HAL_CRYPTOLIB_SUPP)
+#define CA_ROUTE_DEFAULT  CA_ROUTE_HAL
+#else /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+#endif /* CA_ROUTE_DEFAULT */
+
+/**
+  * @}
+  */
+#if defined(CA_FEAT_RNG)
+/** @defgroup CA_Router_Config_RNG_Def RNG Defines
+  * @note     Masks & Defines to use to configure RNG algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief RNG configuration
+  * @note  Define CA_ROUTE_RNG to enable RNG algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_RNG  (CA_ROUTE_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RNG */
+
+#if defined(CA_FEAT_AES)
+/** @defgroup CA_Router_Config_AES_Def AES Defines
+  * @note     Masks & Defines to use to configure AES algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_ENCRYPT_ENABLE to enable encryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_ENCRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_ENCRYPT)
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (1UL << 8)
+#else /* CA_FEAT_AES_ENCRYPT */
+#define CA_ROUTE_AES_CFG_ENCRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_ENCRYPT */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DECRYPT_ENABLE to enable decryption for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_DECRYPT to be defined
+  */
+#if defined(CA_FEAT_AES_DECRYPT)
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (1UL << 9)
+#else /* CA_FEAT_AES_DECRYPT */
+#define CA_ROUTE_AES_CFG_DECRYPT_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_DECRYPT */
+
+/**
+  * @brief Use CA_ROUTE_AES_CFG_128BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_128BITS to be defined
+  */
+#if defined(CA_FEAT_AES_128BITS)
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (1UL << 10)
+#else /* CA_FEAT_AES_128BITS */
+#define CA_ROUTE_AES_CFG_128BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_128BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_192BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_192BITS to be defined
+  */
+#if defined(CA_FEAT_AES_192BITS)
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (1UL << 11)
+#else /* CA_FEAT_AES_192BITS */
+#define CA_ROUTE_AES_CFG_192BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_192BITS */
+/**
+  * @brief Use CA_ROUTE_AES_CFG_256BITS_ENABLE to enable 128 bits key length for the configured AES algorithm
+  * @note  Requires @ref CA_FEAT_AES_256BITS to be defined
+  */
+#if defined(CA_FEAT_AES_256BITS)
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_AES_256BITS */
+#define CA_ROUTE_AES_CFG_256BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_AES_256BITS */
+
+#if !defined(CA_ROUTE_AES_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_AES_CFG_DEFAULT to choose default settings for the configured AES algorithm
+  * @note  Default is: encryption & decryption using 128, 192 & 256 bits lengths keys enabled
+  */
+#define CA_ROUTE_AES_CFG_DEFAULT  (CA_ROUTE_AES_CFG_ENCRYPT_ENABLE  \
+                                   | CA_ROUTE_AES_CFG_DECRYPT_ENABLE \
+                                   | CA_ROUTE_AES_CFG_128BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_192BITS_ENABLE \
+                                   | CA_ROUTE_AES_CFG_256BITS_ENABLE)
+#endif /* CA_ROUTE_AES_CFG_DEFAULT */
+
+/**
+  * @}
+  */
+
+/** @defgroup CA_Router_Config_AES AES Algorithms configurations
+  * @{
+  */
+
+/**
+  * @brief AES CBC configuration
+  * @note  Define CA_ROUTE_AES_CBC to enable AES CBC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CBC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CCM configuration
+  * @note  Define CA_ROUTE_AES_CCM to enable AES CCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES CMAC configuration
+  * @note  Define CA_ROUTE_AES_CMAC to enable AES CMAC algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_CMAC  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES ECB configuration
+  * @note  Define CA_ROUTE_AES_ECB to enable AES ECB algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_ECB  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @brief AES GCM configuration
+  * @note  Define CA_ROUTE_AES_GCM to enable AES GCM algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_AES_CFG_ENCRYPT_ENABLE    Encryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_DECRYPT_ENABLE    Decryption is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_128BITS_ENABLE    128 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_192BITS_ENABLE    192 bits key length is enabled for this algorithm
+  *          * @ref CA_ROUTE_AES_CFG_256BITS_ENABLE    256 bits key length is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_AES_CFG_DEFAULT to use default AES algorithm configuration
+  */
+#define CA_ROUTE_AES_GCM  (CA_ROUTE_HAL | CA_ROUTE_AES_CFG_DEFAULT)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_AES */
+
+#if defined(CA_FEAT_HASH)
+/** @defgroup CA_Router_Config_HASH_Def HASH Defines
+  * @note     Masks & Defines to use to configure HASH algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief HASH SHA1 configuration
+  * @note  Define CA_ROUTE_HASH_SHA1 to enable HASH SHA1 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+/* #define CA_ROUTE_HASH_SHA1  (CA_ROUTE_DEFAULT) */
+
+/**
+  * @brief HASH SHA256 configuration
+  * @note  Define CA_ROUTE_HASH_SHA256 to enable HASH SHA256 algorithm
+  * @note  This define is a bit mask that includes 1 kind of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  */
+#define CA_ROUTE_HASH_SHA256  (CA_ROUTE_MBED)
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_HASH */
+
+#if defined(CA_FEAT_ECC)
+/** @defgroup CA_Router_Config_ECC_Def ECC Defines
+  * @note     Masks & Defines to use to configure ECC algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_VERIFY_ENABLE to enable verification for the configured ECC algorithm
+  * @note  Requires @ref CA_FEAT_ECC_VERIFY to be defined
+  */
+#if defined(CA_FEAT_ECC_VERIFY)
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_ECC_VERIFY */
+#define CA_ROUTE_ECC_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_ECC_VERIFY */
+
+
+#if !defined(CA_ROUTE_ECC_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_ECC_CFG_DEFAULT to choose default settings for the configured ECC algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_ECC_CFG_DEFAULT  (CA_ROUTE_ECC_CFG_VERIFY_ENABLE)
+#endif /* CA_ROUTE_ECC_CFG_DEFAULT */
+
+/**
+  * @brief ECC ECDSA configuration
+  * @note  Define CA_ROUTE_ECC_ECDSA to enable ECC ECDSA algorithm
+  * @note  Requires CA_ROUTE_RNG to be defined
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_ECC_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_ECC_CFG_DEFAULT to use default ECC algorithm configuration
+  */
+#define CA_ROUTE_ECC_ECDSA  (CA_ROUTE_HAL | CA_ROUTE_ECC_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_ECC */
+
+
+#if defined(CA_FEAT_RSA)
+/** @defgroup CA_Router_Config_RSA_Def RSA Defines
+  * @note     Masks & Defines to use to configure RSA algorithm supported features
+  * @{
+  */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_SIGN_ENABLE to enable signature for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_SIGN to be defined
+  */
+#if defined(CA_FEAT_RSA_SIGN)
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (1UL << 8)
+#else /* CA_FEAT_RSA_SIGN */
+#define CA_ROUTE_RSA_CFG_SIGN_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_SIGN */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_VERIFY_ENABLE to enable verification for the configured RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_VERIFY to be defined
+  */
+#if defined(CA_FEAT_RSA_VERIFY)
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (1UL << 9)
+#else /* CA_FEAT_RSA_VERIFY */
+#define CA_ROUTE_RSA_CFG_VERIFY_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_VERIFY */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_1024BITS_ENABLE to enable support of 1024 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_1024BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_1024BITS)
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (1UL << 12)
+#else /* CA_FEAT_RSA_1024BITS */
+#define CA_ROUTE_RSA_CFG_1024BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_1024BITS */
+
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_2048BITS_ENABLE to enable support of 2048 bits length modulus for the configured
+  *        RSA algorithm
+  * @note  Requires @ref CA_FEAT_RSA_2048BITS to be defined
+  */
+#if defined(CA_FEAT_RSA_2048BITS)
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (1UL << 13)
+#else /* CA_FEAT_RSA_2048BITS */
+#define CA_ROUTE_RSA_CFG_2048BITS_ENABLE     (0UL)
+#endif /* CA_FEAT_RSA_2048BITS */
+
+
+#if !defined(CA_ROUTE_RSA_CFG_DEFAULT)
+/**
+  * @brief Use CA_ROUTE_RSA_CFG_DEFAULT to choose default settings for the configured RSA algorithm
+  * @note  Default is: signature & verification enabled
+  */
+#define CA_ROUTE_RSA_CFG_DEFAULT  (CA_ROUTE_RSA_CFG_SIGN_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_VERIFY_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_1024BITS_ENABLE\
+                                   | CA_ROUTE_RSA_CFG_2048BITS_ENABLE)
+#endif /* CA_ROUTE_RSA_CFG_DEFAULT */
+
+/**
+  * @brief RSA configuration
+  * @note  Define CA_ROUTE_RSA to enable RSA algorithm
+  * @note  This define is a bit mask that includes 2 kinds of information
+  *        - The cryptographic library to use to serve this algorithm (choose one of the below elements)
+  *          * @ref CA_ROUTE_ST      Use ST cryptographic library
+  *          * @ref CA_ROUTE_MBED    Use MBED cryptographic library
+  *          * @ref CA_ROUTE_HAL     Use HAL drivers
+
+  *        - The algorithm specific configuration (use a combination of the below elements)
+  *          * @ref CA_ROUTE_RSA_CFG_SIGN_ENABLE      Signature is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_VERIFY_ENABLE    Verification is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_1024BITS_ENABLE  1024 bits length modulus is enabled for this algorithm
+  *          * @ref CA_ROUTE_RSA_CFG_2048BITS_ENABLE  2048 bits length modulus is enabled for this algorithm
+  * @note  You can use @ref CA_ROUTE_DEFAULT to use default route
+  * @note  You can use @ref CA_ROUTE_RSA_CFG_DEFAULT to use default RSA algorithm configuration
+  */
+#define CA_ROUTE_RSA  (CA_ROUTE_HAL | CA_ROUTE_RSA_CFG_DEFAULT)
+
+
+/**
+  * @}
+  */
+#endif /* CA_FEAT_RSA */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
new file mode 100644
index 00000000..64ef96b3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/ca_low_level.h
@@ -0,0 +1,77 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains the low level definitions of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_H
+#define CA_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+/*
+ * STM32 target HAL driver include
+ * ex: stm32l4xx_hal.h
+ */
+#include "stm32wlxx_hal.h"
+
+/* Exported constants --------------------------------------------------------*/
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * AES/CRYP instance to use
+ * ex: AES1
+ */
+#define CA_AES_INSTANCE     (AES)
+
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/*
+ * PKA instance to use
+ * ex: PKA
+ */
+#define CA_PKA_INSTANCE     (PKA)
+
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+
+/* Exported function ---------------------------------------------------------*/
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+void CA_LL_CRC_Init(void);
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CA_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h
new file mode 100644
index 00000000..20ad4cb3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_config.h
@@ -0,0 +1,530 @@
+/**
+  ******************************************************************************
+  * @file    kms_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains configuration for Key Management Services (KMS)
+  *          module functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_CONFIG_H
+#define KMS_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @defgroup KMS_Configuration Global configuration
+  * @{
+  */
+
+/** @defgroup KMS_HW_Config Hardware
+  * @{
+  */
+
+/**
+  * @brief KMS_EXT_TOKEN_ENABLED Uncomment the below line to support External Token
+  */
+/*#define KMS_EXT_TOKEN_ENABLED*/
+
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Storage_Config Storage
+  * @{
+  */
+
+/**
+  * @brief KMS_NVM_ENABLED Uncomment the below line to support Non Volatile
+  *        Memory storage
+  * @note  Mandatory to handle runtime objects addition through blob import or
+  *        creation through specific KMS services
+  */
+#define KMS_NVM_ENABLED
+
+/**
+  * @brief KMS_NVM_DYNAMIC_ENABLED Uncomment the below line to support Non
+  *        Volatile Memory storage
+  * @note  Mandatory to handle runtime objects creation through specific KMS services
+  * @note  Requires @ref KMS_NVM_ENABLED to be defined
+  */
+#define KMS_NVM_DYNAMIC_ENABLED
+
+/**
+  * @brief KMS_NVM_SLOT_NUMBERS Specify here the number of slots to use in the Non Volatile Memory storage
+  * @note  NVM slots correspond to storage slots, it should be at least equal to the number of keys you'll store
+  *        into NVM. But if you intend to manipulate objects (create, destroy, derivate...) better use a greater
+  *        number to avoid too much erase of the flash sectors containing the NVM storage.
+  * @note  Memory impact is a 4 bytes per slot to store slot address in NVM.
+  * @note  Mandatory to set if @ref KMS_NVM_ENABLED is defined
+  */
+#define KMS_NVM_SLOT_NUMBERS                    (40UL)
+
+/**
+  * @}
+  */
+
+/** @defgroup KMS_Config Services
+  * @{
+  */
+/**
+  * @brief KMS_NB_SESSIONS_MAX Defines the number of sessions KMS will be able
+  *        to handle in parallel
+  * @note  This value has an impact on memory footprint
+  */
+#define KMS_NB_SESSIONS_MAX                     (10UL)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_PKCS_Config PKCS#11 services
+  * @{
+  */
+
+/**
+  * @brief KMS_ENCRYPT Uncomment the below line to support encryption services
+  * @note  Requires a supported encryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_ENCRYPT
+
+/**
+  * @brief KMS_DECRYPT Uncomment the below line to support decryption services
+  * @note  Requires a supported decryption algorithm to be enabled too:
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_AES_CCM
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_AES_GCM
+  */
+#define KMS_DECRYPT
+
+/**
+  * @brief KMS_DIGEST Uncomment the below line to support digest services
+  * @note  Requires a supported digest algorithm to be enabled too:
+  *        @ref KMS_SHA1
+  *        @ref KMS_SHA256
+  */
+#define KMS_DIGEST
+
+/**
+  * @brief KMS_SIGN Uncomment the below line to support signature services
+  * @note  Requires a supported signature algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_SIGN
+
+/**
+  * @brief KMS_VERIFY Uncomment the below line to support verification services
+  * @note  Requires a supported verification algorithm to be enabled too:
+  *        @ref KMS_RSA
+  *        @ref KMS_ECDSA
+  *        @ref KMS_AES_CMAC
+  */
+#define KMS_VERIFY
+
+/**
+  * @brief KMS_DERIVE_KEY Uncomment the below line to support key derivation services
+  * @note  Requires a supported derivation algorithm to be enabled too:
+  *        @ref KMS_AES_ECB
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store derived key into NVM
+  */
+#define KMS_DERIVE_KEY
+
+/**
+  * @brief KMS_SEARCH Uncomment the below line to support key search or mechanism search services
+  */
+#define KMS_SEARCH
+
+/**
+  * @brief KMS_GENERATE_KEYS Uncomment the below line to support key generation services
+  * @note  Requires a supported key generation algorithm to be enabled too:
+  *        @ref KMS_ECDSA
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to store generated key into NVM
+  */
+/*#define KMS_GENERATE_KEYS*/
+
+/**
+  * @brief KMS_ATTRIBUTES Uncomment the below line to support attributes manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled in order to modify attributes
+  */
+#define KMS_ATTRIBUTES
+
+/**
+  * @brief KMS_OBJECTS Uncomment the below line to support objects manipulation services
+  * @note  Requires @ref KMS_NVM_DYNAMIC_ENABLED to be enabled to create or delete objects into NVM
+  */
+#define KMS_OBJECTS
+
+/**
+  * @brief KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT Uncomment the below line to support C_GetFunctionList API
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_GET_FUNCTION_LIST_SUPPORT*/
+
+/**
+  * @brief KMS_PKCS11_COMPLIANCE Uncomment the below line to support PKCS11 APIs and implementation that are required
+  *        to be compliant with PKCS11 standard
+  * @note  Disabling this feature allows to save some code footprint
+  */
+/*#define KMS_PKCS11_COMPLIANCE*/
+
+/**
+  * @brief KMS_NIKMS_ROUTER_BYPASS Uncomment the below line to bypass KMS router and perform direct KMS API calls
+  * @note  Only applicable when using 'niKMS' access
+  * @note  Enabling this feature allows to save some code footprint, but forbid any use of the external token services
+  */
+/*#define KMS_NIKMS_ROUTER_BYPASS*/
+
+/**
+  * @brief KMS_IMPORT_BLOB Uncomment the below line to use vendor defined blob import features
+  * @note  Requires @ref KMS_NVM_ENABLED to store imported keys
+  * @note  Requires the following services and algorithm to Authenticate, Verify and decrypt the imported blobs:
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_AES_CBC
+  *        @ref KMS_DIGEST
+  *        @ref KMS_SHA256
+  *        @ref KMS_VERIFY
+  *        @ref KMS_ECDSA
+  *        @ref KMS_EC_SECP256
+  */
+#define KMS_IMPORT_BLOB
+
+/**
+  * @brief KMS_IMPORT_BLOB_CHUNK_SIZE Configure the blob importation chunk size
+  * @note  This size must be a multiple of 4
+  * @note  This size must be greater to at least the blob import header size
+  * @note  Requires @ref KMS_IMPORT_BLOB to be enabled
+  */
+#define KMS_IMPORT_BLOB_CHUNK_SIZE      (512U)
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Memory_Config Memory management
+  * @{
+  */
+
+/**
+  * @brief KMS_MEM_USE_HEAP_ALLOCATOR Uncomment the below line to perform dynamic allocation in HEAP
+  * @note  KMS will use standard malloc and free APIs
+  * @note  Requires a dynamic allocator provided by the toolchain like dlmalloc
+  * @note  KMS_MEM_USE_HEAP_ALLOCATOR and KMS_MEM_USE_POOL_ALLOCATOR are mutually exclusive
+  */
+/*#define KMS_MEM_USE_HEAP_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_USE_POOL_ALLOCATOR Uncomment the below line to perform dynamic allocation using internal pool
+  *        allocator
+  * @note  Requires a pool definition in a file called kms_mem_pool_def.h (see kms_mem_pool_def_template.h for example)
+  */
+#define KMS_MEM_USE_POOL_ALLOCATOR
+
+/**
+  * @brief KMS_MEM_USE_CUSTOM_ALLOCATOR Uncomment the below line to perform dynamic
+  *        allocation using a custom allocator
+  * @note  To use this custom allocator, implement the kms_mem_low_level.c
+  *        - void KMS_MemInit(void)
+  *        - CK_VOID_PTR KMS_Alloc(CK_SESSION_HANDLE session, size_t size)
+  *        - void KMS_Free(CK_SESSION_HANDLE session, CK_VOID_PTR ptr)
+  */
+/*#define KMS_MEM_USE_CUSTOM_ALLOCATOR*/
+
+/**
+  * @brief KMS_MEM_DEBUGGING Uncomment the below line to keep memory profiling information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_DEBUGGING
+
+/**
+  * @brief KMS_MEM_CLEANING Uncomment the below line to clean dynamically freed memory
+  * @note  The freed memory will be reset to 0
+  * @note  If using @ref KMS_MEM_USE_HEAP_ALLOCATOR, @ref KMS_MEM_DEBUGGING required
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  */
+#define KMS_MEM_CLEANING
+
+/**
+  * @brief KMS_MEM_LOGGING Uncomment the below line to log memory allocation information
+  * @note  Not usable with @ref KMS_MEM_USE_CUSTOM_ALLOCATOR
+  * @note  Information about allocations will be transmitted to @ref KMS_LL_ReportMemAlloc and @ref KMS_LL_ReportMemFree
+  */
+/*#define KMS_MEM_LOGGING*/
+
+/**
+  * @}
+  */
+
+
+/** @defgroup KMS_Security_Config Security Enforcement
+  * @{
+  */
+
+/**
+  * @brief KMS_SE_CHECK_PARAMS Uncomment the below line to check input & output parameters location vs secure enclave
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_CHECK_PARAMS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS Uncomment the below line to use key locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_KEYS
+
+/**
+  * @brief KMS_SE_LOCK_KEYS_MAXIMUM Specify here the number of keys that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_KEYS is defined
+  */
+#define KMS_SE_LOCK_KEYS_MAX                 (10UL)
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES Uncomment the below line to use services locking services
+  * @note  Secure enforcement only applicable when using iKMS and secure enclave
+  */
+#define KMS_SE_LOCK_SERVICES
+
+/**
+  * @brief KMS_SE_LOCK_SERVICES_MAX Specify here the number of services that can be locked
+  * @note  Mandatory to set if @ref KMS_SE_LOCK_SERVICES is defined
+  */
+#define KMS_SE_LOCK_SERVICES_MAX             (2UL)
+
+/**
+  * @}
+  */
+
+/** Function flag definition to be used to qualify algorithm usage **/
+
+#if defined(KMS_ENCRYPT)
+#define KMS_FCT_ENCRYPT         (1UL << 0)
+#else /* KMS_ENCRYPT */
+#define KMS_FCT_ENCRYPT         (0UL << 0)
+#endif /* KMS_ENCRYPT */
+#if defined(KMS_DECRYPT)
+#define KMS_FCT_DECRYPT         (1UL << 1)
+#else /* KMS_DECRYPT */
+#define KMS_FCT_DECRYPT         (0UL << 1)
+#endif /* KMS_DECRYPT */
+#if defined(KMS_SIGN)
+#define KMS_FCT_SIGN            (1UL << 2)
+#else /* KMS_SIGN */
+#define KMS_FCT_SIGN            (0UL << 2)
+#endif /* KMS_SIGN */
+#if defined(KMS_VERIFY)
+#define KMS_FCT_VERIFY          (1UL << 3)
+#else /* KMS_VERIFY */
+#define KMS_FCT_VERIFY          (0UL << 3)
+#endif /* KMS_VERIFY */
+#if defined(KMS_DERIVE_KEY)
+#define KMS_FCT_DERIVE_KEY      (1UL << 4)
+#else /* KMS_DERIVE_KEY */
+#define KMS_FCT_DERIVE_KEY      (0UL << 4)
+#endif /* KMS_DERIVE_KEY */
+#if defined(KMS_GENERATE_KEYS)
+#define KMS_FCT_GENERATE_KEYS   (1UL << 5)
+#else /* KMS_GENERATE_KEYS */
+#define KMS_FCT_GENERATE_KEYS   (0UL << 5)
+#endif /* KMS_GENERATE_KEYS */
+#if defined(KMS_DIGEST)
+#define KMS_FCT_DIGEST          (1UL << 6)
+#else /* KMS_DIGEST */
+#define KMS_FCT_DIGEST          (0UL << 6)
+#endif /* KMS_DIGEST */
+
+/** @defgroup KMS_Features_Config Features
+  * @{
+  */
+
+/**
+  * @brief KMS_AES_CBC Uncomment the below line to support AES CBC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_CBC           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CCM Uncomment the below line to support AES CCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+/*#define KMS_AES_CCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)*/
+
+/**
+  * @brief KMS_AES_ECB Uncomment the below line to support AES ECB algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  *        @ref KMS_DERIVE_KEY
+  */
+#define KMS_AES_ECB           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT|KMS_FCT_DERIVE_KEY)
+
+/**
+  * @brief KMS_AES_GCM Uncomment the below line to support AES GCM algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_ENCRYPT          This algorithm can be used to perform encryption
+  *        - KMS_FCT_DECRYPT          This algorithm can be used to perform decryption
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_ENCRYPT
+  *        @ref KMS_DECRYPT
+  */
+#define KMS_AES_GCM           (KMS_FCT_ENCRYPT|KMS_FCT_DECRYPT)
+
+/**
+  * @brief KMS_AES_CMAC Uncomment the below line to support AES CMAC algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  */
+#define KMS_AES_CMAC          (KMS_FCT_SIGN|KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_RSA Uncomment the below line to support RSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_SIGN             This algorithm can be used to perform signature
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_SIGN
+  *        @ref KMS_VERIFY
+  * @note  Requires at least one of the following RSA modulus length to be enabled:
+  *        @ref KMS_RSA_1024
+  *        @ref KMS_RSA_2048
+  */
+/* #define KMS_RSA               (KMS_FCT_SIGN|KMS_FCT_VERIFY) */
+
+/**
+  * @brief KMS_RSA_1024 Uncomment the below line to support RSA 1024 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+/* #define KMS_RSA_1024 */
+
+/**
+  * @brief KMS_RSA_2048 Uncomment the below line to support RSA 2048 bits modulus length
+  * @note  Requires @ref KMS_RSA to be defined
+  */
+/* #define KMS_RSA_2048 */
+
+/**
+  * @brief KMS_ECDSA Uncomment the below line to support ECDSA algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_VERIFY           This algorithm can be used to perform verification
+  *        - KMS_FCT_DERIVE_KEY       This algorithm can be used to perform key derivation
+  *        - KMS_FCT_GENERATE_KEYS    This algorithm can be used to perform key generation
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_VERIFY
+  *        @ref KMS_DERIVE_KEY
+  *        @ref KMS_GENERATE_KEYS
+  * @note  Requires at least one of the following elliptic curve to be enabled:
+  *        @ref KMS_EC_SECP192
+  *        @ref KMS_EC_SECP256
+  *        @ref KMS_EC_SECP384
+  */
+#define KMS_ECDSA             (KMS_FCT_VERIFY)
+
+/**
+  * @brief KMS_EC_SECP192 Uncomment the below line to support elliptic curve SECP-192
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP192*/
+
+/**
+  * @brief KMS_EC_SECP256 Uncomment the below line to support elliptic curve SECP-256
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+#define KMS_EC_SECP256
+
+/**
+  * @brief KMS_EC_SECP384 Uncomment the below line to support elliptic curve SECP-384
+  * @note  Requires @ref KMS_ECDSA to be defined
+  */
+/*#define KMS_EC_SECP384*/
+
+/**
+  * @brief KMS_SHA1 Uncomment the below line to support SHA1 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+/*#define KMS_SHA1              (KMS_FCT_DIGEST)*/
+
+/**
+  * @brief KMS_SHA256 Uncomment the below line to support SHA256 digest algorithm
+  * @note  This defines is a bit mask that include information on the algorithm purpose:
+  *        - KMS_FCT_DIGEST          This algorithm can be used to perform digesting
+  * @note  Requires at least one of the following PKCS#11 services to be enabled:
+  *        @ref KMS_DIGEST
+  */
+#define KMS_SHA256            (KMS_FCT_DIGEST)
+
+
+
+/** @defgroup KMS_Debug_Config Debug
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
new file mode 100644
index 00000000..ae3e8d6b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_low_level.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef KMS_LOW_LEVEL_H
+#define KMS_LOW_LEVEL_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "sfu_fwimg_regions.h"
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup KMS_LL_Exported_Constants Exported Constants
+  * @{
+  */
+
+#define KMS_LL_ERROR_MEM_ALLOC_FAILURE    (0x00000001UL)    /*!< Memory allocation failure error */
+#define KMS_LL_ERROR_MEM_FREE_CANARY      (0x00000002UL)    /*!< Memory free detected altered canaries error */
+#define KMS_LL_ERROR_MEM_FREE_NULL_PTR    (0x00000003UL)    /*!< Memory free detected a NULL pointer error */
+#define KMS_LL_ERROR_MEM_FREE_UNKNOWN     (0x00000004UL)    /*!< Memory free detected an unknown pointer error */
+
+/**
+  * @}
+  */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_LL_Exported_Functions Exported Functions
+  * @{
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length);
+uint32_t KMS_LL_FLASH_GetBlobDownloadAddress(void);
+
+#ifdef KMS_SE_CHECK_PARAMS
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize);
+#endif /* KMS_SE_CHECK_PARAMS */
+
+void KMS_LL_ReportError(uint32_t error);
+
+void KMS_LL_ReportMemInit(void);
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem);
+void KMS_LL_ReportMemFree(void *pmem);
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t KMS_LL_GetLR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#endif /* KMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
new file mode 100644
index 00000000..a5f54fbf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_mem_pool_def.h
@@ -0,0 +1,54 @@
+/**
+  ******************************************************************************
+  * @file    kms_mem_pool_def.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          memory pool definition
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Recursive inclusion autorised ---------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * POOL DESCRIPTION
+ */
+
+/*
+ * Memory pools definition:
+ * 2 pools of 256
+ * 1 pool of 512
+ * 2 pools of 1K
+ * 1 pool of 5K
+ */
+
+KMS_MEM_DECLARE_POOL_START()
+KMS_MEM_DECLARE_POOL_ENTRY(1, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(2, 256)
+KMS_MEM_DECLARE_POOL_ENTRY(3, 512)
+KMS_MEM_DECLARE_POOL_ENTRY(4, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(5, 1024)
+KMS_MEM_DECLARE_POOL_ENTRY(6, 5 * 1024)
+KMS_MEM_DECLARE_POOL_END()
+
+
+#ifdef __cplusplus
+}
+#endif
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
new file mode 100644
index 00000000..52dab788
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern
@@ -0,0 +1,476 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_config.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_CONFIG_H
+#define KMS_PLATF_OBJECTS_CONFIG_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "kms_platf_objects_interface.h"
+#include "app_sfu.h"
+#include "app_sigfox.h"  /* SIGFOX_KMS */
+#include "st_sigfox_api.h"
+#include "sgfx_credentials.h"
+#include "sigfox_data.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_PLATF Platform Objects
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_PLATF_Exported_Constants Exported Constants
+  * @note KMS support different type of objects, their respective ranges are
+  *       defined here
+  * @{
+  */
+
+/* We consider that the ORDER (static = lower ids) will be kept. */
+#define KMS_INDEX_MIN_EMBEDDED_OBJECTS       1UL   /*!< Embedded objects min ID. Must be > 0 as '0' is never a
+                                                        valid key index */
+#define KMS_INDEX_MAX_EMBEDDED_OBJECTS       (KMS_INDEX_MIN_EMBEDDED_OBJECTS+19UL)    /*!< Embedded objects max ID */
+#define KMS_INDEX_MIN_NVM_STATIC_OBJECTS     (KMS_INDEX_MAX_EMBEDDED_OBJECTS+1UL)     /*!< NVM static objects min ID */
+#define KMS_INDEX_MAX_NVM_STATIC_OBJECTS     (KMS_INDEX_MIN_NVM_STATIC_OBJECTS+19UL)  /*!< NVM static objects max ID */
+
+#define KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MAX_NVM_STATIC_OBJECTS+1UL)   /*!< NVM dynamic objects min ID */
+#define KMS_INDEX_MAX_NVM_DYNAMIC_OBJECTS    (KMS_INDEX_MIN_NVM_DYNAMIC_OBJECTS+19UL) /*!< NVM dynamic objects max ID */
+
+/* Blob import key index */
+#define KMS_INDEX_BLOBIMPORT_VERIFY       (1U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob verification key is stored */
+#define KMS_INDEX_BLOBIMPORT_DECRYPT      (2U)      /*!< Index in @ref KMS_PlatfObjects_EmbeddedList
+                                                         where the blob decryption key is stored */
+
+#define RAW_TO_4X_INT32A_KMS(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
+  0x##a##b##c##d, 0x##e##f##g##h, 0x##i##j##k##l, 0x##m##n##o##p
+#define RAW_TO_2X_INT32A_KMS(a,b,c,d,e,f,g,h)\
+  0x##a##b##c##d, 0x##e##f##g##h
+#define RAW_TO_1X_INT32A_KMS(a,b,c,d)\
+  0x##d##c##b##a
+
+#define FORMAT_KMS_KEY(...) RAW_TO_4X_INT32A_KMS(__VA_ARGS__)
+#define FORMAT_KMS_PAC(...) RAW_TO_2X_INT32A_KMS(__VA_ARGS__)
+#define FORMAT_KMS_ID(...) RAW_TO_1X_INT32A_KMS(__VA_ARGS__)
+
+/**
+  * @}
+  */
+
+/*
+ * Embedded objects definition
+ *
+ */
+#ifdef KMS_PLATF_OBJECTS_C
+/** @addtogroup KMS_PLATF_Private_Variables Private Variables
+  * @{
+  */
+/* Place code in a specific section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".SE_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".SE_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 24);
+KMS_DECLARE_BLOB_STRUCT(, 30);
+KMS_DECLARE_BLOB_STRUCT(, 256);
+
+/* This object is used for KMS blob header signature                 */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   KMS_Blob_ECDSA_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  1,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_BLOB_KEY@
+  }
+};
+
+/* This object is used for KMS blob encryption                    */
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   KMS_Blob_AES_CBC128_Decrypt =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  2,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_BLOB_KEY@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_1_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  3,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_1@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_2_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  4,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_2@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /*(SFU_NB_MAX_ACTIVE_IMAGE > 1U)*/
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_24_t   SBSFU_AES_3_128 =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  96,                              /*  uint32_t blobs_size; */
+  7,                               /*  uint32_t blobs_count; */
+  5,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_SECRET_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_AES,
+    CKA_VALUE,        @AES_SBSFU_KEY_3@
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), CK_FALSE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), CK_FALSE,
+    CKA_DERIVE,       sizeof(CK_BBOOL), CK_FALSE,
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_1_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  6,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_1@
+  }
+};
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_2_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  7,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,   /* EC OIDs */
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_2@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+#if defined(__GNUC__)
+__attribute__((section(".SE_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_30_t   SBSFU_ECDSA_3_Verify =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  120,                             /*  uint32_t blobs_size; */
+  4,                               /*  uint32_t blobs_count; */
+  8,                               /*  uint32_t object_id; */
+  {
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), CKO_PUBLIC_KEY,
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),     CKK_EC,
+    CKA_EC_PARAMS,    10, 0x06082a86U, 0x48ce3d03U, 0x0107U,
+    CKA_EC_POINT,     @ECDSA_SBSFU_KEY_3@
+  }
+};
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+
+/* Stop placing data in specified section*/
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif
+
+#if defined(__ICCARM__)
+#pragma default_variable_attributes = @ ".USER_embedded_Keys"
+#elif defined(__CC_ARM)
+#pragma arm section rodata = ".USER_embedded_Keys"
+#endif
+
+KMS_DECLARE_BLOB_STRUCT(, 32);
+
+/* These objects are used by user tKMS application                 */
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_32_t   Sigfox_Data_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  128,                             /*  uint32_t blobs_size; */
+  9,                               /*  uint32_t blobs_count; */
+  13,                               /*  uint32_t object_id; */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),       CKK_AES,
+    CKA_VALUE,        MANUF_SIGNATURE_LENGTH, FORMAT_KMS_KEY(SIGFOX_KEY),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_LABEL,        12, 0x58464753U, 0x50595243U, 0x00383231U      /* 'SGFX', 'CRYP', '128' */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_32_t   Sigfox_pac =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  128,                             /*  uint32_t blobs_size; */
+  9,                               /*  uint32_t blobs_count; */
+  14,                               /*  uint32_t object_id; */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),       CKK_AES,
+    CKA_VALUE,        MANUF_PAC_LENGTH, FORMAT_KMS_PAC(SIGFOX_PAC),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_LABEL,        12, 0x58464753U, 0x434150U, 0x00383231U,      /* 'SGFX', 'PAC', '128' */
+    0UL, 0UL /* Fill end of table */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_32_t   Sigfox_id =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  128,                             /*  uint32_t blobs_size; */
+  9,                               /*  uint32_t blobs_count; */
+  15,                               /*  uint32_t object_id; */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),       CKK_AES,
+    CKA_VALUE,        MANUF_DEVICE_ID_LENGTH, FORMAT_KMS_ID(SIGFOX_ID),
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_LABEL,        12, 0x58464753U, 0x4449U, 0x00383231U,      /* 'SGFX', 'ID', '128' */
+    0UL, 0UL, 0UL /* Fill end of table */
+  }
+};
+
+#if defined(__GNUC__)
+__attribute__((section(".USER_embedded_Keys")))
+#endif
+static const kms_obj_keyhead_32_t   Sigfox_Public_Key =
+{
+  KMS_ABI_VERSION_CK_2_40,         /*  uint32_t version; */
+  KMS_ABI_CONFIG_KEYHEAD,          /*  uint32_t configuration; */
+  128,                             /*  uint32_t blobs_size; */
+  9,                               /*  uint32_t blobs_count; */
+  16,                               /*  uint32_t object_id; */
+  {
+    CKA_KEY_TYPE,     sizeof(CK_KEY_TYPE),       CKK_AES,
+    CKA_VALUE,        MANUF_SIGNATURE_LENGTH, 0x00112233, 0x44556677, 0x8899AABB, 0xCCDDEEFF,
+    CKA_ENCRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_DECRYPT,      sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_TOKEN,        sizeof(CK_BBOOL), (uint8_t)CK_TRUE,
+    CKA_COPYABLE,     sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_EXTRACTABLE,  sizeof(CK_BBOOL), (uint8_t)CK_FALSE,
+    CKA_CLASS,        sizeof(CK_OBJECT_CLASS), (uint8_t)CKO_SECRET_KEY,
+    CKA_LABEL,        12, 0x58464753U, 0x425550U, 0x00383231U      /* 'SGFX', 'PUB', '128' */
+  }
+};
+
+#if defined(__ICCARM__)
+#pragma default_variable_attributes =
+#elif defined(__CC_ARM)
+#pragma arm section code
+#endif
+
+/**
+  * @brief  KMS embedded objects definition
+  * @note   Must contains KMS blob verification and decryption keys
+  */
+static const kms_obj_keyhead_t *const KMS_PlatfObjects_EmbeddedList[KMS_INDEX_MAX_EMBEDDED_OBJECTS -
+                                                                    KMS_INDEX_MIN_EMBEDDED_OBJECTS + 1] =
+{
+#if defined(KMS_IMPORT_BLOB)
+  /* KMS Blob import keys */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_ECDSA_Verify,       /* Index = 1 */
+  (kms_obj_keyhead_t *)(uint32_t) &KMS_Blob_AES_CBC128_Decrypt, /* Index = 2 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 1 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 2 */
+#endif /* KMS_IMPORT_BLOB */
+  /* SBSFU keys */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_1_128,             /* Index = 3 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_2_128,             /* Index = 4 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_AES_3_128,             /* Index = 5 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 3 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 4 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 5 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) */
+
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_1_Verify,        /* Index = 6 */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 1U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_2_Verify,        /* Index = 7 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 1U) */
+#if (SFU_NB_MAX_ACTIVE_IMAGE > 2U)
+  (kms_obj_keyhead_t *)(uint32_t) &SBSFU_ECDSA_3_Verify,        /* Index = 8 */
+#else
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SFU_NB_MAX_ACTIVE_IMAGE > 2U) */
+#else /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 6 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 7 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 8 */
+#endif /* (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256) || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256) */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 9 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 10 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 11 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 12 */
+  /* UserApp example keys */
+  (kms_obj_keyhead_t *) &Sigfox_Data_Key,                      /* Index = 13 */
+  (kms_obj_keyhead_t *) &Sigfox_pac,                           /* Index = 14 */
+  (kms_obj_keyhead_t *) &Sigfox_id,                             /* Index = 15 */
+  (kms_obj_keyhead_t *) &Sigfox_Public_Key,                     /* Index = 16 */
+  (kms_obj_keyhead_t *) NULL,                                  /* Index = 17 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 18 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 19 */
+  (kms_obj_keyhead_t *) NULL,                                   /* Index = 20 */
+};
+
+/**
+  * @}
+  */
+#endif /* KMS_PLATF_OBJECTS_C */
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
new file mode 100644
index 00000000..462ecea5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/kms_platf_objects_interface.h
@@ -0,0 +1,68 @@
+/**
+  ******************************************************************************
+  * @file    kms_platf_objects_interface.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module platform objects management configuration interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_PLATF_OBJECTS_INTERFACE_H
+#define KMS_PLATF_OBJECTS_INTERFACE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* KMS exported Object handles for Secure Boot */
+
+/* SBSFU Root CA Certificate */
+#define KMS_SBSFU_ROOT_CA_CRT_LABEL           "SBSFURootCACertificate"  /*!< SBSFU Root CA Certificate Label */
+#define KMS_SBSFU_ROOT_CA_CRT_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)9)  /*!< SBSFU Root CA Certificate object handle */
+
+/* OEM Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_LABEL           "OEMIntermCACertificate_1"  /*!< OEM 1 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_LABEL           "OEMIntermCACertificate_2"  /*!< OEM 2 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_LABEL           "OEMIntermCACertificate_3"  /*!< OEM 3 Interm CA Certificate */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_1_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)10)  /*!< OEM 1 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_2_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)11)  /*!< OEM 2 Interm CA Certificate object handle */
+#define KMS_SBSFU_OEM_INTM_CA_CRT_3_OBJECT_HANDLE   ((CK_OBJECT_HANDLE)12)  /*!< OEM 3 Interm CA Certificate object handle */
+
+
+#define KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)3)
+#define KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)4)
+#define KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)5)
+#define KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)6)
+#define KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)7)
+#define KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE             ((CK_OBJECT_HANDLE)8)
+
+/* KMS exported Object handles for tKMS test application */
+#define KMS_KEY_RSA2048_OBJECT_HANDLE                 ((CK_OBJECT_HANDLE)21)
+#define KMS_KEY_AES128_DERIVABLE_OBJECT_HANDLE        ((CK_OBJECT_HANDLE)22)
+
+/*  Object handles for user application */
+#define KMS_SGFX_DATA_KEY_OBJECT_HANDLE            ((CK_OBJECT_HANDLE)13)
+#define KMS_SGFX_PAC_OBJECT_HANDLE                 ((CK_OBJECT_HANDLE)14)
+#define KMS_SGFX_ID_OBJECT_HANDLE                  ((CK_OBJECT_HANDLE)15)
+#define KMS_SGFX_DATA_KEY_PUBLIC_OBJECT_HANDLE     ((CK_OBJECT_HANDLE)16)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_PLATF_OBJECTS_INTERFACE_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
new file mode 100644
index 00000000..097c85ef
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/mbed_crypto_config.h
@@ -0,0 +1,1976 @@
+/**
+ * \file config.h
+ *
+ * \brief Configuration options (set of defines)
+ *
+ *  This set of compile-time options may be used to enable
+ *  or disable features selectively, and reduce the global
+ *  memory footprint.
+ */
+/*
+ *  Copyright (C) 2006-2018, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  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.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+/**
+ * \name SECTION: System support
+ *
+ * This section sets system specific settings.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_HAVE_ASM
+ *
+ * The compiler has support for asm().
+ *
+ * Requires support for asm() in compiler.
+ *
+ * Used in:
+ *      library/aria.c
+ *      library/timing.c
+ *      include/mbedtls/bn_mul.h
+ *
+ * Required by:
+ *      MBEDTLS_AESNI_C
+ *      MBEDTLS_PADLOCK_C
+ *
+ * Comment to disable the use of assembly code.
+ */
+//#define MBEDTLS_HAVE_ASM
+
+/**
+ * \def MBEDTLS_NO_UDBL_DIVISION
+ *
+ * The platform lacks support for double-width integer division (64-bit
+ * division on a 32-bit platform, 128-bit division on a 64-bit platform).
+ *
+ * Used in:
+ *      include/mbedtls/bignum.h
+ *      library/bignum.c
+ *
+ * The bignum code uses double-width division to speed up some operations.
+ * Double-width division is often implemented in software that needs to
+ * be linked with the program. The presence of a double-width integer
+ * type is usually detected automatically through preprocessor macros,
+ * but the automatic detection cannot know whether the code needs to
+ * and can be linked with an implementation of division for that type.
+ * By default division is assumed to be usable if the type is present.
+ * Uncomment this option to prevent the use of double-width division.
+ *
+ * Note that division for the native integer type is always required.
+ * Furthermore, a 64-bit type is always required even on a 32-bit
+ * platform, but it need not support multiplication or division. In some
+ * cases it is also desirable to disable some double-width operations. For
+ * example, if double-width division is implemented in software, disabling
+ * it can reduce code size in some embedded targets.
+ */
+//#define MBEDTLS_NO_UDBL_DIVISION
+
+/**
+ * \def MBEDTLS_NO_64BIT_MULTIPLICATION
+ *
+ * The platform lacks support for 32x32 -> 64-bit multiplication.
+ *
+ * Used in:
+ *      library/poly1305.c
+ *
+ * Some parts of the library may use multiplication of two unsigned 32-bit
+ * operands with a 64-bit result in order to speed up computations. On some
+ * platforms, this is not available in hardware and has to be implemented in
+ * software, usually in a library provided by the toolchain.
+ *
+ * Sometimes it is not desirable to have to link to that library. This option
+ * removes the dependency of that library on platforms that lack a hardware
+ * 64-bit multiplier by embedding a software implementation in Mbed TLS.
+ *
+ * Note that depending on the compiler, this may decrease performance compared
+ * to using the library function provided by the toolchain.
+ */
+//#define MBEDTLS_NO_64BIT_MULTIPLICATION
+
+/**
+ * \def MBEDTLS_HAVE_SSE2
+ *
+ * CPU supports SSE2 instruction set.
+ *
+ * Uncomment if the CPU supports SSE2 (IA-32 specific).
+ */
+//#define MBEDTLS_HAVE_SSE2
+
+/**
+ * \def MBEDTLS_HAVE_TIME
+ *
+ * System has time.h and time().
+ * The time does not need to be correct, only time differences are used,
+ * by contrast with MBEDTLS_HAVE_TIME_DATE
+ *
+ * Defining MBEDTLS_HAVE_TIME allows you to specify MBEDTLS_PLATFORM_TIME_ALT,
+ * MBEDTLS_PLATFORM_TIME_MACRO, MBEDTLS_PLATFORM_TIME_TYPE_MACRO and
+ * MBEDTLS_PLATFORM_STD_TIME.
+ *
+ * Comment if your system does not support time functions
+ */
+//#define MBEDTLS_HAVE_TIME
+
+/**
+ * \def MBEDTLS_HAVE_TIME_DATE
+ *
+ * System has time.h, time(), and an implementation for
+ * mbedtls_platform_gmtime_r() (see below).
+ * The time needs to be correct (not necessarily very accurate, but at least
+ * the date should be correct). This is used to verify the validity period of
+ * X.509 certificates.
+ *
+ * Comment if your system does not have a correct clock.
+ *
+ * \note mbedtls_platform_gmtime_r() is an abstraction in platform_util.h that
+ * behaves similarly to the gmtime_r() function from the C standard. Refer to
+ * the documentation for mbedtls_platform_gmtime_r() for more information.
+ *
+ * \note It is possible to configure an implementation for
+ * mbedtls_platform_gmtime_r() at compile-time by using the macro
+ * MBEDTLS_PLATFORM_GMTIME_R_ALT.
+ */
+//#define MBEDTLS_HAVE_TIME_DATE
+
+/**
+ * \def MBEDTLS_PLATFORM_MEMORY
+ *
+ * Enable the memory allocation layer.
+ *
+ * By default mbed TLS uses the system-provided calloc() and free().
+ * This allows different allocators (self-implemented or provided) to be
+ * provided to the platform abstraction layer.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY without the
+ * MBEDTLS_PLATFORM_{FREE,CALLOC}_MACROs will provide
+ * "mbedtls_platform_set_calloc_free()" allowing you to set an alternative calloc() and
+ * free() function pointer at runtime.
+ *
+ * Enabling MBEDTLS_PLATFORM_MEMORY and specifying
+ * MBEDTLS_PLATFORM_{CALLOC,FREE}_MACROs will allow you to specify the
+ * alternate function at compile time.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Enable this layer to allow use of alternative memory allocators.
+ */
+//#define MBEDTLS_PLATFORM_MEMORY
+
+/**
+ * \def MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+ *
+ * Do not assign standard functions in the platform layer (e.g. calloc() to
+ * MBEDTLS_PLATFORM_STD_CALLOC and printf() to MBEDTLS_PLATFORM_STD_PRINTF)
+ *
+ * This makes sure there are no linking errors on platforms that do not support
+ * these functions. You will HAVE to provide alternatives, either at runtime
+ * via the platform_set_xxx() functions or at compile time by setting
+ * the MBEDTLS_PLATFORM_STD_XXX defines, or enabling a
+ * MBEDTLS_PLATFORM_XXX_MACRO.
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *
+ * Uncomment to prevent default assignment of standard functions in the
+ * platform layer.
+ */
+//#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+
+/**
+ * \def MBEDTLS_PLATFORM_EXIT_ALT
+ *
+ * MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let mbed TLS support the
+ * function in the platform abstraction layer.
+ *
+ * Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, mbed TLS will
+ * provide a function "mbedtls_platform_set_printf()" that allows you to set an
+ * alternative printf function pointer.
+ *
+ * All these define require MBEDTLS_PLATFORM_C to be defined!
+ *
+ * \note MBEDTLS_PLATFORM_SNPRINTF_ALT is required on Windows;
+ * it will be enabled automatically by check_config.h
+ *
+ * \warning MBEDTLS_PLATFORM_XXX_ALT cannot be defined at the same time as
+ * MBEDTLS_PLATFORM_XXX_MACRO!
+ *
+ * Requires: MBEDTLS_PLATFORM_TIME_ALT requires MBEDTLS_HAVE_TIME
+ *
+ * Uncomment a macro to enable alternate implementation of specific base
+ * platform function
+ */
+//#define MBEDTLS_PLATFORM_EXIT_ALT
+//#define MBEDTLS_PLATFORM_TIME_ALT
+//#define MBEDTLS_PLATFORM_FPRINTF_ALT
+//#define MBEDTLS_PLATFORM_PRINTF_ALT
+//#define MBEDTLS_PLATFORM_SNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_VSNPRINTF_ALT
+//#define MBEDTLS_PLATFORM_NV_SEED_ALT
+//#define MBEDTLS_PLATFORM_SETUP_TEARDOWN_ALT
+
+/**
+ * \def MBEDTLS_DEPRECATED_WARNING
+ *
+ * Mark deprecated functions so that they generate a warning if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * This only works with GCC and Clang. With other compilers, you may want to
+ * use MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Uncomment to get warnings on using deprecated functions.
+ */
+//#define MBEDTLS_DEPRECATED_WARNING
+
+/**
+ * \def MBEDTLS_DEPRECATED_REMOVED
+ *
+ * Remove deprecated functions so that they generate an error if used.
+ * Functions deprecated in one version will usually be removed in the next
+ * version. You can enable this to help you prepare the transition to a new
+ * major version by making sure your code is not using these functions.
+ *
+ * Uncomment to get errors on using deprecated functions.
+ */
+#define MBEDTLS_DEPRECATED_REMOVED
+
+/**
+ * \def MBEDTLS_CHECK_PARAMS
+ *
+ * This configuration option controls whether the library validates more of
+ * the parameters passed to it.
+ *
+ * When this flag is not defined, the library only attempts to validate an
+ * input parameter if: (1) they may come from the outside world (such as the
+ * network, the filesystem, etc.) or (2) not validating them could result in
+ * internal memory errors such as overflowing a buffer controlled by the
+ * library. On the other hand, it doesn't attempt to validate parameters whose
+ * values are fully controlled by the application (such as pointers).
+ *
+ * When this flag is defined, the library additionally attempts to validate
+ * parameters that are fully controlled by the application, and should always
+ * be valid if the application code is fully correct and trusted.
+ *
+ * For example, when a function accepts as input a pointer to a buffer that may
+ * contain untrusted data, and its documentation mentions that this pointer
+ * must not be NULL:
+ * - the pointer is checked to be non-NULL only if this option is enabled
+ * - the content of the buffer is always validated
+ *
+ * When this flag is defined, if a library function receives a parameter that
+ * is invalid, it will:
+ * - invoke the macro MBEDTLS_PARAM_FAILED() which by default expands to a
+ *   call to the function mbedtls_param_failed()
+ * - immediately return (with a specific error code unless the function
+ *   returns void and can't communicate an error).
+ *
+ * When defining this flag, you also need to:
+ * - either provide a definition of the function mbedtls_param_failed() in
+ *   your application (see platform_util.h for its prototype) as the library
+ *   calls that function, but does not provide a default definition for it,
+ * - or provide a different definition of the macro MBEDTLS_PARAM_FAILED()
+ *   below if the above mechanism is not flexible enough to suit your needs.
+ *   See the documentation of this macro later in this file.
+ *
+ * Uncomment to enable validation of application-controlled parameters.
+ */
+//#define MBEDTLS_CHECK_PARAMS
+
+/* \} name SECTION: System support */
+
+/**
+ * \name SECTION: mbed TLS feature support
+ *
+ * This section sets support for features that are or are not needed
+ * within the modules that are enabled.
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_TIMING_ALT
+ *
+ * Uncomment to provide your own alternate implementation for mbedtls_timing_hardclock(),
+ * mbedtls_timing_get_timer(), mbedtls_set_alarm(), mbedtls_set/get_delay()
+ *
+ * Only works if you have MBEDTLS_TIMING_C enabled.
+ *
+ * You will need to provide a header "timing_alt.h" and an implementation at
+ * compile time.
+ */
+//#define MBEDTLS_TIMING_ALT
+
+/**
+ * \def MBEDTLS_AES_ALT
+ *
+ * MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternate core implementation of a symmetric crypto, an arithmetic or hash
+ * module (e.g. platform specific assembly optimized implementations). Keep
+ * in mind that the function prototypes should remain the same.
+ *
+ * This replaces the whole module. If you only want to replace one of the
+ * functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_AES_ALT, mbed TLS will no longer
+ * provide the "struct mbedtls_aes_context" definition and omit the base
+ * function declarations and implementations. "aes_alt.h" will be included from
+ * "aes.h" to include the new function definitions.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * module.
+ *
+ * \warning   MD2, MD4, MD5, ARC4, DES and SHA-1 are considered weak and their
+ *            use constitutes a security risk. If possible, we recommend
+ *            avoiding dependencies on them, and considering stronger message
+ *            digests and ciphers instead.
+ *
+ */
+//#define MBEDTLS_AES_ALT
+//#define MBEDTLS_ARC4_ALT
+//#define MBEDTLS_ARIA_ALT
+//#define MBEDTLS_BLOWFISH_ALT
+//#define MBEDTLS_CAMELLIA_ALT
+//#define MBEDTLS_CCM_ALT
+//#define MBEDTLS_CHACHA20_ALT
+//#define MBEDTLS_CHACHAPOLY_ALT
+//#define MBEDTLS_CMAC_ALT
+//#define MBEDTLS_DES_ALT
+//#define MBEDTLS_DHM_ALT
+//#define MBEDTLS_ECJPAKE_ALT
+//#define MBEDTLS_GCM_ALT
+//#define MBEDTLS_NIST_KW_ALT
+//#define MBEDTLS_MD2_ALT
+//#define MBEDTLS_MD4_ALT
+//#define MBEDTLS_MD5_ALT
+//#define MBEDTLS_POLY1305_ALT
+//#define MBEDTLS_RIPEMD160_ALT
+//#define MBEDTLS_RSA_ALT
+//#define MBEDTLS_SHA1_ALT
+//#define MBEDTLS_SHA256_ALT
+//#define MBEDTLS_SHA512_ALT
+//#define MBEDTLS_XTEA_ALT
+
+/*
+ * When replacing the elliptic curve module, pleace consider, that it is
+ * implemented with two .c files:
+ *      - ecp.c
+ *      - ecp_curves.c
+ * You can replace them very much like all the other MBEDTLS__MODULE_NAME__ALT
+ * macros as described above. The only difference is that you have to make sure
+ * that you provide functionality for both .c files.
+ */
+//#define MBEDTLS_ECP_ALT
+
+/**
+ * \def MBEDTLS_MD2_PROCESS_ALT
+ *
+ * MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use you
+ * alternate core implementation of symmetric crypto or hash function. Keep in
+ * mind that function prototypes should remain the same.
+ *
+ * This replaces only one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags.
+ *
+ * Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, mbed TLS will
+ * no longer provide the mbedtls_sha1_process() function, but it will still provide
+ * the other function (using your mbedtls_sha1_process() function) and the definition
+ * of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible
+ * with this definition.
+ *
+ * \note Because of a signature change, the core AES encryption and decryption routines are
+ *       currently named mbedtls_aes_internal_encrypt and mbedtls_aes_internal_decrypt,
+ *       respectively. When setting up alternative implementations, these functions should
+ *       be overridden, but the wrapper functions mbedtls_aes_decrypt and mbedtls_aes_encrypt
+ *       must stay untouched.
+ *
+ * \note If you use the AES_xxx_ALT macros, then is is recommended to also set
+ *       MBEDTLS_AES_ROM_TABLES in order to help the linker garbage-collect the AES
+ *       tables.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ *
+ * \warning   MD2, MD4, MD5, DES and SHA-1 are considered weak and their use
+ *            constitutes a security risk. If possible, we recommend avoiding
+ *            dependencies on them, and considering stronger message digests
+ *            and ciphers instead.
+ *
+ */
+//#define MBEDTLS_MD2_PROCESS_ALT
+//#define MBEDTLS_MD4_PROCESS_ALT
+//#define MBEDTLS_MD5_PROCESS_ALT
+//#define MBEDTLS_RIPEMD160_PROCESS_ALT
+//#define MBEDTLS_SHA1_PROCESS_ALT
+//#define MBEDTLS_SHA256_PROCESS_ALT
+//#define MBEDTLS_SHA512_PROCESS_ALT
+//#define MBEDTLS_DES_SETKEY_ALT
+//#define MBEDTLS_DES_CRYPT_ECB_ALT
+//#define MBEDTLS_DES3_CRYPT_ECB_ALT
+//#define MBEDTLS_AES_SETKEY_ENC_ALT
+//#define MBEDTLS_AES_SETKEY_DEC_ALT
+//#define MBEDTLS_AES_ENCRYPT_ALT
+//#define MBEDTLS_AES_DECRYPT_ALT
+//#define MBEDTLS_ECDH_GEN_PUBLIC_ALT
+//#define MBEDTLS_ECDH_COMPUTE_SHARED_ALT
+//#define MBEDTLS_ECDSA_VERIFY_ALT
+//#define MBEDTLS_ECDSA_SIGN_ALT
+//#define MBEDTLS_ECDSA_GENKEY_ALT
+
+/**
+ * \def MBEDTLS_ECP_INTERNAL_ALT
+ *
+ * Expose a part of the internal interface of the Elliptic Curve Point module.
+ *
+ * MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use your
+ * alternative core implementation of elliptic curve arithmetic. Keep in mind
+ * that function prototypes should remain the same.
+ *
+ * This partially replaces one function. The header file from mbed TLS is still
+ * used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation
+ * is still present and it is used for group structures not supported by the
+ * alternative.
+ *
+ * Any of these options become available by defining MBEDTLS_ECP_INTERNAL_ALT
+ * and implementing the following functions:
+ *      unsigned char mbedtls_internal_ecp_grp_capable(
+ *          const mbedtls_ecp_group *grp )
+ *      int  mbedtls_internal_ecp_init( const mbedtls_ecp_group *grp )
+ *      void mbedtls_internal_ecp_free( const mbedtls_ecp_group *grp )
+ * The mbedtls_internal_ecp_grp_capable function should return 1 if the
+ * replacement functions implement arithmetic for the given group and 0
+ * otherwise.
+ * The functions mbedtls_internal_ecp_init and mbedtls_internal_ecp_free are
+ * called before and after each point operation and provide an opportunity to
+ * implement optimized set up and tear down instructions.
+ *
+ * Example: In case you uncomment MBEDTLS_ECP_INTERNAL_ALT and
+ * MBEDTLS_ECP_DOUBLE_JAC_ALT, mbed TLS will still provide the ecp_double_jac
+ * function, but will use your mbedtls_internal_ecp_double_jac if the group is
+ * supported (your mbedtls_internal_ecp_grp_capable function returns 1 when
+ * receives it as an argument). If the group is not supported then the original
+ * implementation is used. The other functions and the definition of
+ * mbedtls_ecp_group and mbedtls_ecp_point will not change, so your
+ * implementation of mbedtls_internal_ecp_double_jac and
+ * mbedtls_internal_ecp_grp_capable must be compatible with this definition.
+ *
+ * Uncomment a macro to enable alternate implementation of the corresponding
+ * function.
+ */
+/* Required for all the functions in this section */
+//#define MBEDTLS_ECP_INTERNAL_ALT
+/* Support for Weierstrass curves with Jacobi representation */
+//#define MBEDTLS_ECP_RANDOMIZE_JAC_ALT
+//#define MBEDTLS_ECP_ADD_MIXED_ALT
+//#define MBEDTLS_ECP_DOUBLE_JAC_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT
+//#define MBEDTLS_ECP_NORMALIZE_JAC_ALT
+/* Support for curves with Montgomery arithmetic */
+//#define MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT
+//#define MBEDTLS_ECP_RANDOMIZE_MXZ_ALT
+//#define MBEDTLS_ECP_NORMALIZE_MXZ_ALT
+
+/**
+ * \def MBEDTLS_TEST_NULL_ENTROPY
+ *
+ * Enables testing and use of mbed TLS without any configured entropy sources.
+ * This permits use of the library on platforms before an entropy source has
+ * been integrated (see for example the MBEDTLS_ENTROPY_HARDWARE_ALT or the
+ * MBEDTLS_ENTROPY_NV_SEED switches).
+ *
+ * WARNING! This switch MUST be disabled in production builds, and is suitable
+ * only for development.
+ * Enabling the switch negates any security provided by the library.
+ *
+ * Requires MBEDTLS_ENTROPY_C, MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ */
+//#define MBEDTLS_TEST_NULL_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_HARDWARE_ALT
+ *
+ * Uncomment this macro to let mbed TLS use your own implementation of a
+ * hardware entropy collector.
+ *
+ * Your function must be called \c mbedtls_hardware_poll(), have the same
+ * prototype as declared in entropy_poll.h, and accept NULL as first argument.
+ *
+ * Uncomment to use your own hardware entropy collector.
+ */
+//#define MBEDTLS_ENTROPY_HARDWARE_ALT
+
+/**
+ * \def MBEDTLS_AES_ROM_TABLES
+ *
+ * Use precomputed AES tables stored in ROM.
+ *
+ * Uncomment this macro to use precomputed AES tables stored in ROM.
+ * Comment this macro to generate AES tables in RAM at runtime.
+ *
+ * Tradeoff: Using precomputed ROM tables reduces RAM usage by ~8kb
+ * (or ~2kb if \c MBEDTLS_AES_FEWER_TABLES is used) and reduces the
+ * initialization time before the first AES operation can be performed.
+ * It comes at the cost of additional ~8kb ROM use (resp. ~2kb if \c
+ * MBEDTLS_AES_FEWER_TABLES below is used), and potentially degraded
+ * performance if ROM access is slower than RAM access.
+ *
+ * This option is independent of \c MBEDTLS_AES_FEWER_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_ROM_TABLES
+
+/**
+ * \def MBEDTLS_AES_FEWER_TABLES
+ *
+ * Use less ROM/RAM for AES tables.
+ *
+ * Uncommenting this macro omits 75% of the AES tables from
+ * ROM / RAM (depending on the value of \c MBEDTLS_AES_ROM_TABLES)
+ * by computing their values on the fly during operations
+ * (the tables are entry-wise rotations of one another).
+ *
+ * Tradeoff: Uncommenting this reduces the RAM / ROM footprint
+ * by ~6kb but at the cost of more arithmetic operations during
+ * runtime. Specifically, one has to compare 4 accesses within
+ * different tables to 4 accesses with additional arithmetic
+ * operations within the same table. The performance gain/loss
+ * depends on the system and memory details.
+ *
+ * This option is independent of \c MBEDTLS_AES_ROM_TABLES.
+ *
+ */
+//#define MBEDTLS_AES_FEWER_TABLES
+
+/**
+ * \def MBEDTLS_CAMELLIA_SMALL_MEMORY
+ *
+ * Use less ROM for the Camellia implementation (saves about 768 bytes).
+ *
+ * Uncomment this macro to use less memory for Camellia.
+ */
+//#define MBEDTLS_CAMELLIA_SMALL_MEMORY
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CBC
+ *
+ * Enable Cipher Block Chaining mode (CBC) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CBC
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CFB
+ *
+ * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_CTR
+ *
+ * Enable Counter Block Cipher mode (CTR) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_CTR
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_OFB
+ *
+ * Enable Output Feedback mode (OFB) for symmetric ciphers.
+ */
+//#define MBEDTLS_CIPHER_MODE_OFB
+
+/**
+ * \def MBEDTLS_CIPHER_MODE_XTS
+ *
+ * Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
+ */
+//#define MBEDTLS_CIPHER_MODE_XTS
+
+/**
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+ *
+ * Enable NULL cipher.
+ * Warning: Only do so when you know what you are doing. This allows for
+ * encryption or channels without any security!
+ *
+ * This module is required to support the TLS ciphersuites that use the NULL
+ * cipher.
+ *
+ * Uncomment this macro to enable the NULL cipher
+ */
+//#define MBEDTLS_CIPHER_NULL_CIPHER
+
+/**
+ * \def MBEDTLS_CIPHER_PADDING_PKCS7
+ *
+ * MBEDTLS_CIPHER_PADDING_XXX: Uncomment or comment macros to add support for
+ * specific padding modes in the cipher layer with cipher modes that support
+ * padding (e.g. CBC)
+ *
+ * If you disable all padding modes, only full blocks can be used with CBC.
+ *
+ * Enable padding modes in the cipher layer.
+ */
+//#define MBEDTLS_CIPHER_PADDING_PKCS7
+//#define MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS
+//#define MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN
+//#define MBEDTLS_CIPHER_PADDING_ZEROS
+
+/**
+ * \def MBEDTLS_ECP_DP_SECP192R1_ENABLED
+ *
+ * MBEDTLS_ECP_XXXX_ENABLED: Enables specific curves within the Elliptic Curve
+ * module.  By default all supported curves are enabled.
+ *
+ * Comment macros to disable the curve and functions for it
+ */
+//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+//#define MBEDTLS_ECP_DP_CURVE448_ENABLED
+
+/**
+ * \def MBEDTLS_ECP_NIST_OPTIM
+ *
+ * Enable specific 'modulo p' routines for each NIST prime.
+ * Depending on the prime and architecture, makes operations 4 to 8 times
+ * faster on the corresponding curve.
+ *
+ * Comment this macro to disable NIST curves optimisation.
+ */
+//#define MBEDTLS_ECP_NIST_OPTIM
+
+/**
+ * \def MBEDTLS_ECP_RESTARTABLE
+ *
+ * Enable "non-blocking" ECC operations that can return early and be resumed.
+ *
+ * This allows various functions to pause by returning
+ * #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in Mbed TLS's SSL module,
+ * MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in order
+ * to further progress and eventually complete their operation. This is
+ * controlled through mbedtls_ecp_set_max_ops() which limits the maximum number
+ * of ECC operations a function may perform before pausing; see
+ * mbedtls_ecp_set_max_ops() for more information.
+ *
+ * This is useful in non-threaded environments if you want to avoid blocking
+ * for too long on ECC (and, hence, X.509 or SSL/TLS) operations.
+ *
+ * Uncomment this macro to enable restartable ECC computations.
+ *
+ * \note  This option only works with the default software implementation of
+ *        elliptic curve functionality. It is incompatible with
+ *        MBEDTLS_ECP_ALT, MBEDTLS_ECDH_XXX_ALT and MBEDTLS_ECDSA_XXX_ALT.
+ */
+//#define MBEDTLS_ECP_RESTARTABLE
+
+/**
+ * \def MBEDTLS_ECDSA_DETERMINISTIC
+ *
+ * Enable deterministic ECDSA (RFC 6979).
+ * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
+ * may result in a compromise of the long-term signing key. This is avoided by
+ * the deterministic variant.
+ *
+ * Requires: MBEDTLS_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+ */
+//#define MBEDTLS_ECDSA_DETERMINISTIC
+
+/**
+ * \def MBEDTLS_PK_PARSE_EC_EXTENDED
+ *
+ * Enhance support for reading EC keys using variants of SEC1 not allowed by
+ * RFC 5915 and RFC 5480.
+ *
+ * Currently this means parsing the SpecifiedECDomain choice of EC
+ * parameters (only known groups are supported, not arbitrary domains, to
+ * avoid validation issues).
+ *
+ * Disable if you only need to support RFC 5915 + 5480 key formats.
+ */
+//#define MBEDTLS_PK_PARSE_EC_EXTENDED
+
+/**
+ * \def MBEDTLS_ERROR_STRERROR_DUMMY
+ *
+ * Enable a dummy error function to make use of mbedtls_strerror() in
+ * third party libraries easier when MBEDTLS_ERROR_C is disabled
+ * (no effect when MBEDTLS_ERROR_C is enabled).
+ *
+ * You can safely disable this if MBEDTLS_ERROR_C is enabled, or if you're
+ * not using mbedtls_strerror() or error_strerror() in your application.
+ *
+ * Disable if you run into name conflicts and want to really remove the
+ * mbedtls_strerror()
+ */
+//#define MBEDTLS_ERROR_STRERROR_DUMMY
+
+/**
+ * \def MBEDTLS_GENPRIME
+ *
+ * Enable the prime-number generation code.
+ *
+ * Requires: MBEDTLS_BIGNUM_C
+ */
+//#define MBEDTLS_GENPRIME
+
+/**
+ * \def MBEDTLS_FS_IO
+ *
+ * Enable functions that use the filesystem.
+ */
+//#define MBEDTLS_FS_IO
+
+/**
+ * \def MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+ *
+ * Do not add default entropy sources. These are the platform specific,
+ * mbedtls_timing_hardclock and HAVEGE based poll functions.
+ *
+ * This is useful to have more control over the added entropy sources in an
+ * application.
+ *
+ * Uncomment this macro to prevent loading of default entropy functions.
+ */
+//#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
+
+/**
+ * \def MBEDTLS_NO_PLATFORM_ENTROPY
+ *
+ * Do not use built-in platform entropy functions.
+ * This is useful if your platform does not support
+ * standards like the /dev/urandom or Windows CryptoAPI.
+ *
+ * Uncomment this macro to disable the built-in platform entropy functions.
+ */
+//#define MBEDTLS_NO_PLATFORM_ENTROPY
+
+/**
+ * \def MBEDTLS_ENTROPY_FORCE_SHA256
+ *
+ * Force the entropy accumulator to use a SHA-256 accumulator instead of the
+ * default SHA-512 based one (if both are available).
+ *
+ * Requires: MBEDTLS_SHA256_C
+ *
+ * On 32-bit systems SHA-256 can be much faster than SHA-512. Use this option
+ * if you have performance concerns.
+ *
+ * This option is only useful if both MBEDTLS_SHA256_C and
+ * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
+ */
+//#define MBEDTLS_ENTROPY_FORCE_SHA256
+
+/**
+ * \def MBEDTLS_ENTROPY_NV_SEED
+ *
+ * Enable the non-volatile (NV) seed file-based entropy source.
+ * (Also enables the NV seed read/write functions in the platform layer)
+ *
+ * This is crucial (if not required) on systems that do not have a
+ * cryptographic entropy source (in hardware or kernel) available.
+ *
+ * Requires: MBEDTLS_ENTROPY_C, MBEDTLS_PLATFORM_C
+ *
+ * \note The read/write functions that are used by the entropy source are
+ *       determined in the platform layer, and can be modified at runtime and/or
+ *       compile-time depending on the flags (MBEDTLS_PLATFORM_NV_SEED_*) used.
+ *
+ * \note If you use the default implementation functions that read a seedfile
+ *       with regular fopen(), please make sure you make a seedfile with the
+ *       proper name (defined in MBEDTLS_PLATFORM_STD_NV_SEED_FILE) and at
+ *       least MBEDTLS_ENTROPY_BLOCK_SIZE bytes in size that can be read from
+ *       and written to or you will get an entropy source error! The default
+ *       implementation will only use the first MBEDTLS_ENTROPY_BLOCK_SIZE
+ *       bytes from the file.
+ *
+ * \note The entropy collector will write to the seed file before entropy is
+ *       given to an external source, to update it.
+ */
+//#define MBEDTLS_ENTROPY_NV_SEED
+
+/* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+ *
+ * In PSA key storage, encode the owner of the key.
+ *
+ * This is only meaningful when building the library as part of a
+ * multi-client service. When you activate this option, you must provide
+ * an implementation of the type psa_key_owner_id_t and a translation
+ * from psa_key_file_id_t to file name in all the storage backends that
+ * you wish to support.
+ *
+ * Note that this option is meant for internal use only and may be removed
+ * without notice.
+ */
+//#define MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
+
+/**
+ * \def MBEDTLS_MEMORY_DEBUG
+ *
+ * Enable debugging of buffer allocator memory issues. Automatically prints
+ * (to stderr) all (fatal) messages on memory allocation issues. Enables
+ * function for 'debug output' of allocated memory.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Uncomment this macro to let the buffer allocator print out error messages.
+ */
+//#define MBEDTLS_MEMORY_DEBUG
+
+/**
+ * \def MBEDTLS_MEMORY_BACKTRACE
+ *
+ * Include backtrace information with each allocated block.
+ *
+ * Requires: MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *           GLIBC-compatible backtrace() an backtrace_symbols() support
+ *
+ * Uncomment this macro to include backtrace information
+ */
+//#define MBEDTLS_MEMORY_BACKTRACE
+
+/**
+ * \def MBEDTLS_PK_RSA_ALT_SUPPORT
+ *
+ * Support external private RSA keys (eg from a HSM) in the PK layer.
+ *
+ * Comment this macro to disable support for external private RSA keys.
+ */
+//#define MBEDTLS_PK_RSA_ALT_SUPPORT
+
+/**
+ * \def MBEDTLS_PKCS1_V15
+ *
+ * Enable support for PKCS#1 v1.5 encoding.
+ *
+ * Requires: MBEDTLS_RSA_C
+ *
+ * This enables support for PKCS#1 v1.5 operations.
+ */
+//#define MBEDTLS_PKCS1_V15
+
+/**
+ * \def MBEDTLS_PKCS1_V21
+ *
+ * Enable support for PKCS#1 v2.1 encoding.
+ *
+ * Requires: MBEDTLS_MD_C, MBEDTLS_RSA_C
+ *
+ * This enables support for RSAES-OAEP and RSASSA-PSS operations.
+ */
+//#define MBEDTLS_PKCS1_V21
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_SPM
+ *
+ * When MBEDTLS_PSA_CRYPTO_SPM is defined, the code is built for SPM (Secure
+ * Partition Manager) integration which separates the code into two parts: a
+ * NSPE (Non-Secure Process Environment) and an SPE (Secure Process
+ * Environment).
+ *
+ * Module:  library/psa_crypto.c
+ * Requires: MBEDTLS_PSA_CRYPTO_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_SPM
+
+/**
+ * \def MBEDTLS_PSA_INJECT_ENTROPY
+ *
+ * Enable support for entropy injection at first boot. This feature is
+ * required on systems that do not have a built-in entropy source (TRNG).
+ * This feature is currently not supported on systems that have a built-in
+ * entropy source.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_STORAGE_C, MBEDTLS_ENTROPY_NV_SEED
+ *
+ */
+//#define MBEDTLS_PSA_INJECT_ENTROPY
+
+/**
+ * \def MBEDTLS_RSA_NO_CRT
+ *
+ * Do not use the Chinese Remainder Theorem
+ * for the RSA private operation.
+ *
+ * Uncomment this macro to disable the use of CRT in RSA.
+ *
+ */
+//#define MBEDTLS_RSA_NO_CRT
+
+/**
+ * \def MBEDTLS_SELF_TEST
+ *
+ * Enable the checkup functions (*_self_test).
+ */
+//#define MBEDTLS_SELF_TEST
+
+/**
+ * \def MBEDTLS_SHA256_SMALLER
+ *
+ * Enable an implementation of SHA-256 that has lower ROM footprint but also
+ * lower performance.
+ *
+ * The default implementation is meant to be a reasonable compromise between
+ * performance and size. This version optimizes more aggressively for size at
+ * the expense of performance. Eg on Cortex-M4 it reduces the size of
+ * mbedtls_sha256_process() from ~2KB to ~0.5KB for a performance hit of about
+ * 30%.
+ *
+ * Uncomment to enable the smaller implementation of SHA256.
+ */
+#define MBEDTLS_SHA256_SMALLER
+
+/**
+ * \def MBEDTLS_THREADING_ALT
+ *
+ * Provide your own alternate threading implementation.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to allow your own alternate threading implementation.
+ */
+//#define MBEDTLS_THREADING_ALT
+
+/**
+ * \def MBEDTLS_THREADING_PTHREAD
+ *
+ * Enable the pthread wrapper layer for the threading layer.
+ *
+ * Requires: MBEDTLS_THREADING_C
+ *
+ * Uncomment this to enable pthread mutexes.
+ */
+//#define MBEDTLS_THREADING_PTHREAD
+
+/**
+ * \def MBEDTLS_USE_PSA_CRYPTO
+ *
+ * Make the X.509 and TLS library use PSA for cryptographic operations, see
+ * #MBEDTLS_PSA_CRYPTO_C.
+ *
+ * Note: this option is still in progress, the full X.509 and TLS modules are
+ * not covered yet, but parts that are not ported to PSA yet will still work
+ * as usual, so enabling this option should not break backwards compatibility.
+ *
+ * \warning  Support for PSA is still an experimental feature.
+ *           Any public API that depends on this option may change
+ *           at any time until this warning is removed.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C.
+ */
+//#define MBEDTLS_USE_PSA_CRYPTO
+
+/**
+ * \def MBEDTLS_VERSION_FEATURES
+ *
+ * Allow run-time checking of compile-time enabled features. Thus allowing users
+ * to check at run-time if the library is for instance compiled with threading
+ * support via mbedtls_version_check_feature().
+ *
+ * Requires: MBEDTLS_VERSION_C
+ *
+ * Comment this to disable run-time checking and save ROM space
+ */
+//#define MBEDTLS_VERSION_FEATURES
+
+/* \} name SECTION: mbed TLS feature support */
+
+/**
+ * \name SECTION: mbed TLS modules
+ *
+ * This section enables or disables entire modules in mbed TLS
+ * \{
+ */
+
+/**
+ * \def MBEDTLS_AESNI_C
+ *
+ * Enable AES-NI support on x86-64.
+ *
+ * Module:  library/aesni.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the AES-NI instructions on x86-64
+ */
+//#define MBEDTLS_AESNI_C
+
+/**
+ * \def MBEDTLS_AES_C
+ *
+ * Enable the AES block cipher.
+ *
+ * Module:  library/aes.c
+ * Caller:  library/cipher.c
+ *          library/pem.c
+ *          library/ctr_drbg.c
+ *
+ * This module is required to support the TLS ciphersuites that use the AES
+ * cipher.
+ *
+ * PEM_PARSE uses AES for decrypting encrypted keys.
+ */
+//#define MBEDTLS_AES_C
+
+/**
+ * \def MBEDTLS_ARC4_C
+ *
+ * Enable the ARCFOUR stream cipher.
+ *
+ * Module:  library/arc4.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the ARC4
+ * cipher.
+ *
+ * \warning   ARC4 is considered a weak cipher and its use constitutes a
+ *            security risk. If possible, we recommend avoidng dependencies on
+ *            it, and considering stronger ciphers instead.
+ *
+ */
+//#define MBEDTLS_ARC4_C
+
+/**
+ * \def MBEDTLS_ASN1_PARSE_C
+ *
+ * Enable the generic ASN1 parser.
+ *
+ * Module:  library/asn1.c
+ * Caller:  library/dhm.c
+ *          library/pkcs12.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ */
+//#define MBEDTLS_ASN1_PARSE_C
+
+/**
+ * \def MBEDTLS_ASN1_WRITE_C
+ *
+ * Enable the generic ASN1 writer.
+ *
+ * Module:  library/asn1write.c
+ * Caller:  library/ecdsa.c
+ *          library/pkwrite.c
+ */
+//#define MBEDTLS_ASN1_WRITE_C
+
+/**
+ * \def MBEDTLS_BASE64_C
+ *
+ * Enable the Base64 module.
+ *
+ * Module:  library/base64.c
+ * Caller:  library/pem.c
+ *
+ * This module is required for PEM support (required by X.509).
+ */
+//#define MBEDTLS_BASE64_C
+
+/**
+ * \def MBEDTLS_BIGNUM_C
+ *
+ * Enable the multi-precision integer library.
+ *
+ * Module:  library/bignum.c
+ * Caller:  library/dhm.c
+ *          library/ecp.c
+ *          library/ecdsa.c
+ *          library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is required for RSA, DHM and ECC (ECDH, ECDSA) support.
+ */
+//#define MBEDTLS_BIGNUM_C
+
+/**
+ * \def MBEDTLS_BLOWFISH_C
+ *
+ * Enable the Blowfish block cipher.
+ *
+ * Module:  library/blowfish.c
+ */
+//#define MBEDTLS_BLOWFISH_C
+
+/**
+ * \def MBEDTLS_CAMELLIA_C
+ *
+ * Enable the Camellia block cipher.
+ *
+ * Module:  library/camellia.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * Camellia cipher.
+ */
+//#define MBEDTLS_CAMELLIA_C
+
+/**
+ * \def MBEDTLS_ARIA_C
+ *
+ * Enable the ARIA block cipher.
+ *
+ * Module:  library/aria.c
+ * Caller:  library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the
+ * ARIA cipher.
+ */
+//#define MBEDTLS_ARIA_C
+
+/**
+ * \def MBEDTLS_CCM_C
+ *
+ * Enable the Counter with CBC-MAC (CCM) mode for 128-bit block cipher.
+ *
+ * Module:  library/ccm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support AES-CCM ciphersuites in TLS.
+ */
+//#define MBEDTLS_CCM_C
+
+/**
+ * \def MBEDTLS_CHACHA20_C
+ *
+ * Enable the ChaCha20 stream cipher.
+ *
+ * Module:  library/chacha20.c
+ */
+//#define MBEDTLS_CHACHA20_C
+
+/**
+ * \def MBEDTLS_CHACHAPOLY_C
+ *
+ * Enable the ChaCha20-Poly1305 AEAD algorithm.
+ *
+ * Module:  library/chachapoly.c
+ *
+ * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
+ */
+//#define MBEDTLS_CHACHAPOLY_C
+
+/**
+ * \def MBEDTLS_CIPHER_C
+ *
+ * Enable the generic cipher layer.
+ *
+ * Module:  library/cipher.c
+ *
+ * Uncomment to enable generic cipher wrappers.
+ */
+//#define MBEDTLS_CIPHER_C
+
+/**
+ * \def MBEDTLS_CMAC_C
+ *
+ * Enable the CMAC (Cipher-based Message Authentication Code) mode for block
+ * ciphers.
+ *
+ * Module:  library/cmac.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
+ *
+ */
+//#define MBEDTLS_CMAC_C
+
+/**
+ * \def MBEDTLS_CTR_DRBG_C
+ *
+ * Enable the CTR_DRBG AES-based random generator.
+ * The CTR_DRBG generator uses AES-256 by default.
+ * To use AES-128 instead, enable MBEDTLS_CTR_DRBG_USE_128_BIT_KEY below.
+ *
+ * Module:  library/ctr_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_AES_C
+ *
+ * This module provides the CTR_DRBG AES random number generator.
+ */
+//#define MBEDTLS_CTR_DRBG_C
+
+/**
+ * \def MBEDTLS_DES_C
+ *
+ * Enable the DES block cipher.
+ *
+ * Module:  library/des.c
+ * Caller:  library/pem.c
+ *          library/cipher.c
+ *
+ * This module is required to support the TLS ciphersuites that use the DES
+ * cipher.
+ *
+ * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
+ *
+ * \warning   DES is considered a weak cipher and its use constitutes a
+ *            security risk. We recommend considering stronger ciphers instead.
+ */
+//#define MBEDTLS_DES_C
+
+/**
+ * \def MBEDTLS_DHM_C
+ *
+ * Enable the Diffie-Hellman-Merkle module.
+ *
+ * Module:  library/dhm.c
+ *
+ * This module is used by the following key exchanges:
+ *      DHE-RSA, DHE-PSK
+ *
+ * \warning    Using DHE constitutes a security risk as it
+ *             is not possible to validate custom DH parameters.
+ *             If possible, it is recommended users should consider
+ *             preferring other methods of key exchange.
+ *             See dhm.h for more details.
+ *
+ */
+//#define MBEDTLS_DHM_C
+
+/**
+ * \def MBEDTLS_ECDH_C
+ *
+ * Enable the elliptic curve Diffie-Hellman library.
+ *
+ * Module:  library/ecdh.c
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
+ *
+ * Requires: MBEDTLS_ECP_C
+ */
+//#define MBEDTLS_ECDH_C
+
+/**
+ * \def MBEDTLS_ECDSA_C
+ *
+ * Enable the elliptic curve DSA library.
+ *
+ * Module:  library/ecdsa.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECDHE-ECDSA
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_ASN1_WRITE_C, MBEDTLS_ASN1_PARSE_C
+ */
+//#define MBEDTLS_ECDSA_C
+
+/**
+ * \def MBEDTLS_ECJPAKE_C
+ *
+ * Enable the elliptic curve J-PAKE library.
+ *
+ * \warning This is currently experimental. EC J-PAKE support is based on the
+ * Thread v1.0.0 specification; incompatible changes to the specification
+ * might still happen. For this reason, this is disabled by default.
+ *
+ * Module:  library/ecjpake.c
+ * Caller:
+ *
+ * This module is used by the following key exchanges:
+ *      ECJPAKE
+ *
+ * Requires: MBEDTLS_ECP_C, MBEDTLS_MD_C
+ */
+//#define MBEDTLS_ECJPAKE_C
+
+/**
+ * \def MBEDTLS_ECP_C
+ *
+ * Enable the elliptic curve over GF(p) library.
+ *
+ * Module:  library/ecp.c
+ * Caller:  library/ecdh.c
+ *          library/ecdsa.c
+ *          library/ecjpake.c
+ *
+ * Requires: MBEDTLS_BIGNUM_C and at least one MBEDTLS_ECP_DP_XXX_ENABLED
+ */
+//#define MBEDTLS_ECP_C
+
+/**
+ * \def MBEDTLS_ENTROPY_C
+ *
+ * Enable the platform-specific entropy code.
+ *
+ * Module:  library/entropy.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_SHA512_C or MBEDTLS_SHA256_C
+ *
+ * This module provides a generic entropy pool
+ */
+//#define MBEDTLS_ENTROPY_C
+
+/**
+ * \def MBEDTLS_ERROR_C
+ *
+ * Enable error code to error string conversion.
+ *
+ * Module:  library/error.c
+ * Caller:
+ *
+ * This module enables mbedtls_strerror().
+ */
+//#define MBEDTLS_ERROR_C
+
+/**
+ * \def MBEDTLS_GCM_C
+ *
+ * Enable the Galois/Counter Mode (GCM) for AES.
+ *
+ * Module:  library/gcm.c
+ *
+ * Requires: MBEDTLS_AES_C or MBEDTLS_CAMELLIA_C
+ *
+ * This module is required to support the TLS ciphersuites that use GCM.
+ */
+//#define MBEDTLS_GCM_C
+
+/**
+ * \def MBEDTLS_HAVEGE_C
+ *
+ * Enable the HAVEGE random generator.
+ *
+ * Warning: the HAVEGE random generator is not suitable for virtualized
+ *          environments
+ *
+ * Warning: the HAVEGE random generator is dependent on timing and specific
+ *          processor traits. It is therefore not advised to use HAVEGE as
+ *          your applications primary random generator or primary entropy pool
+ *          input. As a secondary input to your entropy pool, it IS able add
+ *          the (limited) extra entropy it provides.
+ *
+ * Module:  library/havege.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_TIMING_C
+ *
+ * Uncomment to enable the HAVEGE random generator.
+ */
+//#define MBEDTLS_HAVEGE_C
+
+/**
+ * \def MBEDTLS_HKDF_C
+ *
+ * Enable the HKDF algorithm (RFC 5869).
+ *
+ * Module:  library/hkdf.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the Hashed Message Authentication Code
+ * (HMAC)-based key derivation function (HKDF).
+ */
+//#define MBEDTLS_HKDF_C
+
+/**
+ * \def MBEDTLS_HMAC_DRBG_C
+ *
+ * Enable the HMAC_DRBG random generator.
+ *
+ * Module:  library/hmac_drbg.c
+ * Caller:
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+ */
+//#define MBEDTLS_HMAC_DRBG_C
+
+/**
+ * \def MBEDTLS_NIST_KW_C
+ *
+ * Enable the Key Wrapping mode for 128-bit block ciphers,
+ * as defined in NIST SP 800-38F. Only KW and KWP modes
+ * are supported. At the moment, only AES is approved by NIST.
+ *
+ * Module:  library/nist_kw.c
+ *
+ * Requires: MBEDTLS_AES_C and MBEDTLS_CIPHER_C
+ */
+//#define MBEDTLS_NIST_KW_C
+
+/**
+ * \def MBEDTLS_MD_C
+ *
+ * Enable the generic message digest layer.
+ *
+ * Module:  library/md.c
+ * Caller:
+ *
+ * Uncomment to enable generic message digest wrappers.
+ */
+//#define MBEDTLS_MD_C
+
+/**
+ * \def MBEDTLS_MD2_C
+ *
+ * Enable the MD2 hash algorithm.
+ *
+ * Module:  library/md2.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD2-signed X.509 certs.
+ *
+ * \warning   MD2 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD2_C
+
+/**
+ * \def MBEDTLS_MD4_C
+ *
+ * Enable the MD4 hash algorithm.
+ *
+ * Module:  library/md4.c
+ * Caller:
+ *
+ * Uncomment to enable support for (rare) MD4-signed X.509 certs.
+ *
+ * \warning   MD4 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD4_C
+
+/**
+ * \def MBEDTLS_MD5_C
+ *
+ * Enable the MD5 hash algorithm.
+ *
+ * Module:  library/md5.c
+ * Caller:  library/md.c
+ *          library/pem.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, and for TLS 1.2
+ * depending on the handshake parameters. Further, it is used for checking
+ * MD5-signed certificates, and for PBKDF1 when decrypting PEM-encoded
+ * encrypted keys.
+ *
+ * \warning   MD5 is considered a weak message digest and its use constitutes a
+ *            security risk. If possible, we recommend avoiding dependencies on
+ *            it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_MD5_C
+
+/**
+ * \def MBEDTLS_MEMORY_BUFFER_ALLOC_C
+ *
+ * Enable the buffer allocator implementation that makes use of a (stack)
+ * based buffer to 'allocate' dynamic memory. (replaces calloc() and free()
+ * calls)
+ *
+ * Module:  library/memory_buffer_alloc.c
+ *
+ * Requires: MBEDTLS_PLATFORM_C
+ *           MBEDTLS_PLATFORM_MEMORY (to use it within mbed TLS)
+ *
+ * Enable this module to enable the buffer memory allocator.
+ */
+//#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
+
+/**
+ * \def MBEDTLS_OID_C
+ *
+ * Enable the OID database.
+ *
+ * Module:  library/oid.c
+ * Caller:  library/asn1write.c
+ *          library/pkcs5.c
+ *          library/pkparse.c
+ *          library/pkwrite.c
+ *          library/rsa.c
+ *
+ * This modules translates between OIDs and internal values.
+ */
+//#define MBEDTLS_OID_C
+
+/**
+ * \def MBEDTLS_PADLOCK_C
+ *
+ * Enable VIA Padlock support on x86.
+ *
+ * Module:  library/padlock.c
+ * Caller:  library/aes.c
+ *
+ * Requires: MBEDTLS_HAVE_ASM
+ *
+ * This modules adds support for the VIA PadLock on x86.
+ */
+//#define MBEDTLS_PADLOCK_C
+
+/**
+ * \def MBEDTLS_PEM_PARSE_C
+ *
+ * Enable PEM decoding / parsing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/dhm.c
+ *          library/pkparse.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for decoding / parsing PEM files.
+ */
+//#define MBEDTLS_PEM_PARSE_C
+
+/**
+ * \def MBEDTLS_PEM_WRITE_C
+ *
+ * Enable PEM encoding / writing.
+ *
+ * Module:  library/pem.c
+ * Caller:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_BASE64_C
+ *
+ * This modules adds support for encoding / writing PEM files.
+ */
+//#define MBEDTLS_PEM_WRITE_C
+
+/**
+ * \def MBEDTLS_PK_C
+ *
+ * Enable the generic public (asymmetric) key layer.
+ *
+ * Module:  library/pk.c
+ *
+ * Requires: MBEDTLS_RSA_C or MBEDTLS_ECP_C
+ *
+ * Uncomment to enable generic public key wrappers.
+ */
+//#define MBEDTLS_PK_C
+
+/**
+ * \def MBEDTLS_PK_PARSE_C
+ *
+ * Enable the generic public (asymmetric) key parser.
+ *
+ * Module:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key parse functions.
+ */
+//#define MBEDTLS_PK_PARSE_C
+
+/**
+ * \def MBEDTLS_PK_WRITE_C
+ *
+ * Enable the generic public (asymmetric) key writer.
+ *
+ * Module:  library/pkwrite.c
+ *
+ * Requires: MBEDTLS_PK_C
+ *
+ * Uncomment to enable generic public key write functions.
+ */
+//#define MBEDTLS_PK_WRITE_C
+
+/**
+ * \def MBEDTLS_PKCS5_C
+ *
+ * Enable PKCS#5 functions.
+ *
+ * Module:  library/pkcs5.c
+ *
+ * Requires: MBEDTLS_MD_C
+ *
+ * This module adds support for the PKCS#5 functions.
+ */
+//#define MBEDTLS_PKCS5_C
+
+/**
+ * \def MBEDTLS_PKCS12_C
+ *
+ * Enable PKCS#12 PBE functions.
+ * Adds algorithms for parsing PKCS#8 encrypted private keys
+ *
+ * Module:  library/pkcs12.c
+ * Caller:  library/pkparse.c
+ *
+ * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_CIPHER_C, MBEDTLS_MD_C
+ * Can use:  MBEDTLS_ARC4_C
+ *
+ * This module enables PKCS#12 functions.
+ */
+//#define MBEDTLS_PKCS12_C
+
+/**
+ * \def MBEDTLS_PLATFORM_C
+ *
+ * Enable the platform abstraction layer that allows you to re-assign
+ * functions like calloc(), free(), snprintf(), printf(), fprintf(), exit().
+ *
+ * Enabling MBEDTLS_PLATFORM_C enables to use of MBEDTLS_PLATFORM_XXX_ALT
+ * or MBEDTLS_PLATFORM_XXX_MACRO directives, allowing the functions mentioned
+ * above to be specified at runtime or compile time respectively.
+ *
+ * \note This abstraction layer must be enabled on Windows (including MSYS2)
+ * as other module rely on it for a fixed snprintf implementation.
+ *
+ * Module:  library/platform.c
+ * Caller:  Most other .c files
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+//#define MBEDTLS_PLATFORM_C
+
+/**
+ * \def MBEDTLS_POLY1305_C
+ *
+ * Enable the Poly1305 MAC algorithm.
+ *
+ * Module:  library/poly1305.c
+ * Caller:  library/chachapoly.c
+ */
+//#define MBEDTLS_POLY1305_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_C
+ *
+ * Enable the Platform Security Architecture cryptography API.
+ *
+ * Module:  library/psa_crypto.c
+ *
+ * Requires: MBEDTLS_CTR_DRBG_C, MBEDTLS_ENTROPY_C
+ *
+ */
+//#define MBEDTLS_PSA_CRYPTO_C
+
+/**
+ * \def MBEDTLS_PSA_CRYPTO_STORAGE_C
+ *
+ * Enable the Platform Security Architecture persistent key storage.
+ *
+ * Module:  library/psa_crypto_storage.c
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C,
+ *           either MBEDTLS_PSA_ITS_FILE_C or a native implementation of
+ *           the PSA ITS interface
+ */
+//#define MBEDTLS_PSA_CRYPTO_STORAGE_C
+
+/**
+ * \def MBEDTLS_PSA_ITS_FILE_C
+ *
+ * Enable the emulation of the Platform Security Architecture
+ * Internal Trusted Storage (PSA ITS) over files.
+ *
+ * Module:  library/psa_its_file.c
+ *
+ * Requires: MBEDTLS_FS_IO
+ */
+//#define MBEDTLS_PSA_ITS_FILE_C
+
+/**
+ * \def MBEDTLS_RIPEMD160_C
+ *
+ * Enable the RIPEMD-160 hash algorithm.
+ *
+ * Module:  library/ripemd160.c
+ * Caller:  library/md.c
+ *
+ */
+//#define MBEDTLS_RIPEMD160_C
+
+/**
+ * \def MBEDTLS_RSA_C
+ *
+ * Enable the RSA public-key cryptosystem.
+ *
+ * Module:  library/rsa.c
+ *          library/rsa_internal.c
+ *
+ * This module is used by the following key exchanges:
+ *      RSA, DHE-RSA, ECDHE-RSA, RSA-PSK
+ *
+ * Requires: MBEDTLS_BIGNUM_C, MBEDTLS_OID_C
+ */
+/* #define MBEDTLS_RSA_C */
+
+/**
+ * \def MBEDTLS_SHA1_C
+ *
+ * Enable the SHA1 cryptographic hash algorithm.
+ *
+ * Module:  library/sha1.c
+ * Caller:  library/md.c
+ *
+ * This module is required for SSL/TLS up to version 1.1, for TLS 1.2
+ * depending on the handshake parameters, and for SHA1-signed certificates.
+ *
+ * \warning   SHA-1 is considered a weak message digest and its use constitutes
+ *            a security risk. If possible, we recommend avoiding dependencies
+ *            on it, and considering stronger message digests instead.
+ *
+ */
+//#define MBEDTLS_SHA1_C
+
+/**
+ * \def MBEDTLS_SHA256_C
+ *
+ * Enable the SHA-224 and SHA-256 cryptographic hash algorithms.
+ *
+ * Module:  library/sha256.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-224 and SHA-256.
+ * This module is required for the SSL/TLS 1.2 PRF function.
+ */
+#define MBEDTLS_SHA256_C
+
+/**
+ * \def MBEDTLS_SHA512_C
+ *
+ * Enable the SHA-384 and SHA-512 cryptographic hash algorithms.
+ *
+ * Module:  library/sha512.c
+ * Caller:  library/entropy.c
+ *          library/md.c
+ *
+ * This module adds support for SHA-384 and SHA-512.
+ */
+//#define MBEDTLS_SHA512_C
+
+/**
+ * \def MBEDTLS_THREADING_C
+ *
+ * Enable the threading abstraction layer.
+ * By default mbed TLS assumes it is used in a non-threaded environment or that
+ * contexts are not shared between threads. If you do intend to use contexts
+ * between threads, you will need to enable this layer to prevent race
+ * conditions. See also our Knowledge Base article about threading:
+ * https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
+ *
+ * Module:  library/threading.c
+ *
+ * This allows different threading implementations (self-implemented or
+ * provided).
+ *
+ * You will have to enable either MBEDTLS_THREADING_ALT or
+ * MBEDTLS_THREADING_PTHREAD.
+ *
+ * Enable this layer to allow use of mutexes within mbed TLS
+ */
+//#define MBEDTLS_THREADING_C
+
+/**
+ * \def MBEDTLS_TIMING_C
+ *
+ * Enable the semi-portable timing interface.
+ *
+ * \note The provided implementation only works on POSIX/Unix (including Linux,
+ * BSD and OS X) and Windows. On other platforms, you can either disable that
+ * module and provide your own implementations of the callbacks needed by Mbed
+ * TLS's \c mbedtls_ssl_set_timer_cb() for DTLS, or leave it enabled and
+ * provide your own implementation of the whole module by setting
+ * \c MBEDTLS_TIMING_ALT in the current file.
+ *
+ * \note See also our Knowledge Base article about porting to a new
+ * environment:
+ * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS
+ *
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+//#define MBEDTLS_TIMING_C
+
+/**
+ * \def MBEDTLS_VERSION_C
+ *
+ * Enable run-time version information.
+ *
+ * Module:  library/version.c
+ *
+ * This module provides run-time version information.
+ */
+//#define MBEDTLS_VERSION_C
+
+/**
+ * \def MBEDTLS_XTEA_C
+ *
+ * Enable the XTEA block cipher.
+ *
+ * Module:  library/xtea.c
+ * Caller:
+ */
+//#define MBEDTLS_XTEA_C
+
+/* \} name SECTION: mbed TLS modules */
+
+/**
+ * \name SECTION: Module configuration options
+ *
+ * This section allows for the setting of module specific sizes and
+ * configuration options. The default values are already present in the
+ * relevant header files and should suffice for the regular use cases.
+ *
+ * Our advice is to enable options and change their values here
+ * only if you have a good reason and know the consequences.
+ *
+ * Please check the respective header file for documentation on these
+ * parameters (to prevent duplicate documentation).
+ * \{
+ */
+
+/* MPI / BIGNUM options */
+//#define MBEDTLS_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
+//#define MBEDTLS_MPI_MAX_SIZE            1024 /**< Maximum number of bytes for usable MPIs. */
+
+/* CTR_DRBG options */
+//#define MBEDTLS_CTR_DRBG_ENTROPY_LEN               48 /**< Amount of entropy used per seed by default (48 with SHA-512, 32 with SHA-256) */
+//#define MBEDTLS_CTR_DRBG_RESEED_INTERVAL        10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_CTR_DRBG_MAX_INPUT                256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_CTR_DRBG_MAX_REQUEST             1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_CTR_DRBG_MAX_SEED_INPUT           384 /**< Maximum size of (re)seed buffer */
+//#define MBEDTLS_CTR_DRBG_USE_128_BIT_KEY              /**< Use 128-bit key for CTR_DRBG - may reduce security (see ctr_drbg.h) */
+
+/* HMAC_DRBG options */
+//#define MBEDTLS_HMAC_DRBG_RESEED_INTERVAL   10000 /**< Interval before reseed is performed by default */
+//#define MBEDTLS_HMAC_DRBG_MAX_INPUT           256 /**< Maximum number of additional input bytes */
+//#define MBEDTLS_HMAC_DRBG_MAX_REQUEST        1024 /**< Maximum number of requested bytes per call */
+//#define MBEDTLS_HMAC_DRBG_MAX_SEED_INPUT      384 /**< Maximum size of (re)seed buffer */
+
+/* ECP options */
+//#define MBEDTLS_ECP_MAX_BITS             521 /**< Maximum bit size of groups */
+//#define MBEDTLS_ECP_WINDOW_SIZE            6 /**< Maximum window size used */
+//#define MBEDTLS_ECP_FIXED_POINT_OPTIM      1 /**< Enable fixed-point speed-up */
+
+/* Entropy options */
+//#define MBEDTLS_ENTROPY_MAX_SOURCES                20 /**< Maximum number of sources supported */
+//#define MBEDTLS_ENTROPY_MAX_GATHER                128 /**< Maximum amount requested from entropy sources */
+//#define MBEDTLS_ENTROPY_MIN_HARDWARE               32 /**< Default minimum number of bytes required for the hardware entropy source mbedtls_hardware_poll() before entropy is released */
+
+/* Memory buffer allocator options */
+//#define MBEDTLS_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
+
+/* Platform options */
+//#define MBEDTLS_PLATFORM_STD_MEM_HDR   <stdlib.h> /**< Header to include if MBEDTLS_PLATFORM_NO_STD_FUNCTIONS is defined. Don't define if no header is needed. */
+//#define MBEDTLS_PLATFORM_STD_CALLOC        calloc /**< Default allocator to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_FREE            free /**< Default free to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT            exit /**< Default exit to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_TIME            time /**< Default time to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_STD_FPRINTF      fprintf /**< Default fprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_PRINTF        printf /**< Default printf to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_STD_SNPRINTF    snprintf /**< Default snprintf to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_SUCCESS       0 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_EXIT_FAILURE       1 /**< Default exit value to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_READ   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_WRITE  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_STD_NV_SEED_FILE  "seedfile" /**< Seed file to read/write with default implementation */
+
+/* To Use Function Macros MBEDTLS_PLATFORM_C must be enabled */
+/* MBEDTLS_PLATFORM_XXX_MACRO and MBEDTLS_PLATFORM_XXX_ALT cannot both be defined */
+//#define MBEDTLS_PLATFORM_CALLOC_MACRO        calloc /**< Default allocator macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_FREE_MACRO            free /**< Default free macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_EXIT_MACRO            exit /**< Default exit macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_TIME_MACRO            time /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO       time_t /**< Default time macro to use, can be undefined. MBEDTLS_HAVE_TIME must be enabled */
+//#define MBEDTLS_PLATFORM_FPRINTF_MACRO      fprintf /**< Default fprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_PRINTF_MACRO        printf /**< Default printf macro to use, can be undefined */
+/* Note: your snprintf must correctly zero-terminate the buffer! */
+//#define MBEDTLS_PLATFORM_SNPRINTF_MACRO    snprintf /**< Default snprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_VSNPRINTF_MACRO    vsnprintf /**< Default vsnprintf macro to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO   mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
+//#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO  mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
+
+/**
+ * Uncomment the macro to let mbed TLS use your alternate implementation of
+ * mbedtls_platform_zeroize(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * mbedtls_platform_zeroize() is a widely used function across the library to
+ * zero a block of memory. The implementation is expected to be secure in the
+ * sense that it has been written to prevent the compiler from removing calls
+ * to mbedtls_platform_zeroize() as part of redundant code elimination
+ * optimizations. However, it is difficult to guarantee that calls to
+ * mbedtls_platform_zeroize() will not be optimized by the compiler as older
+ * versions of the C language standards do not provide a secure implementation
+ * of memset(). Therefore, MBEDTLS_PLATFORM_ZEROIZE_ALT enables users to
+ * configure their own implementation of mbedtls_platform_zeroize(), for
+ * example by using directives specific to their compiler, features from newer
+ * C standards (e.g using memset_s() in C11) or calling a secure memset() from
+ * their system (e.g explicit_bzero() in BSD).
+ */
+//#define MBEDTLS_PLATFORM_ZEROIZE_ALT
+
+/**
+ * Uncomment the macro to let Mbed TLS use your alternate implementation of
+ * mbedtls_platform_gmtime_r(). This replaces the default implementation in
+ * platform_util.c.
+ *
+ * gmtime() is not a thread-safe function as defined in the C standard. The
+ * library will try to use safer implementations of this function, such as
+ * gmtime_r() when available. However, if Mbed TLS cannot identify the target
+ * system, the implementation of mbedtls_platform_gmtime_r() will default to
+ * using the standard gmtime(). In this case, calls from the library to
+ * gmtime() will be guarded by the global mutex mbedtls_threading_gmtime_mutex
+ * if MBEDTLS_THREADING_C is enabled. We recommend that calls from outside the
+ * library are also guarded with this mutex to avoid race conditions. However,
+ * if the macro MBEDTLS_PLATFORM_GMTIME_R_ALT is defined, Mbed TLS will
+ * unconditionally use the implementation for mbedtls_platform_gmtime_r()
+ * supplied at compile time.
+ */
+//#define MBEDTLS_PLATFORM_GMTIME_R_ALT
+
+/* \} name SECTION: Customisation configuration options */
+
+/* Target and application specific configurations
+ *
+ * Allow user to override any previous default.
+ *
+ */
+#if defined(MBEDTLS_USER_CONFIG_FILE)
+#include MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#include "mbedtls/check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
new file mode 100644
index 00000000..8ebb6f6f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/nvms_low_level.h
@@ -0,0 +1,142 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#ifndef NVMS_LOW_LEVEL_H
+#define NVMS_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Exported constants --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Constants Exported Constants
+  * @{
+  */
+#define NVMS_LL_BLOCK0_ADDRESS   KMS_DATASTORAGE_START
+#define NVMS_LL_BLOCK1_ADDRESS   (KMS_DATASTORAGE_START + NVMS_LL_BLOCK_SIZE)
+
+#define NVMS_LL_NB_PAGE_PER_BLOCK  (NVMS_LL_BLOCK_SIZE / FLASH_PAGE_SIZE)
+#define NVMS_LL_BLOCK_SIZE         ((KMS_DATASTORAGE_END- KMS_DATASTORAGE_START + 1U) / 2U)
+
+#define NVMS_LL_ERASED           0xFFFFFFFFU
+
+/* not physical flash page size, but writing granularity size -> 8 bytes */
+#define NVMS_LL_PAGE_SIZE    8UL
+
+/**
+  * @}
+  */
+
+/* Exported types ------------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief   Block identifiers.
+  */
+typedef enum
+{
+  NVMS_BLOCK0 = 0,
+  NVMS_BLOCK1 = 1,
+} nvms_block_t;
+
+
+/**
+  * @}
+  */
+
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+void NVMS_LL_Init(void);
+bool NVMS_LL_IsBlockErased(nvms_block_t block);
+bool NVMS_LL_BlockErase(nvms_block_t block);
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size);
+
+/* Exported in line functions ------------------------------------------------*/
+
+/**
+  * @brief   Returns the base address of the specified flash block
+  * @param   block block identifier
+  * @retval  pointer to the block base
+  */
+static inline uint32_t NVMS_LL_GetBlockAddress(nvms_block_t block)
+{
+
+  if (block == NVMS_BLOCK0)
+  {
+    return (uint32_t)NVMS_LL_BLOCK0_ADDRESS;
+  }
+  return (uint32_t)NVMS_LL_BLOCK1_ADDRESS;
+}
+
+
+/**
+  * @brief   Returns the size of the flash blocks
+  * @note    Blocks are required to be of equal size
+  * @retval  Block size
+  */
+static inline size_t NVMS_LL_GetBlockSize(void)
+{
+
+  return NVMS_LL_BLOCK_SIZE;
+}
+
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* NVMS_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
new file mode 100644
index 00000000..8a159341
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_crypto_config.h
@@ -0,0 +1,101 @@
+/**
+  ******************************************************************************
+  * @file    se_crypto_config.h
+  * @author  MCD Application Team
+  *          This file provides a template to configure the crypto scheme used
+  *          for the services used by the bootloader (crypto operations for the
+  *          Firmware and Metadata).
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_CRYPTO_CONFIG_H
+#define SE_CRYPTO_CONFIG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup SE_CRYPTO SE Crypto
+  * @{
+  */
+
+/** @defgroup SE_CRYPTO_CONFIG SE Crypto scheme configuration
+  * @brief Choose the cryptographic scheme you want the bootloader to use.
+  *        These settings apply to the services used by the bootloader only, not to the services called by the User
+  *        Application.
+  * @{
+  */
+
+/**
+  * SE_CoreBin instantiates the crypto scheme selected thanks to "SECBOOT_CRYPTO_SCHEME".
+  * "SECBOOT_CRYPTO_SCHEME" is composed as indicated below:
+  *        SECBOOT_authenticationalgo_encryptionalgo_MACalgo
+  *
+  * Set "SECBOOT_CRYPTO_SCHEME" to one of the values listed below:
+  *
+  * SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256: no FW encryption, only Authentication and Integrity are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           No Firmware encryption.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using SHA256 signed with ECC DSA.
+  *                           Decrypt Firmware Image with AES128-CBC.
+  *                           Firmware Image Integrity using SHA256 on clear Firmware (SHA256 stored in the
+  *                           authenticated metadata).
+  *
+  * SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM: Authentication, Integrity, Confidentiality are ensured.
+  *                           Authenticate Firmware Metadata using AES128-GCM tag.
+  *                           Decrypt Firmware image using AES128-GCM algo.
+  *                           Firmware Image Integrity using AES128-GCM tag.
+  */
+#define SECBOOT_CRYPTO_SCHEME SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256     /*!< Selected Crypto Scheme */
+
+#define SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256        (1U) /*!< asymmetric crypto, no FW encryption           */
+#define SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256        (2U) /*!< asymmetric crypto with encrypted Firmware     */
+#define SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM     (3U) /*!< symmetric crypto                              */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_CRYPTO_CONFIG_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
new file mode 100644
index 00000000..85f027a9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_def_metadata.h
@@ -0,0 +1,215 @@
+/**
+  ******************************************************************************
+  * @file    se_def_metadata.h
+  * @author  MCD Application Team
+  * @brief   This file contains metadata definitions for SE functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_DEF_METADATA_H
+#define SE_DEF_METADATA_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "se_crypto_config.h"
+
+/** @addtogroup  SE Secure Engine
+  * @{
+  */
+
+/** @addtogroup  SE_CORE SE Core
+  * @{
+  */
+
+/** @addtogroup  SE_CORE_DEF SE Definitions
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA SE Metadata Definitions
+  *  @brief definitions related to FW metadata (header).
+  * @{
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Constants Exported Constants
+  * @brief  Firmware Image Header (FW metadata) constants
+  * @{
+  */
+
+#define SE_FW_HEADER_TOT_LEN    (sizeof(SE_FwRawHeaderTypeDef))   /*!< FW INFO header Total Length */
+#define SE_FW_HEADER_SIGN_LEN   SE_HEADER_SIGN_LEN                /*!< FW Header signature Len */
+#define SE_FW_HEADER_STATE_LEN  (3U * 32U)                        /*!< FW Header state Len */
+#define SE_FW_HEADER_FINGERPRINT_LEN  (32U)                       /*!< FW Header finger print Len */
+#define SE_FW_AUTH_LEN          (SE_FW_HEADER_TOT_LEN - SE_FW_HEADER_SIGN_LEN  \
+                                 - SE_FW_HEADER_STATE_LEN - SE_FW_HEADER_FINGERPRINT_LEN) /*!< Authenticated part of the header */
+
+#define SE_SYMKEY_LEN           (16U)  /*!< SE Symmetric Key length (bytes)*/
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+/* AES-GCM encryption and FW Tag */
+#define SE_NONCE_LEN            (12U)  /*!< Secure Engine Nonce Length (Bytes)*/
+#define SE_TAG_LEN              (16U)  /*!< Secure Engine Tag Length (Bytes): AES-GCM for the FW tag */
+#define SE_HEADER_SIGN_LEN      (16U)  /*!< Firmware Header signature LEN : AES-GCM for header signature */
+#elif ((SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)\
+       || (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256))
+/* AES-CBC encryption (or no encryption) and SHA256 for FW tag */
+#define SE_IV_LEN               (16U)  /*!< Secure Engine IV Length (Bytes): same size as an AES block*/
+#define SE_TAG_LEN              (32U)  /*!< Secure Engine Tag Length (Bytes): SHA-256 for the FW tag */
+#define SE_HEADER_SIGN_LEN      (64U)  /*!< Firmware Header signarure LEN*/
+#define SE_ASYM_PUBKEY_LEN      (64U)  /*!< SE Asymmetric Public Key length (bytes)*/
+#else
+#error "The current example does not support the selected crypto scheme."
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/* Image type: complete or partial image */
+#define SE_FW_IMAGE_COMPLETE    (0U) /*!< Complete Fw Image */
+#define SE_FW_IMAGE_PARTIAL     (1U) /*!< Partial Fw Image */
+
+/*!< FW Magic IDs */
+#define SFUM_1 "SFU1"      /*!< Active Slot #1 : first active also referred as master */
+#define SFUM_2 "SFU2"      /*!< Active Slot #2 : second active slot */
+#define SFUM_3 "SFU3"      /*!< Active Slot #3 : third active slot */
+
+#ifdef ENABLE_IMAGE_STATE_HANDLING
+/* SE_FwStateTypeDef - firmware image state type representing the state of the firmware image
+ * In the header (SE_FwRawHeaderTypeDef.FwImageState), these states are encoded as follows:
+   * FWIMG_STATE_INVALID  : 32 * 0x00, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID    : 32 * 0xFF, 32 * 0x00, 32 * 0x00
+   * FWIMG_STATE_VALID_ALL: 32 * 0xFF, 32 * 0x55, 32 * 0x00
+   * FWIMG_STATE_SELFTEST : 32 * 0xFF, 32 * 0xFF, 32 * 0x00
+   * FWIMG_STATE_NEW      : 32 * 0xFF, 32 * 0xFF, 32 * 0xFF
+ */
+typedef enum
+{
+  FWIMG_STATE_INVALID   = 0U, /* image is not valid (typically selftest has failed) and should not boot */
+  FWIMG_STATE_VALID     = 1U, /* image is valid (selftest passed), image OK to boot if signature checks pass */
+  FWIMG_STATE_VALID_ALL = 2U, /* master image is valid (selftest passed), all other images are automatically validated */
+  FWIMG_STATE_SELFTEST  = 3U, /* self tests to be executed. Image OK to boot one time if signature checks pass */
+  FWIMG_STATE_NEW       = 4U, /* new image, has never run on the device */
+} SE_FwStateTypeDef;
+#endif /* ENABLE_IMAGE_STATE_HANDLING */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_DEF_METADATA_Exported_Types Exported Types
+  * @{
+  */
+
+/**
+  * @brief  Firmware Header structure definition
+  * @note This structure MUST be called SE_FwRawHeaderTypeDef
+  * @note This structure MUST contain a field named 'FwVersion'
+  * @note This structure MUST contain a field named 'FwSize'
+  * @note This structure MUST contain a field named 'FwTag' (to control intergrity of full FW)
+  * @note This structure MUST contain a field named 'PartialFwOffset'
+  * @note This structure MUST contain a field named 'PartialFwSize'
+  * @note This structure MUST contain a field named 'PartialFwTag' (to control intergrity of partial FW)
+  * @note This structure MUST contain a field named 'HeaderSignature' (to control authentication of the header)
+  * @note This structure MUST contain a field named 'FwImageState' (not part of the authentified header)
+  * @note This structure MUST contain a field named 'PrevHeaderFingerprint' (not part of the authentified header)
+  * @note In this example, the header size is always a multiple of 32 to match the FLASH constraint on STM32H7.
+  *       We keep this alignment for all platforms (even when the FLASH alignment constraint is another value) to have
+  *       one unique header size per crypto scheme.
+  * @note In this example, the authentified header size + the header signature is always 192 bytes (for all crypto
+  *       schemes).
+  */
+#if (SECBOOT_CRYPTO_SCHEME == SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM)
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Nonce[SE_NONCE_LEN];    /*!< Nonce used to encrypt firmware*/
+  uint8_t  Reserved[112U];         /*!< Reserved for future use: 112 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN]; /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  InitVector[SE_IV_LEN];  /*!< IV used to encrypt firmware */
+  uint8_t  Reserved[28U];          /*!< Reserved for future use: 28 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#elif (SECBOOT_CRYPTO_SCHEME == SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256)
+
+typedef struct
+{
+  uint8_t  SFUMagic[4U];           /*!< SFU Magic 'SFU1' / 'SFU2' / 'SFU3'*/
+  uint16_t ProtocolVersion;        /*!< SFU Protocol version*/
+  uint16_t FwVersion;              /*!< Firmware version*/
+  uint32_t FwSize;                 /*!< Firmware size (bytes)*/
+  uint32_t PartialFwOffset;        /*!< Offset (bytes) of partial firmware vs full firmware */
+  uint32_t PartialFwSize;          /*!< Size of partial firmware */
+  uint8_t  FwTag[SE_TAG_LEN];      /*!< Firmware Tag*/
+  uint8_t  PartialFwTag[SE_TAG_LEN];/*!< Partial firmware Tag */
+  uint8_t  Reserved[44U];          /*!< Reserved for future use: 44 extra bytes to have a header size of 192 bytes */
+  uint8_t  HeaderSignature[SE_HEADER_SIGN_LEN];  /*!< Signature of the full header message */
+  uint8_t  FwImageState[3U][32U];  /*!< Firmware image state - see SE_FwStateTypeDef for details */
+  uint8_t  PrevHeaderFingerprint[SE_FW_HEADER_FINGERPRINT_LEN]; /*!< Fingerprint of previous FW header (if this is an update, else 32*0x00) */
+} SE_FwRawHeaderTypeDef;
+
+#else
+
+#error "The current example does not support the selected crypto scheme."
+
+#endif /* SECBOOT_CRYPTO_SCHEME */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_DEF_METADATA_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
new file mode 100644
index 00000000..3d7e71b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/se_low_level.h
@@ -0,0 +1,210 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Secure Engine low level interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef SE_LOW_LEVEL_H
+#define SE_LOW_LEVEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_def.h"
+
+/* Secure Engine needs to know the slots configuration for the Read/Write services in protected area
+   (see @ref SE_IMG_Write, see @ref SE_IMG_Read) */
+#include "sfu_fwimg_regions.h"
+
+#include "stm32wlxx_hal.h"
+
+/** @addtogroup SE
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Constants Exported Constants
+  * @{
+  */
+/**
+  * @brief flash handling constants: these constants are used in se_fwimg.c
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros Exported Macros
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CRC CRC Settings
+  * @{
+  */
+
+/**
+  * @brief Set CRC 32 of the BootInfoTypeDef pointer passed as parameter
+  * The CRC is computed with the structure without its CRC field and the length is provided to SE_CRC_Calculate in
+  * 32-bit word.
+  * Please note that this works only if the CRC field is kept as the last uint32_t of the SE_BootInfoTypeDef structure.
+  */
+#define SE_BOOT_CONFIG_SET_CRC_32(x)    \
+  do{                                  \
+    (x)->CRC32 = SE_CRC_Calculate ((uint32_t*)(x), (sizeof(SE_BootInfoTypeDef)-sizeof(uint32_t))/sizeof(uint32_t));\
+  }while(0)
+
+/**
+  * @brief Set CRC of the BootInfoTypeDef pointer passed as parameter
+  */
+#define SE_BOOT_CONFIG_SET_CRC(x)      SE_BOOT_CONFIG_SET_CRC_32(x)
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Macros_CodeIsolation Code Isolation Settings
+  * @brief These settings configure the way the Secure Engine is isolated from the rest of the code.
+  * @{
+  */
+
+/**
+  * Code isolation based on Firewall
+  */
+#define SFU_ISOLATE_SE_WITH_MPU
+
+/**
+  * MPU : Enter/Exit secured area ==> nothing to do
+  */
+#define ENTER_PROTECTED_AREA() do { /* do nothing */; } while(0)
+#define EXIT_PROTECTED_AREA() do { /* do nothing */; } while(0)
+
+/**
+  * Service to enable/disable interrupts
+  */
+#define UPDATE_IRQ_SERVICE
+
+
+/** @addtogroup SE_LOW_LEVEL_Exported_Functions
+  * @{
+  */
+void SE_LL_CORE_Cleanup(void);
+#if defined (__CC_ARM)
+void __arm_clean_data(void);
+#elif defined(__GNUC__)
+void __gcc_clean_data(void);
+#endif /* __CC_ARM */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_Functions
+  * @{
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_CRC_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void);
+SE_ErrorStatus SE_LL_CRC_Init(void);
+SE_ErrorStatus SE_LL_CRC_DeInit(void);
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength);
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length);
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Exported_FLASH_EXT_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_RAM_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length);
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb);
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void);
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SE_LOW_LEVEL_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..99ddd88d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,340 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/* #define HAL_ADC_MODULE_ENABLED */
+/* #define HAL_COMP_MODULE_ENABLED */
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
+/* #define HAL_DAC_MODULE_ENABLED */
+/* #define HAL_GTZC_MODULE_ENABLED */
+/* #define HAL_HSEM_MODULE_ENABLED */
+/* #define HAL_I2C_MODULE_ENABLED */
+/* #define HAL_I2S_MODULE_ENABLED */
+/* #define HAL_IPCC_MODULE_ENABLED */
+/* #define HAL_IRDA_MODULE_ENABLED */
+/* #define HAL_IWDG_MODULE_ENABLED */
+/* #define HAL_LPTIM_MODULE_ENABLED */
+#define HAL_PKA_MODULE_ENABLED
+/* #define HAL_RNG_MODULE_ENABLED */
+/* #define HAL_RTC_MODULE_ENABLED */
+/* #define HAL_SMARTCARD_MODULE_ENABLED */
+/* #define HAL_SMBUS_MODULE_ENABLED */
+/* #define HAL_SPI_MODULE_ENABLED */
+/* #define HAL_SUBGHZ_MODULE_ENABLED */
+/* #define HAL_TIM_MODULE_ENABLED */
+/* #define HAL_UART_MODULE_ENABLED */
+/* #define HAL_USART_MODULE_ENABLED */
+/* #define HAL_WWDG_MODULE_ENABLED */
+/* #define HAL_EXTI_MODULE_ENABLED */
+/* #define HAL_CORTEX_MODULE_ENABLED */
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
new file mode 100644
index 00000000..15b64f1c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvoptx
@@ -0,0 +1,693 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>12000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U001F00313038511234333935 -O206 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>0</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\data_init.c</PathWithFileName>
+      <FilenameWithoutPath>data_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/ca_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>ca_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/kms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>kms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/nvms_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>nvms_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Src/se_low_level.c</PathWithFileName>
+      <FilenameWithoutPath>se_low_level.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_crc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pka.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</PathWithFileName>
+      <FilenameWithoutPath>se_callgate.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</PathWithFileName>
+      <FilenameWithoutPath>se_exception.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</PathWithFileName>
+      <FilenameWithoutPath>se_fwimg.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</PathWithFileName>
+      <FilenameWithoutPath>se_startup.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</PathWithFileName>
+      <FilenameWithoutPath>se_user_application.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</PathWithFileName>
+      <FilenameWithoutPath>se_utils.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</PathWithFileName>
+      <FilenameWithoutPath>ca_core.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</PathWithFileName>
+      <FilenameWithoutPath>kms_der_x962.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</PathWithFileName>
+      <FilenameWithoutPath>kms_digest.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</PathWithFileName>
+      <FilenameWithoutPath>kms_dyn_obj.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</PathWithFileName>
+      <FilenameWithoutPath>kms_ecc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</PathWithFileName>
+      <FilenameWithoutPath>kms_enc_dec.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</PathWithFileName>
+      <FilenameWithoutPath>kms_entry.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</PathWithFileName>
+      <FilenameWithoutPath>kms_init.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</PathWithFileName>
+      <FilenameWithoutPath>kms_key_mgt.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</PathWithFileName>
+      <FilenameWithoutPath>kms_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</PathWithFileName>
+      <FilenameWithoutPath>kms_nvm_storage.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</PathWithFileName>
+      <FilenameWithoutPath>kms_platf_objects.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</PathWithFileName>
+      <FilenameWithoutPath>kms_sign_verify.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</PathWithFileName>
+      <FilenameWithoutPath>platform_util.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</PathWithFileName>
+      <FilenameWithoutPath>sha256.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
new file mode 100644
index 00000000..881c003f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/Project.uvprojx
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>STM32WL55JC_Nucleo_2_Images_SECoreBin</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>.\STM32WL55JC_Nucleo\Exe\</OutputDirectory>
+          <OutputName>SECoreBin</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>0</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name>prebuild.bat .</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>2</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name>fromelf #L --bin --output=$L@L.bin</UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>0</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>3</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>0</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x10000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define>USE_HAL_DRIVER,STM32WL55xx,CORE_CM0PLUS,KMS_ENABLED,MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;,IT_MANAGEMENT_DISABLED</Define>
+              <Undefine></Undefine>
+              <IncludePath>.;../Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/ST/STM32_Secure_Engine/Key;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../2_Images_SBSFU/CM0PLUS/SBSFU/App;../../2_Images_SBSFU/Common;../../Linker_Common/MDK-ARM;../../Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App;../../Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>SECoreBin.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc>--entry=SE_CallGate
+--diag_suppress L6404W
+--diag_suppress L6314W</Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>data_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\data_init.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/ca_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/kms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>nvms_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/nvms_low_level.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_low_level.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Src/se_low_level.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_crc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_crc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pka.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_callgate.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_exception.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_fwimg.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_user_application.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_utils.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Key_Management_Services</GroupName>
+          <Files>
+            <File>
+              <FileName>ca_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_der_x962.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_digest.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_dyn_obj.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_ecc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_enc_dec.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_init.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_key_mgt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_nvm_storage.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_platf_objects.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</FilePath>
+            </File>
+            <File>
+              <FileName>kms_sign_verify.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Third_Party/mbed-crypto</GroupName>
+          <Files>
+            <File>
+              <FileName>platform_util.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/platform_util.c</FilePath>
+            </File>
+            <File>
+              <FileName>sha256.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/mbed-crypto/library/sha256.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.2.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.5.1"/>
+        <targetInfos>
+          <targetInfo name="STM32WL55JC_Nucleo_2_Images_SECoreBin"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
new file mode 100644
index 00000000..a196d400
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM.bat
@@ -0,0 +1,146 @@
+::Post build for SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+
+set "nonce=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\nonce.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_Sigfox_PushButton_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_GCM.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -n %nonce% %bin% %sfu% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sign -k %oemkey% -n %nonce% %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %oemkey%  -r 112 -v %version% -n %nonce% -f %sfu% -t %sign% -o 512 %headerbin%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
new file mode 100644
index 00000000..3b0d7a01
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256.bat
@@ -0,0 +1,142 @@
+::Post build for SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "oemkey="
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_Sigfox_PushButton_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+:: no encryption
+set "command=%python%%prepareimage% sha256 %bin% %sign% > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:: no encryption so pack the binary file
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k %ecckey% -p 1 -r 44 -v %version% -f %bin% -t %sign%  -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
new file mode 100644
index 00000000..8b4ee7fe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256.bat
@@ -0,0 +1,145 @@
+::Post build for SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256
+:: arg1 is the build directory
+:: arg2 is the elf file path+name
+:: arg3 is the bin file path+name
+:: arg4 is the firmware Id (1/2/3)
+:: arg5 is the version
+:: arg6 when present forces "bigelf" generation
+@echo off
+set "projectdir=%1"
+set "execname=%~n3"
+set "elf=%2"
+set "bin=%3"
+set "fwid=%4"
+set "version=%5"
+
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::The default installation path of the Cube Programmer tool is: "C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin"
+::If you installed it in another location, please update the %programmertool% variable below accordingly.
+set "programmertool="C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI""
+set "userAppBinary=%projectdir%\\..\\MDK-ARM\\Binary\\"
+
+set "sfu=%userAppBinary%\\%execname%.sfu"
+set "sfb=%userAppBinary%\\%execname%.sfb"
+set "sign=%userAppBinary%\\%execname%.sign"
+set "headerbin=%userAppBinary%\\%execname%sfuh.bin"
+set "bigbinary=%userAppBinary%\\SBSFU_%execname%.bin"
+set "elfbackup=%userAppBinary%\\SBSFU_%execname%.elf"
+
+set "iv=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\iv.bin"
+set "ecckey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\ECCKEY%fwid%.txt"
+IF "%fwid%"=="2" (
+set "priorbin=%userAppBinary%\\SBSFU_Sigfox_PushButton_DualCore_CM0PLUS.bin"
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM4\\Exe\\SB.axf"
+goto setkeys
+)
+set "sbsfuelf=%SBSFUBootLoader%\\2_Images_SBSFU\\MDK-ARM\\STM32WL55JC_Nucleo_CM0PLUS\\Exe\\SBSFU.axf"
+:setkeys
+set "oemkey=%SBSFUBootLoader%\\2_Images_SECoreBin\\Binary\\OEM_KEY_COMPANY%fwid%_key_AES_CBC.bin"
+set "mapping=%SBSFUBootLoader%\\Linker_Common\\MDK-ARM\\mapping_fwimg.h"
+set "magic=SFU%fwid%"
+
+::comment this line to force python
+::python is used if windows executable not found
+pushd %projectdir%\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Postbuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto postbuild
+)
+:py
+::line for python
+echo Postbuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+:postbuild
+
+::Make sure we have a Binary sub-folder in UserApp folder
+if not exist "%userAppBinary%" (
+mkdir "%userAppBinary%" > %projectdir%\output_%fwid%.txt 2>&1
+IF %ERRORLEVEL% NEQ 0 goto :error
+)
+
+::PostBuild is fired if elf has been regenerated from last run, so elf is different from backup elf
+if exist %elfbackup% (
+fc %elfbackup% %elf% >NUL && (goto nothingtodo) || echo "elf has been modified, processing required"
+)
+
+set "command=%python%%prepareimage% enc -k %oemkey% -i %iv% %bin% %sfu%  > %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% sha256 %bin% %sign% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+set "command=%python%%prepareimage% pack -m %magic% -k %ecckey%  -r 28 -v %version% -i %iv% -f %sfu% -t %sign% %sfb% -o 512 >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=%python%%prepareimage% header -m %magic% -k  %ecckey% -r 28 -v %version%  -i %iv% -f %sfu% -t %sign% -o 512 %headerbin% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+::get Header address when not contiguous with firmware
+if exist %projectdir%\header_%fwid%.txt (
+  del %projectdir%\header_%fwid%.txt
+)
+set "command=%python%%prepareimage% extract -d "SLOT_ACTIVE_%fwid%_HEADER" %mapping% > %projectdir%\header_%fwid%.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set /P header=<%projectdir%\header_%fwid%.txt >> %projectdir%\output_%fwid%.txt 2>>&1
+echo header %header% >> %projectdir%\output_%fwid%.txt 2>>&1
+
+if exist %priorbin%.baseadd (goto addpriorbin)
+set extramergebin=
+goto buildmergecmd
+:addpriorbin
+set /P priorbinbaseadd=<%priorbin%.baseadd
+set extramergebin=%priorbin%@%priorbinbaseadd%;
+:buildmergecmd
+set "command=%python%%prepareimage% mergev2 -b %extramergebin%%headerbin%@%header% -f %sbsfuelf%;%elf% %bigbinary% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:bigelf
+IF  "%~6"=="" goto :finish
+echo "Generating the global elf file (SBSFU and userApp)"
+echo "Generating the global elf file (SBSFU and userApp)" >> %projectdir%\output_%fwid%.txt
+set "command=%programmertool% -ms %elf% %headerbin% %sbsfuelf% >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+set "command=copy %elf% %elfbackup%  >> %projectdir%\output_%fwid%.txt 2>&1"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto :error
+
+:finish
+::backup and clean up the intermediate file
+del %sign%
+del %sfu%
+del %headerbin%
+
+exit 0
+
+:error
+echo "%command% : failed" >> %projectdir%\\output_%fwid%.txt
+:: remove the elf to force the regeneration
+if exist %elf%(
+  del %elf%
+)
+if exist %elfbackup%(
+  del %elfbackup%
+)
+echo %command% : failed
+
+pause
+exit 1
+
+:nothingtodo
+exit 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
new file mode 100644
index 00000000..7b2822b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/SECoreBin.sct
@@ -0,0 +1,29 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+
+; *** regions needed by SE_CoreBin project ***
+LR_SE SE_CODE_REGION_ROM_START {
+  SE_CallGate_region_ROM SE_CALLGATE_REGION_ROM_START FIXED SE_CALLGATE_REGION_ROM_SIZE {
+  *(.SE_CallGate_Code)
+  }
+  SE_Startup_region_ROM SE_STARTUP_REGION_ROM_START FIXED  {
+  *(.SE_Startup_Code)
+  }
+  SE_Code_NoKey_region SE_CODE_NOKEY_REGION_ROM_START FIXED SE_CODE_NOKEY_REGION_ROM_SIZE{
+  .ANY (+RO)
+  }
+  User_Key_region_ROM USER_KEY_REGION_ROM_START FIXED USER_KEY_REGION_ROM_SIZE {
+  *(.User_embedded_Keys)
+  }
+  SE_Key_region_ROM SE_KEY_REGION_ROM_START FIXED SE_KEY_REGION_ROM_SIZE {
+  *(.SE_embedded_Keys)
+  }
+  SE_region_RAM SE_REGION_RAM_STACK_TOP SE_RAM_REGION_SIZE  {
+  .ANY (+RW +ZI)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
new file mode 100644
index 00000000..67246f7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/data_init.c
@@ -0,0 +1,84 @@
+/**
+  ******************************************************************************
+  * @file    data_init.c
+  * @author  MCD Application Team
+  * @brief   Data section (RW + ZI) initialization.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+******************************************************************************
+*/
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+
+extern uint32_t Image$$SE_region_RAM$$RW$$Base;
+extern uint32_t Load$$SE_region_RAM$$RW$$Base;
+extern uint32_t Image$$SE_region_RAM$$RW$$Length;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Base;
+extern uint32_t Image$$SE_region_RAM$$ZI$$Length;
+
+
+#define data_ram Image$$SE_region_RAM$$RW$$Base
+#define data_rom Load$$SE_region_RAM$$RW$$Base
+#define data_rom_length Image$$SE_region_RAM$$RW$$Length
+#define bss Image$$SE_region_RAM$$ZI$$Base
+#define bss_length Image$$SE_region_RAM$$ZI$$Length;
+
+
+/**
+  * @brief  Copy initialized data from ROM to RAM.
+  * @param  None.
+  * @retval None.
+  */
+void LoopCopyDataInit(void) 
+{
+  uint32_t i;
+	uint8_t* src = (uint8_t*)&data_rom;
+	uint8_t* dst = (uint8_t*)&data_ram;
+	uint32_t len = (uint32_t)&data_rom_length;
+
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = src[i];
+  }
+}
+  
+/**
+  * @brief  Clear the zero-initialized data section.
+  * @param  None.
+  * @retval None.
+  */
+void LoopFillZerobss(void) 
+{
+  uint32_t i;
+	uint8_t* dst = (uint8_t*)&bss;
+	uint32_t len = (uint32_t)&bss_length;
+	
+	/* Clear the zero-initialized data section */
+	for(i=0; i < len; i++)
+  {  
+		dst[i] = 0;
+  }
+}
+	
+/**
+  * @brief  Data section initialization.
+  * @param  None.
+  * @retval None.
+  */
+ void __arm_data_init(void) {
+	 	LoopFillZerobss();
+	  LoopCopyDataInit();
+} 
+ 
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
new file mode 100644
index 00000000..83291a72
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/MDK-ARM/prebuild.bat
@@ -0,0 +1,147 @@
+@echo off
+echo prebuild.bat : started > %1\\output.txt
+set "SBSFUBootLoader=%~d0%~p0\\..\\.."
+::comment this line to force python
+::python is used if windows executable not found
+pushd %1\..\..\..\..\..\..\Middlewares\ST\STM32_Secure_Engine\Utilities\KeysAndImages
+set basedir=%cd%
+popd
+goto exe:
+goto py:
+:exe
+::line for window executable
+echo Prebuild with windows executable
+set "prepareimage=%basedir%\\win\\prepareimage.exe"
+set "python="
+if exist %prepareimage% (
+goto prebuild
+)
+:py
+::line for python
+echo Prebuild with python script
+set "prepareimage=%basedir%\\prepareimage.py"
+set "python=python "
+echo "python: %prepareimage%" >> %1\\output.txt 2>>&1
+:prebuild
+set "crypto_h=%1\\..\\Inc\\se_crypto_config.h"
+
+::clean
+if exist %1\\crypto.txt (
+  del %1\\crypto.txt
+)
+
+if exist %1\\postbuild.bat (
+  del %1\\postbuild.bat
+)
+
+::get crypto name
+set "command=%python%%prepareimage% conf %crypto_h% > %1\\crypto.txt"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set /P crypto=<%1\\crypto.txt >> %1\\output.txt 2>>&1
+echo crypto %crypto% selected >> %1\\output.txt 2>>&1
+
+set "cortex=V6M"
+
+set "KMS_config=%1\kms_platf_objects_config.h"
+set "KMS_tmp=%1\kms_platf_objects_config.h.tmp"
+
+::Patch KMS embedded keys with Blob Keys
+set "kmsblob_ecckey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\ECCKEY.txt"
+set "command=%python%%prepareimage% inject -k %kmsblob_ecckey% -f %1\..\Inc\kms_platf_objects_config.h.pattern -p @ECDSA_BLOB_KEY@ %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "kmsblob_oemkey=%SBSFUBootLoader%\\2_Images_KMS_Blob\\Binary\\OEM_KEY_COMPANY1_key_AES_CBC.bin"
+set "command=%python%%prepareimage% inject -k %kmsblob_oemkey% -f %KMS_tmp% -p @AES_BLOB_KEY@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" (
+  set "type=GCM"
+  goto AES128
+)
+if "%crypto%"=="SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+::For KMS dummy AES keys are needed (reusing AES_CBC inputs files)
+if "%crypto%"=="SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256" (
+  set "type=CBC"
+  goto AES128
+)
+goto end
+
+:AES128
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY1_key_AES_%type%.bin"
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY2_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "oemkey=%1\\..\\Binary\\OEM_KEY_COMPANY3_key_AES_%type%.bin"
+IF NOT EXIST %oemkey% goto AES128_end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %oemkey% -f %KMS_tmp% -p @AES_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+:AES128_end
+::For KMS dummy ECC keys are needed
+::if "%crypto%"=="SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM" goto end
+goto ECDSA
+
+:ECDSA
+set "ecckey=%1\\..\\Binary\\ECCKEY1.txt"
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_1@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY2.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_2@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+set "ecckey=%1\\..\\Binary\\ECCKEY3.txt"
+IF NOT EXIST %ecckey% goto end
+set "command=copy %KMS_config% %KMS_tmp%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+set "command=%python%%prepareimage% inject -k %ecckey% -f %KMS_tmp% -p @ECDSA_SBSFU_KEY_3@ %KMS_config%"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+
+goto end
+
+
+:end
+del %KMS_tmp%
+set "command=copy %1\\%crypto%.bat %1\\postbuild.bat"
+%command%
+IF %ERRORLEVEL% NEQ 0 goto error
+exit 0
+
+:error
+echo %command% : failed >> %1\\output.txt 2>&1
+echo %command% : failed
+pause
+exit 1
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..136e97cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.cproject
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="SECoreBin" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="&quot;../prebuild.sh&quot; &quot;..&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.478661912" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1032456474" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1615809983" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1420906671" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.392901236" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2079963316" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.968022388" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.479937813" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core | ../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../2_Images_SBSFU/CM0PLUS/SBSFU/App | ../../../2_Images_SBSFU/Common | ../../../Linker_Common/EWARM ||  ||  || KMS_ENABLED | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS | MBEDTLS_CONFIG_FILE=&quot;$PROJ_DIR$\..\Inc\mbed_crypto_config.h&quot; | IT_MANAGEMENT_DISABLED ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/SECoreBin.ld} || true || NonSecure ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1010420859" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/2_Images_SECoreBin}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.763832622" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.998159771" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.224831512" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1524488626" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.485503789" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1155126712" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.989828408" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&lt;mbed_crypto_config.h&gt;"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="IT_MANAGEMENT_DISABLED"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1389919721" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value=".."/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Secure_Engine/Key"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/mbed-crypto/include"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+									<listOptionValue builtIn="false" value="../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App"/>
+									<listOptionValue builtIn="false" value="../../../Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1157206032" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2060805134" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.158399330" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.880558755" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1840802701" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1920812697" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.535457687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1229761427" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.2094071264" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/SECoreBin.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1271602848" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.512548792" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.886681419" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1632570786" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1622291156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1802672574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1821965851" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2019199458" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="2_Images_SECoreBin.null.394363235" name="2_Images_SECoreBin"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.61484161.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.231535894;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2109110267">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
new file mode 100644
index 00000000..4a09bf52
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/.project
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>2_Images_SECoreBin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeExampleProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Application/User/ca_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/ca_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/kms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/kms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/nvms_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/nvms_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/se_low_level.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Src/se_low_level.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_crc_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_crc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pka.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pka.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/ca_core.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ca_core.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_der_x962.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_der_x962.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_digest.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_digest.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_dyn_obj.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_dyn_obj.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_ecc.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_ecc.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_enc_dec.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_enc_dec.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_entry.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_entry.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_init.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_init.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_key_mgt.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_key_mgt.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_mem.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_nvm_storage.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_nvm_storage.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_platf_objects.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Core/kms_platf_objects.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Key_Management_Services/kms_sign_verify.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Key_Management_Services/Modules/kms_sign_verify.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_callgate.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_callgate.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_exception.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_exception.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_fwimg.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_fwimg.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_startup.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_startup.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_user_application.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_user_application.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_utils.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/ST/STM32_Secure_Engine/Core/se_utils.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/mbed-crypto/sha256.c</name>
+			<type>1</type>
+			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/mbed-crypto/library/sha256.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
new file mode 100644
index 00000000..dcc46a55
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/Startup/data_init.c
@@ -0,0 +1,36 @@
+
+#include "stdint-gcc.h"
+
+#ifndef vu32
+#	define vu32 volatile uint32_t
+#endif
+
+void LoopCopyDataInit(void) {
+	extern char _sidata asm("_sidata");
+	extern char _sdata asm("_sdata");
+	extern char _edata asm("_edata");
+	
+	vu32* src = (vu32*) &_sidata;
+	vu32* dst = (vu32*) &_sdata;
+	
+	vu32 len = (&_edata - &_sdata) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = src[i];
+}
+
+void LoopFillZerobss(void) {
+	extern char _sbss asm("_sbss");
+	extern char _ebss asm("_ebss");
+	
+	vu32* dst = (vu32*) &_sbss;
+	vu32 len = (&_ebss - &_sbss) / 4;
+	
+	for(vu32 i=0; i < len; i++)
+		dst[i] = 0;
+}
+
+void __gcc_data_init(void) {
+	LoopFillZerobss();
+	LoopCopyDataInit();
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
new file mode 100644
index 00000000..4ec95844
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/syscalls.c
@@ -0,0 +1,159 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+//#undef errno
+extern int errno;
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+register char * stack_ptr asm("sp");
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/Application/User/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
new file mode 100644
index 00000000..6539f13b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/STM32CubeIDE/SECoreBin.ld
@@ -0,0 +1,153 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(SE_CallGate)
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0;         /* specific stack provided inside secured area */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Define output sections */
+SECTIONS
+{
+  .SE_CallGate_Code :
+  {
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    BYTE(0);           /* dummy byte to keep the callgate at INTVECT_start + Vector_size + 4 */
+    KEEP(*(.SE_CallGate_Code))
+  } > SE_CallGate_ROM_region
+
+  .SE_Startup_Code : { KEEP ( *se_startup.o (.text .text*)) } > SE_Startup_ROM_region
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >SE_Code_NoKey_ROM_region
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM.extab   : 
+  { 
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+  
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >SE_Code_NoKey_ROM_region
+
+  .USER_embedded_Keys : { KEEP(*(.USER_embedded_Keys)) } > User_Key_region_ROM
+  .SE_embedded_Keys : { KEEP(*(.SE_embedded_Keys)) } > SE_Key_region_ROM
+  
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >SE_RAM_region AT>SE_Code_NoKey_ROM_region 
+
+  
+  /* Uninitialized data section */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >SE_RAM_region
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >SE_RAM_region
+   
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
new file mode 100644
index 00000000..30759a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/ca_low_level.c
@@ -0,0 +1,255 @@
+/**
+  ******************************************************************************
+  * @file    ca_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains the low level implementations of the Cryptographic API (CA) module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef CA_LOW_LEVEL_C
+#define CA_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "CryptoApi/ca.h"
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#include "mbedtls/entropy_poll.h"
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Private defines -----------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+#define COMPILER_BARRIER() __DMB();__DSB();
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private typedef -----------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static RNG_HandleTypeDef handle;
+static uint8_t users = 0;
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+/* Private function prototypes -----------------------------------------------*/
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta);
+static void RNG_Init(void);
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length);
+static void RNG_DeInit(void);
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+/* Exported functions implementation -----------------------------------------*/
+
+#if defined(CA_HAL_CRYPTOLIB_SUPP)
+
+#if ((CA_ROUTE_AES_CBC & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+ || ((CA_ROUTE_AES_CMAC & CA_ROUTE_MASK) == CA_ROUTE_HAL) \
+ || ((CA_ROUTE_AES_ECB & CA_ROUTE_MASK) == CA_ROUTE_HAL)  \
+     || ((CA_ROUTE_AES_GCM & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+
+/**
+  * @brief CRYP MSP Initialization
+  * This function configures the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Release AES/CRYP from reset state */
+    __HAL_RCC_AES_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_AES_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief CRYP MSP De-Initialization
+  * This function freeze the hardware resources
+  * @param hcryp: CRYP handle pointer
+  * @retval None
+  */
+void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp)
+{
+  if (hcryp->Instance == CA_AES_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_AES_CLK_DISABLE();
+    /* Force AES/CRYP into reset state */
+    __HAL_RCC_AES_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_AES_CBC || CA_ROUTE_AES_CCM || CA_ROUTE_AES_CMAC \
+       || CA_ROUTE_AES_ECB || CA_ROUTE_AES_GCM => CA_ROUTE_HAL */
+
+
+#if ((CA_ROUTE_ECC_ECDSA & CA_ROUTE_MASK) == CA_ROUTE_HAL) || ((CA_ROUTE_RSA & CA_ROUTE_MASK) == CA_ROUTE_HAL)
+/**
+  * @brief      PKA MSP Initialization
+  *             This function configures the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Release PKA from reset state */
+    __HAL_RCC_PKA_RELEASE_RESET();
+    /* Peripheral clock enable */
+    __HAL_RCC_PKA_CLK_ENABLE();
+  }
+}
+
+/**
+  * @brief      PKA MSP De-Initialization
+  *             This function freeze the hardware resources used in this example
+  * @param[in] hpka: PKA handle pointer
+  * @retval None
+  */
+void HAL_PKA_MspDeInit(PKA_HandleTypeDef *hpka)
+{
+  if (hpka->Instance == CA_PKA_INSTANCE)
+  {
+    /* Peripheral clock disable */
+    __HAL_RCC_PKA_CLK_DISABLE();
+    /* Force PKA into reset state */
+    __HAL_RCC_PKA_FORCE_RESET();
+  }
+}
+#endif /* CA_ROUTE_ECC_ECDSA || CA_ROUTE_RSA => CA_ROUTE_HAL */
+
+#endif /* CA_HAL_CRYPTOLIB_SUPP */
+
+#if defined(CA_MBED_CRYPTOLIB_SUPP)
+#if defined(CA_USES_PSA_CRYPTO) && defined(HAL_RNG_MODULE_ENABLED)
+static uint8_t atomic_incr_u8(__IO uint8_t *valuePtr, uint8_t delta)
+{
+  COMPILER_BARRIER();
+  uint8_t newValue;
+  do
+  {
+    newValue = __LDREXB(valuePtr) + delta;
+  } while (__STREXB(newValue, valuePtr));
+  COMPILER_BARRIER();
+  return newValue;
+}
+
+static void RNG_Init(void)
+{
+  uint32_t dummy;
+
+  /*  We're only supporting a single user of RNG */
+  if (atomic_incr_u8(&users, 1) > 1)
+  {
+    while (1);
+  }
+
+  /* Select MSI as RNG clock source */
+  __HAL_RCC_RNG_CONFIG(RCC_RNGCLKSOURCE_MSI);
+
+  /* RNG Peripheral clock enable */
+  __HAL_RCC_RNG_CLK_ENABLE();
+
+  /* Initialize RNG instance */
+  handle.Instance = RNG;
+  handle.State = HAL_RNG_STATE_RESET;
+  handle.Lock = HAL_UNLOCKED;
+
+  HAL_RNG_Init(&handle);
+
+  /* first random number generated after setting the RNGEN bit should not be used */
+  HAL_RNG_GenerateRandomNumber(&handle, &dummy);
+}
+
+static void RNG_GetBytes(uint8_t *output, size_t length, size_t *output_length)
+{
+  int32_t ret = 0;
+  __IO uint8_t random[4];
+  *output_length = 0;
+
+  /* Get Random byte */
+  while ((*output_length < length) && (ret == 0))
+  {
+    if (HAL_RNG_GenerateRandomNumber(&handle, (uint32_t *)random) != HAL_OK)
+    {
+      ret = -1;
+    }
+    else
+    {
+      for (uint8_t i = 0; (i < 4) && (*output_length < length) ; i++)
+      {
+        *output++ = random[i];
+        *output_length += 1;
+        random[i] = 0;
+      }
+    }
+  }
+  /* Just be extra sure that we didn't do it wrong */
+  if ((__HAL_RNG_GET_FLAG(&handle, (RNG_FLAG_CECS | RNG_FLAG_SECS))) != 0)
+  {
+    *output_length = 0;
+  }
+}
+
+static void RNG_DeInit(void)
+{
+  /*Disable the RNG peripheral */
+  HAL_RNG_DeInit(&handle);
+  /* RNG Peripheral clock disable - assume we're the only users of RNG  */
+  __HAL_RCC_RNG_CLK_DISABLE();
+
+  users = 0;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+  RNG_Init();
+  RNG_GetBytes(output, len, olen);
+  RNG_DeInit();
+  if (*olen != len)
+  {
+    return -1;
+  }
+  return 0;
+}
+#endif /* CA_USES_PSA_CRYPTO && HAL_RNG_MODULE_ENABLED */
+#endif /* CA_MBED_CRYPTOLIB_SUPP */
+
+#if defined(CA_ST_CRYPTOLIB_SUPP)
+/**
+  * @brief      CRC initialization
+  *             This function release reset and clock CRC IP peripheral
+  * @retval None
+  */
+void CA_LL_CRC_Init(void)
+{
+  /* Force CRC into reset state */
+  __HAL_RCC_CRC_FORCE_RESET();
+  /* Release CRC from reset state */
+  __HAL_RCC_CRC_RELEASE_RESET();
+  /* Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+}
+
+#endif /* CA_ST_CRYPTOLIB_SUPP */
+
+#endif /* CA_LOW_LEVEL_C */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
new file mode 100644
index 00000000..3db7b5e3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/kms_low_level.c
@@ -0,0 +1,188 @@
+/**
+  ******************************************************************************
+  * @file    kms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains implementations for Key Management Services (KMS)
+  *          module Low Level access to Flash, CRC...
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include "kms.h"
+#include "kms_low_level.h"
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_LL Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+typedef enum
+{
+  KMS_MEM_NONE    = 0,
+  KMS_MEM_ALLOC,
+  KMS_MEM_FREE
+} kms_ll_mem_optype;
+typedef struct
+{
+  kms_ll_mem_optype   optype;
+  uint32_t            size;
+  void               *ptr;
+} kms_ll_mem_operation_t;
+#endif /* KMS_MEM_LOGGING */
+/* Private define ------------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+#define KMS_LL_MEM_LOGGING_MAX    (100UL)
+#endif /* KMS_MEM_LOGGING */
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+#if defined(KMS_MEM_LOGGING)
+kms_ll_mem_operation_t kms_ll_mem_logging[KMS_LL_MEM_LOGGING_MAX];
+uint32_t kms_ll_mem_logging_idx;
+#endif /* KMS_MEM_LOGGING */
+/* Private function prototypes -----------------------------------------------*/
+/* Private function ----------------------------------------------------------*/
+/* Exported functions --------------------------------------------------------*/
+
+/**
+  * @brief  Read data from flash and store into buffer
+  * @note   Used to access encrypted blob in flash.
+  * @param  pDestination buffer to store red data
+  * @param  pSource flash aread to read from
+  * @param  Length amount of data to read from flash
+  * @retval Operation status
+  */
+CK_RV KMS_LL_FLASH_Read(void *pDestination, const void *pSource, uint32_t Length)
+{
+  SE_ErrorStatus seStatus;
+  seStatus = SE_LL_FLASH_Read(pDestination, pSource, Length);
+  return (seStatus == SE_SUCCESS) ? CKR_OK : CKR_GENERAL_ERROR;
+}
+
+#ifdef KMS_SE_CHECK_PARAMS
+
+/* Remove compilation optimization */
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O0")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  Check if given buffer in inside secure enclave (RAM or Flash, NVM_Storgae)
+  *              If it is in Enclave area, then generate a RESET.
+  * @param  pBuffer Buffer address
+  * @param  ulSize  Buffer size
+  * @retval void
+  */
+void KMS_LL_IsBufferInSecureEnclave(void *pBuffer, uint32_t ulSize)
+{
+  /* If pBuffer is NULL, simply return FALSE */
+  if ((pBuffer == NULL) || (ulSize == 0UL))
+  {
+    return;
+  }
+  /* Check if address range is within secure enclave                           */
+  /* Called APIs will generate exception in case buffer is in forbidden area   */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  /* Double Check to avoid basic fault injection */
+  (void)SE_LL_Buffer_part_of_SE_ram(pBuffer, ulSize);
+  /*     Checking RAM Need to add test to protect on NVM_STORAGE */
+  (void)SE_LL_Buffer_part_of_SE_rom(pBuffer, ulSize);
+
+  return;
+}
+#endif /* KMS_SE_CHECK_PARAMS */
+
+/**
+  * @brief  An error occurred
+  * @note   Used to debug or reset in case of important issue
+  * @param  error Error reported by KMS
+  */
+void KMS_LL_ReportError(uint32_t error)
+{
+  (void)error;
+  while (1 == 1) {;}
+}
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory initialization occurred
+  */
+void KMS_LL_ReportMemInit(void)
+{
+  for (uint32_t i = 0; i < KMS_LL_MEM_LOGGING_MAX; i++)
+  {
+    kms_ll_mem_logging[i].optype = KMS_MEM_NONE;
+    kms_ll_mem_logging[i].size = 0;
+    kms_ll_mem_logging[i].ptr = NULL_PTR;
+  }
+  kms_ll_mem_logging_idx = 0;
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory allocation occurred
+  * @param  size    Size allocated
+  * @param  pmem    Allocated pointer
+  */
+void KMS_LL_ReportMemAlloc(uint32_t size, void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_ALLOC;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = size;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+#if defined(KMS_MEM_LOGGING)
+/**
+  * @brief  A memory free occurred
+  * @param  pmem    Freed pointer
+  */
+void KMS_LL_ReportMemFree(void *pmem)
+{
+  if (kms_ll_mem_logging_idx < KMS_LL_MEM_LOGGING_MAX)
+  {
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].optype = KMS_MEM_FREE;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].size = 0;
+    kms_ll_mem_logging[kms_ll_mem_logging_idx].ptr = pmem;
+    kms_ll_mem_logging_idx++;
+  }
+}
+#endif /* KMS_MEM_LOGGING */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
new file mode 100644
index 00000000..f9ca9236
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/nvms_low_level.c
@@ -0,0 +1,236 @@
+/**
+  ******************************************************************************
+  * @file    nvms_low_level.c
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for Key Management Services (KMS)
+  *          module NVM Low Level access to physical storage (Flash...)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "stm32wlxx_hal.h"
+#include "stm32wlxx_hal_flash.h"
+#include "nvms_low_level.h"
+
+/** @addtogroup Key_Management_Services Key Management Services (KMS)
+  * @{
+  */
+
+/** @addtogroup KMS_NVMLL NVM Low Level access
+  * @{
+  */
+
+/* Private types -------------------------------------------------------------*/
+/* Private define ------------------------------------------------------------*/
+/* Private macro -------------------------------------------------------------*/
+/* Private variables ---------------------------------------------------------*/
+/* Private function prototypes -----------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep);
+static uint32_t get_page(uint32_t Addr);
+/* Private function ----------------------------------------------------------*/
+static bool page_write(const uint8_t **sourcep,
+                       uint8_t **destinationp,
+                       size_t *sizep)
+{
+  uint8_t *p;
+  uint32_t maxsize;
+  HAL_StatusTypeDef ret = HAL_OK;
+
+  /* Calculating the maximum writable chunk size.*/
+  maxsize = (size_t)(NVMS_LL_PAGE_SIZE -
+                     ((uint32_t) * destinationp & (NVMS_LL_PAGE_SIZE - 1UL)));
+  if (maxsize > *sizep)
+  {
+    maxsize = *sizep;
+  }
+
+  p = *destinationp;
+
+  /* Updating size and pointers.*/
+  *sizep        -= maxsize;
+  *destinationp += maxsize;
+
+  /* Programming, 64 bits granularity  */
+  (void)HAL_FLASH_Unlock();
+  while ((maxsize >= 8UL) && (ret == HAL_OK))
+  {
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+    p = &p[8];
+    *sourcep = &((*sourcep)[8]);
+    maxsize -= 8UL;
+  }
+
+  if (maxsize != 0UL)
+  {
+    uint8_t block[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+    /* Problem, there are remaining bytes to write, but not a full 64bit word --> we can't handle it */
+    /* Let's write a full 64bit word */
+    (void)memcpy(block, *sourcep, maxsize);
+    ret = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (uint32_t)p, (uint64_t) * ((uint64_t *)(uint32_t) * sourcep));
+  }
+  (void)HAL_FLASH_Lock();
+
+  if (ret == HAL_OK)
+  {
+    return false;
+  }
+  return true;
+}
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t get_page(uint32_t Addr)
+{
+  uint32_t page;
+
+  page = (Addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+
+  return page;
+}
+
+/* Exported functions --------------------------------------------------------*/
+
+/** @addtogroup KMS_NVMLL_Exported_Functions Exported Functions
+  * @{
+  */
+
+/**
+  * @brief   Flash low level driver initialization.
+  */
+void NVMS_LL_Init(void)
+{
+
+}
+
+/**
+  * @brief   Determines if a flash block is in erased state.
+  *
+  * @param   block         the block identifier
+  * @return                  The block state.
+  * @retval false            if the block is not in erased state.
+  * @retval true             if the block is in erased state.
+  */
+bool NVMS_LL_IsBlockErased(nvms_block_t block)
+{
+  uint32_t i;
+  uint32_t *p = (uint32_t *)((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS :
+                             NVMS_LL_BLOCK1_ADDRESS);
+
+  for (i = 0; i < (NVMS_LL_BLOCK_SIZE / sizeof(uint32_t)); i++)
+  {
+    if (*p != NVMS_LL_ERASED)
+    {
+      return false;
+    }
+    p++;
+  }
+  return true;
+}
+
+
+
+/**
+  * @brief   Erases a block.
+  * @note    The erase operation is verified internally.
+  *
+  * @param   block         the block identifier
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the erase operation failed.
+  */
+bool NVMS_LL_BlockErase(nvms_block_t block)
+{
+  /* Erase First Flash sector */
+  FLASH_EraseInitTypeDef EraseInitStruct;
+  uint32_t SectorError = 0;
+
+  EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+  EraseInitStruct.Page        = get_page((block == NVMS_BLOCK0) ? NVMS_LL_BLOCK0_ADDRESS : NVMS_LL_BLOCK1_ADDRESS);
+  EraseInitStruct.NbPages     = NVMS_LL_NB_PAGE_PER_BLOCK;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  (void)HAL_FLASH_Unlock();
+
+  if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK)
+  {
+    /* Error occurred while sector erase.
+      User can add here some code to deal with this error.
+      SectorError will contain the faulty sector and then to know the code error on this sector,
+      user can call function 'HAL_FLASH_GetError()'
+      FLASH_ErrorTypeDef errorcode = HAL_FLASH_GetError(); */
+  }
+
+  /* Lock the Flash to disable the flash control register access (recommended
+  to protect the FLASH memory against possible unwanted operation) *********/
+  (void)HAL_FLASH_Lock();
+
+  /* Operation verification.*/
+  return !NVMS_LL_IsBlockErased(block);
+}
+
+/**
+  * @brief   Writes data.
+  * @note    The write operation is verified internally.
+  * @note    If the write operation partially writes flash pages then the
+  *          unwritten bytes are left to the filler value.
+  *
+  * @param   source        pointer to the data to be written
+  * @param   destination   pointer to the flash position
+  * @param   size          size of data
+  * @return                  The operation status.
+  * @retval false            if the operation is successful.
+  * @retval true             if the write operation failed.
+  */
+bool NVMS_LL_Write(const uint8_t *source, uint8_t *destination, size_t size)
+{
+  const uint8_t *s = source;
+  uint8_t *d = destination;
+  size_t sz = size;
+
+  while (sz > 0UL)
+  {
+    /* Writes as much as a single operation allows.*/
+    if (page_write(&s, &d, &sz))
+    {
+      return true;
+    }
+  }
+
+  /* Operation verification.*/
+  return (bool)(memcmp(source, destination, size) != 0);
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c
new file mode 100644
index 00000000..576319a2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/Src/se_low_level.c
@@ -0,0 +1,757 @@
+/**
+  ******************************************************************************
+  * @file    se_low_level.c
+  * @author  MCD Application Team
+  * @brief   Secure Engine Interface module.
+  *          This file provides set of firmware functions to manage SE low level
+  *          interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+#define SE_LOW_LEVEL_C
+
+/* Includes ------------------------------------------------------------------*/
+#include "se_low_level.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#endif /* __CC_ARM */
+#include "se_exception.h"
+#include "string.h"
+
+#ifdef KMS_ENABLED
+#include "kms.h"
+#include "kms_objects.h"
+#include "kms_platf_objects_config.h"
+#endif /* KMS_ENABLED */
+
+/** @addtogroup SE Secure Engine
+  * @{
+  */
+/** @defgroup  SE_HARDWARE SE Hardware Interface
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Private_Variables Private Variables
+  * @{
+  */
+static CRC_HandleTypeDef    CrcHandle;                  /*!< SE Crc Handle*/
+
+static __IO uint32_t SE_DoubleECC_Error_Counter = 0U;
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Private_Functions Private Functions
+  * @{
+  */
+
+static uint32_t SE_LL_GetPage(uint32_t Address);
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Variables Exported Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_Functions Exported Functions
+  * @{
+  */
+
+/** @defgroup SE_HARDWARE_Exported_CRC_Functions CRC Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  Set CRC configuration and call HAL CRC initialization function.
+  * @param  None.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_CRC_Config(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  CrcHandle.Instance = CRC;
+  /* The input data are not inverted */
+  CrcHandle.Init.InputDataInversionMode = CRC_INPUTDATA_INVERSION_NONE;
+
+  /* The output data are not inverted */
+  CrcHandle.Init.OutputDataInversionMode = CRC_OUTPUTDATA_INVERSION_DISABLE;
+
+  /* The Default polynomial is used */
+  CrcHandle.Init.DefaultPolynomialUse = DEFAULT_POLYNOMIAL_ENABLE;
+  /* The default init value is used */
+  CrcHandle.Init.DefaultInitValueUse = DEFAULT_INIT_VALUE_ENABLE;
+  /* The input data are 32-bit long words */
+  CrcHandle.InputDataFormat = CRC_INPUTDATA_FORMAT_WORDS;
+  /* CRC Init*/
+  if (HAL_CRC_Init(&CrcHandle) == HAL_OK)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_Init(void)
+{
+  /* CRC Peripheral clock enable */
+  __HAL_RCC_CRC_CLK_ENABLE();
+
+  return SE_LL_CRC_Config();
+}
+
+/**
+  * @brief  Wrapper to HAL CRC de-initialization function.
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_CRC_DeInit(void)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (HAL_CRC_DeInit(&CrcHandle) == HAL_OK)
+  {
+    /* Initialization OK */
+    e_ret_status = SE_SUCCESS;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Wrapper to HAL CRC Calculate function.
+  * @param  pBuffer: pointer to data buffer.
+  * @param  uBufferLength: buffer length in 32-bits word.
+  * @retval uint32_t CRC (returned value LSBs for CRC shorter than 32 bits)
+  */
+uint32_t SE_LL_CRC_Calculate(uint32_t pBuffer[], uint32_t uBufferLength)
+{
+  return HAL_CRC_Calculate(&CrcHandle, pBuffer, uBufferLength);
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_Functions FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief  This function does an erase of nb pages in user flash area
+  * @param  pStart: pointer to  user flash area
+  * @param  Length: number of bytes.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Erase(uint8_t *pStart, uint32_t Length)
+{
+  uint32_t page_error = 0U;
+  uint32_t start = (uint32_t)pStart;
+  FLASH_EraseInitTypeDef p_erase_init;
+  SE_ErrorStatus e_ret_status = SE_SUCCESS;
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    /* Fill EraseInit structure*/
+    p_erase_init.TypeErase     = FLASH_TYPEERASE_PAGES;
+    p_erase_init.Page          = SE_LL_GetPage(start);
+    p_erase_init.NbPages       = SE_LL_GetPage(start + Length - 1U) - p_erase_init.Page + 1U;
+    if (HAL_FLASHEx_Erase(&p_erase_init, &page_error) != HAL_OK)
+    {
+      e_ret_status = SE_ERROR;
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) *********/
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+
+  return e_ret_status;
+}
+
+/**
+  * @brief  Write in Flash  protected area
+  * @param  pDestination pointer to destination area in Flash
+  * @param  pSource pointer to input buffer
+  * @param  Length number of bytes to be written
+  * @retval SE_SUCCESS if successful, otherwise SE_ERROR
+  */
+
+SE_ErrorStatus SE_LL_FLASH_Write(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  SE_ErrorStatus ret = SE_SUCCESS;
+  uint32_t i;
+  uint32_t verified = 0U;
+  uint32_t destination = (uint32_t)pDestination;
+  uint32_t source = (uint32_t)pSource;
+
+  if (Length == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Area should be inside 1 of the firmware image headers */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((destination >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((destination + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  /* Unlock the Flash to enable the flash control register access *************/
+  if (HAL_FLASH_Unlock() == HAL_OK)
+  {
+    for (i = 0U; i < Length; i += 8U)
+    {
+      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, (destination + i), *(uint64_t *)(source + i)) != HAL_OK)
+      {
+        ret = SE_ERROR;
+        break;
+      }
+    }
+
+    /* Lock the Flash to disable the flash control register access (recommended
+    to protect the FLASH memory against possible unwanted operation) */
+    (void)HAL_FLASH_Lock();
+  }
+  else
+  {
+    ret = SE_ERROR;
+  }
+  return ret;
+}
+
+/**
+  * @brief  Read in Flash protected area
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to read
+  * @param  Length: Length in bytes of data buffer
+  * @retval SFU_ErrorStatus SFU_SUCCESS if successful, SFU_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_Read(uint8_t *pDestination, const uint8_t *pSource, uint32_t Length)
+{
+  uint32_t source = (uint32_t)pSource;
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+  uint32_t i;
+  uint32_t verified = 0U;
+
+  /* Area should be inside 1 of the firmware image headers
+     or inside 1 of the download areas */
+  for (i = 0U; i < SFU_NB_MAX_ACTIVE_IMAGE; i++)
+  {
+    if ((source >= SlotHeaderAdd[SLOT_ACTIVE_1 + i]) &&
+        ((source + Length) <= (SlotHeaderAdd[SLOT_ACTIVE_1 + i] + SFU_IMG_IMAGE_OFFSET)))
+    {
+      verified = 1U;
+    }
+  }
+
+  for (i = 0U; i < SFU_NB_MAX_DWL_AREA; i++)
+  {
+    if ((source >= SlotStartAdd[SLOT_DWL_1 + i]) &&
+        ((source + Length) <= (SlotStartAdd[SLOT_DWL_1 + i] + SLOT_SIZE(SLOT_DWL_1))))
+    {
+      verified = 1U;
+    }
+  }
+
+  if (verified == 0U)
+  {
+    return SE_ERROR;
+  }
+
+  SE_DoubleECC_Error_Counter = 0U;
+  /* Do not use memcpy from lib : ECC error should be checked at each loop */
+  for (i = 0; (i < Length) && (SE_DoubleECC_Error_Counter == 0U); i++, pDestination++, pSource++)
+  {
+    *pDestination = *pSource;
+  }
+  if (SE_DoubleECC_Error_Counter == 0U)
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  SE_DoubleECC_Error_Counter = 0U;
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @defgroup SE_HARDWARE_Exported_FLASH_EXT_Functions External FLASH Exported Functions
+  * @{
+  */
+
+/**
+  * @brief Initialization of external flash On The Fly DECryption (OTFDEC)
+  * @param pxSE_Metadata: Firmware metadata.
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_FLASH_EXT_Decrypt_Init(SE_FwRawHeaderTypeDef *pxSE_Metadata)
+{
+  /* Prevent unused argument(s) compilation warning */
+  UNUSED(pxSE_Metadata);
+  return SE_SUCCESS;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @brief Check if an array is inside the RAM of the product
+  * @param Addr : address  of array
+  * @param Length : length of array in byte
+  */
+SE_ErrorStatus SE_LL_Buffer_in_ram(void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_ROM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is in sbsfu ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_in_SBSFU_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if ((Length != 0U) && (!((0xFFFFFFFFUL - addr_start) < Length))
+      && ((addr_end  <= SB_REGION_RAM_END) && (addr_start >= SB_REGION_RAM_START)))
+  {
+    e_ret_status = SE_SUCCESS;
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se ram.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se ram, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_ram(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_REGION_RAM_START) && (addr_end < SE_REGION_RAM_START)) ||
+                            ((addr_start > SE_REGION_RAM_END) && (addr_end > SE_REGION_RAM_END)))))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Buffer_part_of_SE_rom(const void *pBuff, uint32_t Length)
+{
+  SE_ErrorStatus e_ret_status;
+  uint32_t addr_start = (uint32_t)pBuff;
+  uint32_t addr_end = addr_start + Length - 1U;
+
+  /* Check if length is positive with no overflow */
+  if (((Length != 0U) && (!(((addr_start < SE_CODE_REGION_ROM_START) && (addr_end < SE_CODE_REGION_ROM_START))
+                            || ((addr_start > SE_CODE_REGION_ROM_END) && (addr_end > SE_CODE_REGION_ROM_END))
+                           )))
+      || ((0xFFFFFFFFUL - addr_start) < Length))
+  {
+    e_ret_status = SE_SUCCESS;
+
+    /* Could be an attack ==> Reset */
+    NVIC_SystemReset();
+  }
+  else
+  {
+    e_ret_status = SE_ERROR;
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_BUFFER_CHECK_Exported_IRQ_Functions
+  * @{
+  */
+
+/**
+  * @brief function to disable all IRQ, previously enabled ones are stored in parameter
+  * @param pIrqState: IRQ state buffer
+  * @param IrqStateNb: Number of IRQ state that can be stored
+  * @retval SE_ErrorStatus SE_SUCCESS when complete successfully, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Save_Disable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    pIrqState[0] = NVIC->ICER[0];     /* Save currently enabled IRQ */
+    NVIC->ICER[0] = pIrqState[0];     /* Disable All IRQ */
+    if (NVIC->ICER[0] == 0UL)         /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @brief function checking if a buffer is PARTLY in se rom.
+  * @param pBuff: address of buffer
+  * @param Length: length of buffer in bytes
+  * @retval SE_ErrorStatus SE_SUCCESS for buffer in NOT se rom, SE_ERROR otherwise.
+  */
+SE_ErrorStatus SE_LL_Restore_Enable_Irq(uint32_t *pIrqState, uint32_t IrqStateNb)
+{
+  SE_ErrorStatus e_ret_status = SE_ERROR;
+
+  if (IrqStateNb == 1UL)  /* Only 1 ICER register state to save */
+  {
+    NVIC->ISER[0] = pIrqState[0];         /* Disable All enabled IRQ */
+    if (NVIC->ICER[0] == pIrqState[0])    /* Verify effectiveness of the operation */
+    {
+      e_ret_status = SE_SUCCESS;
+    }
+  }
+  return e_ret_status;
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup SE_LOCK_KEYS_Exported_Functions
+  * @{
+  */
+
+/**
+  * @brief  Lock the embedded keys used by SBSFU
+  * @param  None
+  * @retval SE_ErrorStatus SE_SUCCESS if successful, SE_ERROR otherwise
+  */
+SE_ErrorStatus SE_LL_Lock_Keys(void)
+{
+#ifdef KMS_ENABLED
+  uint32_t i_key_locked = 0U;
+  uint32_t i_ctrl = 0U;
+
+#ifdef KMS_INDEX_BLOBIMPORT_VERIFY
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_VERIFY) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_VERIFY */
+#ifdef KMS_INDEX_BLOBIMPORT_DECRYPT
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_INDEX_BLOBIMPORT_DECRYPT) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_INDEX_BLOBIMPORT_DECRYPT */
+#ifdef KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_AES128_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_1_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_2_ECDSA_OBJECT_HANDLE */
+#ifdef KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE
+  i_ctrl++;
+  if (KMS_LockKeyHandle(KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE) == CKR_OK)
+  {
+    i_key_locked++;
+  }
+#endif /* KMS_SBSFU_KEY_3_ECDSA_OBJECT_HANDLE */
+  if(i_ctrl == i_key_locked)
+  {
+    return SE_SUCCESS;
+  }
+  else
+  {
+    return SE_ERROR;
+  }
+#else /* KMS_ENABLED */
+  return SE_SUCCESS;
+#endif /* KMS_ENABLED */
+}
+/**
+  * @}
+  */
+
+/** @addtogroup SE_HARDWARE_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Gets the page of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The page of a given address
+  */
+static uint32_t SE_LL_GetPage(uint32_t Address)
+{
+  uint32_t page;
+
+  if (Address < (FLASH_BASE + (FLASH_BANK_SIZE)))
+  {
+    /* Bank 1 */
+    page = (Address - FLASH_BASE) / FLASH_PAGE_SIZE;
+  }
+  else
+  {
+    /* Bank 2 */
+    page = (Address - (FLASH_BASE + (FLASH_BANK_SIZE))) / FLASH_PAGE_SIZE;
+  }
+  return page;
+}
+
+/**
+  * @brief  Gets the bank of a given address
+  * @param  Addr: Address of the FLASH Memory
+  * @retval The bank of a given address
+  */
+
+
+/**
+  * @brief  Get Link Register value (LR)
+  * @param  None.
+  * @retval LR Register value
+  */
+__attribute__((always_inline)) __STATIC_INLINE uint32_t __get_LR(void)
+{
+  register uint32_t result;
+
+#if defined ( __ICCARM__ ) || ( __GNUC__ )
+  __ASM volatile("MOV %0, LR" : "=r"(result));
+#elif defined ( __CC_ARM )
+  __ASM volatile("MOV result, __return_address()");
+#endif /* ( __ICCARM__ ) || ( __GNUC__ ) */
+
+  return result;
+}
+
+/*
+   As this handler code relies on stack pointer position to manipulate the PC return value, it is important
+   not to use extra registers (on top of scratch registers), because it would change the stack pointer
+   position. Then compiler optimizations are customized to ensure that.
+*/
+#if defined(__ICCARM__)
+#pragma optimize=none
+#elif defined(__CC_ARM)
+#pragma O0
+#elif defined(__ARMCC_VERSION)
+__attribute__((optnone))
+#elif defined(__GNUC__)
+__attribute__((optimize("O1")))
+#endif /* __ICCARM__ */
+
+/**
+  * @brief  NMI Handler present for handling Double ECC NMI interrupt
+  * @param  None.
+  * @retval None.
+  */
+void NMI_Handler(void)
+{
+  uint32_t *p_sp;
+  uint32_t lr;
+  uint16_t opcode_msb;
+
+  if (__HAL_FLASH_GET_FLAG(FLASH_FLAG_ECCD))
+  {
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ECCD);
+
+    /* Memorize error to ignore the read value */
+    SE_DoubleECC_Error_Counter++;
+
+    lr = __get_LR();
+
+    /* Check EXC_RETURN value in LR to know which SP was used prior entering exception */
+    if (((lr) & (0xFU)) == 0xDU)
+    {
+      /* interrupted code was using Process Stack Pointer */
+      p_sp = (uint32_t *)__get_PSP();
+    }
+    else
+    {
+      /* interrupted code was using Main Stack Pointer */
+      p_sp = (uint32_t *)__get_MSP();
+    }
+
+    /* Test caller mode T bit from CPSR in stack */
+    if ((*(p_sp + 7U) & (1U << xPSR_T_Pos)) != 0U)
+    {
+      /* Thumb  mode.
+         Test PC in stack.
+         If bits [15:11] of the halfword being decoded take any of the following values,
+         the halfword is the first halfword of a 32-bit instruction: 0b11101, 0b11110, 0b11111.
+         Otherwise, the halfword is a 16-bit instruction.
+      */
+      opcode_msb = (*(uint16_t *)(*(p_sp + 6) & 0xFFFFFFFEU) & 0xF800U);
+      if ((opcode_msb == 0xE800U) || (opcode_msb == 0xF000U) || (opcode_msb == 0xF800U))
+      {
+        /* execute next instruction PC +4  */
+        *(p_sp + 6U) += 4U;
+      }
+      else
+      {
+        /* execute next instruction PC +2  */
+        *(p_sp + 6U) += 2U;
+      }
+    }
+    else
+    {
+      /* ARM mode execute next instruction PC +4 */
+      *(p_sp + 6U) += 4U;
+    }
+  }
+  else
+  {
+    /* This exception occurs for another reason than flash double ECC errors */
+    SE_NMI_ExceptionHandler();
+  }
+}
+
+/**
+  * @brief  Hard Fault Handler present for handling Double ECC Bus Fault interrupt
+  * @param  None.
+  * @retvat void
+  */
+void HardFault_Handler(void)
+{
+  SE_NMI_ExceptionHandler();
+}
+
+/**
+  * @brief  Cleanup SE CORE
+  * The function is called  during SE_LOCK_RESTRICT_SERVICES.
+  *
+  */
+void  SE_LL_CORE_Cleanup(void)
+{
+}
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt
new file mode 100644
index 00000000..f996f365
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/2_Images_SECoreBin/readme.txt
@@ -0,0 +1,113 @@
+/**
+  @page 2_Images_SECoreBin / Secure Engine Core binary generation.
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2017 STMicroelectronics *******************
+  * @file    readme.txt
+  * @brief   Secure Engine Core binary generation.
+  *          SE Core binary exports SE CallGate function entry point for
+  *          SFU Application.
+  ******************************************************************************
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                               www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Application Description
+
+This application is used to generate Secure Engine Core binary file to be linked
+with Secure Boot & Secure Firmware Update application (SBSFU).
+SE Core binary exports a single entry point to SE CallGate function and a startup method for data initialization.
+It is based on the Secure Engine Middleware.
+
+Generated SE Core Binary embeds Key Management Services accessible through this same single entry point using APIs
+defined by tKMS interface.
+
+It has to be compiled before SBSFU project.
+
+Three cryptographic schemes are provided as example to illustrate the cryptographic operations. The default
+cryptographic scheme uses both symmetric (AES-CBC) and asymmetric (ECDSA) cryptography. Two alternate schemes are
+provided and can be selected thanks to SECBOOT_CRYPTO_SCHEME compiler switch named :
+   - SECBOOT_ECCDSA_WITH_AES128_CBC_SHA256 (default)
+   - SECBOOT_ECCDSA_WITHOUT_ENCRYPT_SHA256
+   - SECBOOT_AES128_GCM_AES128_GCM_AES128_GCM
+
+This example supports multiple images feature configured with 2 active images for execution from internal flash.
+Each image has its own keys for signature verification and firwmare encryption.
+
+For more details, refer to UM2262 "Getting started with SBSFU - software expansion for STM32Cube"
+available from the STMicroelectronics microcontroller website www.st.com.
+
+@par Keywords
+
+Security, KMS, SBSFU
+
+@par Directory contents
+
+   - 2_Images_SECoreBin/Src/ca_low_level.c                      Low level implementations of the Cryptographic API (CA) module
+   - 2_Images_SECoreBin/Src/kms_low_level.c                     Key Management Services low level interface
+   - 2_Images_SECoreBin/Src/nvms_low_level.c                    Non volatile memory storage low level interface
+   - 2_Images_SECoreBin/Src/se_low_level.c                      Low level interface
+   - 2_Images_SECoreBin/Inc/ca_conf.h                           Configuration for Cryptographic API (CA) module functionalities
+   - 2_Images_SECoreBin/Inc/ca_low_level.h                      Header for ca_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_config.h                        Key Management Services configuration file
+   - 2_Images_SECoreBin/Inc/kms_low_level.h                     Header for kms_low_level.c
+   - 2_Images_SECoreBin/Inc/kms_mem_pool_def.h                  KMS memory pool definition file
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_config.h.pattern  Header for Key Management Services embedded objects definitions pattern
+                                                                Appropriate cryptographic scheme keys are injected into it by the prebuild script (see below)
+   - 2_Images_SECoreBin/Inc/kms_platf_objects_interface.h       Header for Key Management Services embedded objects references (labels, IDs...)
+                                                                Exported to KMS user to ease embedded object usage
+   - 2_Images_SECoreBin/Inc/mbed_crypto_config.h                mbed-crypto configuration file
+   - 2_Images_SECoreBin/Inc/nvms_low_level.h                    Header for nvms_low_level.c
+   - 2_Images_SECoreBin/Inc/se_crypto_config.h                  Crypto scheme configuration (crypto scheme used by the bootloader)
+   - 2_Images_SECoreBin/Inc/se_def_metadata.h                   Firmware metadata (header) definition
+   - 2_Images_SECoreBin/Inc/se_low_level.h                      Header file for low level interface
+   - 2_Images_SECoreBin/Inc/stm32wlxx_hal_conf.h                HAL configuration file
+   - 2_Images_SECoreBin/Binary/ECCKEY1.txt                      Private ECCDSA key for signature verification
+   - 2_Images_SECoreBin/Binary/ECCKEY2.txt                      Private ECCDSA key for signature verification of 2nd active image
+   - 2_Images_SECoreBin/Binary/nonce.bin                        Number used only once for firmware encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_CBC.bin Public key for AES CBC encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY1_key_AES_GCM.bin Public key for AES GCM encryption
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_CBC.bin Public key for AES CBC encryption of 2nd active image
+   - 2_Images_SECoreBin/Binary/OEM_KEY_COMPANY2_key_AES_GCM.bin Public key for AES GCM encryption of 2nd active image
+
+@par Hardware and Software environment
+
+   - This example runs on STM32WL55xx devices
+   - This example has been tested with NUCLEO-WL55JC RevC board and can be easily tailored to any other supported device and
+     development board.
+   - An up-to-date version of ST-LINK firmware is required. Upgrading ST-LINK firmware is a feature provided by
+     STM32Cube programmer available on www.st.com.
+   - Microsoft Windows has a limitation whereby paths to files and directories cannot be longer than 256 characters.
+     Paths to files exceeding that limits cause tools (e.g. compilers, shell scripts) to fail reading from or writing
+     to such files. As a workaround, it is advised to use the subst.exe command from within a command prompt to set up
+     a local drive out of an existing directory on the hard drive, such as:
+     C:\> subst X: <PATH_TO_CUBEFW>\Firmware
+
+   
+@par IDE prebuild script
+
+In order to ease the development process, a prebuild script ("prebuild.bat") is integrated in each IDE project.
+This preliminary processing is in charge of:
+   - determining the requested cryptographic scheme
+   - generating the appropriate keys in <IDE folder>/kms_platf_objects_config.h (from injection of SBSFU & Blob
+     importation keys into the KMS embedded objects pattern file)
+   - generating the appropriate script to prepare the firmware image ("postbuild.bat") when building the UserApp project
+
+A known limitation of this integration occurs when you update a cryptographic parameter (for instance the cryptographic
+key). The IDE does not track this update so you need to force the rebuild of the project manually.
+
+@par How to use it ?
+
+In order to generate Secure Engine Core binary file, you must do the following :
+   - Open your preferred toolchain
+   - Rebuild the project
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h
new file mode 100644
index 00000000..ebcb5142
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_export.h
@@ -0,0 +1,118 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t __ICFEDIT_M4_SB_region_ROM_start__;
+#define M4_SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_M4_SB_region_ROM_end__;
+#define M4_SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_M4_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_intvec_start__;
+#define INTVECT_START ((uint32_t)& __ICFEDIT_intvec_start__)
+extern uint32_t __ICFEDIT_SE_Startup_region_ROM_start__;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Startup_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_start__;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Code_region_ROM_end__;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Code_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_start__;
+#define SE_IF_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_IF_region_ROM_end__;
+#define SE_IF_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_IF_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_start__;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_start__)
+extern uint32_t __ICFEDIT_SE_Key_region_ROM_end__;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& __ICFEDIT_SE_Key_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_CallGate_region_ROM_start__;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& __ICFEDIT_SE_CallGate_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_start__;
+#define SB_REGION_ROM_START ((uint32_t)& __ICFEDIT_SB_region_ROM_start__)
+extern uint32_t __ICFEDIT_SB_region_ROM_end__;
+#define SB_REGION_ROM_END ((uint32_t)& __ICFEDIT_SB_region_ROM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_start__;
+#define SE_REGION_RAM_START ((uint32_t)& __ICFEDIT_SE_region_RAM_start__)
+extern uint32_t __ICFEDIT_SE_region_RAM_end__ ;
+#define SE_REGION_RAM_END ((uint32_t)& __ICFEDIT_SE_region_RAM_end__)
+extern uint32_t __ICFEDIT_SB_region_RAM_start__ ;
+#define SB_REGION_RAM_START ((uint32_t)& __ICFEDIT_SB_region_RAM_start__)
+extern uint32_t __ICFEDIT_SB_region_RAM_end__ ;
+#define SB_REGION_RAM_END ((uint32_t)& __ICFEDIT_SB_region_RAM_end__)
+extern uint32_t __ICFEDIT_SE_region_RAM_stack_top__;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& __ICFEDIT_SE_region_RAM_stack_top__)
+
+extern uint32_t __ICFEDIT_EE_DataStorage_start__ ;
+#define EE_DATASTORAGE_START ((uint32_t)& __ICFEDIT_EE_DataStorage_start__)
+extern uint32_t __ICFEDIT_EE_DataStorage_end__ ;
+#define EE_DATASTORAGE_END ((uint32_t)& __ICFEDIT_EE_DataStorage_end__)
+extern uint32_t __ICFEDIT_KMS_DataStorage_start__ ;
+#define KMS_DATASTORAGE_START ((uint32_t)& __ICFEDIT_KMS_DataStorage_start__)
+extern uint32_t __ICFEDIT_KMS_DataStorage_end__ ;
+#define KMS_DATASTORAGE_END ((uint32_t)& __ICFEDIT_KMS_DataStorage_end__)
+
+
+#if defined (__ICCARM__) || defined(__GNUC__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_header__;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_1_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_start__;
+#define SLOT_ACTIVE_1_START ((uint32_t)& __ICFEDIT_SLOT_Active_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_1_end__;
+#define SLOT_ACTIVE_1_END ((uint32_t)& __ICFEDIT_SLOT_Active_1_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_header__;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_2_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_start__;
+#define SLOT_ACTIVE_2_START ((uint32_t)& __ICFEDIT_SLOT_Active_2_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_2_end__;
+#define SLOT_ACTIVE_2_END ((uint32_t)& __ICFEDIT_SLOT_Active_2_end__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_header__;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& __ICFEDIT_SLOT_Active_3_header__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_start__;
+#define SLOT_ACTIVE_3_START ((uint32_t)& __ICFEDIT_SLOT_Active_3_start__)
+extern uint32_t __ICFEDIT_SLOT_Active_3_end__;
+#define SLOT_ACTIVE_3_END ((uint32_t)& __ICFEDIT_SLOT_Active_3_end__)
+extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_start__;
+#define SLOT_BLOB_DWL_1_START ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_start__)
+extern uint32_t __ICFEDIT_SLOT_Blob_Dwl_1_end__;
+#define SLOT_BLOB_DWL_1_END ((uint32_t)& __ICFEDIT_SLOT_Blob_Dwl_1_end__)
+
+/* DualCore specificities */
+#if !defined(CORE_CM0PLUS)
+extern uint32_t __ICFEDIT_region_ROM_end__ ;
+#define C1_AREA_ADDR_END  ((uint32_t)& __ICFEDIT_region_ROM_end__)
+#define C2_BOOT_BASE_ADDR ((uint32_t)& __ICFEDIT_intvec_start__)
+#endif /* CORE_CM0PLUS */
+extern volatile uint32_t __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ ;
+#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__)
+
+#endif /* __ICCARM__ || __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
new file mode 100644
index 00000000..3ddc0811
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_fwimg.icf
@@ -0,0 +1,24 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* Active slot #1 (56 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_1_header__= 0x0803F800;
+define exported symbol  __ICFEDIT_SLOT_Active_1_start__ = 0x0801C000;
+define exported symbol  __ICFEDIT_SLOT_Active_1_end__   = 0x08029FFF;
+
+/* Active slot #2 (100 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Active_2_header__= 0x0803F000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_start__ = 0x08003000;
+define exported symbol  __ICFEDIT_SLOT_Active_2_end__   = 0x0801BFFF;
+
+/* Slot download 1 region (2 kbytes) */
+define exported symbol  __ICFEDIT_SLOT_Blob_Dwl_1_start__= 0x08002800;
+define exported symbol  __ICFEDIT_SLOT_Blob_Dwl_1_end__  = 0x08002FFF;
+
+/* Slots not configured */
+define exported symbol  __ICFEDIT_SLOT_Active_3_header__= 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_start__ = 0x00000000;
+define exported symbol  __ICFEDIT_SLOT_Active_3_end__   = 0x00000000;
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
new file mode 100644
index 00000000..6552a2d9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/EWARM/mapping_sbsfu.icf
@@ -0,0 +1,105 @@
+/*###ICF### Set of symbols used in SE and SB_SFU projects ****/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 SB Code region */
+define exported symbol __ICFEDIT_M4_SB_region_ROM_start__          = 0x08000000;
+define exported symbol __ICFEDIT_M4_SB_region_ROM_end__            = 0x080027FF;
+
+/* ROM regions definition */
+define region M4_SB_ROM_region           = mem:[from __ICFEDIT_M4_SB_region_ROM_start__   to __ICFEDIT_M4_SB_region_ROM_end__];
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+/* EE Data Storage (NVMS) region protected area */
+/* EE Data Storage need for 2 images : 2 kbytes * 2 ==> 4 kbytes */
+define exported symbol __ICFEDIT_EE_DataStorage_start__            = 0x0802A000;
+define exported symbol __ICFEDIT_EE_DataStorage_end__              = 0x0802AFFF;
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+define exported symbol __ICFEDIT_KMS_DataStorage_start__           = 0x0802B000;
+define exported symbol __ICFEDIT_KMS_DataStorage_end__             = 0x0802CFFF;
+
+/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation */
+define exported symbol __ICFEDIT_SE_IF_region_ROM_start__          = __ICFEDIT_KMS_DataStorage_end__ + 1;
+define exported symbol __ICFEDIT_SE_IF_region_ROM_end__            = __ICFEDIT_SE_IF_region_ROM_start__ + 0x13FF;
+
+/* SBSFU Code region */
+define exported symbol __ICFEDIT_SB_region_ROM_start__             = __ICFEDIT_SE_IF_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_ROM_end__               = 0x080367FF;
+
+/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+define exported symbol __ICFEDIT_intvec_start__                    = __ICFEDIT_SB_region_ROM_end__ + 1;
+define exported symbol __ICFEDIT_Vector_size__                     = 0x200;
+
+/* SE Code region protected by MPU isolation */
+define exported symbol __ICFEDIT_SE_Code_region_ROM_start__        = __ICFEDIT_intvec_start__ + __ICFEDIT_Vector_size__;
+define exported symbol __ICFEDIT_SE_CallGate_region_ROM_start__    = __ICFEDIT_SE_Code_region_ROM_start__ + 4;
+define exported symbol __ICFEDIT_SE_CallGate_Region_ROM_End__      = __ICFEDIT_SE_Code_region_ROM_start__ + 0x1FF;
+
+/* SE Startup */
+define exported symbol __ICFEDIT_SE_Startup_region_ROM_start__     = __ICFEDIT_SE_CallGate_Region_ROM_End__ + 1;
+define exported symbol __ICFEDIT_SE_Code_nokey_region_ROM_start__  = __ICFEDIT_SE_Startup_region_ROM_start__ + 0x100;
+
+/* User Embedded Keys */
+define exported symbol __ICFEDIT_User_Key_region_ROM_start__      = 0x0803E500;
+define exported symbol __ICFEDIT_User_Key_region_ROM_end__        = 0x0803E7FF;
+
+/* SE Embedded Keys */
+define exported symbol __ICFEDIT_SE_Key_region_ROM_start__         = 0x0803E800;
+define exported symbol __ICFEDIT_SE_Key_region_ROM_end__           = 0x0803EFFF;
+define exported symbol __ICFEDIT_SE_Code_region_ROM_end__          = __ICFEDIT_SE_Key_region_ROM_end__;
+
+/* ROM regions definition */
+define region KMS_DataStorage            = mem:[from __ICFEDIT_KMS_DataStorage_start__ to __ICFEDIT_KMS_DataStorage_end__];
+define region SE_IF_ROM_region           = mem:[from __ICFEDIT_SE_IF_region_ROM_start__ to __ICFEDIT_SE_IF_region_ROM_end__];
+define region SB_ROM_region              = mem:[from __ICFEDIT_SB_region_ROM_start__ to __ICFEDIT_SB_region_ROM_end__];
+define region SE_CALLGATE_ROM_Region     = mem:[from __ICFEDIT_SE_CallGate_region_ROM_start__ to __ICFEDIT_SE_CallGate_Region_ROM_End__];
+define region SE_CODE_NOKEY_ROM_region   = mem:[from __ICFEDIT_SE_Code_nokey_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_start__ - 1];
+define region User_Key_ROM_region        = mem:[from __ICFEDIT_User_Key_region_ROM_start__ to __ICFEDIT_User_Key_region_ROM_end__];
+define region SE_Key_ROM_region          = mem:[from __ICFEDIT_SE_Key_region_ROM_start__ to __ICFEDIT_SE_Key_region_ROM_end__];
+define region SE_ROM_region              = mem:[from __ICFEDIT_SE_Code_region_ROM_start__ to __ICFEDIT_SE_Code_region_ROM_end__];
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+define symbol __ICFEDIT_M4_SB_region_RAM_start__                   = 0x20000000;
+define symbol __ICFEDIT_M4_SB_region_RAM_end__                     = __ICFEDIT_M4_SB_region_RAM_start__ + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ = __ICFEDIT_M4_SB_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__   = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_start__ + 0x1F;
+
+/* M4 UserApp */
+define symbol __ICFEDIT_M4_APP_region_RAM_start__                  = __ICFEDIT_M4_M0PLUS_FLAG_region_RAM_end__ + 1;
+define symbol __ICFEDIT_M4_APP_region_RAM_end__                    = 0x20007FFF;
+
+/* M4 UserApp shared area */
+define exported symbol __ICFEDIT_M4_SHARED_region_SRAM_start__     = 0x20008000;
+define exported symbol __ICFEDIT_M4_SHARED_region_SRAM_end__       = 0x200083FF;
+
+/* M0PLUS UserApp shared area */
+define exported symbol __ICFEDIT_M0PLUS_SHARED_region_SRAM_start__ = 0x20008400;
+define exported symbol __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__   = 0x20008FFF;
+
+/* SBSFU RAM region */
+define exported symbol __ICFEDIT_SB_region_RAM_start__             = __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__ + 1;
+define exported symbol __ICFEDIT_SB_region_RAM_end__               = 0x2000D3FF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
+define exported symbol __ICFEDIT_SE_region_RAM_start__             = __ICFEDIT_SB_region_RAM_end__ + 1;
+define exported symbol __ICFEDIT_SE_region_RAM_stack_top__         = 0x2000DB00; /* Secure Engine's private stack */
+define exported symbol __ICFEDIT_SE_region_RAM_end__               = 0x2000FFFF;
+
+/* RAM regions definition */
+define region M4_SB_RAM_region           = mem:[from __ICFEDIT_M4_SB_region_RAM_start__ to __ICFEDIT_M4_SB_region_RAM_end__];
+define region M4_APP_RAM_region          = mem:[from __ICFEDIT_M4_APP_region_RAM_start__ to __ICFEDIT_M4_APP_region_RAM_end__];
+define region SE_RAM_region              = mem:[from __ICFEDIT_SE_region_RAM_stack_top__ to __ICFEDIT_SE_region_RAM_end__];
+define region SB_RAM_region              = mem:[from __ICFEDIT_SB_region_RAM_start__ to __ICFEDIT_SB_region_RAM_end__];
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
new file mode 100644
index 00000000..d449e2b2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_fwimg.h
@@ -0,0 +1,45 @@
+/**
+  ******************************************************************************
+  * @file    mapping_fwimg.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for firmware images mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_FWIMG_H
+#define MAPPING_FWIMG_H
+
+/* Slots  must be aligned on 2048 bytes (0x800) */
+
+/* Active slot #1  (56 kbytes) */
+#define SLOT_ACTIVE_1_HEADER         0x0803F800
+#define SLOT_ACTIVE_1_START          0x0801C000
+#define SLOT_ACTIVE_1_END            0x08029FFF
+
+/* Active slot #2  (100 kbytes) */
+#define SLOT_ACTIVE_2_HEADER         0x0803F000
+#define SLOT_ACTIVE_2_START          0x08003000
+#define SLOT_ACTIVE_2_END            0x0801BFFF
+
+/* Dwl slot #1  (2 kbytes) */
+#define SLOT_BLOB_DWL_1_START        0x08002800
+#define SLOT_BLOB_DWL_1_END          0x08002FFF
+
+/* Slots not configured */
+#define SLOT_ACTIVE_3_HEADER         0x00000000
+#define SLOT_ACTIVE_3_START          0x00000000
+#define SLOT_ACTIVE_3_END            0x00000000
+
+#endif
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
new file mode 100644
index 00000000..eaf88323
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/MDK-ARM/mapping_sbsfu.h
@@ -0,0 +1,131 @@
+/**
+  ******************************************************************************
+  * @file    mapping_sbsfu.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for SBSFU mapping
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright(c) 2017 STMicroelectronics International N.V.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_SBSFU_H
+#define MAPPING_SBSFU_H
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 SB Code region */
+#define M4_SB_REGION_ROM_START          0x08000000
+#define M4_SB_REGION_ROM_END            0x080027FF
+
+/* ROM regions definition */
+#define M4_SB_ROM_REGION_SIZE          (M4_SB_REGION_ROM_END - M4_SB_REGION_ROM_START + 0x1)
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+/* EE Data Storage (NVMS) region protected area */
+/* EE Data Storage need for 2 images : 2 kbytes * 2 ==> 4 kbytes */
+#define EE_DATASTORAGE_START            0x0802A000
+#define EE_DATASTORAGE_END              0x0802AFFF
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+#define KMS_DATASTORAGE_START           0x0802B000
+#define KMS_DATASTORAGE_END             0x0802CFFF
+
+/* SE IF ROM: used to locate Secure Engine interface code out of MPU isolation     */
+#define SE_IF_REGION_ROM_START          (KMS_DATASTORAGE_END + 0x1)
+#define SE_IF_REGION_ROM_END            (SE_IF_REGION_ROM_START + 0x15FF)
+
+/* SBSFU Code region */
+#define SB_REGION_ROM_START             (SE_IF_REGION_ROM_END + 1)
+#define SB_REGION_ROM_END               0x080367FF
+
+/* M0 Vector table with alignment constraint on VECTOR_SIZE */
+#define VECTOR_SIZE                     0x200
+#define INTVECT_START                   (SB_REGION_ROM_END + 0x1)
+
+/* SE Code region protected by MPU isolation */
+#define SE_CODE_REGION_ROM_START        (INTVECT_START + VECTOR_SIZE)
+#define SE_CALLGATE_REGION_ROM_START    (SE_CODE_REGION_ROM_START + 4)
+#define SE_CALLGATE_REGION_ROM_END      (SE_CODE_REGION_ROM_START + 0xFF)
+
+/* SE Startup                               */
+#define SE_STARTUP_REGION_ROM_START     (SE_CALLGATE_REGION_ROM_END + 1)
+#define SE_CODE_NOKEY_REGION_ROM_START  (SE_STARTUP_REGION_ROM_START + 0x100)
+
+/* User Embedded Keys */
+#define USER_KEY_REGION_ROM_START       0x0803E500
+#define USER_KEY_REGION_ROM_END         0x0803E7FF
+
+/* SE Embedded Keys */
+#define SE_KEY_REGION_ROM_START         0x0803E800
+#define SE_KEY_REGION_ROM_END           0x0803EFFF
+#define SE_CODE_REGION_ROM_END          SE_KEY_REGION_ROM_END
+
+/* ROM regions size definition */
+#define KMS_DATASTORAGE_SIZE            (KMS_DATASTORAGE_END - KMS_DATASTORAGE_START + 0x1)
+#define SE_IF_ROM_REGION_SIZE           (SE_IF_REGION_ROM_END - SE_IF_REGION_ROM_START + 0x1)
+#define SB_ROM_REGION_SIZE              (SB_REGION_ROM_END - SB_REGION_ROM_START + 0x1)
+#define SE_CALLGATE_REGION_ROM_SIZE     (SE_CALLGATE_REGION_ROM_END - SE_CALLGATE_REGION_ROM_START + 0x1)
+#define SE_CODE_NOKEY_REGION_ROM_SIZE   (SE_KEY_REGION_ROM_START - SE_CODE_NOKEY_REGION_ROM_START)
+#define USER_KEY_REGION_ROM_SIZE        (USER_KEY_REGION_ROM_START - USER_KEY_REGION_ROM_END + 0x1)
+#define SE_KEY_REGION_ROM_SIZE          (SE_KEY_REGION_ROM_END - SE_KEY_REGION_ROM_START + 0x1)
+#define SE_ROM_REGION_SIZE              (SE_CODE_REGION_ROM_END - SE_CODE_REGION_ROM_START + 0x1)
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+#define M4_SB_REGION_RAM_START          0x20000000
+#define M4_SB_REGION_RAM_END            (M4_SB_REGION_RAM_START + 0xCDF)
+
+/* M0+/M4 Synchronization flag */
+#define M4_M0PLUS_FLAG_RAM_START        (M4_SB_REGION_RAM_END + 0x1)
+#define M4_M0PLUS_FLAG_RAM_END          (M4_M0PLUS_FLAG_RAM_START + 0x1F)
+
+/* M4 UserApp : allocation limited to half RAM size */
+#define M4_APP_REGION_RAM_START         (M4_M0PLUS_FLAG_RAM_END + 0x1)
+#define M4_APP_REGION_RAM_END           0x20007FFF
+
+/* M4 UserApp shared area */
+#define M4_SHARED_REGION_RAM_START      (M4_APP_REGION_RAM_END + 0x1)
+#define M4_SHARED_REGION_RAM_END        0x200083FF
+
+/* M0PLUS UserApp shared area */
+#define M0PLUS_SHARED_REGION_RAM_START  (M4_SHARED_REGION_RAM_END + 0x1)
+#define M0PLUS_SHARED_REGION_RAM_END    0x20008FFF
+
+/* SBSFU RAM region */
+#define SB_REGION_RAM_START             (M0PLUS_SHARED_REGION_RAM_END + 0x1)
+#define SB_REGION_RAM_END               0x2000D3FF
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000D400 */
+#define SE_REGION_RAM_START             (SB_REGION_RAM_END +0x1)
+#define SE_REGION_RAM_STACK_TOP         0x2000DB00                /* Secure Engine's private stack */
+#define SE_REGION_RAM_END               0x2000FFFF
+
+/* RAM regions definition */
+#define M4_SB_RAM_REGION_SIZE           (M4_SB_REGION_RAM_END - M4_SB_REGION_RAM_START + 0x1)
+#define M4_APP_RAM_REGION_SIZE          (M4_APP_REGION_RAM_END - M4_APP_REGION_RAM_START + 0x1)
+#define M4_SHARED_RAM_REGION_SIZE       (M4_SHARED_REGION_RAM_END - M4_SHARED_REGION_RAM_START + 0x1)
+#define M0PLUS_SHARED_RAM_REGION_SIZE   (M0PLUS_SHARED_REGION_RAM_END - M0PLUS_SHARED_REGION_RAM_START + 0x1)
+#define SB_RAM_REGION_SIZE              (SB_REGION_RAM_END - SB_REGION_RAM_START + 0x1)
+#define SE_RAM_REGION_SIZE              (SE_REGION_RAM_END - SE_REGION_RAM_STACK_TOP + 0x1)
+
+#endif
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
new file mode 100644
index 00000000..8d106161
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_export.h
@@ -0,0 +1,116 @@
+/**
+  ******************************************************************************
+  * @file    mapping_export.h
+  * @author  MCD Application Team
+  * @brief   This file contains the definitions exported from mapping linker files.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef MAPPING_EXPORT_H
+#define MAPPING_EXPORT_H
+
+#ifdef cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+extern uint32_t M4_SB_region_ROM_start;
+#define M4_SB_REGION_ROM_START ((uint32_t)& M4_SB_region_ROM_start)
+extern uint32_t M4_SB_region_ROM_end;
+#define M4_SB_REGION_ROM_END ((uint32_t)& M4_SB_region_ROM_end)
+extern uint32_t INTVECT_start;
+#define INTVECT_START ((uint32_t)& INTVECT_start)
+extern uint32_t SE_Startup_region_ROM_start;
+#define SE_STARTUP_REGION_ROM_START ((uint32_t)& SE_Startup_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_start;
+#define SE_CODE_REGION_ROM_START ((uint32_t)& SE_Code_region_ROM_start)
+extern uint32_t SE_Code_region_ROM_end;
+#define SE_CODE_REGION_ROM_END ((uint32_t)& SE_Code_region_ROM_end)
+extern uint32_t SE_IF_region_ROM_start;
+#define SE_IF_REGION_ROM_START ((uint32_t)& SE_IF_region_ROM_start)
+extern uint32_t SE_IF_region_ROM_end;
+#define SE_IF_REGION_ROM_END ((uint32_t)& SE_IF_region_ROM_end)
+extern uint32_t SE_Key_region_ROM_start;
+#define SE_KEY_REGION_ROM_START ((uint32_t)& SE_Key_region_ROM_start)
+extern uint32_t SE_Key_region_ROM_end;
+#define SE_KEY_REGION_ROM_END ((uint32_t)& SE_Key_region_ROM_end)
+extern uint32_t SE_CallGate_region_ROM_start;
+#define SE_CALLGATE_REGION_ROM_START ((uint32_t)& SE_CallGate_region_ROM_start)
+extern uint32_t SB_region_ROM_start;
+#define SB_REGION_ROM_START ((uint32_t)& SB_region_ROM_start)
+extern uint32_t SB_region_ROM_end;
+#define SB_REGION_ROM_END ((uint32_t)& SB_region_ROM_end)
+extern uint32_t SE_region_RAM_start;
+#define SE_REGION_RAM_START ((uint32_t)& SE_region_RAM_start)
+extern uint32_t SE_region_RAM_end ;
+#define SE_REGION_RAM_END ((uint32_t)& SE_region_RAM_end)
+extern uint32_t SB_region_RAM_start ;
+#define SB_REGION_RAM_START ((uint32_t)& SB_region_RAM_start)
+extern uint32_t SB_region_RAM_end ;
+#define SB_REGION_RAM_END ((uint32_t)& SB_region_RAM_end)
+extern uint32_t SE_region_RAM_stack_top;
+#define SE_REGION_RAM_STACK_TOP ((uint32_t)& SE_region_RAM_stack_top)
+
+extern uint32_t EE_DataStorage_start ;
+#define EE_DATASTORAGE_START ((uint32_t)& EE_DataStorage_start)
+extern uint32_t EE_DataStorage_end ;
+#define EE_DATASTORAGE_END ((uint32_t)& EE_DataStorage_end)
+extern uint32_t KMS_DataStorage_start ;
+#define KMS_DATASTORAGE_START ((uint32_t)& KMS_DataStorage_start)
+extern uint32_t KMS_DataStorage_end ;
+#define KMS_DATASTORAGE_END ((uint32_t)& KMS_DataStorage_end)
+
+extern uint32_t SLOT_Active_1_header;
+#define SLOT_ACTIVE_1_HEADER ((uint32_t)& SLOT_Active_1_header)
+extern uint32_t SLOT_Active_1_start;
+#define SLOT_ACTIVE_1_START ((uint32_t)& SLOT_Active_1_start)
+extern uint32_t SLOT_Active_1_end;
+#define SLOT_ACTIVE_1_END ((uint32_t)& SLOT_Active_1_end)
+extern uint32_t SLOT_Active_2_header;
+#define SLOT_ACTIVE_2_HEADER ((uint32_t)& SLOT_Active_2_header)
+extern uint32_t SLOT_Active_2_start;
+#define SLOT_ACTIVE_2_START ((uint32_t)& SLOT_Active_2_start)
+extern uint32_t SLOT_Active_2_end;
+#define SLOT_ACTIVE_2_END ((uint32_t)& SLOT_Active_2_end)
+extern uint32_t SLOT_Active_3_header;
+#define SLOT_ACTIVE_3_HEADER ((uint32_t)& SLOT_Active_3_header)
+extern uint32_t SLOT_Active_3_start;
+#define SLOT_ACTIVE_3_START ((uint32_t)& SLOT_Active_3_start)
+extern uint32_t SLOT_Active_3_end;
+#define SLOT_ACTIVE_3_END ((uint32_t)& SLOT_Active_3_end)
+extern uint32_t SLOT_Blob_Dwl_1_start;
+#define SLOT_BLOB_DWL_1_START ((uint32_t)& SLOT_Blob_Dwl_1_start)
+extern uint32_t SLOT_Blob_Dwl_1_end;
+#define SLOT_BLOB_DWL_1_END ((uint32_t)& SLOT_Blob_Dwl_1_end)
+
+/* DualCore specificities */
+#if !defined(CORE_CM0PLUS)
+extern uint32_t region_ROM_end ;
+#define C2_AREA_ADDR_END  ((uint32_t)& region_ROM_end)
+extern uint32_t INTVEC_start;
+#define C2_BOOT_BASE_ADDR    ((uint32_t)& INTVEC_start)
+#endif /* CORE_CM0PLUS */
+extern volatile uint32_t M4_M0PLUS_flag_RAM_start ;
+#define M4_M0PLUS_FLAG_RAM_START ((uint32_t)& M4_M0PLUS_flag_RAM_start)
+
+
+#ifdef cplusplus
+}
+#endif
+
+#endif /* MAPPING_EXPORT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
new file mode 100644
index 00000000..d8c15b6b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_fwimg.ld
@@ -0,0 +1,25 @@
+/*
+** LinkerScript
+*/
+
+/* Slots must be aligned on sector size */
+
+/* Active slot #1 (56 kbytes) */
+SLOT_Active_1_header  = 0x0803F800;
+SLOT_Active_1_start   = 0x0801C000;
+SLOT_Active_1_end     = 0x08029FFF;
+
+/* Active slot #2 (100 kbytes) */
+SLOT_Active_2_header  = 0x0803F000;
+SLOT_Active_2_start   = 0x08003000;
+SLOT_Active_2_end     = 0x0801BFFF;
+
+/* Dwl slot #1 : (2 kbytes) */
+SLOT_Blob_Dwl_1_start = 0x08002800;
+SLOT_Blob_Dwl_1_end   = 0x08002FFF;
+
+/* Slots not configured */
+SLOT_Active_3_header  = 0x00000000;
+SLOT_Active_3_start   = 0x00000000;
+SLOT_Active_3_end     = 0x00000000;
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
new file mode 100644
index 00000000..6d1eff3a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Linker_Common/STM32CubeIDE/mapping_sbsfu.ld
@@ -0,0 +1,140 @@
+/*
+** LinkerScript
+*/
+
+/******************************************************************************/
+/*                               M4 ROM section                               */
+/******************************************************************************/
+
+/* M4 Vector table */
+M4_INTVECT_start               = 0x08000000;
+M4_SB_region_ROM_start         = M4_INTVECT_start;
+M4_Vector_size                 = 0x200;
+
+/* M4 SB Code region */
+M4_SB_Code_region_ROM_start    = M4_INTVECT_start + M4_Vector_size;
+M4_SB_Code_region_ROM_end      = 0x080027FF;
+M4_SB_region_ROM_end           = M4_SB_Code_region_ROM_end;
+
+/* ROM regions size definition */
+M4_SB_Code_region_ROM_size     = M4_SB_Code_region_ROM_end - M4_SB_Code_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                               M0+ ROM section                              */
+/******************************************************************************/
+/* EE Data Storage (NVMS) region protected area */
+/* EE Data Storage need for 2 images : 2 kbytes * 2 ==> 4 kbytes */
+EE_DataStorage_start           = 0x0802A000;
+EE_DataStorage_end             = EE_DataStorage_start + 0xFFF;
+
+/* KMS Data Storage (NVMS) region protected area */
+/* KMS Data Storage need for 2 images : 4 kbytes * 2 ==> 8 kbytes */
+KMS_DataStorage_start          = 0x0802B000;
+KMS_DataStorage_end            = KMS_DataStorage_start + 0x1FFF;
+
+/* SE IF ROM: used to locate Secure Engine interface Code out of MPU isolation     */
+SE_IF_region_ROM_start         = KMS_DataStorage_end + 0x1; 
+SE_IF_region_ROM_end           = SE_IF_region_ROM_start + 0x17FF;
+
+/* SBSFU Code region */
+SB_region_ROM_start            = SE_IF_region_ROM_end + 0x1;
+SB_region_ROM_end              = 0x080367FF;
+
+/* M0 Vector table with alignment constraint on Vector_size */
+INTVECT_start                  = 0x08036800;
+Vector_size                    = 0x200;
+C2_BOOT_BASE_ADDR              = INTVECT_start;
+
+/* SE Code region protected by MPU isolation */
+SE_Code_region_ROM_start       = INTVECT_start + Vector_size;
+SE_CallGate_region_ROM_start   = SE_Code_region_ROM_start; /* No need to do +4 as we have dummy bytes in SE_CoreBin .ld file */
+SE_CallGate_region_ROM_end     = SE_Code_region_ROM_start + 0xFF;
+
+/* SE Startup */
+SE_Startup_region_ROM_start    = SE_CallGate_region_ROM_end + 0x1;
+SE_Code_NoKey_region_ROM_start = SE_Startup_region_ROM_start + 0x100;
+
+/* User Embedded Keys */
+User_Key_region_ROM_start      = 0x0803E500;
+User_Key_region_ROM_end        = 0x0803E7FF;
+
+/* SE Embedded Keys */
+SE_Key_region_ROM_start        = 0x0803E800;
+SE_Key_region_ROM_end          = 0x0803EFFF;
+SE_Code_region_ROM_end         = SE_Key_region_ROM_end;
+
+/* ROM regions size definition */
+KMS_DataStorage_size           = KMS_DataStorage_end - KMS_DataStorage_start + 0x1;
+SE_IF_region_ROM_size          = SE_IF_region_ROM_end - SE_IF_region_ROM_start + 0x1;
+SB_region_ROM_size             = SB_region_ROM_end - SB_region_ROM_start + 0x1;
+SE_Code_region_ROM_size        = SE_Code_region_ROM_end - SE_Code_region_ROM_start + 0x1;
+SE_CallGate_region_ROM_size    = SE_CallGate_region_ROM_end - SE_CallGate_region_ROM_start + 0x1;
+SE_Startup_region_ROM_size     = SE_Code_NoKey_region_ROM_start - SE_Startup_region_ROM_start;
+SE_Code_NoKey_region_ROM_size  = User_Key_region_ROM_start - SE_Code_NoKey_region_ROM_start;
+User_Key_region_ROM_size       = User_Key_region_ROM_end - User_Key_region_ROM_start + 0x1;
+SE_Key_region_ROM_size         = SE_Key_region_ROM_end - SE_Key_region_ROM_start + 0x1;
+
+/******************************************************************************/
+/*                              RAM section                                   */
+/*                                                                            */
+/******************************************************************************/
+
+/* M4 SB */
+M4_SB_region_RAM_start         = 0x20000000;
+M4_SB_region_RAM_end           = M4_SB_region_RAM_start + 0xCDF;
+
+/* M0+/M4 Synchronization flag */
+M4_M0PLUS_flag_RAM_start       = M4_SB_region_RAM_end + 0x1;
+M4_M0PLUS_flag_RAM_end         = M4_M0PLUS_flag_RAM_start + 0x1F;
+
+/* M4 UserApp : allocation limited to half RAM size */
+M4_APP_region_RAM_start        = M4_M0PLUS_flag_RAM_end + 0x1;
+M4_APP_region_RAM_end          = 0x20007FFF;
+
+/* M4 UserApp shared area */
+M4_SHARED_region_RAM_start     = M4_APP_region_RAM_end + 0x1;
+M4_SHARED_region_RAM_end       = 0x200083FF;
+
+/* M0PLUS UserApp shared area */
+M0PLUS_SHARED_region_RAM_start = M4_SHARED_region_RAM_end + 0x1;
+M0PLUS_SHARED_region_RAM_end   = 0x20008FFF;
+
+/* SBSFU RAM region */
+SB_region_RAM_start            = M0PLUS_SHARED_region_RAM_end + 0x1;
+SB_region_RAM_end              = 0x2000CBFF;
+
+/* SE RAM region protected area with 1 kBytes alignment constraint (TZIC) ==> 0x2000CC00 */
+SE_region_RAM_start            = SB_region_RAM_end + 0x1;
+SE_region_RAM_stack_top        = SE_region_RAM_start + 0xC00;                /* Secure Engine's private stack */
+SE_region_RAM_end              = 0x2000FFFF;
+
+/* RAM regions size definition */
+M4_SB_region_RAM_size          = M4_SB_region_RAM_end - M4_SB_region_RAM_start + 0x1;
+M4_APP_region_RAM_size         = M4_APP_region_RAM_end - M4_APP_region_RAM_start + 0x1;
+M4_SHARED_region_RAM_size      = M4_SHARED_region_RAM_end - M4_SHARED_region_RAM_start + 0x1;
+M0PLUS_SHARED_region_RAM_size  = M0PLUS_SHARED_region_RAM_end - M0PLUS_SHARED_region_RAM_start + 0x1;
+SB_region_RAM_size             = SB_region_RAM_end - SB_region_RAM_start + 0x1;
+SE_region_RAM_size             = SE_region_RAM_end - SE_region_RAM_stack_top + 0x1;
+
+/******************************************************************************/
+/*                              RAM/ROM regions                               */
+/*                                                                            */
+/******************************************************************************/
+
+MEMORY
+{
+ M4_INTVECT_ROM_region (rx)       : ORIGIN = M4_INTVECT_start, LENGTH = M4_Vector_size
+ M4_SB_Code_ROM_region (rx)       : ORIGIN = M4_SB_Code_region_ROM_start, LENGTH = M4_SB_Code_region_ROM_size
+ SE_IF_ROM_region (rx)            : ORIGIN = SE_IF_region_ROM_start, LENGTH = SE_IF_region_ROM_size
+ SB_ROM_region (rx)               : ORIGIN = SB_region_ROM_start, LENGTH = SB_region_ROM_size
+ INTVECT_ROM_region (rx)          : ORIGIN = INTVECT_start, LENGTH = Vector_size
+ SE_ROM_region (rx)               : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_Code_region_ROM_size
+ SE_CallGate_ROM_region (rx)      : ORIGIN = SE_CallGate_region_ROM_start, LENGTH = SE_CallGate_region_ROM_size
+ SE_Startup_ROM_region (rx)       : ORIGIN = SE_Startup_region_ROM_start, LENGTH = SE_Startup_region_ROM_size
+ SE_Code_NoKey_ROM_region (rx)    : ORIGIN = SE_Code_NoKey_region_ROM_start, LENGTH = SE_Code_NoKey_region_ROM_size
+ User_Key_region_ROM (rx)         : ORIGIN = User_Key_region_ROM_start, LENGTH = User_Key_region_ROM_size
+ SE_Key_region_ROM (rx)           : ORIGIN = SE_Key_region_ROM_start, LENGTH = SE_Key_region_ROM_size
+ M4_SB_RAM_region (xrw)           : ORIGIN = M4_SB_region_RAM_start, LENGTH = M4_SB_region_RAM_size
+ SB_RAM_region (xrw)              : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+ SE_RAM_region (xrw)              : ORIGIN = SE_region_RAM_stack_top, LENGTH = SE_region_RAM_size
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/EWARM/build.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/EWARM/build.bat
new file mode 100644
index 00000000..6e5fa325
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/EWARM/build.bat
@@ -0,0 +1,69 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+set rebuild=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if "%1"=="-norebuild" (
+    set rebuild=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\EWARM\Project.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\EWARM\Project.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\EWARM\CM0PLUS.ewp || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\EWARM\CM4.ewp || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+call :compile_func %current_dir%..\..\Sigfox_PushButton_DualCore\EWARM\Sigfox_PushButton_DualCore_CM0PLUS.ewp || goto :eof
+call :compile_func %current_dir%..\..\Sigfox_PushButton_DualCore\EWARM\Sigfox_PushButton_DualCore_CM4.ewp || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  if %rebuild% equ 1 (
+    %EWARM_EXE% "%~1" -clean * -parallel 10
+    %EWARM_EXE% "%~1" -make * -parallel 10
+  ) else (
+    %EWARM_EXE% "%~1" * -parallel 10
+  )
+  if %errorlevel% neq 0 (
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| -norebuild ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo -norebuild  Partial compilation
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/EWARM/program.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/EWARM/program.bat
new file mode 100644
index 00000000..13df7211
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/EWARM/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\Sigfox_PushButton_DualCore\EWARM\Binary\SBSFU_Sigfox_PushButton_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/build.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/build.bat
new file mode 100644
index 00000000..b4deb600
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/build.bat
@@ -0,0 +1,70 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  echo Build 2_Images_KMS_Blob
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\MDK-ARM\Project.uvprojx || goto :eof
+  echo Build 2_Images_SECoreBin
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\MDK-ARM\Project.uvprojx || goto :eof
+  echo Build 2_Images_SBSFU\CM0PLUS
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\MDK-ARM\CM0PLUS.uvprojx || goto :eof
+  echo Build 2_Images_SBSFU\CM4
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\MDK-ARM\CM4.uvprojx || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+echo Build Sigfox_PushButton_DualCore\CM0PLUS
+call :compile_func %current_dir%..\..\Sigfox_PushButton_DualCore\MDK-ARM\Sigfox_PushButton_DualCore_CM0PLUS.uvprojx || goto :eof
+echo Build Sigfox_PushButton_DualCore\CM4
+call :compile_func %current_dir%..\..\Sigfox_PushButton_DualCore\MDK-ARM\Sigfox_PushButton_DualCore_CM4.uvprojx || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  %MDK_EXE% -r "%~1" -o "%~dp0\temp.log" -j0
+  REM return 0 if OK, 1 if warning, 2 if error
+  if %errorlevel% equ 2 (
+    type "%~dp0\temp.log"
+    del "%~dp0\temp.log"
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  type "%~dp0\temp.log"
+  del "%~dp0\temp.log"
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/program.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/program.bat
new file mode 100644
index 00000000..27904295
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/MDK-ARM/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\Sigfox_PushButton_DualCore\MDK-ARM\Binary\SBSFU_Sigfox_PushButton_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/build.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/build.bat
new file mode 100644
index 00000000..311b5775
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/build.bat
@@ -0,0 +1,73 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+set compile_all_projects=1
+set rebuild=1
+
+REM Get Arguments
+:continue
+if not "%1"=="" (
+  if "%1"=="-app" (
+    set compile_all_projects=0
+  )
+  if "%1"=="-norebuild" (
+    set rebuild=0
+  )
+  if [%1]==[/?] goto help
+  shift
+  goto continue
+)
+
+set "workspacedir=%current_dir%..\..\LoRaWAN_End_Node_DualCore\STM32CubeIDE\Binary\ws"
+
+if %compile_all_projects% equ 1 (
+  echo ###########################################
+  echo # 1- Compile all SBSFU projects
+  echo ###########################################
+  call :compile_func %current_dir%..\..\2_Images_KMS_Blob\STM32CubeIDE || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SECoreBin\STM32CubeIDE || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\STM32CubeIDE\CM0PLUS || goto :eof
+  call :compile_func %current_dir%..\..\2_Images_SBSFU\STM32CubeIDE\CM4 || goto :eof
+)
+
+echo ###########################################
+echo # 2- Compile Application projects
+echo ###########################################
+call :compile_func %current_dir%..\..\Sigfox_PushButton_DualCore\STM32CubeIDE\CM0PLUS || goto :eof
+call :compile_func %current_dir%..\..\Sigfox_PushButton_DualCore\STM32CubeIDE\CM4 || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:compile_func
+  if not exist %workspacedir% (
+    mkdir %workspacedir% 2>NUL
+    if %ERRORLEVEL% NEQ 0 exit /B 1
+  ) else (
+    del /q "%workspacedir%\*"
+    for /D %%p in ("%workspacedir%\*.*") do rmdir "%%p" /s /q
+  )
+  %CUBEIDE_EXE% --launcher.suppressErrors -nosplash -application org.eclipse.cdt.managedbuilder.core.headlessbuild -data "%workspacedir%" -import "%~1" -build all
+  if %errorlevel% neq 0 (
+    echo Error: Compilation of %~1 Failed. Abort of compile batch ...
+    exit /B 1
+  )
+  exit /B 0
+
+:help
+  echo ###########################################
+  echo # HELP
+  echo ###########################################
+  echo Usage: %0 [-app ^| -norebuild ^| /?]
+  echo.
+  echo -app        Compile only Application projects (exclude SBSFU projects)
+  echo -norebuild  Partial compilation
+  echo ?           Print Help
+  goto eof
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/program.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/program.bat
new file mode 100644
index 00000000..13a77792
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/STM32CubeIDE/program.bat
@@ -0,0 +1,60 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cls
+
+set "current_dir=%~dp0"
+
+echo ###########################################
+echo # 0- Set all global variables
+echo ###########################################
+call %current_dir%..\setenv.bat
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+call %current_dir%..\disable_security.bat || goto :eof
+if %errorlevel% neq 0 goto :eof
+
+echo ###########################################
+echo # 2- Erase Memory
+echo ###########################################
+%CUBEPROG_EXE% -c port=SWD mode=UR -e all
+if %errorlevel% neq 0 (
+  echo Error: Full Memory Erase Failure
+  goto :eof
+)
+
+echo ###########################################
+echo # 3- Download binaries
+echo ###########################################
+call :download_file %current_dir%..\..\Sigfox_PushButton_DualCore\STM32CubeIDE\Binary\SBSFU_Sigfox_PushButton_DualCore_CM4.bin Big_Binary 0x08000000 || goto :eof
+
+echo Power cycle the board (unplug/plug USB cable) to apply the SBSFU security mechanisms...
+exit /B 0
+
+:--------------------------------------
+:download_file
+  if not exist %~1 (
+    echo Error: %~1 File not found. Check your build log ...
+    exit /B 1
+  )
+
+  if "%~3" == "" (
+    echo Downloading %~2 binary ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 -v >nul 2>nul
+  ) else (
+    echo Downloading %~2 binary @%~3 ...
+    %CUBEPROG_EXE% -c port=SWD mode=UR -d %~1 %~3 -v >nul 2>nul
+  )
+  if %errorlevel% neq 0 (
+    echo Error: %~2 Download Failed
+    exit /B 1
+  )
+  
+  %CUBEPROG_EXE% -c port=SWD mode=HOTPLUG -hardRst >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Reset after download Failed
+    exit /B 1
+  )
+  echo Done
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/disable_security.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/disable_security.bat
new file mode 100644
index 00000000..02dbfc56
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/disable_security.bat
@@ -0,0 +1,87 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+
+REM ###########################################
+REM # 0- Set all global variables
+REM ###########################################
+if not defined CUBEPROG_EXE (
+  call setenv.bat
+)
+
+echo ###########################################
+echo # 1- Disable security
+echo ###########################################
+echo RDP: Read Out protection Level 1
+call :write_ob RDP 0xBB || goto :eof
+
+echo RDP+ESE: Read Out protection Level 0 + Security disabled
+call :write_ob RDP 0xAA ESE 0x0 || goto :eof
+
+echo WRP: Write Protection disabled
+call :write_ob WRP1A_STRT 0x7F WRP1A_END 0x0 WRP1B_STRT 0x7F WRP1B_END 0x0 || goto :eof
+
+echo ------ User Configuration ------
+echo nRST: No reset generated when entering the Stop/Standby/Shutdown modes
+call :write_ob nRST_STOP 0x1 nRST_STDBY 0x1 nRST_SHDW 0x1 || goto :eof
+
+echo WDG_SW: Software window/independent watchdogs
+call :write_ob WWDG_SW 0x1 IWDG_SW 0x1 || goto :eof
+
+echo IWDG: Independent watchdog counter frozen in Stop/Standby modes
+call :write_ob IWGD_STDBY 0x0 IWDG_STOP 0x0 || goto :eof
+
+echo BOOT: CPU1+CPU2 CM0+ Boot lock disabled
+call :write_ob BOOT_LOCK 0x0 C2BOOT_LOCK 0x0 || goto :eof
+
+echo ------ Security Configuration ------
+echo HDPAD: User Flash hide protection area access disabled
+call :write_ob HDPAD 0x1 || goto :eof
+
+echo SPISD: SPI3 security disabled
+call :write_ob SUBGHSPISD 0x1 || goto :eof
+
+echo SBRSA: Reset default value of SRAM Start address secure
+call :write_ob SNBRSA 0x1F SBRSA 0x1F || goto :eof
+
+echo SBRV: Reset default value of CPU2 Boot start address
+call :write_ob SBRV 0x8000 || goto :eof
+
+exit /B 0
+
+:--------------------------------------
+:write_ob
+  set len_ob=0
+  :next
+  if not "%~1" == "" if not "%~2" == "" (
+    set option_byte_name[!len_ob!]=%~1
+    set option_byte_val[!len_ob!]=%~2
+    set /a len_ob+=1
+    shift
+    shift
+    goto next
+  )
+  set /a len_ob-=1
+  set obj_str=
+  for /L %%i in (0,1,%len_ob%) do (
+    set obj_str=!option_byte_name[%%i]!=!option_byte_val[%%i]! !obj_str! 
+  )
+
+  %CUBEPROG_EXE% -c port=SWD mode=UR -q -ob !obj_str! >nul 2>nul
+  if %errorlevel% neq 0 (
+    echo Error: Command write -ob !obj_str! Failed
+    exit /B 1
+  )
+  %CUBEPROG_EXE% -c port=SWD mode=UR -q -ob displ > temp.txt
+  
+  REM Get line containing %~1 Option Byte
+  for /L %%i in (0,1,%len_ob%) do (
+    for /f "tokens=3" %%h in ('findstr /c:"     !option_byte_name[%%i]!" temp.txt') do set "read_ob=%%h"
+    if "!read_ob!" neq "!option_byte_val[%%i]!" (
+      echo Error: Option Byte !option_byte_name[%%i]! not modified as expected: read=!read_ob! expected=!option_byte_val[%%i]!
+      del /Q temp.txt >nul
+      exit /B 1
+    )
+  )
+  
+  del /Q temp.txt >nul
+  exit /B 0
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/setenv.bat b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/setenv.bat
new file mode 100644
index 00000000..c8c00c32
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Scripts/setenv.bat
@@ -0,0 +1,4 @@
+set CUBEPROG_EXE="C:\Program Files\STMicroelectronics\STM32Cube\STM32CubeProgrammer\bin\STM32_Programmer_CLI.exe"
+set EWARM_EXE="C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.1\common\bin\IarBuild.exe"
+set MDK_EXE="C:\Keil_v5\UV4\UV4.exe"
+set CUBEIDE_EXE="C:\ST\STM32CubeIDE_1.6.0\STM32CubeIDE\stm32cubeidec.exe"
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h
new file mode 100644
index 00000000..60836e7b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h
@@ -0,0 +1,78 @@
+/**
+  ******************************************************************************
+  * @file    cmsis_nvic_virtual.h
+  * @brief   Maps the NVIC functions on _SVC for Unpriviledge usage
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __CMSIS_NVIC_VIRTUAL_H__
+#define __CMSIS_NVIC_VIRTUAL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "sys_privileged_wrap.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+#define NVIC_SetPriorityGrouping    __NVIC_SetPriorityGrouping
+#define NVIC_GetPriorityGrouping    __NVIC_GetPriorityGrouping
+#define NVIC_EnableIRQ              SYS_PRIVIL_NVIC_EnableIRQ
+#define NVIC_GetEnableIRQ           SYS_PRIVIL_NVIC_GetEnableIRQ
+#define NVIC_DisableIRQ             SYS_PRIVIL_NVIC_DisableIRQ
+#define NVIC_GetPendingIRQ          SYS_PRIVIL_NVIC_GetPendingIRQ
+#define NVIC_SetPendingIRQ          SYS_PRIVIL_NVIC_SetPendingIRQ
+#define NVIC_ClearPendingIRQ        SYS_PRIVIL_NVIC_ClearPendingIRQ
+/* #define NVIC_GetActive              __NVIC_GetActive             not available for Cortex-M0+ */
+#define NVIC_SetPriority            SYS_PRIVIL_NVIC_SetPriority
+#define NVIC_GetPriority            SYS_PRIVIL_NVIC_GetPriority
+#define NVIC_SystemReset            SYS_PRIVIL_NVIC_SystemReset
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CMSIS_NVIC_VIRTUAL_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h
new file mode 100644
index 00000000..9cb596ba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h
@@ -0,0 +1,123 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    flash_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains definitions for FLASH Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __FLASH_IF_H__
+#define __FLASH_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * @brief Flash status enumeration
+  */
+enum
+{
+  FLASH_PARAM_ERROR = -5,
+  FLASH_LOCK_ERROR = -4,
+  FLASH_WRITE_ERROR = -3,
+  FLASH_ERASE_ERROR  = -2,
+  FLASH_ERROR  = -1,
+  FLASH_OK     = 0,
+  FLASH_BUSY   = 1
+};
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#define PAGE(__ADDRESS__) (uint32_t)((((__ADDRESS__) - FLASH_BASE) % FLASH_BANK_SIZE) / FLASH_PAGE_SIZE) /*!< Get page index from page address */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function writes a user flash area (read/modify/write)
+  * @param  address: ptr to user flash area
+  * @param  data: ptr to data to be written
+  * @param  size: number of 32b.
+  * @param  dataTempPage: ptr used to copy already written page in ram
+  * @return Flash status.
+  */
+int32_t FLASH_IF_Write(uint32_t  address, uint8_t *data, uint32_t size, uint8_t *dataTempPage);
+
+/**
+  * Writes a 64-bit word in flash at a specific address.
+  * @param address (in bytes) must be a multiple of 8.
+  * @param data data to write
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
+  */
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data);
+
+/**
+  * Erases 'n' flash pages from page number 'page' to page number
+  * 'page + n - 1'.
+  * - If 'interrupt' is set to 0, the erasing is performed in polling mode.
+  * - If 'interrupt' is set to 1, the erasing is performed under FLASH
+  *   interrupt: the function returns immediately and the user is informed of
+  *   the end of erasing procedure by a call to the following function that
+  *   must be implemented by the user: void HWCB_FLASH_EndOfCleanup( void );
+  *   this call-back function is called under FLASH IRQ handler.
+  * @param page memory start page number
+  * @param n number of page
+  * @param interrupt choice polling/interrupt
+  * @returns FLASH_OK, FLASH_BUSY, FLASH_ERASE_ERROR
+  */
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt);
+
+/**
+  * Callback
+  */
+void HWCB_FLASH_EndOfCleanup(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __FLASH_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h
new file mode 100644
index 00000000..3dbeb3d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.h
+  * @brief   This file contains all the function prototypes for
+  *          the ipcc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_H__
+#define __IPCC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern IPCC_HandleTypeDef hipcc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_IPCC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
new file mode 100644
index 00000000..40330641
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
@@ -0,0 +1,109 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains the interface of the ipcc driver on CM0PLUS.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_IF_CM0PLUS_H__
+#define __IPCC_IF_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "ipcc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Initialize IPCC and register upper and downer callbacks
+  * @param  IPCC_IF_CommandRcv_cb     command callback
+  * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
+  */
+void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
+
+/**
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
+
+/**
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
+
+/**
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
+
+/**
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_ResponseSnd(uint32_t channelIdx);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_IF_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_if.h
new file mode 100644
index 00000000..193e853a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_if.h
@@ -0,0 +1,71 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    kms_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains kms interfaces with middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef KMS_IF_H
+#define KMS_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "kms.h"
+#include "tkms.h"
+#include "se_interface_kms.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KMS_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/lptim.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/lptim.h
new file mode 100644
index 00000000..7fe5ac5c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/lptim.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    lptim.h
+  * @brief   This file contains all the function prototypes for
+  *          the lptim.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __LPTIM_H__
+#define __LPTIM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern LPTIM_HandleTypeDef hlptim1;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_LPTIM1_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __LPTIM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/main.h
new file mode 100644
index 00000000..d6e56436
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/main.h
@@ -0,0 +1,84 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.h
+  * @brief          : Header for main.c file.
+  *                   This file contains the common defines of the application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+#include "app_kms.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+#define RTC_N_PREDIV_S 10
+#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
+#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h
new file mode 100644
index 00000000..d1831b4d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h
@@ -0,0 +1,77 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mn_lptim_if.h
+  * @author  MCD Application Team
+  * @brief   Header for between Sigfox monarch and lptim
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MN_LPTIM_IF_H__
+#define __MN_LPTIM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+#include "lptim.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function initializes the LPTIM used in the scope of Monarch
+  */
+void MN_LPTIM_IF_Init(void);
+
+/**
+  * @brief This function de-init the LPTIM used in the scope of Monarch
+  */
+void MN_LPTIM_IF_DeInit(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MN_LPTIM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/platform.h
new file mode 100644
index 00000000..2386cd7f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/platform.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    platform.h
+  * @author  MCD Application Team
+  * @brief   Header for General HW instances configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+
+#define USE_BSP_DRIVER
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdbool.h>
+#include "stm32wlxx.h"
+#include "main.h"
+#include "stm32wlxx_ll_gpio.h"
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP.  */
+/* In order to use BSP, users can add the BSP files in the IDE project space */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  */
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_nucleo_radio.h"
+#endif /* defined(USE_BSP_DRIVER) */
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PLATFORM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/rtc.h
new file mode 100644
index 00000000..6dd24df4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/rtc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    rtc.h
+  * @brief   This file contains all the function prototypes for
+  *          the rtc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RTC_H__
+#define __RTC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern RTC_HandleTypeDef hrtc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_RTC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RTC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
new file mode 100644
index 00000000..cbe62fa1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -0,0 +1,102 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Low Power Manager interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_LPM_IF_H__
+#define __STM32_LPM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_lpm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Enters Low Power Off Mode
+  */
+void PWR_EnterOffMode(void);
+
+/**
+  * @brief Exits Low Power Off Mode
+  */
+void PWR_ExitOffMode(void);
+
+/**
+  * @brief Enters Low Power Stop Mode
+  * @note ARM exists the function when waking up
+  */
+void PWR_EnterStopMode(void);
+
+/**
+  * @brief Exits Low Power Stop Mode
+  * @note Enable the pll at 32MHz
+  */
+void PWR_ExitStopMode(void);
+
+/**
+  * @brief Enters Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_EnterSleepMode(void);
+
+/**
+  * @brief Exits Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_ExitSleepMode(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_LPM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..2c10fcc5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,338 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/*#define HAL_ADC_MODULE_ENABLED   */
+/*#define HAL_COMP_MODULE_ENABLED   */
+/*#define HAL_CRC_MODULE_ENABLED   */
+#define HAL_CRYP_MODULE_ENABLED
+/*#define HAL_DAC_MODULE_ENABLED   */
+#define HAL_GTZC_MODULE_ENABLED
+/*#define HAL_HSEM_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED   */
+/*#define HAL_I2S_MODULE_ENABLED   */
+#define HAL_IPCC_MODULE_ENABLED
+/*#define HAL_IRDA_MODULE_ENABLED   */
+/*#define HAL_IWDG_MODULE_ENABLED   */
+#define HAL_LPTIM_MODULE_ENABLED
+/*#define HAL_PKA_MODULE_ENABLED   */
+/*#define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+#define HAL_SUBGHZ_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
+/*#define HAL_UART_MODULE_ENABLED   */
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..3c7e195d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,69 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+ ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32WLxx_IT_H
+#define __STM32WLxx_IT_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void TZIC_ILA_IRQHandler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+void RTC_LSECSS_IRQHandler(void);
+void LPTIM1_IRQHandler(void);
+void IPCC_C2_RX_C2_TX_IRQHandler(void);
+void SUBGHZ_Radio_IRQHandler(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/subghz.h
new file mode 100644
index 00000000..0926ffad
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/subghz.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    subghz.h
+  * @brief   This file contains all the function prototypes for
+  *          the subghz.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SUBGHZ_H__
+#define __SUBGHZ_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern SUBGHZ_HandleTypeDef hsubghz;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_SUBGHZ_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SUBGHZ_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_app.h
new file mode 100644
index 00000000..eee9c7ac
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_app.h
@@ -0,0 +1,114 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for sys_app.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_APP_H__
+#define __SYS_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmux_table.h"
+#include "sys_conf.h"
+#include "stm32_adv_trace.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported defines ----------------------------------------------------------*/
+/* currently not supported */
+/* #define ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
+#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+
+#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
+#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
+#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
+#define APP_LOG(TS,VL,...)
+#else
+#error "APP_LOG_ENABLED not defined or out of range <0,1>"
+#endif /* APP_LOG_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
+  */
+void SystemApp_Init(void);
+
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
+void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_APP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_conf.h
new file mode 100644
index 00000000..4bdc3fd3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_conf.h
@@ -0,0 +1,100 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_conf.h
+  * @author  MCD Application Team
+  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_CONF_H__
+#define __SYS_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sgfx_eeprom_if.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/**
+  * @brief CM0PLUS Verbose level for all trace logs
+  */
+#define VERBOSE_LEVEL               VLEVEL_M
+
+/**
+  * @brief Enable trace logs
+  */
+#define APP_LOG_ENABLED             1
+
+/**
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
+  */
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
+
+/**
+  * @brief Disable Low Power mode
+  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
+  */
+#define LOW_POWER_DISABLE           0
+
+/**
+  * @brief Enable unprivilege mode
+  * @note 1: execute the code in unprivileged mode, 0: execute the code fully in privileged mode
+  */
+#define SECURE_UNPRIVILEGE_ENABLE   1
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h
new file mode 100644
index 00000000..d0bfd820
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h
@@ -0,0 +1,126 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_services.h
+  * @brief   Maps sys_privileged_wrap functions on SVC and API to cortex services
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_PRIVILEGED_SERVICES_H__
+#define __SYS_PRIVILEGED_SERVICES_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define SFU_ISOLATE_SE_WITH_MPU
+/* Critical section functions group */
+#define SVC_DISABLE_ALL_NVIC_IRQS           0x10
+#define SVC_RESTORE_NVIC_IRQS               0x11
+#define SVC_DISABLE_ALL_EXCEPTIONS          0x12
+/* Native NVIC functions group */
+#define SVC_NVIC_ENABLE_IRQ                 0x10
+#define SVC_NVIC_GET_ENABLE_IRQ             0x11
+#define SVC_NVIC_DISABLE_IRQ                0x12
+#define SVC_NVIC_GET_PENDING_IRQ            0x13
+#define SVC_NVIC_SET_PENDING_IRQ            0x14
+#define SVC_NVIC_CLEAR_PENDING_IRQ          0x15
+#define SVC_NVIC_SET_PRIORITY               0x16
+#define SVC_NVIC_GET_PRIORITY               0x17
+#define SVC_NVIC_SYSTEM_RESET               0x18
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief This is the main SVC Handler of the CM0 application (the one from vector table).
+  * @param args SVC arguments
+  * @retval void
+  */
+void SVC_APP_Handler(uint32_t *args);
+
+/**
+  * @brief This functions triggers a CRITICAL_SECTION system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...);
+
+/**
+  * @brief This functions triggers a NVIC system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+void SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...);
+
+
+
+/**
+  * @brief Maps MSP on Privileged region and set up PSP to current stack pointer
+  * @param void
+  * @retval void
+  */
+void ThumbState_RemapMspAndSwitchToPspStack(void);
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void ThumbState_EnterUnprivilegedMode(void);
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t ThumbState_IsUnprivileged(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_PRIVILEGED_SERVICES_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h
new file mode 100644
index 00000000..d58fbba7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h
@@ -0,0 +1,109 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_wrap.h
+  * @brief   This file contains all the function prototypes for
+  *          the sys_privileged_wrap.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_PRIVILEGE_WRAP_H__
+#define __SYS_PRIVILEGE_WRAP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief If execution in unprivil mode, calls SVC and Disable All Nvic Irqs
+  * @param void
+  * @retval uint32_t nvic_iser_state
+  */
+uint32_t SYS_PRIVIL_EnterCriticalSection(void);
+
+/**
+  * @brief If execution in unprivil mode, calls SVC and restore NVIC ISER register
+  * @param uint32_t nvic_iser_state
+  * @retval void
+  */
+void SYS_PRIVIL_ExitCriticalSection(uint32_t nvic_iser_state);
+
+/**
+  * @brief disable all exceptions and after SVC keeps MODE Privileged! (stack goes back to PSP)
+  * @param  void
+  * @retval void
+  */
+void SYS_PRIVIL_DisableIrqsAndRemainPriv(void);
+
+/**
+  * @brief enable all exceptions and go to Unprivileged mode
+  * @param  void
+  * @retval void
+  */
+void SYS_PRIVIL_EnableIrqsAndGoUnpriv(void);
+
+
+/**
+  * @note All SYS_PRIVIL_NVIC_*** functions are a remapping such thatIf
+  *       if execution in unprivil mode  call SVC before __NVIC_***
+  */
+void SYS_PRIVIL_NVIC_EnableIRQ(IRQn_Type IRQn);
+uint32_t SYS_PRIVIL_NVIC_GetEnableIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_DisableIRQ(IRQn_Type IRQn);
+uint32_t SYS_PRIVIL_NVIC_GetPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SetPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_ClearPendingIRQ(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority);
+uint32_t SYS_PRIVIL_NVIC_GetPriority(IRQn_Type IRQn);
+void SYS_PRIVIL_NVIC_SystemReset(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_PRIVILEGE_WRAP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/timer_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/timer_if.h
new file mode 100644
index 00000000..3bbde030
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/timer_if.h
@@ -0,0 +1,174 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.h
+  * @author  MCD Application Team
+  * @brief  configuration of the timer_if.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_IF_H__
+#define __TIMER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+#include "stm32_systime.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Init RTC hardware
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_Init(void);
+
+/**
+  * @brief Set the alarm
+  * @note The alarm is set at timeout from timer Reference (TimerContext)
+  * @param timeout Duration of the Timer in ticks
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout);
+
+/**
+  * @brief Stop the Alarm
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void);
+
+/**
+  * @brief set timer Reference (TimerContext)
+  * @return  Timer Reference Value in  Ticks
+  */
+uint32_t TIMER_IF_SetTimerContext(void);
+
+/**
+  * @brief Get the RTC timer Reference
+  * @return Timer Value in  Ticks
+  */
+uint32_t TIMER_IF_GetTimerContext(void);
+
+/**
+  * @brief Get the timer elapsed time since timer Reference (TimerContext) was set
+  * @return RTC Elapsed time in ticks
+  */
+uint32_t TIMER_IF_GetTimerElapsedTime(void);
+
+/**
+  * @brief Get the timer value
+  * @return RTC Timer value in ticks
+  */
+uint32_t TIMER_IF_GetTimerValue(void);
+
+/**
+  * @brief Return the minimum timeout in ticks the RTC is able to handle
+  * @return minimum value for a timeout in ticks
+  */
+uint32_t TIMER_IF_GetMinimumTimeout(void);
+
+/**
+  * @brief a delay of delay ms by polling RTC
+  * @param delay in ms
+  */
+void TIMER_IF_DelayMs(uint32_t delay);
+
+/**
+  * @brief converts time in ms to time in ticks
+  * @param[in] timeMilliSec time in milliseconds
+  * @return time in timer ticks
+  */
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec);
+
+/**
+  * @brief converts time in ticks to time in ms
+  * @param[in] tick time in timer ticks
+  * @return time in timer milliseconds
+  */
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick);
+
+/**
+  * @brief Get rtc time
+  * @param[out] subSeconds in ticks
+  * @return time seconds
+  */
+uint32_t TIMER_IF_GetTime(uint16_t *subSeconds);
+
+/**
+  * @brief write seconds in backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @param[in] Seconds time in seconds
+  */
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds);
+
+/**
+  * @brief reads seconds from backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @return Time in seconds
+  */
+uint32_t TIMER_IF_BkUp_Read_Seconds(void);
+
+/**
+  * @brief writes SubSeconds in backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @param[in] SubSeconds time in SubSeconds
+  */
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds);
+
+/**
+  * @brief reads SubSeconds from backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @return Time in SubSeconds
+  */
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
new file mode 100644
index 00000000..48d734de
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
@@ -0,0 +1,260 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for configuration file to utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_CONF_H__
+#define __UTILITIES_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "cmsis_compiler.h"
+
+/* definitions to be provided to "sequencer" utility */
+#include "stm32_mem.h"
+/* definition and callback for tiny_vsnprintf */
+#include "stm32_tiny_vsnprintf.h"
+
+#include "mbmuxif_trace.h"
+#include "sys_privileged_wrap.h"
+#include "stm32_seq.h"
+
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#endif /* __ARMCC_VERSION */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*                             sequencer configuration                       */
+/*---------------------------------------------------------------------------*/
+/**
+  * @brief Sequencer flag reserved for future use
+  */
+#define UTIL_SEQ_RFU 0
+
+/**
+  * @brief default number of tasks configured in sequencer
+  */
+#define SEQ_CONF_TASK_NBR    4
+
+/**
+  * @brief default value of priority task
+  */
+#define SEQ_CONF_PRIO_NBR    1
+
+/*---------------------------------------------------------------------------*/
+/*                             eeprom configuration                       */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * @brief Flash address
+  */
+#define HW_FLASH_ADDRESS                FLASH_BASE
+
+/**
+  * @brief Flash page size in bytes
+  */
+#define HW_FLASH_PAGE_SIZE              FLASH_PAGE_SIZE
+
+/**
+  * @brief Flash width in bytes
+  */
+#define HW_FLASH_WIDTH                  8
+
+/**
+  * @brief Flash bank0 size in bytes
+  */
+#define CFG_EE_BANK0_SIZE               2*HW_FLASH_PAGE_SIZE
+
+/**
+  * @brief Maximum number of data that can be stored in bank0
+  */
+#define CFG_EE_BANK0_MAX_NB             EE_ID_COUNT<<2 /*from uint32 to byte*/
+
+/* Unused Bank1 */
+/**
+  * @brief Flash bank1 size in bytes
+  */
+#define CFG_EE_BANK1_SIZE              0
+
+/**
+  * @brief Maximum number of data that can be stored in bank1
+  */
+#define CFG_EE_BANK1_MAX_NB            0
+
+/**
+  * @brief EEPROM Flash address
+  */
+#define EE_BASE_ADRESS                  EE_DATASTORAGE_START
+
+#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
+#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
+                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
+#define VLEVEL_L 1       /*!< just essential traces */
+#define VLEVEL_M 2       /*!< functional traces */
+#define VLEVEL_H 3       /*!< all traces */
+
+#define TS_OFF 0         /*!< Log without TimeStamp */
+#define TS_ON 1          /*!< Log with TimeStamp */
+
+#define T_REG_OFF  0     /*!< Log without bitmask */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Memory placement macro
+  */
+#if defined(__CC_ARM)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
+#elif defined(__ICCARM__)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#else  /* __GNUC__ */
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+
+/**
+  * @brief Memory alignment macro
+  */
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* WIN32 */
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro to Enter CS used specifically by UTIL_SEQ_Run before going to Idle
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION_IDLE( )   SYS_PRIVIL_DisableIrqsAndRemainPriv()
+
+/**
+  * @brief macro to Exit CS used specifically by UTIL_SEQ_Run exiting from Idle
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION_IDLE( )    SYS_PRIVIL_EnableIrqsAndGoUnpriv()
+
+/**
+  * @brief Security: Map UTIL_TIMER_IRQ on Sequencer Task (rather then Isr) such to run Unprivileged
+  */
+#define UTIL_TIMER_IRQ_MAP_INIT()     do{ UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_UtilTimer_Process), UTIL_SEQ_RFU, UTIL_TIMER_IRQ_Handler);} while(0)
+
+#define UTIL_TIMER_IRQ_MAP_PROCESS()  do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_UtilTimer_Process, CFG_SEQ_Prio_0); } while(0)
+
+/**
+  * @brief Memset utilities interface to application
+  */
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTILS_ENTER_CRITICAL_SECTION() uint32_t nvic_iser_state= SYS_PRIVIL_EnterCriticalSection()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTILS_EXIT_CRITICAL_SECTION()  SYS_PRIVIL_ExitCriticalSection(nvic_iser_state)
+/**
+  * @brief macro used to Enter critical section specifically for UTIL_LPM_EnterLowPower()
+  */
+#define UTIL_LPM_ENTER_CRITICAL_SECTION_ELP()
+/**
+  * @brief macro used to Exit critical section specifically for UTIL_LPM_EnterLowPower()
+  */
+#define UTIL_LPM_EXIT_CRITICAL_SECTION_ELP()
+
+/******************************************************************************
+  * trace\advanced
+  * the define option
+  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
+  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
+  *
+  ******************************************************************************/
+
+#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
+#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
+#define UTIL_ADV_TRACE_MEMLOCATION                 UTIL_MEM_PLACE_IN_SECTION("MB_MEM2")  /*!< memory placement for trace buffer */
+#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
+#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
+#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
+#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
+#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UTILITIES_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h
new file mode 100644
index 00000000..443e558b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h
@@ -0,0 +1,148 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_def.h
+  * @author  MCD Application Team
+  * @brief   Definitions for modules requiring utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_DEF_H__
+#define __UTILITIES_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/******************************************************************************
+  * LOW POWER MANAGER
+  ******************************************************************************/
+/**
+  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+  * It lists a bit mapping of all user of the Low Power Manager
+  */
+typedef enum
+{
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
+  CFG_LPM_APPLI_Id,
+  CFG_LPM_UART_TX_Id,
+  CFG_LPM_SGFX_MN_Id,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/*---------------------------------------------------------------------------*/
+/*                             sequencer definitions                         */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * This is the list of priority required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Prio_0,
+  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
+
+  /* USER CODE END CFG_SEQ_Prio_Id_t */
+  CFG_SEQ_Prio_NBR,
+} CFG_SEQ_Prio_Id_t;
+
+/**
+  * This is the list of task id required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  /* CM0PLUS */
+  CFG_SEQ_Task_MbSystemCmdRcv,
+  CFG_SEQ_Task_MbTraceAckRcv,
+  CFG_SEQ_Task_MbSigfoxCmdRcv,
+  CFG_SEQ_Task_MbRadioCmdRcv,
+  CFG_SEQ_Task_MbRadioNotifSnd,
+  CFG_SEQ_Task_MbKmsCmdRcv,
+  CFG_SEQ_Task_MbSigfoxNotifRcv,
+  CFG_SEQ_Task_Monarch,
+  CFG_SEQ_Task_RadioIrq_Process,
+  CFG_SEQ_Task_RadioRxTimeout_Process,
+  CFG_SEQ_Task_RadioTxTimeout_Process,
+  CFG_SEQ_Task_UtilTimer_Process,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t */
+  CFG_SEQ_Task_NBR
+} CFG_SEQ_Task_Id_t;
+
+/**
+  * This is a bit mapping over 32bits listing all events id supported in the application
+  */
+typedef enum
+{
+  /* CM0PLUS */
+  CFG_SEQ_Evt_MbSystemAckRcv,
+  CFG_SEQ_Evt_MbTraceAckRcv,
+  CFG_SEQ_Evt_MbSigfoxAckRcv,
+  CFG_SEQ_Evt_Monarch,
+  CFG_SEQ_Evt_MbRadioAckRcv,
+  CFG_SEQ_Evt_Timeout,
+  CFG_SEQ_Evt_TxTimeout,
+  CFG_SEQ_Evt_Delay,
+  /* USER CODE BEGIN CFG_SEQ_IdleEvt_Id_t */
+
+  /* USER CODE END CFG_SEQ_IdleEvt_Id_t */
+  CFG_SEQ_Evt_NBR
+} CFG_SEQ_IdleEvt_Id_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UTILITIES_DEF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c
new file mode 100644
index 00000000..a33a673d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c
@@ -0,0 +1,331 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    flash_if.c
+  * @author  MCD Application Team
+  * @brief   This file provides set of firmware functions to manage Flash
+  *          Interface functionalities.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "flash_if.h"
+#include "stm32_mem.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Flash empty status enumeration
+  */
+enum
+{
+  FLASH_EMPTY      = 0,
+  FLASH_NOT_EMPTY  = 1
+};
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  This function writes a data buffer in flash (data are 64-bit aligned).
+  * @note   After writing data buffer, the flash content is checked.
+  * @param  pDestination: Start address for target location
+  * @param  pSource: pointer on buffer with data to write
+  * @param  uLength: Length of data buffer in byte. It has to be 64-bit aligned.
+  * @retval HAL Status.
+  */
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength);
+
+/**
+  * @brief  This function checks if part of Flash is empty
+            It handles 32b unaligned address
+  * @param  addr: Start of user flash area
+  * @param  size: number of bytes.
+  * @retval FLASH_EMPTY or FLASH_NOT_EMPTY.
+  */
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t FLASH_IF_Write(uint32_t address, uint8_t *data, uint32_t size, uint8_t *dataTempPage)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_1 */
+
+  /* USER CODE END FLASH_IF_Write_1 */
+  int32_t status = FLASH_OK;
+  uint32_t page_start_index = PAGE(address);
+  uint32_t page_end_index = PAGE(address + size - 1);
+  uint32_t curr_size = size;
+  uint32_t curr_dest_addr = address;
+  uint32_t curr_src_addr = (uint32_t)data;
+
+  if ((data == NULL) || ((size % sizeof(uint64_t)) != 0) || ((address % sizeof(uint64_t)) != 0))
+  {
+    return FLASH_PARAM_ERROR;
+  }
+
+  if (READ_BIT(FLASH->CR, FLASH_CR_LOCK) != 0U)
+  {
+    return FLASH_LOCK_ERROR;
+  }
+
+  if (page_start_index != page_end_index)
+  {
+    curr_size = FLASH_PAGE_SIZE - (address % FLASH_PAGE_SIZE);
+  }
+
+  for (uint32_t idx = page_start_index; idx <= page_end_index; idx++)
+  {
+    if (FLASH_IF_IsEmpty((uint8_t *)curr_dest_addr, curr_size) != FLASH_EMPTY)
+    {
+      if (dataTempPage == NULL)
+      {
+        return FLASH_PARAM_ERROR;
+      }
+      /* backup initial Flash page data in RAM area */
+      UTIL_MEM_cpy_8(dataTempPage, (uint8_t *)(idx * FLASH_PAGE_SIZE + FLASH_BASE), FLASH_PAGE_SIZE);
+      /* copy fragment into RAM area */
+      UTIL_MEM_cpy_8(&dataTempPage[((uint32_t)curr_dest_addr) % FLASH_PAGE_SIZE], (uint8_t *)curr_src_addr, curr_size);
+
+      /*  erase the Flash sector, to avoid writing twice in RAM */
+      if (FLASH_IF_EraseByPages(idx, 1, 0) != FLASH_OK)
+      {
+        status = FLASH_ERASE_ERROR;
+        break; /* exit for loop */
+      }
+      else
+      {
+        /* copy the whole flash sector including fragment from RAM to Flash*/
+        if (FLASH_IF_Write_Buffer(idx * FLASH_PAGE_SIZE + FLASH_BASE, dataTempPage, FLASH_PAGE_SIZE) != FLASH_OK)
+        {
+          status = FLASH_WRITE_ERROR;
+          break; /* exit for loop */
+        }
+      }
+    }
+    else
+    {
+      if (FLASH_IF_Write_Buffer(curr_dest_addr, (uint8_t *)curr_src_addr, curr_size) != FLASH_OK)
+      {
+        status = FLASH_WRITE_ERROR;
+        break; /* exit for loop */
+      }
+    }
+
+    /* 2nd part of memory overlapped on 2nd flash sector */
+    curr_dest_addr += curr_size;
+    curr_src_addr += curr_size;
+    curr_size = size - curr_size;
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_2 */
+
+  /* USER CODE END FLASH_IF_Write_2 */
+}
+
+int32_t FLASH_IF_Write64(uint32_t address, uint64_t data)
+{
+  /* USER CODE BEGIN FLASH_IF_Write64_1 */
+
+  /* USER CODE END FLASH_IF_Write64_1 */
+  while (*(uint64_t *)address != data)
+  {
+    while (LL_FLASH_IsActiveFlag_OperationSuspended());
+    HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, address, data);
+  }
+
+  return FLASH_OK;
+  /* USER CODE BEGIN HW_FLASH_Write_2 */
+
+  /* USER CODE END HW_FLASH_Write_2 */
+}
+
+int32_t FLASH_IF_EraseByPages(uint32_t page, uint16_t n, int32_t interrupt)
+{
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_1 */
+
+  /* USER CODE END FLASH_IF_EraseByPages_1 */
+  HAL_StatusTypeDef hal_status;
+  FLASH_EraseInitTypeDef erase_str;
+  uint32_t page_error;
+
+  erase_str.TypeErase = FLASH_TYPEERASE_PAGES;
+  erase_str.Page = page;
+  erase_str.NbPages = n;
+
+  /* Erase the Page */
+  if (interrupt)
+  {
+    hal_status = HAL_FLASHEx_Erase_IT(&erase_str);
+  }
+  else
+  {
+    hal_status = HAL_FLASHEx_Erase(&erase_str, &page_error);
+  }
+
+  return ((hal_status == HAL_OK) ? FLASH_OK : ((hal_status == HAL_BUSY) ? FLASH_BUSY : FLASH_ERASE_ERROR));
+  /* USER CODE BEGIN FLASH_IF_EraseByPages_2 */
+
+  /* USER CODE END FLASH_IF_EraseByPages_2 */
+}
+
+void HAL_FLASH_EndOfOperationCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_EndOfOperationCallback_1 */
+
+  /* USER CODE END HAL_FLASH_EndOfOperationCallback_1 */
+  /* Call CleanUp callback when all requested pages have been erased */
+  if (ReturnValue == 0xFFFFFFFFUL)
+  {
+    HWCB_FLASH_EndOfCleanup();
+  }
+  /* USER CODE BEGIN HAL_FLASH_EndOfOperationCallback_2 */
+
+  /* USER CODE END HAL_FLASH_EndOfOperationCallback_2 */
+}
+
+void HAL_FLASH_OperationErrorCallback(uint32_t ReturnValue)
+{
+  /* USER CODE BEGIN HAL_FLASH_OperationErrorCallback_1 */
+
+  /* USER CODE END HAL_FLASH_OperationErrorCallback_1 */
+}
+
+void HWCB_FLASH_EndOfCleanup(void)
+{
+  /* USER CODE BEGIN HWCB_FLASH_EndOfCleanup_1 */
+
+  /* USER CODE END HWCB_FLASH_EndOfCleanup_1 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static int32_t FLASH_IF_Write_Buffer(uint32_t pDestination, uint8_t *pSource, uint32_t uLength)
+{
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_1 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_1 */
+  uint8_t *pSrc = pSource;
+  uint64_t src_value;
+  int32_t status = FLASH_OK;
+
+  for (uint32_t i = 0; i < (uLength / sizeof(uint64_t)); i++)
+  {
+    UTIL_MEM_cpy_8(&src_value, pSrc, sizeof(uint64_t));
+
+    /* Avoid writing 0xFFFFFFFFFFFFFFFFLL on erased Flash */
+    if (src_value != UINT64_MAX)
+    {
+      status = FLASH_IF_Write64(pDestination, src_value);
+    }
+
+    pDestination += sizeof(uint64_t);
+    pSrc += sizeof(uint64_t);
+
+    if (status != FLASH_OK)
+    {
+      /* exit the for loop*/
+      break;
+    }
+  }
+
+  return status;
+  /* USER CODE BEGIN FLASH_IF_Write_Buffer_2 */
+
+  /* USER CODE END FLASH_IF_Write_Buffer_2 */
+}
+
+static int32_t FLASH_IF_IsEmpty(uint8_t *addr, uint32_t size)
+{
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_1 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_1 */
+  uint64_t *addr64;
+  uint32_t i;
+
+  /* start memory NOT 64bits aligned */
+  while ((((uint32_t)addr) % sizeof(uint64_t)) != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+
+  /* addr64 is 64 bits aligned */
+  addr64 = (uint64_t *)addr;
+  for (i = 0; i < (size / sizeof(uint64_t)); i++)
+  {
+    if (*addr64++ != UINT64_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+  }
+  size -= sizeof(uint64_t) * i;
+
+  /* end memory NOT 64 bits aligned */
+  addr = (uint8_t *)addr64;
+  while (size != 0)
+  {
+    if (*addr++ != UINT8_MAX)
+    {
+      return FLASH_NOT_EMPTY;
+    }
+    size--;
+  }
+  return FLASH_EMPTY;
+  /* USER CODE BEGIN FLASH_IF_IsEmpty_2 */
+
+  /* USER CODE END FLASH_IF_IsEmpty_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c
new file mode 100644
index 00000000..1d49b00f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c
@@ -0,0 +1,94 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.c
+  * @brief   This file provides code for the configuration
+  *          of the IPCC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "ipcc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+IPCC_HandleTypeDef hipcc;
+
+/* IPCC init function */
+void MX_IPCC_Init(void)
+{
+
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
+  hipcc.Instance = IPCC;
+  if (HAL_IPCC_Init(&hipcc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
+
+}
+
+void HAL_IPCC_MspInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspInit 0 */
+
+  /* USER CODE END IPCC_MspInit 0 */
+    /* IPCC clock enable */
+    __HAL_RCC_IPCC_CLK_ENABLE();
+
+    /* IPCC interrupt Init */
+    HAL_NVIC_SetPriority(IPCC_C2_RX_C2_TX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C2_RX_C2_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspInit 1 */
+
+  /* USER CODE END IPCC_MspInit 1 */
+  }
+}
+
+void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspDeInit 0 */
+
+  /* USER CODE END IPCC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_IPCC_CLK_DISABLE();
+
+    /* IPCC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(IPCC_C2_RX_C2_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspDeInit 1 */
+
+  /* USER CODE END IPCC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c
new file mode 100644
index 00000000..d8ea5d9a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c
@@ -0,0 +1,208 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.c
+  * @author  MCD Application Team
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+
+/*ipcc interface for M4*/
+#include "assert.h"
+#include "stddef.h"
+#include "ipcc_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static void (*IpccCommandRcv)(uint32_t channelIdx);
+
+static void (*IpccAcknowledgeRcv)(uint32_t channelIdx);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ confirmation of a received message by remote CPU
+  */
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ notification request by remote CPU
+  */
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx))
+{
+  /* USER CODE BEGIN IPCC_IF_Init_1 */
+
+  /* USER CODE END IPCC_IF_Init_1 */
+  /*Initialize the ipcc, initialize MSP*/
+  MX_IPCC_Init();
+
+  /* Enable C2AHB3 peripherals clock. */
+  LL_C2_AHB3_GRP1_EnableClock(LL_C2_AHB3_GRP1_PERIPH_IPCC);
+  /* IPCC EXTI (AIEC) line for CPU2  */
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
+  LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
+
+  /* Initialize IPCC callback of all channels*/
+  for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
+  {
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
+  }
+
+  /* Registers upper level (application) callback */
+  IpccCommandRcv = IPCC_IF_CommandRcv_cb;
+  IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
+  return;
+  /* USER CODE BEGIN IPCC_IF_Init_2 */
+
+  /* USER CODE END IPCC_IF_Init_2 */
+}
+
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_1 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX);
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_2 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_2 */
+}
+
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_1 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX);
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_2 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_2 */
+}
+
+int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotificationSnd_1 */
+
+  /* USER CODE END IPCC_IF_NotificationSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_NotificationSnd_2 */
+
+  /* USER CODE END IPCC_IF_NotificationSnd_2 */
+}
+
+int32_t IPCC_IF_ResponseSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_ResponseSnd_1 */
+
+  /* USER CODE END IPCC_IF_ResponseSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_ResponseSnd_2 */
+
+  /* USER CODE END IPCC_IF_ResponseSnd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrTxCb_1 */
+
+  /* USER CODE END IpccIfIsrTxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccAcknowledgeRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrTxCb_2 */
+
+  /* USER CODE END IpccIfIsrTxCb_2 */
+}
+
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrRxCb_1 */
+
+  /* USER CODE END IpccIfIsrRxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccCommandRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrRxCb_2 */
+
+  /* USER CODE END IpccIfIsrRxCb_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c
new file mode 100644
index 00000000..6b18ae32
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c
@@ -0,0 +1,112 @@
+/**
+  ******************************************************************************
+  * @file    lptim.c
+  * @brief   This file provides code for the configuration
+  *          of the LPTIM instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "lptim.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+LPTIM_HandleTypeDef hlptim1;
+
+/* LPTIM1 init function */
+void MX_LPTIM1_Init(void)
+{
+
+  /* USER CODE BEGIN LPTIM1_Init 0 */
+
+  /* USER CODE END LPTIM1_Init 0 */
+
+  /* USER CODE BEGIN LPTIM1_Init 1 */
+
+  /* USER CODE END LPTIM1_Init 1 */
+  hlptim1.Instance = LPTIM1;
+  hlptim1.Init.Clock.Source = LPTIM_CLOCKSOURCE_APBCLOCK_LPOSC;
+  hlptim1.Init.Clock.Prescaler = LPTIM_PRESCALER_DIV1;
+  hlptim1.Init.Trigger.Source = LPTIM_TRIGSOURCE_SOFTWARE;
+  hlptim1.Init.OutputPolarity = LPTIM_OUTPUTPOLARITY_HIGH;
+  hlptim1.Init.UpdateMode = LPTIM_UPDATE_IMMEDIATE;
+  hlptim1.Init.CounterSource = LPTIM_COUNTERSOURCE_INTERNAL;
+  hlptim1.Init.Input1Source = LPTIM_INPUT1SOURCE_GPIO;
+  hlptim1.Init.Input2Source = LPTIM_INPUT2SOURCE_GPIO;
+  if (HAL_LPTIM_Init(&hlptim1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN LPTIM1_Init 2 */
+
+  /* USER CODE END LPTIM1_Init 2 */
+
+}
+
+void HAL_LPTIM_MspInit(LPTIM_HandleTypeDef* lptimHandle)
+{
+
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(lptimHandle->Instance==LPTIM1)
+  {
+  /* USER CODE BEGIN LPTIM1_MspInit 0 */
+
+  /* USER CODE END LPTIM1_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPTIM1;
+    PeriphClkInitStruct.Lptim1ClockSelection = RCC_LPTIM1CLKSOURCE_LSE;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* LPTIM1 clock enable */
+    __HAL_RCC_LPTIM1_CLK_ENABLE();
+
+    /* LPTIM1 interrupt Init */
+    HAL_NVIC_SetPriority(LPTIM1_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(LPTIM1_IRQn);
+  /* USER CODE BEGIN LPTIM1_MspInit 1 */
+
+  /* USER CODE END LPTIM1_MspInit 1 */
+  }
+}
+
+void HAL_LPTIM_MspDeInit(LPTIM_HandleTypeDef* lptimHandle)
+{
+
+  if(lptimHandle->Instance==LPTIM1)
+  {
+  /* USER CODE BEGIN LPTIM1_MspDeInit 0 */
+
+  /* USER CODE END LPTIM1_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_LPTIM1_CLK_DISABLE();
+
+    /* LPTIM1 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(LPTIM1_IRQn);
+  /* USER CODE BEGIN LPTIM1_MspDeInit 1 */
+
+  /* USER CODE END LPTIM1_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/main.c
new file mode 100644
index 00000000..ba373c86
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/main.c
@@ -0,0 +1,152 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "app_sigfox.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* USER CODE BEGIN SysInit */
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_KMS_Init();
+  MX_Sigfox_Init();
+  /* USER CODE BEGIN 2 */
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE END WHILE */
+    MX_Sigfox_Process();
+
+    /* USER CODE BEGIN 3 */
+  }
+  /* USER CODE END 3 */
+}
+
+/* USER CODE BEGIN 4 */
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  while (1)
+  {
+  }
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/**
+  * @brief  Implement the Cube_Hal Callback generated on the Tamper IRQ.
+  * @param  None
+  * @retval None
+  */
+void HAL_GTZC_TZIC_Callback(uint32_t PeriphId)
+{
+  while (1)
+  {
+  }
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c
new file mode 100644
index 00000000..c81d7a90
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c
@@ -0,0 +1,141 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mn_lptim_if.c
+  * @author  MCD Application Team
+  * @brief   Interface between Sigfox monarch and lptim
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "mn_lptim_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief LPTIM handle
+  */
+extern LPTIM_HandleTypeDef hlptim1;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void MN_LPTIM_IF_Init(void)
+{
+  /* USER CODE BEGIN MN_LPTIM_IF_Init_0 */
+
+  /* USER CODE END MN_LPTIM_IF_Init_0 */
+
+  /* Force the LPTIM1 Peripheral Clock Reset */
+  __HAL_RCC_LPTIM1_FORCE_RESET();
+  /* Release the LPTIM1 Peripheral Clock Reset */
+  __HAL_RCC_LPTIM1_RELEASE_RESET();
+
+  /* USER CODE BEGIN MN_LPTIM_IF_Init_1 */
+
+  /* USER CODE END MN_LPTIM_IF_Init_1 */
+
+  MX_LPTIM1_Init();
+
+  /* USER CODE BEGIN MN_LPTIM_IF_Init_2 */
+
+  /* USER CODE END MN_LPTIM_IF_Init_2 */
+
+  /* w.a.: LL_EXTI_LINE_X should be enabled in HAL_LPTIM_MspInit */
+  LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_29);
+
+  /* USER CODE BEGIN MN_LPTIM_IF_Init_3 */
+
+  /* USER CODE END MN_LPTIM_IF_Init_3 */
+}
+
+void MN_LPTIM_IF_DeInit(void)
+{
+  RCC_PeriphCLKInitTypeDef RCC_PeriphCLKInitStruct;
+
+  /* USER CODE BEGIN MN_LPTIM_IF_DeInit_0 */
+
+  /* USER CODE END MN_LPTIM_IF_DeInit_0 */
+
+  if (HAL_LPTIM_DeInit(&hlptim1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN MN_LPTIM_IF_DeInit_1 */
+
+  /* USER CODE END MN_LPTIM_IF_DeInit_1 */
+
+  /* Select the PCLK clock as LPTIM1 peripheral clock */
+  RCC_PeriphCLKInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPTIM1;
+  RCC_PeriphCLKInitStruct.Lptim1ClockSelection = RCC_LPTIM1CLKSOURCE_PCLK1;
+  HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphCLKInitStruct);
+
+  /* USER CODE BEGIN MN_LPTIM_IF_DeInit_2 */
+
+  /* USER CODE END MN_LPTIM_IF_DeInit_2 */
+
+  /* Force the LPTIM1 Peripheral Clock Reset */
+  __HAL_RCC_LPTIM1_FORCE_RESET();
+
+  /* Release the LPTIM1 Peripheral Clock Reset */
+  __HAL_RCC_LPTIM1_RELEASE_RESET();
+
+  /* USER CODE BEGIN MN_LPTIM_IF_DeInit_3 */
+
+  /* USER CODE END MN_LPTIM_IF_DeInit_3 */
+
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c
new file mode 100644
index 00000000..ab828d03
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c
@@ -0,0 +1,147 @@
+/**
+  ******************************************************************************
+  * @file    rtc.c
+  * @brief   This file provides code for the configuration
+  *          of the RTC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "rtc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+RTC_HandleTypeDef hrtc;
+
+/* RTC init function */
+void MX_RTC_Init(void)
+{
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
+  RTC_AlarmTypeDef sAlarm = {0};
+
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
+  /** Initialize RTC Only
+  */
+  hrtc.Instance = RTC;
+  hrtc.Init.AsynchPrediv = RTC_PREDIV_A;
+  hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
+  hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE;
+  hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
+  hrtc.Init.OutPutPullUp = RTC_OUTPUT_PULLUP_NONE;
+  hrtc.Init.BinMode = RTC_BINARY_ONLY;
+  if (HAL_RTC_Init(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN Check_RTC_BKUP */
+
+  /* USER CODE END Check_RTC_BKUP */
+
+  /** Initialize RTC and set the Time and Date
+  */
+  if (HAL_RTCEx_SetSSRU_IT(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Enable the Alarm A
+  */
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = 0x0;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Enable the Alarm B
+  */
+  sAlarm.Alarm = RTC_ALARM_B;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
+
+}
+
+void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspInit 0 */
+
+  /* USER CODE END RTC_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+    PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* RTC clock enable */
+    __HAL_RCC_RTC_ENABLE();
+    __HAL_RCC_RTCAPB_CLK_ENABLE();
+
+    /* RTC interrupt Init */
+    HAL_NVIC_SetPriority(RTC_LSECSS_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(RTC_LSECSS_IRQn);
+  /* USER CODE BEGIN RTC_MspInit 1 */
+
+  /* USER CODE END RTC_MspInit 1 */
+  }
+}
+
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspDeInit 0 */
+
+  /* USER CODE END RTC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_RTC_DISABLE();
+    __HAL_RCC_RTCAPB_CLK_DISABLE();
+
+    /* RTC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(RTC_LSECSS_IRQn);
+  /* USER CODE BEGIN RTC_MspDeInit 1 */
+
+  /* USER CODE END RTC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
new file mode 100644
index 00000000..eb2e798d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -0,0 +1,164 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.c
+  * @author  MCD Application Team
+  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "stm32_lpm_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Power driver callbacks handler
+  */
+const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
+{
+  PWR_EnterSleepMode,
+  PWR_ExitSleepMode,
+
+  PWR_EnterStopMode,
+  PWR_ExitStopMode,
+
+  PWR_EnterOffMode,
+  PWR_ExitOffMode,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void PWR_EnterOffMode(void)
+{
+  /* USER CODE BEGIN EnterOffMode_1 */
+
+  /* USER CODE END EnterOffMode_1 */
+}
+
+void PWR_ExitOffMode(void)
+{
+  /* USER CODE BEGIN ExitOffMode_1 */
+
+  /* USER CODE END ExitOffMode_1 */
+}
+
+void PWR_EnterStopMode(void)
+{
+  /* USER CODE BEGIN EnterStopMode_1 */
+
+  /* USER CODE END EnterStopMode_1 */
+  HAL_SuspendTick();
+  /* Clear Status Flag before entering STOP/STANDBY Mode */
+  LL_PWR_ClearFlag_C2STOP_C2STB();
+
+  /* USER CODE BEGIN EnterStopMode_2 */
+
+  /* USER CODE END EnterStopMode_2 */
+  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
+  /* USER CODE BEGIN EnterStopMode_3 */
+
+  /* USER CODE END EnterStopMode_3 */
+}
+
+void PWR_ExitStopMode(void)
+{
+  /* USER CODE BEGIN ExitStopMode_1 */
+
+  /* USER CODE END ExitStopMode_1 */
+  /* Resume sysTick : work around for debugger problem in dual core */
+  HAL_ResumeTick();
+  /*Not retained periph:
+    ADC interface
+    DAC interface USARTx, TIMx, i2Cx, SPIx
+    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
+
+  /* USER CODE BEGIN ExitStopMode_2 */
+
+  /* USER CODE END ExitStopMode_2 */
+}
+
+void PWR_EnterSleepMode(void)
+{
+  /* USER CODE BEGIN EnterSleepMode_1 */
+
+  /* USER CODE END EnterSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_SuspendTick();
+  /* USER CODE BEGIN EnterSleepMode_2 */
+
+  /* USER CODE END EnterSleepMode_2 */
+  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+  /* USER CODE BEGIN EnterSleepMode_3 */
+
+  /* USER CODE END EnterSleepMode_3 */
+}
+
+void PWR_ExitSleepMode(void)
+{
+  /* USER CODE BEGIN ExitSleepMode_1 */
+
+  /* USER CODE END ExitSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_ResumeTick();
+
+  /* USER CODE BEGIN ExitSleepMode_2 */
+
+  /* USER CODE END ExitSleepMode_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..ea7dc033
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file         stm32wlxx_hal_msp.c
+  * @brief        This file provides code for the MSP Initialization
+  *               and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..20f33a48
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,204 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+extern IPCC_HandleTypeDef hipcc;
+extern RTC_HandleTypeDef hrtc;
+extern LPTIM_HandleTypeDef hlptim1;
+extern SUBGHZ_HandleTypeDef hsubghz;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable Interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+  while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief  This function handles TZIC interrupt request.
+  * @param  None
+  * @retval None
+  */
+void TZIC_ILA_IRQHandler(void)
+{
+  HAL_GTZC_IRQHandler();
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/**
+  * @brief This function handles RTC Wakeup + RTC Tamper and RTC TimeStamp + RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts.
+  */
+void RTC_LSECSS_IRQHandler(void)
+{
+  /* USER CODE BEGIN RTC_LSECSS_IRQn 0 */
+
+  /* USER CODE END RTC_LSECSS_IRQn 0 */
+  HAL_RTC_AlarmIRQHandler(&hrtc);
+  HAL_RTCEx_SSRUIRQHandler(&hrtc);
+  /* USER CODE BEGIN RTC_LSECSS_IRQn 1 */
+
+  /* USER CODE END RTC_LSECSS_IRQn 1 */
+}
+
+/**
+  * @brief This function handles LPTIM1 Global Interrupt.
+  */
+void LPTIM1_IRQHandler(void)
+{
+  /* USER CODE BEGIN LPTIM1_IRQn 0 */
+
+  /* USER CODE END LPTIM1_IRQn 0 */
+  HAL_LPTIM_IRQHandler(&hlptim1);
+  /* USER CODE BEGIN LPTIM1_IRQn 1 */
+
+  /* USER CODE END LPTIM1_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC RX Occupied and TX Free Interrupt.
+  */
+void IPCC_C2_RX_C2_TX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C2_RX_C2_TX_IRQn 0 */
+
+  /* USER CODE END IPCC_C2_RX_C2_TX_IRQn 0 */
+  HAL_IPCC_RX_IRQHandler(&hipcc);
+  HAL_IPCC_TX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C2_RX_C2_TX_IRQn 1 */
+
+  /* USER CODE END IPCC_C2_RX_C2_TX_IRQn 1 */
+}
+
+/**
+  * @brief This function handles SUBGHZ Radio Interrupt.
+  */
+void SUBGHZ_Radio_IRQHandler(void)
+{
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 0 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 0 */
+  HAL_SUBGHZ_IRQHandler(&hsubghz);
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 1 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c
new file mode 100644
index 00000000..7b7dba4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c
@@ -0,0 +1,88 @@
+/**
+  ******************************************************************************
+  * @file    subghz.c
+  * @brief   This file provides code for the configuration
+  *          of the SUBGHZ instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "subghz.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+SUBGHZ_HandleTypeDef hsubghz;
+
+/* SUBGHZ init function */
+void MX_SUBGHZ_Init(void)
+{
+
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
+  hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
+  if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
+
+}
+
+void HAL_SUBGHZ_MspInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspInit 0 */
+
+  /* USER CODE END SUBGHZ_MspInit 0 */
+    /* SUBGHZ clock enable */
+    __HAL_RCC_SUBGHZSPI_CLK_ENABLE();
+
+    /* SUBGHZ interrupt Init */
+    HAL_NVIC_SetPriority(SUBGHZ_Radio_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspInit 1 */
+
+  /* USER CODE END SUBGHZ_MspInit 1 */
+}
+
+void HAL_SUBGHZ_MspDeInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 0 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_SUBGHZSPI_CLK_DISABLE();
+
+    /* SUBGHZ interrupt Deinit */
+    HAL_NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 1 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_app.c
new file mode 100644
index 00000000..bdc4e1de
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_app.c
@@ -0,0 +1,421 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.c
+  * @author  MCD Application Team
+  * @brief   Initializes HW and SW system entities (not related to the radio)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdio.h>
+#include "platform.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "stm32_systime.h"
+#include "stm32_lpm.h"
+#include "timer_if.h"
+#include "utilities_def.h"
+#include "sys_debug.h"
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+#include "sys_privileged_services.h"
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+#include "sgfx_eeprom_if.h"
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_radio.h"
+#include "features_info.h"
+#include "mbmuxif_sigfox.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MAX_TS_SIZE (int) 16
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static EXTI_HandleTypeDef Exti41;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
+  */
+static void System_Init(void);
+
+/**
+  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
+  */
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
+/**
+  * @brief  Init the Exti used for sync the two CPU after SBSFU download
+  */
+static void MX_EXTI_Init(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SystemApp_Init(void)
+{
+  int8_t init_status;
+  /* USER CODE BEGIN SystemApp_Init_1 */
+
+  /* USER CODE END SystemApp_Init_1 */
+
+  /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
+  UTIL_TIMER_Init();
+
+  /* #warning "should be removed when proper obl is done" */
+  __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+  E2P_Init();
+
+  /*Init low power manager*/
+  UTIL_LPM_Init();
+  /* Disable Stand-by mode */
+  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+
+#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
+  /* Disable Stop Mode */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+#elif !defined (LOW_POWER_DISABLE)
+#error LOW_POWER_DISABLE not defined
+#endif /* LOW_POWER_DISABLE */
+
+  /* Init the Exti used for sync the two CPU after SBSFU download */
+  MX_EXTI_Init();
+
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+  ThumbState_RemapMspAndSwitchToPspStack();
+  ThumbState_EnterUnprivilegedMode();
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+
+  /* Wait for CPU1 to be ready */
+  while (HAL_EXTI_GetPending(&Exti41, EXTI_TRIGGER_RISING_FALLING) != 0x01u)
+  {
+    /* Wait CPU1 Event */
+  }
+  /* Acknowledge CPU1 event */
+  HAL_EXTI_ClearPending(&Exti41, EXTI_TRIGGER_RISING_FALLING);
+
+  /* Init Feat_Info table */
+  FEAT_INFO_Init();
+
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
+  init_status = MBMUXIF_SystemInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+
+  System_Init();
+
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
+
+  /* Registers Sigfox Notif to the sequencer */
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSigfoxNotifRcv), UTIL_SEQ_RFU, MBMUXIF_SigfoxSendNotifTask);
+
+  /* USER CODE BEGIN SystemApp_Init_2 */
+
+  /* USER CODE END SystemApp_Init_2 */
+}
+
+void TimestampNow(uint8_t *buff, uint16_t *size)
+{
+  /* USER CODE BEGIN TimestampNow_1 */
+
+  /* USER CODE END TimestampNow_1 */
+  SysTime_t curtime = SysTimeGet();
+  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
+  *size = strlen((char *)buff);
+  /* USER CODE BEGIN TimestampNow_2 */
+
+  /* USER CODE END TimestampNow_2 */
+}
+
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Kms_Cmd_1 */
+
+  /* USER CODE END Process_Kms_Cmd_1 */
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
+  APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(KMS)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case KMS_CRYPTO_HMAC_SHA256_MSG_ID:
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Cmd rcv : KMS_CRYPTO_HMAC_SHA256_MSG_ID\r\n");
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Crypto aKey length %d\r\n", com_buffer[1]);
+      APP_LOG(TS_ON, VLEVEL_L, " * CM0 Crypto aKey string %s\r\n", (char *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0;
+      ComObj->ReturnVal = (uint32_t) -5; /* dummy value for test */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_L, "<CM0PLUS(KMS)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_KMS_ID);
+
+  /* USER CODE BEGIN Process_Kms_Cmd_2 */
+
+  /* USER CODE END Process_Kms_Cmd_2 */
+}
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Sys_Cmd_1 */
+
+  /* USER CODE END Process_Sys_Cmd_1 */
+  APP_LOG(TS_ON, VLEVEL_L, ">CM0PLUS(System)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case SYS_OTHER_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      break;
+
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+
+    /* USER CODE END Process_Sys_Cmd_switch_case */
+
+    default:
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+
+      /* USER CODE END Process_Sys_Cmd_switch_default */
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_M, "<CM0PLUS(System)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  /* USER CODE BEGIN Process_Sys_Cmd_2 */
+
+  /* USER CODE END Process_Sys_Cmd_2 */
+}
+
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
+{
+  /**
+    * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
+    * all to process all tack except TaskId_bm
+    */
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_1 */
+  UTIL_SEQ_Run(~TaskId_bm);
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_2 */
+  return;
+}
+
+/**
+  * @brief redefines __weak function in stm32_seq.c such to enter low power
+  */
+void UTIL_SEQ_Idle(void)
+{
+  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
+
+  /* USER CODE END UTIL_SEQ_Idle_1 */
+  UTIL_LPM_EnterLowPower();
+  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
+
+  /* USER CODE END UTIL_SEQ_Idle_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void System_Init(void)
+{
+  /* USER CODE BEGIN System_Init_1 */
+
+  /* USER CODE END System_Init_1 */
+  /* No need of Enable Internal Wake-up line for CPU2 */
+  LL_C2_PWR_DisableInternWU();
+
+  /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
+  LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
+  LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
+
+  /* Enable Radio IRQ lines interrupt for CPU2 */
+  LL_C2_PWR_SetRadioIRQTrigger(LL_PWR_RADIO_IRQ_TRIGGER_WU_IT);
+  /* Enable Radio EXTI lines for CPU2 (Needed for low power STOP mode */
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_44);
+  LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_45);
+
+  /* Ensure that MSI is wake-up system clock */
+  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
+  /* USER CODE BEGIN System_Init_Last */
+
+  /* USER CODE END System_Init_Last */
+}
+
+/* Disable StopMode when traces need to be printed */
+void UTIL_ADV_TRACE_PreSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
+}
+/* Re-enable StopMode when traces have been printed */
+void UTIL_ADV_TRACE_PostSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_2 */
+}
+
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
+{
+  /* USER CODE BEGIN tiny_snprintf_like_1 */
+
+  /* USER CODE END tiny_snprintf_like_1 */
+  va_list vaArgs;
+  va_start(vaArgs, strFormat);
+  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
+  va_end(vaArgs);
+  /* USER CODE BEGIN tiny_snprintf_like_2 */
+
+  /* USER CODE END tiny_snprintf_like_2 */
+}
+
+/**
+  * Enable EXTI controller
+  * Configure line 41
+  */
+static void MX_EXTI_Init(void)
+{
+  EXTI_ConfigTypeDef exit41config;
+
+  exit41config.Line = EXTI_LINE_41;
+  exit41config.Mode = EXTI_MODE_INTERRUPT;
+  exit41config.Trigger = EXTI_TRIGGER_RISING;
+  HAL_EXTI_SetConfigLine(&Exti41, &exit41config);
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/* HAL overload functions ---------------------------------------------------------*/
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
+{
+  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
+  /* USER CODE BEGIN HAL_InitTick_1 */
+
+  /* USER CODE END HAL_InitTick_1 */
+  return HAL_OK;
+  /* USER CODE BEGIN HAL_InitTick_2 */
+
+  /* USER CODE END HAL_InitTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+uint32_t HAL_GetTick(void)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_GetTick_1 */
+
+  /* USER CODE END HAL_GetTick_1 */
+  return TIMER_IF_GetTimerValue();
+  /* USER CODE BEGIN HAL_GetTick_2 */
+
+  /* USER CODE END HAL_GetTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+void HAL_Delay(__IO uint32_t Delay)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_Delay_1 */
+
+  /* USER CODE END HAL_Delay_1 */
+  TIMER_IF_DelayMs(Delay);
+  /* USER CODE BEGIN HAL_Delay_2 */
+
+  /* USER CODE END HAL_Delay_2 */
+}
+
+/* USER CODE BEGIN Overload_HAL_weaks */
+
+/* USER CODE END Overload_HAL_weaks */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c
new file mode 100644
index 00000000..c598f589
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c
@@ -0,0 +1,336 @@
+/**
+  ******************************************************************************
+  * @file    sys_privileged_services.c
+  * @author  MCD Application Team
+  * @brief   gives access to COrtex services like ThumbState, SVC, MPU
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sys_privileged_services.h" /* shall be placed before se_interface_application.h */
+#include "se_interface_application.h"
+#include "stm32_seq.h"
+#include "subghz.h"
+#if defined(__ARMCC_VERSION)
+#include "mapping_sbsfu.h"
+#elif defined (__ICCARM__) || defined(__GNUC__)
+#include "mapping_export.h"
+#elif defined(__CC_ARM)
+#include "mapping_fwimg.h"
+#include "mapping_sbsfu.h"
+#endif /* __ARMCC_VERSION */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void APP_NVIC_SVC_Handler(uint32_t *args);
+void APP_CRITICALSECTION_SVC_Handler(uint32_t *args);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+
+/**
+  * @brief This functions triggers a CRITICAL_SECTION system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+#if defined (__ICCARM__) || defined(__GNUC__)
+void SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+#if defined ( __GNUC__ )
+  /*
+    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
+    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
+    */
+  __ASM volatile("MOV r1, %0" : : "r"(syscall));
+#endif /* __GNUC__ */
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+    */
+  __ASM volatile("SVC #1");  /* 1 is the hard-coded value to indicate NVIC syscall */
+}
+#elif defined(__CC_ARM)
+/*
+  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
+  * caller is in same file. Defining the function as ASM avoids the issue.
+  */
+void __ASM SYS_CRITICALSECTION_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+  /*
+   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+   * example an SVC.
+   * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+   */
+  SVC #1
+  BX LR
+}
+#endif /* (__ICCARM__) || defined(__GNUC__) */
+
+
+/**
+  * @brief This functions triggers a NVIC system call (supervisor call): request privileged operation
+  * @param syscall The identifier of the operation to be called
+  * @param arguments arguments of the privileged operation
+  * @retval void
+  */
+#if defined (__ICCARM__) || defined(__GNUC__)
+void SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+#if defined ( __GNUC__ )
+  /*
+    * With GCC high C/C++++ optimisation level, as syscall parameter is unused, compiler does not initialize
+    * syscall parameter (in r0) when caller is in same file. Forcing the parameter copy in r0 avoid the issue.
+    */
+  __ASM volatile("MOV r1, %0" : : "r"(syscall));
+#endif /* __GNUC__ */
+  /*
+    * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+    * example an SVC.
+    * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+    */
+  __ASM volatile("SVC #2");   /* 2 is the hard-coded value to indicate NVIC syscall */
+}
+#elif defined(__CC_ARM)
+/*
+  * With Keil v5.x, as syscall parameter is unused, compiler does not initialize syscall parameter when
+  * caller is in same file. Defining the function as ASM avoids the issue.
+  */
+void __ASM SYS_NVIC_SvcCall(uint32_t *ret, uint32_t syscall, ...)
+{
+  /*
+   * You cannot directly change to privileged mode from unprivileged mode without going through an exception, for
+   * example an SVC.
+   * Handled by @ref SVC_APP_Handler() and finally @ref SFU_SVC_APP_Handler()
+   */
+  SVC #2
+  BX LR
+}
+#endif /* (__ICCARM__) || defined(__GNUC__) */
+
+/**
+  * @brief This is the SVC Handler of the CM0 application (the one from vector table).
+  * @param args SVC arguments
+  * @retval void
+  */
+void SVC_APP_Handler(uint32_t *args)
+{
+  /* in PSP (args) contains caller context as follow *
+    * args[0] :R0
+    * args[1] :R1
+    * args[2] :R2
+    * args[3] :R3
+    * args[4] :R12
+    * args[5] :LR
+    * args[6] :PC to return after exception
+    * args[7] :xPSR
+  */
+  uint8_t svc_index = ((char *)args[6])[-2];
+
+  switch (svc_index)
+  {
+    case 0x0: /* SE SVC CALL : called by SECoreBin*/
+    {
+      SE_APP_SVC_Handler(args);
+      break;
+    }
+    case 0x1:
+    {
+      APP_CRITICALSECTION_SVC_Handler(args);
+      break;
+    }
+    case 0x2:
+    {
+      APP_NVIC_SVC_Handler(args);
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+}
+
+/**
+  * @brief This is the handler that groups CRITICAL_SESSION functions via SVC calls.
+  * @param args SVC arguments
+  * @retval void
+  */
+void APP_CRITICALSECTION_SVC_Handler(uint32_t *args)
+{
+  uint32_t nvic_iser_state = 0;
+  uint32_t *pRet = (uint32_t *)(args[0]);
+
+  switch (args[1])
+  {
+    case SVC_DISABLE_ALL_NVIC_IRQS:
+    {
+      /*all __NVIC_GetEnableIRQ*/
+      nvic_iser_state = NVIC->ISER[0];
+      /* clear all positive interrupt e.g. no see IRQn_Type in core_cm0plus.h*/
+      NVIC->ICER[0] = nvic_iser_state;
+      break;
+    }
+    case SVC_RESTORE_NVIC_IRQS:
+    {
+      NVIC->ISER[0] = args[2] | NVIC->ISER[0];
+      break;
+    }
+    case SVC_DISABLE_ALL_EXCEPTIONS:
+    {
+      __disable_irq();
+      __set_CONTROL(__get_CONTROL() & 0xFFFE); /* bit 0 = 0: remain privileged   */
+      /* note: exiting the SVC will go back to PSP stack but remain priv mode */
+      break;
+    }
+    default:
+    {
+      break;
+    }
+  }
+  *pRet = nvic_iser_state;
+}
+
+/**
+  * @brief This is the handler that groups NVIC functions via SVC calls.
+  * @param args SVC arguments
+  * @retval void
+  */
+void APP_NVIC_SVC_Handler(uint32_t *args)
+{
+  uint32_t ret = 0;
+  uint32_t *pRet = (uint32_t *)(args[0]);
+
+  switch (args[1])
+  {
+    case SVC_NVIC_ENABLE_IRQ:
+    {
+      __NVIC_EnableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_GET_ENABLE_IRQ:
+    {
+      ret = __NVIC_GetEnableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_DISABLE_IRQ:
+    {
+      __NVIC_DisableIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_GET_PENDING_IRQ:
+    {
+      ret = __NVIC_GetPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SET_PENDING_IRQ:
+    {
+      __NVIC_SetPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_CLEAR_PENDING_IRQ:
+    {
+      __NVIC_ClearPendingIRQ((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SET_PRIORITY:
+    {
+      __NVIC_SetPriority((IRQn_Type) args[2], args[3]);
+      break;
+    }
+    case SVC_NVIC_GET_PRIORITY:
+    {
+      ret = __NVIC_GetPriority((IRQn_Type) args[2]);
+      break;
+    }
+    case SVC_NVIC_SYSTEM_RESET:
+    {
+      __NVIC_SystemReset();
+      break;
+    }
+    default:
+    {
+      HAL_NVIC_SystemReset();
+      break;
+    }
+  }
+  *pRet = ret;
+}
+
+
+/**
+  * @brief Maps MSP on Privileged region and set up PSP to current stack pointer
+  * @param void
+  * @retval void
+  */
+void ThumbState_RemapMspAndSwitchToPspStack(void)
+{
+  __set_PSP(__get_MSP()); /* set up Process Stack Pointer to current stack pointer */
+  __set_MSP(SE_REGION_RAM_STACK_TOP); /* change Main Stack to point on privileged stack */
+  __ISB();
+}
+
+/**
+  * @brief This is a helper function to enter the unprivileged level for software execution
+  * @param void
+  * @retval void
+  */
+void ThumbState_EnterUnprivilegedMode(void)
+{
+  __set_CONTROL(__get_CONTROL() | 3); /* bit 0 = 1: unpriviledged      bit 1=1: stack=PSP */
+  __ISB();
+}
+
+
+/**
+  * @brief This is a helper function to determine if we are currently running in non-privileged mode or not
+  * @param void
+  * @retval 0 if we are in privileged mode, 1 if we are in non-privileged mode
+  */
+uint32_t ThumbState_IsUnprivileged(void)
+{
+  return ((__get_IPSR() == 0U) && ((__get_CONTROL() & 1U) == 1U));
+}
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c
new file mode 100644
index 00000000..c1dcf9be
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c
@@ -0,0 +1,255 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_privileged_wrap.c
+  * @author  MCD Application Team
+  * @brief   Wrapper functions to call SVC when in Unprivilege mode
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sys_privileged_wrap.h"
+#include "sys_privileged_services.h"
+#include "stm32_seq.h"
+#include "subghz.h"
+#include "sys_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+uint32_t SYS_PRIVIL_EnterCriticalSection(void)
+{
+  uint32_t nvic_iser_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* disable NVIC irqs, then back to PSP and Unpriv */
+    SYS_CRITICALSECTION_SvcCall(&nvic_iser_state, SVC_DISABLE_ALL_NVIC_IRQS);
+  }
+  else
+  {
+    nvic_iser_state = NVIC->ISER[0];
+    NVIC->ICER[0] = nvic_iser_state;
+  }
+  return nvic_iser_state;
+}
+
+void SYS_PRIVIL_ExitCriticalSection(uint32_t nvic_iser_state)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* enable NVIC irqs, then back to PSP and Unpriv */
+    uint32_t dummy_ret = 0;
+    SYS_CRITICALSECTION_SvcCall(&dummy_ret, SVC_RESTORE_NVIC_IRQS, nvic_iser_state);
+  }
+  else
+  {
+    NVIC->ISER[0] = nvic_iser_state | NVIC->ISER[0];
+  }
+}
+
+void SYS_PRIVIL_DisableIrqsAndRemainPriv(void)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    /* disable exceptions and after SVC keeps MODE Privileged! (stack goes back to PSP)*/
+    uint32_t dummy_ret = 0;
+    SYS_CRITICALSECTION_SvcCall(&dummy_ret, SVC_DISABLE_ALL_EXCEPTIONS);
+  }
+  else
+  {
+    __disable_irq();
+  }
+}
+
+void SYS_PRIVIL_EnableIrqsAndGoUnpriv(void)
+{
+  __enable_irq();
+#if defined (SECURE_UNPRIVILEGE_ENABLE) && (SECURE_UNPRIVILEGE_ENABLE == 1)
+  ThumbState_EnterUnprivilegedMode(); /* Goes always Unpriv */
+#elif !defined (SECURE_UNPRIVILEGE_ENABLE)
+#error SECURE_UNPRIVILEGE_ENABLE not defined
+#endif /* SECURE_UNPRIVILEGE_ENABLE */
+}
+
+void SYS_PRIVIL_NVIC_EnableIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_ENABLE_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_EnableIRQ(IRQn);
+  }
+}
+
+
+uint32_t SYS_PRIVIL_NVIC_GetEnableIRQ(IRQn_Type IRQn)
+{
+  uint32_t irqn_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_state, SVC_NVIC_GET_ENABLE_IRQ, IRQn);
+  }
+  else
+  {
+    irqn_state = __NVIC_GetEnableIRQ(IRQn);
+  }
+  return irqn_state;
+}
+
+
+void SYS_PRIVIL_NVIC_DisableIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_DISABLE_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_DisableIRQ(IRQn);
+  }
+}
+
+uint32_t SYS_PRIVIL_NVIC_GetPendingIRQ(IRQn_Type IRQn)
+{
+  uint32_t irqn_pending_state;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_pending_state, SVC_NVIC_GET_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    irqn_pending_state = __NVIC_GetPendingIRQ(IRQn);
+  }
+  return irqn_pending_state;
+}
+
+void SYS_PRIVIL_NVIC_SetPendingIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SET_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_SetPendingIRQ(IRQn);
+  }
+}
+
+void SYS_PRIVIL_NVIC_ClearPendingIRQ(IRQn_Type IRQn)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_CLEAR_PENDING_IRQ, IRQn);
+  }
+  else
+  {
+    __NVIC_ClearPendingIRQ(IRQn);
+  }
+}
+
+void SYS_PRIVIL_NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SET_PRIORITY, IRQn, priority);
+  }
+  else
+  {
+    __NVIC_SetPriority(IRQn, priority);
+  }
+}
+
+uint32_t SYS_PRIVIL_NVIC_GetPriority(IRQn_Type IRQn)
+{
+  uint32_t irqn_prio;
+
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    SYS_NVIC_SvcCall(&irqn_prio, SVC_NVIC_GET_PRIORITY, IRQn);
+  }
+  else
+  {
+    irqn_prio = __NVIC_GetPriority(IRQn);
+  }
+  return irqn_prio;
+}
+
+void SYS_PRIVIL_NVIC_SystemReset(void)
+{
+  if (ThumbState_IsUnprivileged() != 0)
+  {
+    uint32_t dummy_ret = 0;
+    SYS_NVIC_SvcCall(&dummy_ret, SVC_NVIC_SYSTEM_RESET);
+  }
+  else
+  {
+    __NVIC_SystemReset();
+  }
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/timer_if.c
new file mode 100644
index 00000000..6405002c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/timer_if.c
@@ -0,0 +1,545 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.c
+  * @author  MCD Application Team
+  * @brief   Configure RTC Alarm, Tick and Calendar manager
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
+#include "stm32_lpm.h"
+#include "utilities_def.h"
+#include "stm32wlxx_ll_rtc.h"
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief RTC handle
+  */
+extern RTC_HandleTypeDef hrtc;
+
+/**
+  * @brief Timer driver callbacks handler
+  */
+const UTIL_TIMER_Driver_s UTIL_TimerDriver =
+{
+  TIMER_IF_Init,
+  NULL,
+
+  TIMER_IF_StartTimer,
+  TIMER_IF_StopTimer,
+
+  TIMER_IF_SetTimerContext,
+  TIMER_IF_GetTimerContext,
+
+  TIMER_IF_GetTimerElapsedTime,
+  TIMER_IF_GetTimerValue,
+  TIMER_IF_GetMinimumTimeout,
+
+  TIMER_IF_Convert_ms2Tick,
+  TIMER_IF_Convert_Tick2ms,
+};
+
+/**
+  * @brief SysTime driver callbacks handler
+  */
+const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
+{
+  TIMER_IF_BkUp_Write_Seconds,
+  TIMER_IF_BkUp_Read_Seconds,
+  TIMER_IF_BkUp_Write_SubSeconds,
+  TIMER_IF_BkUp_Read_SubSeconds,
+  TIMER_IF_GetTime,
+};
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Minimum timeout delay of Alarm in ticks
+  */
+#define MIN_ALARM_DELAY    3
+
+/**
+  * @brief Backup seconds register
+  */
+#define RTC_BKP_SECONDS    RTC_BKP_DR0
+
+/**
+  * @brief Backup subseconds register
+  */
+#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
+
+/**
+  * @brief Backup msbticks register
+  */
+#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
+
+/* #define RTIF_DEBUG */
+
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifdef RTIF_DEBUG
+#include "sys_app.h" /*for app_log*/
+/**
+  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
+  */
+#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+#else
+/**
+  * @brief not used
+  */
+#define TIMER_IF_DBG_PRINTF(...)
+#endif /* RTIF_DEBUG */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Indicates if the RTC is already Initialized or not
+  */
+static bool RTC_Initialized = false;
+
+/**
+  * @brief RtcTimerContext
+  */
+static uint32_t RtcTimerContext = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Get rtc timer Value in rtc tick
+  * @return val the rtc timer value (upcounting)
+  */
+static inline uint32_t GetTimerTicks(void);
+
+/**
+  * @brief Writes MSBticks to backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @param[in] MSBticks
+  */
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
+
+/**
+  * @brief Reads MSBticks from backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @retval MSBticks
+  */
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+UTIL_TIMER_Status_t TIMER_IF_Init(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_Init */
+
+  /* USER CODE END TIMER_IF_Init */
+  if (RTC_Initialized == false)
+  {
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+    /*Init RTC*/
+    MX_RTC_Init();
+    /*Stop Timer */
+    TIMER_IF_StopTimer();
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
+    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
+    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
+    /*overload RTC feature enable*/
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+
+    /*Enable Direct Read of the calendar registers (not through Shadow) */
+    HAL_RTCEx_EnableBypassShadow(&hrtc);
+    /*Initialize MSB ticks*/
+    TIMER_IF_BkUp_Write_MSBticks(0);
+
+    TIMER_IF_SetTimerContext();
+
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
+    RTC_Initialized = true;
+  }
+
+  /* USER CODE BEGIN TIMER_IF_Init_Last */
+
+  /* USER CODE END TIMER_IF_Init_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StartTimer */
+
+  /* USER CODE END TIMER_IF_StartTimer */
+  RTC_AlarmTypeDef sAlarm = {0};
+  /*Stop timer if one is already started*/
+  TIMER_IF_StopTimer();
+  timeout += RtcTimerContext;
+
+  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
+  /* starts timer*/
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_B;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
+
+  /* USER CODE END TIMER_IF_StartTimer_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StopTimer */
+
+  /* USER CODE END TIMER_IF_StopTimer */
+  /* Clear RTC Alarm Flag */
+  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRBF);
+  /* Disable the Alarm A interrupt */
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B);
+  /*overload RTC feature enable*/
+  hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
+
+  /* USER CODE END TIMER_IF_StopTimer_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_SetTimerContext(void)
+{
+  /*store time context*/
+  RtcTimerContext = GetTimerTicks();
+
+  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
+
+  /* USER CODE END TIMER_IF_SetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerContext(void)
+{
+  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
+
+  /* USER CODE END TIMER_IF_GetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerElapsedTime(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetTimerValue(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
+
+  /* USER CODE END TIMER_IF_GetTimerValue */
+  if (RTC_Initialized == true)
+  {
+    ret = GetTimerTicks();
+  }
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetMinimumTimeout(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick */
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
+}
+
+void TIMER_IF_DelayMs(uint32_t delay)
+{
+  /* USER CODE BEGIN TIMER_IF_DelayMs */
+
+  /* USER CODE END TIMER_IF_DelayMs */
+  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
+  uint32_t timeout = GetTimerTicks();
+
+  /* Wait delay ms */
+  while (((GetTimerTicks() - timeout)) < delayTicks)
+  {
+    __NOP();
+  }
+  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
+
+  /* USER CODE END TIMER_IF_DelayMs_Last */
+}
+
+void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
+  {
+    /*Alarm A reserved for CM4: notify CM4 that Alarm A was raised */
+    com_obj = MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+    if (com_obj != NULL)
+    {
+      com_obj->MsgId = SYS_RTC_ALARM_MSG_ID;
+      com_obj->ParamCnt = 0;
+      MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+    }
+  }
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
+}
+
+void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
+
+  /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
+  UTIL_TIMER_IRQ_MAP_PROCESS();
+  /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
+
+  /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
+}
+
+void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback */
+  /*called every 48 days with 1024 ticks per seconds*/
+  TIMER_IF_DBG_PRINTF(">>Handler SSRUnderflow at %d\n\r", GetTimerTicks());
+  /*Increment MSBticks*/
+  uint32_t MSB_ticks = TIMER_IF_BkUp_Read_MSBticks();
+  TIMER_IF_BkUp_Write_MSBticks(MSB_ticks + 1);
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback_Last */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback_Last */
+}
+
+uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
+{
+  uint32_t seconds = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTime */
+
+  /* USER CODE END TIMER_IF_GetTime */
+  uint64_t ticks;
+  uint32_t timerValueLsb = GetTimerTicks();
+  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
+
+  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
+
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+
+  ticks = (uint32_t) ticks & RTC_PREDIV_S;
+
+  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
+
+  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
+}
+
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
+}
+
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
+}
+
+uint32_t TIMER_IF_BkUp_Read_Seconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_MSBTICKS, MSBticks);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks_Last */
+}
+
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
+  uint32_t MSBticks;
+  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
+  return MSBticks;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
+}
+
+static inline uint32_t GetTimerTicks(void)
+{
+  /* USER CODE BEGIN GetTimerTicks */
+
+  /* USER CODE END GetTimerTicks */
+  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
+  /* USER CODE BEGIN GetTimerTicks_Last */
+
+  /* USER CODE END GetTimerTicks_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.c
new file mode 100644
index 00000000..b2d71dce
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.c
@@ -0,0 +1,62 @@
+/* USER CODE BEGIN Header */
+/**
+ ******************************************************************************
+  * File Name          : app_kms.c
+  * Description        : This file provides code for the configuration
+  *                      of the kms instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_kms.h"
+#include "tkms.h"
+
+/* USER CODE BEGIN 0 */
+/* USER CODE END 0 */
+
+/* USER CODE BEGIN 1 */
+/* USER CODE END 1 */
+
+/* Global variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN 2 */
+/* USER CODE END 2 */
+
+/* KMS init function */
+void MX_KMS_Init(void)
+{
+/***************************************/
+   /**
+  */
+
+  C_Initialize(NULL);
+
+  /* USER CODE BEGIN 3 */
+  /* USER CODE END 3 */
+
+}
+
+/* USER CODE BEGIN 4 */
+/* USER CODE END 4 */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.h
new file mode 100644
index 00000000..8ca7171b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.h
@@ -0,0 +1,57 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * File Name          : app_kms.h
+  * Description        : This file provides code for the configuration
+  *                      of the kms instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __app_kms_H
+#define __app_kms_H
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN 0 */
+/* USER CODE END 0 */
+
+/* Global variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN 1 */
+/* USER CODE END 1 */
+
+/* KMS init function */
+void MX_KMS_Init(void);
+
+/* USER CODE BEGIN 2 */
+/* USER CODE END 2 */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /*__kms_H */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c
new file mode 100644
index 00000000..30d2715f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c
@@ -0,0 +1,153 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    features_info.c
+  * @author  MCD Application Team
+  * @brief   CM0PLUS supported features list
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stddef.h>
+#include <stdint.h>
+#include "features_info.h"
+#include "sigfox_info.h"
+#include "sigfox_version.h"
+#include "sgfx_app_version.h"
+#include "subghz_phy_version.h"
+#include "stm32_mem.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Feature info table
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") FEAT_INFO_Param_t Feat_Info_Table[] =
+{
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_SYSTEM_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size =  0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  /* {
+    .Feat_Info_Feature_Id =   FEAT_INFO_KMS_ID,
+    .Feat_Info_Feature_Version = FEAT_INFO_KMS_VER,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr=  (void *) NULL
+  }, */
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_SIGFOX_ID,
+    .Feat_Info_Feature_Version = __SIGFOX_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_TRACE_ID,
+    .Feat_Info_Feature_Version = __CM0_APP_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+  {
+    .Feat_Info_Feature_Id =   FEAT_INFO_RADIO_ID,
+    .Feat_Info_Feature_Version = __SUBGHZ_PHY_VERSION,
+    .Feat_Info_Config_Size = 0,
+    .Feat_Info_Config_Ptr = (void *) NULL
+  },
+};
+
+/**
+  * @brief Feature info container
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") FEAT_INFO_List_t Feat_Info_List =
+{
+  .Feat_Info_Cnt =  sizeof(Feat_Info_Table) / sizeof(FEAT_INFO_Param_t),
+  .Feat_Info_TableAddress =  Feat_Info_Table,
+};
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void FEAT_INFO_Init(void)
+{
+  /* USER CODE BEGIN FEAT_INFO_Init_1 */
+
+  /* USER CODE END FEAT_INFO_Init_1 */
+
+  /* Set Sigfox Info_Config */
+  SigfoxInfo_Init();
+  /* USER CODE BEGIN FEAT_INFO_Init_2 */
+
+  /* USER CODE END FEAT_INFO_Init_2 */
+}
+
+FEAT_INFO_List_t *FEAT_INFO_GetListPtr(void)
+{
+  /* USER CODE BEGIN FEAT_INFO_GetListPtr_1 */
+
+  /* USER CODE END FEAT_INFO_GetListPtr_1 */
+  return (FEAT_INFO_List_t *) &Feat_Info_List;
+  /* USER CODE BEGIN FEAT_INFO_GetListPtr_2 */
+
+  /* USER CODE END FEAT_INFO_GetListPtr_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c
new file mode 100644
index 00000000..70087950
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c
@@ -0,0 +1,439 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.c
+  * @author  MCD Application Team
+  * @brief   Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "assert.h"
+#include "stddef.h"
+#include "stm32_mem.h"
+#include "ipcc_if.h"
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MB_CHANNEL_NOT_REGISTERED 0xFF
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
+static void MBMUX_IsrNotRegistered(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
+{
+  /* USER CODE BEGIN MBMUX_Init_1 */
+
+  /* USER CODE END MBMUX_Init_1 */
+  uint8_t i;
+  IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
+
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
+
+  for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
+  {
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+  }
+  /* USER CODE BEGIN MBMUX_Init_Last */
+
+  /* USER CODE END MBMUX_Init_Last */
+}
+
+int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
+{
+  uint8_t channel_idx;
+  int8_t ret = -1;
+  uint8_t check_existing_feature_registration;
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_1 */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_1 */
+
+  check_existing_feature_registration = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  if (check_existing_feature_registration != MB_CHANNEL_NOT_REGISTERED)
+  {
+    /* channel has been registered by CM4 registered */
+    channel_idx = check_existing_feature_registration;
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
+    {
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
+    }
+  }
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_Last */
+  return ret;
+}
+
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
+
+  /* USER CODE END MBMUX_UnregisterFeature_1 */
+  uint8_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  if (mb_ch < IPCC_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
+      IPCC_IF_ResponseSnd(mb_ch);
+
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    }
+    else
+    {
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    }
+  }
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
+
+  /* USER CODE END MBMUX_UnregisterFeature_Last */
+}
+
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_1 */
+  uint32_t channel_idx;
+  MBMUX_ComParam_t *com_param_ptr = NULL;
+
+  channel_idx = MBMUX_GetFeatureChIdx(e_featID, ComType);
+  if (channel_idx < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBCmdRespParam[channel_idx];
+    }
+    else
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBNotifAckParam[channel_idx];
+    }
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_Last */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_Last */
+}
+
+int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
+
+  /* USER CODE END MBMUX_NotificationSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
+  if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
+  {
+    Error_Handler();
+  }
+  return IPCC_IF_NotificationSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
+
+  /* USER CODE END MBMUX_NotificationSnd_Last */
+}
+
+uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
+
+  /* USER CODE END MBMUX_ResponseSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_CMD_RESP);
+  return IPCC_IF_ResponseSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_ResponseSnd_Last */
+
+  /* USER CODE END MBMUX_ResponseSnd_Last */
+}
+
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* First check is only sufficient to avoid SW attacks (pBufferAddress out of range) */
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_2 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_2 */
+
+  /* Double Check to avoid basic fault injection by "HW" (e.g. power glitched) */
+  /* fault injection might lead to "jump" the check inside the MBMUX_SEC_VerifySramBuffer function */
+  /* which would validate an out-of-range buffer pointer */
+  /* note: below "if statement" is dummy: it is used to avoid the compiler to remove the second call*/
+  if ((pbuf_validated == pBufferAddress) || (pbuf_validated == NULL))
+  {
+    /* Calling twice the function reduce exponentially the HW fault injection attacks */
+    pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
+
+static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrCommandRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
+  /* call registered callback */
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
+  return;
+}
+
+static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
+  /* call registered callback */
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
+  return;
+}
+
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_1 */
+  return p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType];
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_Last */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_Last */
+}
+
+static void MBMUX_IsrNotRegistered(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_1 */
+  Error_Handler();
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h
new file mode 100644
index 00000000..a938e544
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.h
+  * @author  MCD Application Team
+  * @brief   API which interfaces CM0PLUS to IPCC
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_CM0PLUS_H__
+#define __MBMUX_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
+int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
+
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUX_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
new file mode 100644
index 00000000..fe5fd070
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -0,0 +1,217 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.c
+  * @author  MCD Application Team
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_radio.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "radio_mbwrapper.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *RadioComObj;
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
+static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
+static void MBMUXIF_TaskRadioNotifSnd(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_RadioInit(void)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_1 */
+
+  /* USER CODE END MBMUXIF_RadioInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrRadioAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP, MBMUXIF_IsrRadioCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskRadioCmdRcv);
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioNotifSnd), UTIL_SEQ_RFU, MBMUXIF_TaskRadioNotifSnd);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_Last */
+
+  /* USER CODE END MBMUXIF_RadioInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_RadioSendNotif(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendNotif_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioNotifSnd), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_RadioSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendNotif_Last */
+}
+
+void MBMUXIF_RadioSendResp(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendResp_1 */
+  if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendResp_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbRadioAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_1 */
+  RadioComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioCmdRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_Last*/
+
+  /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
+}
+
+static void MBMUXIF_TaskRadioCmdRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioCmdRcv_1 */
+  Process_Radio_Cmd(RadioComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
+}
+
+static void MBMUXIF_TaskRadioNotifSnd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifSnd_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_RADIO_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbRadioAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifSnd_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
new file mode 100644
index 00000000..7e226c6c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -0,0 +1,93 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_RADIO_CM0PLUS_H__
+#define __MBMUXIF_RADIO_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
+void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
+void MBMUXIF_RadioSendResp(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_RADIO_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c
new file mode 100644
index 00000000..c68a5481
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c
@@ -0,0 +1,213 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sigfox.c
+  * @author  MCD Application Team
+  * @brief   allows CM0PLUS application to register and handle Sigfox to MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_sigfox.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "sigfox_mbwrapper.h"
+#include "utilities_def.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *SigfoxComObj;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  Sigfox acknowledge callbacks: set event to release waiting task
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
+static void MBMUXIF_IsrSigfoxAckRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox command callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
+static void MBMUXIF_IsrSigfoxCmdRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox task to process the command
+  */
+static void MBMUXIF_TaskSigfoxCmdRcv(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_SigfoxInit(void)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_SigfoxInit_1 */
+
+  /* USER CODE END MBMUXIF_SigfoxInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SIGFOX_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSigfoxAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SIGFOX_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSigfoxCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSigfoxCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSigfoxCmdRcv);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SigfoxInit_Last */
+
+  /* USER CODE END MBMUXIF_SigfoxInit_Last */
+
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetSigfoxFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_SIGFOX_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetSigfoxFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_SigfoxSendNotif(void)
+{
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_SigfoxSendNotif_1 */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSigfoxNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_SigfoxSendNotif_Last */
+}
+
+void MBMUXIF_SigfoxSendNotifTask(void)
+{
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendNotifTask_1 */
+
+  /* USER CODE END MBMUXIF_SigfoxSendNotifTask_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_SIGFOX_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSigfoxAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendNotifTask_Last */
+
+  /* USER CODE END MBMUXIF_SigfoxSendNotifTask_Last */
+}
+
+void MBMUXIF_SigfoxSendResp(void)
+{
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendResp_1 */
+
+  /* USER CODE END MBMUXIF_SigfoxSendResp_1 */
+  if (MBMUX_ResponseSnd(FEAT_INFO_SIGFOX_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendResp_Last */
+
+  /* USER CODE END MBMUXIF_SigfoxSendResp_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+
+static void MBMUXIF_IsrSigfoxAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSigfoxAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSigfoxAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSigfoxAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrSigfoxAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSigfoxAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSigfoxCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSigfoxCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSigfoxCmdRcvCb_1 */
+  SigfoxComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSigfoxCmdRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrSigfoxCmdRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSigfoxCmdRcvCb_Last */
+}
+
+static void MBMUXIF_TaskSigfoxCmdRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskSigfoxCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskSigfoxCmdRcv_1 */
+  Process_Sigfox_Cmd(SigfoxComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskSigfoxCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskSigfoxCmdRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h
new file mode 100644
index 00000000..9aac213b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h
@@ -0,0 +1,92 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sigfox.h
+  * @author  MCD Application Team
+  * @brief   API provided to CM0 application to register and handle Sigfox to MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_SIGFOX_CM0PLUS_H__
+#define __MBMUXIF_SIGFOX_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS; -3: callback error on CM0PLUS
+  */
+int8_t MBMUXIF_SigfoxInit(void);
+/**
+  * @brief   gives back the pointer to the com buffer associated to Sigfox feature Notif
+  * @return  pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureNotifComPtr(void);
+
+/**
+  * @brief   Set a Task to prevent being blocked on ISR
+  */
+void MBMUXIF_SigfoxSendNotif(void);
+
+/**
+  * @brief   Sends a Sigfox-Notif via Ipcc and Wait for the Ack
+  */
+void MBMUXIF_SigfoxSendNotifTask(void);
+
+/**
+  * @brief   Sends a Sigfox-Resp  via Ipcc without waiting for the response
+  */
+void MBMUXIF_SigfoxSendResp(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_SIGFOX_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
new file mode 100644
index 00000000..942a5042
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -0,0 +1,443 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.c
+  * @author  MCD Application Team
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_sys.h"
+#include "stm32_seq.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_sigfox.h"
+#include "mbmuxif_radio.h"
+#include "features_info.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *pMb_RefTable;  /* SRAM1_BASE + IPCCDBA<<4*/
+static MBMUX_ComParam_t *SystemComObj;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
+static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_SystemInit(void)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
+
+  /* USER CODE END MBMUXIF_SystemInit_1 */
+
+  /*Read FLASH IPCC data buffer base address based on (IPCCDBA << 4) + SRAM1_BASE*/
+  FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+  pMb_RefTable = (MBMUX_ComTable_t *) OptionsBytesStruct.IPCCdataBufAddr;
+
+  /* prevents Cm0 to go further, during boot after PWR_CR4_C2BOOT is set by Cm4*/
+  /* it allows Cm0 debugging step by step the MBMUXIF_SystemInit */
+  while (pMb_RefTable->SynchronizeCpusAtBoot == CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
+
+  MBMUX_Init(pMb_RefTable);
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemAckRcvCb);
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemCmdRcvCb);
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemCmdRcv);
+    ret = 0;
+  }
+
+  if (ret >= 0)
+  {
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
+    /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
+    while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
+    pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
+
+  /* USER CODE END MBMUXIF_SystemInit_Last */
+  return ret;
+}
+
+uint16_t MBMUXIF_GetCpusSynchroFlag(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
+
+  /* USER CODE END MBMUXIF_GetCpusSynchroFlag */
+  return pMb_RefTable->SynchronizeCpusAtBoot;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureNotifComPtr_Last */
+  return com_param_ptr;
+}
+
+void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_1 */
+  if (MBMUX_NotificationSnd(SystemPrioFeat) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_Last */
+}
+
+void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
+  if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
+}
+
+void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
+  if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendResp_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Exported services --------------------------------------------------------*/
+int16_t MBMUXIF_ChipRevId(void)
+{
+  int16_t ret = pMb_RefTable->ChipRevId;
+  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+
+  /* USER CODE END MBMUXIF_ChipRevId */
+  return ret ;
+}
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
+{
+  SystemComObj = (MBMUX_ComParam_t *) ComObj;
+  uint32_t *com_buffer = SystemComObj->ParamBuf;
+  uint32_t status;
+
+  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
+
+  /* process Command on Isr or schedule a task*/
+  switch (SystemComObj->MsgId)
+  {
+    case SYS_GET_INFO_LIST_MSG_ID:
+      SystemComObj->ReturnVal = (uint32_t) FEAT_INFO_GetListPtr();
+      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+      break;
+
+    case SYS_EE_READ_ID:
+      status = (uint32_t) EE_ReadValue((e_EE_ID) com_buffer[0], (uint32_t *) com_buffer[1]);
+      /* prepare response buffer */
+      SystemComObj->ParamCnt = 1; /* reset ParamCnt */
+      SystemComObj->ReturnVal = status;
+      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+      break;
+
+    case SYS_EE_WRITE_ID:
+      status = (uint32_t)EE_WriteValue((e_EE_ID) com_buffer[0], (uint32_t) com_buffer[1]);
+      /* prepare response buffer */
+      SystemComObj->ParamCnt = 1; /* reset ParamCnt */
+      SystemComObj->ReturnVal = status;
+      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+      break;
+
+    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
+
+    default:
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
+      break;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
+
+}
+
+static void MBMUXIF_TaskSystemCmdRcv(void)
+{
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
+  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
+  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
+
+}
+
+static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
+}
+
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
+{
+  int8_t ret = -2; /* feature not supported */
+
+  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  APP_LOG(TS_OFF, VLEVEL_L, "\r\n");
+
+  switch (pBuf[0])
+  {
+    case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioAAckRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_CMD_PRIO_B_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_B_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioBCmdRcvCb);
+      break;
+
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID:
+      ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioBAckRcvCb);
+      break;
+
+    case FEAT_INFO_KMS_ID:
+      /* ret = MBMUXIF_KmsInit(); */
+      /* APP_LOG(TS_OFF, VLEVEL_L, " * CM0 : Kms registration done\r\n"); */
+      break;
+
+    case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
+      ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
+      break;
+
+    case FEAT_INFO_RADIO_ID:
+      ret = MBMUXIF_RadioInit();
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Radio registration done\r\n");
+      break;
+
+    case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora not supported\r\n");
+      break;
+
+    case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
+      ret = MBMUXIF_SigfoxInit();
+      APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox registration done\r\n");
+      break;
+
+    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+
+    default:
+      break;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+
+  return ret;
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
new file mode 100644
index 00000000..f780cdde
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_SYS_CM0PLUS_H__
+#define __MBMUXIF_SYS_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
+uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
+int16_t MBMUXIF_ChipRevId(void);
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_SYS_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
new file mode 100644
index 00000000..05704d23
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -0,0 +1,237 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.c
+  * @author  MCD Application Team
+  * @brief   Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_trace.h"
+#include "mbmux.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "stm32_seq.h"
+#include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
+static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private typedef -----------------------------------------------------------*/
+const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
+{
+  MBMUXIF_TraceBufferInit,
+  NULL,
+  NULL,
+  MBMUXIF_TraceBufferSend,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
+{
+  int8_t ret;
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceInit_1 */
+
+  ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
+    /*Initialize the terminal */
+    UTIL_ADV_TRACE_Init();
+    UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
+
+    /*Set verbose LEVEL*/
+    UTIL_ADV_TRACE_SetVerboseLevel(verboseLevel);
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
+}
+
+void MBMUXIF_TraceSendNotif_NoWait(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
+
+  /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
+  if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
+
+  /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Exported services --------------------------------------------------------*/
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
+{
+  /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceBufferInit_1 */
+  TraceUtilCpltCallback = cb;
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN MBMUXIF_TraceBufferInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceBufferInit_Last */
+}
+
+static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
+
+  /* USER CODE END MBMUXIF_TraceBufferSend_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
+
+  /* notify CM4 that CM0PLUS is initialized */
+  com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
+  if (com_obj != NULL)
+  {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
+    com_obj->MsgId = TRACE_SEND_MSG_ID;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
+    com_obj->ParamCnt = 2;
+    MBMUXIF_TraceSendNotif_NoWait();
+  }
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN MBMUXIF_TraceBufferSend_Last */
+
+  /* USER CODE END MBMUXIF_TraceBufferSend_Last */
+}
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
+}
+
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
new file mode 100644
index 00000000..8aad9276
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -0,0 +1,85 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.h
+  * @author  MCD Application Team
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_TRACE_CM0PLUS_H__
+#define __MBMUXIF_TRACE_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
+int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
+void MBMUXIF_TraceSendNotif_NoWait(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_TRACE_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
new file mode 100644
index 00000000..063d379e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -0,0 +1,510 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "radio_mbwrapper.h"
+#include "main.h"
+#include "stm32_mem.h"
+#include "mbmux_table.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_radio.h"
+#include "sys_app.h"
+
+#include "radio.h"
+#include "radio_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/**
+  * @brief local structure of radio callbacks for command processes
+  */
+static  RadioEvents_t radioevents_mbwrapper;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/*!
+ * \brief  Tx Done callback prototype.
+ */
+static void RadioTxDone_mbwrapper(void);
+
+/*!
+ * \brief  Tx Timeout callback prototype.
+ */
+static void RadioTxTimeout_mbwrapper(void);
+
+/*!
+ * \brief Rx Done callback prototype.
+ *
+ * \param[in] payload Received buffer pointer
+ * \param[in] size    Received buffer size
+ * \param[in] rssi    RSSI value computed while receiving the frame [dBm]
+ * \param[in] snr     Raw SNR value given by the radio hardware
+ *                     FSK : N/A ( set to 0 )
+ *                     LoRa: SNR value in dB
+ */
+static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
+
+/*!
+ * \brief  Rx Timeout callback prototype.
+ */
+static void RadioRxTimeout_mbwrapper(void);
+
+/*!
+ * \brief Rx Error callback prototype.
+ */
+static void RadioRxError_mbwrapper(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Radio_Cmd_1 */
+
+  /* USER CODE END Process_Radio_Cmd_1 */
+  uint32_t *com_buffer = NULL;
+  uint32_t ret_uint;
+  int32_t ret_int;
+  RadioState_t status;
+
+  APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case RADIO_INIT_ID:
+      radioevents_mbwrapper.TxDone = &RadioTxDone_mbwrapper;
+      radioevents_mbwrapper.TxTimeout = &RadioTxTimeout_mbwrapper;
+      radioevents_mbwrapper.RxDone = &RadioRxDone_mbwrapper;
+      radioevents_mbwrapper.RxTimeout = &RadioRxTimeout_mbwrapper;
+      radioevents_mbwrapper.RxError = &RadioRxError_mbwrapper;
+
+      Radio.Init(&radioevents_mbwrapper);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_GET_STATUS_ID:
+      status = Radio.GetStatus();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status; /* */
+      break;
+
+    case RADIO_SET_MODEM_ID:
+      Radio.SetModem((RadioModems_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_CHANNEL_ID:
+      Radio.SetChannel((uint32_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_IS_CHANNEL_FREE_ID:
+      ret_uint = Radio.IsChannelFree(com_buffer[0], com_buffer[1], (int16_t) com_buffer[2], com_buffer[3]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_RANDOM_ID:
+      ret_uint = Radio.Random();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_SET_RX_CONFIG_ID:
+      Radio.SetRxConfig((RadioModems_t) com_buffer[0],  com_buffer[1],
+                        com_buffer[2], (uint8_t) com_buffer[3],
+                        com_buffer[4], (uint16_t) com_buffer[5],
+                        (uint16_t) com_buffer[6], (bool) com_buffer[7],
+                        (uint8_t) com_buffer[8],
+                        (bool) com_buffer[9], (bool) com_buffer[10], (uint8_t) com_buffer[11],
+                        (bool) com_buffer[12], (bool) com_buffer[13]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_TX_CONFIG_ID:
+      Radio.SetTxConfig((RadioModems_t) com_buffer[0], (int8_t) com_buffer[1],
+                        com_buffer[2], com_buffer[3],  com_buffer[4],
+                        (uint8_t) com_buffer[5], (uint16_t) com_buffer[6],
+                        (bool) com_buffer[7], (bool) com_buffer[8], (bool) com_buffer[9],
+                        (uint8_t) com_buffer[10], (bool) com_buffer[11],  com_buffer[12]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_CHECK_RF_FREQUENCY_ID:
+      ret_uint = Radio.CheckRfFrequency(com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_GET_TIME_ON_AIR_ID:
+      ret_uint = Radio.TimeOnAir((RadioModems_t) com_buffer[0], (uint32_t) com_buffer[1],
+                                 (uint32_t) com_buffer[2], (uint8_t) com_buffer[3],
+                                 (uint16_t) com_buffer[4], (bool) com_buffer[5],
+                                 (uint8_t) com_buffer[6], (bool) com_buffer[7]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_SEND_ID:
+      Radio.Send((uint8_t *) com_buffer[0], (uint8_t) com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SLEEP_ID:
+      Radio.Sleep();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_STANDBY_ID:
+      Radio.Standby();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_RX_ID:
+      Radio.Rx(com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_START_CAD_ID:
+      Radio.StartCad();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_TX_CONTINUOUS_WAVE_ID:
+      Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_RSSI_ID:
+      ret_int =  Radio.Rssi((RadioModems_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_int; /* */
+      break;
+
+    case RADIO_WRITE_ID:
+      Radio.Write((uint16_t) com_buffer[0], (uint8_t) com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_READ_ID:
+      ret_uint = Radio.Read((uint16_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_WRITE_BUFFER_ID:
+      Radio.WriteRegisters((uint16_t) com_buffer[0], (uint8_t *) com_buffer[1], (uint8_t) com_buffer[2]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_READ_BUFFER_ID:
+      Radio.ReadRegisters((uint16_t) com_buffer[0], (uint8_t *) com_buffer[1], (uint8_t) com_buffer[2]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_MAX_PAYLOAD_LENGTH_ID:
+      Radio.SetMaxPayloadLength((RadioModems_t) com_buffer[0], (uint8_t) com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_PUBLIC_NETWORK_ID:
+      Radio.SetPublicNetwork((bool) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_GET_WAKEUP_TIME_ID:
+      ret_uint = Radio.GetWakeupTime();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_IRQ_PROCESS_ID:
+      Radio.IrqProcess();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_RX_BOOSTED_ID:
+      Radio.RxBoosted(com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_RX_DUTY_CYCLE_ID:
+      Radio.SetRxDutyCycle(com_buffer[0], com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_TX_CW_ID:
+      Radio.TxCw((int8_t)com_buffer[0]);
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_TX_PRBS_ID:
+      Radio.TxPrbs();
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    case RADIO_SET_RX_GENERIC_CONFIG_ID:
+      ret_uint = Radio.RadioSetRxGenericConfig((GenericModems_t) com_buffer[0], (RxConfigGeneric_t *)com_buffer[1], com_buffer[2], com_buffer[3]);
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    case RADIO_SET_TX_GENERIC_CONFIG_ID:
+      ret_uint = Radio.RadioSetTxGenericConfig((GenericModems_t) com_buffer[0], (TxConfigGeneric_t *)com_buffer[1], (int8_t) com_buffer[2], (uint32_t) com_buffer[3]);
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) ret_uint; /* */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_H, "<CM0PLUS(Radio)\r\n");
+  MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID);
+  /* USER CODE BEGIN Process_Radio_Cmd_2 */
+
+  /* USER CODE END Process_Radio_Cmd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void RadioTxDone_mbwrapper(void)
+{
+  /* USER CODE BEGIN RadioTxDone_mbwrapper_1 */
+
+  /* USER CODE END RadioTxDone_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_TX_DONE_CB_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioTxDone_mbwrapper_2 */
+
+  /* USER CODE END RadioTxDone_mbwrapper_2 */
+}
+
+static void RadioTxTimeout_mbwrapper(void)
+{
+  /* USER CODE BEGIN RadioTxTimeout_mbwrapper_1 */
+
+  /* USER CODE END RadioTxTimeout_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_TX_TIMEOUT_CB_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioTxTimeout_mbwrapper_2 */
+
+  /* USER CODE END RadioTxTimeout_mbwrapper_2 */
+}
+
+static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
+{
+  /* USER CODE BEGIN RadioRxDone_mbwrapper_1 */
+
+  /* USER CODE END RadioRxDone_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL ;
+  uint16_t i = 0;
+
+  /* copy data from Cm0 private memory to shared memory */
+  if (payload != NULL)
+  {
+    UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  }
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_RX_DONE_CB_ID;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (payload == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  }
+  com_buffer[i++] = (uint32_t) size;
+  com_buffer[i++] = (uint32_t) rssi;
+  com_buffer[i++] = (uint32_t) snr;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
+     this might be requested just if the buffer should be processed by the application and the stack */
+  /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
+  return;
+  /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
+
+  /* USER CODE END RadioRxDone_mbwrapper_2 */
+}
+
+static void RadioRxTimeout_mbwrapper(void)
+{
+  /* USER CODE BEGIN RadioRxTimeout_mbwrapper_1 */
+
+  /* USER CODE END RadioRxTimeout_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_RX_TIMEOUT_CB_ID;
+  com_obj->ParamCnt = 0;
+
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioRxTimeout_mbwrapper_2 */
+
+  /* USER CODE END RadioRxTimeout_mbwrapper_2 */
+}
+
+static void RadioRxError_mbwrapper(void)
+{
+  /* USER CODE BEGIN RadioRxError_mbwrapper_1 */
+
+  /* USER CODE END RadioRxError_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
+  com_obj->MsgId = RADIO_RX_ERROR_CB_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioRxError_mbwrapper_2 */
+
+  /* USER CODE END RadioRxError_mbwrapper_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
new file mode 100644
index 00000000..ac6a70d3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0PLUS side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
+#define __RADIO_MBWRAPPER_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
+void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__RADIO_MBWRAPPER_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_info.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_info.c
new file mode 100644
index 00000000..8629b1bf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_info.c
@@ -0,0 +1,157 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sigfox_info.c
+  * @author  MCD Application Team
+  * @brief   To give info to the application about Sigfox configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sigfox_info.h"
+#include "features_info.h"
+#include "main.h"
+#include "stm32_mem.h"
+#include "sigfox_types.h"
+#include "sigfox_monarch_api.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") SigfoxInfo_t SigfoxInfoTable;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief initialize the SigfoxInfo capabilities table
+  */
+static void StoreValueInFeatureListTable(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void SigfoxInfo_Init(void)
+{
+  /* USER CODE BEGIN SigfoxInfo_Init_1 */
+
+  /* USER CODE END SigfoxInfo_Init_1 */
+  SigfoxInfoTable.Region |= (1 << SFX_BITFIELD_SHIFT_RC1) ;
+  SigfoxInfoTable.Region |= (1 << SFX_BITFIELD_SHIFT_RC2) ;
+  SigfoxInfoTable.Region |= (1 << SFX_BITFIELD_SHIFT_RC3) ;
+  SigfoxInfoTable.Region |= (1 << SFX_BITFIELD_SHIFT_RC4) ;
+  SigfoxInfoTable.Region |= (1 << SFX_BITFIELD_SHIFT_RC5) ;
+  SigfoxInfoTable.Region |= (1 << SFX_BITFIELD_SHIFT_RC6) ;
+  SigfoxInfoTable.Region |= (1 << SFX_BITFIELD_SHIFT_RC7) ;
+
+  /* For DualCore */
+  StoreValueInFeatureListTable();
+  return;
+  /* USER CODE BEGIN SigfoxInfo_Init_2 */
+
+  /* USER CODE END SigfoxInfo_Init_2 */
+}
+
+SigfoxInfo_t *SigfoxInfo_GetPtr(void)
+{
+  /* USER CODE BEGIN SigfoxInfo_GetPtr_1 */
+
+  /* USER CODE END SigfoxInfo_GetPtr_1 */
+  return &SigfoxInfoTable;
+  /* USER CODE BEGIN SigfoxInfo_GetPtr_2 */
+
+  /* USER CODE END SigfoxInfo_GetPtr_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void StoreValueInFeatureListTable(void)
+{
+  /* USER CODE BEGIN StoreValueInFeatureListTable_1 */
+
+  /* USER CODE END StoreValueInFeatureListTable_1 */
+  FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
+  FEAT_INFO_Param_t  *p_feature;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  uint8_t found = 0;
+
+  p_MBMUX_Cm0plusFeatureList = FEAT_INFO_GetListPtr();
+
+  if (p_MBMUX_Cm0plusFeatureList != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_MBMUX_Cm0plusFeatureList->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      p_feature = i + p_MBMUX_Cm0plusFeatureList->Feat_Info_TableAddress;
+      if (p_feature->Feat_Info_Feature_Id == FEAT_INFO_SIGFOX_ID)
+      {
+        found = 1;
+        break;
+      }
+    }
+  }
+
+  if (found)
+  {
+    p_feature->Feat_Info_Config_Size = sizeof(SigfoxInfo_t) / sizeof(uint32_t);
+    p_feature->Feat_Info_Config_Ptr = &SigfoxInfoTable;
+  }
+  else
+  {
+    Error_Handler();
+  }
+
+  return;
+  /* USER CODE BEGIN StoreValueInFeatureListTable_2 */
+
+  /* USER CODE END StoreValueInFeatureListTable_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c
new file mode 100644
index 00000000..976269c7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c
@@ -0,0 +1,375 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sigfox_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0 side wrapper of the sigfoxMac interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sigfox_mbwrapper.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "mbmux_table.h"
+#include "msg_id.h"
+#include "mbmux.h"
+#include "mbmuxif_sigfox.h"
+#include "sys_app.h"
+#include "st_sigfox_api.h"
+#include "sigfox_monarch_api.h"
+#include "sigfox_info.h"
+#include "utilities_def.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define SIZE_CONF_WORDS 3
+#define SGFX_MAX_PAYLOAD_SIZE 12
+#define SGFX_DWNL_SIZE 8
+
+#define SIGFOX_MBWRAP_SHBUF_SIZE        SGFX_MAX_PAYLOAD_SIZE*sizeof(sfx_u8)
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aSigfoxMbWrapShare2Buffer[SIGFOX_MBWRAP_SHBUF_SIZE];
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/*!
+  * @brief This is the function that will be called by the Sigfox Library when the scan is completed
+  * @param[out] rc_bit_mask  rc  Value of the RC found. There could be only 1 RC or 0 ( not found )
+  * @param[out] rssi         RSSI value of the RC found. if rc = 0, rssi is not valid ( is set to 0 too )
+  */
+static sfx_u8 app_monarch_rcscan_wrapper(sfx_u8 rc_bit_mask, sfx_s16 rssi);
+
+/**
+  * @brief  rf test mode call back starting a while wait loop
+  */
+static void sfx_monarch_test_mode_wait_start_cb(void);
+
+/**
+  * @brief  rf test mode call back exiting a while wait loop
+  */
+static void sfx_monarch_test_mode_wait_end_cb(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Sigfox_Cmd_1 */
+
+  /* USER CODE END Process_Sigfox_Cmd_1 */
+  uint32_t *com_buffer = NULL;
+  sfx_u32 config_words[SIZE_CONF_WORDS];
+  sfx_u8 frame_ul[SGFX_MAX_PAYLOAD_SIZE];
+  sfx_u8 frame_dwnl[SGFX_DWNL_SIZE];
+
+  sfx_error_t status;
+
+  /* init */
+
+  APP_LOG(TS_ON, VLEVEL_H, " * CM0PLUS Sigfox command received\n\r");
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    case SIGFOX_START_ID:
+      status = SIGFOX_API_open((sfx_rc_t *)com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_STOP_ID:
+      status = SIGFOX_API_close();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_SEND_FRAME_DWNL_ID:
+      UTIL_MEM_cpy_8((uint8_t *)frame_ul, (uint8_t *)com_buffer[0], SGFX_MAX_PAYLOAD_SIZE * sizeof(sfx_u8));
+      UTIL_MEM_cpy_8((uint8_t *)frame_dwnl, (uint8_t *)com_buffer[2], SGFX_DWNL_SIZE * sizeof(sfx_u8));
+
+      status = SIGFOX_API_send_frame((sfx_u8 *)frame_ul, (sfx_u8)com_buffer[1], (sfx_u8 *)frame_dwnl, (sfx_u8)com_buffer[3], (sfx_bool)com_buffer[4]);
+
+      UTIL_MEM_cpy_8((uint8_t *)com_buffer[0], (uint8_t *)frame_ul, SGFX_MAX_PAYLOAD_SIZE * sizeof(sfx_u8));
+      UTIL_MEM_cpy_8((uint8_t *)com_buffer[2], (uint8_t *)frame_dwnl, SGFX_DWNL_SIZE * sizeof(sfx_u8));
+
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_SEND_BIT_ID:
+      UTIL_MEM_cpy_8((uint8_t *)frame_dwnl, (uint8_t *)com_buffer[1], SGFX_DWNL_SIZE * sizeof(sfx_u8));
+
+      status = SIGFOX_API_send_bit((sfx_bool)com_buffer[0], (sfx_u8 *)frame_dwnl, (sfx_u8)com_buffer[2], (sfx_bool)com_buffer[3]);
+
+      UTIL_MEM_cpy_8((uint8_t *)com_buffer[1], (uint8_t *)frame_dwnl, SGFX_DWNL_SIZE * sizeof(sfx_u8));
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_SEND_OOB_ID:
+      status =  SIGFOX_API_send_outofband((sfx_oob_enum_t) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_SET_STD_ID:
+      UTIL_MEM_cpy_8((uint8_t *)config_words, (uint8_t *)com_buffer[0], SIZE_CONF_WORDS * sizeof(sfx_u32));
+
+      status = SIGFOX_API_set_std_config(config_words, (sfx_bool) com_buffer[1]);
+
+      UTIL_MEM_cpy_8((uint8_t *)com_buffer[0], (uint8_t *)config_words, SIZE_CONF_WORDS * sizeof(sfx_u32));
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_START_CONTINUOUS_ID:
+      status = SIGFOX_API_start_continuous_transmission((sfx_u32)com_buffer[0], (sfx_modulation_type_t)com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_STOP_CONTINUOUS_ID:
+      status = SIGFOX_API_stop_continuous_transmission();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_GET_VERSION_ID:
+      status = SIGFOX_API_get_version((sfx_u8 **) com_buffer[0], (sfx_u8 *) com_buffer[1], (sfx_version_type_t)com_buffer[2]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_GET_DEVICE_ID:
+      status = SIGFOX_API_get_device_id((sfx_u8 *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_GET_INIT_PAC_ID:
+      status = SIGFOX_API_get_initial_pac((sfx_u8 *) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_SET_RCSYNC_PERIOD_ID:
+      status = SIGFOX_API_set_rc_sync_period((sfx_u16) com_buffer[0]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_API_TEST_MODE_ID:
+      status = ADDON_SIGFOX_RF_PROTOCOL_API_test_mode((sfx_rc_enum_t) com_buffer[0], (sfx_test_mode_t) com_buffer[1]);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_API_MONARCH_TEST_MODE_ID:
+      status = ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_async((sfx_rc_enum_t) com_buffer[0], (sfx_test_mode_t) com_buffer[1], (sfx_u8)  com_buffer[2],
+                                                                       sfx_monarch_test_mode_wait_start_cb,
+                                                                       sfx_monarch_test_mode_wait_end_cb);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_API_MONARCH_TEST_EXEC_RC_SCAN_ID:
+      status = SIGFOX_MONARCH_API_execute_rc_scan((sfx_u8) com_buffer[0], (sfx_u16) com_buffer[1], (sfx_timer_unit_enum_t)  com_buffer[2],
+                                                  app_monarch_rcscan_wrapper);
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_API_MONARCH_STOP_RC_SCAN_ID:
+      status = SIGFOX_MONARCH_API_stop_rc_scan();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = (uint32_t) status;
+      break;
+
+    case SIGFOX_INFO_INIT_ID:
+      SigfoxInfo_Init();
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal = 0; /* */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Response */
+  APP_LOG(TS_ON, VLEVEL_H, " * CM0PLUS Sigfox sending response\n\r");
+  MBMUX_ResponseSnd(FEAT_INFO_SIGFOX_ID);
+  /* USER CODE BEGIN Process_Sigfox_Cmd_2 */
+
+  /* USER CODE END Process_Sigfox_Cmd_2 */
+}
+
+uint16_t GetBatteryLevel_mbwrapper(void)
+{
+  /* USER CODE BEGIN GetBatteryLevel_mbwrapper_1 */
+
+  /* USER CODE END GetBatteryLevel_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureNotifComPtr();
+  com_obj->MsgId = SIGFOX_GET_BATTERY_LEVEL_CB_ID;
+  com_obj->ParamCnt = 0;
+  /* Don't call MBMUXIF_SigfoxSendNotif to force blocking DAC computation in CM4
+    to display value on CM0 */
+  MBMUXIF_SigfoxSendNotifTask();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint16_t) ret;
+  /* USER CODE BEGIN GetBatteryLevel_mbwrapper_2 */
+
+  /* USER CODE END GetBatteryLevel_mbwrapper_2 */
+}
+
+int16_t GetTemperatureLevel_mbwrapper(void)
+{
+  /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_1 */
+
+  /* USER CODE END GetTemperatureLevel_mbwrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureNotifComPtr();
+  com_obj->MsgId = SIGFOX_GET_TEMPERATURE_LEVEL_CB_ID;
+  com_obj->ParamCnt = 0;
+  /* Don't call MBMUXIF_SigfoxSendNotif to force blocking DAC computation in CM4
+  to display value on CM0 */
+  MBMUXIF_SigfoxSendNotifTask();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (int16_t) ret;
+  /* USER CODE BEGIN GetTemperatureLevel_mbwrapper_2 */
+
+  /* USER CODE END GetTemperatureLevel_mbwrapper_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static sfx_u8 app_monarch_rcscan_wrapper(sfx_u8 rc_bit_mask, sfx_s16 rssi)
+{
+  /* USER CODE BEGIN app_monarch_rcscan_wrapper_1 */
+
+  /* USER CODE END app_monarch_rcscan_wrapper_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer = NULL;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureNotifComPtr();
+  com_obj->MsgId = SIGFOX_MONARCH_RC_SCAN_CB_ID;
+
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  com_buffer[0] = (uint32_t) rc_bit_mask;
+  com_buffer[1] = (uint32_t) rssi;
+  com_obj->ParamCnt = 2;
+  MBMUXIF_SigfoxSendNotif();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (sfx_u8) ret;
+  /* USER CODE BEGIN app_monarch_rcscan_wrapper_2 */
+
+  /* USER CODE END app_monarch_rcscan_wrapper_2 */
+}
+
+static void sfx_monarch_test_mode_wait_start_cb(void)
+{
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_start_cb_1 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_start_cb_1 */
+
+  /* don't exit this function until test_mode_wait_end callback is called */
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Monarch);
+
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_start_cb_2 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_start_cb_2 */
+}
+
+static void sfx_monarch_test_mode_wait_end_cb(void)
+{
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_end_cb_1 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_end_cb_1 */
+
+  /* release from the test_mode_wait */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Monarch);
+
+  /* USER CODE BEGIN sfx_monarch_test_mode_wait_end_cb_2 */
+
+  /* USER CODE END sfx_monarch_test_mode_wait_end_cb_2 */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h
new file mode 100644
index 00000000..9220c66b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h
@@ -0,0 +1,87 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sigfox_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0 side wrapper of the SigfoxMac interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SIGFOX_MBWRAPPER_CM0PLUS_H__
+#define __SIGFOX_MBWRAPPER_CM0PLUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Process_Sigfox_Cmd(MBMUX_ComParam_t *ComObj);
+
+/*!
+  * @brief   Measures the battery level
+  * @return  Battery level [0: node is connected to an external
+  *          power source, 1..254: battery level, where 1 is the minimum
+  *          and 254 is the maximum value, 255: the node was not able
+  *          to measure the battery level]
+  */
+uint16_t GetBatteryLevel_mbwrapper(void);
+
+/*!
+  * @brief   Measures the temperature level
+  * @return  Temperature level
+  */
+int16_t GetTemperatureLevel_mbwrapper(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SIGFOX_MBWRAPPER_CM0PLUS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c
new file mode 100644
index 00000000..5bbdbdf3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c
@@ -0,0 +1,98 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_sigfox.c
+  * @author  MCD Application Team
+  * @brief   Application of the Sigfox Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sigfox.h"
+#include "radio.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+extern RadioEvents_t RfApiRadioEvents;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void MX_Sigfox_Init(void)
+{
+  /* USER CODE BEGIN MX_Sigfox_Init_1 */
+
+  /* USER CODE END MX_Sigfox_Init_1 */
+  SystemApp_Init();
+  Radio.Init(&RfApiRadioEvents);
+  /* USER CODE BEGIN MX_Sigfox_Init_2 */
+
+  /* USER CODE END MX_Sigfox_Init_2 */
+}
+
+void MX_Sigfox_Process(void)
+{
+  /* USER CODE BEGIN MX_Sigfox_Process_1 */
+
+  /* USER CODE END MX_Sigfox_Process_1 */
+  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
+  /* USER CODE BEGIN MX_Sigfox_Process_2 */
+
+  /* USER CODE END MX_Sigfox_Process_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h
new file mode 100644
index 00000000..601d642c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h
@@ -0,0 +1,86 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_sigfox.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the Sigfox Middleware
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_SIGFOX_H__
+#define __APP_SIGFOX_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* To enable the KMS Middleware with Sigfox, you must update these files from the DualCore example project:
+   - CM0PLUS/Core/Inc/kms_platf_objects_config.h : Add all Sigfox keys as kms_object_keyhead_32_t structures.
+   - CM0PLUS/Core/Inc/kms_platf_objects_interface.h : Add all Sigfox key indexes
+   - CM0PLUS/Core/Inc/nvms_low_level.h : Enable the NVMS (Non Volatile Memory) to store the session keys
+   - CM0PLUS/Core/Src/nvms_low_level.c : Implement the Flash read/write functions to manage the NVMS items
+   And finally, change the SIGFOX_KMS define to 1
+*/
+/* USER CODE BEGIN SIGFOX_KMS */
+#define SIGFOX_KMS 1
+/* USER CODE END SIGFOX_KMS */
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init Sigfox Application
+  */
+void MX_Sigfox_Init(void);
+
+/**
+  * @brief  entry Sigfox Process or scheduling
+  */
+void MX_Sigfox_Process(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_SIGFOX_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.c
new file mode 100644
index 00000000..aa1c02f5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.c
@@ -0,0 +1,774 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ee.c
+  * @author  MCD Application Team
+  * @brief   Implementation of the EEPROM emulator
+  *****************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  *****************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "ee.h"
+#include "flash_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+typedef struct
+{
+  /* Absolute base address of the bank in Flash memory */
+  uint32_t address;
+
+  /* Total number of pages in a pool (constant) */
+  uint8_t  nb_pages;
+
+  /* Current write page (can be ACTIVE or RECEIVE state) */
+  uint8_t  current_write_page;
+
+  /* Total number of elements written in valid and active pages */
+  uint16_t nb_written_elements;
+
+  /* Write position inside the current write page */
+  uint16_t next_write_offset;
+
+} EE_var_t;
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+
+#ifndef M_BEGIN
+#define  M_BEGIN                        do{
+#endif /* !M_BEGIN */
+#ifndef M_END
+#define M_END  }                       while(0)
+#endif /* !M_END */
+
+#ifndef DBG_EE
+#define DBG_EE( X )
+#endif /* !DBG_EE */
+
+/* Page header size in bytes (4 words used to save page state) */
+#define EE_HEADER_SIZE             (4 * HW_FLASH_WIDTH)
+
+/* Maximum number of elements by page */
+#define EE_NB_MAX_ELT \
+  ((HW_FLASH_PAGE_SIZE - EE_HEADER_SIZE) / HW_FLASH_WIDTH)
+
+/* Flash words special values */
+#define EE_ERASED                  0xFFFFFFFFFFFFFFFFULL
+#define EE_PROGRAMMED              0xAAAAAAAAAAAAAAAAULL
+
+/* No page define */
+#define EE_PAGE_NOT_FOUND          0xFFFFFFFFUL
+
+/* Element tag in flash */
+#define EE_TAG                     0x8000UL
+
+/* Page state definition */
+enum
+{
+  EE_STATE_ERASED  = 0,   /* page is erased */
+  EE_STATE_RECEIVE = 1,   /* used during transfer for new page */
+  EE_STATE_ACTIVE  = 2,   /* page contains valid data and is not full */
+  EE_STATE_VALID   = 3,   /* page contains valid data and is full */
+  EE_STATE_ERASING = 4,   /* used during transfer for old pages */
+};
+
+/* Macro to get flash address from page index */
+#define EE_FLASH_ADDR( pv, p_ ) \
+  ((pv)->address + ((p_) * HW_FLASH_PAGE_SIZE))
+
+/* Macro to get flash page from page index */
+#define EE_FLASH_PAGE( pv, p_ ) \
+  ((((pv)->address - HW_FLASH_ADDRESS) / HW_FLASH_PAGE_SIZE) + (p_))
+
+/* Macro to get first page index of following pool, among circular pool list */
+#define EE_NEXT_POOL( pv ) \
+  (((pv)->current_write_page < (pv)->nb_pages) ? (pv)->nb_pages : 0)
+
+/* Check Configuration */
+#if (CFG_EE_BANK0_SIZE & ((2 * HW_FLASH_PAGE_SIZE) - 1))
+#error EE: wrong value of CFG_EE_BANK0_SIZE
+#endif /* (CFG_EE_BANK0_SIZE & ((2 * HW_FLASH_PAGE_SIZE) - 1)) */
+#if (CFG_EE_BANK1_SIZE & ((2 * HW_FLASH_PAGE_SIZE) - 1))
+#error EE: wrong value of CFG_EE_BANK1_SIZE
+#endif /* (CFG_EE_BANK1_SIZE & ((2 * HW_FLASH_PAGE_SIZE) - 1)) */
+#if ((CFG_EE_BANK0_MAX_NB > \
+      EE_NB_MAX_ELT * CFG_EE_BANK0_SIZE / (2 * HW_FLASH_PAGE_SIZE)) || \
+     (CFG_EE_BANK0_MAX_NB > 0x4000U))
+#error EE: CFG_EE_BANK0_MAX_NB too big
+#endif /* CFG_EE_BANK0_MAX_NB */
+#if ((CFG_EE_BANK1_SIZE > 0) && \
+     ((CFG_EE_BANK1_MAX_NB > \
+       EE_NB_MAX_ELT * CFG_EE_BANK1_SIZE / (2 * HW_FLASH_PAGE_SIZE)) || \
+      (CFG_EE_BANK1_MAX_NB > 0x4000U)))
+#error EE: CFG_EE_BANK1_MAX_NB too big
+#endif /* CFG_EE_BANK1_SIZE */
+
+/* Macro used in CRC computation (one byte CRC step) */
+#define EE_CRC16_STEP( v, x, crc ) \
+  M_BEGIN \
+  x = ((crc>>8) ^ v) & 0xFF; \
+  x ^= x>>4; \
+  crc = (crc << 8) ^ (x << 12) ^ (x << 5) ^ x; \
+  M_END
+
+/* Macro to get a 64-bit pointer from an address represented as an integer */
+#ifndef EE_PTR
+#define EE_PTR( x_ )               ((uint64_t*)(uintptr_t)(x_))
+#endif /* !EE_PTR */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+EE_var_t EE_var[CFG_EE_BANK1_SIZE ? 2 : 1];
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+static void EE_Reset(EE_var_t *pv, uint32_t address, uint8_t nb_pages);
+
+static int32_t EE_Recovery(EE_var_t *pv);
+
+static int32_t EE_Transfer(EE_var_t *pv, uint16_t addr, uint32_t page);
+
+static int32_t EE_WriteEl(EE_var_t *pv, uint16_t addr, uint32_t data);
+
+static int32_t EE_ReadEl(const EE_var_t *pv,
+                         uint16_t addr, uint32_t *data, uint32_t page);
+
+static int32_t EE_SetState(const EE_var_t *pv, uint32_t page, uint32_t state);
+
+static uint32_t EE_GetState(const EE_var_t *pv, uint32_t page);
+
+static uint16_t EE_Crc(uint64_t v);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+int32_t EE_Init(int32_t format, uint32_t base_address)
+{
+  /* USER CODE BEGIN EE_Init_1 */
+
+  /* USER CODE END EE_Init_1 */
+  int32_t status;
+  uint16_t total_nb_pages;
+
+  /* Reset global variables of both banks */
+
+  EE_Reset(&EE_var[0],
+           base_address,
+           CFG_EE_BANK0_SIZE / (2 * HW_FLASH_PAGE_SIZE));
+
+  if (CFG_EE_BANK1_SIZE)
+  {
+    EE_Reset(&EE_var[1],
+             base_address + CFG_EE_BANK0_SIZE,
+             CFG_EE_BANK1_SIZE / (2 * HW_FLASH_PAGE_SIZE));
+  }
+
+  /* If format mode is set, start from scratch */
+
+  if (format)
+  {
+    /* Force erase of all pages */
+    total_nb_pages =
+      2 * (EE_var[0].nb_pages + (CFG_EE_BANK1_SIZE ? EE_var[1].nb_pages : 0));
+
+    if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(EE_var, 0), total_nb_pages, 0) != 0)
+    {
+      return EE_ERASE_ERROR;
+    }
+
+    /* Set first page of each pool in ACTIVE State */
+    status = EE_SetState(&EE_var[0], 0, EE_STATE_ACTIVE);
+
+    if (CFG_EE_BANK1_SIZE && (status == EE_OK))
+    {
+      status = EE_SetState(&EE_var[1], 0, EE_STATE_ACTIVE);
+    }
+
+    return status;
+  }
+
+  /* else, try to recover the EEPROM emulation state from flash */
+
+  status = EE_Recovery(&EE_var[0]);
+
+  if (CFG_EE_BANK1_SIZE && (status == EE_OK))
+  {
+    status = EE_Recovery(&EE_var[1]);
+  }
+
+  return status;
+  /* USER CODE BEGIN EE_Init_2 */
+
+  /* USER CODE END EE_Init_2 */
+}
+
+int32_t EE_Read(int32_t bank, uint16_t addr, uint32_t *data)
+{
+  /* USER CODE BEGIN EE_Read_1 */
+
+  /* USER CODE END EE_Read_1 */
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
+
+  /* Read element starting from active page */
+  return EE_ReadEl(pv, addr, data, pv->current_write_page);
+  /* USER CODE BEGIN EE_Read_2 */
+
+  /* USER CODE END EE_Read_2 */
+}
+
+int32_t EE_Write(int32_t bank, uint16_t addr, uint32_t data)
+{
+  /* USER CODE BEGIN EE_Write_1 */
+
+  /* USER CODE END EE_Write_1 */
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
+  uint32_t page;
+
+  /* Check if current pool is full */
+  if (pv->nb_written_elements < EE_NB_MAX_ELT * pv->nb_pages)
+  {
+    /* If not full, write the virtual address and value in the EEPROM */
+    return EE_WriteEl(pv, addr, data);
+  }
+
+  DBG_EE(EE_2);
+
+  /* If full, we need to write in other pool and perform pool transfer */
+  page = EE_NEXT_POOL(pv);
+
+  /* Check next page state: it must be ERASED */
+  if (EE_GetState(pv, page) != EE_STATE_ERASED)
+  {
+    return EE_STATE_ERROR;
+  }
+
+  /* Mark the ERASED page at RECEIVE state */
+  if (EE_SetState(pv, page, EE_STATE_RECEIVE) != EE_OK)
+  {
+    return EE_WRITE_ERROR;
+  }
+
+  DBG_EE(EE_3);
+
+  /* Reset global variables */
+  pv->current_write_page = page;
+  pv->nb_written_elements = 0;
+  pv->next_write_offset = EE_HEADER_SIZE;
+
+  /* Write the variable passed as parameter in the new active page */
+  if (EE_WriteEl(pv, addr, data) != EE_OK)
+  {
+    return EE_WRITE_ERROR;
+  }
+
+  DBG_EE(EE_4);
+
+  /* Set the previous ACTIVE pool to ERASING and copy the latest written
+     values to the new pool */
+  if (EE_Transfer(pv, addr, page) != EE_OK)
+  {
+    return EE_WRITE_ERROR;
+  }
+
+  DBG_EE(EE_5);
+
+  /* A clean is required */
+  return EE_CLEAN_NEEDED;
+  /* USER CODE BEGIN EE_Write_2 */
+
+  /* USER CODE END EE_Write_2 */
+}
+
+int32_t EE_Clean(int32_t bank, int32_t interrupt)
+{
+  /* USER CODE BEGIN EE_Clean_1 */
+
+  /* USER CODE END EE_Clean_1 */
+  EE_var_t *pv = &EE_var[CFG_EE_BANK1_SIZE && bank];
+  uint32_t page;
+
+  /* Get first page of unused pool */
+  page = EE_NEXT_POOL(pv);
+
+  /* At least, the first page of the pool should be in ERASING state */
+  if (EE_GetState(pv, page) != EE_STATE_ERASING)
+  {
+    return EE_STATE_ERROR;
+  }
+
+  DBG_EE(EE_1);
+
+  /* Erase all the pages of the pool */
+  if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), pv->nb_pages, interrupt)
+      != 0)
+  {
+    return EE_ERASE_ERROR;
+  }
+
+  return EE_OK;
+  /* USER CODE BEGIN EE_Clean_2 */
+
+  /* USER CODE END EE_Clean_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+static void EE_Reset(EE_var_t *pv, uint32_t address, uint8_t nb_pages)
+{
+  /* USER CODE BEGIN EE_Reset_1 */
+
+  /* USER CODE END EE_Reset_1 */
+  /* Reset global variables of the bank */
+  pv->address = address;
+  pv->nb_pages = nb_pages;
+  pv->current_write_page = 0;
+  pv->nb_written_elements = 0;
+  pv->next_write_offset = EE_HEADER_SIZE;
+  /* USER CODE BEGIN EE_Reset_2 */
+
+  /* USER CODE END EE_Reset_2 */
+}
+
+static int32_t EE_Recovery(EE_var_t *pv)
+{
+  /* USER CODE BEGIN EE_Recovery_1 */
+
+  /* USER CODE END EE_Recovery_1 */
+  uint32_t page;
+  uint32_t first_page;
+  uint32_t state;
+  uint32_t prev_state;
+  uint32_t flash_addr;
+  uint32_t i;
+
+  /* Search all pages for a reliable RECEIVE page then ACTIVE page */
+  for (state = EE_STATE_RECEIVE; state <= EE_STATE_ACTIVE; state++)
+  {
+    for (page = 0; page < 2UL * pv->nb_pages; page++)
+    {
+      if (state != EE_GetState(pv, page))
+      {
+        continue;
+      }
+
+      if ((page == 0) || (page == pv->nb_pages))
+      {
+        /* Check if state is reliable by checking state of next page */
+        if (EE_GetState(pv, page + 1) != EE_STATE_ERASED)
+        {
+          continue;
+        }
+      }
+      else
+      {
+        prev_state = EE_GetState(pv, page - 1);
+
+        if (prev_state != state)
+        {
+          /* Check if state is reliable by checking state of previous page */
+          if (prev_state != EE_STATE_VALID)
+          {
+            continue;
+          }
+        }
+        else
+        {
+          /* If page and previous page are the same, mark previous as VALID */
+          if (EE_SetState(pv, page - 1, EE_STATE_VALID) != EE_OK)
+          {
+            return EE_WRITE_ERROR;
+          }
+        }
+      }
+
+      /* Update write page */
+      pv->current_write_page = page;
+
+      /* Count elements already in ACTIVE or RECEIVE page */
+      flash_addr = EE_FLASH_ADDR(pv, page) + EE_HEADER_SIZE;
+      for (i = 0; i < EE_NB_MAX_ELT; i++)
+      {
+        /* Check if current element is valid */
+        if (*EE_PTR(flash_addr) == EE_ERASED)
+        {
+          break;
+        }
+
+        /* Update global variables accordingly */
+        pv->nb_written_elements++;
+        pv->next_write_offset += HW_FLASH_WIDTH;
+
+        /* Next element address */
+        flash_addr += HW_FLASH_WIDTH;
+      }
+
+      /* Count elements already transferred in previous pool pages */
+      while (!((page == 0) || (page == pv->nb_pages)))
+      {
+        /* Update number of elements written in pool */
+        pv->nb_written_elements += EE_NB_MAX_ELT;
+
+        page--;
+      }
+
+      /* If we have found a RECEIVE page, it means that pool transfer
+         has been interrupted by reset */
+      if (state == EE_STATE_RECEIVE)
+      {
+        /* Resume pool transfer */
+        if (EE_Transfer(pv, EE_TAG, page) != EE_OK)
+        {
+          return EE_WRITE_ERROR;
+        }
+      }
+
+      /* RECEIVE/ACTIVE page found, check if some erasing is needed */
+
+      /* Get first page of unused pool */
+      first_page = EE_NEXT_POOL(pv);
+
+      /* Erase all the pages not already erased in the pool */
+      for (page = first_page; page < first_page + pv->nb_pages; page++)
+      {
+        if (EE_GetState(pv, page) != EE_STATE_ERASED)
+        {
+          if (FLASH_IF_EraseByPages(EE_FLASH_PAGE(pv, page), 1, 0) != 0)
+          {
+            return EE_ERASE_ERROR;
+          }
+        }
+      }
+
+      return EE_OK;
+    }
+  }
+
+  /* No true RECEIVE or ACTIVE page has been found */
+  return EE_STATE_ERROR;
+  /* USER CODE BEGIN EE_Recovery_2 */
+
+  /* USER CODE END EE_Recovery_2 */
+}
+
+static int32_t EE_Transfer(EE_var_t *pv, uint16_t addr, uint32_t page)
+{
+  /* USER CODE BEGIN EE_Transfer_1 */
+
+  /* USER CODE END EE_Transfer_1 */
+  uint32_t state;
+  uint32_t var;
+  uint32_t data;
+  uint32_t last_page;
+
+  /* Input "page" is the first page of the new pool;
+     We compute "last_page" as the last page of the old pool to be set
+     in ERASING state (all pages in old pool are assumed to be either VALID
+     or ACTIVE, except in case of recovery, where some pages may be already
+     in ERASING state.
+     However, in case of recovery, we do not not need to set ERASING,
+     as initialization phase erases the inactive pool. */
+  last_page =
+    (page < pv->nb_pages) ? (2 * pv->nb_pages - 1) : (pv->nb_pages - 1);
+
+  if (addr != EE_TAG)
+  {
+    /* Loop on all old pool pages in descending order */
+    page = last_page;
+    while (1)
+    {
+      state = EE_GetState(pv, page);
+
+      if ((state == EE_STATE_ACTIVE) || (state == EE_STATE_VALID))
+      {
+        /* Set page state to ERASING */
+        if (EE_SetState(pv, page, EE_STATE_ERASING) != EE_OK)
+        {
+          return EE_WRITE_ERROR;
+        }
+      }
+
+      DBG_EE(EE_6);
+
+      /* Check if start of pool is reached */
+      if ((page == 0) || (page == pv->nb_pages))
+      {
+        break;
+      }
+
+      page--;
+    }
+  }
+
+  /* Now, we can copy variables from one pool to the other */
+
+  for (var = 0; var < EE_NB_MAX_ELT * pv->nb_pages; var++)
+  {
+    /* Check each variable except the one passed as parameter
+       (and except the ones already transferred in case of recovery) */
+    if ((var != addr) &&
+        ((addr != EE_TAG) ||
+         (EE_ReadEl(pv, var, &data, pv->current_write_page) != EE_OK)))
+    {
+      /* Read the last variable update */
+      if (EE_ReadEl(pv, var, &data, last_page) == EE_OK)
+      {
+        DBG_EE(EE_7);
+
+        /* In case variable corresponding to the virtual address was found,
+           copy the variable to the new active page */
+        if (EE_WriteEl(pv, var, data) != EE_OK)
+        {
+          return EE_WRITE_ERROR;
+        }
+      }
+    }
+  }
+
+  /* Transfer is now done, mark the receive state page as active */
+  return EE_SetState(pv, pv->current_write_page, EE_STATE_ACTIVE);
+  /* USER CODE BEGIN EE_Transfer_2 */
+
+  /* USER CODE END EE_Transfer_2 */
+}
+
+static int32_t EE_WriteEl(EE_var_t *pv, uint16_t addr, uint32_t data)
+{
+  /* USER CODE BEGIN EE_WriteEl_1 */
+
+  /* USER CODE END EE_WriteEl_1 */
+  uint32_t page;
+  uint32_t flash_addr;
+  uint64_t el;
+
+  /* It is assumed here that the current pool is not full
+     and that free pages in this pool are in ERASED state */
+
+  /* Check if active page is full */
+  if (pv->next_write_offset >= HW_FLASH_PAGE_SIZE)
+  {
+    /* Get current active page */
+    page = pv->current_write_page;
+
+    /* Set new page as was previous one (active or receive) */
+    if (EE_SetState(pv, page + 1, EE_GetState(pv, page)) != EE_OK)
+    {
+      return EE_WRITE_ERROR;
+    }
+
+    DBG_EE(EE_8);
+
+    /* Set current page in valid state */
+    if (EE_SetState(pv, page, EE_STATE_VALID) != EE_OK)
+    {
+      return EE_WRITE_ERROR;
+    }
+
+    /* Update global variables to use next page */
+    pv->current_write_page = page + 1;
+    pv->next_write_offset = EE_HEADER_SIZE;
+  }
+
+  /* Build element to be written in flash */
+  if (addr == EE_TAG)
+  {
+    el = 0ULL;
+  }
+  else
+  {
+    /* Build element from virtual addr and data, plus CRC */
+    el = ((((uint64_t)data) << 32) | ((EE_TAG | (addr & 0x3FFFUL)) << 16));
+    el |= EE_Crc(el);
+  }
+
+  /* Compute write address */
+  flash_addr =
+    EE_FLASH_ADDR(pv, pv->current_write_page) + pv->next_write_offset;
+
+  /* Write element in flash */
+  if (FLASH_IF_Write64(flash_addr, el) != 0)
+  {
+    return EE_WRITE_ERROR;
+  }
+
+  /* Increment global variables relative to write operation done */
+  pv->next_write_offset += HW_FLASH_WIDTH;
+  pv->nb_written_elements++;
+
+  return EE_OK;
+  /* USER CODE BEGIN EE_WriteEl_2 */
+
+  /* USER CODE END EE_WriteEl_2 */
+}
+
+static int32_t EE_ReadEl(const EE_var_t *pv,
+                         uint16_t addr, uint32_t *data, uint32_t page)
+{
+  /* USER CODE BEGIN EE_ReadEl_1 */
+
+  /* USER CODE END EE_ReadEl_1 */
+  uint32_t flash_addr;
+  uint32_t offset;
+  uint64_t el;
+
+  /* Search variable in the pool (in decreasing page order from "page") */
+  while (1)
+  {
+    /* Check each page address starting from end */
+    flash_addr = EE_FLASH_ADDR(pv, page);
+    for (offset = HW_FLASH_PAGE_SIZE - HW_FLASH_WIDTH;
+         offset >= EE_HEADER_SIZE; offset -= HW_FLASH_WIDTH)
+    {
+      /* Read one element from flash */
+      el = *EE_PTR(flash_addr + offset);
+
+      /* Compare the read address with the input address and check CRC:
+         in case of failed CRC, data is corrupted and has to be skipped */
+      if ((el != EE_ERASED) && (el != 0ULL) &&
+          (((el & 0x3FFFFFFFUL) >> 16) == addr) &&
+          (EE_Crc(el) == (uint16_t)el))
+      {
+        /* Get variable data */
+        *data = (uint32_t)(el >> 32);
+
+        /* Variable is found */
+        return EE_OK;
+      }
+    }
+
+    /* Check if start of pool is reached */
+    if ((page == 0) || (page == pv->nb_pages))
+    {
+      /* Variable is not found */
+      return EE_NOT_FOUND;
+    }
+
+    page--;
+  }
+  /* USER CODE BEGIN EE_ReadEl_2 */
+
+  /* USER CODE END EE_ReadEl_2 */
+}
+
+static int32_t EE_SetState(const EE_var_t *pv, uint32_t page, uint32_t state)
+{
+  /* USER CODE BEGIN EE_SetState_1 */
+
+  /* USER CODE END EE_SetState_1 */
+  uint32_t flash_addr;
+
+  flash_addr = EE_FLASH_ADDR(pv, page) + ((state - 1) * HW_FLASH_WIDTH);
+
+  DBG_EE(EE_0);
+
+  /* Set new page state inside page header */
+  if (FLASH_IF_Write64(flash_addr, EE_PROGRAMMED) != 0)
+  {
+    return EE_WRITE_ERROR;
+  }
+
+  return EE_OK;
+  /* USER CODE BEGIN EE_SetState_2 */
+
+  /* USER CODE END EE_SetState_2 */
+}
+
+static uint32_t EE_GetState(const EE_var_t *pv, uint32_t page)
+{
+  /* USER CODE BEGIN EE_GetState_1 */
+
+  /* USER CODE END EE_GetState_1 */
+  uint32_t state;
+  uint32_t flash_addr;
+
+  flash_addr = EE_FLASH_ADDR(pv, page) + EE_HEADER_SIZE;
+
+  for (state = EE_STATE_ERASING; state > EE_STATE_ERASED; state--)
+  {
+    flash_addr -= HW_FLASH_WIDTH;
+
+    /* If page header word is not ERASED, return word index as page state */
+    if (*EE_PTR(flash_addr) != EE_ERASED)
+    {
+      break;
+    }
+  }
+
+  return state;
+  /* USER CODE BEGIN EE_GetState_2 */
+
+  /* USER CODE END EE_GetState_2 */
+}
+
+static uint16_t EE_Crc(uint64_t v)
+{
+  /* USER CODE BEGIN EE_Crc_1 */
+
+  /* USER CODE END EE_Crc_1 */
+  uint32_t x = 0;
+  uint32_t crc = 0;
+
+  v >>= 16;
+  EE_CRC16_STEP((uint32_t)v, x, crc);
+  v >>= 8;
+  EE_CRC16_STEP((uint32_t)v, x, crc);
+  v >>= 8;
+  EE_CRC16_STEP((uint32_t)v, x, crc);
+  v >>= 8;
+  EE_CRC16_STEP((uint32_t)v, x, crc);
+  v >>= 8;
+  EE_CRC16_STEP((uint32_t)v, x, crc);
+  v >>= 8;
+  EE_CRC16_STEP((uint32_t)v, x, crc);
+
+  return crc;
+  /* USER CODE BEGIN EE_Crc_2 */
+
+  /* USER CODE END EE_Crc_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.h
new file mode 100644
index 00000000..81b544f1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.h
@@ -0,0 +1,205 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ee.h
+  * @author  MCD Application Team
+  * @brief   Header of the EEPROM emulator
+  *****************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  *****************************************************************************
+  */
+/* USER CODE END Header */
+
+#ifndef EE_H__
+#define EE_H__
+
+/**
+  * Description
+  * -----------
+  * the EE module implements an EEPROM emulator in one C file ("ee.c").
+  * Its interface is defined below in this file ("ee.h").
+  * Up to two independent banks can be configured.
+  * Data granularity to store and read in this EEPROM emulator is a 32-bit word.
+  *
+  * Configuration and dependencies
+  * ------------------------------
+  * the EE module includes a generic header file "common.h":
+  * this file has to be defined by the user and must provide the following:
+  *
+  * - M_BEGIN, M_END and DBG() macro definitions.
+  *
+  * - Hardware flash driver definitions:
+  *
+  *      * HW_FLASH_PAGE_SIZE (in bytes)
+  *
+  *      * HW_FLASH_WIDTH (in bytes)
+  *
+  *      * int HW_FLASH_Write( uint32_t address,
+  *                            uint64_t data );
+  *
+  *      * int HW_FLASH_Erase( uint32_t page,
+  *                            uint16_t n,
+  *                            int interrupt );
+  *
+  * - Configuration definitions:
+  *
+  *     * CFG_EE_BANK0_SIZE
+  *       Size of the first bank in bytes (must be greater than 0).
+  *       It must be a multiple of page size.
+  *
+  *     * CFG_EE_BANK0_MAX_NB
+  *       Maximum number of data that can be stored in the first bank.
+  *
+  *     * CFG_EE_BANK1_SIZE
+  *       Size of the second bank in bytes (can be 0 if the bank is not used).
+  *       It must be a multiple of page size.
+  *
+  *     * CFG_EE_BANK1_MAX_NB
+  *       Maximum number of data that can be stored in the second bank.
+  *
+  * Notes
+  * -----
+  * - a corrupted word in FLASH detected by the user software shall be set to 0.
+  *   The EEPROM emulation software will then handle it properly.
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "utilities_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* Definition of the functions return value */
+enum
+{
+  EE_OK = 0,
+  EE_NOT_FOUND,     /* read data is not found in flash */
+  EE_CLEAN_NEEDED,  /* data is written but a "clean" is needed */
+  EE_ERASE_ERROR,   /* an error occurs during flash erase */
+  EE_WRITE_ERROR,   /* an error occurs during flash write */
+  EE_STATE_ERROR    /* state of flash is incoherent (needs clean or format) */
+};
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * EE_Init
+  *
+  * Initialization of EEPROM emulation module. It must be called once at reset.
+  *
+  * format: 0 -> recover EE state from flash and restore the pages
+  *              to a known good state in case of power loss.
+  *         1 -> erase all the pages: starts from scratch.
+  *              This format mode can be activated the very first time EEPROM
+  *              emulation is used, to prepare flash pages for EEPROM emulation
+  *              with empty EEPROM
+  *
+  * base_address: absolute start address of flash area used for EEPROM
+  *               emulation. It must be a multiple of flash page size.
+  *
+  * return: EE_OK in case of success
+  *         EE..._ERROR in case of error
+  */
+
+extern int32_t EE_Init(int32_t format,
+                       uint32_t base_address);
+
+/**
+  * EE_Read
+  *
+  * Returns the last stored variable data, if found, which corresponds to
+  * the passed virtual address
+  *
+  * bank:   index of the bank (0 or 1)
+  *
+  * addr:   variable virtual address
+  *
+  * data:   pointer to a 32-bit word (allocated by the caller) containing the
+  *         variable value in case of success.
+  *
+  * return: EE_OK in case of success
+  *         EE_NOT_FOUND in case this virtual address has never been written to
+  *         EE..._ERROR in case of error
+  */
+
+extern int32_t EE_Read(int32_t bank, uint16_t addr, uint32_t *data);
+
+/**
+  * EE_Write
+  *
+  * Writes/updates variable data in EEPROM emulator.
+  * Triggers internal pages transfer if flash pool is full.
+  *
+  * bank:   index of the bank (0 or 1)
+  *
+  * addr:   variable virtual address
+  *
+  * data:   32-bit data word to be written
+  *
+  * return: EE_OK in case of success
+  *         EE_CLEAN_NEEDED if success but user has to trigger flash cleanup
+  *                         by calling EE_Clean()
+  *         EE..._ERROR in case of error
+  */
+
+extern int32_t EE_Write(int32_t bank, uint16_t addr, uint32_t data);
+
+/**
+  * EE_Clean
+  *
+  * Erase obsolete pool of pages in polling or interrupt mode.
+  * This function should be called when EE_Write() has returned EE_CLEAN_NEEDED
+  * (and only in that case)
+  * If interrupt mode is used, the user must declare a function with the
+  * following prototype (see hw.h):
+  *  void HWCB_FLASH_EndOfCleanup( void );
+  * this function is called under FLASH IRQ handler at end of cleanup.
+  *
+  * bank:   index of the bank (0 or 1)
+  *
+  * interrupt: 0 -> polling mode
+  *            1 -> interrupt mode
+  *
+  * return: EE_OK in case of success
+  *         EE..._ERROR in case of error
+  */
+
+extern int32_t EE_Clean(int32_t bank, int32_t interrupt);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#endif /* EE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h
new file mode 100644
index 00000000..ae7d30ed
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h
@@ -0,0 +1,90 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_app_version.h
+  * @author  MCD Application Team
+  * @brief   Definition the version of the CM0PLUS application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_VERSION_H__
+#define __APP_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
+#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
+
+#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
+#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
+#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
+#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Application version
+  */
+#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
+                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
+                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
+                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
+
+/**
+  * @brief Sigfox CM0PLUS application version
+  */
+#define __CM0_APP_VERSION             __APP_VERSION
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_VERSION_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c
new file mode 100644
index 00000000..8f722834
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c
@@ -0,0 +1,105 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_cstimer.c
+  * @author  MCD Application Team
+  * @brief   manages carrier sense timer.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "sgfx_cstimer.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static int32_t rxCarrierSenseFlag = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void RxCarrierSenseInitStatus(void)
+{
+  /* USER CODE BEGIN RxCarrierSenseInitStatus_1 */
+
+  /* USER CODE END RxCarrierSenseInitStatus_1 */
+  /*Initialize the Flag*/
+  rxCarrierSenseFlag = 0;
+  /* USER CODE BEGIN RxCarrierSenseInitStatus_2 */
+
+  /* USER CODE END RxCarrierSenseInitStatus_2 */
+}
+
+int32_t RxCarrierSenseGetStatus(void)
+{
+  /* USER CODE BEGIN RxCarrierSenseGetStatus_1 */
+
+  /* USER CODE END RxCarrierSenseGetStatus_1 */
+  return rxCarrierSenseFlag ;
+  /* USER CODE BEGIN RxCarrierSenseGetStatus_2 */
+
+  /* USER CODE END RxCarrierSenseGetStatus_2 */
+}
+
+void OnTimerTimeoutCsEvt(void *context)
+{
+  /* USER CODE BEGIN OnTimerTimeoutCsEvt_1 */
+
+  /* USER CODE END OnTimerTimeoutCsEvt_1 */
+  rxCarrierSenseFlag = 1;
+  /* USER CODE BEGIN OnTimerTimeoutCsEvt_2 */
+
+  /* USER CODE END OnTimerTimeoutCsEvt_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h
new file mode 100644
index 00000000..d51103ca
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h
@@ -0,0 +1,76 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_cstimer.h
+  * @author  MCD Application Team
+  * @brief   Interface for  cstimer.c driver
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SGFX_CSTIMER_H__
+#define __SGFX_CSTIMER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void OnTimerTimeoutCsEvt(void *context);
+
+void RxCarrierSenseInitStatus(void);
+
+int32_t RxCarrierSenseGetStatus(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* __SGFX_CSTIMER_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c
new file mode 100644
index 00000000..10028955
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c
@@ -0,0 +1,763 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_eeprom_if.c
+  * @author  MCD Application Team
+  * @brief   eeprom interface to the sigfox component
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "sgfx_eeprom_if.h"
+#include "ee.h"
+#include "st_sigfox_api.h"
+#include "se_nvm.h"
+#include "sys_conf.h"
+#include "utilities_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+enum
+{
+  EE_BANK_0 = 0,
+  EE_BANK_1 = 1
+};
+
+enum
+{
+  EE_CLEAN_MODE_POLLING = 0,
+  EE_CLEAN_MODE_IT = 1
+};
+
+enum
+{
+  NO_FORMAT =         0,
+  FORMAT =            1
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief        Read Sigfox Configuration from eeprom
+  * @param addr   variable virtual address
+  * @param data   pointer to a 32-bit word (allocated by the caller) containing the
+  *               variable value in case of success.
+  */
+static void E2P_Read(e_EE_ID addr, uint32_t *data);
+
+/**
+  * @brief        Write Sigfox Configuration to eeprom
+  * @param addr   variable virtual address
+  * @param data   32-bit data word to be written
+  */
+static void E2P_Write(e_EE_ID addr, uint32_t data);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void E2P_Init(void)
+{
+  /* USER CODE BEGIN E2P_Init_1 */
+
+  /* USER CODE END E2P_Init_1 */
+  HAL_FLASH_Unlock();
+
+  if (EE_Init(NO_FORMAT, EE_BASE_ADRESS) != EE_OK)
+  {
+    if (EE_Init(FORMAT, EE_BASE_ADRESS) == EE_OK)
+    {
+      E2P_RestoreFs();
+    }
+    else
+    {
+      Error_Handler();
+    }
+  }
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Init_2 */
+
+  /* USER CODE END E2P_Init_2 */
+}
+
+void E2P_RestoreFs(void)
+{
+  /* USER CODE BEGIN E2P_RestoreFs_1 */
+
+  /* USER CODE END E2P_RestoreFs_1 */
+  uint32_t rc3a_config[] = RC3A_CONFIG;
+  uint32_t rc3c_config[] = RC3C_CONFIG;
+  uint32_t rc5_config[] = RC5_CONFIG;
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_RSSI_CAL_ID, 0);
+  E2P_Write(EE_AT_ECHO_ID, 1);   /* AtEcho  =  Set */
+  E2P_Write(EE_TX_POWER_RC1_ID, 13);
+  E2P_Write(EE_TX_POWER_RC2_ID, 22);
+  E2P_Write(EE_TX_POWER_RC3A_ID, 13);
+  E2P_Write(EE_TX_POWER_RC3C_ID, 13);
+  E2P_Write(EE_TX_POWER_RC4_ID, 22);
+  E2P_Write(EE_TX_POWER_RC5_ID, 12);
+  E2P_Write(EE_TX_POWER_RC6_ID, 13);
+  E2P_Write(EE_TX_POWER_RC7_ID, 13);
+  E2P_Write(EE_SGFX_RC_ID, SFX_RC1);    /* Default RC at device birth*/
+  E2P_Write(EE_SGFX_KEYTYPE_ID, CREDENTIALS_KEY_PRIVATE);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC2_ID, RC2_SET_STD_CONFIG_SM_WORD_0);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC2_ID, RC2_SET_STD_CONFIG_SM_WORD_1);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC2_ID, RC2_SET_STD_CONFIG_SM_WORD_2);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC3A_ID, rc3a_config[0]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC3A_ID, rc3a_config[1]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC3A_ID, rc3a_config[2]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC3C_ID, rc3c_config[0]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC3C_ID, rc3c_config[1]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC3C_ID, rc3c_config[2]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC4_ID, RC4_SET_STD_CONFIG_SM_WORD_0);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC4_ID, RC4_SET_STD_CONFIG_SM_WORD_1);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC4_ID, RC4_SET_STD_CONFIG_SM_WORD_2);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC5_ID, rc5_config[0]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC5_ID, rc5_config[1]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC5_ID, rc5_config[2]);
+  E2P_Write(EE_SE_NVM_0_ID, 0xFF);
+  E2P_Write(EE_SE_NVM_1_ID, 0x0F);
+  E2P_Write(EE_SE_NVM_2_ID, 0);
+  E2P_Write(EE_SE_NVM_3_ID, 0);
+  E2P_Write(EE_SE_NVM_4_ID, 0xFF);
+  E2P_Write(EE_MCU_NVM_0_ID, 0);
+  E2P_Write(EE_MCU_NVM_1_ID, 0);
+  E2P_Write(EE_MCU_NVM_2_ID, 0);
+  E2P_Write(EE_MCU_NVM_3_ID, 0);
+  E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, 0);
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, VERBOSE_LEVEL);
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_RestoreFs_2 */
+
+  /* USER CODE END E2P_RestoreFs_2 */
+}
+
+int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc)
+{
+  /* USER CODE BEGIN E2P_Read_Power_1 */
+
+  /* USER CODE END E2P_Read_Power_1 */
+  uint32_t power ;
+  switch (SgfxRc)
+  {
+    case SFX_RC1:
+      E2P_Read(EE_TX_POWER_RC1_ID, &power);
+      break;
+    case SFX_RC2:
+      E2P_Read(EE_TX_POWER_RC2_ID, &power);
+      break;
+    case SFX_RC3A:
+      E2P_Read(EE_TX_POWER_RC3A_ID, &power);
+      break;
+    case SFX_RC3C:
+      E2P_Read(EE_TX_POWER_RC3C_ID, &power);
+      break;
+    case SFX_RC4:
+      E2P_Read(EE_TX_POWER_RC4_ID, &power);
+      break;
+    case SFX_RC5:
+      E2P_Read(EE_TX_POWER_RC5_ID, &power);
+      break;
+    case SFX_RC6:
+      E2P_Read(EE_TX_POWER_RC6_ID, &power);
+      break;
+    case SFX_RC7:
+      E2P_Read(EE_TX_POWER_RC7_ID, &power);
+      break;
+    default:
+      break;
+  }
+  return (int8_t) power;
+  /* USER CODE BEGIN E2P_Read_Power_2 */
+
+  /* USER CODE END E2P_Read_Power_2 */
+}
+
+void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power)
+{
+  /* USER CODE BEGIN E2P_Write_Power_1 */
+
+  /* USER CODE END E2P_Write_Power_1 */
+  HAL_FLASH_Unlock();
+
+  switch (SgfxRc)
+  {
+    case SFX_RC1:
+      E2P_Write(EE_TX_POWER_RC1_ID, (uint32_t) power);
+      break;
+    case SFX_RC2:
+      E2P_Write(EE_TX_POWER_RC2_ID, (uint32_t) power);
+      break;
+    case SFX_RC3A:
+      E2P_Write(EE_TX_POWER_RC3A_ID, (uint32_t) power);
+      break;
+    case SFX_RC3C:
+      E2P_Write(EE_TX_POWER_RC3C_ID, (uint32_t) power);
+      break;
+    case SFX_RC4:
+      E2P_Write(EE_TX_POWER_RC4_ID, (uint32_t) power);
+      break;
+    case SFX_RC5:
+      E2P_Write(EE_TX_POWER_RC5_ID, (uint32_t) power);
+      break;
+    case SFX_RC6:
+      E2P_Write(EE_TX_POWER_RC6_ID, (uint32_t) power);
+      break;
+    case SFX_RC7:
+      E2P_Write(EE_TX_POWER_RC7_ID, (uint32_t) power);
+      break;
+    default:
+      break;
+  }
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Write_Power_2 */
+
+  /* USER CODE END E2P_Write_Power_2 */
+}
+
+sfx_rc_enum_t E2P_Read_Rc(void)
+{
+  /* USER CODE BEGIN E2P_Read_Rc_1 */
+
+  /* USER CODE END E2P_Read_Rc_1 */
+  uint32_t SgfxRc ;
+  E2P_Read(EE_SGFX_RC_ID, &SgfxRc);
+  return (sfx_rc_enum_t) SgfxRc;
+  /* USER CODE BEGIN E2P_Read_Rc_2 */
+
+  /* USER CODE END E2P_Read_Rc_2 */
+}
+
+void E2P_Write_Rc(sfx_rc_enum_t SgfxRc)
+{
+  /* USER CODE BEGIN E2P_Write_Rc_1 */
+
+  /* USER CODE END E2P_Write_Rc_1 */
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_SGFX_RC_ID, (uint32_t) SgfxRc);
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Write_Rc_2 */
+
+  /* USER CODE END E2P_Write_Rc_2 */
+}
+
+int16_t E2P_Read_RssiCal(void)
+{
+  /* USER CODE BEGIN E2P_Read_RssiCal_1 */
+
+  /* USER CODE END E2P_Read_RssiCal_1 */
+  uint32_t rssi_cal ;
+  E2P_Read(EE_RSSI_CAL_ID, &rssi_cal);
+  return (int16_t) rssi_cal;
+  /* USER CODE BEGIN E2P_Read_RssiCal_2 */
+
+  /* USER CODE END E2P_Read_RssiCal_2 */
+}
+
+void E2P_Write_RssiCal(int16_t rssi_cal)
+{
+  /* USER CODE BEGIN E2P_Write_RssiCal_1 */
+
+  /* USER CODE END E2P_Write_RssiCal_1 */
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_RSSI_CAL_ID, (uint32_t) rssi_cal);
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Write_RssiCal_2 */
+
+  /* USER CODE END E2P_Write_RssiCal_2 */
+}
+
+uint32_t E2P_Read_AtEcho(void)
+{
+  /* USER CODE BEGIN E2P_Read_AtEcho_1 */
+
+  /* USER CODE END E2P_Read_AtEcho_1 */
+  uint32_t at_echo ;
+  E2P_Read(EE_AT_ECHO_ID, &at_echo);
+  return (E2P_flagStatus_t) at_echo;
+  /* USER CODE BEGIN E2P_Read_AtEcho_2 */
+
+  /* USER CODE END E2P_Read_AtEcho_2 */
+}
+
+void E2P_Write_AtEcho(uint32_t at_echo)
+{
+  /* USER CODE BEGIN E2P_Write_AtEcho_1 */
+
+  /* USER CODE END E2P_Write_AtEcho_1 */
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_AT_ECHO_ID, (uint32_t) at_echo);
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Write_AtEcho_2 */
+
+  /* USER CODE END E2P_Write_AtEcho_2 */
+}
+
+sfx_key_type_t E2P_Read_KeyType(void)
+{
+  /* USER CODE BEGIN E2P_Read_KeyType_1 */
+
+  /* USER CODE END E2P_Read_KeyType_1 */
+  uint32_t data_from_eeprom;
+  E2P_Read(EE_SGFX_KEYTYPE_ID, &data_from_eeprom);
+  return (sfx_key_type_t) data_from_eeprom;
+  /* USER CODE BEGIN E2P_Read_KeyType_2 */
+
+  /* USER CODE END E2P_Read_KeyType_2 */
+}
+
+void E2P_Write_KeyType(sfx_key_type_t key_type)
+{
+  /* USER CODE BEGIN E2P_Write_KeyType_1 */
+
+  /* USER CODE END E2P_Write_KeyType_1 */
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_SGFX_KEYTYPE_ID, (uint32_t) key_type);
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Write_KeyType_2 */
+
+  /* USER CODE END E2P_Write_KeyType_2 */
+}
+
+uint8_t E2P_Read_EncryptionFlag(void)
+{
+  /* USER CODE BEGIN E2P_Read_EncryptionFlag_1 */
+
+  /* USER CODE END E2P_Read_EncryptionFlag_1 */
+  uint32_t data_from_eeprom;
+  E2P_Read(EE_SGFX_ENCRYPTIONFLAG_ID, &data_from_eeprom);
+  return (uint8_t) data_from_eeprom;
+  /* USER CODE BEGIN E2P_Read_EncryptionFlag_2 */
+
+  /* USER CODE END E2P_Read_EncryptionFlag_2 */
+}
+
+void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag)
+{
+  /* USER CODE BEGIN E2P_Write_EncryptionFlag_1 */
+
+  /* USER CODE END E2P_Write_EncryptionFlag_1 */
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, (uint32_t) encryption_flag);
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Write_EncryptionFlag_2 */
+
+  /* USER CODE END E2P_Write_EncryptionFlag_2 */
+}
+
+uint8_t E2P_Read_VerboseLevel(void)
+{
+  /* USER CODE BEGIN E2P_Read_VerboseLevel_1 */
+
+  /* USER CODE END E2P_Read_VerboseLevel_1 */
+  uint32_t data_from_eeprom;
+  E2P_Read(EE_SGFX_VERBOSELEVEL_ID, &data_from_eeprom);
+  return (uint8_t) data_from_eeprom;
+  /* USER CODE BEGIN E2P_Read_VerboseLevel_2 */
+
+  /* USER CODE END E2P_Read_VerboseLevel_2 */
+}
+
+void E2P_Write_VerboseLevel(uint8_t verboselevel)
+{
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_1 */
+
+  /* USER CODE END E2P_Write_VerboseLevel_1 */
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, (uint32_t) verboselevel);
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_2 */
+
+  /* USER CODE END E2P_Write_VerboseLevel_2 */
+}
+
+void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
+{
+  /* USER CODE BEGIN E2P_Read_ConfigWords_1 */
+
+  /* USER CODE END E2P_Read_ConfigWords_1 */
+  switch (sfx_rc)
+  {
+    case SFX_RC1:
+    {
+      break;
+    }
+    case SFX_RC2:
+    {
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC2_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC2_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC2_ID, (uint32_t *) &config_words[2]);
+      break;
+    }
+    case SFX_RC3A:
+    {
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC3A_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC3A_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC3A_ID, (uint32_t *) &config_words[2]);
+
+      break;
+    }
+    case SFX_RC3C:
+    {
+
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC3C_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC3C_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC3C_ID, (uint32_t *) &config_words[2]);
+
+      break;
+    }
+    case SFX_RC4:
+    {
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC4_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC4_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC4_ID, (uint32_t *) &config_words[2]);
+      break;
+    }
+    case SFX_RC5:
+    {
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC5_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC5_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC5_ID, (uint32_t *) &config_words[2]);
+
+      break;
+    }
+    case SFX_RC6:
+    {
+      break;
+    }
+    case SFX_RC7:
+    {
+      break;
+    }
+    default:
+      break;
+  }
+  /* USER CODE BEGIN E2P_Read_ConfigWords_2 */
+
+  /* USER CODE END E2P_Read_ConfigWords_2 */
+}
+
+void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
+{
+  /* USER CODE BEGIN E2P_Write_ConfigWords_1 */
+
+  /* USER CODE END E2P_Write_ConfigWords_1 */
+  HAL_FLASH_Unlock();
+
+  switch (sfx_rc)
+  {
+    case SFX_RC1:
+    {
+      break;
+    }
+    case SFX_RC2:
+    {
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC2_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC2_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC2_ID, config_words[2]);
+      break;
+    }
+    case SFX_RC3A:
+    {
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC3A_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC3A_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC3A_ID, config_words[2]);
+
+      break;
+    }
+    case SFX_RC3C:
+    {
+
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC3C_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC3C_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC3C_ID, config_words[2]);
+
+      break;
+    }
+    case SFX_RC4:
+    {
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC4_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC4_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC4_ID, config_words[2]);
+      break;
+    }
+    case SFX_RC5:
+    {
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC5_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC5_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC5_ID, config_words[2]);
+      break;
+    }
+    case SFX_RC6:
+    {
+      break;
+    }
+    case SFX_RC7:
+    {
+      break;
+    }
+    default:
+      break;
+  }
+
+  HAL_FLASH_Lock();
+  /* USER CODE BEGIN E2P_Write_ConfigWords_2 */
+
+  /* USER CODE END E2P_Write_ConfigWords_2 */
+}
+
+E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len)
+{
+  /* USER CODE BEGIN E2P_Read_SeNvm_1 */
+
+  /* USER CODE END E2P_Read_SeNvm_1 */
+  E2P_ErrorStatus_t error = E2P_OK;
+  int32_t i = 0;
+  uint32_t data_from_eeprom;
+
+  E2P_Read(EE_SE_NVM_0_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_SE_NVM_1_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_SE_NVM_2_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_SE_NVM_3_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_SE_NVM_4_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+
+  if (i != len)
+  {
+    error =  E2P_KO;
+  }
+  return error;
+  /* USER CODE BEGIN E2P_Read_SeNvm_2 */
+
+  /* USER CODE END E2P_Read_SeNvm_2 */
+}
+
+E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write,  uint32_t len)
+{
+  /* USER CODE BEGIN E2P_Write_SeNvm_1 */
+
+  /* USER CODE END E2P_Write_SeNvm_1 */
+  E2P_ErrorStatus_t error = E2P_OK;
+  int32_t i = 0;
+
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_SE_NVM_0_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_SE_NVM_1_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_SE_NVM_2_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_SE_NVM_3_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_SE_NVM_4_ID, (uint32_t) data_to_write[i++]);
+
+  HAL_FLASH_Lock();
+
+  if (i != len)
+  {
+    error =  E2P_KO;
+  }
+  return error;
+  /* USER CODE BEGIN E2P_Write_SeNvm_2 */
+
+  /* USER CODE END E2P_Write_SeNvm_2 */
+}
+
+E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data, uint32_t len)
+{
+  /* USER CODE BEGIN E2P_Read_McuNvm_1 */
+
+  /* USER CODE END E2P_Read_McuNvm_1 */
+  E2P_ErrorStatus_t error = E2P_OK;
+  int32_t i = 0;
+  uint32_t data_from_eeprom;
+  E2P_Read(EE_MCU_NVM_0_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_MCU_NVM_1_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_MCU_NVM_2_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_MCU_NVM_3_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  if (i != len)
+  {
+    error =  E2P_KO;
+  }
+  return error;
+  /* USER CODE BEGIN E2P_Read_McuNvm_2 */
+
+  /* USER CODE END E2P_Read_McuNvm_2 */
+}
+
+E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len)
+{
+  /* USER CODE BEGIN E2P_Write_McuNvm_1 */
+
+  /* USER CODE END E2P_Write_McuNvm_1 */
+  E2P_ErrorStatus_t error = E2P_OK;
+  int32_t i = 0;
+
+  HAL_FLASH_Unlock();
+
+  E2P_Write(EE_MCU_NVM_0_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_MCU_NVM_1_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_MCU_NVM_2_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_MCU_NVM_3_ID, (uint32_t) data_to_write[i++]);
+
+  HAL_FLASH_Lock();
+
+  if (i != len)
+  {
+    error =  E2P_KO;
+  }
+  return error;
+  /* USER CODE BEGIN E2P_Write_McuNvm_2 */
+
+  /* USER CODE END E2P_Write_McuNvm_2 */
+}
+
+int32_t EE_ReadValue(e_EE_ID EEsgfxID,  uint32_t *data)
+{
+  /* USER CODE BEGIN EE_ReadValue_1 */
+
+  /* USER CODE END EE_ReadValue_1 */
+  int32_t  status;
+
+  /* Prevent CM4 to read EEPROM private part of CM0 */
+  if (EEsgfxID < MAX_CPU2_PRIVATE)
+  {
+    return ERROR_READ_WRITE_EEPROM;
+  }
+  else
+  {
+    status = EE_Read(EE_BANK_0, (uint16_t)EEsgfxID, data);
+  }
+  return status;
+  /* USER CODE BEGIN EE_ReadValue_2 */
+
+  /* USER CODE END EE_ReadValue_2 */
+}
+
+int32_t EE_WriteValue(e_EE_ID EEsgfxID,  uint32_t data)
+{
+  /* USER CODE BEGIN EE_WriteValue_1 */
+
+  /* USER CODE END EE_WriteValue_1 */
+  int32_t status;
+
+  /* Prevent CM4 to write EEPROM private part of CM0 */
+  if (EEsgfxID < MAX_CPU2_PRIVATE)
+  {
+    return ERROR_READ_WRITE_EEPROM;
+  }
+  else
+  {
+    HAL_FLASH_Unlock();
+
+    status = EE_Write(EE_BANK_0, EEsgfxID, data);
+    if (status  == EE_CLEAN_NEEDED)
+    {
+      EE_Clean(EE_BANK_0, EE_CLEAN_MODE_POLLING);
+    }
+
+    HAL_FLASH_Lock();
+  }
+
+  return status;
+  /* USER CODE BEGIN EE_WriteValue_2 */
+
+  /* USER CODE END EE_WriteValue_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void E2P_Write(e_EE_ID addr, uint32_t data)
+{
+  /* USER CODE BEGIN E2P_Write_1 */
+
+  /* USER CODE END E2P_Write_1 */
+  if (EE_Write(EE_BANK_0, (uint16_t) addr, data) == EE_CLEAN_NEEDED)
+  {
+    EE_Clean(EE_BANK_0, EE_CLEAN_MODE_POLLING);
+  }
+  /* USER CODE BEGIN E2P_Write_2 */
+
+  /* USER CODE END E2P_Write_2 */
+}
+
+static void E2P_Read(e_EE_ID addr, uint32_t *data)
+{
+  /* USER CODE BEGIN E2P_Read_1 */
+
+  /* USER CODE END E2P_Read_1 */
+  EE_Read(EE_BANK_0, (uint16_t) addr, data);
+  /* USER CODE BEGIN E2P_Read_2 */
+
+  /* USER CODE END E2P_Read_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h
new file mode 100644
index 00000000..b8f92029
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h
@@ -0,0 +1,310 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_eeprom_if.h
+  * @author  MCD Application Team
+  * @brief   eeprom interface to the upper module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SGFX_EEPROM_IF_H__
+#define __SGFX_EEPROM_IF_H__
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sigfox_types.h"
+#include "st_sigfox_api.h"
+#include "se_nvm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+#if defined(__CC_ARM) /* when changing tool chain the EEPROM shall be re-initialized */
+  E2P_SET = (uint32_t)0xAA,   /* Set by Keil */
+#elif defined(__ICCARM__)
+  E2P_SET = (uint32_t) 0xBB,   /* Set by IAR */
+#else  /* __GNUC__ */
+  E2P_SET = (uint32_t) 0xCC,   /* Set by GCC */
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+  E2P_RST = (uint32_t)  0     /* EEPROM has not yet been set or has been erased */
+} E2P_flagStatus_t;
+
+typedef enum
+{
+  E2P_OK = (uint32_t)1,   /* Set by Keil */
+  E2P_KO = (uint32_t)0     /* EEPROM has not yet been set or has been erased */
+} E2P_ErrorStatus_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MAX_CPU2_PRIVATE             EE_RSSI_CAL_ID
+#define ERROR_READ_WRITE_EEPROM      0x7FFFFFFF
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+typedef enum
+{
+  EE_INIT_ID = 0,
+  EE_SE_NVM_0_ID,
+  EE_SE_NVM_1_ID,
+  EE_SE_NVM_2_ID,
+  EE_SE_NVM_3_ID,
+  EE_SE_NVM_4_ID,
+  EE_MCU_NVM_0_ID,
+  EE_MCU_NVM_1_ID,
+  EE_MCU_NVM_2_ID,
+  EE_MCU_NVM_3_ID,
+  /*Public ID e.g. visible on M4 starting at EE_ID=EE_RSSI_CAL_ID */
+  EE_RSSI_CAL_ID = 100,
+  EE_AT_ECHO_ID,
+  EE_TX_POWER_RC1_ID,
+  EE_TX_POWER_RC2_ID,
+  EE_TX_POWER_RC3A_ID,
+  EE_TX_POWER_RC3C_ID,
+  EE_TX_POWER_RC4_ID,
+  EE_TX_POWER_RC5_ID,
+  EE_TX_POWER_RC6_ID,
+  EE_TX_POWER_RC7_ID,
+  EE_SGFX_RC_ID,
+  EE_SGFX_KEYTYPE_ID,
+  EE_MACROCH_CONFIG_WORD0_RC2_ID,
+  EE_MACROCH_CONFIG_WORD1_RC2_ID,
+  EE_MACROCH_CONFIG_WORD2_RC2_ID,
+  EE_MACROCH_CONFIG_WORD0_RC3A_ID,
+  EE_MACROCH_CONFIG_WORD1_RC3A_ID,
+  EE_MACROCH_CONFIG_WORD2_RC3A_ID,
+  EE_MACROCH_CONFIG_WORD0_RC3C_ID,
+  EE_MACROCH_CONFIG_WORD1_RC3C_ID,
+  EE_MACROCH_CONFIG_WORD2_RC3C_ID,
+  EE_MACROCH_CONFIG_WORD0_RC4_ID,
+  EE_MACROCH_CONFIG_WORD1_RC4_ID,
+  EE_MACROCH_CONFIG_WORD2_RC4_ID,
+  EE_MACROCH_CONFIG_WORD0_RC5_ID,
+  EE_MACROCH_CONFIG_WORD1_RC5_ID,
+  EE_MACROCH_CONFIG_WORD2_RC5_ID,
+  EE_SGFX_ENCRYPTIONFLAG_ID,
+  EE_SGFX_VERBOSELEVEL_ID,
+  EE_ID_COUNT,
+} e_EE_ID;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/*!
+ * @brief Initializes the Eeprom
+ * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ */
+void E2P_Init(void);
+
+/*!
+ * @brief Initializes the Eeprom
+ * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ */
+void E2P_RestoreFs(void);
+
+/*!
+ * @brief  Read Output Power
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @return Output Power
+ */
+int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc);
+
+/*!
+ * @brief  Write Output Power to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @param  power Output Power
+ */
+void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power);
+
+/*!
+ * @brief  Read Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return Region Configuration RC
+ */
+sfx_rc_enum_t E2P_Read_Rc(void);
+
+/*!
+ * @brief  Write Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ */
+void E2P_Write_Rc(sfx_rc_enum_t SgfxRc);
+
+/*!
+ * @brief  Read Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
+ */
+void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
+
+/*!
+ * @brief  Write Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
+ */
+void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
+
+/*!
+ * @brief  Read rssi calibration value from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return rssi calibration value
+ */
+int16_t E2P_Read_RssiCal(void);
+
+/*!
+ * @brief  Writes rssi calibration value to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  rssi_cal calibration value
+ */
+void E2P_Write_RssiCal(int16_t rssi_cal);
+
+/*!
+ * @brief  Read Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @retval at_echo
+ */
+uint32_t E2P_Read_AtEcho(void);
+
+/*!
+ * @brief  Write Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  at_echo
+ */
+void E2P_Write_AtEcho(uint32_t at_echo);
+
+/*!
+ * @brief  Read KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @retval KeyType
+ */
+sfx_key_type_t E2P_Read_KeyType(void);
+
+/*!
+ * @brief  Write KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  key_type KeyType setting
+ */
+void E2P_Write_KeyType(sfx_key_type_t key_type);
+
+/*!
+ * @brief  Read EncryptionFlag setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @retval encryption_flag
+ */
+uint8_t E2P_Read_EncryptionFlag(void);
+
+/*!
+ * @brief  Write EncryptionFlag  setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  encryption_flag
+ */
+void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag);
+
+/*!
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data SEnvm
+ * @param  len
+ * @retval error status
+ */
+E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len);
+
+/*!
+ * @brief  Write Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write SEnvm
+ * @param  len
+ * @retval error status
+ */
+E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write, uint32_t len);
+
+/*!
+ * @brief  Read MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data MCUnvm
+ * @param  len
+ * @retval error status
+ */
+E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data,  uint32_t len);
+
+/*!
+ * @brief  Write Region MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write MCUnvm
+ * @param  len
+ * @retval error status
+ */
+E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len);
+
+/*!
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @retval the VL
+ */
+uint8_t E2P_Read_VerboseLevel(void);
+
+/*!
+ * @brief  Read verbose levelsetting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  verboselevel
+ */
+void E2P_Write_VerboseLevel(uint8_t verboselevel);
+
+/*!
+ * @brief  Read Sigfox Configuration from eeprom
+ * @param  EEsgfxID e_EE_ID
+ * @param  data read
+ * @retval error status
+ */
+int32_t EE_ReadValue(e_EE_ID EEsgfxID,  uint32_t *data);
+
+/*!
+ * @brief  Write Sigfox Configuration from eeprom
+ * @param  EEsgfxID e_EE_ID
+ * @param  data read
+ * @retval error status
+ */
+int32_t EE_WriteValue(e_EE_ID EEsgfxID,  uint32_t data);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#endif /* __SGFX_EEPROM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h
new file mode 100644
index 00000000..9dbd7b64
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h
@@ -0,0 +1,38 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file   sigfox_data.h
+  * @author MCD Application Team
+  * @brief  provides encrypted data
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SIGFOX_DATA_H__
+#define __SIGFOX_DATA_H__
+
+/* Includes ------------------------------------------------------------------*/
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+#define SIGFOX_KEY             01, 23, 45, 67, 89, AB, CD, EF, 01, 23, 45, 67, 89, AB, CD, EF
+#define SIGFOX_ID              FE, DC, BA, 98
+#define SIGFOX_PAC             00, 00, 00, 00, 00, 00, 00, 00
+
+/* Exported macros -----------------------------------------------------------*/
+/* External variables --------------------------------------------------------*/
+
+#endif /*__SIGFOX_DATA_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c
new file mode 100644
index 00000000..1b6e1096
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c
@@ -0,0 +1,546 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mcu_api.c
+  * @author  MCD Application Team
+  * @brief   mcu library interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sigfox_types.h"
+#include "sigfox_api.h"
+#include "sigfox_mbwrapper.h"
+#include "mcu_api.h"
+#include "stm32_timer.h"
+#include "stm32_seq.h"
+#include "sgfx_eeprom_if.h"
+#include "sys_debug.h"
+#include "sgfx_cstimer.h"
+#include "utilities_def.h"
+#include "sys_app.h" /*for APP_LOG*/
+#include "radio_board_if.h"
+#include "radio_conf.h" /* RF_WAKEUP_TIME */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MCU_VER "MCU_API_V1.0"
+#define LIBRARY_MEM_SIZE_MAX 200
+
+#define TERM_RESET   "\033[0m"
+#define TERM_BLACK   "\033[30m"      /* Black */
+#define TERM_RED     "\033[31m"      /* Red   */
+#define TERM_GREEN   "\033[32m"      /* Green */
+
+#define T_RADIO_DELAY_ON (RF_WAKEUP_TIME)
+#define T_RADIO_DELAY_OFF (11*10)
+
+#if RF_WAKEUP_TIME<50
+#define ARIB_DELAY (50-RF_WAKEUP_TIME)
+#else
+#define ARIB_DELAY 1
+#endif /* RF_WAKEUP_TIME */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifndef ALIGN
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* !ALIGN */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static int32_t rxcount = 0;
+static int32_t okcount = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+static sfx_u8 mcu_api_version[] = MCU_VER;
+/*The allocated memory must be word aligned */
+static uint8_t LibraryMem[LIBRARY_MEM_SIZE_MAX] ALIGN(4);
+
+static UTIL_TIMER_Object_t Timer_delayMs;
+
+static void OnTimerDelayEvt(void *context);
+
+/*timer to handle low power delays*/
+static UTIL_TIMER_Object_t Timer_Timeout;
+
+static void OnTimerTimeoutEvt(void *context);
+
+/*timer to handleCarrier Sense Timeout*/
+static UTIL_TIMER_Object_t Timer_TimeoutCs;
+
+static void Delay_Lp(uint32_t delay_ms);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+sfx_u8 MCU_API_malloc(sfx_u16 size, sfx_u8 **returned_pointer)
+{
+  sfx_error_t error = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_malloc_1 */
+
+  /* USER CODE END MCU_API_malloc_1 */
+
+  /* Allocate a memory : static or dynamic allocation */
+  /* knowing that the sigfox library will ask for a buffer once at the SIGFOX_API_open() call. */
+  /* This buffer will be released after SIGFOX_API_close() call. */
+  if (size <= LIBRARY_MEM_SIZE_MAX)
+  {
+    /* The memory block is free, we can allocate it */
+    *returned_pointer = LibraryMem ;
+  }
+  else
+  {
+    /* No block available */
+    error = MCU_ERR_API_MALLOC;
+  }
+  /* USER CODE BEGIN MCU_API_malloc_2 */
+
+  /* USER CODE END MCU_API_malloc_2 */
+  return error;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_free(sfx_u8 *ptr)
+{
+  /* USER CODE BEGIN MCU_API_free_1 */
+
+  /* USER CODE END MCU_API_free_1 */
+  /* Free the buffer allocated during the MCU_API_malloc()
+   * called only when SIGFOX_API_close() is called. */
+  return SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_free_2 */
+
+  /* USER CODE END MCU_API_free_2 */
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_tx, sfx_s16 *temperature)
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_get_voltage_temperature_1 */
+
+  /* USER CODE END MCU_API_get_voltage_temperature_1 */
+
+  /* Get the idle voltage of the complete device
+   * Get the TX voltage of the complete device ( during transmission )
+   * Get the temperature of the device
+   * If those values are not available : set it to 0x0000
+   * return the voltage_idle in 1/10 volt on 16bits and 1/10 degrees for the temperature */
+  *voltage_idle = (uint16_t)GetBatteryLevel_mbwrapper(); /* mV */
+  *voltage_tx = 0;
+  *temperature = (uint16_t)((GetTemperatureLevel_mbwrapper() * 10) >> 8);   /* */
+  APP_LOG(TS_ON, VLEVEL_M, "temp=%d , ", (int32_t) *temperature);
+  APP_LOG(TS_OFF, VLEVEL_M, "voltage=%u\n\r", (uint32_t) *voltage_idle);
+
+  /* USER CODE BEGIN MCU_API_get_voltage_temperature_2 */
+
+  /* USER CODE END MCU_API_get_voltage_temperature_2 */
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
+{
+  /* Local variables */
+  sfx_error_t err = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_delay_1 */
+
+  /* USER CODE END MCU_API_delay_1 */
+
+  sfx_rc_enum_t sfx_rc = E2P_Read_Rc();
+
+  /* Switch/case */
+  switch (delay_type)
+  {
+    case SFX_DLY_INTER_FRAME_TRX :
+      /* Interframe used when sending an Uplink Message with a downlink request */
+      /* Delay  is 500ms  in FCC and ETSI
+       * In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX1 */
+      if ((sfx_rc == SFX_RC3A) ||
+          (sfx_rc == SFX_RC3C) ||
+          (sfx_rc == SFX_RC5))
+      {
+        /* 50 ms */
+        Delay_Lp(ARIB_DELAY);
+      }
+      else if ((sfx_rc == SFX_RC2) ||
+               (sfx_rc == SFX_RC4))
+      {
+        Delay_Lp(510 - T_RADIO_DELAY_ON - T_RADIO_DELAY_OFF / 6); /* 500-525ms */
+      }
+      else
+      {
+        Delay_Lp(510 - (T_RADIO_DELAY_ON) - T_RADIO_DELAY_OFF); /* 500-525 ms */
+      }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TRX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TRX2 */
+      break;
+
+    case SFX_DLY_INTER_FRAME_TX :
+      /* Interframe used when sending an Uplink Message without downlink request */
+      /* Start delay 0 seconds to 2 seconds in FCC and ETSI*/
+      /* In ARIB : minimum delay is 50 ms */
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX1 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX1 */
+      if ((sfx_rc == SFX_RC3A) ||
+          (sfx_rc == SFX_RC3C) ||
+          (sfx_rc == SFX_RC5))
+      {
+        /* 50 ms */
+        Delay_Lp(ARIB_DELAY);
+      }
+      else
+      {
+        Delay_Lp(1000 - T_RADIO_DELAY_ON - T_RADIO_DELAY_OFF); /* 1000 ms */
+      }
+      /* USER CODE BEGIN SFX_DLY_INTER_FRAME_TX2 */
+
+      /* USER CODE END SFX_DLY_INTER_FRAME_TX2 */
+      break;
+
+    case SFX_DLY_OOB_ACK :
+      /*  Delay between RX frame and sending ack in oob service frame*/
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK1 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK1 */
+      /* Start delay between 1.4 seconds to 4 seconds in FCC and ETSI */
+      Delay_Lp(1600 - T_RADIO_DELAY_ON);
+      /* USER CODE BEGIN SFX_DLY_OOB_ACK2 */
+
+      /* USER CODE END SFX_DLY_OOB_ACK2 */
+      break;
+
+    case SFX_DLY_CS_SLEEP :
+      /* Delay between attempts of carrier sense for the first frame*/
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP1 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP1 */
+      Delay_Lp(500 - T_RADIO_DELAY_ON); /* 500 ms */
+      /* USER CODE BEGIN SFX_DLY_CS_SLEEP2 */
+
+      /* USER CODE END SFX_DLY_CS_SLEEP2 */
+      break;
+    /* USER CODE BEGIN SFX_DLY_ADD_CASE */
+
+    /* USER CODE END SFX_DLY_ADD_CASE */
+    default :
+      err = MCU_ERR_API_DLY;
+      /* USER CODE BEGIN SFX_DLY_DEFAULT */
+
+      /* USER CODE END SFX_DLY_DEFAULT */
+      break;
+  }
+  /* USER CODE BEGIN MCU_API_delay_Last */
+
+  /* USER CODE END MCU_API_delay_Last */
+  return err;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_get_nv_mem1 */
+
+  /* USER CODE END MCU_API_get_nv_mem1 */
+  /* Read out SFX_NVMEM_BLOCK_SIZE bytes in eeprom or equivalent
+   * in flash as Non Volatile Memory (NVM)
+   * This cannot be in RAM : must be remanent*/
+  if (E2P_Read_McuNvm(read_data, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
+  {
+    return MCU_ERR_API_GETNVMEM;
+  }
+  /* USER CODE BEGIN MCU_API_get_nv_mem2 */
+
+  /* USER CODE END MCU_API_get_nv_mem2 */
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_set_nv_mem_1 */
+
+  /* USER CODE END MCU_API_set_nv_mem_1 */
+  /* Write down SFX_NVMEM_BLOCK_SIZE bytes
+   * in the eeprom or flash such as it can be retrieved
+   * later even if device is switched off or rebooting*/
+  if (E2P_Write_McuNvm(data_to_write, SFX_NVMEM_BLOCK_SIZE) != E2P_OK)
+  {
+    return MCU_ERR_API_SETNVMEM;
+  }
+  /* USER CODE BEGIN MCU_API_set_nv_mem_2 */
+
+  /* USER CODE END MCU_API_set_nv_mem_2 */
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_1 */
+
+  /* USER CODE END MCU_API_timer_start_carrier_sense_1 */
+  /* Starts a timer for the carrier sense. You can plug your timer
+   * expiration to a callback that will update the timer event
+   * status checked by RF_API_wait_for_clear_channel*/
+  /* Starts CS timeout during time_duration_in_ms */
+
+  APP_LOG(TS_ON, VLEVEL_M, "CS timeout Started= %d msec\n\r", time_duration_in_ms);
+  UTIL_TIMER_Create(&Timer_TimeoutCs, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTimerTimeoutCsEvt, NULL);
+  UTIL_TIMER_Stop(&Timer_TimeoutCs);
+  UTIL_TIMER_SetPeriod(&Timer_TimeoutCs,  time_duration_in_ms);
+  UTIL_TIMER_Start(&Timer_TimeoutCs);
+  /* USER CODE BEGIN MCU_API_timer_start_carrier_sense_2 */
+
+  /* USER CODE END MCU_API_timer_start_carrier_sense_2 */
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_timer_start_1 */
+
+  /* USER CODE END MCU_API_timer_start_1 */
+  /* Starts MCU timer during time_duration_in_ms */
+  /* This timer start can install a callback to indicate when it occurs
+   * This event will be caught in the MCU_API_wait_for_end_timer() function. */
+  uint32_t time_duration_in_millisec = time_duration_in_s * 1000;
+  APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Started= %d sec\n\r", time_duration_in_s);
+
+  UTIL_TIMER_Create(&Timer_Timeout, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTimerTimeoutEvt, NULL);
+  UTIL_TIMER_Stop(&Timer_Timeout);
+  UTIL_TIMER_SetPeriod(&Timer_Timeout, time_duration_in_millisec);
+  UTIL_TIMER_Start(&Timer_Timeout);
+
+  /* USER CODE BEGIN MCU_API_timer_start_2 */
+
+  /* USER CODE END MCU_API_timer_start_2 */
+
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_timer_stop(void)
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_timer_stop_1 */
+
+  /* USER CODE END MCU_API_timer_stop_1 */
+  /* Stops MCU timer started in MCU_API_timer_start*/
+  APP_LOG(TS_ON, VLEVEL_M, "timer_stop\n\r");
+
+  UTIL_TIMER_Stop(&Timer_Timeout);
+  /* USER CODE BEGIN MCU_API_timer_stop_2 */
+
+  /* USER CODE END MCU_API_timer_stop_2 */
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_timer_stop_carrier_sense(void)
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_1 */
+
+  /* USER CODE END MCU_API_timer_stop_carrier_sense_1 */
+  /* Abort the carrier sense: stops CS timer */
+  APP_LOG(TS_ON, VLEVEL_M, "CS timer_stop\n\r");
+
+  UTIL_TIMER_Stop(&Timer_TimeoutCs);
+  /* USER CODE BEGIN MCU_API_timer_stop_carrier_sense_2 */
+
+  /* USER CODE END MCU_API_timer_stop_carrier_sense_2 */
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_timer_wait_for_end(void)
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_timer_wait_for_end_1 */
+
+  /* USER CODE END MCU_API_timer_wait_for_end_1 */
+  /* This function is waiting (actively or not) on the event for end timer
+   * (started by MCU_API_timer_start) elapsed and then returns*/
+  APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Wait\n\r");
+
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
+  /* USER CODE BEGIN MCU_API_timer_wait_for_end_2 */
+
+  /* USER CODE END MCU_API_timer_wait_for_end_2 */
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_report_test_result(sfx_bool status, sfx_s16 rssi)
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_report_test_result_1 */
+
+  /* USER CODE END MCU_API_report_test_result_1 */
+  /* this function is used to to report status and rssi
+   * optionally, it can log data on terminal*/
+  rxcount++;
+
+  if (status == SFX_TRUE)
+  {
+    /* Last Rx Packet received*/
+    /* USER CODE BEGIN SFX_TRUE_1 */
+    BSP_LED_On(LED_GREEN);
+    HAL_Delay(50);
+    BSP_LED_Off(LED_GREEN);
+    /* USER CODE END SFX_TRUE_1 */
+    okcount++;
+    APP_LOG(TS_ON, VLEVEL_H, TERM_GREEN"RX OK. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r  "TERM_RESET, (int32_t) rssi, rxcount,
+            ((rxcount - okcount) * 100) / rxcount);
+    /* USER CODE BEGIN SFX_TRUE_2 */
+
+    /* USER CODE END SFX_TRUE_2 */
+  }
+  else
+  {
+    /* Last Rx Packet on error or timeout*/
+    /* USER CODE BEGIN SFX_FALSE_1 */
+    BSP_LED_On(LED_BLUE);
+    HAL_Delay(50);
+    BSP_LED_Off(LED_BLUE);
+    /* USER CODE END SFX_FALSE_1 */
+    APP_LOG(TS_ON, VLEVEL_H, TERM_RED"RX KO. RSSI= %d dBm, cnt=%d, PER=%d%""%""\n\r "TERM_RESET, (int32_t)rssi, rxcount,
+            ((rxcount - okcount) * 100) / rxcount);
+    /* USER CODE BEGIN SFX_FALSE_2 */
+
+    /* USER CODE END SFX_FALSE_2 */
+  }
+  /* USER CODE BEGIN MCU_API_report_test_result_2 */
+
+  /* USER CODE END MCU_API_report_test_result_2 */
+  return ret;
+}
+
+/*******************************************************************/
+sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
+{
+  sfx_u8 ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN MCU_API_get_version_1 */
+
+  /* USER CODE END MCU_API_get_version_1 */
+  /* Reports version and the size of the version buffer*/
+  *version = (sfx_u8 *)mcu_api_version;
+  if (size == SFX_NULL)
+  {
+    return MCU_ERR_API_GET_VERSION;
+  }
+  *size = sizeof(mcu_api_version);
+  /* USER CODE BEGIN MCU_API_get_version_2 */
+
+  /* USER CODE END MCU_API_get_version_2 */
+
+  return ret;
+}
+
+static void Delay_Lp(uint32_t delay_ms)
+{
+  /* USER CODE BEGIN Delay_Lp_1 */
+
+  /* USER CODE END Delay_Lp_1 */
+  APP_LOG(TS_ON, VLEVEL_M, "Delay= %d ms\n\r", delay_ms);
+  if (delay_ms > 5)
+  {
+    UTIL_TIMER_Create(&Timer_delayMs, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnTimerDelayEvt, NULL);
+    UTIL_TIMER_Stop(&Timer_delayMs);
+    UTIL_TIMER_SetPeriod(&Timer_delayMs,  delay_ms);
+    UTIL_TIMER_Start(&Timer_delayMs);
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Delay);
+  }
+  else
+  {
+    HAL_Delay(delay_ms);
+  }
+  APP_LOG(TS_ON, VLEVEL_M, "Delay Up\n\r");
+  /* USER CODE BEGIN Delay_Lp_2 */
+
+  /* USER CODE END Delay_Lp_2 */
+}
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void OnTimerDelayEvt(void *context)
+{
+  /* USER CODE BEGIN OnTimerDelayEvt_1 */
+
+  /* USER CODE END OnTimerDelayEvt_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Delay);
+  /* USER CODE BEGIN OnTimerDelayEvt_2 */
+
+  /* USER CODE END OnTimerDelayEvt_2 */
+}
+
+static void OnTimerTimeoutEvt(void *context)
+{
+  /* USER CODE BEGIN OnTimerTimeoutEvt_1 */
+
+  /* USER CODE END OnTimerTimeoutEvt_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "TIM timeout Stopped\n\r");
+  /* USER CODE BEGIN OnTimerTimeoutEvt_2 */
+
+  /* USER CODE END OnTimerTimeoutEvt_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h
new file mode 100644
index 00000000..c0a63471
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h
@@ -0,0 +1,352 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mcu_api.h
+  * @author  MCD Application Team
+  * @brief   defines the interface to mcu_api.c
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/*!
+\if SIGFOX PATTERN
+----------------------------------------------
+
+  _____   _   _____   _____   _____  __    __
+ /  ___/ | | /  ___| |  ___| /  _  \ \ \  / /
+ | |___  | | | |     | |__   | | | |  \ \/ /
+ \___  \ | | | |  _  |  __|  | | | |   }  {
+  ___| | | | | |_| | | |     | |_| |  / /\ \
+ /_____/ |_| \_____/ |_|     \_____/ /_/  \_\
+
+----------------------------------------------
+
+   !!!!  DO NOT MODIFY THIS FILE !!!!
+
+----------------------------------------------
+\endif
+ ----------------------------------------------*/
+/*!
+ * \file mcu_api.h
+ * \brief Sigfox manufacturer functions
+ * \author $(SIGFOX_LIB_AUTHOR)
+ * \version $(SIGFOX_LIB_VERSION)
+ * \date $(SIGFOX_LIB_DATE)
+ * \copyright Copyright (c) 2011-2015 SIGFOX, All Rights Reserved. This is unpublished proprietary source code of SIGFOX.
+ *
+ * This file defines the manufacturer's MCU functions to be implemented
+ * for library usage.
+ */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+
+#ifndef __SIGFOX_MCU_API_H__
+#define __SIGFOX_MCU_API_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/********************************************************
+  * External API dependencies to link with this library.
+  *
+  * Error codes of the MCU API functions are described below.
+  * The Manufacturer can add more error code taking care of the limits defined.
+  *
+  ********************************************************/
+
+/*!
+  * \defgroup MCU_ERR_API_xx codes Return Error codes definition for MCU API
+  *
+  * \brief Can be customized to add new error codes.
+  * All MCU_API_ error codes will be piped with SIGFOX_API_xxx return code.<BR>
+  *
+  * IMPORTANT : SFX_ERR_NONE return code is mandatory when no error for each MCU_API_xxx RF_API_xxx REPEATER_API_xxx or SE_API_xxx
+  * functions.
+  *
+  *  @{
+  */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for MCU API ERROR CODES : From 0x10 to 0x2F       */
+/* ---------------------------------------------------------------- */
+
+#define MCU_ERR_API_MALLOC                          (sfx_u8)(0x11) /*!< Error on MCU_API_malloc */
+#define MCU_ERR_API_FREE                            (sfx_u8)(0x12) /*!< Error on MCU_API_free */
+#define MCU_ERR_API_VOLT_TEMP                       (sfx_u8)(0x13) /*!< Error on MCU_API_get_voltage_temperature */
+#define MCU_ERR_API_DLY                             (sfx_u8)(0x14) /*!< Error on MCU_API_delay */
+#define MCU_ERR_API_AES                             (sfx_u8)(0x15) /*!< Error on MCU_API_aes_128_cbc_encrypt */
+#define MCU_ERR_API_GETNVMEM                        (sfx_u8)(0x16) /*!< Error on MCU_API_get_nv_mem */
+#define MCU_ERR_API_SETNVMEM                        (sfx_u8)(0x17) /*!< Error on MCU_API_set_nv_mem */
+#define MCU_ERR_API_TIMER_START                     (sfx_u8)(0x18) /*!< Error on MCU_API_timer_start */
+#define MCU_ERR_API_TIMER_START_CS                  (sfx_u8)(0x19) /*!< Error on MCU_API_timer_start_carrier_sense */
+#define MCU_ERR_API_TIMER_STOP_CS                   (sfx_u8)(0x1A) /*!< Error on MCU_API_timer_stop_carrier_sense */
+#define MCU_ERR_API_TIMER_STOP                      (sfx_u8)(0x1B) /*!< Error on MCU_API_timer_stop */
+#define MCU_ERR_API_TIMER_END                       (sfx_u8)(0x1C) /*!< Error on MCU_API_timer_wait_for_end */
+#define MCU_ERR_API_TEST_REPORT                     (sfx_u8)(0x1D) /*!< Error on MCU_API_report_test_result */
+#define MCU_ERR_API_GET_VERSION                     (sfx_u8)(0x1E) /*!< Error on MCU_API_get_version */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for RF API ERROR CODES : From 0x30 to 0x3F        */
+/* ---------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for SE API ERROR CODES : From 0x40 to 0x5F        */
+/* ---------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for REPEATER API ERROR CODES : From 0x60 to 0x7F  */
+/* ---------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for MONARCH API ERROR CODES : From 0x80 to 0x8F   */
+/* ---------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------------- */
+/* Bytes reserved for DEVICE CONFIG API ERROR CODES : From 0x90 to 0x9A   */
+/* ---------------------------------------------------------------------- */
+
+/** @}*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_malloc(sfx_u16 size, sfx_u8 **returned_pointer)
+  * \brief Allocate memory for library usage (Memory usage = size (Bytes))
+  * This function is only called once at the opening of the Sigfox Library ( SIGF
+  *
+  * IMPORTANT NOTE:
+  * --------------
+  * The address reported need to be aligned with architecture of the microprocessor used.
+  * For a Microprocessor of:
+  *   - 8 bits  => any address is allowed
+  *   - 16 bits => only address multiple of 2 are allowed
+  *   - 32 bits => only address multiple of 4 are allowed
+  *
+  * \param[in] sfx_u16 size                  size of buffer to allocate in bytes
+  * \param[out] sfx_u8 **returned_pointer    pointer to buffer (can be static)
+  *
+  * \retval SFX_ERR_NONE:              No error
+  * \retval MCU_ERR_API_MALLOC         Malloc error
+  *******************************************************************/
+sfx_u8 MCU_API_malloc(sfx_u16 size, sfx_u8 **returned_pointer);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_free(sfx_u8 *ptr)
+  * \brief Free memory allocated to library
+  *
+  * \param[in] sfx_u8 *ptr                        pointer to buffer
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_FREE:                     Free error
+  *******************************************************************/
+sfx_u8 MCU_API_free(sfx_u8 *ptr);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle, sfx_u16 *voltage_tx, sfx_s16 *temperature)
+  * \brief Get voltage and temperature for Out of band frames
+  * Value must respect the units below for <B>backend compatibility</B>
+  *
+  * \param[in] none
+  * \param[out] sfx_u16 *voltage_idle             Device's voltage in Idle state (mV)
+  * \param[out] sfx_u16 *voltage_tx               Device's voltage in Tx state (mV) - for the last transmission
+  * \param[out] sfx_s16 *temperature              Device's temperature in 1/10 of degrees celsius
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_VOLT_TEMP:                Get voltage/temperature error
+  *******************************************************************/
+sfx_u8 MCU_API_get_voltage_temperature(sfx_u16 *voltage_idle,
+                                       sfx_u16 *voltage_tx,
+                                       sfx_s16 *temperature);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_delay(sfx_delay_t delay_type)
+  * \brief Inter stream delay, called between each RF_API_send
+  * - SFX_DLY_INTER_FRAME_TX  : 0 to 2s in Uplink DC
+  * - SFX_DLY_INTER_FRAME_TRX : 500 ms in Uplink/Downlink FH & Downlink DC
+  * - SFX_DLY_OOB_ACK :         1.4s to 4s for Downlink OOB
+  * - SFX_CS_SLEEP :            delay between several trials of Carrier Sense (for the first frame only)
+  *
+  * \param[in] sfx_delay_t delay_type             Type of delay to call
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_DLY:                      Delay error
+  *******************************************************************/
+sfx_u8 MCU_API_delay(sfx_delay_t delay_type);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE])
+  * \brief This function copies the data read from non volatile memory
+  * into the buffer pointed by read_data.<BR>
+  * The size of the data to read is \link SFX_NVMEM_BLOCK_SIZE \endlink
+  * bytes.
+  * CAREFUL : this value can change according to the features included
+  * in the library (covered zones, etc.)
+  *
+  * \param[in] none
+  * \param[out] sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE] Pointer to the data block to write with the data stored in memory
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_GETNVMEM:                 Read nvmem error
+  *******************************************************************/
+sfx_u8 MCU_API_get_nv_mem(sfx_u8 read_data[SFX_NVMEM_BLOCK_SIZE]);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE])
+  * \brief This function writes data pointed by data_to_write to non
+  * volatile memory.<BR> It is strongly recommended to use NV memory
+  * like EEPROM since this function is called at each SIGFOX_API_send_xxx.
+  * The size of the data to write is \link SFX_NVMEM_BLOCK_SIZE \endlink
+  * bytes.
+  * CAREFUL : this value can change according to the features included
+  * in the library (covered zones, etc.)
+  *
+  * \param[in] sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE] Pointer to data block to be written in memory
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_SETNVMEM:                 Write nvmem error
+  *******************************************************************/
+sfx_u8 MCU_API_set_nv_mem(sfx_u8 data_to_write[SFX_NVMEM_BLOCK_SIZE]);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms)
+  * \brief Start timer for :
+  * - carrier sense maximum window (used in ARIB standard)
+  *
+  * \param[in] sfx_u16 time_duration_in_ms        Timer value in milliseconds
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_TIMER_START_CS:           Start CS timer error
+  *******************************************************************/
+sfx_u8 MCU_API_timer_start_carrier_sense(sfx_u16 time_duration_in_ms);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s)
+  * \brief Start timer for in second duration
+  *
+  * \param[in] sfx_u32 time_duration_in_s         Timer value in seconds
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_TIMER_START:              Start timer error
+  *******************************************************************/
+sfx_u8 MCU_API_timer_start(sfx_u32 time_duration_in_s);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_timer_stop(void)
+  * \brief Stop the timer (started with MCU_API_timer_start)
+  *
+  * \param[in] none
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_TIMER_STOP:               Stop timer error
+  *******************************************************************/
+sfx_u8 MCU_API_timer_stop(void);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_timer_stop_carrier_sense(void)
+  * \brief Stop the timer (started with MCU_API_timer_start_carrier_sense)
+  *
+  * \param[in] none
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_TIMER_STOP_CS:            Stop timer error
+  *******************************************************************/
+sfx_u8 MCU_API_timer_stop_carrier_sense(void);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_timer_wait_for_end(void)
+  * \brief Blocking function to wait for interrupt indicating timer
+  * elapsed.<BR> This function is only used for the 20 seconds wait
+  * in downlink.
+  *
+  * \param[in] none
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_TIMER_END:                Wait end of timer error
+  *******************************************************************/
+sfx_u8 MCU_API_timer_wait_for_end(void);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_report_test_result(sfx_bool status, sfx_s16 rssi)
+  * \brief To report the result of Rx test for each valid message
+  * received/validated by library.<BR> Manufacturer api to show the result
+  * of RX test mode : can be uplink radio frame or uart print or
+  * gpio output.
+  * RSSI parameter is only used to report the rssi of received frames (downlink test)
+  *
+  * \param[in] sfx_bool status                    Is SFX_TRUE when result ok else SFX_FALSE
+  *                                               See SIGFOX_API_test_mode summary
+  * \param[in] rssi                              RSSI of the received frame
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_TEST_REPORT:              Report test result error
+  *******************************************************************/
+sfx_u8 MCU_API_report_test_result(sfx_bool status, sfx_s16 rssi);
+
+/*!******************************************************************
+  * \fn sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size)
+  * \brief Returns current MCU API version
+  *
+  * \param[out] sfx_u8 **version                  Pointer to Byte array (ASCII format) containing library version
+  * \param[out] sfx_u8 *size                      Size of the byte array pointed by *version
+  *
+  * \retval SFX_ERR_NONE:                         No error
+  * \retval MCU_ERR_API_GET_VERSION:              Get Version error
+  *******************************************************************/
+sfx_u8 MCU_API_get_version(sfx_u8 **version, sfx_u8 *size);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SIGFOX_MCU_API_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.c
new file mode 100644
index 00000000..5a748e02
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.c
@@ -0,0 +1,375 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mn_api.c
+  * @author  MCD Application Team
+  * @brief   monarch library interface implementation
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "stm32wlxx_hal.h"
+
+#include "mn_api.h"
+#include "mn_lptim_if.h"
+#include "radio.h"
+#include "platform.h"          /*For led*/
+#include "sys_app.h"           /*For log*/
+#include "stm32_lpm.h"
+#include "stm32_timer.h"
+#include "stm32_seq.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief LPTIM handle
+  */
+extern LPTIM_HandleTypeDef hlptim1;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/*OOK demod on for debug*/
+#define MN_PROCESS_IN_BG 1
+
+#define LPTIM_PERIOD     ((uint32_t)  2)        /* 1/16384~61.03us  */
+
+#define LPTIM_PULSE      ((uint32_t) 0 )
+
+#define RADIO_NOISE_LEVEL (int16_t) (-130)
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* RSSi register to be restored after end of Monarch*/
+static uint8_t Reg0x089B;
+
+#if (MN_PROCESS_IN_BG==1)
+#define SIZE_OF_RSSI_BUFF   (1<<4)
+int16_t RssiBuff[SIZE_OF_RSSI_BUFF];
+__IO int16_t RssiBuffWriteIdx;
+int16_t RssiBuffReadIdx;
+static void process_MonarchBackGround(void);
+#endif /* MN_PROCESS_IN_BG==1 */
+
+/* Flag to disable rssi read transfer (in timer cB) while configuring radio*/
+static uint8_t RssiReadOnIT_Enable = 1;
+
+/*Monarch timeout timer*/
+static UTIL_TIMER_Object_t Monarch_TimerTimeout;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/*monarch API callback at every timer interrupt*/
+static void (*MN_Timer_CB)(int16_t rssi);
+
+/**
+  * @brief  Starts Timer
+  * @param  None
+  * @retval None
+  */
+static void MN_TIM_Start(void);
+
+/**
+  * @brief  Stops Timer
+  * @param  None
+  * @retval None
+  */
+static void MN_TIM_Stop(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void MN_API_Init(void (*MN_API_Timer_CB)(int16_t rssi))
+{
+  /* USER CODE BEGIN MN_API_Init_1 */
+
+  /* USER CODE END MN_API_Init_1 */
+  /*Register call back*/
+  MN_Timer_CB = MN_API_Timer_CB;
+
+  MN_LPTIM_IF_Init();
+
+  APP_LOG(TS_ON, VLEVEL_M, "MN Init\r\n");
+
+  Reg0x089B = Radio.Read(0x089B);
+
+  Radio.Write(0x089B, 0x0);
+
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_SGFX_MN_Id), UTIL_LPM_DISABLE);
+#if (MN_PROCESS_IN_BG==1)
+  /*reset write indices*/
+  RssiBuffWriteIdx = 0;
+  /*reset read indices*/
+  RssiBuffReadIdx = 0;
+  /*reset RssiBuff*/
+  UTIL_MEM_set_8((uint8_t *) RssiBuff, 0, SIZE_OF_RSSI_BUFF * sizeof(int16_t));
+  /* register process_MonarchBackGround under CFG_SEQ_TASK_MONARCH */
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_Monarch), UTIL_SEQ_RFU, process_MonarchBackGround);
+#endif /* MN_PROCESS_IN_BG==1 */
+  /* USER CODE BEGIN MN_API_Init_2 */
+
+  /* USER CODE END MN_API_Init_2 */
+}
+
+void MN_API_DeInit(void)
+{
+  /* USER CODE BEGIN MN_API_DeInit_1 */
+
+  /* USER CODE END MN_API_DeInit_1 */
+  MN_TIM_Stop();
+
+  MN_LPTIM_IF_DeInit();
+
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_SGFX_MN_Id), UTIL_LPM_ENABLE);
+
+  Radio.Write(0x089B, Reg0x089B);
+
+  APP_LOG(TS_ON, VLEVEL_M, "MN Deinit\r\n");
+  /* USER CODE BEGIN MN_API_DeInit_2 */
+
+  /* USER CODE END MN_API_DeInit_2 */
+}
+
+void MN_API_StartRx(void)
+{
+  /* USER CODE BEGIN MN_API_StartRx_1 */
+
+  /* USER CODE END MN_API_StartRx_1 */
+  RssiReadOnIT_Enable = 0;
+
+  Radio.RxBoosted(0);
+
+  RssiReadOnIT_Enable = 1;
+  /* USER CODE BEGIN MN_API_StartRx_2 */
+
+  /* USER CODE END MN_API_StartRx_2 */
+}
+
+void MN_API_StopRx(void)
+{
+  /* USER CODE BEGIN MN_API_StopRx_1 */
+
+  /* USER CODE END MN_API_StopRx_1 */
+  /*no need to standby xosc, radio will just
+    change freq with MN_API_change_frequency*/
+  /* USER CODE BEGIN MN_API_StopRx_2 */
+
+  /* USER CODE END MN_API_StopRx_2 */
+}
+
+void MN_API_change_frequency(uint32_t frequency)
+{
+  /* USER CODE BEGIN MN_API_change_frequency_1 */
+
+  /* USER CODE END MN_API_change_frequency_1 */
+  RssiReadOnIT_Enable = 0;
+
+  Radio.SetChannel(frequency);
+
+  RssiReadOnIT_Enable = 1;
+  /* USER CODE BEGIN MN_API_change_frequency_2 */
+
+  /* USER CODE END MN_API_change_frequency_2 */
+}
+
+void MN_API_Enable16KHzSamplingTimer(void)
+{
+  /* USER CODE BEGIN MN_API_Enable16KHzSamplingTimer_1 */
+
+  /* USER CODE END MN_API_Enable16KHzSamplingTimer_1 */
+  MN_TIM_Start();
+  /* USER CODE BEGIN MN_API_Enable16KHzSamplingTimer_2 */
+
+  /* USER CODE END MN_API_Enable16KHzSamplingTimer_2 */
+}
+
+void MN_API_Disable16KHzSamplingTimer(void)
+{
+  /* USER CODE BEGIN MN_API_Disable16KHzSamplingTimer_1 */
+
+  /* USER CODE END MN_API_Disable16KHzSamplingTimer_1 */
+  MN_TIM_Stop();
+  /* USER CODE BEGIN MN_API_Disable16KHzSamplingTimer_2 */
+
+  /* USER CODE END MN_API_Disable16KHzSamplingTimer_2 */
+}
+
+void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequency, int32_t best_rssi)
+{
+  /* USER CODE BEGIN MN_API_Pattern_Found_1 */
+  BSP_LED_On(LED_BLUE);
+  /* USER CODE END MN_API_Pattern_Found_1 */
+  /* debug function to display sweep/window detected pattern*/
+  if (window_type == 0)
+  {
+    APP_LOG(TS_ON, VLEVEL_H, "Sweep detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
+  }
+  else
+  {
+    APP_LOG(TS_ON, VLEVEL_H, "Window detected pattern %d on freq %d at %d\n\r", pattern, frequency, best_rssi);
+  }
+  /* USER CODE BEGIN MN_API_Pattern_Found_2 */
+  BSP_LED_Off(LED_BLUE);
+  /* USER CODE END MN_API_Pattern_Found_2 */
+}
+
+void MN_API_TimerSart(uint32_t timer_value_ms, void (*TimeoutHandle)(void *Argument))
+{
+  /* USER CODE BEGIN MN_API_TimerSart_1 */
+
+  /* USER CODE END MN_API_TimerSart_1 */
+  APP_LOG(TS_ON, VLEVEL_H, "MONARCH_TIM_START: %d ms\n\r", timer_value_ms);
+  UTIL_TIMER_Create(&Monarch_TimerTimeout, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, TimeoutHandle, NULL);
+  UTIL_TIMER_Stop(&Monarch_TimerTimeout);
+  UTIL_TIMER_SetPeriod(&Monarch_TimerTimeout, timer_value_ms);
+  UTIL_TIMER_Start(&Monarch_TimerTimeout);
+  /* USER CODE BEGIN MN_API_TimerSart_2 */
+
+  /* USER CODE END MN_API_TimerSart_2 */
+}
+
+void MN_API_TimerStop(void)
+{
+  /* USER CODE BEGIN MN_API_TimerStop_1 */
+
+  /* USER CODE END MN_API_TimerStop_1 */
+  UTIL_TIMER_Stop(&Monarch_TimerTimeout);
+
+  APP_LOG(TS_ON, VLEVEL_H, "MONARCH_TIM_STOP\n\r");
+  /* USER CODE BEGIN MN_API_TimerStop_2 */
+
+  /* USER CODE END MN_API_TimerStop_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void MN_TIM_Start(void)
+{
+  /* USER CODE BEGIN MN_TIM_Start_1 */
+
+  /* USER CODE END MN_TIM_Start_1 */
+  if (HAL_LPTIM_PWM_Start_IT(&hlptim1, LPTIM_PERIOD - 1, LPTIM_PULSE) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MN_TIM_Start_2 */
+
+  /* USER CODE END MN_TIM_Start_2 */
+}
+
+static void MN_TIM_Stop(void)
+{
+  /* USER CODE BEGIN MN_TIM_Stop_1 */
+
+  /* USER CODE END MN_TIM_Stop_1 */
+  /* stop the timer */
+  if (HAL_LPTIM_PWM_Stop_IT(&hlptim1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MN_TIM_Stop_2 */
+
+  /* USER CODE END MN_TIM_Stop_2 */
+}
+
+/*16kHz timer timeout call back*/
+/* Here and pass the bit/rssi as parma for monarch processing*/
+void HAL_LPTIM_AutoReloadMatchCallback(LPTIM_HandleTypeDef *hlptim)
+{
+  /* USER CODE BEGIN HAL_LPTIM_AutoReloadMatchCallback_1 */
+
+  /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_1 */
+  int16_t rssi = RADIO_NOISE_LEVEL;
+
+  /*read rssi*/
+  if (RssiReadOnIT_Enable == 1)
+  {
+    rssi = Radio.Rssi(MODEM_FSK);
+
+#if (MN_PROCESS_IN_BG==1)
+    /*record rssi in buffer*/
+    RssiBuff[RssiBuffWriteIdx++] = rssi;
+    if (RssiBuffWriteIdx == SIZE_OF_RSSI_BUFF)
+    {
+      RssiBuffWriteIdx = 0;
+    }
+    /*run process_MonarchBackGround in background*/
+    UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_Monarch, CFG_SEQ_Prio_0);
+#else
+    MN_Timer_CB(rssi);
+#endif /* MN_PROCESS_IN_BG==1 */
+  }
+  /* USER CODE BEGIN HAL_LPTIM_AutoReloadMatchCallback_2 */
+
+  /* USER CODE END HAL_LPTIM_AutoReloadMatchCallback_2 */
+}
+
+#if (MN_PROCESS_IN_BG==1)
+static void process_MonarchBackGround(void)
+{
+  /* USER CODE BEGIN process_MonarchBackGround_1 */
+
+  /* USER CODE END process_MonarchBackGround_1 */
+  int16_t rssi;
+
+  while (RssiBuffWriteIdx != RssiBuffReadIdx)
+  {
+    rssi = RssiBuff[RssiBuffReadIdx++];
+
+    if (RssiBuffReadIdx == SIZE_OF_RSSI_BUFF)
+    {
+      RssiBuffReadIdx = 0;
+    }
+    MN_Timer_CB(rssi);
+  }
+  /* USER CODE BEGIN process_MonarchBackGround_2 */
+
+  /* USER CODE END process_MonarchBackGround_2 */
+}
+#endif /* MN_PROCESS_IN_BG==1 */
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h
new file mode 100644
index 00000000..1f76066c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h
@@ -0,0 +1,142 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mn_api.h
+  * @author  MCD Application Team
+  * @brief   monarch library interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MN_API_H__
+#define __MN_API_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Initialize the Monarch Low level
+  * @param Callback for rssi sample process
+  * @retval None
+  */
+void MN_API_Init(void (*MN_API_Timer_CB)(int16_t rssi));
+
+/**
+  * @brief DeInitialize the Monarch Low level
+  * @param None
+  * @retval None
+  */
+void MN_API_DeInit(void);
+
+/**
+  * @brief enable the 16k timer for sampling
+  * @param None
+  * @retval None
+  */
+void MN_API_Enable16KHzSamplingTimer(void);
+
+/**
+  * @brief enable the 16k timer for sampling
+  * @param None
+  * @retval None
+  */
+void MN_API_Disable16KHzSamplingTimer(void);
+
+/**
+  * @brief change the RF frequency of the receiver
+  * @param frequency
+  * @retval None
+  */
+void MN_API_change_frequency(uint32_t frequency);
+
+/**
+  * @brief starts receiver
+  * @param None
+  * @retval None
+  */
+void MN_API_StartRx(void);
+
+/**
+  * @brief stops receiver
+  * @param None
+  * @retval None
+  */
+void MN_API_StopRx(void);
+
+/**
+  * @brief Notifies that pattern has been found
+  * @note  implementation is optional
+  * @param  window_type 0:sweep pattern, 1:window pattern
+  * @param  pattern: 1:delta_f1, :delta_f2, 1:delta_f2
+  * @param  frequency at which pattern has been detected
+  * @param best_rssi rssi at which pattern has been detected
+  * @retval None
+  */
+void MN_API_Pattern_Found(int32_t window_type, int32_t pattern, int32_t frequency, int32_t best_rssi);
+
+/**
+  * @brief starts timer
+  * @param timer_value_ms timer value in ms
+  * @param call back when timer elapses
+  * @note Argument can be left unused
+  * @retval None
+  */void MN_API_TimerSart(uint32_t timer_value_ms, void (*TimeoutHandle)(void *Argument));
+
+/**
+  * @brief stops timer
+  * @param None
+  * @retval None
+  */
+void MN_API_TimerStop(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MN_API_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h
new file mode 100644
index 00000000..5bcdf818
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mw_log_conf.h
+  * @author  MCD Application Team
+  * @brief   Configure (enable/disable) traces for CM0
+  *******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MW_LOG_CONF_H__
+#define __MW_LOG_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_adv_trace.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MW_LOG_ENABLED
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef MW_LOG_ENABLED
+#define MW_LOG(TS,VL, ...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0)
+#else  /* MW_LOG_ENABLED */
+#define MW_LOG(TS,VL, ...)
+#endif /* MW_LOG_ENABLED */
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MW_LOG_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c
new file mode 100644
index 00000000..d4c34621
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c
@@ -0,0 +1,220 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.c
+  * @author  MCD Application Team
+  * @brief   This file provides an interface layer between MW and Radio Board
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "radio_board_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t RBI_Init(void)
+{
+  /* USER CODE BEGIN RBI_Init_1 */
+
+  /* USER CODE END RBI_Init_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_Init();
+#else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_Init_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_Init_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_DeInit(void)
+{
+  /* USER CODE BEGIN RBI_DeInit_1 */
+
+  /* USER CODE END RBI_DeInit_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_DeInit();
+#else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_DeInit_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_DeInit_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
+{
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_1 */
+
+  /* USER CODE END RBI_ConfigRFSwitch_1 */
+#if defined(USE_BSP_DRIVER)
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
+#else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_ConfigRFSwitch_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_GetTxConfig(void)
+{
+  /* USER CODE BEGIN RBI_GetTxConfig_1 */
+
+  /* USER CODE END RBI_GetTxConfig_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_GetTxConfig();
+#else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
+  /* USER CODE BEGIN RBI_GetTxConfig_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_GetTxConfig_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_IsTCXO(void)
+{
+  /* USER CODE BEGIN RBI_IsTCXO_1 */
+
+  /* USER CODE END RBI_IsTCXO_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsTCXO();
+#else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsTCXO_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsTCXO_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_IsDCDC(void)
+{
+  /* USER CODE BEGIN RBI_IsDCDC_1 */
+
+  /* USER CODE END RBI_IsDCDC_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsDCDC();
+#else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsDCDC_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsDCDC_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h
new file mode 100644
index 00000000..9e505c68
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h
@@ -0,0 +1,207 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Radio interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef RADIO_BOARD_IF_H
+#define RADIO_BOARD_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported defines ----------------------------------------------------------*/
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+#define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
+#define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
+#define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
+#else
+/* USER CODE BEGIN Board Definition */
+
+/* USER CODE END Board Definition */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported Parameters */
+
+/* USER CODE END Exported Parameters */
+/* Indicates the type of switch between the ones proposed by CONFIG Constants
+ */
+#define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
+
+/* Indicates whether or not TCXO is supported by the board
+ * 0: TCXO not supported
+ * 1: TCXO supported
+ */
+#define IS_TCXO_SUPPORTED                   1U
+
+/* Indicates whether or not DCDC is supported by the board
+ * 0: DCDC not supported
+ * 1: DCDC supported
+ */
+#define IS_DCDC_SUPPORTED                   1U
+
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported PinMapping */
+#warning user to provide its board definitions pins
+/* USER CODE END Exported PinMapping */
+#endif  /* USE_BSP_DRIVER  */
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+typedef enum
+{
+  RBI_SWITCH_OFF    = RADIO_SWITCH_OFF,
+  RBI_SWITCH_RX     = RADIO_SWITCH_RX,
+  RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
+  RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
+} RBI_Switch_TypeDef;
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
+typedef enum
+{
+  RBI_SWITCH_OFF    = 0,
+  RBI_SWITCH_RX     = 1,
+  RBI_SWITCH_RFO_LP = 2,
+  RBI_SWITCH_RFO_HP = 3,
+} RBI_Switch_TypeDef;
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief  Init Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_Init(void);
+
+/**
+  * @brief  DeInit Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_DeInit(void);
+
+/**
+  * @brief  Configure Radio Switch.
+  * @param  Config: Specifies the Radio RF switch path to be set.
+  *         This parameter can be one of following parameters:
+  *           @arg RADIO_SWITCH_OFF
+  *           @arg RADIO_SWITCH_RX
+  *           @arg RADIO_SWITCH_RFO_LP
+  *           @arg RADIO_SWITCH_RFO_HP
+  * @return BSP status
+  */
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
+
+/**
+  * @brief  Return Board Configuration
+  * @retval RBI_CONF_RFO_LP_HP
+  * @retval RBI_CONF_RFO_LP
+  * @retval RBI_CONF_RFO_HP
+  */
+int32_t RBI_GetTxConfig(void);
+
+/**
+  * @brief  Get If TCXO is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsTCXO(void);
+
+/**
+  * @brief  Get If DCDC is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsDCDC(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RADIO_BOARD_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h
new file mode 100644
index 00000000..0c8d0db8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h
@@ -0,0 +1,183 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_conf.h
+  * @author  MCD Application Team
+  * @brief   Header of Radio configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_CONF_H__
+#define __RADIO_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
+#include "stm32_seq.h"
+#include "mw_log_conf.h"     /* mw trace conf */
+#include "radio_board_if.h"  /* low layer api (bsp) */
+#include "utilities_def.h"  /* low layer api (bsp) */
+#include "mbmuxif_sys.h"
+#include "sys_debug.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Set RX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
+
+/**
+  * @brief Set TX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
+
+/**
+  * @brief Max payload buffer size
+  */
+#define RADIO_RX_BUF_SIZE          255
+
+/**
+  * @brief Get the chip revision ID from Mbmux table
+  */
+#define LL_DBGMCU_GetRevisionID() MBMUXIF_ChipRevId()
+
+/**
+  * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
+
+/**
+  * @brief drive value used anytime radio is in TX low power mode
+  *        TX low power mode is the worst case because the PA sinks from SMPS
+  *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
+
+/**
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_FREQ                   ( 32000000UL )
+
+/**
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
+
+/**
+  * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
+  */
+#define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
+
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 15UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
+#define RADIO_IRQ_PROCESS_INIT()   do{ UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioIrq_Process), UTIL_SEQ_RFU, RadioIrqProcess); \
+                                       UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioRxTimeout_Process), UTIL_SEQ_RFU, RadioOnRxTimeoutProcess);\
+                                       UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_RadioTxTimeout_Process), UTIL_SEQ_RFU, RadioOnTxTimeoutProcess);} while(0)
+
+#define RADIO_IRQ_PROCESS()        do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioIrq_Process, CFG_SEQ_Prio_0); } while(0)
+#define RADIO_RX_TIMEOUT_PROCESS() do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioRxTimeout_Process, CFG_SEQ_Prio_0); } while(0)
+#define RADIO_TX_TIMEOUT_PROCESS() do{ UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_RadioTxTimeout_Process, CFG_SEQ_Prio_0); } while(0)
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifndef CRITICAL_SECTION_BEGIN
+/**
+  * @brief macro used to enter the critical section
+  */
+#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_BEGIN */
+#ifndef CRITICAL_SECTION_END
+/**
+  * @brief macro used to exit the critical section
+  */
+#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_END */
+
+/* Function mapping */
+/**
+  * @brief SUBGHZ interface init to radio Middleware
+  */
+#define RADIO_INIT                              MX_SUBGHZ_Init
+
+/**
+  * @brief Delay interface to radio Middleware
+  */
+#define RADIO_DELAY_MS                          HAL_Delay
+
+/**
+  * @brief Memset utilities interface to radio Middleware
+  */
+#define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RADIO_CONF_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.c
new file mode 100644
index 00000000..a877cf85
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.c
@@ -0,0 +1,694 @@
+/* USER CODE BEGIN Header */
+/**
+  ****************************************************************************
+  * @file    rf_api.c
+  * @author  MCD Application Team
+  * @brief   rf library interface
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* includes -----------------------------------------------------------*/
+#include "stdint.h"
+#include "sigfox_types.h"
+#include "sigfox_api.h"
+#include "rf_api.h"
+#include "radio.h"
+#include "stm32_seq.h"
+#include "stm32_mem.h"
+#include "utilities_def.h"
+#include "sgfx_eeprom_if.h"
+#include "sys_debug.h"
+#include "sgfx_cstimer.h"
+#include "stm32_timer.h"
+#include "sys_app.h" /*for APP_LOG*/
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define RF_VER                   "RF_API_V1.0"
+#define SFX_PREAMBLE_LENGTH      2
+#define MONARCH_PREAMBLE_LENGTH (65535/8) /*max length to never synchronize*/
+#define SFX_MAX_PAYLOAD_LENGTH   15
+#define SFX_DATARATE_600         600
+#define SFX_DATARATE_100         100
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+static sfx_u8 rf_api_version[] = RF_VER;
+
+static uint8_t *RxFrame;
+
+static int16_t RxRssi;
+
+static sfx_u8 RxPacketReceived = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/*!
+  * \brief Waits End of Rx, either by a successful Reception or by a timeout
+  * \Return 0 when timeOut or 1 when successful Reception
+  */
+static sfx_u8 sfx_wait_end_of_rx(void);
+
+/*!
+  * \brief Function to be executed on Radio Tx Done event
+  */
+static void OnTxDone(void);
+
+/*!
+  * \brief Function to be executed on Radio Rx Done event
+  */
+static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
+
+/*!
+  * \brief Function executed on Radio Tx Timeout event
+  */
+static void OnTxTimeout(void);
+
+/*!
+  * \brief Function executed on Radio Rx Timeout event
+  */
+static void OnRxTimeout(void);
+
+/*!
+  * \brief Function executed on Radio Rx Error event
+  */
+static void OnRxError(void);
+
+/*use for CS*/
+static bool RF_API_isChannelFree(int16_t rssiThresh, uint32_t maxCarrierSenseTime);
+
+const RadioEvents_t RfApiRadioEvents =
+{
+  OnTxDone,
+  OnTxTimeout,
+  OnRxDone,
+  OnRxTimeout,
+  OnRxError,
+};
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  /* USER CODE BEGIN RF_API_init_1 */
+
+  /* USER CODE END RF_API_init_1 */
+  /* Put here all RF initialization concerning the RC IC you are using. */
+
+  switch (rf_mode)
+  {
+    case SFX_RF_MODE_TX:
+    {
+      /* USER CODE BEGIN SFX_RF_MODE_TX_1 */
+
+      /* USER CODE END SFX_RF_MODE_TX_1 */
+      /* Initialize Tx if necessary*/
+      APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in TX\n\r");
+
+      /* USER CODE BEGIN SFX_RF_MODE_TX_2 */
+
+      /* USER CODE END SFX_RF_MODE_TX_2 */
+      break;
+    }
+    case SFX_RF_MODE_RX:
+    {
+      /* Configure the RF_IP IC in RX mode : GFSK 600bps*/
+      /* RF IC must configure the SYNCHRO BIT = 0xAAAAAAAAAA and synchro frame = 0xB227 */
+      /* USER CODE BEGIN SFX_RF_MODE_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_RX_1 */
+      APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in RX\n\r");
+      Radio.SetRxConfig(MODEM_SIGFOX_RX, 1600,
+                        SFX_DATARATE_600, NA,
+                        NA, SFX_PREAMBLE_LENGTH,
+                        1000, true,
+                        SFX_MAX_PAYLOAD_LENGTH,
+                        false, NA, NA,
+                        NA, true);
+
+      /* USER CODE BEGIN SFX_RF_MODE_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_RX_2 */
+      break;
+    }
+    case SFX_RF_MODE_CS200K_RX:
+    {
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_1 */
+      /* configure the RF_IP into sensing 200KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function */
+      APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS200\n\r");
+
+      Radio.SetRxConfig(MODEM_SIGFOX_RX, 200000,
+                        SFX_DATARATE_600, NA,
+                        NA, SFX_PREAMBLE_LENGTH,
+                        1000, true,
+                        SFX_MAX_PAYLOAD_LENGTH,
+                        false, NA, NA,
+                        NA, true);
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS200K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS200K_RX_2 */
+      break;
+    }
+    case SFX_RF_MODE_CS300K_RX:
+    {
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_1 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_1 */
+
+      /* configure the RF_IP into sensing 300KHz bandwidth to be able to read out RSSI level */
+      /* RSSI level will extracted during the RF_API_wait_for_clear_channel function. */
+      APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in CS300\n\r");
+
+      Radio.SetRxConfig(MODEM_SIGFOX_RX, 300000,
+                        SFX_DATARATE_600, NA,
+                        NA, SFX_PREAMBLE_LENGTH,
+                        1000, true,
+                        SFX_MAX_PAYLOAD_LENGTH,
+                        false, NA, NA,
+                        NA, true);
+
+      /* USER CODE BEGIN SFX_RF_MODE_CS300K_RX_2 */
+
+      /* USER CODE END SFX_RF_MODE_CS300K_RX_2 */
+      break;
+    }
+    case SFX_RF_MODE_MONARCH:
+    {
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_1 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_1 */
+
+      /* configure the RF_IP into sensing 20KHz bandwidth */
+      APP_LOG(TS_ON, VLEVEL_M, "RF_API_init in MN20\n\r");
+      /* APP_LOG(TS_ON, VLEVEL_L,"RxBw=20kHz\n\r"); */
+      Radio.SetRxConfig(MODEM_SIGFOX_RX, 20000,
+                        SFX_DATARATE_100, NA,
+                        NA, MONARCH_PREAMBLE_LENGTH,
+                        1000, true,
+                        SFX_MAX_PAYLOAD_LENGTH,
+                        false, NA, NA,
+                        NA, true);
+
+      /* USER CODE BEGIN SFX_RF_MODE_MONARCH_2 */
+
+      /* USER CODE END SFX_RF_MODE_MONARCH_2 */
+      break;
+    }
+    default :
+      status = RF_ERR_API_INIT;
+      break;
+  }
+  /* USER CODE BEGIN RF_API_init_2 */
+
+  /* USER CODE END RF_API_init_2 */
+  return status;
+}
+
+sfx_u8 RF_API_stop(void)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  /* USER CODE BEGIN RF_API_stop_1 */
+
+  /* USER CODE END RF_API_stop_1 */
+  APP_LOG(TS_ON, VLEVEL_M, "RF_API_stop\n\r");
+
+  Radio.Sleep();
+  /* USER CODE BEGIN RF_API_stop_2 */
+
+  /* USER CODE END RF_API_stop_2 */
+
+  return status;
+}
+
+sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  /* USER CODE BEGIN RF_API_send_1 */
+
+  /* USER CODE END RF_API_send_1 */
+
+  uint32_t datarate;
+
+  int8_t power = E2P_Read_Power(E2P_Read_Rc());
+
+  APP_LOG(TS_ON, VLEVEL_M, "TX START:nB=%d\n\r", size);
+  switch (type)
+  {
+    case SFX_DBPSK_100BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @100bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
+      datarate = SFX_DATARATE_100;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_100BPS_2 */
+      break;
+    case SFX_DBPSK_600BPS :
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_1 */
+      /* Send to the RF_IP the stream built by the sigfox lib @600bps:
+       * this bitstream contains all data including synchro bits+frame and CRC.*/
+      datarate = SFX_DATARATE_600;
+
+      /* USER CODE BEGIN RF_API_send_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_send_DBPSK_600BPS_2 */
+
+      break;
+    default :
+      status = RF_ERR_API_SEND;
+      break;
+  }
+  /* USER CODE BEGIN RF_API_send_2 */
+  BSP_LED_On(LED_BLUE);
+
+  /* USER CODE END RF_API_send_2 */
+  if (status == SFX_ERR_NONE)
+  {
+    Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
+                      NA, datarate,
+                      NA, NA,
+                      NA, NA, NA,
+                      NA, NA, 3000);
+
+    Radio.Send(stream, size);
+
+    APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Tx\n\r");
+
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_TxTimeout);
+
+    APP_LOG(TS_ON, VLEVEL_M, "End Of Tx\n\r");
+
+  }
+
+  APP_LOG(TS_ON, VLEVEL_M, "TX END\n\r");
+  /* USER CODE BEGIN RF_API_send_3 */
+  BSP_LED_Off(LED_BLUE);
+
+  /* USER CODE END RF_API_send_3 */
+  return status;
+
+}
+
+sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  /* USER CODE BEGIN RF_API_start_continuous_transmission_1 */
+
+  /* USER CODE END RF_API_start_continuous_transmission_1 */
+
+  int8_t power = E2P_Read_Power(E2P_Read_Rc());
+
+  switch (type)
+  {
+    case SFX_NO_MODULATION :
+      /* Starts CW continuous Tx at the frequency given by the RF_API_change_frequency()*/
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_1 */
+      Radio.TxCw(power);
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_NO_MODULATION_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_NO_MODULATION_2 */
+      break;
+    case SFX_DBPSK_100BPS :
+      /* Starts an infinite DBPSK 100bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_1 */
+      Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
+                        NA, SFX_DATARATE_100,
+                        NA, NA,
+                        NA, NA, NA,
+                        NA, NA, 3000);
+      Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_100BPS_2 */
+      break;
+    case SFX_DBPSK_600BPS :
+      /* Starts an infinite DBPSK 600bps modulation on the RF IC at the frequency given by the RF_API_change_frequency() */
+
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_1 */
+      Radio.SetTxConfig(MODEM_SIGFOX_TX, power, NA,
+                        NA, SFX_DATARATE_600,
+                        NA, NA,
+                        NA, NA, NA,
+                        NA, NA, 3000);
+      Radio.TxPrbs();
+      /* USER CODE BEGIN RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
+
+      /* USER CODE END RF_API_start_continuous_transmission_DBPSK_600BPS_2 */
+      break;
+    default :
+      status = RF_ERR_API_SEND;
+      break;
+  }
+  /* USER CODE BEGIN RF_API_start_continuous_transmission_2 */
+
+  /* USER CODE END RF_API_start_continuous_transmission_2 */
+  return status;
+}
+
+sfx_u8 RF_API_stop_continuous_transmission(void)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  /* stop continuous Tx */
+
+  /* USER CODE BEGIN RF_API_stop_continuous_transmission_1 */
+
+  /* USER CODE END RF_API_stop_continuous_transmission_1 */
+  APP_LOG(TS_ON, VLEVEL_M, "RF_API_stop\n\r");
+
+  Radio.Sleep();
+  /* USER CODE BEGIN RF_API_stop_continuous_transmission_2 */
+
+  /* USER CODE END RF_API_stop_continuous_transmission_2 */
+  return status;
+}
+
+sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  /* set rf frequency for Rx or Tx*/
+
+  /* USER CODE BEGIN RF_API_change_frequency_1 */
+
+  /* USER CODE END RF_API_change_frequency_1 */
+  APP_LOG(TS_ON, VLEVEL_M, "RF at Freq %d\n\r", frequency);
+
+  Radio.SetChannel(frequency);
+  /* USER CODE BEGIN RF_API_change_frequency_2 */
+
+  /* USER CODE END RF_API_change_frequency_2 */
+  return status;
+}
+
+sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *state)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_s16 res_rssi = 0;
+  sfx_rx_state_enum_t ret_state = DL_TIMEOUT;
+  /* USER CODE BEGIN RF_API_wait_frame_1 */
+
+  /* USER CODE END RF_API_wait_frame_1 */
+  /* Starts Rx Windows and wait up to the end of frame or end of rx window*/
+  /*  Wait for 2 events :
+   *  event from your RF_IP indicating a buffer is received or
+   *  event from the timer end : event_timer (see mcu_api.c)
+   * If buffer is received, then copy the buffer in frame buffer and update the state parameter*/
+
+  APP_LOG(TS_ON, VLEVEL_M, "RX START\n\r");
+
+  Radio.RxBoosted(0);
+
+  /*save address for callback*/
+  RxFrame = frame;
+
+  if (sfx_wait_end_of_rx() == 1)
+  {
+    status = SFX_ERR_NONE;
+    ret_state = DL_PASSED;
+  }
+  else
+  {
+    ret_state = DL_TIMEOUT;
+    status = SFX_ERR_NONE;
+  }
+
+  res_rssi = (sfx_s16) RxRssi;
+
+  APP_LOG(TS_ON, VLEVEL_M, "RX END\n\r");
+  /* USER CODE BEGIN RF_API_wait_frame_2 */
+
+  /* USER CODE END RF_API_wait_frame_2 */
+  *state = ret_state;
+  *rssi = res_rssi;
+  return status;
+}
+
+sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_state_enum_t *state)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  sfx_rx_state_enum_t cs_state = DL_TIMEOUT;
+  /* Starts Rx Windows to sense if channel is occupied or clear*
+   * If the channel is clear during the minimum carrier sense
+   * value (cs_min), under the limit of the cs_threshold,
+   * the functions returns with SFX_ERR_NONE (transmission
+   * allowed). Otherwise it continues to listen to the channel till the expiration of the
+   * carrier sense maximum window and then updates the state ( with timeout enum ).*/
+
+  /* USER CODE BEGIN RF_API_wait_for_clear_channel_1 */
+
+  /* USER CODE END RF_API_wait_for_clear_channel_1 */
+
+  RxCarrierSenseInitStatus();
+
+  Radio.Rx(0);
+
+  HAL_Delay(Radio.GetWakeupTime());
+
+  APP_LOG(TS_ON, VLEVEL_M, "CS start cs_min=%dms, cs_threshold=%dBm\n\r", cs_min, cs_threshold);
+
+  while (RxCarrierSenseGetStatus() == 0)
+  {
+    if (RF_API_isChannelFree((int16_t) cs_threshold, (uint32_t) cs_min) == true)
+    {
+      cs_state = DL_PASSED;
+      break;
+    }
+  }
+  Radio.Standby();
+
+  if (cs_state == DL_PASSED)
+  {
+    APP_LOG(TS_ON, VLEVEL_M, "LBT Channel Free\n\r");
+  }
+  else
+  {
+    APP_LOG(TS_ON, VLEVEL_M, "LBT Channel Busy\n\r");
+  }
+
+  /* USER CODE BEGIN RF_API_wait_for_clear_channel_2 */
+
+  /* USER CODE END RF_API_wait_for_clear_channel_2 */
+  *state = cs_state;
+  return status;
+}
+
+sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
+{
+  sfx_u8 status = SFX_ERR_NONE;
+  /* return version and size of the version buffer*/
+  /* USER CODE BEGIN RF_API_get_version_1 */
+
+  /* USER CODE END RF_API_get_version_1 */
+
+  *version = (sfx_u8 *)rf_api_version;
+  if (size == SFX_NULL)
+  {
+    return RF_ERR_API_GET_VERSION;
+  }
+  *size = sizeof(rf_api_version);
+  /* USER CODE BEGIN RF_API_get_version_2 */
+
+  /* USER CODE END RF_API_get_version_2 */
+  return status;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+static void OnTxDone(void)
+{
+  /* USER CODE BEGIN OnTxDone_1 */
+
+  /* USER CODE END OnTxDone_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_TxTimeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "OnTxDone\n\r");
+
+  /* USER CODE BEGIN OnTxDone_2 */
+
+  /* USER CODE END OnTxDone_2 */
+}
+
+static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t offset)
+{
+  /* USER CODE BEGIN OnRxDone_1 */
+
+  /* USER CODE END OnRxDone_1 */
+  UTIL_MEM_cpy_8(RxFrame, payload, size);
+
+  RxRssi = rssi;
+
+  RxPacketReceived = 1;
+  /*wakes up the MCU at line UTIL_SEQ_WaitEvt( 1 << CFG_SEQ_Evt_Timeout );*/
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "OnRxDone\n\r");
+
+  /* USER CODE BEGIN OnRxDone_2 */
+
+  /* USER CODE END OnRxDone_2 */
+}
+
+static void OnTxTimeout(void)
+{
+  /* USER CODE BEGIN OnTxTimeout_1 */
+
+  /* USER CODE END OnTxTimeout_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_TxTimeout);
+
+  APP_LOG(TS_ON, VLEVEL_M,  "OnTxTimeout\n\r");
+
+  /* USER CODE BEGIN OnTxTimeout_2 */
+
+  /* USER CODE END OnTxTimeout_2 */
+}
+
+static void OnRxTimeout(void)
+{
+  /* USER CODE BEGIN OnRxTimeout_1 */
+
+  /* USER CODE END OnRxTimeout_1 */
+  RxPacketReceived = 0;
+
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M,  "OnRxTimeout\n\r");
+
+  /* USER CODE BEGIN OnRxTimeout_2 */
+
+  /* USER CODE END OnRxTimeout_2 */
+}
+
+static void OnRxError(void)
+{
+  /* USER CODE BEGIN OnRxError_1 */
+
+  /* USER CODE END OnRxError_1 */
+  RxPacketReceived = 0;
+
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "OnRxError\n\r");
+
+  /* USER CODE BEGIN OnRxError_2 */
+
+  /* USER CODE END OnRxError_2 */
+}
+
+static sfx_u8 sfx_wait_end_of_rx(void)
+{
+  /* USER CODE BEGIN sfx_wait_end_of_rx_1 */
+
+  /* USER CODE END sfx_wait_end_of_rx_1 */
+  RxPacketReceived = 0;
+
+  RxRssi = -150;
+
+  APP_LOG(TS_ON, VLEVEL_M, "Wait For End of Rx\n\r");
+
+  UTIL_SEQ_ClrEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_Timeout);
+
+  APP_LOG(TS_ON, VLEVEL_M, "End Of Rx\n\r");
+
+  return RxPacketReceived;
+  /* USER CODE BEGIN sfx_wait_end_of_rx_2 */
+
+  /* USER CODE END sfx_wait_end_of_rx_2 */
+}
+
+bool RF_API_isChannelFree(int16_t rssiThresh, uint32_t maxCarrierSenseTime)
+{
+  /* USER CODE BEGIN RF_API_isChannelFree_1 */
+
+  /* USER CODE END RF_API_isChannelFree_1 */
+  bool status = true;
+  int16_t rssi = 0;
+  uint32_t carrierSenseTime = 0;
+
+  carrierSenseTime = UTIL_TIMER_GetCurrentTime();
+
+  /* Perform carrier sense for maxCarrierSenseTime */
+  while (UTIL_TIMER_GetElapsedTime(carrierSenseTime) < maxCarrierSenseTime)
+  {
+    rssi = Radio.Rssi(MODEM_FSK);
+
+    if (rssi > rssiThresh)
+    {
+      status = false;
+      break;
+    }
+  }
+  return status;
+  /* USER CODE BEGIN RF_API_isChannelFree_2 */
+
+  /* USER CODE END RF_API_isChannelFree_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.h
new file mode 100644
index 00000000..6b1eeb25
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.h
@@ -0,0 +1,292 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    rf_api.h
+  * @author  MCD Application Team
+  * @brief   interface to rf_api.c
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/*!
+\if SIGFOX PATTERN
+----------------------------------------------
+
+  _____   _   _____   _____   _____  __    __
+ /  ___/ | | /  ___| |  ___| /  _  \ \ \  / /
+ | |___  | | | |     | |__   | | | |  \ \/ /
+ \___  \ | | | |  _  |  __|  | | | |   }  {
+  ___| | | | | |_| | | |     | |_| |  / /\ \
+ /_____/ |_| \_____/ |_|     \_____/ /_/  \_\
+
+ ----------------------------------------------
+
+   !!!!  DO NOT MODIFY THIS FILE !!!!
+
+ ----------------------------------------------
+ \endif
+ ----------------------------------------------*/
+/*!
+ * \file rf_api.h
+ * \brief Sigfox manufacturer functions
+ * \author $(SIGFOX_LIB_AUTHOR)
+ * \version $(SIGFOX_LIB_VERSION)
+ * \date $(SIGFOX_LIB_DATE)
+ * \copyright Copyright (c) 2011-2015 SIGFOX, All Rights Reserved. This is unpublished proprietary source code of SIGFOX.
+ *
+ * This file defines the manufacturer's RF functions to be implemented
+ * for library usage.
+ */
+/* Define to prevent recursive inclusion -------------------------------------*/
+
+#ifndef __SIGFOX_RF_API_H__
+#define __SIGFOX_RF_API_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/********************************************************
+  * External API dependencies to link with this library.
+  *
+  * Error codes of the RF API functions are described below.
+  * The Manufacturer can add more error code taking care of the limits defined.
+  *
+  ********************************************************/
+
+/*!
+  * \defgroup RF_ERR_API_xx codes Return Error codes definition for RF API
+  *
+  * \brief Can be customized to add new error codes.
+  * All RF_API_ error codes will be piped with SIGFOX_API_xxx return code.<BR>
+  * SFX_ERR_NONE implementation is mandatory for each MCU_API_xxx RF_API_xxx REPEATER_API_xxx or SE_API_xxx
+  * functions.
+  *
+  *  @{
+  */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for MCU API ERROR CODES : From 0x10 to 0x2F       */
+/* ---------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for RF API ERROR CODES : From 0x30 to 0x3F        */
+/* ---------------------------------------------------------------- */
+#define RF_ERR_API_INIT                          (sfx_u8)(0x30) /*!< Error on RF_API_init */
+#define RF_ERR_API_SEND                          (sfx_u8)(0x31) /*!< Error on RF_API_send */
+#define RF_ERR_API_CHANGE_FREQ                   (sfx_u8)(0x32) /*!< Error on RF_API_change_frequency */
+#define RF_ERR_API_STOP                          (sfx_u8)(0x33) /*!< Error on RF_API_stop */
+#define RF_ERR_API_WAIT_FRAME                    (sfx_u8)(0x34) /*!< Error on RF_API_wait_frame */
+#define RF_ERR_API_WAIT_CLEAR_CHANNEL            (sfx_u8)(0x35) /*!< Error on RF_API_wait_for_clear_channel */
+#define RF_ERR_API_START_CONTINUOUS_TRANSMISSION (sfx_u8)(0x36) /*!< Error on RF_API_start_continuous_transmission */
+#define RF_ERR_API_STOP_CONTINUOUS_TRANSMISSION  (sfx_u8)(0x37) /*!< Error on RF_API_stop_continuous_transmission */
+#define RF_ERR_API_GET_VERSION                   (sfx_u8)(0x38) /*!< Error on RF_API_get_version */
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for SE API ERROR CODES : From 0x40 to 0x5F        */
+/* ---------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for REPEATER API ERROR CODES : From 0x60 to 0x7F  */
+/* ---------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------- */
+/* Bytes reserved for MONARCH API ERROR CODES : From 0x80 to 0x8F   */
+/* ---------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------------- */
+/* Bytes reserved for DEVICE CONFIG API ERROR CODES : From 0x90 to 0x9A   */
+/* ---------------------------------------------------------------------- */
+
+/** @}*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode)
+  * \brief Init and configure Radio link in RX/TX
+  *
+  * [RX Configuration]
+  * To receive Sigfox Frame on your device, program the following:
+  *  - Preamble  : 0xAAAAAAAAA
+  *  - Sync Word : 0xB227
+  *  - Packet of the Sigfox frame is 15 bytes length.
+  *
+  * \param[in] sfx_rf_mode_t rf_mode         Init Radio link in Tx or RX
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:             No error
+  * \retval RF_ERR_API_INIT:          Init Radio link error
+  *******************************************************************/
+sfx_u8 RF_API_init(sfx_rf_mode_t rf_mode);
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_stop(void)
+  * \brief Close Radio link
+  *
+  * \param[in] none
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:              No error
+  * \retval RF_ERR_API_STOP:           Close Radio link error
+  *******************************************************************/
+sfx_u8 RF_API_stop(void);
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size)
+  * \brief BPSK Modulation of data stream
+  * (from synchro bit field to CRC)
+  *
+  * NOTE : during this function, the voltage_tx needs to be retrieved and stored in
+  *        a variable to be returned into the MCU_API_get_voltage_and_temperature or
+  *        MCU_API_get_voltage functions.
+  *
+  * \param[in] sfx_u8 *stream                Complete stream to modulate
+  * \param[in]sfx_modulation_type_t          Type of the modulation ( enum with baudrate and modulation information)
+  * \param[in] sfx_u8 size                   Length of stream
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                    No error
+  * \retval RF_ERR_API_SEND:                 Send data stream error
+  *******************************************************************/
+sfx_u8 RF_API_send(sfx_u8 *stream, sfx_modulation_type_t type, sfx_u8 size);
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_start_continuous_transmission (sfx_modulation_type_t type)
+  * \brief Generate a signal with modulation type. All the configuration ( Init of the RF and Frequency have already been executed
+  *        when this function is called.
+  *
+  * \param[in] sfx_modulation_type_t         Type of the modulation ( enum with baudrate and modulation information is contained in sigfox_api.h)
+  *
+  * \retval SFX_ERR_NONE:                                 No error
+  * \retval RF_ERR_API_START_CONTINUOUS_TRANSMISSION:     Continuous Transmission Start error
+  *******************************************************************/
+sfx_u8 RF_API_start_continuous_transmission(sfx_modulation_type_t type);
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_stop_continuous_transmission (void)
+  * \brief Stop the current continuous transmission
+  *
+  * \retval SFX_ERR_NONE:                                 No error
+  * \retval RF_ERR_API_STOP_CONTINUOUS_TRANSMISSION:      Continuous Transmission Stop error
+  *******************************************************************/
+sfx_u8 RF_API_stop_continuous_transmission(void);
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_change_frequency(sfx_u32 frequency)
+  * \brief Change synthesizer carrier frequency
+  *
+  * \param[in] sfx_u32 frequency             Frequency in Hz to program in the radio chipset
+  * \param[out] none
+  *
+  * \retval SFX_ERR_NONE:                    No error
+  * \retval RF_ERR_API_CHANGE_FREQ:          Change frequency error
+  *******************************************************************/
+sfx_u8 RF_API_change_frequency(sfx_u32 frequency);
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t * state)
+  * \brief Get all GFSK frames received in Rx buffer, structure of
+  * frame is : Synchro bit + Synchro frame + 15 Bytes.<BR> This function must
+  * be blocking state since data is received or timer of 25 s has elapsed.
+  *
+  * - If received buffer, function returns SFX_ERR_NONE then the
+  *   library will try to decode frame. If the frame is not correct, the
+  *   library will recall RF_API_wait_frame.
+  *
+  * - If 25 seconds timer has elapsed, function returns into the state the timeout enum code.
+  *   and then library will stop receive frame phase.
+  *
+  * \param[in] none
+  * \param[out] sfx_s8 *frame                  Receive buffer
+  * \param[out] sfx_s16 *rssi                  Chipset RSSI
+  * Warning: This is the 'raw' RSSI value. Do not add 100 as made
+  * in Library versions 1.x.x
+  * Resolution: 1 LSB = 1 dBm
+  *
+  * \param[out] sfx_rx_state_enum_t state      Indicate the final state of the reception. Value can be DL_TIMEOUT or DL_PASSED
+  *                                            if a frame has been received, as defined in sigfox_api.h file.
+  *
+  * \retval SFX_ERR_NONE:                      No error
+  *******************************************************************/
+sfx_u8 RF_API_wait_frame(sfx_u8 *frame, sfx_s16 *rssi, sfx_rx_state_enum_t *state);
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_wait_for_clear_channel (sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_state_enum_t * state);
+  * \brief This function is used in ARIB standard for the Listen Before Talk
+  *        feature. It listens on a specific frequency band initialized through the RF_API_init(), during a sliding window set
+  *        in the MCU_API_timer_start_carrier_sense().
+  *        If the channel is clear during the minimum carrier sense
+  *        value (cs_min), under the limit of the cs_threshold,
+  *        the functions returns with SFX_ERR_NONE (transmission
+  *        allowed). Otherwise it continues to listen to the channel till the expiration of the
+  *        carrier sense maximum window and then updates the state ( with timeout enum ).
+  *
+  *
+  * \param[in] sfx_u8 cs_min                  Minimum Carrier Sense time in ms.
+  * \param[in] sfx_s8 cs_threshold            Power threshold limit to declare the channel clear.
+  *                                            i.e : cs_threshold value -80dBm in Japan / -65dBm in Korea
+  * \param[out] sfx_rx_state_enum_t state      Indicate the final state of the carrier sense. Value can be DL_TIMEOUT or PASSED
+  *                                            as per defined in sigfox_api.h file.
+  *
+  * \retval SFX_ERR_NONE:                      No error
+  *******************************************************************/
+sfx_u8 RF_API_wait_for_clear_channel(sfx_u8 cs_min, sfx_s8 cs_threshold, sfx_rx_state_enum_t *state);
+
+/*!******************************************************************
+  * \fn sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size)
+  * \brief Returns current RF API version
+  *
+  * \param[out] sfx_u8 **version                 Pointer to Byte array (ASCII format) containing library version
+  * \param[out] sfx_u8 *size                     Size of the byte array pointed by *version
+  *
+  * \retval SFX_ERR_NONE:                No error
+  * \retval RF_ERR_API_GET_VERSION:      Get Version error
+  *******************************************************************/
+sfx_u8 RF_API_get_version(sfx_u8 **version, sfx_u8 *size);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SIGFOX_RF_API_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c
new file mode 100644
index 00000000..28c83de8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c
@@ -0,0 +1,152 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    se_nvm.c
+  * @author  MCD Application Team
+  * @brief   manages SE nvm data
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include <string.h>
+#include "sgfx_eeprom_if.h"
+#include "st_sigfox_api.h"
+#include "se_nvm.h"
+#include "sgfx_credentials.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE])
+{
+  sfx_u8  ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN SE_NVM_get_1 */
+
+  /* USER CODE END SE_NVM_get_1 */
+
+  if (E2P_Read_SeNvm(read_data, SFX_SE_NVMEM_BLOCK_SIZE) != E2P_OK)
+  {
+    ret = SE_ERR_API_SE_NVM;
+  }
+
+  /* USER CODE BEGIN SE_NVM_get_2 */
+
+  /* USER CODE END SE_NVM_get_2 */
+  return ret;
+}
+
+sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE])
+{
+  sfx_u8  ret = SFX_ERR_NONE;
+  /* USER CODE BEGIN SE_NVM_set_1 */
+
+  /* USER CODE END SE_NVM_set_1 */
+
+  if (E2P_Write_SeNvm(data_to_write, SFX_SE_NVMEM_BLOCK_SIZE) != E2P_OK)
+  {
+    ret = SE_ERR_API_SE_NVM;
+  }
+  /* USER CODE BEGIN SE_NVM_set_2 */
+
+  /* USER CODE END SE_NVM_set_2 */
+  return ret;
+}
+
+sfx_key_type_t SE_NVM_get_key_type(void)
+{
+  /* USER CODE BEGIN SE_NVM_get_key_type_1 */
+
+  /* USER CODE END SE_NVM_get_key_type_1 */
+  return E2P_Read_KeyType();
+  /* USER CODE BEGIN SE_NVM_get_key_type_2 */
+
+  /* USER CODE END SE_NVM_get_key_type_2 */
+}
+
+void  SE_NVM_set_key_type(sfx_key_type_t keyType)
+{
+  /* USER CODE BEGIN SE_NVM_set_key_type_1 */
+
+  /* USER CODE END SE_NVM_set_key_type_1 */
+  E2P_Write_KeyType(keyType);
+  /* USER CODE BEGIN SE_NVM_set_key_type_2 */
+
+  /* USER CODE END SE_NVM_set_key_type_2 */
+}
+
+sfx_u8 SE_NVM_get_encrypt_flag(void)
+{
+  /* USER CODE BEGIN SE_NVM_get_encrypt_flag_1 */
+
+  /* USER CODE END SE_NVM_get_encrypt_flag_1 */
+  return E2P_Read_EncryptionFlag();
+  /* USER CODE BEGIN SE_NVM_get_encrypt_flag_2 */
+
+  /* USER CODE END SE_NVM_get_encrypt_flag_2 */
+}
+
+void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag)
+{
+  /* USER CODE BEGIN SE_NVM_set_encrypt_flag_1 */
+
+  /* USER CODE END SE_NVM_set_encrypt_flag_1 */
+  E2P_Write_EncryptionFlag(encryption_flag);
+  /* USER CODE BEGIN SE_NVM_set_encrypt_flag_2 */
+
+  /* USER CODE END SE_NVM_set_encrypt_flag_2 */
+}
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h
new file mode 100644
index 00000000..97cbfbee
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h
@@ -0,0 +1,122 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    se_nvm.h
+  * @author  MCD Application Team
+  * @brief   header to emulated SE nvm data
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SE_NVM_H__
+#define __SE_NVM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  CREDENTIALS_KEY_PRIVATE = 0,   /* private key */
+  CREDENTIALS_KEY_PUBLIC  = 1,   /* public key  <i> 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF</i>.*/
+} sfx_key_type_t;
+
+typedef enum
+{
+  SE_NVMEM_SEQNUM         = 0,                 /*!< Index of nv memory for PN */
+  SE_NVMEM_RCSYNC_PERIOD  = 2,                 /*!< Index of nv memory for dedicated FH information */
+  SE_NVMEM_ROLLOVER       = 4,
+} se_nvmem_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define SFX_SE_NVMEM_BLOCK_SIZE  5
+#define SE_ERR_API_SE_NVM                 (sfx_u8)(0x4A)
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief     This function reads data pointed by read_data to non volatile memory
+  *
+  * @param[in] read_data Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
+  */
+sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE]);
+
+/**
+  * @brief     This function write data pointed by data_to_write to non volatile memory
+  *
+  * @param[in] data_to_write Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
+  */
+sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE]);
+
+/**
+  * @brief     Get the active encryption payload flag
+  * @retval    encryption_flag 0:Off, 1:On
+  */
+sfx_u8 SE_NVM_get_encrypt_flag(void);
+
+/**
+  * @brief     Set the active encryption payload flag
+  * @param[in] encryption_flag 0:Off, 1:On
+  */
+void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag);
+
+/**
+  * @brief     Get the active encryption key
+  * @return    key public or private
+  */
+sfx_key_type_t SE_NVM_get_key_type(void);
+
+/**
+  * @brief     Set the active encryption key
+  * @param[in] keyType key public or private
+  */
+void SE_NVM_set_key_type(sfx_key_type_t keyType);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SE_NVM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c
new file mode 100644
index 00000000..2a26019d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c
@@ -0,0 +1,610 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_credentials.c
+  * @author  MCD Application Team
+  * @brief   manages keys and encryption algorithm
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include <string.h>
+#include "st_sigfox_api.h"
+#include "sgfx_credentials.h"
+#include "se_nvm.h"
+#include "app_sigfox.h"
+
+#if (!defined (SIGFOX_KMS))
+#warning SIGFOX_KMS not defined, forced to 0
+#define SIGFOX_KMS 0
+#endif /* !SIGFOX_KMS*/
+
+#if (SIGFOX_KMS == 0)
+#include "sigfox_aes.h"
+#else /* SIGFOX_KMS == 1 */
+#include "se_api.h"
+#include "kms_if.h"
+#endif /* SIGFOX_KMS */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+typedef struct manuf_device_info_s
+{
+  /* 16bits block 1 */
+  sfx_u8 dev_id[MANUF_DEVICE_ID_LENGTH];
+  sfx_u8 pac[MANUF_PAC_LENGTH];
+  sfx_u8 ver[MANUF_VER_LENGTH];
+  sfx_u8 spare1[MANUF_SPARE_1];
+  /* 16bits block 2 */
+  sfx_u8 dev_key[MANUF_DEVICE_KEY_LENGTH];
+  /* 16bits block 3 */
+  sfx_u8 spare2[MANUF_SPARE_2];
+  sfx_u8 crc[MANUF_CRC_LENGTH];
+} manuf_device_info_t;
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/*Sigfox defines*/
+#define KEY_128_LEN               16 /*bytes*/
+#define CREDENTIALS_VERSION       11
+#define PUBLIC_KEY                {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}
+#define N_BLOCK_128               16
+
+/*CREDENTIAL_KEY may be used to encrypt sigfox_data
+  CREDENTIAL_KEY must be aligned with the sigfox tool generating and encrypting the sigfox_data*/
+/*
+#define CREDENTIAL_KEY {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}
+*/
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/*PREPROCESSOR CONVERSION*/
+#define DECIMAL2STRING_DEF(s) #s
+#define DECIMAL2STRING(s) DECIMAL2STRING_DEF(s)
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static const char sgfxSeeLibVersion[] = "." DECIMAL2STRING(CREDENTIALS_VERSION);
+
+#if (SIGFOX_KMS == 0)
+extern sfx_u8 encrypted_sigfox_data[ sizeof(manuf_device_info_t) ];
+
+static uint8_t device_public_key[] = PUBLIC_KEY;
+static sigfox_aes_context AesContext;
+static uint8_t session_key[KEY_128_LEN] = {0};
+#else  /* SIGFOX_KMS */
+
+static CK_ULONG DeriveKey_template_class = CKO_SECRET_KEY;
+static CK_ULONG DeriveKey_template_destroyable = CK_TRUE;
+static CK_ULONG DeriveKey_template_encrypt = CK_TRUE;
+static CK_ULONG DeriveKey_template_decrypt = CK_TRUE;
+static CK_ULONG DeriveKey_template_extract = CK_FALSE;
+
+static CK_ATTRIBUTE DeriveKey_template[] =
+{
+  {CKA_CLASS, (CK_VOID_PTR) &DeriveKey_template_class,       sizeof(CK_ULONG)},
+  {CKA_DESTROYABLE, (CK_VOID_PTR) &DeriveKey_template_destroyable, sizeof(CK_ULONG)},
+  {CKA_ENCRYPT, (CK_VOID_PTR) &DeriveKey_template_encrypt,     sizeof(CK_ULONG)},
+  {CKA_DECRYPT, (CK_VOID_PTR) &DeriveKey_template_decrypt,     sizeof(CK_ULONG)},
+  {CKA_EXTRACTABLE, (CK_VOID_PTR) &DeriveKey_template_extract,     sizeof(CK_ULONG)}
+};
+static CK_OBJECT_HANDLE kms_sgfx_session_key_handle;
+#endif  /* SIGFOX_KMS */
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+#if (SIGFOX_KMS == 0)
+static sfx_error_t CREDENTIALS_get_cra(sfx_u8 *decrypted_data, sfx_u8 *data_to_decrypt, sfx_u8 data_len);
+static void CREDENTIALS_get_key(uint8_t *key, sfx_key_type_t KeyType);
+#else
+static sfx_error_t Sgfx_KMS_AES_CBC_encrypt(sfx_u8 *data_to_encrypt, sfx_u8 *encrypted_data,
+                                            CK_OBJECT_HANDLE key_object_handle, sfx_u8 length);
+static sfx_error_t Sgfx_KMS_DeriveKey(uint8_t *input, CK_OBJECT_HANDLE derivedkeyObj);
+static sfx_error_t Sgfx_KMS_GetAttribute(CK_OBJECT_HANDLE input, uint8_t *pAttrVal);
+static void Sgfx_KMS_DeleteDerivedKeys(CK_OBJECT_HANDLE input);
+#endif /* SIGFOX_KMS */
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *data_to_encrypt, uint8_t blocks)
+{
+  sfx_error_t retval = SFX_ERR_NONE;
+  /* USER CODE BEGIN CREDENTIALS_aes_128_cbc_encrypt_1 */
+
+  /* USER CODE END CREDENTIALS_aes_128_cbc_encrypt_1 */
+#if (SIGFOX_KMS == 0)
+  uint8_t iv[N_BLOCK_128] = {0x00};
+
+  uint8_t key[AES_KEY_LEN];
+
+  sfx_key_type_t KeyType = SE_NVM_get_key_type();
+
+  CREDENTIALS_get_key(key, KeyType);
+
+  sigfox_aes_set_key(key, AES_KEY_LEN,  &AesContext);
+  /* Clear Key */
+  memset(key, 0, AES_KEY_LEN);
+
+  sigfox_aes_cbc_encrypt(data_to_encrypt,
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
+#else
+  sfx_key_type_t KeyType = SE_NVM_get_key_type();
+  switch (KeyType)
+  {
+    case CREDENTIALS_KEY_PRIVATE:
+      retval = Sgfx_KMS_AES_CBC_encrypt(data_to_encrypt, encrypted_data, (CK_OBJECT_HANDLE)KMS_SGFX_DATA_KEY_OBJECT_HANDLE, blocks);
+      break;
+    case CREDENTIALS_KEY_PUBLIC:
+      retval = Sgfx_KMS_AES_CBC_encrypt(data_to_encrypt, encrypted_data, (CK_OBJECT_HANDLE)KMS_SGFX_DATA_KEY_PUBLIC_OBJECT_HANDLE, blocks);
+      break;
+    default:
+      break;
+  }
+#endif /* SIGFOX_KMS */
+  /* USER CODE BEGIN CREDENTIALS_aes_128_cbc_encrypt_2 */
+
+  /* USER CODE END CREDENTIALS_aes_128_cbc_encrypt_2 */
+  return retval;
+}
+
+sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_data, uint8_t *data_to_encrypt,
+                                                             uint8_t blocks)
+{
+  sfx_error_t retval = SFX_ERR_NONE;
+  /* USER CODE BEGIN CREDENTIALS_aes_128_cbc_encrypt_with_session_key_1 */
+
+  /* USER CODE END CREDENTIALS_aes_128_cbc_encrypt_with_session_key_1 */
+#if (SIGFOX_KMS == 0)
+  uint8_t iv[N_BLOCK_128] = {0x00};
+
+  sigfox_aes_set_key(session_key, AES_KEY_LEN,  &AesContext);
+
+  sigfox_aes_cbc_encrypt(data_to_encrypt,
+                         encrypted_data,
+                         blocks,
+                         iv,
+                         &AesContext);
+#else
+  /* encrypt with session key */
+  retval = Sgfx_KMS_AES_CBC_encrypt(data_to_encrypt, encrypted_data, (CK_OBJECT_HANDLE)kms_sgfx_session_key_handle, blocks);
+#endif /* SIGFOX_KMS */
+  /* USER CODE BEGIN CREDENTIALS_aes_128_cbc_encrypt_with_session_key_2 */
+
+  /* USER CODE END CREDENTIALS_aes_128_cbc_encrypt_with_session_key_2 */
+  return retval;
+}
+
+sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks)
+{
+  sfx_error_t retval = SFX_ERR_NONE;
+  /* USER CODE BEGIN CREDENTIALS_wrap_session_key_1 */
+
+  /* USER CODE END CREDENTIALS_wrap_session_key_1 */
+#if (SIGFOX_KMS == 0)
+  uint8_t iv[N_BLOCK_128] = {0x00};
+
+  uint8_t key[AES_KEY_LEN];
+
+  CREDENTIALS_get_key(key, CREDENTIALS_KEY_PRIVATE);
+
+  sigfox_aes_set_key(key, AES_KEY_LEN,  &AesContext);
+
+  memset(key, 0, AES_KEY_LEN);
+
+  sigfox_aes_cbc_encrypt(data,
+                         session_key,
+                         blocks,
+                         iv,
+                         &AesContext);
+#else
+  /* DestroyKey: to be done before new deriveKey */
+  Sgfx_KMS_DeleteDerivedKeys(kms_sgfx_session_key_handle);
+
+  retval = Sgfx_KMS_DeriveKey(data, (CK_OBJECT_HANDLE)kms_sgfx_session_key_handle);
+#endif /* SIGFOX_KMS */
+  /* USER CODE BEGIN CREDENTIALS_wrap_session_key_2 */
+
+  /* USER CODE END CREDENTIALS_wrap_session_key_2 */
+  return retval;
+}
+
+const char *CREDENTIALS_get_version(void)
+{
+  /* USER CODE BEGIN CREDENTIALS_get_version_1 */
+
+  /* USER CODE END CREDENTIALS_get_version_1 */
+  return sgfxSeeLibVersion;
+  /* USER CODE BEGIN CREDENTIALS_get_version_2 */
+
+  /* USER CODE END CREDENTIALS_get_version_2 */
+}
+
+void CREDENTIALS_get_dev_id(uint8_t *dev_id)
+{
+  /* USER CODE BEGIN CREDENTIALS_get_dev_id_1 */
+
+  /* USER CODE END CREDENTIALS_get_dev_id_1 */
+#if (SIGFOX_KMS == 0)
+  manuf_device_info_t DeviceInfo;
+
+  CREDENTIALS_get_cra((uint8_t *) &DeviceInfo, encrypted_sigfox_data, sizeof(manuf_device_info_t));
+
+  memcpy(dev_id, DeviceInfo.dev_id, MANUF_DEVICE_ID_LENGTH);
+
+  /*clear key*/
+  memset(DeviceInfo.dev_key, 0, AES_KEY_LEN);
+#else
+  Sgfx_KMS_GetAttribute(KMS_SGFX_ID_OBJECT_HANDLE, dev_id);
+#endif /* SIGFOX_KMS */
+  /* USER CODE BEGIN CREDENTIALS_get_dev_id_2 */
+
+  /* USER CODE END CREDENTIALS_get_dev_id_2 */
+}
+
+void CREDENTIALS_get_initial_pac(uint8_t *pac)
+{
+  /* USER CODE BEGIN CREDENTIALS_get_initial_pac_1 */
+
+  /* USER CODE END CREDENTIALS_get_initial_pac_1 */
+#if (SIGFOX_KMS == 0)
+  manuf_device_info_t DeviceInfo;
+
+  CREDENTIALS_get_cra((uint8_t *) &DeviceInfo, encrypted_sigfox_data, sizeof(manuf_device_info_t));
+  /*clear key*/
+  memcpy(pac, DeviceInfo.pac, MANUF_PAC_LENGTH);
+  /*clear key*/
+  memset(DeviceInfo.dev_key, 0, AES_KEY_LEN);
+#else
+  Sgfx_KMS_GetAttribute(KMS_SGFX_PAC_OBJECT_HANDLE, pac);
+#endif /* SIGFOX_KMS */
+  /* USER CODE BEGIN CREDENTIALS_get_initial_pac_2 */
+
+  /* USER CODE END CREDENTIALS_get_initial_pac_2 */
+}
+
+sfx_bool CREDENTIALS_get_payload_encryption_flag(void)
+{
+  sfx_bool ret = SFX_FALSE;
+
+  ret = (sfx_bool) SE_NVM_get_encrypt_flag();
+  /* USER CODE BEGIN CREDENTIALS_get_payload_encryption_flag_1 */
+
+  /* USER CODE END CREDENTIALS_get_payload_encryption_flag_1 */
+  return ret;
+}
+
+void CREDENTIALS_set_payload_encryption_flag(uint8_t enable)
+{
+  /* USER CODE BEGIN CREDENTIALS_set_payload_encryption_flag_1 */
+
+  /* USER CODE END CREDENTIALS_set_payload_encryption_flag_1 */
+  if (enable == 0)
+  {
+    SE_NVM_set_encrypt_flag(0);
+  }
+  else
+  {
+    SE_NVM_set_encrypt_flag(1);
+  }
+  /* USER CODE BEGIN CREDENTIALS_set_payload_encryption_flag_2 */
+
+  /* USER CODE END CREDENTIALS_set_payload_encryption_flag_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+#if (SIGFOX_KMS == 0)
+static void CREDENTIALS_get_key(uint8_t *key, sfx_key_type_t KeyType)
+{
+  /* USER CODE BEGIN CREDENTIALS_get_key_1 */
+
+  /* USER CODE END CREDENTIALS_get_key_1 */
+  switch (KeyType)
+  {
+    case CREDENTIALS_KEY_PUBLIC:
+    {
+      memcpy(key, device_public_key, AES_KEY_LEN);
+
+      break;
+    }
+    case CREDENTIALS_KEY_PRIVATE:
+    {
+      manuf_device_info_t DeviceInfo;
+
+      CREDENTIALS_get_cra((uint8_t *) &DeviceInfo, encrypted_sigfox_data, sizeof(manuf_device_info_t));
+
+      memcpy(key, DeviceInfo.dev_key, AES_KEY_LEN);
+
+      memset(DeviceInfo.dev_key, 0, AES_KEY_LEN);
+
+      break;
+    }
+    default:
+      break;
+  }
+  /* USER CODE BEGIN CREDENTIALS_get_key_2 */
+
+  /* USER CODE END CREDENTIALS_get_key_2 */
+}
+
+static sfx_error_t CREDENTIALS_get_cra(sfx_u8 *decrypted_data, sfx_u8 *data_to_decrypt, sfx_u8 data_len)
+{
+  /* USER CODE BEGIN CREDENTIALS_get_cra_1 */
+
+  /* USER CODE END CREDENTIALS_get_cra_1 */
+#ifdef CREDENTIAL_KEY
+  uint8_t iv[N_BLOCK_128] = {0x00};
+
+  uint8_t CredentialKey[AES_KEY_LEN] = CREDENTIAL_KEY;
+
+  /*device is provisioned with sigfox_data.h   */
+  /*encrypted with CREDENTIAL_KEY in Sigfox Tool*/
+  sigfox_aes_set_key(CredentialKey, AES_KEY_LEN,  &AesContext);
+
+  memset(CredentialKey, 0, AES_KEY_LEN);
+
+  sigfox_aes_cbc_decrypt(data_to_decrypt,
+                         decrypted_data,
+                         sizeof(manuf_device_info_t) / AES_KEY_LEN,
+                         iv,
+                         &AesContext);
+#else
+  /* default sigfox_data.h provided, sigfox_data.h is not encrypted*/
+  memcpy((uint8_t *) decrypted_data, (uint8_t *) data_to_decrypt, sizeof(manuf_device_info_t));
+#endif /* CREDENTIAL_KEY */
+  /* USER CODE BEGIN CREDENTIALS_get_cra_2 */
+
+  /* USER CODE END CREDENTIALS_get_cra_2 */
+  return SFX_ERR_NONE;
+}
+
+#else /* SIGFOX_KMS == 1 */
+
+static sfx_error_t Sgfx_KMS_AES_CBC_encrypt(sfx_u8 *data_to_encrypt, sfx_u8 *encrypted_data,
+                                            CK_OBJECT_HANDLE key_object_handle, sfx_u8 length)
+{
+  /* USER CODE BEGIN Sgfx_KMS_AES_CBC_encrypt_1 */
+
+  /* USER CODE END Sgfx_KMS_AES_CBC_encrypt_1 */
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  uint32_t length16Bytes = 0;
+  uint32_t encrypted_length = 0;
+  uint8_t tag[16] = {0};
+  uint32_t tag_length = 0;
+  sfx_error_t retval = SFX_ERR_NONE;
+
+  /* AES CBC Configuration variables */
+  uint8_t cbc_iv[N_BLOCK_128] = {0x00};
+  CK_MECHANISM aes_cbc_mechanism = { CKM_AES_CBC, (CK_VOID_PTR)cbc_iv, sizeof(cbc_iv) };
+
+  /* convert blocks is 16bytes (128b) input KMS is in byte */
+  length16Bytes = length << 4;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* -------------------------------------------------------------------------*/
+  /* Encryption --------------------------------------------------------------*/
+  /* -------------------------------------------------------------------------*/
+
+  /* Configure session to Authentication message in AES CMAC with settings included into the mechanism */
+  if (rv == CKR_OK)
+  {
+
+    /* encrypt with Sigfox key */
+    rv = C_EncryptInit(session, &aes_cbc_mechanism, (CK_OBJECT_HANDLE)key_object_handle);
+  }
+
+  /* Encrypt clear message */
+  if (rv == CKR_OK)
+  {
+    encrypted_length = length16Bytes;
+    rv = C_EncryptUpdate(session, (CK_BYTE_PTR)data_to_encrypt, length16Bytes,
+                         encrypted_data, (CK_ULONG_PTR)&encrypted_length);
+  }
+
+  /* Finalize message Authentication */
+  if (rv == CKR_OK)
+  {
+    rv = C_EncryptFinal(session, &tag[0], (CK_ULONG_PTR)&tag_length);
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+  if (rv != CKR_OK)
+  {
+    retval = SE_ERR_API_SECURE_UP_MSG;
+  }
+
+  /* USER CODE BEGIN Sgfx_KMS_AES_CBC_encrypt_2 */
+
+  /* USER CODE END Sgfx_KMS_AES_CBC_encrypt_2 */
+  return retval;
+}
+
+static sfx_error_t Sgfx_KMS_DeriveKey(uint8_t *input, CK_OBJECT_HANDLE derivedkeyObj)
+{
+  /* USER CODE BEGIN Sgfx_KMS_DeriveKey_1 */
+
+  /* USER CODE END Sgfx_KMS_DeriveKey_1 */
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  /* Key derivation */
+  CK_MECHANISM      mech = {CKM_AES_ECB_ENCRYPT_DATA, input, AES_KEY_LEN};
+  sfx_error_t retval = SFX_ERR_NONE;
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Derive key with pass phrase */
+  if (rv == CKR_OK)
+  {
+    rv = C_DeriveKey(session, &(mech), (CK_OBJECT_HANDLE)KMS_SGFX_DATA_KEY_OBJECT_HANDLE,
+                     &DeriveKey_template[0], sizeof(DeriveKey_template) / sizeof(CK_ATTRIBUTE), &derivedkeyObj);
+  }
+  if (rv != CKR_OK)
+  {
+    retval = SE_ERR_API_SECURE_UP_MSG;
+  }
+  /* store generated derivedkeyObj */
+  kms_sgfx_session_key_handle = derivedkeyObj;
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  /* USER CODE BEGIN Sgfx_KMS_DeriveKey_2 */
+
+  /* USER CODE END Sgfx_KMS_DeriveKey_2 */
+  return retval;
+}
+
+static sfx_error_t Sgfx_KMS_GetAttribute(CK_OBJECT_HANDLE input, uint8_t *pAttrVal)
+{
+  /* USER CODE BEGIN Sgfx_KMS_GetAttribute_1 */
+
+  /* USER CODE END Sgfx_KMS_GetAttribute_1 */
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+  sfx_error_t retval = SFX_ERR_NONE;
+  uint8_t attrlength;
+
+  /* Determine size of AttrVal tab*/
+  if (input == KMS_SGFX_ID_OBJECT_HANDLE)
+  {
+    attrlength = MANUF_DEVICE_ID_LENGTH;
+  }
+  else if (input == KMS_SGFX_PAC_OBJECT_HANDLE)
+  {
+    attrlength = MANUF_PAC_LENGTH;
+  }
+  else
+  {
+    return -1;
+  }
+
+  CK_ATTRIBUTE pAttr[] = {{CKA_VALUE, (CK_VOID_PTR) &DeriveKey_template_class, attrlength}};
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  /* Get derived key to display */
+  /* possible only because DeriveKey_template DeriveKey_template_extract = TRUE */
+  /* after debug phase DeriveKey_template_extract shall be FALSE */
+  if (rv == CKR_OK)
+  {
+    pAttr[0].pValue = pAttrVal;
+    rv = C_GetAttributeValue(session, (CK_OBJECT_HANDLE) input, &(pAttr[0]), sizeof(pAttr) /
+                             sizeof(CK_ATTRIBUTE));
+  }
+
+  if (rv != CKR_OK)
+  {
+    if (input == KMS_SGFX_ID_OBJECT_HANDLE)
+    {
+      retval = SE_ERR_API_GET_ID;
+    }
+    else
+    {
+      retval = SE_ERR_API_GET_PAC;
+    }
+  }
+
+  /* Close session with KMS */
+  (void)C_CloseSession(session);
+
+  /* USER CODE BEGIN Sgfx_KMS_GetAttribute_2 */
+
+  /* USER CODE END Sgfx_KMS_GetAttribute_2 */
+  return retval;
+}
+
+/*!
+ * \brief Deletion of Derived Key
+ * \param [IN] input handle to be destroyed
+ * \param [OUT] NONE
+ * NOTE: C_DestroyObject() KMS function output isn't transmitted to higher layers
+ * because the 1st call, as no handle is created, returns an error
+ */
+static void Sgfx_KMS_DeleteDerivedKeys(CK_OBJECT_HANDLE input)
+{
+  /* USER CODE BEGIN Sgfx_KMS_DeleteDerivedKeys_1 */
+
+  /* USER CODE END Sgfx_KMS_DeleteDerivedKeys_1 */
+#if (!defined (SIGFOX_KMS) || (SIGFOX_KMS == 0))
+#else /* SIGFOX_KMS == 1 */
+  CK_RV rv;
+  CK_SESSION_HANDLE session;
+  CK_FLAGS session_flags = CKF_SERIAL_SESSION;  /* Read ONLY session */
+
+  /* Open session with KMS */
+  rv = C_OpenSession(0,  session_flags, NULL, 0, &session);
+
+  if (rv == CKR_OK)
+  {
+    C_DestroyObject(session, input);
+  }
+
+  /* Close sessions */
+  if (session > 0)
+  {
+    (void)C_CloseSession(session);
+  }
+#endif /* SIGFOX_KMS == 1 */
+  /* USER CODE BEGIN Sgfx_KMS_DeleteDerivedKeys_2 */
+
+  /* USER CODE END Sgfx_KMS_DeleteDerivedKeys_2 */
+}
+
+#endif /* SIGFOX_KMS */
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h
new file mode 100644
index 00000000..c7d84239
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h
@@ -0,0 +1,139 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_credentials.h
+  * @author  MCD Application Team
+  * @brief   interface to key manager and encryption algorithm
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SGFX_CREDENTIALS_H__
+#define __SGFX_CREDENTIALS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "sigfox_types.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define AES_KEY_LEN 16 /* bytes */
+
+/* encrypted_sigfox_data defines size */
+#define MANUF_DEVICE_ID_LENGTH      4
+#define MANUF_SIGNATURE_LENGTH     16
+#define MANUF_VER_LENGTH            1
+#define MANUF_SPARE_1               3
+#define MANUF_DEVICE_KEY_LENGTH    16
+#define MANUF_PAC_LENGTH            8
+#define MANUF_SPARE_2              14
+#define MANUF_CRC_LENGTH            2
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief      get the cmac library version
+  * @return     string containing the library version
+  */
+const char *CREDENTIALS_get_version(void);
+
+/**
+  * @brief      get the loaded dev_id
+  * @param[out] dev_id return the dev_id in the pointer
+  */
+void CREDENTIALS_get_dev_id(uint8_t *dev_id);
+
+/**
+  * @brief      get the loaded pac
+  * @param[out] pac return the pac in the pointer
+  */
+void CREDENTIALS_get_initial_pac(uint8_t *pac);
+
+/**
+  * @brief      get the payload_encryption_flag
+  * @retval     the payload_encryption_flag
+  */
+sfx_bool CREDENTIALS_get_payload_encryption_flag(void);
+
+/**
+  * @brief      set the payload_encryption_flag
+  * @param[in]  enable flag. 0: disable, 1: enable
+  */
+void CREDENTIALS_set_payload_encryption_flag(uint8_t enable);
+
+/**
+  * @brief      encrypts the data_to_encrypt with aes secrete Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
+  */
+sfx_error_t CREDENTIALS_aes_128_cbc_encrypt(uint8_t *encrypted_data, uint8_t *data_to_encrypt, uint8_t block_len);
+
+/**
+  * @brief      encrypts the data_to_encrypt with aes session Key
+  * @param[out] encrypted_data the encrypted data
+  * @param[in]  data_to_encrypt
+  * @param[in]  block_len the number of aes blocks
+  * @return     sfx_error_t status
+  */
+sfx_error_t CREDENTIALS_aes_128_cbc_encrypt_with_session_key(uint8_t *encrypted_data, uint8_t *data_to_encrypt,
+                                                             uint8_t block_len);
+
+/**
+  * @brief      wraps the session Key
+  * @param[in]  data the arguments used to generate the session Key
+  * @param[in]  blocks the number of aes blocks
+  * @return     sfx_error_t status
+  */
+sfx_error_t CREDENTIALS_wrap_session_key(uint8_t *data, uint8_t blocks);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SGFX_CREDENTIALS_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/timer.h
new file mode 100644
index 00000000..e80cd6a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/timer.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer.h
+  * @author  MCD Application Team
+  * @brief   Wrapper to timer server
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_H__
+#define __TIMER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Max timer mask
+  */
+#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/**
+  * @brief Timer value on 32 bits
+  */
+#define TimerTime_t UTIL_TIMER_Time_t
+
+/**
+  * @brief Timer object description
+  */
+#define TimerEvent_t UTIL_TIMER_Object_t
+
+/**
+  * @brief Create the timer object
+  */
+#define TimerInit(HANDLE, CB) do {\
+                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
+                                 } while(0)
+
+/**
+  * @brief update the period and start the timer
+  */
+#define TimerSetValue(HANDLE, TIMEOUT) do{ \
+                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
+                                         } while(0)
+
+/**
+  * @brief Start and adds the timer object to the list of timer events
+  */
+#define TimerStart(HANDLE)   do {\
+                                  UTIL_TIMER_Start(HANDLE);\
+                                } while(0)
+
+/**
+  * @brief Stop and removes the timer object from the list of timer events
+  */
+#define TimerStop(HANDLE)   do {\
+                                 UTIL_TIMER_Stop(HANDLE);\
+                               } while(0)
+
+/**
+  * @brief return the current time
+  */
+#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
+
+/**
+  * @brief return the elapsed time
+  */
+#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc.h
new file mode 100644
index 00000000..2e8c37f3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    adc.h
+  * @brief   This file contains all the function prototypes for
+  *          the adc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __ADC_H__
+#define __ADC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern ADC_HandleTypeDef hadc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_ADC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc_if.h
new file mode 100644
index 00000000..5c2a2568
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/adc_if.h
@@ -0,0 +1,104 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    adc_if.h
+  * @author  MCD Application Team
+  * @brief   Header for ADC interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __ADC_IF_H__
+#define __ADC_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Battery level in mV
+  */
+#define BAT_CR2032                  ((uint32_t) 3000)
+/**
+  * @brief Maximum battery level in mV
+  */
+#define VDD_BAT                     BAT_CR2032
+/**
+  * @brief Minimum battery level in mV
+  */
+#define VDD_MIN                     1800
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/**
+  * @brief  Initializes the ADC input
+  */
+void SYS_InitMeasurement(void);
+
+/**
+  * @brief DeInitializes the ADC
+  */
+void SYS_DeInitMeasurement(void);
+
+/**
+  * @brief  Get the current temperature
+  * @return value temperature in degree Celsius( q7.8 )
+  */
+int16_t SYS_GetTemperatureLevel(void);
+
+/**
+  * @brief Get the current battery level
+  * @return value battery level in linear scale
+  */
+uint16_t SYS_GetBatteryLevel(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/dma.h
new file mode 100644
index 00000000..59a26f2e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/dma.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    dma.h
+  * @brief   This file contains all the function prototypes for
+  *          the dma.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __DMA_H__
+#define __DMA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* DMA memory to memory transfer handles -------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_DMA_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DMA_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc.h
new file mode 100644
index 00000000..3dbeb3d7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.h
+  * @brief   This file contains all the function prototypes for
+  *          the ipcc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_H__
+#define __IPCC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern IPCC_HandleTypeDef hipcc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_IPCC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc_if.h
new file mode 100644
index 00000000..e891e529
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc_if.h
@@ -0,0 +1,109 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.h
+  * @author  MCD Application Team
+  * @brief   This file contains the interface of the ipcc driver on CM4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __IPCC_IF_CM4_H__
+#define __IPCC_IF_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "ipcc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Initialize IPCC and register upper and downer callbacks
+  * @param  IPCC_IF_ResponseRcv_cb     response callback
+  * @param  IPCC_IF_NotificationRcv_cb notification callback
+  */
+void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
+
+/**
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
+
+/**
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc channel status
+  * @retval IPCC_CHANNEL_STATUS_FREE 0
+  * @retval IPCC_CHANNEL_STATUS_OCCUPIED 1
+  */
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
+
+/**
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
+
+/**
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
+  * @param channelIdx  ipcc channel
+  * @return ipcc status [OK: 0 , fail: -1]
+  */
+int32_t IPCC_IF_AcknowledgeSnd(uint32_t channelIdx);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IPCC_IF_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE***/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/main.h
new file mode 100644
index 00000000..14990858
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/main.h
@@ -0,0 +1,91 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.h
+  * @brief          : Header for main.c file.
+  *                   This file contains the common defines of the application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+#define RTC_N_PREDIV_S 10
+#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define BUT1_Pin GPIO_PIN_0
+#define BUT1_GPIO_Port GPIOA
+#define BUT1_EXTI_IRQn EXTI0_IRQn
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define BUT2_Pin GPIO_PIN_1
+#define BUT2_GPIO_Port GPIOA
+#define BUT2_EXTI_IRQn EXTI1_IRQn
+#define USARTx_RX_Pin GPIO_PIN_3
+#define USARTx_RX_GPIO_Port GPIOA
+#define USARTx_TX_Pin GPIO_PIN_2
+#define USARTx_TX_GPIO_Port GPIOA
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/platform.h
new file mode 100644
index 00000000..2386cd7f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/platform.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    platform.h
+  * @author  MCD Application Team
+  * @brief   Header for General HW instances configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+
+#define USE_BSP_DRIVER
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdbool.h>
+#include "stm32wlxx.h"
+#include "main.h"
+#include "stm32wlxx_ll_gpio.h"
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP.  */
+/* In order to use BSP, users can add the BSP files in the IDE project space */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  */
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_nucleo_radio.h"
+#endif /* defined(USE_BSP_DRIVER) */
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PLATFORM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32_lpm_if.h
new file mode 100644
index 00000000..cbe62fa1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32_lpm_if.h
@@ -0,0 +1,102 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Low Power Manager interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_LPM_IF_H__
+#define __STM32_LPM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_lpm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Enters Low Power Off Mode
+  */
+void PWR_EnterOffMode(void);
+
+/**
+  * @brief Exits Low Power Off Mode
+  */
+void PWR_ExitOffMode(void);
+
+/**
+  * @brief Enters Low Power Stop Mode
+  * @note ARM exists the function when waking up
+  */
+void PWR_EnterStopMode(void);
+
+/**
+  * @brief Exits Low Power Stop Mode
+  * @note Enable the pll at 32MHz
+  */
+void PWR_ExitStopMode(void);
+
+/**
+  * @brief Enters Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_EnterSleepMode(void);
+
+/**
+  * @brief Exits Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_ExitSleepMode(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_LPM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..2fffde50
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,338 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+/*#define HAL_COMP_MODULE_ENABLED   */
+/*#define HAL_CRC_MODULE_ENABLED   */
+/*#define HAL_CRYP_MODULE_ENABLED   */
+/*#define HAL_DAC_MODULE_ENABLED   */
+/*#define HAL_GTZC_MODULE_ENABLED   */
+/*#define HAL_HSEM_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED   */
+/*#define HAL_I2S_MODULE_ENABLED   */
+#define HAL_IPCC_MODULE_ENABLED
+/*#define HAL_IRDA_MODULE_ENABLED   */
+/*#define HAL_IWDG_MODULE_ENABLED   */
+/*#define HAL_LPTIM_MODULE_ENABLED   */
+/*#define HAL_PKA_MODULE_ENABLED   */
+/*#define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+/*#define HAL_SUBGHZ_MODULE_ENABLED   */
+/*#define HAL_TIM_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..06556d8b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+ ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32WLxx_IT_H
+#define __STM32WLxx_IT_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+void EXTI0_IRQHandler(void);
+void EXTI1_IRQHandler(void);
+void DMA1_Channel5_IRQHandler(void);
+void LPUART1_IRQHandler(void);
+void IPCC_C1_RX_IRQHandler(void);
+void IPCC_C1_TX_IRQHandler(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_app.h
new file mode 100644
index 00000000..024b3713
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_app.h
@@ -0,0 +1,99 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for sys_app.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_APP_H__
+#define __SYS_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmux_table.h"
+#include "sys_conf.h"
+#include "stm32_adv_trace.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#define APP_PPRINTF(...)  do{ } while( UTIL_ADV_TRACE_OK \
+                              != UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__) ) /* Polling Mode */
+#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
+#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+
+#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
+#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
+#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
+#define APP_LOG(TS,VL,...)
+#else
+#error "APP_LOG_ENABLED not defined or out of range <0,1>"
+#endif /* APP_LOG_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
+  */
+void SystemApp_Init(void);
+
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
+void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_APP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_conf.h
new file mode 100644
index 00000000..a2f39fa4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_conf.h
@@ -0,0 +1,99 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_conf.h
+  * @author  MCD Application Team
+  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_CONF_H__
+#define __SYS_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/**
+  * @brief Temperature and pressure values are retrieved from sensors shield
+  *        (instead of sending dummy values). It requires MEMS IKS shield
+  */
+#define SENSOR_ENABLED              0
+
+/**
+  * @brief CM4 Verbose level for all trace logs
+  */
+#define VERBOSE_LEVEL               VLEVEL_M
+
+/**
+  * @brief Enable trace logs
+  */
+#define APP_LOG_ENABLED             1
+
+/**
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
+  */
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
+
+/**
+  * @brief Disable Low Power mode
+  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
+  */
+#define LOW_POWER_DISABLE           0
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_sensors.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_sensors.h
new file mode 100644
index 00000000..fc37f342
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_sensors.h
@@ -0,0 +1,98 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_sensors.h
+  * @author  MCD Application Team
+  * @brief   Header for sensors application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SENSORS_H__
+#define __SENSORS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/**
+  * Sensor data parameters
+  */
+typedef struct
+{
+  float pressure;         /*!< in mbar */
+  float temperature;      /*!< in degC */
+  float humidity;         /*!< in % */
+  int32_t latitude;       /*!< latitude converted to binary */
+  int32_t longitude ;     /*!< longitude converted to binary */
+  int16_t altitudeGps;    /*!< in m */
+  int16_t altitudeBar ;   /*!< in m * 10 */
+  /**more may be added*/
+  /* USER CODE BEGIN sensor_t */
+
+  /* USER CODE END sensor_t */
+} sensor_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1) && defined (X_NUCLEO_IKS01A2)
+#define HTS221_0    0U
+#define LPS22HB_0   1U
+#endif /* SENSOR_ENABLED & X_NUCLEO_IKS01A2 */
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  initialize the environmental sensor
+  */
+int32_t EnvSensors_Init(void);
+
+/**
+  * @brief  Environmental sensor  read.
+  * @param  sensor_data sensor data
+  */
+int32_t EnvSensors_Read(sensor_t *sensor_data);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SENSORS_H__ */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/timer_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/timer_if.h
new file mode 100644
index 00000000..3bbde030
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/timer_if.h
@@ -0,0 +1,174 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.h
+  * @author  MCD Application Team
+  * @brief  configuration of the timer_if.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_IF_H__
+#define __TIMER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+#include "stm32_systime.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Init RTC hardware
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_Init(void);
+
+/**
+  * @brief Set the alarm
+  * @note The alarm is set at timeout from timer Reference (TimerContext)
+  * @param timeout Duration of the Timer in ticks
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout);
+
+/**
+  * @brief Stop the Alarm
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void);
+
+/**
+  * @brief set timer Reference (TimerContext)
+  * @return  Timer Reference Value in  Ticks
+  */
+uint32_t TIMER_IF_SetTimerContext(void);
+
+/**
+  * @brief Get the RTC timer Reference
+  * @return Timer Value in  Ticks
+  */
+uint32_t TIMER_IF_GetTimerContext(void);
+
+/**
+  * @brief Get the timer elapsed time since timer Reference (TimerContext) was set
+  * @return RTC Elapsed time in ticks
+  */
+uint32_t TIMER_IF_GetTimerElapsedTime(void);
+
+/**
+  * @brief Get the timer value
+  * @return RTC Timer value in ticks
+  */
+uint32_t TIMER_IF_GetTimerValue(void);
+
+/**
+  * @brief Return the minimum timeout in ticks the RTC is able to handle
+  * @return minimum value for a timeout in ticks
+  */
+uint32_t TIMER_IF_GetMinimumTimeout(void);
+
+/**
+  * @brief a delay of delay ms by polling RTC
+  * @param delay in ms
+  */
+void TIMER_IF_DelayMs(uint32_t delay);
+
+/**
+  * @brief converts time in ms to time in ticks
+  * @param[in] timeMilliSec time in milliseconds
+  * @return time in timer ticks
+  */
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec);
+
+/**
+  * @brief converts time in ticks to time in ms
+  * @param[in] tick time in timer ticks
+  * @return time in timer milliseconds
+  */
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick);
+
+/**
+  * @brief Get rtc time
+  * @param[out] subSeconds in ticks
+  * @return time seconds
+  */
+uint32_t TIMER_IF_GetTime(uint16_t *subSeconds);
+
+/**
+  * @brief write seconds in backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @param[in] Seconds time in seconds
+  */
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds);
+
+/**
+  * @brief reads seconds from backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @return Time in seconds
+  */
+uint32_t TIMER_IF_BkUp_Read_Seconds(void);
+
+/**
+  * @brief writes SubSeconds in backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @param[in] SubSeconds time in SubSeconds
+  */
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds);
+
+/**
+  * @brief reads SubSeconds from backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @return Time in SubSeconds
+  */
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart.h
new file mode 100644
index 00000000..29cb339e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    usart.h
+  * @brief   This file contains all the function prototypes for
+  *          the usart.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_H__
+#define __USART_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern UART_HandleTypeDef hlpuart1;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_LPUART1_UART_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart_if.h
new file mode 100644
index 00000000..b1ed2355
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/usart_if.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.h
+  * @author  MCD Application Team
+  * @brief   Header for USART interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#include "stm32_adv_trace.h"
+#include "usart.h"
+#include "dma.h"
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_IF_H__
+#define __USART_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init the UART and associated DMA.
+  * @param  cb TxCpltCallback
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *));
+
+/**
+  * @brief  init receiver of vcom
+  * @param  RxCb callback when Rx char is received
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error));
+
+/**
+  * @brief  DeInit the UART and associated DMA.
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom in polling mode
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  */
+void vcom_Trace(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom using DMA
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  last byte has been sent on the uart line
+  */
+void vcom_IRQHandler(void);
+
+/**
+  * @brief  last byte has been sent from memory to uart data register
+  */
+void vcom_DMA_TX_IRQHandler(void);
+
+/**
+  * @brief  Resume the UART and associated DMA (used by LPM)
+  */
+void vcom_Resume(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h
new file mode 100644
index 00000000..31fa7a54
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h
@@ -0,0 +1,225 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for configuration file to utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_CONF_H__
+#define __UTILITIES_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "cmsis_compiler.h"
+
+/* definitions to be provided to "sequencer" utility */
+#include "stm32_mem.h"
+/* definition and callback for tiny_vsnprintf */
+#include "stm32_tiny_vsnprintf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/*---------------------------------------------------------------------------*/
+/*                             sequencer configuration                       */
+/*---------------------------------------------------------------------------*/
+/**
+  * @brief Sequencer flag reserved for future use
+  */
+#define UTIL_SEQ_RFU 0
+
+/**
+  * @brief default number of tasks configured in sequencer
+  */
+#define SEQ_CONF_TASK_NBR    3
+
+/**
+  * @brief default value of priority task
+  */
+#define SEQ_CONF_PRIO_NBR    1
+
+/*---------------------------------------------------------------------------*/
+/*                             eeprom configuration                       */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * @brief Flash address
+  */
+#define HW_FLASH_ADDRESS                (0x08000000UL)
+
+/**
+  * @brief Flash page size in bytes
+  */
+#define HW_FLASH_PAGE_SIZE              (0x00000800UL)
+
+/**
+  * @brief Flash width in bytes
+  */
+#define HW_FLASH_WIDTH                  8
+
+/**
+  * @brief Flash bank0 size in bytes
+  */
+#define CFG_EE_BANK0_SIZE               2*HW_FLASH_PAGE_SIZE
+
+/**
+  * @brief Maximum number of data that can be stored in bank0
+  */
+#define CFG_EE_BANK0_MAX_NB             EE_ID_COUNT<<2 /*from uint32 to byte*/
+
+/* Unused Bank1 */
+/**
+  * @brief Flash bank1 size in bytes
+  */
+#define CFG_EE_BANK1_SIZE              0
+
+/**
+  * @brief Maximum number of data that can be stored in bank1
+  */
+#define CFG_EE_BANK1_MAX_NB            0
+
+/**
+  * @brief EEPROM Flash address
+  * @note last 2 sector of a 128kBytes device
+  */
+#define EE_BASE_ADRESS                  (0x0801D000UL)
+
+#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
+#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
+                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
+#define VLEVEL_L 1       /*!< just essential traces */
+#define VLEVEL_M 2       /*!< functional traces */
+#define VLEVEL_H 3       /*!< all traces */
+
+#define TS_OFF 0         /*!< Log without TimeStamp */
+#define TS_ON 1          /*!< Log with TimeStamp */
+
+#define T_REG_OFF  0     /*!< Log without bitmask */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Memory placement macro
+  */
+#if defined(__CC_ARM)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
+#elif defined(__ICCARM__)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#else  /* __GNUC__ */
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+
+/**
+  * @brief Memory alignment macro
+  */
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* WIN32 */
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
+
+/**
+  * @brief Memset utilities interface to application
+  */
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTILS_ENTER_CRITICAL_SECTION() uint32_t primask_bit= __get_PRIMASK();\
+  __disable_irq()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTILS_EXIT_CRITICAL_SECTION()  __set_PRIMASK(primask_bit)
+
+/******************************************************************************
+  * trace\advanced
+  * the define option
+  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
+  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
+  *
+  ******************************************************************************/
+
+#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
+#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
+#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
+#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
+#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
+#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
+#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UTILITIES_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h
new file mode 100644
index 00000000..6e1488ab
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h
@@ -0,0 +1,140 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_def.h
+  * @author  MCD Application Team
+  * @brief   Definitions for modules requiring utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_DEF_H__
+#define __UTILITIES_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/******************************************************************************
+  * LOW POWER MANAGER
+  ******************************************************************************/
+/**
+  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+  * It lists a bit mapping of all user of the Low Power Manager
+  */
+typedef enum
+{
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
+  CFG_LPM_APPLI_Id,
+  CFG_LPM_UART_TX_Id,
+  CFG_LPM_SGFX_MN_Id,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/*---------------------------------------------------------------------------*/
+/*                             sequencer definitions                         */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * This is the list of priority required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Prio_0,
+  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
+
+  /* USER CODE END CFG_SEQ_Prio_Id_t */
+  CFG_SEQ_Prio_NBR,
+} CFG_SEQ_Prio_Id_t;
+
+/**
+  * This is the list of task id required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  /* CM4 */
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t_0 */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t_0 */
+  CFG_SEQ_Task_MbSystemNotifRcv,
+  CFG_SEQ_Task_MbSigfoxNotifRcv,
+  CFG_SEQ_Task_MbRadioNotifRcv,
+  CFG_SEQ_Task_Pb,
+  CFG_SEQ_Evt_Monarch,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t */
+  CFG_SEQ_Task_NBR
+} CFG_SEQ_Task_Id_t;
+
+/**
+  * This is a bit mapping over 32bits listing all events id supported in the application
+  */
+typedef enum
+{
+  /* CM4 */
+  CFG_SEQ_Evt_MbSystemRespRcv,
+  CFG_SEQ_Evt_MbKmsRespRcv,
+  CFG_SEQ_Evt_MbSigfoxRespRcv,
+  CFG_SEQ_Evt_MbRadioRespRcv,
+  /* USER CODE BEGIN CFG_SEQ_IdleEvt_Id_t */
+
+  /* USER CODE END CFG_SEQ_IdleEvt_Id_t */
+  CFG_SEQ_Evt_NBR
+} CFG_SEQ_IdleEvt_Id_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UTILITIES_DEF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/adc.c
new file mode 100644
index 00000000..d6f3988c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/adc.c
@@ -0,0 +1,107 @@
+/**
+  ******************************************************************************
+  * @file    adc.c
+  * @brief   This file provides code for the configuration
+  *          of the ADC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+ADC_HandleTypeDef hadc;
+
+/* ADC init function */
+void MX_ADC_Init(void)
+{
+
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
+  /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
+  */
+  hadc.Instance = ADC;
+  hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
+  hadc.Init.Resolution = ADC_RESOLUTION_12B;
+  hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
+  hadc.Init.ScanConvMode = ADC_SCAN_DISABLE;
+  hadc.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
+  hadc.Init.LowPowerAutoWait = DISABLE;
+  hadc.Init.LowPowerAutoPowerOff = DISABLE;
+  hadc.Init.ContinuousConvMode = DISABLE;
+  hadc.Init.NbrOfConversion = 1;
+  hadc.Init.DiscontinuousConvMode = DISABLE;
+  hadc.Init.ExternalTrigConv = ADC_SOFTWARE_START;
+  hadc.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
+  hadc.Init.DMAContinuousRequests = DISABLE;
+  hadc.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
+  hadc.Init.SamplingTimeCommon1 = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.SamplingTimeCommon2 = ADC_SAMPLETIME_160CYCLES_5;
+  hadc.Init.OversamplingMode = DISABLE;
+  hadc.Init.TriggerFrequencyMode = ADC_TRIGGER_FREQ_HIGH;
+  if (HAL_ADC_Init(&hadc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
+
+}
+
+void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC)
+  {
+  /* USER CODE BEGIN ADC_MspInit 0 */
+
+  /* USER CODE END ADC_MspInit 0 */
+    /* ADC clock enable */
+    __HAL_RCC_ADC_CLK_ENABLE();
+  /* USER CODE BEGIN ADC_MspInit 1 */
+
+  /* USER CODE END ADC_MspInit 1 */
+  }
+}
+
+void HAL_ADC_MspDeInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC)
+  {
+  /* USER CODE BEGIN ADC_MspDeInit 0 */
+
+  /* USER CODE END ADC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_ADC_CLK_DISABLE();
+  /* USER CODE BEGIN ADC_MspDeInit 1 */
+
+  /* USER CODE END ADC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/adc_if.c
new file mode 100644
index 00000000..75af32ca
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/adc_if.c
@@ -0,0 +1,230 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    adc_if.c
+  * @author  MCD Application Team
+  * @brief   Read status related to the chip (battery level, VREF, chip temperature)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "adc_if.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief ADC handle
+  */
+extern ADC_HandleTypeDef hadc;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define TEMPSENSOR_TYP_CAL1_V          (( int32_t)  760)        /*!< Internal temperature sensor, parameter V30 (unit: mV). Refer to device datasheet for min/typ/max values. */
+#define TEMPSENSOR_TYP_AVGSLOPE        (( int32_t) 2500)        /*!< Internal temperature sensor, parameter Avg_Slope (unit: uV/DegCelsius). Refer to device datasheet for min/typ/max values. */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief This function reads the ADC channel
+  * @param channel channel number to read
+  * @return adc measured level value
+  */
+static uint32_t ADC_ReadChannels(uint32_t channel);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+void SYS_InitMeasurement(void)
+{
+  /* USER CODE BEGIN SYS_InitMeasurement_1 */
+
+  /* USER CODE END SYS_InitMeasurement_1 */
+  hadc.Instance = ADC;
+  /* USER CODE BEGIN SYS_InitMeasurement_2 */
+
+  /* USER CODE END SYS_InitMeasurement_2 */
+}
+
+void SYS_DeInitMeasurement(void)
+{
+  /* USER CODE BEGIN SYS_DeInitMeasurement_1 */
+
+  /* USER CODE END SYS_DeInitMeasurement_1 */
+}
+
+int16_t SYS_GetTemperatureLevel(void)
+{
+  /* USER CODE BEGIN SYS_GetTemperatureLevel_1 */
+
+  /* USER CODE END SYS_GetTemperatureLevel_1 */
+  int16_t temperatureDegreeC = 0;
+  uint32_t measuredLevel = 0;
+  uint16_t batteryLevelmV = SYS_GetBatteryLevel();
+
+  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_TEMPSENSOR);
+
+  /* convert ADC level to temperature */
+  /* check whether device has temperature sensor calibrated in production */
+  if (((int32_t)*TEMPSENSOR_CAL2_ADDR - (int32_t)*TEMPSENSOR_CAL1_ADDR) != 0)
+  {
+    /* Device with temperature sensor calibrated in production:
+       use device optimized parameters */
+    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE(batteryLevelmV,
+                                                   measuredLevel,
+                                                   LL_ADC_RESOLUTION_12B);
+  }
+  else
+  {
+    /* Device with temperature sensor not calibrated in production:
+       use generic parameters */
+    temperatureDegreeC = __LL_ADC_CALC_TEMPERATURE_TYP_PARAMS(TEMPSENSOR_TYP_AVGSLOPE,
+                                                              TEMPSENSOR_TYP_CAL1_V,
+                                                              TEMPSENSOR_CAL1_TEMP,
+                                                              batteryLevelmV,
+                                                              measuredLevel,
+                                                              LL_ADC_RESOLUTION_12B);
+  }
+
+  APP_LOG(TS_ON, VLEVEL_L, "temp= %d\n\r", temperatureDegreeC);
+
+  /* from int16 to q8.7*/
+  temperatureDegreeC <<= 8;
+
+  return (int16_t) temperatureDegreeC;
+  /* USER CODE BEGIN SYS_GetTemperatureLevel_2 */
+
+  /* USER CODE END SYS_GetTemperatureLevel_2 */
+}
+
+uint16_t SYS_GetBatteryLevel(void)
+{
+  /* USER CODE BEGIN SYS_GetBatteryLevel_1 */
+
+  /* USER CODE END SYS_GetBatteryLevel_1 */
+  uint16_t batteryLevelmV = 0;
+  uint32_t measuredLevel = 0;
+
+  measuredLevel = ADC_ReadChannels(ADC_CHANNEL_VREFINT);
+
+  if (measuredLevel == 0)
+  {
+    batteryLevelmV = 0;
+  }
+  else
+  {
+    if ((uint32_t)*VREFINT_CAL_ADDR != (uint32_t)0xFFFFU)
+    {
+      /* Device with Reference voltage calibrated in production:
+         use device optimized parameters */
+      batteryLevelmV = __LL_ADC_CALC_VREFANALOG_VOLTAGE(measuredLevel,
+                                                        ADC_RESOLUTION_12B);
+    }
+    else
+    {
+      /* Device with Reference voltage not calibrated in production:
+         use generic parameters */
+      batteryLevelmV = (VREFINT_CAL_VREF * 1510) / measuredLevel;
+    }
+  }
+
+  return batteryLevelmV;
+  /* USER CODE BEGIN SYS_GetBatteryLevel_2 */
+
+  /* USER CODE END SYS_GetBatteryLevel_2 */
+}
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+static uint32_t ADC_ReadChannels(uint32_t channel)
+{
+  /* USER CODE BEGIN ADC_ReadChannels_1 */
+
+  /* USER CODE END ADC_ReadChannels_1 */
+  uint32_t ADCxConvertedValues = 0;
+  ADC_ChannelConfTypeDef sConfig = {0};
+
+  MX_ADC_Init();
+
+  /* Start Calibration */
+  if (HAL_ADCEx_Calibration_Start(&hadc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* Configure Regular Channel */
+  sConfig.Channel = channel;
+  sConfig.Rank = ADC_REGULAR_RANK_1;
+  sConfig.SamplingTime = ADC_SAMPLINGTIME_COMMON_1;
+  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  if (HAL_ADC_Start(&hadc) != HAL_OK)
+  {
+    /* Start Error */
+    Error_Handler();
+  }
+  /** Wait for end of conversion */
+  HAL_ADC_PollForConversion(&hadc, HAL_MAX_DELAY);
+
+  /** Wait for end of conversion */
+  HAL_ADC_Stop(&hadc) ;   /* it calls also ADC_Disable() */
+
+  ADCxConvertedValues = HAL_ADC_GetValue(&hadc);
+
+  HAL_ADC_DeInit(&hadc);
+
+  return ADCxConvertedValues;
+  /* USER CODE BEGIN ADC_ReadChannels_2 */
+
+  /* USER CODE END ADC_ReadChannels_2 */
+}
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/dma.c
new file mode 100644
index 00000000..b93bda5c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/dma.c
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    dma.c
+  * @brief   This file provides code for the configuration
+  *          of all the requested memory to memory DMA transfers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "dma.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/*----------------------------------------------------------------------------*/
+/* Configure DMA                                                              */
+/*----------------------------------------------------------------------------*/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/**
+  * Enable DMA controller clock
+  */
+void MX_DMA_Init(void)
+{
+
+  /* DMA controller clock enable */
+  __HAL_RCC_DMAMUX1_CLK_ENABLE();
+  __HAL_RCC_DMA1_CLK_ENABLE();
+
+  /* DMA interrupt init */
+  /* DMA1_Channel5_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+
+}
+
+/* USER CODE BEGIN 2 */
+
+/* USER CODE END 2 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c
new file mode 100644
index 00000000..fdcbc616
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c
@@ -0,0 +1,97 @@
+/**
+  ******************************************************************************
+  * @file    ipcc.c
+  * @brief   This file provides code for the configuration
+  *          of the IPCC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "ipcc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+IPCC_HandleTypeDef hipcc;
+
+/* IPCC init function */
+void MX_IPCC_Init(void)
+{
+
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
+  hipcc.Instance = IPCC;
+  if (HAL_IPCC_Init(&hipcc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
+
+}
+
+void HAL_IPCC_MspInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspInit 0 */
+
+  /* USER CODE END IPCC_MspInit 0 */
+    /* IPCC clock enable */
+    __HAL_RCC_IPCC_CLK_ENABLE();
+
+    /* IPCC interrupt Init */
+    HAL_NVIC_SetPriority(IPCC_C1_RX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn);
+    HAL_NVIC_SetPriority(IPCC_C1_TX_IRQn, 1, 0);
+    HAL_NVIC_EnableIRQ(IPCC_C1_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspInit 1 */
+
+  /* USER CODE END IPCC_MspInit 1 */
+  }
+}
+
+void HAL_IPCC_MspDeInit(IPCC_HandleTypeDef* ipccHandle)
+{
+
+  if(ipccHandle->Instance==IPCC)
+  {
+  /* USER CODE BEGIN IPCC_MspDeInit 0 */
+
+  /* USER CODE END IPCC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_IPCC_CLK_DISABLE();
+
+    /* IPCC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(IPCC_C1_RX_IRQn);
+    HAL_NVIC_DisableIRQ(IPCC_C1_TX_IRQn);
+  /* USER CODE BEGIN IPCC_MspDeInit 1 */
+
+  /* USER CODE END IPCC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c
new file mode 100644
index 00000000..672a366f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c
@@ -0,0 +1,206 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    ipcc_if.c
+  * @author  MCD Application Team
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+
+/*ipcc interface for M4*/
+#include "assert.h"
+#include "stddef.h"
+#include "ipcc_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static void (*IpccResponseRcv)(uint32_t channelIdx);
+
+static void (*IpccNotificationRcv)(uint32_t channelIdx);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ confirmation of a received message by remote CPU
+  */
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/**
+  * @brief Interrupt service routine executed when Ipcc receive IRQ notification request by remote CPU
+  */
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
+                  void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx))
+{
+  /* USER CODE BEGIN IPCC_IF_Init_1 */
+
+  /* USER CODE END IPCC_IF_Init_1 */
+  /*Initialize the ipcc, initialize MSP*/
+  MX_IPCC_Init();
+
+  /* IPCC EXTI (AIEC) line for CPU1  */
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
+  LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
+
+  /* Initialize IPCC callback of all channels*/
+  for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
+  {
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
+    HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
+  }
+
+  /* Registers upper level (application) callback */
+  IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
+  IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
+  return;
+  /* USER CODE BEGIN IPCC_IF_Init_2 */
+
+  /* USER CODE END IPCC_IF_Init_2 */
+}
+
+uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_1 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX);
+  /* USER CODE BEGIN IPCC_IF_CmdRespStatus_2 */
+
+  /* USER CODE END IPCC_IF_CmdRespStatus_2 */
+}
+
+uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_1 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_1 */
+  return HAL_IPCC_GetChannelStatus(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX);
+  /* USER CODE BEGIN IPCC_IF_NotifAckStatus_2 */
+
+  /* USER CODE END IPCC_IF_NotifAckStatus_2 */
+}
+
+int32_t IPCC_IF_CommandSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_CommandSnd_1 */
+
+  /* USER CODE END IPCC_IF_CommandSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_TX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_CommandSnd_2 */
+
+  /* USER CODE END IPCC_IF_CommandSnd_2 */
+}
+
+int32_t IPCC_IF_AcknowledgeSnd(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN IPCC_IF_AcknowledgeSnd_1 */
+
+  /* USER CODE END IPCC_IF_AcknowledgeSnd_1 */
+  if (HAL_OK != HAL_IPCC_NotifyCPU(&hipcc, channelIdx, IPCC_CHANNEL_DIR_RX))
+  {
+    return -1;
+  }
+  else
+  {
+    return 0;
+  }
+  /* USER CODE BEGIN IPCC_IF_AcknowledgeSnd_2 */
+
+  /* USER CODE END IPCC_IF_AcknowledgeSnd_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+static void IpccIfIsrTxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrTxCb_1 */
+
+  /* USER CODE END IpccIfIsrTxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccResponseRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrTxCb_2 */
+
+  /* USER CODE END IpccIfIsrTxCb_2 */
+}
+
+static void IpccIfIsrRxCb(IPCC_HandleTypeDef *hIpcc, uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
+{
+  /* USER CODE BEGIN IpccIfIsrRxCb_1 */
+
+  /* USER CODE END IpccIfIsrRxCb_1 */
+  UNUSED(hIpcc);
+  UNUSED(ChannelDir);
+
+  IpccNotificationRcv(ChannelIndex);
+  return;
+  /* USER CODE BEGIN IpccIfIsrRxCb_2 */
+
+  /* USER CODE END IpccIfIsrRxCb_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/main.c
new file mode 100644
index 00000000..d147df2a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/main.c
@@ -0,0 +1,189 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "app_sigfox.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_Sigfox_Init();
+  /* USER CODE BEGIN 2 */
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE END WHILE */
+    MX_Sigfox_Process();
+
+    /* USER CODE BEGIN 3 */
+  }
+  /* USER CODE END 3 */
+}
+
+/**
+  * @brief System Clock Configuration
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+
+  /** Configure LSE Drive Capability
+  */
+  HAL_PWR_EnableBkUpAccess();
+  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+  /** Configure the main internal regulator output voltage
+  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+  /** Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.MSIState = RCC_MSI_ON;
+  RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_10;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK3|RCC_CLOCKTYPE_HCLK2
+                              |RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
+                              |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK2Divider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  while (1)
+  {
+  }
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32_lpm_if.c
new file mode 100644
index 00000000..99f840e9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32_lpm_if.c
@@ -0,0 +1,168 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.c
+  * @author  MCD Application Team
+  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "stm32_lpm.h"
+#include "stm32_lpm_if.h"
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Power driver callbacks handler
+  */
+const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
+{
+  PWR_EnterSleepMode,
+  PWR_ExitSleepMode,
+
+  PWR_EnterStopMode,
+  PWR_ExitStopMode,
+
+  PWR_EnterOffMode,
+  PWR_ExitOffMode,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void PWR_EnterOffMode(void)
+{
+  /* USER CODE BEGIN EnterOffMode_1 */
+
+  /* USER CODE END EnterOffMode_1 */
+}
+
+void PWR_ExitOffMode(void)
+{
+  /* USER CODE BEGIN ExitOffMode_1 */
+
+  /* USER CODE END ExitOffMode_1 */
+}
+
+void PWR_EnterStopMode(void)
+{
+  /* USER CODE BEGIN EnterStopMode_1 */
+
+  /* USER CODE END EnterStopMode_1 */
+  HAL_SuspendTick();
+  /* Clear Status Flag before entering STOP/STANDBY Mode */
+  LL_PWR_ClearFlag_C1STOP_C1STB();
+
+  /* USER CODE BEGIN EnterStopMode_2 */
+
+  /* USER CODE END EnterStopMode_2 */
+  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
+  /* USER CODE BEGIN EnterStopMode_3 */
+
+  /* USER CODE END EnterStopMode_3 */
+}
+
+void PWR_ExitStopMode(void)
+{
+  /* USER CODE BEGIN ExitStopMode_1 */
+
+  /* USER CODE END ExitStopMode_1 */
+  /* Resume sysTick : work around for debugger problem in dual core */
+  HAL_ResumeTick();
+  /*Not retained periph:
+    ADC interface
+    DAC interface USARTx, TIMx, i2Cx, SPIx
+    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
+
+  /* Resume not retained USARTx and DMA */
+  vcom_Resume();
+  /* USER CODE BEGIN ExitStopMode_2 */
+
+  /* USER CODE END ExitStopMode_2 */
+}
+
+void PWR_EnterSleepMode(void)
+{
+  /* USER CODE BEGIN EnterSleepMode_1 */
+
+  /* USER CODE END EnterSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_SuspendTick();
+  /* USER CODE BEGIN EnterSleepMode_2 */
+
+  /* USER CODE END EnterSleepMode_2 */
+  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+  /* USER CODE BEGIN EnterSleepMode_3 */
+
+  /* USER CODE END EnterSleepMode_3 */
+}
+
+void PWR_ExitSleepMode(void)
+{
+  /* USER CODE BEGIN ExitSleepMode_1 */
+
+  /* USER CODE END ExitSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_ResumeTick();
+
+  /* USER CODE BEGIN ExitSleepMode_2 */
+
+  /* USER CODE END ExitSleepMode_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..ea7dc033
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file         stm32wlxx_hal_msp.c
+  * @brief        This file provides code for the MSP Initialization
+  *               and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..3f8494d3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,290 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+extern IPCC_HandleTypeDef hipcc;
+extern DMA_HandleTypeDef hdma_lpuart1_tx;
+extern UART_HandleTypeDef hlpuart1;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+  while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/**
+  * @brief This function handles EXTI Line 0 Interrupt.
+  */
+void EXTI0_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI0_IRQn 0 */
+
+  /* USER CODE END EXTI0_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
+  /* USER CODE BEGIN EXTI0_IRQn 1 */
+
+  /* USER CODE END EXTI0_IRQn 1 */
+}
+
+/**
+  * @brief This function handles EXTI Line 1 Interrupt.
+  */
+void EXTI1_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI1_IRQn 0 */
+
+  /* USER CODE END EXTI1_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1);
+  /* USER CODE BEGIN EXTI1_IRQn 1 */
+
+  /* USER CODE END EXTI1_IRQn 1 */
+}
+
+/**
+  * @brief This function handles DMA1 Channel 5 Interrupt.
+  */
+void DMA1_Channel5_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_lpuart1_tx);
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 1 */
+}
+
+/**
+  * @brief This function handles LPUART1 Interrupt.
+  */
+void LPUART1_IRQHandler(void)
+{
+  /* USER CODE BEGIN LPUART1_IRQn 0 */
+
+  /* USER CODE END LPUART1_IRQn 0 */
+  HAL_UART_IRQHandler(&hlpuart1);
+  /* USER CODE BEGIN LPUART1_IRQn 1 */
+
+  /* USER CODE END LPUART1_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC RX Occupied Interrupt.
+  */
+void IPCC_C1_RX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C1_RX_IRQn 0 */
+
+  /* USER CODE END IPCC_C1_RX_IRQn 0 */
+  HAL_IPCC_RX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C1_RX_IRQn 1 */
+
+  /* USER CODE END IPCC_C1_RX_IRQn 1 */
+}
+
+/**
+  * @brief This function handles IPCC TX Free Interrupt.
+  */
+void IPCC_C1_TX_IRQHandler(void)
+{
+  /* USER CODE BEGIN IPCC_C1_TX_IRQn 0 */
+
+  /* USER CODE END IPCC_C1_TX_IRQn 0 */
+  HAL_IPCC_TX_IRQHandler(&hipcc);
+  /* USER CODE BEGIN IPCC_C1_TX_IRQn 1 */
+
+  /* USER CODE END IPCC_C1_TX_IRQn 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_app.c
new file mode 100644
index 00000000..3722a4c5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_app.c
@@ -0,0 +1,424 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.c
+  * @author  MCD Application Team
+  * @brief   Initializes HW and SW system entities (not related to the radio)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdio.h>
+#include "platform.h"
+#include "sys_app.h"
+#include "adc_if.h"
+#include "stm32_seq.h"
+#include "stm32_systime.h"
+#include "stm32_lpm.h"
+#include "timer_if.h"
+#include "utilities_def.h"
+#include "sys_debug.h"
+#include "sys_sensors.h"
+#include "sgfx_eeprom_if.h"
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_radio.h"
+#include "mbmuxif_sigfox.h"
+#include "sgfx_app.h"
+#ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/* #include "mbmuxif_kms.h" */
+#endif /* ALLOW_KMS_VIA_MBMUX */
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+#if ( DEBUGGER_ENABLED == 1 )
+__IO uint32_t lets_go_on = 0;
+#endif /* DEBUGGER_ENABLED */
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MAX_TS_SIZE (int) 16
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+uint32_t InstanceIndex;
+uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
+  */
+static void MBMUXIF_Init(void);
+
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
+static void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
+  */
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SystemApp_Init(void)
+{
+  /* USER CODE BEGIN SystemApp_Init_1 */
+
+  /* USER CODE END SystemApp_Init_1 */
+
+  /* Ensure that MSI is wake-up system clock */
+  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
+
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
+
+#if ( DEBUGGER_ENABLED == 1 )
+  BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
+#endif /* DEBUGGER_ENABLED */
+
+  /*Initialize the terminal */
+  UTIL_ADV_TRACE_Init();
+  UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
+
+  /*Set verbose LEVEL*/
+  UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
+  /*Initialize the temperature and Battery measurement services */
+  SYS_InitMeasurement();
+
+  /*Initialize the Sensors */
+  EnvSensors_Init();
+
+  /*Init low power manager*/
+  UTIL_LPM_Init();
+  /* Disable Stand-by mode */
+  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+
+#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
+  /* Disable Stop Mode */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+#elif !defined (LOW_POWER_DISABLE)
+#error LOW_POWER_DISABLE not defined
+#endif /* LOW_POWER_DISABLE */
+
+  /*Initialize MBMux (to be done after LPM because MBMux uses the sequencer) */
+  MBMUXIF_Init();
+
+  /*Update verbose LEVEL with EEPROM content*/
+  UTIL_ADV_TRACE_SetVerboseLevel(E2P_Read_VerboseLevel());
+
+  UTIL_TIMER_Init();
+
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
+  /* USER CODE BEGIN SystemApp_Init_2 */
+
+  /* USER CODE END SystemApp_Init_2 */
+}
+
+void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Sys_Notif_1 */
+
+  /* USER CODE END Process_Sys_Notif_1 */
+  uint32_t  notif_ack_id;
+
+  notif_ack_id = ComObj->MsgId;
+
+  switch (notif_ack_id)
+  {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
+    case SYS_OTHER_MSG_ID:
+      APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
+      /* prepare ack buffer*/
+      ComObj->ParamCnt = 0;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
+
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
+    default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
+      break;
+  }
+
+  /* Send ack*/
+  APP_LOG(TS_ON, VLEVEL_H, "CM4>(System)\r\n");
+  MBMUXIF_SystemSendAck(FEAT_INFO_SYSTEM_ID);
+  /* USER CODE BEGIN Process_Sys_Notif_2 */
+
+  /* USER CODE END Process_Sys_Notif_2 */
+}
+
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
+{
+  /**
+    * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
+    * all to process all tack except TaskId_bm
+    */
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_1 */
+  UTIL_SEQ_Run(~TaskId_bm);
+  /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
+
+  /* USER CODE END UTIL_SEQ_EvtIdle_2 */
+  return;
+}
+
+/**
+  * @brief redefines __weak function in stm32_seq.c such to enter low power
+  */
+void UTIL_SEQ_Idle(void)
+{
+  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
+
+  /* USER CODE END UTIL_SEQ_Idle_1 */
+  UTIL_LPM_EnterLowPower();
+  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
+
+  /* USER CODE END UTIL_SEQ_Idle_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_Init(void)
+{
+  /* USER CODE BEGIN MBMUXIF_Init_1 */
+
+  /* USER CODE END MBMUXIF_Init_1 */
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
+  int8_t init_status;
+
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
+
+  init_status = MBMUXIF_SystemInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+
+  /* start CM0PLUS */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
+  HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
+
+  /* Warn CPU2 that CPU1 is ready */
+  /* Set Cpu Event then consume it to allow next low power entry */
+  __SEV();
+  __WFE();
+
+  /* Push Button for stop the core in other to attach debugger */
+#if ( DEBUGGER_ENABLED == 1 )
+  APP_LOG(TS_ON, VLEVEL_L, "\r\nPress PushButton2 to continue \r\n");
+  while (lets_go_on == 0);
+  lets_go_on = 0;
+#endif /* DEBUGGER_ENABLED */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
+
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
+
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
+
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
+
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
+
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
+
+  init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_RTC_REGISTERED);
+  APP_LOG(TS_ON, VLEVEL_H, "System_Priority_A Registration for RTC Alarm handling completed \r\n");
+
+  init_status = MBMUXIF_TraceInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  APP_LOG(TS_ON, VLEVEL_H, "Trace registration CM4-CM0PLUS completed \r\n");
+
+  init_status = MBMUXIF_RadioInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  APP_LOG(TS_ON, VLEVEL_H, "Radio registration CM4-CM0PLUS completed \r\n");
+
+  init_status = MBMUXIF_SigfoxInit();
+  if (init_status < 0)
+  {
+    Error_Handler();
+  }
+  APP_LOG(TS_ON, VLEVEL_H, "Sigfox registration CM4-CM0PLUS completed \n\r");
+
+  /* USER CODE BEGIN MBMUXIF_Init_Last */
+
+  /* USER CODE END MBMUXIF_Init_Last */
+}
+
+static void TimestampNow(uint8_t *buff, uint16_t *size)
+{
+  /* USER CODE BEGIN TimestampNow_1 */
+
+  /* USER CODE END TimestampNow_1 */
+  SysTime_t curtime = SysTimeGet();
+  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
+  *size = strlen((char *)buff);
+  /* USER CODE BEGIN TimestampNow_2 */
+
+  /* USER CODE END TimestampNow_2 */
+}
+
+/* Disable StopMode when traces need to be printed */
+void UTIL_ADV_TRACE_PreSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
+}
+/* Re-enable StopMode when traces have been printed */
+void UTIL_ADV_TRACE_PostSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_2 */
+}
+
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
+{
+  /* USER CODE BEGIN tiny_snprintf_like_1 */
+
+  /* USER CODE END tiny_snprintf_like_1 */
+  va_list vaArgs;
+  va_start(vaArgs, strFormat);
+  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
+  va_end(vaArgs);
+  /* USER CODE BEGIN tiny_snprintf_like_2 */
+
+  /* USER CODE END tiny_snprintf_like_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/* HAL overload functions ---------------------------------------------------------*/
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
+{
+  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
+  /* USER CODE BEGIN HAL_InitTick_1 */
+
+  /* USER CODE END HAL_InitTick_1 */
+  return HAL_OK;
+  /* USER CODE BEGIN HAL_InitTick_2 */
+
+  /* USER CODE END HAL_InitTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+uint32_t HAL_GetTick(void)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_GetTick_1 */
+
+  /* USER CODE END HAL_GetTick_1 */
+  return TIMER_IF_GetTimerValue();
+  /* USER CODE BEGIN HAL_GetTick_2 */
+
+  /* USER CODE END HAL_GetTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+void HAL_Delay(__IO uint32_t Delay)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_Delay_1 */
+
+  /* USER CODE END HAL_Delay_1 */
+  TIMER_IF_DelayMs(Delay);
+  /* USER CODE BEGIN HAL_Delay_2 */
+
+  /* USER CODE END HAL_Delay_2 */
+}
+
+/* USER CODE BEGIN Overload_HAL_weaks */
+
+/* USER CODE END Overload_HAL_weaks */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_sensors.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_sensors.c
new file mode 100644
index 00000000..3afffff8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/sys_sensors.c
@@ -0,0 +1,268 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_sensors.c
+  * @author  MCD Application Team
+  * @brief   Manages the sensors on the application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "sys_conf.h"
+#include "sys_sensors.h"
+
+/* USER CODE BEGIN Includes */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if defined (X_NUCLEO_IKS01A2)
+#warning "IKS drivers are today available for several families but not stm32WL"
+#warning "up to the user adapt IKS low layer to map it on WL board driver"
+#warning "this code would work only if user provide necessary IKS and BSP layers"
+#include "iks01a2_env_sensors.h"
+#elif defined (X_NUCLEO_IKS01A3)
+/*
+## How to add IKS01A3 to CubeWL
+
+ 1. Download STM32CubeExpansion_MEMS1_V8.0.0
+ 2. Copy Drivers From `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3` to CubeWL `Drivers\BSP\IKS01A3` and add to the IDE Project
+ 3. Copy `STM32CubeExpansion_MEMS1_V8.0.0\Drivers\BSP\IKS01A3\iks01a3_conf_template.h` into `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target\iks01a3_conf.h`.
+ 4. Copy files nucleo_l476rg_bus.c/nucleo_l476rg_bus.h  from `STM32L476RG-Nucleo\Applications\IKS01A3\ActiveTime\Inc and \Src` to `Projects\NUCLEO-WL55JC\Applications\LoRaWAN\End_Node\LoRaWAN\Target` and rename to `nucleo_wl55jc_bus.c` and `nucleo_wl55jc_bus.h` respectively
+ 5. Update `nucleo_wl55jc_bus.c`  include files  to
+ ```bash
+#include "nucleo_wl55jc_bus.h"
+#include "stm32wlxx_nucleo_errno.h"
+#include "stm32wlxx_hal.h"
+```
+
+6. Update definitions in `nucleo_wl55jc_bus.h`(to be commented since already defined elsewhere)
+
+ ```bash
+//#define USE_HAL_SPI_REGISTER_CALLBACKS 0
+//#define USE_HAL_I2C_REGISTER_CALLBACKS 0
+```
+
+7. copy following components and add them (.c and .h) into IDE Project
+
+../../../../../../Drivers/BSP/Components/lsm6dso
+../../../../../../Drivers/BSP/Components/lis2dw12
+../../../../../../Drivers/BSP/Components/lis2mdl
+../../../../../../Drivers/BSP/Components/hts221
+../../../../../../Drivers/BSP/Components/lps22hh
+../../../../../../Drivers/BSP/Components/stts751
+../../../../../../Drivers/BSP/Components/Common
+
+8. Enable #define HAL_I2C_MODULE_ENABLED in stm32_hal_conf.h
+9. Add stm32wlxx_hal_i2c.c and stm32wlxx_hal_i2c_ex.c in the IDE Project
+10. Update hi2c->Instance in `nucleo_wl55jc_bus.c` to
+
+```bash
+  hi2c->Instance = I2C2;
+```
+
+11. Update msp function in `nucleo_wl55jc_bus.c`
+
+```bash
+static void I2C2_MspInit(I2C_HandleTypeDef *i2cHandle)
+{
+  GPIO_InitTypeDef GPIO_InitStruct;
+
+  GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12;
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+  GPIO_InitStruct.Alternate = GPIO_AF4_I2C2;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  __HAL_RCC_I2C2_CLK_ENABLE();
+}
+
+static void I2C2_MspDeInit(I2C_HandleTypeDef *i2cHandle)
+{
+  __HAL_RCC_I2C2_CLK_DISABLE();
+
+  HAL_GPIO_DeInit(GPIOA, GPIO_PIN_11 | GPIO_PIN_12);
+
+}
+```
+12. Replace I2C1xx by MX_I2C2xx and i2c1 by i2c2 in `nucleo_wl55jc_bus.c`
+13. Replace I2C1xx by MX_I2C2xx in `nucleo_wl55jc_bus.h`
+*/
+#warning "IKS drivers are today available for several families but not stm32WL, follow steps defined in sys_sensors.c"
+#include "iks01a3_env_sensors.h"
+#else  /* not X_IKS01xx */
+#error "user to include its sensor drivers"
+#endif  /* X_NUCLEO_IKS01xx */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+
+/* USER CODE BEGIN PD */
+#define STSOP_LATTITUDE           ((float) 43.618622 )  /*!< default latitude position */
+#define STSOP_LONGITUDE           ((float) 7.051415  )  /*!< default longitude position */
+#define MAX_GPS_POS               ((int32_t) 8388607 )  /*!< 2^23 - 1 */
+#define HUMIDITY_DEFAULT_VAL      50.0f                 /*!< default humidity */
+#define TEMPERATURE_DEFAULT_VAL   18.0f                 /*!< default temperature */
+#define PRESSURE_DEFAULT_VAL      1000.0f               /*!< default pressure */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if defined (X_NUCLEO_IKS01A2)
+#warning "IKS drivers are today available for several families but not stm32WL"
+#warning "up to the user adapt IKS low layer to map it on WL board driver"
+#warning "this code would work only if user provide necessary IKS and BSP layers"
+IKS01A2_ENV_SENSOR_Capabilities_t EnvCapabilities;
+#elif defined (X_NUCLEO_IKS01A3)
+IKS01A3_ENV_SENSOR_Capabilities_t EnvCapabilities;
+#else  /* not X_IKS01Ax */
+#error "user to include its sensor drivers"
+#endif  /* X_NUCLEO_IKS01 */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t  EnvSensors_Read(sensor_t *sensor_data)
+{
+  /* USER CODE BEGIN EnvSensors_Read */
+  float HUMIDITY_Value = HUMIDITY_DEFAULT_VAL;
+  float TEMPERATURE_Value = TEMPERATURE_DEFAULT_VAL;
+  float PRESSURE_Value = PRESSURE_DEFAULT_VAL;
+
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
+  IKS01A2_ENV_SENSOR_GetValue(HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_PRESSURE, &PRESSURE_Value);
+  IKS01A2_ENV_SENSOR_GetValue(LPS22HB_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_HUMIDITY, &HUMIDITY_Value);
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_HTS221_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_PRESSURE, &PRESSURE_Value);
+  IKS01A3_ENV_SENSOR_GetValue(IKS01A3_LPS22HH_0, ENV_TEMPERATURE, &TEMPERATURE_Value);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif  /* SENSOR_ENABLED */
+
+  sensor_data->humidity    = HUMIDITY_Value;
+  sensor_data->temperature = TEMPERATURE_Value;
+  sensor_data->pressure    = PRESSURE_Value;
+
+  sensor_data->latitude  = (int32_t)((STSOP_LATTITUDE  * MAX_GPS_POS) / 90);
+  sensor_data->longitude = (int32_t)((STSOP_LONGITUDE  * MAX_GPS_POS) / 180);
+
+  return 0;
+  /* USER CODE END EnvSensors_Read */
+}
+
+int32_t  EnvSensors_Init(void)
+{
+  /* USER CODE BEGIN EnvSensors_Init */
+#if defined (SENSOR_ENABLED) && (SENSOR_ENABLED == 1)
+  /* Init */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_Init(HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_Init(LPS22HB_0, ENV_TEMPERATURE | ENV_PRESSURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_Init(IKS01A3_HTS221_0, ENV_TEMPERATURE | ENV_HUMIDITY);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_Init(IKS01A3_LPS22HH_0, ENV_TEMPERATURE | ENV_PRESSURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+  /* Enable */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_HUMIDITY);
+  IKS01A2_ENV_SENSOR_Enable(HTS221_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_PRESSURE);
+  IKS01A2_ENV_SENSOR_Enable(LPS22HB_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_HUMIDITY);
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_HTS221_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_PRESSURE);
+  IKS01A3_ENV_SENSOR_Enable(IKS01A3_LPS22HH_0, ENV_TEMPERATURE);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+  /* Get capabilities */
+#if (USE_IKS01A2_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A2_ENV_SENSOR_GetCapabilities(HTS221_0, &EnvCapabilities);
+#endif /* USE_IKS01A2_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A2_ENV_SENSOR_LPS22HB_0 == 1)
+  IKS01A2_ENV_SENSOR_GetCapabilities(LPS22HB_0, &EnvCapabilities);
+#endif /* USE_IKS01A2_ENV_SENSOR_LPS22HB_0 */
+#if (USE_IKS01A3_ENV_SENSOR_HTS221_0 == 1)
+  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_HTS221_0, &EnvCapabilities);
+#endif /* USE_IKS01A3_ENV_SENSOR_HTS221_0 */
+#if (USE_IKS01A3_ENV_SENSOR_LPS22HH_0 == 1)
+  IKS01A3_ENV_SENSOR_GetCapabilities(IKS01A3_LPS22HH_0, &EnvCapabilities);
+#endif /* USE_IKS01A3_ENV_SENSOR_LPS22HH_0 */
+
+#elif !defined (SENSOR_ENABLED)
+#error SENSOR_ENABLED not defined
+#endif /* SENSOR_ENABLED  */
+  return 0;
+  /* USER CODE END EnvSensors_Init */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c
new file mode 100644
index 00000000..f02a544d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c
@@ -0,0 +1,437 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.c
+  * @author  MCD Application Team
+  * @brief   Configure RTC Alarm, Tick and Calendar manager
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "stm32_lpm.h"
+#include "utilities_def.h"
+#include "stm32wlxx_ll_rtc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief RTC handle
+  */
+RTC_HandleTypeDef hrtc;
+
+/**
+  * @brief Timer driver callbacks handler
+  */
+const UTIL_TIMER_Driver_s UTIL_TimerDriver =
+{
+  TIMER_IF_Init,
+  NULL,
+
+  TIMER_IF_StartTimer,
+  TIMER_IF_StopTimer,
+
+  TIMER_IF_SetTimerContext,
+  TIMER_IF_GetTimerContext,
+
+  TIMER_IF_GetTimerElapsedTime,
+  TIMER_IF_GetTimerValue,
+  TIMER_IF_GetMinimumTimeout,
+
+  TIMER_IF_Convert_ms2Tick,
+  TIMER_IF_Convert_Tick2ms,
+};
+
+/**
+  * @brief SysTime driver callbacks handler
+  */
+const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
+{
+  TIMER_IF_BkUp_Write_Seconds,
+  TIMER_IF_BkUp_Read_Seconds,
+  TIMER_IF_BkUp_Write_SubSeconds,
+  TIMER_IF_BkUp_Read_SubSeconds,
+  TIMER_IF_GetTime,
+};
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Minimum timeout delay of Alarm in ticks
+  */
+#define MIN_ALARM_DELAY    3
+
+/**
+  * @brief Backup seconds register
+  */
+#define RTC_BKP_SECONDS    RTC_BKP_DR0
+
+/**
+  * @brief Backup subseconds register
+  */
+#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
+
+/**
+  * @brief Backup msbticks register
+  */
+#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
+
+/* #define RTIF_DEBUG */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifdef RTIF_DEBUG
+#include "sys_app.h" /*for app_log*/
+/**
+  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
+  */
+#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+#else
+/**
+  * @brief not used
+  */
+#define TIMER_IF_DBG_PRINTF(...)
+#endif /* RTIF_DEBUG */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Indicates if the RTC is already Initialized or not
+  */
+static bool RTC_Initialized = false;
+
+/**
+  * @brief RtcTimerContext
+  */
+static uint32_t RtcTimerContext = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Get rtc timer Value in rtc tick
+  * @return val the rtc timer value (upcounting)
+  */
+static inline uint32_t GetTimerTicks(void);
+
+/**
+  * @brief Reads MSBticks from backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @retval MSBticks
+  */
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+UTIL_TIMER_Status_t TIMER_IF_Init(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_Init */
+
+  /* USER CODE END TIMER_IF_Init */
+  /** Configure the Instance */
+  hrtc.Instance = RTC;
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+  TIMER_IF_SetTimerContext();
+  RTC_Initialized = true;
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StartTimer */
+
+  /* USER CODE END TIMER_IF_StartTimer */
+  RTC_AlarmTypeDef sAlarm = {0};
+  /*Stop timer if one is already started*/
+  TIMER_IF_StopTimer();
+  timeout += RtcTimerContext;
+
+  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
+  /* starts timer*/
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
+
+  /* USER CODE END TIMER_IF_StartTimer_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StopTimer */
+
+  /* USER CODE END TIMER_IF_StopTimer */
+  /* Clear RTC Alarm Flag */
+  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRAF);
+  /* Disable the Alarm A interrupt */
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
+
+  /* USER CODE END TIMER_IF_StopTimer_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_SetTimerContext(void)
+{
+  /*store time context*/
+  RtcTimerContext = GetTimerTicks();
+
+  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
+
+  /* USER CODE END TIMER_IF_SetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerContext(void)
+{
+  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
+
+  /* USER CODE END TIMER_IF_GetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerElapsedTime(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetTimerValue(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
+
+  /* USER CODE END TIMER_IF_GetTimerValue */
+  if (RTC_Initialized == true)
+  {
+    ret = GetTimerTicks();
+  }
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetMinimumTimeout(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick */
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
+}
+
+void TIMER_IF_DelayMs(uint32_t delay)
+{
+  /* USER CODE BEGIN TIMER_IF_DelayMs */
+
+  /* USER CODE END TIMER_IF_DelayMs */
+  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
+  uint32_t timeout = GetTimerTicks();
+
+  /* Wait delay ms */
+  while (((GetTimerTicks() - timeout)) < delayTicks)
+  {
+    __NOP();
+  }
+  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
+
+  /* USER CODE END TIMER_IF_DelayMs_Last */
+}
+
+uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
+{
+  uint32_t seconds = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTime */
+
+  /* USER CODE END TIMER_IF_GetTime */
+  uint64_t ticks;
+  uint32_t timerValueLsb = GetTimerTicks();
+  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
+
+  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
+
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+
+  ticks = (uint32_t) ticks & RTC_PREDIV_S;
+
+  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
+
+  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
+}
+
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
+}
+
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
+}
+
+uint32_t TIMER_IF_BkUp_Read_Seconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
+  uint32_t MSBticks;
+  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
+  return MSBticks;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
+}
+
+static inline uint32_t GetTimerTicks(void)
+{
+  /* USER CODE BEGIN GetTimerTicks */
+
+  /* USER CODE END GetTimerTicks */
+  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
+  /* USER CODE BEGIN GetTimerTicks_Last */
+
+  /* USER CODE END GetTimerTicks_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c
new file mode 100644
index 00000000..476eb1f2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c
@@ -0,0 +1,173 @@
+/**
+  ******************************************************************************
+  * @file    usart.c
+  * @brief   This file provides code for the configuration
+  *          of the USART instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+UART_HandleTypeDef hlpuart1;
+DMA_HandleTypeDef hdma_lpuart1_tx;
+
+/* LPUART1 init function */
+
+void MX_LPUART1_UART_Init(void)
+{
+
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
+  hlpuart1.Instance = LPUART1;
+  hlpuart1.Init.BaudRate = 9600;
+  hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
+  hlpuart1.Init.StopBits = UART_STOPBITS_1;
+  hlpuart1.Init.Parity = UART_PARITY_NONE;
+  hlpuart1.Init.Mode = UART_MODE_TX_RX;
+  hlpuart1.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  hlpuart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
+  hlpuart1.Init.ClockPrescaler = UART_PRESCALER_DIV1;
+  hlpuart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
+  hlpuart1.FifoMode = UART_FIFOMODE_ENABLE;
+  if (HAL_UART_Init(&hlpuart1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetTxFifoThreshold(&hlpuart1, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetRxFifoThreshold(&hlpuart1, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_EnableFifoMode(&hlpuart1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
+
+}
+
+void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(uartHandle->Instance==LPUART1)
+  {
+  /* USER CODE BEGIN LPUART1_MspInit 0 */
+
+  /* USER CODE END LPUART1_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_LPUART1;
+    PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_LSE;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* LPUART1 clock enable */
+    __HAL_RCC_LPUART1_CLK_ENABLE();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**LPUART1 GPIO Configuration
+    PA3     ------> LPUART1_RX
+    PA2     ------> LPUART1_TX
+    */
+    GPIO_InitStruct.Pin = USARTx_RX_Pin|USARTx_TX_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF8_LPUART1;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    /* LPUART1 DMA Init */
+    /* LPUART1_TX Init */
+    hdma_lpuart1_tx.Instance = DMA1_Channel5;
+    hdma_lpuart1_tx.Init.Request = DMA_REQUEST_LPUART1_TX;
+    hdma_lpuart1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_lpuart1_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_lpuart1_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_lpuart1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_lpuart1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_lpuart1_tx.Init.Mode = DMA_NORMAL;
+    hdma_lpuart1_tx.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_lpuart1_tx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    if (HAL_DMA_ConfigChannelAttributes(&hdma_lpuart1_tx, DMA_CHANNEL_NPRIV) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmatx,hdma_lpuart1_tx);
+
+    /* LPUART1 interrupt Init */
+    HAL_NVIC_SetPriority(LPUART1_IRQn, 2, 0);
+    HAL_NVIC_EnableIRQ(LPUART1_IRQn);
+  /* USER CODE BEGIN LPUART1_MspInit 1 */
+
+  /* USER CODE END LPUART1_MspInit 1 */
+  }
+}
+
+void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
+{
+
+  if(uartHandle->Instance==LPUART1)
+  {
+  /* USER CODE BEGIN LPUART1_MspDeInit 0 */
+
+  /* USER CODE END LPUART1_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_LPUART1_CLK_DISABLE();
+
+    /**LPUART1 GPIO Configuration
+    PA3     ------> LPUART1_RX
+    PA2     ------> LPUART1_TX
+    */
+    HAL_GPIO_DeInit(GPIOA, USARTx_RX_Pin|USARTx_TX_Pin);
+
+    /* LPUART1 DMA DeInit */
+    HAL_DMA_DeInit(uartHandle->hdmatx);
+
+    /* LPUART1 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(LPUART1_IRQn);
+  /* USER CODE BEGIN LPUART1_MspDeInit 1 */
+
+  /* USER CODE END LPUART1_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c
new file mode 100644
index 00000000..36217a2f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c
@@ -0,0 +1,251 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.c
+  * @author  MCD Application Team
+  * @brief   Configuration of UART driver interface for hyperterminal communication
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief DMA handle
+  */
+extern DMA_HandleTypeDef hdma_lpuart1_tx;
+
+/**
+  * @brief UART handle
+  */
+extern UART_HandleTypeDef hlpuart1;
+
+/**
+  * @brief buffer to receive 1 character
+  */
+uint8_t charRx;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Trace driver callbacks handler
+  */
+const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
+{
+  vcom_Init,
+  vcom_DeInit,
+  vcom_ReceiveInit,
+  vcom_Trace_DMA,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief  TX complete callback
+  * @return none
+  */
+static void (*TxCpltCallback)(void *);
+/**
+  * @brief  RX complete callback
+  * @param  rxChar ptr of chars buffer sent by user
+  * @param  size buffer size
+  * @param  error errorcode
+  * @return none
+  */
+static void (*RxCpltCallback)(uint8_t *rxChar, uint16_t size, uint8_t error);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *))
+{
+  /* USER CODE BEGIN vcom_Init_1 */
+
+  /* USER CODE END vcom_Init_1 */
+  TxCpltCallback = cb;
+  MX_DMA_Init();
+  MX_LPUART1_UART_Init();
+  LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_28);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Init_2 */
+
+  /* USER CODE END vcom_Init_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
+{
+  /* USER CODE BEGIN vcom_DeInit_1 */
+
+  /* USER CODE END vcom_DeInit_1 */
+  /* ##-1- Reset peripherals ################################################## */
+  __HAL_RCC_LPUART1_FORCE_RESET();
+  __HAL_RCC_LPUART1_RELEASE_RESET();
+
+  /* ##-2- MspDeInit ################################################## */
+  HAL_UART_MspDeInit(&hlpuart1);
+
+  /* ##-3- Disable the NVIC for DMA ########################################### */
+  /* USER CODE BEGIN 1 */
+  HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE END 1 */
+  /* USER CODE BEGIN vcom_DeInit_2 */
+
+  /* USER CODE END vcom_DeInit_2 */
+}
+
+void vcom_Trace(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_1 */
+
+  /* USER CODE END vcom_Trace_1 */
+  HAL_UART_Transmit(&hlpuart1, p_data, size, 1000);
+  /* USER CODE BEGIN vcom_Trace_2 */
+
+  /* USER CODE END vcom_Trace_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_DMA_1 */
+
+  /* USER CODE END vcom_Trace_DMA_1 */
+  HAL_UART_Transmit_DMA(&hlpuart1, p_data, size);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Trace_DMA_2 */
+
+  /* USER CODE END vcom_Trace_DMA_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error))
+{
+  /* USER CODE BEGIN vcom_ReceiveInit_1 */
+
+  /* USER CODE END vcom_ReceiveInit_1 */
+  UART_WakeUpTypeDef WakeUpSelection;
+
+  /*record call back*/
+  RxCpltCallback = RxCb;
+
+  /*Set wakeUp event on start bit*/
+  WakeUpSelection.WakeUpEvent = UART_WAKEUP_ON_STARTBIT;
+
+  HAL_UARTEx_StopModeWakeUpSourceConfig(&hlpuart1, WakeUpSelection);
+
+  /* Make sure that no UART transfer is on-going */
+  while (__HAL_UART_GET_FLAG(&hlpuart1, USART_ISR_BUSY) == SET);
+
+  /* Make sure that UART is ready to receive)   */
+  while (__HAL_UART_GET_FLAG(&hlpuart1, USART_ISR_REACK) == RESET);
+
+  /* Enable USART interrupt */
+  __HAL_UART_ENABLE_IT(&hlpuart1, UART_IT_WUF);
+
+  /*Enable wakeup from stop mode*/
+  HAL_UARTEx_EnableStopMode(&hlpuart1);
+
+  /*Start LPUART receive on IT*/
+  HAL_UART_Receive_IT(&hlpuart1, &charRx, 1);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_ReceiveInit_2 */
+
+  /* USER CODE END vcom_ReceiveInit_2 */
+}
+
+void vcom_Resume(void)
+{
+  /* USER CODE BEGIN vcom_Resume_1 */
+
+  /* USER CODE END vcom_Resume_1 */
+  /*to re-enable lost DMA settings*/
+  if (HAL_DMA_Init(&hdma_lpuart1_tx) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN vcom_Resume_2 */
+
+  /* USER CODE END vcom_Resume_2 */
+}
+
+void HAL_UART_TxCpltCallback(UART_HandleTypeDef *hlpuart1)
+{
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_1 */
+  /* buffer transmission complete*/
+  TxCpltCallback(NULL);
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_2 */
+}
+
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *hlpuart1)
+{
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_1 */
+  if ((NULL != RxCpltCallback) && (HAL_UART_ERROR_NONE == hlpuart1->ErrorCode))
+  {
+    RxCpltCallback(&charRx, 1, 0);
+  }
+  HAL_UART_Receive_IT(hlpuart1, &charRx, 1);
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c
new file mode 100644
index 00000000..8328a537
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c
@@ -0,0 +1,476 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.c
+  * @author  MCD Application Team
+  * @brief   CM4 side multiplexer to map features to IPCC channels
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "assert.h"
+#include "stddef.h"
+#include "stm32_mem.h"
+#include "ipcc_if.h"
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MB_CHANNEL_NOT_REGISTERED 0xFF
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
+static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
+static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
+static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
+static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
+static void MBMUX_IsrNotRegistered(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
+{
+  /* USER CODE BEGIN MBMUX_Init_1 */
+
+  /* USER CODE END MBMUX_Init_1 */
+  uint8_t i;
+  IPCC_IF_Init(MBMUX_IsrResponseRcvCb, MBMUX_IsrNotificationRcvCb);
+
+  p_MBMUX_ComTable = pMBMUX_ComTable;
+
+  for (i = 0; i < FEAT_INFO_CNT; i++)
+  {
+    p_MBMUX_ComTable->MBMUXMapping[i][MBMUX_CMD_RESP] = MB_CHANNEL_NOT_REGISTERED;
+    p_MBMUX_ComTable->MBMUXMapping[i][MBMUX_NOTIF_ACK] = MB_CHANNEL_NOT_REGISTERED;
+  }
+
+  for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
+  {
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgId = 0;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm4Cb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].ParamCnt = 0;
+    p_MBMUX_ComTable->MBCmdRespParam[i].ParamBuf = NULL;
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgId = 0;
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm4Cb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBNotifAckParam[i].ParamCnt = 0;
+    p_MBMUX_ComTable->MBNotifAckParam[i].ParamBuf = NULL;
+  }
+  /* USER CODE BEGIN MBMUX_Init_Last */
+
+  /* USER CODE END MBMUX_Init_Last */
+}
+
+void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
+{
+  /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
+
+  /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_1 */
+  p_MBMUX_Cm0plusFeatureList = pCM0PLUS_FeatureList;
+  /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_Last */
+
+  /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
+}
+
+int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
+{
+  int8_t check_if_feature_provided_by_cm0plus = 0;
+  uint8_t channel_idx = MB_CHANNEL_NOT_REGISTERED;
+  int8_t ret = -1; /* no more ipcc channels available */
+  uint8_t check_existing_feature_registration;
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_1 */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_1 */
+
+  if (e_featID == FEAT_INFO_SYSTEM_ID)
+  {
+    check_if_feature_provided_by_cm0plus = 1;
+  }
+  else
+  {
+    check_if_feature_provided_by_cm0plus = MBMUX_CheckIfFeatureSupportedByCm0plus(e_featID);
+  }
+
+  if (check_if_feature_provided_by_cm0plus == 1)
+  {
+    check_existing_feature_registration = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+    if (check_existing_feature_registration == MB_CHANNEL_NOT_REGISTERED)
+    {
+      if (e_featID == FEAT_INFO_SYSTEM_ID)
+      {
+        channel_idx = 0;
+      }
+      else
+      {
+        channel_idx = MBMUX_FindChStillUnregistered(ComType);
+      }
+    }
+    else
+    {
+      /* previous registration will be replaced by the given buffers */
+      channel_idx = check_existing_feature_registration;
+    }
+  }
+  else
+  {
+    ret = -2; /* feature not provided by CM0PLUS */
+  }
+
+  if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
+  {
+    if (ComType == MBMUX_CMD_RESP)
+    {
+      p_MBMUX_ComTable->MBMUXMapping[e_featID][MBMUX_CMD_RESP] = channel_idx;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm4Cb = MsgCb;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].BufSize = ComBufSize;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].ParamBuf = ComBuffer;
+      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].ReturnVal = 0;
+    }
+    else
+    {
+      p_MBMUX_ComTable->MBMUXMapping[e_featID][MBMUX_NOTIF_ACK] = channel_idx;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm4Cb = MsgCb;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].BufSize = ComBufSize;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].ParamBuf = ComBuffer;
+      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].ReturnVal = 0;
+    }
+    ret = channel_idx;
+  }
+  /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
+
+  /* USER CODE END MBMUX_RegisterFeatureC_Last */
+  return ret;
+}
+
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
+
+  /* USER CODE END MBMUX_UnregisterFeature_1 */
+  uint8_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, ComType);
+
+  /* Function not completely implemented:
+     Missing code that sends via Mbmux a SysCmd to tell CM0PLUS to unregister it's callback */
+  /* ... */
+
+  if (mb_ch < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)
+    {
+      /* Channel should have been unregistered first on CM0PLUS to avoid getting Irq with no cb */
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].BufSize = 0;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ParamBuf = NULL;
+      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ReturnVal = 0;
+    }
+    else
+    {
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
+      /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
+      IPCC_IF_AcknowledgeSnd(mb_ch);
+
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize = 0;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamBuf = NULL;
+      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ReturnVal = 0;
+    }
+  }
+
+  p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType] = MB_CHANNEL_NOT_REGISTERED;
+
+  /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
+
+  /* USER CODE END MBMUX_UnregisterFeature_Last */
+}
+
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_1 */
+  uint32_t channel_idx;
+  MBMUX_ComParam_t *com_param_ptr = NULL;
+
+  channel_idx = MBMUX_GetFeatureChIdx(e_featID, ComType);
+  if (channel_idx < MBMUX_CHANNEL_NUMBER)
+  {
+    if (ComType == MBMUX_CMD_RESP)  /* TX */
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBCmdRespParam[channel_idx];
+    }
+    else
+    {
+      com_param_ptr = (MBMUX_ComParam_t *) &p_MBMUX_ComTable->MBNotifAckParam[channel_idx];
+    }
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUX_GetFeatureComPtr_Last */
+
+  /* USER CODE END MBMUX_GetFeatureComPtr_Last */
+}
+
+int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_CommandSnd_1 */
+
+  /* USER CODE END MBMUX_CommandSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_CMD_RESP);
+  if (p_MBMUX_ComTable->MBCmdRespParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBCmdRespParam[mb_ch].BufSize)
+  {
+    Error_Handler();
+  }
+  return IPCC_IF_CommandSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_CommandSnd_Last */
+
+  /* USER CODE END MBMUX_CommandSnd_Last */
+}
+
+uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
+{
+  /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
+
+  /* USER CODE END MBMUX_AcknowledgeSnd_1 */
+  uint32_t mb_ch;
+
+  mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
+  return IPCC_IF_AcknowledgeSnd(mb_ch);
+  /* USER CODE BEGIN MBMUX_AcknowledgeSnd_Last */
+
+  /* USER CODE END MBMUX_AcknowledgeSnd_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
+{
+  int8_t ret = 0;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  FEAT_INFO_Param_t  i_feature;
+  /* USER CODE BEGIN MBMUX_CheckIfFeatureSupportedByCm0plus_1 */
+
+  /* USER CODE END MBMUX_CheckIfFeatureSupportedByCm0plus_1 */
+
+  if (p_MBMUX_Cm0plusFeatureList != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_MBMUX_Cm0plusFeatureList->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      i_feature = *(i + p_MBMUX_Cm0plusFeatureList->Feat_Info_TableAddress);
+      if (i_feature.Feat_Info_Feature_Id == e_featID)
+      {
+        ret = 1;
+        break;
+      }
+
+    }
+  }
+  /* USER CODE BEGIN MBMUX_CheckIfFeatureSupportedByCm0plus_Last */
+
+  /* USER CODE END MBMUX_CheckIfFeatureSupportedByCm0plus_Last */
+  return ret;
+}
+
+static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrResponseRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
+  /* call registered callback */
+  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm4Cb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrResponseRcvCb_Last */
+  return;
+}
+
+static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
+
+  /* USER CODE END MBMUX_IsrNotificationRcvCb_1 */
+  /* retrieve pointer to com params */
+  void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
+  /* call registered callback */
+  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm4Cb(com_obj);
+  /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_Last */
+
+  /* USER CODE END MBMUX_IsrNotificationRcvCb_Last */
+  return;
+}
+
+static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
+
+  /* USER CODE END MBMUX_FindChStillUnregistered_1 */
+  uint8_t feat_id;
+  uint8_t ch;
+  uint8_t already_used;
+
+  /* First two channels are reserved to SYSTEM, TRACE and SKS */
+  if (ComType == MBMUX_CMD_RESP)
+  {
+    for (ch = 1; ch < MBMUX_CHANNEL_NUMBER; ch++)
+    {
+      already_used = 0;
+      for (feat_id = 0; feat_id < FEAT_INFO_CNT; feat_id++)
+      {
+        if (p_MBMUX_ComTable->MBMUXMapping[feat_id][MBMUX_CMD_RESP] == ch)
+        {
+          already_used = 1;
+        }
+      }
+      if (already_used == 0)
+      {
+        break;
+      }
+    }
+  }
+  else  /* RX */
+  {
+    for (ch = 1; ch < MBMUX_CHANNEL_NUMBER; ch++)
+    {
+      already_used = 0;
+      for (feat_id = 0; feat_id < FEAT_INFO_CNT; feat_id++)
+      {
+        if (p_MBMUX_ComTable->MBMUXMapping[feat_id][MBMUX_NOTIF_ACK] == ch)
+        {
+          already_used = 1;
+        }
+      }
+      if (already_used == 0)
+      {
+        break;
+      }
+    }
+  }
+
+  if (ch == MBMUX_CHANNEL_NUMBER)
+  {
+    return MB_CHANNEL_NOT_REGISTERED;
+  }
+  else
+  {
+    return (ch);
+  }
+  /* USER CODE BEGIN MBMUX_FindChStillUnregistered_Last */
+
+  /* USER CODE END MBMUX_FindChStillUnregistered_Last */
+}
+
+static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
+{
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_1 */
+  return p_MBMUX_ComTable->MBMUXMapping[e_featID][ComType];
+  /* USER CODE BEGIN MBMUX_GetFeatureChIdx_Last */
+
+  /* USER CODE END MBMUX_GetFeatureChIdx_Last */
+}
+
+static void MBMUX_IsrNotRegistered(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_1 */
+  Error_Handler();
+  /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
+
+  /* USER CODE END MBMUX_IsrNotRegistered_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h
new file mode 100644
index 00000000..a15773f5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h
@@ -0,0 +1,121 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux.h
+  * @author  MCD Application Team
+  * @brief   API which interfaces CM4 to IPCC
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_CM4_H__
+#define __MBMUX_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
+void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
+
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
+void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
+MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
+uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUX_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c
new file mode 100644
index 00000000..81fc561a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c
@@ -0,0 +1,231 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_radio.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "radio_mbwrapper.h"
+#include "subghz_phy_version.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *RadioComObj;
+
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
+static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
+static void MBMUXIF_TaskRadioNotifRcv(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_RadioInit(void)
+{
+  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_1 */
+
+  /* USER CODE END MBMUXIF_RadioInit_1 */
+
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
+  if (p_cm0plus_specific_features_info->Feat_Info_Feature_Version != __SUBGHZ_PHY_VERSION)
+  {
+    ret = -4; /* version mismatch */
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP, MBMUXIF_IsrRadioRespRcvCb, aRadioCmdRespBuff, sizeof(aRadioCmdRespBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrRadioNotifRcvCb, aRadioNotifAckBuff, sizeof(aRadioNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbRadioNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskRadioNotifRcv);
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_RADIO_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  if (ret >= 0)
+  {
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_RadioInit_Last */
+
+  /* USER CODE END MBMUXIF_RadioInit_Last */
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
+}
+
+void MBMUXIF_RadioSendCmd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendCmd_1 */
+  if (MBMUX_CommandSnd(FEAT_INFO_RADIO_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbRadioRespRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendCmd_Last */
+}
+
+void MBMUXIF_RadioSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
+
+  /* USER CODE END MBMUXIF_RadioSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_RADIO_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_RadioSendAck_Last */
+
+  /* USER CODE END MBMUXIF_RadioSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbRadioRespRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_1 */
+  RadioComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbRadioNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskRadioNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifRcv_1 */
+  Process_Radio_Notif(RadioComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskRadioNotifRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h
new file mode 100644
index 00000000..3d565fcd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h
@@ -0,0 +1,93 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_radio.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_RADIO_CM4_H__
+#define __MBMUXIF_RADIO_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
+int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
+void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
+void MBMUXIF_RadioSendAck(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_RADIO_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c
new file mode 100644
index 00000000..c4b71d29
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c
@@ -0,0 +1,227 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sigfox.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to register and handle SigfoxWAN via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_sigfox.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "sigfox_mbwrapper.h"
+#include "sgfx_app_version.h"
+#include "utilities_def.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static MBMUX_ComParam_t *SigfoxComObj;
+
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSigfoxCmdRespBuff[MAX_PARAM_OF_SIGFOX_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSigfoxNotifAckBuff[MAX_PARAM_OF_SIGFOX_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  Sigfox response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
+static void MBMUXIF_IsrSigfoxRespRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the Sigfox com param buffer
+  */
+static void MBMUXIF_IsrSigfoxNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  Sigfox task to process the notification
+  */
+static void MBMUXIF_TaskSigfoxNotifRcv(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_SigfoxInit(void)
+{
+  FEAT_INFO_Param_t *p_cm0plus_system_info;
+  int32_t cm0_vers = 0;
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_SigfoxInit_1 */
+
+  /* USER CODE END MBMUXIF_SigfoxInit_1 */
+
+  p_cm0plus_system_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
+  /* abstract CM0 release version from RC (release candidate) and compare */
+  cm0_vers = p_cm0plus_system_info->Feat_Info_Feature_Version >> __APP_VERSION_SUB2_SHIFT;
+  if (cm0_vers < (__LAST_COMPATIBLE_CM0_RELEASE >> __APP_VERSION_SUB2_SHIFT))
+  {
+    ret = -4; /* version incompatibility */
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_SIGFOX_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSigfoxRespRcvCb, aSigfoxCmdRespBuff, sizeof(aSigfoxCmdRespBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_SIGFOX_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSigfoxNotifRcvCb, aSigfoxNotifAckBuff, sizeof(aSigfoxNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    UTIL_SEQ_RegTask(1 << CFG_SEQ_Task_MbSigfoxNotifRcv, UTIL_SEQ_RFU, MBMUXIF_TaskSigfoxNotifRcv);
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_SIGFOX_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  if (ret >= 0)
+  {
+    ret = 0;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SigfoxInit_Last */
+
+  /* USER CODE END MBMUXIF_SigfoxInit_Last */
+
+  return ret;
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void)
+{
+  /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureCmdComPtr_1 */
+
+  /* USER CODE END MBMUXIF_GetSigfoxFeatureCmdComPtr_1 */
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_SIGFOX_ID, MBMUX_CMD_RESP);
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+  /* USER CODE BEGIN MBMUXIF_GetSigfoxFeatureCmdComPtr_Last */
+
+  /* USER CODE END MBMUXIF_GetSigfoxFeatureCmdComPtr_Last */
+}
+
+void MBMUXIF_SigfoxSendCmd(void)
+{
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_SigfoxSendCmd_1 */
+  if (MBMUX_CommandSnd(FEAT_INFO_SIGFOX_ID) == 0)
+  {
+    UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSigfoxRespRcv);
+  }
+  else
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_SigfoxSendCmd_Last */
+}
+
+void MBMUXIF_SigfoxSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendAck_1 */
+
+  /* USER CODE END MBMUXIF_SigfoxSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_SIGFOX_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SigfoxSendAck_Last */
+
+  /* USER CODE END MBMUXIF_SigfoxSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrSigfoxRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSigfoxRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSigfoxRespRcvCb_1 */
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSigfoxRespRcv);
+  /* USER CODE BEGIN MBMUXIF_IsrSigfoxRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSigfoxRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSigfoxNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSigfoxNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSigfoxNotifRcvCb_1 */
+  SigfoxComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask(1 << CFG_SEQ_Task_MbSigfoxNotifRcv, CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrSigfoxNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSigfoxNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskSigfoxNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskSigfoxNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskSigfoxNotifRcv_1 */
+  Process_Sigfox_Notif(SigfoxComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskSigfoxNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskSigfoxNotifRcv_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h
new file mode 100644
index 00000000..3834fe17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h
@@ -0,0 +1,87 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sigfox.h
+  * @author  MCD Application Team
+  * @brief   API provided to CM0 application to register and handle Sigfox to MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_SIGFOX_CM4_H__
+#define __MBMUXIF_SIGFOX_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers Sigfox feature to the mailbox and to the sequencer
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS; -3: callback error on CM0PLUS
+  */
+int8_t MBMUXIF_SigfoxInit(void);
+/**
+  * @brief   gives back the pointer to the com buffer associated to Sigfox feature Cmd
+  * @return  pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetSigfoxFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Sigfox-Cmd via Ipcc and Wait for the response
+  */
+void MBMUXIF_SigfoxSendCmd(void);
+
+/**
+  * @brief   Sends a Sigfox-Ack  via Ipcc without waiting for the ack
+  */
+void MBMUXIF_SigfoxSendAck(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_SIGFOX_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c
new file mode 100644
index 00000000..1884bb44
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c
@@ -0,0 +1,566 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_sys.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "stm32_timer.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "utilities_def.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
+static __IO uint8_t MbSystemRespRcvFlag;
+
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
+
+MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
+MBMUX_ComParam_t *SystemComObj;
+
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
+static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
+static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_SystemInit(void)
+{
+  int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
+
+  /* USER CODE END MBMUXIF_SystemInit_1 */
+
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
+  {
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
+
+    /* write FLASH->IPCCBR option byte */
+    /* Unlock the Flash to enable the flash control register access *************/
+    HAL_FLASH_Unlock();
+    /* Clear OPTVERR bit set on virgin samples */
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_OPTVERR);
+
+    /* Unlock the Options Bytes *************************************************/
+    HAL_FLASH_OB_Unlock();
+
+    /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
+
+    if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
+    {
+      /*
+      Error occurred while setting option bytes configuration.
+      User can add here some code to deal with this error.
+      To know the code error, user can call function 'HAL_FLASH_GetError()'
+      */
+      Error_Handler();
+    }
+
+    /* Start the Option Bytes programming process */
+    if (HAL_FLASH_OB_Launch() != HAL_OK)
+    {
+      /*
+      Error occurred while reloading option bytes configuration.
+      User can add here some code to deal with this error.
+      To know the code error, user can call function 'HAL_FLASH_GetError()'
+      */
+      Error_Handler();
+    }
+
+    /* Notice: After HAL_FLASH_OB_Launch() the chip is reset so next code is not executed */
+    /* Implemented anyway to be aligned with other projects (SBSFU, etc) */
+    /* Lock the Options Bytes ***************************************************/
+    (void) HAL_FLASH_OB_Lock();
+    /* Lock the Flash to disable the flash control register access  *********/
+    (void) HAL_FLASH_Lock();
+  }
+  /* Init MailBoxMultiplexer */
+  MBMUX_Init(pMb_RefTable);
+
+  ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
+  if (ret >= 0)
+  {
+    ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemNotifRcvCb, aSystemNotifAckBuff, sizeof(aSystemNotifAckBuff));
+  }
+  if (ret >= 0)
+  {
+    ret = 0;
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
+
+  /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
+  /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
+  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
+
+  /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
+
+  /* USER CODE END MBMUXIF_SystemInit_Last */
+  return ret;
+}
+
+int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  int8_t ret = 0;
+
+  /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
+
+  /* USER CODE END MBMUXIF_SystemPrio_Add_1 */
+
+  switch (SystemPrioFeat)
+  {
+    case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioARespRcvCb, aSystemPrioACmdRespBuff, sizeof(aSystemPrioACmdRespBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioANotifRcvCb, aSystemPrioANotifAckBuff, sizeof(aSystemPrioANotifAckBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_CMD_PRIO_B_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioBRespRcvCb, aSystemPrioBCmdRespBuff, sizeof(aSystemPrioBCmdRespBuff));
+      break;
+    }
+    case FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID:
+    {
+      ret = MBMUX_RegisterFeature(SystemPrioFeat, MBMUX_NOTIF_ACK, MBMUXIF_IsrSystemPrioBNotifRcvCb, aSystemPrioBNotifAckBuff, sizeof(aSystemPrioBNotifAckBuff));
+      break;
+    }
+    default:
+      break;
+  }
+
+  if (ret >= 0)
+  {
+    /* Note: trace works on ISR, no need to associate a SEQ_TASK */
+
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(SystemPrioFeat);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_Last */
+
+  /* USER CODE END MBMUXIF_SystemPrio_Add_Last */
+  return ret;
+}
+
+void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
+{
+  pMb_RefTable->SynchronizeCpusAtBoot = flag;
+  /* USER CODE BEGIN MBMUXIF_SetCpusSynchroFlag */
+
+  /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
+}
+
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
+{
+  while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
+  {
+  }
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
+
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
+}
+
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
+  /* USER CODE BEGIN MBMUXIF_GetSystemFeatureCmdComPtr */
+
+  /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
+  if (com_param_ptr == NULL)
+  {
+    Error_Handler(); /* feature isn't registered */
+  }
+  return com_param_ptr;
+}
+
+void MBMUXIF_SystemAllowSequencerForSysCmd(void)
+{
+  AllowSequencerForSysCmd = 1;
+  /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
+
+  /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
+}
+
+void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCmd_1 */
+
+  if (SystemPrioFeat == FEAT_INFO_SYSTEM_ID)
+  {
+
+    MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
+    if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
+    {
+      if (AllowSequencerForSysCmd)
+      {
+        UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
+      }
+      else
+      {
+        /* To avoid using Sequencer (& LowPower) during Init sequence for SysCmd  */
+        while (!MbSystemRespRcvFlag) {}
+      }
+    }
+    else
+    {
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCmd_Last */
+}
+
+void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
+{
+  /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(SystemPrioFeat) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_SystemSendAck_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendAck_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Exported services --------------------------------------------------------*/
+FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
+{
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret = 0;
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusInfoListReq_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusInfoListReq_1 */
+
+  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
+  if (com_obj != NULL)
+  {
+    com_obj->MsgId = SYS_GET_INFO_LIST_MSG_ID;
+    com_obj->ParamCnt = 0;
+    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
+    /* waiting for ack event */
+
+    /* once event is received and semaphore released: */
+    ret = com_obj->ReturnVal;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusInfoListReq_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusInfoListReq_Last */
+  return (FEAT_INFO_List_t *) ret;   /* need to verify */
+}
+
+FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
+{
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
+  FEAT_INFO_Param_t  *p_feature = NULL;
+  uint8_t i;
+  uint8_t cm0plus_nr_of_supported_features;
+  uint8_t found = 0;
+
+  /* USER CODE BEGIN MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
+
+  /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
+
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+
+  if (p_cm0plus_supported_features_list != NULL)
+  {
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
+
+    for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
+    {
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
+      if (p_feature->Feat_Info_Feature_Id == e_featID)
+      {
+        found = 1;
+        break;
+      }
+    }
+  }
+
+  if (!found)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemGetFeatCapabInfoPtr_Last */
+
+  /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_Last */
+  return  p_feature;
+}
+
+int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
+{
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret = 0;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusRegistrationCmd_1 */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusRegistrationCmd_1 */
+
+  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
+  if (com_obj != NULL)
+  {
+    com_obj->MsgId = SYS_REGISTER_FEATURE_MSG_ID;
+    com_buffer = com_obj->ParamBuf;
+    com_buffer[i++] = (uint32_t) e_featID;
+    com_obj->ParamCnt = i;
+    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
+    /* waiting for event */
+    /* once event is received and semaphore released: */
+    ret = com_obj->ReturnVal;
+  }
+
+  /* USER CODE BEGIN MBMUXIF_SystemSendCm0plusRegistrationCmd_Last */
+
+  /* USER CODE END MBMUXIF_SystemSendCm0plusRegistrationCmd_Last */
+  return (int8_t) ret;
+}
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_1 */
+
+  /* During "SystemInit sequence" Flag is used instead of Sequencer */
+  MbSystemRespRcvFlag = 1;
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  {
+    UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
+  }
+  /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_1 */
+  SystemComObj = (MBMUX_ComParam_t *) ComObj;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), CFG_SEQ_Prio_0);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
+}
+
+static void MBMUXIF_TaskSystemNotifRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskSystemNotifRcv_1 */
+  Process_Sys_Notif(SystemComObj);
+  /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
+}
+
+static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
+  UTIL_TIMER_IRQ_Handler();
+  /* clear the IPCC flag (necessary even if this Notif is not blocking */
+  MBMUXIF_SystemSendAck(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
+}
+
+static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
+}
+
+static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
+
+  /* USER CODE END MBMUXIF_IsrSystemPrioBNotifRcvCb */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h
new file mode 100644
index 00000000..61f37d9a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h
@@ -0,0 +1,147 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_sys.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_SYS_CM4_H__
+#define __MBMUXIF_SYS_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "mbmux.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
+MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
+void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
+void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
+void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
+FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
+FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
+int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
+
+/* USER CODE BEGIN ExpoS */
+
+/* USER CODE END ExpoS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_SYS_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c
new file mode 100644
index 00000000..c91551a5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c
@@ -0,0 +1,156 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "mbmuxif_trace.h"
+#include "mbmuxif_sys.h"
+#include "sys_app.h"
+#include "msg_id.h"
+#include "stm32_mem.h"
+#include "stm32_adv_trace.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
+static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int8_t MBMUXIF_TraceInit(void)
+{
+  int8_t ret;
+  /* USER CODE BEGIN MBMUXIF_TraceInit_1 */
+
+  /* USER CODE END MBMUXIF_TraceInit_1 */
+
+  ret = MBMUX_RegisterFeature(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceNotifRcvCb, aTraceNotifAckBuff, sizeof(aTraceNotifAckBuff));
+  if (ret >= 0)
+  {
+    /* Note: trace works on ISR, no need to associate a SEQ_TASK */
+
+    ret = MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_TRACE_ID);
+    if (ret < 0)
+    {
+      ret = -3;
+    }
+  }
+
+  /* USER CODE BEGIN MBMUXIF_TraceInit_Last */
+
+  /* USER CODE END MBMUXIF_TraceInit_Last */
+  return ret;
+}
+
+void MBMUXIF_TraceSendAck(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
+  if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
+}
+
+/* USER CODE BEGIN EFD */
+
+/* USER CODE END EFD */
+
+/* Private functions ---------------------------------------------------------*/
+static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
+{
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  MBMUX_ComParam_t *TraceComObj;
+  uint32_t  notif_ack_id;
+  uint8_t *buffer;
+  uint16_t bufsize;
+  UTIL_ADV_TRACE_Status_t ret;
+
+  TraceComObj = (MBMUX_ComParam_t *) ComObj;
+
+  notif_ack_id = TraceComObj->MsgId;
+
+  switch (notif_ack_id)
+  {
+    case TRACE_SEND_MSG_ID:
+      buffer = (uint8_t *) TraceComObj->ParamBuf[0];
+      bufsize = (uint16_t) TraceComObj->ParamBuf[1];
+      ret = UTIL_ADV_TRACE_Send(buffer, bufsize);
+      /* prepare ack buffer */
+      TraceComObj->ParamCnt = 0;
+      TraceComObj->ReturnVal = (uint32_t)ret;
+      break;
+
+    default:
+      break;
+  }
+
+  /* Send ack */
+  MBMUXIF_TraceSendAck();
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h
new file mode 100644
index 00000000..f98a156d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h
@@ -0,0 +1,77 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmuxif_trace.h
+  * @author  MCD Application Team
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUXIF_TRACE_CM4_H__
+#define __MBMUXIF_TRACE_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
+int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
+void MBMUXIF_TraceSendAck(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MBMUXIF_TRACE_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c
new file mode 100644
index 00000000..fd0e305e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c
@@ -0,0 +1,1425 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "radio_mbwrapper.h"
+#include "radio.h"
+#include "mbmux.h"
+#include "msg_id.h"
+#include "mbmuxif_radio.h"
+#include "sys_app.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static RadioEvents_t   radioevents_wrap;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* **********************************************************************
+ * Interrupts functions prototypes
+ ************************************************************************/
+/*!
+ * @brief Process radio irq
+ */
+static void RadioIrqProcess(void);
+
+/* **********************************************************************
+ * Middleware Interface functions prototypes
+ ************************************************************************/
+/*!
+ * \brief Initializes the radio
+ *
+ * \param[in] events Structure containing the driver callback functions
+ */
+static void RadioInit(RadioEvents_t *events);
+
+/*!
+ * Return current radio status
+ *
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ */
+static RadioState_t RadioGetStatus(void);
+
+/*!
+ * \brief Configures the radio with the given modem
+ *
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
+ */
+static void RadioSetModem(RadioModems_t modem);
+
+/*!
+ * \brief Sets the channel frequency
+ *
+ * \param[in] freq Channel RF frequency
+ */
+static void RadioSetChannel(uint32_t freq);
+
+/*!
+  * \brief Checks if the channel is free for the given time
+  *
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  *
+  * \retval isFree         [true: Channel is free, false: Channel is not free]
+  */
+static bool RadioIsChannelFree(uint32_t freq, uint32_t rxBandwidth,
+                               int16_t rssiThresh, uint32_t maxCarrierSenseTime);
+
+/*!
+ * \brief Generates a 32 bits random value based on the RSSI readings
+ *
+ * \remark This function sets the radio in LoRa modem mode and disables
+ *         all interrupts.
+ *         After calling this function either Radio.SetRxConfig or
+ *         Radio.SetTxConfig functions must be called.
+ *
+ * \retval randomValue    32 bits random value
+ */
+static uint32_t RadioRandom(void);
+
+/*!
+ * \brief Sets the reception parameters
+ *
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] datarate     Sets the Datarate
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: N/A ( set to 0 )
+ * \param[in] preambleLen  Sets the Preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
+ *                          FSK : timeout in number of bytes
+ *                          LoRa: timeout in symbols
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: OFF, 1: ON]
+ * \param[in] HopPeriod    Number of symbols between each hop
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: Number of symbols
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: not inverted, 1: inverted]
+ * \param[in] rxContinuous Sets the reception in continuous mode
+ *                          [false: single mode, true: continuous mode]
+ */
+static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
+                             uint32_t datarate, uint8_t coderate,
+                             uint32_t bandwidthAfc, uint16_t preambleLen,
+                             uint16_t symbTimeout, bool fixLen,
+                             uint8_t payloadLen,
+                             bool crcOn, bool FreqHopOn, uint8_t HopPeriod,
+                             bool iqInverted, bool rxContinuous);
+
+/*!
+ * \brief Sets the transmission parameters
+ *
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
+ *                          FSK : [Hz]
+ *                          LoRa: 0
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
+ *                          FSK : 0
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] datarate     Sets the Datarate
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] preambleLen  Sets the preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: OFF, 1: ON]
+ * \param[in] HopPeriod    Number of symbols between each hop
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: Number of symbols
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [0: not inverted, 1: inverted]
+ * \param[in] timeout      Transmission timeout [ms]
+ */
+static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
+                             uint32_t bandwidth, uint32_t datarate,
+                             uint8_t coderate, uint16_t preambleLen,
+                             bool fixLen, bool crcOn, bool FreqHopOn,
+                             uint8_t HopPeriod, bool iqInverted, uint32_t timeout);
+
+/*!
+ * \brief Checks if the given RF frequency is supported by the hardware
+ *
+ * \param[in] frequency RF frequency to be checked
+ * \retval isSupported [true: supported, false: unsupported]
+ */
+static bool RadioCheckRfFrequency(uint32_t frequency);
+
+/*!
+ * \brief Computes the packet time on air in ms for the given payload
+ *
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
+ *                          FSK : >= 2600 and <= 250000 Hz
+ *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+ *                                 2: 500 kHz, 3: Reserved]
+ * \param[in] spreadingFactor  Sets the Spreading Factor
+ *                          FSK : 600..300000 bits/s
+ *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+ *                                10: 1024, 11: 2048, 12: 4096  chips]
+ * \param[in] coderate     Sets the coding rate (LoRa only)
+ *                          FSK : N/A ( set to 0 )
+ *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+ * \param[in] preambleLen  Sets the Preamble length
+ *                          FSK : Number of bytes
+ *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ *
+ * \retval airTime        Computed airTime (ms) for the given packet payload length
+ */
+static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
+                                  uint32_t spreadingFactor, uint8_t coderate,
+                                  uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                                  bool crcOn);
+
+/*!
+ * \brief Sends the buffer of size. Prepares the packet to be sent and sets
+ *        the radio in transmission
+ *
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
+ */
+static void RadioSend(uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Sets the radio in sleep mode
+ */
+static void RadioSleep(void);
+
+/*!
+ * \brief Sets the radio in standby mode
+ */
+static void RadioStandby(void);
+
+/*!
+ * \brief Sets the radio in reception mode for the given time
+ * \param[in] timeout Reception timeout [ms]
+ *                     [0: continuous, others timeout]
+ */
+static void RadioRx(uint32_t timeout);
+
+/*!
+ * \brief Start a Channel Activity Detection
+ */
+static void RadioStartCad(void);
+
+/*!
+ * \brief Sets the radio in continuous wave transmission mode
+ *
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
+ */
+static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
+
+/*!
+ * \brief Reads the current RSSI value
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
+ * \retval rssiValue Current RSSI value in [dBm]
+ */
+static int16_t RadioRssi(RadioModems_t modem);
+
+/*!
+ * \brief Writes the radio register at the specified address
+ *
+ * \param[in] addr Register address
+ * \param[in] data New register value
+ */
+static void RadioWrite(uint16_t addr, uint8_t data);
+
+/*!
+ * \brief Reads the radio register at the specified address
+ *
+ * \param[in] addr Register address
+ * \retval data Register value
+ */
+static uint8_t RadioRead(uint16_t addr);
+
+/*!
+ * \brief Writes multiple radio registers starting at address
+ *
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
+ */
+static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Reads multiple radio registers starting at address
+ *
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
+ */
+static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
+
+/*!
+ * \brief Sets the maximum payload length.
+ *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
+ */
+static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
+
+/*!
+ * \brief Sets the network to public or private. Updates the sync byte.
+ *
+ * \remark Applies to LoRa modem only
+ *
+ * \param[in] enable if true, it enables a public network
+ */
+static void RadioSetPublicNetwork(bool enable);
+
+/*!
+ * \brief Gets the time required for the board plus radio to get out of sleep.[ms]
+ *
+ * \retval time Radio plus board wakeup time in ms.
+ */
+static uint32_t RadioGetWakeUpTime(void);
+
+/*!
+ * \brief Sets the radio in reception mode with Max LNA gain for the given time
+ * \param[in] timeout Reception timeout [ms]
+ *                     [0: continuous, others timeout]
+ */
+static void RadioRxBoosted(uint32_t timeout);
+
+/*!
+ * \brief Sets the Rx duty cycle management parameters
+ *
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
+ */
+static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
+
+/*!
+ * \brief Set Tx PRBS modulated wave
+ */
+static void RadioTxPrbs(void);
+
+/*!
+ * \brief Set Tx continuous wave
+ * \param[in]  power  Tx power level [0..15]
+ */
+static void RadioTxCw(int8_t power);
+
+/*!
+ * \brief Sets the reception parameters
+ *
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
+ *                          fsk field to be used if modem =GENERIC_FSK
+*                           lora field to be used if modem =GENERIC_LORA
+ * \param[in] rxContinuous Sets the reception in continuous mode
+ *                          [0: single mode, otherwise continuous mode]
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
+ *                          FSK : timeout in number of bytes
+ *                          LoRa: timeout in symbols
+ * \return 0 when no parameters error, -1 otherwise
+ */
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
+                                       uint32_t rxContinuous, uint32_t symbTimeout);
+
+/*!
+ * \brief Sets the transmission parameters
+ *
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
+ *                          fsk field to be used if modem =GENERIC_FSK
+*                           lora field to be used if modem =GENERIC_LORA
+                            bpsk field to be used if modem =GENERIC_BPSK
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
+ * \return 0 when no parameters error, -1 otherwise
+ */
+static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
+                                       int8_t power, uint32_t timeout);
+
+/*
+* Private global constants
+*/
+
+/*!
+ * Radio driver structure initialization
+ */
+const struct Radio_s Radio =
+{
+  RadioInit,
+  RadioGetStatus,
+  RadioSetModem,
+  RadioSetChannel,
+  RadioIsChannelFree,
+  RadioRandom,
+  RadioSetRxConfig,
+  RadioSetTxConfig,
+  RadioCheckRfFrequency,
+  RadioGetTimeOnAir,
+  RadioSend,
+  RadioSleep,
+  RadioStandby,
+  RadioRx,
+  RadioStartCad,
+  RadioSetTxContinuousWave,
+  RadioRssi,
+  RadioWrite,
+  RadioRead,
+  RadioWriteRegisters,
+  RadioReadRegisters,
+  RadioSetMaxPayloadLength,
+  RadioSetPublicNetwork,
+  RadioGetWakeUpTime,
+  RadioIrqProcess,
+  RadioRxBoosted,
+  RadioSetRxDutyCycle,
+  RadioTxPrbs,
+  RadioTxCw,
+  RadioSetRxGenericConfig,
+  RadioSetTxGenericConfig,
+};
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Radio_Notif_1 */
+
+  /* USER CODE END Process_Radio_Notif_1 */
+  uint32_t *com_buffer = ComObj->ParamBuf;
+  /* Radio Notif received */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4<(Radio)\r\n");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    /* callbacks */
+    case RADIO_TX_DONE_CB_ID:
+      if (radioevents_wrap.TxDone != NULL)
+      {
+        radioevents_wrap.TxDone();
+      }
+      else
+      {
+        Error_Handler();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case RADIO_TX_TIMEOUT_CB_ID:
+      if (radioevents_wrap.TxTimeout != NULL)
+      {
+        radioevents_wrap.TxTimeout();
+      }
+      else
+      {
+        Error_Handler();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case RADIO_RX_DONE_CB_ID:
+      if (radioevents_wrap.RxDone != NULL)
+      {
+        radioevents_wrap.RxDone((uint8_t *) com_buffer[0], (uint16_t) com_buffer[1], (int16_t) com_buffer[2],
+                                (int8_t) com_buffer[3]);
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case RADIO_RX_TIMEOUT_CB_ID:
+      if (radioevents_wrap.RxTimeout != NULL)
+      {
+        radioevents_wrap.RxTimeout();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    case RADIO_RX_ERROR_CB_ID:
+      if (radioevents_wrap.RxError != NULL)
+      {
+        radioevents_wrap.RxError();
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  0; /* */
+      break;
+
+    default:
+      break;
+  }
+
+  /* Radio sending ack */
+  APP_LOG(TS_ON, VLEVEL_H, "CM4>(Radio)\r\n");
+  MBMUX_AcknowledgeSnd(FEAT_INFO_RADIO_ID);
+  /* USER CODE BEGIN Process_Radio_Notif_2 */
+
+  /* USER CODE END Process_Radio_Notif_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void RadioInit(RadioEvents_t *events)
+{
+  /* USER CODE BEGIN RadioInit_1 */
+
+  /* USER CODE END RadioInit_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  if (events == NULL)
+  {
+    Error_Handler();
+  }
+
+  radioevents_wrap.TxDone = events->TxDone;
+  radioevents_wrap.TxTimeout = events->TxTimeout;
+  radioevents_wrap.RxDone = events->RxDone;
+  radioevents_wrap.RxTimeout = events->RxTimeout;
+  radioevents_wrap.RxError = events->RxError;
+  radioevents_wrap.FhssChangeChannel = events->FhssChangeChannel;
+  radioevents_wrap.CadDone = events->CadDone;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_INIT_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioInit_2 */
+
+  /* USER CODE END RadioInit_2 */
+}
+
+/*!
+  * Return current radio status
+  *
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  */
+static RadioState_t RadioGetStatus(void)
+{
+  /* USER CODE BEGIN RadioGetStatus_1 */
+
+  /* USER CODE END RadioGetStatus_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_GET_STATUS_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (RadioState_t) ret;
+  /* USER CODE BEGIN RadioGetStatus_2 */
+
+  /* USER CODE END RadioGetStatus_2 */
+}
+
+static void RadioSetModem(RadioModems_t modem)
+{
+  /* USER CODE BEGIN RadioSetModem_1 */
+
+  /* USER CODE END RadioSetModem_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_MODEM_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetModem_2 */
+
+  /* USER CODE END RadioSetModem_2 */
+}
+
+static void RadioSetChannel(uint32_t freq)
+{
+  /* USER CODE BEGIN RadioSetChannel_1 */
+
+  /* USER CODE END RadioSetChannel_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_CHANNEL_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) freq;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetChannel_2 */
+
+  /* USER CODE END RadioSetChannel_2 */
+}
+
+static bool RadioIsChannelFree(uint32_t freq, uint32_t rxBandwidth, int16_t rssiThresh, uint32_t maxCarrierSenseTime)
+{
+  /* USER CODE BEGIN RadioIsChannelFree_1 */
+
+  /* USER CODE END RadioIsChannelFree_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_IS_CHANNEL_FREE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) freq;
+  com_buffer[i++] = (uint32_t) rxBandwidth;
+  com_buffer[i++] = (uint32_t) rssiThresh;
+  com_buffer[i++] = (uint32_t) maxCarrierSenseTime;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (bool) ret;
+  /* USER CODE BEGIN RadioIsChannelFree_2 */
+
+  /* USER CODE END RadioIsChannelFree_2 */
+}
+
+static uint32_t RadioRandom(void)
+{
+  /* USER CODE BEGIN RadioRandom_1 */
+
+  /* USER CODE END RadioRandom_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_RANDOM_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint32_t) ret;
+  /* USER CODE BEGIN RadioRandom_2 */
+
+  /* USER CODE END RadioRandom_2 */
+}
+
+static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
+                             uint32_t datarate, uint8_t coderate,
+                             uint32_t bandwidthAfc, uint16_t preambleLen,
+                             uint16_t symbTimeout, bool fixLen,
+                             uint8_t payloadLen,
+                             bool crcOn, bool freqHopOn, uint8_t hopPeriod,
+                             bool iqInverted, bool rxContinuous)
+{
+  /* USER CODE BEGIN RadioSetRxConfig_1 */
+
+  /* USER CODE END RadioSetRxConfig_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_RX_CONFIG_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) bandwidth;
+  com_buffer[i++] = (uint32_t) datarate;
+  com_buffer[i++] = (uint32_t) coderate;
+  com_buffer[i++] = (uint32_t) bandwidthAfc;
+  com_buffer[i++] = (uint32_t) preambleLen;
+  com_buffer[i++] = (uint32_t) symbTimeout;
+  com_buffer[i++] = (uint32_t) fixLen;
+  com_buffer[i++] = (uint32_t) payloadLen;
+  com_buffer[i++] = (uint32_t) crcOn;
+  com_buffer[i++] = (uint32_t) freqHopOn;
+  com_buffer[i++] = (uint32_t) hopPeriod;
+  com_buffer[i++] = (uint32_t) iqInverted;
+  com_buffer[i++] = (uint32_t) rxContinuous;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetRxConfig_2 */
+
+  /* USER CODE END RadioSetRxConfig_2 */
+}
+
+static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
+                             uint32_t bandwidth, uint32_t datarate,
+                             uint8_t coderate, uint16_t preambleLen,
+                             bool fixLen, bool crcOn, bool freqHopOn,
+                             uint8_t hopPeriod, bool iqInverted, uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioSetTxConfig_1 */
+
+  /* USER CODE END RadioSetTxConfig_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_TX_CONFIG_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) power;
+  com_buffer[i++] = (uint32_t) fdev;
+  com_buffer[i++] = (uint32_t) bandwidth;
+  com_buffer[i++] = (uint32_t) datarate;
+  com_buffer[i++] = (uint32_t) coderate;
+  com_buffer[i++] = (uint32_t) preambleLen;
+  com_buffer[i++] = (uint32_t) fixLen;
+  com_buffer[i++] = (uint32_t) crcOn;
+  com_buffer[i++] = (uint32_t) freqHopOn;
+  com_buffer[i++] = (uint32_t) hopPeriod;
+  com_buffer[i++] = (uint32_t) iqInverted;
+  com_buffer[i++] = (uint32_t) timeout;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetTxConfig_2 */
+
+  /* USER CODE END RadioSetTxConfig_2 */
+}
+
+static bool RadioCheckRfFrequency(uint32_t frequency)
+{
+  /* USER CODE BEGIN RadioCheckRfFrequency_1 */
+
+  /* USER CODE END RadioCheckRfFrequency_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_CHECK_RF_FREQUENCY_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) frequency;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (bool) ret;
+  /* USER CODE BEGIN RadioCheckRfFrequency_2 */
+
+  /* USER CODE END RadioCheckRfFrequency_2 */
+}
+
+static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
+                                  uint32_t spreadingFactor, uint8_t coderate,
+                                  uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                                  bool crcOn)
+{
+  /* USER CODE BEGIN RadioGetTimeOnAir_1 */
+
+  /* USER CODE END RadioGetTimeOnAir_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_GET_TIME_ON_AIR_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) bandwidth;
+  com_buffer[i++] = (uint32_t) spreadingFactor;
+  com_buffer[i++] = (uint32_t) coderate;
+  com_buffer[i++] = (uint32_t) preambleLen;
+  com_buffer[i++] = (uint32_t) fixLen;
+  com_buffer[i++] = (uint32_t) payloadLen;
+  com_buffer[i++] = (uint32_t) crcOn;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint32_t) ret;
+  /* USER CODE BEGIN RadioGetTimeOnAir_2 */
+
+  /* USER CODE END RadioGetTimeOnAir_2 */
+}
+
+static void RadioSend(uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioSend_1 */
+
+  /* USER CODE END RadioSend_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SEND_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) buffer;
+  com_buffer[i++] = (uint32_t) size;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSend_2 */
+
+  /* USER CODE END RadioSend_2 */
+}
+
+static void RadioSleep(void)
+{
+  /* USER CODE BEGIN RadioSleep_1 */
+
+  /* USER CODE END RadioSleep_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SLEEP_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSleep_2 */
+
+  /* USER CODE END RadioSleep_2 */
+}
+
+static void RadioStandby(void)
+{
+  /* USER CODE BEGIN RadioStandby_1 */
+
+  /* USER CODE END RadioStandby_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_STANDBY_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioStandby_2 */
+
+  /* USER CODE END RadioStandby_2 */
+}
+
+static void RadioRx(uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioRx_1 */
+
+  /* USER CODE END RadioRx_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_RX_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) timeout;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioRx_2 */
+
+  /* USER CODE END RadioRx_2 */
+}
+
+static void RadioStartCad(void)
+{
+  /* USER CODE BEGIN RadioStartCad_1 */
+
+  /* USER CODE END RadioStartCad_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_START_CAD_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioStartCad_2 */
+
+  /* USER CODE END RadioStartCad_2 */
+}
+
+static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
+{
+  /* USER CODE BEGIN RadioSetTxContinuousWave_1 */
+
+  /* USER CODE END RadioSetTxContinuousWave_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_TX_CONTINUOUS_WAVE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) freq;
+  com_buffer[i++] = (uint32_t) power;
+  com_buffer[i++] = (uint32_t) time;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioSetTxContinuousWave_2 */
+
+  /* USER CODE END RadioSetTxContinuousWave_2 */
+}
+
+static int16_t RadioRssi(RadioModems_t modem)
+{
+  /* USER CODE BEGIN RadioRssi_1 */
+
+  /* USER CODE END RadioRssi_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_RSSI_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (int16_t) ret;
+  /* USER CODE BEGIN RadioRssi_2 */
+
+  /* USER CODE END RadioRssi_2 */
+}
+
+static void RadioWrite(uint16_t addr, uint8_t data)
+{
+  /* USER CODE BEGIN RadioWrite_1 */
+
+  /* USER CODE END RadioWrite_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_WRITE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) addr;
+  com_buffer[i++] = (uint32_t) data;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioWrite_2 */
+
+  /* USER CODE END RadioWrite_2 */
+}
+
+static uint8_t RadioRead(uint16_t addr)
+{
+  /* USER CODE BEGIN RadioRead_1 */
+
+  /* USER CODE END RadioRead_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_READ_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) addr;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint8_t) ret;
+  /* USER CODE BEGIN RadioRead_2 */
+
+  /* USER CODE END RadioRead_2 */
+}
+
+static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioWriteRegisters_1 */
+
+  /* USER CODE END RadioWriteRegisters_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_WRITE_BUFFER_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) addr;
+  com_buffer[i++] = (uint32_t) buffer;
+  com_buffer[i++] = (uint32_t) size;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioWriteRegisters_2 */
+
+  /* USER CODE END RadioWriteRegisters_2 */
+}
+
+static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size)
+{
+  /* USER CODE BEGIN RadioReadRegisters_1 */
+
+  /* USER CODE END RadioReadRegisters_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_READ_BUFFER_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) addr;
+  com_buffer[i++] = (uint32_t) buffer;
+  com_buffer[i++] = (uint32_t) size;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioReadRegisters_2 */
+
+  /* USER CODE END RadioReadRegisters_2 */
+}
+
+static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max)
+{
+  /* USER CODE BEGIN RadioSetMaxPayloadLength_1 */
+
+  /* USER CODE END RadioSetMaxPayloadLength_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_MAX_PAYLOAD_LENGTH_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) max;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioSetMaxPayloadLength_2 */
+
+  /* USER CODE END RadioSetMaxPayloadLength_2 */
+}
+
+static void RadioSetPublicNetwork(bool enable)
+{
+  /* USER CODE BEGIN RadioSetPublicNetwork_1 */
+
+  /* USER CODE END RadioSetPublicNetwork_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_PUBLIC_NETWORK_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) enable;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioSetPublicNetwork_2 */
+
+  /* USER CODE END RadioSetPublicNetwork_2 */
+}
+
+static uint32_t RadioGetWakeUpTime(void)
+{
+  /* USER CODE BEGIN RadioGetWakeUpTime_1 */
+
+  /* USER CODE END RadioGetWakeUpTime_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_GET_WAKEUP_TIME_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (uint32_t) ret;
+  /* USER CODE BEGIN RadioGetWakeUpTime_2 */
+
+  /* USER CODE END RadioGetWakeUpTime_2 */
+}
+
+static void RadioIrqProcess(void)
+{
+  /* USER CODE BEGIN RadioIrqProcess_1 */
+
+  /* USER CODE END RadioIrqProcess_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_IRQ_PROCESS_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN RadioIrqProcess_2 */
+
+  /* USER CODE END RadioIrqProcess_2 */
+}
+
+static void RadioRxBoosted(uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioRxBoosted_1 */
+
+  /* USER CODE END RadioRxBoosted_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_RX_BOOSTED_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) timeout;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioRxBoosted_2 */
+
+  /* USER CODE END RadioRxBoosted_2 */
+}
+
+static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime)
+{
+  /* USER CODE BEGIN RadioSetRxDutyCycle_1 */
+
+  /* USER CODE END RadioSetRxDutyCycle_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_RX_DUTY_CYCLE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rxTime;
+  com_buffer[i++] = (uint32_t) sleepTime;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioSetRxDutyCycle_2 */
+
+  /* USER CODE END RadioSetRxDutyCycle_2 */
+}
+
+static void RadioTxPrbs(void)
+{
+  /* USER CODE BEGIN RadioTxPrbs_1 */
+
+  /* USER CODE END RadioTxPrbs_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_TX_PRBS_ID;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioTxPrbs_2 */
+
+  /* USER CODE END RadioTxPrbs_2 */
+}
+
+static void RadioTxCw(int8_t power)
+{
+  /* USER CODE BEGIN RadioTxCw_1 */
+
+  /* USER CODE END RadioTxCw_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_TX_CW_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) power;
+  com_obj->ParamCnt = i;
+  if (i > MAX_PARAM_OF_RADIO_CMD_FUNCTIONS)
+  {
+    Error_Handler();
+  }
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return ;
+  /* USER CODE BEGIN RadioTxCw_2 */
+
+  /* USER CODE END RadioTxCw_2 */
+}
+
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config, uint32_t rxContinuous,
+                                       uint32_t symbTimeout)
+{
+  /* USER CODE BEGIN RadioSetRxGenericConfig_1 */
+
+  /* USER CODE END RadioSetRxGenericConfig_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer;
+  uint32_t ret;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_RX_GENERIC_CONFIG_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) config;
+  com_buffer[i++] = (uint32_t) rxContinuous;
+  com_buffer[i++] = (uint32_t) symbTimeout;
+  com_obj->ParamCnt = i;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (int32_t) ret;
+  /* USER CODE BEGIN RadioSetRxGenericConfig_2 */
+
+  /* USER CODE END RadioSetRxGenericConfig_2 */
+}
+
+static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config, int8_t power, uint32_t timeout)
+{
+  /* USER CODE BEGIN RadioSetTxGenericConfig_1 */
+
+  /* USER CODE END RadioSetTxGenericConfig_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint32_t ret;
+  uint16_t i = 0;
+
+  com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
+  com_obj->MsgId = RADIO_SET_TX_GENERIC_CONFIG_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) modem;
+  com_buffer[i++] = (uint32_t) config;
+  com_buffer[i++] = (uint32_t) power;
+  com_buffer[i++] = (uint32_t) timeout;
+  com_obj->ParamCnt = i;
+  MBMUXIF_RadioSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (int32_t) ret;
+  /* USER CODE BEGIN RadioSetTxGenericConfig_2 */
+
+  /* USER CODE END RadioSetTxGenericConfig_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h
new file mode 100644
index 00000000..e7eebe2c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_MBWRAPPER_CM4_H__
+#define __RADIO_MBWRAPPER_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
+void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__RADIO_MBWRAPPER_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c
new file mode 100644
index 00000000..df4d17bc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c
@@ -0,0 +1,743 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sigfox_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the Sigfox interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sigfox_mbwrapper.h"
+#include "platform.h"
+#include "mbmux.h"
+#include "mbmuxif_sys.h"
+#include "msg_id.h"
+#include "mbmuxif_sigfox.h"
+#include "stm32_mem.h"
+#include "stm32_seq.h"
+#include "sys_app.h"
+#include "st_sigfox_api.h"
+#include "sigfox_monarch_api.h"
+#include "sgfx_app.h"
+#include "sigfox_info.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#ifndef MAX
+#define MAX( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
+#endif /* MAX */
+#define NB_ELEMENTS_MAX 3
+
+#define SGFX_OPEN_SIZE       (sizeof(sfx_rc_t))
+#define SGFX_SEND_SIZE       ((SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8)) + (SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8)))
+#define SGFX_SET_CONFIG_SIZE (NB_ELEMENTS_MAX * sizeof(sfx_u32))
+#define SGFX_START_TX_SIZE   (sizeof(sfx_modulation_type_t))
+#define SGFX_GET_VER_SIZE    (sizeof(sfx_u32) + sizeof(sfx_u8))
+#define SGFX_GET_PAC_SIZE    (PAC_LENGTH * sizeof(sfx_u8))
+#define SGFX_MBWRAP_SHBUF_SIZE MAX(MAX(MAX(SGFX_OPEN_SIZE, SGFX_SEND_SIZE), MAX(SGFX_SET_CONFIG_SIZE, SGFX_START_TX_SIZE)), MAX(SGFX_GET_VER_SIZE, SGFX_GET_PAC_SIZE))
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Sigfox buffer to exchange data between from CM4 to CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint8_t aSigfoxMbWrapShareBuffer[SGFX_MBWRAP_SHBUF_SIZE];
+
+static sfx_u8(* app_cb)(sfx_u8 rc_bit_mask, sfx_s16 rssi);
+
+static SigfoxCallback_t *callback_wrap;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+sfx_error_t SIGFOX_API_open(sfx_rc_t *rc)
+{
+  /* USER CODE BEGIN SIGFOX_API_open_1 */
+
+  /* USER CODE END SIGFOX_API_open_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (rc == NULL)
+  {
+    return SFX_ERR_API_OPEN;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) rc, sizeof(sfx_rc_t));
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_START_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aSigfoxMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* copy back data from shared memory to Cm4 stack private memory */
+  UTIL_MEM_cpy_8((uint8_t *) rc, (uint8_t *) aSigfoxMbWrapShareBuffer, sizeof(sfx_rc_t));
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_open_2 */
+
+  /* USER CODE END SIGFOX_API_open_2 */
+}
+
+sfx_error_t SIGFOX_API_close(void)
+{
+  /* USER CODE BEGIN SIGFOX_API_close_1 */
+
+  /* USER CODE END SIGFOX_API_close_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_STOP_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_close_2 */
+
+  /* USER CODE END SIGFOX_API_close_2 */
+}
+
+sfx_error_t SIGFOX_API_send_frame(sfx_u8 *customer_data, sfx_u8 customer_data_length,
+                                  sfx_u8 *customer_response, sfx_u8 tx_mode,
+                                  sfx_bool initiate_downlink_flag)
+{
+  /* USER CODE BEGIN SIGFOX_API_send_frame_1 */
+
+  /* USER CODE END SIGFOX_API_send_frame_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (customer_data == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_DATA_PTR;
+  }
+  else if (customer_response == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_RESPONSE_PTR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) customer_data,
+                 SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8));
+  UTIL_MEM_cpy_8((uint8_t *)(aSigfoxMbWrapShareBuffer + SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8)),
+                 (uint8_t *)customer_response, SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8));
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_SEND_FRAME_DWNL_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aSigfoxMbWrapShareBuffer;
+  com_buffer[i++] = (uint32_t) customer_data_length;
+  com_buffer[i++] = ((uint32_t) aSigfoxMbWrapShareBuffer + SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8));
+  com_buffer[i++] = (uint32_t) tx_mode;
+  com_buffer[i++] = (uint32_t) initiate_downlink_flag ;
+
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* copy back data from shared memory to Cm4 stack memory */
+  UTIL_MEM_cpy_8((uint8_t *) customer_data, (uint8_t *) aSigfoxMbWrapShareBuffer,
+                 SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8));
+  UTIL_MEM_cpy_8((uint8_t *)customer_response,
+                 (uint8_t *)(aSigfoxMbWrapShareBuffer + SGFX_MAX_UL_PAYLOAD_SIZE * sizeof(sfx_u8)),
+                 SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8));
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_send_frame_2 */
+
+  /* USER CODE END SIGFOX_API_send_frame_2 */
+}
+
+sfx_error_t SIGFOX_API_send_bit(sfx_bool bit_value,
+                                sfx_u8 *customer_response,
+                                sfx_u8 tx_mode,
+                                sfx_bool initiate_downlink_flag)
+{
+  /* USER CODE BEGIN SIGFOX_API_send_bit_1 */
+
+  /* USER CODE END SIGFOX_API_send_bit_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (customer_response == NULL)
+  {
+    return SFX_ERR_API_SEND_FRAME_RESPONSE_PTR;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8((uint8_t *)aSigfoxMbWrapShareBuffer, (uint8_t *)customer_response,
+                 SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8));
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_SEND_BIT_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) bit_value;
+  com_buffer[i++] = (uint32_t) aSigfoxMbWrapShareBuffer;
+  com_buffer[i++] = (uint32_t) tx_mode;
+  com_buffer[i++] = (uint32_t) initiate_downlink_flag;
+
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* copy back data from shared memory to Cm4 stack memory */
+  UTIL_MEM_cpy_8((uint8_t *)customer_response, (uint8_t *) aSigfoxMbWrapShareBuffer,
+                 SGFX_MAX_DL_PAYLOAD_SIZE * sizeof(sfx_u8));
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_send_bit_2 */
+
+  /* USER CODE END SIGFOX_API_send_bit_2 */
+}
+
+sfx_error_t SIGFOX_API_send_outofband(sfx_oob_enum_t oob_type)
+{
+  /* USER CODE BEGIN SIGFOX_API_send_outofband_1 */
+
+  /* USER CODE END SIGFOX_API_send_outofband_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_SEND_OOB_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) oob_type;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_send_outofband_2 */
+
+  /* USER CODE END SIGFOX_API_send_outofband_2 */
+}
+
+sfx_error_t SIGFOX_API_set_std_config(sfx_u32 config_words[NB_ELEMENTS_MAX],
+                                      sfx_bool timer_enable)
+{
+  /* USER CODE BEGIN SIGFOX_API_set_std_config_1 */
+
+  /* USER CODE END SIGFOX_API_set_std_config_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) config_words, NB_ELEMENTS_MAX * sizeof(sfx_u32));
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_SET_STD_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aSigfoxMbWrapShareBuffer;
+  com_buffer[i++] = (uint32_t) timer_enable;
+
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* copy back data from shared memory to Cm4 stack private memory */
+  UTIL_MEM_cpy_8((uint8_t *) config_words, (uint8_t *) aSigfoxMbWrapShareBuffer, NB_ELEMENTS_MAX * sizeof(sfx_u32));
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_set_std_config_2 */
+
+  /* USER CODE END SIGFOX_API_set_std_config_2 */
+}
+
+sfx_error_t SIGFOX_API_start_continuous_transmission(sfx_u32 frequency, sfx_modulation_type_t type)
+{
+  /* USER CODE BEGIN SIGFOX_API_start_continuous_transmission_1 */
+
+  /* USER CODE END SIGFOX_API_start_continuous_transmission_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) type, sizeof(sfx_modulation_type_t));
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_START_CONTINUOUS_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) frequency;
+  com_buffer[i++] = (uint32_t) aSigfoxMbWrapShareBuffer;
+
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* copy back data from shared memory to Cm4 stack private memory */
+  UTIL_MEM_cpy_8((uint8_t *) type, (uint8_t *) aSigfoxMbWrapShareBuffer, sizeof(sfx_modulation_type_t));
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_start_continuous_transmission_2 */
+
+  /* USER CODE END SIGFOX_API_start_continuous_transmission_2 */
+}
+
+sfx_error_t SIGFOX_API_stop_continuous_transmission(void)
+{
+  /* USER CODE BEGIN SIGFOX_API_stop_continuous_transmission_1 */
+
+  /* USER CODE END SIGFOX_API_stop_continuous_transmission_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_STOP_CONTINUOUS_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_stop_continuous_transmission_2 */
+
+  /* USER CODE END SIGFOX_API_stop_continuous_transmission_2 */
+}
+
+sfx_error_t SIGFOX_API_get_version(sfx_u8 **version, sfx_u8 *size, sfx_version_type_t type)
+{
+  /* USER CODE BEGIN SIGFOX_API_get_version_1 */
+
+  /* USER CODE END SIGFOX_API_get_version_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (version == NULL)
+  {
+    return SFX_ERR_API_GET_VERSION;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) version, sizeof(sfx_u32));
+  UTIL_MEM_cpy_8((uint8_t *)(aSigfoxMbWrapShareBuffer + sizeof(sfx_u32)), (uint8_t *) size, sizeof(sfx_u8));
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_GET_VERSION_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aSigfoxMbWrapShareBuffer;
+  com_buffer[i++] = (uint32_t)(aSigfoxMbWrapShareBuffer + sizeof(sfx_u32));
+  com_buffer[i++] = (uint32_t) type ;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* copy back data from shared memory to Cm4 stack private memory */
+  UTIL_MEM_cpy_8((uint8_t *) version, (uint8_t *) aSigfoxMbWrapShareBuffer, sizeof(sfx_u32));
+  UTIL_MEM_cpy_8((uint8_t *) size, (uint8_t *)(aSigfoxMbWrapShareBuffer + sizeof(sfx_u32)), sizeof(sfx_u8));
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_get_version_2 */
+
+  /* USER CODE END SIGFOX_API_get_version_2 */
+}
+
+sfx_error_t SIGFOX_API_get_device_id(sfx_u8 *dev_id)
+{
+  /* USER CODE BEGIN SIGFOX_API_get_device_id_1 */
+
+  /* USER CODE END SIGFOX_API_get_device_id_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (dev_id == NULL)
+  {
+    return SFX_ERR_INT_GET_DEVICE_ID;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) dev_id, sizeof(sfx_u32));
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_GET_DEVICE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aSigfoxMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* copy back data from shared memory to Cm4 stack private memory */
+  UTIL_MEM_cpy_8((uint8_t *) dev_id, (uint8_t *) aSigfoxMbWrapShareBuffer, sizeof(sfx_u32));
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_get_device_id_2 */
+
+  /* USER CODE END SIGFOX_API_get_device_id_2 */
+}
+
+sfx_error_t SIGFOX_API_get_initial_pac(sfx_u8 *initial_pac)
+{
+  /* USER CODE BEGIN SIGFOX_API_get_initial_pac_1 */
+
+  /* USER CODE END SIGFOX_API_get_initial_pac_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (initial_pac == NULL)
+  {
+    return SFX_ERR_API_GET_INITIAL_PAC;
+  }
+
+  /* copy data from Cm4 stack memory to shared memory */
+  UTIL_MEM_cpy_8((uint8_t *) aSigfoxMbWrapShareBuffer, (uint8_t *) initial_pac, PAC_LENGTH * sizeof(sfx_u8));
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_GET_INIT_PAC_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) aSigfoxMbWrapShareBuffer;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  /* copy back data from shared memory to Cm4 stack private memory */
+  UTIL_MEM_cpy_8((uint8_t *) initial_pac, (uint8_t *) aSigfoxMbWrapShareBuffer, PAC_LENGTH * sizeof(sfx_u8));
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_get_initial_pac_2 */
+
+  /* USER CODE END SIGFOX_API_get_initial_pac_2 */
+}
+
+sfx_error_t SIGFOX_API_set_rc_sync_period(sfx_u16 rc_sync_period)
+{
+  /* USER CODE BEGIN SIGFOX_API_set_rc_sync_period_1 */
+
+  /* USER CODE END SIGFOX_API_set_rc_sync_period_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_SET_RCSYNC_PERIOD_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rc_sync_period;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_API_set_rc_sync_period_2 */
+
+  /* USER CODE END SIGFOX_API_set_rc_sync_period_2 */
+}
+
+sfx_error_t ADDON_SIGFOX_RF_PROTOCOL_API_test_mode(sfx_rc_enum_t rc_enum, sfx_test_mode_t test_mode)
+{
+  /* USER CODE BEGIN ADDON_SIGFOX_RF_PROTOCOL_API_test_mode_1 */
+
+  /* USER CODE END ADDON_SIGFOX_RF_PROTOCOL_API_test_mode_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_API_TEST_MODE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rc_enum;
+  com_buffer[i++] = (uint32_t) test_mode;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN ADDON_SIGFOX_RF_PROTOCOL_API_test_mode_2 */
+
+  /* USER CODE END ADDON_SIGFOX_RF_PROTOCOL_API_test_mode_2 */
+}
+
+sfx_error_t ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode(sfx_rc_enum_t rc_enum, sfx_test_mode_t test_mode,
+                                                              sfx_u8 rc_capabilities)
+{
+  /* USER CODE BEGIN ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
+
+  /* USER CODE END ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_API_MONARCH_TEST_MODE_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rc_enum;
+  com_buffer[i++] = (uint32_t) test_mode;
+  com_buffer[i++] = (uint32_t) rc_capabilities;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
+
+  /* USER CODE END ST_ADDON_SIGFOX_RF_PROTOCOL_API_monarch_test_mode_2 */
+}
+
+sfx_error_t SIGFOX_MONARCH_API_execute_rc_scan(sfx_u8 rc_capabilities_bit_mask, sfx_u16 timer,
+                                               sfx_timer_unit_enum_t unit, sfx_u8(* app_callback_handler)(sfx_u8 rc_bit_mask, sfx_s16 rssi))
+{
+  /* USER CODE BEGIN SIGFOX_MONARCH_API_execute_rc_scan_1 */
+
+  /* USER CODE END SIGFOX_MONARCH_API_execute_rc_scan_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret;
+
+  if (app_callback_handler == NULL)
+  {
+    return SFX_ERR_MONARCH_API_EXECUTE_RC_SCAN_NULL_CALLBACK;
+  }
+
+  /*Init callback on M4 side*/
+  app_cb = app_callback_handler;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_API_MONARCH_TEST_EXEC_RC_SCAN_ID;
+  com_buffer = com_obj->ParamBuf;
+  com_buffer[i++] = (uint32_t) rc_capabilities_bit_mask;
+  com_buffer[i++] = (uint32_t) timer;
+  com_buffer[i++] = (uint32_t) unit;
+  com_buffer[i++] = (uint32_t) app_cb;
+  com_obj->ParamCnt = i;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_MONARCH_API_execute_rc_scan_2 */
+
+  /* USER CODE END SIGFOX_MONARCH_API_execute_rc_scan_2 */
+}
+
+sfx_error_t SIGFOX_MONARCH_API_stop_rc_scan(void)
+{
+  /* USER CODE BEGIN SIGFOX_MONARCH_API_stop_rc_scan_1 */
+
+  /* USER CODE END SIGFOX_MONARCH_API_stop_rc_scan_1 */
+  MBMUX_ComParam_t *com_obj;
+  uint32_t ret;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_API_MONARCH_STOP_RC_SCAN_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  ret = com_obj->ReturnVal;
+  return (sfx_error_t) ret;
+  /* USER CODE BEGIN SIGFOX_MONARCH_API_stop_rc_scan_2 */
+
+  /* USER CODE END SIGFOX_MONARCH_API_stop_rc_scan_2 */
+}
+
+void SigfoxInfo_Init(void)
+{
+  /* USER CODE BEGIN SigfoxInfo_Init_1 */
+
+  /* USER CODE END SigfoxInfo_Init_1 */
+  MBMUX_ComParam_t *com_obj;
+
+  com_obj = MBMUXIF_GetSigfoxFeatureCmdComPtr();
+  com_obj->MsgId = SIGFOX_INFO_INIT_ID;
+  com_obj->ParamCnt = 0;
+  MBMUXIF_SigfoxSendCmd();
+  /* waiting for event */
+  /* once event is received and semaphore released: */
+  return;
+  /* USER CODE BEGIN SigfoxInfo_Init_2 */
+
+  /* USER CODE END SigfoxInfo_Init_2 */
+}
+
+SigfoxInfo_t *SigfoxInfo_GetPtr(void)
+{
+  /* USER CODE BEGIN SigfoxInfo_GetPtr_1 */
+
+  /* USER CODE END SigfoxInfo_GetPtr_1 */
+  FEAT_INFO_Param_t  *p_feature;
+
+  p_feature = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SIGFOX_ID);
+  return (SigfoxInfo_t *) p_feature->Feat_Info_Config_Ptr ;
+  /* USER CODE BEGIN SigfoxInfo_GetPtr_2 */
+
+  /* USER CODE END SigfoxInfo_GetPtr_2 */
+}
+
+void Sigfox_Register(SigfoxCallback_t *SigfoxCallback)
+{
+  /* USER CODE BEGIN Sigfox_Register_1 */
+
+  /* USER CODE END Sigfox_Register_1 */
+  callback_wrap = SigfoxCallback;
+  /* USER CODE BEGIN Sigfox_Register_2 */
+
+  /* USER CODE END Sigfox_Register_2 */
+}
+
+void Process_Sigfox_Notif(MBMUX_ComParam_t *ComObj)
+{
+  /* USER CODE BEGIN Process_Sigfox_Notif_1 */
+
+  /* USER CODE END Process_Sigfox_Notif_1 */
+  uint32_t    cb_ret;
+
+  APP_LOG(TS_ON, VLEVEL_H, "CM4 - Sigfox Notif received \n\r");
+
+  /* process Command */
+  switch (ComObj->MsgId)
+  {
+    /* callbacks */
+    case SIGFOX_GET_BATTERY_LEVEL_CB_ID:
+      if (callback_wrap->GetBatteryLevel != NULL)
+      {
+        cb_ret = (uint32_t) callback_wrap->GetBatteryLevel();
+      }
+      else
+      {
+        while (1) {}
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  cb_ret; /* */
+      break;
+
+    case SIGFOX_GET_TEMPERATURE_LEVEL_CB_ID:
+      if (callback_wrap->GetTemperatureLevel != NULL)
+      {
+        cb_ret = (uint32_t) callback_wrap->GetTemperatureLevel();
+      }
+      else
+      {
+        while (1) {}
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  cb_ret; /* */
+      break;
+
+    case SIGFOX_MONARCH_RC_SCAN_CB_ID:
+      if (app_cb != NULL)
+      {
+        cb_ret = (sfx_u8) app_cb((sfx_u8)ComObj->ParamBuf[0], (sfx_s16) ComObj->ParamBuf[1]);
+      }
+      else
+      {
+        while (1) {}
+      }
+      /* prepare response buffer */
+      ComObj->ParamCnt = 0; /* reset ParamCnt */
+      ComObj->ReturnVal =  cb_ret; /* */
+      break;
+
+    default:
+      break;
+  }
+
+  /* send Ack */
+  APP_LOG(TS_ON, VLEVEL_H,  "CM4 - Sigfox sending ack \n\r");
+  MBMUX_AcknowledgeSnd(FEAT_INFO_SIGFOX_ID);
+  /* USER CODE BEGIN Process_Sigfox_Notif_2 */
+
+  /* USER CODE END Process_Sigfox_Notif_2 */
+}
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h
new file mode 100644
index 00000000..cd7dc2dc
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h
@@ -0,0 +1,103 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sigfox_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM0 side wrapper of the SigfoxMac interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SIGFOX_MBWRAPPER_CM4_H__
+#define __SIGFOX_MBWRAPPER_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "mbmux_table.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/*!
+  * Sigfox callback structure
+*/
+typedef struct sSigfoxCallback
+{
+  /*!
+  * \brief   Measures the battery level
+  *
+  * \retval  Battery level [0: node is connected to an external
+  *          power source, 1..254: battery level, where 1 is the minimum
+  *          and 254 is the maximum value, 255: the node was not able
+  *          to measure the battery level]
+  */
+  uint16_t (*GetBatteryLevel)(void);
+  /*!
+  * \brief   Measures the temperature level
+  *
+  * \retval  Temperature level
+  */
+  int16_t (*GetTemperatureLevel)(void);
+} SigfoxCallback_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the callbacks and primitives from Cm0
+  * @param ComObj exchange buffer parameter
+  */
+void Process_Sigfox_Notif(MBMUX_ComParam_t *ComObj);
+
+/**
+ * @brief Register the callbacks structure for the process notification
+ * @param SigfoxCallback struct of callbacks
+ */
+void Sigfox_Register(SigfoxCallback_t *SigfoxCallback);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SIGFOX_MBWRAPPER_CM4_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c
new file mode 100644
index 00000000..c2e924b9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c
@@ -0,0 +1,115 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    system_mbwrapper.c
+  * @author  MCD Application Team
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "system_mbwrapper.h"
+#include "platform.h"
+#include "mbmux.h"
+#include "msg_id.h"
+#include "mbmuxif_sys.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t *data)
+{
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret = 0;
+
+  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
+  if (com_obj != NULL)
+  {
+    com_obj->MsgId = SYS_EE_READ_ID;
+    com_buffer = com_obj->ParamBuf;
+    /* Caution: copy all PARAMS from struct E2P_wrapper_params_t */
+    com_buffer[i++] = (uint32_t) EEsgfxID;
+    com_buffer[i++] = (uint32_t) data;
+    com_obj->ParamCnt = i;
+    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
+    /* waiting for event */
+    /* once event is received and semaphore released: */
+    ret = com_obj->ReturnVal;
+  }
+  return (uint32_t) ret;
+}
+
+uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t data)
+{
+  MBMUX_ComParam_t *com_obj;
+  uint32_t *com_buffer ;
+  uint16_t i = 0;
+  uint32_t ret = 0;
+
+  com_obj = MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_SYSTEM_ID);
+  if (com_obj != NULL)
+  {
+    com_obj->MsgId = SYS_EE_WRITE_ID;
+    com_buffer = com_obj->ParamBuf;
+    /* Caution: copy all PARAMS from struct E2P_wrapper_params_t */
+    com_buffer[i++] = (uint32_t) EEsgfxID;
+    com_buffer[i++] = (uint32_t) data;
+    com_obj->ParamCnt = i;
+    MBMUXIF_SystemSendCmd(FEAT_INFO_SYSTEM_ID);
+    /* waiting for event */
+    /* once event is received and semaphore released: */
+    ret = com_obj->ReturnVal;
+  }
+  return (uint32_t) ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.h
new file mode 100644
index 00000000..2acca318
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.h
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    system_mbwrapper.h
+  * @author  MCD Application Team
+  * @brief   This file implements the CM4 side wrapper of the Radio interface
+  *          shared between M0 and M4.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTEM_MBWRAPPER_CM4_H__
+#define __SYSTEM_MBWRAPPER_CM4_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sgfx_eeprom_if.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief   Returns the last stored variable data, if found, which corresponds to
+  *          the passed virtual address
+  * @param   EEsgfxID ID of EEPROM Sigfox variable
+  * @param   data to be read
+  *
+  * @retval  error status
+  */
+uint32_t SYS_EE_ReadBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t *data);
+
+/**
+  * \brief   Writes/updates variable data in EEPROM emulator.
+  * @param   EEsgfxID ID of EEPROM Sigfox variable
+  * @param   data to be written
+  *
+  * @retval error status
+  */
+uint32_t SYS_EE_WriteBuffer_mbwrapper(e_EE_ID EEsgfxID, uint32_t data);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SYSTEM_MBWRAPPER_CM4_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c
new file mode 100644
index 00000000..165374fe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c
@@ -0,0 +1,96 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_sigfox.c
+  * @author  MCD Application Team
+  * @brief   Application of the Sigfox Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_sigfox.h"
+#include "sgfx_app.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void MX_Sigfox_Init(void)
+{
+  /* USER CODE BEGIN MX_Sigfox_Init_1 */
+
+  /* USER CODE END MX_Sigfox_Init_1 */
+  SystemApp_Init();
+  Sigfox_Init();
+  /* USER CODE BEGIN MX_Sigfox_Init_2 */
+
+  /* USER CODE END MX_Sigfox_Init_2 */
+}
+
+void MX_Sigfox_Process(void)
+{
+  /* USER CODE BEGIN MX_Sigfox_Process_1 */
+
+  /* USER CODE END MX_Sigfox_Process_1 */
+  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
+  /* USER CODE BEGIN MX_Sigfox_Process_2 */
+
+  /* USER CODE END MX_Sigfox_Process_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.h
new file mode 100644
index 00000000..7245c333
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.h
@@ -0,0 +1,77 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_sigfox.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the Sigfox Middleware
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_SIGFOX_H__
+#define __APP_SIGFOX_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define DEFAULT_RC SFX_RC1
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init Sigfox Application
+  */
+void MX_Sigfox_Init(void);
+
+/**
+  * @brief  entry Sigfox Process or scheduling
+  */
+void MX_Sigfox_Process(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_SIGFOX_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c
new file mode 100644
index 00000000..a4d987b9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c
@@ -0,0 +1,356 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_app.c
+  * @author  MCD Application Team
+  * @brief   provides code for the application of the sigfox Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+
+#include "st_sigfox_api.h"
+#include "sgfx_app.h"
+#include "sgfx_app_version.h"
+#include "sigfox_version.h"
+#include "subghz_phy_version.h"
+#include "stm32_seq.h"
+#include "radio.h"
+#include "sys_conf.h"
+#include "sgfx_eeprom_if.h"
+#include "sys_app.h"
+#include "stm32_lpm.h"
+#include "stm32_seq.h"
+#include "utilities_def.h"
+#include "sigfox_mbwrapper.h"
+#include "sigfox_info.h"
+#include "mbmuxif_sys.h"
+
+/* USER CODE BEGIN Includes */
+#include "sys_sensors.h"
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+extern RadioEvents_t RfApiRadioEvents;
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+extern __IO uint32_t lets_go_on;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_ENABLED */
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+static SigfoxCallback_t SigfoxCallbacks = { SYS_GetBatteryLevel,
+                                            SYS_GetTemperatureLevel
+                                          };
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc);
+
+/* USER CODE BEGIN PFP */
+static void SendSigfox(void);
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void Sigfox_Init(void)
+{
+  sfx_rc_enum_t sfx_rc = SFX_RC1;
+  sfx_error_t error = 0;
+  SigfoxInfo_t *SigfoxRegionInfo;
+  FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
+  uint32_t sgfx_cm0plus_app;
+
+  /* USER CODE BEGIN Sigfox_Init_1 */
+  BSP_LED_Init(LED_BLUE);
+  BSP_LED_Init(LED_GREEN);
+  /* Initialize button here*/
+  BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
+
+  /* Get CM4 Sigfox APP version*/
+  APP_LOG(TS_OFF, VLEVEL_M, "M4 APP_VERSION:     V%X.%X.%X\r\n",
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get CM0 Sigfox APP version*/
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SYSTEM_ID);
+  sgfx_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "M0PLUS_APP_VERSION: V%X.%X.%X\r\n",
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW Sigfox info */
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_SIGFOX_ID);
+  sgfx_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "MW_SIGFOX_VERSION:  V%X.%X.%X\r\n",
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Get MW SubGhz_Phy info */
+  p_cm0plus_specific_features_info = MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_RADIO_ID);
+  sgfx_cm0plus_app = p_cm0plus_specific_features_info->Feat_Info_Feature_Version ;
+  APP_LOG(TS_OFF, VLEVEL_M, "MW_RADIO_VERSION:   V%X.%X.%X\r\n",
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(sgfx_cm0plus_app >> __APP_VERSION_SUB2_SHIFT));
+
+  /* USER CODE END Sigfox_Init_1 */
+
+  E2P_Write_Rc(DEFAULT_RC);
+  sfx_rc = E2P_Read_Rc();
+
+  /*Open Sigfox library */
+  error = st_sigfox_open(sfx_rc);
+
+  /* Init SigfoxInfo capabilities table (redundant: Cm0 is supposed to have done it already) */
+  SigfoxInfo_Init();
+
+  SigfoxRegionInfo = SigfoxInfo_GetPtr();
+  if (SigfoxRegionInfo->Region == 0)
+  {
+    APP_PRINTF("error: At least one region shall be defined : RC1 to RC7 \n\r");
+    while (1) {} /* At least one region shall be defined */
+  }
+
+  /* Register GetBatteryLevel and GetTemperatureLevel functions */
+  Sigfox_Register(&SigfoxCallbacks);
+  /* USER CODE BEGIN Sigfox_Init_ErrorCheck */
+  if (1U == E2P_Read_AtEcho())
+  {
+    if (error == SFX_ERR_NONE)
+    {
+      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION READY\n\r\n\r");
+    }
+    else
+    {
+      APP_PPRINTF("\r\n\n\rSIGFOX APPLICATION ERROR: 0x%04X\n\r\n\r", error);
+    }
+  }
+  /* USER CODE END Sigfox_Init_ErrorCheck */
+  /* USER CODE BEGIN Sigfox_Init_2 */
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_Pb), UTIL_SEQ_RFU, SendSigfox);
+
+  /* USER CODE END Sigfox_Init_2 */
+}
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static sfx_error_t st_sigfox_open(sfx_rc_enum_t sfx_rc)
+{
+  /* USER CODE BEGIN st_sigfox_open_1 */
+
+  /* USER CODE END st_sigfox_open_1 */
+  sfx_u32 config_words[3] = {0};
+
+  E2P_Read_ConfigWords(sfx_rc, config_words);
+
+  sfx_error_t error = SFX_ERR_NONE;
+
+  /*record RCZ*/
+  switch (sfx_rc)
+  {
+    case SFX_RC1:
+    {
+      sfx_rc_t SgfxRc = RC1;
+      error = SIGFOX_API_open(&SgfxRc);
+
+      break;
+    }
+    case SFX_RC2:
+    {
+      sfx_rc_t SgfxRc = RC2;
+
+      error = SIGFOX_API_open(&SgfxRc);
+
+      if (error == SFX_ERR_NONE)
+      {
+        error = SIGFOX_API_set_std_config(config_words, RC2_SET_STD_TIMER_ENABLE);
+      }
+
+      break;
+    }
+    case SFX_RC3A:
+    {
+      sfx_rc_t SgfxRc = RC3A;
+
+      error = SIGFOX_API_open(&SgfxRc);
+
+      if (error == SFX_ERR_NONE)
+      {
+        error = SIGFOX_API_set_std_config(config_words, NA);
+      }
+      break;
+    }
+    case SFX_RC3C:
+    {
+      sfx_rc_t SgfxRc = RC3C;
+
+      error = SIGFOX_API_open(&SgfxRc);
+
+      if (error == SFX_ERR_NONE)
+      {
+        error = SIGFOX_API_set_std_config(config_words, NA);
+      }
+      break;
+    }
+    case SFX_RC4:
+    {
+      sfx_rc_t SgfxRc = RC4;
+
+      error = SIGFOX_API_open(&SgfxRc);
+
+      if (error == SFX_ERR_NONE)
+      {
+        error = SIGFOX_API_set_std_config(config_words, RC4_SET_STD_TIMER_ENABLE);
+      }
+      break;
+    }
+    case SFX_RC5:
+    {
+      sfx_rc_t SgfxRc = RC5;
+
+      error = SIGFOX_API_open(&SgfxRc);
+
+      if (error == SFX_ERR_NONE)
+      {
+        error = SIGFOX_API_set_std_config(config_words, NA);
+      }
+      break;
+    }
+    case SFX_RC6:
+    {
+      sfx_rc_t SgfxRc = RC6;
+      error = SIGFOX_API_open(&SgfxRc);
+      break;
+    }
+    case SFX_RC7:
+    {
+      sfx_rc_t SgfxRc = RC7;
+      error = SIGFOX_API_open(&SgfxRc);
+      break;
+    }
+    /* USER CODE BEGIN st_sigfox_open_case */
+
+    /* USER CODE END st_sigfox_open_case */
+    default:
+    {
+      error = SFX_ERR_API_OPEN;
+      break;
+    }
+  }
+
+  return error;
+  /* USER CODE BEGIN st_sigfox_open_2 */
+
+  /* USER CODE END st_sigfox_open_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+/* Note: Current the stm32wlxx_it.c generated by STM32CubeMX does not support BSP for PB in EXTI mode. */
+/* In order to get a push button IRS by code automatically generated */
+/* HAL_GPIO_EXTI_Callback is today the only available possibility. */
+/* Using HAL_GPIO_EXTI_Callback() shortcuts the BSP. */
+/* If users wants to really go through the BSP, stm32wlxx_it.c should be updated  */
+/* in the USER CODE SESSION of the correspondent EXTIn_IRQHandler() */
+/* to call the BSP_PB_IRQHandler() or the HAL_EXTI_IRQHandler(&H_EXTI_n);. */
+/* Then the below HAL_GPIO_EXTI_Callback() can be replaced by BSP callback */
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  switch (GPIO_Pin)
+  {
+    case  BUTTON_SW1_PIN:
+      UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_Pb), CFG_SEQ_Prio_0);
+      break;
+    case  BUTTON_SW2_PIN:
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+      lets_go_on = 1;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_ENABLED */
+      break;
+    case  BUTTON_SW3_PIN:
+      break;
+    default:
+      break;
+  }
+}
+
+static void SendSigfox(void)
+{
+  uint8_t ul_msg[12] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11};
+  uint8_t dl_msg[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  uint32_t  ul_size = 0;
+  int16_t temperature = SYS_GetTemperatureLevel() >> 8;
+  uint16_t batteryLevel = SYS_GetBatteryLevel();
+  uint32_t nbTxRepeatFlag = 1;
+  sensor_t sensor_data;
+  uint16_t pressure = 0;
+  uint16_t humidity = 0;
+
+  EnvSensors_Read(&sensor_data);
+  pressure    = (uint16_t)(sensor_data.pressure * 100 / 10);      /* in hPa / 10 */
+  humidity    = (uint16_t) sensor_data.humidity;
+
+  APP_LOG(TS_ON, VLEVEL_L, "sending temperature=%d degC,  battery=%d mV", temperature, batteryLevel);
+
+  ul_msg[ul_size++] = (uint8_t)((batteryLevel * 100) / 3300);
+  ul_msg[ul_size++] = (pressure >> 8) & 0xFF;
+  ul_msg[ul_size++] = pressure & 0xFF;
+  ul_msg[ul_size++] = (temperature >> 8) & 0xFF;
+  ul_msg[ul_size++] = temperature & 0xFF;
+  ul_msg[ul_size++] = (humidity >> 8) & 0xFF;
+  ul_msg[ul_size++] = humidity & 0xFF;
+
+  BSP_LED_On(LED_BLUE);
+
+  SIGFOX_API_send_frame(ul_msg, ul_size, dl_msg, nbTxRepeatFlag, SFX_FALSE);
+
+  BSP_LED_Off(LED_BLUE);
+
+  APP_LOG(TS_OFF, VLEVEL_L, " done\n\r");
+}
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.h
new file mode 100644
index 00000000..e9432537
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.h
@@ -0,0 +1,73 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_app.h
+  * @author  MCD Application Team
+  * @brief   provides code for the application of the SIGFOX Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SGFX_APP_H__
+#define __SGFX_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx.h"
+#include "stm32wlxx_hal.h"
+#include "adc_if.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define DEFAULT_RC SFX_RC1
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* Init Sigfox Application */
+void Sigfox_Init(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SGFX_APP_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h
new file mode 100644
index 00000000..a52b63af
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h
@@ -0,0 +1,95 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_app_version.h
+  * @author  MCD Application Team
+  * @brief   Definition the version of the CM4 application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_VERSION_H__
+#define __APP_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
+#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
+
+#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
+#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
+#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
+#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Application version
+  */
+#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
+                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
+                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
+                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
+
+/**
+  * @brief Sigfox CM4 application version
+  */
+#define __CM4_APP_VERSION             __APP_VERSION
+
+/**
+  * @brief Sigfox CM0PLUS minimum required version
+  */
+#define __LAST_COMPATIBLE_CM0_RELEASE __APP_VERSION
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_VERSION_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c
new file mode 100644
index 00000000..6a2ab9e9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c
@@ -0,0 +1,660 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_eeprom_if.c
+  * @author  MCD Application Team
+  * @brief   eeprom interface to the sigfox component
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+#include "sgfx_eeprom_if.h"
+#include "system_mbwrapper.h"
+#include "st_sigfox_api.h"
+#include "se_nvm.h"
+#include "sys_conf.h"
+#include "utilities_conf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+#define EEPROM_IF_FLASH_LOCK()
+#define EEPROM_IF_FLASH_UNLOCK()
+enum
+{
+  EE_BANK_0 = 0,
+  EE_BANK_1 = 1
+};
+
+enum
+{
+  EE_CLEAN_MODE_POLLING = 0,
+  EE_CLEAN_MODE_IT = 1
+};
+
+enum
+{
+  NO_FORMAT =         0,
+  FORMAT =            1
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief        Read Sigfox Configuration from eeprom
+  * @param addr   variable virtual address
+  * @param data   pointer to a 32-bit word (allocated by the caller) containing the
+  *               variable value in case of success.
+  */
+static void E2P_Read(e_EE_ID addr, uint32_t *data);
+
+/**
+  * @brief        Write Sigfox Configuration to eeprom
+  * @param addr   variable virtual address
+  * @param data   32-bit data word to be written
+  */
+static void E2P_Write(e_EE_ID addr, uint32_t data);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void E2P_RestoreFs(void)
+{
+  /* USER CODE BEGIN E2P_RestoreFs_1 */
+
+  /* USER CODE END E2P_RestoreFs_1 */
+  uint32_t rc3a_config[] = RC3A_CONFIG;
+  uint32_t rc3c_config[] = RC3C_CONFIG;
+  uint32_t rc5_config[] = RC5_CONFIG;
+
+  E2P_Write(EE_RSSI_CAL_ID, 0);
+  E2P_Write(EE_AT_ECHO_ID, 1);   /* AtEcho  =  Set */
+  E2P_Write(EE_TX_POWER_RC1_ID, 13);
+  E2P_Write(EE_TX_POWER_RC2_ID, 22);
+  E2P_Write(EE_TX_POWER_RC3A_ID, 13);
+  E2P_Write(EE_TX_POWER_RC3C_ID, 13);
+  E2P_Write(EE_TX_POWER_RC4_ID, 22);
+  E2P_Write(EE_TX_POWER_RC5_ID, 12);
+  E2P_Write(EE_TX_POWER_RC6_ID, 13);
+  E2P_Write(EE_TX_POWER_RC7_ID, 13);
+  E2P_Write(EE_SGFX_RC_ID, SFX_RC1);    /* Default RC at device birth*/
+  E2P_Write(EE_SGFX_KEYTYPE_ID, CREDENTIALS_KEY_PRIVATE);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC2_ID, RC2_SET_STD_CONFIG_SM_WORD_0);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC2_ID, RC2_SET_STD_CONFIG_SM_WORD_1);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC2_ID, RC2_SET_STD_CONFIG_SM_WORD_2);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC3A_ID, rc3a_config[0]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC3A_ID, rc3a_config[1]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC3A_ID, rc3a_config[2]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC3C_ID, rc3c_config[0]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC3C_ID, rc3c_config[1]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC3C_ID, rc3c_config[2]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC4_ID, RC4_SET_STD_CONFIG_SM_WORD_0);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC4_ID, RC4_SET_STD_CONFIG_SM_WORD_1);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC4_ID, RC4_SET_STD_CONFIG_SM_WORD_2);
+  E2P_Write(EE_MACROCH_CONFIG_WORD0_RC5_ID, rc5_config[0]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD1_RC5_ID, rc5_config[1]);
+  E2P_Write(EE_MACROCH_CONFIG_WORD2_RC5_ID, rc5_config[2]);
+  E2P_Write(EE_SE_NVM_0_ID, 0xFF);
+  E2P_Write(EE_SE_NVM_1_ID, 0x0F);
+  E2P_Write(EE_SE_NVM_2_ID, 0);
+  E2P_Write(EE_SE_NVM_3_ID, 0);
+  E2P_Write(EE_SE_NVM_4_ID, 0xFF);
+  E2P_Write(EE_MCU_NVM_0_ID, 0);
+  E2P_Write(EE_MCU_NVM_1_ID, 0);
+  E2P_Write(EE_MCU_NVM_2_ID, 0);
+  E2P_Write(EE_MCU_NVM_3_ID, 0);
+  E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, 0);
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, VERBOSE_LEVEL);
+
+  /* USER CODE BEGIN E2P_RestoreFs_2 */
+
+  /* USER CODE END E2P_RestoreFs_2 */
+}
+
+int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc)
+{
+  /* USER CODE BEGIN E2P_Read_Power_1 */
+
+  /* USER CODE END E2P_Read_Power_1 */
+  uint32_t power ;
+  switch (SgfxRc)
+  {
+    case SFX_RC1:
+      E2P_Read(EE_TX_POWER_RC1_ID, &power);
+      break;
+    case SFX_RC2:
+      E2P_Read(EE_TX_POWER_RC2_ID, &power);
+      break;
+    case SFX_RC3A:
+      E2P_Read(EE_TX_POWER_RC3A_ID, &power);
+      break;
+    case SFX_RC3C:
+      E2P_Read(EE_TX_POWER_RC3C_ID, &power);
+      break;
+    case SFX_RC4:
+      E2P_Read(EE_TX_POWER_RC4_ID, &power);
+      break;
+    case SFX_RC5:
+      E2P_Read(EE_TX_POWER_RC5_ID, &power);
+      break;
+    case SFX_RC6:
+      E2P_Read(EE_TX_POWER_RC6_ID, &power);
+      break;
+    case SFX_RC7:
+      E2P_Read(EE_TX_POWER_RC7_ID, &power);
+      break;
+    default:
+      break;
+  }
+  return (int8_t) power;
+  /* USER CODE BEGIN E2P_Read_Power_2 */
+
+  /* USER CODE END E2P_Read_Power_2 */
+}
+
+void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power)
+{
+  /* USER CODE BEGIN E2P_Write_Power_1 */
+
+  /* USER CODE END E2P_Write_Power_1 */
+
+  switch (SgfxRc)
+  {
+    case SFX_RC1:
+      E2P_Write(EE_TX_POWER_RC1_ID, (uint32_t) power);
+      break;
+    case SFX_RC2:
+      E2P_Write(EE_TX_POWER_RC2_ID, (uint32_t) power);
+      break;
+    case SFX_RC3A:
+      E2P_Write(EE_TX_POWER_RC3A_ID, (uint32_t) power);
+      break;
+    case SFX_RC3C:
+      E2P_Write(EE_TX_POWER_RC3C_ID, (uint32_t) power);
+      break;
+    case SFX_RC4:
+      E2P_Write(EE_TX_POWER_RC4_ID, (uint32_t) power);
+      break;
+    case SFX_RC5:
+      E2P_Write(EE_TX_POWER_RC5_ID, (uint32_t) power);
+      break;
+    case SFX_RC6:
+      E2P_Write(EE_TX_POWER_RC6_ID, (uint32_t) power);
+      break;
+    case SFX_RC7:
+      E2P_Write(EE_TX_POWER_RC7_ID, (uint32_t) power);
+      break;
+    default:
+      break;
+  }
+
+  /* USER CODE BEGIN E2P_Write_Power_2 */
+
+  /* USER CODE END E2P_Write_Power_2 */
+}
+
+sfx_rc_enum_t E2P_Read_Rc(void)
+{
+  /* USER CODE BEGIN E2P_Read_Rc_1 */
+
+  /* USER CODE END E2P_Read_Rc_1 */
+  uint32_t SgfxRc ;
+  E2P_Read(EE_SGFX_RC_ID, &SgfxRc);
+  return (sfx_rc_enum_t) SgfxRc;
+  /* USER CODE BEGIN E2P_Read_Rc_2 */
+
+  /* USER CODE END E2P_Read_Rc_2 */
+}
+
+void E2P_Write_Rc(sfx_rc_enum_t SgfxRc)
+{
+  /* USER CODE BEGIN E2P_Write_Rc_1 */
+
+  /* USER CODE END E2P_Write_Rc_1 */
+
+  E2P_Write(EE_SGFX_RC_ID, (uint32_t) SgfxRc);
+
+  /* USER CODE BEGIN E2P_Write_Rc_2 */
+
+  /* USER CODE END E2P_Write_Rc_2 */
+}
+
+int16_t E2P_Read_RssiCal(void)
+{
+  /* USER CODE BEGIN E2P_Read_RssiCal_1 */
+
+  /* USER CODE END E2P_Read_RssiCal_1 */
+  uint32_t rssi_cal ;
+  E2P_Read(EE_RSSI_CAL_ID, &rssi_cal);
+  return (int16_t) rssi_cal;
+  /* USER CODE BEGIN E2P_Read_RssiCal_2 */
+
+  /* USER CODE END E2P_Read_RssiCal_2 */
+}
+
+void E2P_Write_RssiCal(int16_t rssi_cal)
+{
+  /* USER CODE BEGIN E2P_Write_RssiCal_1 */
+
+  /* USER CODE END E2P_Write_RssiCal_1 */
+
+  E2P_Write(EE_RSSI_CAL_ID, (uint32_t) rssi_cal);
+
+  /* USER CODE BEGIN E2P_Write_RssiCal_2 */
+
+  /* USER CODE END E2P_Write_RssiCal_2 */
+}
+
+uint32_t E2P_Read_AtEcho(void)
+{
+  /* USER CODE BEGIN E2P_Read_AtEcho_1 */
+
+  /* USER CODE END E2P_Read_AtEcho_1 */
+  uint32_t at_echo ;
+  E2P_Read(EE_AT_ECHO_ID, &at_echo);
+  return (E2P_flagStatus_t) at_echo;
+  /* USER CODE BEGIN E2P_Read_AtEcho_2 */
+
+  /* USER CODE END E2P_Read_AtEcho_2 */
+}
+
+void E2P_Write_AtEcho(uint32_t at_echo)
+{
+  /* USER CODE BEGIN E2P_Write_AtEcho_1 */
+
+  /* USER CODE END E2P_Write_AtEcho_1 */
+
+  E2P_Write(EE_AT_ECHO_ID, (uint32_t) at_echo);
+
+  /* USER CODE BEGIN E2P_Write_AtEcho_2 */
+
+  /* USER CODE END E2P_Write_AtEcho_2 */
+}
+
+sfx_key_type_t E2P_Read_KeyType(void)
+{
+  /* USER CODE BEGIN E2P_Read_KeyType_1 */
+
+  /* USER CODE END E2P_Read_KeyType_1 */
+  uint32_t data_from_eeprom;
+  E2P_Read(EE_SGFX_KEYTYPE_ID, &data_from_eeprom);
+  return (sfx_key_type_t) data_from_eeprom;
+  /* USER CODE BEGIN E2P_Read_KeyType_2 */
+
+  /* USER CODE END E2P_Read_KeyType_2 */
+}
+
+void E2P_Write_KeyType(sfx_key_type_t key_type)
+{
+  /* USER CODE BEGIN E2P_Write_KeyType_1 */
+
+  /* USER CODE END E2P_Write_KeyType_1 */
+
+  E2P_Write(EE_SGFX_KEYTYPE_ID, (uint32_t) key_type);
+
+  /* USER CODE BEGIN E2P_Write_KeyType_2 */
+
+  /* USER CODE END E2P_Write_KeyType_2 */
+}
+
+uint8_t E2P_Read_EncryptionFlag(void)
+{
+  /* USER CODE BEGIN E2P_Read_EncryptionFlag_1 */
+
+  /* USER CODE END E2P_Read_EncryptionFlag_1 */
+  uint32_t data_from_eeprom;
+  E2P_Read(EE_SGFX_ENCRYPTIONFLAG_ID, &data_from_eeprom);
+  return (uint8_t) data_from_eeprom;
+  /* USER CODE BEGIN E2P_Read_EncryptionFlag_2 */
+
+  /* USER CODE END E2P_Read_EncryptionFlag_2 */
+}
+
+void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag)
+{
+  /* USER CODE BEGIN E2P_Write_EncryptionFlag_1 */
+
+  /* USER CODE END E2P_Write_EncryptionFlag_1 */
+
+  E2P_Write(EE_SGFX_ENCRYPTIONFLAG_ID, (uint32_t) encryption_flag);
+
+  /* USER CODE BEGIN E2P_Write_EncryptionFlag_2 */
+
+  /* USER CODE END E2P_Write_EncryptionFlag_2 */
+}
+
+uint8_t E2P_Read_VerboseLevel(void)
+{
+  /* USER CODE BEGIN E2P_Read_VerboseLevel_1 */
+
+  /* USER CODE END E2P_Read_VerboseLevel_1 */
+  uint32_t data_from_eeprom;
+  E2P_Read(EE_SGFX_VERBOSELEVEL_ID, &data_from_eeprom);
+  return (uint8_t) data_from_eeprom;
+  /* USER CODE BEGIN E2P_Read_VerboseLevel_2 */
+
+  /* USER CODE END E2P_Read_VerboseLevel_2 */
+}
+
+void E2P_Write_VerboseLevel(uint8_t verboselevel)
+{
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_1 */
+
+  /* USER CODE END E2P_Write_VerboseLevel_1 */
+
+  E2P_Write(EE_SGFX_VERBOSELEVEL_ID, (uint32_t) verboselevel);
+
+  /* USER CODE BEGIN E2P_Write_VerboseLevel_2 */
+
+  /* USER CODE END E2P_Write_VerboseLevel_2 */
+}
+
+void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
+{
+  /* USER CODE BEGIN E2P_Read_ConfigWords_1 */
+
+  /* USER CODE END E2P_Read_ConfigWords_1 */
+  switch (sfx_rc)
+  {
+    case SFX_RC1:
+    {
+      break;
+    }
+    case SFX_RC2:
+    {
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC2_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC2_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC2_ID, (uint32_t *) &config_words[2]);
+      break;
+    }
+    case SFX_RC3A:
+    {
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC3A_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC3A_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC3A_ID, (uint32_t *) &config_words[2]);
+
+      break;
+    }
+    case SFX_RC3C:
+    {
+
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC3C_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC3C_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC3C_ID, (uint32_t *) &config_words[2]);
+
+      break;
+    }
+    case SFX_RC4:
+    {
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC4_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC4_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC4_ID, (uint32_t *) &config_words[2]);
+      break;
+    }
+    case SFX_RC5:
+    {
+      E2P_Read(EE_MACROCH_CONFIG_WORD0_RC5_ID, (uint32_t *) &config_words[0]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD1_RC5_ID, (uint32_t *) &config_words[1]);
+      E2P_Read(EE_MACROCH_CONFIG_WORD2_RC5_ID, (uint32_t *) &config_words[2]);
+
+      break;
+    }
+    case SFX_RC6:
+    {
+      break;
+    }
+    case SFX_RC7:
+    {
+      break;
+    }
+    default:
+      break;
+  }
+  /* USER CODE BEGIN E2P_Read_ConfigWords_2 */
+
+  /* USER CODE END E2P_Read_ConfigWords_2 */
+}
+
+void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3])
+{
+  /* USER CODE BEGIN E2P_Write_ConfigWords_1 */
+
+  /* USER CODE END E2P_Write_ConfigWords_1 */
+
+  switch (sfx_rc)
+  {
+    case SFX_RC1:
+    {
+      break;
+    }
+    case SFX_RC2:
+    {
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC2_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC2_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC2_ID, config_words[2]);
+      break;
+    }
+    case SFX_RC3A:
+    {
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC3A_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC3A_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC3A_ID, config_words[2]);
+
+      break;
+    }
+    case SFX_RC3C:
+    {
+
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC3C_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC3C_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC3C_ID, config_words[2]);
+
+      break;
+    }
+    case SFX_RC4:
+    {
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC4_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC4_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC4_ID, config_words[2]);
+      break;
+    }
+    case SFX_RC5:
+    {
+      E2P_Write(EE_MACROCH_CONFIG_WORD0_RC5_ID, config_words[0]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD1_RC5_ID, config_words[1]);
+      E2P_Write(EE_MACROCH_CONFIG_WORD2_RC5_ID, config_words[2]);
+      break;
+    }
+    case SFX_RC6:
+    {
+      break;
+    }
+    case SFX_RC7:
+    {
+      break;
+    }
+    default:
+      break;
+  }
+
+  /* USER CODE BEGIN E2P_Write_ConfigWords_2 */
+
+  /* USER CODE END E2P_Write_ConfigWords_2 */
+}
+
+E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len)
+{
+  /* USER CODE BEGIN E2P_Read_SeNvm_1 */
+
+  /* USER CODE END E2P_Read_SeNvm_1 */
+  E2P_ErrorStatus_t error = E2P_OK;
+  int32_t i = 0;
+  uint32_t data_from_eeprom;
+
+  E2P_Read(EE_SE_NVM_0_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_SE_NVM_1_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_SE_NVM_2_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_SE_NVM_3_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_SE_NVM_4_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+
+  if (i != len)
+  {
+    error =  E2P_KO;
+  }
+  return error;
+  /* USER CODE BEGIN E2P_Read_SeNvm_2 */
+
+  /* USER CODE END E2P_Read_SeNvm_2 */
+}
+
+E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write,  uint32_t len)
+{
+  /* USER CODE BEGIN E2P_Write_SeNvm_1 */
+
+  /* USER CODE END E2P_Write_SeNvm_1 */
+  E2P_ErrorStatus_t error = E2P_OK;
+  int32_t i = 0;
+
+  E2P_Write(EE_SE_NVM_0_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_SE_NVM_1_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_SE_NVM_2_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_SE_NVM_3_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_SE_NVM_4_ID, (uint32_t) data_to_write[i++]);
+
+  if (i != len)
+  {
+    error =  E2P_KO;
+  }
+  return error;
+  /* USER CODE BEGIN E2P_Write_SeNvm_2 */
+
+  /* USER CODE END E2P_Write_SeNvm_2 */
+}
+
+E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data, uint32_t len)
+{
+  /* USER CODE BEGIN E2P_Read_McuNvm_1 */
+
+  /* USER CODE END E2P_Read_McuNvm_1 */
+  E2P_ErrorStatus_t error = E2P_OK;
+  int32_t i = 0;
+  uint32_t data_from_eeprom;
+  E2P_Read(EE_MCU_NVM_0_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_MCU_NVM_1_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_MCU_NVM_2_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  E2P_Read(EE_MCU_NVM_3_ID, &data_from_eeprom);
+  read_data[i++] = (sfx_u8) data_from_eeprom;
+  if (i != len)
+  {
+    error =  E2P_KO;
+  }
+  return error;
+  /* USER CODE BEGIN E2P_Read_McuNvm_2 */
+
+  /* USER CODE END E2P_Read_McuNvm_2 */
+}
+
+E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len)
+{
+  /* USER CODE BEGIN E2P_Write_McuNvm_1 */
+
+  /* USER CODE END E2P_Write_McuNvm_1 */
+  E2P_ErrorStatus_t error = E2P_OK;
+  int32_t i = 0;
+
+  E2P_Write(EE_MCU_NVM_0_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_MCU_NVM_1_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_MCU_NVM_2_ID, (uint32_t) data_to_write[i++]);
+  E2P_Write(EE_MCU_NVM_3_ID, (uint32_t) data_to_write[i++]);
+
+  if (i != len)
+  {
+    error =  E2P_KO;
+  }
+  return error;
+  /* USER CODE BEGIN E2P_Write_McuNvm_2 */
+
+  /* USER CODE END E2P_Write_McuNvm_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+static void E2P_Write(e_EE_ID addr, uint32_t data)
+{
+  /* USER CODE BEGIN E2P_Write_1 */
+
+  /* USER CODE END E2P_Write_1 */
+  SYS_EE_WriteBuffer_mbwrapper(addr, data);
+  /* USER CODE BEGIN E2P_Write_2 */
+
+  /* USER CODE END E2P_Write_2 */
+}
+
+static void E2P_Read(e_EE_ID addr, uint32_t *data)
+{
+  /* USER CODE BEGIN E2P_Read_1 */
+
+  /* USER CODE END E2P_Read_1 */
+  SYS_EE_ReadBuffer_mbwrapper(addr, data);
+  /* USER CODE BEGIN E2P_Read_2 */
+
+  /* USER CODE END E2P_Read_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h
new file mode 100644
index 00000000..e6993155
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h
@@ -0,0 +1,291 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sgfx_eeprom_if.h
+  * @author  MCD Application Team
+  * @brief   eeprom interface to the upper module.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SGFX_EEPROM_IF_H__
+#define __SGFX_EEPROM_IF_H__
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "sigfox_types.h"
+#include "st_sigfox_api.h"
+#include "se_nvm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+#if defined(__CC_ARM) /* when changing tool chain the EEPROM shall be re-initialized */
+  E2P_SET = (uint32_t)0xAA,   /* Set by Keil */
+#elif defined(__ICCARM__)
+  E2P_SET = (uint32_t) 0xBB,   /* Set by IAR */
+#else  /* __GNUC__ */
+  E2P_SET = (uint32_t) 0xCC,   /* Set by GCC */
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+  E2P_RST = (uint32_t)  0     /* EEPROM has not yet been set or has been erased */
+} E2P_flagStatus_t;
+
+typedef enum
+{
+  E2P_OK = (uint32_t)1,   /* Set by Keil */
+  E2P_KO = (uint32_t)0     /* EEPROM has not yet been set or has been erased */
+} E2P_ErrorStatus_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+typedef enum
+{
+  EE_INIT_ID = 0,
+  EE_SE_NVM_0_ID,
+  EE_SE_NVM_1_ID,
+  EE_SE_NVM_2_ID,
+  EE_SE_NVM_3_ID,
+  EE_SE_NVM_4_ID,
+  EE_MCU_NVM_0_ID,
+  EE_MCU_NVM_1_ID,
+  EE_MCU_NVM_2_ID,
+  EE_MCU_NVM_3_ID,
+  /*Public ID e.g. visible on M4 starting at EE_ID=EE_RSSI_CAL_ID */
+  EE_RSSI_CAL_ID = 100,
+  EE_AT_ECHO_ID,
+  EE_TX_POWER_RC1_ID,
+  EE_TX_POWER_RC2_ID,
+  EE_TX_POWER_RC3A_ID,
+  EE_TX_POWER_RC3C_ID,
+  EE_TX_POWER_RC4_ID,
+  EE_TX_POWER_RC5_ID,
+  EE_TX_POWER_RC6_ID,
+  EE_TX_POWER_RC7_ID,
+  EE_SGFX_RC_ID,
+  EE_SGFX_KEYTYPE_ID,
+  EE_MACROCH_CONFIG_WORD0_RC2_ID,
+  EE_MACROCH_CONFIG_WORD1_RC2_ID,
+  EE_MACROCH_CONFIG_WORD2_RC2_ID,
+  EE_MACROCH_CONFIG_WORD0_RC3A_ID,
+  EE_MACROCH_CONFIG_WORD1_RC3A_ID,
+  EE_MACROCH_CONFIG_WORD2_RC3A_ID,
+  EE_MACROCH_CONFIG_WORD0_RC3C_ID,
+  EE_MACROCH_CONFIG_WORD1_RC3C_ID,
+  EE_MACROCH_CONFIG_WORD2_RC3C_ID,
+  EE_MACROCH_CONFIG_WORD0_RC4_ID,
+  EE_MACROCH_CONFIG_WORD1_RC4_ID,
+  EE_MACROCH_CONFIG_WORD2_RC4_ID,
+  EE_MACROCH_CONFIG_WORD0_RC5_ID,
+  EE_MACROCH_CONFIG_WORD1_RC5_ID,
+  EE_MACROCH_CONFIG_WORD2_RC5_ID,
+  EE_SGFX_ENCRYPTIONFLAG_ID,
+  EE_SGFX_VERBOSELEVEL_ID,
+  EE_ID_COUNT,
+} e_EE_ID;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+
+/*!
+ * @brief Initializes the Eeprom
+ * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ */
+void E2P_Init(void);
+
+/*!
+ * @brief Initializes the Eeprom
+ * @note  DEFAULT_FACTORY_SETTINGS are written E2pData
+ */
+void E2P_RestoreFs(void);
+
+/*!
+ * @brief  Read Output Power
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @return Output Power
+ */
+int8_t E2P_Read_Power(sfx_rc_enum_t SgfxRc);
+
+/*!
+ * @brief  Write Output Power to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ * @param  power Output Power
+ */
+void E2P_Write_Power(sfx_rc_enum_t SgfxRc, int8_t power);
+
+/*!
+ * @brief  Read Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return Region Configuration RC
+ */
+sfx_rc_enum_t E2P_Read_Rc(void);
+
+/*!
+ * @brief  Write Region Configuration RC from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  SgfxRc Region Configuration RC
+ */
+void E2P_Write_Rc(sfx_rc_enum_t SgfxRc);
+
+/*!
+ * @brief  Read Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
+ */
+void E2P_Read_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
+
+/*!
+ * @brief  Write Region Configuration words depending on RC
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  sfx_rc Region Configuration RC
+ * @param  config_words Configuration words
+ */
+void E2P_Write_ConfigWords(sfx_rc_enum_t sfx_rc, sfx_u32 config_words[3]);
+
+/*!
+ * @brief  Read rssi calibration value from eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @return rssi calibration value
+ */
+int16_t E2P_Read_RssiCal(void);
+
+/*!
+ * @brief  Writes rssi calibration value to eeprom
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  rssi_cal calibration value
+ */
+void E2P_Write_RssiCal(int16_t rssi_cal);
+
+/*!
+ * @brief  Read Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @retval at_echo
+ */
+uint32_t E2P_Read_AtEcho(void);
+
+/*!
+ * @brief  Write Region At echo setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  at_echo
+ */
+void E2P_Write_AtEcho(uint32_t at_echo);
+
+/*!
+ * @brief  Read KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @retval KeyType
+ */
+sfx_key_type_t E2P_Read_KeyType(void);
+
+/*!
+ * @brief  Write KeyType setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  key_type KeyType setting
+ */
+void E2P_Write_KeyType(sfx_key_type_t key_type);
+
+/*!
+ * @brief  Read EncryptionFlag setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @retval encryption_flag
+ */
+uint8_t E2P_Read_EncryptionFlag(void);
+
+/*!
+ * @brief  Write EncryptionFlag  setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  encryption_flag
+ */
+void E2P_Write_EncryptionFlag(sfx_u8 encryption_flag);
+
+/*!
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data SEnvm
+ * @param  len
+ * @retval error status
+ */
+E2P_ErrorStatus_t E2P_Read_SeNvm(sfx_u8 *read_data, uint32_t len);
+
+/*!
+ * @brief  Write Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write SEnvm
+ * @param  len
+ * @retval error status
+ */
+E2P_ErrorStatus_t E2P_Write_SeNvm(sfx_u8 *data_to_write, uint32_t len);
+
+/*!
+ * @brief  Read MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  read_data MCUnvm
+ * @param  len
+ * @retval error status
+ */
+E2P_ErrorStatus_t E2P_Read_McuNvm(sfx_u8 *read_data,  uint32_t len);
+
+/*!
+ * @brief  Write Region MCUnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  data_to_write MCUnvm
+ * @param  len
+ * @retval error status
+ */
+E2P_ErrorStatus_t E2P_Write_McuNvm(sfx_u8 *data_to_write, uint32_t len);
+
+/*!
+ * @brief  Read Region SEnvm setting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @retval the VL
+ */
+uint8_t E2P_Read_VerboseLevel(void);
+
+/*!
+ * @brief  Read verbose levelsetting
+ * @note   DEFAULT_FACTORY_SETTINGS are written E2pData
+ * @param  verboselevel
+ */
+void E2P_Write_VerboseLevel(uint8_t verboselevel);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#endif /* __SGFX_EEPROM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h
new file mode 100644
index 00000000..97cbfbee
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h
@@ -0,0 +1,122 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    se_nvm.h
+  * @author  MCD Application Team
+  * @brief   header to emulated SE nvm data
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SE_NVM_H__
+#define __SE_NVM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+typedef enum
+{
+  CREDENTIALS_KEY_PRIVATE = 0,   /* private key */
+  CREDENTIALS_KEY_PUBLIC  = 1,   /* public key  <i> 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF</i>.*/
+} sfx_key_type_t;
+
+typedef enum
+{
+  SE_NVMEM_SEQNUM         = 0,                 /*!< Index of nv memory for PN */
+  SE_NVMEM_RCSYNC_PERIOD  = 2,                 /*!< Index of nv memory for dedicated FH information */
+  SE_NVMEM_ROLLOVER       = 4,
+} se_nvmem_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define SFX_SE_NVMEM_BLOCK_SIZE  5
+#define SE_ERR_API_SE_NVM                 (sfx_u8)(0x4A)
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief     This function reads data pointed by read_data to non volatile memory
+  *
+  * @param[in] read_data Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
+  */
+sfx_u8 SE_NVM_get(sfx_u8 read_data[SFX_SE_NVMEM_BLOCK_SIZE]);
+
+/**
+  * @brief     This function write data pointed by data_to_write to non volatile memory
+  *
+  * @param[in] data_to_write Pointer to the data block to write with the data stored in memory
+  * @retval    SFX_ERR_NONE:                      No error
+  * @retval    SE_ERR_API_SE_NVM:                 SE nvmem error
+  */
+sfx_u8 SE_NVM_set(sfx_u8 data_to_write[SFX_SE_NVMEM_BLOCK_SIZE]);
+
+/**
+  * @brief     Get the active encryption payload flag
+  * @retval    encryption_flag 0:Off, 1:On
+  */
+sfx_u8 SE_NVM_get_encrypt_flag(void);
+
+/**
+  * @brief     Set the active encryption payload flag
+  * @param[in] encryption_flag 0:Off, 1:On
+  */
+void  SE_NVM_set_encrypt_flag(sfx_u8 encryption_flag);
+
+/**
+  * @brief     Get the active encryption key
+  * @return    key public or private
+  */
+sfx_key_type_t SE_NVM_get_key_type(void);
+
+/**
+  * @brief     Set the active encryption key
+  * @param[in] keyType key public or private
+  */
+void SE_NVM_set_key_type(sfx_key_type_t keyType);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SE_NVM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..af8588aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/features_info.h
new file mode 100644
index 00000000..9df16d26
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/features_info.h
@@ -0,0 +1,138 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    features_info.h
+  * @author  MCD Application Team
+  * @brief   Feature list and parameters TypeDefinitions
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYSTEM_INFO_H
+#define __SYSTEM_INFO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+/**
+  * @brief Feature enumeration
+  * @note This is the list of all available feature so far,
+          the one available in a given build are listed in the Feat_Info_Table[]
+          to keep compatibility, in order to add a feature
+          use a new value to the bottom without changing the existing order
+  */
+typedef enum
+{
+  FEAT_INFO_SYSTEM_ID = 0,
+  FEAT_INFO_SYSTEM_CMD_PRIO_A_ID,    /* = 1 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID, /* = 2 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_CMD_PRIO_B_ID,  /* = 3 : position should not change between revisions */
+  FEAT_INFO_SYSTEM_NOTIF_PRIO_B_ID,  /* = 4 : position should not change between revisions */
+  FEAT_INFO_KMS_ID,  /* = 5 : position should not change between revisions */
+  FEAT_INFO_TRACE_ID,  /* = 6 : position should not change between revisions */
+  FEAT_INFO_RADIO_ID,  /* = 7 : position should not change between revisions */
+  FEAT_INFO_LORAWAN_ID,  /* = 8 : position should not change between revisions */
+  FEAT_INFO_SIGFOX_ID,  /* = 9 : position should not change between revisions */
+  FEAT_INFO_WMBUS_ID,  /* = 10 : position should not change between revisions */
+  /* USER CODE BEGIN FEAT_INFO_IdTypeDef */
+
+  /* USER CODE END FEAT_INFO_IdTypeDef */
+  FEAT_INFO_CNT
+} FEAT_INFO_IdTypeDef;
+
+/**
+  * @brief Feature parameters
+  */
+typedef struct
+{
+  FEAT_INFO_IdTypeDef Feat_Info_Feature_Id;
+  uint32_t Feat_Info_Feature_Version;
+  uint32_t Feat_Info_Config_Size;
+  void *Feat_Info_Config_Ptr;
+} FEAT_INFO_Param_t;
+
+/**
+  * @brief Feature List
+  */
+typedef struct
+{
+  uint32_t Feat_Info_Cnt;
+  FEAT_INFO_Param_t *Feat_Info_TableAddress;
+} FEAT_INFO_List_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MAX_PARAM_OF_SYS_CMD_FUNCTIONS           7 /*!< Max number of parameters that the sys_cmd can use */
+#define MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS         5 /*!< Max number of parameters that the sys_notif can use */
+#define MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS     1 /*!< Max number of parameters that the sysA_cmd can use */
+#define MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS   1 /*!< Max number of parameters that the sysA_notif can use */
+#define MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS     1 /*!< Max number of parameters that the sysB_cmd can use */
+#define MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS   1 /*!< Max number of parameters that the sysB_notif can use */
+
+#define MAX_PARAM_OF_KMS_CMD_FUNCTIONS          12 /*!< Max number of parameters that the kms can use */
+#define MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS      11 /*!< Max number of parameters that the trace can use */
+#define MAX_PARAM_OF_RADIO_CMD_FUNCTIONS        15 /*!< Max number of parameters that the radio_cmd can use */
+#define MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS       4 /*!< Max number of parameters that the radio_notif can use */
+#define MAX_PARAM_OF_SIGFOX_CMD_FUNCTIONS       15 /*!< Max number of parameters that the sigfox_cmd can use */
+#define MAX_PARAM_OF_SIGFOX_NOTIF_FUNCTIONS      5 /*!< Max number of parameters that the sigfox_notif can use */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief  Init configuration params by calling specific feature xxx_info.c
+  */
+void FEAT_INFO_Init(void);
+/**
+  * @brief  Get the feature list ptr
+  * @return address of Feat_Info_List available in shared memory
+  */
+FEAT_INFO_List_t *FEAT_INFO_GetListPtr(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYSTEM_INFO_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h
new file mode 100644
index 00000000..84cb7539
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mbmux_table.h
+  * @author  MCD Application Team
+  * @brief   Maps the IPCC channels to memory buffers
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MBMUX_TABLE_H__
+#define __MBMUX_TABLE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal_ipcc.h"
+#include "features_info.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported constants --------------------------------------------------------*/
+#define  MBMUX_CHANNEL_NUMBER  IPCC_CHANNEL_NUMBER
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported types ------------------------------------------------------------*/
+
+typedef enum
+{
+  MBMUX_CMD_RESP  = 0x00U,  /*!< Channel direction Tx is used by an MCU to transmit */
+  MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
+} MBMUX_ComType_t;
+
+/* Shared memory tables */
+
+typedef struct
+{
+  uint32_t MsgId;
+  void (*MsgCm4Cb)(void *ComObj);
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
+  uint16_t ParamCnt;     /*!<  nr of words composing the message */
+  uint32_t *ParamBuf;
+  uint32_t ReturnVal;    /*!<  only used in RX */
+} MBMUX_ComParam_t;
+
+typedef struct
+{
+  MBMUX_ComParam_t        MBCmdRespParam[MBMUX_CHANNEL_NUMBER];
+  MBMUX_ComParam_t        MBNotifAckParam[MBMUX_CHANNEL_NUMBER];
+  uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
+  __IO uint16_t           SynchronizeCpusAtBoot;
+  uint16_t                ChipRevId;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/msg_id.h
new file mode 100644
index 00000000..a2cc312e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/msg_id.h
@@ -0,0 +1,198 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    msg_id.h
+  * @author  MCD Application Team
+  * @brief   MBMUX message ID enumeration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MSG_ID_H__
+#define __MSG_ID_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+
+typedef enum
+{
+  /* CmdResp */
+  SYS_GET_INFO_LIST_MSG_ID = 0,
+  SYS_REGISTER_FEATURE_MSG_ID,
+  SYS_EE_READ_ID,
+  SYS_EE_WRITE_ID,
+  /* NotifAck */
+  SYS_RTC_ALARM_MSG_ID,
+  SYS_OTHER_MSG_ID,
+  /* USER CODE BEGIN SYSTEM_MsgIdTypeDef */
+
+  /* USER CODE END SYSTEM_MsgIdTypeDef */
+  SYS_MSGID_LAST
+} SYSTEM_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  SIGFOX_START_ID = 0,
+  SIGFOX_STOP_ID,
+  SIGFOX_SEND_FRAME_DWNL_ID,
+  SIGFOX_SEND_BIT_ID,
+  SIGFOX_SEND_OOB_ID,
+  SIGFOX_SET_STD_ID,
+  SIGFOX_START_CONTINUOUS_ID,
+  SIGFOX_STOP_CONTINUOUS_ID,
+  SIGFOX_GET_VERSION_ID,
+  SIGFOX_GET_DEVICE_ID,
+  SIGFOX_GET_INIT_PAC_ID,
+  SIGFOX_SET_RCSYNC_PERIOD_ID,
+  SIGFOX_API_TEST_MODE_ID,
+  SIGFOX_API_MONARCH_TEST_MODE_ID,
+  SIGFOX_API_MONARCH_TEST_EXEC_RC_SCAN_ID,
+  SIGFOX_API_MONARCH_STOP_RC_SCAN_ID,
+  SIGFOX_EE_READ_ID,
+  SIGFOX_EE_WRITE_ID,
+  SIGFOX_INFO_INIT_ID,
+  /* NotifAck */
+  SIGFOX_MONARCH_RC_SCAN_CB_ID,
+  SIGFOX_GET_BATTERY_LEVEL_CB_ID,
+  SIGFOX_GET_TEMPERATURE_LEVEL_CB_ID,
+  /* USER CODE BEGIN Sigfox_MsgIdTypeDef */
+
+  /* USER CODE END Sigfox_MsgIdTypeDef */
+  SIGFOX_MSGID_LAST
+} Sigfox_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  RADIO_INIT_ID = 0,
+  RADIO_GET_STATUS_ID,
+  RADIO_SET_MODEM_ID,
+  RADIO_SET_CHANNEL_ID,
+  RADIO_IS_CHANNEL_FREE_ID,
+  RADIO_RANDOM_ID,
+  RADIO_SET_RX_CONFIG_ID,
+  RADIO_SET_TX_CONFIG_ID,
+  RADIO_CHECK_RF_FREQUENCY_ID,
+  RADIO_GET_TIME_ON_AIR_ID,
+  RADIO_SEND_ID,
+  RADIO_SLEEP_ID,
+  RADIO_STANDBY_ID,
+  RADIO_RX_ID,
+  RADIO_START_CAD_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
+  RADIO_RSSI_ID,
+  RADIO_WRITE_ID,
+  RADIO_READ_ID,
+  RADIO_WRITE_BUFFER_ID,
+  RADIO_READ_BUFFER_ID,
+  RADIO_SET_MAX_PAYLOAD_LENGTH_ID,
+  RADIO_SET_PUBLIC_NETWORK_ID,
+  RADIO_GET_WAKEUP_TIME_ID,
+  RADIO_IRQ_PROCESS_ID,
+  RADIO_RX_BOOSTED_ID,
+  RADIO_SET_RX_DUTY_CYCLE_ID,
+  RADIO_TX_PRBS_ID,
+  RADIO_TX_CW_ID,
+  RADIO_SET_RX_GENERIC_CONFIG_ID,
+  RADIO_SET_TX_GENERIC_CONFIG_ID,
+  /* NotifAck */
+  RADIO_TX_DONE_CB_ID,
+  RADIO_TX_TIMEOUT_CB_ID,
+  RADIO_RX_DONE_CB_ID,
+  RADIO_RX_TIMEOUT_CB_ID,
+  RADIO_RX_ERROR_CB_ID,
+  RADIO_FHSS_CHANGE_CHANNEL_CB_ID,
+  RADIO_CAD_DONE_CB_ID,
+  /* USER CODE BEGIN RADIO_MsgIdTypeDef */
+
+  /* USER CODE END RADIO_MsgIdTypeDef */
+  RADIO_MSGID_LAST
+} RADIO_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  KMS_INIT_ID = 0,
+  KMS_OPEN_SESSION_ID,
+  KMS_CLOSE_SESSION_ID,
+  KMS_ENCRYPT_ID,
+  KMS_DECRYPT_ID,
+  KMS_DERIVE_KEY_ID,
+  KMS_CRYPTO_HMAC_SHA256_MSG_ID,
+  /* NotifAck */
+  /* USER CODE BEGIN KMS_MsgIdTypeDef */
+
+  /* USER CODE END KMS_MsgIdTypeDef */
+  KMS_MSGID_LAST
+} KMS_MsgIdTypeDef;
+
+typedef enum
+{
+  /* CmdResp */
+  TRACE_SEND_MSG_ID = 0,
+  /* NotifAck */
+  /* USER CODE BEGIN Trace_MsgIdTypeDef */
+
+  /* USER CODE END Trace_MsgIdTypeDef */
+  TRACE_MSGID_LAST
+} Trace_MsgIdTypeDef;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/* Dual core Init sequence */
+#define CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START  0xFFFF
+#define CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START    0x5555
+#define CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED    0xAAAA
+#define CPUS_BOOT_SYNC_RTC_REGISTERED         0x9999
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/sigfox_info.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/sigfox_info.h
new file mode 100644
index 00000000..099d2c78
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/MbMux/sigfox_info.h
@@ -0,0 +1,86 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sigfox_info.h
+  * @author  MCD Application Team
+  * @brief   To give info to the application about Sigfox configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#ifndef __SIGFOX_INFO_H__
+#define __SIGFOX_INFO_H__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdint.h>
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/*!
+ * To give info to the application about Sigfox capability
+ * it can depend how it has been compiled (e.g. compiled regions ...)
+ * Params should be better uint32_t foe easier alignment with info_table concept
+ */
+typedef struct
+{
+  uint32_t Region;   /*!< Combination of regions  */
+} SigfoxInfo_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize the SigfoxInfo capabilities table
+  */
+void SigfoxInfo_Init(void);
+
+/**
+  * @brief returns the pointer to the SigfoxInfo capabilities table
+  * @return  SigfoxInfo_t pointer
+  */
+SigfoxInfo_t *SigfoxInfo_GetPtr(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SIGFOX_INFO_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/sys_debug.c
new file mode 100644
index 00000000..d01a65d9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/sys_debug.c
@@ -0,0 +1,255 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.c
+  * @author  MCD Application Team
+  * @brief   Enables 4 debug pins for internal signals RealTime debugging
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sys_debug.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
+{
+  /* USER CODE BEGIN DBG_Init_1 */
+
+  /* USER CODE END DBG_Init_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull   = GPIO_PULLUP;
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
+#if defined(CORE_CM4)
+
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+#else /* CORE_CM0PLUS */
+
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
+
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /*spi dbg*/
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_SUBGHZSPI;
+  __HAL_RCC_GPIOA_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* Busy */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_12);
+  GPIO_InitStruct.Alternate  = GPIO_AF6_RF_BUSY;
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+#endif /* CORE_CM0PLUS */
+
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
+
+  /* USER CODE END DBG_ProbesInit_3 */
+
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
+
+  /* USER CODE END DBG_ProbesInit_Last */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/sys_debug.h
new file mode 100644
index 00000000..28890d05
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/sys_debug.h
@@ -0,0 +1,218 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.h
+  * @author  MCD Application Team
+  * @brief   Configuration of the debug.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_DEBUG_H__
+#define __SYS_DEBUG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sys_conf.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* Pin defines */
+
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
+#if defined(CORE_CM0PLUS)
+
+/**  Definition for Probe Line 1   **/
+/**
+  * @brief Pin of Probe Line 1
+  */
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
+
+/**
+  * @brief Port of Probe Line 1
+  */
+#define PROBE_LINE1_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 2   **/
+/**
+  * @brief Pin of Probe Line 2
+  */
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
+
+/**
+  * @brief Port of Probe Line 2
+  */
+#define PROBE_LINE2_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#else
+/**  Definition for Probe Line 3   **/
+/**
+  * @brief Pin of Probe Line 3
+  */
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
+
+/**
+  * @brief Port of Probe Line 3
+  */
+#define PROBE_LINE3_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 4   **/
+/**
+  * @brief Pin of Probe Line 4
+  */
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
+
+/**
+  * @brief Port of Probe Line 4
+  */
+#define PROBE_LINE4_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
+
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+
+/**
+  * @brief Set pin to high level
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+
+/**
+  * @brief Set pin to low level
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )
+
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#else
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
+  */
+void DBG_ProbesInit(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_DEBUG_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c
new file mode 100644
index 00000000..0b613924
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c
@@ -0,0 +1,387 @@
+/**
+  ******************************************************************************
+  * @file    system_stm32wlxx.c
+  * @author  MCD Application Team
+  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
+  *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  *   This file provides two functions and one global variable to be called from
+  *   user application:
+  *      - SystemInit(): This function is called at startup just after reset and
+  *                      before branch to main program. This call is made inside
+  *                      the "startup_stm32wlxx.s" file.
+  *
+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
+  *                                  by the user application to setup the SysTick
+  *                                  timer or configure other parameters.
+  *
+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
+  *                                 be called whenever the core clock is changed
+  *                                 during program execution.
+  *
+  *   After each device reset the MSI (4 MHz) is used as system clock source.
+  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
+  *   configure the system clock before to branch to main program.
+  *
+  *   This file configures the system clock as follows:
+  *=============================================================================
+  *-----------------------------------------------------------------------------
+  *        System Clock source                    | MSI
+  *-----------------------------------------------------------------------------
+  *        SYSCLK(Hz)                             | 4000000
+  *-----------------------------------------------------------------------------
+  *        HCLK(Hz)                               | 4000000
+  *-----------------------------------------------------------------------------
+  *        AHB Prescaler                          | 1
+  *-----------------------------------------------------------------------------
+  *        APB1 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        APB2 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_M                                  | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_N                                  | 8
+  *-----------------------------------------------------------------------------
+  *        PLL_P                                  | 7
+  *-----------------------------------------------------------------------------
+  *        PLL_Q                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLL_R                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_P                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_Q                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_R                              | NA
+  *-----------------------------------------------------------------------------
+  *        Require 48MHz for USB OTG FS,          | Disabled
+  *        SDIO and RNG clock                     |
+  *-----------------------------------------------------------------------------
+  *=============================================================================
+  */
+
+/** @addtogroup CMSIS
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_system
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_System_Private_Includes
+  * @{
+  */
+
+#include "stm32wlxx.h"
+
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (MSI_VALUE)
+   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
+#endif /* LSI_VALUE */
+
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Defines
+  * @{
+  */
+
+/* Note: Following vector table addresses must be defined in line with linker
+         configuration. */
+/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
+     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
+     at address 0x00 which correspond to automatic remap of boot address selected */
+/* #define USER_VECT_TAB_ADDRESS */
+#if defined(USER_VECT_TAB_ADDRESS)
+#ifdef CORE_CM0PLUS
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
+#else /* CORE_CM4 */
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+#endif
+#endif
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Variables
+  * @{
+  */
+  /* The SystemCoreClock variable is updated in three ways:
+      1) from within HAL_Init()
+      2) by calling CMSIS function SystemCoreClockUpdate()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
+  */
+  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
+
+  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
+
+  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
+
+  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
+    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Functions
+  * @{
+  */
+#if defined(__ARMCC_VERSION)
+extern void * __Vectors;
+#define INTVECT_START ((uint32_t) & __Vectors)
+#elif defined(__ICCARM__)
+extern uint32_t __vector_table;
+#define INTVECT_START ((uint32_t)& __vector_table)
+#elif defined(__GNUC__)
+extern void * g_pfnVectors;
+#define INTVECT_START ((uint32_t)& g_pfnVectors)
+#endif
+
+/**
+  * @brief  Setup the microcontroller system.
+  * @param  None
+  * @retval None
+  */
+void SystemInit(void)
+{
+  /* Configure the Vector Table location  ------------------*/
+  SCB->VTOR = INTVECT_START;
+
+  /* FPU settings ------------------------------------------------------------*/
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
+#endif
+
+  /* Reset the RCC clock configuration to the default reset state ------------*/
+  /* Set MSION bit */
+  RCC->CR |= RCC_CR_MSION;
+
+  /* Reset CFGR register */
+  RCC->CFGR = 0x00070000U;
+
+  /* Reset HSEON, CSSON , HSION, and PLLON bits */
+  /* RCC->CR &= 0xEAF6FFFFU; */
+  RCC->CR &= 0x2321EFF;
+
+  /* Reset PLLCFGR register */
+  RCC->PLLCFGR = 0x22040100;
+
+  /* Reset HSEBYP bit */
+  RCC->CR &= 0xFFDFFFFFFU;
+
+  /* Disable all interrupts */
+  RCC->CIER = 0x00000000U;
+}
+
+/**
+  * @brief  Update SystemCoreClock variable according to Clock Register Values.
+  *         The SystemCoreClock variable contains the core clock (HCLK), it can
+  *         be used by the user application to setup the SysTick timer or configure
+  *         other parameters.
+  *
+  * @note   Each time the core clock (HCLK) changes, this function must be called
+  *         to update SystemCoreClock variable value. Otherwise, any configuration
+  *         based on this variable will be incorrect.
+  *
+  * @note   - The system frequency computed by this function is not the real
+  *           frequency in the chip. It is calculated based on the predefined
+  *           constant and the selected clock source:
+  *
+  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
+  *
+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
+  *
+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
+  *
+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
+  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
+  *
+  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
+  *             4 MHz) but the real value may vary depending on the variations
+  *             in voltage and temperature.
+  *
+  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              16 MHz) but the real value may vary depending on the variations
+  *              in voltage and temperature.
+  *
+  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
+  *              frequency of the crystal used. Otherwise, this function may
+  *              have wrong result.
+  *
+  *         - The result of this function could be not correct when using fractional
+  *           value for HSE crystal.
+  *
+  * @param  None
+  * @retval None
+  */
+void SystemCoreClockUpdate(void)
+{
+  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
+
+ /* Get MSI Range frequency--------------------------------------------------*/
+
+   /* Get MSI Range frequency--------------------------------------------------*/
+   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
+   { /* MSISRANGE from RCC_CSR applies */
+     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
+   }
+   else
+   { /* MSIRANGE from RCC_CR applies */
+     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
+   }
+   /*MSI frequency range in HZ*/
+   msirange = MSIRangeTable[msirange];
+
+
+  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
+  /* Get SYSCLK source -------------------------------------------------------*/
+  switch (RCC->CFGR & RCC_CFGR_SWS)
+  {
+    case 0x00:   /* MSI used as system clock source */
+      SystemCoreClock = msirange;
+      break;
+
+    case 0x04:  /* HSI used as system clock source */
+      /* HSI used as system clock source */
+        SystemCoreClock = HSI_VALUE;
+      break;
+
+    case 0x08:  /* HSE used as system clock source */
+      SystemCoreClock = HSE_VALUE;
+      break;
+
+    case 0x0C: /* PLL used as system clock  source */
+      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
+         SYSCLK = PLL_VCO / PLLR
+         */
+      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
+      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
+
+      switch (pllsource)
+      {
+        case 0x02:  /* HSI used as PLL clock source */
+          pllvco = (HSI_VALUE / pllm);
+          break;
+
+        case 0x03:  /* HSE used as PLL clock source */
+          pllvco = (HSE_VALUE / pllm);
+          break;
+
+        default:    /* MSI used as PLL clock source */
+          pllvco = (msirange / pllm);
+          break;
+      }
+
+      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
+      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
+
+      SystemCoreClock = pllvco/pllr;
+      break;
+
+    default:
+      SystemCoreClock = msirange;
+      break;
+  }
+
+  /* Compute HCLK clock frequency --------------------------------------------*/
+#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
+  /* Get HCLK2 prescaler */
+  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
+#else
+  /* Get HCLK1 prescaler */
+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
+#endif
+
+  /* Core clock frequency */
+  SystemCoreClock = SystemCoreClock / tmp;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Project.eww
new file mode 100644
index 00000000..bce86dba
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Project.eww
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\Sigfox_PushButton_DualCore_CM0PLUS.ewp</path>
+  </project><project>
+    <path>$WS_DIR$\Sigfox_PushButton_DualCore_CM4.ewp</path>
+  </project>
+  <batchBuild />
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewd
new file mode 100644
index 00000000..d6c4e81c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>Sigfox_PushButton_DualCore_CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M0+.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M0+.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>32.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewp
new file mode 100644
index 00000000..70287496
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM0PLUS.ewp
@@ -0,0 +1,1383 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>Sigfox_PushButton_DualCore_CM0PLUS</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>Sigfox_PushButton_DualCore_CM0PLUS/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>Sigfox_PushButton_DualCore_CM0PLUS/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>Sigfox_PushButton_DualCore_CM0PLUS/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M0+	ST STM32WL55JC_M0+</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>35</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM0PLUS</state>
+                    <state>KMS_ENABLED</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                    <state>CMSIS_NVIC_VIRTUAL</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/KMS/App</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/Sigfox/App</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/Sigfox/Target</state>
+                    <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
+                    <state>$PROJ_DIR$/../Common/Board</state>
+                    <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Crypto</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/ST/STM32_Secure_Engine/Core</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Monarch</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SECoreBin\Inc</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\Common</state>
+                    <state>$PROJ_DIR$\..\..\2_Images_SBSFU\CM0PLUS\SBSFU\App</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>..\..\Sigfox_PushButton_DualCore_CM0PLUS.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\Sigfox_PushButton_DualCore_CM0PLUS.bin" 1 1"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Sigfox_PushButton_DualCore_CM0PLUS.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm0plus.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm0plus.s</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\svc_handler.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <group>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\flash_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\lptim.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\mn_lptim_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_privileged_services.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_privileged_wrap.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>KMS</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\KMS\App\app_kms.c</name>
+                        </file>
+                    </group>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sigfox.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\sigfox_mbwrapper.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Sigfox</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\app_sigfox.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\ee.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_cstimer.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\App\sgfx_eeprom_if.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mcu_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\mn_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\radio_board_if.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\rf_api.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\se_nvm.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\Sigfox\Target\sgfx_credentials.c</name>
+                        </file>
+                    </group>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Common\System\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_lptim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Middlewares</name>
+        <group>
+            <name>STM32_Secure_Engine</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\2_Images_SBSFU\EWARM\se_interface_appli.o</name>
+            </file>
+        </group>
+        <group>
+            <name>Sigfox</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.10.0_SE_FDL_MON.a</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\Sgfx-Cmac-V1.0.0-CM0-O3.a</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.1-CM0-O3.a</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_aes.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Crypto\sigfox_data.c</name>
+            </file>
+        </group>
+        <group>
+            <name>SubGHz_Phy</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Utilities</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
+        </file>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewd
new file mode 100644
index 00000000..fe027c72
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>Sigfox_PushButton_DualCore_CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>32.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewp
new file mode 100644
index 00000000..44c41bdf
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/Sigfox_PushButton_DualCore_CM4.ewp
@@ -0,0 +1,1289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>Sigfox_PushButton_DualCore_CM4</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>Sigfox_PushButton_DualCore_CM4/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>Sigfox_PushButton_DualCore_CM4/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>Sigfox_PushButton_DualCore_CM4/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../CM4/Core/Inc</state>
+                    <state>$PROJ_DIR$/../CM4/Sigfox/App</state>
+                    <state>$PROJ_DIR$/../CM4/Sigfox/Target</state>
+                    <state>$PROJ_DIR$/../CM4/MbMux</state>
+                    <state>$PROJ_DIR$/../Common/Board</state>
+                    <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/Monarch</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../Linker_Common/EWARM</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>..\..\Sigfox_PushButton_DualCore_CM4.bin</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild>cmd /C "cmd /C $PROJ_DIR$\..\..\2_Images_SECoreBin\EWARM\postbuild.bat "$PROJ_DIR$" "$TARGET_PATH$" "$PROJ_DIR$\Sigfox_PushButton_DualCore_CM4.bin" 2 1"</postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>Sigfox_PushButton_DualCore_CM4.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state>--config_search $PROJ_DIR$\..\..\Linker_Common\EWARM</state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <group>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\adc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_sensors.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sigfox.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\sigfox_mbwrapper.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\system_mbwrapper.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Sigfox</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\app_sigfox.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_app.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\Sigfox\App\sgfx_eeprom_if.c</name>
+                        </file>
+                    </group>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Common\System\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_ipcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_ll_adc.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Utilities</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
+        </file>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..cd6560d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,316 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : MO+ core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     TZIC_ILA_IRQHandler               ; TZIC ILA Interrupt
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     RTC_LSECSS_IRQHandler             ; RTC Wakeup, Tamper, TimeStamp, RTC Alarms (A & B) and RTC SSRU Interrupts and LSECSS Interrupts
+        DCD     RCC_FLASH_C1SEV_IRQHandler        ; RCC and FLASH and CPU1 M4 SEV Interrupt
+        DCD     EXTI1_0_IRQHandler                ; EXTI Line 1:0 Interrupt
+        DCD     EXTI3_2_IRQHandler                ; EXTI Line 3:2 Interrupt
+        DCD     EXTI15_4_IRQHandler               ; EXTI Line 15:4 interrupt
+        DCD     ADC_COMP_DAC_IRQHandler           ; ADC, COMP1, COMP2, DAC Interrupt
+        DCD     DMA1_Channel1_2_3_IRQHandler      ; DMA1 Channel 1 to 3 Interrupt
+        DCD     DMA1_Channel4_5_6_7_IRQHandler    ; DMA1 Channels 4,5,6,7 Interrupt 
+        DCD     DMA2_DMAMUX1_OVR_IRQHandler       ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+
+        DCD     TIM1_IRQHandler                   ; TIM1 Global Interrupt
+        DCD     TIM2_IRQHandler                     ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                    ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                    ; TIM17 Global Interrupt
+        DCD     IPCC_C2_RX_C2_TX_IRQHandler         ; IPCC RX Occupied and TX Free Interrupt Interrupt
+        DCD     HSEM_IRQHandler                     ; Semaphore Interrupt
+        DCD     RNG_IRQHandler                      ; RNG Interrupt
+        DCD     AES_PKA_IRQHandler                  ; AES and PKA Interrupt
+        DCD     I2C1_IRQHandler                     ; I2C1 Event and Error Interrupt
+        DCD     I2C2_IRQHandler                     ; I2C2 Event and Error Interrupt
+        DCD     I2C3_IRQHandler                     ; I2C3 Event and Error Interrupt
+        DCD     SPI1_IRQHandler                     ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                     ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                   ; USART1 Interrupt
+        DCD     USART2_IRQHandler                   ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                  ; LPUART1 Interrupt
+        DCD     SUBGHZSPI_IRQHandler                ; SUBGHZSPI Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler             ; SUBGHZ Radio Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK TZIC_ILA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TZIC_ILA_IRQHandler
+        B TZIC_ILA_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK RTC_LSECSS_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_LSECSS_IRQHandler
+        B RTC_LSECSS_IRQHandler
+
+        PUBWEAK RCC_FLASH_C1SEV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_FLASH_C1SEV_IRQHandler
+        B RCC_FLASH_C1SEV_IRQHandler
+
+        PUBWEAK EXTI1_0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_0_IRQHandler
+        B EXTI1_0_IRQHandler
+
+        PUBWEAK EXTI3_2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_2_IRQHandler
+        B EXTI3_2_IRQHandler
+
+        PUBWEAK EXTI15_4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_4_IRQHandler
+        B EXTI15_4_IRQHandler
+
+        PUBWEAK ADC_COMP_DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_COMP_DAC_IRQHandler
+        B ADC_COMP_DAC_IRQHandler
+
+        PUBWEAK DMA1_Channel1_2_3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_2_3_IRQHandler
+        B DMA1_Channel1_2_3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_5_6_7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_5_6_7_IRQHandler
+        B DMA1_Channel4_5_6_7_IRQHandler
+
+        PUBWEAK DMA2_DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_DMAMUX1_OVR_IRQHandler
+        B DMA2_DMAMUX1_OVR_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK TIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_IRQHandler
+        B TIM1_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK IPCC_C2_RX_C2_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C2_RX_C2_TX_IRQHandler
+        B IPCC_C2_RX_C2_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK AES_PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_PKA_IRQHandler
+        B AES_PKA_IRQHandler
+
+        PUBWEAK LCD_802_1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LCD_802_1_IRQHandler
+        B LCD_802_1_IRQHandler
+
+        PUBWEAK I2C1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_IRQHandler
+        B I2C1_IRQHandler
+
+        PUBWEAK I2C2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_IRQHandler
+        B I2C2_IRQHandler
+
+        PUBWEAK I2C3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_IRQHandler
+        B I2C3_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
new file mode 100644
index 00000000..2a6cd77e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -0,0 +1,51 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+/***** FLASH part dedicated to M0+ *****/
+define symbol __ICFEDIT_region_ROM_start__               = __ICFEDIT_SLOT_Active_1_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__                 = __ICFEDIT_SLOT_Active_1_end__;
+/***** SRAM2 shared allocated by M0+ *****/
+define symbol __ICFEDIT_region_RAM2_SHARED_start__       = __ICFEDIT_M0PLUS_SHARED_region_SRAM_start__;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__         = __ICFEDIT_M0PLUS_SHARED_region_SRAM_end__;
+/***** SRAM2 dedicated to M0+ *****/
+define symbol __ICFEDIT_region_RAM2_start__              = __ICFEDIT_SB_region_RAM_start__;
+define symbol __ICFEDIT_region_RAM2_end__                = __ICFEDIT_SB_region_RAM_end__;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x1000;
+define symbol __ICFEDIT_size_heap__ = 0x400;
+
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];
+define region RAM2_SHARED_region = mem:[from __ICFEDIT_region_RAM2_SHARED_start__  to __ICFEDIT_region_RAM2_SHARED_end__];
+define region RAM2_region     = mem:[from __ICFEDIT_region_RAM2_start__  to __ICFEDIT_region_RAM2_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit,
+                     section MB_MEM2 };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly, last section aes_block_padding };
+place in RAM2_region  { readwrite,
+                        block CSTACK, block HEAP };
+place in RAM2_SHARED_region  { section MB_MEM2 };
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..f451c3e2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,53 @@
+/*###ICF### Set of symbols used in UserApp project ****/
+
+define memory mem with size = 4G;
+
+/******************************************************************************/
+/*       Include of SBSFU symbols file                                        */
+/*   (Project>Options>Linker>Extra Options --config_search option is used to  */
+/*   specify the the directory to search for include files                    */
+/******************************************************************************/
+include "mapping_sbsfu.icf";
+include "mapping_fwimg.icf";
+
+/*-Memory Regions-*/
+/***** FLASH part dedicated to M4 *****/
+define symbol __ICFEDIT_region_ROM_start__               = __ICFEDIT_SLOT_Active_2_start__ + 512;
+define symbol __ICFEDIT_region_ROM_end__                 = __ICFEDIT_SLOT_Active_2_end__;
+/***** SRAM1 dedicated to M4 *****/
+define symbol __ICFEDIT_region_RAM_start__               = __ICFEDIT_M4_APP_region_RAM_start__;
+define symbol __ICFEDIT_region_RAM_end__                 = __ICFEDIT_M4_APP_region_RAM_end__;
+/***** SRAM2 shared allocated by M4 *****/
+define symbol __ICFEDIT_region_RAM2_SHARED_start__       = __ICFEDIT_M4_SHARED_region_SRAM_start__;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__         = __ICFEDIT_M4_SHARED_region_SRAM_end__;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x1000;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];
+define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__   to __ICFEDIT_region_RAM_end__];
+define region RAM2_SHARED_region = mem:[from __ICFEDIT_region_RAM2_SHARED_start__  to __ICFEDIT_region_RAM2_SHARED_end__];
+
+/* to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes) */
+define root section aes_block_padding with alignment=16
+{
+udata8 "Force Alignment";
+pad_to 16;
+};
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit,
+                     section MAPPING_TABLE,
+                     section MB_MEM1 };
+
+place at address mem:__ICFEDIT_region_ROM_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly, last section aes_block_padding };
+place in RAM_region   { readwrite,
+                        block CSTACK, block HEAP };
+place in RAM2_SHARED_region   { first section MAPPING_TABLE};
+place in RAM2_SHARED_region   { section MB_MEM1};
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/svc_handler.s
new file mode 100644
index 00000000..a3881e7c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/EWARM/svc_handler.s
@@ -0,0 +1,30 @@
+;/******************** (C) COPYRIGHT 2020 STMicroelectronics ********************
+;* File Name          : svc_handler.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;*  @attention
+;* 
+;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* 
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;* 
+;*******************************************************************************
+;
+;
+;
+; Cortex-M version
+;
+      SECTION .text:CODE:NOROOT:REORDER(2)
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT SVC_APP_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL SVC_APP_Handler
+        POP {PC}
+        END
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Project.uvmpw b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Project.uvmpw
new file mode 100644
index 00000000..7ec1daf9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Project.uvmpw
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectWorkspace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_mpw.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <WorkspaceName></WorkspaceName>
+
+  <project>
+    <PathAndName>.\Sigfox_PushButton_DualCore_CM0PLUS.uvprojx</PathAndName>
+    <NodeIsActive>1</NodeIsActive>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+  <project>
+    <PathAndName>.\Sigfox_PushButton_DualCore_CM4.uvprojx</PathAndName>
+    <NodeIsExpanded>1</NodeIsExpanded>
+    <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
+  </project>
+
+</ProjectWorkspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/STM32WL_CM0+.ini b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/STM32WL_CM0+.ini
new file mode 100644
index 00000000..d3f0855b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/STM32WL_CM0+.ini
@@ -0,0 +1,23 @@
+/******************************************************************************/
+/* STM32WL_CM0+.INI: CM0 CPU Initialization File                                           
+/******************************************************************************/
+/* <center>&copy; Copyright (c) 2019 STMicroelectronics. */
+/* * All rights reserved.</center>*/
+/*  *
+/*  * This software component is licensed by ST under BSD 3-Clause license,*/
+/*  * the "License"; You may not use this file except in compliance with the */
+/*  * License. You may obtain a copy of the License at:*/
+/*  *                        opensource.org/licenses/BSD-3-Clause*/
+/*  *
+/*  ****************************************************************************/
+/******************************************************************************/
+
+FUNC void Setup (void) {
+  SP = _RDWORD(0x08022200);          // Setup Stack Pointer
+  PC = _RDWORD(0x08022204);          // Setup Program Counter
+   
+}
+
+Setup();                             // Setup for Running
+
+
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvoptx
new file mode 100644
index 00000000..20e6bac0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvoptx
@@ -0,0 +1,1285 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>Sigfox_PushButton_DualCore_CM0PLUS</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile>.\STM32WL_CM0+.ini</tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U002F003A3038510534333935 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\svc_handler.s</PathWithFileName>
+      <FilenameWithoutPath>svc_handler.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Sigfox/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/app_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/ee.c</PathWithFileName>
+      <FilenameWithoutPath>ee.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_cstimer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Sigfox/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_credentials.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/mcu_api.c</PathWithFileName>
+      <FilenameWithoutPath>mcu_api.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/mn_api.c</PathWithFileName>
+      <FilenameWithoutPath>mn_api.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/rf_api.c</PathWithFileName>
+      <FilenameWithoutPath>rf_api.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Sigfox/Target/se_nvm.c</PathWithFileName>
+      <FilenameWithoutPath>se_nvm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/KMS/App/app_kms.c</PathWithFileName>
+      <FilenameWithoutPath>app_kms.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/lptim.c</PathWithFileName>
+      <FilenameWithoutPath>lptim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/flash_if.c</PathWithFileName>
+      <FilenameWithoutPath>flash_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/mn_lptim_if.c</PathWithFileName>
+      <FilenameWithoutPath>mn_lptim_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\sys_privileged_services.c</PathWithFileName>
+      <FilenameWithoutPath>sys_privileged_services.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\CM0PLUS\Core\Src\sys_privileged_wrap.c</PathWithFileName>
+      <FilenameWithoutPath>sys_privileged_wrap.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/features_info.c</PathWithFileName>
+      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/sigfox_info.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_info.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM0PLUS/MbMux/sigfox_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>54</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>55</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>56</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>57</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_lptim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>58</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>59</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>60</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>61</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gtzc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>11</GroupNumber>
+      <FileNumber>62</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>12</GroupNumber>
+      <FileNumber>63</FileNumber>
+      <FileType>3</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</PathWithFileName>
+      <FilenameWithoutPath>se_interface_appli.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/Sigfox</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>64</FileNumber>
+      <FileType>4</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>65</FileNumber>
+      <FileType>4</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.10.0_SE_FDL_MON.a</PathWithFileName>
+      <FilenameWithoutPath>SFX_LIB_V2.10.0_SE_FDL_MON.a</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>66</FileNumber>
+      <FileType>4</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</PathWithFileName>
+      <FilenameWithoutPath>Sgfx-Cmac-V1.0.0-CM0-O3.a</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>67</FileNumber>
+      <FileType>4</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.1-CM0-O3.a</PathWithFileName>
+      <FilenameWithoutPath>Sgfx-Monarch-V2.0.1-CM0-O3.a</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>68</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_aes.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>13</GroupNumber>
+      <FileNumber>69</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_data.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/SubGHz_Phy</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>70</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>71</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>14</GroupNumber>
+      <FileNumber>72</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>73</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>74</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>75</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>76</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>77</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>78</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>79</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>15</GroupNumber>
+      <FileNumber>80</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvprojx
new file mode 100644
index 00000000..40edde40
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM0PLUS.uvprojx
@@ -0,0 +1,893 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>Sigfox_PushButton_DualCore_CM0PLUS</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM0P</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM0P.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>Sigfox_PushButton_DualCore_CM0PLUS\</OutputDirectory>
+          <OutputName>Sigfox_PushButton_DualCore_CM0PLUS</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 1 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP</SimDllArguments>
+          <SimDlgDll>DARMCM1.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments> </TargetDllArguments>
+          <TargetDlgDll>TARMCM1.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM0+</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3>"" ()</Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M0+"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>1</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x2000c000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM0PLUS,KMS_ENABLED,USE_HAL_DRIVER,STM32WL55xx,DISABLE_IMAGE_STATE_HANDLING,CMSIS_NVIC_VIRTUAL</Define>
+              <Undefine></Undefine>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/KMS/App;../CM0PLUS/Sigfox/App;../CM0PLUS/Sigfox/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/Sigfox/Crypto;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core;../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS;../../../../../../Middlewares/ST/STM32_Secure_Engine/Core;../../../../../../Middlewares/Third_Party/mbed-crypto/include;../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls;../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../Linker_Common/MDK-ARM;../../2_Images_SECoreBin/Inc;../../2_Images_SBSFU/Common;../../2_Images_SBSFU/CM0PLUS/SBSFU/App</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>stm32wl55xx_flash_cm0plus.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+            <File>
+              <FileName>svc_handler.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>.\svc_handler.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Sigfox/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_sigfox.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/App/app_sigfox.c</FilePath>
+            </File>
+            <File>
+              <FileName>ee.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/App/ee.c</FilePath>
+            </File>
+            <File>
+              <FileName>sgfx_cstimer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/App/sgfx_cstimer.c</FilePath>
+            </File>
+            <File>
+              <FileName>sgfx_eeprom_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Sigfox/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>sgfx_credentials.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/Target/sgfx_credentials.c</FilePath>
+            </File>
+            <File>
+              <FileName>mcu_api.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/Target/mcu_api.c</FilePath>
+            </File>
+            <File>
+              <FileName>mn_api.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/Target/mn_api.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_board_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/Target/radio_board_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>rf_api.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/Target/rf_api.c</FilePath>
+            </File>
+            <File>
+              <FileName>se_nvm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Sigfox/Target/se_nvm.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/KMS/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_kms.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/KMS/App/app_kms.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>lptim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/lptim.c</FilePath>
+            </File>
+            <File>
+              <FileName>rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>flash_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/flash_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>timer_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>mn_lptim_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/mn_lptim_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_privileged_services.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\sys_privileged_services.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_privileged_wrap.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\CM0PLUS\Core\Src\sys_privileged_wrap.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
+          <Files>
+            <File>
+              <FileName>features_info.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/features_info.c</FilePath>
+            </File>
+            <File>
+              <FileName>sigfox_info.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/sigfox_info.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmux.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/mbmux.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_sigfox.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_sigfox.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_radio.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_sys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_sys.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/mbmuxif_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/radio_mbwrapper.c</FilePath>
+            </File>
+            <File>
+              <FileName>sigfox_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/MbMux/sigfox_mbwrapper.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_lptim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gtzc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gtzc.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/STM32_Secure_Engine</GroupName>
+          <Files>
+            <File>
+              <FileName>se_interface_appli.txt</FileName>
+              <FileType>3</FileType>
+              <FilePath>..\..\2_Images_SBSFU\MDK-ARM\STM32WL55JC_Nucleo_CM0PLUS\Exe\se_interface_appli.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/Sigfox</GroupName>
+          <Files>
+            <File>
+              <FileName>SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLibTest\SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a</FilePath>
+            </File>
+            <File>
+              <FileName>SFX_LIB_V2.10.0_SE_FDL_MON.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\SigfoxLib\SFX_LIB_V2.10.0_SE_FDL_MON.a</FilePath>
+            </File>
+            <File>
+              <FileName>Sgfx-Cmac-V1.0.0-CM0-O3.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a</FilePath>
+            </File>
+            <File>
+              <FileName>Sgfx-Monarch-V2.0.1-CM0-O3.a</FileName>
+              <FileType>4</FileType>
+              <FilePath>..\..\..\..\..\..\Middlewares\Third_Party\Sigfox\Monarch\Sgfx-Monarch-V2.0.1-CM0-O3.a</FilePath>
+            </File>
+            <File>
+              <FileName>sigfox_aes.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</FilePath>
+            </File>
+            <File>
+              <FileName>sigfox_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/SubGHz_Phy</GroupName>
+          <Files>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_driver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32_adv_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_systime.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="Sigfox_PushButton_DualCore_CM0PLUS"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvoptx
new file mode 100644
index 00000000..ac060b4e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvoptx
@@ -0,0 +1,997 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>Sigfox_PushButton_DualCore_CM4</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U-O142 -O2766 -SF4000 -I2 -A0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Sigfox/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Sigfox/App/app_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>app_sigfox.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Sigfox/App/sgfx_app.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Sigfox/App/sgfx_eeprom_if.c</PathWithFileName>
+      <FilenameWithoutPath>sgfx_eeprom_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/sys_sensors.c</PathWithFileName>
+      <FilenameWithoutPath>sys_sensors.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/adc_if.c</PathWithFileName>
+      <FilenameWithoutPath>adc_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/MbMux/mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_sigfox.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sigfox.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/MbMux/sigfox_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>sigfox_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../CM4/MbMux/system_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>system_mbwrapper.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_ll_adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>54</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>55</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>56</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>57</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>58</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>59</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>60</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>61</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvprojx
new file mode 100644
index 00000000..3971c93d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/Sigfox_PushButton_DualCore_CM4.uvprojx
@@ -0,0 +1,773 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>Sigfox_PushButton_DualCore_CM4</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>Sigfox_PushButton_DualCore_CM4\</OutputDirectory>
+          <OutputName>Sigfox_PushButton_DualCore_CM4</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg2>1</RunUserProg2>
+            <UserProg1Name>fromelf #L --bincombined --output=$L../@L.bin</UserProg1Name>
+            <UserProg2Name>.\..\..\2_Images_SECoreBin\MDK-ARM\postbuild.bat . #L @L.bin 2 1</UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>2</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>1</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x20008000</StartAddress>
+                <Size>0x4000</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../CM4/Core/Inc;../CM4/Sigfox/App;../CM4/Sigfox/Target;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/trace/adv_trace;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/Sigfox/Monarch;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib;../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest;../../../../../../Drivers/CMSIS/Include</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>stm32wl55xx_flash_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Sigfox/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_sigfox.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Sigfox/App/app_sigfox.c</FilePath>
+            </File>
+            <File>
+              <FileName>sgfx_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Sigfox/App/sgfx_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>sgfx_eeprom_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Sigfox/App/sgfx_eeprom_if.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/usart.c</FilePath>
+            </File>
+            <File>
+              <FileName>ipcc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_sensors.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/sys_sensors.c</FilePath>
+            </File>
+            <File>
+              <FileName>adc_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/adc_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>timer_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/timer_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/usart_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
+          <Files>
+            <File>
+              <FileName>mbmux.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/mbmux.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_sigfox.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/mbmuxif_sigfox.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/mbmuxif_radio.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_sys.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/mbmuxif_sys.c</FilePath>
+            </File>
+            <File>
+              <FileName>mbmuxif_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/mbmuxif_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/radio_mbwrapper.c</FilePath>
+            </File>
+            <File>
+              <FileName>sigfox_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/sigfox_mbwrapper.c</FilePath>
+            </File>
+            <File>
+              <FileName>system_mbwrapper.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/MbMux/system_mbwrapper.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_adc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_ll_adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32_adv_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_systime.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="Sigfox_PushButton_DualCore_CM4"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
new file mode 100644
index 00000000..41780b4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -0,0 +1,259 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm0plus.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M0+ processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1000
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x400
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                     ; Top of Stack
+                DCD     Reset_Handler                    ; Reset Handler
+                DCD     NMI_Handler                      ; NMI Handler
+                DCD     HardFault_Handler                ; Hard Fault Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     SVC_Handler                      ; SVCall Handler
+                DCD     0                                ; Reserved
+                DCD     0                                ; Reserved
+                DCD     PendSV_Handler                   ; PendSV Handler
+                DCD     SysTick_Handler                  ; SysTick Handler
+
+                ; External Interrupts                    
+                DCD     TZIC_ILA_IRQHandler              ; Security Interrupt controller illegal access Interrupts
+                DCD     PVD_PVM_IRQHandler               ; PVD and PVM detector
+                DCD     RTC_LSECSS_IRQHandler            ; RTC Wakeup + RTC Tamper and TimeStamp + RTC Alarms (A & B) + SSR Underflow and LSECSS Interrupts
+                DCD     RCC_FLASH_C1SEV_IRQHandler       ; RCC1 and FLASH and CPU1 M4 SEV Interrupts
+                DCD     EXTI1_0_IRQHandler               ; EXTI Line 1:0 Interrupts
+                DCD     EXTI3_2_IRQHandler               ; XTI Line 3:2 Interrupts
+                DCD     EXTI15_4_IRQHandler              ; EXTI Line 15:4 interrupts
+                DCD     ADC_COMP_DAC_IRQHandler          ; ADC, COMP1, COMP2, DAC Interrupts
+                DCD     DMA1_Channel1_2_3_IRQHandler     ; DMA1 Channel 1 to 3 Interrupts
+                DCD     DMA1_Channel4_5_6_7_IRQHandler   ; DMA1 Channels 4, 5, 6, 7 Interrupts
+                DCD     DMA2_DMAMUX1_OVR_IRQHandler      ; DMA2 Channels[1..7] and DMAMUX Overrun Interrupts          
+                DCD     LPTIM1_IRQHandler                ; LPTIM1 global Interrupt
+                DCD     LPTIM2_IRQHandler                ; LPTIM2 global Interrupt
+                DCD     LPTIM3_IRQHandler                ; LPTIM3 global Interrupt
+                DCD     TIM1_IRQHandler                  ; TIM1 Interrupt
+                DCD     TIM2_IRQHandler                  ; TIM2 Interrupt
+                DCD     TIM16_IRQHandler                 ; TIM16 Interrupt
+                DCD     TIM17_IRQHandler                 ; TIM17 Interrupt
+                DCD     IPCC_C2_RX_C2_TX_IRQHandler      ; IPCC RX Occupied and TX Free Interrupt Interrupts
+                DCD     HSEM_IRQHandler                  ; Semaphore Interrupt
+                DCD     RNG_IRQHandler                   ; RNG Interrupt
+                DCD     AES_PKA_IRQHandler               ; AES and PKA Interrupts
+                DCD     I2C1_IRQHandler                  ; I2C1 Event and Error Interrupt
+                DCD     I2C2_IRQHandler                  ; I2C2 Event and Error Interrupt
+                DCD     I2C3_IRQHandler                  ; I2C3 Event and Error Interrupt
+                DCD     SPI1_IRQHandler                  ; SPI1 Interrupts
+                DCD     SPI2_IRQHandler                  ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                ; USART1 Interrupt
+                DCD     USART2_IRQHandler                ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler               ; LPUART1 Interrupt
+                DCD     SUBGHZSPI_IRQHandler             ; SUBGHZSPI Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler          ; SUBGHZ Radio Interrupt
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+                EXPORT  TZIC_ILA_IRQHandler            [WEAK]
+                EXPORT  PVD_PVM_IRQHandler             [WEAK]
+                EXPORT  RTC_LSECSS_IRQHandler          [WEAK]
+                EXPORT  RCC_FLASH_C1SEV_IRQHandler     [WEAK]
+                EXPORT  EXTI1_0_IRQHandler             [WEAK]
+                EXPORT  EXTI3_2_IRQHandler             [WEAK]
+                EXPORT  EXTI15_4_IRQHandler            [WEAK]
+                EXPORT  ADC_COMP_DAC_IRQHandler        [WEAK]
+                EXPORT  DMA1_Channel1_2_3_IRQHandler   [WEAK]
+                EXPORT  DMA1_Channel4_5_6_7_IRQHandler [WEAK]
+                EXPORT  DMA2_DMAMUX1_OVR_IRQHandler    [WEAK]
+                EXPORT  LPTIM1_IRQHandler              [WEAK]
+                EXPORT  LPTIM2_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler              [WEAK]
+                EXPORT  TIM1_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                [WEAK]
+                EXPORT  TIM16_IRQHandler               [WEAK]
+                EXPORT  TIM17_IRQHandler               [WEAK]
+                EXPORT  IPCC_C2_RX_C2_TX_IRQHandler    [WEAK]
+                EXPORT  HSEM_IRQHandler                [WEAK]
+                EXPORT  RNG_IRQHandler                 [WEAK]
+                EXPORT  AES_PKA_IRQHandler             [WEAK]
+                EXPORT  I2C1_IRQHandler                [WEAK]
+                EXPORT  I2C2_IRQHandler                [WEAK]
+                EXPORT  I2C3_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                [WEAK]
+                EXPORT  SPI2_IRQHandler                [WEAK]
+                EXPORT  USART1_IRQHandler              [WEAK]
+                EXPORT  USART2_IRQHandler              [WEAK]
+                EXPORT  LPUART1_IRQHandler             [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler           [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler        [WEAK]
+
+TZIC_ILA_IRQHandler
+PVD_PVM_IRQHandler
+RTC_LSECSS_IRQHandler
+RCC_FLASH_C1SEV_IRQHandler
+EXTI1_0_IRQHandler
+EXTI3_2_IRQHandler
+EXTI15_4_IRQHandler
+ADC_COMP_DAC_IRQHandler
+DMA1_Channel1_2_3_IRQHandler
+DMA1_Channel4_5_6_7_IRQHandler
+DMA2_DMAMUX1_OVR_IRQHandler   
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+LPTIM3_IRQHandler
+TIM1_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+IPCC_C2_RX_C2_TX_IRQHandler
+HSEM_IRQHandler
+RNG_IRQHandler
+AES_PKA_IRQHandler
+I2C1_IRQHandler
+I2C2_IRQHandler
+I2C3_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler
+USART2_IRQHandler
+LPUART1_IRQHandler
+SUBGHZSPI_IRQHandler
+SUBGHZ_Radio_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..efa16135
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,371 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x1000
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x400
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+;*******************************************************************************
+; Element for aligning the Firmware binary size on the AES block size (16 bytes)
+;*******************************************************************************
+  AREA ALIGNTOAESBLOCK, DATA, READONLY, MERGE=1, STRINGS
+				 DCB	"0123456789ABCDE",0
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
new file mode 100644
index 00000000..ffebf4a2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
@@ -0,0 +1,33 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_1_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_1_START + 0x200) FIXED VECTOR_SIZE {
+    *.o (RESET, +First)
+  }
+  ROM_region +0 {
+    *(InRoot$$Sections)
+    .ANY (+RO)
+  }
+  ; SBSFU RAM area is reused for UserApp_M0  
+  RAM_region SB_REGION_RAM_START SB_RAM_REGION_SIZE {
+    .ANY (STACK)
+    .ANY (HEAP)
+    .ANY (+RW +ZI)
+  }
+  ; Backup SRAM2 dedicated to M0PLUS
+  RW_IRAM2 M0PLUS_SHARED_REGION_RAM_START M0PLUS_SHARED_RAM_REGION_SIZE  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+    *(MB_MEM2)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm0plus.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
new file mode 100644
index 00000000..532edbad
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -0,0 +1,33 @@
+#! armclang --target=arm-arm-none-eabi  -mcpu=cortex-m0plus -E -xc
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+#include "..\..\Linker_Common\MDK-ARM\mapping_sbsfu.h"
+#include "..\..\Linker_Common\MDK-ARM\mapping_fwimg.h"
+
+LR_ROM (SLOT_ACTIVE_2_START + 0x200) {                      ; 0x200 = IMAGE_OFFSET
+  vector_start (SLOT_ACTIVE_2_START + 0x200) FIXED VECTOR_SIZE {
+    *.o (RESET, +First)
+  }
+  ROM_region +0 {
+    *(InRoot$$Sections)
+    .ANY (+RO)
+  }
+  RAM_region M4_APP_REGION_RAM_START M4_APP_RAM_REGION_SIZE {
+    .ANY (STACK)
+    .ANY (HEAP)
+    .ANY (+RW +ZI)
+  }
+  ; Backup SRAM2 dedicated to M4
+  RW_IRAM2 M4_SHARED_REGION_RAM_START M4_SHARED_RAM_REGION_SIZE  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+    *(MAPPING_TABLE)
+    *(MB_MEM1)
+  }
+}
+
+; extra ROM region to make sure the binary size is a multiple of the AES block size (16 bytes) and L4 flash writing unit (8 bytes)
+LR_ROM1(+0) ALIGN(16) {
+  ForAlignment +0 {
+    startup_stm32wl55xx_cm4.o (ALIGNTOAESBLOCK,+Last)
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/svc_handler.s
new file mode 100644
index 00000000..b6ad9525
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/MDK-ARM/svc_handler.s
@@ -0,0 +1,34 @@
+;*******************************************************************************
+;* File Name          : svc_handler.s
+;* Author             : MCD Application Team
+;* Description        : Wrapper for SE isolation with MPU.
+;*******************************************************************************
+;*  @attention
+;*
+;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;*
+;*  This software component is licensed by ST under Ultimate Liberty license
+;*  SLA0044, the "License"; You may not use this file except in compliance with
+;*  the License. You may obtain a copy of the License at:
+;*                              www.st.com/SLA0044
+;*
+;*******************************************************************************
+;
+;
+;
+; Cortex-M version
+;
+      PRESERVE8
+      THUMB
+      AREA    |.text|, CODE, READONLY
+ 
+      EXPORT SVC_Handler
+SVC_Handler
+        IMPORT SVC_APP_Handler
+        MRS r0, PSP
+        PUSH {LR}
+        BL SVC_APP_Handler
+        POP {PC}
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/.project
new file mode 100644
index 00000000..74edcec7
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/.project
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Sigfox_PushButton_DualCore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
+		</link>
+	</linkedResources>
+	<filteredResources>
+		<filter>
+			<id>1602236848623</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.launch</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.cproject
new file mode 100644
index 00000000..ca00d748
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.cproject
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;1&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1299281857" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1967487472" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.687430112" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1691004467" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1496951530" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1795144788" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1227276338" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1879601100" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/KMS/App | ../../../CM0PLUS/Sigfox/App | ../../../CM0PLUS/Sigfox/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Modules | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/HAL | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/MBED | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Interface/CryptoApi/ST | ../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/niKMS | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/mbedtls | ../../../../../../../../Middlewares/Third_Party/mbed-crypto/include/psa | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || KMS_ENABLED | MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot; | USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  || ../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto/Sgfx-Cmac-V1.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch/Sgfx-Monarch-V2.0.0-CM0-O3.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib/SFX_LIB_V2.8.1_SE_FDL_MON.a | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest/SFX_ADDON_RFP_V0.6.0_SE_FDL_MON.a || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.751244808" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.42487753" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1484431087" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.778968319" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.953778663" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1784904725" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1841901683" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2071589823" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.324193626" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.937029173" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
+									<listOptionValue builtIn="false" value="KMS_ENABLED"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CMSIS_NVIC_VIRTUAL"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1643537430" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/KMS/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Sigfox/App"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/Sigfox/Target"/>
+									<listOptionValue builtIn="false" value="../../../CM0PLUS/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/Board"/>
+									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Secure_Engine/Core"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/iKMS"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/ST/STM32_Key_Management_Services/Core"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SECoreBin/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/Common"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/CM0PLUS/SBSFU/App"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1165575457" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.2072603310" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1862834284" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.914569323" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool command="gcc -z max-page-size=1" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1423034062" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.770430749" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories.1334017384" name="Library search path (-L)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.directories" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Crypto"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries.1235793158" name="Libraries (-l)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.libraries" useByScannerDiscovery="false" valueType="libs">
+									<listOptionValue builtIn="false" value=":SFX_LIB_V2.10.0_SE_FDL_MON.a"/>
+									<listOptionValue builtIn="false" value=":SFX_ADDON_RFP_V0.8.0_SE_FDL_MON_ASYNC.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Monarch-V2.0.1-CM0-O3.a"/>
+									<listOptionValue builtIn="false" value=":Sgfx-Cmac-V1.0.0-CM0-O3.a"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.644201892" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.564880028" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs">
+									<listOptionValue builtIn="false" value="../../../../2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup.1808590173" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.uselinkergroup" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1504180899" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.503402028" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1579307198" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1087354777" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1016491299" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.87961705" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1615282665" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.467419945" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1745522575" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1776702696" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1462308514" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="Sigfox_PushButton_DualCore_CM0PLUS.null.1458807887" name="Sigfox_PushButton_DualCore_CM0PLUS"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.774697356.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1841901683;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1165575457">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.project
new file mode 100644
index 00000000..d6ef34b2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/.project
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Sigfox_PushButton_DualCore_CM0PLUS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cryp_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gtzc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gtzc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_lptim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_lptim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/STM32_Secure_Engine/se_interface_app.o</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/2_Images_SBSFU/STM32CubeIDE/CM0PLUS/Debug/se_interface_app.o</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/sigfox_aes.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_aes.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/sigfox_data.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/Sigfox/Crypto/sigfox_data.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/flash_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/flash_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/lptim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/lptim.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/mn_lptim_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/mn_lptim_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_privileged_services.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_privileged_services.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_privileged_wrap.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_privileged_wrap.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/timer_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/features_info.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmux.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_sigfox.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sigfox.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/sigfox_info.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/sigfox_info.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/sigfox_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/sigfox_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/KMS/App/app_kms.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/KMS/App/app_kms.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/App/app_sigfox.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/app_sigfox.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/App/ee.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/ee.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/App/sgfx_cstimer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/sgfx_cstimer.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/App/sgfx_eeprom_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/mcu_api.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/mcu_api.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/mn_api.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/mn_api.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/radio_board_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/radio_board_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/rf_api.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/rf_api.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/se_nvm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/se_nvm.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/Target/sgfx_credentials.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Sigfox/Target/sgfx_credentials.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..f98fb740
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,328 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm0plus.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M0+ vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M0+ processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m0plus
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
+
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
+
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
+
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M0+ vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	0
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	TZIC_ILA_IRQHandler                  			/* TZIC ILA Interrupt                                 */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	RTC_LSECSS_IRQHandler                			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RCC_FLASH_C1SEV_IRQHandler           			/* RCC and FLASH and CPU1 M4 SEV Interrupt            */
+  .word	EXTI1_0_IRQHandler                   			/* EXTI Line 1:0 Interrupt                            */
+  .word	EXTI3_2_IRQHandler                   			/* EXTI Line 3:2 Interrupt                            */
+  .word	EXTI15_4_IRQHandler                  			/* EXTI Line 15:4 interrupt                           */
+  .word	ADC_COMP_DAC_IRQHandler              			/* ADC, COMP1, COMP2, DAC Interrupt                   */
+  .word	DMA1_Channel1_2_3_IRQHandler         			/* DMA1 Channel 1 to 3 Interrupt                      */
+  .word	DMA1_Channel4_5_6_7_IRQHandler       			/* DMA1 Channels 4,5,6,7 Interrupt                    */
+  .word	DMA2_DMAMUX1_OVR_IRQHandler          			/* DMA2 Channels[1..7] and DMAMUX Overrun Interrupts  */
+  .word	LPTIM1_IRQHandler                    			/* LPTIM1 Global Interrupt                            */
+  .word	LPTIM2_IRQHandler                    			/* LPTIM2 Global Interrupt                            */
+  .word	LPTIM3_IRQHandler                    			/* LPTIM3 Global Interrupt                            */
+  .word	TIM1_IRQHandler                      			/* TIM1 Global Interrupt                              */
+  .word	TIM2_IRQHandler                      			/* TIM2 Global Interrupt                              */
+  .word	TIM16_IRQHandler                     			/* TIM16 Global Interrupt                             */
+  .word	TIM17_IRQHandler                     			/* TIM17 Global Interrupt                             */
+  .word	IPCC_C2_RX_C2_TX_IRQHandler          			/* IPCC RX Occupied and TX Free Interrupt Interrupt   */
+  .word	HSEM_IRQHandler                      			/* Semaphore Interrupt                                */
+  .word	RNG_IRQHandler                       			/* RNG Interrupt                                      */
+  .word	AES_PKA_IRQHandler                   			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	I2C1_IRQHandler                      			/* I2C1 Event and Error Interrupt                     */
+  .word	I2C2_IRQHandler                      			/* I2C2 Event and Error Interrupt                     */
+  .word	I2C3_IRQHandler                      			/* I2C3 Event and Error Interrupt                     */
+  .word	SPI1_IRQHandler                      			/* SPI1 Interrupt                                     */
+  .word	SPI2_IRQHandler                      			/* SPI2 Interrupt                                     */
+  .word	USART1_IRQHandler                    			/* USART1 Interrupt                                   */
+  .word	USART2_IRQHandler                    			/* USART2 Interrupt                                   */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 Interrupt                                  */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI Interrupt                                */
+  .word	SUBGHZ_Radio_IRQHandler              			/* SUBGHZ Radio Interrupt                             */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	TZIC_ILA_IRQHandler
+	.thumb_set TZIC_ILA_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	RTC_LSECSS_IRQHandler
+	.thumb_set RTC_LSECSS_IRQHandler,Default_Handler
+
+	.weak	RCC_FLASH_C1SEV_IRQHandler
+	.thumb_set RCC_FLASH_C1SEV_IRQHandler,Default_Handler
+
+	.weak	EXTI1_0_IRQHandler
+	.thumb_set EXTI1_0_IRQHandler,Default_Handler
+
+	.weak	EXTI3_2_IRQHandler
+	.thumb_set EXTI3_2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_4_IRQHandler
+	.thumb_set EXTI15_4_IRQHandler,Default_Handler
+
+	.weak	ADC_COMP_DAC_IRQHandler
+	.thumb_set ADC_COMP_DAC_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_2_3_IRQHandler
+	.thumb_set DMA1_Channel1_2_3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_5_6_7_IRQHandler
+	.thumb_set DMA1_Channel4_5_6_7_IRQHandler,Default_Handler
+
+	.weak	DMA2_DMAMUX1_OVR_IRQHandler
+	.thumb_set DMA2_DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	TIM1_IRQHandler
+	.thumb_set TIM1_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	IPCC_C2_RX_C2_TX_IRQHandler
+	.thumb_set IPCC_C2_RX_C2_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	AES_PKA_IRQHandler
+	.thumb_set AES_PKA_IRQHandler,Default_Handler
+
+	.weak	I2C1_IRQHandler
+	.thumb_set I2C1_IRQHandler,Default_Handler
+
+	.weak	I2C2_IRQHandler
+	.thumb_set I2C2_IRQHandler,Default_Handler
+
+	.weak	I2C3_IRQHandler
+	.thumb_set I2C3_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s
new file mode 100644
index 00000000..282425f8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/svc_handler.s
@@ -0,0 +1,29 @@
+/**
+  ******************************************************************************
+  * @file      svc_handler.s
+  * @author    MCD Application Team
+  * @brief     Wrapper for SE isolation with MPU.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2017 STMicroelectronics. All rights reserved.
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+        .section  .text,"ax",%progbits
+        .syntax unified
+        .weak  SVC_APP_Handler
+        .global SVC_Handler
+        .type  SVC_Handler, %function
+SVC_Handler:
+        MRS r0, PSP
+        PUSH {LR}
+        BL SVC_APP_Handler
+        POP {PC}
+.end
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..11e9ea25
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,223 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes ROM
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x400 ; /* required amount of heap  */
+_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  ISR_VECTOR (rx)    : ORIGIN = (SLOT_Active_1_start + 0x200), LENGTH = Vector_size
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_1_start + Vector_size + 0x200), LENGTH = (SLOT_Active_1_end - SLOT_Active_1_start + 1 - 0x200 - Vector_size)
+  APPLI_RAM  (xrw)   : ORIGIN = SB_region_RAM_start, LENGTH = SB_region_RAM_size
+  RAM_SHARED (xrw)   : ORIGIN = M0PLUS_SHARED_region_RAM_start, LENGTH = M0PLUS_SHARED_region_RAM_size
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >ISR_VECTOR
+
+  .SE_IF_Code : {
+    . = ALIGN(8);
+    KEEP(*se_interface_app.o (.text .text*))
+    KEEP(*se_interface_kms.o (.text .text*))
+    . = ALIGN(8);
+  } >SE_IF_ROM_region
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .ARM.extab   : {
+    . = ALIGN(8);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .ARM : {
+    . = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .init_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  .fini_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(8);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(8);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(8);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> APPLI_ROM
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.cproject
new file mode 100644
index 00000000..0df74ab3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.cproject
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="&quot;../../../../2_Images_SECoreBin/STM32CubeIDE/postbuild.sh&quot; &quot;..&quot; &quot;./${BuildArtifactFileBaseName}.elf&quot; &quot;./${BuildArtifactFileBaseName}.bin&quot; &quot;2&quot; &quot;1&quot;">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1653359249" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.560190773" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.934286202" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.672586383" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.268074494" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.41946571" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.619886424" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.293970326" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/Sigfox/App | ../../../CM4/Sigfox/Target | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib | ../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1137870109" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/Sigfox_PushButton_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.97007145" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1001278020" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.698085663" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.719377926" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.898891516" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.484088664" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1061756617" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.93296640" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1054216882" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/App"/>
+									<listOptionValue builtIn="false" value="../../../CM4/Sigfox/Target"/>
+									<listOptionValue builtIn="false" value="../../../CM4/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/Board"/>
+									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
+									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/Monarch"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLib"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Middlewares/Third_Party/Sigfox/SigfoxLibTest"/>
+									<listOptionValue builtIn="false" value="../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1371241978" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1825854381" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1899156162" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1034454810" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1123267593" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.169767631" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.642285922" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-L ../../../../Linker_Common/STM32CubeIDE"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.651882848" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1263991271" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.10556409" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1313707981" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1508836901" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1497574572" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.270878611" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1425459788" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1422730250" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1514119801" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1249370821" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="Sigfox_PushButton_DualCore_CM4.null.1342273716" name="Sigfox_PushButton_DualCore_CM4"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.888816795.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.898891516;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1371241978">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.project
new file mode 100644
index 00000000..922af772
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/.project
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Sigfox_PushButton_DualCore_CM4</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/adc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/adc_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/adc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/dma.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/ipcc_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_sensors.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_sensors.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/timer_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/timer_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmux.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmux.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_sigfox.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sigfox.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_sys.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sys.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/mbmuxif_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/radio_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/sigfox_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/sigfox_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/MbMux/system_mbwrapper.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/system_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Common/System/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/App/app_sigfox.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/app_sigfox.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/App/sgfx_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/sgfx_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Sigfox/App/sgfx_eeprom_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Sigfox/App/sgfx_eeprom_if.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..af218d28
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,461 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
+
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
+
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
+
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..c5d44e54
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,224 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes ROM
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(APPLI_RAM) + LENGTH(APPLI_RAM); /* end of "RAM" Ram type memory */
+
+_Min_Heap_Size = 0x400 ; /* required amount of heap  */
+_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+
+INCLUDE mapping_fwimg.ld
+INCLUDE mapping_sbsfu.ld
+
+/* Memories definition */
+MEMORY
+{
+  ISR_VECTOR (rx)    : ORIGIN = (SLOT_Active_2_start + 0x200), LENGTH = Vector_size
+  APPLI_ROM  (xrw)   : ORIGIN = (SLOT_Active_2_start + Vector_size + 0x200), LENGTH = (SLOT_Active_2_end - SLOT_Active_2_start + 1 - 0x200 - Vector_size)
+  APPLI_RAM  (xrw)   : ORIGIN = M4_APP_region_RAM_start, LENGTH = M4_APP_region_RAM_size
+  RAM_SHARED (xrw)   : ORIGIN = M4_SHARED_region_RAM_start, LENGTH = M4_SHARED_region_RAM_size
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >ISR_VECTOR
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >APPLI_ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >APPLI_ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+    
+  } >APPLI_RAM AT> APPLI_ROM
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
+
+  /* Extra ROM section (last one) to make sure the binary size is a multiple of the AES block size (16 bytes) and F7 flash writing unit (4 bytes)*/
+  .align16 :
+  {
+    . = . + 1;         /* _edata=. is aligned on 8 bytes so could be aligned on 16 bytes: add 1 byte gap */
+    . = ALIGN(16) - 1; /* increment the location counter until next 16 bytes aligned address (-1 byte)   */
+    BYTE(0);           /* allocate 1 byte (value is 0) to be a multiple of 16 bytes                      */
+  } >APPLI_ROM
+
+  /* Uninitialized data section into "RAM" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >APPLI_RAM
+
+  /* User_heap_stack section, used to check that there is enough "RAM" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >APPLI_RAM
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/readme.txt
new file mode 100644
index 00000000..b043a587
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/readme.txt
@@ -0,0 +1,293 @@
+/**
+  @page Sigfox_PushButton_DualCore Readme file
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
+  * @file    Applications/Sigfox_SBSFU_1_Slot_DualCore/Sigfox_PushButton_DualCore/readme.txt
+  * @author  MCD Application Team
+  * @brief   This application is a simple demo application software of a Sigfox
+  *          Modem sending temperature and Battery Level to a Sigfox Network.
+  *          Provides protections offered by Secure Boot and Secure Engine.
+  *          The application keys are managed by key management services.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Description
+
+This directory contains a set of source files that implements a Dual Core (CM4 / CM0) Sigfox application
+device with security environment offered by Secure Boot and Secure Engine.
+
+This application is targeting the NUCLEO-WL55JC1 (HIGH-BAND) embedding the STM32WLxx.
+
+  ******************************************************************************
+
+@par Keywords
+
+Applications, SubGHz_Phy, Sigfox, PushButton, DualCore, SBSFU, KMS
+
+@par Directory contents
+
+
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/cmsis_nvic_virtual.h            Maps the NVIC functions on _SVC for Unpriviledge usage
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/flash_if.h                      This file contains definitions for FLASH Interface functionalities.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc.h                          This file contains all the function prototypes for
+                                                                                the ipcc.c file
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/ipcc_if.h                       This file contains the interface of the ipcc driver on CM0PLUS.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/kms_if.h                        This file contains kms interfaces with middleware
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/lptim.h                         This file contains all the function prototypes for
+                                                                                the lptim.c file
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/main.h                          : Header for main.c file.
+                                                                                This file contains the common defines of the application.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/mn_lptim_if.h                   Header for between Sigfox monarch and lptim
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/platform.h                      Header for General HW instances configuration
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/rtc.h                           This file contains all the function prototypes for
+                                                                                the rtc.c file
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h            HAL configuration file.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32wlxx_it.h                  This file contains the headers of the interrupt handlers.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h                  Header for Low Power Manager interface configuration
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/subghz.h                        This file contains all the function prototypes for
+                                                                                the subghz.c file
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_app.h                       Function prototypes for sys_app.c file
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_conf.h                      Applicative configuration, e.g. : debug, trace, low power, sensors
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_privileged_services.h       Maps sys_privileged_wrap functions on SVC and API to cortex services
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/sys_privileged_wrap.h           This file contains all the function prototypes for
+                                                                                the sys_privileged_wrap.c file
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/timer_if.h                      configuration of the timer_if.c instances
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_conf.h                Header for configuration file to utilities
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Inc/utilities_def.h                 Definitions for modules requiring utilities
+  - Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.h                        !!! No description found !!!
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.h                            API which interfaces CM0PLUS to IPCC
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                    API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.h                   API provided to CM0 application to register and handle Sigfox to MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                      API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                    API for CM0PLUS application to register and handle TRACE via MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                  This file implements the CM0PLUS side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.h                 This file implements the CM0 side wrapper of the SigfoxMac interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.h                  Header of application of the Sigfox Middleware
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.h                          Header of the EEPROM emulator
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_app_version.h            Definition the version of the CM0PLUS application
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.h                Interface for  cstimer.c driver
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.h              eeprom interface to the upper module.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sigfox_data.h                 provides encrypted data
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.h                  defines the interface to mcu_api.c
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.h                   monarch library interface
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mw_log_conf.h              Configure (enable/disable) traces for CM0
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.h           Header for Radio interface configuration
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_conf.h               Header of Radio configuration
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.h                   interface to rf_api.c
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.h                   header to emulated SE nvm data
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.h         interface to key manager and encryption algorithm
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/timer.h                    Wrapper to timer server
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/adc.h                               This file contains all the function prototypes for
+                                                                                the adc.c file
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/adc_if.h                            Header for ADC interface configuration
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/dma.h                               This file contains all the function prototypes for
+                                                                                the dma.c file
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc.h                              This file contains all the function prototypes for
+                                                                                the ipcc.c file
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/ipcc_if.h                           This file contains the interface of the ipcc driver on CM4.
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/main.h                              : Header for main.c file.
+                                                                                This file contains the common defines of the application.
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/platform.h                          Header for General HW instances configuration
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h                HAL configuration file.
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32wlxx_it.h                      This file contains the headers of the interrupt handlers.
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/stm32_lpm_if.h                      Header for Low Power Manager interface configuration
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_app.h                           Function prototypes for sys_app.c file
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_conf.h                          Applicative configuration, e.g. : debug, trace, low power, sensors
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/sys_sensors.h                       Header for sensors application
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/timer_if.h                          configuration of the timer_if.c instances
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/usart.h                             This file contains all the function prototypes for
+                                                                                the usart.c file
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/usart_if.h                          Header for USART interface configuration
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_conf.h                    Header for configuration file to utilities
+  - Sigfox_PushButton_DualCore/CM4/Core/Inc/utilities_def.h                     Definitions for modules requiring utilities
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.h                                API which interfaces CM4 to IPCC
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.h                        API for CM4 application to register and handle RADIO driver via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.h                       API provided to CM0 application to register and handle Sigfox to MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.h                          API for CM4 application to handle the SYSTEM MBMUX channel
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.h                        API for CM4 application to register and handle TRACE via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.h                      This file implements the CM4 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.h                     This file implements the CM0 side wrapper of the SigfoxMac interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.h                     This file implements the CM4 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.h                      Header of application of the Sigfox Middleware
+  - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.h                        provides code for the application of the SIGFOX Middleware
+  - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app_version.h                Definition the version of the CM4 application
+  - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.h                  eeprom interface to the upper module.
+  - Sigfox_PushButton_DualCore/CM4/Sigfox/Target/se_nvm.h                       header to emulated SE nvm data
+  - Sigfox_PushButton_DualCore/Common/Board/stm32wlxx_nucleo_conf.h             STM32WLxx_Nucleo board configuration file.
+  - Sigfox_PushButton_DualCore/Common/MbMux/features_info.h                     Feature list and parameters TypeDefinitions
+  - Sigfox_PushButton_DualCore/Common/MbMux/mbmux_table.h                       Maps the IPCC channels to memory buffers
+  - Sigfox_PushButton_DualCore/Common/MbMux/msg_id.h                            MBMUX message ID enumeration
+  - Sigfox_PushButton_DualCore/Common/MbMux/sigfox_info.h                       To give info to the application about Sigfox configuration
+  - Sigfox_PushButton_DualCore/Common/System/sys_debug.h                        Configuration of the debug.c instances
+
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/flash_if.c                      This file provides set of firmware functions to manage Flash
+                                                                                Interface functionalities.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc.c                          This file provides code for the configuration
+                                                                                of the IPCC instances.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/ipcc_if.c                       Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/lptim.c                         This file provides code for the configuration
+                                                                                of the LPTIM instances.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/main.c                          : Main program body
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/mn_lptim_if.c                   Interface between Sigfox monarch and lptim
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/rtc.c                           This file provides code for the configuration
+                                                                                of the RTC instances.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c             This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                  Interrupt Service Routines.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                  Low layer function to enter/exit low power modes (stop, sleep)
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/subghz.c                        This file provides code for the configuration
+                                                                                of the SUBGHZ instances.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_app.c                       Initializes HW and SW system entities (not related to the radio)
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_privileged_services.c       gives access to COrtex services like ThumbState, SVC, MPU
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/sys_privileged_wrap.c           Wrapper functions to call SVC when in Unprivilege mode
+  - Sigfox_PushButton_DualCore/CM0PLUS/Core/Src/timer_if.c                      Configure RTC Alarm, Tick and Calendar manager
+  - Sigfox_PushButton_DualCore/CM0PLUS/KMS/App/app_kms.c                        !!! No description found !!!
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/features_info.c                    CM0PLUS supported features list
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmux.c                            Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                    allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sigfox.c                   allows CM0PLUS application to register and handle Sigfox to MBMUX
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                      allows CM0 application to handle the SYSTEM MBMUX channel
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                    Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                  This file implements the CM0 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_info.c                      To give info to the application about Sigfox configuration
+  - Sigfox_PushButton_DualCore/CM0PLUS/MbMux/sigfox_mbwrapper.c                 This file implements the CM0 side wrapper of the sigfoxMac interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/app_sigfox.c                  Application of the Sigfox Middleware
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/ee.c                          Implementation of the EEPROM emulator
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_cstimer.c                manages carrier sense timer.
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/App/sgfx_eeprom_if.c              eeprom interface to the sigfox component
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mcu_api.c                  mcu library interface
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/mn_api.c                   monarch library interface implementation
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/radio_board_if.c           This file provides an interface layer between MW and Radio Board
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/rf_api.c                   rf library interface
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/se_nvm.c                   manages SE nvm data
+  - Sigfox_PushButton_DualCore/CM0PLUS/Sigfox/Target/sgfx_credentials.c         manages keys and encryption algorithm
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/adc.c                               This file provides code for the configuration
+                                                                                of the ADC instances.
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/adc_if.c                            Read status related to the chip (battery level, VREF, chip temperature)
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/dma.c                               This file provides code for the configuration
+                                                                                of all the requested memory to memory DMA transfers.
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc.c                              This file provides code for the configuration
+                                                                                of the IPCC instances.
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/ipcc_if.c                           Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/main.c                              : Main program body
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c                 This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/stm32wlxx_it.c                      Interrupt Service Routines.
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/stm32_lpm_if.c                      Low layer function to enter/exit low power modes (stop, sleep)
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/sys_app.c                           Initializes HW and SW system entities (not related to the radio)
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/sys_sensors.c                       Manages the sensors on the application
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/timer_if.c                          Configure RTC Alarm, Tick and Calendar manager
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/usart.c                             This file provides code for the configuration
+                                                                                of the USART instances.
+  - Sigfox_PushButton_DualCore/CM4/Core/Src/usart_if.c                          Configuration of UART driver interface for hyperterminal communication
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmux.c                                CM4 side multiplexer to map features to IPCC channels
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_radio.c                        allows CM4 application to register and handle RADIO driver via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sigfox.c                       allows CM4 application to register and handle SigfoxWAN via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_sys.c                          allows CM4 application to handle the SYSTEM MBMUX channel.
+  - Sigfox_PushButton_DualCore/CM4/MbMux/mbmuxif_trace.c                        allows CM4 application to receive by CM0 TRACE via MBMUX
+  - Sigfox_PushButton_DualCore/CM4/MbMux/radio_mbwrapper.c                      This file implements the CM4 side wrapper of the Radio interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM4/MbMux/sigfox_mbwrapper.c                     This file implements the CM4 side wrapper of the Sigfox interface
+                                                                                shared between M0 and M4.
+  - Sigfox_PushButton_DualCore/CM4/MbMux/system_mbwrapper.c                     allows CM4 application to handle the SYSTEM MBMUX channel.
+  - Sigfox_PushButton_DualCore/CM4/Sigfox/App/app_sigfox.c                      Application of the Sigfox Middleware
+  - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_app.c                        provides code for the application of the sigfox Middleware
+  - Sigfox_PushButton_DualCore/CM4/Sigfox/App/sgfx_eeprom_if.c                  eeprom interface to the sigfox component
+  - Sigfox_PushButton_DualCore/Common/System/system_stm32wlxx.c                 CMSIS Cortex Device Peripheral Access Layer System Source File
+  - Sigfox_PushButton_DualCore/Common/System/sys_debug.c                        Enables 4 debug pins for internal signals RealTime debugging
+  - Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - Sigfox_PushButton_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - Sigfox_PushButton_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.c  STM32CubeIDE System Memory calls file
+
+
+@par Hardware and Software environment
+
+  - This example runs on the STM32WLxx Nucleo board.
+
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
+      to ST-LINK connector.
+    - Please ensure that the ST-LINK connector jumpers are fitted.
+
+  - Configure the software via the configuration files:
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
+    - CM4 (Sigfox application)
+        - sys_conf.h, sgfx_app.h, nucleo_conf.h, main.h, etc
+
+  -Set Up:
+
+             --------------------------  V    V  --------------------------
+             |    Sigfox Object       |  |    |  |   Sigfox  Network      |
+             |                        |  |    |  |                        |
+   ComPort<--|                        |--|    |--|                        |-->Web Server
+             |                        |          |                        |
+             --------------------------          --------------------------
+
+@par How to use it ?
+In order to make the program work, you must do the following :
+  - use the script \Scripts\<MyPreferredToolchain>\build.bat to rebuild the SBSFU and the Sigfox projects
+  - use the script \Scripts\<MyPreferredToolchain>\program.bat to download the big binary on target device
+  - Open a Terminal, connected the device
+  - UART Config depends on which trace you want to see:
+    - in order to see SBSFU trace : UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
+    - in order to see Sigfox trace : UART Config = 9600, 8b, 1 stopbit, no parity, no flow control
+  - Terminal Config: Select 'CR+LF' for Transmit New-Line and switch 'Local echo' on
+  - Reset the system (two cores)
+  - SBSFU check if new fw to be downloaded otherwise verifies the user Sigfox fw signature and execute it
+  - Push Button 1 (it will send a sigfox message, Blue LED blinking)
+
+@par How to debug ?
+  - change or undefine following definitions in above files:
+    - in ..\2_Images_SBSFU\CM0PLUS\app_sfu.h
+      /*#define SFU_RDP_PROTECT_ENABLE*/
+      /*#define SFU_C2SWDBG_PROTECT_ENABLE*/
+    - in ..\2_Images_SBSFU\Common\app_sfu_common.h
+      /*#define SFU_DAP_PROTECT_ENABLE*/
+      /*#define SFU_C2_DDS_PROTECT_ENABLE*/
+      #define SFU_HIDE_PROTECTION_CFG OB_SECURE_HIDE_PROTECTION_DISABLE
+    - in ..\2_Images_SBSFU\CM0PLUS\SBSFU\Target\sfu_low_level.c
+      set UartHandle.Init.BaudRate = 9600U; (optional: it avoids switching the hyper-terminal but it slows the download)
+    - in .\Sigfox_PushButton_DualCore\CM4\Core\Inc\sys_conf.h
+      #define DEBUGGER_ENABLED   1   to debug CM4
+      #define LOW_POWER_DISABLE   1  at least on one MCU (CM4 or CM0PUS)
+    - in .\Sigfox_PushButton_DualCore\CM0PLUS\Core\Inc\sys_conf.h
+      #define DEBUGGER_ENABLED   1   to debug CM0PLUS
+      #define LOW_POWER_DISABLE   1  at least on one MCU (CM4 or CM0PUS)
+  - use the script \Scripts\<MyPreferredToolchain>\build.bat to rebuild the SBSFU and the Sigfox projects
+  - use the script \Scripts\<MyPreferredToolchain>\program.bat to download the big binary on target device
+  - if needed set hyper-terminal to 115200 to see SBSFU trace
+  - unplug and plug the USB reconnect the board to the PC
+  - SBSFU run first then Sigfox_PushButton starts
+  - Sigfox_PushButton CM4 code enters in while(1) loop waiting the push button BUTTON_SW2 to be pressed
+  - the CM0PLUS code is in while(1) loop waiting the CM4 to set CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START
+  - if you need to debug CM4 open your preferred toolchain and select CM4 project and attach to running target
+  - if you need to debug CM0PLUS open your preferred toolchain and select CM0PLUS project and attach to running target
+  - set the breakpoints either in CM4 or CM0PLUS or both debugger instances
+  - set hyper-terminal to 9600 to see Sigfox_PushButton trace
+  - press the push button BUTTON_SW2:
+     - CM4 exits its while(1) loop and executes MBMUXIF_SetCpusSynchroFlag(1) and reaches the CM4 breakpoint
+     - this allows CM0PLUS to exit its while(1) loop and to reach the CM0PLUS breakpoint
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/.extSettings b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/dma.h
new file mode 100644
index 00000000..59a26f2e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/dma.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    dma.h
+  * @brief   This file contains all the function prototypes for
+  *          the dma.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __DMA_H__
+#define __DMA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* DMA memory to memory transfer handles -------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_DMA_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DMA_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/main.h
new file mode 100644
index 00000000..b29411d5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/main.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.h
+  * @brief          : Header for main.c file.
+  *                   This file contains the common defines of the application.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MAIN_H
+#define __MAIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void Error_Handler(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+/* Private defines -----------------------------------------------------------*/
+#define RTC_N_PREDIV_S 10
+#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
+#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
+#define LED1_Pin GPIO_PIN_15
+#define LED1_GPIO_Port GPIOB
+#define LED2_Pin GPIO_PIN_9
+#define LED2_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define RF_CTRL3_Pin GPIO_PIN_3
+#define RF_CTRL3_GPIO_Port GPIOC
+#define BUT1_Pin GPIO_PIN_0
+#define BUT1_GPIO_Port GPIOA
+#define BUT1_EXTI_IRQn EXTI0_IRQn
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define RF_CTRL2_Pin GPIO_PIN_5
+#define RF_CTRL2_GPIO_Port GPIOC
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define RF_CTRL1_Pin GPIO_PIN_4
+#define RF_CTRL1_GPIO_Port GPIOC
+#define BUT3_Pin GPIO_PIN_6
+#define BUT3_GPIO_Port GPIOC
+#define BUT3_EXTI_IRQn EXTI9_5_IRQn
+#define BUT2_Pin GPIO_PIN_1
+#define BUT2_GPIO_Port GPIOA
+#define BUT2_EXTI_IRQn EXTI1_IRQn
+#define LED3_Pin GPIO_PIN_11
+#define LED3_GPIO_Port GPIOB
+#define USARTx_RX_Pin GPIO_PIN_3
+#define USARTx_RX_GPIO_Port GPIOA
+#define USARTx_TX_Pin GPIO_PIN_2
+#define USARTx_TX_GPIO_Port GPIOA
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MAIN_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/platform.h
new file mode 100644
index 00000000..2386cd7f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/platform.h
@@ -0,0 +1,80 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    platform.h
+  * @author  MCD Application Team
+  * @brief   Header for General HW instances configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __PLATFORM_H__
+#define __PLATFORM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Exported constants --------------------------------------------------------*/
+
+#define USE_BSP_DRIVER
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdbool.h>
+#include "stm32wlxx.h"
+#include "main.h"
+#include "stm32wlxx_ll_gpio.h"
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP.  */
+/* In order to use BSP, users can add the BSP files in the IDE project space */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  */
+#include "stm32wlxx_nucleo.h"
+#include "stm32wlxx_nucleo_radio.h"
+#endif /* defined(USE_BSP_DRIVER) */
+
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __PLATFORM_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/rtc.h
new file mode 100644
index 00000000..6dd24df4
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/rtc.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    rtc.h
+  * @brief   This file contains all the function prototypes for
+  *          the rtc.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RTC_H__
+#define __RTC_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern RTC_HandleTypeDef hrtc;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_RTC_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RTC_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32_lpm_if.h
new file mode 100644
index 00000000..cbe62fa1
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32_lpm_if.h
@@ -0,0 +1,102 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Low Power Manager interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32_LPM_IF_H__
+#define __STM32_LPM_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_lpm.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Enters Low Power Off Mode
+  */
+void PWR_EnterOffMode(void);
+
+/**
+  * @brief Exits Low Power Off Mode
+  */
+void PWR_ExitOffMode(void);
+
+/**
+  * @brief Enters Low Power Stop Mode
+  * @note ARM exists the function when waking up
+  */
+void PWR_EnterStopMode(void);
+
+/**
+  * @brief Exits Low Power Stop Mode
+  * @note Enable the pll at 32MHz
+  */
+void PWR_ExitStopMode(void);
+
+/**
+  * @brief Enters Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_EnterSleepMode(void);
+
+/**
+  * @brief Exits Low Power Sleep Mode
+  * @note ARM exits the function when waking up
+  */
+void PWR_ExitSleepMode(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__STM32_LPM_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_hal_conf.h
new file mode 100644
index 00000000..cd09804c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_hal_conf.h
@@ -0,0 +1,338 @@
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_hal_conf.h
+  * @author  MCD Application Team
+  * @brief   HAL configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLxx_HAL_CONF_H
+#define STM32WLxx_HAL_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Exported types ------------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
+
+/* ########################## Module Selection ############################## */
+/**
+  * @brief This is the list of modules to be used in the HAL driver
+  */
+#define HAL_MODULE_ENABLED
+/*#define HAL_ADC_MODULE_ENABLED   */
+/*#define HAL_COMP_MODULE_ENABLED   */
+/*#define HAL_CRC_MODULE_ENABLED   */
+/*#define HAL_CRYP_MODULE_ENABLED   */
+/*#define HAL_DAC_MODULE_ENABLED   */
+/*#define HAL_GTZC_MODULE_ENABLED   */
+/*#define HAL_HSEM_MODULE_ENABLED   */
+/*#define HAL_I2C_MODULE_ENABLED   */
+/*#define HAL_I2S_MODULE_ENABLED   */
+/*#define HAL_IPCC_MODULE_ENABLED   */
+/*#define HAL_IRDA_MODULE_ENABLED   */
+/*#define HAL_IWDG_MODULE_ENABLED   */
+/*#define HAL_LPTIM_MODULE_ENABLED   */
+/*#define HAL_PKA_MODULE_ENABLED   */
+/*#define HAL_RNG_MODULE_ENABLED   */
+#define HAL_RTC_MODULE_ENABLED
+/*#define HAL_SMARTCARD_MODULE_ENABLED   */
+/*#define HAL_SMBUS_MODULE_ENABLED   */
+/*#define HAL_SPI_MODULE_ENABLED   */
+#define HAL_SUBGHZ_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
+#define HAL_UART_MODULE_ENABLED
+/*#define HAL_USART_MODULE_ENABLED   */
+/*#define HAL_WWDG_MODULE_ENABLED   */
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+
+/* ########################## Register Callbacks selection ############################## */
+/**
+  * @brief This is the list of modules where register callback can be used
+  */
+#define USE_HAL_ADC_REGISTER_CALLBACKS         0u
+#define USE_HAL_COMP_REGISTER_CALLBACKS        0u
+#define USE_HAL_CRYP_REGISTER_CALLBACKS        0u
+#define USE_HAL_DAC_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2C_REGISTER_CALLBACKS         0u
+#define USE_HAL_I2S_REGISTER_CALLBACKS         0u
+#define USE_HAL_IRDA_REGISTER_CALLBACKS        0u
+#define USE_HAL_LPTIM_REGISTER_CALLBACKS       0u
+#define USE_HAL_PKA_REGISTER_CALLBACKS         0u
+#define USE_HAL_RNG_REGISTER_CALLBACKS         0u
+#define USE_HAL_RTC_REGISTER_CALLBACKS         0u
+#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS   0u
+#define USE_HAL_SMBUS_REGISTER_CALLBACKS       0u
+#define USE_HAL_SPI_REGISTER_CALLBACKS         0u
+#define USE_HAL_SUBGHZ_REGISTER_CALLBACKS      0u
+#define USE_HAL_TIM_REGISTER_CALLBACKS         0u
+#define USE_HAL_UART_REGISTER_CALLBACKS        0u
+#define USE_HAL_USART_REGISTER_CALLBACKS       0u
+#define USE_HAL_WWDG_REGISTER_CALLBACKS        0u
+
+/* ########################## Oscillator Values adaptation ####################*/
+/**
+  * @brief Adjust the value of External High Speed oscillator (HSE) used in your application.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSE is used as system clock source, directly or through the PLL).
+  */
+
+#if !defined (HSE_VALUE)
+#define HSE_VALUE                           32000000UL  /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined (HSE_STARTUP_TIMEOUT)
+#define HSE_STARTUP_TIMEOUT                 100UL       /*!< Time out for HSE start up, in ms */
+#endif /* HSE_STARTUP_TIMEOUT */
+
+/**
+  * @brief Internal Multiple Speed oscillator (MSI) default value.
+  *        This value is the default MSI range value after Reset.
+  */
+#if !defined  (MSI_VALUE)
+#define MSI_VALUE                           4000000UL   /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+/**
+  * @brief Internal High Speed oscillator (HSI) value.
+  *        This value is used by the RCC HAL module to compute the system frequency
+  *        (when HSI is used as system clock source, directly or through the PLL).
+  */
+#if !defined  (HSI_VALUE)
+#define HSI_VALUE                           16000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+/**
+  * @brief Internal Low Speed oscillator (LSI) value.
+  */
+#if !defined (LSI_VALUE)
+#define LSI_VALUE                           32000UL     /*!< LSI Typical Value in Hz*/
+#endif /* LSI_VALUE */                                  /*!< Value of the Internal Low Speed oscillator in Hz
+                                                        The real value may vary depending on the variations
+                                                        in voltage and temperature. */
+
+/**
+  * @brief External Low Speed oscillator (LSE) value.
+  *        This value is used by the UART, RTC HAL module to compute the system frequency
+  */
+#if !defined (LSE_VALUE)
+#define LSE_VALUE                           32768UL     /*!< Value of the External oscillator in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @brief Internal Multiple Speed oscillator (HSI48) default value.
+  *        This value is the default HSI48 range value after Reset.
+  */
+#if !defined (HSI48_VALUE)
+#define HSI48_VALUE                         48000000UL  /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI48_VALUE */
+
+#if !defined (LSE_STARTUP_TIMEOUT)
+#define LSE_STARTUP_TIMEOUT                 5000UL      /*!< Time out for LSE start up, in ms */
+#endif /* LSE_STARTUP_TIMEOUT */
+
+/* Tip: To avoid modifying this file each time you need to use different HSE,
+   ===  you can define the HSE value in your toolchain compiler preprocessor. */
+
+/* ########################### System Configuration ######################### */
+/**
+  * @brief This is the HAL system configuration section
+  */
+#define  VDD_VALUE                          3300U                             /*!< Value of VDD in mv */
+#define  TICK_INT_PRIORITY                  ((1uL <<__NVIC_PRIO_BITS) - 1uL)  /*!< tick interrupt priority (lowest by default) */
+#define  USE_RTOS                           0U
+#define  PREFETCH_ENABLE                    0U
+#define  INSTRUCTION_CACHE_ENABLE           1U
+#define  DATA_CACHE_ENABLE                  1U
+
+/* ########################## Assert Selection ############################## */
+/**
+  * @brief Uncomment the line below to expanse the "assert_param" macro in the
+  *        HAL drivers code
+  */
+/* #define USE_FULL_ASSERT    1 */
+
+/* ################## SPI peripheral configuration ########################## */
+
+/* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
+ * Activated: CRC code is present inside driver
+ * Deactivated: CRC code cleaned from driver
+ */
+
+#define USE_SPI_CRC                         1U
+
+/* ################## CRYP peripheral configuration ########################## */
+
+#define USE_HAL_CRYP_SUSPEND_RESUME         1U
+
+/* Includes ------------------------------------------------------------------*/
+/**
+  * @brief Include module's header file
+  */
+#ifdef HAL_DMA_MODULE_ENABLED
+  #include "stm32wlxx_hal_dma.h"
+#endif /* HAL_DMA_MODULE_ENABLED */
+
+#ifdef HAL_ADC_MODULE_ENABLED
+  #include "stm32wlxx_hal_adc.h"
+#endif /* HAL_ADC_MODULE_ENABLED */
+
+#ifdef HAL_COMP_MODULE_ENABLED
+  #include "stm32wlxx_hal_comp.h"
+#endif /* HAL_COMP_MODULE_ENABLED */
+
+#ifdef HAL_CORTEX_MODULE_ENABLED
+  #include "stm32wlxx_hal_cortex.h"
+#endif /* HAL_CORTEX_MODULE_ENABLED */
+
+#ifdef HAL_CRC_MODULE_ENABLED
+  #include "stm32wlxx_hal_crc.h"
+#endif /* HAL_CRC_MODULE_ENABLED */
+
+#ifdef HAL_CRYP_MODULE_ENABLED
+  #include "stm32wlxx_hal_cryp.h"
+#endif /* HAL_CRYP_MODULE_ENABLED */
+
+#ifdef HAL_DAC_MODULE_ENABLED
+  #include "stm32wlxx_hal_dac.h"
+#endif /* HAL_DAC_MODULE_ENABLED */
+
+#ifdef HAL_EXTI_MODULE_ENABLED
+  #include "stm32wlxx_hal_exti.h"
+#endif /* HAL_EXTI_MODULE_ENABLED */
+
+#ifdef HAL_FLASH_MODULE_ENABLED
+  #include "stm32wlxx_hal_flash.h"
+#endif /* HAL_FLASH_MODULE_ENABLED */
+
+#ifdef HAL_GPIO_MODULE_ENABLED
+  #include "stm32wlxx_hal_gpio.h"
+#endif /* HAL_GPIO_MODULE_ENABLED */
+
+#ifdef HAL_GTZC_MODULE_ENABLED
+  #include "stm32wlxx_hal_gtzc.h"
+#endif /* HAL_GTZC_MODULE_ENABLED */
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+  #include "stm32wlxx_hal_hsem.h"
+#endif /* HAL_HSEM_MODULE_ENABLED */
+
+#ifdef HAL_I2C_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2c.h"
+#endif /* HAL_I2C_MODULE_ENABLED */
+
+#ifdef HAL_I2S_MODULE_ENABLED
+  #include "stm32wlxx_hal_i2s.h"
+#endif /* HAL_I2S_MODULE_ENABLED */
+
+#ifdef HAL_IPCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_ipcc.h"
+#endif /* HAL_IPCC_MODULE_ENABLED */
+
+#ifdef HAL_IRDA_MODULE_ENABLED
+  #include "stm32wlxx_hal_irda.h"
+#endif /* HAL_IRDA_MODULE_ENABLED */
+
+#ifdef HAL_IWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_iwdg.h"
+#endif /* HAL_IWDG_MODULE_ENABLED */
+
+#ifdef HAL_LPTIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_lptim.h"
+#endif /* HAL_LPTIM_MODULE_ENABLED */
+
+#ifdef HAL_PKA_MODULE_ENABLED
+  #include "stm32wlxx_hal_pka.h"
+#endif /* HAL_PKA_MODULE_ENABLED */
+
+#ifdef HAL_PWR_MODULE_ENABLED
+  #include "stm32wlxx_hal_pwr.h"
+#endif /* HAL_PWR_MODULE_ENABLED */
+
+#ifdef HAL_RCC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rcc.h"
+#endif /* HAL_RCC_MODULE_ENABLED */
+
+#ifdef HAL_RNG_MODULE_ENABLED
+  #include "stm32wlxx_hal_rng.h"
+#endif /* HAL_RNG_MODULE_ENABLED */
+
+#ifdef HAL_RTC_MODULE_ENABLED
+  #include "stm32wlxx_hal_rtc.h"
+#endif /* HAL_RTC_MODULE_ENABLED */
+
+#ifdef HAL_SMARTCARD_MODULE_ENABLED
+  #include "stm32wlxx_hal_smartcard.h"
+#endif /* HAL_SMARTCARD_MODULE_ENABLED */
+
+#ifdef HAL_SMBUS_MODULE_ENABLED
+  #include "stm32wlxx_hal_smbus.h"
+#endif /* HAL_SMBUS_MODULE_ENABLED */
+
+#ifdef HAL_SPI_MODULE_ENABLED
+  #include "stm32wlxx_hal_spi.h"
+#endif /* HAL_SPI_MODULE_ENABLED */
+
+#ifdef HAL_SUBGHZ_MODULE_ENABLED
+  #include "stm32wlxx_hal_subghz.h"
+#endif /* HAL_SUBGHZ_MODULE_ENABLED */
+
+#ifdef HAL_TIM_MODULE_ENABLED
+  #include "stm32wlxx_hal_tim.h"
+#endif /* HAL_TIM_MODULE_ENABLED */
+
+#ifdef HAL_UART_MODULE_ENABLED
+  #include "stm32wlxx_hal_uart.h"
+#endif /* HAL_UART_MODULE_ENABLED */
+
+#ifdef HAL_USART_MODULE_ENABLED
+  #include "stm32wlxx_hal_usart.h"
+#endif /* HAL_USART_MODULE_ENABLED */
+
+#ifdef HAL_WWDG_MODULE_ENABLED
+  #include "stm32wlxx_hal_wwdg.h"
+#endif /* HAL_WWDG_MODULE_ENABLED */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef USE_FULL_ASSERT
+/**
+  * @brief  The assert_param macro is used for function's parameters check.
+  * @param expr If expr is false, it calls assert_failed function
+  *         which reports the name of the source file and the source
+  *         line number of the call that failed.
+  *         If expr is true, it returns no value.
+  * @retval None
+  */
+  #define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
+/* Exported functions ------------------------------------------------------- */
+  void assert_failed(uint8_t* file, uint32_t line);
+#else
+  #define assert_param(expr) ((void)0U)
+#endif /* USE_FULL_ASSERT */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLxx_HAL_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_it.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_it.h
new file mode 100644
index 00000000..c8123798
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_it.h
@@ -0,0 +1,77 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.h
+  * @brief   This file contains the headers of the interrupt handlers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+ ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __STM32WLxx_IT_H
+#define __STM32WLxx_IT_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler(void);
+void EXTI0_IRQHandler(void);
+void EXTI1_IRQHandler(void);
+void DMA1_Channel5_IRQHandler(void);
+void EXTI9_5_IRQHandler(void);
+void USART2_IRQHandler(void);
+void RTC_Alarm_IRQHandler(void);
+void SUBGHZ_Radio_IRQHandler(void);
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __STM32WLxx_IT_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_nucleo_conf.h
new file mode 100644
index 00000000..af8588aa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -0,0 +1,107 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_nucleo_conf.h
+  * @author  MCD Application Team
+  * @brief   STM32WLxx_Nucleo board configuration file.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef STM32WLXX_NUCLEO_CONF_H
+#define STM32WLXX_NUCLEO_CONF_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32wlxx_hal.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/** @addtogroup BSP
+  * @{
+  */
+
+/** @addtogroup STM32WLXX_NUCLEO
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
+  * @{
+  */
+
+/** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
+  * @{
+  */
+/* COM usage define */
+#define USE_BSP_COM_FEATURE                 0U
+
+/* COM log define */
+#define USE_COM_LOG                         0U
+
+/* IRQ priorities */
+#define BSP_BUTTON_SWx_IT_PRIORITY         15U
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32WLXX_NUCLEO_CONF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/subghz.h
new file mode 100644
index 00000000..0926ffad
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/subghz.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    subghz.h
+  * @brief   This file contains all the function prototypes for
+  *          the subghz.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SUBGHZ_H__
+#define __SUBGHZ_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern SUBGHZ_HandleTypeDef hsubghz;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_SUBGHZ_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SUBGHZ_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_app.h
new file mode 100644
index 00000000..37d3218b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_app.h
@@ -0,0 +1,92 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.h
+  * @author  MCD Application Team
+  * @brief   Function prototypes for sys_app.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_APP_H__
+#define __SYS_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stdint.h"
+#include "sys_conf.h"
+#include "stm32_adv_trace.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#define APP_PPRINTF(...)  do{ } while( UTIL_ADV_TRACE_OK \
+                              != UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__) ) /* Polling Mode */
+#define APP_TPRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_ON, __VA_ARGS__);} }while(0); /* with timestamp */
+#define APP_PRINTF(...)   do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+
+#if defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 1)
+#define APP_LOG(TS,VL,...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0);
+#elif defined (APP_LOG_ENABLED) && (APP_LOG_ENABLED == 0) /* APP_LOG disabled */
+#define APP_LOG(TS,VL,...)
+#else
+#error "APP_LOG_ENABLED not defined or out of range <0,1>"
+#endif /* APP_LOG_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
+  */
+void SystemApp_Init(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_APP_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_conf.h
new file mode 100644
index 00000000..7f902a10
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_conf.h
@@ -0,0 +1,93 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_conf.h
+  * @author  MCD Application Team
+  * @brief   Applicative configuration, e.g. : debug, trace, low power, sensors
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_CONF_H__
+#define __SYS_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+/**
+  * @brief  Verbose level for all trace logs
+  */
+#define VERBOSE_LEVEL               VLEVEL_M
+
+/**
+  * @brief Enable trace logs
+  */
+#define APP_LOG_ENABLED             1
+
+/**
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
+  */
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
+
+/**
+  * @brief Disable Low Power mode
+  * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
+  */
+#define LOW_POWER_DISABLE           0
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_debug.h
new file mode 100644
index 00000000..710e8852
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/sys_debug.h
@@ -0,0 +1,207 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.h
+  * @author  MCD Application Team
+  * @brief   Configuration of the debug.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SYS_DEBUG_H__
+#define __SYS_DEBUG_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "sys_conf.h"
+#include "platform.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* Pin defines */
+
+/**  Definition for Probe Line 1   **/
+/**
+  * @brief Pin of Probe Line 1
+  */
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
+
+/**
+  * @brief Port of Probe Line 1
+  */
+#define PROBE_LINE1_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 1
+  */
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 2   **/
+/**
+  * @brief Pin of Probe Line 2
+  */
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
+
+/**
+  * @brief Port of Probe Line 2
+  */
+#define PROBE_LINE2_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 2
+  */
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 3   **/
+/**
+  * @brief Pin of Probe Line 3
+  */
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
+
+/**
+  * @brief Port of Probe Line 3
+  */
+#define PROBE_LINE3_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 3
+  */
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/**  Definition for Probe Line 4   **/
+/**
+  * @brief Pin of Probe Line 4
+  */
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
+
+/**
+  * @brief Port of Probe Line 4
+  */
+#define PROBE_LINE4_PORT                          GPIOB
+
+/**
+  * @brief Enable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+
+/**
+  * @brief Disable GPIOs clock of Probe Line 4
+  */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
+
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+
+/**
+  * @brief Set pin to high level
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+
+/**
+  * @brief Set pin to low level
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_SET_LINE( gpio, n )
+
+/**
+  * @brief not usable
+  */
+#define PROBE_GPIO_RST_LINE( gpio, n )
+
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
+
+#else
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
+  */
+void DBG_ProbesInit(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SYS_DEBUG_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/timer_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/timer_if.h
new file mode 100644
index 00000000..3bbde030
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/timer_if.h
@@ -0,0 +1,174 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.h
+  * @author  MCD Application Team
+  * @brief  configuration of the timer_if.c instances
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_IF_H__
+#define __TIMER_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+#include "stm32_systime.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief Init RTC hardware
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_Init(void);
+
+/**
+  * @brief Set the alarm
+  * @note The alarm is set at timeout from timer Reference (TimerContext)
+  * @param timeout Duration of the Timer in ticks
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout);
+
+/**
+  * @brief Stop the Alarm
+  * @return Status based on @ref UTIL_TIMER_Status_t
+  */
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void);
+
+/**
+  * @brief set timer Reference (TimerContext)
+  * @return  Timer Reference Value in  Ticks
+  */
+uint32_t TIMER_IF_SetTimerContext(void);
+
+/**
+  * @brief Get the RTC timer Reference
+  * @return Timer Value in  Ticks
+  */
+uint32_t TIMER_IF_GetTimerContext(void);
+
+/**
+  * @brief Get the timer elapsed time since timer Reference (TimerContext) was set
+  * @return RTC Elapsed time in ticks
+  */
+uint32_t TIMER_IF_GetTimerElapsedTime(void);
+
+/**
+  * @brief Get the timer value
+  * @return RTC Timer value in ticks
+  */
+uint32_t TIMER_IF_GetTimerValue(void);
+
+/**
+  * @brief Return the minimum timeout in ticks the RTC is able to handle
+  * @return minimum value for a timeout in ticks
+  */
+uint32_t TIMER_IF_GetMinimumTimeout(void);
+
+/**
+  * @brief a delay of delay ms by polling RTC
+  * @param delay in ms
+  */
+void TIMER_IF_DelayMs(uint32_t delay);
+
+/**
+  * @brief converts time in ms to time in ticks
+  * @param[in] timeMilliSec time in milliseconds
+  * @return time in timer ticks
+  */
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec);
+
+/**
+  * @brief converts time in ticks to time in ms
+  * @param[in] tick time in timer ticks
+  * @return time in timer milliseconds
+  */
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick);
+
+/**
+  * @brief Get rtc time
+  * @param[out] subSeconds in ticks
+  * @return time seconds
+  */
+uint32_t TIMER_IF_GetTime(uint16_t *subSeconds);
+
+/**
+  * @brief write seconds in backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @param[in] Seconds time in seconds
+  */
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds);
+
+/**
+  * @brief reads seconds from backUp register
+  * @note Used to store seconds difference between RTC time and Unix time
+  * @return Time in seconds
+  */
+uint32_t TIMER_IF_BkUp_Read_Seconds(void);
+
+/**
+  * @brief writes SubSeconds in backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @param[in] SubSeconds time in SubSeconds
+  */
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds);
+
+/**
+  * @brief reads SubSeconds from backUp register
+  * @note Used to store SubSeconds difference between RTC time and Unix time
+  * @return Time in SubSeconds
+  */
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/usart.h
new file mode 100644
index 00000000..20bb5dfa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/usart.h
@@ -0,0 +1,52 @@
+/**
+  ******************************************************************************
+  * @file    usart.h
+  * @brief   This file contains all the function prototypes for
+  *          the usart.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_H__
+#define __USART_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+extern UART_HandleTypeDef huart2;
+
+/* USER CODE BEGIN Private defines */
+
+/* USER CODE END Private defines */
+
+void MX_USART2_UART_Init(void);
+
+/* USER CODE BEGIN Prototypes */
+
+/* USER CODE END Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/usart_if.h
new file mode 100644
index 00000000..b1ed2355
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/usart_if.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.h
+  * @author  MCD Application Team
+  * @brief   Header for USART interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+#include "stm32_adv_trace.h"
+#include "usart.h"
+#include "dma.h"
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USART_IF_H__
+#define __USART_IF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init the UART and associated DMA.
+  * @param  cb TxCpltCallback
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *));
+
+/**
+  * @brief  init receiver of vcom
+  * @param  RxCb callback when Rx char is received
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error));
+
+/**
+  * @brief  DeInit the UART and associated DMA.
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom in polling mode
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  */
+void vcom_Trace(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  send buffer \p p_data of size \p size to vcom using DMA
+  * @param  p_data data to be sent
+  * @param  size of buffer p_data to be sent
+  * @return @ref UTIL_ADV_TRACE_Status_t
+  */
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size);
+
+/**
+  * @brief  last byte has been sent on the uart line
+  */
+void vcom_IRQHandler(void);
+
+/**
+  * @brief  last byte has been sent from memory to uart data register
+  */
+void vcom_DMA_TX_IRQHandler(void);
+
+/**
+  * @brief  Resume the UART and associated DMA (used by LPM)
+  */
+void vcom_Resume(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USART_IF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/utilities_conf.h
new file mode 100644
index 00000000..3ceefb9c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/utilities_conf.h
@@ -0,0 +1,162 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_conf.h
+  * @author  MCD Application Team
+  * @brief   Header for configuration file to utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+ */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_CONF_H__
+#define __UTILITIES_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "cmsis_compiler.h"
+
+/* definitions to be provided to "sequencer" utility */
+#include "stm32_mem.h"
+/* definition and callback for tiny_vsnprintf */
+#include "stm32_tiny_vsnprintf.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+
+#define VLEVEL_OFF    0  /*!< used to set UTIL_ADV_TRACE_SetVerboseLevel() (not as message param) */
+#define VLEVEL_ALWAYS 0  /*!< used as message params, if this level is given
+                              trace will be printed even when UTIL_ADV_TRACE_SetVerboseLevel(OFF) */
+#define VLEVEL_L 1       /*!< just essential traces */
+#define VLEVEL_M 2       /*!< functional traces */
+#define VLEVEL_H 3       /*!< all traces */
+
+#define TS_OFF 0         /*!< Log without TimeStamp */
+#define TS_ON 1          /*!< Log with TimeStamp */
+
+#define T_REG_OFF  0     /*!< Log without bitmask */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Memory placement macro
+  */
+#if defined(__CC_ARM)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__), zero_init))
+#elif defined(__ICCARM__)
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#else  /* __GNUC__ */
+#define UTIL_PLACE_IN_SECTION( __x__ )  __attribute__((section (__x__)))
+#endif /* __CC_ARM | __ICCARM__ | __GNUC__ */
+
+/**
+  * @brief Memory alignment macro
+  */
+#undef ALIGN
+#ifdef WIN32
+#define ALIGN(n)
+#else
+#define ALIGN(n)             __attribute__((aligned(n)))
+#endif /* WIN32 */
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTIL_SEQ_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTIL_SEQ_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTIL_SEQ_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()
+
+/**
+  * @brief Memset utilities interface to application
+  */
+#define UTIL_SEQ_MEMSET8( dest, value, size )   UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief macro used to initialize the critical section
+  */
+#define UTILS_INIT_CRITICAL_SECTION()
+
+/**
+  * @brief macro used to enter the critical section
+  */
+#define UTILS_ENTER_CRITICAL_SECTION() uint32_t primask_bit= __get_PRIMASK();\
+  __disable_irq()
+
+/**
+  * @brief macro used to exit the critical section
+  */
+#define UTILS_EXIT_CRITICAL_SECTION()  __set_PRIMASK(primask_bit)
+
+/******************************************************************************
+  * trace\advanced
+  * the define option
+  *    UTIL_ADV_TRACE_CONDITIONNAL shall be defined if you want use conditional function
+  *    UTIL_ADV_TRACE_UNCHUNK_MODE shall be defined if you want use the unchunk mode
+  *
+  ******************************************************************************/
+
+#define UTIL_ADV_TRACE_CONDITIONNAL                                                      /*!< not used */
+#define UTIL_ADV_TRACE_UNCHUNK_MODE                                                      /*!< not used */
+#define UTIL_ADV_TRACE_DEBUG(...)                                                        /*!< not used */
+#define UTIL_ADV_TRACE_INIT_CRITICAL_SECTION( )    UTILS_INIT_CRITICAL_SECTION()         /*!< init the critical section in trace feature */
+#define UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION( )   UTILS_ENTER_CRITICAL_SECTION()        /*!< enter the critical section in trace feature */
+#define UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION( )    UTILS_EXIT_CRITICAL_SECTION()         /*!< exit the critical section in trace feature */
+#define UTIL_ADV_TRACE_TMP_BUF_SIZE                (256U)                                /*!< default trace buffer size */
+#define UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE      (15U)                                 /*!< default trace timestamp size */
+#define UTIL_ADV_TRACE_FIFO_SIZE                   (512U)                                /*!< default trace fifo size */
+#define UTIL_ADV_TRACE_MEMSET8( dest, value, size) UTIL_MEM_set_8((dest),(value),(size)) /*!< memset utilities interface to trace feature */
+#define UTIL_ADV_TRACE_VSNPRINTF(...)              tiny_vsnprintf_like(__VA_ARGS__)      /*!< vsnprintf utilities interface to trace feature */
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__UTILITIES_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/utilities_def.h
new file mode 100644
index 00000000..70589b17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Inc/utilities_def.h
@@ -0,0 +1,115 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    utilities_def.h
+  * @author  MCD Application Team
+  * @brief   Definitions for modules requiring utilities
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __UTILITIES_DEF_H__
+#define __UTILITIES_DEF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/******************************************************************************
+  * LOW POWER MANAGER
+  ******************************************************************************/
+/**
+  * Supported requester to the MCU Low Power Manager - can be increased up  to 32
+  * It lists a bit mapping of all user of the Low Power Manager
+  */
+typedef enum
+{
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
+  CFG_LPM_APPLI_Id,
+  CFG_LPM_UART_TX_Id,
+  /* USER CODE BEGIN CFG_LPM_Id_t */
+
+  /* USER CODE END CFG_LPM_Id_t */
+} CFG_LPM_Id_t;
+
+/*---------------------------------------------------------------------------*/
+/*                             sequencer definitions                         */
+/*---------------------------------------------------------------------------*/
+
+/**
+  * This is the list of priority required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Prio_0,
+  /* USER CODE BEGIN CFG_SEQ_Prio_Id_t */
+
+  /* USER CODE END CFG_SEQ_Prio_Id_t */
+  CFG_SEQ_Prio_NBR,
+} CFG_SEQ_Prio_Id_t;
+
+/**
+  * This is the list of task id required by the application
+  * Each Id shall be in the range 0..31
+  */
+typedef enum
+{
+  CFG_SEQ_Task_SubGHz_Phy_App_Process,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t */
+  CFG_SEQ_Task_NBR
+} CFG_SEQ_Task_Id_t;
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __UTILITIES_DEF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/dma.c
new file mode 100644
index 00000000..b93bda5c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/dma.c
@@ -0,0 +1,56 @@
+/**
+  ******************************************************************************
+  * @file    dma.c
+  * @brief   This file provides code for the configuration
+  *          of all the requested memory to memory DMA transfers.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "dma.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/*----------------------------------------------------------------------------*/
+/* Configure DMA                                                              */
+/*----------------------------------------------------------------------------*/
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/**
+  * Enable DMA controller clock
+  */
+void MX_DMA_Init(void)
+{
+
+  /* DMA controller clock enable */
+  __HAL_RCC_DMAMUX1_CLK_ENABLE();
+  __HAL_RCC_DMA1_CLK_ENABLE();
+
+  /* DMA interrupt init */
+  /* DMA1_Channel5_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel5_IRQn, 2, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel5_IRQn);
+
+}
+
+/* USER CODE BEGIN 2 */
+
+/* USER CODE END 2 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/main.c
new file mode 100644
index 00000000..e6ab2757
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/main.c
@@ -0,0 +1,188 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file           : main.c
+  * @brief          : Main program body
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "app_subghz_phy.h"
+
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+void SystemClock_Config(void);
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
+int main(void)
+{
+  /* USER CODE BEGIN 1 */
+
+  /* USER CODE END 1 */
+
+  /* MCU Configuration--------------------------------------------------------*/
+
+  /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
+  HAL_Init();
+
+  /* USER CODE BEGIN Init */
+
+  /* USER CODE END Init */
+
+  /* Configure the system clock */
+  SystemClock_Config();
+
+  /* USER CODE BEGIN SysInit */
+
+  /* USER CODE END SysInit */
+
+  /* Initialize all configured peripherals */
+  MX_SubGHz_Phy_Init();
+  /* USER CODE BEGIN 2 */
+
+  /* USER CODE END 2 */
+
+  /* Infinite loop */
+  /* USER CODE BEGIN WHILE */
+  while (1)
+  {
+    /* USER CODE END WHILE */
+    MX_SubGHz_Phy_Process();
+
+    /* USER CODE BEGIN 3 */
+  }
+  /* USER CODE END 3 */
+}
+
+/**
+  * @brief System Clock Configuration
+  * @retval None
+  */
+void SystemClock_Config(void)
+{
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+  RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+
+  /** Configure LSE Drive Capability
+  */
+  HAL_PWR_EnableBkUpAccess();
+  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+  /** Configure the main internal regulator output voltage
+  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+  /** Initializes the CPU, AHB and APB busses clocks
+  */
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
+  RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.MSIState = RCC_MSI_ON;
+  RCC_OscInitStruct.MSICalibrationValue = RCC_MSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_11;
+  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
+  if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Configure the SYSCLKSource, HCLK, PCLK1 and PCLK2 clocks dividers
+  */
+  RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK3|RCC_CLOCKTYPE_HCLK
+                              |RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1
+                              |RCC_CLOCKTYPE_PCLK2;
+  RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_MSI;
+  RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+  RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+  RCC_ClkInitStruct.AHBCLK3Divider = RCC_SYSCLK_DIV1;
+
+  if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+}
+
+/* USER CODE BEGIN 4 */
+
+/* USER CODE END 4 */
+
+/**
+  * @brief  This function is executed in case of error occurrence.
+  * @retval None
+  */
+void Error_Handler(void)
+{
+  /* USER CODE BEGIN Error_Handler_Debug */
+  /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
+  while (1)
+  {
+  }
+  /* USER CODE END Error_Handler_Debug */
+}
+
+#ifdef  USE_FULL_ASSERT
+/**
+  * @brief  Reports the name of the source file and the source line number
+  *         where the assert_param error has occurred.
+  * @param  file: pointer to the source file name
+  * @param  line: assert_param error line source number
+  * @retval None
+  */
+void assert_failed(uint8_t *file, uint32_t line)
+{
+  /* USER CODE BEGIN 6 */
+  /* User can add his own implementation to report the file name and line number,
+     ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
+  while (1)
+  {
+  }
+  /* USER CODE END 6 */
+}
+#endif /* USE_FULL_ASSERT */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/rtc.c
new file mode 100644
index 00000000..c616f129
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/rtc.c
@@ -0,0 +1,143 @@
+/**
+  ******************************************************************************
+  * @file    rtc.c
+  * @brief   This file provides code for the configuration
+  *          of the RTC instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "rtc.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+RTC_HandleTypeDef hrtc;
+
+/* RTC init function */
+void MX_RTC_Init(void)
+{
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
+  RTC_AlarmTypeDef sAlarm = {0};
+
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
+  /** Initialize RTC Only
+  */
+  hrtc.Instance = RTC;
+  hrtc.Init.AsynchPrediv = RTC_PREDIV_A;
+  hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
+  hrtc.Init.OutPutRemap = RTC_OUTPUT_REMAP_NONE;
+  hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
+  hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
+  hrtc.Init.OutPutPullUp = RTC_OUTPUT_PULLUP_NONE;
+  hrtc.Init.BinMode = RTC_BINARY_ONLY;
+  if (HAL_RTC_Init(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /* USER CODE BEGIN Check_RTC_BKUP */
+
+  /* USER CODE END Check_RTC_BKUP */
+
+  /** Initialize RTC and set the Time and Date
+  */
+  if (HAL_RTCEx_SetSSRU_IT(&hrtc) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /** Enable the Alarm A
+  */
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = 0x0;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
+
+}
+
+void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspInit 0 */
+
+  /* USER CODE END RTC_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC;
+    PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* RTC clock enable */
+    __HAL_RCC_RTC_ENABLE();
+    __HAL_RCC_RTCAPB_CLK_ENABLE();
+
+    /* RTC interrupt Init */
+    HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_SSRU_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn);
+    HAL_NVIC_SetPriority(RTC_Alarm_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn);
+  /* USER CODE BEGIN RTC_MspInit 1 */
+
+  /* USER CODE END RTC_MspInit 1 */
+  }
+}
+
+void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
+{
+
+  if(rtcHandle->Instance==RTC)
+  {
+  /* USER CODE BEGIN RTC_MspDeInit 0 */
+
+  /* USER CODE END RTC_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_RTC_DISABLE();
+    __HAL_RCC_RTCAPB_CLK_DISABLE();
+
+    /* RTC interrupt Deinit */
+    HAL_NVIC_DisableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn);
+    HAL_NVIC_DisableIRQ(RTC_Alarm_IRQn);
+  /* USER CODE BEGIN RTC_MspDeInit 1 */
+
+  /* USER CODE END RTC_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32_lpm_if.c
new file mode 100644
index 00000000..99f840e9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32_lpm_if.c
@@ -0,0 +1,168 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32_lpm_if.c
+  * @author  MCD Application Team
+  * @brief   Low layer function to enter/exit low power modes (stop, sleep)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "stm32_lpm.h"
+#include "stm32_lpm_if.h"
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Power driver callbacks handler
+  */
+const struct UTIL_LPM_Driver_s UTIL_PowerDriver =
+{
+  PWR_EnterSleepMode,
+  PWR_ExitSleepMode,
+
+  PWR_EnterStopMode,
+  PWR_ExitStopMode,
+
+  PWR_EnterOffMode,
+  PWR_ExitOffMode,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void PWR_EnterOffMode(void)
+{
+  /* USER CODE BEGIN EnterOffMode_1 */
+
+  /* USER CODE END EnterOffMode_1 */
+}
+
+void PWR_ExitOffMode(void)
+{
+  /* USER CODE BEGIN ExitOffMode_1 */
+
+  /* USER CODE END ExitOffMode_1 */
+}
+
+void PWR_EnterStopMode(void)
+{
+  /* USER CODE BEGIN EnterStopMode_1 */
+
+  /* USER CODE END EnterStopMode_1 */
+  HAL_SuspendTick();
+  /* Clear Status Flag before entering STOP/STANDBY Mode */
+  LL_PWR_ClearFlag_C1STOP_C1STB();
+
+  /* USER CODE BEGIN EnterStopMode_2 */
+
+  /* USER CODE END EnterStopMode_2 */
+  HAL_PWREx_EnterSTOP2Mode(PWR_STOPENTRY_WFI);
+  /* USER CODE BEGIN EnterStopMode_3 */
+
+  /* USER CODE END EnterStopMode_3 */
+}
+
+void PWR_ExitStopMode(void)
+{
+  /* USER CODE BEGIN ExitStopMode_1 */
+
+  /* USER CODE END ExitStopMode_1 */
+  /* Resume sysTick : work around for debugger problem in dual core */
+  HAL_ResumeTick();
+  /*Not retained periph:
+    ADC interface
+    DAC interface USARTx, TIMx, i2Cx, SPIx
+    SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM  */
+
+  /* Resume not retained USARTx and DMA */
+  vcom_Resume();
+  /* USER CODE BEGIN ExitStopMode_2 */
+
+  /* USER CODE END ExitStopMode_2 */
+}
+
+void PWR_EnterSleepMode(void)
+{
+  /* USER CODE BEGIN EnterSleepMode_1 */
+
+  /* USER CODE END EnterSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_SuspendTick();
+  /* USER CODE BEGIN EnterSleepMode_2 */
+
+  /* USER CODE END EnterSleepMode_2 */
+  HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+  /* USER CODE BEGIN EnterSleepMode_3 */
+
+  /* USER CODE END EnterSleepMode_3 */
+}
+
+void PWR_ExitSleepMode(void)
+{
+  /* USER CODE BEGIN ExitSleepMode_1 */
+
+  /* USER CODE END ExitSleepMode_1 */
+  /* Suspend sysTick */
+  HAL_ResumeTick();
+
+  /* USER CODE BEGIN ExitSleepMode_2 */
+
+  /* USER CODE END ExitSleepMode_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32wlxx_hal_msp.c
new file mode 100644
index 00000000..ea7dc033
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32wlxx_hal_msp.c
@@ -0,0 +1,81 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file         stm32wlxx_hal_msp.c
+  * @brief        This file provides code for the MSP Initialization
+  *               and de-Initialization codes.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN Define */
+
+/* USER CODE END Define */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN Macro */
+
+/* USER CODE END Macro */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* External functions --------------------------------------------------------*/
+/* USER CODE BEGIN ExternalFunctions */
+
+/* USER CODE END ExternalFunctions */
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+/**
+  * Initializes the Global MSP.
+  */
+void HAL_MspInit(void)
+{
+  /* USER CODE BEGIN MspInit 0 */
+
+  /* USER CODE END MspInit 0 */
+
+  /* System interrupt init*/
+
+  /* USER CODE BEGIN MspInit 1 */
+
+  /* USER CODE END MspInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32wlxx_it.c
new file mode 100644
index 00000000..7c2c1073
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/stm32wlxx_it.c
@@ -0,0 +1,319 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    stm32wlxx_it.c
+  * @brief   Interrupt Service Routines.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "main.h"
+#include "stm32wlxx_it.h"
+/* Private includes ----------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+/* USER CODE END Includes */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN TD */
+
+/* USER CODE END TD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Private user code ---------------------------------------------------------*/
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+/* External variables --------------------------------------------------------*/
+extern RTC_HandleTypeDef hrtc;
+extern SUBGHZ_HandleTypeDef hsubghz;
+extern DMA_HandleTypeDef hdma_usart2_tx;
+extern UART_HandleTypeDef huart2;
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/******************************************************************************/
+/*           Cortex Processor Interruption and Exception Handlers          */
+/******************************************************************************/
+/**
+  * @brief This function handles Non maskable interrupt.
+  */
+void NMI_Handler(void)
+{
+  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
+
+  /* USER CODE END NonMaskableInt_IRQn 0 */
+  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
+  while (1)
+  {
+  }
+  /* USER CODE END NonMaskableInt_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Hard fault interrupt.
+  */
+void HardFault_Handler(void)
+{
+  /* USER CODE BEGIN HardFault_IRQn 0 */
+
+  /* USER CODE END HardFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+    /* USER CODE END W1_HardFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Memory management fault.
+  */
+void MemManage_Handler(void)
+{
+  /* USER CODE BEGIN MemoryManagement_IRQn 0 */
+
+  /* USER CODE END MemoryManagement_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_MemoryManagement_IRQn 0 */
+    /* USER CODE END W1_MemoryManagement_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Prefetch fault, memory access fault.
+  */
+void BusFault_Handler(void)
+{
+  /* USER CODE BEGIN BusFault_IRQn 0 */
+
+  /* USER CODE END BusFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_BusFault_IRQn 0 */
+    /* USER CODE END W1_BusFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles Undefined instruction or illegal state.
+  */
+void UsageFault_Handler(void)
+{
+  /* USER CODE BEGIN UsageFault_IRQn 0 */
+
+  /* USER CODE END UsageFault_IRQn 0 */
+  while (1)
+  {
+    /* USER CODE BEGIN W1_UsageFault_IRQn 0 */
+    /* USER CODE END W1_UsageFault_IRQn 0 */
+  }
+}
+
+/**
+  * @brief This function handles System service call via SWI instruction.
+  */
+void SVC_Handler(void)
+{
+  /* USER CODE BEGIN SVCall_IRQn 0 */
+
+  /* USER CODE END SVCall_IRQn 0 */
+  /* USER CODE BEGIN SVCall_IRQn 1 */
+
+  /* USER CODE END SVCall_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Debug monitor.
+  */
+void DebugMon_Handler(void)
+{
+  /* USER CODE BEGIN DebugMonitor_IRQn 0 */
+
+  /* USER CODE END DebugMonitor_IRQn 0 */
+  /* USER CODE BEGIN DebugMonitor_IRQn 1 */
+
+  /* USER CODE END DebugMonitor_IRQn 1 */
+}
+
+/**
+  * @brief This function handles Pendable request for system service.
+  */
+void PendSV_Handler(void)
+{
+  /* USER CODE BEGIN PendSV_IRQn 0 */
+
+  /* USER CODE END PendSV_IRQn 0 */
+  /* USER CODE BEGIN PendSV_IRQn 1 */
+
+  /* USER CODE END PendSV_IRQn 1 */
+}
+
+/**
+  * @brief This function handles System tick timer.
+  */
+void SysTick_Handler(void)
+{
+  /* USER CODE BEGIN SysTick_IRQn 0 */
+
+  /* USER CODE END SysTick_IRQn 0 */
+  /* USER CODE BEGIN SysTick_IRQn 1 */
+
+  /* USER CODE END SysTick_IRQn 1 */
+}
+
+/******************************************************************************/
+/* STM32WLxx Peripheral Interrupt Handlers                                    */
+/* Add here the Interrupt Handlers for the used peripherals.                  */
+/* For the available peripheral interrupt handler names,                      */
+/* please refer to the startup file (startup_stm32wlxx.s).                    */
+/******************************************************************************/
+
+/**
+  * @brief This function handles RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts.
+  */
+void TAMP_STAMP_LSECSS_SSRU_IRQHandler(void)
+{
+  /* USER CODE BEGIN TAMP_STAMP_LSECSS_SSRU_IRQn 0 */
+
+  /* USER CODE END TAMP_STAMP_LSECSS_SSRU_IRQn 0 */
+  HAL_RTCEx_SSRUIRQHandler(&hrtc);
+  /* USER CODE BEGIN TAMP_STAMP_LSECSS_SSRU_IRQn 1 */
+
+  /* USER CODE END TAMP_STAMP_LSECSS_SSRU_IRQn 1 */
+}
+
+/**
+  * @brief This function handles EXTI Line 0 Interrupt.
+  */
+void EXTI0_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI0_IRQn 0 */
+
+  /* USER CODE END EXTI0_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
+  /* USER CODE BEGIN EXTI0_IRQn 1 */
+
+  /* USER CODE END EXTI0_IRQn 1 */
+}
+
+/**
+  * @brief This function handles EXTI Line 1 Interrupt.
+  */
+void EXTI1_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI1_IRQn 0 */
+
+  /* USER CODE END EXTI1_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1);
+  /* USER CODE BEGIN EXTI1_IRQn 1 */
+
+  /* USER CODE END EXTI1_IRQn 1 */
+}
+
+/**
+  * @brief This function handles DMA1 Channel 5 Interrupt.
+  */
+void DMA1_Channel5_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart2_tx);
+  /* USER CODE BEGIN DMA1_Channel5_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel5_IRQn 1 */
+}
+
+/**
+  * @brief This function handles EXTI Lines [9:5] Interrupt.
+  */
+void EXTI9_5_IRQHandler(void)
+{
+  /* USER CODE BEGIN EXTI9_5_IRQn 0 */
+
+  /* USER CODE END EXTI9_5_IRQn 0 */
+  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_6);
+  /* USER CODE BEGIN EXTI9_5_IRQn 1 */
+
+  /* USER CODE END EXTI9_5_IRQn 1 */
+}
+
+/**
+  * @brief This function handles USART2 Interrupt.
+  */
+void USART2_IRQHandler(void)
+{
+  /* USER CODE BEGIN USART2_IRQn 0 */
+
+  /* USER CODE END USART2_IRQn 0 */
+  HAL_UART_IRQHandler(&huart2);
+  /* USER CODE BEGIN USART2_IRQn 1 */
+
+  /* USER CODE END USART2_IRQn 1 */
+}
+
+/**
+  * @brief This function handles RTC Alarms (A and B) Interrupt.
+  */
+void RTC_Alarm_IRQHandler(void)
+{
+  /* USER CODE BEGIN RTC_Alarm_IRQn 0 */
+
+  /* USER CODE END RTC_Alarm_IRQn 0 */
+  HAL_RTC_AlarmIRQHandler(&hrtc);
+  /* USER CODE BEGIN RTC_Alarm_IRQn 1 */
+
+  /* USER CODE END RTC_Alarm_IRQn 1 */
+}
+
+/**
+  * @brief This function handles SUBGHZ Radio Interrupt.
+  */
+void SUBGHZ_Radio_IRQHandler(void)
+{
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 0 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 0 */
+  HAL_SUBGHZ_IRQHandler(&hsubghz);
+  /* USER CODE BEGIN SUBGHZ_Radio_IRQn 1 */
+
+  /* USER CODE END SUBGHZ_Radio_IRQn 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/subghz.c
new file mode 100644
index 00000000..7b7dba4b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/subghz.c
@@ -0,0 +1,88 @@
+/**
+  ******************************************************************************
+  * @file    subghz.c
+  * @brief   This file provides code for the configuration
+  *          of the SUBGHZ instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "subghz.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+SUBGHZ_HandleTypeDef hsubghz;
+
+/* SUBGHZ init function */
+void MX_SUBGHZ_Init(void)
+{
+
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
+  hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
+  if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
+
+}
+
+void HAL_SUBGHZ_MspInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspInit 0 */
+
+  /* USER CODE END SUBGHZ_MspInit 0 */
+    /* SUBGHZ clock enable */
+    __HAL_RCC_SUBGHZSPI_CLK_ENABLE();
+
+    /* SUBGHZ interrupt Init */
+    HAL_NVIC_SetPriority(SUBGHZ_Radio_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspInit 1 */
+
+  /* USER CODE END SUBGHZ_MspInit 1 */
+}
+
+void HAL_SUBGHZ_MspDeInit(SUBGHZ_HandleTypeDef* subghzHandle)
+{
+
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 0 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_SUBGHZSPI_CLK_DISABLE();
+
+    /* SUBGHZ interrupt Deinit */
+    HAL_NVIC_DisableIRQ(SUBGHZ_Radio_IRQn);
+  /* USER CODE BEGIN SUBGHZ_MspDeInit 1 */
+
+  /* USER CODE END SUBGHZ_MspDeInit 1 */
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/sys_app.c
new file mode 100644
index 00000000..65e86d0b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/sys_app.c
@@ -0,0 +1,249 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_app.c
+  * @author  MCD Application Team
+  * @brief   Initializes HW and SW system entities (not related to the radio)
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <stdio.h>
+#include "platform.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+#include "stm32_systime.h"
+#include "stm32_lpm.h"
+#include "timer_if.h"
+#include "utilities_def.h"
+#include "sys_debug.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+#define MAX_TS_SIZE (int) 16
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
+  */
+static void TimestampNow(uint8_t *buff, uint16_t *size);
+
+/**
+  * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
+  */
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SystemApp_Init(void)
+{
+  /* USER CODE BEGIN SystemApp_Init_1 */
+
+  /* USER CODE END SystemApp_Init_1 */
+
+  /* Ensure that MSI is wake-up system clock */
+  __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
+
+  /*Initialize timer and RTC*/
+  UTIL_TIMER_Init();
+
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
+
+  /*Initialize the terminal */
+  UTIL_ADV_TRACE_Init();
+  UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
+
+  /*Set verbose LEVEL*/
+  UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
+  /*Init low power manager*/
+  UTIL_LPM_Init();
+  /* Disable Stand-by mode */
+  UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+
+#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
+  /* Disable Stop Mode */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
+#elif !defined (LOW_POWER_DISABLE)
+#error LOW_POWER_DISABLE not defined
+#endif /* LOW_POWER_DISABLE */
+
+  /* USER CODE BEGIN SystemApp_Init_2 */
+
+  /* USER CODE END SystemApp_Init_2 */
+}
+
+/**
+  * @brief redefines __weak function in stm32_seq.c such to enter low power
+  */
+void UTIL_SEQ_Idle(void)
+{
+  /* USER CODE BEGIN UTIL_SEQ_Idle_1 */
+
+  /* USER CODE END UTIL_SEQ_Idle_1 */
+  UTIL_LPM_EnterLowPower();
+  /* USER CODE BEGIN UTIL_SEQ_Idle_2 */
+
+  /* USER CODE END UTIL_SEQ_Idle_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+
+static void TimestampNow(uint8_t *buff, uint16_t *size)
+{
+  /* USER CODE BEGIN TimestampNow_1 */
+
+  /* USER CODE END TimestampNow_1 */
+  SysTime_t curtime = SysTimeGet();
+  tiny_snprintf_like((char *)buff, MAX_TS_SIZE, "%ds%03d:", curtime.Seconds, curtime.SubSeconds);
+  *size = strlen((char *)buff);
+  /* USER CODE BEGIN TimestampNow_2 */
+
+  /* USER CODE END TimestampNow_2 */
+}
+
+/* Disable StopMode when traces need to be printed */
+void UTIL_ADV_TRACE_PreSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_1 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_DISABLE);
+  /* USER CODE BEGIN UTIL_ADV_TRACE_PreSendHook_2 */
+
+  /* USER CODE END UTIL_ADV_TRACE_PreSendHook_2 */
+}
+/* Re-enable StopMode when traces have been printed */
+void UTIL_ADV_TRACE_PostSendHook(void)
+{
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_1 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_1 */
+  UTIL_LPM_SetStopMode((1 << CFG_LPM_UART_TX_Id), UTIL_LPM_ENABLE);
+  /* USER CODE BEGIN UTIL_LPM_SetStopMode_2 */
+
+  /* USER CODE END UTIL_LPM_SetStopMode_2 */
+}
+
+static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...)
+{
+  /* USER CODE BEGIN tiny_snprintf_like_1 */
+
+  /* USER CODE END tiny_snprintf_like_1 */
+  va_list vaArgs;
+  va_start(vaArgs, strFormat);
+  UTIL_ADV_TRACE_VSNPRINTF(buf, maxsize, strFormat, vaArgs);
+  va_end(vaArgs);
+  /* USER CODE BEGIN tiny_snprintf_like_2 */
+
+  /* USER CODE END tiny_snprintf_like_2 */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/* HAL overload functions ---------------------------------------------------------*/
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
+{
+  /*Don't enable SysTick if TIMER_IF is based on other counters (e.g. RTC) */
+  /* USER CODE BEGIN HAL_InitTick_1 */
+
+  /* USER CODE END HAL_InitTick_1 */
+  return HAL_OK;
+  /* USER CODE BEGIN HAL_InitTick_2 */
+
+  /* USER CODE END HAL_InitTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+uint32_t HAL_GetTick(void)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_GetTick_1 */
+
+  /* USER CODE END HAL_GetTick_1 */
+  return TIMER_IF_GetTimerValue();
+  /* USER CODE BEGIN HAL_GetTick_2 */
+
+  /* USER CODE END HAL_GetTick_2 */
+}
+
+/**
+  * @note This function overwrites the __weak one from HAL
+  */
+void HAL_Delay(__IO uint32_t Delay)
+{
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
+  /* USER CODE BEGIN HAL_Delay_1 */
+
+  /* USER CODE END HAL_Delay_1 */
+  TIMER_IF_DelayMs(Delay);
+  /* USER CODE BEGIN HAL_Delay_2 */
+
+  /* USER CODE END HAL_Delay_2 */
+}
+
+/* USER CODE BEGIN Overload_HAL_weaks */
+
+/* USER CODE END Overload_HAL_weaks */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/sys_debug.c
new file mode 100644
index 00000000..f0395f5c
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/sys_debug.c
@@ -0,0 +1,234 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    sys_debug.c
+  * @author  MCD Application Team
+  * @brief   Enables 4 debug pins for internal signals RealTime debugging
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sys_debug.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
+{
+  /* USER CODE BEGIN DBG_Init_1 */
+
+  /* USER CODE END DBG_Init_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull   = GPIO_PULLUP;
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
+
+  /*spi dbg*/
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_SUBGHZSPI;
+  __HAL_RCC_GPIOA_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* Busy */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_12);
+  GPIO_InitStruct.Alternate  = GPIO_AF6_RF_BUSY;
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
+
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
+
+  /* USER CODE END DBG_ProbesInit_3 */
+
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
+
+  /* USER CODE END DBG_ProbesInit_Last */
+}
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/system_stm32wlxx.c
new file mode 100644
index 00000000..3ce5556b
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/system_stm32wlxx.c
@@ -0,0 +1,359 @@
+/**
+  ******************************************************************************
+  * @file    system_stm32wlxx.c
+  * @author  MCD Application Team
+  * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
+  *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  *   This file provides two functions and one global variable to be called from
+  *   user application:
+  *      - SystemInit(): This function is called at startup just after reset and
+  *                      before branch to main program. This call is made inside
+  *                      the "startup_stm32wlxx.s" file.
+  *
+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used
+  *                                  by the user application to setup the SysTick
+  *                                  timer or configure other parameters.
+  *
+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must
+  *                                 be called whenever the core clock is changed
+  *                                 during program execution.
+  *
+  *   After each device reset the MSI (4 MHz) is used as system clock source.
+  *   Then SystemInit() function is called, in "startup_stm32wlxx.s" file, to
+  *   configure the system clock before to branch to main program.
+  *
+  *   This file configures the system clock as follows:
+  *=============================================================================
+  *-----------------------------------------------------------------------------
+  *        System Clock source                    | MSI
+  *-----------------------------------------------------------------------------
+  *        SYSCLK(Hz)                             | 4000000
+  *-----------------------------------------------------------------------------
+  *        HCLK(Hz)                               | 4000000
+  *-----------------------------------------------------------------------------
+  *        AHB Prescaler                          | 1
+  *-----------------------------------------------------------------------------
+  *        APB1 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        APB2 Prescaler                         | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_M                                  | 1
+  *-----------------------------------------------------------------------------
+  *        PLL_N                                  | 8
+  *-----------------------------------------------------------------------------
+  *        PLL_P                                  | 7
+  *-----------------------------------------------------------------------------
+  *        PLL_Q                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLL_R                                  | 2
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_P                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_Q                              | NA
+  *-----------------------------------------------------------------------------
+  *        PLLSAI1_R                              | NA
+  *-----------------------------------------------------------------------------
+  *        Require 48MHz for USB OTG FS,          | Disabled
+  *        SDIO and RNG clock                     |
+  *-----------------------------------------------------------------------------
+  *=============================================================================
+  */
+
+/** @addtogroup CMSIS
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_system
+  * @{
+  */
+
+/** @addtogroup stm32WLxx_System_Private_Includes
+  * @{
+  */
+
+#include "stm32wlxx.h"
+
+#if !defined  (HSE_VALUE)
+  #define HSE_VALUE    (32000000UL) /*!< Value of the External oscillator in Hz */
+#endif /* HSE_VALUE */
+
+#if !defined  (MSI_VALUE)
+   #define MSI_VALUE    (4000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* MSI_VALUE */
+
+#if !defined  (HSI_VALUE)
+  #define HSI_VALUE    (16000000UL) /*!< Value of the Internal oscillator in Hz*/
+#endif /* HSI_VALUE */
+
+#if !defined  (LSI_VALUE)
+ #define LSI_VALUE  (32000UL)       /*!< Value of LSI in Hz*/
+#endif /* LSI_VALUE */
+
+#if !defined  (LSE_VALUE)
+  #define LSE_VALUE    (32768UL)    /*!< Value of LSE in Hz*/
+#endif /* LSE_VALUE */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_TypesDefinitions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Defines
+  * @{
+  */
+
+/* Note: Following vector table addresses must be defined in line with linker
+         configuration. */
+/*!< Uncomment the following line if you need to relocate CPU1 CM4 and/or CPU2
+     CM0+ vector table anywhere in Sram or Flash. Else vector table will be kept
+     at address 0x00 which correspond to automatic remap of boot address selected */
+/* #define USER_VECT_TAB_ADDRESS */
+#if defined(USER_VECT_TAB_ADDRESS)
+#ifdef CORE_CM0PLUS
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM2_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00008000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x100. */
+#define VECT_TAB_OFFSET         0x00020000U        /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x100. */
+#endif
+#else /* CORE_CM4 */
+ /*!< Uncomment this line for user vector table remap in Sram else user remap
+      will be done in Flash. */
+/* #define VECT_TAB_SRAM */
+#if defined(VECT_TAB_SRAM)
+#define VECT_TAB_BASE_ADDRESS   SRAM1_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#else
+#define VECT_TAB_BASE_ADDRESS   FLASH_BASE      /*!< Vector Table base address field.
+                                                     This value must be a multiple of 0x200. */
+#define VECT_TAB_OFFSET         0x00000000U     /*!< Vector Table base offset field.
+                                                     This value must be a multiple of 0x200. */
+#endif
+#endif
+#endif
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Variables
+  * @{
+  */
+  /* The SystemCoreClock variable is updated in three ways:
+      1) from within HAL_Init()
+      2) by calling CMSIS function SystemCoreClockUpdate()
+      3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
+  */
+  uint32_t SystemCoreClock  = 4000000UL; /*CPU1: M4 on MSI clock after startup (4MHz)*/
+
+  const uint32_t AHBPrescTable[16UL] = {1UL, 3UL, 5UL, 1UL, 1UL, 6UL, 10UL, 32UL, 2UL, 4UL, 8UL, 16UL, 64UL, 128UL, 256UL, 512UL};
+
+  const uint32_t APBPrescTable[8UL]  = {0UL, 0UL, 0UL, 0UL, 1UL, 2UL, 3UL, 4UL};
+
+  const uint32_t MSIRangeTable[16UL] = {100000UL, 200000UL, 400000UL, 800000UL, 1000000UL, 2000000UL, \
+    4000000UL, 8000000UL, 16000000UL, 24000000UL, 32000000UL, 48000000UL, 0UL, 0UL, 0UL, 0UL}; /* 0UL values are incorrect cases */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @addtogroup STM32WLxx_System_Private_Functions
+  * @{
+  */
+
+/**
+  * @brief  Setup the microcontroller system.
+  * @param  None
+  * @retval None
+  */
+void SystemInit(void)
+{
+#if defined(USER_VECT_TAB_ADDRESS)
+  /* Configure the Vector Table location add offset address ------------------*/
+  SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET;
+#endif
+
+  /* FPU settings ------------------------------------------------------------*/
+#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
+  SCB->CPACR |= ((3UL << (10UL*2UL))|(3UL << (11UL*2UL)));  /* set CP10 and CP11 Full Access */
+#endif
+}
+
+/**
+  * @brief  Update SystemCoreClock variable according to Clock Register Values.
+  *         The SystemCoreClock variable contains the core clock (HCLK), it can
+  *         be used by the user application to setup the SysTick timer or configure
+  *         other parameters.
+  *
+  * @note   Each time the core clock (HCLK) changes, this function must be called
+  *         to update SystemCoreClock variable value. Otherwise, any configuration
+  *         based on this variable will be incorrect.
+  *
+  * @note   - The system frequency computed by this function is not the real
+  *           frequency in the chip. It is calculated based on the predefined
+  *           constant and the selected clock source:
+  *
+  *           - If SYSCLK source is MSI, SystemCoreClock will contain the MSI_VALUE(*)
+  *
+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(**)
+  *
+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(***)
+  *
+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(***)
+  *             or HSI_VALUE(*) or MSI_VALUE(*) multiplied/divided by the PLL factors.
+  *
+  *         (*) MSI_VALUE is a constant defined in stm32wlxx_hal.h file (default value
+  *             4 MHz) but the real value may vary depending on the variations
+  *             in voltage and temperature.
+  *
+  *         (**) HSI_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              16 MHz) but the real value may vary depending on the variations
+  *              in voltage and temperature.
+  *
+  *         (***) HSE_VALUE is a constant defined in stm32wlxx_hal_conf.h file (default value
+  *              32 MHz), user has to ensure that HSE_VALUE is same as the real
+  *              frequency of the crystal used. Otherwise, this function may
+  *              have wrong result.
+  *
+  *         - The result of this function could be not correct when using fractional
+  *           value for HSE crystal.
+  *
+  * @param  None
+  * @retval None
+  */
+void SystemCoreClockUpdate(void)
+{
+  uint32_t tmp, msirange, pllvco, pllr, pllsource , pllm;
+
+ /* Get MSI Range frequency--------------------------------------------------*/
+
+   /* Get MSI Range frequency--------------------------------------------------*/
+   if((RCC->CR & RCC_CR_MSIRGSEL) == 0U)
+   { /* MSISRANGE from RCC_CSR applies */
+     msirange = (RCC->CSR & RCC_CSR_MSISRANGE) >> 8U;
+   }
+   else
+   { /* MSIRANGE from RCC_CR applies */
+     msirange = (RCC->CR & RCC_CR_MSIRANGE) >> 4U;
+   }
+   /*MSI frequency range in HZ*/
+   msirange = MSIRangeTable[msirange];
+
+
+  /*SystemCoreClock=HAL_RCC_GetSysClockFreq();*/
+  /* Get SYSCLK source -------------------------------------------------------*/
+  switch (RCC->CFGR & RCC_CFGR_SWS)
+  {
+    case 0x00:   /* MSI used as system clock source */
+      SystemCoreClock = msirange;
+      break;
+
+    case 0x04:  /* HSI used as system clock source */
+      /* HSI used as system clock source */
+        SystemCoreClock = HSI_VALUE;
+      break;
+
+    case 0x08:  /* HSE used as system clock source */
+      SystemCoreClock = HSE_VALUE;
+      break;
+
+    case 0x0C: /* PLL used as system clock  source */
+      /* PLL_VCO = (HSE_VALUE or HSI_VALUE or MSI_VALUE/ PLLM) * PLLN
+         SYSCLK = PLL_VCO / PLLR
+         */
+      pllsource = (RCC->PLLCFGR & RCC_PLLCFGR_PLLSRC);
+      pllm = ((RCC->PLLCFGR & RCC_PLLCFGR_PLLM) >> RCC_PLLCFGR_PLLM_Pos) + 1UL ;
+
+      switch (pllsource)
+      {
+        case 0x02:  /* HSI used as PLL clock source */
+          pllvco = (HSI_VALUE / pllm);
+          break;
+
+        case 0x03:  /* HSE used as PLL clock source */
+          pllvco = (HSE_VALUE / pllm);
+          break;
+
+        default:    /* MSI used as PLL clock source */
+          pllvco = (msirange / pllm);
+          break;
+      }
+
+      pllvco = pllvco * ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos);
+      pllr = (((RCC->PLLCFGR & RCC_PLLCFGR_PLLR) >> RCC_PLLCFGR_PLLR_Pos) + 1UL);
+
+      SystemCoreClock = pllvco/pllr;
+      break;
+
+    default:
+      SystemCoreClock = msirange;
+      break;
+  }
+
+  /* Compute HCLK clock frequency --------------------------------------------*/
+#if defined(DUAL_CORE) &&  defined(CORE_CM0PLUS)
+  /* Get HCLK2 prescaler */
+  tmp = AHBPrescTable[((RCC->EXTCFGR & RCC_EXTCFGR_C2HPRE) >> RCC_EXTCFGR_C2HPRE_Pos)];
+#else
+  /* Get HCLK1 prescaler */
+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)];
+#endif
+
+  /* Core clock frequency */
+  SystemCoreClock = SystemCoreClock / tmp;
+}
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/timer_if.c
new file mode 100644
index 00000000..66e51602
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/timer_if.c
@@ -0,0 +1,519 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer_if.c
+  * @author  MCD Application Team
+  * @brief   Configure RTC Alarm, Tick and Calendar manager
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include <math.h>
+#include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
+#include "stm32_lpm.h"
+#include "utilities_def.h"
+#include "stm32wlxx_ll_rtc.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief RTC handle
+  */
+extern RTC_HandleTypeDef hrtc;
+
+/**
+  * @brief Timer driver callbacks handler
+  */
+const UTIL_TIMER_Driver_s UTIL_TimerDriver =
+{
+  TIMER_IF_Init,
+  NULL,
+
+  TIMER_IF_StartTimer,
+  TIMER_IF_StopTimer,
+
+  TIMER_IF_SetTimerContext,
+  TIMER_IF_GetTimerContext,
+
+  TIMER_IF_GetTimerElapsedTime,
+  TIMER_IF_GetTimerValue,
+  TIMER_IF_GetMinimumTimeout,
+
+  TIMER_IF_Convert_ms2Tick,
+  TIMER_IF_Convert_Tick2ms,
+};
+
+/**
+  * @brief SysTime driver callbacks handler
+  */
+const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
+{
+  TIMER_IF_BkUp_Write_Seconds,
+  TIMER_IF_BkUp_Read_Seconds,
+  TIMER_IF_BkUp_Write_SubSeconds,
+  TIMER_IF_BkUp_Read_SubSeconds,
+  TIMER_IF_GetTime,
+};
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/**
+  * @brief Minimum timeout delay of Alarm in ticks
+  */
+#define MIN_ALARM_DELAY    3
+
+/**
+  * @brief Backup seconds register
+  */
+#define RTC_BKP_SECONDS    RTC_BKP_DR0
+
+/**
+  * @brief Backup subseconds register
+  */
+#define RTC_BKP_SUBSECONDS RTC_BKP_DR1
+
+/**
+  * @brief Backup msbticks register
+  */
+#define RTC_BKP_MSBTICKS   RTC_BKP_DR2
+
+/* #define RTIF_DEBUG */
+
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+#ifdef RTIF_DEBUG
+#include "sys_app.h" /*for app_log*/
+/**
+  * @brief Post the RTC log string format to the circular queue for printing in using the polling mode
+  */
+#define TIMER_IF_DBG_PRINTF(...) do{ {UTIL_ADV_TRACE_COND_FSend(VLEVEL_ALWAYS, T_REG_OFF, TS_OFF, __VA_ARGS__);} }while(0);
+#else
+/**
+  * @brief not used
+  */
+#define TIMER_IF_DBG_PRINTF(...)
+#endif /* RTIF_DEBUG */
+
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief Indicates if the RTC is already Initialized or not
+  */
+static bool RTC_Initialized = false;
+
+/**
+  * @brief RtcTimerContext
+  */
+static uint32_t RtcTimerContext = 0;
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief Get rtc timer Value in rtc tick
+  * @return val the rtc timer value (upcounting)
+  */
+static inline uint32_t GetTimerTicks(void);
+
+/**
+  * @brief Writes MSBticks to backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @param[in] MSBticks
+  */
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
+
+/**
+  * @brief Reads MSBticks from backup register
+  * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
+  * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
+  * @retval MSBticks
+  */
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+UTIL_TIMER_Status_t TIMER_IF_Init(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_Init */
+
+  /* USER CODE END TIMER_IF_Init */
+  if (RTC_Initialized == false)
+  {
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+    /*Init RTC*/
+    MX_RTC_Init();
+    /*Stop Timer */
+    TIMER_IF_StopTimer();
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
+    HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+    /*overload RTC feature enable*/
+    hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+
+    /*Enable Direct Read of the calendar registers (not through Shadow) */
+    HAL_RTCEx_EnableBypassShadow(&hrtc);
+    /*Initialize MSB ticks*/
+    TIMER_IF_BkUp_Write_MSBticks(0);
+
+    TIMER_IF_SetTimerContext();
+
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
+    RTC_Initialized = true;
+  }
+
+  /* USER CODE BEGIN TIMER_IF_Init_Last */
+
+  /* USER CODE END TIMER_IF_Init_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StartTimer(uint32_t timeout)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StartTimer */
+
+  /* USER CODE END TIMER_IF_StartTimer */
+  RTC_AlarmTypeDef sAlarm = {0};
+  /*Stop timer if one is already started*/
+  TIMER_IF_StopTimer();
+  timeout += RtcTimerContext;
+
+  TIMER_IF_DBG_PRINTF("Start timer: time=%d, alarm=%d\n\r",  GetTimerTicks(), timeout);
+  /* starts timer*/
+  sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO;
+  sAlarm.AlarmTime.SubSeconds = UINT32_MAX - timeout;
+  sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
+  sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
+  sAlarm.Alarm = RTC_ALARM_A;
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIMER_IF_StartTimer_Last */
+
+  /* USER CODE END TIMER_IF_StartTimer_Last */
+  return ret;
+}
+
+UTIL_TIMER_Status_t TIMER_IF_StopTimer(void)
+{
+  UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
+  /* USER CODE BEGIN TIMER_IF_StopTimer */
+
+  /* USER CODE END TIMER_IF_StopTimer */
+  /* Clear RTC Alarm Flag */
+  __HAL_RTC_ALARM_CLEAR_FLAG(&hrtc, RTC_FLAG_ALRAF);
+  /* Disable the Alarm A interrupt */
+  HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
+  /*overload RTC feature enable*/
+  hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
+  /* USER CODE BEGIN TIMER_IF_StopTimer_Last */
+
+  /* USER CODE END TIMER_IF_StopTimer_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_SetTimerContext(void)
+{
+  /*store time context*/
+  RtcTimerContext = GetTimerTicks();
+
+  /* USER CODE BEGIN TIMER_IF_SetTimerContext */
+
+  /* USER CODE END TIMER_IF_SetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_SetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerContext(void)
+{
+  /* USER CODE BEGIN TIMER_IF_GetTimerContext */
+
+  /* USER CODE END TIMER_IF_GetTimerContext */
+
+  TIMER_IF_DBG_PRINTF("TIMER_IF_GetTimerContext=%d\n\r", RtcTimerContext);
+  /*return time context*/
+  return RtcTimerContext;
+}
+
+uint32_t TIMER_IF_GetTimerElapsedTime(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetTimerValue(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue */
+
+  /* USER CODE END TIMER_IF_GetTimerValue */
+  if (RTC_Initialized == true)
+  {
+    ret = GetTimerTicks();
+  }
+  /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
+
+  /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_GetMinimumTimeout(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
+
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick */
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+
+  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
+
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
+}
+
+void TIMER_IF_DelayMs(uint32_t delay)
+{
+  /* USER CODE BEGIN TIMER_IF_DelayMs */
+
+  /* USER CODE END TIMER_IF_DelayMs */
+  uint32_t delayTicks = TIMER_IF_Convert_ms2Tick(delay);
+  uint32_t timeout = GetTimerTicks();
+
+  /* Wait delay ms */
+  while (((GetTimerTicks() - timeout)) < delayTicks)
+  {
+    __NOP();
+  }
+  /* USER CODE BEGIN TIMER_IF_DelayMs_Last */
+
+  /* USER CODE END TIMER_IF_DelayMs_Last */
+}
+
+void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback */
+  UTIL_TIMER_IRQ_MAP_PROCESS();
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
+
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
+}
+
+void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
+{
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback */
+  /*called every 48 days with 1024 ticks per seconds*/
+  TIMER_IF_DBG_PRINTF(">>Handler SSRUnderflow at %d\n\r", GetTimerTicks());
+  /*Increment MSBticks*/
+  uint32_t MSB_ticks = TIMER_IF_BkUp_Read_MSBticks();
+  TIMER_IF_BkUp_Write_MSBticks(MSB_ticks + 1);
+  /* USER CODE BEGIN HAL_RTCEx_SSRUEventCallback_Last */
+
+  /* USER CODE END HAL_RTCEx_SSRUEventCallback_Last */
+}
+
+uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
+{
+  uint32_t seconds = 0;
+  /* USER CODE BEGIN TIMER_IF_GetTime */
+
+  /* USER CODE END TIMER_IF_GetTime */
+  uint64_t ticks;
+  uint32_t timerValueLsb = GetTimerTicks();
+  uint32_t timerValueMSB = TIMER_IF_BkUp_Read_MSBticks();
+
+  ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
+
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+
+  ticks = (uint32_t) ticks & RTC_PREDIV_S;
+
+  *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
+
+  /* USER CODE BEGIN TIMER_IF_GetTime_Last */
+
+  /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
+}
+
+void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SECONDS, Seconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_Seconds_Last */
+}
+
+void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_SUBSECONDS, SubSeconds);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_SubSeconds_Last */
+}
+
+uint32_t TIMER_IF_BkUp_Read_Seconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
+}
+
+uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
+{
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks */
+  HAL_RTCEx_BKUPWrite(&hrtc, RTC_BKP_MSBTICKS, MSBticks);
+  /* USER CODE BEGIN TIMER_IF_BkUp_Write_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Write_MSBticks_Last */
+}
+
+static uint32_t TIMER_IF_BkUp_Read_MSBticks(void)
+{
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks */
+  uint32_t MSBticks;
+  MSBticks = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_MSBTICKS);
+  return MSBticks;
+  /* USER CODE BEGIN TIMER_IF_BkUp_Read_MSBticks_Last */
+
+  /* USER CODE END TIMER_IF_BkUp_Read_MSBticks_Last */
+}
+
+static inline uint32_t GetTimerTicks(void)
+{
+  /* USER CODE BEGIN GetTimerTicks */
+
+  /* USER CODE END GetTimerTicks */
+  return (UINT32_MAX - LL_RTC_TIME_GetSubSecond(RTC));
+  /* USER CODE BEGIN GetTimerTicks_Last */
+
+  /* USER CODE END GetTimerTicks_Last */
+}
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/usart.c
new file mode 100644
index 00000000..be36fe23
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/usart.c
@@ -0,0 +1,173 @@
+/**
+  ******************************************************************************
+  * @file    usart.c
+  * @brief   This file provides code for the configuration
+  *          of the USART instances.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart.h"
+
+/* USER CODE BEGIN 0 */
+
+/* USER CODE END 0 */
+
+UART_HandleTypeDef huart2;
+DMA_HandleTypeDef hdma_usart2_tx;
+
+/* USART2 init function */
+
+void MX_USART2_UART_Init(void)
+{
+
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
+  huart2.Instance = USART2;
+  huart2.Init.BaudRate = 115200;
+  huart2.Init.WordLength = UART_WORDLENGTH_8B;
+  huart2.Init.StopBits = UART_STOPBITS_1;
+  huart2.Init.Parity = UART_PARITY_NONE;
+  huart2.Init.Mode = UART_MODE_TX_RX;
+  huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
+  huart2.Init.OverSampling = UART_OVERSAMPLING_16;
+  huart2.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
+  huart2.Init.ClockPrescaler = UART_PRESCALER_DIV1;
+  huart2.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetTxFifoThreshold(&huart2, UART_TXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_SetRxFifoThreshold(&huart2, UART_RXFIFO_THRESHOLD_1_8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_UARTEx_EnableFifoMode(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
+
+}
+
+void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
+  if(uartHandle->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspInit 0 */
+
+  /* USER CODE END USART2_MspInit 0 */
+  /** Initializes the peripherals clocks
+  */
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USART2;
+    PeriphClkInitStruct.Usart2ClockSelection = RCC_USART2CLKSOURCE_SYSCLK;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    /* USART2 clock enable */
+    __HAL_RCC_USART2_CLK_ENABLE();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    /**USART2 GPIO Configuration
+    PA3     ------> USART2_RX
+    PA2     ------> USART2_TX
+    */
+    GPIO_InitStruct.Pin = USARTx_RX_Pin|USARTx_TX_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+    GPIO_InitStruct.Alternate = GPIO_AF7_USART2;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    /* USART2 DMA Init */
+    /* USART2_TX Init */
+    hdma_usart2_tx.Instance = DMA1_Channel5;
+    hdma_usart2_tx.Init.Request = DMA_REQUEST_USART2_TX;
+    hdma_usart2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_usart2_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart2_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart2_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.Mode = DMA_NORMAL;
+    hdma_usart2_tx.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    if (HAL_DMA_ConfigChannelAttributes(&hdma_usart2_tx, DMA_CHANNEL_NPRIV) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
+
+    /* USART2 interrupt Init */
+    HAL_NVIC_SetPriority(USART2_IRQn, 2, 0);
+    HAL_NVIC_EnableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspInit 1 */
+
+  /* USER CODE END USART2_MspInit 1 */
+  }
+}
+
+void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
+{
+
+  if(uartHandle->Instance==USART2)
+  {
+  /* USER CODE BEGIN USART2_MspDeInit 0 */
+
+  /* USER CODE END USART2_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_USART2_CLK_DISABLE();
+
+    /**USART2 GPIO Configuration
+    PA3     ------> USART2_RX
+    PA2     ------> USART2_TX
+    */
+    HAL_GPIO_DeInit(GPIOA, USARTx_RX_Pin|USARTx_TX_Pin);
+
+    /* USART2 DMA DeInit */
+    HAL_DMA_DeInit(uartHandle->hdmatx);
+
+    /* USART2 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART2_IRQn);
+  /* USER CODE BEGIN USART2_MspDeInit 1 */
+
+  /* USER CODE END USART2_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/usart_if.c
new file mode 100644
index 00000000..182f1990
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/Core/Src/usart_if.c
@@ -0,0 +1,257 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    usart_if.c
+  * @author  MCD Application Team
+  * @brief   Configuration of UART driver interface for hyperterminal communication
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usart_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/**
+  * @brief DMA handle
+  */
+extern DMA_HandleTypeDef hdma_usart2_tx;
+
+/**
+  * @brief UART handle
+  */
+extern UART_HandleTypeDef huart2;
+
+/**
+  * @brief buffer to receive 1 character
+  */
+uint8_t charRx;
+
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/**
+  * @brief Trace driver callbacks handler
+  */
+const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
+{
+  vcom_Init,
+  vcom_DeInit,
+  vcom_ReceiveInit,
+  vcom_Trace_DMA,
+};
+
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/**
+  * @brief  TX complete callback
+  * @return none
+  */
+static void (*TxCpltCallback)(void *);
+/**
+  * @brief  RX complete callback
+  * @param  rxChar ptr of chars buffer sent by user
+  * @param  size buffer size
+  * @param  error errorcode
+  * @return none
+  */
+static void (*RxCpltCallback)(uint8_t *rxChar, uint16_t size, uint8_t error);
+
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+UTIL_ADV_TRACE_Status_t vcom_Init(void (*cb)(void *))
+{
+  /* USER CODE BEGIN vcom_Init_1 */
+
+  /* USER CODE END vcom_Init_1 */
+  TxCpltCallback = cb;
+  MX_DMA_Init();
+  MX_USART2_UART_Init();
+  LL_EXTI_EnableIT_0_31(LL_EXTI_LINE_27);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Init_2 */
+
+  /* USER CODE END vcom_Init_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
+{
+  /* USER CODE BEGIN vcom_DeInit_1 */
+
+  /* USER CODE END vcom_DeInit_1 */
+  /* ##-1- Reset peripherals ################################################## */
+  __HAL_RCC_USART2_FORCE_RESET();
+  __HAL_RCC_USART2_RELEASE_RESET();
+
+  /* ##-2- MspDeInit ################################################## */
+  HAL_UART_MspDeInit(&huart2);
+
+  /* ##-3- Disable the NVIC for DMA ########################################### */
+  /* USER CODE BEGIN 1 */
+  HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE END 1 */
+  /* USER CODE BEGIN vcom_DeInit_2 */
+
+  /* USER CODE END vcom_DeInit_2 */
+}
+
+void vcom_Trace(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_1 */
+
+  /* USER CODE END vcom_Trace_1 */
+  HAL_UART_Transmit(&huart2, p_data, size, 1000);
+  /* USER CODE BEGIN vcom_Trace_2 */
+
+  /* USER CODE END vcom_Trace_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_Trace_DMA(uint8_t *p_data, uint16_t size)
+{
+  /* USER CODE BEGIN vcom_Trace_DMA_1 */
+
+  /* USER CODE END vcom_Trace_DMA_1 */
+  HAL_UART_Transmit_DMA(&huart2, p_data, size);
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_Trace_DMA_2 */
+
+  /* USER CODE END vcom_Trace_DMA_2 */
+}
+
+UTIL_ADV_TRACE_Status_t vcom_ReceiveInit(void (*RxCb)(uint8_t *rxChar, uint16_t size, uint8_t error))
+{
+  /* USER CODE BEGIN vcom_ReceiveInit_1 */
+
+  /* USER CODE END vcom_ReceiveInit_1 */
+  UART_WakeUpTypeDef WakeUpSelection;
+
+  /*record call back*/
+  RxCpltCallback = RxCb;
+
+  /*Set wakeUp event on start bit*/
+  WakeUpSelection.WakeUpEvent = UART_WAKEUP_ON_STARTBIT;
+
+  HAL_UARTEx_StopModeWakeUpSourceConfig(&huart2, WakeUpSelection);
+
+  /* Make sure that no UART transfer is on-going */
+  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_BUSY) == SET);
+
+  /* Make sure that UART is ready to receive)   */
+  while (__HAL_UART_GET_FLAG(&huart2, USART_ISR_REACK) == RESET);
+
+  /* Enable USART interrupt */
+  __HAL_UART_ENABLE_IT(&huart2, UART_IT_WUF);
+
+  /*Enable wakeup from stop mode*/
+  HAL_UARTEx_EnableStopMode(&huart2);
+
+  /*Start LPUART receive on IT*/
+  HAL_UART_Receive_IT(&huart2, &charRx, 1);
+
+  return UTIL_ADV_TRACE_OK;
+  /* USER CODE BEGIN vcom_ReceiveInit_2 */
+
+  /* USER CODE END vcom_ReceiveInit_2 */
+}
+
+void vcom_Resume(void)
+{
+  /* USER CODE BEGIN vcom_Resume_1 */
+
+  /* USER CODE END vcom_Resume_1 */
+  /*to re-enable lost UART settings*/
+  if (HAL_UART_Init(&huart2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /*to re-enable lost DMA settings*/
+  if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN vcom_Resume_2 */
+
+  /* USER CODE END vcom_Resume_2 */
+}
+
+void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart2)
+{
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_1 */
+  /* buffer transmission complete*/
+  TxCpltCallback(NULL);
+  /* USER CODE BEGIN HAL_UART_TxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_TxCpltCallback_2 */
+}
+
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart2)
+{
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_1 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_1 */
+  if ((NULL != RxCpltCallback) && (HAL_UART_ERROR_NONE == huart2->ErrorCode))
+  {
+    RxCpltCallback(&charRx, 1, 0);
+  }
+  HAL_UART_Receive_IT(huart2, &charRx, 1);
+  /* USER CODE BEGIN HAL_UART_RxCpltCallback_2 */
+
+  /* USER CODE END HAL_UART_RxCpltCallback_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/Project.eww b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/Project.eww
new file mode 100644
index 00000000..91efaac8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/Project.eww
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workspace>
+  <project>
+    <path>$WS_DIR$\SubGHz_Phy_Per.ewp</path>
+  </project>
+  <batchBuild />
+</workspace>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/SubGHz_Phy_Per.ewd b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/SubGHz_Phy_Per.ewd
new file mode 100644
index 00000000..feec2938
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/SubGHz_Phy_Per.ewd
@@ -0,0 +1,1476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>SubGHz_Phy_Per</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>C-SPY</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>30</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCVariant</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>MemOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MemFile</name>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
+                </option>
+                <option>
+                    <name>RunToEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RunToName</name>
+                    <state>main</state>
+                </option>
+                <option>
+                    <name>CExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDDFArgumentProducer</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadSuppressDownload</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDownloadVerifyAll</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>OCDynDriverList</name>
+                    <state>STLINK_ID</state>
+                </option>
+                <option>
+                    <name>OCLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>UseFlashLoader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CLowLevel</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacFile2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CDevice</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>FlashLoadersV3</name>
+                    <state>$TOOLKIT_DIR$\config\flashloader\ST\FlashSTM32WLxxxC_M4.board</state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesSuppressCheck3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesPath3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OverrideDefFlashBoard</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesOffset1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesOffset3</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCImagesUse1</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCImagesUse3</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDeviceConfigMacroFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDebuggerExtraOption</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAllMTBOptions</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCores</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCMulticoreMaster</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticorePort</name>
+                    <state>53461</state>
+                </option>
+                <option>
+                    <name>OCMulticoreWorkspace</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveProject</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCMulticoreSlaveConfiguration</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCDownloadExtraImage</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCAttachSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MassEraseBeforeFlashing</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCMulticoreNrOfCoresSlave</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ARMSIM_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCSimDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCSimEnablePSP</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspOverrideConfig</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCSimPspConfigFile</name>
+                    <state></state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CADI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCadiMemory</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Fast Model</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCADILogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCADILogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CMSISDAP_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>4</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CMSISDAPResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>CMSISDAPHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>CMSISDAPDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CMSISDAPProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CMSISDAPSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCMSISDAPUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>GDBSERVER_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJTagBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJTagUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IJET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCIarProbeScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetResetList</name>
+                    <version>1</version>
+                    <state>10</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDuration</name>
+                    <state>300</state>
+                </option>
+                <option>
+                    <name>IjetHWResetDelay</name>
+                    <state>200</state>
+                </option>
+                <option>
+                    <name>IjetPowerFromProbe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPowerRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTargetEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetJtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetProtocolRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPin</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>IjetSwoPrescalerList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetRestoreBreakpointsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetUpdateBreakpointsEdit</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>RDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchUndef</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchData</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchPrefetch</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>RDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>RDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CatchMMERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchNOCPERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchCHKERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchSTATERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchBUSERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchINTERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchHARDERR</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeCfgOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCProbeConfig</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IjetProbeConfigRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetMultiCPUNumber</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetSelectedCPUBehaviour</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ICpuName</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>OCJetEmuParams</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetPreferETB</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IjetTraceSettingsList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IjetTraceSizeList</name>
+                    <version>0</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>FlashBoardPathSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCIjetUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>JLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>16</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>JLinkSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCJLinkHWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>JLinkInitialSpeed</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCDoJlinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCScanChainNonARMDevices</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkMultiTarget</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkIRLength</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkCommRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTCPIP</name>
+                    <state>aaa.bbb.ccc.ddd</state>
+                </option>
+                <option>
+                    <name>CCJLinkSpeedRadioV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCUSBDevice</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRDICatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCRDICatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkBreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkResetList</name>
+                    <version>6</version>
+                    <state>7</state>
+                </option>
+                <option>
+                    <name>CCJLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkScriptFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCTcpIpAlt</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCJLinkTcpIpSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>72.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkTraceSourceDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OCJLinkDeviceName</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>LMIFTDI_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>2</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>LmiftdiSpeed</name>
+                    <state>500</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiftdiLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCLmiFtdiInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>NULINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>PEMICRO_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>3</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCJPEMicroShowSettings</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>STLINK_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>5</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceRadio</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCSTLinkInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkResetList</name>
+                    <version>3</version>
+                    <state>4</state>
+                </option>
+                <option>
+                    <name>CCCpuClockEdit</name>
+                    <state>48.0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSwoClockEdit</name>
+                    <state>2000</state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkCatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkUsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkJtagSpeedList</name>
+                    <version>1</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkDAPNumber</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCSTLinkDebugAccessPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSTLinkUseServerSelect</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>THIRDPARTY_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CThirdPartyDriverDll</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CThirdPartyLogFileEditB</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>TIFET_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetInterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVccTypeDefault</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>CCMSPFetVCCDefault</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetTargetSettlingtime</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioJtagSpeedType</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCMSPFetConnection</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetUsbComPort</name>
+                    <state>Automatic</state>
+                </option>
+                <option>
+                    <name>CCMSPFetAllowAccessToBSL</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetDoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCMSPFetLogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCMSPFetRadioEraseFlash</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>XDS100_ID</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>8</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OCDriverInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TIPackageOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TIPackage</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>BoardFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DoLogfile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>LogFile</name>
+                    <state>$PROJ_DIR$\cspycomm.log</state>
+                </option>
+                <option>
+                    <name>CCXds100BreakpointRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100DoUpdateBreakpoints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UpdateBreakpoints</name>
+                    <state>_call_main</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchReset</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchUndef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSWI</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchData</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchPrefetch</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchIRQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchFIQ</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCORERESET</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchMMERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchNOCPERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchCHRERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSTATERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchBUSERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchINTERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchSFERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchHARDERR</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CatchDummy</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100CpuClockEdit</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockAuto</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SwoClockEdit</name>
+                    <state>1000</state>
+                </option>
+                <option>
+                    <name>CCXds100HWResetDelay</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ResetList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNo</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCXds100UsbSerialNoSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100JtagSpeedList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100InterfaceCmdLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100ProbeList</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPortRadio</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXds100SWOPort</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVccEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCXDSTargetVoltage</name>
+                    <state>###Uninitialized###</state>
+                </option>
+                <option>
+                    <name>OCXDSDigitalStatesConfigFile</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <debuggerPlugins>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm8BE.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
+                <loadFlag>1</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+            <plugin>
+                <file>$EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin</file>
+                <loadFlag>0</loadFlag>
+            </plugin>
+        </debuggerPlugins>
+    </configuration>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/SubGHz_Phy_Per.ewp b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/SubGHz_Phy_Per.ewp
new file mode 100644
index 00000000..5ef4d4e8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/SubGHz_Phy_Per.ewp
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+    <fileVersion>3</fileVersion>
+    <configuration>
+        <name>SubGHz_Phy_Per</name>
+        <toolchain>
+            <name>ARM</name>
+        </toolchain>
+        <debug>1</debug>
+        <settings>
+            <name>General</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <version>31</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>ExePath</name>
+                    <state>SubGHz_Phy_Per/Exe</state>
+                </option>
+                <option>
+                    <name>ObjPath</name>
+                    <state>SubGHz_Phy_Per/Obj</state>
+                </option>
+                <option>
+                    <name>ListPath</name>
+                    <state>SubGHz_Phy_Per/List</state>
+                </option>
+                <option>
+                    <name>GEndianMode</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>Input description</name>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>Output description</name>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
+                </option>
+                <option>
+                    <name>GOutputBinary</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGCoreOrChip</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelect</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibSelectSlave</name>
+                    <version>0</version>
+                    <state>2</state>
+                </option>
+                <option>
+                    <name>RTDescription</name>
+                    <state>Use the full configuration of the C/C++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>
+                </option>
+                <option>
+                    <name>OGProductVersion</name>
+                    <state>4.41A</state>
+                </option>
+                <option>
+                    <name>OGLastSavedByProductVersion</name>
+                    <state>8.30.1.17146</state>
+                </option>
+                <option>
+                    <name>GeneralEnableMisra</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVerbose</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGChipSelectEditMenu</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>GenLowLevelInterface</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GEndianModeBE</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGBufferedTerminalOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GenStdoutInterface</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>GeneralMisraVer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GeneralMisraRules04</name>
+                    <version>0</version>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>RTConfigPath2</name>
+                    <state>$TOOLKIT_DIR$\inc\c\DLib_Config_Full.h</state>
+                </option>
+                <option>
+                    <name>GBECoreSlave</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGUseCmsis</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGUseCmsisDspLib</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GRuntimeLibThreads</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CoreVariant</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>GFPUDeviceSlave</name>
+                    <state>STM32WL55JC_M4	ST STM32WL55JC_M4</state>
+                </option>
+                <option>
+                    <name>FPU2</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NrRegs</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>NEON</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>GFPUCoreSlave2</name>
+                    <version>26</version>
+                    <state>39</state>
+                </option>
+                <option>
+                    <name>OGCMSISPackSelectDevice</name>
+                </option>
+                <option>
+                    <name>OgLibHeap</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGLibAdditionalLocale</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OGPrintfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGPrintfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfVariant</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OGScanfMultibyteSupport</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>GenLocaleTags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>GenLocaleDisplayOnly</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>DSPExtension</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>TrustZone</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>TrustZoneModes</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>ICCARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>34</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDefines</name>
+                    <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
+                </option>
+                <option>
+                    <name>CCPreprocFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocComments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPreprocLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMnemonics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListCMessages</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCListAssSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCDiagSuppress</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagRemark</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagWarning</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCDiagError</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCAllowList</name>
+                    <version>1</version>
+                    <state>11111110</state>
+                </option>
+                <option>
+                    <name>CCDebugInfo</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IEndianMode</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IExtraOptionsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CCLangConformance</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCSignedPlainChar</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCRequirePrototypes</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCDiagWarnAreErr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCompilerRuntimeInfo</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>CCLibConfigHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>PreInclude</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CompilerMisraOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCIncludePath2</name>
+                    <state>$PROJ_DIR$/../Core/Inc</state>
+                    <state>$PROJ_DIR$/../SubGHz_Phy/App</state>
+                    <state>$PROJ_DIR$/../SubGHz_Phy/Target</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
+                </option>
+                <option>
+                    <name>CCStdIncCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCCodeSection</name>
+                    <state>.text</state>
+                </option>
+                <option>
+                    <name>IProcessorMode2</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevel</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CCOptStrategy</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCOptLevelSlave</name>
+                    <state>3</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules98</name>
+                    <version>0</version>
+                    <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>
+                </option>
+                <option>
+                    <name>CompilerMisraRules04</name>
+                    <version>0</version>
+                    <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>
+                </option>
+                <option>
+                    <name>CCPosIndRopi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndRwpi</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCPosIndNoDynInit</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccLang</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCDialect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccAllowVLA</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccStaticDestr</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCppInlineSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IccFloatSemantics</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCOptStrategySlave</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCGuardCalls</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncSource</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CCEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CCEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccExceptions2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IccRTTI2</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>AARM</name>
+            <archiveVersion>2</archiveVersion>
+            <data>
+                <version>10</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>AObjPrefix</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AEndian</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>ACaseSensitivity</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacroChars</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnWhat</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AWarnOne</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange1</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AWarnRange2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>ADebug</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AltRegisterNames</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ADefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AList</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AListHeader</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AListing</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>Includes</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacDefs</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MacExps</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>MacExec</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>OnlyAssed</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>MultiLine</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLengthCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>PageLength</name>
+                    <state>80</state>
+                </option>
+                <option>
+                    <name>TabSpacing</name>
+                    <state>8</state>
+                </option>
+                <option>
+                    <name>AXRef</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDefines</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefInternal</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AXRefDual</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AFpuProcessor</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>AOutputFile</name>
+                    <state>$FILE_BNAME$.o</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsCheck</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>ALimitErrorsEdit</name>
+                    <state>100</state>
+                </option>
+                <option>
+                    <name>AIgnoreStdInclude</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AUserIncludes</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AExtraOptionsCheckV2</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>AExtraOptionsV2</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>AsmNoLiteralPool</name>
+                    <state>0</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>OBJCOPY</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>1</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>OOCOutputFormat</name>
+                    <version>3</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OCOutputOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCOutputFile</name>
+                    <state>SubGHz_Phy_Per.hex</state>
+                </option>
+                <option>
+                    <name>OOCCommandLineProducer</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>OOCObjCopyEnable</name>
+                    <state>1</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>CUSTOM</name>
+            <archiveVersion>3</archiveVersion>
+            <data>
+                <extensions></extensions>
+                <cmdline></cmdline>
+                <hasPrio>0</hasPrio>
+            </data>
+        </settings>
+        <settings>
+            <name>BICOMP</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+        <settings>
+            <name>BUILDACTION</name>
+            <archiveVersion>1</archiveVersion>
+            <data>
+                <prebuild></prebuild>
+                <postbuild></postbuild>
+            </data>
+        </settings>
+        <settings>
+            <name>ILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>21</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IlinkLibIOConfig</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>XLinkMisraHandler</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkInputFileSlave</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOutputFile</name>
+                    <state>SubGHz_Phy_Per.out</state>
+                </option>
+                <option>
+                    <name>IlinkDebugInfoEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkKeepSymbols</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySymbol</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinarySegment</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkRawBinaryAlign</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkConfigDefines</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkMapFile</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogFile</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogInitialization</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogModule</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogSection</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogVeneer</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfOverride</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile</name>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFileSlave</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEnableRemarks</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkSuppressDiags</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsRem</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsWarn</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkTreatAsErr</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkWarningsAreErrors</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkUseExtraOptions</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkExtraOptions</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkLowLevelInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAutoLibEnable</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkAdditionalLibs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkOverrideProgramEntryLabel</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabelSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkProgramEntryLabel</name>
+                    <state>__iar_program_start</state>
+                </option>
+                <option>
+                    <name>DoFill</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>FillerByte</name>
+                    <state>0xFF</state>
+                </option>
+                <option>
+                    <name>FillerStart</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>FillerEnd</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>CrcSize</name>
+                    <version>0</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcAlign</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcPoly</name>
+                    <state>0x11021</state>
+                </option>
+                <option>
+                    <name>CrcCompl</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcBitOrder</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>CrcInitialValue</name>
+                    <state>0x0</state>
+                </option>
+                <option>
+                    <name>DoCrc</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkBE8Slave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkBufferedTerminalOutput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkStdoutInterfaceSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcFullSize</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIElfToolPostProcess</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogAutoLibSelect</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogRedirSymbols</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkLogUnusedFragments</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcReverseByteOrder</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCrcUseAsInput</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptInline</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsAllow</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptExceptionsForce</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkCmsis</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptMergeDuplSections</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkOptUseVfe</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkOptForceVfe</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackAnalysisEnable</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkStackControlFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkStackCallGraphFile</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>CrcAlgorithm</name>
+                    <version>1</version>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>CrcUnitSize</name>
+                    <version>0</version>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkThreadsSlave</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLogCallGraph</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkIcfFile_AltDefault</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IlinkEncInput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutput</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IlinkEncOutputBom</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkHeapSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkLocaleSelect</name>
+                    <state>1</state>
+                </option>
+                <option>
+                    <name>IlinkTrustzoneImportLibraryOut</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>IARCHIVE</name>
+            <archiveVersion>0</archiveVersion>
+            <data>
+                <version>0</version>
+                <wantNonLocal>1</wantNonLocal>
+                <debug>1</debug>
+                <option>
+                    <name>IarchiveInputs</name>
+                    <state></state>
+                </option>
+                <option>
+                    <name>IarchiveOverride</name>
+                    <state>0</state>
+                </option>
+                <option>
+                    <name>IarchiveOutput</name>
+                    <state>###Unitialized###</state>
+                </option>
+            </data>
+        </settings>
+        <settings>
+            <name>BILINK</name>
+            <archiveVersion>0</archiveVersion>
+            <data />
+        </settings>
+    </configuration>
+    <group>
+        <name>Application</name>
+        <group>
+            <name>EWARM</name>
+            <file>
+                <name>$PROJ_DIR$\startup_stm32wl55xx_cm4.s</name>
+            </file>
+        </group>
+        <group>
+            <name>User</name>
+            <group>
+                <name>Core</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
+                </file>
+            </group>
+            <group>
+                <name>SubGHz_Phy</name>
+                <group>
+                    <name>App</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\SubGHz_Phy\App\app_subghz_phy.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\SubGHz_Phy\App\subghz_phy_app.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Target</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\SubGHz_Phy\Target\radio_board_if.c</name>
+                    </file>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group>
+        <name>Doc</name>
+        <file>
+            <name>$PROJ_DIR$\..\readme.txt</name>
+        </file>
+    </group>
+    <group>
+        <name>Drivers</name>
+        <group>
+            <name>BSP</name>
+            <group>
+                <name>STM32WLxx_Nucleo</name>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
+            </group>
+        </group>
+        <group>
+            <name>CMSIS</name>
+            <file>
+                <name>$PROJ_DIR$\..\Core\Src\system_stm32wlxx.c</name>
+            </file>
+        </group>
+        <group>
+            <name>STM32WLxx_HAL_Driver</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_gpio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_pwr_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rcc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart_ex.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Middlewares</name>
+        <group>
+            <name>SubGHz_Phy</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
+        </group>
+    </group>
+    <group>
+        <name>Utilities</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\trace\adv_trace\stm32_adv_trace.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\lpm\tiny_lpm\stm32_lpm.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_mem.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\sequencer\stm32_seq.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_systime.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
+        </file>
+    </group>
+</project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..658ca8e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,509 @@
+;********************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : M4 core vector table of the STM32WLxxxx devices for the
+;*                      IAR (EWARM) toolchain.
+;*
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == _iar_program_start,
+;*                      - Set the vector table entries with the exceptions ISR
+;*                        address.
+;*                      - Branches to main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the Cortex-M4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;********************************************************************************
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;
+;*******************************************************************************
+;
+;
+; The modules in this file are included in the libraries, and may be replaced
+; by any user-defined modules that define the PUBLIC symbol _program_start or
+; a user defined start symbol.
+; To override the cstartup defined in the library, simply add your modified
+; version to the workbench project.
+;
+; The vector table is normally located at address 0.
+; When debugging in RAM, it can be located in RAM, aligned to at least 2^6.
+; The name "__vector_table" has special meaning for C-SPY:
+; it is where the SP start value is found, and the NVIC vector
+; table register (VTOR) is initialized to this address if != 0.
+;
+; Cortex-M version
+;
+
+        MODULE  ?cstartup
+
+        ;; Forward declaration of sections.
+        SECTION CSTACK:DATA:NOROOT(3)
+
+        SECTION .intvec:CODE:NOROOT(2)
+
+        EXTERN  __iar_program_start
+        EXTERN  SystemInit
+        PUBLIC  __vector_table
+
+        DATA
+__vector_table
+        DCD     sfe(CSTACK)
+        DCD     Reset_Handler                     ; Reset Handler
+
+        DCD     NMI_Handler                       ; NMI Handler
+        DCD     HardFault_Handler                 ; Hard Fault Handler
+        DCD     MemManage_Handler                 ; MPU Fault Handler
+        DCD     BusFault_Handler                  ; Bus Fault Handler
+        DCD     UsageFault_Handler                ; Usage Fault Handler
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     0                                 ; Reserved
+        DCD     SVC_Handler                       ; SVCall Handler
+        DCD     DebugMon_Handler                  ; Debug Monitor Handler
+        DCD     0                                 ; Reserved
+        DCD     PendSV_Handler                    ; PendSV Handler
+        DCD     SysTick_Handler                   ; SysTick Handler
+
+        ; External Interrupts
+        DCD     WWDG_IRQHandler                   ; Window WatchDog
+        DCD     PVD_PVM_IRQHandler                ; PVD and PVM Interrupt
+        DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU Interrupts
+        DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+        DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+        DCD     RCC_IRQHandler                    ; RCC Interrupt
+        DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+        DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+        DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+        DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrupt
+        DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+        DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+        DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+        DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+        DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+        DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+        DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+        DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+        DCD     ADC_IRQHandler                    ; ADC Interrupt
+        DCD     DAC_IRQHandler                    ; DAC Interrupt
+        DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV Interrupt
+        DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+        DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+        DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+        DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupt
+        DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+        DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+        DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+        DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+        DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+        DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+        DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+        DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+        DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+        DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+        DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+        DCD     USART1_IRQHandler                 ; USART1 Interrupt
+        DCD     USART2_IRQHandler                 ; USART2 Interrupt
+        DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+        DCD     LPTIM1_IRQHandler                 ; LPTIM1 Global Interrupt
+        DCD     LPTIM2_IRQHandler                 ; LPTIM2 Global Interrupt
+        DCD     EXTI15_10_IRQHandler              ; EXTI Lines [15:10] Interrupt
+        DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+        DCD     LPTIM3_IRQHandler                 ; LPTIM3 Global Interrupt
+        DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+        DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+        DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+        DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+        DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+        DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+        DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+        DCD     AES_IRQHandler                    ; AES Interrupt
+        DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+        DCD     PKA_IRQHandler                    ; PKA Interrupt
+        DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+        DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+        DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+        DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+        DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+        DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+        DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+        DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Default interrupt handlers.
+;;
+        THUMB
+
+        PUBWEAK Reset_Handler
+        SECTION .text:CODE:NOROOT:REORDER(2)
+Reset_Handler
+        LDR     R0, =SystemInit
+        BLX     R0
+        LDR     R0, =__iar_program_start
+        BX      R0
+
+        PUBWEAK NMI_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+NMI_Handler
+        B NMI_Handler
+
+        PUBWEAK HardFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HardFault_Handler
+        B HardFault_Handler
+
+        PUBWEAK MemManage_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+MemManage_Handler
+        B MemManage_Handler
+
+        PUBWEAK BusFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+BusFault_Handler
+        B BusFault_Handler
+
+        PUBWEAK UsageFault_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+UsageFault_Handler
+        B UsageFault_Handler
+
+        PUBWEAK SVC_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SVC_Handler
+        B SVC_Handler
+
+        PUBWEAK DebugMon_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DebugMon_Handler
+        B DebugMon_Handler
+
+        PUBWEAK PendSV_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PendSV_Handler
+        B PendSV_Handler
+
+        PUBWEAK SysTick_Handler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SysTick_Handler
+        B SysTick_Handler
+
+        PUBWEAK WWDG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+WWDG_IRQHandler
+        B WWDG_IRQHandler
+
+        PUBWEAK PVD_PVM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PVD_PVM_IRQHandler
+        B PVD_PVM_IRQHandler
+
+        PUBWEAK TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+        B TAMP_STAMP_LSECSS_SSRU_IRQHandler
+
+        PUBWEAK RTC_WKUP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_WKUP_IRQHandler
+        B RTC_WKUP_IRQHandler
+
+        PUBWEAK FLASH_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+FLASH_IRQHandler
+        B FLASH_IRQHandler
+
+        PUBWEAK RCC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RCC_IRQHandler
+        B RCC_IRQHandler
+
+        PUBWEAK EXTI0_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI0_IRQHandler
+        B EXTI0_IRQHandler
+
+        PUBWEAK EXTI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI1_IRQHandler
+        B EXTI1_IRQHandler
+
+        PUBWEAK EXTI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI2_IRQHandler
+        B EXTI2_IRQHandler
+
+        PUBWEAK EXTI3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI3_IRQHandler
+        B EXTI3_IRQHandler
+
+        PUBWEAK EXTI4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI4_IRQHandler
+        B EXTI4_IRQHandler
+
+        PUBWEAK DMA1_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel1_IRQHandler
+        B DMA1_Channel1_IRQHandler
+
+        PUBWEAK DMA1_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel2_IRQHandler
+        B DMA1_Channel2_IRQHandler
+
+        PUBWEAK DMA1_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel3_IRQHandler
+        B DMA1_Channel3_IRQHandler
+
+        PUBWEAK DMA1_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel4_IRQHandler
+        B DMA1_Channel4_IRQHandler
+
+        PUBWEAK DMA1_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel5_IRQHandler
+        B DMA1_Channel5_IRQHandler
+
+        PUBWEAK DMA1_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel6_IRQHandler
+        B DMA1_Channel6_IRQHandler
+
+        PUBWEAK DMA1_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA1_Channel7_IRQHandler
+        B DMA1_Channel7_IRQHandler
+
+        PUBWEAK ADC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+ADC_IRQHandler
+        B ADC_IRQHandler
+
+        PUBWEAK DAC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DAC_IRQHandler
+        B DAC_IRQHandler
+
+        PUBWEAK C2SEV_PWR_C2H_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+C2SEV_PWR_C2H_IRQHandler
+        B C2SEV_PWR_C2H_IRQHandler
+
+        PUBWEAK COMP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+COMP_IRQHandler
+        B COMP_IRQHandler
+
+        PUBWEAK EXTI9_5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI9_5_IRQHandler
+        B EXTI9_5_IRQHandler
+
+        PUBWEAK TIM1_BRK_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_BRK_IRQHandler
+        B TIM1_BRK_IRQHandler
+
+        PUBWEAK TIM1_UP_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_UP_IRQHandler
+        B TIM1_UP_IRQHandler
+
+        PUBWEAK TIM1_TRG_COM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_TRG_COM_IRQHandler
+        B TIM1_TRG_COM_IRQHandler
+
+        PUBWEAK TIM1_CC_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM1_CC_IRQHandler
+        B TIM1_CC_IRQHandler
+
+        PUBWEAK TIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM2_IRQHandler
+        B TIM2_IRQHandler
+
+        PUBWEAK TIM16_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM16_IRQHandler
+        B TIM16_IRQHandler
+
+        PUBWEAK TIM17_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+TIM17_IRQHandler
+        B TIM17_IRQHandler
+
+        PUBWEAK I2C1_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_EV_IRQHandler
+        B I2C1_EV_IRQHandler
+
+        PUBWEAK I2C1_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C1_ER_IRQHandler
+        B I2C1_ER_IRQHandler
+
+        PUBWEAK I2C2_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_EV_IRQHandler
+        B I2C2_EV_IRQHandler
+
+        PUBWEAK I2C2_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C2_ER_IRQHandler
+        B I2C2_ER_IRQHandler
+
+        PUBWEAK SPI1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI1_IRQHandler
+        B SPI1_IRQHandler
+
+        PUBWEAK SPI2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SPI2_IRQHandler
+        B SPI2_IRQHandler
+
+        PUBWEAK USART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART1_IRQHandler
+        B USART1_IRQHandler
+
+        PUBWEAK USART2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+USART2_IRQHandler
+        B USART2_IRQHandler
+
+        PUBWEAK LPUART1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPUART1_IRQHandler
+        B LPUART1_IRQHandler
+
+        PUBWEAK LPTIM1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM1_IRQHandler
+        B LPTIM1_IRQHandler
+
+        PUBWEAK LPTIM2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM2_IRQHandler
+        B LPTIM2_IRQHandler
+
+        PUBWEAK EXTI15_10_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+EXTI15_10_IRQHandler
+        B EXTI15_10_IRQHandler
+
+        PUBWEAK RTC_Alarm_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RTC_Alarm_IRQHandler
+        B RTC_Alarm_IRQHandler
+
+        PUBWEAK LPTIM3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+LPTIM3_IRQHandler
+        B LPTIM3_IRQHandler
+
+        PUBWEAK SUBGHZSPI_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZSPI_IRQHandler
+        B SUBGHZSPI_IRQHandler
+
+        PUBWEAK IPCC_C1_RX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_RX_IRQHandler
+        B IPCC_C1_RX_IRQHandler
+
+        PUBWEAK IPCC_C1_TX_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+IPCC_C1_TX_IRQHandler
+        B IPCC_C1_TX_IRQHandler
+
+        PUBWEAK HSEM_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+HSEM_IRQHandler
+        B HSEM_IRQHandler
+
+        PUBWEAK I2C3_EV_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_EV_IRQHandler
+        B I2C3_EV_IRQHandler
+
+        PUBWEAK I2C3_ER_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+I2C3_ER_IRQHandler
+        B I2C3_ER_IRQHandler
+
+        PUBWEAK SUBGHZ_Radio_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+SUBGHZ_Radio_IRQHandler
+        B SUBGHZ_Radio_IRQHandler
+
+        PUBWEAK AES_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+AES_IRQHandler
+        B AES_IRQHandler
+
+        PUBWEAK RNG_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+RNG_IRQHandler
+        B RNG_IRQHandler
+
+        PUBWEAK PKA_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+PKA_IRQHandler
+        B PKA_IRQHandler
+
+        PUBWEAK DMA2_Channel1_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel1_IRQHandler
+        B DMA2_Channel1_IRQHandler
+
+        PUBWEAK DMA2_Channel2_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel2_IRQHandler
+        B DMA2_Channel2_IRQHandler
+
+        PUBWEAK DMA2_Channel3_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel3_IRQHandler
+        B DMA2_Channel3_IRQHandler
+
+        PUBWEAK DMA2_Channel4_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel4_IRQHandler
+        B DMA2_Channel4_IRQHandler
+
+        PUBWEAK DMA2_Channel5_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel5_IRQHandler
+        B DMA2_Channel5_IRQHandler
+
+        PUBWEAK DMA2_Channel6_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel6_IRQHandler
+        B DMA2_Channel6_IRQHandler
+
+        PUBWEAK DMA2_Channel7_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMA2_Channel7_IRQHandler
+        B DMA2_Channel7_IRQHandler
+
+        PUBWEAK DMAMUX1_OVR_IRQHandler
+        SECTION .text:CODE:NOROOT:REORDER(1)
+DMAMUX1_OVR_IRQHandler
+        B DMAMUX1_OVR_IRQHandler
+
+        END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/stm32wl55xx_flash_cm4.icf
new file mode 100644
index 00000000..930169fe
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/EWARM/stm32wl55xx_flash_cm4.icf
@@ -0,0 +1,40 @@
+/*###ICF### Section handled by ICF editor, don't touch! ****/
+/*-Editor annotation file-*/
+/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
+/*-Specials-*/
+define symbol __ICFEDIT_intvec_start__ = 0x08000000;
+
+/*-Memory Regions-*/
+/***** FLASH *****/
+define symbol __ICFEDIT_region_ROM_start__    = 0x08000000;
+define symbol __ICFEDIT_region_ROM_end__      = 0x0803FFFF;
+/***** Non-backup SRAM1 *****/
+define symbol __ICFEDIT_region_RAM_start__    = 0x20000000;
+define symbol __ICFEDIT_region_RAM_end__      = 0x20007FFF;
+/***** Backup SRAM2 *****/
+define symbol __ICFEDIT_region_RAM2_start__   = 0x20008000;
+define symbol __ICFEDIT_region_RAM2_end__     = 0x2000FFFF;
+
+/*-Sizes-*/
+define symbol __ICFEDIT_size_cstack__ = 0x800;
+define symbol __ICFEDIT_size_heap__ = 0x200;
+/**** End of ICF editor section. ###ICF###*/
+
+
+define memory mem with size = 4G;
+define region ROM_region      = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];
+define region RAM_region      = mem:[from __ICFEDIT_region_RAM_start__   to __ICFEDIT_region_RAM_end__];
+define region RAM2_region     = mem:[from __ICFEDIT_region_RAM2_start__  to __ICFEDIT_region_RAM2_end__];
+
+define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
+define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+
+initialize by copy { readwrite };
+do not initialize  { section .noinit };
+
+place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
+
+place in ROM_region   { readonly };
+place in RAM_region   { readwrite,
+                        block CSTACK, block HEAP };
+place in RAM2_region  { };
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/SubGHz_Phy_Per.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/SubGHz_Phy_Per.uvoptx
new file mode 100644
index 00000000..3c861390
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/SubGHz_Phy_Per.uvoptx
@@ -0,0 +1,885 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<ProjectOpt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_optx.xsd">
+
+  <SchemaVersion>1.0</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Extensions>
+    <cExt>*.c</cExt>
+    <aExt>*.s*; *.src; *.a*</aExt>
+    <oExt>*.obj; *.o</oExt>
+    <lExt>*.lib</lExt>
+    <tExt>*.txt; *.h; *.inc</tExt>
+    <pExt>*.plm</pExt>
+    <CppX>*.cpp</CppX>
+    <nMigrate>0</nMigrate>
+  </Extensions>
+
+  <DaveTm>
+    <dwLowDateTime>0</dwLowDateTime>
+    <dwHighDateTime>0</dwHighDateTime>
+  </DaveTm>
+
+  <Target>
+    <TargetName>SubGHz_Phy_Per</TargetName>
+    <ToolsetNumber>0x4</ToolsetNumber>
+    <ToolsetName>ARM-ADS</ToolsetName>
+    <TargetOption>
+      <CLKADS>8000000</CLKADS>
+      <OPTTT>
+        <gFlags>1</gFlags>
+        <BeepAtEnd>1</BeepAtEnd>
+        <RunSim>0</RunSim>
+        <RunTarget>1</RunTarget>
+        <RunAbUc>0</RunAbUc>
+      </OPTTT>
+      <OPTHX>
+        <HexSelection>1</HexSelection>
+        <FlashByte>65535</FlashByte>
+        <HexRangeLowAddress>0</HexRangeLowAddress>
+        <HexRangeHighAddress>0</HexRangeHighAddress>
+        <HexOffset>0</HexOffset>
+      </OPTHX>
+      <OPTLEX>
+        <PageWidth>79</PageWidth>
+        <PageLength>66</PageLength>
+        <TabStop>8</TabStop>
+        <ListingPath></ListingPath>
+      </OPTLEX>
+      <ListingPage>
+        <CreateCListing>1</CreateCListing>
+        <CreateAListing>1</CreateAListing>
+        <CreateLListing>1</CreateLListing>
+        <CreateIListing>0</CreateIListing>
+        <AsmCond>1</AsmCond>
+        <AsmSymb>1</AsmSymb>
+        <AsmXref>0</AsmXref>
+        <CCond>1</CCond>
+        <CCode>0</CCode>
+        <CListInc>0</CListInc>
+        <CSymb>0</CSymb>
+        <LinkerCodeListing>0</LinkerCodeListing>
+      </ListingPage>
+      <OPTXL>
+        <LMap>1</LMap>
+        <LComments>1</LComments>
+        <LGenerateSymbols>1</LGenerateSymbols>
+        <LLibSym>1</LLibSym>
+        <LLines>1</LLines>
+        <LLocSym>1</LLocSym>
+        <LPubSym>1</LPubSym>
+        <LXref>0</LXref>
+        <LExpSel>0</LExpSel>
+      </OPTXL>
+      <OPTFL>
+        <tvExp>1</tvExp>
+        <tvExpOptDlg>0</tvExpOptDlg>
+        <IsCurrentTarget>1</IsCurrentTarget>
+      </OPTFL>
+      <CpuCode>18</CpuCode>
+      <DebugOpt>
+        <uSim>0</uSim>
+        <uTrg>1</uTrg>
+        <sLdApp>1</sLdApp>
+        <sGomain>1</sGomain>
+        <sRbreak>1</sRbreak>
+        <sRwatch>1</sRwatch>
+        <sRmem>1</sRmem>
+        <sRfunc>1</sRfunc>
+        <sRbox>1</sRbox>
+        <tLdApp>1</tLdApp>
+        <tGomain>1</tGomain>
+        <tRbreak>1</tRbreak>
+        <tRwatch>1</tRwatch>
+        <tRmem>1</tRmem>
+        <tRfunc>1</tRfunc>
+        <tRbox>1</tRbox>
+        <tRtrace>1</tRtrace>
+        <sRSysVw>1</sRSysVw>
+        <tRSysVw>1</tRSysVw>
+        <sRunDeb>0</sRunDeb>
+        <sLrtime>0</sLrtime>
+        <bEvRecOn>1</bEvRecOn>
+        <bSchkAxf>0</bSchkAxf>
+        <bTchkAxf>0</bTchkAxf>
+        <nTsel>6</nTsel>
+        <sDll></sDll>
+        <sDllPa></sDllPa>
+        <sDlgDll></sDlgDll>
+        <sDlgPa></sDlgPa>
+        <sIfile></sIfile>
+        <tDll></tDll>
+        <tDllPa></tDllPa>
+        <tDlgDll></tDlgDll>
+        <tDlgPa></tDlgPa>
+        <tIfile></tIfile>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
+      </DebugOpt>
+      <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>UL2CM3</Key>
+          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4 -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM))</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ST-LINKIII-KEIL_SWO</Key>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+        </SetRegEntry>
+      </TargetDriverDllRegistry>
+      <Breakpoint/>
+      <Tracepoint>
+        <THDelay>0</THDelay>
+      </Tracepoint>
+      <DebugFlag>
+        <trace>0</trace>
+        <periodic>1</periodic>
+        <aLwin>1</aLwin>
+        <aCover>0</aCover>
+        <aSer1>0</aSer1>
+        <aSer2>0</aSer2>
+        <aPa>0</aPa>
+        <viewmode>1</viewmode>
+        <vrSel>0</vrSel>
+        <aSym>0</aSym>
+        <aTbox>0</aTbox>
+        <AscS1>0</AscS1>
+        <AscS2>0</AscS2>
+        <AscS3>0</AscS3>
+        <aSer3>0</aSer3>
+        <eProf>0</eProf>
+        <aLa>0</aLa>
+        <aPa1>0</aPa1>
+        <AscS4>0</AscS4>
+        <aSer4>0</aSer4>
+        <StkLoc>1</StkLoc>
+        <TrcWin>0</TrcWin>
+        <newCpu>0</newCpu>
+        <uProt>0</uProt>
+      </DebugFlag>
+      <LintExecutable></LintExecutable>
+      <LintConfigFile></LintConfigFile>
+      <bLintAuto>0</bLintAuto>
+      <bAutoGenD>0</bAutoGenD>
+      <LntExFlags>0</LntExFlags>
+      <pMisraName></pMisraName>
+      <pszMrule></pszMrule>
+      <pSingCmds></pSingCmds>
+      <pMultCmds></pMultCmds>
+      <pMisraNamep></pMisraNamep>
+      <pszMrulep></pszMrulep>
+      <pSingCmdsp></pSingCmdsp>
+      <pMultCmdsp></pMultCmdsp>
+    </TargetOption>
+  </Target>
+
+  <Group>
+    <GroupName>Application/MDK-ARM</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>1</FileNumber>
+      <FileType>2</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>2</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>11</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>12</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>13</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/SubGHz_Phy/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../SubGHz_Phy/App/app_subghz_phy.c</PathWithFileName>
+      <FilenameWithoutPath>app_subghz_phy.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>15</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../SubGHz_Phy/App/subghz_phy_app.c</PathWithFileName>
+      <FilenameWithoutPath>subghz_phy_app.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/SubGHz_Phy/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>16</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../SubGHz_Phy/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Doc</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>17</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../readme.txt</PathWithFileName>
+      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>18</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>21</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>22</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>23</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>25</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>26</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>27</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>28</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>29</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>30</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>31</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>32</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>33</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>34</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>35</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>36</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>37</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>38</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>39</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/SubGHz_Phy</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>40</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>42</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>43</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>44</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>45</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>46</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>47</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>48</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>::CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>1</RteFlg>
+  </Group>
+
+</ProjectOpt>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/SubGHz_Phy_Per.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/SubGHz_Phy_Per.uvprojx
new file mode 100644
index 00000000..fe6ad40e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/SubGHz_Phy_Per.uvprojx
@@ -0,0 +1,718 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
+
+  <SchemaVersion>2.1</SchemaVersion>
+
+  <Header>### uVision Project, (C) Keil Software</Header>
+
+  <Targets>
+    <Target>
+      <TargetName>SubGHz_Phy_Per</TargetName>
+      <ToolsetNumber>0x4</ToolsetNumber>
+      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
+      <TargetOption>
+        <TargetCommonOption>
+          <Device>STM32WL55JCIx:CM4</Device>
+          <Vendor>STMicroelectronics</Vendor>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
+          <FlashUtilSpec></FlashUtilSpec>
+          <StartupFile></StartupFile>
+          <FlashDriverDll></FlashDriverDll>
+          <DeviceId>0</DeviceId>
+          <RegisterFile></RegisterFile>
+          <MemoryEnv></MemoryEnv>
+          <Cmp></Cmp>
+          <Asm></Asm>
+          <Linker></Linker>
+          <OHString></OHString>
+          <InfinionOptionDll></InfinionOptionDll>
+          <SLE66CMisc></SLE66CMisc>
+          <SLE66AMisc></SLE66AMisc>
+          <SLE66LinkerMisc></SLE66LinkerMisc>
+          <SFDFile>$$Device:STM32WL55JCIx$CMSIS\SVD\STM32WL5x_CM4.svd</SFDFile>
+          <bCustSvd>0</bCustSvd>
+          <UseEnv>0</UseEnv>
+          <BinPath></BinPath>
+          <IncludePath></IncludePath>
+          <LibPath></LibPath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
+          <TargetStatus>
+            <Error>0</Error>
+            <ExitCodeStop>0</ExitCodeStop>
+            <ButtonStop>0</ButtonStop>
+            <NotGenerated>0</NotGenerated>
+            <InvalidFlash>1</InvalidFlash>
+          </TargetStatus>
+          <OutputDirectory>SubGHz_Phy_Per\</OutputDirectory>
+          <OutputName>SubGHz_Phy_Per</OutputName>
+          <CreateExecutable>1</CreateExecutable>
+          <CreateLib>0</CreateLib>
+          <CreateHexFile>1</CreateHexFile>
+          <DebugInformation>1</DebugInformation>
+          <BrowseInformation>1</BrowseInformation>
+          <ListingPath></ListingPath>
+          <HexFormatSelection>1</HexFormatSelection>
+          <Merge32K>0</Merge32K>
+          <CreateBatchFile>0</CreateBatchFile>
+          <BeforeCompile>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
+          </BeforeCompile>
+          <BeforeMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
+          </BeforeMake>
+          <AfterMake>
+            <RunUserProg1>0</RunUserProg1>
+            <RunUserProg2>0</RunUserProg2>
+            <UserProg1Name></UserProg1Name>
+            <UserProg2Name></UserProg2Name>
+            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
+            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
+          </AfterMake>
+          <SelectedForBatchBuild>1</SelectedForBatchBuild>
+          <SVCSIdString></SVCSIdString>
+        </TargetCommonOption>
+        <CommonProperty>
+          <UseCPPCompiler>0</UseCPPCompiler>
+          <RVCTCodeConst>0</RVCTCodeConst>
+          <RVCTZI>0</RVCTZI>
+          <RVCTOtherData>0</RVCTOtherData>
+          <ModuleSelection>0</ModuleSelection>
+          <IncludeInBuild>1</IncludeInBuild>
+          <AlwaysBuild>0</AlwaysBuild>
+          <GenerateAssemblyFile>0</GenerateAssemblyFile>
+          <AssembleAssemblyFile>0</AssembleAssemblyFile>
+          <PublicsOnly>0</PublicsOnly>
+          <StopOnExitCode>3</StopOnExitCode>
+          <CustomArgument></CustomArgument>
+          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>0</ComprImg>
+        </CommonProperty>
+        <DllOption>
+          <SimDllName>SARMCM3.DLL</SimDllName>
+          <SimDllArguments>-REMAP -MPU</SimDllArguments>
+          <SimDlgDll>DCM.DLL</SimDlgDll>
+          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
+          <TargetDllName>SARMCM3.DLL</TargetDllName>
+          <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDlgDll>TCM.DLL</TargetDlgDll>
+          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
+        </DllOption>
+        <DebugOption>
+          <OPTHX>
+            <HexSelection>1</HexSelection>
+            <HexRangeLowAddress>0</HexRangeLowAddress>
+            <HexRangeHighAddress>0</HexRangeHighAddress>
+            <HexOffset>0</HexOffset>
+            <Oh166RecLen>16</Oh166RecLen>
+          </OPTHX>
+        </DebugOption>
+        <Utilities>
+          <Flash1>
+            <UseTargetDll>1</UseTargetDll>
+            <UseExternalTool>0</UseExternalTool>
+            <RunIndependent>0</RunIndependent>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
+            <Capability>1</Capability>
+            <DriverSelection>4101</DriverSelection>
+          </Flash1>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3></Flash3>
+          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
+        </Utilities>
+        <TargetArmAds>
+          <ArmAdsMisc>
+            <GenerateListings>0</GenerateListings>
+            <asHll>1</asHll>
+            <asAsm>1</asAsm>
+            <asMacX>1</asMacX>
+            <asSyms>1</asSyms>
+            <asFals>1</asFals>
+            <asDbgD>1</asDbgD>
+            <asForm>1</asForm>
+            <ldLst>0</ldLst>
+            <ldmm>1</ldmm>
+            <ldXref>1</ldXref>
+            <BigEnd>0</BigEnd>
+            <AdsALst>1</AdsALst>
+            <AdsACrf>1</AdsACrf>
+            <AdsANop>0</AdsANop>
+            <AdsANot>0</AdsANot>
+            <AdsLLst>1</AdsLLst>
+            <AdsLmap>1</AdsLmap>
+            <AdsLcgr>1</AdsLcgr>
+            <AdsLsym>1</AdsLsym>
+            <AdsLszi>1</AdsLszi>
+            <AdsLtoi>1</AdsLtoi>
+            <AdsLsun>1</AdsLsun>
+            <AdsLven>1</AdsLven>
+            <AdsLsxf>1</AdsLsxf>
+            <RvctClst>0</RvctClst>
+            <GenPPlst>0</GenPPlst>
+            <AdsCpuType>"Cortex-M4"</AdsCpuType>
+            <RvctDeviceName></RvctDeviceName>
+            <mOS>0</mOS>
+            <uocRom>0</uocRom>
+            <uocRam>0</uocRam>
+            <hadIROM>1</hadIROM>
+            <hadIRAM>1</hadIRAM>
+            <hadXRAM>0</hadXRAM>
+            <uocXRam>0</uocXRam>
+            <RvdsVP>0</RvdsVP>
+            <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
+            <hadIRAM2>1</hadIRAM2>
+            <hadIROM2>0</hadIROM2>
+            <StupSel>8</StupSel>
+            <useUlib>1</useUlib>
+            <EndSel>0</EndSel>
+            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
+            <RoSelD>3</RoSelD>
+            <RwSelD>4</RwSelD>
+            <CodeSel>0</CodeSel>
+            <OptFeed>0</OptFeed>
+            <NoZi1>0</NoZi1>
+            <NoZi2>0</NoZi2>
+            <NoZi3>0</NoZi3>
+            <NoZi4>0</NoZi4>
+            <NoZi5>0</NoZi5>
+            <Ro1Chk>0</Ro1Chk>
+            <Ro2Chk>0</Ro2Chk>
+            <Ro3Chk>0</Ro3Chk>
+            <Ir1Chk>1</Ir1Chk>
+            <Ir2Chk>0</Ir2Chk>
+            <Ra1Chk>0</Ra1Chk>
+            <Ra2Chk>0</Ra2Chk>
+            <Ra3Chk>0</Ra3Chk>
+            <Im1Chk>1</Im1Chk>
+            <Im2Chk>1</Im2Chk>
+            <OnChipMemories>
+              <Ocm1>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm1>
+              <Ocm2>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm2>
+              <Ocm3>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm3>
+              <Ocm4>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm4>
+              <Ocm5>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm5>
+              <Ocm6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </Ocm6>
+              <IRAM>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x4000</Size>
+              </IRAM>
+              <IROM>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x20000</Size>
+              </IROM>
+              <XRAM>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </XRAM>
+              <OCR_RVCT1>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT1>
+              <OCR_RVCT2>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT2>
+              <OCR_RVCT3>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT3>
+              <OCR_RVCT4>
+                <Type>1</Type>
+                <StartAddress>0x8000000</StartAddress>
+                <Size>0x40000</Size>
+              </OCR_RVCT4>
+              <OCR_RVCT5>
+                <Type>1</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT5>
+              <OCR_RVCT6>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT6>
+              <OCR_RVCT7>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT7>
+              <OCR_RVCT8>
+                <Type>0</Type>
+                <StartAddress>0x0</StartAddress>
+                <Size>0x0</Size>
+              </OCR_RVCT8>
+              <OCR_RVCT9>
+                <Type>0</Type>
+                <StartAddress>0x20000000</StartAddress>
+                <Size>0x8000</Size>
+              </OCR_RVCT9>
+              <OCR_RVCT10>
+                <Type>0</Type>
+                <StartAddress>0x20008000</StartAddress>
+                <Size>0x8000</Size>
+              </OCR_RVCT10>
+            </OnChipMemories>
+            <RvctStartVector></RvctStartVector>
+          </ArmAdsMisc>
+          <Cads>
+            <interw>1</interw>
+            <Optim>7</Optim>
+            <oTime>0</oTime>
+            <SplitLS>0</SplitLS>
+            <OneElfS>1</OneElfS>
+            <Strict>0</Strict>
+            <EnumInt>0</EnumInt>
+            <PlainCh>0</PlainCh>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <wLevel>3</wLevel>
+            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>1</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>5</v6Lang>
+            <v6LangP>3</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
+            <VariousControls>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
+              <Undefine></Undefine>
+              <IncludePath>../Core/Inc;../SubGHz_Phy/App;../SubGHz_Phy/Target;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
+            </VariousControls>
+          </Cads>
+          <Aads>
+            <interw>1</interw>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <thumb>0</thumb>
+            <SplitLS>0</SplitLS>
+            <SwStkChk>0</SwStkChk>
+            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <ClangAsOpt>4</ClangAsOpt>
+            <VariousControls>
+              <MiscControls></MiscControls>
+              <Define></Define>
+              <Undefine></Undefine>
+              <IncludePath></IncludePath>
+            </VariousControls>
+          </Aads>
+          <LDads>
+            <umfTarg>0</umfTarg>
+            <Ropi>0</Ropi>
+            <Rwpi>0</Rwpi>
+            <noStLib>0</noStLib>
+            <RepFail>1</RepFail>
+            <useFile>0</useFile>
+            <TextAddressRange></TextAddressRange>
+            <DataAddressRange></DataAddressRange>
+            <pXoBase></pXoBase>
+            <ScatterFile>stm32wl55xx_flash_cm4.sct</ScatterFile>
+            <IncludeLibs></IncludeLibs>
+            <IncludeLibsPath></IncludeLibsPath>
+            <Misc></Misc>
+            <LinkerInputFile></LinkerInputFile>
+            <DisabledWarnings></DisabledWarnings>
+          </LDads>
+        </TargetArmAds>
+      </TargetOption>
+      <Groups>
+        <Group>
+          <GroupName>Application/MDK-ARM</GroupName>
+          <Files>
+            <File>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Core</GroupName>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/main.c</FilePath>
+            </File>
+            <File>
+              <FileName>dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/sys_app.c</FilePath>
+            </File>
+            <File>
+              <FileName>sys_debug.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/sys_debug.c</FilePath>
+            </File>
+            <File>
+              <FileName>timer_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/timer_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/usart_if.c</FilePath>
+            </File>
+            <File>
+              <FileName>usart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/usart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_it.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/SubGHz_Phy/App</GroupName>
+          <Files>
+            <File>
+              <FileName>app_subghz_phy.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../SubGHz_Phy/App/app_subghz_phy.c</FilePath>
+            </File>
+            <File>
+              <FileName>subghz_phy_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../SubGHz_Phy/App/subghz_phy_app.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/SubGHz_Phy/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_board_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../SubGHz_Phy/Target/radio_board_if.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Doc</GroupName>
+          <Files>
+            <File>
+              <FileName>readme.txt</FileName>
+              <FileType>5</FileType>
+              <FilePath>../readme.txt</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/BSP/STM32WLxx_Nucleo</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_nucleo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_pwr_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_rtc_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_subghz.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_uart_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/SubGHz_Phy</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_driver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Utilities</GroupName>
+          <Files>
+            <File>
+              <FileName>stm32_adv_trace.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_mem.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_systime.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_lpm.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>::CMSIS</GroupName>
+        </Group>
+      </Groups>
+    </Target>
+  </Targets>
+
+  <RTE>
+    <apis/>
+    <components>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
+        <targetInfos>
+          <targetInfo name="SubGHz_Phy_Per"/>
+        </targetInfos>
+      </component>
+    </components>
+    <files/>
+  </RTE>
+
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
+</Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/startup_stm32wl55xx_cm4.s
new file mode 100644
index 00000000..a52e507f
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -0,0 +1,365 @@
+;******************************************************************************
+;* File Name          : startup_stm32wl55xx_cm4.s
+;* Author             : MCD Application Team
+;* Description        : STM32WL55xx devices vector table for MDK-ARM toolchain.
+;*                      This module performs:
+;*                      - Set the initial SP
+;*                      - Set the initial PC == Reset_Handler
+;*                      - Set the vector table entries with the exceptions ISR address
+;*                      - Branches to __main in the C library (which eventually
+;*                        calls main()).
+;*                      After Reset the CortexM4 processor is in Thread mode,
+;*                      priority is Privileged, and the Stack is set to Main.
+;* <<< Use Configuration Wizard in Context Menu >>>   
+;******************************************************************************
+;* @attention
+;*
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
+;*
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
+;*
+;******************************************************************************
+
+; Amount of memory (in bytes) allocated for Stack
+; Tailor this value to your application needs
+; <h> Stack Configuration
+;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Stack_Size		EQU     0x800
+
+                AREA    STACK, NOINIT, READWRITE, ALIGN=3
+Stack_Mem       SPACE   Stack_Size
+__initial_sp
+
+
+; <h> Heap Configuration
+;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
+; </h>
+
+Heap_Size      EQU     0x200
+
+                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+__heap_base
+Heap_Mem        SPACE   Heap_Size
+__heap_limit
+
+                PRESERVE8
+                THUMB
+
+
+; Vector Table Mapped to Address 0 at Reset
+                AREA    RESET, DATA, READONLY
+                EXPORT  __Vectors
+                EXPORT  __Vectors_End
+                EXPORT  __Vectors_Size
+
+__Vectors       DCD     __initial_sp                      ; Top of Stack
+                DCD     Reset_Handler                     ; Reset Handler
+                DCD     NMI_Handler                       ; NMI Handler
+                DCD     HardFault_Handler                 ; Hard Fault Handler
+                DCD     MemManage_Handler                 ; MPU Fault Handler
+                DCD     BusFault_Handler                  ; Bus Fault Handler
+                DCD     UsageFault_Handler                ; Usage Fault Handler
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     0                                 ; Reserved
+                DCD     SVC_Handler                       ; SVCall Handler
+                DCD     DebugMon_Handler                  ; Debug Monitor Handler
+                DCD     0                                 ; Reserved
+                DCD     PendSV_Handler                    ; PendSV Handler
+                DCD     SysTick_Handler                   ; SysTick Handler
+
+                ; External Interrupts
+                DCD     WWDG_IRQHandler                   ; Window WatchDog
+                DCD     PVD_PVM_IRQHandler                ; PVD and PVM detector
+                DCD     TAMP_STAMP_LSECSS_SSRU_IRQHandler ; RTC Tamper, RTC TimeStamp, LSECSS and RTC SSR Underflow Interrupts
+                DCD     RTC_WKUP_IRQHandler               ; RTC Wakeup Interrupt
+                DCD     FLASH_IRQHandler                  ; FLASH global Interrupt
+                DCD     RCC_IRQHandler                    ; RCC Interrupt
+                DCD     EXTI0_IRQHandler                  ; EXTI Line 0 Interrupt
+                DCD     EXTI1_IRQHandler                  ; EXTI Line 1 Interrupt
+                DCD     EXTI2_IRQHandler                  ; EXTI Line 2 Interrupt
+                DCD     EXTI3_IRQHandler                  ; EXTI Line 3 Interrup
+                DCD     EXTI4_IRQHandler                  ; EXTI Line 4 Interrupt
+                DCD     DMA1_Channel1_IRQHandler          ; DMA1 Channel 1 Interrupt
+                DCD     DMA1_Channel2_IRQHandler          ; DMA1 Channel 2 Interrupt
+                DCD     DMA1_Channel3_IRQHandler          ; DMA1 Channel 3 Interrupt
+                DCD     DMA1_Channel4_IRQHandler          ; DMA1 Channel 4 Interrupt
+                DCD     DMA1_Channel5_IRQHandler          ; DMA1 Channel 5 Interrupt
+                DCD     DMA1_Channel6_IRQHandler          ; DMA1 Channel 6 Interrupt
+                DCD     DMA1_Channel7_IRQHandler          ; DMA1 Channel 7 Interrupt
+                DCD     ADC_IRQHandler                    ; ADC Interrupt
+                DCD     DAC_IRQHandler                    ; DAC Interrupt
+                DCD     C2SEV_PWR_C2H_IRQHandler          ; CPU M0+ SEV and PWR CPU M0+ HOLD wakeup Interrupt
+                DCD     COMP_IRQHandler                   ; COMP1 and COMP2 Interrupts
+                DCD     EXTI9_5_IRQHandler                ; EXTI Lines [9:5] Interrupt
+                DCD     TIM1_BRK_IRQHandler               ; TIM1 Break Interrupt
+                DCD     TIM1_UP_IRQHandler                ; TIM1 Update Interrupts
+                DCD     TIM1_TRG_COM_IRQHandler           ; TIM1 Trigger and Communication Interrupts
+                DCD     TIM1_CC_IRQHandler                ; TIM1 Capture Compare Interrupt
+                DCD     TIM2_IRQHandler                   ; TIM2 Global Interrupt
+                DCD     TIM16_IRQHandler                  ; TIM16 Global Interrupt
+                DCD     TIM17_IRQHandler                  ; TIM17 Global Interrupt
+                DCD     I2C1_EV_IRQHandler                ; I2C1 Event Interrupt
+                DCD     I2C1_ER_IRQHandler                ; I2C1 Error Interrupt
+                DCD     I2C2_EV_IRQHandler                ; I2C2 Event Interrupt
+                DCD     I2C2_ER_IRQHandler                ; I2C2 Error Interrupt
+                DCD     SPI1_IRQHandler                   ; SPI1 Interrupt
+                DCD     SPI2_IRQHandler                   ; SPI2 Interrupt
+                DCD     USART1_IRQHandler                 ; USART1 Interrupt
+                DCD     USART2_IRQHandler                 ; USART2 Interrupt
+                DCD     LPUART1_IRQHandler                ; LPUART1 Interrupt
+                DCD     LPTIM1_IRQHandler                 ; LPTIM1 Interrupt
+                DCD     LPTIM2_IRQHandler                 ; LPTIM2 Interrupt
+                DCD     EXTI15_10_IRQHandler              ; EXTI Lines1[15:10 ]Interrupts
+                DCD     RTC_Alarm_IRQHandler              ; RTC Alarms (A and B) Interrupt
+                DCD     LPTIM3_IRQHandler                 ; LPTIM3 Interrupt
+                DCD     SUBGHZSPI_IRQHandler              ; SUBGHZSPI Interrupt
+                DCD     IPCC_C1_RX_IRQHandler             ; IPCC CPU1 RX occupied interrupt
+                DCD     IPCC_C1_TX_IRQHandler             ; IPCC CPU1 RX free interrupt
+                DCD     HSEM_IRQHandler                   ; HSEM0 Interrupt
+                DCD     I2C3_EV_IRQHandler                ; I2C3 Event Interrupt
+                DCD     I2C3_ER_IRQHandler                ; I2C3 Error Interrupt
+                DCD     SUBGHZ_Radio_IRQHandler           ; SUBGHZ Radio Interrupt
+                DCD     AES_IRQHandler                    ; AES Interrupt
+                DCD     RNG_IRQHandler                    ; RNG1 Interrupt
+                DCD     PKA_IRQHandler                    ; PKA Interrupt
+                DCD     DMA2_Channel1_IRQHandler          ; DMA2 Channel 1 Interrupt
+                DCD     DMA2_Channel2_IRQHandler          ; DMA2 Channel 2 Interrupt
+                DCD     DMA2_Channel3_IRQHandler          ; DMA2 Channel 3 Interrupt
+                DCD     DMA2_Channel4_IRQHandler          ; DMA2 Channel 4 Interrupt
+                DCD     DMA2_Channel5_IRQHandler          ; DMA2 Channel 5 Interrupt
+                DCD     DMA2_Channel6_IRQHandler          ; DMA2 Channel 6 Interrupt
+                DCD     DMA2_Channel7_IRQHandler          ; DMA2 Channel 7 Interrupt
+                DCD     DMAMUX1_OVR_IRQHandler            ; DMAMUX overrun Interrupt
+
+__Vectors_End
+
+__Vectors_Size  EQU  __Vectors_End - __Vectors
+
+                AREA    |.text|, CODE, READONLY
+
+; Reset handler
+Reset_Handler    PROC
+                 EXPORT  Reset_Handler                 [WEAK]
+        IMPORT  SystemInit
+        IMPORT  __main
+
+                 LDR     R0, =SystemInit
+                 BLX     R0
+                 LDR     R0, =__main
+                 BX      R0
+                 ENDP
+
+; Dummy Exception Handlers (infinite loops which can be modified)
+
+NMI_Handler     PROC
+                EXPORT  NMI_Handler                    [WEAK]
+                B       .
+                ENDP
+HardFault_Handler\
+                PROC
+                EXPORT  HardFault_Handler              [WEAK]
+                B       .
+                ENDP
+MemManage_Handler\
+                PROC
+                EXPORT  MemManage_Handler              [WEAK]
+                B       .
+                ENDP
+BusFault_Handler\
+                PROC
+                EXPORT  BusFault_Handler               [WEAK]
+                B       .
+                ENDP
+UsageFault_Handler\
+                PROC
+                EXPORT  UsageFault_Handler             [WEAK]
+                B       .
+                ENDP
+SVC_Handler     PROC
+                EXPORT  SVC_Handler                    [WEAK]
+                B       .
+                ENDP
+DebugMon_Handler\
+                PROC
+                EXPORT  DebugMon_Handler               [WEAK]
+                B       .
+                ENDP
+PendSV_Handler  PROC
+                EXPORT  PendSV_Handler                 [WEAK]
+                B       .
+                ENDP
+SysTick_Handler PROC
+                EXPORT  SysTick_Handler                [WEAK]
+                B       .
+                ENDP
+
+Default_Handler PROC
+
+                EXPORT  WWDG_IRQHandler                   [WEAK]
+                EXPORT  PVD_PVM_IRQHandler                [WEAK]
+                EXPORT  TAMP_STAMP_LSECSS_SSRU_IRQHandler [WEAK]
+                EXPORT  RTC_WKUP_IRQHandler               [WEAK]
+                EXPORT  FLASH_IRQHandler                  [WEAK]
+                EXPORT  RCC_IRQHandler                    [WEAK]
+                EXPORT  EXTI0_IRQHandler                  [WEAK]
+                EXPORT  EXTI1_IRQHandler                  [WEAK]
+                EXPORT  EXTI2_IRQHandler                  [WEAK]
+                EXPORT  EXTI3_IRQHandler                  [WEAK]
+                EXPORT  EXTI4_IRQHandler                  [WEAK]
+                EXPORT  DMA1_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA1_Channel7_IRQHandler          [WEAK]
+                EXPORT  ADC_IRQHandler                    [WEAK]
+                EXPORT  DAC_IRQHandler                    [WEAK]
+                EXPORT  C2SEV_PWR_C2H_IRQHandler          [WEAK]
+                EXPORT  COMP_IRQHandler                   [WEAK]
+                EXPORT  EXTI9_5_IRQHandler                [WEAK]
+                EXPORT  TIM1_BRK_IRQHandler               [WEAK]
+                EXPORT  TIM1_UP_IRQHandler                [WEAK]
+                EXPORT  TIM1_TRG_COM_IRQHandler           [WEAK]
+                EXPORT  TIM1_CC_IRQHandler                [WEAK]
+                EXPORT  TIM2_IRQHandler                   [WEAK]
+                EXPORT  TIM16_IRQHandler                  [WEAK]
+                EXPORT  TIM17_IRQHandler                  [WEAK]
+                EXPORT  I2C1_EV_IRQHandler                [WEAK]
+                EXPORT  I2C1_ER_IRQHandler                [WEAK]
+                EXPORT  I2C2_EV_IRQHandler                [WEAK]
+                EXPORT  I2C2_ER_IRQHandler                [WEAK]
+                EXPORT  SPI1_IRQHandler                   [WEAK]
+                EXPORT  SPI2_IRQHandler                   [WEAK]
+                EXPORT  USART1_IRQHandler                 [WEAK]
+                EXPORT  USART2_IRQHandler                 [WEAK]
+                EXPORT  LPUART1_IRQHandler                [WEAK]
+                EXPORT  LPTIM1_IRQHandler                 [WEAK]
+                EXPORT  LPTIM2_IRQHandler                 [WEAK]
+                EXPORT  EXTI15_10_IRQHandler              [WEAK]
+                EXPORT  RTC_Alarm_IRQHandler              [WEAK]
+                EXPORT  LPTIM3_IRQHandler                 [WEAK]
+                EXPORT  SUBGHZSPI_IRQHandler              [WEAK]
+                EXPORT  IPCC_C1_RX_IRQHandler             [WEAK]
+                EXPORT  IPCC_C1_TX_IRQHandler             [WEAK]
+                EXPORT  HSEM_IRQHandler                   [WEAK]
+                EXPORT  I2C3_EV_IRQHandler                [WEAK]
+                EXPORT  I2C3_ER_IRQHandler                [WEAK]
+                EXPORT  SUBGHZ_Radio_IRQHandler           [WEAK]
+                EXPORT  AES_IRQHandler                    [WEAK]
+                EXPORT  RNG_IRQHandler                    [WEAK]
+                EXPORT  PKA_IRQHandler                    [WEAK]
+                EXPORT  DMA2_Channel1_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel2_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel3_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel4_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel5_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel6_IRQHandler          [WEAK]
+                EXPORT  DMA2_Channel7_IRQHandler          [WEAK]
+                EXPORT  DMAMUX1_OVR_IRQHandler            [WEAK]
+
+WWDG_IRQHandler
+PVD_PVM_IRQHandler
+TAMP_STAMP_LSECSS_SSRU_IRQHandler
+RTC_WKUP_IRQHandler
+FLASH_IRQHandler
+RCC_IRQHandler
+EXTI0_IRQHandler
+EXTI1_IRQHandler
+EXTI2_IRQHandler
+EXTI3_IRQHandler
+EXTI4_IRQHandler
+DMA1_Channel1_IRQHandler
+DMA1_Channel2_IRQHandler
+DMA1_Channel3_IRQHandler
+DMA1_Channel4_IRQHandler
+DMA1_Channel5_IRQHandler
+DMA1_Channel6_IRQHandler
+DMA1_Channel7_IRQHandler
+ADC_IRQHandler
+DAC_IRQHandler
+C2SEV_PWR_C2H_IRQHandler
+COMP_IRQHandler
+EXTI9_5_IRQHandler
+TIM1_BRK_IRQHandler
+TIM1_UP_IRQHandler
+TIM1_TRG_COM_IRQHandler
+TIM1_CC_IRQHandler
+TIM2_IRQHandler
+TIM16_IRQHandler
+TIM17_IRQHandler
+I2C1_EV_IRQHandler
+I2C1_ER_IRQHandler
+I2C2_EV_IRQHandler
+I2C2_ER_IRQHandler
+SPI1_IRQHandler
+SPI2_IRQHandler
+USART1_IRQHandler                
+USART2_IRQHandler
+LPUART1_IRQHandler
+LPTIM1_IRQHandler
+LPTIM2_IRQHandler
+EXTI15_10_IRQHandler
+RTC_Alarm_IRQHandler
+LPTIM3_IRQHandler
+SUBGHZSPI_IRQHandler
+IPCC_C1_RX_IRQHandler
+IPCC_C1_TX_IRQHandler
+HSEM_IRQHandler
+I2C3_EV_IRQHandler
+I2C3_ER_IRQHandler
+SUBGHZ_Radio_IRQHandler
+AES_IRQHandler
+RNG_IRQHandler
+PKA_IRQHandler
+DMA2_Channel1_IRQHandler
+DMA2_Channel2_IRQHandler
+DMA2_Channel3_IRQHandler
+DMA2_Channel4_IRQHandler
+DMA2_Channel5_IRQHandler
+DMA2_Channel6_IRQHandler
+DMA2_Channel7_IRQHandler
+DMAMUX1_OVR_IRQHandler
+
+                B       .
+
+                ENDP
+
+                ALIGN
+
+;*******************************************************************************
+; User Stack and Heap initialization
+;*******************************************************************************
+                 IF      :DEF:__MICROLIB
+
+                 EXPORT  __initial_sp
+                 EXPORT  __heap_base
+                 EXPORT  __heap_limit
+
+                 ELSE
+
+                 IMPORT  __use_two_region_memory
+                 EXPORT  __user_initial_stackheap
+
+__user_initial_stackheap
+
+                 LDR     R0, =  Heap_Mem
+                 LDR     R1, =(Stack_Mem + Stack_Size)
+                 LDR     R2, = (Heap_Mem +  Heap_Size)
+                 LDR     R3, = Stack_Mem
+                 BX      LR
+
+                 ALIGN
+
+                 ENDIF
+
+                 END
+
+;************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE*****
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/stm32wl55xx_flash_cm4.sct
new file mode 100644
index 00000000..574c8f1a
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -0,0 +1,19 @@
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+
+LR_IROM1 0x08000000 0x00040000  {    ; load region size_region
+  ; FLASH
+  ER_IROM1 0x08000000 0x00040000  {  ; load address = execution address
+   *.o (RESET, +First)
+   *(InRoot$$Sections)
+   .ANY (+RO)
+  }
+  ; Non-backup SRAM1
+  RW_IRAM1 0x20000000 0x00008000  {  ; RW data
+   .ANY (+RW +ZI)
+  }
+  ; Backup SRAM2
+  RW_IRAM2 0x20008000 EMPTY 0x00008000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+  }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/.cproject
new file mode 100644
index 00000000..53ef3b17
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/.cproject
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.103024649" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.791903410" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.890127598" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.199704266" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1939132081" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1802159477" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../SubGHz_Phy/Target | ../../../../../../../Utilities/timer | ../../SubGHz_Phy/App | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.640390502" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/SubGHz_Phy_Per}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1776185185" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1374242405" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2014620883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.2029987388" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.61687809" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1645933111" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1611979829" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.426545023" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1603706152" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1827580495" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../SubGHz_Phy/App"/>
+									<listOptionValue builtIn="false" value="../../SubGHz_Phy/Target"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.620013891" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.662195029" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.506967486" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.618324057" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1465313539" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.759366108" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1772928823" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1308343526" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1308876931" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.335814163" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.540282885" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.600218333" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1857947499" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.741384387" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1883247559" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1089349422" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1170573023" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1966853390" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1749307674" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.449362973" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.380982817" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1016811819" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../SubGHz_Phy/Target | ../../../../../../../Utilities/timer | ../../SubGHz_Phy/App | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2081355336" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/SubGHz_Phy_Per}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.351089854" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1978032059" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1859026928" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1307807708" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1155270803" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1448972103" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1809421417" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2050449193" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.17127186" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../../SubGHz_Phy/App"/>
+									<listOptionValue builtIn="false" value="../../SubGHz_Phy/Target"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1641187234" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.613819884" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.66793923" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.295955599" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.760097402" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1286322975" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1071112921" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1715041657" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.82226768" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.30622323" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.85457304" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1216647097" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.315408422" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1892691743" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.46331734" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1175184783" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="SubGHz_Phy_Per.null.243532436" name="SubGHz_Phy_Per"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1155270803;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1641187234">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1645933111;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.620013891">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/SubGHz_Phy_Per"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/SubGHz_Phy_Per"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/.project
new file mode 100644
index 00000000..63fa2cfa
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/.project
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SubGHz_Phy_Per</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>SubGHz_Phy_Per.ioc</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy_Per.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_adv_trace.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_lpm.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_mem.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_seq.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_systime.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_timer.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_vsnprintf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/dma.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/rtc.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/subghz.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/sys_debug.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/timer_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/usart_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/SubGHz_Phy/App/app_subghz_phy.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy/App/app_subghz_phy.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/SubGHz_Phy/App/subghz_phy_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy/App/subghz_phy_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/SubGHz_Phy/Target/radio_board_if.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy/Target/radio_board_if.c</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..80ba57c9
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,435 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..4b06d24d
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,212 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
+
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x800 ; /* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 256K
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM1 AT> FLASH
+
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM1
+
+  /* Data section into "RAM1" Ram type memory: Non-backup RAM1 dedicated to CM4 */
+  . = ALIGN(4);
+  RAM1_region :
+  {
+    _sRAM1_region = .;         /* define a global symbol at section start */
+    *(.RAM1_region)
+
+    . = ALIGN(4);
+    _eRAM1_region = .;         /* define a global symbol at section end */
+  } >RAM1
+
+  /* Data section into "RAM2" Ram type memory: Backup RAM2 dedicated to CM4 */
+  . = ALIGN(4);
+  RAM2_region :
+  {
+    _sRAM2_region = .;         /* define a global symbol at section start */
+    *(.RAM2_region)
+
+    . = ALIGN(4);
+    _eRAM2_region = .;         /* define a global symbol at section end */
+  } >RAM2
+
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM1
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_subghz_phy.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_subghz_phy.c
new file mode 100644
index 00000000..75c633b8
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_subghz_phy.c
@@ -0,0 +1,96 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_subghz_phy.c
+  * @author  MCD Application Team
+  * @brief   Application of the SubGHz_Phy Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "app_subghz_phy.h"
+#include "subghz_phy_app.h"
+#include "sys_app.h"
+#include "stm32_seq.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+
+void MX_SubGHz_Phy_Init(void)
+{
+  /* USER CODE BEGIN MX_SubGHz_Phy_Init_1 */
+
+  /* USER CODE END MX_SubGHz_Phy_Init_1 */
+  SystemApp_Init();
+  SubghzApp_Init();
+  /* USER CODE BEGIN MX_SubGHz_Phy_Init_2 */
+
+  /* USER CODE END MX_SubGHz_Phy_Init_2 */
+}
+
+void MX_SubGHz_Phy_Process(void)
+{
+  /* USER CODE BEGIN MX_SubGHz_Phy_Process_1 */
+
+  /* USER CODE END MX_SubGHz_Phy_Process_1 */
+  UTIL_SEQ_Run(UTIL_SEQ_DEFAULT);
+  /* USER CODE BEGIN MX_SubGHz_Phy_Process_2 */
+
+  /* USER CODE END MX_SubGHz_Phy_Process_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_subghz_phy.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_subghz_phy.h
new file mode 100644
index 00000000..ec85aa39
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_subghz_phy.h
@@ -0,0 +1,76 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_subghz_phy.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the SubGHz_Phy Middleware
+   ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_SUBGHZ_PHY_H__
+#define __APP_SUBGHZ_PHY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init SubGHz Radio Application
+  */
+void MX_SubGHz_Phy_Init(void);
+
+/**
+  * @brief  SubGHz Radio Application Process
+  */
+void MX_SubGHz_Phy_Process(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_SUBGHZ_PHY_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_version.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_version.h
new file mode 100644
index 00000000..d03dcd93
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/app_version.h
@@ -0,0 +1,85 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    app_version.h
+  * @author  MCD Application Team
+  * @brief   Definition the version of the application
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __APP_VERSION_H__
+#define __APP_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
+#define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
+
+#define __APP_VERSION_MAIN_SHIFT 24  /*!< main byte shift */
+#define __APP_VERSION_SUB1_SHIFT 16  /*!< sub1 byte shift */
+#define __APP_VERSION_SUB2_SHIFT 8   /*!< sub2 byte shift */
+#define __APP_VERSION_RC_SHIFT   0   /*!< release candidate byte shift */
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+/**
+  * @brief Application version
+  */
+#define __APP_VERSION         ((__APP_VERSION_MAIN  << __APP_VERSION_MAIN_SHIFT)\
+                               |(__APP_VERSION_SUB1 << __APP_VERSION_SUB1_SHIFT)\
+                               |(__APP_VERSION_SUB2 << __APP_VERSION_SUB2_SHIFT)\
+                               |(__APP_VERSION_RC   << __APP_VERSION_RC_SHIFT))
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__APP_VERSION_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/subghz_phy_app.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/subghz_phy_app.c
new file mode 100644
index 00000000..9a7f9524
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/subghz_phy_app.c
@@ -0,0 +1,569 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    subghz_phy_app.c
+  * @author  MCD Application Team
+  * @brief   Application of the SubGHz_Phy Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "sys_app.h"
+#include "subghz_phy_app.h"
+#include "radio.h"
+#include "app_version.h"
+
+/* USER CODE BEGIN Includes */
+#include "stm32_timer.h"
+#include "stm32_seq.h"
+#include "utilities_def.h"
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+
+/* USER CODE BEGIN PTD */
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+/* Configurations */
+/*Timeout*/
+#define RX_TIMEOUT_VALUE              2000
+#define TX_TIMEOUT_VALUE              3000
+/* Definitions */
+#define RX_CONTINUOUS_ON              1
+#define RADIO_TX                      0 /* do not change*/
+#define RADIO_RX                      1 /* do not change*/
+#define PRBS9_INIT                    ( ( uint16_t) 2 )
+
+/* Test Configurations */
+/*if TEST_MODE is RADIO_TX, board will send packet indefinitely*/
+/*if TEST_MODE is RADIO_RX, board will receive packet indefinitely*/
+#define TEST_MODE                     RADIO_TX
+
+/* 0: Tx Long packet disable*/
+/* 1: Tx Long packet enable(payload can be greater than 255bytes. Available on stm32wl revision Y)*/
+#define APP_LONG_PACKET               0
+/* Application buffer, can be increased further*/
+#define MAX_APP_BUFFER_SIZE 1000
+#if (PAYLOAD_LEN>MAX_APP_BUFFER_SIZE)
+#error increase MAX_APP_BUFFER_SIZE
+#endif /* (PAYLOAD_LEN>MAX_APP_BUFFER_SIZE) */
+
+#if ((APP_LONG_PACKET==0) && PAYLOAD_LEN>255)
+#error in case PAYLOAD_LEN>255, APP_LONG_PACKET shall be defined to 1
+#endif /* ((APP_LONG_PACKET==0) && PAYLOAD_LEN>255) */
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* Radio events function pointer */
+static RadioEvents_t RadioEvents;
+/* USER CODE BEGIN PV */
+
+static __IO uint32_t RadioTxDone_flag = 0;
+static __IO uint32_t RadioTxTimeout_flag = 0;
+static __IO uint32_t RadioRxDone_flag = 0;
+static __IO uint32_t RadioRxTimeout_flag = 0;
+static __IO uint32_t RadioError_flag = 0;
+static __IO int16_t last_rx_rssi = 0;
+static __IO int8_t last_rx_cfo = 0;
+
+uint8_t data_buffer[MAX_APP_BUFFER_SIZE] UTIL_MEM_ALIGN(4);
+uint16_t data_offset = 0;
+
+static __IO uint16_t payloadLen = PAYLOAD_LEN;
+
+static uint8_t syncword[] = { 0xC1, 0x94, 0xC1};
+
+uint32_t count_RxOk = 0;
+uint32_t count_RxKo = 0;
+uint32_t PER = 0;
+
+static int packetCnt = 0;
+
+/* TxPayloadMode
+ * 0: byte Inc e.g payload=0x00, 0x01, ..,payloadLen-1
+ * 1: prbs9  */
+static __IO uint8_t TxPayloadMode = 0;
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/*!
+ * @brief Function to be executed on Radio Tx Done event
+ */
+static void OnTxDone(void);
+
+/**
+  * @brief Function to be executed on Radio Rx Done event
+  * @param  payload ptr of buffer received
+  * @param  size buffer size
+  * @param  rssi
+  * @param  LoraSnr_FskCfo
+  */
+static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo);
+
+/**
+  * @brief Function executed on Radio Tx Timeout event
+  */
+static void OnTxTimeout(void);
+
+/**
+  * @brief Function executed on Radio Rx Timeout event
+  */
+static void OnRxTimeout(void);
+
+/**
+  * @brief Function executed on Radio Rx Error event
+  */
+static void OnRxError(void);
+
+/* USER CODE BEGIN PFP */
+/**
+  * @brief Packet Error Rate state machine implementation
+  */
+static void Per_Process(void);
+
+#if (TEST_MODE == RADIO_TX)
+/**
+  * @brief Generates a PRBS9 sequence
+  * @retval 0
+  */
+static int32_t tx_payload_generator(void);
+#endif /* TEST_MODE == RADIO_TX */
+
+#if (APP_LONG_PACKET != 0)
+/**
+  * @brief Process next Tx chunk of payload
+  * @param buffer
+  * @param buffer_size
+  */
+void TxLongPacketGetNextChunk(uint8_t **buffer, uint8_t buffer_size);
+
+/**
+  * @brief Process next Rx chunk of payload
+  * @param buffer
+  * @param chunk_size
+  */
+void RxLongPacketChunk(uint8_t *buffer, uint8_t chunk_size);
+#endif /* APP_LONG_PACKET != 0 */
+/* USER CODE END PFP */
+
+/* Exported functions ---------------------------------------------------------*/
+void SubghzApp_Init(void)
+{
+  /* USER CODE BEGIN SubghzApp_Init_1 */
+#if (TEST_MODE == RADIO_RX)
+  RxConfigGeneric_t RxConfig = {0};
+  /* RX LEDs*/
+  BSP_LED_Init(LED_GREEN);
+  BSP_LED_Init(LED_RED);
+#elif (TEST_MODE == RADIO_TX)
+  TxConfigGeneric_t TxConfig;
+  BSP_PB_Init(BUTTON_SW1, BUTTON_MODE_EXTI);
+  BSP_PB_Init(BUTTON_SW2, BUTTON_MODE_EXTI);
+  BSP_PB_Init(BUTTON_SW3, BUTTON_MODE_EXTI);
+  /* TX LED*/
+  BSP_LED_Init(LED_BLUE);
+#else
+#endif /* TEST_MODE */
+  /* Print APP version*/
+  APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION= V%X.%X.%X\r\n",
+          (uint8_t)(__APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+
+  /* Init leds*/
+  BSP_LED_Init(LED_GREEN);
+
+  APP_LOG(TS_OFF, VLEVEL_M, "---------------\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_MODULATION\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_BW=%d Hz\n\r", FSK_BANDWIDTH);
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_DR=%d bits/s\n\r", FSK_DATARATE);
+#if (TEST_MODE == RADIO_RX)
+  APP_LOG(TS_OFF, VLEVEL_M, "Rx Mode\n\r", FSK_DATARATE);
+#elif (TEST_MODE == RADIO_TX)
+  APP_LOG(TS_OFF, VLEVEL_M, "Tx Mode\n\r", FSK_DATARATE);
+#endif /* TEST_MODE */
+  /* USER CODE END SubghzApp_Init_1 */
+
+  /* Radio initialization */
+  RadioEvents.TxDone = OnTxDone;
+  RadioEvents.RxDone = OnRxDone;
+  RadioEvents.TxTimeout = OnTxTimeout;
+  RadioEvents.RxTimeout = OnRxTimeout;
+  RadioEvents.RxError = OnRxError;
+
+  Radio.Init(&RadioEvents);
+
+  /* USER CODE BEGIN SubghzApp_Init_2 */
+  /* Radio Set frequency */
+  Radio.SetChannel(RF_FREQUENCY);
+
+  data_offset = 0;
+#if (TEST_MODE == RADIO_RX)
+  APP_TPRINTF("Rx FSK Test\r\n");
+  /* RX Continuous */
+  RxConfig.fsk.ModulationShaping = RADIO_FSK_MOD_SHAPING_G_BT_05;
+  RxConfig.fsk.Bandwidth = FSK_BANDWIDTH;
+  RxConfig.fsk.BitRate = FSK_DATARATE; /*BitRate*/
+  RxConfig.fsk.PreambleLen = 4; /*in Byte*/
+  RxConfig.fsk.SyncWordLength = sizeof(syncword); /*in Byte*/
+  RxConfig.fsk.PreambleMinDetect = RADIO_FSK_PREAMBLE_DETECTOR_08_BITS;
+  RxConfig.fsk.SyncWord = syncword; /*SyncWord Buffer*/
+  RxConfig.fsk.whiteSeed = 0x01FF ; /*WhiteningSeed*/
+#if (APP_LONG_PACKET==0)
+  RxConfig.fsk.LengthMode  = RADIO_FSK_PACKET_VARIABLE_LENGTH; /* legacy: payload length field is 1 byte long*/
+#else
+  RxConfig.fsk.LengthMode  = RADIO_FSK_PACKET_2BYTES_LENGTH;  /* payload length field is 2 bytes long */
+#endif /* APP_LONG_PACKET */
+  RxConfig.fsk.CrcLength = RADIO_FSK_CRC_2_BYTES_IBM;       /* Size of the CRC block in the GFSK packet*/
+  RxConfig.fsk.CrcPolynomial = 0x8005;
+  RxConfig.fsk.CrcSeed = 0xFFFF;
+  RxConfig.fsk.Whitening = RADIO_FSK_DC_FREEWHITENING;
+  RxConfig.fsk.MaxPayloadLength = MAX_APP_BUFFER_SIZE;
+  RxConfig.fsk.StopTimerOnPreambleDetect = 0;
+  RxConfig.fsk.AddrComp = RADIO_FSK_ADDRESSCOMP_FILT_OFF;
+  if (0UL != Radio.RadioSetRxGenericConfig(GENERIC_FSK, &RxConfig, RX_CONTINUOUS_ON, 0))
+  {
+    while (1);
+  }
+#if (APP_LONG_PACKET==0)
+  Radio.Rx(RX_TIMEOUT_VALUE);
+#else
+  (void) Radio.ReceiveLongPacket(0, RX_TIMEOUT_VALUE, RxLongPacketChunk);
+#endif /* APP_LONG_PACKET */
+
+#elif (TEST_MODE == RADIO_TX)
+  tx_payload_generator();
+
+  /*fsk modulation*/
+  TxConfig.fsk.ModulationShaping = RADIO_FSK_MOD_SHAPING_G_BT_05;
+  TxConfig.fsk.Bandwidth = FSK_BANDWIDTH;
+  TxConfig.fsk.FrequencyDeviation = FSK_FDEV;
+  TxConfig.fsk.BitRate = FSK_DATARATE; /*BitRate*/
+  TxConfig.fsk.PreambleLen = 4;   /*in Byte        */
+  TxConfig.fsk.SyncWordLength = sizeof(syncword); /*in Byte        */
+  TxConfig.fsk.SyncWord = syncword; /*SyncWord Buffer*/
+  TxConfig.fsk.whiteSeed =  0x01FF ; /*WhiteningSeed  */
+#if (APP_LONG_PACKET==0)
+  TxConfig.fsk.HeaderType  = RADIO_FSK_PACKET_VARIABLE_LENGTH; /*legacy: payload length field is 1 byte long*/
+#else
+  TxConfig.fsk.HeaderType  = RADIO_FSK_PACKET_2BYTES_LENGTH;  /* payload length field is 2 bytes long */
+#endif /* APP_LONG_PACKET */
+  TxConfig.fsk.CrcLength = RADIO_FSK_CRC_2_BYTES_IBM;       /* Size of the CRC block in the GFSK packet*/
+  TxConfig.fsk.CrcPolynomial = 0x8005;
+  TxConfig.fsk.CrcSeed = 0xFFFF;
+  TxConfig.fsk.Whitening = RADIO_FSK_DC_FREEWHITENING;
+  if (0UL != Radio.RadioSetTxGenericConfig(GENERIC_FSK, &TxConfig, TX_OUTPUT_POWER, TX_TIMEOUT_VALUE))
+  {
+    while (1);
+  }
+#if (APP_LONG_PACKET==0)
+  Radio.Send(data_buffer, payloadLen);
+#else
+  if (0UL != Radio.TransmitLongPacket(payloadLen, TX_TIMEOUT_VALUE, TxLongPacketGetNextChunk))
+  {
+    while (1);
+  }
+#endif /* APP_LONG_PACKET */
+#else
+#error should be either Tx or Rx
+#endif /* TEST_MODE */
+
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), UTIL_SEQ_RFU, Per_Process);
+  /* USER CODE END SubghzApp_Init_2 */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private functions ---------------------------------------------------------*/
+
+static void OnTxDone(void)
+{
+  /* USER CODE BEGIN OnTxDone */
+  RadioTxDone_flag = 1;
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnTxDone */
+}
+
+static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo)
+{
+  /* USER CODE BEGIN OnRxDone */
+  last_rx_rssi = rssi;
+  last_rx_cfo = LoraSnr_FskCfo;
+
+  /* Set Rxdone flag */
+  RadioRxDone_flag = 1;
+  /* Run Per process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+#if (APP_LONG_PACKET==0)
+  memcpy(data_buffer, payload, size);
+  payloadLen = size;
+#else
+  /*from chunk*/
+  payloadLen = data_offset;
+  /*payload data are not relevant in long packet mode*/
+#endif /* APP_LONG_PACKET */
+  /* USER CODE END OnRxDone */
+}
+
+static void OnTxTimeout(void)
+{
+  /* USER CODE BEGIN OnTxTimeout */
+  RadioTxTimeout_flag = 1;
+  /* Run Per process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnTxTimeout */
+}
+
+static void OnRxTimeout(void)
+{
+  /* USER CODE BEGIN OnRxTimeout */
+  RadioRxTimeout_flag = 1;
+  /* Run Per process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnRxTimeout */
+}
+
+static void OnRxError(void)
+{
+  /* USER CODE BEGIN OnRxError */
+  RadioError_flag = 1;
+  /* Run Per process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnRxError */
+}
+
+/* USER CODE BEGIN PrFD */
+#if (APP_LONG_PACKET!=0)
+void RxLongPacketChunk(uint8_t *buffer, uint8_t chunk_size)
+{
+  uint8_t *rxdata = &data_buffer[data_offset];
+  uint8_t *rxbuffer = buffer;
+
+  if (data_offset + chunk_size > MAX_APP_BUFFER_SIZE)
+  {
+    __NOP();
+    return;
+  }
+  for (int i = 0; i < chunk_size; i++)
+  {
+    *rxdata++ = *rxbuffer++;
+  }
+  data_offset += chunk_size;
+}
+
+void TxLongPacketGetNextChunk(uint8_t **buffer, uint8_t chunk_size)
+{
+  *buffer = &data_buffer[data_offset];
+  data_offset += chunk_size;
+  /* APP_TPRINTF("Tx chunk: chunk_size=%d, data_offset=%d\r\n",chunk_size, data_offset); */
+}
+#endif /* APP_LONG_PACKET */
+uint8_t buffer_error = 0;
+static void Per_Process(void)
+{
+  packetCnt++;
+  data_offset = 0;
+#if (TEST_MODE == RADIO_RX)
+  if (RadioRxDone_flag == 1)
+  {
+    int16_t rssi = last_rx_rssi;
+    int8_t cfo = last_rx_cfo;
+    BSP_LED_On(LED_GREEN) ;
+    APP_TPRINTF("OnRxDone\r\n");
+    APP_TPRINTF("RssiValue=%d dBm, cfo=%d kHz\r\n", rssi, cfo);
+    APP_TPRINTF("payloadLen=%d bytes\r\n", payloadLen);
+#if 0
+    /* warning, delay between 2 consecutive Tx may be increased to allow DMA to empty printf queue*/
+    APP_PPRINTF("data=0x \n\r");
+    for (int i = 0; i < payloadLen; i++)
+    {
+      APP_PRINTF("%02X ", data_buffer[i]);
+      if ((i % 16) == 15)
+      {
+        APP_PPRINTF("\n\r");
+      }
+    }
+    APP_PPRINTF("\n\r");
+#endif /* 0 */
+  }
+  else
+  {
+    BSP_LED_On(LED_RED);
+  }
+
+  if (RadioRxTimeout_flag == 1)
+  {
+    APP_TPRINTF("OnRxTimeout\r\n");
+  }
+
+  if (RadioError_flag == 1)
+  {
+    APP_TPRINTF("OnRxError\r\n");
+  }
+
+  /*check flag*/
+  if ((RadioRxTimeout_flag == 1) || (RadioError_flag == 1))
+  {
+    count_RxKo++;
+  }
+  if (RadioRxDone_flag == 1)
+  {
+    count_RxOk++;
+  }
+  /* Reset timeout flag */
+  RadioRxDone_flag = 0;
+  RadioRxTimeout_flag = 0;
+  RadioError_flag = 0;
+
+  /* Compute PER */
+  PER = (100 * (count_RxKo)) / (count_RxKo + count_RxOk);
+  APP_TPRINTF("Rx %d>>> PER= %d %%\r\n", packetCnt, PER);
+#if (APP_LONG_PACKET==0)
+  Radio.Rx(RX_TIMEOUT_VALUE);
+#else
+  (void) Radio.ReceiveLongPacket(0, RX_TIMEOUT_VALUE, RxLongPacketChunk);
+#endif /* APP_LONG_PACKET */
+  HAL_Delay(10);
+  BSP_LED_Off(LED_GREEN) ;
+  BSP_LED_Off(LED_RED) ;
+#elif (TEST_MODE == RADIO_TX)
+  BSP_LED_Off(LED_BLUE) ;
+  if (RadioTxDone_flag == 1)
+  {
+    APP_TPRINTF("OnTxDone\r\n");
+  }
+
+  if (RadioTxTimeout_flag == 1)
+  {
+    APP_TPRINTF("OnTxTimeout\r\n");
+  }
+
+  if (RadioError_flag == 1)
+  {
+    APP_TPRINTF("OnRxError\r\n");
+  }
+  /* this delay is only to give enough time to allow DMA to empty printf queue*/
+  HAL_Delay(500);
+  /* Reset TX Done or timeout flags */
+  RadioTxDone_flag = 0;
+  RadioTxTimeout_flag = 0;
+  RadioError_flag = 0;
+
+  tx_payload_generator();
+#if (APP_LONG_PACKET==0)
+  Radio.Send(data_buffer, payloadLen);
+#else
+  if (0UL != Radio.TransmitLongPacket(payloadLen, TX_TIMEOUT_VALUE, TxLongPacketGetNextChunk))
+  {
+    while (1);
+  }
+#endif /* APP_LONG_PACKET */
+  APP_TPRINTF("Tx %d \r\n", packetCnt);
+  BSP_LED_On(LED_BLUE) ;
+#endif /* TEST_MODE */
+}
+
+#if (TEST_MODE == RADIO_TX)
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
+{
+  switch (GPIO_Pin)
+  {
+    case  BUTTON_SW1_PIN:
+      /* Note: when "EventType == TX_ON_TIMER" this GPIO is not initialized */
+      /*increment by 16*/
+      payloadLen += 16;
+      if (payloadLen > MAX_APP_BUFFER_SIZE)
+      {
+        payloadLen = 1;
+      }
+      APP_TPRINTF("New Tx Payload Length= %d\r\n", payloadLen);
+
+      break;
+    case  BUTTON_SW2_PIN:
+
+      /*increment by 1*/
+      payloadLen += 1;
+      if (payloadLen > MAX_APP_BUFFER_SIZE)
+      {
+        payloadLen = 1;
+      }
+      APP_TPRINTF("New Tx Payload Length= %d\r\n", payloadLen);
+
+      break;
+
+    case  BUTTON_SW3_PIN:
+
+      TxPayloadMode = (TxPayloadMode + 1) % 2;
+      if (TxPayloadMode == 1)
+      {
+        APP_TPRINTF("Payload PRBS9 mode\r\n");
+      }
+      else
+      {
+        APP_TPRINTF("Payload Inc mode\r\n");
+      }
+
+      break;
+
+    default:
+      break;
+  }
+}
+
+static int32_t tx_payload_generator(void)
+{
+  if (TxPayloadMode == 1)
+  {
+    uint16_t prbs9_val = PRBS9_INIT;
+    for (int32_t i = 0; i < payloadLen; i++)
+    {
+      data_buffer[i] = 0;
+    }
+    for (int32_t i = 0; i < payloadLen * 8; i++)
+    {
+      /*fill buffer with prbs9 sequence*/
+      int32_t newbit = (((prbs9_val >> 8) ^ (prbs9_val >> 4)) & 1);
+      prbs9_val = ((prbs9_val << 1) | newbit) & 0x01ff;
+      data_buffer[i / 8] |= ((prbs9_val & 0x1) << (i % 8));
+    }
+  }
+  else
+  {
+    for (int32_t i = 0; i < payloadLen; i++)
+    {
+      data_buffer[i] = i;
+    }
+  }
+  return 0;
+}
+#endif /* TEST_MODE */
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/subghz_phy_app.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/subghz_phy_app.h
new file mode 100644
index 00000000..0bf6cf89
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/App/subghz_phy_app.h
@@ -0,0 +1,145 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    subghz_phy_app.h
+  * @author  MCD Application Team
+  * @brief   Header of application of the SubGHz_Phy Middleware
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __SUBGHZ_PHY_APP_H__
+#define __SUBGHZ_PHY_APP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* MODEM type: one shall be 1 the other shall be 0 */
+#define USE_MODEM_LORA  0
+#define USE_MODEM_FSK   1
+
+#define REGION_EU868
+
+#if defined( REGION_AS923 )
+
+#define RF_FREQUENCY                                923000000 /* Hz */
+#elif defined( REGION_AU915 )
+
+#define RF_FREQUENCY                                915000000 /* Hz */
+
+#elif defined( REGION_CN470 )
+
+#define RF_FREQUENCY                                470000000 /* Hz */
+
+#elif defined( REGION_CN779 )
+
+#define RF_FREQUENCY                                779000000 /* Hz */
+
+#elif defined( REGION_EU433 )
+
+#define RF_FREQUENCY                                433000000 /* Hz */
+
+#elif defined( REGION_EU868 )
+
+#define RF_FREQUENCY                                868000000 /* Hz */
+
+#elif defined( REGION_KR920 )
+
+#define RF_FREQUENCY                                920000000 /* Hz */
+
+#elif defined( REGION_IN865 )
+
+#define RF_FREQUENCY                                865000000 /* Hz */
+
+#elif defined( REGION_US915 )
+
+#define RF_FREQUENCY                                915000000 /* Hz */
+
+#elif defined( REGION_RU864 )
+
+#define RF_FREQUENCY                                864000000 /* Hz */
+
+#else
+#error "Please define a frequency band in the compiler options."
+#endif /* REGION_XXxxx */
+
+#define TX_OUTPUT_POWER                             14        /* dBm */
+
+#if (( USE_MODEM_LORA == 1 ) && ( USE_MODEM_FSK == 0 ))
+#define LORA_BANDWIDTH                              0         /* [0: 125 kHz, 1: 250 kHz, 2: 500 kHz, 3: Reserved] */
+#define LORA_SPREADING_FACTOR                       7         /* [SF7..SF12] */
+#define LORA_CODINGRATE                             1         /* [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8] */
+#define LORA_PREAMBLE_LENGTH                        8         /* Same for Tx and Rx */
+#define LORA_SYMBOL_TIMEOUT                         5         /* Symbols */
+#define LORA_FIX_LENGTH_PAYLOAD_ON                  false
+#define LORA_IQ_INVERSION_ON                        false
+
+#elif (( USE_MODEM_LORA == 0 ) && ( USE_MODEM_FSK == 1 ))
+
+#define FSK_FDEV                                    25000     /* Hz */
+#define FSK_DATARATE                                50000     /* bps */
+#define FSK_BANDWIDTH                               50000     /* Hz */
+#define FSK_PREAMBLE_LENGTH                         5         /* Same for Tx and Rx */
+#define FSK_FIX_LENGTH_PAYLOAD_ON                   false
+
+#else
+#error "Please define a modem in the compiler subghz_phy_app.h."
+#endif /* USE_MODEM_LORA | USE_MODEM_FSK */
+
+#define PAYLOAD_LEN                                 64
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Init Subghz Application
+  */
+void SubghzApp_Init(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__SUBGHZ_PHY_APP_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/mw_log_conf.h
new file mode 100644
index 00000000..5bcdf818
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/mw_log_conf.h
@@ -0,0 +1,75 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    mw_log_conf.h
+  * @author  MCD Application Team
+  * @brief   Configure (enable/disable) traces for CM0
+  *******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __MW_LOG_CONF_H__
+#define __MW_LOG_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_adv_trace.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+#define MW_LOG_ENABLED
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+#ifdef MW_LOG_ENABLED
+#define MW_LOG(TS,VL, ...)   do{ {UTIL_ADV_TRACE_COND_FSend(VL, T_REG_OFF, TS, __VA_ARGS__);} }while(0)
+#else  /* MW_LOG_ENABLED */
+#define MW_LOG(TS,VL, ...)
+#endif /* MW_LOG_ENABLED */
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__MW_LOG_CONF_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_board_if.c
new file mode 100644
index 00000000..d4c34621
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_board_if.c
@@ -0,0 +1,220 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.c
+  * @author  MCD Application Team
+  * @brief   This file provides an interface layer between MW and Radio Board
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Includes ------------------------------------------------------------------*/
+#include "radio_board_if.h"
+
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* External variables ---------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Private typedef -----------------------------------------------------------*/
+/* USER CODE BEGIN PTD */
+
+/* USER CODE END PTD */
+
+/* Private define ------------------------------------------------------------*/
+/* USER CODE BEGIN PD */
+
+/* USER CODE END PD */
+
+/* Private macro -------------------------------------------------------------*/
+/* USER CODE BEGIN PM */
+
+/* USER CODE END PM */
+
+/* Private variables ---------------------------------------------------------*/
+/* USER CODE BEGIN PV */
+
+/* USER CODE END PV */
+
+/* Private function prototypes -----------------------------------------------*/
+/* USER CODE BEGIN PFP */
+
+/* USER CODE END PFP */
+
+/* Exported functions --------------------------------------------------------*/
+int32_t RBI_Init(void)
+{
+  /* USER CODE BEGIN RBI_Init_1 */
+
+  /* USER CODE END RBI_Init_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_Init();
+#else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_Init_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_Init_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_DeInit(void)
+{
+  /* USER CODE BEGIN RBI_DeInit_1 */
+
+  /* USER CODE END RBI_DeInit_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_DeInit();
+#else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_DeInit_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_DeInit_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
+{
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_1 */
+
+  /* USER CODE END RBI_ConfigRFSwitch_1 */
+#if defined(USE_BSP_DRIVER)
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
+#else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_ConfigRFSwitch_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_GetTxConfig(void)
+{
+  /* USER CODE BEGIN RBI_GetTxConfig_1 */
+
+  /* USER CODE END RBI_GetTxConfig_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_GetTxConfig();
+#else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
+  /* USER CODE BEGIN RBI_GetTxConfig_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_GetTxConfig_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
+}
+
+int32_t RBI_IsTCXO(void)
+{
+  /* USER CODE BEGIN RBI_IsTCXO_1 */
+
+  /* USER CODE END RBI_IsTCXO_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsTCXO();
+#else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsTCXO_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsTCXO_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+int32_t RBI_IsDCDC(void)
+{
+  /* USER CODE BEGIN RBI_IsDCDC_1 */
+
+  /* USER CODE END RBI_IsDCDC_1 */
+#if defined(USE_BSP_DRIVER)
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_IsDCDC();
+#else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
+  /* USER CODE BEGIN RBI_IsDCDC_2 */
+#warning user to provide its board code or to call his board driver functions
+  /* USER CODE END RBI_IsDCDC_2 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+/* USER CODE BEGIN PrFD */
+
+/* USER CODE END PrFD */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_board_if.h
new file mode 100644
index 00000000..9e505c68
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_board_if.h
@@ -0,0 +1,207 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_board_if.h
+  * @author  MCD Application Team
+  * @brief   Header for Radio interface configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef RADIO_BOARD_IF_H
+#define RADIO_BOARD_IF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported defines ----------------------------------------------------------*/
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+#define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
+#define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
+#define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
+#else
+/* USER CODE BEGIN Board Definition */
+
+/* USER CODE END Board Definition */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported Parameters */
+
+/* USER CODE END Exported Parameters */
+/* Indicates the type of switch between the ones proposed by CONFIG Constants
+ */
+#define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
+
+/* Indicates whether or not TCXO is supported by the board
+ * 0: TCXO not supported
+ * 1: TCXO supported
+ */
+#define IS_TCXO_SUPPORTED                   1U
+
+/* Indicates whether or not DCDC is supported by the board
+ * 0: DCDC not supported
+ * 1: DCDC supported
+ */
+#define IS_DCDC_SUPPORTED                   1U
+
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+#else
+/* USER CODE BEGIN Exported PinMapping */
+#warning user to provide its board definitions pins
+/* USER CODE END Exported PinMapping */
+#endif  /* USE_BSP_DRIVER  */
+
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
+/* Exported types ------------------------------------------------------------*/
+
+#if defined(USE_BSP_DRIVER)
+/* code generated by STM32CubeMX does not support BSP */
+/* In order to use BSP driver, add the correspondent files in the IDE workspace */
+/* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+typedef enum
+{
+  RBI_SWITCH_OFF    = RADIO_SWITCH_OFF,
+  RBI_SWITCH_RX     = RADIO_SWITCH_RX,
+  RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
+  RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
+} RBI_Switch_TypeDef;
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
+typedef enum
+{
+  RBI_SWITCH_OFF    = 0,
+  RBI_SWITCH_RX     = 1,
+  RBI_SWITCH_RFO_LP = 2,
+  RBI_SWITCH_RFO_HP = 3,
+} RBI_Switch_TypeDef;
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
+
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions ------------------------------------------------------- */
+/**
+  * @brief  Init Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_Init(void);
+
+/**
+  * @brief  DeInit Radio Switch
+  * @return BSP status
+  */
+int32_t RBI_DeInit(void);
+
+/**
+  * @brief  Configure Radio Switch.
+  * @param  Config: Specifies the Radio RF switch path to be set.
+  *         This parameter can be one of following parameters:
+  *           @arg RADIO_SWITCH_OFF
+  *           @arg RADIO_SWITCH_RX
+  *           @arg RADIO_SWITCH_RFO_LP
+  *           @arg RADIO_SWITCH_RFO_HP
+  * @return BSP status
+  */
+int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
+
+/**
+  * @brief  Return Board Configuration
+  * @retval RBI_CONF_RFO_LP_HP
+  * @retval RBI_CONF_RFO_LP
+  * @retval RBI_CONF_RFO_HP
+  */
+int32_t RBI_GetTxConfig(void);
+
+/**
+  * @brief  Get If TCXO is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsTCXO(void);
+
+/**
+  * @brief  Get If DCDC is to be present on board
+  * @note   never remove called by MW,
+  * @retval return 1 if present, 0 if not present
+  */
+int32_t RBI_IsDCDC(void);
+
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RADIO_BOARD_IF_H */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_conf.h
new file mode 100644
index 00000000..7c2bd11e
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/radio_conf.h
@@ -0,0 +1,180 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    radio_conf.h
+  * @author  MCD Application Team
+  * @brief   Header of Radio configuration
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __RADIO_CONF_H__
+#define __RADIO_CONF_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "platform.h"
+#include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
+#include "mw_log_conf.h"     /* mw trace conf */
+#include "radio_board_if.h"  /* low layer api (bsp) */
+#include "utilities_def.h"  /* low layer api (bsp) */
+#include "sys_debug.h"
+/* USER CODE BEGIN include */
+
+/* USER CODE END include */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Set RX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
+
+/**
+  * @brief Set TX pin to high or low level
+  */
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
+
+/**
+  * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
+
+/**
+  * @brief drive value used anytime radio is in TX low power mode
+  *        TX low power mode is the worst case because the PA sinks from SMPS
+  *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
+  */
+#define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
+
+/**
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_FREQ                   ( 32000000UL )
+
+/**
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
+  */
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
+
+/**
+  * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
+  */
+#define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
+
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
+/**
+  * @brief enables the RFW module
+  * @note disabled by default
+  */
+#define RFW_ENABLE 1
+
+/**
+  * @brief enables the RFW long packet feature
+  * @note disabled by default
+  */
+#define RFW_LONGPACKET_ENABLE 1
+
+/* USER CODE BEGIN EC */
+/**
+  * @brief enables the RFW module log
+  * @note disabled by default
+  */
+#define RWF_MW_LOG_ENABLE
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macros -----------------------------------------------------------*/
+#ifndef CRITICAL_SECTION_BEGIN
+/**
+  * @brief macro used to enter the critical section
+  */
+#define CRITICAL_SECTION_BEGIN( )      UTILS_ENTER_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_BEGIN */
+#ifndef CRITICAL_SECTION_END
+/**
+  * @brief macro used to exit the critical section
+  */
+#define CRITICAL_SECTION_END( )        UTILS_EXIT_CRITICAL_SECTION( )
+#endif /* !CRITICAL_SECTION_END */
+
+/* Function mapping */
+/**
+  * @brief SUBGHZ interface init to radio Middleware
+  */
+#define RADIO_INIT                              MX_SUBGHZ_Init
+
+/**
+  * @brief Delay interface to radio Middleware
+  */
+#define RADIO_DELAY_MS                          HAL_Delay
+
+/**
+  * @brief Memset utilities interface to radio Middleware
+  */
+#define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
+
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __RADIO_CONF_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/timer.h
new file mode 100644
index 00000000..e80cd6a0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy/Target/timer.h
@@ -0,0 +1,120 @@
+/* USER CODE BEGIN Header */
+/**
+  ******************************************************************************
+  * @file    timer.h
+  * @author  MCD Application Team
+  * @brief   Wrapper to timer server
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under BSD 3-Clause license,
+  * the "License"; You may not use this file except in compliance with the
+  * License. You may obtain a copy of the License at:
+  *                        opensource.org/licenses/BSD-3-Clause
+  *
+  ******************************************************************************
+  */
+/* USER CODE END Header */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __TIMER_H__
+#define __TIMER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32_timer.h"
+/* USER CODE BEGIN Includes */
+
+/* USER CODE END Includes */
+
+/* Exported types ------------------------------------------------------------*/
+/* USER CODE BEGIN ET */
+
+/* USER CODE END ET */
+
+/* Exported constants --------------------------------------------------------*/
+/**
+  * @brief Max timer mask
+  */
+#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
+
+/* USER CODE BEGIN EC */
+
+/* USER CODE END EC */
+
+/* External variables --------------------------------------------------------*/
+/* USER CODE BEGIN EV */
+
+/* USER CODE END EV */
+
+/* Exported macro ------------------------------------------------------------*/
+/**
+  * @brief Timer value on 32 bits
+  */
+#define TimerTime_t UTIL_TIMER_Time_t
+
+/**
+  * @brief Timer object description
+  */
+#define TimerEvent_t UTIL_TIMER_Object_t
+
+/**
+  * @brief Create the timer object
+  */
+#define TimerInit(HANDLE, CB) do {\
+                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
+                                 } while(0)
+
+/**
+  * @brief update the period and start the timer
+  */
+#define TimerSetValue(HANDLE, TIMEOUT) do{ \
+                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
+                                         } while(0)
+
+/**
+  * @brief Start and adds the timer object to the list of timer events
+  */
+#define TimerStart(HANDLE)   do {\
+                                  UTIL_TIMER_Start(HANDLE);\
+                                } while(0)
+
+/**
+  * @brief Stop and removes the timer object from the list of timer events
+  */
+#define TimerStop(HANDLE)   do {\
+                                 UTIL_TIMER_Stop(HANDLE);\
+                               } while(0)
+
+/**
+  * @brief return the current time
+  */
+#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
+
+/**
+  * @brief return the elapsed time
+  */
+#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
+
+/* USER CODE BEGIN EM */
+
+/* USER CODE END EM */
+
+/* Exported functions prototypes ---------------------------------------------*/
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __TIMER_H__*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy_Per.ioc b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy_Per.ioc
new file mode 100644
index 00000000..81002d50
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/SubGHz_Phy_Per.ioc
@@ -0,0 +1,380 @@
+#MicroXplorer Configuration settings - do not modify
+Dma.Request0=USART2_TX
+Dma.RequestsNb=1
+Dma.USART2_TX.0.Channel_PRIV_NPRIV=DMA_CHANNEL_NPRIV_DISABLE
+Dma.USART2_TX.0.Direction=DMA_MEMORY_TO_PERIPH
+Dma.USART2_TX.0.EventEnable=DISABLE
+Dma.USART2_TX.0.Instance=DMA1_Channel5
+Dma.USART2_TX.0.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART2_TX.0.MemInc=DMA_MINC_ENABLE
+Dma.USART2_TX.0.Mode=DMA_NORMAL
+Dma.USART2_TX.0.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART2_TX.0.PeriphInc=DMA_PINC_DISABLE
+Dma.USART2_TX.0.Polarity=HAL_DMAMUX_REQ_GEN_RISING
+Dma.USART2_TX.0.Priority=DMA_PRIORITY_LOW
+Dma.USART2_TX.0.RequestNumber=1
+Dma.USART2_TX.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,SignalID,Polarity,RequestNumber,SyncSignalID,SyncPolarity,SyncEnable,EventEnable,SyncRequestNumber,Channel_PRIV_NPRIV
+Dma.USART2_TX.0.SignalID=NONE
+Dma.USART2_TX.0.SyncEnable=DISABLE
+Dma.USART2_TX.0.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT
+Dma.USART2_TX.0.SyncRequestNumber=1
+Dma.USART2_TX.0.SyncSignalID=NONE
+File.Version=6
+GPIO.groupedBy=Group By Peripherals
+KeepUserPlacement=false
+Mcu.ContextProject=MonoOnDualCore
+Mcu.Family=STM32WL
+Mcu.IP0=ADV_TRACE
+Mcu.IP1=DEBUG
+Mcu.IP10=SYS
+Mcu.IP11=TIMER
+Mcu.IP12=TINY_LPM
+Mcu.IP13=USART2
+Mcu.IP2=DMA
+Mcu.IP3=MISC
+Mcu.IP4=NVIC
+Mcu.IP5=RCC
+Mcu.IP6=RTC
+Mcu.IP7=SEQUENCER_M4
+Mcu.IP8=SUBGHZ
+Mcu.IP9=SUBGHZ_PHY
+Mcu.IPNb=14
+Mcu.Name=STM32WL55JCIx
+Mcu.Package=UFBGA73
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin22=VP_MISC_VS_MISC
+Mcu.Pin23=VP_RTC_VS_RTC_Activate
+Mcu.Pin24=VP_RTC_VS_RTC_Calendar
+Mcu.Pin25=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin26=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin27=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin28=VP_SUBGHZ_PHY_VS_SubGhzPhy
+Mcu.Pin29=VP_SYS_VS_None
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_TIMER_VS_TIMER
+Mcu.Pin31=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=32
+Mcu.ThirdPartyNb=0
+Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1)
+Mcu.UserName=STM32WL55JCIx
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
+NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
+NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.EXTI1_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.EXTI9_5_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.ForceEnableDMAVector=true
+NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
+NVIC.RTC_Alarm_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.TAMP_STAMP_LSECSS_SSRU_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.TimeBase=None
+NVIC.USART2_IRQn=true\:2\:0\:true\:false\:true\:true\:true
+NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+OSC_IN.Mode=HSE-TCXO
+OSC_IN.Signal=RCC_OSC_IN
+PA0.GPIOParameters=GPIO_Label
+PA0.GPIO_Label=BUT1
+PA0.Locked=true
+PA0.Signal=GPXTI0
+PA1.GPIOParameters=GPIO_Label
+PA1.GPIO_Label=BUT2
+PA1.Locked=true
+PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
+PA2.GPIOParameters=GPIO_Speed,GPIO_Label
+PA2.GPIO_Label=USARTx_TX
+PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
+PA2.Locked=true
+PA2.Mode=Asynchronous
+PA2.Signal=USART2_TX
+PA3.GPIOParameters=GPIO_Speed,GPIO_Label
+PA3.GPIO_Label=USARTx_RX
+PA3.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
+PA3.Locked=true
+PA3.Mode=Asynchronous
+PA3.Signal=USART2_RX
+PB0-VDD_TCXO.Mode=HSE-TCXO
+PB0-VDD_TCXO.Signal=VDDTCXO
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
+PB10.Locked=true
+PB10.Signal=GPIO_Output
+PB11.GPIOParameters=GPIO_Label
+PB11.GPIO_Label=LED3
+PB11.Locked=true
+PB11.Signal=GPIO_Output
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
+PB12.Locked=true
+PB12.Signal=GPIO_Output
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
+PB13.Locked=true
+PB13.Signal=GPIO_Output
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
+PB14.Locked=true
+PB14.Signal=GPIO_Output
+PB15.GPIOParameters=GPIO_Label
+PB15.GPIO_Label=LED1
+PB15.Locked=true
+PB15.Signal=GPIO_Output
+PB9.GPIOParameters=GPIO_Label
+PB9.GPIO_Label=LED2
+PB9.Locked=true
+PB9.Signal=GPIO_Output
+PC14-OSC32_IN.Locked=true
+PC14-OSC32_IN.Mode=LSE-External-Oscillator
+PC14-OSC32_IN.Signal=RCC_OSC32_IN
+PC15-OSC32_OUT.Locked=true
+PC15-OSC32_OUT.Mode=LSE-External-Oscillator
+PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
+PC3.GPIOParameters=GPIO_Label
+PC3.GPIO_Label=RF_CTRL3
+PC3.Locked=true
+PC3.Signal=GPIO_Output
+PC4.GPIOParameters=GPIO_Label
+PC4.GPIO_Label=RF_CTRL1
+PC4.Locked=true
+PC4.Signal=GPIO_Output
+PC5.GPIOParameters=GPIO_Label
+PC5.GPIO_Label=RF_CTRL2
+PC5.Locked=true
+PC5.Signal=GPIO_Output
+PC6.GPIOParameters=GPIO_Label
+PC6.GPIO_Label=BUT3
+PC6.Locked=true
+PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
+PinOutPanel.CurrentBGAView=Top
+PinOutPanel.RotationAngle=0
+ProjectManager.AskForMigrate=true
+ProjectManager.BackupPrevious=false
+ProjectManager.CompilerOptimize=6
+ProjectManager.ComputerToolchain=false
+ProjectManager.CoupleFile=true
+ProjectManager.DeletePrevious=true
+ProjectManager.DeviceId=STM32WL55JCIx
+ProjectManager.FreePins=false
+ProjectManager.HalAssertFull=false
+ProjectManager.HeapSize=0x200
+ProjectManager.KeepUserCode=true
+ProjectManager.LastFirmware=true
+ProjectManager.LibraryCopy=2
+ProjectManager.MainLocation=Core/Src
+ProjectManager.NoMain=false
+ProjectManager.PreviousToolchain=
+ProjectManager.ProjectBuild=false
+ProjectManager.ProjectFileName=SubGHz_Phy_Per.ioc
+ProjectManager.ProjectName=SubGHz_Phy_Per
+ProjectManager.RegisterCallBack=
+ProjectManager.StackSize=0x800
+ProjectManager.TargetToolchain=EWARM V8
+ProjectManager.ToolChainLocation=
+ProjectManager.UnderRoot=false
+ProjectManager.functionlistsort=false-1-MX_GPIO_Init-GPIO-false-HAL-false,2-MX_DMA_Init-DMA-true-HAL-false,3-SystemClock_Config-RCC-false-HAL-false,4-MX_RTC_Init-RTC-true-HAL-false,5-MX_USART2_UART_Init-USART2-true-HAL-false,6-MX_SubGHz_Phy_Init-SUBGHZ_PHY-false-HAL-false,7-MX_SUBGHZ_Init-SUBGHZ-true-HAL-false
+RCC.AHBFreq_Value=48000000
+RCC.APB1Freq_Value=48000000
+RCC.APB1TimFreq_Value=48000000
+RCC.APB2Freq_Value=48000000
+RCC.APB2TimFreq_Value=48000000
+RCC.APB3Freq_Value=48000000
+RCC.CortexFreq_Value=48000000
+RCC.FCLKCortexFreq_Value=48000000
+RCC.FLatency=FLASH_LATENCY_2
+RCC.FamilyName=M
+RCC.HCLK3Freq_Value=48000000
+RCC.HCLKFreq_Value=48000000
+RCC.HSE_VALUE=8000000
+RCC.HSI_VALUE=16000000
+RCC.I2C1Freq_Value=48000000
+RCC.I2C2Freq_Value=48000000
+RCC.I2C3Freq_Value=48000000
+RCC.I2S2Freq_Value=16000000
+RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,APB3Freq_Value,CortexFreq_Value,FCLKCortexFreq_Value,FLatency,FamilyName,HCLK3Freq_Value,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2C3Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM3Freq_Value,LPUART1Freq_Value,LSCOPinFreq_Value,LSE_VALUE,MCO1PinFreq_Value,MSIClockRange,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PWRFreq_Value,PWR_Regulator_Voltage_Scale,RNGFreq_Value,RTCClockSelection,RTCFreq_Value,SYSCLKFreq_VALUE,USART1Freq_Value,USART2CLockSelection,USART2Freq_Value,VCOInputFreq_Value,VCOOutputFreq_Value
+RCC.LPTIM1Freq_Value=48000000
+RCC.LPTIM2Freq_Value=48000000
+RCC.LPTIM3Freq_Value=48000000
+RCC.LPUART1Freq_Value=48000000
+RCC.LSCOPinFreq_Value=32000
+RCC.LSE_VALUE=32768
+RCC.MCO1PinFreq_Value=48000000
+RCC.MSIClockRange=RCC_MSIRANGE_11
+RCC.PLLPoutputFreq_Value=192000000
+RCC.PLLQoutputFreq_Value=192000000
+RCC.PLLRCLKFreq_Value=192000000
+RCC.PWRFreq_Value=48000000
+RCC.PWR_Regulator_Voltage_Scale=PWR_REGULATOR_VOLTAGE_SCALE1
+RCC.RNGFreq_Value=32000
+RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE
+RCC.RTCFreq_Value=32768
+RCC.SYSCLKFreq_VALUE=48000000
+RCC.USART1Freq_Value=48000000
+RCC.USART2CLockSelection=RCC_USART2CLKSOURCE_SYSCLK
+RCC.USART2Freq_Value=48000000
+RCC.VCOInputFreq_Value=48000000
+RCC.VCOOutputFreq_Value=384000000
+RTC.Alarm-Alarm\ A=RTC_ALARM_A
+RTC.AsynchPrediv=RTC_PREDIV_A
+RTC.BinMode=RTC_BINARY_ONLY
+RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
+RTC.IPParameters=Alarm-Alarm A,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A
+SH.GPXTI0.0=GPIO_EXTI0
+SH.GPXTI0.ConfNb=1
+SH.GPXTI1.0=GPIO_EXTI1
+SH.GPXTI1.ConfNb=1
+SH.GPXTI6.0=GPIO_EXTI6
+SH.GPXTI6.ConfNb=1
+SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
+SUBGHZ.IPParameters=BaudratePrescaler
+SUBGHZ_PHY.Activate_DEBUG_LINE=true
+SUBGHZ_PHY.Activate_RADIO_BOARD_INTERFACE=Bsp
+SUBGHZ_PHY.DEBUGGER_ON_CM4=false
+SUBGHZ_PHY.IPParameters=IS_TCXO_SUPPORTED,IS_DCDC_SUPPORTED,SUBGHZ_APPLICATION,Activate_RADIO_BOARD_INTERFACE,TX_RFO_CONFIG,MODEM_USED,DEBUGGER_ON_CM4,USE_UART,Activate_DEBUG_LINE,USER_SUBGHZ_APP
+SUBGHZ_PHY.IS_DCDC_SUPPORTED=true
+SUBGHZ_PHY.IS_TCXO_SUPPORTED=true
+SUBGHZ_PHY.MODEM_USED=USE_MODEM_FSK
+SUBGHZ_PHY.SUBGHZ_APPLICATION=SUBGHZ_ADV_APPLICATION
+SUBGHZ_PHY.TX_RFO_CONFIG=RBI_CONF_RFO_LP_HP
+SUBGHZ_PHY.USER_SUBGHZ_APP=SUBGHZ_PER
+SUBGHZ_PHY.USE_UART=false
+SubGHz_Phy.BSP.number=6
+SubGHz_Phy0.BSP.STBoard=false
+SubGHz_Phy0.BSP.api=Unknown
+SubGHz_Phy0.BSP.component=
+SubGHz_Phy0.BSP.condition=\!SEM_SUBGHZ_USER_APPLICATION | SEM_SUBGHZ_USE_RTC
+SubGHz_Phy0.BSP.i2caddr=0
+SubGHz_Phy0.BSP.i2creg=
+SubGHz_Phy0.BSP.instance=RTC
+SubGHz_Phy0.BSP.ip=RTC
+SubGHz_Phy0.BSP.mode=RTC Enabled
+SubGHz_Phy0.BSP.name=RTC
+SubGHz_Phy0.BSP.semaphore=
+SubGHz_Phy0.BSP.solution=RTC
+SubGHz_Phy1.BSP.STBoard=false
+SubGHz_Phy1.BSP.api=Unknown
+SubGHz_Phy1.BSP.component=
+SubGHz_Phy1.BSP.condition=\!SEM_SUBGHZ_USER_APPLICATION | SEM_SUBGHZ_USE_UART
+SubGHz_Phy1.BSP.i2caddr=0
+SubGHz_Phy1.BSP.i2creg=
+SubGHz_Phy1.BSP.instance=USART2
+SubGHz_Phy1.BSP.ip=(LPU|US)ART
+SubGHz_Phy1.BSP.mode=Asynchronous
+SubGHz_Phy1.BSP.name=USART
+SubGHz_Phy1.BSP.semaphore=
+SubGHz_Phy1.BSP.solution=USART2
+SubGHz_Phy2.BSP.STBoard=false
+SubGHz_Phy2.BSP.api=Unknown
+SubGHz_Phy2.BSP.component=
+SubGHz_Phy2.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy2.BSP.i2caddr=0
+SubGHz_Phy2.BSP.i2creg=
+SubGHz_Phy2.BSP.instance=PB12
+SubGHz_Phy2.BSP.ip=GPIO
+SubGHz_Phy2.BSP.mode=Output
+SubGHz_Phy2.BSP.name=Debug Line 1
+SubGHz_Phy2.BSP.semaphore=
+SubGHz_Phy2.BSP.solution=PB12
+SubGHz_Phy3.BSP.STBoard=false
+SubGHz_Phy3.BSP.api=Unknown
+SubGHz_Phy3.BSP.component=
+SubGHz_Phy3.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy3.BSP.i2caddr=0
+SubGHz_Phy3.BSP.i2creg=
+SubGHz_Phy3.BSP.instance=PB13
+SubGHz_Phy3.BSP.ip=GPIO
+SubGHz_Phy3.BSP.mode=Output
+SubGHz_Phy3.BSP.name=Debug Line 2
+SubGHz_Phy3.BSP.semaphore=
+SubGHz_Phy3.BSP.solution=PB13
+SubGHz_Phy4.BSP.STBoard=false
+SubGHz_Phy4.BSP.api=Unknown
+SubGHz_Phy4.BSP.component=
+SubGHz_Phy4.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy4.BSP.i2caddr=0
+SubGHz_Phy4.BSP.i2creg=
+SubGHz_Phy4.BSP.instance=PB14
+SubGHz_Phy4.BSP.ip=GPIO
+SubGHz_Phy4.BSP.mode=Output
+SubGHz_Phy4.BSP.name=Debug Line 3
+SubGHz_Phy4.BSP.semaphore=
+SubGHz_Phy4.BSP.solution=PB14
+SubGHz_Phy5.BSP.STBoard=false
+SubGHz_Phy5.BSP.api=Unknown
+SubGHz_Phy5.BSP.component=
+SubGHz_Phy5.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy5.BSP.i2caddr=0
+SubGHz_Phy5.BSP.i2creg=
+SubGHz_Phy5.BSP.instance=PB10
+SubGHz_Phy5.BSP.ip=GPIO
+SubGHz_Phy5.BSP.mode=Output
+SubGHz_Phy5.BSP.name=Debug Line 4
+SubGHz_Phy5.BSP.semaphore=
+SubGHz_Phy5.BSP.solution=PB10
+USART2.FIFOMode=FIFOMODE_ENABLE
+USART2.IPParameters=VirtualMode-Asynchronous,FIFOMode
+USART2.VirtualMode-Asynchronous=VM_ASYNC
+VP_ADV_TRACE_VS_ADV_TRACE.Mode=ADV_TRACE_Enabled
+VP_ADV_TRACE_VS_ADV_TRACE.Signal=ADV_TRACE_VS_ADV_TRACE
+VP_MISC_VS_MISC.Mode=MISC_Enabled
+VP_MISC_VS_MISC.Signal=MISC_VS_MISC
+VP_RTC_VS_RTC_Activate.Mode=RTC_Enabled
+VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
+VP_RTC_VS_RTC_Alarm_A_Intern.Mode=Alarm A
+VP_RTC_VS_RTC_Alarm_A_Intern.Signal=RTC_VS_RTC_Alarm_A_Intern
+VP_RTC_VS_RTC_Calendar.Mode=RTC_Calendar
+VP_RTC_VS_RTC_Calendar.Signal=RTC_VS_RTC_Calendar
+VP_SEQUENCER_M4_VS_SEQUENCER.Mode=SEQUENCER_Enabled
+VP_SEQUENCER_M4_VS_SEQUENCER.Signal=SEQUENCER_M4_VS_SEQUENCER
+VP_SUBGHZ_PHY_VS_SubGhzPhy.Mode=SubGhzPhy_Enabled
+VP_SUBGHZ_PHY_VS_SubGhzPhy.Signal=SUBGHZ_PHY_VS_SubGhzPhy
+VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
+VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
+VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
+VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
+VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
+VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
+board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=SubGHz_Phy_Per
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/readme.txt
new file mode 100644
index 00000000..f2da94d3
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_Per/readme.txt
@@ -0,0 +1,145 @@
+/**
+  @page SubGHz_Phy_Per Readme file
+
+  @verbatim
+  ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
+  * @file    Applications/SubGHz_Phy/SubGHz_Phy_Per/readme.txt
+  * @author  MCD Application Team
+  * @brief   This application is a simple demo application software between 2
+  *          LoRa Objects: a STM32WL Nucleo board and whatever other LoRa Radio
+  *          board embedding SubGHz_Phy_Per application too
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  @endverbatim
+
+@par Description
+
+This directory contains a set of source files that implements a PER (Packet Error Rate) tests application
+with IBM whitening between one Tx device and one Rx device.
+
+Tx device:
+   - in /SubGHz_Phy/App/subghz_phy_app.c update #define TEST_MODE to RADIO_TX, compile and load
+   - packet content is : preamble | sync | payload length | payload | crc
+     + crc calculated using payload length and payload
+     + whitening is calculated over payload length | payload | crc
+   - the transmission starts forever in GFSK 50kbit/s with a payload of 64 bytes
+   - user button 1 increments "packet length" by 16 bytes
+   - user button 2 increments "packet length" by 1 bytes
+   - user button 3 toggles packet "payload mode" from ramp (0x00, 0x01..) to prbs9
+   - LED blue on while radio in Tx
+Rx device:
+   - in /SubGHz_Phy/App/subghz_phy_app.c update #define TEST_MODE to RADIO_RX, compile and load
+   - LED green on when Rx OK, LED red when Rx KO
+
+  ******************************************************************************
+
+@par Keywords
+
+Applications, SubGHz_Phy, PER, SingleCore
+
+@par Directory contents
+
+
+  - SubGHz_Phy_Per/Core/Inc/dma.h                                               This file contains all the function prototypes for
+                                                                                the dma.c file
+  - SubGHz_Phy_Per/Core/Inc/main.h                                              : Header for main.c file.
+                                                                                This file contains the common defines of the application.
+  - SubGHz_Phy_Per/Core/Inc/platform.h                                          Header for General HW instances configuration
+  - SubGHz_Phy_Per/Core/Inc/rtc.h                                               This file contains all the function prototypes for
+                                                                                the rtc.c file
+  - SubGHz_Phy_Per/Core/Inc/stm32wlxx_hal_conf.h                                HAL configuration file.
+  - SubGHz_Phy_Per/Core/Inc/stm32wlxx_it.h                                      This file contains the headers of the interrupt handlers.
+  - SubGHz_Phy_Per/Core/Inc/stm32wlxx_nucleo_conf.h                             STM32WLxx_Nucleo board configuration file.
+  - SubGHz_Phy_Per/Core/Inc/stm32_lpm_if.h                                      Header for Low Power Manager interface configuration
+  - SubGHz_Phy_Per/Core/Inc/subghz.h                                            This file contains all the function prototypes for
+                                                                                the subghz.c file
+  - SubGHz_Phy_Per/Core/Inc/sys_app.h                                           Function prototypes for sys_app.c file
+  - SubGHz_Phy_Per/Core/Inc/sys_conf.h                                          Applicative configuration, e.g. : debug, trace, low power, sensors
+  - SubGHz_Phy_Per/Core/Inc/sys_debug.h                                         Configuration of the debug.c instances
+  - SubGHz_Phy_Per/Core/Inc/timer_if.h                                          configuration of the timer_if.c instances
+  - SubGHz_Phy_Per/Core/Inc/usart.h                                             This file contains all the function prototypes for
+                                                                                the usart.c file
+  - SubGHz_Phy_Per/Core/Inc/usart_if.h                                          Header for USART interface configuration
+  - SubGHz_Phy_Per/Core/Inc/utilities_conf.h                                    Header for configuration file to utilities
+  - SubGHz_Phy_Per/Core/Inc/utilities_def.h                                     Definitions for modules requiring utilities
+  - SubGHz_Phy_Per/SubGHz_Phy/App/app_subghz_phy.h                              Header of application of the SubGHz_Phy Middleware
+  - SubGHz_Phy_Per/SubGHz_Phy/App/app_version.h                                 Definition the version of the application
+  - SubGHz_Phy_Per/SubGHz_Phy/App/subghz_phy_app.h                              Header of application of the SubGHz_Phy Middleware
+  - SubGHz_Phy_Per/SubGHz_Phy/Target/mw_log_conf.h                              Configure (enable/disable) traces for CM0
+  - SubGHz_Phy_Per/SubGHz_Phy/Target/radio_board_if.h                           Header for Radio interface configuration
+  - SubGHz_Phy_Per/SubGHz_Phy/Target/radio_conf.h                               Header of Radio configuration
+  - SubGHz_Phy_Per/SubGHz_Phy/Target/timer.h                                    Wrapper to timer server
+
+  - SubGHz_Phy_Per/Core/Src/dma.c                                               This file provides code for the configuration
+                                                                                of all the requested memory to memory DMA transfers.
+  - SubGHz_Phy_Per/Core/Src/main.c                                              : Main program body
+  - SubGHz_Phy_Per/Core/Src/rtc.c                                               This file provides code for the configuration
+                                                                                of the RTC instances.
+  - SubGHz_Phy_Per/Core/Src/stm32wlxx_hal_msp.c                                 This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
+  - SubGHz_Phy_Per/Core/Src/stm32wlxx_it.c                                      Interrupt Service Routines.
+  - SubGHz_Phy_Per/Core/Src/stm32_lpm_if.c                                      Low layer function to enter/exit low power modes (stop, sleep)
+  - SubGHz_Phy_Per/Core/Src/subghz.c                                            This file provides code for the configuration
+                                                                                of the SUBGHZ instances.
+  - SubGHz_Phy_Per/Core/Src/system_stm32wlxx.c                                  CMSIS Cortex Device Peripheral Access Layer System Source File
+  - SubGHz_Phy_Per/Core/Src/sys_app.c                                           Initializes HW and SW system entities (not related to the radio)
+  - SubGHz_Phy_Per/Core/Src/sys_debug.c                                         Enables 4 debug pins for internal signals RealTime debugging
+  - SubGHz_Phy_Per/Core/Src/timer_if.c                                          Configure RTC Alarm, Tick and Calendar manager
+  - SubGHz_Phy_Per/Core/Src/usart.c                                             This file provides code for the configuration
+                                                                                of the USART instances.
+  - SubGHz_Phy_Per/Core/Src/usart_if.c                                          Configuration of UART driver interface for hyperterminal communication
+  - SubGHz_Phy_Per/STM32CubeIDE/Application/User/Core/syscalls.c                STM32CubeIDE Minimal System calls file
+  - SubGHz_Phy_Per/STM32CubeIDE/Application/User/Core/sysmem.c                  STM32CubeIDE System Memory calls file
+  - SubGHz_Phy_Per/SubGHz_Phy/App/app_subghz_phy.c                              Application of the SubGHz_Phy Middleware
+  - SubGHz_Phy_Per/SubGHz_Phy/App/subghz_phy_app.c                              Application of the SubGHz_Phy Middleware
+  - SubGHz_Phy_Per/SubGHz_Phy/Target/radio_board_if.c                           This file provides an interface layer between MW and Radio Board
+
+
+@par Hardware and Software environment
+
+  - This example runs on the STM32WLxx Nucleo board.
+
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
+      to ST-LINK connector.
+    - Please ensure that the ST-LINK connector jumpers are fitted.
+
+  - Configure the software via the configuration files:
+    - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
+
+  -Set Up:
+
+             --------------------------  V    V  --------------------------
+             |         Tx Device      |  |    |  |         Rx Device      |
+             |                        |  |    |  |                        |
+   ComPort<--|                        |--|    |--|                        |-->ComPort
+             |                        |          |                        |
+             --------------------------          --------------------------
+
+@par How to use it ?
+In order to make the program work, you must do the following :
+  - Open your preferred toolchain
+  - Rebuild all files and load your image into target memory
+  - Do the same for second board
+  - Reset the two boards
+  - Run the example on two boards
+  - Open two Terminals, each connected to their respective Tx or Rx Device
+  - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
+
+@par How to debug ?
+  - make sure the flag DEBUGGER_ENABLED to 1 in sys_conf.h
+  - simpler to define the flag LOW_POWER_DISABLE to 1 as well
+  - compile, download and attach
+
+ * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
+ */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/.extSettings b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/board_resources.h
deleted file mode 100644
index 953761d8..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/board_resources.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/main.h
index a9e3b1e0..6fd91c18 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -62,23 +61,22 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
 #define LED1_Pin GPIO_PIN_15
 #define LED1_GPIO_Port GPIOB
 #define LED2_Pin GPIO_PIN_9
 #define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
 #define RF_CTRL3_Pin GPIO_PIN_3
 #define RF_CTRL3_GPIO_Port GPIOC
 #define BUT1_Pin GPIO_PIN_0
 #define BUT1_GPIO_Port GPIOA
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
 #define RF_CTRL2_Pin GPIO_PIN_5
 #define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define RF_CTRL1_Pin GPIO_PIN_4
 #define RF_CTRL1_GPIO_Port GPIOC
 #define BUT3_Pin GPIO_PIN_6
@@ -91,8 +89,8 @@ void Error_Handler(void);
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32wlxx_hal_conf.h
index 082c5c4b..cd09804c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32wlxx_nucleo_conf.h
index 4d08d4b2..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     10U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   0U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_app.h
index d7f25dc8..37d3218b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -33,6 +35,11 @@ extern "C" {
 
 /* USER CODE END Includes */
 
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -68,9 +75,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_conf.h
index 47d27319..7f902a10 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief  Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_debug.h
index bbae8f87..710e8852 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/sys_debug.h
@@ -43,89 +43,89 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/**  Definition for Debug Line 1   **/
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 /* USER CODE BEGIN EC */
 
@@ -137,39 +137,41 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
@@ -177,9 +179,20 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initializes the debug
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/usart.h
index 1315adaf..20bb5dfa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/utilities_conf.h
index f48ff71a..3ceefb9c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/utilities_def.h
index d953d8f4..70589b17 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
@@ -71,7 +75,7 @@ typedef enum
   */
 typedef enum
 {
-  CFG_SEQ_Task_PingPong_Process,
+  CFG_SEQ_Task_SubGHz_Phy_App_Process,
   /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
 
   /* USER CODE END CFG_SEQ_Task_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/main.c
index a2a96eae..e6ab2757 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -157,6 +158,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/rtc.c
index 4464f7dc..c616f129 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,10 +71,13 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/stm32wlxx_it.c
index ff9d6817..0f7eadca 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/stm32wlxx_it.c
@@ -76,7 +76,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -187,7 +189,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/sys_app.c
index fe957a11..65e86d0b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -24,9 +26,9 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -60,16 +62,10 @@
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
-  */
-static void Gpio_PreInit(void);
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -77,16 +73,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -95,13 +87,15 @@ void SystemApp_Init(void)
 
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-  /*Initialises timer and RTC*/
+
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
-  Gpio_PreInit();
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -121,6 +115,7 @@ void SystemApp_Init(void)
 #elif !defined (LOW_POWER_DISABLE)
 #error LOW_POWER_DISABLE not defined
 #endif /* LOW_POWER_DISABLE */
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
@@ -128,8 +123,6 @@ void SystemApp_Init(void)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -142,11 +135,12 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
+
 static void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -160,45 +154,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -239,13 +194,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -260,13 +213,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -277,13 +228,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -298,4 +247,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/sys_debug.c
index 2e4c40f7..f0395f5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/sys_debug.c
@@ -41,6 +41,7 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
+
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 
@@ -58,39 +59,121 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
-  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
-  /* Enable the GPIO Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
   GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -108,44 +191,42 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
 #endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
-
-  /* USER CODE END DBG_Init_Last */
-}
-/* USER CODE BEGIN EF */
+#endif /* CORE_CM4 */
 
-/* USER CODE END EF */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-/* Private Functions Definition -----------------------------------------------*/
+  /* USER CODE END DBG_ProbesInit_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/timer_if.c
index 615131a0..66e51602 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -104,6 +104,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -153,7 +164,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -173,9 +183,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -183,18 +193,21 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
     /*overload RTC feature enable*/
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -277,64 +290,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,7 +379,7 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
@@ -383,6 +402,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -392,16 +412,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -428,24 +448,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/usart.c
index 49d236d5..be36fe23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_usart2_tx;
 void MX_USART2_UART_Init(void)
 {
 
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
   huart2.Instance = USART2;
-  huart2.Init.BaudRate = USART_BAUDRATE;
+  huart2.Init.BaudRate = 115200;
   huart2.Init.WordLength = UART_WORDLENGTH_8B;
   huart2.Init.StopBits = UART_STOPBITS_1;
   huart2.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_USART2_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/usart_if.c
index f91e9839..182f1990 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&huart2);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/SubGHz_Phy_PingPong.ewd b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/SubGHz_Phy_PingPong.ewd
index 920a6db3..49394a14 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/SubGHz_Phy_PingPong.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/SubGHz_Phy_PingPong.ewd
@@ -40,11 +40,11 @@
                 </option>
                 <option>
                     <name>MemOverride</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\config\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/SubGHz_Phy_PingPong.ewp b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/SubGHz_Phy_PingPong.ewp
index 49d2f88d..f80d002c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/SubGHz_Phy_PingPong.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/SubGHz_Phy_PingPong.ewp
@@ -16,15 +16,15 @@
                 <debug>1</debug>
                 <option>
                     <name>ExePath</name>
-                    <state>SubGHz_Phy_PingPong\Exe</state>
+                    <state>SubGHz_Phy_PingPong/Exe</state>
                 </option>
                 <option>
                     <name>ObjPath</name>
-                    <state>SubGHz_Phy_PingPong\Obj</state>
+                    <state>SubGHz_Phy_PingPong/Obj</state>
                 </option>
                 <option>
                     <name>ListPath</name>
-                    <state>SubGHz_Phy_PingPong\List</state>
+                    <state>SubGHz_Phy_PingPong/List</state>
                 </option>
                 <option>
                     <name>GEndianMode</name>
@@ -32,11 +32,11 @@
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
                 </option>
                 <option>
                     <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
                 </option>
                 <option>
                     <name>GOutputBinary</name>
@@ -108,7 +108,7 @@
                 <option>
                     <name>GeneralMisraRules04</name>
                     <version>0</version>
-                    <state>011111111111111110111111111111111111111111111010110100111111111111110111111111111111111111111111111111110111111011111111111111111111111111111</state>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
                 </option>
                 <option>
                     <name>RTConfigPath2</name>
@@ -218,10 +218,15 @@
                 <version>34</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>CCDefines</name>
-                    <state>STM32WL55xx</state>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
                 </option>
                 <option>
                     <name>CCPreprocFile</name>
@@ -349,17 +354,18 @@
                     <state>$PROJ_DIR$/../Core/Inc</state>
                     <state>$PROJ_DIR$/../SubGHz_Phy/App</state>
                     <state>$PROJ_DIR$/../SubGHz_Phy/Target</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -422,11 +428,11 @@
                 </option>
                 <option>
                     <name>IccStaticDestr</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCppInlineSemantics</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCmsis</name>
@@ -436,10 +442,6 @@
                     <name>IccFloatSemantics</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCNoLiteralPool</name>
                     <state>0</state>
@@ -778,7 +780,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1044,57 +1046,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>App</name>
-            <file>
-                <name>$PROJ_DIR$\..\SubGHz_Phy\App\app_subghz_phy.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\SubGHz_Phy\App\subghz_phy_app.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1102,10 +1053,64 @@
             </file>
         </group>
         <group>
-            <name>Target</name>
-            <file>
-                <name>$PROJ_DIR$\..\SubGHz_Phy\Target\radio_board_if.c</name>
-            </file>
+            <name>User</name>
+            <group>
+                <name>Core</name>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\dma.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\main.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\rtc.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32_lpm_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_hal_msp.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\stm32wlxx_it.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\subghz.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_app.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\sys_debug.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\timer_if.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart.c</name>
+                </file>
+                <file>
+                    <name>$PROJ_DIR$\..\Core\Src\usart_if.c</name>
+                </file>
+            </group>
+            <group>
+                <name>SubGHz_Phy</name>
+                <group>
+                    <name>App</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\SubGHz_Phy\App\app_subghz_phy.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\SubGHz_Phy\App\subghz_phy_app.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>Target</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\SubGHz_Phy\Target\radio_board_if.c</name>
+                    </file>
+                </group>
+            </group>
         </group>
     </group>
     <group>
@@ -1118,9 +1123,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>SubGHz_Phy_PingPong</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1142,12 +1144,6 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal.c</name>
             </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_adc_ex.c</name>
-            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
             </file>
@@ -1190,6 +1186,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
             </file>
@@ -1208,6 +1210,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1230,6 +1235,9 @@
         <file>
             <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\timer\stm32_timer.c</name>
         </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_sscanf.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\..\..\Utilities\misc\stm32_tiny_vsnprintf.c</name>
         </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/SubGHz_Phy_PingPong.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/SubGHz_Phy_PingPong.uvoptx
index 2e4c3f55..966ded44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/SubGHz_Phy_PingPong.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/SubGHz_Phy_PingPong.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>32000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/App</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,35 +203,35 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../SubGHz_Phy/App/app_subghz_phy.c</PathWithFileName>
-      <FilenameWithoutPath>app_subghz_phy.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../SubGHz_Phy/App/subghz_phy_app.c</PathWithFileName>
-      <FilenameWithoutPath>subghz_phy_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Core</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
       <FileNumber>3</FileNumber>
@@ -219,8 +239,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -231,8 +251,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -243,8 +263,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
+      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -255,8 +275,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -267,8 +287,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -279,8 +299,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -291,8 +311,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -303,8 +323,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -315,8 +335,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/subghz.c</PathWithFileName>
-      <FilenameWithoutPath>subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -327,8 +347,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -339,66 +359,54 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/SubGHz_Phy/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../SubGHz_Phy/App/app_subghz_phy.c</PathWithFileName>
+      <FilenameWithoutPath>app_subghz_phy.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>16</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
+      <PathWithFileName>../SubGHz_Phy/App/subghz_phy_app.c</PathWithFileName>
+      <FilenameWithoutPath>subghz_phy_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/Target</GroupName>
+    <GroupName>Application/User/SubGHz_Phy/Target</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>17</FileNumber>
+      <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -418,7 +426,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>18</FileNumber>
+      <FileNumber>17</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -438,7 +446,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>19</FileNumber>
+      <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -450,7 +458,7 @@
     </File>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>20</FileNumber>
+      <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -463,11 +471,23 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>20</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>7</GroupNumber>
       <FileNumber>21</FileNumber>
@@ -475,223 +495,223 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_adc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>39</FileNumber>
@@ -699,31 +719,31 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
+      <PathWithFileName>../Core/Src/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Middlewares/SubGHz_Phy</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_uart_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/SubGHz_Phy</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>9</GroupNumber>
       <FileNumber>41</FileNumber>
@@ -731,8 +751,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -743,8 +763,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -775,8 +795,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -787,8 +807,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -799,8 +819,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -811,8 +831,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -823,6 +843,18 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
       <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -830,13 +862,13 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>49</FileNumber>
+      <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/SubGHz_Phy_PingPong.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/SubGHz_Phy_PingPong.uvprojx
index 6154c2fa..875e06a4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/SubGHz_Phy_PingPong.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/SubGHz_Phy_PingPong.uvprojx
@@ -10,15 +10,15 @@
       <TargetName>SubGHz_Phy_PingPong</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>SubGHz_Phy_PingPong\Exe\</OutputDirectory>
+          <OutputDirectory>SubGHz_Phy_PingPong\</OutputDirectory>
           <OutputName>SubGHz_Phy_PingPong</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -138,10 +138,10 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -183,8 +183,9 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -335,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>STM32WL55xx,CORE_CM4</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../SUBGHZ_PHY/App;../SUBGHZ_PHY/Target;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace</IncludePath>
+              <IncludePath>../Core/Inc;../SubGHz_Phy/App;../SubGHz_Phy/Target;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/BSP/STM32WLxx_Nucleo</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -351,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -380,47 +381,37 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/App</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>app_subghz_phy.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../SubGHz_Phy/App/app_subghz_phy.c</FilePath>
-            </File>
-            <File>
-              <FileName>subghz_phy_app.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../SubGHz_Phy/App/subghz_phy_app.c</FilePath>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/User/Core</GroupName>
           <Files>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>main.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/board_resources.c</FilePath>
+              <FilePath>../Core/Src/main.c</FilePath>
             </File>
             <File>
               <FileName>dma.c</FileName>
               <FileType>1</FileType>
               <FilePath>../Core/Src/dma.c</FilePath>
             </File>
-            <File>
-              <FileName>main.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Core/Src/main.c</FilePath>
-            </File>
             <File>
               <FileName>rtc.c</FileName>
               <FileType>1</FileType>
               <FilePath>../Core/Src/rtc.c</FilePath>
             </File>
             <File>
-              <FileName>timer_if.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/timer_if.c</FilePath>
+              <FilePath>../Core/Src/subghz.c</FilePath>
             </File>
             <File>
               <FileName>stm32_lpm_if.c</FileName>
@@ -428,54 +419,59 @@
               <FilePath>../Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileName>sys_app.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
+              <FilePath>../Core/Src/sys_app.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../Core/Src/sys_debug.c</FilePath>
             </File>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/subghz.c</FilePath>
+              <FilePath>../Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_app.c</FileName>
+              <FileName>usart_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_app.c</FilePath>
+              <FilePath>../Core/Src/usart_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/sys_debug.c</FilePath>
+              <FilePath>../Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_it.c</FilePath>
             </File>
             <File>
-              <FileName>usart_if.c</FileName>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/usart_if.c</FilePath>
+              <FilePath>../Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
+          <GroupName>Application/User/SubGHz_Phy/App</GroupName>
           <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FileName>app_subghz_phy.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../SubGHz_Phy/App/app_subghz_phy.c</FilePath>
+            </File>
+            <File>
+              <FileName>subghz_phy_app.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../SubGHz_Phy/App/subghz_phy_app.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/Target</GroupName>
+          <GroupName>Application/User/SubGHz_Phy/Target</GroupName>
           <Files>
             <File>
               <FileName>radio_board_if.c</FileName>
@@ -510,37 +506,32 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
+          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-          <Files>
             <File>
-              <FileName>stm32wlxx_hal.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_adc.c</FileName>
+              <FileName>stm32wlxx_hal_flash.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_adc_ex.c</FileName>
+              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
+              <FileName>stm32wlxx_hal_gpio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_dma.c</FileName>
@@ -552,26 +543,6 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
-            <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_flash_ex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_gpio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
-            </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
               <FileType>1</FileType>
@@ -583,14 +554,19 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -607,6 +583,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
             <File>
               <FileName>stm32wlxx_hal_uart.c</FileName>
               <FileType>1</FileType>
@@ -620,18 +606,33 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Middlewares/SubGHz_Phy</GroupName>
+          <GroupName>Drivers/CMSIS</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../Core/Src/system_stm32wlxx.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Middlewares/SubGHz_Phy</GroupName>
+          <Files>
             <File>
               <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
+            <File>
+              <FileName>radio_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -643,24 +644,29 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32_seq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
               <FileName>stm32_timer.c</FileName>
@@ -668,9 +674,9 @@
               <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -694,4 +700,19 @@
     <files/>
   </RTE>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
 </Project>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/startup_stm32wl55xx_cm4.s
index 7f10bb2c..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size      EQU     0x00000800
+Stack_Size		EQU     0x800
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x00000200
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/.cproject
index d2d52416..289fabda 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/.cproject
@@ -1,163 +1,164 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1083642184">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1083642184" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.103024649" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.182342268" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1351781408" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.791903410" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.890127598" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.199704266" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1939132081" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1802159477" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../SubGHz_Phy/App | ../../SubGHz_Phy/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.640390502" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1776185185" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1374242405" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2014620883" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.61687809" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1083642184" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1083642184." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1223013598" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.509069349" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.152337806" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1702800143" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.630731042" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.366506010" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../SubGHz_Phy/Target | ../../../../../../../Utilities/timer | ../../SubGHz_Phy/App | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1096499979" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.410996957" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.535321361" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2019039123" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1549650450" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.761444756" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1645933111" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1611979829" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.426545023" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1603706152" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.133933126" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.516013215" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1307699795" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.815598740" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1827580495" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.444059919" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../SubGHz_Phy/App"/>
 									<listOptionValue builtIn="false" value="../../SubGHz_Phy/Target"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.620013891" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.80341825" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.662195029" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.506967486" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.618324057" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1427419353" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.675060374" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1611674043" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1465313539" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.759366108" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1772928823" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.722513094" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.614141450" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1143967691" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1308343526" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.60889473" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1308876931" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.335814163" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.540282885" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.600218333" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1857947499" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.741384387" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1883247559" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1089349422" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1597568761" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.422069914" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1556908815" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.2123220547" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1187348086" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.439000470" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.750798436" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.716993199" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.120417935" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1120431476">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1120431476" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1170573023" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1993776063" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1652214255" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1966853390" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1749307674" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.449362973" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.380982817" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1016811819" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../SubGHz_Phy/App | ../../SubGHz_Phy/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2081355336" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.351089854" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1978032059" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1859026928" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1307807708" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1120431476" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1120431476." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.641841261" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.179553486" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.368450407" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2048898758" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.169883029" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.780465038" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../../../../../../Utilities/misc | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../SubGHz_Phy/Target | ../../../../../../../Utilities/timer | ../../SubGHz_Phy/App | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.481472661" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.120401264" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1073602742" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1584989412" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.741635690" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1155270803" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1448972103" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1809421417" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2050449193" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.731884363" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.854641275" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2082743383" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.965379924" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.17127186" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2101994779" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../SubGHz_Phy/App"/>
 									<listOptionValue builtIn="false" value="../../SubGHz_Phy/Target"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Utilities/misc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Utilities/sequencer"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Utilities/timer"/>
-									<listOptionValue builtIn="false" value="../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Utilities/lpm/tiny_lpm"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1641187234" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.167544783" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.613819884" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.66793923" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.295955599" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1987024507" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.597864495" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1212803560" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.760097402" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1286322975" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1071112921" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1583527083" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.2065806141" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1904496471" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1715041657" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.117584752" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.82226768" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.30622323" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.85457304" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1216647097" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.315408422" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1892691743" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.46331734" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1175184783" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1944383006" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1858283862" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.2120364483" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1288731486" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.332584696" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.8883656" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.242499179" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.107500968" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.396156762" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -165,26 +166,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="SubGHz_Phy_PingPong.null.243532436" name="SubGHz_Phy_PingPong"/>
+		<project id="SubGHz_Phy_PingPong.null.1747727413" name="SubGHz_Phy_PingPong"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.52374323.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1155270803;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1641187234">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1120431476;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1120431476.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.731884363;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.167544783">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1384892488.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1645933111;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.620013891">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1083642184;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1083642184.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.133933126;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.80341825">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Debug">
-			<resource resourceType="PROJECT" workspacePath="/SubGHz_Phy_PingPong"/>
-		</configuration>
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/SubGHz_Phy_PingPong"/>
-		</configuration>
-	</storageModule>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/.project
index 31c81c88..4462abbc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/.project
@@ -25,7 +25,6 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
@@ -36,232 +35,252 @@
 		<link>
 			<name>SubGHz_Phy_PingPong.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/SubGHz_Phy_PingPong.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy_PingPong.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
+		</link>
+		<link>
+			<name>Utilities/stm32_tiny_sscanf.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/app_subghz_phy.c</name>
+			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/SubGHz_Phy/App/app_subghz_phy.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
-			<name>Application/App/subghz_phy_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/SubGHz_Phy/App/subghz_phy_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/board_resources.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/dma.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/main.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/rtc.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/timer_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32_lpm_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_hal_msp.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/stm32wlxx_it.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/subghz.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_app.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/sys_debug.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_debug.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Core/usart_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Application/Target/radio_board_if.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/SubGHz_Phy/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
+			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
+			<name>Middlewares/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
+			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
+			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
+			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
+			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
+			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
+			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
+			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
+			<name>Application/User/Core/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
+			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
+			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
+			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
-			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
-			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
+			<name>Application/User/SubGHz_Phy/App/app_subghz_phy.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy/App/app_subghz_phy.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/SubGHz_Phy/App/subghz_phy_app.c</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy/App/subghz_phy_app.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/SubGHz_Phy/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy/Target/radio_board_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/Core/sysmem.c
deleted file mode 100644
index 656b3aa2..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/Core/sysmem.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- ******************************************************************************
- * @file      sysmem.c
- * @author    Generated by STM32CubeIDE
- * @brief     STM32CubeIDE System Memory calls file
- *
- *            For more information about which C functions
- *            need which of these lowlevel functions
- *            please consult the newlib libc manual
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- ******************************************************************************
- */
-
-/* Includes */
-#include <errno.h>
-#include <stdint.h>
-
-/**
- * Pointer to the current high watermark of the heap usage
- */
-static uint8_t *__sbrk_heap_end = NULL;
-
-/**
- * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
- *        and others from the C library
- *
- * @verbatim
- * ############################################################################
- * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
- * #         #        #                         # Reserved by _Min_Stack_Size #
- * ############################################################################
- * ^-- RAM start      ^-- _end                             _estack, RAM end --^
- * @endverbatim
- *
- * This implementation starts allocating at the '_end' linker symbol
- * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
- * The implementation considers '_estack' linker symbol to be RAM end
- * NOTE: If the MSP stack, at any point during execution, grows larger than the
- * reserved size, please increase the '_Min_Stack_Size'.
- *
- * @param incr Memory size
- * @return Pointer to allocated memory
- */
-void *_sbrk(ptrdiff_t incr)
-{
-  extern uint8_t _end; /* Symbol defined in the linker script */
-  extern uint8_t _estack; /* Symbol defined in the linker script */
-  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
-  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
-  const uint8_t *max_heap = (uint8_t *)stack_limit;
-  uint8_t *prev_heap_end;
-
-  /* Initialize  heap end at first call */
-  if (NULL == __sbrk_heap_end)
-  {
-    __sbrk_heap_end = &_end;
-  }
-
-  /* Protect heap from growing into the reserved MSP stack */
-  if (__sbrk_heap_end + incr > max_heap)
-  {
-    errno = ENOMEM;
-    return (void *)-1;
-  }
-
-  prev_heap_end = __sbrk_heap_end;
-  __sbrk_heap_end += incr;
-
-  return (void *)prev_heap_end;
-}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Core/syscalls.c
new file mode 100644
index 00000000..bc0dd6c0
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Core/syscalls.c
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file      syscalls.c
+ * @author    Auto-generated by STM32CubeIDE
+ * @brief     STM32CubeIDE Minimal System calls file
+ *
+ *            For more information about which c-functions
+ *            need which of these lowlevel functions
+ *            please consult the Newlib libc-manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+
+/* Variables */
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+
+/* Functions */
+void initialise_monitor_handles()
+{
+}
+
+int _getpid(void)
+{
+	return 1;
+}
+
+int _kill(int pid, int sig)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+void _exit (int status)
+{
+	_kill(status, -1);
+	while (1) {}		/* Make sure we hang here */
+}
+
+__attribute__((weak)) int _read(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		*ptr++ = __io_getchar();
+	}
+
+return len;
+}
+
+__attribute__((weak)) int _write(int file, char *ptr, int len)
+{
+	int DataIdx;
+
+	for (DataIdx = 0; DataIdx < len; DataIdx++)
+	{
+		__io_putchar(*ptr++);
+	}
+	return len;
+}
+
+int _close(int file)
+{
+	return -1;
+}
+
+
+int _fstat(int file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _isatty(int file)
+{
+	return 1;
+}
+
+int _lseek(int file, int ptr, int dir)
+{
+	return 0;
+}
+
+int _open(char *path, int flags, ...)
+{
+	/* Pretend like we always fail */
+	return -1;
+}
+
+int _wait(int *status)
+{
+	errno = ECHILD;
+	return -1;
+}
+
+int _unlink(char *name)
+{
+	errno = ENOENT;
+	return -1;
+}
+
+int _times(struct tms *buf)
+{
+	return -1;
+}
+
+int _stat(char *file, struct stat *st)
+{
+	st->st_mode = S_IFCHR;
+	return 0;
+}
+
+int _link(char *old, char *new)
+{
+	errno = EMLINK;
+	return -1;
+}
+
+int _fork(void)
+{
+	errno = EAGAIN;
+	return -1;
+}
+
+int _execve(char *name, char **argv, char **env)
+{
+	errno = ENOMEM;
+	return -1;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Core/sysmem.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Core/sysmem.c
new file mode 100644
index 00000000..d7cc52cd
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Core/sysmem.c
@@ -0,0 +1,80 @@
+/**
+ ******************************************************************************
+ * @file      sysmem.c
+ * @author    Generated by STM32CubeIDE
+ * @brief     STM32CubeIDE System Memory calls file
+ *
+ *            For more information about which C functions
+ *            need which of these lowlevel functions
+ *            please consult the newlib libc manual
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
+ */
+
+/* Includes */
+#include <errno.h>
+#include <stdint.h>
+
+/**
+ * Pointer to the current high watermark of the heap usage
+ */
+static uint8_t *__sbrk_heap_end = NULL;
+
+/**
+ * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
+ *        and others from the C library
+ *
+ * @verbatim
+ * ############################################################################
+ * #  .data  #  .bss  #       newlib heap       #          MSP stack          #
+ * #         #        #                         # Reserved by _Min_Stack_Size #
+ * ############################################################################
+ * ^-- RAM start      ^-- _end                             _estack, RAM end --^
+ * @endverbatim
+ *
+ * This implementation starts allocating at the '_end' linker symbol
+ * The '_Min_Stack_Size' linker symbol reserves a memory for the MSP stack
+ * The implementation considers '_estack' linker symbol to be RAM end
+ * NOTE: If the MSP stack, at any point during execution, grows larger than the
+ * reserved size, please increase the '_Min_Stack_Size'.
+ *
+ * @param incr Memory size
+ * @return Pointer to allocated memory
+ */
+void *_sbrk(ptrdiff_t incr)
+{
+  extern uint8_t _end; /* Symbol defined in the linker script */
+  extern uint8_t _estack; /* Symbol defined in the linker script */
+  extern uint32_t _Min_Stack_Size; /* Symbol defined in the linker script */
+  const uint32_t stack_limit = (uint32_t)&_estack - (uint32_t)&_Min_Stack_Size;
+  const uint8_t *max_heap = (uint8_t *)stack_limit;
+  uint8_t *prev_heap_end;
+
+  /* Initialize heap end at first call */
+  if (NULL == __sbrk_heap_end)
+  {
+    __sbrk_heap_end = &_end;
+  }
+
+  /* Protect heap from growing into the reserved MSP stack */
+  if (__sbrk_heap_end + incr > max_heap)
+  {
+    errno = ENOMEM;
+    return (void *)-1;
+  }
+
+  prev_heap_end = __sbrk_heap_end;
+  __sbrk_heap_end += incr;
+
+  return (void *)prev_heap_end;
+}
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
new file mode 100644
index 00000000..89dfe9e5
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Startup/startup_stm32wl55jcix.s
@@ -0,0 +1,436 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32wl55xx_cm4.s
+  * @author    MCD Application Team
+  * @brief     STM32WL55xx devices Cortex-M4 vector table for GCC toolchain.
+  *            This module performs:
+  *                - Set the initial SP
+  *                - Set the initial PC == Reset_Handler,
+  *                - Set the vector table entries with the exceptions ISR address,
+  *                - Branches to main in the C library (which eventually
+  *                  calls main()).
+  *            After Reset the Cortex-M4 processor is in Thread mode,
+  *            priority is Privileged, and the Stack is set to Main.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under 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:
+  *                        opensource.org/licenses/Apache-2.0
+  *
+  ******************************************************************************
+  */
+
+.syntax unified
+.cpu cortex-m4
+.fpu softvfp
+.thumb
+
+.global g_pfnVectors
+.global Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word _sidata
+/* start address for the .data section. defined in linker script */
+.word _sdata
+/* end address for the .data section. defined in linker script */
+.word _edata
+/* start address for the .bss section. defined in linker script */
+.word _sbss
+/* end address for the .bss section. defined in linker script */
+.word _ebss
+
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+  .section .text.Reset_Handler
+  .weak Reset_Handler
+  .type Reset_Handler, %function
+Reset_Handler:
+  ldr   r0, =_estack
+  mov   sp, r0          /* set stack pointer */
+
+/* Call the clock system initialization function.*/
+  bl  SystemInit
+
+/* Copy the data segment initializers from flash to SRAM */
+  ldr r0, =_sdata
+  ldr r1, =_edata
+  ldr r2, =_sidata
+  movs r3, #0
+  b LoopCopyDataInit
+
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc CopyDataInit
+
+/* Zero fill the bss segment. */
+  ldr r2, =_sbss
+  ldr r4, =_ebss
+  movs r3, #0
+  b LoopFillZerobss
+
+FillZerobss:
+  str  r3, [r2]
+  adds r2, r2, #4
+
+LoopFillZerobss:
+  cmp r2, r4
+  bcc FillZerobss
+
+/* Call static constructors */
+  bl __libc_init_array
+/* Call the application's entry point.*/
+  bl main
+
+LoopForever:
+    b LoopForever
+
+  .size Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+  .section .text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+  b Infinite_Loop
+  .size Default_Handler, .-Default_Handler
+
+/******************************************************************************
+*
+* The STM32WL55xx Cortex-M4 vector table.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+  .section .isr_vector,"a",%progbits
+  .type g_pfnVectors, %object
+  .size g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+  .word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word	MemManage_Handler
+  .word	BusFault_Handler
+  .word	UsageFault_Handler
+  .word	0
+  .word	0
+  .word	0
+  .word	0
+  .word	SVC_Handler
+  .word	DebugMon_Handler
+  .word	0
+  .word	PendSV_Handler
+  .word	SysTick_Handler
+  .word	WWDG_IRQHandler                      			/* Window Watchdog interrupt                          */
+  .word	PVD_PVM_IRQHandler                   			/* PVD and PVM interrupt through EXTI                 */
+  .word	TAMP_STAMP_LSECSS_SSRU_IRQHandler    			/* RTC Tamper, RTC TimeStamp, LSECSS and RTC SSRU int.*/
+  .word	RTC_WKUP_IRQHandler                  			/* RTC wakeup interrupt through EXTI[19]              */
+  .word	FLASH_IRQHandler                     			/* Flash memory global interrupt and Flash memory ECC */
+  .word	RCC_IRQHandler                       			/* RCC global interrupt                               */
+  .word	EXTI0_IRQHandler                     			/* EXTI line 0 interrupt                              */
+  .word	EXTI1_IRQHandler                     			/* EXTI line 1 interrupt                              */
+  .word	EXTI2_IRQHandler                     			/* EXTI line 2 interrupt                              */
+  .word	EXTI3_IRQHandler                     			/* EXTI line 3 interrupt                              */
+  .word	EXTI4_IRQHandler                     			/* EXTI line 4 interrupt                              */
+  .word	DMA1_Channel1_IRQHandler             			/* DMA1 channel 1 interrupt                           */
+  .word	DMA1_Channel2_IRQHandler             			/* DMA1 channel 2 interrupt                           */
+  .word	DMA1_Channel3_IRQHandler             			/* DMA1 channel 3 interrupt                           */
+  .word	DMA1_Channel4_IRQHandler             			/* DMA1 channel 4 interrupt                           */
+  .word	DMA1_Channel5_IRQHandler             			/* DMA1 channel 5 interrupt                           */
+  .word	DMA1_Channel6_IRQHandler             			/* DMA1 channel 6 interrupt                           */
+  .word	DMA1_Channel7_IRQHandler             			/* DMA1 channel 7 interrupt                           */
+  .word	ADC_IRQHandler                       			/* ADC interrupt                                      */
+  .word	DAC_IRQHandler                       			/* DAC interrupt                                      */
+  .word	C2SEV_PWR_C2H_IRQHandler             			/* CPU M0+ SEV Interrupt                              */
+  .word	COMP_IRQHandler                      			/* COMP1 and COMP2 interrupt through EXTI             */
+  .word	EXTI9_5_IRQHandler                   			/* EXTI line 9_5 interrupt                            */
+  .word	TIM1_BRK_IRQHandler                  			/* Timer 1 break interrupt                            */
+  .word	TIM1_UP_IRQHandler                   			/* Timer 1 Update                                     */
+  .word	TIM1_TRG_COM_IRQHandler              			/* Timer 1 trigger and communication                  */
+  .word	TIM1_CC_IRQHandler                   			/* Timer 1 capture compare interrupt                  */
+  .word	TIM2_IRQHandler                      			/* TIM2 global interrupt                              */
+  .word	TIM16_IRQHandler                     			/* Timer 16 global interrupt                          */
+  .word	TIM17_IRQHandler                     			/* Timer 17 global interrupt                          */
+  .word	I2C1_EV_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C1_ER_IRQHandler                   			/* I2C1 event interrupt                               */
+  .word	I2C2_EV_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	I2C2_ER_IRQHandler                   			/* I2C2 error interrupt                               */
+  .word	SPI1_IRQHandler                      			/* SPI1 global interrupt                              */
+  .word	SPI2_IRQHandler                      			/* SPI2 global interrupt                              */
+  .word	USART1_IRQHandler                    			/* USART1 global interrupt                            */
+  .word	USART2_IRQHandler                    			/* USART2 global interrupt                            */
+  .word	LPUART1_IRQHandler                   			/* LPUART1 global interrupt                           */
+  .word	LPTIM1_IRQHandler                    			/* LPtimer 1 global interrupt                         */
+  .word	LPTIM2_IRQHandler                    			/* LPtimer 2 global interrupt                         */
+  .word	EXTI15_10_IRQHandler                 			/* EXTI line 15_10] interrupt through EXTI            */
+  .word	RTC_Alarm_IRQHandler                 			/* RTC Alarms A & B interrupt                         */
+  .word	LPTIM3_IRQHandler                    			/* LPtimer 3 global interrupt                         */
+  .word	SUBGHZSPI_IRQHandler                 			/* SUBGHZSPI global interrupt                         */
+  .word	IPCC_C1_RX_IRQHandler                			/* IPCC CPU1 RX occupied interrupt                    */
+  .word	IPCC_C1_TX_IRQHandler                			/* IPCC CPU1 RX free interrupt                        */
+  .word	HSEM_IRQHandler                      			/* Semaphore interrupt 0 to CPU1                      */
+  .word	I2C3_EV_IRQHandler                   			/* I2C3 event interrupt                               */
+  .word	I2C3_ER_IRQHandler                   			/* I2C3 error interrupt                               */
+  .word	SUBGHZ_Radio_IRQHandler              			/* Radio IRQs RFBUSY interrupt through EXTI           */
+  .word	AES_IRQHandler                       			/* AES global interrupt                               */
+  .word	RNG_IRQHandler                       			/* RNG interrupt                                      */
+  .word	PKA_IRQHandler                       			/* PKA interrupt                                      */
+  .word	DMA2_Channel1_IRQHandler             			/* DMA2 channel 1 interrupt                           */
+  .word	DMA2_Channel2_IRQHandler             			/* DMA2 channel 2 interrupt                           */
+  .word	DMA2_Channel3_IRQHandler             			/* DMA2 channel 3 interrupt                           */
+  .word	DMA2_Channel4_IRQHandler             			/* DMA2 channel 4 interrupt                           */
+  .word	DMA2_Channel5_IRQHandler             			/* DMA2 channel 5 interrupt                           */
+  .word	DMA2_Channel6_IRQHandler             			/* DMA2 channel 6 interrupt                           */
+  .word	DMA2_Channel7_IRQHandler             			/* DMA2 channel 7 interrupt                           */
+  .word	DMAMUX1_OVR_IRQHandler               			/* DMAMUX overrun interrupt                           */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+	.weak	NMI_Handler
+	.thumb_set NMI_Handler,Default_Handler
+
+	.weak	HardFault_Handler
+	.thumb_set HardFault_Handler,Default_Handler
+
+	.weak	MemManage_Handler
+	.thumb_set MemManage_Handler,Default_Handler
+
+	.weak	BusFault_Handler
+	.thumb_set BusFault_Handler,Default_Handler
+
+	.weak	UsageFault_Handler
+	.thumb_set UsageFault_Handler,Default_Handler
+
+	.weak	SVC_Handler
+	.thumb_set SVC_Handler,Default_Handler
+
+	.weak	DebugMon_Handler
+	.thumb_set DebugMon_Handler,Default_Handler
+
+	.weak	PendSV_Handler
+	.thumb_set PendSV_Handler,Default_Handler
+
+	.weak	SysTick_Handler
+	.thumb_set SysTick_Handler,Default_Handler
+
+	.weak	WWDG_IRQHandler
+	.thumb_set WWDG_IRQHandler,Default_Handler
+
+	.weak	PVD_PVM_IRQHandler
+	.thumb_set PVD_PVM_IRQHandler,Default_Handler
+
+	.weak	TAMP_STAMP_LSECSS_SSRU_IRQHandler
+	.thumb_set TAMP_STAMP_LSECSS_SSRU_IRQHandler,Default_Handler
+
+	.weak	RTC_WKUP_IRQHandler
+	.thumb_set RTC_WKUP_IRQHandler,Default_Handler
+
+	.weak	FLASH_IRQHandler
+	.thumb_set FLASH_IRQHandler,Default_Handler
+
+	.weak	RCC_IRQHandler
+	.thumb_set RCC_IRQHandler,Default_Handler
+
+	.weak	EXTI0_IRQHandler
+	.thumb_set EXTI0_IRQHandler,Default_Handler
+
+	.weak	EXTI1_IRQHandler
+	.thumb_set EXTI1_IRQHandler,Default_Handler
+
+	.weak	EXTI2_IRQHandler
+	.thumb_set EXTI2_IRQHandler,Default_Handler
+
+	.weak	EXTI3_IRQHandler
+	.thumb_set EXTI3_IRQHandler,Default_Handler
+
+	.weak	EXTI4_IRQHandler
+	.thumb_set EXTI4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel1_IRQHandler
+	.thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel2_IRQHandler
+	.thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel3_IRQHandler
+	.thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel4_IRQHandler
+	.thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel5_IRQHandler
+	.thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel6_IRQHandler
+	.thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA1_Channel7_IRQHandler
+	.thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+	.weak	ADC_IRQHandler
+	.thumb_set ADC_IRQHandler,Default_Handler
+
+	.weak	DAC_IRQHandler
+	.thumb_set DAC_IRQHandler,Default_Handler
+
+	.weak	C2SEV_PWR_C2H_IRQHandler
+	.thumb_set C2SEV_PWR_C2H_IRQHandler,Default_Handler
+
+	.weak	COMP_IRQHandler
+	.thumb_set COMP_IRQHandler,Default_Handler
+
+	.weak	EXTI9_5_IRQHandler
+	.thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+	.weak	TIM1_BRK_IRQHandler
+	.thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+	.weak	TIM1_UP_IRQHandler
+	.thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+	.weak	TIM1_TRG_COM_IRQHandler
+	.thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+	.weak	TIM1_CC_IRQHandler
+	.thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+	.weak	TIM2_IRQHandler
+	.thumb_set TIM2_IRQHandler,Default_Handler
+
+	.weak	TIM16_IRQHandler
+	.thumb_set TIM16_IRQHandler,Default_Handler
+
+	.weak	TIM17_IRQHandler
+	.thumb_set TIM17_IRQHandler,Default_Handler
+
+	.weak	I2C1_EV_IRQHandler
+	.thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+	.weak	I2C1_ER_IRQHandler
+	.thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+	.weak	I2C2_EV_IRQHandler
+	.thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+	.weak	I2C2_ER_IRQHandler
+	.thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+	.weak	SPI1_IRQHandler
+	.thumb_set SPI1_IRQHandler,Default_Handler
+
+	.weak	SPI2_IRQHandler
+	.thumb_set SPI2_IRQHandler,Default_Handler
+
+	.weak	USART1_IRQHandler
+	.thumb_set USART1_IRQHandler,Default_Handler
+
+	.weak	USART2_IRQHandler
+	.thumb_set USART2_IRQHandler,Default_Handler
+
+	.weak	LPUART1_IRQHandler
+	.thumb_set LPUART1_IRQHandler,Default_Handler
+
+	.weak	LPTIM1_IRQHandler
+	.thumb_set LPTIM1_IRQHandler,Default_Handler
+
+	.weak	LPTIM2_IRQHandler
+	.thumb_set LPTIM2_IRQHandler,Default_Handler
+
+	.weak	EXTI15_10_IRQHandler
+	.thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+	.weak	RTC_Alarm_IRQHandler
+	.thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+	.weak	LPTIM3_IRQHandler
+	.thumb_set LPTIM3_IRQHandler,Default_Handler
+
+	.weak	SUBGHZSPI_IRQHandler
+	.thumb_set SUBGHZSPI_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_RX_IRQHandler
+	.thumb_set IPCC_C1_RX_IRQHandler,Default_Handler
+
+	.weak	IPCC_C1_TX_IRQHandler
+	.thumb_set IPCC_C1_TX_IRQHandler,Default_Handler
+
+	.weak	HSEM_IRQHandler
+	.thumb_set HSEM_IRQHandler,Default_Handler
+
+	.weak	I2C3_EV_IRQHandler
+	.thumb_set I2C3_EV_IRQHandler,Default_Handler
+
+	.weak	I2C3_ER_IRQHandler
+	.thumb_set I2C3_ER_IRQHandler,Default_Handler
+
+	.weak	SUBGHZ_Radio_IRQHandler
+	.thumb_set SUBGHZ_Radio_IRQHandler,Default_Handler
+
+	.weak	AES_IRQHandler
+	.thumb_set AES_IRQHandler,Default_Handler
+
+	.weak	RNG_IRQHandler
+	.thumb_set RNG_IRQHandler,Default_Handler
+
+	.weak	PKA_IRQHandler
+	.thumb_set PKA_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel1_IRQHandler
+	.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel2_IRQHandler
+	.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel3_IRQHandler
+	.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel4_IRQHandler
+	.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel5_IRQHandler
+	.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel6_IRQHandler
+	.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
+
+	.weak	DMA2_Channel7_IRQHandler
+	.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
+
+	.weak	DMAMUX1_OVR_IRQHandler
+	.thumb_set DMAMUX1_OVR_IRQHandler,Default_Handler
+
+	.weak	SystemInit
+
+/************************ (C) COPYRIGHT STMicroelectonics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
index 002329fa..4b06d24d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -1,39 +1,73 @@
 /*
-** LinkerScript
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
 */
 
 /* Entry Point */
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "SRAM1" Ram type memory */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
 
-_Min_Heap_Size  = 0x200; /* required amount of heap  */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
 _Min_Stack_Size = 0x800 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 256K
-  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K    /* Non-backup SRAM1 */
-  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K    /* Backup SRAM2 */
+  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 256K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -43,80 +77,82 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
-  /* Initialized data sections into "SRAM1" Ram type memory */
-  .data : 
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM1 AT> ROM
 
-  /* Uninitialized data section into "SRAM1" Ram type memory */
-  . = ALIGN(8);
+  } >RAM1 AT> FLASH
+
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -126,34 +162,34 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM1
 
-  /* Data section into "SRAM1" Ram type memory: Non-backup SRAM1 dedicated to CM4 */
-  . = ALIGN(8);
+  /* Data section into "RAM1" Ram type memory: Non-backup RAM1 dedicated to CM4 */
+  . = ALIGN(4);
   RAM1_region :
   {
     _sRAM1_region = .;         /* define a global symbol at section start */
     *(.RAM1_region)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _eRAM1_region = .;         /* define a global symbol at section end */
   } >RAM1
 
-  /* Data section into "SRAM2" Ram type memory: Backup SRAM2 dedicated to CM4 */
-  . = ALIGN(8);
+  /* Data section into "RAM2" Ram type memory: Backup RAM2 dedicated to CM4 */
+  . = ALIGN(4);
   RAM2_region :
   {
     _sRAM2_region = .;         /* define a global symbol at section start */
     *(.RAM2_region)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _eRAM2_region = .;         /* define a global symbol at section end */
   } >RAM2
 
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
   ._user_heap_stack :
   {
     . = ALIGN(8);
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.c
index 9f1d503f..75c633b8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_subghz_phy.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_subghz_phy.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.h
index 94916fb2..ec85aa39 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_subghz_phy.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SUBGHZ_PHY_H__
 #define __APP_SUBGHZ_PHY_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init SubGHz Radio Application
-  * @param None
-  * @retval None
   */
 void MX_SubGHz_Phy_Init(void);
 
 /**
   * @brief  SubGHz Radio Application Process
-  * @param None
-  * @retval None
   */
 void MX_SubGHz_Phy_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_version.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_version.h
index d7a6fb8e..d03dcd93 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.c
index f5e32aca..cfa5680c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.c
@@ -33,16 +33,15 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
-#include "stm32_timer.h"
 #include "sys_app.h"
 #include "subghz_phy_app.h"
 #include "radio.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
 #include "app_version.h"
 
 /* USER CODE BEGIN Includes */
-
+#include "stm32_timer.h"
+#include "stm32_seq.h"
+#include "utilities_def.h"
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -51,23 +50,40 @@
 /* USER CODE END EV */
 
 /* Private typedef -----------------------------------------------------------*/
+
+/* USER CODE BEGIN PTD */
 typedef enum
 {
-  LOWPOWER,
   RX,
   RX_TIMEOUT,
   RX_ERROR,
   TX,
   TX_TIMEOUT,
 } States_t;
-
-/* USER CODE BEGIN PTD */
-
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
 /* USER CODE BEGIN PD */
-
+/* Configurations */
+/*Timeout*/
+#define RX_TIMEOUT_VALUE              3000
+#define TX_TIMEOUT_VALUE              3000
+/* PING string*/
+#define PING "PING"
+/* PONG string*/
+#define PONG "PONG"
+/*Size of the payload to be sent*/
+/* Size must be greater of equal the PING and PONG*/
+#define MAX_APP_BUFFER_SIZE          255
+#if (PAYLOAD_LEN > MAX_APP_BUFFER_SIZE)
+#error PAYLOAD_LEN must be less or equal than MAX_APP_BUFFER_SIZE
+#endif /* (PAYLOAD_LEN > MAX_APP_BUFFER_SIZE) */
+/* wait for remote to be in Rx, before sending a Tx frame*/
+#define RX_TIME_MARGIN                200
+/* Afc bandwidth in Hz */
+#define FSK_AFC_BANDWIDTH             83333
+/* LED blink Period*/
+#define LED_PERIOD_MS                 200
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -76,101 +92,91 @@ typedef enum
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-const uint8_t PingMsg[] = "PING";
-const uint8_t PongMsg[] = "PONG";
-
-uint16_t BufferSize = BUFFER_SIZE;
-uint8_t Buffer[BUFFER_SIZE];
-
-States_t State = LOWPOWER;
+/* Radio events function pointer */
+static RadioEvents_t RadioEvents;
+/* USER CODE BEGIN PV */
 
+/*Ping Pong FSM states */
+static States_t State = RX;
+/* App Rx Buffer*/
+static uint8_t BufferRx[MAX_APP_BUFFER_SIZE];
+/* App Tx Buffer*/
+static uint8_t BufferTx[MAX_APP_BUFFER_SIZE];
+/* Last  Received Buffer Size*/
+uint16_t RxBufferSize = 0;
+/* Last  Received packer Rssi*/
 int8_t RssiValue = 0;
+/* Last  Received packer SNR (in Lora modulation)*/
 int8_t SnrValue = 0;
-
 /* Led Timers objects*/
-static  UTIL_TIMER_Object_t timerLed;
-
+static UTIL_TIMER_Object_t timerLed;
+/* device state. Master: true, Slave: false*/
 bool isMaster = true;
-
-/* Radio events function pointer */
-static RadioEvents_t RadioEvents;
-
-/* USER CODE BEGIN PV */
-
+/* random delay to make sure 2 devices will sync*/
+/* the closest the random delays are, the longer it will
+   take for the devices to sync when started simultaneously*/
+static int32_t random_delay;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/*!
- * @brief  Function executed on when led timer elapses
- * @param  LED context
- * @retval none
- */
-static void OnledEvent(void *context);
-
 /*!
  * @brief Function to be executed on Radio Tx Done event
- * @param  none
- * @retval none
  */
 static void OnTxDone(void);
 
-/*!
- * @brief Function to be executed on Radio Rx Done event
- * @param  payload sent
- * @param  payload size
- * @param  rssi
- * @param  snr
- * @retval none
- */
-static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
+/**
+  * @brief Function to be executed on Radio Rx Done event
+  * @param  payload ptr of buffer received
+  * @param  size buffer size
+  * @param  rssi
+  * @param  LoraSnr_FskCfo
+  */
+static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo);
 
-/*!
- * @brief Function executed on Radio Tx Timeout event
- * @param  none
- * @retval none
- */
+/**
+  * @brief Function executed on Radio Tx Timeout event
+  */
 static void OnTxTimeout(void);
 
-/*!
- * @brief Function executed on Radio Rx Timeout event
- * @param  none
- * @retval none
- */
+/**
+  * @brief Function executed on Radio Rx Timeout event
+  */
 static void OnRxTimeout(void);
 
-/*!
- * @brief Function executed on Radio Rx Error event
- * @param  none
- * @retval none
- */
+/**
+  * @brief Function executed on Radio Rx Error event
+  */
 static void OnRxError(void);
 
-/*!
- * @brief PingPong state machine implementation
- * @param  none
- * @retval none
- */
-static void PingPong_Process(void);
-
 /* USER CODE BEGIN PFP */
+/**
+  * @brief  Function executed on when led timer elapses
+  * @param  context ptr of LED context
+  */
+static void OnledEvent(void *context);
 
+/**
+  * @brief PingPong state machine implementation
+  */
+static void PingPong_Process(void);
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
 void SubghzApp_Init(void)
 {
   /* USER CODE BEGIN SubghzApp_Init_1 */
-
-  /* USER CODE END SubghzApp_Init_1 */
+  APP_LOG(TS_OFF, VLEVEL_M, "\n\rPING PONG\n\r");
   /* Print APP version*/
-  APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION= V%X.%X.%X\r\n", (uint8_t)(__APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
-          (uint8_t)(__APP_VERSION >> __APP_VERSION_SUB1_SHIFT), (uint8_t)(__APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+  APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION= V%X.%X.%X\r\n",
+          (uint8_t)(__APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
 
   /* Led Timers*/
   UTIL_TIMER_Create(&timerLed, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnledEvent, NULL);
   UTIL_TIMER_SetPeriod(&timerLed, LED_PERIOD_MS);
-
   UTIL_TIMER_Start(&timerLed);
+  /* USER CODE END SubghzApp_Init_1 */
 
   /* Radio initialization */
   RadioEvents.TxDone = OnTxDone;
@@ -181,7 +187,17 @@ void SubghzApp_Init(void)
 
   Radio.Init(&RadioEvents);
 
-#if (( USE_MODEM_LORA == 1 ) && ( USE_MODEM_FSK == 0 ))
+  /* USER CODE BEGIN SubghzApp_Init_2 */
+  /* Radio Set frequency */
+  Radio.SetChannel(RF_FREQUENCY);
+
+  /* Radio configuration */
+#if ((USE_MODEM_LORA == 1) && (USE_MODEM_FSK == 0))
+  APP_LOG(TS_OFF, VLEVEL_M, "---------------\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "LORA_MODULATION\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "LORA_BW=%d kHz\n\r", (1 << LORA_BANDWIDTH) * 125);
+  APP_LOG(TS_OFF, VLEVEL_M, "LORA_SF=%d\n\r", LORA_SPREADING_FACTOR);
+
   Radio.SetTxConfig(MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH,
                     LORA_SPREADING_FACTOR, LORA_CODINGRATE,
                     LORA_PREAMBLE_LENGTH, LORA_FIX_LENGTH_PAYLOAD_ON,
@@ -192,9 +208,13 @@ void SubghzApp_Init(void)
                     LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
                     0, true, 0, 0, LORA_IQ_INVERSION_ON, true);
 
-  Radio.SetMaxPayloadLength(MODEM_LORA, BUFFER_SIZE);
+  Radio.SetMaxPayloadLength(MODEM_LORA, MAX_APP_BUFFER_SIZE);
 
-#elif (( USE_MODEM_LORA == 0 ) && ( USE_MODEM_FSK == 1 ))
+#elif ((USE_MODEM_LORA == 0) && (USE_MODEM_FSK == 1))
+  APP_LOG(TS_OFF, VLEVEL_M, "---------------\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_MODULATION\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_BW=%d Hz\n\r", FSK_BANDWIDTH);
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_DR=%d bits/s\n\r", FSK_DATARATE);
 
   Radio.SetTxConfig(MODEM_FSK, TX_OUTPUT_POWER, FSK_FDEV, 0,
                     FSK_DATARATE, 0,
@@ -206,30 +226,24 @@ void SubghzApp_Init(void)
                     0, FSK_FIX_LENGTH_PAYLOAD_ON, 0, true,
                     0, 0, false, true);
 
-  Radio.SetMaxPayloadLength(MODEM_FSK, BUFFER_SIZE);
+  Radio.SetMaxPayloadLength(MODEM_FSK, MAX_APP_BUFFER_SIZE);
 
 #else
-#error "Please define a frequency band in the sys_conf.h file."
+#error "Please define a modulation in the subghz_phy_app.h file."
 #endif /* USE_MODEM_LORA | USE_MODEM_FSK */
-
-  Radio.SetChannel(RF_FREQUENCY);
-
-#if defined(USE_BSP_DRIVER)
+  /* LED initialization*/
   BSP_LED_Init(LED_GREEN);
   BSP_LED_Init(LED_RED);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_GREEN);
-  SYS_LED_Init(SYS_LED_RED);
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC*/
-
-  Radio.Rx(RX_TIMEOUT_VALUE);
-
-  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_PingPong_Process), UTIL_SEQ_RFU, PingPong_Process);
-
-  /* USER CODE BEGIN SubghzApp_Init_2 */
-
+  /*calculate random delay for synchronization*/
+  random_delay = (Radio.Random()) >> 22; /*10bits random e.g. from 0 to 1023 ms*/
+  /*fills tx buffer*/
+  memset(BufferTx, 0x0, MAX_APP_BUFFER_SIZE);
+
+  APP_LOG(TS_ON, VLEVEL_L, "rand=%d\n\r", random_delay);
+  /*starts reception*/
+  Radio.Rx(RX_TIMEOUT_VALUE + random_delay);
+  /*register task to to be run in while(1) after Radio IT*/
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), UTIL_SEQ_RFU, PingPong_Process);
   /* USER CODE END SubghzApp_Init_2 */
 }
 
@@ -238,12 +252,96 @@ void SubghzApp_Init(void)
 /* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
-static void PingPong_Process(void)
+
+static void OnTxDone(void)
+{
+  /* USER CODE BEGIN OnTxDone */
+  APP_LOG(TS_ON, VLEVEL_L, "OnTxDone\n\r");
+  /* Update the State of the FSM*/
+  State = TX;
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnTxDone */
+}
+
+static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo)
+{
+  /* USER CODE BEGIN OnRxDone */
+  APP_LOG(TS_ON, VLEVEL_L, "OnRxDone\n\r");
+#if ((USE_MODEM_LORA == 1) && (USE_MODEM_FSK == 0))
+  APP_LOG(TS_ON, VLEVEL_L, "RssiValue=%d dBm, SnrValue=%ddB\n\r", rssi, LoraSnr_FskCfo);
+  /* Record payload Signal to noise ratio in Lora*/
+  SnrValue = LoraSnr_FskCfo;
+#endif /* USE_MODEM_LORA | USE_MODEM_FSK */
+#if ((USE_MODEM_LORA == 0) && (USE_MODEM_FSK == 1))
+  APP_LOG(TS_ON, VLEVEL_L, "RssiValue=%d dBm, Cfo=%dkHz\n\r", rssi, LoraSnr_FskCfo);
+  SnrValue = 0; /*not applicable in GFSK*/
+#endif /* USE_MODEM_LORA | USE_MODEM_FSK */
+  /* Update the State of the FSM*/
+  State = RX;
+  /* Clear BufferRx*/
+  memset(BufferRx, 0, MAX_APP_BUFFER_SIZE);
+  /* Record payload size*/
+  RxBufferSize = size;
+  if (RxBufferSize <= MAX_APP_BUFFER_SIZE)
+  {
+    memcpy(BufferRx, payload, RxBufferSize);
+  }
+  /* Record Received Signal Strength*/
+  RssiValue = rssi;
+  /* Record payload content*/
+  APP_LOG(TS_ON, VLEVEL_H, "payload. size=%d \n\r", size);
+  for (int i = 0; i < PAYLOAD_LEN; i++)
+  {
+    APP_LOG(TS_OFF, VLEVEL_H, "%02X", BufferRx[i]);
+    if (i % 16 == 15)
+    {
+      APP_LOG(TS_OFF, VLEVEL_H, "\n\r");
+    }
+  }
+  APP_LOG(TS_OFF, VLEVEL_H, "\n\r");
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnRxDone */
+}
+
+static void OnTxTimeout(void)
 {
-  /* USER CODE BEGIN PingPong_Process_1 */
+  /* USER CODE BEGIN OnTxTimeout */
+  APP_LOG(TS_ON, VLEVEL_L, "OnTxTimeout\n\r");
+  /* Update the State of the FSM*/
+  State = TX_TIMEOUT;
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnTxTimeout */
+}
 
-  /* USER CODE END PingPong_Process_1 */
-  uint8_t i;
+static void OnRxTimeout(void)
+{
+  /* USER CODE BEGIN OnRxTimeout */
+  APP_LOG(TS_ON, VLEVEL_L, "OnRxTimeout\n\r");
+  /* Update the State of the FSM*/
+  State = RX_TIMEOUT;
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnRxTimeout */
+}
+
+static void OnRxError(void)
+{
+  /* USER CODE BEGIN OnRxError */
+  APP_LOG(TS_ON, VLEVEL_L, "OnRxError\n\r");
+  /* Update the State of the FSM*/
+  State = RX_ERROR;
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnRxError */
+}
+
+/* USER CODE BEGIN PrFD */
+static void PingPong_Process(void)
+{
+  Radio.Sleep();
 
   switch (State)
   {
@@ -251,50 +349,30 @@ static void PingPong_Process(void)
 
       if (isMaster == true)
       {
-        if (BufferSize > 0)
+        if (RxBufferSize > 0)
         {
-          if (strncmp((const char *)Buffer, (const char *)PongMsg, 4) == 0)
+          if (strncmp((const char *)BufferRx, PONG, sizeof(PONG) - 1) == 0)
           {
             UTIL_TIMER_Stop(&timerLed);
-
-#if defined(USE_BSP_DRIVER)
-            BSP_LED_Off(LED_GREEN) ;
-            /* Indicates on a LED that the received frame is a PONG */
-            BSP_LED_Toggle(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_Off(SYS_LED_GREEN) ;
-            /* Indicates on a LED that the received frame is a PONG */
-            SYS_LED_Toggle(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-            /* Send the next PING frame */
-            Buffer[0] = 'P';
-            Buffer[1] = 'I';
-            Buffer[2] = 'N';
-            Buffer[3] = 'G';
-            /* We fill the buffer with numbers for the payload */
-            for (i = 4; i < BufferSize; i++)
-            {
-              Buffer[i] = i - 4;
-            }
-            APP_LOG(TS_ON, VLEVEL_L, "...PING\n\r");
-
+            /* switch off green led */
+            BSP_LED_Off(LED_GREEN);
+            /* master toggles red led */
+            BSP_LED_Toggle(LED_RED);
+            /* Add delay between RX and TX */
+            HAL_Delay(Radio.GetWakeupTime() + RX_TIME_MARGIN);
+            /* master sends PING*/
+            APP_LOG(TS_ON, VLEVEL_L, "..."
+                    "PING"
+                    "\n\r");
             APP_LOG(TS_ON, VLEVEL_L, "Master Tx start\n\r");
-
-            Radio.SetChannel(RF_FREQUENCY);
-
-            /* Add delay between TX and RX =
-            time Busy_signal is ON in RX opening window */
-            HAL_Delay(Radio.GetWakeupTime() + TCXO_WORKAROUND_TIME_MARGIN);
-
-            Radio.Send(Buffer, BufferSize);
+            memcpy(BufferTx, PING, sizeof(PING) - 1);
+            Radio.Send(BufferTx, PAYLOAD_LEN);
           }
-          else if (strncmp((const char *)Buffer, (const char *)PingMsg, 4) == 0)
+          else if (strncmp((const char *)BufferRx, PING, sizeof(PING) - 1) == 0)
           {
             /* A master already exists then become a slave */
             isMaster = false;
             APP_LOG(TS_ON, VLEVEL_L, "Slave Rx start\n\r");
-
-            Radio.SetChannel(RF_FREQUENCY);
             Radio.Rx(RX_TIMEOUT_VALUE);
           }
           else /* valid reception but neither a PING or a PONG message */
@@ -302,218 +380,80 @@ static void PingPong_Process(void)
             /* Set device as master and start again */
             isMaster = true;
             APP_LOG(TS_ON, VLEVEL_L, "Master Rx start\n\r");
-
-            Radio.SetChannel(RF_FREQUENCY);
             Radio.Rx(RX_TIMEOUT_VALUE);
           }
         }
       }
       else
       {
-        if (BufferSize > 0)
+        if (RxBufferSize > 0)
         {
-          if (strncmp((const char *)Buffer, (const char *)PingMsg, 4) == 0)
+          if (strncmp((const char *)BufferRx, PING, sizeof(PING) - 1) == 0)
           {
-            /* Indicates on a LED that the received frame is a PING */
             UTIL_TIMER_Stop(&timerLed);
-
-#if defined(USE_BSP_DRIVER)
+            /* switch off red led */
             BSP_LED_Off(LED_RED);
+            /* slave toggles green led */
             BSP_LED_Toggle(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_Off(SYS_LED_RED);
-            SYS_LED_Toggle(SYS_LED_GREEN);
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-            /* Send the reply to the PONG string */
-            Buffer[0] = 'P';
-            Buffer[1] = 'O';
-            Buffer[2] = 'N';
-            Buffer[3] = 'G';
-            /* We fill the buffer with numbers for the payload */
-            for (i = 4; i < BufferSize; i++)
-            {
-              Buffer[i] = i - 4;
-            }
+            /* Add delay between RX and TX */
+            HAL_Delay(Radio.GetWakeupTime() + RX_TIME_MARGIN);
+            /*slave sends PONG*/
+            APP_LOG(TS_ON, VLEVEL_L, "..."
+                    "PONG"
+                    "\n\r");
             APP_LOG(TS_ON, VLEVEL_L, "Slave  Tx start\n\r");
-            Radio.SetChannel(RF_FREQUENCY);
-
-            /* Add delay between TX and RX =
-            time Busy_signal is ON in RX opening window */
-            HAL_Delay(Radio.GetWakeupTime() + TCXO_WORKAROUND_TIME_MARGIN);
-
-            Radio.Send(Buffer, BufferSize);
-
-            APP_LOG(TS_ON, VLEVEL_L, "...PONG\n\r");
+            memcpy(BufferTx, PONG, sizeof(PONG) - 1);
+            Radio.Send(BufferTx, PAYLOAD_LEN);
           }
           else /* valid reception but not a PING as expected */
           {
             /* Set device as master and start again */
             isMaster = true;
             APP_LOG(TS_ON, VLEVEL_L, "Master Rx start\n\r");
-            Radio.SetChannel(RF_FREQUENCY);
             Radio.Rx(RX_TIMEOUT_VALUE);
           }
         }
       }
-      State = LOWPOWER;
       break;
     case TX:
-      /* Indicates on a LED that we have sent a PING [Master] */
-      /* Indicates on a LED that we have sent a PONG [Slave] */
-      Radio.SetChannel(RF_FREQUENCY);
       APP_LOG(TS_ON, VLEVEL_L, "Rx start\n\r");
       Radio.Rx(RX_TIMEOUT_VALUE);
-      State = LOWPOWER;
       break;
     case RX_TIMEOUT:
     case RX_ERROR:
       if (isMaster == true)
       {
         /* Send the next PING frame */
-        Buffer[0] = 'P';
-        Buffer[1] = 'I';
-        Buffer[2] = 'N';
-        Buffer[3] = 'G';
-        for (i = 4; i < BufferSize; i++)
-        {
-          Buffer[i] = i - 4;
-        }
+        /* Add delay between RX and TX*/
+        /* add random_delay to force sync between boards after some trials*/
+        HAL_Delay(Radio.GetWakeupTime() + RX_TIME_MARGIN + random_delay);
         APP_LOG(TS_ON, VLEVEL_L, "Master Tx start\n\r");
-
-        Radio.SetChannel(RF_FREQUENCY);
-        /* Add delay between TX and RX =
-        time Busy_signal is ON in RX opening window */
-        HAL_Delay(Radio.GetWakeupTime() + TCXO_WORKAROUND_TIME_MARGIN);
-
-        Radio.Send(Buffer, BufferSize);
+        /* master sends PING*/
+        memcpy(BufferTx, PING, sizeof(PING) - 1);
+        Radio.Send(BufferTx, PAYLOAD_LEN);
       }
       else
       {
         APP_LOG(TS_ON, VLEVEL_L, "Slave Rx start\n\r");
-
-        Radio.SetChannel(RF_FREQUENCY);
         Radio.Rx(RX_TIMEOUT_VALUE);
       }
-      State = LOWPOWER;
       break;
     case TX_TIMEOUT:
-      Radio.SetChannel(RF_FREQUENCY);
       APP_LOG(TS_ON, VLEVEL_L, "Slave Rx start\n\r");
       Radio.Rx(RX_TIMEOUT_VALUE);
-      State = LOWPOWER;
       break;
-    case LOWPOWER:
     default:
-      /* Set low power */
       break;
   }
-  /* USER CODE BEGIN PingPong_Process_2 */
-
-  /* USER CODE END PingPong_Process_2 */
-}
-
-static void OnTxDone(void)
-{
-  /* USER CODE BEGIN OnTxDone_1 */
-
-  /* USER CODE END OnTxDone_1 */
-  APP_LOG(TS_ON, VLEVEL_L, "OnTxDone\n\r");
-
-  Radio.Sleep();
-  State = TX;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnTxDone_2 */
-
-  /* USER CODE END OnTxDone_2 */
-}
-
-static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
-{
-  /* USER CODE BEGIN OnRxDone_1 */
-
-  /* USER CODE END OnRxDone_1 */
-  APP_LOG(TS_ON, VLEVEL_L, "OnRxDone\n\r");
-  APP_LOG(TS_ON, VLEVEL_L,  "RssiValue=%d dBm, SnrValue=%d\n\r", rssi, snr);
-
-  Radio.Sleep();
-  BufferSize = size;
-  memcpy(Buffer, payload, BufferSize);
-  RssiValue = rssi;
-  SnrValue = snr;
-  State = RX;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-
-  /* USER CODE BEGIN OnRxDone_2 */
-
-  /* USER CODE END OnRxDone_2 */
-}
-
-static void OnTxTimeout(void)
-{
-  /* USER CODE BEGIN OnTxTimeout_1 */
-
-  /* USER CODE END OnTxTimeout_1 */
-  APP_LOG(TS_ON, VLEVEL_L,  "OnTxTimeout\n\r");
-
-  Radio.Sleep();
-  State = TX_TIMEOUT;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnTxTimeout_2 */
-
-  /* USER CODE END OnTxTimeout_2 */
-}
-
-static void OnRxTimeout(void)
-{
-  /* USER CODE BEGIN OnRxTimeout_1 */
-
-  /* USER CODE END OnRxTimeout_1 */
-  APP_LOG(TS_ON, VLEVEL_L,  "OnRxTimeout\n\r");
-
-  Radio.Sleep();
-  State = RX_TIMEOUT;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnRxTimeout_2 */
-
-  /* USER CODE END OnRxTimeout_2 */
-}
-
-static void OnRxError(void)
-{
-  /* USER CODE BEGIN OnRxError_1 */
-
-  /* USER CODE END OnRxError_1 */
-  APP_LOG(TS_ON, VLEVEL_L, "OnRxError\n\r");
-
-  Radio.Sleep();
-  State = RX_ERROR;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnRxError_2 */
-
-  /* USER CODE END OnRxError_2 */
 }
 
 static void OnledEvent(void *context)
 {
-  /* USER CODE BEGIN OnledEvent_1 */
-
-  /* USER CODE END OnledEvent_1 */
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Toggle(LED_GREEN) ;
-  BSP_LED_Toggle(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Toggle(SYS_LED_RED) ;
-  SYS_LED_Toggle(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-
+  BSP_LED_Toggle(LED_GREEN);
+  BSP_LED_Toggle(LED_RED);
   UTIL_TIMER_Start(&timerLed);
-  /* USER CODE BEGIN OnledEvent_2 */
-
-  /* USER CODE END OnledEvent_2 */
 }
 
-/* USER CODE BEGIN PrFD */
-
 /* USER CODE END PrFD */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.h
index ee3f9b2b..245ca9e7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    subghz_phy_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SUBGHZ_PHY_APP_H__
 #define __SUBGHZ_PHY_APP_H__
@@ -100,7 +103,6 @@ extern "C" {
 #define FSK_FDEV                                    25000     /* Hz */
 #define FSK_DATARATE                                50000     /* bps */
 #define FSK_BANDWIDTH                               50000     /* Hz */
-#define FSK_AFC_BANDWIDTH                           83333     /* Hz */
 #define FSK_PREAMBLE_LENGTH                         5         /* Same for Tx and Rx */
 #define FSK_FIX_LENGTH_PAYLOAD_ON                   false
 
@@ -108,12 +110,7 @@ extern "C" {
 #error "Please define a modem in the compiler subghz_phy_app.h."
 #endif /* USE_MODEM_LORA | USE_MODEM_FSK */
 
-#define RX_TIMEOUT_VALUE                            2000
-#define TX_TIMEOUT_VALUE                            3000
-#define BUFFER_SIZE                                 64  /* Define the payload size here */
-#define LED_PERIOD_MS                               200
-
-#define TCXO_WORKAROUND_TIME_MARGIN                 50  /* 50ms margin */
+#define PAYLOAD_LEN                                 64
 
 /* USER CODE BEGIN EC */
 
@@ -129,16 +126,9 @@ extern "C" {
 
 /* USER CODE END EM */
 
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Subghz Application
-  * @param None
-  * @retval None
   */
 void SubghzApp_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.h
index 2e283d29..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     10U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -76,54 +76,32 @@ extern "C" {
  * 0: DCDC not supported
  * 1: DCDC supported
  */
-#define IS_DCDC_SUPPORTED                   0U
+#define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_conf.h
index 29cc81b5..375c9ddc 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,7 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
-#include "stm32_mem.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,20 +48,16 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-
-/**
-  * @brief Max payload buffer size
-  */
-#define RADIO_RX_BUF_SIZE          255
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -67,25 +65,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -125,6 +140,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy_PingPong.ioc b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy_PingPong.ioc
index 9ea9f07d..e4ca232c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy_PingPong.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/SubGHz_Phy_PingPong.ioc
@@ -25,57 +25,60 @@ KeepUserPlacement=false
 Mcu.ContextProject=MonoOnDualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADV_TRACE
-Mcu.IP1=DMA
-Mcu.IP10=TIMER
-Mcu.IP11=TINY_LPM
-Mcu.IP12=USART2
-Mcu.IP2=MISC
-Mcu.IP3=NVIC
-Mcu.IP4=RCC
-Mcu.IP5=RTC
-Mcu.IP6=SEQUENCER_M4
-Mcu.IP7=SUBGHZ
-Mcu.IP8=SUBGHZ_PHY
-Mcu.IP9=SYS
-Mcu.IPNb=13
+Mcu.IP1=DEBUG
+Mcu.IP10=SYS
+Mcu.IP11=TIMER
+Mcu.IP12=TINY_LPM
+Mcu.IP13=USART2
+Mcu.IP2=DMA
+Mcu.IP3=MISC
+Mcu.IP4=NVIC
+Mcu.IP5=RCC
+Mcu.IP6=RTC
+Mcu.IP7=SEQUENCER_M4
+Mcu.IP8=SUBGHZ
+Mcu.IP9=SUBGHZ_PHY
+Mcu.IPNb=14
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_MISC_VS_MISC
-Mcu.Pin21=VP_RTC_VS_RTC_Activate
-Mcu.Pin22=VP_RTC_VS_RTC_Calendar
-Mcu.Pin23=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin24=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin25=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin26=VP_SUBGHZ_PHY_VS_SubGhzPhy
-Mcu.Pin27=VP_SYS_VS_Systick
-Mcu.Pin28=VP_TIMER_VS_TIMER
-Mcu.Pin29=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=30
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin22=VP_MISC_VS_MISC
+Mcu.Pin23=VP_RTC_VS_RTC_Activate
+Mcu.Pin24=VP_RTC_VS_RTC_Calendar
+Mcu.Pin25=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin26=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin27=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin28=VP_SUBGHZ_PHY_VS_SubGhzPhy
+Mcu.Pin29=VP_SYS_VS_None
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_TIMER_VS_TIMER
+Mcu.Pin31=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=32
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);USART_BAUDRATE,115200
+Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -88,22 +91,25 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.RTC_Alarm_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.TAMP_STAMP_LSECSS_SSRU_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+NVIC.TimeBase=None
 NVIC.USART2_IRQn=true\:2\:0\:true\:false\:true\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4MonoOnDual
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4MonoOnDual
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -118,40 +124,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=USART2_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4MonoOnDual
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4MonoOnDual
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4MonoOnDual
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4MonoOnDual
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4MonoOnDual
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4MonoOnDual
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4MonoOnDual
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -159,26 +158,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4MonoOnDual
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4MonoOnDual
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4MonoOnDual
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4MonoOnDual
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -260,17 +262,18 @@ SH.GPXTI6.0=GPIO_EXTI6
 SH.GPXTI6.ConfNb=1
 SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
-SUBGHZ_PHY.Activate_BOARD_RESOURCES=M4
 SUBGHZ_PHY.Activate_DEBUG_LINE=true
-SUBGHZ_PHY.IPParameters=IS_TCXO_SUPPORTED,IS_DCDC_SUPPORTED,Activate_DEBUG_LINE,Activate_BOARD_RESOURCES,SUBGHZ_APPLICATION
-SUBGHZ_PHY.IS_DCDC_SUPPORTED=1
+SUBGHZ_PHY.Activate_RADIO_BOARD_INTERFACE=Bsp
+SUBGHZ_PHY.IPParameters=IS_TCXO_SUPPORTED,IS_DCDC_SUPPORTED,Activate_DEBUG_LINE,SUBGHZ_APPLICATION,Activate_RADIO_BOARD_INTERFACE,TX_RFO_CONFIG
+SUBGHZ_PHY.IS_DCDC_SUPPORTED=true
 SUBGHZ_PHY.IS_TCXO_SUPPORTED=true
-SUBGHZ_PHY.SUBGHZ_APPLICATION=SUBGHZ_PINGPONG
-SubGHz_Phy.BSP.number=15
+SUBGHZ_PHY.SUBGHZ_APPLICATION=SUBGHZ_ADV_APPLICATION
+SUBGHZ_PHY.TX_RFO_CONFIG=RBI_CONF_RFO_LP_HP
+SubGHz_Phy.BSP.number=6
 SubGHz_Phy0.BSP.STBoard=false
 SubGHz_Phy0.BSP.api=Unknown
 SubGHz_Phy0.BSP.component=
-SubGHz_Phy0.BSP.condition=\!SEM_SUBGHZ_USER_APPLICATION
+SubGHz_Phy0.BSP.condition=\!SEM_SUBGHZ_USER_APPLICATION | SEM_SUBGHZ_USE_RTC
 SubGHz_Phy0.BSP.i2caddr=0
 SubGHz_Phy0.BSP.i2creg=
 SubGHz_Phy0.BSP.instance=RTC
@@ -282,174 +285,65 @@ SubGHz_Phy0.BSP.solution=RTC
 SubGHz_Phy1.BSP.STBoard=false
 SubGHz_Phy1.BSP.api=Unknown
 SubGHz_Phy1.BSP.component=
-SubGHz_Phy1.BSP.condition=SEM_DEBUG_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy1.BSP.condition=\!SEM_SUBGHZ_USER_APPLICATION | SEM_SUBGHZ_USE_UART
 SubGHz_Phy1.BSP.i2caddr=0
 SubGHz_Phy1.BSP.i2creg=
-SubGHz_Phy1.BSP.instance=PB12
-SubGHz_Phy1.BSP.ip=GPIO
-SubGHz_Phy1.BSP.mode=Output
-SubGHz_Phy1.BSP.name=Debug Line 1
+SubGHz_Phy1.BSP.instance=USART2
+SubGHz_Phy1.BSP.ip=(LPU|US)ART
+SubGHz_Phy1.BSP.mode=Asynchronous
+SubGHz_Phy1.BSP.name=USART
 SubGHz_Phy1.BSP.semaphore=
-SubGHz_Phy1.BSP.solution=PB12
-SubGHz_Phy10.BSP.STBoard=false
-SubGHz_Phy10.BSP.api=Unknown
-SubGHz_Phy10.BSP.component=
-SubGHz_Phy10.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY
-SubGHz_Phy10.BSP.i2caddr=0
-SubGHz_Phy10.BSP.i2creg=
-SubGHz_Phy10.BSP.instance=PA0
-SubGHz_Phy10.BSP.ip=GPIO
-SubGHz_Phy10.BSP.mode=EXTI
-SubGHz_Phy10.BSP.name=BUTTON 1
-SubGHz_Phy10.BSP.semaphore=
-SubGHz_Phy10.BSP.solution=PA0
-SubGHz_Phy11.BSP.STBoard=false
-SubGHz_Phy11.BSP.api=Unknown
-SubGHz_Phy11.BSP.component=
-SubGHz_Phy11.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SUBGHZ_PHY
-SubGHz_Phy11.BSP.i2caddr=0
-SubGHz_Phy11.BSP.i2creg=
-SubGHz_Phy11.BSP.instance=PC4
-SubGHz_Phy11.BSP.ip=GPIO
-SubGHz_Phy11.BSP.mode=Output
-SubGHz_Phy11.BSP.name=RF SW CTRL 1
-SubGHz_Phy11.BSP.semaphore=
-SubGHz_Phy11.BSP.solution=PC4
-SubGHz_Phy12.BSP.STBoard=false
-SubGHz_Phy12.BSP.api=Unknown
-SubGHz_Phy12.BSP.component=
-SubGHz_Phy12.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SUBGHZ_PHY
-SubGHz_Phy12.BSP.i2caddr=0
-SubGHz_Phy12.BSP.i2creg=
-SubGHz_Phy12.BSP.instance=PC5
-SubGHz_Phy12.BSP.ip=GPIO
-SubGHz_Phy12.BSP.mode=Output
-SubGHz_Phy12.BSP.name=RF SW CTRL 2
-SubGHz_Phy12.BSP.semaphore=
-SubGHz_Phy12.BSP.solution=PC5
-SubGHz_Phy13.BSP.STBoard=false
-SubGHz_Phy13.BSP.api=Unknown
-SubGHz_Phy13.BSP.component=
-SubGHz_Phy13.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY
-SubGHz_Phy13.BSP.i2caddr=0
-SubGHz_Phy13.BSP.i2creg=
-SubGHz_Phy13.BSP.instance=PC6
-SubGHz_Phy13.BSP.ip=GPIO
-SubGHz_Phy13.BSP.mode=EXTI
-SubGHz_Phy13.BSP.name=BUTTON 3
-SubGHz_Phy13.BSP.semaphore=
-SubGHz_Phy13.BSP.solution=PC6
-SubGHz_Phy14.BSP.STBoard=false
-SubGHz_Phy14.BSP.api=Unknown
-SubGHz_Phy14.BSP.component=
-SubGHz_Phy14.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY
-SubGHz_Phy14.BSP.i2caddr=0
-SubGHz_Phy14.BSP.i2creg=
-SubGHz_Phy14.BSP.instance=PA1
-SubGHz_Phy14.BSP.ip=GPIO
-SubGHz_Phy14.BSP.mode=EXTI
-SubGHz_Phy14.BSP.name=BUTTON 2
-SubGHz_Phy14.BSP.semaphore=
-SubGHz_Phy14.BSP.solution=PA1
+SubGHz_Phy1.BSP.solution=USART2
 SubGHz_Phy2.BSP.STBoard=false
 SubGHz_Phy2.BSP.api=Unknown
 SubGHz_Phy2.BSP.component=
-SubGHz_Phy2.BSP.condition=SEM_DEBUG_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy2.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
 SubGHz_Phy2.BSP.i2caddr=0
 SubGHz_Phy2.BSP.i2creg=
-SubGHz_Phy2.BSP.instance=PB13
+SubGHz_Phy2.BSP.instance=PB12
 SubGHz_Phy2.BSP.ip=GPIO
 SubGHz_Phy2.BSP.mode=Output
-SubGHz_Phy2.BSP.name=Debug Line 2
+SubGHz_Phy2.BSP.name=Debug Line 1
 SubGHz_Phy2.BSP.semaphore=
-SubGHz_Phy2.BSP.solution=PB13
+SubGHz_Phy2.BSP.solution=PB12
 SubGHz_Phy3.BSP.STBoard=false
 SubGHz_Phy3.BSP.api=Unknown
 SubGHz_Phy3.BSP.component=
-SubGHz_Phy3.BSP.condition=SEM_DEBUG_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy3.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
 SubGHz_Phy3.BSP.i2caddr=0
 SubGHz_Phy3.BSP.i2creg=
-SubGHz_Phy3.BSP.instance=PB14
+SubGHz_Phy3.BSP.instance=PB13
 SubGHz_Phy3.BSP.ip=GPIO
 SubGHz_Phy3.BSP.mode=Output
-SubGHz_Phy3.BSP.name=Debug Line 3
+SubGHz_Phy3.BSP.name=Debug Line 2
 SubGHz_Phy3.BSP.semaphore=
-SubGHz_Phy3.BSP.solution=PB14
+SubGHz_Phy3.BSP.solution=PB13
 SubGHz_Phy4.BSP.STBoard=false
 SubGHz_Phy4.BSP.api=Unknown
 SubGHz_Phy4.BSP.component=
-SubGHz_Phy4.BSP.condition=SEM_DEBUG_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy4.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
 SubGHz_Phy4.BSP.i2caddr=0
 SubGHz_Phy4.BSP.i2creg=
-SubGHz_Phy4.BSP.instance=PB10
+SubGHz_Phy4.BSP.instance=PB14
 SubGHz_Phy4.BSP.ip=GPIO
 SubGHz_Phy4.BSP.mode=Output
-SubGHz_Phy4.BSP.name=Debug Line 4
+SubGHz_Phy4.BSP.name=Debug Line 3
 SubGHz_Phy4.BSP.semaphore=
-SubGHz_Phy4.BSP.solution=PB10
+SubGHz_Phy4.BSP.solution=PB14
 SubGHz_Phy5.BSP.STBoard=false
 SubGHz_Phy5.BSP.api=Unknown
 SubGHz_Phy5.BSP.component=
-SubGHz_Phy5.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY
+SubGHz_Phy5.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
 SubGHz_Phy5.BSP.i2caddr=0
 SubGHz_Phy5.BSP.i2creg=
-SubGHz_Phy5.BSP.instance=PB11
+SubGHz_Phy5.BSP.instance=PB10
 SubGHz_Phy5.BSP.ip=GPIO
 SubGHz_Phy5.BSP.mode=Output
-SubGHz_Phy5.BSP.name=LED 3
+SubGHz_Phy5.BSP.name=Debug Line 4
 SubGHz_Phy5.BSP.semaphore=
-SubGHz_Phy5.BSP.solution=PB11
-SubGHz_Phy6.BSP.STBoard=false
-SubGHz_Phy6.BSP.api=Unknown
-SubGHz_Phy6.BSP.component=
-SubGHz_Phy6.BSP.condition=SEM_SUBGHZ_PINGPONG
-SubGHz_Phy6.BSP.i2caddr=0
-SubGHz_Phy6.BSP.i2creg=
-SubGHz_Phy6.BSP.instance=USART2
-SubGHz_Phy6.BSP.ip=(LPU|US)ART
-SubGHz_Phy6.BSP.mode=Asynchronous
-SubGHz_Phy6.BSP.name=USART
-SubGHz_Phy6.BSP.semaphore=
-SubGHz_Phy6.BSP.solution=USART2
-SubGHz_Phy7.BSP.STBoard=false
-SubGHz_Phy7.BSP.api=Unknown
-SubGHz_Phy7.BSP.component=
-SubGHz_Phy7.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY
-SubGHz_Phy7.BSP.i2caddr=0
-SubGHz_Phy7.BSP.i2creg=
-SubGHz_Phy7.BSP.instance=PB9
-SubGHz_Phy7.BSP.ip=GPIO
-SubGHz_Phy7.BSP.mode=Output
-SubGHz_Phy7.BSP.name=LED 2
-SubGHz_Phy7.BSP.semaphore=
-SubGHz_Phy7.BSP.solution=PB9
-SubGHz_Phy8.BSP.STBoard=false
-SubGHz_Phy8.BSP.api=Unknown
-SubGHz_Phy8.BSP.component=
-SubGHz_Phy8.BSP.condition=SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY
-SubGHz_Phy8.BSP.i2caddr=0
-SubGHz_Phy8.BSP.i2creg=
-SubGHz_Phy8.BSP.instance=PB15
-SubGHz_Phy8.BSP.ip=GPIO
-SubGHz_Phy8.BSP.mode=Output
-SubGHz_Phy8.BSP.name=LED 1
-SubGHz_Phy8.BSP.semaphore=
-SubGHz_Phy8.BSP.solution=PB15
-SubGHz_Phy9.BSP.STBoard=false
-SubGHz_Phy9.BSP.api=Unknown
-SubGHz_Phy9.BSP.component=
-SubGHz_Phy9.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SUBGHZ_PHY
-SubGHz_Phy9.BSP.i2caddr=0
-SubGHz_Phy9.BSP.i2creg=
-SubGHz_Phy9.BSP.instance=PC3
-SubGHz_Phy9.BSP.ip=GPIO
-SubGHz_Phy9.BSP.mode=Output
-SubGHz_Phy9.BSP.name=RF SW CTRL 3
-SubGHz_Phy9.BSP.semaphore=
-SubGHz_Phy9.BSP.solution=PC3
-USART2.BaudRate=USART_BAUDRATE
+SubGHz_Phy5.BSP.solution=PB10
 USART2.FIFOMode=FIFOMODE_ENABLE
-USART2.IPParameters=VirtualMode-Asynchronous,BaudRate,FIFOMode
+USART2.IPParameters=VirtualMode-Asynchronous,FIFOMode
 USART2.VirtualMode-Asynchronous=VM_ASYNC
 VP_ADV_TRACE_VS_ADV_TRACE.Mode=ADV_TRACE_Enabled
 VP_ADV_TRACE_VS_ADV_TRACE.Signal=ADV_TRACE_VS_ADV_TRACE
@@ -467,10 +361,13 @@ VP_SUBGHZ_PHY_VS_SubGhzPhy.Mode=SubGhzPhy_Enabled
 VP_SUBGHZ_PHY_VS_SubGhzPhy.Signal=SUBGHZ_PHY_VS_SubGhzPhy
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=SubGHz_Phy_PingPong
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/readme.txt
index fb38333a..9cd16768 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong/readme.txt
@@ -1,12 +1,12 @@
 /**
   @page SubGHz_Phy_PingPong Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/SubGHz_Phy/SubGHz_Phy_PingPong/readme.txt 
+  * @file    Applications/SubGHz_Phy/SubGHz_Phy_PingPong/readme.txt
   * @author  MCD Application Team
-  * @brief   This application is a simple demo application software between 2 
-  *          LoRa Objects: a STM32WL Nucleo board and whatever other LoRA Radio  
+  * @brief   This application is a simple demo application software between 2
+  *          LoRa Objects: a STM32WL Nucleo board and whatever other LoRa Radio
   *          board embedding SubGHz_Phy_PingPong application too
   ******************************************************************************
   * @attention
@@ -24,20 +24,21 @@
 
 @par Description
 
-This directory contains a set of source files that implements a Ping-Pong application 
+This directory contains a set of source files that implements a Ping-Pong application
 between two PingPong Devices.
 
-The PingPong Device can be 
-   - a STM32WL Nucleo board 
-   - a Lora Radio expansion board or a B-L072Z-LRWAN1
-It is a simple RX/TX RF link between the two PingPong Devices, one will called be Ping the other will be called Pong. 
-By default, each PingPong Device starts as a master and will transmit a "Ping" message, and then wait for an answer. 
+The PingPong Device can be
+   - a STM32WL Nucleo board
+   - a LoRa Radio expansion board or a B-L072Z-LRWAN1
+The applications aims to show a simple RX/TX RF link between the two PingPong devices,
+one will be called Ping the other will be called Pong.
+By default, each PingPong Device starts as a master and will transmit a "Ping" message, and then wait for an answer.
+At start-up, each PingPong Device has its two LEDs blinking.
+When boards will synchronize (Tx window of one board aligned with Rx window of the other board)
+the Ping Device (board receiving "Ping" msg) will blink green LED and the Pong Device (board receiving "Pong" msg) will blink red LED.
 The first PingPong Device receiving a "Ping" message will become a slave and answers the master with a "Pong" message.
-At start, on STM32WL Nucleo board, if you see the 3 LEDs blinking on the 2 PingPong Device 
-it means that both boards have their RX windows synchronised (and TX windows too). The RX window of the first board 
-should NOT be perfectly synchronised with the second board, there should be one TX window in front of one RX window. 
-You only have to reset one of the two boards, to get rid of this issue.
-When boards are sending and receiving: Blue LED blinks on "Ping" msg received, Red LED blinks on "Pong" msg.
+
+Logs via hyperterminal complement LEDs indicators.
 
   ******************************************************************************
 
@@ -45,10 +46,9 @@ When boards are sending and receiving: Blue LED blinks on "Ping" msg received, R
 
 Applications, SubGHz_Phy, PingPong, SingleCore
 
-@par Directory contents 
+@par Directory contents
 
 
-  - SubGHz_Phy_PingPong/Core/Inc/board_resources.h                              Header for driver at.c module
   - SubGHz_Phy_PingPong/Core/Inc/dma.h                                          This file contains all the function prototypes for
                                                                                 the dma.c file
   - SubGHz_Phy_PingPong/Core/Inc/main.h                                         : Header for main.c file.
@@ -79,7 +79,6 @@ Applications, SubGHz_Phy, PingPong, SingleCore
   - SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_conf.h                          Header of Radio configuration
   - SubGHz_Phy_PingPong/SubGHz_Phy/Target/timer.h                               Wrapper to timer server
 
-  - SubGHz_Phy_PingPong/Core/Src/board_resources.c                              Source file
   - SubGHz_Phy_PingPong/Core/Src/dma.c                                          This file provides code for the configuration
                                                                                 of all the requested memory to memory DMA transfers.
   - SubGHz_Phy_PingPong/Core/Src/main.c                                         : Main program body
@@ -97,27 +96,25 @@ Applications, SubGHz_Phy, PingPong, SingleCore
   - SubGHz_Phy_PingPong/Core/Src/timer_if.c                                     Configure RTC Alarm, Tick and Calendar manager
   - SubGHz_Phy_PingPong/Core/Src/usart.c                                        This file provides code for the configuration
                                                                                 of the USART instances.
-  - SubGHz_Phy_PingPong/Core/Src/usart_if.c                                     Configuration of UART MX driver interface for hyperterminal communication
-  - SubGHz_Phy_PingPong/STM32CubeIDE/Application/Core/syscalls.c                STM32CubeIDE Minimal System calls file
-  - SubGHz_Phy_PingPong/STM32CubeIDE/Application/Core/sysmem.c                  STM32CubeIDE System Memory calls file
+  - SubGHz_Phy_PingPong/Core/Src/usart_if.c                                     Configuration of UART driver interface for hyperterminal communication
+  - SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Core/syscalls.c           STM32CubeIDE Minimal System calls file
+  - SubGHz_Phy_PingPong/STM32CubeIDE/Application/User/Core/sysmem.c             STM32CubeIDE System Memory calls file
   - SubGHz_Phy_PingPong/SubGHz_Phy/App/app_subghz_phy.c                         Application of the SubGHz_Phy Middleware
   - SubGHz_Phy_PingPong/SubGHz_Phy/App/subghz_phy_app.c                         Application of the SubGHz_Phy Middleware
   - SubGHz_Phy_PingPong/SubGHz_Phy/Target/radio_board_if.c                      This file provides an interface layer between MW and Radio Board
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - sys_conf.h, radio_conf.h, mw_log_conf.h, radio_board_if.h, main.h, etc
-    - Careful: 
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
+    - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
 
   -Set Up:
 
@@ -128,9 +125,9 @@ Applications, SubGHz_Phy, PingPong, SingleCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all files and load your image into target memory
   - Do the same for second board
   - Reset the two boards
@@ -138,5 +135,10 @@ In order to make the program work, you must do the following :
   - Open two Terminals, each connected to their respective PingPong Device
   - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
 
+@par How to debug ?
+  - make sure the flag DEBUGGER_ENABLED to 1 in sys_conf.h
+  - simpler to define the flag LOW_POWER_DISABLE to 1 as well
+  - compile, download and attach
+
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/.extSettings b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/.extSettings
new file mode 100644
index 00000000..c42d3da2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/.extSettings
@@ -0,0 +1,6 @@
+[ProjectFiles]
+HeaderPath=..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo
+[Others]
+[Groups]
+Drivers/BSP/STM32WLxx_Nucleo=../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c; ../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c
+Doc=../readme.txt;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
index 45049335..40330641 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM0PLUS_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_CommandRcv_cb     command callback
   * @param  IPCC_IF_AcknowledgeRcv_cb acknowledge callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_AcknowledgeRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_NotificationSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/main.h
index 8386c65a..0ba9167a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -62,35 +61,14 @@ void Error_Handler(void);
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
index 271bfa24..15f9e5f8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 /*#define HAL_UART_MODULE_ENABLED   */
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/sys_app.h
index 2ed00a30..eee9c7ac 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -38,6 +40,10 @@ extern "C" {
 /* currently not supported */
 /* #define ALLOW_KMS_VIA_MBMUX */
 
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -71,29 +77,27 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize MBMUXIF System and send a notification to Cm4 when ready
   */
 void SystemApp_Init(void);
 
 /**
-  * @brief  callback to get the board 64 bits unique ID
-  * @param  unique ID
-  * @retval none
+  * @brief Returns sec and msec based on the systime in use
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
-void GetUniqueId(uint8_t *id);
+void TimestampNow(uint8_t *buff, uint16_t *size);
 
 /**
-  * @brief  callback to get the board 32 bits unique ID (LSB)
-  * @param  none
-  * @retval devAddr Device Address
+  * @brief  Process System Command
+  * @param  ComObj exchange buffer parameter
   */
-uint32_t GetDevAddr(void);
-
-void TimestampNow(uint8_t *buff, uint16_t *size);
 void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj);
 #ifdef ALLOW_KMS_VIA_MBMUX /* currently not supported */
+/**
+  * @brief  Process KMS Command
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Kms_Cmd(MBMUX_ComParam_t *ComObj);
 #endif /* ALLOW_KMS_VIA_MBMUX */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/sys_conf.h
index 3a44ccfe..f026efa4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief CM0PLUS Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
index 6f20721c..3c4d0289 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
@@ -35,7 +37,6 @@ extern "C" {
 #include "stm32_tiny_vsnprintf.h"
 
 #include "mbmuxif_trace.h"
-
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_def.h
index 69763aab..09e554d1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc.c
index 617042e8..1d49b00f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc_if.c
index ad72640a..d8ea5d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,7 +82,7 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* Enable C2AHB3 peripherals clock. */
@@ -89,14 +91,14 @@ void IPCC_IF_Init(void (*IPCC_IF_CommandRcv_cb)(uint32_t channelIdx),
   LL_C2_EXTI_EnableIT_32_63(LL_EXTI_LINE_37);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_37);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccCommandRcv = IPCC_IF_CommandRcv_cb;
   IpccAcknowledgeRcv = IPCC_IF_AcknowledgeRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/main.c
index c409fb96..ecf92015 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/main.c
@@ -109,6 +109,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/rtc.c
index 98bf09f8..995731ad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,10 +71,13 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
index 3dfcda11..eb2e798d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm_if.h"
 
 /* USER CODE BEGIN Includes */
@@ -91,7 +93,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C2STOP_C2STB();
@@ -110,7 +111,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
index d453b28c..c5323b14 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c
@@ -75,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -128,7 +130,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/sys_app.c
index c9dc3bfb..6e339df4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -27,12 +29,11 @@
 #include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-
 #include "msg_id.h"
-#include "features_info.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
 #include "mbmuxif_radio.h"
+#include "features_info.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -50,6 +51,7 @@
 
 /* Private define ------------------------------------------------------------*/
 #define MAX_TS_SIZE (int) 16
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -67,8 +69,6 @@
 /* Private function prototypes -----------------------------------------------*/
 /**
   * @brief Radio NVIC IRQ & MSI Wakeup SystemClock setting
-  * @param none
-  * @retval  none
   */
 static void System_Init(void);
 
@@ -76,16 +76,12 @@ static void System_Init(void);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises MBMUXIF System and send a notification to Cm4 when ready
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   int8_t init_status;
@@ -94,6 +90,7 @@ void SystemApp_Init(void)
   /* USER CODE END SystemApp_Init_1 */
 
   /* RTC_Init: normally already executed by overloading HAL_InitTick(), but need to be sure before notify Cm4 */
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
   /*Init low power manager*/
@@ -111,7 +108,7 @@ void SystemApp_Init(void)
   /* Init Feat_Info table */
   FEAT_INFO_Init();
 
-  /* Note: the trace is initialised in the context of MBMUXIF because it uses the MB on Cm0 side */
+  /* Note: the trace is initialized in the context of MBMUXIF because it uses the MB on Cm0 side */
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
@@ -120,19 +117,14 @@ void SystemApp_Init(void)
 
   System_Init();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Func */
+  DBG_ProbesInit();
 
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
-  */
 void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -157,19 +149,19 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   switch (ComObj->MsgId)
   {
     case SYS_OTHER_MSG_ID:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_msg_id */
 
-  /* USER CODE END Process_Sys_Cmd_switch_msg_id */
+      /* USER CODE END Process_Sys_Cmd_switch_msg_id */
       break;
 
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
+    /* USER CODE BEGIN Process_Sys_Cmd_switch_case */
 
-  /* USER CODE END Process_Sys_Cmd_switch_case */
+    /* USER CODE END Process_Sys_Cmd_switch_case */
 
     default:
-  /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
+      /* USER CODE BEGIN Process_Sys_Cmd_switch_default */
 
-  /* USER CODE END Process_Sys_Cmd_switch_default */
+      /* USER CODE END Process_Sys_Cmd_switch_default */
       break;
   }
 
@@ -181,16 +173,16 @@ void Process_Sys_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Cmd_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -199,8 +191,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -213,66 +203,9 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-void GetUniqueId(uint8_t *id)
-{
-  /* USER CODE BEGIN GetUniqueId_1 */
-
-  /* USER CODE END GetUniqueId_1 */
-  uint32_t val = 0;
-  val = LL_FLASH_GetUDN();
-  if (val == 0xFFFFFFFF)  /* Normally this should not happen */
-  {
-    uint32_t ID_1_3_val = HAL_GetUIDw0() + HAL_GetUIDw2();
-    uint32_t ID_2_val = HAL_GetUIDw1();
-
-    id[7] = (ID_1_3_val) >> 24;
-    id[6] = (ID_1_3_val) >> 16;
-    id[5] = (ID_1_3_val) >> 8;
-    id[4] = (ID_1_3_val);
-    id[3] = (ID_2_val) >> 24;
-    id[2] = (ID_2_val) >> 16;
-    id[1] = (ID_2_val) >> 8;
-    id[0] = (ID_2_val);
-  }
-  else  /* Typical use case */
-  {
-    id[7] = val & 0xFF;
-    id[6] = (val >> 8) & 0xFF;
-    id[5] = (val >> 16) & 0xFF;
-    id[4] = (val >> 24) & 0xFF;
-    val = LL_FLASH_GetDeviceID();
-    id[3] = val & 0xFF;
-    val = LL_FLASH_GetSTCompanyID();
-    id[2] = val & 0xFF;
-    id[1] = (val >> 8) & 0xFF;
-    id[0] = (val >> 16) & 0xFF;
-  }
-
-  /* USER CODE BEGIN GetUniqueId_2 */
-
-  /* USER CODE END GetUniqueId_2 */
-}
-
-uint32_t GetDevAddr(void)
-{
-  uint32_t val = 0;
-  /* USER CODE BEGIN GetDevAddr_1 */
-
-  /* USER CODE END GetDevAddr_1 */
-  val = LL_FLASH_GetUDN();
-  if (val == 0xFFFFFFFF)
-  {
-    val = ((HAL_GetUIDw0()) ^ (HAL_GetUIDw1()) ^ (HAL_GetUIDw2()));
-  }
-  /* USER CODE BEGIN GetDevAddr_2 */
-
-  /* USER CODE END GetDevAddr_2 */
-  return val;
-}
-
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
 static void System_Init(void)
@@ -284,7 +217,7 @@ static void System_Init(void)
   LL_C2_PWR_DisableInternWU();
 
   /**< Disable all wakeup interrupt on CPU2  except RTC(17,20) IPCC_CPU2(37), Radio(44,45), Debugger(46) */
-  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach onlt Cm4 */
+  /* This is to avoid that Cm0 woke up as consequence of IRQs that are meant to reach only Cm4 */
   LL_C2_EXTI_DisableIT_0_31(~0  & (~(LL_EXTI_LINE_17 | LL_EXTI_LINE_20)));
   LL_C2_EXTI_DisableIT_32_63((~0) & (~(LL_EXTI_LINE_37 | (0x1U << (7u)) | LL_EXTI_LINE_44 | LL_EXTI_LINE_45 | LL_EXTI_LINE_46)));
 
@@ -345,10 +278,7 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -363,13 +293,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -380,13 +308,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/timer_if.c
index 6133e380..6405002c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -106,6 +106,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -155,7 +166,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -175,9 +185,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -185,7 +195,7 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A and Alarm B enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A and Alarm B enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A); /* handled by Cm4 */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_B); /* handled by Cm0plus */
     /*overload RTC feature enable*/
@@ -193,11 +203,14 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -280,64 +293,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,9 +379,9 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
 {
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_1 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_1 */
   MBMUX_ComParam_t *com_obj;
 
   if (MBMUXIF_GetCpusSynchroFlag() == CPUS_BOOT_SYNC_RTC_REGISTERED)
@@ -376,9 +395,9 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
       MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
     }
   }
-  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_2 */
 
-  /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
+  /* USER CODE END HAL_RTC_AlarmAEventCallback_2 */
 }
 
 void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
@@ -386,7 +405,7 @@ void HAL_RTCEx_AlarmBEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTCEx_AlarmBEventCallback_Last */
 
   /* USER CODE END HAL_RTCEx_AlarmBEventCallback_Last */
@@ -409,6 +428,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -418,16 +438,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -454,24 +474,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/features_info.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/features_info.c
index 3a0e8a23..50ca0a8c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/features_info.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/features_info.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stddef.h>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.c
index 013f7100..ef887470 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -51,15 +54,53 @@
 
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComTable_t *p_MBMUX_ComTable;
+static MBMUX_MsgCbPointersTab_t MBMUX_MsgCbPointersTabCm0 UTIL_MEM_ALIGN(4) ;
+static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
+static uint32_t unsecure_sram1_end;
+static uint32_t unsecure_sram2_end;
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Retrieve Sram Security Configuration from AB and store in static global var
+  */
+static void MBMUX_RetrieveSecureSramConfig(void);
+
+/**
+  * @brief   verify if buffer is in the allowed SRAM range otherwise ErrorHandler
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize  buffer size
+  * @retval  pointer to validated address
+  */
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -67,11 +108,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -80,27 +116,23 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   uint8_t i;
   IPCC_IF_Init(MBMUX_IsrCommandRcvCb, MBMUX_IsrAcknowledgeRcvCb);
 
-  p_MBMUX_ComTable = pMBMUX_ComTable;
+  /* Retrieve SRAM  Security Config from Option Bytes */
+  MBMUX_RetrieveSecureSramConfig();
+  /* Validate pMBMUX_ComTable address range */
+  p_MBMUX_ComTable = (MBMUX_ComTable_t *) MBMUX_SEC_VerifySramBufferPtr((uint32_t *) pMBMUX_ComTable, sizeof(MBMUX_ComTable_t));
 
   for (i = 0; i < MBMUX_CHANNEL_NUMBER; i++)
   {
-    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
-    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[i].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+    p_MBMUX_ComTable->MBCmdRespParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
+    p_MBMUX_ComTable->MBNotifAckParam[i].MsgCm0plusCb = MBMUX_IsrNotRegistered; /* not used anymore */
   }
   /* USER CODE BEGIN MBMUX_Init_Last */
 
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval  return -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
-  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj))
 {
   uint8_t channel_idx;
@@ -116,15 +148,19 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   {
     /* channel has been registered by CM4 registered */
     channel_idx = check_existing_feature_registration;
-    if (ComType == MBMUX_CMD_RESP)
-    {
-      p_MBMUX_ComTable->MBCmdRespParam[channel_idx].MsgCm0plusCb = MsgCb;
-    }
-    else
+
+    if (channel_idx != MB_CHANNEL_NOT_REGISTERED)
     {
-      p_MBMUX_ComTable->MBNotifAckParam[channel_idx].MsgCm0plusCb = MsgCb;
+      if (ComType == MBMUX_CMD_RESP)
+      {
+        MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      else
+      {
+        MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channel_idx].MsgCm0plusCb = MsgCb;
+      }
+      ret = channel_idx;
     }
-    ret = channel_idx;
   }
   /* USER CODE BEGIN MBMUX_RegisterFeatureC_Last */
 
@@ -132,13 +168,6 @@ int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -155,11 +184,11 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
       /* Make sure to clear pending IRQ from Cmd before unregistering the callback */
       IPCC_IF_ResponseSnd(mb_ch);
 
-      p_MBMUX_ComTable->MBCmdRespParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
     else
     {
-      p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
+      MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[mb_ch].MsgCm0plusCb = MBMUX_IsrNotRegistered;
     }
   }
   /* USER CODE BEGIN MBMUX_UnregisterFeature_Last */
@@ -167,12 +196,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -199,11 +222,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Notif to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_NotificationSnd_1 */
@@ -214,7 +232,7 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   mb_ch = MBMUX_GetFeatureChIdx(e_featID, MBMUX_NOTIF_ACK);
   if (p_MBMUX_ComTable->MBNotifAckParam[mb_ch].ParamCnt > p_MBMUX_ComTable->MBNotifAckParam[mb_ch].BufSize)
   {
-    while (1) {}
+    Error_Handler();
   }
   return IPCC_IF_NotificationSnd(mb_ch);
   /* USER CODE BEGIN MBMUX_NotificationSnd_Last */
@@ -222,11 +240,6 @@ int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_NotificationSnd_Last */
 }
 
-/**
-  * @brief Send response to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_ResponseSnd_1 */
@@ -241,17 +254,118 @@ uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_ResponseSnd_Last */
 }
 
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *pbuf_validated = NULL;
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_1 */
+
+  pbuf_validated = MBMUX_SEC_VerifySramBuffer(pBufferAddress, bufferSize);
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBufferPtr_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBufferPtr_Last */
+  return (pbuf_validated);
+}
+
 /* USER CODE BEGIN EFD */
 
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
+static uint32_t *MBMUX_SEC_VerifySramBuffer(uint32_t *pBufferAddress, uint32_t bufferSize)
+{
+  uint32_t *p_validated_address = NULL;
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_1 */
+
+  /* Check the global security is enabled */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SYSTEM_AND_FLASH_ENABLE) != 0)
+  {
+    /** The security is enabled */
+
+    if (((((uint32_t)(pBufferAddress)) >= SRAM1_BASE)
+         && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram1_end)) ||
+        ((((uint32_t)(pBufferAddress)) >= SRAM2_BASE) && ((((uint32_t)(pBufferAddress)) + bufferSize) <= unsecure_sram2_end))
+       )
+    {
+      /* check against (pBufferAddress + bufferSize) overflow */
+      if (((uint32_t)pBufferAddress <= unsecure_sram2_end) && (bufferSize < (SRAM1_SIZE + SRAM2_SIZE)))
+      {
+        /** The address is validated because part of the unsecure SRAM  */
+        p_validated_address = pBufferAddress;
+      }
+      else
+      {
+        /**
+          * The address is outside the unsecure SRAM
+          * This is considered as a security attack
+          * Hold everything to avoid any security issue
+          */
+        Error_Handler();
+      }
+    }
+    else
+    {
+      /**
+        * The address is outside the unsecure SRAM
+        * This is considered as a security attack
+        * Hold everything to avoid any security issue
+        */
+      Error_Handler();
+    }
+  }
+  else
+  {
+    /** The security is disabled */
+    p_validated_address = pBufferAddress;
+  }
+
+  /* USER CODE BEGIN MBMUX_SEC_VerifySramBuffer_Last */
+
+  /* USER CODE END MBMUX_SEC_VerifySramBuffer_Last */
+  return (p_validated_address);
+}
+
+static void MBMUX_RetrieveSecureSramConfig(void)
+{
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_1 */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_1 */
+  /* Get the Dual boot configuration status */
+  HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
+
+  /* Check the SRAM1 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM1_DISABLE) != 0)
+  {
+    /** SRAM1 is not secure */
+    unsecure_sram1_end = SRAM1_BASE + SRAM1_SIZE;
+  }
+  else
+  {
+    /** part of SRAM1 is secure */
+    unsecure_sram1_end = OptionsBytesStruct.SecureSRAM1StartAddr;
+  }
+
+  /** Check the SRAM2 security */
+  if ((OptionsBytesStruct.SecureMode & OB_SECURE_SRAM2_DISABLE) != 0)
+  {
+    /** SRAM2 is not secure */
+    unsecure_sram2_end = SRAM2_BASE + SRAM2_SIZE;
+  }
+  else
+  {
+    /** part of SRAM2 is secure */
+    unsecure_sram2_end = OptionsBytesStruct.SecureSRAM2StartAddr;
+  }
+  /* USER CODE BEGIN MBMUX_RetrieveSecureSramConfig_Last */
+
+  /* USER CODE END MBMUX_RetrieveSecureSramConfig_Last */
+}
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_1 */
@@ -260,18 +374,13 @@ static void MBMUX_IsrCommandRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBCmdRespParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBCmdRespParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBCmdRespCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrCommandRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrCommandRcvCb_Last */
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_1 */
@@ -280,19 +389,13 @@ static void MBMUX_IsrAcknowledgeRcvCb(uint32_t channelIdx)
   /* retrieve pointer to com params */
   void *com_obj = (void *) &p_MBMUX_ComTable->MBNotifAckParam[channelIdx];
   /* call registered callback */
-  p_MBMUX_ComTable->MBNotifAckParam[channelIdx].MsgCm0plusCb(com_obj);
+  MBMUX_MsgCbPointersTabCm0.MBNotifAckCb[channelIdx].MsgCm0plusCb(com_obj);
   /* USER CODE BEGIN MBMUX_IsrAcknowledgeRcvCb_Last */
 
   /* USER CODE END MBMUX_IsrAcknowledgeRcvCb_Last */
   return;
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -304,17 +407,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.h
index e91b1547..a938e544 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM0PLUS_H__
@@ -52,19 +54,58 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @retval  -1 if ch hasn't been registered by CM4, otherwise the nr of the assigned ch
+  */
 int8_t MBMUX_RegisterFeatureCallback(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj));
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the com object retrieved from shared memory
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Notif to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_NotificationSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send response to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_ResponseSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
+/**
+  * @brief   Double check buffer pointer (to avoid fault HW injection attacks)
+  * @param   pBufferAddress buffer start address
+  * @param   bufferSize buffer size
+  * @return  pointer to validated address
+  */
+uint32_t *MBMUX_SEC_VerifySramBufferPtr(uint32_t *pBufferAddress, uint32_t bufferSize);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
index 3ba64a2b..fe5fd070 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -57,22 +59,33 @@ static MBMUX_ComParam_t *RadioComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO task to process the command
+  */
 static void MBMUXIF_TaskRadioCmdRcv(void);
+
+/**
+  * @brief   RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
+  */
 static void MBMUXIF_TaskRadioNotifSnd(void);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief   Registers RADIO feature to the mailbox and to the sequencer
-  * @param   none
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   int8_t ret;
@@ -99,11 +112,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_1 */
@@ -112,7 +120,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureNotifComPtr_Last */
@@ -120,11 +128,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendNotif(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendNotif_1 */
@@ -136,11 +139,6 @@ void MBMUXIF_RadioSendNotif(void)
   /* USER CODE END MBMUXIF_RadioSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Radio-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendResp(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_1 */
@@ -148,7 +146,7 @@ void MBMUXIF_RadioSendResp(void)
   /* USER CODE END MBMUXIF_RadioSendResp_1 */
   if (MBMUX_ResponseSnd(FEAT_INFO_RADIO_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_RadioSendResp_Last */
 
@@ -160,11 +158,6 @@ void MBMUXIF_RadioSendResp(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioAckRcvCb_1 */
@@ -176,11 +169,6 @@ static void MBMUXIF_IsrRadioAckRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioAckRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioCmdRcvCb_1 */
@@ -193,11 +181,6 @@ static void MBMUXIF_IsrRadioCmdRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioCmdRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the command
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioCmdRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioCmdRcv_1 */
@@ -209,11 +192,6 @@ static void MBMUXIF_TaskRadioCmdRcv(void)
   /* USER CODE END MBMUXIF_TaskRadioCmdRcv_Last */
 }
 
-/**
-  * @brief  RADIO task to use the IPCC and the blocking WaitEvt on Task rather then Irq
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifSnd(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_1 */
@@ -225,7 +203,7 @@ static void MBMUXIF_TaskRadioNotifSnd(void)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifSnd_Last */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
index 44fab48f..7e226c6c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM0PLUS application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM0PLUS_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureNotifComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Notif via Ipcc and Wait for the ack
+  */
 void MBMUXIF_RadioSendNotif(void);
+
+/**
+  * @brief   Sends a Radio-Resp  via Ipcc without waiting for the response
+  */
 void MBMUXIF_RadioSendResp(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
index 9c6b7525..d7ac93e4 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM0 applic to handle the SYSTEM MBMUX channel
+  * @brief   allows CM0 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -62,27 +64,59 @@ static MBMUX_ComParam_t *SystemComObj;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   SYSTEM acknowledge callbacks: set event to release waiting task
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM command callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM task to process the command
+  */
 static void MBMUXIF_TaskSystemCmdRcv(void);
+
+/**
+  * @brief   SYSTEM PRIO_A acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_A command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B acknowledge callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj);
+
+/**
+  * @brief   SYSTEM PRIO_B command callbacks:
+  * @param   ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj);
 
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf);
+/**
+  * @brief   Retrieve the feature that needs MbMux registration and call correspondent Init
+  * @param   pBuf pointer to parameter buffer of the command
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  */
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf);
 
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
@@ -117,7 +151,7 @@ int8_t MBMUXIF_SystemInit(void)
 
   if (ret >= 0)
   {
-    /* Notify Cm4 that MBMUXIF_System and RTC are initialised on Cm0 side */
+    /* Notify Cm4 that MBMUXIF_System and RTC are initialized on Cm0 side */
     /* as alternative MBMUXIF_SystemSendNotif() can be used as far Cm4 treats it on Irq */
     while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
     pMb_RefTable->SynchronizeCpusAtBoot = CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED;
@@ -129,14 +163,6 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Get synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetCpusSynchroFlag */
@@ -145,11 +171,6 @@ uint16_t MBMUXIF_GetCpusSynchroFlag(void)
   return pMb_RefTable->SynchronizeCpusAtBoot;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_1 */
@@ -158,7 +179,7 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   /* USER CODE BEGIN MBMUXIF_GetSystemFeatureNotifComPtr_Last */
 
@@ -166,11 +187,6 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef System
   return com_param_ptr;
 }
 
-/**
-  * @brief Sends a System-Notif via Ipcc and Wait for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_1 */
@@ -182,18 +198,13 @@ void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_1 */
@@ -201,26 +212,21 @@ void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendNotif_NoWait_Last */
 
   /* USER CODE END MBMUXIF_SystemSendNotif_NoWait_Last */
 }
 
-/**
-  * @brief Sends a System-Resp  via Ipcc without waiting for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_1 */
 
-  /* USER CODE END EFMBMUXIF_SystemSendResp_1 */
+  /* USER CODE END MBMUXIF_SystemSendResp_1 */
   if (MBMUX_ResponseSnd(SystemPrioFeat) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendResp_Last */
 
@@ -237,7 +243,7 @@ int16_t MBMUXIF_ChipRevId(void)
   int16_t ret = pMb_RefTable->ChipRevId;
   /* USER CODE BEGIN MBMUXIF_ChipRevId */
 
-  /* USER CODE BEGIN MBMUXIF_ChipRevId */
+  /* USER CODE END MBMUXIF_ChipRevId */
   return ret ;
 }
 
@@ -246,35 +252,24 @@ int16_t MBMUXIF_ChipRevId(void)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM acknowledge callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_1 */
   UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemAckRcv);
   /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemAckRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemAckRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM command callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 {
   SystemComObj = (MBMUX_ComParam_t *) ComObj;
-  uint32_t *com_buffer = SystemComObj->ParamBuf;
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_1 */
 
   /* process Command on Isr or schedule a task*/
   switch (SystemComObj->MsgId)
@@ -284,14 +279,9 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
       MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
       break;
 
-    case SYS_REGISTER_FEATURE_MSG_ID:
-      SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
-      MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
-      break;
-
     /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Switch */
+    /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Switch */
 
     default:
       UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbSystemCmdRcv), CFG_SEQ_Prio_0);
@@ -300,89 +290,68 @@ static void MBMUXIF_IsrSystemCmdRcvCb(void *ComObj)
 
   /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemCmdRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrSystemCmdRcvCb_Last */
 
 }
 
-/**
-  * @brief  SYSTEM task to process the command
-  * @param  none
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemCmdRcv(void)
 {
+  uint32_t *com_buffer = MBMUX_SEC_VerifySramBufferPtr(SystemComObj->ParamBuf, SystemComObj->BufSize);
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_1 */
-  Process_Sys_Cmd(SystemComObj);
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_1 */
+  if (SystemComObj->MsgId == SYS_REGISTER_FEATURE_MSG_ID)
+  {
+    SystemComObj->ReturnVal = (uint32_t) MBMUXIF_FeatureCm0plusRegistrationCmd(com_buffer);
+    MBMUX_ResponseSnd(FEAT_INFO_SYSTEM_ID);
+  }
+  else
+  {
+    Process_Sys_Cmd(SystemComObj);
+  }
   /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
 
-  /* USER CODE BEGIN MBMUXIF_TaskSystemCmdRcv_Last */
+  /* USER CODE END MBMUXIF_TaskSystemCmdRcv_Last */
 
 }
 
-/**
-  * @brief  SYSTEM PRIO_A acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioAAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioAAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioAAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioACmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioACmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioACmdRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B acknowledge callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBAckRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBAckRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B command callbacks:
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBCmdRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
 
-  /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBCmdRcvCb */
+  /* USER CODE END MBMUXIF_IsrSystemPrioBCmdRcvCb */
 }
 
-/**
-  * @brief  Retrieve the feature that needs MbMux registration and call correspondent Init
-  * @param  pointer to parameter buffer of the command
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  */
-static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
+static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *pBuf)
 {
   int8_t ret = -2; /* feature not supported */
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_1 */
 
-  switch (ParamBuf[0])
+  switch (pBuf[0])
   {
     case FEAT_INFO_SYSTEM_CMD_PRIO_A_ID:
       ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_SYSTEM_CMD_PRIO_A_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemPrioACmdRcvCb);
@@ -406,6 +375,9 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_TRACE_ID:
+      /* USER CODE BEGIN FEAT_INFO_TRACE_ID */
+
+      /* USER CODE END FEAT_INFO_TRACE_ID */
       ret = MBMUXIF_TraceInit(VERBOSE_LEVEL);
       break;
 
@@ -415,16 +387,22 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
       break;
 
     case FEAT_INFO_LORAWAN_ID:
+      /* USER CODE BEGIN FEAT_INFO_LORAWAN_ID */
+
+      /* USER CODE END FEAT_INFO_LORAWAN_ID */
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Lora not supported\r\n");
       break;
 
     case FEAT_INFO_SIGFOX_ID:
+      /* USER CODE BEGIN FEAT_INFO_SIGFOX_ID */
+
+      /* USER CODE END FEAT_INFO_SIGFOX_ID */
       APP_LOG(TS_OFF, VLEVEL_L, "CM0PLUS : Sigfox not supported\r\n");
       break;
 
     /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
-    /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
+    /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Switch */
 
     default:
       break;
@@ -432,7 +410,7 @@ static int8_t MBMUXIF_FeatureCm0plusRegistrationCmd(uint32_t *ParamBuf)
 
   /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
-  /* USER CODE BEGIN MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
+  /* USER CODE END MBMUXIF_FeatureCm0plusRegistrationCmd_Last */
 
   return ret;
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
index 01dff052..f780cdde 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM0PLUS application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM0PLUS_H__
@@ -54,11 +56,44 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   Get synchro flag between the two CPUs
+  * @return  flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *                0x5555: Cm0 allowed to run its MBMUX_Init
+  *                0xAAAA: Cm0 has completed initialization
+  *                0x9999: RTC PRIO CHANNEL has been registered
+  */
 uint16_t MBMUXIF_GetCpusSynchroFlag(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Notif
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureNotifComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Notif via Ipcc and Wait for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a Trace-Notif via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendNotif_NoWait(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Resp  via Ipcc without waiting for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -66,6 +101,10 @@ void MBMUXIF_SystemSendResp(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Get the chip revision ID from Mbmux table
+  * @retval  Values between Min_Data=0x00 and Max_Data=0xFFFF
+  */
 int16_t MBMUXIF_ChipRevId(void);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
index 04c9f7b6..05704d23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -25,6 +27,7 @@
 #include "msg_id.h"
 #include "stm32_seq.h"
 #include "stm32_adv_trace.h"
+#include "utilities_def.h"   /* for CFG_SEQ_Evt_MbTraceAckRcv */
 
 /* USER CODE BEGIN Includes */
 
@@ -46,15 +49,43 @@
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
+/**
+  * @brief util trace callback
+  */
+static void (*TraceUtilCpltCallback)(void *);
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-
+/**
+  * @brief   TRACE acknowledge callbacks: set event to release waiting task
+  *          and schedule callback to check if other trace need to be sent to CM4
+  * @param   ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj);
-static void (*TraceUtilCpltCallback)(void *);
+
+/**
+  * @brief   Call callback to check if other trace need to be sent to CM4
+  */
+static void MBMUXIF_TaskTraceAckRcv(void);
+
+/**
+  * @brief   The trace utilities inform the mbmuxif which func to call
+  *          once the Mb transmission is completed
+  * @param   cb "stm32_adv_trace.c callback"
+  * @retval  0
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *));
+
+/**
+  * @brief   TraceBufferSend sends the formatted buffer to CM4 which
+  *          posts it to the circular queue for printing
+  * @param   buf string to be printed
+  * @param   bufSize size of buffer
+  * @retval  0 when ok, -1 when circular queue is full
+  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize);
 
 /* USER CODE BEGIN PFP */
@@ -75,12 +106,6 @@ const UTIL_ADV_TRACE_Driver_s UTIL_TraceDriver =
 /* USER CODE END PTD */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @retval  0: OK; -1: if ch hasn't been registered by CM4
-  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
-  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
 {
   int8_t ret;
@@ -92,6 +117,8 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   ret = MBMUX_RegisterFeatureCallback(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK, MBMUXIF_IsrTraceAckRcvCb);
   if (ret >= 0)
   {
+    UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbTraceAckRcv), UTIL_SEQ_RFU, MBMUXIF_TaskTraceAckRcv);
+
     /*Initialize the terminal */
     UTIL_ADV_TRACE_Init();
     UTIL_ADV_TRACE_RegisterTimeStampFunction(TimestampNow);
@@ -107,11 +134,6 @@ int8_t MBMUXIF_TraceInit(uint8_t verboseLevel)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Trace feature Notif
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_1 */
@@ -120,7 +142,7 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_TRACE_ID, MBMUX_NOTIF_ACK);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetTraceFeatureNotifComPtr_Last */
@@ -128,11 +150,6 @@ MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void)
   /* USER CODE END MBMUXIF_GetTraceFeatureNotifComPtr_Last */
 }
 
-/**
-  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendNotif_NoWait(void)
 {
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_1 */
@@ -140,7 +157,7 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
   /* USER CODE END MBMUXIF_TraceSendNotif_NoWait_1 */
   if (MBMUX_NotificationSnd(FEAT_INFO_TRACE_ID) != 0)
   {
-    while (1) {} /* ErrorHandler(); */
+    Error_Handler();
   }
   /* USER CODE BEGIN MBMUXIF_TraceSendNotif_NoWait_Last */
 
@@ -152,14 +169,6 @@ void MBMUXIF_TraceSendNotif_NoWait(void)
 /* USER CODE END EFD */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief The trace utilities inform the mbmuxif which func to call
-  *        once the Mb transmission is completed
-  * @param:  "stm32_adv_trace.c callback"
-  * @retval: none
-  */
-
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferInit_1 */
@@ -172,26 +181,23 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferInit(void (*cb)(void *))
   /* USER CODE END MBMUXIF_TraceBufferInit_Last */
 }
 
-/**
-  * @brief TraceBufferSend sends the formatted buffer to CM4 which
-  *        posts it to the circular queue for printing
-  * @param:  strFormat: string to be printed
-  * @retval: 0 when ok, -1 when circular queue is full
-  */
 static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bufSize)
 {
   /* USER CODE BEGIN MBMUXIF_TraceBufferSend_1 */
 
   /* USER CODE END MBMUXIF_TraceBufferSend_1 */
   MBMUX_ComParam_t *com_obj;
+  uint32_t *pbuf_validated = NULL;
 
-  /* notify CM4 that CM0PLUS is initialised */
+  /* notify CM4 that CM0PLUS is initialized */
   com_obj = MBMUXIF_GetTraceFeatureNotifComPtr();
   if (com_obj != NULL)
   {
+    pbuf_validated = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+
     com_obj->MsgId = TRACE_SEND_MSG_ID;
-    com_obj->ParamBuf[0] = (uint32_t) buf;
-    com_obj->ParamBuf[1] = (uint32_t) bufSize;
+    pbuf_validated[0] = (uint32_t) buf;
+    pbuf_validated[1] = (uint32_t) bufSize;
     com_obj->ParamCnt = 2;
     MBMUXIF_TraceSendNotif_NoWait();
   }
@@ -202,24 +208,28 @@ static UTIL_ADV_TRACE_Status_t MBMUXIF_TraceBufferSend(uint8_t *buf, uint16_t bu
 }
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief  TRACE acknowledge callbacks: set event to release waiting task
-  *             and use callback to check if other trace need to be sent to CM4
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceAckRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_1 */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_1 */
-  TraceUtilCpltCallback(NULL);
+  UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbTraceAckRcv); /* not necessary */
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_MbTraceAckRcv), CFG_SEQ_Prio_0);
   /* USER CODE BEGIN MBMUXIF_IsrTraceAckRcvCb_Last */
 
   /* USER CODE END MBMUXIF_IsrTraceAckRcvCb_Last */
 }
 
+static void MBMUXIF_TaskTraceAckRcv(void)
+{
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_1 */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_1 */
+  TraceUtilCpltCallback(NULL);
+  /* USER CODE BEGIN MBMUXIF_TaskTraceAckRcv_Last */
+
+  /* USER CODE END MBMUXIF_TaskTraceAckRcv_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
index 490321d2..8aad9276 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM0PLUS applic to register and handle TRACE via MBMUX
+  * @brief   API for CM0PLUS application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM0PLUS_H__
@@ -52,8 +54,23 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers TRACE feature to the mailbox
+  * @param   verboseLevel level of trace verbosity
+  * @retval  0: OK; -1: if ch hasn't been registered by CM4
+  * @note    this function is supposed to be called by the System on request (Cmd) of CM4
+  */
 int8_t MBMUXIF_TraceInit(uint8_t verboseLevel);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Trace feature Notif
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetTraceFeatureNotifComPtr(void);
+
+/**
+  * @brief Sends a Trace-Notif via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendNotif_NoWait(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
index c09f8d55..063d379e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -47,7 +49,6 @@
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
 
 /* USER CODE BEGIN PD */
 
@@ -59,7 +60,15 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_S
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-static  RadioEvents_t    radioevents_mbwrapper;
+/**
+  * @brief radio buffer to exchange data between CM4 and CM0+
+  */
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM2") uint8_t aRadioMbWrapRxBuffer[RADIO_RX_BUF_SIZE];
+
+/**
+  * @brief local structure of radio callbacks for command processes
+  */
+static  RadioEvents_t radioevents_mbwrapper;
 
 /* USER CODE BEGIN PV */
 
@@ -79,10 +88,10 @@ static void RadioTxTimeout_mbwrapper(void);
 /*!
  * \brief Rx Done callback prototype.
  *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
+ * \param[in] payload Received buffer pointer
+ * \param[in] size    Received buffer size
+ * \param[in] rssi    RSSI value computed while receiving the frame [dBm]
+ * \param[in] snr     Raw SNR value given by the radio hardware
  *                     FSK : N/A ( set to 0 )
  *                     LoRa: SNR value in dB
  */
@@ -108,13 +117,15 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
   /* USER CODE BEGIN Process_Radio_Cmd_1 */
 
   /* USER CODE END Process_Radio_Cmd_1 */
-  uint32_t *com_buffer = ComObj->ParamBuf;;
+  uint32_t *com_buffer = NULL;
   uint32_t ret_uint;
   int32_t ret_int;
   RadioState_t status;
 
   APP_LOG(TS_ON, VLEVEL_H, ">CM0PLUS(Radio)\r\n");
 
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(ComObj->ParamBuf, ComObj->BufSize);
+
   /* process Command */
   switch (ComObj->MsgId)
   {
@@ -242,7 +253,7 @@ void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj)
       ComObj->ReturnVal = 0; /* */
       break;
 
-    case RADIO_SET_TX_CONTINOUS_WAVE_ID:
+    case RADIO_SET_TX_CONTINUOUS_WAVE_ID:
       Radio.SetTxContinuousWave(com_buffer[0], (int8_t) com_buffer[1], (uint16_t) com_buffer[2]);
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -411,16 +422,26 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
 
   /* USER CODE END RadioRxDone_mbwrapper_1 */
   MBMUX_ComParam_t *com_obj;
-  uint32_t *com_buffer ;
+  uint32_t *com_buffer = NULL ;
   uint16_t i = 0;
 
   /* copy data from Cm0 private memory to shared memory */
-  UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  if (payload != NULL)
+  {
+    UTIL_MEM_cpy_8(aRadioMbWrapRxBuffer, payload, size);
+  }
 
   com_obj = MBMUXIF_GetRadioFeatureNotifComPtr();
   com_obj->MsgId = RADIO_RX_DONE_CB_ID;
-  com_buffer = com_obj->ParamBuf;
-  com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  com_buffer = MBMUX_SEC_VerifySramBufferPtr(com_obj->ParamBuf, com_obj->BufSize);
+  if (payload == NULL)
+  {
+    com_buffer[i++] = (uint32_t)NULL;
+  }
+  else
+  {
+    com_buffer[i++] = (uint32_t) aRadioMbWrapRxBuffer;
+  }
   com_buffer[i++] = (uint32_t) size;
   com_buffer[i++] = (uint32_t) rssi;
   com_buffer[i++] = (uint32_t) snr;
@@ -435,7 +456,7 @@ static void RadioRxDone_mbwrapper(uint8_t *payload, uint16_t size, int16_t rssi,
   /* once event is received and semaphore released: */
 
   /* Notice: current needs don't require to copy back data from aRadioMbWrapRxBuffer to payload
-     this migh be requested just if the buffer should be processed by the applic and the stack */
+     this might be requested just if the buffer should be processed by the application and the stack */
   /* UTIL_MEM_cpy_8(payload, aRadioMbWrapRxBuffer, size); */
   return;
   /* USER CODE BEGIN RadioRxDone_mbwrapper_2 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
index 4b3da2cd..ac6a70d3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM0PLUS_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  This function processes the radio events callbacks from CM4
+  * @param  ComObj exchange buffer parameter
+  */
 void Process_Radio_Cmd(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c
index b5133c1b..01779d9c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_subghz_phy.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_subghz_phy.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.h
index 94916fb2..ec85aa39 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_subghz_phy.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SUBGHZ_PHY_H__
 #define __APP_SUBGHZ_PHY_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init SubGHz Radio Application
-  * @param None
-  * @retval None
   */
 void MX_SubGHz_Phy_Init(void);
 
 /**
   * @brief  SubGHz Radio Application Process
-  * @param None
-  * @retval None
   */
 void MX_SubGHz_Phy_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_version.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_version.h
index cd32652c..23c023af 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/mw_log_conf.h
index 30bb33de..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_board_if.c
index 43ea55a8..d4c34621 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -60,45 +63,23 @@ int32_t RBI_Init(void)
 
   /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_Init here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_Init_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_Init_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
-  /* USER CODE BEGIN RBI_Init_3 */
-
-  /* USER CODE END RBI_Init_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
@@ -107,32 +88,23 @@ int32_t RBI_DeInit(void)
 
   /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_DeInit here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_DeInit_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_DeInit_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_DeInit_3 */
-
-  /* USER CODE END RBI_DeInit_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
@@ -141,58 +113,24 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 
   /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
-
-  return 0;
 #else
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  int32_t retcode = 0;
   /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_ConfigRFSwitch_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_ConfigRFSwitch_3 */
-
-  /* USER CODE END RBI_ConfigRFSwitch_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
@@ -201,44 +139,23 @@ int32_t RBI_GetTxConfig(void)
 
   /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_GetTxConfig();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
 #else
+  /* 2/ Or implement RBI_GetTxConfig here */
+  int32_t retcode = RBI_CONF_RFO;
   /* USER CODE BEGIN RBI_GetTxConfig_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_GetTxConfig_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetTxConfig_3 */
-
-  /* USER CODE END RBI_GetTxConfig_3 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
-  /* USER CODE BEGIN RBI_GetWakeUpTime_1 */
-
-  /* USER CODE END RBI_GetWakeUpTime_1 */
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
-#else
-  /* USER CODE BEGIN RBI_GetWakeUpTime_2 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime_2 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_GetWakeUpTime_3 */
-
-  /* USER CODE END RBI_GetWakeUpTime_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
@@ -247,21 +164,23 @@ int32_t RBI_IsTCXO(void)
 
   /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsTCXO here */
+  int32_t retcode = IS_TCXO_SUPPORTED;
   /* USER CODE BEGIN RBI_IsTCXO_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsTCXO_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsTCXO_3 */
-
-  /* USER CODE END RBI_IsTCXO_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
@@ -270,21 +189,23 @@ int32_t RBI_IsDCDC(void)
 
   /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
+  /* 2/ Or implement RBI_IsDCDC here */
+  int32_t retcode = IS_DCDC_SUPPORTED;
   /* USER CODE BEGIN RBI_IsDCDC_2 */
-#error user to provide its board code or to call his board driver functions
+#warning user to provide its board code or to call his board driver functions
   /* USER CODE END RBI_IsDCDC_2 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
-  /* USER CODE BEGIN RBI_IsDCDC_3 */
-
-  /* USER CODE END RBI_IsDCDC_3 */
+  return retcode;
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_board_if.h
index 2e283d29..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     10U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -76,54 +76,32 @@ extern "C" {
  * 0: DCDC not supported
  * 1: DCDC supported
  */
-#define IS_DCDC_SUPPORTED                   0U
+#define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_conf.h
index 3a3fd8a1..08263606 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,6 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,12 +49,12 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief Max payload buffer size
@@ -65,6 +68,7 @@ extern "C" {
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -72,25 +76,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 1UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -130,6 +151,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/ipcc.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/ipcc.h
index b784032b..3dbeb3d7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/ipcc.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/ipcc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/ipcc_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/ipcc_if.h
index 49ee1e48..e891e529 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/ipcc_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/ipcc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __IPCC_IF_CM4_H__
@@ -55,7 +57,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initialise IPCC and register upper and downer callbacks
+  * @brief Initialize IPCC and register upper and downer callbacks
   * @param  IPCC_IF_ResponseRcv_cb     response callback
   * @param  IPCC_IF_NotificationRcv_cb notification callback
   */
@@ -63,7 +65,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
                   void (*IPCC_IF_NotificationRcv_cb)(uint32_t channelIdx));
 
 /**
-  * @brief Get Command status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get Command status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -72,7 +74,7 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
 uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 
 /**
-  * @brief Get notification status (abstract appl from Ipcc handler and ch direction)
+  * @brief Get notification status (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc channel status
   * @retval IPCC_CHANNEL_STATUS_FREE 0
@@ -81,14 +83,14 @@ uint32_t IPCC_IF_CmdRespStatus(uint32_t channelIdx);
 uint32_t IPCC_IF_NotifAckStatus(uint32_t channelIdx);
 
 /**
-  * @brief Send Cmd to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Cmd to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
 int32_t IPCC_IF_CommandSnd(uint32_t channelIdx);
 
 /**
-  * @brief Send Ack to the remote CPU (abstract appl from Ipcc handler and ch direction)
+  * @brief Send Ack to the remote CPU (abstract application from Ipcc handler and channel direction)
   * @param channelIdx  ipcc channel
   * @return ipcc status [OK: 0 , fail: -1]
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/main.h
index 3447444b..0831d7f3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/main.h
@@ -30,7 +30,6 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_hal.h"
 
-#include "board_resources.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 
@@ -61,40 +60,18 @@ void Error_Handler(void);
 /* Private defines -----------------------------------------------------------*/
 #define RTC_N_PREDIV_S 10
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
-#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
-#define USART_BAUDRATE 115200
-#define LED1_Pin GPIO_PIN_15
-#define LED1_GPIO_Port GPIOB
-#define LED2_Pin GPIO_PIN_9
-#define LED2_GPIO_Port GPIOB
-#define DBG3_Pin GPIO_PIN_14
-#define DBG3_GPIO_Port GPIOB
-#define RF_CTRL3_Pin GPIO_PIN_3
-#define RF_CTRL3_GPIO_Port GPIOC
-#define BUT1_Pin GPIO_PIN_0
-#define BUT1_GPIO_Port GPIOA
-#define BUT1_EXTI_IRQn EXTI0_IRQn
-#define DBG2_Pin GPIO_PIN_13
-#define DBG2_GPIO_Port GPIOB
-#define RF_CTRL2_Pin GPIO_PIN_5
-#define RF_CTRL2_GPIO_Port GPIOC
-#define DBG1_Pin GPIO_PIN_12
-#define DBG1_GPIO_Port GPIOB
-#define RF_CTRL1_Pin GPIO_PIN_4
-#define RF_CTRL1_GPIO_Port GPIOC
-#define BUT3_Pin GPIO_PIN_6
-#define BUT3_GPIO_Port GPIOC
-#define BUT2_Pin GPIO_PIN_1
-#define BUT2_GPIO_Port GPIOA
-#define BUT2_EXTI_IRQn EXTI1_IRQn
-#define LED3_Pin GPIO_PIN_11
-#define LED3_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
-#define DBG4_Pin GPIO_PIN_10
-#define DBG4_GPIO_Port GPIOB
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/platform.h
index 58961ffb..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 1
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
index 9270e73a..5ea6e838 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 /*#define HAL_SUBGHZ_MODULE_ENABLED   */
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/sys_app.h
index 6252f990..024b3713 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -35,6 +37,10 @@ extern "C" {
 /* USER CODE END Includes */
 
 /* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -70,12 +76,14 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
+/**
+  * @brief  Process System Notifications
+  * @param  com_buf exchange buffer parameter
+  */
 void Process_Sys_Notif(MBMUX_ComParam_t *com_buf);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/sys_conf.h
index 0edc96eb..a2ed64fe 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief CM4 Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/usart.h
index 1315adaf..20bb5dfa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_conf.h
index 43a2ee92..0c719869 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_def.h
index 9a5704a6..aabe2ab2 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
@@ -72,7 +76,10 @@ typedef enum
 typedef enum
 {
   /* CM4 */
-  CFG_SEQ_Task_PingPong_Process,
+  /* USER CODE BEGIN CFG_SEQ_Task_Id_t_0 */
+
+  /* USER CODE END CFG_SEQ_Task_Id_t_0 */
+  CFG_SEQ_Task_SubGHz_Phy_App_Process,
   CFG_SEQ_Task_MbSystemNotifRcv,
   CFG_SEQ_Task_MbRadioNotifRcv,
   /* USER CODE BEGIN CFG_SEQ_Task_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc.c
index ad6e2e7c..fdcbc616 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ IPCC_HandleTypeDef hipcc;
 void MX_IPCC_Init(void)
 {
 
+  /* USER CODE BEGIN IPCC_Init 0 */
+
+  /* USER CODE END IPCC_Init 0 */
+
+  /* USER CODE BEGIN IPCC_Init 1 */
+
+  /* USER CODE END IPCC_Init 1 */
   hipcc.Instance = IPCC;
   if (HAL_IPCC_Init(&hipcc) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN IPCC_Init 2 */
+
+  /* USER CODE END IPCC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc_if.c
index abfae080..672a366f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    ipcc_if.c
   * @author  MCD Application Team
-  * @brief   Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  * @brief   Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 
@@ -80,21 +82,21 @@ void IPCC_IF_Init(void (*IPCC_IF_ResponseRcv_cb)(uint32_t channelIdx),
   /* USER CODE BEGIN IPCC_IF_Init_1 */
 
   /* USER CODE END IPCC_IF_Init_1 */
-  /*Initialise the ipcc, initialises MSP*/
+  /*Initialize the ipcc, initialize MSP*/
   MX_IPCC_Init();
 
   /* IPCC EXTI (AIEC) line for CPU1  */
   LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_36);
   LL_EXTI_EnableRisingTrig_32_63(LL_EXTI_LINE_36);
 
-  /* Initialises IPCC callback of all channels*/
+  /* Initialize IPCC callback of all channels*/
   for (int32_t i = 0; i < IPCC_CHANNEL_NUMBER; i++)
   {
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_TX, IpccIfIsrTxCb);
     HAL_IPCC_ActivateNotification(&hipcc, i, IPCC_CHANNEL_DIR_RX, IpccIfIsrRxCb);
   }
 
-  /* Registers upper level (applic) callback */
+  /* Registers upper level (application) callback */
   IpccResponseRcv = IPCC_IF_ResponseRcv_cb;
   IpccNotificationRcv = IPCC_IF_NotificationRcv_cb;
   return;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/main.c
index be3204e6..f54d5676 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/main.c
@@ -112,6 +112,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -158,6 +159,7 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32wlxx_it.c
index 208d8cff..dbc31454 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32wlxx_it.c
@@ -75,7 +75,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -186,7 +188,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
@@ -207,7 +208,7 @@ void EXTI0_IRQHandler(void)
   /* USER CODE BEGIN EXTI0_IRQn 0 */
 
   /* USER CODE END EXTI0_IRQn 0 */
-  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0);
+
   /* USER CODE BEGIN EXTI0_IRQn 1 */
 
   /* USER CODE END EXTI0_IRQn 1 */
@@ -221,7 +222,7 @@ void EXTI1_IRQHandler(void)
   /* USER CODE BEGIN EXTI1_IRQn 0 */
 
   /* USER CODE END EXTI1_IRQn 0 */
-  HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1);
+
   /* USER CODE BEGIN EXTI1_IRQn 1 */
 
   /* USER CODE END EXTI1_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/sys_app.c
index 11abe0c4..04e1d780 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -24,14 +26,13 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 #include "msg_id.h"
 #include "mbmuxif_sys.h"
 #include "mbmuxif_trace.h"
 #include "mbmuxif_radio.h"
-/*#include "mbmuxif_kms.h"*/
 
 /* USER CODE BEGIN Includes */
 
@@ -62,23 +63,21 @@
 /* Private variables ---------------------------------------------------------*/
 uint32_t InstanceIndex;
 uint8_t SYS_Cm0plusRdyNotificationFlag = 0;
+
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-static void MBMUXIF_Init(void);
-
 /**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
+  * @brief Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialize other features
   */
-static void Gpio_PreInit(void);
+static void MBMUXIF_Init(void);
+
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -86,15 +85,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
+
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -104,10 +100,8 @@ void SystemApp_Init(void)
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
 
-  Gpio_PreInit();
-
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -133,14 +127,14 @@ void SystemApp_Init(void)
 
   UTIL_TIMER_Init();
 
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
 }
 
-/**
-  * @brief  Process System Notifications
-  */
 void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Sys_Notif_1 */
@@ -152,14 +146,24 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
 
   switch (notif_ack_id)
   {
+    case SYS_RTC_ALARM_MSG_ID:
+      /* USER CODE BEGIN Process_Sys_Notif_RTC_ALARM */
+
+      /* USER CODE END Process_Sys_Notif_RTC_ALARM */
+      break;
     case SYS_OTHER_MSG_ID:
       APP_LOG(TS_ON, VLEVEL_H, "CM4<(System)\r\n");
       /* prepare ack buffer*/
       ComObj->ParamCnt = 0;
-      ComObj->ReturnVal = 7; /* dummy value for test */
-      break;
+      ComObj->ReturnVal = 0; /* dummy value  */
+      /* USER CODE BEGIN Process_Sys_Notif_OTHER */
 
+      /* USER CODE END Process_Sys_Notif_OTHER */
+      break;
     default:
+      /* USER CODE BEGIN Process_Sys_Notif_DEFAULT */
+
+      /* USER CODE END Process_Sys_Notif_DEFAULT */
       break;
   }
 
@@ -171,16 +175,16 @@ void Process_Sys_Notif(MBMUX_ComParam_t *ComObj)
   /* USER CODE END Process_Sys_Notif_2 */
 }
 
-void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
+void UTIL_SEQ_EvtIdle(uint32_t TaskId_bm, uint32_t EvtWaited_bm)
 {
   /**
     * overwrites the __weak UTIL_SEQ_EvtIdle() in stm32_seq.c
-    * all to process all tack except task_id_bm
+    * all to process all tack except TaskId_bm
     */
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_1 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_1 */
-  UTIL_SEQ_Run(~task_id_bm);
+  UTIL_SEQ_Run(~TaskId_bm);
   /* USER CODE BEGIN UTIL_SEQ_EvtIdle_2 */
 
   /* USER CODE END UTIL_SEQ_EvtIdle_2 */
@@ -189,8 +193,6 @@ void UTIL_SEQ_EvtIdle(uint32_t task_id_bm, uint32_t evt_waited_bm)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -203,51 +205,46 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Test: Initialize MBMUX, wait CM0PLUS is ready, gets CM0PLUS capabilities, Initialises other features
-  * @param none
-  * @retval none
-  */
 static void MBMUXIF_Init(void)
 {
   /* USER CODE BEGIN MBMUXIF_Init_1 */
 
   /* USER CODE END MBMUXIF_Init_1 */
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list;
   int8_t init_status;
 
-  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "\r\nCM4: System Initialization started \r\n");
 
   init_status = MBMUXIF_SystemInit();
   if (init_status < 0)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   /* start CM0PLUS */
-  /* Note: when debugging in order to connect with the deggugger CPUU2 shall be start using workspace CM4 starts CM0PLUS */
-  /* On the other hand is up to the devepoper make sure the CM0PLUS debugger is run after CM4 debugger */
+  /* Note: when debugging in order to connect with the debugger CPU2 shall be start using workspace CM4 starts CM0PLUS */
+  /* On the other hand is up to the developer make sure the CM0PLUS debugger is run after CM4 debugger */
   HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
-  /* CM4 has started and it has reset the mailbox and initialised the MbMux; */
-  /* once CM0PLUS is also initialised it send a SYS notification */
+
+  /* CM4 has started and it has reset the mailbox and initialized the MbMux; */
+  /* once CM0PLUS is also initialized it send a SYS notification */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialisation done: Wait for CM0PLUS \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM4: System Initialization done: Wait for CM0PLUS \r\n");
 
-  MBMUXIF_WaitCm0MbmuxIsInitialised();
+  MBMUXIF_WaitCm0MbmuxIsInitialized();
 
-  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialisation started \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "CM0PLUS: System Initialization started \r\n");
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
-  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supprted_features_list);
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  MBMUX_SetCm0plusFeatureListPtr(p_cm0plus_supported_features_list);
 
-  APP_LOG(TS_ON, VLEVEL_H, "System Initialisation CM4-CM0PLUS completed \r\n");
+  APP_LOG(TS_ON, VLEVEL_H, "System Initialization CM4-CM0PLUS completed \r\n");
 
   init_status = MBMUXIF_SystemPrio_Add(FEAT_INFO_SYSTEM_NOTIF_PRIO_A_ID);
   if (init_status < 0)
@@ -289,45 +286,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -368,13 +326,11 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
+
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -389,13 +345,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -406,13 +360,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
@@ -427,4 +379,3 @@ void HAL_Delay(__IO uint32_t Delay)
 /* USER CODE END Overload_HAL_weaks */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/timer_if.c
index e04bdfc6..f02a544d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/timer_if.c
@@ -21,8 +21,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -163,9 +163,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   /** Configure the Instance */
   hrtc.Instance = RTC;
   HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
@@ -245,64 +245,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -325,6 +331,7 @@ void TIMER_IF_DelayMs(uint32_t delay)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -334,16 +341,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -370,24 +377,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart.c
index 49d236d5..be36fe23 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,8 +32,15 @@ DMA_HandleTypeDef hdma_usart2_tx;
 void MX_USART2_UART_Init(void)
 {
 
+  /* USER CODE BEGIN USART2_Init 0 */
+
+  /* USER CODE END USART2_Init 0 */
+
+  /* USER CODE BEGIN USART2_Init 1 */
+
+  /* USER CODE END USART2_Init 1 */
   huart2.Instance = USART2;
-  huart2.Init.BaudRate = USART_BAUDRATE;
+  huart2.Init.BaudRate = 115200;
   huart2.Init.WordLength = UART_WORDLENGTH_8B;
   huart2.Init.StopBits = UART_STOPBITS_1;
   huart2.Init.Parity = UART_PARITY_NONE;
@@ -59,6 +66,9 @@ void MX_USART2_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN USART2_Init 2 */
+
+  /* USER CODE END USART2_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart_if.c
index f91e9839..182f1990 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&huart2);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.c
index 76152897..8328a537 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.c
@@ -16,11 +17,13 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stdint.h"
 #include "assert.h"
 #include "stddef.h"
+#include "stm32_mem.h"
 #include "ipcc_if.h"
 #include "mbmux.h"
 /* USER CODE BEGIN Includes */
@@ -58,11 +61,44 @@ static FEAT_INFO_List_t *p_MBMUX_Cm0plusFeatureList = NULL;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   Check if the FEATURE is in the CM0 table and return it's position
+  * @param   e_featID  identifier of the feature
+  * @retval  0 not present, 1 present
+  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx ipcc channel number
+  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Isr executed when Ipcc receive IRQ notification: forwards to upper layer
+  * @param   channelIdx  ipcc channel number
+  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx);
+
+/**
+  * @brief   Find the first channel not yet associated to a feature (available)
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means no channel available
+  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType);
+
+/**
+  * @brief   gives back channel associated to the feature
+  * @param   e_featID  identifier of the feature (Lora, Sigfox, etc).
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @retval  ipcc channel number: if 0xFF means the feature isn't registered
+  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
+
+/**
+  * @brief   To facilitate the debug in case a function is not registered
+  * @param   ComObj Dummy
+  */
 static void MBMUX_IsrNotRegistered(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -70,11 +106,6 @@ static void MBMUX_IsrNotRegistered(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief Init the mailbox feature table and init the ipcc
-  * @param MBMUX_ComTable_t  Mailbox intra-MCUs communication table
-  * @retval  none
-  */
 void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
 {
   /* USER CODE BEGIN MBMUX_Init_1 */
@@ -107,11 +138,6 @@ void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable)
   /* USER CODE END MBMUX_Init_Last */
 }
 
-/**
-  * @brief The application informs MBMUX about the CM0PLUS supported feature list
-  * @param p_CM0PLUS_FeatureList  pointer to the list of CM0PLUS features
-  * @retval  none
-  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
 {
   /* USER CODE BEGIN MBMUX_SetCm0plusFeatureListPtr_1 */
@@ -123,15 +149,6 @@ void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList)
   /* USER CODE END MBMUX_SetCm0plusFeatureListPtr_Last */
 }
 
-/**
-  * @brief Assigns an ipcc channel to a feature (for a requested direction) and registers associated applic cb and buffer
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @param MsgCb   applic callback for notification processing
-  * @param ComBuffer   applic buffer where Msg values (params) are stored
-  * @param ComBufSize  max size allocated by the applic for the buffer
-  * @retval   channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType, void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize)
 {
   int8_t check_if_feature_provided_by_cm0plus = 0;
@@ -203,13 +220,6 @@ int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   return ret;
 }
 
-/**
-  * @brief Release an ipcc channel from the given feature and direction
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  none
-  * @note  this function has not been fully tested, because never required by our applic
-  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_UnregisterFeature_1 */
@@ -235,9 +245,9 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
     }
     else
     {
-      /* Make sure to clear pending IRQ Notification before unregistering the callback */
+      /* Make sure to clear pending IRQ Notification before un-registering the callback */
       /* necessary because the HAL_cb only mask the register, the SR is cleaned by the task */
-      /* if the mask is removed by anyone, the unwhished IRQ is generated if SR isn't cleaned */
+      /* if the mask is removed by anyone, the unwished IRQ is generated if SR isn't cleaned */
       IPCC_IF_AcknowledgeSnd(mb_ch);
 
       p_MBMUX_ComTable->MBNotifAckParam[mb_ch].MsgCm4Cb = MBMUX_IsrNotRegistered;
@@ -254,12 +264,6 @@ void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComTy
   /* USER CODE END MBMUX_UnregisterFeature_Last */
 }
 
-/**
-  * @brief gives back the pointer to the MailBox com buffer associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureComPtr_1 */
@@ -286,11 +290,6 @@ MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_Com
   /* USER CODE END MBMUX_GetFeatureComPtr_Last */
 }
 
-/**
-  * @brief Send Cmd to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_CommandSnd_1 */
@@ -309,11 +308,6 @@ int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID)
   /* USER CODE END MBMUX_CommandSnd_Last */
 }
 
-/**
-  * @brief Send ack to remote MCU for a requested feature by abstracting the channel idx
-  * @param e_featID  identifier of the feature
-  * @retval OK: 0 , fail: -1
-  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 {
   /* USER CODE BEGIN MBMUX_AcknowledgeSnd_1 */
@@ -333,12 +327,6 @@ uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Check if the FEATURE is in the CM0 table and return it's position
-  * @param e_featID  identifier of the feature
-  * @retval 0 not present, 1 present
-  */
 static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_featID)
 {
   int8_t ret = 0;
@@ -370,11 +358,6 @@ static uint8_t MBMUX_CheckIfFeatureSupportedByCm0plus(FEAT_INFO_IdTypeDef e_feat
   return ret;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrResponseRcvCb_1 */
@@ -390,11 +373,6 @@ static void MBMUX_IsrResponseRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Isr executed when Ipcc receive IRQ notification: forwards to upper layer
-  * @param channelIdx  ipcc channel number
-  * @retval none
-  */
 static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
 {
   /* USER CODE BEGIN MBMUX_IsrNotificationRcvCb_1 */
@@ -410,11 +388,6 @@ static void MBMUX_IsrNotificationRcvCb(uint32_t channelIdx)
   return;
 }
 
-/**
-  * @brief Find the first channel not yet associated to a feature (available)
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means no channel available
-  */
 static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_FindChStillUnregistered_1 */
@@ -475,12 +448,6 @@ static uint8_t MBMUX_FindChStillUnregistered(MBMUX_ComType_t ComType)
   /* USER CODE END MBMUX_FindChStillUnregistered_Last */
 }
 
-/**
-  * @brief gives back channel associated to the feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
-  * @retval ipcc channel number: if 0xFF means the feature isn't registered
-  */
 static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType)
 {
   /* USER CODE BEGIN MBMUX_GetFeatureChIdx_1 */
@@ -492,17 +459,12 @@ static uint8_t MBMUX_GetFeatureChIdx(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType
   /* USER CODE END MBMUX_GetFeatureChIdx_Last */
 }
 
-/**
-  * @brief To facilitate the debug in case a function is not registered
-  * @param ComType  Dummy
-  * @retval None
-  */
 static void MBMUX_IsrNotRegistered(void *ComObj)
 {
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_1 */
 
   /* USER CODE END MBMUX_IsrNotRegistered_1 */
-  while(1);
+  Error_Handler();
   /* USER CODE BEGIN MBMUX_IsrNotRegistered_Last */
 
   /* USER CODE END MBMUX_IsrNotRegistered_Last */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.h
index fd31da65..a15773f5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_CM4_H__
@@ -52,23 +54,60 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
-void   MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
+/**
+  * @brief   Init the mailbox feature table and init the ipcc
+  * @param   pMBMUX_ComTable Mailbox intra-MCUs communication table
+  */
+void MBMUX_Init(MBMUX_ComTable_t *const pMBMUX_ComTable);
 
+/**
+  * @brief   The application informs MBMUX about the CM0PLUS supported feature list
+  * @param   pCM0PLUS_FeatureList pointer to the list of CM0PLUS features
+  */
 void MBMUX_SetCm0plusFeatureListPtr(FEAT_INFO_List_t *pCM0PLUS_FeatureList);
 
+/**
+  * @brief   Assigns an ipcc channel to a feature (for a requested direction) and registers associated application cb and buffer
+  * @param   e_featID   identifier of the feature
+  * @param   ComType    0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @param   MsgCb      application callback for notification processing
+  * @param   ComBuffer  application buffer where Msg values (params) are stored
+  * @param   ComBufSize max size allocated by the application for the buffer
+  * @return  channel index or -1: (no more ipcc channel available) or -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUX_RegisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType,
-                             void (*MsgCm4Cb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
+                             void (*MsgCb)(void *ComObj), uint32_t *const ComBuffer, uint16_t ComBufSize);
 
+/**
+  * @brief   Release an ipcc channel from the given feature and direction
+  * @param   e_featID  identifier of the feature
+  * @param   ComType  0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @note    this function has not been fully tested, because never required by our application
+  */
 void MBMUX_UnregisterFeature(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   gives back the pointer to the MailBox com buffer associated to the feature
+  * @param   e_featID  identifier of the feature
+  * @param   ComType   0 for CMd/Resp (TX), 1 for Notif/Ack (RX)
+  * @return  pointer to the com param object associated to the feature
+  */
 MBMUX_ComParam_t *MBMUX_GetFeatureComPtr(FEAT_INFO_IdTypeDef e_featID, MBMUX_ComType_t ComType);
 
+/**
+  * @brief   Send Cmd to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 int32_t MBMUX_CommandSnd(FEAT_INFO_IdTypeDef e_featID);
 
+/**
+  * @brief   Send ack to remote MCU for a requested feature by abstracting the channel idx
+  * @param   e_featID  identifier of the feature
+  * @retval  OK: 0 , fail: -1
+  */
 uint32_t MBMUX_AcknowledgeSnd(FEAT_INFO_IdTypeDef e_featID);
 
-uint32_t MBMUX_GetResponseVal(FEAT_INFO_IdTypeDef e_featID);
-
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.c
index 26d69db0..81fc561a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   allows CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -55,7 +57,14 @@
 /* Private variables ---------------------------------------------------------*/
 static MBMUX_ComParam_t *RadioComObj;
 
+/**
+  * @brief radio cmd buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioCmdRespBuff[MAX_PARAM_OF_RADIO_CMD_FUNCTIONS];/*shared*/
+
+/**
+  * @brief radio notif buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RADIO_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
@@ -63,8 +72,21 @@ UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aRadioNotifAckBuff[MAX_PARAM_OF_RA
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief   RADIO response callbacks: set event to release waiting task
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj);
+
+/**
+  * @brief   RADIO notification callbacks: schedules a task in order to quit the ISR
+  * @param   ComObj pointer to the RADIO com param buffer
+  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  RADIO task to process the notification
+  */
 static void MBMUXIF_TaskRadioNotifRcv(void);
 
 /* USER CODE BEGIN PFP */
@@ -72,16 +94,6 @@ static void MBMUXIF_TaskRadioNotifRcv(void);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers RADIO feature to the mailbox and to the sequencer
-  * @param none
-  * @retval   0: OK;
-             -1: no more ipcc channel available;
-             -2: feature not provided by CM0PLUS;
-             -3: callback error on CM0PLUS
-             -4: mistmatch between CM4 and CM0PLUS lora stack versions
-  */
 int8_t MBMUXIF_RadioInit(void)
 {
   FEAT_INFO_Param_t *p_cm0plus_specific_features_info;
@@ -125,11 +137,6 @@ int8_t MBMUXIF_RadioInit(void)
   return ret;
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to Radio feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
 {
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_1 */
@@ -138,7 +145,7 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(FEAT_INFO_RADIO_ID, MBMUX_CMD_RESP);
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
   /* USER CODE BEGIN MBMUXIF_GetRadioFeatureCmdComPtr_Last */
@@ -146,11 +153,6 @@ MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void)
   /* USER CODE END MBMUXIF_GetRadioFeatureCmdComPtr_Last */
 }
 
-/**
-  * @brief Sends a Radio-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendCmd(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendCmd_1 */
@@ -169,11 +171,6 @@ void MBMUXIF_RadioSendCmd(void)
   /* USER CODE END MBMUXIF_RadioSendCmd_Last */
 }
 
-/**
-  * @brief Sends a Radio-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_RadioSendAck(void)
 {
   /* USER CODE BEGIN MBMUXIF_RadioSendAck_1 */
@@ -193,11 +190,6 @@ void MBMUXIF_RadioSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  RADIO response callbacks: set event to release waiting task
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioRespRcvCb_1 */
@@ -209,11 +201,6 @@ static void MBMUXIF_IsrRadioRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioRespRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrRadioNotifRcvCb_1 */
@@ -226,11 +213,6 @@ static void MBMUXIF_IsrRadioNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrRadioNotifRcvCb_Last */
 }
 
-/**
-  * @brief  RADIO task to process the notification
-  * @param  pointer to the RADIO com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskRadioNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskRadioNotifRcv_1 */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.h
index 1f4c2454..3d565fcd 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_radio.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle RADIO driver via MBMUX
+  * @brief   API for CM4 application to register and handle RADIO driver via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_RADIO_CM4_H__
@@ -52,10 +54,32 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief   Registers RADIO feature to the mailbox and to the sequencer
+  * @retval   0: OK;
+             -1: no more ipcc channel available;
+             -2: feature not provided by CM0PLUS;
+             -3: callback error on CM0PLUS
+             -4: mismatch between CM4 and CM0PLUS lora stack versions
+  */
 int8_t MBMUXIF_RadioInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to Radio feature Cmd
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetRadioFeatureCmdComPtr(void);
+
+/**
+  * @brief   Sends a Radio-Cmd via Ipcc and Wait for the response
+  */
 void MBMUXIF_RadioSendCmd(void);
+
+/**
+  * @brief   Sends a Radio-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_RadioSendAck(void);
+
 /* USER CODE BEGIN EFP */
 
 /* USER CODE END EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.c
index c937c14c..1884bb44 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to handle the SYSTEM MBMUX channel.
+  * @brief   allows CM4 application to handle the SYSTEM MBMUX channel.
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -53,10 +55,10 @@
 
 /* Private variables ---------------------------------------------------------*/
 static FLASH_OBProgramInitTypeDef OptionsBytesStruct;
-static __IO uint8_t AllowSeqencerForSysCmd = 0;
+static __IO uint8_t AllowSequencerForSysCmd = 0;
 static __IO uint8_t MbSystemRespRcvFlag;
 
-UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(4) ;
+UTIL_MEM_PLACE_IN_SECTION("MAPPING_TABLE") static  MBMUX_ComTable_t MBSYS_RefTable UTIL_MEM_ALIGN(16) ;
 
 MBMUX_ComTable_t *pMb_RefTable = &MBSYS_RefTable;
 MBMUX_ComParam_t *SystemComObj;
@@ -64,23 +66,54 @@ MBMUX_ComParam_t *SystemComObj;
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemCmdRespBuff[MAX_PARAM_OF_SYS_CMD_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemNotifAckBuff[MAX_PARAM_OF_SYS_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioACmdRespBuff[MAX_PARAM_OF_SYS_PRIOA_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioANotifAckBuff[MAX_PARAM_OF_SYS_PRIOA_NOTIF_FUNCTIONS];/*shared*/
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBCmdRespBuff[MAX_PARAM_OF_SYS_PRIOB_CMD_FUNCTIONS];/*shared*/
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t
-aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
+UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aSystemPrioBNotifAckBuff[MAX_PARAM_OF_SYS_PRIOB_NOTIF_FUNCTIONS];/*shared*/
 
 /* USER CODE BEGIN PV */
 
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  SYSTEM response callbacks: set event to release waiting task
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM task to process the notification
+  */
 static void MBMUXIF_TaskSystemNotifRcv(void);
+
+/**
+  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj);
+
+/**
+  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
+  * @param  ComObj pointer to the SYSTEM com param buffer
+  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 
 /* USER CODE BEGIN PFP */
@@ -88,47 +121,54 @@ static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj);
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemInit(void)
 {
   int8_t ret;
+  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_1 */
 
   /* USER CODE END MBMUXIF_SystemInit_1 */
 
+  /* Get Chip Revision Identifier (cut) */
+  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
   /* Get the Dual boot configuration status */
   HAL_FLASHEx_OBGetConfig(&OptionsBytesStruct);
 
   if (OptionsBytesStruct.IPCCdataBufAddr != (uint32_t) pMb_RefTable)
   {
-    APP_PPRINTF("\r\n WARNING: There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n",  (uint32_t) pMb_RefTable);
-    APP_PPRINTF(" and the address calculated according to the IPCCDBA option byte: 0x%X \r\n", OptionsBytesStruct.IPCCdataBufAddr);
-    APP_PPRINTF(" The execution enters now in a while(1){}  \r\n");
-    APP_PPRINTF(" please check the CM4\\MbMux\\mbmuxif_sys.c or update the scatter file \r\n\r\n");
-
-    /* USER CODE BEGIN MBMUXIF_SystemInit_Prevent_OB_Programming */
-      /* If you are sure you need to reprogram the IPCCDBA set #if to 0 (to avoid while(1){}) */
-      /* Please first check the  CM4 scatter file.*/
-      /* Make sure that the MAPPING_TABLE is placed in SRAM2 (memory with retention) */
-      /* Examples of scatter files available in the LoraWAN and Sigfox DualCore Applications pack*/
-      /* */
-      /* After HAL_FLASH_OB_Launch you will have to unplug and plug the board from power after this operation.*/
-      /* Additionally possible Issue under investigation, i.e.: */
-      /* In some cases happen that unplugging the chip power is not sufficient */
-      /* if so you need to reboot from RAM putting the BOOT0 pin to 3v3 */
-      /* attach with Cube Programmer and full erase the chip memory. */
-      /* */
-      /* PS: of course if you are attached with the debugger, it will not respond anymore after HAL_FLASH_OB_Launch*/
-#if 1
-    /* USER CODE END MBMUXIF_SystemInit_Prevent_OB_Programming */
-    while(1){}
-#else
+    APP_PPRINTF("There is a difference between the MAPPING_TABLE placement in memory: 0x%X \r\n", (uint32_t) pMb_RefTable);
+    APP_PPRINTF("and the address calculated according to the IPCCDBA option byte: 0x%X \r\n",
+                OptionsBytesStruct.IPCCdataBufAddr);
+    APP_PPRINTF("IPCCDBA is automatically updated\n\rSystem restarting...\r\n\r\n");
+    APP_PPRINTF("Please check the CM4\\MbMux\\mbmuxif_sys.c for more info \r\n\r\n");
+
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+
+    /* Next code reprograms the IPCCDBA option byte which automatically resets the chip. */
+    /* It might be that this is not what you want. In that case check your linker file. */
+    /* en.STM32CubeWL.zip example places MAPPING_TABLE in SRAM2 (specifically to 0x20008000) */
+    /* due to its memory retention properties requested for Low Power STANDBY mode. */
+    /* This address also matches the factory default value of IPCCDBA (i.e. 0x800) */
+    /* In fact IPCCdataBufAddr = RAM_BASE_ADDR + IPCCDBA<<0x800 is 0x20008000. */
+    /* On the other hand STM32CubeMX generates standard linker files which don't define MAPPING_TABLE */
+    /* You can get inspired for your linker file by the ones in the Repository at the correspondent Apps: */
+    /*    C:\Users\<username>\STM32Cube\Repository\STM32Cube_FW_WL_V1.0.0\Projects\<board>\Applications\... */
+    /* When using "repository linker file" next code is not supposed to be executed */
+
+    if (MBSYS_RefTable.ChipRevId == 0x1001)
+    {
+      /* w.a. for cut 1.1 : problems to write on FLASH when MSI clock with frq > 16Mhz*/
+      HAL_RCC_GetOscConfig(&RCC_OscInitStruct);
+      RCC_OscInitStruct.MSIClockRange = RCC_MSIRANGE_8;
+      if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
+      {
+        Error_Handler();
+      }
+    }
 
     /* write FLASH->IPCCBR option byte */
     /* Unlock the Flash to enable the flash control register access *************/
@@ -140,7 +180,7 @@ int8_t MBMUXIF_SystemInit(void)
     HAL_FLASH_OB_Unlock();
 
     /*Write IPCCDBA Option Byte based on (FLASH_IPCC_data_buffer - SRAM1_BASE) >> 4*/
-    OptionsBytesStruct.OptionType  = OPTIONBYTE_IPCC_BUF_ADDR;
+    OptionsBytesStruct.OptionType = OPTIONBYTE_IPCC_BUF_ADDR;
     OptionsBytesStruct.IPCCdataBufAddr = (uint32_t) pMb_RefTable;
 
     if (HAL_FLASHEx_OBProgram(&OptionsBytesStruct) != HAL_OK)
@@ -170,10 +210,8 @@ int8_t MBMUXIF_SystemInit(void)
     (void) HAL_FLASH_OB_Lock();
     /* Lock the Flash to disable the flash control register access  *********/
     (void) HAL_FLASH_Lock();
-#endif
   }
-  MBSYS_RefTable.ChipRevId = LL_DBGMCU_GetRevisionID();
-
+  /* Init MailBoxMultiplexer */
   MBMUX_Init(pMb_RefTable);
 
   ret = MBMUX_RegisterFeature(FEAT_INFO_SYSTEM_ID, MBMUX_CMD_RESP, MBMUXIF_IsrSystemRespRcvCb, aSystemCmdRespBuff, sizeof(aSystemCmdRespBuff));
@@ -186,16 +224,13 @@ int8_t MBMUXIF_SystemInit(void)
     ret = 0;
     UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_MbSystemNotifRcv), UTIL_SEQ_RFU, MBMUXIF_TaskSystemNotifRcv);
   }
+  /* USER CODE BEGIN MBMUXIF_SystemInit_2 */
+
+  /* USER CODE END MBMUXIF_SystemInit_2 */
 
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
   /* hold Cm0 from executing MBMUXIF_SystemInit after booting (after PWR_CR4_C2BOOT is set by Cm4)*/
   /* it allows Cm0 debugging step by step its own MBMUXIF_SystemInit */
   MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_PREVENT_CPU2_TO_START);
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  MBMUXIF_SetCpusSynchroFlag(CPUS_BOOT_SYNC_ALLOW_CPU2_TO_START);
-#else
-#warning "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_ON */
 
   /* USER CODE BEGIN MBMUXIF_SystemInit_Last */
 
@@ -203,14 +238,9 @@ int8_t MBMUXIF_SystemInit(void)
   return ret;
 }
 
-/**
-  * @brief Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
-  int8_t ret=0;
+  int8_t ret = 0;
 
   /* USER CODE BEGIN MBMUXIF_SystemPrio_Add_1 */
 
@@ -259,14 +289,6 @@ int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat)
   return ret;
 }
 
-/**
-  * @brief Set synchro flag between the two CPUs
-  * @param flag: 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
-  *              0x5555: Cm0 allowed to run its MBMUX_Init
-  *              0xAAAA: Cm0 has completed initialisation
-  *              0x9999: RTC PRIO CHANNEL has been registered
-  * @retval  none
-  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
 {
   pMb_RefTable->SynchronizeCpusAtBoot = flag;
@@ -275,26 +297,16 @@ void MBMUXIF_SetCpusSynchroFlag(uint16_t flag)
   /* USER CODE END MBMUXIF_SetCpusSynchroFlag */
 }
 
-/**
-  * @brief gives green light to Cm0 to Initialised MBMUX on its side
-  * @param none
-  * @retval  none
-  */
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void)
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void)
 {
   while (pMb_RefTable->SynchronizeCpusAtBoot != CPUS_BOOT_SYNC_CPU2_INIT_COMPLETED)
   {
   }
-  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE BEGIN MBMUXIF_WaitCm0MbmuxIsInitialized */
 
-  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialised */
+  /* USER CODE END MBMUXIF_WaitCm0MbmuxIsInitialized */
 }
 
-/**
-  * @brief gives back the pointer to the com buffer associated to System feature Cmd
-  * @param none
-  * @retval  return pointer to the com param buffer
-  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   MBMUX_ComParam_t *com_param_ptr = MBMUX_GetFeatureComPtr(SystemPrioFeat, MBMUX_CMD_RESP);
@@ -303,30 +315,19 @@ MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPr
   /* USER CODE END MBMUXIF_GetSystemFeatureCmdComPtr */
   if (com_param_ptr == NULL)
   {
-    while (1) {} /* ErrorHandler() : feature isn't registered */
+    Error_Handler(); /* feature isn't registered */
   }
   return com_param_ptr;
 }
 
-/**
-  * @brief To allow SystemCmd to use the sequencer (hence entering in low power)
-  * @note  For compatib with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The applic can call this API at the end of the Init
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void)
 {
-  AllowSeqencerForSysCmd = 1;
+  AllowSequencerForSysCmd = 1;
   /* USER CODE BEGIN MBMUXIF_SystemAllowSequencerForSysCmd */
 
   /* USER CODE END MBMUXIF_SystemAllowSequencerForSysCmd */
 }
 
-/**
-  * @brief Sends a System-Cmd via Ipcc and Wait for the response
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_1 */
@@ -339,7 +340,7 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
     MbSystemRespRcvFlag = 0;  /* To avoid using Sequencer during Init sequence for SysCmd  */
     if (MBMUX_CommandSnd(FEAT_INFO_SYSTEM_ID) == 0)
     {
-      if (AllowSeqencerForSysCmd)
+      if (AllowSequencerForSysCmd)
       {
         UTIL_SEQ_WaitEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
       }
@@ -356,20 +357,15 @@ void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat)
   }
   else
   {
-  /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE BEGIN MBMUXIF_SystemSendCmd_2 */
 
-  /* USER CODE END MBMUXIF_SystemSendCmd_2 */
+    /* USER CODE END MBMUXIF_SystemSendCmd_2 */
   }
   /* USER CODE BEGIN MBMUXIF_SystemSendCmd_Last */
 
   /* USER CODE END MBMUXIF_SystemSendCmd_Last */
 }
 
-/**
-  * @brief Sends a System-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
 {
   /* USER CODE BEGIN MBMUXIF_SystemSendAck_1 */
@@ -384,17 +380,11 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat)
   /* USER CODE END MBMUXIF_SystemSendAck_Last */
 }
 
-/* USER CODE BEGIN ExpoF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExpoF */
+/* USER CODE END EF */
 
 /* Exported services --------------------------------------------------------*/
-
-/**
-  * @brief   Gets the pointer to CM0PLUS capabilities info table
-  * @param   none
-  * @retval  pointer to CM0PLUS capabilities info table
-  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
 {
   MBMUX_ComParam_t *com_obj;
@@ -421,14 +411,9 @@ FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void)
   return (FEAT_INFO_List_t *) ret;   /* need to verify */
 }
 
-/**
-  * @brief returns the pointer to the Capability Info table of a given feature
-  * @param e_featID ID of the feature from which retrieve the ptr
-  * @retval  LoRaMacInfoTable pointer
-  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID)
 {
-  FEAT_INFO_List_t *p_cm0plus_supprted_features_list = NULL;
+  FEAT_INFO_List_t *p_cm0plus_supported_features_list = NULL;
   FEAT_INFO_Param_t  *p_feature = NULL;
   uint8_t i;
   uint8_t cm0plus_nr_of_supported_features;
@@ -438,15 +423,15 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
 
   /* USER CODE END MBMUXIF_SystemGetFeatCapabInfoPtr_1 */
 
-  p_cm0plus_supprted_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
+  p_cm0plus_supported_features_list = MBMUXIF_SystemSendCm0plusInfoListReq();
 
-  if (p_cm0plus_supprted_features_list != NULL)
+  if (p_cm0plus_supported_features_list != NULL)
   {
-    cm0plus_nr_of_supported_features = p_cm0plus_supprted_features_list->Feat_Info_Cnt;
+    cm0plus_nr_of_supported_features = p_cm0plus_supported_features_list->Feat_Info_Cnt;
 
     for (i = 0; i < cm0plus_nr_of_supported_features;  i++)
     {
-      p_feature = i + p_cm0plus_supprted_features_list->Feat_Info_TableAddress;
+      p_feature = i + p_cm0plus_supported_features_list->Feat_Info_TableAddress;
       if (p_feature->Feat_Info_Feature_Id == e_featID)
       {
         found = 1;
@@ -466,12 +451,6 @@ FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featI
   return  p_feature;
 }
 
-/**
-  * @brief Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
-  * @param e_featID  identifier of the feature (Lora, Sigfox, etc).
-  * @param ComType  0 for CMd/Resp, 1 for Notif/Ack
-  * @retval   0 ok, else error code
-  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 {
   MBMUX_ComParam_t *com_obj;
@@ -506,11 +485,6 @@ int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID)
 /* USER CODE END ExpoS */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  SYSTEM response callbacks: set event to release waiting task
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemRespRcvCb_1 */
@@ -519,7 +493,7 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
 
   /* During "SystemInit sequence" Flag is used instead of Sequencer */
   MbSystemRespRcvFlag = 1;
-  if (AllowSeqencerForSysCmd) /* To avoid using Sequencer during Init sequence */
+  if (AllowSequencerForSysCmd) /* To avoid using Sequencer during Init sequence */
   {
     UTIL_SEQ_SetEvt(1 << CFG_SEQ_Evt_MbSystemRespRcv);
   }
@@ -528,11 +502,6 @@ static void MBMUXIF_IsrSystemRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemRespRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemNotifRcvCb_1 */
@@ -545,11 +514,6 @@ static void MBMUXIF_IsrSystemNotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemNotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM task to process the notification
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_TaskSystemNotifRcv(void)
 {
   /* USER CODE BEGIN MBMUXIF_TaskSystemNotifRcv_1 */
@@ -561,11 +525,6 @@ static void MBMUXIF_TaskSystemNotifRcv(void)
   /* USER CODE END MBMUXIF_TaskSystemNotifRcv_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioARespRcvCb */
@@ -573,11 +532,6 @@ static void MBMUXIF_IsrSystemPrioARespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioARespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_A notification callbacks: used by RTC
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioANotifRcvCb_1 */
@@ -591,11 +545,6 @@ static void MBMUXIF_IsrSystemPrioANotifRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioANotifRcvCb_Last */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B response callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBRespRcvCb */
@@ -603,11 +552,6 @@ static void MBMUXIF_IsrSystemPrioBRespRcvCb(void *ComObj)
   /* USER CODE END MBMUXIF_IsrSystemPrioBRespRcvCb */
 }
 
-/**
-  * @brief  SYSTEM PRIO_B notification callbacks: available for new usage
-  * @param  pointer to the SYSTEM com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrSystemPrioBNotifRcvCb(void *ComObj)
 {
   /* USER CODE BEGIN MBMUXIF_IsrSystemPrioBNotifRcvCb */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.h
index d6f9cc5c..61f37d9a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_sys.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to handle the SYSTEM MBMUX channel
+  * @brief   API for CM4 application to handle the SYSTEM MBMUX channel
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_SYS_CM4_H__
@@ -55,13 +57,56 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions ------------------------------------------------------- */
+/**
+  * @brief Inits the MBMUX and registers SYS channel to the mailbox and SYS task to the sequencer
+  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemInit(void);
+
+/**
+  * @brief   gives back the pointer to the com buffer associated to System feature Cmd
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  return pointer to the com param buffer
+  */
 MBMUX_ComParam_t *MBMUXIF_GetSystemFeatureCmdComPtr(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Registers to the mailbox a SYSTEM feature channel used on higher PRIORITY
+  * @param   SystemPrioFeat ID of the feature
+  * @retval  0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_SystemPrio_Add(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Set synchro flag between the two CPUs
+  * @param   flag 0xFFFF: hold Cm0 before it runs its MBMUX_Init,
+  *               0x5555: Cm0 allowed to run its MBMUX_Init
+  *               0xAAAA: Cm0 has completed initialization
+  *               0x9999: RTC PRIO CHANNEL has been registered
+  */
 void MBMUXIF_SetCpusSynchroFlag(uint16_t flag);
-void MBMUXIF_WaitCm0MbmuxIsInitialised(void);
+
+/**
+  * @brief gives green light to Cm0 to Initialized MBMUX on its side
+  */
+void MBMUXIF_WaitCm0MbmuxIsInitialized(void);
+
+/**
+  * @brief   To allow SystemCmd to use the sequencer (hence entering in low power)
+  * @note    For compatibility with RTOS, the sequencer (scheduler) is not used until the main loop process is reached (after Init). The application can call this API at the end of the Init
+  */
 void MBMUXIF_SystemAllowSequencerForSysCmd(void);
+
+/**
+  * @brief   Sends a System-Cmd via Ipcc and Wait for the response
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendCmd(FEAT_INFO_IdTypeDef SystemPrioFeat);
+
+/**
+  * @brief   Sends a System-Ack  via Ipcc without waiting for the ack
+  * @param   SystemPrioFeat ID of the feature
+  */
 void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 
 /* USER CODE BEGIN EFP */
@@ -69,8 +114,24 @@ void MBMUXIF_SystemSendAck(FEAT_INFO_IdTypeDef SystemPrioFeat);
 /* USER CODE END EFP */
 
 /* Exported services --------------------------------------------------------*/
+/**
+  * @brief   Gets the pointer to CM0PLUS capabilities info table
+  * @retval  pointer to CM0PLUS capabilities info table
+  */
 FEAT_INFO_List_t *MBMUXIF_SystemSendCm0plusInfoListReq(void);
+
+/**
+  * @brief   returns the pointer to the Capability Info table of a given feature
+  * @param   e_featID ID of the feature from which retrieve the ptr
+  * @retval  LoRaMacInfoTable pointer
+  */
 FEAT_INFO_Param_t *MBMUXIF_SystemGetFeatCapabInfoPtr(FEAT_INFO_IdTypeDef e_featID);
+
+/**
+  * @brief   Asks CM0PLUS to register its Cmd and Ack callbacks relative to the requested feature
+  * @param   e_featID ID of the feature (Lora, Sigfox, etc).
+  * @retval  0 ok, else error code
+  */
 int8_t MBMUXIF_SystemSendCm0plusRegistrationCmd(FEAT_INFO_IdTypeDef e_featID);
 
 /* USER CODE BEGIN ExpoS */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.c
index b42f9402..c91551a5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.c
   * @author  MCD Application Team
-  * @brief   allows CM4 applic to receive by CM0 TRACE via MBMUX
+  * @brief   allows CM4 application to receive by CM0 TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
@@ -46,25 +48,26 @@
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
-
+/**
+  * @brief trace buffer to exchange data between CM4 and CM0+
+  */
 UTIL_MEM_PLACE_IN_SECTION("MB_MEM1") uint32_t aTraceNotifAckBuff[MAX_PARAM_OF_TRACE_NOTIF_FUNCTIONS];/*shared*/
 /* USER CODE BEGIN PM */
 
 /* USER CODE END PM */
 
 /* Private function prototypes -----------------------------------------------*/
+/**
+  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
+  * @param  ComObj pointer to the TRACE com param buffer
+  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-
-/**
-  * @brief Registers TRACE feature to the mailbox
-  * @param none
-  * @retval   0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
-  */
 int8_t MBMUXIF_TraceInit(void)
 {
   int8_t ret;
@@ -90,23 +93,18 @@ int8_t MBMUXIF_TraceInit(void)
   return ret;
 }
 
-/**
-  * @brief Sends a Trace-Ack  via Ipcc without waiting for the ack
-  * @param none
-  * @retval   none
-  */
 void MBMUXIF_TraceSendAck(void)
 {
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_1 */
 
-/* USER CODE END MBMUXIF_TraceSendAck_1 */
+  /* USER CODE END MBMUXIF_TraceSendAck_1 */
   if (MBMUX_AcknowledgeSnd(FEAT_INFO_TRACE_ID) != 0)
   {
     Error_Handler();
   }
-/* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
+  /* USER CODE BEGIN MBMUXIF_TraceSendAck_Last */
 
-/* USER CODE END MBMUXIF_TraceSendAck_Last */
+  /* USER CODE END MBMUXIF_TraceSendAck_Last */
 }
 
 /* USER CODE BEGIN EFD */
@@ -114,16 +112,11 @@ void MBMUXIF_TraceSendAck(void)
 /* USER CODE END EFD */
 
 /* Private functions ---------------------------------------------------------*/
-/**
-  * @brief  TRACE notification callbacks: schedules a task in order to quit the ISR
-  * @param  pointer to the TRACE com param buffer
-  * @retval  none
-  */
 static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 {
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_1 */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_1 */
   MBMUX_ComParam_t *TraceComObj;
   uint32_t  notif_ack_id;
   uint8_t *buffer;
@@ -151,9 +144,9 @@ static void MBMUXIF_IsrTraceNotifRcvCb(void *ComObj)
 
   /* Send ack */
   MBMUXIF_TraceSendAck();
-/* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE BEGIN MBMUXIF_IsrTraceNotifRcvCb_Last */
 
-/* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
+  /* USER CODE END MBMUXIF_IsrTraceNotifRcvCb_Last */
 }
 
 /* USER CODE BEGIN PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.h
index 7a8d3fa7..f98a156d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.h
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmuxif_trace.h
   * @author  MCD Application Team
-  * @brief   API for CM4 applic to register and handle TRACE via MBMUX
+  * @brief   API for CM4 application to register and handle TRACE via MBMUX
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUXIF_TRACE_CM4_H__
@@ -52,7 +54,15 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief  Registers TRACE feature to the mailbox
+  * @retval 0: OK; -1: no more ipcc channel available; -2: feature not provided by CM0PLUS
+  */
 int8_t MBMUXIF_TraceInit(void);
+
+/**
+  * @brief  Sends a Trace-Ack  via Ipcc without waiting for the ack
+  */
 void MBMUXIF_TraceSendAck(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.c
index 1326f87b..fd0e305e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.c
@@ -17,6 +18,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "radio_mbwrapper.h"
@@ -72,38 +75,38 @@ static void RadioIrqProcess(void);
 /*!
  * \brief Initializes the radio
  *
- * \param [IN] events Structure containing the driver callback functions
+ * \param[in] events Structure containing the driver callback functions
  */
 static void RadioInit(RadioEvents_t *events);
 
 /*!
  * Return current radio status
  *
- * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+ * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
  */
 static RadioState_t RadioGetStatus(void);
 
 /*!
  * \brief Configures the radio with the given modem
  *
- * \param [IN] modem Modem to be used [0: FSK, 1: LoRa]
+ * \param[in] modem Modem to be used [0: FSK, 1: LoRa]
  */
 static void RadioSetModem(RadioModems_t modem);
 
 /*!
  * \brief Sets the channel frequency
  *
- * \param [IN] freq         Channel RF frequency
+ * \param[in] freq Channel RF frequency
  */
 static void RadioSetChannel(uint32_t freq);
 
 /*!
   * \brief Checks if the channel is free for the given time
   *
-  * \param [IN] freq                Channel RF frequency in Hertz
-  * \param [IN] rxBandwidth         Rx bandwidth in Hertz
-  * \param [IN] rssiThresh          RSSI threshold in dBm
-  * \param [IN] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
+  * \param[in] freq                Channel RF frequency in Hertz
+  * \param[in] rxBandwidth         Rx bandwidth in Hertz
+  * \param[in] rssiThresh          RSSI threshold in dBm
+  * \param[in] maxCarrierSenseTime Max time in milliseconds while the RSSI is measured
   *
   * \retval isFree         [true: Channel is free, false: Channel is not free]
   */
@@ -125,40 +128,40 @@ static uint32_t RadioRandom(void);
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] bandwidthAfc Sets the AFC Bandwidth (FSK only)
+ * \param[in] bandwidthAfc Sets the AFC Bandwidth (FSK only)
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: N/A ( set to 0 )
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [false: single mode, true: continuous mode]
  */
 static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
@@ -172,37 +175,37 @@ static void RadioSetRxConfig(RadioModems_t modem, uint32_t bandwidth,
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] fdev         Sets the frequency deviation (FSK only)
+ * \param[in] modem        Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] fdev         Sets the frequency deviation (FSK only)
  *                          FSK : [Hz]
  *                          LoRa: 0
- * \param [IN] bandwidth    Sets the bandwidth (LoRa only)
+ * \param[in] bandwidth    Sets the bandwidth (LoRa only)
  *                          FSK : 0
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] datarate     Sets the Datarate
+ * \param[in] datarate     Sets the Datarate
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the preamble length
+ * \param[in] preambleLen  Sets the preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] crcOn        Enables disables the CRC [0: OFF, 1: ON]
- * \param [IN] FreqHopOn    Enables disables the intra-packet frequency hopping
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] crcOn        Enables disables the CRC [0: OFF, 1: ON]
+ * \param[in] FreqHopOn    Enables disables the intra-packet frequency hopping
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: OFF, 1: ON]
- * \param [IN] HopPeriod    Number of symbols between each hop
+ * \param[in] HopPeriod    Number of symbols between each hop
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: Number of symbols
- * \param [IN] iqInverted   Inverts IQ signals (LoRa only)
+ * \param[in] iqInverted   Inverts IQ signals (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [0: not inverted, 1: inverted]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] timeout      Transmission timeout [ms]
  */
 static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
                              uint32_t bandwidth, uint32_t datarate,
@@ -213,7 +216,7 @@ static void RadioSetTxConfig(RadioModems_t modem, int8_t power, uint32_t fdev,
 /*!
  * \brief Checks if the given RF frequency is supported by the hardware
  *
- * \param [IN] frequency RF frequency to be checked
+ * \param[in] frequency RF frequency to be checked
  * \retval isSupported [true: supported, false: unsupported]
  */
 static bool RadioCheckRfFrequency(uint32_t frequency);
@@ -221,26 +224,26 @@ static bool RadioCheckRfFrequency(uint32_t frequency);
 /*!
  * \brief Computes the packet time on air in ms for the given payload
  *
- * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
+ * \remark Can only be called once SetRxConfig or SetTxConfig have been called
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] bandwidth    Sets the bandwidth
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] bandwidth    Sets the bandwidth
  *                          FSK : >= 2600 and <= 250000 Hz
  *                          LoRa: [0: 125 kHz, 1: 250 kHz,
  *                                 2: 500 kHz, 3: Reserved]
- * \param [IN] spreadingFactor  Sets the Spreading Factor
+ * \param[in] spreadingFactor  Sets the Spreading Factor
  *                          FSK : 600..300000 bits/s
  *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
  *                                10: 1024, 11: 2048, 12: 4096  chips]
- * \param [IN] coderate     Sets the coding rate (LoRa only)
+ * \param[in] coderate     Sets the coding rate (LoRa only)
  *                          FSK : N/A ( set to 0 )
  *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
- * \param [IN] preambleLen  Sets the Preamble length
+ * \param[in] preambleLen  Sets the Preamble length
  *                          FSK : Number of bytes
  *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
- * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
- * \param [IN] payloadLen   Sets payload length when fixed length is used
- * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
+ * \param[in] fixLen       Fixed length packets [0: variable, 1: fixed]
+ * \param[in] payloadLen   Sets payload length when fixed length is used
+ * \param[in] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
  *
  * \retval airTime        Computed airTime (ms) for the given packet payload length
  */
@@ -253,8 +256,8 @@ static uint32_t RadioGetTimeOnAir(RadioModems_t modem, uint32_t bandwidth,
  * \brief Sends the buffer of size. Prepares the packet to be sent and sets
  *        the radio in transmission
  *
- * \param [IN]: buffer     Buffer pointer
- * \param [IN]: size       Buffer size
+ * \param[in] buffer     Buffer pointer
+ * \param[in] size       Buffer size
  */
 static void RadioSend(uint8_t *buffer, uint8_t size);
 
@@ -270,7 +273,7 @@ static void RadioStandby(void);
 
 /*!
  * \brief Sets the radio in reception mode for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRx(uint32_t timeout);
@@ -283,15 +286,17 @@ static void RadioStartCad(void);
 /*!
  * \brief Sets the radio in continuous wave transmission mode
  *
- * \param [IN]: freq       Channel RF frequency
- * \param [IN]: power      Sets the output power [dBm]
- * \param [IN]: time       Transmission mode timeout [s]
+ * \param[in] freq       Channel RF frequency
+ * \param[in] power      Sets the output power [dBm]
+ * \param[in] time       Transmission mode timeout [s]
  */
 static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time);
 
 /*!
  * \brief Reads the current RSSI value
  *
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ *
  * \retval rssiValue Current RSSI value in [dBm]
  */
 static int16_t RadioRssi(RadioModems_t modem);
@@ -299,15 +304,15 @@ static int16_t RadioRssi(RadioModems_t modem);
 /*!
  * \brief Writes the radio register at the specified address
  *
- * \param [IN]: addr Register address
- * \param [IN]: data New register value
+ * \param[in] addr Register address
+ * \param[in] data New register value
  */
 static void RadioWrite(uint16_t addr, uint8_t data);
 
 /*!
  * \brief Reads the radio register at the specified address
  *
- * \param [IN]: addr Register address
+ * \param[in] addr Register address
  * \retval data Register value
  */
 static uint8_t RadioRead(uint16_t addr);
@@ -315,26 +320,26 @@ static uint8_t RadioRead(uint16_t addr);
 /*!
  * \brief Writes multiple radio registers starting at address
  *
- * \param [IN] addr   First Radio register address
- * \param [IN] buffer Buffer containing the new register's values
- * \param [IN] size   Number of registers to be written
+ * \param[in] addr   First Radio register address
+ * \param[in] buffer Buffer containing the new register's values
+ * \param[in] size   Number of registers to be written
  */
 static void RadioWriteRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Reads multiple radio registers starting at address
  *
- * \param [IN] addr First Radio register address
- * \param [OUT] buffer Buffer where to copy the registers data
- * \param [IN] size Number of registers to be read
+ * \param[in] addr First Radio register address
+ * \param[out] buffer Buffer where to copy the registers data
+ * \param[in] size Number of registers to be read
  */
 static void RadioReadRegisters(uint16_t addr, uint8_t *buffer, uint8_t size);
 
 /*!
  * \brief Sets the maximum payload length.
  *
- * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
- * \param [IN] max        Maximum payload length in bytes
+ * \param[in] modem      Radio modem to be used [0: FSK, 1: LoRa]
+ * \param[in] max        Maximum payload length in bytes
  */
 static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
 
@@ -343,7 +348,7 @@ static void RadioSetMaxPayloadLength(RadioModems_t modem, uint8_t max);
  *
  * \remark Applies to LoRa modem only
  *
- * \param [IN] enable if true, it enables a public network
+ * \param[in] enable if true, it enables a public network
  */
 static void RadioSetPublicNetwork(bool enable);
 
@@ -356,7 +361,7 @@ static uint32_t RadioGetWakeUpTime(void);
 
 /*!
  * \brief Sets the radio in reception mode with Max LNA gain for the given time
- * \param [IN] timeout Reception timeout [ms]
+ * \param[in] timeout Reception timeout [ms]
  *                     [0: continuous, others timeout]
  */
 static void RadioRxBoosted(uint32_t timeout);
@@ -364,51 +369,49 @@ static void RadioRxBoosted(uint32_t timeout);
 /*!
  * \brief Sets the Rx duty cycle management parameters
  *
- * \param [in]  rxTime        Structure describing reception timeout value
- * \param [in]  sleepTime     Structure describing sleep timeout value
+ * \param[in]  rxTime        Structure describing reception timeout value
+ * \param[in]  sleepTime     Structure describing sleep timeout value
  */
 static void RadioSetRxDutyCycle(uint32_t rxTime, uint32_t sleepTime);
 
 /*!
  * \brief Set Tx PRBS modulated wave
- * \retval none
  */
 static void RadioTxPrbs(void);
 
 /*!
  * \brief Set Tx continuous wave
- * \param [in]  power  Tx power level [0..15]
- * \retval none
+ * \param[in]  power  Tx power level [0..15]
  */
 static void RadioTxCw(int8_t power);
 
 /*!
  * \brief Sets the reception parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
- * \param [IN] rxContinuous Sets the reception in continuous mode
+ * \param[in] rxContinuous Sets the reception in continuous mode
  *                          [0: single mode, otherwise continuous mode]
- * \param [IN] symbTimeout  Sets the RxSingle timeout value
+ * \param[in] symbTimeout  Sets the RxSingle timeout value
  *                          FSK : timeout in number of bytes
  *                          LoRa: timeout in symbols
  * \return 0 when no parameters error, -1 otherwise
  */
-static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t* config,
+static int32_t RadioSetRxGenericConfig(GenericModems_t modem, RxConfigGeneric_t *config,
                                        uint32_t rxContinuous, uint32_t symbTimeout);
 
 /*!
  * \brief Sets the transmission parameters
  *
- * \param [IN] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
- * \param [IN] config       configuration of receiver
+ * \param[in] modem        Radio modem to be used [GENERIC_FSK or GENERIC_FSK or GENERIC_BPSK]
+ * \param[in] config       configuration of receiver
  *                          fsk field to be used if modem =GENERIC_FSK
 *                           lora field to be used if modem =GENERIC_LORA
                             bpsk field to be used if modem =GENERIC_BPSK
- * \param [IN] power        Sets the output power [dBm]
- * \param [IN] timeout      Transmission timeout [ms]
+ * \param[in] power        Sets the output power [dBm]
+ * \param[in] timeout      Transmission timeout [ms]
  * \return 0 when no parameters error, -1 otherwise
  */
 static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t *config,
@@ -461,11 +464,6 @@ const struct Radio_s Radio =
 /* USER CODE END PFP */
 
 /* Exported functions --------------------------------------------------------*/
-/**
-  * @brief This function processes the radio events callbacks  from Cm0
-  * @param ComObj : parameters
-  * @retval none
-  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
 {
   /* USER CODE BEGIN Process_Radio_Notif_1 */
@@ -486,7 +484,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -500,7 +498,7 @@ void Process_Radio_Notif(MBMUX_ComParam_t *ComObj)
       }
       else
       {
-        while (1) {}
+        Error_Handler();
       }
       /* prepare response buffer */
       ComObj->ParamCnt = 0; /* reset ParamCnt */
@@ -564,7 +562,7 @@ static void RadioInit(RadioEvents_t *events)
 
   if (events == NULL)
   {
-    while (1) {}
+    Error_Handler();
   }
 
   radioevents_wrap.TxDone = events->TxDone;
@@ -590,7 +588,7 @@ static void RadioInit(RadioEvents_t *events)
 /*!
   * Return current radio status
   *
-  * \param status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
+  * \retval status Radio status.[RF_IDLE, RF_RX_RUNNING, RF_TX_RUNNING]
   */
 static RadioState_t RadioGetStatus(void)
 {
@@ -999,7 +997,7 @@ static void RadioSetTxContinuousWave(uint32_t freq, int8_t power, uint16_t time)
   uint16_t i = 0;
 
   com_obj = MBMUXIF_GetRadioFeatureCmdComPtr();
-  com_obj->MsgId = RADIO_SET_TX_CONTINOUS_WAVE_ID;
+  com_obj->MsgId = RADIO_SET_TX_CONTINUOUS_WAVE_ID;
   com_buffer = com_obj->ParamBuf;
   com_buffer[i++] = (uint32_t) freq;
   com_buffer[i++] = (uint32_t) power;
@@ -1424,10 +1422,4 @@ static int32_t RadioSetTxGenericConfig(GenericModems_t modem, TxConfigGeneric_t
 
 /* USER CODE END PrFD */
 
-/**
-  * @}
-  *
-  */
-
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.h
index f73a1283..e7eebe2c 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_mbwrapper.h
@@ -17,6 +18,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_MBWRAPPER_CM4_H__
@@ -54,6 +56,10 @@ extern "C" {
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+/**
+  * @brief This function processes the radio events callbacks from CM0+
+  * @param ComObj exchange buffer parameter
+  */
 void Process_Radio_Notif(MBMUX_ComParam_t *ComObj);
 
 /* USER CODE BEGIN EFP */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.c
index 9f1d503f..75c633b8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_subghz_phy.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "app_subghz_phy.h"
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.h
index 94916fb2..ec85aa39 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_subghz_phy.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_SUBGHZ_PHY_H__
 #define __APP_SUBGHZ_PHY_H__
@@ -52,15 +55,11 @@ extern "C" {
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init SubGHz Radio Application
-  * @param None
-  * @retval None
   */
 void MX_SubGHz_Phy_Init(void);
 
 /**
   * @brief  SubGHz Radio Application Process
-  * @param None
-  * @retval None
   */
 void MX_SubGHz_Phy_Process(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_version.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_version.h
index e1d28222..651bd86e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_version.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_version.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    app_version.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __APP_VERSION_H__
 #define __APP_VERSION_H__
@@ -37,7 +40,7 @@ extern "C" {
 
 /* Exported constants --------------------------------------------------------*/
 #define __APP_VERSION_MAIN   (0x01U) /*!< [31:24] main version */
-#define __APP_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */
+#define __APP_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */
 #define __APP_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */
 #define __APP_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.c
index 4bac9581..c680a53f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.c
@@ -33,16 +33,15 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
-#include "stm32_timer.h"
 #include "sys_app.h"
 #include "subghz_phy_app.h"
 #include "radio.h"
-#include "stm32_seq.h"
-#include "utilities_def.h"
 #include "app_version.h"
 
 /* USER CODE BEGIN Includes */
-
+#include "stm32_timer.h"
+#include "stm32_seq.h"
+#include "utilities_def.h"
 /* USER CODE END Includes */
 
 /* External variables ---------------------------------------------------------*/
@@ -51,23 +50,40 @@
 /* USER CODE END EV */
 
 /* Private typedef -----------------------------------------------------------*/
+
+/* USER CODE BEGIN PTD */
 typedef enum
 {
-  LOWPOWER,
   RX,
   RX_TIMEOUT,
   RX_ERROR,
   TX,
   TX_TIMEOUT,
 } States_t;
-
-/* USER CODE BEGIN PTD */
-
 /* USER CODE END PTD */
 
 /* Private define ------------------------------------------------------------*/
 /* USER CODE BEGIN PD */
-
+/* Configurations */
+/*Timeout*/
+#define RX_TIMEOUT_VALUE              3000
+#define TX_TIMEOUT_VALUE              3000
+/* PING string*/
+#define PING "PING"
+/* PONG string*/
+#define PONG "PONG"
+/*Size of the payload to be sent*/
+/* Size must be greater of equal the PING and PONG*/
+#define MAX_APP_BUFFER_SIZE          255
+#if (PAYLOAD_LEN > MAX_APP_BUFFER_SIZE)
+#error PAYLOAD_LEN must be less or equal than MAX_APP_BUFFER_SIZE
+#endif /* (PAYLOAD_LEN > MAX_APP_BUFFER_SIZE) */
+/* wait for remote to be in Rx, before sending a Tx frame*/
+#define RX_TIME_MARGIN                200
+/* Afc bandwidth in Hz */
+#define FSK_AFC_BANDWIDTH             83333
+/* LED blink Period*/
+#define LED_PERIOD_MS                 200
 /* USER CODE END PD */
 
 /* Private macro -------------------------------------------------------------*/
@@ -76,101 +92,91 @@ typedef enum
 /* USER CODE END PM */
 
 /* Private variables ---------------------------------------------------------*/
-const uint8_t PingMsg[] = "PING";
-const uint8_t PongMsg[] = "PONG";
-
-uint16_t BufferSize = BUFFER_SIZE;
-UTIL_MEM_PLACE_IN_SECTION("MB_MEM1")  uint8_t Buffer[BUFFER_SIZE];
-
-States_t State = LOWPOWER;
+/* Radio events function pointer */
+static RadioEvents_t RadioEvents;
+/* USER CODE BEGIN PV */
 
+/*Ping Pong FSM states */
+static States_t State = RX;
+/* App Rx Buffer*/
+static uint8_t BufferRx[MAX_APP_BUFFER_SIZE];
+/* App Tx Buffer*/
+static uint8_t BufferTx[MAX_APP_BUFFER_SIZE];
+/* Last  Received Buffer Size*/
+uint16_t RxBufferSize = 0;
+/* Last  Received packer Rssi*/
 int8_t RssiValue = 0;
+/* Last  Received packer SNR (in Lora modulation)*/
 int8_t SnrValue = 0;
-
 /* Led Timers objects*/
-static  UTIL_TIMER_Object_t timerLed;
-
+static UTIL_TIMER_Object_t timerLed;
+/* device state. Master: true, Slave: false*/
 bool isMaster = true;
-
-/* Radio events function pointer */
-static RadioEvents_t RadioEvents;
-
-/* USER CODE BEGIN PV */
-
+/* random delay to make sure 2 devices will sync*/
+/* the closest the random delays are, the longer it will
+   take for the devices to sync when started simultaneously*/
+static int32_t random_delay;
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/*!
- * @brief  Function executed on when led timer elapses
- * @param  LED context
- * @retval none
- */
-static void OnledEvent(void *context);
-
 /*!
  * @brief Function to be executed on Radio Tx Done event
- * @param  none
- * @retval none
  */
 static void OnTxDone(void);
 
-/*!
- * @brief Function to be executed on Radio Rx Done event
- * @param  payload sent
- * @param  payload size
- * @param  rssi
- * @param  snr
- * @retval none
- */
-static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
+/**
+  * @brief Function to be executed on Radio Rx Done event
+  * @param  payload ptr of buffer received
+  * @param  size buffer size
+  * @param  rssi
+  * @param  LoraSnr_FskCfo
+  */
+static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo);
 
-/*!
- * @brief Function executed on Radio Tx Timeout event
- * @param  none
- * @retval none
- */
+/**
+  * @brief Function executed on Radio Tx Timeout event
+  */
 static void OnTxTimeout(void);
 
-/*!
- * @brief Function executed on Radio Rx Timeout event
- * @param  none
- * @retval none
- */
+/**
+  * @brief Function executed on Radio Rx Timeout event
+  */
 static void OnRxTimeout(void);
 
-/*!
- * @brief Function executed on Radio Rx Error event
- * @param  none
- * @retval none
- */
+/**
+  * @brief Function executed on Radio Rx Error event
+  */
 static void OnRxError(void);
 
-/*!
- * @brief PingPong state machine implementation
- * @param  none
- * @retval none
- */
-static void PingPong_Process(void);
-
 /* USER CODE BEGIN PFP */
+/**
+  * @brief  Function executed on when led timer elapses
+  * @param  context ptr of LED context
+  */
+static void OnledEvent(void *context);
 
+/**
+  * @brief PingPong state machine implementation
+  */
+static void PingPong_Process(void);
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
 void SubghzApp_Init(void)
 {
   /* USER CODE BEGIN SubghzApp_Init_1 */
-
-  /* USER CODE END SubghzApp_Init_1 */
+  APP_LOG(TS_OFF, VLEVEL_M, "\n\rPING PONG\n\r");
   /* Print APP version*/
-  APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION= V%X.%X.%X\r\n", (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
-          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB1_SHIFT), (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
+  APP_LOG(TS_OFF, VLEVEL_M, "APP_VERSION= V%X.%X.%X\r\n",
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_MAIN_SHIFT),
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB1_SHIFT),
+          (uint8_t)(__CM4_APP_VERSION >> __APP_VERSION_SUB2_SHIFT));
 
   /* Led Timers*/
   UTIL_TIMER_Create(&timerLed, 0xFFFFFFFFU, UTIL_TIMER_ONESHOT, OnledEvent, NULL);
   UTIL_TIMER_SetPeriod(&timerLed, LED_PERIOD_MS);
-
   UTIL_TIMER_Start(&timerLed);
+  /* USER CODE END SubghzApp_Init_1 */
 
   /* Radio initialization */
   RadioEvents.TxDone = OnTxDone;
@@ -181,7 +187,17 @@ void SubghzApp_Init(void)
 
   Radio.Init(&RadioEvents);
 
-#if (( USE_MODEM_LORA == 1 ) && ( USE_MODEM_FSK == 0 ))
+  /* USER CODE BEGIN SubghzApp_Init_2 */
+  /* Radio Set frequency */
+  Radio.SetChannel(RF_FREQUENCY);
+
+  /* Radio configuration */
+#if ((USE_MODEM_LORA == 1) && (USE_MODEM_FSK == 0))
+  APP_LOG(TS_OFF, VLEVEL_M, "---------------\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "LORA_MODULATION\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "LORA_BW=%d kHz\n\r", (1 << LORA_BANDWIDTH) * 125);
+  APP_LOG(TS_OFF, VLEVEL_M, "LORA_SF=%d\n\r", LORA_SPREADING_FACTOR);
+
   Radio.SetTxConfig(MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH,
                     LORA_SPREADING_FACTOR, LORA_CODINGRATE,
                     LORA_PREAMBLE_LENGTH, LORA_FIX_LENGTH_PAYLOAD_ON,
@@ -192,9 +208,13 @@ void SubghzApp_Init(void)
                     LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
                     0, true, 0, 0, LORA_IQ_INVERSION_ON, true);
 
-  Radio.SetMaxPayloadLength(MODEM_LORA, BUFFER_SIZE);
+  Radio.SetMaxPayloadLength(MODEM_LORA, MAX_APP_BUFFER_SIZE);
 
-#elif (( USE_MODEM_LORA == 0 ) && ( USE_MODEM_FSK == 1 ))
+#elif ((USE_MODEM_LORA == 0) && (USE_MODEM_FSK == 1))
+  APP_LOG(TS_OFF, VLEVEL_M, "---------------\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_MODULATION\n\r");
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_BW=%d Hz\n\r", FSK_BANDWIDTH);
+  APP_LOG(TS_OFF, VLEVEL_M, "FSK_DR=%d bits/s\n\r", FSK_DATARATE);
 
   Radio.SetTxConfig(MODEM_FSK, TX_OUTPUT_POWER, FSK_FDEV, 0,
                     FSK_DATARATE, 0,
@@ -206,30 +226,24 @@ void SubghzApp_Init(void)
                     0, FSK_FIX_LENGTH_PAYLOAD_ON, 0, true,
                     0, 0, false, true);
 
-  Radio.SetMaxPayloadLength(MODEM_FSK, BUFFER_SIZE);
+  Radio.SetMaxPayloadLength(MODEM_FSK, MAX_APP_BUFFER_SIZE);
 
 #else
-#error "Please define a frequency band in the sys_conf.h file."
+#error "Please define a modulation in the subghz_phy_app.h file."
 #endif /* USE_MODEM_LORA | USE_MODEM_FSK */
-
-  Radio.SetChannel(RF_FREQUENCY);
-
-#if defined(USE_BSP_DRIVER)
+  /* LED initialization*/
   BSP_LED_Init(LED_GREEN);
   BSP_LED_Init(LED_RED);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Init(SYS_LED_GREEN);
-  SYS_LED_Init(SYS_LED_RED);
-#else
-#error user to provide its board code or to call his board driver functions
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC*/
-
-  Radio.Rx(RX_TIMEOUT_VALUE);
-
-  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_PingPong_Process), UTIL_SEQ_RFU, PingPong_Process);
-
-  /* USER CODE BEGIN SubghzApp_Init_2 */
-
+  /*calculate random delay for synchronization*/
+  random_delay = (Radio.Random()) >> 22; /*10bits random e.g. from 0 to 1023 ms*/
+  /*fills tx buffer*/
+  memset(BufferTx, 0x0, MAX_APP_BUFFER_SIZE);
+
+  APP_LOG(TS_ON, VLEVEL_L, "rand=%d\n\r", random_delay);
+  /*starts reception*/
+  Radio.Rx(RX_TIMEOUT_VALUE + random_delay);
+  /*register task to to be run in while(1) after Radio IT*/
+  UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), UTIL_SEQ_RFU, PingPong_Process);
   /* USER CODE END SubghzApp_Init_2 */
 }
 
@@ -238,12 +252,96 @@ void SubghzApp_Init(void)
 /* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
-static void PingPong_Process(void)
+
+static void OnTxDone(void)
+{
+  /* USER CODE BEGIN OnTxDone */
+  APP_LOG(TS_ON, VLEVEL_L, "OnTxDone\n\r");
+  /* Update the State of the FSM*/
+  State = TX;
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnTxDone */
+}
+
+static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t LoraSnr_FskCfo)
+{
+  /* USER CODE BEGIN OnRxDone */
+  APP_LOG(TS_ON, VLEVEL_L, "OnRxDone\n\r");
+#if ((USE_MODEM_LORA == 1) && (USE_MODEM_FSK == 0))
+  APP_LOG(TS_ON, VLEVEL_L, "RssiValue=%d dBm, SnrValue=%ddB\n\r", rssi, LoraSnr_FskCfo);
+  /* Record payload Signal to noise ratio in Lora*/
+  SnrValue = LoraSnr_FskCfo;
+#endif /* USE_MODEM_LORA | USE_MODEM_FSK */
+#if ((USE_MODEM_LORA == 0) && (USE_MODEM_FSK == 1))
+  APP_LOG(TS_ON, VLEVEL_L, "RssiValue=%d dBm, Cfo=%dkHz\n\r", rssi, LoraSnr_FskCfo);
+  SnrValue = 0; /*not applicable in GFSK*/
+#endif /* USE_MODEM_LORA | USE_MODEM_FSK */
+  /* Update the State of the FSM*/
+  State = RX;
+  /* Clear BufferRx*/
+  memset(BufferRx, 0, MAX_APP_BUFFER_SIZE);
+  /* Record payload size*/
+  RxBufferSize = size;
+  if (RxBufferSize <= MAX_APP_BUFFER_SIZE)
+  {
+    memcpy(BufferRx, payload, RxBufferSize);
+  }
+  /* Record Received Signal Strength*/
+  RssiValue = rssi;
+  /* Record payload content*/
+  APP_LOG(TS_ON, VLEVEL_H, "payload. size=%d \n\r", size);
+  for (int i = 0; i < PAYLOAD_LEN; i++)
+  {
+    APP_LOG(TS_OFF, VLEVEL_H, "%02X", BufferRx[i]);
+    if (i % 16 == 15)
+    {
+      APP_LOG(TS_OFF, VLEVEL_H, "\n\r");
+    }
+  }
+  APP_LOG(TS_OFF, VLEVEL_H, "\n\r");
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnRxDone */
+}
+
+static void OnTxTimeout(void)
 {
-  /* USER CODE BEGIN PingPong_Process_1 */
+  /* USER CODE BEGIN OnTxTimeout */
+  APP_LOG(TS_ON, VLEVEL_L, "OnTxTimeout\n\r");
+  /* Update the State of the FSM*/
+  State = TX_TIMEOUT;
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnTxTimeout */
+}
 
-  /* USER CODE END PingPong_Process_1 */
-  uint8_t i;
+static void OnRxTimeout(void)
+{
+  /* USER CODE BEGIN OnRxTimeout */
+  APP_LOG(TS_ON, VLEVEL_L, "OnRxTimeout\n\r");
+  /* Update the State of the FSM*/
+  State = RX_TIMEOUT;
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnRxTimeout */
+}
+
+static void OnRxError(void)
+{
+  /* USER CODE BEGIN OnRxError */
+  APP_LOG(TS_ON, VLEVEL_L, "OnRxError\n\r");
+  /* Update the State of the FSM*/
+  State = RX_ERROR;
+  /* Run PingPong process in background*/
+  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_SubGHz_Phy_App_Process), CFG_SEQ_Prio_0);
+  /* USER CODE END OnRxError */
+}
+
+/* USER CODE BEGIN PrFD */
+static void PingPong_Process(void)
+{
+  Radio.Sleep();
 
   switch (State)
   {
@@ -251,50 +349,30 @@ static void PingPong_Process(void)
 
       if (isMaster == true)
       {
-        if (BufferSize > 0)
+        if (RxBufferSize > 0)
         {
-          if (strncmp((const char *)Buffer, (const char *)PongMsg, 4) == 0)
+          if (strncmp((const char *)BufferRx, PONG, sizeof(PONG) - 1) == 0)
           {
             UTIL_TIMER_Stop(&timerLed);
-
-#if defined(USE_BSP_DRIVER)
-            BSP_LED_Off(LED_GREEN) ;
-            /* Indicates on a LED that the received frame is a PONG */
-            BSP_LED_Toggle(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_Off(SYS_LED_GREEN) ;
-            /* Indicates on a LED that the received frame is a PONG */
-            SYS_LED_Toggle(SYS_LED_RED) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-            /* Send the next PING frame */
-            Buffer[0] = 'P';
-            Buffer[1] = 'I';
-            Buffer[2] = 'N';
-            Buffer[3] = 'G';
-            /* We fill the buffer with numbers for the payload */
-            for (i = 4; i < BufferSize; i++)
-            {
-              Buffer[i] = i - 4;
-            }
-            APP_LOG(TS_ON, VLEVEL_L, "...PING\n\r");
-
+            /* switch off green led */
+            BSP_LED_Off(LED_GREEN);
+            /* master toggles red led */
+            BSP_LED_Toggle(LED_RED);
+            /* Add delay between RX and TX */
+            HAL_Delay(Radio.GetWakeupTime() + RX_TIME_MARGIN);
+            /* master sends PING*/
+            APP_LOG(TS_ON, VLEVEL_L, "..."
+                    "PING"
+                    "\n\r");
             APP_LOG(TS_ON, VLEVEL_L, "Master Tx start\n\r");
-
-            Radio.SetChannel(RF_FREQUENCY);
-
-            /* Add delay between TX and RX =
-            time Busy_signal is ON in RX opening window */
-            HAL_Delay(Radio.GetWakeupTime() + TCXO_WORKAROUND_TIME_MARGIN);
-
-            Radio.Send(Buffer, BufferSize);
+            memcpy(BufferTx, PING, sizeof(PING) - 1);
+            Radio.Send(BufferTx, PAYLOAD_LEN);
           }
-          else if (strncmp((const char *)Buffer, (const char *)PingMsg, 4) == 0)
+          else if (strncmp((const char *)BufferRx, PING, sizeof(PING) - 1) == 0)
           {
             /* A master already exists then become a slave */
             isMaster = false;
             APP_LOG(TS_ON, VLEVEL_L, "Slave Rx start\n\r");
-
-            Radio.SetChannel(RF_FREQUENCY);
             Radio.Rx(RX_TIMEOUT_VALUE);
           }
           else /* valid reception but neither a PING or a PONG message */
@@ -302,218 +380,80 @@ static void PingPong_Process(void)
             /* Set device as master and start again */
             isMaster = true;
             APP_LOG(TS_ON, VLEVEL_L, "Master Rx start\n\r");
-
-            Radio.SetChannel(RF_FREQUENCY);
             Radio.Rx(RX_TIMEOUT_VALUE);
           }
         }
       }
       else
       {
-        if (BufferSize > 0)
+        if (RxBufferSize > 0)
         {
-          if (strncmp((const char *)Buffer, (const char *)PingMsg, 4) == 0)
+          if (strncmp((const char *)BufferRx, PING, sizeof(PING) - 1) == 0)
           {
-            /* Indicates on a LED that the received frame is a PING */
             UTIL_TIMER_Stop(&timerLed);
-
-#if defined(USE_BSP_DRIVER)
+            /* switch off red led */
             BSP_LED_Off(LED_RED);
+            /* slave toggles green led */
             BSP_LED_Toggle(LED_GREEN);
-#elif defined(MX_BOARD_PSEUDODRIVER)
-            SYS_LED_Off(SYS_LED_RED);
-            SYS_LED_Toggle(SYS_LED_GREEN);
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-            /* Send the reply to the PONG string */
-            Buffer[0] = 'P';
-            Buffer[1] = 'O';
-            Buffer[2] = 'N';
-            Buffer[3] = 'G';
-            /* We fill the buffer with numbers for the payload */
-            for (i = 4; i < BufferSize; i++)
-            {
-              Buffer[i] = i - 4;
-            }
+            /* Add delay between RX and TX */
+            HAL_Delay(Radio.GetWakeupTime() + RX_TIME_MARGIN);
+            /*slave sends PONG*/
+            APP_LOG(TS_ON, VLEVEL_L, "..."
+                    "PONG"
+                    "\n\r");
             APP_LOG(TS_ON, VLEVEL_L, "Slave  Tx start\n\r");
-            Radio.SetChannel(RF_FREQUENCY);
-
-            /* Add delay between TX and RX =
-            time Busy_signal is ON in RX opening window */
-            HAL_Delay(Radio.GetWakeupTime() + TCXO_WORKAROUND_TIME_MARGIN);
-
-            Radio.Send(Buffer, BufferSize);
-
-            APP_LOG(TS_ON, VLEVEL_L, "...PONG\n\r");
+            memcpy(BufferTx, PONG, sizeof(PONG) - 1);
+            Radio.Send(BufferTx, PAYLOAD_LEN);
           }
           else /* valid reception but not a PING as expected */
           {
             /* Set device as master and start again */
             isMaster = true;
             APP_LOG(TS_ON, VLEVEL_L, "Master Rx start\n\r");
-            Radio.SetChannel(RF_FREQUENCY);
             Radio.Rx(RX_TIMEOUT_VALUE);
           }
         }
       }
-      State = LOWPOWER;
       break;
     case TX:
-      /* Indicates on a LED that we have sent a PING [Master] */
-      /* Indicates on a LED that we have sent a PONG [Slave] */
-      Radio.SetChannel(RF_FREQUENCY);
       APP_LOG(TS_ON, VLEVEL_L, "Rx start\n\r");
       Radio.Rx(RX_TIMEOUT_VALUE);
-      State = LOWPOWER;
       break;
     case RX_TIMEOUT:
     case RX_ERROR:
       if (isMaster == true)
       {
         /* Send the next PING frame */
-        Buffer[0] = 'P';
-        Buffer[1] = 'I';
-        Buffer[2] = 'N';
-        Buffer[3] = 'G';
-        for (i = 4; i < BufferSize; i++)
-        {
-          Buffer[i] = i - 4;
-        }
+        /* Add delay between RX and TX*/
+        /* add random_delay to force sync between boards after some trials*/
+        HAL_Delay(Radio.GetWakeupTime() + RX_TIME_MARGIN + random_delay);
         APP_LOG(TS_ON, VLEVEL_L, "Master Tx start\n\r");
-
-        Radio.SetChannel(RF_FREQUENCY);
-        /* Add delay between TX and RX =
-        time Busy_signal is ON in RX opening window */
-        HAL_Delay(Radio.GetWakeupTime() + TCXO_WORKAROUND_TIME_MARGIN);
-
-        Radio.Send(Buffer, BufferSize);
+        /* master sends PING*/
+        memcpy(BufferTx, PING, sizeof(PING) - 1);
+        Radio.Send(BufferTx, PAYLOAD_LEN);
       }
       else
       {
         APP_LOG(TS_ON, VLEVEL_L, "Slave Rx start\n\r");
-
-        Radio.SetChannel(RF_FREQUENCY);
         Radio.Rx(RX_TIMEOUT_VALUE);
       }
-      State = LOWPOWER;
       break;
     case TX_TIMEOUT:
-      Radio.SetChannel(RF_FREQUENCY);
       APP_LOG(TS_ON, VLEVEL_L, "Slave Rx start\n\r");
       Radio.Rx(RX_TIMEOUT_VALUE);
-      State = LOWPOWER;
       break;
-    case LOWPOWER:
     default:
-      /* Set low power */
       break;
   }
-  /* USER CODE BEGIN PingPong_Process_2 */
-
-  /* USER CODE END PingPong_Process_2 */
-}
-
-static void OnTxDone(void)
-{
-  /* USER CODE BEGIN OnTxDone_1 */
-
-  /* USER CODE END OnTxDone_1 */
-  APP_LOG(TS_ON, VLEVEL_L, "OnTxDone\n\r");
-
-  Radio.Sleep();
-  State = TX;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnTxDone_2 */
-
-  /* USER CODE END OnTxDone_2 */
-}
-
-static void OnRxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
-{
-  /* USER CODE BEGIN OnRxDone_1 */
-
-  /* USER CODE END OnRxDone_1 */
-  APP_LOG(TS_ON, VLEVEL_L, "OnRxDone\n\r");
-  APP_LOG(TS_ON, VLEVEL_L,  "RssiValue=%d dBm, SnrValue=%d\n\r", rssi, snr);
-
-  Radio.Sleep();
-  BufferSize = size;
-  memcpy(Buffer, payload, BufferSize);
-  RssiValue = rssi;
-  SnrValue = snr;
-  State = RX;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-
-  /* USER CODE BEGIN OnRxDone_2 */
-
-  /* USER CODE END OnRxDone_2 */
-}
-
-static void OnTxTimeout(void)
-{
-  /* USER CODE BEGIN OnTxTimeout_1 */
-
-  /* USER CODE END OnTxTimeout_1 */
-  APP_LOG(TS_ON, VLEVEL_L,  "OnTxTimeout\n\r");
-
-  Radio.Sleep();
-  State = TX_TIMEOUT;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnTxTimeout_2 */
-
-  /* USER CODE END OnTxTimeout_2 */
-}
-
-static void OnRxTimeout(void)
-{
-  /* USER CODE BEGIN OnRxTimeout_1 */
-
-  /* USER CODE END OnRxTimeout_1 */
-  APP_LOG(TS_ON, VLEVEL_L,  "OnRxTimeout\n\r");
-
-  Radio.Sleep();
-  State = RX_TIMEOUT;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnRxTimeout_2 */
-
-  /* USER CODE END OnRxTimeout_2 */
-}
-
-static void OnRxError(void)
-{
-  /* USER CODE BEGIN OnRxError_1 */
-
-  /* USER CODE END OnRxError_1 */
-  APP_LOG(TS_ON, VLEVEL_L, "OnRxError\n\r");
-
-  Radio.Sleep();
-  State = RX_ERROR;
-  UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_PingPong_Process), CFG_SEQ_Prio_0);
-  /* USER CODE BEGIN OnRxError_2 */
-
-  /* USER CODE END OnRxError_2 */
 }
 
 static void OnledEvent(void *context)
 {
-  /* USER CODE BEGIN OnledEvent_1 */
-
-  /* USER CODE END OnledEvent_1 */
-#if defined(USE_BSP_DRIVER)
-  BSP_LED_Toggle(LED_GREEN) ;
-  BSP_LED_Toggle(LED_RED) ;
-#elif defined(MX_BOARD_PSEUDODRIVER)
-  SYS_LED_Toggle(SYS_LED_RED) ;
-  SYS_LED_Toggle(SYS_LED_GREEN) ;
-#endif /* USE_BSP_DRIVER || MX_BOARD_PSEUDODRIVER */
-
+  BSP_LED_Toggle(LED_GREEN);
+  BSP_LED_Toggle(LED_RED);
   UTIL_TIMER_Start(&timerLed);
-  /* USER CODE BEGIN OnledEvent_2 */
-
-  /* USER CODE END OnledEvent_2 */
 }
 
-/* USER CODE BEGIN PrFD */
-
 /* USER CODE END PrFD */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.h
index ee3f9b2b..245ca9e7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    subghz_phy_app.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SUBGHZ_PHY_APP_H__
 #define __SUBGHZ_PHY_APP_H__
@@ -100,7 +103,6 @@ extern "C" {
 #define FSK_FDEV                                    25000     /* Hz */
 #define FSK_DATARATE                                50000     /* bps */
 #define FSK_BANDWIDTH                               50000     /* Hz */
-#define FSK_AFC_BANDWIDTH                           83333     /* Hz */
 #define FSK_PREAMBLE_LENGTH                         5         /* Same for Tx and Rx */
 #define FSK_FIX_LENGTH_PAYLOAD_ON                   false
 
@@ -108,12 +110,7 @@ extern "C" {
 #error "Please define a modem in the compiler subghz_phy_app.h."
 #endif /* USE_MODEM_LORA | USE_MODEM_FSK */
 
-#define RX_TIMEOUT_VALUE                            2000
-#define TX_TIMEOUT_VALUE                            3000
-#define BUFFER_SIZE                                 64  /* Define the payload size here */
-#define LED_PERIOD_MS                               200
-
-#define TCXO_WORKAROUND_TIME_MARGIN                 50  /* 50ms margin */
+#define PAYLOAD_LEN                                 64
 
 /* USER CODE BEGIN EC */
 
@@ -129,16 +126,9 @@ extern "C" {
 
 /* USER CODE END EM */
 
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
 /* Exported functions prototypes ---------------------------------------------*/
 /**
   * @brief  Init Subghz Application
-  * @param None
-  * @retval None
   */
 void SubghzApp_Init(void);
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/Target/timer.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/Target/timer.h
deleted file mode 100644
index 33389639..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/Target/timer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    timer.h
-  * @author  MCD Application Team
-  * @brief   Wrapper to timer server
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
-  */
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __TIMER_H__
-#define __TIMER_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_timer.h"
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Max timer mask
-  */
-#define TIMERTIME_T_MAX ( ( uint32_t )~0 )
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* External variables --------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Timer value on 32 bits
-  */
-#define TimerTime_t UTIL_TIMER_Time_t
-
-/**
-  * @brief Timer object description
-  */
-#define TimerEvent_t UTIL_TIMER_Object_t
-
-/**
-  * @brief Create the timer object
-  */
-#define TimerInit(HANDLE, CB) do {\
-                                   UTIL_TIMER_Create( HANDLE, TIMERTIME_T_MAX, UTIL_TIMER_ONESHOT, CB, NULL);\
-                                 } while(0)
-
-/**
-  * @brief update the period and start the timer
-  */
-#define TimerSetValue(HANDLE, TIMEOUT) do{ \
-                                           UTIL_TIMER_SetPeriod(HANDLE, TIMEOUT);\
-                                         } while(0)
-
-/**
-  * @brief Start and adds the timer object to the list of timer events
-  */
-#define TimerStart(HANDLE)   do {\
-                                  UTIL_TIMER_Start(HANDLE);\
-                                } while(0)
-
-/**
-  * @brief Stop and removes the timer object from the list of timer events
-  */
-#define TimerStop(HANDLE)   do {\
-                                 UTIL_TIMER_Stop(HANDLE);\
-                               } while(0)
-
-/**
-  * @brief return the current time
-  */
-#define TimerGetCurrentTime  UTIL_TIMER_GetCurrentTime
-
-/**
-  * @brief return the elapsed time
-  */
-#define TimerGetElapsedTime UTIL_TIMER_GetElapsedTime
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TIMER_H__*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/board_resources.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/board_resources.c
deleted file mode 100644
index f56e979b..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/board_resources.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.c
-  * @author  MCD Application Team
-  * @brief   Source file
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-/* Includes ------------------------------------------------------------------*/
-#include "platform.h"
-#include "board_resources.h"
-#include "stm32wlxx_hal_exti.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* External variables ---------------------------------------------------------*/
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Private typedef -----------------------------------------------------------*/
-/**
-  * @brief Exti Line callback function definition
-  */
-typedef void (* SYS_RES_EXTI_LineCallback)(void);
-
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-/**
-  * @brief Ports led list
-  */
-static GPIO_TypeDef  *SYS_LED_PORT[SYS_LEDn] = {SYS_LED3_GPIO_PORT, SYS_LED2_GPIO_PORT, SYS_LED1_GPIO_PORT, };
-
-/**
-  * @brief Pins led list
-  */
-static const uint16_t SYS_LED_PIN[SYS_LEDn] = {SYS_LED3_PIN, SYS_LED2_PIN, SYS_LED1_PIN, };
-
-/**
-  * @brief Ports button list
-  */
-static GPIO_TypeDef   *SYS_BUTTON_PORT[SYS_BUTTONn] = {SYS_BUTTON1_GPIO_PORT, SYS_BUTTON3_GPIO_PORT, SYS_BUTTON2_GPIO_PORT, };
-
-/**
-  * @brief Pins button list
-  */
-static const uint16_t  SYS_BUTTON_PIN[SYS_BUTTONn] = {SYS_BUTTON1_PIN, SYS_BUTTON3_PIN, SYS_BUTTON2_PIN, };
-
-/**
-  * @brief IRQ button IDs list
-  */
-static const IRQn_Type SYS_BUTTON_IRQn[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_IRQn, SYS_BUTTON3_EXTI_IRQn, SYS_BUTTON2_EXTI_IRQn, };
-EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief Button SW1 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON1_EXTI_Callback(void);
-
-/**
-  * @brief Button SW3 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON3_EXTI_Callback(void);
-
-/**
-  * @brief Button SW2 EXTI line detection callback.
-  * @return none
-  */
-static void SYS_BUTTON2_EXTI_Callback(void);
-
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Exported functions --------------------------------------------------------*/
-int32_t SYS_LED_Init(Sys_Led_TypeDef Led)
-{
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-  /* Enable the GPIO_SYS_LED Clock */
-  SYS_LEDx_GPIO_CLK_ENABLE(Led);
-
-  /* Configure the GPIO_SYS_LED pin */
-  gpio_init_structure.Pin = SYS_LED_PIN[Led];
-  gpio_init_structure.Mode = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  HAL_GPIO_Init(SYS_LED_PORT[Led], &gpio_init_structure);
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_DeInit(Sys_Led_TypeDef Led)
-{
-  /* Turn off SYS_LED */
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  /* DeInit the GPIO_SYS_LED pin */
-  HAL_GPIO_DeInit(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_On(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_SET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Off(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_WritePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led], GPIO_PIN_RESET);
-
-  return 0;
-}
-
-int32_t SYS_LED_Toggle(Sys_Led_TypeDef Led)
-{
-  HAL_GPIO_TogglePin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-
-  return 0;
-}
-
-int32_t SYS_LED_GetState(Sys_Led_TypeDef Led)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_LED_PORT[Led], SYS_LED_PIN[Led]);
-}
-
-int32_t SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode)
-{
-  GPIO_InitTypeDef gpio_init_structure = {0};
-  static SYS_RES_EXTI_LineCallback button_callback[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_Callback, SYS_BUTTON2_EXTI_Callback, SYS_BUTTON3_EXTI_Callback};
-  static uint32_t button_interrupt_priority[SYS_BUTTONn] = {SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY, SYS_BUTTONx_IT_PRIORITY};
-  static const uint32_t button_exti_line[SYS_BUTTONn] = {SYS_BUTTON1_EXTI_LINE, SYS_BUTTON2_EXTI_LINE, SYS_BUTTON3_EXTI_LINE};
-
-  /* Enable the SYS_BUTTON Clock */
-  SYS_BUTTONx_GPIO_CLK_ENABLE(Button);
-
-  gpio_init_structure.Pin = SYS_BUTTON_PIN[Button];
-  gpio_init_structure.Pull = GPIO_PULLUP;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_HIGH;
-
-  if (ButtonMode == SYS_BUTTON_MODE_GPIO)
-  {
-    /* Configure Button pin as input */
-    gpio_init_structure.Mode = GPIO_MODE_INPUT;
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-  }
-  else /* (ButtonMode == SYS_BUTTON_MODE_EXTI) */
-  {
-    /* Configure Button pin as input with External interrupt */
-    gpio_init_structure.Mode = GPIO_MODE_IT_FALLING;
-
-    HAL_GPIO_Init(SYS_BUTTON_PORT[Button], &gpio_init_structure);
-
-    (void)HAL_EXTI_GetHandle(&sys_hpb_exti[Button], button_exti_line[Button]);
-    (void)HAL_EXTI_RegisterCallback(&sys_hpb_exti[Button],  HAL_EXTI_COMMON_CB_ID, button_callback[Button]);
-
-    /* Enable and set Button EXTI Interrupt to the lowest priority */
-    HAL_NVIC_SetPriority((SYS_BUTTON_IRQn[Button]), button_interrupt_priority[Button], 0x00);
-    HAL_NVIC_EnableIRQ((SYS_BUTTON_IRQn[Button]));
-  }
-
-  return 0;
-}
-
-int32_t SYS_PB_DeInit(Sys_Button_TypeDef Button)
-{
-  HAL_NVIC_DisableIRQ((SYS_BUTTON_IRQn[Button]));
-  HAL_GPIO_DeInit(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-
-  return 0;
-}
-
-int32_t SYS_PB_GetState(Sys_Button_TypeDef Button)
-{
-  return (int32_t)HAL_GPIO_ReadPin(SYS_BUTTON_PORT[Button], SYS_BUTTON_PIN[Button]);
-}
-
-void SYS_PB_IRQHandler(Sys_Button_TypeDef Button)
-{
-  HAL_EXTI_IRQHandler(&sys_hpb_exti[Button]);
-}
-
-__weak void SYS_PB_Callback(Sys_Button_TypeDef Button)
-{
-  /* Prevent unused argument(s) compilation warning */
-  UNUSED(Button);
-
-  /* This function should be implemented by the user application.
-     It is called into this driver when an event on Button is triggered.*/
-}
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
-static void SYS_BUTTON1_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON1);
-}
-
-static void SYS_BUTTON3_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON3);
-}
-
-static void SYS_BUTTON2_EXTI_Callback(void)
-{
-  SYS_PB_Callback(SYS_BUTTON2);
-}
-
-/* USER CODE BEGIN PrFD */
-
-/* USER CODE END PrFD */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/board_resources.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/board_resources.h
deleted file mode 100644
index 8cf7f3ed..00000000
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/board_resources.h
+++ /dev/null
@@ -1,436 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file    board_resources.h
-  * @author  MCD Application Team
-  * @brief   Header for driver at.c module
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under Ultimate Liberty license
-  * SLA0044, the "License"; You may not use this file except in compliance with
-  * the License. You may obtain a copy of the License at:
-  *                             www.st.com/SLA0044
-  *
-  ******************************************************************************
-  */
-/* USER CODE END Header */
-
-#ifndef BOARD_RESOURCE_H
-#define BOARD_RESOURCE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include "utilities_conf.h"
-
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-/* Exported types ------------------------------------------------------------*/
-/**
-  * @brief Led enumeration
-  */
-typedef enum
-{
-  SYS_LED3 = 0,
-  SYS_LED2 = 1,
-  SYS_LED1 = 2,
-  /* Color SYS_LED aliases */
-  SYS_LED_BLUE   = SYS_LED1,
-  SYS_LED_GREEN  = SYS_LED2,
-  SYS_LED_RED    = SYS_LED3
-} Sys_Led_TypeDef;
-
-/**
-  * @brief Button enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON1 = 0,
-  SYS_BUTTON3 = 1,
-  SYS_BUTTON2 = 2,
-} Sys_Button_TypeDef;
-
-/**
-  * @brief Button mode enumeration
-  */
-typedef enum
-{
-  SYS_BUTTON_MODE_GPIO = 0,
-  SYS_BUTTON_MODE_EXTI = 1
-} Sys_ButtonMode_TypeDef;
-
-/* USER CODE BEGIN ET */
-
-/* USER CODE END ET */
-
-/* Exported constants --------------------------------------------------------*/
-/**
-  * @brief Number of leds
-  */
-#define SYS_LEDn                                     3U
-
-/**  Definition for BSP USER LED 3  **/
-/**
-  * @brief Pin of Led3
-  */
-#define SYS_LED3_PIN                                GPIO_PIN_11
-/**
-  * @brief Port of Led3
-  */
-#define SYS_LED3_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led3
-  */
-#define SYS_LED3_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 2  **/
-/**
-  * @brief Pin of Led2
-  */
-#define SYS_LED2_PIN                                GPIO_PIN_9
-/**
-  * @brief Port of Led2
-  */
-#define SYS_LED2_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led2
-  */
-#define SYS_LED2_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**  Definition for BSP USER LED 1  **/
-/**
-  * @brief Pin of Led1
-  */
-#define SYS_LED1_PIN                                GPIO_PIN_15
-/**
-  * @brief Port of Led1
-  */
-#define SYS_LED1_GPIO_PORT                          GPIOB
-/**
-  * @brief Enable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Led1
-  */
-#define SYS_LED1_GPIO_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-
-/**
-  * @brief Number of buttons
-  */
-#define SYS_BUTTONn                                 3U
-
-/**
-  * @brief Key push-buttons
-  */
-/**  Definition for BSP USER BUTTON 1   **/
-/**
-  * @brief Pin of Button1
-  */
-#define SYS_BUTTON1_PIN                    GPIO_PIN_0
-/**
-  * @brief Port of Button1
-  */
-#define SYS_BUTTON1_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button1
-  */
-#define SYS_BUTTON1_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button1
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON1_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON1_EXTI_IRQn              EXTI0_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button1
-  */
-#define SYS_BUTTON1_EXTI_LINE              EXTI_LINE_0
-/**
-  * @brief Exti handle of Button1
-  */
-#define H_EXTI_GPIO_PIN_0                  sys_hpb_exti[SYS_BUTTON1]
-/**  Definition for BSP USER BUTTON 3   **/
-/**
-  * @brief Pin of Button3
-  */
-#define SYS_BUTTON3_PIN                    GPIO_PIN_6
-/**
-  * @brief Port of Button3
-  */
-#define SYS_BUTTON3_GPIO_PORT              GPIOC
-/**
-  * @brief Enable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button3
-  */
-#define SYS_BUTTON3_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOC_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button3
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON3_EXTI_IRQn              EXTI15_4_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON3_EXTI_IRQn              EXTI9_5_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button3
-  */
-#define SYS_BUTTON3_EXTI_LINE              EXTI_LINE_6
-/**
-  * @brief Exti handle of Button3
-  */
-#define H_EXTI_GPIO_PIN_6                  sys_hpb_exti[SYS_BUTTON3]
-/**  Definition for BSP USER BUTTON 2   **/
-/**
-  * @brief Pin of Button2
-  */
-#define SYS_BUTTON2_PIN                    GPIO_PIN_1
-/**
-  * @brief Port of Button2
-  */
-#define SYS_BUTTON2_GPIO_PORT              GPIOA
-/**
-  * @brief Enable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_ENABLE()      __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Disable GPIOs clock of Button2
-  */
-#define SYS_BUTTON2_GPIO_CLK_DISABLE()     __HAL_RCC_GPIOA_CLK_ENABLE()
-/**
-  * @brief Interrupt number of Button2
-  */
-#if defined(CORE_CM0PLUS)
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_0_IRQn
-#else /* CORE_CM4 */
-#define SYS_BUTTON2_EXTI_IRQn              EXTI1_IRQn
-#endif /* CORE_CM0PLUS | CORE_CM4 */
-/**
-  * @brief Interrupt line of Button2
-  */
-#define SYS_BUTTON2_EXTI_LINE              EXTI_LINE_1
-/**
-  * @brief Exti handle of Button2
-  */
-#define H_EXTI_GPIO_PIN_1                  sys_hpb_exti[SYS_BUTTON2]
-
-/**
-  * IRQ priorities
-  */
-#define SYS_BUTTONx_IT_PRIORITY         15U
-
-/* USER CODE BEGIN EC */
-
-/* USER CODE END EC */
-
-/* Exported macro ------------------------------------------------------------*/
-/**
-  * @brief Enable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_ENABLE(__INDEX__)         __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Disable all Leds clock
-  */
-#define SYS_LEDx_GPIO_CLK_DISABLE(__INDEX__)        __HAL_RCC_GPIOB_CLK_ENABLE() /* All SYS_LED on same port */
-
-/**
-  * @brief Enable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_ENABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_ENABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_ENABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_ENABLE();} while(0)
-
-/**
-  * @brief Disable all Buttons clock
-  */
-#define SYS_BUTTONx_GPIO_CLK_DISABLE(__INDEX__)    do { if ((__INDEX__) == SYS_BUTTON1) SYS_BUTTON1_GPIO_CLK_DISABLE(); else \
-                                                       if ((__INDEX__) == SYS_BUTTON2) SYS_BUTTON2_GPIO_CLK_DISABLE(); else \
-                                                     if ((__INDEX__) == SYS_BUTTON3) SYS_BUTTON3_GPIO_CLK_DISABLE();} while(0)
-
-/* USER CODE BEGIN EM */
-
-/* USER CODE END EM */
-
-/* Exported variables ---------------------------------------------------------*/
-/**
-  * @brief Exti handles list
-  */
-extern EXTI_HandleTypeDef sys_hpb_exti[SYS_BUTTONn];
-/* USER CODE BEGIN EV */
-
-/* USER CODE END EV */
-
-/* Exported functions prototypes ---------------------------------------------*/
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_LED_Functions  LOW LEVEL LED Functions
-  * @{
-  */
-/**
-  * @brief  Configures SYS_LED GPIO.
-  * @param  SYS_LED to be configured
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Init(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  DeInit SYS_LEDs.
-  * @param  SYS_LED to be de-init
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @note Led DeInit does not disable the GPIO clock nor disable the Mfx
-  * @return BSP status
-  */
-int32_t          SYS_LED_DeInit(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED On.
-  * @param  SYS_LED Specifies the Led to be set on
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_On(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Turns selected SYS_LED Off.
-  * @param  SYS_LED Specifies the Led to be set off
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Off(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Toggles the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to be toggled
-  *         This parameter can be one of the following values:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return BSP status
-  */
-int32_t          SYS_LED_Toggle(Sys_Led_TypeDef SYS_LED);
-
-/**
-  * @brief  Get the status of the selected SYS_LED.
-  * @param  SYS_LED Specifies the Led to get its state
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_LED3
-  *            @arg SYS_LED2
-  *            @arg SYS_LED1
-  * @return SYS_LED status
-  */
-int32_t          SYS_LED_GetState(Sys_Led_TypeDef SYS_LED);
-/**
-  * @}
-  */
-
-/** @defgroup STM32WLXX_NUCLEO_LOW_LEVEL_BUTTON_Functions  LOW LEVEL BUTTON Functions
-  * @{
-  */
-/**
-  * @brief  Configures Button GPIO and EXTI Line.
-  * @param  Button Specifies the Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @param  ButtonMode Specifies Button mode
-  *   This parameter can be one of following parameters:
-  *     @arg SYS_BUTTON_MODE_GPIO: Button will be used as simple IO
-  *     @arg SYS_BUTTON_MODE_EXTI: Button will be connected to EXTI line with interrupt
-  *                            generation capability
-  * @return BSP status
-  */
-int32_t          SYS_PB_Init(Sys_Button_TypeDef Button, Sys_ButtonMode_TypeDef ButtonMode);
-
-/**
-  * @brief  Push Button DeInit.
-  * @param  Button Button to be configured
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @note PB DeInit does not disable the GPIO clock
-  * @return BSP status
-  */
-int32_t          SYS_PB_DeInit(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  Returns the selected Button state.
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  * @return The Button GPIO pin value.
-  */
-int32_t          SYS_PB_GetState(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  BSP Push Button callback
-  * @param  Button Specifies the Button to be checked
-  *         This parameter can be one of following parameters:
-  *            @arg SYS_BUTTON1
-  *            @arg SYS_BUTTON3
-  *            @arg SYS_BUTTON2
-  */
-void             SYS_PB_Callback(Sys_Button_TypeDef Button);
-
-/**
-  * @brief  This function handles Push-Button interrupt requests.
-  * @param  Button Specifies the pin connected EXTI line
-  */
-void             SYS_PB_IRQHandler(Sys_Button_TypeDef Button);
-
-/**
-  * @}
-  */
-
-/* USER CODE BEGIN EFP */
-
-/* USER CODE END EFP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD_RESOURCE_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
index 4d08d4b2..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/Board/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     10U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   0U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/features_info.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/features_info.h
index 97f89db1..36acd271 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/features_info.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/features_info.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    features_info.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYSTEM_INFO_H
@@ -36,7 +38,7 @@ extern "C" {
 /**
   * @brief Feature enumeration
   * @note This is the list of all available feature so far,
-          the one available in a fiven build are listed in the Feat_Info_Table[]
+          the one available in a given build are listed in the Feat_Info_Table[]
           to keep compatibility, in order to add a feature
           use a new value to the bottom without changing the existing order
   */
@@ -113,7 +115,6 @@ typedef struct
 /* Exported functions ------------------------------------------------------- */
 /**
   * @brief  Init configuration params by calling specific feature xxx_info.c
-  * @return void
   */
 void FEAT_INFO_Init(void);
 /**
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/mbmux_table.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/mbmux_table.h
index 2874d9de..84cb7539 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/mbmux_table.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/mbmux_table.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mbmux_table.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MBMUX_TABLE_H__
@@ -48,12 +50,14 @@ typedef enum
   MBMUX_NOTIF_ACK  = 0x01U   /*!< Channel direction Rx is used by an MCU to receive */
 } MBMUX_ComType_t;
 
+/* Shared memory tables */
+
 typedef struct
 {
   uint32_t MsgId;
   void (*MsgCm4Cb)(void *ComObj);
-  void (*MsgCm0plusCb)(void *ComObj);
-  uint16_t BufSize;      /*!<  size of the array given by the applic */
+  void (*MsgCm0plusCb)(void *ComObj); /* Currently not used : moved in MBMUX_MsgCbPointer_t */
+  uint16_t BufSize;      /*!<  size of the array given by the application */
   uint16_t ParamCnt;     /*!<  nr of words composing the message */
   uint32_t *ParamBuf;
   uint32_t ReturnVal;    /*!<  only used in RX */
@@ -66,7 +70,19 @@ typedef struct
   uint8_t                 MBMUXMapping[FEAT_INFO_CNT][2];
   __IO uint16_t           SynchronizeCpusAtBoot;
   uint16_t                ChipRevId;
-} MBMUX_ComTable_t;
+} MBMUX_ComTable_t;   /* main MBMUX table in shared memory */
+
+/* Keeps Cm0 callback aside to improve isolation */
+typedef struct
+{
+  void (*MsgCm0plusCb)(void *ComObj);
+} MBMUX_MsgCbPointer_t;
+
+typedef struct
+{
+  MBMUX_MsgCbPointer_t        MBCmdRespCb[MBMUX_CHANNEL_NUMBER];
+  MBMUX_MsgCbPointer_t        MBNotifAckCb[MBMUX_CHANNEL_NUMBER];
+} MBMUX_MsgCbPointersTab_t;  /* copy pointers in CM0plus Isolated memory */
 
 /* USER CODE BEGIN ET */
 
@@ -87,3 +103,5 @@ typedef struct
 #endif
 
 #endif /* __MBMUX_TABLE_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/msg_id.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/msg_id.h
index 3c245443..6ba6d5cb 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/msg_id.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/MbMux/msg_id.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    msg_id.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MSG_ID_H__
@@ -64,7 +66,7 @@ typedef enum
   RADIO_STANDBY_ID,
   RADIO_RX_ID,
   RADIO_START_CAD_ID,
-  RADIO_SET_TX_CONTINOUS_WAVE_ID,
+  RADIO_SET_TX_CONTINUOUS_WAVE_ID,
   RADIO_RSSI_ID,
   RADIO_WRITE_ID,
   RADIO_READ_ID,
@@ -158,3 +160,5 @@ typedef enum
 #endif
 
 #endif /* __MSG_ID_H__ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.c
index 807e1bb4..d01a65d9 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.c
@@ -41,9 +41,6 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
-#define DBGMCU_LPM   0   /* if 1 enables/disables the Debug Module during LowPower modes */
-                         /* if 0 it does not modify the DBGMCU_CR_DBG registers */
-                         /* in DualCore few issues are under investigation when 1 */
 
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
@@ -62,12 +59,90 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+#endif /* CORE_CM4 */
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
   GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
@@ -75,57 +150,49 @@ void DBG_Init(void)
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  /* make sure a pin is not used simultaneusly by the two cores */
-  /* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+  /* make sure a pin is not used simultaneously by the two cores */
+  /* PROBE_LINE1 & PROBE_LINE2 for CM0PLUS: this mapping can be changed*/
 #if defined(CORE_CM4)
 
   /* Enable the GPIO_LINES Clock */
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
 
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+#else /* CORE_CM0PLUS */
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  /* Enable the GPIO_LINES Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-#if defined (DBGMCU_LPM) && ( DBGMCU_LPM == 1 )
-  /* careful does not work correctly in dual core: Bugzilla 71087 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
-#elif defined (DBGMCU_LPM) && ( DBGMCU_LPM == 0 )
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
-#elif !defined (DBGMCU_LPM)
-#error "DBGMCU_LPM not defined or out of range <0,1>"
-#endif /* DBGMCU_LPM */
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
 
-#else /* CORE_CM0PLUS */
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
 
-  /* Enable the GPIO_LINES Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
+#endif /* CORE_CM4 */
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+#if defined(CORE_CM0PLUS)
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN ;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
+  /* HW alternate functions for monitoring RF */
 
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -143,7 +210,7 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /* LDO_rdy & BUCK_rdy */
+  /* LDO_rdy & BUCK_rdy (SMPS) */
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
   GPIO_InitStruct.Pull   = GPIO_NOPULL;
   GPIO_InitStruct.Pin    = (GPIO_PIN_2);
@@ -158,40 +225,29 @@ void DBG_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-#endif /* CORE_CM4 */
+#endif /* CORE_CM0PLUS */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#if defined(CORE_CM4)
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
 #endif /* CORE_CM4 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-  /* USER CODE END DBG_Init_Last */
+  /* USER CODE END DBG_ProbesInit_Last */
 }
-
-/* USER CODE BEGIN EF */
-
-/* USER CODE END EF */
-
-/* Private Functions Definition -----------------------------------------------*/
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.h b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.h
index 162d992f..28890d05 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.h
@@ -43,94 +43,96 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/* make sure a pin is not used simultaneusly by the two cores */
-/* DGB_LINE1 & DGB_LINE2 for CM4: this mapping can be changed*/
+/* make sure a pin is not used simultaneously by the two cores */
+/* PROBE_LINE1 & PROBE_LINE2 for CM4: this mapping can be changed*/
 #if defined(CORE_CM0PLUS)
-/**  Definition for Debug Line 1   **/
+
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 #else
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
-#endif /* CORE_CM4 */
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+
+#endif /* CORE_CM0PLUS */
 
 /* USER CODE BEGIN EC */
 
@@ -142,49 +144,66 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
 
 /* Exported functions prototypes ---------------------------------------------*/
+#if defined(CORE_CM4)
+
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+#endif /* CORE_CM4 */
+
 /**
-  * @brief Initializes the debug
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/Common/System/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.ewd b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.ewd
index d872df1c..9f9a0f20 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.ewd
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1106,11 +1106,11 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>1</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.ewp b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.ewp
index a18d0b8a..0a94bcb8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.ewp
@@ -225,6 +225,7 @@
                 <option>
                     <name>CCDefines</name>
                     <state>CORE_CM0PLUS</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                 </option>
                 <option>
@@ -350,24 +351,25 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
-                    <state>$PROJ_DIR$/../Common/System</state>
                     <state>$PROJ_DIR$/../CM0PLUS/Core/Inc</state>
                     <state>$PROJ_DIR$/../CM0PLUS/SubGHz_Phy/App</state>
                     <state>$PROJ_DIR$/../CM0PLUS/SubGHz_Phy/Target</state>
                     <state>$PROJ_DIR$/../CM0PLUS/MbMux</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../Common/Board</state>
+                    <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -1048,42 +1050,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1091,37 +1057,88 @@
             </file>
         </group>
         <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
-            </file>
-        </group>
-        <group>
-            <name>App</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\SubGHz_Phy\App\app_subghz_phy.c</name>
-            </file>
-        </group>
-        <group>
-            <name>Target</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM0PLUS\SubGHz_Phy\Target\radio_board_if.c</name>
-            </file>
+            <name>User</name>
+            <group>
+                <name>CM0PLUS</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\rtc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\subghz.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\Core\Src\timer_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\features_info.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM0PLUS\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>SubGHz_Phy</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\SubGHz_Phy\App\app_subghz_phy.c</name>
+                        </file>
+                    </group>
+                    <group>
+                        <name>Target</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM0PLUS\SubGHz_Phy\Target\radio_board_if.c</name>
+                        </file>
+                    </group>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
+            </group>
         </group>
     </group>
     <group>
@@ -1134,9 +1151,6 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>SubGHz_Phy_PingPong_DualCore_CM0PLUS</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
@@ -1162,10 +1176,13 @@
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cortex.c</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp.c</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_dma_ex.c</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_cryp_ex.c</name>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_flash.c</name>
@@ -1200,6 +1217,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_subghz.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
         </group>
     </group>
     <group>
@@ -1212,6 +1235,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
         </group>
     </group>
     <group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM4.ewd b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM4.ewd
index 81527057..3e1c9fc8 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM4.ewd
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM4.ewd
@@ -184,7 +184,7 @@
                 </option>
                 <option>
                     <name>OCMulticoreMaster</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>OCMulticorePort</name>
@@ -192,15 +192,15 @@
                 </option>
                 <option>
                     <name>OCMulticoreWorkspace</name>
-                    <state>$PROJ_DIR$\Project.eww</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveProject</name>
-                    <state>SubGHz_Phy_PingPong_DualCore_CM0PLUS</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCMulticoreSlaveConfiguration</name>
-                    <state>MBMUX_STM32WL_M0_FLASH</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>OCDownloadExtraImage</name>
@@ -1106,11 +1106,11 @@
                 </option>
                 <option>
                     <name>CCSTLinkDAPNumber</name>
-                    <state>0</state>
+                    <state></state>
                 </option>
                 <option>
                     <name>CCSTLinkDebugAccessPortRadio</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCSTLinkUseServerSelect</name>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM4.ewp b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM4.ewp
index e12a4aee..84caa934 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM4.ewp
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/SubGHz_Phy_PingPong_DualCore_CM4.ewp
@@ -225,6 +225,7 @@
                 <option>
                     <name>CCDefines</name>
                     <state>CORE_CM4</state>
+                    <state>USE_HAL_DRIVER</state>
                     <state>STM32WL55xx</state>
                 </option>
                 <option>
@@ -350,24 +351,24 @@
                 </option>
                 <option>
                     <name>CCIncludePath2</name>
-                    <state>$PROJ_DIR$/../Common/Board</state>
-                    <state>$PROJ_DIR$/../Common/MbMux</state>
-                    <state>$PROJ_DIR$/../Common/System</state>
                     <state>$PROJ_DIR$/../CM4/Core/Inc</state>
                     <state>$PROJ_DIR$/../CM4/SubGHz_Phy/App</state>
-                    <state>$PROJ_DIR$/../CM4/SubGHz_Phy/Target</state>
                     <state>$PROJ_DIR$/../CM4/MbMux</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../Common/Board</state>
+                    <state>$PROJ_DIR$/../Common/System</state>
+                    <state>$PROJ_DIR$/../Common/MbMux</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
-                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/misc</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/sequencer</state>
                     <state>$PROJ_DIR$/../../../../../../Utilities/timer</state>
-                    <state>$PROJ_DIR$/../../../../../../Utilities/trace/adv_trace</state>
+                    <state>$PROJ_DIR$/../../../../../../Utilities/lpm/tiny_lpm</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy</state>
+                    <state>$PROJ_DIR$/../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include</state>
+                    <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
                 </option>
                 <option>
                     <name>CCStdIncCheck</name>
@@ -1048,48 +1049,6 @@
     </configuration>
     <group>
         <name>Application</name>
-        <group>
-            <name>Core</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\Board\board_resources.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
-            </file>
-        </group>
         <group>
             <name>EWARM</name>
             <file>
@@ -1097,31 +1056,85 @@
             </file>
         </group>
         <group>
-            <name>MbMux</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
-            </file>
-        </group>
-        <group>
-            <name>App</name>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\SubGHz_Phy\App\app_subghz_phy.c</name>
-            </file>
-            <file>
-                <name>$PROJ_DIR$\..\CM4\SubGHz_Phy\App\subghz_phy_app.c</name>
-            </file>
+            <name>User</name>
+            <group>
+                <name>CM4</name>
+                <group>
+                    <name>Core</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\dma.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\ipcc_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\main.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32_lpm_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_hal_msp.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\stm32wlxx_it.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\sys_app.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\timer_if.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\Core\Src\usart_if.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>MbMux</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmux.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_radio.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_sys.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\mbmuxif_trace.c</name>
+                    </file>
+                    <file>
+                        <name>$PROJ_DIR$\..\CM4\MbMux\radio_mbwrapper.c</name>
+                    </file>
+                </group>
+                <group>
+                    <name>SubGHz_Phy</name>
+                    <group>
+                        <name>App</name>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\SubGHz_Phy\App\app_subghz_phy.c</name>
+                        </file>
+                        <file>
+                            <name>$PROJ_DIR$\..\CM4\SubGHz_Phy\App\subghz_phy_app.c</name>
+                        </file>
+                    </group>
+                </group>
+            </group>
+            <group>
+                <name>Common</name>
+                <group>
+                    <name>System</name>
+                    <file>
+                        <name>$PROJ_DIR$\..\Common\System\sys_debug.c</name>
+                    </file>
+                </group>
+            </group>
         </group>
     </group>
     <group>
@@ -1134,14 +1147,14 @@
         <name>Drivers</name>
         <group>
             <name>BSP</name>
-            <excluded>
-                <configuration>SubGHz_Phy_PingPong_DualCore_CM4</configuration>
-            </excluded>
             <group>
                 <name>STM32WLxx_Nucleo</name>
                 <file>
                     <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo.c</name>
                 </file>
+                <file>
+                    <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\BSP\STM32WLxx_Nucleo\stm32wlxx_nucleo_radio.c</name>
+                </file>
             </group>
         </group>
         <group>
@@ -1197,6 +1210,12 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_rtc_ex.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_tim_ex.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_uart.c</name>
             </file>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
index a6cf0145..cd6560d5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/startup_stm32wl55xx_cm0plus.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
index 55e741a1..97fd3793 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/stm32wl55xx_flash_cm0plus.icf
@@ -9,10 +9,10 @@ define symbol __ICFEDIT_intvec_start__ = 0x08020000;
 define symbol __ICFEDIT_region_ROM_start__    = 0x08020000;
 define symbol __ICFEDIT_region_ROM_end__      = 0x0803EFFF;
 /***** SRAM2 shared allocated by M0+ *****/
-define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x2000B000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000BFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20009000;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20009FFF;
 /***** SRAM2 dedicated to M0+ *****/
-define symbol __ICFEDIT_region_RAM2_start__   = 0x2000C000;
+define symbol __ICFEDIT_region_RAM2_start__   = 0x2000A000;
 define symbol __ICFEDIT_region_RAM2_end__     = 0x2000FFFF;
 
 /*-Sizes-*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/stm32wl55xx_flash_cm4.icf b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
index 6f32a5f9..b8551a3e 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/EWARM/stm32wl55xx_flash_cm4.icf
@@ -13,7 +13,7 @@ define symbol __ICFEDIT_region_RAM_start__    = 0x20000000;
 define symbol __ICFEDIT_region_RAM_end__      = 0x20007FFF;
 /***** SRAM2 shared allocated by M4 *****/
 define symbol __ICFEDIT_region_RAM2_SHARED_start__ = 0x20008000;
-define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x2000AFFF;
+define symbol __ICFEDIT_region_RAM2_SHARED_end__   = 0x20008FFF;
 
 /*-Sizes-*/
 define symbol __ICFEDIT_size_cstack__ = 0x800;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.uvoptx
index ae7a95c4..d822e072 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>12000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -73,7 +73,7 @@
         <LExpSel>0</LExpSel>
       </OPTXL>
       <OPTFL>
-        <tvExp>0</tvExp>
+        <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
         <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O718 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
+          <Name>-U-O142 -O966 -SF4000 -C0 -A1 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20004000 -FC1000 -FN1 -FF0STM32WLxx_CM0+.FLM -FS08020000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,89 +203,121 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/SubGHz_Phy/App</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c</PathWithFileName>
+      <FilenameWithoutPath>app_subghz_phy.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/SubGHz_Phy/Target</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
-      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/SubGHz_Phy/Target/radio_board_if.c</PathWithFileName>
+      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -277,178 +329,154 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>12</FileNumber>
-      <FileType>2</FileType>
+      <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm0plus.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm0plus.s</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/features_info.c</PathWithFileName>
-      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>5</GroupNumber>
       <FileNumber>14</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmux.c</PathWithFileName>
-      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/features_info.c</PathWithFileName>
+      <FilenameWithoutPath>features_info.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmux.c</PathWithFileName>
+      <FilenameWithoutPath>mbmux.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
-      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_radio.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
-      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_sys.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_sys.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/App</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c</PathWithFileName>
-      <FilenameWithoutPath>app_subghz_phy.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/mbmuxif_trace.c</PathWithFileName>
+      <FilenameWithoutPath>mbmuxif_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/Target</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
+      <GroupNumber>6</GroupNumber>
       <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM0PLUS/SubGHz_Phy/Target/radio_board_if.c</PathWithFileName>
-      <FilenameWithoutPath>radio_board_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM0PLUS/MbMux/radio_mbwrapper.c</PathWithFileName>
+      <FilenameWithoutPath>radio_mbwrapper.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -461,7 +489,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
+      <GroupNumber>7</GroupNumber>
       <FileNumber>21</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
@@ -481,7 +509,7 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -493,7 +521,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>7</GroupNumber>
+      <GroupNumber>8</GroupNumber>
       <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -507,31 +535,23 @@
   </Group>
 
   <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
+    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>8</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>1</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>9</GroupNumber>
       <FileNumber>25</FileNumber>
@@ -539,8 +559,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -551,8 +571,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -563,8 +583,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -575,8 +595,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cryp_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -587,8 +607,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -599,8 +619,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -611,8 +631,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -623,8 +643,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -635,8 +655,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -647,8 +667,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -659,8 +679,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -671,8 +691,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -707,8 +727,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -719,31 +739,31 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Middlewares/SubGHz_Phy</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>10</GroupNumber>
+      <GroupNumber>9</GroupNumber>
       <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
-      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_subghz.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Drivers/CMSIS</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
       <FileNumber>42</FileNumber>
@@ -751,15 +771,15 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
-      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Utilities</GroupName>
+    <GroupName>Middlewares/SubGHz_Phy</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -771,8 +791,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
+      <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -783,8 +803,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -795,49 +815,57 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</PathWithFileName>
+      <FilenameWithoutPath>radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_mem.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_mem.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -849,7 +877,7 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>11</GroupNumber>
+      <GroupNumber>12</GroupNumber>
       <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
@@ -860,6 +888,42 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>12</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>12</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>12</GroupNumber>
+      <FileNumber>53</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.uvprojx
index 5970dd4e..8f47fb1b 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM0PLUS.uvprojx
@@ -16,14 +16,14 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM0P</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M0+") CLOCK(12000000) ELITTLE</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20004000-0x20007FFF) IRAM2(0x2000C000-0x2000FFFF) IROM(0x8020000-0x803FFFF) CLOCK(12000000) CPUTYPE("Cortex-M0+") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
-          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM0+ -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM0+.FLM))</FlashDriverDll>
+          <FlashDriverDll></FlashDriverDll>
           <DeviceId>0</DeviceId>
-          <RegisterFile>$$Device:STM32WL55JCIx$Drivers\CMSIS\Device\ST\STM32WLxx\Include\stm32wlxx.h</RegisterFile>
+          <RegisterFile></RegisterFile>
           <MemoryEnv></MemoryEnv>
           <Cmp></Cmp>
           <Asm></Asm>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>SubGHz_Phy_PingPong_DualCore_CM0PLUS\Exe\</OutputDirectory>
+          <OutputDirectory>SubGHz_Phy_PingPong_DualCore_CM0PLUS\</OutputDirectory>
           <OutputName>SubGHz_Phy_PingPong_DualCore_CM0PLUS</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -110,7 +110,7 @@
         </CommonProperty>
         <DllOption>
           <SimDllName>SARMCM3.DLL</SimDllName>
-          <SimDllArguments> -REMAP </SimDllArguments>
+          <SimDllArguments>-REMAP</SimDllArguments>
           <SimDlgDll>DARMCM1.DLL</SimDlgDll>
           <SimDlgDllArguments>-pCM0+</SimDlgDllArguments>
           <TargetDllName>SARMCM3.DLL</TargetDllName>
@@ -134,14 +134,14 @@
             <RunIndependent>0</RunIndependent>
             <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
-            <DriverSelection>4096</DriverSelection>
+            <DriverSelection>4101</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
-          <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash2>BIN\UL2V8M.DLL</Flash2>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -186,7 +186,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <hadIRAM2>0</hadIRAM2>
+            <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
             <useUlib>1</useUlib>
@@ -194,7 +194,7 @@
             <uLtcg>0</uLtcg>
             <nSecure>0</nSecure>
             <RoSelD>3</RoSelD>
-            <RwSelD>3</RwSelD>
+            <RwSelD>4</RwSelD>
             <CodeSel>0</CodeSel>
             <OptFeed>0</OptFeed>
             <NoZi1>0</NoZi1>
@@ -211,7 +211,7 @@
             <Ra2Chk>0</Ra2Chk>
             <Ra3Chk>0</Ra3Chk>
             <Im1Chk>1</Im1Chk>
-            <Im2Chk>0</Im2Chk>
+            <Im2Chk>1</Im2Chk>
             <OnChipMemories>
               <Ocm1>
                 <Type>0</Type>
@@ -245,13 +245,13 @@
               </Ocm6>
               <IRAM>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -275,8 +275,8 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <StartAddress>0x8020000</StartAddress>
+                <Size>0x20000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
                 <Type>1</Type>
@@ -300,13 +300,13 @@
               </OCR_RVCT8>
               <OCR_RVCT9>
                 <Type>0</Type>
-                <StartAddress>0x20000000</StartAddress>
-                <Size>0x10000</Size>
+                <StartAddress>0x20004000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
-                <StartAddress>0x0</StartAddress>
-                <Size>0x0</Size>
+                <StartAddress>0x2000c000</StartAddress>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM0PLUS,STM32WL55xx</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM0PLUS,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Common/Board;../Common/MbMux;../Common/System;../CM0PLUS/Core/Inc;../CM0PLUS/SubGHz_Phy/App;../CM0PLUS/SubGHz_Phy/Target;../CM0PLUS/MbMux;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace</IncludePath>
+              <IncludePath>../CM0PLUS/Core/Inc;../CM0PLUS/SubGHz_Phy/App;../CM0PLUS/SubGHz_Phy/Target;../CM0PLUS/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,47 +381,77 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>ipcc.c</FileName>
+              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
+            <File>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/SubGHz_Phy/App</GroupName>
+          <Files>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>app_subghz_phy.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/SubGHz_Phy/Target</GroupName>
+          <Files>
+            <File>
+              <FileName>radio_board_if.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/SubGHz_Phy/Target/radio_board_if.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM0PLUS/Core</GroupName>
+          <Files>
             <File>
               <FileName>main.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM0PLUS/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>rtc.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>timer_if.c</FileName>
+              <FileName>rtc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/rtc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>subghz.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>subghz.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM0PLUS/Core/Src/subghz.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
               <FileName>sys_app.c</FileName>
@@ -429,29 +459,24 @@
               <FilePath>../CM0PLUS/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm0plus.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm0plus.s</FilePath>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM0PLUS/MbMux</GroupName>
           <Files>
             <File>
               <FileName>features_info.c</FileName>
@@ -485,26 +510,6 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>Application/App</GroupName>
-          <Files>
-            <File>
-              <FileName>app_subghz_phy.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/Target</GroupName>
-          <Files>
-            <File>
-              <FileName>radio_board_if.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM0PLUS/SubGHz_Phy/Target/radio_board_if.c</FilePath>
-            </File>
-          </Files>
-        </Group>
         <Group>
           <GroupName>Doc</GroupName>
           <Files>
@@ -530,38 +535,18 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>system_stm32wlxx.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
-            </File>
-          </Files>
-        </Group>
         <Group>
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
             <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cryp.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_cryp_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cryp_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -579,9 +564,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -594,14 +584,24 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -613,15 +613,30 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
             <File>
               <FileName>stm32wlxx_hal_subghz.c</FileName>
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>system_stm32wlxx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\..\..\..\Drivers\STM32WLxx_HAL_Driver\Src\stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -629,14 +644,19 @@
           <GroupName>Middlewares/SubGHz_Phy</GroupName>
           <Files>
             <File>
-              <FileName>radio.c</FileName>
+              <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
             </File>
             <File>
-              <FileName>radio_driver.c</FileName>
+              <FileName>radio_fw.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</FilePath>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
+            <File>
+              <FileName>radio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -649,39 +669,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -695,8 +715,8 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
         <targetInfos>
           <targetInfo name="SubGHz_Phy_PingPong_DualCore_CM0PLUS"/>
         </targetInfos>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM4.uvoptx b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM4.uvoptx
index e28087fb..ff4e0f16 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM4.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM4.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>48000000</CLKADS>
+      <CLKADS>8000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U0021001F3137510533333639 -O2254 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U-O142 -O2766 -SF4000 -C0 -A0 -I2 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL020000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -175,7 +195,7 @@
   </Target>
 
   <Group>
-    <GroupName>Application/Core</GroupName>
+    <GroupName>Application/MDK-ARM</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
@@ -183,190 +203,186 @@
     <File>
       <GroupNumber>1</GroupNumber>
       <FileNumber>1</FileNumber>
-      <FileType>1</FileType>
+      <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
-      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
+      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
+      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/Common/System</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
+      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Application/User/CM4/Core</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>3</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
-      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
+      <FilenameWithoutPath>main.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/main.c</PathWithFileName>
-      <FilenameWithoutPath>main.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/dma.c</PathWithFileName>
+      <FilenameWithoutPath>dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
-      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>6</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/ipcc_if.c</PathWithFileName>
+      <FilenameWithoutPath>ipcc_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32_lpm_if.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
+      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/sys_app.c</PathWithFileName>
-      <FilenameWithoutPath>sys_app.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/timer_if.c</PathWithFileName>
+      <FilenameWithoutPath>timer_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
-      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
+      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../CM4/Core/Src/usart_if.c</PathWithFileName>
-      <FilenameWithoutPath>usart_if.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/usart.c</PathWithFileName>
+      <FilenameWithoutPath>usart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/Board/board_resources.c</PathWithFileName>
-      <FilenameWithoutPath>board_resources.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_it.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_it.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>1</GroupNumber>
+      <GroupNumber>3</GroupNumber>
       <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/sys_debug.c</PathWithFileName>
-      <FilenameWithoutPath>sys_debug.c</FilenameWithoutPath>
+      <PathWithFileName>../CM4/Core/Src/stm32wlxx_hal_msp.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_msp.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
   </Group>
 
   <Group>
-    <GroupName>Application/MDK-ARM</GroupName>
+    <GroupName>Application/User/CM4/MbMux</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>2</GroupNumber>
+      <GroupNumber>4</GroupNumber>
       <FileNumber>14</FileNumber>
-      <FileType>2</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>startup_stm32wl55xx_cm4.s</PathWithFileName>
-      <FilenameWithoutPath>startup_stm32wl55xx_cm4.s</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-  </Group>
-
-  <Group>
-    <GroupName>Application/MbMux</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -377,8 +393,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>16</FileNumber>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>15</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -389,8 +405,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>17</FileNumber>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>16</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -401,8 +417,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>18</FileNumber>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>17</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -413,8 +429,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>19</FileNumber>
+      <GroupNumber>4</GroupNumber>
+      <FileNumber>18</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -427,14 +443,14 @@
   </Group>
 
   <Group>
-    <GroupName>Application/App</GroupName>
+    <GroupName>Application/User/CM4/SubGHz_Phy/App</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>20</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>19</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -445,8 +461,8 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>4</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <GroupNumber>5</GroupNumber>
+      <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -465,8 +481,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>5</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <GroupNumber>6</GroupNumber>
+      <FileNumber>21</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -485,8 +501,8 @@
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>6</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -496,23 +512,15 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-  </Group>
-
-  <Group>
-    <GroupName>Drivers/CMSIS</GroupName>
-    <tvExp>0</tvExp>
-    <tvExpOptDlg>0</tvExpOptDlg>
-    <cbSel>0</cbSel>
-    <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
-      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_nucleo_radio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -524,6 +532,18 @@
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>24</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
     <File>
       <GroupNumber>8</GroupNumber>
       <FileNumber>25</FileNumber>
@@ -531,8 +551,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -543,8 +563,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -555,8 +575,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -567,8 +587,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -579,8 +599,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -591,8 +611,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_dma_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -603,8 +623,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_flash_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -615,8 +635,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_gpio.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -627,8 +647,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_cortex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -639,8 +659,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -651,8 +671,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_pwr_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_exti.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -663,8 +683,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_ipcc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -675,8 +695,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rcc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -687,8 +707,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -699,8 +719,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</PathWithFileName>
-      <FilenameWithoutPath>stm32wlxx_hal_rtc_ex.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -711,6 +731,18 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</PathWithFileName>
+      <FilenameWithoutPath>stm32wlxx_hal_tim_ex.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>8</GroupNumber>
+      <FileNumber>41</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</PathWithFileName>
       <FilenameWithoutPath>stm32wlxx_hal_uart.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -718,7 +750,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>41</FileNumber>
+      <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -731,38 +763,46 @@
   </Group>
 
   <Group>
-    <GroupName>Utilities</GroupName>
+    <GroupName>Drivers/CMSIS</GroupName>
     <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>9</GroupNumber>
-      <FileNumber>42</FileNumber>
+      <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
+      <PathWithFileName>../Common/System/system_stm32wlxx.c</PathWithFileName>
+      <FilenameWithoutPath>system_stm32wlxx.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+  </Group>
+
+  <Group>
+    <GroupName>Utilities</GroupName>
+    <tvExp>0</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
     <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>43</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_adv_trace.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>44</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -773,62 +813,74 @@
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>45</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>46</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_systime.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_systime.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>47</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>48</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_sscanf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/sequencer/stm32_seq.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_seq.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
     <File>
-      <GroupNumber>9</GroupNumber>
-      <FileNumber>49</FileNumber>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</PathWithFileName>
-      <FilenameWithoutPath>stm32_tiny_vsnprintf.c</FilenameWithoutPath>
+      <PathWithFileName>../../../../../../Utilities/timer/stm32_timer.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>10</GroupNumber>
+      <FileNumber>51</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</PathWithFileName>
+      <FilenameWithoutPath>stm32_lpm.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM4.uvprojx b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM4.uvprojx
index b7dcd301..0fc434d3 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM4.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/SubGHz_Phy_PingPong_DualCore_CM4.uvprojx
@@ -16,9 +16,9 @@
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.5</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x801FFFF) IRAM(0x20000000-0x20007FFF) IRAM2(0x20008000-0x2000AFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>SubGHz_Phy_PingPong_DualCore_CM4\Exe\</OutputDirectory>
+          <OutputDirectory>SubGHz_Phy_PingPong_DualCore_CM4\</OutputDirectory>
           <OutputName>SubGHz_Phy_PingPong_DualCore_CM4</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -138,7 +138,7 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -183,7 +183,7 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
@@ -246,7 +246,7 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
@@ -301,12 +301,12 @@
               <OCR_RVCT9>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>
                 <StartAddress>0x20008000</StartAddress>
-                <Size>0x3000</Size>
+                <Size>0x4000</Size>
               </OCR_RVCT10>
             </OnChipMemories>
             <RvctStartVector></RvctStartVector>
@@ -336,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>CORE_CM4,STM32WL55xx</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Common/Board;../Common/MbMux;../Common/System;../CM4/Core/Inc;../CM4/SubGHz_Phy/App;../CM4/SubGHz_Phy/Target;../CM4/MbMux;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace</IncludePath>
+              <IncludePath>../CM4/Core/Inc;../CM4/SubGHz_Phy/App;../CM4/MbMux;../Common/Board;../Common/System;../Common/MbMux;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Utilities/trace/adv_trace;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Drivers/CMSIS/Include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -381,47 +381,52 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Application/Core</GroupName>
+          <GroupName>Application/MDK-ARM</GroupName>
           <Files>
             <File>
-              <FileName>dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>ipcc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
+              <FileName>startup_stm32wl55xx_cm4.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/Common/System</GroupName>
+          <Files>
             <File>
-              <FileName>ipcc_if.c</FileName>
+              <FileName>sys_debug.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
+              <FilePath>../Common/System/sys_debug.c</FilePath>
             </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Application/User/CM4/Core</GroupName>
+          <Files>
             <File>
               <FileName>main.c</FileName>
               <FileType>1</FileType>
               <FilePath>../CM4/Core/Src/main.c</FilePath>
             </File>
             <File>
-              <FileName>timer_if.c</FileName>
+              <FileName>dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/timer_if.c</FilePath>
+              <FilePath>../CM4/Core/Src/dma.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm_if.c</FileName>
+              <FileName>ipcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileName>ipcc_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
+              <FilePath>../CM4/Core/Src/ipcc_if.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_it.c</FileName>
+              <FileName>stm32_lpm_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32_lpm_if.c</FilePath>
             </File>
             <File>
               <FileName>sys_app.c</FileName>
@@ -429,9 +434,9 @@
               <FilePath>../CM4/Core/Src/sys_app.c</FilePath>
             </File>
             <File>
-              <FileName>usart.c</FileName>
+              <FileName>timer_if.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../CM4/Core/Src/usart.c</FilePath>
+              <FilePath>../CM4/Core/Src/timer_if.c</FilePath>
             </File>
             <File>
               <FileName>usart_if.c</FileName>
@@ -439,29 +444,24 @@
               <FilePath>../CM4/Core/Src/usart_if.c</FilePath>
             </File>
             <File>
-              <FileName>board_resources.c</FileName>
+              <FileName>usart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/Board/board_resources.c</FilePath>
+              <FilePath>../CM4/Core/Src/usart.c</FilePath>
             </File>
             <File>
-              <FileName>sys_debug.c</FileName>
+              <FileName>stm32wlxx_it.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/sys_debug.c</FilePath>
+              <FilePath>../CM4/Core/Src/stm32wlxx_it.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Application/MDK-ARM</GroupName>
-          <Files>
             <File>
-              <FileName>startup_stm32wl55xx_cm4.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>startup_stm32wl55xx_cm4.s</FilePath>
+              <FileName>stm32wlxx_hal_msp.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../CM4/Core/Src/stm32wlxx_hal_msp.c</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/MbMux</GroupName>
+          <GroupName>Application/User/CM4/MbMux</GroupName>
           <Files>
             <File>
               <FileName>mbmux.c</FileName>
@@ -491,7 +491,7 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Application/App</GroupName>
+          <GroupName>Application/User/CM4/SubGHz_Phy/App</GroupName>
           <Files>
             <File>
               <FileName>app_subghz_phy.c</FileName>
@@ -523,15 +523,10 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</FilePath>
             </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers/CMSIS</GroupName>
-          <Files>
             <File>
-              <FileName>system_stm32wlxx.c</FileName>
+              <FileName>stm32wlxx_nucleo_radio.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+              <FilePath>../../../../../../Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -539,29 +534,14 @@
           <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
           <Files>
             <File>
-              <FileName>stm32wlxx_hal.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_cortex.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
-            </File>
-            <File>
-              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileName>stm32wlxx_hal_rcc.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_flash.c</FileName>
@@ -579,9 +559,14 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileName>stm32wlxx_hal_dma.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_dma_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_pwr.c</FileName>
@@ -594,14 +579,24 @@
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc.c</FileName>
+              <FileName>stm32wlxx_hal_cortex.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</FilePath>
             </File>
             <File>
-              <FileName>stm32wlxx_hal_rcc_ex.c</FileName>
+              <FileName>stm32wlxx_hal.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</FilePath>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_exti.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_ipcc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</FilePath>
             </File>
             <File>
               <FileName>stm32wlxx_hal_rtc.c</FileName>
@@ -613,6 +608,16 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</FilePath>
             </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</FilePath>
+            </File>
+            <File>
+              <FileName>stm32wlxx_hal_tim_ex.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</FilePath>
+            </File>
             <File>
               <FileName>stm32wlxx_hal_uart.c</FileName>
               <FileType>1</FileType>
@@ -625,6 +630,16 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>Drivers/CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>system_stm32wlxx.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../Common/System/system_stm32wlxx.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>Utilities</GroupName>
           <Files>
@@ -634,39 +649,39 @@
               <FilePath>../../../../../../Utilities/trace/adv_trace/stm32_adv_trace.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_lpm.c</FileName>
+              <FileName>stm32_mem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_mem.c</FileName>
+              <FileName>stm32_systime.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_mem.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_seq.c</FileName>
+              <FileName>stm32_tiny_sscanf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_systime.c</FileName>
+              <FileName>stm32_tiny_vsnprintf.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_systime.c</FilePath>
+              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_timer.c</FileName>
+              <FileName>stm32_seq.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
+              <FilePath>../../../../../../Utilities/sequencer/stm32_seq.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_sscanf.c</FileName>
+              <FileName>stm32_timer.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_sscanf.c</FilePath>
+              <FilePath>../../../../../../Utilities/timer/stm32_timer.c</FilePath>
             </File>
             <File>
-              <FileName>stm32_tiny_vsnprintf.c</FileName>
+              <FileName>stm32_lpm.c</FileName>
               <FileType>1</FileType>
-              <FilePath>../../../../../../Utilities/misc/stm32_tiny_vsnprintf.c</FilePath>
+              <FilePath>../../../../../../Utilities/lpm/tiny_lpm/stm32_lpm.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -680,8 +695,8 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="4.3.0" condition="CMSIS Core">
+        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="4.5.0"/>
         <targetInfos>
           <targetInfo name="SubGHz_Phy_PingPong_DualCore_CM4"/>
         </targetInfos>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
index 5707d81c..7c9ba28d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/startup_stm32wl55xx_cm0plus.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
index a8b1492f..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
@@ -29,7 +29,7 @@
 ;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Stack_Size		EQU     0x1000
+Stack_Size		EQU     0x800
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
 Stack_Mem       SPACE   Stack_Size
@@ -40,7 +40,7 @@ __initial_sp
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size      EQU     0x400
+Heap_Size      EQU     0x200
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
 __heap_base
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
index f9b3e23c..8f413233 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/stm32wl55xx_flash_cm0plus.sct
@@ -10,11 +10,11 @@ LR_IROM1 0x08020000 0x00020000  {    ; load region size_region
    .ANY (+RO)
   }
   ; SRAM2 dedicated to M0+
-  RW_IRAM1 0x2000C000 0x00004000  {  ; RW data
+  RW_IRAM1 0x2000A000 0x00006000  {  ; RW data
    .ANY (+RW +ZI)
   }
 
-  RW_RAM_SHARED 0x2000B000 0x1000  {
+  RW_RAM_SHARED 0x20009000 0x1000  {
    *(MB_MEM2)
   }
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
index 79a183e1..5141de4a 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -14,7 +14,7 @@ LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
    .ANY (+RW +ZI)
   }
   ; Backup SRAM2 dedicated to M4
-RW_IRAM2 0x20008000 0x00003000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
+RW_IRAM2 0x20008000 0x00001000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
     *(MAPPING_TABLE)
     *(MB_MEM1)
   }
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/.project
index d5bfd54b..901e8344 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/.project
@@ -12,159 +12,168 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
 			<name>SubGHz_Phy_PingPong_DualCore.ioc</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/SubGHz_Phy_PingPong_DualCore.ioc</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/SubGHz_Phy_PingPong_DualCore.ioc</locationURI>
+		</link>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1602236684407</id>
+			<id>1612375238048</id>
 			<name></name>
 			<type>22</type>
 			<matcher>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/.cproject b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/.cproject
index 04d6ea06..92964f7d 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/.cproject
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.468838110">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.468838110" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.700116865">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.700116865" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.468838110" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.468838110." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.678153619" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1572855155" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.415629539" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.840015858" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.969329544" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1681155605" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.38495205" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.481064119" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/SubGHz_Phy/App | ../../../CM0PLUS/SubGHz_Phy/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.8428446" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.765204772" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.766093216" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.48796429" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.372013321" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.700116865" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.700116865." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1018522287" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1227566448" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1440060148" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.429880106" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.290098605" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1820182808" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../CM0PLUS/SubGHz_Phy/Target | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/sequencer | ../../../CM0PLUS/SubGHz_Phy/App | ../../../../../../../../Utilities/lpm/tiny_lpm ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.767988310" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong_DualCore_CM0PLUS}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.960334597" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.62198004" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.739284521" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.745857335" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1507309258" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.82304814" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1726868105" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1680801123" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1182252688" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.675685969" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1246779880" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1692498531" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.432158769" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1651123015" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1372417618" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/SubGHz_Phy/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/SubGHz_Phy/Target"/>
@@ -47,6 +48,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
@@ -59,74 +61,70 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.416607061" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1471217921" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1294182892" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1737906878" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.926637416" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1165352590" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1091891768" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.165466416" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.561725745" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1712288550" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1302924995" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.408979006" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.155889940" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1845880220" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1611455067" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1426383106" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.2113752489" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1443028592" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.493281102" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1619324021" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.153886661" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1375749923" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1418367172" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1665504466" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.987238784" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1663922589" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.274448079" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1777215870" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1623659209" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.644766785" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.353994807" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1581078642" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.735129078" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1536018756">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1536018756" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.268543771">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.268543771" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1536018756" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1536018756." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.461652710" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.396884210" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.565428635" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1269345598" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.546702905" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1824860149" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1366492256" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.946533022" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Core/Inc | ../../../CM0PLUS/SubGHz_Phy/App | ../../../CM0PLUS/SubGHz_Phy/Target | ../../../CM0PLUS/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.509780383" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1858984380" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1480124343" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.900764874" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1501919680" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.268543771" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.268543771." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.707787735" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1786566287" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1018003475" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1742207453" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1019997501" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1274658439" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/MbMux | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../CM0PLUS/SubGHz_Phy/Target | ../../../CM0PLUS/Core/Inc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/sequencer | ../../../CM0PLUS/SubGHz_Phy/App | ../../../../../../../../Utilities/lpm/tiny_lpm ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.182963263" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.46212449" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.903872500" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.602393515" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.414505123" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1355264977" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.967123991" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.912117953" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.731711710" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1891491108" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1750741027" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2034672442" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2048922336" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM0PLUS"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.907432133" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.916078727" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/SubGHz_Phy/App"/>
 									<listOptionValue builtIn="false" value="../../../CM0PLUS/SubGHz_Phy/Target"/>
@@ -134,6 +132,7 @@
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
@@ -146,30 +145,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.565250225" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1887417344" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1855676383" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1660350227" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.893452060" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1115451610" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1508748458" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.944206493" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.789408049" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1493189791" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1748959225" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1258648467" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.497457232" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1876931516" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.644104935" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.636066346" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1216711043" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1798821306" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.122244931" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.789314761" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.981820221" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1048436325" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1119955839" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.55889490" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1322960192" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.145868471" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.2086824900" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.468786522" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1264867157" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.262216000" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1752801398" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.711430715" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.716969409" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -177,19 +174,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="SubGHz_Phy_PingPong_DualCore_CM0PLUS.null.2061864094" name="SubGHz_Phy_PingPong_DualCore_CM0PLUS"/>
+		<project id="SubGHz_Phy_PingPong_DualCore_CM0PLUS.null.2110707863" name="SubGHz_Phy_PingPong_DualCore_CM0PLUS"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.468838110;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.468838110.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.82304814;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.416607061">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.700116865;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.700116865.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.675685969;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1471217921">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1536018756;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1536018756.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1355264977;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.565250225">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.268543771;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.268543771.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1891491108;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1887417344">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/.project b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/.project
index 5903edbb..27196254 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/.project
@@ -25,251 +25,270 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/Third_Party/radio.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
-		</link>
-		<link>
-			<name>Middlewares/Third_Party/radio_driver.c</name>
-			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32_lpm_if.c</locationURI>
+		</link>
+		<link>
+			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/features_info.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/features_info.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/features_info.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmux.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_driver.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Middlewares/Third_Party/SubGHz_Phy/radio_fw.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/SubGHz_Phy/App/app_subghz_phy.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/SubGHz_Phy/Target/radio_board_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM0PLUS/SubGHz_Phy/Target/radio_board_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM0PLUS/SubGHz_Phy/Target/radio_board_if.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
index 9e23530f..f98fb740 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,51 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the initialization values of the .MB_MEM2 section.
+defined in linker script */
+.word _siMB_MEM2
+/* start address for the .MB_MEM2 section. defined in linker script */
+.word _sMB_MEM2
+/* end address for the .MB_MEM2 section. defined in linker script */
+.word _eMB_MEM2
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +105,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
-
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
+/* Zero fill the MB_MEM2 segments. */
+  INIT_BSS _sMB_MEM2, _eMB_MEM2
 
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
-
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the MB_MEM2 segment initializers from flash to SRAM */
+  INIT_DATA _sMB_MEM2, _eMB_MEM2, _siMB_MEM2
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
index 2b06c01f..87472aa6 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -46,25 +49,25 @@ _Min_Stack_Size = 0x1000 ; /* required amount of stack */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x2000A000, LENGTH = 24K
-  ROM    (rx)    : ORIGIN = 0x08020000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08020000, LENGTH = 128K
   RAM_SHARED (xrw): ORIGIN = 0x20009000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.text)           /* .text sections (code) */
     *(.text*)          /* .text* sections (code) */
     *(.glue_7)         /* glue arm to thumb code */
@@ -74,80 +77,96 @@ SECTIONS
     KEEP (*(.init))
     KEEP (*(.fini))
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
-  .ARM.extab   : { 
-    . = ALIGN(8);
+  .ARM.extab   : {
+    . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .ARM : {
-    . = ALIGN(8);
+    . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   .preinit_array     :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__preinit_array_start = .);
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .init_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__init_array_start = .);
     KEEP (*(SORT(.init_array.*)))
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
+    . = ALIGN(4);
+  } >FLASH
+
   .fini_array :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     PROVIDE_HIDDEN (__fini_array_start = .);
     KEEP (*(SORT(.fini_array.*)))
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
+    . = ALIGN(4);
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
-    . = ALIGN(8);
+    . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM AT> ROM
+
+  } >RAM AT> FLASH
+
+  /* Used by the startup to initialize MB_MEM2 */
+  _siMB_MEM2 = LOADADDR(.MB_MEM2);
+
+  /* Initialized data sections into "MB_MEM2" Ram type memory */
+  .MB_MEM2 :
+  {
+    . = ALIGN(4);
+    _sMB_MEM2 = .;
+    *(MB_MEM2)
+
+    . = ALIGN(4);
+    _eMB_MEM2 = .;
+  } >RAM_SHARED AT> FLASH
 
   /* Uninitialized data section into "RAM" Ram type memory */
-  . = ALIGN(8);
+  . = ALIGN(4);
   .bss :
   {
     /* This is used by the startup in order to initialize the .bss section */
@@ -157,7 +176,7 @@ SECTIONS
     *(.bss*)
     *(COMMON)
 
-    . = ALIGN(8);
+    . = ALIGN(4);
     _ebss = .;         /* define a global symbol at bss end */
     __bss_end__ = _ebss;
   } >RAM
@@ -182,5 +201,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MB_MEM2       : { *(MB_MEM2) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/.cproject
index cbee23d4..0d457328 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/.cproject
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/.cproject
@@ -1,53 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.470054035">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.470054035" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1219133631">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1219133631" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.470054035" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.470054035." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1442776677" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.708491823" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.292946193" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1024442351" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.715609319" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1805971941" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1586739672" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1234427105" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/SubGHz_Phy/App | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.2121365685" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.82651043" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.562567288" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1424753461" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1312815517" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1219133631" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1219133631." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.15735453" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.599102978" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.568913436" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1263506291" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1042303099" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1256043157" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../CM4/SubGHz_Phy/App | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/lpm/tiny_lpm ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1279279440" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong_DualCore_CM4}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.988667583" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1998566973" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1642649206" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.577468816" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1669307223" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.765060801" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.614114842" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1019975219" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.753955262" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.933545032" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1811436583" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1619223550" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2020172364" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.300098816" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1391665362" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/SubGHz_Phy/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
@@ -58,82 +60,79 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1060892597" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1072488130" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1251597583" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.431690000" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1792694623" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.269496932" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.108560800" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1231077430" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1911437947" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.692165623" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1025637381" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.197607795" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.108218098" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.751751162" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1450579830" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1264719012" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.68000823" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.705142750" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1719462363" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.672684904" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.991519888" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.568320790" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.52806863" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.259504641" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.516339202" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1012966164" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.221981375" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1035117915" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1142845028" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1347199771" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1483585780" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1602941635" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.4391926" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1680798942">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1680798942" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1776383410">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1776383410" moduleId="org.eclipse.cdt.core.settings" name="Release">
 				<externalSettings/>
 				<extensions>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1680798942" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1680798942." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.378947246" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.973053183" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1582779409" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.396245599" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.998351948" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.811374504" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1523216097" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.316063157" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM4/Core/Inc | ../../../CM4/SubGHz_Phy/App | ../../../CM4/MbMux | ../../../Common/Board | ../../../Common/MbMux | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Utilities/misc | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/timer | ../../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.382609074" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.563092582" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.504513147" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.209378533" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1064101079" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1776383410" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1776383410." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.408959799" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.505707527" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1235770678" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.77048600" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.53961999" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.2066271698" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.4 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../CM4/Core/Inc | ../../../Common/System | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Utilities/misc | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../Common/Board | ../../../../../../../../Utilities/trace/adv_trace | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo | ../../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../Common/MbMux | ../../../../../../../../Utilities/timer | ../../../CM4/MbMux | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../CM4/SubGHz_Phy/App | ../../../../../../../../Utilities/sequencer | ../../../../../../../../Utilities/lpm/tiny_lpm ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1175752544" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/SubGHz_Phy_PingPong_DualCore_CM4}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.420899191" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1772341942" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1788419122" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.838765039" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.166642527" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.34904636" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.265483822" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.231251867" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1737310652" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1162230218" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1518715009" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.678715494" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.129561733" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.899096568" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../../CM4/Core/Inc"/>
 									<listOptionValue builtIn="false" value="../../../CM4/SubGHz_Phy/App"/>
 									<listOptionValue builtIn="false" value="../../../CM4/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/Board"/>
 									<listOptionValue builtIn="false" value="../../../Common/MbMux"/>
 									<listOptionValue builtIn="false" value="../../../Common/System"/>
-									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/trace/adv_trace"/>
+									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/misc"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Utilities/sequencer"/>
@@ -144,30 +143,28 @@
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../../Drivers/CMSIS/Include"/>
 								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2057718452" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.151352018" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1043473397" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.562016994" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.546880492" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1436755214" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1691720469" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1824058294" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1397171099" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1521798532" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1516061444" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.217017705" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1684687477" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1055041856" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.894220643" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1355598367" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1747442163" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.886537022" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.619978563" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1550428652" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.2126602995" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1566074071" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1660911044" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1333322384" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.883498820" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.666611373" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1306966636" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1799578015" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.874456381" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1175331814" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1647673908" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.101060665" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.736289771" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ -175,19 +172,20 @@
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="SubGHz_Phy_PingPong_DualCore_CM4.null.1493071984" name="SubGHz_Phy_PingPong_DualCore_CM4"/>
+		<project id="SubGHz_Phy_PingPong_DualCore_CM4.null.2105008799" name="SubGHz_Phy_PingPong_DualCore_CM4"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.470054035;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.470054035.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.765060801;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1060892597">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1219133631;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1219133631.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.933545032;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1072488130">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1680798942;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1680798942.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.166642527;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2057718452">
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1776383410;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1776383410.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1737310652;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.151352018">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/.project b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/.project
index 601a0e86..afdbd1ad 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/.project
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/.project
@@ -25,251 +25,260 @@
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_flash_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_flash_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-7-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/ipcc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/ipcc_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/ipcc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmux.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmux.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmux.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_radio.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_sys.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_sys.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_sys.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/mbmuxif_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/mbmuxif_trace.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/mbmuxif_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/MbMux/radio_mbwrapper.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/MbMux/radio_mbwrapper.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/MbMux/radio_mbwrapper.c</locationURI>
+		</link>
+		<link>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
+			<type>1</type>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</locationURI>
 		</link>
 		<link>
-			<name>Application/User/Common/Board/board_resources.c</name>
+			<name>Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/Board/board_resources.c</locationURI>
+			<locationURI>PARENT-7-PROJECT_LOC/Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo_radio.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/Common/System/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/Common/System/sys_debug.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/Common/System/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/SubGHz_Phy/App/app_subghz_phy.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/SubGHz_Phy/App/app_subghz_phy.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/SubGHz_Phy/App/app_subghz_phy.c</locationURI>
 		</link>
 		<link>
 			<name>Application/User/SubGHz_Phy/App/subghz_phy_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-2-PROJECT_LOC%7D/CM4/SubGHz_Phy/App/subghz_phy_app.c</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/CM4/SubGHz_Phy/App/subghz_phy_app.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
index 89dfe9e5..af218d28 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Startup/startup_stm32wl55jcix.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
@@ -44,6 +43,52 @@ defined in linker script */
 .word _sbss
 /* end address for the .bss section. defined in linker script */
 .word _ebss
+/* start address for the .MB_MEM1 section. defined in linker script */
+.word _sMB_MEM1
+/* end address for the .MB_MEM1 section. defined in linker script */
+.word _eMB_MEM1
+/* start address for the .MAPPING_TABLE section. defined in linker script */
+.word _sMAPPING_TABLE
+/* end address for the .MAPPING_TABLE section. defined in linker script */
+.word _eMAPPING_TABLE
+
+/* INIT_BSS macro is used to fill the specified region [start : end] with zeros */
+.macro INIT_BSS start, end
+  ldr r0, =\start
+  ldr r1, =\end
+  movs r3, #0
+  bl LoopFillZerobss
+.endm
+
+/* INIT_DATA macro is used to copy data in the region [start : end] starting from 'src' */
+.macro INIT_DATA start, end, src
+  ldr r0, =\start
+  ldr r1, =\end
+  ldr r2, =\src
+  movs r3, #0
+  bl LoopCopyDataInit
+.endm
+
+.section  .text.data_initializers
+CopyDataInit:
+  ldr r4, [r2, r3]
+  str r4, [r0, r3]
+  adds r3, r3, #4
+
+LoopCopyDataInit:
+  adds r4, r0, r3
+  cmp r4, r1
+  bcc  CopyDataInit
+  bx lr
+
+FillZerobss:
+  str  r3, [r0]
+  adds r0, r0, #4
+
+LoopFillZerobss:
+  cmp r0, r1
+  bcc FillZerobss
+  bx lr
 
 /**
  * @brief  This is the code that gets called when the processor first
@@ -61,40 +106,20 @@ Reset_Handler:
   ldr   r0, =_estack
   mov   sp, r0          /* set stack pointer */
 
-/* Call the clock system initialization function.*/
-  bl  SystemInit
+/* Zero fill the bss segments. */
+  INIT_BSS _sbss, _ebss
 
-/* Copy the data segment initializers from flash to SRAM */
-  ldr r0, =_sdata
-  ldr r1, =_edata
-  ldr r2, =_sidata
-  movs r3, #0
-  b LoopCopyDataInit
-
-CopyDataInit:
-  ldr r4, [r2, r3]
-  str r4, [r0, r3]
-  adds r3, r3, #4
-
-LoopCopyDataInit:
-  adds r4, r0, r3
-  cmp r4, r1
-  bcc CopyDataInit
+/* Zero fill the MB_MEM1 segments. */
+  INIT_BSS _sMB_MEM1, _eMB_MEM1
 
-/* Zero fill the bss segment. */
-  ldr r2, =_sbss
-  ldr r4, =_ebss
-  movs r3, #0
-  b LoopFillZerobss
+/* Zero fill the MAPPING_TABLE segments. */
+  INIT_BSS _sMAPPING_TABLE, _eMAPPING_TABLE
 
-FillZerobss:
-  str  r3, [r2]
-  adds r2, r2, #4
-
-LoopFillZerobss:
-  cmp r2, r4
-  bcc FillZerobss
+/* Copy the data segment initializers from flash to SRAM */
+  INIT_DATA _sdata, _edata, _sidata
 
+/* Call the clock system initialization function.*/
+  bl  SystemInit
 /* Call static constructors */
   bl __libc_init_array
 /* Call the application's entry point.*/
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
index 1eeab01b..7ef32125 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -6,7 +6,7 @@
 **  Author      : STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32WL55xC Device
-**                      256Kbytes ROM
+**                      256Kbytes FLASH
 **                      64Kbytes RAM
 **
 **                Set heap size, stack size and stack location according
@@ -14,6 +14,9 @@
 **
 **                Set memory bank area and size if external memory is used.
 **
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
 **  Target      : STMicroelectronics STM32
 **
 **  Distribution: The file is distributed as is without any warranty
@@ -39,29 +42,29 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x400 ; /* required amount of heap  */
-_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x800 ; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
   RAM    (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 128K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 128K
   RAM_SHARED (rw): ORIGIN = 0x20008000, LENGTH = 4K
 }
 
 /* Sections */
 SECTIONS
 {
-  /* The startup code into "ROM" Rom type memory */
+  /* The startup code into "FLASH" Rom type memory */
   .isr_vector :
   {
     . = ALIGN(4);
     KEEP(*(.isr_vector)) /* Startup code */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  /* The program code and other data into "ROM" Rom type memory */
+  /* The program code and other data into "FLASH" Rom type memory */
   .text :
   {
     . = ALIGN(4);
@@ -76,30 +79,30 @@ SECTIONS
 
     . = ALIGN(4);
     _etext = .;        /* define a global symbols at end of code */
-  } >ROM
+  } >FLASH
 
-  /* Constant data into "ROM" Rom type memory */
+  /* Constant data into "FLASH" Rom type memory */
   .rodata :
   {
     . = ALIGN(4);
     *(.rodata)         /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
-  .ARM.extab   : { 
+  .ARM.extab   : {
     . = ALIGN(4);
     *(.ARM.extab* .gnu.linkonce.armextab.*)
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .ARM : {
     . = ALIGN(4);
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   .preinit_array     :
   {
@@ -108,8 +111,8 @@ SECTIONS
     KEEP (*(.preinit_array*))
     PROVIDE_HIDDEN (__preinit_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .init_array :
   {
     . = ALIGN(4);
@@ -118,8 +121,8 @@ SECTIONS
     KEEP (*(.init_array*))
     PROVIDE_HIDDEN (__init_array_end = .);
     . = ALIGN(4);
-  } >ROM
-  
+  } >FLASH
+
   .fini_array :
   {
     . = ALIGN(4);
@@ -128,23 +131,47 @@ SECTIONS
     KEEP (*(.fini_array*))
     PROVIDE_HIDDEN (__fini_array_end = .);
     . = ALIGN(4);
-  } >ROM
+  } >FLASH
 
   /* Used by the startup to initialize data */
   _sidata = LOADADDR(.data);
 
   /* Initialized data sections into "RAM" Ram type memory */
-  .data : 
+  .data :
   {
     . = ALIGN(4);
     _sdata = .;        /* create a global symbol at data start */
     *(.data)           /* .data sections */
     *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
 
     . = ALIGN(4);
     _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM AT> ROM
+
+  } >RAM AT> FLASH
+
+  /* Uninitialized data section into "MAPPING_TABLE" Ram type memory */
+  MAPPING_TABLE (NOLOAD) :
+  {
+    . = ALIGN(4);
+    _sMAPPING_TABLE = .;
+    *(MAPPING_TABLE)
+
+    . = ALIGN(4);
+    _eMAPPING_TABLE = .;
+  } >RAM_SHARED
+
+  /* Uninitialized data section into "MB_MEM1" Ram type memory */
+  MB_MEM1 (NOLOAD) : 
+  {
+    . = ALIGN(4);
+    _sMB_MEM1 = .;
+    *(MB_MEM1)
+
+    . = ALIGN(4);
+    _eMB_MEM1 = .;
+  } >RAM_SHARED
 
   /* Uninitialized data section into "RAM" Ram type memory */
   . = ALIGN(4);
@@ -182,6 +209,4 @@ SECTIONS
   }
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
-   MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
-   MB_MEM1 (NOLOAD)       : { *(MB_MEM1) } >RAM_SHARED
 }
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/SubGHz_Phy_PingPong_DualCore.ioc b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/SubGHz_Phy_PingPong_DualCore.ioc
index 3b36e25a..a8bc9ff7 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/SubGHz_Phy_PingPong_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/SubGHz_Phy_PingPong_DualCore.ioc
@@ -30,64 +30,67 @@ Mcu.ContextNb=2
 Mcu.ContextProject=DualCore
 Mcu.Family=STM32WL
 Mcu.IP0=ADV_TRACE
-Mcu.IP1=DMA
-Mcu.IP10=SUBGHZ
-Mcu.IP11=SUBGHZ_PHY
-Mcu.IP12=SYS_M0PLUS
-Mcu.IP13=SYS
-Mcu.IP14=TIMER
-Mcu.IP15=TINY_LPM
-Mcu.IP16=USART2
-Mcu.IP2=IPCC
-Mcu.IP3=MISC
-Mcu.IP4=NVIC1
-Mcu.IP5=NVIC2
-Mcu.IP6=RCC
-Mcu.IP7=RTC
-Mcu.IP8=SEQUENCER_M0PLUS
-Mcu.IP9=SEQUENCER_M4
-Mcu.IPNb=17
+Mcu.IP1=DEBUG
+Mcu.IP10=SEQUENCER_M4
+Mcu.IP11=SUBGHZ
+Mcu.IP12=SUBGHZ_PHY
+Mcu.IP13=SYS_M0PLUS
+Mcu.IP14=SYS
+Mcu.IP15=TIMER
+Mcu.IP16=TINY_LPM
+Mcu.IP17=USART2
+Mcu.IP2=DMA
+Mcu.IP3=IPCC
+Mcu.IP4=MISC
+Mcu.IP5=NVIC1
+Mcu.IP6=NVIC2
+Mcu.IP7=RCC
+Mcu.IP8=RTC
+Mcu.IP9=SEQUENCER_M0PLUS
+Mcu.IPNb=18
 Mcu.Name=STM32WL55JCIx
 Mcu.Package=UFBGA73
-Mcu.Pin0=PB15
-Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PC4
-Mcu.Pin11=PB0-VDD_TCXO
-Mcu.Pin12=PC6
-Mcu.Pin13=PA1
-Mcu.Pin14=PB11
-Mcu.Pin15=OSC_IN
-Mcu.Pin16=PA3
-Mcu.Pin17=PA2
-Mcu.Pin18=PB10
-Mcu.Pin19=VP_ADV_TRACE_VS_ADV_TRACE
-Mcu.Pin2=PB9
-Mcu.Pin20=VP_IPCC_VS_IPCC
-Mcu.Pin21=VP_MISC_VS_MISC
-Mcu.Pin22=VP_RTC_VS_RTC_Activate
-Mcu.Pin23=VP_RTC_VS_RTC_Calendar
-Mcu.Pin24=VP_RTC_VS_RTC_Alarm_A_Intern
-Mcu.Pin25=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
-Mcu.Pin26=VP_SEQUENCER_M4_VS_SEQUENCER
-Mcu.Pin27=VP_SUBGHZ_VS_SUBGHZ
-Mcu.Pin28=VP_SUBGHZ_PHY_VS_SubGhzPhy
-Mcu.Pin29=VP_SYS_VS_Systick
-Mcu.Pin3=PC15-OSC32_OUT
-Mcu.Pin30=VP_SYS_M0PLUS_VS_Systick
-Mcu.Pin31=VP_TIMER_VS_TIMER
-Mcu.Pin32=VP_TINY_LPM_VS_TINY_LPM
-Mcu.Pin4=PB14
-Mcu.Pin5=PC3
-Mcu.Pin6=PA0
-Mcu.Pin7=PB13
-Mcu.Pin8=PC5
-Mcu.Pin9=PB12
-Mcu.PinsNb=33
+Mcu.Pin0=PA14
+Mcu.Pin1=PB15
+Mcu.Pin10=PC5
+Mcu.Pin11=PB12
+Mcu.Pin12=PC4
+Mcu.Pin13=PB0-VDD_TCXO
+Mcu.Pin14=PC6
+Mcu.Pin15=PA1
+Mcu.Pin16=PB11
+Mcu.Pin17=OSC_IN
+Mcu.Pin18=PA3
+Mcu.Pin19=PA2
+Mcu.Pin2=PC14-OSC32_IN
+Mcu.Pin20=PB10
+Mcu.Pin21=VP_ADV_TRACE_VS_ADV_TRACE
+Mcu.Pin22=VP_IPCC_VS_IPCC
+Mcu.Pin23=VP_MISC_VS_MISC
+Mcu.Pin24=VP_RTC_VS_RTC_Activate
+Mcu.Pin25=VP_RTC_VS_RTC_Calendar
+Mcu.Pin26=VP_RTC_VS_RTC_Alarm_A_Intern
+Mcu.Pin27=VP_SEQUENCER_M0PLUS_VS_SEQUENCER
+Mcu.Pin28=VP_SEQUENCER_M4_VS_SEQUENCER
+Mcu.Pin29=VP_SUBGHZ_VS_SUBGHZ
+Mcu.Pin3=PA13
+Mcu.Pin30=VP_SUBGHZ_PHY_VS_SubGhzPhy
+Mcu.Pin31=VP_SYS_VS_None
+Mcu.Pin32=VP_SYS_M0PLUS_VS_None
+Mcu.Pin33=VP_TIMER_VS_TIMER
+Mcu.Pin34=VP_TINY_LPM_VS_TINY_LPM
+Mcu.Pin4=PB9
+Mcu.Pin5=PC15-OSC32_OUT
+Mcu.Pin6=PB14
+Mcu.Pin7=PC3
+Mcu.Pin8=PA0
+Mcu.Pin9=PB13
+Mcu.PinsNb=35
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=RTC_N_PREDIV_S,10;RTC_PREDIV_S,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A,((1<<(15-RTC_N_PREDIV_S))-1);USART_BAUDRATE,115200
+Mcu.UserConstants=RTC_N_PREDIV_S-CortexM0Plus,10;RTC_PREDIV_S-CortexM0Plus,((1<<RTC_N_PREDIV_S)-1);RTC_PREDIV_A-CortexM0Plus,((1<<(15-RTC_N_PREDIV_S))-1);RTC_N_PREDIV_S-CortexM4,10;RTC_PREDIV_S-CortexM4,((1<<RTC_N_PREDIV_S)-1)
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DMA1_Channel5_IRQn=true\:2\:0\:true\:false\:true\:false\:true
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -102,7 +105,8 @@ NVIC1.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC1.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC1.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC1.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC1.TimeBase=None
 NVIC1.USART2_IRQn=true\:2\:0\:true\:false\:true\:true\:true
 NVIC1.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.ForceEnableDMAVector=true
@@ -113,19 +117,22 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.RTC_LSECSS_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SUBGHZ_Radio_IRQn=true\:0\:0\:false\:false\:true\:true\:true
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
+NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC2.TimeBase=None
 OSC_IN.Mode=HSE-TCXO
 OSC_IN.Signal=RCC_OSC_IN
-PA0.GPIOParameters=GPIO_Label,PinAttribute
+PA0.GPIOParameters=GPIO_Label
 PA0.GPIO_Label=BUT1
 PA0.Locked=true
-PA0.PinAttribute=CortexM4
 PA0.Signal=GPXTI0
-PA1.GPIOParameters=GPIO_Label,PinAttribute
+PA1.GPIOParameters=GPIO_Label
 PA1.GPIO_Label=BUT2
 PA1.Locked=true
-PA1.PinAttribute=CortexM4
 PA1.Signal=GPXTI1
+PA13.Mode=Serial_Wire
+PA13.Signal=DEBUG_JTMS-SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=DEBUG_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Speed,GPIO_Label
 PA2.GPIO_Label=USARTx_TX
 PA2.GPIO_Speed=GPIO_SPEED_FREQ_VERY_HIGH
@@ -140,40 +147,33 @@ PA3.Mode=Asynchronous
 PA3.Signal=USART2_RX
 PB0-VDD_TCXO.Mode=HSE-TCXO
 PB0-VDD_TCXO.Signal=VDDTCXO
-PB10.GPIOParameters=GPIO_Label,PinAttribute
-PB10.GPIO_Label=DBG4
+PB10.GPIOParameters=GPIO_Label
+PB10.GPIO_Label=PROB4
 PB10.Locked=true
-PB10.PinAttribute=CortexM4
 PB10.Signal=GPIO_Output
-PB11.GPIOParameters=GPIO_Label,PinAttribute
+PB11.GPIOParameters=GPIO_Label
 PB11.GPIO_Label=LED3
 PB11.Locked=true
-PB11.PinAttribute=CortexM4
 PB11.Signal=GPIO_Output
-PB12.GPIOParameters=GPIO_Label,PinAttribute
-PB12.GPIO_Label=DBG1
+PB12.GPIOParameters=GPIO_Label
+PB12.GPIO_Label=PROB1
 PB12.Locked=true
-PB12.PinAttribute=CortexM4
 PB12.Signal=GPIO_Output
-PB13.GPIOParameters=GPIO_Label,PinAttribute
-PB13.GPIO_Label=DBG2
+PB13.GPIOParameters=GPIO_Label
+PB13.GPIO_Label=PROB2
 PB13.Locked=true
-PB13.PinAttribute=CortexM4
 PB13.Signal=GPIO_Output
-PB14.GPIOParameters=GPIO_Label,PinAttribute
-PB14.GPIO_Label=DBG3
+PB14.GPIOParameters=GPIO_Label
+PB14.GPIO_Label=PROB3
 PB14.Locked=true
-PB14.PinAttribute=CortexM4
 PB14.Signal=GPIO_Output
-PB15.GPIOParameters=GPIO_Label,PinAttribute
+PB15.GPIOParameters=GPIO_Label
 PB15.GPIO_Label=LED1
 PB15.Locked=true
-PB15.PinAttribute=CortexM4
 PB15.Signal=GPIO_Output
-PB9.GPIOParameters=GPIO_Label,PinAttribute
+PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
-PB9.PinAttribute=CortexM4
 PB9.Signal=GPIO_Output
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Mode=LSE-External-Oscillator
@@ -181,26 +181,29 @@ PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Locked=true
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
-PC3.GPIOParameters=GPIO_Label,PinAttribute
+PC3.GPIOParameters=GPIO_Label
 PC3.GPIO_Label=RF_CTRL3
 PC3.Locked=true
-PC3.PinAttribute=CortexM4
 PC3.Signal=GPIO_Output
-PC4.GPIOParameters=GPIO_Label,PinAttribute
+PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=RF_CTRL1
 PC4.Locked=true
-PC4.PinAttribute=CortexM4
 PC4.Signal=GPIO_Output
-PC5.GPIOParameters=GPIO_Label,PinAttribute
+PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=RF_CTRL2
 PC5.Locked=true
-PC5.PinAttribute=CortexM4
 PC5.Signal=GPIO_Output
-PC6.GPIOParameters=GPIO_Label,PinAttribute
+PC6.GPIOParameters=GPIO_Label
 PC6.GPIO_Label=BUT3
 PC6.Locked=true
-PC6.PinAttribute=CortexM4
 PC6.Signal=GPXTI6
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -213,7 +216,7 @@ ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32WL55JCIx
 ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
-ProjectManager.HeapSize=0x400
+ProjectManager.HeapSize=M4-0x200,M0P-0x400
 ProjectManager.KeepUserCode=true
 ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=2
@@ -224,7 +227,7 @@ ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=SubGHz_Phy_PingPong_DualCore.ioc
 ProjectManager.ProjectName=SubGHz_Phy_PingPong_DualCore
 ProjectManager.RegisterCallBack=
-ProjectManager.StackSize=0x1000
+ProjectManager.StackSize=M4-0x800,M0P-0x1000
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
@@ -277,8 +280,7 @@ RTC.AsynchPrediv=RTC_PREDIV_A
 RTC.BinMode=RTC_BINARY_ONLY
 RTC.BinaryAutoClr_A-Alarm\ A=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
 RTC.BinaryAutoClr_B-Alarm\ B=RTC_ALARMSUBSECONDBIN_AUTOCLR_NO
-RTC.Format=RTC_FORMAT_BIN
-RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B,Format
+RTC.IPParameters=Alarm-Alarm A,Alarm_B-Alarm B,BinMode,AsynchPrediv,BinaryAutoClr_A-Alarm A,BinaryAutoClr_B-Alarm B
 SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI0.ConfNb=1
 SH.GPXTI1.0=GPIO_EXTI1
@@ -287,18 +289,18 @@ SH.GPXTI6.0=GPIO_EXTI6
 SH.GPXTI6.ConfNb=1
 SUBGHZ.BaudratePrescaler=SUBGHZSPI_BAUDRATEPRESCALER_4
 SUBGHZ.IPParameters=BaudratePrescaler
-SUBGHZ_PHY.Activate_BOARD_RESOURCES=both
 SUBGHZ_PHY.Activate_DEBUG_LINE=true
-SUBGHZ_PHY.IPParameters=Activate_BOARD_RESOURCES,IS_DCDC_SUPPORTED,Activate_DEBUG_LINE,SUBGHZ_APPLICATION
-SUBGHZ_PHY.IS_DCDC_SUPPORTED=false
-SUBGHZ_PHY.SUBGHZ_APPLICATION=SUBGHZ_PINGPONG
+SUBGHZ_PHY.Activate_RADIO_BOARD_INTERFACE=Bsp
+SUBGHZ_PHY.IPParameters=IS_DCDC_SUPPORTED,Activate_DEBUG_LINE,SUBGHZ_APPLICATION,Activate_RADIO_BOARD_INTERFACE
+SUBGHZ_PHY.IS_DCDC_SUPPORTED=true
+SUBGHZ_PHY.SUBGHZ_APPLICATION=SUBGHZ_ADV_APPLICATION
 SYS.userName=SYS_M4
 SYS_M0PLUS.userName=SYS_M0+
-SubGHz_Phy.BSP.number=15
+SubGHz_Phy.BSP.number=6
 SubGHz_Phy0.BSP.STBoard=false
 SubGHz_Phy0.BSP.api=Unknown
 SubGHz_Phy0.BSP.component=
-SubGHz_Phy0.BSP.condition=\!SEM_SUBGHZ_USER_APPLICATION
+SubGHz_Phy0.BSP.condition=\!SEM_SUBGHZ_USER_APPLICATION | SEM_SUBGHZ_USE_RTC
 SubGHz_Phy0.BSP.i2caddr=0
 SubGHz_Phy0.BSP.i2creg=
 SubGHz_Phy0.BSP.instance=RTC
@@ -310,174 +312,65 @@ SubGHz_Phy0.BSP.solution=RTC
 SubGHz_Phy1.BSP.STBoard=false
 SubGHz_Phy1.BSP.api=Unknown
 SubGHz_Phy1.BSP.component=
-SubGHz_Phy1.BSP.condition=SEM_DEBUG_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy1.BSP.condition=\!SEM_SUBGHZ_USER_APPLICATION | SEM_SUBGHZ_USE_UART
 SubGHz_Phy1.BSP.i2caddr=0
 SubGHz_Phy1.BSP.i2creg=
-SubGHz_Phy1.BSP.instance=PB12
-SubGHz_Phy1.BSP.ip=GPIO
-SubGHz_Phy1.BSP.mode=Output
-SubGHz_Phy1.BSP.name=Debug Line 1
+SubGHz_Phy1.BSP.instance=USART2
+SubGHz_Phy1.BSP.ip=(LPU|US)ART
+SubGHz_Phy1.BSP.mode=Asynchronous
+SubGHz_Phy1.BSP.name=USART
 SubGHz_Phy1.BSP.semaphore=
-SubGHz_Phy1.BSP.solution=PB12
-SubGHz_Phy10.BSP.STBoard=false
-SubGHz_Phy10.BSP.api=Unknown
-SubGHz_Phy10.BSP.component=
-SubGHz_Phy10.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SUBGHZ_PHY
-SubGHz_Phy10.BSP.i2caddr=0
-SubGHz_Phy10.BSP.i2creg=
-SubGHz_Phy10.BSP.instance=PC3
-SubGHz_Phy10.BSP.ip=GPIO
-SubGHz_Phy10.BSP.mode=Output
-SubGHz_Phy10.BSP.name=RF SW CTRL 3
-SubGHz_Phy10.BSP.semaphore=
-SubGHz_Phy10.BSP.solution=PC3
-SubGHz_Phy11.BSP.STBoard=false
-SubGHz_Phy11.BSP.api=Unknown
-SubGHz_Phy11.BSP.component=
-SubGHz_Phy11.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SUBGHZ_PHY
-SubGHz_Phy11.BSP.i2caddr=0
-SubGHz_Phy11.BSP.i2creg=
-SubGHz_Phy11.BSP.instance=PC4
-SubGHz_Phy11.BSP.ip=GPIO
-SubGHz_Phy11.BSP.mode=Output
-SubGHz_Phy11.BSP.name=RF SW CTRL 1
-SubGHz_Phy11.BSP.semaphore=
-SubGHz_Phy11.BSP.solution=PC4
-SubGHz_Phy12.BSP.STBoard=false
-SubGHz_Phy12.BSP.api=Unknown
-SubGHz_Phy12.BSP.component=
-SubGHz_Phy12.BSP.condition=SEM_RADIO_BOARD_INTERFACE_FOR_SUBGHZ_PHY
-SubGHz_Phy12.BSP.i2caddr=0
-SubGHz_Phy12.BSP.i2creg=
-SubGHz_Phy12.BSP.instance=PC5
-SubGHz_Phy12.BSP.ip=GPIO
-SubGHz_Phy12.BSP.mode=Output
-SubGHz_Phy12.BSP.name=RF SW CTRL 2
-SubGHz_Phy12.BSP.semaphore=
-SubGHz_Phy12.BSP.solution=PC5
-SubGHz_Phy13.BSP.STBoard=false
-SubGHz_Phy13.BSP.api=Unknown
-SubGHz_Phy13.BSP.component=
-SubGHz_Phy13.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_BOTH_FOR_SUBGHZ_PHY
-SubGHz_Phy13.BSP.i2caddr=0
-SubGHz_Phy13.BSP.i2creg=
-SubGHz_Phy13.BSP.instance=PC6
-SubGHz_Phy13.BSP.ip=GPIO
-SubGHz_Phy13.BSP.mode=EXTI
-SubGHz_Phy13.BSP.name=BUTTON 3
-SubGHz_Phy13.BSP.semaphore=
-SubGHz_Phy13.BSP.solution=PC6
-SubGHz_Phy14.BSP.STBoard=false
-SubGHz_Phy14.BSP.api=Unknown
-SubGHz_Phy14.BSP.component=
-SubGHz_Phy14.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_BOTH_FOR_SUBGHZ_PHY
-SubGHz_Phy14.BSP.i2caddr=0
-SubGHz_Phy14.BSP.i2creg=
-SubGHz_Phy14.BSP.instance=PA1
-SubGHz_Phy14.BSP.ip=GPIO
-SubGHz_Phy14.BSP.mode=EXTI
-SubGHz_Phy14.BSP.name=BUTTON 2
-SubGHz_Phy14.BSP.semaphore=
-SubGHz_Phy14.BSP.solution=PA1
+SubGHz_Phy1.BSP.solution=USART2
 SubGHz_Phy2.BSP.STBoard=false
 SubGHz_Phy2.BSP.api=Unknown
 SubGHz_Phy2.BSP.component=
-SubGHz_Phy2.BSP.condition=SEM_DEBUG_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy2.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
 SubGHz_Phy2.BSP.i2caddr=0
 SubGHz_Phy2.BSP.i2creg=
-SubGHz_Phy2.BSP.instance=PB13
+SubGHz_Phy2.BSP.instance=PB12
 SubGHz_Phy2.BSP.ip=GPIO
 SubGHz_Phy2.BSP.mode=Output
-SubGHz_Phy2.BSP.name=Debug Line 2
+SubGHz_Phy2.BSP.name=Debug Line 1
 SubGHz_Phy2.BSP.semaphore=
-SubGHz_Phy2.BSP.solution=PB13
+SubGHz_Phy2.BSP.solution=PB12
 SubGHz_Phy3.BSP.STBoard=false
 SubGHz_Phy3.BSP.api=Unknown
 SubGHz_Phy3.BSP.component=
-SubGHz_Phy3.BSP.condition=SEM_DEBUG_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy3.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
 SubGHz_Phy3.BSP.i2caddr=0
 SubGHz_Phy3.BSP.i2creg=
-SubGHz_Phy3.BSP.instance=PB14
+SubGHz_Phy3.BSP.instance=PB13
 SubGHz_Phy3.BSP.ip=GPIO
 SubGHz_Phy3.BSP.mode=Output
-SubGHz_Phy3.BSP.name=Debug Line 3
+SubGHz_Phy3.BSP.name=Debug Line 2
 SubGHz_Phy3.BSP.semaphore=
-SubGHz_Phy3.BSP.solution=PB14
+SubGHz_Phy3.BSP.solution=PB13
 SubGHz_Phy4.BSP.STBoard=false
 SubGHz_Phy4.BSP.api=Unknown
 SubGHz_Phy4.BSP.component=
-SubGHz_Phy4.BSP.condition=SEM_DEBUG_LINE_FOR_SUBGHZ_PHY
+SubGHz_Phy4.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
 SubGHz_Phy4.BSP.i2caddr=0
 SubGHz_Phy4.BSP.i2creg=
-SubGHz_Phy4.BSP.instance=PB10
+SubGHz_Phy4.BSP.instance=PB14
 SubGHz_Phy4.BSP.ip=GPIO
 SubGHz_Phy4.BSP.mode=Output
-SubGHz_Phy4.BSP.name=Debug Line 4
+SubGHz_Phy4.BSP.name=Debug Line 3
 SubGHz_Phy4.BSP.semaphore=
-SubGHz_Phy4.BSP.solution=PB10
+SubGHz_Phy4.BSP.solution=PB14
 SubGHz_Phy5.BSP.STBoard=false
 SubGHz_Phy5.BSP.api=Unknown
 SubGHz_Phy5.BSP.component=
-SubGHz_Phy5.BSP.condition=SEM_SUBGHZ_PINGPONG
+SubGHz_Phy5.BSP.condition=SEM_PROBE_LINE_FOR_SUBGHZ_PHY
 SubGHz_Phy5.BSP.i2caddr=0
 SubGHz_Phy5.BSP.i2creg=
-SubGHz_Phy5.BSP.instance=USART2
-SubGHz_Phy5.BSP.ip=(LPU|US)ART
-SubGHz_Phy5.BSP.mode=Asynchronous
-SubGHz_Phy5.BSP.name=USART
+SubGHz_Phy5.BSP.instance=PB10
+SubGHz_Phy5.BSP.ip=GPIO
+SubGHz_Phy5.BSP.mode=Output
+SubGHz_Phy5.BSP.name=Debug Line 4
 SubGHz_Phy5.BSP.semaphore=
-SubGHz_Phy5.BSP.solution=USART2
-SubGHz_Phy6.BSP.STBoard=false
-SubGHz_Phy6.BSP.api=Unknown
-SubGHz_Phy6.BSP.component=
-SubGHz_Phy6.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_BOTH_FOR_SUBGHZ_PHY
-SubGHz_Phy6.BSP.i2caddr=0
-SubGHz_Phy6.BSP.i2creg=
-SubGHz_Phy6.BSP.instance=PB11
-SubGHz_Phy6.BSP.ip=GPIO
-SubGHz_Phy6.BSP.mode=Output
-SubGHz_Phy6.BSP.name=LED 3
-SubGHz_Phy6.BSP.semaphore=
-SubGHz_Phy6.BSP.solution=PB11
-SubGHz_Phy7.BSP.STBoard=false
-SubGHz_Phy7.BSP.api=Unknown
-SubGHz_Phy7.BSP.component=
-SubGHz_Phy7.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_BOTH_FOR_SUBGHZ_PHY
-SubGHz_Phy7.BSP.i2caddr=0
-SubGHz_Phy7.BSP.i2creg=
-SubGHz_Phy7.BSP.instance=PB9
-SubGHz_Phy7.BSP.ip=GPIO
-SubGHz_Phy7.BSP.mode=Output
-SubGHz_Phy7.BSP.name=LED 2
-SubGHz_Phy7.BSP.semaphore=
-SubGHz_Phy7.BSP.solution=PB9
-SubGHz_Phy8.BSP.STBoard=false
-SubGHz_Phy8.BSP.api=Unknown
-SubGHz_Phy8.BSP.component=
-SubGHz_Phy8.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_BOTH_FOR_SUBGHZ_PHY
-SubGHz_Phy8.BSP.i2caddr=0
-SubGHz_Phy8.BSP.i2creg=
-SubGHz_Phy8.BSP.instance=PB15
-SubGHz_Phy8.BSP.ip=GPIO
-SubGHz_Phy8.BSP.mode=Output
-SubGHz_Phy8.BSP.name=LED 1
-SubGHz_Phy8.BSP.semaphore=
-SubGHz_Phy8.BSP.solution=PB15
-SubGHz_Phy9.BSP.STBoard=false
-SubGHz_Phy9.BSP.api=Unknown
-SubGHz_Phy9.BSP.component=
-SubGHz_Phy9.BSP.condition=SEM_BOARD_RESOURCES_M0PLUS_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_M4_FOR_SUBGHZ_PHY | SEM_BOARD_RESOURCES_BOTH_FOR_SUBGHZ_PHY
-SubGHz_Phy9.BSP.i2caddr=0
-SubGHz_Phy9.BSP.i2creg=
-SubGHz_Phy9.BSP.instance=PA0
-SubGHz_Phy9.BSP.ip=GPIO
-SubGHz_Phy9.BSP.mode=EXTI
-SubGHz_Phy9.BSP.name=BUTTON 1
-SubGHz_Phy9.BSP.semaphore=
-SubGHz_Phy9.BSP.solution=PA0
-USART2.BaudRate=USART_BAUDRATE
+SubGHz_Phy5.BSP.solution=PB10
 USART2.FIFOMode=FIFOMODE_ENABLE
-USART2.IPParameters=VirtualMode-Asynchronous,BaudRate,FIFOMode
+USART2.IPParameters=VirtualMode-Asynchronous,FIFOMode
 USART2.VirtualMode-Asynchronous=VM_ASYNC
 VP_ADV_TRACE_VS_ADV_TRACE.Mode=ADV_TRACE_Enabled
 VP_ADV_TRACE_VS_ADV_TRACE.Signal=ADV_TRACE_VS_ADV_TRACE
@@ -499,12 +392,15 @@ VP_SUBGHZ_PHY_VS_SubGhzPhy.Mode=SubGhzPhy_Enabled
 VP_SUBGHZ_PHY_VS_SubGhzPhy.Signal=SUBGHZ_PHY_VS_SubGhzPhy
 VP_SUBGHZ_VS_SUBGHZ.Mode=SUBGHZ_Activate
 VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
-VP_SYS_M0PLUS_VS_Systick.Mode=SysTick
-VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
-VP_SYS_VS_Systick.Mode=SysTick
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_SYS_M0PLUS_VS_None.Mode=None
+VP_SYS_M0PLUS_VS_None.Signal=SYS_M0PLUS_VS_None
+VP_SYS_VS_None.Mode=None
+VP_SYS_VS_None.Signal=SYS_VS_None
 VP_TIMER_VS_TIMER.Mode=TIMER_Enabled
 VP_TIMER_VS_TIMER.Signal=TIMER_VS_TIMER
 VP_TINY_LPM_VS_TINY_LPM.Mode=TINY_LPM_Enabled
 VP_TINY_LPM_VS_TINY_LPM.Signal=TINY_LPM_VS_TINY_LPM
 board=NUCLEO-WL55JC1
+boardIOC=true
+ProjectManager.Example=SubGHz_Phy_PingPong_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/readme.txt
index 32dba1ef..d92499ba 100644
--- a/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/readme.txt
@@ -1,13 +1,13 @@
 /**
   @page SubGHz_Phy_PingPong_DualCore Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/readme.txt 
+  * @file    Applications/SubGHz_Phy/SubGHz_Phy_PingPong_DualCore/readme.txt
   * @author  MCD Application Team
-  * @brief   This application is a simple demo application software between 2 
-  *          LoRa Objects: a STM32WL Nucleo board and whatever other LoRA Radio  
-  *          board embedding SubGHz_Phy_PingPong application too. 
+  * @brief   This application is a simple demo application software between 2
+  *          LoRa Objects: a STM32WL Nucleo board and whatever other LoRa Radio
+  *          board embedding SubGHz_Phy_PingPong application too.
   *          IPCC and MBMUX are used for multicore communication.
   ******************************************************************************
   * @attention
@@ -25,20 +25,21 @@
 
 @par Description
 
-This directory contains a set of source files that implements a Dual Core (CM4 / CM0) Ping-Pong application 
+This directory contains a set of source files that implements a Dual Core (CM4 / CM0) Ping-Pong application
 between two PingPong Devices.
 
-The PingPong Device can be 
-   - a STM32WL Nucleo board 
-   - a Lora Radio expansion board or a B-L072Z-LRWAN1
-It is a simple RX/TX RF link between the two PingPong Devices, one will called be Ping the other will be called Pong. 
-By default, each PingPong Device starts as a master and will transmit a "Ping" message, and then wait for an answer. 
+The PingPong Device can be
+   - a STM32WL Nucleo board
+   - a LoRa Radio expansion board or a B-L072Z-LRWAN1
+The applications aims to show a simple RX/TX RF link between the two PingPong devices,
+one will be called Ping the other will be called Pong.
+By default, each PingPong Device starts as a master and will transmit a "Ping" message, and then wait for an answer.
+At start-up, each PingPong Device has its two LEDs blinking.
+When boards will synchronize (Tx window of one board aligned with Rx window of the other board)
+the Ping Device (board receiving "Ping" msg) will blink green LED and the Pong Device (board receiving "Pong" msg) will blink red LED.
 The first PingPong Device receiving a "Ping" message will become a slave and answers the master with a "Pong" message.
-At start, on STM32WL Nucleo board, if you see the 3 LEDs blinking on the 2 PingPong Device 
-it means that both boards have their RX windows synchronised (and TX windows too). The RX window of the first board 
-should NOT be perfectly synchronised with the second board, there should be one TX window in front of one RX window. 
-You only have to reset one of the two boards, to get rid of this issue.
-When boards are sending and receiving: Blue LED blinks on "Ping" msg received, Red LED blinks on "Pong" msg.
+
+Logs via hyperterminal complement LEDs indicators.
 
   ******************************************************************************
 
@@ -46,7 +47,7 @@ When boards are sending and receiving: Blue LED blinks on "Ping" msg received, R
 
 Applications, SubGHz_Phy, PingPong, DualCore
 
-@par Directory contents 
+@par Directory contents
 
 
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/ipcc.h                        This file contains all the function prototypes for
@@ -68,9 +69,9 @@ Applications, SubGHz_Phy, PingPong, DualCore
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_conf.h              Header for configuration file to utilities
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Inc/utilities_def.h               Definitions for modules requiring utilities
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.h                          API which interfaces CM0PLUS to IPCC
-  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                  API for CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                    API for CM0PLUS applic to handle the SYSTEM MBMUX channel
-  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                  API for CM0PLUS applic to register and handle TRACE via MBMUX
+  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.h                  API for CM0PLUS application to register and handle RADIO driver via MBMUX
+  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.h                    API for CM0PLUS application to handle the SYSTEM MBMUX channel
+  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.h                  API for CM0PLUS application to register and handle TRACE via MBMUX
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.h                This file implements the CM0PLUS side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/SubGHz_Phy/App/app_subghz_phy.h        Header of application of the SubGHz_Phy Middleware
@@ -99,16 +100,14 @@ Applications, SubGHz_Phy, PingPong, DualCore
   - SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_conf.h                  Header for configuration file to utilities
   - SubGHz_Phy_PingPong_DualCore/CM4/Core/Inc/utilities_def.h                   Definitions for modules requiring utilities
   - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.h                              API which interfaces CM4 to IPCC
-  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.h                      API for CM4 applic to register and handle RADIO driver via MBMUX
-  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.h                        API for CM4 applic to handle the SYSTEM MBMUX channel
-  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.h                      API for CM4 applic to register and handle TRACE via MBMUX
+  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.h                      API for CM4 application to register and handle RADIO driver via MBMUX
+  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.h                        API for CM4 application to handle the SYSTEM MBMUX channel
+  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.h                      API for CM4 application to register and handle TRACE via MBMUX
   - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.h                    This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.h            Header of application of the SubGHz_Phy Middleware
   - SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_version.h               Definition the version of the CM4 application
   - SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.h            Header of application of the SubGHz_Phy Middleware
-  - SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/Target/timer.h                  Wrapper to timer server
-  - SubGHz_Phy_PingPong_DualCore/Common/Board/board_resources.h                 Header for driver at.c module
   - SubGHz_Phy_PingPong_DualCore/Common/Board/stm32wlxx_nucleo_conf.h           STM32WLxx_Nucleo board configuration file.
   - SubGHz_Phy_PingPong_DualCore/Common/MbMux/features_info.h                   Feature list and parameters TypeDefinitions
   - SubGHz_Phy_PingPong_DualCore/Common/MbMux/mbmux_table.h                     Maps the IPCC channels to memory buffers
@@ -117,10 +116,12 @@ Applications, SubGHz_Phy, PingPong, DualCore
 
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc.c                        This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc_if.c                     Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/ipcc_if.c                     Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/main.c                        : Main program body
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/rtc.c                         This file provides code for the configuration
                                                                                 of the RTC instances.
+  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32wlxx_hal_msp.c           This file provides code for the MSP Initialization
+                                                                                and de-Initialization codes.
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32wlxx_it.c                Interrupt Service Routines.
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/stm32_lpm_if.c                Low layer function to enter/exit low power modes (stop, sleep)
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/subghz.c                      This file provides code for the configuration
@@ -129,8 +130,8 @@ Applications, SubGHz_Phy, PingPong, DualCore
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/Core/Src/timer_if.c                    Configure RTC Alarm, Tick and Calendar manager
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/features_info.c                  CM0PLUS supported features list
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmux.c                          Interface CPU2 to IPCC: multiplexer to map features to IPCC channels
-  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                  allows CM0PLUS applic to register and handle RADIO driver via MBMUX
-  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                    allows CM0 applic to handle the SYSTEM MBMUX channel
+  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_radio.c                  allows CM0PLUS application to register and handle RADIO driver via MBMUX
+  - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_sys.c                    allows CM0 application to handle the SYSTEM MBMUX channel
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/mbmuxif_trace.c                  Interface layer CM0PLUS Trace to MBMUX (Mailbox Multiplexer)
   - SubGHz_Phy_PingPong_DualCore/CM0PLUS/MbMux/radio_mbwrapper.c                This file implements the CM0 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
@@ -140,7 +141,7 @@ Applications, SubGHz_Phy, PingPong, DualCore
                                                                                 of all the requested memory to memory DMA transfers.
   - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc.c                            This file provides code for the configuration
                                                                                 of the IPCC instances.
-  - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc_if.c                         Interface to IPCC: handles IRQs and abstract appl from Ipcc handler and ch direction
+  - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/ipcc_if.c                         Interface to IPCC: handles IRQs and abstract application from Ipcc handler and channel direction
   - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/main.c                            : Main program body
   - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/stm32wlxx_hal_msp.c               This file provides code for the MSP Initialization
                                                                                 and de-Initialization codes.
@@ -150,36 +151,37 @@ Applications, SubGHz_Phy, PingPong, DualCore
   - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/timer_if.c                        Configure RTC Alarm, Tick and Calendar manager
   - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart.c                           This file provides code for the configuration
                                                                                 of the USART instances.
-  - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart_if.c                        Configuration of UART MX driver interface for hyperterminal communication
+  - SubGHz_Phy_PingPong_DualCore/CM4/Core/Src/usart_if.c                        Configuration of UART driver interface for hyperterminal communication
   - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmux.c                              CM4 side multiplexer to map features to IPCC channels
-  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.c                      allows CM4 applic to register and handle RADIO driver via MBMUX
-  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.c                        allows CM4 applic to handle the SYSTEM MBMUX channel.
-  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.c                      allows CM4 applic to receive by CM0 TRACE via MBMUX
+  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_radio.c                      allows CM4 application to register and handle RADIO driver via MBMUX
+  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_sys.c                        allows CM4 application to handle the SYSTEM MBMUX channel.
+  - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/mbmuxif_trace.c                      allows CM4 application to receive by CM0 TRACE via MBMUX
   - SubGHz_Phy_PingPong_DualCore/CM4/MbMux/radio_mbwrapper.c                    This file implements the CM4 side wrapper of the Radio interface
                                                                                 shared between M0 and M4.
   - SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/app_subghz_phy.c            Application of the SubGHz_Phy Middleware
   - SubGHz_Phy_PingPong_DualCore/CM4/SubGHz_Phy/App/subghz_phy_app.c            Application of the SubGHz_Phy Middleware
-  - SubGHz_Phy_PingPong_DualCore/Common/Board/board_resources.c                 Source file
   - SubGHz_Phy_PingPong_DualCore/Common/System/system_stm32wlxx.c               CMSIS Cortex Device Peripheral Access Layer System Source File
   - SubGHz_Phy_PingPong_DualCore/Common/System/sys_debug.c                      Enables 4 debug pins for internal signals RealTime debugging
+  - SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM0PLUS/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
+  - SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Core/syscalls.cSTM32CubeIDE Minimal System calls file
+  - SubGHz_Phy_PingPong_DualCore/STM32CubeIDE/CM4/Application/User/Core/sysmem.cSTM32CubeIDE System Memory calls file
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
 
   - Configure the software via the configuration files:
-    - CM0PLUS (Mw and radio drivers config) 
-        - sys_conf.h, radio_conf.h, mw_log_conf.h, radio_board_if.h, main.h, etc
-    - CM4 (Subghz appli)
+    - CM0PLUS (Mw and radio drivers config)
+        - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
+    - CM4 (Subghz application)
         - sys_conf.h, nucleo_conf.h, main.h, etc
-    - Careful: 
-        - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
 
   -Set Up:
 
@@ -190,32 +192,34 @@ Applications, SubGHz_Phy, PingPong, DualCore
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all CM4 files and load your image into CM4 target memory
-  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory 
+  - Rebuild all CM0PLUS files, set PWR_CR4_C2BOOT flag via CM4 and load your image into CM0PLUS target memory
   - Do the same for second board
   - Reset the two boards
   - Run the example on two boards
   - Open two Terminals, each connected to their respective PingPong Device
   - UART Config = 115200, 8b, 1 stopbit, no parity, no flow control
 
-@par How to use IAR to debug ? 
-  - open project.eww and select CM4 project
-  - make sure the flag DEBUGGER_ON =1 in app_conf.h
-  - better to define the flag LOW_POWER_DISABLE = 1 at least on one MCU (currently debugger has problem in dual core STOP mode)
-  - compile and download (Ctrl + D)
+@par How to debug ?
+  - Open your preferred toolchain and select CM4 project
+  - define the flag DEBUGGER_ENABLED to 1 in CM4\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download
   - put a breakpoint in sys_app.c one line after HAL_PWREx_ReleaseCore(PWR_CORE_CPU2);
   - run CM4 (the above functions sets PWR_CR4_C2BOOT flag)
-  - open a second instance of project.eww and select CM0PLUS project
-  - compile and download using "Download active application" 
+  - open a second instance of your preferred toolchain and select CM0PLUS project
+  - to debug CM0PLUS as well, define the flag DEBUGGER_ENABLED to 1 in CM0PLUS\Core\Inc\sys_conf.h
+  - define the flag LOW_POWER_DISABLE to 1 at least on one MCU (CM4 or CM0PUS)
+  - compile and download using "Download active application"
   - once CM0PLUS code is downloaded reset (system reset) the CM4
   - run CM4 to the breakpoint again
-  - attach to running target CM0PLUS 
+  - attach to running target CM0PLUS
          (CM0PLUS is in a while loop waiting CM4 to give green light to go further)
          (this is done to prevent CM0PLUS to execute too much code before attaching)
-  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exite the while loop
+  - on CM4 execute MBMUXIF_SetCpusSynchroFlag(1); this will allow CM0PLUS to exit the while loop
 
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LICENSE.md b/Projects/NUCLEO-WL55JC/Demonstrations/LICENSE.md
new file mode 100644
index 00000000..1af52330
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LICENSE.md
@@ -0,0 +1,80 @@
+SLA0044 Rev5/February 2018
+
+## Software license agreement
+
+### __ULTIMATE LIBERTY SOFTWARE LICENSE AGREEMENT__
+
+BY INSTALLING, COPYING, DOWNLOADING, ACCESSING OR OTHERWISE USING THIS SOFTWARE
+OR ANY PART THEREOF (AND THE RELATED DOCUMENTATION) FROM STMICROELECTRONICS
+INTERNATIONAL N.V, SWISS BRANCH AND/OR ITS AFFILIATED COMPANIES
+(STMICROELECTRONICS), THE RECIPIENT, ON BEHALF OF HIMSELF OR HERSELF, OR ON
+BEHALF OF ANY ENTITY BY WHICH SUCH RECIPIENT IS EMPLOYED AND/OR ENGAGED AGREES
+TO BE BOUND BY THIS SOFTWARE LICENSE AGREEMENT.
+
+Under STMicroelectronics’ intellectual property rights, the redistribution,
+reproduction and use in source and binary forms of the software or any part
+thereof, with or without modification, are permitted provided that the following
+conditions are met:
+
+1. Redistribution of source code (modified or not) must retain any copyright
+notice, this list of conditions and the disclaimer set forth below as items 10
+and 11.
+
+2. Redistributions in binary form, except as embedded into microcontroller or
+microprocessor device manufactured by or for STMicroelectronics or a software
+update for such device, must reproduce any copyright notice provided with the
+binary code, this list of conditions, and the disclaimer set forth below as
+items 10 and 11, in documentation and/or other materials provided with the
+distribution.
+
+3. Neither the name of STMicroelectronics nor the names of other contributors to
+this software may be used to endorse or promote products derived from this
+software or part thereof without specific written permission.
+
+4. This software or any part thereof, including modifications and/or derivative
+works of this software, must be used and execute solely and exclusively on or in
+combination with a microcontroller or microprocessor device manufactured by or
+for STMicroelectronics.
+
+5. No use, reproduction or redistribution of this software partially or totally
+may be done in any manner that would subject this software to any Open Source
+Terms. “Open Source Terms” shall mean any open source license which requires as
+part of distribution of software that the source code of such software is
+distributed therewith or otherwise made available, or open source license that
+substantially complies with the Open Source definition specified at
+www.opensource.org and any other comparable open source license such as for
+example GNU General Public License (GPL), Eclipse Public License (EPL), Apache
+Software License, BSD license or MIT license.
+
+6. STMicroelectronics has no obligation to provide any maintenance, support or
+updates for the software.
+
+7. The software is and will remain the exclusive property of STMicroelectronics
+and its licensors. The recipient will not take any action that jeopardizes
+STMicroelectronics and its licensors' proprietary rights or acquire any rights
+in the software, except the limited rights specified hereunder.
+
+8. The recipient shall comply with all applicable laws and regulations affecting
+the use of the software or any part thereof including any applicable export
+control law or regulation.
+
+9. Redistribution and use of this software or any part thereof other than as
+permitted under this license is void and will automatically terminate your
+rights under this license.
+
+10. THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, WHICH ARE
+DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT SHALL
+STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+11. EXCEPT AS EXPRESSLY PERMITTED HEREUNDER, NO LICENSE OR OTHER RIGHTS, WHETHER
+EXPRESS OR IMPLIED, ARE GRANTED UNDER ANY PATENT OR OTHER INTELLECTUAL PROPERTY
+RIGHTS OF STMICROELECTRONICS OR ANY THIRD PARTY.
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_data_format.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_data_format.h
index 100f09f2..0fcd0694 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_data_format.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_data_format.h
@@ -27,10 +27,10 @@ extern "C" {
 #endif
 
 /**
- * @brief Structure with measurement data.
- * Sent in DEMO_packet_sensor_t.
- * This data structure is for version 1.0.
- */
+  * @brief Structure with measurement data.
+  * Sent in DEMO_packet_sensor_t.
+  * This data structure is for version 1.0.
+  */
 typedef  struct
 {
   int16_t temperature;  /**<Temperature [0.01 `C]*/
@@ -44,10 +44,10 @@ typedef  struct
 
 
 /**
- * @brief Structure with measurement data.
- * Sent in DEMO_packet_sensor_t.
- * This data structure is for version 1.1.
- */
+  * @brief Structure with measurement data.
+  * Sent in DEMO_packet_sensor_t.
+  * This data structure is for version 1.1.
+  */
 typedef  struct
 {
   int16_t temperature;  /**<Temperature [0.01 `C]*/
@@ -65,15 +65,15 @@ typedef  struct
   uint16_t distance:12; /**<Distance from the ranging sensor [mm]*/
 
   /**
-   * Activity detected by the accelerometer and MotionAR
-   * 0 - No Activity
-   * 1 - Stationary
-   * 2 - Walking
-   * 3 - Fast Walking
-   * 4 - Jogging
-   * 5 - Biking
-   * 6 - Driving
-   */
+    * Activity detected by the accelerometer and MotionAR
+    * 0 - No Activity
+    * 1 - Stationary
+    * 2 - Walking
+    * 3 - Fast Walking
+    * 4 - Jogging
+    * 5 - Biking
+    * 6 - Driving
+    */
   uint16_t activity:4;
 
   uint16_t step_count;  /**<Number of steps (acceleration bumps) [1]*/
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_packet_format.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_packet_format.h
index 304e6aae..00944cd2 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_packet_format.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_packet_format.h
@@ -30,10 +30,10 @@ extern "C" {
 
 
 /**
- * @brief Beacon data structure.
- * Always 4 B.
- * Beacon packet doesn't have length or CRC.
- */
+  * @brief Beacon data structure.
+  * Always 4 B.
+  * Beacon packet doesn't have length or CRC.
+  */
 typedef  struct
 {
   uint8_t version_major :3;   /**<Major version of concentrator*/
@@ -56,16 +56,16 @@ typedef  struct
 #define DEMO_HDR_CONNECT_MARK           0x0 /*This value marks connect header*/
 
 /**
- * @brief Slot coding and connect header.
- */
+  * @brief Slot coding and connect header.
+  */
 typedef struct
-  {
-    uint8_t slot :4;     /**<Slot number to change, [2 .. DEMO_SLOT_NUMBER]*/
-    uint8_t mode :1;     /**<true for LoRa, false for FSK*/
-    uint8_t period :3;   /**<Number of beacons skipped before another transmission*/
-    uint8_t data_lim :5; /**<Limit length of sensor's packet [byte]*/
-    uint8_t chan_nr :3;  /**<Set different channel due to different channel constrains (not used when hopping)*/
-    /**Following are DEMO_coding_lora_t or DEMO_coding_fsk_t*/
+{
+  uint8_t slot :4;     /**<Slot number to change, [2 .. DEMO_SLOT_NUMBER]*/
+  uint8_t mode :1;     /**<true for LoRa, false for FSK*/
+  uint8_t period :3;   /**<Number of beacons skipped before another transmission*/
+  uint8_t data_lim :5; /**<Limit length of sensor's packet [byte]*/
+  uint8_t chan_nr :3;  /**<Set different channel due to different channel constrains (not used when hopping)*/
+  /**Following are DEMO_coding_lora_t or DEMO_coding_fsk_t*/
 } DEMO_coding_hdr_t;    /**<Header for a coding change*/
 
 #define DEMO_HDR_PARAM_PERIOD_MAX    7  /*Maximum period*/
@@ -78,54 +78,54 @@ typedef union
 } __packed DEMO_coding_combined_t;               /**<Combined header put into Sync*/
 
 /**
- * @brief Slot coding specific for LoRa.
- */
+  * @brief Slot coding specific for LoRa.
+  */
 typedef struct
 {
-  uint8_t de :1;        ///< LowDataRateOptimize, used when symbol length > 16 ms
+  uint8_t de :1;        /**<LowDataRateOptimize, used when symbol length > 16 ms*/
 
   /**
-   * Error coding rate
-   *   001 - 4/5
-   *   010 - 4/6
-   *   011 - 4/7
-   *   100 - 4/8
-   */
+    * Error coding rate
+    *   001 - 4/5
+    *   010 - 4/6
+    *   011 - 4/7
+    *   100 - 4/8
+    */
   uint8_t cr :3;
 
   /**
-   * Signal bandwidth
-   *   0000 - 7.8 kHz
-   *   0001 - 10.4 kHz
-   *   0010 - 15.6 kHz
-   *   0011 - 20.8kHz
-   *   0100 - 31.25 kHz
-   *   0101 - 41.7 kHz
-   *   0110 - 62.5 kHz
-   *   0111 - 125 kHz
-   *   1000 - 250 kHz
-   *   1001 - 500 kHz
-   */
+    * Signal bandwidth
+    *   0000 - 7.8 kHz
+    *   0001 - 10.4 kHz
+    *   0010 - 15.6 kHz
+    *   0011 - 20.8kHz
+    *   0100 - 31.25 kHz
+    *   0101 - 41.7 kHz
+    *   0110 - 62.5 kHz
+    *   0111 - 125 kHz
+    *   1000 - 250 kHz
+    *   1001 - 500 kHz
+    */
   uint8_t bw :4;
 
   /**
-   * SF rate (expressed as a base-2 logarithm)
-   *   6  - 64 chips / symbol
-   *   7  - 128 chips / symbol
-   *   8  - 256 chips / symbol
-   *   9  - 512 chips / symbol
-   *   10 - 1024 chips / symbol
-   *   11 - 2048 chips / symbol
-   *   12 - 4096 chips / symbol
-   */
+    * SF rate (expressed as a base-2 logarithm)
+    *   6  - 64 chips / symbol
+    *   7  - 128 chips / symbol
+    *   8  - 256 chips / symbol
+    *   9  - 512 chips / symbol
+    *   10 - 1024 chips / symbol
+    *   11 - 2048 chips / symbol
+    *   12 - 4096 chips / symbol
+    */
   uint8_t sf :4;
 
   uint8_t :4;
 } __packed DEMO_coding_lora_t;
 
 /**
- * @brief LoRa parameters limits.
- */
+  * @brief LoRa parameters limits.
+  */
 #define DEMO_LORA_PARAM_CR_MIN      1
 #define DEMO_LORA_PARAM_SF_MIN      6
 #define DEMO_LORA_PARAM_BW_MIN      0
@@ -135,43 +135,43 @@ typedef struct
 #define DEMO_LORA_PARAM_BW_MAX      9
 
 /**
- * @brief Change of FSK coding.
- */
+  * @brief Change of FSK coding.
+  */
 typedef struct
 {
   uint32_t br :24;      /**<Data rate [600..300000 bits/s]*/
 
   /**
-   * Power Ramp Time
-   * 0 -   10 us
-   * 1 -   20 us
-   * 2 -   40 us
-   * 3 -   80 us
-   * 4 -  200 us
-   * 5 -  800 us
-   * 6 - 1700 us
-   * 7 - 3400 us
-   */
+    * Power Ramp Time
+    * 0 -   10 us
+    * 1 -   20 us
+    * 2 -   40 us
+    * 3 -   80 us
+    * 4 -  200 us
+    * 5 -  800 us
+    * 6 - 1700 us
+    * 7 - 3400 us
+    */
   uint32_t rise :3;
   uint32_t :5;
   uint32_t fdev :24;    /**<Frequency Deviation [Hz]*/
 
   /**
-   * Gaussian Shaping BT
-   * Lower number means wider spreading.
-   * 0 - Off
-   * 1 - 0.3
-   * 2 - 0.5
-   * 3 - 0.7
-   * 4 -   1
-   **/
+    * Gaussian Shaping BT
+    * Lower number means wider spreading.
+    * 0 - Off
+    * 1 - 0.3
+    * 2 - 0.5
+    * 3 - 0.7
+    * 4 -   1
+    **/
   uint32_t bt :3;
   uint32_t :5;
 } __packed DEMO_coding_fsk_t;
 
 /**
- * @brief FSK parameters limits.
- */
+  * @brief FSK parameters limits.
+  */
 #define DEMO_FSK_PARAM_RISE_MIN      0
 #define DEMO_FSK_PARAM_BR_MIN        600
 #define DEMO_FSK_PARAM_FDEV_MIN      0
@@ -185,26 +185,26 @@ typedef struct
 #define DEMO_SYNC_CODINGS_LEN        23 /*This many bytes are for coding changes*/
 
 /**
- * @brief Sync data structure. Maximally 27 B.
- */
+  * @brief Sync data structure. Maximally 27 B.
+  */
 typedef struct
 {
   /**
-   * @brief Mask of occupied frequencies for 16 slots.
-   * Each slot is true if a node is connected, false if the slot is free to take.
-   * False also means that default coding is used.
-   * Bits 0 and 1 are not used by sensors, but by concentrator.
-   */
+    * @brief Mask of occupied frequencies for 16 slots.
+    * Each slot is true if a node is connected, false if the slot is free to take.
+    * False also means that default coding is used.
+    * Bits 0 and 1 are not used by sensors, but by concentrator.
+    */
   uint16_t occupied;
   uint8_t version_major:3;    /**<Major version of concentrator*/
   uint8_t subregion:5;  /**<Subregion number*/
   uint8_t seed;         /**<Seed for hopping*/
 
   /**
-   * @brief List of slot coding changes or connect accept structures.
-   * Contains list of DEMO_coding_combined_t
-   * each followed by DEMO_coding_lora_t, DEMO_coding_gfsk_t or 4 B eui to connect.
-   */
+    * @brief List of slot coding changes or connect accept structures.
+    * Contains list of DEMO_coding_combined_t
+    * each followed by DEMO_coding_lora_t, DEMO_coding_gfsk_t or 4 B eui to connect.
+    */
   uint8_t codings[DEMO_SYNC_CODINGS_LEN];
 } __packed DEMO_packet_sync_t;
 
@@ -212,8 +212,8 @@ typedef struct
 #define DEMO_SENSOR_MAX_PAYLOAD    26   /*Maximal payload for sensor*/
 
 /**
- * @brief Sensor packet data structure.
- */
+  * @brief Sensor packet data structure.
+  */
 typedef struct
 {
   uint32_t eui;         /**<Lower part of EUI read from HW*/
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_prnd.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_prnd.h
index 0fe36d2e..3d82b0b5 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_prnd.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_prnd.h
@@ -31,15 +31,15 @@ extern "C" {
 #define DEMO_PRND_A        62089911ULL   /*Suggested by Knuth, found by Fishman and Moore*/
 
 /**
- * @brief Generate one pseudorandom number between 0x00000001 and 0x7ffffffe.
- * @param last previous generated number (cannot be 0x00000000 and cannot be 0x7fffffff)
- * @return almost 31 bits of pseudorandom number (numbers 0x00000000 and 0x7fffffff cannot happen)
- */
+  * @brief Generate one pseudorandom number between 0x00000001 and 0x7ffffffe.
+  * @param last previous generated number (cannot be 0x00000000 and cannot be 0x7fffffff)
+  * @return almost 31 bits of pseudorandom number (numbers 0x00000000 and 0x7fffffff cannot happen)
+  */
 static inline uint32_t DEMO_PRND_Next(uint32_t last)
 {
-  uint64_t x = (uint64_t)(last)*DEMO_PRND_A;            /* x = last * A */
+  uint64_t x = (uint64_t)(last) * DEMO_PRND_A;          /* x = last * A */
   x = (x >> DEMO_PRND_P_MERS) + (x & DEMO_PRND_P);      /* x / w + x % w almost mod P, P = w-1 */
-  if(x >= DEMO_PRND_P)
+  if (x >= DEMO_PRND_P)
   {
     return x - DEMO_PRND_P;                             /* The rest of mod P */
   }
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_radio_utils.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_radio_utils.h
index f94041f0..091adb0e 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_radio_utils.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_radio_utils.h
@@ -31,58 +31,58 @@ extern "C" {
 
 
 /**
- * @brief Wait until the channel is free for Scan long.
- *
- * Functions Radio.SetModem(); Radio.SetChannel(f); need to be called before this.
- *
- * @param Modem LoRa or FSK
- * @param RssiThreshold threshold of free channel [dBm]
- * @param Scan time for which the channel needs to be free [ms]
- * @param MaxWait Wait maximally this long before giving up [ms]
- * @return true if the channel is free, false if the channel is busy
- */
+  * @brief Wait until the channel is free for Scan long.
+  *
+  * Functions Radio.SetModem(); Radio.SetChannel(f); need to be called before this.
+  *
+  * @param Modem LoRa or FSK
+  * @param RssiThreshold threshold of free channel [dBm]
+  * @param Scan time for which the channel needs to be free [ms]
+  * @param MaxWait Wait maximally this long before giving up [ms]
+  * @return true if the channel is free, false if the channel is busy
+  */
 bool DEMO_WaitForFreeChannel(RadioModems_t Modem, int16_t RssiThreshold, uint32_t Scan, uint32_t MaxWait);
 
 /**
- * @brief Convert coding bt parameter into proper symbol shaping.
- * @param coding FSK coding
- * @return shaping
- */
-RadioModShapings_t DEMO_GetShaping(const DEMO_coding_fsk_t* coding);
+  * @brief Convert coding bt parameter into proper symbol shaping.
+  * @param coding FSK coding
+  * @return shaping
+  */
+RadioModShapings_t DEMO_GetShaping(const DEMO_coding_fsk_t *coding);
 
 /**
- * @brief Convert coding rise parameter into proper power ramp.
- * @param coding FSK coding
- * @return ramp up
- */
-RadioRampTimes_t DEMO_GetRampUp(const DEMO_coding_fsk_t* coding);
+  * @brief Convert coding rise parameter into proper power ramp.
+  * @param coding FSK coding
+  * @return ramp up
+  */
+RadioRampTimes_t DEMO_GetRampUp(const DEMO_coding_fsk_t *coding);
 
 /**
- * @brief Convert coding sf parameter into proper spreading factor.
- * @param coding LoRa coding
- * @return spreading factor
- */
-RadioLoRaSpreadingFactors_t DEMO_GetSpreadingFactor(const DEMO_coding_lora_t* coding);
+  * @brief Convert coding sf parameter into proper spreading factor.
+  * @param coding LoRa coding
+  * @return spreading factor
+  */
+RadioLoRaSpreadingFactors_t DEMO_GetSpreadingFactor(const DEMO_coding_lora_t *coding);
 
 /**
- * @brief Convert coding bw parameter into proper bandwidth.
- * @param coding LoRa coding
- * @return spreading factor
- */
-RadioLoRaBandwidths_t DEMO_GetBandwidth(const DEMO_coding_lora_t* coding);
+  * @brief Convert coding bw parameter into proper bandwidth.
+  * @param coding LoRa coding
+  * @return spreading factor
+  */
+RadioLoRaBandwidths_t DEMO_GetBandwidth(const DEMO_coding_lora_t *coding);
 
 /**
- * @brief Convert coding cr parameter into proper coding rate.
- * @param coding LoRa coding
- * @return spreading factor
- */
-RadioLoRaCodingRates_t DEMO_GetCoderate(const DEMO_coding_lora_t* coding);
+  * @brief Convert coding cr parameter into proper coding rate.
+  * @param coding LoRa coding
+  * @return spreading factor
+  */
+RadioLoRaCodingRates_t DEMO_GetCoderate(const DEMO_coding_lora_t *coding);
 
 /**
- * @brief Convert FSK bandwidth to a constant of RX filter settings.
- * @param bandwidth bandwidth in Hz
- * @return bandwidth setting
- */
+  * @brief Convert FSK bandwidth to a constant of RX filter settings.
+  * @param bandwidth bandwidth in Hz
+  * @return bandwidth setting
+  */
 RadioRxBandwidth_t DEMO_ConvertFSKBandwidth(uint32_t bandwidth);
 
 #ifdef __cplusplus
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_regions.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_regions.h
index beff6c5c..ada4869d 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_regions.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_regions.h
@@ -31,8 +31,8 @@ extern "C" {
 #endif
 
 /**
- * @brief Structure defining one of sensor channels.
- */
+  * @brief Structure defining one of sensor channels.
+  */
 typedef struct
 {
   int32_t power;                        /**<Power used on this channel [dBm]*/
@@ -42,11 +42,11 @@ typedef struct
 } DEMO_Channel_t;
 
 /**
- * @brief Structure defining subregion.
- */
+  * @brief Structure defining subregion.
+  */
 typedef struct
 {
-  const char* name;                     /**<String with subregion name*/
+  const char *name;                     /**<String with subregion name*/
   int32_t beacon_power;                 /**<Beacon power [dBm]*/
   uint16_t max_t;                       /**<Maximal transmission time [ms]*/
   uint8_t hopping:1;                    /**<Choose channels pseudorandomly if set*/
@@ -60,11 +60,11 @@ typedef struct
 } DEMO_Subregion_t;
 
 /**
- * @brief Structure defining region.
- */
+  * @brief Structure defining region.
+  */
 typedef struct
 {
-  const char* name;                     /**<String with region name*/
+  const char *name;                     /**<String with region name*/
   uint32_t beacon_freq;                 /**<Frequency of the beacon [Hz]*/
   uint8_t beacon_bw;                    /**<Bandwidth used for beacon [same as in DEMO_coding_lora_t::bw]*/
   uint8_t beacon_sf;                    /**<Spreading used for beacon [same as in DEMO_coding_lora_t::sf]*/
@@ -76,8 +76,8 @@ typedef struct
 
 
 /**
- * @brief Definition of all Regions.
- */
+  * @brief Definition of all Regions.
+  */
 extern const DEMO_Region_t DEMO_Regions[];
 extern const int DEMO_Regions_n;
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_utils.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_utils.h
index 504b75be..baa6b53f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_utils.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/demo_utils.h
@@ -53,10 +53,10 @@ extern "C" {
 #define DEMO_SYNCWORD_FSK_SENS   {0x60, 0x6D, 0xC9, 0xE2, 0x00, 0x00, 0x00, 0x00}
 
 /**
- * @brief Convert bw used in regional settings to input for Radio.SetTxConfig()
- * This allows only higher bandwidth.
- * For proper bandwidth use DEMO_GetBandwidth().
- */
+  * @brief Convert bw used in regional settings to input for Radio.SetTxConfig()
+  * This allows only higher bandwidth.
+  * For proper bandwidth use DEMO_GetBandwidth().
+  */
 #define DEMO_BW_TO_SETTXCONFIG(bw)      (((((uint32_t)(bw)) - 7) < 3) ? ((bw) - 7) : 0) /*0 = 125 kHz ... 2 = 500 kHz*/
 
 /*Generate next pseudorandom value*/
@@ -65,8 +65,8 @@ extern "C" {
 #define DEMO_PSEUDORANDOM_FIRST(rnd)    ((rnd) & 0xff)
 
 /**
- * Pack of all codings.
- */
+  * Pack of all codings.
+  */
 typedef struct
 {
   DEMO_coding_hdr_t hdr;    /**<Modulation header, indicates whether lora or fsk is used*/
@@ -75,102 +75,102 @@ typedef struct
 } DEMO_codings_t;
 
 /**
- * @brief Calculate sensor's packet length.
- * @param Coding packet coding
- * @param Payload number of bytes in payload
- * @return packet length [ms]
- */
-uint32_t DEMO_TimeOnAirLora (const DEMO_coding_lora_t* Coding, uint32_t Payload);
+  * @brief Calculate sensor's packet length.
+  * @param Coding packet coding
+  * @param Payload number of bytes in payload
+  * @return packet length [ms]
+  */
+uint32_t DEMO_TimeOnAirLora(const DEMO_coding_lora_t *Coding, uint32_t Payload);
 
 /**
- * @brief Calculate sensor's packet length.
- * @param Coding packet coding
- * @param Payload number of bytes in payload
- * @return packet length [ms]
- */
-uint32_t DEMO_TimeOnAirFsk (const DEMO_coding_fsk_t* Coding, uint32_t payload);
+  * @brief Calculate sensor's packet length.
+  * @param Coding packet coding
+  * @param Payload number of bytes in payload
+  * @return packet length [ms]
+  */
+uint32_t DEMO_TimeOnAirFsk(const DEMO_coding_fsk_t *Coding, uint32_t payload);
 
 /**
- * @brief Get the longest payload that can be sent in the given subregion.
- * @param Coding packet coding
- * @param Subregion local subregion
- * @param packet_time if not NULL, length of the packet will be written there [ms]
- * @return number of bytes which can be sent
- */
-uint32_t DEMO_MaxPayloadLora (const DEMO_coding_lora_t* Coding,
-                              const DEMO_Subregion_t* Subregion, uint32_t* packet_time);
+  * @brief Get the longest payload that can be sent in the given subregion.
+  * @param Coding packet coding
+  * @param Subregion local subregion
+  * @param packet_time if not NULL, length of the packet will be written there [ms]
+  * @return number of bytes which can be sent
+  */
+uint32_t DEMO_MaxPayloadLora(const DEMO_coding_lora_t *Coding,
+                             const DEMO_Subregion_t *Subregion, uint32_t *packet_time);
 
 /**
- * @brief Get the longest payload that can be sent in the given subregion.
- * @param Coding packet coding
- * @param Subregion local subregion
- * @param packet_time if not NULL, length of the packet will be written there [ms]
- * @return number of bytes which can be sent
- */
-uint32_t DEMO_MaxPayloadFsk (const DEMO_coding_fsk_t* coding,
-                             const DEMO_Subregion_t* Subregion, uint32_t* packet_time);
+  * @brief Get the longest payload that can be sent in the given subregion.
+  * @param Coding packet coding
+  * @param Subregion local subregion
+  * @param packet_time if not NULL, length of the packet will be written there [ms]
+  * @return number of bytes which can be sent
+  */
+uint32_t DEMO_MaxPayloadFsk(const DEMO_coding_fsk_t *coding,
+                            const DEMO_Subregion_t *Subregion, uint32_t *packet_time);
 
 /**
- * @brief Set coding to default.
- * @param Codings structure to clear
- * @param SlotNr clear structure for this slot
- * @param Region default coding is the same as beacon
- */
-void DEMO_DefaultCoding (DEMO_codings_t* Codings, uint32_t SlotNr, const DEMO_Region_t* Region);
+  * @brief Set coding to default.
+  * @param Codings structure to clear
+  * @param SlotNr clear structure for this slot
+  * @param Region default coding is the same as beacon
+  */
+void DEMO_DefaultCoding(DEMO_codings_t *Codings, uint32_t SlotNr, const DEMO_Region_t *Region);
 
 /**
- * @brief Check if the sensor coding is the default coding.
- * @param Sensor structure for Sensor
- * @return true if the coding is default
- */
-bool DEMO_IsCodingDefault (const DEMO_codings_t* Codings, const DEMO_Region_t* Region);
+  * @brief Check if the sensor coding is the default coding.
+  * @param Sensor structure for Sensor
+  * @return true if the coding is default
+  */
+bool DEMO_IsCodingDefault(const DEMO_codings_t *Codings, const DEMO_Region_t *Region);
 
 /**
- * @brief Get modulation bandwidth.
- * @param Coding modulation
- * @return bandwidth [Hz]
- */
-uint32_t DEMO_BandwidthLora (const DEMO_coding_lora_t* Coding);
+  * @brief Get modulation bandwidth.
+  * @param Coding modulation
+  * @return bandwidth [Hz]
+  */
+uint32_t DEMO_BandwidthLora(const DEMO_coding_lora_t *Coding);
 
 /**
- * @brief Get modulation bandwidth.
- * @param Coding modulation
- * @return bandwidth [Hz]
- */
-uint32_t DEMO_BandwidthFsk (const DEMO_coding_fsk_t* Coding);
+  * @brief Get modulation bandwidth.
+  * @param Coding modulation
+  * @return bandwidth [Hz]
+  */
+uint32_t DEMO_BandwidthFsk(const DEMO_coding_fsk_t *Coding);
 
 /**
- * @brief Validate and copy coding header.
- * @param Hdr structure to validate
- * @param Subregion pointer to subregion used to validate
- */
-void DEMO_ValidateCodingHdr(DEMO_coding_hdr_t* Hdr, const DEMO_Subregion_t* Subregion);
+  * @brief Validate and copy coding header.
+  * @param Hdr structure to validate
+  * @param Subregion pointer to subregion used to validate
+  */
+void DEMO_ValidateCodingHdr(DEMO_coding_hdr_t *Hdr, const DEMO_Subregion_t *Subregion);
 
 /**
- * @brief Validate and copy coding parameters.
- * @param Coding structure to validate
- */
-void DEMO_ValidateCodingLora(DEMO_coding_lora_t* Coding);
+  * @brief Validate and copy coding parameters.
+  * @param Coding structure to validate
+  */
+void DEMO_ValidateCodingLora(DEMO_coding_lora_t *Coding);
 
 /**
- * @brief Validate and copy coding parameters.
- * @param Coding structure to validate
- */
-void DEMO_ValidateCodingFsk(DEMO_coding_fsk_t* Coding);
+  * @brief Validate and copy coding parameters.
+  * @param Coding structure to validate
+  */
+void DEMO_ValidateCodingFsk(DEMO_coding_fsk_t *Coding);
 
 /**
- * @brief Get number of free slots.
- * @param Occupied mask of occupied slots
- * @return number of free slots
- */
+  * @brief Get number of free slots.
+  * @param Occupied mask of occupied slots
+  * @return number of free slots
+  */
 uint32_t DEMO_CountFreeSlots(uint16_t Occupied);
 
 /**
- * @brief Pick one slot from the slots marked as free in Occupied mask.
- * @param Occupied mask of occupied slots, true if occupied, slot 0 and slot 1 are reserved
- * @param Random random input for the random selection (should be much larger than number of channels)
- * @return selected slot number
- */
+  * @brief Pick one slot from the slots marked as free in Occupied mask.
+  * @param Occupied mask of occupied slots, true if occupied, slot 0 and slot 1 are reserved
+  * @param Random random input for the random selection (should be much larger than number of channels)
+  * @return selected slot number
+  */
 uint32_t DEMO_ChooseRandomSlot(uint16_t Occupied, uint32_t Random);
 
 #ifdef __cplusplus
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/version.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/version.h
index 967e7137..c648d74a 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/version.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Inc/version.h
@@ -21,17 +21,17 @@
 #define __VERSION_H__
 
 /**
- * @brief Major version indicates major changes in behavior.
- * Used when regions/subregions are changed or incompatible behavior.
- * Only 0 ~ 7 fit inside packets.
- */
+  * @brief Major version indicates major changes in behavior.
+  * Used when regions/subregions are changed or incompatible behavior.
+  * Only 0 ~ 7 fit inside packets.
+  */
 #define VERSION_MAJOR          1
 
 /**
- * @brief Minor version indicated minor changes in behavior.
- * Used to change sensor data format or compatible changes.
- * Only 0 ~ 31 fit inside packets.
- */
+  * @brief Minor version indicated minor changes in behavior.
+  * Used to change sensor data format or compatible changes.
+  * Only 0 ~ 31 fit inside packets.
+  */
 #define VERSION_MINOR          0
 
 #define VERSION_STR_CONVERT(a) VERSION_STR_HELPER(a)    /*Preprocessor trick to convert constant to string*/
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_radio_utils.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_radio_utils.c
index ff8b373b..7a2ccda6 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_radio_utils.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_radio_utils.c
@@ -24,16 +24,16 @@
 
 
 /**
- * @brief Wait until the channel is free for Scan long.
- *
- * Functions Radio.SetModem(); Radio.SetChannel(f); need to be called before this.
- *
- * @param Modem LoRa or FSK
- * @param RssiThreshold threshold of free channel [dBm]
- * @param Scan time for which the channel needs to be free [ms]
- * @param MaxWait Wait maximally this long before giving up [ms]
- * @return true if the channel is free, false if the channel is busy
- */
+  * @brief Wait until the channel is free for Scan long.
+  *
+  * Functions Radio.SetModem(); Radio.SetChannel(f); need to be called before this.
+  *
+  * @param Modem LoRa or FSK
+  * @param RssiThreshold threshold of free channel [dBm]
+  * @param Scan time for which the channel needs to be free [ms]
+  * @param MaxWait Wait maximally this long before giving up [ms]
+  * @return true if the channel is free, false if the channel is busy
+  */
 bool DEMO_WaitForFreeChannel(RadioModems_t Modem, int16_t RssiThreshold, uint32_t Scan, uint32_t MaxWait)
 {
   UTIL_TIMER_Time_t start = UTIL_TIMER_GetCurrentTime();    /*Time when this business started*/
@@ -45,11 +45,11 @@ bool DEMO_WaitForFreeChannel(RadioModems_t Modem, int16_t RssiThreshold, uint32_
 
   free_from = UTIL_TIMER_GetCurrentTime();    /*Do not count radio init to the free time*/
 
-  while((now - start) < MaxWait)        /*Check maximal time limit*/
+  while ((now - start) < MaxWait)       /*Check maximal time limit*/
   {
     UTILS_ENTER_CRITICAL_SECTION();
     now = UTIL_TIMER_GetCurrentTime();
-    if(Radio.Rssi(Modem) > RssiThreshold)      /*Channel is currently busy*/
+    if (Radio.Rssi(Modem) > RssiThreshold)     /*Channel is currently busy*/
     {
       UTILS_EXIT_CRITICAL_SECTION();
       free_from = now;  /*Reset time when the channel became free*/
@@ -68,13 +68,13 @@ bool DEMO_WaitForFreeChannel(RadioModems_t Modem, int16_t RssiThreshold, uint32_
 }
 
 /**
- * @brief Convert coding BT parameter into proper symbol shaping.
- * @param coding FSH coding
- * @return shaping
- */
-RadioModShapings_t DEMO_GetShaping(const DEMO_coding_fsk_t* coding)
+  * @brief Convert coding BT parameter into proper symbol shaping.
+  * @param coding FSH coding
+  * @return shaping
+  */
+RadioModShapings_t DEMO_GetShaping(const DEMO_coding_fsk_t *coding)
 {
-  switch(coding->bt)
+  switch (coding->bt)
   {
     default:    /*Off*/
       return MOD_SHAPING_OFF;
@@ -91,33 +91,33 @@ RadioModShapings_t DEMO_GetShaping(const DEMO_coding_fsk_t* coding)
 }
 
 /**
- * @brief Convert coding rise parameter into proper power ramp.
- * @param coding FSK coding
- * @return ramp up
- */
-RadioRampTimes_t DEMO_GetRampUp(const DEMO_coding_fsk_t* coding)
+  * @brief Convert coding rise parameter into proper power ramp.
+  * @param coding FSK coding
+  * @return ramp up
+  */
+RadioRampTimes_t DEMO_GetRampUp(const DEMO_coding_fsk_t *coding)
 {
   return (RadioRampTimes_t)coding->rise;        /*Values fit*/
 }
 
 /**
- * @brief Convert coding sf parameter into proper spreading factor.
- * @param coding LoRa coding
- * @return spreading factor
- */
-RadioLoRaSpreadingFactors_t DEMO_GetSpreadingFactor(const DEMO_coding_lora_t* coding)
+  * @brief Convert coding sf parameter into proper spreading factor.
+  * @param coding LoRa coding
+  * @return spreading factor
+  */
+RadioLoRaSpreadingFactors_t DEMO_GetSpreadingFactor(const DEMO_coding_lora_t *coding)
 {
   return (RadioLoRaSpreadingFactors_t)coding->sf;       /*Values fit*/
 }
 
 /**
- * @brief Convert coding bw parameter into proper bandwidth.
- * @param coding LoRa coding
- * @return spreading factor
- */
-RadioLoRaBandwidths_t DEMO_GetBandwidth(const DEMO_coding_lora_t* coding)
+  * @brief Convert coding bw parameter into proper bandwidth.
+  * @param coding LoRa coding
+  * @return spreading factor
+  */
+RadioLoRaBandwidths_t DEMO_GetBandwidth(const DEMO_coding_lora_t *coding)
 {
-  switch(coding->bw)
+  switch (coding->bw)
   {
     default:     /*7.8 kHz*/
       return LORA_BW_007;
@@ -143,43 +143,106 @@ RadioLoRaBandwidths_t DEMO_GetBandwidth(const DEMO_coding_lora_t* coding)
 }
 
 /**
- * @brief Convert coding cr parameter into proper coding rate.
- * @param coding LoRa coding
- * @return spreading factor
- */
-RadioLoRaCodingRates_t DEMO_GetCoderate(const DEMO_coding_lora_t* coding)
+  * @brief Convert coding cr parameter into proper coding rate.
+  * @param coding LoRa coding
+  * @return spreading factor
+  */
+RadioLoRaCodingRates_t DEMO_GetCoderate(const DEMO_coding_lora_t *coding)
 {
   return (RadioLoRaCodingRates_t)coding->cr;    /*Values fit*/
 }
 
 /**
- * @brief Convert FSK bandwidth to a constant of RX filter settings.
- * @param bandwidth bandwidth in Hz
- * @return bandwidth setting
- */
+  * @brief Convert FSK bandwidth to a constant of RX filter settings.
+  * @param bandwidth bandwidth in Hz
+  * @return bandwidth setting
+  */
 RadioRxBandwidth_t DEMO_ConvertFSKBandwidth(uint32_t bandwidth)
 {
-  if(     bandwidth < 4800  ) {return RX_BW_4800  ;}
-  else if(bandwidth < 5800  ) {return RX_BW_5800  ;}
-  else if(bandwidth < 7300  ) {return RX_BW_7300  ;}
-  else if(bandwidth < 9700  ) {return RX_BW_9700  ;}
-  else if(bandwidth < 11700 ) {return RX_BW_11700 ;}
-  else if(bandwidth < 14600 ) {return RX_BW_14600 ;}
-  else if(bandwidth < 19500 ) {return RX_BW_19500 ;}
-  else if(bandwidth < 23400 ) {return RX_BW_23400 ;}
-  else if(bandwidth < 29300 ) {return RX_BW_29300 ;}
-  else if(bandwidth < 39000 ) {return RX_BW_39000 ;}
-  else if(bandwidth < 46900 ) {return RX_BW_46900 ;}
-  else if(bandwidth < 58600 ) {return RX_BW_58600 ;}
-  else if(bandwidth < 78200 ) {return RX_BW_78200 ;}
-  else if(bandwidth < 93800 ) {return RX_BW_93800 ;}
-  else if(bandwidth < 117300) {return RX_BW_117300;}
-  else if(bandwidth < 156200) {return RX_BW_156200;}
-  else if(bandwidth < 187200) {return RX_BW_187200;}
-  else if(bandwidth < 234300) {return RX_BW_234300;}
-  else if(bandwidth < 312000) {return RX_BW_312000;}
-  else if(bandwidth < 373600) {return RX_BW_373600;}
-  else if(bandwidth < 467000) {return RX_BW_467000;}
+  if (bandwidth < 4800)
+  {
+    return RX_BW_4800  ;
+  }
+  else if (bandwidth < 5800)
+  {
+    return RX_BW_5800  ;
+  }
+  else if (bandwidth < 7300)
+  {
+    return RX_BW_7300  ;
+  }
+  else if (bandwidth < 9700)
+  {
+    return RX_BW_9700  ;
+  }
+  else if (bandwidth < 11700)
+  {
+    return RX_BW_11700 ;
+  }
+  else if (bandwidth < 14600)
+  {
+    return RX_BW_14600 ;
+  }
+  else if (bandwidth < 19500)
+  {
+    return RX_BW_19500 ;
+  }
+  else if (bandwidth < 23400)
+  {
+    return RX_BW_23400 ;
+  }
+  else if (bandwidth < 29300)
+  {
+    return RX_BW_29300 ;
+  }
+  else if (bandwidth < 39000)
+  {
+    return RX_BW_39000 ;
+  }
+  else if (bandwidth < 46900)
+  {
+    return RX_BW_46900 ;
+  }
+  else if (bandwidth < 58600)
+  {
+    return RX_BW_58600 ;
+  }
+  else if (bandwidth < 78200)
+  {
+    return RX_BW_78200 ;
+  }
+  else if (bandwidth < 93800)
+  {
+    return RX_BW_93800 ;
+  }
+  else if (bandwidth < 117300)
+  {
+    return RX_BW_117300;
+  }
+  else if (bandwidth < 156200)
+  {
+    return RX_BW_156200;
+  }
+  else if (bandwidth < 187200)
+  {
+    return RX_BW_187200;
+  }
+  else if (bandwidth < 234300)
+  {
+    return RX_BW_234300;
+  }
+  else if (bandwidth < 312000)
+  {
+    return RX_BW_312000;
+  }
+  else if (bandwidth < 373600)
+  {
+    return RX_BW_373600;
+  }
+  else if (bandwidth < 467000)
+  {
+    return RX_BW_467000;
+  }
 
   return RX_BW_4800;     /*Invalid bandwidth*/
 }
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_regions.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_regions.c
index 1a530501..b6369c0e 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_regions.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_regions.c
@@ -20,740 +20,740 @@
 #include "demo_regions.h"
 
 /**
- * @brief European channels definitions.
- */
+  * @brief European channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsEU[] =
 {
-    /*EU 10% 869.525*/
-    {
-        .power = 21,
-        .max_bw = 250000,
-        .freq = 869525000,
-        .duty_cycle = 10,
-    },
-
-    /*EU 1% 868.3*/
-    {
-        .power = 16,
-        .max_bw = 600000,
-        .freq = 868300000,
-        .duty_cycle = 100,
-    },
+  /*EU 10% 869.525*/
+  {
+    .power = 21,
+    .max_bw = 250000,
+    .freq = 869525000,
+    .duty_cycle = 10,
+  },
+
+  /*EU 1% 868.3*/
+  {
+    .power = 16,
+    .max_bw = 600000,
+    .freq = 868300000,
+    .duty_cycle = 100,
+  },
 };
 
 /**
- * @brief European subregions definitions.
- */
+  * @brief European subregions definitions.
+  */
 const DEMO_Subregion_t DEMO_SubregionsEU[] =
 {
   /*Subregion 0.0, Europe*/
   {
-      .name = "European Union",
-      .beacon_power = 22,
-      .max_t = 900,
-      .hopping = false,
-      .lbt = false,
-      .lbt_time = 0,
-      .lbt_rssi = 0,
-      .channels_n = sizeof(DEMO_ChannelsEU)/sizeof(DEMO_Channel_t),
-      .channels = DEMO_ChannelsEU,
+    .name = "European Union",
+    .beacon_power = 22,
+    .max_t = 900,
+    .hopping = false,
+    .lbt = false,
+    .lbt_time = 0,
+    .lbt_rssi = 0,
+    .channels_n = sizeof(DEMO_ChannelsEU) / sizeof(DEMO_Channel_t),
+    .channels = DEMO_ChannelsEU,
   },
 };
 
 /**
- * @brief FCC channels definitions.
- */
+  * @brief FCC channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsFCC[] =
 {
-    /*FCC 924.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 924500000,
-        .duty_cycle = 1,
-    },
-    /*FCC 924.0 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 924000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 923.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 923500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 923 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 923000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 922.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 922500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 922 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 922000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 921.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 921500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 921 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 921000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 920.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 920500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 920 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 920000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 919.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 919500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 919 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 919000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 918.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 918500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 918 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 918000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 917.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 917500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 917 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 917000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 916.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 916500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 916 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 916000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 915.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 915500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 915 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 915000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 914.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 914500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 914 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 914000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 913.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 913500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 913 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 913000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 912.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 912500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 912 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 912000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 911.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 911500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 911 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 911000000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 910.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 910500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 910 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 910000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 910.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 909500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 909 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 909000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 908.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 908500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 908 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 908000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 907.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 907500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 907 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 907000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 906.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 906500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 906 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 906000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 905.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 905500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 905 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 905000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 904.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 904500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 904 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 904000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 903.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 903500000,
-        .duty_cycle = 1,
-    },
-
-    /*FCC 903 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 903000000,
-        .duty_cycle = 1,
-    },
-    /*FCC 902.5 MHz*/
-    {
-        .power = 21,
-        .max_bw = 500000,
-        .freq = 902500000,
-        .duty_cycle = 1,
-    },
+  /*FCC 924.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 924500000,
+    .duty_cycle = 1,
+  },
+  /*FCC 924.0 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 924000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 923.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 923500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 923 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 923000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 922.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 922500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 922 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 922000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 921.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 921500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 921 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 921000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 920.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 920500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 920 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 920000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 919.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 919500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 919 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 919000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 918.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 918500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 918 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 918000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 917.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 917500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 917 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 917000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 916.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 916500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 916 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 916000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 915.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 915500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 915 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 915000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 914.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 914500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 914 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 914000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 913.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 913500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 913 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 913000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 912.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 912500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 912 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 912000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 911.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 911500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 911 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 911000000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 910.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 910500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 910 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 910000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 910.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 909500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 909 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 909000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 908.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 908500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 908 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 908000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 907.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 907500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 907 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 907000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 906.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 906500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 906 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 906000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 905.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 905500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 905 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 905000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 904.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 904500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 904 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 904000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 903.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 903500000,
+    .duty_cycle = 1,
+  },
+
+  /*FCC 903 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 903000000,
+    .duty_cycle = 1,
+  },
+  /*FCC 902.5 MHz*/
+  {
+    .power = 21,
+    .max_bw = 500000,
+    .freq = 902500000,
+    .duty_cycle = 1,
+  },
 };
 
 /**
- * @brief Australian channels definitions.
- */
+  * @brief Australian channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsAU[] =
 {
-    /*Australia 925 MHz*/
-    {
-        .power = 21,
-        .max_bw = 1000000,
-        .freq = 925000000,
-        .duty_cycle = 1,
-    },
+  /*Australia 925 MHz*/
+  {
+    .power = 21,
+    .max_bw = 1000000,
+    .freq = 925000000,
+    .duty_cycle = 1,
+  },
 };
 
 /**
- * @brief US subregions definitions.
- */
+  * @brief US subregions definitions.
+  */
 const DEMO_Subregion_t DEMO_SubregionsUS_AU[] =
 {
   /*Subregion 1.0, United States 902-928MHz*/
   {
-      .name = "United States",
-      .beacon_power = 22,
-      .max_t = 400,
-      .hopping = true,
-      .lbt = false,
-      .lbt_time = 0,
-      .lbt_rssi = 0,
-      .channels_n = sizeof(DEMO_ChannelsFCC)/sizeof(DEMO_Channel_t),
-      .channels = DEMO_ChannelsFCC,
+    .name = "United States",
+    .beacon_power = 22,
+    .max_t = 400,
+    .hopping = true,
+    .lbt = false,
+    .lbt_time = 0,
+    .lbt_rssi = 0,
+    .channels_n = sizeof(DEMO_ChannelsFCC) / sizeof(DEMO_Channel_t),
+    .channels = DEMO_ChannelsFCC,
   },
 
   /*Subregion 1.1, Australia 915-928MHz*/
   {
-      .name = "Australia",
-      .beacon_power = 22,
-      .max_t = 1000,
-      .hopping = true,
-      .lbt = false,
-      .lbt_time = 0,
-      .lbt_rssi = 0,
-      .channels_n =19, /* 924.5 down to 915.5*/
-      .channels = DEMO_ChannelsFCC,
+    .name = "Australia",
+    .beacon_power = 22,
+    .max_t = 1000,
+    .hopping = true,
+    .lbt = false,
+    .lbt_time = 0,
+    .lbt_rssi = 0,
+    .channels_n = 19, /* 924.5 down to 915.5*/
+    .channels = DEMO_ChannelsFCC,
   },
 };
 
 /**
- * @brief Korean channels definitions.
- */
+  * @brief Korean channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsKR[] =
 {
-    /*Korea 923.4 MHz*/
-    {
-        .power = 12,
-        .max_bw = 200000,
-        .freq = 923400000,
-        .duty_cycle = 1,
-    },
+  /*Korea 923.4 MHz*/
+  {
+    .power = 12,
+    .max_bw = 200000,
+    .freq = 923400000,
+    .duty_cycle = 1,
+  },
 };
 
 /**
- * @brief Japanese channels definitions.
- */
+  * @brief Japanese channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsJP[] =
 {
-    /*Japan 923.4 MHz, 200 kHz*/
-    {
-        .power = 15,
-        .max_bw = 200000,
-        .freq = 923400000,
-        .duty_cycle = 1,
-    },
-
-    /*Japan 923.3 MHz, 400 kHz*/
-    {
-        .power = 15,
-        .max_bw = 400000,
-        .freq = 923300000,
-        .duty_cycle = 1,
-    },
-
-    /*Japan 923.2 MHz, 600 kHz*/
-    {
-        .power = 15,
-        .max_bw = 600000,
-        .freq = 923200000,
-        .duty_cycle = 1,
-    },
-
-    /*Japan 923.1 MHz, 800 kHz*/
-    {
-        .power = 15,
-        .max_bw = 800000,
-        .freq = 923100000,
-        .duty_cycle = 1,
-    },
-
-    /*Japan 923.0 MHz, 1000 kHz*/
-    {
-        .power = 15,
-        .max_bw = 1000000,
-        .freq = 923000000,
-        .duty_cycle = 1,
-    },
+  /*Japan 923.4 MHz, 200 kHz*/
+  {
+    .power = 15,
+    .max_bw = 200000,
+    .freq = 923400000,
+    .duty_cycle = 1,
+  },
+
+  /*Japan 923.3 MHz, 400 kHz*/
+  {
+    .power = 15,
+    .max_bw = 400000,
+    .freq = 923300000,
+    .duty_cycle = 1,
+  },
+
+  /*Japan 923.2 MHz, 600 kHz*/
+  {
+    .power = 15,
+    .max_bw = 600000,
+    .freq = 923200000,
+    .duty_cycle = 1,
+  },
+
+  /*Japan 923.1 MHz, 800 kHz*/
+  {
+    .power = 15,
+    .max_bw = 800000,
+    .freq = 923100000,
+    .duty_cycle = 1,
+  },
+
+  /*Japan 923.0 MHz, 1000 kHz*/
+  {
+    .power = 15,
+    .max_bw = 1000000,
+    .freq = 923000000,
+    .duty_cycle = 1,
+  },
 };
 
 /**
- * @brief Generic Asian channels definitions.
- */
+  * @brief Generic Asian channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsAS[] =
 {
-    /*Generic Asia 923.4 MHz*/
-    {
-        .power = 16,
-        .max_bw = 200000,
-        .freq = 923400000,
-        .duty_cycle = 1,
-    },
+  /*Generic Asia 923.4 MHz*/
+  {
+    .power = 16,
+    .max_bw = 200000,
+    .freq = 923400000,
+    .duty_cycle = 1,
+  },
 };
 
 /**
- * @brief Asian subregions definitions.
- */
+  * @brief Asian subregions definitions.
+  */
 const DEMO_Subregion_t DEMO_SubregionsAS[] =
 {
   /*Subregion 2.0, Korea*/
   {
-      .name = "Korea",
-      .beacon_power = 12,
-      .max_t = 1000,
-      .hopping = false,
-      .lbt = true,
-      .lbt_time = 5,
-      .lbt_rssi = -80,
-      .channels_n = sizeof(DEMO_ChannelsKR)/sizeof(DEMO_Channel_t),
-      .channels = DEMO_ChannelsKR,
+    .name = "Korea",
+    .beacon_power = 12,
+    .max_t = 1000,
+    .hopping = false,
+    .lbt = true,
+    .lbt_time = 5,
+    .lbt_rssi = -80,
+    .channels_n = sizeof(DEMO_ChannelsKR) / sizeof(DEMO_Channel_t),
+    .channels = DEMO_ChannelsKR,
   },
 
   /*Subregion 2.1, Japan*/
   {
-      .name = "Japan",
-      .beacon_power = 15,
-      .max_t = 1000,
-      .hopping = false,
-      .lbt = true,
-      .lbt_time = 5,
-      .lbt_rssi = -80,
-      .channels_n = sizeof(DEMO_ChannelsJP)/sizeof(DEMO_Channel_t),
-      .channels = DEMO_ChannelsJP,
+    .name = "Japan",
+    .beacon_power = 15,
+    .max_t = 1000,
+    .hopping = false,
+    .lbt = true,
+    .lbt_time = 5,
+    .lbt_rssi = -80,
+    .channels_n = sizeof(DEMO_ChannelsJP) / sizeof(DEMO_Channel_t),
+    .channels = DEMO_ChannelsJP,
   },
 
   /*Subregion 2.2, Generic Asia*/
   {
-      .name = "Generic Asia",
-      .beacon_power = 16,
-      .max_t = 1000,
-      .hopping = false,
-      .lbt = false,
-      .lbt_time = 0,
-      .lbt_rssi = 0,
-      .channels_n = sizeof(DEMO_ChannelsAS)/sizeof(DEMO_Channel_t),
-      .channels = DEMO_ChannelsAS,
+    .name = "Generic Asia",
+    .beacon_power = 16,
+    .max_t = 1000,
+    .hopping = false,
+    .lbt = false,
+    .lbt_time = 0,
+    .lbt_rssi = 0,
+    .channels_n = sizeof(DEMO_ChannelsAS) / sizeof(DEMO_Channel_t),
+    .channels = DEMO_ChannelsAS,
   },
 };
 
 /**
- * @brief Chinese channels definitions.
- */
+  * @brief Chinese channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsCN[] =
 {
-    /*China 470.3 MHz*/
-    {
-        .power = 19,
-        .max_bw = 200000,
-        .freq = 470300000,
-        .duty_cycle = 1,
-    },
+  /*China 470.3 MHz*/
+  {
+    .power = 19,
+    .max_bw = 200000,
+    .freq = 470300000,
+    .duty_cycle = 1,
+  },
 };
 
 /**
- * @brief Chinese subregions definitions.
- */
+  * @brief Chinese subregions definitions.
+  */
 const DEMO_Subregion_t DEMO_SubregionsCN[] =
 {
   /*Subregion 3.0, China*/
   {
-      .name = "China",
-      .beacon_power = 19,
-      .max_t = 1000,
-      .hopping = false,
-      .lbt = false,
-      .lbt_time = 0,
-      .lbt_rssi = 0,
-      .channels_n = sizeof(DEMO_ChannelsCN)/sizeof(DEMO_Channel_t),
-      .channels = DEMO_ChannelsCN,
+    .name = "China",
+    .beacon_power = 19,
+    .max_t = 1000,
+    .hopping = false,
+    .lbt = false,
+    .lbt_time = 0,
+    .lbt_rssi = 0,
+    .channels_n = sizeof(DEMO_ChannelsCN) / sizeof(DEMO_Channel_t),
+    .channels = DEMO_ChannelsCN,
   },
 };
 
 /**
- * @brief Indian channels definitions.
- */
+  * @brief Indian channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsIN[] =
 {
-    /*India 865.1 MHz*/
-    {
-        .power = 21,
-        .max_bw = 200000,
-        .freq = 865100000,
-        .duty_cycle = 1,
-    },
+  /*India 865.1 MHz*/
+  {
+    .power = 21,
+    .max_bw = 200000,
+    .freq = 865100000,
+    .duty_cycle = 1,
+  },
 };
 
 /**
- * @brief Indian subregions definitions.
- */
+  * @brief Indian subregions definitions.
+  */
 const DEMO_Subregion_t DEMO_SubregionsIN[] =
 {
   /*Subregion 4.0, India*/
   {
-      .name = "India",
-      .beacon_power = 22,
-      .max_t = 1000,
-      .hopping = false,
-      .lbt = false,
-      .lbt_time = 0,
-      .lbt_rssi = 0,
-      .channels_n = sizeof(DEMO_ChannelsIN)/sizeof(DEMO_Channel_t),
-      .channels = DEMO_ChannelsIN,
+    .name = "India",
+    .beacon_power = 22,
+    .max_t = 1000,
+    .hopping = false,
+    .lbt = false,
+    .lbt_time = 0,
+    .lbt_rssi = 0,
+    .channels_n = sizeof(DEMO_ChannelsIN) / sizeof(DEMO_Channel_t),
+    .channels = DEMO_ChannelsIN,
   },
 };
 
 /**
- * @brief Russian channels definitions.
- */
+  * @brief Russian channels definitions.
+  */
 const DEMO_Channel_t DEMO_ChannelsRU[] =
 {
-    /*Russia 868.95 MHz*/
-    {
-        .power = 16,
-        .max_bw = 500000,
-        .freq = 868950000,
-        .duty_cycle = 1,
-    },
+  /*Russia 868.95 MHz*/
+  {
+    .power = 16,
+    .max_bw = 500000,
+    .freq = 868950000,
+    .duty_cycle = 1,
+  },
 };
 
 /**
- * @brief Russian subregions definitions.
- */
+  * @brief Russian subregions definitions.
+  */
 const DEMO_Subregion_t DEMO_SubregionsRU[] =
 {
   /*Subregion 5.0, Russia*/
   {
-      .name = "Russia",
-      .beacon_power = 19,
-      .max_t = 1000,
-      .hopping = false,
-      .lbt = false,
-      .lbt_time = 0,
-      .lbt_rssi = 0,
-      .channels_n = sizeof(DEMO_ChannelsRU)/sizeof(DEMO_Channel_t),
-      .channels = DEMO_ChannelsRU,
+    .name = "Russia",
+    .beacon_power = 19,
+    .max_t = 1000,
+    .hopping = false,
+    .lbt = false,
+    .lbt_time = 0,
+    .lbt_rssi = 0,
+    .channels_n = sizeof(DEMO_ChannelsRU) / sizeof(DEMO_Channel_t),
+    .channels = DEMO_ChannelsRU,
   },
 };
 
 /**
- * @brief All region definitions.
- */
+  * @brief All region definitions.
+  */
 const DEMO_Region_t DEMO_Regions[] =
 {
-    /*Region 0, Europe*/
-    {
-        .name = "European Union",
-        .beacon_freq = 869525000,
-        .beacon_bw = 7,         /*125 KHz*/
-        .beacon_sf = 11,        /*SF11*/
-        .beacon_length = 791,
-        .subregions_n = sizeof(DEMO_SubregionsEU)/sizeof(DEMO_Subregion_t),
-        .subregions = DEMO_SubregionsEU,
-    },
-
-    /*Region 1, United States/Australia*/
-    {
-        .name = "United States/Australia",
-        .beacon_freq = 925000000,
-        .beacon_bw = 8,         /*250 KHz*/
-        .beacon_sf = 11,        /*SF11*/
-        .beacon_length = 395,
-        .subregions_n = sizeof(DEMO_SubregionsUS_AU)/sizeof(DEMO_Subregion_t),
-        .subregions = DEMO_SubregionsUS_AU,
-    },
-
-    /*Region 2, Asia*/
-    {
-        .name = "Asia",
-        .beacon_freq = 923400000,
-        .beacon_bw = 7,         /*125 KHz*/
-        .beacon_sf = 11,        /*SF11*/
-        .beacon_length = 791,
-        .subregions_n = sizeof(DEMO_SubregionsAS)/sizeof(DEMO_Subregion_t),
-        .subregions = DEMO_SubregionsAS,
-    },
-
-    /*Region 3, China*/
-    {
-        .name = "China",
-        .beacon_freq = 470300000,
-        .beacon_bw = 7,         /*125 KHz*/
-        .beacon_sf = 11,        /*SF11*/
-        .beacon_length = 791,
-        .subregions_n = sizeof(DEMO_SubregionsCN)/sizeof(DEMO_Subregion_t),
-        .subregions = DEMO_SubregionsCN,
-    },
-
-    /*Region 4, India*/
-    {
-        .name = "India",
-        .beacon_freq = 865100000,
-        .beacon_bw = 7,         /*125 KHz*/
-        .beacon_sf = 11,        /*SF11*/
-        .beacon_length = 791,
-        .subregions_n = sizeof(DEMO_SubregionsIN)/sizeof(DEMO_Subregion_t),
-        .subregions = DEMO_SubregionsIN,
-    },
-
-    /*Region 5, Russia*/
-    {
-        .name = "Russia",
-        .beacon_freq = 868950000,
-        .beacon_bw = 7,         /*125 KHz*/
-        .beacon_sf = 11,        /*SF11*/
-        .beacon_length = 791,
-        .subregions_n = sizeof(DEMO_SubregionsRU)/sizeof(DEMO_Subregion_t),
-        .subregions = DEMO_SubregionsRU,
-    },
+  /*Region 0, Europe*/
+  {
+    .name = "European Union",
+    .beacon_freq = 869525000,
+    .beacon_bw = 7,         /*125 KHz*/
+    .beacon_sf = 11,        /*SF11*/
+    .beacon_length = 791,
+    .subregions_n = sizeof(DEMO_SubregionsEU) / sizeof(DEMO_Subregion_t),
+    .subregions = DEMO_SubregionsEU,
+  },
+
+  /*Region 1, United States/Australia*/
+  {
+    .name = "United States/Australia",
+    .beacon_freq = 925000000,
+    .beacon_bw = 8,         /*250 KHz*/
+    .beacon_sf = 11,        /*SF11*/
+    .beacon_length = 395,
+    .subregions_n = sizeof(DEMO_SubregionsUS_AU) / sizeof(DEMO_Subregion_t),
+    .subregions = DEMO_SubregionsUS_AU,
+  },
+
+  /*Region 2, Asia*/
+  {
+    .name = "Asia",
+    .beacon_freq = 923400000,
+    .beacon_bw = 7,         /*125 KHz*/
+    .beacon_sf = 11,        /*SF11*/
+    .beacon_length = 791,
+    .subregions_n = sizeof(DEMO_SubregionsAS) / sizeof(DEMO_Subregion_t),
+    .subregions = DEMO_SubregionsAS,
+  },
+
+  /*Region 3, China*/
+  {
+    .name = "China",
+    .beacon_freq = 470300000,
+    .beacon_bw = 7,         /*125 KHz*/
+    .beacon_sf = 11,        /*SF11*/
+    .beacon_length = 791,
+    .subregions_n = sizeof(DEMO_SubregionsCN) / sizeof(DEMO_Subregion_t),
+    .subregions = DEMO_SubregionsCN,
+  },
+
+  /*Region 4, India*/
+  {
+    .name = "India",
+    .beacon_freq = 865100000,
+    .beacon_bw = 7,         /*125 KHz*/
+    .beacon_sf = 11,        /*SF11*/
+    .beacon_length = 791,
+    .subregions_n = sizeof(DEMO_SubregionsIN) / sizeof(DEMO_Subregion_t),
+    .subregions = DEMO_SubregionsIN,
+  },
+
+  /*Region 5, Russia*/
+  {
+    .name = "Russia",
+    .beacon_freq = 868950000,
+    .beacon_bw = 7,         /*125 KHz*/
+    .beacon_sf = 11,        /*SF11*/
+    .beacon_length = 791,
+    .subregions_n = sizeof(DEMO_SubregionsRU) / sizeof(DEMO_Subregion_t),
+    .subregions = DEMO_SubregionsRU,
+  },
 };
 
 /**
- * How many regions are there.
- */
-const int DEMO_Regions_n = sizeof(DEMO_Regions)/sizeof(DEMO_Region_t);
+  * How many regions are there.
+  */
+const int DEMO_Regions_n = sizeof(DEMO_Regions) / sizeof(DEMO_Region_t);
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_utils.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_utils.c
index f80f08ec..05eccde7 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_utils.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Common/Src/demo_utils.c
@@ -33,12 +33,12 @@ static const int DEMO_BandwidthTable[9] = { 7800, 10400, 15600, 20800, 31250, 41
 static int CheckLimits(int input, int min, int max);
 
 /**
- * @brief Calculate sensor's packet length.
- * @param Coding packet coding
- * @param Payload number of bytes in payload
- * @return packet length [ms]
- */
-uint32_t DEMO_TimeOnAirLora (const DEMO_coding_lora_t* Coding, uint32_t Payload)
+  * @brief Calculate sensor's packet length.
+  * @param Coding packet coding
+  * @param Payload number of bytes in payload
+  * @return packet length [ms]
+  */
+uint32_t DEMO_TimeOnAirLora(const DEMO_coding_lora_t *Coding, uint32_t Payload)
 {
   uint32_t t_s; /*Symbol duration [us]*/
   int32_t n_payload; /*Number of symbols of payload*/
@@ -46,8 +46,8 @@ uint32_t DEMO_TimeOnAirLora (const DEMO_coding_lora_t* Coding, uint32_t Payload)
   t_s = (1000000 << Coding->sf) / DEMO_BW_TO_HZ(Coding->bw); /*Symbol time [us]*/
 
   n_payload = 8 + DEMO_MAX(
-      DEMO_CEIL_DIV(((8 * (int32_t)Payload) - (4 * (int32_t)Coding->sf) + 28 + 16),
-                    (4 * ((int32_t)Coding->sf - (2 * (int32_t)Coding->de))))
+                DEMO_CEIL_DIV(((8 * (int32_t)Payload) - (4 * (int32_t)Coding->sf) + 28 + 16),
+                              (4 * ((int32_t)Coding->sf - (2 * (int32_t)Coding->de))))
                 * ((int32_t)Coding->cr + 4), 0);   /*Number of symbols of payload*/
 
   /*Return packet length [ms]*/
@@ -55,25 +55,25 @@ uint32_t DEMO_TimeOnAirLora (const DEMO_coding_lora_t* Coding, uint32_t Payload)
 }
 
 /**
- * @brief Calculate sensor's packet length.
- * @param Coding packet coding
- * @param Payload number of bytes in payload
- * @return packet length [ms]
- */
-uint32_t DEMO_TimeOnAirFsk (const DEMO_coding_fsk_t* Coding, uint32_t Payload)
+  * @brief Calculate sensor's packet length.
+  * @param Coding packet coding
+  * @param Payload number of bytes in payload
+  * @return packet length [ms]
+  */
+uint32_t DEMO_TimeOnAirFsk(const DEMO_coding_fsk_t *Coding, uint32_t Payload)
 {
   return (1000 * (4 + 4 + Payload + 1 + 2) * 8) / Coding->br; /*Return packet length [ms]*/
 }
 
 /**
- * @brief Get the longest payload that can be sent in the given subregion.
- * @param Coding packet coding
- * @param Subregion local subregion
- * @param packet_time if not NULL, length of the packet will be written there [ms]
- * @return number of bytes which can be sent
- */
-uint32_t DEMO_MaxPayloadLora (const DEMO_coding_lora_t* Coding,
-                              const DEMO_Subregion_t* Subregion, uint32_t* packet_time)
+  * @brief Get the longest payload that can be sent in the given subregion.
+  * @param Coding packet coding
+  * @param Subregion local subregion
+  * @param packet_time if not NULL, length of the packet will be written there [ms]
+  * @return number of bytes which can be sent
+  */
+uint32_t DEMO_MaxPayloadLora(const DEMO_coding_lora_t *Coding,
+                             const DEMO_Subregion_t *Subregion, uint32_t *packet_time)
 {
   uint32_t payload;
   uint32_t temp_time;
@@ -87,7 +87,7 @@ uint32_t DEMO_MaxPayloadLora (const DEMO_coding_lora_t* Coding,
     }
   }
 
-  if(packet_time != NULL)
+  if (packet_time != NULL)
   {
     *packet_time = temp_time;   /*Store TimeOnAir of the packet*/
   }
@@ -95,14 +95,14 @@ uint32_t DEMO_MaxPayloadLora (const DEMO_coding_lora_t* Coding,
 }
 
 /**
- * @brief Get the longest payload that can be sent in the given subregion.
- * @param Coding packet coding
- * @param Subregion local subregion
- * @param packet_time if not NULL, length of the packet will be written there [ms]
- * @return number of bytes which can be sent
- */
-uint32_t DEMO_MaxPayloadFsk (const DEMO_coding_fsk_t* Coding,
-                             const DEMO_Subregion_t* Subregion, uint32_t* packet_time)
+  * @brief Get the longest payload that can be sent in the given subregion.
+  * @param Coding packet coding
+  * @param Subregion local subregion
+  * @param packet_time if not NULL, length of the packet will be written there [ms]
+  * @return number of bytes which can be sent
+  */
+uint32_t DEMO_MaxPayloadFsk(const DEMO_coding_fsk_t *Coding,
+                            const DEMO_Subregion_t *Subregion, uint32_t *packet_time)
 {
   uint32_t payload;
   uint32_t temp_time;
@@ -116,7 +116,7 @@ uint32_t DEMO_MaxPayloadFsk (const DEMO_coding_fsk_t* Coding,
     }
   }
 
-  if(packet_time != NULL)
+  if (packet_time != NULL)
   {
     *packet_time = temp_time;   /*Store TimeOnAir of the packet*/
   }
@@ -124,14 +124,14 @@ uint32_t DEMO_MaxPayloadFsk (const DEMO_coding_fsk_t* Coding,
 }
 
 /**
- * @brief Set coding to default.
- * @param Codings structure to clear
- * @param SlotNr clear structure for this slot
- * @param Region default coding is the same as beacon
- */
-void DEMO_DefaultCoding (DEMO_codings_t* Codings, uint32_t SlotNr, const DEMO_Region_t* Region)
+  * @brief Set coding to default.
+  * @param Codings structure to clear
+  * @param SlotNr clear structure for this slot
+  * @param Region default coding is the same as beacon
+  */
+void DEMO_DefaultCoding(DEMO_codings_t *Codings, uint32_t SlotNr, const DEMO_Region_t *Region)
 {
-  if((SlotNr < 2) || (SlotNr >= DEMO_SLOT_NUMBER))
+  if ((SlotNr < 2) || (SlotNr >= DEMO_SLOT_NUMBER))
   {
     SlotNr = 0;
   }
@@ -154,11 +154,11 @@ void DEMO_DefaultCoding (DEMO_codings_t* Codings, uint32_t SlotNr, const DEMO_Re
 }
 
 /**
- * @brief Check if the sensor coding is the default coding.
- * @param Sensor structure for Sensor
- * @return true if the coding is default
- */
-bool DEMO_IsCodingDefault (const DEMO_codings_t* Codings, const DEMO_Region_t* Region)
+  * @brief Check if the sensor coding is the default coding.
+  * @param Sensor structure for Sensor
+  * @return true if the coding is default
+  */
+bool DEMO_IsCodingDefault(const DEMO_codings_t *Codings, const DEMO_Region_t *Region)
 {
   if ((Codings->hdr.data_lim != DEMO_SENSOR_MAX_PAYLOAD)
       || (Codings->hdr.mode != DEMO_DEFAULT_LORA)
@@ -180,48 +180,56 @@ bool DEMO_IsCodingDefault (const DEMO_codings_t* Codings, const DEMO_Region_t* R
 }
 
 /**
- * @brief Get modulation bandwidth.
- * @param Coding modulation
- * @return bandwidth [Hz]
- */
-uint32_t DEMO_BandwidthLora (const DEMO_coding_lora_t* Coding)
+  * @brief Get modulation bandwidth.
+  * @param Coding modulation
+  * @return bandwidth [Hz]
+  */
+uint32_t DEMO_BandwidthLora(const DEMO_coding_lora_t *Coding)
 {
   return ((16 * DEMO_BW_TO_HZ(Coding->bw)) / 10); /*Bandwidth = bw * 1.6, (guessed from LoRaWAN documentation)*/
 }
 
 /**
- * @brief Get modulation bandwidth.
- * @param Coding modulation
- * @return bandwidth [Hz]
- */
-uint32_t DEMO_BandwidthFsk (const DEMO_coding_fsk_t* Coding)
+  * @brief Get modulation bandwidth.
+  * @param Coding modulation
+  * @return bandwidth [Hz]
+  */
+uint32_t DEMO_BandwidthFsk(const DEMO_coding_fsk_t *Coding)
 {
   uint32_t bt10;        /*10*BT factor*/
-  switch(Coding->bt)
+  switch (Coding->bt)
   {
-    default: bt10 = 10; break;
-    case 1: bt10 = 3; break;
-    case 2: bt10 = 5; break;
-    case 3: bt10 = 7; break;
+    default:
+      bt10 = 10;
+      break;
+    case 1:
+      bt10 = 3;
+      break;
+    case 2:
+      bt10 = 5;
+      break;
+    case 3:
+      bt10 = 7;
+      break;
   }
 
   return (2 * (((bt10 * Coding->br) / 10) + Coding->fdev)); /*Carson's rule to guess bandwidth*/
 }
 
 /**
- * @brief Check and limit input.
- * @param input input variable
- * @param min lower limit
- * @param max upper limit
- * @return output limited variable
- */
+  * @brief Check and limit input.
+  * @param input input variable
+  * @param min lower limit
+  * @param max upper limit
+  * @return output limited variable
+  */
 static int CheckLimits(int input, int min, int max)
 {
-  if(input < min)
+  if (input < min)
   {
     return min;
   }
-  else if(input > max)
+  else if (input > max)
   {
     return max;
   }
@@ -230,25 +238,25 @@ static int CheckLimits(int input, int min, int max)
 }
 
 /**
- * @brief Validate and copy coding header.
- * @param Hdr structure to validate
- * @param Subregion pointer to subregion used to validate
- */
-void DEMO_ValidateCodingHdr(DEMO_coding_hdr_t* Hdr, const DEMO_Subregion_t* Subregion)
+  * @brief Validate and copy coding header.
+  * @param Hdr structure to validate
+  * @param Subregion pointer to subregion used to validate
+  */
+void DEMO_ValidateCodingHdr(DEMO_coding_hdr_t *Hdr, const DEMO_Subregion_t *Subregion)
 {
   Hdr->data_lim = CheckLimits(Hdr->data_lim, 5, DEMO_SENSOR_MAX_PAYLOAD);
 
-  if(Hdr->chan_nr >= Subregion->channels_n)
+  if (Hdr->chan_nr >= Subregion->channels_n)
   {
     Hdr->chan_nr = 0;
   }
 }
 
 /**
- * @brief Validate and copy coding parameters.
- * @param Coding structure to validate
- */
-void DEMO_ValidateCodingLora(DEMO_coding_lora_t* Coding)
+  * @brief Validate and copy coding parameters.
+  * @param Coding structure to validate
+  */
+void DEMO_ValidateCodingLora(DEMO_coding_lora_t *Coding)
 {
   Coding->bw = CheckLimits(Coding->bw, DEMO_LORA_PARAM_BW_MIN, DEMO_LORA_PARAM_BW_MAX);
   Coding->cr = CheckLimits(Coding->cr, DEMO_LORA_PARAM_CR_MIN, DEMO_LORA_PARAM_CR_MAX);
@@ -256,10 +264,10 @@ void DEMO_ValidateCodingLora(DEMO_coding_lora_t* Coding)
 }
 
 /**
- * @brief Validate and copy coding parameters.
- * @param Coding structure to validate
- */
-void DEMO_ValidateCodingFsk(DEMO_coding_fsk_t* Coding)
+  * @brief Validate and copy coding parameters.
+  * @param Coding structure to validate
+  */
+void DEMO_ValidateCodingFsk(DEMO_coding_fsk_t *Coding)
 {
   Coding->br = CheckLimits(Coding->br, DEMO_FSK_PARAM_BR_MIN, DEMO_FSK_PARAM_BR_MAX);
   Coding->bt = CheckLimits(Coding->bt, DEMO_FSK_PARAM_BT_MIN, DEMO_FSK_PARAM_BT_MAX);
@@ -268,14 +276,14 @@ void DEMO_ValidateCodingFsk(DEMO_coding_fsk_t* Coding)
 }
 
 /**
- * @brief Get number of free slots.
- * @param Occupied mask of occupied slots
- * @return number of free slots
- */
+  * @brief Get number of free slots.
+  * @param Occupied mask of occupied slots
+  * @return number of free slots
+  */
 uint32_t DEMO_CountFreeSlots(uint16_t Occupied)
 {
   uint32_t free_slots = DEMO_SLOT_NUMBER - 2;   /*Slots 0 and 1 are taken by Beacon and Sync*/
-  for(uint16_t oc_copy = (Occupied & ~0x3); (free_slots > 0) && (oc_copy != 0x0000); free_slots--)
+  for (uint16_t oc_copy = (Occupied & ~0x3); (free_slots > 0) && (oc_copy != 0x0000); free_slots--)
   {
     oc_copy &= oc_copy - 1; /*Remove least significant 1*/
   }
@@ -283,15 +291,15 @@ uint32_t DEMO_CountFreeSlots(uint16_t Occupied)
 }
 
 /**
- * @brief Pick one slot from the slots marked as free in Occupied mask.
- * @param Occupied mask of occupied slots, true if occupied, slot 0 and slot 1 are reserved
- * @param Random random input for the random selection (should be much larger than number of channels)
- * @return selected slot number
- */
+  * @brief Pick one slot from the slots marked as free in Occupied mask.
+  * @param Occupied mask of occupied slots, true if occupied, slot 0 and slot 1 are reserved
+  * @param Random random input for the random selection (should be much larger than number of channels)
+  * @return selected slot number
+  */
 uint32_t DEMO_ChooseRandomSlot(uint16_t Occupied, uint32_t Random)
 {
   uint32_t random_nr = DEMO_CountFreeSlots(Occupied); /*Get number of free slots*/
-  if(random_nr == 0)
+  if (random_nr == 0)
   {
     return 0;   /*No slot left*/
   }
@@ -299,16 +307,15 @@ uint32_t DEMO_ChooseRandomSlot(uint16_t Occupied, uint32_t Random)
 
   /*Offset for used slots*/
   uint32_t slot;
-  for(slot = 1; (slot < DEMO_SLOT_NUMBER) && (random_nr > 0); random_nr--)
+  for (slot = 1; (slot < DEMO_SLOT_NUMBER) && (random_nr > 0); random_nr--)
   {
     do
     {
       slot++; /*Find next free slot*/
-    }
-    while((Occupied & (1 << slot)) != 0);
+    } while ((Occupied & (1 << slot)) != 0);
   }
 
-  if(slot == DEMO_SLOT_NUMBER)  /*Error, this shouldn't happen*/
+  if (slot == DEMO_SLOT_NUMBER) /*Error, this shouldn't happen*/
   {
     return 0;
   }
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/main.h
index 311e8c32..aa102534 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/main.h
@@ -62,10 +62,36 @@ void Error_Handler(void);
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
 #define LPUART_BAUDRATE 9600
+#define LED1_Pin GPIO_PIN_15
+#define LED1_GPIO_Port GPIOB
+#define LED2_Pin GPIO_PIN_9
+#define LED2_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define RF_CTRL3_Pin GPIO_PIN_3
+#define RF_CTRL3_GPIO_Port GPIOC
+#define BUT1_Pin GPIO_PIN_0
+#define BUT1_GPIO_Port GPIOA
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define RF_CTRL2_Pin GPIO_PIN_5
+#define RF_CTRL2_GPIO_Port GPIOC
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define RF_CTRL1_Pin GPIO_PIN_4
+#define RF_CTRL1_GPIO_Port GPIOC
+#define BUT3_Pin GPIO_PIN_6
+#define BUT3_GPIO_Port GPIOC
+#define BUT2_Pin GPIO_PIN_1
+#define BUT2_GPIO_Port GPIOA
+#define LED3_Pin GPIO_PIN_11
+#define LED3_GPIO_Port GPIOB
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/platform.h
index 1ccf2b6e..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 0
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32wlxx_hal_conf.h
index a5fe461f..f027e308 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32wlxx_nucleo_conf.h
index 341aae1f..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     3U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_app.h
index 17566231..37d3218b 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -33,6 +35,11 @@ extern "C" {
 
 /* USER CODE END Includes */
 
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -68,12 +75,14 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_conf.h
index 89265370..bfc19eab 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief  Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_L
+#define VERBOSE_LEVEL               VLEVEL_L
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 1
+#define LOW_POWER_DISABLE           1
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_debug.h
index bbae8f87..710e8852 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/sys_debug.h
@@ -43,89 +43,89 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/**  Definition for Debug Line 1   **/
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 /* USER CODE BEGIN EC */
 
@@ -137,39 +137,41 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
@@ -177,9 +179,20 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initializes the debug
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/usart.h
index c196d42b..29cb339e 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/utilities_conf.h
index 52f0cb15..42fd5e67 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/utilities_def.h
index 41007559..f49e747d 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
   /* USER CODE END CFG_LPM_Id_t */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/main.c
index 9808ce6d..ffb69045 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/main.c
@@ -149,6 +149,13 @@ void SystemClock_Config(void)
   RCC_OscInitTypeDef RCC_OscInitStruct = {0};
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
 
+  /** Configure LSE Drive Capability
+  */
+  HAL_PWR_EnableBkUpAccess();
+  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+  /** Configure the main internal regulator output voltage
+  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
   /** Initializes the CPU, AHB and APB busses clocks
   */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
@@ -190,10 +197,10 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
-
   /* USER CODE END Error_Handler_Debug */
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/rtc.c
index 4464f7dc..b61dd5fe 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,10 +71,13 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/stm32wlxx_it.c
index a608058e..c5783cd8 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/stm32wlxx_it.c
@@ -76,7 +76,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -187,7 +189,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/sys_app.c
index 47280a9c..a31c7b0c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,18 +17,20 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
 #include <stdarg.h>
+#include "platform.h"
 #include "sys_app.h"
 #include "adc_if.h"
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -61,16 +64,10 @@
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
-  */
-static void Gpio_PreInit(void);
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -78,16 +75,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -96,13 +89,15 @@ void SystemApp_Init(void)
 
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-  /*Initialises timer and RTC*/
+
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
-  Gpio_PreInit();
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -127,8 +122,6 @@ void SystemApp_Init(void)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -141,11 +134,12 @@ void UTIL_SEQ_Idle(void)
   /* USER CODE END UTIL_SEQ_Idle_2 */
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
+
 static void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -159,45 +153,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -242,10 +197,7 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -260,13 +212,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -277,13 +227,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/sys_debug.c
index 2e4c40f7..f0395f5c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/sys_debug.c
@@ -41,6 +41,7 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
+
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 
@@ -58,39 +59,121 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
-  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
-  /* Enable the GPIO Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
   GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -108,44 +191,42 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
 #endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
-
-  /* USER CODE END DBG_Init_Last */
-}
-/* USER CODE BEGIN EF */
+#endif /* CORE_CM4 */
 
-/* USER CODE END EF */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-/* Private Functions Definition -----------------------------------------------*/
+  /* USER CODE END DBG_ProbesInit_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/timer_if.c
index 615131a0..66e51602 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -104,6 +104,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -153,7 +164,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -173,9 +183,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -183,18 +193,21 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
     /*overload RTC feature enable*/
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -277,64 +290,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,7 +379,7 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
@@ -383,6 +402,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -392,16 +412,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -428,24 +448,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/usart.c
index 343006bc..8eda5eb1 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,6 +32,13 @@ DMA_HandleTypeDef hdma_lpuart1_tx;
 void MX_LPUART1_UART_Init(void)
 {
 
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
   hlpuart1.Init.BaudRate = LPUART_BAUDRATE;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
@@ -59,6 +66,9 @@ void MX_LPUART1_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/usart_if.c
index cfa581cd..36217a2f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&hlpuart1);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/LocalNetwork_Concentrator.ewd b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/LocalNetwork_Concentrator.ewd
index 1585b4f4..06e26594 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/LocalNetwork_Concentrator.ewd
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/LocalNetwork_Concentrator.ewd
@@ -40,11 +40,11 @@
                 </option>
                 <option>
                     <name>MemOverride</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\config\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/LocalNetwork_Concentrator.ewp b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/LocalNetwork_Concentrator.ewp
index c3876cb9..9c9149bb 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/LocalNetwork_Concentrator.ewp
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/LocalNetwork_Concentrator.ewp
@@ -16,15 +16,15 @@
                 <debug>1</debug>
                 <option>
                     <name>ExePath</name>
-                    <state>LocalNetwork_Concentrator\Exe</state>
+                    <state>LocalNetwork_Concentrator/Exe</state>
                 </option>
                 <option>
                     <name>ObjPath</name>
-                    <state>LocalNetwork_Concentrator\Obj</state>
+                    <state>LocalNetwork_Concentrator/Obj</state>
                 </option>
                 <option>
                     <name>ListPath</name>
-                    <state>LocalNetwork_Concentrator\List</state>
+                    <state>LocalNetwork_Concentrator/List</state>
                 </option>
                 <option>
                     <name>GEndianMode</name>
@@ -32,11 +32,11 @@
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
                 </option>
                 <option>
                     <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
                 </option>
                 <option>
                     <name>GOutputBinary</name>
@@ -108,7 +108,7 @@
                 <option>
                     <name>GeneralMisraRules04</name>
                     <version>0</version>
-                    <state>011111111111111110111111111111111111111111111010110100111111111111110111111111111111111111111111111111110111111011111111111111111111111111111</state>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
                 </option>
                 <option>
                     <name>RTConfigPath2</name>
@@ -218,11 +218,15 @@
                 <version>34</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>CCDefines</name>
-                    <state>STM32WL55xx</state>
                     <state>CORE_CM4</state>
                     <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
                 </option>
                 <option>
                     <name>CCPreprocFile</name>
@@ -424,11 +428,11 @@
                 </option>
                 <option>
                     <name>IccStaticDestr</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCppInlineSemantics</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCmsis</name>
@@ -438,10 +442,6 @@
                     <name>IccFloatSemantics</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCNoLiteralPool</name>
                     <state>0</state>
@@ -780,7 +780,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1234,6 +1234,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/LocalNetwork_Concentrator.uvoptx b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/LocalNetwork_Concentrator.uvoptx
index e32acb43..f6f47a8f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/LocalNetwork_Concentrator.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/LocalNetwork_Concentrator.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>32000000</CLKADS>
+      <CLKADS>48000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -556,7 +576,7 @@
 
   <Group>
     <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -827,6 +847,18 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>50</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
       <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -842,7 +874,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>50</FileNumber>
+      <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -854,7 +886,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>51</FileNumber>
+      <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -866,7 +898,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>52</FileNumber>
+      <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -878,7 +910,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>53</FileNumber>
+      <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -890,7 +922,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>54</FileNumber>
+      <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -902,7 +934,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>55</FileNumber>
+      <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -914,7 +946,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>56</FileNumber>
+      <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -926,7 +958,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>57</FileNumber>
+      <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/LocalNetwork_Concentrator.uvprojx b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/LocalNetwork_Concentrator.uvprojx
index 84f9ca63..d4a59f4c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/LocalNetwork_Concentrator.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/LocalNetwork_Concentrator.uvprojx
@@ -10,15 +10,15 @@
       <TargetName>LocalNetwork_Concentrator</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.6</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x803FFFF) IRAM(0x20000000-0x20007FFF) IRAM2(0x20008000-0x2000FFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LocalNetwork_Concentrator\Exe\</OutputDirectory>
+          <OutputDirectory>LocalNetwork_Concentrator\</OutputDirectory>
           <OutputName>LocalNetwork_Concentrator</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -138,10 +138,10 @@
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2V8M.DLL</Flash2>
-          <Flash3>"" ()</Flash3>
+          <Flash3></Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
-          <pFcarmGrp>Application/MDK-ARM</pFcarmGrp>
+          <pFcarmGrp></pFcarmGrp>
           <pFcArmRoot></pFcArmRoot>
           <FcArmLst>0</FcArmLst>
         </Utilities>
@@ -183,8 +183,9 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -245,12 +246,12 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
                 <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <Size>0x20000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -335,8 +336,8 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>STM32WL55xx,CORE_CM4,USE_HAL_DRIVER</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
               <IncludePath>../Core/Inc;../Common/Inc;../SubGHz_Phy/App;../SubGHz_Phy/Target;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace</IncludePath>
             </VariousControls>
@@ -351,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -662,6 +663,11 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
+            <File>
+              <FileName>radio_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
             <File>
               <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
@@ -734,4 +740,19 @@
     <files/>
   </RTE>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
 </Project>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/startup_stm32wl55xx_cm4.s
index 4ccae29d..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/stm32wl55xx_flash_cm4.sct
index 135ceb14..574c8f1a 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/stm32wl55xx_flash_cm4.sct
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -2,19 +2,18 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
-  ; FLASH part dedicated to M4
-  ER_IROM1 0x08000000 0x00020000  {  ; load address = execution address
+LR_IROM1 0x08000000 0x00040000  {    ; load region size_region
+  ; FLASH
+  ER_IROM1 0x08000000 0x00040000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)
   }
-  ; Non-backup SRAM1 dedicated to M4
-  RW_IRAM1 0x20000000 0x00004000  {  ; RW data
+  ; Non-backup SRAM1
+  RW_IRAM1 0x20000000 0x00008000  {  ; RW data
    .ANY (+RW +ZI)
   }
-  ; Backup SRAM2 dedicated to M4
-  RW_IRAM2 0x20008000 ALIGN 4 0x00004000  {  ; RW data
-   .ANY (+RW +ZI)
+  ; Backup SRAM2
+  RW_IRAM2 0x20008000 EMPTY 0x00008000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
   }
 }
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/.cproject
index 91f5a95c..4d89fb8f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/.cproject
@@ -8,6 +8,7 @@
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
@@ -16,27 +17,27 @@
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1466985998" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1466985998." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1190768917" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1799137810" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.5585584" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801697261" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2025793403" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.392620907" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2021892859" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1557389453" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1799137810" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.5585584" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801697261" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2025793403" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.392620907" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2021892859" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1557389453" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1608474235" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/LocalNetwork_Concentrator}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.839273790" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.754271990" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1404283493" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1404283493" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1953189115" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1489840519" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1088368083" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.194190494" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.194190494" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.513493159" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
-									<listOptionValue builtIn="false" value="CORE_CM4"/>
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.694212381" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
@@ -62,14 +63,14 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2068965098" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.479062137" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.419274375" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.419274375" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.73018535" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.577449596" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.143035263" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.143035263" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.405337869" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.19084737" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
@@ -92,6 +93,7 @@
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
@@ -102,11 +104,11 @@
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1455908214" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
 							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1408083214" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.78030957" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1163853994" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.603807858" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2031399645" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1163853994" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.603807858" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2031399645" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1757190645" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.332265939" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.332265939" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.51625410" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/LocalNetwork_Concentrator}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1885755997" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.327412967" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -117,9 +119,9 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.937119445" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1321844335" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.589264167" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32WL55xx"/>
 									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.738060588" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../../Core/Inc"/>
@@ -145,14 +147,14 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1876971924" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1165782354" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1122299919" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1122299919" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.149358669" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.557570763" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.104558393" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.104558393" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1155679616" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.690607626" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
@@ -191,4 +193,4 @@
 		</configuration>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/.project
index 423c9f93..a4b6588c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/.project
@@ -23,8 +23,8 @@
 		<nature>org.eclipse.cdt.core.cnature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
@@ -32,45 +32,50 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Application/App/demo_at.c</name>
@@ -130,72 +135,72 @@
 		<link>
 			<name>Application/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/main.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/main.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/main.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_debug.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Target/radio_board_if.c</name>
@@ -205,107 +210,107 @@
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
@@ -320,12 +325,17 @@
 		<link>
 			<name>Middlewares/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/Application/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/Application/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/Application/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s
index 89dfe9e5..80ba57c9 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..74ed46df
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,190 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
+
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 256K
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM1 AT> FLASH
+
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM1
+
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM1
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/STM32WL55XX_FLASH_CM4.ld b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/STM32WL55XX_FLASH_CM4.ld
deleted file mode 100644
index adbec013..00000000
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/STM32CubeIDE/STM32WL55XX_FLASH_CM4.ld
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-** LinkerScript
-*/
-
-/* Entry Point */
-ENTRY(Reset_Handler)
-
-/* Highest address of the user mode stack */
-_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "SRAM1" Ram type memory */
-
-_Min_Heap_Size  = 0x200; /* required amount of heap  */
-_Min_Stack_Size = 0x800 ; /* required amount of stack */
-
-/* Memories definition */
-MEMORY
-{
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 256K   /* Flash memory dedicated to CM4 */
-  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K    /* Non-backup SRAM1 dedicated to CM4 */
-  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K    /* Backup SRAM2 dedicated to CM4 */
-}
-
-/* Sections */
-SECTIONS
-{
-  /* The startup code into "ROM" Rom type memory */
-  .isr_vector :
-  {
-    . = ALIGN(8);
-    KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
-
-  /* The program code and other data into "ROM" Rom type memory */
-  .text :
-  {
-    . = ALIGN(8);
-    *(.text)           /* .text sections (code) */
-    *(.text*)          /* .text* sections (code) */
-    *(.glue_7)         /* glue arm to thumb code */
-    *(.glue_7t)        /* glue thumb to arm code */
-    *(.eh_frame)
-
-    KEEP (*(.init))
-    KEEP (*(.fini))
-
-    . = ALIGN(8);
-    _etext = .;        /* define a global symbols at end of code */
-  } >ROM
-
-  /* Constant data into "ROM" Rom type memory */
-  .rodata :
-  {
-    . = ALIGN(8);
-    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
-    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
-
-  .ARM.extab   : { 
-    . = ALIGN(8);
-    *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
-  .ARM : {
-    . = ALIGN(8);
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
-
-  .preinit_array     :
-  {
-    . = ALIGN(8);
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array*))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
-  .init_array :
-  {
-    . = ALIGN(8);
-    PROVIDE_HIDDEN (__init_array_start = .);
-    KEEP (*(SORT(.init_array.*)))
-    KEEP (*(.init_array*))
-    PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
-  .fini_array :
-  {
-    . = ALIGN(8);
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(SORT(.fini_array.*)))
-    KEEP (*(.fini_array*))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-
-  /* Used by the startup to initialize data */
-  _sidata = LOADADDR(.data);
-
-  /* Initialized data sections into "SRAM1" Ram type memory */
-  .data : 
-  {
-    . = ALIGN(8);
-    _sdata = .;        /* create a global symbol at data start */
-    *(.data)           /* .data sections */
-    *(.data*)          /* .data* sections */
-
-    . = ALIGN(8);
-    _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM1 AT> ROM
-
-  /* Uninitialized data section into "SRAM1" Ram type memory */
-  . = ALIGN(8);
-  .bss :
-  {
-    /* This is used by the startup in order to initialize the .bss section */
-    _sbss = .;         /* define a global symbol at bss start */
-    __bss_start__ = _sbss;
-    *(.bss)
-    *(.bss*)
-    *(COMMON)
-
-    . = ALIGN(8);
-    _ebss = .;         /* define a global symbol at bss end */
-    __bss_end__ = _ebss;
-  } >RAM1
-
-  /* Data section into "SRAM1" Ram type memory: Non-backup SRAM1 dedicated to CM4 */
-  . = ALIGN(8);
-  RAM1_region :
-  {
-    _sRAM_region = .;         /* define a global symbol at section start */
-    *(.RAM1_region)
-
-    . = ALIGN(8);
-    _eRAM1_region = .;         /* define a global symbol at section end */
-  } >RAM1
-
-  /* Data section into "SRAM2" Ram type memory: Backup SRAM2 dedicated to CM4 */
-  . = ALIGN(8);
-  RAM2_region :
-  {
-    _sRAM2_region = .;         /* define a global symbol at section start */
-    *(.RAM2_region)
-
-    . = ALIGN(8);
-    _eRAM2_region = .;         /* define a global symbol at section end */
-  } >RAM2
-
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
-  ._user_heap_stack :
-  {
-    . = ALIGN(8);
-    PROVIDE ( end = . );
-    PROVIDE ( _end = . );
-    . = . + _Min_Heap_Size;
-    . = . + _Min_Stack_Size;
-    . = ALIGN(8);
-  } >RAM1
-
-  /* Remove information from the compiler libraries */
-  /DISCARD/ :
-  {
-    libc.a ( * )
-    libm.a ( * )
-    libgcc.a ( * )
-  }
-
-  .ARM.attributes 0 : { *(.ARM.attributes) }
-}
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.c
index 19de2687..ebed18ac 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.c
@@ -29,13 +29,7 @@
 /* External variables --------------------------------------------------------*/
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
-/**
- * @brief Max size of the data that can be received
- */
-#define MAX_RECEIVED_DATA 255
-
 /* Private macro -------------------------------------------------------------*/
-
 /* Private variables ---------------------------------------------------------*/
 
 static DEMO_coding_lora_t RegLoraParam; /**< Registers to store modulation before change*/
@@ -46,19 +40,19 @@ static uint32_t RegSubregion;           /**< Register to store subregion before
 /* Private function prototypes -----------------------------------------------*/
 
 /**
- * @brief Set modulation to LoRa or FSK.
- * @param lora true if LoRa, false if FSK
- * @param param parameters of AT command
- * @param test_only if true, only respond and do not use the modulation
- * @return one of ATEerror_t
- */
+  * @brief Set modulation to LoRa or FSK.
+  * @param lora true if LoRa, false if FSK
+  * @param param parameters of AT command
+  * @param test_only if true, only respond and do not use the modulation
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_mod_helper(bool lora, const char *param, bool test_only);
 
 /* Exported functions ------------------------------------------------------- */
 
 /**
- * @brief Set default values to registers.
- */
+  * @brief Set default values to registers.
+  */
 void at_init(void)
 {
   DEMO_ValidateCodingLora(&RegLoraParam);
@@ -97,48 +91,48 @@ ATEerror_t at_version_get(const char *param)
 }
 
 ATEerror_t at_verbose_set(const char *param)
-{ 
-  const char *buf= param;
+{
+  const char *buf = param;
   int32_t lvl_nb;
-  
+
   /* read and set the verbose level */
   if (1 != tiny_sscanf(buf, "%u", &lvl_nb))
   {
     AT_PRINTF("AT+VL: verbose level is not well set");
     return AT_PARAM_ERROR;
   }
-  if ((lvl_nb > VLEVEL_H)||(lvl_nb <VLEVEL_OFF))
+  if ((lvl_nb > VLEVEL_H) || (lvl_nb < VLEVEL_OFF))
   {
     AT_PRINTF("AT+VL: verbose level out of range => 0(VLEVEL_OFF) to 3(VLEVEL_H)");
     return AT_PARAM_ERROR;
   }
-  
-  UTIL_ADV_TRACE_SetVerboseLevel( lvl_nb);
-  
-  return AT_OK;  
+
+  UTIL_ADV_TRACE_SetVerboseLevel(lvl_nb);
+
+  return AT_OK;
 }
 
 ATEerror_t at_verbose_get(const char *param)
-{ 
+{
   AT_PRINTF("%u", UTIL_ADV_TRACE_GetVerboseLevel());
-  return AT_OK;  
+  return AT_OK;
 }
 
 /**
- * @brief List all available regions.
- * @param param ignored
- * @return AT_OK
- */
+  * @brief List all available regions.
+  * @param param ignored
+  * @return AT_OK
+  */
 ATEerror_t at_list_regions(const char *param)
 {
   AT_PRINTF("Regions and subregions %s:", VERSION_STR);
-  for(int r = 0; r < DEMO_Regions_n; r++)
+  for (int r = 0; r < DEMO_Regions_n; r++)
   {
     AT_PRINTF("\r\n\t%i - %3u.%03u MHz - %s\r\n", r,
               DEMO_Regions[r].beacon_freq / 1000000, (DEMO_Regions[r].beacon_freq / 1000) % 1000,
               DEMO_Regions[r].name);
 
-    for(int s = 0; s < DEMO_Regions[r].subregions_n; s++)
+    for (int s = 0; s < DEMO_Regions[r].subregions_n; s++)
     {
       AT_PRINTF("\t%i.%i - %s\r\n", r, s, DEMO_Regions[r].subregions[s].name);
     }
@@ -148,43 +142,43 @@ ATEerror_t at_list_regions(const char *param)
 }
 
 /**
- * @brief Macro to get many register getters and setters.
- */
+  * @brief Macro to get many register getters and setters.
+  */
 #define AT_PROVIDE_GETSET(name, var, min, max)                   \
-                                                                 \
-/**                                                              \
- * @brief Set variable.                                          \
- * @param param parameters of AT command                         \
- * @return one of ATEerror_t                                     \
- */                                                              \
-ATEerror_t at_##name##_set(const char *param)                    \
-{                                                                \
-  unsigned long ul;                                              \
-  int ret;                                                       \
-                                                                 \
-  ret = tiny_sscanf(param, "%ul", &ul);                          \
-  if((ret != 1)                                                  \
-          || ((ul - (min)) > ((max) - (min)))) /*Check limits*/  \
-  {                                                              \
-    AT_PRINTF(#name);                                            \
-    AT_PRINTF(" needs to be between %u and %u!", min, max);      \
-    return AT_PARAM_ERROR;                                       \
-  }                                                              \
-                                                                 \
-  var = ul;                                                      \
-  return AT_OK;                                                  \
-}                                                                \
-                                                                 \
-/**                                                              \
- * @brief Get variable.                                          \
- * @param param parameters of AT command                         \
- * @return AT_OK                                                 \
- */                                                              \
-ATEerror_t at_##name##_get(const char *param)                    \
-{                                                                \
+  \
+  /**                                                              \
+    * @brief Set variable.                                          \
+    * @param param parameters of AT command                         \
+    * @return one of ATEerror_t                                     \
+    */                                                              \
+  ATEerror_t at_##name##_set(const char *param)                    \
+  {                                                                \
+    unsigned long ul;                                              \
+    int ret;                                                       \
+    \
+    ret = tiny_sscanf(param, "%ul", &ul);                          \
+    if((ret != 1)                                                  \
+       || ((ul - (min)) > ((max) - (min)))) /*Check limits*/  \
+    {                                                              \
+      AT_PRINTF(#name);                                            \
+      AT_PRINTF(" needs to be between %u and %u!", min, max);      \
+      return AT_PARAM_ERROR;                                       \
+    }                                                              \
+    \
+    var = ul;                                                      \
+    return AT_OK;                                                  \
+  }                                                                \
+  \
+  /**                                                              \
+    * @brief Get variable.                                          \
+    * @param param parameters of AT command                         \
+    * @return AT_OK                                                 \
+    */                                                              \
+  ATEerror_t at_##name##_get(const char *param)                    \
+  {                                                                \
     AT_PRINTF("%u", (unsigned int)(var));                        \
     return AT_OK;                                                \
-}
+  }
 
 AT_PROVIDE_GETSET(DE,        RegLoraParam.de,      0,                           1)
 AT_PROVIDE_GETSET(CR,        RegLoraParam.cr,      DEMO_LORA_PARAM_CR_MIN,      DEMO_LORA_PARAM_CR_MAX)
@@ -200,13 +194,13 @@ AT_PROVIDE_GETSET(REGION,    RegRegion,            0,
 AT_PROVIDE_GETSET(SUBREGION, RegSubregion,         0,                           255)
 
 /**
- * @brief Start or stop sending beacons.
- * @param param parameters of AT command
- * @return one of ATEerror_t
- */
+  * @brief Start or stop sending beacons.
+  * @param param parameters of AT command
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_beacon_get(const char *param)
 {
-  if(CONC_IsEnabled() == true)
+  if (CONC_IsEnabled() == true)
   {
     AT_PRINTF("1\r\n");
   }
@@ -218,27 +212,27 @@ ATEerror_t at_beacon_get(const char *param)
 }
 
 /**
- * @brief Start or stop sending beacons.
- * @param param
- * @return one of ATEerror_t
- */
+  * @brief Start or stop sending beacons.
+  * @param param
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_beacon_set(const char *param)
 {
   int ret;
 
-  if(param[0] == '\0')
+  if (param[0] == '\0')
   {
     return AT_PARAM_ERROR;
   }
-  else if(param[0] == '0')
+  else if (param[0] == '0')
   {
     CONC_StopBeacon();
     return AT_OK;
   }
-  else if(param[0] == '1')
+  else if (param[0] == '1')
   {
     ret = CONC_StartBeacon(RegRegion, RegSubregion);  /*Enable transmitting beacons*/
-    switch(ret)
+    switch (ret)
     {
       case 0:
         return AT_OK;
@@ -263,22 +257,22 @@ ATEerror_t at_beacon_set(const char *param)
 }
 
 /**
- * @brief Start or stop sending beacons.
- * @param param
- * @return one of ATEerror_t
- */
+  * @brief Start or stop sending beacons.
+  * @param param
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_beacon_run(const char *param)
 {
   return at_beacon_set("1");
 }
 
 /**
- * @brief Set modulation to LoRa or FSK.
- * @param lora true if LoRa, false if FSK
- * @param param parameters of AT command
- * @param test_only if true, only respond and do not use the modulation
- * @return one of ATEerror_t
- */
+  * @brief Set modulation to LoRa or FSK.
+  * @param lora true if LoRa, false if FSK
+  * @param param parameters of AT command
+  * @param test_only if true, only respond and do not use the modulation
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_mod_helper(bool lora, const char *param, bool test_only)
 {
   uint32_t eui;
@@ -286,19 +280,19 @@ ATEerror_t at_mod_helper(bool lora, const char *param, bool test_only)
   int ret1;
 
 
-  if(CONC_IsEnabled() == false)
+  if (CONC_IsEnabled() == false)
   {
     AT_PRINTF("Beacon is not on!");
     return AT_PARAM_ERROR;
   }
 
-  if(test_only == false)
+  if (test_only == false)
   {
     ret1 = tiny_sscanf(param, "0x%x", &eui);
-    if(ret1 != 1)
+    if (ret1 != 1)
     {
-        AT_PRINTF("EUI was not understood! (use AT+MOD_XXX=0xabcd1234)");
-        return AT_PARAM_ERROR;
+      AT_PRINTF("EUI was not understood! (use AT+MOD_XXX=0xabcd1234)");
+      return AT_PARAM_ERROR;
     }
   }
   else
@@ -306,7 +300,7 @@ ATEerror_t at_mod_helper(bool lora, const char *param, bool test_only)
     eui = 0;
   }
 
-  if(lora)
+  if (lora)
   {
     ret2 = CONC_SetModLora(eui, &RegLoraParam, test_only);     /*Change or test the mode*/
   }
@@ -315,7 +309,7 @@ ATEerror_t at_mod_helper(bool lora, const char *param, bool test_only)
     ret2 = CONC_SetModFSK(eui, &RegFskParam, test_only);     /*Change or test the mode*/
   }
 
-  switch(ret2)
+  switch (ret2)
   {
     case CONC_SETMOD_Ok:
       return AT_OK;
@@ -334,40 +328,40 @@ ATEerror_t at_mod_helper(bool lora, const char *param, bool test_only)
 }
 
 /**
- * @brief Set modulation to LoRa.
- * @param param parameters of AT command
- * @return one of ATEerror_t
- */
+  * @brief Set modulation to LoRa.
+  * @param param parameters of AT command
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_mod_lora(const char *param)
 {
   return at_mod_helper(1, param, 0);
 }
 
 /**
- * @brief Set modulation to FSK.
- * @param param parameters of AT command
- * @return one of ATEerror_t
- */
+  * @brief Set modulation to FSK.
+  * @param param parameters of AT command
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_mod_fsk(const char *param)
 {
   return at_mod_helper(0, param, 0);
 }
 
 /**
- * @brief Test LoRa modulation.
- * @param param parameters of AT command
- * @return one of ATEerror_t
- */
+  * @brief Test LoRa modulation.
+  * @param param parameters of AT command
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_mod_test_lora(const char *param)
 {
   return at_mod_helper(1, param, 1);
 }
 
 /**
- * @brief Test FSK modulation.
- * @param param parameters of AT command
- * @return one of ATEerror_t
- */
+  * @brief Test FSK modulation.
+  * @param param parameters of AT command
+  * @return one of ATEerror_t
+  */
 ATEerror_t at_mod_test_fsk(const char *param)
 {
   return at_mod_helper(0, param, 1);
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.h
index 371c7952..829f9844 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.h
@@ -84,45 +84,45 @@ typedef enum eATEerror
 void at_init(void);
 
 /**
- * @brief  Return AT_OK in all cases
- * @param  Param string of the AT command - unused
- * @retval AT_OK
- */
+  * @brief  Return AT_OK in all cases
+  * @param  Param string of the AT command - unused
+  * @retval AT_OK
+  */
 ATEerror_t at_return_ok(const char *param);
 
 /**
- * @brief  Return AT_ERROR in all cases
- * @param  Param string of the AT command - unused
- * @retval AT_ERROR
- */
+  * @brief  Return AT_ERROR in all cases
+  * @param  Param string of the AT command - unused
+  * @retval AT_ERROR
+  */
 ATEerror_t at_return_error(const char *param);
 
 /**
- * @brief  Trig a reset of the MCU
- * @param  Param string of the AT command - unused
- * @retval AT_OK
- */
+  * @brief  Trig a reset of the MCU
+  * @param  Param string of the AT command - unused
+  * @retval AT_OK
+  */
 ATEerror_t at_reset(const char *param);
 
 /**
- * @brief Get firmware version.
- * @param param
- * @return AT_OK
- */
+  * @brief Get firmware version.
+  * @param param
+  * @return AT_OK
+  */
 ATEerror_t at_version_get(const char *param);
 
 /**
- * @brief  Set the verbose level
- * @param  String parameter
- * @retval AT_OK
- */
+  * @brief  Set the verbose level
+  * @param  String parameter
+  * @retval AT_OK
+  */
 ATEerror_t at_verbose_set(const char *param);
 
 /**
- * @brief  Get the verbose level
- * @param  String parameter
- * @retval AT_OK
- */
+  * @brief  Get the verbose level
+  * @param  String parameter
+  * @retval AT_OK
+  */
 ATEerror_t at_verbose_get(const char *param);
 
 ATEerror_t at_list_regions(const char *param);
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_command.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_command.c
index 102fe0ca..8b139420 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_command.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_command.c
@@ -35,8 +35,8 @@
 
 /* Private typedef -----------------------------------------------------------*/
 /**
- * @brief  Structure defining an AT Command
- */
+  * @brief  Structure defining an AT Command
+  */
 struct ATCommand_s
 {
   const char *string;                       /*< command string, after the "AT" */
@@ -46,7 +46,7 @@ struct ATCommand_s
   ATEerror_t (*run)(const char *param);     /*< \0 after the string - run the command */
 #if !defined(NO_HELP)
   const char *help_string;                  /*< to be printed when ? after the string */
-#endif
+#endif /* !NO_HELP */
 };
 
 /* USER CODE BEGIN PTD */
@@ -56,7 +56,6 @@ struct ATCommand_s
 /* Private define ------------------------------------------------------------*/
 #define CMD_SIZE                        540
 #define CIRC_BUFF_SIZE                  8
-#define HELP_DISPLAY_FLUSH_DELAY        100
 
 /* USER CODE BEGIN PD */
 
@@ -70,8 +69,8 @@ struct ATCommand_s
 /* Private variables ---------------------------------------------------------*/
 
 /**
- * @brief  Array corresponding to the description of each possible AT Error
- */
+  * @brief  Array corresponding to the description of each possible AT Error
+  */
 static const char *const ATError_description[] =
 {
   "\r\nOK\r\n",                     /* AT_OK */
@@ -85,8 +84,8 @@ static const char *const ATError_description[] =
 };
 
 /**
- * @brief  Array of all supported AT Commands
- */
+  * @brief  Array of all supported AT Commands
+  */
 static const struct ATCommand_s ATCommand[] =
 {
   {
@@ -94,7 +93,7 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_RESET) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_RESET ": Trig a reset of the MCU\r\n",
-#endif
+#endif /* NO_HELP */
     .get = at_return_error,
     .set = at_return_error,
     .run = at_reset,
@@ -105,7 +104,7 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_VER) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_VER ": Get the version of the FW\r\n",
-#endif
+#endif /* NO_HELP */
     .get = at_version_get,
     .set = at_return_error,
     .run = at_return_error,
@@ -116,7 +115,7 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_VL) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_VL ": Set the Verbose Level with integer from 0(VLEVEL_OFF) to 3(VLEVEL_H)\r\n",
-#endif
+#endif /* NO_HELP */
     .get = at_verbose_get,
     .set = at_verbose_set,
     .run = at_return_error,
@@ -127,7 +126,7 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_LIST_REGIONS) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_LIST_REGIONS ": List all available regions and subregions\r\n",
-#endif
+#endif /* NO_HELP */
     .get = at_return_error,
     .set = at_return_error,
     .run = at_list_regions,
@@ -196,7 +195,7 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_BEACON_ON) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_BEACON_ON ": Start sending beacons (uses REGION and SUBREGION registers)\r\n",
-#endif
+#endif /* NO_HELP */
     .get = at_beacon_get,
     .set = at_beacon_set,
     .run = at_beacon_run,
@@ -207,8 +206,8 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_MOD_LORA) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_MOD_LORA ": Set modulation for this EUI to LoRa\r\n\t\t"
-        "(uses DE, CR, SF and BW registers) (use AT+MOD_LORA=0xabcd1234)\r\n",
-#endif
+    "(uses DE, CR, SF and BW registers) (use AT+MOD_LORA=0xabcd1234)\r\n",
+#endif /* NO_HELP */
     .get = at_return_error,
     .set = at_mod_lora,
     .run = at_return_error,
@@ -219,8 +218,8 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_MOD_FSK) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_MOD_FSK ": Set modulation for this EUI to FSK\r\n\t\t"
-        "(uses RISE, BR, FDEV and BT registers) (use AT+MOD_FSK=0xabcd1234)\r\n",
-#endif
+    "(uses RISE, BR, FDEV and BT registers) (use AT+MOD_FSK=0xabcd1234)\r\n",
+#endif /* NO_HELP */
     .get = at_return_error,
     .set = at_mod_fsk,
     .run = at_return_error,
@@ -231,8 +230,8 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_MOD_TEST_LORA) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_MOD_TEST_LORA ": Test LoRa modulation\r\n\t\t"
-        "(uses DE, CR, SF and BW registers)\r\n",
-#endif
+    "(uses DE, CR, SF and BW registers)\r\n",
+#endif /* NO_HELP */
     .get = at_return_error,
     .set = at_return_error,
     .run = at_mod_test_lora,
@@ -243,8 +242,8 @@ static const struct ATCommand_s ATCommand[] =
     .size_string = sizeof(AT_MOD_TEST_FSK) - 1,
 #ifndef NO_HELP
     .help_string = "AT"AT_MOD_TEST_FSK ": Test FSK modulation\r\n\t\t"
-        "(uses RISE, BR, FDEV and BT registers)\r\n",
-#endif
+    "(uses RISE, BR, FDEV and BT registers)\r\n",
+#endif /* NO_HELP */
     .get = at_return_error,
     .set = at_return_error,
     .run = at_mod_test_fsk,
@@ -341,7 +340,7 @@ void CMD_Process(void)
   {
 #if 0 /* echo On    */
     APP_PRINTF("%c", circBuffer[ridx]);
-#endif
+#endif /* 0 */
 
     if (circBuffer[ridx] == AT_ERROR_RX_CHAR)
     {
@@ -494,10 +493,11 @@ static void parse_cmd(const char *cmd)
     {
       APP_PPRINTF(ATCommand[i].help_string);
     }
-    /* Wait for the message queue to be flushed in order
-       not to disturb following com_error() display */
-    HAL_Delay(HELP_DISPLAY_FLUSH_DELAY);
-#endif
+    while (1 != UTIL_ADV_TRACE_IsBufferEmpty())
+    {
+      /* Wait that all printfs are completed*/
+    }
+#endif /* NO_HELP */
   }
   else
   {
@@ -531,7 +531,7 @@ static void parse_cmd(const char *cmd)
           case '?':
 #ifndef NO_HELP
             APP_PRINTF(Current_ATCommand->help_string);
-#endif
+#endif /* NO_HELP */
             status = AT_OK;
             break;
           default:
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_command.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_command.h
index a4bbeef2..c9eb1e58 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_command.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_command.h
@@ -38,19 +38,19 @@ extern "C" {
 /* Exported functions ------------------------------------------------------- */
 
 /**
- * @brief Initializes command module
- *
- * @param [IN] cb to signal appli that character has been received
- * @retval None
- */
+  * @brief Initializes command module
+  *
+  * @param [IN] cb to signal appli that character has been received
+  * @retval None
+  */
 void CMD_Init(void (*CmdProcessNotify)(void));
 
 /**
- * @brief Process the command
- *
- * @param [IN] None
- * @retval None
- */
+  * @brief Process the command
+  *
+  * @param [IN] None
+  * @retval None
+  */
 void CMD_Process(void);
 
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_concentrator.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_concentrator.c
index 8a19c9ca..896ec5b3 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_concentrator.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_concentrator.c
@@ -1,21 +1,21 @@
 /**
- ******************************************************************************
- * @file    demo_concentrator.c
- * @author  MCD Application Team
- * @brief   Concentrator behavior module for STM32WL Concentrator Demo.
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under Ultimate Liberty license
- * SLA0044, the "License"; You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- *                             www.st.com/SLA0044
- *
- ******************************************************************************
- */
+  ******************************************************************************
+  * @file    demo_concentrator.c
+  * @author  MCD Application Team
+  * @brief   Concentrator behavior module for STM32WL Concentrator Demo.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
 
 #include "demo_concentrator.h"
 #include "demo_radio_utils.h"
@@ -37,10 +37,15 @@
 #define CONC_BEACON_OFFSET_TRIM         ((int32_t)0)    /*[ms]*/
 
 /**
- *
-*/
+  *
+  */
 #define PRBS9_INIT ((uint16_t) 0x0055);
 
+/**
+  * @brief Max size of the data that can be received
+  */
+#define MAX_RECEIVED_DATA 255
+
 /* Private global variables --------------------------------------------------*/
 
 uint16_t prbs9_val;
@@ -61,15 +66,15 @@ typedef struct
   UTIL_TIMER_Object_t LedTimer;        /**<Timer which turns LEDs off*/
   UTIL_TIMER_Object_t LedEffect;        /**<Timer which blink leds after other*/
   UTIL_TIMER_Object_t StartTimer;      /**<Timer which starts LPTIM at a random offset*/
-  CONC_Sensor_t Sensors[DEMO_SLOT_NUMBER-2];  /**<Storage for all connected sensors*/
-  CONC_Sensor_t ShadowSensors[DEMO_SLOT_NUMBER-2];  /**<Storage for planned coding changes*/
+  CONC_Sensor_t Sensors[DEMO_SLOT_NUMBER - 2]; /**<Storage for all connected sensors*/
+  CONC_Sensor_t ShadowSensors[DEMO_SLOT_NUMBER - 2]; /**<Storage for planned coding changes*/
   uint32_t SlotCounter;         /**<Count slots, starting with 0=beacon and 1=sync*/
   uint32_t PeriodCounter;       /**<Counts periods from BEACON_ON*/
   uint32_t PseudorandomState;   /**<If hopping is used, it holds state of the generator*/
   uint32_t OccupiedNrLatch;     /**<Number of occupied slots sent in last Sync (not modified for predictable hopping)*/
   uint32_t BeaconLength;        /**<Length of the beacon packet [ms]*/
-  const DEMO_Region_t* Region;          /**<Region number used*/
-  const DEMO_Subregion_t* Subregion;    /**<Subregion number used*/
+  const DEMO_Region_t *Region;          /**<Region number used*/
+  const DEMO_Subregion_t *Subregion;    /**<Subregion number used*/
   bool Enable;                  /**<Set when beacon sending is enabled*/
   bool BeaconOk;                /**<Set if beacon was sent (not set if it failed due to LBT)*/
   bool SyncOk;                  /**<Set if sync was sent (not set if it failed due to LBT)*/
@@ -78,39 +83,39 @@ static CONC_Global_t CONC; /*Global variables of this module*/
 
 /* Private function declarations ---------------------------------------------*/
 
-static void StartLPTIM (void* context);
-static void LedsOff(void* context);
-static void LedsEffect(void* context);
+static void StartLPTIM(void *context);
+static void LedsOff(void *context);
+static void LedsEffect(void *context);
 static void LedBlink(Led_TypeDef Led);
-static void SendBeacon (void);
-static void SendSync (void);
-static void Receive (void);
-static void EvaluateLastPeriod (void);
+static void SendBeacon(void);
+static void SendSync(void);
+static void Receive(void);
+static void EvaluateLastPeriod(void);
 static uint32_t FindEui(uint32_t Eui);
-static uint32_t AddCodingChanges (uint8_t* Buf, uint32_t Len);
-void LPTIM1_IRQHandler (void);
-static void TxDone (void);
-static void TxTimeout (void);
-static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
-static void RxTimeout (void);
-static void RxError (void);
-static void FhssChangeChannel (uint8_t currentChannel);
-static void CadDone (bool channelActivityDetected);
-static void Prbs9Init( void );
-static uint8_t Prbs9Next( void );
+static uint32_t AddCodingChanges(uint8_t *Buf, uint32_t Len);
+void LPTIM1_IRQHandler(void);
+static void TxDone(void);
+static void TxTimeout(void);
+static void RxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
+static void RxTimeout(void);
+static void RxError(void);
+static void FhssChangeChannel(uint8_t currentChannel);
+static void CadDone(bool channelActivityDetected);
+static void Prbs9Init(void);
+static uint8_t Prbs9Next(void);
 
 /**
- * @brief Structure with handlers for radio events.
- */
+  * @brief Structure with handlers for radio events.
+  */
 static RadioEvents_t CONC_RadioEvents;
 
 /* Function definitions ------------------------------------------------------*/
 
 /**
- * @brief Initialize Concentrator but don't send anything yet.
- * @return zero on success, 1 - LSE fault, 2 - ARR set fault
- */
-int CONC_Init (void)
+  * @brief Initialize Concentrator but don't send anything yet.
+  * @return zero on success, 1 - LSE fault, 2 - ARR set fault
+  */
+int CONC_Init(void)
 {
   int timeout;
   uint32_t random;
@@ -140,7 +145,7 @@ int CONC_Init (void)
 
   /*Init LED timer*/
   UTIL_TIMER_Create(&CONC.LedTimer, 125, UTIL_TIMER_ONESHOT, LedsOff, NULL);
-  
+
   UTIL_TIMER_Create(&CONC.LedEffect, 125, UTIL_TIMER_ONESHOT, LedsEffect, NULL);
   /*Start Led Effect*/
   UTIL_TIMER_Start(&CONC.LedEffect);
@@ -182,7 +187,7 @@ int CONC_Init (void)
       return 2; /*ARR register couldn't be set*/
     }
   }
-  
+
   Prbs9Init();
 
   /*Enable timer interrupt*/
@@ -200,9 +205,9 @@ int CONC_Init (void)
 }
 
 /**
- * @brief Start LPTIM at a random time.
- */
-static void StartLPTIM (void* context)
+  * @brief Start LPTIM at a random time.
+  */
+static void StartLPTIM(void *context)
 {
   UNUSED(context);
 
@@ -212,12 +217,12 @@ static void StartLPTIM (void* context)
 }
 
 /**
- * @brief Start sending beacons.
- * @param Region region number as index to CONC_Regions
- * @param Subregion subregion number as index to CONC_Regions[].subregions
- * @return zero on success
- */
-int CONC_StartBeacon (uint32_t Region, uint32_t Subregion)
+  * @brief Start sending beacons.
+  * @param Region region number as index to CONC_Regions
+  * @param Subregion subregion number as index to CONC_Regions[].subregions
+  * @return zero on success
+  */
+int CONC_StartBeacon(uint32_t Region, uint32_t Subregion)
 {
   if (CONC.Enable == true)
   {
@@ -235,9 +240,9 @@ int CONC_StartBeacon (uint32_t Region, uint32_t Subregion)
   }
   /*stop Led effect*/
   UTIL_TIMER_Stop(&CONC.LedEffect);
-  BSP_LED_Off( LED_GREEN);
-  BSP_LED_Off( LED_RED);
-  BSP_LED_Off( LED_BLUE);
+  BSP_LED_Off(LED_GREEN);
+  BSP_LED_Off(LED_RED);
+  BSP_LED_Off(LED_BLUE);
 
   /*Store Parameters*/
   CONC.Region = &(DEMO_Regions[Region]);
@@ -252,7 +257,7 @@ int CONC_StartBeacon (uint32_t Region, uint32_t Subregion)
 
   /*Reset all modulations and sensors*/
   CONC.PeriodCounter = 0;
-  for(int i = 0; i < (DEMO_SLOT_NUMBER - 2); i++)
+  for (int i = 0; i < (DEMO_SLOT_NUMBER - 2); i++)
   {
     DEMO_DefaultCoding(&(CONC.Sensors[i].Coding), i + 2, CONC.Region);
     CONC.Sensors[i].CodingApplied = true;       /*Default coding is already applied*/
@@ -273,9 +278,9 @@ int CONC_StartBeacon (uint32_t Region, uint32_t Subregion)
 }
 
 /**
- * @brief Stop sending beacons and forget all sensors.
- */
-void CONC_StopBeacon (void)
+  * @brief Stop sending beacons and forget all sensors.
+  */
+void CONC_StopBeacon(void)
 {
   CONC.Enable = false; /*Stop sending beacons*/
 
@@ -286,38 +291,38 @@ void CONC_StopBeacon (void)
 }
 
 /**
- * @brief Get whether beacon sending is enabled.
- * @return true when beacons are sent
- */
-bool CONC_IsEnabled (void)
+  * @brief Get whether beacon sending is enabled.
+  * @return true when beacons are sent
+  */
+bool CONC_IsEnabled(void)
 {
   return CONC.Enable;
 }
 
 /**
- * @brief Change modulation for one sensor to LoRa.
- * @param eui device whose modulation is to change
- * @param param LoRa modulation parameters
- * @param test_only if true, only respond and do not use the modulation
- * @return CONC_SETMOD_Ok when successfully added the modulation, the modulation will change after a while
- */
-CONC_SetModReturn_t CONC_SetModLora (uint32_t eui, const DEMO_coding_lora_t *param, bool test_only)
+  * @brief Change modulation for one sensor to LoRa.
+  * @param eui device whose modulation is to change
+  * @param param LoRa modulation parameters
+  * @param test_only if true, only respond and do not use the modulation
+  * @return CONC_SETMOD_Ok when successfully added the modulation, the modulation will change after a while
+  */
+CONC_SetModReturn_t CONC_SetModLora(uint32_t eui, const DEMO_coding_lora_t *param, bool test_only)
 {
   uint32_t slot_nr;             /*Slot number of the eui given*/
-  CONC_Sensor_t* shadow_sensor= NULL;        /*Sensor for eui given*/
+  CONC_Sensor_t *shadow_sensor = NULL;       /*Sensor for eui given*/
   uint32_t channel_nr;          /*Selected channel number*/
-  const DEMO_Channel_t* channel;      /*Iterator over available channels*/
+  const DEMO_Channel_t *channel;      /*Iterator over available channels*/
 
-  if(CONC.Enable == false)
+  if (CONC.Enable == false)
   {
     return CONC_SETMOD_Fail;
   }
 
-  if(test_only == false)
+  if (test_only == false)
   {
     /*Find the sensor*/
     slot_nr = FindEui(eui);
-    if(slot_nr == 0)
+    if (slot_nr == 0)
     {
       return CONC_SETMOD_EuiWrong;   /*Eui not found*/
     }
@@ -325,23 +330,23 @@ CONC_SetModReturn_t CONC_SetModLora (uint32_t eui, const DEMO_coding_lora_t *par
   }
 
   /*Check if the modulation is valid*/
-  for(channel_nr = 0; (channel_nr < CONC.Subregion->channels_n) && (channel_nr <= DEMO_HDR_CHAN_NR_MAX); channel_nr++)
+  for (channel_nr = 0; (channel_nr < CONC.Subregion->channels_n) && (channel_nr <= DEMO_HDR_CHAN_NR_MAX); channel_nr++)
   {
     channel = &(CONC.Subregion->channels[channel_nr]);
 
-    if(DEMO_BandwidthLora(param) <= channel->max_bw) /*Bandwidth fits*/
+    if (DEMO_BandwidthLora(param) <= channel->max_bw) /*Bandwidth fits*/
     {
       /*Calculate what is the maximal payload and how long is the packet*/
       uint32_t packet_time;
       uint32_t max_payload = DEMO_MaxPayloadLora(param, CONC.Subregion, &packet_time);
-      if(max_payload >= sizeof(DEMO_packet_sensor_header_t))   /*Modulation allows to send at least header*/
+      if (max_payload >= sizeof(DEMO_packet_sensor_header_t))  /*Modulation allows to send at least header*/
       {
         /*Calculate how many periods must be skipped to comply with duty cycle*/
         uint32_t period = (packet_time * channel->duty_cycle) / (DEMO_SLOT_NUMBER * 1000);
-        if(period <= DEMO_HDR_PARAM_PERIOD_MAX) /*Check that period is achievable*/
+        if (period <= DEMO_HDR_PARAM_PERIOD_MAX) /*Check that period is achievable*/
         {
           UTILS_ENTER_CRITICAL_SECTION();
-          if(test_only == false)
+          if (test_only == false)
           {
             /*Store the config*/
             shadow_sensor->Coding.hdr.data_lim = max_payload;
@@ -374,24 +379,24 @@ CONC_SetModReturn_t CONC_SetModLora (uint32_t eui, const DEMO_coding_lora_t *par
 }
 
 /**
- * @brief Change modulation for one sensor to FSK.
- * @param eui device whose modulation is to change
- * @param param FSK modulation parameters
- * @param test_only if true, only respond and do not use the modulation
- * @return CONC_SETMOD_Ok when successfully added the modulation, the modulation will change after a while
- */
-CONC_SetModReturn_t CONC_SetModFSK (uint32_t eui, const DEMO_coding_fsk_t *param, bool test_only)
+  * @brief Change modulation for one sensor to FSK.
+  * @param eui device whose modulation is to change
+  * @param param FSK modulation parameters
+  * @param test_only if true, only respond and do not use the modulation
+  * @return CONC_SETMOD_Ok when successfully added the modulation, the modulation will change after a while
+  */
+CONC_SetModReturn_t CONC_SetModFSK(uint32_t eui, const DEMO_coding_fsk_t *param, bool test_only)
 {
   uint32_t slot_nr;             /*Slot number of the eui given*/
-  CONC_Sensor_t* shadow_sensor= NULL;        /*Sensor for eui given*/
+  CONC_Sensor_t *shadow_sensor = NULL;       /*Sensor for eui given*/
   uint32_t channel_nr;          /*Selected channel number*/
-  const DEMO_Channel_t* channel;      /*Pointer to iterate over channels*/
+  const DEMO_Channel_t *channel;      /*Pointer to iterate over channels*/
 
-  if(test_only == false)
+  if (test_only == false)
   {
     /*Find the sensor*/
     slot_nr = FindEui(eui);
-    if(slot_nr == 0)
+    if (slot_nr == 0)
     {
       return CONC_SETMOD_EuiWrong;   /*Eui not found*/
     }
@@ -399,29 +404,29 @@ CONC_SetModReturn_t CONC_SetModFSK (uint32_t eui, const DEMO_coding_fsk_t *param
   }
 
   /*Check MSK limit*/
-  if((param->fdev * 4) < param->br)
+  if ((param->fdev * 4) < param->br)
   {
     return CONC_SETMOD_ModWrong;
   }
 
   /*Check if the modulation is valid*/
-  for(channel_nr = 0; (channel_nr < CONC.Subregion->channels_n) && (channel_nr <= DEMO_HDR_CHAN_NR_MAX); channel_nr++)
+  for (channel_nr = 0; (channel_nr < CONC.Subregion->channels_n) && (channel_nr <= DEMO_HDR_CHAN_NR_MAX); channel_nr++)
   {
     channel = &(CONC.Subregion->channels[channel_nr]);  /*Iterate over channels*/
 
-    if(DEMO_BandwidthFsk(param) <= channel->max_bw) /*Bandwidth fits*/
+    if (DEMO_BandwidthFsk(param) <= channel->max_bw) /*Bandwidth fits*/
     {
       /*Calculate what is the maximal payload and how long is the packet*/
       uint32_t packet_time;
       uint32_t max_payload = DEMO_MaxPayloadFsk(param, CONC.Subregion, &packet_time);
-      if(max_payload >= sizeof(DEMO_packet_sensor_header_t))      /*Modulation allows to send at least header*/
+      if (max_payload >= sizeof(DEMO_packet_sensor_header_t))     /*Modulation allows to send at least header*/
       {
         /*Calculate how many periods must be skipped to comply with duty cycle*/
         uint32_t period = (packet_time * channel->duty_cycle) / (DEMO_SLOT_NUMBER * 1000);
-        if(period <= DEMO_HDR_PARAM_PERIOD_MAX) /*Check that period is achievable*/
+        if (period <= DEMO_HDR_PARAM_PERIOD_MAX) /*Check that period is achievable*/
         {
           UTILS_ENTER_CRITICAL_SECTION();
-          if(test_only == false)
+          if (test_only == false)
           {
             /*Store the config*/
             shadow_sensor->Coding.hdr.data_lim = max_payload;
@@ -454,44 +459,44 @@ CONC_SetModReturn_t CONC_SetModFSK (uint32_t eui, const DEMO_coding_fsk_t *param
 }
 
 /**
- * @brief Turn all LEDs off.
- * Used as a timer callback.
- */
-static void LedsOff(void* context)
+  * @brief Turn all LEDs off.
+  * Used as a timer callback.
+  */
+static void LedsOff(void *context)
 {
   UNUSED(context);
   BSP_LED_Off(LED_GREEN);
   BSP_LED_Off(LED_BLUE);
 }
 
-static void LedsEffect(void* context)
+static void LedsEffect(void *context)
 {
   UNUSED(context);
-  if (1U==BSP_LED_GetState(LED_BLUE))
+  if (1U == BSP_LED_GetState(LED_BLUE))
   {
-    BSP_LED_Off( LED_BLUE);
-    BSP_LED_On( LED_GREEN);
-  } 
-  else if(1U==BSP_LED_GetState(LED_GREEN))
+    BSP_LED_Off(LED_BLUE);
+    BSP_LED_On(LED_GREEN);
+  }
+  else if (1U == BSP_LED_GetState(LED_GREEN))
   {
-    BSP_LED_Off( LED_GREEN);
-    BSP_LED_On( LED_RED);
+    BSP_LED_Off(LED_GREEN);
+    BSP_LED_On(LED_RED);
   }
-  else if (1U==BSP_LED_GetState(LED_RED))
+  else if (1U == BSP_LED_GetState(LED_RED))
   {
-    BSP_LED_Off( LED_RED);
-    BSP_LED_On( LED_BLUE);
+    BSP_LED_Off(LED_RED);
+    BSP_LED_On(LED_BLUE);
   }
   else
   {
-    BSP_LED_On( LED_BLUE);
+    BSP_LED_On(LED_BLUE);
   }
   UTIL_TIMER_Start(&CONC.LedEffect);
 }
 /**
- * @brief Do a short blink with a LED.
- * @param Led which LED
- */
+  * @brief Do a short blink with a LED.
+  * @param Led which LED
+  */
 static void LedBlink(Led_TypeDef Led)
 {
   BSP_LED_On(Led);
@@ -499,11 +504,11 @@ static void LedBlink(Led_TypeDef Led)
 }
 
 /**
- * @brief Send beacon.
- */
-static void SendBeacon (void)
+  * @brief Send beacon.
+  */
+static void SendBeacon(void)
 {
-  if(CONC.Subregion->hopping == true)
+  if (CONC.Subregion->hopping == true)
   {
     /*Generate seed,*/
     CONC.Beacon.seed = Prbs9Next();
@@ -536,24 +541,24 @@ static void SendBeacon (void)
   }
   else
   {
-      Radio.SetTxConfig(MODEM_LORA, /*Beacon is always LoRa*/
-                    CONC.Subregion->beacon_power, /*Power*/
-                    0, /*FSK parameter*/
-                    DEMO_BW_TO_SETTXCONFIG(CONC.Region->beacon_bw), /*Bandwidth*/
-                    CONC.Region->beacon_sf, /*Spreading factor*/
-                    DEMO_DEFAULT_CR, /*Coderate 4/5*/
-                    36, /*Preamble length*/
-                    1, /*Fixed length*/
-                    0, /*CRC not used*/
-                    0, 0, /*No hopping*/
-                    0, /*IQ not inverted*/
-                    1000); /*Tx timeout is not needed*/
+    Radio.SetTxConfig(MODEM_LORA, /*Beacon is always LoRa*/
+                      CONC.Subregion->beacon_power, /*Power*/
+                      0, /*FSK parameter*/
+                      DEMO_BW_TO_SETTXCONFIG(CONC.Region->beacon_bw), /*Bandwidth*/
+                      CONC.Region->beacon_sf, /*Spreading factor*/
+                      DEMO_DEFAULT_CR, /*Coderate 4/5*/
+                      36, /*Preamble length*/
+                      1, /*Fixed length*/
+                      0, /*CRC not used*/
+                      0, 0, /*No hopping*/
+                      0, /*IQ not inverted*/
+                      1000); /*Tx timeout is not needed*/
   }
   /*Listen Before Talk is required*/
   if (CONC.Subregion->lbt)
   {
-    if(DEMO_WaitForFreeChannel(MODEM_LORA, CONC.Subregion->lbt_rssi, CONC.Subregion->lbt_time,
-                               DEMO_MAX_END_OF_PACKET_TX - CONC.Region->beacon_length) == false)
+    if (DEMO_WaitForFreeChannel(MODEM_LORA, CONC.Subregion->lbt_rssi, CONC.Subregion->lbt_time,
+                                DEMO_MAX_END_OF_PACKET_TX - CONC.Region->beacon_length) == false)
     {
       Radio.Sleep();
       APP_LOG(TS_ON, VLEVEL_L, "Beacon transmission failed\n\r");
@@ -563,30 +568,30 @@ static void SendBeacon (void)
 
   /*Send*/
   CONC.Beacon.offset = (int32_t)CONC.Region->beacon_length      /*Mark end of the packet*/
-      + (int32_t)CONC_LPTIM_TO_MS(LL_LPTIM_GetCounter(LPTIM1))  /*Delay caused by config and LBT*/
-      + CONC_BEACON_OFFSET_TRIM;                                /*Configurable trim*/
+                       + (int32_t)CONC_LPTIM_TO_MS(LL_LPTIM_GetCounter(LPTIM1))  /*Delay caused by config and LBT*/
+                       + CONC_BEACON_OFFSET_TRIM;                                /*Configurable trim*/
   CONC.Beacon.sum = 0;  /*Set to 0 before summing bytes*/
-  uint8_t bytesum = ((uint8_t*)&CONC.Beacon)[0] + ((uint8_t*)&CONC.Beacon)[1]
-                  + ((uint8_t*)&CONC.Beacon)[2] + ((uint8_t*)&CONC.Beacon)[3];
-  CONC.Beacon.sum = - ((bytesum + (bytesum >> 4)) & 0xf);   //Add negative value of primitive checksum
+  uint8_t bytesum = ((uint8_t *)&CONC.Beacon)[0] + ((uint8_t *)&CONC.Beacon)[1]
+                    + ((uint8_t *)&CONC.Beacon)[2] + ((uint8_t *)&CONC.Beacon)[3];
+  CONC.Beacon.sum = - ((bytesum + (bytesum >> 4)) & 0xf);   /* Add negative value of primitive checksum */
 
-  Radio.Send((uint8_t*)&CONC.Beacon, 4); /*Send beacon*/
+  Radio.Send((uint8_t *)&CONC.Beacon, 4); /*Send beacon*/
 
   EvaluateLastPeriod(); /*Check all sensors and update occupied mask before Sync*/
-  
-  APP_LOG(TS_ON, VLEVEL_H, "Beacon Tx at %d\n\r",(CONC.Region->beacon_freq));
+
+  APP_LOG(TS_ON, VLEVEL_H, "Beacon Tx at %d\n\r", (CONC.Region->beacon_freq));
   /*Notify*/
   BSP_LED_On(LED_RED);
 }
 
 /**
- * @brief Send sync.
- */
-static void SendSync (void)
+  * @brief Send sync.
+  */
+static void SendSync(void)
 {
-  const DEMO_Channel_t* channel;
+  const DEMO_Channel_t *channel;
 
-  if(CONC.Subregion->hopping == true)
+  if (CONC.Subregion->hopping == true)
   {
     /*Select one of available channels, depending only on seed*/
     channel = &(CONC.Subregion->channels[CONC.Beacon.seed % CONC.Subregion->channels_n]);
@@ -623,8 +628,8 @@ static void SendSync (void)
     DEMO_coding_lora_t sync_coding = {.de = 0, .cr = 1, .bw = CONC.Region->beacon_bw, .sf = CONC.Region->beacon_sf};
     uint32_t packet_length = DEMO_TimeOnAirLora(&sync_coding, 4 + codings_len);
 
-    if(DEMO_WaitForFreeChannel(MODEM_LORA, CONC.Subregion->lbt_rssi, CONC.Subregion->lbt_time,
-                               DEMO_MAX_END_OF_PACKET_TX - packet_length) == false)
+    if (DEMO_WaitForFreeChannel(MODEM_LORA, CONC.Subregion->lbt_rssi, CONC.Subregion->lbt_time,
+                                DEMO_MAX_END_OF_PACKET_TX - packet_length) == false)
     {
       Radio.Sleep();
       APP_LOG(TS_ON, VLEVEL_L, "Sync transmission failed\n\r");
@@ -634,28 +639,28 @@ static void SendSync (void)
 
   /*Send*/
   CONC.Sync.seed = CONC.Beacon.seed;    /*Repeat the seed*/
-  Radio.Send((uint8_t*)&CONC.Sync, 4 + codings_len);
+  Radio.Send((uint8_t *)&CONC.Sync, 4 + codings_len);
 
   /*Notify*/
   BSP_LED_On(LED_RED);
-  
-  APP_LOG(TS_ON, VLEVEL_H, "Sync Tx at %d\n\r",(channel->freq));
+
+  APP_LOG(TS_ON, VLEVEL_H, "Sync Tx at %d\n\r", (channel->freq));
 }
 
 /**
- * @brief Set receiver and listen for sensor.
- * @note This function doesn't use Radio.SetRxConfig() and Radio.SetTxConfig() because it allows only LoRaWAN
- *    modulation and it doesn't use Radio.Rx() because it highly depends on SetRxConfig.
- */
-static void Receive (void)
+  * @brief Set receiver and listen for sensor.
+  * @note This function doesn't use Radio.SetRxConfig() and Radio.SetTxConfig() because it allows only LoRaWAN
+  *    modulation and it doesn't use Radio.Rx() because it highly depends on SetRxConfig.
+  */
+static void Receive(void)
 {
-  const DEMO_Channel_t* channel;
+  const DEMO_Channel_t *channel;
   PacketParams_t pck_params;
   ModulationParams_t mod_params;
   CONC_Sensor_t *sensor = &(CONC.Sensors[CONC.SlotCounter - 2]);        /*Make the below code less confusing*/
 
   /*Select channel*/
-  if(CONC.Subregion->hopping == true)
+  if (CONC.Subregion->hopping == true)
   {
     /*Get number of used channels*/
     uint32_t channel_count = CONC.Subregion->channels_n;       /*Limited by number of existing channels*/
@@ -681,7 +686,7 @@ static void Receive (void)
     mod_params.PacketType = PACKET_TYPE_LORA;
     mod_params.Params.LoRa.SpreadingFactor = DEMO_GetSpreadingFactor(&(sensor->Coding.lora));
     mod_params.Params.LoRa.Bandwidth = DEMO_GetBandwidth(&(sensor->Coding.lora));
-    mod_params.Params.LoRa.CodingRate= DEMO_GetCoderate(&(sensor->Coding.lora));
+    mod_params.Params.LoRa.CodingRate = DEMO_GetCoderate(&(sensor->Coding.lora));
     mod_params.Params.LoRa.LowDatarateOptimize = sensor->Coding.lora.de;
 
     pck_params.PacketType = PACKET_TYPE_LORA;
@@ -694,7 +699,7 @@ static void Receive (void)
       pck_params.Params.LoRa.PreambleLength = 8;
     }
     pck_params.Params.LoRa.HeaderType = LORA_PACKET_VARIABLE_LENGTH;
-    pck_params.Params.LoRa.PayloadLength = RADIO_RX_BUF_SIZE;
+    pck_params.Params.LoRa.PayloadLength = MAX_RECEIVED_DATA;
     pck_params.Params.LoRa.CrcMode = LORA_CRC_ON;
     pck_params.Params.LoRa.InvertIQ = LORA_IQ_NORMAL;
 
@@ -722,7 +727,7 @@ static void Receive (void)
     pck_params.Params.Gfsk.SyncWordLength = (4 << 3); /*Convert byte into bit*/
     pck_params.Params.Gfsk.AddrComp = RADIO_ADDRESSCOMP_FILT_OFF;
     pck_params.Params.Gfsk.HeaderType = RADIO_PACKET_VARIABLE_LENGTH;
-    pck_params.Params.Gfsk.PayloadLength = RADIO_RX_BUF_SIZE;
+    pck_params.Params.Gfsk.PayloadLength = MAX_RECEIVED_DATA;
     pck_params.Params.Gfsk.CrcLength = RADIO_CRC_2_BYTES_CCIT;
     pck_params.Params.Gfsk.DcFree = RADIO_DC_FREEWHITENING;
 
@@ -743,9 +748,9 @@ static void Receive (void)
                          IRQ_RADIO_NONE);
 
   /*Set DBG pin PB12*/
-#ifdef LET_SUBGHZ_MW_USING_DGB_LINE1_PIN
-  DBG_GPIO_SET_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
-#endif
+#ifdef LET_SUBGHZ_MW_USING_PROBE_LINE1_PIN
+  PROBE_GPIO_SET_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
+#endif /* LET_SUBGHZ_MW_USING_PROBE_LINE1_PIN */
 
   /*Receive*/
   SUBGRF_SetSwitch(0, RFSWITCH_RX); /*Set RF switch*/
@@ -753,26 +758,26 @@ static void Receive (void)
 }
 
 /**
- * @brief Evaluate last period and update occupied mask.
- * Check all sensors and loose those who do not communicate.
- * Count occupied slots.
- * Apply coding changes for the Sync which will come just now.
- */
-static void EvaluateLastPeriod (void)
+  * @brief Evaluate last period and update occupied mask.
+  * Check all sensors and loose those who do not communicate.
+  * Count occupied slots.
+  * Apply coding changes for the Sync which will come just now.
+  */
+static void EvaluateLastPeriod(void)
 {
   uint32_t slot_nr;             /*Slot number*/
-  CONC_Sensor_t* sensor;        /*Iterate over connected sensors*/
-  CONC_Sensor_t* shadow_sensor;        /*Pointer to a temporary storage of coding changes*/
+  CONC_Sensor_t *sensor;        /*Iterate over connected sensors*/
+  CONC_Sensor_t *shadow_sensor;        /*Pointer to a temporary storage of coding changes*/
 
   CONC.OccupiedNrLatch = 0;
-  for(slot_nr = 2; slot_nr < DEMO_SLOT_NUMBER; slot_nr++)
+  for (slot_nr = 2; slot_nr < DEMO_SLOT_NUMBER; slot_nr++)
   {
-    if(CONC.Sync.occupied & (1 << slot_nr))     /*Slot is occupied*/
+    if (CONC.Sync.occupied & (1 << slot_nr))    /*Slot is occupied*/
     {
-      sensor = &(CONC.Sensors[slot_nr -2]);     /*Iterate over connected sensors*/
+      sensor = &(CONC.Sensors[slot_nr - 2]);    /*Iterate over connected sensors*/
       shadow_sensor = &(CONC.ShadowSensors[slot_nr - 2]);        /*Get respective shadow sensor*/
 
-      if(sensor->Missed > (DEMO_SENSOR_MISS_LIMIT * (sensor->Coding.hdr.period + 1)))      /*Missed too many beacons*/
+      if (sensor->Missed > (DEMO_SENSOR_MISS_LIMIT * (sensor->Coding.hdr.period + 1)))     /*Missed too many beacons*/
       {
         CONC.Sync.occupied &= ~(1 << slot_nr);  /*Kick the sensor out*/
         CONC_Report_LOST(sensor->Eui);  /*Report lost sensor*/
@@ -792,7 +797,7 @@ static void EvaluateLastPeriod (void)
         CONC.OccupiedNrLatch++;      /*Count number of occupied slots*/
         sensor->Missed++; /*Increase missed counter now, it is cleared on each reception*/
 
-        if(shadow_sensor->CodingApplied == false)        /*There is a modulation change to apply*/
+        if (shadow_sensor->CodingApplied == false)       /*There is a modulation change to apply*/
         {
           /*Apply the new coding, to be sent soon in Sync*/
           sensor->Coding.hdr = shadow_sensor->Coding.hdr;
@@ -809,9 +814,9 @@ static void EvaluateLastPeriod (void)
   APP_LOG(TS_ON, VLEVEL_M, "Period %u, occupied = bs", CONC.PeriodCounter++);
   char oc_str[17] = "..............\r\n";
   uint16_t oc_shift = CONC.Sync.occupied >> 2;
-  for(int i = 0; i < (DEMO_SLOT_NUMBER - 2); oc_shift >>= 1, i++)
+  for (int i = 0; i < (DEMO_SLOT_NUMBER - 2); oc_shift >>= 1, i++)
   {
-    if(oc_shift & 0x1)
+    if (oc_shift & 0x1)
     {
       oc_str[i] = '0';
     }
@@ -820,15 +825,15 @@ static void EvaluateLastPeriod (void)
 }
 
 /**
- * @brief Find eui in list of connected sensors.
- * @param Eui sensor's address
- * @return slot on which the sensor is connected or 0 if it is unknown
- */
+  * @brief Find eui in list of connected sensors.
+  * @param Eui sensor's address
+  * @return slot on which the sensor is connected or 0 if it is unknown
+  */
 static uint32_t FindEui(uint32_t Eui)
 {
   int i;
 
-  for(i = 0; i < (DEMO_SLOT_NUMBER - 2); i++)
+  for (i = 0; i < (DEMO_SLOT_NUMBER - 2); i++)
   {
     if ((CONC.Sync.occupied & (1 << (i + 2)))   /*This slot is occupied*/
         && (CONC.Sensors[i].Eui == Eui))        /*Eui fits*/
@@ -841,16 +846,16 @@ static uint32_t FindEui(uint32_t Eui)
 }
 
 /**
- * @brief Add coding changes to a buffer.
- * @param buf where to write the changes
- * @param len available length
- * @return number of bytes used
- */
-static uint32_t AddCodingChanges (uint8_t* Buf, uint32_t Len)
+  * @brief Add coding changes to a buffer.
+  * @param buf where to write the changes
+  * @param len available length
+  * @return number of bytes used
+  */
+static uint32_t AddCodingChanges(uint8_t *Buf, uint32_t Len)
 {
   uint32_t offset; /*Current offset in Buf*/
   uint32_t slot_nr; /*Slot index*/
-  CONC_Sensor_t* sensor; /*Sensor iterator*/
+  CONC_Sensor_t *sensor; /*Sensor iterator*/
 
   for (slot_nr = 2, offset = 0; slot_nr < DEMO_SLOT_NUMBER; slot_nr++)
   {
@@ -870,8 +875,8 @@ static uint32_t AddCodingChanges (uint8_t* Buf, uint32_t Len)
 
       DEMO_coding_connect_t connect =
       {
-          .mark = DEMO_HDR_CONNECT_MARK,
-          .slot = sensor->Coding.hdr.slot,
+        .mark = DEMO_HDR_CONNECT_MARK,
+        .slot = sensor->Coding.hdr.slot,
       };
       memcpy(&(Buf[offset]), &connect, sizeof(DEMO_coding_connect_t));
       offset += sizeof(DEMO_coding_connect_t);
@@ -912,10 +917,10 @@ static uint32_t AddCodingChanges (uint8_t* Buf, uint32_t Len)
 }
 
 /**
- * @brief LPTIM autoreload interrupt handler.
- * This is launched each second to mark start of a slot.
- */
-void LPTIM1_IRQHandler (void)
+  * @brief LPTIM autoreload interrupt handler.
+  * This is launched each second to mark start of a slot.
+  */
+void LPTIM1_IRQHandler(void)
 {
   LL_LPTIM_ClearFLAG_ARRM(LPTIM1);
 
@@ -926,10 +931,10 @@ void LPTIM1_IRQHandler (void)
     /*Start of period, clear OKs*/
     CONC.BeaconOk = false;
     CONC.SyncOk = false;
-    
-    HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_SET);
-    HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-    
+
+    PROBE_GPIO_WRITE(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_SET);
+    PROBE_GPIO_WRITE(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+
   }
   else
   {
@@ -939,20 +944,20 @@ void LPTIM1_IRQHandler (void)
   /*Do something when slot starts*/
   if (CONC.Enable)
   {
-    if(CONC.SlotCounter == 0) /*Time to send Beacon*/
+    if (CONC.SlotCounter == 0) /*Time to send Beacon*/
     {
       SendBeacon();
     }
-    else if(CONC.SlotCounter == 1) /*Time to send Sync*/
+    else if (CONC.SlotCounter == 1) /*Time to send Sync*/
     {
-      if(CONC.BeaconOk == true)   /*No point sending Sync if Beacon wasn't sent*/
+      if (CONC.BeaconOk == true)  /*No point sending Sync if Beacon wasn't sent*/
       {
         SendSync();
       }
     }
     else /*Receive for sensors*/
     {
-      if(CONC.SyncOk == true)      /*No point receiving if Sync wasn't sent properly*/
+      if (CONC.SyncOk == true)     /*No point receiving if Sync wasn't sent properly*/
       {
         Receive();
       }
@@ -966,11 +971,11 @@ void LPTIM1_IRQHandler (void)
 }
 
 /*!
- * \brief  Tx Done callback prototype.
- */
-static void TxDone (void)
+  * \brief  Tx Done callback prototype.
+  */
+static void TxDone(void)
 {
-  if(CONC.Enable == true)
+  if (CONC.Enable == true)
   {
     /*Set radio to idle state and wait for next slot*/
     Radio.Standby();
@@ -992,26 +997,26 @@ static void TxDone (void)
 }
 
 /*!
- * \brief  Tx Timeout callback prototype.
- */
-static void TxTimeout (void)
+  * \brief  Tx Timeout callback prototype.
+  */
+static void TxTimeout(void)
 {
   BSP_LED_Off(LED_RED);
 }
 
 /*!
- * \brief Rx Done callback prototype.
- *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
- *                     FSK : N/A ( set to 0 )
- *                     LoRa: SNR value in dB
- */
-static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
+  * \brief Rx Done callback prototype.
+  *
+  * \param [IN] payload Received buffer pointer
+  * \param [IN] size    Received buffer size
+  * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
+  * \param [IN] snr     Raw SNR value given by the radio hardware
+  *                     FSK : N/A ( set to 0 )
+  *                     LoRa: SNR value in dB
+  */
+static void RxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
 {
-  if(CONC.Enable == true)
+  if (CONC.Enable == true)
   {
     /*Set radio to idle state and wait for next slot*/
     Radio.Standby();
@@ -1028,7 +1033,7 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
     DEMO_packet_sensor_header_t header;
     memcpy(&header, payload, sizeof(DEMO_packet_sensor_header_t)); /*Copy payload header to sensor's packet*/
 
-    CONC_Sensor_t* sensor = &(CONC.Sensors[CONC.SlotCounter - 2]); /*Look up this slot's sensor*/
+    CONC_Sensor_t *sensor = &(CONC.Sensors[CONC.SlotCounter - 2]); /*Look up this slot's sensor*/
 
     if (CONC.Sync.occupied & (1 << CONC.SlotCounter)) /*Slot is already occupied*/
     {
@@ -1037,11 +1042,11 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
         return;
       }
 
-      if(sensor->ConnectVerified == false)
+      if (sensor->ConnectVerified == false)
       {
         sensor->ConnectVerified = true;
       }
-      if(sensor->CodingApplied == false)
+      if (sensor->CodingApplied == false)
       {
         sensor->CodingApplied = true; /*Modulation was successfully changed*/
         CONC_Report_MOD_OK(header.eui); /*Report to console*/
@@ -1054,7 +1059,7 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
       if (already_in >= 2) /*This sensor is already connected in different slot*/
       {
         CONC.Sensors[already_in - 2].ConnectVerified = false;      /*Switch the eui to that slot*/
-        if(DEMO_IsCodingDefault(&(CONC.Sensors[already_in - 2].Coding), CONC.Region) != true)    /*Coding was changed*/
+        if (DEMO_IsCodingDefault(&(CONC.Sensors[already_in - 2].Coding), CONC.Region) != true)   /*Coding was changed*/
         {
           CONC.Sensors[already_in - 2].CodingApplied = false;   /*Reapply coding*/
         }
@@ -1071,7 +1076,7 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
 
     /*Report to console*/
     CONC_Report_RCV(&header, rssi, snr,
-                    ((uint8_t*)payload) + sizeof(DEMO_packet_sensor_header_t),
+                    ((uint8_t *)payload) + sizeof(DEMO_packet_sensor_header_t),
                     size - sizeof(DEMO_packet_sensor_header_t));
 
     LedBlink(LED_BLUE);
@@ -1083,51 +1088,51 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
 }
 
 /*!
- * \brief  Rx Timeout callback prototype.
- */
-static void RxTimeout (void){}
+  * \brief  Rx Timeout callback prototype.
+  */
+static void RxTimeout(void) {}
 
 /*!
- * \brief Rx Error callback prototype.
- */
-static void RxError (void){}
+  * \brief Rx Error callback prototype.
+  */
+static void RxError(void) {}
 
 /*!
- * \brief  FHSS Change Channel callback prototype.
- *
- * \param [IN] currentChannel   Index number of the current channel
- */
-static void FhssChangeChannel (uint8_t currentChannel)
+  * \brief  FHSS Change Channel callback prototype.
+  *
+  * \param [IN] currentChannel   Index number of the current channel
+  */
+static void FhssChangeChannel(uint8_t currentChannel)
 {
   UNUSED(currentChannel);
 }
 
 /*!
- * \brief CAD Done callback prototype.
- *
- * \param [IN] channelDetected    Channel Activity detected during the CAD
- */
-static void CadDone ( bool channelActivityDetected)
+  * \brief CAD Done callback prototype.
+  *
+  * \param [IN] channelDetected    Channel Activity detected during the CAD
+  */
+static void CadDone(bool channelActivityDetected)
 {
   UNUSED(channelActivityDetected);
 }
 
 /**
- * \brief Initialise the PRBS9 generator
- */
-static void Prbs9Init( void )
+  * \brief Initialise the PRBS9 generator
+  */
+static void Prbs9Init(void)
 {
-  prbs9_val= PRBS9_INIT;
+  prbs9_val = PRBS9_INIT;
 }
 
 /**
- * \brief Returns the next number from PRBS9 generator
- *
- * \return new PRBS number
- */
-static uint8_t Prbs9Next( void )
+  * \brief Returns the next number from PRBS9 generator
+  *
+  * \return new PRBS number
+  */
+static uint8_t Prbs9Next(void)
 {
   int newbit = (((prbs9_val >> 8) ^ (prbs9_val >> 4)) & 1);
   prbs9_val = ((prbs9_val << 1) | newbit) & 0x01ff;
-  return (uint8_t) (prbs9_val&0xFF);
+  return (uint8_t)(prbs9_val & 0xFF);
 }
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_concentrator.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_concentrator.h
index a6f47106..dd4fb7e0 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_concentrator.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_concentrator.h
@@ -30,33 +30,33 @@ extern "C" {
 
 
 /**
- * @brief Initialize Concentrator but don't send anything yet.
- * @return zero on success, 1 - LSE fault, 2 - ARR set fault
- */
+  * @brief Initialize Concentrator but don't send anything yet.
+  * @return zero on success, 1 - LSE fault, 2 - ARR set fault
+  */
 int CONC_Init(void);
 
 /**
- * @brief Start sending beacons.
- * @param Region region number as index to CONC_Regions
- * @param Subregion subregion number as index to CONC_Regions[].subregions
- * @return zero on success
- */
+  * @brief Start sending beacons.
+  * @param Region region number as index to CONC_Regions
+  * @param Subregion subregion number as index to CONC_Regions[].subregions
+  * @return zero on success
+  */
 int CONC_StartBeacon(uint32_t Region, uint32_t Subregion);
 
 /**
- * @brief Stop sending beacons and forget all sensors.
- */
+  * @brief Stop sending beacons and forget all sensors.
+  */
 void CONC_StopBeacon(void);
 
 /**
- * @brief Get whether beacon sending is enabled.
- * @return true when beacons are sent
- */
+  * @brief Get whether beacon sending is enabled.
+  * @return true when beacons are sent
+  */
 bool CONC_IsEnabled(void);
 
 /**
- * @brief Return values from CONC_SetModXxxx().
- */
+  * @brief Return values from CONC_SetModXxxx().
+  */
 typedef enum
 {
   CONC_SETMOD_Ok = 0,       /**< CONC_SETMOD_Ok modulation accepted*/
@@ -67,22 +67,22 @@ typedef enum
 } CONC_SetModReturn_t;
 
 /**
- * @brief Change modulation for one sensor to LoRa.
- * @param eui device whose modulation is to change
- * @param param LoRa modulation parameters
- * @param test_only if true, only respond and do not use the modulation
- * @return CONC_SETMOD_Ok when successfully added the modulation, the modulation will change after a while
- */
-CONC_SetModReturn_t CONC_SetModLora (uint32_t eui, const DEMO_coding_lora_t *param, bool test_only);
+  * @brief Change modulation for one sensor to LoRa.
+  * @param eui device whose modulation is to change
+  * @param param LoRa modulation parameters
+  * @param test_only if true, only respond and do not use the modulation
+  * @return CONC_SETMOD_Ok when successfully added the modulation, the modulation will change after a while
+  */
+CONC_SetModReturn_t CONC_SetModLora(uint32_t eui, const DEMO_coding_lora_t *param, bool test_only);
 
 /**
- * @brief Change modulation for one sensor to FSK.
- * @param eui device whose modulation is to change
- * @param param FSK modulation parameters
- * @param test_only if true, only respond and do not use the modulation
- * @return CONC_SETMOD_Ok when successfully added the modulation, the modulation will change after a while
- */
-CONC_SetModReturn_t CONC_SetModFSK (uint32_t eui, const DEMO_coding_fsk_t *param, bool test_only);
+  * @brief Change modulation for one sensor to FSK.
+  * @param eui device whose modulation is to change
+  * @param param FSK modulation parameters
+  * @param test_only if true, only respond and do not use the modulation
+  * @return CONC_SETMOD_Ok when successfully added the modulation, the modulation will change after a while
+  */
+CONC_SetModReturn_t CONC_SetModFSK(uint32_t eui, const DEMO_coding_fsk_t *param, bool test_only);
 
 
 #ifdef __cplusplus
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_report.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_report.c
index 9c2cd6b5..ac5d6cd3 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_report.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_report.c
@@ -26,37 +26,37 @@
 /**Make value positive*/
 #define CONC_ABS_INT(a)                 (((a) >= 0) ? (a) : (-1 * (a)))
 
-static bool CheckAndUpdateLength(uint32_t* DataLen, uint32_t Size, bool ErrorAnyway, char* ErrorStr);
-static void Report_1_0_RCV(const DEMO_data_1_0_t* Data, uint32_t DataLen);
-static void Report_1_1_RCV(const DEMO_data_1_1_t* Data, uint32_t DataLen);
+static bool CheckAndUpdateLength(uint32_t *DataLen, uint32_t Size, bool ErrorAnyway, char *ErrorStr);
+static void Report_1_0_RCV(const DEMO_data_1_0_t *Data, uint32_t DataLen);
+static void Report_1_1_RCV(const DEMO_data_1_1_t *Data, uint32_t DataLen);
 
 /**
- * @brief Report lost sensor to console.
- * @param Eui sensor's address
- */
-void CONC_Report_LOST (uint32_t Eui)
+  * @brief Report lost sensor to console.
+  * @param Eui sensor's address
+  */
+void CONC_Report_LOST(uint32_t Eui)
 {
   APP_PPRINTF("AT+LOST=0x%08x\r\n", Eui);
 }
 
 /**
- * @brief Report successful modulation change to console.
- * @param Eui sensor's address
- */
-void CONC_Report_MOD_OK (uint32_t Eui)
+  * @brief Report successful modulation change to console.
+  * @param Eui sensor's address
+  */
+void CONC_Report_MOD_OK(uint32_t Eui)
 {
   APP_PPRINTF("AT+MOD_OK=0x%08x\r\n", Eui);
 }
 
 /**
- * @brief Check whether DataLen can fit element of size and subtract.
- * @param DataLen remaining bytes in buffer
- * @param Size size of the element that should be in buffer
- * @param ErrorAnyway If set, print the error string anyway
- * @param ErrorStr string printed when element doesn't fit or if ErrorAnyway
- * @return true if OK, false if element couldn't fit
- */
-static bool CheckAndUpdateLength(uint32_t* DataLen, uint32_t Size, bool ErrorAnyway, char* ErrorStr)
+  * @brief Check whether DataLen can fit element of size and subtract.
+  * @param DataLen remaining bytes in buffer
+  * @param Size size of the element that should be in buffer
+  * @param ErrorAnyway If set, print the error string anyway
+  * @param ErrorStr string printed when element doesn't fit or if ErrorAnyway
+  * @return true if OK, false if element couldn't fit
+  */
+static bool CheckAndUpdateLength(uint32_t *DataLen, uint32_t Size, bool ErrorAnyway, char *ErrorStr)
 {
   if (*DataLen < Size) /*Not enough data*/
   {
@@ -68,7 +68,7 @@ static bool CheckAndUpdateLength(uint32_t* DataLen, uint32_t Size, bool ErrorAny
   {
     *DataLen -= Size; /*Subtract element size*/
 
-    if(ErrorAnyway) /*Force error*/
+    if (ErrorAnyway) /*Force error*/
     {
       APP_PPRINTF(ErrorStr); /*Print error*/
       return false;
@@ -81,26 +81,26 @@ static bool CheckAndUpdateLength(uint32_t* DataLen, uint32_t Size, bool ErrorAny
 }
 
 /**
- * @brief Report received packet to console.
- * @param Header sensor packet header
- * @param Rssi RSSI value computed while receiving the frame [dBm]
- * @param Snr raw SNR value given by the radio hardware [dB]
- * @param Data sensor's measured sensor data
- * @param DataLen length of data [byte]
- */
-void CONC_Report_RCV(const DEMO_packet_sensor_header_t* Header,
+  * @brief Report received packet to console.
+  * @param Header sensor packet header
+  * @param Rssi RSSI value computed while receiving the frame [dBm]
+  * @param Snr raw SNR value given by the radio hardware [dB]
+  * @param Data sensor's measured sensor data
+  * @param DataLen length of data [byte]
+  */
+void CONC_Report_RCV(const DEMO_packet_sensor_header_t *Header,
                      int16_t Rssi, int8_t Snr,
-                     const uint8_t* Data, uint32_t DataLen)
+                     const uint8_t *Data, uint32_t DataLen)
 {
-  if(Header->version_major != VERSION_MAJOR)
+  if (Header->version_major != VERSION_MAJOR)
   {
     return;     /*Unknown major version*/
   }
 
-  APP_PPRINTF("AT+RCV=0x%08x,0x%02hhx,%hhu:%hhu,%hi,%hhi,",
-            Header->eui, Header->packet_cnt, Header->version_major, Header->version_minor, Rssi, Snr);
+  APP_PPRINTF("AT+RCV=0x%08x,0x%02x,%u:%u,%hi,%i,",
+              Header->eui, Header->packet_cnt, Header->version_major, Header->version_minor, Rssi, Snr);
 
-  switch(Header->version_minor)
+  switch (Header->version_minor)
   {
 #if ((VERSION_MAJOR != 1) || (VERSION_MINOR != 0))     /*Reserved for future*/
 #error "Version changed, check data format!"
@@ -110,21 +110,21 @@ void CONC_Report_RCV(const DEMO_packet_sensor_header_t* Header,
     case VERSION_MINOR:     /*Version X:X*/
     {
       DEMO_data_X_X_t data;
-      memcpy((uint8_t*)data, Data, DataLen);
+      memcpy((uint8_t *)data, Data, DataLen);
       Report_X_X_RCV(&data, DataLen);
     }
 #endif  /*Reserved for future*/
     case 0: /*v1:0*/
     {
       DEMO_data_1_0_t data;
-      memcpy((uint8_t*)(&data), Data, DataLen); /*Copy the payload into parseable structure*/
+      memcpy((uint8_t *)(&data), Data, DataLen); /*Copy the payload into parseable structure*/
       Report_1_0_RCV(&data, DataLen);   /*Print*/
       break;
     }
     case 1: /*v1:1*/
     {
       DEMO_data_1_1_t data;
-      memcpy((uint8_t*)(&data), Data, DataLen); /*Copy the payload into parseable structure*/
+      memcpy((uint8_t *)(&data), Data, DataLen); /*Copy the payload into parseable structure*/
       Report_1_1_RCV(&data, DataLen);   /*Print*/
       break;
     }
@@ -137,25 +137,25 @@ void CONC_Report_RCV(const DEMO_packet_sensor_header_t* Header,
 }
 
 /**
- * @brief Report received packet with version 1:0 to console.
- * @param Data sensor's measured sensor data of version 1:0
- * @param DataLen length of data [byte]
- */
-static void Report_1_0_RCV(const DEMO_data_1_0_t* Data, uint32_t DataLen)
+  * @brief Report received packet with version 1:0 to console.
+  * @param Data sensor's measured sensor data of version 1:0
+  * @param DataLen length of data [byte]
+  */
+static void Report_1_0_RCV(const DEMO_data_1_0_t *Data, uint32_t DataLen)
 {
-  bool voltage_present=true;
+  bool voltage_present = true;
 
   /*Temperature*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
-                          Data->temperature == DEMO_DATA_1_0_ERROR_TEMPERATURE, "E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
+                           Data->temperature == DEMO_DATA_1_0_ERROR_TEMPERATURE, "E,") == true)
   {
     APP_PPRINTF("%+hi.%02hu,", Data->temperature / 100, CONC_ABS_INT(Data->temperature % 100));
   }
 
   /*Voltage*/
-  if(voltage_present == true)
+  if (voltage_present == true)
   {
-    APP_PPRINTF("%hhu.%02hhu\r\n", Data->voltage / 20, (Data->voltage % 20) * 5);
+    APP_PPRINTF("%u.%02u\r\n", Data->voltage / 20, (Data->voltage % 20) * 5);
   }
   else
   {
@@ -164,42 +164,42 @@ static void Report_1_0_RCV(const DEMO_data_1_0_t* Data, uint32_t DataLen)
 }
 
 /**
- * @brief Report received packet with version 1:0 to console.
- * @param Data sensor's measured sensor data of version 1:0
- * @param DataLen length of data [byte]
- */
-static void Report_1_1_RCV(const DEMO_data_1_1_t* Data, uint32_t DataLen)
+  * @brief Report received packet with version 1:0 to console.
+  * @param Data sensor's measured sensor data of version 1:0
+  * @param DataLen length of data [byte]
+  */
+static void Report_1_1_RCV(const DEMO_data_1_1_t *Data, uint32_t DataLen)
 {
-  bool voltage_present=true;
+  bool voltage_present = true;
 
   /*Temperature*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
-                          Data->temperature == DEMO_DATA_1_1_ERROR_TEMPERATURE, "E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
+                           Data->temperature == DEMO_DATA_1_1_ERROR_TEMPERATURE, "E,") == true)
   {
     APP_PPRINTF("%+hi.%02hu,", Data->temperature / 100, CONC_ABS_INT(Data->temperature % 100));
   }
   /*sensors data board*/
   /*Pressure*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
-                          Data->pressure == DEMO_DATA_1_1_ERROR_PRESSURE, "E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
+                           Data->pressure == DEMO_DATA_1_1_ERROR_PRESSURE, "E,") == true)
   {
     APP_PPRINTF("%hu.%01hu,", Data->pressure / 10, Data->pressure % 10);
   }
 
   /*Yaw Pitch Roll*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint32_t),
-                          ((Data->yaw == DEMO_DATA_1_1_ERROR_YAW)
-                              || (Data->pitch == DEMO_DATA_1_1_ERROR_PITCH)
-                              || (Data->roll == DEMO_DATA_1_1_ERROR_ROLL)), "E:E:E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint32_t),
+                           ((Data->yaw == DEMO_DATA_1_1_ERROR_YAW)
+                            || (Data->pitch == DEMO_DATA_1_1_ERROR_PITCH)
+                            || (Data->roll == DEMO_DATA_1_1_ERROR_ROLL)), "E:E:E,") == true)
   {
     APP_PPRINTF("%+hi:%+hi:%+hi,", Data->yaw, Data->pitch, Data->roll);
   }
 
   /*Humidity*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint8_t),
-                          Data->humidity == DEMO_DATA_1_1_ERROR_HUMIDITY, "E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint8_t),
+                           Data->humidity == DEMO_DATA_1_1_ERROR_HUMIDITY, "E,") == true)
   {
-    APP_PPRINTF("%hhu.%01hhu,", Data->humidity / 2, 5 * (Data->humidity % 2));
+    APP_PPRINTF("%u.%01u,", Data->humidity / 2, 5 * (Data->humidity % 2));
   }
 
   /*Voltage, do not print now, keep it for the end*/
@@ -215,9 +215,9 @@ static void Report_1_1_RCV(const DEMO_data_1_1_t* Data, uint32_t DataLen)
   }
 
   /*Distance and Activity are in the same word*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint16_t), false, "E,E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint16_t), false, "E,E,") == true)
   {
-    if(Data->activity == DEMO_DATA_1_1_ERROR_ACTIVITY)
+    if (Data->activity == DEMO_DATA_1_1_ERROR_ACTIVITY)
     {
       APP_PPRINTF("E,");
     }
@@ -225,7 +225,7 @@ static void Report_1_1_RCV(const DEMO_data_1_1_t* Data, uint32_t DataLen)
     {
       APP_PPRINTF("%hu,", Data->activity);
     }
-    if(Data->distance == DEMO_DATA_1_1_ERROR_DISTANCE)
+    if (Data->distance == DEMO_DATA_1_1_ERROR_DISTANCE)
     {
       APP_PPRINTF("E,");
     }
@@ -236,35 +236,35 @@ static void Report_1_1_RCV(const DEMO_data_1_1_t* Data, uint32_t DataLen)
   }
 
   /*Step count*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint16_t), false, "E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint16_t), false, "E,") == true)
   {
     APP_PPRINTF("%hu,", Data->step_count);
   }
 
   /*Swipe count*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint16_t), false, "E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint16_t), false, "E,") == true)
   {
     APP_PPRINTF("%hu,", Data->swipe_count);
   }
 
   /*Average acceleration*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
-                          Data->acceleration_avg == DEMO_DATA_1_1_ERROR_ACCELERATION, "E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
+                           Data->acceleration_avg == DEMO_DATA_1_1_ERROR_ACCELERATION, "E,") == true)
   {
     APP_PPRINTF("%hu.%03hu,", Data->acceleration_avg / 1000, Data->acceleration_avg % 1000);
   }
 
   /*Maximum acceleration*/
-  if(CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
-                          Data->acceleration_max == DEMO_DATA_1_1_ERROR_ACCELERATION, "E,") == true)
+  if (CheckAndUpdateLength(&DataLen, sizeof(uint16_t),
+                           Data->acceleration_max == DEMO_DATA_1_1_ERROR_ACCELERATION, "E,") == true)
   {
     APP_PPRINTF("%hu.%03hu,", Data->acceleration_max / 1000, Data->acceleration_max % 1000);
   }
 
   /*Voltage*/
-  if(voltage_present == true)
+  if (voltage_present == true)
   {
-    APP_PPRINTF("%hhu.%02hhu\r\n", Data->voltage / 20, (Data->voltage % 20) * 5);
+    APP_PPRINTF("%u.%02u\r\n", Data->voltage / 20, (Data->voltage % 20) * 5);
   }
   else
   {
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_report.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_report.h
index d1a73e37..d1c516b5 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_report.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/App/demo_report.h
@@ -23,28 +23,28 @@
 #include "demo_packet_format.h"
 
 /**
- * @brief Report lost sensor to console.
- * @param Eui sensor's address
- */
-void CONC_Report_LOST (uint32_t Eui);
+  * @brief Report lost sensor to console.
+  * @param Eui sensor's address
+  */
+void CONC_Report_LOST(uint32_t Eui);
 
 /**
- * @brief Report successful modulation change to console.
- * @param Eui sensor's address
- */
-void CONC_Report_MOD_OK (uint32_t Eui);
+  * @brief Report successful modulation change to console.
+  * @param Eui sensor's address
+  */
+void CONC_Report_MOD_OK(uint32_t Eui);
 
 /**
- * @brief Report received packet to console.
- * @param Header sensor packet header
- * @param Rssi RSSI value computed while receiving the frame [dBm]
- * @param Snr raw SNR value given by the radio hardware [dB]
- * @param Data sensor's measured sensor data
- * @param DataLen length of data [byte]
- */
-void CONC_Report_RCV(const DEMO_packet_sensor_header_t* Header,
+  * @brief Report received packet to console.
+  * @param Header sensor packet header
+  * @param Rssi RSSI value computed while receiving the frame [dBm]
+  * @param Snr raw SNR value given by the radio hardware [dB]
+  * @param Data sensor's measured sensor data
+  * @param DataLen length of data [byte]
+  */
+void CONC_Report_RCV(const DEMO_packet_sensor_header_t *Header,
                      int16_t Rssi, int8_t Snr,
-                     const uint8_t* Data, uint32_t DataLen);
+                     const uint8_t *Data, uint32_t DataLen);
 
 
 #endif /* __DEMO_REPORT_H__ */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/mw_log_conf.h
index 6643f344..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
@@ -27,6 +29,7 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_adv_trace.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.c
index 2a75d3c1..edc0eb65 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -56,193 +59,148 @@
 /* Exported functions --------------------------------------------------------*/
 int32_t RBI_Init(void)
 {
+  /* USER CODE BEGIN RBI_Init_1 */
+
+  /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
-  /* USER CODE BEGIN RBI_Init 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_Init 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+  /* 2/ Or implement RBI_Init here */
+  /* USER CODE BEGIN RBI_Init_2 */
+#warning user to provide its board code or to call his board driver functions
+  return 0;
+  /* USER CODE END RBI_Init_2 */
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
 {
+  /* USER CODE BEGIN RBI_DeInit_1 */
+
+  /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
-  /* USER CODE BEGIN RBI_DeInit 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_DeInit 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_DeInit here */
+  /* USER CODE BEGIN RBI_DeInit_2 */
+#warning user to provide its board code or to call his board driver functions
+  return 0;
+  /* USER CODE END RBI_DeInit_2 */
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 {
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_1 */
+
+  /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
 
-  return 0;
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
 #else
-  /* USER CODE BEGIN RBI_ConfigRFSwitch 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_ConfigRFSwitch 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
+#warning user to provide its board code or to call his board driver functions
+  return 0;
+  /* USER CODE END RBI_ConfigRFSwitch_2 */
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
 {
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_GetTxConfig();
+  /* USER CODE BEGIN RBI_GetTxConfig_1 */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
-#else
-  /* USER CODE BEGIN RBI_GetTxConfig 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetTxConfig 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
+  /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_GetTxConfig();
 #else
-  /* USER CODE BEGIN RBI_GetWakeUpTime 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_GetTxConfig here */
+  /* USER CODE BEGIN RBI_GetTxConfig_2 */
+#warning user to provide its board code or to call his board driver functions
+  return RBI_CONF_RFO;
+  /* USER CODE END RBI_GetTxConfig_2 */
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
 {
+  /* USER CODE BEGIN RBI_IsTCXO_1 */
+
+  /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
-  /* USER CODE BEGIN RBI_IsTCXO 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_IsTCXO 0 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_IsTCXO here */
+  /* USER CODE BEGIN RBI_IsTCXO_2 */
+#warning user to provide its board code or to call his board driver functions
+  return IS_TCXO_SUPPORTED;
+  /* USER CODE END RBI_IsTCXO_2 */
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
 {
+  /* USER CODE BEGIN RBI_IsDCDC_1 */
+
+  /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
-  /* USER CODE BEGIN RBI_IsDCDC 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_IsDCDC 0 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_IsDCDC here */
+  /* USER CODE BEGIN RBI_IsDCDC_2 */
+#warning user to provide its board code or to call his board driver functions
+  return IS_DCDC_SUPPORTED;
+  /* USER CODE END RBI_IsDCDC_2 */
+
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.h
index 8878d937..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     3U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_conf.h
index 29cc81b5..17c678d7 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,7 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
-#include "stm32_mem.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,20 +48,16 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-
-/**
-  * @brief Max payload buffer size
-  */
-#define RADIO_RX_BUF_SIZE          255
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -67,25 +65,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 3UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -125,6 +140,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/timer.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/SubGHz_Phy/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/readme.txt b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/readme.txt
index f7bc9c8e..cdc28c4b 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Concentrator/readme.txt
@@ -1,12 +1,12 @@
 /**
   @page LocalNetwork_Concentrator Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Demonstrations/LocalNetwork/LocalNetwork_Concentrator/readme.txt 
+  * @file    Demonstrations/LocalNetwork/LocalNetwork_Concentrator/readme.txt
   * @author  MCD Application Team
-  * @brief   This application is a demo software of a Concentrator sending 
-  *          Beacon to  administrate a Network and receiving Sensor data 
+  * @brief   This application is a demo software of a Concentrator sending
+  *          Beacon to  administrate a Network and receiving Sensor data
   ******************************************************************************
   * @attention
   *
@@ -23,9 +23,9 @@
 
 @par Description
 
-This directory contains a set of source files that implements a Concentrator 
-sending Beacon to  administrate a Network of up to 14 sensors and receives 
-each connected Sensor's data 
+This directory contains a set of source files that implements a Concentrator
+sending Beacon to administrate a Network of up to 14 sensors and receives
+each connected Sensor's data.
 
 This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
   ******************************************************************************
@@ -34,7 +34,7 @@ This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx
 
 Demonstrations, SubGHz_Phy, LocalNetwork, Concentrator
 
-@par Directory contents 
+@par Directory contents
 
 
   - LocalNetwork_Concentrator/Common/Inc/demo_data_format.h                     Header with data format definitions for STM32WL Concentrator Demo.
@@ -101,7 +101,7 @@ Demonstrations, SubGHz_Phy, LocalNetwork, Concentrator
   - LocalNetwork_Concentrator/Core/Src/timer_if.c                               Configure RTC Alarm, Tick and Calendar manager
   - LocalNetwork_Concentrator/Core/Src/usart.c                                  This file provides code for the configuration
                                                                                 of the USART instances.
-  - LocalNetwork_Concentrator/Core/Src/usart_if.c                               Configuration of UART MX driver interface for hyperterminal communication
+  - LocalNetwork_Concentrator/Core/Src/usart_if.c                               Configuration of UART driver interface for hyperterminal communication
   - LocalNetwork_Concentrator/STM32CubeIDE/Application/Core/syscalls.c          STM32CubeIDE Minimal System calls file
   - LocalNetwork_Concentrator/STM32CubeIDE/Application/Core/sysmem.c            STM32CubeIDE System Memory calls file
   - LocalNetwork_Concentrator/SubGHz_Phy/App/demo_at.c                          at command API
@@ -111,15 +111,17 @@ Demonstrations, SubGHz_Phy, LocalNetwork, Concentrator
   - LocalNetwork_Concentrator/SubGHz_Phy/Target/radio_board_if.c                This file provides an interface layer between MW and Radio Board
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
-     - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
+
+  - Configure the software via the configuration files:
+    - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
 
   -Set Up:
 
@@ -130,15 +132,15 @@ Demonstrations, SubGHz_Phy, LocalNetwork, Concentrator
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all files and load your image into target memory
   - Run the example
   - Open a Terminal, connected the Demo/Sensor
   - UART Config = 9600, 8b, 1 stopbit, no parity, no flow control
   - Terminal Config: Select 'CR+LF' for Transmit New-Line and switch 'Local echo' on
-  - Type AT? to get the all ATcommand. 
+  - Type AT? to get the all ATcommand.
   - Type AT+LIST_REGIONS to list all supported regions and AT+REGION and AT+SUBREGION to set the region where user is located
   - Type AT+BEACON_ON (default beacon frequency is EU)
   - the Demo/Concentrator will automatically start to send beacon every 16 seconds.
@@ -149,7 +151,12 @@ In order to make the program work, you must do the following :
   - Any time the concentrator receives one-s sensor packet it will displayed as:
       AT+RCV=UID, COUNTER, VERSION_MAJOR, VERSION_MINOR, RSSI, SNR, TEMP, Voltage
         UID is a 32bits lsb of IEEE64 number. It may be 0xFFFFFFFF for early version of STM32WLxx
-        COUNTER is the uplimk ounter f a sensor, and can be used for PER count
+        COUNTER is the uplink counter of a sensor, and can be used for PER count
+
+@par How to debug ?
+  - make sure the flag DEBUGGER_ENABLED to 1 in sys_conf.h
+  - simpler to define the flag LOW_POWER_DISABLE to 1 as well
+  - compile, download and attach
 
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/adc.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/adc.h
index 0a491dd2..2e8c37f3 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/adc.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/adc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/adc_if.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/adc_if.h
index 277fa58c..5c2a2568 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/adc_if.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/adc_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __ADC_IF_H__
@@ -79,7 +81,7 @@ void SYS_DeInitMeasurement(void);
 
 /**
   * @brief  Get the current temperature
-  * @return value temperature in degreeCelcius( q7.8 )
+  * @return value temperature in degree Celsius( q7.8 )
   */
 int16_t SYS_GetTemperatureLevel(void);
 
@@ -100,4 +102,3 @@ uint16_t SYS_GetBatteryLevel(void);
 #endif /* __ADC_IF_H__ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
-
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/dma.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/dma.h
index 24238c8c..59a26f2e 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/dma.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/dma.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/main.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/main.h
index 311e8c32..aa102534 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/main.h
@@ -62,10 +62,36 @@ void Error_Handler(void);
 #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
 #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
 #define LPUART_BAUDRATE 9600
+#define LED1_Pin GPIO_PIN_15
+#define LED1_GPIO_Port GPIOB
+#define LED2_Pin GPIO_PIN_9
+#define LED2_GPIO_Port GPIOB
+#define PROB3_Pin GPIO_PIN_14
+#define PROB3_GPIO_Port GPIOB
+#define RF_CTRL3_Pin GPIO_PIN_3
+#define RF_CTRL3_GPIO_Port GPIOC
+#define BUT1_Pin GPIO_PIN_0
+#define BUT1_GPIO_Port GPIOA
+#define PROB2_Pin GPIO_PIN_13
+#define PROB2_GPIO_Port GPIOB
+#define RF_CTRL2_Pin GPIO_PIN_5
+#define RF_CTRL2_GPIO_Port GPIOC
+#define PROB1_Pin GPIO_PIN_12
+#define PROB1_GPIO_Port GPIOB
+#define RF_CTRL1_Pin GPIO_PIN_4
+#define RF_CTRL1_GPIO_Port GPIOC
+#define BUT3_Pin GPIO_PIN_6
+#define BUT3_GPIO_Port GPIOC
+#define BUT2_Pin GPIO_PIN_1
+#define BUT2_GPIO_Port GPIOA
+#define LED3_Pin GPIO_PIN_11
+#define LED3_GPIO_Port GPIOB
 #define USARTx_RX_Pin GPIO_PIN_3
 #define USARTx_RX_GPIO_Port GPIOA
 #define USARTx_TX_Pin GPIO_PIN_2
 #define USARTx_TX_GPIO_Port GPIOA
+#define PROB4_Pin GPIO_PIN_10
+#define PROB4_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 
 /* USER CODE END Private defines */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/platform.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/platform.h
index 1ccf2b6e..2386cd7f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/platform.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/platform.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    platform.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __PLATFORM_H__
@@ -26,12 +28,8 @@ extern "C" {
 #endif
 
 /* Exported constants --------------------------------------------------------*/
-#if 0
-#define MX_BOARD_PSEUDODRIVER
-#else
-#define USE_BSP_DRIVER
-#endif /* */
 
+#define USE_BSP_DRIVER
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -42,13 +40,11 @@ extern "C" {
 #include "main.h"
 #include "stm32wlxx_ll_gpio.h"
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP.  */
+/* code generated by STM32CubeMX does not support BSP.  */
 /* In order to use BSP, users can add the BSP files in the IDE project space */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  */
 #include "stm32wlxx_nucleo.h"
 #include "stm32wlxx_nucleo_radio.h"
-#elif defined(MX_BOARD_PSEUDODRIVER)
-#include "board_resources.h"
 #endif /* defined(USE_BSP_DRIVER) */
 
 /* USER CODE BEGIN include */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/rtc.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/rtc.h
index 632d0e57..6dd24df4 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/rtc.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/rtc.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32_lpm_if.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32_lpm_if.h
index b7c44f5d..cbe62fa1 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32_lpm_if.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32_lpm_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32_LPM_IF_H__
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32wlxx_hal_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32wlxx_hal_conf.h
index a5fe461f..f027e308 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32wlxx_hal_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32wlxx_hal_conf.h
@@ -53,7 +53,7 @@
 /*#define HAL_SMBUS_MODULE_ENABLED   */
 /*#define HAL_SPI_MODULE_ENABLED   */
 #define HAL_SUBGHZ_MODULE_ENABLED
-#define HAL_TIM_MODULE_ENABLED
+/*#define HAL_TIM_MODULE_ENABLED   */
 #define HAL_UART_MODULE_ENABLED
 /*#define HAL_USART_MODULE_ENABLED   */
 /*#define HAL_WWDG_MODULE_ENABLED   */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32wlxx_nucleo_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32wlxx_nucleo_conf.h
index 341aae1f..af8588aa 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32wlxx_nucleo_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/stm32wlxx_nucleo_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32wlxx_nucleo_conf.h
@@ -6,23 +7,23 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef STM32WLXX_NUCLEO_CONF_H
 #define STM32WLXX_NUCLEO_CONF_H
 
 #ifdef __cplusplus
-extern "C" {
+ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
@@ -46,47 +47,22 @@ extern "C" {
   * @{
   */
 
-/** @defgroup STM32WLXX_NUCLEO_CONFIG Config
+/** @defgroup STM32WLXX_NUCLEO_CONFIG CONFIG
   * @{
   */
 
 /** @defgroup STM32WLXX_NUCLEO_CONFIG_Exported_Constants Exported Constants
   * @{
   */
-/**
-  * COM usage define
-  */
+/* COM usage define */
 #define USE_BSP_COM_FEATURE                 0U
 
-/**
-  * COM log define
-  */
+/* COM log define */
 #define USE_COM_LOG                         0U
 
-/**
-  * IRQ priorities
-  */
+/* IRQ priorities */
 #define BSP_BUTTON_SWx_IT_PRIORITY         15U
 
-/**
-  * Radio maximum wakeup time (in ms)
-  */
-#define RF_WAKEUP_TIME                     3U
-
-/**
-  * Indicates whether or not TCXO is supported by the board
-  * 0: TCXO not supported
-  * 1: TCXO supported
-  */
-#define IS_TCXO_SUPPORTED                   1U
-
-/**
-  * Indicates whether or not DCDC is supported by the board
-  * 0: DCDC not supported
-  * 1: DCDC supported
-  */
-#define IS_DCDC_SUPPORTED                   1U
-
 /**
   * @}
   */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/subghz.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/subghz.h
index f9a63224..0926ffad 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/subghz.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/subghz.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_app.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_app.h
index 1b357cd6..4c18702d 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_app.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_app.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_APP_H__
@@ -33,6 +35,11 @@ extern "C" {
 
 /* USER CODE END Includes */
 
+/* Exported defines ----------------------------------------------------------*/
+/* USER CODE BEGIN ED */
+
+/* USER CODE END ED */
+
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
 
@@ -68,9 +75,7 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief initialises the system (dbg pins, trace, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
+  * @brief initialize the system (dbg pins, trace, mbmux, sys timer, LPM, ...)
   */
 void SystemApp_Init(void);
 
@@ -88,6 +93,10 @@ uint8_t GetBatteryLevel(void);
   */
 uint16_t GetTemperatureLevel(void);
 
+/* USER CODE BEGIN EFP */
+
+/* USER CODE END EFP */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_conf.h
index 47d27319..7f902a10 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SYS_CONF_H__
@@ -40,24 +42,28 @@ extern "C" {
 /**
   * @brief  Verbose level for all trace logs
   */
-#define VERBOSE_LEVEL     VLEVEL_M
+#define VERBOSE_LEVEL               VLEVEL_M
 
 /**
   * @brief Enable trace logs
   */
-#define APP_LOG_ENABLED   1
+#define APP_LOG_ENABLED             1
 
 /**
-  * @brief Enable Debugger mode
-  * @note  1:ON it enables the debbugger plus 4 dgb pins, 0:OFF the debugger is OFF (lower consumption)
+  * @brief Enable MCU Debugger pins (dbg serial wires, sbg spi, etc)
   */
-#define DEBUGGER_ON       0
+#define DEBUGGER_ENABLED            0
+
+/**
+  * @brief Enable four wires usable as probes (two of them PROBE1 and PROBE2 used by the MW)
+  */
+#define PROBE_PINS_ENABLED          0
 
 /**
   * @brief Disable Low Power mode
   * @note  0: LowPowerMode enabled. MCU enters stop2 mode, 1: LowPowerMode disabled. MCU enters sleep mode only
   */
-#define LOW_POWER_DISABLE 0
+#define LOW_POWER_DISABLE           0
 
 /* USER CODE BEGIN EC */
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_debug.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_debug.h
index bbae8f87..710e8852 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_debug.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/sys_debug.h
@@ -43,89 +43,89 @@ extern "C" {
 /* Exported constants --------------------------------------------------------*/
 /* Pin defines */
 
-/**  Definition for Debug Line 1   **/
+/**  Definition for Probe Line 1   **/
 /**
-  * @brief Pin of Debug Line 1
+  * @brief Pin of Probe Line 1
   */
-#define DGB_LINE1_PIN                           GPIO_PIN_12
+#define PROBE_LINE1_PIN                           GPIO_PIN_12
 
 /**
-  * @brief Port of Debug Line 1
+  * @brief Port of Probe Line 1
   */
-#define DGB_LINE1_PORT                          GPIOB
+#define PROBE_LINE1_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 1
+  * @brief Enable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE1_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 1
+  * @brief Disable GPIOs clock of Probe Line 1
   */
-#define DGB_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE1_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 2   **/
+/**  Definition for Probe Line 2   **/
 /**
-  * @brief Pin of Debug Line 2
+  * @brief Pin of Probe Line 2
   */
-#define DGB_LINE2_PIN                           GPIO_PIN_13
+#define PROBE_LINE2_PIN                           GPIO_PIN_13
 
 /**
-  * @brief Port of Debug Line 2
+  * @brief Port of Probe Line 2
   */
-#define DGB_LINE2_PORT                          GPIOB
+#define PROBE_LINE2_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 2
+  * @brief Enable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE2_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 2
+  * @brief Disable GPIOs clock of Probe Line 2
   */
-#define DGB_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE2_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 3   **/
+/**  Definition for Probe Line 3   **/
 /**
-  * @brief Pin of Debug Line 3
+  * @brief Pin of Probe Line 3
   */
-#define DGB_LINE3_PIN                           GPIO_PIN_14
+#define PROBE_LINE3_PIN                           GPIO_PIN_14
 
 /**
-  * @brief Port of Debug Line 3
+  * @brief Port of Probe Line 3
   */
-#define DGB_LINE3_PORT                          GPIOB
+#define PROBE_LINE3_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 3
+  * @brief Enable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE3_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 3
+  * @brief Disable GPIOs clock of Probe Line 3
   */
-#define DGB_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE3_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
-/**  Definition for Debug Line 4   **/
+/**  Definition for Probe Line 4   **/
 /**
-  * @brief Pin of Debug Line 4
+  * @brief Pin of Probe Line 4
   */
-#define DGB_LINE4_PIN                           GPIO_PIN_10
+#define PROBE_LINE4_PIN                           GPIO_PIN_10
 
 /**
-  * @brief Port of Debug Line 4
+  * @brief Port of Probe Line 4
   */
-#define DGB_LINE4_PORT                          GPIOB
+#define PROBE_LINE4_PORT                          GPIOB
 
 /**
-  * @brief Enable GPIOs clock of Debug Line 4
+  * @brief Enable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
+#define PROBE_LINE4_CLK_ENABLE()                  __HAL_RCC_GPIOB_CLK_ENABLE()
 
 /**
-  * @brief Disable GPIOs clock of Debug Line 4
+  * @brief Disable GPIOs clock of Probe Line 4
   */
-#define DGB_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
+#define PROBE_LINE4_CLK_DISABLE()                 __HAL_RCC_GPIOB_CLK_DISABLE()
 
 /* USER CODE BEGIN EC */
 
@@ -137,39 +137,41 @@ extern "C" {
 /* USER CODE END EV */
 
 /* Exported macro ------------------------------------------------------------*/
-#if defined (DEBUGGER_ON) && (DEBUGGER_ON == 1)
+#if defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 1)
 
-#define DBG_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
+#define PROBE_GPIO_WRITE( gpio, n, x )  HAL_GPIO_WritePin( gpio, n, (GPIO_PinState)(x) )
 
 /**
   * @brief Set pin to high level
   */
-#define DBG_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )       LL_GPIO_SetOutputPin( gpio, n )
 
 /**
   * @brief Set pin to low level
   */
-#define DBG_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )       LL_GPIO_ResetOutputPin ( gpio, n )
 
-/*enabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*enabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
+#elif defined (PROBE_PINS_ENABLED) && (PROBE_PINS_ENABLED == 0) /* PROBE_PINS_OFF */
+
+#define PROBE_GPIO_WRITE( gpio, n, x )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_SET_LINE( gpio, n )
+#define PROBE_GPIO_SET_LINE( gpio, n )
 
 /**
   * @brief not usable
   */
-#define DBG_GPIO_RST_LINE( gpio, n )
+#define PROBE_GPIO_RST_LINE( gpio, n )
 
-/*disabling RTC_OUTPUT should be set via MX GUI because MX_RTC_Init is now entirely generated */
+/*disabling RTC_OUTPUT should be set via STM32CubeMX GUI because MX_RTC_Init is now entirely generated */
 
 #else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
-#endif /* DEBUGGER_OFF */
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
 /* USER CODE BEGIN EM */
 
@@ -177,9 +179,20 @@ extern "C" {
 
 /* Exported functions prototypes ---------------------------------------------*/
 /**
-  * @brief Initializes the debug
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void);
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after CM0+ is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg);
+
+/**
+  * @brief Initializes the SW probes pins and the monitor RF pins via Alternate Function
   */
-void DBG_Init(void);
+void DBG_ProbesInit(void);
 
 /* USER CODE BEGIN EFP */
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/usart.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/usart.h
index c196d42b..29cb339e 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/usart.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/usart.h
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/usart_if.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/usart_if.h
index 87adf426..b1ed2355 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/usart_if.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/usart_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 #include "stm32_adv_trace.h"
 #include "usart.h"
 #include "dma.h"
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/utilities_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/utilities_conf.h
index 8cc21817..4e7147b1 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/utilities_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/utilities_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
  */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_CONF_H__
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/utilities_def.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/utilities_def.h
index edf9166b..76956958 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/utilities_def.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Inc/utilities_def.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    utilities_def.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __UTILITIES_DEF_H__
@@ -40,9 +42,11 @@ extern "C" {
   */
 typedef enum
 {
+  /* USER CODE BEGIN CFG_LPM_Id_t_0 */
+
+  /* USER CODE END CFG_LPM_Id_t_0 */
   CFG_LPM_APPLI_Id,
   CFG_LPM_UART_TX_Id,
-  CFG_LPM_TCXO_WA_Id,
   CFG_LPM_SENS_Id,
   /* USER CODE BEGIN CFG_LPM_Id_t */
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/adc.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/adc.c
index 4e783b96..d6f3988c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/adc.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/adc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,6 +30,13 @@ ADC_HandleTypeDef hadc;
 void MX_ADC_Init(void)
 {
 
+  /* USER CODE BEGIN ADC_Init 0 */
+
+  /* USER CODE END ADC_Init 0 */
+
+  /* USER CODE BEGIN ADC_Init 1 */
+
+  /* USER CODE END ADC_Init 1 */
   /** Configure the global features of the ADC (Clock, Resolution, Data Alignment and number of conversion)
   */
   hadc.Instance = ADC;
@@ -55,6 +62,9 @@ void MX_ADC_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN ADC_Init 2 */
+
+  /* USER CODE END ADC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/adc_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/adc_if.c
index 4e61c91c..75af32ca 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/adc_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/adc_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    adc_if.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include "adc_if.h"
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/dma.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/dma.c
index 4f10df5f..b93bda5c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/dma.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/dma.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/main.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/main.c
index 0e8698ce..a7be211f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/main.c
@@ -163,6 +163,13 @@ void SystemClock_Config(void)
   RCC_OscInitTypeDef RCC_OscInitStruct = {0};
   RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
 
+  /** Configure LSE Drive Capability
+  */
+  HAL_PWR_EnableBkUpAccess();
+  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+  /** Configure the main internal regulator output voltage
+  */
+  __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
   /** Initializes the CPU, AHB and APB busses clocks
   */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE|RCC_OSCILLATORTYPE_MSI;
@@ -269,10 +276,10 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+  __disable_irq();
   while (1)
   {
   }
-
   /* USER CODE END Error_Handler_Debug */
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/rtc.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/rtc.c
index 4464f7dc..b61dd5fe 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/rtc.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/rtc.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -29,8 +29,16 @@ RTC_HandleTypeDef hrtc;
 /* RTC init function */
 void MX_RTC_Init(void)
 {
+
+  /* USER CODE BEGIN RTC_Init 0 */
+
+  /* USER CODE END RTC_Init 0 */
+
   RTC_AlarmTypeDef sAlarm = {0};
 
+  /* USER CODE BEGIN RTC_Init 1 */
+
+  /* USER CODE END RTC_Init 1 */
   /** Initialize RTC Only
   */
   hrtc.Instance = RTC;
@@ -63,10 +71,13 @@ void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BIN) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN RTC_Init 2 */
+
+  /* USER CODE END RTC_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/stm32_lpm_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/stm32_lpm_if.c
index 04efdb6d..99f840e9 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/stm32_lpm_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/stm32_lpm_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    stm32_lpm_if.c
@@ -16,9 +17,10 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
-#include "sys_debug.h"
+#include "platform.h"
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #include "usart_if.h"
@@ -93,7 +95,6 @@ void PWR_EnterStopMode(void)
   /* USER CODE BEGIN EnterStopMode_1 */
 
   /* USER CODE END EnterStopMode_1 */
-  /* Suspend sysTick : work around for degugger problem in dual core (tickets 71085,  72038, 71087 ) */
   HAL_SuspendTick();
   /* Clear Status Flag before entering STOP/STANDBY Mode */
   LL_PWR_ClearFlag_C1STOP_C1STB();
@@ -112,7 +113,7 @@ void PWR_ExitStopMode(void)
   /* USER CODE BEGIN ExitStopMode_1 */
 
   /* USER CODE END ExitStopMode_1 */
-  /* Resume sysTick : work around for degugger problem in dual core */
+  /* Resume sysTick : work around for debugger problem in dual core */
   HAL_ResumeTick();
   /*Not retained periph:
     ADC interface
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/stm32wlxx_it.c
index a608058e..c5783cd8 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/stm32wlxx_it.c
@@ -76,7 +76,9 @@ void NMI_Handler(void)
 
   /* USER CODE END NonMaskableInt_IRQn 0 */
   /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
+  while (1)
+  {
+  }
   /* USER CODE END NonMaskableInt_IRQn 1 */
 }
 
@@ -187,7 +189,6 @@ void SysTick_Handler(void)
   /* USER CODE BEGIN SysTick_IRQn 0 */
 
   /* USER CODE END SysTick_IRQn 0 */
-  HAL_IncTick();
   /* USER CODE BEGIN SysTick_IRQn 1 */
 
   /* USER CODE END SysTick_IRQn 1 */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/subghz.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/subghz.c
index ee7e45e8..7b7dba4b 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/subghz.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/subghz.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -30,11 +30,21 @@ SUBGHZ_HandleTypeDef hsubghz;
 void MX_SUBGHZ_Init(void)
 {
 
+  /* USER CODE BEGIN SUBGHZ_Init 0 */
+
+  /* USER CODE END SUBGHZ_Init 0 */
+
+  /* USER CODE BEGIN SUBGHZ_Init 1 */
+
+  /* USER CODE END SUBGHZ_Init 1 */
   hsubghz.Init.BaudratePrescaler = SUBGHZSPI_BAUDRATEPRESCALER_4;
   if (HAL_SUBGHZ_Init(&hsubghz) != HAL_OK)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN SUBGHZ_Init 2 */
+
+  /* USER CODE END SUBGHZ_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/sys_app.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/sys_app.c
index 661be315..433ae233 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/sys_app.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/sys_app.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    sys_app.c
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdio.h>
@@ -25,9 +27,9 @@
 #include "stm32_seq.h"
 #include "stm32_systime.h"
 #include "stm32_lpm.h"
+#include "timer_if.h"
 #include "utilities_def.h"
 #include "sys_debug.h"
-#include "timer_if.h"
 
 /* USER CODE BEGIN Includes */
 
@@ -47,8 +49,8 @@
 #define MAX_TS_SIZE (int) 16
 
 /**
- * Defines the maximum battery level
- */
+  * Defines the maximum battery level
+  */
 #define LORAWAN_MAX_BAT   254
 /* USER CODE BEGIN PD */
 
@@ -65,16 +67,10 @@
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
-/**
-  * @brief  Set all pins such to minimized consumption (necessary for some STM32 families)
-  * @param none
-  * @retval None
-  */
-static void Gpio_PreInit(void);
 /**
   * @brief Returns sec and msec based on the systime in use
-  * @param none
-  * @retval  none
+  * @param buff to update with timestamp
+  * @param size of updated buffer
   */
 static void TimestampNow(uint8_t *buff, uint16_t *size);
 
@@ -82,16 +78,12 @@ static void TimestampNow(uint8_t *buff, uint16_t *size);
   * @brief  it calls UTIL_ADV_TRACE_VSNPRINTF
   */
 static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strFormat, ...);
+
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Exported functions ---------------------------------------------------------*/
-/**
-  * @brief initialises the system (dbg pins, trace, mbmux, systiemr, LPM, ...)
-  * @param none
-  * @retval  none
-  */
 void SystemApp_Init(void)
 {
   /* USER CODE BEGIN SystemApp_Init_1 */
@@ -100,13 +92,15 @@ void SystemApp_Init(void)
 
   /* Ensure that MSI is wake-up system clock */
   __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
-  /*Initialises timer and RTC*/
+
+  /*Initialize timer and RTC*/
   UTIL_TIMER_Init();
 
-  Gpio_PreInit();
+  /* Debug config : disable serial wires and DbgMcu pins settings */
+  DBG_Disable();
 
-  /* Configure the debug mode*/
-  DBG_Init();
+  /* Initializes the SW probes pins and the monitor RF pins via Alternate Function */
+  DBG_ProbesInit();
 
   /*Initialize the terminal */
   UTIL_ADV_TRACE_Init();
@@ -114,6 +108,7 @@ void SystemApp_Init(void)
 
   /*Set verbose LEVEL*/
   UTIL_ADV_TRACE_SetVerboseLevel(VERBOSE_LEVEL);
+
   /*Initialize the temperature and Battery measurement services */
   SYS_InitMeasurement();
 
@@ -128,6 +123,7 @@ void SystemApp_Init(void)
 #elif !defined (LOW_POWER_DISABLE)
 #error LOW_POWER_DISABLE not defined
 #endif /* LOW_POWER_DISABLE */
+
   /* USER CODE BEGIN SystemApp_Init_2 */
 
   /* USER CODE END SystemApp_Init_2 */
@@ -135,8 +131,6 @@ void SystemApp_Init(void)
 
 /**
   * @brief redefines __weak function in stm32_seq.c such to enter low power
-  * @param none
-  * @retval  none
   */
 void UTIL_SEQ_Idle(void)
 {
@@ -157,9 +151,10 @@ uint8_t GetBatteryLevel(void)
   /* USER CODE BEGIN GetBatteryLevel_0 */
 
   /* USER CODE END GetBatteryLevel_0 */
+
   batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
 
-  /* Convert batterey level from mV to linea scale: 1 (very low) to 254 (fully charged) */
+  /* Convert battery level from mV to linear scale: 1 (very low) to 254 (fully charged) */
   if (batteryLevelmV > VDD_BAT)
   {
     batteryLevel = LORAWAN_MAX_BAT;
@@ -178,22 +173,27 @@ uint8_t GetBatteryLevel(void)
   /* USER CODE BEGIN GetBatteryLevel_2 */
 
   /* USER CODE END GetBatteryLevel_2 */
+
   return batteryLevel;  /* 1 (very low) to 254 (fully charged) */
 }
 
 uint16_t GetTemperatureLevel(void)
 {
+  uint16_t temperatureLevel = 0;
+
+  temperatureLevel = (uint16_t)(SYS_GetTemperatureLevel() / 256);
   /* USER CODE BEGIN GetTemperatureLevel */
 
   /* USER CODE END GetTemperatureLevel */
-  return (uint16_t)(SYS_GetTemperatureLevel() / 256);
+  return temperatureLevel;
 }
 
-/* USER CODE BEGIN ExF */
+/* USER CODE BEGIN EF */
 
-/* USER CODE END ExF */
+/* USER CODE END EF */
 
 /* Private functions ---------------------------------------------------------*/
+
 static void TimestampNow(uint8_t *buff, uint16_t *size)
 {
   /* USER CODE BEGIN TimestampNow_1 */
@@ -207,45 +207,6 @@ static void TimestampNow(uint8_t *buff, uint16_t *size)
   /* USER CODE END TimestampNow_2 */
 }
 
-static void Gpio_PreInit(void)
-{
-  /* USER CODE BEGIN Gpio_PreInit_1 */
-
-  /* USER CODE END Gpio_PreInit_1 */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-
-  /* Configure all IOs in analog input              */
-  /* Except PA143 and PA14 (SWCLK and SWD) for debug*/
-  /* PA13 and PA14 are configured in debug_init     */
-  /* Configure all GPIO as analog to reduce current consumption on non used IOs */
-  /* Enable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_ENABLE();
-  __HAL_RCC_GPIOB_CLK_ENABLE();
-  __HAL_RCC_GPIOC_CLK_ENABLE();
-  __HAL_RCC_GPIOH_CLK_ENABLE();
-
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  /* All GPIOs except debug pins (SWCLK and SWD) */
-  GPIO_InitStruct.Pin = GPIO_PIN_All & (~(GPIO_PIN_13 | GPIO_PIN_14));
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /* All GPIOs */
-  GPIO_InitStruct.Pin = GPIO_PIN_All;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-  HAL_GPIO_Init(GPIOH, &GPIO_InitStruct);
-
-  /* Disable GPIOs clock */
-  __HAL_RCC_GPIOA_CLK_DISABLE();
-  __HAL_RCC_GPIOB_CLK_DISABLE();
-  __HAL_RCC_GPIOC_CLK_DISABLE();
-  __HAL_RCC_GPIOH_CLK_DISABLE();
-  /* USER CODE BEGIN Gpio_PreInit_2 */
-
-  /* USER CODE END Gpio_PreInit_2 */
-}
-
 /* Disable StopMode when traces need to be printed */
 void UTIL_ADV_TRACE_PreSendHook(void)
 {
@@ -290,10 +251,7 @@ static void tiny_snprintf_like(char *buf, uint32_t maxsize, const char *strForma
 /* HAL overload functions ---------------------------------------------------------*/
 
 /**
-  * @brief This function configures the source of the time base.
-  * @brief  don't enable systick
-  * @param TickPriority: Tick interrupt priority.
-  * @retval HAL status
+  * @note This function overwrites the __weak one from HAL
   */
 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 {
@@ -308,13 +266,11 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 }
 
 /**
-  * @brief Provide a tick value in millisecond measured using RTC
   * @note This function overwrites the __weak one from HAL
-  * @retval tick value
   */
 uint32_t HAL_GetTick(void)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_GetTick_1 */
 
   /* USER CODE END HAL_GetTick_1 */
@@ -325,13 +281,11 @@ uint32_t HAL_GetTick(void)
 }
 
 /**
-  * @brief This function provides delay (in ms)
-  * @param Delay: specifies the delay time length, in milliseconds.
-  * @retval None
+  * @note This function overwrites the __weak one from HAL
   */
 void HAL_Delay(__IO uint32_t Delay)
 {
-  /* TIMER_IF can be based onother counter the SysTick e.g. RTC */
+  /* TIMER_IF can be based on other counter the SysTick e.g. RTC */
   /* USER CODE BEGIN HAL_Delay_1 */
 
   /* USER CODE END HAL_Delay_1 */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/sys_debug.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/sys_debug.c
index 2e4c40f7..f0395f5c 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/sys_debug.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/sys_debug.c
@@ -41,6 +41,7 @@
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
+
 /* Private macro -------------------------------------------------------------*/
 /* USER CODE BEGIN PM */
 
@@ -58,39 +59,121 @@
 
 /* Exported functions --------------------------------------------------------*/
 
-void DBG_Init(void)
+/**
+  * @brief Disable debugger (serial wires pins)
+  */
+void DBG_Disable(void)
 {
   /* USER CODE BEGIN DBG_Init_1 */
 
   /* USER CODE END DBG_Init_1 */
-#if defined (DEBUGGER_ON) && ( DEBUGGER_ON == 1 )
-  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
-  /* Enable the GPIO Clock */
-  DGB_LINE1_CLK_ENABLE();
-  DGB_LINE2_CLK_ENABLE();
-  DGB_LINE3_CLK_ENABLE();
-  DGB_LINE4_CLK_ENABLE();
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 ) /* DEBUGGER_DISABLED */
+  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
+  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
+  __HAL_RCC_GPIOA_CLK_ENABLE() ;
+  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  /* Disabled HAL_DBGMCU_  */
+  DBG_ConfigForLpm(0);
+
+  /* USER CODE BEGIN DBG_Init_Last */
+
+  /* USER CODE END DBG_Init_Last */
+}
+
+/**
+  * @brief Config debugger when working in Low Power Mode
+  * @note  When in Dual Core DbgMcu pins should be better disable only after Cm0 is started
+  */
+void DBG_ConfigForLpm(uint8_t enableDbg)
+{
+  uint8_t enable_dbg = enableDbg;
+  /* USER CODE BEGIN DBG_ConfigForLpm_1 */
+
+  /* USER CODE END DBG_ConfigForLpm_1 */
+
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 0 )
+  enable_dbg = 0;
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
+#endif /* DEBUGGER_OFF */
+
+  if (enable_dbg == 1)
+  {
+    HAL_DBGMCU_EnableDBGSleepMode();
+    HAL_DBGMCU_EnableDBGStopMode();
+    HAL_DBGMCU_EnableDBGStandbyMode();
+  }
+  else
+  {
+    HAL_DBGMCU_DisableDBGSleepMode();
+    HAL_DBGMCU_DisableDBGStopMode();
+    HAL_DBGMCU_DisableDBGStandbyMode();
+  }
+
+  /* USER CODE BEGIN DBG_ConfigForLpm_Last */
+
+  /* USER CODE END DBG_ConfigForLpm_Last */
+}
+
+/* USER CODE BEGIN EF */
+
+/* USER CODE END EF */
+
+/* Private Functions Definition -----------------------------------------------*/
+void DBG_ProbesInit(void)
+{
+  /* USER CODE BEGIN DBG_ProbesInit_1 */
+
+  /* USER CODE END DBG_ProbesInit_1 */
+
+  /* SW probes */
+
+#if defined (PROBE_PINS_ENABLED) && ( PROBE_PINS_ENABLED == 1 )
+  GPIO_InitTypeDef  GPIO_InitStruct = {0};
 
   /* Configure the GPIO pin */
   GPIO_InitStruct.Mode   = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull   = GPIO_PULLUP;
   GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
-  GPIO_InitStruct.Pin    = DGB_LINE1_PIN;
-  HAL_GPIO_Init(DGB_LINE1_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE2_PIN;
-  HAL_GPIO_Init(DGB_LINE2_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE3_PIN;
-  HAL_GPIO_Init(DGB_LINE3_PORT, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin    = DGB_LINE4_PIN;
-  HAL_GPIO_Init(DGB_LINE4_PORT, &GPIO_InitStruct);
-
-  /* Reset debug Pins */
-  HAL_GPIO_WritePin(DGB_LINE1_PORT, DGB_LINE1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE2_PORT, DGB_LINE2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(DGB_LINE4_PORT, DGB_LINE4_PIN, GPIO_PIN_RESET);
+  /* Enable the GPIO Clock */
+  PROBE_LINE1_CLK_ENABLE();
+  PROBE_LINE2_CLK_ENABLE();
+  PROBE_LINE3_CLK_ENABLE();
+  PROBE_LINE4_CLK_ENABLE();
+
+  GPIO_InitStruct.Pin    = PROBE_LINE1_PIN;
+  HAL_GPIO_Init(PROBE_LINE1_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE2_PIN;
+  HAL_GPIO_Init(PROBE_LINE2_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE3_PIN;
+  HAL_GPIO_Init(PROBE_LINE3_PORT, &GPIO_InitStruct);
+  GPIO_InitStruct.Pin    = PROBE_LINE4_PIN;
+  HAL_GPIO_Init(PROBE_LINE4_PORT, &GPIO_InitStruct);
+
+  /* Reset probe Pins */
+  HAL_GPIO_WritePin(PROBE_LINE1_PORT, PROBE_LINE1_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE2_PORT, PROBE_LINE2_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(PROBE_LINE4_PORT, PROBE_LINE4_PIN, GPIO_PIN_RESET);
+
+  /* USER CODE BEGIN DBG_ProbesInit_2 */
+
+  /* USER CODE END DBG_ProbesInit_2 */
+  /* HW alternate functions for monitoring RF */
+
+  /* Configure the GPIO pin */
+  GPIO_InitStruct.Speed  = GPIO_SPEED_FREQ_VERY_HIGH;
 
   /*spi dbg*/
   GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
@@ -108,44 +191,42 @@ void DBG_Init(void)
   __HAL_RCC_GPIOA_CLK_ENABLE() ;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /******** MCO OUT Config on PA8 *****/
-  HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_SYSCLK, RCC_MCODIV_16);
+  /* LDO_rdy & BUCK_rdy (SMPS) */
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_2);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /*Debug power up request wakeup CBDGPWRUPREQ*/
-  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+  GPIO_InitStruct.Mode   = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Pull   = GPIO_NOPULL;
+  GPIO_InitStruct.Pin    = (GPIO_PIN_4);
+  GPIO_InitStruct.Alternate  = GPIO_AF13_DEBUG_RF;
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-  /* lowpower DBGmode: just needed for CORE_CM4 */
-  HAL_DBGMCU_EnableDBGSleepMode();
-  HAL_DBGMCU_EnableDBGStopMode();
-  HAL_DBGMCU_EnableDBGStandbyMode();
+#elif !defined (PROBE_PINS_ENABLED)
+#error "PROBE_PINS_ENABLED not defined or out of range <0,1>"
+#endif /* PROBE_PINS_ENABLED */
 
-#elif defined (DEBUGGER_ON) && (DEBUGGER_ON == 0) /* DEBUGGER_OFF */
-  /* Put the debugger pin PA13 and P14 in analog for LowPower*/
-  /* The 4 debug lines above are simply not set in this case */
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  GPIO_InitStruct.Mode   = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull   = GPIO_NOPULL;
-  GPIO_InitStruct.Pin    = (GPIO_PIN_13 | GPIO_PIN_14);
-  /* make sure clock is enabled before setting the pins with HAL_GPIO_Init() */
-  __HAL_RCC_GPIOA_CLK_ENABLE() ;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+  /* USER CODE BEGIN DBG_ProbesInit_3 */
 
-  HAL_DBGMCU_DisableDBGSleepMode();
-  HAL_DBGMCU_DisableDBGStopMode();
-  HAL_DBGMCU_DisableDBGStandbyMode();
+  /* USER CODE END DBG_ProbesInit_3 */
 
-#else
-#error "DEBUGGER_ON not defined or out of range <0,1>"
+#if defined(CORE_CM4)
+#if defined (DEBUGGER_ENABLED) && ( DEBUGGER_ENABLED == 1 )
+  /*Debug power up request wakeup CBDGPWRUPREQ*/
+  LL_EXTI_EnableIT_32_63(LL_EXTI_LINE_46);
+#elif !defined (DEBUGGER_ENABLED)
+#error "DEBUGGER_ENABLED not defined or out of range <0,1>"
 #endif /* DEBUGGER_OFF */
-  /* USER CODE BEGIN DBG_Init_Last */
-
-  /* USER CODE END DBG_Init_Last */
-}
-/* USER CODE BEGIN EF */
+#endif /* CORE_CM4 */
 
-/* USER CODE END EF */
+  /* USER CODE BEGIN DBG_ProbesInit_Last */
 
-/* Private Functions Definition -----------------------------------------------*/
+  /* USER CODE END DBG_ProbesInit_Last */
+}
 /* USER CODE BEGIN PrFD */
 
 /* USER CODE END PrFD */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/system_stm32wlxx.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/system_stm32wlxx.c
index 1e593d85..3ce5556b 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/system_stm32wlxx.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/system_stm32wlxx.c
@@ -4,6 +4,17 @@
   * @author  MCD Application Team
   * @brief   CMSIS Cortex Device Peripheral Access Layer System Source File
   *
+  ******************************************************************************
+  * @attention
+  *
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
+  *
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
+  *
+  ******************************************************************************
   *   This file provides two functions and one global variable to be called from
   *   user application:
   *      - SystemInit(): This function is called at startup just after reset and
@@ -57,18 +68,6 @@
   *        SDIO and RNG clock                     |
   *-----------------------------------------------------------------------------
   *=============================================================================
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics. 
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
-  *
-  ******************************************************************************
   */
 
 /** @addtogroup CMSIS
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/timer_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/timer_if.c
index 615131a0..66e51602 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/timer_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/timer_if.c
@@ -21,9 +21,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include <math.h>
-#include "main.h" /*for Mx generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
-#include "rtc.h"
 #include "timer_if.h"
+#include "main.h" /*for STM32CubeMX generated RTC_N_PREDIV_S and RTC_N_PREDIV_A*/
+#include "rtc.h"
 #include "stm32_lpm.h"
 #include "utilities_def.h"
 #include "stm32wlxx_ll_rtc.h"
@@ -104,6 +104,17 @@ const UTIL_SYSTIM_Driver_s UTIL_SYSTIMDriver =
 
 /* #define RTIF_DEBUG */
 
+/**
+  * @brief Map UTIL_TIMER_IRQ can be overridden in utilities_conf.h to Map on Task rather then Isr
+  */
+#ifndef UTIL_TIMER_IRQ_MAP_INIT
+#define UTIL_TIMER_IRQ_MAP_INIT()
+#endif /* UTIL_TIMER_IRQ_MAP_INIT */
+
+#ifndef UTIL_TIMER_IRQ_MAP_PROCESS
+#define UTIL_TIMER_IRQ_MAP_PROCESS() UTIL_TIMER_IRQ_Handler()
+#endif /* UTIL_TIMER_IRQ_MAP_PROCESS */
+
 /* USER CODE BEGIN PD */
 
 /* USER CODE END PD */
@@ -153,7 +164,6 @@ static inline uint32_t GetTimerTicks(void);
   * Absolute RTC time in tick is (MSBticks)<<32 + (32bits binary counter)
   * @note MSBticks incremented every time the 32bits RTC timer wraps around (~44days)
   * @param[in] MSBticks
-  * @return none
   */
 static void TIMER_IF_BkUp_Write_MSBticks(uint32_t MSBticks);
 
@@ -173,9 +183,9 @@ static uint32_t TIMER_IF_BkUp_Read_MSBticks(void);
 UTIL_TIMER_Status_t TIMER_IF_Init(void)
 {
   UTIL_TIMER_Status_t ret = UTIL_TIMER_OK;
-  /* USER CODE BEGIN TIMER_IF_Init_1 */
+  /* USER CODE BEGIN TIMER_IF_Init */
 
-  /* USER CODE END TIMER_IF_Init_1 */
+  /* USER CODE END TIMER_IF_Init */
   if (RTC_Initialized == false)
   {
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
@@ -183,18 +193,21 @@ UTIL_TIMER_Status_t TIMER_IF_Init(void)
     MX_RTC_Init();
     /*Stop Timer */
     TIMER_IF_StopTimer();
-    /** DeActivate the Alarm A enabled by MX during MX_RTC_Init() */
+    /** DeActivate the Alarm A enabled by STM32CubeMX during MX_RTC_Init() */
     HAL_RTC_DeactivateAlarm(&hrtc, RTC_ALARM_A);
     /*overload RTC feature enable*/
     hrtc.IsEnabled.RtcFeatures = UINT32_MAX;
 
     /*Enable Direct Read of the calendar registers (not through Shadow) */
     HAL_RTCEx_EnableBypassShadow(&hrtc);
-    /*Initialise MSB ticks*/
+    /*Initialize MSB ticks*/
     TIMER_IF_BkUp_Write_MSBticks(0);
 
     TIMER_IF_SetTimerContext();
 
+    /* Register a task to associate to UTIL_TIMER_Irq() interrupt */
+    UTIL_TIMER_IRQ_MAP_INIT();
+
     RTC_Initialized = true;
   }
 
@@ -277,64 +290,70 @@ uint32_t TIMER_IF_GetTimerContext(void)
 
 uint32_t TIMER_IF_GetTimerElapsedTime(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return ((uint32_t)(GetTimerTicks() - RtcTimerContext));
+  ret = ((uint32_t)(GetTimerTicks() - RtcTimerContext));
   /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
 
   /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetTimerValue(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_GetTimerValue */
 
   /* USER CODE END TIMER_IF_GetTimerValue */
   if (RTC_Initialized == true)
   {
-    return GetTimerTicks();
-  }
-  else
-  {
-    return 0;
+    ret = GetTimerTicks();
   }
   /* USER CODE BEGIN TIMER_IF_GetTimerValue_Last */
 
   /* USER CODE END TIMER_IF_GetTimerValue_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_GetMinimumTimeout(void)
 {
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime */
-  return (MIN_ALARM_DELAY);
-  /* USER CODE BEGIN TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout */
+  ret = (MIN_ALARM_DELAY);
+  /* USER CODE BEGIN TIMER_IF_GetMinimumTimeout_Last */
 
-  /* USER CODE END TIMER_IF_GetTimerElapsedTime_Last */
+  /* USER CODE END TIMER_IF_GetMinimumTimeout_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_ms2Tick(uint32_t timeMilliSec)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
+  ret = ((uint32_t)((((uint64_t) timeMilliSec) << RTC_N_PREDIV_S) / 1000));
   /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
 
   /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_Convert_Tick2ms(uint32_t tick)
 {
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick */
+  uint32_t ret = 0;
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick */
-  return ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
-  /* USER CODE BEGIN TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms */
+  ret = ((uint32_t)((((uint64_t)(tick)) * 1000) >> RTC_N_PREDIV_S));
+  /* USER CODE BEGIN TIMER_IF_Convert_Tick2ms_Last */
 
-  /* USER CODE END TIMER_IF_Convert_ms2Tick_Last */
+  /* USER CODE END TIMER_IF_Convert_Tick2ms_Last */
+  return ret;
 }
 
 void TIMER_IF_DelayMs(uint32_t delay)
@@ -360,7 +379,7 @@ void HAL_RTC_AlarmAEventCallback(RTC_HandleTypeDef *hrtc)
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback */
-  UTIL_TIMER_IRQ_Handler();
+  UTIL_TIMER_IRQ_MAP_PROCESS();
   /* USER CODE BEGIN HAL_RTC_AlarmAEventCallback_Last */
 
   /* USER CODE END HAL_RTC_AlarmAEventCallback_Last */
@@ -383,6 +402,7 @@ void HAL_RTCEx_SSRUEventCallback(RTC_HandleTypeDef *hrtc)
 
 uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 {
+  uint32_t seconds = 0;
   /* USER CODE BEGIN TIMER_IF_GetTime */
 
   /* USER CODE END TIMER_IF_GetTime */
@@ -392,16 +412,16 @@ uint32_t TIMER_IF_GetTime(uint16_t *mSeconds)
 
   ticks = (((uint64_t) timerValueMSB) << 32) + timerValueLsb;
 
-  uint32_t seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
+  seconds = (uint32_t)(ticks >> RTC_N_PREDIV_S);
 
   ticks = (uint32_t) ticks & RTC_PREDIV_S;
 
   *mSeconds = TIMER_IF_Convert_Tick2ms(ticks);
 
-  return seconds;
   /* USER CODE BEGIN TIMER_IF_GetTime_Last */
 
   /* USER CODE END TIMER_IF_GetTime_Last */
+  return seconds;
 }
 
 void TIMER_IF_BkUp_Write_Seconds(uint32_t Seconds)
@@ -428,24 +448,28 @@ void TIMER_IF_BkUp_Write_SubSeconds(uint32_t SubSeconds)
 
 uint32_t TIMER_IF_BkUp_Read_Seconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_Seconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_Seconds_Last */
+  return ret;
 }
 
 uint32_t TIMER_IF_BkUp_Read_SubSeconds(void)
 {
+  uint32_t ret = 0;
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds */
-  return HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
+  ret = HAL_RTCEx_BKUPRead(&hrtc, RTC_BKP_SUBSECONDS);
   /* USER CODE BEGIN TIMER_IF_BkUp_Read_SubSeconds_Last */
 
   /* USER CODE END TIMER_IF_BkUp_Read_SubSeconds_Last */
+  return ret;
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/usart.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/usart.c
index 343006bc..8eda5eb1 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/usart.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/usart.c
@@ -6,7 +6,7 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * <h2><center>&copy; Copyright (c) 2021 STMicroelectronics.
   * All rights reserved.</center></h2>
   *
   * This software component is licensed by ST under Ultimate Liberty license
@@ -32,6 +32,13 @@ DMA_HandleTypeDef hdma_lpuart1_tx;
 void MX_LPUART1_UART_Init(void)
 {
 
+  /* USER CODE BEGIN LPUART1_Init 0 */
+
+  /* USER CODE END LPUART1_Init 0 */
+
+  /* USER CODE BEGIN LPUART1_Init 1 */
+
+  /* USER CODE END LPUART1_Init 1 */
   hlpuart1.Instance = LPUART1;
   hlpuart1.Init.BaudRate = LPUART_BAUDRATE;
   hlpuart1.Init.WordLength = UART_WORDLENGTH_8B;
@@ -59,6 +66,9 @@ void MX_LPUART1_UART_Init(void)
   {
     Error_Handler();
   }
+  /* USER CODE BEGIN LPUART1_Init 2 */
+
+  /* USER CODE END LPUART1_Init 2 */
 
 }
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/usart_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/usart_if.c
index cfa581cd..36217a2f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/usart_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/Core/Src/usart_if.c
@@ -1,8 +1,9 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    usart_if.c
   * @author  MCD Application Team
-  * @brief   Configuration of UART MX driver interface for hyperterminal communication
+  * @brief   Configuration of UART driver interface for hyperterminal communication
   ******************************************************************************
   * @attention
   *
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "usart_if.h"
 
@@ -124,8 +127,6 @@ UTIL_ADV_TRACE_Status_t vcom_DeInit(void)
   HAL_UART_MspDeInit(&hlpuart1);
 
   /* ##-3- Disable the NVIC for DMA ########################################### */
-  /* temporary while waiting CR 50840: MX implementation of  MX_DMA_DeInit() */
-  /* For the time being user should change manually the channel according to the MX settings */
   /* USER CODE BEGIN 1 */
   HAL_NVIC_DisableIRQ(DMA1_Channel5_IRQn);
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/LocalNetwork_Sensor.ewd b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/LocalNetwork_Sensor.ewd
index cb230589..24929cf5 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/LocalNetwork_Sensor.ewd
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/LocalNetwork_Sensor.ewd
@@ -40,11 +40,11 @@
                 </option>
                 <option>
                     <name>MemOverride</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>MemFile</name>
-                    <state>$TOOLKIT_DIR$\config\debugger\ST\STM32WL55JC_M4.ddf</state>
+                    <state>$TOOLKIT_DIR$\CONFIG\debugger\ST\STM32WL55JC_M4.ddf</state>
                 </option>
                 <option>
                     <name>RunToEnable</name>
@@ -281,6 +281,10 @@
                 <version>4</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -399,10 +403,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -497,6 +497,10 @@
                 <version>8</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CatchSFERR</name>
+                    <state>1</state>
+                </option>
                 <option>
                     <name>OCDriverInfo</name>
                     <state>1</state>
@@ -508,7 +512,7 @@
                 <option>
                     <name>IjetResetList</name>
                     <version>1</version>
-                    <state>9</state>
+                    <state>10</state>
                 </option>
                 <option>
                     <name>IjetHWResetDuration</name>
@@ -573,7 +577,7 @@
                 </option>
                 <option>
                     <name>IjetCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>IjetSwoPrescalerList</name>
@@ -648,10 +652,6 @@
                     <name>CatchINTERR</name>
                     <state>1</state>
                 </option>
-                <option>
-                    <name>CatchSFERR</name>
-                    <state>1</state>
-                </option>
                 <option>
                     <name>CatchHARDERR</name>
                     <state>1</state>
@@ -682,7 +682,7 @@
                 </option>
                 <option>
                     <name>IjetSelectedCPUBehaviour</name>
-                    <state></state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>ICpuName</name>
@@ -727,6 +727,10 @@
                 <version>16</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCCatchSFERR</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>JLinkSpeed</name>
                     <state>1000</state>
@@ -831,7 +835,7 @@
                 <option>
                     <name>CCJLinkResetList</name>
                     <version>6</version>
-                    <state>5</state>
+                    <state>7</state>
                 </option>
                 <option>
                     <name>CCJLinkInterfaceCmdLine</name>
@@ -865,10 +869,6 @@
                     <name>CCCatchINTERR</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCCatchSFERR</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCCatchHARDERR</name>
                     <state>0</state>
@@ -896,7 +896,7 @@
                 </option>
                 <option>
                     <name>CCCpuClockEdit</name>
-                    <state></state>
+                    <state>72.0</state>
                 </option>
                 <option>
                     <name>CCSwoClockAuto</name>
@@ -1012,7 +1012,7 @@
                 </option>
                 <option>
                     <name>CCSTLinkInterfaceRadio</name>
-                    <state>0</state>
+                    <state>1</state>
                 </option>
                 <option>
                     <name>CCSTLinkInterfaceCmdLine</name>
@@ -1361,7 +1361,7 @@
                 </option>
                 <option>
                     <name>CCXds100InterfaceRadio</name>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100InterfaceCmdLine</name>
@@ -1370,7 +1370,7 @@
                 <option>
                     <name>CCXds100ProbeList</name>
                     <version>0</version>
-                    <state>2</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>CCXds100SWOPortRadio</name>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/LocalNetwork_Sensor.ewp b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/LocalNetwork_Sensor.ewp
index 06f05154..2136aae2 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/LocalNetwork_Sensor.ewp
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/LocalNetwork_Sensor.ewp
@@ -16,15 +16,15 @@
                 <debug>1</debug>
                 <option>
                     <name>ExePath</name>
-                    <state>LocalNetwork_Sensor\Exe</state>
+                    <state>LocalNetwork_Sensor/Exe</state>
                 </option>
                 <option>
                     <name>ObjPath</name>
-                    <state>LocalNetwork_Sensor\Obj</state>
+                    <state>LocalNetwork_Sensor/Obj</state>
                 </option>
                 <option>
                     <name>ListPath</name>
-                    <state>LocalNetwork_Sensor\List</state>
+                    <state>LocalNetwork_Sensor/List</state>
                 </option>
                 <option>
                     <name>GEndianMode</name>
@@ -32,11 +32,11 @@
                 </option>
                 <option>
                     <name>Input description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier n, no float nor long long, no scan set, no assignment suppressing, with multibyte support.</state>
                 </option>
                 <option>
                     <name>Output description</name>
-                    <state>Full formatting, with multibyte support.</state>
+                    <state>No specifier a, A, no specifier n, no float nor long long, with multibyte support.</state>
                 </option>
                 <option>
                     <name>GOutputBinary</name>
@@ -94,7 +94,7 @@
                 </option>
                 <option>
                     <name>GenStdoutInterface</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>GeneralMisraRules98</name>
@@ -108,7 +108,7 @@
                 <option>
                     <name>GeneralMisraRules04</name>
                     <version>0</version>
-                    <state>011111111111111110111111111111111111111111111010110100111111111111110111111111111111111111111111111111110111111011111111111111111111111111111</state>
+                    <state>011111111111111110111111111111011111111111111011110100111111111111111111111111111111111111111111101111111111111011111111111111111111111111111</state>
                 </option>
                 <option>
                     <name>RTConfigPath2</name>
@@ -218,11 +218,15 @@
                 <version>34</version>
                 <wantNonLocal>1</wantNonLocal>
                 <debug>1</debug>
+                <option>
+                    <name>CCOptimizationNoSizeConstraints</name>
+                    <state>0</state>
+                </option>
                 <option>
                     <name>CCDefines</name>
-                    <state>STM32WL55xx</state>
                     <state>CORE_CM4</state>
                     <state>USE_HAL_DRIVER</state>
+                    <state>STM32WL55xx</state>
                 </option>
                 <option>
                     <name>CCPreprocFile</name>
@@ -348,7 +352,6 @@
                 <option>
                     <name>CCIncludePath2</name>
                     <state>$PROJ_DIR$/../Core/Inc</state>
-                    <state>$PROJ_DIR$/../Common/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/BSP/STM32WLxx_Nucleo</state>
                     <state>$PROJ_DIR$/../../../../../../Drivers/CMSIS/Include</state>
@@ -425,11 +428,11 @@
                 </option>
                 <option>
                     <name>IccStaticDestr</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCppInlineSemantics</name>
-                    <state>1</state>
+                    <state>0</state>
                 </option>
                 <option>
                     <name>IccCmsis</name>
@@ -439,10 +442,6 @@
                     <name>IccFloatSemantics</name>
                     <state>0</state>
                 </option>
-                <option>
-                    <name>CCOptimizationNoSizeConstraints</name>
-                    <state>0</state>
-                </option>
                 <option>
                     <name>CCNoLiteralPool</name>
                     <state>0</state>
@@ -781,7 +780,7 @@
                 </option>
                 <option>
                     <name>IlinkIcfFile</name>
-                    <state>$PROJ_DIR$\stm32wl55xx_flash_cm4.icf</state>
+                    <state>$PROJ_DIR$/stm32wl55xx_flash_cm4.icf</state>
                 </option>
                 <option>
                     <name>IlinkIcfFileSlave</name>
@@ -1226,6 +1225,9 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio.c</name>
             </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_fw.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\..\..\Middlewares\Third_Party\SubGHz_Phy\stm32_radio_driver\radio_driver.c</name>
             </file>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/startup_stm32wl55xx_cm4.s
index 1431e7f3..658ca8e5 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/EWARM/startup_stm32wl55xx_cm4.s
@@ -15,12 +15,12 @@
 ;*                      priority is Privileged, and the Stack is set to Main.
 ;********************************************************************************
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;
 ;*******************************************************************************
 ;
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/LocalNetwork_Sensor.uvoptx b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/LocalNetwork_Sensor.uvoptx
index df480fc9..7c51d93f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/LocalNetwork_Sensor.uvoptx
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/LocalNetwork_Sensor.uvoptx
@@ -26,7 +26,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>32000000</CLKADS>
+      <CLKADS>48000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -117,6 +117,26 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMRTXEVENTFLAGS</Key>
+          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGTARM</Key>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>ARMDBGFLAGS</Key>
+          <Name></Name>
+        </SetRegEntry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>DLGUARM</Key>
+          <Name>(105=-1,-1,-1,-1,0)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
@@ -125,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
+          <Name>-U002F003A3038510534333935 -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(6BA02477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32WLxx_CM4.FLM -FS08000000 -FL040000 -FP0($$Device:STM32WL55JCIx$CMSIS\Flash\STM32WLxx_CM4.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
@@ -520,7 +540,7 @@
 
   <Group>
     <GroupName>Drivers/STM32WLxx_HAL_Driver</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -815,6 +835,18 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
+      <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</PathWithFileName>
+      <FilenameWithoutPath>radio_fw.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>9</GroupNumber>
+      <FileNumber>49</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
       <PathWithFileName>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</PathWithFileName>
       <FilenameWithoutPath>radio_driver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -830,7 +862,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>49</FileNumber>
+      <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -842,7 +874,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>50</FileNumber>
+      <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -854,7 +886,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>51</FileNumber>
+      <FileNumber>52</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -866,7 +898,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>52</FileNumber>
+      <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -878,7 +910,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>53</FileNumber>
+      <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -890,7 +922,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>54</FileNumber>
+      <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -902,7 +934,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>55</FileNumber>
+      <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -914,7 +946,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>56</FileNumber>
+      <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/LocalNetwork_Sensor.uvprojx b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/LocalNetwork_Sensor.uvprojx
index 8ab37b43..94e5a41d 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/LocalNetwork_Sensor.uvprojx
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/LocalNetwork_Sensor.uvprojx
@@ -10,15 +10,15 @@
       <TargetName>LocalNetwork_Sensor</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
+      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32WL55JCIx:CM4</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32WLxx_DFP.1.0.6</PackID>
-          <PackURL>http://www.keil.com/pack</PackURL>
-          <Cpu>IROM(0x08000000-0x803FFFF) IRAM(0x20000000-0x20007FFF) IRAM2(0x20008000-0x2000FFFF) CLOCK(12000000) FPU2 CPUTYPE("Cortex-M4") TZ</Cpu>
+          <PackID>Keil.STM32WLxx_DFP.1.1.0</PackID>
+          <PackURL>http://www.keil.com/pack/</PackURL>
+          <Cpu>IRAM(0x20000000-0x20003FFF) IRAM2(0x20008000-0x2000BFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") TZ</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile></StartupFile>
           <FlashDriverDll></FlashDriverDll>
@@ -48,7 +48,7 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>LocalNetwork_Sensor\Exe\</OutputDirectory>
+          <OutputDirectory>LocalNetwork_Sensor\</OutputDirectory>
           <OutputName>LocalNetwork_Sensor</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
@@ -183,8 +183,9 @@
             <hadIRAM>1</hadIRAM>
             <hadXRAM>0</hadXRAM>
             <uocXRam>0</uocXRam>
-            <RvdsVP>1</RvdsVP>
+            <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>1</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -245,12 +246,12 @@
               <IRAM>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x8000</Size>
+                <Size>0x4000</Size>
               </IRAM>
               <IROM>
                 <Type>1</Type>
                 <StartAddress>0x8000000</StartAddress>
-                <Size>0x40000</Size>
+                <Size>0x20000</Size>
               </IROM>
               <XRAM>
                 <Type>0</Type>
@@ -335,10 +336,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls></MiscControls>
-              <Define>STM32WL55xx,CORE_CM4,USE_HAL_DRIVER</Define>
+              <MiscControls>-fshort-enums</MiscControls>
+              <Define>CORE_CM4,USE_HAL_DRIVER,STM32WL55xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../Common/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace;../SubGHz_Phy/Target;../SubGHz_Phy/App;../../LocalNetwork_Concentrator/Common/Inc</IncludePath>
+              <IncludePath>../Core/Inc;../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc;../../../../../../Drivers/BSP/STM32WLxx_Nucleo;../../../../../../Drivers/CMSIS/Include;../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include;../../../../../../Middlewares/Third_Party/SubGHz_Phy;../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver;../../../../../../Utilities/lpm/tiny_lpm;../../../../../../Utilities/misc;../../../../../../Utilities/sequencer;../../../../../../Utilities/timer;../../../../../../Utilities/trace/adv_trace;../SubGHz_Phy/Target;../SubGHz_Phy/App;../../LocalNetwork_Concentrator/Common/Inc</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -351,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -657,6 +658,11 @@
               <FileType>1</FileType>
               <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</FilePath>
             </File>
+            <File>
+              <FileName>radio_fw.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</FilePath>
+            </File>
             <File>
               <FileName>radio_driver.c</FileName>
               <FileType>1</FileType>
@@ -729,4 +735,19 @@
     <files/>
   </RTE>
 
+  <LayerInfo>
+    <Layers>
+      <Layer>
+        <LayName>&lt;Project Info&gt;</LayName>
+        <LayDesc></LayDesc>
+        <LayUrl></LayUrl>
+        <LayKeys></LayKeys>
+        <LayCat></LayCat>
+        <LayLic></LayLic>
+        <LayTarg>0</LayTarg>
+        <LayPrjMark>1</LayPrjMark>
+      </Layer>
+    </Layers>
+  </LayerInfo>
+
 </Project>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/startup_stm32wl55xx_cm4.s
index 4ccae29d..a52e507f 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/startup_stm32wl55xx_cm4.s
@@ -14,12 +14,12 @@
 ;******************************************************************************
 ;* @attention
 ;*
-;* Copyright (c) 2020 STMicroelectronics. All rights reserved.
+;* Copyright (c) 2020(2021) STMicroelectronics.
+;* All rights reserved.
 ;*
-;* This software component is licensed by ST under 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:
-;*                        opensource.org/licenses/Apache-2.0
+;* This software is licensed under terms that can be found in the LICENSE file
+;* in the root directory of this software component.
+;* If no LICENSE file comes with this software, it is provided AS-IS.
 ;*
 ;******************************************************************************
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/stm32wl55xx_flash_cm4.sct b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/stm32wl55xx_flash_cm4.sct
index 135ceb14..574c8f1a 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/stm32wl55xx_flash_cm4.sct
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/MDK-ARM/stm32wl55xx_flash_cm4.sct
@@ -2,19 +2,18 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
-  ; FLASH part dedicated to M4
-  ER_IROM1 0x08000000 0x00020000  {  ; load address = execution address
+LR_IROM1 0x08000000 0x00040000  {    ; load region size_region
+  ; FLASH
+  ER_IROM1 0x08000000 0x00040000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)
   }
-  ; Non-backup SRAM1 dedicated to M4
-  RW_IRAM1 0x20000000 0x00004000  {  ; RW data
+  ; Non-backup SRAM1
+  RW_IRAM1 0x20000000 0x00008000  {  ; RW data
    .ANY (+RW +ZI)
   }
-  ; Backup SRAM2 dedicated to M4
-  RW_IRAM2 0x20008000 ALIGN 4 0x00004000  {  ; RW data
-   .ANY (+RW +ZI)
+  ; Backup SRAM2
+  RW_IRAM2 0x20008000 EMPTY 0x00008000  {  ; to be modified accordingly to user project. Can be NoInit data for backup usage, RW, ZI region, etc...
   }
 }
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/.cproject
index 032a31a5..5a5d4ad6 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/.cproject
@@ -10,6 +10,7 @@
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -18,11 +19,11 @@
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1190768917" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
 							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1799137810" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.5585584" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801697261" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2025793403" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.392620907" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.801697261" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2025793403" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.392620907" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2021892859" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1557389453" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1557389453" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1608474235" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/LocalNetwork_Sensor}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.839273790" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.754271990" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -31,7 +32,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1489840519" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1088368083" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.194190494" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.194190494" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.og" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.513493159" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
@@ -62,14 +63,14 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2068965098" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.479062137" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.419274375" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.419274375" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.73018535" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.577449596" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.143035263" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.143035263" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.405337869" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.19084737" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
@@ -94,19 +95,20 @@
 					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1419000794" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1419000794." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1455908214" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1408083214" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.78030957" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1163853994" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.603807858" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2031399645" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1757190645" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.332265939" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1408083214" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.78030957" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1163853994" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.603807858" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.2031399645" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1757190645" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.332265939" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Core/Inc | ../../LoRaWAN/App | ../../LoRaWAN/Target | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Utilities/trace/adv_trace | ../../../../../../../Utilities/misc | ../../../../../../../Utilities/sequencer | ../../../../../../../Utilities/timer | ../../../../../../../Utilities/lpm/tiny_lpm | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/packages | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy | ../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Conf | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac | ../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler | ../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities | ../../../../../../../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.51625410" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/LocalNetwork_Sensor}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1885755997" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.327412967" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -145,14 +147,14 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1876971924" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1165782354" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1122299919" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1122299919" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.149358669" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.557570763" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.104558393" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55XX_FLASH_CM4.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.104558393" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1155679616" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.690607626" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
@@ -184,4 +186,4 @@
 	</storageModule>
 	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>
+</cproject>
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/.project b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/.project
index 7a067228..bdbba277 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/.project
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/.project
@@ -23,8 +23,8 @@
 		<nature>org.eclipse.cdt.core.cnature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAev2ProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUNonUnderRootProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUAdvancedStructureProjectNature</nature>
-		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledTrustZoneProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUEndUserDisabledMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCUMultiCpuProjectNature</nature>
 		<nature>com.st.stm32cube.ide.mcu.MCURootProjectNature</nature>
@@ -32,45 +32,50 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>Doc/readme.txt</name>
+			<type>1</type>
+			<locationURI>PARENT-1-PROJECT_LOC/readme.txt</locationURI>
+		</link>
 		<link>
 			<name>Utilities/stm32_adv_trace.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/trace/adv_trace/stm32_adv_trace.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_lpm.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/lpm/tiny_lpm/stm32_lpm.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_mem.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_mem.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_mem.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_seq.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/sequencer/stm32_seq.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/sequencer/stm32_seq.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_systime.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_systime.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_systime.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_timer.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/timer/stm32_timer.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/timer/stm32_timer.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_sscanf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_sscanf.c</locationURI>
 		</link>
 		<link>
 			<name>Utilities/stm32_tiny_vsnprintf.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Utilities/misc/stm32_tiny_vsnprintf.c</locationURI>
 		</link>
 		<link>
 			<name>Application/App/demo_sensor.c</name>
@@ -95,17 +100,17 @@
 		<link>
 			<name>Application/Core/adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/adc_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/adc_if.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/adc_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/dma.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/dma.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/main.c</name>
@@ -115,52 +120,52 @@
 		<link>
 			<name>Application/Core/rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/rtc.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/stm32_lpm_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32_lpm_if.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32_lpm_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/stm32wlxx_hal_msp.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_hal_msp.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_hal_msp.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/stm32wlxx_it.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/stm32wlxx_it.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_it.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/subghz.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/sys_app.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_app.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_app.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/sys_debug.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/sys_debug.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/sys_debug.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/timer_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/timer_if.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/timer_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/usart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Core/usart_if.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/usart_if.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/usart_if.c</locationURI>
 		</link>
 		<link>
 			<name>Application/Target/radio_board_if.c</name>
@@ -170,107 +175,107 @@
 		<link>
 			<name>Drivers/CMSIS/system_stm32wlxx.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/Core/Src/system_stm32wlxx.c</locationURI>
+			<locationURI>PARENT-1-PROJECT_LOC/Core/Src/system_stm32wlxx.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_adc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_adc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_cortex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_cortex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_dma_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_dma_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_exti.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_exti.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_gpio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_gpio.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_pwr_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_pwr_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rcc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rcc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_rtc_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_rtc_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_subghz.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_tim_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_tim_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_hal_uart_ex.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_uart_ex.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_HAL_Driver/stm32wlxx_ll_adc.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Drivers/STM32WLxx_HAL_Driver/Src/stm32wlxx_ll_adc.c</locationURI>
 		</link>
 		<link>
 			<name>Drivers/STM32WLxx_Nucleo/stm32wlxx_nucleo.c</name>
@@ -285,12 +290,17 @@
 		<link>
 			<name>Middlewares/SubGHz_Phy/radio.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio.c</locationURI>
+		</link>
+		<link>
+			<name>Middlewares/SubGHz_Phy/radio_fw.c</name>
+			<type>1</type>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_fw.c</locationURI>
 		</link>
 		<link>
 			<name>Middlewares/SubGHz_Phy/radio_driver.c</name>
 			<type>1</type>
-			<locationURI>$%7BPARENT-6-PROJECT_LOC%7D/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
+			<locationURI>PARENT-6-PROJECT_LOC/Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver/radio_driver.c</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/Application/Core/syscalls.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/Application/Core/syscalls.c
index 4ec95844..bc0dd6c0 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/Application/Core/syscalls.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/Application/Core/syscalls.c
@@ -33,12 +33,9 @@
 
 
 /* Variables */
-//#undef errno
-extern int errno;
 extern int __io_putchar(int ch) __attribute__((weak));
 extern int __io_getchar(void) __attribute__((weak));
 
-register char * stack_ptr asm("sp");
 
 char *__env[1] = { 0 };
 char **environ = __env;
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s
index 89dfe9e5..80ba57c9 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/Application/Startup/startup_stm32wl55xx_cm4.s
@@ -14,13 +14,12 @@
   ******************************************************************************
   * @attention
   *
-  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
-  * All rights reserved.</center></h2>
+  * Copyright (c) 2020(-2021) STMicroelectronics.
+  * All rights reserved.
   *
-  * This software component is licensed by ST under 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:
-  *                        opensource.org/licenses/Apache-2.0
+  * This software is licensed under terms that can be found in the LICENSE file
+  * in the root directory of this software component.
+  * If no LICENSE file comes with this software, it is provided AS-IS.
   *
   ******************************************************************************
   */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..74ed46df
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,190 @@
+/*
+******************************************************************************
+**
+**  File        : LinkerScript.ld
+**
+**  Author      : STM32CubeIDE
+**
+**  Abstract    : Linker script for STM32WL55xC Device
+**                      256Kbytes FLASH
+**                      64Kbytes RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Note:       : For specific memory allocation, linker and startup files must be customized.
+**                Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
+**
+**  Target      : STMicroelectronics STM32
+**
+**  Distribution: The file is distributed as is without any warranty
+**                of any kind.
+**
+*****************************************************************************
+** @attention
+**
+** <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+** All rights reserved.</center></h2>
+**
+** This software component is licensed by ST under BSD 3-Clause license,
+** the "License"; You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at:
+**                        opensource.org/licenses/BSD-3-Clause
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "RAM1" Ram type memory */
+
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x1000 ; /* required amount of stack */
+
+/* Memories definition */
+MEMORY
+{
+  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K
+  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K
+  FLASH   (rx)   : ORIGIN = 0x08000000, LENGTH = 256K
+}
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "FLASH" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+  } >FLASH
+
+  /* The program code and other data into "FLASH" Rom type memory */
+  .text :
+  {
+    . = ALIGN(4);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data into "FLASH" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(4);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM.extab   : {
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
+  } >FLASH
+
+  .ARM : {
+    . = ALIGN(4);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(4);
+  } >FLASH
+
+  .preinit_array     :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .init_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  .fini_array :
+  {
+    . = ALIGN(4);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(4);
+  } >FLASH
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "RAM1" Ram type memory */
+  .data :
+  {
+    . = ALIGN(4);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+    *(.RamFunc)        /* .RamFunc sections */
+    *(.RamFunc*)       /* .RamFunc* sections */
+
+    . = ALIGN(4);
+    _edata = .;        /* define a global symbol at data end */
+
+  } >RAM1 AT> FLASH
+
+  /* Uninitialized data section into "RAM1" Ram type memory */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM1
+
+  /* User_heap_stack section, used to check that there is enough "RAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM1
+
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/STM32WL55XX_FLASH_CM4.ld b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/STM32WL55XX_FLASH_CM4.ld
deleted file mode 100644
index adbec013..00000000
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/STM32CubeIDE/STM32WL55XX_FLASH_CM4.ld
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-** LinkerScript
-*/
-
-/* Entry Point */
-ENTRY(Reset_Handler)
-
-/* Highest address of the user mode stack */
-_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "SRAM1" Ram type memory */
-
-_Min_Heap_Size  = 0x200; /* required amount of heap  */
-_Min_Stack_Size = 0x800 ; /* required amount of stack */
-
-/* Memories definition */
-MEMORY
-{
-  ROM    (rx)    : ORIGIN = 0x08000000, LENGTH = 256K   /* Flash memory dedicated to CM4 */
-  RAM1   (xrw)   : ORIGIN = 0x20000000, LENGTH = 32K    /* Non-backup SRAM1 dedicated to CM4 */
-  RAM2   (xrw)   : ORIGIN = 0x20008000, LENGTH = 32K    /* Backup SRAM2 dedicated to CM4 */
-}
-
-/* Sections */
-SECTIONS
-{
-  /* The startup code into "ROM" Rom type memory */
-  .isr_vector :
-  {
-    . = ALIGN(8);
-    KEEP(*(.isr_vector)) /* Startup code */
-    . = ALIGN(8);
-  } >ROM
-
-  /* The program code and other data into "ROM" Rom type memory */
-  .text :
-  {
-    . = ALIGN(8);
-    *(.text)           /* .text sections (code) */
-    *(.text*)          /* .text* sections (code) */
-    *(.glue_7)         /* glue arm to thumb code */
-    *(.glue_7t)        /* glue thumb to arm code */
-    *(.eh_frame)
-
-    KEEP (*(.init))
-    KEEP (*(.fini))
-
-    . = ALIGN(8);
-    _etext = .;        /* define a global symbols at end of code */
-  } >ROM
-
-  /* Constant data into "ROM" Rom type memory */
-  .rodata :
-  {
-    . = ALIGN(8);
-    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
-    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    . = ALIGN(8);
-  } >ROM
-
-  .ARM.extab   : { 
-    . = ALIGN(8);
-    *(.ARM.extab* .gnu.linkonce.armextab.*)
-    . = ALIGN(8);
-  } >ROM
-  
-  .ARM : {
-    . = ALIGN(8);
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-    . = ALIGN(8);
-  } >ROM
-
-  .preinit_array     :
-  {
-    . = ALIGN(8);
-    PROVIDE_HIDDEN (__preinit_array_start = .);
-    KEEP (*(.preinit_array*))
-    PROVIDE_HIDDEN (__preinit_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
-  .init_array :
-  {
-    . = ALIGN(8);
-    PROVIDE_HIDDEN (__init_array_start = .);
-    KEEP (*(SORT(.init_array.*)))
-    KEEP (*(.init_array*))
-    PROVIDE_HIDDEN (__init_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-  
-  .fini_array :
-  {
-    . = ALIGN(8);
-    PROVIDE_HIDDEN (__fini_array_start = .);
-    KEEP (*(SORT(.fini_array.*)))
-    KEEP (*(.fini_array*))
-    PROVIDE_HIDDEN (__fini_array_end = .);
-    . = ALIGN(8);
-  } >ROM
-
-  /* Used by the startup to initialize data */
-  _sidata = LOADADDR(.data);
-
-  /* Initialized data sections into "SRAM1" Ram type memory */
-  .data : 
-  {
-    . = ALIGN(8);
-    _sdata = .;        /* create a global symbol at data start */
-    *(.data)           /* .data sections */
-    *(.data*)          /* .data* sections */
-
-    . = ALIGN(8);
-    _edata = .;        /* define a global symbol at data end */
-    
-  } >RAM1 AT> ROM
-
-  /* Uninitialized data section into "SRAM1" Ram type memory */
-  . = ALIGN(8);
-  .bss :
-  {
-    /* This is used by the startup in order to initialize the .bss section */
-    _sbss = .;         /* define a global symbol at bss start */
-    __bss_start__ = _sbss;
-    *(.bss)
-    *(.bss*)
-    *(COMMON)
-
-    . = ALIGN(8);
-    _ebss = .;         /* define a global symbol at bss end */
-    __bss_end__ = _ebss;
-  } >RAM1
-
-  /* Data section into "SRAM1" Ram type memory: Non-backup SRAM1 dedicated to CM4 */
-  . = ALIGN(8);
-  RAM1_region :
-  {
-    _sRAM_region = .;         /* define a global symbol at section start */
-    *(.RAM1_region)
-
-    . = ALIGN(8);
-    _eRAM1_region = .;         /* define a global symbol at section end */
-  } >RAM1
-
-  /* Data section into "SRAM2" Ram type memory: Backup SRAM2 dedicated to CM4 */
-  . = ALIGN(8);
-  RAM2_region :
-  {
-    _sRAM2_region = .;         /* define a global symbol at section start */
-    *(.RAM2_region)
-
-    . = ALIGN(8);
-    _eRAM2_region = .;         /* define a global symbol at section end */
-  } >RAM2
-
-  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
-  ._user_heap_stack :
-  {
-    . = ALIGN(8);
-    PROVIDE ( end = . );
-    PROVIDE ( _end = . );
-    . = . + _Min_Heap_Size;
-    . = . + _Min_Stack_Size;
-    . = ALIGN(8);
-  } >RAM1
-
-  /* Remove information from the compiler libraries */
-  /DISCARD/ :
-  {
-    libc.a ( * )
-    libm.a ( * )
-    libgcc.a ( * )
-  }
-
-  .ARM.attributes 0 : { *(.ARM.attributes) }
-}
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.c
index b093ce7b..f0b34be3 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.c
@@ -1,21 +1,21 @@
 /**
- ******************************************************************************
- * @file    demo_sensor.c
- * @author  MCD Application Team
- * @brief   Concentrator behavior module for STM32WL Concentrator Demo.
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under Ultimate Liberty license
- * SLA0044, the "License"; You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- *                             www.st.com/SLA0044
- *
- ******************************************************************************
- */
+  ******************************************************************************
+  * @file    demo_sensor.c
+  * @author  MCD Application Team
+  * @brief   Concentrator behavior module for STM32WL Concentrator Demo.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+  * All rights reserved.</center></h2>
+  *
+  * This software component is licensed by ST under Ultimate Liberty license
+  * SLA0044, the "License"; You may not use this file except in compliance with
+  * the License. You may obtain a copy of the License at:
+  *                             www.st.com/SLA0044
+  *
+  ******************************************************************************
+  */
 
 #include <string.h>
 
@@ -61,9 +61,9 @@ typedef struct
   UTIL_TIMER_Object_t SyncTimer;        /**<Timer when sync is expected*/
   UTIL_TIMER_Object_t ReceiveTimer;     /**<Timer for RX timeout when receiving Beacon or Sync*/
   UTIL_TIMER_Object_t CadTimer;         /**<Timer for CAD timeout when scanning*/
-  const DEMO_Region_t* Region;  /**<Pointer to tuned region*/
+  const DEMO_Region_t *Region;  /**<Pointer to tuned region*/
   uint32_t RegionNr;            /**<Number of tuned region*/
-  const DEMO_Subregion_t* Subregion;  /**<Pointer to tuned subregion*/
+  const DEMO_Subregion_t *Subregion;  /**<Pointer to tuned subregion*/
   void (*GetDataCallback)(void); /**<Callback called before transmission*/
   void (*ActivityCallback)(void); /**<Callback called on every activity to blink LEDs or something*/
   uint32_t SubregionNr;         /**<Number of tuned subregion*/
@@ -79,29 +79,29 @@ typedef struct
 } SENS_Global_t;
 static SENS_Global_t SENS; /*Global variables of this module*/
 
-static void ReceiveBeacon(void* context);
-static void ReceiveSync(void* context);
-static void Transmit(void* context);
-static void ReceiveTimeout(void* context);
-static void CadTimeout(void* context);
+static void ReceiveBeacon(void *context);
+static void ReceiveSync(void *context);
+static void Transmit(void *context);
+static void ReceiveTimeout(void *context);
+static void CadTimeout(void *context);
 static void StartScanning(void);
 static void OneScan(void);
 static void ChangeState(SENS_State_t State);
-static bool ValidReceivedBeacon(DEMO_packet_beacon_t* Beacon);
-static bool ValidReceivedSync(DEMO_packet_sync_t* Sync, uint32_t Size, uint32_t RadioRandom);
-static void ProcessCodingChanges(DEMO_packet_sync_t* Sync, uint32_t Size);
-
-static void TxDone (void);
-static void TxTimeout (void);
-static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
-static void RxTimeout (void);
-static void RxError (void);
-static void FhssChangeChannel (uint8_t currentChannel);
-static void CadDone (bool channelActivityDetected);
+static bool ValidReceivedBeacon(DEMO_packet_beacon_t *Beacon);
+static bool ValidReceivedSync(DEMO_packet_sync_t *Sync, uint32_t Size, uint32_t RadioRandom);
+static void ProcessCodingChanges(DEMO_packet_sync_t *Sync, uint32_t Size);
+
+static void TxDone(void);
+static void TxTimeout(void);
+static void RxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr);
+static void RxTimeout(void);
+static void RxError(void);
+static void FhssChangeChannel(uint8_t currentChannel);
+static void CadDone(bool channelActivityDetected);
 
 /**
- * @brief Structure with handlers for radio events.
- */
+  * @brief Structure with handlers for radio events.
+  */
 static RadioEvents_t SENS_RadioEvents;
 
 
@@ -109,11 +109,11 @@ static RadioEvents_t SENS_RadioEvents;
 
 
 /**
- * @brief Initialize Sensor and start scanning for Beacon.
- * @param GetDataCallback called before transmission, quickly add data to transmit, do block in the callback
- * @param ActivityCallback called on every activity to blink LED or something
- */
-int SENS_Init (void (*GetDataCallback)(void), void (*ActivityCallback)(void))
+  * @brief Initialize Sensor and start scanning for Beacon.
+  * @param GetDataCallback called before transmission, quickly add data to transmit, do block in the callback
+  * @param ActivityCallback called on every activity to blink LED or something
+  */
+int SENS_Init(void (*GetDataCallback)(void), void (*ActivityCallback)(void))
 {
   UTILS_ENTER_CRITICAL_SECTION();
 
@@ -152,9 +152,9 @@ int SENS_Init (void (*GetDataCallback)(void), void (*ActivityCallback)(void))
 
   /*Init radio timers*/
   UTIL_TIMER_Create(&SENS.BeaconTimer, 0, UTIL_TIMER_ONESHOT, ReceiveBeacon, NULL);
-  UTIL_TIMER_Create(&SENS.SyncTimer, 0, UTIL_TIMER_ONESHOT,ReceiveSync, NULL);
-  UTIL_TIMER_Create(&SENS.TransmitTimer, 0, UTIL_TIMER_ONESHOT,Transmit, NULL);
-  UTIL_TIMER_Create(&SENS.ReceiveTimer, 0, UTIL_TIMER_ONESHOT,ReceiveTimeout, NULL);
+  UTIL_TIMER_Create(&SENS.SyncTimer, 0, UTIL_TIMER_ONESHOT, ReceiveSync, NULL);
+  UTIL_TIMER_Create(&SENS.TransmitTimer, 0, UTIL_TIMER_ONESHOT, Transmit, NULL);
+  UTIL_TIMER_Create(&SENS.ReceiveTimer, 0, UTIL_TIMER_ONESHOT, ReceiveTimeout, NULL);
   UTIL_TIMER_Create(&SENS.CadTimer, SENS_CAD_TIMEOUT, UTIL_TIMER_ONESHOT, CadTimeout, NULL);
 
   /*Start scanning*/
@@ -169,10 +169,10 @@ int SENS_Init (void (*GetDataCallback)(void), void (*ActivityCallback)(void))
 }
 
 /**
- * @brief Store data to send in next packet.
- * @param Data structure
- */
-void SENS_WriteSensorData(const DEMO_data_1_0_t* Data)
+  * @brief Store data to send in next packet.
+  * @param Data structure
+  */
+void SENS_WriteSensorData(const DEMO_data_1_0_t *Data)
 {
   APP_LOG(TS_ON, VLEVEL_M, "Sensor data written\r\n");
 
@@ -183,26 +183,26 @@ void SENS_WriteSensorData(const DEMO_data_1_0_t* Data)
 }
 
 /**
- * @brief Get state of the sensor connection.
- * @return one of SENS_State_t
- */
+  * @brief Get state of the sensor connection.
+  * @return one of SENS_State_t
+  */
 SENS_State_t SENS_GetState(void)
 {
   return SENS.State;
 }
 
 /**
- * @brief Start receiving for Beacon.
- * @param context not used
- */
-static void ReceiveBeacon(void* context)
+  * @brief Start receiving for Beacon.
+  * @param context not used
+  */
+static void ReceiveBeacon(void *context)
 {
-  if(SENS.State != SENS_STATE_Scan)
+  if (SENS.State != SENS_STATE_Scan)
   {
     Radio.Standby();      /*Prepare for RX*/
     Radio.SetChannel(SENS.Region->beacon_freq); /*Frequency*/
-    
-    if (SENS.RegionNr==1)
+
+    if (SENS.RegionNr == 1)
     {
       /*For FCC, force beacon at 500kHZ/SF12*/
       Radio.SetRxConfig(MODEM_LORA,
@@ -234,7 +234,7 @@ static void ReceiveBeacon(void* context)
                         0, 0, /*No hopping*/
                         0,  /*IQ not inverted*/
                         1); /*Continuous receive mode*/
-     }
+    }
   }
   Radio.Rx(0);
 
@@ -246,8 +246,8 @@ static void ReceiveBeacon(void* context)
   {
     /*Set to the latest time a Beacon can come*/
     UTIL_TIMER_Stop(&SENS.ReceiveTimer);
-    UTIL_TIMER_SetPeriod(&SENS.ReceiveTimer, DEMO_MAX_END_OF_PACKET_RX + 2*SENS.Missed*SENS_TIMING_TOLERANCE
-                  + SENS_TIMING_PRERECEIVE + Radio.GetWakeupTime());    /*Add time of initialization to timeout*/
+    UTIL_TIMER_SetPeriod(&SENS.ReceiveTimer, DEMO_MAX_END_OF_PACKET_RX + 2 * SENS.Missed * SENS_TIMING_TOLERANCE
+                         + SENS_TIMING_PRERECEIVE + Radio.GetWakeupTime());    /*Add time of initialization to timeout*/
     APP_LOG(TS_ON, VLEVEL_M, "Receive for beacon\r\n");
   }
   else
@@ -255,7 +255,7 @@ static void ReceiveBeacon(void* context)
     /*Receive for whole period*/
     UTIL_TIMER_Stop(&SENS.ReceiveTimer);
     UTIL_TIMER_SetPeriod(&SENS.ReceiveTimer, SENS_LOST_DUTY_RX
-                  + SENS_TIMING_PRERECEIVE + Radio.GetWakeupTime());    /*Add time of initialization to timeout*/
+                         + SENS_TIMING_PRERECEIVE + Radio.GetWakeupTime());    /*Add time of initialization to timeout*/
     APP_LOG(TS_ON, VLEVEL_L, "Receive for the whole period\r\n");
   }
   UTIL_TIMER_Start(&SENS.ReceiveTimer);
@@ -265,16 +265,16 @@ static void ReceiveBeacon(void* context)
 }
 
 /**
- * @brief Start receiving for Sync.
- * @param context not used
- */
-static void ReceiveSync(void* context)
+  * @brief Start receiving for Sync.
+  * @param context not used
+  */
+static void ReceiveSync(void *context)
 {
-  const DEMO_Channel_t* channel;
+  const DEMO_Channel_t *channel;
 
   Radio.Standby();      /*Prepare for RX*/
 
-  if(SENS.Subregion->hopping == true)
+  if (SENS.Subregion->hopping == true)
   {
     /*Select one of available channels, depending only on seed*/
     channel = &(SENS.Subregion->channels[SENS.Seed % SENS.Subregion->channels_n]);
@@ -305,7 +305,7 @@ static void ReceiveSync(void* context)
   /*Set to the latest time a packet can come*/
   UTIL_TIMER_Stop(&SENS.ReceiveTimer);
   UTIL_TIMER_SetPeriod(&SENS.ReceiveTimer, DEMO_MAX_END_OF_PACKET_RX
-                + SENS_TIMING_PRERECEIVE + Radio.GetWakeupTime());    /*Add time of initialization to timeout*/
+                       + SENS_TIMING_PRERECEIVE + Radio.GetWakeupTime());    /*Add time of initialization to timeout*/
   UTIL_TIMER_Start(&SENS.ReceiveTimer);
 
   /*Notify*/
@@ -314,32 +314,32 @@ static void ReceiveSync(void* context)
 }
 
 /**
- * @brief Start transmitting in sensor slot.
- * @param context not used
- * @note This function doesn't use Radio.SetTxConfig() because it allows only LoRaWAN modulation
- *    and it doesn't use Radio.Send() because it highly depends on SetTxConfig.
- */
-static void Transmit(void* context)
+  * @brief Start transmitting in sensor slot.
+  * @param context not used
+  * @note This function doesn't use Radio.SetTxConfig() because it allows only LoRaWAN modulation
+  *    and it doesn't use Radio.Send() because it highly depends on SetTxConfig.
+  */
+static void Transmit(void *context)
 {
-  const DEMO_Channel_t* channel;      /*Pointer to channel used to transmit*/
+  const DEMO_Channel_t *channel;      /*Pointer to channel used to transmit*/
   uint8_t ant_switch;
   PacketParams_t pck_params;
   ModulationParams_t mod_params;
 
   /*Application Callback*/
-  if(SENS.GetDataCallback != NULL)
+  if (SENS.GetDataCallback != NULL)
   {
     SENS.GetDataCallback();     /*Get new data to transmit*/
   }
 
   /*Select channel*/
-  if(SENS.Subregion->hopping == true)
+  if (SENS.Subregion->hopping == true)
   {
     /*Get number of used channels*/
     uint32_t channel_count = SENS.Subregion->channels_n;
     /*Get the right number in pseudorandom sequence*/
     uint32_t pseudorandom = SENS.Seed;
-    for(int i = 1; i < SENS.Codings.hdr.slot; i++)
+    for (int i = 1; i < SENS.Codings.hdr.slot; i++)
     {
       pseudorandom = DEMO_PSEUDORANDOM_NEXT(pseudorandom);
     }
@@ -387,7 +387,7 @@ static void Transmit(void* context)
     mod_params.PacketType = PACKET_TYPE_LORA;
     mod_params.Params.LoRa.SpreadingFactor = DEMO_GetSpreadingFactor(&(SENS.Codings.lora));
     mod_params.Params.LoRa.Bandwidth = DEMO_GetBandwidth(&(SENS.Codings.lora));
-    mod_params.Params.LoRa.CodingRate= DEMO_GetCoderate(&(SENS.Codings.lora));
+    mod_params.Params.LoRa.CodingRate = DEMO_GetCoderate(&(SENS.Codings.lora));
     mod_params.Params.LoRa.LowDatarateOptimize = SENS.Codings.lora.de;
 
     pck_params.PacketType = PACKET_TYPE_LORA;
@@ -449,7 +449,7 @@ static void Transmit(void* context)
     {
       paSelect = RFO_HP;
     }
-    SUBGRF_SetTxParams( paSelect, channel->power, DEMO_GetRampUp(&(SENS.Codings.fsk)) );
+    SUBGRF_SetTxParams(paSelect, channel->power, DEMO_GetRampUp(&(SENS.Codings.fsk)));
     ant_switch = paSelect;
   }
 
@@ -460,28 +460,28 @@ static void Transmit(void* context)
                          IRQ_RADIO_NONE);
 
   /*Set DBG pin PB13*/
-#ifdef LET_SUBGHZ_MW_USING_DGB_LINE2_PIN
-  DBG_GPIO_SET_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-#endif
+#ifdef LET_SUBGHZ_MW_USING_PROBE_LINE2_PIN
+  PROBE_GPIO_SET_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
+#endif /* LET_SUBGHZ_MW_USING_PROBE_LINE2_PIN */
 
   /*Send*/
   SUBGRF_SetSwitch(ant_switch, RFSWITCH_TX);  /*Set RF switch*/
   SUBGRF_SendPayload(SENS.Packet, SENS.Codings.hdr.data_lim, 0);
   SENS.Header.packet_cnt++;   /*Count number of sent packets*/
-  
-  APP_LOG(TS_ON, VLEVEL_M, "Tx at %d\r\n",channel->freq);
+
+  APP_LOG(TS_ON, VLEVEL_M, "Tx at %d\r\n", channel->freq);
 
   /*Notification*/
   (*SENS.ActivityCallback)();
 }
 
 /**
- * @brief Timeout when planned receive was unsuccessful.
- * @param context not used
- */
-static void ReceiveTimeout(void* context)
+  * @brief Timeout when planned receive was unsuccessful.
+  * @param context not used
+  */
+static void ReceiveTimeout(void *context)
 {
-  if(SENS.State == SENS_STATE_Scan)
+  if (SENS.State == SENS_STATE_Scan)
   {
     SENS.ReceivingBeacon = false;
     Radio.Standby();
@@ -492,7 +492,7 @@ static void ReceiveTimeout(void* context)
   Radio.Sleep();
 
 
-  if(SENS.ReceivingBeacon == true)  /*Beacon was missed*/
+  if (SENS.ReceivingBeacon == true) /*Beacon was missed*/
   {
     SENS.ReceivingBeacon = false;
 
@@ -510,7 +510,7 @@ static void ReceiveTimeout(void* context)
 
       APP_LOG(TS_ON, VLEVEL_L, "Missed Beacon %u\r\n", SENS.Missed);
 
-      if(SENS.Missed >= SENS_MAX_MISSED_TO_LOST)
+      if (SENS.Missed >= SENS_MAX_MISSED_TO_LOST)
       {
         SENS.Codings.hdr.slot = 0;   /*Reset slot*/
         SENS.TxDutyCounter = 0; /*Reset duty cycle*/
@@ -521,15 +521,15 @@ static void ReceiveTimeout(void* context)
       {
         /*Start timer for next Beacon*/
         UTIL_TIMER_Stop(&SENS.BeaconTimer);
-        UTIL_TIMER_SetPeriod(&SENS.BeaconTimer, (SENS.Missed + 1)*(DEMO_SLOT_NUMBER*1000)
-                            - SENS_TIMING_PRERECEIVE - Radio.GetWakeupTime()  /*Start the radio this earlier*/
-                            - SENS.Missed*SENS_TIMING_TOLERANCE  /*Subtract tolerance*/
-                            + SENS.BeaconTime - UTIL_TIMER_GetCurrentTime()); /*Make the timer absolute to the last known period start*/
+        UTIL_TIMER_SetPeriod(&SENS.BeaconTimer, (SENS.Missed + 1) * (DEMO_SLOT_NUMBER * 1000)
+                             - SENS_TIMING_PRERECEIVE - Radio.GetWakeupTime()  /*Start the radio this earlier*/
+                             - SENS.Missed * SENS_TIMING_TOLERANCE /*Subtract tolerance*/
+                             + SENS.BeaconTime - UTIL_TIMER_GetCurrentTime()); /*Make the timer absolute to the last known period start*/
         UTIL_TIMER_Start(&SENS.BeaconTimer);
       }
     }
   }
-  else if(SENS.ReceivingSync == true)   /*Sync was missed*/
+  else if (SENS.ReceivingSync == true)  /*Sync was missed*/
   {
     SENS.ReceivingSync = false;
     APP_LOG(TS_ON, VLEVEL_L, "Missed Sync\r\n");
@@ -541,10 +541,10 @@ static void ReceiveTimeout(void* context)
 }
 
 /**
- * @brief CAD didn't finish in time.
- * @param context not used
- */
-static void CadTimeout (void* context)
+  * @brief CAD didn't finish in time.
+  * @param context not used
+  */
+static void CadTimeout(void *context)
 {
   /*Reinit radio*/
   Radio.Init(&SENS_RadioEvents);
@@ -557,8 +557,8 @@ static void CadTimeout (void* context)
 }
 
 /**
- * @brief Start the scanning process.
- */
+  * @brief Start the scanning process.
+  */
 static void StartScanning(void)
 {
   /*Init or reinit radio, without reinit CadTimeout() happens often*/
@@ -570,7 +570,7 @@ static void StartScanning(void)
   ChangeState(SENS_STATE_Scan);
 
   /*Disable STOP while scanning*/
-  UTIL_LPM_SetStopMode(1<<CFG_LPM_SENS_Id, UTIL_LPM_DISABLE);
+  UTIL_LPM_SetStopMode(1 << CFG_LPM_SENS_Id, UTIL_LPM_DISABLE);
 
   /*Set Region to overflow, so the scan starts with Region 0*/
   SENS.RegionNr = DEMO_Regions_n;
@@ -585,18 +585,18 @@ static void StartScanning(void)
 
 
 /**
- * @brief Start scanning for a Beacon.
- */
+  * @brief Start scanning for a Beacon.
+  */
 static void OneScan(void)
 {
-  if(SENS.State != SENS_STATE_Scan)
+  if (SENS.State != SENS_STATE_Scan)
   {
     return;
   }
 
   /*Check valid RegionNR or continue iterating*/
   SENS.RegionNr++;
-  if(SENS.RegionNr >= DEMO_Regions_n)
+  if (SENS.RegionNr >= DEMO_Regions_n)
   {
     SENS.RegionNr = 0;
 #if SENS_SCAN_TESTING != 0
@@ -611,7 +611,7 @@ static void OneScan(void)
 
   /*Tune radio*/
   Radio.SetChannel(SENS.Region->beacon_freq); /*Frequency*/
-  if (SENS.RegionNr==1) /*FCC*/
+  if (SENS.RegionNr == 1) /*FCC*/
   {
     /*For FCC, force beacon at 500kHZ/SF12*/
     Radio.SetRxConfig(MODEM_LORA,
@@ -643,45 +643,55 @@ static void OneScan(void)
                       0, 0, /*No hopping*/
                       0,  /*IQ not inverted*/
                       1); /*Continuous receive mode*/
-   }
+  }
   /*Configure CAD*/
   SUBGRF_SetCadParams(LORA_CAD_02_SYMBOL,       /*Detect n symbols*/
                       SENS_SCAN_CadDetPeak,     /*Sensitivity settings*/
                       SENS_SCAN_CadDetMin,      /*Sensitivity settings*/
                       LORA_CAD_RX,      /*Receive after CAD was successful*/
-                      100*64);    /*(n * 15.625) us timeout*/
+                      100 * 64);  /*(n * 15.625) us timeout*/
 
   UTIL_TIMER_Start(&(SENS.CadTimer)); /*Start timeout*/
   Radio.StartCad();     /*Start Scanning*/
 }
 
 /**
- * @brief Change sensor communication state.
- * @param State new state
- */
+  * @brief Change sensor communication state.
+  * @param State new state
+  */
 static void ChangeState(SENS_State_t State)
 {
-  if(SENS.State != State)
+  if (SENS.State != State)
   {
     SENS.State = State;
     APP_LOG(TS_ON, VLEVEL_L, "   ==== State: ");
-    switch(State)
+    switch (State)
     {
-      case SENS_STATE_Connect: APP_LOG(TS_OFF, VLEVEL_L, "Connected"); break;
-      case SENS_STATE_Lost: APP_LOG(TS_OFF, VLEVEL_L, "Lost"); break;
-      case SENS_STATE_Scan: APP_LOG(TS_OFF, VLEVEL_L, "Scan"); break;
-      case SENS_STATE_Sync: APP_LOG(TS_OFF, VLEVEL_L, "Sync"); break;
-      default: APP_LOG(TS_OFF, VLEVEL_L, "Dead"); break;
+      case SENS_STATE_Connect:
+        APP_LOG(TS_OFF, VLEVEL_L, "Connected");
+        break;
+      case SENS_STATE_Lost:
+        APP_LOG(TS_OFF, VLEVEL_L, "Lost");
+        break;
+      case SENS_STATE_Scan:
+        APP_LOG(TS_OFF, VLEVEL_L, "Scan");
+        break;
+      case SENS_STATE_Sync:
+        APP_LOG(TS_OFF, VLEVEL_L, "Sync");
+        break;
+      default:
+        APP_LOG(TS_OFF, VLEVEL_L, "Dead");
+        break;
     }
     APP_LOG(TS_OFF, VLEVEL_L, " ====\r\n");
   }
 }
 
 /**
- * @brief Process valid beacon packet.
- * @param Beacon 4 B beacon packet
- */
-static bool ValidReceivedBeacon(DEMO_packet_beacon_t* Beacon)
+  * @brief Process valid beacon packet.
+  * @param Beacon 4 B beacon packet
+  */
+static bool ValidReceivedBeacon(DEMO_packet_beacon_t *Beacon)
 {
   if ((Beacon->version_major != VERSION_MAJOR) /*Concentrator with the correct version*/
       || ((SENS.State == SENS_STATE_Connect) && (SENS.SubregionNr != Beacon->subregion)))      /*Check subregion*/
@@ -695,17 +705,18 @@ static bool ValidReceivedBeacon(DEMO_packet_beacon_t* Beacon)
   /*Start timer for Sync*/
   UTIL_TIMER_Stop(&SENS.SyncTimer);
   UTIL_TIMER_SetPeriod(&SENS.SyncTimer, 1000 - Beacon->offset
-                - SENS_TIMING_PRERECEIVE - Radio.GetWakeupTime());
+                       - SENS_TIMING_PRERECEIVE - Radio.GetWakeupTime());
   UTIL_TIMER_Start(&SENS.SyncTimer);
 
   /*Start timer for next Beacon*/
   UTIL_TIMER_Stop(&SENS.BeaconTimer);
   UTIL_TIMER_SetPeriod(&SENS.BeaconTimer, DEMO_SLOT_NUMBER * 1000 - Beacon->offset
-                - SENS_TIMING_PRERECEIVE - Radio.GetWakeupTime());
+                       - SENS_TIMING_PRERECEIVE - Radio.GetWakeupTime());
   UTIL_TIMER_Start(&SENS.BeaconTimer);
 
   /*Print info*/
-  APP_LOG(TS_ON, VLEVEL_M, "Beacon received, seed = 0x%02hhx, offset = %hu ms\r\n", Beacon->seed, Beacon->offset);     /*Print info*/
+  APP_LOG(TS_ON, VLEVEL_M, "Beacon received, seed = 0x%02x, offset = %hu ms\r\n", Beacon->seed,
+          Beacon->offset);     /*Print info*/
 
   /*Process Beacon and change state*/
   if ((SENS.State == SENS_STATE_Scan)
@@ -713,10 +724,10 @@ static bool ValidReceivedBeacon(DEMO_packet_beacon_t* Beacon)
   {
     SENS.Codings.hdr.slot = 0;     /*Reset slot*/
     SENS.TxDutyCounter = 0; /*Reset duty cycle*/
-    UTIL_LPM_SetStopMode(1<<CFG_LPM_SENS_Id, UTIL_LPM_ENABLE); /*Re-enable STOP mode*/
+    UTIL_LPM_SetStopMode(1 << CFG_LPM_SENS_Id, UTIL_LPM_ENABLE); /*Re-enable STOP mode*/
     ChangeState(SENS_STATE_Sync);     /*Change lower states to sync*/
   }
-  if(SENS.State != SENS_STATE_Connect)
+  if (SENS.State != SENS_STATE_Connect)
   {
     SENS.SubregionNr = Beacon->subregion; /*Store subregion*/
     SENS.Subregion = &(SENS.Region->subregions[Beacon->subregion]);
@@ -732,17 +743,17 @@ static bool ValidReceivedBeacon(DEMO_packet_beacon_t* Beacon)
 }
 
 /**
- * @brief Process successfully received Sync
- * @param Sync pointer to Sync structure
- * @param Size number of bytes received
- * @param RadioRandom one random value obtained from the radio before it was put to sleep
- */
-static bool ValidReceivedSync(DEMO_packet_sync_t* Sync, uint32_t Size, uint32_t RadioRandom)
+  * @brief Process successfully received Sync
+  * @param Sync pointer to Sync structure
+  * @param Size number of bytes received
+  * @param RadioRandom one random value obtained from the radio before it was put to sleep
+  */
+static bool ValidReceivedSync(DEMO_packet_sync_t *Sync, uint32_t Size, uint32_t RadioRandom)
 {
-  
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_SET);
-  HAL_GPIO_WritePin(DGB_LINE3_PORT, DGB_LINE3_PIN, GPIO_PIN_RESET);
-  
+
+  PROBE_GPIO_WRITE(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_SET);
+  PROBE_GPIO_WRITE(PROBE_LINE3_PORT, PROBE_LINE3_PIN, GPIO_PIN_RESET);
+
   if ((Sync->subregion != SENS.SubregionNr) /*Subregion must fit*/
       || (Sync->seed != SENS.Seed)    /*Seed must fit*/
       || (Sync->version_major != VERSION_MAJOR)) /*Only concentrator with the correct version*/
@@ -757,9 +768,9 @@ static bool ValidReceivedSync(DEMO_packet_sync_t* Sync, uint32_t Size, uint32_t
   APP_LOG(TS_ON, VLEVEL_M, "Sync received, occupied = bs");
   char oc_str[17] = "..............\r\n";
   uint16_t oc_shift = Sync->occupied >> 2;
-  for(int i = 0; i < (DEMO_SLOT_NUMBER - 2); oc_shift >>= 1, i++)
+  for (int i = 0; i < (DEMO_SLOT_NUMBER - 2); oc_shift >>= 1, i++)
   {
-    if(oc_shift & 0x1)
+    if (oc_shift & 0x1)
     {
       oc_str[i] = '0';
     }
@@ -797,7 +808,7 @@ static bool ValidReceivedSync(DEMO_packet_sync_t* Sync, uint32_t Size, uint32_t
       /*Make the timer absolute to the period start*/
       UTIL_TIMER_Stop(&SENS.TransmitTimer);
       UTIL_TIMER_SetPeriod(&SENS.TransmitTimer,
-                    SENS.Codings.hdr.slot * 1000 + SENS.BeaconTime - UTIL_TIMER_GetCurrentTime() - Radio.GetWakeupTime());
+                           SENS.Codings.hdr.slot * 1000 + SENS.BeaconTime - UTIL_TIMER_GetCurrentTime() - Radio.GetWakeupTime());
       UTIL_TIMER_Start(&SENS.TransmitTimer); /*Start timer for the transmission slot*/
     }
     else
@@ -810,16 +821,16 @@ static bool ValidReceivedSync(DEMO_packet_sync_t* Sync, uint32_t Size, uint32_t
 }
 
 /**
- * @brief Process coding changes and apply the first one with correct slot.
- * @param Sync received sync packet
- * @param Size number of bytes received
- */
-static void ProcessCodingChanges(DEMO_packet_sync_t* Sync, uint32_t Size)
+  * @brief Process coding changes and apply the first one with correct slot.
+  * @param Sync received sync packet
+  * @param Size number of bytes received
+  */
+static void ProcessCodingChanges(DEMO_packet_sync_t *Sync, uint32_t Size)
 {
   DEMO_coding_combined_t combined;
   uint32_t Len = Size - 4;       /*Get number of bytes in codings*/
 
-  for(uint32_t offset = 0; (offset + sizeof(DEMO_coding_combined_t)) <= Len; )  /*While there is enough data for header*/
+  for (uint32_t offset = 0; (offset + sizeof(DEMO_coding_combined_t)) <= Len;)  /*While there is enough data for header*/
   {
     memcpy(&combined, &(Sync->codings[offset]), sizeof(DEMO_coding_combined_t)); /*Copy header to parseable structure*/
 
@@ -827,7 +838,7 @@ static void ProcessCodingChanges(DEMO_packet_sync_t* Sync, uint32_t Size)
     {
       offset += sizeof(DEMO_coding_connect_t);
 
-      if(offset + sizeof(uint32_t) > Len)     /*No space left for eui*/
+      if (offset + sizeof(uint32_t) > Len)    /*No space left for eui*/
       {
         return;
       }
@@ -840,7 +851,7 @@ static void ProcessCodingChanges(DEMO_packet_sync_t* Sync, uint32_t Size)
           && ((Sync->occupied & (1 << combined.connect.slot)) != 0))
       {
         SENS.Codings.hdr.slot = combined.connect.slot;
-        APP_LOG(TS_ON, VLEVEL_M, "Connected to slot = %hhu\r\n", SENS.Codings.hdr.slot);
+        APP_LOG(TS_ON, VLEVEL_M, "Connected to slot = %u\r\n", SENS.Codings.hdr.slot);
         ChangeState(SENS_STATE_Connect); /*Connected*/
       }
 
@@ -852,7 +863,7 @@ static void ProcessCodingChanges(DEMO_packet_sync_t* Sync, uint32_t Size)
 
       if (combined.hdr.mode == true)     /*LoRa*/
       {
-        if(offset + sizeof(DEMO_coding_lora_t) > Len)     /*No space left for the rest of the coding*/
+        if (offset + sizeof(DEMO_coding_lora_t) > Len)    /*No space left for the rest of the coding*/
         {
           return;
         }
@@ -866,13 +877,13 @@ static void ProcessCodingChanges(DEMO_packet_sync_t* Sync, uint32_t Size)
           DEMO_ValidateCodingLora(&(SENS.Codings.lora));
           SENS.TxDutyCounter = 0;
           APP_LOG(TS_ON, VLEVEL_M, "Changed to LoRa f = %u Hz, ", SENS.Subregion->channels[SENS.Codings.hdr.chan_nr].freq);
-          APP_LOG(TS_OFF, VLEVEL_M, "period = %hhu, data_lim = %hhu B\r\n", SENS.Codings.hdr.period, SENS.Codings.hdr.data_lim);
+          APP_LOG(TS_OFF, VLEVEL_M, "period = %u, data_lim = %u B\r\n", SENS.Codings.hdr.period, SENS.Codings.hdr.data_lim);
         }
         offset += sizeof(DEMO_coding_lora_t);
       }
       else    /*FSK*/
       {
-        if(offset + sizeof(DEMO_coding_fsk_t) > Len)     /*No space left for the rest of the coding*/
+        if (offset + sizeof(DEMO_coding_fsk_t) > Len)    /*No space left for the rest of the coding*/
         {
           return;
         }
@@ -886,7 +897,7 @@ static void ProcessCodingChanges(DEMO_packet_sync_t* Sync, uint32_t Size)
           DEMO_ValidateCodingFsk(&(SENS.Codings.fsk));
           SENS.TxDutyCounter = 0;
           APP_LOG(TS_ON, VLEVEL_M, "Changed to FSK f = %u Hz, ", SENS.Subregion->channels[SENS.Codings.hdr.chan_nr].freq);
-          APP_LOG(TS_OFF, VLEVEL_M, "period = %hhu, data_lim = %hhu B\r\n", SENS.Codings.hdr.period, SENS.Codings.hdr.data_lim);
+          APP_LOG(TS_OFF, VLEVEL_M, "period = %u, data_lim = %u B\r\n", SENS.Codings.hdr.period, SENS.Codings.hdr.data_lim);
         }
         offset += sizeof(DEMO_coding_fsk_t);
       }
@@ -895,9 +906,9 @@ static void ProcessCodingChanges(DEMO_packet_sync_t* Sync, uint32_t Size)
 }
 
 /*!
- * \brief  Tx Done callback.
- */
-static void TxDone (void)
+  * \brief  Tx Done callback.
+  */
+static void TxDone(void)
 {
   /*Put radio to sleep*/
   Radio.Sleep();
@@ -908,9 +919,9 @@ static void TxDone (void)
 }
 
 /*!
- * \brief  Tx Timeout callback.
- */
-static void TxTimeout (void)
+  * \brief  Tx Timeout callback.
+  */
+static void TxTimeout(void)
 {
   /*Put radio to sleep*/
   Radio.Sleep();
@@ -919,16 +930,16 @@ static void TxTimeout (void)
 }
 
 /*!
- * \brief Rx Done callback.
- *
- * \param [IN] payload Received buffer pointer
- * \param [IN] size    Received buffer size
- * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
- * \param [IN] snr     Raw SNR value given by the radio hardware
- *                     FSK : N/A ( set to 0 )
- *                     LoRa: SNR value in dB
- */
-static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
+  * \brief Rx Done callback.
+  *
+  * \param [IN] payload Received buffer pointer
+  * \param [IN] size    Received buffer size
+  * \param [IN] rssi    RSSI value computed while receiving the frame [dBm]
+  * \param [IN] snr     Raw SNR value given by the radio hardware
+  *                     FSK : N/A ( set to 0 )
+  *                     LoRa: SNR value in dB
+  */
+static void RxDone(uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
 {
   if (SENS.ReceivingBeacon == true) /*Receiving beacon*/
   {
@@ -966,7 +977,7 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
     Radio.Sleep(); /*Turn off the radio*/
 
     /*Process Beacon*/
-    if(ValidReceivedBeacon(&beacon) == true)
+    if (ValidReceivedBeacon(&beacon) == true)
     {
 #if SENS_SCAN_TESTING != 0
       SENS.Debug.CntSuccess++;
@@ -993,7 +1004,7 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
     }
   }
   else if ((SENS.ReceivingSync == true) /*Receiving Sync*/
-      && ((SENS.State == SENS_STATE_Connect) || (SENS.State == SENS_STATE_Sync))) /*Only in sync*/
+           && ((SENS.State == SENS_STATE_Connect) || (SENS.State == SENS_STATE_Sync))) /*Only in sync*/
   {
     if (size < 4) /*Sync must be at least 4 bytes*/
     {
@@ -1009,7 +1020,7 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
     memcpy(&sync, payload, size);
 
     /*Process Sync*/
-    if(ValidReceivedSync(&sync, size, radio_random) == true)
+    if (ValidReceivedSync(&sync, size, radio_random) == true)
     {
       /*Sync was OK*/
     }
@@ -1029,11 +1040,11 @@ static void RxDone (uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr)
 }
 
 /*!
- * \brief  Rx Timeout callback.
- */
-static void RxTimeout (void)
+  * \brief  Rx Timeout callback.
+  */
+static void RxTimeout(void)
 {
-  if(SENS.State == SENS_STATE_Scan)
+  if (SENS.State == SENS_STATE_Scan)
   {
     Radio.Standby();
     OneScan();
@@ -1046,29 +1057,29 @@ static void RxTimeout (void)
 }
 
 /*!
- * \brief Rx Error callback.
- */
-static void RxError (void)
+  * \brief Rx Error callback.
+  */
+static void RxError(void)
 {
   APP_LOG(TS_ON, VLEVEL_L, "Receive error\r\n");
 }
 
 /*!
- * \brief  FHSS Change Channel callback.
- *
- * \param [IN] currentChannel   Index number of the current channel
- */
-static void FhssChangeChannel (uint8_t currentChannel)
+  * \brief  FHSS Change Channel callback.
+  *
+  * \param [IN] currentChannel   Index number of the current channel
+  */
+static void FhssChangeChannel(uint8_t currentChannel)
 {
   UNUSED(currentChannel);
 }
 
 /*!
- * \brief CAD Done callback.
- *
- * \param [IN] channelDetected    Channel Activity detected during the CAD
- */
-static void CadDone (bool channelActivityDetected)
+  * \brief CAD Done callback.
+  *
+  * \param [IN] channelDetected    Channel Activity detected during the CAD
+  */
+static void CadDone(bool channelActivityDetected)
 {
   UTIL_TIMER_Stop(&(SENS.CadTimer)); /*Stop timeout*/
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.h
index dfb49952..66b24e01 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.h
@@ -55,17 +55,17 @@ extern "C" {
 #define SENS_SCAN_CadDetMin         20
 
 /**
- * @brief Initialize Sensor and start scanning for Beacon.
- * @param GetDataCallback called before transmission, quickly add data to transmit, do block in the callback
- * @param ActivityCallback called on every activity to blink LED or something
- */
-int SENS_Init (void (*GetDataCallback)(void), void (*ActivityCallback)(void));
+  * @brief Initialize Sensor and start scanning for Beacon.
+  * @param GetDataCallback called before transmission, quickly add data to transmit, do block in the callback
+  * @param ActivityCallback called on every activity to blink LED or something
+  */
+int SENS_Init(void (*GetDataCallback)(void), void (*ActivityCallback)(void));
 
 /**
- * @brief Store data to send in next packet.
- * @param Data structure
- */
-void SENS_WriteSensorData(const DEMO_data_1_0_t* Data);
+  * @brief Store data to send in next packet.
+  * @param Data structure
+  */
+void SENS_WriteSensorData(const DEMO_data_1_0_t *Data);
 
 typedef enum
 {
@@ -77,9 +77,9 @@ typedef enum
 } SENS_State_t;
 
 /**
- * @brief Get state of the sensor connection.
- * @return one of SENS_State_t
- */
+  * @brief Get state of the sensor connection.
+  * @return one of SENS_State_t
+  */
 SENS_State_t SENS_GetState(void);
 
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/meters_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/meters_conf.h
index b6fc9fc5..911cdb99 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/meters_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/App/meters_conf.h
@@ -21,43 +21,43 @@
 #define __METERS_CONF_H__
 
 /**
- * @brief Maximal period of measurement for slow sensors [ms].
- * This is the maximum period between two measurements if sensor is not connected.
- * If sensor is connected, the measurement is done just before transmit.
- * Slow sensors are: Humidity, Temperature, Pressure, Battery Voltage.
- */
+  * @brief Maximal period of measurement for slow sensors [ms].
+  * This is the maximum period between two measurements if sensor is not connected.
+  * If sensor is connected, the measurement is done just before transmit.
+  * Slow sensors are: Humidity, Temperature, Pressure, Battery Voltage.
+  */
 #define METERS_SLOW_MAX_DELAY   (30*1000)
 
 /**
- * @brief Enable sensors this long before reading out the measurement data [ms].
- */
+  * @brief Enable sensors this long before reading out the measurement data [ms].
+  */
 #define METERS_SLOW_ENABLE_DELAY      150
 
 /**
- * @brief Read out measurement data this long before NextGet from function void Meters_GetData() [ms].
- */
+  * @brief Read out measurement data this long before NextGet from function void Meters_GetData() [ms].
+  */
 #define METERS_SLOW_PREMEASURE         10
 
 /**
- * @brief Period of measurement of the ranging sensor [ms].
- * Measurement itself takes 33 ms.
- * Higher value will cripple the swipe detection, lower value increases consumption.
- */
+  * @brief Period of measurement of the ranging sensor [ms].
+  * Measurement itself takes 33 ms.
+  * Higher value will cripple the swipe detection, lower value increases consumption.
+  */
 #define METERS_RANGE_PERIOD           250
 
 /**
- * @brief Time that the range sensor is blocked after out of range [ms].
- * When the sensor is out of range, it can sometimes throw values on the range limit which confuse
- * the swipe detection algorithm. This constant will block the sensor and swipe detection for a limited time.
- * Set to 0 to not block the swipe detection algorithm when sensor is out of range.
- */
+  * @brief Time that the range sensor is blocked after out of range [ms].
+  * When the sensor is out of range, it can sometimes throw values on the range limit which confuse
+  * the swipe detection algorithm. This constant will block the sensor and swipe detection for a limited time.
+  * Set to 0 to not block the swipe detection algorithm when sensor is out of range.
+  */
 #define METERS_RANGE_BLOCK_PERIOD    1000
 
 /**
- * @brief Period of measurement for fast sensors [ms].
- * Fast sensors, magnetometer and accelerometer, are measured continuously.
- * This value affects multiple MotionXX libraries and some of them can misbehave for other frequencies than 50 Hz.
- */
+  * @brief Period of measurement for fast sensors [ms].
+  * Fast sensors, magnetometer and accelerometer, are measured continuously.
+  * This value affects multiple MotionXX libraries and some of them can misbehave for other frequencies than 50 Hz.
+  */
 #define METERS_FAST_PERIOD             20
 
 
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/mw_log_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/mw_log_conf.h
index 6643f344..5bcdf818 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/mw_log_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/mw_log_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    mw_log_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __MW_LOG_CONF_H__
@@ -27,6 +29,7 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32_adv_trace.h"
+
 /* USER CODE BEGIN Includes */
 
 /* USER CODE END Includes */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.c b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.c
index 2a75d3c1..edc0eb65 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.c
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.c
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.c
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Includes ------------------------------------------------------------------*/
 #include "radio_board_if.h"
 
@@ -56,193 +59,148 @@
 /* Exported functions --------------------------------------------------------*/
 int32_t RBI_Init(void)
 {
+  /* USER CODE BEGIN RBI_Init_1 */
+
+  /* USER CODE END RBI_Init_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_Init();
-#elif defined(MX_NUCLEO_WL55JC1)
-  /* should be calling BSP_RADIO_Init() but not supported by MX*/
-
-  GPIO_InitTypeDef  gpio_init_structure = {0};
-
-  /* Enable the Radio Switch Clock */
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Configure the Radio Switch pin */
-  gpio_init_structure.Pin   = RF_SW_CTRL1_PIN;
-  gpio_init_structure.Mode  = GPIO_MODE_OUTPUT_PP;
-  gpio_init_structure.Pull  = GPIO_NOPULL;
-  gpio_init_structure.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-
-  HAL_GPIO_Init(RF_SW_CTRL1_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL2_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL2_GPIO_PORT, &gpio_init_structure);
-
-  gpio_init_structure.Pin = RF_SW_CTRL3_PIN;
-  HAL_GPIO_Init(RF_SW_CTRL3_GPIO_PORT, &gpio_init_structure);
-
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  return 0;
 #else
-  /* USER CODE BEGIN RBI_Init 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_Init 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+  /* 2/ Or implement RBI_Init here */
+  /* USER CODE BEGIN RBI_Init_2 */
+#warning user to provide its board code or to call his board driver functions
+  return 0;
+  /* USER CODE END RBI_Init_2 */
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_DeInit(void)
 {
+  /* USER CODE BEGIN RBI_DeInit_1 */
+
+  /* USER CODE END RBI_DeInit_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_DeInit();
-#elif defined(MX_NUCLEO_WL55JC1)
-  RF_SW_CTRL3_GPIO_CLK_ENABLE();
-
-  /* Turn off switch */
-  HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-
-  /* DeInit the Radio Switch pin */
-  HAL_GPIO_DeInit(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN);
-  HAL_GPIO_DeInit(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN);
-
-  return 0;
 #else
-  /* USER CODE BEGIN RBI_DeInit 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_DeInit 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_DeInit here */
+  /* USER CODE BEGIN RBI_DeInit_2 */
+#warning user to provide its board code or to call his board driver functions
+  return 0;
+  /* USER CODE END RBI_DeInit_2 */
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config)
 {
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_1 */
+
+  /* USER CODE END RBI_ConfigRFSwitch_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
-#elif defined(MX_NUCLEO_WL55JC1)
-  switch (Config)
-  {
-    case RBI_SWITCH_OFF:
-    {
-      /* Turn off switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RX:
-    {
-      /*Turns On in Rx Mode the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_RESET);
-      break;
-    }
-    case RBI_SWITCH_RFO_LP:
-    {
-      /*Turns On in Tx Low Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    case RBI_SWITCH_RFO_HP:
-    {
-      /*Turns On in Tx High Power the RF Switch */
-      HAL_GPIO_WritePin(RF_SW_CTRL3_GPIO_PORT, RF_SW_CTRL3_PIN, GPIO_PIN_SET);
-      HAL_GPIO_WritePin(RF_SW_CTRL1_GPIO_PORT, RF_SW_CTRL1_PIN, GPIO_PIN_RESET);
-      HAL_GPIO_WritePin(RF_SW_CTRL2_GPIO_PORT, RF_SW_CTRL2_PIN, GPIO_PIN_SET);
-      break;
-    }
-    default:
-      break;
-  }
 
-  return 0;
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_ConfigRFSwitch((BSP_RADIO_Switch_TypeDef) Config);
 #else
-  /* USER CODE BEGIN RBI_ConfigRFSwitch 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_ConfigRFSwitch 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_ConfigRFSwitch here */
+  /* USER CODE BEGIN RBI_ConfigRFSwitch_2 */
+#warning user to provide its board code or to call his board driver functions
+  return 0;
+  /* USER CODE END RBI_ConfigRFSwitch_2 */
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_GetTxConfig(void)
 {
-#if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return BSP_RADIO_GetTxConfig();
+  /* USER CODE BEGIN RBI_GetTxConfig_1 */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RBI_CONF_RFO;
-#else
-  /* USER CODE BEGIN RBI_GetTxConfig 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetTxConfig 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
-}
-
-int32_t RBI_GetWakeUpTime(void)
-{
+  /* USER CODE END RBI_GetTxConfig_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
-  return  BSP_RADIO_GetWakeUpTime();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return RF_WAKEUP_TIME;
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
+  return BSP_RADIO_GetTxConfig();
 #else
-  /* USER CODE BEGIN RBI_GetWakeUpTime 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_GetWakeUpTime 0 */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_GetTxConfig here */
+  /* USER CODE BEGIN RBI_GetTxConfig_2 */
+#warning user to provide its board code or to call his board driver functions
+  return RBI_CONF_RFO;
+  /* USER CODE END RBI_GetTxConfig_2 */
+#endif  /* USE_BSP_DRIVER */
 }
 
 int32_t RBI_IsTCXO(void)
 {
+  /* USER CODE BEGIN RBI_IsTCXO_1 */
+
+  /* USER CODE END RBI_IsTCXO_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsTCXO();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_TCXO_SUPPORTED;
 #else
-  /* USER CODE BEGIN RBI_IsTCXO 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_IsTCXO 0 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_IsTCXO here */
+  /* USER CODE BEGIN RBI_IsTCXO_2 */
+#warning user to provide its board code or to call his board driver functions
+  return IS_TCXO_SUPPORTED;
+  /* USER CODE END RBI_IsTCXO_2 */
+#endif  /* USE_BSP_DRIVER  */
 }
 
 int32_t RBI_IsDCDC(void)
 {
+  /* USER CODE BEGIN RBI_IsDCDC_1 */
+
+  /* USER CODE END RBI_IsDCDC_1 */
 #if defined(USE_BSP_DRIVER)
-  /* code generated by MX does not support BSP */
-  /* In order to use BSP driver, add the correspondent files in the IDE workspace */
-  /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
+  /* Important note: BSP code is board dependent
+   * STM32WL_Nucleo code can be found
+   *       either in STM32CubeWL package under Drivers/BSP/STM32WLxx_Nucleo/
+   *       or at https://github.com/STMicroelectronics/STM32CubeWL/tree/main/Drivers/BSP/STM32WLxx_Nucleo/
+   * 1/ For User boards, the BSP/STM32WLxx_Nucleo/ directory can be copied and replaced in the project. The copy must then be updated depending:
+   *       on board RF switch configuration (pin control, number of port etc)
+   *       on TCXO configuration
+   *       on DC/DC configuration */
   return BSP_RADIO_IsDCDC();
-
-#elif defined(MX_NUCLEO_WL55JC1)
-  return IS_DCDC_SUPPORTED;
 #else
-  /* USER CODE BEGIN RBI_IsDCDC 0 */
-#error user to provide its board code or to call his board driver functions
-  /* USER CODE END RBI_IsDCDC 0 */
-#endif  /* USE_BSP_DRIVER   || MX_NUCLEO_WL55JC1 */
+  /* 2/ Or implement RBI_IsDCDC here */
+  /* USER CODE BEGIN RBI_IsDCDC_2 */
+#warning user to provide its board code or to call his board driver functions
+  return IS_DCDC_SUPPORTED;
+  /* USER CODE END RBI_IsDCDC_2 */
+
+#endif  /* USE_BSP_DRIVER  */
 }
 
 /* USER CODE BEGIN EF */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.h
index 8878d937..9e505c68 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_board_if.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef RADIO_BOARD_IF_H
@@ -32,40 +34,38 @@ extern "C" {
 /* USER CODE END include */
 
 /* Exported defines ----------------------------------------------------------*/
-#ifdef MX_BOARD_PSEUDODRIVER
-#define MX_NUCLEO_WL55JC1
-#endif /* MX_BOARD_PSEUDODRIVER */
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 #define RBI_CONF_RFO_LP_HP  RADIO_CONF_RFO_LP_HP
 #define RBI_CONF_RFO_LP     RADIO_CONF_RFO_LP
 #define RBI_CONF_RFO_HP     RADIO_CONF_RFO_HP
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RBI_CONF_RFO_LP_HP  0
-#define RBI_CONF_RFO_LP     1
-#define RBI_CONF_RFO_HP     2
 #else
 /* USER CODE BEGIN Board Definition */
-#error user to provide its board definitions
+
 /* USER CODE END Board Definition */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+#define RBI_CONF_RFO_LP_HP  0
+#define RBI_CONF_RFO_LP     1
+#define RBI_CONF_RFO_HP     2
+/* USER CODE BEGIN Board Definition_2 */
+
+/* USER CODE END Board Definition_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
+#else
+/* USER CODE BEGIN Exported Parameters */
 
+/* USER CODE END Exported Parameters */
 /* Indicates the type of switch between the ones proposed by CONFIG Constants
  */
 #define RBI_CONF_RFO                        RBI_CONF_RFO_LP_HP
 
-/* Radio maximum wakeup time (in ms) */
-#define RF_WAKEUP_TIME                     3U
-
 /* Indicates whether or not TCXO is supported by the board
  * 0: TCXO not supported
  * 1: TCXO supported
@@ -78,52 +78,30 @@ extern "C" {
  */
 #define IS_DCDC_SUPPORTED                   1U
 
-#else
-/* USER CODE BEGIN Exported Parameters */
-#error user to provide its board definitions
-/* USER CODE END Exported Parameters */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1  */
+/* USER CODE BEGIN Exported Parameters_2 */
+
+/* USER CODE END Exported Parameters_2 */
+#endif  /* USE_BSP_DRIVER  */
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 
-#elif defined(MX_NUCLEO_WL55JC1)
-#define RF_SW_CTRL3_PIN                          GPIO_PIN_3
-#define RF_SW_CTRL3_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL3_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL3_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL1_PIN                          GPIO_PIN_4
-#define RF_SW_CTRL1_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL1_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_RX_GPIO_CLK_DISABLE()              __HAL_RCC_GPIOC_CLK_DISABLE()
-
-#define RF_SW_CTRL2_PIN                          GPIO_PIN_5
-#define RF_SW_CTRL2_GPIO_PORT                    GPIOC
-#define RF_SW_CTRL2_GPIO_CLK_ENABLE()            __HAL_RCC_GPIOC_CLK_ENABLE()
-#define RF_SW_CTRL2_GPIO_CLK_DISABLE()           __HAL_RCC_GPIOC_CLK_DISABLE()
-
-/* To be checked vs TCXO management in RCC config */
-#define RF_TCXO_VCC_PIN                          GPIO_PIN_0
-#define RF_TCXO_VCC_GPIO_PORT                    GPIOB
-#define RF_TCXO_VCC_CLK_ENABLE()                 __HAL_RCC_GPIOB_CLK_ENABLE()
-#define RF_TCXO_VCC_CLK_DISABLE()                __HAL_RCC_GPIOB_CLK_DISABLE()
 #else
 /* USER CODE BEGIN Exported PinMapping */
-#error user to provide its board definitions
+#warning user to provide its board definitions pins
 /* USER CODE END Exported PinMapping */
-#endif  /* USE_BSP_DRIVER || MX_NUCLEO_WL55JC1  */
+#endif  /* USE_BSP_DRIVER  */
 
-/* USER CODE BEGIN Exported_Defines */
+/* USER CODE BEGIN ED */
 
-/* USER CODE END Exported_Defines */
+/* USER CODE END ED */
 
 /* Exported types ------------------------------------------------------------*/
 
 #if defined(USE_BSP_DRIVER)
-/* code generated by MX does not support BSP */
+/* code generated by STM32CubeMX does not support BSP */
 /* In order to use BSP driver, add the correspondent files in the IDE workspace */
 /* and define USE_BSP_DRIVER in the preprocessor definitions  or in platform.h */
 typedef enum
@@ -133,7 +111,11 @@ typedef enum
   RBI_SWITCH_RFO_LP = RADIO_SWITCH_RFO_LP,
   RBI_SWITCH_RFO_HP = RADIO_SWITCH_RFO_HP,
 } RBI_Switch_TypeDef;
-#elif defined(MX_NUCLEO_WL55JC1)
+
+#else
+/* USER CODE BEGIN Exported Types */
+
+/* USER CODE END Exported Types */
 typedef enum
 {
   RBI_SWITCH_OFF    = 0,
@@ -141,11 +123,10 @@ typedef enum
   RBI_SWITCH_RFO_LP = 2,
   RBI_SWITCH_RFO_HP = 3,
 } RBI_Switch_TypeDef;
-#else
-/* USER CODE BEGIN Exported Types */
-#error user to provide its board definitions
-/* USER CODE END Exported Types */
-#endif  /* USE_BSP_DRIVER  || MX_NUCLEO_WL55JC1 */
+/* USER CODE BEGIN Exported Types_2 */
+
+/* USER CODE END Exported Types_2 */
+#endif  /* USE_BSP_DRIVER */
 
 /* USER CODE BEGIN ET */
 
@@ -199,12 +180,6 @@ int32_t RBI_ConfigRFSwitch(RBI_Switch_TypeDef Config);
   */
 int32_t RBI_GetTxConfig(void);
 
-/**
-  * @brief  Get Radio Wake Time
-  * @return the wake upt time in ms
-  */
-int32_t RBI_GetWakeUpTime(void);
-
 /**
   * @brief  Get If TCXO is to be present on board
   * @note   never remove called by MW,
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_conf.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_conf.h
index 29cc81b5..17c678d7 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_conf.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/radio_conf.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    radio_conf.h
@@ -16,6 +17,7 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __RADIO_CONF_H__
@@ -28,7 +30,7 @@ extern "C" {
 /* Includes ------------------------------------------------------------------*/
 #include "platform.h"
 #include "subghz.h"
-#include "stm32_mem.h"
+#include "stm32_mem.h"       /* RADIO_MEMSET8 def in this file */
 #include "mw_log_conf.h"     /* mw trace conf */
 #include "radio_board_if.h"  /* low layer api (bsp) */
 #include "utilities_def.h"  /* low layer api (bsp) */
@@ -46,20 +48,16 @@ extern "C" {
 /**
   * @brief Set RX pin to high or low level
   */
-#define DBG_GPIO_RADIO_RX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE1_PORT, DGB_LINE1_PIN);
+#define DBG_GPIO_RADIO_RX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE1_PORT, PROBE_LINE1_PIN);
 
 /**
   * @brief Set TX pin to high or low level
   */
-#define DBG_GPIO_RADIO_TX(set_rst) DBG_GPIO_##set_rst##_LINE(DGB_LINE2_PORT, DGB_LINE2_PIN);
-
-/**
-  * @brief Max payload buffer size
-  */
-#define RADIO_RX_BUF_SIZE          255
+#define DBG_GPIO_RADIO_TX(set_rst) PROBE_GPIO_##set_rst##_LINE(PROBE_LINE2_PORT, PROBE_LINE2_PIN);
 
 /**
   * @brief drive value used anytime radio is NOT in TX low power mode
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_DEFAULT  SMPS_DRV_40
 
@@ -67,25 +65,42 @@ extern "C" {
   * @brief drive value used anytime radio is in TX low power mode
   *        TX low power mode is the worst case because the PA sinks from SMPS
   *        while in high power mode, current is sunk directly from the battery
+  * @note override the default configuration of radio_driver.c
   */
 #define SMPS_DRIVE_SETTING_MAX      SMPS_DRV_60
 
 /**
-  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @brief Provides the frequency of the chip running on the radio and the frequency step
+  * @remark These defines are used for computing the frequency divider to set the RF frequency
+  * @note override the default configuration of radio_driver.c
   */
-#define XTAL_DEFAULT_CAP_VALUE      0x20
+#define XTAL_FREQ                   ( 32000000UL )
 
 /**
-  * @brief Frequency error (in Hz) can be compensated here.
-  *        warning XO frequency error generates (de)modulator sampling time error which can not be compensated
+  * @brief in XO mode, set internal capacitor (from 0x00 to 0x2F starting 11.2pF with 0.47pF steps)
+  * @note override the default configuration of radio_driver.c
   */
-#define RF_FREQUENCY_ERROR          ((int32_t) 0)
+#define XTAL_DEFAULT_CAP_VALUE      ( 0x20UL )
 
 /**
   * @brief voltage of vdd tcxo.
+  * @note override the default configuration of radio_driver.c
   */
 #define TCXO_CTRL_VOLTAGE           TCXO_CTRL_1_7V
 
+/**
+  * @brief Radio maximum wakeup time (in ms)
+  * @note override the default configuration of radio_driver.c
+  */
+#define RF_WAKEUP_TIME              ( 3UL )
+
+/**
+  * @brief DCDC is enabled
+  * @remark this define is only used if the DCDC is present on the board
+  * @note override the default configuration of radio_driver.c
+  */
+#define DCDC_ENABLE                 ( 1UL )
+
 /* USER CODE BEGIN EC */
 
 /* USER CODE END EC */
@@ -125,6 +140,11 @@ extern "C" {
   */
 #define RADIO_MEMSET8( dest, value, size )      UTIL_MEM_set_8( dest, value, size )
 
+/**
+  * @brief Memcpy utilities interface to radio Middleware
+  */
+#define RADIO_MEMCPY8( dest, src, size )        UTIL_MEM_cpy_8( dest, src, size )
+
 /* USER CODE BEGIN EM */
 
 /* USER CODE END EM */
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/timer.h b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/timer.h
index 33389639..e80cd6a0 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/timer.h
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/SubGHz_Phy/Target/timer.h
@@ -1,3 +1,4 @@
+/* USER CODE BEGIN Header */
 /**
   ******************************************************************************
   * @file    timer.h
@@ -16,6 +17,8 @@
   *
   ******************************************************************************
   */
+/* USER CODE END Header */
+
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __TIMER_H__
 #define __TIMER_H__
diff --git a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/readme.txt b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/readme.txt
index 0c43dc44..fb570fd3 100644
--- a/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Demonstrations/LocalNetwork/LocalNetwork_Sensor/readme.txt
@@ -1,12 +1,12 @@
 /**
   @page LocalNetwork_Sensor Readme file
- 
+
   @verbatim
   ******************** (C) COPYRIGHT 2020 STMicroelectronics *******************
-  * @file    Demonstrations/LocalNetwork/LocalNetwork_Sensor/readme.txt 
+  * @file    Demonstrations/LocalNetwork/LocalNetwork_Sensor/readme.txt
   * @author  MCD Application Team
-  * @brief   This application is a demo software of a Sensor sending 
-  *          Sensor data to the demo concentrator modem 
+  * @brief   This application is a demo software of a Sensor sending
+  *          Sensor data to the demo concentrator modem
   *          external host
   ******************************************************************************
   * @attention
@@ -24,8 +24,8 @@
 
 @par Description
 
-This directory contains a set of source files that implements Sensor sending Sensor 
-data to the demo concentrator 
+This directory contains a set of source files that implements Sensor sending Sensor
+data to the demo concentrator.
 
 This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
   ******************************************************************************
@@ -34,7 +34,7 @@ This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx
 
 Demonstrations, SubGHz_Phy, LocalNetwork, Sensor
 
-@par Directory contents 
+@par Directory contents
 
 
   - LocalNetwork_Sensor/Core/Inc/adc.h                                          This file contains all the function prototypes for
@@ -89,22 +89,24 @@ Demonstrations, SubGHz_Phy, LocalNetwork, Sensor
   - LocalNetwork_Sensor/Core/Src/timer_if.c                                     Configure RTC Alarm, Tick and Calendar manager
   - LocalNetwork_Sensor/Core/Src/usart.c                                        This file provides code for the configuration
                                                                                 of the USART instances.
-  - LocalNetwork_Sensor/Core/Src/usart_if.c                                     Configuration of UART MX driver interface for hyperterminal communication
+  - LocalNetwork_Sensor/Core/Src/usart_if.c                                     Configuration of UART driver interface for hyperterminal communication
   - LocalNetwork_Sensor/STM32CubeIDE/Application/Core/syscalls.c                STM32CubeIDE Minimal System calls file
   - LocalNetwork_Sensor/STM32CubeIDE/Application/Core/sysmem.c                  STM32CubeIDE System Memory calls file
   - LocalNetwork_Sensor/SubGHz_Phy/App/demo_sensor.c                            Concentrator behavior module for STM32WL Concentrator Demo.
   - LocalNetwork_Sensor/SubGHz_Phy/Target/radio_board_if.c                      This file provides an interface layer between MW and Radio Board
 
 
-@par Hardware and Software environment 
+@par Hardware and Software environment
 
   - This example runs on the STM32WLxx Nucleo board.
 
-  - STM32WLxx Nucleo board Set-up    
-    - Connect the Nucleo board to your PC with a USB cable type A to micro-B 
+  - STM32WLxx Nucleo board Set-up
+    - Connect the Nucleo board to your PC with a USB cable type A to micro-B
       to ST-LINK connector.
     - Please ensure that the ST-LINK connector jumpers are fitted.
-    - STM32WLxx Nucleo requires IS_TCXO_SUPPORTED=1
+
+  - Configure the software via the configuration files:
+    - sys_conf.h, radio_conf.h, mw_log_conf.h, main.h, etc
 
   -Set Up:
 
@@ -115,9 +117,9 @@ Demonstrations, SubGHz_Phy, LocalNetwork, Sensor
              |                        |          |                        |
              --------------------------          --------------------------
 
-@par How to use it ? 
+@par How to use it ?
 In order to make the program work, you must do the following :
-  - Open your preferred toolchain 
+  - Open your preferred toolchain
   - Rebuild all files and load your image into target memory
   - Run the example
   - Open a Terminal, connected the Demo/Sensor
@@ -127,5 +129,10 @@ In order to make the program work, you must do the following :
   - the Demo/Sensor will automatically acquire the beacon and a time slot will be reserved.
   - the Demo/Sensor will send sensor data at reserved time slot.
 
+@par How to debug ?
+  - make sure the flag DEBUGGER_ENABLED to 1 in sys_conf.h
+  - simpler to define the flag LOW_POWER_DISABLE to 1 as well
+  - compile, download and attach
+
  * <h3><center>&copy; COPYRIGHT STMicroelectronics</center></h3>
  */
\ No newline at end of file
diff --git a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc
index e0984e7e..1fd55208 100644
--- a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_AnalogWatchdog/ADC_AnalogWatchdog.ioc
@@ -147,3 +147,5 @@ SH.SharedAnalog_PA10.ConfNb=2
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_AnalogWatchdog
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc
index cf973146..100f114f 100644
--- a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_MultiChannelSingleConversion/ADC_MultiChannelSingleConversion.ioc
@@ -165,3 +165,5 @@ VP_ADC_Vref_Input.Signal=ADC_Vref_Input
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_MultiChannelSingleConversion
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_Oversampling/ADC_Oversampling.ioc b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_Oversampling/ADC_Oversampling.ioc
index 0bc0d507..23dc6d42 100644
--- a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_Oversampling/ADC_Oversampling.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_Oversampling/ADC_Oversampling.ioc
@@ -119,3 +119,5 @@ SH.SharedAnalog_PA10.ConfNb=2
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_Oversampling
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc
index 424c278e..433a825a 100644
--- a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc
@@ -117,3 +117,5 @@ SH.SharedAnalog_PA10.ConfNb=2
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_SingleConversion_TriggerSW_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc
index 0433a11d..06351602 100644
--- a/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/ADC/ADC_SingleConversion_TriggerTimer_DMA/ADC_SingleConversion_TriggerTimer_DMA.ioc
@@ -156,3 +156,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM2_VS_ClockSourceINT.Mode=Internal
 VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT
 board=custom
+ProjectManager.Example=ADC_SingleConversion_TriggerTimer_DMA
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc
index f9ccb6cc..b7bbc873 100644
--- a/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_IT/COMP_CompareGpioVsVrefInt_IT.ioc
@@ -110,3 +110,5 @@ VP_COMP1_VS_VREFINT.Signal=COMP1_VS_VREFINT
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=COMP_CompareGpioVsVrefInt_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/COMP_CompareGpioVsVrefInt_Window_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/COMP_CompareGpioVsVrefInt_Window_IT.ioc
index 9e072dd5..88ab2e71 100644
--- a/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/COMP_CompareGpioVsVrefInt_Window_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/COMP_CompareGpioVsVrefInt_Window_IT.ioc
@@ -127,3 +127,5 @@ VP_COMP2_VS_WindowMode.Signal=COMP2_VS_WindowMode
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=COMP_CompareGpioVsVrefInt_Window_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/.cproject
index d7e1455e..1455c67a 100644
--- a/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples/COMP/COMP_CompareGpioVsVrefInt_Window_IT/STM32CubeIDE/.cproject
@@ -109,7 +109,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.566725402" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.679880683" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1342746464" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1342746464" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2042199848" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -128,7 +128,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1780434697" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1605774744" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1970807152" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1970807152" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1491191077" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.861342955" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_MPU/CORTEXM_MPU.ioc b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_MPU/CORTEXM_MPU.ioc
index 19892f56..42752285 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_MPU/CORTEXM_MPU.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_MPU/CORTEXM_MPU.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CORTEXM_MPU
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_MPU/Src/stm32_mpu.c b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_MPU/Src/stm32_mpu.c
index bd78ab8d..41e4972c 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_MPU/Src/stm32_mpu.c
+++ b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_MPU/Src/stm32_mpu.c
@@ -64,7 +64,7 @@ void MPU_Config(void)
   /* Disable MPU */
   HAL_MPU_Disable();
 
-  /* Configure RAM region as Region N°0, 64KB of size and R/W region */
+  /* Configure RAM region as Region Number 0, 64KB of size and R/W region */
   MPU_InitStruct.Enable = MPU_REGION_ENABLE;
   MPU_InitStruct.BaseAddress = EXAMPLE_RAM_ADDRESS_START;
   MPU_InitStruct.Size = EXAMPLE_RAM_SIZE;
@@ -79,14 +79,14 @@ void MPU_Config(void)
 
   HAL_MPU_ConfigRegion(&MPU_InitStruct);
 
-  /* Configure FLASH region as REGION N°1, 256KB of size and R/W region */
+  /* Configure FLASH region as REGION Number 1, 256KB of size and R/W region */
   MPU_InitStruct.BaseAddress = EXAMPLE_FLASH_ADDRESS_START;
   MPU_InitStruct.Size = EXAMPLE_FLASH_SIZE;
   MPU_InitStruct.Number = EXAMPLE_FLASH_REGION_NUMBER;
 
   HAL_MPU_ConfigRegion(&MPU_InitStruct);
 
-  /* Configure Peripheral region as REGION N°2, 512MB of size, R/W and Execute
+  /* Configure Peripheral region as REGION Number 2, 512MB of size, R/W and Execute
   Never region */
   MPU_InitStruct.BaseAddress = EXAMPLE_PERIPH_ADDRESS_START;
   MPU_InitStruct.Size = EXAMPLE_PERIPH_SIZE;
@@ -108,7 +108,7 @@ void MPU_AccessPermConfig(void)
 {
   MPU_Region_InitTypeDef MPU_InitStruct;
 
-  /* Configure region for PrivilegedReadOnlyArray as REGION N°3, 32byte and R
+  /* Configure region for PrivilegedReadOnlyArray as REGION Number 3, 32byte and R
      only in privileged mode */
   /* Disable MPU */
   HAL_MPU_Disable();
diff --git a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_ModePrivilege/CORTEXM_ModePrivilege.ioc b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_ModePrivilege/CORTEXM_ModePrivilege.ioc
index 9533822f..c95981b8 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_ModePrivilege/CORTEXM_ModePrivilege.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_ModePrivilege/CORTEXM_ModePrivilege.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CORTEXM_ModePrivilege
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_ProcessStack/CORTEXM_ProcessStack.ioc b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_ProcessStack/CORTEXM_ProcessStack.ioc
index 735078e5..a83de25f 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_ProcessStack/CORTEXM_ProcessStack.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_ProcessStack/CORTEXM_ProcessStack.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CORTEXM_ProcessStack
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc
index e25d18b2..b9b4ff5b 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CORTEX/CORTEXM_SysTick/CORTEXM_SysTick.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CORTEXM_SysTick
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Bytes_Stream_7bit_CRC/CRC_Bytes_Stream_7bit_CRC.ioc b/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Bytes_Stream_7bit_CRC/CRC_Bytes_Stream_7bit_CRC.ioc
index a902faa1..c4221f68 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Bytes_Stream_7bit_CRC/CRC_Bytes_Stream_7bit_CRC.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Bytes_Stream_7bit_CRC/CRC_Bytes_Stream_7bit_CRC.ioc
@@ -108,3 +108,5 @@ VP_CRC_VS_CRC.Signal=CRC_VS_CRC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRC_Bytes_Stream_7bit_CRC
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Data_Reversing_16bit_CRC/CRC_Data_Reversing_16bit_CRC.ioc b/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Data_Reversing_16bit_CRC/CRC_Data_Reversing_16bit_CRC.ioc
index 1f1a79e6..ed180592 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Data_Reversing_16bit_CRC/CRC_Data_Reversing_16bit_CRC.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Data_Reversing_16bit_CRC/CRC_Data_Reversing_16bit_CRC.ioc
@@ -109,3 +109,5 @@ VP_CRC_VS_CRC.Signal=CRC_VS_CRC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRC_Data_Reversing_16bit_CRC
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Example/CRC_Example.ioc b/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Example/CRC_Example.ioc
index 721f52ae..4fc94c2b 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Example/CRC_Example.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_Example/CRC_Example.ioc
@@ -106,3 +106,5 @@ VP_CRC_VS_CRC.Signal=CRC_VS_CRC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRC_Example
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc b/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc
index 7f03ecd7..a81bae59 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc
@@ -108,3 +108,5 @@ VP_CRC_VS_CRC.Signal=CRC_VS_CRC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRC_UserDefinedPolynomial
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc
index ebea4ddc..3af12758 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/CRYP_AESModes.ioc
@@ -104,3 +104,5 @@ VP_AES_VS_AES.Signal=AES_VS_AES
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRYP_AESModes
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/.cproject
index a607b74e..7e98f591 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/STM32CubeIDE/.cproject
@@ -17,13 +17,13 @@
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.132587357" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.132587357." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1447433583" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.6757006" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.407393109" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.853766497" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2080713104" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.33353208" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1895974046" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.940448334" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.6757006" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.407393109" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.853766497" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.2080713104" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.33353208" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1895974046" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.940448334" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1102447503" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/CRYP_AESModes}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.540198623" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.933497447" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -47,7 +47,7 @@
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
 									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
 								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.2085402864" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.2085402864" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="-Wno-format"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2091436168" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
@@ -83,6 +83,87 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.132587357.1581626356">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.132587357.1581626356" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.132587357.1581626356" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.132587357.1581626356." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.795554826" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1163030982" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1415367248" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.726031457" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.767018756" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.890503908" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1108783662" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.371246329" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1127792990" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/CRYP_AESModes}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.29121999" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.733646090" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1716609462" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.973246192" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1545278301" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.114212094" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.471054325" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1434074323" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1079801995" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1331341333" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-format"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1682370024" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1635407083" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1780555984" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.610377336" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.786784228" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1109827715" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.756662204" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-specs=rdimon.specs -lc -lrdimon"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1533625805" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1388486507" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.1061291188" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.263463900" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.43180995" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.494609730" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.775699652" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.808738156" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1307174574" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1578329655" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1535795374" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="CRYP_AESModes.null.1060309631" name="CRYP_AESModes"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/Src/main.c
index f9cd6b5c..2721a835 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_AESModes/Src/main.c
@@ -971,7 +971,7 @@ static void Display_DecryptedData(uint8_t mode, uint16_t keysize, uint32_t datal
 void data_cmp(uint32_t *EncryptedText, uint32_t *RefText, uint8_t Size)
 {
   /*  Before starting a new process, you need to check the current state of the peripheral;
-      if it’s busy you need to wait for the end of current transfer before starting a new one.
+      if it is busy you need to wait for the end of current transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       process, but application may perform other tasks while transfer operation
       is ongoing. */
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc
index 8f5c3554..47427f73 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_DMA/CRYP_DMA.ioc
@@ -149,3 +149,5 @@ VP_AES_VS_AES.Signal=AES_VS_AES
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRYP_DMA
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/.cproject
index e292bda6..757d0159 100644
--- a/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples/CRYP/CRYP_DMA/STM32CubeIDE/.cproject
@@ -17,13 +17,13 @@
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.985924271" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.985924271." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.556689555" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1216823317" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1434767234" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.2130035834" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1130457959" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.69007751" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2100910803" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.991067247" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1216823317" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1434767234" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.2130035834" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1130457959" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.69007751" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2100910803" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.991067247" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.483101588" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/CRYP_DMA}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.111576565" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.2133460725" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -55,7 +55,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2040488895" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.471015711" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1298806750" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1298806750" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="-specs=rdimon.specs -lc -lrdimon"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.111337968" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
@@ -80,6 +80,85 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.985924271.384362409">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.985924271.384362409" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.985924271.384362409" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.985924271.384362409." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1490068780" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.890693985" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.2078171641" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1482100945" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1511537806" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1996651920" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1637932035" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.244561386" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.577609988" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/CRYP_DMA}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.928838792" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.125605809" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.283938959" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1055814031" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1552753188" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.684602441" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.796415637" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1561338234" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.987347849" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1345477191" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.89561070" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.47786966" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.134017381" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.826097837" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1653056356" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1950600507" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-specs=rdimon.specs -lc -lrdimon"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2021189517" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1749954120" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.250628178" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.2135932450" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.433627232" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1031397402" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1563461871" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1972352233" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.378226806" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.2082631791" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.522825518" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="CRYP_DMA.null.1369394815" name="CRYP_DMA"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples/DAC/DAC_SignalsGeneration/DAC_SignalsGeneration.ioc b/Projects/NUCLEO-WL55JC/Examples/DAC/DAC_SignalsGeneration/DAC_SignalsGeneration.ioc
index 09e05b84..3ecf542f 100644
--- a/Projects/NUCLEO-WL55JC/Examples/DAC/DAC_SignalsGeneration/DAC_SignalsGeneration.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/DAC/DAC_SignalsGeneration/DAC_SignalsGeneration.ioc
@@ -135,3 +135,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM1_VS_ClockSourceINT.Mode=Internal
 VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
 board=custom
+ProjectManager.Example=DAC_SignalsGeneration
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/DAC/DAC_SimpleConversion/DAC_SimpleConversion.ioc b/Projects/NUCLEO-WL55JC/Examples/DAC/DAC_SimpleConversion/DAC_SimpleConversion.ioc
index f41397d8..65606594 100644
--- a/Projects/NUCLEO-WL55JC/Examples/DAC/DAC_SimpleConversion/DAC_SimpleConversion.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/DAC/DAC_SimpleConversion/DAC_SimpleConversion.ioc
@@ -101,3 +101,5 @@ SH.COMP_DAC1_group.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DAC_SimpleConversion
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc
index 4a1be779..d3686c37 100644
--- a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc
@@ -118,3 +118,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DMA_FLASHToRAM
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc
index 6403ce91..737ef96e 100644
--- a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_MUXSYNC/DMA_MUXSYNC.ioc
@@ -162,3 +162,5 @@ VP_LPTIM1_VS_LPTIM_counterModeInternalClock.Signal=LPTIM1_VS_LPTIM_counterModeIn
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DMA_MUXSYNC
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc
index 4b8cb281..f4c4b9e9 100644
--- a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_MUX_RequestGen/DMA_MUX_RequestGen.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DMA_MUX_RequestGen
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_SecureTransfer_DualCore/CM0PLUS/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_SecureTransfer_DualCore/CM0PLUS/Src/main.c
index bd955563..716195f1 100644
--- a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_SecureTransfer_DualCore/CM0PLUS/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_SecureTransfer_DualCore/CM0PLUS/Src/main.c
@@ -89,7 +89,7 @@ int main(void)
 
   /* USER CODE END Init */
 
-  /* MX_GTZC_S_Init initialisation */
+  /* GTZC initialisation */
   MX_GTZC_S_Init();
 
   /* USER CODE BEGIN SysInit */
@@ -167,6 +167,18 @@ static void MX_GTZC_S_Init(void)
   */
 
   /* USER CODE END GTZC_S_Init 1 */
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_DMA1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_FLASH) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM1) != HAL_OK)
+  {
+    Error_Handler();
+  }
   MPCWM_NonPrivilegeArea_Desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
   MPCWM_NonPrivilegeArea_Desc.Length = 0x40000;
   if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &MPCWM_NonPrivilegeArea_Desc) != HAL_OK)
@@ -184,7 +196,6 @@ static void MX_GTZC_S_Init(void)
   {
     Error_Handler();
   }
-  MPCWM_NonPrivilegeArea_Desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
   if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &MPCWM_NonPrivilegeArea_Desc) != HAL_OK)
   {
     Error_Handler();
diff --git a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_SecureTransfer_DualCore/DMA_SecureTransfer_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_SecureTransfer_DualCore/DMA_SecureTransfer_DualCore.ioc
index 51aa2c92..e3f70dfa 100644
--- a/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_SecureTransfer_DualCore/DMA_SecureTransfer_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/DMA/DMA_SecureTransfer_DualCore/DMA_SecureTransfer_DualCore.ioc
@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
-CortexM0Plus.IPs=IPCC,RCC,SYS_M0PLUS\:I,DMA,NVIC2\:I,ADV_TRACE,LORAWAN,MISC,SEQUENCER,SIGFOX,SUBGHZ_PHY,TIMER,TINY_LPM,GTZC_S\:I
-CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,RCC\:I,SYS\:I,DMA\:I,NVIC1\:I,ADV_TRACE\:I,LORAWAN\:I,MISC\:I,SEQUENCER\:I,SIGFOX\:I,SUBGHZ_PHY\:I,TIMER\:I,TINY_LPM\:I,GTZC_NS\:I
+CortexM0Plus.IPs=IPCC,RCC,SYS_M0PLUS\:I,DMA,NVIC2\:I,ADV_TRACE,LORAWAN,MISC,SIGFOX,SUBGHZ_PHY,TIMER,TINY_LPM,GTZC_S\:I,SEQUENCER_M0PLUS\:I,SUBGHZ\:I
+CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,RCC\:I,SYS\:I,DMA\:I,NVIC1\:I,ADV_TRACE\:I,LORAWAN\:I,MISC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,TIMER\:I,TINY_LPM\:I,GTZC_NS\:I,SEQUENCER_M4\:I
 Dma.MEMTOMEM.0.Channel_PRIV_NPRIV=DMA_CHANNEL_NPRIV_DISABLE
 Dma.MEMTOMEM.0.Channel_SEC_NSEC=DMA_CHANNEL_SEC_ENABLE
 Dma.MEMTOMEM.0.Dest_SEC_NSEC=DMA_CHANNEL_DEST_NSEC_DISABLE
@@ -28,12 +28,16 @@ File.Version=6
 GPIO.groupedBy=
 GTZC_S.DMA1_Illegal_Access_Interrupt=Enabled
 GTZC_S.FLASH_Illegal_Access_Interrupt=Enabled
-GTZC_S.IPParameters=DMA1_Illegal_Access_Interrupt,FLASH_Illegal_Access_Interrupt,SRAM1_Illegal_Access_Interrupt,TZIC_Configure_IT_Choice,MPCWM1_NonPrivilegeArea_Choice,MPCWM2_NonPrivilegeArea_Choice,MPCWM3_NonPrivilegeArea_Choice
+GTZC_S.Full_IT_Default-GTZC_Enable=Disabled
+GTZC_S.Full_IT_Enabled-GTZC_Enable=Enabled
+GTZC_S.IAI_Default-GTZC_Enable=Disabled
+GTZC_S.IPParameters=DMA1_Illegal_Access_Interrupt,FLASH_Illegal_Access_Interrupt,SRAM1_Illegal_Access_Interrupt,TZIC_Configure_IT_Choice,MPCWM1_NonPrivilegeArea_Choice,MPCWM2_NonPrivilegeArea_Choice,MPCWM3_NonPrivilegeArea_Choice,MPCWM_Activation,Full_IT_Enabled-GTZC_Enable,Full_IT_Default-GTZC_Enable,IAI_Default-GTZC_Enable
 GTZC_S.MPCWM1_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM2_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM3_NonPrivilegeArea_Choice=from full Not Privileged
+GTZC_S.MPCWM_Activation=MPCWM_ENABLE
 GTZC_S.SRAM1_Illegal_Access_Interrupt=Enabled
-GTZC_S.TZIC_Configure_IT_Choice=by Individual Disabling from full Enabled
+GTZC_S.TZIC_Configure_IT_Choice=by Individual modifying from Default
 KeepUserPlacement=false
 Mcu.Context0=CortexM4
 Mcu.Context1=CortexM0Plus
@@ -57,8 +61,8 @@ Mcu.PinsNb=3
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.ForceEnableDMAVector=true
@@ -77,6 +81,13 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC2.TZIC_ILA_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -128,3 +139,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DMA_SecureTransfer_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc b/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc
index 7266dfc6..557a0597 100644
--- a/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_EraseProgram/FLASH_EraseProgram.ioc
@@ -98,3 +98,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=FLASH_EraseProgram
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_FastProgram/FLASH_FastProgram.ioc b/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_FastProgram/FLASH_FastProgram.ioc
index 2663bb23..bebf42d1 100644
--- a/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_FastProgram/FLASH_FastProgram.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_FastProgram/FLASH_FastProgram.ioc
@@ -98,3 +98,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=FLASH_FastProgram
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc b/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc
index b02f26d1..f17fbbdd 100644
--- a/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/FLASH/FLASH_WriteProtection/FLASH_WriteProtection.ioc
@@ -98,3 +98,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=FLASH_WriteProtection
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc b/Projects/NUCLEO-WL55JC/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc
index d7da24f2..da31f6dc 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/GPIO/GPIO_EXTI/GPIO_EXTI.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=GPIO_EXTI
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc b/Projects/NUCLEO-WL55JC/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc
index f28f093b..d92e9efb 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/GPIO/GPIO_IOToggle/GPIO_IOToggle.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=GPIO_IOToggle
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM0plus/.cproject b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM0plus/.cproject
index 3bc2a1da..6eb883c5 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM0plus/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM0plus/.cproject
@@ -14,7 +14,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1437914377" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="arm-none-eabi-gcc -P -E -xc -D CPU2 -E -o./output.ld  ../../STM32WL55JCIX_FLASH.ld">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1437914377" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" prebuildStep="arm-none-eabi-gcc -P -E -xc -D CPU2 -E -o./output.ld  ../STM32WL55JCIX_FLASH.ld">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1437914377." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.521037347" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
 							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1071219324" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
@@ -93,17 +93,17 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.2113596097" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release" prebuildStep="arm-none-eabi-gcc -P -E -xc -D CPU2 -E -o./output.ld  ../../STM32WL55JCIX_FLASH.ld">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.2113596097" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release" prebuildStep="arm-none-eabi-gcc -P -E -xc -D CPU2 -E -o./output.ld  ../STM32WL55JCIX_FLASH.ld">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.2113596097." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.595996816" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1812967700" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1926922742" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.674888181" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.31847615" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="1" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1131789487" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.996560373" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1154479440" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure || Size ||  || " valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.2123793421" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" value="true" valueType="boolean"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1812967700" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1926922742" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.674888181" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.31847615" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1131789487" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.996560373" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1154479440" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 1 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../../CM0PLUS/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../../Drivers/CMSIS/Include | ../../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM0PLUS ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure || Size ||  || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.2123793421" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.710511348" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/GTZC_GlobalSecurityConfiguration_DualCore_CM0PLUS}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1591573296" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.538907927" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld
similarity index 100%
rename from Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
rename to Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM4/.cproject b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM4/.cproject
index 5144053a..04c099d0 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM4/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM4/.cproject
@@ -14,7 +14,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1811914909" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="" prebuildStep="arm-none-eabi-gcc -P -E -xc -D CPU1 -E -o./output.ld  ../../STM32WL55JCIX_FLASH.ld">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1811914909" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug" postbuildStep="" prebuildStep="arm-none-eabi-gcc -P -E -xc -D CPU1 -E -o./output.ld  ../STM32WL55JCIX_FLASH.ld">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1811914909." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1248598051" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
 							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.345858007" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
@@ -95,7 +95,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1465463841" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release" prebuildStep="arm-none-eabi-gcc -P -E -xc -D CPU1 -E -o./output.ld  ../../STM32WL55JCIX_FLASH.ld">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1465463841" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release" prebuildStep="arm-none-eabi-gcc -P -E -xc -D CPU1 -E -o./output.ld  ../STM32WL55JCIX_FLASH.ld">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1465463841." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.2015859448" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
 							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.664785138" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
@@ -131,7 +131,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1391768184" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1778634885" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1092714487" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1092714487" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.520128245" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1356524644" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="./output.ld" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
new file mode 100644
index 00000000..fe7dc029
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -0,0 +1,216 @@
+/*
+** LinkerScript
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = ORIGIN(RAM1) + LENGTH(RAM1); /* end of "SRAM1" Ram type memory */
+
+
+/* Memory Regions
+/****** FLASH Part dedicated to CPU1 ******/
+#define ROM_CPU1_START 					0x08000000
+#define ROM_CPU1_LENGTH					0x00020000
+/****** FLASH Part dedicated to CPU2 ******/
+#define ROM_CPU2_START 					0x08020000
+#define ROM_CPU2_LENGTH 				0x00020000
+
+/****** SRAM1 dedicated to CPU1 ******/
+#define SRAM1_CPU1_START 				0x20000000 
+#define SRAM1_CPU1_LENGTH    			0x00004000
+/****** SRAM1 dedicated to CPU2 ***** */
+#define SRAM1_CPU2_START  				0x20004000
+#define SRAM1_CPU2_LENGTH    			0x00004000
+
+/****** SRAM2 dedicated to CPU1 ******/
+#define SRAM2_CPU1_START  				0x20008000
+#define SRAM2_CPU1_LENGTH    			0x00004000
+/****** SRAM2 dedicated to CPU2 ******/
+#define SRAM2_CPU2_START  				0x2000C000
+#define SRAM2_CPU2_LENGTH   			0x00004000
+
+
+MEMORY
+{
+
+  #if (CPU1 )
+  
+  ROM    (rx)    : ORIGIN = ROM_CPU1_START , LENGTH = ROM_CPU1_LENGTH   /* Flash memory dedicated to CM4 */
+  RAM1   (xrw)   : ORIGIN = SRAM1_CPU1_START, LENGTH = SRAM1_CPU1_LENGTH    /* Non-backup SRAM1 dedicated to CM4 */
+  RAM2   (xrw)   : ORIGIN = SRAM2_CPU1_START, LENGTH = SRAM2_CPU1_LENGTH    /* Backup SRAM2 dedicated to CM4 */
+  
+  #else
+  ROM    (rx)    : ORIGIN = ROM_CPU2_START , LENGTH = ROM_CPU2_LENGTH   /* Flash memory dedicated to CM4 */
+  RAM1   (xrw)   : ORIGIN = SRAM1_CPU2_START, LENGTH = SRAM1_CPU2_LENGTH    /* Non-backup SRAM1 dedicated to CM4 */
+  RAM2   (xrw)   : ORIGIN = SRAM2_CPU2_START, LENGTH = SRAM2_CPU2_LENGTH    /* Backup SRAM2 dedicated to CM4 */
+  #endif
+}
+
+_Min_Heap_Size = 0x200 ; /* required amount of heap  */
+_Min_Stack_Size = 0x400 ; /* required amount of stack */
+
+/* Sections */
+SECTIONS
+{
+  /* The startup code into "ROM" Rom type memory */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >ROM
+
+  /* The program code and other data into "ROM" Rom type memory */
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >ROM
+
+  /* Constant data into "ROM" Rom type memory */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >ROM
+
+  .ARM.extab   : { 
+    . = ALIGN(8);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(8);
+  } >ROM
+  
+  .ARM : {
+    . = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+    . = ALIGN(8);
+  } >ROM
+
+  .preinit_array     :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+    . = ALIGN(8);
+  } >ROM
+  
+  .init_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+    . = ALIGN(8);
+  } >ROM
+  
+  .fini_array :
+  {
+    . = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+    . = ALIGN(8);
+  } >ROM
+
+  /* Used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections into "SRAM1" Ram type memory */
+  .data : 
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+    
+  } >RAM1 AT> ROM
+
+  /* Uninitialized data section into "SRAM1" Ram type memory */
+  . = ALIGN(8);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(8);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM1
+
+  /* Data section into "SRAM1" Ram type memory: Non-backup SRAM1 dedicated to CM4 */
+  . = ALIGN(8);
+  RAM1_region :
+  {
+    _sRAM_region = .;         /* define a global symbol at section start */
+    *(.RAM1_region)
+
+    . = ALIGN(8);
+    _eRAM1_region = .;         /* define a global symbol at section end */
+  } >RAM1
+
+  /* Data section into "SRAM2" Ram type memory: Backup SRAM2 dedicated to CM4 */
+  . = ALIGN(8);
+  RAM2_region :
+  {
+    _sRAM2_region = .;         /* define a global symbol at section start */
+    *(.RAM2_region)
+
+    . = ALIGN(8);
+    _eRAM2_region = .;         /* define a global symbol at section end */
+  } >RAM2
+
+  /* User_heap_stack section, used to check that there is enough "SRAM1" Ram  type memory left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM1
+  
+_ROM2_CPU2_base = ROM_CPU2_START;
+_ROM2_CPU2_length = ROM_CPU2_LENGTH;
+_SRAM1_CPU2_base = SRAM1_CPU2_START;
+_SRAM1_CPU2_length = SRAM1_CPU2_LENGTH ;
+_SRAM2_CPU2_base = SRAM2_CPU2_START;
+_SRAM2_CPU2_length = SRAM2_CPU2_LENGTH ;
+  /* Remove information from the compiler libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/readme.txt
index 0cbd846e..a418d1c6 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_GlobalSecurityConfiguration_DualCore/readme.txt
@@ -66,7 +66,7 @@ Option bytes have to be modified following this sequence:
 
 @par Keywords
 
-Security, GTZC, FLASH, DMA, TZSC, TZIC, MPCWM, TrustZone, Secure, Privilege, Illegal access, Memory, Option bytes, Lock, Power On Reset
+Security, GTZC, FLASH, DMA, TZSC, TZIC, MPCWM, Secure, Privilege, Illegal access, Memory, Option bytes, Lock, Power On Reset
 
 @par Directory contents
 
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/CM0PLUS/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/CM0PLUS/Src/main.c
index 95897ca4..a6e793da 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/CM0PLUS/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/CM0PLUS/Src/main.c
@@ -76,7 +76,7 @@ int main(void)
   /* USER CODE BEGIN Init */
   /* USER CODE END Init */
 
-  /* MX_GTZC_S_Init initialisation */
+  /* GTZC initialisation */
   MX_GTZC_S_Init();
 
   /* USER CODE BEGIN SysInit */
@@ -173,13 +173,11 @@ static void MX_GTZC_S_Init(void)
 
   /* USER CODE BEGIN GTZC_S_Init 1 */
 
-  /* Note: Default state of GTZC peripherals interrruption are enable.
-           Therefore, SRAM2 interruption is implicitly enable, corresponding
-           to the corresponding explicit code:
-           "HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2);"
-  */
-
   /* USER CODE END GTZC_S_Init 1 */
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_SRAM2) != HAL_OK)
+  {
+    Error_Handler();
+  }
   MPCWM_NonPrivilegeArea_Desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
   MPCWM_NonPrivilegeArea_Desc.Length = 0x40000;
   if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(FLASH_BASE, &MPCWM_NonPrivilegeArea_Desc) != HAL_OK)
@@ -197,7 +195,6 @@ static void MX_GTZC_S_Init(void)
   {
     Error_Handler();
   }
-  MPCWM_NonPrivilegeArea_Desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
   MPCWM_NonPrivilegeArea_Desc.Length = 0x4000;
   if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &MPCWM_NonPrivilegeArea_Desc) != HAL_OK)
   {
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/GTZC_MemoryWatermarkProtection_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/GTZC_MemoryWatermarkProtection_DualCore.ioc
index da9fccde..55bc4439 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/GTZC_MemoryWatermarkProtection_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/GTZC_MemoryWatermarkProtection_DualCore.ioc
@@ -1,14 +1,21 @@
 #MicroXplorer Configuration settings - do not modify
-CortexM0Plus.IPs=ADV_TRACE,IPCC,LORAWAN,MISC,RCC,SEQUENCER,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,TIMER,TINY_LPM,DMA,NVIC2\:I,GTZC_S\:I
-CortexM4.IPs=ADV_TRACE\:I,DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,MISC\:I,RCC\:I,SEQUENCER\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,TIMER\:I,TINY_LPM\:I,DMA\:I,NVIC1\:I,GTZC_NS\:I
+CortexM0Plus.IPs=ADV_TRACE,IPCC,LORAWAN,MISC,RCC,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,TIMER,TINY_LPM,DMA,NVIC2\:I,GTZC_S\:I,SEQUENCER_M0PLUS\:I,SUBGHZ\:I
+CortexM4.IPs=ADV_TRACE\:I,DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,MISC\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,TIMER\:I,TINY_LPM\:I,DMA\:I,NVIC1\:I,GTZC_NS\:I,SEQUENCER_M4\:I
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
-GTZC_S.IPParameters=MPCWM3_NonPrivilegeArea_Choice,MPCWM2_NonPrivilegeArea_Choice,MPCWM1_NonPrivilegeArea_Choice,MPCWM3_NonPrivilegeArea_Size,TZIC_Configure_IT_Choice
+GTZC_S.Full_IT_Default-GTZC_Enable=Disabled
+GTZC_S.Full_IT_Enabled-GTZC_Enable=Enabled
+GTZC_S.IAI_Default-GTZC_Enable=Disabled
+GTZC_S.IAI_Enabled-GTZC_Enable=Disabled
+GTZC_S.IPParameters=MPCWM3_NonPrivilegeArea_Choice,MPCWM2_NonPrivilegeArea_Choice,MPCWM1_NonPrivilegeArea_Choice,MPCWM3_NonPrivilegeArea_Size,TZIC_Configure_IT_Choice,MPCWM_Activation,Full_IT_Enabled-GTZC_Enable,Full_IT_Default-GTZC_Enable,IAI_Enabled-GTZC_Enable,IAI_Default-GTZC_Enable,TZIC_Illegal_Access_Interrupt,SRAM2_Illegal_Access_Interrupt
 GTZC_S.MPCWM1_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM2_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM3_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM3_NonPrivilegeArea_Size=0x4000
-GTZC_S.TZIC_Configure_IT_Choice=by Individual Disabling from full Enabled
+GTZC_S.MPCWM_Activation=MPCWM_ENABLE
+GTZC_S.SRAM2_Illegal_Access_Interrupt=Enabled
+GTZC_S.TZIC_Configure_IT_Choice=by Individual modifying from Default
+GTZC_S.TZIC_Illegal_Access_Interrupt=Default
 KeepUserPlacement=false
 Mcu.Context0=CortexM4
 Mcu.Context1=CortexM0Plus
@@ -31,8 +38,8 @@ Mcu.PinsNb=3
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.ForceEnableDMAVector=false
@@ -51,6 +58,13 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC2.TZIC_ILA_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -129,3 +143,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=GTZC_MemoryWatermarkProtection_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/readme.txt
index a61a5d81..f21148de 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_MemoryWatermarkProtection_DualCore/readme.txt
@@ -84,7 +84,7 @@ Option bytes have to be modified following this sequence:
 
 @par Keywords
 
-Security, GTZC, TZSC, TZIC, TrustZone, Secure, Privilege, Watermark, Illegal access, Memory
+Security, GTZC, TZSC, TZIC, Secure, Privilege, Watermark, Illegal access, Memory
 
 @par Directory contents
 
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/CM0PLUS/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/CM0PLUS/Src/main.c
index eab18dee..f4df736a 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/CM0PLUS/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/CM0PLUS/Src/main.c
@@ -70,7 +70,7 @@ int main(void)
   /* USER CODE BEGIN Init */
   /* USER CODE END Init */
 
-  /* MX_GTZC_S_Init initialisation */
+  /* GTZC initialisation */
   MX_GTZC_S_Init();
 
   /* USER CODE BEGIN SysInit */
@@ -126,6 +126,10 @@ static void MX_GTZC_S_Init(void)
   /* USER CODE BEGIN GTZC_S_Init 1 */
 
   /* USER CODE END GTZC_S_Init 1 */
+  if (HAL_GTZC_TZIC_EnableIT(GTZC_PERIPH_RNG) != HAL_OK)
+  {
+    Error_Handler();
+  }
   if (HAL_GTZC_TZSC_ConfigPeriphAttributes(GTZC_PERIPH_RNG, GTZC_TZSC_ATTRIBUTE_SEC|GTZC_TZSC_ATTRIBUTE_NPRIV) != HAL_OK)
   {
     Error_Handler();
@@ -147,7 +151,6 @@ static void MX_GTZC_S_Init(void)
   {
     Error_Handler();
   }
-  MPCWM_NonPrivilegeArea_Desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
   if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &MPCWM_NonPrivilegeArea_Desc) != HAL_OK)
   {
     Error_Handler();
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/GTZC_PeripheralProtection_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/GTZC_PeripheralProtection_DualCore.ioc
index c8f7e8d7..0860836f 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/GTZC_PeripheralProtection_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/GTZC_PeripheralProtection_DualCore.ioc
@@ -1,14 +1,22 @@
 #MicroXplorer Configuration settings - do not modify
-CortexM0Plus.IPs=ADV_TRACE,IPCC,LORAWAN,MISC,RCC,SEQUENCER,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,TIMER,TINY_LPM,DMA,NVIC2\:I,GTZC_S\:I
-CortexM4.IPs=ADV_TRACE\:I,DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,MISC\:I,RCC\:I,SEQUENCER\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,TIMER\:I,TINY_LPM\:I,DMA\:I,NVIC1\:I,GTZC_NS\:I
+CortexM0Plus.IPs=ADV_TRACE,IPCC,LORAWAN,MISC,RCC,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,TIMER,TINY_LPM,DMA,NVIC2\:I,GTZC_S\:I,SEQUENCER_M0PLUS\:I,SUBGHZ\:I,RNG\:I
+CortexM4.IPs=ADV_TRACE\:I,DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,MISC\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,TIMER\:I,TINY_LPM\:I,DMA\:I,NVIC1\:I,GTZC_NS\:I,SEQUENCER_M4\:I
 File.Version=6
 GPIO.groupedBy=
-GTZC_S.IPParameters=RNG_Secure,MPCWM1_NonPrivilegeArea_Choice,MPCWM2_NonPrivilegeArea_Choice,MPCWM3_NonPrivilegeArea_Choice,TZIC_Configure_IT_Choice
+GTZC_S.Full_IT_Default-GTZC_Enable=Disabled
+GTZC_S.Full_IT_Disabled-GTZC_Enable=Enabled
+GTZC_S.Full_IT_Enabled-GTZC_Enable=Enabled
+GTZC_S.IAI_Default-GTZC_Enable=Disabled
+GTZC_S.IAI_Disabled-GTZC_Enable=Enabled
+GTZC_S.IAI_Enabled-GTZC_Enable=Disabled
+GTZC_S.IPParameters=RNG_Secure,MPCWM1_NonPrivilegeArea_Choice,MPCWM2_NonPrivilegeArea_Choice,MPCWM3_NonPrivilegeArea_Choice,TZIC_Configure_IT_Choice,Full_IT_Disabled-GTZC_Enable,Full_IT_Enabled-GTZC_Enable,IAI_Disabled-GTZC_Enable,IAI_Enabled-GTZC_Enable,RNG_Illegal_Access_Interrupt,Full_IT_Default-GTZC_Enable,IAI_Default-GTZC_Enable,MPCWM_Activation
 GTZC_S.MPCWM1_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM2_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM3_NonPrivilegeArea_Choice=from full Not Privileged
+GTZC_S.MPCWM_Activation=MPCWM_ENABLE
+GTZC_S.RNG_Illegal_Access_Interrupt=Enabled
 GTZC_S.RNG_Secure=GTZC_TZSC_ATTRIBUTE_SEC
-GTZC_S.TZIC_Configure_IT_Choice=by Individual Disabling from full Enabled
+GTZC_S.TZIC_Configure_IT_Choice=by Individual modifying from Default
 KeepUserPlacement=false
 Mcu.Context0=CortexM4
 Mcu.Context1=CortexM0Plus
@@ -31,8 +39,8 @@ Mcu.PinsNb=3
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.3.0
+MxDb.Version=DB.6.0.30
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.ForceEnableDMAVector=false
@@ -51,6 +59,13 @@ NVIC2.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC2.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC2.TZIC_ILA_IRQn=true\:0\:0\:false\:false\:true\:true\:true
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -130,3 +145,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=GTZC_PeripheralProtection_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/readme.txt
index a68b4b98..c6558fc0 100644
--- a/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Examples/GTZC/GTZC_PeripheralProtection_DualCore/readme.txt
@@ -79,7 +79,7 @@ Option bytes have to be modified following this sequence:
 
 @par Keywords
 
-Security, GTZC, TZSC, TZIC, TrustZone, Secure, Securable, Illegal access
+Security, GTZC, TZSC, TZIC, Secure, Securable, Illegal access
 
 @par Directory contents
 
diff --git a/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc b/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc
index 425b83b5..2d3e5610 100644
--- a/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase/HAL_TimeBase.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=HAL_TimeBase
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_RTC_ALARM/HAL_TimeBase_RTC_ALARM.ioc b/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_RTC_ALARM/HAL_TimeBase_RTC_ALARM.ioc
index 38e0e6f4..573ee47f 100644
--- a/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_RTC_ALARM/HAL_TimeBase_RTC_ALARM.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_RTC_ALARM/HAL_TimeBase_RTC_ALARM.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=HAL_TimeBase_RTC_ALARM
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc b/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc
index ba6dbfbb..ea150dc8 100644
--- a/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_RTC_WKUP/HAL_TimeBase_RTC_WKUP.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=HAL_TimeBase_RTC_WKUP
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc b/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc
index a2da2562..fd618b71 100644
--- a/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/HAL/HAL_TimeBase_TIM/HAL_TimeBase_TIM.ioc
@@ -99,3 +99,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_tim2.Mode=TIM2
 VP_SYS_VS_tim2.Signal=SYS_VS_tim2
 board=custom
+ProjectManager.Example=HAL_TimeBase_TIM
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc b/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc
index bac67966..b04749aa 100644
--- a/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_ProcessSync/HSEM_ProcessSync.ioc
@@ -101,3 +101,5 @@ VP_HSEM_VS_HSEM.Signal=HSEM_VS_HSEM
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=HSEM_ProcessSync
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc b/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc
index 7d62aace..4a5aa050 100644
--- a/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_ReadLock/HSEM_ReadLock.ioc
@@ -101,3 +101,5 @@ VP_HSEM_VS_HSEM.Signal=HSEM_VS_HSEM
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=HSEM_ReadLock
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_Sync_DualCore/HSEM_Sync_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_Sync_DualCore/HSEM_Sync_DualCore.ioc
index 8652cefd..5be48756 100644
--- a/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_Sync_DualCore/HSEM_Sync_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/HSEM/HSEM_Sync_DualCore/HSEM_Sync_DualCore.ioc
@@ -139,3 +139,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=HSEM_Sync_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc
index dbdab23c..8997e193 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComDMA/I2C_TwoBoards_ComDMA.ioc
@@ -161,3 +161,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_ComDMA
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c
index f6c5c43c..d0b96692 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComDMA/Src/main.c
@@ -153,7 +153,7 @@ int main(void)
 
     /*##- Wait for the end of the transfer #################################*/
     /*  Before starting a new communication transfer, you need to check the current
-        state of the peripheral; if it�s busy you need to wait for the end of current
+        state of the peripheral; if it is busy you need to wait for the end of current
         transfer before starting a new one.
         For simplicity reasons, this example is just waiting till the end of the
         transfer, but application may perform other tasks while transfer operation
@@ -191,7 +191,7 @@ int main(void)
 
     /*##- Wait for the end of the transfer #################################*/
     /*  Before starting a new communication transfer, you need to check the current
-        state of the peripheral; if it�s busy you need to wait for the end of current
+        state of the peripheral; if it is busy you need to wait for the end of current
         transfer before starting a new one.
         For simplicity reasons, this example is just waiting till the end of the
         transfer, but application may perform other tasks while transfer operation
@@ -218,7 +218,7 @@ int main(void)
 
   /*##- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
@@ -240,7 +240,7 @@ int main(void)
 
   /*##- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc
index f17f4435..89389b19 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComIT/I2C_TwoBoards_ComIT.ioc
@@ -119,3 +119,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_ComIT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c
index dbc743df..af6a8c45 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComIT/Src/main.c
@@ -150,7 +150,7 @@ int main(void)
 
     /*##- Wait for the end of the transfer #################################*/
     /*  Before starting a new communication transfer, you need to check the current
-        state of the peripheral; if it�s busy you need to wait for the end of current
+        state of the peripheral; if it is busy you need to wait for the end of current
         transfer before starting a new one.
         For simplicity reasons, this example is just waiting till the end of the
         transfer, but application may perform other tasks while transfer operation
@@ -188,7 +188,7 @@ int main(void)
 
     /*##- Wait for the end of the transfer #################################*/
     /*  Before starting a new communication transfer, you need to check the current
-        state of the peripheral; if it�s busy you need to wait for the end of current
+        state of the peripheral; if it is busy you need to wait for the end of current
         transfer before starting a new one.
         For simplicity reasons, this example is just waiting till the end of the
         transfer, but application may perform other tasks while transfer operation
@@ -215,7 +215,7 @@ int main(void)
 
   /*##- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
@@ -237,7 +237,7 @@ int main(void)
 
   /*##- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComPolling/I2C_TwoBoards_ComPolling.ioc b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComPolling/I2C_TwoBoards_ComPolling.ioc
index 59cd93cf..d97acd0e 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComPolling/I2C_TwoBoards_ComPolling.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_ComPolling/I2C_TwoBoards_ComPolling.ioc
@@ -117,3 +117,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_ComPolling
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/I2C_TwoBoards_RestartAdvComIT.ioc b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/I2C_TwoBoards_RestartAdvComIT.ioc
index cc707094..1e50d226 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/I2C_TwoBoards_RestartAdvComIT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/I2C_TwoBoards_RestartAdvComIT.ioc
@@ -119,3 +119,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_RestartAdvComIT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/.cproject
index 2afcdbc8..0c389fd3 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/STM32CubeIDE/.cproject
@@ -17,13 +17,13 @@
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1694945356" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1694945356." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1018457505" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1798943559" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1432026878" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.96862386" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.527211940" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.600032869" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1615778050" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1094103036" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1798943559" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1432026878" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.96862386" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.527211940" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.600032869" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1615778050" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1094103036" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.656198872" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/I2C_TwoBoards_RestartAdvComIT}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.513722460" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1218301487" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -56,7 +56,7 @@
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2067662529" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.2065600649" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1571118739" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1944284103" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1944284103" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="-specs=rdimon.specs -lc -lrdimon"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1826203479" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
@@ -81,6 +81,86 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1694945356.879224525">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1694945356.879224525" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1694945356.879224525" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1694945356.879224525." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1123819284" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1365944654" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.47482601" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1225819225" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1678810079" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1537376542" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.906193241" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.806571416" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include | ../../../../../../../Drivers/BSP/STM32WLxx_Nucleo ||  ||  || USE_HAL_DRIVER | STM32WL55xx | CORE_CM4 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1862292999" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/I2C_TwoBoards_RestartAdvComIT}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2073701064" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.207303720" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1731093483" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1296417309" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.2036538314" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2126226720" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.480850651" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.804913837" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2044603544" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/BSP/STM32WLxx_Nucleo"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.924587324" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.96842926" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.378882742" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2005196655" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.959810440" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1233994197" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs.1611588970" name="Additional object files" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.additionalobjs" useByScannerDiscovery="false" valueType="userObjs"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.417324765" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-specs=rdimon.specs -lc -lrdimon"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.280992079" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.619623553" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.763027281" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1574653291" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1008081017" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1270795065" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1625257628" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.896943695" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.2039287082" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1404202777" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.760600151" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="I2C_TwoBoards_RestartAdvComIT.null.2120396267" name="I2C_TwoBoards_RestartAdvComIT"/>
@@ -96,4 +176,5 @@
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope"/>
 </cproject>
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c
index 45dd65ac..30cabb14 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartAdvComIT/Src/main.c
@@ -249,7 +249,7 @@ int main(void)
 
         /*##-3- Wait for the end of the transfer #################################*/  
         /*  Before starting a new communication transfer, you need to check the current   
-            state of the peripheral; if it’s busy you need to wait for the end of current
+            state of the peripheral; if it is busy you need to wait for the end of current
             transfer before starting a new one.
             For simplicity reasons, this example is just waiting till the end of the 
             transfer, but application may perform other tasks while transfer operation
@@ -289,7 +289,7 @@ int main(void)
 
         /*##-3- Wait for the end of the transfer #################################*/  
         /*  Before starting a new communication transfer, you need to check the current   
-            state of the peripheral; if it’s busy you need to wait for the end of current
+            state of the peripheral; if it is busy you need to wait for the end of current
             transfer before starting a new one.
             For simplicity reasons, this example is just waiting till the end of the 
             transfer, but application may perform other tasks while transfer operation
@@ -317,7 +317,7 @@ int main(void)
 
         /*##-5- Wait for the end of the transfer #################################*/  
         /*  Before starting a new communication transfer, you need to check the current   
-            state of the peripheral; if it’s busy you need to wait for the end of current
+            state of the peripheral; if it is busy you need to wait for the end of current
             transfer before starting a new one.
             For simplicity reasons, this example is just waiting till the end of the 
             transfer, but application may perform other tasks while transfer operation
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartComIT/I2C_TwoBoards_RestartComIT.ioc b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartComIT/I2C_TwoBoards_RestartComIT.ioc
index a48c3a72..c77a93d3 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartComIT/I2C_TwoBoards_RestartComIT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartComIT/I2C_TwoBoards_RestartComIT.ioc
@@ -119,3 +119,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_RestartComIT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/main.c
index 3fe20fab..9ad4abf6 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_TwoBoards_RestartComIT/Src/main.c
@@ -148,7 +148,7 @@ int main(void)
 
     /*##- Wait for the end of the transfer #################################*/
     /*  Before starting a new communication transfer, you need to check the current
-        state of the peripheral; if it�s busy you need to wait for the end of current
+        state of the peripheral; if it is busy you need to wait for the end of current
         transfer before starting a new one.
         For simplicity reasons, this example is just waiting till the end of the
         transfer, but application may perform other tasks while transfer operation
@@ -183,7 +183,7 @@ int main(void)
 
     /*##- Wait for the end of the transfer #################################*/
     /*  Before starting a new communication transfer, you need to check the current
-        state of the peripheral; if it�s busy you need to wait for the end of current
+        state of the peripheral; if it is busy you need to wait for the end of current
         transfer before starting a new one.
         For simplicity reasons, this example is just waiting till the end of the
         transfer, but application may perform other tasks while transfer operation
@@ -225,7 +225,7 @@ int main(void)
 
   /*##- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
@@ -255,7 +255,7 @@ int main(void)
 
   /*##- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc
index 02504647..83d7cb8b 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_WakeUpFromStop/I2C_WakeUpFromStop.ioc
@@ -121,3 +121,5 @@ RCC.VCOOutputFreq_Value=128000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_WakeUpFromStop
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc
index be401119..6640f11d 100644
--- a/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/I2C/I2C_WakeUpFromStop2/I2C_WakeUpFromStop2.ioc
@@ -120,3 +120,5 @@ RCC.VCOOutputFreq_Value=128000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_WakeUpFromStop2
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/IPCC/IPCC_HalfDuplexMode_DualCore/IPCC_HalfDuplexMode_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/IPCC/IPCC_HalfDuplexMode_DualCore/IPCC_HalfDuplexMode_DualCore.ioc
index a21fbc9e..9cfb6fec 100644
--- a/Projects/NUCLEO-WL55JC/Examples/IPCC/IPCC_HalfDuplexMode_DualCore/IPCC_HalfDuplexMode_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/IPCC/IPCC_HalfDuplexMode_DualCore/IPCC_HalfDuplexMode_DualCore.ioc
@@ -141,3 +141,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=IPCC_HalfDuplexMode_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/IPCC/IPCC_SimplexMode_DualCore/IPCC_SimplexMode_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/IPCC/IPCC_SimplexMode_DualCore/IPCC_SimplexMode_DualCore.ioc
index f941c4d7..95017620 100644
--- a/Projects/NUCLEO-WL55JC/Examples/IPCC/IPCC_SimplexMode_DualCore/IPCC_SimplexMode_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/IPCC/IPCC_SimplexMode_DualCore/IPCC_SimplexMode_DualCore.ioc
@@ -141,3 +141,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=IPCC_SimplexMode_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc b/Projects/NUCLEO-WL55JC/Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc
index 3c1f0030..dc5295f9 100644
--- a/Projects/NUCLEO-WL55JC/Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/IWDG/IWDG_Reset/IWDG_Reset.ioc
@@ -105,3 +105,5 @@ VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=IWDG_Reset
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc b/Projects/NUCLEO-WL55JC/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc
index b43ee8f3..2054e84a 100644
--- a/Projects/NUCLEO-WL55JC/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/IWDG/IWDG_WindowMode/IWDG_WindowMode.ioc
@@ -105,3 +105,5 @@ VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=IWDG_WindowMode
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/LICENSE.md b/Projects/NUCLEO-WL55JC/Examples/LICENSE.md
new file mode 100644
index 00000000..f6031ef2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Examples/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright 2020(-2021) STMicroelectronics.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc
index 0d094e6b..b062c5e2 100644
--- a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWMExternalClock/LPTIM_PWMExternalClock.ioc
@@ -114,3 +114,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=LPTIM_PWMExternalClock
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc
index a3585ac4..bdd63fcd 100644
--- a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWM_LSE/LPTIM_PWM_LSE.ioc
@@ -24,8 +24,8 @@ Mcu.PinsNb=5
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true\:false
 NVIC.ForceEnableDMAVector=true
@@ -44,6 +44,13 @@ PC14-OSC32_IN.Mode=LSE-External-Oscillator
 PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -117,3 +124,5 @@ VP_LPTIM1_VS_LPTIM_counterModeInternalClock.Signal=LPTIM1_VS_LPTIM_counterModeIn
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=LPTIM_PWM_LSE
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c
index 59769a51..1c7ddafb 100644
--- a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PWM_LSE/Src/main.c
@@ -155,6 +155,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
diff --git a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc
index 75e5c1d5..1cd9ce6c 100644
--- a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_PulseCounter/LPTIM_PulseCounter.ioc
@@ -109,3 +109,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=LPTIM_PulseCounter
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc
index 4e4b009c..5083f1a8 100644
--- a/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/LPTIM/LPTIM_Timeout/LPTIM_Timeout.ioc
@@ -111,3 +111,5 @@ VP_LPTIM1_VS_LPTIM_counterModeInternalClock.Signal=LPTIM1_VS_LPTIM_counterModeIn
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=LPTIM_Timeout
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECCscalarMultiplication/PKA_ECCscalarMultiplication.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECCscalarMultiplication/PKA_ECCscalarMultiplication.ioc
index 465b4d9e..f97ffc84 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECCscalarMultiplication/PKA_ECCscalarMultiplication.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECCscalarMultiplication/PKA_ECCscalarMultiplication.ioc
@@ -100,3 +100,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ECCscalarMultiplication
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECCscalarMultiplication_IT/PKA_ECCscalarMultiplication_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECCscalarMultiplication_IT/PKA_ECCscalarMultiplication_IT.ioc
index 033c55c8..0c0bf175 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECCscalarMultiplication_IT/PKA_ECCscalarMultiplication_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECCscalarMultiplication_IT/PKA_ECCscalarMultiplication_IT.ioc
@@ -99,3 +99,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ECCscalarMultiplication_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc
index b42759a6..032232ff 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc
@@ -100,3 +100,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ECDSA_Sign
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc
index 18b9020e..ea2e67cb 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Sign_IT/PKA_ECDSA_Sign_IT.ioc
@@ -99,3 +99,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ECDSA_Sign_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc
index 469118dd..f9e12670 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Verify/PKA_ECDSA_Verify.ioc
@@ -100,3 +100,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ECDSA_Verify
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc
index 74d32250..921c05be 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ECDSA_Verify_IT/PKA_ECDSA_Verify_IT.ioc
@@ -99,3 +99,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ECDSA_Verify_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc
index 659965a4..ca4e9b78 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc
@@ -100,3 +100,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ModularExponentiation
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiationCRT/PKA_ModularExponentiationCRT.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiationCRT/PKA_ModularExponentiationCRT.ioc
index a0c99272..1218d728 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiationCRT/PKA_ModularExponentiationCRT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiationCRT/PKA_ModularExponentiationCRT.ioc
@@ -100,3 +100,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ModularExponentiationCRT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiationCRT_IT/PKA_ModularExponentiationCRT_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiationCRT_IT/PKA_ModularExponentiationCRT_IT.ioc
index 48139503..5b77d33e 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiationCRT_IT/PKA_ModularExponentiationCRT_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiationCRT_IT/PKA_ModularExponentiationCRT_IT.ioc
@@ -99,3 +99,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ModularExponentiationCRT_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiation_IT/PKA_ModularExponentiation_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiation_IT/PKA_ModularExponentiation_IT.ioc
index 357fb01d..d7163e1d 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiation_IT/PKA_ModularExponentiation_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_ModularExponentiation_IT/PKA_ModularExponentiation_IT.ioc
@@ -99,3 +99,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ModularExponentiation_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc
index 889eccb8..ecb8c150 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_PointCheck/PKA_PointCheck.ioc
@@ -100,3 +100,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_PointCheck
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc
index 3783805c..ce8040d4 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PKA/PKA_PointCheck_IT/PKA_PointCheck_IT.ioc
@@ -99,3 +99,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_PointCheck_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc
index 40cb6b1c..6a3eafb0 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_LPRUN/PWR_LPRUN.ioc
@@ -96,3 +96,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_LPRUN
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc
index 7f230b2b..e6868bad 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_LPSLEEP/PWR_LPSLEEP.ioc
@@ -98,3 +98,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_LPSLEEP
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_PVD/PWR_PVD.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_PVD/PWR_PVD.ioc
index a170248d..35e00a18 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_PVD/PWR_PVD.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_PVD/PWR_PVD.ioc
@@ -98,3 +98,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_PVD
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SMPS/PWR_SMPS.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SMPS/PWR_SMPS.ioc
index 49191a00..5974e09b 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SMPS/PWR_SMPS.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SMPS/PWR_SMPS.ioc
@@ -112,3 +112,5 @@ VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_SMPS
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY/PWR_STANDBY.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY/PWR_STANDBY.ioc
index 4755338c..cd6232ab 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY/PWR_STANDBY.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY/PWR_STANDBY.ioc
@@ -98,3 +98,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_STANDBY
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc
index 0f92a009..ba4b2445 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/PWR_STANDBY_RTC.ioc
@@ -56,7 +56,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=EWARM V8
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=false
-ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_RTC_Init-RTC-false-HAL-true
+ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_RTC_Init-RTC-true-HAL-true
 RCC.AHBFreq_Value=48000000
 RCC.APB1Freq_Value=48000000
 RCC.APB1TimFreq_Value=48000000
@@ -107,3 +107,5 @@ VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_STANDBY_RTC
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/Src/main.c
index 1769cd01..f07c3063 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/Src/main.c
@@ -101,14 +101,21 @@ int main(void)
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
-  MX_RTC_Init();
   /* USER CODE BEGIN 2 */
 
   /* Check and handle if the system was resumed from StandBy mode */
-  if(__HAL_PWR_GET_FLAG(PWR_FLAG_SB) != RESET)
+  if(__HAL_PWR_GET_FLAG(PWR_FLAG_SB) == RESET)
+  {
+    MX_RTC_Init();
+  }
+  else
   {
     /* Clear Standby flag */
     __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB);
+
+    /* Enable access to RTC domain for following wake-up source configuration */
+    HAL_PWR_EnableBkUpAccess();
+    __HAL_RCC_RTCAPB_CLK_ENABLE();    
   }
   
   /* Insert 5 seconds delay */
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wlxx_hal_msp.c b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wlxx_hal_msp.c
index 92de43aa..486c7db6 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wlxx_hal_msp.c
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STANDBY_RTC/Src/stm32wlxx_hal_msp.c
@@ -86,7 +86,6 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc)
   if(hrtc->Instance==RTC)
   {
   /* USER CODE BEGIN RTC_MspInit 0 */
-  RCC_OscInitTypeDef RCC_OscInitStruct = {0};
   /* Intermediate configuration in case of system resume from standby mode:   */
   /* RTC clock source disable before modifying its configuration afterwards.  */
   /* Note: In case of user application requires RTC clock to be uninterrupted,*/
@@ -100,15 +99,8 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* hrtc)
   }
 
   /*## Configure the RTC clock source ######################################*/
-  /* Enable LSI Oscillator */
-  RCC_OscInitStruct.OscillatorType =  RCC_OSCILLATORTYPE_LSI;
-  RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
-  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-  RCC_OscInitStruct.LSIDiv = LL_RCC_LSI_PREDIV_1;
-  if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-  {
-    while(1);
-  }
+  /* Note: LSI has already been configured by function "SystemClock_Config()" */
+
   /* USER CODE END RTC_MspInit 0 */
   /** Initializes the peripherals clocks
   */
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc
index 61ce5489..506a7f3b 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_STOP2_RTC/PWR_STOP2_RTC.ioc
@@ -107,3 +107,5 @@ VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_STOP2_RTC
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SecurityIllegalAccess_DualCore/CM0PLUS/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SecurityIllegalAccess_DualCore/CM0PLUS/Src/main.c
index d4e2a813..3a5aa622 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SecurityIllegalAccess_DualCore/CM0PLUS/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SecurityIllegalAccess_DualCore/CM0PLUS/Src/main.c
@@ -78,7 +78,7 @@ int main(void)
 
   /* USER CODE END Init */
 
-  /* MX_GTZC_S_Init initialisation */
+  /* GTZC initialisation */
   MX_GTZC_S_Init();
 
   /* USER CODE BEGIN SysInit */
@@ -189,7 +189,6 @@ static void MX_GTZC_S_Init(void)
   {
     Error_Handler();
   }
-  MPCWM_NonPrivilegeArea_Desc.AreaId = GTZC_TZSC_MPCWM_AREAID_UNPRIV;
   if (HAL_GTZC_TZSC_MPCWM_ConfigMemAttributes(SRAM2_BASE, &MPCWM_NonPrivilegeArea_Desc) != HAL_OK)
   {
     Error_Handler();
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SecurityIllegalAccess_DualCore/PWR_SecurityIllegalAccess_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SecurityIllegalAccess_DualCore/PWR_SecurityIllegalAccess_DualCore.ioc
index 2d6c3d30..a0774c2e 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SecurityIllegalAccess_DualCore/PWR_SecurityIllegalAccess_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_SecurityIllegalAccess_DualCore/PWR_SecurityIllegalAccess_DualCore.ioc
@@ -1,13 +1,18 @@
 #MicroXplorer Configuration settings - do not modify
-CortexM0Plus.IPs=ADV_TRACE,IPCC,LORAWAN,MISC,RCC,SEQUENCER,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,TIMER,TINY_LPM,DMA,NVIC2\:I,GTZC_S\:I
-CortexM4.IPs=ADV_TRACE\:I,DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,MISC\:I,RCC\:I,SEQUENCER\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,TIMER\:I,TINY_LPM\:I,DMA\:I,NVIC1\:I,GTZC_NS\:I
+CortexM0Plus.IPs=ADV_TRACE,IPCC,LORAWAN,MISC,RCC,SIGFOX,SUBGHZ_PHY,SYS_M0PLUS\:I,TIMER,TINY_LPM,DMA,NVIC2\:I,GTZC_S\:I,SEQUENCER_M0PLUS\:I,SUBGHZ\:I
+CortexM4.IPs=ADV_TRACE\:I,DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,LORAWAN\:I,MISC\:I,RCC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,SYS\:I,TIMER\:I,TINY_LPM\:I,DMA\:I,NVIC1\:I,GTZC_NS\:I,SEQUENCER_M4\:I
 File.Version=6
 GPIO.groupedBy=
-GTZC_S.IPParameters=TZIC_Configure_IT_Choice,MPCWM1_NonPrivilegeArea_Choice,MPCWM2_NonPrivilegeArea_Choice,MPCWM3_NonPrivilegeArea_Choice
+GTZC_S.Full_IT_Default-GTZC_Enable=Disabled
+GTZC_S.Full_IT_Enabled-GTZC_Enable=Enabled
+GTZC_S.IAI_Default-GTZC_Enable=Disabled
+GTZC_S.IAI_Enabled-GTZC_Enable=Enabled
+GTZC_S.IPParameters=TZIC_Configure_IT_Choice,MPCWM1_NonPrivilegeArea_Choice,MPCWM2_NonPrivilegeArea_Choice,MPCWM3_NonPrivilegeArea_Choice,Full_IT_Enabled-GTZC_Enable,Full_IT_Default-GTZC_Enable,IAI_Enabled-GTZC_Enable,IAI_Default-GTZC_Enable,MPCWM_Activation
 GTZC_S.MPCWM1_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM2_NonPrivilegeArea_Choice=from full Not Privileged
 GTZC_S.MPCWM3_NonPrivilegeArea_Choice=from full Not Privileged
-GTZC_S.TZIC_Configure_IT_Choice=by Individual Disabling from full Enabled
+GTZC_S.MPCWM_Activation=MPCWM_ENABLE
+GTZC_S.TZIC_Configure_IT_Choice=by Individual modifying from Default
 KeepUserPlacement=false
 Mcu.Context0=CortexM4
 Mcu.Context1=CortexM0Plus
@@ -35,8 +40,8 @@ Mcu.PinsNb=8
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.ForceEnableDMAVector=false
@@ -76,6 +81,13 @@ PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
 PB9.Signal=GPIO_Output
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -158,3 +170,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_SecurityIllegalAccess_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Standby_DualCore/PWR_Standby_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Standby_DualCore/PWR_Standby_DualCore.ioc
index b75ac7c9..1ef3c07f 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Standby_DualCore/PWR_Standby_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Standby_DualCore/PWR_Standby_DualCore.ioc
@@ -149,3 +149,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_Standby_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Stop2_DualCore/PWR_Stop2_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Stop2_DualCore/PWR_Stop2_DualCore.ioc
index 55dc15bc..63ea252c 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Stop2_DualCore/PWR_Stop2_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Stop2_DualCore/PWR_Stop2_DualCore.ioc
@@ -149,3 +149,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_Stop2_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Stop2_PeripheralNoRetention/PWR_Stop2_PeripheralNoRetention.ioc b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Stop2_PeripheralNoRetention/PWR_Stop2_PeripheralNoRetention.ioc
index 8668ea93..a1269da0 100644
--- a/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Stop2_PeripheralNoRetention/PWR_Stop2_PeripheralNoRetention.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/PWR/PWR_Stop2_PeripheralNoRetention/PWR_Stop2_PeripheralNoRetention.ioc
@@ -113,3 +113,5 @@ VP_RNG_VS_RNG.Signal=RNG_VS_RNG
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_Stop2_PeripheralNoRetention
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc b/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc
index 7d408f06..3c335651 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_ClockConfig/RCC_ClockConfig.ioc
@@ -106,3 +106,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RCC_ClockConfig
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_LSEConfig/RCC_LSEConfig.ioc b/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_LSEConfig/RCC_LSEConfig.ioc
index 9dcf4c02..cd7c30e6 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_LSEConfig/RCC_LSEConfig.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_LSEConfig/RCC_LSEConfig.ioc
@@ -100,3 +100,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RCC_LSEConfig
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_LSIConfig/RCC_LSIConfig.ioc b/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_LSIConfig/RCC_LSIConfig.ioc
index 015e3f2e..ff441437 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_LSIConfig/RCC_LSIConfig.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RCC/RCC_LSIConfig/RCC_LSIConfig.ioc
@@ -100,3 +100,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RCC_LSIConfig
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc b/Projects/NUCLEO-WL55JC/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc
index 0ba0e99a..ff444ff4 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RNG/RNG_MultiRNG/RNG_MultiRNG.ioc
@@ -100,3 +100,5 @@ VP_RNG_VS_RNG.Signal=RNG_VS_RNG
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RNG_MultiRNG
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc
index e0cc51b9..d793a4a4 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RNG/RNG_MultiRNG_IT/RNG_MultiRNG_IT.ioc
@@ -101,3 +101,5 @@ VP_RNG_VS_RNG.Signal=RNG_VS_RNG
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RNG_MultiRNG_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc
index 58fda2d4..8d245cc7 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm/RTC_Alarm.ioc
@@ -137,3 +137,5 @@ VP_RTC_VS_RTC_Calendar.Signal=RTC_VS_RTC_Calendar
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_Alarm
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/CM0PLUS/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/CM0PLUS/Src/main.c
index 6dbc20b6..7a6703cd 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/CM0PLUS/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/CM0PLUS/Src/main.c
@@ -84,6 +84,11 @@ int main(void)
   HAL_Init();
 
   /* USER CODE BEGIN Init */
+
+  /* Configure LED assigned to CPU2 */
+  /* Note: LED3 used in case of error has already been configured by CPU1 */
+  BSP_LED_Init(LED2);
+
   /* Do not initialise RTC again, already done by the CM4 core */
   hrtc.Instance = RTC;
   __HAL_RCC_RTC_ENABLE();
@@ -124,7 +129,9 @@ int main(void)
   {
   }
 
-  BSP_LED_On(LED3);
+  /* Turn on LED2 to indicate RTC Alarm B has triggered */ 
+  BSP_LED_On(LED2);
+
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -202,7 +209,7 @@ void MX_RTC_Init(void)
   */
   sAlarm.AlarmTime.Hours = 0x0;
   sAlarm.AlarmTime.Minutes = 0x10;
-  sAlarm.AlarmTime.Seconds = 0x4;
+  sAlarm.AlarmTime.Seconds = 0x2;
   sAlarm.AlarmTime.SubSeconds = 0x0;
   sAlarm.AlarmTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
   sAlarm.AlarmTime.StoreOperation = RTC_STOREOPERATION_RESET;
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/CM4/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/CM4/Src/main.c
index 8d9260b7..ce005449 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/CM4/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/CM4/Src/main.c
@@ -86,8 +86,11 @@ int main(void)
   HAL_Init();
 
   /* USER CODE BEGIN Init */
-  /* Configure LED */
-  BSP_LED_Init(LED2);
+
+  /* Configure LED assigned to CPU1 */
+  BSP_LED_Init(LED1);
+  BSP_LED_Init(LED3);
+
   /* USER CODE END Init */
 
   /* Configure the system clock */
@@ -112,7 +115,9 @@ int main(void)
 
   alarmFlag = 0;
   while(alarmFlag == 0);
-  BSP_LED_On(LED2);
+  
+  /* Turn on LED1 to indicate RTC Alarm A has triggered */ 
+  BSP_LED_On(LED1);
 
   while (1)
   {
@@ -134,6 +139,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -232,7 +238,7 @@ static void MX_RTC_Init(void)
   */
   sAlarm.AlarmTime.Hours = 0x0;
   sAlarm.AlarmTime.Minutes = 0x10;
-  sAlarm.AlarmTime.Seconds = 0x4;
+  sAlarm.AlarmTime.Seconds = 0x2;
   sAlarm.AlarmTime.SubSeconds = 0x0;
   sAlarm.AlarmTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
   sAlarm.AlarmTime.StoreOperation = RTC_STOREOPERATION_RESET;
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/RTC_Alarm_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/RTC_Alarm_DualCore.ioc
index 88972479..773c0037 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/RTC_Alarm_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/RTC_Alarm_DualCore.ioc
@@ -1,6 +1,6 @@
 #MicroXplorer Configuration settings - do not modify
-CortexM0Plus.IPs=IPCC,RCC,SYS_M0PLUS\:I,DMA,NVIC2\:I,RTC,ADV_TRACE,LORAWAN,MISC,SEQUENCER,SIGFOX,SUBGHZ_PHY,TIMER,TINY_LPM,GTZC_S\:I
-CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,RCC\:I,SYS\:I,DMA\:I,NVIC1\:I,RTC\:I,ADV_TRACE\:I,LORAWAN\:I,MISC\:I,SEQUENCER\:I,SIGFOX\:I,SUBGHZ_PHY\:I,TIMER\:I,TINY_LPM\:I,GTZC_NS\:I
+CortexM0Plus.IPs=IPCC,RCC,SYS_M0PLUS\:I,DMA,NVIC2\:I,RTC,ADV_TRACE,LORAWAN,MISC,SIGFOX,SUBGHZ_PHY,TIMER,TINY_LPM,GTZC_S\:I,SEQUENCER_M0PLUS\:I,SUBGHZ\:I
+CortexM4.IPs=DEBUG\:I,FATFS\:I,FREERTOS\:I,IPCC\:I,RCC\:I,SYS\:I,DMA\:I,NVIC1\:I,RTC\:I,ADV_TRACE\:I,LORAWAN\:I,MISC\:I,SIGFOX\:I,SUBGHZ_PHY\:I,TIMER\:I,TINY_LPM\:I,GTZC_NS\:I,SEQUENCER_M4\:I
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
@@ -30,8 +30,8 @@ Mcu.PinsNb=8
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC1.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC1.ForceEnableDMAVector=true
@@ -59,6 +59,13 @@ PC14-OSC32_IN.Mode=LSE-External-Oscillator
 PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -137,7 +144,7 @@ RTC.IPParameters=Alarm-Alarm A,Hours,Minutes,WeekDay,Month,Date,Year,Hours_A-Ala
 RTC.Minutes=10
 RTC.Minutes_A-Alarm\ A=10
 RTC.Month=RTC_MONTH_JANUARY
-RTC.Seconds_A-Alarm\ A=4
+RTC.Seconds_A-Alarm\ A=2
 RTC.WeekDay=RTC_WEEKDAY_MONDAY
 RTC.Year=20
 SYS.userName=SYS_M4
@@ -153,3 +160,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_Alarm_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/readme.txt b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/readme.txt
index 498b9fa4..e6c972d7 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/readme.txt
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Alarm_DualCore/readme.txt
@@ -19,7 +19,7 @@
   @endverbatim
 
 @par Example Description
-This multicore project shows how CM4 uses the Alarm A and CM0 uses Alarm B.
+This multicore project shows how CPU1 (CM4) uses the Alarm A and CPU2 (CM0) uses Alarm B.
 
 At the beginning of the main program the HAL_Init() function is called to reset
 all the peripherals, initialize the Flash interface and the systick.
@@ -39,13 +39,14 @@ Procedure using IDE:
   3. Perform a system reset (or SW reset of CPU2 program only)
 
 In this example :
- - CM4 Configures the RTC, set the Time to 00:10:00 and programs the Alarm A with interrupt at 00:10:02.
- - CM4 starts the CM0.
- - CM0 programs the Alarm B with interrupt at 00:10:04.
- - LED2 is turned ON when the RTC Alarm A is generated correctly (CM4 after 4s).
- - LED3 is turned ON when the RTC Alarm B is generated correctly (CM0 after 4s).
- - LED2 Toggles in case of error with CM4
- - LED3 Toggles in case of error with CM0
+ - CPU1 configures the RTC, set the Time to 00:10:00 and programs the Alarm A with interrupt at 00:10:02.
+ - CPU1 boot the CPU2.
+ - CPU2 programs the Alarm B with interrupt at 00:10:04.
+
+Three GPIO are used to monitor CPU activity through LED:
+- LED1 for CPU1 activity: turned on when RTC Alarm A interruption is generated correctly (2s after CPU1 boot)
+- LED2 for CPU2 activity: turned on when RTC Alarm B interruption is generated correctly (4s after CPU2 boot)
+- LED3 for CPU1 and CPU2 in case of error: LED toggle
 
 @note Care must be taken when using HAL_Delay(), this function provides accurate delay (in milliseconds)
       based on variable incremented in SysTick ISR. This implies that if HAL_Delay() is called from
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Binary/RTC_Binary.ioc b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Binary/RTC_Binary.ioc
index a7e85551..f00a7447 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Binary/RTC_Binary.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Binary/RTC_Binary.ioc
@@ -21,8 +21,8 @@ Mcu.PinsNb=6
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
@@ -39,6 +39,13 @@ PC14-OSC32_IN.Mode=LSE-External-Oscillator
 PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -118,3 +125,5 @@ VP_RTC_VS_RTC_Calendar.Signal=RTC_VS_RTC_Calendar
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_Binary
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Binary/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Binary/Src/main.c
index 92cceec8..47fc6eec 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Binary/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Binary/Src/main.c
@@ -151,6 +151,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
@@ -233,7 +234,7 @@ static void MX_RTC_Init(void)
   sAlarm.AlarmMask = RTC_ALARMMASK_NONE;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDBINMASK_NONE;
   sAlarm.Alarm = RTC_ALARM_A;
-  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  if (HAL_RTC_SetAlarm_IT(&hrtc, &sAlarm, 0) != HAL_OK)
   {
     Error_Handler();
   }
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Calendar/RTC_Calendar.ioc b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Calendar/RTC_Calendar.ioc
index 8d344b44..6a38b1a0 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Calendar/RTC_Calendar.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Calendar/RTC_Calendar.ioc
@@ -110,3 +110,5 @@ VP_RTC_VS_RTC_Calendar.Signal=RTC_VS_RTC_Calendar
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_Calendar
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_LSI/RTC_LSI.ioc b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_LSI/RTC_LSI.ioc
index 9b01e0d1..0a4091ee 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_LSI/RTC_LSI.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_LSI/RTC_LSI.ioc
@@ -118,3 +118,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM16_VS_ClockSourceINT.Mode=Enable_Timer
 VP_TIM16_VS_ClockSourceINT.Signal=TIM16_VS_ClockSourceINT
 board=custom
+ProjectManager.Example=RTC_LSI
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc
index 39c39422..94935216 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Tamper/RTC_Tamper.ioc
@@ -20,8 +20,8 @@ Mcu.PinsNb=5
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=RTC_ASYNCH_PREDIV,0x7F;RTC_SYNCH_PREDIV,0xFF
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true\:false
 NVIC.ForceEnableDMAVector=true
@@ -41,6 +41,13 @@ PC14-OSC32_IN.Mode=LSE-External-Oscillator
 PC14-OSC32_IN.Signal=RCC_OSC32_IN
 PC15-OSC32_OUT.Mode=LSE-External-Oscillator
 PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -118,3 +125,5 @@ VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_Tamper
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Tamper/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Tamper/Src/main.c
index 38b96218..3eddfaab 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Tamper/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_Tamper/Src/main.c
@@ -178,6 +178,7 @@ void SystemClock_Config(void)
 
   /** Configure LSE Drive Capability
   */
+  HAL_PWR_EnableBkUpAccess();
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
   /** Configure the main internal regulator output voltage
   */
diff --git a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc
index b92d42c1..b2251ee2 100644
--- a/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/RTC/RTC_TimeStamp/RTC_TimeStamp.ioc
@@ -91,3 +91,5 @@ VP_RTC_VS_RTC_Calendar.Signal=RTC_VS_RTC_Calendar
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_TimeStamp
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc
index ddda86ad..ab691241 100644
--- a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComDMA_Master/SPI_FullDuplex_ComDMA_Master.ioc
@@ -165,3 +165,5 @@ SPI1.VirtualType=VM_MASTER
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_FullDuplex_ComDMA_Master
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc
index 23fe8fb7..d7bcd5d8 100644
--- a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComDMA_Slave/SPI_FullDuplex_ComDMA_Slave.ioc
@@ -162,3 +162,5 @@ SPI1.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_FullDuplex_ComDMA_Slave
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComIT_Master/SPI_FullDuplex_ComIT_Master.ioc b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComIT_Master/SPI_FullDuplex_ComIT_Master.ioc
index 07ff4b3a..33fc8159 100644
--- a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComIT_Master/SPI_FullDuplex_ComIT_Master.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComIT_Master/SPI_FullDuplex_ComIT_Master.ioc
@@ -124,3 +124,5 @@ SPI1.VirtualType=VM_MASTER
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_FullDuplex_ComIT_Master
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComIT_Slave/SPI_FullDuplex_ComIT_Slave.ioc b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComIT_Slave/SPI_FullDuplex_ComIT_Slave.ioc
index f0e61ecc..fd39acdb 100644
--- a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComIT_Slave/SPI_FullDuplex_ComIT_Slave.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComIT_Slave/SPI_FullDuplex_ComIT_Slave.ioc
@@ -121,3 +121,5 @@ SPI1.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_FullDuplex_ComIT_Slave
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc
index 19eb6bec..c98d9115 100644
--- a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc
@@ -123,3 +123,5 @@ SPI1.VirtualType=VM_MASTER
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_FullDuplex_ComPolling_Master
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc
index 24ab048a..fe2a18b4 100644
--- a/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc
@@ -120,3 +120,5 @@ SPI1.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_FullDuplex_ComPolling_Slave
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/SUBGHZ/SUBGHZ_Tx_Mode/SUBGHZ_Tx_Mode.ioc b/Projects/NUCLEO-WL55JC/Examples/SUBGHZ/SUBGHZ_Tx_Mode/SUBGHZ_Tx_Mode.ioc
index b7656d8d..731f17ac 100644
--- a/Projects/NUCLEO-WL55JC/Examples/SUBGHZ/SUBGHZ_Tx_Mode/SUBGHZ_Tx_Mode.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/SUBGHZ/SUBGHZ_Tx_Mode/SUBGHZ_Tx_Mode.ioc
@@ -75,3 +75,5 @@ VP_SUBGHZ_VS_SUBGHZ.Signal=SUBGHZ_VS_SUBGHZ
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SUBGHZ_Tx_Mode
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/SUBGHZ/SUBGHZ_Tx_Mode/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/SUBGHZ/SUBGHZ_Tx_Mode/Src/main.c
index 414a3994..78a64d4b 100644
--- a/Projects/NUCLEO-WL55JC/Examples/SUBGHZ/SUBGHZ_Tx_Mode/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/SUBGHZ/SUBGHZ_Tx_Mode/Src/main.c
@@ -144,7 +144,7 @@ int main(void)
   /* Reset RadioResult */
   RadioResult = 0x00;
 
-   /* Retrive Status from SUBGHZ Radio */
+   /* Retrieve Status from SUBGHZ Radio */
   if (HAL_SUBGHZ_ExecGetCmd(&hsubghz, RADIO_GET_STATUS, &RadioResult, 1) != HAL_OK)
   {
     Error_Handler();
@@ -162,7 +162,7 @@ int main(void)
       /* Reset RadioResult */
       RadioResult = 0x00;
 
-      /* Retrive Status from SUBGHZ Radio */
+      /* Retrieve Status from SUBGHZ Radio */
       if (HAL_SUBGHZ_ExecGetCmd(&hsubghz, RADIO_GET_STATUS, &RadioResult, 1) != HAL_OK)
       {
         Error_Handler();
@@ -176,7 +176,7 @@ int main(void)
   }
   else
   {
-    /* Call Error Handler � LED1 blinking */
+    /* Call Error Handler; LED1 blinking */
     Error_Handler();
   }
 
@@ -188,7 +188,7 @@ int main(void)
   }
   else
   {
-    /* Call Error Handler � LED1 blinking */
+    /* Call Error Handler; LED1 blinking */
     Error_Handler();
   }
   /* USER CODE END 2 */
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_DMA/TIM_DMA.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_DMA/TIM_DMA.ioc
index 65d8a992..ec729a01 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_DMA/TIM_DMA.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_DMA/TIM_DMA.ioc
@@ -161,3 +161,5 @@ TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_DMA
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc
index e0067be9..db094743 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_DMABurst/TIM_DMABurst.ioc
@@ -139,3 +139,5 @@ TIM2.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_DMABurst
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_InputCapture/TIM_InputCapture.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_InputCapture/TIM_InputCapture.ioc
index b63c0d4e..36103de4 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_InputCapture/TIM_InputCapture.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_InputCapture/TIM_InputCapture.ioc
@@ -119,3 +119,5 @@ TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_InputCapture
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc
index 6c22f710..c4f0aac6 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCActive/TIM_OCActive.ioc
@@ -173,3 +173,5 @@ TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_OCActive
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc
index c9dd3c7a..44596e12 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCInactive/TIM_OCInactive.ioc
@@ -200,3 +200,5 @@ TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_OCInactive
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc
index 8e0977e3..1bcbe867 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OCToggle/TIM_OCToggle.ioc
@@ -180,3 +180,5 @@ TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_OCToggle
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OnePulse/TIM_OnePulse.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OnePulse/TIM_OnePulse.ioc
index 129c0483..c15bb41b 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OnePulse/TIM_OnePulse.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_OnePulse/TIM_OnePulse.ioc
@@ -156,3 +156,5 @@ VP_TIM1_VS_ControllerModeTrigger.Signal=TIM1_VS_ControllerModeTrigger
 VP_TIM1_VS_OPM.Mode=OPM_bit
 VP_TIM1_VS_OPM.Signal=TIM1_VS_OPM
 board=custom
+ProjectManager.Example=TIM_OnePulse
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc
index 6259f92c..44201b5e 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_PWMInput/TIM_PWMInput.ioc
@@ -130,3 +130,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM1_VS_ControllerModeReset.Mode=Reset Mode
 VP_TIM1_VS_ControllerModeReset.Signal=TIM1_VS_ControllerModeReset
 board=custom
+ProjectManager.Example=TIM_PWMInput
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc
index 28a3d26e..60aeb148 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_PWMOutput/TIM_PWMOutput.ioc
@@ -181,3 +181,5 @@ TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_PWMOutput
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc
index f21c684e..78a673d3 100644
--- a/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/TIM/TIM_TimeBase/TIM_TimeBase.ioc
@@ -110,3 +110,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM2_VS_ClockSourceINT.Mode=Internal
 VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT
 board=custom
+ProjectManager.Example=TIM_TimeBase
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/LPUART_WakeUpFromStop/LPUART_WakeUpFromStop.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/LPUART_WakeUpFromStop/LPUART_WakeUpFromStop.ioc
index c07dbf5a..0fe92f2e 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/LPUART_WakeUpFromStop/LPUART_WakeUpFromStop.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/LPUART_WakeUpFromStop/LPUART_WakeUpFromStop.ioc
@@ -128,3 +128,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=LPUART_WakeUpFromStop
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc
index 54bcd722..f5a77901 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_DMA/UART_HyperTerminal_DMA.ioc
@@ -169,3 +169,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_HyperTerminal_DMA
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_IT/Src/main.c b/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_IT/Src/main.c
index 9875ab4c..32e40523 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_IT/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_IT/Src/main.c
@@ -130,7 +130,7 @@ int main(void)
 
   /*##-3- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
@@ -148,7 +148,7 @@ int main(void)
 
   /*##-5- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc
index 1e0c2bc9..29d1e7f3 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc
@@ -127,3 +127,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_HyperTerminal_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_Printf/UART_Printf.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/UART_Printf/UART_Printf.ioc
index 66a0fafe..4dd09ae9 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_Printf/UART_Printf.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_Printf/UART_Printf.ioc
@@ -126,3 +126,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_Printf
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_ReceptionToIdle_CircularDMA/UART_ReceptionToIdle_CircularDMA.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/UART_ReceptionToIdle_CircularDMA/UART_ReceptionToIdle_CircularDMA.ioc
index 264e0fef..18ef0120 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_ReceptionToIdle_CircularDMA/UART_ReceptionToIdle_CircularDMA.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_ReceptionToIdle_CircularDMA/UART_ReceptionToIdle_CircularDMA.ioc
@@ -131,3 +131,5 @@ USART2.VirtualMode-Asynchronous=VM_ASYNC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_ReceptionToIdle_CircularDMA
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComDMA/UART_TwoBoards_ComDMA.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComDMA/UART_TwoBoards_ComDMA.ioc
index 0d94ce02..eedf1f4c 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComDMA/UART_TwoBoards_ComDMA.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComDMA/UART_TwoBoards_ComDMA.ioc
@@ -169,3 +169,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_TwoBoards_ComDMA
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc
index 104439b4..37231505 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComIT/UART_TwoBoards_ComIT.ioc
@@ -127,3 +127,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_TwoBoards_ComIT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComPolling/UART_TwoBoards_ComPolling.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComPolling/UART_TwoBoards_ComPolling.ioc
index 67351d4b..7f8626e7 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComPolling/UART_TwoBoards_ComPolling.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_TwoBoards_ComPolling/UART_TwoBoards_ComPolling.ioc
@@ -126,3 +126,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_TwoBoards_ComPolling
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/UART/UART_WakeUpFromStopUsingFIFO/UART_WakeUpFromStopUsingFIFO.ioc b/Projects/NUCLEO-WL55JC/Examples/UART/UART_WakeUpFromStopUsingFIFO/UART_WakeUpFromStopUsingFIFO.ioc
index 345b17b8..4fd834d5 100644
--- a/Projects/NUCLEO-WL55JC/Examples/UART/UART_WakeUpFromStopUsingFIFO/UART_WakeUpFromStopUsingFIFO.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/UART/UART_WakeUpFromStopUsingFIFO/UART_WakeUpFromStopUsingFIFO.ioc
@@ -118,3 +118,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_WakeUpFromStopUsingFIFO
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/USART/USART_SlaveMode/USART_SlaveMode.ioc b/Projects/NUCLEO-WL55JC/Examples/USART/USART_SlaveMode/USART_SlaveMode.ioc
index 240f989d..80f0fb3c 100644
--- a/Projects/NUCLEO-WL55JC/Examples/USART/USART_SlaveMode/USART_SlaveMode.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/USART/USART_SlaveMode/USART_SlaveMode.ioc
@@ -167,3 +167,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_USART1_VNSS.Mode=Software NSS Management
 VP_USART1_VNSS.Signal=USART1_VNSS
 board=custom
+ProjectManager.Example=USART_SlaveMode
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples/WWDG/WWDG_Example/WWDG_Example.ioc b/Projects/NUCLEO-WL55JC/Examples/WWDG/WWDG_Example/WWDG_Example.ioc
index a998e5b1..54513702 100644
--- a/Projects/NUCLEO-WL55JC/Examples/WWDG/WWDG_Example/WWDG_Example.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples/WWDG/WWDG_Example/WWDG_Example.ioc
@@ -104,3 +104,5 @@ WWDG.IPParametersWithoutCheck=Window,Counter
 WWDG.Prescaler=WWDG_PRESCALER_8
 WWDG.Window=WWDG_WINDOW
 board=custom
+ProjectManager.Example=WWDG_Example
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_AnalogWatchdog_Init/ADC_AnalogWatchdog_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_AnalogWatchdog_Init/ADC_AnalogWatchdog_Init.ioc
index 8220fe71..ff62a886 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_AnalogWatchdog_Init/ADC_AnalogWatchdog_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_AnalogWatchdog_Init/ADC_AnalogWatchdog_Init.ioc
@@ -150,3 +150,5 @@ VP_ADC_Vref_Input.Signal=ADC_Vref_Input
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_AnalogWatchdog_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/ADC_ContinuousConversion_TriggerSW_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/ADC_ContinuousConversion_TriggerSW_Init.ioc
index e217e434..14c6db22 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/ADC_ContinuousConversion_TriggerSW_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_Init/ADC_ContinuousConversion_TriggerSW_Init.ioc
@@ -125,3 +125,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_ContinuousConversion_TriggerSW_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/ADC_ContinuousConversion_TriggerSW_LowPower_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/ADC_ContinuousConversion_TriggerSW_LowPower_Init.ioc
index 9d705033..1ad0ebcc 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/ADC_ContinuousConversion_TriggerSW_LowPower_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_ContinuousConversion_TriggerSW_LowPower_Init/ADC_ContinuousConversion_TriggerSW_LowPower_Init.ioc
@@ -130,3 +130,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_ContinuousConversion_TriggerSW_LowPower_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_Oversampling_Init/ADC_Oversampling_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_Oversampling_Init/ADC_Oversampling_Init.ioc
index 8f14dd03..68c2c957 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_Oversampling_Init/ADC_Oversampling_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_Oversampling_Init/ADC_Oversampling_Init.ioc
@@ -130,3 +130,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_Oversampling_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/ADC_SingleConversion_TriggerSW_DMA_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/ADC_SingleConversion_TriggerSW_DMA_Init.ioc
index 045544f1..81aec005 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/ADC_SingleConversion_TriggerSW_DMA_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/ADC_SingleConversion_TriggerSW_DMA_Init.ioc
@@ -147,3 +147,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_SingleConversion_TriggerSW_DMA_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/stm32wlxx_it.c
index d946e520..9ee90305 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_DMA_Init/Src/stm32wlxx_it.c
@@ -255,7 +255,7 @@ void DMA1_Channel1_IRQHandler(void)
   /*       DMA global interrupt flag:                                      */
   /* Clear flag DMA global interrupt */
   /* (global interrupt flag: half transfer and transfer complete flags) */
-  // LL_DMA_ClearFlag_GI1(DMA1);
+  // LL_DMA_ClearFlag_TC1(DMA1);
   
   /* Check whether DMA transfer error caused the DMA interruption */
   if(LL_DMA_IsActiveFlag_TE1(DMA1) == 1)
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc
index 056923a6..41465d2e 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_IT_Init/ADC_SingleConversion_TriggerSW_IT_Init.ioc
@@ -125,3 +125,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_SingleConversion_TriggerSW_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/ADC_SingleConversion_TriggerSW_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/ADC_SingleConversion_TriggerSW_Init.ioc
index 03760927..c89acea3 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/ADC_SingleConversion_TriggerSW_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerSW_Init/ADC_SingleConversion_TriggerSW_Init.ioc
@@ -125,3 +125,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_SingleConversion_TriggerSW_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc
index 00b0f1b2..eeb471dd 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_SingleConversion_TriggerTimer_DMA_Init/ADC_SingleConversion_TriggerTimer_DMA_Init.ioc
@@ -157,3 +157,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM2_VS_ClockSourceITR.Mode=TriggerSource_ITR0
 VP_TIM2_VS_ClockSourceITR.Signal=TIM2_VS_ClockSourceITR
 board=custom
+ProjectManager.Example=ADC_SingleConversion_TriggerTimer_DMA_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_TemperatureSensor_Init/ADC_TemperatureSensor_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_TemperatureSensor_Init/ADC_TemperatureSensor_Init.ioc
index aa607c3e..1e36b3ef 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_TemperatureSensor_Init/ADC_TemperatureSensor_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/ADC/ADC_TemperatureSensor_Init/ADC_TemperatureSensor_Init.ioc
@@ -113,3 +113,5 @@ VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_TemperatureSensor_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/COMP_CompareGpioVsVrefInt_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/COMP_CompareGpioVsVrefInt_IT_Init.ioc
index a114951f..5957d4f6 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/COMP_CompareGpioVsVrefInt_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/COMP_CompareGpioVsVrefInt_IT_Init.ioc
@@ -113,3 +113,5 @@ VP_COMP1_VS_VREFINT.Signal=COMP1_VS_VREFINT
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=COMP_CompareGpioVsVrefInt_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/.cproject
index a8caacc1..8ad17fb6 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_IT_Init/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1657942162" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.2005470235" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1378185911" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1378185911" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.520411698" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.441095156" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1750399926" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1429073205" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1429073205" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.525777246" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1722280556" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc
index ea1d99a8..f8537065 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/COMP_CompareGpioVsVrefInt_OutputGpio_Init.ioc
@@ -112,3 +112,5 @@ VP_COMP1_VS_VREFINT.Signal=COMP1_VS_VREFINT
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=COMP_CompareGpioVsVrefInt_OutputGpio_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/.cproject
index 07afaf50..3a121451 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_OutputGpio_Init/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.931709964" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.35757321" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.450219098" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.450219098" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.618837024" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1351759668" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1296544717" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.43971441" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.43971441" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.661531757" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1190456886" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc
index 7f6602cc..81c20cb6 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/COMP_CompareGpioVsVrefInt_Window_IT_Init.ioc
@@ -125,3 +125,5 @@ VP_COMP2_VS_WindowMode.Signal=COMP2_VS_WindowMode
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=COMP_CompareGpioVsVrefInt_Window_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/.cproject
index e750278c..04c2375b 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/COMP/COMP_CompareGpioVsVrefInt_Window_IT_Init/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1130823710" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1575695602" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.878863782" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.878863782" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.506275747" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1857456289" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.642183719" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.418659106" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.418659106" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.203890603" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.880435449" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc
index 0036fe55..6c7c5fef 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/CORTEX/CORTEX_MPU/CORTEX_MPU.ioc
@@ -110,3 +110,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CORTEX_MPU
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/CORTEX/CORTEX_MPU/Src/main.c b/Projects/NUCLEO-WL55JC/Examples_LL/CORTEX/CORTEX_MPU/Src/main.c
index 151d8487..dc317b6a 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/CORTEX/CORTEX_MPU/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/CORTEX/CORTEX_MPU/Src/main.c
@@ -245,19 +245,19 @@ void Configure_MPU(void)
   /* Disable MPU */
   LL_MPU_Disable();
 
-  /* Configure RAM region as Region N°0, 64KB of size and R/W region */
+  /* Configure RAM region as Region Number 0, 64KB of size and R/W region */
   LL_MPU_ConfigRegion(EXAMPLE_RAM_REGION_NUMBER, 0x00, EXAMPLE_RAM_ADDRESS_START, 
          EXAMPLE_RAM_SIZE | portMPU_REGION_READ_WRITE | LL_MPU_ACCESS_NOT_BUFFERABLE |
          LL_MPU_ACCESS_NOT_CACHEABLE | LL_MPU_ACCESS_NOT_SHAREABLE | LL_MPU_TEX_LEVEL0 |
          LL_MPU_INSTRUCTION_ACCESS_ENABLE);
 
-  /* Configure FLASH region as REGION N°1, 256KB of size and R/W region */
+  /* Configure FLASH region as REGION Number 1, 256KB of size and R/W region */
   LL_MPU_ConfigRegion(EXAMPLE_FLASH_REGION_NUMBER, 0x00, EXAMPLE_FLASH_ADDRESS_START, 
          EXAMPLE_FLASH_SIZE | portMPU_REGION_READ_WRITE | LL_MPU_ACCESS_NOT_BUFFERABLE |
          LL_MPU_ACCESS_NOT_CACHEABLE | LL_MPU_ACCESS_NOT_SHAREABLE | LL_MPU_TEX_LEVEL0 |
          LL_MPU_INSTRUCTION_ACCESS_ENABLE);
 
-  /* Configure Peripheral region as REGION N°2, 512MB of size, R/W and Execute
+  /* Configure Peripheral region as REGION Number 2, 512MB of size, R/W and Execute
   Never region */
   LL_MPU_ConfigRegion(EXAMPLE_PERIPH_REGION_NUMBER, 0x00, EXAMPLE_PERIPH_ADDRESS_START, 
          EXAMPLE_PERIPH_SIZE | portMPU_REGION_READ_WRITE | LL_MPU_ACCESS_NOT_BUFFERABLE |
@@ -275,7 +275,7 @@ void Configure_MPU(void)
   */
 void MPU_AccessPermConfig(void)
 {
-  /* Configure region for PrivilegedReadOnlyArray as REGION N°3, 32byte and R
+  /* Configure region for PrivilegedReadOnlyArray as REGION Number 3, 32byte and R
      only in privileged mode */
   /* Disable MPU */
   LL_MPU_Disable();
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc
index 42192fea..79c32c98 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_CalculateAndCheck/CRC_CalculateAndCheck.ioc
@@ -109,3 +109,5 @@ VP_CRC_VS_CRC.Signal=CRC_VS_CRC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRC_CalculateAndCheck
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/.cproject
index a39553f5..46ce71f2 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_CalculateAndCheck/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.634234013" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.537791276" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1421072258" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1421072258" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.706671221" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1275521691" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1000322150" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.206925133" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.206925133" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1016444458" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.2114020791" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc
index 27aa16fd..b095b792 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_UserDefinedPolynomial/CRC_UserDefinedPolynomial.ioc
@@ -109,3 +109,5 @@ VP_CRC_VS_CRC.Signal=CRC_VS_CRC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRC_UserDefinedPolynomial
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/.cproject
index 6572dacc..5d0d7f26 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/CRC/CRC_UserDefinedPolynomial/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1221979271" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.174696813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.824244692" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.824244692" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1868325125" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.327995820" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.622352840" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1135963656" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1135963656" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.731559336" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.208417636" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateConstantSignal_TriggerSW_Init/DAC_GenerateConstantSignal_TriggerSW_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateConstantSignal_TriggerSW_Init/DAC_GenerateConstantSignal_TriggerSW_Init.ioc
index 33e0da7d..30ce7155 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateConstantSignal_TriggerSW_Init/DAC_GenerateConstantSignal_TriggerSW_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateConstantSignal_TriggerSW_Init/DAC_GenerateConstantSignal_TriggerSW_Init.ioc
@@ -117,3 +117,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DAC_GenerateConstantSignal_TriggerSW_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateConstantSignal_TriggerSW_LP_Init/DAC_GenerateConstantSignal_TriggerSW_LP_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateConstantSignal_TriggerSW_LP_Init/DAC_GenerateConstantSignal_TriggerSW_LP_Init.ioc
index 1f0f49a3..52095e7f 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateConstantSignal_TriggerSW_LP_Init/DAC_GenerateConstantSignal_TriggerSW_LP_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateConstantSignal_TriggerSW_LP_Init/DAC_GenerateConstantSignal_TriggerSW_LP_Init.ioc
@@ -122,3 +122,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DAC_GenerateConstantSignal_TriggerSW_LP_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateWaveform_TriggerHW_Init/DAC_GenerateWaveform_TriggerHW_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateWaveform_TriggerHW_Init/DAC_GenerateWaveform_TriggerHW_Init.ioc
index 048564fd..de71be7c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateWaveform_TriggerHW_Init/DAC_GenerateWaveform_TriggerHW_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/DAC/DAC_GenerateWaveform_TriggerHW_Init/DAC_GenerateWaveform_TriggerHW_Init.ioc
@@ -150,3 +150,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM1_VS_ClockSourceINT.Mode=Internal
 VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
 board=custom
+ProjectManager.Example=DAC_GenerateWaveform_TriggerHW_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc
index ccda7c69..44e3eacd 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/DMA_CopyFromFlashToMemory_Init.ioc
@@ -121,3 +121,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DMA_CopyFromFlashToMemory_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/.cproject
index 2f021967..511d2525 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/STM32CubeIDE/.cproject
@@ -117,7 +117,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1014965420" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1846047488" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.319524028" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.319524028" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.543219323" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
@@ -144,7 +144,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.865029673" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.654922201" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1942287453" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1942287453" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.507082742" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1935721705" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wlxx_it.c
index 21bd4354..9b293425 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/DMA/DMA_CopyFromFlashToMemory_Init/Src/stm32wlxx_it.c
@@ -209,7 +209,7 @@ void DMA1_Channel1_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel1_IRQn 0 */
   if(LL_DMA_IsActiveFlag_TC1(DMA1) == 1)
   {
-    LL_DMA_ClearFlag_GI1(DMA1);
+    LL_DMA_ClearFlag_TC1(DMA1);
     TransferComplete();
   }
   else if(LL_DMA_IsActiveFlag_TE1(DMA1) == 1)
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc
index c7b0b99f..b471eef7 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/EXTI/EXTI_ToggleLedOnIT_Init/EXTI_ToggleLedOnIT_Init.ioc
@@ -108,3 +108,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=EXTI_ToggleLedOnIT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc
index 1e3178ee..0cb779e8 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/GPIO_InfiniteLedToggling_Init.ioc
@@ -99,3 +99,5 @@ RCC.VCOOutputFreq_Value=32000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=GPIO_InfiniteLedToggling_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/.cproject
index 5cd8f805..bbd0f3c1 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/GPIO/GPIO_InfiniteLedToggling_Init/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1823603854" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.363494749" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1521726898" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1521726898" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.564735659" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1306834406" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2047338835" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.71695813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.71695813" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1204740051" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1630899156" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc
index 5f7453b2..04f764c2 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess/HSEM_DualProcess.ioc
@@ -100,3 +100,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=HSEM_DualProcess
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/.cproject
index 01949e40..0fd3bdfa 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess/STM32CubeIDE/.cproject
@@ -117,7 +117,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1826598661" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.283956699" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1375850644" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1375850644" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.117930988" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
@@ -144,7 +144,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.317919657" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.734142489" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.222943465" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.222943465" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1400072452" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1287108774" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc
index c39aa501..92a38dea 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess_IT/HSEM_DualProcess_IT.ioc
@@ -99,3 +99,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=HSEM_DualProcess_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/.cproject
index 2c66243c..198bc07c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/HSEM/HSEM_DualProcess_IT/STM32CubeIDE/.cproject
@@ -117,7 +117,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1300006731" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1182270987" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.20690618" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.20690618" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.223737636" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
@@ -144,7 +144,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1427156844" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.591589020" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1792950919" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1792950919" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1133560166" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1420809989" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc
index acfe4ae9..3dfb6087 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/I2C_OneBoard_AdvCommunication_DMAAndIT_Init.ioc
@@ -88,8 +88,8 @@ Mcu.PinsNb=6
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.DMA1_Channel3_IRQn=true\:0\:0\:false\:false\:true\:false\:true
@@ -123,6 +123,13 @@ PC1.GPIOParameters=GPIO_Speed
 PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PC1.Mode=I2C
 PC1.Signal=I2C3_SDA
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -189,3 +196,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_OneBoard_AdvCommunication_DMAAndIT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/main.h
index 9a50614b..07f28100 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Inc/main.h
@@ -29,7 +29,6 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_ll_dma.h"
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/.cproject
index 4a0c889c..9d946e1b 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/STM32CubeIDE/.cproject
@@ -17,13 +17,13 @@
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.652370282" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.652370282." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1091572401" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.403894607" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.961916727" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.870224938" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32WL55JCIx" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1166415131" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.999717207" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1154629652" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1517721150" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include ||  ||  || HSE_VALUE=8000000 | STM32WL55xx | LSI_VALUE=32000 | CORE_CM4 | HSE_STARTUP_TIMEOUT=100 | HSI_VALUE=16000000 | LSE_STARTUP_TIMEOUT=5000 | LSE_VALUE=32768 | DATA_CACHE_ENABLE=1 | VDD_VALUE=3300 | INSTRUCTION_CACHE_ENABLE=1 | EXTERNAL_CLOCK_VALUE=48000 | USE_FULL_LL_DRIVER | PREFETCH_ENABLE=0 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.403894607" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.961916727" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.870224938" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1166415131" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.999717207" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1154629652" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1517721150" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include ||  ||  || HSE_VALUE=8000000 | STM32WL55xx | LSI_VALUE=32000 | CORE_CM4 | HSE_STARTUP_TIMEOUT=100 | HSI_VALUE=16000000 | LSE_STARTUP_TIMEOUT=5000 | LSE_VALUE=32768 | DATA_CACHE_ENABLE=1 | VDD_VALUE=3300 | INSTRUCTION_CACHE_ENABLE=1 | EXTERNAL_CLOCK_VALUE=48000 | USE_FULL_LL_DRIVER | PREFETCH_ENABLE=0 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1497565270" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/I2C_OneBoard_AdvCommunication_DMAAndIT_Init}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1221867788" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1413083274" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -64,7 +64,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1370576481" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1931368907" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1465793818" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1465793818" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="-specs=rdimon.specs -lc -lrdimon"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1085069834" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
@@ -89,6 +89,94 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.652370282.1896773843">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.652370282.1896773843" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.652370282.1896773843" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.652370282.1896773843." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.300572409" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.930108912" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.877191690" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1368744688" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="true" value="STM32WL55JCIx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1074964211" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.75403878" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1110640555" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.272396922" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.3 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32WL55JCIx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../../Inc | ../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc | ../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include | ../../../../../../../Drivers/CMSIS/Include ||  ||  || HSE_VALUE=8000000 | STM32WL55xx | LSI_VALUE=32000 | CORE_CM4 | HSE_STARTUP_TIMEOUT=100 | HSI_VALUE=16000000 | LSE_STARTUP_TIMEOUT=5000 | LSE_VALUE=32768 | DATA_CACHE_ENABLE=1 | VDD_VALUE=3300 | INSTRUCTION_CACHE_ENABLE=1 | EXTERNAL_CLOCK_VALUE=48000 | USE_FULL_LL_DRIVER | PREFETCH_ENABLE=0 ||  ||  ||  ||  || ${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1245773140" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/I2C_OneBoard_AdvCommunication_DMAAndIT_Init}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.92661987" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1147260251" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.810365435" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1127872854" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1502929193" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1651228530" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.582863720" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.776658753" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
+									<listOptionValue builtIn="false" value="STM32WL55xx"/>
+									<listOptionValue builtIn="false" value="LSI_VALUE=32000"/>
+									<listOptionValue builtIn="false" value="CORE_CM4"/>
+									<listOptionValue builtIn="false" value="HSE_STARTUP_TIMEOUT=100"/>
+									<listOptionValue builtIn="false" value="HSI_VALUE=16000000"/>
+									<listOptionValue builtIn="false" value="LSE_STARTUP_TIMEOUT=5000"/>
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="LSE_VALUE=32768"/>
+									<listOptionValue builtIn="false" value="DATA_CACHE_ENABLE=1"/>
+									<listOptionValue builtIn="false" value="VDD_VALUE=3300"/>
+									<listOptionValue builtIn="false" value="INSTRUCTION_CACHE_ENABLE=1"/>
+									<listOptionValue builtIn="false" value="EXTERNAL_CLOCK_VALUE=48000"/>
+									<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
+									<listOptionValue builtIn="false" value="PREFETCH_ENABLE=0"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1608779085" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../../Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include"/>
+									<listOptionValue builtIn="false" value="../../../../../../../Drivers/CMSIS/Include"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.462243294" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.503607327" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1581100710" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1029394622" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1292176627" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1159986381" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1632885577" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-specs=rdimon.specs -lc -lrdimon"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.254864345" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1070944523" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.633679789" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.538572422" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.427375009" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.988473959" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.716217912" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.704566291" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1963575115" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1497198865" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.2126578949" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="I2C_OneBoard_AdvCommunication_DMAAndIT_Init.null.320332542" name="I2C_OneBoard_AdvCommunication_DMAAndIT_Init"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/stm32wlxx_it.c
index b0b1de6c..e971ff0a 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_AdvCommunication_DMAAndIT_Init/Src/stm32wlxx_it.c
@@ -208,7 +208,7 @@ void DMA1_Channel2_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel2_IRQn 0 */
   if (LL_DMA_IsActiveFlag_TC2(DMA1))
   {
-    LL_DMA_ClearFlag_GI2(DMA1);
+    LL_DMA_ClearFlag_TC2(DMA1);
     Transfer_Complete_Callback();
   }
   else if (LL_DMA_IsActiveFlag_TE2(DMA1))
@@ -230,7 +230,7 @@ void DMA1_Channel3_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel3_IRQn 0 */
   if (LL_DMA_IsActiveFlag_TC3(DMA1))
   {
-    LL_DMA_ClearFlag_GI3(DMA1);
+    LL_DMA_ClearFlag_TC3(DMA1);
     Transfer_Complete_Callback();
   }
   else if (LL_DMA_IsActiveFlag_TE3(DMA1))
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/I2C_OneBoard_Communication_DMAAndIT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/I2C_OneBoard_Communication_DMAAndIT_Init.ioc
index 4a1411c5..2454a6e9 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/I2C_OneBoard_Communication_DMAAndIT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/I2C_OneBoard_Communication_DMAAndIT_Init.ioc
@@ -69,8 +69,8 @@ Mcu.PinsNb=6
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
@@ -103,6 +103,13 @@ PC1.GPIOParameters=GPIO_Speed
 PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PC1.Mode=I2C
 PC1.Signal=I2C3_SDA
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -169,3 +176,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_OneBoard_Communication_DMAAndIT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/main.h
index 9dc41a4d..31feb79e 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Inc/main.h
@@ -29,7 +29,6 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_ll_dma.h"
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/stm32wlxx_it.c
index 6da3a1d2..d8bcb21b 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_DMAAndIT_Init/Src/stm32wlxx_it.c
@@ -209,7 +209,7 @@ void DMA1_Channel2_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel2_IRQn 0 */
   if (LL_DMA_IsActiveFlag_TC2(DMA1))
   {
-    LL_DMA_ClearFlag_GI2(DMA1);
+    LL_DMA_ClearFlag_TC2(DMA1);
     Transfer_Complete_Callback();
   }
   else if (LL_DMA_IsActiveFlag_TE2(DMA1))
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/I2C_OneBoard_Communication_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/I2C_OneBoard_Communication_IT_Init.ioc
index 03369c4d..8225f205 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/I2C_OneBoard_Communication_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/I2C_OneBoard_Communication_IT_Init.ioc
@@ -49,8 +49,8 @@ Mcu.PinsNb=7
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true
@@ -89,6 +89,13 @@ PC1.GPIOParameters=GPIO_Speed
 PC1.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PC1.Mode=I2C
 PC1.Signal=I2C3_SDA
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -157,3 +164,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_OneBoard_Communication_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/main.h
index 2d56ec71..36296d32 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_IT_Init/Inc/main.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/I2C_OneBoard_Communication_PollingAndIT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/I2C_OneBoard_Communication_PollingAndIT_Init.ioc
index 83cfc7e7..03b7ecc8 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/I2C_OneBoard_Communication_PollingAndIT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/I2C_OneBoard_Communication_PollingAndIT_Init.ioc
@@ -44,8 +44,8 @@ Mcu.PinsNb=7
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true
@@ -87,6 +87,13 @@ PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
 PB9.Signal=GPIO_Output
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -155,3 +162,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_OneBoard_Communication_PollingAndIT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/main.h
index 8a353fe2..f992926b 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_OneBoard_Communication_PollingAndIT_Init/Inc/main.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc
index c096419e..ee3a9feb 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init.ioc
@@ -33,8 +33,8 @@ Mcu.PinsNb=5
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true
@@ -65,6 +65,13 @@ PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
 PB9.Signal=GPIO_Output
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -133,3 +140,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_MasterRx_SlaveTx_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h
index 175178e1..6bd3e699 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterRx_SlaveTx_IT_Init/Inc/main.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc
index 9702cc43..54efbc3c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init.ioc
@@ -72,8 +72,8 @@ Mcu.PinsNb=4
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true
 NVIC.DMA1_Channel2_IRQn=true\:0\:0\:false\:false\:true\:false\:true
@@ -99,6 +99,13 @@ PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
 PB9.Signal=GPIO_Output
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -165,3 +172,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h
index 83930b4b..cdae2a28 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Inc/main.h
@@ -29,7 +29,6 @@ extern "C" {
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32wlxx_ll_dma.h"
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wlxx_it.c
index 23c37f64..409f740c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_DMA_Init/Src/stm32wlxx_it.c
@@ -210,7 +210,7 @@ void DMA1_Channel1_IRQHandler(void)
 #ifdef SLAVE_BOARD
   if (LL_DMA_IsActiveFlag_TC1(DMA1))
   {
-    LL_DMA_ClearFlag_GI1(DMA1);
+    LL_DMA_ClearFlag_TC1(DMA1);
     DMA1_Transfer_Complete_Callback();
   }
   else if (LL_DMA_IsActiveFlag_TE1(DMA1))
@@ -235,7 +235,7 @@ void DMA1_Channel2_IRQHandler(void)
 #else
   if (LL_DMA_IsActiveFlag_TC2(DMA1))
   {
-    LL_DMA_ClearFlag_GI2(DMA1);
+    LL_DMA_ClearFlag_TC2(DMA1);
     DMA1_Transfer_Complete_Callback();
   }
   else if (LL_DMA_IsActiveFlag_TE2(DMA1))
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc
index 80c6df59..4b5bd524 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/I2C_TwoBoards_MasterTx_SlaveRx_Init.ioc
@@ -33,8 +33,8 @@ Mcu.PinsNb=5
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true
@@ -61,6 +61,13 @@ PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
 PB9.Signal=GPIO_Output
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -129,3 +136,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_MasterTx_SlaveRx_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h
index 10c37bd7..c15db9d5 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_MasterTx_SlaveRx_Init/Inc/main.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc
index 242a199a..03574625 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/I2C_TwoBoards_WakeUpFromStop2_IT_Init.ioc
@@ -34,8 +34,8 @@ Mcu.PinsNb=5
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true
@@ -69,6 +69,13 @@ PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
 PB9.Signal=GPIO_Output
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -140,3 +147,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_WakeUpFromStop2_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/main.h
index 92b6e933..e321845a 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop2_IT_Init/Inc/main.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc
index f1949244..f9cb5fa9 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/I2C_TwoBoards_WakeUpFromStop_IT_Init.ioc
@@ -34,8 +34,8 @@ Mcu.PinsNb=5
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true
@@ -66,6 +66,13 @@ PB9.GPIOParameters=GPIO_Label
 PB9.GPIO_Label=LED2
 PB9.Locked=true
 PB9.Signal=GPIO_Output
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -139,3 +146,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_TwoBoards_WakeUpFromStop_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/main.h b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/main.h
index 59d45e3f..1466c086 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/main.h
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/I2C/I2C_TwoBoards_WakeUpFromStop_IT_Init/Inc/main.h
@@ -28,7 +28,6 @@ extern "C" {
 #endif
 
 /* Includes ------------------------------------------------------------------*/
-#include "stm32wlxx.h"
 #include "stm32wlxx_ll_i2c.h"
 #include "stm32wlxx_ll_rcc.h"
 #include "stm32wlxx_ll_bus.h"
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/IPCC/IPCC_SimplexMode_DualCore/IPCC_SimplexMode_DualCore.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/IPCC/IPCC_SimplexMode_DualCore/IPCC_SimplexMode_DualCore.ioc
index 97d3fdca..b15a3f3f 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/IPCC/IPCC_SimplexMode_DualCore/IPCC_SimplexMode_DualCore.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/IPCC/IPCC_SimplexMode_DualCore/IPCC_SimplexMode_DualCore.ioc
@@ -135,3 +135,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=NUCLEO-WL55JC1
+ProjectManager.Example=IPCC_SimplexMode_DualCore
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc
index 0aa81e13..49572232 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/IWDG/IWDG_RefreshUntilUserEvent_Init/IWDG_RefreshUntilUserEvent_Init.ioc
@@ -118,3 +118,5 @@ VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
 boardIOC=true
+ProjectManager.Example=IWDG_RefreshUntilUserEvent_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/LICENSE.md b/Projects/NUCLEO-WL55JC/Examples_LL/LICENSE.md
new file mode 100644
index 00000000..f6031ef2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright 2020(-2021) STMicroelectronics.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc
index 2735806e..b51bb07b 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/LPTIM_PulseCounter_Init.ioc
@@ -23,8 +23,8 @@ Mcu.PinsNb=3
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
@@ -46,6 +46,13 @@ PC0.GPIO_PuPd=GPIO_PULLDOWN
 PC0.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PC0.Mode=Counts_external_clock_with_synchro_01_occur1
 PC0.Signal=LPTIM1_IN1
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
@@ -113,3 +120,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=LPTIM_PulseCounter_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/.cproject
index d499dc4f..5bf42def 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1472257942" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.868950334" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1030539231" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1030539231" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.540011139" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.316296860" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1593376037" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1354936517" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1354936517" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1726306762" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.833765127" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c b/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c
index aaa751fb..bb65cc9c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/LPTIM/LPTIM_PulseCounter_Init/Src/main.c
@@ -209,6 +209,7 @@ static void MX_LPTIM1_Init(void)
   LL_LPTIM_SetPolarity(LPTIM1, LL_LPTIM_OUTPUT_POLARITY_REGULAR);
   LL_LPTIM_SetUpdateMode(LPTIM1, LL_LPTIM_UPDATE_MODE_IMMEDIATE);
   LL_LPTIM_SetCounterMode(LPTIM1, LL_LPTIM_COUNTER_MODE_EXTERNAL);
+  LL_LPTIM_ConfigClock(LPTIM1, LL_LPTIM_CLK_FILTER_NONE, LL_LPTIM_CLK_POLARITY_RISING);
   LL_LPTIM_TrigSw(LPTIM1);
   LL_LPTIM_SetInput1Src(LPTIM1, LL_LPTIM_INPUT1_SRC_GPIO);
   LL_LPTIM_SetInput2Src(LPTIM1, LL_LPTIM_INPUT2_SRC_GPIO);
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/LPUART_WakeUpFromStop2_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/LPUART_WakeUpFromStop2_Init.ioc
index a1da3bb3..082a5a48 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/LPUART_WakeUpFromStop2_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/LPUART_WakeUpFromStop2_Init.ioc
@@ -136,3 +136,5 @@ RCC.VCOOutputFreq_Value=32000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=LPUART_WakeUpFromStop2_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/.cproject
index 2c8e27a3..c1d8662c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop2_Init/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.494362017" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.267193272" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1334185192" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1334185192" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1371838179" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1730167888" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.391466193" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1368104507" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1368104507" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1767216540" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1676271326" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc
index 5d94f620..cc0472aa 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/LPUART_WakeUpFromStop_Init.ioc
@@ -136,3 +136,5 @@ RCC.VCOOutputFreq_Value=32000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=LPUART_WakeUpFromStop_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/.cproject
index 980589da..f95527f1 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/LPUART/LPUART_WakeUpFromStop_Init/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1849240456" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.273564203" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.39879780" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.39879780" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.498561965" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1672003827" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.134440317" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1728921753" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1728921753" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.827627891" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1010035599" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc
index 9489d7a8..aa83b466 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ECDSA_Sign/PKA_ECDSA_Sign.ioc
@@ -103,3 +103,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PKA_ECDSA_Sign
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc
index 3e361fb6..03370261 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ModularExponentiation/PKA_ModularExponentiation.ioc
@@ -103,3 +103,5 @@ VP_PKA_VS_PKA.Signal=PKA_VS_PKA
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=NUCLEO-WB55RG
+ProjectManager.Example=PKA_ModularExponentiation
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/.cproject
index 3c2e4bf6..ba9a7a2e 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/PKA/PKA_ModularExponentiation/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1604553275" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1514259167" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1011870988" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1011870988" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.754189444" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.260590574" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1919686591" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1288793556" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1288793556" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.952136682" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1152939015" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc
index 86434d8b..5922d421 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_EnterStandbyMode/PWR_EnterStandbyMode.ioc
@@ -99,3 +99,5 @@ RCC.VCOOutputFreq_Value=32000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_EnterStandbyMode
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc
index b5467f84..c49f2f8f 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_EnterStopMode/PWR_EnterStopMode.ioc
@@ -99,3 +99,5 @@ RCC.VCOOutputFreq_Value=32000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_EnterStopMode
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc
index aa3e1b8d..afff06cb 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_OptimizedRunMode/PWR_OptimizedRunMode.ioc
@@ -119,3 +119,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_OptimizedRunMode
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/.cproject
index e638b8df..c4f03fe3 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/PWR/PWR_OptimizedRunMode/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1565878498" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.454215712" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1754339276" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1754339276" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.630536030" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1707303284" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1184445776" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1223351450" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1223351450" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1477430448" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.916846748" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_HWAutoMSICalibration/RCC_HWAutoMSICalibration.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_HWAutoMSICalibration/RCC_HWAutoMSICalibration.ioc
index ea466fac..0d73042f 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_HWAutoMSICalibration/RCC_HWAutoMSICalibration.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_HWAutoMSICalibration/RCC_HWAutoMSICalibration.ioc
@@ -117,3 +117,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RCC_HWAutoMSICalibration
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/RCC_OutputSystemClockOnMCO.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/RCC_OutputSystemClockOnMCO.ioc
index 020c7420..579b8195 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/RCC_OutputSystemClockOnMCO.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/RCC_OutputSystemClockOnMCO.ioc
@@ -117,3 +117,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RCC_OutputSystemClockOnMCO
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/.cproject
index 4849527a..8167a126 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_OutputSystemClockOnMCO/STM32CubeIDE/.cproject
@@ -118,7 +118,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.243000278" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.167889334" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2023602647" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.2023602647" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.746145261" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -146,7 +146,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.312011119" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1437306161" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.93089969" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.93089969" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2072022671" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1295262025" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSEasSystemClock/RCC_UseHSEasSystemClock.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSEasSystemClock/RCC_UseHSEasSystemClock.ioc
index 9d92760c..0d64a8aa 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSEasSystemClock/RCC_UseHSEasSystemClock.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSEasSystemClock/RCC_UseHSEasSystemClock.ioc
@@ -99,3 +99,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RCC_UseHSEasSystemClock
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/.cproject
index 57ce168f..173053ae 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSEasSystemClock/STM32CubeIDE/.cproject
@@ -117,7 +117,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1075228954" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1381894430" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.666569050" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.666569050" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.606130143" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
@@ -144,7 +144,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.2062158203" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1776672954" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.103855071" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.103855071" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.924538338" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1643408833" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc
index eae14805..a5ddb0d1 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RCC/RCC_UseHSI_PLLasSystemClock/RCC_UseHSI_PLLasSystemClock.ioc
@@ -110,3 +110,5 @@ SH.GPXTI0.ConfNb=1
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RCC_UseHSI_PLLasSystemClock
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RNG/RNG_GenerateRandomNumbers/RNG_GenerateRandomNumbers.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RNG/RNG_GenerateRandomNumbers/RNG_GenerateRandomNumbers.ioc
index befd4e7d..b78ecc1c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RNG/RNG_GenerateRandomNumbers/RNG_GenerateRandomNumbers.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RNG/RNG_GenerateRandomNumbers/RNG_GenerateRandomNumbers.ioc
@@ -116,3 +116,5 @@ VP_RNG_VS_RNG.Signal=RNG_VS_RNG
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RNG_GenerateRandomNumbers
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc
index 41626dea..5c9821ea 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RNG/RNG_GenerateRandomNumbers_IT/RNG_GenerateRandomNumbers_IT.ioc
@@ -116,3 +116,5 @@ VP_RNG_VS_RNG.Signal=RNG_VS_RNG
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RNG_GenerateRandomNumbers_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc
index 58bae1ab..62e8af1a 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_Alarm_Init/RTC_Alarm_Init.ioc
@@ -125,3 +125,5 @@ VP_RTC_VS_RTC_Calendar.Signal=RTC_VS_RTC_Calendar
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_Alarm_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/RTC_ExitStandbyWithWakeUpTimer_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/RTC_ExitStandbyWithWakeUpTimer_Init.ioc
index 7e425a81..4ab5c8e8 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/RTC_ExitStandbyWithWakeUpTimer_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_ExitStandbyWithWakeUpTimer_Init/RTC_ExitStandbyWithWakeUpTimer_Init.ioc
@@ -99,3 +99,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_ExitStandbyWithWakeUpTimer_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc
index dafedab5..679d0d52 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_Tamper_Init/RTC_Tamper_Init.ioc
@@ -106,3 +106,5 @@ VP_RTC_VS_RTC_Activate.Signal=RTC_VS_RTC_Activate
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_Tamper_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc
index f46b25ff..4cb42987 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/RTC/RTC_TimeStamp_Init/RTC_TimeStamp_Init.ioc
@@ -117,3 +117,5 @@ VP_RTC_VS_RTC_Calendar.Signal=RTC_VS_RTC_Calendar
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=RTC_TimeStamp_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/SPI_OneBoard_HalfDuplex_DMA_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/SPI_OneBoard_HalfDuplex_DMA_Init.ioc
index c4c6ff86..8553eca9 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/SPI_OneBoard_HalfDuplex_DMA_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/SPI_OneBoard_HalfDuplex_DMA_Init.ioc
@@ -204,3 +204,5 @@ SPI2.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_OneBoard_HalfDuplex_DMA_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/.cproject
index 88738a11..0becdf00 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/STM32CubeIDE/.cproject
@@ -116,7 +116,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1376762116" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1832144616" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.801400205" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.801400205" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1859731605" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="HSE_VALUE=8000000"/>
@@ -144,7 +144,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.2030689308" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2004021528" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.458322584" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.458322584" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.88488894" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.304343017" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/stm32wlxx_it.c
index dbf3cb89..11e93f9c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_DMA_Init/Src/stm32wlxx_it.c
@@ -231,7 +231,7 @@ void DMA1_Channel3_IRQHandler(void)
 
   if (LL_DMA_IsActiveFlag_TC3(DMA1))
   {
-    LL_DMA_ClearFlag_GI3(DMA1);
+    LL_DMA_ClearFlag_TC3(DMA1);
     /* Call function Transmission complete Callback */
     DMA1_TransmitComplete_Callback();
   }
@@ -255,7 +255,7 @@ void DMA2_Channel1_IRQHandler(void)
 
   if (LL_DMA_IsActiveFlag_TC1(DMA2))
   {
-    LL_DMA_ClearFlag_GI1(DMA2);
+    LL_DMA_ClearFlag_TC1(DMA2);
     /* Call function Reception complete Callback */
     DMA2_ReceiveComplete_Callback();
   }
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/SPI_OneBoard_HalfDuplex_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/SPI_OneBoard_HalfDuplex_IT_Init.ioc
index c21071fd..bbd9ae89 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/SPI_OneBoard_HalfDuplex_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_OneBoard_HalfDuplex_IT_Init/SPI_OneBoard_HalfDuplex_IT_Init.ioc
@@ -164,3 +164,5 @@ SPI2.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_OneBoard_HalfDuplex_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc
index 2151e97e..79a937d0 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/SPI_TwoBoards_FullDuplex_DMA_Master_Init.ioc
@@ -173,3 +173,5 @@ SPI1.VirtualType=VM_MASTER
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_TwoBoards_FullDuplex_DMA_Master_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wlxx_it.c
index 5154bd43..334d0911 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Master_Init/Src/stm32wlxx_it.c
@@ -212,7 +212,7 @@ void DMA1_Channel3_IRQHandler(void)
 
   if (LL_DMA_IsActiveFlag_TC3(DMA1))
   {
-    LL_DMA_ClearFlag_GI3(DMA1);
+    LL_DMA_ClearFlag_TC3(DMA1);
     /* Call function Reception complete Callback */
     DMA1_ReceiveComplete_Callback();
   }
@@ -233,7 +233,7 @@ void DMA1_Channel1_IRQHandler(void)
 {
   if (LL_DMA_IsActiveFlag_TC1(DMA1))
   {
-    LL_DMA_ClearFlag_GI1(DMA1);
+    LL_DMA_ClearFlag_TC1(DMA1);
     /* Call function Transmission complete Callback */
     DMA1_TransmitComplete_Callback();
   }
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc
index d34682bf..5a0c287c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/SPI_TwoBoards_FullDuplex_DMA_Slave_Init.ioc
@@ -171,3 +171,5 @@ SPI1.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_TwoBoards_FullDuplex_DMA_Slave_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wlxx_it.c
index 599ee2ce..b4307cac 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_DMA_Slave_Init/Src/stm32wlxx_it.c
@@ -212,7 +212,7 @@ void DMA1_Channel3_IRQHandler(void)
 
   if (LL_DMA_IsActiveFlag_TC3(DMA1))
   {
-    LL_DMA_ClearFlag_GI3(DMA1);
+    LL_DMA_ClearFlag_TC3(DMA1);
     /* Call function Reception complete Callback */
     DMA1_ReceiveComplete_Callback();
   }
@@ -233,7 +233,7 @@ void DMA1_Channel1_IRQHandler(void)
 {
   if (LL_DMA_IsActiveFlag_TC1(DMA1))
   {
-    LL_DMA_ClearFlag_GI1(DMA1);
+    LL_DMA_ClearFlag_TC1(DMA1);
     /* Call function Transmission complete Callback */
     DMA1_TransmitComplete_Callback();
   }
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc
index e686e8d4..2427afca 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Master_Init/SPI_TwoBoards_FullDuplex_IT_Master_Init.ioc
@@ -142,3 +142,5 @@ SPI1.VirtualType=VM_MASTER
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_TwoBoards_FullDuplex_IT_Master_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc
index 30cc7fc2..380c4454 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/SPI/SPI_TwoBoards_FullDuplex_IT_Slave_Init/SPI_TwoBoards_FullDuplex_IT_Slave_Init.ioc
@@ -140,3 +140,5 @@ SPI1.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_TwoBoards_FullDuplex_IT_Slave_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_BreakAndDeadtime_Init/Src/main.c b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_BreakAndDeadtime_Init/Src/main.c
index 11b45ba5..9d19cbe3 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_BreakAndDeadtime_Init/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_BreakAndDeadtime_Init/Src/main.c
@@ -224,14 +224,10 @@ static void MX_TIM1_Init(void)
   LL_TIM_OC_Init(TIM1, LL_TIM_CHANNEL_CH1, &TIM_OC_InitStruct);
   LL_TIM_OC_DisableFast(TIM1, LL_TIM_CHANNEL_CH1);
   LL_TIM_OC_EnablePreload(TIM1, LL_TIM_CHANNEL_CH2);
-  TIM_OC_InitStruct.OCState = LL_TIM_OCSTATE_DISABLE;
-  TIM_OC_InitStruct.OCNState = LL_TIM_OCSTATE_DISABLE;
   TIM_OC_InitStruct.CompareValue = Pulse2;
   LL_TIM_OC_Init(TIM1, LL_TIM_CHANNEL_CH2, &TIM_OC_InitStruct);
   LL_TIM_OC_DisableFast(TIM1, LL_TIM_CHANNEL_CH2);
   LL_TIM_OC_EnablePreload(TIM1, LL_TIM_CHANNEL_CH3);
-  TIM_OC_InitStruct.OCState = LL_TIM_OCSTATE_DISABLE;
-  TIM_OC_InitStruct.OCNState = LL_TIM_OCSTATE_DISABLE;
   TIM_OC_InitStruct.CompareValue = Pulse3;
   LL_TIM_OC_Init(TIM1, LL_TIM_CHANNEL_CH3, &TIM_OC_InitStruct);
   LL_TIM_OC_DisableFast(TIM1, LL_TIM_CHANNEL_CH3);
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_BreakAndDeadtime_Init/TIM_BreakAndDeadtime_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_BreakAndDeadtime_Init/TIM_BreakAndDeadtime_Init.ioc
index 69517716..7137bfbf 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_BreakAndDeadtime_Init/TIM_BreakAndDeadtime_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_BreakAndDeadtime_Init/TIM_BreakAndDeadtime_Init.ioc
@@ -23,8 +23,8 @@ Mcu.PinsNb=8
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32WL55JCIx
-MxCube.Version=6.1.0
-MxDb.Version=DB.6.0.10
+MxCube.Version=6.2.0
+MxDb.Version=DB.6.0.20
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.ForceEnableDMAVector=true
@@ -65,9 +65,16 @@ PB9.GPIOParameters=GPIO_Speed
 PB9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PB9.Mode=PWM Generation3 CH3 CH3N
 PB9.Signal=TIM1_CH3N
+PCC.SUBGHZ.FrequencyBand=High
+PCC.SUBGHZ.Modulation=FSK
+PCC.SUBGHZ.OptionalSettings=false
+PCC.SUBGHZ.Output.Power=14
+PCC.SUBGHZ.PowerAmplifier=Low Power
+PCC.SUBGHZ.RxBoosted=false
+PCC.SUBGHZ.SMPS=Off
 PinOutPanel.CurrentBGAView=Top
 PinOutPanel.RotationAngle=0
-ProjectManager.AskForMigrate=true
+ProjectManager.AskForMigrate=false
 ProjectManager.BackupPrevious=false
 ProjectManager.CompilerOptimize=6
 ProjectManager.ComputerToolchain=false
@@ -192,3 +199,5 @@ TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_BreakAndDeadtime_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_DMA_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_DMA_Init/Src/stm32wlxx_it.c
index 320fef06..4b0aa291 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_DMA_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_DMA_Init/Src/stm32wlxx_it.c
@@ -210,7 +210,7 @@ void DMA1_Channel5_IRQHandler(void)
 
   if(LL_DMA_IsActiveFlag_TC5(DMA1) == 1)
   {
-    LL_DMA_ClearFlag_GI5(DMA1);
+    LL_DMA_ClearFlag_TC5(DMA1);
     TransferComplete_Callback();
   }
   else if(LL_DMA_IsActiveFlag_TE5(DMA1) == 1)
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc
index 0a85800b..427dddc9 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_DMA_Init/TIM_DMA_Init.ioc
@@ -167,3 +167,5 @@ TIM1.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_DMA_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_InputCapture_Init/TIM_InputCapture_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_InputCapture_Init/TIM_InputCapture_Init.ioc
index bcbd4ee8..a6419031 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_InputCapture_Init/TIM_InputCapture_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_InputCapture_Init/TIM_InputCapture_Init.ioc
@@ -154,3 +154,5 @@ TIM2.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_InputCapture_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_OnePulse_Init/TIM_OnePulse_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_OnePulse_Init/TIM_OnePulse_Init.ioc
index f05150cb..f35ae538 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_OnePulse_Init/TIM_OnePulse_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_OnePulse_Init/TIM_OnePulse_Init.ioc
@@ -185,3 +185,5 @@ VP_TIM2_VS_ControllerModeTrigger.Signal=TIM2_VS_ControllerModeTrigger
 VP_TIM2_VS_OPM.Mode=OPM_bit
 VP_TIM2_VS_OPM.Signal=TIM2_VS_OPM
 board=custom
+ProjectManager.Example=TIM_OnePulse_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_OutputCompare_Init/TIM_OutputCompare_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_OutputCompare_Init/TIM_OutputCompare_Init.ioc
index 373e0445..411c9135 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_OutputCompare_Init/TIM_OutputCompare_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_OutputCompare_Init/TIM_OutputCompare_Init.ioc
@@ -128,3 +128,5 @@ TIM2.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_OutputCompare_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc
index 7ce0a7fc..a811555f 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_PWMOutput_Init/TIM_PWMOutput_Init.ioc
@@ -130,3 +130,5 @@ TIM2.TIM_MasterSlaveMode=TIM_MASTERSLAVEMODE_DISABLE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=TIM_PWMOutput_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc
index e5d0369d..817dbf46 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/TIM/TIM_TimeBase_Init/TIM_TimeBase_Init.ioc
@@ -125,3 +125,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM1_VS_ClockSourceINT.Mode=Internal
 VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT
 board=custom
+ProjectManager.Example=TIM_TimeBase_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/USART_Communication_Rx_IT_Continuous_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/USART_Communication_Rx_IT_Continuous_Init.ioc
index be8515c4..c728a8e7 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/USART_Communication_Rx_IT_Continuous_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_Init/USART_Communication_Rx_IT_Continuous_Init.ioc
@@ -145,3 +145,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_Rx_IT_Continuous_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/USART_Communication_Rx_IT_Continuous_VCP_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/USART_Communication_Rx_IT_Continuous_VCP_Init.ioc
index a218b58e..4a4f2133 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/USART_Communication_Rx_IT_Continuous_VCP_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Continuous_VCP_Init/USART_Communication_Rx_IT_Continuous_VCP_Init.ioc
@@ -147,3 +147,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_Rx_IT_Continuous_VCP_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc
index 28172d98..fdd27aa4 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_Init/USART_Communication_Rx_IT_Init.ioc
@@ -145,3 +145,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_Rx_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/USART_Communication_Rx_IT_VCP_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/USART_Communication_Rx_IT_VCP_Init.ioc
index 3e23102e..abd2d5a8 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/USART_Communication_Rx_IT_VCP_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Rx_IT_VCP_Init/USART_Communication_Rx_IT_VCP_Init.ioc
@@ -147,3 +147,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_Rx_IT_VCP_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/stm32wlxx_it.c
index 6267a74f..f5b57ffe 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/Src/stm32wlxx_it.c
@@ -210,7 +210,7 @@ void DMA1_Channel1_IRQHandler(void)
 
   if (LL_DMA_IsActiveFlag_TC1(DMA1))
   {
-    LL_DMA_ClearFlag_GI1(DMA1);
+    LL_DMA_ClearFlag_TC1(DMA1);
     /* Call function Transmission complete Callback */
     DMA1_TransmitComplete_Callback();
   }
@@ -235,7 +235,7 @@ void DMA1_Channel2_IRQHandler(void)
 
   if (LL_DMA_IsActiveFlag_TC2(DMA1))
   {
-    LL_DMA_ClearFlag_GI2(DMA1);
+    LL_DMA_ClearFlag_TC2(DMA1);
     /* Call function Reception complete Callback */
     DMA1_ReceiveComplete_Callback();
   }
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/USART_Communication_TxRx_DMA_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/USART_Communication_TxRx_DMA_Init.ioc
index 85dfe59b..43b88d69 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/USART_Communication_TxRx_DMA_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_TxRx_DMA_Init/USART_Communication_TxRx_DMA_Init.ioc
@@ -179,3 +179,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_TxRx_DMA_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_IT_Init/USART_Communication_Tx_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_IT_Init/USART_Communication_Tx_IT_Init.ioc
index 382da452..c2209af3 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_IT_Init/USART_Communication_Tx_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_IT_Init/USART_Communication_Tx_IT_Init.ioc
@@ -145,3 +145,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_Tx_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/USART_Communication_Tx_IT_VCP_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/USART_Communication_Tx_IT_VCP_Init.ioc
index cb0ff89d..c79bf6ce 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/USART_Communication_Tx_IT_VCP_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_IT_VCP_Init/USART_Communication_Tx_IT_VCP_Init.ioc
@@ -147,3 +147,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_Tx_IT_VCP_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc
index cb05fe6f..aa54d2b6 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_Init/USART_Communication_Tx_Init.ioc
@@ -144,3 +144,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_Tx_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_VCP_Init/USART_Communication_Tx_VCP_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_VCP_Init/USART_Communication_Tx_VCP_Init.ioc
index 130be792..a58d860c 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_VCP_Init/USART_Communication_Tx_VCP_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_Communication_Tx_VCP_Init/USART_Communication_Tx_VCP_Init.ioc
@@ -147,3 +147,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_Communication_Tx_VCP_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_HardwareFlowControl_Init/USART_HardwareFlowControl_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_HardwareFlowControl_Init/USART_HardwareFlowControl_Init.ioc
index c10ab11b..f6ecf3ad 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_HardwareFlowControl_Init/USART_HardwareFlowControl_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_HardwareFlowControl_Init/USART_HardwareFlowControl_Init.ioc
@@ -159,3 +159,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_HardwareFlowControl_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_DMA_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_DMA_Init/Src/stm32wlxx_it.c
index eff18045..c1ee6091 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_DMA_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_DMA_Init/Src/stm32wlxx_it.c
@@ -233,7 +233,7 @@ void DMA1_Channel2_IRQHandler(void)
 
   if (LL_DMA_IsActiveFlag_TC2(DMA1))
   {
-    LL_DMA_ClearFlag_GI2(DMA1);
+    LL_DMA_ClearFlag_TC2(DMA1);
     /* Call function Transmission complete Callback */
     SPI1_DMA1_TransmitComplete_Callback();
   }
@@ -257,7 +257,7 @@ void DMA1_Channel3_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel3_IRQn 0 */
   if (LL_DMA_IsActiveFlag_TC3(DMA1))
   {
-    LL_DMA_ClearFlag_GI3(DMA1);
+    LL_DMA_ClearFlag_TC3(DMA1);
     /* Call function Reception complete Callback */
     SPI1_DMA1_ReceiveComplete_Callback();
   }
@@ -282,7 +282,7 @@ void DMA1_Channel4_IRQHandler(void)
 
   if (LL_DMA_IsActiveFlag_TC4(DMA1))
   {
-    LL_DMA_ClearFlag_GI4(DMA1);
+    LL_DMA_ClearFlag_TC4(DMA1);
     /* Call function Transmission complete Callback */
     USART1_DMA1_TransmitComplete_Callback();
   }
@@ -306,7 +306,7 @@ void DMA1_Channel5_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel5_IRQn 0 */
   if (LL_DMA_IsActiveFlag_TC5(DMA1))
   {
-    LL_DMA_ClearFlag_GI5(DMA1);
+    LL_DMA_ClearFlag_TC5(DMA1);
     /* Call function Reception complete Callback */
     USART1_DMA1_ReceiveComplete_Callback();
   }
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_DMA_Init/USART_SyncCommunication_FullDuplex_DMA_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_DMA_Init/USART_SyncCommunication_FullDuplex_DMA_Init.ioc
index eb9f6fc7..ca7ec78f 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_DMA_Init/USART_SyncCommunication_FullDuplex_DMA_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_DMA_Init/USART_SyncCommunication_FullDuplex_DMA_Init.ioc
@@ -260,3 +260,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_SyncCommunication_FullDuplex_DMA_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_IT_Init/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_IT_Init/Src/stm32wlxx_it.c
index b644792f..deb45535 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_IT_Init/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_IT_Init/Src/stm32wlxx_it.c
@@ -230,7 +230,7 @@ void DMA1_Channel1_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel1_IRQn 0 */
   if (LL_DMA_IsActiveFlag_TC1(DMA1))
   {
-    LL_DMA_ClearFlag_GI1(DMA1);
+    LL_DMA_ClearFlag_TC1(DMA1);
     /* Call function Transmission complete Callback */
     SPI1_DMA1_TransmitComplete_Callback();
   }
@@ -254,7 +254,7 @@ void DMA1_Channel2_IRQHandler(void)
   /* USER CODE BEGIN DMA1_Channel2_IRQn 0 */
   if (LL_DMA_IsActiveFlag_TC2(DMA1))
   {
-    LL_DMA_ClearFlag_GI2(DMA1);
+    LL_DMA_ClearFlag_TC2(DMA1);
     /* Call function Reception complete Callback */
     SPI1_DMA1_ReceiveComplete_Callback();
   }
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_IT_Init/USART_SyncCommunication_FullDuplex_IT_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_IT_Init/USART_SyncCommunication_FullDuplex_IT_Init.ioc
index 37effb99..d9a5c6bc 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_IT_Init/USART_SyncCommunication_FullDuplex_IT_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_SyncCommunication_FullDuplex_IT_Init/USART_SyncCommunication_FullDuplex_IT_Init.ioc
@@ -222,3 +222,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_SyncCommunication_FullDuplex_IT_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_WakeUpFromStop1_Init/USART_WakeUpFromStop1_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_WakeUpFromStop1_Init/USART_WakeUpFromStop1_Init.ioc
index 711dbc94..167f8056 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_WakeUpFromStop1_Init/USART_WakeUpFromStop1_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_WakeUpFromStop1_Init/USART_WakeUpFromStop1_Init.ioc
@@ -142,3 +142,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_WakeUpFromStop1_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_WakeUpFromStop_Init/USART_WakeUpFromStop_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_WakeUpFromStop_Init/USART_WakeUpFromStop_Init.ioc
index 4d8baeed..6f00c2da 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_WakeUpFromStop_Init/USART_WakeUpFromStop_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/USART/USART_WakeUpFromStop_Init/USART_WakeUpFromStop_Init.ioc
@@ -142,3 +142,5 @@ USART1.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=USART_WakeUpFromStop_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/UTILS/UTILS_ConfigureSystemClock/UTILS_ConfigureSystemClock.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/UTILS/UTILS_ConfigureSystemClock/UTILS_ConfigureSystemClock.ioc
index 83d4a564..a93871cd 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/UTILS/UTILS_ConfigureSystemClock/UTILS_ConfigureSystemClock.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/UTILS/UTILS_ConfigureSystemClock/UTILS_ConfigureSystemClock.ioc
@@ -94,3 +94,5 @@ RCC.VCOOutputFreq_Value=32000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UTILS_ConfigureSystemClock
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc
index d7b2fdef..060c5981 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/UTILS/UTILS_ReadDeviceInfo/UTILS_ReadDeviceInfo.ioc
@@ -94,3 +94,5 @@ RCC.VCOOutputFreq_Value=32000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UTILS_ReadDeviceInfo
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc b/Projects/NUCLEO-WL55JC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc
index b2956f9e..a2b85624 100644
--- a/Projects/NUCLEO-WL55JC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_LL/WWDG/WWDG_RefreshUntilUserEvent_Init/WWDG_RefreshUntilUserEvent_Init.ioc
@@ -119,3 +119,5 @@ WWDG.Prescaler=WWDG_PRESCALER_64
 WWDG.Window=126
 board=custom
 boardIOC=true
+ProjectManager.Example=WWDG_RefreshUntilUserEvent_Init
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc
index 6adb0a2c..9b87af0e 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/ADC/ADC_SingleConversion_TriggerSW_IT/ADC_SingleConversion_TriggerSW_IT.ioc
@@ -112,3 +112,5 @@ SH.SharedAnalog_PA10.ConfNb=2
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=ADC_SingleConversion_TriggerSW_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/CRC/CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/CRC/CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc
index c2ab4579..a72135fe 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/CRC/CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/CRC/CRC_PolynomialUpdate/CRC_PolynomialUpdate.ioc
@@ -106,3 +106,5 @@ VP_CRC_VS_CRC.Signal=CRC_VS_CRC
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=CRC_PolynomialUpdate
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/.cproject
index 354eab4e..fe7fb7b5 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/CRC/CRC_PolynomialUpdate/STM32CubeIDE/.cproject
@@ -109,7 +109,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1532791422" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1942617240" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.223891594" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.223891594" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.765710503" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="MBEDTLS_CONFIG_FILE=&quot;mbedtls_config.h&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -128,7 +128,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.651502846" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.1559881401" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1482928233" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1482928233" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.975272745" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.2124445742" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc
index fa396217..0a90f923 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/DMA_FLASHToRAM.ioc
@@ -118,3 +118,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=DMA_FLASHToRAM
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/.cproject b/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/.cproject
index 06586b3a..d29a19c8 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/.cproject
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/STM32CubeIDE/.cproject
@@ -108,7 +108,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.261787755" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1321749392" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1880190151" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1880190151" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1218743864" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32WL55xx"/>
@@ -126,7 +126,7 @@
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.815304986" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.2035951360" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.350910648" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.o3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.350910648" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2114712993" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.305802116" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32WL55JCIX_FLASH.ld}" valueType="string"/>
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wlxx_it.c b/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wlxx_it.c
index d26ad3b1..8fda03fe 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wlxx_it.c
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/DMA/DMA_FLASHToRAM/Src/stm32wlxx_it.c
@@ -217,15 +217,15 @@ void DMA1_Channel1_IRQHandler(void)
   /* Using LL interface, use :                                             */
   /* - LL_DMA_IsActiveFlag_TC1() to check complete DMA1 Interrupt */
   /* - LL_DMA_IsActiveFlag_TE1() to check error DMA1 Interrupt    */
-  /* - LL_DMA_ClearFlag_GI1() to clear all DMA1 Interrupts        */
+  /* - LL_DMA_ClearFlag_TC1() to clear all DMA1 Interrupts        */
   if(LL_DMA_IsActiveFlag_TC1(DMA1) == 1)
   {
-    LL_DMA_ClearFlag_GI1(DMA1);
+    LL_DMA_ClearFlag_TC1(DMA1);
     TransferComplete();
   }
   else if(LL_DMA_IsActiveFlag_TE1(DMA1) == 1)
   {
-    LL_DMA_ClearFlag_GI1(DMA1);
+    LL_DMA_ClearFlag_TC1(DMA1);
     TransferError();
   }
 
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/I2C_OneBoard_ComSlave7_10bits_IT.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/I2C_OneBoard_ComSlave7_10bits_IT.ioc
index a26deb5f..6aa72dc7 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/I2C_OneBoard_ComSlave7_10bits_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/I2C_OneBoard_ComSlave7_10bits_IT.ioc
@@ -135,3 +135,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=I2C_OneBoard_ComSlave7_10bits_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c b/Projects/NUCLEO-WL55JC/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c
index b3c489db..9e76bfa0 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/I2C/I2C_OneBoard_ComSlave7_10bits_IT/Src/main.c
@@ -145,7 +145,7 @@ int main(void)
 
   /*##-5- Wait for the end of the transfer ###################################*/
   /*  Before starting a new communication transfer, you need to check the current
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
@@ -212,7 +212,7 @@ int main(void)
 
   /*##-10- Wait for the end of the transfer ##################################*/  
   /*  Before starting a new communication transfer, you need to check the current   
-      state of the peripheral; if it�s busy you need to wait for the end of current
+      state of the peripheral; if it is busy you need to wait for the end of current
       transfer before starting a new one.
       For simplicity reasons, this example is just waiting till the end of the
       transfer, but application may perform other tasks while transfer operation
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/LICENSE.md b/Projects/NUCLEO-WL55JC/Examples_MIX/LICENSE.md
new file mode 100644
index 00000000..f6031ef2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright 2020(-2021) STMicroelectronics.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc
index 83b8524c..64e53041 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/PWR/PWR_STOP1/PWR_STOP1.ioc
@@ -98,3 +98,5 @@ RCC.VCOOutputFreq_Value=96000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=PWR_STOP1
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc
index 5ea2a04f..f8982adf 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Master/SPI_FullDuplex_ComPolling_Master.ioc
@@ -131,3 +131,5 @@ SPI1.VirtualType=VM_MASTER
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_FullDuplex_ComPolling_Master
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc
index 778920ba..a548d250 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_FullDuplex_ComPolling_Slave/SPI_FullDuplex_ComPolling_Slave.ioc
@@ -128,3 +128,5 @@ SPI1.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_FullDuplex_ComPolling_Slave
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc
index 2bef03a5..1fcb2ab3 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Master/SPI_HalfDuplex_ComPollingIT_Master.ioc
@@ -125,3 +125,5 @@ SPI1.VirtualType=VM_MASTER
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_HalfDuplex_ComPollingIT_Master
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc
index 5f62091f..ab4ae3d4 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/SPI/SPI_HalfDuplex_ComPollingIT_Slave/SPI_HalfDuplex_ComPollingIT_Slave.ioc
@@ -124,3 +124,5 @@ SPI1.VirtualType=VM_SLAVE
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=SPI_HalfDuplex_ComPollingIT_Slave
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc
index 6ffe1bfb..1aff7e39 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/TIM/TIM_PWMInput/TIM_PWMInput.ioc
@@ -164,3 +164,5 @@ VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_TIM2_VS_ControllerModeReset.Mode=Reset Mode
 VP_TIM2_VS_ControllerModeReset.Signal=TIM2_VS_ControllerModeReset
 board=custom
+ProjectManager.Example=TIM_PWMInput
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc
index 2a193233..b64a2946 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/UART/UART_HyperTerminal_IT/UART_HyperTerminal_IT.ioc
@@ -131,3 +131,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_HyperTerminal_IT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/UART_HyperTerminal_TxPolling_RxIT.ioc b/Projects/NUCLEO-WL55JC/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/UART_HyperTerminal_TxPolling_RxIT.ioc
index 0da63fc7..d3e1bf93 100644
--- a/Projects/NUCLEO-WL55JC/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/UART_HyperTerminal_TxPolling_RxIT.ioc
+++ b/Projects/NUCLEO-WL55JC/Examples_MIX/UART/UART_HyperTerminal_TxPolling_RxIT/UART_HyperTerminal_TxPolling_RxIT.ioc
@@ -131,3 +131,5 @@ USART2.WordLength=WORDLENGTH_8B
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=UART_HyperTerminal_TxPolling_RxIT
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Templates/DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Templates/DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld
index d9932257..b2f00bf6 100644
--- a/Projects/NUCLEO-WL55JC/Templates/DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Templates/DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Projects/NUCLEO-WL55JC/Templates/DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Templates/DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
index d83c02ca..26d8eae5 100644
--- a/Projects/NUCLEO-WL55JC/Templates/DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Templates/DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Projects/NUCLEO-WL55JC/Templates/DualCore/Templates.ioc b/Projects/NUCLEO-WL55JC/Templates/DualCore/Templates.ioc
index 7aa54f18..3d27a6d6 100644
--- a/Projects/NUCLEO-WL55JC/Templates/DualCore/Templates.ioc
+++ b/Projects/NUCLEO-WL55JC/Templates/DualCore/Templates.ioc
@@ -118,3 +118,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=Templates
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Templates/LICENSE.md b/Projects/NUCLEO-WL55JC/Templates/LICENSE.md
new file mode 100644
index 00000000..f6031ef2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Templates/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright 2020(-2021) STMicroelectronics.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Projects/NUCLEO-WL55JC/Templates/SingleCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Templates/SingleCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
index 5e48259f..631b77d9 100644
--- a/Projects/NUCLEO-WL55JC/Templates/SingleCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Templates/SingleCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Projects/NUCLEO-WL55JC/Templates/SingleCore/Templates.ioc b/Projects/NUCLEO-WL55JC/Templates/SingleCore/Templates.ioc
index 80411137..7ab293d6 100644
--- a/Projects/NUCLEO-WL55JC/Templates/SingleCore/Templates.ioc
+++ b/Projects/NUCLEO-WL55JC/Templates/SingleCore/Templates.ioc
@@ -94,3 +94,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=Templates
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld
index d9932257..b2f00bf6 100644
--- a/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/STM32CubeIDE/CM0plus/STM32WL55JCIX_FLASH.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
index d83c02ca..26d8eae5 100644
--- a/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/STM32CubeIDE/CM4/STM32WL55JCIX_FLASH.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/Templates_LL.ioc b/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/Templates_LL.ioc
index af74fd5a..92f152a1 100644
--- a/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/Templates_LL.ioc
+++ b/Projects/NUCLEO-WL55JC/Templates_LL/DualCore/Templates_LL.ioc
@@ -125,3 +125,5 @@ VP_SYS_M0PLUS_VS_Systick.Signal=SYS_M0PLUS_VS_Systick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=Templates_LL
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/NUCLEO-WL55JC/Templates_LL/LICENSE.md b/Projects/NUCLEO-WL55JC/Templates_LL/LICENSE.md
new file mode 100644
index 00000000..f6031ef2
--- /dev/null
+++ b/Projects/NUCLEO-WL55JC/Templates_LL/LICENSE.md
@@ -0,0 +1,27 @@
+Copyright 2020(-2021) STMicroelectronics.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Projects/NUCLEO-WL55JC/Templates_LL/SingleCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/Projects/NUCLEO-WL55JC/Templates_LL/SingleCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
index 5e48259f..631b77d9 100644
--- a/Projects/NUCLEO-WL55JC/Templates_LL/SingleCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
+++ b/Projects/NUCLEO-WL55JC/Templates_LL/SingleCore/STM32CubeIDE/STM32WL55JCIX_FLASH.ld
@@ -1,5 +1,7 @@
 /*
 ** LinkerScript
+** Note: For specific memory allocation, linker and startup files must be customized.
+**       Refer to STM32CubeIDE user guide (UM2609), chapter "Modify the linker script".
 */
 
 /* Entry Point */
diff --git a/Projects/NUCLEO-WL55JC/Templates_LL/SingleCore/Templates_LL.ioc b/Projects/NUCLEO-WL55JC/Templates_LL/SingleCore/Templates_LL.ioc
index b366fdb1..117496ae 100644
--- a/Projects/NUCLEO-WL55JC/Templates_LL/SingleCore/Templates_LL.ioc
+++ b/Projects/NUCLEO-WL55JC/Templates_LL/SingleCore/Templates_LL.ioc
@@ -94,3 +94,5 @@ RCC.VCOOutputFreq_Value=384000000
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 board=custom
+ProjectManager.Example=Templates_LL
+ProjectManager.ExampleSource=CubeFw
diff --git a/Projects/Release_Notes.html b/Projects/Release_Notes.html
index c8dd4970..c3c2c244 100644
--- a/Projects/Release_Notes.html
+++ b/Projects/Release_Notes.html
@@ -15,19 +15,18 @@
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
-  <link rel="icon" type="image/x-icon" href="_htmresc/favicon.png" />
+  <link rel="icon" type="image/x-icon" href="../_htmresc/favicon.png" />
 </head>
 <body>
 <div class="row">
 <div class="col-sm-12 col-lg-4">
 <center>
-<h1 id="release-notes-for-projects-of-stm32cubewl-firmware-package">Release Notes for <mark>Projects of STM32CubeWL Firmware Package</mark></h1>
+<h1 id="release-notes-for">Release Notes for</h1>
+<h1 id="projects-of-stm32cubewl-firmware-package"><mark>Projects of STM32CubeWL Firmware Package</mark></h1>
 <p>Copyright © 2020 STMicroelectronics<br />
 </p>
 <a href="https://www.st.com" class="logo"><img src="../_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
-<h1 id="license">License</h1>
-<p>The projects covered by these release notes are delivered under different licenses. Details of applicable license for each project are provided in the table of the "Contents" section below.</p>
 <h1 id="purpose">Purpose</h1>
 <p>The projects are a set of applicative tasks that aim to explain and provide use cases of the different products features based on the products hardware (Boards, STM32 Core(s) features, interconnections and peripherals) and built around the different firmware components. They can be directly used or adapted by the STM32CubeWL Firmware Package users. They provide basic functionalities, show main features or demonstrate performance. They are provided with preconfigured projects for the main supported toolchains.</p>
 <p>In the STM32CubeWL Firmware Package, the projects are organized in a sequential scheme based on the following levels:</p>
@@ -53,10 +52,24 @@ <h1 id="purpose">Purpose</h1>
 <div class="col-sm-12 col-lg-8">
 <h1 id="update-history">Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section1" checked aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<input type="checkbox" id="collapse-section2" checked aria-hidden="true"> <label for="collapse-section2" aria-hidden="true"><strong>V1.1.0 / 16-June-2021</strong></label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
-<h3 id="first-official-release">First Official Release</h3>
+<h3 id="maintenance-release">Maintenance Release</h3>
+<ul>
+<li>Security Applications :
+<ul>
+<li>BFU_1_Image renamed BFU_1_Slot</li>
+<li>BFU_2_Slots, SBSFU_1_Slot_DualCore and SBSFU_2_Slots_DualCore added</li>
+</ul></li>
+<li>RF Applications :
+<ul>
+<li>LoRaWAN_FUOTA_DualCore STM32CubeIDE project added</li>
+<li>LoRaWAN_FUOTA Single Core project added</li>
+<li>RF Secure projects added: LoRaWAN_SBSFU_1_Slot_DualCore and Sigfox_SBSFU_1_Slot_DualCore added</li>
+<li>SubGHz_Phy_Per Project added. Optionally featuring long packet mode (FSK payload &gt; 255 bytes) on stm32wl revision Y</li>
+</ul></li>
+</ul>
 <h2 id="contents">Contents</h2>
 <p><small>The Project categories flagged by “<span class="icon-st-update"></span>” have changed since the previous release. “<span class="icon-st-add"></span>” are new.</small></p>
 <p>Projects</p>
@@ -65,7 +78,103 @@ <h2 id="contents">Contents</h2>
 <tr class="header">
 <th style="text-align: left;">Board</th>
 <th style="text-align: left;">Project category</th>
-<th style="text-align: left;">License</th>
+<th style="text-align: left;">Path</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">NUCLEO-WL55JC</td>
+<td style="text-align: left;">Demonstrations <span class="icon-st-update"></span></td>
+<td style="text-align: left;">Projects\NUCLEO-WL55JC\Demonstrations</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">NUCLEO-WL55JC</td>
+<td style="text-align: left;">Applications <span class="icon-st-update"></span></td>
+<td style="text-align: left;">Projects\NUCLEO-WL55JC\Applications</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">NUCLEO-WL55JC</td>
+<td style="text-align: left;">HAL Examples <span class="icon-st-update"></span></td>
+<td style="text-align: left;">Projects\NUCLEO-WL55JC\Examples</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">NUCLEO-WL55JC</td>
+<td style="text-align: left;">LL Examples <span class="icon-st-update"></span></td>
+<td style="text-align: left;">Projects\NUCLEO-WL55JC\Examples_LL</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">NUCLEO-WL55JC</td>
+<td style="text-align: left;">MIX Examples <span class="icon-st-update"></span></td>
+<td style="text-align: left;">Projects\NUCLEO-WL55JC\Examples_MIX</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">NUCLEO-WL55JC</td>
+<td style="text-align: left;">HAL Template <span class="icon-st-update"></span></td>
+<td style="text-align: left;">Projects\NUCLEO-WL55JC\Templates</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">NUCLEO-WL55JC</td>
+<td style="text-align: left;">LL Template <span class="icon-st-update"></span></td>
+<td style="text-align: left;">Projects\NUCLEO-WL55JC\Templates_LL</td>
+</tr>
+</tbody>
+</table>
+<h2 id="known-limitations">Known Limitations</h2>
+<ul>
+<li><strong>LL/HAL</strong>
+<ul>
+<li>All LL/HAL Projects are developed using CubeMx except GTZC_GlobalSecurityConfiguration_DualCore (not eligible)</li>
+</ul></li>
+<li><strong>MW Legacy Applications</strong>
+<ul>
+<li>All FreeRTOS applications except FreeRTOS_HSEM_DualCore are developed using CubeMx (not eligible)</li>
+<li>FatFs_uSD_Standalone not developed using CubeMx (not eligible)</li>
+</ul></li>
+<li><strong>Security Applications</strong>
+<ul>
+<li>All KMS applications are developed using CubeMx except KMS_Blob_Binary (not eligible)</li>
+<li>All SBSFU applications is not developed using CubeMx (not eligible)</li>
+</ul></li>
+<li><strong>RF Applications</strong>
+<ul>
+<li>All SBSFU &amp; FUOTA applications are not developed using CubeMx (not eligible)</li>
+</ul></li>
+</ul>
+<h2 id="development-toolchains-and-compilers">Development Toolchains and Compilers</h2>
+<ul>
+<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.30.1 + ST-Link</li>
+<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.31 + ST-Link
+<ul>
+<li>Support of ARM Compiler 6 (AC-5 like warnings) for HAL/LL/BSP drivers and STMicroelectronics Middleware components</li>
+</ul></li>
+<li>STM32CubeIDE 1.7.0 + ST-Link</li>
+</ul>
+<h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
+<ul>
+<li>STM32WLE5xx &amp; STM32WL55xx</li>
+<li>NUCLEO-WL55JC1 &amp; NUCLEO-WL55JC2 (except Sigfox applications) ecosystem boards - Nucleo kit RevC (MB1389-HIGHBAND-E01 or MB1389-LOWBAND-C01)</li>
+</ul>
+<h2 id="backward-compatibility">Backward Compatibility</h2>
+<p>This release is compatible with the previous versions</p>
+<h2 id="dependencies">Dependencies</h2>
+<ul>
+<li>STM32CubeMX 6.3.0</li>
+</ul>
+</div>
+</div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<h3 id="first-official-release">First Official Release</h3>
+<h2 id="contents-1">Contents</h2>
+<p><small>The Project categories flagged by “<span class="icon-st-update"></span>” have changed since the previous release. “<span class="icon-st-add"></span>” are new.</small></p>
+<p>Projects</p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Board</th>
+<th style="text-align: left;">Project category</th>
 <th style="text-align: left;">Path</th>
 </tr>
 </thead>
@@ -73,48 +182,41 @@ <h2 id="contents">Contents</h2>
 <tr class="odd">
 <td style="text-align: left;">NUCLEO-WL55JC</td>
 <td style="text-align: left;">Demonstrations</td>
-<td style="text-align: left;"><a href="http://www.st.com/SLA0044">SLA0044</a></td>
 <td style="text-align: left;">Projects\NUCLEO-WL55JC\Demonstrations</td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">NUCLEO-WL55JC</td>
 <td style="text-align: left;">Applications</td>
-<td style="text-align: left;"><a href="http://www.st.com/SLA0044">SLA0044</a></td>
 <td style="text-align: left;">Projects\NUCLEO-WL55JC\Applications</td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">NUCLEO-WL55JC</td>
 <td style="text-align: left;">HAL Examples</td>
-<td style="text-align: left;"><a href="https://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause</a></td>
 <td style="text-align: left;">Projects\NUCLEO-WL55JC\Examples</td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">NUCLEO-WL55JC</td>
 <td style="text-align: left;">LL Examples</td>
-<td style="text-align: left;"><a href="https://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause</a></td>
 <td style="text-align: left;">Projects\NUCLEO-WL55JC\Examples_LL</td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">NUCLEO-WL55JC</td>
 <td style="text-align: left;">MIX Examples</td>
-<td style="text-align: left;"><a href="https://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause</a></td>
 <td style="text-align: left;">Projects\NUCLEO-WL55JC\Examples_MIX</td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">NUCLEO-WL55JC</td>
 <td style="text-align: left;">HAL Template</td>
-<td style="text-align: left;"><a href="https://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause</a></td>
 <td style="text-align: left;">Projects\NUCLEO-WL55JC\Templates</td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">NUCLEO-WL55JC</td>
 <td style="text-align: left;">LL Template</td>
-<td style="text-align: left;"><a href="https://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause</a></td>
 <td style="text-align: left;">Projects\NUCLEO-WL55JC\Templates_LL</td>
 </tr>
 </tbody>
 </table>
-<h2 id="known-limitations">Known Limitations</h2>
+<h2 id="known-limitations-1">Known Limitations</h2>
 <ul>
 <li><strong>LL/HAL</strong>
 <ul>
@@ -132,23 +234,23 @@ <h2 id="known-limitations">Known Limitations</h2>
 </ul></li>
 <li><strong>RF Applications</strong>
 <ul>
-<li>LoRaWAN_FUOTA application is not developed using CubeMx (not eligible) and not ported in CubeIDE</li>
+<li>LoRaWAN_FUOTA, LoRaWAN_SBSFU_1_Slot_DualCore and Sigfox_SBSFU_1_Slot_DualCore applications are not developed using CubeMx (not eligible)</li>
 </ul></li>
 </ul>
-<h2 id="development-toolchains-and-compilers">Development Toolchains and Compilers</h2>
+<h2 id="development-toolchains-and-compilers-1">Development Toolchains and Compilers</h2>
 <ul>
 <li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.30.1 + ST-Link</li>
 <li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.28 + ST-Link</li>
 <li>STM32CubeIDE 1.5.0 + ST-Link</li>
 </ul>
-<h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
+<h2 id="supported-devices-and-boards-1">Supported Devices and boards</h2>
 <ul>
 <li>STM32WLE5xx &amp; STM32WL55xx</li>
 <li>NUCLEO-WL55JC1 &amp; NUCLEO-WL55JC2 (except Sigfox applications) ecosystem boards - Nucleo kit RevC (MB1389-HIGHBAND-C01 or MB1389-LOWBAND-C01)</li>
 </ul>
-<h2 id="backward-compatibility">Backward Compatibility</h2>
+<h2 id="backward-compatibility-1">Backward Compatibility</h2>
 <p>This release is compatible with the previous versions</p>
-<h2 id="dependencies">Dependencies</h2>
+<h2 id="dependencies-1">Dependencies</h2>
 <ul>
 <li>STM32CubeMX 6.1.0</li>
 </ul>
diff --git a/Projects/STM32CubeProjectsList.html b/Projects/STM32CubeProjectsList.html
index 6b52dbdb..dc03f439 100644
--- a/Projects/STM32CubeProjectsList.html
+++ b/Projects/STM32CubeProjectsList.html
@@ -18,16 +18,16 @@
 
     <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
 
-    <p class="copyright">Copyright 2019 STMicroelectronics</p>
+    <p class="copyright">Copyright 2021 STMicroelectronics</p>
 
     <div class="picture">
-      <img alt="" id="_x0000_i1025" src="../_htmresc/st_logo.png" style="border: 0px solid ; width: 104px; height: 77px;"/>
+      <img alt="" id="_x0000_i1025" src="../_htmresc/st_logo_2020.png" style="border: 0px solid ; width: 104px; height: 77px;"/>
     </div>
 
     <p>The STM32CubeWL Firmware package comes with a rich set of examples running on STMicroelectronics boards, organized by board and provided with preconfigured projects for the main supported toolchains.</p>
 
     <div class="picture">
-      <img alt="" src="../_htmresc/STM32Cube.bmp"/>
+      <img alt="" src="../_htmresc/STM32Cube_2020.bmp"/>
     </div>
 
     <p>The examples are classified depending on the STM32Cube level they apply to, and are named as follows:</p>
@@ -47,7 +47,7 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
       <li>\Inc folder that contains all header files.</li>
       <li>\Src folder for the sources code.</li>
       <li>\EWARM, \MDK-ARM and \STM32CubeIDE folders contain the preconfigured project for each toolchain.</li>
-      <li>readme.txt describing the example behavior and the environment required to run the example.</li>
+      <li>A readme describing the example behavior and the environment required to run the example.</li>
     </ul>
 
     <p>To run the example, you have to do the following:</p>
@@ -55,9 +55,9 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
     <ul>
       <li>Open the example using your preferred toolchain.</li>
       <li>Rebuild all files and load the image into target memory.</li>
-      <li>Run the example by following the readme.txt instructions.</li>
+      <li>Run the example by following the readme instructions.</li>
       <li>
-        <i><u>Note</u>: refer to section "Development Toolchains and Compilers" and "Supported Devices and EVAL boards" of the Firmware package release notes to know about the SW/HW environment used for the Firmware development and validation. The correct operation of the provided examples is not guaranteed on some environments, for example when using different compiler or board versions.</i>
+        <i><u>Note</u>: refer to section "Development Toolchains and Compilers" and "Supported Devices and EVAL, Nucleo and Discovery boards" of the Firmware package release notes to know about the SW/HW environment used for the Firmware development and validation. The correct operation of the provided examples is not guaranteed on some environments, for example when using different compiler or board versions.</i>
       </li>
     </ul>
 
@@ -793,7 +793,7 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
       </tr>
       <tr align=center>
         <td align=left><p id="RTC_Alarm_DualCore">RTC_Alarm_DualCore</p></td>
-        <td align=left>This multicore project shows how CM4 uses the Alarm A and CM0 uses Alarm B.
+        <td align=left>This multicore project shows how CPU1 (CM4) uses the Alarm A and CPU2 (CM0) uses Alarm B.
 </td>
         <td><font size="5" color=green>CubeMx</font></td>
       </tr>
@@ -1943,14 +1943,13 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
         <td>12</td>
       </tr>
       <tr align=center>
-        <td style="background-repeat: no-repeat;background-position: right center;background-color: #39A9DC;color: #FFF;" rowspan=39><p id="Applications">Applications</p></td>
-        <td align=left rowspan=4><p id="BFU_1_Image">BFU_1_Image</p></td>
+        <td style="background-repeat: no-repeat;background-position: right center;background-color: #39A9DC;color: #FFF;" rowspan=61><p id="Applications">Applications</p></td>
+        <td align=left rowspan=4><p id="BFU_1_Slot">BFU_1_Slot</p></td>
         <td align=left><p id="1_Image_BFU">1_Image_BFU</p></td>
         <td align=left>
-The Boot (B) and Firmware Update (FU) solution allows the update
-of the STM32 microcontroller built-in program with new firmware versions, adding
-new features and correcting potential issues. The update process is performed in
-a secure way to prevent unauthorized updates.
+The Boot (B) and Firmware Update (FU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates.
 </td>
         <td><font size="5" color=green>X</font></td>
       </tr>
@@ -1973,8 +1972,42 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
       <tr align=center>
         <td align=left><p id="1_Image_UserApp">1_Image_UserApp</p></td>
         <td align=left>
-This application demonstrates firmware download capabilities and provides a set
-of functions to test the active protections offered by Secure Boot and Secure Engine.
+This application demonstrates firmware download capabilities and provides a set of functions to test the active
+protections offered by Secure Boot and Secure Engine.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left rowspan=4><p id="BFU_2_Slots">BFU_2_Slots</p></td>
+        <td align=left><p id="1_Image_BFU">1_Image_BFU</p></td>
+        <td align=left>
+The Boot (B) and Firmware Update (FU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="1_Image_KMS_Blob">1_Image_KMS_Blob</p></td>
+        <td align=left>
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="1_Image_SECoreBin">1_Image_SECoreBin</p></td>
+        <td align=left>
+This application is used to generate Secure Engine Core binary file to be linked
+with Boot & Firmware Update application (BFU).
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="1_Image_UserApp">1_Image_UserApp</p></td>
+        <td align=left>
+This application demonstrates firmware download capabilities and provides a set of functions to test the active
+protections offered by Secure Boot and Secure Engine.
 </td>
         <td><font size="5" color=green>X</font></td>
       </tr>
@@ -2121,12 +2154,46 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
         <td align=left><p id="LoRaWAN_End_Node_DualCoreFreeRTOS">LoRaWAN_End_Node_DualCoreFreeRTOS</p></td>
         <td align=left>
 This directory contains a set of source files that implements a Dual Core (CM4 / CM0) LoRa application
-device sending sensors data to LoRa Network server.
+device sending sensors data to LoRa Network server with FreeRTOS Task scheduler on CM4.
 </td>
         <td><font size="5" color=green>CubeMx</font></td>
       </tr>
       <tr align=center>
         <td align=left rowspan=4><p id="LoRaWAN_FUOTA">LoRaWAN_FUOTA</p></td>
+        <td align=left><p id="1_Image_BFU">1_Image_BFU</p></td>
+        <td align=left>
+The Boot (B) and Firmware Update (FU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="1_Image_KMS_Blob">1_Image_KMS_Blob</p></td>
+        <td align=left>
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="1_Image_SECoreBin">1_Image_SECoreBin</p></td>
+        <td align=left>
+This application is used to generate Secure Engine Core binary file to be linked
+with Boot & Firmware Update application (BFU).
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="LoRaWAN_End_Node">LoRaWAN_End_Node</p></td>
+        <td align=left>
+This directory contains a set of source files that implements a LoRa application
+device with firmware update over the air download capabilities.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left rowspan=4><p id="LoRaWAN_FUOTA_DualCore">LoRaWAN_FUOTA_DualCore</p></td>
         <td align=left><p id="2_Images_KMS_Blob">2_Images_KMS_Blob</p></td>
         <td align=left>
 This application is used to generate Key Management Services Blob binary file to be downloaded
@@ -2137,11 +2204,10 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
       <tr align=center>
         <td align=left><p id="2_Images_SBSFU">2_Images_SBSFU</p></td>
         <td align=left>
-The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update
-of the STM32 microcontroller built-in program with new firmware versions, adding
-new features and correcting potential issues. The update process is performed in
-a secure way to prevent unauthorized updates and access to confidential on-device
-data such as secret code and firmware encryption key.
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
 </td>
         <td><font size="5" color=green>X</font></td>
       </tr>
@@ -2157,12 +2223,12 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
         <td align=left><p id="LoRaWAN_End_Node_DualCore">LoRaWAN_End_Node_DualCore</p></td>
         <td align=left>
 This directory contains a set of source files that implements a Dual Core (CM4 / CM0) LoRa application
-device sending sensors data to LoRa Network server.
+device with firmware update over the air download capabilities.
 </td>
         <td><font size="5" color=green>X</font></td>
       </tr>
       <tr align=center>
-        <td align=left rowspan=5><p id="SBSFU_2_Images_DualCore">SBSFU_2_Images_DualCore</p></td>
+        <td align=left rowspan=4><p id="LoRaWAN_SBSFU_1_Slot_DualCore">LoRaWAN_SBSFU_1_Slot_DualCore</p></td>
         <td align=left><p id="2_Images_KMS_Blob">2_Images_KMS_Blob</p></td>
         <td align=left>
 This application is used to generate Key Management Services Blob binary file to be downloaded
@@ -2173,11 +2239,45 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
       <tr align=center>
         <td align=left><p id="2_Images_SBSFU">2_Images_SBSFU</p></td>
         <td align=left>
-The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update
-of the STM32 microcontroller built-in program with new firmware versions, adding
-new features and correcting potential issues. The update process is performed in
-a secure way to prevent unauthorized updates and access to confidential on-device
-data such as secret code and firmware encryption key.
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="2_Images_SECoreBin">2_Images_SECoreBin</p></td>
+        <td align=left>
+This application is used to generate Secure Engine Core binary file to be linked
+with Secure Boot & Secure Firmware Update application (SBSFU).
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="LoRaWAN_End_Node_DualCore">LoRaWAN_End_Node_DualCore</p></td>
+        <td align=left>
+This directory contains a set of source files that implements a Dual Core (CM4 / CM0) LoRa application
+device with security environment offered by Secure Boot and Secure Engine.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left rowspan=5><p id="SBSFU_1_Slot_DualCore">SBSFU_1_Slot_DualCore</p></td>
+        <td align=left><p id="2_Images_KMS_Blob">2_Images_KMS_Blob</p></td>
+        <td align=left>
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="2_Images_SBSFU">2_Images_SBSFU</p></td>
+        <td align=left>
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
 </td>
         <td><font size="5" color=green>X</font></td>
       </tr>
@@ -2192,8 +2292,50 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
       <tr align=center>
         <td align=left><p id="2_Images_UserApp_M0Plus">2_Images_UserApp_M0Plus</p></td>
         <td align=left>
-This application demonstrates firmware download capabilities and provides a set
-of functions to test the active protections offered by Secure Boot and Secure Engine.
+This application demonstrates firmware download capabilities and provides a set of functions to test the active
+protections offered by Secure Boot and Secure Engine.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="2_Images_UserApp_M4">2_Images_UserApp_M4</p></td>
+        <td align=left>
+This application demonstrates firmware download capabilities.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left rowspan=5><p id="SBSFU_2_Slots_DualCore">SBSFU_2_Slots_DualCore</p></td>
+        <td align=left><p id="2_Images_KMS_Blob">2_Images_KMS_Blob</p></td>
+        <td align=left>
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="2_Images_SBSFU">2_Images_SBSFU</p></td>
+        <td align=left>
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="2_Images_SECoreBin">2_Images_SECoreBin</p></td>
+        <td align=left>
+This application is used to generate Secure Engine Core binary file to be linked
+with Secure Boot & Secure Firmware Update application (SBSFU).
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="2_Images_UserApp_M0Plus">2_Images_UserApp_M0Plus</p></td>
+        <td align=left>
+This application demonstrates firmware download capabilities and provides a set of functions to test the active
+protections offered by Secure Boot and Secure Engine.
 </td>
         <td><font size="5" color=green>X</font></td>
       </tr>
@@ -2226,8 +2368,8 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
       <tr align=center>
         <td align=left><p id="Sigfox_PushButton">Sigfox_PushButton</p></td>
         <td align=left>
-This directory contains a set of source files that implements an example of a 
-Sigfox object sending temperature - and Batterie Level to a Sigfox Network. 
+This directory contains a set of source files that implements an example of a
+Sigfox object sending temperature and Battery Level to a Sigfox Network.
 </td>
         <td><font size="5" color=green>CubeMx</font></td>
       </tr>
@@ -2235,15 +2377,58 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
         <td align=left><p id="Sigfox_PushButton_DualCore">Sigfox_PushButton_DualCore</p></td>
         <td align=left>
 This directory contains a set of source files that implements a Dual Core (CM4 / CM0) Sigfox application
-example of a Sigfox object sending temperature - and Batterie Level to a Sigfox Network.
+example of a Sigfox object sending temperature and Battery Level to a Sigfox Network.
+</td>
+        <td><font size="5" color=green>CubeMx</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left rowspan=4><p id="Sigfox_SBSFU_1_Slot_DualCore">Sigfox_SBSFU_1_Slot_DualCore</p></td>
+        <td align=left><p id="2_Images_KMS_Blob">2_Images_KMS_Blob</p></td>
+        <td align=left>
+This application is used to generate Key Management Services Blob binary file to be downloaded
+with KMS through the ImportBlob() API. 
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="2_Images_SBSFU">2_Images_SBSFU</p></td>
+        <td align=left>
+The Secure Boot (SB) and Secure Firmware Update (SFU) solution allows the update of the STM32 microcontroller built-in
+program with new firmware versions, adding new features and correcting potential issues. The update process is performed
+in a secure way to prevent unauthorized updates and access to confidential on-device data such as secret code and
+firmware encryption key.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="2_Images_SECoreBin">2_Images_SECoreBin</p></td>
+        <td align=left>
+This application is used to generate Secure Engine Core binary file to be linked
+with Secure Boot & Secure Firmware Update application (SBSFU).
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left><p id="Sigfox_PushButton_DualCore">Sigfox_PushButton_DualCore</p></td>
+        <td align=left>
+This directory contains a set of source files that implements a Dual Core (CM4 / CM0) Sigfox application
+device with security environment offered by Secure Boot and Secure Engine.
+</td>
+        <td><font size="5" color=green>X</font></td>
+      </tr>
+      <tr align=center>
+        <td align=left rowspan=3><p id="SubGHz_Phy">SubGHz_Phy</p></td>
+        <td align=left><p id="SubGHz_Phy_Per">SubGHz_Phy_Per</p></td>
+        <td align=left>
+This directory contains a set of source files that implements a PER (Packet Error Rate) tests application
+with IBM whitening between one Tx device and one Rx device.
 </td>
         <td><font size="5" color=green>CubeMx</font></td>
       </tr>
       <tr align=center>
-        <td align=left rowspan=2><p id="SubGHz_Phy">SubGHz_Phy</p></td>
         <td align=left><p id="SubGHz_Phy_PingPong">SubGHz_Phy_PingPong</p></td>
         <td align=left>
-This directory contains a set of source files that implements a Ping-Pong application 
+This directory contains a set of source files that implements a Ping-Pong application
 between two PingPong Devices.
 </td>
         <td><font size="5" color=green>CubeMx</font></td>
@@ -2251,35 +2436,31 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
       <tr align=center>
         <td align=left><p id="SubGHz_Phy_PingPong_DualCore">SubGHz_Phy_PingPong_DualCore</p></td>
         <td align=left>
-This directory contains a set of source files that implements a Dual Core (CM4 / CM0) Ping-Pong application 
+This directory contains a set of source files that implements a Dual Core (CM4 / CM0) Ping-Pong application
 between two PingPong Devices.
 </td>
         <td><font size="5" color=green>CubeMx</font></td>
       </tr>
       <tr style="background-repeat: no-repeat;background-position: right center;background-color: #39A9DC;color: #FFF;" align=center>
-        <td colspan="3"><b>Total number of applications: 38</b></td>
-        <td>38</td>
+        <td colspan="3"><b>Total number of applications: 60</b></td>
+        <td>60</td>
       </tr>
       <tr align=center>
         <td style="background-repeat: no-repeat;background-position: right center;background-color: #39A9DC;color: #FFF;" rowspan=3><p id="Demonstrations">Demonstrations</p></td>
         <td align=left rowspan=2><p id="LocalNetwork">LocalNetwork</p></td>
         <td align=left><p id="LocalNetwork_Concentrator">LocalNetwork_Concentrator</p></td>
         <td align=left>
-This directory contains a set of source files that implements a Concentrator 
-sending Beacon to  administrate a Network of up to 14 sensors and receives 
-each connected Sensor's data 
-
-This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
+This directory contains a set of source files that implements a Concentrator
+sending Beacon to administrate a Network of up to 14 sensors and receives
+each connected Sensor's data.
 </td>
         <td><font size="5" color=green>X</font></td>
       </tr>
       <tr align=center>
         <td align=left><p id="LocalNetwork_Sensor">LocalNetwork_Sensor</p></td>
         <td align=left>
-This directory contains a set of source files that implements Sensor sending Sensor 
-data to the demo concentrator 
-
-This application is targeting the STM32WLxx Nucleo board embedding the STM32WLxx.
+This directory contains a set of source files that implements Sensor sending Sensor
+data to the demo concentrator.
 </td>
         <td><font size="5" color=green>X</font></td>
       </tr>
@@ -2288,8 +2469,8 @@ <h1>STM32CubeWL Firmware Examples for STM32WLxx Series</h1>
         <td>2</td>
       </tr>
       <tr style="background-repeat: no-repeat;background-position: right center;background-color: #39A9DC;color: #FFF;" align=center>
-      	<td colspan="4"><b>Total number of projects: 254</b></td>
-      	<td>254</td>
+      	<td colspan="4"><b>Total number of projects: 276</b></td>
+      	<td>276</td>
       </tr>
     </table>
   </body>
diff --git a/README.md b/README.md
index d430e784..76da9f19 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # STM32CubeWL MCU Firmware Package
 
+![latest tag](https://img.shields.io/github/v/tag/STMicroelectronics/STM32CubeWL.svg?color=brightgreen)
+
 **STM32Cube** is an STMicroelectronics original initiative to ease the developers life by reducing efforts, time and cost.
 
 **STM32Cube** covers the overall STM32 products portfolio. It includes a comprehensive embedded software platform delivered for each STM32 series.
@@ -30,4 +32,4 @@ Details about the content of this release are available in the release note [her
 
 **Caution** : The issues and the pull-requests are **strictly limited** to submit problems or suggestions related to the software delivered in this repository.
 
-**For any other question** related to the product, the hardware performance or characteristics, the tools, the environment, you can submit it to the **ST Community** on the STM32 MCUs related [page](https://community.st.com/s/group/0F90X000000AXsASAW/stm32-mcus).
+**For any other question** related to the product, the hardware performance or characteristics, the tools, the environment, you can submit it to the **ST Community** on the STM32 MCUs related [page](https://community.st.com/s/topic/0TO0X000000BSqSWAW/stm32-mcus).
diff --git a/Release_Notes.html b/Release_Notes.html
index 58c6e38b..a3d36c29 100644
--- a/Release_Notes.html
+++ b/Release_Notes.html
@@ -21,14 +21,12 @@
 <div class="row">
 <div class="col-sm-12 col-lg-4">
 <center>
-<h1 id="release-notes-for-stm32cubewl-firmware-package"><small>Release Notes for</small> STM32CubeWL Firmware Package</h1>
+<h1 id="release-notes-for">Release Notes for</h1>
+<h1 id="stm32cubewl-firmware-package"><mark>STM32CubeWL Firmware Package</mark></h1>
 <p>Copyright © 2020 STMicroelectronics<br />
 </p>
 <a href="https://www.st.com" class="logo"><img src="_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
-<h1 id="license">License</h1>
-<p>This software package is licensed by ST under ST license SLA0048, the “License”; You may not use this package except in compliance with the License. You may obtain a copy of the License at:</p>
-<p><a href="http://www.st.com/SLA0048">http://www.st.com/SLA0048</a></p>
 <h1 id="purpose">Purpose</h1>
 <p>STM32WL series will serve all applications requiring Sub-GHz (LoRaWAN, Sigfox) capabilities in a low-power context with an open dual core architecture offer.</p>
 <p><strong>STM32Cube is an STMicroelectronics original initiative to ease developers life by reducing development efforts, time and cost.</mark></strong></p>
@@ -44,9 +42,7 @@ <h1 id="purpose">Purpose</h1>
 </ul>
 <p>All embedded software utilities come with a full set of examples.</p>
 <p>The STM32Cube firmware solution offers a straightforward API with a modular architecture, making it simple to fine tune custom applications and scalable to fit most requirements.</p>
-<figure>
-<img src="_htmresc/STM32Cube.bmp" alt="STM32Cube" /><figcaption>STM32Cube</figcaption>
-</figure>
+<p><img src="_htmresc/STM32Cube_2020.bmp" /></p>
 <p>The HAL (Hardware Abstraction Layer) &amp; LL (Low Layers) drivers provided within this package supports the following STM32WLxx product:</p>
 <ul>
 <li>STM32WL55xx</li>
@@ -62,6 +58,7 @@ <h1 id="purpose">Purpose</h1>
 <li><a href="https://www.st.com/resource/en/user_manual/DM00660673.pdf">UM2642</a> : Description of STM32WL HAL and low-layer drivers.</li>
 <li><a href="https://www.st.com/resource/en/application_note/DM00660670.pdf">AN5409</a> : STM32Cube MCU Package examples for STM32WL Series.</li>
 <li><a href="https://www.st.com/resource/en/application_note/DM00660451.pdf">AN5406</a> : How to build a LoRa® application with STM32CubeWL.</li>
+<li><a href="https://www.st.com/resource/en/application_note/DM00699239.pdf">AN5481</a> : LoRaWAN® AT commands for STM32CubeWL</li>
 <li><a href="https://www.st.com/resource/en/application_note/DM00699238.pdf">AN5480</a> : How to build a Sigfox™ application with STM32CubeWL.</li>
 <li><a href="https://www.st.com/resource/en/user_manual/DM00731353.pdf">UM2767</a> : Getting started with the SBSFU of STM32CubeWL.</li>
 <li><a href="https://www.st.com/resource/en/application_note/DM00732711.pdf">AN5556</a> : Getting started with STM32WL dual core using IAR™ and Keil®.</li>
@@ -72,15 +69,57 @@ <h1 id="purpose">Purpose</h1>
 <div class="col-sm-12 col-lg-8">
 <h1 id="update-history">Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section1" checked aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<input type="checkbox" id="collapse-section2" checked aria-hidden="true"> <label for="collapse-section2" aria-hidden="true"><strong>V1.1.0 / 16-June-2021</strong></label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
-<p><strong>First Official Release</strong></p>
+<h3 id="maintenance-release-of-stm32cubewl-mcu-package">Maintenance release of <strong>STM32CubeWL</strong> MCU package</h3>
 <p>In the STM32CubeWL MCU Package, examples and applications projects are generated with the STM32CubeMX tool to initialize the system, peripherals and middleware stacks. User can open the provided ioc file in STM32CubeMX to modify the settings, add additional peripherals and/or middleware, to build his final application.</p>
 <h2 id="contents">Contents</h2>
 <ul>
+<li><strong>CMSIS Device</strong> updates
+<ul>
+<li>Update CMSIS device to include latest corrections</li>
+<li>Refer to <a href="Drivers/CMSIS/Device/ST/STM32WLxx/Release_Notes.html">release notes</a> for further details</li>
+</ul></li>
+<li><strong>HAL/LL Drivers</strong> updates
+<ul>
+<li>Update HAL/LL drivers to include latest corrections
+<ul>
+<li>Update of ADC, COMP, CORTEX, CRYP, EXTI, GPIO, HSEM, I2C, IRDA, IWDG, LPUART, LPTIM, PWR, RCC, RNG, RTC, SMARTCARD, SMBUS, SPI, SUBGHZ, TIM, UART, USART drivers</li>
+<li>Update of HAL SMBUS driver to introduce fast mode and fast mode plus
+<ul>
+<li>New extension files: stm32wlxx_hal_smbus_ex.h/.c for new APIs</li>
+</ul></li>
+</ul></li>
+<li>Refer to <a href="Drivers/STM32WLxx_HAL_Driver/Release_Notes.html">release notes</a> for further details</li>
+</ul></li>
+<li><strong>Middlewares</strong> updates
+<ul>
+<li>Update Security middlewares to include latest corrections and evolutions
+<ul>
+<li>Refer to Key Management Services <a href="Middlewares/ST/STM32_Key_Management_Services/Release_Notes.html">release notes</a> and Secure Engine <a href="Middlewares/ST/STM32_Secure_Engine/Release_Notes.html">release notes</a> for further details</li>
+</ul></li>
+<li>Update RF middlewares to include latest corrections and evolutions
+<ul>
+<li>Refer to LoRaWAN <a href="Middlewares/Third_Party/LoRaWAN/st_readme.txt">ST release notes</a> and Sigfox <a href="Middlewares/Third_Party/Sigfox/Release_notes.html">release notes</a> for further details</li>
+</ul></li>
+</ul></li>
+<li><strong>Utilities</strong> updates
+<ul>
+<li>Update on adv_trace to include latest corrections
+<ul>
+<li>Refer to <a href="Utilities/trace/adv_trace/Release_Notes.html">release notes</a> for further details</li>
+</ul></li>
+</ul></li>
 <li><strong>Projects</strong> updates
 <ul>
+<li>Update of FW projects following changes in latest version of HAL/LL and Middlewares</li>
+<li>New BFU application in 2 Slot configuration (1 download slot associated to 1 execution slot)</li>
+<li>New SBSFU application in 1 slot configuration (new image is written directly into the execution slot)</li>
+<li>New LoRaWAN_FUOTA_DualCore STM32CubeIDE project</li>
+<li>New LoRaWAN_FUOTA Single Core project</li>
+<li>New RF Secure projects: LoRaWAN_SBSFU_1_Slot_DualCore and Sigfox_SBSFU_1_Slot_DualCore</li>
+<li>New SubGHz_Phy_Per Project. Optionally featuring long packet mode (FSK payload &gt; 255 bytes) on stm32wl revision Y</li>
 <li>The STM32CubeWL Firmware package comes with a rich set of examples running on STMicroelectronics boards, organized by board and provided with preconfigured projects for the main supported toolchains.</li>
 <li>The exhaustive list of projects is provided in this table (<a href="Projects/STM32CubeProjectsList.html">STM32CubeProjectsList.html</a>).</li>
 <li>The STM32CubeWL Firmware offers full scope of Examples &amp; Applications targeted, developed using STM32CubeMx &amp; ported on 3 toolchains</li>
@@ -91,15 +130,13 @@ <h2 id="contents">Contents</h2>
 <tr class="header">
 <th>Name</th>
 <th>Version</th>
-<th style="text-align: left;">License</th>
 <th style="text-align: left;">Release notes</th>
 </tr>
 </thead>
 <tbody>
 <tr class="odd">
 <td>Projects</td>
-<td>V1.0.0</td>
-<td style="text-align: left;">see Projects Release note for details</td>
+<td>V1.1.0 <span class="icon-st-update"></span></td>
 <td style="text-align: left;"><a href="Projects/Release_Notes.html">release notes</a></td>
 </tr>
 </tbody>
@@ -112,7 +149,6 @@ <h2 id="components">Components</h2>
 <tr class="header">
 <th style="text-align: left;">Name</th>
 <th>Version</th>
-<th>License</th>
 <th>Release note</th>
 </tr>
 </thead>
@@ -120,25 +156,236 @@ <h2 id="components">Components</h2>
 <tr class="odd">
 <td style="text-align: left;">Cortex-M CMSIS</td>
 <td>V5.6.0_cm4</td>
-<td><a href="https://opensource.org/licenses/Apache-2.0">Apache-2.0</a></td>
+<td><a href="Drivers/CMSIS/README.md">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">STM32WL CMSIS</td>
+<td>V1.1.0 <span class="icon-st-update"></span></td>
+<td><a href="Drivers/CMSIS/Device/ST/STM32WLxx/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">STM32WLxx_HAL_Driver</td>
+<td>V1.1.0 <span class="icon-st-update"></span></td>
+<td><a href="Drivers/STM32WLxx_HAL_Driver/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">STM32WLxx_Nucleo</td>
+<td>V1.1.0 <span class="icon-st-update"></span></td>
+<td><a href="Drivers/BSP/STM32WLxx_Nucleo/Release_Notes.html">release notes</a></td>
+</tr>
+</tbody>
+</table>
+<p><strong>Middlewares</strong></p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Name</th>
+<th style="text-align: left;">Version</th>
+<th>Release note</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">FatFS</td>
+<td style="text-align: left;">R0.12c</td>
+<td><a href="Middlewares/Third_Party/FatFs/doc/updates.txt">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;"></td>
+<td style="text-align: left;">ST modified 20191011</td>
+<td><a href="Middlewares/Third_Party/FatFs/src/st_readme.txt">ST release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">FreeRTOS</td>
+<td style="text-align: left;">v10.2.1</td>
+<td><a href="Middlewares/Third_Party/FreeRTOS/Source/readme.txt">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;"></td>
+<td style="text-align: left;">ST modified 20200117</td>
+<td><a href="Middlewares/Third_Party/FreeRTOS/Source/st_readme.txt">ST release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">LoRaWAN</td>
+<td style="text-align: left;">V4.4.7 <span class="icon-st-update"></span></td>
+<td><a href="Middlewares/Third_Party/LoRaWAN/readme.md">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;"></td>
+<td style="text-align: left;">V2.3.0 <span class="icon-st-update"></span></td>
+<td><a href="Middlewares/Third_Party/LoRaWAN/st_readme.txt">ST release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">SubGHz_Phy</td>
+<td style="text-align: left;">V1.1.0 <span class="icon-st-update"></span></td>
+<td><a href="Middlewares/Third_Party/SubGHz_Phy/Release_notes.html">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">Sigfox</td>
+<td style="text-align: left;">V1.7.0 <span class="icon-st-update"></span></td>
+<td><a href="Middlewares/Third_Party/Sigfox/Release_notes.html">release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">STM32_Key_Management_Services</td>
+<td style="text-align: left;">v1.1.6 <span class="icon-st-update"></span></td>
+<td><a href="Middlewares/ST/STM32_Key_Management_Services/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">STM32_Secure_Engine</td>
+<td style="text-align: left;">v2.5.0 <span class="icon-st-update"></span></td>
+<td><a href="Middlewares/ST/STM32_Secure_Engine/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">mbed-crypto</td>
+<td style="text-align: left;">V1.1.0</td>
+<td><a href="Middlewares/Third_Party/mbed-crypto/README.md">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;"></td>
+<td style="text-align: left;">ST modified 20191107</td>
+<td><a href="Middlewares/Third_Party/mbed-crypto/st_readme.txt">ST release notes</a></td>
+</tr>
+</tbody>
+</table>
+<p><strong>Utilities</strong></p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Name</th>
+<th style="text-align: left;">Version</th>
+<th>Release note</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">conf</td>
+<td style="text-align: left;">V1.4.1</td>
+<td><a href="Utilities/conf/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">lcd</td>
+<td style="text-align: left;">V2.0.1</td>
+<td><a href="Utilities/lcd/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">Fonts</td>
+<td style="text-align: left;">V2.0.1</td>
+<td><a href="Utilities/Fonts/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">tiny_lpm</td>
+<td style="text-align: left;">V1.3.1</td>
+<td><a href="Utilities/lpm/tiny_lpm/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">sequencer</td>
+<td style="text-align: left;">V1.5.1</td>
+<td><a href="Utilities/sequencer/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">adv_trace</td>
+<td style="text-align: left;">V1.2.0 <span class="icon-st-update"></span></td>
+<td><a href="Utilities/trace/adv_trace/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">timer</td>
+<td style="text-align: left;">V1.1.2</td>
+<td><a href="Utilities/timer/Release_Notes.html">release notes</a></td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">misc</td>
+<td style="text-align: left;">V1.0.2 <span class="icon-st-update"></span></td>
+<td><a href="Utilities/misc/Release_Notes.html">release notes</a></td>
+</tr>
+</tbody>
+</table>
+<h2 id="known-limitations">Known Limitations</h2>
+<ul>
+<li>Projects: Few projects not available at CubeMx format (with .ioc) as not eligible (due to CubeMx limitations)</li>
+</ul>
+<h2 id="development-toolchains-and-compilers">Development Toolchains and Compilers</h2>
+<ul>
+<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.30.1 + <a href="./Utilities/PC_Software/EWARMv8_STM32WLxx_Support_V4.7.zip">Patch EWARM</a> + ST-Link</li>
+<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.31 + ST-Link
+<ul>
+<li>Support of ARM Compiler 6 (AC-5 like warnings) for HAL/LL/BSP drivers and STMicroelectronics Middleware components</li>
+</ul></li>
+<li>STM32CubeIDE 1.7.0 + ST-Link</li>
+</ul>
+<h2 id="supported-devices-and-boards">Supported Devices and Boards</h2>
+<ul>
+<li>STM32WLE5xx, STM32WLE4xx, STM32WL54xx &amp; STM32WL55xx devices</li>
+<li>NUCLEO-WL55JC1 &amp; NUCLEO-WL55JC2 (except Sigfox applications) ecosystem boards - Nucleo kit RevC (MB1389-HIGHBAND-E02 or MB1389-LOWBAND-E02)</li>
+</ul>
+<h2 id="backward-compatibility">Backward Compatibility</h2>
+<p>Not applicable</p>
+<h2 id="dependencies">Dependencies</h2>
+<ul>
+<li>STM32CubeMX 6.3.0</li>
+</ul>
+</div>
+</div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true"><strong>V1.0.0 / 28-October-2020</strong></label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<p><strong>First Official Release</strong></p>
+<p>In the STM32CubeWL MCU Package, examples and applications projects are generated with the STM32CubeMX tool to initialize the system, peripherals and middleware stacks. User can open the provided ioc file in STM32CubeMX to modify the settings, add additional peripherals and/or middleware, to build his final application.</p>
+<h2 id="contents-1">Contents</h2>
+<ul>
+<li><strong>Projects</strong> updates
+<ul>
+<li>The STM32CubeWL Firmware package comes with a rich set of examples running on STMicroelectronics boards, organized by board and provided with preconfigured projects for the main supported toolchains.</li>
+<li>The exhaustive list of projects is provided in this table (<a href="Projects/STM32CubeProjectsList.html">STM32CubeProjectsList.html</a>).</li>
+<li>The STM32CubeWL Firmware offers full scope of Examples &amp; Applications targeted, developed using STM32CubeMx &amp; ported on 3 toolchains</li>
+</ul></li>
+</ul>
+<table>
+<thead>
+<tr class="header">
+<th>Name</th>
+<th>Version</th>
+<th style="text-align: left;">Release notes</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>Projects</td>
+<td>V1.0.0</td>
+<td style="text-align: left;"><a href="Projects/Release_Notes.html">release notes</a></td>
+</tr>
+</tbody>
+</table>
+<h2 id="components-1">Components</h2>
+<p><small>The components flagged by “<span class="icon-st-update"></span>” have changed since the previous release. “<span class="icon-st-add"></span>” are new.</small></p>
+<p><strong>Drivers</strong></p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Name</th>
+<th>Version</th>
+<th>Release note</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">Cortex-M CMSIS</td>
+<td>V5.6.0_cm4</td>
 <td><a href="Drivers/CMSIS/README.md">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">STM32WL CMSIS</td>
 <td>V1.0.0</td>
-<td><a href="https://opensource.org/licenses/Apache-2.0">Apache-2.0</a></td>
 <td><a href="Drivers/CMSIS/Device/ST/STM32WLxx/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">STM32WLxx_HAL_Driver</td>
 <td>V1.0.0</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Drivers/STM32WLxx_HAL_Driver/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">STM32WLxx_Nucleo</td>
 <td>V1.0.0</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Drivers/BSP/STM32WLxx_Nucleo/Release_Notes.html">release notes</a></td>
 </tr>
 </tbody>
@@ -149,7 +396,6 @@ <h2 id="components">Components</h2>
 <tr class="header">
 <th style="text-align: left;">Name</th>
 <th style="text-align: left;">Version</th>
-<th>License</th>
 <th>Release note</th>
 </tr>
 </thead>
@@ -157,73 +403,61 @@ <h2 id="components">Components</h2>
 <tr class="odd">
 <td style="text-align: left;">FatFS</td>
 <td style="text-align: left;">R0.12c</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Middlewares/Third_Party/FatFs/doc/updates.txt">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;"></td>
 <td style="text-align: left;">ST modified 20191011</td>
-<td></td>
 <td><a href="Middlewares/Third_Party/FatFs/src/st_readme.txt">ST release notes</a></td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">FreeRTOS</td>
 <td style="text-align: left;">V10.2.1</td>
-<td><a href="https://opensource.org/licenses/MIT">MIT-License</a></td>
 <td><a href="Middlewares/Third_Party/FreeRTOS/Source/readme.txt">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;"></td>
 <td style="text-align: left;">ST modified 20200117</td>
-<td></td>
 <td><a href="Middlewares/Third_Party/FreeRTOS/Source/st_readme.txt">ST release notes</a></td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">LoRaWAN</td>
 <td style="text-align: left;">V4.4.4</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Middlewares/Third_Party/LoRaWAN/readme.md">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;"></td>
 <td style="text-align: left;">V2.2.1</td>
-<td></td>
-<td><a href="Middlewares/Third_Party/LoRaWAN/st_readme.txt">ST release notes</a></td>
+<td>ST release notes](Middlewares/Third_Party/LoRaWAN/st_readme.txt)</td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">SubGHz_Phy</td>
 <td style="text-align: left;">V1.0.0</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Middlewares/Third_Party/SubGHz_Phy/Release_notes.html">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">Sigfox</td>
 <td style="text-align: left;">V1.6.1</td>
-<td><a href="http://www.st.com/SLA0044">SLA0044</a> - <a href="Middlewares/Third_Party/Sigfox/License_Sigfox_library_to_ST_Customers_legal.txt">Sigfox Specific Terms</a></td>
 <td><a href="Middlewares/Third_Party/Sigfox/Release_notes.html">release notes</a></td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">STM32_Key_Management_Services</td>
 <td style="text-align: left;">v1.1.5</td>
-<td><a href="http://www.st.com/SLA0044">SLA0044</a></td>
 <td><a href="Middlewares/ST/STM32_Key_Management_Services/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">STM32_Secure_Engine</td>
 <td style="text-align: left;">v2.4.1</td>
-<td><a href="http://www.st.com/SLA0044">SLA0044</a></td>
 <td><a href="Middlewares/ST/STM32_Secure_Engine/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">mbed-crypto</td>
 <td style="text-align: left;">V1.1.0</td>
-<td><a href="https://opensource.org/licenses/Apache-2.0">Apache-2.0</a></td>
 <td><a href="Middlewares/Third_Party/mbed-crypto/README.md">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;"></td>
 <td style="text-align: left;">ST modified 20191107</td>
-<td></td>
 <td><a href="Middlewares/Third_Party/mbed-crypto/st_readme.txt">ST release notes</a></td>
 </tr>
 </tbody>
@@ -234,7 +468,6 @@ <h2 id="components">Components</h2>
 <tr class="header">
 <th style="text-align: left;">Name</th>
 <th style="text-align: left;">Version</th>
-<th>License</th>
 <th>Release note</th>
 </tr>
 </thead>
@@ -242,72 +475,64 @@ <h2 id="components">Components</h2>
 <tr class="odd">
 <td style="text-align: left;">conf</td>
 <td style="text-align: left;">V1.4.1</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Utilities/conf/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">lcd</td>
 <td style="text-align: left;">V2.0.1</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Utilities/lcd/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">Fonts</td>
 <td style="text-align: left;">V2.0.1</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Utilities/Fonts/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">tiny_lpm</td>
 <td style="text-align: left;">V1.3.1</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Utilities/lpm/tiny_lpm/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">sequencer</td>
 <td style="text-align: left;">V1.5.1</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Utilities/sequencer/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">adv_trace</td>
 <td style="text-align: left;">V1.0.5</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Utilities/trace/adv_trace/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="odd">
 <td style="text-align: left;">timer</td>
 <td style="text-align: left;">V1.1.2</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Utilities/timer/Release_Notes.html">release notes</a></td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">misc</td>
 <td style="text-align: left;">V1.0.0</td>
-<td><a href="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a></td>
 <td><a href="Utilities/misc/Release_Notes.html">release notes</a></td>
 </tr>
 </tbody>
 </table>
-<h2 id="known-limitations">Known Limitations</h2>
+<h2 id="known-limitations-1">Known Limitations</h2>
 <ul>
 <li>Projects: Few projects not available at CubeMx format (with .ioc) as not eligible (due to CubeMx limitations)</li>
 <li>Projects: LoRaWAN_FUOTA application not ported on CubeIDE</li>
 </ul>
-<h2 id="development-toolchains-and-compilers">Development Toolchains and Compilers</h2>
+<h2 id="development-toolchains-and-compilers-1">Development Toolchains and Compilers</h2>
 <ul>
 <li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.30.1 + <a href="./Utilities/PC_Software/EWARMv8_STM32WLxx_V4.6.zip">Patch EWARM</a> + ST-Link</li>
 <li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.28 + <a href="./Utilities/PC_Software/Keil.STM32WLxx_DFP.1.0.7.zip">Patch MDK-ARM</a> + ST-Link</li>
 <li>STM32CubeIDE 1.5.0 + ST-Link</li>
 </ul>
-<h2 id="supported-devices-and-boards">Supported Devices and Boards</h2>
+<h2 id="supported-devices-and-boards-1">Supported Devices and Boards</h2>
 <ul>
 <li>STM32WLE5xx, STM32WLE4xx, STM32WL54xx &amp; STM32WL55xx devices</li>
 <li>NUCLEO-WL55JC1 &amp; NUCLEO-WL55JC2 (except Sigfox applications) ecosystem boards - Nucleo kit RevC (MB1389-HIGHBAND-C01 or MB1389-LOWBAND-C01)</li>
 </ul>
-<h2 id="backward-compatibility">Backward Compatibility</h2>
+<h2 id="backward-compatibility-1">Backward Compatibility</h2>
 <p>Not applicable</p>
-<h2 id="dependencies">Dependencies</h2>
+<h2 id="dependencies-1">Dependencies</h2>
 <ul>
 <li>STM32CubeMX 6.1.0</li>
 </ul>
diff --git a/Utilities/PC_Software/EWARMv8_STM32WLxx_Support_V4.7.zip b/Utilities/PC_Software/EWARMv8_STM32WLxx_Support_V4.7.zip
new file mode 100644
index 00000000..bf01d34d
Binary files /dev/null and b/Utilities/PC_Software/EWARMv8_STM32WLxx_Support_V4.7.zip differ
diff --git a/Utilities/PC_Software/EWARMv8_STM32WLxx_V4.6.zip b/Utilities/PC_Software/EWARMv8_STM32WLxx_V4.6.zip
deleted file mode 100644
index 5d8f0c22..00000000
Binary files a/Utilities/PC_Software/EWARMv8_STM32WLxx_V4.6.zip and /dev/null differ
diff --git a/Utilities/PC_Software/Keil.STM32WLxx_DFP.1.0.7.zip b/Utilities/PC_Software/Keil.STM32WLxx_DFP.1.0.7.zip
deleted file mode 100644
index 727fba0d..00000000
Binary files a/Utilities/PC_Software/Keil.STM32WLxx_DFP.1.0.7.zip and /dev/null differ
diff --git a/Utilities/misc/Release_notes.html b/Utilities/misc/Release_notes.html
index 657398d2..d034f6b0 100644
--- a/Utilities/misc/Release_notes.html
+++ b/Utilities/misc/Release_notes.html
@@ -5,59 +5,45 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Release Notes for STM32 miscellaneous utilities</title>
-  <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
+  <style>
+    code{white-space: pre-wrap;}
+    span.smallcaps{font-variant: small-caps;}
+    span.underline{text-decoration: underline;}
+    div.column{display: inline-block; vertical-align: top; width: 50%;}
+    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+    ul.task-list{list-style: none;}
+    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
   </style>
-  <link rel="stylesheet" href="_htmresc/mini-st.css" />
+  <link rel="stylesheet" href="_htmresc/mini-st_2020.css" />
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
+  <link rel="icon" type="image/x-icon" href="_htmresc/favicon.png" />
 </head>
 <body>
 <div class="row">
 <div class="col-sm-12 col-lg-4">
-<div class="card fluid">
-<div class="sectione dark">
 <center>
-<h1 id="release-notes-for-stm32-miscellaneous-utilities"><small>Release Notes for</small> STM32 miscellaneous utilities</h1>
-<p>Copyright © 2020 STMicroelectronics<br />
+<h1 id="release-notes-for-stm32-miscellaneous-utilities">Release Notes for <mark>STM32 miscellaneous utilities</mark></h1>
+<p>Copyright © 2021 STMicroelectronics<br />
 </p>
-<a href="https://www.st.com" class="logo"><img src="./_htmresc/st_logo.png" alt="ST logo" /></a>
+<a href="https://www.st.com" class="logo"><img src="./_htmresc/st_logo_2020.png" alt="ST logo" /></a>
 </center>
-</div>
-</div>
 <h1 id="license">License</h1>
 <p>This software component is licensed by ST under BSD 3-Clause license, the “License”; You may not use this file except in compliance with the License. You may obtain a copy of the License at:</p>
 <p><a href="https://opensource.org/licenses/BSD-3-Clause">https://opensource.org/licenses/BSD-3-Clause</a></p>
 <h1 id="purpose">Purpose</h1>
 <p>The source code delivered is a utility to help managing miscellaneous utilities within an embedded application: memory, system time and vsnprintf.</p>
 </div>
-<div class="col-sm-12 col-lg-8">
-<h1 id="update-history">Update History</h1>
+<section id="update-history" class="col-sm-12 col-lg-8">
+<h1>Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section1" checked aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0 / 17-Sept-2020</label>
+<input type="checkbox" id="collapse-section3" checked aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.0.2 / 2-Mar-2021</label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
-<h3 id="release-v1.0.0">release V1.0.0</h3>
+<h3 id="release-v1.0.2">release V1.0.2</h3>
 <h2 id="contents">Contents</h2>
-<table>
-<thead>
-<tr class="header">
-<th>Headline</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>First release</td>
-</tr>
-<tr class="even">
-<td></td>
-</tr>
-</tbody>
-</table>
+<p>Update release note format</p>
 <h2 id="known-limitations">known limitations</h2>
 <h2 id="development-toolchains-and-compilers">Development Toolchains and Compilers</h2>
 <h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
@@ -65,9 +51,36 @@ <h2 id="backward-compatibility">backward compatibility</h2>
 <h2 id="dependencies">Dependencies</h2>
 </div>
 </div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.0.1 / 12-Jan-2021</label>
+<div>
+<h2 id="main-changes-1">Main Changes</h2>
+<h3 id="release-v1.0.1">release V1.0.1</h3>
+<h2 id="contents-1">Contents</h2>
+<p>add empty line at the end of stm32_mem.h</p>
+<h2 id="known-limitations-1">known limitations</h2>
+<h2 id="development-toolchains-and-compilers-1">Development Toolchains and Compilers</h2>
+<h2 id="supported-devices-and-boards-1">Supported Devices and boards</h2>
+<h2 id="backward-compatibility-1">backward compatibility</h2>
+<h2 id="dependencies-1">Dependencies</h2>
+</div>
+</div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0 / 17-Sept-2020</label>
+<div>
+<h2 id="main-changes-2">Main Changes</h2>
+<h3 id="release-v1.0.0">release V1.0.0</h3>
+<h2 id="contents-2">Contents</h2>
+<p>First release</p>
+<h2 id="known-limitations-2">known limitations</h2>
+<h2 id="development-toolchains-and-compilers-2">Development Toolchains and Compilers</h2>
+<h2 id="supported-devices-and-boards-2">Supported Devices and boards</h2>
+<h2 id="backward-compatibility-2">backward compatibility</h2>
+<h2 id="dependencies-2">Dependencies</h2>
+</div>
 </div>
+</section>
 </div>
-<p>:::</p>
 <footer class="sticky">
 <p>For complete documentation on STM32,visit: [<a href="http://www.st.com">www.st.com/stm32</a>]</p>
 This release note uses up to date web standards and, for this reason, should not be opened with Internet Explorer but preferably with popular browsers such as Google Chrome, Mozilla Firefox, Opera or Microsoft Edge.
diff --git a/Utilities/misc/_htmresc/favicon.png b/Utilities/misc/_htmresc/favicon.png
new file mode 100644
index 00000000..06713eec
Binary files /dev/null and b/Utilities/misc/_htmresc/favicon.png differ
diff --git a/Utilities/misc/_htmresc/mini-st_2020.css b/Utilities/misc/_htmresc/mini-st_2020.css
new file mode 100644
index 00000000..986f4d42
--- /dev/null
+++ b/Utilities/misc/_htmresc/mini-st_2020.css
@@ -0,0 +1,1711 @@
+@charset "UTF-8";
+/*
+  Flavor name: Custom (mini-custom)
+  Generated online - https://minicss.org/flavors
+  mini.css version: v3.0.1
+*/
+/*
+  Browsers resets and base typography.
+*/
+/* Core module CSS variable definitions */
+:root {
+  --fore-color: #03234b;
+  --secondary-fore-color: #03234b;
+  --back-color: #ffffff;
+  --secondary-back-color: #ffffff;
+  --blockquote-color: #e6007e;
+  --pre-color: #e6007e;
+  --border-color: #3cb4e6;
+  --secondary-border-color: #3cb4e6;
+  --heading-ratio: 1.2;
+  --universal-margin: 0.5rem;
+  --universal-padding: 0.25rem;
+  --universal-border-radius: 0.075rem;
+  --background-margin: 1.5%;
+  --a-link-color: #3cb4e6;
+  --a-visited-color: #8c0078; }
+
+html {
+  font-size: 13.5px; }
+
+a, b, del, em, i, ins, q, span, strong, u {
+  font-size: 1em; }
+
+html, * {
+  font-family: -apple-system, BlinkMacSystemFont, Helvetica, arial, sans-serif;
+  line-height: 1.25;
+  -webkit-text-size-adjust: 100%; }
+
+* {
+  font-size: 1rem; }
+
+body {
+  margin: 0;
+  color: var(--fore-color);
+  @background: var(--back-color);
+  background: var(--back-color) linear-gradient(#ffd200, #ffd200) repeat-y left top;
+  background-size: var(--background-margin);
+  }
+
+details {
+  display: block; }
+
+summary {
+  display: list-item; }
+
+abbr[title] {
+  border-bottom: none;
+  text-decoration: underline dotted; }
+
+input {
+  overflow: visible; }
+
+img {
+  max-width: 100%;
+  height: auto; }
+
+h1, h2, h3, h4, h5, h6 {
+  line-height: 1.25;
+  margin: calc(1.5 * var(--universal-margin)) var(--universal-margin);
+  font-weight: 400; }
+  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
+    color: var(--secondary-fore-color);
+    display: block;
+    margin-top: -0.25rem; }
+
+h1 {
+  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) * var(--heading-ratio)); }
+
+h2 {
+  font-size: calc(1rem * var(--heading-ratio) * var(--heading-ratio) );
+  border-style: none none solid none ; 
+  border-width: thin;
+  border-color: var(--border-color); }
+h3 {
+  font-size: calc(1rem * var(--heading-ratio) ); }
+
+h4 {
+  font-size: calc(1rem * var(--heading-ratio)); }
+
+h5 {
+  font-size: 1rem; }
+
+h6 {
+  font-size: calc(1rem / var(--heading-ratio)); }
+
+p {
+  margin: var(--universal-margin); }
+
+ol, ul {
+  margin: var(--universal-margin);
+  padding-left: calc(3 * var(--universal-margin)); }
+
+b, strong {
+  font-weight: 700; }
+
+hr {
+  box-sizing: content-box;
+  border: 0;
+  line-height: 1.25em;
+  margin: var(--universal-margin);
+  height: 0.0714285714rem;
+  background: linear-gradient(to right, transparent, var(--border-color) 20%, var(--border-color) 80%, transparent); }
+
+blockquote {
+  display: block;
+  position: relative;
+  font-style: italic;
+  color: var(--secondary-fore-color);
+  margin: var(--universal-margin);
+  padding: calc(3 * var(--universal-padding));
+  border: 0.0714285714rem solid var(--secondary-border-color);
+  border-left: 0.3rem solid var(--blockquote-color);
+  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
+  blockquote:before {
+    position: absolute;
+    top: calc(0rem - var(--universal-padding));
+    left: 0;
+    font-family: sans-serif;
+    font-size: 2rem;
+    font-weight: 800;
+    content: "\201c";
+    color: var(--blockquote-color); }
+  blockquote[cite]:after {
+    font-style: normal;
+    font-size: 0.75em;
+    font-weight: 700;
+    content: "\a—  " attr(cite);
+    white-space: pre; }
+
+code, kbd, pre, samp {
+  font-family: Menlo, Consolas, monospace;
+  font-size: 0.85em; }
+
+code {
+  background: var(--secondary-back-color);
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
+
+kbd {
+  background: var(--fore-color);
+  color: var(--back-color);
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) calc(var(--universal-padding) / 2); }
+
+pre {
+  overflow: auto;
+  background: var(--secondary-back-color);
+  padding: calc(1.5 * var(--universal-padding));
+  margin: var(--universal-margin);
+  border: 0.0714285714rem solid var(--secondary-border-color);
+  border-left: 0.2857142857rem solid var(--pre-color);
+  border-radius: 0 var(--universal-border-radius) var(--universal-border-radius) 0; }
+
+sup, sub, code, kbd {
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline; }
+
+small, sup, sub, figcaption {
+  font-size: 0.75em; }
+
+sup {
+  top: -0.5em; }
+
+sub {
+  bottom: -0.25em; }
+
+figure {
+  margin: var(--universal-margin); }
+
+figcaption {
+  color: var(--secondary-fore-color); }
+
+a {
+  text-decoration: none; }
+  a:link {
+    color: var(--a-link-color); }
+  a:visited {
+    color: var(--a-visited-color); }
+  a:hover, a:focus {
+    text-decoration: underline; }
+
+/*
+  Definitions for the grid system, cards and containers.
+*/
+.container {
+  margin: 0 auto;
+  padding: 0 calc(1.5 * var(--universal-padding)); }
+
+.row {
+  box-sizing: border-box;
+  display: flex;
+  flex: 0 1 auto;
+  flex-flow: row wrap;
+  margin: 0 0 0 var(--background-margin); }
+
+.col-sm,
+[class^='col-sm-'],
+[class^='col-sm-offset-'],
+.row[class*='cols-sm-'] > * {
+  box-sizing: border-box;
+  flex: 0 0 auto;
+  padding: 0 calc(var(--universal-padding) / 2); }
+
+.col-sm,
+.row.cols-sm > * {
+  max-width: 100%;
+  flex-grow: 1;
+  flex-basis: 0; }
+
+.col-sm-1,
+.row.cols-sm-1 > * {
+  max-width: 8.3333333333%;
+  flex-basis: 8.3333333333%; }
+
+.col-sm-offset-0 {
+  margin-left: 0; }
+
+.col-sm-2,
+.row.cols-sm-2 > * {
+  max-width: 16.6666666667%;
+  flex-basis: 16.6666666667%; }
+
+.col-sm-offset-1 {
+  margin-left: 8.3333333333%; }
+
+.col-sm-3,
+.row.cols-sm-3 > * {
+  max-width: 25%;
+  flex-basis: 25%; }
+
+.col-sm-offset-2 {
+  margin-left: 16.6666666667%; }
+
+.col-sm-4,
+.row.cols-sm-4 > * {
+  max-width: 33.3333333333%;
+  flex-basis: 33.3333333333%; }
+
+.col-sm-offset-3 {
+  margin-left: 25%; }
+
+.col-sm-5,
+.row.cols-sm-5 > * {
+  max-width: 41.6666666667%;
+  flex-basis: 41.6666666667%; }
+
+.col-sm-offset-4 {
+  margin-left: 33.3333333333%; }
+
+.col-sm-6,
+.row.cols-sm-6 > * {
+  max-width: 50%;
+  flex-basis: 50%; }
+
+.col-sm-offset-5 {
+  margin-left: 41.6666666667%; }
+
+.col-sm-7,
+.row.cols-sm-7 > * {
+  max-width: 58.3333333333%;
+  flex-basis: 58.3333333333%; }
+
+.col-sm-offset-6 {
+  margin-left: 50%; }
+
+.col-sm-8,
+.row.cols-sm-8 > * {
+  max-width: 66.6666666667%;
+  flex-basis: 66.6666666667%; }
+
+.col-sm-offset-7 {
+  margin-left: 58.3333333333%; }
+
+.col-sm-9,
+.row.cols-sm-9 > * {
+  max-width: 75%;
+  flex-basis: 75%; }
+
+.col-sm-offset-8 {
+  margin-left: 66.6666666667%; }
+
+.col-sm-10,
+.row.cols-sm-10 > * {
+  max-width: 83.3333333333%;
+  flex-basis: 83.3333333333%; }
+
+.col-sm-offset-9 {
+  margin-left: 75%; }
+
+.col-sm-11,
+.row.cols-sm-11 > * {
+  max-width: 91.6666666667%;
+  flex-basis: 91.6666666667%; }
+
+.col-sm-offset-10 {
+  margin-left: 83.3333333333%; }
+
+.col-sm-12,
+.row.cols-sm-12 > * {
+  max-width: 100%;
+  flex-basis: 100%; }
+
+.col-sm-offset-11 {
+  margin-left: 91.6666666667%; }
+
+.col-sm-normal {
+  order: initial; }
+
+.col-sm-first {
+  order: -999; }
+
+.col-sm-last {
+  order: 999; }
+
+@media screen and (min-width: 500px) {
+  .col-md,
+  [class^='col-md-'],
+  [class^='col-md-offset-'],
+  .row[class*='cols-md-'] > * {
+    box-sizing: border-box;
+    flex: 0 0 auto;
+    padding: 0 calc(var(--universal-padding) / 2); }
+
+  .col-md,
+  .row.cols-md > * {
+    max-width: 100%;
+    flex-grow: 1;
+    flex-basis: 0; }
+
+  .col-md-1,
+  .row.cols-md-1 > * {
+    max-width: 8.3333333333%;
+    flex-basis: 8.3333333333%; }
+
+  .col-md-offset-0 {
+    margin-left: 0; }
+
+  .col-md-2,
+  .row.cols-md-2 > * {
+    max-width: 16.6666666667%;
+    flex-basis: 16.6666666667%; }
+
+  .col-md-offset-1 {
+    margin-left: 8.3333333333%; }
+
+  .col-md-3,
+  .row.cols-md-3 > * {
+    max-width: 25%;
+    flex-basis: 25%; }
+
+  .col-md-offset-2 {
+    margin-left: 16.6666666667%; }
+
+  .col-md-4,
+  .row.cols-md-4 > * {
+    max-width: 33.3333333333%;
+    flex-basis: 33.3333333333%; }
+
+  .col-md-offset-3 {
+    margin-left: 25%; }
+
+  .col-md-5,
+  .row.cols-md-5 > * {
+    max-width: 41.6666666667%;
+    flex-basis: 41.6666666667%; }
+
+  .col-md-offset-4 {
+    margin-left: 33.3333333333%; }
+
+  .col-md-6,
+  .row.cols-md-6 > * {
+    max-width: 50%;
+    flex-basis: 50%; }
+
+  .col-md-offset-5 {
+    margin-left: 41.6666666667%; }
+
+  .col-md-7,
+  .row.cols-md-7 > * {
+    max-width: 58.3333333333%;
+    flex-basis: 58.3333333333%; }
+
+  .col-md-offset-6 {
+    margin-left: 50%; }
+
+  .col-md-8,
+  .row.cols-md-8 > * {
+    max-width: 66.6666666667%;
+    flex-basis: 66.6666666667%; }
+
+  .col-md-offset-7 {
+    margin-left: 58.3333333333%; }
+
+  .col-md-9,
+  .row.cols-md-9 > * {
+    max-width: 75%;
+    flex-basis: 75%; }
+
+  .col-md-offset-8 {
+    margin-left: 66.6666666667%; }
+
+  .col-md-10,
+  .row.cols-md-10 > * {
+    max-width: 83.3333333333%;
+    flex-basis: 83.3333333333%; }
+
+  .col-md-offset-9 {
+    margin-left: 75%; }
+
+  .col-md-11,
+  .row.cols-md-11 > * {
+    max-width: 91.6666666667%;
+    flex-basis: 91.6666666667%; }
+
+  .col-md-offset-10 {
+    margin-left: 83.3333333333%; }
+
+  .col-md-12,
+  .row.cols-md-12 > * {
+    max-width: 100%;
+    flex-basis: 100%; }
+
+  .col-md-offset-11 {
+    margin-left: 91.6666666667%; }
+
+  .col-md-normal {
+    order: initial; }
+
+  .col-md-first {
+    order: -999; }
+
+  .col-md-last {
+    order: 999; } }
+@media screen and (min-width: 1280px) {
+  .col-lg,
+  [class^='col-lg-'],
+  [class^='col-lg-offset-'],
+  .row[class*='cols-lg-'] > * {
+    box-sizing: border-box;
+    flex: 0 0 auto;
+    padding: 0 calc(var(--universal-padding) / 2); }
+
+  .col-lg,
+  .row.cols-lg > * {
+    max-width: 100%;
+    flex-grow: 1;
+    flex-basis: 0; }
+
+  .col-lg-1,
+  .row.cols-lg-1 > * {
+    max-width: 8.3333333333%;
+    flex-basis: 8.3333333333%; }
+
+  .col-lg-offset-0 {
+    margin-left: 0; }
+
+  .col-lg-2,
+  .row.cols-lg-2 > * {
+    max-width: 16.6666666667%;
+    flex-basis: 16.6666666667%; }
+
+  .col-lg-offset-1 {
+    margin-left: 8.3333333333%; }
+
+  .col-lg-3,
+  .row.cols-lg-3 > * {
+    max-width: 25%;
+    flex-basis: 25%; }
+
+  .col-lg-offset-2 {
+    margin-left: 16.6666666667%; }
+
+  .col-lg-4,
+  .row.cols-lg-4 > * {
+    max-width: 33.3333333333%;
+    flex-basis: 33.3333333333%; }
+
+  .col-lg-offset-3 {
+    margin-left: 25%; }
+
+  .col-lg-5,
+  .row.cols-lg-5 > * {
+    max-width: 41.6666666667%;
+    flex-basis: 41.6666666667%; }
+
+  .col-lg-offset-4 {
+    margin-left: 33.3333333333%; }
+
+  .col-lg-6,
+  .row.cols-lg-6 > * {
+    max-width: 50%;
+    flex-basis: 50%; }
+
+  .col-lg-offset-5 {
+    margin-left: 41.6666666667%; }
+
+  .col-lg-7,
+  .row.cols-lg-7 > * {
+    max-width: 58.3333333333%;
+    flex-basis: 58.3333333333%; }
+
+  .col-lg-offset-6 {
+    margin-left: 50%; }
+
+  .col-lg-8,
+  .row.cols-lg-8 > * {
+    max-width: 66.6666666667%;
+    flex-basis: 66.6666666667%; }
+
+  .col-lg-offset-7 {
+    margin-left: 58.3333333333%; }
+
+  .col-lg-9,
+  .row.cols-lg-9 > * {
+    max-width: 75%;
+    flex-basis: 75%; }
+
+  .col-lg-offset-8 {
+    margin-left: 66.6666666667%; }
+
+  .col-lg-10,
+  .row.cols-lg-10 > * {
+    max-width: 83.3333333333%;
+    flex-basis: 83.3333333333%; }
+
+  .col-lg-offset-9 {
+    margin-left: 75%; }
+
+  .col-lg-11,
+  .row.cols-lg-11 > * {
+    max-width: 91.6666666667%;
+    flex-basis: 91.6666666667%; }
+
+  .col-lg-offset-10 {
+    margin-left: 83.3333333333%; }
+
+  .col-lg-12,
+  .row.cols-lg-12 > * {
+    max-width: 100%;
+    flex-basis: 100%; }
+
+  .col-lg-offset-11 {
+    margin-left: 91.6666666667%; }
+
+  .col-lg-normal {
+    order: initial; }
+
+  .col-lg-first {
+    order: -999; }
+
+  .col-lg-last {
+    order: 999; } }
+/* Card component CSS variable definitions */
+:root {
+  --card-back-color: #3cb4e6;
+  --card-fore-color: #03234b;
+  --card-border-color: #03234b; }
+
+.card {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-self: center;
+  position: relative;
+  width: 100%;
+  background: var(--card-back-color);
+  color: var(--card-fore-color);
+  border: 0.0714285714rem solid var(--card-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin);
+  overflow: hidden; }
+  @media screen and (min-width: 320px) {
+    .card {
+      max-width: 320px; } }
+  .card > .sectione {
+    background: var(--card-back-color);
+    color: var(--card-fore-color);
+    box-sizing: border-box;
+    margin: 0;
+    border: 0;
+    border-radius: 0;
+    border-bottom: 0.0714285714rem solid var(--card-border-color);
+    padding: var(--universal-padding);
+    width: 100%; }
+    .card > .sectione.media {
+      height: 200px;
+      padding: 0;
+      -o-object-fit: cover;
+      object-fit: cover; }
+  .card > .sectione:last-child {
+    border-bottom: 0; }
+
+/*
+  Custom elements for card elements.
+*/
+@media screen and (min-width: 240px) {
+  .card.small {
+    max-width: 240px; } }
+@media screen and (min-width: 480px) {
+  .card.large {
+    max-width: 480px; } }
+.card.fluid {
+  max-width: 100%;
+  width: auto; }
+
+.card.warning {
+  --card-back-color: #e5b8b7;
+  --card-fore-color: #3b234b;
+  --card-border-color: #8c0078; }
+
+.card.error {
+  --card-back-color: #464650;
+  --card-fore-color: #ffffff;
+  --card-border-color: #8c0078; }
+
+.card > .sectione.dark {
+  --card-back-color: #3b234b;
+  --card-fore-color: #ffffff; }
+
+.card > .sectione.double-padded {
+  padding: calc(1.5 * var(--universal-padding)); }
+
+/*
+  Definitions for forms and input elements.
+*/
+/* Input_control module CSS variable definitions */
+:root {
+  --form-back-color: #ffe97f;
+  --form-fore-color: #03234b;
+  --form-border-color: #3cb4e6;
+  --input-back-color: #ffffff;
+  --input-fore-color: #03234b;
+  --input-border-color: #3cb4e6;
+  --input-focus-color: #0288d1;
+  --input-invalid-color: #d32f2f;
+  --button-back-color: #e2e2e2;
+  --button-hover-back-color: #dcdcdc;
+  --button-fore-color: #212121;
+  --button-border-color: transparent;
+  --button-hover-border-color: transparent;
+  --button-group-border-color: rgba(124, 124, 124, 0.54); }
+
+form {
+  background: var(--form-back-color);
+  color: var(--form-fore-color);
+  border: 0.0714285714rem solid var(--form-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin);
+  padding: calc(2 * var(--universal-padding)) var(--universal-padding); }
+
+fieldset {
+  border: 0.0714285714rem solid var(--form-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: calc(var(--universal-margin) / 4);
+  padding: var(--universal-padding); }
+
+legend {
+  box-sizing: border-box;
+  display: table;
+  max-width: 100%;
+  white-space: normal;
+  font-weight: 500;
+  padding: calc(var(--universal-padding) / 2); }
+
+label {
+  padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
+
+.input-group {
+  display: inline-block; }
+  .input-group.fluid {
+    display: flex;
+    align-items: center;
+    justify-content: center; }
+    .input-group.fluid > input {
+      max-width: 100%;
+      flex-grow: 1;
+      flex-basis: 0px; }
+    @media screen and (max-width: 499px) {
+      .input-group.fluid {
+        align-items: stretch;
+        flex-direction: column; } }
+  .input-group.vertical {
+    display: flex;
+    align-items: stretch;
+    flex-direction: column; }
+    .input-group.vertical > input {
+      max-width: 100%;
+      flex-grow: 1;
+      flex-basis: 0px; }
+
+[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button {
+  height: auto; }
+
+[type="search"] {
+  -webkit-appearance: textfield;
+  outline-offset: -2px; }
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none; }
+
+input:not([type]), [type="text"], [type="email"], [type="number"], [type="search"],
+[type="password"], [type="url"], [type="tel"], [type="checkbox"], [type="radio"], textarea, select {
+  box-sizing: border-box;
+  background: var(--input-back-color);
+  color: var(--input-fore-color);
+  border: 0.0714285714rem solid var(--input-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: calc(var(--universal-margin) / 2);
+  padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
+
+input:not([type="button"]):not([type="submit"]):not([type="reset"]):hover, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus, textarea:hover, textarea:focus, select:hover, select:focus {
+  border-color: var(--input-focus-color);
+  box-shadow: none; }
+input:not([type="button"]):not([type="submit"]):not([type="reset"]):invalid, input:not([type="button"]):not([type="submit"]):not([type="reset"]):focus:invalid, textarea:invalid, textarea:focus:invalid, select:invalid, select:focus:invalid {
+  border-color: var(--input-invalid-color);
+  box-shadow: none; }
+input:not([type="button"]):not([type="submit"]):not([type="reset"])[readonly], textarea[readonly], select[readonly] {
+  background: var(--secondary-back-color); }
+
+select {
+  max-width: 100%; }
+
+option {
+  overflow: hidden;
+  text-overflow: ellipsis; }
+
+[type="checkbox"], [type="radio"] {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  position: relative;
+  height: calc(1rem + var(--universal-padding) / 2);
+  width: calc(1rem + var(--universal-padding) / 2);
+  vertical-align: text-bottom;
+  padding: 0;
+  flex-basis: calc(1rem + var(--universal-padding) / 2) !important;
+  flex-grow: 0 !important; }
+  [type="checkbox"]:checked:before, [type="radio"]:checked:before {
+    position: absolute; }
+
+[type="checkbox"]:checked:before {
+  content: '\2713';
+  font-family: sans-serif;
+  font-size: calc(1rem + var(--universal-padding) / 2);
+  top: calc(0rem - var(--universal-padding));
+  left: calc(var(--universal-padding) / 4); }
+
+[type="radio"] {
+  border-radius: 100%; }
+  [type="radio"]:checked:before {
+    border-radius: 100%;
+    content: '';
+    top: calc(0.0714285714rem + var(--universal-padding) / 2);
+    left: calc(0.0714285714rem + var(--universal-padding) / 2);
+    background: var(--input-fore-color);
+    width: 0.5rem;
+    height: 0.5rem; }
+
+:placeholder-shown {
+  color: var(--input-fore-color); }
+
+::-ms-placeholder {
+  color: var(--input-fore-color);
+  opacity: 0.54; }
+
+button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0; }
+
+button, html [type="button"], [type="reset"], [type="submit"] {
+  -webkit-appearance: button; }
+
+button {
+  overflow: visible;
+  text-transform: none; }
+
+button, [type="button"], [type="submit"], [type="reset"],
+a.button, label.button, .button,
+a[role="button"], label[role="button"], [role="button"] {
+  display: inline-block;
+  background: var(--button-back-color);
+  color: var(--button-fore-color);
+  border: 0.0714285714rem solid var(--button-border-color);
+  border-radius: var(--universal-border-radius);
+  padding: var(--universal-padding) calc(1.5 * var(--universal-padding));
+  margin: var(--universal-margin);
+  text-decoration: none;
+  cursor: pointer;
+  transition: background 0.3s; }
+  button:hover, button:focus, [type="button"]:hover, [type="button"]:focus, [type="submit"]:hover, [type="submit"]:focus, [type="reset"]:hover, [type="reset"]:focus,
+  a.button:hover,
+  a.button:focus, label.button:hover, label.button:focus, .button:hover, .button:focus,
+  a[role="button"]:hover,
+  a[role="button"]:focus, label[role="button"]:hover, label[role="button"]:focus, [role="button"]:hover, [role="button"]:focus {
+    background: var(--button-hover-back-color);
+    border-color: var(--button-hover-border-color); }
+
+input:disabled, input[disabled], textarea:disabled, textarea[disabled], select:disabled, select[disabled], button:disabled, button[disabled], .button:disabled, .button[disabled], [role="button"]:disabled, [role="button"][disabled] {
+  cursor: not-allowed;
+  opacity: 0.75; }
+
+.button-group {
+  display: flex;
+  border: 0.0714285714rem solid var(--button-group-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin); }
+  .button-group > button, .button-group [type="button"], .button-group > [type="submit"], .button-group > [type="reset"], .button-group > .button, .button-group > [role="button"] {
+    margin: 0;
+    max-width: 100%;
+    flex: 1 1 auto;
+    text-align: center;
+    border: 0;
+    border-radius: 0;
+    box-shadow: none; }
+  .button-group > :not(:first-child) {
+    border-left: 0.0714285714rem solid var(--button-group-border-color); }
+  @media screen and (max-width: 499px) {
+    .button-group {
+      flex-direction: column; }
+      .button-group > :not(:first-child) {
+        border: 0;
+        border-top: 0.0714285714rem solid var(--button-group-border-color); } }
+
+/*
+  Custom elements for forms and input elements.
+*/
+button.primary, [type="button"].primary, [type="submit"].primary, [type="reset"].primary, .button.primary, [role="button"].primary {
+  --button-back-color: #1976d2;
+  --button-fore-color: #f8f8f8; }
+  button.primary:hover, button.primary:focus, [type="button"].primary:hover, [type="button"].primary:focus, [type="submit"].primary:hover, [type="submit"].primary:focus, [type="reset"].primary:hover, [type="reset"].primary:focus, .button.primary:hover, .button.primary:focus, [role="button"].primary:hover, [role="button"].primary:focus {
+    --button-hover-back-color: #1565c0; }
+
+button.secondary, [type="button"].secondary, [type="submit"].secondary, [type="reset"].secondary, .button.secondary, [role="button"].secondary {
+  --button-back-color: #d32f2f;
+  --button-fore-color: #f8f8f8; }
+  button.secondary:hover, button.secondary:focus, [type="button"].secondary:hover, [type="button"].secondary:focus, [type="submit"].secondary:hover, [type="submit"].secondary:focus, [type="reset"].secondary:hover, [type="reset"].secondary:focus, .button.secondary:hover, .button.secondary:focus, [role="button"].secondary:hover, [role="button"].secondary:focus {
+    --button-hover-back-color: #c62828; }
+
+button.tertiary, [type="button"].tertiary, [type="submit"].tertiary, [type="reset"].tertiary, .button.tertiary, [role="button"].tertiary {
+  --button-back-color: #308732;
+  --button-fore-color: #f8f8f8; }
+  button.tertiary:hover, button.tertiary:focus, [type="button"].tertiary:hover, [type="button"].tertiary:focus, [type="submit"].tertiary:hover, [type="submit"].tertiary:focus, [type="reset"].tertiary:hover, [type="reset"].tertiary:focus, .button.tertiary:hover, .button.tertiary:focus, [role="button"].tertiary:hover, [role="button"].tertiary:focus {
+    --button-hover-back-color: #277529; }
+
+button.inverse, [type="button"].inverse, [type="submit"].inverse, [type="reset"].inverse, .button.inverse, [role="button"].inverse {
+  --button-back-color: #212121;
+  --button-fore-color: #f8f8f8; }
+  button.inverse:hover, button.inverse:focus, [type="button"].inverse:hover, [type="button"].inverse:focus, [type="submit"].inverse:hover, [type="submit"].inverse:focus, [type="reset"].inverse:hover, [type="reset"].inverse:focus, .button.inverse:hover, .button.inverse:focus, [role="button"].inverse:hover, [role="button"].inverse:focus {
+    --button-hover-back-color: #111; }
+
+button.small, [type="button"].small, [type="submit"].small, [type="reset"].small, .button.small, [role="button"].small {
+  padding: calc(0.5 * var(--universal-padding)) calc(0.75 * var(--universal-padding));
+  margin: var(--universal-margin); }
+
+button.large, [type="button"].large, [type="submit"].large, [type="reset"].large, .button.large, [role="button"].large {
+  padding: calc(1.5 * var(--universal-padding)) calc(2 * var(--universal-padding));
+  margin: var(--universal-margin); }
+
+/*
+  Definitions for navigation elements.
+*/
+/* Navigation module CSS variable definitions */
+:root {
+  --header-back-color: #03234b;
+  --header-hover-back-color: #ffd200;
+  --header-fore-color: #ffffff;
+  --header-border-color: #3cb4e6;
+  --nav-back-color: #ffffff;
+  --nav-hover-back-color: #ffe97f;
+  --nav-fore-color: #e6007e;
+  --nav-border-color: #3cb4e6;
+  --nav-link-color: #3cb4e6;
+  --footer-fore-color: #ffffff;
+  --footer-back-color: #03234b;
+  --footer-border-color: #3cb4e6;
+  --footer-link-color: #3cb4e6;
+  --drawer-back-color: #ffffff;
+  --drawer-hover-back-color: #ffe97f;
+  --drawer-border-color: #3cb4e6;
+  --drawer-close-color: #e6007e; }
+
+header {
+  height: 2.75rem;
+  background: var(--header-back-color);
+  color: var(--header-fore-color);
+  border-bottom: 0.0714285714rem solid var(--header-border-color);
+  padding: calc(var(--universal-padding) / 4) 0;
+  white-space: nowrap;
+  overflow-x: auto;
+  overflow-y: hidden; }
+  header.row {
+    box-sizing: content-box; }
+  header .logo {
+    color: var(--header-fore-color);
+    font-size: 1.75rem;
+    padding: var(--universal-padding) calc(2 * var(--universal-padding));
+    text-decoration: none; }
+  header button, header [type="button"], header .button, header [role="button"] {
+    box-sizing: border-box;
+    position: relative;
+    top: calc(0rem - var(--universal-padding) / 4);
+    height: calc(3.1875rem + var(--universal-padding) / 2);
+    background: var(--header-back-color);
+    line-height: calc(3.1875rem - var(--universal-padding) * 1.5);
+    text-align: center;
+    color: var(--header-fore-color);
+    border: 0;
+    border-radius: 0;
+    margin: 0;
+    text-transform: uppercase; }
+    header button:hover, header button:focus, header [type="button"]:hover, header [type="button"]:focus, header .button:hover, header .button:focus, header [role="button"]:hover, header [role="button"]:focus {
+      background: var(--header-hover-back-color); }
+
+nav {
+  background: var(--nav-back-color);
+  color: var(--nav-fore-color);
+  border: 0.0714285714rem solid var(--nav-border-color);
+  border-radius: var(--universal-border-radius);
+  margin: var(--universal-margin); }
+  nav * {
+    padding: var(--universal-padding) calc(1.5 * var(--universal-padding)); }
+  nav a, nav a:visited {
+    display: block;
+    color: var(--nav-link-color);
+    border-radius: var(--universal-border-radius);
+    transition: background 0.3s; }
+    nav a:hover, nav a:focus, nav a:visited:hover, nav a:visited:focus {
+      text-decoration: none;
+      background: var(--nav-hover-back-color); }
+  nav .sublink-1 {
+    position: relative;
+    margin-left: calc(2 * var(--universal-padding)); }
+    nav .sublink-1:before {
+      position: absolute;
+      left: calc(var(--universal-padding) - 1 * var(--universal-padding));
+      top: -0.0714285714rem;
+      content: '';
+      height: 100%;
+      border: 0.0714285714rem solid var(--nav-border-color);
+      border-left: 0; }
+  nav .sublink-2 {
+    position: relative;
+    margin-left: calc(4 * var(--universal-padding)); }
+    nav .sublink-2:before {
+      position: absolute;
+      left: calc(var(--universal-padding) - 3 * var(--universal-padding));
+      top: -0.0714285714rem;
+      content: '';
+      height: 100%;
+      border: 0.0714285714rem solid var(--nav-border-color);
+      border-left: 0; }
+
+footer {
+  background: var(--footer-back-color);
+  color: var(--footer-fore-color);
+  border-top: 0.0714285714rem solid var(--footer-border-color);
+  padding: calc(2 * var(--universal-padding)) var(--universal-padding);
+  font-size: 0.875rem; }
+  footer a, footer a:visited {
+    color: var(--footer-link-color); }
+
+header.sticky {
+  position: -webkit-sticky;
+  position: sticky;
+  z-index: 1101;
+  top: 0; }
+
+footer.sticky {
+  position: -webkit-sticky;
+  position: sticky;
+  z-index: 1101;
+  bottom: 0; }
+
+.drawer-toggle:before {
+  display: inline-block;
+  position: relative;
+  vertical-align: bottom;
+  content: '\00a0\2261\00a0';
+  font-family: sans-serif;
+  font-size: 1.5em; }
+@media screen and (min-width: 500px) {
+  .drawer-toggle:not(.persistent) {
+    display: none; } }
+
+[type="checkbox"].drawer {
+  height: 1px;
+  width: 1px;
+  margin: -1px;
+  overflow: hidden;
+  position: absolute;
+  clip: rect(0 0 0 0);
+  -webkit-clip-path: inset(100%);
+  clip-path: inset(100%); }
+  [type="checkbox"].drawer + * {
+    display: block;
+    box-sizing: border-box;
+    position: fixed;
+    top: 0;
+    width: 320px;
+    height: 100vh;
+    overflow-y: auto;
+    background: var(--drawer-back-color);
+    border: 0.0714285714rem solid var(--drawer-border-color);
+    border-radius: 0;
+    margin: 0;
+    z-index: 1110;
+    right: -320px;
+    transition: right 0.3s; }
+    [type="checkbox"].drawer + * .drawer-close {
+      position: absolute;
+      top: var(--universal-margin);
+      right: var(--universal-margin);
+      z-index: 1111;
+      width: 2rem;
+      height: 2rem;
+      border-radius: var(--universal-border-radius);
+      padding: var(--universal-padding);
+      margin: 0;
+      cursor: pointer;
+      transition: background 0.3s; }
+      [type="checkbox"].drawer + * .drawer-close:before {
+        display: block;
+        content: '\00D7';
+        color: var(--drawer-close-color);
+        position: relative;
+        font-family: sans-serif;
+        font-size: 2rem;
+        line-height: 1;
+        text-align: center; }
+      [type="checkbox"].drawer + * .drawer-close:hover, [type="checkbox"].drawer + * .drawer-close:focus {
+        background: var(--drawer-hover-back-color); }
+    @media screen and (max-width: 320px) {
+      [type="checkbox"].drawer + * {
+        width: 100%; } }
+  [type="checkbox"].drawer:checked + * {
+    right: 0; }
+  @media screen and (min-width: 500px) {
+    [type="checkbox"].drawer:not(.persistent) + * {
+      position: static;
+      height: 100%;
+      z-index: 1100; }
+      [type="checkbox"].drawer:not(.persistent) + * .drawer-close {
+        display: none; } }
+
+/*
+  Definitions for the responsive table component.
+*/
+/* Table module CSS variable definitions. */
+:root {
+  --table-border-color: #03234b;
+  --table-border-separator-color: #03234b;
+  --table-head-back-color: #03234b;
+  --table-head-fore-color: #ffffff;
+  --table-body-back-color: #ffffff;
+  --table-body-fore-color: #03234b;
+  --table-body-alt-back-color: #f4f4f4; }
+
+table {
+  border-collapse: separate;
+  border-spacing: 0;
+  margin: 0;
+  display: flex;
+  flex: 0 1 auto;
+  flex-flow: row wrap;
+  padding: var(--universal-padding);
+  padding-top: 0; }
+  table caption {
+    font-size: 1rem;
+    margin: calc(2 * var(--universal-margin)) 0;
+    max-width: 100%;
+    flex: 0 0 100%; }
+  table thead, table tbody {
+    display: flex;
+    flex-flow: row wrap;
+    border: 0.0714285714rem solid var(--table-border-color); }
+  table thead {
+    z-index: 999;
+    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0;
+    border-bottom: 0.0714285714rem solid var(--table-border-separator-color); }
+  table tbody {
+    border-top: 0;
+    margin-top: calc(0 - var(--universal-margin));
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+  table tr {
+    display: flex;
+    padding: 0; }
+  table th, table td {
+    padding: calc(0.5 * var(--universal-padding));
+		font-size: 0.9rem; }
+  table th {
+    text-align: left;
+    background: var(--table-head-back-color);
+    color: var(--table-head-fore-color); }
+  table td {
+    background: var(--table-body-back-color);
+    color: var(--table-body-fore-color);
+    border-top: 0.0714285714rem solid var(--table-border-color); }
+
+table:not(.horizontal) {
+  overflow: auto;
+  max-height: 100%; }
+  table:not(.horizontal) thead, table:not(.horizontal) tbody {
+    max-width: 100%;
+    flex: 0 0 100%; }
+  table:not(.horizontal) tr {
+    flex-flow: row wrap;
+    flex: 0 0 100%; }
+  table:not(.horizontal) th, table:not(.horizontal) td {
+    flex: 1 0 0%;
+    overflow: hidden;
+    text-overflow: ellipsis; }
+  table:not(.horizontal) thead {
+    position: sticky;
+    top: 0; }
+  table:not(.horizontal) tbody tr:first-child td {
+    border-top: 0; }
+
+table.horizontal {
+  border: 0; }
+  table.horizontal thead, table.horizontal tbody {
+    border: 0;
+    flex: .2 0 0;
+    flex-flow: row nowrap; }
+  table.horizontal tbody {
+    overflow: auto;
+    justify-content: space-between;
+    flex: .8 0 0;
+    margin-left: 0;
+    padding-bottom: calc(var(--universal-padding) / 4); }
+  table.horizontal tr {
+    flex-direction: column;
+    flex: 1 0 auto; }
+  table.horizontal th, table.horizontal td {
+    width: auto;
+    border: 0;
+    border-bottom: 0.0714285714rem solid var(--table-border-color); }
+    table.horizontal th:not(:first-child), table.horizontal td:not(:first-child) {
+      border-top: 0; }
+  table.horizontal th {
+    text-align: right;
+    border-left: 0.0714285714rem solid var(--table-border-color);
+    border-right: 0.0714285714rem solid var(--table-border-separator-color); }
+  table.horizontal thead tr:first-child {
+    padding-left: 0; }
+  table.horizontal th:first-child, table.horizontal td:first-child {
+    border-top: 0.0714285714rem solid var(--table-border-color); }
+  table.horizontal tbody tr:last-child td {
+    border-right: 0.0714285714rem solid var(--table-border-color); }
+    table.horizontal tbody tr:last-child td:first-child {
+      border-top-right-radius: 0.25rem; }
+    table.horizontal tbody tr:last-child td:last-child {
+      border-bottom-right-radius: 0.25rem; }
+  table.horizontal thead tr:first-child th:first-child {
+    border-top-left-radius: 0.25rem; }
+  table.horizontal thead tr:first-child th:last-child {
+    border-bottom-left-radius: 0.25rem; }
+
+@media screen and (max-width: 499px) {
+  table, table.horizontal {
+    border-collapse: collapse;
+    border: 0;
+    width: 100%;
+    display: table; }
+    table thead, table th, table.horizontal thead, table.horizontal th {
+      border: 0;
+      height: 1px;
+      width: 1px;
+      margin: -1px;
+      overflow: hidden;
+      padding: 0;
+      position: absolute;
+      clip: rect(0 0 0 0);
+      -webkit-clip-path: inset(100%);
+      clip-path: inset(100%); }
+    table tbody, table.horizontal tbody {
+      border: 0;
+      display: table-row-group; }
+    table tr, table.horizontal tr {
+      display: block;
+      border: 0.0714285714rem solid var(--table-border-color);
+      border-radius: var(--universal-border-radius);
+      background: #ffffff;
+      padding: var(--universal-padding);
+      margin: var(--universal-margin);
+      margin-bottom: calc(1 * var(--universal-margin)); }
+    table th, table td, table.horizontal th, table.horizontal td {
+      width: auto; }
+    table td, table.horizontal td {
+      display: block;
+      border: 0;
+      text-align: right; }
+    table td:before, table.horizontal td:before {
+      content: attr(data-label);
+      float: left;
+      font-weight: 600; }
+    table th:first-child, table td:first-child, table.horizontal th:first-child, table.horizontal td:first-child {
+      border-top: 0; }
+    table tbody tr:last-child td, table.horizontal tbody tr:last-child td {
+      border-right: 0; } }
+table tr:nth-of-type(2n) > td {
+  background: var(--table-body-alt-back-color); }
+
+@media screen and (max-width: 500px) {
+  table tr:nth-of-type(2n) {
+    background: var(--table-body-alt-back-color); } }
+:root {
+  --table-body-hover-back-color: #90caf9; }
+
+table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
+  background: var(--table-body-hover-back-color); }
+
+@media screen and (max-width: 500px) {
+  table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focus, table.hoverable tr:focus > td {
+    background: var(--table-body-hover-back-color); } }
+/*
+  Definitions for contextual background elements, toasts and tooltips.
+*/
+/* Contextual module CSS variable definitions */
+:root {
+  --mark-back-color: #3cb4e6;
+  --mark-fore-color: #ffffff; }
+
+mark {
+  background: var(--mark-back-color);
+  color: var(--mark-fore-color);
+  font-size: 0.95em;
+  line-height: 1em;
+  border-radius: var(--universal-border-radius);
+  padding: calc(var(--universal-padding) / 4) var(--universal-padding); }
+  mark.inline-block {
+    display: inline-block;
+    font-size: 1em;
+    line-height: 1.4;
+    padding: calc(var(--universal-padding) / 2) var(--universal-padding); }
+
+:root {
+  --toast-back-color: #424242;
+  --toast-fore-color: #fafafa; }
+
+.toast {
+  position: fixed;
+  bottom: calc(var(--universal-margin) * 3);
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1111;
+  color: var(--toast-fore-color);
+  background: var(--toast-back-color);
+  border-radius: calc(var(--universal-border-radius) * 16);
+  padding: var(--universal-padding) calc(var(--universal-padding) * 3); }
+
+:root {
+  --tooltip-back-color: #212121;
+  --tooltip-fore-color: #fafafa; }
+
+.tooltip {
+  position: relative;
+  display: inline-block; }
+  .tooltip:before, .tooltip:after {
+    position: absolute;
+    opacity: 0;
+    clip: rect(0 0 0 0);
+    -webkit-clip-path: inset(100%);
+    clip-path: inset(100%);
+    transition: all 0.3s;
+    z-index: 1010;
+    left: 50%; }
+  .tooltip:not(.bottom):before, .tooltip:not(.bottom):after {
+    bottom: 75%; }
+  .tooltip.bottom:before, .tooltip.bottom:after {
+    top: 75%; }
+  .tooltip:hover:before, .tooltip:hover:after, .tooltip:focus:before, .tooltip:focus:after {
+    opacity: 1;
+    clip: auto;
+    -webkit-clip-path: inset(0%);
+    clip-path: inset(0%); }
+  .tooltip:before {
+    content: '';
+    background: transparent;
+    border: var(--universal-margin) solid transparent;
+    left: calc(50% - var(--universal-margin)); }
+  .tooltip:not(.bottom):before {
+    border-top-color: #212121; }
+  .tooltip.bottom:before {
+    border-bottom-color: #212121; }
+  .tooltip:after {
+    content: attr(aria-label);
+    color: var(--tooltip-fore-color);
+    background: var(--tooltip-back-color);
+    border-radius: var(--universal-border-radius);
+    padding: var(--universal-padding);
+    white-space: nowrap;
+    transform: translateX(-50%); }
+  .tooltip:not(.bottom):after {
+    margin-bottom: calc(2 * var(--universal-margin)); }
+  .tooltip.bottom:after {
+    margin-top: calc(2 * var(--universal-margin)); }
+
+:root {
+  --modal-overlay-color: rgba(0, 0, 0, 0.45);
+  --modal-close-color: #e6007e;
+  --modal-close-hover-color: #ffe97f; }
+
+[type="checkbox"].modal {
+  height: 1px;
+  width: 1px;
+  margin: -1px;
+  overflow: hidden;
+  position: absolute;
+  clip: rect(0 0 0 0);
+  -webkit-clip-path: inset(100%);
+  clip-path: inset(100%); }
+  [type="checkbox"].modal + div {
+    position: fixed;
+    top: 0;
+    left: 0;
+    display: none;
+    width: 100vw;
+    height: 100vh;
+    background: var(--modal-overlay-color); }
+    [type="checkbox"].modal + div .card {
+      margin: 0 auto;
+      max-height: 50vh;
+      overflow: auto; }
+      [type="checkbox"].modal + div .card .modal-close {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 1.75rem;
+        height: 1.75rem;
+        border-radius: var(--universal-border-radius);
+        padding: var(--universal-padding);
+        margin: 0;
+        cursor: pointer;
+        transition: background 0.3s; }
+        [type="checkbox"].modal + div .card .modal-close:before {
+          display: block;
+          content: '\00D7';
+          color: var(--modal-close-color);
+          position: relative;
+          font-family: sans-serif;
+          font-size: 1.75rem;
+          line-height: 1;
+          text-align: center; }
+        [type="checkbox"].modal + div .card .modal-close:hover, [type="checkbox"].modal + div .card .modal-close:focus {
+          background: var(--modal-close-hover-color); }
+  [type="checkbox"].modal:checked + div {
+    display: flex;
+    flex: 0 1 auto;
+    z-index: 1200; }
+    [type="checkbox"].modal:checked + div .card .modal-close {
+      z-index: 1211; }
+
+:root {
+  --collapse-label-back-color: #03234b;
+  --collapse-label-fore-color: #ffffff;
+  --collapse-label-hover-back-color: #3cb4e6;
+  --collapse-selected-label-back-color: #3cb4e6;
+  --collapse-border-color: var(--collapse-label-back-color);
+  --collapse-selected-border-color: #ceecf8;
+  --collapse-content-back-color: #ffffff;
+  --collapse-selected-label-border-color: #3cb4e6; }
+
+.collapse {
+  width: calc(100% - 2 * var(--universal-margin));
+  opacity: 1;
+  display: flex;
+  flex-direction: column;
+  margin: var(--universal-margin);
+  border-radius: var(--universal-border-radius); }
+  .collapse > [type="radio"], .collapse > [type="checkbox"] {
+    height: 1px;
+    width: 1px;
+    margin: -1px;
+    overflow: hidden;
+    position: absolute;
+    clip: rect(0 0 0 0);
+    -webkit-clip-path: inset(100%);
+    clip-path: inset(100%); }
+  .collapse > label {
+    flex-grow: 1;
+    display: inline-block;
+    height: 1.25rem;
+    cursor: pointer;
+    transition: background 0.2s;
+    color: var(--collapse-label-fore-color);
+    background: var(--collapse-label-back-color);
+    border: 0.0714285714rem solid var(--collapse-selected-border-color);
+    padding: calc(1.25 * var(--universal-padding)); }
+    .collapse > label:hover, .collapse > label:focus {
+      background: var(--collapse-label-hover-back-color); }
+    .collapse > label + div {
+      flex-basis: auto;
+      height: 1px;
+      width: 1px;
+      margin: -1px;
+      overflow: hidden;
+      position: absolute;
+      clip: rect(0 0 0 0);
+      -webkit-clip-path: inset(100%);
+      clip-path: inset(100%);
+      transition: max-height 0.3s;
+      max-height: 1px; }
+  .collapse > :checked + label {
+    background: var(--collapse-selected-label-back-color);
+    border-color: var(--collapse-selected-label-border-color); }
+    .collapse > :checked + label + div {
+      box-sizing: border-box;
+      position: relative;
+      width: 100%;
+      height: auto;
+      overflow: auto;
+      margin: 0;
+      background: var(--collapse-content-back-color);
+      border: 0.0714285714rem solid var(--collapse-selected-border-color);
+      border-top: 0;
+      padding: var(--universal-padding);
+      clip: auto;
+      -webkit-clip-path: inset(0%);
+      clip-path: inset(0%);
+      max-height: 100%; }
+  .collapse > label:not(:first-of-type) {
+    border-top: 0; }
+  .collapse > label:first-of-type {
+    border-radius: var(--universal-border-radius) var(--universal-border-radius) 0 0; }
+  .collapse > label:last-of-type:not(:first-of-type) {
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+  .collapse > label:last-of-type:first-of-type {
+    border-radius: var(--universal-border-radius); }
+  .collapse > :checked:last-of-type:not(:first-of-type) + label {
+    border-radius: 0; }
+  .collapse > :checked:last-of-type + label + div {
+    border-radius: 0 0 var(--universal-border-radius) var(--universal-border-radius); }
+
+/*
+  Custom elements for contextual background elements, toasts and tooltips.
+*/
+mark.tertiary {
+  --mark-back-color: #3cb4e6; }
+
+mark.tag {
+  padding: calc(var(--universal-padding)/2) var(--universal-padding);
+  border-radius: 1em; }
+
+/*
+  Definitions for progress elements and spinners.
+*/
+/* Progress module CSS variable definitions */
+:root {
+  --progress-back-color: #3cb4e6;
+  --progress-fore-color: #555; }
+
+progress {
+  display: block;
+  vertical-align: baseline;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  height: 0.75rem;
+  width: calc(100% - 2 * var(--universal-margin));
+  margin: var(--universal-margin);
+  border: 0;
+  border-radius: calc(2 * var(--universal-border-radius));
+  background: var(--progress-back-color);
+  color: var(--progress-fore-color); }
+  progress::-webkit-progress-value {
+    background: var(--progress-fore-color);
+    border-top-left-radius: calc(2 * var(--universal-border-radius));
+    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
+  progress::-webkit-progress-bar {
+    background: var(--progress-back-color); }
+  progress::-moz-progress-bar {
+    background: var(--progress-fore-color);
+    border-top-left-radius: calc(2 * var(--universal-border-radius));
+    border-bottom-left-radius: calc(2 * var(--universal-border-radius)); }
+  progress[value="1000"]::-webkit-progress-value {
+    border-radius: calc(2 * var(--universal-border-radius)); }
+  progress[value="1000"]::-moz-progress-bar {
+    border-radius: calc(2 * var(--universal-border-radius)); }
+  progress.inline {
+    display: inline-block;
+    vertical-align: middle;
+    width: 60%; }
+
+:root {
+  --spinner-back-color: #ddd;
+  --spinner-fore-color: #555; }
+
+@keyframes spinner-donut-anim {
+  0% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } }
+.spinner {
+  display: inline-block;
+  margin: var(--universal-margin);
+  border: 0.25rem solid var(--spinner-back-color);
+  border-left: 0.25rem solid var(--spinner-fore-color);
+  border-radius: 50%;
+  width: 1.25rem;
+  height: 1.25rem;
+  animation: spinner-donut-anim 1.2s linear infinite; }
+
+/*
+  Custom elements for progress bars and spinners.
+*/
+progress.primary {
+  --progress-fore-color: #1976d2; }
+
+progress.secondary {
+  --progress-fore-color: #d32f2f; }
+
+progress.tertiary {
+  --progress-fore-color: #308732; }
+
+.spinner.primary {
+  --spinner-fore-color: #1976d2; }
+
+.spinner.secondary {
+  --spinner-fore-color: #d32f2f; }
+
+.spinner.tertiary {
+  --spinner-fore-color: #308732; }
+
+/*
+  Definitions for icons - powered by Feather (https://feathericons.com/).
+*/
+span[class^='icon-'] {
+  display: inline-block;
+  height: 1em;
+  width: 1em;
+  vertical-align: -0.125em;
+  background-size: contain;
+  margin: 0 calc(var(--universal-margin) / 4); }
+  span[class^='icon-'].secondary {
+    -webkit-filter: invert(25%);
+    filter: invert(25%); }
+  span[class^='icon-'].inverse {
+    -webkit-filter: invert(100%);
+    filter: invert(100%); }
+
+span.icon-alert {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='8' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='16' x2='12' y2='16'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-bookmark {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M19 21l-7-5-7 5V5a2 2 0 0 1 2-2h10a2 2 0 0 1 2 2z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-calendar {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='4' width='18' height='18' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='16' y1='2' x2='16' y2='6'%3E%3C/line%3E%3Cline x1='8' y1='2' x2='8' y2='6'%3E%3C/line%3E%3Cline x1='3' y1='10' x2='21' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-credit {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1' y='4' width='22' height='16' rx='2' ry='2'%3E%3C/rect%3E%3Cline x1='1' y1='10' x2='23' y2='10'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-edit {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 14.66V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h5.34'%3E%3C/path%3E%3Cpolygon points='18 2 22 6 12 16 8 16 8 12 18 2'%3E%3C/polygon%3E%3C/svg%3E"); }
+span.icon-link {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6'%3E%3C/path%3E%3Cpolyline points='15 3 21 3 21 9'%3E%3C/polyline%3E%3Cline x1='10' y1='14' x2='21' y2='3'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-help {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3'%3E%3C/path%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='17' x2='12' y2='17'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-home {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z'%3E%3C/path%3E%3Cpolyline points='9 22 9 12 15 12 15 22'%3E%3C/polyline%3E%3C/svg%3E"); }
+span.icon-info {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='10'%3E%3C/circle%3E%3Cline x1='12' y1='16' x2='12' y2='12'%3E%3C/line%3E%3Cline x1='12' y1='8' x2='12' y2='8'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-lock {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='3' y='11' width='18' height='11' rx='2' ry='2'%3E%3C/rect%3E%3Cpath d='M7 11V7a5 5 0 0 1 10 0v4'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-mail {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z'%3E%3C/path%3E%3Cpolyline points='22,6 12,13 2,6'%3E%3C/polyline%3E%3C/svg%3E"); }
+span.icon-location {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0 1 18 0z'%3E%3C/path%3E%3Ccircle cx='12' cy='10' r='3'%3E%3C/circle%3E%3C/svg%3E"); }
+span.icon-phone {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-rss {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11a9 9 0 0 1 9 9'%3E%3C/path%3E%3Cpath d='M4 4a16 16 0 0 1 16 16'%3E%3C/path%3E%3Ccircle cx='5' cy='19' r='1'%3E%3C/circle%3E%3C/svg%3E"); }
+span.icon-search {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='11' cy='11' r='8'%3E%3C/circle%3E%3Cline x1='21' y1='21' x2='16.65' y2='16.65'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-settings {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='3'%3E%3C/circle%3E%3Cpath d='M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-share {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='18' cy='5' r='3'%3E%3C/circle%3E%3Ccircle cx='6' cy='12' r='3'%3E%3C/circle%3E%3Ccircle cx='18' cy='19' r='3'%3E%3C/circle%3E%3Cline x1='8.59' y1='13.51' x2='15.42' y2='17.49'%3E%3C/line%3E%3Cline x1='15.41' y1='6.51' x2='8.59' y2='10.49'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-cart {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='9' cy='21' r='1'%3E%3C/circle%3E%3Ccircle cx='20' cy='21' r='1'%3E%3C/circle%3E%3Cpath d='M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6'%3E%3C/path%3E%3C/svg%3E"); }
+span.icon-upload {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4'%3E%3C/path%3E%3Cpolyline points='17 8 12 3 7 8'%3E%3C/polyline%3E%3Cline x1='12' y1='3' x2='12' y2='15'%3E%3C/line%3E%3C/svg%3E"); }
+span.icon-user {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2303234b' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2'%3E%3C/path%3E%3Ccircle cx='12' cy='7' r='4'%3E%3C/circle%3E%3C/svg%3E"); }
+
+/*
+  Definitions for STMicroelectronics icons (https://brandportal.st.com/document/26).
+*/
+span.icon-st-update {
+  background-image: url("Update.svg"); }
+span.icon-st-add {
+  background-image: url("Add button.svg"); }
+
+/*
+  Definitions for utilities and helper classes.
+*/
+/* Utility module CSS variable definitions */
+:root {
+  --generic-border-color: rgba(0, 0, 0, 0.3);
+  --generic-box-shadow: 0 0.2857142857rem 0.2857142857rem 0 rgba(0, 0, 0, 0.125), 0 0.1428571429rem 0.1428571429rem -0.1428571429rem rgba(0, 0, 0, 0.125); }
+
+.hidden {
+  display: none !important; }
+
+.visually-hidden {
+  position: absolute !important;
+  width: 1px !important;
+  height: 1px !important;
+  margin: -1px !important;
+  border: 0 !important;
+  padding: 0 !important;
+  clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(100%) !important;
+  clip-path: inset(100%) !important;
+  overflow: hidden !important; }
+
+.bordered {
+  border: 0.0714285714rem solid var(--generic-border-color) !important; }
+
+.rounded {
+  border-radius: var(--universal-border-radius) !important; }
+
+.circular {
+  border-radius: 50% !important; }
+
+.shadowed {
+  box-shadow: var(--generic-box-shadow) !important; }
+
+.responsive-margin {
+  margin: calc(var(--universal-margin) / 4) !important; }
+  @media screen and (min-width: 500px) {
+    .responsive-margin {
+      margin: calc(var(--universal-margin) / 2) !important; } }
+  @media screen and (min-width: 1280px) {
+    .responsive-margin {
+      margin: var(--universal-margin) !important; } }
+
+.responsive-padding {
+  padding: calc(var(--universal-padding) / 4) !important; }
+  @media screen and (min-width: 500px) {
+    .responsive-padding {
+      padding: calc(var(--universal-padding) / 2) !important; } }
+  @media screen and (min-width: 1280px) {
+    .responsive-padding {
+      padding: var(--universal-padding) !important; } }
+
+@media screen and (max-width: 499px) {
+  .hidden-sm {
+    display: none !important; } }
+@media screen and (min-width: 500px) and (max-width: 1279px) {
+  .hidden-md {
+    display: none !important; } }
+@media screen and (min-width: 1280px) {
+  .hidden-lg {
+    display: none !important; } }
+@media screen and (max-width: 499px) {
+  .visually-hidden-sm {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+@media screen and (min-width: 500px) and (max-width: 1279px) {
+  .visually-hidden-md {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+@media screen and (min-width: 1280px) {
+  .visually-hidden-lg {
+    position: absolute !important;
+    width: 1px !important;
+    height: 1px !important;
+    margin: -1px !important;
+    border: 0 !important;
+    padding: 0 !important;
+    clip: rect(0 0 0 0) !important;
+    -webkit-clip-path: inset(100%) !important;
+    clip-path: inset(100%) !important;
+    overflow: hidden !important; } }
+
+/*# sourceMappingURL=mini-custom.css.map */
+
+img[alt="ST logo"] { display: block; margin: auto; width: 75%; max-width: 250px; min-width: 71px; }
+img[alt="Cube logo"] { float: right; width: 30%; max-width: 10rem; min-width: 8rem; padding-right: 1rem;}
+
+.figure {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  text-align: center;
+}
\ No newline at end of file
diff --git a/Utilities/misc/_htmresc/st_logo_2020.png b/Utilities/misc/_htmresc/st_logo_2020.png
new file mode 100644
index 00000000..d6cebb5a
Binary files /dev/null and b/Utilities/misc/_htmresc/st_logo_2020.png differ
diff --git a/Utilities/misc/stm32_mem.h b/Utilities/misc/stm32_mem.h
index 1f82fe57..1880c2d8 100644
--- a/Utilities/misc/stm32_mem.h
+++ b/Utilities/misc/stm32_mem.h
@@ -25,50 +25,49 @@
 extern "C"
 {
 #endif
-  /* Includes ------------------------------------------------------------------*/
+/* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
 #include "utilities_conf.h"
 
 /* Exported types ------------------------------------------------------------*/
-  /* Exported constants --------------------------------------------------------*/
+/* Exported constants --------------------------------------------------------*/
 /* Exported macro ------------------------------------------------------------*/
-/* ---- Memory mapping macros --------------------------------------- */
+/* ---- Memory mapping macros ----------------------------------------------- */
 #define UTIL_MEM_PLACE_IN_SECTION( __x__ ) UTIL_PLACE_IN_SECTION( __x__ ) 
-#define UTIL_MEM_ALIGN  ALIGN
-  
+#define UTIL_MEM_ALIGN ALIGN
+
+/* Exported functions ------------------------------------------------------- */
+/**
+* @brief  This API copies one buffer to another
+* @param  dst: output buffer to be filled
+* @param  src: input buffer
+* @param  size: size of 8b data
+* @retval None
+*/
+void UTIL_MEM_cpy_8( void *dst, const void *src, uint16_t size );
+
+/**
+* @brief  This API copies one buffer to another in reverse
+* @param  dst: output buffer to be filled
+* @param  src: input buffer
+* @param  size: size of 8b data
+* @retval None
+*/
+void UTIL_MEM_cpyr_8( void *dst, const void *src, uint16_t size );
+
+/**
+* @brief  This API fills a buffer with value
+* @param  dst: output buffer to be filled
+* @param  value: value 
+* @param  size: size of 8b data
+* @retval None
+*/
+void UTIL_MEM_set_8( void *dst, uint8_t value, uint16_t size );
+
 
-  /* Exported functions ------------------------------------------------------- */
-  /**
-  * @brief  This API copies one buffer to another
-  * @param  dst: output buffer to be filled
-  * @param  src: input buffer
-  * @param  size: size of 8b data
-  * @retval None
-  */
-  void UTIL_MEM_cpy_8( void *dst, const void *src, uint16_t size );
-  
-  /**
-  * @brief  This API copies one buffer to another in reverse
-  * @param  dst: output buffer to be filled
-  * @param  src: input buffer
-  * @param  size: size of 8b data
-  * @retval None
-  */
-  void UTIL_MEM_cpyr_8( void *dst, const void *src, uint16_t size );
-  
-  /**
-  * @brief  This API copies one value into buffer
-  * @param  dst: output buffer to be filled
-  * @param  value: value 
-  * @param  size: size of 8b data
-  * @retval None
-  */
-  void UTIL_MEM_set_8( void *dst, uint8_t value, uint16_t size );
-  
-  
 #ifdef __cplusplus
 }
 #endif
 
 #endif // __STM32_MEM_H__
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
\ No newline at end of file
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Utilities/trace/adv_trace/Release_Notes.html b/Utilities/trace/adv_trace/Release_Notes.html
index caba9fbe..a379cfa1 100644
--- a/Utilities/trace/adv_trace/Release_Notes.html
+++ b/Utilities/trace/adv_trace/Release_Notes.html
@@ -6,10 +6,13 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Release Notes for STM32 advanced tracer</title>
   <style>
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
+    code{white-space: pre-wrap;}
+    span.smallcaps{font-variant: small-caps;}
+    span.underline{text-decoration: underline;}
+    div.column{display: inline-block; vertical-align: top; width: 50%;}
+    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
+    ul.task-list{list-style: none;}
+    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
   </style>
   <link rel="stylesheet" href="_htmresc/mini-st.css" />
   <!--[if lt IE 9]>
@@ -35,13 +38,13 @@ <h1 id="license">License</h1>
 <h1 id="purpose">Purpose</h1>
 <p>The source code delivered is an utility to help the application debug by providing a trace service.</p>
 </div>
-<div class="col-sm-12 col-lg-8">
-<h1 id="update-history">Update History</h1>
+<section id="update-history" class="col-sm-12 col-lg-8">
+<h1>Update History</h1>
 <div class="collapse">
-<input type="checkbox" id="collapse-section6" checked aria-hidden="true"> <label for="collapse-section6" aria-hidden="true">V1.0.5 / 19-October-2020</label>
+<input type="checkbox" id="collapse-section8" checked aria-hidden="true"> <label for="collapse-section8" aria-hidden="true">V1.2.0 / 10-May-2021</label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
-<h3 id="release-v1.0.5">release v1.0.5</h3>
+<h3 id="release-v1.2.0">release v1.2.0</h3>
 <h2 id="contents">Contents</h2>
 <table>
 <caption>Fixed bugs list<br />
@@ -53,7 +56,7 @@ <h2 id="contents">Contents</h2>
 </thead>
 <tbody>
 <tr class="odd">
-<td>Ticket 94664 - stm32_adv_trace_if_template.c</td>
+<td>Ticket 106337 - CodeSpell issues detected on adv_traceproject</td>
 </tr>
 </tbody>
 </table>
@@ -70,10 +73,10 @@ <h2 id="dependencies">Dependencies</h2>
 </div>
 </div>
 <div class="collapse">
-<input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">V1.0.4 / 10-September-2020</label>
+<input type="checkbox" id="collapse-section7" aria-hidden="true"> <label for="collapse-section7" aria-hidden="true">V1.1.0 / 04-Februar-2021</label>
 <div>
 <h2 id="main-changes-1">Main Changes</h2>
-<h3 id="release-v1.0.4">release v1.0.4</h3>
+<h3 id="release-v1.1.0">release v1.1.0</h3>
 <h2 id="contents-1">Contents</h2>
 <table>
 <caption>Fixed bugs list<br />
@@ -85,7 +88,10 @@ <h2 id="contents-1">Contents</h2>
 </thead>
 <tbody>
 <tr class="odd">
-<td>Ticket 86948 - CodeSpell : Correct some english words typo</td>
+<td>Ticket 99822 - add API to poll when if buffer is empty ( uint8_t UTIL_ADV_TRACE_IsBufferEmpty(void))</td>
+</tr>
+<tr class="even">
+<td>Code review - Improve overrun feature</td>
 </tr>
 </tbody>
 </table>
@@ -102,10 +108,10 @@ <h2 id="dependencies-1">Dependencies</h2>
 </div>
 </div>
 <div class="collapse">
-<input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true">V1.0.3 / 3-September-2020</label>
+<input type="checkbox" id="collapse-section6" aria-hidden="true"> <label for="collapse-section6" aria-hidden="true">V1.0.5 / 19-October-2020</label>
 <div>
 <h2 id="main-changes-2">Main Changes</h2>
-<h3 id="release-v1.0.3">release v1.0.3</h3>
+<h3 id="release-v1.0.5">release v1.0.5</h3>
 <h2 id="contents-2">Contents</h2>
 <table>
 <caption>Fixed bugs list<br />
@@ -117,7 +123,7 @@ <h2 id="contents-2">Contents</h2>
 </thead>
 <tbody>
 <tr class="odd">
-<td>Ticket 89624 - Utilities Releases Notes Improvements - Link on openorg BSD-3-Clause.</td>
+<td>Ticket 94664 - stm32_adv_trace_if_template.c be updated</td>
 </tr>
 </tbody>
 </table>
@@ -134,10 +140,10 @@ <h2 id="dependencies-2">Dependencies</h2>
 </div>
 </div>
 <div class="collapse">
-<input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.0.2 / 19-June-2020</label>
+<input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">V1.0.4 / 10-September-2020</label>
 <div>
 <h2 id="main-changes-3">Main Changes</h2>
-<h3 id="release-v1.0.2">release v1.0.2</h3>
+<h3 id="release-v1.0.4">release v1.0.4</h3>
 <h2 id="contents-3">Contents</h2>
 <table>
 <caption>Fixed bugs list<br />
@@ -149,13 +155,7 @@ <h2 id="contents-3">Contents</h2>
 </thead>
 <tbody>
 <tr class="odd">
-<td>Ticket 83642 - add possibility to sprintf directly to queue in unchunk mode.</td>
-</tr>
-<tr class="even">
-<td>Ticket 86948 - CodeSpell : Correct some english words typo.</td>
-</tr>
-<tr class="odd">
-<td>Ticket 88566 - for security reasons, need to place the TraceBuffer.</td>
+<td>Ticket 86948 - CodeSpell : Correct some english words typo</td>
 </tr>
 </tbody>
 </table>
@@ -172,10 +172,10 @@ <h2 id="dependencies-3">Dependencies</h2>
 </div>
 </div>
 <div class="collapse">
-<input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.0.1 / 12-Decembre-2019</label>
+<input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true">V1.0.3 / 3-September-2020</label>
 <div>
 <h2 id="main-changes-4">Main Changes</h2>
-<h3 id="release-v1.0.1">release v1.0.1</h3>
+<h3 id="release-v1.0.3">release v1.0.3</h3>
 <h2 id="contents-4">Contents</h2>
 <table>
 <caption>Fixed bugs list<br />
@@ -187,7 +187,7 @@ <h2 id="contents-4">Contents</h2>
 </thead>
 <tbody>
 <tr class="odd">
-<td>Release note update.</td>
+<td>Ticket 89624 - Utilities Releases Notes Improvements - Link on openorg BSD-3-Clause.</td>
 </tr>
 </tbody>
 </table>
@@ -204,10 +204,10 @@ <h2 id="dependencies-4">Dependencies</h2>
 </div>
 </div>
 <div class="collapse">
-<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0 / 16-October-2019</label>
+<input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.0.2 / 19-June-2020</label>
 <div>
 <h2 id="main-changes-5">Main Changes</h2>
-<h3 id="first-release">first release</h3>
+<h3 id="release-v1.0.2">release v1.0.2</h3>
 <h2 id="contents-5">Contents</h2>
 <table>
 <caption>Fixed bugs list<br />
@@ -219,7 +219,13 @@ <h2 id="contents-5">Contents</h2>
 </thead>
 <tbody>
 <tr class="odd">
-<td>first version.</td>
+<td>Ticket 83642 - add possibility to sprintf directly to queue in unchunk mode.</td>
+</tr>
+<tr class="even">
+<td>Ticket 86948 - CodeSpell : Correct some english words typo.</td>
+</tr>
+<tr class="odd">
+<td>Ticket 88566 - for security reasons, need to place the TraceBuffer.</td>
 </tr>
 </tbody>
 </table>
@@ -235,7 +241,71 @@ <h2 id="backward-compatibility-5">backward compatibility</h2>
 <h2 id="dependencies-5">Dependencies</h2>
 </div>
 </div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.0.1 / 12-Decembre-2019</label>
+<div>
+<h2 id="main-changes-6">Main Changes</h2>
+<h3 id="release-v1.0.1">release v1.0.1</h3>
+<h2 id="contents-6">Contents</h2>
+<table>
+<caption>Fixed bugs list<br />
+</caption>
+<thead>
+<tr class="header">
+<th>Headline</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>Release note update.</td>
+</tr>
+</tbody>
+</table>
+<h2 id="known-limitations-6">known limitations</h2>
+<h2 id="development-toolchains-and-compilers-6">Development Toolchains and Compilers</h2>
+<ul>
+<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2</li>
+<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
+<li>System Workbench STM32 (SW4STM32) toolchain V2.7.2</li>
+</ul>
+<h2 id="supported-devices-and-boards-6">Supported Devices and boards</h2>
+<h2 id="backward-compatibility-6">backward compatibility</h2>
+<h2 id="dependencies-6">Dependencies</h2>
+</div>
+</div>
+<div class="collapse">
+<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0 / 16-October-2019</label>
+<div>
+<h2 id="main-changes-7">Main Changes</h2>
+<h3 id="first-release">first release</h3>
+<h2 id="contents-7">Contents</h2>
+<table>
+<caption>Fixed bugs list<br />
+</caption>
+<thead>
+<tr class="header">
+<th>Headline</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td>first version.</td>
+</tr>
+</tbody>
+</table>
+<h2 id="known-limitations-7">known limitations</h2>
+<h2 id="development-toolchains-and-compilers-7">Development Toolchains and Compilers</h2>
+<ul>
+<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2</li>
+<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
+<li>System Workbench STM32 (SW4STM32) toolchain V2.7.2</li>
+</ul>
+<h2 id="supported-devices-and-boards-7">Supported Devices and boards</h2>
+<h2 id="backward-compatibility-7">backward compatibility</h2>
+<h2 id="dependencies-7">Dependencies</h2>
+</div>
 </div>
+</section>
 </div>
 <footer class="sticky">
 <p>For complete documentation on STM32,visit: [<a href="http://www.st.com">www.st.com/stm32</a>]</p>
diff --git a/Utilities/trace/adv_trace/stm32_adv_trace.c b/Utilities/trace/adv_trace/stm32_adv_trace.c
index e6499ee4..1e004ea2 100644
--- a/Utilities/trace/adv_trace/stm32_adv_trace.c
+++ b/Utilities/trace/adv_trace/stm32_adv_trace.c
@@ -1,20 +1,20 @@
 /**
-  ******************************************************************************
-  * @file    stm32_adv_trace.c
-  * @author  MCD Application Team
-  * @brief   This file contains the advanced trace utility functions.
  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
-  * All rights reserved.</center></h2>
-  *
-  * This software component is licensed by ST under BSD 3-Clause license,
-  * the "License"; You may not use this file except in compliance with the
-  * License. You may obtain a copy of the License at:
-  *                        opensource.org/licenses/BSD-3-Clause
-  *
-  ******************************************************************************
+ * @file    stm32_adv_trace.c
+ * @author  MCD Application Team
+ * @brief   This file contains the advanced trace utility functions.
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ ******************************************************************************
  */
 
 /* Includes ------------------------------------------------------------------*/
@@ -23,8 +23,8 @@
 #include "stdio.h"
 
 /** @addtogroup ADV_TRACE
-  * @{
-  */
+ * @{
+ */
 
 /* Private defines -----------------------------------------------------------*/
 
@@ -49,10 +49,10 @@
  *  @note only valid if UTIL_ADV_TRACE_OVERRUN has been enabled inside utilities conf
  */
 typedef enum {
-  TRACE_OVERRUN_NONE = 0,     /*!<overrun status none.                        */
-  TRACE_OVERRUN_INDICATION,   /*!<overrun status an indication shall be sent. */
-  TRACE_OVERRUN_TRANSFERT,    /*!<overrun status data transfer ongoing.       */
-  TRACE_OVERRUN_EXECUTED,     /*!<overrun status data transfer complete.      */
+  TRACE_OVERRUN_NONE = 0, /*!<overrun status none.                        */
+  TRACE_OVERRUN_INDICATION, /*!<overrun status an indication shall be sent. */
+  TRACE_OVERRUN_TRANSFERT, /*!<overrun status data transfer ongoing.       */
+  TRACE_OVERRUN_EXECUTED, /*!<overrun status data transfer complete.      */
 } TRACE_OVERRUN_STATUS;
 #endif
 
@@ -70,7 +70,7 @@ typedef enum {
 } TRACE_UNCHUNK_STATUS;
 #endif
 /**
-  * @}
+ * @}
  */
 
 /**
@@ -95,7 +95,7 @@ typedef enum {
  */
 typedef struct {
 #if defined(UTIL_ADV_TRACE_UNCHUNK_MODE)
-  uint16_t unchunk_enabled;                              /*!<unchunck enable.                           */
+  uint16_t unchunk_enabled;                              /*!<unchunk enable.                           */
   TRACE_UNCHUNK_STATUS unchunk_status;                   /*!<unchunk transfer status.                  */
 #endif
 #if defined(UTIL_ADV_TRACE_OVERRUN)
@@ -103,14 +103,14 @@ typedef struct {
   cb_overrun *overrun_func;                               /*!<overrun function                            */
 #endif
 #if defined(UTIL_ADV_TRACE_CONDITIONNAL)
-  cb_timestamp *timestamp_func;                           /*!<ptr of function used to insert time stamp. */
-  uint8_t CurrentVerboseLevel;                           /*!<verbose level used.                        */
-  uint32_t RegionMask;                                   /*!<mask of the enabled region.                */
-#endif
-  uint16_t TraceRdPtr;                                   /*!<read pointer the trace system.             */
-  uint16_t TraceWrPtr;                                   /*!<write pointer the trace system.            */
-  uint16_t TraceSentSize;                                /*!<size of the latest transfer.               */
-  uint16_t TraceLock;                                    /*!<lock counter of the trace system.          */
+  cb_timestamp *timestamp_func; /*!<ptr of function used to insert time stamp.        */
+  uint8_t  CurrentVerboseLevel; /*!<verbose level used.                                */
+  uint32_t RegionMask; /*!<mask of the enabled region.                                */
+#endif
+  uint16_t TraceRdPtr; /*!<read pointer the trace system.                             */
+  uint16_t TraceWrPtr; /*!<write pointer the trace system.                            */
+  uint16_t TraceSentSize; /*!<size of the latest transfer.                            */
+  uint16_t TraceLock; /*!<lock counter of the trace system.                           */
 } ADV_TRACE_Context;
 
 /**
@@ -155,8 +155,8 @@ static void TRACE_UnLock(void);
 static uint32_t TRACE_IsLocked(void);
 
 /**
-  * @}
-  */
+ * @}
+ */
 
 /* Functions Definition ------------------------------------------------------*/
 
@@ -174,8 +174,8 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_Init(void)
 #endif
   /* Allocate Lock resource */
   UTIL_ADV_TRACE_INIT_CRITICAL_SECTION();
-  
-  /* Initialize the Low Level interface */  
+
+  /* Initialize the Low Level interface */
   return UTIL_TraceDriver.Init(TRACE_TxCpltCallback);
 }
 
@@ -185,6 +185,14 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_DeInit(void)
   return UTIL_TraceDriver.DeInit();
 }
 
+uint8_t UTIL_ADV_TRACE_IsBufferEmpty(void)
+{
+  /* check of the buffer is empty */
+  if(ADV_TRACE_Ctx.TraceWrPtr == ADV_TRACE_Ctx.TraceRdPtr)
+    return 1;
+  return 0;
+}
+
 UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_StartRxProcess(void (*UserCallback)(uint8_t *PData, uint16_t Size, uint8_t Error))
 {
   /* start the RX process */
@@ -206,12 +214,12 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_FSend(uint32_t VerboseLevel, uint32_
   uint16_t buff_size = 0u;
 
   /* check verbose level */
-  if (!( ADV_TRACE_Ctx.CurrentVerboseLevel >= VerboseLevel))
+  if(!(ADV_TRACE_Ctx.CurrentVerboseLevel >= VerboseLevel))
   {
     return UTIL_ADV_TRACE_GIVEUP;
   }
 
-  if(( Region & ADV_TRACE_Ctx.RegionMask) != Region)
+  if((Region & ADV_TRACE_Ctx.RegionMask) != Region)
   {
     return UTIL_ADV_TRACE_REGIONMASKED;
   }
@@ -276,8 +284,8 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_FSend(uint32_t VerboseLevel, uint32_
     ADV_TRACE_Ctx.timestamp_func(buf,&buff_size);
   }
 
-  va_start( vaArgs, strFormat);
-  buff_size+=(uint16_t)UTIL_ADV_TRACE_VSNPRINTF((char *)(buf + buff_size), UTIL_ADV_TRACE_TMP_BUF_SIZE, strFormat, vaArgs);
+  va_start(vaArgs, strFormat);
+  buff_size += (uint16_t) UTIL_ADV_TRACE_VSNPRINTF((char* )(buf + buff_size), UTIL_ADV_TRACE_TMP_BUF_SIZE, strFormat, vaArgs);
   va_end(vaArgs);
 
   return UTIL_ADV_TRACE_Send(buf, buff_size);
@@ -288,12 +296,12 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_FSend(uint32_t VerboseLevel, uint32_
 UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_FSend(const char *strFormat, ...)
 {
   uint8_t buf[UTIL_ADV_TRACE_TMP_BUF_SIZE];
-  va_list vaArgs; 
+  va_list vaArgs;
 
-  va_start( vaArgs, strFormat);
-  uint16_t bufSize=(uint16_t)UTIL_ADV_TRACE_VSNPRINTF((char *)buf ,UTIL_ADV_TRACE_TMP_BUF_SIZE, strFormat, vaArgs);
+  va_start(vaArgs, strFormat);
+  uint16_t bufSize = (uint16_t) UTIL_ADV_TRACE_VSNPRINTF((char* )buf, UTIL_ADV_TRACE_TMP_BUF_SIZE, strFormat, vaArgs);
   va_end(vaArgs);
-  
+
   return UTIL_ADV_TRACE_Send(buf, bufSize);
 }
 
@@ -306,19 +314,19 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_ZCSend_Allocation(uint32_t VerboseLe
   uint16_t timestamp_size = 0u;
 
   /* check verbose level */
-  if (!( ADV_TRACE_Ctx.CurrentVerboseLevel >= VerboseLevel))
+  if(!(ADV_TRACE_Ctx.CurrentVerboseLevel >= VerboseLevel))
   {
     return UTIL_ADV_TRACE_GIVEUP;
   }
-  
-  if(( Region & ADV_TRACE_Ctx.RegionMask) != Region)
+
+  if((Region & ADV_TRACE_Ctx.RegionMask) != Region)
   {
-	  return UTIL_ADV_TRACE_REGIONMASKED;
+    return UTIL_ADV_TRACE_REGIONMASKED;
   }
-  
+
   if((ADV_TRACE_Ctx.timestamp_func != NULL) && (TimeStampState != 0u))
   {
-	  ADV_TRACE_Ctx.timestamp_func(timestamp_ptr,&timestamp_size);
+    ADV_TRACE_Ctx.timestamp_func(timestamp_ptr, &timestamp_size);
   }
 
   TRACE_Lock();
@@ -326,39 +334,20 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_ZCSend_Allocation(uint32_t VerboseLe
   /* if allocation is ok, write data into the buffer */
   if (TRACE_AllocateBufer(length+timestamp_size, &writepos) != -1)
   {
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-    UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-    if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_EXECUTED)
-    {
-      /* clear the over run */
-	    ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_NONE;
-    }
-    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-#endif
-    
     /* fill time stamp information */
-    for(uint16_t index = 0u; index < timestamp_size; index++)
+    for (uint16_t index = 0u; index < timestamp_size; index++)
     {
       ADV_TRACE_Buffer[writepos] = timestamp_ptr[index];
-      writepos = (uint16_t)((writepos + 1u) % UTIL_ADV_TRACE_FIFO_SIZE);
+      writepos = (uint16_t) ((writepos + 1u) % UTIL_ADV_TRACE_FIFO_SIZE);
     }
-    
+
     /*user fill */
     *pData = ADV_TRACE_Buffer;
-    *FifoSize = (uint16_t)UTIL_ADV_TRACE_FIFO_SIZE;
+    *FifoSize = (uint16_t) UTIL_ADV_TRACE_FIFO_SIZE;
     *WritePos = writepos;
   }
   else
   {
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-    UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-    if((ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_NONE ) && (NULL != ADV_TRACE_Ctx.overrun_func))
-    {
-      UTIL_ADV_TRACE_DEBUG(":TRACE_OVERRUN_INDICATION");
-      ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_INDICATION;
-    }
-    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-#endif
     TRACE_UnLock();
     ret = UTIL_ADV_TRACE_MEM_FULL;
   }
@@ -367,7 +356,7 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_ZCSend_Allocation(uint32_t VerboseLe
 
 UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_ZCSend_Finalize(void)
 {
-	return UTIL_ADV_TRACE_ZCSend_Finalize();
+  return UTIL_ADV_TRACE_ZCSend_Finalize();
 }
 #endif
 
@@ -381,32 +370,13 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_ZCSend_Allocation(uint16_t Length, uint8_
   /* if allocation is ok, write data into the buffer */
   if (TRACE_AllocateBufer(Length,&writepos)  != -1)
   {
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-	UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-	if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_EXECUTED)
-	{
-		/* clear the over run */
-	    ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_NONE;
-	}
-	UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-#endif
-
-	/*user fill */
-	*pData = ADV_TRACE_Buffer;
-	*FifoSize = UTIL_ADV_TRACE_FIFO_SIZE;
-	*WritePos = (uint16_t)writepos;
+    /*user fill */
+    *pData = ADV_TRACE_Buffer;
+    *FifoSize = UTIL_ADV_TRACE_FIFO_SIZE;
+    *WritePos = (uint16_t)writepos;
   }
   else
   {
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-	UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-	if((ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_NONE ) && (NULL != ADV_TRACE_Ctx.overrun_func))
-	{
-		UTIL_ADV_TRACE_DEBUG("UTIL_ADV_TRACE_ZCSend:TRACE_OVERRUN_INDICATION");
-		ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_INDICATION;
-	}
-	UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-#endif
     TRACE_UnLock();
     ret = UTIL_ADV_TRACE_MEM_FULL;
   }
@@ -416,33 +386,33 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_ZCSend_Allocation(uint16_t Length, uint8_
 
 UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_ZCSend_Finalize(void)
 {
-    TRACE_UnLock();
-    return TRACE_Send();
+  TRACE_UnLock();
+  return TRACE_Send();
 }
 
 #if defined(UTIL_ADV_TRACE_CONDITIONNAL)
 UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_Send(uint32_t VerboseLevel, uint32_t Region, uint32_t TimeStampState, const uint8_t *pData, uint16_t Length)
 {
-  UTIL_ADV_TRACE_Status_t ret;  
+  UTIL_ADV_TRACE_Status_t ret;
   uint16_t writepos;
-  uint32_t  idx;
+  uint32_t idx;
   uint8_t timestamp_ptr[UTIL_ADV_TRACE_TMP_MAX_TIMESTMAP_SIZE];
   uint16_t timestamp_size = 0u;
 
   /* check verbose level */
-  if (!( ADV_TRACE_Ctx.CurrentVerboseLevel >= VerboseLevel))
+  if(!(ADV_TRACE_Ctx.CurrentVerboseLevel >= VerboseLevel))
   {
-	return UTIL_ADV_TRACE_GIVEUP;
+    return UTIL_ADV_TRACE_GIVEUP;
   }
 
-  if(( Region & ADV_TRACE_Ctx.RegionMask) != Region)
+  if((Region & ADV_TRACE_Ctx.RegionMask) != Region)
   {
-	  return UTIL_ADV_TRACE_REGIONMASKED;
+    return UTIL_ADV_TRACE_REGIONMASKED;
   }
 
   if((ADV_TRACE_Ctx.timestamp_func != NULL) && (TimeStampState != 0u))
   {
-	  ADV_TRACE_Ctx.timestamp_func(timestamp_ptr,&timestamp_size);
+    ADV_TRACE_Ctx.timestamp_func(timestamp_ptr, &timestamp_size);
   }
 
   TRACE_Lock();
@@ -450,27 +420,17 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_Send(uint32_t VerboseLevel, uint32_t
   /* if allocation is ok, write data into the buffer */
   if (TRACE_AllocateBufer(Length + timestamp_size, &writepos) != -1)
   {
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-    UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-    if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_EXECUTED)
-    {
-      /* clear the over run */
-	    ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_NONE;
-    }
-    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-#endif
-    
     /* fill time stamp information */
-    for( idx = 0; idx < timestamp_size; idx++)
+    for (idx = 0; idx < timestamp_size; idx++)
     {
       ADV_TRACE_Buffer[writepos] = timestamp_ptr[idx];
-      writepos = (uint16_t)((writepos + 1u) % UTIL_ADV_TRACE_FIFO_SIZE);
+      writepos = (uint16_t) ((writepos + 1u) % UTIL_ADV_TRACE_FIFO_SIZE);
     }
-    
+
     for (idx = 0u; idx < Length; idx++)
     {
       ADV_TRACE_Buffer[writepos] = pData[idx];
-      writepos = (uint16_t)((writepos + 1u) % UTIL_ADV_TRACE_FIFO_SIZE);
+      writepos = (uint16_t) ((writepos + 1u) % UTIL_ADV_TRACE_FIFO_SIZE);
     }
 
     TRACE_UnLock();
@@ -478,16 +438,7 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_Send(uint32_t VerboseLevel, uint32_t
   }
   else
   {
-	TRACE_UnLock();
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-	UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-	if((ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_NONE ) && (NULL != ADV_TRACE_Ctx.overrun_func))
-	{
-		UTIL_ADV_TRACE_DEBUG("UTIL_ADV_TRACE_Send:TRACE_OVERRUN_INDICATION");
-		ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_INDICATION;
-	}
-	UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-#endif
+    TRACE_UnLock();
     ret = UTIL_ADV_TRACE_MEM_FULL;
   }
 
@@ -497,49 +448,28 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_COND_Send(uint32_t VerboseLevel, uint32_t
 
 UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_Send(const uint8_t *pData, uint16_t Length)
 {
-  UTIL_ADV_TRACE_Status_t ret;  
+  UTIL_ADV_TRACE_Status_t ret;
   uint16_t writepos;
-  uint32_t  idx;  
+  uint32_t idx;
 
   TRACE_Lock();
 
   /* if allocation is ok, write data into the buffer */
   if (TRACE_AllocateBufer(Length,&writepos) != -1)
   {
-
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-	UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-    if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_EXECUTED)
-    {
-      /* clear the over run */
-	    ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_NONE;
-    }
-    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-#endif
-    
     /* initialize the Ptr for Read/Write */
     for (idx = 0u; idx < Length; idx++)
     {
       ADV_TRACE_Buffer[writepos] = pData[idx];
-      writepos = (uint16_t)((writepos + 1u) % UTIL_ADV_TRACE_FIFO_SIZE);
+      writepos = (uint16_t) ((writepos + 1u) % UTIL_ADV_TRACE_FIFO_SIZE);
     }
     TRACE_UnLock();
-    
+
     ret = TRACE_Send();
   }
   else
   {
-	TRACE_UnLock();
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-	UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-	if((ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_NONE ) && (NULL != ADV_TRACE_Ctx.overrun_func))
-	{
-		UTIL_ADV_TRACE_DEBUG("UTIL_ADV_TRACE_Send:TRACE_OVERRUN_INDICATION");
-		ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_INDICATION;
-	}
-	UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-#endif
-
+    TRACE_UnLock();
     ret = UTIL_ADV_TRACE_MEM_FULL;
   }
 
@@ -549,47 +479,47 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_Send(const uint8_t *pData, uint16_t Lengt
 #if defined(UTIL_ADV_TRACE_OVERRUN)
 void UTIL_ADV_TRACE_RegisterOverRunFunction(cb_overrun *cb)
 {
-	ADV_TRACE_Ctx.overrun_func = *cb;
+  ADV_TRACE_Ctx.overrun_func = *cb;
 }
 #endif
 
 #if defined(UTIL_ADV_TRACE_CONDITIONNAL)
 void UTIL_ADV_TRACE_RegisterTimeStampFunction(cb_timestamp *cb)
 {
-	ADV_TRACE_Ctx.timestamp_func = *cb;
+  ADV_TRACE_Ctx.timestamp_func = *cb;
 }
 
 void UTIL_ADV_TRACE_SetVerboseLevel(uint8_t Level)
 {
-	ADV_TRACE_Ctx.CurrentVerboseLevel = Level;
+  ADV_TRACE_Ctx.CurrentVerboseLevel = Level;
 }
 
 uint8_t UTIL_ADV_TRACE_GetVerboseLevel(void)
 {
-	return ADV_TRACE_Ctx.CurrentVerboseLevel;
+  return ADV_TRACE_Ctx.CurrentVerboseLevel;
 }
 
 void UTIL_ADV_TRACE_SetRegion(uint32_t Region)
 {
-	ADV_TRACE_Ctx.RegionMask|= Region;
+  ADV_TRACE_Ctx.RegionMask |= Region;
 }
 
 uint32_t UTIL_ADV_TRACE_GetRegion(void)
 {
-	return ADV_TRACE_Ctx.RegionMask;
+  return ADV_TRACE_Ctx.RegionMask;
 }
 
 void UTIL_ADV_TRACE_ResetRegion(uint32_t Region)
 {
-	ADV_TRACE_Ctx.RegionMask&= ~Region;
+  ADV_TRACE_Ctx.RegionMask &= ~Region;
 }
 #endif
 
-__WEAK void UTIL_ADV_TRACE_PreSendHook (void)
+__WEAK void UTIL_ADV_TRACE_PreSendHook(void)
 {
 }
 
-__WEAK void UTIL_ADV_TRACE_PostSendHook (void)
+__WEAK void UTIL_ADV_TRACE_PostSendHook(void)
 {
 }
 
@@ -602,61 +532,48 @@ __WEAK void UTIL_ADV_TRACE_PostSendHook (void)
  */
 
 /**
-  * @brief send the data of the trace to low layer
-  * @retval Status based on @ref UTIL_ADV_TRACE_Status_t
-  */
+ * @brief send the data of the trace to low layer
+ * @retval Status based on @ref UTIL_ADV_TRACE_Status_t
+ */
 static UTIL_ADV_TRACE_Status_t TRACE_Send(void)
 {
-  UTIL_ADV_TRACE_Status_t ret = UTIL_ADV_TRACE_OK;  
+  UTIL_ADV_TRACE_Status_t ret = UTIL_ADV_TRACE_OK;
   uint8_t *ptr = NULL;
-  
-  UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();  
-  
+
+  UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
+
   if(TRACE_IsLocked() == 0u)
   {
     TRACE_Lock();
 
-#if defined(UTIL_ADV_TRACE_OVERRUN)
-	if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_INDICATION )
-	{
-		ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_TRANSFERT;
-	    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-	    UTIL_ADV_TRACE_PreSendHook();
-
-	    ADV_TRACE_Ctx.overrun_func(&ptr, &ADV_TRACE_Ctx.TraceSentSize);
-	    UTIL_ADV_TRACE_DEBUG("\n--TRACE_Send overrun(%d)--\n", ADV_TRACE_Ctx.TraceSentSize);
-	    return UTIL_TraceDriver.Send(ptr, ADV_TRACE_Ctx.TraceSentSize);
-	}
-#endif
-
-    if (ADV_TRACE_Ctx.TraceRdPtr != ADV_TRACE_Ctx.TraceWrPtr)
+    if(ADV_TRACE_Ctx.TraceRdPtr != ADV_TRACE_Ctx.TraceWrPtr)
     {
 #ifdef UTIL_ADV_TRACE_UNCHUNK_MODE
-   	  if(TRACE_UNCHUNK_DETECTED == ADV_TRACE_Ctx.unchunk_status)
-   	  {
-        ADV_TRACE_Ctx.TraceSentSize = (uint16_t)(ADV_TRACE_Ctx.unchunk_enabled - ADV_TRACE_Ctx.TraceRdPtr);
+      if(TRACE_UNCHUNK_DETECTED == ADV_TRACE_Ctx.unchunk_status)
+      {
+        ADV_TRACE_Ctx.TraceSentSize = (uint16_t) (ADV_TRACE_Ctx.unchunk_enabled - ADV_TRACE_Ctx.TraceRdPtr);
         ADV_TRACE_Ctx.unchunk_status = TRACE_UNCHUNK_TRANSFER;
         ADV_TRACE_Ctx.unchunk_enabled = 0;
-        
-        UTIL_ADV_TRACE_DEBUG("\nTRACE_TxCpltCallback::unchunk start(%d,%d)\n",ADV_TRACE_Ctx.unchunk_enabled, ADV_TRACE_Ctx.TraceRdPtr);
-        
-        if (0u == ADV_TRACE_Ctx.TraceSentSize)
+
+        UTIL_ADV_TRACE_DEBUG("\nTRACE_TxCpltCallback::unchunk start(%d,%d)\n", ADV_TRACE_Ctx.unchunk_enabled, ADV_TRACE_Ctx.TraceRdPtr);
+
+        if(0u == ADV_TRACE_Ctx.TraceSentSize)
         {
           ADV_TRACE_Ctx.unchunk_status = TRACE_UNCHUNK_NONE;
           ADV_TRACE_Ctx.TraceRdPtr = 0;
         }
-   	  }
-      
-   	  if(TRACE_UNCHUNK_NONE == ADV_TRACE_Ctx.unchunk_status)
-   	  {
+      }
+
+      if(TRACE_UNCHUNK_NONE == ADV_TRACE_Ctx.unchunk_status)
+      {
 #endif
-   	    if (ADV_TRACE_Ctx.TraceWrPtr > ADV_TRACE_Ctx.TraceRdPtr)
+        if(ADV_TRACE_Ctx.TraceWrPtr > ADV_TRACE_Ctx.TraceRdPtr)
         {
-   	    	ADV_TRACE_Ctx.TraceSentSize = ADV_TRACE_Ctx.TraceWrPtr - ADV_TRACE_Ctx.TraceRdPtr;
+          ADV_TRACE_Ctx.TraceSentSize = ADV_TRACE_Ctx.TraceWrPtr - ADV_TRACE_Ctx.TraceRdPtr;
         }
-        else  /* TraceRdPtr > TraceWrPtr */
+        else /* TraceRdPtr > TraceWrPtr */
         {
-        	ADV_TRACE_Ctx.TraceSentSize = UTIL_ADV_TRACE_FIFO_SIZE - ADV_TRACE_Ctx.TraceRdPtr;
+          ADV_TRACE_Ctx.TraceSentSize = UTIL_ADV_TRACE_FIFO_SIZE - ADV_TRACE_Ctx.TraceRdPtr;
 
         }
 #ifdef UTIL_ADV_TRACE_UNCHUNK_MODE
@@ -665,122 +582,125 @@ static UTIL_ADV_TRACE_Status_t TRACE_Send(void)
       ptr = &ADV_TRACE_Buffer[ADV_TRACE_Ctx.TraceRdPtr];
 
       UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-      UTIL_ADV_TRACE_PreSendHook(); 
+      UTIL_ADV_TRACE_PreSendHook();
 
-      UTIL_ADV_TRACE_DEBUG("\n--TRACE_Send(%d-%d)--\n",ADV_TRACE_Ctx.TraceRdPtr, ADV_TRACE_Ctx.TraceSentSize);
+      UTIL_ADV_TRACE_DEBUG("\n--TRACE_Send(%d-%d)--\n", ADV_TRACE_Ctx.TraceRdPtr, ADV_TRACE_Ctx.TraceSentSize);
       ret = UTIL_TraceDriver.Send(ptr, ADV_TRACE_Ctx.TraceSentSize);
     }
     else
     {
       TRACE_UnLock();
-      UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();  
-    }    
+      UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
+    }
   }
   else
   {
-    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();  
+    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
   }
-  
+
   return ret;
 }
 
 /**
-  * @brief Tx callback called by the low layer level to inform a transfer complete
-  * @param Ptr pointer not used only for HAL compatibility
-  * @retval none
-  */
+ * @brief Tx callback called by the low layer level to inform a transfer complete
+ * @param Ptr pointer not used only for HAL compatibility
+ * @retval none
+ */
 static void TRACE_TxCpltCallback(void *Ptr)
-{ 
+{
+  uint8_t *ptr = NULL;
   UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
-  
+
 #if defined(UTIL_ADV_TRACE_OVERRUN)
-  if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_TRANSFERT )
+  if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_TRANSFERT)
   {
     ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_EXECUTED;
     UTIL_ADV_TRACE_DEBUG("\n--TRACE_Send overrun complete--\n");
     ADV_TRACE_Ctx.TraceSentSize = 0u;
   }
 #endif
-  
+
 #if defined(UTIL_ADV_TRACE_UNCHUNK_MODE)
   if(TRACE_UNCHUNK_TRANSFER == ADV_TRACE_Ctx.unchunk_status)
   {
-	  ADV_TRACE_Ctx.unchunk_status = TRACE_UNCHUNK_NONE;
-	  ADV_TRACE_Ctx.TraceRdPtr = 0;
-	  UTIL_ADV_TRACE_DEBUG("\nTRACE_TxCpltCallback::unchunk complete\n");
+    ADV_TRACE_Ctx.unchunk_status = TRACE_UNCHUNK_NONE;
+    ADV_TRACE_Ctx.TraceRdPtr = 0;
+    UTIL_ADV_TRACE_DEBUG("\nTRACE_TxCpltCallback::unchunk complete\n");
   }
   else
   {
-	  ADV_TRACE_Ctx.TraceRdPtr = (ADV_TRACE_Ctx.TraceRdPtr + ADV_TRACE_Ctx.TraceSentSize) % UTIL_ADV_TRACE_FIFO_SIZE;
+    ADV_TRACE_Ctx.TraceRdPtr = (ADV_TRACE_Ctx.TraceRdPtr + ADV_TRACE_Ctx.TraceSentSize) % UTIL_ADV_TRACE_FIFO_SIZE;
   }
 #else
   ADV_TRACE_Ctx.TraceRdPtr = (ADV_TRACE_Ctx.TraceRdPtr + ADV_TRACE_Ctx.TraceSentSize) % UTIL_ADV_TRACE_FIFO_SIZE;
 #endif
-  
+
 #if defined(UTIL_ADV_TRACE_OVERRUN)
-	if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_INDICATION )
-	{
-		uint8_t *ptr = NULL;
-    
-		ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_TRANSFERT;
-		UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
-		ADV_TRACE_Ctx.overrun_func(&ptr, &ADV_TRACE_Ctx.TraceSentSize);
-		UTIL_ADV_TRACE_DEBUG("\n--Driver_Send overrun(%d)--\n", ADV_TRACE_Ctx.TraceSentSize);
-		UTIL_TraceDriver.Send(ptr, ADV_TRACE_Ctx.TraceSentSize);
+  if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_INDICATION)
+  {
+    uint8_t *ptr = NULL;
+    ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_TRANSFERT;
+    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
+    ADV_TRACE_Ctx.overrun_func(&ptr, &ADV_TRACE_Ctx.TraceSentSize);
+    UTIL_ADV_TRACE_DEBUG("\n--Driver_Send overrun(%d)--\n", ADV_TRACE_Ctx.TraceSentSize);
+    UTIL_TraceDriver.Send(ptr, ADV_TRACE_Ctx.TraceSentSize);
     return;
-	}
+  }
 #endif
-  
+
   if((ADV_TRACE_Ctx.TraceRdPtr != ADV_TRACE_Ctx.TraceWrPtr) && (1u == ADV_TRACE_Ctx.TraceLock))
   {
 #ifdef UTIL_ADV_TRACE_UNCHUNK_MODE
     if(TRACE_UNCHUNK_DETECTED == ADV_TRACE_Ctx.unchunk_status)
     {
-   		ADV_TRACE_Ctx.TraceSentSize = ADV_TRACE_Ctx.unchunk_enabled - ADV_TRACE_Ctx.TraceRdPtr;
-   		ADV_TRACE_Ctx.unchunk_status = TRACE_UNCHUNK_TRANSFER;
-   		ADV_TRACE_Ctx.unchunk_enabled = 0;
-      
-    	UTIL_ADV_TRACE_DEBUG("\nTRACE_TxCpltCallback::unchunk start(%d,%d)\n",ADV_TRACE_Ctx.unchunk_enabled, ADV_TRACE_Ctx.TraceRdPtr);
-      
-    	if (0u == ADV_TRACE_Ctx.TraceSentSize)
+      ADV_TRACE_Ctx.TraceSentSize = ADV_TRACE_Ctx.unchunk_enabled - ADV_TRACE_Ctx.TraceRdPtr;
+      ADV_TRACE_Ctx.unchunk_status = TRACE_UNCHUNK_TRANSFER;
+      ADV_TRACE_Ctx.unchunk_enabled = 0;
+
+      UTIL_ADV_TRACE_DEBUG("\nTRACE_TxCpltCallback::unchunk start(%d,%d)\n", ADV_TRACE_Ctx.unchunk_enabled, ADV_TRACE_Ctx.TraceRdPtr);
+
+      if(0u == ADV_TRACE_Ctx.TraceSentSize)
       {
+        /* this case occurs when an ongoing write aligned the Rd position with chunk position */
+        /* in that case the unchunk is forgot */
         ADV_TRACE_Ctx.unchunk_status = TRACE_UNCHUNK_NONE;
         ADV_TRACE_Ctx.TraceRdPtr = 0;
       }
     }
-    
+
     if(TRACE_UNCHUNK_NONE == ADV_TRACE_Ctx.unchunk_status)
     {
 #endif
-      if (ADV_TRACE_Ctx.TraceWrPtr > ADV_TRACE_Ctx.TraceRdPtr)
+      if(ADV_TRACE_Ctx.TraceWrPtr > ADV_TRACE_Ctx.TraceRdPtr)
       {
         ADV_TRACE_Ctx.TraceSentSize = ADV_TRACE_Ctx.TraceWrPtr - ADV_TRACE_Ctx.TraceRdPtr;
       }
-      else  /* TraceRdPtr > TraceWrPtr */
+      else /* TraceRdPtr > TraceWrPtr */
       {
         ADV_TRACE_Ctx.TraceSentSize = UTIL_ADV_TRACE_FIFO_SIZE - ADV_TRACE_Ctx.TraceRdPtr;
       }
 #ifdef UTIL_ADV_TRACE_UNCHUNK_MODE
     }
 #endif
-    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION(); 
+    ptr = &ADV_TRACE_Buffer[ADV_TRACE_Ctx.TraceRdPtr];
+    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
     UTIL_ADV_TRACE_DEBUG("\n--TRACE_Send(%d-%d)--\n", ADV_TRACE_Ctx.TraceRdPtr, ADV_TRACE_Ctx.TraceSentSize);
-    UTIL_TraceDriver.Send(&ADV_TRACE_Buffer[ADV_TRACE_Ctx.TraceRdPtr], ADV_TRACE_Ctx.TraceSentSize);
+    UTIL_TraceDriver.Send(ptr, ADV_TRACE_Ctx.TraceSentSize);
   }
   else
   {
-    UTIL_ADV_TRACE_PostSendHook();      
-    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION(); 
+    UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
+    UTIL_ADV_TRACE_PostSendHook();
     TRACE_UnLock();
   }
 }
 
 /**
-  * @brief  allocate space inside the buffer to push data
-  * @param  Size to allocate within fifo
-  * @param  Pos position within the fifo
-  * @retval write position inside the buffer is -1 no space available.
-  */
+ * @brief  allocate space inside the buffer to push data
+ * @param  Size to allocate within fifo
+ * @param  Pos position within the fifo
+ * @retval write position inside the buffer is -1 no space available.
+ */
 static int16_t TRACE_AllocateBufer(uint16_t Size, uint16_t *Pos)
 {
   uint16_t freesize;
@@ -788,7 +708,7 @@ static int16_t TRACE_AllocateBufer(uint16_t Size, uint16_t *Pos)
 
   UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
 
-  if (ADV_TRACE_Ctx.TraceWrPtr == ADV_TRACE_Ctx.TraceRdPtr)
+  if(ADV_TRACE_Ctx.TraceWrPtr == ADV_TRACE_Ctx.TraceRdPtr)
   {
 #ifdef UTIL_ADV_TRACE_UNCHUNK_MODE
     freesize = (uint16_t)(UTIL_ADV_TRACE_FIFO_SIZE - ADV_TRACE_Ctx.TraceWrPtr);
@@ -821,7 +741,7 @@ static int16_t TRACE_AllocateBufer(uint16_t Size, uint16_t *Pos)
     else
     {
       freesize = (uint16_t)(ADV_TRACE_Ctx.TraceRdPtr - ADV_TRACE_Ctx.TraceWrPtr);
-    }
+      }
 #else
     if (ADV_TRACE_Ctx.TraceWrPtr > ADV_TRACE_Ctx.TraceRdPtr)
     {
@@ -833,28 +753,45 @@ static int16_t TRACE_AllocateBufer(uint16_t Size, uint16_t *Pos)
     }
 #endif
   }
-  
-  if (freesize > Size)
+
+  if(freesize > Size)
   {
     *Pos = ADV_TRACE_Ctx.TraceWrPtr;
     ADV_TRACE_Ctx.TraceWrPtr = (ADV_TRACE_Ctx.TraceWrPtr + Size) % UTIL_ADV_TRACE_FIFO_SIZE;
     ret = 0;
-    
+#if defined(UTIL_ADV_TRACE_OVERRUN)
+    if(ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_EXECUTED)
+    {
+      /* clear the over run */
+      ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_NONE;
+    }
+#endif
+
 #ifdef UTIL_ADV_TRACE_UNCHUNK_MODE
-    UTIL_ADV_TRACE_DEBUG("\n--TRACE_AllocateBufer(%d-%d-%d::%d-%d)--\n",freesize - Size, Size, ADV_TRACE_Ctx.unchunk_enabled, ADV_TRACE_Ctx.TraceRdPtr, ADV_TRACE_Ctx.TraceWrPtr);
+    UTIL_ADV_TRACE_DEBUG("\n--TRACE_AllocateBufer(%d-%d-%d::%d-%d)--\n", freesize - Size, Size, ADV_TRACE_Ctx.unchunk_enabled, ADV_TRACE_Ctx.TraceRdPtr, ADV_TRACE_Ctx.TraceWrPtr);
 #else
     UTIL_ADV_TRACE_DEBUG("\n--TRACE_AllocateBufer(%d-%d::%d-%d)--\n",freesize - Size, Size, ADV_TRACE_Ctx.TraceRdPtr, ADV_TRACE_Ctx.TraceWrPtr);
 #endif
   }
+#if defined(UTIL_ADV_TRACE_OVERRUN)
+  else
+  {
+    if((ADV_TRACE_Ctx.OverRunStatus == TRACE_OVERRUN_NONE) && (NULL != ADV_TRACE_Ctx.overrun_func))
+    {
+      UTIL_ADV_TRACE_DEBUG(":TRACE_OVERRUN_INDICATION");
+      ADV_TRACE_Ctx.OverRunStatus = TRACE_OVERRUN_INDICATION;
+    }
+  }
+#endif
 
-  UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();  
+  UTIL_ADV_TRACE_EXIT_CRITICAL_SECTION();
   return ret;
 }
 
 /**
-  * @brief  Lock the trace buffer.
-  * @retval None.
-  */
+ * @brief  Lock the trace buffer.
+ * @retval None.
+ */
 static void TRACE_Lock(void)
 {
   UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
@@ -863,9 +800,9 @@ static void TRACE_Lock(void)
 }
 
 /**
-  * @brief  UnLock the trace buffer.
-  * @retval None.
-  */
+ * @brief  UnLock the trace buffer.
+ * @retval None.
+ */
 static void TRACE_UnLock(void)
 {
   UTIL_ADV_TRACE_ENTER_CRITICAL_SECTION();
@@ -874,9 +811,9 @@ static void TRACE_UnLock(void)
 }
 
 /**
-  * @brief  UnLock the trace buffer.
-  * @retval None.
-  */
+ * @brief  UnLock the trace buffer.
+ * @retval None.
+ */
 static uint32_t TRACE_IsLocked(void)
 {
   return (ADV_TRACE_Ctx.TraceLock == 0u? 0u: 1u);
diff --git a/Utilities/trace/adv_trace/stm32_adv_trace.h b/Utilities/trace/adv_trace/stm32_adv_trace.h
index 11f22eb8..eec38bf2 100644
--- a/Utilities/trace/adv_trace/stm32_adv_trace.h
+++ b/Utilities/trace/adv_trace/stm32_adv_trace.h
@@ -110,6 +110,12 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_Init(void);
  */
 UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_DeInit(void);
 
+/**
+ * @brief this function check if the buffer is empty.
+ * @retval 1 if the buffer is empty else 0
+ */
+uint8_t UTIL_ADV_TRACE_IsBufferEmpty(void);
+
 /**
  * @brief start the RX process.
  * @param UserCallback ptr function used to get the RX data
@@ -127,7 +133,7 @@ UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_FSend(const char *strFormat, ...);
 /**
  * @brief post data to the circular queue
  * @param *pdata pointer to Data
- * @param length length of data buffer ro be sent
+ * @param length length of data buffer to be sent
  * @retval Status based on @ref UTIL_ADV_TRACE_Status_t
  */
 UTIL_ADV_TRACE_Status_t UTIL_ADV_TRACE_Send(const uint8_t *pdata, uint16_t length);
@@ -220,7 +226,7 @@ void UTIL_ADV_TRACE_RegisterTimeStampFunction(cb_timestamp *cb);
 
 /**
  * @brief  Set the verbose level
- * @param  Level (0 to 256)
+ * @param  Level (0 to 255)
  * @retval None
  */
 void UTIL_ADV_TRACE_SetVerboseLevel(uint8_t Level);
diff --git a/_htmresc/STM32Cube_2020.bmp b/_htmresc/STM32Cube_2020.bmp
new file mode 100644
index 00000000..324eae78
Binary files /dev/null and b/_htmresc/STM32Cube_2020.bmp differ
diff --git a/package.xml b/package.xml
index c8d4f48f..4b268275 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
 <Package DBVersion="2.0">
- <PackDescription Release="FW.WL.1.0.0">
+ <PackDescription Release="FW.WL.1.1.0">
   <Note  Release="ReleaseNotes.html"/>
  </PackDescription>
 </Package>
\ No newline at end of file